diff --git a/.tx/config b/.tx/config
deleted file mode 100644
index b51860f8b2..0000000000
--- a/.tx/config
+++ /dev/null
@@ -1,182 +0,0 @@
-[main]
-host = https://www.transifex.net
-
-[owncloud.core]
-file_filter = l10n/<lang>/core.po
-host = http://www.transifex.net
-source_file = l10n/templates/core.pot
-source_lang = en
-trans.bg_BG = l10n/bg_BG/core.po
-trans.ca = l10n/ca/core.po
-trans.cs_CZ = l10n/cs_CZ/core.po
-trans.da = l10n/da/core.po
-trans.de = l10n/de/core.po
-trans.el = l10n/el/core.po
-trans.es = l10n/es/core.po
-trans.et_EE = l10n/et_EE/core.po
-trans.fr = l10n/fr/core.po
-trans.id = l10n/id/core.po
-trans.it = l10n/it/core.po
-trans.lb = l10n/lb/core.po
-trans.ms_MY = l10n/ms_MY/core.po
-trans.nb_NO = l10n/nb_NO/core.po
-trans.nl = l10n/nl/core.po
-trans.pl = l10n/pl/core.po
-trans.pt_BR = l10n/pt_BR/core.po
-trans.pt_PT = l10n/pt_PT/core.po
-trans.ro = l10n/ro/core.po
-trans.ru = l10n/ru/core.po
-trans.sr = l10n/sr/core.po
-trans.sr@latin = l10n/sr@latin/core.po
-trans.sv = l10n/sv/core.po
-trans.zh_CN = l10n/zh_CN/core.po
-
-[owncloud.settings]
-file_filter = l10n/<lang>/settings.po
-host = http://www.transifex.net
-source_file = l10n/templates/settings.pot
-source_lang = en
-trans.bg_BG = l10n/bg_BG/settings.po
-trans.ca = l10n/ca/settings.po
-trans.cs_CZ = l10n/cs_CZ/settings.po
-trans.da = l10n/da/settings.po
-trans.de = l10n/de/settings.po
-trans.el = l10n/el/settings.po
-trans.es = l10n/es/settings.po
-trans.et_EE = l10n/et_EE/settings.po
-trans.fr = l10n/fr/settings.po
-trans.id = l10n/id/settings.po
-trans.it = l10n/it/settings.po
-trans.lb = l10n/lb/settings.po
-trans.ms_MY = l10n/ms_MY/settings.po
-trans.nb_NO = l10n/nb_NO/settings.po
-trans.nl = l10n/nl/settings.po
-trans.pl = l10n/pl/settings.po
-trans.pt_BR = l10n/pt_BR/settings.po
-trans.pt_PT = l10n/pt_PT/settings.po
-trans.ro = l10n/ro/settings.po
-trans.ru = l10n/ru/settings.po
-trans.sr = l10n/sr/settings.po
-trans.sr@latin = l10n/sr@latin/settings.po
-trans.sv = l10n/sv/settings.po
-trans.zh_CN = l10n/zh_CN/settings.po
-
-[owncloud.files]
-file_filter = translations/owncloud.files/<lang>.po
-host = http://www.transifex.net
-source_file = l10n/templates/files.pot
-source_lang = en
-trans.bg_BG = l10n/bg_BG/files.po
-trans.ca = l10n/ca/files.po
-trans.cs_CZ = l10n/cs_CZ/files.po
-trans.da = l10n/da/files.po
-trans.de = l10n/de/files.po
-trans.el = l10n/el/files.po
-trans.es = l10n/es/files.po
-trans.et_EE = l10n/et_EE/files.po
-trans.fr = l10n/fr/files.po
-trans.id = l10n/id/files.po
-trans.it = l10n/it/files.po
-trans.lb = l10n/lb/files.po
-trans.ms_MY = l10n/ms_MY/files.po
-trans.nb_NO = l10n/nb_NO/files.po
-trans.nl = l10n/nl/files.po
-trans.pl = l10n/pl/files.po
-trans.pt_BR = l10n/pt_BR/files.po
-trans.pt_PT = l10n/pt_PT/files.po
-trans.ro = l10n/ro/files.po
-trans.ru = l10n/ru/files.po
-trans.sr = l10n/sr/files.po
-trans.sr@latin = l10n/sr@latin/files.po
-trans.sv = l10n/sv/files.po
-trans.zh_CN = l10n/zh_CN/files.po
-
-[owncloud.media]
-file_filter = translations/owncloud.media/<lang>.po
-host = http://www.transifex.net
-source_file = l10n/templates/media.pot
-source_lang = en
-trans.bg_BG = l10n/bg_BG/media.po
-trans.ca = l10n/ca/media.po
-trans.cs_CZ = l10n/cs_CZ/media.po
-trans.da = l10n/da/media.po
-trans.de = l10n/de/media.po
-trans.el = l10n/el/media.po
-trans.es = l10n/es/media.po
-trans.et_EE = l10n/et_EE/media.po
-trans.fr = l10n/fr/media.po
-trans.id = l10n/id/media.po
-trans.it = l10n/it/media.po
-trans.lb = l10n/lb/media.po
-trans.ms_MY = l10n/ms_MY/media.po
-trans.nb_NO = l10n/nb_NO/media.po
-trans.nl = l10n/nl/media.po
-trans.pl = l10n/pl/media.po
-trans.pt_BR = l10n/pt_BR/media.po
-trans.pt_PT = l10n/pt_PT/media.po
-trans.ro = l10n/ro/media.po
-trans.ru = l10n/ru/media.po
-trans.sr = l10n/sr/media.po
-trans.sr@latin = l10n/sr@latin/media.po
-trans.sv = l10n/sv/media.po
-trans.zh_CN = l10n/zh_CN/media.po
-
-[owncloud.calendar]
-file_filter = l10n/<lang>/calendar.po
-host = http://www.transifex.net
-source_file = l10n/templates/calendar.pot
-source_lang = en
-trans.bg_BG = l10n/bg_BG/calendar.po
-trans.ca = l10n/ca/calendar.po
-trans.cs_CZ = l10n/cs_CZ/calendar.po
-trans.da = l10n/da/calendar.po
-trans.de = l10n/de/calendar.po
-trans.el = l10n/el/calendar.po
-trans.es = l10n/es/calendar.po
-trans.et_EE = l10n/et_EE/calendar.po
-trans.fr = l10n/fr/calendar.po
-trans.id = l10n/id/calendar.po
-trans.it = l10n/it/calendar.po
-trans.lb = l10n/lb/calendar.po
-trans.ms_MY = l10n/ms_MY/calendar.po
-trans.nb_NO = l10n/nb_NO/calendar.po
-trans.nl = l10n/nl/calendar.po
-trans.pl = l10n/pl/calendar.po
-trans.pt_BR = l10n/pt_BR/calendar.po
-trans.pt_PT = l10n/pt_PT/calendar.po
-trans.ro = l10n/ro/calendar.po
-trans.ru = l10n/ru/calendar.po
-trans.sr = l10n/sr/calendar.po
-trans.sr@latin = l10n/sr@latin/calendar.po
-trans.sv = l10n/sv/calendar.po
-trans.zh_CN = l10n/zh_CN/calendar.po
-
-[owncloud.contacts]
-file_filter = translations/owncloud.contacts/<lang>.po
-host = http://www.transifex.net
-source_file = l10n/templates/contacts.pot
-source_lang = en
-trans.bg_BG = l10n/bg_BG/contacts.po
-trans.ca = l10n/ca/contacts.po
-trans.cs_CZ = l10n/cs_CZ/contacts.po
-trans.da = l10n/da/contacts.po
-trans.de = l10n/de/contacts.po
-trans.el = l10n/el/contacts.po
-trans.es = l10n/es/contacts.po
-trans.et_EE = l10n/et_EE/contacts.po
-trans.fr = l10n/fr/contacts.po
-trans.id = l10n/id/contacts.po
-trans.it = l10n/it/contacts.po
-trans.lb = l10n/lb/contacts.po
-trans.ms_MY = l10n/ms_MY/contacts.po
-trans.nb_NO = l10n/nb_NO/contacts.po
-trans.nl = l10n/nl/contacts.po
-trans.pl = l10n/pl/contacts.po
-trans.pt_BR = l10n/pt_BR/contacts.po
-trans.pt_PT = l10n/pt_PT/contacts.po
-trans.ro = l10n/ro/contacts.po
-trans.ru = l10n/ru/contacts.po
-trans.sr = l10n/sr/contacts.po
-trans.sr@latin = l10n/sr@latin/contacts.po
-trans.sv = l10n/sv/contacts.po
-trans.zh_CN = l10n/zh_CN/contacts.po
diff --git a/3rdparty/MDB2/Driver/Datatype/Common.php b/3rdparty/MDB2/Driver/Datatype/Common.php
index 3b02c86acd..dd7f1c7e0a 100644
--- a/3rdparty/MDB2/Driver/Datatype/Common.php
+++ b/3rdparty/MDB2/Driver/Datatype/Common.php
@@ -1412,7 +1412,7 @@ class MDB2_Driver_Datatype_Common extends MDB2_Module_Common
             if (PEAR::isError($db)) {
                 return $db;
             }
-            if (isset($db->function) && is_object($this->function) && is_a($db->function, 'MDB2_Driver_Function_Common')) {
+            if (isset($db->function) && is_object($db->function) && is_a($db->function, 'MDB2_Driver_Function_Common')) {
                 return $db->function->now('timestamp');
             }
             return 'CURRENT_TIMESTAMP';
diff --git a/3rdparty/MDB2/Driver/mysql.php b/3rdparty/MDB2/Driver/mysql.php
index 3008bd04f0..1d22e61f46 100644
--- a/3rdparty/MDB2/Driver/mysql.php
+++ b/3rdparty/MDB2/Driver/mysql.php
@@ -80,7 +80,7 @@ class MDB2_Driver_mysql extends MDB2_Driver_Common
 
     protected $start_transaction = false;
 
-    protected $varchar_max_length = 255;
+    public $varchar_max_length = 255;
 
     // }}}
     // {{{ constructor
diff --git a/3rdparty/simpletest/extensions/coverage/autocoverage.php b/3rdparty/simpletest/extensions/coverage/autocoverage.php
new file mode 100644
index 0000000000..9fc961bf43
--- /dev/null
+++ b/3rdparty/simpletest/extensions/coverage/autocoverage.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * @package        SimpleTest
+ * @subpackage     Extensions
+ */
+/**
+ * Include this in any file to start coverage, coverage will automatically end
+ * when process dies.
+ */
+require_once(dirname(__FILE__) .'/coverage.php');
+
+if (CodeCoverage::isCoverageOn()) {
+    $coverage = CodeCoverage::getInstance();
+    $coverage->startCoverage();
+    register_shutdown_function("stop_coverage");
+}
+
+function stop_coverage() {
+    # hack until i can think of a way to run tests first and w/o exiting
+    $autorun = function_exists("run_local_tests");
+    if ($autorun) {
+        $result = run_local_tests();
+    }
+    CodeCoverage::getInstance()->stopCoverage();
+    if ($autorun) {
+        exit($result ? 0 : 1);
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/extensions/coverage/bin/php-coverage-close.php b/3rdparty/simpletest/extensions/coverage/bin/php-coverage-close.php
new file mode 100755
index 0000000000..9a5a52ba13
--- /dev/null
+++ b/3rdparty/simpletest/extensions/coverage/bin/php-coverage-close.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * Close code coverage data collection, next step is to generate report
+ * @package        SimpleTest
+ * @subpackage     Extensions
+ */
+/**
+ * include coverage files
+ */
+require_once(dirname(__FILE__) . '/../coverage.php');
+$cc = CodeCoverage::getInstance();
+$cc->readSettings();
+$cc->writeUntouched();
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/extensions/coverage/bin/php-coverage-open.php b/3rdparty/simpletest/extensions/coverage/bin/php-coverage-open.php
new file mode 100755
index 0000000000..c04e1fb512
--- /dev/null
+++ b/3rdparty/simpletest/extensions/coverage/bin/php-coverage-open.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Initialize code coverage data collection, next step is to run your tests
+ * with ini setting auto_prepend_file=autocoverage.php ...
+ *
+ * @package        SimpleTest
+ * @subpackage     Extensions
+ */ 
+# optional arguments:
+#  --include=<some filepath regexp>      these files should be included coverage report
+#  --exclude=<come filepath regexp>      these files should not be included in coverage report
+#  --maxdepth=2                          when considering which file were not touched, scan directories 
+#
+# Example: 
+# php-coverage-open.php --include='.*\.php$' --include='.*\.inc$' --exclude='.*/tests/.*' 
+/**#@+
+ * include coverage files
+ */
+require_once(dirname(__FILE__) . '/../coverage_utils.php');
+CoverageUtils::requireSqlite();
+require_once(dirname(__FILE__) . '/../coverage.php');
+/**#@-*/
+$cc = new CodeCoverage();
+$cc->log = 'coverage.sqlite';
+$args = CoverageUtils::parseArguments($_SERVER['argv'], TRUE);
+$cc->includes = CoverageUtils::issetOr($args['include[]'], array('.*\.php$'));
+$cc->excludes = CoverageUtils::issetOr($args['exclude[]']); 
+$cc->maxDirectoryDepth = (int)CoverageUtils::issetOr($args['maxdepth'], '1');
+$cc->resetLog();
+$cc->writeSettings();
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/extensions/coverage/bin/php-coverage-report.php b/3rdparty/simpletest/extensions/coverage/bin/php-coverage-report.php
new file mode 100755
index 0000000000..d61c822d99
--- /dev/null
+++ b/3rdparty/simpletest/extensions/coverage/bin/php-coverage-report.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Generate a code coverage report
+ *
+ * @package        SimpleTest
+ * @subpackage     Extensions
+ */
+# optional arguments:
+#  --reportDir=some/directory    the default is ./coverage-report
+#  --title='My Coverage Report'  title the main page of your report
+
+/**#@+
+ * include coverage files
+ */
+require_once(dirname(__FILE__) . '/../coverage_utils.php');
+require_once(dirname(__FILE__) . '/../coverage.php');
+require_once(dirname(__FILE__) . '/../coverage_reporter.php');
+/**#@-*/
+$cc = CodeCoverage::getInstance();
+$cc->readSettings();
+$handler = new CoverageDataHandler($cc->log);
+$report = new CoverageReporter();
+$args = CoverageUtils::parseArguments($_SERVER['argv']);
+$report->reportDir = CoverageUtils::issetOr($args['reportDir'], 'coverage-report');
+$report->title = CoverageUtils::issetOr($args['title'], "Simpletest Coverage");
+$report->coverage = $handler->read();
+$report->untouched = $handler->readUntouchedFiles();
+$report->generate();
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/extensions/coverage/coverage.php b/3rdparty/simpletest/extensions/coverage/coverage.php
new file mode 100644
index 0000000000..44e5b679b8
--- /dev/null
+++ b/3rdparty/simpletest/extensions/coverage/coverage.php
@@ -0,0 +1,196 @@
+<?php
+/**
+* @package        SimpleTest
+* @subpackage     Extensions
+*/
+/**
+* load coverage data handle
+*/
+require_once dirname(__FILE__) . '/coverage_data_handler.php';
+
+/**
+ * Orchestrates code coverage both in this thread and in subthread under apache
+ * Assumes this is running on same machine as apache.
+ * @package        SimpleTest
+ * @subpackage     Extensions
+ */
+class CodeCoverage  {
+    var $log;
+    var $root;
+    var $includes;
+    var $excludes;
+    var $directoryDepth;
+    var $maxDirectoryDepth = 20; // reasonable, otherwise arbitrary
+    var $title = "Code Coverage";
+
+    # NOTE: This assumes all code shares the same current working directory.
+    var $settingsFile = './code-coverage-settings.dat';
+
+    static $instance;
+
+    function writeUntouched() {
+        $touched = array_flip($this->getTouchedFiles());
+        $untouched = array();
+        $this->getUntouchedFiles($untouched, $touched, '.', '.');
+        $this->includeUntouchedFiles($untouched);
+    }
+
+    function &getTouchedFiles() {
+        $handler = new CoverageDataHandler($this->log);
+        $touched = $handler->getFilenames();
+        return $touched;
+    }
+
+    function includeUntouchedFiles($untouched) {
+        $handler = new CoverageDataHandler($this->log);
+        foreach ($untouched as $file) {
+            $handler->writeUntouchedFile($file);
+        }
+    }
+
+    function getUntouchedFiles(&$untouched, $touched, $parentPath, $rootPath, $directoryDepth = 1) {
+        $parent = opendir($parentPath);
+        while ($file = readdir($parent)) {
+            $path = "$parentPath/$file";
+            if (is_dir($path)) {
+                if ($file != '.' && $file != '..') {
+                    if ($this->isDirectoryIncluded($path, $directoryDepth)) {
+                        $this->getUntouchedFiles($untouched, $touched, $path, $rootPath, $directoryDepth + 1);
+                    }
+                }
+            }
+            else if ($this->isFileIncluded($path)) {
+                $relativePath = CoverageDataHandler::ltrim($rootPath .'/', $path);
+                if (!array_key_exists($relativePath, $touched)) {
+                    $untouched[] = $relativePath;
+                }
+            }
+        }
+        closedir($parent);
+    }
+
+    function resetLog() {
+        error_log('reseting log');
+        $new_file = fopen($this->log, "w");
+        if (!$new_file) {
+            throw new Exception("Could not create ". $this->log);
+        }
+        fclose($new_file);
+        if (!chmod($this->log, 0666)) {
+            throw new Exception("Could not change ownership on file  ". $this->log);
+        }
+        $handler = new CoverageDataHandler($this->log);
+        $handler->createSchema();
+    }
+
+    function startCoverage() {
+        $this->root = getcwd();
+        if(!extension_loaded("xdebug")) {
+            throw new Exception("Could not load xdebug extension");
+        };
+        xdebug_start_code_coverage(XDEBUG_CC_UNUSED | XDEBUG_CC_DEAD_CODE);
+    }
+
+    function stopCoverage() {
+        $cov = xdebug_get_code_coverage();
+        $this->filter($cov);
+        $data = new CoverageDataHandler($this->log);
+        chdir($this->root);
+        $data->write($cov);
+        unset($data); // release sqlite connection
+        xdebug_stop_code_coverage();
+        // make sure we wind up on same current working directory, otherwise
+        // coverage handler writer doesn't know what directory to chop off
+        chdir($this->root);
+    }
+
+    function readSettings() {
+        if (file_exists($this->settingsFile)) {
+            $this->setSettings(file_get_contents($this->settingsFile));
+        } else {
+            error_log("could not find file ". $this->settingsFile);
+        }
+    }
+
+    function writeSettings() {       
+        file_put_contents($this->settingsFile, $this->getSettings());
+    }
+
+    function getSettings() {
+        $data = array(
+    	'log' => realpath($this->log), 
+    	'includes' => $this->includes, 
+    	'excludes' => $this->excludes);
+        return serialize($data);
+    }
+
+    function setSettings($settings) {
+        $data = unserialize($settings);
+        $this->log = $data['log'];
+        $this->includes = $data['includes'];
+        $this->excludes = $data['excludes'];
+    }
+
+    function filter(&$coverage) {
+        foreach ($coverage as $file => $line) {
+            if (!$this->isFileIncluded($file)) {
+                unset($coverage[$file]);
+            }
+        }
+    }
+
+    function isFileIncluded($file)  {
+        if (!empty($this->excludes)) {
+            foreach ($this->excludes as $path) {
+                if (preg_match('|' . $path . '|', $file)) {
+                    return False;
+                }
+            }
+        }
+
+        if (!empty($this->includes)) {
+            foreach ($this->includes as $path) {
+                if (preg_match('|' . $path . '|', $file)) {
+                    return True;
+                }
+            }
+            return False;
+        }
+
+        return True;
+    }
+
+    function isDirectoryIncluded($dir, $directoryDepth)  {
+        if ($directoryDepth >= $this->maxDirectoryDepth) {
+            return false;
+        }
+        if (isset($this->excludes)) {
+            foreach ($this->excludes as $path) {
+                if (preg_match('|' . $path . '|', $dir)) {
+                    return False;
+                }
+            }
+        }
+
+        return True;
+    }
+
+    static function isCoverageOn() {
+        $coverage = self::getInstance();
+        $coverage->readSettings();
+        if (empty($coverage->log) || !file_exists($coverage->log)) {
+            trigger_error('No coverage log');
+            return False;
+        }
+        return True;
+    }
+
+    static function getInstance() {
+        if (self::$instance == NULL) {
+            self::$instance = new CodeCoverage();
+            self::$instance->readSettings();
+        }
+        return self::$instance;
+    }
+}
+?>
diff --git a/3rdparty/simpletest/extensions/coverage/coverage_calculator.php b/3rdparty/simpletest/extensions/coverage/coverage_calculator.php
new file mode 100644
index 0000000000..f1aa57bbab
--- /dev/null
+++ b/3rdparty/simpletest/extensions/coverage/coverage_calculator.php
@@ -0,0 +1,98 @@
+<?php
+/**
+* @package        SimpleTest
+* @subpackage     Extensions
+*/
+/**
+* @package        SimpleTest
+* @subpackage     Extensions
+*/
+class CoverageCalculator {
+
+    function coverageByFileVariables($file, $coverage) {
+        $hnd = fopen($file, 'r');
+        if ($hnd == null) {
+            throw new Exception("File $file is missing");
+        }
+        $lines = array();
+        for ($i = 1; !feof($hnd); $i++) {
+            $line = fgets($hnd);
+            $lineCoverage = $this->lineCoverageCodeToStyleClass($coverage, $i);
+            $lines[$i] = array('lineCoverage' => $lineCoverage, 'code' => $line);
+        }
+
+        fclose($hnd);
+
+        $var = compact('file', 'lines', 'coverage');
+        return $var;
+    }
+
+    function lineCoverageCodeToStyleClass($coverage, $line) {
+        if (!array_key_exists($line, $coverage)) {
+            return "comment";
+        }
+        $code = $coverage[$line];
+        if (empty($code)) {
+            return "comment";
+        }
+        switch ($code) {
+            case -1:
+                return "missed";
+            case -2:
+                return "dead";
+        }
+
+        return "covered";
+    }
+
+    function totalLoc($total, $coverage) {
+        return $total + sizeof($coverage);
+    }
+
+    function lineCoverage($total, $line) {
+        # NOTE: counting dead code as covered, as it's almost always an executable line
+        # strange artifact of xdebug or underlying system
+        return $total + ($line > 0 || $line == -2 ? 1 : 0);
+    }
+
+    function totalCoverage($total, $coverage) {
+        return $total + array_reduce($coverage, array(&$this, "lineCoverage"));
+    }
+
+    static function reportFilename($filename) {
+        return preg_replace('|[/\\\\]|', '_', $filename) . '.html';
+    }
+
+    function percentCoverageByFile($coverage, $file, &$results) {
+        $byFileReport = self::reportFilename($file);
+
+        $loc = sizeof($coverage);
+        if ($loc == 0)
+        return 0;
+        $lineCoverage = array_reduce($coverage, array(&$this, "lineCoverage"));
+        $percentage = 100 * ($lineCoverage / $loc);
+        $results[0][$file] = array('byFileReport' => $byFileReport, 'percentage' => $percentage);
+    }
+
+    function variables($coverage, $untouched) {
+        $coverageByFile = array();
+        array_walk($coverage, array(&$this, "percentCoverageByFile"), array(&$coverageByFile));
+
+        $totalLoc = array_reduce($coverage, array(&$this, "totalLoc"));
+
+        if ($totalLoc > 0) {
+            $totalLinesOfCoverage = array_reduce($coverage, array(&$this, "totalCoverage"));
+            $totalPercentCoverage = 100 * ($totalLinesOfCoverage / $totalLoc);
+        }
+
+        $untouchedPercentageDenominator = sizeof($coverage) + sizeof($untouched);
+        if ($untouchedPercentageDenominator > 0) {
+            $filesTouchedPercentage = 100 * sizeof($coverage) / $untouchedPercentageDenominator;
+        }
+
+        $var = compact('coverageByFile', 'totalPercentCoverage', 'totalLoc', 'totalLinesOfCoverage', 'filesTouchedPercentage');
+        $var['untouched'] = $untouched;
+        return $var;
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/extensions/coverage/coverage_data_handler.php b/3rdparty/simpletest/extensions/coverage/coverage_data_handler.php
new file mode 100644
index 0000000000..bbf81106fc
--- /dev/null
+++ b/3rdparty/simpletest/extensions/coverage/coverage_data_handler.php
@@ -0,0 +1,125 @@
+<?php
+/**
+ * @package        SimpleTest
+ * @subpackage     Extensions
+ */
+/**
+ * @todo	which db abstraction layer is this?
+ */
+require_once 'DB/sqlite.php';
+
+/**
+ * Persists code coverage data into SQLite database and aggregate data for convienent
+ * interpretation in report generator.  Be sure to not to keep an instance longer
+ * than you have, otherwise you risk overwriting database edits from another process
+ * also trying to make updates.
+ * @package        SimpleTest
+ * @subpackage     Extensions
+ */
+class CoverageDataHandler {
+
+    var $db;
+
+    function __construct($filename) {
+        $this->filename = $filename;
+        $this->db = new SQLiteDatabase($filename);
+        if (empty($this->db)) {
+            throw new Exception("Could not create sqlite db ". $filename);
+        }
+    }
+
+    function createSchema() {
+        $this->db->queryExec("create table untouched (filename text)");
+        $this->db->queryExec("create table coverage (name text, coverage text)");
+    }
+
+    function &getFilenames() {
+        $filenames = array();
+        $cursor = $this->db->unbufferedQuery("select distinct name from coverage");
+        while ($row = $cursor->fetch()) {
+            $filenames[] = $row[0];
+        }
+
+        return $filenames;
+    }
+
+    function write($coverage) {
+        foreach ($coverage as $file => $lines) {
+            $coverageStr = serialize($lines);
+            $relativeFilename = self::ltrim(getcwd() . '/', $file);
+            $sql = "insert into coverage (name, coverage) values ('$relativeFilename', '$coverageStr')";
+            # if this fails, check you have write permission
+            $this->db->queryExec($sql);
+        }
+    }
+
+    function read() {
+        $coverage = array_flip($this->getFilenames());
+        foreach($coverage as $file => $garbage) {
+            $coverage[$file] = $this->readFile($file);
+        }
+        return $coverage;
+    }
+
+    function &readFile($file) {
+        $sql = "select coverage from coverage where name = '$file'";
+        $aggregate = array();
+        $result = $this->db->query($sql);
+        while ($result->valid()) {
+            $row = $result->current();
+            $this->aggregateCoverage($aggregate, unserialize($row[0]));
+            $result->next();
+        }
+
+        return $aggregate;
+    }
+
+    function aggregateCoverage(&$total, $next) {
+        foreach ($next as $lineno => $code) {
+            if (!isset($total[$lineno])) {
+                $total[$lineno] = $code;
+            } else {
+                $total[$lineno] = $this->aggregateCoverageCode($total[$lineno], $code);
+            }
+        }
+    }
+
+    function aggregateCoverageCode($code1, $code2) {
+        switch($code1) {
+            case -2: return -2;
+            case -1: return $code2;
+            default:
+                switch ($code2) {
+                    case -2: return -2;
+                    case -1: return $code1;
+                }
+        }
+        return $code1 + $code2;
+    }
+
+    static function ltrim($cruft, $pristine) {
+        if(stripos($pristine, $cruft) === 0) {
+            return substr($pristine, strlen($cruft));
+        }
+        return $pristine;
+    }
+
+    function writeUntouchedFile($file) {
+        $relativeFile = CoverageDataHandler::ltrim('./', $file);
+        $sql = "insert into untouched values ('$relativeFile')";
+        $this->db->queryExec($sql);
+    }
+
+    function &readUntouchedFiles() {
+        $untouched = array();
+        $result = $this->db->query("select filename from untouched order by filename");
+        while ($result->valid()) {
+            $row = $result->current();
+            $untouched[] = $row[0];
+            $result->next();
+        }
+
+        return $untouched;
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/extensions/coverage/coverage_reporter.php b/3rdparty/simpletest/extensions/coverage/coverage_reporter.php
new file mode 100644
index 0000000000..ba4e7161c2
--- /dev/null
+++ b/3rdparty/simpletest/extensions/coverage/coverage_reporter.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * @package        SimpleTest
+ * @subpackage     Extensions
+ */
+/**#@+
+ * include additional coverage files
+ */
+require_once dirname(__FILE__) .'/coverage_calculator.php';
+require_once dirname(__FILE__) .'/coverage_utils.php';
+require_once dirname(__FILE__) .'/simple_coverage_writer.php';
+/**#@-*/
+
+/**
+ * Take aggregated coverage data and generate reports from it using smarty
+ * templates
+ * @package        SimpleTest
+ * @subpackage     Extensions
+ */
+class CoverageReporter {
+    var $coverage;
+    var $untouched;
+    var $reportDir;
+    var $title = 'Coverage';
+    var $writer;
+    var $calculator;
+
+    function __construct() {
+        $this->writer = new SimpleCoverageWriter();
+        $this->calculator = new CoverageCalculator();
+    }
+
+    function generateSummaryReport($out) {
+        $variables = $this->calculator->variables($this->coverage, $this->untouched);
+        $variables['title'] = $this->title;
+        $report = $this->writer->writeSummary($out, $variables);
+        fwrite($out, $report);
+    }
+
+    function generate() {
+        CoverageUtils::mkdir($this->reportDir);
+
+        $index = $this->reportDir .'/index.html';
+        $hnd = fopen($index, 'w');
+        $this->generateSummaryReport($hnd);
+        fclose($hnd);
+
+        foreach ($this->coverage as $file => $cov) {
+            $byFile = $this->reportDir .'/'. self::reportFilename($file);
+            $byFileHnd = fopen($byFile, 'w');
+            $this->generateCoverageByFile($byFileHnd, $file, $cov);
+            fclose($byFileHnd);
+        }
+
+        echo "generated report $index\n";
+    }
+
+    function generateCoverageByFile($out, $file, $cov) {
+        $variables = $this->calculator->coverageByFileVariables($file, $cov);
+        $variables['title'] = $this->title .' - '. $file;
+        $this->writer->writeByFile($out, $variables);
+    }
+
+    static function reportFilename($filename) {
+        return preg_replace('|[/\\\\]|', '_', $filename) . '.html';
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/extensions/coverage/coverage_utils.php b/3rdparty/simpletest/extensions/coverage/coverage_utils.php
new file mode 100644
index 0000000000..d2c3a635f4
--- /dev/null
+++ b/3rdparty/simpletest/extensions/coverage/coverage_utils.php
@@ -0,0 +1,114 @@
+<?php
+/**
+ * @package        SimpleTest
+ * @subpackage     Extensions
+ */
+/**
+ * @package        SimpleTest
+ * @subpackage     Extensions
+ */
+class CoverageUtils {
+
+    static function mkdir($dir) {
+        if (!file_exists($dir)) {
+            mkdir($dir, 0777, True);
+        } else {
+            if (!is_dir($dir)) {
+                throw new Exception($dir .' exists as a file, not a directory');
+            }
+        }
+    }
+
+    static function requireSqlite() {
+        if (!self::isPackageClassAvailable('DB/sqlite.php', 'SQLiteDatabase')) {
+            echo "sqlite library is required to be installed and available in include_path";
+            exit(1);
+        }
+    }
+
+    static function isPackageClassAvailable($includeFile, $class) {
+        @include_once($includeFile);
+        return class_exists($class);
+    }
+
+    /**
+     * Parses simple parameters from CLI.
+     *
+     * Puts trailing parameters into string array in 'extraArguments'
+     *
+     * Example:
+     * $args = CoverageUtil::parseArguments($_SERVER['argv']);
+     * if ($args['verbose']) echo "Verbose Mode On\n";
+     * $files = $args['extraArguments'];
+     *
+     * Example CLI:
+     *  --foo=blah -x -h  some trailing arguments
+     *
+     * if multiValueMode is true
+     * Example CLI:
+     *  --include=a --include=b --exclude=c
+     * Then
+     *  $args = CoverageUtil::parseArguments($_SERVER['argv']);
+     *  $args['include[]'] will equal array('a', 'b')
+     *  $args['exclude[]'] will equal array('c')
+     *  $args['exclude'] will equal c
+     *  $args['include'] will equal b   NOTE: only keeps last value
+     *
+     * @param unknown_type $argv
+     * @param supportMutliValue - will store 2nd copy of value in an array with key "foo[]"
+     * @return unknown
+     */
+    static public function parseArguments($argv, $mutliValueMode = False) {
+        $args = array();
+        $args['extraArguments'] = array();
+        array_shift($argv); // scriptname
+        foreach ($argv as $arg) {
+            if (ereg('^--([^=]+)=(.*)', $arg, $reg)) {
+                $args[$reg[1]] = $reg[2];
+                if ($mutliValueMode) {
+                    self::addItemAsArray($args, $reg[1], $reg[2]);
+                }
+            } elseif (ereg('^[-]{1,2}([^[:blank:]]+)', $arg, $reg)) {
+                $nonnull = '';
+                $args[$reg[1]] = $nonnull;
+                if ($mutliValueMode) {
+                    self::addItemAsArray($args, $reg[1], $nonnull);
+                }
+            } else {
+                $args['extraArguments'][] = $arg;
+            }
+        }
+
+        return $args;
+    }
+
+    /**
+     * Adds a value as an array of one, or appends to an existing array elements
+     *
+     * @param unknown_type $array
+     * @param unknown_type $item
+     */
+    static function addItemAsArray(&$array, $key, $item) {
+        $array_key = $key .'[]';
+        if (array_key_exists($array_key, $array)) {
+            $array[$array_key][] = $item;
+        } else {
+            $array[$array_key] = array($item);
+        }
+    }
+
+    /**
+     * isset function with default value
+     *
+     * Example:  $z = CoverageUtils::issetOr($array[$key], 'no value given')
+     *
+     * @param unknown_type $val
+     * @param unknown_type $default
+     * @return first value unless value is not set then returns 2nd arg or null if no 2nd arg
+     */
+    static public function issetOr(&$val, $default = null)
+    {
+        return isset($val) ? $val : $default;
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/extensions/coverage/coverage_writer.php b/3rdparty/simpletest/extensions/coverage/coverage_writer.php
new file mode 100644
index 0000000000..0a8519cb50
--- /dev/null
+++ b/3rdparty/simpletest/extensions/coverage/coverage_writer.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * @package        SimpleTest
+ * @subpackage     Extensions
+ */
+/**
+ * @package        SimpleTest
+ * @subpackage     Extensions
+ */
+interface CoverageWriter {
+
+    function writeSummary($out, $variables);
+
+    function writeByFile($out, $variables);
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/extensions/coverage/simple_coverage_writer.php b/3rdparty/simpletest/extensions/coverage/simple_coverage_writer.php
new file mode 100644
index 0000000000..7eb73fc8ab
--- /dev/null
+++ b/3rdparty/simpletest/extensions/coverage/simple_coverage_writer.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ *  SimpleCoverageWriter class file
+ *  @package    SimpleTest
+ *  @subpackage UnitTester
+ *  @version    $Id: unit_tester.php 1882 2009-07-01 14:30:05Z lastcraft $
+ */
+/**
+ * base coverage writer class
+ */
+require_once dirname(__FILE__) .'/coverage_writer.php';
+
+/**
+ *  SimpleCoverageWriter class
+ *  @package    SimpleTest
+ *  @subpackage UnitTester
+ */
+class SimpleCoverageWriter implements CoverageWriter {
+
+    function writeSummary($out, $variables) {
+        extract($variables);
+        $now = date("F j, Y, g:i a");
+        ob_start();
+        include dirname(__FILE__) . '/templates/index.php';
+        $contents = ob_get_contents();
+        fwrite ($out, $contents);
+        ob_end_clean();
+    }
+
+    function writeByFile($out, $variables) {
+        extract($variables);
+        ob_start();
+        include dirname(__FILE__) . '/templates/file.php';
+        $contents = ob_get_contents();
+        fwrite ($out, $contents);
+        ob_end_clean();
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/extensions/coverage/templates/file.php b/3rdparty/simpletest/extensions/coverage/templates/file.php
new file mode 100644
index 0000000000..70f6903068
--- /dev/null
+++ b/3rdparty/simpletest/extensions/coverage/templates/file.php
@@ -0,0 +1,60 @@
+<html>
+<head>
+<title><?php echo $title ?></title>
+</head>
+<style type="text/css">
+body {
+  font-family: "Gill Sans MT", "Gill Sans", GillSans, Arial, Helvetica, sans-serif;
+}
+h1 {
+  font-size: medium;
+}
+#code {
+  border-spacing: 0;
+}
+.lineNo {
+  color: #ccc;
+}
+.code, .lineNo {
+  white-space: pre;
+  font-family: monospace;
+}
+.covered {
+  color: #090;
+}
+.missed {
+  color: #f00;
+}
+.dead {
+  color: #00f;
+}
+.comment {
+  color: #333;
+}
+</style>
+<body>
+<h1 id="title"><?php echo $title ?></h1>
+<table id="code">
+  <tbody>
+<?php foreach ($lines as $lineNo => $line) { ?>
+    <tr>
+       <td><span class="lineNo"><?php echo $lineNo ?></span></td>
+       <td><span class="<?php echo $line['lineCoverage'] ?> code"><?php echo htmlentities($line['code']) ?></span></td>
+    </tr>
+<?php } ?>
+  </tbody>
+</table>
+<h2>Legend</h2>
+<dl>
+  <dt><span class="missed">Missed</span></dt>
+  <dd>lines code that <strong>were not</strong> excersized during program execution.</dd>
+  <dt><span class="covered">Covered</span></dt>
+  <dd>lines code <strong>were</strong> excersized during program execution.</dd>
+  <dt><span class="comment">Comment/non executable</span></dt>
+  <dd>Comment or non-executable line of code.</dd>
+  <dt><span class="dead">Dead</span></dt>
+  <dd>lines of code that according to xdebug could not be executed.  This is counted as coverage code because 
+  in almost all cases it is code that runnable.</dd>
+</dl>
+</body>
+</html>
diff --git a/3rdparty/simpletest/extensions/coverage/templates/index.php b/3rdparty/simpletest/extensions/coverage/templates/index.php
new file mode 100644
index 0000000000..e4374e2380
--- /dev/null
+++ b/3rdparty/simpletest/extensions/coverage/templates/index.php
@@ -0,0 +1,106 @@
+<html>
+<head>
+<title><?php echo $title ?></title>
+</head>
+<style type="text/css">
+h1 {
+	font-size: medium;
+}
+
+body {
+	font-family: "Gill Sans MT", "Gill Sans", GillSans, Arial, Helvetica,
+		sans-serif;
+}
+
+td.percentage {
+	text-align: right;
+}
+
+caption {
+	border-bottom: thin solid;
+	font-weight: bolder;
+}
+
+dt {
+	font-weight: bolder;
+}
+
+table {
+	margin: 1em;
+}
+</style>
+<body>
+<h1 id="title"><?php echo $title ?></h1>
+<table>
+	<caption>Summary</caption>
+	<tbody>
+		<tr>
+			<td>Total Coverage (<a href="#total-coverage">?</a>) :</td>
+			<td class="percentage"><span class="totalPercentCoverage"><?php echo number_format($totalPercentCoverage, 0) ?>%</span></td>
+		</tr>
+		<tr>
+			<td>Total Files Covered (<a href="#total-files-covered">?</a>) :</td>
+			<td class="percentage"><span class="filesTouchedPercentage"><?php  echo number_format($filesTouchedPercentage, 0) ?>%</span></td>
+		</tr>
+		<tr>
+			<td>Report Generation Date :</td>
+			<td><?php echo $now ?></td>
+		</tr>
+	</tbody>
+</table>
+<table id="covered-files">
+	<caption>Coverage (<a href="#coverage">?</a>)</caption>
+	<thead>
+		<tr>
+			<th>File</th>
+			<th>Coverage</th>
+		</tr>
+	</thead>
+	<tbody>
+		<?php foreach ($coverageByFile as $file => $coverage) { ?>
+		<tr>
+			<td><a class="byFileReportLink" href="<?php echo $coverage['byFileReport']  ?>"><?php echo $file ?></a></td>
+			<td class="percentage"><span class="percentCoverage"><?php echo number_format($coverage['percentage'], 0) ?>%</span></td>
+		</tr>
+		<?php } ?>
+	</tbody>
+</table>
+<table>
+	<caption>Files Not Covered (<a href="#untouched">?</a>)</caption>
+	<tbody>
+		<?php foreach ($untouched as $key => $file) { ?>
+		<tr>
+			<td><span class="untouchedFile"><?php echo $file ?></span></td>
+		</tr>
+		<?php } ?>
+	</tbody>
+</table>
+
+<h2>Glossary</h2>
+<dl>
+	<dt><a name="total-coverage">Total Coverage</a></dt>
+	<dd>Ratio of all the lines of executable code that were executed to the
+	lines of code that were not executed. This does not include the files
+	that were not covered at all.</dd>
+	<dt><a name="total-files-covered">Total Files Covered</a></dt>
+	<dd>This is the ratio of the number of files tested, to the number of
+	files not tested at all.</dd>
+	<dt><a name="coverage">Coverage</a></dt>
+	<dd>These files were parsed and loaded by the php interpreter while
+	running the tests. Percentage is determined by the ratio of number of
+	lines of code executed to the number of possible executable lines of
+	code. "dead" lines of code, or code that could not be executed
+	according to xdebug, are counted as covered because in almost all cases
+	it is the end of a logical loop.</dd>
+	<dt><a name="untouched">Files Not Covered</a></dt>
+	<dd>These files were not loaded by the php interpreter at anytime
+	during a unit test. You could consider these files having 0% coverage,
+	but because it is difficult to determine the total coverage unless you
+	could count the lines for executable code, this is not reflected in the
+	Total Coverage calculation.</dd>
+</dl>
+
+<p>Code coverage generated by <a href="http://www.simpletest.org">SimpleTest</a></p>
+
+</body>
+</html>
diff --git a/3rdparty/simpletest/extensions/coverage/test/coverage_calculator_test.php b/3rdparty/simpletest/extensions/coverage/test/coverage_calculator_test.php
new file mode 100644
index 0000000000..64bd8d463f
--- /dev/null
+++ b/3rdparty/simpletest/extensions/coverage/test/coverage_calculator_test.php
@@ -0,0 +1,65 @@
+<?php
+require_once(dirname(__FILE__) . '/../../../autorun.php');
+
+class CoverageCalculatorTest extends UnitTestCase {
+    function skip() {
+        $this->skipIf(
+        		!file_exists('DB/sqlite.php'),
+                'The Coverage extension needs to have PEAR installed');
+    }
+    
+	function setUp() {
+       	require_once dirname(__FILE__) .'/../coverage_calculator.php';
+        $this->calc = new CoverageCalculator();
+    }
+
+    function testVariables() {
+        $coverage = array('file' => array(1,1,1,1));
+        $untouched = array('missed-file');
+        $variables = $this->calc->variables($coverage, $untouched);
+        $this->assertEqual(4, $variables['totalLoc']);
+        $this->assertEqual(100, $variables['totalPercentCoverage']);
+        $this->assertEqual(4, $variables['totalLinesOfCoverage']);
+        $expected = array('file' => array('byFileReport' => 'file.html', 'percentage' => 100));
+        $this->assertEqual($expected, $variables['coverageByFile']);
+        $this->assertEqual(50, $variables['filesTouchedPercentage']);
+        $this->assertEqual($untouched, $variables['untouched']);
+    }
+
+    function testPercentageCoverageByFile() {
+        $coverage = array(0,0,0,1,1,1);
+        $results = array();
+        $this->calc->percentCoverageByFile($coverage, 'file', $results);
+        $pct = $results[0];
+        $this->assertEqual(50, $pct['file']['percentage']);
+        $this->assertEqual('file.html', $pct['file']['byFileReport']);
+    }
+
+    function testTotalLoc() {
+        $this->assertEqual(13, $this->calc->totalLoc(10, array(1,2,3)));
+    }
+
+    function testLineCoverage() {
+        $this->assertEqual(10, $this->calc->lineCoverage(10, -1));
+        $this->assertEqual(10, $this->calc->lineCoverage(10, 0));
+        $this->assertEqual(11, $this->calc->lineCoverage(10, 1));
+    }
+
+    function testTotalCoverage() {
+        $this->assertEqual(11, $this->calc->totalCoverage(10, array(-1,1)));
+    }
+
+    static function getAttribute($element, $attribute) {
+        $a = $element->attributes();
+        return $a[$attribute];
+    }
+
+    static function dom($stream) {
+        rewind($stream);
+        $actual = stream_get_contents($stream);
+        $html = DOMDocument::loadHTML($actual);
+        return simplexml_import_dom($html);
+    }
+}
+
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/extensions/coverage/test/coverage_data_handler_test.php b/3rdparty/simpletest/extensions/coverage/test/coverage_data_handler_test.php
new file mode 100644
index 0000000000..54c67a4a7b
--- /dev/null
+++ b/3rdparty/simpletest/extensions/coverage/test/coverage_data_handler_test.php
@@ -0,0 +1,83 @@
+<?php
+require_once(dirname(__FILE__) . '/../../../autorun.php');
+
+class CoverageDataHandlerTest extends UnitTestCase {
+    function skip() {
+        $this->skipIf(
+        		!file_exists('DB/sqlite.php'),
+                'The Coverage extension needs to have PEAR installed');
+    }
+    
+	function setUp() {
+       	require_once dirname(__FILE__) .'/../coverage_data_handler.php';
+    }
+
+    function testAggregateCoverageCode() {
+        $handler = new CoverageDataHandler($this->tempdb());
+        $this->assertEqual(-2, $handler->aggregateCoverageCode(-2, -2));
+        $this->assertEqual(-2, $handler->aggregateCoverageCode(-2, 10));
+        $this->assertEqual(-2, $handler->aggregateCoverageCode(10, -2));
+        $this->assertEqual(-1, $handler->aggregateCoverageCode(-1, -1));
+        $this->assertEqual(10, $handler->aggregateCoverageCode(-1, 10));
+        $this->assertEqual(10, $handler->aggregateCoverageCode(10, -1));
+        $this->assertEqual(20, $handler->aggregateCoverageCode(10, 10));
+    }
+
+    function testSimpleWriteRead() {
+        $handler = new CoverageDataHandler($this->tempdb());
+        $handler->createSchema();
+        $coverage = array(10 => -2, 20 => -1, 30 => 0, 40 => 1);
+        $handler->write(array('file' => $coverage));
+
+        $actual = $handler->readFile('file');
+        $expected = array(10 => -2, 20 => -1, 30 => 0, 40 => 1);
+        $this->assertEqual($expected, $actual);
+    }
+
+    function testMultiFileWriteRead() {
+        $handler = new CoverageDataHandler($this->tempdb());
+        $handler->createSchema();
+        $handler->write(array(
+    	'file1' => array(-2, -1, 1), 
+    	'file2' => array(-2, -1, 1)
+        ));
+        $handler->write(array(
+    	'file1' => array(-2, -1, 1)
+        ));
+
+        $expected = array(
+    	'file1' => array(-2, -1, 2),
+    	'file2' => array(-2, -1, 1)
+        );
+        $actual = $handler->read();
+        $this->assertEqual($expected, $actual);
+    }
+
+    function testGetfilenames() {
+        $handler = new CoverageDataHandler($this->tempdb());
+        $handler->createSchema();
+        $rawCoverage = array('file0' => array(), 'file1' => array());
+        $handler->write($rawCoverage);
+        $actual = $handler->getFilenames();
+        $this->assertEqual(array('file0', 'file1'), $actual);
+    }
+
+    function testWriteUntouchedFiles() {
+        $handler = new CoverageDataHandler($this->tempdb());
+        $handler->createSchema();
+        $handler->writeUntouchedFile('bluejay');
+        $handler->writeUntouchedFile('robin');
+        $this->assertEqual(array('bluejay', 'robin'), $handler->readUntouchedFiles());
+    }
+
+    function testLtrim() {
+        $this->assertEqual('ber', CoverageDataHandler::ltrim('goo', 'goober'));
+        $this->assertEqual('some/file', CoverageDataHandler::ltrim('./', './some/file'));
+        $this->assertEqual('/x/y/z/a/b/c', CoverageDataHandler::ltrim('/a/b/', '/x/y/z/a/b/c'));
+    }
+
+    function tempdb() {
+        return tempnam(NULL, 'coverage.test.db');
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/extensions/coverage/test/coverage_reporter_test.php b/3rdparty/simpletest/extensions/coverage/test/coverage_reporter_test.php
new file mode 100644
index 0000000000..a8b09962a0
--- /dev/null
+++ b/3rdparty/simpletest/extensions/coverage/test/coverage_reporter_test.php
@@ -0,0 +1,22 @@
+<?php
+require_once(dirname(__FILE__) . '/../../../autorun.php');
+
+class CoverageReporterTest extends UnitTestCase {
+    function skip() {
+        $this->skipIf(
+        		!file_exists('DB/sqlite.php'),
+                'The Coverage extension needs to have PEAR installed');
+    }
+	
+	function setUp() {
+        require_once dirname(__FILE__) .'/../coverage_reporter.php';
+        new CoverageReporter();
+    }
+
+    function testreportFilename() {
+        $this->assertEqual("parula.php.html", CoverageReporter::reportFilename("parula.php"));
+        $this->assertEqual("warbler_parula.php.html", CoverageReporter::reportFilename("warbler/parula.php"));
+        $this->assertEqual("warbler_parula.php.html", CoverageReporter::reportFilename("warbler\\parula.php"));
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/extensions/coverage/test/coverage_test.php b/3rdparty/simpletest/extensions/coverage/test/coverage_test.php
new file mode 100644
index 0000000000..f09d03f78a
--- /dev/null
+++ b/3rdparty/simpletest/extensions/coverage/test/coverage_test.php
@@ -0,0 +1,109 @@
+<?php
+require_once(dirname(__FILE__) . '/../../../autorun.php');
+require_once(dirname(__FILE__) . '/../../../mock_objects.php');
+
+class CodeCoverageTest extends UnitTestCase {
+    function skip() {
+        $this->skipIf(
+        		!file_exists('DB/sqlite.php'),
+                'The Coverage extension needs to have PEAR installed');
+    }
+	
+	function setUp() {
+        require_once dirname(__FILE__) .'/../coverage.php';
+    }
+	
+    function testIsFileIncluded() {
+        $coverage = new CodeCoverage();
+        $this->assertTrue($coverage->isFileIncluded('aaa'));
+        $coverage->includes = array('a');
+        $this->assertTrue($coverage->isFileIncluded('aaa'));
+        $coverage->includes = array('x');
+        $this->assertFalse($coverage->isFileIncluded('aaa'));
+        $coverage->excludes = array('aa');
+        $this->assertFalse($coverage->isFileIncluded('aaa'));
+    }
+
+    function testIsFileIncludedRegexp() {
+        $coverage = new CodeCoverage();
+        $coverage->includes = array('modules/.*\.php$');
+        $coverage->excludes = array('bad-bunny.php');
+        $this->assertFalse($coverage->isFileIncluded('modules/a.test'));
+        $this->assertFalse($coverage->isFileIncluded('modules/bad-bunny.test'));
+        $this->assertTrue($coverage->isFileIncluded('modules/test.php'));
+        $this->assertFalse($coverage->isFileIncluded('module-bad/good-bunny.php'));
+        $this->assertTrue($coverage->isFileIncluded('modules/good-bunny.php'));
+    }
+
+    function testIsDirectoryIncludedPastMaxDepth() {
+        $coverage = new CodeCoverage();
+        $coverage->maxDirectoryDepth = 5;
+        $this->assertTrue($coverage->isDirectoryIncluded('aaa', 1));
+        $this->assertFalse($coverage->isDirectoryIncluded('aaa', 5));
+    }
+
+    function testIsDirectoryIncluded() {
+        $coverage = new CodeCoverage();
+        $this->assertTrue($coverage->isDirectoryIncluded('aaa', 0));
+        $coverage->excludes = array('b$');
+        $this->assertTrue($coverage->isDirectoryIncluded('aaa', 0));
+        $coverage->includes = array('a$'); // includes are ignore, all dirs are included unless excluded
+        $this->assertTrue($coverage->isDirectoryIncluded('aaa', 0));
+        $coverage->excludes = array('.*a$');
+        $this->assertFalse($coverage->isDirectoryIncluded('aaa', 0));
+    }
+
+    function testFilter() {
+        $coverage = new CodeCoverage();
+        $data = array('a' => 0, 'b' => 0, 'c' => 0);
+        $coverage->includes = array('b');
+        $coverage->filter($data);
+        $this->assertEqual(array('b' => 0), $data);
+    }
+
+    function testUntouchedFiles() {
+        $coverage = new CodeCoverage();
+        $touched = array_flip(array("test/coverage_test.php"));
+        $actual = array();
+        $coverage->includes = array('coverage_test\.php$');
+        $parentDir = realpath(dirname(__FILE__));
+        $coverage->getUntouchedFiles($actual, $touched, $parentDir, $parentDir);
+        $this->assertEqual(array("coverage_test.php"), $actual);
+    }
+
+    function testResetLog() {
+        $coverage = new CodeCoverage();
+        $coverage->log = tempnam(NULL, 'php.xdebug.coverage.test.');
+        $coverage->resetLog();
+        $this->assertTrue(file_exists($coverage->log));
+    }
+
+    function testSettingsSerialization() {
+        $coverage = new CodeCoverage();
+        $coverage->log = '/banana/boat';
+        $coverage->includes = array('apple', 'orange');
+        $coverage->excludes = array('tomato', 'pea');
+        $data = $coverage->getSettings();
+        $this->assertNotNull($data);
+
+        $actual = new CodeCoverage();
+        $actual->setSettings($data);
+        $this->assertEqual('/banana/boat', $actual->log);
+        $this->assertEqual(array('apple', 'orange'), $actual->includes);
+        $this->assertEqual(array('tomato', 'pea'), $actual->excludes);
+    }
+
+    function testSettingsCanBeReadWrittenToDisk() {
+        $settings_file = 'banana-boat-coverage-settings-test.dat';
+        $coverage = new CodeCoverage();
+        $coverage->log = '/banana/boat';
+        $coverage->settingsFile = $settings_file;
+        $coverage->writeSettings();
+
+        $actual = new CodeCoverage();
+        $actual->settingsFile = $settings_file;
+        $actual->readSettings();
+        $this->assertEqual('/banana/boat', $actual->log);
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/extensions/coverage/test/coverage_utils_test.php b/3rdparty/simpletest/extensions/coverage/test/coverage_utils_test.php
new file mode 100644
index 0000000000..b900c5d2c4
--- /dev/null
+++ b/3rdparty/simpletest/extensions/coverage/test/coverage_utils_test.php
@@ -0,0 +1,70 @@
+<?php
+require_once dirname(__FILE__) . '/../../../autorun.php';
+
+class CoverageUtilsTest extends UnitTestCase {
+    function skip() {
+        $this->skipIf(
+        		!file_exists('DB/sqlite.php'),
+                'The Coverage extension needs to have PEAR installed');
+    }
+	
+	function setUp() {
+    	require_once dirname(__FILE__) .'/../coverage_utils.php';
+	}
+	
+    function testMkdir() {
+        CoverageUtils::mkdir(dirname(__FILE__));
+        try {
+            CoverageUtils::mkdir(__FILE__);
+            $this->fail("Should give error about cannot create dir of a file");
+        } catch (Exception $expected) {
+        }
+    }
+
+    function testIsPackageClassAvailable() {
+        $coverageSource = dirname(__FILE__) .'/../coverage_calculator.php';
+        $this->assertTrue(CoverageUtils::isPackageClassAvailable($coverageSource, 'CoverageCalculator'));
+        $this->assertFalse(CoverageUtils::isPackageClassAvailable($coverageSource, 'BogusCoverage'));
+        $this->assertFalse(CoverageUtils::isPackageClassAvailable('bogus-file', 'BogusCoverage'));
+        $this->assertTrue(CoverageUtils::isPackageClassAvailable('bogus-file', 'CoverageUtils'));
+    }
+
+    function testParseArgumentsMultiValue() {
+        $actual = CoverageUtils::parseArguments(array('scriptname', '--a=b', '--a=c'), True);
+        $expected = array('extraArguments' => array(), 'a' => 'c', 'a[]' => array('b', 'c'));
+        $this->assertEqual($expected, $actual);
+    }
+
+    function testParseArguments() {
+        $actual = CoverageUtils::parseArguments(array('scriptname', '--a=b', '-c', 'xxx'));
+        $expected = array('a' => 'b', 'c' => '', 'extraArguments' => array('xxx'));
+        $this->assertEqual($expected, $actual);
+    }
+
+    function testParseDoubleDashNoArguments() {
+        $actual = CoverageUtils::parseArguments(array('scriptname', '--aa'));
+        $this->assertTrue(isset($actual['aa']));
+    }
+
+    function testParseHyphenedExtraArguments() {
+        $actual = CoverageUtils::parseArguments(array('scriptname', '--alpha-beta=b', 'gamma-lambda'));
+        $expected = array('alpha-beta' => 'b', 'extraArguments' => array('gamma-lambda'));
+        $this->assertEqual($expected, $actual);
+    }
+
+    function testAddItemAsArray() {
+        $actual = array();
+        CoverageUtils::addItemAsArray($actual, 'bird', 'duck');
+        $this->assertEqual(array('bird[]' => array('duck')), $actual);
+
+        CoverageUtils::addItemAsArray(&$actual, 'bird', 'pigeon');
+        $this->assertEqual(array('bird[]' => array('duck', 'pigeon')), $actual);
+    }
+
+    function testIssetOr() {
+        $data = array('bird' => 'gull');
+        $this->assertEqual('lab', CoverageUtils::issetOr($data['dog'], 'lab'));
+        $this->assertEqual('gull', CoverageUtils::issetOr($data['bird'], 'sparrow'));
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/extensions/coverage/test/sample/code.php b/3rdparty/simpletest/extensions/coverage/test/sample/code.php
new file mode 100644
index 0000000000..a2438f4bee
--- /dev/null
+++ b/3rdparty/simpletest/extensions/coverage/test/sample/code.php
@@ -0,0 +1,4 @@
+<?php
+// sample code
+$x = 1 + 2;
+if (false) echo "dead";
\ No newline at end of file
diff --git a/3rdparty/simpletest/extensions/coverage/test/simple_coverage_writer_test.php b/3rdparty/simpletest/extensions/coverage/test/simple_coverage_writer_test.php
new file mode 100644
index 0000000000..2c9f9abc18
--- /dev/null
+++ b/3rdparty/simpletest/extensions/coverage/test/simple_coverage_writer_test.php
@@ -0,0 +1,69 @@
+<?php
+require_once(dirname(__FILE__) . '/../../../autorun.php');
+
+class SimpleCoverageWriterTest extends UnitTestCase {
+	function skip() {
+        $this->skipIf(
+        		!file_exists('DB/sqlite.php'),
+                'The Coverage extension needs to have PEAR installed');
+    }
+		
+	function setUp() {
+		require_once dirname(__FILE__) .'/../simple_coverage_writer.php';
+		require_once dirname(__FILE__) .'/../coverage_calculator.php';
+		
+	}
+
+	function testGenerateSummaryReport() {
+        $writer = new SimpleCoverageWriter();
+        $coverage = array('file' => array(0, 1));
+        $untouched = array('missed-file');
+        $calc = new CoverageCalculator();
+        $variables = $calc->variables($coverage, $untouched);
+        $variables['title'] = 'coverage';
+        $out = fopen("php://memory", 'w');
+        $writer->writeSummary($out, $variables);
+        $dom = self::dom($out);
+        $totalPercentCoverage = $dom->elements->xpath("//span[@class='totalPercentCoverage']");
+        $this->assertEqual('50%', (string)$totalPercentCoverage[0]);
+
+        $fileLinks = $dom->elements->xpath("//a[@class='byFileReportLink']");
+        $fileLinkAttr = $fileLinks[0]->attributes();
+        $this->assertEqual('file.html', $fileLinkAttr['href']);
+        $this->assertEqual('file', (string)($fileLinks[0]));
+
+        $untouchedFile = $dom->elements->xpath("//span[@class='untouchedFile']");
+        $this->assertEqual('missed-file', (string)$untouchedFile[0]);
+    }
+
+    function testGenerateCoverageByFile() {
+        $writer = new SimpleCoverageWriter();
+        $cov = array(3 => 1, 4 => -2); // 2 comments, 1 code, 1 dead  (1-based indexes)
+        $out = fopen("php://memory", 'w');
+        $file = dirname(__FILE__) .'/sample/code.php';
+        $calc = new CoverageCalculator();
+        $variables = $calc->coverageByFileVariables($file, $cov);
+        $variables['title'] = 'coverage';
+        $writer->writeByFile($out, $variables);
+        $dom = self::dom($out);
+
+        $cells = $dom->elements->xpath("//table[@id='code']/tbody/tr/td/span");
+        $this->assertEqual("comment code", self::getAttribute($cells[1], 'class'));
+        $this->assertEqual("comment code", self::getAttribute($cells[3], 'class'));
+        $this->assertEqual("covered code", self::getAttribute($cells[5], 'class'));
+        $this->assertEqual("dead code", self::getAttribute($cells[7], 'class'));
+    }
+
+    static function getAttribute($element, $attribute) {
+        $a = $element->attributes();
+        return $a[$attribute];
+    }
+
+    static function dom($stream) {
+        rewind($stream);
+        $actual = stream_get_contents($stream);
+        $html = DOMDocument::loadHTML($actual);
+        return simplexml_import_dom($html);
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/extensions/coverage/test/test.php b/3rdparty/simpletest/extensions/coverage/test/test.php
new file mode 100644
index 0000000000..0af4dbf3e7
--- /dev/null
+++ b/3rdparty/simpletest/extensions/coverage/test/test.php
@@ -0,0 +1,14 @@
+<?php
+// $Id: $
+require_once(dirname(__FILE__) . '/../../../autorun.php');
+
+class CoverageUnitTests extends TestSuite {
+    function CoverageUnitTests() {
+        $this->TestSuite('Coverage Unit tests');
+        $path = dirname(__FILE__) . '/*_test.php';
+        foreach(glob($path) as $test) {
+            $this->addFile($test);
+        }
+    }
+}
+?>
\ No newline at end of file
diff --git a/README b/README
index 77379a4645..7c60e81a7b 100644
--- a/README
+++ b/README
@@ -5,9 +5,9 @@ http://ownCloud.org
 
 Installation instructions: http://owncloud.org/support
 
-Source code: http://gitorious.org/owncloud
-Mailing list: http://mail.kde.org/mailman/listinfo/owncloud
-IRC channel: http://webchat.freenode.net/?channels=owncloud
+Source code: https://github.com/owncloud
+Mailing list: https://mail.kde.org/mailman/listinfo/owncloud
+IRC channel: https://webchat.freenode.net/?channels=owncloud
 Diaspora: https://joindiaspora.com/u/owncloud
-Identi.ca: http://identi.ca/owncloud
+Identi.ca: https://identi.ca/owncloud
 
diff --git a/apps/admin_audit/appinfo/app.php b/apps/admin_audit/appinfo/app.php
deleted file mode 100644
index 2cbed5bf57..0000000000
--- a/apps/admin_audit/appinfo/app.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-OC::$CLASSPATH['OC_Admin_Audit_Hooks_Handlers'] = 'apps/admin_audit/lib/hooks_handlers.php';
-
-OCP\Util::connectHook('OCP\User', 'pre_login', 'OC_Admin_Audit_Hooks_Handlers', 'pre_login');
-OCP\Util::connectHook('OCP\User', 'post_login', 'OC_Admin_Audit_Hooks_Handlers', 'post_login');
-OCP\Util::connectHook('OCP\User', 'logout', 'OC_Admin_Audit_Hooks_Handlers', 'logout');
-
-OCP\Util::connectHook(OC_Filesystem::CLASSNAME, OC_Filesystem::signal_rename, 'OC_Admin_Audit_Hooks_Handlers', 'rename');
-OCP\Util::connectHook(OC_Filesystem::CLASSNAME, OC_Filesystem::signal_create, 'OC_Admin_Audit_Hooks_Handlers', 'create');
-OCP\Util::connectHook(OC_Filesystem::CLASSNAME, OC_Filesystem::signal_copy, 'OC_Admin_Audit_Hooks_Handlers', 'copy');
-OCP\Util::connectHook(OC_Filesystem::CLASSNAME, OC_Filesystem::signal_write, 'OC_Admin_Audit_Hooks_Handlers', 'write');
-OCP\Util::connectHook(OC_Filesystem::CLASSNAME, OC_Filesystem::signal_read, 'OC_Admin_Audit_Hooks_Handlers', 'read');
-OCP\Util::connectHook(OC_Filesystem::CLASSNAME, OC_Filesystem::signal_delete, 'OC_Admin_Audit_Hooks_Handlers', 'delete');
-
-//FIXME OC_Share does no longer exist
-/*
-OCP\Util::connectHook('OC_Share', 'public', 'OC_Admin_Audit_Hooks_Handlers', 'share_public');
-OCP\Util::connectHook('OC_Share', 'public-download', 'OC_Admin_Audit_Hooks_Handlers', 'share_public_download');
-OCP\Util::connectHook('OC_Share', 'user', 'OC_Admin_Audit_Hooks_Handlers', 'share_user');
-*/
\ No newline at end of file
diff --git a/apps/admin_audit/appinfo/info.xml b/apps/admin_audit/appinfo/info.xml
deleted file mode 100644
index 4fa013162f..0000000000
--- a/apps/admin_audit/appinfo/info.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<info>
-	<id>admin_audit</id>
-	<name>Log audit info</name>
-	<version>0.1</version>
-	<licence>AGPL</licence>
-	<author>Bart Visscher</author>
-	<require>4</require>
-	<description>Audit user actions in Owncloud</description>
-	<shipped>true</shipped>
-</info>
diff --git a/apps/admin_audit/lib/hooks_handlers.php b/apps/admin_audit/lib/hooks_handlers.php
deleted file mode 100644
index 17a553837d..0000000000
--- a/apps/admin_audit/lib/hooks_handlers.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-
-class OC_Admin_Audit_Hooks_Handlers {
-	static public function pre_login($params) {
-		$path = $params['uid'];
-		self::log('Trying login '.$user);
-	}
-	static public function post_login($params) {
-		$path = $params['uid'];
-		self::log('Login '.$user);
-	}
-	static public function logout($params) {
-		$user = OCP\User::getUser();
-		self::log('Logout '.$user);
-	}
-
-	static public function rename($params) {
-		$oldpath = $params[OC_Filesystem::signal_param_oldpath];
-		$newpath = $params[OC_Filesystem::signal_param_newpath];
-		$user = OCP\User::getUser();
-		self::log('Rename "'.$oldpath.'" to "'.$newpath.'" by '.$user);
-	}
-	static public function create($params) {
-		$path = $params[OC_Filesystem::signal_param_path];
-		$user = OCP\User::getUser();
-		self::log('Create "'.$path.'" by '.$user);
-	}
-	static public function copy($params) {
-		$oldpath = $params[OC_Filesystem::signal_param_oldpath];
-		$newpath = $params[OC_Filesystem::signal_param_newpath];
-		$user = OCP\User::getUser();
-		self::log('Copy "'.$oldpath.'" to "'.$newpath.'" by '.$user);
-	}
-	static public function write($params) {
-		$path = $params[OC_Filesystem::signal_param_path];
-		$user = OCP\User::getUser();
-		self::log('Write "'.$path.'" by '.$user);
-	}
-	static public function read($params) {
-		$path = $params[OC_Filesystem::signal_param_path];
-		$user = OCP\User::getUser();
-		self::log('Read "'.$path.'" by '.$user);
-	}
-	static public function delete($params) {
-		$path = $params[OC_Filesystem::signal_param_path];
-		$user = OCP\User::getUser();
-		self::log('Delete "'.$path.'" by '.$user);
-	}
-	static public function share_public($params) {
-		$path = $params['source'];
-		$token = $params['token'];
-		$user = OCP\User::getUser();
-		self::log('Shared "'.$path.'" with public, token="'.$token.'" by '.$user);
-	}
-	static public function share_public_download($params) {
-		$path = $params['source'];
-		$token = $params['token'];
-		$user = $_SERVER['REMOTE_ADDR'];
-		self::log('Download of shared "'.$path.'" token="'.$token.'" by '.$user);
-	}
-	static public function share_user($params) {
-		$path = $params['source'];
-		$permissions = $params['permissions'];
-		$with = $params['with'];
-		$user = OCP\User::getUser();
-		//$rw = $permissions & OC_Share::WRITE ? 'w' : 'o'; //FIXME OC_Share no longer exists, hack to check permissions
-		$rw = $permissions & 1 ? 'w' : 'o';
-		self::log('Shared "'.$path.'" (r'.$rw.') with user "'.$with.'" by '.$user);
-	}
-	static protected function log($msg) {
-		OCP\Util::writeLog('admin_audit', $msg, OCP\Util::INFO);
-	}
-}
diff --git a/apps/admin_dependencies_chk/appinfo/app.php b/apps/admin_dependencies_chk/appinfo/app.php
deleted file mode 100644
index 62b26342d2..0000000000
--- a/apps/admin_dependencies_chk/appinfo/app.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-$l=OC_L10N::get('admin_dependencies_chk');
-
-OCP\App::registerAdmin('admin_dependencies_chk','settings');
diff --git a/apps/admin_dependencies_chk/appinfo/info.xml b/apps/admin_dependencies_chk/appinfo/info.xml
deleted file mode 100644
index 90ea72bf4b..0000000000
--- a/apps/admin_dependencies_chk/appinfo/info.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0"?> 
-<info>
-	<id>admin_dependencies_chk</id>
-	<name>ownCloud dependencies info</name>
-	<licence>AGPL</licence>
-	<author>Brice Maron (eMerzh)</author>
-	<require>4</require>
-	<shipped>true</shipped>
-	<description>Display OwnCloud's dependencies informations (missings modules, ...)</description>
-</info>
diff --git a/apps/admin_dependencies_chk/appinfo/version b/apps/admin_dependencies_chk/appinfo/version
deleted file mode 100644
index d1c6331b31..0000000000
--- a/apps/admin_dependencies_chk/appinfo/version
+++ /dev/null
@@ -1 +0,0 @@
-0.01
\ No newline at end of file
diff --git a/apps/admin_dependencies_chk/css/style.css b/apps/admin_dependencies_chk/css/style.css
deleted file mode 100644
index 30f204be7b..0000000000
--- a/apps/admin_dependencies_chk/css/style.css
+++ /dev/null
@@ -1,9 +0,0 @@
-#status_list legend { font-weight: bold; color: #888888; }
-.state > li { margin-bottom: 3px; padding-left: 0.5em; list-style-type: circle; }
-.state .state_module {  font-weight:bold; text-shadow: 0 1px 0 #DDD; cursor:help;}
-
-.state_used ul,  .state_used li { display:inline;   }
-
-.state_ok .state_module	{ color: #009700; }
-.state_warning .state_module	{ color: #FF9B29; }
-.state_error .state_module	{ color: #FF3B3B; }
diff --git a/apps/admin_dependencies_chk/l10n/.gitkeep b/apps/admin_dependencies_chk/l10n/.gitkeep
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/apps/admin_dependencies_chk/l10n/ca.php b/apps/admin_dependencies_chk/l10n/ca.php
deleted file mode 100644
index 08f4ec8078..0000000000
--- a/apps/admin_dependencies_chk/l10n/ca.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php $TRANSLATIONS = array(
-"The php-json module is needed by the many applications for inter communications" => "El mòdul php-json és necessari per moltes aplicacions per comunicacions internes",
-"The php-curl modude is needed to fetch the page title when adding a bookmarks" => "El mòdul php-curl és necessari per mostrar el títol de la pàgina quan s'afegeixen adreces d'interès",
-"The php-gd module is needed to create thumbnails of your images" => "El mòdul php-gd és necessari per generar miniatures d'imatges",
-"The php-ldap module is needed connect to your ldap server" => "El mòdul php-ldap és necessari per connectar amb el servidor ldap",
-"The php-zip module is needed download multiple files at once" => "El mòdul php-zip és necessari per baixar múltiples fitxers de cop",
-"The php-mb_multibyte module is needed to manage correctly the encoding." => "El mòdul php-mb_multibyte és necessari per gestionar correctament la codificació.",
-"The php-ctype module is needed validate data." => "El mòdul php-ctype és necessari per validar dades.",
-"The php-xml module is needed to share files with webdav." => "El mòdul php-xml és necessari per compatir els fitxers amb webdav.",
-"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve knowledge base from OCS servers" => "La directiva allow_url_fopen de php.ini hauria d'establir-se en 1 per accedir a la base de coneixements dels servidors OCS",
-"The php-pdo module is needed to store owncloud data into a database." => "El mòdul php-pdo és necessari per desar les dades d'ownCloud en una base de dades.",
-"Dependencies status" => "Estat de dependències",
-"Used by :" => "Usat per:"
-);
diff --git a/apps/admin_dependencies_chk/l10n/cs_CZ.php b/apps/admin_dependencies_chk/l10n/cs_CZ.php
deleted file mode 100644
index f750f13aef..0000000000
--- a/apps/admin_dependencies_chk/l10n/cs_CZ.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php $TRANSLATIONS = array(
-"The php-json module is needed by the many applications for inter communications" => "Modul php-json je třeba pro vzájemnou komunikaci mnoha aplikací",
-"The php-curl modude is needed to fetch the page title when adding a bookmarks" => "Modul php-curl je třeba pro zobrazení titulu strany v okamžiku přidání záložky",
-"The php-gd module is needed to create thumbnails of your images" => "Modul php-gd je třeba pro tvorbu náhledů Vašich obrázků",
-"The php-ldap module is needed connect to your ldap server" => "Modul php-ldap je třeba pro připojení na Váš ldap server",
-"The php-zip module is needed download multiple files at once" => "Modul php-zip je třeba pro souběžné stahování souborů",
-"The php-mb_multibyte module is needed to manage correctly the encoding." => "Modul php-mb_multibyte je třeba pro správnou funkci kódování.",
-"The php-ctype module is needed validate data." => "Modul php-ctype je třeba k ověřování dat.",
-"The php-xml module is needed to share files with webdav." => "Modul php-xml je třeba ke sdílení souborů prostřednictvím WebDAV.",
-"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve knowledge base from OCS servers" => "Příkaz allow_url_fopen ve Vašem php.ini souboru by měl být nastaven na 1 kvůli získávání informací z OCS serverů",
-"The php-pdo module is needed to store owncloud data into a database." => "Modul php-pdo je třeba pro ukládání dat ownCloud do databáze",
-"Dependencies status" => "Status závislostí",
-"Used by :" => "Používáno:"
-);
diff --git a/apps/admin_dependencies_chk/l10n/de.php b/apps/admin_dependencies_chk/l10n/de.php
deleted file mode 100644
index 7877e7d679..0000000000
--- a/apps/admin_dependencies_chk/l10n/de.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php $TRANSLATIONS = array(
-"The php-json module is needed by the many applications for inter communications" => "Das Modul php-json wird von vielen Anwendungen zur internen Kommunikation benötigt.",
-"The php-curl modude is needed to fetch the page title when adding a bookmarks" => "Das Modul php-curl wird benötigt, um den Titel der Seite für die Lesezeichen hinzuzufügen.",
-"The php-gd module is needed to create thumbnails of your images" => "Das Modul php-gd wird für die Erzeugung der Vorschaubilder benötigt.",
-"The php-ldap module is needed connect to your ldap server" => "Das Modul php-ldap wird für die Verbindung mit dem LDAP-Server benötigt.",
-"The php-zip module is needed download multiple files at once" => "Das Modul php-zip wird für den gleichzeitigen Download mehrerer Dateien benötigt.",
-"The php-mb_multibyte module is needed to manage correctly the encoding." => "Das Modul php_mb_multibyte wird benötigt, um das Encoding richtig zu handhaben.",
-"The php-ctype module is needed validate data." => "Das Modul php-ctype wird benötigt, um Daten zu prüfen.",
-"The php-xml module is needed to share files with webdav." => "Das Modul php-xml wird benötigt, um Dateien über WebDAV zu teilen.",
-"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve knowledge base from OCS servers" => "Die Richtlinie allow_url_fopen in Ihrer php.ini sollte auf 1 gesetzt werden, um die Wissensbasis vom OCS-Server abrufen.",
-"The php-pdo module is needed to store owncloud data into a database." => "Das Modul php-pdo wird benötigt, um Daten in der Datenbank zu speichern.",
-"Dependencies status" => "Status der Abhängigkeiten",
-"Used by :" => "Benutzt von:"
-);
diff --git a/apps/admin_dependencies_chk/l10n/el.php b/apps/admin_dependencies_chk/l10n/el.php
deleted file mode 100644
index 9dd455b670..0000000000
--- a/apps/admin_dependencies_chk/l10n/el.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Dependencies status" => "Κατάσταση εξαρτήσεων",
-"Used by :" => "Χρησιμοποιήθηκε από:"
-);
diff --git a/apps/admin_dependencies_chk/l10n/eo.php b/apps/admin_dependencies_chk/l10n/eo.php
deleted file mode 100644
index 65896831f7..0000000000
--- a/apps/admin_dependencies_chk/l10n/eo.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php $TRANSLATIONS = array(
-"The php-json module is needed by the many applications for inter communications" => "La modulo php-json necesas por komuniko inter la multaj aplikaĵoj",
-"The php-curl modude is needed to fetch the page title when adding a bookmarks" => "La modulo php-curl necesas por venigi la paĝotitolon dum aldono de legosigno",
-"The php-gd module is needed to create thumbnails of your images" => "La modulo php-gd necesas por krei bildetojn.",
-"The php-ldap module is needed connect to your ldap server" => "La modulo php-ldap necesas por konekti al via LDAP-servilo.",
-"The php-zip module is needed download multiple files at once" => "La modulo php-zip necesas por elŝuti plurajn dosierojn per unu fojo.",
-"The php-mb_multibyte module is needed to manage correctly the encoding." => "La modulo php-mb_multibyte necesas por ĝuste administri la kodprezenton.",
-"The php-ctype module is needed validate data." => "La modulo php-ctype necesas por validkontroli datumojn.",
-"The php-xml module is needed to share files with webdav." => "La modulo php-xml necesas por kunhavigi dosierojn per WebDAV.",
-"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve knowledge base from OCS servers" => "La ordono allow_url_fopen de via php.ini devus valori 1 por ricevi scibazon el OCS-serviloj",
-"The php-pdo module is needed to store owncloud data into a database." => "La modulo php-pdo necesas por konservi datumojn de ownCloud en datumbazo.",
-"Dependencies status" => "Stato de dependoj",
-"Used by :" => "Uzata de:"
-);
diff --git a/apps/admin_dependencies_chk/l10n/es.php b/apps/admin_dependencies_chk/l10n/es.php
deleted file mode 100644
index cbf13951ac..0000000000
--- a/apps/admin_dependencies_chk/l10n/es.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Dependencies status" => "Estado de las dependencias",
-"Used by :" => "Usado por:"
-);
diff --git a/apps/admin_dependencies_chk/l10n/et_EE.php b/apps/admin_dependencies_chk/l10n/et_EE.php
deleted file mode 100644
index 529c8e78d1..0000000000
--- a/apps/admin_dependencies_chk/l10n/et_EE.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php $TRANSLATIONS = array(
-"The php-json module is needed by the many applications for inter communications" => "php-json moodul on vajalik paljude rakenduse poolt omvahelise suhtlemise jaoks",
-"The php-curl modude is needed to fetch the page title when adding a bookmarks" => "php-curl moodul on vajalik lehe pealkirja tõmbamiseks järjehoidja lisamisel",
-"The php-gd module is needed to create thumbnails of your images" => "php-gd moodul on vajalik sinu piltidest pisipiltide loomiseks",
-"The php-ldap module is needed connect to your ldap server" => "php-ldap moodul on vajalik sinu ldap serveriga ühendumiseks",
-"The php-zip module is needed download multiple files at once" => "php-zip moodul on vajalik mitme faili korraga alla laadimiseks",
-"The php-mb_multibyte module is needed to manage correctly the encoding." => "php-mb_multibyte moodul on vajalik kodeerimise korrektseks haldamiseks.",
-"The php-ctype module is needed validate data." => "php-ctype moodul on vajalik andmete kontrollimiseks.",
-"The php-xml module is needed to share files with webdav." => "php-xml moodul on vajalik failide jagamiseks webdav-iga.",
-"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve knowledge base from OCS servers" => "Sinu php.ini failis oleva direktiivi allow_url_fopen väärtuseks peaks määrama 1, et saaks tõmmata teadmistebaasi OCS-i serveritest",
-"The php-pdo module is needed to store owncloud data into a database." => "php-pdo moodul on vajalik owncloudi andmete salvestamiseks andmebaasi.",
-"Dependencies status" => "Sõltuvuse staatus",
-"Used by :" => "Kasutab :"
-);
diff --git a/apps/admin_dependencies_chk/l10n/fi_FI.php b/apps/admin_dependencies_chk/l10n/fi_FI.php
deleted file mode 100644
index 85e33cfe8c..0000000000
--- a/apps/admin_dependencies_chk/l10n/fi_FI.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php $TRANSLATIONS = array(
-"The php-gd module is needed to create thumbnails of your images" => "php-gd-moduuli vaaditaan, jotta kuvista on mahdollista luoda esikatselukuvia",
-"The php-ldap module is needed connect to your ldap server" => "php-ldap-moduuli vaaditaan, jotta yhteys ldap-palvelimeen on mahdollista",
-"The php-zip module is needed download multiple files at once" => "php-zip-moduuli vaaditaan, jotta useiden tiedostojen samanaikainen lataus on mahdollista",
-"The php-xml module is needed to share files with webdav." => "php-xml-moduuli vaaditaan, jotta tiedostojen jako webdavia käyttäen on mahdollista",
-"The php-pdo module is needed to store owncloud data into a database." => "php-pdo-moduuli tarvitaan, jotta ownCloud-tietojen tallennus tietokantaan on mahdollista",
-"Dependencies status" => "Riippuvuuksien tila",
-"Used by :" => "Käyttökohde:"
-);
diff --git a/apps/admin_dependencies_chk/l10n/fr.php b/apps/admin_dependencies_chk/l10n/fr.php
deleted file mode 100644
index 1b195b78bb..0000000000
--- a/apps/admin_dependencies_chk/l10n/fr.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php $TRANSLATIONS = array(
-"The php-json module is needed by the many applications for inter communications" => "Le module php-json est requis pour l'inter-communication de nombreux modules.",
-"The php-curl modude is needed to fetch the page title when adding a bookmarks" => "Le module php-curl est requis afin de rapatrier le titre des pages lorsque vous ajoutez un marque-pages.",
-"The php-gd module is needed to create thumbnails of your images" => "Le module php-gd est requis afin de permettre la création d'aperçus pour vos images.",
-"The php-ldap module is needed connect to your ldap server" => "Le module php-ldap est requis afin de permettre la connexion à votre serveur ldap.",
-"The php-zip module is needed download multiple files at once" => "Le module php-zip est requis pour le téléchargement simultané de plusieurs fichiers.",
-"The php-mb_multibyte module is needed to manage correctly the encoding." => "Le module php-mb_multibyte est requis pour une gestion correcte des encodages.",
-"The php-ctype module is needed validate data." => "Le module php-ctype est requis pour la validation des données.",
-"The php-xml module is needed to share files with webdav." => "Le module php-xml est requis pour le partage de fichiers via webdav.",
-"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve knowledge base from OCS servers" => "La directive allow_url_fopen de votre fichier php.ini doit être à la valeur 1 afin de permettre le rapatriement de la base de connaissance depuis les serveurs OCS.",
-"The php-pdo module is needed to store owncloud data into a database." => "le module php-pdo est requis pour le stockage des données ownCloud en base de données.",
-"Dependencies status" => "Statut des dépendances",
-"Used by :" => "Utilisé par :"
-);
diff --git a/apps/admin_dependencies_chk/l10n/it.php b/apps/admin_dependencies_chk/l10n/it.php
deleted file mode 100644
index f51286966e..0000000000
--- a/apps/admin_dependencies_chk/l10n/it.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php $TRANSLATIONS = array(
-"The php-json module is needed by the many applications for inter communications" => "Il modulo php-json è richiesto per l'intercomunicazione di diverse applicazioni",
-"The php-curl modude is needed to fetch the page title when adding a bookmarks" => "Il modulo php-curl è richiesto per scaricare il titolo della pagina quando si aggiunge un segnalibro",
-"The php-gd module is needed to create thumbnails of your images" => "Il modulo php-gd è richiesto per creare miniature delle tue immagini",
-"The php-ldap module is needed connect to your ldap server" => "Il modulo php-ldap è richiesto per collegarsi a un server ldap",
-"The php-zip module is needed download multiple files at once" => "Il modulo php-zip è richiesto per scaricare diversi file contemporaneamente",
-"The php-mb_multibyte module is needed to manage correctly the encoding." => "Il modulo php-mb_multibyte è richiesto per gestire correttamente la codifica.",
-"The php-ctype module is needed validate data." => "Il modulo php-ctype è richiesto per la validazione dei dati.",
-"The php-xml module is needed to share files with webdav." => "Il modulo php-xml è richiesto per condividere i file con webdav.",
-"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve knowledge base from OCS servers" => "La direttiva allow_url_fopen del tuo php.ini deve essere impostata a 1 per recuperare la base di conoscenza dai server di OCS",
-"The php-pdo module is needed to store owncloud data into a database." => "Il modulo php-pdo è richiesto per archiviare i dati di ownCloud in un database.",
-"Dependencies status" => "Stato delle dipendenze",
-"Used by :" => "Usato da:"
-);
diff --git a/apps/admin_dependencies_chk/l10n/ja_JP.php b/apps/admin_dependencies_chk/l10n/ja_JP.php
deleted file mode 100644
index 0770b92db1..0000000000
--- a/apps/admin_dependencies_chk/l10n/ja_JP.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php $TRANSLATIONS = array(
-"The php-json module is needed by the many applications for inter communications" => "php-jsonモジュールはアプリケーション間の内部通信に必要です",
-"The php-curl modude is needed to fetch the page title when adding a bookmarks" => "php-curlモジュールはブックマーク追加時のページタイトル取得に必要です",
-"The php-gd module is needed to create thumbnails of your images" => "php-gdモジュールはサムネイル画像の生成に必要です",
-"The php-ldap module is needed connect to your ldap server" => "php-ldapモジュールはLDAPサーバへの接続に必要です",
-"The php-zip module is needed download multiple files at once" => "php-zipモジュールは複数ファイルの同時ダウンロードに必要です",
-"The php-mb_multibyte module is needed to manage correctly the encoding." => "php-mb_multibyteモジュールはエンコードを正しく扱うために必要です",
-"The php-ctype module is needed validate data." => "php-ctypeモジュールはデータのバリデーションに必要です",
-"The php-xml module is needed to share files with webdav." => "php-xmlモジュールはWebDAVでのファイル共有に必要です",
-"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve knowledge base from OCS servers" => "php.iniのallow_url_fopenはOCSサーバから知識ベースを取得するために1に設定しなくてはなりません",
-"The php-pdo module is needed to store owncloud data into a database." => "php-pdoモジュールはデータベースにownCloudのデータを格納するために必要です",
-"Dependencies status" => "依存関係の状況",
-"Used by :" => "利用先 :"
-);
diff --git a/apps/admin_dependencies_chk/l10n/lt_LT.php b/apps/admin_dependencies_chk/l10n/lt_LT.php
deleted file mode 100644
index 4fed2ab93d..0000000000
--- a/apps/admin_dependencies_chk/l10n/lt_LT.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php $TRANSLATIONS = array(
-"The php-json module is needed by the many applications for inter communications" => "Php-json modulis yra reikalingas duomenų keitimuisi tarp programų",
-"The php-curl modude is needed to fetch the page title when adding a bookmarks" => "Php-curl modulis automatiškai nuskaito tinklapio pavadinimą kuomet išsaugoma žymelė.",
-"The php-gd module is needed to create thumbnails of your images" => "Php-gd modulis yra naudojamas paveikslėlių miniatiūroms kurti.",
-"The php-ldap module is needed connect to your ldap server" => "Php-ldap modulis yra reikalingas prisijungimui prie jūsų ldap serverio",
-"The php-zip module is needed download multiple files at once" => "Php-zip modulis yra reikalingas kelių failų atsiuntimui iš karto.",
-"The php-mb_multibyte module is needed to manage correctly the encoding." => "Php-mb_multibyte modulis yra naudojamas apdoroti įvairius teksto kodavimo formatus.",
-"The php-ctype module is needed validate data." => "Php-ctype modulis yra reikalingas duomenų tikrinimui.",
-"The php-xml module is needed to share files with webdav." => "Php-xml modulis yra reikalingas failų dalinimuisi naudojant webdav.",
-"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve knowledge base from OCS servers" => "allow_url_fopen direktyva turėtų būti nustatyta į \"1\" jei norite automatiškai gauti žinių bazės informaciją iš OCS serverių.",
-"The php-pdo module is needed to store owncloud data into a database." => "Php-pdo modulis yra reikalingas duomenų saugojimui į owncloud duomenų bazę.",
-"Dependencies status" => "Priklausomybės",
-"Used by :" => "Naudojama:"
-);
diff --git a/apps/admin_dependencies_chk/l10n/pl.php b/apps/admin_dependencies_chk/l10n/pl.php
deleted file mode 100644
index e40d23cb7e..0000000000
--- a/apps/admin_dependencies_chk/l10n/pl.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php $TRANSLATIONS = array(
-"The php-json module is needed by the many applications for inter communications" => "Moduł php-json jest wymagane przez wiele aplikacji do wewnętrznej łączności",
-"The php-curl modude is needed to fetch the page title when adding a bookmarks" => "Modude php-curl jest wymagany do pobrania tytułu strony podczas dodawania zakładki",
-"The php-gd module is needed to create thumbnails of your images" => "Moduł php-gd jest wymagany do tworzenia miniatury obrazów",
-"The php-ldap module is needed connect to your ldap server" => "Moduł php-ldap jest wymagany aby połączyć się z serwerem ldap",
-"The php-zip module is needed download multiple files at once" => "Moduł php-zip jest wymagany aby pobrać wiele plików na raz",
-"The php-mb_multibyte module is needed to manage correctly the encoding." => "Moduł php-mb_multibyte jest wymagany do poprawnego zarządzania kodowaniem.",
-"The php-ctype module is needed validate data." => "Moduł php-ctype jest wymagany do sprawdzania poprawności danych.",
-"The php-xml module is needed to share files with webdav." => "Moduł php-xml jest wymagany do udostępniania plików przy użyciu protokołu webdav.",
-"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve knowledge base from OCS servers" => "Dyrektywy allow_url_fopen użytkownika php.ini powinna być ustawiona na 1 do pobierania bazy wiedzy  z serwerów OCS",
-"The php-pdo module is needed to store owncloud data into a database." => "Moduł php-pdo jest wymagany do przechowywania danych owncloud w bazie danych.",
-"Dependencies status" => "Stan zależności",
-"Used by :" => "Używane przez:"
-);
diff --git a/apps/admin_dependencies_chk/l10n/ru.php b/apps/admin_dependencies_chk/l10n/ru.php
deleted file mode 100644
index 58e699cb48..0000000000
--- a/apps/admin_dependencies_chk/l10n/ru.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php $TRANSLATIONS = array(
-"The php-json module is needed by the many applications for inter communications" => "Модуль php-json необходим многим приложениям для внутренних связей",
-"The php-curl modude is needed to fetch the page title when adding a bookmarks" => "Модуль php-curl необходим для получения заголовка страницы при добавлении закладок",
-"The php-gd module is needed to create thumbnails of your images" => "Модуль php-gd необходим для создания уменьшенной копии для предпросмотра ваших картинок.",
-"The php-ldap module is needed connect to your ldap server" => "Модуль php-ldap необходим для соединения с вашим ldap сервером",
-"The php-zip module is needed download multiple files at once" => "Модуль php-zip необходим для загрузки нескольких файлов за раз",
-"The php-mb_multibyte module is needed to manage correctly the encoding." => "Модуль php-mb_multibyte необходим для корректного управления кодировками.",
-"The php-ctype module is needed validate data." => "Модуль php-ctype необходим для проверки данных.",
-"The php-xml module is needed to share files with webdav." => "Модуль php-xml необходим для открытия файлов через webdav.",
-"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve knowledge base from OCS servers" => "Директива allow_url_fopen в файле php.ini должна быть установлена в 1 для получения базы знаний с серверов OCS",
-"The php-pdo module is needed to store owncloud data into a database." => "Модуль php-pdo необходим для хранения данных ownСloud в базе данных.",
-"Dependencies status" => "Статус зависимостей",
-"Used by :" => "Используется:"
-);
diff --git a/apps/admin_dependencies_chk/l10n/sl.php b/apps/admin_dependencies_chk/l10n/sl.php
deleted file mode 100644
index 0d36aa379c..0000000000
--- a/apps/admin_dependencies_chk/l10n/sl.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php $TRANSLATIONS = array(
-"The php-json module is needed by the many applications for inter communications" => "Modul php-json je potreben za medsebojno komunikacijo veliko aplikacij.",
-"The php-curl modude is needed to fetch the page title when adding a bookmarks" => "Modul php-curl je potreben za pridobivanje naslova strani pri dodajanju zaznamkov.",
-"The php-gd module is needed to create thumbnails of your images" => "Modul php-gd je potreben za ustvarjanje sličic za predogled.",
-"The php-ldap module is needed connect to your ldap server" => "Modul php-ldap je potreben za povezavo z vašim ldap strežnikom.",
-"The php-zip module is needed download multiple files at once" => "Modul php-zip je potreben za prenašanje večih datotek hkrati.",
-"The php-mb_multibyte module is needed to manage correctly the encoding." => "Modul php-mb_multibyte je potreben za pravilno upravljanje kodiranja.",
-"The php-ctype module is needed validate data." => "Modul php-ctype je potreben za preverjanje veljavnosti podatkov.",
-"The php-xml module is needed to share files with webdav." => "Modul php-xml je potreben za izmenjavo datotek preko protokola WebDAV.",
-"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve knowledge base from OCS servers" => "Direktiva allow_url_fopen v vaši php.ini datoteki mora biti nastavljena na 1, če želite omogočiti dostop do zbirke znanja na strežnikih OCS.",
-"The php-pdo module is needed to store owncloud data into a database." => "Modul php-pdo je potreben za shranjevanje ownCloud podatkov v podatkovno zbirko.",
-"Dependencies status" => "Stanje odvisnosti",
-"Used by :" => "Uporablja:"
-);
diff --git a/apps/admin_dependencies_chk/l10n/sv.php b/apps/admin_dependencies_chk/l10n/sv.php
deleted file mode 100644
index 07868f3c03..0000000000
--- a/apps/admin_dependencies_chk/l10n/sv.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php $TRANSLATIONS = array(
-"The php-json module is needed by the many applications for inter communications" => "Modulen php-json behövs av många applikationer som interagerar.",
-"The php-curl modude is needed to fetch the page title when adding a bookmarks" => "Modulen php-curl behövs för att hämta sidans titel när du lägger till bokmärken.",
-"The php-gd module is needed to create thumbnails of your images" => "Modulen php-gd behövs för att skapa miniatyrer av dina bilder.",
-"The php-ldap module is needed connect to your ldap server" => "Modulen php-ldap behövs för att ansluta mot din ldapserver.",
-"The php-zip module is needed download multiple files at once" => "Modulen php-zip behövs för att kunna ladda ner flera filer på en gång.",
-"The php-mb_multibyte module is needed to manage correctly the encoding." => "Modulen php-mb_multibyte behövs för att hantera korrekt teckenkodning.",
-"The php-ctype module is needed validate data." => "Modulen php-ctype behövs för att validera data.",
-"The php-xml module is needed to share files with webdav." => "Modulen php-xml behövs för att kunna dela filer med webdav.",
-"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve knowledge base from OCS servers" => "Direktivet allow_url_fopen i php.ini bör sättas till 1 för att kunna hämta kunskapsbasen från OCS-servrar.",
-"The php-pdo module is needed to store owncloud data into a database." => "Modulen php-pdo behövs för att kunna lagra ownCloud data i en databas.",
-"Dependencies status" => "Beroenden status",
-"Used by :" => "Används av:"
-);
diff --git a/apps/admin_dependencies_chk/l10n/th_TH.php b/apps/admin_dependencies_chk/l10n/th_TH.php
deleted file mode 100644
index 01d5c36366..0000000000
--- a/apps/admin_dependencies_chk/l10n/th_TH.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php $TRANSLATIONS = array(
-"The php-json module is needed by the many applications for inter communications" => "โมดูล php-json จำเป็นต้องใช้สำหรับแอพพลิเคชั่นหลายๆตัวเพื่อการเชื่อมต่อสากล",
-"The php-curl modude is needed to fetch the page title when adding a bookmarks" => "โมดูล php-curl จำเป็นต้องใช้สำหรับดึงข้อมูลชื่อหัวเว็บเมื่อเพิ่มเข้าไปยังรายการโปรด",
-"The php-gd module is needed to create thumbnails of your images" => "โมดูล php-gd จำเป็นต้องใช้สำหรับสร้างรูปภาพขนาดย่อของรูปภาพของคุณ",
-"The php-ldap module is needed connect to your ldap server" => "โมดูล php-ldap จำเป็นต้องใช้สำหรับการเชื่อมต่อกับเซิร์ฟเวอร์ ldap ของคุณ",
-"The php-zip module is needed download multiple files at once" => "โมดูล php-zip จำเป็นต้องใช้สำหรับดาวน์โหลดไฟล์พร้อมกันหลายๆไฟล์ในครั้งเดียว",
-"The php-mb_multibyte module is needed to manage correctly the encoding." => "โมดูล php-mb_multibyte จำเป็นต้องใช้สำหรับการจัดการการแปลงรหัสไฟล์อย่างถูกต้อง",
-"The php-ctype module is needed validate data." => "โมดูล php-ctype จำเป็นต้องใช้สำหรับตรวจสอบความถูกต้องของข้อมูล",
-"The php-xml module is needed to share files with webdav." => "โมดูล php-xml จำเป็นต้องใช้สำหรับแชร์ไฟล์ด้วย webdav",
-"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve knowledge base from OCS servers" => "คำสั่ง allow_url_fopen ที่อยู่ในไฟล์ php.ini ของคุณ ควรกำหนดเป็น 1 เพื่อดึงข้อมูลของฐานความรู้ต่างๆจากเซิร์ฟเวอร์ของ OCS",
-"The php-pdo module is needed to store owncloud data into a database." => "โมดูล php-pdo จำเป็นต้องใช้สำหรับจัดเก็บข้อมูลใน owncloud เข้าไปไว้ยังฐานข้อมูล",
-"Dependencies status" => "สถานะการอ้างอิง",
-"Used by :" => "ใช้งานโดย:"
-);
diff --git a/apps/admin_dependencies_chk/settings.php b/apps/admin_dependencies_chk/settings.php
deleted file mode 100644
index 4e0803f791..0000000000
--- a/apps/admin_dependencies_chk/settings.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-
-/**
- * ownCloud - user_ldap
- *
- * @author Brice Maron
- * @copyright 2011 Brice Maron brice __from__ bmaron _DOT_ net
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *
- * You should have received a copy of the GNU Affero General Public
- * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-$l=OC_L10N::get('admin_dependencies_chk');
-$tmpl = new OCP\Template( 'admin_dependencies_chk', 'settings');
-
-$modules = array();
-
-//Possible status are : ok, error, warning
-$modules[] =array(
-	'status' => function_exists('json_encode') ? 'ok' : 'error',
-	'part'=> 'php-json',
-	'modules'=> array('core'),
-	'message'=> $l->t('The php-json module is needed by the many applications for inter communications'));
-
-$modules[] =array(
-	'status' => function_exists('curl_init') ? 'ok' : 'error',
-	'part'=> 'php-curl',
-	'modules'=> array('bookmarks'),
-	'message'=> $l->t('The php-curl modude is needed to fetch the page title when adding a bookmarks'));
-
-$modules[] =array(
-	'status' => function_exists('imagepng') ? 'ok' : 'error',
-	'part'=> 'php-gd',
-	'modules'=> array('gallery'),
-	'message'=> $l->t('The php-gd module is needed to create thumbnails of your images'));
-
-$modules[] =array(
-	'status' => function_exists("ldap_bind") ? 'ok' : 'error',
-	'part'=> 'php-ldap',
-	'modules'=> array('user_ldap'),
-	'message'=> $l->t('The php-ldap module is needed connect to your ldap server'));
-
-$modules[] =array(
-	'status' => class_exists('ZipArchive') ? 'ok' : 'warning',
-	'part'=> 'php-zip',
-	'modules'=> array('admin_export','core'),
-	'message'=> $l->t('The php-zip module is needed download multiple files at once'));
-
-$modules[] =array(
-	'status' => function_exists('mb_detect_encoding') ? 'ok' : 'error',
-	'part'=> 'php-mb_multibyte ',
-	'modules'=> array('core'),
-	'message'=> $l->t('The php-mb_multibyte module is needed to manage correctly the encoding.'));
-
-$modules[] =array(
-	'status' => function_exists('ctype_digit') ? 'ok' : 'error',
-	'part'=> 'php-ctype',
-	'modules'=> array('core'),
-	'message'=> $l->t('The php-ctype module is needed validate data.'));
-
-$modules[] =array(
-	'status' => class_exists('DOMDocument') ? 'ok' : 'error',
-	'part'=> 'php-xml',
-	'modules'=> array('core'),
-	'message'=> $l->t('The php-xml module is needed to share files with webdav.'));
-
-$modules[] =array(
-	'status' => ini_get('allow_url_fopen') == '1' ? 'ok' : 'error',
-	'part'=> 'allow_url_fopen',
-	'modules'=> array('core'),
-	'message'=> $l->t('The allow_url_fopen directive of your php.ini should be set to 1 to retrieve knowledge base from OCS servers'));
-
-$modules[] =array(
-	'status' => class_exists('PDO') ? 'ok' : 'warning',
-	'part'=> 'php-pdo',
-	'modules'=> array('core'),
-	'message'=> $l->t('The php-pdo module is needed to store owncloud data into a database.'));
-
-foreach($modules as $key => $module) {
-	$enabled = false ;
-	foreach($module['modules'] as $app) {
-		if(OCP\App::isEnabled($app) || $app=='core'){
-				$enabled = true;
-		}
-	}
-	if($enabled == false) unset($modules[$key]);
-}
-
-OCP\UTIL::addStyle('admin_dependencies_chk', 'style');
-$tmpl->assign( 'items', $modules );
-
-return $tmpl->fetchPage();
diff --git a/apps/admin_dependencies_chk/templates/settings.php b/apps/admin_dependencies_chk/templates/settings.php
deleted file mode 100644
index 8ff27ebb18..0000000000
--- a/apps/admin_dependencies_chk/templates/settings.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<fieldset id="status_list" class="personalblock">
-	<legend><?php echo $l->t('Dependencies status');?></legend>
-	<ul class="state">
-		<?php foreach($_['items'] as $item):?>
-			<li class="state_<?php echo $item['status'];?>">
-				<span class="state_module" title="<?php echo $item['message'];?>"><?php echo $item['part'];?></span>
-				<div class="state_used"><?php echo $l->t('Used by :');?>
-					<ul>
-						<?php foreach($item['modules'] as $module):?>
-							<li><?php echo $module;?></li>
-						<?php endforeach;?>
-					</ul>
-			</li>
-		<?php endforeach;?>
-	</ul>
-</fieldset>
\ No newline at end of file
diff --git a/apps/admin_migrate/appinfo/app.php b/apps/admin_migrate/appinfo/app.php
deleted file mode 100644
index 7a12a32856..0000000000
--- a/apps/admin_migrate/appinfo/app.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-/**
-* ownCloud - admin_migrate
-*
-* @author Tom Needham
-* @copyright 2012 Tom Needham tom@owncloud.com
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either
-* version 3 of the License, or any later version.
-*
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-*
-* You should have received a copy of the GNU Affero General Public
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-*
-*/
-
-
-OCP\App::registerAdmin('admin_migrate','settings');
-
-// add settings page to navigation
-$entry = array(
-	'id' => "admin_migrate_settings",
-	'order'=>1,
-	'href' => OCP\Util::linkTo( "admin_migrate", "settings.php" ),
-	'name' => 'Export'
-);
diff --git a/apps/admin_migrate/appinfo/info.xml b/apps/admin_migrate/appinfo/info.xml
deleted file mode 100644
index f48c666ffe..0000000000
--- a/apps/admin_migrate/appinfo/info.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<info>
-	<id>admin_migrate</id>
-	<name>ownCloud Instance Migration</name>
-	<description>Import/Export your owncloud instance</description>
-	<licence>AGPL</licence>
-	<author>Thomas Schmidt and Tom Needham</author>
-	<require>4</require>
-	<shipped>true</shipped>
-	<default_enable/>
-</info>
diff --git a/apps/admin_migrate/appinfo/version b/apps/admin_migrate/appinfo/version
deleted file mode 100644
index ceab6e11ec..0000000000
--- a/apps/admin_migrate/appinfo/version
+++ /dev/null
@@ -1 +0,0 @@
-0.1
\ No newline at end of file
diff --git a/apps/admin_migrate/l10n/.gitkeep b/apps/admin_migrate/l10n/.gitkeep
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/apps/admin_migrate/l10n/ca.php b/apps/admin_migrate/l10n/ca.php
deleted file mode 100644
index 8743b39760..0000000000
--- a/apps/admin_migrate/l10n/ca.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Export this ownCloud instance" => "Exporta aquesta instància de ownCloud",
-"This will create a compressed file that contains the data of this owncloud instance.\n            Please choose the export type:" => "Això crearà un fitxer comprimit amb les dades d'aquesta instància ownCloud.\n            Escolliu el tipus d'exportació:",
-"Export" => "Exporta"
-);
diff --git a/apps/admin_migrate/l10n/cs_CZ.php b/apps/admin_migrate/l10n/cs_CZ.php
deleted file mode 100644
index 0dc1a61d5d..0000000000
--- a/apps/admin_migrate/l10n/cs_CZ.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Export this ownCloud instance" => "Export této instance ownCloud",
-"This will create a compressed file that contains the data of this owncloud instance.\n            Please choose the export type:" => "Bude vytvořen komprimovaný soubor obsahující data této instance ownCloud.⏎ Zvolte typ exportu:",
-"Export" => "Export"
-);
diff --git a/apps/admin_migrate/l10n/da.php b/apps/admin_migrate/l10n/da.php
deleted file mode 100644
index a33635cdc1..0000000000
--- a/apps/admin_migrate/l10n/da.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Export this ownCloud instance" => "Eksporter ownCloud instans",
-"Export" => "Eksporter"
-);
diff --git a/apps/admin_migrate/l10n/de.php b/apps/admin_migrate/l10n/de.php
deleted file mode 100644
index d42179b75a..0000000000
--- a/apps/admin_migrate/l10n/de.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Export this ownCloud instance" => "Diese ownCloud-Instanz exportieren.",
-"This will create a compressed file that contains the data of this owncloud instance.\n            Please choose the export type:" => "Dies wird eine komprimierte Datei erzeugen, welche die Daten dieser ownCloud-Instanz enthält.\n            Bitte wählen Sie den Exporttyp:",
-"Export" => "Exportieren"
-);
diff --git a/apps/admin_migrate/l10n/el.php b/apps/admin_migrate/l10n/el.php
deleted file mode 100644
index 95034c46a4..0000000000
--- a/apps/admin_migrate/l10n/el.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php $TRANSLATIONS = array(
-"This will create a compressed file that contains the data of this owncloud instance.\n            Please choose the export type:" => "Αυτό θα δημιουργήσει ένα συμπιεσμένο αρχείο που θα περιέχει τα δεδομένα από αυτό το ownCloud.\n            Παρακαλώ επιλέξτε τον τύπο εξαγωγής:",
-"Export" => "Εξαγωγή"
-);
diff --git a/apps/admin_migrate/l10n/eo.php b/apps/admin_migrate/l10n/eo.php
deleted file mode 100644
index a37be76425..0000000000
--- a/apps/admin_migrate/l10n/eo.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Export this ownCloud instance" => "Malenporti ĉi tiun aperon de ownCloud",
-"This will create a compressed file that contains the data of this owncloud instance.\n            Please choose the export type:" => "Ĉi tio kreos densigitan dosieron, kiu enhavos la datumojn de ĉi tiu apero de ownCloud.\nBonvolu elekti la tipon de malenportado:",
-"Export" => "Malenporti"
-);
diff --git a/apps/admin_migrate/l10n/es.php b/apps/admin_migrate/l10n/es.php
deleted file mode 100644
index cb6699b1d9..0000000000
--- a/apps/admin_migrate/l10n/es.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Export this ownCloud instance" => "Exportar esta instancia de ownCloud",
-"This will create a compressed file that contains the data of this owncloud instance.\n            Please choose the export type:" => "Se creará un archivo comprimido que contendrá los datos de esta instancia de owncloud.\n            Por favor elegir el tipo de exportación:",
-"Export" => "Exportar"
-);
diff --git a/apps/admin_migrate/l10n/et_EE.php b/apps/admin_migrate/l10n/et_EE.php
deleted file mode 100644
index ee92f9fe21..0000000000
--- a/apps/admin_migrate/l10n/et_EE.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Export this ownCloud instance" => "Ekspordi see ownCloudi paigaldus",
-"This will create a compressed file that contains the data of this owncloud instance.\n            Please choose the export type:" => "See loob pakitud faili, milles on sinu owncloudi paigalduse andmed.\n            Palun vali eksporditava faili tüüp:",
-"Export" => "Ekspordi"
-);
diff --git a/apps/admin_migrate/l10n/fi_FI.php b/apps/admin_migrate/l10n/fi_FI.php
deleted file mode 100644
index 2484eab7d3..0000000000
--- a/apps/admin_migrate/l10n/fi_FI.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Export this ownCloud instance" => "Vie tämä ownCloud-istanssi",
-"Export" => "Vie"
-);
diff --git a/apps/admin_migrate/l10n/fr.php b/apps/admin_migrate/l10n/fr.php
deleted file mode 100644
index 0cf0a444b0..0000000000
--- a/apps/admin_migrate/l10n/fr.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Export this ownCloud instance" => "Exporter cette instance ownCloud",
-"This will create a compressed file that contains the data of this owncloud instance.\n            Please choose the export type:" => "Ceci va créer une archive compressée contenant les données de cette instance ownCloud.\n            Veuillez choisir le type d'export :",
-"Export" => "Exporter"
-);
diff --git a/apps/admin_migrate/l10n/gl.php b/apps/admin_migrate/l10n/gl.php
deleted file mode 100644
index 9d18e13493..0000000000
--- a/apps/admin_migrate/l10n/gl.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Export this ownCloud instance" => "Exporta esta instancia de ownCloud",
-"This will create a compressed file that contains the data of this owncloud instance.\n            Please choose the export type:" => "Esto creará un ficheiro comprimido que contén os datos de esta instancia de ownCloud.\nPor favor escolla o modo de exportación:",
-"Export" => "Exportar"
-);
diff --git a/apps/admin_migrate/l10n/it.php b/apps/admin_migrate/l10n/it.php
deleted file mode 100644
index 94ba191ba6..0000000000
--- a/apps/admin_migrate/l10n/it.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Export this ownCloud instance" => "Esporta questa istanza di ownCloud",
-"This will create a compressed file that contains the data of this owncloud instance.\n            Please choose the export type:" => "Questa operazione creerà un file compresso che contiene i dati dell'istanza di ownCloud. Scegli il tipo di esportazione:",
-"Export" => "Esporta"
-);
diff --git a/apps/admin_migrate/l10n/ja_JP.php b/apps/admin_migrate/l10n/ja_JP.php
deleted file mode 100644
index f8e5944a6a..0000000000
--- a/apps/admin_migrate/l10n/ja_JP.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Export this ownCloud instance" => "ownCloudをエクスポート",
-"This will create a compressed file that contains the data of this owncloud instance.\n            Please choose the export type:" => "このownCloudのデータを含む圧縮ファイルを生成します。\nエクスポートの種類を選択してください:",
-"Export" => "エクスポート"
-);
diff --git a/apps/admin_migrate/l10n/lt_LT.php b/apps/admin_migrate/l10n/lt_LT.php
deleted file mode 100644
index f78263da75..0000000000
--- a/apps/admin_migrate/l10n/lt_LT.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Export this ownCloud instance" => "Eksportuoti šią ownCloud instaliaciją",
-"This will create a compressed file that contains the data of this owncloud instance.\n            Please choose the export type:" => "Bus sukurtas archyvas su visais owncloud duomenimis ir failais.\n            Pasirinkite eksportavimo tipą:",
-"Export" => "Eksportuoti"
-);
diff --git a/apps/admin_migrate/l10n/nb_NO.php b/apps/admin_migrate/l10n/nb_NO.php
deleted file mode 100644
index 31f4c030bd..0000000000
--- a/apps/admin_migrate/l10n/nb_NO.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Export this ownCloud instance" => "Eksporter denne ownCloud forekomsten",
-"This will create a compressed file that contains the data of this owncloud instance.\n            Please choose the export type:" => "Dette vil opprette en komprimert fil som inneholder dataene fra denne ownCloud forekomsten.⏎ Vennligst velg eksporttype:",
-"Export" => "Eksport"
-);
diff --git a/apps/admin_migrate/l10n/nl.php b/apps/admin_migrate/l10n/nl.php
deleted file mode 100644
index d1a7372c10..0000000000
--- a/apps/admin_migrate/l10n/nl.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Export this ownCloud instance" => "Exporteer deze ownCloud instantie",
-"This will create a compressed file that contains the data of this owncloud instance.\n            Please choose the export type:" => "Dit maakt een gecomprimeerd bestand, met de inhoud van deze ownCloud instantie.  Kies het export type:",
-"Export" => "Exporteer"
-);
diff --git a/apps/admin_migrate/l10n/pl.php b/apps/admin_migrate/l10n/pl.php
deleted file mode 100644
index 292601daa2..0000000000
--- a/apps/admin_migrate/l10n/pl.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Export this ownCloud instance" => "Eksportuj instancję ownCloud",
-"This will create a compressed file that contains the data of this owncloud instance.\n            Please choose the export type:" => "Spowoduje to utworzenie pliku skompresowanego, który zawiera dane tej instancji ownCloud.⏎ proszę wybrać typ eksportu:",
-"Export" => "Eksport"
-);
diff --git a/apps/admin_migrate/l10n/ru.php b/apps/admin_migrate/l10n/ru.php
deleted file mode 100644
index c862657580..0000000000
--- a/apps/admin_migrate/l10n/ru.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Export this ownCloud instance" => "Экспортировать этот экземпляр ownCloud",
-"This will create a compressed file that contains the data of this owncloud instance.\n            Please choose the export type:" => "Будет создан сжатый файл, содержащий данные этого экземпляра owncloud.\n            Выберите тип экспорта:",
-"Export" => "Экспорт"
-);
diff --git a/apps/admin_migrate/l10n/sl.php b/apps/admin_migrate/l10n/sl.php
deleted file mode 100644
index b8d1118bfe..0000000000
--- a/apps/admin_migrate/l10n/sl.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Export this ownCloud instance" => "Izvozi to ownCloud namestitev",
-"This will create a compressed file that contains the data of this owncloud instance.\n            Please choose the export type:" => "Ustvarjena bo stisnjena datoteka s podatki te ownCloud namestitve.\n            Prosimo, če izberete vrsto izvoza:",
-"Export" => "Izvozi"
-);
diff --git a/apps/admin_migrate/l10n/sv.php b/apps/admin_migrate/l10n/sv.php
deleted file mode 100644
index 57866e897e..0000000000
--- a/apps/admin_migrate/l10n/sv.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Export this ownCloud instance" => "Exportera denna instans av ownCloud",
-"This will create a compressed file that contains the data of this owncloud instance.\n            Please choose the export type:" => "Detta kommer att skapa en komprimerad fil som innehåller all data från denna instans av ownCloud.\n            Välj exporttyp:",
-"Export" => "Exportera"
-);
diff --git a/apps/admin_migrate/l10n/th_TH.php b/apps/admin_migrate/l10n/th_TH.php
deleted file mode 100644
index 9dfaca15b5..0000000000
--- a/apps/admin_migrate/l10n/th_TH.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Export this ownCloud instance" => "ส่งออกข้อมูลค่าสมมุติของ ownCloud นี้",
-"This will create a compressed file that contains the data of this owncloud instance.\n            Please choose the export type:" => "ส่วนนี้จะเป็นการสร้างไฟล์บีบอัดที่บรรจุข้อมูลค่าสมมุติของ ownCloud.\n            กรุณาเลือกชนิดของการส่งออกข้อมูล:",
-"Export" => "ส่งออก"
-);
diff --git a/apps/admin_migrate/settings.php b/apps/admin_migrate/settings.php
deleted file mode 100644
index daa56390af..0000000000
--- a/apps/admin_migrate/settings.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-
-/**
- * ownCloud - admin_migrate
- *
- * @author Thomas Schmidt
- * @copyright 2011 Thomas Schmidt tom@opensuse.org
- * @author Tom Needham
- * @copyright 2012 Tom Needham tom@owncloud.com
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *
- * You should have received a copy of the GNU Affero General Public
- * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-OCP\User::checkAdminUser();
-OCP\App::checkAppEnabled('admin_migrate');
-
-// Export?
-if (isset($_POST['admin_export'])) {
-	// Create the export zip
-	$response = json_decode( OC_Migrate::export( null, $_POST['export_type'] ) );
-	if( !$response->success ){
-		// Error
-		die('error');	
-	} else {
-		$path = $response->data;
-		// Download it
-		header("Content-Type: application/zip");
-		header("Content-Disposition: attachment; filename=" . basename($path));
-		header("Content-Length: " . filesize($path));
-		@ob_end_clean();
-		readfile( $path );
-		unlink( $path );
-	}
-// Import?
-} else if( isset($_POST['admin_import']) ){
-	$from = $_FILES['owncloud_import']['tmp_name'];
-
-	if( !OC_Migrate::import( $from, 'instance' ) ){
-		die('failed');	
-	}
-		
-} else {
-// fill template
-    $tmpl = new OCP\Template('admin_migrate', 'settings');
-    return $tmpl->fetchPage();
-}
\ No newline at end of file
diff --git a/apps/admin_migrate/templates/settings.php b/apps/admin_migrate/templates/settings.php
deleted file mode 100644
index f81c9199ec..0000000000
--- a/apps/admin_migrate/templates/settings.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<form id="export" action="#" method="post">
-    <fieldset class="personalblock">
-        <legend><strong><?php echo $l->t('Export this ownCloud instance');?></strong></legend>
-        <p><?php echo $l->t('This will create a compressed file that contains the data of this owncloud instance.
-            Please choose the export type:');?>
-        </p>
-        <h3>What would you like to export?</h3>
-        <p>
-        <input type="radio" name="export_type" value="instance" style="width:20px;" /> ownCloud instance (suitable for import )<br />
-	<input type="radio" name="export_type" value="system" style="width:20px;" /> ownCloud system files<br />
-	<input type="radio" name="export_type" value="userfiles" style="width:20px;" /> Just user files<br />
-        <input type="submit" name="admin_export" value="<?php echo $l->t('Export'); ?>" />
-    </fieldset>
-</form>
-<?php 
-/* 
- * EXPERIMENTAL
-?>
-<form id="import" action="#" method="post" enctype="multipart/form-data">
-    <fieldset class="personalblock">
-        <legend><strong><?php echo $l->t('Import an ownCloud instance. THIS WILL DELETE ALL CURRENT OWNCLOUD DATA');?></strong></legend>
-        <p><?php echo $l->t('All current ownCloud data will be replaced by the ownCloud instance that is uploaded.');?>
-        </p>
-        <p><input type="file" id="owncloud_import" name="owncloud_import"><label for="owncloud_import"><?php echo $l->t('ownCloud Export Zip File');?></label>
-        </p>
-        <input type="submit" name="admin_import" value="<?php echo $l->t('Import'); ?>" />
-    </fieldset>
-</form>
-<?php 
-*/ 
-?>
diff --git a/apps/bookmarks/addBm.php b/apps/bookmarks/addBm.php
deleted file mode 100644
index 4df93c8b05..0000000000
--- a/apps/bookmarks/addBm.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-/**
-* ownCloud - bookmarks plugin
-*
-* @author Arthur Schiwon
-* @copyright 2011 Arthur Schiwon blizzz@arthur-schiwon.de
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either
-* version 3 of the License, or any later version.
-*
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-*
-*/
-
-
-
-// Check if we are a user
-OCP\User::checkLoggedIn();
-OCP\App::checkAppEnabled('bookmarks');
-
-require_once('bookmarksHelper.php');
-addBookmark($_GET['url'], '', 'Read-Later');
-
-include 'templates/addBm.php';
diff --git a/apps/bookmarks/ajax/addBookmark.php b/apps/bookmarks/ajax/addBookmark.php
deleted file mode 100644
index baf3a288c1..0000000000
--- a/apps/bookmarks/ajax/addBookmark.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-/**
-* ownCloud - bookmarks plugin
-*
-* @author Arthur Schiwon
-* @copyright 2011 Arthur Schiwon blizzz@arthur-schiwon.de
-* 
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either 
-* version 3 of the License, or any later version.
-* 
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-*  
-* You should have received a copy of the GNU Lesser General Public 
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-* 
-*/
-
-//no apps or filesystem
-$RUNTIME_NOSETUPFS=true;
-
- 
-
-// Check if we are a user
-OCP\JSON::checkLoggedIn();
-OCP\JSON::callCheck();
-
-OCP\JSON::checkAppEnabled('bookmarks');
-
-require_once(OC_App::getAppPath('bookmarks').'/bookmarksHelper.php');
-$id = addBookmark($_POST['url'], $_POST['title'], $_POST['tags']);
-OCP\JSON::success(array('data' => $id));
diff --git a/apps/bookmarks/ajax/delBookmark.php b/apps/bookmarks/ajax/delBookmark.php
deleted file mode 100644
index 26437ea0c8..0000000000
--- a/apps/bookmarks/ajax/delBookmark.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-/**
-* ownCloud - bookmarks plugin
-*
-* @author Arthur Schiwon
-* @copyright 2011 Arthur Schiwon blizzz@arthur-schiwon.de
-* 
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either 
-* version 3 of the License, or any later version.
-* 
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-*  
-* You should have received a copy of the GNU Lesser General Public 
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-* 
-*/
-
-// Check if we are a user
-OCP\JSON::checkLoggedIn();
-OCP\JSON::callCheck();
-
-OCP\JSON::checkAppEnabled('bookmarks');
-OCP\JSON::callCheck();
-
-$id = $_POST['id'];
-if (!OC_Bookmarks_Bookmarks::deleteUrl($id)){
-	OC_JSON::error();
-	exit();
-}
-
-OCP\JSON::success();
diff --git a/apps/bookmarks/ajax/editBookmark.php b/apps/bookmarks/ajax/editBookmark.php
deleted file mode 100644
index 617021e412..0000000000
--- a/apps/bookmarks/ajax/editBookmark.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-
-/**
-* ownCloud - bookmarks plugin - edit bookmark script
-*
-* @author Golnaz Nilieh
-* @copyright 2011 Golnaz Nilieh <golnaz.nilieh@gmail.com>
-* 
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either 
-* version 3 of the License, or any later version.
-* 
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-*  
-* You should have received a copy of the GNU Lesser General Public 
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-* 
-*/
-
-// Check if we are a user
-OCP\JSON::checkLoggedIn();
-OCP\JSON::callCheck();
-
-OCP\JSON::checkAppEnabled('bookmarks');
-
-$CONFIG_DBTYPE = OCP\Config::getSystemValue( "dbtype", "sqlite" );
-if( $CONFIG_DBTYPE == 'sqlite' or $CONFIG_DBTYPE == 'sqlite3' ){
-	$_ut = "strftime('%s','now')";
-} elseif($CONFIG_DBTYPE == 'pgsql') {
-	$_ut = 'date_part(\'epoch\',now())::integer';
-} elseif($CONFIG_DBTYPE == 'oci') {
-	$_ut = '(oracletime - to_date(\'19700101\',\'YYYYMMDD\')) * 86400';
-} else {
-	$_ut = "UNIX_TIMESTAMP()";
-}
-
-$bookmark_id = (int)$_POST["id"];
-$user_id = OCP\USER::getUser();
-
-//TODO check using CURRENT_TIMESTAMP? prepare already does magic when using now()
-$query = OCP\DB::prepare('
-	UPDATE `*PREFIX*bookmarks`
-	SET `url` = ?, `title` = ?, `lastmodified` = '.$_ut.'
-	WHERE `id` = ?
-	AND `user_id` = ?
-	');
-
-$params=array(
-	htmlspecialchars_decode($_POST["url"]),
-	htmlspecialchars_decode($_POST["title"]),
-	$bookmark_id,
-	$user_id,
-	);
-
-$result = $query->execute($params);
-
-# Abort the operation if bookmark couldn't be set (probably because the user is not allowed to edit this bookmark)
-if ($result->numRows() == 0) exit();
-
-# Remove old tags and insert new ones.
-$query = OCP\DB::prepare('
-	DELETE FROM `*PREFIX*bookmarks_tags`
-	WHERE `bookmark_id` = ?
-	');
-
-$params=array(
-	$bookmark_id
-	);
-
-$query->execute($params);
-
-$query = OCP\DB::prepare('
-	INSERT INTO `*PREFIX*bookmarks_tags`
-	(`bookmark_id`, `tag`)
-	VALUES (?, ?)
-	');
-
-$tags = explode(' ', urldecode($_POST["tags"]));
-foreach ($tags as $tag) {
-	if(empty($tag)) {
-		//avoid saving blankspaces
-		continue;
-	}
-	$params = array($bookmark_id, trim($tag));
-	$query->execute($params);
-}
diff --git a/apps/bookmarks/ajax/recordClick.php b/apps/bookmarks/ajax/recordClick.php
deleted file mode 100644
index 785056dc11..0000000000
--- a/apps/bookmarks/ajax/recordClick.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/**
-* ownCloud - bookmarks plugin
-*
-* @author Arthur Schiwon
-* @copyright 2011 Arthur Schiwon blizzz@arthur-schiwon.de
-* 
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either 
-* version 3 of the License, or any later version.
-* 
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-*  
-* You should have received a copy of the GNU Lesser General Public 
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-* 
-*/
-
-// Check if we are a user
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('bookmarks');
-
-$query = OCP\DB::prepare('
-	UPDATE `*PREFIX*bookmarks`
-	SET `clickcount` = `clickcount` + 1
-	WHERE `user_id` = ?
-		AND `url` LIKE ?
-	');
-	
-$params=array(OCP\USER::getUser(), htmlspecialchars_decode($_POST["url"]));
-$bookmarks = $query->execute($params);
-
-header( "HTTP/1.1 204 No Content" );
-
diff --git a/apps/bookmarks/ajax/updateList.php b/apps/bookmarks/ajax/updateList.php
deleted file mode 100644
index cf9a2cf918..0000000000
--- a/apps/bookmarks/ajax/updateList.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-/**
-* ownCloud - bookmarks plugin
-*
-* @author Arthur Schiwon
-* @copyright 2011 Arthur Schiwon blizzz@arthur-schiwon.de
-* @copyright 2012 David Iwanowitsch <david at unclouded dot de>
-* 
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either 
-* version 3 of the License, or any later version.
-* 
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-*  
-* You should have received a copy of the GNU Lesser General Public 
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-* 
-*/
-
-// Check if we are a user
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('bookmarks');
-
-
-//Filter for tag?
-$filterTag = isset($_POST['tag']) ? htmlspecialchars_decode($_POST['tag']) : false;
-
-$offset = isset($_POST['page']) ? intval($_POST['page']) * 10 : 0;
-
-$sort = isset($_POST['sort']) ? ($_POST['sort']) : 'bookmarks_sorting_recent';
-if($sort == 'bookmarks_sorting_clicks') {
-	$sqlSortColumn = 'clickcount';
-} else {
-	$sqlSortColumn = 'id';
-}
-
-
-$bookmarks = OC_Bookmarks_Bookmarks::findBookmarks($offset, $sqlSortColumn, $filterTag, true);
-
-OCP\JSON::success(array('data' => $bookmarks));
diff --git a/apps/bookmarks/appinfo/app.php b/apps/bookmarks/appinfo/app.php
deleted file mode 100644
index f4bca9df70..0000000000
--- a/apps/bookmarks/appinfo/app.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
-* Copyright (c) 2011 Marvin Thomas Rabe <mrabe@marvinrabe.de>
-* Copyright (c) 2011 Arthur Schiwon <blizzz@arthur-schiwon.de>
-* This file is licensed under the Affero General Public License version 3 or
-* later.
-* See the COPYING-README file.
-*/
-
-OC::$CLASSPATH['OC_Bookmarks_Bookmarks'] = 'apps/bookmarks/lib/bookmarks.php';
-OC::$CLASSPATH['OC_Search_Provider_Bookmarks'] = 'apps/bookmarks/lib/search.php';
-
-$l = new OC_l10n('bookmarks');
-OCP\App::addNavigationEntry( array( 'id' => 'bookmarks_index', 'order' => 70, 'href' => OCP\Util::linkTo( 'bookmarks', 'index.php' ), 'icon' => OCP\Util::imagePath( 'bookmarks', 'bookmarks.png' ), 'name' => $l->t('Bookmarks')));
-
-OCP\App::registerPersonal('bookmarks', 'settings');
-OCP\Util::addscript('bookmarks','bookmarksearch');
-
-OC_Search::registerProvider('OC_Search_Provider_Bookmarks');
diff --git a/apps/bookmarks/appinfo/database.xml b/apps/bookmarks/appinfo/database.xml
deleted file mode 100644
index d28857b075..0000000000
--- a/apps/bookmarks/appinfo/database.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<database>
-	<name>*dbname*</name>
-	<create>true</create>
-	<overwrite>false</overwrite>
-	<charset>utf8</charset>
-	<table>
-		<name>*dbprefix*bookmarks</name>
-		<declaration>
-			<field>
-				<name>id</name>
-				<type>integer</type>
-				<autoincrement>1</autoincrement>
-				<default>0</default>
-				<notnull>true</notnull>
-				<length>4</length>
-			</field>
-			<field>
-				<name>url</name>
-				<type>text</type>
-				<default></default>
-				<notnull>true</notnull>
-				<length>4096</length>
-			</field>
-			<field>
-				<name>title</name>
-				<type>text</type>
-				<default></default>
-				<notnull>true</notnull>
-				<length>140</length>
-			</field>
-			<field>
-				<name>user_id</name>
-				<type>text</type>
-				<default></default>
-				<notnull>true</notnull>
-				<length>64</length>
-			</field>
-			<field>
-				<name>public</name>
-				<type>integer</type>
-				<default>0</default>
-				<length>1</length>
-			</field>
-			<field>
-				<name>added</name>
-				<type>integer</type>
-				<default></default>
-				<notnull>false</notnull>
-				<unsigned>true</unsigned>
-				<length>4</length>
-			</field>
-			<field>
-				<name>lastmodified</name>
-				<type>integer</type>
-				<default></default>
-				<notnull>false</notnull>
-				<unsigned>true</unsigned>
-				<length>4</length>
-			</field>
-			<field>
-				<name>clickcount</name>
-				<type>integer</type>
-				<default>0</default>
-				<notnull>true</notnull>
-				<unsigned>true</unsigned>
-				<length>4</length>
-			</field>
-			
-			<index>
-				<name>id</name>
-				<unique>true</unique>
-				<field>
-					<name>id</name>
-					<sorting>descending</sorting>
-				</field>
-			</index>
-		</declaration>
-	</table>
-	
-	<table>
-		<name>*dbprefix*bookmarks_tags</name>
-		<declaration>
-			<field>
-				<name>bookmark_id</name>
-				<type>integer</type>
-				<length>64</length>
-			</field>
-			
-			<field>
-				<name>tag</name>
-				<type>text</type>
-				<default></default>
-				<notnull>true</notnull>
-				<length>255</length>
-			</field>
-			<index>
-				<name>bookmark_tag</name>
-				<unique>true</unique>
-				<field>
-					<name>bookmark_id</name>
-					<sorting>ascending</sorting>
-				</field>
-				<field>
-					<name>tag</name>
-					<sorting>ascending</sorting>
-				</field>
-			</index>
-		</declaration>
-	</table>
-</database>
-			
diff --git a/apps/bookmarks/appinfo/info.xml b/apps/bookmarks/appinfo/info.xml
deleted file mode 100644
index 93510815f5..0000000000
--- a/apps/bookmarks/appinfo/info.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<info>
-	<id>bookmarks</id>
-	<name>Bookmarks</name>
-	<description>Bookmark manager for ownCloud</description>
-	<licence>AGPL</licence>
-	<author>Arthur Schiwon, Marvin Thomas Rabe</author>
-	<standalone/>
-	<require>4</require>
-	<shipped>true</shipped>
-</info>
diff --git a/apps/bookmarks/appinfo/migrate.php b/apps/bookmarks/appinfo/migrate.php
deleted file mode 100644
index f14469269a..0000000000
--- a/apps/bookmarks/appinfo/migrate.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-class OC_Migration_Provider_Bookmarks extends OC_Migration_Provider{
-	
-	// Create the xml for the user supplied
-	function export( ){
-		$options = array(
-			'table'=>'bookmarks',
-			'matchcol'=>'user_id',
-			'matchval'=>$this->uid,
-			'idcol'=>'id'
-		);
-		$ids = $this->content->copyRows( $options );
-
-		$options = array(
-			'table'=>'bookmarks_tags',
-			'matchcol'=>'bookmark_id',
-			'matchval'=>$ids
-		);
-		
-		// Export tags
-		$ids2 = $this->content->copyRows( $options );
-		
-		// If both returned some ids then they worked
-		if( is_array( $ids ) && is_array( $ids2 ) )
-		{
-			return true;	
-		} else {
-			return false;
-		}
-		
-	}
-	
-	// Import function for bookmarks
-	function import( ){
-		switch( $this->appinfo->version ){
-			default:
-				// All versions of the app have had the same db structure, so all can use the same import function
-				$query = $this->content->prepare( "SELECT * FROM `bookmarks` WHERE `user_id` LIKE ?" );
-				$results = $query->execute( array( $this->olduid ) );
-				$idmap = array();
-				while( $row = $results->fetchRow() ){
-					// Import each bookmark, saving its id into the map	
-					$query = OCP\DB::prepare( "INSERT INTO `*PREFIX*bookmarks`(`url`, `title`, `user_id`, `public`, `added`, `lastmodified`) VALUES (?, ?, ?, ?, ?, ?)" );
-					$query->execute( array( $row['url'], $row['title'], $this->uid, $row['public'], $row['added'], $row['lastmodified'] ) );
-					// Map the id
-					$idmap[$row['id']] = OCP\DB::insertid();
-				}
-				// Now tags
-				foreach($idmap as $oldid => $newid){
-					$query = $this->content->prepare( "SELECT * FROM `bookmarks_tags` WHERE `bookmark_id` LIKE ?" );
-					$results = $query->execute( array( $oldid ) );
-					while( $row = $results->fetchRow() ){
-						// Import the tags for this bookmark, using the new bookmark id
-						$query = OCP\DB::prepare( "INSERT INTO `*PREFIX*bookmarks_tags`(`bookmark_id`, `tag`) VALUES (?, ?)" );
-						$query->execute( array( $newid, $row['tag'] ) );	
-					}		
-				}
-				// All done!
-			break;
-		}
-		
-		return true;
-	}
-	
-}
-
-// Load the provider
-new OC_Migration_Provider_Bookmarks( 'bookmarks' );
\ No newline at end of file
diff --git a/apps/bookmarks/appinfo/version b/apps/bookmarks/appinfo/version
deleted file mode 100644
index 2f4536184b..0000000000
--- a/apps/bookmarks/appinfo/version
+++ /dev/null
@@ -1 +0,0 @@
-0.2
\ No newline at end of file
diff --git a/apps/bookmarks/bookmarksHelper.php b/apps/bookmarks/bookmarksHelper.php
deleted file mode 100644
index 988042fc0e..0000000000
--- a/apps/bookmarks/bookmarksHelper.php
+++ /dev/null
@@ -1,130 +0,0 @@
-<?php
-
-// Source: http://www.php.net/manual/de/function.curl-setopt.php#102121
-// This works around a safe_mode/open_basedir restriction
-function curl_exec_follow(/*resource*/ $ch, /*int*/ &$maxredirect = null) {
-	$mr = $maxredirect === null ? 5 : intval($maxredirect);
-	if (ini_get('open_basedir') == '' && ini_get('safe_mode' == 'Off')) {
-		curl_setopt($ch, CURLOPT_FOLLOWLOCATION, $mr > 0);
-		curl_setopt($ch, CURLOPT_MAXREDIRS, $mr);
-	} else {
-		curl_setopt($ch, CURLOPT_FOLLOWLOCATION, false);
-		if ($mr > 0) {
-			$newurl = curl_getinfo($ch, CURLINFO_EFFECTIVE_URL);
-
-			$rch = curl_copy_handle($ch);
-			curl_setopt($rch, CURLOPT_HEADER, true);
-			curl_setopt($rch, CURLOPT_NOBODY, true);
-			curl_setopt($rch, CURLOPT_FORBID_REUSE, false);
-			curl_setopt($rch, CURLOPT_RETURNTRANSFER, true);
-			do {
-				curl_setopt($rch, CURLOPT_URL, $newurl);
-				$header = curl_exec($rch);
-				if (curl_errno($rch)) {
-					$code = 0;
-				} else {
-					$code = curl_getinfo($rch, CURLINFO_HTTP_CODE);
-					if ($code == 301 || $code == 302) {
-						preg_match('/Location:(.*?)\n/', $header, $matches);
-						$newurl = trim(array_pop($matches));
-					} else {
-						$code = 0;
-					}
-				}
-			} while ($code && --$mr);
-			curl_close($rch);
-			if (!$mr) {
-				if ($maxredirect === null) {
-					trigger_error('Too many redirects. When following redirects, libcurl hit the maximum amount.', E_USER_WARNING);
-				} else {
-					$maxredirect = 0;
-				}
-				return false;
-			}
-			curl_setopt($ch, CURLOPT_URL, $newurl);
-		}
-	}
-	return curl_exec($ch);
-}
-
-function getURLMetadata($url) {
-	//allow only http(s) and (s)ftp
-	$protocols = '/^[hs]{0,1}[tf]{0,1}tp[s]{0,1}\:\/\//i';
-	//if not (allowed) protocol is given, assume http
-	if(preg_match($protocols, $url) == 0) {
-		$url = 'http://' . $url;
-	} 
-	$metadata['url'] = $url;
-
-	if (!function_exists('curl_init')){
-		return $metadata;
-	}
-	$ch = curl_init();
-	curl_setopt($ch, CURLOPT_URL, $url);
-	curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-	$page = curl_exec_follow($ch);
-	curl_close($ch);
-
-	@preg_match( "/<title>(.*)<\/title>/si", $page, $match );
-	$metadata['title'] = htmlspecialchars_decode(@$match[1]); 
-
-	return $metadata;
-}
-
-function addBookmark($url, $title, $tags='') {
-	$CONFIG_DBTYPE = OCP\Config::getSystemValue( "dbtype", "sqlite" );
-	if( $CONFIG_DBTYPE == 'sqlite' or $CONFIG_DBTYPE == 'sqlite3' ){
-		$_ut = "strftime('%s','now')";
-	} elseif($CONFIG_DBTYPE == 'pgsql') {
-		$_ut = 'date_part(\'epoch\',now())::integer';
-	} else {
-		$_ut = "UNIX_TIMESTAMP()";
-	}
-	
-	//FIXME: Detect when user adds a known URL
-	$query = OCP\DB::prepare("
-		INSERT INTO `*PREFIX*bookmarks`
-		(`url`, `title`, `user_id`, `public`, `added`, `lastmodified`)
-		VALUES (?, ?, ?, 0, $_ut, $_ut)
-		");
-	
-	if(empty($title)) {
-		$metadata = getURLMetadata($url);
-		if(isset($metadata['title'])) // Check for problems fetching the title
-			$title = $metadata['title'];
-	}
-	
-	if(empty($title)) {
-		$l = OC_L10N::get('bookmarks');
-		$title = $l->t('unnamed');
-	}
-	
-	$params=array(
-	htmlspecialchars_decode($url),
-	htmlspecialchars_decode($title),
-	OCP\USER::getUser()
-	);
-	$query->execute($params);
-	
-	$b_id = OCP\DB::insertid('*PREFIX*bookmarks');
-	
-	if($b_id !== false) {
-		$query = OCP\DB::prepare("
-			INSERT INTO `*PREFIX*bookmarks_tags`
-			(`bookmark_id`, `tag`)
-			VALUES (?, ?)
-			");
-	
-		$tags = explode(' ', urldecode($tags));
-		foreach ($tags as $tag) {
-			if(empty($tag)) {
-				//avoid saving blankspaces
-				continue;
-			}
-			$params = array($b_id, trim($tag));
-			$query->execute($params);
-		}
-	
-		return $b_id;
-	}
-}
diff --git a/apps/bookmarks/css/bookmarks.css b/apps/bookmarks/css/bookmarks.css
deleted file mode 100644
index a67afcd44f..0000000000
--- a/apps/bookmarks/css/bookmarks.css
+++ /dev/null
@@ -1,87 +0,0 @@
-#content { overflow: auto; height: 100%; }
-#firstrun { width: 80%; margin: 5em auto auto auto; text-align: center; font-weight:bold; font-size:1.5em;  color:#777; position: relative;}
-#firstrun small { display: block; font-weight: normal; font-size: 0.5em; margin-bottom: 1.5em; }
-#firstrun .button { font-size: 0.7em; }
-#firstrun #selections { font-size:0.8em;  font-weight: normal; width: 100%; margin: 2em auto auto auto; clear: both; }
-
-.bookmarks_headline {
-	font-size: large;
-	font-weight: bold;
-	margin-left: 2em;
-	padding: 2.5ex 0.5ex;
-}
-
-.bookmarks_menu {
-	margin-left: 1.5em;
-	padding: 0.5ex;
-}
-
-.bookmarks_list {
-	overflow: auto;
-	position: fixed;
-	top: 6.5em;
-}
-
-.bookmarks_addBml {
-	text-decoration: underline;
-}
-
-.bookmarks_label {
-	width: 7em;
-	display: inline-block;
-	text-align: right;
-}
-
-.bookmarks_input {
-	width: 8em;
-}
-
-.bookmark_actions {
-	position: absolute;
-	right: 1em;
-	top: 0.7em;
-	display: none;
-}
-.bookmark_actions span { margin: 0 0.4em; }
-.bookmark_actions img { opacity: 0.3; }
-.bookmark_actions img:hover { opacity: 1; cursor: pointer; }
-
-.bookmark_single {
-	position: relative;
-	padding: 0.5em 1em;
-	border-bottom: 1px solid #DDD;
-	-webkit-transition:background-color 500ms; -moz-transition:background-color 500ms; -o-transition:background-color 500ms; transition:background-color 500ms;
-}
-
-.bookmark_single:hover {
-	background-color:#f8f8f8
-}
-
-.bookmark_single:hover .bookmark_actions {
-	display: block;
-}
-
-.bookmark_title { font-weight: bold; display: inline-block; margin-right: 0.8em; }
-.bookmark_url { display: none; color: #999; }
-.bookmark_single:hover .bookmark_url { display: inline; }
-.bookmark_tags {
-	position: absolute;
-	top: 0.5em;
-	right: 6em;
-	text-align: right;
-}
-.bookmark_tag {
-	display: inline-block;
-	color: white;
-	margin: 0 0.2em;
-	padding: 0 0.4em;
-	background-color: #1D2D44;
-	border-radius: 0.4em;
-	opacity: 0.2;
-}
-.bookmark_tag:hover { opacity: 0.5; }
-
-.loading_meta {
-	display: none;
-	margin-left: 5px;
-}
diff --git a/apps/bookmarks/img/bookmarks.png b/apps/bookmarks/img/bookmarks.png
deleted file mode 100644
index 3e8eed2380..0000000000
Binary files a/apps/bookmarks/img/bookmarks.png and /dev/null differ
diff --git a/apps/bookmarks/index.php b/apps/bookmarks/index.php
deleted file mode 100644
index a4ce022987..0000000000
--- a/apps/bookmarks/index.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-/**
-* ownCloud - bookmarks plugin
-*
-* @author Arthur Schiwon
-* @copyright 2011 Arthur Schiwon blizzz@arthur-schiwon.de
-* 
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either 
-* version 3 of the License, or any later version.
-* 
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-*  
-* You should have received a copy of the GNU Lesser General Public 
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-* 
-*/
-
-
-
-// Check if we are a user
-OCP\User::checkLoggedIn();
-OCP\App::checkAppEnabled('bookmarks');
-
-OCP\App::setActiveNavigationEntry( 'bookmarks_index' );
-
-OCP\Util::addscript('bookmarks','bookmarks');
-OCP\Util::addStyle('bookmarks', 'bookmarks');
-
-$tmpl = new OCP\Template( 'bookmarks', 'list', 'user' );
-
-$tmpl->printPage();
diff --git a/apps/bookmarks/js/addBm.js b/apps/bookmarks/js/addBm.js
deleted file mode 100644
index 625ac8420a..0000000000
--- a/apps/bookmarks/js/addBm.js
+++ /dev/null
@@ -1,16 +0,0 @@
-$(document).ready(function() {
-	$('#bookmark_add_submit').click(addBookmark);
-});
-
-function addBookmark(event) {
-	var url = $('#bookmark_add_url').val();
-	var tags = $('#bookmark_add_tags').val();
-	$.ajax({
-		type: 'POST',
-		url: 'ajax/addBookmark.php',
-		data: 'url=' + encodeURI(url) + '&tags=' + encodeURI(tags),
-		success: function(data){ 
-			window.close();
-		}
-	});
-}
\ No newline at end of file
diff --git a/apps/bookmarks/js/bookmarks.js b/apps/bookmarks/js/bookmarks.js
deleted file mode 100644
index 7f3104e812..0000000000
--- a/apps/bookmarks/js/bookmarks.js
+++ /dev/null
@@ -1,201 +0,0 @@
-var bookmarks_page = 0;
-var bookmarks_loading = false;
-
-var bookmarks_sorting = 'bookmarks_sorting_recent';
-
-$(document).ready(function() {
-	$('#bookmark_add_submit').click(addOrEditBookmark);
-	$(window).resize(function () {
-		fillWindow($('.bookmarks_list'));
-	});
-	$(window).resize();
-	$('.bookmarks_list').scroll(updateOnBottom).empty().width($('#content').width());
-	getBookmarks();
-});
-
-function getBookmarks() {
-	if(bookmarks_loading) {
-		//have patience :)
-		return;
-	}
-
-	$.ajax({
-		  type: 'POST',
-		url: OC.filePath('bookmarks', 'ajax', 'updateList.php'),
-		data: 'tag=' + encodeURIComponent($('#bookmarkFilterTag').val()) + '&page=' + bookmarks_page + '&sort=' + bookmarks_sorting,
-		success: function(bookmarks){
-			if (bookmarks.data.length) {
-				bookmarks_page += 1;
-			}
-			$('.bookmark_link').unbind('click', recordClick);
-			$('.bookmark_delete').unbind('click', delBookmark);
-			$('.bookmark_edit').unbind('click', showBookmark);
-
-			for(var i in bookmarks.data) {
-				updateBookmarksList(bookmarks.data[i]);
-				$("#firstrun").hide();
-			}
-			if($('.bookmarks_list').is(':empty')) {
-				$("#firstrun").show();
-			}
-
-			$('.bookmark_link').click(recordClick);
-			$('.bookmark_delete').click(delBookmark);
-			$('.bookmark_edit').click(showBookmark);
-
-			bookmarks_loading = false;
-			if (bookmarks.data.length) {
-				updateOnBottom()
-			}
-		}
-	});
-}
-
-// function addBookmark() {
-// Instead of creating editBookmark() function, Converted the one above to
-// addOrEditBookmark() to make .js file more compact.
-
-function addOrEditBookmark(event) {
-	var id = $('#bookmark_add_id').val();
-	var url = encodeEntities($('#bookmark_add_url').val());
-	var title = encodeEntities($('#bookmark_add_title').val());
-	var tags = encodeEntities($('#bookmark_add_tags').val());
-	$("#firstrun").hide();
-	if($.trim(url) == '') {
-		OC.dialogs.alert('A valid bookmark url must be provided', 'Error creating bookmark');
-		return false;
-	}
-	if($.trim(title) == '') {
-		OC.dialogs.alert('A valid bookmark title must be provided', 'Error creating bookmark');
-		return false;
-	}
-	if (id == 0) {
-		$.ajax({
-			type: 'POST',
-			url: OC.filePath('bookmarks', 'ajax', 'addBookmark.php'),
-			data: 'url=' + encodeURIComponent(url) + '&title=' + encodeURIComponent(title) + '&tags=' + encodeURIComponent(tags),
-			success: function(response){
-				$('.bookmarks_input').val('');
-				$('.bookmarks_list').empty();
-				bookmarks_page = 0;
-				getBookmarks();
-			}
-		});
-	}
-	else {
-		$.ajax({
-			type: 'POST',
-			url: OC.filePath('bookmarks', 'ajax', 'editBookmark.php'),
-			data: 'id=' + id + '&url=' + encodeURIComponent(url) + '&title=' + encodeURIComponent(title) + '&tags=' + encodeURIComponent(tags),
-			success: function(){
-				$('.bookmarks_input').val('');
-				$('#bookmark_add_id').val('0');
-				$('.bookmarks_list').empty();
-				bookmarks_page = 0;
-				getBookmarks();
-			}
-		});
-	}
-
-}
-
-function delBookmark(event) {
-	var record = $(this).parent().parent();
-	$.ajax({
-		type: 'POST',
-		url: OC.filePath('bookmarks', 'ajax', 'delBookmark.php'),
-		data: 'id=' + record.data('id'),
-		success: function(data){
-			if (data.status == 'success') {
-				record.remove();
-				if($('.bookmarks_list').is(':empty')) {
-					$("#firstrun").show();
-				}
-			}
-		}
-	});
-}
-
-function showBookmark(event) {
-	var record = $(this).parent().parent();
-	$('#bookmark_add_id').val(record.attr('data-id'));
-	$('#bookmark_add_url').val(record.children('.bookmark_url:first').text());
-	$('#bookmark_add_title').val(record.children('.bookmark_title:first').text());
-	$('#bookmark_add_tags').val(record.children('.bookmark_tags:first').text());
-
-	if ($('.bookmarks_add').css('display') == 'none') {
-		$('.bookmarks_add').slideToggle();
-	}
-}
-
-function replaceQueryString(url,param,value) {
-    var re = new RegExp("([?|&])" + param + "=.*?(&|$)","i");
-    if (url.match(re))
-        return url.replace(re,'$1' + param + "=" + value + '$2');
-    else
-        return url + '&' + param + "=" + value;
-}
-
-function updateBookmarksList(bookmark) {
-	var tags = encodeEntities(bookmark.tags).split(' ');
-	var taglist = '';
-	for ( var i=0, len=tags.length; i<len; ++i ){
-		if(tags[i] != '')
-			taglist = taglist + '<a class="bookmark_tag" href="'+replaceQueryString( String(window.location), 'tag', encodeURIComponent(tags[i])) + '">' + tags[i] + '</a> ';
-	}
-	if(!hasProtocol(bookmark.url)) {
-		bookmark.url = 'http://' + bookmark.url;
-	}
-	if(bookmark.title == '') bookmark.title = bookmark.url;
-	$('.bookmarks_list').append(
-		'<div class="bookmark_single" data-id="' + bookmark.id +'" >' +
-			'<p class="bookmark_actions">' +
-				'<span class="bookmark_edit">' +
-					'<img class="svg" src="'+OC.imagePath('core', 'actions/rename')+'" title="Edit">' +
-				'</span>' +
-				'<span class="bookmark_delete">' +
-					'<img class="svg" src="'+OC.imagePath('core', 'actions/delete')+'" title="Delete">' +
-				'</span>&nbsp;' +
-			'</p>' +
-			'<p class="bookmark_title">'+
-				'<a href="' + encodeEntities(bookmark.url) + '" target="_blank" class="bookmark_link">' + encodeEntities(bookmark.title) + '</a>' +
-			'</p>' +
-			'<p class="bookmark_url"><a href="' + encodeEntities(bookmark.url) + '" target="_blank" class="bookmark_link">' + encodeEntities(bookmark.url) + '</a></p>' +
-		'</div>'
-	);
-	if(taglist != '') {
-		$('div[data-id="'+ bookmark.id +'"]').append('<p class="bookmark_tags">' + taglist + '</p>');
-	}
-}
-
-function updateOnBottom() {
-	//check wether user is on bottom of the page
-	var top = $('.bookmarks_list>:last-child').position().top;
-	var height = $('.bookmarks_list').height();
-	// use a bit of margin to begin loading before we are really at the
-	// bottom
-	if (top < height * 1.2) {
-		getBookmarks();
-	}
-}
-
-function recordClick(event) {
-	$.ajax({
-		type: 'POST',
-		url: OC.filePath('bookmarks', 'ajax', 'recordClick.php'),
-		data: 'url=' + encodeURIComponent($(this).attr('href')),
-	});
-}
-
-function encodeEntities(s){
-	try {
-		return $('<div/>').text(s).html();
-	} catch (ex) {
-		return "";
-	}
-}
-
-function hasProtocol(url) {
-    var regexp = /(ftp|http|https|sftp)/;
-    return regexp.test(url);
-}
diff --git a/apps/bookmarks/js/bookmarksearch.js b/apps/bookmarks/js/bookmarksearch.js
deleted file mode 100644
index e8f5363c93..0000000000
--- a/apps/bookmarks/js/bookmarksearch.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * Copyright (c) 2012 David Iwanowitsch <david at unclouded dot de>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-$(document).ready(function(){
-	OC.search.customResults['Bookm.'] = function(row,item){
-		var a=row.find('a');
-		a.attr('target','_blank');
-		a.click(recordClick);
-	}
-});
-
-function recordClick(event) {
-	var jsFileLocation = $('script[src*=bookmarksearch]').attr('src');
-	jsFileLocation = jsFileLocation.replace('js/bookmarksearch.js', '');
-	$.ajax({
-		type: 'POST',
-		url: jsFileLocation + 'ajax/recordClick.php',
-		data: 'url=' + encodeURI($(this).attr('href')),
-	});	
-}
diff --git a/apps/bookmarks/l10n/bg_BG.php b/apps/bookmarks/l10n/bg_BG.php
deleted file mode 100644
index 04d731b107..0000000000
--- a/apps/bookmarks/l10n/bg_BG.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Bookmarks" => "Отметки",
-"unnamed" => "неозаглавено",
-"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Завлачете това в лентата с отметки на браузъра си и го натискайте, когато искате да отметнете бързо някоя страница:",
-"Read later" => "Отмятане",
-"Address" => "Адрес",
-"Title" => "Заглавие",
-"Tags" => "Етикети",
-"Save bookmark" => "Запис на отметката",
-"You have no bookmarks" => "Нямате отметки",
-"Bookmarklet <br />" => "Бутон за отметки <br />"
-);
diff --git a/apps/bookmarks/l10n/ca.php b/apps/bookmarks/l10n/ca.php
deleted file mode 100644
index cf90d9a887..0000000000
--- a/apps/bookmarks/l10n/ca.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Bookmarks" => "Adreces d'interès",
-"unnamed" => "sense nom",
-"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Arrossegueu-ho al navegador i feu-hi un clic quan volgueu marcar ràpidament una adreça d'interès:",
-"Read later" => "Llegeix més tard",
-"Address" => "Adreça",
-"Title" => "Títol",
-"Tags" => "Etiquetes",
-"Save bookmark" => "Desa l'adreça d'interès",
-"You have no bookmarks" => "No teniu adreces d'interès",
-"Bookmarklet <br />" => "Bookmarklet <br />"
-);
diff --git a/apps/bookmarks/l10n/cs_CZ.php b/apps/bookmarks/l10n/cs_CZ.php
deleted file mode 100644
index 2251969a26..0000000000
--- a/apps/bookmarks/l10n/cs_CZ.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Bookmarks" => "Záložky",
-"unnamed" => "nepojmenovaný",
-"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Přetáhněte do Vašeho prohlížeče a kliněte, pokud si přejete rychle uložit stranu do záložek:",
-"Read later" => "Přečíst později",
-"Address" => "Adresa",
-"Title" => "Název",
-"Tags" => "Tagy",
-"Save bookmark" => "Uložit záložku",
-"You have no bookmarks" => "Nemáte žádné záložky",
-"Bookmarklet <br />" => "Záložky <br />"
-);
diff --git a/apps/bookmarks/l10n/de.php b/apps/bookmarks/l10n/de.php
deleted file mode 100644
index 14a54f1cce..0000000000
--- a/apps/bookmarks/l10n/de.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Bookmarks" => "Lesezeichen",
-"unnamed" => "unbenannt",
-"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Ziehen Sie dies zu Ihren Browser-Lesezeichen und klicken Sie darauf, wenn Sie eine Website schnell den Lesezeichen hinzufügen wollen.",
-"Read later" => "Später lesen",
-"Address" => "Adresse",
-"Title" => "Titel",
-"Tags" => "Tags",
-"Save bookmark" => "Lesezeichen speichern",
-"You have no bookmarks" => "Sie haben keine Lesezeichen",
-"Bookmarklet <br />" => "Bookmarklet <br />"
-);
diff --git a/apps/bookmarks/l10n/el.php b/apps/bookmarks/l10n/el.php
deleted file mode 100644
index f282a1bbf8..0000000000
--- a/apps/bookmarks/l10n/el.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Bookmarks" => "Σελιδοδείκτες",
-"unnamed" => "ανώνυμο",
-"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Σύρετε αυτό στους σελιδοδείκτες του περιηγητή σας και κάντε κλικ επάνω του, όταν θέλετε να προσθέσετε σύντομα μια ιστοσελίδα ως σελιδοδείκτη:",
-"Read later" => "Ανάγνωση αργότερα",
-"Address" => "Διεύθυνση",
-"Title" => "Τίτλος",
-"Tags" => "Ετικέτες",
-"Save bookmark" => "Αποθήκευση σελιδοδείκτη",
-"You have no bookmarks" => "Δεν έχετε σελιδοδείκτες",
-"Bookmarklet <br />" => "Εφαρμογίδιο Σελιδοδεικτών <br />"
-);
diff --git a/apps/bookmarks/l10n/eo.php b/apps/bookmarks/l10n/eo.php
deleted file mode 100644
index 808cda8a04..0000000000
--- a/apps/bookmarks/l10n/eo.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Bookmarks" => "Legosignoj",
-"unnamed" => "nenomita",
-"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Ŝovu tion ĉi al la legosignoj de via TTT-legilo kaj klaku ĝin, se vi volas rapide legosignigi TTT-paĝon:",
-"Read later" => "Legi poste",
-"Address" => "Adreso",
-"Title" => "Titolo",
-"Tags" => "Etikedoj",
-"Save bookmark" => "Konservi legosignon",
-"You have no bookmarks" => "Vi havas neniun legosignon"
-);
diff --git a/apps/bookmarks/l10n/es.php b/apps/bookmarks/l10n/es.php
deleted file mode 100644
index 071b0dda70..0000000000
--- a/apps/bookmarks/l10n/es.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Bookmarks" => "Marcadores",
-"unnamed" => "sin nombre",
-"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Arrastra desde aquí a los marcadores de tu navegador, y haz clic cuando quieras marcar una página web rápidamente:",
-"Read later" => "Leer después",
-"Address" => "Dirección",
-"Title" => "Título",
-"Tags" => "Etiquetas",
-"Save bookmark" => "Guardar marcador",
-"You have no bookmarks" => "No tienes marcadores",
-"Bookmarklet <br />" => "Bookmarklet <br />"
-);
diff --git a/apps/bookmarks/l10n/et_EE.php b/apps/bookmarks/l10n/et_EE.php
deleted file mode 100644
index da9e4d92a6..0000000000
--- a/apps/bookmarks/l10n/et_EE.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Bookmarks" => "Järjehoidjad",
-"unnamed" => "nimetu",
-"Read later" => "Loe hiljem",
-"Address" => "Aadress",
-"Title" => "Pealkiri",
-"Tags" => "Sildid",
-"Save bookmark" => "Salvesta järjehoidja",
-"You have no bookmarks" => "Sul pole järjehoidjaid"
-);
diff --git a/apps/bookmarks/l10n/fa.php b/apps/bookmarks/l10n/fa.php
deleted file mode 100644
index b46ce911d4..0000000000
--- a/apps/bookmarks/l10n/fa.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Bookmarks" => "نشانک‌ها",
-"unnamed" => "بدون‌نام",
-"Address" => "آدرس",
-"Title" => "عنوان",
-"Save bookmark" => "ذخیره نشانک",
-"You have no bookmarks" => "شما هیچ نشانکی ندارید"
-);
diff --git a/apps/bookmarks/l10n/fi_FI.php b/apps/bookmarks/l10n/fi_FI.php
deleted file mode 100644
index c814747411..0000000000
--- a/apps/bookmarks/l10n/fi_FI.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Bookmarks" => "Kirjanmerkit",
-"unnamed" => "nimetön",
-"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Vedä tämä selaimesi kirjanmerkkipalkkiin ja napsauta sitä, kun haluat lisätä kirjanmerkin nopeasti:",
-"Read later" => "Lue myöhemmin",
-"Address" => "Osoite",
-"Title" => "Otsikko",
-"Tags" => "Tunnisteet",
-"Save bookmark" => "Tallenna kirjanmerkki",
-"You have no bookmarks" => "Sinulla ei ole kirjanmerkkejä",
-"Bookmarklet <br />" => "Kirjanmerkitsin <br />"
-);
diff --git a/apps/bookmarks/l10n/fr.php b/apps/bookmarks/l10n/fr.php
deleted file mode 100644
index 508c82369f..0000000000
--- a/apps/bookmarks/l10n/fr.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Bookmarks" => "Favoris",
-"unnamed" => "sans titre",
-"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Glissez ceci dans les favoris de votre navigateur, et cliquer dessus lorsque vous souhaitez ajouter la page en cours à vos marques-pages :",
-"Read later" => "Lire plus tard",
-"Address" => "Adresse",
-"Title" => "Titre",
-"Tags" => "Étiquettes",
-"Save bookmark" => "Sauvegarder le favori",
-"You have no bookmarks" => "Vous n'avez aucun favori",
-"Bookmarklet <br />" => "Gestionnaire de favoris <br />"
-);
diff --git a/apps/bookmarks/l10n/it.php b/apps/bookmarks/l10n/it.php
deleted file mode 100644
index 862d75bde4..0000000000
--- a/apps/bookmarks/l10n/it.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Bookmarks" => "Segnalibri",
-"unnamed" => "senza nome",
-"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Quando vuoi creare rapidamente un segnalibro, trascinalo sui segnalibri del browser e fai clic su di esso:",
-"Read later" => "Leggi dopo",
-"Address" => "Indirizzo",
-"Title" => "Titolo",
-"Tags" => "Tag",
-"Save bookmark" => "Salva segnalibro",
-"You have no bookmarks" => "Non hai segnalibri",
-"Bookmarklet <br />" => "Bookmarklet <br />"
-);
diff --git a/apps/bookmarks/l10n/lt_LT.php b/apps/bookmarks/l10n/lt_LT.php
deleted file mode 100644
index 58faddc233..0000000000
--- a/apps/bookmarks/l10n/lt_LT.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php $TRANSLATIONS = array(
-"unnamed" => "be pavadinimo"
-);
diff --git a/apps/bookmarks/l10n/nb_NO.php b/apps/bookmarks/l10n/nb_NO.php
deleted file mode 100644
index 12e63887d2..0000000000
--- a/apps/bookmarks/l10n/nb_NO.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Bookmarks" => "Bokmerker",
-"unnamed" => "uten navn",
-"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Dra denne over din nettlesers bokmerker og klikk den, hvis du ønsker å hurtig legge til bokmerke for en nettside",
-"Read later" => "Les senere",
-"Address" => "Adresse",
-"Title" => "Tittel",
-"Tags" => "Etikett",
-"Save bookmark" => "Lagre bokmerke",
-"You have no bookmarks" => "Du har ingen bokmerker"
-);
diff --git a/apps/bookmarks/l10n/nl.php b/apps/bookmarks/l10n/nl.php
deleted file mode 100644
index e5e0894b51..0000000000
--- a/apps/bookmarks/l10n/nl.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Bookmarks" => "Bladwijzers",
-"unnamed" => "geen naam",
-"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Sleep dit naar uw browser bladwijzers en klik erop, wanneer u een webpagina snel wilt voorzien van een bladwijzer:",
-"Read later" => "Lees later",
-"Address" => "Adres",
-"Title" => "Titel",
-"Tags" => "Tags",
-"Save bookmark" => "Bewaar bookmark",
-"You have no bookmarks" => "U heeft geen bookmarks"
-);
diff --git a/apps/bookmarks/l10n/ru.php b/apps/bookmarks/l10n/ru.php
deleted file mode 100644
index 3abc089e3f..0000000000
--- a/apps/bookmarks/l10n/ru.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Bookmarks" => "Закладки",
-"unnamed" => "без имени",
-"Read later" => "Прочитать позже",
-"Address" => "Адрес",
-"Title" => "Заголовок",
-"Tags" => "Метки",
-"Save bookmark" => "Сохранить закладки",
-"You have no bookmarks" => "У вас нет закладок",
-"Bookmarklet <br />" => "Букмарклет <br />"
-);
diff --git a/apps/bookmarks/l10n/sl.php b/apps/bookmarks/l10n/sl.php
deleted file mode 100644
index 32a4162908..0000000000
--- a/apps/bookmarks/l10n/sl.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Bookmarks" => "Zaznamki",
-"unnamed" => "neimenovano",
-"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Povlecite to povezavo med zaznamke v vašem brskalniku in jo, ko želite ustvariti zaznamek trenutne strani, preprosto kliknite:",
-"Read later" => "Preberi kasneje",
-"Address" => "Naslov",
-"Title" => "Ime",
-"Tags" => "Oznake",
-"Save bookmark" => "Shrani zaznamek",
-"You have no bookmarks" => "Nimate zaznamkov",
-"Bookmarklet <br />" => "Bookmarklet <br />"
-);
diff --git a/apps/bookmarks/l10n/sv.php b/apps/bookmarks/l10n/sv.php
deleted file mode 100644
index 689bd452f1..0000000000
--- a/apps/bookmarks/l10n/sv.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Bookmarks" => "Bokmärken",
-"unnamed" => "namnlös",
-"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Dra till din webbläsares bokmärken och klicka på det när du vill bokmärka en webbsida snabbt:",
-"Read later" => "Läs senare",
-"Address" => "Adress",
-"Title" => "Titel",
-"Tags" => "Taggar",
-"Save bookmark" => "Spara bokmärke",
-"You have no bookmarks" => "Du har inga bokmärken",
-"Bookmarklet <br />" => "Skriptbokmärke <br />"
-);
diff --git a/apps/bookmarks/l10n/th_TH.php b/apps/bookmarks/l10n/th_TH.php
deleted file mode 100644
index 64a148efab..0000000000
--- a/apps/bookmarks/l10n/th_TH.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Bookmarks" => "รายการโปรด",
-"unnamed" => "ยังไม่มีชื่อ",
-"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "ลากสิ่งนี้ไปไว้ที่รายการโปรดในโปรแกรมบราวเซอร์ของคุณ แล้วคลิกที่นั่น, เมื่อคุณต้องการเก็บหน้าเว็บเพจเข้าไปไว้ในรายการโปรดอย่างรวดเร็ว",
-"Read later" => "อ่านภายหลัง",
-"Address" => "ที่อยู่",
-"Title" => "ชื่อ",
-"Tags" => "ป้ายกำกับ",
-"Save bookmark" => "บันทึกรายการโปรด",
-"You have no bookmarks" => "คุณยังไม่มีรายการโปรด",
-"Bookmarklet <br />" => "Bookmarklet <br />"
-);
diff --git a/apps/bookmarks/l10n/xgettextfiles b/apps/bookmarks/l10n/xgettextfiles
deleted file mode 100644
index cd55543239..0000000000
--- a/apps/bookmarks/l10n/xgettextfiles
+++ /dev/null
@@ -1,5 +0,0 @@
-../appinfo/app.php
-../lib/search.php
-../templates/settings.php
-../templates/addBm.php
-../templates/list.php
diff --git a/apps/bookmarks/l10n/zh_CN.php b/apps/bookmarks/l10n/zh_CN.php
deleted file mode 100644
index 0510738c97..0000000000
--- a/apps/bookmarks/l10n/zh_CN.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Bookmarks" => "书签",
-"unnamed" => "未命名",
-"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "拖曳此处到您的浏览器书签处，点击可以将网页快速添加到书签中。",
-"Read later" => "稍后阅读",
-"Address" => "地址",
-"Title" => "标题",
-"Tags" => "标签",
-"Save bookmark" => "保存书签",
-"You have no bookmarks" => "您暂无书签",
-"Bookmarklet <br />" => "书签应用"
-);
diff --git a/apps/bookmarks/lib/bookmarks.php b/apps/bookmarks/lib/bookmarks.php
deleted file mode 100644
index e1e1338890..0000000000
--- a/apps/bookmarks/lib/bookmarks.php
+++ /dev/null
@@ -1,147 +0,0 @@
-<?php
-/**
- * ownCloud - bookmarks plugin
- *
- * @author Arthur Schiwon
- * @copyright 2011 Arthur Schiwon blizzz@arthur-schiwon.de
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *
- * You should have received a copy of the GNU Affero General Public
- * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-/**
- * This class manages bookmarks
- */
-class OC_Bookmarks_Bookmarks{
-
-	/**
-	 * @brief Finds all bookmarks, matching the filter
-	 * @param offset result offset
-	 * @param sqlSortColumn sort result with this column
-	 * @param filter can be: empty -> no filter, a string -> filter this, a string array -> filter for all strings
-	 * @param filterTagOnly if true, filter affacts only tags, else filter affects url, title and tags
-	 * @return void
-	 */
-	public static function findBookmarks($offset, $sqlSortColumn, $filter, $filterTagOnly){
-		//OCP\Util::writeLog('bookmarks', 'findBookmarks ' .$offset. ' '.$sqlSortColumn.' '. $filter.' '. $filterTagOnly ,OCP\Util::DEBUG);
-		$CONFIG_DBTYPE = OCP\Config::getSystemValue( 'dbtype', 'sqlite' );
-	
-		$params=array(OCP\USER::getUser());
-	
-		if( $CONFIG_DBTYPE == 'sqlite' or $CONFIG_DBTYPE == 'sqlite3' ){
-			$_gc_separator = ', \' \'';
-		} else {
-			$_gc_separator = 'SEPARATOR \' \'';
-		}
-
-		if($filter){
-			if($CONFIG_DBTYPE == 'pgsql' )
-				$tagString = 'array_to_string(array_agg(tag), \' \')';
-			else
-				$tagString = 'tags';
-
-			$sqlFilterTag = 'HAVING ';
-			if(is_array($filter)){
-				$first = true;
-				$filterstring = '';
-				foreach ($filter as $singleFilter){
-					$filterstring = $filterstring . ($first?'':' AND ') . $tagString.' LIKE ? ';
-					$params[] = '%'.$singleFilter.'%';
-					$first=false;
-				}
-				$sqlFilterTag = $sqlFilterTag . $filterstring;
-			} else{
-				$sqlFilterTag = $sqlFilterTag .$tagString.' LIKE ? ';
-				$params[] = '%'.$filter.'%';
-			}
-		} else {
-			$sqlFilterTag = '';
-		}
-
-		if($CONFIG_DBTYPE == 'pgsql' ){
-			$query = OCP\DB::prepare('
-				SELECT `id`, `url`, `title`, '.($filterTagOnly?'':'`url` || `title` ||').' array_to_string(array_agg(`tag`), \' \') as `tags`
-				FROM `*PREFIX*bookmarks`
-				LEFT JOIN `*PREFIX*bookmarks_tags` ON `*PREFIX*bookmarks`.`id` = `*PREFIX*bookmarks_tags`.`bookmark_id` 
-				WHERE 
-					`*PREFIX*bookmarks`.`user_id` = ?
-				GROUP BY `id`, `url`, `title`
-				'.$sqlFilterTag.'
-				ORDER BY `*PREFIX*bookmarks`.`'.$sqlSortColumn.'` DESC',
-				10,$offset);
-		} else {
-			if( $CONFIG_DBTYPE == 'sqlite' or $CONFIG_DBTYPE == 'sqlite3' )
-				$concatFunction = '(url || title || ';
-			else
-				$concatFunction = 'Concat(Concat( url, title), ';
-		
-			$query = OCP\DB::prepare('
-				SELECT `id`, `url`, `title`, '
-				.($filterTagOnly?'':$concatFunction).
-				'CASE WHEN `*PREFIX*bookmarks`.`id` = `*PREFIX*bookmarks_tags`.`bookmark_id`
-						THEN GROUP_CONCAT( `tag` ' .$_gc_separator. ' )
-						ELSE \' \'
-					END '
-				.($filterTagOnly?'':')').'
-					AS `tags`
-				FROM `*PREFIX*bookmarks`
-				LEFT JOIN `*PREFIX*bookmarks_tags` ON 1=1
-				WHERE (`*PREFIX*bookmarks`.`id` = `*PREFIX*bookmarks_tags`.`bookmark_id` 
-						OR `*PREFIX*bookmarks`.`id` NOT IN (
-							SELECT `*PREFIX*bookmarks_tags`.`bookmark_id` FROM `*PREFIX*bookmarks_tags`
-						)
-					)
-					AND `*PREFIX*bookmarks`.`user_id` = ?
-				GROUP BY `url`
-				'.$sqlFilterTag.'
-				ORDER BY `*PREFIX*bookmarks`.`'.$sqlSortColumn.'` DESC',
-				10, $offset);
-		}
-
-		$bookmarks = $query->execute($params)->fetchAll();
-		return $bookmarks;
-	}
-
-	public static function deleteUrl($id)
-	{
-		$user = OCP\USER::getUser();
-
-		$query = OCP\DB::prepare("
-				SELECT `id` FROM `*PREFIX*bookmarks`
-				WHERE `id` = ?
-				AND `user_id` = ?
-				");
-
-		$result = $query->execute(array($id, $user));
-		$id = $result->fetchOne();
-		if ($id === false) {
-			return false;
-		}
-
-		$query = OCP\DB::prepare("
-			DELETE FROM `*PREFIX*bookmarks`
-			WHERE `id` = $id
-			");
-
-		$result = $query->execute();
-
-		$query = OCP\DB::prepare("
-			DELETE FROM `*PREFIX*bookmarks_tags`
-			WHERE `bookmark_id` = $id
-			");
-
-		$result = $query->execute();
-		return true;
-	}
-}
diff --git a/apps/bookmarks/lib/search.php b/apps/bookmarks/lib/search.php
deleted file mode 100644
index 1e6a3ce910..0000000000
--- a/apps/bookmarks/lib/search.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/**
- * ownCloud - bookmarks plugin
- *
- * @author David Iwanowitsch
- * @copyright 2012 David Iwanowitsch <david at unclouded dot de>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *
- * You should have received a copy of the GNU Affero General Public
- * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-class OC_Search_Provider_Bookmarks extends OC_Search_Provider{
-	function search($query){
-		$results=array();
-		
-		$offset = 0;
-		$sqlSortColumn = 'id';
-		
-		$searchquery=array();
-		if(substr_count($query, ' ') > 0){
-			$searchquery = explode(' ', $query);
-		}else{
-			$searchquery = $query;
-		}
-		
-//		OCP\Util::writeLog('bookmarks', 'search ' .$query ,OCP\Util::DEBUG);
-		$bookmarks = OC_Bookmarks_Bookmarks::findBookmarks($offset, $sqlSortColumn, $searchquery, false);
-//		OCP\Util::writeLog('bookmarks', 'found ' .count($bookmarks) ,OCP\Util::DEBUG);
-		//$l = new OC_l10n('bookmarks'); //resulttype can't be localized, javascript relies on that type
-		foreach($bookmarks as $bookmark){
-			$results[]=new OC_Search_Result($bookmark['title'],'', $bookmark['url'],'Bookm.');
-		}
-		
-		return $results;
-	}
-}
diff --git a/apps/bookmarks/settings.php b/apps/bookmarks/settings.php
deleted file mode 100644
index 6db3617633..0000000000
--- a/apps/bookmarks/settings.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011 Marvin Thomas Rabe <mrabe@marvinrabe.de>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-$tmpl = new OCP\Template( 'bookmarks', 'settings');
-
-return $tmpl->fetchPage();
diff --git a/apps/bookmarks/templates/addBm.php b/apps/bookmarks/templates/addBm.php
deleted file mode 100644
index 357e0a18f2..0000000000
--- a/apps/bookmarks/templates/addBm.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE html>  
-<html lang="en">  
-  <head>  
-    <meta charset="utf-8">  
-    <title>Read later - ownCloud</title>  
-  </head>
-  <body>
-  	<div class="message"><h1>Saved!</h1></div>
-		<a href="javascript:self.close()" >Close the window</a>
-  </body>  
-</html>  
\ No newline at end of file
diff --git a/apps/bookmarks/templates/bookmarklet.php b/apps/bookmarks/templates/bookmarklet.php
deleted file mode 100644
index 1802814d4b..0000000000
--- a/apps/bookmarks/templates/bookmarklet.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-function createBookmarklet() {
-	$l = OC_L10N::get('bookmarks');
-	echo '<small>' . $l->t('Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:') . '</small>'
-	. '<a class="button bookmarklet" href="javascript:(function(){var a=window,b=document,c=encodeURIComponent,d=a.open(\'' . OCP\Util::linkToAbsolute('bookmarks', 'addBm.php') . '?output=popup&url=\'+c(b.location),\'bkmk_popup\',\'left=\'+((a.screenX||a.screenLeft)+10)+\',top=\'+((a.screenY||a.screenTop)+10)+\',height=230px,width=230px,resizable=1,alwaysRaised=1\');a.setTimeout(function(){d.focus()},300);})();">'
-	. $l->t('Read later') . '</a>';
-} 
diff --git a/apps/bookmarks/templates/list.php b/apps/bookmarks/templates/list.php
deleted file mode 100644
index 4b84b43890..0000000000
--- a/apps/bookmarks/templates/list.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php 
-/**
- * Copyright (c) 2011 Marvin Thomas Rabe <mrabe@marvinrabe.de>
- * Copyright (c) 2011 Arthur Schiwon <blizzz@arthur-schiwon.de>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-?>
-<input type="hidden" id="bookmarkFilterTag" value="<?php if(isset($_GET['tag'])) echo OCP\Util::sanitizeHTML($_GET['tag']); ?>" />
-<div id="controls">
-	<input type="hidden" id="bookmark_add_id" value="0" />
-	<input type="text" id="bookmark_add_url" placeholder="<?php echo $l->t('Address'); ?>" class="bookmarks_input" />
-	<input type="text" id="bookmark_add_title" placeholder="<?php echo $l->t('Title'); ?>" class="bookmarks_input" />
-	<input type="text" id="bookmark_add_tags" placeholder="<?php echo $l->t('Tags'); ?>" class="bookmarks_input" />
-	<input type="submit" value="<?php echo $l->t('Save bookmark'); ?>" id="bookmark_add_submit" />
-</div>
-<div class="bookmarks_list">
-</div>
-<div id="firstrun" style="display: none;">
-	<?php
-		echo $l->t('You have no bookmarks');
-		require_once(OC_App::getAppPath('bookmarks') .'/templates/bookmarklet.php');
-		createBookmarklet(); 
-	?>
-</div>
diff --git a/apps/bookmarks/templates/settings.php b/apps/bookmarks/templates/settings.php
deleted file mode 100644
index 31edf7478b..0000000000
--- a/apps/bookmarks/templates/settings.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011 Marvin Thomas Rabe <mrabe@marvinrabe.de>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-?>
-<form id="bookmarks">
-		<fieldset class="personalblock">
-			<span class="bold"><?php echo $l->t('Bookmarklet <br />');?></span>
-			<?php
-			    require_once('bookmarklet.php');
-			    createBookmarklet(); 
-			?>
-		</fieldset>
-</form>
diff --git a/apps/calendar/ajax/cache/rescan.php b/apps/calendar/ajax/cache/rescan.php
deleted file mode 100644
index 3417f1ae4b..0000000000
--- a/apps/calendar/ajax/cache/rescan.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Georg Ehrke <georg@ownCloud.com>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('calendar');
-$calendars = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser());
-foreach($calendars as $calendar){
-	OC_Calendar_Repeat::cleancalendar($calendar['id']);
-	OC_Calendar_Repeat::generatecalendar($calendar['id']);
-}
-OCP\JSON::success();
\ No newline at end of file
diff --git a/apps/calendar/ajax/cache/status.php b/apps/calendar/ajax/cache/status.php
deleted file mode 100644
index d2806d4789..0000000000
--- a/apps/calendar/ajax/cache/status.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Georg Ehrke <georg@ownCloud.com>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('calendar');
-$calendars = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser());
-$allcached = true;
-foreach($calendars as $calendar){
-	if(!OC_Calendar_Repeat::is_calendar_cached($calendar['id'])){
-		$allcached = false;
-	}
-}
-$l = new OC_L10N('calendar');
-if(!$allcached){
-	OCP\JSON::error(array('message'=>'Not all calendars are completely cached', 'l10n'=>$l->t('Not all calendars are completely cached')));
-}else{
-	OCP\JSON::success(array('message'=>'Everything seems to be completely cached', 'l10n'=>$l->t('Everything seems to be completely cached')));
-}
\ No newline at end of file
diff --git a/apps/calendar/ajax/calendar/activation.php b/apps/calendar/ajax/calendar/activation.php
deleted file mode 100644
index f4aadc5b01..0000000000
--- a/apps/calendar/ajax/calendar/activation.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011 Bart Visscher <bartv@thisnet.nl>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
- 
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('calendar');
-OCP\JSON::callCheck();
-
-$calendarid = $_POST['calendarid'];
-$calendar = OC_Calendar_App::getCalendar($calendarid, true);
-if(!$calendar){
-	OCP\JSON::error(array('message'=>'permission denied'));
-	exit;
-}
-OC_Calendar_Calendar::setCalendarActive($calendarid, $_POST['active']);
-$calendar = OC_Calendar_App::getCalendar($calendarid);
-OCP\JSON::success(array(
-	'active' => $calendar['active'],
-	'eventSource' => OC_Calendar_Calendar::getEventSourceInfo($calendar),
-));
\ No newline at end of file
diff --git a/apps/calendar/ajax/calendar/delete.php b/apps/calendar/ajax/calendar/delete.php
deleted file mode 100644
index 089255cae3..0000000000
--- a/apps/calendar/ajax/calendar/delete.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011 Georg Ehrke <ownclouddev at georgswebsite dot de>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
- 
-
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('calendar');
-OCP\JSON::callCheck();
-
-$cal = $_POST["calendarid"];
-$calendar = OC_Calendar_App::getCalendar($cal, true);
-if(!$calendar){
-	OCP\JSON::error(array('message'=>'permission denied'));
-	exit;
-}
-$del = OC_Calendar_Calendar::deleteCalendar($cal);
-if($del == true){
-	OCP\JSON::success();
-}else{
-	OCP\JSON::error(array('error'=>'dberror'));
-}
\ No newline at end of file
diff --git a/apps/calendar/ajax/calendar/edit.form.php b/apps/calendar/ajax/calendar/edit.form.php
deleted file mode 100644
index 3916c52763..0000000000
--- a/apps/calendar/ajax/calendar/edit.form.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011 Bart Visscher <bartv@thisnet.nl>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
- 
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('calendar');
-
-$calendarcolor_options = OC_Calendar_Calendar::getCalendarColorOptions();
-$calendar = OC_Calendar_App::getCalendar($_POST['calendarid']);
-$tmpl = new OCP\Template("calendar", "part.editcalendar");
-$tmpl->assign('new', false);
-$tmpl->assign('calendarcolor_options', $calendarcolor_options);
-$tmpl->assign('calendar', $calendar);
-$tmpl->printPage();
\ No newline at end of file
diff --git a/apps/calendar/ajax/calendar/edit.php b/apps/calendar/ajax/calendar/edit.php
deleted file mode 100644
index 3f69666b58..0000000000
--- a/apps/calendar/ajax/calendar/edit.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011 Bart Visscher <bartv@thisnet.nl>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
- 
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('calendar');
-OCP\JSON::callCheck();
-
-$calendarcolor_options = OC_Calendar_Calendar::getCalendarColorOptions();
-$calendar = OC_Calendar_App::getCalendar($_GET['calendarid'], true);
-if(!$calendar){
-	OCP\JSON::error(array('message'=>'permission denied'));
-	exit;
-}
-$tmpl = new OCP\Template("calendar", "part.editcalendar");
-$tmpl->assign('new', false);
-$tmpl->assign('calendarcolor_options', $calendarcolor_options);
-$tmpl->assign('calendar', $calendar);
-$tmpl->printPage();
\ No newline at end of file
diff --git a/apps/calendar/ajax/calendar/new.form.php b/apps/calendar/ajax/calendar/new.form.php
deleted file mode 100644
index 0783b6168f..0000000000
--- a/apps/calendar/ajax/calendar/new.form.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011 Bart Visscher <bartv@thisnet.nl>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
- 
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('calendar');
-$calendarcolor_options = OC_Calendar_Calendar::getCalendarColorOptions();
-$calendar = array(
-	'id' => 'new',
-	'displayname' => '',
-	'calendarcolor' => '',
-);
-$tmpl = new OCP\Template('calendar', 'part.editcalendar');
-$tmpl->assign('new', true);
-$tmpl->assign('calendarcolor_options', $calendarcolor_options);
-$tmpl->assign('calendar', $calendar);
-$tmpl->printPage();
\ No newline at end of file
diff --git a/apps/calendar/ajax/calendar/new.php b/apps/calendar/ajax/calendar/new.php
deleted file mode 100644
index 67d1282237..0000000000
--- a/apps/calendar/ajax/calendar/new.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011 Bart Visscher <bartv@thisnet.nl>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-// Check if we are a user
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('calendar');
-OCP\JSON::callCheck();
-
-if(trim($_POST['name']) == ''){
-	OCP\JSON::error(array('message'=>'empty'));
-	exit;
-}
-$calendars = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser());
-foreach($calendars as $cal){
-	if($cal['displayname'] == $_POST['name']){
-		OCP\JSON::error(array('message'=>'namenotavailable'));
-		exit;
-	}
-}
-
-$userid = OCP\USER::getUser();
-$calendarid = OC_Calendar_Calendar::addCalendar($userid, strip_tags($_POST['name']), 'VEVENT,VTODO,VJOURNAL', null, 0, $_POST['color']);
-OC_Calendar_Calendar::setCalendarActive($calendarid, 1);
-
-$calendar = OC_Calendar_Calendar::find($calendarid);
-$tmpl = new OCP\Template('calendar', 'part.choosecalendar.rowfields');
-$tmpl->assign('calendar', $calendar);
-if(OC_Calendar_Share::allUsersSharedwith($calendarid, OC_Calendar_Share::CALENDAR) == array()){
-	$shared = false;
-}else{
-	$shared = true;
-}
-$tmpl->assign('shared', $shared);
-OCP\JSON::success(array(
-	'page' => $tmpl->fetchPage(),
-	'eventSource' => OC_Calendar_Calendar::getEventSourceInfo($calendar),
-));
diff --git a/apps/calendar/ajax/calendar/overview.php b/apps/calendar/ajax/calendar/overview.php
deleted file mode 100644
index 1d8e49ea5f..0000000000
--- a/apps/calendar/ajax/calendar/overview.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011 Georg Ehrke <ownclouddev at georgswebsite dot de>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */ 
-$l10n = OC_L10N::get('calendar');
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('calendar');
-$output = new OCP\Template("calendar", "part.choosecalendar");
-$output -> printpage();
\ No newline at end of file
diff --git a/apps/calendar/ajax/calendar/update.php b/apps/calendar/ajax/calendar/update.php
deleted file mode 100644
index c09b1008c9..0000000000
--- a/apps/calendar/ajax/calendar/update.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011 Bart Visscher <bartv@thisnet.nl>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
- 
-
-// Check if we are a user
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('calendar');
-OCP\JSON::callCheck();
-
-if(trim($_POST['name']) == ''){
-	OCP\JSON::error(array('message'=>'empty'));
-	exit;
-}
-$calendars = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser());
-foreach($calendars as $cal){
-	if($cal['displayname'] == $_POST['name'] && $cal['id'] != $_POST['id']){
-		OCP\JSON::error(array('message'=>'namenotavailable'));
-		exit;
-	}
-}
-
-$calendarid = $_POST['id'];
-$calendar = OC_Calendar_App::getCalendar($calendarid, true);
-if(!$calendar){
-	OCP\JSON::error(array('message'=>'permission denied'));
-	exit;
-}
-OC_Calendar_Calendar::editCalendar($calendarid, strip_tags($_POST['name']), null, null, null, $_POST['color']);
-OC_Calendar_Calendar::setCalendarActive($calendarid, $_POST['active']);
-
-$calendar = OC_Calendar_App::getCalendar($calendarid);
-$tmpl = new OCP\Template('calendar', 'part.choosecalendar.rowfields');
-$tmpl->assign('calendar', $calendar);
-if(OC_Calendar_Share::allUsersSharedwith($calendarid, OC_Calendar_Share::CALENDAR) == array()){
-	$shared = false;
-}else{
-	$shared = true;
-}
-$tmpl->assign('shared', $shared);
-OCP\JSON::success(array(
-	'page' => $tmpl->fetchPage(),
-	'eventSource' => OC_Calendar_Calendar::getEventSourceInfo($calendar),
-));
diff --git a/apps/calendar/ajax/categories/rescan.php b/apps/calendar/ajax/categories/rescan.php
deleted file mode 100644
index 08c32865b6..0000000000
--- a/apps/calendar/ajax/categories/rescan.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Thomas Tanghus <thomas@tanghus.net>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
- 
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('calendar');
-OCP\JSON::callCheck();
-
-foreach ($_POST as $key=>$element) {
-	debug('_POST: '.$key.'=>'.print_r($element, true));
-}
-
-function bailOut($msg) {
-	OCP\JSON::error(array('data' => array('message' => $msg)));
-	OCP\Util::writeLog('calendar','ajax/categories/rescan.php: '.$msg, OCP\Util::DEBUG);
-	exit();
-}
-function debug($msg) {
-	OCP\Util::writeLog('calendar','ajax/categories/rescan.php: '.$msg, OCP\Util::DEBUG);
-}
-
-$calendars = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser());
-if(count($calendars) == 0) {
-	bailOut(OC_Calendar_App::$l10n->t('No calendars found.'));
-}
-$events = array();
-foreach($calendars as $calendar) {
-	$calendar_events = OC_Calendar_Object::all($calendar['id']);
-	$events = $events + $calendar_events;
-}
-if(count($events) == 0) {
-	bailOut(OC_Calendar_App::$l10n->t('No events found.'));
-}
-
-OC_Calendar_App::scanCategories($events);
-$categories = OC_Calendar_App::getCategoryOptions();
-
-OCP\JSON::success(array('data' => array('categories'=>$categories)));
\ No newline at end of file
diff --git a/apps/calendar/ajax/changeview.php b/apps/calendar/ajax/changeview.php
deleted file mode 100644
index 819025543a..0000000000
--- a/apps/calendar/ajax/changeview.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Georg Ehrke <ownclouddev at georgswebsite dot de>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('calendar');
-$view = $_POST['v'];
-switch($view){
-	case 'agendaWeek':
-	case 'month';
-	case 'list':
-		break;
-	default:
-		OCP\JSON::error(array('message'=>'unexpected parameter: ' . $view));
-		exit;
-}
-OCP\Config::setUserValue(OCP\USER::getUser(), 'calendar', 'currentview', $view);
-OCP\JSON::success();
\ No newline at end of file
diff --git a/apps/calendar/ajax/event/delete.php b/apps/calendar/ajax/event/delete.php
deleted file mode 100644
index 17e45c001e..0000000000
--- a/apps/calendar/ajax/event/delete.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011 Bart Visscher <bartv@thisnet.nl>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
- 
-
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('calendar');
-OCP\JSON::callCheck();
-
-$id = $_POST['id'];
-$access = OC_Calendar_App::getaccess($id, OC_Calendar_App::EVENT);
-if($access != 'owner' && $access != 'rw'){
-	OCP\JSON::error(array('message'=>'permission denied'));
-	exit;
-}
-$result = OC_Calendar_Object::delete($id);
-OCP\JSON::success();
\ No newline at end of file
diff --git a/apps/calendar/ajax/event/edit.form.php b/apps/calendar/ajax/event/edit.form.php
deleted file mode 100644
index 2751248153..0000000000
--- a/apps/calendar/ajax/event/edit.form.php
+++ /dev/null
@@ -1,272 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011 Bart Visscher <bartv@thisnet.nl>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
- 
-
-if(!OCP\User::isLoggedIn()) {
-	die('<script type="text/javascript">document.location = oc_webroot;</script>');
-}
-OCP\JSON::checkAppEnabled('calendar');
-
-$id = $_POST['id'];
-$data = OC_Calendar_App::getEventObject($id, true, true);
-
-if(!$data){
-	OCP\JSON::error(array('data' => array('message' => self::$l10n->t('Wrong calendar'))));
-	exit;
-}
-$access = OC_Calendar_App::getaccess($id, OC_Calendar_Share::EVENT);
-$object = OC_VObject::parse($data['calendardata']);
-$vevent = $object->VEVENT;
-
-$dtstart = $vevent->DTSTART;
-$dtend = OC_Calendar_Object::getDTEndFromVEvent($vevent);
-switch($dtstart->getDateType()) {
-	case Sabre_VObject_Property_DateTime::UTC:
-		$timeOffset = $_SESSION['timezone']*60;
-		$newDT      = $dtstart->getDateTime(); 
-		$newDT->add(new DateInterval("PT" . $timeOffset . "M"));
-		$dtstart->setDateTime($newDT); 
-		$newDT      = $dtend->getDateTime(); 
-		$newDT->add(new DateInterval("PT" . $timeOffset . "M"));
-		$dtend->setDateTime($newDT); 
-	case Sabre_VObject_Property_DateTime::LOCALTZ:
-	case Sabre_VObject_Property_DateTime::LOCAL:
-		$startdate = $dtstart->getDateTime()->format('d-m-Y');
-		$starttime = $dtstart->getDateTime()->format('H:i');
-		$enddate = $dtend->getDateTime()->format('d-m-Y');
-		$endtime = $dtend->getDateTime()->format('H:i');
-		$allday = false;
-		break;
-	case Sabre_VObject_Property_DateTime::DATE:
-		$startdate = $dtstart->getDateTime()->format('d-m-Y');
-		$starttime = '';
-		$dtend->getDateTime()->modify('-1 day');
-		$enddate = $dtend->getDateTime()->format('d-m-Y');
-		$endtime = '';
-		$allday = true;
-		break;
-}
-
-$summary = $vevent->getAsString('SUMMARY');
-$location = $vevent->getAsString('LOCATION');
-$categories = $vevent->getAsString('CATEGORIES');
-$description = $vevent->getAsString('DESCRIPTION');
-$last_modified = $vevent->__get('LAST-MODIFIED');
-if ($last_modified){
-	$lastmodified = $last_modified->getDateTime()->format('U');
-}else{
-	$lastmodified = 0;
-}
-if($data['repeating'] == 1){
-	$rrule = explode(';', $vevent->getAsString('RRULE'));
-	$rrulearr = array();
-	foreach($rrule as $rule){
-		list($attr, $val) = explode('=', $rule);
-		$rrulearr[$attr] = $val;
-	}
-	if(!isset($rrulearr['INTERVAL']) || $rrulearr['INTERVAL'] == ''){
-		$rrulearr['INTERVAL'] = 1;
-	}
-	if(array_key_exists('BYDAY', $rrulearr)){
-		if(substr_count($rrulearr['BYDAY'], ',') == 0){
-			if(strlen($rrulearr['BYDAY']) == 2){
-				$repeat['weekdays'] = array($rrulearr['BYDAY']);
-			}elseif(strlen($rrulearr['BYDAY']) == 3){
-				$repeat['weekofmonth'] = substr($rrulearr['BYDAY'], 0, 1);
-				$repeat['weekdays'] = array(substr($rrulearr['BYDAY'], 1, 2));
-			}elseif(strlen($rrulearr['BYDAY']) == 4){
-				$repeat['weekofmonth'] = substr($rrulearr['BYDAY'], 0, 2);
-				$repeat['weekdays'] = array(substr($rrulearr['BYDAY'], 2, 2));
-			}
-		}else{
-			$byday_days = explode(',', $rrulearr['BYDAY']);
-			foreach($byday_days as $byday_day){
-				if(strlen($byday_day) == 2){
-					$repeat['weekdays'][] = $byday_day;
-				}elseif(strlen($byday_day) == 3){
-					$repeat['weekofmonth'] = substr($byday_day , 0, 1);
-					$repeat['weekdays'][] = substr($byday_day , 1, 2);
-				}elseif(strlen($byday_day) == 4){
-					$repeat['weekofmonth'] = substr($byday_day , 0, 2);
-					$repeat['weekdays'][] = substr($byday_day , 2, 2);
-				}
-			}
-		}
-	}
-	if(array_key_exists('BYMONTHDAY', $rrulearr)){
-		if(substr_count($rrulearr['BYMONTHDAY'], ',') == 0){
-			$repeat['bymonthday'][] = $rrulearr['BYMONTHDAY'];
-		}else{
-			$bymonthdays = explode(',', $rrulearr['BYMONTHDAY']);
-			foreach($bymonthdays as $bymonthday){
-				$repeat['bymonthday'][] = $bymonthday;
-			}
-		}
-	}
-	if(array_key_exists('BYYEARDAY', $rrulearr)){
-		if(substr_count($rrulearr['BYYEARDAY'], ',') == 0){
-			$repeat['byyearday'][] = $rrulearr['BYYEARDAY'];
-		}else{
-			$byyeardays = explode(',', $rrulearr['BYYEARDAY']);
-			foreach($byyeardays  as $yearday){
-				$repeat['byyearday'][] = $yearday;
-			}
-		}
-	}
-	if(array_key_exists('BYWEEKNO', $rrulearr)){
-		if(substr_count($rrulearr['BYWEEKNO'], ',') == 0){
-			$repeat['byweekno'][] = (string) $rrulearr['BYWEEKNO'];
-		}else{
-			$byweekno = explode(',', $rrulearr['BYWEEKNO']);
-			foreach($byweekno as $weekno){
-				$repeat['byweekno'][] = (string) $weekno;
-			}
-		}
-	}
-	if(array_key_exists('BYMONTH', $rrulearr)){
-		$months = OC_Calendar_App::getByMonthOptions();
-		if(substr_count($rrulearr['BYMONTH'], ',') == 0){
-			$repeat['bymonth'][] = $months[$month];
-		}else{
-			$bymonth = explode(',', $rrulearr['BYMONTH']);
-			foreach($bymonth as $month){
-				$repeat['bymonth'][] = $months[$month];
-			}
-		}
-	}
-	switch($rrulearr['FREQ']){
-		case 'DAILY':
-			$repeat['repeat'] = 'daily';
-			break;
-		case 'WEEKLY':
-			if($rrulearr['INTERVAL'] % 2 == 0){
-				$repeat['repeat'] = 'biweekly';
-				$rrulearr['INTERVAL'] = $rrulearr['INTERVAL'] / 2;
-			}elseif($rrulearr['BYDAY'] == 'MO,TU,WE,TH,FR'){
-				$repeat['repeat'] = 'weekday';
-			}else{
-				$repeat['repeat'] = 'weekly';
-			}
-			break;
-		case 'MONTHLY':
-			$repeat['repeat'] = 'monthly';
-			if(array_key_exists('BYDAY', $rrulearr)){
-				$repeat['month'] = 'weekday';
-			}else{
-				$repeat['month'] = 'monthday';
-			}
-			break;
-		case 'YEARLY':
-			$repeat['repeat'] = 'yearly';
-			if(array_key_exists('BYMONTH', $rrulearr)){
-				$repeat['year'] = 'bydaymonth';
-			}elseif(array_key_exists('BYWEEKNO', $rrulearr)){
-				$repeat['year'] = 'byweekno';
-			}else{
-				$repeat['year'] = 'byyearday';
-			}
-	}
-	$repeat['interval'] = $rrulearr['INTERVAL'];
-	if(array_key_exists('COUNT', $rrulearr)){
-		$repeat['end'] = 'count';
-		$repeat['count'] = $rrulearr['COUNT'];
-	}elseif(array_key_exists('UNTIL', $rrulearr)){
-		$repeat['end'] = 'date';
-		$endbydate_day = substr($rrulearr['UNTIL'], 6, 2);
-		$endbydate_month = substr($rrulearr['UNTIL'], 4, 2);
-		$endbydate_year = substr($rrulearr['UNTIL'], 0, 4);
-		$repeat['date'] = $endbydate_day . '-' .  $endbydate_month . '-' . $endbydate_year;
-	}else{
-		$repeat['end'] = 'never';
-	}
-	if(array_key_exists('weekdays', $repeat)){
-		$repeat_weekdays_ = array();
-		$days = OC_Calendar_App::getWeeklyOptions();
-		foreach($repeat['weekdays'] as $weekday){
-			$repeat_weekdays_[] = $days[$weekday];
-		}
-		$repeat['weekdays'] = $repeat_weekdays_;
-	}
-}else{
-	$repeat['repeat'] = 'doesnotrepeat';
-}
-if($access == 'owner'){
-	$calendar_options = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser());
-}else{
-	$calendar_options = array(OC_Calendar_App::getCalendar($data['calendarid'], false));
-}
-$category_options = OC_Calendar_App::getCategoryOptions();
-$repeat_options = OC_Calendar_App::getRepeatOptions();
-$repeat_end_options = OC_Calendar_App::getEndOptions();
-$repeat_month_options = OC_Calendar_App::getMonthOptions();
-$repeat_year_options = OC_Calendar_App::getYearOptions();
-$repeat_weekly_options = OC_Calendar_App::getWeeklyOptions();
-$repeat_weekofmonth_options = OC_Calendar_App::getWeekofMonth();
-$repeat_byyearday_options = OC_Calendar_App::getByYearDayOptions();
-$repeat_bymonth_options = OC_Calendar_App::getByMonthOptions();
-$repeat_byweekno_options = OC_Calendar_App::getByWeekNoOptions();
-$repeat_bymonthday_options = OC_Calendar_App::getByMonthDayOptions();
-
-if($access == 'owner' || $access == 'rw'){
-	$tmpl = new OCP\Template('calendar', 'part.editevent');
-}elseif($access == 'r'){
-	$tmpl = new OCP\Template('calendar', 'part.showevent');
-}
-
-$tmpl->assign('eventid', $id);
-$tmpl->assign('access', $access);
-$tmpl->assign('lastmodified', $lastmodified);
-$tmpl->assign('calendar_options', $calendar_options);
-$tmpl->assign('repeat_options', $repeat_options);
-$tmpl->assign('repeat_month_options', $repeat_month_options);
-$tmpl->assign('repeat_weekly_options', $repeat_weekly_options);
-$tmpl->assign('repeat_end_options', $repeat_end_options);
-$tmpl->assign('repeat_year_options', $repeat_year_options);
-$tmpl->assign('repeat_byyearday_options', $repeat_byyearday_options);
-$tmpl->assign('repeat_bymonth_options', $repeat_bymonth_options);
-$tmpl->assign('repeat_byweekno_options', $repeat_byweekno_options);
-$tmpl->assign('repeat_bymonthday_options', $repeat_bymonthday_options);
-$tmpl->assign('repeat_weekofmonth_options', $repeat_weekofmonth_options);
-
-$tmpl->assign('title', $summary);
-$tmpl->assign('location', $location);
-$tmpl->assign('categories', $categories);
-$tmpl->assign('calendar', $data['calendarid']);
-$tmpl->assign('allday', $allday);
-$tmpl->assign('startdate', $startdate);
-$tmpl->assign('starttime', $starttime);
-$tmpl->assign('enddate', $enddate);
-$tmpl->assign('endtime', $endtime);
-$tmpl->assign('description', $description);
-
-$tmpl->assign('repeat', $repeat['repeat']);
-if($repeat['repeat'] != 'doesnotrepeat'){
-	$tmpl->assign('repeat_month', $repeat['month']);
-	$tmpl->assign('repeat_weekdays', $repeat['weekdays']);
-	$tmpl->assign('repeat_interval', $repeat['interval']);
-	$tmpl->assign('repeat_end', $repeat['end']);
-	$tmpl->assign('repeat_count', $repeat['count']);
-	$tmpl->assign('repeat_weekofmonth', $repeat['weekofmonth']);
-	$tmpl->assign('repeat_date', $repeat['date']);
-	$tmpl->assign('repeat_year', $repeat['year']);
-	$tmpl->assign('repeat_byyearday', $repeat['byyearday']);
-	$tmpl->assign('repeat_bymonthday', $repeat['bymonthday']);
-	$tmpl->assign('repeat_bymonth', $repeat['bymonth']);
-	$tmpl->assign('repeat_byweekno', $repeat['byweekno']);
-} else {
-	$tmpl->assign('repeat_month', 'monthday');
-	$tmpl->assign('repeat_weekdays', array());
-	$tmpl->assign('repeat_interval', 1);
-	$tmpl->assign('repeat_end', 'never');
-	$tmpl->assign('repeat_count', '10');
-	$tmpl->assign('repeat_weekofmonth', 'auto');
-	$tmpl->assign('repeat_date', '');
-	$tmpl->assign('repeat_year', 'bydate');
-}
-$tmpl->printpage();
diff --git a/apps/calendar/ajax/event/edit.php b/apps/calendar/ajax/event/edit.php
deleted file mode 100644
index db78bf6e5e..0000000000
--- a/apps/calendar/ajax/event/edit.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011 Bart Visscher <bartv@thisnet.nl>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
- 
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('calendar');
-OCP\JSON::callCheck();
-
-$id = $_POST['id'];
-
-if(!array_key_exists('calendar', $_POST)){
-	$cal = OC_Calendar_Object::getCalendarid($id);
-	$_POST['calendar'] = $cal;
-}else{
-	$cal = $_POST['calendar'];
-}
-
-$access = OC_Calendar_App::getaccess($id, OC_Calendar_App::EVENT);
-if($access != 'owner' && $access != 'rw'){
-	OCP\JSON::error(array('message'=>'permission denied'));
-	exit;
-}
-
-$errarr = OC_Calendar_Object::validateRequest($_POST);
-if($errarr){
-	//show validate errors
-	OCP\JSON::error($errarr);
-	exit;
-}else{
-	$data = OC_Calendar_App::getEventObject($id, false, false);
-	$vcalendar = OC_VObject::parse($data['calendardata']);
-
-	OC_Calendar_App::isNotModified($vcalendar->VEVENT, $_POST['lastmodified']);
-	OC_Calendar_Object::updateVCalendarFromRequest($_POST, $vcalendar);
-
-	OC_Calendar_Object::edit($id, $vcalendar->serialize());
-	if ($data['calendarid'] != $cal) {
-		OC_Calendar_Object::moveToCalendar($id, $cal);
-	}
-	OCP\JSON::success();
-}
\ No newline at end of file
diff --git a/apps/calendar/ajax/event/move.php b/apps/calendar/ajax/event/move.php
deleted file mode 100644
index f4e2b36376..0000000000
--- a/apps/calendar/ajax/event/move.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011 Bart Visscher <bartv@thisnet.nl>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
- 
-OCP\JSON::checkLoggedIn();
-OCP\JSON::callCheck();
-
-$id = $_POST['id'];
-$access = OC_Calendar_App::getaccess($id, OC_Calendar_App::EVENT);
-if($access != 'owner' && $access != 'rw'){
-	OCP\JSON::error(array('message'=>'permission denied'));
-	exit;
-}
-$vcalendar = OC_Calendar_App::getVCalendar($id, false, false);
-$vevent = $vcalendar->VEVENT;
-
-$allday = $_POST['allDay'];
-$delta = new DateInterval('P0D');
-$delta->d = $_POST['dayDelta'];
-$delta->i = $_POST['minuteDelta'];
-OC_Calendar_App::isNotModified($vevent, $_POST['lastmodified']);
-
-$dtstart = $vevent->DTSTART;
-$dtend = OC_Calendar_Object::getDTEndFromVEvent($vevent);
-$start_type = $dtstart->getDateType();
-$end_type = $dtend->getDateType();
-if ($allday && $start_type != Sabre_VObject_Property_DateTime::DATE){
-	$start_type = $end_type = Sabre_VObject_Property_DateTime::DATE;
-	$dtend->setDateTime($dtend->getDateTime()->modify('+1 day'), $end_type);
-}
-if (!$allday && $start_type == Sabre_VObject_Property_DateTime::DATE){
-	$start_type = $end_type = Sabre_VObject_Property_DateTime::LOCALTZ;
-}
-$dtstart->setDateTime($dtstart->getDateTime()->add($delta), $start_type);
-$dtend->setDateTime($dtend->getDateTime()->add($delta), $end_type);
-unset($vevent->DURATION);
-
-$vevent->setDateTime('LAST-MODIFIED', 'now', Sabre_VObject_Property_DateTime::UTC);
-$vevent->setDateTime('DTSTAMP', 'now', Sabre_VObject_Property_DateTime::UTC);
-
-$result = OC_Calendar_Object::edit($id, $vcalendar->serialize());
-$lastmodified = $vevent->__get('LAST-MODIFIED')->getDateTime();
-OCP\JSON::success(array('lastmodified'=>(int)$lastmodified->format('U')));
\ No newline at end of file
diff --git a/apps/calendar/ajax/event/new.form.php b/apps/calendar/ajax/event/new.form.php
deleted file mode 100644
index db04cdf2d4..0000000000
--- a/apps/calendar/ajax/event/new.form.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011 Georg Ehrke <ownclouddev at georgswebsite dot de>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
- 
-
-if(!OCP\User::isLoggedIn()) {
-	die('<script type="text/javascript">document.location = oc_webroot;</script>');
-}
-OCP\JSON::checkAppEnabled('calendar');
-
-if (!isset($_POST['start'])){
-	OCP\JSON::error();
-	die;
-}
-$start = $_POST['start'];
-$end = $_POST['end'];
-$allday = $_POST['allday'];
-
-if (!$end){
-	$duration = OCP\Config::getUserValue( OCP\USER::getUser(), 'calendar', 'duration', '60');
-	$end = $start + ($duration * 60);
-}
-$start = new DateTime('@'.$start);
-$end = new DateTime('@'.$end);
-$timezone = OC_Calendar_App::getTimezone();
-$start->setTimezone(new DateTimeZone($timezone));
-$end->setTimezone(new DateTimeZone($timezone));
-
-$calendar_options = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser());
-$repeat_options = OC_Calendar_App::getRepeatOptions();
-$repeat_end_options = OC_Calendar_App::getEndOptions();
-$repeat_month_options = OC_Calendar_App::getMonthOptions();
-$repeat_year_options = OC_Calendar_App::getYearOptions();
-$repeat_weekly_options = OC_Calendar_App::getWeeklyOptions();
-$repeat_weekofmonth_options = OC_Calendar_App::getWeekofMonth();
-$repeat_byyearday_options = OC_Calendar_App::getByYearDayOptions();
-$repeat_bymonth_options = OC_Calendar_App::getByMonthOptions();
-$repeat_byweekno_options = OC_Calendar_App::getByWeekNoOptions();
-$repeat_bymonthday_options = OC_Calendar_App::getByMonthDayOptions();
-
-$tmpl = new OCP\Template('calendar', 'part.newevent');
-$tmpl->assign('access', 'owner');
-$tmpl->assign('calendar_options', $calendar_options);
-$tmpl->assign('repeat_options', $repeat_options);
-$tmpl->assign('repeat_month_options', $repeat_month_options);
-$tmpl->assign('repeat_weekly_options', $repeat_weekly_options);
-$tmpl->assign('repeat_end_options', $repeat_end_options);
-$tmpl->assign('repeat_year_options', $repeat_year_options);
-$tmpl->assign('repeat_byyearday_options', $repeat_byyearday_options);
-$tmpl->assign('repeat_bymonth_options', $repeat_bymonth_options);
-$tmpl->assign('repeat_byweekno_options', $repeat_byweekno_options);
-$tmpl->assign('repeat_bymonthday_options', $repeat_bymonthday_options);
-$tmpl->assign('repeat_weekofmonth_options', $repeat_weekofmonth_options);
-
-$tmpl->assign('eventid', 'new');
-$tmpl->assign('startdate', $start->format('d-m-Y'));
-$tmpl->assign('starttime', $start->format('H:i'));
-$tmpl->assign('enddate', $end->format('d-m-Y'));
-$tmpl->assign('endtime', $end->format('H:i'));
-$tmpl->assign('allday', $allday);
-$tmpl->assign('repeat', 'doesnotrepeat');
-$tmpl->assign('repeat_month', 'monthday');
-$tmpl->assign('repeat_weekdays', array());
-$tmpl->assign('repeat_interval', 1);
-$tmpl->assign('repeat_end', 'never');
-$tmpl->assign('repeat_count', '10');
-$tmpl->assign('repeat_weekofmonth', 'auto');
-$tmpl->assign('repeat_date', '');
-$tmpl->assign('repeat_year', 'bydate');
-$tmpl->printpage();
\ No newline at end of file
diff --git a/apps/calendar/ajax/event/new.php b/apps/calendar/ajax/event/new.php
deleted file mode 100644
index bc0439cc31..0000000000
--- a/apps/calendar/ajax/event/new.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011 Georg Ehrke <ownclouddev at georgswebsite dot de>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
- 
-
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('calendar');
-OCP\JSON::callCheck();
-
-$errarr = OC_Calendar_Object::validateRequest($_POST);
-if($errarr){
-	//show validate errors
-	OCP\JSON::error($errarr);
-	exit;
-}else{
-	$cal = $_POST['calendar'];
-	$vcalendar = OC_Calendar_Object::createVCalendarFromRequest($_POST);
-	$result = OC_Calendar_Object::add($cal, $vcalendar->serialize());
-	OCP\JSON::success();
-}
\ No newline at end of file
diff --git a/apps/calendar/ajax/event/resize.php b/apps/calendar/ajax/event/resize.php
deleted file mode 100644
index 15b687b55d..0000000000
--- a/apps/calendar/ajax/event/resize.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011 Bart Visscher <bartv@thisnet.nl>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
- 
-OCP\JSON::checkLoggedIn();
-OCP\JSON::callCheck();
-
-$id = $_POST['id'];
-
-$access = OC_Calendar_App::getaccess($id, OC_Calendar_App::EVENT);
-if($access != 'owner' && $access != 'rw'){
-	OCP\JSON::error(array('message'=>'permission denied'));
-	exit;
-}
-
-$vcalendar = OC_Calendar_App::getVCalendar($id, false, false);
-$vevent = $vcalendar->VEVENT;
-
-$delta = new DateInterval('P0D');
-$delta->d = $_POST['dayDelta'];
-$delta->i = $_POST['minuteDelta'];
-
-OC_Calendar_App::isNotModified($vevent, $_POST['lastmodified']);
-
-$dtend = OC_Calendar_Object::getDTEndFromVEvent($vevent);
-$end_type = $dtend->getDateType();
-$dtend->setDateTime($dtend->getDateTime()->add($delta), $end_type);
-unset($vevent->DURATION);
-
-$vevent->setDateTime('LAST-MODIFIED', 'now', Sabre_VObject_Property_DateTime::UTC);
-$vevent->setDateTime('DTSTAMP', 'now', Sabre_VObject_Property_DateTime::UTC);
-
-OC_Calendar_Object::edit($id, $vcalendar->serialize());
-$lastmodified = $vevent->__get('LAST-MODIFIED')->getDateTime();
-OCP\JSON::success(array('lastmodified'=>(int)$lastmodified->format('U')));
\ No newline at end of file
diff --git a/apps/calendar/ajax/events.php b/apps/calendar/ajax/events.php
deleted file mode 100644
index ae55cbc02d..0000000000
--- a/apps/calendar/ajax/events.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011, 2012 Georg Ehrke <ownclouddev at georgswebsite dot de>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('calendar');
-session_write_close();
-
-// Look for the calendar id
-$calendar_id = null;
-if (strval(intval($_GET['calendar_id'])) == strval($_GET['calendar_id'])) { // integer for sure.
-	$id = intval($_GET['calendar_id']);
-	$calendarrow = OC_Calendar_App::getCalendar($id, true, false); // Let's at least security check otherwise we might as well use OC_Calendar_Calendar::find()
-	if($calendarrow !== false && is_int($calendar_id['userid']) && $id == $calendar_id['userid']) {
-		$calendar_id = $id;
-	}
-}
-$calendar_id = (is_null($calendar_id)?strip_tags($_GET['calendar_id']):$calendar_id);
-
-$start = (version_compare(PHP_VERSION, '5.3.0', '>='))?DateTime::createFromFormat('U', $_GET['start']):new DateTime('@' . $_GET['start']);
-$end = (version_compare(PHP_VERSION, '5.3.0', '>='))?DateTime::createFromFormat('U', $_GET['end']):new DateTime('@' . $_GET['end']);
-$events = OC_Calendar_App::getrequestedEvents($_GET['calendar_id'], $start, $end);
-$output = array();
-foreach($events as $event){
-	$output = array_merge($output, OC_Calendar_App::generateEventOutput($event, $start, $end));
-}
-OCP\JSON::encodedPrint(OCP\Util::sanitizeHTML($output));
diff --git a/apps/calendar/ajax/import/calendarcheck.php b/apps/calendar/ajax/import/calendarcheck.php
deleted file mode 100644
index a91bab7057..0000000000
--- a/apps/calendar/ajax/import/calendarcheck.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Georg Ehrke <ownclouddev at georgswebsite dot de>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-OCP\JSON::checkLoggedIn();
-OCP\App::checkAppEnabled('calendar');
-$calname = strip_tags($_POST['calname']);
-$calendars = OC_Calendar_Calendar::allCalendars(OCP\User::getUser());
-foreach($calendars as $calendar){
-	if($calendar['displayname'] == $calname){
-		OCP\JSON::success(array('message'=>'exists'));
-		exit;
-	}
-}
-OCP\JSON::error();
\ No newline at end of file
diff --git a/apps/calendar/ajax/import/dialog.php b/apps/calendar/ajax/import/dialog.php
deleted file mode 100644
index 18fe226172..0000000000
--- a/apps/calendar/ajax/import/dialog.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Georg Ehrke <ownclouddev at georgswebsite dot de>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-OCP\JSON::checkLoggedIn();
-OCP\App::checkAppEnabled('calendar');
-$tmpl = new OCP\Template('calendar', 'part.import');
-$tmpl->assign('path', $_POST['path']);
-$tmpl->assign('filename', $_POST['filename']);
-$tmpl->printpage();
\ No newline at end of file
diff --git a/apps/calendar/ajax/import/dropimport.php b/apps/calendar/ajax/import/dropimport.php
deleted file mode 100644
index f46e731409..0000000000
--- a/apps/calendar/ajax/import/dropimport.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Georg Ehrke <ownclouddev@georgswebsite.de>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-$data = $_POST['data'];
-$data = explode(',', $data);
-$data = end($data);
-$data = base64_decode($data);
-OCP\JSON::checkLoggedIn();
-OCP\App::checkAppEnabled('calendar');
-$import = new OC_Calendar_Import($data);
-$import->setUserID(OCP\User::getUser());
-$import->setTimeZone(OC_Calendar_App::$tz);
-$import->disableProgressCache();
-if(!$import->isValid()){
-	OCP\JSON::error();
-	exit;
-}
-$newcalendarname = strip_tags($import->createCalendarName());
-$newid = OC_Calendar_Calendar::addCalendar(OCP\User::getUser(),$newcalendarname,'VEVENT,VTODO,VJOURNAL',null,0,$import->createCalendarColor());
-$import->setCalendarID($newid);
-$import->import();
-$count = $import->getCount();
-if($count == 0){
-	OC_Calendar_Calendar::deleteCalendar($newid);
-	OCP\JSON::error(array('message'=>OC_Calendar_App::$l10n->t('The file contained either no events or all events are already saved in your calendar.')));
-}else{
-	OCP\JSON::success(array('message'=>$count . ' ' . OC_Calendar_App::$l10n->t('events has been saved in the new calendar') . ' ' . $newcalendarname, 'eventSource'=>OC_Calendar_Calendar::getEventSourceInfo(OC_Calendar_Calendar::find($newid))));
-}
\ No newline at end of file
diff --git a/apps/calendar/ajax/import/import.php b/apps/calendar/ajax/import/import.php
deleted file mode 100644
index b1dfc464d0..0000000000
--- a/apps/calendar/ajax/import/import.php
+++ /dev/null
@@ -1,151 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Georg Ehrke <ownclouddev at georgswebsite dot de>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-OCP\JSON::checkLoggedIn();
-OCP\App::checkAppEnabled('calendar');
-OCP\JSON::callCheck();
-session_write_close();
-if (isset($_POST['progresskey']) && isset($_POST['getprogress'])) {
-	echo OCP\JSON::success(array('percent'=>OC_Cache::get($_POST['progresskey'])));
-	exit;
-}
-$file = OC_Filesystem::file_get_contents($_POST['path'] . '/' . $_POST['file']);
-if(!$file){
-	OCP\JSON::error(array('error'=>'404'));
-}
-$import = new OC_Calendar_Import($file);
-$import->setUserID(OCP\User::getUser());
-$import->setTimeZone(OC_Calendar_App::$tz);
-$import->enableProgressCache();
-$import->setProgresskey($_POST['progresskey']);
-if(!$import->isValid()){
-	OCP\JSON::error(array('error'=>'notvalid'));
-	exit;
-}
-$newcal = false;
-if($_POST['method'] == 'new'){
-	$calendars = OC_Calendar_Calendar::allCalendars(OCP\User::getUser());
-	foreach($calendars as $calendar){
-		if($calendar['displayname'] == $_POST['calname']){
-			$id = $calendar['id'];
-			$newcal = false;
-			break;
-		}
-		$newcal = true;
-	}
-	if($newcal){
-		$id = OC_Calendar_Calendar::addCalendar(OCP\USER::getUser(), strip_tags($_POST['calname']),'VEVENT,VTODO,VJOURNAL',null,0,strip_tags($_POST['calcolor']));
-		OC_Calendar_Calendar::setCalendarActive($id, 1);
-	}
-}else{
-	$calendar = OC_Calendar_App::getCalendar($_POST['id']);
-	if($calendar['userid'] != OCP\USER::getUser()){
-		OCP\JSON::error(array('error'=>'missingcalendarrights'));
-		exit();
-	}
-	$id = $_POST['id'];
-}
-$import->setCalendarID($id);
-try{
-	$import->import();
-}catch (Exception $e) {
-	OCP\JSON::error(array('message'=>OC_Calendar_App::$l10n->t('Import failed'), 'debug'=>$e->getMessage()));
-	//write some log
-}
-$count = $import->getCount();
-if($count == 0){
-	if($newcal){
-		OC_Calendar_Calendar::deleteCalendar($id);
-	}
-	OCP\JSON::error(array('message'=>OC_Calendar_App::$l10n->t('The file contained either no events or all events are already saved in your calendar.')));
-}else{
-	if($newcal){
-		OCP\JSON::success(array('message'=>$count . ' ' . OC_Calendar_App::$l10n->t('events has been saved in the new calendar') . ' ' .  strip_tags($_POST['calname'])));
-	}else{
-		OCP\JSON::success(array('message'=>$count . ' ' . OC_Calendar_App::$l10n->t('events has been saved in your calendar')));
-	}
-}
-/*		//////////////////////////// Attention: following code is quite painfull !!! ///////////////////////
-writeProgress('20');
-// normalize the newlines
-$file = str_replace(array("\r","\n\n"), array("\n","\n"), $file);
-$lines = explode("\n", $file);
-unset($file);
-writeProgress('30');
-// analyze the file, group components by uid, and keep refs to originating calendar object
-// $cals is array calendar objects, keys are 1st line# $cal, ie array( $cal => $caldata )
-//   $caldata is array( 'first' => 1st component line#, 'last' => last comp line#, 'end' => end line# )
-//   $caldata is used to create prefix/suffix strings when building import text
-// $uids is array of component arrays, keys are $uid, ie array( $uid => array( $beginlineno => $component ) )
-//   $component is array( 'end' => end line#, 'cal'=> $cal )
-$comp=$uid=$cal=false;
-$cals=$uids=array();
-$i = 0;
-foreach($lines as $line) {
-
-	if(strpos($line, ':')!==false) {
-		list($attr, $val) = explode(':', strtoupper($line));
-		if ($attr == 'BEGIN' && $val == 'VCALENDAR') {
-			$cal = $i;
-			$cals[$cal] = array('first'=>$i,'last'=>$i,'end'=>$i);
-		} elseif ($attr =='BEGIN' && $cal!==false && isset($comps[$val])) {
-			$comp = $val;
-			$beginNo = $i;
-		} elseif ($attr == 'END' && $cal!==false && $val == 'VCALENDAR') {
-			if($comp!==false) {
-				unset($cals[$cal]); // corrupt calendar, unset it
-			} else {
-				$cals[$cal]['end'] = $i;
-			}
-			$comp=$uid=$cal=false; // reset calendar
-		} elseif ($attr == 'END' && $comp!==false && $val == $comp) {
-			if(! $uid) {
-				$uid = OC_Calendar_Object::createUID();
-			}
-			$uids[$uid][$beginNo] = array('end'=>$i, 'cal'=>$cal);
-			if ($cals[$cal]['first'] == $cal) {
-				$cals[$cal]['first'] = $beginNo;
-			}
-			$cals[$cal]['last'] = $i;
-			$comp=$uid=false; // reset component
-		} elseif ($attr =="UID" && $comp!==false) {
-			list($attr, $uid) = explode(':', $line);
-		}
-	}
-	$i++;
-}
-// import the calendar
-writeProgress('60');
-foreach($uids as $uid) {
-	$prefix=$suffix=$content=array();
-	foreach($uid as $begin=>$details) {
-		
-		$cal = $details['cal'];
-		if(!isset($cals[$cal])) {
-			continue; // from corrupt/incomplete calendar
-		}
-		$cdata = $cals[$cal];
-		// if we have multiple components from different calendar objects,
-		// we should really merge their elements (enhancement?) -- 1st one wins for now.
-		if(! count($prefix)) {
-			$prefix = array_slice($lines, $cal, $cdata['first'] - $cal);
-		}
-		if(! count($suffix)) {
-			$suffix = array_slice($lines, $cdata['last']+1, $cdata['end'] - $cdata['last']);
-		}
-		$content = array_merge($content, array_slice($lines, $begin, $details['end'] - $begin + 1));
-	}
-	if(count($content)) {
-		$import = join($nl, array_merge($prefix, $content, $suffix)) . $nl;
-		OC_Calendar_Object::add($id, $import);
-	}
-}
-// finished import
-writeProgress('100');
-sleep(3);
-OC_Cache::remove($progresskey);
-OCP\JSON::success();*/
diff --git a/apps/calendar/ajax/settings/getfirstday.php b/apps/calendar/ajax/settings/getfirstday.php
deleted file mode 100644
index bc995f7d6e..0000000000
--- a/apps/calendar/ajax/settings/getfirstday.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Georg Ehrke <ownclouddev at georgswebsite dot de>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
- 
-OCP\JSON::checkLoggedIn();
-$firstday = OCP\Config::getUserValue( OCP\USER::getUser(), 'calendar', 'firstday', 'mo');
-OCP\JSON::encodedPrint(array('firstday' => $firstday));
\ No newline at end of file
diff --git a/apps/calendar/ajax/settings/gettimezonedetection.php b/apps/calendar/ajax/settings/gettimezonedetection.php
deleted file mode 100644
index 6bc9a07a1e..0000000000
--- a/apps/calendar/ajax/settings/gettimezonedetection.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011, 2012 Georg Ehrke <ownclouddev at georgswebsite dot de>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
- 
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('calendar');
-OCP\JSON::success(array('detection' => OCP\Config::getUserValue(OCP\USER::getUser(), 'calendar', 'timezonedetection')));
\ No newline at end of file
diff --git a/apps/calendar/ajax/settings/guesstimezone.php b/apps/calendar/ajax/settings/guesstimezone.php
deleted file mode 100644
index 6b6b8bef9c..0000000000
--- a/apps/calendar/ajax/settings/guesstimezone.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011, 2012 Georg Ehrke <ownclouddev at georgswebsite dot de>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
- 
-
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('calendar');
-
-$l = OC_L10N::get('calendar');
-
-$lat = $_POST['lat'];
-$lng = $_POST['lng'];
-
-$timezone =  OC_Geo::timezone($lat, $lng);
-
-if($timezone == OCP\Config::getUserValue(OCP\USER::getUser(), 'calendar', 'timezone')){
-	OCP\JSON::success();
-	exit;
-}
-OCP\Config::setUserValue(OCP\USER::getUser(), 'calendar', 'timezone', $timezone);
-$message = array('message'=> $l->t('New Timezone:') . $timezone);
-OCP\JSON::success($message);
\ No newline at end of file
diff --git a/apps/calendar/ajax/settings/setfirstday.php b/apps/calendar/ajax/settings/setfirstday.php
deleted file mode 100644
index 73cf0c19b7..0000000000
--- a/apps/calendar/ajax/settings/setfirstday.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Georg Ehrke <ownclouddev at georgswebsite dot de>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
- 
-OCP\JSON::checkLoggedIn();
-OCP\JSON::callCheck();
-if(isset($_POST["firstday"])){
-	OCP\Config::setUserValue(OCP\USER::getUser(), 'calendar', 'firstday', $_POST["firstday"]);
-	OCP\JSON::success();
-}else{
-	OCP\JSON::error();
-}
\ No newline at end of file
diff --git a/apps/calendar/ajax/settings/settimeformat.php b/apps/calendar/ajax/settings/settimeformat.php
deleted file mode 100644
index 6136857e2f..0000000000
--- a/apps/calendar/ajax/settings/settimeformat.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011 Georg Ehrke <ownclouddev at georgswebsite dot de>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
- 
-OCP\JSON::checkLoggedIn();
-OCP\JSON::callCheck();
-if(isset($_POST["timeformat"])){
-	OCP\Config::setUserValue(OCP\USER::getUser(), 'calendar', 'timeformat', $_POST["timeformat"]);
-	OCP\JSON::success();
-}else{
-	OCP\JSON::error();
-}
\ No newline at end of file
diff --git a/apps/calendar/ajax/settings/settimezone.php b/apps/calendar/ajax/settings/settimezone.php
deleted file mode 100644
index 06db66d578..0000000000
--- a/apps/calendar/ajax/settings/settimezone.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011 Bart Visscher <bartv@thisnet.nl>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-// Init owncloud
- 
-
-$l=OC_L10N::get('calendar');
-
-// Check if we are a user
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('calendar');
-OCP\JSON::callCheck();
-
-// Get data
-if( isset( $_POST['timezone'] ) ){
-	$timezone=$_POST['timezone'];
-	OCP\Config::setUserValue( OCP\USER::getUser(), 'calendar', 'timezone', $timezone );
-	OCP\JSON::success(array('data' => array( 'message' => $l->t('Timezone changed') )));
-}else{
-	OCP\JSON::error(array('data' => array( 'message' => $l->t('Invalid request') )));
-}
\ No newline at end of file
diff --git a/apps/calendar/ajax/settings/timeformat.php b/apps/calendar/ajax/settings/timeformat.php
deleted file mode 100644
index eebb687dfa..0000000000
--- a/apps/calendar/ajax/settings/timeformat.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011 Georg Ehrke <ownclouddev at georgswebsite dot de>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
- 
-OCP\JSON::checkLoggedIn();
-$timeformat = OCP\Config::getUserValue( OCP\USER::getUser(), 'calendar', 'timeformat', "24");
-OCP\JSON::encodedPrint(array("timeformat" => $timeformat));
\ No newline at end of file
diff --git a/apps/calendar/ajax/settings/timezonedetection.php b/apps/calendar/ajax/settings/timezonedetection.php
deleted file mode 100644
index 5f03f647b3..0000000000
--- a/apps/calendar/ajax/settings/timezonedetection.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011, 2012 Georg Ehrke <ownclouddev at georgswebsite dot de>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
- 
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('calendar');
-if(array_key_exists('timezonedetection', $_POST) && $_POST['timezonedetection'] == 'on'){
-	OCP\Config::setUserValue(OCP\USER::getUser(), 'calendar', 'timezonedetection', 'true');
-}else{
-	OCP\Config::setUserValue(OCP\USER::getUser(), 'calendar', 'timezonedetection', 'false');
-}
-OCP\JSON::success();
\ No newline at end of file
diff --git a/apps/calendar/ajax/share/activation.php b/apps/calendar/ajax/share/activation.php
deleted file mode 100644
index bce8693577..0000000000
--- a/apps/calendar/ajax/share/activation.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Georg Ehrke <ownclouddev@georgswebsite.de>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-$id = strip_tags($_POST['id']);
-$activation = strip_tags($_POST['activation']);
-OC_Calendar_Share::set_active(OCP\USER::getUser(), $id, $activation);
-OCP\JSON::success();
diff --git a/apps/calendar/ajax/share/changepermission.php b/apps/calendar/ajax/share/changepermission.php
deleted file mode 100644
index 5aff7666f7..0000000000
--- a/apps/calendar/ajax/share/changepermission.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Georg Ehrke <ownclouddev@georgswebsite.de>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-OCP\JSON::callCheck();
-
-$id = strip_tags($_POST['id']);
-$idtype = strip_tags($_POST['idtype']);
-$permission = (int) strip_tags($_POST['permission']);
-switch($idtype){
-	case 'calendar':
-	case 'event':
-		break;
-	default:
-		OCP\JSON::error(array('message'=>'unexspected parameter'));
-		exit;
-}
-if($idtype == 'calendar' && !OC_Calendar_App::getCalendar($id)){
-	OCP\JSON::error(array('message'=>'permission denied'));
-	exit;
-}
-if($idtype == 'event' && !OC_Calendar_App::getEventObject($id)){
-	OCP\JSON::error(array('message'=>'permission denied'));
-	exit;
-}
-$sharewith = $_POST['sharewith'];
-$sharetype = strip_tags($_POST['sharetype']);
-switch($sharetype){
-	case 'user':
-	case 'group':
-	case 'public':
-		break;
-	default:
-		OCP\JSON::error(array('message'=>'unexspected parameter'));
-		exit;
-}
-if($sharetype == 'user' && !OCP\User::userExists($sharewith)){
-	OCP\JSON::error(array('message'=>'user not found'));
-	exit;
-}
-if($sharetype == 'group' && !OC_Group::groupExists($sharewith)){
-	OCP\JSON::error(array('message'=>'group not found'));
-	exit;
-}
-$success = OC_Calendar_Share::changepermission($sharewith, $sharetype, $id, $permission, (($idtype=='calendar') ? OC_Calendar_Share::CALENDAR : OC_Calendar_Share::EVENT));
-OCP\JSON::success();
\ No newline at end of file
diff --git a/apps/calendar/ajax/share/dropdown.php b/apps/calendar/ajax/share/dropdown.php
deleted file mode 100644
index 86cf4ac090..0000000000
--- a/apps/calendar/ajax/share/dropdown.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Georg Ehrke <ownclouddev@georgswebsite.de>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
- 
-$user = OCP\USER::getUser();
-$calid = $_POST['calid'];
-$calendar = OC_Calendar_Calendar::find($calid);
-if($calendar['userid'] != $user){
-	OCP\JSON::error();
-	exit;
-}
-$tmpl = new OCP\Template('calendar', 'share.dropdown');
-$tmpl->assign('calid', $calid);
-$tmpl->printPage();
\ No newline at end of file
diff --git a/apps/calendar/ajax/share/share.php b/apps/calendar/ajax/share/share.php
deleted file mode 100644
index 77e1ab9d65..0000000000
--- a/apps/calendar/ajax/share/share.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Georg Ehrke <ownclouddev@georgswebsite.de>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
- 
-OCP\JSON::callCheck();
-
-$id = strip_tags($_POST['id']);
-$idtype = strip_tags($_POST['idtype']);
-switch($idtype){
-	case 'calendar':
-	case 'event':
-		break;
-	default:
-		OCP\JSON::error(array('message'=>'unexpected parameter'));
-		exit;
-}
-if($idtype == 'calendar' && !OC_Calendar_App::getCalendar($id)){
-	OCP\JSON::error(array('message'=>'permission denied'));
-	exit;
-}
-if($idtype == 'event' && !OC_Calendar_App::getEventObject($id)){
-	OCP\JSON::error(array('message'=>'permission denied'));
-	exit;
-}
-$sharewith = $_POST['sharewith'];
-$sharetype = strip_tags($_POST['sharetype']);
-switch($sharetype){
-	case 'user':
-	case 'group':
-	case 'public':
-		break;
-	default:
-		OCP\JSON::error(array('message'=>'unexpected parameter'));
-		exit;
-}
-if($sharetype == 'user' && !OCP\User::userExists($sharewith)){
-	OCP\JSON::error(array('message'=>'user not found'));
-	exit;
-}
-if($sharetype == 'group' && !OC_Group::groupExists($sharewith)){
-	OCP\JSON::error(array('message'=>'group not found'));
-	exit;
-}
-if($sharetype == 'user' && OCP\USER::getUser() == $sharewith){
-	OCP\JSON::error(array('message'=>'you can not share with yourself'));
-}
-$success = OC_Calendar_Share::share(OCP\USER::getUser(), $sharewith, $sharetype, $id, (($idtype=='calendar') ? OC_Calendar_Share::CALENDAR : OC_Calendar_Share::EVENT));
-if($success){
-	if($sharetype == 'public'){
-		OCP\JSON::success(array('message'=>$success));
-	}else{
-		OCP\JSON::success(array('message'=>'shared'));
-	}
-}else{
-	OCP\JSON::error(array('message'=>'can not share'));
-	exit;
-}
\ No newline at end of file
diff --git a/apps/calendar/ajax/share/unshare.php b/apps/calendar/ajax/share/unshare.php
deleted file mode 100644
index c7c0611318..0000000000
--- a/apps/calendar/ajax/share/unshare.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Georg Ehrke <ownclouddev@georgswebsite.de>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-OCP\JSON::callCheck();
-
-$id = strip_tags($_POST['id']);
-$idtype = strip_tags($_POST['idtype']);
-switch($idtype){
-	case 'calendar':
-	case 'event':
-		break;
-	default:
-		OCP\JSON::error(array('message'=>'unexspected parameter'));
-		exit;
-}
-if($idtype == 'calendar' && !OC_Calendar_App::getCalendar($id)){
-	OCP\JSON::error(array('message'=>'permission denied'));
-	exit;
-}
-if($idtype == 'event' && !OC_Calendar_App::getEventObject($id)){
-	OCP\JSON::error(array('message'=>'permission denied'));
-	exit;
-}
-$sharewith = $_POST['sharewith'];
-$sharetype = strip_tags($_POST['sharetype']);
-switch($sharetype){
-	case 'user':
-	case 'group':
-	case 'public':
-		break;
-	default:
-		OCP\JSON::error(array('message'=>'unexspected parameter'));
-		exit;
-}
-if($sharetype == 'user' && !OCP\User::userExists($sharewith)){
-	OCP\JSON::error(array('message'=>'user not found'));
-	exit;
-}elseif($sharetype == 'group' && !OC_Group::groupExists($sharewith)){
-	OCP\JSON::error(array('message'=>'group not found'));
-	exit;
-}
-$success = OC_Calendar_Share::unshare(OCP\USER::getUser(), $sharewith, $sharetype, $id, (($idtype=='calendar') ? OC_Calendar_Share::CALENDAR : OC_Calendar_Share::EVENT));
-if($success){
-	OCP\JSON::success();
-}else{
-	OCP\JSON::error(array('message'=>'can not unshare'));
-	exit;
-}
\ No newline at end of file
diff --git a/apps/calendar/appinfo/app.php b/apps/calendar/appinfo/app.php
deleted file mode 100644
index 0078705578..0000000000
--- a/apps/calendar/appinfo/app.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-$l=OC_L10N::get('calendar');
-OC::$CLASSPATH['OC_Calendar_App'] = 'apps/calendar/lib/app.php';
-OC::$CLASSPATH['OC_Calendar_Calendar'] = 'apps/calendar/lib/calendar.php';
-OC::$CLASSPATH['OC_Calendar_Object'] = 'apps/calendar/lib/object.php';
-OC::$CLASSPATH['OC_Calendar_Hooks'] = 'apps/calendar/lib/hooks.php';
-OC::$CLASSPATH['OC_Connector_Sabre_CalDAV'] = 'apps/calendar/lib/sabre/backend.php';
-OC::$CLASSPATH['OC_Connector_Sabre_CalDAV_CalendarRoot'] = 'apps/calendar/lib/sabre/calendarroot.php';
-OC::$CLASSPATH['OC_Connector_Sabre_CalDAV_UserCalendars'] = 'apps/calendar/lib/sabre/usercalendars.php';
-OC::$CLASSPATH['OC_Connector_Sabre_CalDAV_Calendar'] = 'apps/calendar/lib/sabre/calendar.php';
-OC::$CLASSPATH['OC_Connector_Sabre_CalDAV_CalendarObject'] = 'apps/calendar/lib/sabre/object.php';
-OC::$CLASSPATH['OC_Calendar_Repeat'] = 'apps/calendar/lib/repeat.php';
-OC::$CLASSPATH['OC_Calendar_Share'] = 'apps/calendar/lib/share.php';
-OC::$CLASSPATH['OC_Search_Provider_Calendar'] = 'apps/calendar/lib/search.php';
-OC::$CLASSPATH['OC_Calendar_Export'] = 'apps/calendar/lib/export.php';
-OC::$CLASSPATH['OC_Calendar_Import'] = 'apps/calendar/lib/import.php';
-OC::$CLASSPATH['OC_Share_Backend_Calendar'] = 'apps/calendar/lib/share/calendar.php';
-OC::$CLASSPATH['OC_Share_Backend_Event'] = 'apps/calendar/lib/share/event.php';
-//General Hooks
-OCP\Util::connectHook('OC_User', 'post_createUser', 'OC_Calendar_Hooks', 'createUser');
-OCP\Util::connectHook('OC_User', 'post_deleteUser', 'OC_Calendar_Hooks', 'deleteUser');
-//Repeating Events Hooks
-OCP\Util::connectHook('OC_Calendar', 'addEvent', 'OC_Calendar_Repeat', 'generate');
-OCP\Util::connectHook('OC_Calendar', 'editEvent', 'OC_Calendar_Repeat', 'update');
-OCP\Util::connectHook('OC_Calendar', 'deleteEvent', 'OC_Calendar_Repeat', 'clean');
-OCP\Util::connectHook('OC_Calendar', 'moveEvent', 'OC_Calendar_Repeat', 'update');
-OCP\Util::connectHook('OC_Calendar', 'deleteCalendar', 'OC_Calendar_Repeat', 'cleanCalendar');
-//Sharing Hooks
-OCP\Util::connectHook('OC_Calendar', 'deleteEvent', 'OC_Calendar_Share', 'post_eventdelete');
-OCP\Util::connectHook('OC_Calendar', 'deleteCalendar', 'OC_Calendar_Share', 'post_caldelete');
-OCP\Util::addscript('calendar','loader');
-OCP\Util::addscript("3rdparty", "chosen/chosen.jquery.min");
-OCP\Util::addStyle("3rdparty", "chosen/chosen");
-OCP\Util::addStyle('3rdparty/miniColors', 'jquery.miniColors');
-OCP\Util::addscript('3rdparty/miniColors', 'jquery.miniColors.min');
-OCP\App::addNavigationEntry( array(
-  'id' => 'calendar_index',
-  'order' => 10,
-  'href' => OCP\Util::linkTo( 'calendar', 'index.php' ),
-  'icon' => OCP\Util::imagePath( 'calendar', 'icon.svg' ),
-  'name' => $l->t('Calendar')));
-OC_Search::registerProvider('OC_Search_Provider_Calendar');
-OCP\Share::registerBackend('calendar', 'OC_Share_Backend_Calendar');
-OCP\Share::registerBackend('event', 'OC_Share_Backend_Event');
diff --git a/apps/calendar/appinfo/database.xml b/apps/calendar/appinfo/database.xml
deleted file mode 100644
index 16e10010d5..0000000000
--- a/apps/calendar/appinfo/database.xml
+++ /dev/null
@@ -1,345 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<database>
-
- <name>*dbname*</name>
- <create>true</create>
- <overwrite>false</overwrite>
-
- <charset>utf8</charset>
-
- <table>
-
-  <name>*dbprefix*calendar_objects</name>
-
-  <declaration>
-
-   <field>
-    <name>id</name>
-    <type>integer</type>
-    <default>0</default>
-    <notnull>true</notnull>
-    <autoincrement>1</autoincrement>
-    <unsigned>true</unsigned>
-    <length>4</length>
-   </field>
-
-   <field>
-    <name>calendarid</name>
-    <type>integer</type>
-    <default></default>
-    <notnull>true</notnull>
-    <unsigned>true</unsigned>
-    <length>4</length>
-   </field>
-
-   <field>
-    <name>objecttype</name>
-    <type>text</type>
-    <default></default>
-    <notnull>true</notnull>
-    <length>40</length>
-   </field>
-
-   <field>
-    <name>startdate</name>
-    <type>timestamp</type>
-    <default>CURRENT_TIMESTAMP</default>
-    <notnull>false</notnull>
-   </field>
-
-   <field>
-    <name>enddate</name>
-    <type>timestamp</type>
-    <default>CURRENT_TIMESTAMP</default>
-    <notnull>false</notnull>
-   </field>
-
-   <field>
-    <name>repeating</name>
-    <type>integer</type>
-    <default></default>
-    <notnull>false</notnull>
-    <length>4</length>
-   </field>
-
-   <field>
-    <name>summary</name>
-    <type>text</type>
-    <default></default>
-    <notnull>false</notnull>
-    <length>255</length>
-   </field>
-
-   <field>
-    <name>calendardata</name>
-    <type>text</type>
-    <notnull>false</notnull>
-   </field>
-
-   <field>
-    <name>uri</name>
-    <type>text</type>
-    <default></default>
-    <notnull>false</notnull>
-    <length>255</length>
-   </field>
-
-   <field>
-    <name>lastmodified</name>
-    <type>integer</type>
-    <default></default>
-    <notnull>false</notnull>
-    <length>4</length>
-   </field>
-
-  </declaration>
-
- </table>
-
- <table>
-
-  <name>*dbprefix*calendar_calendars</name>
-
-  <declaration>
-
-   <field>
-    <name>id</name>
-    <type>integer</type>
-    <default>0</default>
-    <notnull>true</notnull>
-    <autoincrement>1</autoincrement>
-    <unsigned>true</unsigned>
-    <length>4</length>
-   </field>
-
-   <field>
-    <name>userid</name>
-    <type>text</type>
-    <default></default>
-    <notnull>false</notnull>
-    <length>255</length>
-   </field>
-
-   <field>
-    <name>displayname</name>
-    <type>text</type>
-    <default></default>
-    <notnull>false</notnull>
-    <length>100</length>
-   </field>
-
-   <field>
-    <name>uri</name>
-    <type>text</type>
-    <default></default>
-    <notnull>false</notnull>
-    <length>255</length>
-   </field>
-
-   <field>
-    <name>active</name>
-    <type>integer</type>
-    <default>1</default>
-    <notnull>true</notnull>
-    <length>4</length>
-   </field>
-
-   <field>
-    <name>ctag</name>
-    <type>integer</type>
-    <default>0</default>
-    <notnull>true</notnull>
-    <unsigned>true</unsigned>
-    <length>4</length>
-   </field>
-
-   <field>
-    <name>calendarorder</name>
-    <type>integer</type>
-    <default>0</default>
-    <notnull>true</notnull>
-    <unsigned>true</unsigned>
-    <length>4</length>
-   </field>
-
-   <field>
-    <name>calendarcolor</name>
-    <type>text</type>
-    <default></default>
-    <notnull>false</notnull>
-    <length>10</length>
-   </field>
-
-   <field>
-    <name>timezone</name>
-    <type>text</type>
-    <notnull>false</notnull>
-   </field>
-
-   <field>
-    <name>components</name>
-    <type>text</type>
-    <default></default>
-    <notnull>false</notnull>
-    <length>100</length>
-   </field>
-
-  </declaration>
-
- </table>
- 
- <table>
-
-  <name>*dbprefix*calendar_share_event</name>
-
-  <declaration>
-  
-   <field>
-    <name>owner</name>
-    <type>text</type>
-    <notnull>true</notnull>
-    <length>255</length>
-   </field>
-  
-   <field>
-    <name>share</name>
-    <type>text</type>
-    <notnull>true</notnull>
-    <length>255</length>
-   </field>
-  
-   <field>
-    <name>sharetype</name>
-    <type>text</type>
-    <notnull>true</notnull>
-    <length>6</length>
-   </field>
-
-   <field>
-    <name>eventid</name>
-    <type>integer</type>
-    <default></default>
-    <notnull>true</notnull>
-    <unsigned>true</unsigned>
-    <length>11</length>
-   </field>
-
-   <field>
-    <name>permissions</name>
-    <type>integer</type>
-    <notnull>true</notnull>
-    <length>1</length>
-   </field>
-
-  </declaration>
-
- </table>
- 
- <table>
-
-  <name>*dbprefix*calendar_share_calendar</name>
-
-  <declaration>
-  
-   <field>
-    <name>owner</name>
-    <type>text</type>
-    <notnull>true</notnull>
-    <length>255</length>
-   </field>
-  
-   <field>
-    <name>share</name>
-    <type>text</type>
-    <notnull>true</notnull>
-    <length>255</length>
-   </field>
-  
-   <field>
-    <name>sharetype</name>
-    <type>text</type>
-    <notnull>true</notnull>
-    <length>6</length>
-   </field>
-
-   <field>
-    <name>calendarid</name>
-    <type>integer</type>
-    <default></default>
-    <notnull>true</notnull>
-    <unsigned>true</unsigned>
-    <length>11</length>
-   </field>
-
-   <field>
-    <name>permissions</name>
-    <type>integer</type>
-    <notnull>true</notnull>
-    <length>1</length>
-   </field>
-
-   <field>
-    <name>active</name>
-    <type>integer</type>
-    <default>1</default>
-    <notnull>true</notnull>
-    <length>4</length>
-   </field>
-
-  </declaration>
-
- </table>
- 
- <table>
-
-  <name>*dbprefix*calendar_repeat</name>
-
-  <declaration>
-
-   <field>
-    <name>id</name>
-    <type>integer</type>
-    <default>0</default>
-    <notnull>true</notnull>
-    <autoincrement>1</autoincrement>
-    <unsigned>true</unsigned>
-    <length>4</length>
-   </field>
-  
-   <field>
-    <name>eventid</name>
-    <type>integer</type>
-    <default>0</default>
-    <notnull>true</notnull>
-    <unsigned>true</unsigned>
-    <length>4</length>
-   </field>
-  
-   <field>
-    <name>calid</name>
-    <type>integer</type>
-    <default>0</default>
-    <notnull>true</notnull>
-    <unsigned>true</unsigned>
-    <length>4</length>
-   </field>
-
-   <field>
-    <name>startdate</name>
-    <type>timestamp</type>
-    <default>0000-00-00 00:00:00</default>
-    <notnull>false</notnull>
-   </field>
-
-   <field>
-    <name>enddate</name>
-    <type>timestamp</type>
-    <default>0000-00-00 00:00:00</default>
-    <notnull>false</notnull>
-   </field>
-
-  </declaration>
-
- </table>
- 
-</database>
diff --git a/apps/calendar/appinfo/info.xml b/apps/calendar/appinfo/info.xml
deleted file mode 100644
index dde0260f07..0000000000
--- a/apps/calendar/appinfo/info.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?> 
-<info>
-	<id>calendar</id>
-	<name>Calendar</name>
-	<licence>AGPL</licence>
-	<author>Georg Ehrke, Bart Visscher, Jakob Sack</author>
-	<require>4</require>
-	<shipped>true</shipped>
-	<description>Calendar with CalDAV support</description>
-	<default_enable/>
-	<remote>
-		<calendar>appinfo/remote.php</calendar>
-		<caldav>appinfo/remote.php</caldav>
-	</remote>
-	<public>
-		<calendar>share.php</calendar>
-		<caldav>share.php</caldav>
-	</public>
-</info>
diff --git a/apps/calendar/appinfo/remote.php b/apps/calendar/appinfo/remote.php
deleted file mode 100644
index f499d90966..0000000000
--- a/apps/calendar/appinfo/remote.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011 Jakob Sack <mail@jakobsack.de>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-OCP\App::checkAppEnabled('calendar');
-
-if(substr($_SERVER["REQUEST_URI"],0,strlen(OC_App::getAppWebPath('calendar').'/caldav.php')) == OC_App::getAppWebPath('calendar'). '/caldav.php'){
-	$baseuri = OC_App::getAppWebPath('calendar').'/caldav.php';
-}
-
-// only need authentication apps
-$RUNTIME_APPTYPES=array('authentication');
-OC_App::loadApps($RUNTIME_APPTYPES);
-
-// Backends
-$authBackend = new OC_Connector_Sabre_Auth();
-$principalBackend = new OC_Connector_Sabre_Principal();
-$caldavBackend    = new OC_Connector_Sabre_CalDAV();
-
-// Root nodes
-$Sabre_CalDAV_Principal_Collection = new Sabre_CalDAV_Principal_Collection($principalBackend);
-$Sabre_CalDAV_Principal_Collection->disableListing = true; // Disable listening
-
-$calendarRoot = new OC_Connector_Sabre_CalDAV_CalendarRoot($principalBackend, $caldavBackend);
-$calendarRoot->disableListing = true; // Disable listening
-
-$nodes = array(
-	$Sabre_CalDAV_Principal_Collection,
-	$calendarRoot,
-	);
-
-// Fire up server
-$server = new Sabre_DAV_Server($nodes);
-$server->setBaseUri($baseuri);
-// Add plugins
-$server->addPlugin(new Sabre_DAV_Auth_Plugin($authBackend,'ownCloud'));
-$server->addPlugin(new Sabre_CalDAV_Plugin());
-$server->addPlugin(new Sabre_DAVACL_Plugin());
-$server->addPlugin(new Sabre_DAV_Browser_Plugin(false)); // Show something in the Browser, but no upload
-$server->addPlugin(new Sabre_CalDAV_ICSExportPlugin());
-
-// And off we go!
-$server->exec();
diff --git a/apps/calendar/appinfo/update.php b/apps/calendar/appinfo/update.php
deleted file mode 100644
index 0e11c99884..0000000000
--- a/apps/calendar/appinfo/update.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-$installedVersion=OCP\Config::getAppValue('calendar', 'installed_version');
-if (version_compare($installedVersion, '0.2.1', '<')) {
-	$stmt = OCP\DB::prepare( 'SELECT `id`, `calendarcolor` FROM `*PREFIX*calendar_calendars` WHERE `calendarcolor` IS NOT NULL' );
-	$result = $stmt->execute();
-	while( $row = $result->fetchRow()) {
-		$id = $row['id'];
-		$color = $row['calendarcolor'];
-		if ($color[0] == '#' || strlen($color) < 6) {
-			continue;
-		}
-		$color = '#' .$color;
-		$stmt = OCP\DB::prepare( 'UPDATE `*PREFIX*calendar_calendars` SET `calendarcolor`=? WHERE `id`=?' );
-		$r = $stmt->execute(array($color,$id));
-	}
-}
-if (version_compare($installedVersion, '0.5', '<')) {
-	$calendars = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser());
-	foreach($calendars as $calendar){
-		OC_Calendar_Repeat::cleanCalendar($calendar['id']);
-		OC_Calendar_Repeat::generateCalendar($calendar['id']);
-	}
-}
\ No newline at end of file
diff --git a/apps/calendar/appinfo/version b/apps/calendar/appinfo/version
deleted file mode 100644
index cb0c939a93..0000000000
--- a/apps/calendar/appinfo/version
+++ /dev/null
@@ -1 +0,0 @@
-0.5.2
diff --git a/apps/calendar/caldav.php b/apps/calendar/caldav.php
deleted file mode 100644
index 7b811d3cdf..0000000000
--- a/apps/calendar/caldav.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-if(!file_exists('../../lib/base.php')){
-	die('Please update the path to /lib/base.php in caldav.php or make use of /remote.php/caldav/');
-}
-require_once('../../lib/base.php');
-require_once('appinfo/remote.php');
\ No newline at end of file
diff --git a/apps/calendar/calendar.php b/apps/calendar/calendar.php
deleted file mode 100644
index 2c0bee9d23..0000000000
--- a/apps/calendar/calendar.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Georg Ehrke <ownClouddev at georgswebsite.de>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-$l10n = OC_L10N::get('calendar');
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('calendar');
-$tmpl = new OCP\Template('calendar', 'part.choosecalendar');
-$tmpl->printpage();
\ No newline at end of file
diff --git a/apps/calendar/css/import.css b/apps/calendar/css/import.css
deleted file mode 100644
index fd82006072..0000000000
--- a/apps/calendar/css/import.css
+++ /dev/null
@@ -1,14 +0,0 @@
-/**
- * Copyright (c) 2012 Georg Ehrke <ownclouddev at georgswebsite dot de>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-#calendar_import_newcalform, #calendar_import_mergewarning, #calendar_import_process, #calendar_import_done{display:none;}
-#calendar_import_process_message, #calendar_import_status, #calendar_import_form_message, #calendar_import_mergewarning{text-align:center;}
-#calendar_import_form_message{font-weight: bold;}
-#calendar_import_newcalendar{width:415px;float:right;}
-#calendar_import_mergewarning{clear: both;}
-#calendar_import_defaultcolors{clear:both;margin: 0 auto;text-align: center;}
-.calendar_import_warning{border-color: #fc3333;}
-.calendar-colorpicker-color{display:inline-block;width:20px;height:5px;margin: 0 auto;cursor:pointer;border:2px solid transparent;margin-top: 5px;}
\ No newline at end of file
diff --git a/apps/calendar/css/style.css b/apps/calendar/css/style.css
deleted file mode 100644
index 64a779b9a9..0000000000
--- a/apps/calendar/css/style.css
+++ /dev/null
@@ -1,142 +0,0 @@
-/**
- * Copyright (c) 2011 Georg Ehrke <ownclouddev at georgswebsite dot de>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-#view { float: left; font-size: 12px; height: 100%;}
-#datecontrol {text-align: center;}
-#datecontrol_left{font-size: 12px;}
-#datecontrol_right{font-size: 12px;}
-#datecontrol_date_label {margin: 0; padding: 0; font-size: 12px;}
-#choosecalendar {margin-right: 170px; float: right; font-size: 12px;}
-
-#choosecalendar_dialog {display: none;}
-#newentry_dialog {display: none;}
-#editentry_dialog {display: none;}
-#parsingfail_dialog{display: none;}
-
-#loading { display: none;margin: 0;padding:0;margin-top:5px;}
-
-#fullcalendar {position: relative;bottom: 0; right: 0; left: 0; top: 3em;}
-.fc-content{padding:2px 4px;}
-#listview {margin: 0; padding: 10px; background: #EEEEEE;}
-#listview #more_before, #listview #more_after {border: 1px solid #1a1a1a; width:25em;padding: 3px;text-align: center;}
-#listview #events {width:25em;padding: 4px;}
-#listview #events .day {width:auto;padding-left:10px;border-bottom: 2px solid #EEEEEE;text-align:left;}
-
-.actions {height: 33px;	min-width: 800px;}
-.controls {min-width: 800px;}
-.center {text-align: center;}
-.dateinfo {height: 20px;width: 100%; overflow: hidden; margin-top: 0; padding: 0; font-size: 12px;background: #F7F7F7;}
-.events {width: 100%; margin: 0; padding: 0;min-height: 100px;}
-.calendar_row {height: 20px; text-align: center;background: #ffffff;}
-#oneweekview .calendar_row {width: 13.5%;}
-.calendar_time {height: 20px; width: 50px; text-align:right;background: #ffffff;}
-.day {text-align: center; background: #ffffff; margin: 0; padding: 0; vertical-align: top; width: 14%; height: 22%;}
-.weekend {background: #F3F3F3; }
-.weekend_thead, .weekend_row{height: 20px;text-align: center;text-align: center;background: #F3F3F3;}
-.thisday{background: #FFFABC;}
-.event {position:relative;}
-.event.colored {border-bottom: 1px solid white;}
-
-input[type="button"].active {color: #6193CF}
-#fromtime, #totime {
-color:#333;
-}
-#fromtime.disabled, #totime.disabled {
-color:#A9A9A9;
-}
-select#category{width:140px;}
-button.category{margin:0 3px;}
-
-.calendar-colorpicker-color{display:inline-block;width:20px;height:20px;margin-right:2px;cursor:pointer;border:2px solid transparent;}
-.calendar-colorpicker-color.active{border:2px solid black;}
-
-#event {padding: 0;margin: 0;margin-top:-5px}
-
-.calendar_share_dropdown{ display:block;  position:absolute; z-index:100; width:16em; right:0; margin-right:7em; background:#F8F8F8; padding:1em;
--moz-box-shadow:0 1px 1px #777; -webkit-box-shadow:0 1px 1px #777; box-shadow:0 1px 1px #777;
--moz-border-radius:0 0 1em 1em; -webkit-border-radius:0 0 1em 1em; border-radius:0 0 1em 1em;}
-
-.fc-list-table
-{
-    margin: 10px;
-    border-style: hidden;
-    border-width: 10px;
-    padding: 10px;
-    vertical-align: top;
-    width: 100%;
-}
-.fc-list-table tr:hover
-{
-    color: #0000FF;
-    background-color: #CCFFCC;
-}
-
-
-.fc-list-date
-{
-    margin: 16px;
-    white-space: nowrap;
-    text-align: left;
-    width: 100%;
-    background-color: #808080;
-    color: #FFFFFF;
-    font-weight: bold;
-    font-family: Arial, Helvetica, sans-serif;
-}
-.fc-list-time
-{
-    text-align: center;
-    white-space: nowrap;
-    width: 1%;
-}
-
-.fc-list-event
-{
-     text-align: left;
-}
-
-.fc-list-event .fc-event-title
-{
-     cursor: pointer;
-}
-.tipsy-event .tipsy-inner{
-background-color:#0098E4;
-border:2px solid #1d2d44;
-max-width:400px;
-padding:0;
-}
-.tipsy-event .tipsy-arrow-s{
-border-top-color:#1d2d44;
-}
-.tipsy-event .tipsy-arrow-n{
-border-bottom-color:#1d2d44;
-}
-.tipsy-event .summary,
-.tipsy-event .timespan,
-.tipsy-event .description{
-padding:0 8px;
-}
-.tipsy-event .summary{
-background-color:#1d2d44;
-font-size:1.2em;
-font-weight:bold;
-text-align:left;
-padding:0 8px 2px;
-}
-.tipsy-event .description{
-line-height:1.2;
-margin-bottom:4px;
-}
-
-#choosecalendar a.settings{
-	margin-top: 25px;
-	margin-right: 10px;
-}
-
-#fullcalendar{
-	overflow: scroll;
-}
\ No newline at end of file
diff --git a/apps/calendar/export.php b/apps/calendar/export.php
deleted file mode 100644
index 1374c49cc0..0000000000
--- a/apps/calendar/export.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Georg Ehrke <ownclouddev at georgswebsite dot de>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-OCP\User::checkLoggedIn();
-OCP\App::checkAppEnabled('calendar');
-$cal = isset($_GET['calid']) ? $_GET['calid'] : NULL;
-$event = isset($_GET['eventid']) ? $_GET['eventid'] : NULL;
-if(isset($cal)){
-	$calendar = OC_Calendar_App::getCalendar($cal, true);
-	if(!$calendar){
-		header('HTTP/1.0 404 Not Found');
-		exit;
-	}
-	header('Content-Type: text/Calendar');
-	header('Content-Disposition: inline; filename=' . str_replace(' ', '-', $calendar['displayname']) . '.ics'); 
-	echo OC_Calendar_Export::export($cal, OC_Calendar_Export::CALENDAR);
-}elseif(isset($event)){
-	$data = OC_Calendar_App::getEventObject($_GET['eventid'], true);
-	if(!$data){
-		header('HTTP/1.0 404 Not Found');
-		exit;
-	}
-	header('Content-Type: text/Calendar');
-	header('Content-Disposition: inline; filename=' . str_replace(' ', '-', $data['summary']) . '.ics');
-	echo OC_Calendar_Export::export($event, OC_Calendar_Export::EVENT);
-}
\ No newline at end of file
diff --git a/apps/calendar/img/Icon License b/apps/calendar/img/Icon License
deleted file mode 100644
index b1b292ace6..0000000000
--- a/apps/calendar/img/Icon License	
+++ /dev/null
@@ -1,2 +0,0 @@
-http://thenounproject.com/noun/calendar/#icon-No404
-Creative Commons BY 3.0
\ No newline at end of file
diff --git a/apps/calendar/img/icon.png b/apps/calendar/img/icon.png
deleted file mode 100644
index 267efd997f..0000000000
Binary files a/apps/calendar/img/icon.png and /dev/null differ
diff --git a/apps/calendar/img/icon.svg b/apps/calendar/img/icon.svg
deleted file mode 100644
index 211f74df06..0000000000
--- a/apps/calendar/img/icon.svg
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="Layer_1"
-   x="0px"
-   y="0px"
-   width="14px"
-   height="16px"
-   viewBox="0 0 88 100"
-   enable-background="new 0 0 88 100"
-   xml:space="preserve"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="icon.svg"><metadata
-   id="metadata11"><rdf:RDF><cc:Work
-       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
-   id="defs9" /><sodipodi:namedview
-   pagecolor="#ffffff"
-   bordercolor="#666666"
-   borderopacity="1"
-   objecttolerance="10"
-   gridtolerance="10"
-   guidetolerance="10"
-   inkscape:pageopacity="0"
-   inkscape:pageshadow="2"
-   inkscape:window-width="1680"
-   inkscape:window-height="1004"
-   id="namedview7"
-   showgrid="false"
-   inkscape:zoom="19.125"
-   inkscape:cx="7"
-   inkscape:cy="8"
-   inkscape:window-x="-2"
-   inkscape:window-y="23"
-   inkscape:window-maximized="1"
-   inkscape:current-layer="Layer_1" />
-<path
-   d="M0,32v59.906C0,96.377,3.582,100,8,100h72c4.418,0,8-3.623,8-8.094V32H0z M22,94H6V78h16V94z M22,74H6V58h16V74z M22,54H6  V38h16V54z M42,94H26V78h16V94z M42,74H26V58h16V74z M42,54H26V38h16V54z M62,94H46V78h16V94z M62,74H46V58h16V74z M62,54H46V38h16  V54z M82,94H66V78h16V94z M82,74H66V58h16V74z M82,54H66V38h16V54z"
-   id="path3"
-   style="fill:#4d4d4d" />
-<path
-   d="M80,12H67V3c0-1.657-1.344-3-3-3c-1.657,0-3,1.343-3,3v9H27V3c0-1.657-1.344-3-3-3c-1.657,0-3,1.343-3,3v9H8  c-4.418,0-8,3.623-8,8.093V27v0v1h88v-1v0v-6.907C88,15.623,84.418,12,80,12z M24,26c-3.313,0-6-2.687-6-6  c0-2.219,1.209-4.152,3-5.19V20c0,1.657,1.343,3,3,3c1.656,0,3-1.343,3-3v-5.191c1.792,1.038,3,2.972,3,5.191  C30,23.313,27.314,26,24,26z M64,26c-3.313,0-6-2.687-6-6c0-2.219,1.209-4.152,3-5.19V20c0,1.657,1.343,3,3,3c1.656,0,3-1.343,3-3  v-5.191c1.792,1.038,3,2.972,3,5.191C70,23.313,67.314,26,64,26z"
-   id="path5"
-   style="fill:#4d4d4d" />
-</svg>
\ No newline at end of file
diff --git a/apps/calendar/index.php b/apps/calendar/index.php
deleted file mode 100644
index a8ad4ab335..0000000000
--- a/apps/calendar/index.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011 Georg Ehrke <ownclouddev at georgswebsite dot de>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-OCP\User::checkLoggedIn();
-OCP\App::checkAppEnabled('calendar');
-
-// Create default calendar ...
-$calendars = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser(), false);
-if( count($calendars) == 0){
-	OC_Calendar_Calendar::addCalendar(OCP\USER::getUser(),'Default calendar');
-	$calendars = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser(), true);
-}
-
-$eventSources = array();
-foreach($calendars as $calendar){
-	if($calendar['active'] == 1) {
-		$eventSources[] = OC_Calendar_Calendar::getEventSourceInfo($calendar);
-	}
-}
-
-$events_baseURL = OCP\Util::linkTo('calendar', 'ajax/events.php');
-$eventSources[] = array('url' => $events_baseURL.'?calendar_id=shared_rw',
-		'backgroundColor' => '#1D2D44',
-		'borderColor' => '#888',
-		'textColor' => 'white',
-		'editable'=>'true');
-$eventSources[] = array('url' => $events_baseURL.'?calendar_id=shared_r',
-		'backgroundColor' => '#1D2D44',
-		'borderColor' => '#888',
-		'textColor' => 'white',
-		'editable' => 'false');
-
-OCP\Util::emitHook('OC_Calendar', 'getSources', array('sources' => &$eventSources));
-$categories = OC_Calendar_App::getCategoryOptions();
-
-//Fix currentview for fullcalendar
-if(OCP\Config::getUserValue(OCP\USER::getUser(), 'calendar', 'currentview', 'month') == "oneweekview"){
-	OCP\Config::setUserValue(OCP\USER::getUser(), "calendar", "currentview", "agendaWeek");
-}
-if(OCP\Config::getUserValue(OCP\USER::getUser(), 'calendar', 'currentview', 'month') == "onemonthview"){
-	OCP\Config::setUserValue(OCP\USER::getUser(), "calendar", "currentview", "month");
-}
-if(OCP\Config::getUserValue(OCP\USER::getUser(), 'calendar', 'currentview', 'month') == "listview"){
-	OCP\Config::setUserValue(OCP\USER::getUser(), "calendar", "currentview", "list");
-}
-
-OCP\Util::addscript('3rdparty/fullcalendar', 'fullcalendar');
-OCP\Util::addStyle('3rdparty/fullcalendar', 'fullcalendar');
-OCP\Util::addscript('3rdparty/timepicker', 'jquery.ui.timepicker');
-OCP\Util::addStyle('3rdparty/timepicker', 'jquery.ui.timepicker');
-if(OCP\Config::getUserValue(OCP\USER::getUser(), "calendar", "timezone") == null || OCP\Config::getUserValue(OCP\USER::getUser(), 'calendar', 'timezonedetection') == 'true'){
-	OCP\Util::addscript('calendar', 'geo');
-}
-OCP\Util::addscript('calendar', 'calendar');
-OCP\Util::addStyle('calendar', 'style');
-OCP\Util::addscript('', 'jquery.multiselect');
-OCP\Util::addStyle('', 'jquery.multiselect');
-OCP\Util::addscript('contacts','jquery.multi-autocomplete');
-OCP\Util::addscript('','oc-vcategories');
-OCP\App::setActiveNavigationEntry('calendar_index');
-$tmpl = new OCP\Template('calendar', 'calendar', 'user');
-$tmpl->assign('eventSources', $eventSources,false);
-$tmpl->assign('categories', $categories);
-if(array_key_exists('showevent', $_GET)){
-	$tmpl->assign('showevent', $_GET['showevent'], false);
-}
-$tmpl->printPage();
diff --git a/apps/calendar/js/calendar.js b/apps/calendar/js/calendar.js
deleted file mode 100644
index 23846c89b8..0000000000
--- a/apps/calendar/js/calendar.js
+++ /dev/null
@@ -1,935 +0,0 @@
-/**
- * Copyright (c) 2012 Georg Ehrke <ownclouddev at georgswebsite dot de>
- * Copyright (c) 2011 Bart Visscher <bartv@thisnet.nl>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-Calendar={
-	UI:{
-		loading: function(isLoading){
-			if (isLoading){
-				$('#loading').show();
-			}else{
-				$('#loading').hide();
-			}
-		},
-		startEventDialog:function(){
-			Calendar.UI.loading(false);
-			$('.tipsy').remove();
-			$('#fullcalendar').fullCalendar('unselect');
-			Calendar.UI.lockTime();
-			$( "#from" ).datepicker({
-				dateFormat : 'dd-mm-yy'
-			});
-			$( "#to" ).datepicker({
-				dateFormat : 'dd-mm-yy'
-			});
-			$('#fromtime').timepicker({
-			    showPeriodLabels: false
-			});
-			$('#totime').timepicker({
-			    showPeriodLabels: false
-			});
-			$('#category').multiple_autocomplete({source: categories});
-			Calendar.UI.repeat('init');
-			$('#end').change(function(){
-				Calendar.UI.repeat('end');
-			});
-			$('#repeat').change(function(){
-				Calendar.UI.repeat('repeat');
-			});
-			$('#advanced_year').change(function(){
-				Calendar.UI.repeat('year');
-			});
-			$('#advanced_month').change(function(){
-				Calendar.UI.repeat('month');
-			});
-			$( "#event" ).tabs({ selected: 0});
-			$('#event').dialog({
-				width : 500,
-				height: 600,
-				close : function(event, ui) {
-					$(this).dialog('destroy').remove();
-				}
-			});
-		},
-		newEvent:function(start, end, allday){
-			start = Math.round(start.getTime()/1000);
-			if (end){
-				end = Math.round(end.getTime()/1000);
-			}
-			if($('#event').dialog('isOpen') == true){
-				// TODO: save event
-				$('#event').dialog('destroy').remove();
-			}else{
-				Calendar.UI.loading(true);
-				$('#dialog_holder').load(OC.filePath('calendar', 'ajax/event', 'new.form.php'), {start:start, end:end, allday:allday?1:0}, Calendar.UI.startEventDialog);
-			}
-		},
-		editEvent:function(calEvent, jsEvent, view){
-			if (calEvent.editable == false || calEvent.source.editable == false) {
-				return;
-			}
-			var id = calEvent.id;
-			if($('#event').dialog('isOpen') == true){
-				// TODO: save event
-				$('#event').dialog('destroy').remove();
-			}else{
-				Calendar.UI.loading(true);
-				$('#dialog_holder').load(OC.filePath('calendar', 'ajax/event', 'edit.form.php'), {id: id}, Calendar.UI.startEventDialog);
-			}
-		},
-		submitDeleteEventForm:function(url){
-			var post = $( '#event_form' ).serialize();
-			$('#errorbox').empty();
-			Calendar.UI.loading(true);
-			$.post(url, post, function(data){
-					Calendar.UI.loading(false);
-					if(data.status == 'success'){
-						$('#fullcalendar').fullCalendar('removeEvents', $('#event_form input[name=id]').val());
-						$('#event').dialog('destroy').remove();
-					} else {
-						$('#errorbox').html(t('calendar', 'Deletion failed'));
-					}
-
-			}, "json");
-		},
-		validateEventForm:function(url){
-			var post = $( "#event_form" ).serialize();
-			$("#errorbox").empty();
-			Calendar.UI.loading(true);
-			$.post(url, post,
-				function(data){
-					Calendar.UI.loading(false);
-					if(data.status == "error"){
-						var output = missing_field + ": <br />";
-						if(data.title == "true"){
-							output = output + missing_field_title + "<br />";
-						}
-						if(data.cal == "true"){
-							output = output + missing_field_calendar + "<br />";
-						}
-						if(data.from == "true"){
-							output = output + missing_field_fromdate + "<br />";
-						}
-						if(data.fromtime == "true"){
-							output = output + missing_field_fromtime + "<br />";
-						}
-						if(data.to == "true"){
-							output = output + missing_field_todate + "<br />";
-						}
-						if(data.totime == "true"){
-							output = output + missing_field_totime + "<br />";
-						}
-						if(data.endbeforestart == "true"){
-							output = output + missing_field_startsbeforeends + "!<br/>";
-						}
-						if(data.dberror == "true"){
-							output = "There was a database fail!";
-						}
-						$("#errorbox").html(output);
-					} else
-					if(data.status == 'success'){
-						$('#event').dialog('destroy').remove();
-						$('#fullcalendar').fullCalendar('refetchEvents');
-					}
-				},"json");
-		},
-		moveEvent:function(event, dayDelta, minuteDelta, allDay, revertFunc){
-			$('.tipsy').remove();
-			Calendar.UI.loading(true);
-			$.post(OC.filePath('calendar', 'ajax/event', 'move.php'), { id: event.id, dayDelta: dayDelta, minuteDelta: minuteDelta, allDay: allDay?1:0, lastmodified: event.lastmodified},
-			function(data) {
-				Calendar.UI.loading(false);
-				if (data.status == 'success'){
-					event.lastmodified = data.lastmodified;
-					console.log("Event moved successfully");
-				}else{
-					revertFunc();
-					$('#fullcalendar').fullCalendar('refetchEvents');
-				}
-			});
-		},
-		resizeEvent:function(event, dayDelta, minuteDelta, revertFunc){
-			$('.tipsy').remove();
-			Calendar.UI.loading(true);
-			$.post(OC.filePath('calendar', 'ajax/event', 'resize.php'), { id: event.id, dayDelta: dayDelta, minuteDelta: minuteDelta, lastmodified: event.lastmodified},
-			function(data) {
-				Calendar.UI.loading(false);
-				if (data.status == 'success'){
-					event.lastmodified = data.lastmodified;
-					console.log("Event resized successfully");
-				}else{
-					revertFunc();
-					$('#fullcalendar').fullCalendar('refetchEvents');
-				}
-			});
-		},
-		showadvancedoptions:function(){
-			$("#advanced_options").slideDown('slow');
-			$("#advanced_options_button").css("display", "none");
-		},
-		showadvancedoptionsforrepeating:function(){
-			if($("#advanced_options_repeating").is(":hidden")){
-				$('#advanced_options_repeating').slideDown('slow');
-			}else{
-				$('#advanced_options_repeating').slideUp('slow');
-			}
-		},
-		getEventPopupText:function(event){
-			if (event.allDay){
-				var timespan = $.fullCalendar.formatDates(event.start, event.end, 'ddd d MMMM[ yyyy]{ -[ddd d] MMMM yyyy}', {monthNamesShort: monthNamesShort, monthNames: monthNames, dayNames: dayNames, dayNamesShort: dayNamesShort}); //t('calendar', "ddd d MMMM[ yyyy]{ -[ddd d] MMMM yyyy}")
-			}else{
-				var timespan = $.fullCalendar.formatDates(event.start, event.end, 'ddd d MMMM[ yyyy] ' + defaulttime + '{ -[ ddd d MMMM yyyy]' + defaulttime + '}', {monthNamesShort: monthNamesShort, monthNames: monthNames, dayNames: dayNames, dayNamesShort: dayNamesShort}); //t('calendar', "ddd d MMMM[ yyyy] HH:mm{ -[ ddd d MMMM yyyy] HH:mm}")
-				// Tue 18 October 2011 08:00 - 16:00
-			}
-			var html =
-				'<div class="summary">' + event.title + '</div>' +
-				'<div class="timespan">' + timespan + '</div>';
-			if (event.description){
-				html += '<div class="description">' + event.description + '</div>';
-			}
-			return html;
-		},
-		lockTime:function(){
-			if($('#allday_checkbox').is(':checked')) {
-				$("#fromtime").attr('disabled', true)
-					.addClass('disabled');
-				$("#totime").attr('disabled', true)
-					.addClass('disabled');
-			} else {
-				$("#fromtime").attr('disabled', false)
-					.removeClass('disabled');
-				$("#totime").attr('disabled', false)
-					.removeClass('disabled');
-			}
-		},
-		showCalDAVUrl:function(username, calname){
-			$('#caldav_url').val(totalurl + '/' + username + '/' + decodeURIComponent(calname));
-			$('#caldav_url').show();
-			$("#caldav_url_close").show();
-		},
-		initScroll:function(){
-			if(window.addEventListener)
-				document.addEventListener('DOMMouseScroll', Calendar.UI.scrollCalendar, false);
-			//}else{
-				document.onmousewheel = Calendar.UI.scrollCalendar;
-			//}
-		},
-		scrollCalendar:function(event){
-			$('.tipsy').remove();
-			var direction;
-			if(event.detail){
-				if(event.detail < 0){
-					direction = 'top';
-				}else{
-					direction = 'down';
-				}
-			}
-			if (event.wheelDelta){
-				if(event.wheelDelta > 0){
-					direction = 'top';
-				}else{
-					direction = 'down';
-				}
-			}
-			var scroll = $(document).scrollTop(),
-				doc_height = $(document).height(),
-				win_height = $(window).height();
-			if(direction == 'down' && win_height == (doc_height - scroll)){
-				$('#fullcalendar').fullCalendar('next');
-				$(document).scrollTop(0);
-				event.preventDefault();
-			}else if (direction == 'top' && scroll == 0) {
-				$('#fullcalendar').fullCalendar('prev');
-				$(document).scrollTop(win_height);
-				event.preventDefault();
-			}
-		},
-		repeat:function(task){
-			if(task=='init'){
-				$('#byweekno').multiselect({
-					header: false,
-					noneSelectedText: $('#advanced_byweekno').attr('title'),
-					selectedList: 2,
-					minWidth:'auto'
-				});
-				$('#weeklyoptions').multiselect({
-					header: false,
-					noneSelectedText: $('#weeklyoptions').attr('title'),
-					selectedList: 2,
-					minWidth:'auto'
-				});
-				$('input[name="bydate"]').datepicker({
-					dateFormat : 'dd-mm-yy'
-				});
-				$('#byyearday').multiselect({
-					header: false,
-					noneSelectedText: $('#byyearday').attr('title'),
-					selectedList: 2,
-					minWidth:'auto'
-				});
-				$('#bymonth').multiselect({
-					header: false,
-					noneSelectedText: $('#bymonth').attr('title'),
-					selectedList: 2,
-					minWidth:'auto'
-				});
-				$('#bymonthday').multiselect({
-					header: false,
-					noneSelectedText: $('#bymonthday').attr('title'),
-					selectedList: 2,
-					minWidth:'auto'
-				});
-				Calendar.UI.repeat('end');
-				Calendar.UI.repeat('month');
-				Calendar.UI.repeat('year');
-				Calendar.UI.repeat('repeat');
-			}
-			if(task == 'end'){
-				$('#byoccurrences').css('display', 'none');
-				$('#bydate').css('display', 'none');
-				if($('#end option:selected').val() == 'count'){
-					$('#byoccurrences').css('display', 'block');
-				}
-				if($('#end option:selected').val() == 'date'){
-					$('#bydate').css('display', 'block');
-				}
-			}
-			if(task == 'repeat'){
-				$('#advanced_month').css('display', 'none');
-				$('#advanced_weekday').css('display', 'none');
-				$('#advanced_weekofmonth').css('display', 'none');
-				$('#advanced_byyearday').css('display', 'none');
-				$('#advanced_bymonth').css('display', 'none');
-				$('#advanced_byweekno').css('display', 'none');
-				$('#advanced_year').css('display', 'none');
-				$('#advanced_bymonthday').css('display', 'none');
-				if($('#repeat option:selected').val() == 'monthly'){
-					$('#advanced_month').css('display', 'block');
-					Calendar.UI.repeat('month');
-				}
-				if($('#repeat option:selected').val() == 'weekly'){
-					$('#advanced_weekday').css('display', 'block');
-				}
-				if($('#repeat option:selected').val() == 'yearly'){
-					$('#advanced_year').css('display', 'block');
-					Calendar.UI.repeat('year');
-				}
-				if($('#repeat option:selected').val() == 'doesnotrepeat'){
-					$('#advanced_options_repeating').slideUp('slow');
-				}
-			}
-			if(task == 'month'){
-				$('#advanced_weekday').css('display', 'none');
-				$('#advanced_weekofmonth').css('display', 'none');
-				if($('#advanced_month_select option:selected').val() == 'weekday'){
-					$('#advanced_weekday').css('display', 'block');
-					$('#advanced_weekofmonth').css('display', 'block');
-				}
-			}
-			if(task == 'year'){
-				$('#advanced_weekday').css('display', 'none');
-				$('#advanced_byyearday').css('display', 'none');
-				$('#advanced_bymonth').css('display', 'none');
-				$('#advanced_byweekno').css('display', 'none');
-				$('#advanced_bymonthday').css('display', 'none');
-				if($('#advanced_year_select option:selected').val() == 'byyearday'){
-					//$('#advanced_byyearday').css('display', 'block');
-				}
-				if($('#advanced_year_select option:selected').val() == 'byweekno'){
-					$('#advanced_byweekno').css('display', 'block');
-				}
-				if($('#advanced_year_select option:selected').val() == 'bydaymonth'){
-					$('#advanced_bymonth').css('display', 'block');
-					$('#advanced_bymonthday').css('display', 'block');
-					$('#advanced_weekday').css('display', 'block');
-				}
-			}
-			
-		},
-		setViewActive: function(view){
-			$('#view input[type="button"]').removeClass('active');
-			var id;
-			switch (view) {
-				case 'agendaWeek':
-					id = 'oneweekview_radio';
-					break;
-				case 'month':
-					id = 'onemonthview_radio';
-					break;
-				case 'list':
-					id = 'listview_radio';
-					break;
-			}
-			$('#'+id).addClass('active');
-		},
-		categoriesChanged:function(newcategories){
-			categories = $.map(newcategories, function(v) {return v;});
-			console.log('Calendar categories changed to: ' + categories);
-			$('#category').multiple_autocomplete('option', 'source', categories);
-		},
-		Calendar:{
-			overview:function(){
-				if($('#choosecalendar_dialog').dialog('isOpen') == true){
-					$('#choosecalendar_dialog').dialog('moveToTop');
-				}else{
-					Calendar.UI.loading(true);
-					$('#dialog_holder').load(OC.filePath('calendar', 'ajax/calendar', 'overview.php'), function(){
-						$('#choosecalendar_dialog').dialog({
-							width : 600,
-							height: 400,
-							close : function(event, ui) {
-								$(this).dialog('destroy').remove();
-							}
-						});
-						Calendar.UI.loading(false);
-					});
-				}
-			},
-			activation:function(checkbox, calendarid)
-			{
-				Calendar.UI.loading(true);
-				$.post(OC.filePath('calendar', 'ajax/calendar', 'activation.php'), { calendarid: calendarid, active: checkbox.checked?1:0 },
-				  function(data) {
-					Calendar.UI.loading(false);
-					if (data.status == 'success'){
-						checkbox.checked = data.active == 1;
-						if (data.active == 1){
-							$('#fullcalendar').fullCalendar('addEventSource', data.eventSource);
-						}else{
-							$('#fullcalendar').fullCalendar('removeEventSource', data.eventSource.url);
-						}
-					}
-				  });
-			},
-			newCalendar:function(object){
-				var tr = $(document.createElement('tr'))
-					.load(OC.filePath('calendar', 'ajax/calendar', 'new.form.php'),
-						function(){Calendar.UI.Calendar.colorPicker(this)});
-				$(object).closest('tr').after(tr).hide();
-			},
-			edit:function(object, calendarid){
-				var tr = $(document.createElement('tr'))
-					.load(OC.filePath('calendar', 'ajax/calendar', 'edit.form.php'), {calendarid: calendarid},
-						function(){Calendar.UI.Calendar.colorPicker(this)});
-				$(object).closest('tr').after(tr).hide();
-			},
-			deleteCalendar:function(calid){
-				var check = confirm("Do you really want to delete this calendar?");
-				if(check == false){
-					return false;
-				}else{
-					$.post(OC.filePath('calendar', 'ajax/calendar', 'delete.php'), { calendarid: calid},
-					  function(data) {
-						if (data.status == 'success'){
-							var url = 'ajax/events.php?calendar_id='+calid;
-							$('#fullcalendar').fullCalendar('removeEventSource', url);
-							$('#choosecalendar_dialog').dialog('destroy').remove();
-							Calendar.UI.Calendar.overview();
-							$('#fullcalendar').fullCalendar('refetchEvents');
-						}
-					  });
-				}
-			},
-			submit:function(button, calendarid){
-				var displayname = $.trim($("#displayname_"+calendarid).val());
-				var active = $("#edit_active_"+calendarid+":checked").length;
-				var description = $("#description_"+calendarid).val();
-				var calendarcolor = $("#calendarcolor_"+calendarid).val();
-				if(displayname == ''){
-					$("#displayname_"+calendarid).css('background-color', '#FF2626');
-					$("#displayname_"+calendarid).focus(function(){
-						$("#displayname_"+calendarid).css('background-color', '#F8F8F8');
-					});
-				}
-				
-				var url;
-				if (calendarid == 'new'){
-					url = OC.filePath('calendar', 'ajax/calendar', 'new.php');
-				}else{
-					url = OC.filePath('calendar', 'ajax/calendar', 'update.php');
-				}
-				$.post(url, { id: calendarid, name: displayname, active: active, description: description, color: calendarcolor },
-					function(data){
-						if(data.status == 'success'){
-							$(button).closest('tr').prev().html(data.page).show().next().remove();
-							$('#fullcalendar').fullCalendar('removeEventSource', data.eventSource.url);
-							$('#fullcalendar').fullCalendar('addEventSource', data.eventSource);
-							if (calendarid == 'new'){
-								$('#choosecalendar_dialog > table:first').append('<tr><td colspan="6"><a href="#" onclick="Calendar.UI.Calendar.newCalendar(this);"><input type="button" value="' + newcalendar + '"></a></td></tr>');
-							}
-						}else{
-							$("#displayname_"+calendarid).css('background-color', '#FF2626');
-							$("#displayname_"+calendarid).focus(function(){
-								$("#displayname_"+calendarid).css('background-color', '#F8F8F8');
-							});
-						}
-					}, 'json');
-			},
-			cancel:function(button, calendarid){
-				$(button).closest('tr').prev().show().next().remove();
-			},
-			colorPicker:function(container){
-				// based on jquery-colorpicker at jquery.webspirited.com
-				var obj = $('.colorpicker', container);
-				var picker = $('<div class="calendar-colorpicker"></div>');
-				//build an array of colors
-				var colors = {};
-				$(obj).children('option').each(function(i, elm) {
-					colors[i] = {};
-					colors[i].color = $(elm).val();
-					colors[i].label = $(elm).text();
-				});
-				for (var i in colors) {
-					picker.append('<span class="calendar-colorpicker-color ' + (colors[i].color == $(obj).children(":selected").val() ? ' active' : '') + '" rel="' + colors[i].label + '" style="background-color: ' + colors[i].color + ';"></span>');
-				}
-				picker.delegate(".calendar-colorpicker-color", "click", function() {
-					$(obj).val($(this).attr('rel'));
-					$(obj).change();
-					picker.children('.calendar-colorpicker-color.active').removeClass('active');
-					$(this).addClass('active');
-				});
-				$(obj).after(picker);
-				$(obj).css({
-					position: 'absolute',
-					left: -10000
-				});
-			}
-		},
-		Share:{
-			currentid: 'false',
-			idtype: '',
-			activation:function(object,owner,id){
-				$.post(OC.filePath('calendar', 'ajax/share', 'activation.php'),{id:id, idtype:'calendar', activation:object.checked?1:0});
-				$('#fullcalendar').fullCalendar('refetchEvents');
-			},
-			dropdown:function(userid, calid){
-				$('.calendar_share_dropdown').remove();
-				var element = document.getElementById(userid+'_'+calid);
-				$('<div class="calendar_share_dropdown"></div>').appendTo(element);
-				$.post(OC.filePath('calendar', 'ajax/share', 'dropdown.php'), {calid: calid}, function(data){
-					$('.calendar_share_dropdown').html(data);
-					$('.calendar_share_dropdown').show('blind');
-					$('#share_user').chosen();
-					$('#share_group').chosen();
-				});
-				Calendar.UI.Share.currentid = calid;
-				Calendar.UI.Share.idtype = 'calendar';
-			},
-			share:function(id, idtype, sharewith, sharetype){
-				$.post(OC.filePath('calendar', 'ajax/share', 'share.php'),{id:id, idtype:idtype, sharewith:sharewith, sharetype:sharetype}, function(data){
-					if(sharetype == 'public'){
-						$('#public_token').val(parent.location.protocol+'//'+location.host+OC.linkTo('', 'public.php')+'?service=calendar&t='+data.message);
-						$('#public_token').css('display', 'block');
-					}
-				});
-			},
-			unshare:function(id, idtype, sharewith, sharetype){
-				$.post(OC.filePath('calendar', 'ajax/share', 'unshare.php'),{id:id, idtype:idtype, sharewith:sharewith, sharetype:sharetype}, function(){
-					if(sharetype == 'public'){
-						$('#public_token').val('');
-						$('#public_token').css('display', 'none');
-					}
-				});
-			},
-			changepermission:function(id, idtype, sharewith, sharetype, permission){
-				$.post(OC.filePath('calendar', 'ajax/share', 'changepermission.php'),{id:id, idtype:idtype, sharewith: sharewith, sharetype:sharetype, permission: (permission?1:0)});
-			},
-			init:function(){
-				$('.calendar_share_dropdown').live('mouseleave', function(){
-					$('.calendar_share_dropdown').hide('blind', function(){
-						$('.calendar_share_dropdown').remove();
-					});
-				});
-				$('#share_user').live('change', function(){
-					if($('#sharewithuser_' + $('#share_user option:selected').text()).length == 0){
-						Calendar.UI.Share.share(Calendar.UI.Share.currentid, Calendar.UI.Share.idtype, $('#share_user option:selected').text(), 'user');
-						var newitem = '<li id="sharewithuser_' + $('#share_user option:selected').text() +'"><input type="checkbox" width="12px" style="visibility:hidden;" title="' + $('#share_user option:selected').text() + '">' + $('#share_user option:selected').text() + '<img src="' + OC.imagePath('core', 'actions/delete.svg') + '" class="svg action" style="display:none;float:right;"></li>';
-						$('#sharewithuser_list').append(newitem);
-						$('#sharewithuser_' + $('#share_user option:selected').text() + ' > img').click(function(){
-							$('#share_user option[value="' + $(this).parent().text() + '"]').removeAttr('disabled');
-							Calendar.UI.Share.unshare(Calendar.UI.Share.currentid, Calendar.UI.Share.idtype, $(this).parent().text(), 'user' );
-							$("#share_user").trigger("liszt:updated");
-							$(this).parent().remove();
-						});
-						$('#share_user option:selected').attr('disabled', 'disabled');
-						$("#share_user").trigger("liszt:updated");
-					}
-				});
-				$('#share_group').live('change', function(){
-					if($('#sharewithgroup_' + $('#share_group option:selected').text()).length == 0){
-						Calendar.UI.Share.share(Calendar.UI.Share.currentid, Calendar.UI.Share.idtype, $('#share_group option:selected').text(), 'group');
-						var newitem = '<li id="sharewithgroup_' + $('#share_group option:selected').text() +'"><input type="checkbox" width="12px" style="visibility:hidden;" title="' + $('#share_group option:selected').text() + '">' + $('#share_group option:selected').text() + '<img src="' + OC.imagePath('core', 'actions/delete.svg') + '" class="svg action" style="display:none;float:right;"></li>';
-						$('#sharewithgroup_list').append(newitem);
-						$('#sharewithgroup_' + $('#share_group option:selected').text() + ' > img').click(function(){
-							$('#share_group option[value="' + $(this).parent().text() + '"]').removeAttr('disabled');
-							Calendar.UI.Share.unshare(Calendar.UI.Share.currentid, Calendar.UI.Share.idtype, $(this).parent().text(), 'group');
-							$("#share_group").trigger("liszt:updated");
-							$(this).parent().remove();
-						});
-						$('#share_group option:selected').attr('disabled', 'disabled');
-						$("#share_group").trigger("liszt:updated");
-					}
-				});
-				$('#sharewithuser_list > li > input:checkbox').live('change', function(){
-					Calendar.UI.Share.changepermission(Calendar.UI.Share.currentid, Calendar.UI.Share.idtype, $(this).parent().text(), 'user', this.checked);
-				});
-				$('#sharewithgroup_list > li > input:checkbox').live('change', function(){
-					Calendar.UI.Share.changepermission(Calendar.UI.Share.currentid, Calendar.UI.Share.idtype, $(this).parent().text(), 'group', this.checked);
-				});
-				$('#publish').live('change', function(){
-					if(this.checked == 1){
-						Calendar.UI.Share.share(Calendar.UI.Share.currentid, Calendar.UI.Share.idtype, '', 'public');
-					}else{
-						Calendar.UI.Share.unshare(Calendar.UI.Share.currentid, Calendar.UI.Share.idtype, '', 'public');
-					}
-				});
-				$('#sharewithuser_list').live('mouseenter', function(){
-					$('#sharewithuser_list > li > img').css('display', 'block');
-					$('#sharewithuser_list > li > input').css('visibility', 'visible');
-				});
-				$('#sharewithuser_list').live('mouseleave', function(){
-					$('#sharewithuser_list > li > img').css('display', 'none');
-					$('#sharewithuser_list > li > input').css('visibility', 'hidden');
-				});
-				$('#sharewithgroup_list').live('mouseenter', function(){
-					$('#sharewithgroup_list > li > img').css('display', 'block');
-					$('#sharewithgroup_list > li > input').css('visibility', 'visible');
-				});
-				$('#sharewithgroup_list').live('mouseleave', function(){
-					$('#sharewithgroup_list > li > img').css('display', 'none');
-					$('#sharewithgroup_list > li > input').css('visibility', 'hidden');
-				});
-				/*var permissions = (this.checked) ? 1 : 0;*/
-			}
-		},
-		Drop:{
-			init:function(){
-				if (typeof window.FileReader === 'undefined') {
-					console.log('The drop-import feature is not supported in your browser :(');
-					return false;
-				}
-				droparea = document.getElementById('fullcalendar');
-				droparea.ondrop = function(e){
-					e.preventDefault();
-					Calendar.UI.Drop.drop(e);
-				}
-				console.log('Drop initialized successfully');
-			},
-			drop:function(e){
-				var files = e.dataTransfer.files;
-				for(var i = 0;i < files.length;i++){
-					var file = files[i];
-					reader = new FileReader();
-					reader.onload = function(event){
-						Calendar.UI.Drop.import(event.target.result);
-						$('#fullcalendar').fullCalendar('refetchEvents');
-					}
-					reader.readAsDataURL(file);
-				}
-			},
-			import:function(data){
-				$.post(OC.filePath('calendar', 'ajax/import', 'dropimport.php'), {'data':data},function(result) {
-					if(result.status == 'success'){
-						$('#fullcalendar').fullCalendar('addEventSource', result.eventSource);
-						$('#notification').html(result.message);
-						$('#notification').slideDown();
-						window.setTimeout(function(){$('#notification').slideUp();}, 5000);
-						return true;
-					}else{
-						$('#notification').html(result.message);
-						$('#notification').slideDown();
-						window.setTimeout(function(){$('#notification').slideUp();}, 5000);
-					}
-				});
-			}
-		}
-	},
-	Settings:{
-		//
-	},
-	
-}
-$.fullCalendar.views.list = ListView;
-function ListView(element, calendar) {
-	var t = this;
-
-	// imports
-	jQuery.fullCalendar.views.month.call(t, element, calendar);
-	var opt = t.opt;
-	var trigger = t.trigger;
-	var eventElementHandlers = t.eventElementHandlers;
-	var reportEventElement = t.reportEventElement;
-	var formatDate = calendar.formatDate;
-	var formatDates = calendar.formatDates;
-	var addDays = $.fullCalendar.addDays;
-	var cloneDate = $.fullCalendar.cloneDate;
-	function skipWeekend(date, inc, excl) {
-		inc = inc || 1;
-		while (!date.getDay() || (excl && date.getDay()==1 || !excl && date.getDay()==6)) {
-			addDays(date, inc);
-		}
-		return date;
-	}
-
-	// overrides
-	t.name='list';
-	t.render=render;
-	t.renderEvents=renderEvents;
-	t.setHeight=setHeight;
-	t.setWidth=setWidth;
-	t.clearEvents=clearEvents;
-
-	function setHeight(height, dateChanged) {
-	}
-
-	function setWidth(width) {
-	}
-
-	function clearEvents() {
-		this.reportEventClear();
-	}
-
-	// main
-	function sortEvent(a, b) {
-		return a.start - b.start;
-	}
-
-	function render(date, delta) {
-		if (!t.start){
-			t.start = addDays(cloneDate(date, true), -7);
-			t.end = addDays(cloneDate(date, true), 7);
-		}
-		if (delta) {
-			if (delta < 0){
-				addDays(t.start, -7);
-				addDays(t.end, -7);
-				if (!opt('weekends')) {
-					skipWeekend(t.start, delta < 0 ? -1 : 1);
-				}
-			}else{
-				addDays(t.start, 7);
-				addDays(t.end, 7);
-				if (!opt('weekends')) {
-					skipWeekend(t.end, delta < 0 ? -1 : 1);
-				}
-			}
-		}
-		t.title = formatDates(
-			t.start,
-			t.end,
-			opt('titleFormat', 'week')
-		);
-		t.visStart = cloneDate(t.start);
-		t.visEnd = cloneDate(t.end);
-	}
-
-	function eventsOfThisDay(events, theDate) {
-		var start = cloneDate(theDate, true);
-		var end = addDays(cloneDate(start), 1);
-		var retArr = new Array();
-		for (i in events) {
-			var event_end = t.eventEnd(events[i]);
-			if (events[i].start < end && event_end >= start) {
-				retArr.push(events[i]);
-			}
-		}
-		return retArr;
-	}
-
-	function renderEvent(event) {
-		if (event.allDay) { //all day event
-			var time = opt('allDayText');
-		}
-		else {
-			var time = formatDates(event.start, event.end, opt('timeFormat', 'agenda'));
-		}
-		var classes = ['fc-event', 'fc-list-event'];
-		classes = classes.concat(event.className);
-		if (event.source) {
-			classes = classes.concat(event.source.className || []);
-		}
-		var html = '<tr>' +
-			'<td>&nbsp;</td>' +
-			'<td class="fc-list-time">' +
-			time +
-			'</td>' +
-			'<td>&nbsp;</td>' +
-			'<td class="fc-list-event">' +
-			'<span id="list' + event.id + '"' +
-			' class="' + classes.join(' ') + '"' +
-			'>' +
-			'<span class="fc-event-title">' +
-			event.title +
-			'</span>' +
-			'</span>' +
-			'</td>' +
-			'</tr>';
-		return html;
-	}
-
-	function renderDay(date, events) {
-		var dayRows = $('<tr>' +
-			'<td colspan="4" class="fc-list-date">' +
-			'<span>' +
-			formatDate(date, opt('titleFormat', 'day')) +
-			'</span>' +
-			'</td>' +
-			'</tr>');
-		for (i in events) {
-			var event = events[i];
-			var eventElement = $(renderEvent(event));
-			triggerRes = trigger('eventRender', event, event, eventElement);
-			if (triggerRes === false) {
-				eventElement.remove();
-			}else{
-				if (triggerRes && triggerRes !== true) {
-					eventElement.remove();
-					eventElement = $(triggerRes);
-				}
-				$.merge(dayRows, eventElement);
-				eventElementHandlers(event, eventElement);
-				reportEventElement(event, eventElement);
-			}
-		}
-		return dayRows;
-	}
-
-	function renderEvents(events, modifiedEventId) {
-		events = events.sort(sortEvent);
-
-		var table = $('<table class="fc-list-table"></table>');
-		var total = events.length;
-		if (total > 0) {
-			var date = cloneDate(t.visStart);
-			while (date <= t.visEnd) {
-				var dayEvents = eventsOfThisDay(events, date);
-				if (dayEvents.length > 0) {
-					table.append(renderDay(date, dayEvents));
-				}
-				date=addDays(date, 1);
-			}
-		}
-
-		this.element.html(table);
-	}
-}
-$(document).ready(function(){
-	Calendar.UI.initScroll();
-	$('#fullcalendar').fullCalendar({
-		header: false,
-		firstDay: firstDay,
-		editable: true,
-		defaultView: defaultView,
-		timeFormat: {
-			agenda: agendatime,
-			'': defaulttime
-			},
-		columnFormat: {
-			month: t('calendar', 'ddd'),    // Mon
-			week: t('calendar', 'ddd M/d'), // Mon 9/7
-			day: t('calendar', 'dddd M/d')  // Monday 9/7
-			},
-		titleFormat: {
-			month: t('calendar', 'MMMM yyyy'),
-					// September 2009
-			week: t('calendar', "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"),
-					// Sep 7 - 13 2009
-			day: t('calendar', 'dddd, MMM d, yyyy'),
-					// Tuesday, Sep 8, 2009
-			},
-		axisFormat: defaulttime,
-		monthNames: monthNames,
-		monthNamesShort: monthNamesShort,
-		dayNames: dayNames,
-		dayNamesShort: dayNamesShort,
-		allDayText: allDayText,
-		viewDisplay: function(view) {
-			$('#datecontrol_date').val($('<p>').html(view.title).text());
-			if (view.name != defaultView) {
-				$.post(OC.filePath('calendar', 'ajax', 'changeview.php'), {v:view.name});
-				defaultView = view.name;
-			}
-			Calendar.UI.setViewActive(view.name);
-			if (view.name == 'agendaWeek') {
-				$('#fullcalendar').fullCalendar('option', 'aspectRatio', 0.1);
-			}
-			else {
-				$('#fullcalendar').fullCalendar('option', 'aspectRatio', 1.35);
-			}
-		},
-		columnFormat: {
-		    week: 'ddd d. MMM'
-		},
-		selectable: true,
-		selectHelper: true,
-		select: Calendar.UI.newEvent,
-		eventClick: Calendar.UI.editEvent,
-		eventDrop: Calendar.UI.moveEvent,
-		eventResize: Calendar.UI.resizeEvent,
-		eventRender: function(event, element) {
-			element.find('.fc-event-title').html(element.find('.fc-event-title').text());
-			element.tipsy({
-				className: 'tipsy-event',
-				opacity: 0.9,
-				gravity:$.fn.tipsy.autoBounds(150, 's'),
-				fade:true,
-				delayIn: 400,
-				html:true,
-				title:function() {
-					return Calendar.UI.getEventPopupText(event);
-				}
-			});
-		},
-		loading: Calendar.UI.loading,
-		eventSources: eventSources
-	});
-	$('#datecontrol_date').datepicker({
-		changeMonth: true,
-		changeYear: true,
-		showButtonPanel: true,
-		beforeShow: function(input, inst) {
-			var calendar_holder = $('#fullcalendar');
-			var date = calendar_holder.fullCalendar('getDate');
-			inst.input.datepicker('setDate', date);
-			inst.input.val(calendar_holder.fullCalendar('getView').title);
-			return inst;
-		},
-		onSelect: function(value, inst) {
-			var date = inst.input.datepicker('getDate');
-			$('#fullcalendar').fullCalendar('gotoDate', date);
-		}
-	});
-	fillWindow($('#content'));
-	OCCategories.changed = Calendar.UI.categoriesChanged;
-	OCCategories.app = 'calendar';
-	$('#oneweekview_radio').click(function(){
-		$('#fullcalendar').fullCalendar('changeView', 'agendaWeek');
-	});
-	$('#onemonthview_radio').click(function(){
-		$('#fullcalendar').fullCalendar('changeView', 'month');
-	});
-	$('#listview_radio').click(function(){
-		$('#fullcalendar').fullCalendar('changeView', 'list');
-	});
-	$('#today_input').click(function(){
-		$('#fullcalendar').fullCalendar('today');
-	});
-	$('#datecontrol_left').click(function(){
-		$('#fullcalendar').fullCalendar('prev');
-	});
-	$('#datecontrol_right').click(function(){
-		$('#fullcalendar').fullCalendar('next');
-	});
-	Calendar.UI.Share.init();
-	Calendar.UI.Drop.init();
-	$('#choosecalendar .generalsettings').on('click keydown', function() {
-		OC.appSettings({appid:'calendar', loadJS:true, cache:false});
-	});
-	$('#choosecalendar .calendarsettings').on('click keydown', function() {
-		OC.appSettings({appid:'calendar', loadJS:true, cache:false, scriptName:'calendar.php'});
-	});
-});
diff --git a/apps/calendar/js/geo.js b/apps/calendar/js/geo.js
deleted file mode 100644
index 99290d940e..0000000000
--- a/apps/calendar/js/geo.js
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * Copyright (c) 2011 Georg Ehrke <ownclouddev at georgswebsite dot de>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-if (navigator.geolocation) { 
-	navigator.geolocation.getCurrentPosition(function(position) {
-		$.post(OC.filePath('calendar', 'ajax/settings', 'guesstimezone.php'), {lat: position.coords.latitude, lng: position.coords.longitude},
-		function(data){
-			if (data.status == 'success' && typeof(data.message) != 'undefined'){
-				$('#notification').html(data.message);
-				$('#notification').slideDown();
-				window.setTimeout(function(){$('#notification').slideUp();}, 5000);
-			}else{
-				console.log('Can\'t set new timezone.');
-			}
-		});
-	});
-}
\ No newline at end of file
diff --git a/apps/calendar/js/loader.js b/apps/calendar/js/loader.js
deleted file mode 100644
index 253abafc42..0000000000
--- a/apps/calendar/js/loader.js
+++ /dev/null
@@ -1,179 +0,0 @@
-/**
- * Copyright (c) 2012 Georg Ehrke <ownclouddev at georgswebsite dot de>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-Calendar_Import={
-	Store:{
-		file: '',
-		path: '',
-		id: 0,
-		method: '',
-		calname: '',
-		calcolor: '',
-		progresskey: '',
-		percentage: 0
-	},
-	Dialog:{
-		open: function(filename){
-			OC.addStyle('calendar', 'import');
-			Calendar_Import.Store.file = filename;
-			Calendar_Import.Store.path = $('#dir').val();
-			$('body').append('<div id="calendar_import"></div>');
-			$('#calendar_import').load(OC.filePath('calendar', 'ajax/import', 'dialog.php'), {filename:Calendar_Import.Store.file, path:Calendar_Import.Store.path},function(){
-					Calendar_Import.Dialog.init();
-			});
-		},
-		close: function(){
-			Calendar_Import.reset();
-			$(this).dialog('destroy').remove();
-			$('#calendar_import_dialog').remove();
-		},
-		init: function(){
-			//init dialog
-			$('#calendar_import_dialog').dialog({
-				width : 500,
-				resizable: false,
-				close : function() {
-					Calendar_Import.Dialog.close();
-				}
-			});
-			//init buttons
-			$('#calendar_import_done').click(function(){
-				Calendar_Import.Dialog.close();
-			});
-			$('#calendar_import_submit').click(function(){
-				Calendar_Import.Core.process();
-			});
-			$('#calendar_import_mergewarning').click(function(){
-				$('#calendar_import_newcalendar').attr('value', $('#calendar_import_availablename').val());
-				Calendar_Import.Dialog.mergewarning($('#calendar_import_newcalendar').val());
-			});
-			$('#calendar_import_calendar').change(function(){
-				if($('#calendar_import_calendar option:selected').val() == 'newcal'){
-					$('#calendar_import_newcalform').slideDown('slow');
-					Calendar_Import.Dialog.mergewarning($('#calendar_import_newcalendar').val());
-				}else{
-					$('#calendar_import_newcalform').slideUp('slow');
-					$('#calendar_import_mergewarning').slideUp('slow');
-				}
-			});
-			$('#calendar_import_newcalendar').keyup(function(){
-				Calendar_Import.Dialog.mergewarning($.trim($('#calendar_import_newcalendar').val()));
-			});
-			$('#calendar_import_newcalendar_color').miniColors({
-				letterCase: 'uppercase'
-			});
-			$('.calendar-colorpicker-color').click(function(){
-				var str = $(this).attr('rel');
-				str = str.substr(1);
-				$('#calendar_import_newcalendar_color').attr('value', str);
-				$(".color-picker").miniColors('value', '#' + str);
-			});
-			//init progressbar
-			$('#calendar_import_progressbar').progressbar({value: Calendar_Import.Store.percentage});
-			Calendar_Import.Store.progresskey = $('#calendar_import_progresskey').val();
-		},
-		mergewarning: function(newcalname){
-			$.post(OC.filePath('calendar', 'ajax/import', 'calendarcheck.php'), {calname: newcalname}, function(data){
-				if(data.message == 'exists'){
-					$('#calendar_import_mergewarning').slideDown('slow');
-				}else{
-					$('#calendar_import_mergewarning').slideUp('slow');
-				}
-			});
-		},
-		update: function(){
-			if(Calendar_Import.Store.percentage == 100){
-				return false;
-			}
-			$.post(OC.filePath('calendar', 'ajax/import', 'import.php'), {progresskey: Calendar_Import.Store.progresskey, getprogress: true}, function(data){
- 				if(data.status == 'success'){
- 					if(data.percent == null){
-	 					return false;
- 					}
- 					Calendar_Import.Store.percentage = parseInt(data.percent);
-					$('#calendar_import_progressbar').progressbar('option', 'value', parseInt(data.percent));
-					if(data.percent < 100 ){
-						window.setTimeout('Calendar_Import.Dialog.update()', 250);
-					}else{
-						$('#calendar_import_done').css('display', 'block');
-					}
-				}else{
-					$('#calendar_import_progressbar').progressbar('option', 'value', 100);
-					$('#calendar_import_progressbar > div').css('background-color', '#FF2626');
-					$('#calendar_import_status').html(data.message);
-				}
-			});
-			return 0;
-		},
-		warning: function(selector){
-			$(selector).addClass('calendar_import_warning');
-			$(selector).focus(function(){
-				$(selector).removeClass('calendar_import_warning');
-			});
-		}
-	},
-	Core:{
-		process: function(){
-			var validation = Calendar_Import.Core.prepare();
-			if(validation){
-				$('#calendar_import_form').css('display', 'none');
-				$('#calendar_import_process').css('display', 'block');
-				$('#calendar_import_newcalendar').attr('readonly', 'readonly');
-				$('#calendar_import_calendar').attr('disabled', 'disabled');
-				Calendar_Import.Core.send();
-				window.setTimeout('Calendar_Import.Dialog.update()', 250);
-			}
-		},
-		send: function(){
-			$.post(OC.filePath('calendar', 'ajax/import', 'import.php'), 
-			{progresskey: Calendar_Import.Store.progresskey, method: String (Calendar_Import.Store.method), calname: String (Calendar_Import.Store.calname), path: String (Calendar_Import.Store.path), file: String (Calendar_Import.Store.file), id: String (Calendar_Import.Store.id), calcolor: String (Calendar_Import.Store.calcolor)}, function(data){
-				if(data.status == 'success'){
-					$('#calendar_import_progressbar').progressbar('option', 'value', 100);
-					Calendar_Import.Store.percentage = 100;
-					$('#calendar_import_done').css('display', 'block');
-					$('#calendar_import_status').html(data.message);
-				}else{
-					$('#calendar_import_progressbar').progressbar('option', 'value', 100);
-					$('#calendar_import_progressbar > div').css('background-color', '#FF2626');
-					$('#calendar_import_status').html(data.message);
-				}
-			});
-		},
-		prepare: function(){
-			Calendar_Import.Store.id = $('#calendar_import_calendar option:selected').val();
-			if($('#calendar_import_calendar option:selected').val() == 'newcal'){
-				Calendar_Import.Store.method = 'new';
-				Calendar_Import.Store.calname = $.trim($('#calendar_import_newcalendar').val());
-				if(Calendar_Import.Store.calname == ''){
-					Calendar_Import.Dialog.warning('#calendar_import_newcalendar');
-					return false;
-				}
-				Calendar_Import.Store.calcolor = $.trim($('#calendar_import_newcalendar_color').val());
-				if(Calendar_Import.Store.calcolor == ''){
-					Calendar_Import.Store.calcolor = $('.calendar-colorpicker-color:first').attr('rel');
-				}
-			}else{
-				Calendar_Import.Store.method = 'old';
-			}
-			return true;
-		}
-	},
-	reset: function(){
-		Calendar_Import.Store.file = '';
-		Calendar_Import.Store.path = '';
-		Calendar_Import.Store.id = 0;
-		Calendar_Import.Store.method = '';
-		Calendar_Import.Store.calname = '';
-		Calendar_Import.Store.progresskey = '';
-		Calendar_Import.Store.percentage = 0;
-	}
-}
-$(document).ready(function(){
-	if(typeof FileActions !== 'undefined'){
-		FileActions.register('text/calendar','importCalendar',  FileActions.PERMISSION_READ, '', Calendar_Import.Dialog.open); 
-		FileActions.setDefault('text/calendar','importCalendar');
-	};
-});
diff --git a/apps/calendar/js/settings.js b/apps/calendar/js/settings.js
deleted file mode 100644
index 20753a7b8f..0000000000
--- a/apps/calendar/js/settings.js
+++ /dev/null
@@ -1,66 +0,0 @@
-$(document).ready(function(){
-	$('#timezone').change( function(){
-		var post = $( '#timezone' ).serialize();
-		$.post( OC.filePath('calendar', 'ajax/settings', 'settimezone.php'), post, function(data){return;});
-		return false;
-	});
-	$('#timezone').chosen();
-	$('#timeformat').change( function(){
-		var data = $('#timeformat').serialize();
-		$.post( OC.filePath('calendar', 'ajax/settings', 'settimeformat.php'), data, function(data){
-			if(data == 'error'){
-				console.log('saving timeformat failed');
-			}
-		});
-	});
-	$('#firstday').change( function(){
-		var data = $('#firstday').serialize();
-		$.post( OC.filePath('calendar', 'ajax/settings', 'setfirstday.php'), data, function(data){
-			if(data == 'error'){
-				console.log('saving firstday failed');
-			}
-		});
-	});
-	$('#timezonedetection').change( function(){
-		var post = $('#timezonedetection').serialize();
-		$.post( OC.filePath('calendar', 'ajax/settings', 'timezonedetection.php'), post, function(data){
-			
-		});
-	});
-	$.getJSON(OC.filePath('calendar', 'ajax/settings', 'timeformat.php'), function(jsondata, status) {
-		$('#' + jsondata.timeformat).attr('selected',true);
-		$('#timeformat').chosen();
-		$('#timeformat_chzn').css('width', '100px');
-	});
-	$.getJSON(OC.filePath('calendar', 'ajax/settings', 'gettimezonedetection.php'), function(jsondata, status){
-		if(jsondata.detection == 'true'){
-			$('#timezonedetection').attr('checked', 'checked');
-		}
-	});
-	$.getJSON(OC.filePath('calendar', 'ajax/settings', 'getfirstday.php'), function(jsondata, status) {
-		$('#' + jsondata.firstday).attr('selected',true);
-		$('#firstday').chosen();
-		$('#firstday_chzn').css('width', '100px');
-	});
-	$('#cleancalendarcache').click(function(){
-		$.getJSON(OC.filePath('calendar', 'ajax/cache', 'rescan.php'), function(){
-			calendarcachecheck();
-		});
-	});
-	calendarcachecheck();
-	
-});
-function calendarcachecheck(){
-	$.getJSON(OC.filePath('calendar', 'ajax/cache', 'status.php'), function(jsondata, status) {
-		$('#cleancalendarcache').attr('title', jsondata.l10n.text);
-		if(jsondata.status == 'success'){
-			$('#cleancalendarcache').css('background', '#F8F8F8');
-			$('#cleancalendarcache').css('color', '#333');
-			$('#cleancalendarcache').css('text-shadow', '#fff 0 1px 0');
-		}else{
-			$('#cleancalendarcache').css('background', '#DC143C');
-			$('#cleancalendarcache').css('color', '#FFFFFF');
-			$('#cleancalendarcache').css('text-shadow', '0px 0px 0px #fff, 0px 0px #fff');
-		}
-	});
-}
\ No newline at end of file
diff --git a/apps/calendar/l10n/ar.php b/apps/calendar/l10n/ar.php
deleted file mode 100644
index 1ca5e0ead5..0000000000
--- a/apps/calendar/l10n/ar.php
+++ /dev/null
@@ -1,171 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Not all calendars are completely cached" => "ليس جميع الجداول الزمنيه محفوضه مؤقة",
-"Everything seems to be completely cached" => "كل شيء محفوض مؤقة",
-"No calendars found." => "لم يتم العثور على جدول الزمني",
-"No events found." => "لم يتم العثور على احداث",
-"Wrong calendar" => "جدول زمني خاطئ",
-"New Timezone:" => "التوقيت الجديد",
-"Timezone changed" => "تم تغيير المنطقة الزمنية",
-"Invalid request" => "طلب غير مفهوم",
-"Calendar" => "الجدول الزمني",
-"ddd" => "ddd",
-"ddd M/d" => "ddd M/d",
-"dddd M/d" => "ddd M/d",
-"MMMM yyyy" => "ddd M/d",
-"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
-"dddd, MMM d, yyyy" => "dddd, MMM d, yyyy",
-"Birthday" => "عيد ميلاد",
-"Business" => "عمل",
-"Call" => "إتصال",
-"Clients" => "الزبائن",
-"Deliverer" => "المرسل",
-"Holidays" => "عطلة",
-"Ideas" => "أفكار",
-"Journey" => "رحلة",
-"Jubilee" => "يوبيل",
-"Meeting" => "إجتماع",
-"Other" => "شيء آخر",
-"Personal" => "شخصي",
-"Projects" => "مشاريع",
-"Questions" => "اسئلة",
-"Work" => "العمل",
-"by" => "من قبل",
-"unnamed" => "غير مسمى",
-"New Calendar" => "جدول زمني جديد",
-"Does not repeat" => "لا يعاد",
-"Daily" => "يومي",
-"Weekly" => "أسبوعي",
-"Every Weekday" => "كل نهاية الأسبوع",
-"Bi-Weekly" => "كل اسبوعين",
-"Monthly" => "شهري",
-"Yearly" => "سنوي",
-"never" => "بتاتا",
-"by occurrences" => "حسب تسلسل الحدوث",
-"by date" => "حسب التاريخ",
-"by monthday" => "حسب يوم الشهر",
-"by weekday" => "حسب يوم الاسبوع",
-"Monday" => "الأثنين",
-"Tuesday" => "الثلاثاء",
-"Wednesday" => "الاربعاء",
-"Thursday" => "الخميس",
-"Friday" => "الجمعه",
-"Saturday" => "السبت",
-"Sunday" => "الاحد",
-"events week of month" => "الاحداث باسبوع الشهر",
-"first" => "أول",
-"second" => "ثاني",
-"third" => "ثالث",
-"fourth" => "رابع",
-"fifth" => "خامس",
-"last" => "أخير",
-"January" => "كانون الثاني",
-"February" => "شباط",
-"March" => "آذار",
-"April" => "نيسان",
-"May" => "أيار",
-"June" => "حزيران",
-"July" => "تموز",
-"August" => "آب",
-"September" => "أيلول",
-"October" => "تشرين الاول",
-"November" => "تشرين الثاني",
-"December" => "كانون الاول",
-"by events date" => "حسب تاريخ الحدث",
-"by yearday(s)" => "حسب يوم السنه",
-"by weeknumber(s)" => "حسب رقم الاسبوع",
-"by day and month" => "حسب اليوم و الشهر",
-"Date" => "تاريخ",
-"Cal." => "تقويم",
-"Sun." => "أحد",
-"Mon." => "أثن.",
-"Tue." => "ثلا.",
-"Wed." => "أرب.",
-"Thu." => "خمي.",
-"Fri." => "جمع.",
-"Sat." => "سبت",
-"Jan." => "ك2",
-"Feb." => "شبا.",
-"Mar." => "آذا.",
-"Apr." => "نيس.",
-"May." => "أيا.",
-"All day" => "كل النهار",
-"Missing fields" => "خانات خالية من المعلومات",
-"Title" => "عنوان",
-"From Date" => "من تاريخ",
-"From Time" => "إلى تاريخ",
-"To Date" => "إلى يوم",
-"To Time" => "إلى وقت",
-"The event ends before it starts" => "هذا الحدث ينتهي قبل أن يبدأ",
-"There was a database fail" => "خطأ في قاعدة البيانات",
-"Week" => "إسبوع",
-"Month" => "شهر",
-"List" => "قائمة",
-"Today" => "اليوم",
-"Your calendars" => "جداولك الزمنيه",
-"CalDav Link" => "وصلة CalDav",
-"Shared calendars" => "جداول زمنيه مشتركه",
-"No shared calendars" => "لا يوجد جداول زمنيه مشتركه",
-"Share Calendar" => "شارك الجدول الزمني",
-"Download" => "تحميل",
-"Edit" => "تعديل",
-"Delete" => "حذف",
-"shared with you by" => "مشاركه من قبل",
-"New calendar" => "جدول زمني جديد",
-"Edit calendar" => "عادل الجدول الزمني",
-"Displayname" => "الاسم المرئي",
-"Active" => "حالي",
-"Calendar color" => "لون الجدول الزمني",
-"Save" => "إحفظ",
-"Submit" => "أرسل",
-"Cancel" => "إلغاء",
-"Edit an event" => "عادل حدث",
-"Export" => "تصدير المعلومات",
-"Eventinfo" => "تفاصيل الحدث",
-"Repeating" => "يعاد",
-"Alarm" => "تنبيه",
-"Attendees" => "الحضور",
-"Share" => "شارك",
-"Title of the Event" => "عنوان الحدث",
-"Category" => "فئة",
-"Separate categories with commas" => "افصل الفئات بالفواصل",
-"Edit categories" => "عدل الفئات",
-"All Day Event" => "حدث في يوم كامل",
-"From" => "من",
-"To" => "إلى",
-"Advanced options" => "خيارات متقدمة",
-"Location" => "مكان",
-"Location of the Event" => "مكان الحدث",
-"Description" => "مواصفات",
-"Description of the Event" => "وصف الحدث",
-"Repeat" => "إعادة",
-"Advanced" => "تعديلات متقدمه",
-"Select weekdays" => "اختر ايام الاسبوع",
-"Select days" => "اختر الايام",
-"and the events day of year." => "و التواريخ حسب يوم السنه.",
-"and the events day of month." => "و الاحداث حسب يوم الشهر.",
-"Select months" => "اختر الاشهر",
-"Select weeks" => "اختر الاسابيع",
-"and the events week of year." => "و الاحداث حسب اسبوع السنه",
-"Interval" => "المده الفاصله",
-"End" => "نهايه",
-"occurrences" => "الاحداث",
-"create a new calendar" => "انشاء جدول زمني جديد",
-"Import a calendar file" => "أدخل ملف التقويم",
-"Name of new calendar" => "أسم الجدول الزمني الجديد",
-"Import" => "إدخال",
-"Close Dialog" => "أغلق الحوار",
-"Create a new event" => "إضافة حدث جديد",
-"View an event" => "شاهد الحدث",
-"No categories selected" => "لم يتم اختيار الفئات",
-"of" => "من",
-"at" => "في",
-"Timezone" => "المنطقة الزمنية",
-"24h" => "24 ساعة",
-"12h" => "12 ساعة",
-"Users" => "المستخدمين",
-"select users" => "اختر المستخدمين",
-"Editable" => "يمكن تعديله",
-"Groups" => "مجموعات",
-"select groups" => "اختر المجموعات",
-"make public" => "حدث عام"
-);
diff --git a/apps/calendar/l10n/bg_BG.php b/apps/calendar/l10n/bg_BG.php
deleted file mode 100644
index fc353ebef9..0000000000
--- a/apps/calendar/l10n/bg_BG.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php $TRANSLATIONS = array(
-"No calendars found." => "Не са открити календари.",
-"No events found." => "Не са открити събития.",
-"Import failed" => "Грешка при внасяне",
-"New Timezone:" => "Нов часови пояс:",
-"Timezone changed" => "Часовата зона е сменена",
-"Invalid request" => "Невалидна заявка",
-"Calendar" => "Календар",
-"Birthday" => "Роджен ден",
-"Clients" => "Клиенти",
-"Holidays" => "Празници",
-"Ideas" => "Идеи",
-"Journey" => "Пътуване",
-"Meeting" => "Среща",
-"Other" => "Друго",
-"Personal" => "Лично",
-"Projects" => "Проекти",
-"Questions" => "Въпроси",
-"Work" => "Работа",
-"New Calendar" => "Нов календар",
-"Does not repeat" => "Не се повтаря",
-"Daily" => "Дневно",
-"Weekly" => "Седмично",
-"Every Weekday" => "Всеки делничен ден",
-"Bi-Weekly" => "Двуседмично",
-"Monthly" => "Месечно",
-"Yearly" => "Годишно",
-"never" => "никога",
-"Monday" => "Понеделник",
-"Tuesday" => "Вторник",
-"Wednesday" => "Сряда",
-"Thursday" => "Четвъртък",
-"Friday" => "Петък",
-"Saturday" => "Събота",
-"Sunday" => "Неделя",
-"All day" => "Всички дни",
-"Missing fields" => "Липсват полета",
-"Title" => "Заглавие",
-"Week" => "Седмица",
-"Month" => "Месец",
-"List" => "Списък",
-"Today" => "Днес",
-"Your calendars" => "Вашите календари",
-"Shared calendars" => "Споделени календари",
-"No shared calendars" => "Няма споделени календари",
-"Share Calendar" => "Споделяне на календар",
-"Download" => "Изтегляне",
-"Edit" => "Промяна",
-"Delete" => "Изтриване",
-"New calendar" => "Нов календар",
-"Edit calendar" => "Промени календар",
-"Displayname" => "Екранно име",
-"Active" => "Активен",
-"Calendar color" => "Цвят на календара",
-"Save" => "Запис",
-"Submit" => "Продължи",
-"Cancel" => "Отказ",
-"Edit an event" => "Промяна на събитие",
-"Export" => "Изнасяне",
-"Share" => "Споделяне",
-"Title of the Event" => "Наименование",
-"Category" => "Категория",
-"Separate categories with commas" => "Отделете категориите със запетаи",
-"Edit categories" => "Редактиране на категориите",
-"All Day Event" => "Целодневно събитие",
-"From" => "От",
-"To" => "До",
-"Advanced options" => "Разширени настройки",
-"Location" => "Локация",
-"Location of the Event" => "Локация",
-"Description" => "Описание",
-"Description of the Event" => "Описание",
-"Repeat" => "Повтори",
-"create a new calendar" => "създаване на нов календар",
-"Please choose a calendar" => "Изберете календар",
-"Name of new calendar" => "Име на новия календар",
-"Import" => "Внасяне",
-"Close Dialog" => "Затваряне на прозореца",
-"Create a new event" => "Ново събитие",
-"View an event" => "Преглед на събитие",
-"No categories selected" => "Няма избрани категории",
-"Timezone" => "Часова зона",
-"Groups" => "Групи"
-);
diff --git a/apps/calendar/l10n/ca.php b/apps/calendar/l10n/ca.php
deleted file mode 100644
index 9e267604e6..0000000000
--- a/apps/calendar/l10n/ca.php
+++ /dev/null
@@ -1,198 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Not all calendars are completely cached" => "No tots els calendaris estan en memòria",
-"Everything seems to be completely cached" => "Sembla que tot està en memòria",
-"No calendars found." => "No s'han trobat calendaris.",
-"No events found." => "No s'han trobat events.",
-"Wrong calendar" => "Calendari erroni",
-"The file contained either no events or all events are already saved in your calendar." => "El fitxer no contenia esdeveniments o aquests ja estaven desats en el vostre caledari",
-"events has been saved in the new calendar" => "els esdeveniments s'han desat en el calendari nou",
-"Import failed" => "Ha fallat la importació",
-"events has been saved in your calendar" => "els esdveniments s'han desat en el calendari",
-"New Timezone:" => "Nova zona horària:",
-"Timezone changed" => "La zona horària ha canviat",
-"Invalid request" => "Sol.licitud no vàlida",
-"Calendar" => "Calendari",
-"ddd" => "ddd",
-"ddd M/d" => "ddd d/M",
-"dddd M/d" => "dddd d/M",
-"MMMM yyyy" => "MMMM yyyy",
-"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "d [MMM ][yyyy ]{'&#8212;' d MMM yyyy}",
-"dddd, MMM d, yyyy" => "dddd, d MMM, yyyy",
-"Birthday" => "Aniversari",
-"Business" => "Feina",
-"Call" => "Trucada",
-"Clients" => "Clients",
-"Deliverer" => "Remitent",
-"Holidays" => "Vacances",
-"Ideas" => "Idees",
-"Journey" => "Viatge",
-"Jubilee" => "Sant",
-"Meeting" => "Reunió",
-"Other" => "Altres",
-"Personal" => "Personal",
-"Projects" => "Projectes",
-"Questions" => "Preguntes",
-"Work" => "Feina",
-"by" => "per",
-"unnamed" => "sense nom",
-"New Calendar" => "Calendari nou",
-"Does not repeat" => "No es repeteix",
-"Daily" => "Diari",
-"Weekly" => "Mensual",
-"Every Weekday" => "Cada setmana",
-"Bi-Weekly" => "Bisetmanalment",
-"Monthly" => "Mensualment",
-"Yearly" => "Cada any",
-"never" => "mai",
-"by occurrences" => "per aparicions",
-"by date" => "per data",
-"by monthday" => "per dia del mes",
-"by weekday" => "per dia de la setmana",
-"Monday" => "Dilluns",
-"Tuesday" => "Dimarts",
-"Wednesday" => "Dimecres",
-"Thursday" => "Dijous",
-"Friday" => "Divendres",
-"Saturday" => "Dissabte",
-"Sunday" => "Diumenge",
-"events week of month" => "esdeveniments la setmana del mes",
-"first" => "primer",
-"second" => "segon",
-"third" => "tercer",
-"fourth" => "quart",
-"fifth" => "cinquè",
-"last" => "últim",
-"January" => "Gener",
-"February" => "Febrer",
-"March" => "Març",
-"April" => "Abril",
-"May" => "Maig",
-"June" => "Juny",
-"July" => "Juliol",
-"August" => "Agost",
-"September" => "Setembre",
-"October" => "Octubre",
-"November" => "Novembre",
-"December" => "Desembre",
-"by events date" => "per data d'esdeveniments",
-"by yearday(s)" => "per ahir(s)",
-"by weeknumber(s)" => "per número(s) de la setmana",
-"by day and month" => "per dia del mes",
-"Date" => "Data",
-"Cal." => "Cal.",
-"Sun." => "Dg.",
-"Mon." => "Dl.",
-"Tue." => "Dm.",
-"Wed." => "Dc.",
-"Thu." => "Dj.",
-"Fri." => "Dv.",
-"Sat." => "Ds.",
-"Jan." => "Gen.",
-"Feb." => "Febr.",
-"Mar." => "Març",
-"Apr." => "Abr.",
-"May." => "Maig",
-"Jun." => "Juny",
-"Jul." => "Jul.",
-"Aug." => "Ag.",
-"Sep." => "Set.",
-"Oct." => "Oct.",
-"Nov." => "Nov.",
-"Dec." => "Des.",
-"All day" => "Tot el dia",
-"Missing fields" => "Els camps que falten",
-"Title" => "Títol",
-"From Date" => "Des de la data",
-"From Time" => "Des de l'hora",
-"To Date" => "Fins a la data",
-"To Time" => "Fins a l'hora",
-"The event ends before it starts" => "L'esdeveniment acaba abans que comenci",
-"There was a database fail" => "Hi ha un error de base de dades",
-"Week" => "Setmana",
-"Month" => "Mes",
-"List" => "Llista",
-"Today" => "Avui",
-"Settings" => "Configuració",
-"Your calendars" => "Els vostres calendaris",
-"CalDav Link" => "Enllaç CalDav",
-"Shared calendars" => "Calendaris compartits",
-"No shared calendars" => "No hi ha calendaris compartits",
-"Share Calendar" => "Comparteix el calendari",
-"Download" => "Baixa",
-"Edit" => "Edita",
-"Delete" => "Suprimeix",
-"shared with you by" => "compartit amb vós",
-"New calendar" => "Calendari nou",
-"Edit calendar" => "Edita el calendari",
-"Displayname" => "Mostra el nom",
-"Active" => "Actiu",
-"Calendar color" => "Color del calendari",
-"Save" => "Desa",
-"Submit" => "Envia",
-"Cancel" => "Cancel·la",
-"Edit an event" => "Edició d'un esdeveniment",
-"Export" => "Exporta",
-"Eventinfo" => "Eventinfo",
-"Repeating" => "Repetició",
-"Alarm" => "Alarma",
-"Attendees" => "Assistents",
-"Share" => "Comparteix",
-"Title of the Event" => "Títol de l'esdeveniment",
-"Category" => "Categoria",
-"Separate categories with commas" => "Separeu les categories amb comes",
-"Edit categories" => "Edita categories",
-"All Day Event" => "Esdeveniment de tot el dia",
-"From" => "Des de",
-"To" => "Fins a",
-"Advanced options" => "Opcions avançades",
-"Location" => "Ubicació",
-"Location of the Event" => "Ubicació de l'esdeveniment",
-"Description" => "Descripció",
-"Description of the Event" => "Descripció de l'esdeveniment",
-"Repeat" => "Repetició",
-"Advanced" => "Avançat",
-"Select weekdays" => "Dies de la setmana seleccionats",
-"Select days" => "Seleccionar dies",
-"and the events day of year." => "i dies d'esdeveniment de l'any.",
-"and the events day of month." => "i dies d'esdeveniment del mes.",
-"Select months" => "Seleccionar mesos",
-"Select weeks" => "Seleccionar setmanes",
-"and the events week of year." => "i setmanes d'esdeveniment de l'any.",
-"Interval" => "Interval",
-"End" => "Final",
-"occurrences" => "aparicions",
-"create a new calendar" => "crea un nou calendari",
-"Import a calendar file" => "Importa un fitxer de calendari",
-"Please choose a calendar" => "Escolliu un calendari",
-"Name of new calendar" => "Nom del nou calendari",
-"Take an available name!" => "Escolliu un nom disponible!",
-"A Calendar with this name already exists. If you continue anyhow, these calendars will be merged." => "Ja hi ha un calendari amb aquest nom. Si continueu, els calendaris es combinaran.",
-"Import" => "Importa",
-"Close Dialog" => "Tanca el diàleg",
-"Create a new event" => "Crea un nou esdeveniment",
-"View an event" => "Mostra un event",
-"No categories selected" => "No hi ha categories seleccionades",
-"of" => "de",
-"at" => "a",
-"General" => "General",
-"Timezone" => "Zona horària",
-"Update timezone automatically" => "Actualitza la zona horària automàticament",
-"Time format" => "Format horari",
-"24h" => "24h",
-"12h" => "12h",
-"Start week on" => "Comença la setmana en ",
-"Cache" => "Memòria de cau",
-"Clear cache for repeating events" => "Neteja la memòria de cau pels esdeveniments amb repetició",
-"URLs" => "URLs",
-"Calendar CalDAV syncing addresses" => "Adreça de sincronització del calendari CalDAV",
-"more info" => "més informació",
-"Primary address (Kontact et al)" => "Adreça primària (Kontact et al)",
-"iOS/OS X" => "IOS/OS X",
-"Read only iCalendar link(s)" => "Enllaç(os) iCalendar només de lectura",
-"Users" => "Usuaris",
-"select users" => "seleccioneu usuaris",
-"Editable" => "Editable",
-"Groups" => "Grups",
-"select groups" => "seleccioneu grups",
-"make public" => "fes-ho public"
-);
diff --git a/apps/calendar/l10n/cs_CZ.php b/apps/calendar/l10n/cs_CZ.php
deleted file mode 100644
index ab76cc49d1..0000000000
--- a/apps/calendar/l10n/cs_CZ.php
+++ /dev/null
@@ -1,198 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Not all calendars are completely cached" => "V paměti nejsou uloženy kompletně všechny kalendáře",
-"Everything seems to be completely cached" => "Zdá se, že vše je kompletně uloženo v paměti",
-"No calendars found." => "Žádné kalendáře nenalezeny.",
-"No events found." => "Žádné události nenalezeny.",
-"Wrong calendar" => "Nesprávný kalendář",
-"The file contained either no events or all events are already saved in your calendar." => "Soubor, obsahující všechny záznamy nebo je prázdný, je již uložen ve Vašem kalendáři.",
-"events has been saved in the new calendar" => "Záznam byl uložen v novém kalendáři",
-"Import failed" => "Import selhal",
-"events has been saved in your calendar" => "záznamů bylo uloženo ve Vašem kalendáři",
-"New Timezone:" => "Nová časová zóna:",
-"Timezone changed" => "Časová zóna byla změněna",
-"Invalid request" => "Chybný požadavek",
-"Calendar" => "Kalendář",
-"ddd" => "ddd",
-"ddd M/d" => "ddd M/d",
-"dddd M/d" => "dddd M/d",
-"MMMM yyyy" => "MMMM rrrr",
-"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "d. MMM[ yyyy]{ '&#8212;' d.[ MMM] yyyy}",
-"dddd, MMM d, yyyy" => "dddd, MMM d, rrrr",
-"Birthday" => "Narozeniny",
-"Business" => "Obchodní",
-"Call" => "Hovor",
-"Clients" => "Klienti",
-"Deliverer" => "Doručovatel",
-"Holidays" => "Prázdniny",
-"Ideas" => "Nápady",
-"Journey" => "Cesta",
-"Jubilee" => "Výročí",
-"Meeting" => "Schůzka",
-"Other" => "Další",
-"Personal" => "Osobní",
-"Projects" => "Projekty",
-"Questions" => "Dotazy",
-"Work" => "Pracovní",
-"by" => "od",
-"unnamed" => "nepojmenováno",
-"New Calendar" => "Nový kalendář",
-"Does not repeat" => "Neopakuje se",
-"Daily" => "Denně",
-"Weekly" => "Týdně",
-"Every Weekday" => "Každý všední den",
-"Bi-Weekly" => "Jednou za dva týdny",
-"Monthly" => "Měsíčně",
-"Yearly" => "Ročně",
-"never" => "nikdy",
-"by occurrences" => "podle výskytu",
-"by date" => "podle data",
-"by monthday" => "podle dne v měsíci",
-"by weekday" => "podle dne v týdnu",
-"Monday" => "Pondělí",
-"Tuesday" => "Úterý",
-"Wednesday" => "Středa",
-"Thursday" => "Čtvrtek",
-"Friday" => "Pátek",
-"Saturday" => "Sobota",
-"Sunday" => "Neděle",
-"events week of month" => "týdenní události v měsíci",
-"first" => "první",
-"second" => "druhý",
-"third" => "třetí",
-"fourth" => "čtvrtý",
-"fifth" => "pátý",
-"last" => "poslední",
-"January" => "Leden",
-"February" => "Únor",
-"March" => "Březen",
-"April" => "Duben",
-"May" => "Květen",
-"June" => "Červen",
-"July" => "Červenec",
-"August" => "Srpen",
-"September" => "Září",
-"October" => "Říjen",
-"November" => "Listopad",
-"December" => "Prosinec",
-"by events date" => "podle data události",
-"by yearday(s)" => "po dni (dnech)",
-"by weeknumber(s)" => "podle čísel týdnů",
-"by day and month" => "podle dne a měsíce",
-"Date" => "Datum",
-"Cal." => "Kal.",
-"Sun." => "Ne",
-"Mon." => "Po",
-"Tue." => "Út",
-"Wed." => "St",
-"Thu." => "Čt",
-"Fri." => "Pá",
-"Sat." => "So",
-"Jan." => "Ne",
-"Feb." => "únor",
-"Mar." => "březen",
-"Apr." => "duben",
-"May." => "květen",
-"Jun." => "červen",
-"Jul." => "červenec",
-"Aug." => "srpen",
-"Sep." => "září",
-"Oct." => "říjen",
-"Nov." => "listopad",
-"Dec." => "prosinec",
-"All day" => "Celý den",
-"Missing fields" => "Chybějící pole",
-"Title" => "Název",
-"From Date" => "Od data",
-"From Time" => "Od",
-"To Date" => "Do data",
-"To Time" => "Do",
-"The event ends before it starts" => "Akce končí před zahájením",
-"There was a database fail" => "Chyba v databázi",
-"Week" => "týden",
-"Month" => "měsíc",
-"List" => "Seznam",
-"Today" => "dnes",
-"Settings" => "Nastavení",
-"Your calendars" => "Vaše kalendáře",
-"CalDav Link" => "CalDav odkaz",
-"Shared calendars" => "Sdílené kalendáře",
-"No shared calendars" => "Žádné sdílené kalendáře",
-"Share Calendar" => "Sdílet kalendář",
-"Download" => "Stáhnout",
-"Edit" => "Editovat",
-"Delete" => "Odstranit",
-"shared with you by" => "sdíleno s vámi uživatelem",
-"New calendar" => "Nový kalendář",
-"Edit calendar" => "Editovat kalendář",
-"Displayname" => "Zobrazované jméno",
-"Active" => "Aktivní",
-"Calendar color" => "Barva kalendáře",
-"Save" => "Uložit",
-"Submit" => "Potvrdit",
-"Cancel" => "Storno",
-"Edit an event" => "Editovat událost",
-"Export" => "Export",
-"Eventinfo" => "Informace o události",
-"Repeating" => "Opakující se",
-"Alarm" => "Alarm",
-"Attendees" => "Účastníci",
-"Share" => "Sdílet",
-"Title of the Event" => "Název události",
-"Category" => "Kategorie",
-"Separate categories with commas" => "Kategorie oddělené čárkami",
-"Edit categories" => "Upravit kategorie",
-"All Day Event" => "Celodenní událost",
-"From" => "od",
-"To" => "do",
-"Advanced options" => "Pokročilé volby",
-"Location" => "Umístění",
-"Location of the Event" => "Místo konání události",
-"Description" => "Popis",
-"Description of the Event" => "Popis události",
-"Repeat" => "Opakování",
-"Advanced" => "Pokročilé",
-"Select weekdays" => "Vybrat dny v týdnu",
-"Select days" => "Vybrat dny",
-"and the events day of year." => "a denní události v roce",
-"and the events day of month." => "a denní události v měsíci",
-"Select months" => "Vybrat měsíce",
-"Select weeks" => "Vybrat týdny",
-"and the events week of year." => "a týden s událostmi v roce",
-"Interval" => "Interval",
-"End" => "Konec",
-"occurrences" => "výskyty",
-"create a new calendar" => "vytvořit nový kalendář",
-"Import a calendar file" => "Importovat soubor kalendáře",
-"Please choose a calendar" => "Vyberte prosím kalendář",
-"Name of new calendar" => "Název nového kalendáře",
-"Take an available name!" => "Použijte volné jméno!",
-"A Calendar with this name already exists. If you continue anyhow, these calendars will be merged." => "Kalendář s trímto názvem již existuje. Pokud název použijete, stejnojmenné kalendáře budou sloučeny.",
-"Import" => "Import",
-"Close Dialog" => "Zavřít dialog",
-"Create a new event" => "Vytvořit novou událost",
-"View an event" => "Zobrazit událost",
-"No categories selected" => "Žádné kategorie nevybrány",
-"of" => "z",
-"at" => "v",
-"General" => "Hlavní",
-"Timezone" => "Časové pásmo",
-"Update timezone automatically" => "Obnovit auronaricky časovou zónu.",
-"Time format" => "Formát času",
-"24h" => "24h",
-"12h" => "12h",
-"Start week on" => "Týden začína v",
-"Cache" => "Paměť",
-"Clear cache for repeating events" => "Vymazat paměť pro opakuijísí se záznamy",
-"URLs" => "URLs",
-"Calendar CalDAV syncing addresses" => "Kalendář CalDAV synchronizuje adresy",
-"more info" => "podrobnosti",
-"Primary address (Kontact et al)" => "Primární adresa (veřejná)",
-"iOS/OS X" => "iOS/OS X",
-"Read only iCalendar link(s)" => "Odkaz(y) kalendáře pouze pro čtení",
-"Users" => "Uživatelé",
-"select users" => "vybrat uživatele",
-"Editable" => "Upravovatelné",
-"Groups" => "Skupiny",
-"select groups" => "vybrat skupiny",
-"make public" => "zveřejnit"
-);
diff --git a/apps/calendar/l10n/da.php b/apps/calendar/l10n/da.php
deleted file mode 100644
index a193d5e156..0000000000
--- a/apps/calendar/l10n/da.php
+++ /dev/null
@@ -1,190 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Not all calendars are completely cached" => "Ikke alle kalendere er fuldstændig cached",
-"No calendars found." => "Der blev ikke fundet nogen kalendere.",
-"No events found." => "Der blev ikke fundet nogen begivenheder.",
-"Wrong calendar" => "Forkert kalender",
-"The file contained either no events or all events are already saved in your calendar." => "Filen indeholdt enten ingen begivenheder eller alle begivenheder er allerede gemt i din kalender.",
-"events has been saved in the new calendar" => "begivenheder er gemt i den nye kalender",
-"Import failed" => "import mislykkedes",
-"events has been saved in your calendar" => "begivenheder er gemt i din kalender",
-"New Timezone:" => "Ny tidszone:",
-"Timezone changed" => "Tidszone ændret",
-"Invalid request" => "Ugyldig forespørgsel",
-"Calendar" => "Kalender",
-"ddd" => "ddd",
-"ddd M/d" => "ddd M/d",
-"dddd M/d" => "dddd M/d",
-"MMMM yyyy" => "MMMM åååå",
-"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ åååå]{ '&#8212;'[ MMM] d åååå}",
-"dddd, MMM d, yyyy" => "dddd, MMM d, åååå",
-"Birthday" => "Fødselsdag",
-"Business" => "Forretning",
-"Call" => "Ring",
-"Clients" => "Kunder",
-"Deliverer" => "Leverance",
-"Holidays" => "Helligdage",
-"Ideas" => "Ideér",
-"Journey" => "Rejse",
-"Jubilee" => "Jubilæum",
-"Meeting" => "Møde",
-"Other" => "Andet",
-"Personal" => "Privat",
-"Projects" => "Projekter",
-"Questions" => "Spørgsmål",
-"Work" => "Arbejde",
-"by" => "af",
-"unnamed" => "unavngivet",
-"New Calendar" => "Ny Kalender",
-"Does not repeat" => "Gentages ikke",
-"Daily" => "Daglig",
-"Weekly" => "Ugentlig",
-"Every Weekday" => "Alle hverdage",
-"Bi-Weekly" => "Hver anden uge",
-"Monthly" => "Månedlig",
-"Yearly" => "Årlig",
-"never" => "aldrig",
-"by occurrences" => "efter forekomster",
-"by date" => "efter dato",
-"by monthday" => "efter dag i måneden",
-"by weekday" => "efter ugedag",
-"Monday" => "Mandag",
-"Tuesday" => "Tirsdag",
-"Wednesday" => "Onsdag",
-"Thursday" => "Torsdag",
-"Friday" => "Fredag",
-"Saturday" => "Lørdag",
-"Sunday" => "øndag",
-"events week of month" => "begivenhedens uge i måneden",
-"first" => "første",
-"second" => "anden",
-"third" => "tredje",
-"fourth" => "fjerde",
-"fifth" => "femte",
-"last" => "sidste",
-"January" => "Januar",
-"February" => "Februar",
-"March" => "Marts",
-"April" => "April",
-"May" => "Maj",
-"June" => "Juni",
-"July" => "Juli",
-"August" => "August",
-"September" => "September",
-"October" => "Oktober",
-"November" => "November",
-"December" => "December",
-"by events date" => "efter begivenheders dato",
-"by yearday(s)" => "efter dag(e) i året",
-"by weeknumber(s)" => "efter ugenummer/-numre",
-"by day and month" => "efter dag og måned",
-"Date" => "Dato",
-"Cal." => "Kal.",
-"Sun." => "Søn.",
-"Mon." => "Man.",
-"Tue." => "Tir.",
-"Wed." => "Ons.",
-"Thu." => "Tor.",
-"Fri." => "Fre.",
-"Sat." => "Lør.",
-"Jan." => "Jan.",
-"Feb." => "Feb.",
-"Mar." => "Mar.",
-"Apr." => "Apr.",
-"May." => "Maj",
-"Jun." => "Jun.",
-"Jul." => "Jul.",
-"Aug." => "Aug.",
-"Sep." => "Sep.",
-"Oct." => "Okt.",
-"Nov." => "Nov.",
-"Dec." => "Dec.",
-"All day" => "Hele dagen",
-"Missing fields" => "Manglende felter",
-"Title" => "Titel",
-"From Date" => "Fra dato",
-"From Time" => "Fra tidspunkt",
-"To Date" => "Til dato",
-"To Time" => "Til tidspunkt",
-"The event ends before it starts" => "Begivenheden slutter, inden den begynder",
-"There was a database fail" => "Der var en fejl i databasen",
-"Week" => "Uge",
-"Month" => "Måned",
-"List" => "Liste",
-"Today" => "I dag",
-"Settings" => "Indstillinger",
-"Your calendars" => "Dine kalendere",
-"CalDav Link" => "CalDav-link",
-"Shared calendars" => "Delte kalendere",
-"No shared calendars" => "Ingen delte kalendere",
-"Share Calendar" => "Del kalender",
-"Download" => "Hent",
-"Edit" => "Rediger",
-"Delete" => "Slet",
-"shared with you by" => "delt af dig",
-"New calendar" => "Ny kalender",
-"Edit calendar" => "Rediger kalender",
-"Displayname" => "Vist navn",
-"Active" => "Aktiv",
-"Calendar color" => "Kalenderfarve",
-"Save" => "Gem",
-"Submit" => "Send",
-"Cancel" => "Annuller",
-"Edit an event" => "Redigér en begivenhed",
-"Export" => "Eksporter",
-"Eventinfo" => "Begivenhedsinfo",
-"Repeating" => "Gentagende",
-"Alarm" => "Alarm",
-"Attendees" => "Deltagere",
-"Share" => "Del",
-"Title of the Event" => "Titel på begivenheden",
-"Category" => "Kategori",
-"Separate categories with commas" => "Opdel kategorier med kommaer",
-"Edit categories" => "Rediger kategorier",
-"All Day Event" => "Heldagsarrangement",
-"From" => "Fra",
-"To" => "Til",
-"Advanced options" => "Avancerede indstillinger",
-"Location" => "Sted",
-"Location of the Event" => "Placering af begivenheden",
-"Description" => "Beskrivelse",
-"Description of the Event" => "Beskrivelse af begivenheden",
-"Repeat" => "Gentag",
-"Advanced" => "Avanceret",
-"Select weekdays" => "Vælg ugedage",
-"Select days" => "Vælg dage",
-"and the events day of year." => "og begivenhedens dag i året.",
-"and the events day of month." => "og begivenhedens sag på måneden",
-"Select months" => "Vælg måneder",
-"Select weeks" => "Vælg uger",
-"and the events week of year." => "og begivenhedens uge i året.",
-"Interval" => "Interval",
-"End" => "Afslutning",
-"occurrences" => "forekomster",
-"create a new calendar" => "opret en ny kalender",
-"Import a calendar file" => "Importer en kalenderfil",
-"Please choose a calendar" => "Vælg en kalender",
-"Name of new calendar" => "Navn på ny kalender",
-"A Calendar with this name already exists. If you continue anyhow, these calendars will be merged." => "En kalender med dette navn findes allerede. Hvis du fortsætter alligevel, vil disse kalendere blive sammenlagt.",
-"Import" => "Importer",
-"Importing calendar" => "Importerer kalender",
-"Calendar imported successfully" => "Kalender importeret korrekt",
-"Close Dialog" => "Luk dialog",
-"Create a new event" => "Opret en ny begivenhed",
-"View an event" => "Vis en begivenhed",
-"No categories selected" => "Ingen categorier valgt",
-"of" => "fra",
-"at" => "kl.",
-"General" => "Generel",
-"Timezone" => "Tidszone",
-"Update timezone automatically" => "Opdater tidszone automatisk",
-"24h" => "24T",
-"12h" => "12T",
-"more info" => "flere oplysninger",
-"iOS/OS X" => "iOS/OS X",
-"Users" => "Brugere",
-"select users" => "Vælg brugere",
-"Editable" => "Redigerbar",
-"Groups" => "Grupper",
-"select groups" => "Vælg grupper",
-"make public" => "Offentliggør"
-);
diff --git a/apps/calendar/l10n/de.php b/apps/calendar/l10n/de.php
deleted file mode 100644
index d91753ff74..0000000000
--- a/apps/calendar/l10n/de.php
+++ /dev/null
@@ -1,201 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Not all calendars are completely cached" => "Noch sind nicht alle Kalender zwischengespeichert.",
-"Everything seems to be completely cached" => "Es sieht so aus, als wäre alles vollständig zwischengespeichert.",
-"No calendars found." => "Keine Kalender gefunden.",
-"No events found." => "Keine Termine gefunden.",
-"Wrong calendar" => "Falscher Kalender",
-"The file contained either no events or all events are already saved in your calendar." => "Entweder enthielt die Datei keine Termine oder alle Termine waren bereits im Kalender gespeichert.",
-"events has been saved in the new calendar" => "Der Termin wurde im neuen Kalender gespeichert.",
-"Import failed" => "Import fehlgeschlagen",
-"events has been saved in your calendar" => "Der Termin wurde im Kalender gespeichert.",
-"New Timezone:" => "Neue Zeitzone:",
-"Timezone changed" => "Zeitzone geändert",
-"Invalid request" => "Fehlerhafte Anfrage",
-"Calendar" => "Kalender",
-"ddd" => "ddd",
-"ddd M/d" => "ddd d.M",
-"dddd M/d" => "dddd d.M",
-"MMMM yyyy" => "MMMM yyyy",
-"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
-"dddd, MMM d, yyyy" => "dddd, d. MMM yyyy",
-"Birthday" => "Geburtstag",
-"Business" => "Geschäftlich",
-"Call" => "Anruf",
-"Clients" => "Kunden",
-"Deliverer" => "Lieferant",
-"Holidays" => "Urlaub",
-"Ideas" => "Ideen",
-"Journey" => "Reise",
-"Jubilee" => "Jubiläum",
-"Meeting" => "Treffen",
-"Other" => "Anderes",
-"Personal" => "Persönlich",
-"Projects" => "Projekte",
-"Questions" => "Fragen",
-"Work" => "Arbeit",
-"by" => "von",
-"unnamed" => "unbenannt",
-"New Calendar" => "Neuer Kalender",
-"Does not repeat" => "einmalig",
-"Daily" => "täglich",
-"Weekly" => "wöchentlich",
-"Every Weekday" => "jeden Wochentag",
-"Bi-Weekly" => "jede zweite Woche",
-"Monthly" => "monatlich",
-"Yearly" => "jährlich",
-"never" => "niemals",
-"by occurrences" => "nach Terminen",
-"by date" => "nach Datum",
-"by monthday" => "an einem Monatstag",
-"by weekday" => "an einem Wochentag",
-"Monday" => "Montag",
-"Tuesday" => "Dienstag",
-"Wednesday" => "Mittwoch",
-"Thursday" => "Donnerstag",
-"Friday" => "Freitag",
-"Saturday" => "Samstag",
-"Sunday" => "Sonntag",
-"events week of month" => "Woche des Monats vom Termin",
-"first" => "erste",
-"second" => "zweite",
-"third" => "dritte",
-"fourth" => "vierte",
-"fifth" => "fünfte",
-"last" => "letzte",
-"January" => "Januar",
-"February" => "Februar",
-"March" => "März",
-"April" => "April",
-"May" => "Mai",
-"June" => "Juni",
-"July" => "Juli",
-"August" => "August",
-"September" => "September",
-"October" => "Oktober",
-"November" => "November",
-"December" => "Dezember",
-"by events date" => "nach Tag des Termins",
-"by yearday(s)" => "nach Tag des Jahres",
-"by weeknumber(s)" => "nach Wochennummer",
-"by day and month" => "nach Tag und Monat",
-"Date" => "Datum",
-"Cal." => "Kal.",
-"Sun." => "So",
-"Mon." => "Mo",
-"Tue." => "Di",
-"Wed." => "Mi",
-"Thu." => "Do",
-"Fri." => "Fr",
-"Sat." => "Sa",
-"Jan." => "Jan.",
-"Feb." => "Feb.",
-"Mar." => "Mär.",
-"Apr." => "Apr.",
-"May." => "Mai",
-"Jun." => "Jun.",
-"Jul." => "Jul.",
-"Aug." => "Aug.",
-"Sep." => "Sep.",
-"Oct." => "Okt.",
-"Nov." => "Nov.",
-"Dec." => "Dez.",
-"All day" => "Ganztags",
-"Missing fields" => "fehlende Felder",
-"Title" => "Titel",
-"From Date" => "Startdatum",
-"From Time" => "Startzeit",
-"To Date" => "Enddatum",
-"To Time" => "Endzeit",
-"The event ends before it starts" => "Der Termin hört auf, bevor er angefangen hat.",
-"There was a database fail" => "Datenbankfehler",
-"Week" => "Woche",
-"Month" => "Monat",
-"List" => "Liste",
-"Today" => "Heute",
-"Settings" => "Einstellungen",
-"Your calendars" => "Deine Kalender",
-"CalDav Link" => "CalDAV-Link",
-"Shared calendars" => "Geteilte Kalender",
-"No shared calendars" => "Keine geteilten Kalender",
-"Share Calendar" => "Kalender teilen",
-"Download" => "Herunterladen",
-"Edit" => "Bearbeiten",
-"Delete" => "Löschen",
-"shared with you by" => "Geteilt mit dir von",
-"New calendar" => "Neuer Kalender",
-"Edit calendar" => "Kalender bearbeiten",
-"Displayname" => "Anzeigename",
-"Active" => "Aktiv",
-"Calendar color" => "Kalenderfarbe",
-"Save" => "Speichern",
-"Submit" => "Bestätigen",
-"Cancel" => "Abbrechen",
-"Edit an event" => "Ereignis bearbeiten",
-"Export" => "Exportieren",
-"Eventinfo" => "Termininfo",
-"Repeating" => "Wiederholen",
-"Alarm" => "Alarm",
-"Attendees" => "Teilnehmer",
-"Share" => "Teilen",
-"Title of the Event" => "Name",
-"Category" => "Kategorie",
-"Separate categories with commas" => "Kategorien mit Kommas trennen",
-"Edit categories" => "Kategorien ändern",
-"All Day Event" => "Ganztägiges Ereignis",
-"From" => "von",
-"To" => "bis",
-"Advanced options" => "Erweiterte Optionen",
-"Location" => "Ort",
-"Location of the Event" => "Ort",
-"Description" => "Beschreibung",
-"Description of the Event" => "Beschreibung",
-"Repeat" => "wiederholen",
-"Advanced" => "Erweitert",
-"Select weekdays" => "Wochentage auswählen",
-"Select days" => "Tage auswählen",
-"and the events day of year." => "und den Tag des Jahres vom Termin",
-"and the events day of month." => "und den Tag des Monats vom Termin",
-"Select months" => "Monate auswählen",
-"Select weeks" => "Wochen auswählen",
-"and the events week of year." => "und den Tag des Jahres vom Termin",
-"Interval" => "Intervall",
-"End" => "Ende",
-"occurrences" => "Termine",
-"create a new calendar" => "Neuen Kalender anlegen",
-"Import a calendar file" => "Kalenderdatei importieren",
-"Please choose a calendar" => "Wählen Sie bitte einen Kalender.",
-"Name of new calendar" => "Kalendername",
-"Take an available name!" => "Wählen Sie einen verfügbaren Namen.",
-"A Calendar with this name already exists. If you continue anyhow, these calendars will be merged." => "Ein Kalender mit diesem Namen existiert bereits. Sollten Sie fortfahren, werden die beiden Kalender zusammengeführt.",
-"Import" => "Importieren",
-"Importing calendar" => "Kalender wird importiert.",
-"Calendar imported successfully" => "Kalender erfolgreich importiert",
-"Close Dialog" => "Dialog schließen",
-"Create a new event" => "Neues Ereignis",
-"View an event" => "Termin öffnen",
-"No categories selected" => "Keine Kategorie ausgewählt",
-"Select category" => "Kategorie auswählen",
-"of" => "von",
-"at" => "um",
-"General" => "Allgemein",
-"Timezone" => "Zeitzone",
-"Update timezone automatically" => "Zeitzone automatisch aktualisieren",
-"Time format" => "Zeitformat",
-"24h" => "24 Stunden",
-"12h" => "12 Stunden",
-"Start week on" => "Erster Wochentag",
-"Cache" => "Zwischenspeicher",
-"Clear cache for repeating events" => "Lösche den Zwischenspeicher für wiederholende Veranstaltungen",
-"URLs" => "URLs",
-"Calendar CalDAV syncing addresses" => "CalDAV-Kalender gleicht Adressen ab",
-"more info" => "weitere Informationen",
-"Primary address (Kontact et al)" => "Primäre Adresse (Kontakt u.a.)",
-"iOS/OS X" => "iOS/OS X",
-"Read only iCalendar link(s)" => "Nur lesende(r) iCalender-Link(s)",
-"Users" => "Benutzer",
-"select users" => "Benutzer auswählen",
-"Editable" => "editierbar",
-"Groups" => "Gruppen",
-"select groups" => "Gruppen auswählen",
-"make public" => "Veröffentlichen"
-);
diff --git a/apps/calendar/l10n/el.php b/apps/calendar/l10n/el.php
deleted file mode 100644
index ad07d7b585..0000000000
--- a/apps/calendar/l10n/el.php
+++ /dev/null
@@ -1,192 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Not all calendars are completely cached" => "Δεν έχει δημιουργηθεί λανθάνουσα μνήμη για όλα τα ημερολόγια",
-"Everything seems to be completely cached" => "Όλα έχουν αποθηκευτεί στη cache",
-"No calendars found." => "Δε βρέθηκαν ημερολόγια.",
-"No events found." => "Δε βρέθηκαν γεγονότα.",
-"Wrong calendar" => "Λάθος ημερολόγιο",
-"The file contained either no events or all events are already saved in your calendar." => "Το αρχείο που περιέχει είτε κανένα γεγονός είτε όλα τα γεγονότα έχουν ήδη αποθηκευτεί στο ημερολόγιό σας.",
-"events has been saved in the new calendar" => "τα συμβάντα αποθηκεύτηκαν σε ένα νέο ημερολόγιο",
-"Import failed" => "Η εισαγωγή απέτυχε",
-"events has been saved in your calendar" => "το συμβάν αποθηκεύτηκε στο ημερολογιό σου",
-"New Timezone:" => "Νέα ζώνη ώρας:",
-"Timezone changed" => "Η ζώνη ώρας άλλαξε",
-"Invalid request" => "Μη έγκυρο αίτημα",
-"Calendar" => "Ημερολόγιο",
-"ddd" => "ddd",
-"ddd M/d" => "ddd M/d",
-"dddd M/d" => "dddd M/d",
-"MMMM yyyy" => "MMMM yyyy",
-"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
-"dddd, MMM d, yyyy" => "dddd, MMM d, yyyy",
-"Birthday" => "Γενέθλια",
-"Business" => "Επιχείρηση",
-"Call" => "Κλήση",
-"Clients" => "Πελάτες",
-"Deliverer" => "Προμηθευτής",
-"Holidays" => "Διακοπές",
-"Ideas" => "Ιδέες",
-"Journey" => "Ταξίδι",
-"Jubilee" => "Γιορτή",
-"Meeting" => "Συνάντηση",
-"Other" => "Άλλο",
-"Personal" => "Προσωπικό",
-"Projects" => "Έργα",
-"Questions" => "Ερωτήσεις",
-"Work" => "Εργασία",
-"by" => "από",
-"unnamed" => "ανώνυμο",
-"New Calendar" => "Νέα Ημερολόγιο",
-"Does not repeat" => "Μη επαναλαμβανόμενο",
-"Daily" => "Καθημερινά",
-"Weekly" => "Εβδομαδιαία",
-"Every Weekday" => "Κάθε μέρα",
-"Bi-Weekly" => "Δύο φορές την εβδομάδα",
-"Monthly" => "Μηνιαία",
-"Yearly" => "Ετήσια",
-"never" => "ποτέ",
-"by occurrences" => "κατά συχνότητα πρόσβασης",
-"by date" => "κατά ημερομηνία",
-"by monthday" => "κατά ημέρα",
-"by weekday" => "κατά εβδομάδα",
-"Monday" => "Δευτέρα",
-"Tuesday" => "Τρίτη",
-"Wednesday" => "Τετάρτη",
-"Thursday" => "Πέμπτη",
-"Friday" => "Παρασκευή",
-"Saturday" => "Σάββατο",
-"Sunday" => "Κυριακή",
-"events week of month" => "συμβάντα της εβδομάδας του μήνα",
-"first" => "πρώτο",
-"second" => "δεύτερο",
-"third" => "τρίτο",
-"fourth" => "τέταρτο",
-"fifth" => "πέμπτο",
-"last" => "τελευταίο",
-"January" => "Ιανουάριος",
-"February" => "Φεβρουάριος",
-"March" => "Μάρτιος",
-"April" => "Απρίλιος",
-"May" => "Μάϊος",
-"June" => "Ιούνιος",
-"July" => "Ιούλιος",
-"August" => "Αύγουστος",
-"September" => "Σεπτέμβριος",
-"October" => "Οκτώβριος",
-"November" => "Νοέμβριος",
-"December" => "Δεκέμβριος",
-"by events date" => "κατά ημερομηνία συμβάντων",
-"by yearday(s)" => "κατά ημέρα(ες) του έτους",
-"by weeknumber(s)" => "κατά εβδομάδα(ες)",
-"by day and month" => "κατά ημέρα και μήνα",
-"Date" => "Ημερομηνία",
-"Cal." => "Ημερ.",
-"Sun." => "Κυρ.",
-"Mon." => "Δευ.",
-"Tue." => "Τρί.",
-"Wed." => "Τετ.",
-"Thu." => "Πέμ.",
-"Fri." => "Παρ.",
-"Sat." => "Σάβ.",
-"Jan." => "Ιαν.",
-"Feb." => "Φεβ.",
-"Mar." => "Μάρ.",
-"Apr." => "Απρ.",
-"May." => "Μαΐ.",
-"Jun." => "Ιούν.",
-"Jul." => "Ιούλ.",
-"Aug." => "Αύγ.",
-"Sep." => "Σεπ.",
-"Oct." => "Οκτ.",
-"Nov." => "Νοέ.",
-"Dec." => "Δεκ.",
-"All day" => "Ολοήμερο",
-"Missing fields" => "Πεδία που λείπουν",
-"Title" => "Τίτλος",
-"From Date" => "Από Ημερομηνία",
-"From Time" => "Από Ώρα",
-"To Date" => "Έως Ημερομηνία",
-"To Time" => "Έως Ώρα",
-"The event ends before it starts" => "Το συμβάν ολοκληρώνεται πριν από την έναρξή του",
-"There was a database fail" => "Υπήρξε σφάλμα στη βάση δεδομένων",
-"Week" => "Εβδομάδα",
-"Month" => "Μήνας",
-"List" => "Λίστα",
-"Today" => "Σήμερα",
-"Your calendars" => "Τα ημερολόγια σου",
-"CalDav Link" => "Σύνδεση CalDAV",
-"Shared calendars" => "Κοινόχρηστα ημερολόγια",
-"No shared calendars" => "Δεν υπάρχουν κοινόχρηστα ημερολόγια",
-"Share Calendar" => "Διαμοίρασε ένα ημερολόγιο",
-"Download" => "Λήψη",
-"Edit" => "Επεξεργασία",
-"Delete" => "Διαγραφή",
-"shared with you by" => "μοιράστηκε μαζί σας από ",
-"New calendar" => "Νέο ημερολόγιο",
-"Edit calendar" => "Επεξεργασία ημερολογίου",
-"Displayname" => "Προβολή ονόματος",
-"Active" => "Ενεργό",
-"Calendar color" => "Χρώμα ημερολογίου",
-"Save" => "Αποθήκευση",
-"Submit" => "Υποβολή",
-"Cancel" => "Ακύρωση",
-"Edit an event" => "Επεξεργασία ενός γεγονότος",
-"Export" => "Εξαγωγή",
-"Eventinfo" => "Πληροφορίες γεγονότος",
-"Repeating" => "Επαναλαμβανόμενο",
-"Alarm" => "Ειδοποίηση",
-"Attendees" => "Συμμετέχοντες",
-"Share" => "Διαμοίρασε",
-"Title of the Event" => "Τίτλος συμβάντος",
-"Category" => "Κατηγορία",
-"Separate categories with commas" => "Διαχώρισε τις κατηγορίες με κόμμα",
-"Edit categories" => "Επεξεργασία κατηγοριών",
-"All Day Event" => "Ολοήμερο συμβάν",
-"From" => "Από",
-"To" => "Έως",
-"Advanced options" => "Επιλογές για προχωρημένους",
-"Location" => "Τοποθεσία",
-"Location of the Event" => "Τοποθεσία συμβάντος",
-"Description" => "Περιγραφή",
-"Description of the Event" => "Περιγραφή του συμβάντος",
-"Repeat" => "Επαναλαμβανόμενο",
-"Advanced" => "Για προχωρημένους",
-"Select weekdays" => "Επιλογή ημερών εβδομάδας",
-"Select days" => "Επιλογή ημερών",
-"and the events day of year." => "και των ημερών του χρόνου που υπάρχουν συμβάντα.",
-"and the events day of month." => "και των ημερών του μήνα που υπάρχουν συμβάντα.",
-"Select months" => "Επιλογή μηνών",
-"Select weeks" => "Επιλογή εβδομάδων",
-"and the events week of year." => "και των εβδομάδων του χρόνου που υπάρουν συμβάντα.",
-"Interval" => "Διάστημα",
-"End" => "Τέλος",
-"occurrences" => "περιστατικά",
-"create a new calendar" => "δημιουργία νέου ημερολογίου",
-"Import a calendar file" => "Εισαγωγή αρχείου ημερολογίου",
-"Please choose a calendar" => "Παρακαλώ επέλεξε ένα ημερολόγιο",
-"Name of new calendar" => "Όνομα νέου ημερολογίου",
-"Take an available name!" => "Επέλεξε ένα διαθέσιμο όνομα!",
-"A Calendar with this name already exists. If you continue anyhow, these calendars will be merged." => "Ένα ημερολόγιο με αυτό το όνομα υπάρχει ήδη. Εάν θέλετε να συνεχίσετε, αυτά τα 2 ημερολόγια θα συγχωνευθούν.",
-"Import" => "Εισαγωγή",
-"Close Dialog" => "Κλείσιμο Διαλόγου",
-"Create a new event" => "Δημιουργήστε ένα νέο συμβάν",
-"View an event" => "Εμφάνισε ένα γεγονός",
-"No categories selected" => "Δεν επελέγησαν  κατηγορίες",
-"of" => "του",
-"at" => "στο",
-"Timezone" => "Ζώνη ώρας",
-"24h" => "24ω",
-"12h" => "12ω",
-"Cache" => "Cache",
-"Clear cache for repeating events" => "Εκκαθάριση λανθάνουσας μνήμης για επανάληψη γεγονότων",
-"Calendar CalDAV syncing addresses" => "Διευθύνσεις συγχρονισμού ημερολογίου CalDAV",
-"more info" => "περισσότερες πλροφορίες",
-"Primary address (Kontact et al)" => "Κύρια Διεύθυνση(Επαφή και άλλα)",
-"iOS/OS X" => "iOS/OS X",
-"Read only iCalendar link(s)" => " iCalendar link(s) μόνο για ανάγνωση",
-"Users" => "Χρήστες",
-"select users" => "επέλεξε χρήστες",
-"Editable" => "Επεξεργάσιμο",
-"Groups" => "Ομάδες",
-"select groups" => "Επέλεξε ομάδες",
-"make public" => "κάνε το δημόσιο"
-);
diff --git a/apps/calendar/l10n/eo.php b/apps/calendar/l10n/eo.php
deleted file mode 100644
index be3db9bfae..0000000000
--- a/apps/calendar/l10n/eo.php
+++ /dev/null
@@ -1,198 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Not all calendars are completely cached" => "Ne ĉiuj kalendaroj estas tute kaŝmemorigitaj",
-"Everything seems to be completely cached" => "Ĉio ŝajnas tute kaŝmemorigita",
-"No calendars found." => "Neniu kalendaro troviĝis.",
-"No events found." => "Neniu okazaĵo troviĝis.",
-"Wrong calendar" => "Malĝusta kalendaro",
-"The file contained either no events or all events are already saved in your calendar." => "Aŭ la dosiero enhavas neniun okazaĵon aŭ ĉiuj okazaĵoj jam estas konservitaj en via kalendaro.",
-"events has been saved in the new calendar" => "okazaĵoj estas konservitaj en la nova kalendaro",
-"Import failed" => "Enporto malsukcesis",
-"events has been saved in your calendar" => "okazaĵoj estas konservitaj en via kalendaro",
-"New Timezone:" => "Nova horozono:",
-"Timezone changed" => "La horozono estas ŝanĝita",
-"Invalid request" => "Nevalida peto",
-"Calendar" => "Kalendaro",
-"ddd" => "ddd",
-"ddd M/d" => "ddd d/M",
-"dddd M/d" => "dddd d/M",
-"MMMM yyyy" => "MMMM yyyy",
-"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "d MMM[ yyyy]{ '&#8212;'d[ MMM] yyyy}",
-"dddd, MMM d, yyyy" => "dddd, d-a de MMM yyyy",
-"Birthday" => "Naskiĝotago",
-"Business" => "Negoco",
-"Call" => "Voko",
-"Clients" => "Klientoj",
-"Deliverer" => "Livero",
-"Holidays" => "Ferioj",
-"Ideas" => "Ideoj",
-"Journey" => "Vojaĝo",
-"Jubilee" => "Jubileo",
-"Meeting" => "Rendevuo",
-"Other" => "Alia",
-"Personal" => "Persona",
-"Projects" => "Projektoj",
-"Questions" => "Demandoj",
-"Work" => "Laboro",
-"by" => "de",
-"unnamed" => "nenomita",
-"New Calendar" => "Nova kalendaro",
-"Does not repeat" => "Ĉi tio ne ripetiĝas",
-"Daily" => "Tage",
-"Weekly" => "Semajne",
-"Every Weekday" => "Labortage",
-"Bi-Weekly" => "Semajnduope",
-"Monthly" => "Monate",
-"Yearly" => "Jare",
-"never" => "neniam",
-"by occurrences" => "laŭ aperoj",
-"by date" => "laŭ dato",
-"by monthday" => "laŭ monattago",
-"by weekday" => "laŭ semajntago",
-"Monday" => "lundo",
-"Tuesday" => "mardo",
-"Wednesday" => "merkredo",
-"Thursday" => "ĵaŭdo",
-"Friday" => "vendredo",
-"Saturday" => "sabato",
-"Sunday" => "dimanĉo",
-"events week of month" => "la monatsemajno de la okazaĵo",
-"first" => "unua",
-"second" => "dua",
-"third" => "tria",
-"fourth" => "kvara",
-"fifth" => "kvina",
-"last" => "lasta",
-"January" => "Januaro",
-"February" => "Februaro",
-"March" => "Marto",
-"April" => "Aprilo",
-"May" => "Majo",
-"June" => "Junio",
-"July" => "Julio",
-"August" => "Aŭgusto",
-"September" => "Septembro",
-"October" => "Oktobro",
-"November" => "Novembro",
-"December" => "Decembro",
-"by events date" => "laŭ okazaĵdato",
-"by yearday(s)" => "laŭ jartago(j)",
-"by weeknumber(s)" => "laŭ semajnnumero(j)",
-"by day and month" => "laŭ tago kaj monato",
-"Date" => "Dato",
-"Cal." => "Kal.",
-"Sun." => "dim.",
-"Mon." => "lun.",
-"Tue." => "mar.",
-"Wed." => "mer.",
-"Thu." => "ĵaŭ.",
-"Fri." => "ven.",
-"Sat." => "sab.",
-"Jan." => "Jan.",
-"Feb." => "Feb.",
-"Mar." => "Mar.",
-"Apr." => "Apr.",
-"May." => "Maj.",
-"Jun." => "Jun.",
-"Jul." => "Jul.",
-"Aug." => "Aŭg.",
-"Sep." => "Sep.",
-"Oct." => "Okt.",
-"Nov." => "Nov.",
-"Dec." => "Dec.",
-"All day" => "La tuta tago",
-"Missing fields" => "Mankas iuj kampoj",
-"Title" => "Titolo",
-"From Date" => "ekde la dato",
-"From Time" => "ekde la horo",
-"To Date" => "ĝis la dato",
-"To Time" => "ĝis la horo",
-"The event ends before it starts" => "La okazaĵo finas antaŭ komenci",
-"There was a database fail" => "Datumbaza malsukceso okazis",
-"Week" => "Semajno",
-"Month" => "Monato",
-"List" => "Listo",
-"Today" => "Hodiaŭ",
-"Settings" => "Agordo",
-"Your calendars" => "Viaj kalendaroj",
-"CalDav Link" => "CalDav-a ligilo",
-"Shared calendars" => "Kunhavigitaj kalendaroj",
-"No shared calendars" => "Neniu kunhavigita kalendaro",
-"Share Calendar" => "Kunhavigi kalendaron",
-"Download" => "Elŝuti",
-"Edit" => "Redakti",
-"Delete" => "Forigi",
-"shared with you by" => "kunhavigita kun vi fare de",
-"New calendar" => "Nova kalendaro",
-"Edit calendar" => "Redakti la kalendaron",
-"Displayname" => "Montrota nomo",
-"Active" => "Aktiva",
-"Calendar color" => "Kalendarokoloro",
-"Save" => "Konservi",
-"Submit" => "Sendi",
-"Cancel" => "Nuligi",
-"Edit an event" => "Redakti okazaĵon",
-"Export" => "Elporti",
-"Eventinfo" => "Informo de okazaĵo",
-"Repeating" => "Ripetata",
-"Alarm" => "Alarmo",
-"Attendees" => "Ĉeestontoj",
-"Share" => "Kunhavigi",
-"Title of the Event" => "Okazaĵotitolo",
-"Category" => "Kategorio",
-"Separate categories with commas" => "Disigi kategoriojn per komoj",
-"Edit categories" => "Redakti kategoriojn",
-"All Day Event" => "La tuta tago",
-"From" => "Ekde",
-"To" => "Ĝis",
-"Advanced options" => "Altnivela agordo",
-"Location" => "Loko",
-"Location of the Event" => "Loko de okazaĵo",
-"Description" => "Priskribo",
-"Description of the Event" => "Okazaĵopriskribo",
-"Repeat" => "Ripeti",
-"Advanced" => "Altnivelo",
-"Select weekdays" => "Elekti semajntagojn",
-"Select days" => "Elekti tagojn",
-"and the events day of year." => "kaj la jartago de la okazaĵo.",
-"and the events day of month." => "kaj la monattago de la okazaĵo.",
-"Select months" => "Elekti monatojn",
-"Select weeks" => "Elekti semajnojn",
-"and the events week of year." => "kaj la jarsemajno de la okazaĵo.",
-"Interval" => "Intervalo",
-"End" => "Fino",
-"occurrences" => "aperoj",
-"create a new calendar" => "Krei novan kalendaron",
-"Import a calendar file" => "Enporti kalendarodosieron",
-"Please choose a calendar" => "Bonvolu elekti kalendaron",
-"Name of new calendar" => "Nomo de la nova kalendaro",
-"Take an available name!" => "Prenu haveblan nomon!",
-"A Calendar with this name already exists. If you continue anyhow, these calendars will be merged." => "Kalendaro kun ĉi tiu nomo jam ekzastas. Se vi malgraŭe daŭros, ĉi tiuj kalendaroj kunfandiĝos.",
-"Import" => "Enporti",
-"Close Dialog" => "Fermi la dialogon",
-"Create a new event" => "Krei okazaĵon",
-"View an event" => "Vidi okazaĵon",
-"No categories selected" => "Neniu kategorio elektita",
-"of" => "de",
-"at" => "ĉe",
-"General" => "Ĝenerala",
-"Timezone" => "Horozono",
-"Update timezone automatically" => "Aŭtomate ĝisdatigi la horozonon",
-"Time format" => "Horoformo",
-"24h" => "24h",
-"12h" => "12h",
-"Start week on" => "Komenci semajnon je",
-"Cache" => "Kaŝmemoro",
-"Clear cache for repeating events" => "Forviŝi kaŝmemoron por ripeto de okazaĵoj",
-"URLs" => "URL-oj",
-"Calendar CalDAV syncing addresses" => "sinkronigaj adresoj por CalDAV-kalendaroj",
-"more info" => "pli da informo",
-"Primary address (Kontact et al)" => "Ĉefa adreso (Kontact kaj aliaj)",
-"iOS/OS X" => "iOS/OS X",
-"Read only iCalendar link(s)" => "Nurlegebla(j) iCalendar-ligilo(j)",
-"Users" => "Uzantoj",
-"select users" => "elekti uzantojn",
-"Editable" => "Redaktebla",
-"Groups" => "Grupoj",
-"select groups" => "elekti grupojn",
-"make public" => "publikigi"
-);
diff --git a/apps/calendar/l10n/es.php b/apps/calendar/l10n/es.php
deleted file mode 100644
index 3ebcd2e943..0000000000
--- a/apps/calendar/l10n/es.php
+++ /dev/null
@@ -1,192 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Not all calendars are completely cached" => "Aún no se han guardado en caché todos los calendarios",
-"Everything seems to be completely cached" => "Parece que se ha guardado todo en caché",
-"No calendars found." => "No se encontraron calendarios.",
-"No events found." => "No se encontraron eventos.",
-"Wrong calendar" => "Calendario incorrecto",
-"The file contained either no events or all events are already saved in your calendar." => "El archivo no contiene eventos o ya existen en tu calendario.",
-"events has been saved in the new calendar" => "Los eventos han sido guardados en el nuevo calendario",
-"Import failed" => "Fallo en la importación",
-"events has been saved in your calendar" => "eventos se han guardado en tu calendario",
-"New Timezone:" => "Nueva zona horaria:",
-"Timezone changed" => "Zona horaria cambiada",
-"Invalid request" => "Petición no válida",
-"Calendar" => "Calendario",
-"ddd" => "ddd",
-"ddd M/d" => "ddd M/d",
-"dddd M/d" => "dddd M/d",
-"MMMM yyyy" => "MMMM yyyy",
-"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
-"dddd, MMM d, yyyy" => "dddd, MMM d, yyyy",
-"Birthday" => "Cumpleaños",
-"Business" => "Negocios",
-"Call" => "Llamada",
-"Clients" => "Clientes",
-"Deliverer" => "Entrega",
-"Holidays" => "Festivos",
-"Ideas" => "Ideas",
-"Journey" => "Viaje",
-"Jubilee" => "Aniversario",
-"Meeting" => "Reunión",
-"Other" => "Otro",
-"Personal" => "Personal",
-"Projects" => "Proyectos",
-"Questions" => "Preguntas",
-"Work" => "Trabajo",
-"by" => "por",
-"unnamed" => "Sin nombre",
-"New Calendar" => "Nuevo calendario",
-"Does not repeat" => "No se repite",
-"Daily" => "Diariamente",
-"Weekly" => "Semanalmente",
-"Every Weekday" => "Días de semana laboral",
-"Bi-Weekly" => "Cada 2 semanas",
-"Monthly" => "Mensualmente",
-"Yearly" => "Anualmente",
-"never" => "nunca",
-"by occurrences" => "por ocurrencias",
-"by date" => "por fecha",
-"by monthday" => "por día del mes",
-"by weekday" => "por día de la semana",
-"Monday" => "Lunes",
-"Tuesday" => "Martes",
-"Wednesday" => "Miércoles",
-"Thursday" => "Jueves",
-"Friday" => "Viernes",
-"Saturday" => "Sábado",
-"Sunday" => "Domingo",
-"events week of month" => "eventos de la semana del mes",
-"first" => "primer",
-"second" => "segundo",
-"third" => "tercer",
-"fourth" => "cuarto",
-"fifth" => "quinto",
-"last" => "último",
-"January" => "Enero",
-"February" => "Febrero",
-"March" => "Marzo",
-"April" => "Abril",
-"May" => "Mayo",
-"June" => "Junio",
-"July" => "Julio",
-"August" => "Agosto",
-"September" => "Septiembre",
-"October" => "Octubre",
-"November" => "Noviembre",
-"December" => "Diciembre",
-"by events date" => "por fecha de los eventos",
-"by yearday(s)" => "por día(s) del año",
-"by weeknumber(s)" => "por número(s) de semana",
-"by day and month" => "por día y mes",
-"Date" => "Fecha",
-"Cal." => "Cal.",
-"Sun." => "Dom.",
-"Mon." => "Lun.",
-"Tue." => "Mar.",
-"Wed." => "Mier.",
-"Thu." => "Jue.",
-"Fri." => "Vie.",
-"Sat." => "Sab.",
-"Jan." => "Ene.",
-"Feb." => "Feb.",
-"Mar." => "Mar.",
-"Apr." => "Abr.",
-"May." => "May.",
-"Jun." => "Jun.",
-"Jul." => "Jul.",
-"Aug." => "Ago.",
-"Sep." => "Sep.",
-"Oct." => "Oct.",
-"Nov." => "Nov.",
-"Dec." => "Dic.",
-"All day" => "Todo el día",
-"Missing fields" => "Los campos que faltan",
-"Title" => "Título",
-"From Date" => "Desde la fecha",
-"From Time" => "Desde la hora",
-"To Date" => "Hasta la fecha",
-"To Time" => "Hasta la hora",
-"The event ends before it starts" => "El evento termina antes de que comience",
-"There was a database fail" => "Se ha producido un error en la base de datos",
-"Week" => "Semana",
-"Month" => "Mes",
-"List" => "Lista",
-"Today" => "Hoy",
-"Your calendars" => "Tus calendarios",
-"CalDav Link" => "Enlace a CalDav",
-"Shared calendars" => "Calendarios compartidos",
-"No shared calendars" => "Calendarios no compartidos",
-"Share Calendar" => "Compartir calendario",
-"Download" => "Descargar",
-"Edit" => "Editar",
-"Delete" => "Eliminar",
-"shared with you by" => "compartido contigo por",
-"New calendar" => "Nuevo calendario",
-"Edit calendar" => "Editar calendario",
-"Displayname" => "Nombre",
-"Active" => "Activo",
-"Calendar color" => "Color del calendario",
-"Save" => "Guardar",
-"Submit" => "Guardar",
-"Cancel" => "Cancelar",
-"Edit an event" => "Editar un evento",
-"Export" => "Exportar",
-"Eventinfo" => "Información del evento",
-"Repeating" => "Repetición",
-"Alarm" => "Alarma",
-"Attendees" => "Asistentes",
-"Share" => "Compartir",
-"Title of the Event" => "Título del evento",
-"Category" => "Categoría",
-"Separate categories with commas" => "Separar categorías con comas",
-"Edit categories" => "Editar categorías",
-"All Day Event" => "Todo el día",
-"From" => "Desde",
-"To" => "Hasta",
-"Advanced options" => "Opciones avanzadas",
-"Location" => "Lugar",
-"Location of the Event" => "Lugar del evento",
-"Description" => "Descripción",
-"Description of the Event" => "Descripción del evento",
-"Repeat" => "Repetir",
-"Advanced" => "Avanzado",
-"Select weekdays" => "Seleccionar días de la semana",
-"Select days" => "Seleccionar días",
-"and the events day of year." => "y el día del año de los eventos.",
-"and the events day of month." => "y el día del mes de los eventos.",
-"Select months" => "Seleccionar meses",
-"Select weeks" => "Seleccionar semanas",
-"and the events week of year." => "y la semana del año de los eventos.",
-"Interval" => "Intervalo",
-"End" => "Fin",
-"occurrences" => "ocurrencias",
-"create a new calendar" => "Crear un nuevo calendario",
-"Import a calendar file" => "Importar un archivo de calendario",
-"Please choose a calendar" => "Por favor, escoge un calendario",
-"Name of new calendar" => "Nombre del nuevo calendario",
-"Take an available name!" => "¡Elige un nombre disponible!",
-"A Calendar with this name already exists. If you continue anyhow, these calendars will be merged." => "Ya existe un calendario con este nombre. Si continúas, se combinarán los calendarios.",
-"Import" => "Importar",
-"Close Dialog" => "Cerrar diálogo",
-"Create a new event" => "Crear un nuevo evento",
-"View an event" => "Ver un evento",
-"No categories selected" => "Ninguna categoría seleccionada",
-"of" => "de",
-"at" => "a las",
-"Timezone" => "Zona horaria",
-"24h" => "24h",
-"12h" => "12h",
-"Cache" => "Caché",
-"Clear cache for repeating events" => "Limpiar caché de eventos recurrentes",
-"Calendar CalDAV syncing addresses" => "Direcciones de sincronización de calendario CalDAV:",
-"more info" => "Más información",
-"Primary address (Kontact et al)" => "Dirección principal (Kontact y otros)",
-"iOS/OS X" => "iOS/OS X",
-"Read only iCalendar link(s)" => "Enlace(s) iCalendar de sólo lectura",
-"Users" => "Usuarios",
-"select users" => "seleccionar usuarios",
-"Editable" => "Editable",
-"Groups" => "Grupos",
-"select groups" => "seleccionar grupos",
-"make public" => "hacerlo público"
-);
diff --git a/apps/calendar/l10n/et_EE.php b/apps/calendar/l10n/et_EE.php
deleted file mode 100644
index 59f494f8ab..0000000000
--- a/apps/calendar/l10n/et_EE.php
+++ /dev/null
@@ -1,156 +0,0 @@
-<?php $TRANSLATIONS = array(
-"No calendars found." => "Kalendreid ei leitud.",
-"No events found." => "Üritusi ei leitud.",
-"Wrong calendar" => "Vale kalender",
-"New Timezone:" => "Uus ajavöönd:",
-"Timezone changed" => "Ajavöönd on muudetud",
-"Invalid request" => "Vigane päring",
-"Calendar" => "Kalender",
-"ddd" => "ddd",
-"ddd M/d" => "ddd M/d",
-"dddd M/d" => "dddd M/d",
-"MMMM yyyy" => "MMMM yyyy",
-"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
-"dddd, MMM d, yyyy" => "dddd, MMM d, yyyy",
-"Birthday" => "Sünnipäev",
-"Business" => "Äri",
-"Call" => "Helista",
-"Clients" => "Kliendid",
-"Deliverer" => "Kohaletoimetaja",
-"Holidays" => "Pühad",
-"Ideas" => "Ideed",
-"Journey" => "Reis",
-"Jubilee" => "Juubel",
-"Meeting" => "Kohtumine",
-"Other" => "Muu",
-"Personal" => "Isiklik",
-"Projects" => "Projektid",
-"Questions" => "Küsimused",
-"Work" => "Töö",
-"unnamed" => "nimetu",
-"New Calendar" => "Uus kalender",
-"Does not repeat" => "Ei kordu",
-"Daily" => "Iga päev",
-"Weekly" => "Iga nädal",
-"Every Weekday" => "Igal nädalapäeval",
-"Bi-Weekly" => "Üle nädala",
-"Monthly" => "Igal kuul",
-"Yearly" => "Igal aastal",
-"never" => "mitte kunagi",
-"by occurrences" => "toimumiskordade järgi",
-"by date" => "kuupäeva järgi",
-"by monthday" => "kuu päeva järgi",
-"by weekday" => "nädalapäeva järgi",
-"Monday" => "Esmaspäev",
-"Tuesday" => "Teisipäev",
-"Wednesday" => "Kolmapäev",
-"Thursday" => "Neljapäev",
-"Friday" => "Reede",
-"Saturday" => "Laupäev",
-"Sunday" => "Pühapäev",
-"events week of month" => "ürituse kuu nädal",
-"first" => "esimene",
-"second" => "teine",
-"third" => "kolmas",
-"fourth" => "neljas",
-"fifth" => "viies",
-"last" => "viimane",
-"January" => "Jaanuar",
-"February" => "Veebruar",
-"March" => "Märts",
-"April" => "Aprill",
-"May" => "Mai",
-"June" => "Juuni",
-"July" => "Juuli",
-"August" => "August",
-"September" => "September",
-"October" => "Oktoober",
-"November" => "November",
-"December" => "Detsember",
-"by events date" => "ürituste kuupäeva järgi",
-"by yearday(s)" => "aasta päeva(de) järgi",
-"by weeknumber(s)" => "nädala numbri(te) järgi",
-"by day and month" => "kuu ja päeva järgi",
-"Date" => "Kuupäev",
-"Cal." => "Kal.",
-"All day" => "Kogu päev",
-"Missing fields" => "Puuduvad väljad",
-"Title" => "Pealkiri",
-"From Date" => "Alates kuupäevast",
-"From Time" => "Alates kellaajast",
-"To Date" => "Kuni kuupäevani",
-"To Time" => "Kuni kellaajani",
-"The event ends before it starts" => "Üritus lõpeb enne, kui see algab",
-"There was a database fail" => "Tekkis andmebaasi viga",
-"Week" => "Nädal",
-"Month" => "Kuu",
-"List" => "Nimekiri",
-"Today" => "Täna",
-"Your calendars" => "Sinu kalendrid",
-"CalDav Link" => "CalDav Link",
-"Shared calendars" => "Jagatud kalendrid",
-"No shared calendars" => "Jagatud kalendreid pole",
-"Share Calendar" => "Jaga kalendrit",
-"Download" => "Lae alla",
-"Edit" => "Muuda",
-"Delete" => "Kustuta",
-"shared with you by" => "jagas sinuga",
-"New calendar" => "Uus kalender",
-"Edit calendar" => "Muuda kalendrit",
-"Displayname" => "Näidatav nimi",
-"Active" => "Aktiivne",
-"Calendar color" => "Kalendri värv",
-"Save" => "Salvesta",
-"Submit" => "OK",
-"Cancel" => "Loobu",
-"Edit an event" => "Muuda sündmust",
-"Export" => "Ekspordi",
-"Eventinfo" => "Ürituse info",
-"Repeating" => "Kordamine",
-"Alarm" => "Alarm",
-"Attendees" => "Osalejad",
-"Share" => "Jaga",
-"Title of the Event" => "Sündmuse pealkiri",
-"Category" => "Kategooria",
-"Separate categories with commas" => "Eralda kategooriad komadega",
-"Edit categories" => "Muuda kategooriaid",
-"All Day Event" => "Kogu päeva sündmus",
-"From" => "Alates",
-"To" => "Kuni",
-"Advanced options" => "Lisavalikud",
-"Location" => "Asukoht",
-"Location of the Event" => "Sündmuse toimumiskoht",
-"Description" => "Kirjeldus",
-"Description of the Event" => "Sündmuse kirjeldus",
-"Repeat" => "Korda",
-"Advanced" => "Täpsem",
-"Select weekdays" => "Vali nädalapäevad",
-"Select days" => "Vali päevad",
-"and the events day of year." => "ja ürituse päev aastas.",
-"and the events day of month." => "ja ürituse päev kuus.",
-"Select months" => "Vali kuud",
-"Select weeks" => "Vali nädalad",
-"and the events week of year." => "ja ürituse nädal aastas.",
-"Interval" => "Intervall",
-"End" => "Lõpp",
-"occurrences" => "toimumiskordi",
-"create a new calendar" => "loo uus kalender",
-"Import a calendar file" => "Impordi kalendrifail",
-"Name of new calendar" => "Uue kalendri nimi",
-"Import" => "Impordi",
-"Close Dialog" => "Sulge dialoogiaken",
-"Create a new event" => "Loo sündmus",
-"View an event" => "Vaata üritust",
-"No categories selected" => "Ühtegi kategooriat pole valitud",
-"of" => "/",
-"at" => "kell",
-"Timezone" => "Ajavöönd",
-"24h" => "24h",
-"12h" => "12h",
-"Users" => "Kasutajad",
-"select users" => "valitud kasutajad",
-"Editable" => "Muudetav",
-"Groups" => "Grupid",
-"select groups" => "valitud grupid",
-"make public" => "tee avalikuks"
-);
diff --git a/apps/calendar/l10n/eu.php b/apps/calendar/l10n/eu.php
deleted file mode 100644
index 5ebce09c58..0000000000
--- a/apps/calendar/l10n/eu.php
+++ /dev/null
@@ -1,183 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Not all calendars are completely cached" => "Egutegi guztiak ez daude guztiz cacheatuta",
-"Everything seems to be completely cached" => "Dena guztiz cacheatuta dagoela dirudi",
-"No calendars found." => "Ez da egutegirik aurkitu.",
-"No events found." => "Ez da gertaerarik aurkitu.",
-"Wrong calendar" => "Egutegi okerra",
-"The file contained either no events or all events are already saved in your calendar." => "Fitxategiak ez zuen gertaerarik edo gertaera guztiak dagoeneko egutegian gordeta zeuden.",
-"events has been saved in the new calendar" => "gertaerak egutegi berrian gorde dira",
-"Import failed" => "Inportazioak huts egin du",
-"events has been saved in your calendar" => "gertaerak zure egutegian gorde dira",
-"New Timezone:" => "Ordu-zonalde berria",
-"Timezone changed" => "Ordu-zonaldea aldatuta",
-"Invalid request" => "Baliogabeko eskaera",
-"Calendar" => "Egutegia",
-"MMMM yyyy" => "yyyy MMMM",
-"Birthday" => "Jaioteguna",
-"Business" => "Negozioa",
-"Call" => "Deia",
-"Clients" => "Bezeroak",
-"Deliverer" => "Banatzailea",
-"Holidays" => "Oporrak",
-"Ideas" => "Ideiak",
-"Journey" => "Bidaia",
-"Jubilee" => "Urteurrena",
-"Meeting" => "Bilera",
-"Other" => "Bestelakoa",
-"Personal" => "Pertsonala",
-"Projects" => "Proiektuak",
-"Questions" => "Galderak",
-"Work" => "Lana",
-"unnamed" => "izengabea",
-"New Calendar" => "Egutegi berria",
-"Does not repeat" => "Ez da errepikatzen",
-"Daily" => "Egunero",
-"Weekly" => "Astero",
-"Every Weekday" => "Asteko egun guztietan",
-"Bi-Weekly" => "Bi-Astero",
-"Monthly" => "Hilabetero",
-"Yearly" => "Urtero",
-"never" => "inoiz",
-"by occurrences" => "errepikapen kopuruagatik",
-"by date" => "dataren arabera",
-"by monthday" => "hileko egunaren arabera",
-"by weekday" => "asteko egunaren arabera",
-"Monday" => "Astelehena",
-"Tuesday" => "Asteartea",
-"Wednesday" => "Asteazkena",
-"Thursday" => "Osteguna",
-"Friday" => "Ostirala",
-"Saturday" => "Larunbata",
-"Sunday" => "Igandea",
-"events week of month" => "gertaeraren hilabeteko astea",
-"first" => "lehenengoa",
-"second" => "bigarrean",
-"third" => "hirugarrena",
-"fourth" => "laugarrena",
-"fifth" => "bostgarrena",
-"last" => "azkena",
-"January" => "Urtarrila",
-"February" => "Otsaila",
-"March" => "Martxoa",
-"April" => "Apirila",
-"May" => "Maiatza",
-"June" => "Ekaina",
-"July" => "Uztaila",
-"August" => "Abuztua",
-"September" => "Iraila",
-"October" => "Urria",
-"November" => "Azaroa",
-"December" => "Abendua",
-"by events date" => "gertaeren dataren arabera",
-"by yearday(s)" => "urteko egunaren arabera",
-"by weeknumber(s)" => "aste zenbaki(ar)en arabera",
-"by day and month" => "eguna eta hilabetearen arabera",
-"Date" => "Data",
-"Cal." => "Eg.",
-"Sun." => "ig.",
-"Mon." => "al.",
-"Tue." => "ar.",
-"Wed." => "az.",
-"Thu." => "og.",
-"Fri." => "ol.",
-"Sat." => "lr.",
-"Jan." => "urt.",
-"Feb." => "ots.",
-"Mar." => "mar.",
-"Apr." => "api.",
-"May." => "mai.",
-"Jun." => "eka.",
-"Jul." => "uzt.",
-"Aug." => "abu.",
-"Sep." => "ira.",
-"Oct." => "urr.",
-"Nov." => "aza.",
-"Dec." => "abe.",
-"All day" => "Egun guztia",
-"Missing fields" => "Eremuak faltan",
-"Title" => "Izenburua",
-"From Date" => "Hasierako Data",
-"From Time" => "Hasierako Ordua",
-"To Date" => "Bukaerako Data",
-"To Time" => "Bukaerako Ordua",
-"The event ends before it starts" => "Gertaera hasi baino lehen bukatzen da",
-"There was a database fail" => "Datu-baseak huts egin du",
-"Week" => "Astea",
-"Month" => "Hilabetea",
-"List" => "Zerrenda",
-"Today" => "Gaur",
-"Your calendars" => "Zure egutegiak",
-"CalDav Link" => "CalDav lotura",
-"Shared calendars" => "Elkarbanatutako egutegiak",
-"No shared calendars" => "Ez dago elkarbanatutako egutegirik",
-"Share Calendar" => "Elkarbanatu egutegia",
-"Download" => "Deskargatu",
-"Edit" => "Editatu",
-"Delete" => "Ezabatu",
-"shared with you by" => "honek zurekin elkarbanatu du",
-"New calendar" => "Egutegi berria",
-"Edit calendar" => "Editatu egutegia",
-"Displayname" => "Bistaratzeko izena",
-"Active" => "Aktiboa",
-"Calendar color" => "Egutegiaren kolorea",
-"Save" => "Gorde",
-"Submit" => "Bidali",
-"Cancel" => "Ezeztatu",
-"Edit an event" => "Editatu gertaera",
-"Export" => "Exportatu",
-"Eventinfo" => "Gertaeraren informazioa",
-"Repeating" => "Errepikapena",
-"Alarm" => "Alarma",
-"Attendees" => "Partaideak",
-"Share" => "Elkarbanatu",
-"Title of the Event" => "Gertaeraren izenburua",
-"Category" => "Kategoria",
-"Separate categories with commas" => "Banatu kategoriak komekin",
-"Edit categories" => "Editatu kategoriak",
-"All Day Event" => "Egun osoko gertaera",
-"From" => "Hasiera",
-"To" => "Bukaera",
-"Advanced options" => "Aukera aurreratuak",
-"Location" => "Kokalekua",
-"Location of the Event" => "Gertaeraren kokalekua",
-"Description" => "Deskribapena",
-"Description of the Event" => "Gertaeraren deskribapena",
-"Repeat" => "Errepikatu",
-"Advanced" => "Aurreratua",
-"Select weekdays" => "Hautatu asteko egunak",
-"Select days" => "Hautatu egunak",
-"and the events day of year." => "eta gertaeraren urteko eguna.",
-"and the events day of month." => "eta gertaeraren hilabeteko eguna.",
-"Select months" => "Hautatu hilabeteak",
-"Select weeks" => "Hautatu asteak",
-"and the events week of year." => "eta gertaeraren urteko astea.",
-"Interval" => "Tartea",
-"End" => "Amaiera",
-"occurrences" => "errepikapenak",
-"create a new calendar" => "sortu egutegi berria",
-"Import a calendar file" => "Inportatu egutegi fitxategi bat",
-"Please choose a calendar" => "Mesedez aukeratu egutegi bat.",
-"Name of new calendar" => "Egutegi berriaren izena",
-"Take an available name!" => "Hartu eskuragarri dagoen izen bat!",
-"A Calendar with this name already exists. If you continue anyhow, these calendars will be merged." => "Izen hau duen egutegi bat dagoeneko existitzen da. Hala ere jarraitzen baduzu, egutegi hauek elkartuko dira.",
-"Import" => "Importatu",
-"Close Dialog" => "Itxi lehioa",
-"Create a new event" => "Sortu gertaera berria",
-"View an event" => "Ikusi gertaera bat",
-"No categories selected" => "Ez da kategoriarik hautatu",
-"Timezone" => "Ordu-zonaldea",
-"24h" => "24h",
-"12h" => "12h",
-"Cache" => "Cache",
-"Clear cache for repeating events" => "Ezabatu gertaera errepikakorren cachea",
-"Calendar CalDAV syncing addresses" => "Egutegiaren CalDAV sinkronizazio helbideak",
-"more info" => "informazio gehiago",
-"Primary address (Kontact et al)" => "Helbide nagusia",
-"iOS/OS X" => "iOS/OS X",
-"Users" => "Erabiltzaileak",
-"select users" => "hautatutako erabiltzaileak",
-"Editable" => "Editagarria",
-"Groups" => "Taldeak",
-"select groups" => "hautatutako taldeak",
-"make public" => "publikoa egin"
-);
diff --git a/apps/calendar/l10n/fa.php b/apps/calendar/l10n/fa.php
deleted file mode 100644
index 9235460834..0000000000
--- a/apps/calendar/l10n/fa.php
+++ /dev/null
@@ -1,156 +0,0 @@
-<?php $TRANSLATIONS = array(
-"No calendars found." => "هیچ تقویمی پیدا نشد",
-"No events found." => "هیچ رویدادی پیدا نشد",
-"Wrong calendar" => "تقویم اشتباه",
-"New Timezone:" => "زمان محلی جدید",
-"Timezone changed" => "زمان محلی تغییر یافت",
-"Invalid request" => "درخواست نامعتبر",
-"Calendar" => "تقویم",
-"ddd" => "ddd",
-"ddd M/d" => "ddd M/d",
-"dddd M/d" => "dddd M/d",
-"MMMM yyyy" => "MMMM yyyy",
-"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "DDD m[ yyyy]{ '&#8212;'[ DDD] m yyyy}",
-"dddd, MMM d, yyyy" => "dddd, MMM d, yyyy",
-"Birthday" => "روزتولد",
-"Business" => "تجارت",
-"Call" => "تماس گرفتن",
-"Clients" => "مشتریان",
-"Deliverer" => "نجات",
-"Holidays" => "روزهای تعطیل",
-"Ideas" => "ایده ها",
-"Journey" => "سفر",
-"Jubilee" => "سالگرد",
-"Meeting" => "ملاقات",
-"Other" => "دیگر",
-"Personal" => "شخصی",
-"Projects" => "پروژه ها",
-"Questions" => "سوالات",
-"Work" => "کار",
-"unnamed" => "نام گذاری نشده",
-"New Calendar" => "تقویم جدید",
-"Does not repeat" => "تکرار نکنید",
-"Daily" => "روزانه",
-"Weekly" => "هفتهگی",
-"Every Weekday" => "هرروز هفته",
-"Bi-Weekly" => "دوهفته",
-"Monthly" => "ماهانه",
-"Yearly" => "سالانه",
-"never" => "هرگز",
-"by occurrences" => "به وسیله ظهور",
-"by date" => "به وسیله تاریخ",
-"by monthday" => "به وسیله روزهای ماه",
-"by weekday" => "به وسیله روز های هفته",
-"Monday" => "دوشنبه",
-"Tuesday" => "سه شنبه",
-"Wednesday" => "چهارشنبه",
-"Thursday" => "پنجشنبه",
-"Friday" => "جمعه",
-"Saturday" => "شنبه",
-"Sunday" => "یکشنبه",
-"events week of month" => "رویداد های  هفته هایی از ماه",
-"first" => "اولین",
-"second" => "دومین",
-"third" => "سومین",
-"fourth" => "چهارمین",
-"fifth" => "پنجمین",
-"last" => "آخرین",
-"January" => "ژانویه",
-"February" => "فبریه",
-"March" => "مارس",
-"April" => "آوریل",
-"May" => "می",
-"June" => "ژوءن",
-"July" => "جولای",
-"August" => "آگوست",
-"September" => "سپتامبر",
-"October" => "اکتبر",
-"November" => "نوامبر",
-"December" => "دسامبر",
-"by events date" => "به وسیله رویداد های روزانه",
-"by yearday(s)" => "به وسیله روز های سال(ها)",
-"by weeknumber(s)" => "به وسیله شماره هفته(ها)",
-"by day and month" => "به وسیله روز و ماه",
-"Date" => "تاریخ",
-"Cal." => "تقویم.",
-"All day" => "هرروز",
-"Missing fields" => "فیلد های گم شده",
-"Title" => "عنوان",
-"From Date" => "از تاریخ",
-"From Time" => "از ساعت",
-"To Date" => "به تاریخ",
-"To Time" => "به ساعت",
-"The event ends before it starts" => "رویداد قبل از شروع شدن تمام شده!",
-"There was a database fail" => "یک پایگاه داده فرو مانده است",
-"Week" => "هفته",
-"Month" => "ماه",
-"List" => "فهرست",
-"Today" => "امروز",
-"Your calendars" => "تقویم های شما",
-"CalDav Link" => "CalDav Link",
-"Shared calendars" => "تقویمهای به اشترک گذاری شده",
-"No shared calendars" => "هیچ تقویمی به  اشتراک گذارده نشده",
-"Share Calendar" => "تقویم را به اشتراک بگذارید",
-"Download" => "بارگیری",
-"Edit" => "ویرایش",
-"Delete" => "پاک کردن",
-"shared with you by" => "به اشتراک گذارده شده به وسیله",
-"New calendar" => "تقویم جدید",
-"Edit calendar" => "ویرایش تقویم",
-"Displayname" => "نام برای نمایش",
-"Active" => "فعال",
-"Calendar color" => "رنگ تقویم",
-"Save" => "ذخیره سازی",
-"Submit" => "ارسال",
-"Cancel" => "انصراف",
-"Edit an event" => "ویرایش رویداد",
-"Export" => "خروجی گرفتن",
-"Eventinfo" => "اطلاعات رویداد",
-"Repeating" => "در حال تکرار کردن",
-"Alarm" => "هشدار",
-"Attendees" => "شرکت کنندگان",
-"Share" => "به اشتراک گذاردن",
-"Title of the Event" => "عنوان رویداد",
-"Category" => "نوع",
-"Separate categories with commas" => "گروه ها را به وسیله درنگ نما از هم جدا کنید",
-"Edit categories" => "ویرایش گروه",
-"All Day Event" => "رویداد های روزانه",
-"From" => "از",
-"To" => "به",
-"Advanced options" => "تنظیمات حرفه ای",
-"Location" => "منطقه",
-"Location of the Event" => "منطقه رویداد",
-"Description" => "توضیحات",
-"Description of the Event" => "توضیحات درباره رویداد",
-"Repeat" => "تکرار",
-"Advanced" => "پیشرفته",
-"Select weekdays" => "انتخاب روز های هفته ",
-"Select days" => "انتخاب روز ها",
-"and the events day of year." => "و رویداد های روز از سال",
-"and the events day of month." => "و رویداد های روز از ماه",
-"Select months" => "انتخاب ماه ها",
-"Select weeks" => "انتخاب هفته ها",
-"and the events week of year." => "و رویداد هفته ها از سال",
-"Interval" => "فاصله",
-"End" => "پایان",
-"occurrences" => "ظهور",
-"create a new calendar" => "یک تقویم جدید ایجاد کنید",
-"Import a calendar file" => "یک پرونده حاوی تقویم وارد کنید",
-"Name of new calendar" => "نام تقویم جدید",
-"Import" => "ورودی دادن",
-"Close Dialog" => "بستن دیالوگ",
-"Create a new event" => "یک رویداد ایجاد کنید",
-"View an event" => "دیدن یک رویداد",
-"No categories selected" => "هیچ گروهی انتخاب نشده",
-"of" => "از",
-"at" => "در",
-"Timezone" => "زمان محلی",
-"24h" => "24 ساعت",
-"12h" => "12 ساعت",
-"Users" => "کاربرها",
-"select users" => "انتخاب شناسه ها",
-"Editable" => "قابل ویرایش",
-"Groups" => "گروه ها",
-"select groups" => "انتخاب گروه ها",
-"make public" => "عمومی سازی"
-);
diff --git a/apps/calendar/l10n/fi_FI.php b/apps/calendar/l10n/fi_FI.php
deleted file mode 100644
index c4c9df3588..0000000000
--- a/apps/calendar/l10n/fi_FI.php
+++ /dev/null
@@ -1,159 +0,0 @@
-<?php $TRANSLATIONS = array(
-"No calendars found." => "Kalentereita ei löytynyt",
-"No events found." => "Tapahtumia ei löytynyt.",
-"Wrong calendar" => "Väärä kalenteri",
-"The file contained either no events or all events are already saved in your calendar." => "Tiedosto ei joko sisältänyt tapahtumia tai vaihtoehtoisesti kaikki tapahtumat on jo tallennettu kalenteriisi.",
-"Import failed" => "Tuonti epäonnistui",
-"events has been saved in your calendar" => "tapahtumaa on tallennettu kalenteriisi",
-"New Timezone:" => "Uusi aikavyöhyke:",
-"Timezone changed" => "Aikavyöhyke vaihdettu",
-"Invalid request" => "Virheellinen pyyntö",
-"Calendar" => "Kalenteri",
-"Birthday" => "Syntymäpäivä",
-"Call" => "Ota yhteyttä",
-"Clients" => "Asiakkaat",
-"Deliverer" => "Toimittaja",
-"Holidays" => "Vapaapäivät",
-"Ideas" => "Ideat",
-"Journey" => "Matkustus",
-"Jubilee" => "Vuosipäivät",
-"Meeting" => "Tapaamiset",
-"Other" => "Muut",
-"Personal" => "Henkilökohtainen",
-"Projects" => "Projektit",
-"Questions" => "Kysymykset",
-"Work" => "Työ",
-"unnamed" => "nimetön",
-"New Calendar" => "Uusi kalenteri",
-"Does not repeat" => "Ei toistoa",
-"Daily" => "Päivittäin",
-"Weekly" => "Viikottain",
-"Every Weekday" => "Arkipäivisin",
-"Bi-Weekly" => "Joka toinen viikko",
-"Monthly" => "Kuukausittain",
-"Yearly" => "Vuosittain",
-"never" => "Ei koskaan",
-"Monday" => "Maanantai",
-"Tuesday" => "Tiistai",
-"Wednesday" => "Keskiviikko",
-"Thursday" => "Torstai",
-"Friday" => "Perjantai",
-"Saturday" => "Lauantai",
-"Sunday" => "Sunnuntai",
-"first" => "ensimmäinen",
-"second" => "toinen",
-"third" => "kolmas",
-"fourth" => "neljäs",
-"fifth" => "viides",
-"last" => "viimeinen",
-"January" => "Tammikuu",
-"February" => "Helmikuu",
-"March" => "Maaliskuu",
-"April" => "Huhtikuu",
-"May" => "Toukokuu",
-"June" => "Kesäkuu",
-"July" => "Heinäkuu",
-"August" => "Elokuu",
-"September" => "Syyskuu",
-"October" => "Lokakuu",
-"November" => "Marraskuu",
-"December" => "Joulukuu",
-"Date" => "Päivämäärä",
-"Sun." => "Su",
-"Mon." => "Ma",
-"Tue." => "Ti",
-"Wed." => "Ke",
-"Thu." => "To",
-"Fri." => "Pe",
-"Sat." => "La",
-"Jan." => "Tammi",
-"Feb." => "Helmi",
-"Mar." => "Maalis",
-"Apr." => "Huhti",
-"May." => "Touko",
-"Jun." => "Kesä",
-"Jul." => "Heinä",
-"Aug." => "Elo",
-"Sep." => "Syys",
-"Oct." => "Loka",
-"Nov." => "Marras",
-"Dec." => "Joulu",
-"All day" => "Koko päivä",
-"Missing fields" => "Puuttuvat kentät",
-"Title" => "Otsikko",
-"The event ends before it starts" => "Tapahtuma päättyy ennen alkamistaan",
-"There was a database fail" => "Tapahtui tietokantavirhe",
-"Week" => "Viikko",
-"Month" => "Kuukausi",
-"List" => "Lista",
-"Today" => "Tänään",
-"Settings" => "Asetukset",
-"Your calendars" => "Omat kalenterisi",
-"CalDav Link" => "CalDav-linkki",
-"Shared calendars" => "Jaetut kalenterit",
-"No shared calendars" => "Ei jaettuja kalentereita",
-"Share Calendar" => "Jaa kalenteri",
-"Download" => "Lataa",
-"Edit" => "Muokkaa",
-"Delete" => "Poista",
-"shared with you by" => "kanssasi jaettu",
-"New calendar" => "Uusi kalenteri",
-"Edit calendar" => "Muokkaa kalenteria",
-"Displayname" => "Kalenterin nimi",
-"Active" => "Aktiivinen",
-"Calendar color" => "Kalenterin väri",
-"Save" => "Tallenna",
-"Submit" => "Talleta",
-"Cancel" => "Peru",
-"Edit an event" => "Muokkaa tapahtumaa",
-"Export" => "Vie",
-"Eventinfo" => "Tapahtumatiedot",
-"Repeating" => "Toisto",
-"Alarm" => "Hälytys",
-"Attendees" => "Osallistujat",
-"Share" => "Jaa",
-"Title of the Event" => "Tapahtuman otsikko",
-"Category" => "Luokka",
-"Separate categories with commas" => "Erota luokat pilkuilla",
-"Edit categories" => "Muokkaa luokkia",
-"All Day Event" => "Koko päivän tapahtuma",
-"From" => "Alkaa",
-"To" => "Päättyy",
-"Advanced options" => "Tarkemmat asetukset",
-"Location" => "Sijainti",
-"Location of the Event" => "Tapahtuman sijainti",
-"Description" => "Kuvaus",
-"Description of the Event" => "Tapahtuman kuvaus",
-"Repeat" => "Toisto",
-"Select weekdays" => "Valitse viikonpäivät",
-"Select days" => "Valitse päivät",
-"Select months" => "Valitse kuukaudet",
-"Select weeks" => "Valitse viikot",
-"Interval" => "Intervalli",
-"create a new calendar" => "luo uusi kalenteri",
-"Import a calendar file" => "Tuo kalenteritiedosto",
-"Please choose a calendar" => "Valitse kalenteri",
-"Name of new calendar" => "Uuden kalenterin nimi",
-"A Calendar with this name already exists. If you continue anyhow, these calendars will be merged." => "Samalla nimellä on jo olemassa kalenteri. Jos jatkat kaikesta huolimatta, kalenterit yhdistetään.",
-"Import" => "Tuo",
-"Close Dialog" => "Sulje ikkuna",
-"Create a new event" => "Luo uusi tapahtuma",
-"View an event" => "Avaa tapahtuma",
-"No categories selected" => "Luokkia ei ole valittu",
-"General" => "Yleiset",
-"Timezone" => "Aikavyöhyke",
-"Update timezone automatically" => "Päivitä aikavyöhykkeet automaattisesti",
-"Time format" => "Ajan näyttömuoto",
-"24h" => "24 tuntia",
-"12h" => "12 tuntia",
-"Start week on" => "Viikon alkamispäivä",
-"Calendar CalDAV syncing addresses" => "Kalenterin CalDAV-synkronointiosoitteet",
-"Primary address (Kontact et al)" => "Ensisijainen osoite (Kontact ja muut vastaavat)",
-"iOS/OS X" => "iOS/OS X",
-"Users" => "Käyttäjät",
-"select users" => "valitse käyttäjät",
-"Editable" => "Muoktattava",
-"Groups" => "Ryhmät",
-"select groups" => "valitse ryhmät",
-"make public" => "aseta julkiseksi"
-);
diff --git a/apps/calendar/l10n/fr.php b/apps/calendar/l10n/fr.php
deleted file mode 100644
index 90ba903b87..0000000000
--- a/apps/calendar/l10n/fr.php
+++ /dev/null
@@ -1,192 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Not all calendars are completely cached" => "Tous les calendriers ne sont pas mis en cache",
-"Everything seems to be completely cached" => "Tout semble être en cache",
-"No calendars found." => "Aucun calendrier n'a été trouvé.",
-"No events found." => "Aucun événement n'a été trouvé.",
-"Wrong calendar" => "Mauvais calendrier",
-"The file contained either no events or all events are already saved in your calendar." => "Soit le fichier ne contient aucun événement soit tous les événements sont déjà enregistrés dans votre calendrier.",
-"events has been saved in the new calendar" => "Les événements ont été enregistrés dans le nouveau calendrier",
-"Import failed" => "Échec de l'import",
-"events has been saved in your calendar" => "Les événements ont été enregistrés dans votre calendrier",
-"New Timezone:" => "Nouveau fuseau horaire :",
-"Timezone changed" => "Fuseau horaire modifié",
-"Invalid request" => "Requête invalide",
-"Calendar" => "Calendrier",
-"ddd" => "ddd",
-"ddd M/d" => "ddd d/M",
-"dddd M/d" => "dddd d/M",
-"MMMM yyyy" => "MMMM yyyy",
-"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
-"dddd, MMM d, yyyy" => "dddd, d MMM, yyyy",
-"Birthday" => "Anniversaire",
-"Business" => "Professionnel",
-"Call" => "Appel",
-"Clients" => "Clientèle",
-"Deliverer" => "Livraison",
-"Holidays" => "Vacances",
-"Ideas" => "Idées",
-"Journey" => "Déplacement",
-"Jubilee" => "Jubilé",
-"Meeting" => "Meeting",
-"Other" => "Autre",
-"Personal" => "Personnel",
-"Projects" => "Projets",
-"Questions" => "Questions",
-"Work" => "Travail",
-"by" => "par",
-"unnamed" => "sans-nom",
-"New Calendar" => "Nouveau Calendrier",
-"Does not repeat" => "Pas de répétition",
-"Daily" => "Tous les jours",
-"Weekly" => "Hebdomadaire",
-"Every Weekday" => "Quotidien",
-"Bi-Weekly" => "Bi-hebdomadaire",
-"Monthly" => "Mensuel",
-"Yearly" => "Annuel",
-"never" => "jamais",
-"by occurrences" => "par occurrences",
-"by date" => "par date",
-"by monthday" => "par jour du mois",
-"by weekday" => "par jour de la semaine",
-"Monday" => "Lundi",
-"Tuesday" => "Mardi",
-"Wednesday" => "Mercredi",
-"Thursday" => "Jeudi",
-"Friday" => "Vendredi",
-"Saturday" => "Samedi",
-"Sunday" => "Dimanche",
-"events week of month" => "événements du mois par semaine",
-"first" => "premier",
-"second" => "deuxième",
-"third" => "troisième",
-"fourth" => "quatrième",
-"fifth" => "cinquième",
-"last" => "dernier",
-"January" => "Janvier",
-"February" => "Février",
-"March" => "Mars",
-"April" => "Avril",
-"May" => "Mai",
-"June" => "Juin",
-"July" => "Juillet",
-"August" => "Août",
-"September" => "Septembre",
-"October" => "Octobre",
-"November" => "Novembre",
-"December" => "Décembre",
-"by events date" => "par date d’événements",
-"by yearday(s)" => "par jour(s) de l'année",
-"by weeknumber(s)" => "par numéro de semaine(s)",
-"by day and month" => "par jour et mois",
-"Date" => "Date",
-"Cal." => "Cal.",
-"Sun." => "Dim.",
-"Mon." => "Lun.",
-"Tue." => "Mar.",
-"Wed." => "Mer.",
-"Thu." => "Jeu",
-"Fri." => "Ven.",
-"Sat." => "Sam.",
-"Jan." => "Jan.",
-"Feb." => "Fév.",
-"Mar." => "Mars",
-"Apr." => "Avr.",
-"May." => "Mai",
-"Jun." => "Juin",
-"Jul." => "Juil.",
-"Aug." => "Août",
-"Sep." => "Sep.",
-"Oct." => "Oct.",
-"Nov." => "Nov.",
-"Dec." => "Déc.",
-"All day" => "Journée entière",
-"Missing fields" => "Champs manquants",
-"Title" => "Titre",
-"From Date" => "De la date",
-"From Time" => "De l'heure",
-"To Date" => "A la date",
-"To Time" => "A l'heure",
-"The event ends before it starts" => "L'évènement s'est terminé avant qu'il ne commence",
-"There was a database fail" => "Il y a eu un échec dans la base de donnée",
-"Week" => "Semaine",
-"Month" => "Mois",
-"List" => "Liste",
-"Today" => "Aujourd'hui",
-"Your calendars" => "Vos calendriers",
-"CalDav Link" => "Lien CalDav",
-"Shared calendars" => "Calendriers partagés",
-"No shared calendars" => "Aucun calendrier partagé",
-"Share Calendar" => "Partager le calendrier",
-"Download" => "Télécharger",
-"Edit" => "Éditer",
-"Delete" => "Supprimer",
-"shared with you by" => "partagé avec vous par",
-"New calendar" => "Nouveau calendrier",
-"Edit calendar" => "Éditer le calendrier",
-"Displayname" => "Nom d'affichage",
-"Active" => "Actif",
-"Calendar color" => "Couleur du calendrier",
-"Save" => "Sauvegarder",
-"Submit" => "Soumettre",
-"Cancel" => "Annuler",
-"Edit an event" => "Éditer un événement",
-"Export" => "Exporter",
-"Eventinfo" => "Événement",
-"Repeating" => "Occurences",
-"Alarm" => "Alarmes",
-"Attendees" => "Participants",
-"Share" => "Partage",
-"Title of the Event" => "Titre de l'événement",
-"Category" => "Catégorie",
-"Separate categories with commas" => "Séparer les catégories par des virgules",
-"Edit categories" => "Modifier les catégories",
-"All Day Event" => "Journée entière",
-"From" => "De",
-"To" => "À",
-"Advanced options" => "Options avancées",
-"Location" => "Emplacement",
-"Location of the Event" => "Emplacement de l'événement",
-"Description" => "Description",
-"Description of the Event" => "Description de l'événement",
-"Repeat" => "Répétition",
-"Advanced" => "Avancé",
-"Select weekdays" => "Sélection des jours de la semaine",
-"Select days" => "Sélection des jours",
-"and the events day of year." => "et les événements de l'année par jour.",
-"and the events day of month." => "et les événements du mois par jour.",
-"Select months" => "Sélection des mois",
-"Select weeks" => "Sélection des semaines",
-"and the events week of year." => "et les événements de l'année par semaine.",
-"Interval" => "Intervalle",
-"End" => "Fin",
-"occurrences" => "occurrences",
-"create a new calendar" => "Créer un nouveau calendrier",
-"Import a calendar file" => "Importer un fichier de calendriers",
-"Please choose a calendar" => "Veuillez sélectionner un calendrier",
-"Name of new calendar" => "Nom pour le nouveau calendrier",
-"Take an available name!" => "Choisissez un nom disponible !",
-"A Calendar with this name already exists. If you continue anyhow, these calendars will be merged." => "Un calendrier de ce nom existe déjà. Si vous choisissez de continuer les calendriers seront fusionnés.",
-"Import" => "Importer",
-"Close Dialog" => "Fermer la fenêtre",
-"Create a new event" => "Créer un nouvel événement",
-"View an event" => "Voir un événement",
-"No categories selected" => "Aucune catégorie sélectionnée",
-"of" => "de",
-"at" => "à",
-"Timezone" => "Fuseau horaire",
-"24h" => "24h",
-"12h" => "12h",
-"Cache" => "Cache",
-"Clear cache for repeating events" => "Nettoyer le cache des événements répétitifs",
-"Calendar CalDAV syncing addresses" => "Adresses de synchronisation des calendriers CalDAV",
-"more info" => "plus d'infos",
-"Primary address (Kontact et al)" => "Adresses principales (Kontact et assimilés)",
-"iOS/OS X" => "iOS/OS X",
-"Read only iCalendar link(s)" => "lien(s) iCalendar en lecture seule",
-"Users" => "Utilisateurs",
-"select users" => "sélectionner les utilisateurs",
-"Editable" => "Modifiable",
-"Groups" => "Groupes",
-"select groups" => "sélectionner les groupes",
-"make public" => "rendre public"
-);
diff --git a/apps/calendar/l10n/gl.php b/apps/calendar/l10n/gl.php
deleted file mode 100644
index 00a28cc70f..0000000000
--- a/apps/calendar/l10n/gl.php
+++ /dev/null
@@ -1,165 +0,0 @@
-<?php $TRANSLATIONS = array(
-"No calendars found." => "Non se atoparon calendarios.",
-"No events found." => "Non se atoparon eventos.",
-"Wrong calendar" => "Calendario equivocado",
-"New Timezone:" => "Novo fuso horario:",
-"Timezone changed" => "Fuso horario trocado",
-"Invalid request" => "Petición non válida",
-"Calendar" => "Calendario",
-"ddd" => "ddd",
-"ddd M/d" => "ddd M/d",
-"dddd M/d" => "dddd M/d",
-"MMMM yyyy" => "MMMM yyyy",
-"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "d MMM[ yyyy]{ '&#8212;'d [ MMM] yyyy}",
-"dddd, MMM d, yyyy" => "dddd, MMM d,yyyy",
-"Birthday" => "Aniversario",
-"Business" => "Traballo",
-"Call" => "Chamada",
-"Clients" => "Clientes",
-"Deliverer" => "Remitente",
-"Holidays" => "Vacacións",
-"Ideas" => "Ideas",
-"Journey" => "Viaxe",
-"Jubilee" => "Aniversario especial",
-"Meeting" => "Reunión",
-"Other" => "Outro",
-"Personal" => "Persoal",
-"Projects" => "Proxectos",
-"Questions" => "Preguntas",
-"Work" => "Traballo",
-"unnamed" => "sen nome",
-"New Calendar" => "Novo calendario",
-"Does not repeat" => "Non se repite",
-"Daily" => "A diario",
-"Weekly" => "Semanalmente",
-"Every Weekday" => "Todas as semanas",
-"Bi-Weekly" => "Cada dúas semanas",
-"Monthly" => "Mensual",
-"Yearly" => "Anual",
-"never" => "nunca",
-"by occurrences" => "por acontecementos",
-"by date" => "por data",
-"by monthday" => "por día do mes",
-"by weekday" => "por día da semana",
-"Monday" => "Luns",
-"Tuesday" => "Martes",
-"Wednesday" => "Mércores",
-"Thursday" => "Xoves",
-"Friday" => "Venres",
-"Saturday" => "Sábado",
-"Sunday" => "Domingo",
-"events week of month" => "semana dos eventos no mes",
-"first" => "primeiro",
-"second" => "segundo",
-"third" => "terceiro",
-"fourth" => "cuarto",
-"fifth" => "quinto",
-"last" => "último",
-"January" => "Xaneiro",
-"February" => "Febreiro",
-"March" => "Marzo",
-"April" => "Abril",
-"May" => "Maio",
-"June" => "Xuño",
-"July" => "Xullo",
-"August" => "Agosto",
-"September" => "Setembro",
-"October" => "Outubro",
-"November" => "Novembro",
-"December" => "Decembro",
-"by events date" => "por data dos eventos",
-"by yearday(s)" => "por dia(s) do ano",
-"by weeknumber(s)" => "por número(s) de semana",
-"by day and month" => "por día e mes",
-"Date" => "Data",
-"Cal." => "Cal.",
-"All day" => "Todo o dia",
-"Missing fields" => "Faltan campos",
-"Title" => "Título",
-"From Date" => "Desde a data",
-"From Time" => "Desde a hora",
-"To Date" => "á data",
-"To Time" => "á hora",
-"The event ends before it starts" => "O evento remata antes de iniciarse",
-"There was a database fail" => "Produciuse un erro na base de datos",
-"Week" => "Semana",
-"Month" => "Mes",
-"List" => "Lista",
-"Today" => "Hoxe",
-"Calendars" => "Calendarios",
-"There was a fail, while parsing the file." => "Produciuse un erro ao procesar o ficheiro",
-"Choose active calendars" => "Escolla os calendarios activos",
-"Your calendars" => "Os seus calendarios",
-"CalDav Link" => "Ligazón CalDav",
-"Shared calendars" => "Calendarios compartidos",
-"No shared calendars" => "Sen calendarios compartidos",
-"Share Calendar" => "Compartir calendario",
-"Download" => "Descargar",
-"Edit" => "Editar",
-"Delete" => "Borrar",
-"shared with you by" => "compartido con vostede por",
-"New calendar" => "Novo calendario",
-"Edit calendar" => "Editar calendario",
-"Displayname" => "Mostrar nome",
-"Active" => "Activo",
-"Calendar color" => "Cor do calendario",
-"Save" => "Gardar",
-"Submit" => "Enviar",
-"Cancel" => "Cancelar",
-"Edit an event" => "Editar un evento",
-"Export" => "Exportar",
-"Eventinfo" => "Info do evento",
-"Repeating" => "Repetido",
-"Alarm" => "Alarma",
-"Attendees" => "Participantes",
-"Share" => "Compartir",
-"Title of the Event" => "Título do evento",
-"Category" => "Categoría",
-"Separate categories with commas" => "Separe as categorías con comas",
-"Edit categories" => "Editar categorías",
-"All Day Event" => "Eventos do día",
-"From" => "Desde",
-"To" => "a",
-"Advanced options" => "Opcións avanzadas",
-"Location" => "Localización",
-"Location of the Event" => "Localización do evento",
-"Description" => "Descrición",
-"Description of the Event" => "Descrición do evento",
-"Repeat" => "Repetir",
-"Advanced" => "Avanzado",
-"Select weekdays" => "Seleccionar días da semana",
-"Select days" => "Seleccionar días",
-"and the events day of year." => "e día dos eventos no ano.",
-"and the events day of month." => "e día dos eventos no mes.",
-"Select months" => "Seleccione meses",
-"Select weeks" => "Seleccionar semanas",
-"and the events week of year." => "e semana dos eventos no ano.",
-"Interval" => "Intervalo",
-"End" => "Fin",
-"occurrences" => "acontecementos",
-"create a new calendar" => "crear un novo calendario",
-"Import a calendar file" => "Importar un ficheiro de calendario",
-"Please choose the calendar" => "Por favor, seleccione o calendario",
-"create a new calendar" => "crear un novo calendario",
-"Name of new calendar" => "Nome do novo calendario",
-"Import" => "Importar",
-"Importing calendar" => "Importar calendario",
-"Calendar imported successfully" => "Calendario importado correctamente",
-"Close Dialog" => "Pechar diálogo",
-"Create a new event" => "Crear un novo evento",
-"View an event" => "Ver un evento",
-"No categories selected" => "Non seleccionou as categorías",
-"of" => "de",
-"at" => "a",
-"Timezone" => "Fuso horario",
-"Check always for changes of the timezone" => "Comprobar sempre cambios de fuso horario",
-"Timeformat" => "Formato de hora",
-"24h" => "24h",
-"12h" => "12h",
-"Users" => "Usuarios",
-"select users" => "escoller usuarios",
-"Editable" => "Editable",
-"Groups" => "Grupos",
-"select groups" => "escoller grupos",
-"make public" => "facer público"
-);
diff --git a/apps/calendar/l10n/he.php b/apps/calendar/l10n/he.php
deleted file mode 100644
index d5c0b2b2e5..0000000000
--- a/apps/calendar/l10n/he.php
+++ /dev/null
@@ -1,156 +0,0 @@
-<?php $TRANSLATIONS = array(
-"No calendars found." => "לא נמצאו לוחות שנה.",
-"No events found." => "לא נמצאו אירועים.",
-"Wrong calendar" => "לוח שנה לא נכון",
-"New Timezone:" => "אזור זמן חדש:",
-"Timezone changed" => "אזור זמן השתנה",
-"Invalid request" => "בקשה לא חוקית",
-"Calendar" => "ח שנה",
-"ddd" => "ddd",
-"ddd M/d" => "ddd M/d",
-"dddd M/d" => "dddd M/d",
-"MMMM yyyy" => "MMMM yyyy",
-"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "d MMM [ yyyy]{ '&#8212;'d[ MMM] yyyy}",
-"dddd, MMM d, yyyy" => "dddd, MMM d, yyyy",
-"Birthday" => "יום הולדת",
-"Business" => "עסקים",
-"Call" => "שיחה",
-"Clients" => "לקוחות",
-"Deliverer" => "משלוח",
-"Holidays" => "חגים",
-"Ideas" => "רעיונות",
-"Journey" => "מסע",
-"Jubilee" => "יובל",
-"Meeting" => "פגישה",
-"Other" => "אחר",
-"Personal" => "אישי",
-"Projects" => "פרוייקטים",
-"Questions" => "שאלות",
-"Work" => "עבודה",
-"unnamed" => "ללא שם",
-"New Calendar" => "לוח שנה חדש",
-"Does not repeat" => "ללא חזרה",
-"Daily" => "יומי",
-"Weekly" => "שבועי",
-"Every Weekday" => "כל יום עבודה",
-"Bi-Weekly" => "דו שבועי",
-"Monthly" => "חודשי",
-"Yearly" => "שנתי",
-"never" => "לעולם לא",
-"by occurrences" => "לפי מופעים",
-"by date" => "לפי תאריך",
-"by monthday" => "לפי היום בחודש",
-"by weekday" => "לפי היום בשבוע",
-"Monday" => "יום שני",
-"Tuesday" => "יום שלישי",
-"Wednesday" => "יום רביעי",
-"Thursday" => "יום חמישי",
-"Friday" => "יום שישי",
-"Saturday" => "שבת",
-"Sunday" => "יום ראשון",
-"events week of month" => "שבוע בחודש לציון הפעילות",
-"first" => "ראשון",
-"second" => "שני",
-"third" => "שלישי",
-"fourth" => "רביעי",
-"fifth" => "חמישי",
-"last" => "אחרון",
-"January" => "ינואר",
-"February" => "פברואר",
-"March" => "מרץ",
-"April" => "אפריל",
-"May" => "מאי",
-"June" => "יוני",
-"July" => "יולי",
-"August" => "אוגוסט",
-"September" => "ספטמבר",
-"October" => "אוקטובר",
-"November" => "נובמבר",
-"December" => "דצמבר",
-"by events date" => "לפי תאריכי האירועים",
-"by yearday(s)" => "לפי ימים בשנה",
-"by weeknumber(s)" => "לפי מספרי השבועות",
-"by day and month" => "לפי יום וחודש",
-"Date" => "תאריך",
-"Cal." => "לוח שנה",
-"All day" => "היום",
-"Missing fields" => "שדות חסרים",
-"Title" => "כותרת",
-"From Date" => "מתאריך",
-"From Time" => "משעה",
-"To Date" => "עד תאריך",
-"To Time" => "עד שעה",
-"The event ends before it starts" => "האירוע מסתיים עוד לפני שהתחיל",
-"There was a database fail" => "אירע כשל במסד הנתונים",
-"Week" => "שבוע",
-"Month" => "חודש",
-"List" => "רשימה",
-"Today" => "היום",
-"Your calendars" => "לוחות השנה שלך",
-"CalDav Link" => "קישור CalDav",
-"Shared calendars" => "לוחות שנה מושתפים",
-"No shared calendars" => "אין לוחות שנה משותפים",
-"Share Calendar" => "שיתוף לוח שנה",
-"Download" => "הורדה",
-"Edit" => "עריכה",
-"Delete" => "מחיקה",
-"shared with you by" => "שותף אתך על ידי",
-"New calendar" => "לוח שנה חדש",
-"Edit calendar" => "עריכת לוח שנה",
-"Displayname" => "שם תצוגה",
-"Active" => "פעיל",
-"Calendar color" => "צבע לוח שנה",
-"Save" => "שמירה",
-"Submit" => "שליחה",
-"Cancel" => "ביטול",
-"Edit an event" => "עריכת אירוע",
-"Export" => "יצוא",
-"Eventinfo" => "פרטי האירוע",
-"Repeating" => "חוזר",
-"Alarm" => "תזכורת",
-"Attendees" => "משתתפים",
-"Share" => "שיתוף",
-"Title of the Event" => "כותרת האירוע",
-"Category" => "קטגוריה",
-"Separate categories with commas" => "הפרדת קטגוריות בפסיק",
-"Edit categories" => "עריכת קטגוריות",
-"All Day Event" => "אירוע של כל היום",
-"From" => "מאת",
-"To" => "עבור",
-"Advanced options" => "אפשרויות מתקדמות",
-"Location" => "מיקום",
-"Location of the Event" => "מיקום האירוע",
-"Description" => "תיאור",
-"Description of the Event" => "תיאור האירוע",
-"Repeat" => "חזרה",
-"Advanced" => "מתקדם",
-"Select weekdays" => "יש לבחור ימים בשבוע",
-"Select days" => "יש לבחור בימים",
-"and the events day of year." => "ויום האירוע בשנה.",
-"and the events day of month." => "ויום האירוע בחודש.",
-"Select months" => "יש לבחור בחודשים",
-"Select weeks" => "יש לבחור בשבועות",
-"and the events week of year." => "ומספור השבוע הפעיל בשנה.",
-"Interval" => "משך",
-"End" => "סיום",
-"occurrences" => "מופעים",
-"create a new calendar" => "יצירת לוח שנה חדש",
-"Import a calendar file" => "יבוא קובץ לוח שנה",
-"Name of new calendar" => "שם לוח השנה החדש",
-"Import" => "יבוא",
-"Close Dialog" => "סגירת הדו־שיח",
-"Create a new event" => "יצירת אירוע חדש",
-"View an event" => "צפייה באירוע",
-"No categories selected" => "לא נבחרו קטגוריות",
-"of" => "מתוך",
-"at" => "בשנה",
-"Timezone" => "אזור זמן",
-"24h" => "24 שעות",
-"12h" => "12 שעות",
-"Users" => "משתמשים",
-"select users" => "נא לבחור במשתמשים",
-"Editable" => "ניתן לעריכה",
-"Groups" => "קבוצות",
-"select groups" => "בחירת קבוצות",
-"make public" => "הפיכה לציבורי"
-);
diff --git a/apps/calendar/l10n/hr.php b/apps/calendar/l10n/hr.php
deleted file mode 100644
index 07512b9605..0000000000
--- a/apps/calendar/l10n/hr.php
+++ /dev/null
@@ -1,148 +0,0 @@
-<?php $TRANSLATIONS = array(
-"No calendars found." => "Nisu pronađeni kalendari",
-"No events found." => "Događaj nije pronađen.",
-"Wrong calendar" => "Pogrešan kalendar",
-"New Timezone:" => "Nova vremenska zona:",
-"Timezone changed" => "Vremenska zona promijenjena",
-"Invalid request" => "Neispravan zahtjev",
-"Calendar" => "Kalendar",
-"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
-"Birthday" => "Rođendan",
-"Business" => "Poslovno",
-"Call" => "Poziv",
-"Clients" => "Klijenti",
-"Deliverer" => "Dostavljač",
-"Holidays" => "Praznici",
-"Ideas" => "Ideje",
-"Journey" => "Putovanje",
-"Jubilee" => "Obljetnica",
-"Meeting" => "Sastanak",
-"Other" => "Ostalo",
-"Personal" => "Osobno",
-"Projects" => "Projekti",
-"Questions" => "Pitanja",
-"Work" => "Posao",
-"unnamed" => "bezimeno",
-"New Calendar" => "Novi kalendar",
-"Does not repeat" => "Ne ponavlja se",
-"Daily" => "Dnevno",
-"Weekly" => "Tjedno",
-"Every Weekday" => "Svakog radnog dana",
-"Bi-Weekly" => "Dvotjedno",
-"Monthly" => "Mjesečno",
-"Yearly" => "Godišnje",
-"never" => "nikad",
-"by occurrences" => "po pojavama",
-"by date" => "po datum",
-"by monthday" => "po dana mjeseca",
-"by weekday" => "po tjednu",
-"Monday" => "ponedeljak",
-"Tuesday" => "utorak",
-"Wednesday" => "srijeda",
-"Thursday" => "četvrtak",
-"Friday" => "petak",
-"Saturday" => "subota",
-"Sunday" => "nedelja",
-"first" => "prvi",
-"second" => "drugi",
-"third" => "treći",
-"fourth" => "četvrti",
-"fifth" => "peti",
-"last" => "zadnji",
-"January" => "siječanj",
-"February" => "veljača",
-"March" => "ožujak",
-"April" => "travanj",
-"May" => "svibanj",
-"June" => "lipanj",
-"July" => "srpanj",
-"August" => "kolovoz",
-"September" => "rujan",
-"October" => "listopad",
-"November" => "studeni",
-"December" => "prosinac",
-"by events date" => "po datumu događaja",
-"by yearday(s)" => "po godini(-nama)",
-"by weeknumber(s)" => "po broju tjedna(-ana)",
-"by day and month" => "po danu i mjeseca",
-"Date" => "datum",
-"Cal." => "Kal.",
-"All day" => "Cijeli dan",
-"Missing fields" => "Nedostaju polja",
-"Title" => "Naslov",
-"From Date" => "Datum od",
-"From Time" => "Vrijeme od",
-"To Date" => "Datum do",
-"To Time" => "Vrijeme do",
-"The event ends before it starts" => "Događaj završava prije nego počinje",
-"There was a database fail" => "Pogreška u bazi podataka",
-"Week" => "Tjedan",
-"Month" => "Mjesec",
-"List" => "Lista",
-"Today" => "Danas",
-"Your calendars" => "Vaši kalendari",
-"CalDav Link" => "CalDav poveznica",
-"Shared calendars" => "Podijeljeni kalendari",
-"No shared calendars" => "Nema zajedničkih kalendara",
-"Share Calendar" => "Podjeli kalendar",
-"Download" => "Spremi lokalno",
-"Edit" => "Uredi",
-"Delete" => "Briši",
-"shared with you by" => "podijeljeno s vama od ",
-"New calendar" => "Novi kalendar",
-"Edit calendar" => "Uredi kalendar",
-"Displayname" => "Naziv",
-"Active" => "Aktivan",
-"Calendar color" => "Boja kalendara",
-"Save" => "Spremi",
-"Submit" => "Potvrdi",
-"Cancel" => "Odustani",
-"Edit an event" => "Uredi događaj",
-"Export" => "Izvoz",
-"Eventinfo" => "Informacije o događaju",
-"Repeating" => "Ponavljanje",
-"Alarm" => "Alarm",
-"Attendees" => "Polaznici",
-"Share" => "Podijeli",
-"Title of the Event" => "Naslov događaja",
-"Category" => "Kategorija",
-"Separate categories with commas" => "Odvoji kategorije zarezima",
-"Edit categories" => "Uredi kategorije",
-"All Day Event" => "Cjelodnevni događaj",
-"From" => "Od",
-"To" => "Za",
-"Advanced options" => "Napredne mogućnosti",
-"Location" => "Lokacija",
-"Location of the Event" => "Lokacija događaja",
-"Description" => "Opis",
-"Description of the Event" => "Opis događaja",
-"Repeat" => "Ponavljanje",
-"Advanced" => "Napredno",
-"Select weekdays" => "Odaberi dane u tjednu",
-"Select days" => "Odaberi dane",
-"Select months" => "Odaberi mjesece",
-"Select weeks" => "Odaberi tjedne",
-"Interval" => "Interval",
-"End" => "Kraj",
-"occurrences" => "pojave",
-"create a new calendar" => "stvori novi kalendar",
-"Import a calendar file" => "Uvozite datoteku kalendara",
-"Name of new calendar" => "Ime novog kalendara",
-"Import" => "Uvoz",
-"Close Dialog" => "Zatvori dijalog",
-"Create a new event" => "Unesi novi događaj",
-"View an event" => "Vidjeti događaj",
-"No categories selected" => "Nema odabranih kategorija",
-"of" => "od",
-"at" => "na",
-"Timezone" => "Vremenska zona",
-"Timeformat" => "Format vremena",
-"24h" => "24h",
-"12h" => "12h",
-"Users" => "Korisnici",
-"select users" => "odaberi korisnike",
-"Editable" => "Može se uređivati",
-"Groups" => "Grupe",
-"select groups" => "izaberite grupe",
-"make public" => "podjeli s javnošću"
-);
diff --git a/apps/calendar/l10n/hu_HU.php b/apps/calendar/l10n/hu_HU.php
deleted file mode 100644
index 3ef4b9675b..0000000000
--- a/apps/calendar/l10n/hu_HU.php
+++ /dev/null
@@ -1,156 +0,0 @@
-<?php $TRANSLATIONS = array(
-"No calendars found." => "Nem található naptár",
-"No events found." => "Nem található esemény",
-"Wrong calendar" => "Hibás naptár",
-"New Timezone:" => "Új időzóna",
-"Timezone changed" => "Időzóna megváltozott",
-"Invalid request" => "Érvénytelen kérés",
-"Calendar" => "Naptár",
-"ddd" => "nnn",
-"ddd M/d" => "nnn H/n",
-"dddd M/d" => "nnnn H/n",
-"MMMM yyyy" => "HHHH éééé",
-"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
-"dddd, MMM d, yyyy" => "nnnn, HHH n, éééé",
-"Birthday" => "Születésap",
-"Business" => "Üzlet",
-"Call" => "Hívás",
-"Clients" => "Kliensek",
-"Deliverer" => "Szállító",
-"Holidays" => "Ünnepek",
-"Ideas" => "Ötletek",
-"Journey" => "Utazás",
-"Jubilee" => "Évforduló",
-"Meeting" => "Találkozó",
-"Other" => "Egyéb",
-"Personal" => "Személyes",
-"Projects" => "Projektek",
-"Questions" => "Kérdések",
-"Work" => "Munka",
-"unnamed" => "névtelen",
-"New Calendar" => "Új naptár",
-"Does not repeat" => "Nem ismétlődik",
-"Daily" => "Napi",
-"Weekly" => "Heti",
-"Every Weekday" => "Minden hétköznap",
-"Bi-Weekly" => "Kéthetente",
-"Monthly" => "Havi",
-"Yearly" => "Évi",
-"never" => "soha",
-"by occurrences" => "előfordulás szerint",
-"by date" => "dátum szerint",
-"by monthday" => "hónap napja szerint",
-"by weekday" => "hét napja szerint",
-"Monday" => "Hétfő",
-"Tuesday" => "Kedd",
-"Wednesday" => "Szerda",
-"Thursday" => "Csütörtök",
-"Friday" => "Péntek",
-"Saturday" => "Szombat",
-"Sunday" => "Vasárnap",
-"events week of month" => "hónap heteinek sorszáma",
-"first" => "első",
-"second" => "második",
-"third" => "harmadik",
-"fourth" => "negyedik",
-"fifth" => "ötödik",
-"last" => "utolsó",
-"January" => "Január",
-"February" => "Február",
-"March" => "Március",
-"April" => "Április",
-"May" => "Május",
-"June" => "Június",
-"July" => "Július",
-"August" => "Augusztus",
-"September" => "Szeptember",
-"October" => "Október",
-"November" => "November",
-"December" => "December",
-"by events date" => "az esemény napja szerint",
-"by yearday(s)" => "az év napja(i) szerint",
-"by weeknumber(s)" => "a hét sorszáma szerint",
-"by day and month" => "nap és hónap szerint",
-"Date" => "Dátum",
-"Cal." => "Naptár",
-"All day" => "Egész nap",
-"Missing fields" => "Hiányzó mezők",
-"Title" => "Cím",
-"From Date" => "Napjától",
-"From Time" => "Időtől",
-"To Date" => "Napig",
-"To Time" => "Ideig",
-"The event ends before it starts" => "Az esemény véget ér a kezdés előtt.",
-"There was a database fail" => "Adatbázis hiba történt",
-"Week" => "Hét",
-"Month" => "Hónap",
-"List" => "Lista",
-"Today" => "Ma",
-"Your calendars" => "Naptárjaid",
-"CalDav Link" => "CalDAV link",
-"Shared calendars" => "Megosztott naptárak",
-"No shared calendars" => "Nincs megosztott naptár",
-"Share Calendar" => "Naptármegosztás",
-"Download" => "Letöltés",
-"Edit" => "Szerkesztés",
-"Delete" => "Törlés",
-"shared with you by" => "megosztotta veled: ",
-"New calendar" => "Új naptár",
-"Edit calendar" => "Naptár szerkesztése",
-"Displayname" => "Megjelenítési név",
-"Active" => "Aktív",
-"Calendar color" => "Naptár szín",
-"Save" => "Mentés",
-"Submit" => "Beküldés",
-"Cancel" => "Mégse",
-"Edit an event" => "Esemény szerkesztése",
-"Export" => "Export",
-"Eventinfo" => "Eseményinfó",
-"Repeating" => "Ismétlődő",
-"Alarm" => "Riasztás",
-"Attendees" => "Résztvevők",
-"Share" => "Megosztás",
-"Title of the Event" => "Az esemény címe",
-"Category" => "Kategória",
-"Separate categories with commas" => "Vesszővel válaszd el a kategóriákat",
-"Edit categories" => "Kategóriák szerkesztése",
-"All Day Event" => "Egész napos esemény",
-"From" => "Ettől",
-"To" => "Eddig",
-"Advanced options" => "Haladó beállítások",
-"Location" => "Hely",
-"Location of the Event" => "Az esemény helyszíne",
-"Description" => "Leírás",
-"Description of the Event" => "Az esemény leírása",
-"Repeat" => "Ismétlés",
-"Advanced" => "Haladó",
-"Select weekdays" => "Hétköznapok kiválasztása",
-"Select days" => "Napok kiválasztása",
-"and the events day of year." => "és az éves esemény napja.",
-"and the events day of month." => "és a havi esemény napja.",
-"Select months" => "Hónapok kiválasztása",
-"Select weeks" => "Hetek kiválasztása",
-"and the events week of year." => "és az heti esemény napja.",
-"Interval" => "Időköz",
-"End" => "Vége",
-"occurrences" => "előfordulások",
-"create a new calendar" => "új naptár létrehozása",
-"Import a calendar file" => "Naptár-fájl importálása",
-"Name of new calendar" => "Új naptár neve",
-"Import" => "Importálás",
-"Close Dialog" => "Párbeszédablak bezárása",
-"Create a new event" => "Új esemény létrehozása",
-"View an event" => "Esemény megtekintése",
-"No categories selected" => "Nincs kiválasztott kategória",
-"of" => ", tulaj ",
-"at" => ", ",
-"Timezone" => "Időzóna",
-"24h" => "24h",
-"12h" => "12h",
-"Users" => "Felhasználók",
-"select users" => "válassz felhasználókat",
-"Editable" => "Szerkeszthető",
-"Groups" => "Csoportok",
-"select groups" => "válassz csoportokat",
-"make public" => "nyilvánossá tétel"
-);
diff --git a/apps/calendar/l10n/hy.php b/apps/calendar/l10n/hy.php
deleted file mode 100644
index 3b675693b0..0000000000
--- a/apps/calendar/l10n/hy.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Calendar" => "Օրացույց",
-"Other" => "Այլ",
-"Month" => "Ամիս",
-"Today" => "Այսօր",
-"Download" => "Բեռնել",
-"Delete" => "Ջնջել",
-"Save" => "Պահպանել",
-"Submit" => "Հաստատել",
-"Description" => "Նկարագրություն"
-);
diff --git a/apps/calendar/l10n/ia.php b/apps/calendar/l10n/ia.php
deleted file mode 100644
index 84c36536b9..0000000000
--- a/apps/calendar/l10n/ia.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php $TRANSLATIONS = array(
-"No calendars found." => "Necun calendarios trovate.",
-"No events found." => "Nulle eventos trovate.",
-"New Timezone:" => "Nove fuso horari",
-"Invalid request" => "Requesta invalide.",
-"Calendar" => "Calendario",
-"Birthday" => "Anniversario de nativitate",
-"Business" => "Affaires",
-"Call" => "Appello",
-"Clients" => "Clientes",
-"Holidays" => "Dies feriate",
-"Meeting" => "Incontro",
-"Other" => "Altere",
-"Personal" => "Personal",
-"Projects" => "Projectos",
-"Questions" => "Demandas",
-"Work" => "Travalio",
-"unnamed" => "sin nomine",
-"New Calendar" => "Nove calendario",
-"Does not repeat" => "Non repite",
-"Daily" => "Quotidian",
-"Weekly" => "Septimanal",
-"Every Weekday" => "Cata die",
-"Monthly" => "Mensual",
-"Yearly" => "Cata anno",
-"never" => "nunquam",
-"by date" => "per data",
-"Monday" => "Lunedi",
-"Tuesday" => "Martedi",
-"Wednesday" => "Mercuridi",
-"Thursday" => "Jovedi",
-"Friday" => "Venerdi",
-"Saturday" => "Sabbato",
-"Sunday" => "Dominica",
-"first" => "prime",
-"second" => "secunde",
-"third" => "tertie",
-"last" => "ultime",
-"January" => "januario",
-"February" => "Februario",
-"March" => "Martio",
-"April" => "April",
-"May" => "Mai",
-"June" => "Junio",
-"July" => "Julio",
-"August" => "Augusto",
-"September" => "Septembre",
-"October" => "Octobre",
-"November" => "Novembre",
-"December" => "Decembre",
-"by events date" => "per data de eventos",
-"by day and month" => "per dia e mense",
-"Date" => "Data",
-"All day" => "Omne die",
-"Missing fields" => "Campos incomplete",
-"Title" => "Titulo",
-"From Date" => "Data de initio",
-"From Time" => "Hora de initio",
-"To Date" => "Data de fin",
-"To Time" => "Hora de fin",
-"Week" => "Septimana",
-"Month" => "Mense",
-"List" => "Lista",
-"Today" => "Hodie",
-"Your calendars" => "Tu calendarios",
-"Download" => "Discarga",
-"Edit" => "Modificar",
-"Delete" => "Deler",
-"New calendar" => "Nove calendario",
-"Edit calendar" => "Modificar calendario",
-"Active" => "Active",
-"Calendar color" => "Color de calendario",
-"Save" => "Salveguardar",
-"Submit" => "Inviar",
-"Cancel" => "Cancellar",
-"Edit an event" => "Modificar evento",
-"Export" => "Exportar",
-"Share" => "Compartir",
-"Title of the Event" => "Titulo del evento.",
-"Category" => "Categoria",
-"Edit categories" => "Modificar categorias",
-"From" => "Ab",
-"To" => "A",
-"Advanced options" => "Optiones avantiate",
-"Location" => "Loco",
-"Location of the Event" => "Loco del evento.",
-"Description" => "Description",
-"Description of the Event" => "Description del evento",
-"Repeat" => "Repeter",
-"Advanced" => "Avantiate",
-"Select weekdays" => "Seliger dies del septimana",
-"Select days" => "Seliger dies",
-"Select months" => "Seliger menses",
-"Select weeks" => "Seliger septimanas",
-"Interval" => "Intervallo",
-"End" => "Fin",
-"create a new calendar" => "crear un nove calendario",
-"Import a calendar file" => "Importar un file de calendario",
-"Name of new calendar" => "Nomine del calendario",
-"Import" => "Importar",
-"Close Dialog" => "Clauder dialogo",
-"Create a new event" => "Crear un nove evento",
-"View an event" => "Vide un evento",
-"No categories selected" => "Nulle categorias seligite",
-"of" => "de",
-"at" => "in",
-"Timezone" => "Fuso horari",
-"Users" => "Usatores",
-"Groups" => "Gruppos"
-);
diff --git a/apps/calendar/l10n/id.php b/apps/calendar/l10n/id.php
deleted file mode 100644
index 865c2118fa..0000000000
--- a/apps/calendar/l10n/id.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Timezone changed" => "Zona waktu telah diubah",
-"Invalid request" => "Permintaan tidak sah",
-"Calendar" => "Kalender",
-"Does not repeat" => "Tidak akan mengulangi",
-"Daily" => "Harian",
-"Weekly" => "Mingguan",
-"Every Weekday" => "Setiap Hari Minggu",
-"Bi-Weekly" => "Dwi-mingguan",
-"Monthly" => "Bulanan",
-"Yearly" => "Tahunan",
-"All day" => "Semua Hari",
-"Title" => "Judul",
-"Week" => "Minggu",
-"Month" => "Bulan",
-"Today" => "Hari ini",
-"Download" => "Unduh",
-"Edit" => "Sunting",
-"Edit calendar" => "Sunting kalender",
-"Displayname" => "Namatampilan",
-"Active" => "Aktif",
-"Calendar color" => "Warna kalender",
-"Submit" => "Sampaikan",
-"Edit an event" => "Sunting agenda",
-"Title of the Event" => "Judul Agenda",
-"Category" => "Kategori",
-"All Day Event" => "Agenda di Semua Hari",
-"From" => "Dari",
-"To" => "Ke",
-"Location" => "Lokasi",
-"Location of the Event" => "Lokasi Agenda",
-"Description" => "Deskripsi",
-"Description of the Event" => "Deskripsi dari Agenda",
-"Repeat" => "Ulangi",
-"Create a new event" => "Buat agenda baru",
-"Timezone" => "Zonawaktu"
-);
diff --git a/apps/calendar/l10n/it.php b/apps/calendar/l10n/it.php
deleted file mode 100644
index 04e10b582b..0000000000
--- a/apps/calendar/l10n/it.php
+++ /dev/null
@@ -1,198 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Not all calendars are completely cached" => "Non tutti i calendari sono mantenuti completamente in cache",
-"Everything seems to be completely cached" => "Tutto sembra essere mantenuto completamente in cache",
-"No calendars found." => "Nessun calendario trovato.",
-"No events found." => "Nessun evento trovato.",
-"Wrong calendar" => "Calendario sbagliato",
-"The file contained either no events or all events are already saved in your calendar." => "Il file non conteneva alcun evento o tutti gli eventi erano già salvati nel tuo calendario.",
-"events has been saved in the new calendar" => "gli eventi sono stati salvati nel nuovo calendario",
-"Import failed" => "Importazione non riuscita",
-"events has been saved in your calendar" => "gli eventi sono stati salvati nel tuo calendario",
-"New Timezone:" => "Nuovo fuso orario:",
-"Timezone changed" => "Fuso orario cambiato",
-"Invalid request" => "Richiesta non valida",
-"Calendar" => "Calendario",
-"ddd" => "ddd",
-"ddd M/d" => "ddd d/M",
-"dddd M/d" => "dddd d/M",
-"MMMM yyyy" => "MMMM yyyy",
-"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
-"dddd, MMM d, yyyy" => "dddd, d MMM yyyy",
-"Birthday" => "Compleanno",
-"Business" => "Azienda",
-"Call" => "Chiama",
-"Clients" => "Clienti",
-"Deliverer" => "Consegna",
-"Holidays" => "Vacanze",
-"Ideas" => "Idee",
-"Journey" => "Viaggio",
-"Jubilee" => "Anniversario",
-"Meeting" => "Riunione",
-"Other" => "Altro",
-"Personal" => "Personale",
-"Projects" => "Progetti",
-"Questions" => "Domande",
-"Work" => "Lavoro",
-"by" => "da",
-"unnamed" => "senza nome",
-"New Calendar" => "Nuovo calendario",
-"Does not repeat" => "Non ripetere",
-"Daily" => "Giornaliero",
-"Weekly" => "Settimanale",
-"Every Weekday" => "Ogni giorno della settimana",
-"Bi-Weekly" => "Ogni due settimane",
-"Monthly" => "Mensile",
-"Yearly" => "Annuale",
-"never" => "mai",
-"by occurrences" => "per occorrenze",
-"by date" => "per data",
-"by monthday" => "per giorno del mese",
-"by weekday" => "per giorno della settimana",
-"Monday" => "Lunedì",
-"Tuesday" => "Martedì",
-"Wednesday" => "Mercoledì",
-"Thursday" => "Giovedì",
-"Friday" => "Venerdì",
-"Saturday" => "Sabato",
-"Sunday" => "Domenica",
-"events week of month" => "settimana del mese degli eventi",
-"first" => "primo",
-"second" => "secondo",
-"third" => "terzo",
-"fourth" => "quarto",
-"fifth" => "quinto",
-"last" => "ultimo",
-"January" => "Gennaio",
-"February" => "Febbraio",
-"March" => "Marzo",
-"April" => "Aprile",
-"May" => "Maggio",
-"June" => "Giugno",
-"July" => "Luglio",
-"August" => "Agosto",
-"September" => "Settembre",
-"October" => "Ottobre",
-"November" => "Novembre",
-"December" => "Dicembre",
-"by events date" => "per data evento",
-"by yearday(s)" => "per giorno/i dell'anno",
-"by weeknumber(s)" => "per numero/i settimana",
-"by day and month" => "per giorno e mese",
-"Date" => "Data",
-"Cal." => "Cal.",
-"Sun." => "Dom.",
-"Mon." => "Lun.",
-"Tue." => "Mar.",
-"Wed." => "Mer.",
-"Thu." => "Gio.",
-"Fri." => "Ven.",
-"Sat." => "Sab.",
-"Jan." => "Gen.",
-"Feb." => "Feb.",
-"Mar." => "Mar.",
-"Apr." => "Apr.",
-"May." => "Mag.",
-"Jun." => "Giu.",
-"Jul." => "Lug.",
-"Aug." => "Ago.",
-"Sep." => "Set.",
-"Oct." => "Ott.",
-"Nov." => "Nov.",
-"Dec." => "Dic.",
-"All day" => "Tutti il giorno",
-"Missing fields" => "Campi mancanti",
-"Title" => "Titolo",
-"From Date" => "Dal giorno",
-"From Time" => "Ora iniziale",
-"To Date" => "Al giorno",
-"To Time" => "Ora finale",
-"The event ends before it starts" => "L'evento finisce prima d'iniziare",
-"There was a database fail" => "Si è verificato un errore del database",
-"Week" => "Settimana",
-"Month" => "Mese",
-"List" => "Elenco",
-"Today" => "Oggi",
-"Settings" => "Impostazioni",
-"Your calendars" => "I tuoi calendari",
-"CalDav Link" => "Collegamento CalDav",
-"Shared calendars" => "Calendari condivisi",
-"No shared calendars" => "Nessun calendario condiviso",
-"Share Calendar" => "Condividi calendario",
-"Download" => "Scarica",
-"Edit" => "Modifica",
-"Delete" => "Elimina",
-"shared with you by" => "condiviso con te da",
-"New calendar" => "Nuovo calendario",
-"Edit calendar" => "Modifica calendario",
-"Displayname" => "Nome visualizzato",
-"Active" => "Attivo",
-"Calendar color" => "Colore calendario",
-"Save" => "Salva",
-"Submit" => "Invia",
-"Cancel" => "Annulla",
-"Edit an event" => "Modifica un evento",
-"Export" => "Esporta",
-"Eventinfo" => "Informazioni evento",
-"Repeating" => "Ripetizione",
-"Alarm" => "Avviso",
-"Attendees" => "Partecipanti",
-"Share" => "Condividi",
-"Title of the Event" => "Titolo dell'evento",
-"Category" => "Categoria",
-"Separate categories with commas" => "Categorie separate da virgole",
-"Edit categories" => "Modifica le categorie",
-"All Day Event" => "Evento che occupa tutta la giornata",
-"From" => "Da",
-"To" => "A",
-"Advanced options" => "Opzioni avanzate",
-"Location" => "Luogo",
-"Location of the Event" => "Luogo dell'evento",
-"Description" => "Descrizione",
-"Description of the Event" => "Descrizione dell'evento",
-"Repeat" => "Ripeti",
-"Advanced" => "Avanzato",
-"Select weekdays" => "Seleziona i giorni della settimana",
-"Select days" => "Seleziona i giorni",
-"and the events day of year." => "e il giorno dell'anno degli eventi.",
-"and the events day of month." => "e il giorno del mese degli eventi.",
-"Select months" => "Seleziona i mesi",
-"Select weeks" => "Seleziona le settimane",
-"and the events week of year." => "e la settimana dell'anno degli eventi.",
-"Interval" => "Intervallo",
-"End" => "Fine",
-"occurrences" => "occorrenze",
-"create a new calendar" => "Crea un nuovo calendario",
-"Import a calendar file" => "Importa un file di calendario",
-"Please choose a calendar" => "Scegli un calendario",
-"Name of new calendar" => "Nome del nuovo calendario",
-"Take an available name!" => "Usa un nome disponibile!",
-"A Calendar with this name already exists. If you continue anyhow, these calendars will be merged." => "Un calendario con questo nome esiste già. Se continui, i due calendari saranno uniti.",
-"Import" => "Importa",
-"Close Dialog" => "Chiudi la finestra di dialogo",
-"Create a new event" => "Crea un nuovo evento",
-"View an event" => "Visualizza un evento",
-"No categories selected" => "Nessuna categoria selezionata",
-"of" => "di",
-"at" => "alle",
-"General" => "Generale",
-"Timezone" => "Fuso orario",
-"Update timezone automatically" => "Aggiorna automaticamente il fuso orario",
-"Time format" => "Formato orario",
-"24h" => "24h",
-"12h" => "12h",
-"Start week on" => "La settimana inizia il",
-"Cache" => "Cache",
-"Clear cache for repeating events" => "Cancella gli eventi che si ripetono dalla cache",
-"URLs" => "URL",
-"Calendar CalDAV syncing addresses" => "Indirizzi di sincronizzazione calendari CalDAV",
-"more info" => "ulteriori informazioni",
-"Primary address (Kontact et al)" => "Indirizzo principale (Kontact e altri)",
-"iOS/OS X" => "iOS/OS X",
-"Read only iCalendar link(s)" => "Collegamento(i) iCalendar sola lettura",
-"Users" => "Utenti",
-"select users" => "seleziona utenti",
-"Editable" => "Modificabile",
-"Groups" => "Gruppi",
-"select groups" => "seleziona gruppi",
-"make public" => "rendi pubblico"
-);
diff --git a/apps/calendar/l10n/ja_JP.php b/apps/calendar/l10n/ja_JP.php
deleted file mode 100644
index e59f186a0b..0000000000
--- a/apps/calendar/l10n/ja_JP.php
+++ /dev/null
@@ -1,199 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Not all calendars are completely cached" => "すべてのカレンダーは完全にキャッシュされていません",
-"Everything seems to be completely cached" => "すべて完全にキャッシュされていると思われます",
-"No calendars found." => "カレンダーが見つかりませんでした。",
-"No events found." => "イベントが見つかりませんでした。",
-"Wrong calendar" => "誤ったカレンダーです",
-"The file contained either no events or all events are already saved in your calendar." => "イベントの無いもしくはすべてのイベントを含むファイルは既にあなたのカレンダーに保存されています。",
-"events has been saved in the new calendar" => "イベントは新しいカレンダーに保存されました",
-"Import failed" => "インポートに失敗",
-"events has been saved in your calendar" => "イベントはあなたのカレンダーに保存されました",
-"New Timezone:" => "新しいタイムゾーン:",
-"Timezone changed" => "タイムゾーンが変更されました",
-"Invalid request" => "無効なリクエストです",
-"Calendar" => "カレンダー",
-"ddd" => "dddd",
-"ddd M/d" => "M月d日 （dddd）",
-"dddd M/d" => "M月d日 （dddd）",
-"MMMM yyyy" => "yyyy年M月",
-"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "yyyy年M月d日{ '～' [yyyy年][M月]d日}",
-"dddd, MMM d, yyyy" => "yyyy年M月d日 （dddd）",
-"Birthday" => "誕生日",
-"Business" => "ビジネス",
-"Call" => "電話をかける",
-"Clients" => "顧客",
-"Deliverer" => "運送会社",
-"Holidays" => "休日",
-"Ideas" => "アイデア",
-"Journey" => "旅行",
-"Jubilee" => "記念祭",
-"Meeting" => "ミーティング",
-"Other" => "その他",
-"Personal" => "個人",
-"Projects" => "プロジェクト",
-"Questions" => "質問事項",
-"Work" => "週の始まり",
-"by" => "による",
-"unnamed" => "無名",
-"New Calendar" => "新しくカレンダーを作成",
-"Does not repeat" => "繰り返さない",
-"Daily" => "毎日",
-"Weekly" => "毎週",
-"Every Weekday" => "毎平日",
-"Bi-Weekly" => "2週間ごと",
-"Monthly" => "毎月",
-"Yearly" => "毎年",
-"never" => "無し",
-"by occurrences" => "回数で指定",
-"by date" => "日付で指定",
-"by monthday" => "日にちで指定",
-"by weekday" => "曜日で指定",
-"Monday" => "月",
-"Tuesday" => "火",
-"Wednesday" => "水",
-"Thursday" => "木",
-"Friday" => "金",
-"Saturday" => "土",
-"Sunday" => "日",
-"events week of month" => "予定のある週を指定",
-"first" => "１週目",
-"second" => "２週目",
-"third" => "３週目",
-"fourth" => "４週目",
-"fifth" => "５週目",
-"last" => "最終週",
-"January" => "1月",
-"February" => "2月",
-"March" => "3月",
-"April" => "4月",
-"May" => "5月",
-"June" => "6月",
-"July" => "7月",
-"August" => "8月",
-"September" => "9月",
-"October" => "10月",
-"November" => "11月",
-"December" => "12月",
-"by events date" => "日付で指定",
-"by yearday(s)" => "日番号で指定",
-"by weeknumber(s)" => "週番号で指定",
-"by day and month" => "月と日で指定",
-"Date" => "日付",
-"Cal." => "カレンダー",
-"Sun." => "日",
-"Mon." => "月",
-"Tue." => "火",
-"Wed." => "水",
-"Thu." => "木",
-"Fri." => "金",
-"Sat." => "土",
-"Jan." => "1月",
-"Feb." => "2月",
-"Mar." => "3月",
-"Apr." => "4月",
-"May." => "5月",
-"Jun." => "6月",
-"Jul." => "7月",
-"Aug." => "8月",
-"Sep." => "9月",
-"Oct." => "10月",
-"Nov." => "11月",
-"Dec." => "12月",
-"All day" => "終日",
-"New Calendar" => "新しくカレンダーを作成する",
-"Missing fields" => "項目がありません",
-"Title" => "タイトル",
-"From Date" => "開始日",
-"From Time" => "開始時間",
-"To Date" => "終了日",
-"To Time" => "終了時間",
-"The event ends before it starts" => "イベント終了時間が開始時間より先です",
-"There was a database fail" => "データベースのエラーがありました",
-"Week" => "週",
-"Month" => "月",
-"List" => "予定リスト",
-"Today" => "今日",
-"Settings" => "設定",
-"Your calendars" => "あなたのカレンダー",
-"CalDav Link" => "CalDavへのリンク",
-"Shared calendars" => "共有カレンダー",
-"No shared calendars" => "共有カレンダーはありません",
-"Share Calendar" => "カレンダーを共有する",
-"Download" => "ダウンロード",
-"Edit" => "編集",
-"Delete" => "削除",
-"shared with you by" => "共有者",
-"New calendar" => "新しいカレンダー",
-"Edit calendar" => "カレンダーを編集",
-"Displayname" => "表示名",
-"Active" => "アクティブ",
-"Calendar color" => "カレンダーの色",
-"Save" => "保存",
-"Submit" => "完了",
-"Cancel" => "キャンセル",
-"Edit an event" => "イベントを編集",
-"Export" => "エクスポート",
-"Eventinfo" => "イベント情報",
-"Repeating" => "繰り返し",
-"Alarm" => "アラーム",
-"Attendees" => "参加者",
-"Share" => "共有",
-"Title of the Event" => "イベントのタイトル",
-"Category" => "カテゴリー",
-"Separate categories with commas" => "カテゴリをコンマで区切る",
-"Edit categories" => "カテゴリを編集",
-"All Day Event" => "終日イベント",
-"From" => "開始",
-"To" => "終了",
-"Advanced options" => "詳細設定",
-"Location" => "場所",
-"Location of the Event" => "イベントの場所",
-"Description" => "メモ",
-"Description of the Event" => "イベントの説明",
-"Repeat" => "繰り返し",
-"Advanced" => "詳細設定",
-"Select weekdays" => "曜日を指定",
-"Select days" => "日付を指定",
-"and the events day of year." => "対象の年を選択する。",
-"and the events day of month." => "対象の月を選択する。",
-"Select months" => "月を指定する",
-"Select weeks" => "週を指定する",
-"and the events week of year." => "対象の週を選択する。",
-"Interval" => "間隔",
-"End" => "繰り返す期間",
-"occurrences" => "回繰り返す",
-"create a new calendar" => "新規カレンダーの作成",
-"Import a calendar file" => "カレンダーファイルをインポート",
-"Please choose a calendar" => "カレンダーを選択してください",
-"Name of new calendar" => "新規カレンダーの名称",
-"Take an available name!" => "利用可能な名前を指定してください！",
-"A Calendar with this name already exists. If you continue anyhow, these calendars will be merged." => "このカレンダー名はすでに使われています。もし続行する場合は、これらのカレンダーはマージされます。",
-"Import" => "インポート",
-"Close Dialog" => "ダイアログを閉じる",
-"Create a new event" => "新しいイベントを作成",
-"View an event" => "イベントを閲覧",
-"No categories selected" => "カテゴリが選択されていません",
-"of" => "of",
-"at" => "at",
-"General" => "一般",
-"Timezone" => "タイムゾーン",
-"Update timezone automatically" => "自動的にタイムゾーンを更新",
-"Time format" => "時刻の表示形式",
-"24h" => "24h",
-"12h" => "12h",
-"Start week on" => "1週間の初めの曜日",
-"Cache" => "キャッシュ",
-"Clear cache for repeating events" => "繰り返しイベントのキャッシュをクリア",
-"URLs" => "URL",
-"Calendar CalDAV syncing addresses" => "CalDAVカレンダーの同期用アドレス",
-"more info" => "さらに",
-"Primary address (Kontact et al)" => "プライマリアドレス（コンタクト等）",
-"iOS/OS X" => "iOS/OS X",
-"Read only iCalendar link(s)" => "読み取り専用のiCalendarリンク",
-"Users" => "ユーザ",
-"select users" => "ユーザを選択",
-"Editable" => "編集可能",
-"Groups" => "グループ",
-"select groups" => "グループを選択",
-"make public" => "公開する"
-);
diff --git a/apps/calendar/l10n/ko.php b/apps/calendar/l10n/ko.php
deleted file mode 100644
index 77e421d4aa..0000000000
--- a/apps/calendar/l10n/ko.php
+++ /dev/null
@@ -1,156 +0,0 @@
-<?php $TRANSLATIONS = array(
-"No calendars found." => "달력이 없습니다",
-"No events found." => "일정이 없습니다",
-"Wrong calendar" => "잘못된 달력",
-"New Timezone:" => "새로운 시간대 설정",
-"Timezone changed" => "시간대 변경됨",
-"Invalid request" => "잘못된 요청",
-"Calendar" => "달력",
-"ddd" => "ddd",
-"ddd M/d" => "ddd M/d",
-"dddd M/d" => "dddd M/d",
-"MMMM yyyy" => "MMMM yyyy",
-"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
-"dddd, MMM d, yyyy" => "dddd, MMM d, yyyy",
-"Birthday" => "생일",
-"Business" => "사업",
-"Call" => "통화",
-"Clients" => "클라이언트",
-"Deliverer" => "배송",
-"Holidays" => "공휴일",
-"Ideas" => "생각",
-"Journey" => "여행",
-"Jubilee" => "기념일",
-"Meeting" => "미팅",
-"Other" => "기타",
-"Personal" => "개인",
-"Projects" => "프로젝트",
-"Questions" => "질문",
-"Work" => "작업",
-"unnamed" => "익명의",
-"New Calendar" => "새로운 달력",
-"Does not repeat" => "반복 없음",
-"Daily" => "매일",
-"Weekly" => "매주",
-"Every Weekday" => "매주 특정 요일",
-"Bi-Weekly" => "2주마다",
-"Monthly" => "매월",
-"Yearly" => "매년",
-"never" => "전혀",
-"by occurrences" => "번 이후",
-"by date" => "날짜",
-"by monthday" => "월",
-"by weekday" => "주",
-"Monday" => "월요일",
-"Tuesday" => "화요일",
-"Wednesday" => "수요일",
-"Thursday" => "목요일",
-"Friday" => "금요일",
-"Saturday" => "토요일",
-"Sunday" => "일요일",
-"events week of month" => "이달의 한 주 일정",
-"first" => "첫번째",
-"second" => "두번째",
-"third" => "세번째",
-"fourth" => "네번째",
-"fifth" => "다섯번째",
-"last" => "마지막",
-"January" => "1월",
-"February" => "2월",
-"March" => "3월",
-"April" => "4월",
-"May" => "5월",
-"June" => "6월",
-"July" => "7월",
-"August" => "8월",
-"September" => "9월",
-"October" => "10월",
-"November" => "11월",
-"December" => "12월",
-"by events date" => "이벤트 날짜 순",
-"by yearday(s)" => "날짜 번호 순",
-"by weeknumber(s)" => "주 번호 순",
-"by day and month" => "날짜 순",
-"Date" => "날짜",
-"Cal." => "달력",
-"All day" => "매일",
-"Missing fields" => "기입란이 비어있습니다",
-"Title" => "제목",
-"From Date" => "시작날짜",
-"From Time" => "시작시간",
-"To Date" => "마침 날짜",
-"To Time" => "마침 시간",
-"The event ends before it starts" => "마침일정이 시작일정 보다 빠릅니다. ",
-"There was a database fail" => "데이터베이스 에러입니다.",
-"Week" => "주",
-"Month" => "달",
-"List" => "목록",
-"Today" => "오늘",
-"Your calendars" => "내 달력",
-"CalDav Link" => "CalDav 링크",
-"Shared calendars" => "공유 달력",
-"No shared calendars" => "달력 공유하지 않음",
-"Share Calendar" => "달력 공유",
-"Download" => "다운로드",
-"Edit" => "편집",
-"Delete" => "삭제",
-"shared with you by" => "로 인해 당신과 함께 공유",
-"New calendar" => "새로운 달력",
-"Edit calendar" => "달력 편집",
-"Displayname" => "표시 이름",
-"Active" => "활성",
-"Calendar color" => "달력 색상",
-"Save" => "저장",
-"Submit" => "보내기",
-"Cancel" => "취소",
-"Edit an event" => "이벤트 편집",
-"Export" => "출력",
-"Eventinfo" => "일정 정보",
-"Repeating" => "반복",
-"Alarm" => "알람",
-"Attendees" => "참석자",
-"Share" => "공유",
-"Title of the Event" => "이벤트 제목",
-"Category" => "분류",
-"Separate categories with commas" => "쉼표로 카테고리 구분",
-"Edit categories" => "카테고리 수정",
-"All Day Event" => "종일 이벤트",
-"From" => "시작",
-"To" => "끝",
-"Advanced options" => "고급 설정",
-"Location" => "위치",
-"Location of the Event" => "이벤트 위치",
-"Description" => "설명",
-"Description of the Event" => "이벤트 설명",
-"Repeat" => "반복",
-"Advanced" => "고급",
-"Select weekdays" => "요일 선택",
-"Select days" => "날짜 선택",
-"and the events day of year." => "그리고 이 해의 일정",
-"and the events day of month." => "그리고 이 달의 일정",
-"Select months" => "달 선택",
-"Select weeks" => "주 선택",
-"and the events week of year." => "그리고 이 해의 주간 일정",
-"Interval" => "간격",
-"End" => "끝",
-"occurrences" => "번 이후",
-"create a new calendar" => "새 달력 만들기",
-"Import a calendar file" => "달력 파일 가져오기",
-"Name of new calendar" => "새 달력 이름",
-"Import" => "입력",
-"Close Dialog" => "대화 마침",
-"Create a new event" => "새 이벤트 만들기",
-"View an event" => "일정 보기",
-"No categories selected" => "선택된 카테고리 없음",
-"of" => "의",
-"at" => "에서",
-"Timezone" => "시간대",
-"24h" => "24시간",
-"12h" => "12시간",
-"Users" => "사용자",
-"select users" => "사용자 선택",
-"Editable" => "편집 가능",
-"Groups" => "그룹",
-"select groups" => "선택 그룹",
-"make public" => "공개"
-);
diff --git a/apps/calendar/l10n/lb.php b/apps/calendar/l10n/lb.php
deleted file mode 100644
index 6e96b5df18..0000000000
--- a/apps/calendar/l10n/lb.php
+++ /dev/null
@@ -1,129 +0,0 @@
-<?php $TRANSLATIONS = array(
-"No calendars found." => "Keng Kalenner fonnt.",
-"No events found." => "Keng Evenementer fonnt.",
-"Wrong calendar" => "Falschen Kalenner",
-"New Timezone:" => "Nei Zäitzone:",
-"Timezone changed" => "Zäitzon geännert",
-"Invalid request" => "Ongülteg Requête",
-"Calendar" => "Kalenner",
-"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
-"Birthday" => "Gebuertsdag",
-"Business" => "Geschäftlech",
-"Call" => "Uruff",
-"Clients" => "Clienten",
-"Deliverer" => "Liwwerant",
-"Holidays" => "Vakanzen",
-"Ideas" => "Ideeën",
-"Journey" => "Dag",
-"Jubilee" => "Jubiläum",
-"Meeting" => "Meeting",
-"Other" => "Aner",
-"Personal" => "Perséinlech",
-"Projects" => "Projeten",
-"Questions" => "Froen",
-"Work" => "Aarbecht",
-"New Calendar" => "Neien Kalenner",
-"Does not repeat" => "Widderhëlt sech net",
-"Daily" => "Deeglech",
-"Weekly" => "All Woch",
-"Every Weekday" => "All Wochendag",
-"Bi-Weekly" => "All zweet Woch",
-"Monthly" => "All Mount",
-"Yearly" => "All Joer",
-"never" => "ni",
-"by occurrences" => "no Virkommes",
-"by date" => "no Datum",
-"by monthday" => "no Mount-Dag",
-"by weekday" => "no Wochendag",
-"Monday" => "Méindes",
-"Tuesday" => "Dënschdes",
-"Wednesday" => "Mëttwoch",
-"Thursday" => "Donneschdes",
-"Friday" => "Freides",
-"Saturday" => "Samschdes",
-"Sunday" => "Sonndes",
-"first" => "éischt",
-"second" => "Sekonn",
-"third" => "Drëtt",
-"fourth" => "Féiert",
-"fifth" => "Fënneft",
-"last" => "Läscht",
-"January" => "Januar",
-"February" => "Februar",
-"March" => "Mäerz",
-"April" => "Abrëll",
-"May" => "Mee",
-"June" => "Juni",
-"July" => "Juli",
-"August" => "August",
-"September" => "September",
-"October" => "Oktober",
-"November" => "November",
-"December" => "Dezember",
-"Date" => "Datum",
-"Cal." => "Cal.",
-"All day" => "All Dag",
-"Missing fields" => "Felder déi feelen",
-"Title" => "Titel",
-"From Date" => "Vun Datum",
-"From Time" => "Vun Zäit",
-"To Date" => "Bis Datum",
-"To Time" => "Bis Zäit",
-"The event ends before it starts" => "D'Evenement hält op ier et ufänkt",
-"There was a database fail" => "En Datebank Feeler ass opgetrueden",
-"Week" => "Woch",
-"Month" => "Mount",
-"List" => "Lescht",
-"Today" => "Haut",
-"Your calendars" => "Deng Kalenneren",
-"CalDav Link" => "CalDav Link",
-"Shared calendars" => "Gedeelte Kalenneren",
-"No shared calendars" => "Keng gedeelten Kalenneren",
-"Download" => "Eroflueden",
-"Edit" => "Editéieren",
-"Delete" => "Läschen",
-"New calendar" => "Neien Kalenner",
-"Edit calendar" => "Kalenner editéieren",
-"Displayname" => "Numm",
-"Active" => "Aktiv",
-"Calendar color" => "Fuerf vum Kalenner",
-"Save" => "Späicheren",
-"Submit" => "Fortschécken",
-"Cancel" => "Ofbriechen",
-"Edit an event" => "Evenement editéieren",
-"Export" => "Export",
-"Title of the Event" => "Titel vum Evenement",
-"Category" => "Kategorie",
-"All Day Event" => "Ganz-Dag Evenement",
-"From" => "Vun",
-"To" => "Fir",
-"Advanced options" => "Avancéiert Optiounen",
-"Location" => "Uert",
-"Location of the Event" => "Uert vum Evenement",
-"Description" => "Beschreiwung",
-"Description of the Event" => "Beschreiwung vum Evenement",
-"Repeat" => "Widderhuelen",
-"Advanced" => "Erweidert",
-"Select weekdays" => "Wochendeeg auswielen",
-"Select days" => "Deeg auswielen",
-"Select months" => "Méint auswielen",
-"Select weeks" => "Wochen auswielen",
-"Interval" => "Intervall",
-"End" => "Enn",
-"occurrences" => "Virkommes",
-"Import a calendar file" => "E Kalenner Fichier importéieren",
-"Please choose the calendar" => "Wiel den Kalenner aus",
-"create a new calendar" => "E neie Kalenner uleeën",
-"Name of new calendar" => "Numm vum neie Kalenner",
-"Import" => "Import",
-"Importing calendar" => "Importéiert Kalenner",
-"Calendar imported successfully" => "Kalenner erfollegräich importéiert",
-"Close Dialog" => "Dialog zoumaachen",
-"Create a new event" => "En Evenement maachen",
-"Select category" => "Kategorie auswielen",
-"Timezone" => "Zäitzon",
-"Timeformat" => "Zäit Format",
-"24h" => "24h",
-"12h" => "12h",
-"Calendar CalDAV syncing address:" => "CalDAV Kalenner Synchronisatioun's Adress:"
-);
diff --git a/apps/calendar/l10n/lt_LT.php b/apps/calendar/l10n/lt_LT.php
deleted file mode 100644
index 408718071e..0000000000
--- a/apps/calendar/l10n/lt_LT.php
+++ /dev/null
@@ -1,137 +0,0 @@
-<?php $TRANSLATIONS = array(
-"No calendars found." => "Kalendorių nerasta.",
-"No events found." => "Įvykių nerasta.",
-"Wrong calendar" => "Ne tas kalendorius",
-"New Timezone:" => "Nauja laiko juosta:",
-"Timezone changed" => "Laiko zona pakeista",
-"Invalid request" => "Klaidinga užklausa",
-"Calendar" => "Kalendorius",
-"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
-"Birthday" => "Gimtadienis",
-"Business" => "Verslas",
-"Call" => "Skambučiai",
-"Clients" => "Klientai",
-"Deliverer" => "Vykdytojas",
-"Holidays" => "Išeiginės",
-"Ideas" => "Idėjos",
-"Journey" => "Kelionė",
-"Jubilee" => "Jubiliejus",
-"Meeting" => "Susitikimas",
-"Other" => "Kiti",
-"Personal" => "Asmeniniai",
-"Projects" => "Projektai",
-"Questions" => "Klausimai",
-"Work" => "Darbas",
-"unnamed" => "be pavadinimo",
-"New Calendar" => "Naujas kalendorius",
-"Does not repeat" => "Nekartoti",
-"Daily" => "Kasdien",
-"Weekly" => "Kiekvieną savaitę",
-"Every Weekday" => "Kiekvieną savaitės dieną",
-"Bi-Weekly" => "Kas dvi savaites",
-"Monthly" => "Kiekvieną mėnesį",
-"Yearly" => "Kiekvienais metais",
-"never" => "niekada",
-"by date" => "pagal datą",
-"by monthday" => "pagal mėnesio dieną",
-"by weekday" => "pagal savaitės dieną",
-"Monday" => "Pirmadienis",
-"Tuesday" => "Antradienis",
-"Wednesday" => "Trečiadienis",
-"Thursday" => "Ketvirtadienis",
-"Friday" => "Penktadienis",
-"Saturday" => "Šeštadienis",
-"Sunday" => "Sekmadienis",
-"January" => "Sausis",
-"February" => "Vasaris",
-"March" => "Kovas",
-"April" => "Balandis",
-"May" => "Gegužė",
-"June" => "Birželis",
-"July" => "Liepa",
-"August" => "Rugpjūtis",
-"September" => "Rugsėjis",
-"October" => "Spalis",
-"November" => "Lapkritis",
-"December" => "Gruodis",
-"Date" => "Data",
-"Cal." => "Kal.",
-"All day" => "Visa diena",
-"Missing fields" => "Trūkstami laukai",
-"Title" => "Pavadinimas",
-"From Date" => "Nuo datos",
-"From Time" => "Nuo laiko",
-"To Date" => "Iki datos",
-"To Time" => "Iki laiko",
-"The event ends before it starts" => "Įvykis baigiasi anksčiau nei jis prasideda",
-"There was a database fail" => "Įvyko duomenų bazės klaida",
-"Week" => "Savaitė",
-"Month" => "Mėnuo",
-"List" => "Sąrašas",
-"Today" => "Šiandien",
-"Your calendars" => "Jūsų kalendoriai",
-"CalDav Link" => "CalDav adresas",
-"Shared calendars" => "Bendri kalendoriai",
-"No shared calendars" => "Bendrų kalendorių nėra",
-"Share Calendar" => "Dalintis kalendoriumi",
-"Download" => "Atsisiųsti",
-"Edit" => "Keisti",
-"Delete" => "Trinti",
-"New calendar" => "Naujas kalendorius",
-"Edit calendar" => "Taisyti kalendorių",
-"Displayname" => "Pavadinimas",
-"Active" => "Naudojamas",
-"Calendar color" => "Kalendoriaus spalva",
-"Save" => "Išsaugoti",
-"Submit" => "Išsaugoti",
-"Cancel" => "Atšaukti",
-"Edit an event" => "Taisyti įvykį",
-"Export" => "Eksportuoti",
-"Eventinfo" => "Informacija",
-"Repeating" => "Pasikartojantis",
-"Alarm" => "Priminimas",
-"Attendees" => "Dalyviai",
-"Share" => "Dalintis",
-"Title of the Event" => "Įvykio pavadinimas",
-"Category" => "Kategorija",
-"Separate categories with commas" => "Atskirkite kategorijas kableliais",
-"Edit categories" => "Redaguoti kategorijas",
-"All Day Event" => "Visos dienos įvykis",
-"From" => "Nuo",
-"To" => "Iki",
-"Advanced options" => "Papildomi nustatymai",
-"Location" => "Vieta",
-"Location of the Event" => "Įvykio vieta",
-"Description" => "Aprašymas",
-"Description of the Event" => "Įvykio aprašymas",
-"Repeat" => "Kartoti",
-"Select weekdays" => "Pasirinkite savaitės dienas",
-"Select days" => "Pasirinkite dienas",
-"Select months" => "Pasirinkite mėnesius",
-"Select weeks" => "Pasirinkite savaites",
-"Interval" => "Intervalas",
-"End" => "Pabaiga",
-"create a new calendar" => "sukurti naują kalendorių",
-"Import a calendar file" => "Importuoti kalendoriaus failą",
-"Please choose the calendar" => "Pasirinkite kalendorių",
-"create a new calendar" => "sukurti naują kalendorių",
-"Name of new calendar" => "Naujo kalendoriaus pavadinimas",
-"Import" => "Importuoti",
-"Importing calendar" => "Importuojamas kalendorius",
-"Calendar imported successfully" => "Kalendorius sėkmingai importuotas",
-"Close Dialog" => "Uždaryti",
-"Create a new event" => "Sukurti naują įvykį",
-"View an event" => "Peržiūrėti įvykį",
-"No categories selected" => "Nepasirinktos jokios katagorijos",
-"Timezone" => "Laiko juosta",
-"Check always for changes of the timezone" => "Visada tikrinti laiko zonos pasikeitimus",
-"Timeformat" => "Laiko formatas",
-"24h" => "24val",
-"12h" => "12val",
-"Users" => "Vartotojai",
-"select users" => "pasirinkti vartotojus",
-"Editable" => "Redaguojamas",
-"Groups" => "Grupės",
-"select groups" => "pasirinkti grupes",
-"make public" => "viešinti"
-);
diff --git a/apps/calendar/l10n/mk.php b/apps/calendar/l10n/mk.php
deleted file mode 100644
index 1a03101fe5..0000000000
--- a/apps/calendar/l10n/mk.php
+++ /dev/null
@@ -1,156 +0,0 @@
-<?php $TRANSLATIONS = array(
-"No calendars found." => "Не се најдени календари.",
-"No events found." => "Не се најдени настани.",
-"Wrong calendar" => "Погрешен календар",
-"New Timezone:" => "Нова временска зона:",
-"Timezone changed" => "Временската зона е променета",
-"Invalid request" => "Неправилно барање",
-"Calendar" => "Календар",
-"ddd" => "ддд",
-"ddd M/d" => "ддд М/д",
-"dddd M/d" => "дддд М/д",
-"MMMM yyyy" => "ММММ гггг",
-"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
-"dddd, MMM d, yyyy" => "дддд, МММ д, гггг",
-"Birthday" => "Роденден",
-"Business" => "Деловно",
-"Call" => "Повикај",
-"Clients" => "Клиенти",
-"Deliverer" => "Доставувач",
-"Holidays" => "Празници",
-"Ideas" => "Идеи",
-"Journey" => "Патување",
-"Jubilee" => "Јубилеј",
-"Meeting" => "Состанок",
-"Other" => "Останато",
-"Personal" => "Лично",
-"Projects" => "Проекти",
-"Questions" => "Прашања",
-"Work" => "Работа",
-"unnamed" => "неименувано",
-"New Calendar" => "Нов календар",
-"Does not repeat" => "Не се повторува",
-"Daily" => "Дневно",
-"Weekly" => "Седмично",
-"Every Weekday" => "Секој работен ден",
-"Bi-Weekly" => "Дво-седмично",
-"Monthly" => "Месечно",
-"Yearly" => "Годишно",
-"never" => "никогаш",
-"by occurrences" => "по настан",
-"by date" => "по датум",
-"by monthday" => "по ден во месецот",
-"by weekday" => "по работен ден",
-"Monday" => "Понеделник",
-"Tuesday" => "Вторник",
-"Wednesday" => "Среда",
-"Thursday" => "Четврток",
-"Friday" => "Петок",
-"Saturday" => "Сабота",
-"Sunday" => "Недела",
-"events week of month" => "седмични настани од месец",
-"first" => "прв",
-"second" => "втор",
-"third" => "трет",
-"fourth" => "четврт",
-"fifth" => "пет",
-"last" => "последен",
-"January" => "Јануари",
-"February" => "Февруари",
-"March" => "Март",
-"April" => "Април",
-"May" => "Мај",
-"June" => "Јуни",
-"July" => "Јули",
-"August" => "Август",
-"September" => "Септември",
-"October" => "Октомври",
-"November" => "Ноември",
-"December" => "Декември",
-"by events date" => "по датумот на настанот",
-"by yearday(s)" => "по вчерашните",
-"by weeknumber(s)" => "по број на седмицата",
-"by day and month" => "по ден и месец",
-"Date" => "Датум",
-"Cal." => "Кал.",
-"All day" => "Цел ден",
-"Missing fields" => "Полиња кои недостасуваат",
-"Title" => "Наслов",
-"From Date" => "Од датум",
-"From Time" => "Од време",
-"To Date" => "До датум",
-"To Time" => "До време",
-"The event ends before it starts" => "Овој настан завршува пред за почне",
-"There was a database fail" => "Имаше проблем со базата",
-"Week" => "Седмица",
-"Month" => "Месец",
-"List" => "Листа",
-"Today" => "Денеска",
-"Your calendars" => "Ваши календари",
-"CalDav Link" => "Врска за CalDav",
-"Shared calendars" => "Споделени календари",
-"No shared calendars" => "Нема споделени календари",
-"Share Calendar" => "Сподели календар",
-"Download" => "Преземи",
-"Edit" => "Уреди",
-"Delete" => "Избриши",
-"shared with you by" => "Споделен со вас од",
-"New calendar" => "Нов календар",
-"Edit calendar" => "Уреди календар",
-"Displayname" => "Име за приказ",
-"Active" => "Активен",
-"Calendar color" => "Боја на календарот",
-"Save" => "Сними",
-"Submit" => "Прати",
-"Cancel" => "Откажи",
-"Edit an event" => "Уреди настан",
-"Export" => "Извези",
-"Eventinfo" => "Инфо за настан",
-"Repeating" => "Повторување",
-"Alarm" => "Аларм",
-"Attendees" => "Присутни",
-"Share" => "Сподели",
-"Title of the Event" => "Наслов на настанот",
-"Category" => "Категорија",
-"Separate categories with commas" => "Одвоете ги категориите со запирка",
-"Edit categories" => "Уреди категории",
-"All Day Event" => "Целодневен настан",
-"From" => "Од",
-"To" => "До",
-"Advanced options" => "Напредни опции",
-"Location" => "Локација",
-"Location of the Event" => "Локација на настанот",
-"Description" => "Опис",
-"Description of the Event" => "Опис на настанот",
-"Repeat" => "Повтори",
-"Advanced" => "Напредно",
-"Select weekdays" => "Избери работни денови",
-"Select days" => "Избери денови",
-"and the events day of year." => "и настаните ден од година.",
-"and the events day of month." => "и настаните ден од месец.",
-"Select months" => "Избери месеци",
-"Select weeks" => "Избери седмици",
-"and the events week of year." => "и настаните седмица од година.",
-"Interval" => "интервал",
-"End" => "Крај",
-"occurrences" => "повторувања",
-"create a new calendar" => "создади нов календар",
-"Import a calendar file" => "Внеси календар од датотека ",
-"Name of new calendar" => "Име на новиот календар",
-"Import" => "Увези",
-"Close Dialog" => "Затвори дијалог",
-"Create a new event" => "Создади нов настан",
-"View an event" => "Погледај настан",
-"No categories selected" => "Нема избрано категории",
-"of" => "од",
-"at" => "на",
-"Timezone" => "Временска зона",
-"24h" => "24ч",
-"12h" => "12ч",
-"Users" => "Корисници",
-"select users" => "избери корисници",
-"Editable" => "Изменливо",
-"Groups" => "Групи",
-"select groups" => "избери групи",
-"make public" => "направи јавно"
-);
diff --git a/apps/calendar/l10n/ms_MY.php b/apps/calendar/l10n/ms_MY.php
deleted file mode 100644
index 4be91a4019..0000000000
--- a/apps/calendar/l10n/ms_MY.php
+++ /dev/null
@@ -1,156 +0,0 @@
-<?php $TRANSLATIONS = array(
-"No calendars found." => "Tiada kalendar dijumpai.",
-"No events found." => "Tiada agenda dijumpai.",
-"Wrong calendar" => "Silap kalendar",
-"New Timezone:" => "Timezone Baru",
-"Timezone changed" => "Zon waktu diubah",
-"Invalid request" => "Permintaan tidak sah",
-"Calendar" => "Kalendar",
-"ddd" => "ddd",
-"ddd M/d" => "dd M/d",
-"dddd M/d" => "dddd M/d",
-"MMMM yyyy" => "MMMM yyyy",
-"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
-"dddd, MMM d, yyyy" => "dddd, MMM d, yyy",
-"Birthday" => "Hari lahir",
-"Business" => "Perniagaan",
-"Call" => "Panggilan",
-"Clients" => "Klien",
-"Deliverer" => "Penghantar",
-"Holidays" => "Cuti",
-"Ideas" => "Idea",
-"Journey" => "Perjalanan",
-"Jubilee" => "Jubli",
-"Meeting" => "Perjumpaan",
-"Other" => "Lain",
-"Personal" => "Peribadi",
-"Projects" => "Projek",
-"Questions" => "Soalan",
-"Work" => "Kerja",
-"unnamed" => "tiada nama",
-"New Calendar" => "Kalendar baru",
-"Does not repeat" => "Tidak berulang",
-"Daily" => "Harian",
-"Weekly" => "Mingguan",
-"Every Weekday" => "Setiap hari minggu",
-"Bi-Weekly" => "Dua kali seminggu",
-"Monthly" => "Bulanan",
-"Yearly" => "Tahunan",
-"never" => "jangan",
-"by occurrences" => "dari kekerapan",
-"by date" => "dari tarikh",
-"by monthday" => "dari haribulan",
-"by weekday" => "dari hari minggu",
-"Monday" => "Isnin",
-"Tuesday" => "Selasa",
-"Wednesday" => "Rabu",
-"Thursday" => "Khamis",
-"Friday" => "Jumaat",
-"Saturday" => "Sabtu",
-"Sunday" => "Ahad",
-"events week of month" => "event minggu dari bulan",
-"first" => "pertama",
-"second" => "kedua",
-"third" => "ketiga",
-"fourth" => "keempat",
-"fifth" => "kelima",
-"last" => "akhir",
-"January" => "Januari",
-"February" => "Februari",
-"March" => "Mac",
-"April" => "April",
-"May" => "Mei",
-"June" => "Jun",
-"July" => "Julai",
-"August" => "Ogos",
-"September" => "September",
-"October" => "Oktober",
-"November" => "November",
-"December" => "Disember",
-"by events date" => "dari tarikh event",
-"by yearday(s)" => "dari tahun",
-"by weeknumber(s)" => "dari nombor minggu",
-"by day and month" => "dari hari dan bulan",
-"Date" => "Tarikh",
-"Cal." => "Kalendar",
-"All day" => "Sepanjang hari",
-"Missing fields" => "Ruangan tertinggal",
-"Title" => "Tajuk",
-"From Date" => "Dari tarikh",
-"From Time" => "Masa Dari",
-"To Date" => "Sehingga kini",
-"To Time" => "Semasa",
-"The event ends before it starts" => "Peristiwa berakhir sebelum bermula",
-"There was a database fail" => "Terdapat kegagalan pada pengkalan data",
-"Week" => "Minggu",
-"Month" => "Bulan",
-"List" => "Senarai",
-"Today" => "Hari ini",
-"Your calendars" => "Kalendar anda",
-"CalDav Link" => "Pautan CalDav",
-"Shared calendars" => "Kalendar Kongsian",
-"No shared calendars" => "Tiada kalendar kongsian",
-"Share Calendar" => "Kongsi Kalendar",
-"Download" => "Muat turun",
-"Edit" => "Edit",
-"Delete" => "Hapus",
-"shared with you by" => "dikongsi dengan kamu oleh",
-"New calendar" => "Kalendar baru",
-"Edit calendar" => "Edit kalendar",
-"Displayname" => "Paparan nama",
-"Active" => "Aktif",
-"Calendar color" => "Warna kalendar",
-"Save" => "Simpan",
-"Submit" => "Hantar",
-"Cancel" => "Batal",
-"Edit an event" => "Edit agenda",
-"Export" => "Export",
-"Eventinfo" => "Maklumat agenda",
-"Repeating" => "Pengulangan",
-"Alarm" => "Penggera",
-"Attendees" => "Jemputan",
-"Share" => "Berkongsi",
-"Title of the Event" => "Tajuk agenda",
-"Category" => "kategori",
-"Separate categories with commas" => "Asingkan kategori dengan koma",
-"Edit categories" => "Sunting Kategori",
-"All Day Event" => "Agenda di sepanjang hari ",
-"From" => "Dari",
-"To" => "ke",
-"Advanced options" => "Pilihan maju",
-"Location" => "Lokasi",
-"Location of the Event" => "Lokasi agenda",
-"Description" => "Huraian",
-"Description of the Event" => "Huraian agenda",
-"Repeat" => "Ulang",
-"Advanced" => "Maju",
-"Select weekdays" => "Pilih hari minggu",
-"Select days" => "Pilih hari",
-"and the events day of year." => "dan hari event dalam tahun.",
-"and the events day of month." => "dan hari event dalam bulan.",
-"Select months" => "Pilih bulan",
-"Select weeks" => "Pilih minggu",
-"and the events week of year." => "dan event mingguan dalam setahun.",
-"Interval" => "Tempoh",
-"End" => "Tamat",
-"occurrences" => "Peristiwa",
-"create a new calendar" => "Cipta kalendar baru",
-"Import a calendar file" => "Import fail kalendar",
-"Name of new calendar" => "Nama kalendar baru",
-"Import" => "Import",
-"Close Dialog" => "Tutup dialog",
-"Create a new event" => "Buat agenda baru",
-"View an event" => "Papar peristiwa",
-"No categories selected" => "Tiada kategori dipilih",
-"of" => "dari",
-"at" => "di",
-"Timezone" => "Zon waktu",
-"24h" => "24h",
-"12h" => "12h",
-"Users" => "Pengguna",
-"select users" => "Pilih pengguna",
-"Editable" => "Boleh disunting",
-"Groups" => "Kumpulan-kumpulan",
-"select groups" => "pilih kumpulan-kumpulan",
-"make public" => "jadikan tontonan awam"
-);
diff --git a/apps/calendar/l10n/nb_NO.php b/apps/calendar/l10n/nb_NO.php
deleted file mode 100644
index 8f736869de..0000000000
--- a/apps/calendar/l10n/nb_NO.php
+++ /dev/null
@@ -1,160 +0,0 @@
-<?php $TRANSLATIONS = array(
-"No calendars found." => "Ingen kalendere funnet",
-"No events found." => "Ingen hendelser funnet",
-"Wrong calendar" => "Feil kalender",
-"New Timezone:" => "Ny tidssone:",
-"Timezone changed" => "Tidssone endret",
-"Invalid request" => "Ugyldig forespørsel",
-"Calendar" => "Kalender",
-"Birthday" => "Bursdag",
-"Business" => "Forretninger",
-"Call" => "Ring",
-"Clients" => "Kunder",
-"Holidays" => "Ferie",
-"Ideas" => "Ideér",
-"Journey" => "Reise",
-"Jubilee" => "Jubileum",
-"Meeting" => "Møte",
-"Other" => "Annet",
-"Personal" => "ersonlig",
-"Projects" => "Prosjekter",
-"Questions" => "Spørsmål",
-"Work" => "Arbeid",
-"unnamed" => "uten navn",
-"New Calendar" => "Ny kalender",
-"Does not repeat" => "Gjentas ikke",
-"Daily" => "Daglig",
-"Weekly" => "Ukentlig",
-"Every Weekday" => "Hver ukedag",
-"Bi-Weekly" => "Annenhver uke",
-"Monthly" => "Månedlig",
-"Yearly" => "Årlig",
-"never" => "aldri",
-"by occurrences" => "etter hyppighet",
-"by date" => "etter dato",
-"by monthday" => "etter dag i måned",
-"by weekday" => "etter ukedag",
-"Monday" => "Mandag",
-"Tuesday" => "Tirsdag",
-"Wednesday" => "Onsdag",
-"Thursday" => "Torsdag",
-"Friday" => "Fredag",
-"Saturday" => "Lørdag",
-"Sunday" => "Søndag",
-"events week of month" => "begivenhetens uke denne måneden",
-"first" => "første",
-"second" => "andre",
-"third" => "tredje",
-"fourth" => "fjerde",
-"fifth" => "femte",
-"last" => "siste",
-"January" => "Januar",
-"February" => "Februar",
-"March" => "Mars",
-"April" => "April",
-"May" => "Mai",
-"June" => "Juni",
-"July" => "Juli",
-"August" => "August",
-"September" => "September",
-"October" => "Oktober",
-"November" => "November",
-"December" => "Desember",
-"by events date" => "etter hendelsenes dato",
-"by yearday(s)" => "etter dag i året",
-"by weeknumber(s)" => "etter ukenummer/-numre",
-"by day and month" => "etter dag og måned",
-"Date" => "Dato",
-"Cal." => "Kal.",
-"All day" => "Hele dagen ",
-"New Calendar" => "Ny kalender",
-"Missing fields" => "Manglende felt",
-"Title" => "Tittel",
-"From Date" => "Fra dato",
-"From Time" => "Fra tidspunkt",
-"To Date" => "Til dato",
-"To Time" => "Til tidspunkt",
-"The event ends before it starts" => "En hendelse kan ikke slutte før den har begynt.",
-"There was a database fail" => "Det oppstod en databasefeil.",
-"Week" => "Uke",
-"Month" => "ned",
-"List" => "Liste",
-"Today" => "I dag",
-"Calendars" => "Kalendre",
-"There was a fail, while parsing the file." => "Det oppstod en feil under åpningen av filen.",
-"Choose active calendars" => "Velg en aktiv kalender",
-"Your calendars" => "Dine kalendere",
-"CalDav Link" => "CalDav-lenke",
-"Shared calendars" => "Delte kalendere",
-"No shared calendars" => "Ingen delte kalendere",
-"Share Calendar" => "Del Kalender",
-"Download" => "Last ned",
-"Edit" => "Endre",
-"Delete" => "Slett",
-"shared with you by" => "delt med deg",
-"New calendar" => "Ny kalender",
-"Edit calendar" => "Rediger kalender",
-"Displayname" => "Visningsnavn",
-"Active" => "Aktiv",
-"Calendar color" => "Kalenderfarge",
-"Save" => "Lagre",
-"Submit" => "Lagre",
-"Cancel" => "Avbryt",
-"Edit an event" => "Rediger en hendelse",
-"Export" => "Eksporter",
-"Eventinfo" => "Hendelsesinformasjon",
-"Repeating" => "Gjentas",
-"Alarm" => "Alarm",
-"Attendees" => "Deltakere",
-"Share" => "Del",
-"Title of the Event" => "Hendelsestittel",
-"Category" => "Kategori",
-"Separate categories with commas" => "Separer kategorier med komma",
-"Edit categories" => "Rediger kategorier",
-"All Day Event" => "Hele dagen-hendelse",
-"From" => "Fra",
-"To" => "Til",
-"Advanced options" => "Avanserte innstillinger",
-"Location" => "Sted",
-"Location of the Event" => "Hendelsessted",
-"Description" => "Beskrivelse",
-"Description of the Event" => "Hendelesebeskrivelse",
-"Repeat" => "Gjenta",
-"Advanced" => "Avansert",
-"Select weekdays" => "Velg ukedager",
-"Select days" => "Velg dager",
-"and the events day of year." => "og hendelsenes dag i året.",
-"and the events day of month." => "og hendelsenes dag i måneden.",
-"Select months" => "Velg måneder",
-"Select weeks" => "Velg uker",
-"and the events week of year." => "og hendelsenes uke i året.",
-"Interval" => "Intervall",
-"End" => "Slutt",
-"occurrences" => "forekomster",
-"create a new calendar" => "Lag en ny kalender",
-"Import a calendar file" => "Importer en kalenderfil",
-"Please choose the calendar" => "Vennligst velg kalenderen",
-"create a new calendar" => "Lag en ny kalender",
-"Name of new calendar" => "Navn på ny kalender:",
-"Import" => "Importer",
-"Importing calendar" => "Importerer kalender",
-"Calendar imported successfully" => "Kalenderen ble importert uten feil",
-"Close Dialog" => "Lukk dialog",
-"Create a new event" => "Opprett en ny hendelse",
-"View an event" => "Se på hendelse",
-"No categories selected" => "Ingen kategorier valgt",
-"Select category" => "Velg kategori",
-"Timezone" => "Tidssone",
-"Check always for changes of the timezone" => "Se alltid etter endringer i tidssone",
-"Timeformat" => "Tidsformat:",
-"24h" => "24 t",
-"12h" => "12 t",
-"First day of the week" => "Ukens første dag",
-"Calendar CalDAV syncing address:" => "Kalender CalDAV synkroniseringsadresse",
-"Users" => "Brukere",
-"select users" => "valgte brukere",
-"Editable" => "Redigerbar",
-"Groups" => "Grupper",
-"select groups" => "velg grupper",
-"make public" => "gjør offentlig"
-);
diff --git a/apps/calendar/l10n/nl.php b/apps/calendar/l10n/nl.php
deleted file mode 100644
index bc0954abe2..0000000000
--- a/apps/calendar/l10n/nl.php
+++ /dev/null
@@ -1,198 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Not all calendars are completely cached" => "Niet alle agenda's zijn volledig gecached",
-"Everything seems to be completely cached" => "Alles lijkt volledig gecached te zijn",
-"No calendars found." => "Geen kalenders gevonden.",
-"No events found." => "Geen gebeurtenissen gevonden.",
-"Wrong calendar" => "Verkeerde kalender",
-"The file contained either no events or all events are already saved in your calendar." => "Het bestand bevat geen gebeurtenissen of alle gebeurtenissen worden al in uw agenda bewaard.",
-"events has been saved in the new calendar" => "De gebeurtenissen worden in de nieuwe agenda bewaard",
-"Import failed" => "import is gefaald",
-"events has been saved in your calendar" => "de gebeurtenissen zijn in uw agenda opgeslagen ",
-"New Timezone:" => "Nieuwe tijdszone:",
-"Timezone changed" => "Tijdzone is veranderd",
-"Invalid request" => "Ongeldige aanvraag",
-"Calendar" => "Kalender",
-"ddd" => "ddd",
-"ddd M/d" => "ddd d.M",
-"dddd M/d" => "dddd d.M",
-"MMMM yyyy" => "MMMM yyyy",
-"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "d[ MMM][ yyyy]{ '&#8212;' d MMM yyyy}",
-"dddd, MMM d, yyyy" => "dddd, d. MMM yyyy",
-"Birthday" => "Verjaardag",
-"Business" => "Zakelijk",
-"Call" => "Bellen",
-"Clients" => "Klanten",
-"Deliverer" => "Leverancier",
-"Holidays" => "Vakantie",
-"Ideas" => "Ideeën",
-"Journey" => "Reis",
-"Jubilee" => "Jubileum",
-"Meeting" => "Vergadering",
-"Other" => "Ander",
-"Personal" => "Persoonlijk",
-"Projects" => "Projecten",
-"Questions" => "Vragen",
-"Work" => "Werk",
-"by" => "door",
-"unnamed" => "onbekend",
-"New Calendar" => "Nieuwe Kalender",
-"Does not repeat" => "Wordt niet herhaald",
-"Daily" => "Dagelijks",
-"Weekly" => "Wekelijks",
-"Every Weekday" => "Elke weekdag",
-"Bi-Weekly" => "Tweewekelijks",
-"Monthly" => "Maandelijks",
-"Yearly" => "Jaarlijks",
-"never" => "nooit meer",
-"by occurrences" => "volgens gebeurtenissen",
-"by date" => "op datum",
-"by monthday" => "per dag van de maand",
-"by weekday" => "op weekdag",
-"Monday" => "Maandag",
-"Tuesday" => "Dinsdag",
-"Wednesday" => "Woensdag",
-"Thursday" => "Donderdag",
-"Friday" => "Vrijdag",
-"Saturday" => "Zaterdag",
-"Sunday" => "Zondag",
-"events week of month" => "gebeurtenissen week van maand",
-"first" => "eerste",
-"second" => "tweede",
-"third" => "derde",
-"fourth" => "vierde",
-"fifth" => "vijfde",
-"last" => "laatste",
-"January" => "Januari",
-"February" => "Februari",
-"March" => "Maart",
-"April" => "April",
-"May" => "Mei",
-"June" => "Juni",
-"July" => "Juli",
-"August" => "Augustus",
-"September" => "September",
-"October" => "Oktober",
-"November" => "November",
-"December" => "December",
-"by events date" => "volgens evenementsdatum",
-"by yearday(s)" => "volgens jaardag(en)",
-"by weeknumber(s)" => "volgens weeknummer(s)",
-"by day and month" => "per dag en maand",
-"Date" => "Datum",
-"Cal." => "Cal.",
-"Sun." => "Zon.",
-"Mon." => "Maa.",
-"Tue." => "Din.",
-"Wed." => "Woe.",
-"Thu." => "Don.",
-"Fri." => "Vrij.",
-"Sat." => "Zat.",
-"Jan." => "Jan.",
-"Feb." => "Feb.",
-"Mar." => "Maa.",
-"Apr." => "Apr.",
-"May." => "Mei.",
-"Jun." => "Jun.",
-"Jul." => "Jul.",
-"Aug." => "Aug.",
-"Sep." => "Sep.",
-"Oct." => "Okt.",
-"Nov." => "Nov.",
-"Dec." => "Dec.",
-"All day" => "Hele dag",
-"Missing fields" => "missende velden",
-"Title" => "Titel",
-"From Date" => "Begindatum",
-"From Time" => "Begintijd",
-"To Date" => "Einddatum",
-"To Time" => "Eindtijd",
-"The event ends before it starts" => "Het evenement eindigt voordat het begint",
-"There was a database fail" => "Er was een databasefout",
-"Week" => "Week",
-"Month" => "Maand",
-"List" => "Lijst",
-"Today" => "Vandaag",
-"Settings" => "Instellingen",
-"Your calendars" => "Je kalenders",
-"CalDav Link" => "CalDav Link",
-"Shared calendars" => "Gedeelde kalenders",
-"No shared calendars" => "Geen gedeelde kalenders",
-"Share Calendar" => "Deel kalender",
-"Download" => "Download",
-"Edit" => "Bewerken",
-"Delete" => "Verwijderen",
-"shared with you by" => "gedeeld met jou door",
-"New calendar" => "Nieuwe kalender",
-"Edit calendar" => "Bewerk kalender",
-"Displayname" => "Weergavenaam",
-"Active" => "Actief",
-"Calendar color" => "Kalender kleur",
-"Save" => "Opslaan",
-"Submit" => "Opslaan",
-"Cancel" => "Annuleren",
-"Edit an event" => "Bewerken van een afspraak",
-"Export" => "Exporteren",
-"Eventinfo" => "Geberurtenisinformatie",
-"Repeating" => "Herhalend",
-"Alarm" => "Alarm",
-"Attendees" => "Deelnemers",
-"Share" => "Delen",
-"Title of the Event" => "Titel van de afspraak",
-"Category" => "Categorie",
-"Separate categories with commas" => "Gescheiden door komma's",
-"Edit categories" => "Wijzig categorieën",
-"All Day Event" => "Hele dag",
-"From" => "Van",
-"To" => "Aan",
-"Advanced options" => "Geavanceerde opties",
-"Location" => "Locatie",
-"Location of the Event" => "Locatie van de afspraak",
-"Description" => "Beschrijving",
-"Description of the Event" => "Beschrijving van het evenement",
-"Repeat" => "Herhalen",
-"Advanced" => "Geavanceerd",
-"Select weekdays" => "Selecteer weekdagen",
-"Select days" => "Selecteer dagen",
-"and the events day of year." => "en de gebeurtenissen dag van het jaar",
-"and the events day of month." => "en de gebeurtenissen dag van de maand",
-"Select months" => "Selecteer maanden",
-"Select weeks" => "Selecteer weken",
-"and the events week of year." => "en de gebeurtenissen week van het jaar",
-"Interval" => "Interval",
-"End" => "Einde",
-"occurrences" => "gebeurtenissen",
-"create a new calendar" => "Maak een nieuw agenda",
-"Import a calendar file" => "Importeer een agenda bestand",
-"Please choose a calendar" => "Kies een agenda",
-"Name of new calendar" => "Naam van de nieuwe agenda",
-"Take an available name!" => "Kies een beschikbare naam!",
-"A Calendar with this name already exists. If you continue anyhow, these calendars will be merged." => "Een agenda met deze naam bestaat al.  Als u doorgaat, worden deze agenda's samengevoegd",
-"Import" => "Importeer",
-"Close Dialog" => "Sluit venster",
-"Create a new event" => "Maak een nieuwe afspraak",
-"View an event" => "Bekijk een gebeurtenis",
-"No categories selected" => "Geen categorieën geselecteerd",
-"of" => "van",
-"at" => "op",
-"General" => "Algemeen",
-"Timezone" => "Tijdzone",
-"Update timezone automatically" => "Werk de tijdzone automatisch bij",
-"Time format" => "Tijd formaat",
-"24h" => "24uur",
-"12h" => "12uur",
-"Start week on" => "Begin de week op",
-"Cache" => "Cache",
-"Clear cache for repeating events" => "Leeg cache voor repeterende gebeurtenissen",
-"URLs" => "URLs",
-"Calendar CalDAV syncing addresses" => "Agenda CalDAV synchronisatie adres",
-"more info" => "meer informatie",
-"Primary address (Kontact et al)" => "Primary adres (voor Kontact en dergelijke)",
-"iOS/OS X" => "iOS/OS X",
-"Read only iCalendar link(s)" => "Alleen lezen iCalendar link(en)",
-"Users" => "Gebruikers",
-"select users" => "kies gebruikers",
-"Editable" => "Te wijzigen",
-"Groups" => "Groepen",
-"select groups" => "kies groep",
-"make public" => "maak publiek"
-);
diff --git a/apps/calendar/l10n/nn_NO.php b/apps/calendar/l10n/nn_NO.php
deleted file mode 100644
index 3330cc562b..0000000000
--- a/apps/calendar/l10n/nn_NO.php
+++ /dev/null
@@ -1,125 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Wrong calendar" => "Feil kalender",
-"New Timezone:" => "Ny tidssone:",
-"Timezone changed" => "Endra tidssone",
-"Invalid request" => "Ugyldig førespurnad",
-"Calendar" => "Kalender",
-"Birthday" => "Bursdag",
-"Business" => "Forretning",
-"Call" => "Telefonsamtale",
-"Clients" => "Klientar",
-"Deliverer" => "Forsending",
-"Holidays" => "Høgtid",
-"Ideas" => "Idear",
-"Journey" => "Reise",
-"Jubilee" => "Jubileum",
-"Meeting" => "Møte",
-"Other" => "Anna",
-"Personal" => "Personleg",
-"Projects" => "Prosjekt",
-"Questions" => "Spørsmål",
-"Work" => "Arbeid",
-"New Calendar" => "Ny kalender",
-"Does not repeat" => "Ikkje gjenta",
-"Daily" => "Kvar dag",
-"Weekly" => "Kvar veke",
-"Every Weekday" => "Kvar vekedag",
-"Bi-Weekly" => "Annakvar veke",
-"Monthly" => "Kvar månad",
-"Yearly" => "Kvart år",
-"never" => "aldri",
-"by occurrences" => "av førekomstar",
-"by date" => "av dato",
-"by monthday" => "av månadsdag",
-"by weekday" => "av vekedag",
-"Monday" => "Måndag",
-"Tuesday" => "Tysdag",
-"Wednesday" => "Onsdag",
-"Thursday" => "Torsdag",
-"Friday" => "Fredag",
-"Saturday" => "Laurdag",
-"Sunday" => "Søndag",
-"events week of month" => "hendingas veke av månad",
-"first" => "første",
-"second" => "andre",
-"third" => "tredje",
-"fourth" => "fjerde",
-"fifth" => "femte",
-"last" => "siste",
-"January" => "Januar",
-"February" => "Februar",
-"March" => "Mars",
-"April" => "April",
-"May" => "Mai",
-"June" => "Juni",
-"July" => "Juli",
-"August" => "August",
-"September" => "September",
-"October" => "Oktober",
-"November" => "November",
-"December" => "Desember",
-"by events date" => "av hendingsdato",
-"by yearday(s)" => "av årsdag(ar)",
-"by weeknumber(s)" => "av vekenummer",
-"by day and month" => "av dag og månad",
-"Date" => "Dato",
-"Cal." => "Kal.",
-"All day" => "Heile dagen",
-"Missing fields" => "Manglande felt",
-"Title" => "Tittel",
-"From Date" => "Frå dato",
-"From Time" => "Frå tid",
-"To Date" => "Til dato",
-"To Time" => "Til tid",
-"The event ends before it starts" => "Hendinga endar før den startar",
-"There was a database fail" => "Det oppstod ein databasefeil",
-"Week" => "Veke",
-"Month" => "Månad",
-"List" => "Liste",
-"Today" => "I dag",
-"CalDav Link" => "CalDav-lenkje",
-"Download" => "Last ned",
-"Edit" => "Endra",
-"Delete" => "Slett",
-"New calendar" => "Ny kalender",
-"Edit calendar" => "Endra kalendarar",
-"Displayname" => "Visingsnamn",
-"Active" => "Aktiv",
-"Calendar color" => "Kalenderfarge",
-"Save" => "Lagra",
-"Submit" => "Lagra",
-"Cancel" => "Avbryt",
-"Edit an event" => "Endra ein hending",
-"Export" => "Eksporter",
-"Title of the Event" => "Tittel på hendinga",
-"Category" => "Kategori",
-"All Day Event" => "Heildagshending",
-"From" => "Frå",
-"To" => "Til",
-"Advanced options" => "Avanserte alternativ",
-"Location" => "Stad",
-"Location of the Event" => "Stad for hendinga",
-"Description" => "Skildring",
-"Description of the Event" => "Skildring av hendinga",
-"Repeat" => "Gjenta",
-"Advanced" => "Avansert",
-"Select weekdays" => "Vel vekedagar",
-"Select days" => "Vel dagar",
-"and the events day of year." => "og hendingane dag for år.",
-"and the events day of month." => "og hendingane dag for månad.",
-"Select months" => "Vel månedar",
-"Select weeks" => "Vel veker",
-"and the events week of year." => "og hendingane veke av året.",
-"Interval" => "Intervall",
-"End" => "Ende",
-"occurrences" => "førekomstar",
-"create a new calendar" => "Lag ny kalender",
-"Import a calendar file" => "Importer ei kalenderfil",
-"Name of new calendar" => "Namn for ny kalender",
-"Import" => "Importer",
-"Close Dialog" => "Steng dialog",
-"Create a new event" => "Opprett ei ny hending",
-"Timezone" => "Tidssone",
-"24h" => "24t",
-"12h" => "12t"
-);
diff --git a/apps/calendar/l10n/pl.php b/apps/calendar/l10n/pl.php
deleted file mode 100644
index 0174bef6fc..0000000000
--- a/apps/calendar/l10n/pl.php
+++ /dev/null
@@ -1,186 +0,0 @@
-<?php $TRANSLATIONS = array(
-"No calendars found." => "Brak kalendarzy",
-"No events found." => "Brak wydzarzeń",
-"Wrong calendar" => "Nieprawidłowy kalendarz",
-"Import failed" => "Import nieudany",
-"events has been saved in your calendar" => "zdarzenie zostało zapisane w twoim kalendarzu",
-"New Timezone:" => "Nowa strefa czasowa:",
-"Timezone changed" => "Zmieniono strefę czasową",
-"Invalid request" => "Nieprawidłowe żądanie",
-"Calendar" => "Kalendarz",
-"ddd" => "ddd",
-"ddd M/d" => "ddd M/d",
-"dddd M/d" => "dddd M/d",
-"MMMM yyyy" => "MMMM rrrr",
-"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
-"dddd, MMM d, yyyy" => "dddd, MMM d, rrrr",
-"Birthday" => "Urodziny",
-"Business" => "Interesy",
-"Call" => "Rozmowy",
-"Clients" => "Klienci",
-"Deliverer" => "Dostawcy",
-"Holidays" => "Święta",
-"Ideas" => "Pomysły",
-"Journey" => "Podróże",
-"Jubilee" => "Jubileusze",
-"Meeting" => "Spotkania",
-"Other" => "Inne",
-"Personal" => "Osobiste",
-"Projects" => "Projekty",
-"Questions" => "Pytania",
-"Work" => "Zawodowe",
-"by" => "przez",
-"unnamed" => "nienazwany",
-"New Calendar" => "Nowy kalendarz",
-"Does not repeat" => "Brak",
-"Daily" => "Codziennie",
-"Weekly" => "Tygodniowo",
-"Every Weekday" => "Każdego dnia tygodnia",
-"Bi-Weekly" => "Dwa razy w tygodniu",
-"Monthly" => "Miesięcznie",
-"Yearly" => "Rocznie",
-"never" => "nigdy",
-"by occurrences" => "przez wydarzenia",
-"by date" => "po dacie",
-"by monthday" => "miesięcznie",
-"by weekday" => "tygodniowo",
-"Monday" => "Poniedziałek",
-"Tuesday" => "Wtorek",
-"Wednesday" => "Środa",
-"Thursday" => "Czwartek",
-"Friday" => "Piątek",
-"Saturday" => "Sobota",
-"Sunday" => "Niedziela",
-"events week of month" => "wydarzenia miesiąca",
-"first" => "pierwszy",
-"second" => "drugi",
-"third" => "trzeci",
-"fourth" => "czwarty",
-"fifth" => "piąty",
-"last" => "ostatni",
-"January" => "Styczeń",
-"February" => "Luty",
-"March" => "Marzec",
-"April" => "Kwiecień",
-"May" => "Maj",
-"June" => "Czerwiec",
-"July" => "Lipiec",
-"August" => "Sierpień",
-"September" => "Wrzesień",
-"October" => "Październik",
-"November" => "Listopad",
-"December" => "Grudzień",
-"by events date" => "po datach wydarzeń",
-"by yearday(s)" => "po dniach roku",
-"by weeknumber(s)" => "po tygodniach",
-"by day and month" => "przez dzień i miesiąc",
-"Date" => "Data",
-"Cal." => "Kal.",
-"Sun." => "N.",
-"Mon." => "Pn.",
-"Tue." => "Wt.",
-"Wed." => "Śr.",
-"Thu." => "Cz.",
-"Fri." => "Pt.",
-"Sat." => "S.",
-"Jan." => "Sty.",
-"Feb." => "Lut.",
-"Mar." => "Mar.",
-"Apr." => "Kwi.",
-"May." => "Maj.",
-"Jun." => "Cze.",
-"Jul." => "Lip.",
-"Aug." => "Sie.",
-"Sep." => "Wrz.",
-"Oct." => "Paź.",
-"Nov." => "Lis.",
-"Dec." => "Gru.",
-"All day" => "Cały dzień",
-"Missing fields" => "Brakujące pola",
-"Title" => "Nazwa",
-"From Date" => "Od daty",
-"From Time" => "Od czasu",
-"To Date" => "Do daty",
-"To Time" => "Do czasu",
-"The event ends before it starts" => "Wydarzenie kończy się przed rozpoczęciem",
-"There was a database fail" => "Awaria bazy danych",
-"Week" => "Tydzień",
-"Month" => "Miesiąc",
-"List" => "Lista",
-"Today" => "Dzisiaj",
-"Your calendars" => "Twoje kalendarze",
-"CalDav Link" => "Wyświetla odnośnik CalDAV",
-"Shared calendars" => "Współdzielone kalendarze",
-"No shared calendars" => "Brak współdzielonych kalendarzy",
-"Share Calendar" => "Współdziel kalendarz",
-"Download" => "Pobiera kalendarz",
-"Edit" => "Edytuje kalendarz",
-"Delete" => "Usuwa kalendarz",
-"shared with you by" => "współdzielisz z",
-"New calendar" => "Nowy kalendarz",
-"Edit calendar" => "Edytowanie kalendarza",
-"Displayname" => "Wyświetlana nazwa",
-"Active" => "Aktywny",
-"Calendar color" => "Kolor",
-"Save" => "Zapisz",
-"Submit" => "Prześlij",
-"Cancel" => "Anuluj",
-"Edit an event" => "Edytowanie wydarzenia",
-"Export" => "Wyeksportuj",
-"Eventinfo" => "Informacja o wydarzeniach",
-"Repeating" => "Powtarzanie",
-"Alarm" => "Alarm",
-"Attendees" => "Uczestnicy",
-"Share" => "Współdziel",
-"Title of the Event" => "Nazwa wydarzenia",
-"Category" => "Kategoria",
-"Separate categories with commas" => "Oddziel kategorie przecinkami",
-"Edit categories" => "Edytuj kategorie",
-"All Day Event" => "Wydarzenie całodniowe",
-"From" => "Od",
-"To" => "Do",
-"Advanced options" => "Opcje zaawansowane",
-"Location" => "Lokalizacja",
-"Location of the Event" => "Lokalizacja wydarzenia",
-"Description" => "Opis",
-"Description of the Event" => "Opis wydarzenia",
-"Repeat" => "Powtarzanie",
-"Advanced" => "Zaawansowane",
-"Select weekdays" => "Wybierz dni powszechne",
-"Select days" => "Wybierz dni",
-"and the events day of year." => "oraz wydarzenia roku",
-"and the events day of month." => "oraz wydarzenia miesiąca",
-"Select months" => "Wybierz miesiące",
-"Select weeks" => "Wybierz tygodnie",
-"and the events week of year." => "oraz wydarzenia roku.",
-"Interval" => "Interwał",
-"End" => "Koniec",
-"occurrences" => "wystąpienia",
-"create a new calendar" => "stwórz nowy kalendarz",
-"Import a calendar file" => "Zaimportuj plik kalendarza",
-"Please choose a calendar" => "Proszę wybierz kalendarz",
-"Name of new calendar" => "Nazwa kalendarza",
-"Import" => "Import",
-"Importing calendar" => "Importuje kalendarz",
-"Calendar imported successfully" => "Zaimportowano kalendarz",
-"Close Dialog" => "Zamknij okno",
-"Create a new event" => "Tworzenie nowego wydarzenia",
-"View an event" => "Zobacz wydarzenie",
-"No categories selected" => "nie zaznaczono kategorii",
-"of" => "z",
-"at" => "w",
-"Timezone" => "Strefa czasowa",
-"Check always for changes of the timezone" => "Zawsze sprawdzaj zmiany strefy czasowej",
-"Timeformat" => "Format czasu",
-"24h" => "24h",
-"12h" => "12h",
-"more info" => "więcej informacji",
-"iOS/OS X" => "iOS/OS X",
-"Read only iCalendar link(s)" => "Odczytać tylko linki iCalendar",
-"Users" => "Użytkownicy",
-"select users" => "wybierz użytkowników",
-"Editable" => "Edytowalne",
-"Groups" => "Grupy",
-"select groups" => "wybierz grupy",
-"make public" => "uczyń publicznym"
-);
diff --git a/apps/calendar/l10n/pt_BR.php b/apps/calendar/l10n/pt_BR.php
deleted file mode 100644
index b636c19bfe..0000000000
--- a/apps/calendar/l10n/pt_BR.php
+++ /dev/null
@@ -1,156 +0,0 @@
-<?php $TRANSLATIONS = array(
-"No calendars found." => "Nenhum calendário encontrado.",
-"No events found." => "Nenhum evento encontrado.",
-"Wrong calendar" => "Calendário incorreto",
-"New Timezone:" => "Novo fuso horário",
-"Timezone changed" => "Fuso horário alterado",
-"Invalid request" => "Pedido inválido",
-"Calendar" => "Calendário",
-"ddd" => "ddd",
-"ddd M/d" => "ddd M/d",
-"dddd M/d" => "dddd M/d",
-"MMMM yyyy" => "MMMM yyyy",
-"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
-"dddd, MMM d, yyyy" => "dddd, MMM d, yyyy",
-"Birthday" => "Aniversário",
-"Business" => "Negócio",
-"Call" => "Chamada",
-"Clients" => "Clientes",
-"Deliverer" => "Entrega",
-"Holidays" => "Feriados",
-"Ideas" => "Idéias",
-"Journey" => "Jornada",
-"Jubilee" => "Jubileu",
-"Meeting" => "Reunião",
-"Other" => "Outros",
-"Personal" => "Pessoal",
-"Projects" => "Projetos",
-"Questions" => "Perguntas",
-"Work" => "Trabalho",
-"unnamed" => "sem nome",
-"New Calendar" => "Novo Calendário",
-"Does not repeat" => "Não repetir",
-"Daily" => "Diariamente",
-"Weekly" => "Semanal",
-"Every Weekday" => "Cada dia da semana",
-"Bi-Weekly" => "De duas em duas semanas",
-"Monthly" => "Mensal",
-"Yearly" => "Anual",
-"never" => "nunca",
-"by occurrences" => "por ocorrências",
-"by date" => "por data",
-"by monthday" => "por dia do mês",
-"by weekday" => "por dia da semana",
-"Monday" => "Segunda-feira",
-"Tuesday" => "Terça-feira",
-"Wednesday" => "Quarta-feira",
-"Thursday" => "Quinta-feira",
-"Friday" => "Sexta-feira",
-"Saturday" => "Sábado",
-"Sunday" => "Domingo",
-"events week of month" => "semana do evento no mês",
-"first" => "primeiro",
-"second" => "segundo",
-"third" => "terceiro",
-"fourth" => "quarto",
-"fifth" => "quinto",
-"last" => "último",
-"January" => "Janeiro",
-"February" => "Fevereiro",
-"March" => "Março",
-"April" => "Abril",
-"May" => "Maio",
-"June" => "Junho",
-"July" => "Julho",
-"August" => "Agosto",
-"September" => "Setembro",
-"October" => "Outubro",
-"November" => "Novembro",
-"December" => "Dezembro",
-"by events date" => "eventos por data",
-"by yearday(s)" => "por dia(s) do ano",
-"by weeknumber(s)" => "por número(s) da semana",
-"by day and month" => "por dia e mês",
-"Date" => "Data",
-"Cal." => "Cal.",
-"All day" => "Todo o dia",
-"Missing fields" => "Campos incompletos",
-"Title" => "Título",
-"From Date" => "Desde a Data",
-"From Time" => "Desde a Hora",
-"To Date" => "Até a Data",
-"To Time" => "Até a Hora",
-"The event ends before it starts" => "O evento termina antes de começar",
-"There was a database fail" => "Houve uma falha de banco de dados",
-"Week" => "Semana",
-"Month" => "Mês",
-"List" => "Lista",
-"Today" => "Hoje",
-"Your calendars" => "Meus Calendários",
-"CalDav Link" => "Link para CalDav",
-"Shared calendars" => "Calendários Compartilhados",
-"No shared calendars" => "Nenhum Calendário Compartilhado",
-"Share Calendar" => "Compartilhar Calendário",
-"Download" => "Baixar",
-"Edit" => "Editar",
-"Delete" => "Excluir",
-"shared with you by" => "compartilhado com você por",
-"New calendar" => "Novo calendário",
-"Edit calendar" => "Editar calendário",
-"Displayname" => "Mostrar Nome",
-"Active" => "Ativo",
-"Calendar color" => "Cor do Calendário",
-"Save" => "Salvar",
-"Submit" => "Submeter",
-"Cancel" => "Cancelar",
-"Edit an event" => "Editar um evento",
-"Export" => "Exportar",
-"Eventinfo" => "Info de Evento",
-"Repeating" => "Repetindo",
-"Alarm" => "Alarme",
-"Attendees" => "Participantes",
-"Share" => "Compartilhar",
-"Title of the Event" => "Título do evento",
-"Category" => "Categoria",
-"Separate categories with commas" => "Separe as categorias por vírgulas",
-"Edit categories" => "Editar categorias",
-"All Day Event" => "Evento de dia inteiro",
-"From" => "De",
-"To" => "Para",
-"Advanced options" => "Opções avançadas",
-"Location" => "Local",
-"Location of the Event" => "Local do evento",
-"Description" => "Descrição",
-"Description of the Event" => "Descrição do Evento",
-"Repeat" => "Repetir",
-"Advanced" => "Avançado",
-"Select weekdays" => "Selecionar dias da semana",
-"Select days" => "Selecionar dias",
-"and the events day of year." => "e o dia do evento no ano.",
-"and the events day of month." => "e o dia do evento no mês.",
-"Select months" => "Selecionar meses",
-"Select weeks" => "Selecionar semanas",
-"and the events week of year." => "e a semana do evento no ano.",
-"Interval" => "Intervalo",
-"End" => "Final",
-"occurrences" => "ocorrências",
-"create a new calendar" => "criar um novo calendário",
-"Import a calendar file" => "Importar um arquivo de calendário",
-"Name of new calendar" => "Nome do novo calendário",
-"Import" => "Importar",
-"Close Dialog" => "Fechar caixa de diálogo",
-"Create a new event" => "Criar um novo evento",
-"View an event" => "Visualizar evento",
-"No categories selected" => "Nenhuma categoria selecionada",
-"of" => "de",
-"at" => "para",
-"Timezone" => "Fuso horário",
-"24h" => "24h",
-"12h" => "12h",
-"Users" => "Usuários",
-"select users" => "Selecione usuários",
-"Editable" => "Editável",
-"Groups" => "Grupos",
-"select groups" => "Selecione grupos",
-"make public" => "Tornar público"
-);
diff --git a/apps/calendar/l10n/pt_PT.php b/apps/calendar/l10n/pt_PT.php
deleted file mode 100644
index 81bab52e59..0000000000
--- a/apps/calendar/l10n/pt_PT.php
+++ /dev/null
@@ -1,200 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Not all calendars are completely cached" => "Nem todos os calendários estão completamente pré-carregados",
-"Everything seems to be completely cached" => "Parece que tudo está completamente pré-carregado",
-"No calendars found." => "Nenhum calendário encontrado.",
-"No events found." => "Nenhum evento encontrado.",
-"Wrong calendar" => "Calendário errado",
-"The file contained either no events or all events are already saved in your calendar." => "O ficheiro não continha nenhuns eventos ou então todos os eventos já estavam carregados no seu calendário",
-"events has been saved in the new calendar" => "Os eventos foram guardados no novo calendário",
-"Import failed" => "Falha na importação",
-"events has been saved in your calendar" => "Os eventos foram guardados no seu calendário",
-"New Timezone:" => "Nova zona horária",
-"Timezone changed" => "Zona horária alterada",
-"Invalid request" => "Pedido inválido",
-"Calendar" => "Calendário",
-"ddd" => "ddd",
-"ddd M/d" => "ddd M/d",
-"dddd M/d" => "dddd M/d",
-"MMMM yyyy" => "MMMM aaaa",
-"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
-"dddd, MMM d, yyyy" => "dddd, MMM d, aaaa",
-"Birthday" => "Dia de anos",
-"Business" => "Negócio",
-"Call" => "Telefonar",
-"Clients" => "Clientes",
-"Deliverer" => "Entregar",
-"Holidays" => "Férias",
-"Ideas" => "Ideias",
-"Journey" => "Jornada",
-"Jubilee" => "Jublieu",
-"Meeting" => "Encontro",
-"Other" => "Outro",
-"Personal" => "Pessoal",
-"Projects" => "Projetos",
-"Questions" => "Perguntas",
-"Work" => "Trabalho",
-"by" => "por",
-"unnamed" => "não definido",
-"New Calendar" => "Novo calendário",
-"Does not repeat" => "Não repete",
-"Daily" => "Diário",
-"Weekly" => "Semanal",
-"Every Weekday" => "Todos os dias da semana",
-"Bi-Weekly" => "Bi-semanal",
-"Monthly" => "Mensal",
-"Yearly" => "Anual",
-"never" => "nunca",
-"by occurrences" => "por ocorrências",
-"by date" => "por data",
-"by monthday" => "por dia do mês",
-"by weekday" => "por dia da semana",
-"Monday" => "Segunda",
-"Tuesday" => "Terça",
-"Wednesday" => "Quarta",
-"Thursday" => "Quinta",
-"Friday" => "Sexta",
-"Saturday" => "Sábado",
-"Sunday" => "Domingo",
-"events week of month" => "Eventos da semana do mês",
-"first" => "primeiro",
-"second" => "segundo",
-"third" => "terçeiro",
-"fourth" => "quarto",
-"fifth" => "quinto",
-"last" => "último",
-"January" => "Janeiro",
-"February" => "Fevereiro",
-"March" => "Março",
-"April" => "Abril",
-"May" => "Maio",
-"June" => "Junho",
-"July" => "Julho",
-"August" => "Agosto",
-"September" => "Setembro",
-"October" => "Outubro",
-"November" => "Novembro",
-"December" => "Dezembro",
-"by events date" => "por data de evento",
-"by yearday(s)" => "por dia(s) do ano",
-"by weeknumber(s)" => "por número(s) da semana",
-"by day and month" => "por dia e mês",
-"Date" => "Data",
-"Cal." => "Cal.",
-"Sun." => "Dom.",
-"Mon." => "Seg.",
-"Tue." => "ter.",
-"Wed." => "Qua.",
-"Thu." => "Qui.",
-"Fri." => "Sex.",
-"Sat." => "Sáb.",
-"Jan." => "Jan.",
-"Feb." => "Fev,",
-"Mar." => "Mar.",
-"Apr." => "Abr.",
-"May." => "Mai.",
-"Jun." => "Jun.",
-"Jul." => "Jul.",
-"Aug." => "Ago.",
-"Sep." => "Set.",
-"Oct." => "Out.",
-"Nov." => "Nov.",
-"Dec." => "Dez.",
-"All day" => "Todo o dia",
-"Missing fields" => "Falta campos",
-"Title" => "Título",
-"From Date" => "Da data",
-"From Time" => "Da hora",
-"To Date" => "Para data",
-"To Time" => "Para hora",
-"The event ends before it starts" => "O evento acaba antes de começar",
-"There was a database fail" => "Houve uma falha de base de dados",
-"Week" => "Semana",
-"Month" => "Mês",
-"List" => "Lista",
-"Today" => "Hoje",
-"Settings" => "Configurações",
-"Your calendars" => "Os seus calendários",
-"CalDav Link" => "Endereço CalDav",
-"Shared calendars" => "Calendários partilhados",
-"No shared calendars" => "Nenhum calendário partilhado",
-"Share Calendar" => "Partilhar calendário",
-"Download" => "Transferir",
-"Edit" => "Editar",
-"Delete" => "Apagar",
-"shared with you by" => "Partilhado consigo por",
-"New calendar" => "Novo calendário",
-"Edit calendar" => "Editar calendário",
-"Displayname" => "Nome de exibição",
-"Active" => "Ativo",
-"Calendar color" => "Cor do calendário",
-"Save" => "Guardar",
-"Submit" => "Submeter",
-"Cancel" => "Cancelar",
-"Edit an event" => "Editar um evento",
-"Export" => "Exportar",
-"Eventinfo" => "Informação do evento",
-"Repeating" => "Repetição",
-"Alarm" => "Alarme",
-"Attendees" => "Participantes",
-"Share" => "Partilhar",
-"Title of the Event" => "Título do evento",
-"Category" => "Categoria",
-"Separate categories with commas" => "Separe categorias por virgulas",
-"Edit categories" => "Editar categorias",
-"All Day Event" => "Evento de dia inteiro",
-"From" => "De",
-"To" => "Para",
-"Advanced options" => "Opções avançadas",
-"Location" => "Localização",
-"Location of the Event" => "Localização do evento",
-"Description" => "Descrição",
-"Description of the Event" => "Descrição do evento",
-"Repeat" => "Repetir",
-"Advanced" => "Avançado",
-"Select weekdays" => "Seleciona os dias da semana",
-"Select days" => "Seleciona os dias",
-"and the events day of year." => "e o dia de eventos do ano.",
-"and the events day of month." => "e o dia de eventos do mês.",
-"Select months" => "Seleciona os meses",
-"Select weeks" => "Seleciona as semanas",
-"and the events week of year." => "e a semana de eventos do ano.",
-"Interval" => "Intervalo",
-"End" => "Fim",
-"occurrences" => "ocorrências",
-"create a new calendar" => "criar novo calendário",
-"Import a calendar file" => "Importar um ficheiro de calendário",
-"Please choose a calendar" => "Escolha um calendário por favor",
-"Name of new calendar" => "Nome do novo calendário",
-"Take an available name!" => "Escolha um nome disponível!",
-"A Calendar with this name already exists. If you continue anyhow, these calendars will be merged." => "Já existe um Calendário com esse nome. Se mesmo assim continuar, esses calendários serão fundidos.",
-"Import" => "Importar",
-"Importing calendar" => "A importar calendário",
-"Calendar imported successfully" => "Calendário importado com sucesso",
-"Close Dialog" => "Fechar diálogo",
-"Create a new event" => "Criar novo evento",
-"View an event" => "Ver um evento",
-"No categories selected" => "Nenhuma categoria seleccionada",
-"of" => "de",
-"at" => "em",
-"General" => "Geral",
-"Timezone" => "Zona horária",
-"Update timezone automatically" => "Actualizar automaticamente o fuso horário",
-"Time format" => "Formato da hora",
-"24h" => "24h",
-"12h" => "12h",
-"Start week on" => "Começar semana em",
-"Cache" => "Memória de pré-carregamento",
-"Clear cache for repeating events" => "Limpar a memória de pré carregamento para eventos recorrentes",
-"URLs" => "Endereço(s) web",
-"Calendar CalDAV syncing addresses" => "Endereços de sincronização de calendários CalDAV",
-"more info" => "mais informação",
-"Primary address (Kontact et al)" => "Endereço principal (contactos et al.)",
-"iOS/OS X" => "iOS/OS X",
-"Read only iCalendar link(s)" => "Ligaç(ão/ões) só de leitura do iCalendar",
-"Users" => "Utilizadores",
-"select users" => "Selecione utilizadores",
-"Editable" => "Editavel",
-"Groups" => "Grupos",
-"select groups" => "Selecione grupos",
-"make public" => "Tornar público"
-);
diff --git a/apps/calendar/l10n/ro.php b/apps/calendar/l10n/ro.php
deleted file mode 100644
index 696322dd73..0000000000
--- a/apps/calendar/l10n/ro.php
+++ /dev/null
@@ -1,157 +0,0 @@
-<?php $TRANSLATIONS = array(
-"No calendars found." => "Nici un calendar găsit.",
-"No events found." => "Nici un eveniment găsit.",
-"Wrong calendar" => "Calendar greșit",
-"New Timezone:" => "Fus orar nou:",
-"Timezone changed" => "Fus orar schimbat",
-"Invalid request" => "Cerere eronată",
-"Calendar" => "Calendar",
-"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "LLL z[aaaa]{'&#8212;'[LLL] z aaaa}",
-"Birthday" => "Zi de naștere",
-"Business" => "Afaceri",
-"Call" => "Sună",
-"Clients" => "Clienți",
-"Deliverer" => "Curier",
-"Holidays" => "Sărbători",
-"Ideas" => "Idei",
-"Journey" => "Călătorie",
-"Jubilee" => "Aniversare",
-"Meeting" => "Întâlnire",
-"Other" => "Altele",
-"Personal" => "Personal",
-"Projects" => "Proiecte",
-"Questions" => "Întrebări",
-"Work" => "Servici",
-"unnamed" => "fără nume",
-"New Calendar" => "Calendar nou",
-"Does not repeat" => "Nerepetabil",
-"Daily" => "Zilnic",
-"Weekly" => "Săptămânal",
-"Every Weekday" => "În fiecare zii a săptămânii",
-"Bi-Weekly" => "La fiecare două săptămâni",
-"Monthly" => "Lunar",
-"Yearly" => "Anual",
-"never" => "niciodată",
-"by occurrences" => "după repetiție",
-"by date" => "după dată",
-"by monthday" => "după ziua lunii",
-"by weekday" => "după ziua săptămânii",
-"Monday" => "Luni",
-"Tuesday" => "Marți",
-"Wednesday" => "Miercuri",
-"Thursday" => "Joi",
-"Friday" => "Vineri",
-"Saturday" => "Sâmbătă",
-"Sunday" => "Duminică",
-"events week of month" => "evenimentele săptămânii din luna",
-"first" => "primul",
-"second" => "al doilea",
-"third" => "al treilea",
-"fourth" => "al patrulea",
-"fifth" => "al cincilea",
-"last" => "ultimul",
-"January" => "Ianuarie",
-"February" => "Februarie",
-"March" => "Martie",
-"April" => "Aprilie",
-"May" => "Mai",
-"June" => "Iunie",
-"July" => "Iulie",
-"August" => "August",
-"September" => "Septembrie",
-"October" => "Octombrie",
-"November" => "Noiembrie",
-"December" => "Decembrie",
-"by events date" => "după data evenimentului",
-"by yearday(s)" => "după ziua(zilele) anului",
-"by weeknumber(s)" => "după numărul săptămânii",
-"by day and month" => "după zi și lună",
-"Date" => "Data",
-"Cal." => "Cal.",
-"All day" => "Toată ziua",
-"Missing fields" => "Câmpuri lipsă",
-"Title" => "Titlu",
-"From Date" => "Începând cu",
-"From Time" => "De la",
-"To Date" => "Până pe",
-"To Time" => "La",
-"The event ends before it starts" => "Evenimentul se termină înainte să înceapă",
-"There was a database fail" => "A avut loc o eroare a bazei de date",
-"Week" => "Săptămâna",
-"Month" => "Luna",
-"List" => "Listă",
-"Today" => "Astăzi",
-"Your calendars" => "Calendarele tale",
-"CalDav Link" => "Legătură CalDav",
-"Shared calendars" => "Calendare partajate",
-"No shared calendars" => "Nici un calendar partajat",
-"Share Calendar" => "Partajați calendarul",
-"Download" => "Descarcă",
-"Edit" => "Modifică",
-"Delete" => "Șterge",
-"shared with you by" => "Partajat cu tine de",
-"New calendar" => "Calendar nou",
-"Edit calendar" => "Modifică calendarul",
-"Displayname" => "Nume afișat",
-"Active" => "Activ",
-"Calendar color" => "Culoarea calendarului",
-"Save" => "Salveză",
-"Submit" => "Trimite",
-"Cancel" => "Anulează",
-"Edit an event" => "Modifică un eveniment",
-"Export" => "Exportă",
-"Eventinfo" => "Informații despre eveniment",
-"Repeating" => "Ciclic",
-"Alarm" => "Alarmă",
-"Attendees" => "Participanți",
-"Share" => "Partajează",
-"Title of the Event" => "Numele evenimentului",
-"Category" => "Categorie",
-"Separate categories with commas" => "Separă categoriile prin virgule",
-"Edit categories" => "Editează categorii",
-"All Day Event" => "Toată ziua",
-"From" => "De la",
-"To" => "Către",
-"Advanced options" => "Opțiuni avansate",
-"Location" => "Locație",
-"Location of the Event" => "Locația evenimentului",
-"Description" => "Descriere",
-"Description of the Event" => "Descrierea evenimentului",
-"Repeat" => "Repetă",
-"Advanced" => "Avansat",
-"Select weekdays" => "Selectează zilele săptămânii",
-"Select days" => "Selectează zilele",
-"and the events day of year." => "și evenimentele de zi cu zi ale anului.",
-"and the events day of month." => "și evenimentele de zi cu zi ale lunii.",
-"Select months" => "Selectează lunile",
-"Select weeks" => "Selectează săptămânile",
-"and the events week of year." => "și evenimentele săptămânale ale anului.",
-"Interval" => "Interval",
-"End" => "Sfârșit",
-"occurrences" => "repetiții",
-"create a new calendar" => "crează un calendar nou",
-"Import a calendar file" => "Importă un calendar",
-"Please choose the calendar" => "Alegeți calendarul",
-"create a new calendar" => "crează un calendar nou",
-"Name of new calendar" => "Numele noului calendar",
-"Import" => "Importă",
-"Importing calendar" => "Importă calendar",
-"Calendar imported successfully" => "Calendarul a fost importat cu succes",
-"Close Dialog" => "Închide",
-"Create a new event" => "Crează un eveniment nou",
-"View an event" => "Vizualizează un eveniment",
-"No categories selected" => "Nici o categorie selectată",
-"of" => "din",
-"at" => "la",
-"Timezone" => "Fus orar",
-"Check always for changes of the timezone" => "Verifică mereu pentru schimbări ale fusului orar",
-"Timeformat" => "Forma de afișare a orei",
-"24h" => "24h",
-"12h" => "12h",
-"Users" => "Utilizatori",
-"select users" => "utilizatori selectați",
-"Editable" => "Editabil",
-"Groups" => "Grupuri",
-"select groups" => "grupuri selectate",
-"make public" => "fă public"
-);
diff --git a/apps/calendar/l10n/ru.php b/apps/calendar/l10n/ru.php
deleted file mode 100644
index ba0be30df1..0000000000
--- a/apps/calendar/l10n/ru.php
+++ /dev/null
@@ -1,200 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Not all calendars are completely cached" => "Не все календари полностью кешированы",
-"Everything seems to be completely cached" => "Все, вроде бы, закешировано",
-"No calendars found." => "Календари не найдены.",
-"No events found." => "События не найдены.",
-"Wrong calendar" => "Неверный календарь",
-"The file contained either no events or all events are already saved in your calendar." => "Файл либо не собержит событий, либо все события уже есть в календаре",
-"events has been saved in the new calendar" => "события были сохранены в новый календарь",
-"Import failed" => "Ошибка импорта",
-"events has been saved in your calendar" => "события были сохранены в вашем календаре",
-"New Timezone:" => "Новый часовой пояс:",
-"Timezone changed" => "Часовой пояс изменён",
-"Invalid request" => "Неверный запрос",
-"Calendar" => "Календарь",
-"ddd" => "ддд",
-"ddd M/d" => "ддд М/д",
-"dddd M/d" => "дддд М/д",
-"MMMM yyyy" => "ММММ гггг",
-"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
-"dddd, MMM d, yyyy" => "дддд, МММ д, гггг",
-"Birthday" => "День рождения",
-"Business" => "Бизнес",
-"Call" => "Звонить",
-"Clients" => "Клиенты",
-"Deliverer" => "Посыльный",
-"Holidays" => "Праздники",
-"Ideas" => "Идеи",
-"Journey" => "Поездка",
-"Jubilee" => "Юбилей",
-"Meeting" => "Встреча",
-"Other" => "Другое",
-"Personal" => "Личное",
-"Projects" => "Проекты",
-"Questions" => "Вопросы",
-"Work" => "Работа",
-"by" => "до свидания",
-"unnamed" => "без имени",
-"New Calendar" => "Новый Календарь",
-"Does not repeat" => "Не повторяется",
-"Daily" => "Ежедневно",
-"Weekly" => "Еженедельно",
-"Every Weekday" => "По будням",
-"Bi-Weekly" => "Каждые две недели",
-"Monthly" => "Каждый месяц",
-"Yearly" => "Каждый год",
-"never" => "никогда",
-"by occurrences" => "по числу повторений",
-"by date" => "по дате",
-"by monthday" => "по дню месяца",
-"by weekday" => "по дню недели",
-"Monday" => "Понедельник",
-"Tuesday" => "Вторник",
-"Wednesday" => "Среда",
-"Thursday" => "Четверг",
-"Friday" => "Пятница",
-"Saturday" => "Суббота",
-"Sunday" => "Воскресенье",
-"events week of month" => "неделя месяца",
-"first" => "первая",
-"second" => "вторая",
-"third" => "третья",
-"fourth" => "червётрая",
-"fifth" => "пятая",
-"last" => "последняя",
-"January" => "Январь",
-"February" => "Февраль",
-"March" => "Март",
-"April" => "Апрель",
-"May" => "Май",
-"June" => "Июнь",
-"July" => "Июль",
-"August" => "Август",
-"September" => "Сентябрь",
-"October" => "Октябрь",
-"November" => "Ноябрь",
-"December" => "Декабрь",
-"by events date" => "по дате событий",
-"by yearday(s)" => "по дням недели",
-"by weeknumber(s)" => "по номерам недели",
-"by day and month" => "по дню и месяцу",
-"Date" => "Дата",
-"Cal." => "Кал.",
-"Sun." => "Вс.",
-"Mon." => "Пн.",
-"Tue." => "Вт.",
-"Wed." => "Ср.",
-"Thu." => "Чт.",
-"Fri." => "Пт.",
-"Sat." => "Сб.",
-"Jan." => "Янв.",
-"Feb." => "Фев.",
-"Mar." => "Мар.",
-"Apr." => "Апр.",
-"May." => "Май.",
-"Jun." => "Июн.",
-"Jul." => "Июл.",
-"Aug." => "Авг.",
-"Sep." => "Сен.",
-"Oct." => "Окт.",
-"Nov." => "Ноя.",
-"Dec." => "Дек.",
-"All day" => "Весь день",
-"Missing fields" => "Незаполненные поля",
-"Title" => "Название",
-"From Date" => "Дата начала",
-"From Time" => "Время начала",
-"To Date" => "Дата окончания",
-"To Time" => "Время окончания",
-"The event ends before it starts" => "Окончание события раньше, чем его начало",
-"There was a database fail" => "Ошибка базы данных",
-"Week" => "Неделя",
-"Month" => "Месяц",
-"List" => "Список",
-"Today" => "Сегодня",
-"Settings" => "Параметры",
-"Your calendars" => "Ваши календари",
-"CalDav Link" => "Ссылка для CalDav",
-"Shared calendars" => "Опубликованные",
-"No shared calendars" => "Нет опубликованных календарей",
-"Share Calendar" => "Опубликовать",
-"Download" => "Скачать",
-"Edit" => "Редактировать",
-"Delete" => "Удалить",
-"shared with you by" => "опубликовал для вас",
-"New calendar" => "Новый календарь",
-"Edit calendar" => "Редактировать календарь",
-"Displayname" => "Отображаемое имя",
-"Active" => "Активен",
-"Calendar color" => "Цвет календаря",
-"Save" => "Сохранить",
-"Submit" => "Отправить",
-"Cancel" => "Отмена",
-"Edit an event" => "Редактировать событие",
-"Export" => "Экспортировать",
-"Eventinfo" => "Информация о событии",
-"Repeating" => "Повторение",
-"Alarm" => "Сигнал",
-"Attendees" => "Участники",
-"Share" => "Опубликовать",
-"Title of the Event" => "Название событие",
-"Category" => "Категория",
-"Separate categories with commas" => "Разделяйте категории запятыми",
-"Edit categories" => "Редактировать категории",
-"All Day Event" => "Событие на весь день",
-"From" => "От",
-"To" => "До",
-"Advanced options" => "Дополнительные параметры",
-"Location" => "Место",
-"Location of the Event" => "Место события",
-"Description" => "Описание",
-"Description of the Event" => "Описание события",
-"Repeat" => "Повтор",
-"Advanced" => "Дополнительно",
-"Select weekdays" => "Выбрать дни недели",
-"Select days" => "Выбрать дни",
-"and the events day of year." => "и день года события",
-"and the events day of month." => "и день месяца события",
-"Select months" => "Выбрать месяцы",
-"Select weeks" => "Выбрать недели",
-"and the events week of year." => "и номер недели события",
-"Interval" => "Интервал",
-"End" => "Окончание",
-"occurrences" => "повторений",
-"create a new calendar" => "Создать новый календарь",
-"Import a calendar file" => "Импортировать календарь из файла",
-"Please choose a calendar" => "Пожалуйста, выберите календарь",
-"Name of new calendar" => "Название нового календаря",
-"Take an available name!" => "Возьмите разрешенное имя!",
-"A Calendar with this name already exists. If you continue anyhow, these calendars will be merged." => "Календарь с таким именем уже существует. Если вы продолжите, одноименный календарь будет удален.",
-"Import" => "Импортировать",
-"Importing calendar" => "Импортируется календарь",
-"Calendar imported successfully" => "Календарь успешно импортирован",
-"Close Dialog" => "Закрыть Сообщение",
-"Create a new event" => "Создать новое событие",
-"View an event" => "Показать событие",
-"No categories selected" => "Категории не выбраны",
-"of" => "из",
-"at" => "на",
-"General" => "Основные",
-"Timezone" => "Часовой пояс",
-"Update timezone automatically" => "Автоматическое обновление временной зоны",
-"Time format" => "Формат времени",
-"24h" => "24ч",
-"12h" => "12ч",
-"Start week on" => "Начало недели",
-"Cache" => "Кэш",
-"Clear cache for repeating events" => "Очистить кэш повторяющихся событий",
-"URLs" => "URLs",
-"Calendar CalDAV syncing addresses" => "Адрес синхронизации CalDAV",
-"more info" => "подробнее",
-"Primary address (Kontact et al)" => "Основной адрес (Контакта)",
-"iOS/OS X" => "iOS/OS X",
-"Read only iCalendar link(s)" => "Читать только ссылки iCalendar",
-"Users" => "Пользователи",
-"select users" => "выбрать пользователей",
-"Editable" => "Редактируемо",
-"Groups" => "Группы",
-"select groups" => "выбрать группы",
-"make public" => "селать публичным"
-);
diff --git a/apps/calendar/l10n/sk_SK.php b/apps/calendar/l10n/sk_SK.php
deleted file mode 100644
index 65400c496d..0000000000
--- a/apps/calendar/l10n/sk_SK.php
+++ /dev/null
@@ -1,156 +0,0 @@
-<?php $TRANSLATIONS = array(
-"No calendars found." => "Nenašiel sa žiadny kalendár.",
-"No events found." => "Nenašla sa žiadna udalosť.",
-"Wrong calendar" => "Zlý kalendár",
-"New Timezone:" => "Nová časová zóna:",
-"Timezone changed" => "Časové pásmo zmenené",
-"Invalid request" => "Neplatná požiadavka",
-"Calendar" => "Kalendár",
-"ddd" => "ddd",
-"ddd M/d" => "ddd M/d",
-"dddd M/d" => "dddd M/d",
-"MMMM yyyy" => "MMMM rrrr",
-"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "d. MMM[ yyyy]{ '&#8212;' d.[ MMM] yyyy}",
-"dddd, MMM d, yyyy" => "dddd, MMM d, rrrr",
-"Birthday" => "Narodeniny",
-"Business" => "Podnikanie",
-"Call" => "Hovor",
-"Clients" => "Klienti",
-"Deliverer" => "Doručovateľ",
-"Holidays" => "Prázdniny",
-"Ideas" => "Nápady",
-"Journey" => "Cesta",
-"Jubilee" => "Jubileá",
-"Meeting" => "Stretnutia",
-"Other" => "Ostatné",
-"Personal" => "Osobné",
-"Projects" => "Projekty",
-"Questions" => "Otázky",
-"Work" => "Práca",
-"unnamed" => "nepomenovaný",
-"New Calendar" => "Nový kalendár",
-"Does not repeat" => "Neopakovať",
-"Daily" => "Denne",
-"Weekly" => "Týždenne",
-"Every Weekday" => "Každý deň v týždni",
-"Bi-Weekly" => "Každý druhý týždeň",
-"Monthly" => "Mesačne",
-"Yearly" => "Ročne",
-"never" => "nikdy",
-"by occurrences" => "podľa výskytu",
-"by date" => "podľa dátumu",
-"by monthday" => "podľa dňa v mesiaci",
-"by weekday" => "podľa dňa v týždni",
-"Monday" => "Pondelok",
-"Tuesday" => "Utorok",
-"Wednesday" => "Streda",
-"Thursday" => "Štvrtok",
-"Friday" => "Piatok",
-"Saturday" => "Sobota",
-"Sunday" => "Nedeľa",
-"events week of month" => "týždenné udalosti v mesiaci",
-"first" => "prvý",
-"second" => "druhý",
-"third" => "tretí",
-"fourth" => "štvrtý",
-"fifth" => "piaty",
-"last" => "posledný",
-"January" => "Január",
-"February" => "Február",
-"March" => "Marec",
-"April" => "Apríl",
-"May" => "Máj",
-"June" => "Jún",
-"July" => "Júl",
-"August" => "August",
-"September" => "September",
-"October" => "Október",
-"November" => "November",
-"December" => "December",
-"by events date" => "podľa dátumu udalosti",
-"by yearday(s)" => "po dňoch",
-"by weeknumber(s)" => "podľa čísel týždňov",
-"by day and month" => "podľa dňa a mesiaca",
-"Date" => "Dátum",
-"Cal." => "Kal.",
-"All day" => "Celý deň",
-"Missing fields" => "Nevyplnené položky",
-"Title" => "Nadpis",
-"From Date" => "Od dátumu",
-"From Time" => "Od času",
-"To Date" => "Do dátumu",
-"To Time" => "Do času",
-"The event ends before it starts" => "Udalosť končí ešte pred tým než začne",
-"There was a database fail" => "Nastala chyba databázy",
-"Week" => "Týždeň",
-"Month" => "Mesiac",
-"List" => "Zoznam",
-"Today" => "Dnes",
-"Your calendars" => "Vaše kalendáre",
-"CalDav Link" => "CalDav odkaz",
-"Shared calendars" => "Zdielané kalendáre",
-"No shared calendars" => "Žiadne zdielané kalendáre",
-"Share Calendar" => "Zdielať kalendár",
-"Download" => "Stiahnuť",
-"Edit" => "Upraviť",
-"Delete" => "Odstrániť",
-"shared with you by" => "zdielané s vami používateľom",
-"New calendar" => "Nový kalendár",
-"Edit calendar" => "Upraviť kalendár",
-"Displayname" => "Zobrazené meno",
-"Active" => "Aktívne",
-"Calendar color" => "Farba kalendáru",
-"Save" => "Uložiť",
-"Submit" => "Odoslať",
-"Cancel" => "Zrušiť",
-"Edit an event" => "Upraviť udalosť",
-"Export" => "Exportovať",
-"Eventinfo" => "Informácie o udalosti",
-"Repeating" => "Opakovanie",
-"Alarm" => "Alarm",
-"Attendees" => "Účastníci",
-"Share" => "Zdielať",
-"Title of the Event" => "Nadpis udalosti",
-"Category" => "Kategória",
-"Separate categories with commas" => "Kategórie oddelené čiarkami",
-"Edit categories" => "Úprava kategórií",
-"All Day Event" => "Celodenná udalosť",
-"From" => "Od",
-"To" => "Do",
-"Advanced options" => "Pokročilé možnosti",
-"Location" => "Poloha",
-"Location of the Event" => "Poloha udalosti",
-"Description" => "Popis",
-"Description of the Event" => "Popis udalosti",
-"Repeat" => "Opakovať",
-"Advanced" => "Pokročilé",
-"Select weekdays" => "Do času",
-"Select days" => "Vybrať dni",
-"and the events day of year." => "a denné udalosti v roku.",
-"and the events day of month." => "a denné udalosti v mesiaci.",
-"Select months" => "Vybrať mesiace",
-"Select weeks" => "Vybrať týždne",
-"and the events week of year." => "a týždenné udalosti v roku.",
-"Interval" => "Interval",
-"End" => "Koniec",
-"occurrences" => "výskyty",
-"create a new calendar" => "vytvoriť nový kalendár",
-"Import a calendar file" => "Importovať súbor kalendára",
-"Name of new calendar" => "Meno nového kalendára",
-"Import" => "Importovať",
-"Close Dialog" => "Zatvoriť dialóg",
-"Create a new event" => "Vytvoriť udalosť",
-"View an event" => "Zobraziť udalosť",
-"No categories selected" => "Žiadne vybraté kategórie",
-"of" => "z",
-"at" => "v",
-"Timezone" => "Časová zóna",
-"24h" => "24h",
-"12h" => "12h",
-"Users" => "Používatelia",
-"select users" => "vybrať používateľov",
-"Editable" => "Upravovateľné",
-"Groups" => "Skupiny",
-"select groups" => "vybrať skupiny",
-"make public" => "zverejniť"
-);
diff --git a/apps/calendar/l10n/sl.php b/apps/calendar/l10n/sl.php
deleted file mode 100644
index 585132314b..0000000000
--- a/apps/calendar/l10n/sl.php
+++ /dev/null
@@ -1,198 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Not all calendars are completely cached" => "Vsi koledarji niso povsem predpomnjeni",
-"Everything seems to be completely cached" => "Izgleda, da je vse v predpomnilniku",
-"No calendars found." => "Ni bilo najdenih koledarjev.",
-"No events found." => "Ni bilo najdenih dogodkov.",
-"Wrong calendar" => "Napačen koledar",
-"The file contained either no events or all events are already saved in your calendar." => "Datoteka ni vsebovala dogodkov ali pa so vsi dogodki že shranjeni v koledarju.",
-"events has been saved in the new calendar" => "dogodki so bili shranjeni v nov koledar",
-"Import failed" => "Uvoz je spodletel",
-"events has been saved in your calendar" => "dogodki so bili shranjeni v vaš koledar",
-"New Timezone:" => "Nov časovni pas:",
-"Timezone changed" => "Časovni pas je bil spremenjen",
-"Invalid request" => "Neveljaven zahtevek",
-"Calendar" => "Koledar",
-"ddd" => "ddd",
-"ddd M/d" => "ddd M/d",
-"dddd M/d" => "dddd M/d",
-"MMMM yyyy" => "MMMM yyyy",
-"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
-"dddd, MMM d, yyyy" => "dddd, MMM d, yyyy",
-"Birthday" => "Rojstni dan",
-"Business" => "Poslovno",
-"Call" => "Pokliči",
-"Clients" => "Stranke",
-"Deliverer" => "Dobavitelj",
-"Holidays" => "Dopust",
-"Ideas" => "Ideje",
-"Journey" => "Potovanje",
-"Jubilee" => "Obletnica",
-"Meeting" => "Sestanek",
-"Other" => "Ostalo",
-"Personal" => "Osebno",
-"Projects" => "Projekt",
-"Questions" => "Vprašanja",
-"Work" => "Delo",
-"by" => "od",
-"unnamed" => "neimenovan",
-"New Calendar" => "Nov koledar",
-"Does not repeat" => "Se ne ponavlja",
-"Daily" => "Dnevno",
-"Weekly" => "Tedensko",
-"Every Weekday" => "Vsak dan v tednu",
-"Bi-Weekly" => "Dvakrat tedensko",
-"Monthly" => "Mesečno",
-"Yearly" => "Letno",
-"never" => "nikoli",
-"by occurrences" => "po številu dogodkov",
-"by date" => "po datumu",
-"by monthday" => "po dnevu v mesecu",
-"by weekday" => "po dnevu v tednu",
-"Monday" => "ponedeljek",
-"Tuesday" => "torek",
-"Wednesday" => "sreda",
-"Thursday" => "četrtek",
-"Friday" => "petek",
-"Saturday" => "sobota",
-"Sunday" => "nedelja",
-"events week of month" => "dogodki tedna v mesecu",
-"first" => "prvi",
-"second" => "drugi",
-"third" => "tretji",
-"fourth" => "četrti",
-"fifth" => "peti",
-"last" => "zadnji",
-"January" => "januar",
-"February" => "februar",
-"March" => "marec",
-"April" => "april",
-"May" => "maj",
-"June" => "junij",
-"July" => "julij",
-"August" => "avgust",
-"September" => "september",
-"October" => "oktober",
-"November" => "november",
-"December" => "december",
-"by events date" => "po datumu dogodka",
-"by yearday(s)" => "po številu let",
-"by weeknumber(s)" => "po tednu v letu",
-"by day and month" => "po dnevu in mesecu",
-"Date" => "Datum",
-"Cal." => "Kol.",
-"Sun." => "ned.",
-"Mon." => "pon.",
-"Tue." => "tor.",
-"Wed." => "sre.",
-"Thu." => "čet.",
-"Fri." => "pet.",
-"Sat." => "sob.",
-"Jan." => "jan.",
-"Feb." => "feb.",
-"Mar." => "mar.",
-"Apr." => "apr.",
-"May." => "maj",
-"Jun." => "jun.",
-"Jul." => "jul.",
-"Aug." => "avg.",
-"Sep." => "sep.",
-"Oct." => "okt.",
-"Nov." => "nov.",
-"Dec." => "dec.",
-"All day" => "Cel dan",
-"Missing fields" => "Mankajoča polja",
-"Title" => "Naslov",
-"From Date" => "od Datum",
-"From Time" => "od Čas",
-"To Date" => "do Datum",
-"To Time" => "do Čas",
-"The event ends before it starts" => "Dogodek se konča preden se začne",
-"There was a database fail" => "Napaka v podatkovni zbirki",
-"Week" => "Teden",
-"Month" => "Mesec",
-"List" => "Seznam",
-"Today" => "Danes",
-"Settings" => "Nastavitve",
-"Your calendars" => "Vaši koledarji",
-"CalDav Link" => "CalDav povezava",
-"Shared calendars" => "Koledarji v souporabi",
-"No shared calendars" => "Ni koledarjev v souporabi",
-"Share Calendar" => "Daj koledar v souporabo",
-"Download" => "Prenesi",
-"Edit" => "Uredi",
-"Delete" => "Izbriši",
-"shared with you by" => "z vami souporablja",
-"New calendar" => "Nov koledar",
-"Edit calendar" => "Uredi koledar",
-"Displayname" => "Ime za prikaz",
-"Active" => "Aktivno",
-"Calendar color" => "Barva koledarja",
-"Save" => "Shrani",
-"Submit" => "Potrdi",
-"Cancel" => "Prekliči",
-"Edit an event" => "Uredi dogodek",
-"Export" => "Izvozi",
-"Eventinfo" => "Informacije od dogodku",
-"Repeating" => "Ponavljanja",
-"Alarm" => "Alarm",
-"Attendees" => "Udeleženci",
-"Share" => "Souporaba",
-"Title of the Event" => "Naslov dogodka",
-"Category" => "Kategorija",
-"Separate categories with commas" => "Kategorije ločite z vejico",
-"Edit categories" => "Uredi kategorije",
-"All Day Event" => "Celodnevni dogodek",
-"From" => "Od",
-"To" => "Do",
-"Advanced options" => "Napredne možnosti",
-"Location" => "Kraj",
-"Location of the Event" => "Kraj dogodka",
-"Description" => "Opis",
-"Description of the Event" => "Opis dogodka",
-"Repeat" => "Ponovi",
-"Advanced" => "Napredno",
-"Select weekdays" => "Izberite dneve v tednu",
-"Select days" => "Izberite dneve",
-"and the events day of year." => "in dnevu dogodka v letu.",
-"and the events day of month." => "in dnevu dogodka v mesecu.",
-"Select months" => "Izberite mesece",
-"Select weeks" => "Izberite tedne",
-"and the events week of year." => "in tednu dogodka v letu.",
-"Interval" => "Časovni razmik",
-"End" => "Konec",
-"occurrences" => "ponovitev",
-"create a new calendar" => "Ustvari nov koledar",
-"Import a calendar file" => "Uvozi datoteko koledarja",
-"Please choose a calendar" => "Prosimo, če izberete koledar",
-"Name of new calendar" => "Ime novega koledarja",
-"Take an available name!" => "Izberite prosto ime!",
-"A Calendar with this name already exists. If you continue anyhow, these calendars will be merged." => "Koledar s tem imenom že obstaja. Če nadaljujete, bosta koledarja združena.",
-"Import" => "Uvozi",
-"Close Dialog" => "Zapri dialog",
-"Create a new event" => "Ustvari nov dogodek",
-"View an event" => "Poglej dogodek",
-"No categories selected" => "Nobena kategorija ni izbrana",
-"of" => "od",
-"at" => "pri",
-"General" => "Splošno",
-"Timezone" => "Časovni pas",
-"Update timezone automatically" => "Samodejno posodobi časovni pas",
-"Time format" => "Oblika zapisa časa",
-"24h" => "24ur",
-"12h" => "12ur",
-"Start week on" => "Začni teden z",
-"Cache" => "Predpomnilnik",
-"Clear cache for repeating events" => "Počisti predpomnilnik za ponavljajoče dogodke",
-"URLs" => "URLji",
-"Calendar CalDAV syncing addresses" => "CalDAV naslov za usklajevanje koledarjev",
-"more info" => "dodatne informacije",
-"Primary address (Kontact et al)" => "Glavni naslov (Kontakt et al)",
-"iOS/OS X" => "iOS/OS X",
-"Read only iCalendar link(s)" => "iCalendar povezava/e samo za branje",
-"Users" => "Uporabniki",
-"select users" => "izberite uporabnike",
-"Editable" => "Možno urejanje",
-"Groups" => "Skupine",
-"select groups" => "izberite skupine",
-"make public" => "objavi"
-);
diff --git a/apps/calendar/l10n/sr.php b/apps/calendar/l10n/sr.php
deleted file mode 100644
index 4ec60e20cb..0000000000
--- a/apps/calendar/l10n/sr.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Wrong calendar" => "Погрешан календар",
-"Timezone changed" => "Временска зона је промењена",
-"Invalid request" => "Неисправан захтев",
-"Calendar" => "Календар",
-"Birthday" => "Рођендан",
-"Business" => "Посао",
-"Call" => "Позив",
-"Clients" => "Клијенти",
-"Deliverer" => "Достављач",
-"Holidays" => "Празници",
-"Ideas" => "Идеје",
-"Journey" => "путовање",
-"Jubilee" => "јубилеј",
-"Meeting" => "Састанак",
-"Other" => "Друго",
-"Personal" => "Лично",
-"Projects" => "Пројекти",
-"Questions" => "Питања",
-"Work" => "Посао",
-"New Calendar" => "Нови календар",
-"Does not repeat" => "Не понавља се",
-"Daily" => "дневно",
-"Weekly" => "недељно",
-"Every Weekday" => "сваког дана у недељи",
-"Bi-Weekly" => "двонедељно",
-"Monthly" => "месечно",
-"Yearly" => "годишње",
-"All day" => "Цео дан",
-"Title" => "Наслов",
-"Week" => "Недеља",
-"Month" => "Месец",
-"List" => "Списак",
-"Today" => "Данас",
-"CalDav Link" => "КалДав веза",
-"Download" => "Преузми",
-"Edit" => "Уреди",
-"Delete" => "Обриши",
-"New calendar" => "Нови календар",
-"Edit calendar" => "Уреди календар",
-"Displayname" => "Приказаноиме",
-"Active" => "Активан",
-"Calendar color" => "Боја календара",
-"Save" => "Сними",
-"Submit" => "Пошаљи",
-"Cancel" => "Откажи",
-"Edit an event" => "Уреди догађај",
-"Title of the Event" => "Наслов догађаја",
-"Category" => "Категорија",
-"All Day Event" => "Целодневни догађај",
-"From" => "Од",
-"To" => "До",
-"Location" => "Локација",
-"Location of the Event" => "Локација догађаја",
-"Description" => "Опис",
-"Description of the Event" => "Опис догађаја",
-"Repeat" => "Понављај",
-"Create a new event" => "Направи нови догађај",
-"Timezone" => "Временска зона"
-);
diff --git a/apps/calendar/l10n/sr@latin.php b/apps/calendar/l10n/sr@latin.php
deleted file mode 100644
index 4ceabcbae5..0000000000
--- a/apps/calendar/l10n/sr@latin.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Wrong calendar" => "Pogrešan kalendar",
-"Timezone changed" => "Vremenska zona je promenjena",
-"Invalid request" => "Neispravan zahtev",
-"Calendar" => "Kalendar",
-"Birthday" => "Rođendan",
-"Business" => "Posao",
-"Call" => "Poziv",
-"Clients" => "Klijenti",
-"Deliverer" => "Dostavljač",
-"Holidays" => "Praznici",
-"Ideas" => "Ideje",
-"Journey" => "putovanje",
-"Jubilee" => "jubilej",
-"Meeting" => "Sastanak",
-"Other" => "Drugo",
-"Personal" => "Lično",
-"Projects" => "Projekti",
-"Questions" => "Pitanja",
-"Work" => "Posao",
-"New Calendar" => "Novi kalendar",
-"Does not repeat" => "Ne ponavlja se",
-"Daily" => "dnevno",
-"Weekly" => "nedeljno",
-"Every Weekday" => "svakog dana u nedelji",
-"Bi-Weekly" => "dvonedeljno",
-"Monthly" => "mesečno",
-"Yearly" => "godišnje",
-"All day" => "Ceo dan",
-"Title" => "Naslov",
-"Week" => "Nedelja",
-"Month" => "Mesec",
-"List" => "Spisak",
-"Today" => "Danas",
-"CalDav Link" => "KalDav veza",
-"Download" => "Preuzmi",
-"Edit" => "Uredi",
-"Delete" => "Obriši",
-"New calendar" => "Novi kalendar",
-"Edit calendar" => "Uredi kalendar",
-"Displayname" => "Prikazanoime",
-"Active" => "Aktivan",
-"Calendar color" => "Boja kalendara",
-"Save" => "Snimi",
-"Submit" => "Pošalji",
-"Cancel" => "Otkaži",
-"Edit an event" => "Uredi događaj",
-"Title of the Event" => "Naslov događaja",
-"Category" => "Kategorija",
-"All Day Event" => "Celodnevni događaj",
-"From" => "Od",
-"To" => "Do",
-"Location" => "Lokacija",
-"Location of the Event" => "Lokacija događaja",
-"Description" => "Opis",
-"Description of the Event" => "Opis događaja",
-"Repeat" => "Ponavljaj",
-"Create a new event" => "Napravi novi događaj",
-"Timezone" => "Vremenska zona"
-);
diff --git a/apps/calendar/l10n/sv.php b/apps/calendar/l10n/sv.php
deleted file mode 100644
index 4cea9073a2..0000000000
--- a/apps/calendar/l10n/sv.php
+++ /dev/null
@@ -1,196 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Not all calendars are completely cached" => "Alla kalendrar är inte fullständigt sparade i cache",
-"Everything seems to be completely cached" => "Allt verkar vara fullständigt sparat i cache",
-"No calendars found." => "Inga kalendrar funna",
-"No events found." => "Inga händelser funna.",
-"Wrong calendar" => "Fel kalender",
-"The file contained either no events or all events are already saved in your calendar." => "Filen innehöll inga händelser eller så är alla händelser redan sparade i kalendern.",
-"events has been saved in the new calendar" => "händelser har sparats i den nya kalendern",
-"Import failed" => "Misslyckad import",
-"events has been saved in your calendar" => "händelse har sparats i din kalender",
-"New Timezone:" => "Ny tidszon:",
-"Timezone changed" => "Tidszon ändrad",
-"Invalid request" => "Ogiltig begäran",
-"Calendar" => "Kalender",
-"ddd" => "ddd",
-"ddd M/d" => "ddd M/d",
-"dddd M/d" => "dddd M/d",
-"MMMM yyyy" => "MMMM åååå",
-"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
-"dddd, MMM d, yyyy" => "ddd, MMM d, åååå",
-"Birthday" => "Födelsedag",
-"Business" => "Företag",
-"Call" => "Ringa",
-"Clients" => "Klienter",
-"Deliverer" => "Leverantör",
-"Holidays" => "Semester",
-"Ideas" => "Idéer",
-"Journey" => "Resa",
-"Jubilee" => "Jubileum",
-"Meeting" => "Möte",
-"Other" => "Annat",
-"Personal" => "Personlig",
-"Projects" => "Projekt",
-"Questions" => "Frågor",
-"Work" => "Arbetet",
-"by" => "av",
-"unnamed" => "Namn saknas",
-"New Calendar" => "Ny kalender",
-"Does not repeat" => "Upprepas inte",
-"Daily" => "Dagligen",
-"Weekly" => "Varje vecka",
-"Every Weekday" => "Varje vardag",
-"Bi-Weekly" => "Varannan vecka",
-"Monthly" => "Varje månad",
-"Yearly" => "Årligen",
-"never" => "aldrig",
-"by occurrences" => "efter händelser",
-"by date" => "efter datum",
-"by monthday" => "efter dag i månaden",
-"by weekday" => "efter veckodag",
-"Monday" => "Måndag",
-"Tuesday" => "Tisdag",
-"Wednesday" => "Onsdag",
-"Thursday" => "Torsdag",
-"Friday" => "Fredag",
-"Saturday" => "Lördag",
-"Sunday" => "Söndag",
-"events week of month" => "händelse vecka av månad",
-"first" => "första",
-"second" => "andra",
-"third" => "tredje",
-"fourth" => "fjärde",
-"fifth" => "femte",
-"last" => "sist",
-"January" => "Januari",
-"February" => "Februari",
-"March" => "Mars",
-"April" => "April",
-"May" => "Maj",
-"June" => "Juni",
-"July" => "Juli",
-"August" => "Augusti",
-"September" => "September",
-"October" => "Oktober",
-"November" => "November",
-"December" => "December",
-"by events date" => "efter händelsedatum",
-"by yearday(s)" => "efter årsdag(ar)",
-"by weeknumber(s)" => "efter veckonummer",
-"by day and month" => "efter dag och månad",
-"Date" => "Datum",
-"Cal." => "Kal.",
-"Sun." => "Sön.",
-"Mon." => "Mån.",
-"Tue." => "Tis.",
-"Wed." => "Ons.",
-"Thu." => "Tor.",
-"Fri." => "Fre.",
-"Sat." => "Lör.",
-"Jan." => "Jan.",
-"Feb." => "Feb.",
-"Mar." => "Mar.",
-"Apr." => "Apr.",
-"May." => "Maj.",
-"Jun." => "Jun.",
-"Jul." => "Jul.",
-"Aug." => "Aug.",
-"Sep." => "Sep.",
-"Oct." => "Okt.",
-"Nov." => "Nov.",
-"Dec." => "Dec.",
-"All day" => "Hela dagen",
-"Missing fields" => "Saknade fält",
-"Title" => "Rubrik",
-"From Date" => "Från datum",
-"From Time" => "Från tid",
-"To Date" => "Till datum",
-"To Time" => "Till tid",
-"The event ends before it starts" => "Händelsen slutar innan den börjar",
-"There was a database fail" => "Det blev ett databasfel",
-"Week" => "Vecka",
-"Month" => "Månad",
-"List" => "Lista",
-"Today" => "Idag",
-"Your calendars" => "Dina kalendrar",
-"CalDav Link" => "CalDAV-länk",
-"Shared calendars" => "Delade kalendrar",
-"No shared calendars" => "Inga delade kalendrar",
-"Share Calendar" => "Dela kalender",
-"Download" => "Ladda ner",
-"Edit" => "Redigera",
-"Delete" => "Radera",
-"shared with you by" => "delad med dig av",
-"New calendar" => "Nya kalender",
-"Edit calendar" => "Redigera kalender",
-"Displayname" => "Visningsnamn",
-"Active" => "Aktiv",
-"Calendar color" => "Kalender-färg",
-"Save" => "Spara",
-"Submit" => "Lägg till",
-"Cancel" => "Avbryt",
-"Edit an event" => "Redigera en händelse",
-"Export" => "Exportera",
-"Eventinfo" => "Händelseinfo",
-"Repeating" => "Repetera",
-"Alarm" => "Alarm",
-"Attendees" => "Deltagare",
-"Share" => "Dela",
-"Title of the Event" => "Rubrik för händelsen",
-"Category" => "Kategori",
-"Separate categories with commas" => "Separera kategorier med komman",
-"Edit categories" => "Redigera kategorier",
-"All Day Event" => "Hela dagen",
-"From" => "Från",
-"To" => "Till",
-"Advanced options" => "Avancerade alternativ",
-"Location" => "Plats",
-"Location of the Event" => "Platsen för händelsen",
-"Description" => "Beskrivning",
-"Description of the Event" => "Beskrivning av händelse",
-"Repeat" => "Upprepa",
-"Advanced" => "Avancerad",
-"Select weekdays" => "Välj veckodagar",
-"Select days" => "Välj dagar",
-"and the events day of year." => "och händelsedagen för året.",
-"and the events day of month." => "och händelsedagen för månaden.",
-"Select months" => "Välj månader",
-"Select weeks" => "Välj veckor",
-"and the events week of year." => "och händelsevecka för året.",
-"Interval" => "Hur ofta",
-"End" => "Slut",
-"occurrences" => "Händelser",
-"create a new calendar" => "skapa en ny kalender",
-"Import a calendar file" => "Importera en kalenderfil",
-"Please choose a calendar" => "Välj en kalender",
-"Name of new calendar" => "Namn på ny kalender",
-"Take an available name!" => "Ta ett ledigt namn!",
-"A Calendar with this name already exists. If you continue anyhow, these calendars will be merged." => "En kalender med detta namn finns redan. Om du fortsätter ändå så kommer dessa kalendrar att slås samman.",
-"Import" => "Importera",
-"Importing calendar" => "Importerar kalender",
-"Calendar imported successfully" => "Kalender importerades utan problem",
-"Close Dialog" => "Stäng ",
-"Create a new event" => "Skapa en ny händelse",
-"View an event" => "Visa en händelse",
-"No categories selected" => "Inga kategorier valda",
-"of" => "av",
-"at" => "på",
-"Timezone" => "Tidszon",
-"Check always for changes of the timezone" => "Kontrollera alltid ändringar i tidszon.",
-"Timeformat" => "Tidsformat",
-"24h" => "24h",
-"12h" => "12h",
-"Cache" => "Cache",
-"Clear cache for repeating events" => "Töm cache för upprepade händelser",
-"Calendar CalDAV syncing addresses" => "Kalender CalDAV synkroniserar adresser",
-"more info" => "mer info",
-"Primary address (Kontact et al)" => "Primary address (Kontact et al)",
-"iOS/OS X" => "iOS/OS X",
-"Read only iCalendar link(s)" => "Read only iCalendar link(s)",
-"Users" => "Användare",
-"select users" => "välj användare",
-"Editable" => "Redigerbar",
-"Groups" => "Grupper",
-"select groups" => "Välj grupper",
-"make public" => "Gör offentlig"
-);
diff --git a/apps/calendar/l10n/th_TH.php b/apps/calendar/l10n/th_TH.php
deleted file mode 100644
index 0b92a623d4..0000000000
--- a/apps/calendar/l10n/th_TH.php
+++ /dev/null
@@ -1,198 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Not all calendars are completely cached" => "ไม่ใช่ปฏิทินทั้งหมดที่จะถูกจัดเก็บข้อมูลไว้ในหน่วยความจำแคชอย่างสมบูรณ์",
-"Everything seems to be completely cached" => "ทุกสิ่งทุกอย่างได้ถูกเก็บเข้าไปไว้ในหน่วยความจำแคชอย่างสมบูรณ์แล้ว",
-"No calendars found." => "ไม่พบปฏิทินที่ต้องการ",
-"No events found." => "ไม่พบกิจกรรมที่ต้องการ",
-"Wrong calendar" => "ปฏิทินไม่ถูกต้อง",
-"The file contained either no events or all events are already saved in your calendar." => "ไฟล์ดังกล่าวบรรจุข้อมูลกิจกรรมที่มีอยู่แล้วในปฏิทินของคุณ",
-"events has been saved in the new calendar" => "กิจกรรมได้ถูกบันทึกไปไว้ในปฏิทินที่สร้างขึ้นใหม่แล้ว",
-"Import failed" => "การนำเข้าข้อมูลล้มเหลว",
-"events has been saved in your calendar" => "กิจกรรมได้ถูกบันทึกเข้าไปไว้ในปฏิทินของคุณแล้ว",
-"New Timezone:" => "สร้างโซนเวลาใหม่:",
-"Timezone changed" => "โซนเวลาถูกเปลี่ยนแล้ว",
-"Invalid request" => "คำร้องขอไม่ถูกต้อง",
-"Calendar" => "ปฏิทิน",
-"ddd" => "ddd",
-"ddd M/d" => "ddd M/d",
-"dddd M/d" => "dddd M/d",
-"MMMM yyyy" => "MMMM yyyy",
-"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
-"dddd, MMM d, yyyy" => "dddd, MMM d, yyyy",
-"Birthday" => "วันเกิด",
-"Business" => "ธุรกิจ",
-"Call" => "โทรติดต่อ",
-"Clients" => "ลูกค้า",
-"Deliverer" => "จัดส่ง",
-"Holidays" => "วันหยุด",
-"Ideas" => "ไอเดีย",
-"Journey" => "การเดินทาง",
-"Jubilee" => "งานเลี้ยง",
-"Meeting" => "นัดประชุม",
-"Other" => "อื่นๆ",
-"Personal" => "ส่วนตัว",
-"Projects" => "โครงการ",
-"Questions" => "คำถาม",
-"Work" => "งาน",
-"by" => "โดย",
-"unnamed" => "ไม่มีชื่อ",
-"New Calendar" => "สร้างปฏิทินใหม่",
-"Does not repeat" => "ไม่ต้องทำซ้ำ",
-"Daily" => "รายวัน",
-"Weekly" => "รายสัปดาห์",
-"Every Weekday" => "ทุกวันหยุด",
-"Bi-Weekly" => "รายปักษ์",
-"Monthly" => "รายเดือน",
-"Yearly" => "รายปี",
-"never" => "ไม่ต้องเลย",
-"by occurrences" => "ตามจำนวนที่ปรากฏ",
-"by date" => "ตามวันที่",
-"by monthday" => "จากเดือน",
-"by weekday" => "จากสัปดาห์",
-"Monday" => "วันจันทร์",
-"Tuesday" => "วันอังคาร",
-"Wednesday" => "วันพุธ",
-"Thursday" => "วันพฤหัสบดี",
-"Friday" => "วันศุกร์",
-"Saturday" => "วันเสาร์",
-"Sunday" => "วันอาทิตย์",
-"events week of month" => "สัปดาห์ที่มีกิจกรรมของเดือน",
-"first" => "ลำดับแรก",
-"second" => "ลำดับที่สอง",
-"third" => "ลำดับที่สาม",
-"fourth" => "ลำดับที่สี่",
-"fifth" => "ลำดับที่ห้า",
-"last" => "ลำดับสุดท้าย",
-"January" => "มกราคม",
-"February" => "กุมภาพันธ์",
-"March" => "มีนาคม",
-"April" => "เมษายน",
-"May" => "พฤษภาคม",
-"June" => "มิถุนายน",
-"July" => "กรกฏาคม",
-"August" => "สิงหาคม",
-"September" => "กันยายน",
-"October" => "ตุลาคม",
-"November" => "พฤศจิกายน",
-"December" => "ธันวาคม",
-"by events date" => "ตามวันที่จัดกิจกรรม",
-"by yearday(s)" => "ของเมื่อวานนี้",
-"by weeknumber(s)" => "จากหมายเลขของสัปดาห์",
-"by day and month" => "ตามวันและเดือน",
-"Date" => "วันที่",
-"Cal." => "คำนวณ",
-"Sun." => "อา.",
-"Mon." => "จ.",
-"Tue." => "อ.",
-"Wed." => "พ.",
-"Thu." => "พฤ.",
-"Fri." => "ศ.",
-"Sat." => "ส.",
-"Jan." => "ม.ค.",
-"Feb." => "ก.พ.",
-"Mar." => "มี.ค.",
-"Apr." => "เม.ย.",
-"May." => "พ.ค.",
-"Jun." => "มิ.ย.",
-"Jul." => "ก.ค.",
-"Aug." => "ส.ค.",
-"Sep." => "ก.ย.",
-"Oct." => "ต.ค.",
-"Nov." => "พ.ย.",
-"Dec." => "ธ.ค.",
-"All day" => "ทั้งวัน",
-"Missing fields" => "ช่องฟิลด์เกิดการสูญหาย",
-"Title" => "ชื่อกิจกรรม",
-"From Date" => "จากวันที่",
-"From Time" => "ตั้งแต่เวลา",
-"To Date" => "ถึงวันที่",
-"To Time" => "ถึงเวลา",
-"The event ends before it starts" => "วันที่สิ้นสุดกิจกรรมดังกล่าวอยู่ก่อนวันเริ่มต้น",
-"There was a database fail" => "เกิดความล้มเหลวกับฐานข้อมูล",
-"Week" => "สัปดาห์",
-"Month" => "เดือน",
-"List" => "รายการ",
-"Today" => "วันนี้",
-"Settings" => "ตั้งค่า",
-"Your calendars" => "ปฏิทินของคุณ",
-"CalDav Link" => "ลิงค์ CalDav",
-"Shared calendars" => "ปฏิทินที่เปิดแชร์",
-"No shared calendars" => "ไม่มีปฏิทินที่เปิดแชร์ไว้",
-"Share Calendar" => "เปิดแชร์ปฏิทิน",
-"Download" => "ดาวน์โหลด",
-"Edit" => "แก้ไข",
-"Delete" => "ลบ",
-"shared with you by" => "แชร์ให้คุณโดย",
-"New calendar" => "สร้างปฏิทินใหม่",
-"Edit calendar" => "แก้ไขปฏิทิน",
-"Displayname" => "ชื่อที่ต้องการให้แสดง",
-"Active" => "ใช้งาน",
-"Calendar color" => "สีของปฏิทิน",
-"Save" => "บันทึก",
-"Submit" => "ส่งข้อมูล",
-"Cancel" => "ยกเลิก",
-"Edit an event" => "แก้ไขกิจกรรม",
-"Export" => "ส่งออกข้อมูล",
-"Eventinfo" => "ข้อมูลเกี่ยวกับกิจกรรม",
-"Repeating" => "ทำซ้ำ",
-"Alarm" => "แจ้งเตือน",
-"Attendees" => "ผู้เข้าร่วมกิจกรรม",
-"Share" => "แชร์",
-"Title of the Event" => "ชื่อของกิจกรรม",
-"Category" => "หมวดหมู่",
-"Separate categories with commas" => "คั่นระหว่างรายการหมวดหมู่ด้วยเครื่องหมายจุลภาคหรือคอมม่า",
-"Edit categories" => "แก้ไขหมวดหมู่",
-"All Day Event" => "เป็นกิจกรรมตลอดทั้งวัน",
-"From" => "จาก",
-"To" => "ถึง",
-"Advanced options" => "ตัวเลือกขั้นสูง",
-"Location" => "สถานที่",
-"Location of the Event" => "สถานที่จัดกิจกรรม",
-"Description" => "คำอธิบาย",
-"Description of the Event" => "คำอธิบายเกี่ยวกับกิจกรรม",
-"Repeat" => "ทำซ้ำ",
-"Advanced" => "ขั้นสูง",
-"Select weekdays" => "เลือกสัปดาห์",
-"Select days" => "เลือกวัน",
-"and the events day of year." => "และวันที่มีเหตุการณ์เกิดขึ้นในปี",
-"and the events day of month." => "และวันที่มีเหตุการณ์เกิดขึ้นในเดือน",
-"Select months" => "เลือกเดือน",
-"Select weeks" => "เลือกสัปดาห์",
-"and the events week of year." => "และสัปดาห์ที่มีเหตุการณ์เกิดขึ้นในปี",
-"Interval" => "ช่วงเวลา",
-"End" => "สิ้นสุด",
-"occurrences" => "จำนวนที่ปรากฏ",
-"create a new calendar" => "สร้างปฏิทินใหม่",
-"Import a calendar file" => "นำเข้าไฟล์ปฏิทิน",
-"Please choose a calendar" => "กรุณาเลือกปฏิทิน",
-"Name of new calendar" => "ชื่อของปฏิทิน",
-"Take an available name!" => "เลือกชื่อที่ต้องการ",
-"A Calendar with this name already exists. If you continue anyhow, these calendars will be merged." => "ปฏิทินชื่อดังกล่าวถูกใช้งานไปแล้ว หากคุณยังดำเนินการต่อไป ปฏิทินดังกล่าวนี้จะถูกผสานข้อมูลเข้าด้วยกัน",
-"Import" => "นำเข้าข้อมูล",
-"Close Dialog" => "ปิดกล่องข้อความโต้ตอบ",
-"Create a new event" => "สร้างกิจกรรมใหม่",
-"View an event" => "ดูกิจกรรม",
-"No categories selected" => "ยังไม่ได้เลือกหมวดหมู่",
-"of" => "ของ",
-"at" => "ที่",
-"General" => "ทั่วไป",
-"Timezone" => "โซนเวลา",
-"Update timezone automatically" => "อัพเดทโซนเวลาอัตโนมัติ",
-"Time format" => "รูปแบบเวลา",
-"24h" => "24 ช.ม.",
-"12h" => "12 ช.ม.",
-"Start week on" => "เริ่มต้นสัปดาห์ด้วย",
-"Cache" => "หน่วยความจำแคช",
-"Clear cache for repeating events" => "ล้างข้อมูลในหน่วยความจำแคชสำหรับกิจกรรมที่ซ้ำซ้อน",
-"URLs" => "URLs",
-"Calendar CalDAV syncing addresses" => "ที่อยู่ที่ใช้สำหรับเชื่อมข้อมูลปฏิทิน CalDAV",
-"more info" => "ข้อมูลเพิ่มเติม",
-"Primary address (Kontact et al)" => "ที่อยู่หลัก (Kontact et al)",
-"iOS/OS X" => "iOS/OS X",
-"Read only iCalendar link(s)" => "อ่านเฉพาะลิงก์ iCalendar เท่านั้น",
-"Users" => "ผู้ใช้งาน",
-"select users" => "เลือกผู้ใช้งาน",
-"Editable" => "สามารถแก้ไขได้",
-"Groups" => "กลุ่ม",
-"select groups" => "เลือกกลุ่ม",
-"make public" => "กำหนดเป็นสาธารณะ"
-);
diff --git a/apps/calendar/l10n/tr.php b/apps/calendar/l10n/tr.php
deleted file mode 100644
index b9256eb619..0000000000
--- a/apps/calendar/l10n/tr.php
+++ /dev/null
@@ -1,192 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Not all calendars are completely cached" => "Bütün takvimler tamamen  ön belleğe alınmadı",
-"Everything seems to be completely cached" => "Bütün herşey tamamen ön belleğe alınmış görünüyor",
-"No calendars found." => "Takvim yok.",
-"No events found." => "Etkinlik yok.",
-"Wrong calendar" => "Yanlış takvim",
-"The file contained either no events or all events are already saved in your calendar." => "Dosya ya hiçbir etkinlik içermiyor veya bütün etkinlikler takviminizde zaten saklı.",
-"events has been saved in the new calendar" => "Etkinlikler yeni takvimde saklandı",
-"Import failed" => "İçeri aktarma başarısız oldu.",
-"events has been saved in your calendar" => "Etkinlikler takviminizde saklandı",
-"New Timezone:" => "Yeni Zamandilimi:",
-"Timezone changed" => "Zaman dilimi değiştirildi",
-"Invalid request" => "Geçersiz istek",
-"Calendar" => "Takvim",
-"ddd" => "ddd",
-"ddd M/d" => "ddd M/d",
-"dddd M/d" => "dddd M/d",
-"MMMM yyyy" => "MMMM yyyy",
-"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "AAA g[ yyyy]{ '&#8212;'[ AAA] g yyyy}",
-"dddd, MMM d, yyyy" => "dddd, MMM d, yyyy",
-"Birthday" => "Doğum günü",
-"Business" => "İş",
-"Call" => "Arama",
-"Clients" => "Müşteriler",
-"Deliverer" => "Teslimatçı",
-"Holidays" => "Tatil günleri",
-"Ideas" => "Fikirler",
-"Journey" => "Seyahat",
-"Jubilee" => "Yıl dönümü",
-"Meeting" => "Toplantı",
-"Other" => "Diğer",
-"Personal" => "Kişisel",
-"Projects" => "Projeler",
-"Questions" => "Sorular",
-"Work" => "İş",
-"by" => "hazırlayan",
-"unnamed" => "isimsiz",
-"New Calendar" => "Yeni Takvim",
-"Does not repeat" => "Tekrar etmiyor",
-"Daily" => "Günlük",
-"Weekly" => "Haftalı",
-"Every Weekday" => "Haftaiçi Her gün",
-"Bi-Weekly" => "İki haftada bir",
-"Monthly" => "Aylık",
-"Yearly" => "Yıllı",
-"never" => "asla",
-"by occurrences" => "sıklığa göre",
-"by date" => "tarihe göre",
-"by monthday" => "ay günlerine göre",
-"by weekday" => "hafta günlerine göre",
-"Monday" => "Pazartesi",
-"Tuesday" => "Salı",
-"Wednesday" => "Çarşamba",
-"Thursday" => "Perşembe",
-"Friday" => "Cuma",
-"Saturday" => "Cumartesi",
-"Sunday" => "Pazar",
-"events week of month" => "ayın etkinlikler haftası",
-"first" => "birinci",
-"second" => "ikinci",
-"third" => "üçüncü",
-"fourth" => "dördüncü",
-"fifth" => "beşinci",
-"last" => "sonuncu",
-"January" => "Ocak",
-"February" => "Şubat",
-"March" => "Mart",
-"April" => "Nisan",
-"May" => "Mayıs",
-"June" => "Haziran",
-"July" => "Temmuz",
-"August" => "Ağustos",
-"September" => "Eylül",
-"October" => "Ekim",
-"November" => "Kasım",
-"December" => "Aralık",
-"by events date" => "olay tarihine göre",
-"by yearday(s)" => "yıl gün(ler)ine göre",
-"by weeknumber(s)" => "hafta sayı(lar)ına göre",
-"by day and month" => "gün ve aya göre",
-"Date" => "Tarih",
-"Cal." => "Takv.",
-"Sun." => "Paz.",
-"Mon." => "Pzt.",
-"Tue." => "Sal.",
-"Wed." => "Çar.",
-"Thu." => "Per.",
-"Fri." => "Cum.",
-"Sat." => "Cmt.",
-"Jan." => "Oca.",
-"Feb." => "Şbt.",
-"Mar." => "Mar.",
-"Apr." => "Nis",
-"May." => "May.",
-"Jun." => "Haz.",
-"Jul." => "Tem.",
-"Aug." => "Agu.",
-"Sep." => "Eyl.",
-"Oct." => "Eki.",
-"Nov." => "Kas.",
-"Dec." => "Ara.",
-"All day" => "Tüm gün",
-"Missing fields" => "Eksik alanlar",
-"Title" => "Başlık",
-"From Date" => "Bu Tarihten",
-"From Time" => "Bu Saatten",
-"To Date" => "Bu Tarihe",
-"To Time" => "Bu Saate",
-"The event ends before it starts" => "Olay başlamadan önce bitiyor",
-"There was a database fail" => "Bir veritabanı başarısızlığı oluştu",
-"Week" => "Hafta",
-"Month" => "Ay",
-"List" => "Liste",
-"Today" => "Bugün",
-"Your calendars" => "Takvimleriniz",
-"CalDav Link" => "CalDav Bağlantısı",
-"Shared calendars" => "Paylaşılan",
-"No shared calendars" => "Paylaşılan takvim yok",
-"Share Calendar" => "Takvimi paylaş",
-"Download" => "İndir",
-"Edit" => "Düzenle",
-"Delete" => "Sil",
-"shared with you by" => "sizinle paylaşılmış",
-"New calendar" => "Yeni takvim",
-"Edit calendar" => "Takvimi düzenle",
-"Displayname" => "Görünüm adı",
-"Active" => "Aktif",
-"Calendar color" => "Takvim rengi",
-"Save" => "Kaydet",
-"Submit" => "Gönder",
-"Cancel" => "İptal",
-"Edit an event" => "Bir olay düzenle",
-"Export" => "Dışa aktar",
-"Eventinfo" => "Etkinlik bilgisi",
-"Repeating" => "Tekrarlama",
-"Alarm" => "Alarm",
-"Attendees" => "Katılanlar",
-"Share" => "Paylaş",
-"Title of the Event" => "Olayın Başlığı",
-"Category" => "Kategori",
-"Separate categories with commas" => "Kategorileri virgülle ayırın",
-"Edit categories" => "Kategorileri düzenle",
-"All Day Event" => "Tüm Gün Olay",
-"From" => "Kimden",
-"To" => "Kime",
-"Advanced options" => "Gelişmiş opsiyonlar",
-"Location" => "Konum",
-"Location of the Event" => "Olayın Konumu",
-"Description" => "Açıklama",
-"Description of the Event" => "Olayın Açıklaması",
-"Repeat" => "Tekrar",
-"Advanced" => "Gelişmiş",
-"Select weekdays" => "Hafta günlerini seçin",
-"Select days" => "Günleri seçin",
-"and the events day of year." => "ve yılın etkinlikler günü.",
-"and the events day of month." => "ve ayın etkinlikler günü.",
-"Select months" => "Ayları seç",
-"Select weeks" => "Haftaları seç",
-"and the events week of year." => "ve yılın etkinkinlikler haftası.",
-"Interval" => "Aralık",
-"End" => "Son",
-"occurrences" => "olaylar",
-"create a new calendar" => "Yeni bir takvim oluştur",
-"Import a calendar file" => "Takvim dosyasını içeri aktar",
-"Please choose a calendar" => "Lütfen takvim seçiniz",
-"Name of new calendar" => "Yeni takvimin adı",
-"Take an available name!" => "Müsait ismi al !",
-"A Calendar with this name already exists. If you continue anyhow, these calendars will be merged." => "Bu isimde bir takvim zaten mevcut. Yine de devam ederseniz bu takvimler birleştirilecektir.",
-"Import" => "İçe Al",
-"Close Dialog" => "Diyalogu kapat",
-"Create a new event" => "Yeni olay oluştur",
-"View an event" => "Bir olay görüntüle",
-"No categories selected" => "Kategori seçilmedi",
-"of" => "nın",
-"at" => "üzerinde",
-"Timezone" => "Zaman dilimi",
-"24h" => "24s",
-"12h" => "12s",
-"Cache" => "Önbellek",
-"Clear cache for repeating events" => "Tekrar eden etkinlikler için ön belleği temizle.",
-"Calendar CalDAV syncing addresses" => "CalDAV takvimi adresleri senkronize ediyor.",
-"more info" => "daha fazla bilgi",
-"Primary address (Kontact et al)" => "Öncelikli adres",
-"iOS/OS X" => "iOS/OS X",
-"Read only iCalendar link(s)" => "Sadece okunabilir iCalendar link(ler)i",
-"Users" => "Kullanıcılar",
-"select users" => "kullanıcıları seç",
-"Editable" => "Düzenlenebilir",
-"Groups" => "Gruplar",
-"select groups" => "grupları seç",
-"make public" => "kamuyla paylaş"
-);
diff --git a/apps/calendar/l10n/uk.php b/apps/calendar/l10n/uk.php
deleted file mode 100644
index 2911307e58..0000000000
--- a/apps/calendar/l10n/uk.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php $TRANSLATIONS = array(
-"New Timezone:" => "Новий часовий пояс",
-"Timezone changed" => "Часовий пояс змінено",
-"Calendar" => "Календар",
-"Birthday" => "День народження",
-"Business" => "Справи",
-"Call" => "Подзвонити",
-"Clients" => "Клієнти",
-"Holidays" => "Свята",
-"Ideas" => "Ідеї",
-"Journey" => "Поїздка",
-"Jubilee" => "Ювілей",
-"Meeting" => "Зустріч",
-"Other" => "Інше",
-"Personal" => "Особисте",
-"Projects" => "Проекти",
-"Questions" => "Запитання",
-"Work" => "Робота",
-"New Calendar" => "новий Календар",
-"Does not repeat" => "Не повторювати",
-"Daily" => "Щоденно",
-"Weekly" => "Щотижня",
-"Every Weekday" => "По будням",
-"Bi-Weekly" => "Кожні дві неділі",
-"Monthly" => "Щомісяця",
-"Yearly" => "Щорічно",
-"never" => "ніколи",
-"Monday" => "Понеділок",
-"Tuesday" => "Вівторок",
-"Wednesday" => "Середа",
-"Thursday" => "Четвер",
-"Friday" => "П'ятниця",
-"Saturday" => "Субота",
-"Sunday" => "Неділя",
-"first" => "перший",
-"second" => "другий",
-"third" => "третій",
-"fourth" => "четвертий",
-"fifth" => "п'ятий",
-"last" => "останній",
-"January" => "Січень",
-"February" => "Лютий",
-"March" => "Березень",
-"April" => "Квітень",
-"May" => "Травень",
-"June" => "Червень",
-"July" => "Липень",
-"August" => "Серпень",
-"September" => "Вересень",
-"October" => "Жовтень",
-"November" => "Листопад",
-"December" => "Грудень",
-"Date" => "Дата",
-"Cal." => "Кал.",
-"All day" => "Увесь день",
-"Missing fields" => "Пропущені поля",
-"Title" => "Назва",
-"From Date" => "Від Дати",
-"From Time" => "З Часу",
-"To Date" => "До Часу",
-"To Time" => "По Дату",
-"The event ends before it starts" => "Подія завершається до її початку",
-"There was a database fail" => "Сталася помилка бази даних",
-"Week" => "Тиждень",
-"Month" => "Місяць",
-"List" => "Список",
-"Today" => "Сьогодні",
-"Your calendars" => "Ваші календарі",
-"Download" => "Завантажити",
-"Edit" => "Редагувати",
-"Delete" => "Видалити",
-"New calendar" => "Новий календар",
-"Edit calendar" => "Редагувати календар",
-"Active" => "Активний",
-"Calendar color" => "Колір календаря",
-"Save" => "Зберегти",
-"Cancel" => "Відмінити",
-"Export" => "Експорт",
-"Title of the Event" => "Назва події",
-"Category" => "Категорія",
-"From" => "З",
-"To" => "По",
-"Location" => "Місце",
-"Location of the Event" => "Місце події",
-"Description" => "Опис",
-"Description of the Event" => "Опис події",
-"Repeat" => "Повторювати",
-"create a new calendar" => "створити новий календар",
-"Import a calendar file" => "Імпортувати файл календаря",
-"Name of new calendar" => "Назва нового календаря",
-"Import" => "Імпорт",
-"Create a new event" => "Створити нову подію",
-"Timezone" => "Часовий пояс",
-"24h" => "24г",
-"12h" => "12г",
-"Users" => "Користувачі",
-"Groups" => "Групи"
-);
diff --git a/apps/calendar/l10n/vi.php b/apps/calendar/l10n/vi.php
deleted file mode 100644
index 3594a095eb..0000000000
--- a/apps/calendar/l10n/vi.php
+++ /dev/null
@@ -1,131 +0,0 @@
-<?php $TRANSLATIONS = array(
-"No calendars found." => "Không tìm thấy lịch.",
-"No events found." => "Không tìm thấy sự kiện nào",
-"Wrong calendar" => "Sai lịch",
-"New Timezone:" => "Múi giờ mới :",
-"Timezone changed" => "Thay đổi múi giờ",
-"Invalid request" => "Yêu cầu không hợp lệ",
-"Calendar" => "Lịch",
-"ddd" => "ddd",
-"ddd M/d" => "ddd M/d",
-"dddd M/d" => "dddd M/d",
-"MMMM yyyy" => "MMMM yyyy",
-"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
-"dddd, MMM d, yyyy" => "dddd, MMM d, yyyy",
-"Birthday" => "Ngày sinh nhật",
-"Business" => "Công việc",
-"Call" => "Số điện thoại",
-"Clients" => "Máy trạm",
-"Holidays" => "Ngày lễ",
-"Ideas" => "Ý tưởng",
-"Jubilee" => "Lễ kỷ niệm",
-"Meeting" => "Hội nghị",
-"Other" => "Khác",
-"Personal" => "Cá nhân",
-"Projects" => "Dự án",
-"Questions" => "Câu hỏi",
-"Work" => "Công việc",
-"New Calendar" => "Lịch mới",
-"Does not repeat" => "Không lặp lại",
-"Daily" => "Hàng ngày",
-"Weekly" => "Hàng tuần",
-"Every Weekday" => "Mỗi ngày trong tuần",
-"Bi-Weekly" => "Hai tuần một lần",
-"Monthly" => "Hàng tháng",
-"Yearly" => "Hàng năm",
-"never" => "không thay đổi",
-"by occurrences" => "bởi xuất hiện",
-"by date" => "bởi ngày",
-"by monthday" => "bởi ngày trong tháng",
-"by weekday" => "bởi ngày trong tuần",
-"Monday" => "Thứ 2",
-"Tuesday" => "Thứ 3",
-"Wednesday" => "Thứ 4",
-"Thursday" => "Thứ 5",
-"Friday" => "Thứ ",
-"Saturday" => "Thứ 7",
-"Sunday" => "Chủ nhật",
-"events week of month" => "sự kiện trong tuần của tháng",
-"first" => "đầu tiên",
-"second" => "Thứ hai",
-"third" => "Thứ ba",
-"fourth" => "Thứ tư",
-"fifth" => "Thứ năm",
-"January" => "Tháng 1",
-"February" => "Tháng 2",
-"March" => "Tháng 3",
-"April" => "Tháng 4",
-"May" => "Tháng 5",
-"June" => "Tháng 6",
-"July" => "Tháng 7",
-"August" => "Tháng 8",
-"September" => "Tháng 9",
-"October" => "Tháng 10",
-"November" => "Tháng 11",
-"December" => "Tháng 12",
-"by events date" => "Theo ngày tháng sự kiện",
-"by weeknumber(s)" => "số tuần",
-"by day and month" => "ngày, tháng",
-"Date" => "Ngày",
-"Cal." => "Cal.",
-"All day" => "Tất cả các ngày",
-"Title" => "Tiêu đề",
-"From Date" => "Từ ngày",
-"From Time" => "Từ thời gian",
-"To Date" => "Tới ngày",
-"To Time" => "Tới thời gian",
-"The event ends before it starts" => "Sự kiện này kết thúc trước khi nó bắt đầu",
-"Week" => "Tuần",
-"Month" => "Tháng",
-"List" => "Danh sách",
-"Today" => "Hôm nay",
-"Your calendars" => "Lịch của bạn",
-"CalDav Link" => "Liên kết CalDav ",
-"Shared calendars" => "Chia sẻ lịch",
-"No shared calendars" => "Không chia sẻ lcihj",
-"Share Calendar" => "Chia sẻ lịch",
-"Download" => "Tải về",
-"Edit" => "Chỉnh sửa",
-"Delete" => "Xóa",
-"shared with you by" => "Chia sẻ bởi",
-"New calendar" => "Lịch mới",
-"Edit calendar" => "sửa Lịch",
-"Displayname" => "Hiển thị tên",
-"Active" => "Kích hoạt",
-"Calendar color" => "Màu lịch",
-"Save" => "Lưu",
-"Submit" => "Submit",
-"Cancel" => "Hủy",
-"Edit an event" => "Sửa sự kiện",
-"Share" => "Chia sẻ",
-"Title of the Event" => "Tên sự kiện",
-"Category" => "Danh mục",
-"All Day Event" => "Sự kiện trong ngày",
-"From" => "Từ",
-"To" => "Tới",
-"Advanced options" => "Tùy chọn nâng cao",
-"Location" => "Nơi",
-"Location of the Event" => "Nơi tổ chức sự kiện",
-"Description" => "Mô tả",
-"Description of the Event" => "Mô tả sự kiện",
-"Repeat" => "Lặp lại",
-"Advanced" => "Nâng cao",
-"Select weekdays" => "Chọn ngày trong tuần",
-"Select days" => "Chọn ngày",
-"and the events day of year." => "và sự kiện của ngày trong năm",
-"and the events day of month." => "và sự kiện của một ngày trong năm",
-"Select months" => "Chọn tháng",
-"Select weeks" => "Chọn tuần",
-"and the events week of year." => "và sự kiện của tuần trong năm.",
-"create a new calendar" => "Tạo lịch mới",
-"Name of new calendar" => "Tên lịch mới",
-"Close Dialog" => "Đóng hộp thoại",
-"Create a new event" => "Tạo một sự kiện mới",
-"View an event" => "Xem một sự kiện",
-"No categories selected" => "Không danh sách nào được chọn",
-"of" => "của",
-"at" => "tại",
-"Timezone" => "Múi giờ",
-"24h" => "24h",
-"12h" => "12h"
-);
diff --git a/apps/calendar/l10n/xgettextfiles b/apps/calendar/l10n/xgettextfiles
deleted file mode 100644
index a8c2601045..0000000000
--- a/apps/calendar/l10n/xgettextfiles
+++ /dev/null
@@ -1,12 +0,0 @@
-../appinfo/app.php
-../lib/object.php
-../templates/calendar.php
-../templates/part.choosecalendar.php
-../templates/part.choosecalendar.rowfields.php
-../templates/part.editcalendar.php
-../templates/part.editevent.php
-../templates/part.eventform.php
-../templates/part.import.php
-../templates/part.newevent.php
-../templates/settings.php
-../templates/lAfix.php
\ No newline at end of file
diff --git a/apps/calendar/l10n/zh_CN.GB2312.php b/apps/calendar/l10n/zh_CN.GB2312.php
deleted file mode 100644
index 38f039e661..0000000000
--- a/apps/calendar/l10n/zh_CN.GB2312.php
+++ /dev/null
@@ -1,121 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Wrong calendar" => "错误的日历",
-"New Timezone:" => "新时区",
-"Timezone changed" => "时区改变了",
-"Invalid request" => "非法请求",
-"Calendar" => "日历",
-"Birthday" => "生日",
-"Business" => "商务",
-"Call" => "呼叫",
-"Clients" => "客户端",
-"Deliverer" => "交付者",
-"Holidays" => "假期",
-"Ideas" => "灵感",
-"Journey" => "旅行",
-"Jubilee" => "五十年纪念",
-"Meeting" => "会面",
-"Other" => "其它",
-"Personal" => "个人的",
-"Projects" => "项目",
-"Questions" => "问题",
-"Work" => "工作",
-"New Calendar" => "新的日历",
-"Does not repeat" => "不要重复",
-"Daily" => "每天",
-"Weekly" => "每星期",
-"Every Weekday" => "每个周末",
-"Bi-Weekly" => "每两周",
-"Monthly" => "每个月",
-"Yearly" => "每年",
-"never" => "从不",
-"by occurrences" => "根据发生时",
-"by date" => "根据日期",
-"by monthday" => "根据月天",
-"by weekday" => "根据星期",
-"Monday" => "星期一",
-"Tuesday" => "星期二",
-"Wednesday" => "星期三",
-"Thursday" => "星期四",
-"Friday" => "星期五",
-"Saturday" => "星期六",
-"Sunday" => "星期天",
-"events week of month" => "时间每月发生的周数",
-"first" => "首先",
-"second" => "其次",
-"third" => "第三",
-"fourth" => "第四",
-"fifth" => "第五",
-"last" => "最后",
-"January" => "一月",
-"February" => "二月",
-"March" => "三月",
-"April" => "四月",
-"May" => "五月",
-"June" => "六月",
-"July" => "七月",
-"August" => "八月",
-"September" => "九月",
-"October" => "十月",
-"November" => "十一月",
-"December" => "十二月",
-"by events date" => "根据时间日期",
-"by yearday(s)" => "根据年数",
-"by weeknumber(s)" => "根据周数",
-"by day and month" => "根据天和月",
-"Date" => "日期",
-"Cal." => "Cal.",
-"All day" => "整天",
-"Missing fields" => "丢失的输入框",
-"Title" => "标题",
-"From Date" => "从日期",
-"From Time" => "从时间",
-"To Date" => "到日期",
-"To Time" => "到时间",
-"The event ends before it starts" => "在它开始前需要结束的事件",
-"There was a database fail" => "发生了一个数据库失败",
-"Week" => "星期",
-"Month" => "月",
-"List" => "列表",
-"Today" => "今天",
-"CalDav Link" => "CalDav 链接",
-"Download" => "下载",
-"Edit" => "编辑",
-"Delete" => "删除",
-"New calendar" => "新的日历",
-"Edit calendar" => "编辑日历",
-"Displayname" => "显示名称",
-"Active" => "活动",
-"Calendar color" => "日历颜色",
-"Save" => "保存",
-"Submit" => "提交",
-"Cancel" => " 取消",
-"Edit an event" => "编辑一个事件",
-"Export" => "导出",
-"Title of the Event" => "事件的标题",
-"Category" => "分类",
-"All Day Event" => "每天的事件",
-"From" => "从",
-"To" => "到",
-"Advanced options" => "进阶选项",
-"Location" => "地点",
-"Location of the Event" => "事件的地点",
-"Description" => "解释",
-"Description of the Event" => "事件描述",
-"Repeat" => "重复",
-"Advanced" => "进阶",
-"Select weekdays" => "选择星期",
-"Select days" => "选择日",
-"and the events day of year." => "选择每年时间发生天数",
-"and the events day of month." => "选择每个月事件发生的天",
-"Select months" => "选择月份",
-"Select weeks" => "选择星期",
-"and the events week of year." => "每年时间发生的星期",
-"Interval" => "间隔",
-"End" => "结束",
-"occurrences" => "发生",
-"Import" => "导入",
-"Create a new event" => "新建一个时间",
-"Timezone" => "时区",
-"24h" => "24小时",
-"12h" => "12小时"
-);
diff --git a/apps/calendar/l10n/zh_CN.php b/apps/calendar/l10n/zh_CN.php
deleted file mode 100644
index add84588d3..0000000000
--- a/apps/calendar/l10n/zh_CN.php
+++ /dev/null
@@ -1,163 +0,0 @@
-<?php $TRANSLATIONS = array(
-"No calendars found." => "无法找到日历。",
-"No events found." => "无法找到事件。",
-"Wrong calendar" => "错误的日历",
-"New Timezone:" => "新时区：",
-"Timezone changed" => "时区已修改",
-"Invalid request" => "非法请求",
-"Calendar" => "日历",
-"ddd" => "ddd",
-"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
-"Birthday" => "生日",
-"Business" => "商务",
-"Call" => "呼叫",
-"Clients" => "客户",
-"Deliverer" => "派送",
-"Holidays" => "节日",
-"Ideas" => "想法",
-"Journey" => "旅行",
-"Jubilee" => "周年纪念",
-"Meeting" => "会议",
-"Other" => "其他",
-"Personal" => "个人",
-"Projects" => "项目",
-"Questions" => "问题",
-"Work" => "工作",
-"unnamed" => "未命名",
-"New Calendar" => "新日历",
-"Does not repeat" => "不重复",
-"Daily" => "每天",
-"Weekly" => "每周",
-"Every Weekday" => "每个工作日",
-"Bi-Weekly" => "每两周",
-"Monthly" => "每月",
-"Yearly" => "每年",
-"never" => "从不",
-"by occurrences" => "按发生次数",
-"by date" => "按日期",
-"by monthday" => "按月的某天",
-"by weekday" => "按星期的某天",
-"Monday" => "星期一",
-"Tuesday" => "星期二",
-"Wednesday" => "星期三",
-"Thursday" => "星期四",
-"Friday" => "星期五",
-"Saturday" => "星期六",
-"Sunday" => "星期日",
-"events week of month" => "事件在每月的第几个星期",
-"first" => "第一",
-"second" => "第二",
-"third" => "第三",
-"fourth" => "第四",
-"fifth" => "第五",
-"last" => "最后",
-"January" => "一月",
-"February" => "二月",
-"March" => "三月",
-"April" => "四月",
-"May" => "五月",
-"June" => "六月",
-"July" => "七月",
-"August" => "八月",
-"September" => "九月",
-"October" => "十月",
-"November" => "十一月",
-"December" => "十二月",
-"by events date" => "按事件日期",
-"by yearday(s)" => "按每年的某天",
-"by weeknumber(s)" => "按星期数",
-"by day and month" => "按天和月份",
-"Date" => "日期",
-"Cal." => "日历",
-"All day" => "全天",
-"Missing fields" => "缺少字段",
-"Title" => "标题",
-"From Date" => "从",
-"From Time" => "从",
-"To Date" => "至",
-"To Time" => "至",
-"The event ends before it starts" => "事件在开始前已结束",
-"There was a database fail" => "数据库访问失败",
-"Week" => "星期",
-"Month" => "月",
-"List" => "列表",
-"Today" => "今天",
-"Calendars" => "日历",
-"There was a fail, while parsing the file." => "解析文件失败",
-"Choose active calendars" => "选择活动日历",
-"Your calendars" => "您的日历",
-"CalDav Link" => "CalDav 链接",
-"Shared calendars" => "共享的日历",
-"No shared calendars" => "无共享的日历",
-"Share Calendar" => "共享日历",
-"Download" => "下载",
-"Edit" => "编辑",
-"Delete" => "删除",
-"shared with you by" => "                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               ",
-"New calendar" => "新日历",
-"Edit calendar" => "编辑日历",
-"Displayname" => "显示名称",
-"Active" => "激活",
-"Calendar color" => "日历颜色",
-"Save" => "保存",
-"Submit" => "提交",
-"Cancel" => "取消",
-"Edit an event" => "编辑事件",
-"Export" => "导出",
-"Eventinfo" => "事件信息",
-"Repeating" => "重复",
-"Alarm" => "提醒",
-"Attendees" => "参加者",
-"Share" => "共享",
-"Title of the Event" => "事件标题",
-"Category" => "分类",
-"Separate categories with commas" => "用逗号分隔分类",
-"Edit categories" => "编辑分类",
-"All Day Event" => "全天事件",
-"From" => "自",
-"To" => "至",
-"Advanced options" => "高级选项",
-"Location" => "地点",
-"Location of the Event" => "事件地点",
-"Description" => "描述",
-"Description of the Event" => "事件描述",
-"Repeat" => "重复",
-"Advanced" => "高级",
-"Select weekdays" => "选择星期中的某天",
-"Select days" => "选择某天",
-"and the events day of year." => "选择每年事件发生的日子",
-"and the events day of month." => "选择每月事件发生的日子",
-"Select months" => "选择月份",
-"Select weeks" => "选择星期",
-"and the events week of year." => "选择每年的事件发生的星期",
-"Interval" => "间隔",
-"End" => "结束",
-"occurrences" => "次",
-"create a new calendar" => "创建新日历",
-"Import a calendar file" => "导入日历文件",
-"Please choose the calendar" => "请选择日历",
-"create a new calendar" => "创建新日历",
-"Name of new calendar" => "新日历名称",
-"Import" => "导入",
-"Importing calendar" => "导入日历",
-"Calendar imported successfully" => "导入日历成功",
-"Close Dialog" => "关闭对话框",
-"Create a new event" => "创建新事件",
-"View an event" => "查看事件",
-"No categories selected" => "无选中分类",
-"of" => "在",
-"at" => "在",
-"Timezone" => "时区",
-"Check always for changes of the timezone" => "选中则总是按照时区变化",
-"Timeformat" => "时间格式",
-"24h" => "24小时",
-"12h" => "12小时",
-"First day of the week" => "每周的第一天",
-"Calendar CalDAV syncing address:" => "日历CalDAV 同步地址：",
-"Users" => "用户",
-"select users" => "选中用户",
-"Editable" => "可编辑",
-"Groups" => "分组",
-"select groups" => "选中分组",
-"make public" => "公开"
-);
diff --git a/apps/calendar/l10n/zh_TW.php b/apps/calendar/l10n/zh_TW.php
deleted file mode 100644
index 48897b8ca0..0000000000
--- a/apps/calendar/l10n/zh_TW.php
+++ /dev/null
@@ -1,158 +0,0 @@
-<?php $TRANSLATIONS = array(
-"No calendars found." => "沒有找到行事曆",
-"No events found." => "沒有找到活動",
-"Wrong calendar" => "錯誤日曆",
-"New Timezone:" => "新時區：",
-"Timezone changed" => "時區已變更",
-"Invalid request" => "無效請求",
-"Calendar" => "日曆",
-"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
-"Birthday" => "生日",
-"Business" => "商業",
-"Call" => "呼叫",
-"Clients" => "客戶",
-"Deliverer" => "遞送者",
-"Holidays" => "節日",
-"Ideas" => "主意",
-"Journey" => "旅行",
-"Jubilee" => "周年慶",
-"Meeting" => "會議",
-"Other" => "其他",
-"Personal" => "個人",
-"Projects" => "計畫",
-"Questions" => "問題",
-"Work" => "工作",
-"unnamed" => "無名稱的",
-"New Calendar" => "新日曆",
-"Does not repeat" => "不重覆",
-"Daily" => "每日",
-"Weekly" => "每週",
-"Every Weekday" => "每週末",
-"Bi-Weekly" => "每雙週",
-"Monthly" => "每月",
-"Yearly" => "每年",
-"never" => "絕不",
-"by occurrences" => "由事件",
-"by date" => "由日期",
-"by monthday" => "依月份日期",
-"by weekday" => "由平日",
-"Monday" => "週一",
-"Tuesday" => "週二",
-"Wednesday" => "週三",
-"Thursday" => "週四",
-"Friday" => "週五",
-"Saturday" => "週六",
-"Sunday" => "週日",
-"events week of month" => "月份中活動週",
-"first" => "第一",
-"second" => "第二",
-"third" => "第三",
-"fourth" => "第四",
-"fifth" => "第五",
-"last" => "最後",
-"January" => "一月",
-"February" => "二月",
-"March" => "三月",
-"April" => "四月",
-"May" => "五月",
-"June" => "六月",
-"July" => "七月",
-"August" => "八月",
-"September" => "九月",
-"October" => "十月",
-"November" => "十一月",
-"December" => "十二月",
-"by events date" => "由事件日期",
-"by yearday(s)" => "依年份日期",
-"by weeknumber(s)" => "由週數",
-"by day and month" => "由日與月",
-"Date" => "日期",
-"Cal." => "行事曆",
-"All day" => "整天",
-"Missing fields" => "遺失欄位",
-"Title" => "標題",
-"From Date" => "自日期",
-"From Time" => "至時間",
-"To Date" => "至日期",
-"To Time" => "至時間",
-"The event ends before it starts" => "事件的結束在開始之前",
-"There was a database fail" => "資料庫錯誤",
-"Week" => "週",
-"Month" => "月",
-"List" => "清單",
-"Today" => "今日",
-"Your calendars" => "你的行事曆",
-"CalDav Link" => "CalDav 聯結",
-"Shared calendars" => "分享的行事曆",
-"No shared calendars" => "不分享的行事曆",
-"Share Calendar" => "分享行事曆",
-"Download" => "下載",
-"Edit" => "編輯",
-"Delete" => "刪除",
-"shared with you by" => "分享給你由",
-"New calendar" => "新日曆",
-"Edit calendar" => "編輯日曆",
-"Displayname" => "顯示名稱",
-"Active" => "作用中",
-"Calendar color" => "日曆顏色",
-"Save" => "儲存",
-"Submit" => "提出",
-"Cancel" => "取消",
-"Edit an event" => "編輯事件",
-"Export" => "匯出",
-"Eventinfo" => "活動資訊",
-"Repeating" => "重覆中",
-"Alarm" => "鬧鐘",
-"Attendees" => "出席者",
-"Share" => "分享",
-"Title of the Event" => "事件標題",
-"Category" => "分類",
-"Separate categories with commas" => "用逗點分隔分類",
-"Edit categories" => "編輯分類",
-"All Day Event" => "全天事件",
-"From" => "自",
-"To" => "至",
-"Advanced options" => "進階選項",
-"Location" => "位置",
-"Location of the Event" => "事件位置",
-"Description" => "描述",
-"Description of the Event" => "事件描述",
-"Repeat" => "重覆",
-"Advanced" => "進階",
-"Select weekdays" => "選擇平日",
-"Select days" => "選擇日",
-"and the events day of year." => "以及年中的活動日",
-"and the events day of month." => "以及月中的活動日",
-"Select months" => "選擇月",
-"Select weeks" => "選擇週",
-"and the events week of year." => "以及年中的活動週",
-"Interval" => "間隔",
-"End" => "結束",
-"occurrences" => "事件",
-"create a new calendar" => "建立新日曆",
-"Import a calendar file" => "匯入日曆檔案",
-"Please choose the calendar" => "請選擇日曆",
-"create a new calendar" => "建立新日曆",
-"Name of new calendar" => "新日曆名稱",
-"Import" => "匯入",
-"Importing calendar" => "匯入日曆",
-"Calendar imported successfully" => "已成功匯入日曆",
-"Close Dialog" => "關閉對話",
-"Create a new event" => "建立一個新事件",
-"View an event" => "觀看一個活動",
-"No categories selected" => "沒有選擇分類",
-"of" => "於",
-"at" => "於",
-"Timezone" => "時區",
-"Check always for changes of the timezone" => "總是檢查是否變更了時區",
-"Timeformat" => "日期格式",
-"24h" => "24小時制",
-"12h" => "12小時制",
-"Calendar CalDAV syncing address:" => "CalDAV 的日曆同步地址：",
-"Users" => "使用者",
-"select users" => "選擇使用者",
-"Editable" => "可編輯",
-"Groups" => "群組",
-"select groups" => "選擇群組",
-"make public" => "公開"
-);
diff --git a/apps/calendar/lib/alarm.php b/apps/calendar/lib/alarm.php
deleted file mode 100644
index a71cc08682..0000000000
--- a/apps/calendar/lib/alarm.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Georg Ehrke <ownclouddev@georgswebsite.de>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-/*
- * This class manages reminders for calendars
- */
-class OC_Calendar_Alarm{
-	
-}
\ No newline at end of file
diff --git a/apps/calendar/lib/app.php b/apps/calendar/lib/app.php
deleted file mode 100644
index 8bdb54f486..0000000000
--- a/apps/calendar/lib/app.php
+++ /dev/null
@@ -1,436 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011 Bart Visscher <bartv@thisnet.nl>
- * Copyright (c) 2012 Georg Ehrke <georg@owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- * 
- * This class manages our app actions
- */
-OC_Calendar_App::$l10n = new OC_L10N('calendar');
-OC_Calendar_App::$tz = OC_Calendar_App::getTimezone();
-class OC_Calendar_App{
-	const CALENDAR = 'calendar';
-	const EVENT = 'event';
-	/**
-	 * @brief language object for calendar app
-	 */
-	public static $l10n;
-	
-	/**
-	 * @brief categories of the user
-	 */
-	protected static $categories = null;
-
-	/**
-	 * @brief timezone of the user
-	 */
-	public static $tz;
-	
-	/**
-	 * @brief returns informations about a calendar
-	 * @param int $id - id of the calendar
-	 * @param bool $security - check access rights or not
-	 * @param bool $shared - check if the user got access via sharing
-	 * @return mixed - bool / array
-	 */
-	public static function getCalendar($id, $security = true, $shared = false){
-		if(! is_numeric($id)){
-			return false;
-		}
-		$calendar = OC_Calendar_Calendar::find($id);
-		if($shared === true){
-			if(OC_Calendar_Share::check_access(OCP\USER::getUser(), $id, OC_Calendar_Share::CALENDAR)){
-				return $calendar;
-			}
-		}
-		if($security === true){
-			if($calendar['userid'] != OCP\USER::getUser()){
-				return false;
-			}
-		}
-		return $calendar;
-	}
-	
-	/**
-	 * @brief returns informations about an event
-	 * @param int $id - id of the event
-	 * @param bool $security - check access rights or not
-	 * @param bool $shared - check if the user got access via sharing
-	 * @return mixed - bool / array
-	 */
-	public static function getEventObject($id, $security = true, $shared = false){
-		$event = OC_Calendar_Object::find($id);
-		if($shared === true){
-			if(OC_Calendar_Share::check_access(OCP\USER::getUser(), $id, OC_Calendar_Share::EVENT)){
-				return $event;
-			}
-		}
-		if($security === true){
-			$calendar = self::getCalendar($event['calendarid'], false);
-			if($calendar['userid'] != OCP\USER::getUser()){
-				return false;
-			}
-		}
-		if($event === false){
-			return false;
-		}
-		return $event;
-	}
-	
-	/**
-	 * @brief returns the parsed calendar data
-	 * @param int $id - id of the event
-	 * @param bool $security - check access rights or not
-	 * @return mixed - bool / object
-	 */
-	public static function getVCalendar($id, $security = true, $shared = false){
-		$event_object = self::getEventObject($id, $security, $shared);
-		if($event_object === false){
-			return false;
-		}
-		$vobject = OC_VObject::parse($event_object['calendardata']);
-		if(is_null($vobject)){
-			return false;
-		}
-		return $vobject;
-	}
-	
-	/**
-	 * @brief checks if an event was edited and dies if it was
-	 * @param (object) $vevent - vevent object of the event
-	 * @param (int) $lastmodified - time of last modification as unix timestamp
-	 * @return (bool)
-	 */
-	public static function isNotModified($vevent, $lastmodified){
-		$last_modified = $vevent->__get('LAST-MODIFIED');
-		if($last_modified && $lastmodified != $last_modified->getDateTime()->format('U')){
-			OCP\JSON::error(array('modified'=>true));
-			exit;
-		}
-		return true;
-	}
-	
-	/**
-	 * @brief returns the default categories of ownCloud
-	 * @return (array) $categories
-	 */
-	protected static function getDefaultCategories(){
-		return array(
-			self::$l10n->t('Birthday'),
-			self::$l10n->t('Business'),
-			self::$l10n->t('Call'),
-			self::$l10n->t('Clients'),
-			self::$l10n->t('Deliverer'),
-			self::$l10n->t('Holidays'),
-			self::$l10n->t('Ideas'),
-			self::$l10n->t('Journey'),
-			self::$l10n->t('Jubilee'),
-			self::$l10n->t('Meeting'),
-			self::$l10n->t('Other'),
-			self::$l10n->t('Personal'),
-			self::$l10n->t('Projects'),
-			self::$l10n->t('Questions'),
-			self::$l10n->t('Work'),
-		);
-	}
-	
-	/**
-	 * @brief returns the vcategories object of the user
-	 * @return (object) $vcategories
-	 */
-	protected static function getVCategories() {
-		if (is_null(self::$categories)) {
-			self::$categories = new OC_VCategories('calendar', null, self::getDefaultCategories());
-		}
-		return self::$categories;
-	}
-	
-	/**
-	 * @brief returns the categories of the vcategories object
-	 * @return (array) $categories
-	 */
-	public static function getCategoryOptions(){
-		$categories = self::getVCategories()->categories();
-		return $categories;
-	}
-
-	/**
-	 * scan events for categories.
-	 * @param $events VEVENTs to scan. null to check all events for the current user.
-	 */
-	public static function scanCategories($events = null) {
-		if (is_null($events)) {
-			$calendars = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser());
-			if(count($calendars) > 0) {
-				$events = array();
-				foreach($calendars as $calendar) {
-					$calendar_events = OC_Calendar_Object::all($calendar['id']);
-					$events = $events + $calendar_events;
-				}
-			}
-		}
-		if(is_array($events) && count($events) > 0) {
-			$vcategories = self::getVCategories();
-			$vcategories->delete($vcategories->categories());
-			foreach($events as $event) {
-				$vobject = OC_VObject::parse($event['calendardata']);
-				if(!is_null($vobject)) {
-					self::loadCategoriesFromVCalendar($vobject);
-				}
-			}
-		}
-	}
-
-	/**
-	 * check VEvent for new categories.
-	 * @see OC_VCategories::loadFromVObject
-	 */
-	public static function loadCategoriesFromVCalendar(OC_VObject $calendar) {
-		$object = null;
-		if (isset($calendar->VEVENT)) {
-			$object = $calendar->VEVENT;
-		} else
-		if (isset($calendar->VTODO)) {
-			$object = $calendar->VTODO;
-		} else
-		if (isset($calendar->VJOURNAL)) {
-			$object = $calendar->VJOURNAL;
-		}
-		if ($object) {
-			self::getVCategories()->loadFromVObject($object, true);
-		}
-	}
-	
-	/**
-	 * @brief returns the options for the repeat rule of an repeating event
-	 * @return array - valid inputs for the repeat rule of an repeating event
-	 */
-	public static function getRepeatOptions(){
-		return OC_Calendar_Object::getRepeatOptions(self::$l10n);
-	}
-	
-	/**
-	 * @brief returns the options for the end of an repeating event
-	 * @return array - valid inputs for the end of an repeating events
-	 */
-	public static function getEndOptions(){
-		return OC_Calendar_Object::getEndOptions(self::$l10n);
-	}
-	
-	/**
-	 * @brief returns the options for an monthly repeating event
-	 * @return array - valid inputs for monthly repeating events
-	 */
-	public static function getMonthOptions(){
-		return OC_Calendar_Object::getMonthOptions(self::$l10n);
-	}
-	
-	/**
-	 * @brief returns the options for an weekly repeating event
-	 * @return array - valid inputs for weekly repeating events
-	 */
-	public static function getWeeklyOptions(){
-		return OC_Calendar_Object::getWeeklyOptions(self::$l10n);
-	}
-	
-	/**
-	 * @brief returns the options for an yearly repeating event
-	 * @return array - valid inputs for yearly repeating events
-	 */
-	public static function getYearOptions(){
-		return OC_Calendar_Object::getYearOptions(self::$l10n);
-	}
-	
-	/**
-	 * @brief returns the options for an yearly repeating event which occurs on specific days of the year
-	 * @return array - valid inputs for yearly repeating events
-	 */
-	public static function getByYearDayOptions(){
-		return OC_Calendar_Object::getByYearDayOptions();
-	}
-	
-	/**
-	 * @brief returns the options for an yearly repeating event which occurs on specific month of the year
-	 * @return array - valid inputs for yearly repeating events
-	 */
-	public static function getByMonthOptions(){
-		return OC_Calendar_Object::getByMonthOptions(self::$l10n);
-	}
-	
-	/**
-	 * @brief returns the options for an yearly repeating event which occurs on specific week numbers of the year
-	 * @return array - valid inputs for yearly repeating events
-	 */
-	public static function getByWeekNoOptions(){
-		return OC_Calendar_Object::getByWeekNoOptions();
-	}
-	
-	/**
-	 * @brief returns the options for an yearly or monthly repeating event which occurs on specific days of the month
-	 * @return array - valid inputs for yearly or monthly repeating events
-	 */
-	public static function getByMonthDayOptions(){
-		return OC_Calendar_Object::getByMonthDayOptions();
-	}
-	
-	/**
-	 * @brief returns the options for an monthly repeating event which occurs on specific weeks of the month
-	 * @return array - valid inputs for monthly repeating events
-	 */
-	public static function getWeekofMonth(){
-		return OC_Calendar_Object::getWeekofMonth(self::$l10n);
-	}
-
-	/**
-	 * @return (string) $timezone as set by user or the default timezone
-	 */
-	public static function getTimezone() {
-		return OCP\Config::getUserValue(OCP\User::getUser(),
-						'calendar',
-						'timezone',
-						date_default_timezone_get());
-	}
-
-	/**
-	 * @brief checks the access for a calendar / an event
-	 * @param (int) $id - id of the calendar / event
-	 * @param (string) $type - type of the id (calendar/event)
-	 * @return (string) $access - level of access
-	 */
-	public static function getaccess($id, $type){
-		if($type == self::CALENDAR){
-			$calendar = self::getCalendar($id, false, false);
-			if($calendar['userid'] == OCP\USER::getUser()){
-				return 'owner';
-			}
-			$isshared = OC_Calendar_Share::check_access(OCP\USER::getUser(), $id, OC_Calendar_Share::CALENDAR);
-			if($isshared){
-				$writeaccess = OC_Calendar_Share::is_editing_allowed(OCP\USER::getUser(), $id, OC_Calendar_Share::CALENDAR);
-				if($writeaccess){
-					return 'rw';
-				}else{
-					return 'r';
-				}
-			}else{
-				return false;
-			}
-		}elseif($type == self::EVENT){
-			if(OC_Calendar_Object::getowner($id) == OCP\USER::getUser()){
-				return 'owner';
-			}
-			$isshared = OC_Calendar_Share::check_access(OCP\USER::getUser(), $id, OC_Calendar_Share::EVENT);
-			if($isshared){
-				$writeaccess = OC_Calendar_Share::is_editing_allowed(OCP\USER::getUser(), $id, OC_Calendar_Share::EVENT);
-				if($writeaccess){
-					return 'rw';
-				}else{
-					return 'r';
-				}
-			}else{
-				return false;
-			}
-		}
-	}
-	
-	/**
-	 * @brief analyses the parameter for calendar parameter and returns the objects
-	 * @param (string) $calendarid - calendarid
-	 * @param (int) $start - unixtimestamp of start
-	 * @param (int) $end - unixtimestamp of end
-	 * @return (array) $events 
-	 */
-	public static function getrequestedEvents($calendarid, $start, $end){
-		$events = array();
-		if($calendarid == 'shared_rw' || $calendarid == 'shared_r'){
-			$calendars = OC_Calendar_Share::allSharedwithuser(OCP\USER::getUser(), OC_Calendar_Share::CALENDAR, 1, ($_GET['calendar_id'] == 'shared_rw')?'rw':'r');
-			foreach($calendars as $calendar){
-				$calendarevents = OC_Calendar_Object::allInPeriod($calendar['calendarid'], $start, $end);
-				foreach($calendarevents as $event){
-					$event['summary'] .= ' (' . self::$l10n->t('by') .  ' ' . OC_Calendar_Object::getowner($event['id']) . ')';
-				}
-				$events = array_merge($events, $calendarevents);
-			}
-			$singleevents = OC_Calendar_Share::allSharedwithuser(OCP\USER::getUser(), OC_Calendar_Share::EVENT, 1, ($_GET['calendar_id'] == 'shared_rw')?'rw':'r');
-			foreach($singleevents as $singleevent){
-				$event = OC_Calendar_Object::find($singleevent['eventid']);
-				if(!array_key_exists('summary', $event)){
-					$event['summary'] = self::$l10n->t('unnamed');
-				}
-				$event['summary'] .= ' (' . self::$l10n->t('by') .  ' ' . OC_Calendar_Object::getowner($event['id']) . ')';
-				$events[] =  $event;
-			}
-		}else{
-			if (is_numeric($calendarid)) {
-				$calendar = self::getCalendar($calendarid);
-				OCP\Response::enableCaching(0);
-				OCP\Response::setETagHeader($calendar['ctag']);
-				$events = OC_Calendar_Object::allInPeriod($calendarid, $start, $end);
-			} else {
-				OCP\Util::emitHook('OC_Calendar', 'getEvents', array('calendar_id' => $calendarid, 'events' => &$events));
-			}
-		}
-		return $events;
-	}
-	
-	/**
-	 * @brief generates the output for an event which will be readable for our js
-	 * @param (mixed) $event - event object / array
-	 * @param (int) $start - DateTime object of start
-	 * @param (int) $end - DateTime object of end
-	 * @return (array) $output - readable output
-	 */
-	public static function generateEventOutput($event, $start, $end){
-		if(!isset($event['calendardata']) && !isset($event['vevent'])){
-			return false;
-		}
-		if(!isset($event['calendardata']) && isset($event['vevent'])){
-			$event['calendardata'] = "BEGIN:VCALENDAR\nVERSION:2.0\nPRODID:ownCloud's Internal iCal System\n" . $event['vevent']->serialize() .  "END:VCALENDAR";
-		}
-		$object = OC_VObject::parse($event['calendardata']);
-		$vevent = $object->VEVENT;
-		$return = array();
-		$id = $event['id'];
-		$allday = ($vevent->DTSTART->getDateType() == Sabre_VObject_Element_DateTime::DATE)?true:false;
-		$last_modified = @$vevent->__get('LAST-MODIFIED');
-		$lastmodified = ($last_modified)?$last_modified->getDateTime()->format('U'):0;
-		$staticoutput = array('id'=>(int)$event['id'],
-						'title' => ($event['summary']!=NULL || $event['summary'] != '')?$event['summary']: self::$l10n->t('unnamed'),
-						'description' => isset($vevent->DESCRIPTION)?$vevent->DESCRIPTION->value:'',
-						'lastmodified'=>$lastmodified,
-						'allDay'=>$allday);
-		if(OC_Calendar_Object::isrepeating($id) && OC_Calendar_Repeat::is_cached_inperiod($event['id'], $start, $end)){
-			$cachedinperiod = OC_Calendar_Repeat::get_inperiod($id, $start, $end);
-			foreach($cachedinperiod as $cachedevent){
-				$dynamicoutput = array();
-				if($allday){
-					$start_dt = new DateTime($cachedevent['startdate'], new DateTimeZone('UTC'));
-					$end_dt = new DateTime($cachedevent['enddate'], new DateTimeZone('UTC'));
-					$dynamicoutput['start'] = $start_dt->format('Y-m-d');
-					$dynamicoutput['end'] = $end_dt->format('Y-m-d');
-				}else{
-					$start_dt = new DateTime($cachedevent['startdate'], new DateTimeZone('UTC'));
-					$end_dt = new DateTime($cachedevent['enddate'], new DateTimeZone('UTC'));
-					$start_dt->setTimezone(new DateTimeZone(self::$tz));
-					$end_dt->setTimezone(new DateTimeZone(self::$tz));
-					$dynamicoutput['start'] = $start_dt->format('Y-m-d H:i:s');
-					$dynamicoutput['end'] = $end_dt->format('Y-m-d H:i:s');
-				}
-				$return[] = array_merge($staticoutput, $dynamicoutput);
-			}
-		}else{
-			if(OC_Calendar_Object::isrepeating($id) || $event['repeating'] == 1){
-				$object->expand($start, $end);
-			}
-			foreach($object->getComponents() as $singleevent){
-				if(!($singleevent instanceof Sabre_VObject_Component_VEvent)){
-					continue;
-				}
-				$dynamicoutput = OC_Calendar_Object::generateStartEndDate($singleevent->DTSTART, OC_Calendar_Object::getDTEndFromVEvent($singleevent), $allday, self::$tz);
-				$return[] = array_merge($staticoutput, $dynamicoutput);			
-			}
-		}
-		return $return;
-	}
-}
diff --git a/apps/calendar/lib/attendees.php b/apps/calendar/lib/attendees.php
deleted file mode 100644
index ac30e11b3b..0000000000
--- a/apps/calendar/lib/attendees.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Georg Ehrke <ownclouddev@georgswebsite.de>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-/*
- * This class manages Attendees for calendars
- */
-class OC_Calendar_Attendees{
-	
-}
\ No newline at end of file
diff --git a/apps/calendar/lib/calendar.php b/apps/calendar/lib/calendar.php
deleted file mode 100644
index f8f5aab363..0000000000
--- a/apps/calendar/lib/calendar.php
+++ /dev/null
@@ -1,308 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011 Jakob Sack <mail@jakobsack.de>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-/**
- *
- * The following SQL statement is just a help for developers and will not be
- * executed!
- *
- * CREATE TABLE calendar_calendars (
- *     id INTEGER UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
- *     userid VARCHAR(255),
- *     displayname VARCHAR(100),
- *     uri VARCHAR(100),
- *     active INTEGER UNSIGNED NOT NULL DEFAULT '0',
- *     ctag INTEGER UNSIGNED NOT NULL DEFAULT '0',
- *     calendarorder INTEGER UNSIGNED NOT NULL DEFAULT '0',
- *     calendarcolor VARCHAR(10),
- *     timezone TEXT,
- *     components VARCHAR(20)
- * );
- *
- */
-
-/**
- * This class manages our calendars
- */
-class OC_Calendar_Calendar{
-	/**
-	 * @brief Returns the list of calendars for a specific user.
-	 * @param string $uid User ID
-	 * @param boolean $active Only return calendars with this $active state, default(=false) is don't care
-	 * @return array
-	 */
-	public static function allCalendars($uid, $active=false){
-		$values = array($uid);
-		$active_where = '';
-		if (!is_null($active) && $active){
-			$active_where = ' AND `active` = ?';
-			$values[] = $active;
-		}
-		$stmt = OCP\DB::prepare( 'SELECT * FROM `*PREFIX*calendar_calendars` WHERE `userid` = ?' . $active_where );
-		$result = $stmt->execute($values);
-
-		$calendars = array();
-		while( $row = $result->fetchRow()){
-			$calendars[] = $row;
-		}
-
-		return $calendars;
-	}
-
-	/**
-	 * @brief Returns the list of calendars for a principal (DAV term of user)
-	 * @param string $principaluri
-	 * @return array
-	 */
-	public static function allCalendarsWherePrincipalURIIs($principaluri){
-		$uid = self::extractUserID($principaluri);
-		return self::allCalendars($uid);
-	}
-
-	/**
-	 * @brief Gets the data of one calendar
-	 * @param integer $id
-	 * @return associative array
-	 */
-	public static function find($id){
-		$stmt = OCP\DB::prepare( 'SELECT * FROM `*PREFIX*calendar_calendars` WHERE `id` = ?' );
-		$result = $stmt->execute(array($id));
-
-		return $result->fetchRow();
-	}
-
-	/**
-	 * @brief Creates a new calendar
-	 * @param string $userid
-	 * @param string $name
-	 * @param string $components Default: "VEVENT,VTODO,VJOURNAL"
-	 * @param string $timezone Default: null
-	 * @param integer $order Default: 1
-	 * @param string $color Default: null, format: '#RRGGBB(AA)'
-	 * @return insertid
-	 */
-	public static function addCalendar($userid,$name,$components='VEVENT,VTODO,VJOURNAL',$timezone=null,$order=0,$color=null){
-		$all = self::allCalendars($userid);
-		$uris = array();
-		foreach($all as $i){
-			$uris[] = $i['uri'];
-		}
-
-		$uri = self::createURI($name, $uris );
-
-		$stmt = OCP\DB::prepare( 'INSERT INTO `*PREFIX*calendar_calendars` (`userid`,`displayname`,`uri`,`ctag`,`calendarorder`,`calendarcolor`,`timezone`,`components`) VALUES(?,?,?,?,?,?,?,?)' );
-		$result = $stmt->execute(array($userid,$name,$uri,1,$order,$color,$timezone,$components));
-
-		$insertid = OCP\DB::insertid('*PREFIX*calendar_calendars');
-		OCP\Util::emitHook('OC_Calendar', 'addCalendar', $insertid);
-
-		return $insertid;
-	}
-
-	/**
-	 * @brief Creates a new calendar from the data sabredav provides
-	 * @param string $principaluri
-	 * @param string $uri
-	 * @param string $name
-	 * @param string $components
-	 * @param string $timezone
-	 * @param integer $order
-	 * @param string $color format: '#RRGGBB(AA)'
-	 * @return insertid
-	 */
-	public static function addCalendarFromDAVData($principaluri,$uri,$name,$components,$timezone,$order,$color){
-		$userid = self::extractUserID($principaluri);
-
-		$stmt = OCP\DB::prepare( 'INSERT INTO `*PREFIX*calendar_calendars` (`userid`,`displayname`,`uri`,`ctag`,`calendarorder`,`calendarcolor`,`timezone`,`components`) VALUES(?,?,?,?,?,?,?,?)' );
-		$result = $stmt->execute(array($userid,$name,$uri,1,$order,$color,$timezone,$components));
-
-		$insertid = OCP\DB::insertid('*PREFIX*calendar_calendars');
-		OCP\Util::emitHook('OC_Calendar', 'addCalendar', $insertid);
-
-		return $insertid;
-	}
-
-	/**
-	 * @brief Edits a calendar
-	 * @param integer $id
-	 * @param string $name Default: null
-	 * @param string $components Default: null
-	 * @param string $timezone Default: null
-	 * @param integer $order Default: null
-	 * @param string $color Default: null, format: '#RRGGBB(AA)'
-	 * @return boolean
-	 *
-	 * Values not null will be set
-	 */
-	public static function editCalendar($id,$name=null,$components=null,$timezone=null,$order=null,$color=null){
-		// Need these ones for checking uri
-		$calendar = self::find($id);
-
-		// Keep old stuff
-		if(is_null($name)) $name = $calendar['displayname'];
-		if(is_null($components)) $components = $calendar['components'];
-		if(is_null($timezone)) $timezone = $calendar['timezone'];
-		if(is_null($order)) $order = $calendar['calendarorder'];
-		if(is_null($color)) $color = $calendar['calendarcolor'];
-
-		$stmt = OCP\DB::prepare( 'UPDATE `*PREFIX*calendar_calendars` SET `displayname`=?,`calendarorder`=?,`calendarcolor`=?,`timezone`=?,`components`=?,`ctag`=`ctag`+1 WHERE `id`=?' );
-		$result = $stmt->execute(array($name,$order,$color,$timezone,$components,$id));
-
-		OCP\Util::emitHook('OC_Calendar', 'editCalendar', $id);
-		return true;
-	}
-
-	/**
-	 * @brief Sets a calendar (in)active
-	 * @param integer $id
-	 * @param boolean $active
-	 * @return boolean
-	 */
-	public static function setCalendarActive($id,$active){
-		$stmt = OCP\DB::prepare( 'UPDATE `*PREFIX*calendar_calendars` SET `active` = ? WHERE `id` = ?' );
-		$stmt->execute(array($active, $id));
-
-		return true;
-	}
-
-	/**
-	 * @brief Updates ctag for calendar
-	 * @param integer $id
-	 * @return boolean
-	 */
-	public static function touchCalendar($id){
-		$stmt = OCP\DB::prepare( 'UPDATE `*PREFIX*calendar_calendars` SET `ctag` = `ctag` + 1 WHERE `id` = ?' );
-		$stmt->execute(array($id));
-
-		return true;
-	}
-
-	/**
-	 * @brief removes a calendar
-	 * @param integer $id
-	 * @return boolean
-	 */
-	public static function deleteCalendar($id){
-		$stmt = OCP\DB::prepare( 'DELETE FROM `*PREFIX*calendar_calendars` WHERE `id` = ?' );
-		$stmt->execute(array($id));
-
-		$stmt = OCP\DB::prepare( 'DELETE FROM `*PREFIX*calendar_objects` WHERE `calendarid` = ?' );
-		$stmt->execute(array($id));
-
-		OCP\Util::emitHook('OC_Calendar', 'deleteCalendar', $id);
-		if(count(self::allCalendars(OCP\USER::getUser())) == 0) {
-			self::addCalendar(OCP\USER::getUser(),'Default calendar');
-		}
-
-		return true;
-	}
-	
-	/**
-	 * @brief merges two calendars
-	 * @param integer $id1
-	 * @param integer $id2
-	 * @return boolean
-	 */
-	public static function mergeCalendar($id1, $id2){
-		$stmt = OCP\DB::prepare('UPDATE `*PREFIX*calendar_objects` SET `calendarid` = ? WHERE `calendarid` = ?');
-		$stmt->execute(array($id1, $id2));
-		self::touchCalendar($id1);
-		self::deleteCalendar($id2);
-	}
-	
-	/**
-	 * @brief Creates a URI for Calendar
-	 * @param string $name name of the calendar
-	 * @param array  $existing existing calendar URIs
-	 * @return string uri
-	 */
-	public static function createURI($name,$existing){
-		$name = strtolower($name);
-		$newname = $name;
-		$i = 1;
-		while(in_array($newname,$existing)){
-			$newname = $name.$i;
-			$i = $i + 1;
-		}
-		return $newname;
-	}
-
-	/**
-	 * @brief gets the userid from a principal path
-	 * @return string
-	 */
-	public static function extractUserID($principaluri){
-		list($prefix,$userid) = Sabre_DAV_URLUtil::splitPath($principaluri);
-		return $userid;
-	}
-	
-	/**
-	 * @brief returns the possible color for calendars
-	 * @return array
-	 */
-	public static function getCalendarColorOptions(){
-		return array(
-			'#ff0000', // "Red"
-			'#b3dc6c', // "Green"
-			'#ffff00', // "Yellow"
-			'#808000', // "Olive"
-			'#ffa500', // "Orange"
-			'#ff7f50', // "Coral"
-			'#ee82ee', // "Violet"
-			'#9fc6e7', // "light blue"
-		);
-	}
-
-	/**
-	 * @brief generates the Event Source Info for our JS
-	 * @param array $calendar calendar data
-	 * @return array
-	 */
-	public static function getEventSourceInfo($calendar){
-		return array(
-			'url' => OCP\Util::linkTo('calendar', 'ajax/events.php').'?calendar_id='.$calendar['id'],
-			'backgroundColor' => $calendar['calendarcolor'],
-			'borderColor' => '#888',
-			'textColor' => self::generateTextColor($calendar['calendarcolor']),
-			'cache' => true,
-		);
-	}
-	
-	/*
-	 * @brief checks if a calendar name is available for a user
-	 * @param string $calendarname 
-	 * @param string $userid
-	 * @return boolean
-	 */
-	public static function isCalendarNameavailable($calendarname, $userid){
-		$calendars = self::allCalendars($userid);
-		foreach($calendars as $calendar){
-			if($calendar['displayname'] == $calendarname){
-				return false;
-			}
-		}
-		return true;
-	}
-	
-	/*
-	 * @brief generates the text color for the calendar
-	 * @param string $calendarcolor rgb calendar color code in hex format (with or without the leading #)
-	 * (this function doesn't pay attention on the alpha value of rgba color codes)
-	 * @return boolean
-	 */
-	public static function generateTextColor($calendarcolor){
-		if(substr_count($calendarcolor, '#') == 1){
-			$calendarcolor = substr($calendarcolor,1);
-		}
-		$red = hexdec(substr($calendarcolor,0,2));
-		$green = hexdec(substr($calendarcolor,2,2));
-		$blue = hexdec(substr($calendarcolor,2,2));
-		//recommendation by W3C
-		$computation = ((($red * 299) + ($green * 587) + ($blue * 114)) / 1000);
-		return ($computation > 130)?'#000000':'#FAFAFA';
-	}
-}
diff --git a/apps/calendar/lib/export.php b/apps/calendar/lib/export.php
deleted file mode 100644
index 8f26891f36..0000000000
--- a/apps/calendar/lib/export.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Georg Ehrke <ownclouddev@georgswebsite.de>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-/**
- * This class does export and converts all times to UTC
- */
-class OC_Calendar_Export{
-	/**
-	 * @brief Use one of these constants as second parameter if you call OC_Calendar_Export::export()
-	 */
-	const CALENDAR = 'calendar';
-	const EVENT = 'event';
-
-	/**
-	 * @brief export a calendar or an event
-	 * @param integer $id id of calendar / event
-	 * @param string $type use OC_Calendar_Export constants
-	 * @return string
-	 */
-	public static function export($id, $type){
-		if($type == self::EVENT){
-			$return = self::event($id);
-		}else{
-			$return = self::calendar($id);
-		}
-		return self::fixLineBreaks($return);
-	}
-
-	/**
-	 * @brief exports a calendar and convert all times to UTC
-	 * @param integer $id id of the calendar
-	 * @return string
-	 */
-	private static function calendar($id){
-		$events = OC_Calendar_Object::all($id);
-		$calendar = OC_Calendar_Calendar::find($id);
-		$return = "BEGIN:VCALENDAR\nVERSION:2.0\nPRODID:ownCloud Calendar " . OCP\App::getAppVersion('calendar') . "\nX-WR-CALNAME:" . $calendar['displayname'] . "\n";
-		foreach($events as $event){
-			$return .= self::generateEvent($event);
-		}
-		$return .= "END:VCALENDAR";
-		return $return;
-	}
-	
-	/**
-	 * @brief exports an event and convert all times to UTC
-	 * @param integer $id id of the event
-	 * @return string
-	 */
-	private static function event($id){
-		$event = OC_Calendar_Object::find($id);
-		$return = "BEGIN:VCALENDAR\nVERSION:2.0\nPRODID:ownCloud Calendar " . OCP\App::getAppVersion('calendar') . "\nX-WR-CALNAME:" . $event['summary'] . "\n";
-		$return .= self::generateEvent($event);
-		$return .= "END:VCALENDAR";
-		return $return;
-	 }
-	 
-	 /**
-	  * @brief generates the VEVENT with UTC dates
-	  * @param array $event
-	  * @return string
-	  */
-	 private static function generateEvent($event){
-		$object = OC_VObject::parse($event['calendardata']);
-		$dtstart = $object->VEVENT->DTSTART;
-		$start_dt = $dtstart->getDateTime();
-		$dtend = OC_Calendar_Object::getDTEndFromVEvent($object->VEVENT);
-		$end_dt = $dtend->getDateTime();
-		if($dtstart->getDateType() !== Sabre_VObject_Element_DateTime::DATE){
-			$start_dt->setTimezone(new DateTimeZone('UTC'));
-			$end_dt->setTimezone(new DateTimeZone('UTC'));
-			$object->VEVENT->setDateTime('DTSTART', $start_dt, Sabre_VObject_Property_DateTime::UTC);
-			$object->VEVENT->setDateTime('DTEND', $end_dt, Sabre_VObject_Property_DateTime::UTC);
-		}
-		return $object->VEVENT->serialize();
-	}
-	
-	/**
-	 * @brief fixes new line breaks
-	 * (fixes problems with Apple iCal)
-	 * @param string $string to fix
-	 * @return string 
-	 */
-	private static function fixLineBreaks($string){
-		$string = str_replace("\r\n", "\n", $string);
-		$string = str_replace("\r", "\n", $string);
-		$string = str_replace("\n", "\r\n", $string);
-		return $string;
-	}
-}
diff --git a/apps/calendar/lib/hooks.php b/apps/calendar/lib/hooks.php
deleted file mode 100644
index bc0b02c62b..0000000000
--- a/apps/calendar/lib/hooks.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011 Jakob Sack <mail@jakobsack.de>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-/**
- * This class contains all hooks.
- */
-class OC_Calendar_Hooks{
-	/**
-	 * @brief Creates default calendar for a user
-	 * @param paramters parameters from postCreateUser-Hook
-	 * @return array
-	 */
-	public static function createUser($parameters) {
-		OC_Calendar_Calendar::addCalendar($parameters['uid'],'Default calendar');
-
-		return true;
-	}
-
-	/**
-	 * @brief Deletes all calendars of a certain user
-	 * @param paramters parameters from postDeleteUser-Hook
-	 * @return array
-	 */
-	public static function deleteUser($parameters) {
-		$calendars = OC_Calendar_Calendar::allCalendars($parameters['uid']);
-
-		foreach($calendars as $calendar) {
-			OC_Calendar_Calendar::deleteCalendar($calendar['id']);
-		}
-
-		OC_Calendar_Share::post_userdelete($parameters['uid']);
-
-		return true;
-	}
-}
diff --git a/apps/calendar/lib/import.php b/apps/calendar/lib/import.php
deleted file mode 100644
index 2e3a729e0c..0000000000
--- a/apps/calendar/lib/import.php
+++ /dev/null
@@ -1,336 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Georg Ehrke <ownclouddev@georgswebsite.de>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-/*
- * This class does import and converts all times to the users current timezone
- */
-class OC_Calendar_Import{
-	/*
-	 * @brief counts the absolute number of parsed elements
-	 */
-	private $abscount;
-	
-	/*
-	 * @brief var saves if the percentage should be saved with OC_Cache
-	 */
-	private $cacheprogress;
-	
-	/*
-	 * @brief Sabre_VObject_Component_VCalendar object - for documentation see http://code.google.com/p/sabredav/wiki/Sabre_VObject_Component_VCalendar
-	 */
-	private $calobject;
-	
-	/*
-	 * @brief var counts the number of imported elements
-	 */
-	private $count;
-	
-	/*
-	 * @brief var to check if errors happend while initialization
-	 */
-	private $error;
-	
-	/*
-	 * @brief var saves the ical string that was submitted with the __construct function
-	 */
-	private $ical;
-	
-	/*
-	 * @brief calendar id for import
-	 */
-	private $id;
-	
-	/*
-	 * @brief var saves the percentage of the import's progress
-	 */
-	private $progress;
-	
-	/*
-	 * @brief var saves the key for the percentage of the import's progress
-	 */
-	private $progresskey;
-	
-	/*
-	 * @brief var saves the timezone the events shell converted to
-	 */
-	private $tz;
-	
-	/*
-	 * @brief var saves the userid
-	 */
-	private $userid;
-
-	/*
-	 * public methods 
-	 */
-	
-	/*
-	 * @brief does general initialization for import object
-	 * @param string $calendar content of ical file
-	 * @param string $tz timezone of the user
-	 * @return boolean
-	 */
-	public function __construct($ical){
-		$this->error = null;
-		$this->ical = $ical;
-		$this->abscount = 0;
-		$this->count = 0;
-		try{
-			$this->calobject = OC_VObject::parse($this->ical);
-		}catch(Exception $e){
-			//MISSING: write some log
-			$this->error = true;
-			return false;
-		}
-		return true;
-	}
-	
-	/*
-	 * @brief imports a calendar
-	 * @return boolean
-	 */
-	public function import(){
-		if(!$this->isValid()){
-			return false;
-		}
-		$numofcomponents = count($this->calobject->getComponents());
-		foreach($this->calobject->getComponents() as $object){
-			if(!($object instanceof Sabre_VObject_Component_VEvent) && !($object instanceof Sabre_VObject_Component_VJournal) && !($object instanceof Sabre_VObject_Component_VTodo)){
-				continue;
-			}
-			$dtend = OC_Calendar_Object::getDTEndFromVEvent($object);
-			$object->DTSTART->getDateTime()->setTimezone(new DateTimeZone($this->tz));
-			$object->DTEND->setDateTime($dtend->getDateTime(), $object->DTSTART->getDateType());
-			$object->DTEND->getDateTime()->setTimezone(new DateTimeZone($this->tz));
-			$vcalendar = $this->createVCalendar($object->serialize());
-			$insertid = OC_Calendar_Object::add($this->id, $vcalendar);
-			$this->abscount++;
-			if($this->isDuplicate($insertid)){
-				OC_Calendar_Object::delete($insertid);
-			}else{
-				$this->count++;
-			}
-			$this->updateProgress(intval(($this->abscount / $numofcomponents)*100));
-		}
-		OC_Cache::remove($this->progresskey);
-		return true;
-	}
-	
-	/*
-	 * @brief sets the timezone
-	 * @return boolean
-	 */
-	public function setTimeZone($tz){
-		$this->tz = $tz;
-		return true;
-	}
-	
-	/*
-	 * @brief sets the progresskey
-	 * @return boolean
-	 */
-	public function setProgresskey($progresskey){
-		$this->progresskey = $progresskey;
-		return true;
-	}
-	
-	/*
-	 * @brief checks if something went wrong while initialization
-	 * @return boolean
-	 */
-	public function isValid(){
-		if(is_null($this->error)){
-			return true;
-		}
-		return false;
-	}
-	
-	/*
-	 * @brief returns the percentage of progress
-	 * @return integer
-	 */
-	public function getProgress(){
-		return $this->progress;
-	}
-	
-	/*
-	 * @brief enables the cache for the percentage of progress
-	 * @return boolean
-	 */
-	public function enableProgressCache(){
-		$this->cacheprogress = true;
-		return true;
-	}
-	
-	/*
-	 * @brief disables the cache for the percentage of progress
-	 * @return boolean
-	 */
-	public function disableProgressCache(){
-		$this->cacheprogress = false;
-		return false;
-	}
-	
-	/*
-	 * @brief generates a new calendar name
-	 * @return string
-	 */
-	public function createCalendarName(){	
-		$calendars = OC_Calendar_Calendar::allCalendars($this->userid);
-		$calendarname = $guessedcalendarname = !is_null($this->guessCalendarName())?($this->guessCalendarName()):(OC_Calendar_App::$l10n->t('New Calendar'));
-		$i = 1;
-		while(!OC_Calendar_Calendar::isCalendarNameavailable($calendarname, $this->userid)){
-			$calendarname = $guessedcalendarname . ' (' . $i . ')';
-			$i++;
-		}
-		return $calendarname;
-	}
-	
-	/*
-	 * @brief generates a new calendar color
-	 * @return string
-	 */
-	public function createCalendarColor(){
-		if(is_null($this->guessCalendarColor())){
-			return '#9fc6e7';
-		}
-		return $this->guessCalendarColor();
-	}
-	
-	/*
-	 * @brief sets the id for the calendar
-	 * @param integer $id of the calendar
-	 * @return boolean
-	 */
-	public function setCalendarID($id){
-		$this->id = $id;
-		return true;
-	}
-	
-	/*
-	 * @brief sets the userid to import the calendar
-	 * @param string $id of the user
-	 * @return boolean
-	 */
-	public function setUserID($userid){
-		$this->userid = $userid;
-		return true;
-	}
-	
-	/*
-	 * @brief returns the private 
-	 * @param string $id of the user
-	 * @return boolean
-	 */
-	public function getCount(){
-		return $this->count;
-	}
-
-	/*
-	 * private methods 
-	 */
-	
-	/*
-	 * @brief generates an unique ID 
-	 * @return string 
-	 */
-	//private function createUID(){
-	//	return substr(md5(rand().time()),0,10);
-	//}
-	
-	/*
-	 * @brief checks is the UID is already in use for another event
-	 * @param string $uid uid to check
-	 * @return boolean
-	 */
-	//private function isUIDAvailable($uid){
-	//	
-	//}
-	
-	/*
-	 * @brief generates a proper VCalendar string
-	 * @param string $vobject
-	 * @return string 
-	 */
-	private function createVCalendar($vobject){
-		if(is_object($vobject)){
-			$vobject = @$vobject->serialize();
-		}
-		$vcalendar = "BEGIN:VCALENDAR\nVERSION:2.0\nPRODID:ownCloud Calendar " . OCP\App::getAppVersion('calendar') . "\n";
-		$vcalendar .= $vobject;
-		$vcalendar .= "END:VCALENDAR";
-		return $vcalendar;
-	}
-	
-	/*
-	 * @brief checks if an event already exists in the user's calendars
-	 * @param integer $insertid id of the new object
-	 * @return boolean
-	 */
-	private function isDuplicate($insertid){
-		$newobject = OC_Calendar_Object::find($insertid);
-		$stmt = OCP\DB::prepare('SELECT COUNT(*) AS `count` FROM `*PREFIX*calendar_objects`
-								 INNER JOIN `*PREFIX*calendar_calendars` ON `calendarid`=`*PREFIX*calendar_calendars`.`id`
-								 WHERE `objecttype`=? AND `startdate`=? AND `enddate`=? AND `repeating`=? AND `summary`=? AND `calendardata`=? AND `userid` = ?');
-		$result = $stmt->execute(array($newobject['objecttype'],$newobject['startdate'],$newobject['enddate'],$newobject['repeating'],$newobject['summary'],$newobject['calendardata'], $this->userid));
-		$result = $result->fetchRow();
-		if($result['count'] >= 2){
-			return true;
-		}
-		return false;
-	}
-	
-	/*
-	 * @brief updates the progress var
-	 * @param integer $percentage
-	 * @return boolean
-	 */
-	private function updateProgress($percentage){
-		$this->progress = $percentage;
-		if($this->cacheprogress){
-			OC_Cache::set($this->progresskey, $this->progress, 300);
-		}
-		return true;
-	}
-
-	/*
-	 * public methods for (pre)rendering of X-... Attributes
-	 */
-	
-	/*
-	 * @brief guesses the calendar color
-	 * @return mixed - string or boolean
-	 */
-	public function guessCalendarColor(){
-		if(!is_null($this->calobject->__get('X-APPLE-CALENDAR-COLOR'))){
-			return $this->calobject->__get('X-APPLE-CALENDAR-COLOR');
-		}
-		return null;
-	}
-	
-	/*
-	 * @brief guesses the calendar description
-	 * @return mixed - string or boolean
-	 */
-	public function guessCalendarDescription(){
-		if(!is_null($this->calobject->__get('X-WR-CALDESC'))){
-			return $this->calobject->__get('X-WR-CALDESC');
-		}
-		return null;
-	}
-	
-	/*
-	 * @brief guesses the calendar name
-	 * @return mixed - string or boolean
-	 */
-	public function guessCalendarName(){
-		if(!is_null($this->calobject->__get('X-WR-CALNAME'))){
-			return $this->calobject->__get('X-WR-CALNAME');
-		}
-		return null;
-	}
-}
diff --git a/apps/calendar/lib/object.php b/apps/calendar/lib/object.php
deleted file mode 100644
index 8020d7c2e5..0000000000
--- a/apps/calendar/lib/object.php
+++ /dev/null
@@ -1,937 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011 Jakob Sack <mail@jakobsack.de>
- * Copyright (c) 2012 Bart Visscher <bartv@thisnet.nl>
- * Copyright (c) 2012 Georg Ehrke <ownclouddev at georgswebsite dot de>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
- /**
- *
- * The following SQL statement is just a help for developers and will not be
- * executed!
- *
- * CREATE TABLE calendar_objects (
- *     id INTEGER UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
- *     calendarid INTEGER UNSIGNED NOT NULL,
- *     objecttype VARCHAR(40) NOT NULL,
- *     startdate DATETIME,
- *     enddate DATETIME,
- *     repeating INT(1),
- *     summary VARCHAR(255),
- *     calendardata TEXT,
- *     uri VARCHAR(100),
- *     lastmodified INT(11)
- * );
- *
- */
-
-/**
- * This class manages our calendar objects
- */
-class OC_Calendar_Object{
-	/**
-	 * @brief Returns all objects of a calendar
-	 * @param integer $id
-	 * @return array
-	 *
-	 * The objects are associative arrays. You'll find the original vObject in
-	 * ['calendardata']
-	 */
-	public static function all($id){
-		$stmt = OCP\DB::prepare( 'SELECT * FROM `*PREFIX*calendar_objects` WHERE `calendarid` = ?' );
-		$result = $stmt->execute(array($id));
-
-		$calendarobjects = array();
-		while( $row = $result->fetchRow()){
-			$calendarobjects[] = $row;
-		}
-
-		return $calendarobjects;
-	}
-
-	/**
-	 * @brief Returns all objects of a calendar between $start and $end
-	 * @param integer $id
-	 * @param DateTime $start
-	 * @param DateTime $end
-	 * @return array
-	 *
-	 * The objects are associative arrays. You'll find the original vObject
-	 * in ['calendardata']
-	 */
-	public static function allInPeriod($id, $start, $end){
-		$stmt = OCP\DB::prepare( 'SELECT * FROM `*PREFIX*calendar_objects` WHERE `calendarid` = ?'
-		.' AND ((`startdate` >= ? AND `startdate` <= ? AND `repeating` = 0)'
-		.' OR (`enddate` >= ? AND `enddate` <= ? AND `repeating` = 0)'
-		.' OR (`startdate` <= ? AND `repeating` = 1))' );
-		$start = self::getUTCforMDB($start);
-		$end = self::getUTCforMDB($end);
-		$result = $stmt->execute(array($id,
-					$start, $end,
-					$start, $end,
-					$end));
-
-		$calendarobjects = array();
-		while( $row = $result->fetchRow()){
-			$calendarobjects[] = $row;
-		}
-
-		return $calendarobjects;
-	}
-
-	/**
-	 * @brief Returns an object
-	 * @param integer $id
-	 * @return associative array
-	 */
-	public static function find($id){
-		$stmt = OCP\DB::prepare( 'SELECT * FROM `*PREFIX*calendar_objects` WHERE `id` = ?' );
-		$result = $stmt->execute(array($id));
-
-		return $result->fetchRow();
-	}
-
-	/**
-	 * @brief finds an object by its DAV Data
-	 * @param integer $cid Calendar id
-	 * @param string $uri the uri ('filename')
-	 * @return associative array
-	 */
-	public static function findWhereDAVDataIs($cid,$uri){
-		$stmt = OCP\DB::prepare( 'SELECT * FROM `*PREFIX*calendar_objects` WHERE `calendarid` = ? AND `uri` = ?' );
-		$result = $stmt->execute(array($cid,$uri));
-
-		return $result->fetchRow();
-	}
-
-	/**
-	 * @brief Adds an object
-	 * @param integer $id Calendar id
-	 * @param string $data  object
-	 * @return insertid
-	 */
-	public static function add($id,$data){
-		$object = OC_VObject::parse($data);
-		OC_Calendar_App::loadCategoriesFromVCalendar($object);
-		list($type,$startdate,$enddate,$summary,$repeating,$uid) = self::extractData($object);
-
-		if(is_null($uid)){
-			$object->setUID();
-			$data = $object->serialize();
-		}
-
-		$uri = 'owncloud-'.md5($data.rand().time()).'.ics';
-
-		$stmt = OCP\DB::prepare( 'INSERT INTO `*PREFIX*calendar_objects` (`calendarid`,`objecttype`,`startdate`,`enddate`,`repeating`,`summary`,`calendardata`,`uri`,`lastmodified`) VALUES(?,?,?,?,?,?,?,?,?)' );
-		$stmt->execute(array($id,$type,$startdate,$enddate,$repeating,$summary,$data,$uri,time()));
-		$object_id = OCP\DB::insertid('*PREFIX*calendar_objects');
-
-		OC_Calendar_Calendar::touchCalendar($id);
-		OCP\Util::emitHook('OC_Calendar', 'addEvent', $object_id);
-		return $object_id;
-	}
-
-	/**
-	 * @brief Adds an object with the data provided by sabredav
-	 * @param integer $id Calendar id
-	 * @param string $uri   the uri the card will have
-	 * @param string $data  object
-	 * @return insertid
-	 */
-	public static function addFromDAVData($id,$uri,$data){
-		$object = OC_VObject::parse($data);
-		list($type,$startdate,$enddate,$summary,$repeating,$uid) = self::extractData($object);
-
-		$stmt = OCP\DB::prepare( 'INSERT INTO `*PREFIX*calendar_objects` (`calendarid`,`objecttype`,`startdate`,`enddate`,`repeating`,`summary`,`calendardata`,`uri`,`lastmodified`) VALUES(?,?,?,?,?,?,?,?,?)' );
-		$stmt->execute(array($id,$type,$startdate,$enddate,$repeating,$summary,$data,$uri,time()));
-		$object_id = OCP\DB::insertid('*PREFIX*calendar_objects');
-
-		OC_Calendar_Calendar::touchCalendar($id);
-		OCP\Util::emitHook('OC_Calendar', 'addEvent', $object_id);
-		return $object_id;
-	}
-
-	/**
-	 * @brief edits an object
-	 * @param integer $id id of object
-	 * @param string $data  object
-	 * @return boolean
-	 */
-	public static function edit($id, $data){
-		$oldobject = self::find($id);
-
-		$object = OC_VObject::parse($data);
-		OC_Calendar_App::loadCategoriesFromVCalendar($object);
-		list($type,$startdate,$enddate,$summary,$repeating,$uid) = self::extractData($object);
-
-		$stmt = OCP\DB::prepare( 'UPDATE `*PREFIX*calendar_objects` SET `objecttype`=?,`startdate`=?,`enddate`=?,`repeating`=?,`summary`=?,`calendardata`=?,`lastmodified`= ? WHERE `id` = ?' );
-		$stmt->execute(array($type,$startdate,$enddate,$repeating,$summary,$data,time(),$id));
-
-		OC_Calendar_Calendar::touchCalendar($oldobject['calendarid']);
-		OCP\Util::emitHook('OC_Calendar', 'editEvent', $id);
-
-		return true;
-	}
-
-	/**
-	 * @brief edits an object with the data provided by sabredav
-	 * @param integer $id calendar id
-	 * @param string $uri   the uri of the object
-	 * @param string $data  object
-	 * @return boolean
-	 */
-	public static function editFromDAVData($cid,$uri,$data){
-		$oldobject = self::findWhereDAVDataIs($cid,$uri);
-
-		$object = OC_VObject::parse($data);
-		list($type,$startdate,$enddate,$summary,$repeating,$uid) = self::extractData($object);
-
-		$stmt = OCP\DB::prepare( 'UPDATE `*PREFIX*calendar_objects` SET `objecttype`=?,`startdate`=?,`enddate`=?,`repeating`=?,`summary`=?,`calendardata`=?,`lastmodified`= ? WHERE `id` = ?' );
-		$stmt->execute(array($type,$startdate,$enddate,$repeating,$summary,$data,time(),$oldobject['id']));
-
-		OC_Calendar_Calendar::touchCalendar($oldobject['calendarid']);
-		OCP\Util::emitHook('OC_Calendar', 'editEvent', $oldobject['id']);
-
-		return true;
-	}
-
-	/**
-	 * @brief deletes an object
-	 * @param integer $id id of object
-	 * @return boolean
-	 */
-	public static function delete($id){
-		$oldobject = self::find($id);
-		$stmt = OCP\DB::prepare( 'DELETE FROM `*PREFIX*calendar_objects` WHERE `id` = ?' );
-		$stmt->execute(array($id));
-		OC_Calendar_Calendar::touchCalendar($oldobject['calendarid']);
-		OCP\Util::emitHook('OC_Calendar', 'deleteEvent', $id);
-
-		return true;
-	}
-
-	/**
-	 * @brief deletes an  object with the data provided by sabredav
-	 * @param integer $cid calendar id
-	 * @param string $uri the uri of the object
-	 * @return boolean
-	 */
-	public static function deleteFromDAVData($cid,$uri){
-		$oldobject = self::findWhereDAVDataIs($cid, $uri);
-		$stmt = OCP\DB::prepare( 'DELETE FROM `*PREFIX*calendar_objects` WHERE `calendarid`= ? AND `uri`=?' );
-		$stmt->execute(array($cid,$uri));
-		OC_Calendar_Calendar::touchCalendar($cid);
-		OCP\Util::emitHook('OC_Calendar', 'deleteEvent', $oldobject['id']);
-
-		return true;
-	}
-
-	public static function moveToCalendar($id, $calendarid){
-		$stmt = OCP\DB::prepare( 'UPDATE `*PREFIX*calendar_objects` SET `calendarid`=? WHERE `id`=?' );
-		$stmt->execute(array($calendarid,$id));
-
-		OC_Calendar_Calendar::touchCalendar($id);
-		OCP\Util::emitHook('OC_Calendar', 'moveEvent', $id);
-
-		return true;
-	}
-	
-	/**
-     * @brief Creates a UID
-     * @return string
-     */
-    protected static function createUID(){
-        return substr(md5(rand().time()),0,10);
-    }
-
-	/**
-	 * @brief Extracts data from a vObject-Object
-	 * @param Sabre_VObject $object
-	 * @return array
-	 *
-	 * [type, start, end, summary, repeating, uid]
-	 */
-	protected static function extractData($object){
-		$return = array('',null,null,'',0,null);
-
-		// Child to use
-		$children = 0;
-		$use = null;
-		foreach($object->children as $property){
-			if($property->name == 'VEVENT'){
-				$children++;
-				$thisone = true;
-
-				foreach($property->children as &$element){
-					if($element->name == 'RECURRENCE-ID'){
-						$thisone = false;
-					}
-				} unset($element);
-
-				if($thisone){
-					$use = $property;
-				}
-			}
-			elseif($property->name == 'VTODO' || $property->name == 'VJOURNAL'){
-				$return[0] = $property->name;
-				foreach($property->children as &$element){
-					if($element->name == 'SUMMARY'){
-						$return[3] = $element->value;
-					}
-					elseif($element->name == 'UID'){
-						$return[5] = $element->value;
-					}
-				};
-
-				// Only one VTODO or VJOURNAL per object
-				// (only one UID per object but a UID is required by a VTODO =>
-				//    one VTODO per object)
-				break;
-			}
-		}
-
-		// find the data
-		if(!is_null($use)){
-			$return[0] = $use->name;
-			foreach($use->children as $property){
-				if($property->name == 'DTSTART'){
-					$return[1] = self::getUTCforMDB($property->getDateTime());
-				}
-				elseif($property->name == 'DTEND'){
-					$return[2] = self::getUTCforMDB($property->getDateTime());
-				}
-				elseif($property->name == 'SUMMARY'){
-					$return[3] = $property->value;
-				}
-				elseif($property->name == 'RRULE'){
-					$return[4] = 1;
-				}
-				elseif($property->name == 'UID'){
-					$return[5] = $property->value;
-				}
-			}
-		}
-
-		// More than one child means reoccuring!
-		if($children > 1){
-			$return[4] = 1;
-		}
-		return $return;
-	}
-
-	/**
-	 * @brief DateTime to UTC string
-	 * @param DateTime $datetime The date to convert
-	 * @returns date as YYYY-MM-DD hh:mm
-	 *
-	 * This function creates a date string that can be used by MDB2.
-	 * Furthermore it converts the time to UTC.
-	 */
-	public static function getUTCforMDB($datetime){
-		return date('Y-m-d H:i', $datetime->format('U') - $datetime->getOffset());
-	}
-	
-	/**
-	 * @brief returns the DTEND of an $vevent object
-	 * @param object $vevent vevent object
-	 * @return object
-	 */
-	public static function getDTEndFromVEvent($vevent){
-		if ($vevent->DTEND) {
-			$dtend = $vevent->DTEND;
-		}else{
-			$dtend = clone $vevent->DTSTART;
-			// clone creates a shallow copy, also clone DateTime
-			$dtend->setDateTime(clone $dtend->getDateTime(), $dtend->getDateType());
-			if ($vevent->DURATION){
-				$duration = strval($vevent->DURATION);
-				$invert = 0;
-				if ($duration[0] == '-'){
-					$duration = substr($duration, 1);
-					$invert = 1;
-				}
-				if ($duration[0] == '+'){
-					$duration = substr($duration, 1);
-				}
-				$interval = new DateInterval($duration);
-				$interval->invert = $invert;
-				$dtend->getDateTime()->add($interval);
-			}
-		}
-		return $dtend;
-	}
-	
-	/**
-	 * @brief returns the options for the repeat rule of an repeating event
-	 * @return array - valid inputs for the repeat rule of an repeating event
-	 */
-	public static function getRepeatOptions($l10n){
-		return array(
-			'doesnotrepeat' => $l10n->t('Does not repeat'),
-			'daily'         => $l10n->t('Daily'),
-			'weekly'        => $l10n->t('Weekly'),
-			'weekday'       => $l10n->t('Every Weekday'),
-			'biweekly'      => $l10n->t('Bi-Weekly'),
-			'monthly'       => $l10n->t('Monthly'),
-			'yearly'        => $l10n->t('Yearly')
-		);
-	}
-	
-	/**
-	 * @brief returns the options for the end of an repeating event
-	 * @return array - valid inputs for the end of an repeating events
-	 */
-	public static function getEndOptions($l10n){
-		return array(
-			'never' => $l10n->t('never'),
-			'count' => $l10n->t('by occurrences'),
-			'date'  => $l10n->t('by date')
-		);
-	}
-	
-	/**
-	 * @brief returns the options for an monthly repeating event
-	 * @return array - valid inputs for monthly repeating events
-	 */
-	public static function getMonthOptions($l10n){
-		return array(
-			'monthday' => $l10n->t('by monthday'),
-			'weekday'  => $l10n->t('by weekday')
-		);
-	}
-	
-	/**
-	 * @brief returns the options for an weekly repeating event
-	 * @return array - valid inputs for weekly repeating events
-	 */
-	public static function getWeeklyOptions($l10n){
-		return array(
-			'MO' => $l10n->t('Monday'),
-			'TU' => $l10n->t('Tuesday'),
-			'WE' => $l10n->t('Wednesday'),
-			'TH' => $l10n->t('Thursday'),
-			'FR' => $l10n->t('Friday'),
-			'SA' => $l10n->t('Saturday'),
-			'SU' => $l10n->t('Sunday')
-		);
-	}
-	
-	/**
-	 * @brief returns the options for an monthly repeating event which occurs on specific weeks of the month
-	 * @return array - valid inputs for monthly repeating events
-	 */
-	public static function getWeekofMonth($l10n){
-		return array(
-			'auto' => $l10n->t('events week of month'),
-			'1' => $l10n->t('first'),
-			'2' => $l10n->t('second'),
-			'3' => $l10n->t('third'),
-			'4' => $l10n->t('fourth'),
-			'5' => $l10n->t('fifth'),
-			'-1' => $l10n->t('last')
-		);
-	}
-	
-	/**
-	 * @brief returns the options for an yearly repeating event which occurs on specific days of the year
-	 * @return array - valid inputs for yearly repeating events
-	 */
-	public static function getByYearDayOptions(){
-		$return = array();
-		foreach(range(1,366) as $num){
-			$return[(string) $num] = (string) $num;
-		}
-		return $return;
-	}
-	
-	/**
-	 * @brief returns the options for an yearly or monthly repeating event which occurs on specific days of the month
-	 * @return array - valid inputs for yearly or monthly repeating events
-	 */
-	public static function getByMonthDayOptions(){
-		$return = array();
-		foreach(range(1,31) as $num){
-			$return[(string) $num] = (string) $num;
-		}
-		return $return;
-	}
-	
-	/**
-	 * @brief returns the options for an yearly repeating event which occurs on specific month of the year
-	 * @return array - valid inputs for yearly repeating events
-	 */
-	public static function getByMonthOptions($l10n){
-		return array(
-			'1'  => $l10n->t('January'),
-			'2'  => $l10n->t('February'),
-			'3'  => $l10n->t('March'),
-			'4'  => $l10n->t('April'),
-			'5'  => $l10n->t('May'),
-			'6'  => $l10n->t('June'),
-			'7'  => $l10n->t('July'),
-			'8'  => $l10n->t('August'),
-			'9'  => $l10n->t('September'),
-			'10' => $l10n->t('October'),
-			'11' => $l10n->t('November'),
-			'12' => $l10n->t('December')
-		);
-	}
-	
-	/**
-	 * @brief returns the options for an yearly repeating event
-	 * @return array - valid inputs for yearly repeating events
-	 */
-	public static function getYearOptions($l10n){
-		return array(
-			'bydate' => $l10n->t('by events date'),
-			'byyearday' => $l10n->t('by yearday(s)'),
-			'byweekno'  => $l10n->t('by weeknumber(s)'),
-			'bydaymonth'  => $l10n->t('by day and month')
-		);
-	}
-	
-	/**
-	 * @brief returns the options for an yearly repeating event which occurs on specific week numbers of the year
-	 * @return array - valid inputs for yearly repeating events
-	 */
-	public static function getByWeekNoOptions(){
-		return range(1, 52);
-	}
-	
-	/**
-	 * @brief validates a request
-	 * @param array $request
-	 * @return mixed (array / boolean)
-	 */
-	public static function validateRequest($request){
-		$errnum = 0;
-		$errarr = array('title'=>'false', 'cal'=>'false', 'from'=>'false', 'fromtime'=>'false', 'to'=>'false', 'totime'=>'false', 'endbeforestart'=>'false');
-		if($request['title'] == ''){
-			$errarr['title'] = 'true';
-			$errnum++;
-		}
-
-		$fromday = substr($request['from'], 0, 2);
-		$frommonth = substr($request['from'], 3, 2);
-		$fromyear = substr($request['from'], 6, 4);
-		if(!checkdate($frommonth, $fromday, $fromyear)){
-			$errarr['from'] = 'true';
-			$errnum++;
-		}
-		$allday = isset($request['allday']);
-		if(!$allday && self::checkTime(urldecode($request['fromtime']))) {
-			$errarr['fromtime'] = 'true';
-			$errnum++;
-		}
-
-		$today = substr($request['to'], 0, 2);
-		$tomonth = substr($request['to'], 3, 2);
-		$toyear = substr($request['to'], 6, 4);
-		if(!checkdate($tomonth, $today, $toyear)){
-			$errarr['to'] = 'true';
-			$errnum++;
-		}
-		if($request['repeat'] != 'doesnotrepeat'){
-			if(is_nan($request['interval']) && $request['interval'] != ''){
-				$errarr['interval'] = 'true';
-				$errnum++;
-			}
-			if(array_key_exists('repeat', $request) && !array_key_exists($request['repeat'], self::getRepeatOptions(OC_Calendar_App::$l10n))){
-				$errarr['repeat'] = 'true';
-				$errnum++;
-			}
-			if(array_key_exists('advanced_month_select', $request) && !array_key_exists($request['advanced_month_select'], self::getMonthOptions(OC_Calendar_App::$l10n))){
-				$errarr['advanced_month_select'] = 'true';
-				$errnum++;
-			}
-			if(array_key_exists('advanced_year_select', $request) && !array_key_exists($request['advanced_year_select'], self::getYearOptions(OC_Calendar_App::$l10n))){
-				$errarr['advanced_year_select'] = 'true';
-				$errnum++;
-			}
-			if(array_key_exists('weekofmonthoptions', $request) && !array_key_exists($request['weekofmonthoptions'], self::getWeekofMonth(OC_Calendar_App::$l10n))){
-				$errarr['weekofmonthoptions'] = 'true';
-				$errnum++;
-			}
-			if($request['end'] != 'never'){
-				if(!array_key_exists($request['end'], self::getEndOptions(OC_Calendar_App::$l10n))){
-					$errarr['end'] = 'true';
-					$errnum++;
-				}
-				if($request['end'] == 'count' && is_nan($request['byoccurrences'])){
-					$errarr['byoccurrences'] = 'true';
-					$errnum++;
-				}
-				if($request['end'] == 'date'){
-					list($bydate_day, $bydate_month, $bydate_year) = explode('-', $request['bydate']);
-					if(!checkdate($bydate_month, $bydate_day, $bydate_year)){
-						$errarr['bydate'] = 'true';
-						$errnum++;
-					}
-				}
-			}
-			if(array_key_exists('weeklyoptions', $request)){
-				foreach($request['weeklyoptions'] as $option){
-					if(!in_array($option, self::getWeeklyOptions(OC_Calendar_App::$l10n))){
-						$errarr['weeklyoptions'] = 'true';
-						$errnum++;
-					}
-				}
-			}
-			if(array_key_exists('byyearday', $request)){
-				foreach($request['byyearday'] as $option){
-					if(!array_key_exists($option, self::getByYearDayOptions())){
-						$errarr['byyearday'] = 'true';
-						$errnum++;
-					}
-				}
-			}
-			if(array_key_exists('weekofmonthoptions', $request)){
-				if(is_nan((double)$request['weekofmonthoptions'])){
-					$errarr['weekofmonthoptions'] = 'true';
-					$errnum++;
-				}
-			}
-			if(array_key_exists('bymonth', $request)){
-				foreach($request['bymonth'] as $option){
-					if(!in_array($option, self::getByMonthOptions(OC_Calendar_App::$l10n))){
-						$errarr['bymonth'] = 'true';
-						$errnum++;
-					}
-				}
-			}
-			if(array_key_exists('byweekno', $request)){
-				foreach($request['byweekno'] as $option){
-					if(!array_key_exists($option, self::getByWeekNoOptions())){
-						$errarr['byweekno'] = 'true';
-						$errnum++;
-					}
-				}
-			}
-			if(array_key_exists('bymonthday', $request)){
-				foreach($request['bymonthday'] as $option){
-					if(!array_key_exists($option, self::getByMonthDayOptions())){
-						$errarr['bymonthday'] = 'true';
-						$errnum++;
-					}
-				}
-			}
-		}
-		if(!$allday && self::checkTime(urldecode($request['totime']))) {
-			$errarr['totime'] = 'true';
-			$errnum++;
-		}
-		if($today < $fromday && $frommonth == $tomonth && $fromyear == $toyear){
-			$errarr['endbeforestart'] = 'true';
-			$errnum++;
-		}
-		if($today == $fromday && $frommonth > $tomonth && $fromyear == $toyear){
-			$errarr['endbeforestart'] = 'true';
-			$errnum++;
-		}
-		if($today == $fromday && $frommonth == $tomonth && $fromyear > $toyear){
-			$errarr['endbeforestart'] = 'true';
-			$errnum++;
-		}
-		if(!$allday && $fromday == $today && $frommonth == $tomonth && $fromyear == $toyear){
-			list($tohours, $tominutes) = explode(':', $request['totime']);
-			list($fromhours, $fromminutes) = explode(':', $request['fromtime']);
-			if($tohours < $fromhours){
-				$errarr['endbeforestart'] = 'true';
-				$errnum++;
-			}
-			if($tohours == $fromhours && $tominutes < $fromminutes){
-				$errarr['endbeforestart'] = 'true';
-				$errnum++;
-			}
-		}
-		if ($errnum)
-		{
-			return $errarr;
-		}
-		return false;
-	}
-	
-	/**
-	 * @brief validates time
-	 * @param string $time
-	 * @return boolean
-	 */	
-	protected static function checkTime($time){
-		list($hours, $minutes) = explode(':', $time);
-		return empty($time)
-			|| $hours < 0 || $hours > 24
-			|| $minutes < 0 || $minutes > 60;
-	}
-	
-	/**
-	 * @brief creates an VCalendar Object from the request data
-	 * @param array $request
-	 * @return object created $vcalendar
-	 */	public static function createVCalendarFromRequest($request){
-		$vcalendar = new OC_VObject('VCALENDAR');
-		$vcalendar->add('PRODID', 'ownCloud Calendar');
-		$vcalendar->add('VERSION', '2.0');
-
-		$vevent = new OC_VObject('VEVENT');
-		$vcalendar->add($vevent);
-
-		$vevent->setDateTime('CREATED', 'now', Sabre_VObject_Property_DateTime::UTC);
-
-		$vevent->setUID();
-		return self::updateVCalendarFromRequest($request, $vcalendar);
-	}
-	
-	/**
-	 * @brief updates an VCalendar Object from the request data
-	 * @param array $request
-	 * @param object $vcalendar
-	 * @return object updated $vcalendar
-	 */
-	public static function updateVCalendarFromRequest($request, $vcalendar){
-		$title = $request["title"];
-		$location = $request["location"];
-		$categories = $request["categories"];
-		$allday = isset($request["allday"]);
-		$from = $request["from"];
-		$to  = $request["to"];
-		if (!$allday){
-			$fromtime = $request['fromtime'];
-			$totime = $request['totime'];
-		}
-		$vevent = $vcalendar->VEVENT;
-		$description = $request["description"];
-		$repeat = $request["repeat"];
-		if($repeat != 'doesnotrepeat'){
-			$rrule = '';
-			$interval = $request['interval'];
-			$end = $request['end'];
-			$byoccurrences = $request['byoccurrences'];
-			switch($repeat){
-				case 'daily':
-					$rrule .= 'FREQ=DAILY';
-					break;
-				case 'weekly':
-					$rrule .= 'FREQ=WEEKLY';
-					if(array_key_exists('weeklyoptions', $request)){
-						$byday = '';
-						$daystrings = array_flip(self::getWeeklyOptions(OC_Calendar_App::$l10n));
-						foreach($request['weeklyoptions'] as $days){
-							if($byday == ''){
-								$byday .= $daystrings[$days];
-							}else{
-								$byday .= ',' .$daystrings[$days];
-							}
-						}
-						$rrule .= ';BYDAY=' . $byday;
-					}
-					break;
-				case 'weekday':
-					$rrule .= 'FREQ=WEEKLY';
-					$rrule .= ';BYDAY=MO,TU,WE,TH,FR';
-					break;
-				case 'biweekly':
-					$rrule .= 'FREQ=WEEKLY';
-					$interval = $interval * 2;
-					break;
-				case 'monthly':
-					$rrule .= 'FREQ=MONTHLY';
-					if($request['advanced_month_select'] == 'monthday'){
-						break;
-					}elseif($request['advanced_month_select'] == 'weekday'){
-						if($request['weekofmonthoptions'] == 'auto'){
-							list($_day, $_month, $_year) = explode('-', $from);
-							$weekofmonth = floor($_day/7);
-						}else{
-							$weekofmonth = $request['weekofmonthoptions'];
-						}
-						$days = array_flip(self::getWeeklyOptions(OC_Calendar_App::$l10n));
-						$byday = '';
-						foreach($request['weeklyoptions'] as $day){
-							if($byday == ''){
-								$byday .= $weekofmonth . $days[$day];
-							}else{
-								$byday .= ',' . $weekofmonth . $days[$day];
-							}
-						}
-						if($byday == ''){
-							$byday = 'MO,TU,WE,TH,FR,SA,SU';
-						}
-						$rrule .= ';BYDAY=' . $byday;
-					}
-					break;
-				case 'yearly':
-					$rrule .= 'FREQ=YEARLY';
-					if($request['advanced_year_select'] == 'bydate'){
-						
-					}elseif($request['advanced_year_select'] == 'byyearday'){
-						list($_day, $_month, $_year) = explode('-', $from);
-						$byyearday = date('z', mktime(0,0,0, $_month, $_day, $_year)) + 1;
-						if(array_key_exists('byyearday', $request)){
-							foreach($request['byyearday'] as $yearday){
-								$byyearday .= ',' . $yearday;
-							}
-						}
-						$rrule .= ';BYYEARDAY=' . $byyearday;
-					}elseif($request['advanced_year_select'] == 'byweekno'){
-						list($_day, $_month, $_year) = explode('-', $from);
-						$rrule .= ';BYDAY=' . strtoupper(substr(date('l', mktime(0,0,0, $_month, $_day, $_year)), 0, 2));
-						$byweekno = '';
-						foreach($request['byweekno'] as $weekno){
-							if($byweekno == ''){
-								$byweekno = $weekno;
-							}else{
-								$byweekno .= ',' . $weekno;
-							}
-						}
-						$rrule .= ';BYWEEKNO=' . $byweekno;
-					}elseif($request['advanced_year_select'] == 'bydaymonth'){
-						if(array_key_exists('weeklyoptions', $request)){
-							$days = array_flip(self::getWeeklyOptions(OC_Calendar_App::$l10n));
-							$byday = '';
-							foreach($request['weeklyoptions'] as $day){
-								if($byday == ''){
-								      $byday .= $days[$day];
-								}else{
-								      $byday .= ',' . $days[$day];
-								}
-							}
-							$rrule .= ';BYDAY=' . $byday;
-						}
-						if(array_key_exists('bymonth', $request)){
-							$monthes = array_flip(self::getByMonthOptions(OC_Calendar_App::$l10n));
-							$bymonth = '';
-							foreach($request['bymonth'] as $month){
-								if($bymonth == ''){
-								      $bymonth .= $monthes[$month];
-								}else{
-								      $bymonth .= ',' . $monthes[$month];
-								}
-							}
-							$rrule .= ';BYMONTH=' . $bymonth;
-							
-						}
-						if(array_key_exists('bymonthday', $request)){
-							$bymonthday = '';
-							foreach($request['bymonthday'] as $monthday){
-								if($bymonthday == ''){
-								      $bymonthday .= $monthday;
-								}else{
-								      $bymonthday .= ',' . $monthday;
-								}
-							}
-							$rrule .= ';BYMONTHDAY=' . $bymonthday;
-							
-						}
-					}
-					break;
-				default:
-					break;
-			}
-			if($interval != ''){
-				$rrule .= ';INTERVAL=' . $interval;
-			}
-			if($end == 'count'){
-				$rrule .= ';COUNT=' . $byoccurrences;
-			}
-			if($end == 'date'){
-				list($bydate_day, $bydate_month, $bydate_year) = explode('-', $request['bydate']);
-				$rrule .= ';UNTIL=' . $bydate_year . $bydate_month . $bydate_day;
-			}
-			$vevent->setString('RRULE', $rrule);
-			$repeat = "true";
-		}else{
-			$repeat = "false";
-		}
-
-
-		$vevent->setDateTime('LAST-MODIFIED', 'now', Sabre_VObject_Property_DateTime::UTC);
-		$vevent->setDateTime('DTSTAMP', 'now', Sabre_VObject_Property_DateTime::UTC);
-		$vevent->setString('SUMMARY', $title);
-
-		if($allday){
-			$start = new DateTime($from);
-			$end = new DateTime($to.' +1 day');
-			$vevent->setDateTime('DTSTART', $start, Sabre_VObject_Property_DateTime::DATE);
-			$vevent->setDateTime('DTEND', $end, Sabre_VObject_Property_DateTime::DATE);
-		}else{
-			$timezone = OC_Calendar_App::getTimezone();
-			$timezone = new DateTimeZone($timezone);
-			$start = new DateTime($from.' '.$fromtime, $timezone);
-			$end = new DateTime($to.' '.$totime, $timezone);
-			$vevent->setDateTime('DTSTART', $start, Sabre_VObject_Property_DateTime::LOCALTZ);
-			$vevent->setDateTime('DTEND', $end, Sabre_VObject_Property_DateTime::LOCALTZ);
-		}
-		unset($vevent->DURATION);
-
-		$vevent->setString('LOCATION', $location);
-		$vevent->setString('DESCRIPTION', $description);
-		$vevent->setString('CATEGORIES', $categories);
-
-		/*if($repeat == "true"){
-			$vevent->RRULE = $repeat;
-		}*/
-
-		return $vcalendar;
-	}
-	
-	/**
-	 * @brief returns the owner of an object
-	 * @param integer $id
-	 * @return string
-	 */
-	public static function getowner($id){
-		$event = self::find($id);
-		$cal = OC_Calendar_Calendar::find($event['calendarid']);
-		return $cal['userid'];
-	}
-	
-	/**
-	 * @brief returns the calendarid of an object
-	 * @param integer $id
-	 * @return integer
-	 */
-	public static function getCalendarid($id){
-		$event = self::find($id);
-		return $event['calendarid'];
-	}
-	
-	/**
-	 * @brief checks if an object is repeating
-	 * @param integer $id
-	 * @return boolean
-	 */
-	public static function isrepeating($id){
-		$event = self::find($id);
-		return ($event['repeating'] == 1)?true:false;
-	}
-	
-	/**
-	 * @brief converts the start_dt and end_dt to a new timezone 
-	 * @param object $dtstart
-	 * @param object $dtend
-	 * @param boolean $allday
-	 * @param string $tz
-	 * @return array
-	 */
-	public static function generateStartEndDate($dtstart, $dtend, $allday, $tz){
-		$start_dt = $dtstart->getDateTime();
-		$end_dt = $dtend->getDateTime();
-		$return = array();
-		if($allday){
-			$return['start'] = $start_dt->format('Y-m-d');
-			$end_dt->modify('-1 minute');
-			while($start_dt >= $end_dt){
-				$end_dt->modify('+1 day');
-			}
-			$return['end'] = $end_dt->format('Y-m-d');
-		}else{
-			$start_dt->setTimezone(new DateTimeZone($tz));
-			$end_dt->setTimezone(new DateTimeZone($tz));
-			$return['start'] = $start_dt->format('Y-m-d H:i:s');
-			$return['end'] = $end_dt->format('Y-m-d H:i:s');
-		}
-		return $return;
-	}
-}
diff --git a/apps/calendar/lib/repeat.php b/apps/calendar/lib/repeat.php
deleted file mode 100644
index 27f1e0481a..0000000000
--- a/apps/calendar/lib/repeat.php
+++ /dev/null
@@ -1,204 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Georg Ehrke <ownclouddev@georgswebsite.de>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-/**
- * This class manages the caching of repeating events
- * Events will be cached for the current year ± 5 years
- */
-class OC_Calendar_Repeat{
-	/**
-	 * @brief returns the cache of an event
-	 * @param (int) $id - id of the event
-	 * @return (array) 
-	 */
-	public static function get($id){
-		$stmt = OCP\DB::prepare('SELECT * FROM `*PREFIX*calendar_repeat` WHERE `eventid` = ?');
-		$result = $stmt->execute(array($id));
-		$return = array();
-		while($row = $result->fetchRow()){
-			$return[] = $row;
-		}
-		return $return;
-	}
-	/**
-	 * @brief returns the cache of an event in a specific peroid
-	 * @param (int) $id - id of the event
-	 * @param (DateTime) $from - start for period in UTC
-	 * @param (DateTime) $until - end for period in UTC
-	 * @return (array)
-	 */
-	public static function get_inperiod($id, $from, $until){
-		$stmt = OCP\DB::prepare( 'SELECT * FROM `*PREFIX*calendar_repeat` WHERE `eventid` = ?'
-		.' AND ((`startdate` >= ? AND `startdate` <= ?)'
-		.' OR (`enddate` >= ? AND `enddate` <= ?))');
-		$result = $stmt->execute(array($id,
-					OC_Calendar_Object::getUTCforMDB($from), OC_Calendar_Object::getUTCforMDB($until),
-					OC_Calendar_Object::getUTCforMDB($from), OC_Calendar_Object::getUTCforMDB($until)));
-		$return = array();
-		while($row = $result->fetchRow()){
-			$return[] = $row;
-		}
-		return $return;
-	}
-	/**
-	 * @brief returns the cache of all repeating events of a calendar
-	 * @param (int) $id - id of the calendar
-	 * @return (array) 
-	 */
-	public static function getCalendar($id){
-		$stmt = OCP\DB::prepare('SELECT * FROM `*PREFIX*calendar_repeat` WHERE `calid` = ?');
-		$result = $stmt->execute(array($id));
-		$return = array();
-		while($row = $result->fetchRow()){
-			$return[] = $row;
-		}
-		return $return;
-	}
-	/**
-	 * @brief returns the cache of all repeating events of a calendar in a specific period
-	 * @param (int) $id - id of the event
-	 * @param (string) $from - start for period in UTC
-	 * @param (string) $until - end for period in UTC
-	 * @return (array)
-	 */
-	public static function getCalendar_inperiod($id, $from, $until){
-		$stmt = OCP\DB::prepare( 'SELECT * FROM `*PREFIX*calendar_repeat` WHERE `calid` = ?'
-		.' AND ((`startdate` >= ? AND `startdate` <= ?)'
-		.' OR (`enddate` >= ? AND `enddate` <= ?))');
-		$result = $stmt->execute(array($id,
-					$from, $until,
-					$from, $until));
-		$return = array();
-		while($row = $result->fetchRow()){
-			$return[] = $row;
-		}
-		return $return;
-	}
-	/**
-	 * @brief generates the cache the first time
-	 * @param (int) id - id of the event
-	 * @return (bool)
-	 */
-	public static function generate($id){
-		$event = OC_Calendar_Object::find($id);
-		if($event['repeating'] == 0){
-			return false;
-		}
-		$object = OC_VObject::parse($event['calendardata']);
-		$start = new DateTime('01-01-' . date('Y') . ' 00:00:00', new DateTimeZone('UTC'));
-		$start->modify('-5 years');
-		$end = new DateTime('31-12-' . date('Y') . ' 23:59:59', new DateTimeZone('UTC'));
-		$end->modify('+5 years');
-		$object->expand($start, $end);
-		foreach($object->getComponents() as $vevent){
-			if(!($vevent instanceof Sabre_VObject_Component_VEvent)){
-				continue;
-			}
-			$startenddate = OC_Calendar_Object::generateStartEndDate($vevent->DTSTART, OC_Calendar_Object::getDTEndFromVEvent($vevent), ($vevent->DTSTART->getDateType() == Sabre_VObject_Element_DateTime::DATE)?true:false, 'UTC');
-			$stmt = OCP\DB::prepare('INSERT INTO `*PREFIX*calendar_repeat` (`eventid`,`calid`,`startdate`,`enddate`) VALUES(?,?,?,?)');
-			$stmt->execute(array($id,OC_Calendar_Object::getCalendarid($id),$startenddate['start'],$startenddate['end']));
-		}
-		return true;
-	}
-	/**
-	 * @brief generates the cache the first time for all repeating event of an calendar
-	 * @param (int) id - id of the calendar
-	 * @return (bool)
-	 */
-	public static function generateCalendar($id){
-		$allobjects = OC_Calendar_Object::all($id);
-		foreach($allobjects as $event){
-			self::generate($event['id']);
-		}
-		return true;
-	}
-	/**
-	 * @brief updates an event that is already cached
-	 * @param (int) id - id of the event
-	 * @return (bool)
-	 */
-	public static function update($id){
-		self::clean($id);
-		self::generate($id);
-		return true;
-	}
-	/**
-	 * @brief updates all repating events of a calendar that are already cached
-	 * @param (int) id - id of the calendar
-	 * @return (bool)
-	 */
-	public static function updateCalendar($id){
-		self::cleanCalendar($id);
-		self::generateCalendar($id);
-		return true;
-	}
-	/**
-	 * @brief checks if an event is already cached
-	 * @param (int) id - id of the event
-	 * @return (bool)
-	 */
-	public static function is_cached($id){
-		if(count(self::get($id)) != 0){
-			return true;
-		}else{
-			return false;
-		}
-	}
-	/**
-	 * @brief checks if an event is already cached in a specific period
-	 * @param (int) id - id of the event
-	 * @param (DateTime) $from - start for period in UTC
-	 * @param (DateTime) $until - end for period in UTC
-	 * @return (bool)
-	 */
-	public static function is_cached_inperiod($id, $start, $end){
-		if(count(self::get_inperiod($id, $start, $end)) != 0){
-			return true;
-		}else{
-			return false;
-		}
-
-	}
-	/**
-	 * @brief checks if a whole calendar is already cached
-	 * @param (int) id - id of the calendar
-	 * @return (bool)
-	 */
-	public static function is_calendar_cached($id){
-		$cachedevents = count(self::getCalendar($id));
-		$repeatingevents = 0;
-		$allevents = OC_Calendar_Object::all($id);
-		foreach($allevents as $event){
-			if($event['repeating'] === 1){
-				$repeatingevents++;
-			}
-		}
-		if($cachedevents < $repeatingevents){
-			return false;
-		}else{
-			return true;
-		}
-	}
-	/**
-	 * @brief removes the cache of an event
-	 * @param (int) id - id of the event
-	 * @return (bool)
-	 */
-	public static function clean($id){
-		$stmt = OCP\DB::prepare('DELETE FROM `*PREFIX*calendar_repeat` WHERE `eventid` = ?');
-		$stmt->execute(array($id));
-	}
-	/**
-	 * @brief removes the cache of all events of a calendar
-	 * @param (int) id - id of the calendar
-	 * @return (bool)
-	 */
-	public static function cleanCalendar($id){
-		$stmt = OCP\DB::prepare('DELETE FROM `*PREFIX*calendar_repeat` WHERE `calid` = ?');
-		$stmt->execute(array($id));
-	}
-}
\ No newline at end of file
diff --git a/apps/calendar/lib/sabre/backend.php b/apps/calendar/lib/sabre/backend.php
deleted file mode 100644
index ac3b26ceb3..0000000000
--- a/apps/calendar/lib/sabre/backend.php
+++ /dev/null
@@ -1,318 +0,0 @@
-<?php
-
-class OC_Connector_Sabre_CalDAV extends Sabre_CalDAV_Backend_Abstract {
-	/**
-	 * List of CalDAV properties, and how they map to database fieldnames
-	 *
-	 * Add your own properties by simply adding on to this array
-	 *
-	 * @var array
-	 */
-	public $propertyMap = array(
-		'{DAV:}displayname'						  => 'displayname',
-		'{urn:ietf:params:xml:ns:caldav}calendar-timezone'	=> 'timezone',
-		'{http://apple.com/ns/ical/}calendar-order'  => 'calendarorder',
-		'{http://apple.com/ns/ical/}calendar-color'  => 'calendarcolor',
-	);
-
-	/**
-	 * Returns a list of calendars for a principal.
-	 *
-	 * Every project is an array with the following keys:
-	 *  * id, a unique id that will be used by other functions to modify the
-	 *	calendar. This can be the same as the uri or a database key.
-	 *  * uri, which the basename of the uri with which the calendar is
-	 *	accessed.
-	 *  * principalUri. The owner of the calendar. Almost always the same as
-	 *	principalUri passed to this method.
-	 *
-	 * Furthermore it can contain webdav properties in clark notation. A very
-	 * common one is '{DAV:}displayname'.
-	 *
-	 * @param string $principalUri
-	 * @return array
-	 */
-	public function getCalendarsForUser($principalUri) {
-		$raw = OC_Calendar_Calendar::allCalendarsWherePrincipalURIIs($principalUri);
-		
-		$calendars = array();
-		foreach( $raw as $row ){
-			$components = explode(',',$row['components']);
-
-			$calendar = array(
-				'id' => $row['id'],
-				'uri' => $row['uri'],
-				'principaluri' => 'principals/'.$row['userid'],
-				'{' . Sabre_CalDAV_Plugin::NS_CALENDARSERVER . '}getctag' => $row['ctag']?$row['ctag']:'0',
-				'{' . Sabre_CalDAV_Plugin::NS_CALDAV . '}supported-calendar-component-set' => new Sabre_CalDAV_Property_SupportedCalendarComponentSet($components),
-			);
-	
-			foreach($this->propertyMap as $xmlName=>$dbName) {
-				$calendar[$xmlName] = $row[$dbName];
-			}
-
-			$calendars[] = $calendar;
-		}
-		return $calendars;
-	}
-
-	/**
-	 * Creates a new calendar for a principal.
-	 *
-	 * If the creation was a success, an id must be returned that can be used to reference
-	 * this calendar in other methods, such as updateCalendar
-	 *
-	 * @param string $principalUri
-	 * @param string $calendarUri
-	 * @param array $properties
-	 * @return mixed
-	 */
-	public function createCalendar($principalUri,$calendarUri, array $properties) {
-		$fieldNames = array(
-			'principaluri',
-			'uri',
-			'ctag',
-		);
-		$values = array(
-			':principaluri' => $principalUri,
-			':uri'		  => $calendarUri,
-			':ctag'		 => 1,
-		);
-
-		// Default value
-		$sccs = '{urn:ietf:params:xml:ns:caldav}supported-calendar-component-set';
-		$fieldNames[] = 'components';
-		if (!isset($properties[$sccs])) {
-			$values[':components'] = 'VEVENT,VTODO';
-		} else {
-			if (!($properties[$sccs] instanceof Sabre_CalDAV_Property_SupportedCalendarComponentSet)) {
-				throw new Sabre_DAV_Exception('The ' . $sccs . ' property must be of type: Sabre_CalDAV_Property_SupportedCalendarComponentSet');
-			}
-			$values[':components'] = implode(',',$properties[$sccs]->getValue());
-		}
-
-		foreach($this->propertyMap as $xmlName=>$dbName) {
-			if (isset($properties[$xmlName])) {
-
-				$myValue = $properties[$xmlName];
-				$values[':' . $dbName] = $properties[$xmlName];
-				$fieldNames[] = $dbName;
-			}
-		}
-
-		if(!isset($newValues['displayname'])) $newValues['displayname'] = 'unnamed';
-		if(!isset($newValues['components'])) $newValues['components'] = 'VEVENT,VTODO';
-		if(!isset($newValues['timezone'])) $newValues['timezone'] = null;
-		if(!isset($newValues['calendarorder'])) $newValues['calendarorder'] = 0;
-		if(!isset($newValues['calendarcolor'])) $newValues['calendarcolor'] = null;
-		if(!is_null($newValues['calendarcolor']) && strlen($newValues['calendarcolor']) == 9){
-			$newValues['calendarcolor'] = substr($newValues['calendarcolor'], 0, 7);
-		}
-		
-		return OC_Calendar_Calendar::addCalendarFromDAVData($principalUri,$calendarUri,$newValues['displayname'],$newValues['components'],$newValues['timezone'],$newValues['calendarorder'],$newValues['calendarcolor']);
-	}
-
-	/**
-	 * Updates a calendars properties
-	 *
-	 * The properties array uses the propertyName in clark-notation as key,
-	 * and the array value for the property value. In the case a property
-	 * should be deleted, the property value will be null.
-	 *
-	 * This method must be atomic. If one property cannot be changed, the
-	 * entire operation must fail.
-	 *
-	 * If the operation was successful, true can be returned.
-	 * If the operation failed, false can be returned.
-	 *
-	 * Deletion of a non-existant property is always succesful.
-	 *
-	 * Lastly, it is optional to return detailed information about any
-	 * failures. In this case an array should be returned with the following
-	 * structure:
-	 *
-	 * array(
-	 *   403 => array(
-	 *	  '{DAV:}displayname' => null,
-	 *   ),
-	 *   424 => array(
-	 *	  '{DAV:}owner' => null,
-	 *   )
-	 * )
-	 *
-	 * In this example it was forbidden to update {DAV:}displayname.
-	 * (403 Forbidden), which in turn also caused {DAV:}owner to fail
-	 * (424 Failed Dependency) because the request needs to be atomic.
-	 *
-	 * @param string $calendarId
-	 * @param array $properties
-	 * @return bool|array
-	 */
-	public function updateCalendar($calendarId, array $properties) {
-
-		$newValues = array();
-		$result = array(
-			200 => array(), // Ok
-			403 => array(), // Forbidden
-			424 => array(), // Failed Dependency
-		);
-
-		$hasError = false;
-
-		foreach($properties as $propertyName=>$propertyValue) {
-
-			// We don't know about this property.
-			if (!isset($this->propertyMap[$propertyName])) {
-				$hasError = true;
-				$result[403][$propertyName] = null;
-				unset($properties[$propertyName]);
-				continue;
-			}
-
-			$fieldName = $this->propertyMap[$propertyName];
-			$newValues[$fieldName] = $propertyValue;
-	
-		}
-
-		// If there were any errors we need to fail the request
-		if ($hasError) {
-			// Properties has the remaining properties
-			foreach($properties as $propertyName=>$propertyValue) {
-				$result[424][$propertyName] = null;
-			}
-
-			// Removing unused statuscodes for cleanliness
-			foreach($result as $status=>$properties) {
-				if (is_array($properties) && count($properties)===0) unset($result[$status]);
-			}
-
-			return $result;
-
-		}
-
-		// Success
-		if(!isset($newValues['displayname'])) $newValues['displayname'] = null;
-		if(!isset($newValues['timezone'])) $newValues['timezone'] = null;
-		if(!isset($newValues['calendarorder'])) $newValues['calendarorder'] = null;
-		if(!isset($newValues['calendarcolor'])) $newValues['calendarcolor'] = null;
-		if(!is_null($newValues['calendarcolor']) && strlen($newValues['calendarcolor']) == 9){
-			$newValues['calendarcolor'] = substr($newValues['calendarcolor'], 0, 7);
-		}
-		
-		OC_Calendar_Calendar::editCalendar($calendarId,$newValues['displayname'],null,$newValues['timezone'],$newValues['calendarorder'],$newValues['calendarcolor']);
-
-		return true;
-
-	}
-
-	/**
-	 * Delete a calendar and all it's objects
-	 *
-	 * @param string $calendarId
-	 * @return void
-	 */
-	public function deleteCalendar($calendarId) {
-	    if(preg_match( '=iCal/[1-4]?.*Mac OS X/10.[1-6](.[0-9])?=', $_SERVER['HTTP_USER_AGENT'] )){
-	    	throw new Sabre_DAV_Exception_Forbidden("Action is not possible with OSX 10.6.x", 403);
-		}
-		
-		OC_Calendar_Calendar::deleteCalendar($calendarId);
-	}
-
-	/**
-	 * Returns all calendar objects within a calendar object.
-	 *
-	 * Every item contains an array with the following keys:
-	 *   * id - unique identifier which will be used for subsequent updates
-	 *   * calendardata - The iCalendar-compatible calnedar data
-	 *   * uri - a unique key which will be used to construct the uri. This can be any arbitrary string.
-	 *   * lastmodified - a timestamp of the last modification time
-	 *   * etag - An arbitrary string, surrounded by double-quotes. (e.g.:
-	 *   '  "abcdef"')
-	 *   * calendarid - The calendarid as it was passed to this function.
-	 *
-	 * Note that the etag is optional, but it's highly encouraged to return for
-	 * speed reasons.
-	 *
-	 * The calendardata is also optional. If it's not returned
-	 * 'getCalendarObject' will be called later, which *is* expected to return
-	 * calendardata.
-	 *
-	 * @param string $calendarId
-	 * @return array
-	 */
-	public function getCalendarObjects($calendarId) {
-		$data = array();
-		foreach(OC_Calendar_Object::all($calendarId) as $row){
-			$data[] = $this->OCAddETag($row);
-		}
-		return $data;
-	}
-
-	/**
-	 * Returns information from a single calendar object, based on it's object
-	 * uri.
-	 *
-	 * The returned array must have the same keys as getCalendarObjects. The
-	 * 'calendardata' object is required here though, while it's not required
-	 * for getCalendarObjects.
-	 *
-	 * @param string $calendarId
-	 * @param string $objectUri
-	 * @return array
-	 */
-	public function getCalendarObject($calendarId,$objectUri) {
-		$data = OC_Calendar_Object::findWhereDAVDataIs($calendarId,$objectUri);
-		if(is_array($data)){
-			$data = $this->OCAddETag($data);
-		}
-		return $data;
-	}
-
-	/**
-	 * Creates a new calendar object.
-	 *
-	 * @param string $calendarId
-	 * @param string $objectUri
-	 * @param string $calendarData
-	 * @return void
-	 */
-	public function createCalendarObject($calendarId,$objectUri,$calendarData) {
-		OC_Calendar_Object::addFromDAVData($calendarId,$objectUri,$calendarData);
-	}
-
-	/**
-	 * Updates an existing calendarobject, based on it's uri.
-	 *
-	 * @param string $calendarId
-	 * @param string $objectUri
-	 * @param string $calendarData
-	 * @return void
-	 */
-	public function updateCalendarObject($calendarId,$objectUri,$calendarData){
-		OC_Calendar_Object::editFromDAVData($calendarId,$objectUri,$calendarData);
-	}
-
-	/**
-	 * Deletes an existing calendar object.
-	 *
-	 * @param string $calendarId
-	 * @param string $objectUri
-	 * @return void
-	 */
-	public function deleteCalendarObject($calendarId,$objectUri){
-		OC_Calendar_Object::deleteFromDAVData($calendarId,$objectUri);
-	}
-	
-	/**
-	 * @brief Creates a etag
-	 * @param array $row Database result
-	 * @returns associative array
-	 *
-	 * Adds a key "etag" to the row
-	 */
-	private function OCAddETag($row){
-		$row['etag'] = '"'.md5($row['calendarid'].$row['uri'].$row['calendardata'].$row['lastmodified']).'"';
-		return $row;
-	}
-}
diff --git a/apps/calendar/lib/sabre/calendar.php b/apps/calendar/lib/sabre/calendar.php
deleted file mode 100644
index 179be1b281..0000000000
--- a/apps/calendar/lib/sabre/calendar.php
+++ /dev/null
@@ -1,127 +0,0 @@
-<?php
-/**
- * ownCloud - OC_Connector_Sabre_Sabre_CalDAV_Calendar
- *
- * @author Thomas Tanghus
- * @copyright 2012 Thomas Tanghus (thomas@tanghus.net)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *
- * You should have received a copy of the GNU Affero General Public
- * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-/**
- * This class overrides Sabre_CalDAV_Calendar::getACL() to return read/write
- * permissions based on user and shared state and it overrides
- * Sabre_CalDAV_Calendar::getChild() and Sabre_CalDAV_Calendar::getChildren()
- * to instantiate OC_Connector_Sabre_CalDAV_CalendarObjects.
-*/
-class OC_Connector_Sabre_CalDAV_Calendar extends Sabre_CalDAV_Calendar {
-
-	/**
-	* Returns a list of ACE's for this node.
-	*
-	* Each ACE has the following properties:
-	*   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
-	*     currently the only supported privileges
-	*   * 'principal', a url to the principal who owns the node
-	*   * 'protected' (optional), indicating that this ACE is not allowed to
-	*      be updated.
-	*
-	* @return array
-	*/
-	public function getACL() {
-
-		$readprincipal = $this->getOwner();
-		$writeprincipal = $this->getOwner();
-		$uid = OC_Calendar_Calendar::extractUserID($this->getOwner());
-
-		if($uid != OCP\USER::getUser()) {
-			$sharedCalendar = OCP\Share::getItemSharedWithBySource('calendar', $this->$calendarInfo['id']);
-			if ($sharedCalendar && ($sharedCalendar['permissions'] & OCP\Share::PERMISSION_READ)) {
-				$readprincipal = 'principals/' . OCP\USER::getUser();
-			}
-			if ($sharedCalendar && ($sharedCalendar['permissions'] & OCP\Share::PERMISSION_UPDATE)) {
-				$writeprincipal = 'principals/' . OCP\USER::getUser();
-			}
-		}
-
-		return array(
-			array(
-				'privilege' => '{DAV:}read',
-				'principal' => $readprincipal,
-				'protected' => true,
-			),
-			array(
-				'privilege' => '{DAV:}write',
-				'principal' => $writeprincipal,
-				'protected' => true,
-			),
-			array(
-				'privilege' => '{DAV:}read',
-				'principal' => $readprincipal . '/calendar-proxy-write',
-				'protected' => true,
-			),
-			array(
-				'privilege' => '{DAV:}write',
-				'principal' => $writeprincipal . '/calendar-proxy-write',
-				'protected' => true,
-			),
-			array(
-				'privilege' => '{DAV:}read',
-				'principal' => $readprincipal . '/calendar-proxy-read',
-				'protected' => true,
-			),
-			array(
-				'privilege' => '{' . Sabre_CalDAV_Plugin::NS_CALDAV . '}read-free-busy',
-				'principal' => '{DAV:}authenticated',
-				'protected' => true,
-			),
-
-		);
-
-	}
-
-	/**
-	* Returns a calendar object
-	*
-	* The contained calendar objects are for example Events or Todo's.
-	*
-	* @param string $name
-	* @return Sabre_DAV_ICalendarObject
-	*/
-	public function getChild($name) {
-
-		$obj = $this->caldavBackend->getCalendarObject($this->calendarInfo['id'],$name);
-		if (!$obj) throw new Sabre_DAV_Exception_NotFound('Calendar object not found');
-		return new OC_Connector_Sabre_CalDAV_CalendarObject($this->caldavBackend,$this->calendarInfo,$obj);
-
-	}
-
-	/**
-	* Returns the full list of calendar objects
-	*
-	* @return array
-	*/
-	public function getChildren() {
-
-		$objs = $this->caldavBackend->getCalendarObjects($this->calendarInfo['id']);
-		$children = array();
-		foreach($objs as $obj) {
-			$children[] = new OC_Connector_Sabre_CalDAV_CalendarObject($this->caldavBackend,$this->calendarInfo,$obj);
-		}
-		return $children;
-
-	}
-
-}
\ No newline at end of file
diff --git a/apps/calendar/lib/sabre/calendarroot.php b/apps/calendar/lib/sabre/calendarroot.php
deleted file mode 100644
index e09731c95b..0000000000
--- a/apps/calendar/lib/sabre/calendarroot.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * ownCloud - OC_Connector_Sabre_CalDAV_CalendarRoot
- *
- * @author Thomas Tanghus
- * @copyright 2012 Thomas Tanghus (thomas@tanghus.net)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *
- * You should have received a copy of the GNU Affero General Public
- * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-/**
- * This class overrides Sabre_CalDAV_CalendarRootNode::getChildForPrincipal()
- * to instantiate OC_Connector_Sabre_CalDAV_UserCalendars.
-*/
-class OC_Connector_Sabre_CalDAV_CalendarRoot extends Sabre_CalDAV_CalendarRootNode {
-
-	/**
-	* This method returns a node for a principal.
-	*
-	* The passed array contains principal information, and is guaranteed to
-	* at least contain a uri item. Other properties may or may not be
-	* supplied by the authentication backend.
-	*
-	* @param array $principal
-	* @return Sabre_DAV_INode
-	*/
-	public function getChildForPrincipal(array $principal) {
-
-		return new OC_Connector_Sabre_CalDAV_UserCalendars($this->principalBackend, $this->caldavBackend, $principal['uri']);
-
-	}
-
-}
\ No newline at end of file
diff --git a/apps/calendar/lib/sabre/object.php b/apps/calendar/lib/sabre/object.php
deleted file mode 100644
index 0d1bfa397c..0000000000
--- a/apps/calendar/lib/sabre/object.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-/**
- * ownCloud - OC_Connector_Sabre_CalDAV_CalendarObject
- *
- * @author Thomas Tanghus
- * @copyright 2012 Thomas Tanghus (thomas@tanghus.net)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *
- * You should have received a copy of the GNU Affero General Public
- * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-/**
- * This class overrides Sabre_CalDAV_CalendarObject::getACL()
- * to return read/write permissions based on user and shared state.
-*/
-class OC_Connector_Sabre_CalDAV_CalendarObject extends Sabre_CalDAV_CalendarObject {
-
-	/**
-	* Returns a list of ACE's for this node.
-	*
-	* Each ACE has the following properties:
-	*   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
-	*     currently the only supported privileges
-	*   * 'principal', a url to the principal who owns the node
-	*   * 'protected' (optional), indicating that this ACE is not allowed to
-	*      be updated.
-	*
-	* @return array
-	*/
-	public function getACL() {
-
-		$readprincipal = $this->getOwner();
-		$writeprincipal = $this->getOwner();
-		$uid = OC_Calendar_Calendar::extractUserID($this->getOwner());
-
-		if($uid != OCP\USER::getUser()) {
-			$sharedCalendar = OCP\Share::getItemSharedWithBySource('calendar', $this->$calendarInfo['id']);
-			if ($sharedCalendar && ($sharedCalendar['permissions'] & OCP\Share::PERMISSION_READ)) {
-				$readprincipal = 'principals/' . OCP\USER::getUser();
-			}
-			if ($sharedCalendar && ($sharedCalendar['permissions'] & OCP\Share::PERMISSION_UPDATE)) {
-				$writeprincipal = 'principals/' . OCP\USER::getUser();
-			}
-		}
-
-		return array(
-			array(
-				'privilege' => '{DAV:}read',
-				'principal' => $readprincipal,
-				'protected' => true,
-			),
-			array(
-				'privilege' => '{DAV:}write',
-				'principal' => $writeprincipal,
-				'protected' => true,
-			),
-			array(
-				'privilege' => '{DAV:}read',
-				'principal' => $readprincipal . '/calendar-proxy-write',
-				'protected' => true,
-			),
-			array(
-				'privilege' => '{DAV:}write',
-				'principal' => $writeprincipal . '/calendar-proxy-write',
-				'protected' => true,
-			),
-			array(
-				'privilege' => '{DAV:}read',
-				'principal' => $readprincipal . '/calendar-proxy-read',
-				'protected' => true,
-			),
-		);
-
-	}
-
-}
\ No newline at end of file
diff --git a/apps/calendar/lib/sabre/usercalendars.php b/apps/calendar/lib/sabre/usercalendars.php
deleted file mode 100644
index 919f6b27e1..0000000000
--- a/apps/calendar/lib/sabre/usercalendars.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * ownCloud - OC_Connector_Sabre_CalDAV_UserCalendars
- *
- * @author Thomas Tanghus
- * @copyright 2012 Thomas Tanghus (thomas@tanghus.net)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *
- * You should have received a copy of the GNU Affero General Public
- * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-/**
- * This class overrides Sabre_CalDAV_UserCalendars::getChildren()
- * to instantiate OC_Connector_Sabre_CalDAV_Calendars.
-*/
-class OC_Connector_Sabre_CalDAV_UserCalendars extends Sabre_CalDAV_UserCalendars {
-
-	/**
-	* Returns a list of calendars
-	*
-	* @return array
-	*/
-	public function getChildren() {
-
-		$calendars = $this->caldavBackend->getCalendarsForUser($this->principalInfo['uri']);
-		$objs = array();
-		foreach($calendars as $calendar) {
-			$objs[] = new OC_Connector_Sabre_CalDAV_Calendar($this->principalBackend, $this->caldavBackend, $calendar);
-		}
-		$objs[] = new Sabre_CalDAV_Schedule_Outbox($this->principalInfo['uri']);
-		return $objs;
-
-	}
-
-}
\ No newline at end of file
diff --git a/apps/calendar/lib/search.php b/apps/calendar/lib/search.php
deleted file mode 100644
index 551489672b..0000000000
--- a/apps/calendar/lib/search.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-class OC_Search_Provider_Calendar extends OC_Search_Provider{
-	function search($query){
-		$calendars = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser(), true);
-		if(count($calendars)==0 || !OCP\App::isEnabled('calendar')){
-			//return false;
-		}
-		$results=array();
-		$searchquery=array();
-		if(substr_count($query, ' ') > 0){
-			$searchquery = explode(' ', $query);
-		}else{
-			$searchquery[] = $query;
-		}
-		$user_timezone = OC_Calendar_App::getTimezone();
-		$l = new OC_l10n('calendar');
-		foreach($calendars as $calendar){
-			$objects = OC_Calendar_Object::all($calendar['id']);
-			foreach($objects as $object){
-				if($object['objecttype']!='VEVENT') {
-					continue;
-				}
-				if(substr_count(strtolower($object['summary']), strtolower($query)) > 0){
-					$calendardata = OC_VObject::parse($object['calendardata']);
-					$vevent = $calendardata->VEVENT;
-					$dtstart = $vevent->DTSTART;
-					$dtend = OC_Calendar_Object::getDTEndFromVEvent($vevent);
-					$start_dt = $dtstart->getDateTime();
-					$start_dt->setTimezone(new DateTimeZone($user_timezone));
-					$end_dt = $dtend->getDateTime();
-					$end_dt->setTimezone(new DateTimeZone($user_timezone));
-					if ($dtstart->getDateType() == Sabre_VObject_Property_DateTime::DATE){
-						$end_dt->modify('-1 sec');
-						if($start_dt->format('d.m.Y') != $end_dt->format('d.m.Y')){
-							$info = $l->t('Date') . ': ' . $start_dt->format('d.m.Y') . ' - ' . $end_dt->format('d.m.Y');
-						}else{
-							$info = $l->t('Date') . ': ' . $start_dt->format('d.m.Y');
-						}
-					}else{
-						$info = $l->t('Date') . ': ' . $start_dt->format('d.m.y H:i') . ' - ' . $end_dt->format('d.m.y H:i');
-					}
-					$link = OCP\Util::linkTo('calendar', 'index.php').'?showevent='.urlencode($object['id']);
-					$results[]=new OC_Search_Result($object['summary'],$info, $link,(string)$l->t('Cal.'));//$name,$text,$link,$type
-				}
-			}
-		}
-		return $results;
-	}
-}
diff --git a/apps/calendar/lib/share.php b/apps/calendar/lib/share.php
deleted file mode 100644
index bad1082c33..0000000000
--- a/apps/calendar/lib/share.php
+++ /dev/null
@@ -1,295 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Georg Ehrke <ownclouddev@georgswebsite.de>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-/**
- * This class manages shared calendars
- */
-class OC_Calendar_Share{
-	const CALENDAR = 'calendar';
-	const EVENT = 'event';
-	/**
-	 * @brief: returns informations about all calendar or events which users are sharing with the user - userid
-	 * @param: string $userid - id of the user
-	 * @param: string $type - use const self::CALENDAR or self::EVENT
-	 * @return: array $return - information about calendars
-	 */
-	public static function allSharedwithuser($userid, $type, $active=null, $permission=null){
-		$format = OC_Share_Backend_Calendar::FORMAT_CALENDAR;
-		if ($type == self::EVENT) {
-			$format = OC_Share_Backend_Event::FORMAT_EVENT;
-		}
-		$return = OCP\Share::getItemsSharedWith($type,
-			$format,
-			array(
-				'active' => $active,
-				'permissions' => $permission,
-			));
-		return $return;
-	}
-	/**
-	 * @brief: returns all users a calendar / event is shared with
-	 * @param: integer id - id of the calendar / event
-	 * @param: string $type - use const self::CALENDAR or self::EVENT
-	 * @return: array $users - information about users a calendar / event is shared with
-	 */
-	public static function allUsersSharedwith($id, $type){
-		$stmt = OCP\DB::prepare('SELECT * FROM `*PREFIX*calendar_share_' . $type . '` WHERE `' . $type . 'id` = ? ORDER BY `share`');
-		$result = $stmt->execute(array($id));
-		$users = array();
-		while( $row = $result->fetchRow()){
-			$users[] = $row;
-		}
-		return $users;
-	}
-	/**
-	 * @brief: shares a calendar / event
-	 * @param: string $owner - userid of the owner
-	 * @param: string $share - userid (if $sharetype == user) / groupid (if $sharetype == group) / token (if $sharetype == public)
-	 * @param: string $sharetype - type of sharing (can be: user/group/public)
-	 * @param: string $id - id of the calendar / event
-	 * @param: string $type - use const self::CALENDAR or self::EVENT
-	 * @return (mixed) - token (if $sharetype == public) / bool (if $sharetype != public)
-	 */
-	public static function share($owner, $share, $sharetype, $id, $type){
-		if(self::is_already_shared($owner, $share, $sharetype, $id, $type)){
-			return false;
-		}
-		switch($sharetype){
-			case 'user':
-			case 'group':
-			case 'public':
-				break;
-			default:
-				return false;
-		}
-		if($sharetype == 'public'){
-			$share = self::generate_token($id, $type);
-		}
-		$stmt = OCP\DB::prepare('INSERT INTO `*PREFIX*calendar_share_' . $type . '` (`owner`,`share`,`sharetype`,`' . $type . 'id`,`permissions`' . (($type == self::CALENDAR)?',`active`':'') . ') VALUES(?,?,?,?,0' . (($type == self::CALENDAR)?', 1':'') . ')' );
-		$result = $stmt->execute(array($owner,$share,$sharetype,$id));
-		if($sharetype == 'public'){
-			return $share;
-		}else{
-			return true;
-		}
-	}
-	/**
-	 * @brief: stops sharing a calendar / event
-	 * @param: string $owner - userid of the owner
-	 * @param: string $share - userid (if $sharetype == user) / groupid (if $sharetype == group) / token (if $sharetype == public)
-	 * @param: string $sharetype - type of sharing (can be: user/group/public)
-	 * @param: string $id - id of the calendar / event
-	 * @param: string $type - use const self::CALENDAR or self::EVENT
-	 * @return boolean
-	 */
-	public static function unshare($owner, $share, $sharetype, $id, $type){
-		$stmt = OCP\DB::prepare('DELETE FROM `*PREFIX*calendar_share_' . $type . '` WHERE `owner` = ? ' . (($sharetype != 'public')?'AND `share` = ?':'') . ' AND `sharetype` = ? AND `' . $type . 'id` = ?');
-		if($sharetype != 'public'){
-			$stmt->execute(array($owner,$share,$sharetype,$id));
-		}else{
-			$stmt->execute(array($owner,$sharetype,$id));
-		}
-		return true;
-	}
-	/**
-	 * @brief: changes the permission for a calendar / event
-	 * @param: string $share - userid (if $sharetype == user) / groupid (if $sharetype == group) / token (if $sharetype == public)
-	 * @param: string $sharetype - type of sharing (can be: user/group/public)
-	 * @param: string $id - id of the calendar / event
-	 * @param: integer $permission - permission of user the calendar / event is shared with (if $sharetype == public then $permission = 0)
-	 * @param: string $type - use const self::CALENDAR or self::EVENT
-	 * @return boolean
-	 */
-	public static function changepermission($share, $sharetype, $id, $permission, $type){
-		if($sharetype == 'public' && $permission == 1){
-			$permission = 0;
-		}
-		$stmt = OCP\DB::prepare('UPDATE `*PREFIX*calendar_share_' . $type . '` SET `permissions` = ? WHERE `share` = ? AND `sharetype` = ? AND `' . $type . 'id` = ?');
-		$stmt->execute(array($permission, $share, $sharetype, $id));
-		return true;
-	}
-	/**
-	 * @brief: generates a token for public calendars / events
-	 * @return: string $token
-	 */
-	private static function generate_token($id, $type){
-		$uniqid = uniqid();
-		if($type == self::CALENDAR){
-			$events = OC_Calendar_Object::all($id);
-			$string = '';
-			foreach($events as $event){
-				$string .= $event['calendardata'];
-			}
-		}else{
-			$string = OC_Calendar_Object::find($id);
-		}
-		$string = sha1($string['calendardata']);
-		$id = sha1($id);
-		$array = array($uniqid,$string,$id);
-		shuffle($array);
-		$string = implode('', $array);
-		$token = md5($string);
-		return substr($token, rand(0,16), 15);
-	}
-	/**
-	 * @brief: checks if it is already shared
-	 * @param: string $owner - userid of the owner
-	 * @param: string $share - userid (if $sharetype == user) / groupid (if $sharetype == group) / token (if $sharetype == public)
-	 * @param: string $sharetype - type of sharing (can be: user/group/public)
-	 * @param: string $id - id of the calendar / event
-	 * @param: string $type - use const self::CALENDAR or self::EVENT
-	 * @return boolean
-	 */
-	public static function is_already_shared($owner, $share, $sharetype, $id, $type){
-		$stmt = OCP\DB::prepare('SELECT * FROM `*PREFIX*calendar_share_' . $type . '` WHERE `owner` = ? AND `share` = ? AND `sharetype` = ? AND `' . $type . 'id` = ?');
-		$result = $stmt->execute(array($owner, $share, $sharetype, $id));
-		if($result->numRows() > 0){
-			return true;
-		}
-		return false;
-	}
-	private static function group_sql($groups){
-		$group_where = '';
-		$i = 0;
-		foreach($groups as $group){
-			$group_where .= ' OR ';
-			$group_where .= ' (`share` = \'' . $group . '\' AND `sharetype` = \'group\') ';
-			$i++;
-		}
-		return $group_where;
-	}
-	private static function permission_sql($permission = null){
-		$permission_where = '';
-		if(!is_null($permission)){
-			$permission_where = ' AND `permissions` = ';
-			$permission_where .= ($permission=='rw')?"'1'":"'0'";
-		}
-		return $permission_where;
-	}
-	private static function active_sql($active = null){
-		$active_where = '';
-		if(!is_null($active)){
-			$active_where = 'AND `active` = ';
-			$active_where .= (!is_null($active) && $active)?'1':'0';
-		}
-		return $active_where;
-	}
-	/**
-	 * @brief: checks the permission for editing an event
-	 * @param: string $share - userid (if $sharetype == user) / groupid (if $sharetype == group) / token (if $sharetype == public)
-	 * @param: string $id - id of the calendar / event
-	 * @param: string $type - use const self::CALENDAR or self::EVENT
-	 * @return boolean
-	 */
-	public static function is_editing_allowed($share, $id, $type){
-		$group_where = self::group_sql(OC_Group::getUserGroups($share));
-		$permission_where = self::permission_sql('rw');
-		$stmt = OCP\DB::prepare('SELECT * FROM `*PREFIX*calendar_share_' . $type . '` WHERE ((`share` = ? AND `sharetype` = \'user\') ' . $group_where . ') ' . $permission_where);
-		$result = $stmt->execute(array($share));
-		if($result->numRows() == 1){
-			return true;
-		}
-		if($type == self::EVENT){
-			$event = OC_Calendar_App::getEventObject($id, false, false);
-			return self::is_editing_allowed($share, $event['calendarid'], self::CALENDAR);
-		}
-		return false;
-	}
-	/**
-	 * @brief: checks the access of 
-	 * @param: string $share - userid (if $sharetype == user) / groupid (if $sharetype == group) / token (if $sharetype == public)
-	 * @param: string $id - id of the calendar / event
-	 * @param: string $type - use const self::CALENDAR or self::EVENT
-	 * @return boolean
-	 */
-	public static function check_access($share, $id, $type){
-		$group_where = self::group_sql(OC_Group::getUserGroups($share));
-		$stmt = OCP\DB::prepare('SELECT * FROM `*PREFIX*calendar_share_' . $type . '` WHERE (`' . $type . 'id` = ? AND (`share` = ? AND `sharetype` = \'user\') ' . $group_where . ')');
-		$result = $stmt->execute(array($id,$share));
-		$rows =  $result->numRows();
-		if($rows > 0){
-			return true;
-		}elseif($type == self::EVENT){
-			$event = OC_Calendar_App::getEventObject($id, false, false);
-			return self::check_access($share, $event['calendarid'], self::CALENDAR);
-		}else{
-			return false;
-		}
-	}
-        /**
-         * @brief: returns the calendardata of an event or a calendar
-         * @param: string $token - token which should be searched
-         * @return: mixed - bool if false, array with type and id if true
-         */
-        public static function getElementByToken($token){
-            $stmt_calendar = OCP\DB::prepare('SELECT * FROM `*PREFIX*calendar_share_' . OC_Calendar_Share::CALENDAR . '` WHERE `sharetype` = \'public\' AND `share` = ?');
-            $result_calendar = $stmt_calendar->execute(array($token));
-            $stmt_event = OCP\DB::prepare('SELECT * FROM `*PREFIX*calendar_share_' . OC_Calendar_Share::EVENT . '` WHERE `sharetype` = \'public\' AND `share` = ?');
-            $result_event = $stmt_event->execute(array($token));
-            $return = array();
-            if($result_calendar->numRows() == 0 && $result_event->numRows() == 0){
-                return false;
-            }elseif($result_calendar->numRows() != 0){
-                $return ['type'] = 'calendar';
-                $calendar = $result_calendar->fetchRow();
-                $return ['id'] = $calendar['calendarid'];
-            }else{
-                $return ['type'] = 'event';
-                $event = $result_event->fetchRow();
-                $return ['id'] = $event['eventid'];
-            }
-			return $return;
-        }
-		
-		/**
-		 * @brief sets the active status of the calendar
-		 * @param string 
-		 */
-		public static function set_active($share, $id, $active){
-			$stmt = OCP\DB::prepare("UPDATE `*PREFIX*calendar_share_calendar` SET `active` = ? WHERE `share` = ? AND `sharetype` = 'user' AND `calendarid` = ?");
-			$stmt->execute(array($active, $share, $id));
-		}
-
-		/**
-		 * @brief deletes all shared calendars / events after a user was deleted
-		 * @param string $userid
-		 * @return boolean
-		 */
-		public static function post_userdelete($userid){			
-			$stmt = OCP\DB::prepare('DELETE FROM `*PREFIX*calendar_share_calendar` WHERE `owner` = ?');
-			$stmt->execute(array($userid));
-			$stmt = OCP\DB::prepare('DELETE FROM `*PREFIX*calendar_share_event` WHERE `owner` = ?');
-			$stmt->execute(array($userid));
-			$stmt = OCP\DB::prepare("DELETE FROM `*PREFIX*calendar_share_calendar` WHERE `share` = ? AND `sharetype` = 'user'");
-			$stmt->execute(array($userid));
-			$stmt = OCP\DB::prepare("DELETE FROM `*PREFIX*calendar_share_event` WHERE `share` = ? AND `sharetype` = 'user'");
-			$stmt->execute(array($userid));
-			return true;
-		}
-		
-		/**
-		 * @brief deletes all shared events of a calendar
-		 * @param integer $calid
-		 * @return boolean
-		 */
-		public static function post_caldelete($calid){
-			$stmt = OCP\DB::prepare('DELETE FROM `*PREFIX*calendar_share_calendar` WHERE `calendarid` = ?');
-			$stmt->execute(array($calid));
-			return true;
-		}
-		
-		/**
-		 * @brief deletes all shares of an event
-		 * @param integer $eventid
-		 * @return boolean
-		 */
-		public static function post_eventdelete($eventid){
-			$stmt = OCP\DB::prepare('DELETE FROM `*PREFIX*calendar_share_event` WHERE `eventid` = ?');
-			$stmt->execute(array($eventid));
-			return true;
-		}
-}
\ No newline at end of file
diff --git a/apps/calendar/lib/share/calendar.php b/apps/calendar/lib/share/calendar.php
deleted file mode 100644
index bbc43fcca0..0000000000
--- a/apps/calendar/lib/share/calendar.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-/**
-* ownCloud
-*
-* @author Michael Gapczynski
-* @copyright 2012 Michael Gapczynski mtgap@owncloud.com
-* Copyright (c) 2012 Bart Visscher <bartv@thisnet.nl>
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either
-* version 3 of the License, or any later version.
-*
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-*
-* You should have received a copy of the GNU Affero General Public
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-class OC_Share_Backend_Calendar implements OCP\Share_Backend_Collection {
-	const FORMAT_CALENDAR = 1;
-
-	/**
-	* @brief Get the source of the item to be stored in the database
-	* @param string Item
-	* @param string Owner of the item
-	* @return mixed|array|false Source
-	*
-	* Return an array if the item is file dependent, the array needs two keys: 'item' and 'file'
-	* Return false if the item does not exist for the user
-	*
-	* The formatItems() function will translate the source returned back into the item
-	*/
-	public function isValidSource($itemSource, $uidOwner) {
-		$calendar = OC_Calendar_App::getCalendar( $itemSource );
-		if ($calendar || $calendar['userid'] != $uidOwner) {
-			return false;
-		}
-		return true;
-	}
-
-	/**
-	* @brief Get a unique name of the item for the specified user
-	* @param string Item
-	* @param string|false User the item is being shared with
-	* @param array|null List of similar item names already existing as shared items
-	* @return string Target name
-	*
-	* This function needs to verify that the user does not already have an item with this name.
-	* If it does generate a new name e.g. name_#
-	*/
-	public function generateTarget($itemSource, $shareWith, $exclude = null) {
-		$calendar = OC_Calendar_App::getCalendar( $itemSource );
-		$user_calendars = array();
-		foreach(OC_Contacts_Addressbook::all($uid) as $user_calendar) {
-			$user_calendars[] = $user_calendar['displayname'];
-		}
-		$name = $calendar['userid']."'s ".$calendar['displayname'];
-		$suffix = '';
-		while (in_array($name.$suffix, $user_calendars)) {
-			$suffix++;
-		}
-		
-		return $name.$suffix;
-	}
-
-	/**
-	* @brief Converts the shared item sources back into the item in the specified format
-	* @param array Shared items
-	* @param int Format
-	* @return ?
-	*
-	* The items array is a 3-dimensional array with the item_source as the first key and the share id as the second key to an array with the share info.
-	* The key/value pairs included in the share info depend on the function originally called:
-	* If called by getItem(s)Shared: id, item_type, item, item_source, share_type, share_with, permissions, stime, file_source
-	* If called by getItem(s)SharedWith: id, item_type, item, item_source, item_target, share_type, share_with, permissions, stime, file_source, file_target
-	* This function allows the backend to control the output of shared items with custom formats.
-	* It is only called through calls to the public getItem(s)Shared(With) functions.
-	*/
-	public function formatItems($items, $format, $parameters = null) {
-		$calendars = array();
-		if ($format == self::FORMAT_CALENDAR) {
-			foreach ($items as $item) {
-				$calendar = OC_Calendar_App::getCalendar($item['item_source'], false);
-				// TODO: really check $parameters['permissions'] == 'rw'/'r'
-				if ($parameters['permissions'] == 'rw') {
-					continue; // TODO
-				}
-				$calendar['displaynamename'] = $item['item_target'];
-				$calendar['calendarid'] = $calendar['id'];
-				$calendar['owner'] = $calendar['userid'];
-				$calendars[] = $calendar;
-			}
-		}
-		return $calendars;
-	}
-
-	public function getChildren($itemSource) {
-		$query = OCP\DB::prepare('SELECT `id` FROM `*PREFIX*calendar_objects` WHERE `calendarid` = ?');
-		$result = $query->execute(array($itemSource));
-		$sources = array();
-		while ($object = $result->fetchRow()) {
-			$sources[] = $object['id'];
-		}
-		return $sources;
-	}
-
-}
\ No newline at end of file
diff --git a/apps/calendar/lib/share/event.php b/apps/calendar/lib/share/event.php
deleted file mode 100644
index 5bb72ee6c9..0000000000
--- a/apps/calendar/lib/share/event.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Bart Visscher <bartv@thisnet.nl>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-class OC_Share_Backend_Event implements OCP\Share_Backend {
-
-	const FORMAT_EVENT = 0;
-
-	private static $event;
-
-	public function isValidSource($itemSource, $uidOwner) {
-		self::$event = OC_Calendar_Object::find($itemSource);
-		if (self::$event) {
-			return true;
-		}
-		return false;
-	}
-	
-	public function generateTarget($itemSource, $shareWith, $exclude = null) {
-		// TODO Get default calendar and check for conflicts
-		return self::$event['summary'];
-	}
-	
-	public function formatItems($items, $format, $parameters = null) {
-		$events = array();
-		if ($format == self::FORMAT_EVENT) {
-			foreach ($items as $item) {
-				$event = OC_Calendar_Object::find($item['item_source']);
-				$event['summary'] = $item['item_target'];
-				$events[] = $event;
-			}
-		}
-		return $events;
-	}
-
-}
diff --git a/apps/calendar/lib/share_backend.php b/apps/calendar/lib/share_backend.php
deleted file mode 100644
index 1ea58ac270..0000000000
--- a/apps/calendar/lib/share_backend.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-/**
-* ownCloud
-*
-* @author Michael Gapczynski
-* @copyright 2012 Michael Gapczynski mtgap@owncloud.com
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either
-* version 3 of the License, or any later version.
-*
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-*
-* You should have received a copy of the GNU Affero General Public
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-class OC_Share_Backend_Calendar extends OCP\Share_Backend {
-
-	public function getSource($item, $uid) {
-		$query = OCP\DB::prepare('SELECT `id` FROM `*PREFIX*calendar_calendars` WHERE `userid` = ? AND `displayname` = ?',1);
-		return $query->execute(array($uid, $item))->fetchAll();
-	}
-
-	public function generateTarget($item, $uid) {
-		
-	}
-
-	public function getItems($sources) {
-		
-	}
-
-}
-
-class OC_Share_Backend_Event extends OCP\Share_Backend {
-
-}
-
-
-?>
\ No newline at end of file
diff --git a/apps/calendar/settings.php b/apps/calendar/settings.php
deleted file mode 100644
index f563518046..0000000000
--- a/apps/calendar/settings.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011 Bart Visscher <bartv@thisnet.nl>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-$tmpl = new OCP\Template( 'calendar', 'settings');
-$timezone=OCP\Config::getUserValue(OCP\USER::getUser(),'calendar','timezone','');
-$tmpl->assign('timezone',$timezone);
-$tmpl->assign('timezones',DateTimeZone::listIdentifiers());
-$tmpl->assign('calendars', OC_Calendar_Calendar::allCalendars(OCP\USER::getUser()), false);
-
-OCP\Util::addscript('calendar','settings');
-
-$tmpl->printPage();
\ No newline at end of file
diff --git a/apps/calendar/share.php b/apps/calendar/share.php
deleted file mode 100644
index bffcf0b470..0000000000
--- a/apps/calendar/share.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Georg Ehrke <ownclouddev at georgswebsite dot de>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-$token = strip_tags($_GET['t']);
-$shared = OC_Calendar_Share::getElementByToken($token);
-if($shared['type'] == OC_Calendar_Share::CALENDAR){
-	$calendar = OC_Calendar_App::getCalendar($shared['id'], false);
-	if(!$calendar){
-		header('HTTP/1.0 404 Not Found');
-		exit;
-	}
-	header('Content-Type: text/Calendar');
-	header('Content-Disposition: inline; filename=' . str_replace(' ', '-', $calendar['displayname']) . '.ics'); 
-	echo OC_Calendar_Export::export($shared['id'], OC_Calendar_Export::CALENDAR);
-}elseif($shared['type'] == OC_Calendar_Share::EVENT){
-	$data = OC_Calendar_App::getEventObject($shared['id'], false);
-	if(!$data){
-		header('HTTP/1.0 404 Not Found');
-		exit;
-	}
-	header('Content-Type: text/Calendar');
-	header('Content-Disposition: inline; filename=' . str_replace(' ', '-', $data['summary']) . '.ics');
-	echo OC_Calendar_Export::export($shared['id'], OC_Calendar_Export::EVENT);
-}else{
-	header('HTTP/1.0 404 Not Found');
-	exit;
-}
diff --git a/apps/calendar/templates/calendar.php b/apps/calendar/templates/calendar.php
deleted file mode 100644
index 15891aafd9..0000000000
--- a/apps/calendar/templates/calendar.php
+++ /dev/null
@@ -1,57 +0,0 @@
-				<script type='text/javascript'>
-				var defaultView = '<?php echo OCP\Config::getUserValue(OCP\USER::getUser(), 'calendar', 'currentview', 'month') ?>';
-				var eventSources = <?php echo json_encode($_['eventSources']) ?>;
-				var categories = <?php echo json_encode($_['categories']); ?>;
-				var dayNames = new Array("<?php echo $l -> t("Sunday");?>", "<?php echo $l -> t("Monday");?>", "<?php echo $l -> t("Tuesday");?>", "<?php echo $l -> t("Wednesday");?>", "<?php echo $l -> t("Thursday");?>", "<?php echo $l -> t("Friday");?>", "<?php echo $l -> t("Saturday");?>");
-				var dayNamesShort = new Array("<?php echo $l -> t("Sun.");?>", "<?php echo $l -> t("Mon.");?>", "<?php echo $l -> t("Tue.");?>", "<?php echo $l -> t("Wed.");?>", "<?php echo $l -> t("Thu.");?>", "<?php echo $l -> t("Fri.");?>", "<?php echo $l -> t("Sat.");?>");
-				var monthNames = new Array("<?php echo $l -> t("January");?>", "<?php echo $l -> t("February");?>", "<?php echo $l -> t("March");?>", "<?php echo $l -> t("April");?>", "<?php echo $l -> t("May");?>", "<?php echo $l -> t("June");?>", "<?php echo $l -> t("July");?>", "<?php echo $l -> t("August");?>", "<?php echo $l -> t("September");?>", "<?php echo $l -> t("October");?>", "<?php echo $l -> t("November");?>", "<?php echo $l -> t("December");?>");
-				var monthNamesShort = new Array("<?php echo $l -> t("Jan.");?>", "<?php echo $l -> t("Feb.");?>", "<?php echo $l -> t("Mar.");?>", "<?php echo $l -> t("Apr.");?>", "<?php echo $l -> t("May.");?>", "<?php echo $l -> t("Jun.");?>", "<?php echo $l -> t("Jul.");?>", "<?php echo $l -> t("Aug.");?>", "<?php echo $l -> t("Sep.");?>", "<?php echo $l -> t("Oct.");?>", "<?php echo $l -> t("Nov.");?>", "<?php echo $l -> t("Dec.");?>");
-				var agendatime = '<?php echo ((int) OCP\Config::getUserValue(OCP\USER::getUser(), 'calendar', 'timeformat', '24') == 24 ? 'HH:mm' : 'hh:mm tt'); ?>{ - <?php echo ((int) OCP\Config::getUserValue(OCP\USER::getUser(), 'calendar', 'timeformat', '24') == 24 ? 'HH:mm' : 'hh:mm tt'); ?>}';
-				var defaulttime = '<?php echo ((int) OCP\Config::getUserValue(OCP\USER::getUser(), 'calendar', 'timeformat', '24') == 24 ? 'HH:mm' : 'hh:mm tt'); ?>';
-				var allDayText = '<?php echo addslashes($l->t('All day')) ?>';
-				var newcalendar = '<?php echo addslashes($l->t('New Calendar')) ?>';
-				var missing_field = '<?php echo addslashes($l->t('Missing fields')) ?>';
-				var missing_field_title = '<?php echo addslashes($l->t('Title')) ?>';
-				var missing_field_calendar = '<?php echo addslashes($l->t('Calendar')) ?>';
-				var missing_field_fromdate = '<?php echo addslashes($l->t('From Date')) ?>';
-				var missing_field_fromtime = '<?php echo addslashes($l->t('From Time')) ?>';
-				var missing_field_todate = '<?php echo addslashes($l->t('To Date')) ?>';
-				var missing_field_totime = '<?php echo addslashes($l->t('To Time')) ?>';
-				var missing_field_startsbeforeends = '<?php echo addslashes($l->t('The event ends before it starts')) ?>';
-				var missing_field_dberror = '<?php echo addslashes($l->t('There was a database fail')) ?>';
-				var totalurl = '<?php echo OCP\Util::linkToRemote('caldav'); ?>calendars';
-				var firstDay = '<?php echo (OCP\Config::getUserValue(OCP\USER::getUser(), 'calendar', 'firstday', 'mo') == 'mo' ? '1' : '0'); ?>';
-				$(document).ready(function() {
-				<?php
-				if(array_key_exists('showevent', $_)){
-					$data = OC_Calendar_App::getEventObject($_['showevent']);
-					$date = substr($data['startdate'], 0, 10);
-					list($year, $month, $day) = explode('-', $date);
-					echo '$(\'#calendar_holder\').fullCalendar(\'gotoDate\', ' . $year . ', ' . --$month . ', ' . $day . ');';
-					echo '$(\'#dialog_holder\').load(OC.filePath(\'calendar\', \'ajax\', \'editeventform.php\') + \'?id=\' +  ' . $_['showevent'] . ' , Calendar.UI.startEventDialog);';
-				}
-				?>
-				});
-				</script>
-				<div id="notification" style="display:none;"></div>
-				<div id="controls">
-					<form id="view">
-						<input type="button" value="<?php echo $l->t('Week');?>" id="oneweekview_radio"/>
-						<input type="button" value="<?php echo $l->t('Month');?>" id="onemonthview_radio"/>
-						<input type="button" value="<?php echo $l->t('List');?>" id="listview_radio"/>&nbsp;&nbsp;
-						<img id="loading" src="<?php echo OCP\Util::imagePath('core', 'loading.gif'); ?>" />
-					</form>
-					<form id="choosecalendar">
-						<!--<input type="button" id="today_input" value="<?php echo $l->t("Today");?>"/>-->
-						<a class="settings calendarsettings" title="<?php echo $l->t('Settings'); ?>"><img class="svg" src="<?php echo OCP\Util::imagePath('calendar', 'icon.svg'); ?>" alt="<?php echo $l->t('Settings'); ?>" /></a>
-						<a class="settings generalsettings" title="<?php echo $l->t('Settings'); ?>"><img class="svg" src="<?php echo OCP\Util::imagePath('core', 'actions/settings.svg'); ?>" alt="<?php echo $l->t('Settings'); ?>" /></a>
-					</form>
-					<form id="datecontrol">
-						<input type="button" value="&nbsp;&lt;&nbsp;" id="datecontrol_left"/>
-						<input type="button" value="" id="datecontrol_date"/>
-						<input type="button" value="&nbsp;&gt;&nbsp;" id="datecontrol_right"/>
-					</form>
-				</div>
-				<div id="fullcalendar"></div>
-				<div id="dialog_holder"></div>
-				<div id="appsettings" class="popup topright hidden"></div>
\ No newline at end of file
diff --git a/apps/calendar/templates/part.choosecalendar.php b/apps/calendar/templates/part.choosecalendar.php
deleted file mode 100644
index ad2f9e753f..0000000000
--- a/apps/calendar/templates/part.choosecalendar.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<form id="calendar">
-	<p><b><?php echo $l->t('Your calendars'); ?>:</b></p>
-	<table width="100%" style="border: 0;">
-	<?php
-	$option_calendars = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser());
-	for($i = 0; $i < count($option_calendars); $i++){
-		echo "<tr>";
-		$tmpl = new OCP\Template('calendar', 'part.choosecalendar.rowfields');
-		$tmpl->assign('calendar', $option_calendars[$i]);
-		if(OC_Calendar_Share::allUsersSharedwith($option_calendars[$i]['id'], OC_Calendar_Share::CALENDAR) == array()){
-			$shared = false;
-		}else{
-			$shared = true;
-		}
-		$tmpl->assign('shared', $shared);
-		$tmpl->printpage();
-		echo "</tr>";
-	}
-	?>
-	<tr>
-		<td colspan="6">
-			<a href="#" onclick="Calendar.UI.Calendar.newCalendar(this);"><input type="button" value="<?php echo $l->t('New Calendar') ?>"></a>
-		</td>
-	</tr>
-	<tr>
-		<td colspan="6">
-			<p style="margin: 0 auto;width: 90%;"><input style="display:none;width: 90%;float: left;" type="text" id="caldav_url" onmouseover="$('#caldav_url').select();" title="<?php echo $l->t("CalDav Link"); ?>"><img id="caldav_url_close" style="height: 20px;vertical-align: middle;display: none;" src="<?php echo OCP\Util::imagePath('core', 'actions/delete.svg') ?>" alt="close" onclick="$('#caldav_url').hide();$('#caldav_url_close').hide();"/></p>
-		</td>
-	</tr>
-	</table><br>
-	<p><b><?php echo $l->t('Shared calendars'); ?>: </b></p>
-	<table width="100%" style="border: 0;">
-	<?php
-	$share = OC_Calendar_Share::allSharedwithuser(OCP\USER::getUser(), OC_Calendar_Share::CALENDAR);
-	$count = count($share);
-	for($i = 0; $i < $count; $i++){
-		$share[$i]['calendar'] = OC_Calendar_App::getCalendar($share[$i]['calendarid'], false, false);
-		echo '<tr>';
-		$tmpl = new OCP\Template('calendar', 'part.choosecalendar.rowfields.shared');
-		$tmpl->assign('share', $share[$i]);
-		$tmpl->printpage();
-		echo '</tr>';
-	}
-	?>
-	</table>
-	<?php
-	if($count == 0){
-		echo '<p style="text-align:center;"><b>' . $l->t('No shared calendars') . '</b></p>';
-	}
-	?>
-	</fieldset>
-</form>
\ No newline at end of file
diff --git a/apps/calendar/templates/part.choosecalendar.rowfields.php b/apps/calendar/templates/part.choosecalendar.rowfields.php
deleted file mode 100644
index 64aaa79719..0000000000
--- a/apps/calendar/templates/part.choosecalendar.rowfields.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<td width="20px">
-  <input type="checkbox" id="active_<?php echo $_['calendar']['id'] ?>" onclick="Calendar.UI.Calendar.activation(this,<?php echo $_['calendar']['id'] ?>)"<?php echo $_['calendar']['active'] ? ' checked="checked"' : '' ?>>
-</td>
-<td id="<?php echo OCP\USER::getUser() ?>_<?php echo $_['calendar']['id'] ?>">
-  <label for="active_<?php echo $_['calendar']['id'] ?>"><?php echo $_['calendar']['displayname'] ?></label>
-</td>
-<td width="20px">
-  <a href="#" class="share" data-item-type="calendar" data-item="<?php echo $_['calendar']['id']; ?>" title="<?php echo $l->t('Share Calendar') ?>" class="action"><img class="svg action" src="<?php echo (!$_['shared']) ? OCP\Util::imagePath('core', 'actions/share.svg') : OCP\Util::imagePath('core', 'actions/shared.svg') ?>"></a>
-</td>
-<td width="20px">
-  <a href="#" onclick="Calendar.UI.showCalDAVUrl('<?php echo OCP\USER::getUser() ?>', '<?php echo rawurlencode(html_entity_decode($_['calendar']['uri'], ENT_QUOTES, 'UTF-8')) ?>');" title="<?php echo $l->t('CalDav Link') ?>" class="action"><img class="svg action" src="<?php echo OCP\Util::imagePath('core', 'actions/public.svg') ?>"></a>
-</td>
-<td width="20px">
-  <a href="<?php echo OCP\Util::linkTo('calendar', 'export.php') . '?calid=' . $_['calendar']['id'] ?>" title="<?php echo $l->t('Download') ?>" class="action"><img class="svg action" src="<?php echo OCP\Util::imagePath('core', 'actions/download.svg') ?>"></a>
-</td>
-<td width="20px">
-  <a href="#" onclick="Calendar.UI.Calendar.edit(this, <?php echo $_['calendar']['id'] ?>);" title="<?php echo $l->t('Edit') ?>" class="action"><img class="svg action" src="<?php echo OCP\Util::imagePath('core', 'actions/rename.svg') ?>"></a>
-</td>
-<td width="20px">
-  <a href="#" onclick="Calendar.UI.Calendar.deleteCalendar(<?php echo $_['calendar']['id'] ?>);" title="<?php echo $l->t('Delete') ?>" class="action"><img class="svg action" src="<?php echo OCP\Util::imagePath('core', 'actions/delete.svg') ?>"></a>
-</td>
diff --git a/apps/calendar/templates/part.choosecalendar.rowfields.shared.php b/apps/calendar/templates/part.choosecalendar.rowfields.shared.php
deleted file mode 100644
index 6a212858a2..0000000000
--- a/apps/calendar/templates/part.choosecalendar.rowfields.shared.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-echo '<td width="20px"><input id="active_' . $_['share']['owner'] . '_' . $_['share']['calendar']['id'] . '" type="checkbox" onClick="Calendar.UI.Share.activation(this,\'' . $_['share']['owner'] . '\',' . $_['share']['calendar']['id'] . ')"' . ($_['share']['active'] ? ' checked="checked"' : '') . '></td>';
-echo '<td><label for="active_' . $_['share']['owner'] . '_' . $_['share']['calendar']['id'] . '">' . htmlspecialchars($_['share']['calendar']['displayname']) . '</label></td>';
-echo '<td style="font-style: italic;">' .  $l->t('shared with you by') . ' ' . $_['share']['owner'] . '</td>';
\ No newline at end of file
diff --git a/apps/calendar/templates/part.editcalendar.php b/apps/calendar/templates/part.editcalendar.php
deleted file mode 100644
index b4ff573ec8..0000000000
--- a/apps/calendar/templates/part.editcalendar.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011 Bart Visscher <bartv@thisnet.nl>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-?>
-<td id="<?php echo $_['new'] ? 'new' : 'edit' ?>calendar_dialog" title="<?php echo $_['new'] ? $l->t("New calendar") : $l->t("Edit calendar"); ?>" colspan="6">
-<table width="100%" style="border: 0;">
-<tr>
-	<th><?php echo $l->t('Displayname') ?></th>
-	<td>
-		<input id="displayname_<?php echo $_['calendar']['id'] ?>" type="text" value="<?php echo $_['calendar']['displayname'] ?>">
-	</td>
-</tr>
-<?php if (!$_['new']): ?>
-<tr>
-	<td></td>
-	<td>
-		<input id="edit_active_<?php echo $_['calendar']['id'] ?>" type="checkbox"<?php echo $_['calendar']['active'] ? ' checked="checked"' : '' ?>>
-		<label for="edit_active_<?php echo $_['calendar']['id'] ?>">
-			<?php echo $l->t('Active') ?>
-		</label>
-	</td>
-</tr>
-<?php endif; ?>
-<tr>
-	<th><?php echo $l->t('Calendar color') ?></th>
-	<td>
-		<select id="calendarcolor_<?php echo $_['calendar']['id'] ?>" class="colorpicker">
-			<?php
-			if (!isset($_['calendar']['calendarcolor'])) {$_['calendar']['calendarcolor'] = false;}
-			foreach($_['calendarcolor_options'] as $color){
-				echo '<option value="' . $color . '"' . ($_['calendar']['calendarcolor'] == $color ? ' selected="selected"' : '') . '>' . $color . '</option>';
-			}
-			?>
-		</select>
-	</td>
-</tr>
-</table>
-<input style="float: left;" type="button" onclick="Calendar.UI.Calendar.submit(this, <?php echo $_['new'] ? "'new'" : $_['calendar']['id'] ?>);" value="<?php echo $_['new'] ? $l->t("Save") : $l->t("Submit"); ?>">
-<input style="float: left;" type="button" onclick="Calendar.UI.Calendar.cancel(this, <?php echo $_['new'] ? "'new'" : $_['calendar']['id'] ?>);" value="<?php echo $l->t("Cancel"); ?>">
-</td>
diff --git a/apps/calendar/templates/part.editevent.php b/apps/calendar/templates/part.editevent.php
deleted file mode 100644
index ea91192cc6..0000000000
--- a/apps/calendar/templates/part.editevent.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<div id="event" title="<?php echo $l->t("Edit an event");?>">
-	<form id="event_form">
-		<input type="hidden" name="id" value="<?php echo $_['eventid'] ?>">
-		<input type="hidden" name="lastmodified" value="<?php echo $_['lastmodified'] ?>">
-<?php echo $this->inc("part.eventform"); ?>
-	<div style="width: 100%;text-align: center;color: #FF1D1D;" id="errorbox"></div>
-	<span id="actions">
-		<input type="button" class="submit" style="float: left;" value="<?php echo $l->t("Submit");?>" onclick="Calendar.UI.validateEventForm('<?php echo OCP\Util::linkTo('calendar', 'ajax/event/edit.php') ?>');">
-		<input type="button" class="submit" style="float: left;" name="delete" value="<?php echo $l->t("Delete");?>" onclick="Calendar.UI.submitDeleteEventForm('<?php echo OCP\Util::linkTo('calendar', 'ajax/event/delete.php') ?>');">
-		<input type="button" class="submit" style="float: right;" name="export" value="<?php echo $l->t("Export");?>" onclick="window.location='<?php echo OCP\Util::linkTo('calendar', 'export.php') ?>?eventid=<?php echo $_['eventid'] ?>';">
-	</span>
-	</form>
-</div>
diff --git a/apps/calendar/templates/part.eventform.php b/apps/calendar/templates/part.eventform.php
deleted file mode 100644
index 95eecf2622..0000000000
--- a/apps/calendar/templates/part.eventform.php
+++ /dev/null
@@ -1,251 +0,0 @@
-<script type="text/javascript">
-<?php
-echo 'Calendar.UI.Share.idtype = "event";' . "\n" . 'Calendar.UI.Share.currentid = "' . $_['eventid'] . '";';
-?>
-</script>
-
-<ul>
-	<li><a href="#tabs-1"><?php echo $l->t('Eventinfo'); ?></a></li>
-	<li><a href="#tabs-2"><?php echo $l->t('Repeating'); ?></a></li>
-	<!--<li><a href="#tabs-3"><?php echo $l->t('Alarm'); ?></a></li>
-	<li><a href="#tabs-4"><?php echo $l->t('Attendees'); ?></a></li>-->
-	<?php if($_['access'] == 'owner' && $_['eventid'] != 'new') { ?>
-	<li><a href="#tabs-5"><?php echo $l->t('Share'); ?></a></li>
-	<?php } ?>
-</ul>
-<div id="tabs-1">
-	<table width="100%">
-		<tr>
-			<th width="75px"><?php echo $l->t("Title");?>:</th>
-			<td>
-				<input type="text" style="width:350px;" size="100" placeholder="<?php echo $l->t("Title of the Event");?>" value="<?php echo isset($_['title']) ? $_['title'] : '' ?>" maxlength="100" name="title"/>
-			</td>
-		</tr>
-	</table>
-	<table width="100%">
-		<tr>
-			<th width="75px"><?php echo $l->t("Category");?>:</th>
-			<td>
-				<input id="category" name="categories" type="text" placeholder="<?php echo $l->t('Separate categories with commas'); ?>" value="<?php echo isset($_['categories']) ? $_['categories'] : '' ?>">
-				<a class="action edit" onclick="$(this).tipsy('hide');OCCategories.edit();" title="<?php echo $l->t('Edit categories'); ?>"><img alt="<?php echo $l->t('Edit categories'); ?>" src="<?php echo OCP\image_path('core','actions/rename.svg')?>" class="svg action" style="width: 16px; height: 16px;"></a>
-			</td>
-			<?php if(count($_['calendar_options']) > 1) { ?>
-			<th width="75px">&nbsp;&nbsp;&nbsp;<?php echo $l->t("Calendar");?>:</th>
-			<td>
-				<select style="width:140px;" name="calendar">
-					<?php
-					if (!isset($_['calendar'])) {$_['calendar'] = false;}
-					echo OCP\html_select_options($_['calendar_options'], $_['calendar'], array('value'=>'id', 'label'=>'displayname'));
-					?>
-				</select>
-			</td>
-			<?php } else { ?>
-			<th width="75px">&nbsp;</th>
-			<td>
-				<input type="hidden" name="calendar" value="<?php echo $_['calendar_options'][0]['id']; ?>">
-			</td>
-			<?php } ?>
-		</tr>
-	</table>
-	<hr>
-	<table width="100%">
-		<tr>
-			<th width="75px"></th>
-			<td>
-				<input onclick="Calendar.UI.lockTime();" type="checkbox"<?php if($_['allday']){echo 'checked="checked"';} ?> id="allday_checkbox" name="allday">
-				<label for="allday_checkbox"><?php echo $l->t("All Day Event");?></label>
-			</td>
-		</tr>
-		<tr>
-			<th width="75px"><?php echo $l->t("From");?>:</th>
-			<td>
-				<input type="text" value="<?php echo $_['startdate'];?>" name="from" id="from">
-				&nbsp;&nbsp;
-				<input type="time" value="<?php echo $_['starttime'];?>" name="fromtime" id="fromtime">
-			</td>
-		</tr>
-		<tr>
-			<th width="75px"><?php echo $l->t("To");?>:</th>
-			<td>
-				<input type="text" value="<?php echo $_['enddate'];?>" name="to" id="to">
-				&nbsp;&nbsp;
-				<input type="time" value="<?php echo $_['endtime'];?>" name="totime" id="totime">
-			</td>
-		</tr>
-	</table>
-	<input type="button" class="submit" value="<?php echo $l->t("Advanced options"); ?>" onclick="Calendar.UI.showadvancedoptions();" id="advanced_options_button">
-	<div id="advanced_options" style="display: none;">
-		<hr>
-		<table>
-			<tr>
-				<th width="85px"><?php echo $l->t("Location");?>:</th>
-				<td>
-					<input type="text" style="width:350px;" size="100" placeholder="<?php echo $l->t("Location of the Event");?>" value="<?php echo isset($_['location']) ? $_['location'] : '' ?>" maxlength="100"  name="location" />
-				</td>
-			</tr>
-		</table>
-		<table>
-			<tr>
-				<th width="85px" style="vertical-align: top;"><?php echo $l->t("Description");?>:</th>
-				<td>
-					<textarea style="width:350px;height: 150px;" placeholder="<?php echo $l->t("Description of the Event");?>" name="description"><?php echo isset($_['description']) ? $_['description'] : '' ?></textarea>
-				</td>
-			</tr>
-		</table>
-	</div>
-	</div>
-<div id="tabs-2">
-	<table style="width:100%">
-			<tr>
-				<th width="75px"><?php echo $l->t("Repeat");?>:</th>
-				<td>
-				<select id="repeat" name="repeat">
-					<?php
-					echo OCP\html_select_options($_['repeat_options'], $_['repeat']);
-					?>
-				</select></td>
-				<td><input type="button" style="float:right;" class="submit" value="<?php echo $l->t("Advanced"); ?>" onclick="Calendar.UI.showadvancedoptionsforrepeating();" id="advanced_options_button"></td>
-			</tr>
-		</table>
-		<div id="advanced_options_repeating" style="display:none;">
-			<table style="width:100%">
-				<tr id="advanced_month" style="display:none;">
-					<th width="75px"></th>
-					<td>
-						<select id="advanced_month_select" name="advanced_month_select">
-							<?php
-							echo OCP\html_select_options($_['repeat_month_options'], $_['repeat_month']);
-							?>
-						</select>
-					</td>
-				</tr>
-			</table>
-			<table style="width:100%">
-				<tr id="advanced_year" style="display:none;">
-					<th width="75px"></th>
-					<td>
-						<select id="advanced_year_select" name="advanced_year_select">
-							<?php
-							echo OCP\html_select_options($_['repeat_year_options'], $_['repeat_year']);
-							?>
-						</select>
-					</td>
-				</tr>
-			</table>
-			<table style="width:100%">
-				<tr id="advanced_weekofmonth" style="display:none;">
-					<th width="75px"></th>
-					<td id="weekofmonthcheckbox">
-						<select id="weekofmonthoptions" name="weekofmonthoptions">
-							<?php
-							echo OCP\html_select_options($_['repeat_weekofmonth_options'], $_['repeat_weekofmonth']);
-							?>
-						</select>
-					</td>
-				</tr>
-			</table>
-			<table style="width:100%">
-				<tr id="advanced_weekday" style="display:none;">
-					<th width="75px"></th>
-					<td id="weeklycheckbox">
-						<select id="weeklyoptions" name="weeklyoptions[]" multiple="multiple" style="width: 150px;" title="<?php echo $l->t("Select weekdays") ?>">
-							<?php
-							if (!isset($_['weekdays'])) {$_['weekdays'] = array();}
-							echo OCP\html_select_options($_['repeat_weekly_options'], $_['repeat_weekdays'], array('combine'=>true));
-							?>
-						</select>
-					</td>
-				</tr>
-			</table>
-			<table style="width:100%">
-				<tr id="advanced_byyearday" style="display:none;">
-					<th width="75px"></th>
-					<td id="byyeardaycheckbox">
-						<select id="byyearday" name="byyearday[]" multiple="multiple" title="<?php echo $l->t("Select days") ?>">
-							<?php
-							if (!isset($_['repeat_byyearday'])) {$_['repeat_byyearday'] = array();}
-							echo OCP\html_select_options($_['repeat_byyearday_options'], $_['repeat_byyearday'], array('combine'=>true));
-							?>
-						</select><?php echo $l->t('and the events day of year.'); ?>
-					</td>
-				</tr>
-			</table>
-			<table style="width:100%">
-				<tr id="advanced_bymonthday" style="display:none;">
-					<th width="75px"></th>
-					<td id="bymonthdaycheckbox">
-						<select id="bymonthday" name="bymonthday[]" multiple="multiple" title="<?php echo $l->t("Select days") ?>">
-							<?php
-							if (!isset($_['repeat_bymonthday'])) {$_['repeat_bymonthday'] = array();}
-							echo OCP\html_select_options($_['repeat_bymonthday_options'], $_['repeat_bymonthday'], array('combine'=>true));
-							?>
-						</select><?php echo $l->t('and the events day of month.'); ?>
-					</td>
-				</tr>
-			</table>
-			<table style="width:100%">
-				<tr id="advanced_bymonth" style="display:none;">
-					<th width="75px"></th>
-					<td id="bymonthcheckbox">
-						<select id="bymonth" name="bymonth[]" multiple="multiple" title="<?php echo $l->t("Select months") ?>">
-							<?php
-							if (!isset($_['repeat_bymonth'])) {$_['repeat_bymonth'] = array();}
-							echo OCP\html_select_options($_['repeat_bymonth_options'], $_['repeat_bymonth'], array('combine'=>true));
-							?>
-						</select>
-					</td>
-				</tr>
-			</table>
-			<table style="width:100%">
-				<tr id="advanced_byweekno" style="display:none;">
-					<th width="75px"></th>
-					<td id="bymonthcheckbox">
-						<select id="byweekno" name="byweekno[]" multiple="multiple" title="<?php echo $l->t("Select weeks") ?>">
-							<?php
-							if (!isset($_['repeat_byweekno'])) {$_['repeat_byweekno'] = array();}
-							echo OCP\html_select_options($_['repeat_byweekno_options'], $_['repeat_byweekno'], array('combine'=>true));
-							?>
-						</select><?php echo $l->t('and the events week of year.'); ?>
-					</td>
-				</tr>
-			</table>
-			<table style="width:100%">
-				<tr>
-					<th width="75px"><?php echo $l->t('Interval'); ?>:</th>
-					<td>
-						<input style="width:350px;" type="number" min="1" size="4" max="1000" value="<?php echo isset($_['repeat_interval']) ? $_['repeat_interval'] : '1'; ?>" name="interval">
-					</td>
-				</tr>
-				<tr>
-					<th width="75px"><?php echo $l->t('End'); ?>:</th>
-					<td>
-						<select id="end" name="end">
-							<?php
-							if($_['repeat_end'] == '') $_['repeat_end'] = 'never';
-							echo OCP\html_select_options($_['repeat_end_options'], $_['repeat_end']); 
-							?>
-						</select>
-					</td>
-				</tr>
-				<tr>
-					<th></th>
-					<td id="byoccurrences" style="display:none;">
-						<input type="number" min="1" max="99999" id="until_count" name="byoccurrences" value="<?php echo $_['repeat_count']; ?>"><?php echo $l->t('occurrences'); ?>
-					</td>
-				</tr>
-				<tr>
-					<th></th>
-					<td id="bydate" style="display:none;">
-						<input type="text" name="bydate" value="<?php echo $_['repeat_date']; ?>">
-					</td>
-				</tr>
-			</table>
-		</div>
-</div>
-<!--<div id="tabs-3">//Alarm</div>
-<div id="tabs-4">//Attendees</div>-->
-<?php if($_['access'] == 'owner') { ?>
-<div id="tabs-5">
-	<?php if($_['eventid'] != 'new'){ echo $this->inc('share.dropdown'); } ?>
-</div>
-<?php } ?>
diff --git a/apps/calendar/templates/part.import.php b/apps/calendar/templates/part.import.php
deleted file mode 100644
index 2ce3cc3423..0000000000
--- a/apps/calendar/templates/part.import.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-//Prerendering for iCalendar file
-$file = OC_Filesystem::file_get_contents($_['path'] . '/' . $_['filename']);
-if(!$file){
-	OCP\JSON::error(array('error'=>'404'));
-}
-$import = new OC_Calendar_Import($file);
-$import->setUserID(OCP\User::getUser());
-$newcalendarname = strip_tags($import->createCalendarName());
-$guessedcalendarname = strip_tags($import->guessCalendarName());
-$calendarcolor = strip_tags($import->createCalendarColor());
-//loading calendars for select box
-$calendar_options = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser());
-$calendar_options[] = array('id'=>'newcal', 'displayname'=>$l->t('create a new calendar'));
-$defaultcolors = OC_Calendar_Calendar::getCalendarColorOptions();
-?>
-<div id="calendar_import_dialog" title="<?php echo $l->t("Import a calendar file");?>">
-<div id="calendar_import_form">
-	<form>
-		<input type="hidden" id="calendar_import_filename" value="<?php echo $_['filename'];?>">
-		<input type="hidden" id="calendar_import_path" value="<?php echo $_['path'];?>">
-		<input type="hidden" id="calendar_import_progresskey" value="<?php echo rand() ?>">
-		<input type="hidden" id="calendar_import_availablename" value="<?php echo $newcalendarname ?>">
-		<div id="calendar_import_form_message"><?php echo $l->t('Please choose a calendar'); ?></div>
-		<select style="width:100%;" id="calendar_import_calendar" name="calendar_import_calendar">
-		<?php
-		for($i = 0;$i<count($calendar_options);$i++){
-			$calendar_options[$i]['displayname'] = $calendar_options[$i]['displayname'];
-		}
-		echo OCP\html_select_options($calendar_options, $calendar_options[0]['id'], array('value'=>'id', 'label'=>'displayname'));
-		?>
-		</select>
-		<br><br>
-		<div id="calendar_import_newcalform">
-			<input id="calendar_import_newcalendar_color" class="color-picker" type="hidden" size="6" value="<?php echo substr($calendarcolor,1); ?>">
-			<input id="calendar_import_newcalendar"  class="" type="text" placeholder="<?php echo $l->t('Name of new calendar'); ?>" value="<?php echo $guessedcalendarname ?>"><br>
-			<div id="calendar_import_defaultcolors">
-				<?php
-				foreach($defaultcolors as $color){
-					echo '<span class="calendar-colorpicker-color" rel="' . $color . '" style="background-color: ' . $color .  ';"></span>';
-				}
-				?>
-			</div>
-			<!--<input id="calendar_import_generatename" type="button" class="button" value="<?php echo $l->t('Take an available name!'); ?>"><br>-->
-			<div  id="calendar_import_mergewarning" class="hint"><?php echo $l->t('A Calendar with this name already exists. If you continue anyhow, these calendars will be merged.'); ?></div>
-		</div>
-		<input id="calendar_import_submit" type="button" class="button" value="&raquo; <?php echo $l->t('Import'); ?> &raquo;" id="startimport">
-	<form>
-</div>
-<div id="calendar_import_process">
-	<div id="calendar_import_process_message"></div>
-	<div  id="calendar_import_progressbar"></div>
-	<br>
-	<div id="calendar_import_status" class="hint"></div>
-	<br>
-	<input id="calendar_import_done" type="button" value="<?php echo $l->t('Close Dialog'); ?>">
-</div>
-</div>
\ No newline at end of file
diff --git a/apps/calendar/templates/part.newevent.php b/apps/calendar/templates/part.newevent.php
deleted file mode 100644
index a4f48aecbc..0000000000
--- a/apps/calendar/templates/part.newevent.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<div id="event" title="<?php echo $l->t("Create a new event");?>">
-	<form id="event_form">
-<?php echo $this->inc("part.eventform"); ?>
-	<div style="width: 100%;text-align: center;color: #FF1D1D;" id="errorbox"></div>
-	<span id="actions">
-		<input type="button" class="submit" style="float: left;" value="<?php echo $l->t("Submit");?>" onclick="Calendar.UI.validateEventForm('<?php echo OCP\Util::linkTo('calendar', 'ajax/event/new.php') ?>');">
-	</span>
-	</form>
-</div>
diff --git a/apps/calendar/templates/part.showevent.php b/apps/calendar/templates/part.showevent.php
deleted file mode 100644
index 59684d831e..0000000000
--- a/apps/calendar/templates/part.showevent.php
+++ /dev/null
@@ -1,243 +0,0 @@
-<div id="event" title="<?php echo $l->t("View an event");?>">
-<ul>
-	<li><a href="#tabs-1"><?php echo $l->t('Eventinfo'); ?></a></li>
-	<li><a href="#tabs-2"><?php echo $l->t('Repeating'); ?></a></li>
-	<!--<li><a href="#tabs-3"><?php echo $l->t('Alarm'); ?></a></li>
-	<li><a href="#tabs-4"><?php echo $l->t('Attendees'); ?></a></li>-->
-</ul>
-<div id="tabs-1">
-	<table width="100%">
-		<tr>
-			<th width="75px"><?php echo $l->t("Title");?>:</th>
-			<td>
-				<?php echo isset($_['title']) ? $_['title'] : '' ?>
-			</td>
-		</tr>
-	</table>
-	<table width="100%">
-		<tr>
-			<th width="75px"><?php echo $l->t("Category");?>:</th>
-			<td>
-				<?php
-				if(count($_['categories']) == 0 || $_['categories'] == ''){
-					echo $l->t('No categories selected');
-				}else{
-					echo '<ul>';
-					foreach($_['categories'] as $categorie){
-						echo '<li>' . $categorie . '</li>';
-					}
-					echo '</ul>';
-				}
-				?>
-			</td>
-			<th width="75px">&nbsp;&nbsp;&nbsp;<?php echo $l->t("Calendar");?>:</th>
-			<td>
-			<?php
-			$calendar = OC_Calendar_App::getCalendar($_['calendar'], false, false);
-			echo $calendar['displayname'] . ' ' . $l->t('of') . ' ' . $calendar['userid'];
-			?>
-			</td>
-			<th width="75px">&nbsp;</th>
-			<td>
-				<input type="hidden" name="calendar" value="<?php echo $_['calendar_options'][0]['id'] ?>">
-			</td>
-		</tr>
-	</table>
-	<hr>
-	<table width="100%">
-		<tr>
-			<th width="75px"></th>
-			<td>
-				<input onclick="Calendar.UI.lockTime();" type="checkbox"<?php if($_['allday']){echo 'checked="checked"';} ?> id="allday_checkbox" name="allday" disabled="disabled">
-				<?php echo $l->t("All Day Event");?>
-			</td>
-		</tr>
-		<tr>
-			<th width="75px"><?php echo $l->t("From");?>:</th>
-			<td>
-				<?php echo $_['startdate'];?>
-				&nbsp;&nbsp; <?php echo (!$_['allday'])?$l->t('at'):''; ?> &nbsp;&nbsp;
-				<?php echo $_['starttime'];?>
-			</td>
-		</tr>
-		<tr>
-			<th width="75px"><?php echo $l->t("To");?>:</th>
-			<td>
-				<?php echo $_['enddate'];?>
-				&nbsp;&nbsp; <?php echo (!$_['allday'])?$l->t('at'):''; ?> &nbsp;&nbsp;
-				<?php echo $_['endtime'];?>
-			</td>
-		</tr>
-	</table>
-	<input type="button" class="submit" value="<?php echo $l->t("Advanced options"); ?>" onclick="Calendar.UI.showadvancedoptions();" id="advanced_options_button">
-	<div id="advanced_options" style="display: none;">
-		<hr>
-		<table>
-			<tr>
-				<th width="85px"><?php echo $l->t("Location");?>:</th>
-				<td>
-					<?php echo isset($_['location']) ? $_['location'] : '' ?>
-				</td>
-			</tr>
-		</table>
-		<table>
-			<tr>
-				<th width="85px" style="vertical-align: top;"><?php echo $l->t("Description");?>:</th>
-				<td>
-					<?php echo isset($_['description']) ? $_['description'] : '' ?></textarea>
-			</tr>
-		</table>
-	</div>
-	</div>
-<div id="tabs-2">
-	<table style="width:100%">
-			<tr>
-				<th width="75px"><?php echo $l->t("Repeat");?>:</th>
-				<td>
-				<select id="repeat" name="repeat">
-					<?php
-					echo OCP\html_select_options(array($_['repeat_options'][$_['repeat']]), $_['repeat']);
-					?>
-				</select></td>
-				<td><input type="button" style="float:right;" class="submit" value="<?php echo $l->t("Advanced"); ?>" onclick="Calendar.UI.showadvancedoptionsforrepeating();" id="advanced_options_button"></td>
-			</tr>
-		</table>
-		<div id="advanced_options_repeating" style="display:none;">
-			<table style="width:100%">
-				<tr id="advanced_month" style="display:none;">
-					<th width="75px"></th>
-					<td>
-						<select id="advanced_month_select" name="advanced_month_select">
-							<?php
-							echo OCP\html_select_options(array($_['repeat_month_options'][$_['repeat_month']]), $_['repeat_month']);
-							?>
-						</select>
-					</td>
-				</tr>
-			</table>
-			<table style="width:100%">
-				<tr id="advanced_year" style="display:none;">
-					<th width="75px"></th>
-					<td>
-						<select id="advanced_year_select" name="advanced_year_select">
-							<?php
-							echo OCP\html_select_options(array($_['repeat_year_options'][$_['repeat_year']]), $_['repeat_year']);
-							?>
-						</select>
-					</td>
-				</tr>
-			</table>
-			<table style="width:100%">
-				<tr id="advanced_weekofmonth" style="display:none;">
-					<th width="75px"></th>
-					<td id="weekofmonthcheckbox">
-						<select id="weekofmonthoptions" name="weekofmonthoptions">
-							<?php
-							echo OCP\html_select_options(array($_['repeat_weekofmonth_options'][$_['repeat_weekofmonth']]), $_['repeat_weekofmonth']);
-							?>
-						</select>
-					</td>
-				</tr>
-			</table>
-			<table style="width:100%">
-				<tr id="advanced_weekday" style="display:none;">
-					<th width="75px"></th>
-					<td id="weeklycheckbox">
-						<select id="weeklyoptions" name="weeklyoptions[]" multiple="multiple" style="width: 150px;" title="<?php echo $l->t("Select weekdays") ?>">
-							<?php
-							if (!isset($_['weekdays'])) {$_['weekdays'] = array();}
-							echo OCP\html_select_options(array($_['repeat_weekly_options'][$_['repeat_weekdays']]), $_['repeat_weekdays'], array('combine'=>true));
-							?>
-						</select>
-					</td>
-				</tr>
-			</table>
-			<table style="width:100%">
-				<tr id="advanced_byyearday" style="display:none;">
-					<th width="75px"></th>
-					<td id="byyeardaycheckbox">
-						<select id="byyearday" name="byyearday[]" multiple="multiple" title="<?php echo $l->t("Select days") ?>">
-							<?php
-							if (!isset($_['repeat_byyearday'])) {$_['repeat_byyearday'] = array();}
-							echo OCP\html_select_options(array($_['repeat_byyearday_options'][$_['repeat_byyearday']]), $_['repeat_byyearday'], array('combine'=>true));
-							?>
-						</select><?php echo $l->t('and the events day of year.'); ?>
-					</td>
-				</tr>
-			</table>
-			<table style="width:100%">
-				<tr id="advanced_bymonthday" style="display:none;">
-					<th width="75px"></th>
-					<td id="bymonthdaycheckbox">
-						<select id="bymonthday" name="bymonthday[]" multiple="multiple" title="<?php echo $l->t("Select days") ?>">
-							<?php
-							if (!isset($_['repeat_bymonthday'])) {$_['repeat_bymonthday'] = array();}
-							echo OCP\html_select_options(array($_['repeat_bymonthday_options'][$_['repeat_bymonthday']]), $_['repeat_bymonthday'], array('combine'=>true));
-							?>
-						</select><?php echo $l->t('and the events day of month.'); ?>
-					</td>
-				</tr>
-			</table>
-			<table style="width:100%">
-				<tr id="advanced_bymonth" style="display:none;">
-					<th width="75px"></th>
-					<td id="bymonthcheckbox">
-						<select id="bymonth" name="bymonth[]" multiple="multiple" title="<?php echo $l->t("Select months") ?>">
-							<?php
-							if (!isset($_['repeat_bymonth'])) {$_['repeat_bymonth'] = array();}
-							echo OCP\html_select_options(array($_['repeat_bymonth_options'][$_['repeat_bymonth']]), $_['repeat_bymonth'], array('combine'=>true));
-							?>
-						</select>
-					</td>
-				</tr>
-			</table>
-			<table style="width:100%">
-				<tr id="advanced_byweekno" style="display:none;">
-					<th width="75px"></th>
-					<td id="bymonthcheckbox">
-						<select id="byweekno" name="byweekno[]" multiple="multiple" title="<?php echo $l->t("Select weeks") ?>">
-							<?php
-							if (!isset($_['repeat_byweekno'])) {$_['repeat_byweekno'] = array();}
-							echo OCP\html_select_options(array($_['repeat_byweekno_options'][$_['repeat_byweekno']]), $_['repeat_byweekno'], array('combine'=>true));
-							?>
-						</select><?php echo $l->t('and the events week of year.'); ?>
-					</td>
-				</tr>
-			</table>
-			<table style="width:100%">
-				<tr>
-					<th width="75px"><?php echo $l->t('Interval'); ?>:</th>
-					<td>
-						<?php echo isset($_['repeat_interval']) ? $_['repeat_interval'] : '1'; ?>
-					</td>
-				</tr>
-				<tr>
-					<th width="75px"><?php echo $l->t('End'); ?>:</th>
-					<td>
-						<select id="end" name="end">
-							<?php
-							if($_['repeat_end'] == '') $_['repeat_end'] = 'never';
-							echo OCP\html_select_options(array($_['repeat_end_options'][$_['repeat_end']]), $_['repeat_end']); 
-							?>
-						</select>
-					</td>
-				</tr>
-				<tr>
-					<th></th>
-					<td id="byoccurrences" style="display:none;">
-						<?php echo $_['repeat_count'] . ' ' . $l->t('occurrences'); ?>
-					</td>
-				</tr>
-				<tr>
-					<th></th>
-					<td id="bydate" style="display:none;">
-						<?php echo $_['repeat_date']; ?>
-					</td>
-				</tr>
-			</table>
-		</div>
-</div>
-<!--<div id="tabs-3">//Alarm</div>
-<div id="tabs-4">//Attendees</div>-->
-
-</div>
\ No newline at end of file
diff --git a/apps/calendar/templates/settings.php b/apps/calendar/templates/settings.php
deleted file mode 100644
index 56a6a42ee0..0000000000
--- a/apps/calendar/templates/settings.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011 Bart Visscher <bartv@thisnet.nl>
- * Copyright (c) 2012 Georg Ehrke <ownclouddev at georgswebsite dot de>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-?>
-<h2 id="title_general"><?php echo $l->t('General'); ?></h2>
-<div id="general">
-	<table class="nostyle">
-		<tr>
-			<td>
-				<label for="timezone" class="bold"><?php echo $l->t('Timezone');?></label>
-				&nbsp;&nbsp;
-			</td>
-			<td>
-				<select style="display: none;" id="timezone" name="timezone">
-				<?php
-				$continent = '';
-				foreach($_['timezones'] as $timezone):
-					$ex=explode('/', $timezone, 2);//obtain continent,city
-					if (!isset($ex[1])) {
-						$ex[1] = $ex[0];
-						$ex[0] = "Other";
-					}
-					if ($continent!=$ex[0]):
-						if ($continent!="") echo '</optgroup>';
-						echo '<optgroup label="'.$ex[0].'">';
-					endif;
-					$city=strtr($ex[1], '_', ' ');
-					$continent=$ex[0];
-					echo '<option value="'.$timezone.'"'.($_['timezone'] == $timezone?' selected="selected"':'').'>'.$city.'</option>';
-					var_dump($_['timezone']);
-				endforeach;?>
-				</select>
-			</td>
-		</tr>
-		<tr>
-			<td>
-				&nbsp;&nbsp;
-			</td>
-			<td>
-				<input type="checkbox" name="timezonedetection" id="timezonedetection">
-				&nbsp;
-				<label for="timezonedetection"><?php echo $l->t('Update timezone automatically'); ?></label>
-			</td>
-		</tr>
-		<tr>
-			<td>
-				<label for="timeformat" class="bold"><?php echo $l->t('Time format');?></label>
-				&nbsp;&nbsp;
-			</td>
-			<td>
-				<select style="display: none; width: 60px;" id="timeformat" title="<?php echo "timeformat"; ?>" name="timeformat">
-					<option value="24" id="24h"><?php echo $l->t("24h"); ?></option>
-					<option value="ampm" id="ampm"><?php echo $l->t("12h"); ?></option>
-				</select>
-			</td>
-		</tr>
-		<tr>
-			<td>
-				<label for="firstday" class="bold"><?php echo $l->t('Start week on');?></label>
-				&nbsp;&nbsp;
-			</td>
-			<td>
-				<select style="display: none;" id="firstday" title="<?php echo "First day"; ?>" name="firstday">
-					<option value="mo" id="mo"><?php echo $l->t("Monday"); ?></option>
-					<option value="su" id="su"><?php echo $l->t("Sunday"); ?></option>
-				</select>
-			</td>
-		</tr>
-		<tr class="advancedsettings">
-			<td>
-				<label for="" class="bold"><?php echo $l->t('Cache');?></label>
-				&nbsp;&nbsp;
-			</td>
-			<td>
-				<input id="cleancalendarcache" type="button" class="button" value="<?php echo $l->t('Clear cache for repeating events');?>">
-			</td>
-		</tr>
-	</table>
-</div>
-<h2 id="title_urls"><?php echo $l->t('URLs'); ?></h2>
-<div id="urls">
-		<?php echo $l->t('Calendar CalDAV syncing addresses'); ?> (<a href="http://owncloud.org/synchronisation/" target="_blank"><?php echo $l->t('more info'); ?></a>)
-		<dl>
-		<dt><?php echo $l->t('Primary address (Kontact et al)'); ?></dt>
-		<dd><code><?php echo OCP\Util::linkToRemote('caldav'); ?></code></dd>
-		<dt><?php echo $l->t('iOS/OS X'); ?></dt>
-		<dd><code><?php echo OCP\Util::linkToRemote('caldav'); ?>principals/<?php echo OCP\USER::getUser(); ?></code>/</dd>
-		<dt><?php echo $l->t('Read only iCalendar link(s)'); ?></dt>
-		<dd>
-			<?php foreach($_['calendars'] as $calendar) { ?>
-			<a href="<?php echo OCP\Util::linkToRemote('caldav').'calendars/'.OCP\USER::getUser().'/'.rawurlencode($calendar['uri']) ?>?export"><?php echo $calendar['displayname'] ?></a><br />
-			<?php } ?>
-		</dd>
-		</dl>
-	</div>
-</div>
\ No newline at end of file
diff --git a/apps/calendar/templates/share.dropdown.php b/apps/calendar/templates/share.dropdown.php
deleted file mode 100644
index 391ae83765..0000000000
--- a/apps/calendar/templates/share.dropdown.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-if(array_key_exists('calid', $_)){
-	$id = $_['calid'];
-	$sharedelements = OC_Calendar_Share::allUsersSharedwith($_['calid'], OC_Calendar_Share::CALENDAR);
-}else{
-	$sharedelements = OC_Calendar_Share::allUsersSharedwith($_['eventid'], OC_Calendar_Share::EVENT);
-	$id = $_['eventid'];
-}
-$users = array();$groups = array();$public = array();
-foreach($sharedelements as $sharedelement){
-	if($sharedelement['sharetype'] == 'user'){
-		$users[] = $sharedelement;
-	}elseif($sharedelement['sharetype'] == 'group'){
-		$groups[] = $sharedelement;
-	}elseif($sharedelement['sharetype'] == 'public'){
-		$public = $sharedelement;
-	}
-}
-?>
-<strong><?php echo $l->t('Users');?>:</strong><br>
-<select id="share_user" title="<?php echo $l->t('select users');?>" data-placeholder="<?php echo $l->t('select users'); ?>">
-<option value=""></option>
-<?php
-$allocusers = OCP\USER::getUsers();
-$allusers = array();
-foreach($allocusers as $ocuser){
-	$allusers[$ocuser] = $ocuser;
-}
-unset($allusers[OCP\USER::getUser()]);
-$allusers = array_flip($allusers);
-echo OCP\html_select_options($allusers, array());
-?>
-</select><br>
-<ul id="sharewithuser_list">
-<?php foreach($users as $user): ?>
-	<li id="sharewithuser_<?php echo $user['share']; ?>"><input type="checkbox" width="12px" <?php echo ($user['permissions']?'checked="checked"':'')?> style="visibility:hidden;" title="<?php echo $l->t('Editable'); ?>"><?php echo $user['share']; ?><img src="<?php echo OCP\Util::imagePath('core', 'actions/delete.svg'); ?>" class="svg action" style="display:none;float:right;"></li>
-	<script>
-		$('#sharewithuser_<?php echo $user['share']; ?> > img').click(function(){
-			$('#share_user option[value="<?php echo $user['share']; ?>"]').removeAttr('disabled');
-			Calendar.UI.Share.unshare(<?php echo $id; ?>, '<?php echo (array_key_exists('calid', $_)?'calendar':'event');?>', '<?php echo $user['share']; ?>', 'user');
-			$('#sharewithuser_<?php echo $user['share']; ?>').remove();
-			$("#share_user").trigger("liszt:updated");
-		});
-		$('#share_user option[value="<?php echo $user['share']; ?>"]').attr('disabled', 'disabled');
-	</script>
-<?php endforeach; ?>
-</ul>
-<strong><?php echo $l->t('Groups');?>:</strong><br>
-<select id="share_group" title="<?php echo $l->t('select groups');?>" data-placeholder="<?php echo $l->t('select groups'); ?>">
-<option value=""></option> 
-<?php
-$allocgroups = OC_Group::getGroups();
-$allgroups = array();
-foreach($allocgroups as $ocgroup){
-	$allgroups[$ocgroup] = $ocgroup;
-}
-echo OCP\html_select_options($allgroups, array());
-?>
-</select><br>
-<ul id="sharewithgroup_list">
-<?php foreach($groups as $group): ?>
-	<li id="sharewithgroup_<?php echo $group['share']; ?>"><input type="checkbox" width="12px" <?php echo ($group['permissions']?'checked="checked"':'')?> style="visibility:hidden;" title="<?php echo $l->t('Editable'); ?>"><?php echo $group['share']; ?><img src="<?php echo OCP\Util::imagePath('core', 'actions/delete.svg'); ?>" class="svg action" style="display:none;float:right;"></li>
-	<script>
-		$('#sharewithgroup_<?php echo $group['share']; ?> > img').click(function(){
-			$('#share_group option[value="<?php echo $group['share']; ?>"]').removeAttr('disabled');
-			Calendar.UI.Share.unshare(<?php echo $id; ?>, '<?php echo (array_key_exists('calid', $_)?'calendar':'event');?>', '<?php echo $group['share']; ?>', 'group');
-			$('#sharewithgroup_<?php echo $group['share']; ?>').remove();
-			$("#share_group").trigger("liszt:updated");
-		});
-		$('#share_group option[value="<?php echo $group['share']; ?>"]').attr('disabled', 'disabled');
-	</script>
-<?php endforeach; ?>
-</ul>
-<div id="public">
-	<input type="checkbox" id="publish" <?php echo (array_key_exists('share', $public))?'checked="checked"':'' ?>><label for="publish"><?php echo $l->t('make public'); ?></label><br>
-	<input type="text" id="public_token" value="<?php if(array_key_exists('share', $public)){echo OCP\Util::linkToAbsolute('', 'public.php').'?service=calendar&t=' . $public['share']; } ?>" onmouseover="$('#public_token').select();" style="<?php echo (!array_key_exists('share', $public))?'display:none':'' ?>">
-</div>
\ No newline at end of file
diff --git a/apps/contacts/ajax/addressbook/activate.php b/apps/contacts/ajax/addressbook/activate.php
deleted file mode 100644
index a8dec21dac..0000000000
--- a/apps/contacts/ajax/addressbook/activate.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011 Thomas Tanghus <thomas@tanghus.net>
- * Copyright (c) 2011 Bart Visscher <bartv@thisnet.nl>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('contacts');
-OCP\JSON::callCheck();
-
-$id = $_POST['id'];
-$book = OC_Contacts_App::getAddressbook($id);// is owner access check
-
-if(!OC_Contacts_Addressbook::setActive($id, $_POST['active'])) {
-	OCP\Util::writeLog('contacts',
-		'ajax/activation.php: Error activating addressbook: '. $id,
-		OCP\Util::ERROR);
-	OCP\JSON::error(array(
-		'data' => array(
-			'message' => OC_Contacts_App::$l10n->t('Error (de)activating addressbook.'))));
-	exit();
-}
-
-OCP\JSON::success(array(
-	'active' => OC_Contacts_Addressbook::isActive($id),
-	'id' => $id,
-	'addressbook'   => $book,
-));
diff --git a/apps/contacts/ajax/addressbook/add.php b/apps/contacts/ajax/addressbook/add.php
deleted file mode 100644
index 65077743ed..0000000000
--- a/apps/contacts/ajax/addressbook/add.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011-2012 Thomas Tanghus <thomas@tanghus.net>
- * Copyright (c) 2011 Bart Visscher <bartv@thisnet.nl>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-
-// Check if we are a user
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('contacts');
-OCP\JSON::callCheck();
-require_once  __DIR__.'/../loghandler.php';
-
-debug('name: '.$_POST['name']);
-
-$userid = OCP\USER::getUser();
-$name = isset($_POST['name'])?trim(strip_tags($_POST['name'])):null;
-$description = isset($_POST['description'])
-	? trim(strip_tags($_POST['description']))
-	: null;
-
-if(is_null($name)) {
-	bailOut('Cannot add addressbook with an empty name.');
-}
-$bookid = OC_Contacts_Addressbook::add($userid, $name, $description);
-if(!$bookid) {
-	bailOut('Error adding addressbook: '.$name);
-}
-
-if(!OC_Contacts_Addressbook::setActive($bookid, 1)) {
-	bailOut('Error activating addressbook.');
-}
-$addressbook = OC_Contacts_App::getAddressbook($bookid);
-OCP\JSON::success(array('data' => array('addressbook' => $addressbook)));
diff --git a/apps/contacts/ajax/addressbook/delete.php b/apps/contacts/ajax/addressbook/delete.php
deleted file mode 100644
index f59c605f4e..0000000000
--- a/apps/contacts/ajax/addressbook/delete.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * ownCloud - Addressbook
- *
- * @author Jakob Sack
- * @copyright 2011 Jakob Sack mail@jakobsack.de
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *
- * You should have received a copy of the GNU Affero General Public
- * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-// Check if we are a user
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('contacts');
-OCP\JSON::callCheck();
-require_once  __DIR__.'/../loghandler.php';
-
-$id = $_POST['id'];
-if(!$id) {
-	bailOut(OC_Contacts_App::$l10n->t('id is not set.'));
-}
-OC_Contacts_App::getAddressbook( $id ); // is owner access check
-
-OC_Contacts_Addressbook::delete($id);
-OCP\JSON::success(array('data' => array( 'id' => $id )));
diff --git a/apps/contacts/ajax/addressbook/update.php b/apps/contacts/ajax/addressbook/update.php
deleted file mode 100644
index 0fc66c3a3b..0000000000
--- a/apps/contacts/ajax/addressbook/update.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011-2012 Thomas Tanghus <thomas@tanghus.net>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-
-
-// Check if we are a user
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('contacts');
-require_once  __DIR__.'/../loghandler.php';
-
-$id = $_POST['id'];
-$name = trim(strip_tags($_POST['name']));
-$description = trim(strip_tags($_POST['description']));
-if(!$id) {
-	bailOut(OC_Contacts_App::$l10n->t('id is not set.'));
-}
-
-if(!$name) {
-	bailOut(OC_Contacts_App::$l10n->t('Cannot update addressbook with an empty name.'));
-}
-
-if(!OC_Contacts_Addressbook::edit($id, $name, $description)) {
-	bailOut(OC_Contacts_App::$l10n->t('Error updating addressbook.'));
-}
-
-if(!OC_Contacts_Addressbook::setActive($id, $_POST['active'])) {
-	bailOut(OC_Contacts_App::$l10n->t('Error (de)activating addressbook.'));
-}
-
-OC_Contacts_App::getAddressbook($id); // is owner access check
-$addressbook = OC_Contacts_App::getAddressbook($id);
-OCP\JSON::success(array(
-	'addressbook' => $addressbook,
-));
diff --git a/apps/contacts/ajax/categories/categoriesfor.php b/apps/contacts/ajax/categories/categoriesfor.php
deleted file mode 100644
index 8391b14b54..0000000000
--- a/apps/contacts/ajax/categories/categoriesfor.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Thomas Tanghus <thomas@tanghus.net>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
- 
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('contacts');
-
-$id = isset($_GET['id'])?$_GET['id']:null;
-if(is_null($id)) {
-	OCP\JSON::error(array(
-		'data' => array(
-			'message' => OC_Contacts_App::$l10n->t('No ID provided'))));
-	exit();
-}
-$vcard = OC_Contacts_App::getContactVCard( $id );
-foreach($vcard->children as $property){
-	if($property->name == 'CATEGORIES') {
-		$checksum = md5($property->serialize());
-		OCP\JSON::success(array(
-			'data' => array(
-				'value' => $property->value, 
-				'checksum' => $checksum,
-				)));
-		exit();
-	}
-}
-OCP\JSON::error(array(
-	'data' => array(
-		'message' => OC_Contacts_App::$l10n->t('Error setting checksum.'))));
diff --git a/apps/contacts/ajax/categories/delete.php b/apps/contacts/ajax/categories/delete.php
deleted file mode 100644
index bc9f3e14e8..0000000000
--- a/apps/contacts/ajax/categories/delete.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Thomas Tanghus <thomas@tanghus.net>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
- 
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('contacts');
-OCP\JSON::callCheck();
-
-require_once __DIR__.'/../loghandler.php';
-
-$categories = isset($_POST['categories'])?$_POST['categories']:null;
-
-if(is_null($categories)) {
-	bailOut(OC_Contacts_App::$l10n->t('No categories selected for deletion.'));
-}
-
-debug(print_r($categories, true));
-
-$addressbooks = OC_Contacts_Addressbook::all(OCP\USER::getUser());
-if(count($addressbooks) == 0) {
-	bailOut(OC_Contacts_App::$l10n->t('No address books found.'));
-}
-$addressbookids = array();
-foreach($addressbooks as $addressbook) {
-	$addressbookids[] = $addressbook['id'];
-} 
-$contacts = OC_Contacts_VCard::all($addressbookids);
-if(count($contacts) == 0) {
-	bailOut(OC_Contacts_App::$l10n->t('No contacts found.'));
-}
-
-$cards = array();
-foreach($contacts as $contact) {
-	$cards[] = array($contact['id'], $contact['carddata']);
-} 
-
-debug('Before delete: '.print_r($categories, true));
-
-$catman = new OC_VCategories('contacts');
-$catman->delete($categories, $cards);
-debug('After delete: '.print_r($catman->categories(), true));
-OC_Contacts_VCard::updateDataByID($cards);
-OCP\JSON::success(array('data' => array('categories'=>$catman->categories())));
diff --git a/apps/contacts/ajax/categories/list.php b/apps/contacts/ajax/categories/list.php
deleted file mode 100644
index f234116ba8..0000000000
--- a/apps/contacts/ajax/categories/list.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Thomas Tanghus <thomas@tanghus.net>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
- 
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('contacts');
-
-$categories = OC_Contacts_App::getCategories();
-
-OCP\JSON::success(array('data' => array('categories'=>$categories)));
diff --git a/apps/contacts/ajax/categories/rescan.php b/apps/contacts/ajax/categories/rescan.php
deleted file mode 100644
index a06e780395..0000000000
--- a/apps/contacts/ajax/categories/rescan.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Thomas Tanghus <thomas@tanghus.net>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
- 
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('contacts');
-OCP\JSON::callCheck();
-
-OC_Contacts_App::scanCategories();
-$categories = OC_Contacts_App::getCategories();
-
-OCP\JSON::success(array('data' => array('categories'=>$categories)));
diff --git a/apps/contacts/ajax/contact/add.php b/apps/contacts/ajax/contact/add.php
deleted file mode 100644
index c7cec7d946..0000000000
--- a/apps/contacts/ajax/contact/add.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-/**
- * ownCloud - Addressbook
- *
- * @author Thomas Tanghus
- * @copyright 2012 Thomas Tanghus <thomas@tanghus.net>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *
- * You should have received a copy of the GNU Affero General Public
- * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-// Check if we are a user
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('contacts');
-OCP\JSON::callCheck();
-
-$aid = isset($_POST['aid'])?$_POST['aid']:null;
-if(!$aid) {
-	$aid = min(OC_Contacts_Addressbook::activeIds()); // first active addressbook.
-}
-OC_Contacts_App::getAddressbook( $aid ); // is owner access check
-
-$isnew = isset($_POST['isnew'])?$_POST['isnew']:false;
-$fn = trim($_POST['fn']);
-$n = trim($_POST['n']);
-
-$vcard = new OC_VObject('VCARD');
-$vcard->setUID();
-$vcard->setString('FN', $fn);
-$vcard->setString('N', $n);
-
-$id = OC_Contacts_VCard::add($aid, $vcard, null, $isnew);
-if(!$id) {
-	OCP\JSON::error(array(
-		'data' => array(
-			'message' => OC_Contacts_App::$l10n->t('There was an error adding the contact.'))));
-	OCP\Util::writeLog('contacts', 'ajax/addcontact.php: Recieved non-positive ID on adding card: '.$id, OCP\Util::ERROR);
-	exit();
-}
-
-$lastmodified = OC_Contacts_App::lastModified($vcard);
-if(!$lastmodified) {
-	$lastmodified = new DateTime();
-}
-OCP\JSON::success(array(
-	'data' => array(
-		'id' => $id,
-		'aid' => $aid,
-		'lastmodified' => $lastmodified->format('U')
-	)
-));
diff --git a/apps/contacts/ajax/contact/addproperty.php b/apps/contacts/ajax/contact/addproperty.php
deleted file mode 100644
index 2b80ebd58b..0000000000
--- a/apps/contacts/ajax/contact/addproperty.php
+++ /dev/null
@@ -1,168 +0,0 @@
-<?php
-/**
- * ownCloud - Addressbook
- *
- * @author Jakob Sack
- * @copyright 2011 Jakob Sack mail@jakobsack.de
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *
- * You should have received a copy of the GNU Affero General Public
- * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-// Check if we are a user
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('contacts');
-OCP\JSON::callCheck();
-
-require_once __DIR__.'/../loghandler.php';
-
-$id = isset($_POST['id'])?$_POST['id']:null;
-$name = isset($_POST['name'])?$_POST['name']:null;
-$value = isset($_POST['value'])?$_POST['value']:null;
-$parameters = isset($_POST['parameters'])?$_POST['parameters']:array();
-
-$vcard = OC_Contacts_App::getContactVCard($id);
-$l10n = OC_Contacts_App::$l10n;
-
-if(!$name) {
-	bailOut($l10n->t('element name is not set.'));
-}
-if(!$id) {
-	bailOut($l10n->t('id is not set.'));
-}
-
-if(!$vcard) {
-	bailOut($l10n->t('Could not parse contact: ').$id);
-}
-
-if(!is_array($value)) {
-	$value = trim($value);
-	if(!$value
-		&& in_array(
-		$name,
-		array('TEL', 'EMAIL', 'ORG', 'BDAY', 'URL', 'NICKNAME', 'NOTE'))
-	) {
-		bailOut($l10n->t('Cannot add empty property.'));
-	}
-} elseif($name === 'ADR') { // only add if non-empty elements.
-	$empty = true;
-	foreach($value as $part) {
-		if(trim($part) != '') {
-			$empty = false;
-			break;
-		}
-	}
-	if($empty) {
-		bailOut($l10n->t('At least one of the address fields has to be filled out.'));
-	}
-}
-
-// Prevent setting a duplicate entry
-$current = $vcard->select($name);
-foreach($current as $item) {
-	$tmpvalue = (is_array($value)?implode(';', $value):$value);
-	if($tmpvalue == $item->value) {
-		bailOut($l10n->t('Trying to add duplicate property: '.$name.': '.$tmpvalue));
-	}
-}
-
-if(is_array($value)) {
-	// NOTE: Important, otherwise the compound value will
-	// be set in the order the fields appear in the form!
-	ksort($value);
-	$value = array_map('strip_tags', $value);
-} else {
-	$value = strip_tags($value);
-}
-
-/* preprocessing value */
-switch($name) {
-	case 'BDAY':
-		$date = New DateTime($value);
-		$value = $date->format(DateTime::ATOM);
-	case 'FN':
-		if(!$value) {
-			// create a method thats returns an alternative for FN.
-			//$value = getOtherValue();
-		}
-	case 'N':
-	case 'ORG':
-	case 'NOTE':
-		$value = str_replace('\n', ' \\n', $value);
-		break;
-	case 'NICKNAME':
-		// TODO: Escape commas and semicolons.
-		break;
-	case 'EMAIL':
-		$value = strtolower($value);
-		break;
-	case 'TEL':
-	case 'ADR':
-		break;
-	case 'IMPP':
-		if(is_null($parameters) || !isset($parameters['X-SERVICE-TYPE'])) {
-			bailOut(OC_Contacts_App::$l10n->t('Missing IM parameter.'));
-		}
-		$impp = OC_Contacts_App::getIMOptions($parameters['X-SERVICE-TYPE']);
-		if(is_null($impp)) {
-			bailOut(OC_Contacts_App::$l10n->t('Unknown IM: '.$parameters['X-SERVICE-TYPE']));
-		}
-		$value = $impp['protocol'] . ':' . $value;
-		break;
-}
-
-switch($name) {
-	case 'NOTE':
-		$vcard->setString('NOTE', $value);
-		break;
-	default:
-		$property = $vcard->addProperty($name, $value); //, $parameters);
-		break;
-}
-
-$line = count($vcard->children) - 1;
-
-// Apparently Sabre_VObject_Parameter doesn't do well with
-// multiple values or I don't know how to do it. Tanghus.
-foreach ($parameters as $key=>$element) {
-	if(is_array($element) /*&& strtoupper($key) == 'TYPE'*/) {
-		// NOTE: Maybe this doesn't only apply for TYPE?
-		// And it probably shouldn't be done here anyways :-/
-		foreach($element as $e) {
-			if($e != '' && !is_null($e)) {
-				if(trim($e)) {
-					$vcard->children[$line]->parameters[] = new Sabre_VObject_Parameter($key, $e);
-				}
-			}
-		}
-	} else {
-		if(trim($element)) {
-			$vcard->children[$line]->parameters[] = new Sabre_VObject_Parameter($key, $element);
-		}
-	}
-}
-$checksum = md5($vcard->children[$line]->serialize());
-
-try {
-	OC_Contacts_VCard::edit($id, $vcard);
-} catch(Exception $e) {
-	bailOut($e->getMessage());
-}
-
-OCP\JSON::success(array(
-	'data' => array(
-		'checksum' => $checksum,
-		'lastmodified' => OC_Contacts_App::lastModified($vcard)->format('U'))
-	)
-);
diff --git a/apps/contacts/ajax/contact/delete.php b/apps/contacts/ajax/contact/delete.php
deleted file mode 100644
index e73f34f898..0000000000
--- a/apps/contacts/ajax/contact/delete.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-/**
- * ownCloud - Addressbook
- *
- * @author Jakob Sack
- * @copyright 2011 Jakob Sack mail@jakobsack.de
- * @copyright 2012 Thomas Tanghus (thomas@tanghus.net)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *
- * You should have received a copy of the GNU Affero General Public
- * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-// Check if we are a user
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('contacts');
-OCP\JSON::callCheck();
-
-require_once __DIR__.'/../loghandler.php';
-
-$id = isset($_POST['id'])?$_POST['id']:null;
-if(!$id) {
-	bailOut(OC_Contacts_App::$l10n->t('id is not set.'));
-}
-
-try {
-	OC_Contacts_VCard::delete($id);
-} catch(Exception $e) {
-	$msg = $e->getMessage();
-	OCP\Util::writeLog('contacts', __METHOD__.', exception: '.$msg,
-		OCP\Util::DEBUG);
-	OCP\Util::writeLog('contacts', __METHOD__.', id'.$id, OCP\Util::DEBUG);
-	bailOut($msg);
-}
-OCP\JSON::success(array('data' => array( 'id' => $id )));
diff --git a/apps/contacts/ajax/contact/deleteproperty.php b/apps/contacts/ajax/contact/deleteproperty.php
deleted file mode 100644
index b76b6e55ed..0000000000
--- a/apps/contacts/ajax/contact/deleteproperty.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-/**
- * ownCloud - Addressbook
- *
- * @author Jakob Sack
- * @copyright 2011 Jakob Sack mail@jakobsack.de
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *
- * You should have received a copy of the GNU Affero General Public
- * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-// Check if we are a user
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('contacts');
-OCP\JSON::callCheck();
-
-require_once __DIR__.'/../loghandler.php';
-
-$id = $_POST['id'];
-$checksum = $_POST['checksum'];
-$l10n = OC_Contacts_App::$l10n;
-
-$vcard = OC_Contacts_App::getContactVCard( $id );
-$line = OC_Contacts_App::getPropertyLineByChecksum($vcard, $checksum);
-if(is_null($line)) {
-	bailOut($l10n->t('Information about vCard is incorrect. Please reload the page.'));
-	exit();
-}
-
-unset($vcard->children[$line]);
-
-try {
-	OC_Contacts_VCard::edit($id, $vcard);
-} catch(Exception $e) {
-	bailOut($e->getMessage());
-}
-
-OCP\JSON::success(array(
-	'data' => array(
-		'id' => $id,
-		'lastmodified' => OC_Contacts_App::lastModified($vcard)->format('U'),
-	)
-));
diff --git a/apps/contacts/ajax/contact/details.php b/apps/contacts/ajax/contact/details.php
deleted file mode 100644
index 5bf337e645..0000000000
--- a/apps/contacts/ajax/contact/details.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-/**
- * ownCloud - Addressbook
- *
- * @author Thomas Tanghus
- * @copyright 2012 Thomas Tanghus <thomas@tanghus.net>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *
- * You should have received a copy of the GNU Affero General Public
- * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-require_once __DIR__.'/../loghandler.php';
-
-// Check if we are a user
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('contacts');
-
-$id = isset($_GET['id'])?$_GET['id']:null;
-if(is_null($id)) {
-	bailOut(OC_Contacts_App::$l10n->t('Missing ID'));
-}
-$card = OC_Contacts_VCard::find($id);
-$vcard = OC_VObject::parse($card['carddata']);
-if(is_null($vcard)) {
-	bailOut(OC_Contacts_App::$l10n->t('Error parsing VCard for ID: "'.$id.'"'));
-}
-$details = OC_Contacts_VCard::structureContact($vcard);
-
-// Make up for not supporting the 'N' field in earlier version.
-if(!isset($details['N'])) {
-	$details['N'] = array();
-	$details['N'][0] = array($details['FN'][0]['value'],'','','','');
-}
-
-// Don't wanna transfer the photo in a json string.
-if(isset($details['PHOTO'])) {
-	$details['PHOTO'] = true;
-	//unset($details['PHOTO']);
-} else {
-	$details['PHOTO'] = false;
-}
-$lastmodified = OC_Contacts_App::lastModified($vcard);
-if(!$lastmodified) {
-	$lastmodified = new DateTime();
-}
-$details['id'] = $id;
-$details['displayname'] = $card['fullname'];
-$details['addressbookid'] = $card['addressbookid'];
-$details['lastmodified'] = $lastmodified->format('U');
-OC_Contacts_App::setLastModifiedHeader($vcard);
-OCP\JSON::success(array('data' => $details));
diff --git a/apps/contacts/ajax/contact/list.php b/apps/contacts/ajax/contact/list.php
deleted file mode 100644
index 4e2509d8d5..0000000000
--- a/apps/contacts/ajax/contact/list.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011 Thomas Tanghus <thomas@tanghus.net>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-function cmp($a, $b)
-{
-    if ($a['displayname'] == $b['displayname']) {
-        return 0;
-    }
-    return ($a['displayname'] < $b['displayname']) ? -1 : 1;
-}
-
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('contacts');
-
-$start = isset($_GET['startat'])?$_GET['startat']:0;
-$aid = isset($_GET['aid'])?$_GET['aid']:null;
-
-if(is_null($aid)) {
-	// Called initially to get the active addressbooks.
-	$active_addressbooks = OC_Contacts_Addressbook::active(OCP\USER::getUser());
-} else {
-	// called each time more contacts has to be shown.
-	$active_addressbooks = array(OC_Contacts_Addressbook::find($aid));
-}
-
-
-session_write_close();
-
-// create the addressbook associate array
-$contacts_addressbook = array();
-$ids = array();
-foreach($active_addressbooks as $addressbook) {
-	$ids[] = $addressbook['id'];
-	if(!isset($contacts_addressbook[$addressbook['id']])) {
-		$contacts_addressbook[$addressbook['id']]
-				= array('contacts' => array('type' => 'book',));
-		$contacts_addressbook[$addressbook['id']]['displayname']
-				= $addressbook['displayname'];
-		$contacts_addressbook[$addressbook['id']]['permissions']
-				= isset($addressbook['permissions'])
-				? $addressbook['permissions']
-				: '0';
-	}
-}
-
-$contacts_alphabet = array();
-
-// get next 50 for each addressbook.
-foreach($ids as $id) {
-	if($id) {
-		$contacts_alphabet = array_merge(
-				$contacts_alphabet,
-				OC_Contacts_VCard::all($id, $start, 50)
-		);
-	}
-}
-// Our new array for the contacts sorted by addressbook
-if($contacts_alphabet) {
-	foreach($contacts_alphabet as $contact) {
-		// This should never execute.
-		if(!isset($contacts_addressbook[$contact['addressbookid']])) {
-			$contacts_addressbook[$contact['addressbookid']] = array(
-				'contacts' => array('type' => 'book',)
-			);
-		}
-		$display = trim($contact['fullname']);
-		if(!$display) {
-			$vcard = OC_Contacts_App::getContactVCard($contact['id']);
-			if(!is_null($vcard)) {
-				$struct = OC_Contacts_VCard::structureContact($vcard);
-				$display = isset($struct['EMAIL'][0])
-					? $struct['EMAIL'][0]['value']
-					: '[UNKNOWN]';
-			}
-		}
-		$contacts_addressbook[$contact['addressbookid']]['contacts'][] = array(
-			'type' => 'contact',
-			'id' => $contact['id'],
-			'addressbookid' => $contact['addressbookid'],
-			'displayname' => htmlspecialchars($display),
-			'permissions' =>
-				isset($contacts_addressbook[$contact['addressbookid']]['permissions'])
-					? $contacts_addressbook[$contact['addressbookid']]['permissions']
-					: '0',
-		);
-	}
-}
-unset($contacts_alphabet);
-uasort($contacts_addressbook, 'cmp');
-
-OCP\JSON::success(array('data' => array('entries' => $contacts_addressbook)));
-
diff --git a/apps/contacts/ajax/contact/move.php b/apps/contacts/ajax/contact/move.php
deleted file mode 100644
index 053343c47e..0000000000
--- a/apps/contacts/ajax/contact/move.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-/**
-* @author  Victor Dubiniuk
-* Copyright (c) 2012 Victor Dubiniuk <victor.dubiniuk@gmail.com>
-* Copyright (c) 2012 Thomas Tanghus <thomas@tanghus.net>
-* This file is licensed under the Affero General Public License version 3 or
-* later.
-* See the COPYING-README file.
-*/
-
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('contacts');
-OCP\JSON::callCheck();
-
-$id = intval($_POST['id']);
-$aid = intval($_POST['aid']);
-$isaddressbook = isset($_POST['isaddressbook']) ? true: false;
-
-// Ownership checking
-OC_Contacts_App::getAddressbook($aid);
-try {
-	OC_Contacts_VCard::moveToAddressBook($aid, $id, $isaddressbook);
-}  catch (Exception $e) {
-	$msg = $e->getMessage();
-	OCP\Util::writeLog('contacts', 'Error moving contacts "'.implode(',', $id).'" to addressbook "'.$aid.'"'.$msg, OCP\Util::ERROR);
-	OC_JSON::error(array('data' => array('message' => $msg,)));
-}
-
-OC_JSON::success(array('data' => array('ids' => $id,)));
\ No newline at end of file
diff --git a/apps/contacts/ajax/contact/saveproperty.php b/apps/contacts/ajax/contact/saveproperty.php
deleted file mode 100644
index 7ae183538b..0000000000
--- a/apps/contacts/ajax/contact/saveproperty.php
+++ /dev/null
@@ -1,176 +0,0 @@
-<?php
-/**
- * ownCloud - Addressbook
- *
- * @author Thomas Tanghus
- * @copyright 2012 Thomas Tanghus <thomas@tanghus.net>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *
- * You should have received a copy of the GNU Affero General Public
- * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-require_once __DIR__.'/../loghandler.php';
-
-// Check if we are a user
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('contacts');
-OCP\JSON::callCheck();
-$id = isset($_POST['id'])?$_POST['id']:null;
-$name = isset($_POST['name'])?$_POST['name']:null;
-$value = isset($_POST['value'])?$_POST['value']:null;
-$parameters = isset($_POST['parameters'])?$_POST['parameters']:null;
-$checksum = isset($_POST['checksum'])?$_POST['checksum']:null;
-
-if(!$name) {
-	bailOut(OC_Contacts_App::$l10n->t('element name is not set.'));
-}
-if(!$id) {
-	bailOut(OC_Contacts_App::$l10n->t('id is not set.'));
-}
-if(!$checksum) {
-	bailOut(OC_Contacts_App::$l10n->t('checksum is not set.'));
-}
-if(is_array($value)) {
-	$value = array_map('strip_tags', $value);
-	// NOTE: Important, otherwise the compound value will be
-	// set in the order the fields appear in the form!
-	ksort($value);
-	//if($name == 'CATEGORIES') {
-	//	$value = OC_Contacts_VCard::escapeDelimiters($value, ',');
-	//} else {
-		$value = OC_Contacts_VCard::escapeDelimiters($value, ';');
-	//}
-} else {
-	$value = trim(strip_tags($value));
-}
-
-$vcard = OC_Contacts_App::getContactVCard( $id );
-$line = OC_Contacts_App::getPropertyLineByChecksum($vcard, $checksum);
-if(is_null($line)) {
-	bailOut(OC_Contacts_App::$l10n->t(
-		'Information about vCard is incorrect. Please reload the page: ').$checksum
-	);
-}
-$element = $vcard->children[$line]->name;
-
-if($element != $name) {
-	bailOut(OC_Contacts_App::$l10n->t(
-		'Something went FUBAR. ').$name.' != '.$element
-	);
-}
-
-/* preprocessing value */
-switch($element) {
-	case 'BDAY':
-		$date = New DateTime($value);
-		$value = $date->format('Y-m-d');
-		break;
-	case 'FN':
-		if(!$value) {
-			// create a method thats returns an alternative for FN.
-			//$value = getOtherValue();
-		}
-		break;
-	case 'NOTE':
-		$value = str_replace('\n', '\\n', $value);
-		break;
-	case 'EMAIL':
-		$value = strtolower($value);
-		break;
-	case 'IMPP':
-		if(is_null($parameters) || !isset($parameters['X-SERVICE-TYPE'])) {
-			bailOut(OC_Contacts_App::$l10n->t('Missing IM parameter.'));
-		}
-		$impp = OC_Contacts_App::getIMOptions($parameters['X-SERVICE-TYPE']);
-		if(is_null($impp)) {
-			bailOut(OC_Contacts_App::$l10n->t('Unknown IM: '.$parameters['X-SERVICE-TYPE']));
-		}
-		$value = $impp['protocol'] . ':' . $value;
-		break;
-}
-
-if(!$value) {
-	unset($vcard->children[$line]);
-	$checksum = '';
-} else {
-	/* setting value */
-	switch($element) {
-		case 'BDAY':
-			// I don't use setDateTime() because that formats it as YYYYMMDD instead
-			// of YYYY-MM-DD which is what the RFC recommends.
-			$vcard->children[$line]->setValue($value);
-			$vcard->children[$line]->parameters = array();
-			$vcard->children[$line]->add(
-				new Sabre_VObject_Parameter('VALUE', 'DATE')
-			);
-			debug('Setting value:'.$name.' '.$vcard->children[$line]);
-			break;
-		case 'CATEGORIES':
-			debug('Setting string:'.$name.' '.$value);
-			$vcard->children[$line]->setValue($value);
-			break;
-		case 'EMAIL':
-		case 'TEL':
-		case 'ADR':
-		case 'IMPP':
-			debug('Setting element: (EMAIL/TEL/ADR)'.$element);
-			$vcard->children[$line]->setValue($value);
-			$vcard->children[$line]->parameters = array();
-			if(!is_null($parameters)) {
-				debug('Setting parameters: '.$parameters);
-				foreach($parameters as $key => $parameter) {
-					debug('Adding parameter: '.$key);
-					if(is_array($parameter)) {
-						foreach($parameter as $val) {
-							if(trim($val)) {
-								debug('Adding parameter: '.$key.'=>'.$val);
-								$vcard->children[$line]->add(new Sabre_VObject_Parameter(
-									$key,
-									strtoupper(strip_tags($val)))
-								);
-							}
-						}
-					} else {
-						if(trim($parameter)) {
-							$vcard->children[$line]->add(new Sabre_VObject_Parameter(
-								$key,
-								strtoupper(strip_tags($parameter)))
-							);
-						}
-					}
-				}
-			}
-			break;
-		default:
-			debug('Setting string:'.$name.' '.$value);
-			$vcard->setString($name, $value);
-			break;
-	}
-	// Do checksum and be happy
-	$checksum = md5($vcard->children[$line]->serialize());
-}
-//debug('New checksum: '.$checksum);
-
-try {
-	OC_Contacts_VCard::edit($id, $vcard);
-} catch(Exception $e) {
-	bailOut($e->getMessage());
-}
-
-OCP\JSON::success(array('data' => array(
-	'line' => $line,
-	'checksum' => $checksum,
-	'oldchecksum' => $_POST['checksum'],
-	'lastmodified' => OC_Contacts_App::lastModified($vcard)->format('U'),
-)));
diff --git a/apps/contacts/ajax/cropphoto.php b/apps/contacts/ajax/cropphoto.php
deleted file mode 100644
index eb9f1fcdb5..0000000000
--- a/apps/contacts/ajax/cropphoto.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * ownCloud - Addressbook
- *
- * @author Thomas Tanghus
- * @copyright 2012 Thomas Tanghus <thomas@tanghus.net>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *
- * You should have received a copy of the GNU Affero General Public
- * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-// Check if we are a user
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('contacts');
-
-$tmpkey = $_GET['tmpkey'];
-$requesttoken = $_GET['requesttoken'];
-$id = $_GET['id'];
-$tmpl = new OCP\Template("contacts", "part.cropphoto");
-$tmpl->assign('tmpkey', $tmpkey);
-$tmpl->assign('id', $id);
-$tmpl->assign('requesttoken', $requesttoken);
-$page = $tmpl->fetchPage();
-
-OCP\JSON::success(array('data' => array( 'page' => $page )));
diff --git a/apps/contacts/ajax/currentphoto.php b/apps/contacts/ajax/currentphoto.php
deleted file mode 100644
index 96080e661e..0000000000
--- a/apps/contacts/ajax/currentphoto.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/**
- * ownCloud - Addressbook
- *
- * @author Thomas Tanghus
- * @copyright 2012 Thomas Tanghus <thomas@tanghus.net>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *
- * You should have received a copy of the GNU Affero General Public
- * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-// Firefox and Konqueror tries to download application/json for me.  --Arthur
-OCP\JSON::setContentTypeHeader('text/plain');
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('contacts');
-require_once 'loghandler.php';
-
-if (!isset($_GET['id'])) {
-	bailOut(OC_Contacts_App::$l10n->t('No contact ID was submitted.'));
-}
-
-$contact = OC_Contacts_App::getContactVCard($_GET['id']);
-// invalid vcard
-if( is_null($contact)) {
-	bailOut(OC_Contacts_App::$l10n->t('Error reading contact photo.'));
-} else {
-	$image = new OC_Image();
-	if(!$image->loadFromBase64($contact->getAsString('PHOTO'))) {
-		$image->loadFromBase64($contact->getAsString('LOGO'));
-	}
-	if($image->valid()) {
-		$tmpkey = 'contact-photo-'.$contact->getAsString('UID');
-		if(OC_Cache::set($tmpkey, $image->data(), 600)) {
-			OCP\JSON::success(array('data' => array('id'=>$_GET['id'], 'tmp'=>$tmpkey)));
-			exit();
-		} else {
-			bailOut(OC_Contacts_App::$l10n->t('Error saving temporary file.'));
-		}
-	} else {
-		bailOut(OC_Contacts_App::$l10n->t('The loading photo is not valid.'));
-	}
-}
diff --git a/apps/contacts/ajax/editaddress.php b/apps/contacts/ajax/editaddress.php
deleted file mode 100644
index b5e4b72ed5..0000000000
--- a/apps/contacts/ajax/editaddress.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011 Thomas Tanghus <thomas@tanghus.net>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
- 
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('contacts');
-
-$id = $_GET['id'];
-$checksum = isset($_GET['checksum'])?$_GET['checksum']:'';
-$vcard = OC_Contacts_App::getContactVCard($id);
-$adr_types = OC_Contacts_App::getTypesOfProperty('ADR');
-
-$tmpl = new OCP\Template("contacts", "part.edit_address_dialog");
-if($checksum) {
-	$line = OC_Contacts_App::getPropertyLineByChecksum($vcard, $checksum);
-	$element = $vcard->children[$line];
-	$adr = OC_Contacts_VCard::structureProperty($element);
-	$types = array();
-	if(isset($adr['parameters']['TYPE'])) {
-		if(is_array($adr['parameters']['TYPE'])) {
-			$types = array_map('htmlspecialchars', $adr['parameters']['TYPE']);
-			$types = array_map('strtoupper', $types);
-		} else {
-			$types = array(strtoupper(htmlspecialchars($adr['parameters']['TYPE'])));
-		}
-	}
-	$tmpl->assign('types', $types, false);
-	$adr = array_map('htmlspecialchars', $adr['value']);
-	$tmpl->assign('adr', $adr, false);
-}
-
-$tmpl->assign('id', $id);
-$tmpl->assign('adr_types', $adr_types);
-
-$page = $tmpl->fetchPage();
-OCP\JSON::success(array('data' => array('page'=>$page, 'checksum'=>$checksum)));
diff --git a/apps/contacts/ajax/editname.php b/apps/contacts/ajax/editname.php
deleted file mode 100644
index eb55634011..0000000000
--- a/apps/contacts/ajax/editname.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011 Thomas Tanghus <thomas@tanghus.net>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
- 
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('contacts');
-require_once 'loghandler.php';
-
-$tmpl = new OCP\Template("contacts", "part.edit_name_dialog");
-
-$id = isset($_GET['id'])?$_GET['id']:'';
-
-if($id) {
-	$vcard = OC_Contacts_App::getContactVCard($id);
-	$name = array('', '', '', '', '');
-	if($vcard->__isset('N')) {
-		$property = $vcard->__get('N');
-		if($property) {
-			$name = OC_Contacts_VCard::structureProperty($property);
-		}
-	}
-	$name = array_map('htmlspecialchars', $name['value']);
-	$tmpl->assign('name', $name, false);
-	$tmpl->assign('id', $id, false);
-} else {
-	bailOut(OC_Contacts_App::$l10n->t('Contact ID is missing.'));
-}
-$page = $tmpl->fetchPage();
-OCP\JSON::success(array('data' => array('page'=>$page)));
diff --git a/apps/contacts/ajax/importdialog.php b/apps/contacts/ajax/importdialog.php
deleted file mode 100644
index 691522538f..0000000000
--- a/apps/contacts/ajax/importdialog.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Georg Ehrke <ownclouddev at georgswebsite dot de>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
- 
-OCP\JSON::checkLoggedIn();
-OCP\App::checkAppEnabled('contacts');
-$tmpl = new OCP\Template('contacts', 'part.import');
-$tmpl->assign('path', $_POST['path']);
-$tmpl->assign('filename', $_POST['filename']);
-$tmpl->printpage();
diff --git a/apps/contacts/ajax/loadcard.php b/apps/contacts/ajax/loadcard.php
deleted file mode 100644
index 82501ffd2f..0000000000
--- a/apps/contacts/ajax/loadcard.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-/**
- * ownCloud - Addressbook
- *
- * @author Thomas Tanghus
- * @copyright 2012 Thomas Tanghus <thomas@tanghus.net>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *
- * You should have received a copy of the GNU Affero General Public
- * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-// Check if we are a user
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('contacts');
-
-$upload_max_filesize = OCP\Util::computerFileSize(ini_get('upload_max_filesize'));
-$post_max_size = OCP\Util::computerFileSize(ini_get('post_max_size'));
-$maxUploadFilesize = min($upload_max_filesize, $post_max_size);
-$requesttoken = $_GET['requesttoken'];
-
-$freeSpace=OC_Filesystem::free_space('/');
-$freeSpace=max($freeSpace, 0);
-$maxUploadFilesize = min($maxUploadFilesize, $freeSpace);
-$adr_types = OC_Contacts_App::getTypesOfProperty('ADR');
-$phone_types = OC_Contacts_App::getTypesOfProperty('TEL');
-$email_types = OC_Contacts_App::getTypesOfProperty('EMAIL');
-$impp_types = OC_Contacts_App::getTypesOfProperty('IMPP');
-$ims = OC_Contacts_App::getIMOptions();
-$im_protocols = array();
-foreach($ims as $name => $values) {
-	$im_protocols[$name] = $values['displayname'];
-}
-
-$tmpl = new OCP\Template('contacts', 'part.contact');
-$tmpl->assign('uploadMaxFilesize', $maxUploadFilesize);
-$tmpl->assign('requesttoken', $_SERVER['HTTP_REQUESTTOKEN']);
-$tmpl->assign('uploadMaxHumanFilesize', OCP\Util::humanFileSize($maxUploadFilesize));
-$tmpl->assign('adr_types', $adr_types);
-$tmpl->assign('phone_types', $phone_types);
-$tmpl->assign('email_types', $email_types);
-$tmpl->assign('impp_types', $impp_types, false);
-$tmpl->assign('im_protocols', $im_protocols, false);
-$tmpl->assign('requesttoken', $requesttoken);
-$tmpl->assign('id', '');
-$page = $tmpl->fetchPage();
-
-OCP\JSON::success(array('data' => array( 'page' => $page )));
diff --git a/apps/contacts/ajax/loghandler.php b/apps/contacts/ajax/loghandler.php
deleted file mode 100644
index be4b98c111..0000000000
--- a/apps/contacts/ajax/loghandler.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-/**
- * ownCloud - Addressbook
- *
- * @author Thomas Tanghus
- * @copyright 2012 Thomas Tanghus <thomas@tanghus.net>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *
- * You should have received a copy of the GNU Affero General Public
- * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-function bailOut($msg, $tracelevel=1, $debuglevel=OCP\Util::ERROR) 
-{
-	OCP\JSON::error(array('data' => array('message' => $msg)));
-	debug($msg, $tracelevel, $debuglevel);
-	exit();
-}
-
-function debug($msg, $tracelevel=0, $debuglevel=OCP\Util::DEBUG) 
-{
-	if(PHP_VERSION >= "5.4") {
-		$call = debug_backtrace(false, $tracelevel+1);
-	} else {
-		$call = debug_backtrace(false);
-	}
-	error_log('trace: '.print_r($call, true));
-	$call = $call[$tracelevel];
-	if($debuglevel !== false) {
-		OCP\Util::writeLog('contacts', 
-			$call['file'].'. Line: '.$call['line'].': '.$msg, 
-			$debuglevel);
-	}
-}
diff --git a/apps/contacts/ajax/oc_photo.php b/apps/contacts/ajax/oc_photo.php
deleted file mode 100644
index fe37b530f8..0000000000
--- a/apps/contacts/ajax/oc_photo.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-/**
- * ownCloud - Addressbook
- *
- * @author Thomas Tanghus
- * @copyright 2012 Thomas Tanghus <thomas@tanghus.net>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *
- * You should have received a copy of the GNU Affero General Public
- * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-// Check if we are a user
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('contacts');
-require_once 'loghandler.php';
-
-if(!isset($_GET['id'])) {
-	bailOut(OC_Contacts_App::$l10n->t('No contact ID was submitted.'));
-}
-
-if(!isset($_GET['path'])) {
-	bailOut(OC_Contacts_App::$l10n->t('No photo path was submitted.'));
-}
-
-$localpath = OC_Filesystem::getLocalFile($_GET['path']);
-$tmpkey = 'contact-photo-'.$_GET['id'];
-
-if(!file_exists($localpath)) {
-	bailOut(OC_Contacts_App::$l10n->t('File doesn\'t exist:').$localpath);
-}
-
-$image = new OC_Image();
-if(!$image) {
-	bailOut(OC_Contacts_App::$l10n->t('Error loading image.'));
-}
-if(!$image->loadFromFile($localpath)) {
-	bailOut(OC_Contacts_App::$l10n->t('Error loading image.'));
-}
-if($image->width() > 400 || $image->height() > 400) {
-	$image->resize(400); // Prettier resizing than with browser and saves bandwidth.
-}
-if(!$image->fixOrientation()) { // No fatal error so we don't bail out.
-	OCP\Util::writeLog('contacts', 
-		'ajax/oc_photo.php: Couldn\'t save correct image orientation: '.$localpath, 
-		OCP\Util::DEBUG);
-}
-if(OC_Cache::set($tmpkey, $image->data(), 600)) {
-	OCP\JSON::success(array('data' => array('id'=>$_GET['id'], 'tmp'=>$tmpkey)));
-	exit();
-} else {
-	bailOut('Couldn\'t save temporary image: '.$tmpkey);
-}
diff --git a/apps/contacts/ajax/savecrop.php b/apps/contacts/ajax/savecrop.php
deleted file mode 100644
index 2483d0f712..0000000000
--- a/apps/contacts/ajax/savecrop.php
+++ /dev/null
@@ -1,121 +0,0 @@
-<?php
-/**
- * ownCloud - Addressbook
- *
- * @author Thomas Tanghus
- * @copyright 2012 Thomas Tanghus <thomas@tanghus.net>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *
- * You should have received a copy of the GNU Affero General Public
- * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-// Check if we are a user
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('contacts');
-OCP\JSON::callCheck();
-
-// Firefox and Konqueror tries to download application/json for me.  --Arthur
-OCP\JSON::setContentTypeHeader('text/plain; charset=utf-8');
-
-require_once 'loghandler.php';
-
-$image = null;
-
-$x1 = (isset($_POST['x1']) && $_POST['x1']) ? $_POST['x1'] : 0;
-//$x2 = isset($_POST['x2']) ? $_POST['x2'] : -1;
-$y1 = (isset($_POST['y1']) && $_POST['y1']) ? $_POST['y1'] : 0;
-//$y2 = isset($_POST['y2']) ? $_POST['y2'] : -1;
-$w = (isset($_POST['w']) && $_POST['w']) ? $_POST['w'] : -1;
-$h = (isset($_POST['h']) && $_POST['h']) ? $_POST['h'] : -1;
-$tmpkey = isset($_POST['tmpkey']) ? $_POST['tmpkey'] : '';
-$id = isset($_POST['id']) ? $_POST['id'] : '';
-
-if($tmpkey == '') {
-	bailOut('Missing key to temporary file.');
-}
-
-if($id == '') {
-	bailOut('Missing contact id.');
-}
-
-OCP\Util::writeLog('contacts', 'savecrop.php: key: '.$tmpkey, OCP\Util::DEBUG);
-
-$data = OC_Cache::get($tmpkey);
-if($data) {
-	$image = new OC_Image();
-	if($image->loadFromdata($data)) {
-		$w = ($w != -1 ? $w : $image->width());
-		$h = ($h != -1 ? $h : $image->height());
-		OCP\Util::writeLog('contacts',
-			'savecrop.php, x: '.$x1.' y: '.$y1.' w: '.$w.' h: '.$h,
-			OCP\Util::DEBUG);
-		if($image->crop($x1, $y1, $w, $h)) {
-			if(($image->width() <= 200 && $image->height() <= 200)
-						|| $image->resize(200)) {
-				$vcard = OC_Contacts_App::getContactVCard($id);
-				if(!$vcard) {
-					OC_Cache::remove($tmpkey);
-					bailOut(OC_Contacts_App::$l10n
-						->t('Error getting contact object.'));
-				}
-				if($vcard->__isset('PHOTO')) {
-					OCP\Util::writeLog('contacts',
-						'savecrop.php: PHOTO property exists.',
-						OCP\Util::DEBUG);
-					$property = $vcard->__get('PHOTO');
-					if(!$property) {
-						OC_Cache::remove($tmpkey);
-						bailOut(OC_Contacts_App::$l10n
-							->t('Error getting PHOTO property.'));
-					}
-					$property->setValue($image->__toString());
-					$property->parameters[]
-						= new Sabre_VObject_Parameter('ENCODING', 'b');
-					$property->parameters[]
-						= new Sabre_VObject_Parameter('TYPE', $image->mimeType());
-					$vcard->__set('PHOTO', $property);
-				} else {
-					OCP\Util::writeLog('contacts',
-						'savecrop.php: files: Adding PHOTO property.',
-						OCP\Util::DEBUG);
-					$vcard->addProperty('PHOTO',
-						$image->__toString(), array('ENCODING' => 'b',
-						'TYPE' => $image->mimeType()));
-				}
-				$now = new DateTime;
-				$vcard->setString('REV', $now->format(DateTime::W3C));
-				if(!OC_Contacts_VCard::edit($id, $vcard)) {
-					bailOut(OC_Contacts_App::$l10n->t('Error saving contact.'));
-				}
-				OCP\JSON::success(array(
-					'data' => array(
-						'id' => $id,
-						'width' => $image->width(),
-						'height' => $image->height(),
-						'lastmodified' => OC_Contacts_App::lastModified($vcard)->format('U')
-					)
-				));
-			} else {
-				bailOut(OC_Contacts_App::$l10n->t('Error resizing image'));
-			}
-		} else {
-			bailOut(OC_Contacts_App::$l10n->t('Error cropping image'));
-		}
-	} else {
-		bailOut(OC_Contacts_App::$l10n->t('Error creating temporary image'));
-	}
-} else {
-	bailOut(OC_Contacts_App::$l10n->t('Error finding image: ').$tmpkey);
-}
-
-OC_Cache::remove($tmpkey);
diff --git a/apps/contacts/ajax/selectaddressbook.php b/apps/contacts/ajax/selectaddressbook.php
deleted file mode 100644
index e5527c8e5f..0000000000
--- a/apps/contacts/ajax/selectaddressbook.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011 Thomas Tanghus <thomas@tanghus.net>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
- 
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('contacts');
-
-$books = OC_Contacts_Addressbook::all(OCP\USER::getUser());
-if(count($books) > 1) {
-	$addressbooks = array();
-	foreach($books as $book) {
-		$addressbooks[] = array('id' => $book['id'], 'name' => $book['displayname']);
-	}
-	$tmpl = new OCP\Template("contacts", "part.selectaddressbook");
-	$tmpl->assign('addressbooks', $addressbooks);
-	$page = $tmpl->fetchPage();
-	OCP\JSON::success(array('data' => array( 'type' => 'dialog', 'page' => $page )));
-} else {
-	OCP\JSON::success(array('data' => array( 'type' => 'result', 'id' => $books[0]['id'] )));
-}
\ No newline at end of file
diff --git a/apps/contacts/ajax/uploadimport.php b/apps/contacts/ajax/uploadimport.php
deleted file mode 100644
index 87032b731a..0000000000
--- a/apps/contacts/ajax/uploadimport.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-/**
- * ownCloud - Addressbook
- *
- * @author Thomas Tanghus
- * @copyright 2012 Thomas Tanghus <thomas@tanghus.net>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *
- * You should have received a copy of the GNU Affero General Public
- * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-// Check if we are a user
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('contacts');
-OCP\JSON::callCheck();
-require_once 'loghandler.php';
-
-$l10n = OC_Contacts_App::$l10n;
-
-$view = OCP\Files::getStorage('contacts');
-if(!$view->file_exists('imports')) {
-	$view->mkdir('imports');
-}
-$tmpfile = md5(rand());
-
-// If it is a Drag'n'Drop transfer it's handled here.
-$fn = (isset($_SERVER['HTTP_X_FILE_NAME']) ? $_SERVER['HTTP_X_FILE_NAME'] : false);
-if($fn) {
-	if($view->file_put_contents('/imports/'.$fn, file_get_contents('php://input'))) {
-		OCP\JSON::success(array('data' => array('file'=>$tmpfile, 'name'=>$fn)));
-		exit();
-	} else {
-		bailOut($l10n->t('Error uploading contacts to storage.'));
-	}
-}
-
-// File input transfers are handled here
-if (!isset($_FILES['importfile'])) {
-	OCP\Util::writeLog('contacts',
-		'ajax/uploadphoto.php: No file was uploaded. Unknown error.', 
-		OCP\Util::DEBUG);
-	OCP\JSON::error(array('
-		data' => array(
-			'message' => 'No file was uploaded. Unknown error' )));
-	exit();
-}
-$error = $_FILES['importfile']['error'];
-if($error !== UPLOAD_ERR_OK) {
-	$errors = array(
-		0=>$l10n->t("There is no error, the file uploaded with success"),
-		1=>$l10n->t("The uploaded file exceeds the upload_max_filesize directive in php.ini").ini_get('upload_max_filesize'),
-		2=>$l10n->t("The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"),
-		3=>$l10n->t("The uploaded file was only partially uploaded"),
-		4=>$l10n->t("No file was uploaded"),
-		6=>$l10n->t("Missing a temporary folder")
-	);
-	bailOut($errors[$error]);
-}
-$file=$_FILES['importfile'];
-
-if(file_exists($file['tmp_name'])) {
-	if($view->file_put_contents('/imports/'.$file['name'], file_get_contents($file['tmp_name']))) {
-		OCP\JSON::success(array('data' => array('file'=>$file['name'], 'name'=>$file['name'])));
-	} else {
-		bailOut($l10n->t('Error uploading contacts to storage.'));
-	}
-} else {
-	bailOut('Temporary file: \''.$file['tmp_name'].'\' has gone AWOL?');
-}
diff --git a/apps/contacts/ajax/uploadphoto.php b/apps/contacts/ajax/uploadphoto.php
deleted file mode 100644
index 34830b291d..0000000000
--- a/apps/contacts/ajax/uploadphoto.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-/**
- * ownCloud - Addressbook
- *
- * @author Thomas Tanghus
- * @copyright 2012 Thomas Tanghus <thomas@tanghus.net>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *
- * You should have received a copy of the GNU Affero General Public
- * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-// Check if we are a user
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('contacts');
-OCP\JSON::callCheck();
-
-// Firefox and Konqueror tries to download application/json for me.  --Arthur
-OCP\JSON::setContentTypeHeader('text/plain; charset=utf-8');
-require_once 'loghandler.php';
-$l10n = OC_Contacts_App::$l10n;
-// If it is a Drag'n'Drop transfer it's handled here.
-$fn = (isset($_SERVER['HTTP_X_FILE_NAME']) ? $_SERVER['HTTP_X_FILE_NAME'] : false);
-if ($fn) {
-	if (!isset($_GET['id'])) {
-		bailOut($l10n->t('No contact ID was submitted.'));
-	}
-	$id = $_GET['id'];
-	$tmpkey = 'contact-photo-'.md5($fn);
-	$data = file_get_contents('php://input');
-	$image = new OC_Image();
-	sleep(1); // Apparently it needs time to load the data.
-	if($image->loadFromData($data)) {
-		if($image->width() > 400 || $image->height() > 400) {
-			$image->resize(400); // Prettier resizing than with browser and saves bandwidth.
-		}
-		if(!$image->fixOrientation()) { // No fatal error so we don't bail out.
-			debug('Couldn\'t save correct image orientation: '.$tmpkey);
-		}
-		if(OC_Cache::set($tmpkey, $image->data(), 600)) {
-			OCP\JSON::success(array(
-				'data' => array(
-					'mime'=>$_SERVER['CONTENT_TYPE'],
-					'name'=>$fn,
-					'id'=>$id,
-					'tmp'=>$tmpkey)));
-			exit();
-		} else {
-			bailOut($l10n->t('Couldn\'t save temporary image: ').$tmpkey);
-		}
-	} else {
-		bailOut($l10n->t('Couldn\'t load temporary image: ').$tmpkey);
-	}
-}
-
-// Uploads from file dialog are handled here.
-if (!isset($_POST['id'])) {
-	bailOut($l10n->t('No contact ID was submitted.'));
-}
-if (!isset($_FILES['imagefile'])) {
-	bailOut($l10n->t('No file was uploaded. Unknown error'));
-}
-
-$error = $_FILES['imagefile']['error'];
-if($error !== UPLOAD_ERR_OK) {
-	$errors = array(
-		0=>$l10n->t("There is no error, the file uploaded with success"),
-		1=>$l10n->t("The uploaded file exceeds the upload_max_filesize directive in php.ini").ini_get('upload_max_filesize'),
-		2=>$l10n->t("The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"),
-		3=>$l10n->t("The uploaded file was only partially uploaded"),
-		4=>$l10n->t("No file was uploaded"),
-		6=>$l10n->t("Missing a temporary folder")
-	);
-	bailOut($errors[$error]);
-}
-$file=$_FILES['imagefile'];
-
-if(file_exists($file['tmp_name'])) {
-	$tmpkey = 'contact-photo-'.md5(basename($file['tmp_name']));
-	$image = new OC_Image();
-	if($image->loadFromFile($file['tmp_name'])) {
-		if($image->width() > 400 || $image->height() > 400) {
-			$image->resize(400); // Prettier resizing than with browser and saves bandwidth.
-		}
-		if(!$image->fixOrientation()) { // No fatal error so we don't bail out.
-			debug('Couldn\'t save correct image orientation: '.$tmpkey);
-		}
-		if(OC_Cache::set($tmpkey, $image->data(), 600)) {
-			OCP\JSON::success(array(
-				'data' => array(
-					'mime'=>$file['type'],
-					'size'=>$file['size'],
-					'name'=>$file['name'],
-					'id'=>$_POST['id'],
-					'tmp'=>$tmpkey,
-					)));
-			exit();
-		} else {
-			bailOut($l10n->t('Couldn\'t save temporary image: ').$tmpkey);
-		}
-	} else {
-		bailOut($l10n->t('Couldn\'t load temporary image: ').$file['tmp_name']);
-	}
-} else {
-	bailOut('Temporary file: \''.$file['tmp_name'].'\' has gone AWOL?');
-}
diff --git a/apps/contacts/appinfo/app.php b/apps/contacts/appinfo/app.php
deleted file mode 100644
index 102c04705a..0000000000
--- a/apps/contacts/appinfo/app.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-OC::$CLASSPATH['OC_Contacts_App'] = 'apps/contacts/lib/app.php';
-OC::$CLASSPATH['OC_Contacts_Addressbook'] = 'apps/contacts/lib/addressbook.php';
-OC::$CLASSPATH['OC_Contacts_VCard'] = 'apps/contacts/lib/vcard.php';
-OC::$CLASSPATH['OC_Contacts_Hooks'] = 'apps/contacts/lib/hooks.php';
-OC::$CLASSPATH['OC_Share_Backend_Contact'] = 'apps/contacts/lib/share/contact.php';
-OC::$CLASSPATH['OC_Share_Backend_Addressbook'] = 'apps/contacts/lib/share/addressbook.php';
-OC::$CLASSPATH['OC_Connector_Sabre_CardDAV'] = 'apps/contacts/lib/sabre/backend.php';
-OC::$CLASSPATH['OC_Connector_Sabre_CardDAV_AddressBookRoot'] = 'apps/contacts/lib/sabre/addressbookroot.php';
-OC::$CLASSPATH['OC_Connector_Sabre_CardDAV_UserAddressBooks'] = 'apps/contacts/lib/sabre/useraddressbooks.php';
-OC::$CLASSPATH['OC_Connector_Sabre_CardDAV_AddressBook'] = 'apps/contacts/lib/sabre/addressbook.php';
-OC::$CLASSPATH['OC_Connector_Sabre_CardDAV_Card'] = 'apps/contacts/lib/sabre/card.php';
-OC::$CLASSPATH['OC_Connector_Sabre_CardDAV_VCFExportPlugin'] = 'apps/contacts/lib/sabre/vcfexportplugin.php';
-OC::$CLASSPATH['OC_Search_Provider_Contacts'] = 'apps/contacts/lib/search.php';
-OCP\Util::connectHook('OC_User', 'post_createUser', 'OC_Contacts_Hooks', 'createUser');
-OCP\Util::connectHook('OC_User', 'post_deleteUser', 'OC_Contacts_Hooks', 'deleteUser');
-OCP\Util::connectHook('OC_Calendar', 'getEvents', 'OC_Contacts_Hooks', 'getBirthdayEvents');
-OCP\Util::connectHook('OC_Calendar', 'getSources', 'OC_Contacts_Hooks', 'getCalenderSources');
-
-OCP\App::addNavigationEntry( array(
-  'id' => 'contacts_index',
-  'order' => 10,
-  'href' => OCP\Util::linkTo( 'contacts', 'index.php' ),
-  'icon' => OCP\Util::imagePath( 'settings', 'users.svg' ),
-  'name' => OC_L10N::get('contacts')->t('Contacts') ));
-
-OCP\Util::addscript('contacts', 'loader');
-OC_Search::registerProvider('OC_Search_Provider_Contacts');
-OCP\Share::registerBackend('contact', 'OC_Share_Backend_Contact');
-OCP\Share::registerBackend('addressbook', 'OC_Share_Backend_Addressbook', 'contact');
-
diff --git a/apps/contacts/appinfo/database.xml b/apps/contacts/appinfo/database.xml
deleted file mode 100644
index 1e2e097e49..0000000000
--- a/apps/contacts/appinfo/database.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<database>
-
- <name>*dbname*</name>
- <create>true</create>
- <overwrite>false</overwrite>
-
- <charset>utf8</charset>
-
- <table>
-
-  <name>*dbprefix*contacts_addressbooks</name>
-
-  <declaration>
-
-   <field>
-    <name>id</name>
-    <type>integer</type>
-    <default>0</default>
-    <notnull>true</notnull>
-    <autoincrement>1</autoincrement>
-    <unsigned>true</unsigned>
-    <length>4</length>
-   </field>
-
-   <field>
-    <name>userid</name>
-    <type>text</type>
-    <default></default>
-    <notnull>true</notnull>
-    <length>255</length>
-   </field>
-
-   <field>
-    <name>displayname</name>
-    <type>text</type>
-    <default></default>
-    <notnull>false</notnull>
-    <length>255</length>
-   </field>
-
-   <field>
-    <name>uri</name>
-    <type>text</type>
-    <default></default>
-    <notnull>false</notnull>
-    <length>200</length>
-   </field>
-
-   <field>
-    <name>description</name>
-    <type>text</type>
-    <notnull>false</notnull>
-   </field>
-
-   <field>
-    <name>ctag</name>
-    <type>integer</type>
-    <default>1</default>
-    <notnull>true</notnull>
-    <unsigned>true</unsigned>
-    <length>4</length>
-   </field>
-
-   <field>
-    <name>active</name>
-    <type>integer</type>
-    <default>1</default>
-    <notnull>true</notnull>
-    <length>4</length>
-   </field>
-
-  </declaration>
-
- </table>
-
- <table>
-
-  <name>*dbprefix*contacts_cards</name>
-
-  <declaration>
-
-   <field>
-    <name>id</name>
-    <type>integer</type>
-    <default>0</default>
-    <notnull>true</notnull>
-    <autoincrement>1</autoincrement>
-    <unsigned>true</unsigned>
-    <length>4</length>
-   </field>
-
-   <field>
-    <name>addressbookid</name>
-    <type>integer</type>
-    <default></default>
-    <notnull>true</notnull>
-    <unsigned>true</unsigned>
-    <length>4</length>
-   </field>
-
-   <field>
-    <name>fullname</name>
-    <type>text</type>
-    <default></default>
-    <notnull>false</notnull>
-    <length>255</length>
-   </field>
-
-   <field>
-    <name>carddata</name>
-    <type>text</type>
-    <notnull>false</notnull>
-   </field>
-
-   <field>
-    <name>uri</name>
-    <type>text</type>
-    <default></default>
-    <notnull>false</notnull>
-    <length>200</length>
-   </field>
-
-   <field>
-    <name>lastmodified</name>
-    <type>integer</type>
-    <default></default>
-    <notnull>false</notnull>
-    <unsigned>true</unsigned>
-    <length>4</length>
-   </field>
-
-  </declaration>
-
- </table>
-
-</database>
diff --git a/apps/contacts/appinfo/info.xml b/apps/contacts/appinfo/info.xml
deleted file mode 100644
index 74fd6b012d..0000000000
--- a/apps/contacts/appinfo/info.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-<info>
-	<id>contacts</id>
-	<name>Contacts</name>
-	<licence>AGPL</licence>
-	<author>Jakob Sack</author>
-	<require>4</require>
-	<shipped>true</shipped>
-	<description>Address book with CardDAV support.</description>
-	<standalone/>
-	<default_enable/>
-	<remote>
-		<contacts>appinfo/remote.php</contacts>
-		<carddav>appinfo/remote.php</carddav>
-	</remote>
-</info>
diff --git a/apps/contacts/appinfo/migrate.php b/apps/contacts/appinfo/migrate.php
deleted file mode 100644
index 19c960c75a..0000000000
--- a/apps/contacts/appinfo/migrate.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-class OC_Migration_Provider_Contacts extends OC_Migration_Provider{
-	
-	// Create the xml for the user supplied
-	function export( ) {
-		$options = array(
-			'table'=>'contacts_addressbooks',
-			'matchcol'=>'userid',
-			'matchval'=>$this->uid,
-			'idcol'=>'id'
-		);
-		$ids = $this->content->copyRows( $options );
-
-		$options = array(
-			'table'=>'contacts_cards',
-			'matchcol'=>'addressbookid',
-			'matchval'=>$ids
-		);
-		
-		// Export tags
-		$ids2 = $this->content->copyRows( $options );
-		
-		// If both returned some ids then they worked
-		if(is_array($ids) && is_array($ids2)) {
-			return true;
-		} else {
-			return false;
-		}
-		
-	}
-	
-	// Import function for contacts
-	function import( ) {
-		switch( $this->appinfo->version ) {
-			default:
-				// All versions of the app have had the same db structure, so all can use the same import function
-				$query = $this->content->prepare( 'SELECT * FROM `contacts_addressbooks` WHERE `userid` LIKE ?' );
-				$results = $query->execute( array( $this->olduid ) );
-				$idmap = array();
-				while( $row = $results->fetchRow() ) {
-					// Import each addressbook	
-					$addressbookquery = OCP\DB::prepare( 'INSERT INTO `*PREFIX*contacts_addressbooks` (`userid`, `displayname`, `uri`, `description`, `ctag`) VALUES (?, ?, ?, ?, ?)' );
-					$addressbookquery->execute( array( $this->uid, $row['displayname'], $row['uri'], $row['description'], $row['ctag'] ) );
-					// Map the id
-					$idmap[$row['id']] = OCP\DB::insertid('*PREFIX*contacts_addressbooks');
-					// Make the addressbook active
-					OC_Contacts_Addressbook::setActive($idmap[$row['id']], true);
-				}
-				// Now tags
-				foreach($idmap as $oldid => $newid) {
-					
-					$query = $this->content->prepare( 'SELECT * FROM `contacts_cards` WHERE `addressbookid` LIKE ?' );
-					$results = $query->execute( array( $oldid ) );
-					while( $row = $results->fetchRow() ){
-						// Import the contacts
-						$contactquery = OCP\DB::prepare( 'INSERT INTO `*PREFIX*contacts_cards` (`addressbookid`, `fullname`, `carddata`, `uri`, `lastmodified`) VALUES (?, ?, ?, ?, ?)' );
-						$contactquery->execute( array( $newid, $row['fullname'], $row['carddata'], $row['uri'], $row['lastmodified'] ) );	
-					}		
-				}
-				// All done!
-			break;
-		}
-		
-		return true;
-	}
-	
-}
-
-// Load the provider
-new OC_Migration_Provider_Contacts( 'contacts' );
\ No newline at end of file
diff --git a/apps/contacts/appinfo/remote.php b/apps/contacts/appinfo/remote.php
deleted file mode 100644
index d8677d7f73..0000000000
--- a/apps/contacts/appinfo/remote.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-/**
- * ownCloud - Addressbook
- *
- * @author Jakob Sack
- * @copyright 2011 Jakob Sack mail@jakobsack.de
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *
- * You should have received a copy of the GNU Affero General Public
- * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-OCP\App::checkAppEnabled('contacts');
-
-if(substr($_SERVER["REQUEST_URI"], 0, strlen(OC_App::getAppWebPath('contacts').'/carddav.php')) == OC_App::getAppWebPath('contacts').'/carddav.php') {
-	$baseuri = OC_App::getAppWebPath('contacts').'/carddav.php';
-}
-
-// only need authentication apps
-$RUNTIME_APPTYPES=array('authentication');
-OC_App::loadApps($RUNTIME_APPTYPES);
-
-// Backends
-$authBackend = new OC_Connector_Sabre_Auth();
-$principalBackend = new OC_Connector_Sabre_Principal();
-$carddavBackend   = new OC_Connector_Sabre_CardDAV();
-
-// Root nodes
-$principalCollection = new Sabre_CalDAV_Principal_Collection($principalBackend);
-$principalCollection->disableListing = true; // Disable listening
-
-$addressBookRoot = new OC_Connector_Sabre_CardDAV_AddressBookRoot($principalBackend, $carddavBackend);
-$addressBookRoot->disableListing = true; // Disable listening
-
-$nodes = array(
-	$principalCollection,
-	$addressBookRoot,
-	);
-
-// Fire up server
-$server = new Sabre_DAV_Server($nodes);
-$server->setBaseUri($baseuri);
-// Add plugins
-$server->addPlugin(new Sabre_DAV_Auth_Plugin($authBackend, 'ownCloud'));
-$server->addPlugin(new Sabre_CardDAV_Plugin());
-$server->addPlugin(new Sabre_DAVACL_Plugin());
-$server->addPlugin(new Sabre_DAV_Browser_Plugin(false)); // Show something in the Browser, but no upload
-$server->addPlugin(new OC_Connector_Sabre_CardDAV_VCFExportPlugin());
-
-// And off we go!
-$server->exec();
diff --git a/apps/contacts/appinfo/update.php b/apps/contacts/appinfo/update.php
deleted file mode 100644
index cc00b325e1..0000000000
--- a/apps/contacts/appinfo/update.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-$installedVersion=OCP\Config::getAppValue('contacts', 'installed_version');
-if (version_compare($installedVersion, '0.2.3', '<')) {
-	// First set all address books in-active.
-	$stmt = OCP\DB::prepare( 'UPDATE `*PREFIX*contacts_addressbooks` SET `active`=0' );
-	$result = $stmt->execute(array());
-	
-	// Then get all the active address books.
-	$stmt = OCP\DB::prepare( 'SELECT `userid`,`configvalue` FROM `*PREFIX*preferences` WHERE `appid`=\'contacts\' AND `configkey`=\'openaddressbooks\'' );
-	$result = $stmt->execute(array());
-	
-	// Prepare statement for updating the new 'active' field.
-	$stmt = OCP\DB::prepare( 'UPDATE `*PREFIX*contacts_addressbooks` SET `active`=? WHERE `id`=? AND `userid`=?' );
-	while( $row = $result->fetchRow()) {
-		$ids = explode(';', $row['configvalue']);
-		foreach($ids as $id) {
-			$r = $stmt->execute(array(1, $id, $row['userid']));
-		}
-	}
-	
-	// Remove the old preferences.
-	$stmt = OCP\DB::prepare( 'DELETE FROM `*PREFIX*preferences` WHERE `appid`=\'contacts\' AND `configkey`=\'openaddressbooks\'' );
-	$result = $stmt->execute(array());
-}
diff --git a/apps/contacts/appinfo/version b/apps/contacts/appinfo/version
deleted file mode 100644
index 72f9fa8202..0000000000
--- a/apps/contacts/appinfo/version
+++ /dev/null
@@ -1 +0,0 @@
-0.2.4
\ No newline at end of file
diff --git a/apps/contacts/carddav.php b/apps/contacts/carddav.php
deleted file mode 100644
index 264eb30836..0000000000
--- a/apps/contacts/carddav.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-if(!file_exists('../../lib/base.php')) {
-	die('Please update the path to /lib/base.php in carddav.php or make use of /remote.php/carddav/');
-}
-require_once '../../lib/base.php';
-require_once 'appinfo/remote.php';
\ No newline at end of file
diff --git a/apps/contacts/css/contacts.css b/apps/contacts/css/contacts.css
deleted file mode 100644
index bc1a57756a..0000000000
--- a/apps/contacts/css/contacts.css
+++ /dev/null
@@ -1,155 +0,0 @@
-/*dl > dt {
-	font-weight: bold;
-}*/
-#leftcontent { top: 3.5em !important; padding: 0; margin: 0; }
-#leftcontent a { padding: 0 0 0 25px; }
-#rightcontent { top: 3.5em !important; padding-top: 5px; }
-#leftcontent h3 { cursor: pointer; -moz-transition: background 300ms ease 0s; background: none no-repeat scroll 1em center #eee; border-bottom: 1px solid #ddd; border-top: 1px solid #fff; display: block; max-width: 100%; padding: 0.5em 0.8em; color: #666; text-shadow: 0 1px 0 #f8f8f8; font-size: 1.2em; }
-#leftcontent h3:hover,#leftcontent h3:active,#leftcontent h3.active { background-color: #DBDBDB; border-bottom: 1px solid #CCCCCC; border-top: 1px solid #D4D4D4; color: #333333; font-weight: bold; }
-#contacts { position: fixed; background: #fff; max-width: 100%; width: 20em; left: 12.5em; top: 3.7em; bottom: 3em; overflow: auto; padding: 0; margin: 0; }
-.contacts a { height: 23px; display: block; left: 12.5em; margin: 0 0 0 0; padding: 0 0 0 25px; }
-.contacts li.ui-draggable { height: 23px; }
-.ui-draggable-dragging { width: 17em; cursor: move; }
-.ui-state-hover { border: 1px solid dashed; }
-#bottomcontrols { padding: 0; bottom:0px; height:2.8em; width: 20em; margin:0; background:#eee; border-top:1px solid #ccc; position:fixed; -moz-box-shadow: 0 -3px 3px -3px #000; -webkit-box-shadow: 0 -3px 3px -3px #000; box-shadow: 0 -3px 3px -3px #000;}
-#bottomcontrols img { margin-top: 0.35em; }
-#uploadprogressbar { display: none; padding: 0; bottom: 3em; height:2em; width: 20em; margin:0; background:#eee; border:1px solid #ccc; position:fixed; }
-#contacts_newcontact, #bottomcontrols .settings { float: left; margin: 0.2em 0 0 1em; border: 0 none; border-radius: 0; -moz-box-shadow: none; box-shadow: none; outline: 0 none; }
-#bottomcontrols .settings { float: right; margin: 0.2em 1em 0 0; }
-#actionbar { clear: both; height: 30px;}
-#contacts_deletecard {position:relative; float:left; background:url('%webroot%/core/img/actions/delete.svg') no-repeat center; }
-#contacts_downloadcard {position:relative; float:left; background:url('%webroot%/core/img/actions/download.svg') no-repeat center; }
-#contacts_propertymenu { clear: left; float:left; max-width: 15em; margin: 2em; }
-#contacts_propertymenu_button { position:relative;top:0;left:0; margin: 0; }
-#contacts_propertymenu_dropdown { background-color: #fff; position:relative; right:0; overflow:hidden; text-overflow:ellipsis; border: thin solid #1d2d44; box-shadow: 0 3px 5px #bbb; /* -moz-box-shadow:0 0 10px #000; -webkit-box-shadow:0 0 10px #000;  box-shadow:0 0 10px #000; -moz-border-radius:0.5em; -webkit-border-radius:0.5em; border-radius:0.5em; -moz-border-radius:0.5em; -webkit-border-radius:0.5em;*/ border-radius: 3px; }
-#contacts_propertymenu li { display: block; font-weight: bold; height: 20px; }
-#contacts_propertymenu li a { padding: 3px; display: block }
-#contacts_propertymenu li:hover { background-color: #1d2d44; }
-#contacts_propertymenu li a:hover { color: #fff }
-#card { width: auto; font-size: 10px; /*max-width: 70em; border: thin solid lightgray; display: block;*/ }
-#firstrun { width: 100%; position: absolute; top: 5em; left: 0; text-align: center; font-weight:bold; font-size:1.5em; color:#777; }
-#firstrun #selections { font-size:0.8em; margin: 2em auto auto auto; clear: both; }
-
-#card input[type="text"].contacts_property,input[type="email"].contacts_property,input[type="url"].contacts_property { width: 14em; float: left; font-weight: bold; }
-.categories { float: left; width: 16em; }
-#card input[type="checkbox"].contacts_property, #card input[type="text"], #card input[type="email"], #card input[type="url"], #card input[type="tel"], #card input[type="date"], #card select, #card textarea { background-color: #fefefe; border: 0 !important; -moz-appearance:none  !important; -webkit-box-sizing:none !important; -moz-box-sizing:none !important; box-sizing:none !important; -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; -moz-border-radius: 0px; -webkit-border-radius: 0px; border-radius: 0px; float: left; }
-#card input[type="text"]:hover, #card input[type="text"]:focus, #card input[type="text"]:active, input[type="email"]:hover, #card input[type="url"]:hover, #card input[type="tel"]:hover, #card input[type="date"]:hover, #card input[type="date"], #card input[type="date"]:hover, #card input[type="date"]:active, #card input[type="date"]:active, #card input[type="date"]:active, #card input[type="email"]:active, #card input[type="url"]:active, #card input[type="tel"]:active, #card textarea:focus, #card textarea:hover { border: 0 !important; -webkit-appearance:textfield; -moz-appearance:textfield; -webkit-box-sizing:content-box; -moz-box-sizing:content-box; box-sizing:content-box; background:#fff; color:#333; border:1px solid #ddd; -moz-box-shadow:0 1px 1px #ddd, 0 2px 0 #bbb inset; -webkit-box-shadow:0 1px 1px #ddd, 0 1px 0 #bbb inset; box-shadow:0 1px 1px #ddd, 0 1px 0 #bbb inset; -moz-border-radius:.5em; -webkit-border-radius:.5em; border-radius:.5em; outline:none; float: left; }
-#card textarea { width: 80%; min-height: 5em; min-width: 30em; margin: 0 !important; padding: 0 !important; outline: 0 !important;}
-dl.form { width: 100%; float: left; clear: right; margin: 0; padding: 0; cursor: normal; }
-.form dt { display: table-cell; clear: left; float: left; width: 7em; margin: 0; padding: 0.8em 0.5em 0 0; text-align:right; text-overflow:ellipsis; o-text-overflow: ellipsis; vertical-align: text-bottom; color: #bbb;/* white-space: pre-wrap; white-space: -moz-pre-wrap !important; white-space: -pre-wrap; white-space: -o-pre-wrap;*/ }
-.form dd { display: table-cell; clear: right; float: left; margin: 0; padding: 0px; white-space: nowrap; vertical-align: text-bottom; }
-label:hover, dt:hover { color: #333; }
-/*::-webkit-input-placeholder { color: #bbb; }
-:-moz-placeholder { color: #bbb; }
-:-ms-input-placeholder { color: #bbb; }*/
-.droptarget { margin: 0.5em; padding: 0.5em; border: thin solid #ccc; -moz-border-radius:.3em; -webkit-border-radius:.3em; border-radius:.3em; }
-.droppable { margin: 0.5em; padding: 0.5em; border: thin dashed #333; -moz-border-radius:.3em; -webkit-border-radius:.3em; border-radius:.3em; }
-.loading { background: url('%webroot%/core/img/loading.gif') no-repeat center !important; /*cursor: progress; */ cursor: wait; }
-.ui-autocomplete-loading { background: url('%webroot%/core/img/loading.gif') right center no-repeat; }
-.ui-autocomplete-input { margin-top: 0.5em; } /* Ugly hack */
-.float { float: left; }
-.svg { border: inherit; background: inherit; }
-.listactions { height: 1em; width:60px; float: left; clear: right; }
-.add,.edit,.delete,.mail, .globe, .upload, .download, .cloud, .share { cursor: pointer; width: 20px; height: 20px; margin: 0; float: left; position:relative; opacity: 0.1; }
-.add:hover,.edit:hover,.delete:hover,.mail:hover, .globe:hover, .upload:hover, .download:hover .cloud:hover { opacity: 1.0 }
-.add { background:url('%webroot%/core/img/actions/add.svg') no-repeat center; clear: both; }
-.delete { background:url('%webroot%/core/img/actions/delete.svg') no-repeat center; }
-.edit { background:url('%webroot%/core/img/actions/rename.svg') no-repeat center; }
-.share { background:url('%webroot%/core/img/actions/share.svg') no-repeat center; }
-.mail { background:url('%webroot%/core/img/actions/mail.svg') no-repeat center; }
-.upload { background:url('%webroot%/core/img/actions/upload.svg') no-repeat center; }
-.download { background:url('%webroot%/core/img/actions/download.svg') no-repeat center; }
-.cloud { background:url('%webroot%/core/img/places/picture.svg') no-repeat center; }
-/*.globe { background:url('../img/globe.svg') no-repeat center; }*/
-.globe { background:url('%webroot%/core/img/actions/public.svg') no-repeat center; }
-.transparent{ opacity: 0.6; }
-#edit_name_dialog { padding:0; }
-#edit_name_dialog > input { width: 15em; }
-#edit_address_dialog { /*width: 30em;*/ }
-#edit_address_dialog > input { width: 15em; }
-#edit_photo_dialog_img { display: block; min-width: 150; min-height: 200; }
-#fn { float: left !important; width: 18em !important; }
-#name { /*position: absolute; top: 0px; left: 0px;*/ min-width: 25em; height: 2em; clear: right; display: block; }
-#identityprops { /*position: absolute; top: 2.5em; left: 0px;*/ }
-#contact_photo { float: left; margin: 1em; }
-#contact_identity { min-width: 30em; padding: 0.5em;}
-.contactsection { position: relative; float: left; width: 35em; padding: 0.5em; height: auto; }
-
-#cropbox { margin: auto; }
-#contacts_details_photo_wrapper { width: 150px; }
-#contacts_details_photo_wrapper.wait { opacity: 0.6; filter:alpha(opacity=0.6); z-index:1000; background: url('%webroot%/core/img/loading.gif') no-repeat center center; cursor: wait; }
-.contacts_details_photo { border-radius: 0.5em; border: thin solid #bbb; margin: 0.3em; background: url('%webroot%/core/img/loading.gif') no-repeat center center; -moz-box-shadow: 0 1px 3px #777; -webkit-box-shadow: 0 1px 3px #777; box-shadow: 0 1px 3px #777; opacity: 1; }
-.contacts_details_photo:hover { background: #fff; cursor: default; }
-#phototools { position:absolute; margin: 5px 0 0 10px; width:auto; height:22px; padding:0px; background-color:#fff; list-style-type:none; border-radius: 0.5em; -moz-box-shadow: 0 1px 3px #777; -webkit-box-shadow: 0 1px 3px #777; box-shadow: 0 1px 3px #777; }
-#phototools li { display: inline; }
-#phototools li a { float:left; cursor:pointer; width:22px; height:22px; opacity: 0.6; }
-#phototools li a:hover { opacity: 0.8; }
-
-/* Address editor */
-#addressdisplay { padding: 0.5em; }
-dl.addresscard { background-color: #fff; float: left; width: auto; margin: 0 0.3em 0.3em 0.3em; padding: 0; border: 0; }
-dl.addresscard dd {}
-dl.addresscard dt { padding: 0.3em; font-weight: bold; clear: both; color: #aaa; }
-dl.addresscard dt:hover { color:#777; }
-dl.addresscard dd > ul { margin: 0.3em; padding: 0.3em; }
-dl.addresscard .action { float: right; }
-#address dt { width: 30%; white-space:nowrap; }
-#address dd { width: 66%; }
-#address input { width: 12em; padding: 0.6em 0.5em 0.4em; }
-#address input:-moz-placeholder { color: #aaa; }
-#address input::-webkit-input-placeholder { color: #aaa; }
-#address input:-ms-input-placeholder { color: #aaa; }
-#address input:placeholder { color: #aaa; }
-#adr_type {} /* Select */
-#adr_pobox {}
-#adr_extended {}
-#adr_street {}
-#adr_city {}
-#adr_region {}
-#adr_zipcode {}
-#adr_country {}
-
-#file_upload_form { width: 0; height: 0; }
-#file_upload_target, #import_upload_target, #crop_target { display:none; }
-#file_upload_start, #import_upload_start { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; filter:alpha(opacity=0); opacity:0; z-index:1001; width:0; height:0;}
-#import_upload_start { width: 20px; height: 20px; margin: 0 0 -24px 0; padding: 0;}
-input[type="checkbox"] { width: 20px; height: 20px; vertical-align: bottom; }
-.big { font-weight:bold; font-size:1.2em; }
-.huge { font-weight:bold; font-size:1.5em; }
-.propertycontainer dd { float: left; width: 25em; }
-/*.propertylist { clear: none; max-width: 33em; }*/
-.propertylist li.propertycontainer { white-space: nowrap; min-width: 35em; display: block; clear: both; }
-.propertycontainer[data-element="EMAIL"] > input[type="email"],.propertycontainer[data-element="TEL"] > input[type="text"] { min-width: 12em !important; float: left; }
-.propertylist li > input[type="checkbox"],input[type="radio"] { float: left; clear: left; width: 16px; height: 16px; vertical-align: middle; padding: 0; }
-.propertylist li > select { float: left; max-width: 8em; }
-.propertylist li > .select_wrapper { float: left; overflow: hidden; color: #bbb; font-size: 0.8em; }
-.propertylist li > .select_wrapper select { float: left; overflow: hidden; color: #bbb; }
-.propertylist li > .select_wrapper select option { color: #777; }
-.propertylist li > .select_wrapper select:hover,.propertylist li > select:focus,.propertylist li > select:active { color: #777; }
-.propertylist li > .select_wrapper select.impp { margin-left: -23px; direction: rtl; }
-.propertylist li > .select_wrapper select.types { margin-right: -23px; }
-.propertylist li > input[type="checkbox"].impp { clear: none; }
-.propertylist li > label.xab { display: block; color: #bbb; float:left; clear: both; padding: 0.5em 0 0 2.5em; }
-.propertylist li > label.xab:hover { color: #777; }
-.typelist[type="button"] { float: left; max-width: 8em; border: 0; background-color: #fff; color: #bbb; box-shadow: none; } /* for multiselect */
-.typelist[type="button"]:hover { color: #777; } /* for multiselect */
-.addresslist { clear: both; font-weight: bold; }
-#ninjahelp { position: absolute; bottom: 0; left: 0; right: 0; padding: 1em; margin: 1em; opacity: 0.9; }
-#ninjahelp .close { position: absolute; top: 5px; right: 5px; height: 20px; width: 20px; }
-#ninjahelp h2, .help-section h3 { width: 100%; font-weight: bold; text-align: center; }
-#ninjahelp h2 { font-size: 1.4em; }
-.help-section { width: 45%; min-width: 35em; float: left; }
-.help-section h3 { font-size: 1.2em; }
-.help-section dl { width: 100%; float: left; clear: right; margin: 0; padding: 0; cursor: normal; }
-.help-section dt { display: table-cell; clear: left; float: left; width: 35%; margin: 0; padding: 0.2em; text-align: right; text-overflow: ellipsis; vertical-align: text-bottom; font-weight: bold: }
-.help-section dd { display: table-cell; clear: right; float: left; margin: 0; padding: 0.2em; white-space: nowrap; vertical-align: text-bottom; }
-.contacts-settings dl { width: 100%; }
-.addressbooks-settings table { width: 100%; }
-.addressbooks-settings .actions { width: 100%; white-space: nowrap; }
-.addressbooks-settings .actions * { float: left; }
-.addressbooks-settings .actions input.name { width: 5em; }
-.addressbooks-settings .actions input.name { width: 7em; }
-.addressbooks-settings a.action { opacity: 0.2; }
-.addressbooks-settings a.action:hover { opacity: 1; }
-.addressbooks-settings td.active, .addressbooks-settings td.action { width: 20px; }
-
diff --git a/apps/contacts/css/jquery.Jcrop.css b/apps/contacts/css/jquery.Jcrop.css
deleted file mode 100644
index a9ba4746e0..0000000000
--- a/apps/contacts/css/jquery.Jcrop.css
+++ /dev/null
@@ -1,84 +0,0 @@
-/* jquery.Jcrop.css
-   The code contained in this file is free software under MIT License
-   Copyright (c)2008-2011 Tapmodo Interactive LLC
-*/
-
-/*
-  The outer-most container in a typical Jcrop instance
-  If you are having difficulty with formatting related to styles
-  on a parent element, place any fixes here or in a like selector
-*/
-.jcrop-holder {
-  direction: ltr;
-  text-align: left;
-}
-
-.jcrop-vline, .jcrop-hline {
-	background: white url('%appswebroot%/contacts/img/Jcrop.gif') top left repeat;
-	font-size: 0px;
-	position: absolute;
-}
-
-.jcrop-vline {
-  height: 100%;
-  width: 1px !important;
-}
-
-.jcrop-hline {
-  width: 100%;
-  height: 1px !important;
-}
-
-.jcrop-vline.right {
-  right: 0px;
-}
-
-.jcrop-hline.bottom {
-  bottom: 0px;
-}
-
-.jcrop-handle {
-	background-color: #333;
-	border: 1px #eee solid;
-	font-size: 1px;
-}
-
-.jcrop-tracker {
-  height: 100%; 
-  -webkit-tap-highlight-color: transparent; /* "turn off" link highlight */
-  -webkit-touch-callout: none;              /* disable callout, image save panel */
-  -webkit-user-select: none;                /* disable cut copy paste */
-  width: 100%;
-}
-
-/*
-*/
-
-.jcrop-light .jcrop-vline, .jcrop-light .jcrop-hline {
-	background: white;
-  filter: Alpha(opacity=70) !important;
-  opacity: .70 !important;
-}
-
-.jcrop-light .jcrop-handle {
-	background-color: black;
-	border-color: white;
-  border-radius: 3px;
-	-moz-border-radius: 3px;
-	-webkit-border-radius: 3px;
-}
-
-.jcrop-dark .jcrop-vline, .jcrop-dark .jcrop-hline {
-	background: black;
-  filter: Alpha(opacity=70) !important;
-  opacity: 0.70 !important;
-}
-
-.jcrop-dark .jcrop-handle {
-	background-color: white;
-	border-color: black;
-  border-radius: 3px;
-	-moz-border-radius: 3px;
-	-webkit-border-radius: 3px;
-}
-
diff --git a/apps/contacts/css/jquery.combobox.css b/apps/contacts/css/jquery.combobox.css
deleted file mode 100644
index 59294235d2..0000000000
--- a/apps/contacts/css/jquery.combobox.css
+++ /dev/null
@@ -1,3 +0,0 @@
-.combo-button { background:url('../../../core/img/actions/triangle-s.svg') no-repeat center; margin-left: -1px; float: left; border: none; }
-.ui-button-icon-only .ui-button-text { padding: 0.35em; } 
-.ui-autocomplete-input { margin: 0; padding: 0.48em 0 0.47em 0.45em; }
diff --git a/apps/contacts/export.php b/apps/contacts/export.php
deleted file mode 100644
index 161ca8047a..0000000000
--- a/apps/contacts/export.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011-2012 Thomas Tanghus <thomas@tanghus.net>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
- 
-OCP\User::checkLoggedIn();
-OCP\App::checkAppEnabled('contacts');
-$bookid = isset($_GET['bookid']) ? $_GET['bookid'] : null;
-$contactid = isset($_GET['contactid']) ? $_GET['contactid'] : null;
-$nl = "\n";
-if(isset($bookid)) {
-	$addressbook = OC_Contacts_App::getAddressbook($bookid);
-	//$cardobjects = OC_Contacts_VCard::all($bookid);
-	header('Content-Type: text/directory');
-	header('Content-Disposition: inline; filename=' 
-		. str_replace(' ', '_', $addressbook['displayname']) . '.vcf'); 
-
-	$start = 0;
-	$batchsize = OCP\Config::getUserValue(OCP\User::getUser(), 
-		'contacts', 
-		'export_batch_size', 20);
-	while($cardobjects = OC_Contacts_VCard::all($bookid, $start, $batchsize)){
-		foreach($cardobjects as $card) {
-			echo $card['carddata'] . $nl;
-		}
-		$start += $batchsize;
-	}
-}elseif(isset($contactid)) {
-	$data = OC_Contacts_App::getContactObject($contactid);
-	header('Content-Type: text/vcard');
-	header('Content-Disposition: inline; filename=' 
-		. str_replace(' ', '_', $data['fullname']) . '.vcf'); 
-	echo $data['carddata'];
-}
diff --git a/apps/contacts/img/Jcrop.gif b/apps/contacts/img/Jcrop.gif
deleted file mode 100644
index 72ea7ccb53..0000000000
Binary files a/apps/contacts/img/Jcrop.gif and /dev/null differ
diff --git a/apps/contacts/img/contact-new.png b/apps/contacts/img/contact-new.png
deleted file mode 100644
index a91f2e620f..0000000000
Binary files a/apps/contacts/img/contact-new.png and /dev/null differ
diff --git a/apps/contacts/img/contact-new.svg b/apps/contacts/img/contact-new.svg
deleted file mode 100644
index 8322414dac..0000000000
--- a/apps/contacts/img/contact-new.svg
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   width="20"
-   height="20"
-   id="svg3796"
-   inkscape:version="0.48.2 r9819"
-   sodipodi:docname="contact-new.svg">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     id="namedview18"
-     showgrid="false"
-     inkscape:zoom="11.8"
-     inkscape:cx="10"
-     inkscape:cy="10"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg3796" />
-  <defs
-     id="defs3798">
-    <linearGradient
-       id="linearGradient4338">
-      <stop
-         id="stop4340"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-    </linearGradient>
-  </defs>
-  <metadata
-     id="metadata3801">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     transform="matrix(1.2460746,0,0,1.2420314,-0.12303732,-0.51608095)">
-    <g
-       transform="matrix(1.0633871,0,0,1.0633871,-0.03169354,-0.53733376)"
-       id="g4344">
-      <rect
-         width="13.408871"
-         height="9.1084709"
-         x="0.5"
-         y="2.5104902"
-         id="rect3804"
-         style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
-      <rect
-         width="3.168951"
-         height="4.3600798"
-         x="1.2451615"
-         y="3.2825413"
-         id="rect4314"
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
-      <rect
-         width="6.1161237"
-         height="0.70080578"
-         x="5.001205"
-         y="3.3217869"
-         id="rect4316"
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
-      <rect
-         width="2.5802398"
-         height="0.70080578"
-         x="5.001205"
-         y="5.1219902"
-         id="rect4318"
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
-      <rect
-         width="8.1389055"
-         height="0.70080578"
-         x="1.2264099"
-         y="8.4221916"
-         id="rect4322"
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
-      <rect
-         width="4.3481827"
-         height="0.70080578"
-         x="1.2264099"
-         y="9.9221954"
-         id="rect4326"
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
-      <rect
-         width="2.5802398"
-         height="0.70080578"
-         x="8.6010017"
-         y="5.1219902"
-         id="rect4328"
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
-      <rect
-         width="4.9374957"
-         height="0.70080578"
-         x="5.001205"
-         y="6.8221936"
-         id="rect4330"
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
-      <path
-         d="m 10.823783,8.4435567 1.999999,0 0,1.9999993 2,0 0,2 -2,0 0,2 -1.999999,0 0,-2 -2.0000004,0 0,-2 2.0000004,0 z"
-         id="path4336"
-         style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         inkscape:connector-curvature="0" />
-    </g>
-  </g>
-</svg>
diff --git a/apps/contacts/img/globe.svg b/apps/contacts/img/globe.svg
deleted file mode 100644
index 4e43cfba10..0000000000
--- a/apps/contacts/img/globe.svg
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   version="1.0"
-   width="16"
-   height="16"
-   id="svg2485">
-  <defs
-     id="defs2487">
-    <linearGradient
-       id="linearGradient3707-319-631">
-      <stop
-         id="stop4637"
-         style="stop-color:#254b6d;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4639"
-         style="stop-color:#415b73;stop-opacity:1"
-         offset="0.5" />
-      <stop
-         id="stop4641"
-         style="stop-color:#6195b5;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="20"
-       y1="43"
-       x2="20"
-       y2="2.6887112"
-       id="linearGradient2483"
-       xlink:href="#linearGradient3707-319-631"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.3769285,0,0,0.3769199,-1.196178,-0.8960149)" />
-    <linearGradient
-       id="linearGradient2867-449-88-871-390-598-476-591-434-148">
-      <stop
-         id="stop4627"
-         style="stop-color:#51cfee;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4629"
-         style="stop-color:#49a3d2;stop-opacity:1"
-         offset="0.26238" />
-      <stop
-         id="stop4631"
-         style="stop-color:#3470b4;stop-opacity:1"
-         offset="0.704952" />
-      <stop
-         id="stop4633"
-         style="stop-color:#273567;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="61.240059"
-       cy="-8.7256308"
-       r="9.7552834"
-       fx="61.240059"
-       fy="-8.7256308"
-       id="radialGradient2481"
-       xlink:href="#linearGradient2867-449-88-871-390-598-476-591-434-148"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0,1.3551574,-1.3551567,0,-3.824604,-80.384092)" />
-    <linearGradient
-       id="linearGradient4873">
-      <stop
-         id="stop4875"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4877"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="63.397362"
-       y1="-12.489107"
-       x2="63.397362"
-       y2="5.4675598"
-       id="linearGradient2464"
-       xlink:href="#linearGradient4873"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.7432394,0,0,0.7432224,-38.229789,10.609333)" />
-  </defs>
-  <g
-     id="layer1">
-    <path
-       d="M 15.5,7.999735 C 15.5,12.142003 12.141888,15.5 8.000094,15.5 C 3.857922,15.5 0.5,12.141965 0.5,7.999735 C 0.5,3.8576552 3.857922,0.4999997 8.000094,0.4999997 C 12.141888,0.4999997 15.5,3.8576552 15.5,7.999735 L 15.5,7.999735 z"
-       id="path6495"
-       style="fill:url(#radialGradient2481);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient2483);stroke-width:0.99999994;stroke-miterlimit:4;stroke-dasharray:none" />
-    <path
-       d="M 8.1022062,0.95621712 L 7.236144,1.0568701 L 6.2834735,1.3210847 C 6.3646244,1.2921995 6.446834,1.2606694 6.5309208,1.2330132 L 6.4195696,1.0317069 L 6.048401,1.0946151 L 5.8628152,1.2707582 L 5.5782512,1.3085031 L 5.318433,1.4343196 L 5.1947098,1.4972277 L 5.157592,1.5475543 L 4.9720082,1.5852992 L 4.8606579,1.8243504 L 4.712189,1.522391 L 4.6626994,1.6482076 L 4.6874462,1.9879118 L 4.4523728,2.1892181 L 4.3162766,2.5540857 L 4.6008407,2.5540857 L 4.712191,2.3150345 L 4.7493088,2.2269631 C 4.8744282,2.136984 4.9930427,2.0367771 5.1204782,1.9501669 L 5.4174142,2.05082 C 5.6107409,2.1843878 5.8054259,2.3200676 5.9989133,2.4534326 L 6.2834735,2.1892181 L 5.9617936,2.05082 L 5.8133266,1.7488605 L 5.2689442,1.6859524 L 5.2565714,1.6230443 L 5.4916438,1.6733709 L 5.6277409,1.5349726 L 5.9246759,1.4720643 C 5.9949454,1.4373108 6.06407,1.4122795 6.1350055,1.3839929 L 5.9494207,1.560136 L 6.6175262,2.0256568 L 6.6175262,2.302453 L 6.357707,2.5666673 L 6.7041325,3.2712399 L 6.9392071,3.1328408 L 7.2361431,2.6673207 C 7.6536127,2.5360677 8.0298636,2.383337 8.423888,2.2017997 L 8.3991411,2.3779426 L 8.5970969,2.5163408 L 8.9435226,2.2772895 L 8.7703107,2.0759833 L 8.5352353,2.2143814 L 8.4610018,2.1892185 C 8.4780536,2.1812953 8.4933662,2.1721092 8.5104914,2.1640557 L 8.8569181,1.2581766 L 8.1022062,0.95621712 z M 4.712189,2.3150345 L 4.9967521,2.5163408 L 5.2318265,2.5163408 L 5.2318265,2.2772895 L 4.9472634,2.1514733 L 4.712189,2.3150345 L 4.712189,2.3150345 z M 11.281895,2.1514733 L 10.774628,2.2772895 L 10.452951,2.4911776 L 10.452951,2.6799019 L 9.9456829,3.0070243 L 10.044661,3.4977095 L 10.341597,3.2838208 L 10.527183,3.4977095 L 10.737514,3.6235259 L 10.873608,3.2586575 L 10.799375,3.0447699 L 10.873608,2.8937896 L 11.170544,2.6169941 L 11.30664,2.6169941 L 11.170544,2.9189543 L 11.170544,3.1957496 C 11.292932,3.1618717 11.416467,3.1486778 11.541713,3.1328408 L 11.195288,3.3844746 L 11.170543,3.5354537 L 10.774628,3.8751588 L 10.366341,3.7745049 L 10.366341,3.5354537 L 10.180756,3.6612703 L 10.267364,3.8751588 L 9.9704267,3.8751588 L 9.8095868,4.1519548 L 9.61163,4.3784244 L 9.2528324,4.4539139 L 9.463162,4.6678019 L 9.5126507,4.88169 L 9.2528324,4.88169 L 8.9064068,5.0704143 L 8.9064068,5.6240059 L 9.0672458,5.6240059 L 9.2157146,5.7875676 L 9.5497684,5.6240059 L 9.6734907,5.2843013 L 9.920937,5.1333218 L 9.9704267,5.0075057 L 10.366341,4.9068526 L 10.589042,5.1584854 L 10.824117,5.2843013 L 10.688021,5.5610979 L 10.898351,5.49819 L 11.009701,5.2213934 L 10.737512,4.9068526 L 10.848862,4.9068526 L 11.121054,5.1333218 L 11.170543,5.4352821 L 11.405615,5.7120781 L 11.467479,5.3094657 L 11.591202,5.2465566 C 11.722897,5.3855865 11.826706,5.5556097 11.937626,5.7120781 L 12.345913,5.7372433 L 12.580987,5.8882234 L 12.469637,6.0517841 L 12.234564,6.2656727 L 11.888135,6.2656727 L 11.430361,6.1146942 L 11.195287,6.1398593 L 11.022074,6.3411657 L 10.527181,5.8378996 L 10.180756,5.7372462 L 9.6734907,5.8001547 L 9.2280866,5.9259711 C 8.974001,6.2188978 8.7138634,6.5150518 8.4733747,6.8192683 L 8.1888107,7.5238405 L 8.3249076,7.6748196 L 8.0774604,8.0396877 L 8.3496515,8.6813514 C 8.5761437,8.9418962 8.8039678,9.2006825 9.030129,9.461412 L 9.3641827,9.1720348 L 9.5002778,9.3481795 L 9.8590764,9.1091277 L 9.9827973,9.2475248 L 10.341595,9.2475248 L 10.551927,9.4865757 L 10.428203,9.914352 L 10.675649,10.203731 L 10.663275,10.706995 L 10.848861,11.071864 L 10.712766,11.386405 C 10.699498,11.611997 10.68802,11.827605 10.68802,12.053231 C 10.79718,12.358902 10.906621,12.663823 11.0097,12.971693 L 11.083934,13.462375 L 11.083934,13.714009 L 11.281891,13.714009 L 11.566453,13.525283 L 11.91288,13.525283 L 12.432517,12.933947 L 12.370656,12.732639 L 12.717083,12.418101 L 12.457262,12.128722 L 12.76657,11.877089 L 13.063506,11.688364 L 13.199602,11.537384 L 13.112995,11.19768 C 13.112995,10.911684 13.112996,10.628161 13.112995,10.342127 L 13.348069,9.8136993 L 13.645006,9.4865757 L 13.966685,8.6813514 L 13.966685,8.467463 C 13.806607,8.4879689 13.653171,8.506459 13.496537,8.5177905 L 13.818218,8.1906678 L 14.263621,7.8887078 L 14.498696,7.6119125 L 14.498696,7.3099534 C 14.445379,7.2077028 14.391536,7.0976601 14.337854,6.9954116 L 14.127525,7.2470431 L 13.966685,7.0583197 L 13.731609,6.8695964 L 13.731609,6.4795648 L 14.003802,6.7941047 L 14.313111,6.75636 C 14.452648,6.8851798 14.586636,6.9997236 14.709024,7.1463926 L 14.906986,6.9199159 C 14.906986,6.6761022 14.63695,5.4724677 14.053296,4.4539139 C 13.46964,3.4356954 12.444894,2.5037591 12.444895,2.5037591 L 12.370661,2.6421572 L 12.098469,2.9441167 L 11.752043,2.579249 L 12.098469,2.579249 L 12.259308,2.4031061 L 11.615949,2.2772895 L 11.281895,2.1514733 z M 3.8461259,2.3150345 L 3.7224027,2.6421572 C 3.7224027,2.6421572 3.5057941,2.6785236 3.4502116,2.6924839 C 2.7403769,3.3576613 1.3089548,4.8004591 0.97574709,7.5112538 C 0.98894063,7.5741032 1.2108206,7.9390292 1.2108206,7.9390292 L 1.7552039,8.2661509 L 2.2995852,8.417131 L 2.5346596,8.7065091 L 2.8934573,8.9833054 L 3.1037868,8.9455608 L 3.2522558,9.0210508 L 3.2522558,9.0713763 L 3.0542972,9.6375498 L 2.8934573,9.8766016 L 2.942946,9.9898366 L 2.8192238,10.442776 L 3.2769996,11.298327 L 3.7471476,11.713522 L 3.957476,12.015482 L 3.9327303,12.644563 L 4.0811982,12.99685 L 3.9327303,13.67626 C 3.9327303,13.67626 3.9129189,13.670673 3.9327303,13.739167 C 3.9527179,13.807695 4.759781,14.268689 4.8111654,14.22985 C 4.8623746,14.190288 4.9101447,14.154361 4.9101447,14.154361 L 4.860656,14.00338 L 5.0709847,13.802075 L 5.1452191,13.588188 L 5.4792709,13.474953 L 5.7390901,12.820706 L 5.6648567,12.644563 L 5.8380694,12.367767 L 6.2339838,12.279695 L 6.4319415,11.801593 L 6.3824509,11.210255 L 6.6917597,10.769898 L 6.7412484,10.316959 C 6.3168632,10.102948 5.9004921,9.8830534 5.4792709,9.6627135 L 5.2689423,9.2475198 L 4.8853999,9.1594491 L 4.6750703,8.5932746 L 4.1678047,8.6561827 L 3.7224017,8.32906 L 3.2522529,8.7442535 L 3.2522529,8.8071626 C 3.1114329,8.7658292 2.9446126,8.7597462 2.8192238,8.6813464 L 2.7202454,8.3793874 L 2.7202454,8.0522637 L 2.3985655,8.0900083 C 2.4244522,7.8816386 2.4591052,7.6692598 2.485171,7.4609265 L 2.2995852,7.4609265 L 2.1140005,7.6999783 L 1.9407887,7.7880501 L 1.6809694,7.6370692 L 1.6562245,7.3099456 L 1.7057143,6.9576606 L 2.0892557,6.6557005 L 2.3985645,6.6557005 L 2.4604271,6.4795582 L 2.8439686,6.5676288 L 3.1285316,6.932497 L 3.1780203,6.3285781 L 3.672914,5.9133853 L 3.8461259,5.4730269 L 4.2172963,5.3220476 L 4.415253,5.0200879 L 4.8854018,4.9320161 L 5.1204763,4.57973 C 4.8878,4.57973 4.6479303,4.57973 4.415253,4.57973 L 4.8606579,4.3658421 L 5.1699649,4.3658421 L 5.5658793,4.2274443 L 5.6401139,4.6174752 L 5.8133266,4.3406788 L 5.615369,4.2022808 L 5.6648596,4.0387201 L 5.5040187,3.8877395 L 5.3308048,3.8374132 L 5.3802955,3.6486888 L 5.2441994,3.3844746 L 4.9348905,3.5102908 L 4.9843801,3.2712399 L 4.6255827,3.0573516 L 4.3410204,3.5606172 L 4.3657663,3.7367603 L 4.0812032,3.8625768 L 3.9079904,4.2526078 L 3.821384,3.8877395 L 3.3388631,3.6864335 L 3.2522568,3.4096375 L 3.9079904,3.0321885 L 4.1925535,2.755392 L 4.2173002,2.4282694 L 4.0564593,2.3401977 L 3.8461298,2.315035 L 3.8461259,2.3150345 z M 9.1538541,2.9189543 L 9.1538541,3.1202592 L 9.2652062,3.246076 L 9.2652062,3.5480356 L 9.2033438,3.9506479 L 9.5250246,3.8877395 L 9.760098,3.6486888 L 9.5497694,3.4473819 C 9.4815603,3.2626763 9.4124355,3.0961113 9.3270669,2.9189543 L 9.1538541,2.9189543 z M 8.881662,3.3215656 L 8.6837063,3.3844746 L 8.7331959,3.7493421 L 8.9930152,3.6109428 L 8.881662,3.3215656 L 8.881662,3.3215656 z M 12.506754,6.6305386 L 12.803691,6.9828228 L 13.162489,7.7628866 L 13.385189,8.0145183 L 13.273839,8.2787347 L 13.471797,8.5177846 C 13.380952,8.5238987 13.292977,8.5303684 13.199605,8.5303684 C 13.029984,8.1679096 12.895741,7.802374 12.766575,7.4231829 L 12.543871,7.1715503 L 12.420149,6.7186111 L 12.506754,6.6305399 L 12.506754,6.6305386 z"
-       id="path6534"
-       style="opacity:0.4;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-    <path
-       d="M 14.500001,7.9997709 C 14.500001,11.589737 11.589636,14.5 8.0000818,14.5 C 4.4101984,14.5 1.5000001,11.589705 1.5000001,7.9997709 C 1.5000001,4.4099703 4.4101984,1.5000014 8.0000818,1.5000014 C 11.589636,1.5000014 14.500001,4.4099703 14.500001,7.9997709 L 14.500001,7.9997709 z"
-       id="path2451"
-       style="opacity:0.4;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient2464);stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-  </g>
-</svg>
diff --git a/apps/contacts/img/person.png b/apps/contacts/img/person.png
deleted file mode 100644
index e88bb5653a..0000000000
Binary files a/apps/contacts/img/person.png and /dev/null differ
diff --git a/apps/contacts/img/person.svg b/apps/contacts/img/person.svg
deleted file mode 100644
index c4842c5916..0000000000
--- a/apps/contacts/img/person.svg
+++ /dev/null
@@ -1,175 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   version="1.0"
-   width="22"
-   height="22"
-   id="svg11300">
-  <defs
-     id="defs3">
-    <linearGradient
-       id="linearGradient3785">
-      <stop
-         id="stop3787"
-         style="stop-color:#b8b8b8;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3789"
-         style="stop-color:#878787;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6954">
-      <stop
-         id="stop6960"
-         style="stop-color:#f5f5f5;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop6962"
-         style="stop-color:#d2d2d2;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3341">
-      <stop
-         id="stop3343"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3345"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5060">
-      <stop
-         id="stop5062"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop5064"
-         style="stop-color:#000000;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="24.999998"
-       cy="28.659998"
-       r="16"
-       fx="24.999998"
-       fy="28.659998"
-       id="radialGradient2871"
-       xlink:href="#linearGradient6954"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.67742373,0,0,0.19285627,-5.0162555,9.9977318)" />
-    <linearGradient
-       x1="30"
-       y1="25.084745"
-       x2="30"
-       y2="45"
-       id="linearGradient2873"
-       xlink:href="#linearGradient3785"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.51613236,0,0,0.51667107,-0.98397254,-0.49180897)" />
-    <linearGradient
-       x1="29.996229"
-       y1="21.440447"
-       x2="29.996229"
-       y2="43.531425"
-       id="linearGradient2875"
-       xlink:href="#linearGradient3341"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.51613236,0,0,0.51667107,-0.98397254,-0.49180897)" />
-    <radialGradient
-       cx="26.375898"
-       cy="12.31301"
-       r="8"
-       fx="26.375898"
-       fy="12.31301"
-       id="radialGradient2877"
-       xlink:href="#linearGradient6954"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.86552039,-0.07102871,0.06760608,0.84907396,-11.038912,-4.204803)" />
-    <linearGradient
-       x1="30"
-       y1="5"
-       x2="30"
-       y2="44.678879"
-       id="linearGradient2879"
-       xlink:href="#linearGradient3785"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.52770326,0,0,0.53573244,-1.3310981,-1.4043014)" />
-    <linearGradient
-       x1="22"
-       y1="39"
-       x2="17"
-       y2="37.4375"
-       id="linearGradient2881"
-       xlink:href="#linearGradient5060"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.74999995,0,0,0.43478262,-5.1276295,2.9173914)" />
-    <radialGradient
-       cx="30"
-       cy="33.1875"
-       r="4.6875"
-       fx="30"
-       fy="33.1875"
-       id="radialGradient2883"
-       xlink:href="#linearGradient5060"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.81491924,-3.8844793e-7,1.136461e-7,0.25340272,-9.9475804,6.5902095)" />
-    <linearGradient
-       x1="22"
-       y1="39"
-       x2="17"
-       y2="37.4375"
-       id="linearGradient2885"
-       xlink:href="#linearGradient5060"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.74999995,0,0,0.43478262,34.15,2.9173914)" />
-    <linearGradient
-       x1="30.00001"
-       y1="6.333993"
-       x2="30.00001"
-       y2="24.913183"
-       id="linearGradient2887"
-       xlink:href="#linearGradient3341"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.52770326,0,0,0.53573244,-1.3310981,-1.4043014)" />
-  </defs>
-  <g
-     transform="translate(-3,-1.0000003)"
-     id="g3758">
-    <path
-       d="m 12.177403,10.099947 c 0.23753,1.124653 0.370116,1.975373 0.177421,3.100026 -1.502303,1.247697 -5.3445034,1.80835 -5.3387447,3.100025 l -0.5161321,3.875036 c 0,1.284073 3.5817448,2.325019 8.0000528,2.325019 4.418307,0 8.000053,-1.040946 8.000053,-2.325019 l -0.516134,-3.875036 c -0.0061,-1.105498 -3.870993,-1.808346 -5.354873,-3.100025 -0.126751,-1.043848 -0.02586,-2.056174 0.193549,-3.100026 l -4.645192,0 z"
-       id="path3766"
-       style="fill:url(#radialGradient2871);fill-opacity:1;stroke:url(#linearGradient2873);stroke-width:0.99989432;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    <path
-       d="m 13.21875,11.09375 c 0.08722,0.856711 0.3354,1.801007 -0.04818,2.615857 -0.642554,0.728465 -1.594602,1.093826 -2.46738,1.472715 C 9.3226847,15.510467 7.7137266,16 7.9252179,16.998373 7.7834779,18.061416 7.641739,19.124458 7.5,20.1875 c 0.3063993,0.160613 1.0809439,0.584904 1.625,0.6875 2.520767,0.666947 5.16785,0.725367 7.754874,0.519516 1.511711,-0.166212 3.088649,-0.352665 4.432626,-1.113266 0.335436,-0.07362 0.107122,-0.316411 0.114936,-0.654915 -0.132062,-1.021278 -0.264124,-2.042557 -0.396186,-3.063835 -0.587648,-0.5027 -1.391296,-0.753519 -2.106391,-1.064577 -1.082782,-0.447299 -2.251468,-0.853003 -3.086912,-1.707994 -0.391617,-0.689558 -0.161473,-1.538743 -0.107324,-2.28649 0.259681,-0.52835 -0.223399,-0.401903 -0.552932,-0.409689 -0.652981,0 -1.305961,0 -1.958941,0 z"
-       id="path3742"
-       style="fill:none;stroke:url(#linearGradient2875);stroke-width:0.99989432;stroke-miterlimit:4;stroke-opacity:1" />
-    <path
-       d="m 14.5,1.5422262 c -2.185818,0 -3.957774,1.67899 -3.957774,3.7501272 0.01713,0.7664876 0.08155,1.6770462 0.527701,3.750127 0.263852,0.8035986 2.617283,2.9465296 2.638517,3.2143946 0.511701,0.267865 1.319258,0.267865 1.846964,0 0,-0.267865 2.110813,-2.410796 2.374664,-3.2143946 0.502046,-2.1545496 0.500773,-2.9465283 0.527702,-3.750127 0,-2.0711372 -1.771956,-3.7501272 -3.957774,-3.7501272 z"
-       id="path3764"
-       style="fill:url(#radialGradient2877);fill-opacity:1;stroke:url(#linearGradient2879);stroke-width:1.08445191;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    <path
-       d="M 10.62237,21.7 C 8.8506083,20.838176 9.6954668,18.924844 9.8723695,17.7 9.1223696,18.569566 9.5000001,21 8,21 c 1,0.355621 1.6845389,0.59817 2.62237,0.7 z"
-       id="path3848"
-       style="opacity:0.5;fill:url(#linearGradient2881);fill-opacity:1;stroke:none" />
-    <path
-       d="M 12,13.35048 C 12.366027,14.309818 13.343418,15 14.5,15 c 1.156582,0 2.133972,-0.690182 2.5,-1.64952 l -5,0 z"
-       id="path3833"
-       style="opacity:0.3;fill:url(#radialGradient2883);fill-opacity:1;stroke:none" />
-    <path
-       d="m 18.4,21.7 c 1.771762,-0.861824 0.926903,-2.775156 0.750001,-4 C 19.9,18.569566 19.52237,21 21.02237,21 c -1,0.355621 -1.684539,0.59817 -2.62237,0.7 z"
-       id="path3720"
-       style="opacity:0.5;fill:url(#linearGradient2885);fill-opacity:1;stroke:none" />
-    <path
-       d="m 14.5,2.53125 c -1.666616,0 -2.9513,1.2303173 -2.96875,2.71875 1.39e-4,0.00624 -1.45e-4,0.024997 0,0.03125 0.01647,0.7081029 0.08609,1.5272795 0.5,3.46875 -0.0051,-0.03667 0.09671,0.2041393 0.3125,0.46875 0.232433,0.2850235 0.566603,0.6083312 0.875,0.9375 0.308397,0.329169 0.598847,0.668975 0.84375,0.9375 0.09435,0.103448 0.171956,0.186905 0.25,0.28125 0.166811,0.03524 0.415249,0.03212 0.625,0 0.06182,-0.08397 0.114751,-0.159431 0.1875,-0.25 0.218248,-0.271707 0.473896,-0.575993 0.75,-0.90625 0.276104,-0.3302573 0.569207,-0.6813941 0.78125,-0.96875 0.197562,-0.2677316 0.307312,-0.503144 0.3125,-0.5 0.460701,-1.9997828 0.473735,-2.6695721 0.5,-3.46875 0,-0.010182 1.19e-4,-0.021091 0,-0.03125 C 17.4513,3.7615673 16.166616,2.53125 14.5,2.53125 z"
-       id="path3730"
-       style="fill:none;stroke:url(#linearGradient2887);stroke-width:1.08445191;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-  </g>
-</svg>
diff --git a/apps/contacts/img/person_large.png b/apps/contacts/img/person_large.png
deleted file mode 100644
index 8293df6182..0000000000
Binary files a/apps/contacts/img/person_large.png and /dev/null differ
diff --git a/apps/contacts/import.php b/apps/contacts/import.php
deleted file mode 100644
index 1986d79f6d..0000000000
--- a/apps/contacts/import.php
+++ /dev/null
@@ -1,150 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Georg Ehrke <ownclouddev at georgswebsite dot de>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-//check for addressbooks rights or create new one
-ob_start();
- 
-OCP\JSON::checkLoggedIn();
-OCP\App::checkAppEnabled('contacts');
-session_write_close();
-
-$nl = "\n";
-
-global $progresskey;
-$progresskey = 'contacts.import-' . (isset($_GET['progresskey'])?$_GET['progresskey']:'');
-
-if (isset($_GET['progress']) && $_GET['progress']) {
-	echo OC_Cache::get($progresskey);
-	die;
-}
-
-function writeProgress($pct) {
-	global $progresskey;
-	OC_Cache::set($progresskey, $pct, 300);
-}
-writeProgress('10');
-$view = $file = null;
-if(isset($_POST['fstype']) && $_POST['fstype'] == 'OC_FilesystemView') {
-	$view = OCP\Files::getStorage('contacts');
-	$file = $view->file_get_contents('/imports/' . $_POST['file']);
-} else {
-	$file = OC_Filesystem::file_get_contents($_POST['path'] . '/' . $_POST['file']);
-}
-if(!$file) {
-	OCP\JSON::error(array('data' => array('message' => 'Import file was empty.')));
-	exit();
-}
-if(isset($_POST['method']) && $_POST['method'] == 'new') {
-	$id = OC_Contacts_Addressbook::add(OCP\USER::getUser(), 
-		$_POST['addressbookname']);
-	if(!$id) {
-		OCP\JSON::error(
-			array(
-				'data' => array('message' => 'Error creating address book.')
-			)
-		);
-		exit();
-	}
-	OC_Contacts_Addressbook::setActive($id, 1);
-}else{
-	$id = $_POST['id'];
-	if(!$id) {
-		OCP\JSON::error(
-			array(
-				'data' => array(
-					'message' => 'Error getting the ID of the address book.', 
-					'file'=>$_POST['file']
-				)
-			)
-		);
-		exit();
-	}
-	OC_Contacts_App::getAddressbook($id); // is owner access check
-}
-//analyse the contacts file
-writeProgress('40');
-$file = str_replace(array("\r","\n\n"), array("\n","\n"), $file);
-$lines = explode($nl, $file);
-
-$inelement = false;
-$parts = array();
-$card = array();
-foreach($lines as $line){
-	if(strtoupper(trim($line)) == 'BEGIN:VCARD') {
-		$inelement = true;
-	} elseif (strtoupper(trim($line)) == 'END:VCARD') {
-		$card[] = $line;
-		$parts[] = implode($nl, $card);
-		$card = array();
-		$inelement = false;
-	}
-	if ($inelement === true && trim($line) != '') {
-		$card[] = $line;
-	}
-}
-//import the contacts
-writeProgress('70');
-$imported = 0;
-$failed = 0;
-if(!count($parts) > 0) {
-	OCP\JSON::error(
-		array(
-			'data' => array(
-				'message' => 'No contacts to import in '
-					. $_POST['file'].'. Please check if the file is corrupted.', 
-				'file'=>$_POST['file']
-			)
-		)
-	);
-	if(isset($_POST['fstype']) && $_POST['fstype'] == 'OC_FilesystemView') {
-		if(!$view->unlink('/imports/' . $_POST['file'])) {
-			OCP\Util::writeLog('contacts', 
-				'Import: Error unlinking OC_FilesystemView ' . '/' . $_POST['file'], 
-				OCP\Util::ERROR);
-		}
-	}
-	exit();
-}
-foreach($parts as $part){
-	$card = OC_VObject::parse($part);
-	if (!$card) {
-		$failed += 1;
-		OCP\Util::writeLog('contacts', 
-			'Import: skipping card. Error parsing VCard: ' . $part, 
-				OCP\Util::ERROR);
-		continue; // Ditch cards that can't be parsed by Sabre.
-	}
-	try {
-		OC_Contacts_VCard::add($id, $card);
-		$imported += 1;
-	} catch (Exception $e) {
-		OCP\Util::writeLog('contacts', 
-			'Error importing vcard: ' . $e->getMessage() . $nl . $card, 
-			OCP\Util::ERROR);
-		$failed += 1;
-	}
-}
-//done the import
-writeProgress('100');
-sleep(3);
-OC_Cache::remove($progresskey);
-if(isset($_POST['fstype']) && $_POST['fstype'] == 'OC_FilesystemView') {
-	if(!$view->unlink('/imports/' . $_POST['file'])) {
-		OCP\Util::writeLog('contacts', 
-			'Import: Error unlinking OC_FilesystemView ' . '/' . $_POST['file'], 
-			OCP\Util::ERROR);
-	}
-}
-OCP\JSON::success(
-	array(
-		'data' => array(
-			'imported'=>$imported, 
-			'failed'=>$failed, 
-			'file'=>$_POST['file'],
-		)
-	)
-);
diff --git a/apps/contacts/index.php b/apps/contacts/index.php
deleted file mode 100644
index f16d6f5641..0000000000
--- a/apps/contacts/index.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Thomas Tanghus <thomas@tanghus.net>
- * Copyright (c) 2011 Jakob Sack mail@jakobsack.de
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-
-// Check if we are a user
-OCP\User::checkLoggedIn();
-OCP\App::checkAppEnabled('contacts');
-
-// Get active address books. This creates a default one if none exists.
-$ids = OC_Contacts_Addressbook::activeIds(OCP\USER::getUser());
-$has_contacts = (count(OC_Contacts_VCard::all($ids, 0, 1)) > 0
-	? true
-	: false); // just to check if there are any contacts.
-if($has_contacts === false) {
-	OCP\Util::writeLog('contacts',
-		'index.html: No contacts found.',
-		OCP\Util::DEBUG);
-}
-
-// Load the files we need
-OCP\App::setActiveNavigationEntry('contacts_index');
-
-// Load a specific user?
-$id = isset( $_GET['id'] ) ? $_GET['id'] : null;
-$impp_types = OC_Contacts_App::getTypesOfProperty('IMPP');
-$phone_types = OC_Contacts_App::getTypesOfProperty('TEL');
-$email_types = OC_Contacts_App::getTypesOfProperty('EMAIL');
-$ims = OC_Contacts_App::getIMOptions();
-$im_protocols = array();
-foreach($ims as $name => $values) {
-	$im_protocols[$name] = $values['displayname'];
-}
-$categories = OC_Contacts_App::getCategories();
-
-$upload_max_filesize = OCP\Util::computerFileSize(ini_get('upload_max_filesize'));
-$post_max_size = OCP\Util::computerFileSize(ini_get('post_max_size'));
-$maxUploadFilesize = min($upload_max_filesize, $post_max_size);
-
-$freeSpace=OC_Filesystem::free_space('/');
-$freeSpace=max($freeSpace, 0);
-$maxUploadFilesize = min($maxUploadFilesize, $freeSpace);
-
-OCP\Util::addscript('', 'jquery.multiselect');
-OCP\Util::addscript('', 'oc-vcategories');
-OCP\Util::addscript('contacts', 'contacts');
-OCP\Util::addscript('contacts', 'expanding');
-OCP\Util::addscript('contacts', 'jquery.combobox');
-OCP\Util::addscript('files', 'jquery.fileupload');
-OCP\Util::addscript('contacts', 'jquery.inview');
-OCP\Util::addscript('contacts', 'jquery.Jcrop');
-OCP\Util::addscript('contacts', 'jquery.multi-autocomplete');
-OCP\Util::addStyle('', 'jquery.multiselect');
-OCP\Util::addStyle('contacts', 'jquery.combobox');
-OCP\Util::addStyle('contacts', 'jquery.Jcrop');
-OCP\Util::addStyle('contacts', 'contacts');
-
-$tmpl = new OCP\Template( "contacts", "index", "user" );
-$tmpl->assign('uploadMaxFilesize', $maxUploadFilesize, false);
-$tmpl->assign('uploadMaxHumanFilesize',
-	OCP\Util::humanFileSize($maxUploadFilesize), false);
-$tmpl->assign('phone_types', $phone_types, false);
-$tmpl->assign('email_types', $email_types, false);
-$tmpl->assign('impp_types', $impp_types, false);
-$tmpl->assign('categories', $categories, false);
-$tmpl->assign('im_protocols', $im_protocols, false);
-$tmpl->assign('has_contacts', $has_contacts, false);
-$tmpl->assign('id', $id, false);
-$tmpl->printPage();
diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
deleted file mode 100644
index b209acadaa..0000000000
--- a/apps/contacts/js/contacts.js
+++ /dev/null
@@ -1,2277 +0,0 @@
-function ucwords (str) {
-	return (str + '').replace(/^([a-z])|\s+([a-z])/g, function ($1) {
-		return $1.toUpperCase();
-	});
-}
-
-String.prototype.strip_tags = function(){
-	tags = this;
-	stripped = tags.replace(/<(.|\n)*?>/g, '');
-	return stripped;
-};
-
-OC.Contacts={
-	/**
-	 * Arguments:
-	 * message: The text message to show.
-	 * timeout: The timeout in seconds before the notification disappears. Default 10.
-	 * timeouthandler: A function to run on timeout.
-	 * clickhandler: A function to run on click. If a timeouthandler is given it will be cancelled.
-	 * data: An object that will be passed as argument to the timeouthandler and clickhandler functions.
-	 * cancel: If set cancel all ongoing timer events and hide the notification.
-	 */
-	notify:function(params) {
-		var self = this;
-		if(!self.notifier) {
-			self.notifier = $('#notification');
-		}
-		if(params.cancel) {
-			self.notifier.off('click');
-			for(var id in self.notifier.data()) {
-				if($.isNumeric(id)) {
-					clearTimeout(parseInt(id));
-				}
-			}
-			self.notifier.text('').fadeOut().removeData();
-			return;
-		}
-		self.notifier.text(params.message);
-		self.notifier.fadeIn();
-		self.notifier.on('click', function() { $(this).fadeOut();});
-		var timer = setTimeout(function() {
-			if(!self || !self.notifier) {
-				var self = OC.Contacts;
-				self.notifier = $('#notification');
-			}
-			self.notifier.fadeOut();
-			if(params.timeouthandler && $.isFunction(params.timeouthandler)) {
-				params.timeouthandler(self.notifier.data(dataid));
-				self.notifier.off('click');
-				self.notifier.removeData(dataid);
-			}
-		}, params.timeout && $.isNumeric(params.timeout) ? parseInt(params.timeout)*1000 : 10000);
-		var dataid = timer.toString();
-		if(params.data) {
-			self.notifier.data(dataid, params.data);
-		}
-		if(params.clickhandler && $.isFunction(params.clickhandler)) {
-			self.notifier.on('click', function() {
-				if(!self || !self.notifier) {
-					var self = OC.Contacts;
-					self.notifier = $(this);
-				}
-				clearTimeout(timer);
-				self.notifier.off('click');
-				params.clickhandler(self.notifier.data(dataid));
-				self.notifier.removeData(dataid);
-			});
-		}
-	},
-	notImplemented:function() {
-		OC.dialogs.alert(t('contacts', 'Sorry, this functionality has not been implemented yet'), t('contacts', 'Not implemented'));
-	},
-	searchOSM:function(obj) {
-		var adr = OC.Contacts.propertyContainerFor(obj).find('.adr').val();
-		if(adr == undefined) {
-			OC.dialogs.alert(t('contacts', 'Couldn\'t get a valid address.'), t('contacts', 'Error'));
-			return;
-		}
-		// FIXME: I suck at regexp. /Tanghus
-		var adrarr = adr.split(';');
-		var adrstr = '';
-		if(adrarr[2].trim() != '') {
-			adrstr = adrstr + adrarr[2].trim() + ',';
-		}
-		if(adrarr[3].trim() != '') {
-			adrstr = adrstr + adrarr[3].trim() + ',';
-		}
-		if(adrarr[4].trim() != '') {
-			adrstr = adrstr + adrarr[4].trim() + ',';
-		}
-		if(adrarr[5].trim() != '') {
-			adrstr = adrstr + adrarr[5].trim() + ',';
-		}
-		if(adrarr[6].trim() != '') {
-			adrstr = adrstr + adrarr[6].trim();
-		}
-		adrstr = encodeURIComponent(adrstr);
-		var uri = 'http://open.mapquestapi.com/nominatim/v1/search.php?q=' + adrstr + '&limit=10&addressdetails=1&polygon=1&zoom=';
-		var newWindow = window.open(uri,'_blank');
-		newWindow.focus();
-	},
-	mailTo:function(obj) {
-		var adr = OC.Contacts.propertyContainerFor($(obj)).find('input[type="email"]').val().trim();
-		if(adr == '') {
-			OC.dialogs.alert(t('contacts', 'Please enter an email address.'), t('contacts', 'Error'));
-			return;
-		}
-		window.location.href='mailto:' + adr;
-	},
-	propertyContainerFor:function(obj) {
-		return $(obj).parents('.propertycontainer').first();
-	},
-	checksumFor:function(obj) {
-		return $(obj).parents('.propertycontainer').first().data('checksum');
-	},
-	propertyTypeFor:function(obj) {
-		return $(obj).parents('.propertycontainer').first().data('element');
-	},
-	loading:function(obj, state) {
-		if(state) {
-			$(obj).addClass('loading');
-		} else {
-			$(obj).removeClass('loading');
-		}
-	},
-	showCardDAVUrl:function(username, bookname){
-		$('#carddav_url').val(totalurl + '/' + username + '/' + decodeURIComponent(bookname));
-		$('#carddav_url').show();
-		$('#carddav_url_close').show();
-	},
-	loadListHandlers:function() {
-		$('.propertylist li a.delete').unbind('click');
-		$('.propertylist li a.delete').unbind('keydown');
-		var deleteItem = function(obj) {
-			obj.tipsy('hide');
-			OC.Contacts.Card.deleteProperty(obj, 'list');
-		}
-		$('.propertylist li a.delete, .addresscard .delete').click(function() { deleteItem($(this)) });
-		$('.propertylist li a.delete, .addresscard .delete').keydown(function() { deleteItem($(this)) });
-		$('.propertylist li a.mail').click(function() { OC.Contacts.mailTo(this) });
-		$('.propertylist li a.mail').keydown(function() { OC.Contacts.mailTo(this) });
-		$('.addresscard .globe').click(function() { $(this).tipsy('hide');OC.Contacts.searchOSM(this); });
-		$('.addresscard .globe').keydown(function() { $(this).tipsy('hide');OC.Contacts.searchOSM(this); });
-		$('.addresscard .edit').click(function() { $(this).tipsy('hide');OC.Contacts.Card.editAddress(this, false); });
-		$('.addresscard .edit').keydown(function() { $(this).tipsy('hide');OC.Contacts.Card.editAddress(this, false); });
-		$('.addresscard,.propertylist li,.propertycontainer').hover(
-			function () {
-				$(this).find('.globe,.mail,.delete,.edit').animate({ opacity: 1.0 }, 200, function() {});
-			},
-			function () {
-				$(this).find('.globe,.mail,.delete,.edit').animate({ opacity: 0.1 }, 200, function() {});
-			}
-		);
-	},
-	loadHandlers:function() {
-		var deleteItem = function(obj) {
-			obj.tipsy('hide');
-			OC.Contacts.Card.deleteProperty(obj, 'single');
-		}
-		var goToUrl = function(obj) {
-		var url = OC.Contacts.propertyContainerFor(obj).find('#url').val();
-		if(url != '') {
-			var newWindow = window.open(url,'_blank');
-			newWindow.focus();
-			}
-		}
-
-		$('#identityprops a.delete').click( function() { deleteItem($(this)) });
-		$('#identityprops a.delete').keydown( function() { deleteItem($(this)) });
-		$('#categories_value a.edit').click( function() { $(this).tipsy('hide');OCCategories.edit(); } );
-		$('#categories_value a.edit').keydown( function() { $(this).tipsy('hide');OCCategories.edit(); } );
-		$('#url_value a.globe').click( function() { $(this).tipsy('hide');goToUrl($(this)); } );
-		$('#url_value a.globe').keydown( function() { $(this).tipsy('hide');goToUrl($(this)); } );
-		$('#fn_select').combobox({
-			'id': 'fn',
-			'name': 'value',
-			'classes': ['contacts_property', 'nonempty', 'huge', 'tip', 'float'],
-			'attributes': {'placeholder': t('contacts', 'Enter name')},
-			'title': t('contacts', 'Format custom, Short name, Full name, Reverse or Reverse with comma')});
-		$('#bday').datepicker({
-					dateFormat : 'dd-mm-yy'
-		});
-		// Style phone types
-		$('#phonelist').find('select.contacts_property').multiselect({
-												noneSelectedText: t('contacts', 'Select type'),
-												header: false,
-												selectedList: 4,
-												classes: 'typelist'
-											});
-		$('#edit_name').click(function(){OC.Contacts.Card.editName()});
-		$('#edit_name').keydown(function(){OC.Contacts.Card.editName()});
-
-		$('#phototools li a').click(function() {
-		$(this).tipsy('hide');
-		});
-		$('#contacts_details_photo_wrapper').hover(
-			function () {
-				$('#phototools').slideDown(200);
-			},
-			function () {
-				$('#phototools').slideUp(200);
-			}
-		);
-		$('#phototools').hover(
-			function () {
-				$(this).removeClass('transparent');
-			},
-			function () {
-				$(this).addClass('transparent');
-			}
-		);
-		$('#phototools .upload').click(function() {
-			$('#file_upload_start').trigger('click');
-		});
-		$('#phototools .cloud').click(function() {
-			OC.dialogs.filepicker(t('contacts', 'Select photo'), OC.Contacts.Card.cloudPhotoSelected, false, 'image', true);
-		});
-		/* Initialize the photo edit dialog */
-		$('#edit_photo_dialog').dialog({
-			autoOpen: false, modal: true, height: 'auto', width: 'auto'
-		});
-		$('#edit_photo_dialog' ).dialog( 'option', 'buttons', [
-			{
-				text: "Ok",
-				click: function() {
-					OC.Contacts.Card.savePhoto(this);
-					$(this).dialog('close');
-				}
-			},
-			{
-				text: "Cancel",
-				click: function() { $(this).dialog('close'); }
-			}
-		] );
-
-		// Name has changed. Update it and reorder.
-		$('#fn').change(function(){
-			var name = $('#fn').val().strip_tags();
-			var item = $('.contacts li[data-id="'+OC.Contacts.Card.id+'"]').detach();
-			$(item).find('a').html(name);
-			OC.Contacts.Card.fn = name;
-			OC.Contacts.Contacts.insertContact({contact:item});
-			OC.Contacts.Contacts.scrollTo(OC.Contacts.Card.id);
-		});
-
-		$('#contacts_deletecard').click( function() { OC.Contacts.Card.delayedDelete();return false;} );
-		$('#contacts_deletecard').keydown( function(event) {
-			if(event.which == 13 || event.which == 32) {
-				OC.Contacts.Card.delayedDelete();
-			}
-			return false;
-		});
-
-		$('#contacts_downloadcard').click( function() { OC.Contacts.Card.doExport();return false;} );
-		$('#contacts_downloadcard').keydown( function(event) {
-			if(event.which == 13 || event.which == 32) {
-				OC.Contacts.Card.doExport();
-			}
-			return false;
-		});
-
-		// Profile picture upload handling
-		// New profile picture selected
-		$('#file_upload_start').change(function(){
-			OC.Contacts.Card.uploadPhoto(this.files);
-		});
-		$('#contacts_details_photo_wrapper').bind('dragover',function(event){
-			$(event.target).addClass('droppable');
-			event.stopPropagation();
-			event.preventDefault();
-		});
-		$('#contacts_details_photo_wrapper').bind('dragleave',function(event){
-			$(event.target).removeClass('droppable');
-		});
-		$('#contacts_details_photo_wrapper').bind('drop',function(event){
-			event.stopPropagation();
-			event.preventDefault();
-			$(event.target).removeClass('droppable');
-			$.fileUpload(event.originalEvent.dataTransfer.files);
-		});
-
-		$('#categories').multiple_autocomplete({source: categories});
-		$('#contacts_deletecard').tipsy({gravity: 'ne'});
-		$('#contacts_downloadcard').tipsy({gravity: 'ne'});
-		$('#contacts_propertymenu_button').tipsy();
-		$('#contacts_newcontact, #contacts_import, #bottomcontrols .settings').tipsy({gravity: 'sw'});
-
-		$('body').click(function(e){
-			if(!$(e.target).is('#contacts_propertymenu_button')) {
-				$('#contacts_propertymenu_dropdown').hide();
-			}
-		});
-		function propertyMenu(){
-			var menu = $('#contacts_propertymenu_dropdown');
-			if(menu.is(':hidden')) {
-				menu.show();
-				menu.find('li').first().focus();
-			} else {
-				menu.hide();
-			}
-		}
-		$('#contacts_propertymenu_button').click(propertyMenu);
-		$('#contacts_propertymenu_button').keydown(propertyMenu);
-		function propertyMenuItem(){
-			var type = $(this).data('type');
-			OC.Contacts.Card.addProperty(type);
-			$('#contacts_propertymenu_dropdown').hide();
-		}
-		$('#contacts_propertymenu_dropdown a').click(propertyMenuItem);
-		$('#contacts_propertymenu_dropdown a').keydown(propertyMenuItem);
-	},
-	Card:{
-		update:function(params) { // params {cid:int, aid:int}
-			if(!params) { params = {}; }
-			$('#contacts li,#contacts h3').removeClass('active');
-			console.log('Card, cid: ' + params.cid + ' aid: ' + params.aid);
-			var newid, bookid, firstitem;
-			if(!parseInt(params.cid) && !parseInt(params.aid)) {
-				firstitem = $('#contacts ul').find('li:first-child');
-				if(firstitem.length > 0) {
-					if(firstitem.length > 1) {
-						firstitem = firstitem.first();
-					}
-					newid = parseInt(firstitem.data('id'));
-					bookid = parseInt(firstitem.data('bookid'));
-				}
-			} else if(!parseInt(params.cid) && parseInt(params.aid)) {
-				bookid = parseInt(params.aid);
-				newid = parseInt($('#contacts').find('li[data-bookid="'+bookid+'"]').first().data('id'));
-			} else if(parseInt(params.cid) && !parseInt(params.aid)) {
-				newid = parseInt(params.cid);
-				var listitem = OC.Contacts.Contacts.getContact(newid); //$('#contacts li[data-id="'+newid+'"]');
-				console.log('Is contact in list? ' + listitem.length);
-				if(listitem.length) {
-					//bookid = parseInt($('#contacts li[data-id="'+newid+'"]').data('bookid'));
-					bookid = parseInt(OC.Contacts.Contacts.getContact(newid).data('bookid'));
-				} else { // contact isn't in list yet.
-					bookid = 'unknown';
-				}
-			} else {
-				newid = parseInt(params.cid);
-				bookid = parseInt(params.aid);
-			}
-			if(!bookid || !newid) {
-				bookid = parseInt($('#contacts h3').first().data('id'));
-				newid = parseInt($('#contacts').find('li[data-bookid="'+bookid+'"]').first().data('id'));
-			}
-			console.log('newid: ' + newid + ' bookid: ' +bookid);
-			var localLoadContact = function(newid, bookid) {
-				if($('.contacts li').length > 0) {
-					$.getJSON(OC.filePath('contacts', 'ajax', 'contact/details.php'),{'id':newid},function(jsondata){
-						if(jsondata.status == 'success'){
-							if(bookid == 'unknown') {
-								bookid = jsondata.data.addressbookid;
-								var contact = OC.Contacts.Contacts.insertContact({
-									contactlist:$('#contacts ul[data-id="'+bookid+'"]'),
-									data:jsondata.data
-								});
-							}
-							$('#contacts li[data-id="'+newid+'"],#contacts h3[data-id="'+bookid+'"]').addClass('active');
-							$('#contacts ul[data-id="'+bookid+'"]').slideDown(300);
-							OC.Contacts.Card.loadContact(jsondata.data, bookid);
-							OC.Contacts.Contacts.scrollTo(newid);
-						} else {
-							OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
-						}
-					});
-				}
-			}
-
-			// Make sure proper DOM is loaded.
-			if(!$('#card').length && newid) {
-				console.log('Loading card DOM');
-				$.getJSON(OC.filePath('contacts', 'ajax', 'loadcard.php'),{requesttoken:requesttoken},function(jsondata){
-					if(jsondata.status == 'success'){
-						$('#rightcontent').html(jsondata.data.page).ready(function() {
-							OC.Contacts.loadHandlers();
-							localLoadContact(newid, bookid);
-						});
-					} else {
-						OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
-					}
-				});
-			} else if(!newid) {
-				console.log('Loading intro');
-				// load intro page
-				$.getJSON(OC.filePath('contacts', 'ajax', 'loadintro.php'),{},function(jsondata){
-					if(jsondata.status == 'success'){
-						id = '';
-						$('#rightcontent').data('id','');
-						$('#rightcontent').html(jsondata.data.page);
-					} else {
-						OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
-					}
-				});
-			}
-			else {
-				localLoadContact(newid, bookid);
-			}
-		},
-		setEnabled:function(enabled) {
-			console.log('setEnabled', enabled);
-			$('.contacts_property,.action').each(function () {
-				$(this).prop('disabled', !enabled);
-				OC.Contacts.Card.enabled = enabled;
-			});
-		},
-		doExport:function() {
-			document.location.href = OC.linkTo('contacts', 'export.php') + '?contactid=' + this.id;
-		},
-		editNew:function(){ // add a new contact
-			var book = $('#contacts h3.active');
-			var permissions = parseInt(book.data('permissions'));
-			if(permissions == 0
-					|| permissions & OC.Share.PERMISSION_UPDATE
-					|| permissions & OC.Share.PERMISSION_DELETE) {
-				with(this) {
-					delete id; delete fn; delete fullname; delete givname; delete famname;
-					delete addname; delete honpre; delete honsuf;
-				}
-				this.bookid = book.data('id');
-				OC.Contacts.Card.add(';;;;;', '', '', true);
-			} else {
-				OC.dialogs.alert(t('contacts', 'You do not have permission to add contacts to ')
-					+ book.text() + '. ' + t('contacts', 'Please select one of your own address books.'), t('contacts', 'Permission error'));
-			}
-			return false;
-		},
-		add:function(n, fn, aid, isnew){ // add a new contact
-			console.log('Adding ' + fn);
-			aid = aid?aid:$('#contacts h3.active').first().data('id');
-			var localAddcontact = function(n, fn, aid, isnew) {
-				$.post(OC.filePath('contacts', 'ajax', 'contact/add.php'), { n: n, fn: fn, aid: aid, isnew: isnew },
-				function(jsondata) {
-					if (jsondata.status == 'success'){
-						$('#rightcontent').data('id',jsondata.data.id);
-						var id = jsondata.data.id;
-						var aid = jsondata.data.aid;
-						$.getJSON(OC.filePath('contacts', 'ajax', 'contact/details.php'),{'id':id},function(jsondata){
-							if(jsondata.status == 'success'){
-								OC.Contacts.Card.loadContact(jsondata.data, aid);
-								var item = OC.Contacts.Contacts.insertContact({data:jsondata.data});
-								if(isnew) { // add some default properties
-									OC.Contacts.Card.addProperty('EMAIL');
-									OC.Contacts.Card.addProperty('TEL');
-									$('#fn').focus();
-								}
-							}
-							else{
-								OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
-							}
-						});
-						$('#contact_identity').show();
-						$('#actionbar').show();
-					}
-					else{
-						OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
-					}
-				});
-			}
-
-			if(!$('#card').length) {
-				console.log('Loading card DOM');
-				$.getJSON(OC.filePath('contacts', 'ajax', 'loadcard.php'),{'requesttoken': requesttoken},function(jsondata){
-					if(jsondata.status == 'success'){
-						$('#rightcontent').html(jsondata.data.page).ready(function() {
-							OC.Contacts.loadHandlers();
-							localAddcontact(n, fn, aid, isnew);
-						});
-					} else{
-						OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
-					}
-				});
-			} else {
-				localAddcontact(n, fn, aid, isnew);
-			}
-		},
-		delayedDelete:function() {
-			$('#contacts_deletecard').tipsy('hide');
-			var newid = '', bookid;
-			var curlistitem = OC.Contacts.Contacts.getContact(this.id);
-			curlistitem.removeClass('active');
-			var newlistitem = curlistitem.prev('li');
-			if(!newlistitem) {
-				newlistitem = curlistitem.next('li');
-			}
-			curlistitem.detach();
-			if($(newlistitem).is('li')) {
-				newid = newlistitem.data('id');
-				bookid = newlistitem.data('bookid');
-			}
-			$('#rightcontent').data('id', newid);
-
-			OC.Contacts.Contacts.deletionQueue.push(parseInt(this.id));
-			if(!window.onbeforeunload) {
-				window.onbeforeunload = OC.Contacts.Contacts.warnNotDeleted;
-			}
-
-			with(this) {
-				delete id; delete fn; delete fullname; delete shortname; delete famname;
-				delete givname; delete addname; delete honpre; delete honsuf; delete data;
-			}
-
-			if($('.contacts li').length > 0) {
-				OC.Contacts.Card.update({cid:newid, aid:bookid});
-			} else {
-				// load intro page
-				$.getJSON(OC.filePath('contacts', 'ajax', 'loadintro.php'),{},function(jsondata){
-					if(jsondata.status == 'success'){
-						id = '';
-						$('#rightcontent').html(jsondata.data.page).removeData('id');
-					} else {
-						OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
-					}
-				});
-			}
-			OC.Contacts.notify({
-				data:curlistitem,
-				message:t('contacts','Click to undo deletion of "') + curlistitem.find('a').text() + '"',
-				//timeout:5,
-				timeouthandler:function(contact) {
-					console.log('timeout');
-					OC.Contacts.Card.doDelete(contact.data('id'), true, function(res) {
-						if(!res) {
-							OC.Contacts.Contacts.insertContact({contact:contact});
-						} else {
-							delete contact;
-						}
-					});
-				},
-				clickhandler:function(contact) {
-					OC.Contacts.Contacts.insertContact({contact:contact});
-					OC.Contacts.notify({message:t('contacts', 'Cancelled deletion of: "') + curlistitem.find('a').text() + '"'});
-					window.onbeforeunload = null;
-				}
-			});
-		},
-		doDelete:function(id, removeFromQueue, cb) {
-			var updateQueue = function(id, remove) {
-				if(removeFromQueue) {
-					OC.Contacts.Contacts.deletionQueue.splice(OC.Contacts.Contacts.deletionQueue.indexOf(parseInt(id)), 1);
-				}
-				if(OC.Contacts.Contacts.deletionQueue.length == 0) {
-					window.onbeforeunload = null;
-				}
-			}
-
-			if(OC.Contacts.Contacts.deletionQueue.indexOf(parseInt(id)) == -1 && removeFromQueue) {
-				console.log('returning');
-				updateQueue(id, removeFromQueue);
-				if(typeof cb == 'function') {
-					cb(true);
-				}
-				return;
-			}
-			$.post(OC.filePath('contacts', 'ajax', 'contact/delete.php'), {'id':id},function(jsondata) {
-				if(jsondata.status == 'error'){
-					OC.Contacts.notify({message:jsondata.data.message});
-					if(typeof cb == 'function') {
-						cb(false);
-					}
-				}
-				updateQueue(id, removeFromQueue);
-			});
-			if(typeof cb == 'function') {
-				cb(true);
-			}
-		},
-		loadContact:function(jsondata, bookid){
-			this.data = jsondata;
-			this.id = this.data.id;
-			this.bookid = bookid;
-			$('#rightcontent').data('id',this.id);
-			this.populateNameFields();
-			this.loadPhoto();
-			this.loadMails();
-			this.loadPhones();
-			this.loadIMs();
-			this.loadAddresses();
-			this.loadSingleProperties();
-			OC.Contacts.loadListHandlers();
-			var note = $('#note');
-			if(this.data.NOTE) {
-				note.data('checksum', this.data.NOTE[0]['checksum']);
-				var textarea = note.find('textarea');
-				var txt = this.data.NOTE[0]['value'];
-				var nheight = txt.split('\n').length > 4 ? txt.split('\n').length+2 : 5;
-				textarea.css('min-height', nheight+'em');
-				textarea.attr('rows', nheight);
-				textarea.val(txt);
-				$('#contact_note').show();
-				textarea.expandingTextarea();
-				$('#contacts_propertymenu_dropdown a[data-type="NOTE"]').parent().hide();
-			} else {
-				note.removeData('checksum');
-				note.find('textarea').val('');
-				$('#contact_note').hide();
-				$('#contacts_propertymenu_dropdown a[data-type="NOTE"]').parent().show();
-			}
-			var permissions = OC.Contacts.Card.permissions = parseInt($('#contacts ul[data-id="' + bookid + '"]').data('permissions'));
-			console.log('permissions', permissions);
-			this.setEnabled(permissions == 0
-				|| permissions & OC.Share.PERMISSION_UPDATE
-				|| permissions & OC.Share.PERMISSION_DELETE);
-		},
-		loadSingleProperties:function() {
-			var props = ['BDAY', 'NICKNAME', 'ORG', 'URL', 'CATEGORIES'];
-			// Clear all elements
-			$('#ident .propertycontainer').each(function(){
-				if(props.indexOf($(this).data('element')) > -1) {
-					$(this).data('checksum', '');
-					$(this).find('input').val('');
-					$(this).hide();
-					$(this).prev().hide();
-				}
-			});
-			for(var prop in props) {
-				var propname = props[prop];
-				if(this.data[propname] != undefined) {
-					$('#contacts_propertymenu_dropdown a[data-type="'+propname+'"]').parent().hide();
-					var property = this.data[propname][0];
-					var value = property['value'], checksum = property['checksum'];
-
-					if(propname == 'BDAY') {
-						var val = $.datepicker.parseDate('yy-mm-dd', value.substring(0, 10));
-						value = $.datepicker.formatDate('dd-mm-yy', val);
-					}
-					var identcontainer = $('#contact_identity');
-					identcontainer.find('#'+propname.toLowerCase()).val(value);
-					identcontainer.find('#'+propname.toLowerCase()+'_value').data('checksum', checksum);
-					identcontainer.find('#'+propname.toLowerCase()+'_label').show();
-					identcontainer.find('#'+propname.toLowerCase()+'_value').show();
-				} else {
-					$('#contacts_propertymenu_dropdown a[data-type="'+propname+'"]').parent().show();
-				}
-			}
-		},
-		populateNameFields:function() {
-			var props = ['FN', 'N'];
-			// Clear all elements
-			$('#ident .propertycontainer').each(function(){
-				if(props.indexOf($(this).data('element')) > -1) {
-					$(this).data('checksum', '');
-					$(this).find('input').val('');
-				}
-			});
-
-			with(this) {
-				delete fn; delete fullname; delete givname; delete famname;
-				delete addname; delete honpre; delete honsuf;
-			}
-
-			if(this.data.FN) {
-				this.fn = this.data.FN[0]['value'];
-			}
-			else {
-				this.fn = '';
-			}
-			if(this.data.N == undefined) {
-				narray = [this.fn,'','','','']; // Checking for non-existing 'N' property :-P
-			} else {
-				narray = this.data.N[0]['value'];
-			}
-			this.famname = narray[0] || '';
-			this.givname = narray[1] || '';
-			this.addname = narray[2] || '';
-			this.honpre = narray[3] || '';
-			this.honsuf = narray[4] || '';
-			if(this.honpre.length > 0) {
-				this.fullname += this.honpre + ' ';
-			}
-			if(this.givname.length > 0) {
-				this.fullname += ' ' + this.givname;
-			}
-			if(this.addname.length > 0) {
-				this.fullname += ' ' + this.addname;
-			}
-			if(this.famname.length > 0) {
-				this.fullname += ' ' + this.famname;
-			}
-			if(this.honsuf.length > 0) {
-				this.fullname += ', ' + this.honsuf;
-			}
-			$('#n').val(narray.join(';'));
-			$('#fn_select option').remove();
-			var names = [this.fn, this.fullname, this.givname + ' ' + this.famname, this.famname + ' ' + this.givname, this.famname + ', ' + this.givname];
-			if(this.data.ORG) {
-				names[names.length]=this.data.ORG[0].value;
-			}
-			$.each(names, function(key, value) {
-				$('#fn_select')
-				.append($('<option></option>')
-				.text(value));
-			});
-				$('#fn_select').combobox('value', this.fn);
-				$('#contact_identity').find('*[data-element="N"]').data('checksum', this.data.N[0]['checksum']);
-				if(this.data.FN) {
-					$('#contact_identity').find('*[data-element="FN"]').data('checksum', this.data.FN[0]['checksum']);
-				}
-				$('#contact_identity').show();
-		},
-		hasCategory:function(category) {
-			if(this.data.CATEGORIES) {
-				var categories = this.data.CATEGORIES[0]['value'].split(/,\s*/);
-				for(var c in categories) {
-					var cat = this.data.CATEGORIES[0]['value'][c];
-					if(typeof cat === 'string' && (cat.toUpperCase() === category.toUpperCase())) {
-						return true;
-					}
-				}
-			}
-			return false;
-		},
-		categoriesChanged:function(newcategories) { // Categories added/deleted.
-			categories = $.map(newcategories, function(v) {return v;});
-			$('#categories').multiple_autocomplete('option', 'source', categories);
-			var categorylist = $('#categories_value').find('input');
-			$.getJSON(OC.filePath('contacts', 'ajax', 'categories/categoriesfor.php'),{'id':OC.Contacts.Card.id},function(jsondata){
-				if(jsondata.status == 'success'){
-					$('#categories_value').data('checksum', jsondata.data.checksum);
-					categorylist.val(jsondata.data.value);
-				} else {
-					OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
-				}
-			});
-		},
-		savePropertyInternal:function(name, fields, oldchecksum, checksum) {
-			// TODO: Add functionality for new fields.
-			//console.log('savePropertyInternal: ' + name + ', fields: ' + fields + 'checksum: ' + checksum);
-			//console.log('savePropertyInternal: ' + this.data[name]);
-			var multivalue = ['CATEGORIES'];
-			var params = {};
-			var value = multivalue.indexOf(name) != -1 ? new Array() : undefined;
-			jQuery.each(fields, function(i, field){
-				//.substring(11,'parameters[TYPE][]'.indexOf(']'))
-				if(field.name.substring(0, 5) === 'value') {
-					if(multivalue.indexOf(name) != -1) {
-						value.push(field.value);
-					} else {
-						value = field.value;
-					}
-				} else if(field.name.substring(0, 10) === 'parameters') {
-					var p = field.name.substring(11,'parameters[TYPE][]'.indexOf(']'));
-					if(!(p in params)) {
-						params[p] = [];
-					}
-					params[p].push(field.value);
-				}
-			});
-					for(var i in this.data[name]) {
-						if(this.data[name][i]['checksum'] == oldchecksum) {
-							this.data[name][i]['checksum'] = checksum;
-							this.data[name][i]['value'] = value;
-							this.data[name][i]['parameters'] = params;
-						}
-					}
-		},
-		saveProperty:function(obj) {
-			if(!$(obj).hasClass('contacts_property')) {
-				return false;
-			}
-			if($(obj).hasClass('nonempty') && $(obj).val().trim() == '') {
-				OC.dialogs.alert(t('contacts', 'This property has to be non-empty.'), t('contacts', 'Error'));
-				return false;
-			}
-			container = $(obj).parents('.propertycontainer').first(); // get the parent holding the metadata.
-			OC.Contacts.loading(obj, true);
-			var checksum = container.data('checksum');
-			var name = container.data('element');
-			var fields = container.find('input.contacts_property,select.contacts_property').serializeArray();
-			switch(name) {
-				case 'FN':
-					var nempty = true;
-					for(var i in OC.Contacts.Card.data.N[0]['value']) {
-						if(OC.Contacts.Card.data.N[0]['value'][i] != '') {
-							nempty = false;
-							break;
-						}
-					}
-					if(nempty) {
-						$('#n').val(fields[0].value + ';;;;');
-						OC.Contacts.Card.data.N[0]['value'] = Array(fields[0].value, '', '', '', '');
-						setTimeout(function() {OC.Contacts.Card.saveProperty($('#n'))}, 500);
-					}
-					break;
-			}
-			var q = container.find('input.contacts_property,select.contacts_property,textarea.contacts_property').serialize();
-			if(q == '' || q == undefined) {
-				OC.dialogs.alert(t('contacts', 'Couldn\'t serialize elements.'), t('contacts', 'Error'));
-				OC.Contacts.loading(obj, false);
-				return false;
-			}
-			q = q + '&id=' + this.id + '&name=' + name;
-			if(checksum != undefined && checksum != '') { // save
-					q = q + '&checksum=' + checksum;
-					console.log('Saving: ' + q);
-					$(obj).attr('disabled', 'disabled');
-					$.post(OC.filePath('contacts', 'ajax', 'contact/saveproperty.php'),q,function(jsondata){
-						if(!jsondata) {
-							OC.dialogs.alert(t('contacts', 'Unknown error. Please check logs.'), t('contacts', 'Error'));
-							OC.Contacts.loading(obj, false);
-							$(obj).removeAttr('disabled');
-							OC.Contacts.Card.update({cid:OC.Contacts.Card.id});
-							return false;
-						}
-						if(jsondata.status == 'success'){
-							container.data('checksum', jsondata.data.checksum);
-							OC.Contacts.Card.savePropertyInternal(name, fields, checksum, jsondata.data.checksum);
-							OC.Contacts.loading(obj, false);
-							$(obj).removeAttr('disabled');
-							return true;
-						}
-						else{
-							OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
-							OC.Contacts.loading(obj, false);
-							$(obj).removeAttr('disabled');
-							OC.Contacts.Card.update({cid:OC.Contacts.Card.id});
-							return false;
-						}
-					},'json');
-			} else { // add
-					console.log('Adding: ' + q);
-					$(obj).attr('disabled', 'disabled');
-					$.post(OC.filePath('contacts', 'ajax', 'contact/addproperty.php'),q,function(jsondata){
-						if(jsondata.status == 'success'){
-							container.data('checksum', jsondata.data.checksum);
-							// TODO: savePropertyInternal doesn't know about new fields
-							//OC.Contacts.Card.savePropertyInternal(name, fields, checksum, jsondata.data.checksum);
-							OC.Contacts.loading(obj, false);
-							$(obj).removeAttr('disabled');
-							return true;
-						}
-						else{
-							OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
-							OC.Contacts.loading(obj, false);
-							$(obj).removeAttr('disabled');
-							OC.Contacts.Card.update({cid:OC.Contacts.Card.id});
-							return false;
-						}
-					},'json');
-			}
-		},
-		addProperty:function(type) {
-			if(!this.enabled) {
-				return;
-			}
-			switch (type) {
-				case 'NOTE':
-					$('#contacts_propertymenu_dropdown a[data-type="'+type+'"]').parent().hide();
-					$('#note').find('textarea').expandingTextarea().show().focus();
-					$('#contact_note').show();
-					break;
-				case 'EMAIL':
-					if($('#emaillist>li').length == 1) {
-						$('#emails').show();
-					}
-					OC.Contacts.Card.addMail();
-					break;
-				case 'TEL':
-					if($('#phonelist>li').length == 1) {
-						$('#phones').show();
-					}
-					OC.Contacts.Card.addPhone();
-					break;
-				case 'IMPP':
-					if($('#imlist>li').length == 1) {
-						$('#ims').show();
-					}
-					OC.Contacts.Card.addIM();
-					break;
-				case 'ADR':
-					if($('addresses>dl').length == 1) {
-						$('#addresses').show();
-					}
-					OC.Contacts.Card.editAddress('new', true);
-					break;
-				case 'NICKNAME':
-				case 'URL':
-				case 'ORG':
-				case 'BDAY':
-				case 'CATEGORIES':
-					$('dl dt[data-element="'+type+'"],dd[data-element="'+type+'"]').show();
-					$('dd[data-element="'+type+'"]').find('input').focus();
-					$('#contacts_propertymenu_dropdown a[data-type="'+type+'"]').parent().hide();
-					break;
-			}
-		},
-		deleteProperty:function(obj, type) {
-			console.log('deleteProperty');
-			if(!this.enabled) {
-				return;
-			}
-			OC.Contacts.loading(obj, true);
-			var checksum = OC.Contacts.checksumFor(obj);
-			if(checksum) {
-				$.post(OC.filePath('contacts', 'ajax', 'contact/deleteproperty.php'),{'id': this.id, 'checksum': checksum },function(jsondata){
-					if(jsondata.status == 'success'){
-						if(type == 'list') {
-							OC.Contacts.propertyContainerFor(obj).remove();
-						} else if(type == 'single') {
-							var proptype = OC.Contacts.propertyTypeFor(obj);
-							OC.Contacts.Card.data[proptype] = null;
-							var othertypes = ['NOTE', 'PHOTO'];
-							if(othertypes.indexOf(proptype) != -1) {
-								OC.Contacts.propertyContainerFor(obj).data('checksum', '');
-								if(proptype == 'PHOTO') {
-									OC.Contacts.Contacts.refreshThumbnail(OC.Contacts.Card.id);
-									OC.Contacts.Card.loadPhoto();
-								} else if(proptype == 'NOTE') {
-									$('#note').find('textarea').val('');
-									$('#contact_note').hide();
-									OC.Contacts.propertyContainerFor(obj).hide();
-								}
-							} else {
-								$('dl dt[data-element="'+proptype+'"],dd[data-element="'+proptype+'"]').hide();
-								$('dl dd[data-element="'+proptype+'"]').data('checksum', '').find('input').val('');
-							}
-							$('#contacts_propertymenu_dropdown a[data-type="'+proptype+'"]').parent().show();
-							OC.Contacts.loading(obj, false);
-						} else {
-							OC.dialogs.alert(t('contacts', '\'deleteProperty\' called without type argument. Please report at bugs.owncloud.org'), t('contacts', 'Error'));
-							OC.Contacts.loading(obj, false);
-						}
-					}
-					else{
-						OC.Contacts.loading(obj, false);
-						OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
-					}
-				});
-			} else { // Property hasn't been saved so there's nothing to delete.
-				if(type == 'list') {
-					OC.Contacts.propertyContainerFor(obj).remove();
-				} else if(type == 'single') {
-					var proptype = OC.Contacts.propertyTypeFor(obj);
-					$('dl dt[data-element="'+proptype+'"],dd[data-element="'+proptype+'"]').hide();
-					$('#contacts_propertymenu_dropdown a[data-type="'+proptype+'"]').parent().show();
-					OC.Contacts.loading(obj, false);
-				} else {
-					OC.dialogs.alert(t('contacts', '\'deleteProperty\' called without type argument. Please report at bugs.owncloud.org'), t('contacts', 'Error'));
-				}
-			}
-		},
-		editName:function() {
-			if(!this.enabled) {
-				return;
-			}
-			var params = {id: this.id};
-			/* Initialize the name edit dialog */
-			if($('#edit_name_dialog').dialog('isOpen') == true) {
-				$('#edit_name_dialog').dialog('moveToTop');
-			} else {
-				$.getJSON(OC.filePath('contacts', 'ajax', 'editname.php'),{id: this.id},function(jsondata) {
-					if(jsondata.status == 'success') {
-						$('body').append('<div id="name_dialog"></div>');
-						$('#name_dialog').html(jsondata.data.page).find('#edit_name_dialog' ).dialog({
-							modal: true,
-							closeOnEscape: true,
-							title:  t('contacts', 'Edit name'),
-							height: 'auto', width: 'auto',
-							buttons: {
-								'Ok':function() {
-									OC.Contacts.Card.saveName(this);
-									$(this).dialog('close');
-								},
-								'Cancel':function() { $(this).dialog('close'); }
-							},
-							close: function(event, ui) {
-								$(this).dialog('destroy').remove();
-								$('#name_dialog').remove();
-							},
-							open: function(event, ui) {
-								// load 'N' property - maybe :-P
-							}
-						});
-					} else {
-						OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
-					}
-				});
-			}
-		},
-		saveName:function(dlg) {
-			if(!this.enabled) {
-				return;
-			}
-			//console.log('saveName, id: ' + this.id);
-			var n = new Array($(dlg).find('#fam').val().strip_tags(),$(dlg).find('#giv').val().strip_tags(),$(dlg).find('#add').val().strip_tags(),$(dlg).find('#pre').val().strip_tags(),$(dlg).find('#suf').val().strip_tags());
-			this.famname = n[0];
-			this.givname = n[1];
-			this.addname = n[2];
-			this.honpre = n[3];
-			this.honsuf = n[4];
-			this.fullname = '';
-
-			$('#n').val(n.join(';'));
-			if(n[3].length > 0) {
-				this.fullname = n[3] + ' ';
-			}
-			this.fullname += n[1] + ' ' + n[2] + ' ' + n[0];
-			if(n[4].length > 0) {
-				this.fullname += ', ' + n[4];
-			}
-
-			$('#fn_select option').remove();
-			//$('#fn_select').combobox('value', this.fn);
-			var tmp = [this.fullname, this.givname + ' ' + this.famname, this.famname + ' ' + this.givname, this.famname + ', ' + this.givname];
-			var names = new Array();
-			for(var name in tmp) {
-				if(names.indexOf(tmp[name]) == -1) {
-					names.push(tmp[name]);
-				}
-			}
-			$.each(names, function(key, value) {
-				$('#fn_select')
-				.append($('<option></option>')
-				.text(value));
-			});
-
-			if(this.id == '') {
-				var aid = $(dlg).find('#aid').val();
-				OC.Contacts.Card.add(n.join(';'), $('#short').text(), aid);
-			} else {
-				OC.Contacts.Card.saveProperty($('#n'));
-			}
-		},
-		loadAddresses:function() {
-			$('#addresses').hide();
-			$('#addresses dl.propertycontainer').remove();
-			var addresscontainer = $('#addresses');
-			for(var adr in this.data.ADR) {
-				addresscontainer.find('dl').first().clone().insertAfter($('#addresses dl').last()).show();
-				addresscontainer.find('dl').last().removeClass('template').addClass('propertycontainer');
-				addresscontainer.find('dl').last().data('checksum', this.data.ADR[adr]['checksum']);
-				var adrarray = this.data.ADR[adr]['value'];
-				var adrtxt = '';
-				if(adrarray[0] && adrarray[0].length > 0) {
-					adrtxt = adrtxt + '<li>' + adrarray[0].strip_tags() + '</li>';
-				}
-				if(adrarray[1] && adrarray[1].length > 0) {
-					adrtxt = adrtxt + '<li>' + adrarray[1].strip_tags() + '</li>';
-				}
-				if(adrarray[2] && adrarray[2].length > 0) {
-					adrtxt = adrtxt + '<li>' + adrarray[2].strip_tags() + '</li>';
-				}
-				if((3 in adrarray && 5 in adrarray) && adrarray[3].length > 0 || adrarray[5].length > 0) {
-					adrtxt = adrtxt + '<li>' + adrarray[5].strip_tags() + ' ' + adrarray[3].strip_tags() + '</li>';
-				}
-				if(adrarray[4] && adrarray[4].length > 0) {
-					adrtxt = adrtxt + '<li>' + adrarray[4].strip_tags() + '</li>';
-				}
-				if(adrarray[6] && adrarray[6].length > 0) {
-					adrtxt = adrtxt + '<li>' + adrarray[6].strip_tags() + '</li>';
-				}
-				addresscontainer.find('dl').last().find('.addresslist').html(adrtxt);
-				var types = new Array();
-				var ttypes = new Array();
-				for(var param in this.data.ADR[adr]['parameters']) {
-					if(param.toUpperCase() == 'TYPE') {
-						types.push(t('contacts', ucwords(this.data.ADR[adr]['parameters'][param].toLowerCase())));
-						ttypes.push(this.data.ADR[adr]['parameters'][param]);
-					}
-				}
-				addresscontainer.find('dl').last().find('.adr_type_label').text(types.join('/'));
-				addresscontainer.find('dl').last().find('.adr_type').val(ttypes.join(','));
-				addresscontainer.find('dl').last().find('.adr').val(adrarray.join(';'));
-				addresscontainer.find('dl').last().data('checksum', this.data.ADR[adr]['checksum']);
-			}
-			if(addresscontainer.find('dl').length > 1) {
-				$('#addresses').show();
-			}
-			return false;
-		},
-		editAddress:function(obj, isnew){
-			if(!this.enabled) {
-				return;
-			}
-			var container = undefined;
-			var params = {id: this.id};
-			if(obj === 'new') {
-				isnew = true;
-				$('#addresses dl').first().clone(true).insertAfter($('#addresses dl').last()).show();
-				container = $('#addresses dl').last();
-				container.removeClass('template').addClass('propertycontainer');
-			} else {
-				params['checksum'] = OC.Contacts.checksumFor(obj);
-			}
-			/* Initialize the address edit dialog */
-			if($('#edit_address_dialog').dialog('isOpen') == true){
-				$('#edit_address_dialog').dialog('moveToTop');
-			}else{
-				$.getJSON(OC.filePath('contacts', 'ajax', 'editaddress.php'),params,function(jsondata){
-					if(jsondata.status == 'success'){
-						$('body').append('<div id="address_dialog"></div>');
-						$('#address_dialog').html(jsondata.data.page).find('#edit_address_dialog' ).dialog({
-							height: 'auto', width: 'auto',
-							buttons: {
-								'Ok':function() {
-									if(isnew) {
-										OC.Contacts.Card.saveAddress(this, $('#addresses dl:last-child').find('input').first(), isnew);
-									} else {
-										OC.Contacts.Card.saveAddress(this, obj, isnew);
-									}
-									$(this).dialog('close');
-								},
-								'Cancel':function() {
-									$(this).dialog('close');
-									if(isnew) {
-										container.remove();
-									}
-								}
-							},
-							close : function(event, ui) {
-								$(this).dialog('destroy').remove();
-								$('#address_dialog').remove();
-							},
-							open : function(event, ui) {
-								$( "#adr_city" ).autocomplete({
-									source: function( request, response ) {
-										$.ajax({
-											url: "http://ws.geonames.org/searchJSON",
-											dataType: "jsonp",
-											data: {
-												featureClass: "P",
-												style: "full",
-												maxRows: 12,
-												lang: lang,
-												name_startsWith: request.term
-											},
-											success: function( data ) {
-												response( $.map( data.geonames, function( item ) {
-													return {
-														label: item.name + (item.adminName1 ? ", " + item.adminName1 : "") + ", " + item.countryName,
-														value: item.name,
-														country: item.countryName
-													}
-												}));
-											}
-										});
-									},
-									minLength: 2,
-									select: function( event, ui ) {
-										if(ui.item && $('#adr_country').val().trim().length == 0) {
-											$('#adr_country').val(ui.item.country);
-										}
-									},
-									open: function() {
-										$( this ).removeClass( "ui-corner-all" ).addClass( "ui-corner-top" );
-									},
-									close: function() {
-										$( this ).removeClass( "ui-corner-top" ).addClass( "ui-corner-all" );
-									}
-								});
-								$('#adr_country').autocomplete({
-									source: function( request, response ) {
-										$.ajax({
-											url: "http://ws.geonames.org/searchJSON",
-											dataType: "jsonp",
-											data: {
-												/*featureClass: "A",*/
-												featureCode: "PCLI",
-												/*countryBias: "true",*/
-												/*style: "full",*/
-												lang: lang,
-												maxRows: 12,
-												name_startsWith: request.term
-											},
-											success: function( data ) {
-												response( $.map( data.geonames, function( item ) {
-													return {
-														label: item.name,
-														value: item.name
-													}
-												}));
-											}
-										});
-									},
-									minLength: 2,
-									select: function( event, ui ) {
-										/*if(ui.item) {
-											$('#adr_country').val(ui.item.country);
-										}
-										log( ui.item ?
-											"Selected: " + ui.item.label :
-											"Nothing selected, input was " + this.value);*/
-									},
-									open: function() {
-										$( this ).removeClass( "ui-corner-all" ).addClass( "ui-corner-top" );
-									},
-									close: function() {
-										$( this ).removeClass( "ui-corner-top" ).addClass( "ui-corner-all" );
-									}
-								});
-							}
-						});
-					} else {
-						alert(jsondata.data.message);
-					}
-				});
-			}
-		},
-		saveAddress:function(dlg, obj, isnew){
-			if(!this.enabled) {
-				return;
-			}
-			if(isnew) {
-				container = $('#addresses dl').last();
-				obj = container.find('input').first();
-			} else {
-				checksum = OC.Contacts.checksumFor(obj);
-				container = OC.Contacts.propertyContainerFor(obj);
-			}
-			var adr = new Array(
-				$(dlg).find('#adr_pobox').val().strip_tags(),
-				$(dlg).find('#adr_extended').val().strip_tags(),
-				$(dlg).find('#adr_street').val().strip_tags(),
-				$(dlg).find('#adr_city').val().strip_tags(),
-				$(dlg).find('#adr_region').val().strip_tags(),
-				$(dlg).find('#adr_zipcode').val().strip_tags(),
-				$(dlg).find('#adr_country').val().strip_tags()
-			);
-			container.find('.adr').val(adr.join(';'));
-			container.find('.adr_type').val($(dlg).find('#adr_type').val());
-			container.find('.adr_type_label').html(t('contacts',ucwords($(dlg).find('#adr_type').val().toLowerCase())));
-			OC.Contacts.Card.saveProperty($(container).find('input').first());
-			var adrtxt = '';
-			if(adr[0].length > 0) {
-				adrtxt = adrtxt + '<li>' + adr[0] + '</li>';
-			}
-			if(adr[1].length > 0) {
-				adrtxt = adrtxt + '<li>' + adr[1] + '</li>';
-			}
-			if(adr[2].length > 0) {
-				adrtxt = adrtxt + '<li>' + adr[2] + '</li>';
-			}
-			if(adr[3].length > 0 || adr[5].length > 0) {
-				adrtxt = adrtxt + '<li>' + adr[5] + ' ' + adr[3] + '</li>';
-			}
-			if(adr[4].length > 0) {
-				adrtxt = adrtxt + '<li>' + adr[4] + '</li>';
-			}
-			if(adr[6].length > 0) {
-				adrtxt = adrtxt + '<li>' + adr[6] + '</li>';
-			}
-			container.find('.addresslist').html(adrtxt);
-		},
-		uploadPhoto:function(filelist) {
-			if(!this.enabled) {
-				return;
-			}
-			if(!filelist) {
-				OC.dialogs.alert(t('contacts','No files selected for upload.'), t('contacts', 'Error'));
-				return;
-			}
-			var file = filelist[0];
-			var target = $('#file_upload_target');
-			var form = $('#file_upload_form');
-			var totalSize=0;
-			if(file.size > $('#max_upload').val()){
-				OC.dialogs.alert(t('contacts','The file you are trying to upload exceed the maximum size for file uploads on this server.'), t('contacts', 'Error'));
-				return;
-			} else {
-				target.load(function(){
-				var response=jQuery.parseJSON(target.contents().text());
-					if(response != undefined && response.status == 'success'){
-						OC.Contacts.Card.editPhoto(response.data.id, response.data.tmp);
-						//alert('File: ' + file.tmp + ' ' + file.name + ' ' + file.mime);
-					}else{
-						OC.dialogs.alert(response.data.message, t('contacts', 'Error'));
-					}
-				});
-				form.submit();
-			}
-		},
-		loadPhotoHandlers:function() {
-			var phototools = $('#phototools');
-			phototools.find('li a').tipsy('hide');
-			phototools.find('li a').tipsy();
-			if(this.data.PHOTO) {
-				phototools.find('.delete').click(function() {
-					$(this).tipsy('hide');
-					OC.Contacts.Card.deleteProperty($('#contacts_details_photo'), 'single');
-					$(this).hide();
-				});
-				phototools.find('.edit').click(function() {
-					$(this).tipsy('hide');
-					OC.Contacts.Card.editCurrentPhoto();
-				});
-				phototools.find('.delete').show();
-				phototools.find('.edit').show();
-			} else {
-				phototools.find('.delete').hide();
-				phototools.find('.edit').hide();
-			}
-		},
-		cloudPhotoSelected:function(path){
-			$.getJSON(OC.filePath('contacts', 'ajax', 'oc_photo.php'),{'path':path,'id':OC.Contacts.Card.id},function(jsondata){
-				if(jsondata.status == 'success'){
-					//alert(jsondata.data.page);
-					OC.Contacts.Card.editPhoto(jsondata.data.id, jsondata.data.tmp)
-					$('#edit_photo_dialog_img').html(jsondata.data.page);
-				}
-				else{
-					OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
-				}
-			});
-		},
-		loadPhoto:function(){
-			var self = this;
-			var refreshstr = '&refresh='+Math.random();
-			$('#phototools li a').tipsy('hide');
-			var wrapper = $('#contacts_details_photo_wrapper');
-			wrapper.addClass('loading').addClass('wait');
-			delete this.photo;
-			this.photo = new Image();
-			$(this.photo).load(function () {
-				$('img.contacts_details_photo').remove()
-				$(this).addClass('contacts_details_photo');
-				wrapper.css('width', $(this).get(0).width + 10);
-				wrapper.removeClass('loading').removeClass('wait');
-				$(this).insertAfter($('#phototools')).fadeIn();
-			}).error(function () {
-				// notify the user that the image could not be loaded
-				OC.Contacts.notify({message:t('contacts','Error loading profile picture.')});
-			}).attr('src', OC.linkTo('contacts', 'photo.php')+'?id='+self.id+refreshstr);
-			this.loadPhotoHandlers()
-		},
-		editCurrentPhoto:function(){
-			if(!this.enabled) {
-				return;
-			}
-			$.getJSON(OC.filePath('contacts', 'ajax', 'currentphoto.php'),{'id':this.id},function(jsondata){
-				if(jsondata.status == 'success'){
-					//alert(jsondata.data.page);
-					OC.Contacts.Card.editPhoto(jsondata.data.id, jsondata.data.tmp)
-					$('#edit_photo_dialog_img').html(jsondata.data.page);
-				}
-				else{
-					wrapper.removeClass('wait');
-					OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
-				}
-			});
-		},
-		editPhoto:function(id, tmpkey){
-			if(!this.enabled) {
-				return;
-			}
-			//alert('editPhoto: ' + tmpkey);
-			$.getJSON(OC.filePath('contacts', 'ajax', 'cropphoto.php'),{'tmpkey':tmpkey,'id':this.id, 'requesttoken':requesttoken},function(jsondata){
-				if(jsondata.status == 'success'){
-					//alert(jsondata.data.page);
-					$('#edit_photo_dialog_img').html(jsondata.data.page);
-				}
-				else{
-					OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
-				}
-			});
-			if($('#edit_photo_dialog').dialog('isOpen') == true){
-				$('#edit_photo_dialog').dialog('moveToTop');
-			} else {
-				$('#edit_photo_dialog').dialog('open');
-			}
-		},
-		savePhoto:function() {
-			if(!this.enabled) {
-				return;
-			}
-			var target = $('#crop_target');
-			var form = $('#cropform');
-			var wrapper = $('#contacts_details_photo_wrapper');
-			var self = this;
-			wrapper.addClass('wait');
-			form.submit();
-			target.load(function(){
-				var response=jQuery.parseJSON(target.contents().text());
-				if(response != undefined && response.status == 'success'){
-					// load cropped photo.
-					self.loadPhoto();
-					OC.Contacts.Card.data.PHOTO = true;
-				}else{
-					OC.dialogs.alert(response.data.message, t('contacts', 'Error'));
-					wrapper.removeClass('wait');
-				}
-			});
-			OC.Contacts.Contacts.refreshThumbnail(this.id);
-		},
-		addIM:function() {
-			//alert('addMail');
-			var imlist = $('#imlist');
-			imlist.find('li.template:first-child').clone(true).appendTo(imlist).show().find('a .tip').tipsy();
-			imlist.find('li.template:last-child').find('select').addClass('contacts_property');
-			imlist.find('li.template:last-child').removeClass('template').addClass('propertycontainer');
-			imlist.find('li:last-child').find('input[type="text"]').focus();
-			return false;
-		},
-		loadIMs:function() {
-			//console.log('loadIMs');
-			$('#ims').hide();
-			$('#imlist li.propertycontainer').remove();
-			var imlist = $('#imlist');
-			for(var im in this.data.IMPP) {
-				this.addIM();
-				var curim = imlist.find('li.propertycontainer:last-child');
-				if(typeof this.data.IMPP[im].label != 'undefined') {
-					curim.prepend('<label class="xab">'+this.data.IMPP[im].label+'</label>');
-				}
-				curim.data('checksum', this.data.IMPP[im]['checksum'])
-				curim.find('input[type="text"]').val(this.data.IMPP[im]['value'].split(':').pop());
-				for(var param in this.data.IMPP[im]['parameters']) {
-					if(param.toUpperCase() == 'PREF') {
-						curim.find('input[type="checkbox"]').attr('checked', 'checked')
-					}
-					else if(param.toUpperCase() == 'TYPE') {
-						if(typeof this.data.IMPP[im]['parameters'][param] == 'string') {
-							var found = false;
-							var imt = this.data.IMPP[im]['parameters'][param];
-							curim.find('select.types option').each(function(){
-								if($(this).val().toUpperCase() == imt.toUpperCase()) {
-									$(this).attr('selected', 'selected');
-									found = true;
-								}
-							});
-							if(!found) {
-								curim.find('select.type option:last-child').after('<option value="'+imt+'" selected="selected">'+imt+'</option>');
-							}
-						} else if(typeof this.data.IMPP[im]['parameters'][param] == 'object') {
-							for(imtype in this.data.IMPP[im]['parameters'][param]) {
-								var found = false;
-								var imt = this.data.IMPP[im]['parameters'][param][imtype];
-								curim.find('select.types option').each(function(){
-									if($(this).val().toUpperCase() == imt.toUpperCase().split(',')) {
-										$(this).attr('selected', 'selected');
-										found = true;
-									}
-								});
-								if(!found) {
-									curim.find('select.type option:last-child').after('<option value="'+imt+'" selected="selected">'+imt+'</option>');
-								}
-							}
-						}
-					}
-					else if(param.toUpperCase() == 'X-SERVICE-TYPE') {
-						curim.find('select.impp').val(this.data.IMPP[im]['parameters'][param].toLowerCase());
-					}
-				}
-			}
-			if($('#imlist li').length > 1) {
-				$('#ims').show();
-			}
-			return false;
-		},
-		addMail:function() {
-			var emaillist = $('#emaillist');
-			emaillist.find('li.template:first-child').clone(true).appendTo(emaillist).show().find('a .tip').tipsy();
-			emaillist.find('li.template:last-child').find('select').addClass('contacts_property');
-			emaillist.find('li.template:last-child').removeClass('template').addClass('propertycontainer');
-			emaillist.find('li:last-child').find('input[type="email"]').focus();
-			emaillist.find('li:last-child').find('select').multiselect({
-												noneSelectedText: t('contacts', 'Select type'),
-													header: false,
-													selectedList: 4,
-													classes: 'typelist'
-												});
-			return false;
-		},
-		loadMails:function() {
-			$('#emails').hide();
-			$('#emaillist li.propertycontainer').remove();
-			var emaillist = $('#emaillist');
-			for(var mail in this.data.EMAIL) {
-				this.addMail();
-				emaillist.find('li:last-child').find('select').multiselect('destroy');
-				var curemail = emaillist.find('li.propertycontainer:last-child');
-				if(typeof this.data.EMAIL[mail].label != 'undefined') {
-					curemail.prepend('<label class="xab">'+this.data.EMAIL[mail].label+'</label>');
-				}
-				curemail.data('checksum', this.data.EMAIL[mail]['checksum'])
-				curemail.find('input[type="email"]').val(this.data.EMAIL[mail]['value']);
-				for(var param in this.data.EMAIL[mail]['parameters']) {
-					if(param.toUpperCase() == 'PREF') {
-						curemail.find('input[type="checkbox"]').attr('checked', 'checked')
-					}
-					else if(param.toUpperCase() == 'TYPE') {
-						for(etype in this.data.EMAIL[mail]['parameters'][param]) {
-							var found = false;
-							var et = this.data.EMAIL[mail]['parameters'][param][etype];
-							curemail.find('select option').each(function(){
-								if($.inArray($(this).val().toUpperCase(), et.toUpperCase().split(',')) > -1) {
-									$(this).attr('selected', 'selected');
-									found = true;
-								}
-							});
-							if(!found) {
-								curemail.find('select option:last-child').after('<option value="'+et+'" selected="selected">'+et+'</option>');
-							}
-						}
-					}
-				}
-				curemail.find('select').multiselect({
-								noneSelectedText: t('contacts', 'Select type'),
-								header: false,
-								selectedList: 4,
-								classes: 'typelist'
-							});
-			}
-			if($('#emaillist li').length > 1) {
-				$('#emails').show();
-			}
-			$('#emaillist li:last-child').find('input[type="text"]').focus();
-			return false;
-		},
-		addPhone:function() {
-			var phonelist = $('#phonelist');
-			phonelist.find('li.template:first-child').clone(true).appendTo(phonelist); //.show();
-			phonelist.find('li.template:last-child').find('select').addClass('contacts_property');
-			phonelist.find('li.template:last-child').removeClass('template').addClass('propertycontainer');
-			phonelist.find('li:last-child').find('input[type="text"]').focus();
-			phonelist.find('li:last-child').find('select').multiselect({
-												noneSelectedText: t('contacts', 'Select type'),
-													header: false,
-													selectedList: 4,
-													classes: 'typelist'
-												});
-			phonelist.find('li:last-child').show();
-			return false;
-		},
-		loadPhones:function() {
-			$('#phones').hide();
-			$('#phonelist li.propertycontainer').remove();
-			var phonelist = $('#phonelist');
-			for(var phone in this.data.TEL) {
-				this.addPhone();
-				var curphone = phonelist.find('li.propertycontainer:last-child');
-				if(typeof this.data.TEL[phone].label != 'undefined') {
-					curphone.prepend('<label class="xab">'+this.data.TEL[phone].label+'</label>');
-				}
-				curphone.find('select').multiselect('destroy');
-				curphone.data('checksum', this.data.TEL[phone]['checksum'])
-				curphone.find('input[type="text"]').val(this.data.TEL[phone]['value']);
-				for(var param in this.data.TEL[phone]['parameters']) {
-					if(param.toUpperCase() == 'PREF') {
-						curphone.find('input[type="checkbox"]').attr('checked', 'checked');
-					}
-					else if(param.toUpperCase() == 'TYPE') {
-						for(ptype in this.data.TEL[phone]['parameters'][param]) {
-							var found = false;
-							var pt = this.data.TEL[phone]['parameters'][param][ptype];
-							curphone.find('select option').each(function() {
-								//if ($(this).val().toUpperCase() == pt.toUpperCase()) {
-								if ($.inArray($(this).val().toUpperCase(), pt.toUpperCase().split(',')) > -1) {
-									$(this).attr('selected', 'selected');
-									found = true;
-								}
-							});
-							if(!found) {
-								curphone.find('select option:last-child').after('<option class="custom" value="'+pt+'" selected="selected">'+pt+'</option>');
-							}
-						}
-					}
-				}
-				curphone.find('select').multiselect({
-										noneSelectedText: t('contacts', 'Select type'),
-										header: false,
-										selectedList: 4,
-										classes: 'typelist'
-									});
-			}
-			if(phonelist.find('li').length > 1) {
-				$('#phones').show();
-			}
-			return false;
-		},
-	},
-	Contacts:{
-		contacts:{},
-		deletionQueue:[],
-		batchnum:50,
-		warnNotDeleted:function(e) {
-			e = e || window.event;
-			var warn = t('contacts', 'Some contacts are marked for deletion, but not deleted yet. Please wait for them to be deleted.');
-			if (e) {
-				e.returnValue = String(warn);
-			}
-			if(OC.Contacts.Contacts.deletionQueue.length > 0) {
-				setTimeout(OC.Contacts.Contacts.deleteFilesInQueue, 1);
-			}
-			return warn;
-		},
-		deleteFilesInQueue:function() {
-			var queue = OC.Contacts.Contacts.deletionQueue;
-			if(queue.length > 0) {
-				OC.Contacts.notify({cancel:true});
-				while(queue.length > 0) {
-					var id = queue.pop();
-					if(id) {
-						OC.Contacts.Card.doDelete(id, false);
-					}
-				}
-			}
-		},
-		getContact:function(id) {
-			if(!this.contacts[id]) {
-				this.contacts[id] = $('#contacts li[data-id="'+id+'"]');
-					if(!this.contacts[id]) {
-						self = this;
-						$.getJSON(OC.filePath('contacts', 'ajax', 'contactdetails.php'),{'id':id},function(jsondata){
-							if(jsondata.status == 'success'){
-								self.contacts[id] = self.insertContact({data:jsondata.data});
-							}
-							else{
-								OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
-							}
-						});
-					}
-			}
-			return this.contacts[id];
-		},
-		drop:function(event, ui) {
-			var dragitem = ui.draggable, droptarget = $(this);
-			if(dragitem.is('li')) {
-				OC.Contacts.Contacts.dropContact(event, dragitem, droptarget);
-			} else {
-				OC.Contacts.Contacts.dropAddressbook(event, dragitem, droptarget);
-			}
-		},
-		dropContact:function(event, dragitem, droptarget) {
-			if(dragitem.data('bookid') == droptarget.data('id')) {
-				return false;
-			}
-			var droplist = (droptarget.is('ul')) ? droptarget : droptarget.next();
-			$.post(OC.filePath('contacts', 'ajax', 'contact/move.php'),
-				{
-					id: dragitem.data('id'),
-					aid: droptarget.data('id')
-				},
-				function(jsondata){
-					if(jsondata.status == 'success'){
-						dragitem.attr('data-bookid', droptarget.data('id'))
-						dragitem.data('bookid', droptarget.data('id'));
-						OC.Contacts.Contacts.insertContact({
-							contactlist:droplist,
-							contact:dragitem.detach()
-						});
-						OC.Contacts.Contacts.scrollTo(dragitem.data('id'));
-					} else {
-						OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
-					}
-			});
-		},
-		dropAddressbook:function(event, dragitem, droptarget) {
-			if(confirm(t('contacts', 'Do you want to merge these address books?'))) {
-				if(dragitem.data('bookid') == droptarget.data('id')) {
-					return false;
-				}
-				var droplist = (droptarget.is('ul')) ? droptarget : droptarget.next();
-				$.post(OC.filePath('contacts', 'ajax', 'contact/move.php'),
-					{
-						id: dragitem.data('id'),
-						aid: droptarget.data('id'),
-						isaddressbook: 1
-				},
-				function(jsondata){
-					if(jsondata.status == 'success'){
-						OC.Contacts.Contacts.update(); // Easier to refresh the whole bunch.
-					} else {
-						OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
-					}
-				});
-			} else {
-				return false;
-			}
-		},
-		/**
-		 * @params params An object with the properties 'contactlist':a jquery object of the ul to insert into,
-		 * 'contacts':a jquery object of all items in the list and either 'data': an object with the properties
-		 * id, addressbookid and displayname or 'contact': a listitem to be inserted directly.
-		 * If 'contactlist' or 'contacts' aren't defined they will be search for based in the properties in 'data'.
-		 */
-		insertContact:function(params) {
-			var id, bookid;
-			if(!params.contactlist) {
-				// FIXME: Check if contact really exists.
-				bookid = params.data ? params.data.addressbookid : params.contact.data('bookid');
-				id = params.data ? params.data.id : params.contact.data('id');
-				params.contactlist = $('#contacts ul[data-id="'+bookid+'"]');
-			}
-			if(!params.contacts) {
-				bookid = params.data ? params.data.addressbookid : params.contact.data('bookid');
-				id = params.data ? params.data.id : params.contact.data('id');
-				params.contacts = $('#contacts ul[data-id="'+bookid+'"] li');
-			}
-			var contact = params.data
-					? $('<li data-id="'+params.data.id+'" data-bookid="'+params.data.addressbookid
-						+ '" role="button"><a href="'+OC.linkTo('contacts', 'index.php')+'?id='
-						+ params.data.id+'"  style="background: url('+OC.filePath('contacts', '', 'thumbnail.php')
-						+ '?id='+params.data.id+') no-repeat scroll 0% 0% transparent;">'
-						+ params.data.displayname+'</a></li>')
-					: params.contact;
-			var added = false;
-			var name = params.data ? params.data.displayname.toLowerCase() : contact.find('a').text().toLowerCase();
-			if(params.contacts) {
-				params.contacts.each(function() {
-					if ($(this).text().toLowerCase() > name) {
-						$(this).before(contact);
-						added = true;
-						return false;
-					}
-				});
-			}
-			if(!added || !params.contacts) {
-				params.contactlist.append(contact);
-			}
-			//this.contacts[id] = contact;
-			return contact;
-		},
-		addAddressbook:function(name, description, cb) {
-			$.post(OC.filePath('contacts', 'ajax/addressbook', 'add.php'), { name: name, description: description, active: true },
-				function(jsondata) {
-				if(jsondata.status == 'success'){
-					if(cb && typeof cb == 'function') {
-						cb(jsondata.data.addressbook);
-					}
-				} else {
-					OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
-					return false;
-				}
-			});
-		},
-		doImport:function(file, aid){
-			$.post(OC.filePath('contacts', '', 'import.php'), { id: aid, file: file, fstype: 'OC_FilesystemView' },
-				function(jsondata){
-					if(jsondata.status != 'success'){
-						OC.Contacts.notify({message:jsondata.data.message});
-					}
-			});
-			return false;
-		},
-		next:function(reverse) {
-			var curlistitem = this.getContact(OC.Contacts.Card.id);
-			var newlistitem = reverse ? curlistitem.prev('li') : curlistitem.next('li');
-			if(newlistitem) {
-				curlistitem.removeClass('active');
-				OC.Contacts.Card.update({
-					cid:newlistitem.data('id'),
-					aid:newlistitem.data('bookid')
-				});
-			}
-		},
-		previous:function() {
-			this.next(true);
-		},
-		nextAddressbook:function(reverse) {
-			console.log('nextAddressbook', reverse);
-			var curlistitem = this.getContact(OC.Contacts.Card.id);
-			var parent = curlistitem.parent('ul');
-			var newparent = reverse
-				? parent.prevAll('ul').first()
-				: parent.nextAll('ul').first();
-			if(newparent) {
-				newlistitem = newparent.find('li:first-child');
-				if(newlistitem) {
-					parent.slideUp().prev('h3').removeClass('active');
-					newparent.slideDown().prev('h3').addClass('active');
-					curlistitem.removeClass('active');
-					OC.Contacts.Card.update({
-						cid:newlistitem.data('id'),
-						aid:newlistitem.data('bookid')
-					});
-				}
-			}
-		},
-		previousAddressbook:function() {
-			console.log('previousAddressbook');
-			this.nextAddressbook(true);
-		},
-		// Reload the contacts list.
-		update:function(params){
-			if(!params) { params = {}; }
-			if(!params.start) {
-				if(params.aid) {
-					$('#contacts h3[data-id="'+params.aid+'"],#contacts ul[data-id="'+params.aid+'"]').remove();
-				} else {
-					$('#contacts').empty();
-				}
-			}
-			self = this;
-			console.log('update: ' + params.cid + ' ' + params.aid + ' ' + params.start);
-			var firstrun = false;
-			var opts = {};
-			opts['startat'] = (params.start?params.start:0);
-			if(params.aid) {
-				opts['aid'] = params.aid;
-			}
-			$.getJSON(OC.filePath('contacts', 'ajax', 'contact/list.php'),opts,function(jsondata){
-				if(jsondata.status == 'success'){
-					var books = jsondata.data.entries;
-					$.each(books, function(b, book) {
-						if($('#contacts h3[data-id="'+b+'"]').length == 0) {
-							firstrun = true;
-							if($('#contacts h3').length == 0) {
-								$('#contacts').html('<h3 class="addressbook" contextmenu="addressbookmenu" data-id="'
-									+ b + '" data-permissions="' + book.permissions + '">' + book.displayname
-									+ '</h3><ul class="contacts hidden" data-id="'+b+'" data-permissions="'
-									+ book.permissions + '"></ul>');
-							} else {
-								if(!$('#contacts h3[data-id="' + b + '"]').length) {
-									var item = $('<h3 class="addressbook" contextmenu="addressbookmenu" data-id="'
-										+ b + '" data-permissions="' + book.permissions + '">'
-										+ book.displayname+'</h3><ul class="contacts hidden" data-id="' + b
-										+ '" data-permissions="' + book.permissions + '"></ul>');
-									var added = false;
-									$('#contacts h3').each(function(){
-										if ($(this).text().toLowerCase() > book.displayname.toLowerCase()) {
-											$(this).before(item).fadeIn('fast');
-											added = true;
-											return false;
-										}
-									});
-									if(!added) {
-										$('#contacts').append(item);
-									}
-								}
-							}
-							$('#contacts h3[data-id="'+b+'"]').on('click', function(event) {
-								$('#contacts h3').removeClass('active');
-								$(this).addClass('active');
-								$('#contacts ul[data-id="'+b+'"]').slideToggle(300);
-								return false;
-							});
-							var accept = 'li:not([data-bookid="'+b+'"]),h3:not([data-id="'+b+'"])';
-							$('#contacts h3[data-id="'+b+'"],#contacts ul[data-id="'+b+'"]').droppable({
-								drop: OC.Contacts.Contacts.drop,
-								activeClass: 'ui-state-hover',
-								accept: accept
-							});
-						}
-						var contactlist = $('#contacts ul[data-id="'+b+'"]');
-						var contacts = $('#contacts ul[data-id="'+b+'"] li');
-						for(var c in book.contacts) {
-							if(book.contacts[c].id == undefined) { continue; }
-							if(!$('#contacts li[data-id="'+book.contacts[c]['id']+'"]').length) {
-								var contact = OC.Contacts.Contacts.insertContact({contactlist:contactlist, contacts:contacts, data:book.contacts[c]});
-								if(c == self.batchnum-10) {
-									contact.bind('inview', function(event, isInView, visiblePartX, visiblePartY) {
-										$(this).unbind(event);
-										var bookid = $(this).data('bookid');
-										var numsiblings = $('.contacts li[data-bookid="'+bookid+'"]').length;
-										if (isInView && numsiblings >= self.batchnum) {
-											console.log('This would be a good time to load more contacts.');
-											OC.Contacts.Contacts.update({cid:params.cid, aid:bookid, start:$('#contacts li[data-bookid="'+bookid+'"]').length});
-										}
-									});
-								}
-							}
-						}
-					});
-					if($('#contacts h3').length > 1) {
-						$('#contacts li,#contacts h3').draggable({
-							distance: 10,
-							revert: 'invalid',
-							axis: 'y', containment: '#contacts',
-							scroll: true, scrollSensitivity: 40,
-							opacity: 0.7, helper: 'clone'
-						});
-					} else {
-						$('#contacts h3').first().addClass('active');
-					}
-					if(opts['startat'] == 0) { // only update card on first load.
-						OC.Contacts.Card.update(params);
-					}
-				} else {
-					OC.Contacts.notify({message:t('contacts', 'Error')+': '+jsondata.data.message});
-				}
-			});
-		},
-		refreshThumbnail:function(id){
-			var item = $('.contacts li[data-id="'+id+'"]').find('a');
-			item.html(OC.Contacts.Card.fn);
-			item.css('background','url('+OC.filePath('contacts', '', 'thumbnail.php')+'?id='+id+'&refresh=1'+Math.random()+') no-repeat');
-		},
-		scrollTo:function(id){
-			var item = $('#contacts li[data-id="'+id+'"]');
-			if(item && $.isNumeric(item.offset().top)) {
-				console.log('scrollTo ' + parseInt(item.offset().top));
-				$('#contacts').animate({
-					scrollTop: parseInt(item.offset()).top-40}, 'slow','swing');
-			}
-		}
-	}
-}
-$(document).ready(function(){
-
-	OCCategories.changed = OC.Contacts.Card.categoriesChanged;
-	OCCategories.app = 'contacts';
-
-	var ninjahelp = $('#ninjahelp');
-
-	$('#bottomcontrols .settings').on('click keydown', function() {
-		try {
-			ninjahelp.hide();
-			OC.appSettings({appid:'contacts', loadJS:true, cache:false});
-		} catch(e) {
-			console.log('error:', e.message);
-		}
-	});
-	$('#bottomcontrols .import').click(function() {
-		$('#import_upload_start').trigger('click');
-	});
-	$('#contacts_newcontact').on('click keydown', OC.Contacts.Card.editNew);
-
-	ninjahelp.find('.close').on('click keydown',function() {
-		ninjahelp.hide();
-	});
-
-	$(document).on('keyup', function(event) {
-		if(event.target.nodeName.toUpperCase() != 'BODY'
-			|| $('#contacts li').length == 0
-			|| !OC.Contacts.Card.id) {
-			return;
-		}
-		//console.log(event.which + ' ' + event.target.nodeName);
-		/**
-		 * To add:
-		 * Shift-a: add addressbook
-		 * u (85): hide/show leftcontent
-		 * f (70): add field
-		 */
-		switch(event.which) {
-			case 27: // Esc
-				ninjahelp.hide();
-				break;
-			case 46: // Delete
-				if(event.shiftKey) {
-					OC.Contacts.Card.delayedDelete();
-				}
-				break;
-			case 40: // down
-			case 74: // j
-				OC.Contacts.Contacts.next();
-				break;
-			case 65: // a
-				if(event.shiftKey) {
-					// add addressbook
-					OC.Contacts.notImplemented();
-					break;
-				}
-				OC.Contacts.Card.editNew();
-				break;
-			case 38: // up
-			case 75: // k
-				OC.Contacts.Contacts.previous();
-				break;
-			case 34: // PageDown
-			case 78: // n
-				// next addressbook
-				OC.Contacts.Contacts.nextAddressbook();
-				break;
-			case 79: // o
-				var aid = $('#contacts h3.active').first().data('id');
-				if(aid) {
-					$('#contacts ul[data-id="'+aid+'"]').slideToggle(300);
-				}
-				break;
-			case 33: // PageUp
-			case 80: // p
-				// prev addressbook
-				OC.Contacts.Contacts.previousAddressbook();
-				break;
-			case 82: // r
-				OC.Contacts.Contacts.update({cid:OC.Contacts.Card.id});
-				break;
-			case 191: // ?
-				ninjahelp.toggle('fast');
-				break;
-		}
-
-	});
-
-	//$(window).on('beforeunload', OC.Contacts.Contacts.deleteFilesInQueue);
-
-	// Load a contact.
-	$('.contacts').keydown(function(event) {
-		if(event.which == 13 || event.which == 32) {
-			$('.contacts').click();
-		}
-	});
-	$(document).on('click', '#contacts', function(event){
-		var $tgt = $(event.target);
-		if ($tgt.is('li') || $tgt.is('a')) {
-			var item = $tgt.is('li')?$($tgt):($tgt).parent();
-			var id = item.data('id');
-			var bookid = item.data('bookid');
-			item.addClass('active');
-			var oldid = $('#rightcontent').data('id');
-			if(oldid != 0){
-				var olditem = $('.contacts li[data-id="'+oldid+'"]');
-				var oldbookid = olditem.data('bookid');
-				olditem.removeClass('active');
-				if(oldbookid != bookid) {
-					$('#contacts h3[data-id="'+oldbookid+'"]').removeClass('active');
-					$('#contacts h3[data-id="'+bookid+'"]').addClass('active');
-				}
-			}
-			$.getJSON(OC.filePath('contacts', 'ajax', 'contact/details.php'),{'id':id},function(jsondata){
-				if(jsondata.status == 'success'){
-					OC.Contacts.Card.loadContact(jsondata.data, bookid);
-				}
-				else{
-					OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
-				}
-			});
-		}
-		return false;
-	});
-
-	$('.contacts_property').live('change', function(){
-		OC.Contacts.Card.saveProperty(this);
-	});
-
-	$(function() {
-		// Upload function for dropped contact photos files. Should go in the Contacts class/object.
-		$.fileUpload = function(files){
-			var file = files[0];
-			if(file.size > $('#max_upload').val()){
-				OC.dialogs.alert(t('contacts','The file you are trying to upload exceed the maximum size for file uploads on this server.'), t('contacts','Upload too large'));
-				return;
-			}
-			if (file.type.indexOf("image") != 0) {
-				OC.dialogs.alert(t('contacts','Only image files can be used as profile picture.'), t('contacts','Wrong file type'));
-				return;
-			}
-			var xhr = new XMLHttpRequest();
-
-			if (!xhr.upload) {
-				OC.dialogs.alert(t('contacts', 'Your browser doesn\'t support AJAX upload. Please click on the profile picture to select a photo to upload.'), t('contacts', 'Error'))
-			}
-			fileUpload = xhr.upload,
-			xhr.onreadystatechange = function() {
-				if (xhr.readyState == 4){
-					response = $.parseJSON(xhr.responseText);
-					if(response.status == 'success') {
-						if(xhr.status == 200) {
-							OC.Contacts.Card.editPhoto(response.data.id, response.data.tmp);
-						} else {
-							OC.dialogs.alert(xhr.status + ': ' + xhr.responseText, t('contacts', 'Error'));
-						}
-					} else {
-						OC.dialogs.alert(response.data.message, t('contacts', 'Error'));
-					}
-				}
-			};
-
-			fileUpload.onprogress = function(e){
-				if (e.lengthComputable){
-					var _progress = Math.round((e.loaded * 100) / e.total);
-					//if (_progress != 100){
-					//}
-				}
-			};
-			xhr.open('POST', OC.filePath('contacts', 'ajax', 'uploadphoto.php')+'?id='+OC.Contacts.Card.id+'&requesttoken='+requesttoken+'&imagefile='+encodeURIComponent(file.name), true);
-			xhr.setRequestHeader('Cache-Control', 'no-cache');
-			xhr.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
-			xhr.setRequestHeader('X_FILE_NAME', encodeURIComponent(file.name));
-			xhr.setRequestHeader('X-File-Size', file.size);
-			xhr.setRequestHeader('Content-Type', file.type);
-			xhr.send(file);
-		}
-	});
-
-	$(document).bind('drop dragover', function (e) {
-			e.preventDefault(); // prevent browser from doing anything, if file isn't dropped in dropZone
-	});
-
-	//add multiply file upload attribute to all browsers except konqueror (which crashes when it's used)
-	if(navigator.userAgent.search(/konqueror/i)==-1){
-		$('#import_upload_start').attr('multiple','multiple')
-	}
-	// Import using jquery.fileupload
-	$(function() {
-		var uploadingFiles = {}, numfiles = 0, uploadedfiles = 0, retries = 0;
-		var aid;
-
-		$('#import_upload_start').fileupload({
-			dropZone: $('#contacts'), // restrict dropZone to contacts list.
-			acceptFileTypes:  /^text\/(directory|vcard|x-vcard)$/i,
-			add: function(e, data) {
-				var files = data.files;
-				var totalSize=0;
-				if(files) {
-					numfiles += files.length; uploadedfiles = 0;
-					for(var i=0;i<files.length;i++) {
-						if(files[i].size ==0 && files[i].type== '') {
-							OC.dialogs.alert(t('files', 'Unable to upload your file as it is a directory or has 0 bytes'), t('files', 'Upload Error'));
-							return;
-						}
-						totalSize+=files[i].size;
-					}
-				}
-				if(totalSize>$('#max_upload').val()){
-					OC.dialogs.alert(t('contacts','The file you are trying to upload exceed the maximum size for file uploads on this server.'), t('contacts','Upload too large'));
-					numfiles = uploadedfiles = retries = aid = 0;
-					uploadingFiles = {};
-					return;
-				}else{
-					if($.support.xhrFileUpload) {
-						for(var i=0;i<files.length;i++){
-							var fileName = files[i].name;
-							var dropTarget;
-							if($(e.originalEvent.target).is('h3')) {
-								dropTarget = $(e.originalEvent.target).next('ul');
-							} else {
-								dropTarget = $(e.originalEvent.target).closest('ul');
-							}
-							if(dropTarget && dropTarget.hasClass('contacts')) { // TODO: More thorough check for where we are.
-								aid = dropTarget.attr('data-id');
-							} else {
-								aid = undefined;
-							}
-							var jqXHR =  $('#import_upload_start').fileupload('send', {files: files[i],
-								formData: function(form) {
-									var formArray = form.serializeArray();
-									formArray['aid'] = aid;
-									return formArray;
-								}})
-								.success(function(result, textStatus, jqXHR) {
-									if(result.status == 'success') {
-										// import the file
-										uploadedfiles += 1;
-									} else {
-										OC.Contacts.notify({message:jsondata.data.message});
-									}
-									return false;
-								})
-								.error(function(jqXHR, textStatus, errorThrown) {
-									console.log(textStatus);
-									OC.Contacts.notify({message:errorThrown + ': ' + textStatus,});
-								});
-							uploadingFiles[fileName] = jqXHR;
-						}
-					} else {
-						data.submit().success(function(data, status) {
-							response = jQuery.parseJSON(data[0].body.innerText);
-							if(response[0] != undefined && response[0].status == 'success') {
-								var file=response[0];
-								delete uploadingFiles[file.name];
-								$('tr').filterAttr('data-file',file.name).data('mime',file.mime);
-								var size = $('tr').filterAttr('data-file',file.name).find('td.filesize').text();
-								if(size==t('files','Pending')){
-									$('tr').filterAttr('data-file',file.name).find('td.filesize').text(file.size);
-								}
-								FileList.loadingDone(file.name);
-							} else {
-								OC.Contacts.notify({message:response.data.message});
-							}
-						});
-					}
-				}
-			},
-			fail: function(e, data) {
-				console.log('fail');
-				OC.Contacts.notify({message:data.errorThrown + ': ' + data.textStatus});
-				// TODO: Remove file from upload queue.
-			},
-			progressall: function(e, data) {
-				var progress = (data.loaded/data.total)*50;
-				$('#uploadprogressbar').progressbar('value',progress);
-			},
-			start: function(e, data) {
-				$('#uploadprogressbar').progressbar({value:0});
-				$('#uploadprogressbar').fadeIn();
-				if(data.dataType != 'iframe ') {
-					$('#upload input.stop').show();
-				}
-			},
-			stop: function(e, data) {
-				// stop only gets fired once so we collect uploaded items here.
-				var importFiles = function(aid, fileList) {
-					// Create a closure that can be called from different places.
-					if(numfiles != uploadedfiles) {
-						OC.Contacts.notify({message:t('contacts', 'Not all files uploaded. Retrying...')});
-						retries += 1;
-						if(retries > 3) {
-							numfiles = uploadedfiles = retries = aid = 0;
-							uploadingFiles = {};
-							$('#uploadprogressbar').fadeOut();
-							OC.dialogs.alert(t('contacts', 'Something went wrong with the upload, please retry.'), t('contacts', 'Error'));
-							return;
-						}
-						setTimeout(function() { // Just to let any uploads finish
-							importFiles(aid, uploadingFiles);
-						}, 1000);
-					}
-					$('#uploadprogressbar').progressbar('value',50);
-					var todo = uploadedfiles;
-					$.each(fileList, function(fileName, data) {
-						OC.Contacts.Contacts.doImport(fileName, aid);
-						delete fileList[fileName];
-						numfiles -= 1; uploadedfiles -= 1;
-						$('#uploadprogressbar').progressbar('value',50+(50/(todo-uploadedfiles)));
-					})
-					$('#uploadprogressbar').progressbar('value',100);
-					$('#uploadprogressbar').fadeOut();
-					setTimeout(function() {
-						OC.Contacts.Contacts.update({aid:aid});
-						numfiles = uploadedfiles = retries = aid = 0;
-					}, 1000);
-				}
-				if(!aid) {
-					// Either selected with filepicker or dropped outside of an address book.
-					$.getJSON(OC.filePath('contacts', 'ajax', 'selectaddressbook.php'),{},function(jsondata) {
-						if(jsondata.status == 'success') {
-							if($('#selectaddressbook_dialog').dialog('isOpen') == true) {
-								$('#selectaddressbook_dialog').dialog('moveToTop');
-							} else {
-								$('#dialog_holder').html(jsondata.data.page).ready(function($) {
-									var select_dlg = $('#selectaddressbook_dialog');
-									select_dlg.dialog({
-										modal: true, height: 'auto', width: 'auto',
-										buttons: {
-											'Ok':function() {
-												aid = select_dlg.find('input:checked').val();
-												if(aid == 'new') {
-													var displayname = select_dlg.find('input.name').val();
-													var description = select_dlg.find('input.desc').val();
-													if(!displayname.trim()) {
-														OC.dialogs.alert(t('contacts', 'The address book name cannot be empty.'), t('contacts', 'Error'));
-														return false;
-													}
-													$(this).dialog('close');
-													OC.Contacts.Contacts.addAddressbook(displayname, description, function(addressbook) {
-														aid = addressbook.id;
-														setTimeout(function() {
-															importFiles(aid, uploadingFiles);
-														}, 500);
-														console.log('aid ' + aid);
-													});
-												} else {
-													setTimeout(function() {
-														importFiles(aid, uploadingFiles);
-													}, 500);
-													console.log('aid ' + aid);
-													$(this).dialog('close');
-												}
-											},
-											'Cancel':function() {
-												$(this).dialog('close');
-												numfiles = uploadedfiles = retries = aid = 0;
-												uploadingFiles = {};
-												$('#uploadprogressbar').fadeOut();
-											}
-										},
-										close: function(event, ui) {
-											// TODO: If numfiles != 0 delete tmp files after a timeout.
-											$(this).dialog('destroy').remove();
-										}
-									});
-								});
-							}
-						} else {
-							$('#uploadprogressbar').fadeOut();
-							OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
-						}
-					});
-				} else {
-					// Dropped on an address book or it's list.
-					setTimeout(function() { // Just to let any uploads finish
-						importFiles(aid, uploadingFiles);
-					}, 1000);
-				}
-				if(data.dataType != 'iframe ') {
-					$('#upload input.stop').hide();
-				}
-			}
-		})
-	});
-
-	OC.Contacts.loadHandlers();
-	OC.Contacts.Contacts.update({cid:id});
-});
diff --git a/apps/contacts/js/expanding.js b/apps/contacts/js/expanding.js
deleted file mode 100644
index 17139f27ff..0000000000
--- a/apps/contacts/js/expanding.js
+++ /dev/null
@@ -1,118 +0,0 @@
-// Expanding Textareas
-// https://github.com/bgrins/ExpandingTextareas
-
-(function(factory) {
-    // Add jQuery via AMD registration or browser globals
-    if (typeof define === 'function' && define.amd) {
-        define([ 'jquery' ], factory);
-    }
-    else {
-        factory(jQuery);
-    }
-}(function ($) {
-    $.expandingTextarea = $.extend({
-        autoInitialize: true,
-        initialSelector: "textarea.expanding",
-        opts: {
-            resize: function() { }
-        }
-    }, $.expandingTextarea || {});
-    
-    var cloneCSSProperties = [
-        'lineHeight', 'textDecoration', 'letterSpacing',
-        'fontSize', 'fontFamily', 'fontStyle', 
-        'fontWeight', 'textTransform', 'textAlign', 
-        'direction', 'wordSpacing', 'fontSizeAdjust', 
-        'wordWrap', 
-        'borderLeftWidth', 'borderRightWidth',
-        'borderTopWidth','borderBottomWidth',
-        'paddingLeft', 'paddingRight',
-        'paddingTop','paddingBottom',
-        'marginLeft', 'marginRight',
-        'marginTop','marginBottom',
-        'boxSizing', 'webkitBoxSizing', 'mozBoxSizing', 'msBoxSizing'
-    ];
-    
-    var textareaCSS = {
-        position: "absolute",
-        height: "100%",
-        resize: "none"
-    };
-    
-    var preCSS = {
-        visibility: "hidden",
-        border: "0 solid",
-        whiteSpace: "pre-wrap" 
-    };
-    
-    var containerCSS = {
-        position: "relative"
-    };
-    
-    function resize() {
-        $(this).closest('.expandingText').find("div").text(this.value + ' ');
-        $(this).trigger("resize.expanding");
-    }
-    
-    $.fn.expandingTextarea = function(o) {
-        
-        var opts = $.extend({ }, $.expandingTextarea.opts, o);
-        
-        if (o === "resize") {
-            return this.trigger("input.expanding");
-        }
-        
-        if (o === "destroy") {
-            this.filter(".expanding-init").each(function() {
-                var textarea = $(this).removeClass('expanding-init');
-                var container = textarea.closest('.expandingText');
-                
-                container.before(textarea).remove();
-                textarea
-                    .attr('style', textarea.data('expanding-styles') || '')
-                    .removeData('expanding-styles');
-            });
-            
-            return this;
-        }
-        
-        this.filter("textarea").not(".expanding-init").addClass("expanding-init").each(function() {
-            var textarea = $(this);
-            
-            textarea.wrap("<div class='expandingText'></div>");
-            textarea.after("<pre class='textareaClone'><div></div></pre>");
-            
-            var container = textarea.parent().css(containerCSS);
-            var pre = container.find("pre").css(preCSS);
-            
-            // Store the original styles in case of destroying.
-            textarea.data('expanding-styles', textarea.attr('style'));
-            textarea.css(textareaCSS);
-            
-            $.each(cloneCSSProperties, function(i, p) {
-                var val = textarea.css(p);
-                
-                // Only set if different to prevent overriding percentage css values.
-                if (pre.css(p) !== val) {
-                    pre.css(p, val);
-                }
-            });
-            
-            textarea.bind("input.expanding propertychange.expanding", resize);
-            resize.apply(this);
-            
-            if (opts.resize) {
-                textarea.bind("resize.expanding", opts.resize);
-            }
-        });
-        
-        return this;
-    };
-    
-    $(function () {
-        if ($.expandingTextarea.autoInitialize) {
-            $($.expandingTextarea.initialSelector).expandingTextarea();
-        }
-    });
-    
-}));
diff --git a/apps/contacts/js/jquery.Jcrop.js b/apps/contacts/js/jquery.Jcrop.js
deleted file mode 100644
index 36f9a0f08f..0000000000
--- a/apps/contacts/js/jquery.Jcrop.js
+++ /dev/null
@@ -1,1765 +0,0 @@
-/**
- * jquery.Jcrop.js v0.9.9 {{{
- *
- * jQuery Image Cropping Plugin - released under MIT License 
- * Author: Kelly Hallman <khallman@gmail.com>
- * http://github.com/tapmodo/Jcrop
- *
- * }}}
- * Copyright (c) 2008-2012 Tapmodo Interactive LLC {{{
- *
- * 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.
- *
- * }}}
- */
-
-(function ($) {
-
-  $.Jcrop = function (obj, opt) {
-    var options = $.extend({}, $.Jcrop.defaults),
-        docOffset, lastcurs, ie6mode = false;
-
-    // Internal Methods {{{
-    function px(n) {
-      return parseInt(n, 10) + 'px';
-    }
-    function cssClass(cl) {
-      return options.baseClass + '-' + cl;
-    }
-    function supportsColorFade() {
-      return $.fx.step.hasOwnProperty('backgroundColor');
-    }
-    function getPos(obj) //{{{
-    {
-      var pos = $(obj).offset();
-      return [pos.left, pos.top];
-    }
-    //}}}
-    function mouseAbs(e) //{{{
-    {
-      return [(e.pageX - docOffset[0]), (e.pageY - docOffset[1])];
-    }
-    //}}}
-    function setOptions(opt) //{{{
-    {
-      if (typeof(opt) !== 'object') opt = {};
-      options = $.extend(options, opt);
-
-      $.each(['onChange','onSelect','onRelease','onDblClick'],function(i,e) {
-        if (typeof(options[e]) !== 'function') options[e] = function () {};
-      });
-    }
-    //}}}
-    function startDragMode(mode, pos) //{{{
-    {
-      docOffset = getPos($img);
-      Tracker.setCursor(mode === 'move' ? mode : mode + '-resize');
-
-      if (mode === 'move') {
-        return Tracker.activateHandlers(createMover(pos), doneSelect);
-      }
-
-      var fc = Coords.getFixed();
-      var opp = oppLockCorner(mode);
-      var opc = Coords.getCorner(oppLockCorner(opp));
-
-      Coords.setPressed(Coords.getCorner(opp));
-      Coords.setCurrent(opc);
-
-      Tracker.activateHandlers(dragmodeHandler(mode, fc), doneSelect);
-    }
-    //}}}
-    function dragmodeHandler(mode, f) //{{{
-    {
-      return function (pos) {
-        if (!options.aspectRatio) {
-          switch (mode) {
-          case 'e':
-            pos[1] = f.y2;
-            break;
-          case 'w':
-            pos[1] = f.y2;
-            break;
-          case 'n':
-            pos[0] = f.x2;
-            break;
-          case 's':
-            pos[0] = f.x2;
-            break;
-          }
-        } else {
-          switch (mode) {
-          case 'e':
-            pos[1] = f.y + 1;
-            break;
-          case 'w':
-            pos[1] = f.y + 1;
-            break;
-          case 'n':
-            pos[0] = f.x + 1;
-            break;
-          case 's':
-            pos[0] = f.x + 1;
-            break;
-          }
-        }
-        Coords.setCurrent(pos);
-        Selection.update();
-      };
-    }
-    //}}}
-    function createMover(pos) //{{{
-    {
-      var lloc = pos;
-      KeyManager.watchKeys();
-
-      return function (pos) {
-        Coords.moveOffset([pos[0] - lloc[0], pos[1] - lloc[1]]);
-        lloc = pos;
-
-        Selection.update();
-      };
-    }
-    //}}}
-    function oppLockCorner(ord) //{{{
-    {
-      switch (ord) {
-      case 'n':
-        return 'sw';
-      case 's':
-        return 'nw';
-      case 'e':
-        return 'nw';
-      case 'w':
-        return 'ne';
-      case 'ne':
-        return 'sw';
-      case 'nw':
-        return 'se';
-      case 'se':
-        return 'nw';
-      case 'sw':
-        return 'ne';
-      }
-    }
-    //}}}
-    function createDragger(ord) //{{{
-    {
-      return function (e) {
-        if (options.disabled) {
-          return false;
-        }
-        if ((ord === 'move') && !options.allowMove) {
-          return false;
-        }
-        
-        // Fix position of crop area when dragged the very first time.
-        // Necessary when crop image is in a hidden element when page is loaded.
-        docOffset = getPos($img);
-
-        btndown = true;
-        startDragMode(ord, mouseAbs(e));
-        e.stopPropagation();
-        e.preventDefault();
-        return false;
-      };
-    }
-    //}}}
-    function presize($obj, w, h) //{{{
-    {
-      var nw = $obj.width(),
-          nh = $obj.height();
-      if ((nw > w) && w > 0) {
-        nw = w;
-        nh = (w / $obj.width()) * $obj.height();
-      }
-      if ((nh > h) && h > 0) {
-        nh = h;
-        nw = (h / $obj.height()) * $obj.width();
-      }
-      xscale = $obj.width() / nw;
-      yscale = $obj.height() / nh;
-      $obj.width(nw).height(nh);
-    }
-    //}}}
-    function unscale(c) //{{{
-    {
-      return {
-        x: parseInt(c.x * xscale, 10),
-        y: parseInt(c.y * yscale, 10),
-        x2: parseInt(c.x2 * xscale, 10),
-        y2: parseInt(c.y2 * yscale, 10),
-        w: parseInt(c.w * xscale, 10),
-        h: parseInt(c.h * yscale, 10)
-      };
-    }
-    //}}}
-    function doneSelect(pos) //{{{
-    {
-      var c = Coords.getFixed();
-      if ((c.w > options.minSelect[0]) && (c.h > options.minSelect[1])) {
-        Selection.enableHandles();
-        Selection.done();
-      } else {
-        Selection.release();
-      }
-      Tracker.setCursor(options.allowSelect ? 'crosshair' : 'default');
-    }
-    //}}}
-    function newSelection(e) //{{{
-    {
-      if (options.disabled) {
-        return false;
-      }
-      if (!options.allowSelect) {
-        return false;
-      }
-      btndown = true;
-      docOffset = getPos($img);
-      Selection.disableHandles();
-      Tracker.setCursor('crosshair');
-      var pos = mouseAbs(e);
-      Coords.setPressed(pos);
-      Selection.update();
-      Tracker.activateHandlers(selectDrag, doneSelect);
-      KeyManager.watchKeys();
-
-      e.stopPropagation();
-      e.preventDefault();
-      return false;
-    }
-    //}}}
-    function selectDrag(pos) //{{{
-    {
-      Coords.setCurrent(pos);
-      Selection.update();
-    }
-    //}}}
-    function newTracker() //{{{
-    {
-      var trk = $('<div></div>').addClass(cssClass('tracker'));
-      if ($.browser.msie) {
-        trk.css({
-          opacity: 0,
-          backgroundColor: 'white'
-        });
-      }
-      return trk;
-    }
-    //}}}
-
-    // }}}
-    // Initialization {{{
-    // Sanitize some options {{{
-    if ($.browser.msie && ($.browser.version.split('.')[0] === '6')) {
-      ie6mode = true;
-    }
-    if (typeof(obj) !== 'object') {
-      obj = $(obj)[0];
-    }
-    if (typeof(opt) !== 'object') {
-      opt = {};
-    }
-    // }}}
-    setOptions(opt);
-    // Initialize some jQuery objects {{{
-    // The values are SET on the image(s) for the interface
-    // If the original image has any of these set, they will be reset
-    // However, if you destroy() the Jcrop instance the original image's
-    // character in the DOM will be as you left it.
-    var img_css = {
-      border: 'none',
-      visibility: 'visible',
-      margin: 0,
-      padding: 0,
-      position: 'absolute',
-      top: 0,
-      left: 0
-    };
-
-    var $origimg = $(obj),
-      img_mode = true;
-
-    if (obj.tagName == 'IMG') {
-      // Fix size of crop image.
-      // Necessary when crop image is within a hidden element when page is loaded.
-      if ($origimg[0].width != 0 && $origimg[0].height != 0) {
-        // Obtain dimensions from contained img element.
-        $origimg.width($origimg[0].width);
-        $origimg.height($origimg[0].height);
-      } else {
-        // Obtain dimensions from temporary image in case the original is not loaded yet (e.g. IE 7.0). 
-        var tempImage = new Image();
-        tempImage.src = $origimg[0].src;
-        $origimg.width(tempImage.width);
-        $origimg.height(tempImage.height);
-      } 
-
-      var $img = $origimg.clone().removeAttr('id').css(img_css).show();
-
-      $img.width($origimg.width());
-      $img.height($origimg.height());
-      $origimg.after($img).hide();
-
-    } else {
-      $img = $origimg.css(img_css).show();
-      img_mode = false;
-      if (options.shade === null) { options.shade = true; }
-    }
-
-    presize($img, options.boxWidth, options.boxHeight);
-
-    var boundx = $img.width(),
-        boundy = $img.height(),
-        
-        
-        $div = $('<div />').width(boundx).height(boundy).addClass(cssClass('holder')).css({
-        position: 'relative',
-        backgroundColor: options.bgColor
-      }).insertAfter($origimg).append($img);
-
-    if (options.addClass) {
-      $div.addClass(options.addClass);
-    }
-
-    var $img2 = $('<div />'),
-
-        $img_holder = $('<div />') 
-        .width('100%').height('100%').css({
-          zIndex: 310,
-          position: 'absolute',
-          overflow: 'hidden'
-        }),
-
-        $hdl_holder = $('<div />') 
-        .width('100%').height('100%').css('zIndex', 320), 
-
-        $sel = $('<div />') 
-        .css({
-          position: 'absolute',
-          zIndex: 600
-        }).dblclick(function(){
-          var c = Coords.getFixed();
-          options.onDblClick.call(api,c);
-        }).insertBefore($img).append($img_holder, $hdl_holder); 
-
-    if (img_mode) {
-
-      $img2 = $('<img />')
-          .attr('src', $img.attr('src')).css(img_css).width(boundx).height(boundy),
-
-      $img_holder.append($img2);
-
-    }
-
-    if (ie6mode) {
-      $sel.css({
-        overflowY: 'hidden'
-      });
-    }
-
-    var bound = options.boundary;
-    var $trk = newTracker().width(boundx + (bound * 2)).height(boundy + (bound * 2)).css({
-      position: 'absolute',
-      top: px(-bound),
-      left: px(-bound),
-      zIndex: 290
-    }).mousedown(newSelection);
-
-    /* }}} */
-    // Set more variables {{{
-    var bgcolor = options.bgColor,
-        bgopacity = options.bgOpacity,
-        xlimit, ylimit, xmin, ymin, xscale, yscale, enabled = true,
-        btndown, animating, shift_down;
-
-    docOffset = getPos($img);
-    // }}}
-    // }}}
-    // Internal Modules {{{
-    // Touch Module {{{ 
-    var Touch = (function () {
-      // Touch support detection function adapted (under MIT License)
-      // from code by Jeffrey Sambells - http://github.com/iamamused/
-      function hasTouchSupport() {
-        var support = {},
-            events = ['touchstart', 'touchmove', 'touchend'],
-            el = document.createElement('div'), i;
-
-        try {
-          for(i=0; i<events.length; i++) {
-            var eventName = events[i];
-            eventName = 'on' + eventName;
-            var isSupported = (eventName in el);
-            if (!isSupported) {
-              el.setAttribute(eventName, 'return;');
-              isSupported = typeof el[eventName] == 'function';
-            }
-            support[events[i]] = isSupported;
-          }
-          return support.touchstart && support.touchend && support.touchmove;
-        }
-        catch(err) {
-          return false;
-        }
-      }
-
-      function detectSupport() {
-        if ((options.touchSupport === true) || (options.touchSupport === false)) return options.touchSupport;
-          else return hasTouchSupport();
-      }
-      return {
-        createDragger: function (ord) {
-          return function (e) {
-            e.pageX = e.originalEvent.changedTouches[0].pageX;
-            e.pageY = e.originalEvent.changedTouches[0].pageY;
-            if (options.disabled) {
-              return false;
-            }
-            if ((ord === 'move') && !options.allowMove) {
-              return false;
-            }
-            btndown = true;
-            startDragMode(ord, mouseAbs(e));
-            e.stopPropagation();
-            e.preventDefault();
-            return false;
-          };
-        },
-        newSelection: function (e) {
-          e.pageX = e.originalEvent.changedTouches[0].pageX;
-          e.pageY = e.originalEvent.changedTouches[0].pageY;
-          return newSelection(e);
-        },
-        isSupported: hasTouchSupport,
-        support: detectSupport()
-      };
-    }());
-    // }}}
-    // Coords Module {{{
-    var Coords = (function () {
-      var x1 = 0,
-          y1 = 0,
-          x2 = 0,
-          y2 = 0,
-          ox, oy;
-
-      function setPressed(pos) //{{{
-      {
-        pos = rebound(pos);
-        x2 = x1 = pos[0];
-        y2 = y1 = pos[1];
-      }
-      //}}}
-      function setCurrent(pos) //{{{
-      {
-        pos = rebound(pos);
-        ox = pos[0] - x2;
-        oy = pos[1] - y2;
-        x2 = pos[0];
-        y2 = pos[1];
-      }
-      //}}}
-      function getOffset() //{{{
-      {
-        return [ox, oy];
-      }
-      //}}}
-      function moveOffset(offset) //{{{
-      {
-        var ox = offset[0],
-            oy = offset[1];
-
-        if (0 > x1 + ox) {
-          ox -= ox + x1;
-        }
-        if (0 > y1 + oy) {
-          oy -= oy + y1;
-        }
-
-        if (boundy < y2 + oy) {
-          oy += boundy - (y2 + oy);
-        }
-        if (boundx < x2 + ox) {
-          ox += boundx - (x2 + ox);
-        }
-
-        x1 += ox;
-        x2 += ox;
-        y1 += oy;
-        y2 += oy;
-      }
-      //}}}
-      function getCorner(ord) //{{{
-      {
-        var c = getFixed();
-        switch (ord) {
-        case 'ne':
-          return [c.x2, c.y];
-        case 'nw':
-          return [c.x, c.y];
-        case 'se':
-          return [c.x2, c.y2];
-        case 'sw':
-          return [c.x, c.y2];
-        }
-      }
-      //}}}
-      function getFixed() //{{{
-      {
-        if (!options.aspectRatio) {
-          return getRect();
-        }
-        // This function could use some optimization I think...
-        var aspect = options.aspectRatio,
-            min_x = options.minSize[0] / xscale,
-            
-            
-            //min_y = options.minSize[1]/yscale,
-            max_x = options.maxSize[0] / xscale,
-            max_y = options.maxSize[1] / yscale,
-            rw = x2 - x1,
-            rh = y2 - y1,
-            rwa = Math.abs(rw),
-            rha = Math.abs(rh),
-            real_ratio = rwa / rha,
-            xx, yy, w, h;
-
-        if (max_x === 0) {
-          max_x = boundx * 10;
-        }
-        if (max_y === 0) {
-          max_y = boundy * 10;
-        }
-        if (real_ratio < aspect) {
-          yy = y2;
-          w = rha * aspect;
-          xx = rw < 0 ? x1 - w : w + x1;
-
-          if (xx < 0) {
-            xx = 0;
-            h = Math.abs((xx - x1) / aspect);
-            yy = rh < 0 ? y1 - h : h + y1;
-          } else if (xx > boundx) {
-            xx = boundx;
-            h = Math.abs((xx - x1) / aspect);
-            yy = rh < 0 ? y1 - h : h + y1;
-          }
-        } else {
-          xx = x2;
-          h = rwa / aspect;
-          yy = rh < 0 ? y1 - h : y1 + h;
-          if (yy < 0) {
-            yy = 0;
-            w = Math.abs((yy - y1) * aspect);
-            xx = rw < 0 ? x1 - w : w + x1;
-          } else if (yy > boundy) {
-            yy = boundy;
-            w = Math.abs(yy - y1) * aspect;
-            xx = rw < 0 ? x1 - w : w + x1;
-          }
-        }
-
-        // Magic %-)
-        if (xx > x1) { // right side
-          if (xx - x1 < min_x) {
-            xx = x1 + min_x;
-          } else if (xx - x1 > max_x) {
-            xx = x1 + max_x;
-          }
-          if (yy > y1) {
-            yy = y1 + (xx - x1) / aspect;
-          } else {
-            yy = y1 - (xx - x1) / aspect;
-          }
-        } else if (xx < x1) { // left side
-          if (x1 - xx < min_x) {
-            xx = x1 - min_x;
-          } else if (x1 - xx > max_x) {
-            xx = x1 - max_x;
-          }
-          if (yy > y1) {
-            yy = y1 + (x1 - xx) / aspect;
-          } else {
-            yy = y1 - (x1 - xx) / aspect;
-          }
-        }
-
-        if (xx < 0) {
-          x1 -= xx;
-          xx = 0;
-        } else if (xx > boundx) {
-          x1 -= xx - boundx;
-          xx = boundx;
-        }
-
-        if (yy < 0) {
-          y1 -= yy;
-          yy = 0;
-        } else if (yy > boundy) {
-          y1 -= yy - boundy;
-          yy = boundy;
-        }
-
-        return makeObj(flipCoords(x1, y1, xx, yy));
-      }
-      //}}}
-      function rebound(p) //{{{
-      {
-        if (p[0] < 0) {
-          p[0] = 0;
-        }
-        if (p[1] < 0) {
-          p[1] = 0;
-        }
-
-        if (p[0] > boundx) {
-          p[0] = boundx;
-        }
-        if (p[1] > boundy) {
-          p[1] = boundy;
-        }
-
-        return [p[0], p[1]];
-      }
-      //}}}
-      function flipCoords(x1, y1, x2, y2) //{{{
-      {
-        var xa = x1,
-            xb = x2,
-            ya = y1,
-            yb = y2;
-        if (x2 < x1) {
-          xa = x2;
-          xb = x1;
-        }
-        if (y2 < y1) {
-          ya = y2;
-          yb = y1;
-        }
-        return [Math.round(xa), Math.round(ya), Math.round(xb), Math.round(yb)];
-      }
-      //}}}
-      function getRect() //{{{
-      {
-        var xsize = x2 - x1,
-            ysize = y2 - y1,
-            delta;
-
-        if (xlimit && (Math.abs(xsize) > xlimit)) {
-          x2 = (xsize > 0) ? (x1 + xlimit) : (x1 - xlimit);
-        }
-        if (ylimit && (Math.abs(ysize) > ylimit)) {
-          y2 = (ysize > 0) ? (y1 + ylimit) : (y1 - ylimit);
-        }
-
-        if (ymin / yscale && (Math.abs(ysize) < ymin / yscale)) {
-          y2 = (ysize > 0) ? (y1 + ymin / yscale) : (y1 - ymin / yscale);
-        }
-        if (xmin / xscale && (Math.abs(xsize) < xmin / xscale)) {
-          x2 = (xsize > 0) ? (x1 + xmin / xscale) : (x1 - xmin / xscale);
-        }
-
-        if (x1 < 0) {
-          x2 -= x1;
-          x1 -= x1;
-        }
-        if (y1 < 0) {
-          y2 -= y1;
-          y1 -= y1;
-        }
-        if (x2 < 0) {
-          x1 -= x2;
-          x2 -= x2;
-        }
-        if (y2 < 0) {
-          y1 -= y2;
-          y2 -= y2;
-        }
-        if (x2 > boundx) {
-          delta = x2 - boundx;
-          x1 -= delta;
-          x2 -= delta;
-        }
-        if (y2 > boundy) {
-          delta = y2 - boundy;
-          y1 -= delta;
-          y2 -= delta;
-        }
-        if (x1 > boundx) {
-          delta = x1 - boundy;
-          y2 -= delta;
-          y1 -= delta;
-        }
-        if (y1 > boundy) {
-          delta = y1 - boundy;
-          y2 -= delta;
-          y1 -= delta;
-        }
-
-        return makeObj(flipCoords(x1, y1, x2, y2));
-      }
-      //}}}
-      function makeObj(a) //{{{
-      {
-        return {
-          x: a[0],
-          y: a[1],
-          x2: a[2],
-          y2: a[3],
-          w: a[2] - a[0],
-          h: a[3] - a[1]
-        };
-      }
-      //}}}
-
-      return {
-        flipCoords: flipCoords,
-        setPressed: setPressed,
-        setCurrent: setCurrent,
-        getOffset: getOffset,
-        moveOffset: moveOffset,
-        getCorner: getCorner,
-        getFixed: getFixed
-      };
-    }());
-
-    //}}}
-    // Shade Module {{{
-    var Shade = (function() {
-      var enabled = false,
-          holder = $('<div />').css({
-            position: 'absolute',
-            zIndex: 240,
-            opacity: 0
-          }),
-          shades = {
-            top: createShade(),
-            left: createShade().height(boundy),
-            right: createShade().height(boundy),
-            bottom: createShade()
-          };
-
-      function resizeShades(w,h) {
-        shades.left.css({ height: px(h) });
-        shades.right.css({ height: px(h) });
-      }
-      function updateAuto()
-      {
-        return updateShade(Coords.getFixed());
-      }
-      function updateShade(c)
-      {
-        shades.top.css({
-          left: px(c.x),
-          width: px(c.w),
-          height: px(c.y)
-        });
-        shades.bottom.css({
-          top: px(c.y2),
-          left: px(c.x),
-          width: px(c.w),
-          height: px(boundy-c.y2)
-        });
-        shades.right.css({
-          left: px(c.x2),
-          width: px(boundx-c.x2)
-        });
-        shades.left.css({
-          width: px(c.x)
-        });
-      }
-      function createShade() {
-        return $('<div />').css({
-          position: 'absolute',
-          backgroundColor: options.shadeColor||options.bgColor
-        }).appendTo(holder);
-      }
-      function enableShade() {
-        if (!enabled) {
-          enabled = true;
-          holder.insertBefore($img);
-          updateAuto();
-          Selection.setBgOpacity(1,0,1);
-          $img2.hide();
-
-          setBgColor(options.shadeColor||options.bgColor,1);
-          if (Selection.isAwake())
-          {
-            setOpacity(options.bgOpacity,1);
-          }
-            else setOpacity(1,1);
-        }
-      }
-      function setBgColor(color,now) {
-        colorChangeMacro(getShades(),color,now);
-      }
-      function disableShade() {
-        if (enabled) {
-          holder.remove();
-          $img2.show();
-          enabled = false;
-          if (Selection.isAwake()) {
-            Selection.setBgOpacity(options.bgOpacity,1,1);
-          } else {
-            Selection.setBgOpacity(1,1,1);
-            Selection.disableHandles();
-          }
-          colorChangeMacro($div,0,1);
-        }
-      }
-      function setOpacity(opacity,now) {
-        if (enabled) {
-          if (options.bgFade && !now) {
-            holder.animate({
-              opacity: 1-opacity
-            },{
-              queue: false,
-              duration: options.fadeTime
-            });
-          }
-          else holder.css({opacity:1-opacity});
-        }
-      }
-      function refreshAll() {
-        options.shade ? enableShade() : disableShade();
-        if (Selection.isAwake()) setOpacity(options.bgOpacity);
-      }
-      function getShades() {
-        return holder.children();
-      }
-
-      return {
-        update: updateAuto,
-        updateRaw: updateShade,
-        getShades: getShades,
-        setBgColor: setBgColor,
-        enable: enableShade,
-        disable: disableShade,
-        resize: resizeShades,
-        refresh: refreshAll,
-        opacity: setOpacity
-      };
-    }());
-    // }}}
-    // Selection Module {{{
-    var Selection = (function () {
-      var awake, hdep = 370;
-      var borders = {};
-      var handle = {};
-      var seehandles = false;
-      var hhs = options.handleOffset;
-
-      // Private Methods
-      function insertBorder(type) //{{{
-      {
-        var jq = $('<div />').css({
-          position: 'absolute',
-          opacity: options.borderOpacity
-        }).addClass(cssClass(type));
-        $img_holder.append(jq);
-        return jq;
-      }
-      //}}}
-      function dragDiv(ord, zi) //{{{
-      {
-        var jq = $('<div />').mousedown(createDragger(ord)).css({
-          cursor: ord + '-resize',
-          position: 'absolute',
-          zIndex: zi
-        }).addClass('ord-'+ord);
-
-        if (Touch.support) {
-          jq.bind('touchstart.jcrop', Touch.createDragger(ord));
-        }
-
-        $hdl_holder.append(jq);
-        return jq;
-      }
-      //}}}
-      function insertHandle(ord) //{{{
-      {
-        var hs = options.handleSize;
-        return dragDiv(ord, hdep++).css({
-          top: px(-hhs + 1),
-          left: px(-hhs + 1),
-          opacity: options.handleOpacity
-        }).width(hs).height(hs).addClass(cssClass('handle'));
-      }
-      //}}}
-      function insertDragbar(ord) //{{{
-      {
-        var s = options.handleSize,
-            h = s,
-            w = s,
-            t = hhs,
-            l = hhs;
-
-        switch (ord) {
-        case 'n':
-        case 's':
-          w = '100%';
-          break;
-        case 'e':
-        case 'w':
-          h = '100%';
-          break;
-        }
-
-        return dragDiv(ord, hdep++).width(w).height(h).css({
-          top: px(-t + 1),
-          left: px(-l + 1)
-        });
-      }
-      //}}}
-      function createHandles(li) //{{{
-      {
-        var i;
-        for (i = 0; i < li.length; i++) {
-          handle[li[i]] = insertHandle(li[i]);
-        }
-      }
-      //}}}
-      function moveHandles(c) //{{{
-      {
-        var midvert = Math.round((c.h / 2) - hhs),
-            midhoriz = Math.round((c.w / 2) - hhs),
-            north = -hhs + 1,
-            west = -hhs + 1,
-            east = c.w - hhs,
-            south = c.h - hhs,
-            x, y;
-
-        if (handle.e) {
-          handle.e.css({
-            top: px(midvert),
-            left: px(east)
-          });
-          handle.w.css({
-            top: px(midvert)
-          });
-          handle.s.css({
-            top: px(south),
-            left: px(midhoriz)
-          });
-          handle.n.css({
-            left: px(midhoriz)
-          });
-        }
-        if (handle.ne) {
-          handle.ne.css({
-            left: px(east)
-          });
-          handle.se.css({
-            top: px(south),
-            left: px(east)
-          });
-          handle.sw.css({
-            top: px(south)
-          });
-        }
-        if (handle.b) {
-          handle.b.css({
-            top: px(south)
-          });
-          handle.r.css({
-            left: px(east)
-          });
-        }
-      }
-      //}}}
-      function moveto(x, y) //{{{
-      {
-        if (!options.shade) {
-          $img2.css({
-            top: px(-y),
-            left: px(-x)
-          });
-        }
-        $sel.css({
-          top: px(y),
-          left: px(x)
-        });
-      }
-      //}}}
-      function resize(w, h) //{{{
-      {
-        $sel.width(w).height(h);
-      }
-      //}}}
-      function refresh() //{{{
-      {
-        var c = Coords.getFixed();
-
-        Coords.setPressed([c.x, c.y]);
-        Coords.setCurrent([c.x2, c.y2]);
-
-        updateVisible();
-      }
-      //}}}
-
-      // Internal Methods
-      function updateVisible(select) //{{{
-      {
-        if (awake) {
-          return update(select);
-        }
-      }
-      //}}}
-      function update(select) //{{{
-      {
-        var c = Coords.getFixed();
-
-        resize(c.w, c.h);
-        moveto(c.x, c.y);
-        if (options.shade) Shade.updateRaw(c);
-
-        if (seehandles) {
-          moveHandles(c);
-        }
-        if (!awake) {
-          show();
-        }
-
-        if (select) {
-          options.onSelect.call(api, unscale(c));
-        } else {
-          options.onChange.call(api, unscale(c));
-        }
-      }
-      //}}}
-      function setBgOpacity(opacity,force,now)
-      {
-        if (!awake && !force) return;
-        if (options.bgFade && !now) {
-          $img.animate({
-            opacity: opacity
-          },{
-            queue: false,
-            duration: options.fadeTime
-          });
-        } else {
-          $img.css('opacity', opacity);
-        }
-      }
-      function show() //{{{
-      {
-        $sel.show();
-
-        if (options.shade) Shade.opacity(bgopacity);
-          else setBgOpacity(bgopacity,true);
-
-        awake = true;
-      }
-      //}}}
-      function release() //{{{
-      {
-        disableHandles();
-        $sel.hide();
-
-        if (options.shade) Shade.opacity(1);
-          else setBgOpacity(1);
-
-        awake = false;
-        options.onRelease.call(api);
-      }
-      //}}}
-      function showHandles() //{{{
-      {
-        if (seehandles) {
-          moveHandles(Coords.getFixed());
-          $hdl_holder.show();
-        }
-      }
-      //}}}
-      function enableHandles() //{{{
-      {
-        seehandles = true;
-        if (options.allowResize) {
-          moveHandles(Coords.getFixed());
-          $hdl_holder.show();
-          return true;
-        }
-      }
-      //}}}
-      function disableHandles() //{{{
-      {
-        seehandles = false;
-        $hdl_holder.hide();
-      } 
-      //}}}
-      function animMode(v) //{{{
-      {
-        if (animating === v) {
-          disableHandles();
-        } else {
-          enableHandles();
-        }
-      } 
-      //}}}
-      function done() //{{{
-      {
-        animMode(false);
-        refresh();
-      } 
-      //}}}
-      /* Insert draggable elements {{{*/
-
-      // Insert border divs for outline
-      if (options.drawBorders) {
-        borders = {
-          top: insertBorder('hline'),
-          bottom: insertBorder('hline bottom'),
-          left: insertBorder('vline'),
-          right: insertBorder('vline right')
-        };
-      }
-
-      // Insert handles on edges
-      if (options.dragEdges) {
-        handle.t = insertDragbar('n');
-        handle.b = insertDragbar('s');
-        handle.r = insertDragbar('e');
-        handle.l = insertDragbar('w');
-      }
-
-      // Insert side and corner handles
-      if (options.sideHandles) {
-        createHandles(['n', 's', 'e', 'w']);
-      }
-      if (options.cornerHandles) {
-        createHandles(['sw', 'nw', 'ne', 'se']);
-      }
-      //}}}
-
-      // This is a hack for iOS5 to support drag/move touch functionality
-      $(document).bind('touchstart.jcrop-ios',function(e) {
-        if ($(e.currentTarget).hasClass('jcrop-tracker')) e.stopPropagation();
-      });
-
-      var $track = newTracker().mousedown(createDragger('move')).css({
-        cursor: 'move',
-        position: 'absolute',
-        zIndex: 360
-      });
-
-      if (Touch.support) {
-        $track.bind('touchstart.jcrop', Touch.createDragger('move'));
-      }
-
-      $img_holder.append($track);
-      disableHandles();
-
-      return {
-        updateVisible: updateVisible,
-        update: update,
-        release: release,
-        refresh: refresh,
-        isAwake: function () {
-          return awake;
-        },
-        setCursor: function (cursor) {
-          $track.css('cursor', cursor);
-        },
-        enableHandles: enableHandles,
-        enableOnly: function () {
-          seehandles = true;
-        },
-        showHandles: showHandles,
-        disableHandles: disableHandles,
-        animMode: animMode,
-        setBgOpacity: setBgOpacity,
-        done: done
-      };
-    }());
-    
-    //}}}
-    // Tracker Module {{{
-    var Tracker = (function () {
-      var onMove = function () {},
-          onDone = function () {},
-          trackDoc = options.trackDocument;
-
-      function toFront() //{{{
-      {
-        $trk.css({
-          zIndex: 450
-        });
-        if (Touch.support) {
-          $(document)
-            .bind('touchmove.jcrop', trackTouchMove)
-            .bind('touchend.jcrop', trackTouchEnd);
-        }
-        if (trackDoc) {
-          $(document)
-            .bind('mousemove.jcrop',trackMove)
-            .bind('mouseup.jcrop',trackUp);
-        }
-      } 
-      //}}}
-      function toBack() //{{{
-      {
-        $trk.css({
-          zIndex: 290
-        });
-        $(document).unbind('.jcrop');
-      } 
-      //}}}
-      function trackMove(e) //{{{
-      {
-        onMove(mouseAbs(e));
-        return false;
-      } 
-      //}}}
-      function trackUp(e) //{{{
-      {
-        e.preventDefault();
-        e.stopPropagation();
-
-        if (btndown) {
-          btndown = false;
-
-          onDone(mouseAbs(e));
-
-          if (Selection.isAwake()) {
-            options.onSelect.call(api, unscale(Coords.getFixed()));
-          }
-
-          toBack();
-          onMove = function () {};
-          onDone = function () {};
-        }
-
-        return false;
-      }
-      //}}}
-      function activateHandlers(move, done) //{{{
-      {
-        btndown = true;
-        onMove = move;
-        onDone = done;
-        toFront();
-        return false;
-      }
-      //}}}
-      function trackTouchMove(e) //{{{
-      {
-        e.pageX = e.originalEvent.changedTouches[0].pageX;
-        e.pageY = e.originalEvent.changedTouches[0].pageY;
-        return trackMove(e);
-      }
-      //}}}
-      function trackTouchEnd(e) //{{{
-      {
-        e.pageX = e.originalEvent.changedTouches[0].pageX;
-        e.pageY = e.originalEvent.changedTouches[0].pageY;
-        return trackUp(e);
-      }
-      //}}}
-      function setCursor(t) //{{{
-      {
-        $trk.css('cursor', t);
-      }
-      //}}}
-
-      if (!trackDoc) {
-        $trk.mousemove(trackMove).mouseup(trackUp).mouseout(trackUp);
-      }
-
-      $img.before($trk);
-      return {
-        activateHandlers: activateHandlers,
-        setCursor: setCursor
-      };
-    }());
-    //}}}
-    // KeyManager Module {{{
-    var KeyManager = (function () {
-      var $keymgr = $('<input type="radio" />').css({
-        position: 'fixed',
-        left: '-120px',
-        width: '12px'
-      }),
-          $keywrap = $('<div />').css({
-          position: 'absolute',
-          overflow: 'hidden'
-        }).append($keymgr);
-
-      function watchKeys() //{{{
-      {
-        if (options.keySupport) {
-          $keymgr.show();
-          $keymgr.focus();
-        }
-      }
-      //}}}
-      function onBlur(e) //{{{
-      {
-        $keymgr.hide();
-      }
-      //}}}
-      function doNudge(e, x, y) //{{{
-      {
-        if (options.allowMove) {
-          Coords.moveOffset([x, y]);
-          Selection.updateVisible(true);
-        }
-        e.preventDefault();
-        e.stopPropagation();
-      }
-      //}}}
-      function parseKey(e) //{{{
-      {
-        if (e.ctrlKey || e.metaKey) {
-          return true;
-        }
-        shift_down = e.shiftKey ? true : false;
-        var nudge = shift_down ? 10 : 1;
-
-        switch (e.keyCode) {
-        case 37:
-          doNudge(e, -nudge, 0);
-          break;
-        case 39:
-          doNudge(e, nudge, 0);
-          break;
-        case 38:
-          doNudge(e, 0, -nudge);
-          break;
-        case 40:
-          doNudge(e, 0, nudge);
-          break;
-        case 27:
-          if (options.allowSelect) Selection.release();
-          break;
-        case 9:
-          return true;
-        }
-
-        return false;
-      }
-      //}}}
-
-      if (options.keySupport) {
-        $keymgr.keydown(parseKey).blur(onBlur);
-        if (ie6mode || !options.fixedSupport) {
-          $keymgr.css({
-            position: 'absolute',
-            left: '-20px'
-          });
-          $keywrap.append($keymgr).insertBefore($img);
-        } else {
-          $keymgr.insertBefore($img);
-        }
-      }
-
-
-      return {
-        watchKeys: watchKeys
-      };
-    }());
-    //}}}
-    // }}}
-    // API methods {{{
-    function setClass(cname) //{{{
-    {
-      $div.removeClass().addClass(cssClass('holder')).addClass(cname);
-    }
-    //}}}
-    function animateTo(a, callback) //{{{
-    {
-      var x1 = parseInt(a[0], 10) / xscale,
-          y1 = parseInt(a[1], 10) / yscale,
-          x2 = parseInt(a[2], 10) / xscale,
-          y2 = parseInt(a[3], 10) / yscale;
-
-      if (animating) {
-        return;
-      }
-
-      var animto = Coords.flipCoords(x1, y1, x2, y2),
-          c = Coords.getFixed(),
-          initcr = [c.x, c.y, c.x2, c.y2],
-          animat = initcr,
-          interv = options.animationDelay,
-          ix1 = animto[0] - initcr[0],
-          iy1 = animto[1] - initcr[1],
-          ix2 = animto[2] - initcr[2],
-          iy2 = animto[3] - initcr[3],
-          pcent = 0,
-          velocity = options.swingSpeed;
-
-      x = animat[0];
-      y = animat[1];
-      x2 = animat[2];
-      y2 = animat[3];
-
-      Selection.animMode(true);
-      var anim_timer;
-
-      function queueAnimator() {
-        window.setTimeout(animator, interv);
-      }
-      var animator = (function () {
-        return function () {
-          pcent += (100 - pcent) / velocity;
-
-          animat[0] = x + ((pcent / 100) * ix1);
-          animat[1] = y + ((pcent / 100) * iy1);
-          animat[2] = x2 + ((pcent / 100) * ix2);
-          animat[3] = y2 + ((pcent / 100) * iy2);
-
-          if (pcent >= 99.8) {
-            pcent = 100;
-          }
-          if (pcent < 100) {
-            setSelectRaw(animat);
-            queueAnimator();
-          } else {
-            Selection.done();
-            if (typeof(callback) === 'function') {
-              callback.call(api);
-            }
-          }
-        };
-      }());
-      queueAnimator();
-    }
-    //}}}
-    function setSelect(rect) //{{{
-    {
-      setSelectRaw([parseInt(rect[0], 10) / xscale, parseInt(rect[1], 10) / yscale, parseInt(rect[2], 10) / xscale, parseInt(rect[3], 10) / yscale]);
-      options.onSelect.call(api, unscale(Coords.getFixed()));
-      Selection.enableHandles();
-    }
-    //}}}
-    function setSelectRaw(l) //{{{
-    {
-      Coords.setPressed([l[0], l[1]]);
-      Coords.setCurrent([l[2], l[3]]);
-      Selection.update();
-    }
-    //}}}
-    function tellSelect() //{{{
-    {
-      return unscale(Coords.getFixed());
-    }
-    //}}}
-    function tellScaled() //{{{
-    {
-      return Coords.getFixed();
-    }
-    //}}}
-    function setOptionsNew(opt) //{{{
-    {
-      setOptions(opt);
-      interfaceUpdate();
-    }
-    //}}}
-    function disableCrop() //{{{
-    {
-      options.disabled = true;
-      Selection.disableHandles();
-      Selection.setCursor('default');
-      Tracker.setCursor('default');
-    }
-    //}}}
-    function enableCrop() //{{{
-    {
-      options.disabled = false;
-      interfaceUpdate();
-    }
-    //}}}
-    function cancelCrop() //{{{
-    {
-      Selection.done();
-      Tracker.activateHandlers(null, null);
-    }
-    //}}}
-    function destroy() //{{{
-    {
-      $div.remove();
-      $origimg.show();
-      $(obj).removeData('Jcrop');
-    }
-    //}}}
-    function setImage(src, callback) //{{{
-    {
-      Selection.release();
-      disableCrop();
-      var img = new Image();
-      img.onload = function () {
-        var iw = img.width;
-        var ih = img.height;
-        var bw = options.boxWidth;
-        var bh = options.boxHeight;
-        $img.width(iw).height(ih);
-        $img.attr('src', src);
-        $img2.attr('src', src);
-        presize($img, bw, bh);
-        boundx = $img.width();
-        boundy = $img.height();
-        $img2.width(boundx).height(boundy);
-        $trk.width(boundx + (bound * 2)).height(boundy + (bound * 2));
-        $div.width(boundx).height(boundy);
-        Shade.resize(boundx,boundy);
-        enableCrop();
-
-        if (typeof(callback) === 'function') {
-          callback.call(api);
-        }
-      };
-      img.src = src;
-    }
-    //}}}
-    function colorChangeMacro($obj,color,now) {
-      var mycolor = color || options.bgColor;
-      if (options.bgFade && supportsColorFade() && options.fadeTime && !now) {
-        $obj.animate({
-          backgroundColor: mycolor
-        }, {
-          queue: false,
-          duration: options.fadeTime
-        });
-      } else {
-        $obj.css('backgroundColor', mycolor);
-      }
-    }
-    function interfaceUpdate(alt) //{{{
-    // This method tweaks the interface based on options object.
-    // Called when options are changed and at end of initialization.
-    {
-      if (options.allowResize) {
-        if (alt) {
-          Selection.enableOnly();
-        } else {
-          Selection.enableHandles();
-        }
-      } else {
-        Selection.disableHandles();
-      }
-
-      Tracker.setCursor(options.allowSelect ? 'crosshair' : 'default');
-      Selection.setCursor(options.allowMove ? 'move' : 'default');
-
-      if (options.hasOwnProperty('trueSize')) {
-        xscale = options.trueSize[0] / boundx;
-        yscale = options.trueSize[1] / boundy;
-      }
-
-      if (options.hasOwnProperty('setSelect')) {
-        setSelect(options.setSelect);
-        Selection.done();
-        delete(options.setSelect);
-      }
-
-      Shade.refresh();
-
-      if (options.bgColor != bgcolor) {
-        colorChangeMacro(
-          options.shade? Shade.getShades(): $div,
-          options.shade?
-            (options.shadeColor || options.bgColor):
-            options.bgColor
-        );
-        bgcolor = options.bgColor;
-      }
-
-      if (bgopacity != options.bgOpacity) {
-        bgopacity = options.bgOpacity;
-        if (options.shade) Shade.refresh();
-          else Selection.setBgOpacity(bgopacity);
-      }
-
-      xlimit = options.maxSize[0] || 0;
-      ylimit = options.maxSize[1] || 0;
-      xmin = options.minSize[0] || 0;
-      ymin = options.minSize[1] || 0;
-
-      if (options.hasOwnProperty('outerImage')) {
-        $img.attr('src', options.outerImage);
-        delete(options.outerImage);
-      }
-
-      Selection.refresh();
-    }
-    //}}}
-    //}}}
-
-    if (Touch.support) $trk.bind('touchstart.jcrop', Touch.newSelection);
-
-    $hdl_holder.hide();
-    interfaceUpdate(true);
-
-    var api = {
-      setImage: setImage,
-      animateTo: animateTo,
-      setSelect: setSelect,
-      setOptions: setOptionsNew,
-      tellSelect: tellSelect,
-      tellScaled: tellScaled,
-      setClass: setClass,
-
-      disable: disableCrop,
-      enable: enableCrop,
-      cancel: cancelCrop,
-      release: Selection.release,
-      destroy: destroy,
-
-      focus: KeyManager.watchKeys,
-
-      getBounds: function () {
-        return [boundx * xscale, boundy * yscale];
-      },
-      getWidgetSize: function () {
-        return [boundx, boundy];
-      },
-      getScaleFactor: function () {
-        return [xscale, yscale];
-      },
-
-      ui: {
-        holder: $div,
-        selection: $sel
-      }
-    };
-
-    if ($.browser.msie) {
-      $div.bind('selectstart', function () {
-        return false;
-      });
-    }
-
-    $origimg.data('Jcrop', api);
-    return api;
-  };
-  $.fn.Jcrop = function (options, callback) //{{{
-  {
-    var api;
-    // Iterate over each object, attach Jcrop
-    this.each(function () {
-      // If we've already attached to this object
-      if ($(this).data('Jcrop')) {
-        // The API can be requested this way (undocumented)
-        if (options === 'api') return $(this).data('Jcrop');
-        // Otherwise, we just reset the options...
-        else $(this).data('Jcrop').setOptions(options);
-      }
-      // If we haven't been attached, preload and attach
-      else {
-        if (this.tagName == 'IMG')
-          $.Jcrop.Loader(this,function(){
-            $(this).css({display:'block',visibility:'hidden'});
-            api = $.Jcrop(this, options);
-            if ($.isFunction(callback)) callback.call(api);
-          });
-        else {
-          $(this).css({display:'block',visibility:'hidden'});
-          api = $.Jcrop(this, options);
-          if ($.isFunction(callback)) callback.call(api);
-        }
-      }
-    });
-
-    // Return "this" so the object is chainable (jQuery-style)
-    return this;
-  };
-  //}}}
-  // $.Jcrop.Loader - basic image loader {{{
-
-  $.Jcrop.Loader = function(imgobj,success,error){
-    var $img = $(imgobj), img = $img[0];
-
-    function completeCheck(){
-      if (img.complete) {
-        $img.unbind('.jcloader');
-        if ($.isFunction(success)) success.call(img);
-      }
-      else window.setTimeout(completeCheck,50);
-    }
-
-    $img
-      .bind('load.jcloader',completeCheck)
-      .bind('error.jcloader',function(e){
-        $img.unbind('.jcloader');
-        if ($.isFunction(error)) error.call(img);
-      });
-
-    if (img.complete && $.isFunction(success)){
-      $img.unbind('.jcloader');
-      success.call(img);
-    }
-  };
-
-  //}}}
-  // Global Defaults {{{
-  $.Jcrop.defaults = {
-
-    // Basic Settings
-    allowSelect: true,
-    allowMove: true,
-    allowResize: true,
-
-    trackDocument: true,
-
-    // Styling Options
-    baseClass: 'jcrop',
-    addClass: null,
-    bgColor: 'black',
-    bgOpacity: 0.6,
-    bgFade: false,
-    borderOpacity: 0.4,
-    handleOpacity: 0.5,
-    handleSize: 7,
-    handleOffset: 5,
-
-    aspectRatio: 0,
-    keySupport: true,
-    cornerHandles: true,
-    sideHandles: true,
-    drawBorders: true,
-    dragEdges: true,
-    fixedSupport: true,
-    touchSupport: null,
-
-    shade: null,
-
-    boxWidth: 0,
-    boxHeight: 0,
-    boundary: 2,
-    fadeTime: 400,
-    animationDelay: 20,
-    swingSpeed: 3,
-
-    minSelect: [0, 0],
-    maxSize: [0, 0],
-    minSize: [0, 0],
-
-    // Callbacks / Event Handlers
-    onChange: function () {},
-    onSelect: function () {},
-    onDblClick: function () {},
-    onRelease: function () {}
-  };
-
-  // }}}
-}(jQuery));
diff --git a/apps/contacts/js/jquery.Jcrop.min.js b/apps/contacts/js/jquery.Jcrop.min.js
deleted file mode 100644
index 0c05d67c22..0000000000
--- a/apps/contacts/js/jquery.Jcrop.min.js
+++ /dev/null
@@ -1,255 +0,0 @@
-/**
- * jquery.Jcrop.min.js v0.9.9 {{{ (build:20120102)
- * jQuery Image Cropping Plugin - released under MIT License
- * Copyright (c) 2008-2012 Tapmodo Interactive LLC
- * https://github.com/tapmodo/Jcrop
- */
-
-(function($){$.Jcrop=function(obj,opt){var options=$.extend({},$.Jcrop.defaults),docOffset,lastcurs,ie6mode=false;function px(n){return parseInt(n,10)+'px';}
-function cssClass(cl){return options.baseClass+'-'+cl;}
-function supportsColorFade(){return $.fx.step.hasOwnProperty('backgroundColor');}
-function getPos(obj)
-{var pos=$(obj).offset();return[pos.left,pos.top];}
-function mouseAbs(e)
-{return[(e.pageX-docOffset[0]),(e.pageY-docOffset[1])];}
-function setOptions(opt)
-{if(typeof(opt)!=='object')opt={};options=$.extend(options,opt);$.each(['onChange','onSelect','onRelease','onDblClick'],function(i,e){if(typeof(options[e])!=='function')options[e]=function(){};});}
-function startDragMode(mode,pos)
-{docOffset=getPos($img);Tracker.setCursor(mode==='move'?mode:mode+'-resize');if(mode==='move'){return Tracker.activateHandlers(createMover(pos),doneSelect);}
-var fc=Coords.getFixed();var opp=oppLockCorner(mode);var opc=Coords.getCorner(oppLockCorner(opp));Coords.setPressed(Coords.getCorner(opp));Coords.setCurrent(opc);Tracker.activateHandlers(dragmodeHandler(mode,fc),doneSelect);}
-function dragmodeHandler(mode,f)
-{return function(pos){if(!options.aspectRatio){switch(mode){case'e':pos[1]=f.y2;break;case'w':pos[1]=f.y2;break;case'n':pos[0]=f.x2;break;case's':pos[0]=f.x2;break;}}else{switch(mode){case'e':pos[1]=f.y+1;break;case'w':pos[1]=f.y+1;break;case'n':pos[0]=f.x+1;break;case's':pos[0]=f.x+1;break;}}
-Coords.setCurrent(pos);Selection.update();};}
-function createMover(pos)
-{var lloc=pos;KeyManager.watchKeys();return function(pos){Coords.moveOffset([pos[0]-lloc[0],pos[1]-lloc[1]]);lloc=pos;Selection.update();};}
-function oppLockCorner(ord)
-{switch(ord){case'n':return'sw';case's':return'nw';case'e':return'nw';case'w':return'ne';case'ne':return'sw';case'nw':return'se';case'se':return'nw';case'sw':return'ne';}}
-function createDragger(ord)
-{return function(e){if(options.disabled){return false;}
-if((ord==='move')&&!options.allowMove){return false;}
-docOffset=getPos($img);btndown=true;startDragMode(ord,mouseAbs(e));e.stopPropagation();e.preventDefault();return false;};}
-function presize($obj,w,h)
-{var nw=$obj.width(),nh=$obj.height();if((nw>w)&&w>0){nw=w;nh=(w/$obj.width())*$obj.height();}
-if((nh>h)&&h>0){nh=h;nw=(h/$obj.height())*$obj.width();}
-xscale=$obj.width()/nw;yscale=$obj.height()/nh;$obj.width(nw).height(nh);}
-function unscale(c)
-{return{x:parseInt(c.x*xscale,10),y:parseInt(c.y*yscale,10),x2:parseInt(c.x2*xscale,10),y2:parseInt(c.y2*yscale,10),w:parseInt(c.w*xscale,10),h:parseInt(c.h*yscale,10)};}
-function doneSelect(pos)
-{var c=Coords.getFixed();if((c.w>options.minSelect[0])&&(c.h>options.minSelect[1])){Selection.enableHandles();Selection.done();}else{Selection.release();}
-Tracker.setCursor(options.allowSelect?'crosshair':'default');}
-function newSelection(e)
-{if(options.disabled){return false;}
-if(!options.allowSelect){return false;}
-btndown=true;docOffset=getPos($img);Selection.disableHandles();Tracker.setCursor('crosshair');var pos=mouseAbs(e);Coords.setPressed(pos);Selection.update();Tracker.activateHandlers(selectDrag,doneSelect);KeyManager.watchKeys();e.stopPropagation();e.preventDefault();return false;}
-function selectDrag(pos)
-{Coords.setCurrent(pos);Selection.update();}
-function newTracker()
-{var trk=$('<div></div>').addClass(cssClass('tracker'));if($.browser.msie){trk.css({opacity:0,backgroundColor:'white'});}
-return trk;}
-if($.browser.msie&&($.browser.version.split('.')[0]==='6')){ie6mode=true;}
-if(typeof(obj)!=='object'){obj=$(obj)[0];}
-if(typeof(opt)!=='object'){opt={};}
-setOptions(opt);var img_css={border:'none',visibility:'visible',margin:0,padding:0,position:'absolute',top:0,left:0};var $origimg=$(obj),img_mode=true;if(obj.tagName=='IMG'){if($origimg[0].width!=0&&$origimg[0].height!=0){$origimg.width($origimg[0].width);$origimg.height($origimg[0].height);}else{var tempImage=new Image();tempImage.src=$origimg[0].src;$origimg.width(tempImage.width);$origimg.height(tempImage.height);}
-var $img=$origimg.clone().removeAttr('id').css(img_css).show();$img.width($origimg.width());$img.height($origimg.height());$origimg.after($img).hide();}else{$img=$origimg.css(img_css).show();img_mode=false;if(options.shade===null){options.shade=true;}}
-presize($img,options.boxWidth,options.boxHeight);var boundx=$img.width(),boundy=$img.height(),$div=$('<div />').width(boundx).height(boundy).addClass(cssClass('holder')).css({position:'relative',backgroundColor:options.bgColor}).insertAfter($origimg).append($img);if(options.addClass){$div.addClass(options.addClass);}
-var $img2=$('<div />'),$img_holder=$('<div />').width('100%').height('100%').css({zIndex:310,position:'absolute',overflow:'hidden'}),$hdl_holder=$('<div />').width('100%').height('100%').css('zIndex',320),$sel=$('<div />').css({position:'absolute',zIndex:600}).dblclick(function(){var c=Coords.getFixed();options.onDblClick.call(api,c);}).insertBefore($img).append($img_holder,$hdl_holder);if(img_mode){$img2=$('<img />').attr('src',$img.attr('src')).css(img_css).width(boundx).height(boundy),$img_holder.append($img2);}
-if(ie6mode){$sel.css({overflowY:'hidden'});}
-var bound=options.boundary;var $trk=newTracker().width(boundx+(bound*2)).height(boundy+(bound*2)).css({position:'absolute',top:px(-bound),left:px(-bound),zIndex:290}).mousedown(newSelection);var bgcolor=options.bgColor,bgopacity=options.bgOpacity,xlimit,ylimit,xmin,ymin,xscale,yscale,enabled=true,btndown,animating,shift_down;docOffset=getPos($img);var Touch=(function(){function hasTouchSupport(){var support={},events=['touchstart','touchmove','touchend'],el=document.createElement('div'),i;try{for(i=0;i<events.length;i++){var eventName=events[i];eventName='on'+eventName;var isSupported=(eventName in el);if(!isSupported){el.setAttribute(eventName,'return;');isSupported=typeof el[eventName]=='function';}
-support[events[i]]=isSupported;}
-return support.touchstart&&support.touchend&&support.touchmove;}
-catch(err){return false;}}
-function detectSupport(){if((options.touchSupport===true)||(options.touchSupport===false))return options.touchSupport;else return hasTouchSupport();}
-return{createDragger:function(ord){return function(e){e.pageX=e.originalEvent.changedTouches[0].pageX;e.pageY=e.originalEvent.changedTouches[0].pageY;if(options.disabled){return false;}
-if((ord==='move')&&!options.allowMove){return false;}
-btndown=true;startDragMode(ord,mouseAbs(e));e.stopPropagation();e.preventDefault();return false;};},newSelection:function(e){e.pageX=e.originalEvent.changedTouches[0].pageX;e.pageY=e.originalEvent.changedTouches[0].pageY;return newSelection(e);},isSupported:hasTouchSupport,support:detectSupport()};}());var Coords=(function(){var x1=0,y1=0,x2=0,y2=0,ox,oy;function setPressed(pos)
-{pos=rebound(pos);x2=x1=pos[0];y2=y1=pos[1];}
-function setCurrent(pos)
-{pos=rebound(pos);ox=pos[0]-x2;oy=pos[1]-y2;x2=pos[0];y2=pos[1];}
-function getOffset()
-{return[ox,oy];}
-function moveOffset(offset)
-{var ox=offset[0],oy=offset[1];if(0>x1+ox){ox-=ox+x1;}
-if(0>y1+oy){oy-=oy+y1;}
-if(boundy<y2+oy){oy+=boundy-(y2+oy);}
-if(boundx<x2+ox){ox+=boundx-(x2+ox);}
-x1+=ox;x2+=ox;y1+=oy;y2+=oy;}
-function getCorner(ord)
-{var c=getFixed();switch(ord){case'ne':return[c.x2,c.y];case'nw':return[c.x,c.y];case'se':return[c.x2,c.y2];case'sw':return[c.x,c.y2];}}
-function getFixed()
-{if(!options.aspectRatio){return getRect();}
-var aspect=options.aspectRatio,min_x=options.minSize[0]/xscale,max_x=options.maxSize[0]/xscale,max_y=options.maxSize[1]/yscale,rw=x2-x1,rh=y2-y1,rwa=Math.abs(rw),rha=Math.abs(rh),real_ratio=rwa/rha,xx,yy,w,h;if(max_x===0){max_x=boundx*10;}
-if(max_y===0){max_y=boundy*10;}
-if(real_ratio<aspect){yy=y2;w=rha*aspect;xx=rw<0?x1-w:w+x1;if(xx<0){xx=0;h=Math.abs((xx-x1)/aspect);yy=rh<0?y1-h:h+y1;}else if(xx>boundx){xx=boundx;h=Math.abs((xx-x1)/aspect);yy=rh<0?y1-h:h+y1;}}else{xx=x2;h=rwa/aspect;yy=rh<0?y1-h:y1+h;if(yy<0){yy=0;w=Math.abs((yy-y1)*aspect);xx=rw<0?x1-w:w+x1;}else if(yy>boundy){yy=boundy;w=Math.abs(yy-y1)*aspect;xx=rw<0?x1-w:w+x1;}}
-if(xx>x1){if(xx-x1<min_x){xx=x1+min_x;}else if(xx-x1>max_x){xx=x1+max_x;}
-if(yy>y1){yy=y1+(xx-x1)/aspect;}else{yy=y1-(xx-x1)/aspect;}}else if(xx<x1){if(x1-xx<min_x){xx=x1-min_x;}else if(x1-xx>max_x){xx=x1-max_x;}
-if(yy>y1){yy=y1+(x1-xx)/aspect;}else{yy=y1-(x1-xx)/aspect;}}
-if(xx<0){x1-=xx;xx=0;}else if(xx>boundx){x1-=xx-boundx;xx=boundx;}
-if(yy<0){y1-=yy;yy=0;}else if(yy>boundy){y1-=yy-boundy;yy=boundy;}
-return makeObj(flipCoords(x1,y1,xx,yy));}
-function rebound(p)
-{if(p[0]<0){p[0]=0;}
-if(p[1]<0){p[1]=0;}
-if(p[0]>boundx){p[0]=boundx;}
-if(p[1]>boundy){p[1]=boundy;}
-return[p[0],p[1]];}
-function flipCoords(x1,y1,x2,y2)
-{var xa=x1,xb=x2,ya=y1,yb=y2;if(x2<x1){xa=x2;xb=x1;}
-if(y2<y1){ya=y2;yb=y1;}
-return[Math.round(xa),Math.round(ya),Math.round(xb),Math.round(yb)];}
-function getRect()
-{var xsize=x2-x1,ysize=y2-y1,delta;if(xlimit&&(Math.abs(xsize)>xlimit)){x2=(xsize>0)?(x1+xlimit):(x1-xlimit);}
-if(ylimit&&(Math.abs(ysize)>ylimit)){y2=(ysize>0)?(y1+ylimit):(y1-ylimit);}
-if(ymin/yscale&&(Math.abs(ysize)<ymin/yscale)){y2=(ysize>0)?(y1+ymin/yscale):(y1-ymin/yscale);}
-if(xmin/xscale&&(Math.abs(xsize)<xmin/xscale)){x2=(xsize>0)?(x1+xmin/xscale):(x1-xmin/xscale);}
-if(x1<0){x2-=x1;x1-=x1;}
-if(y1<0){y2-=y1;y1-=y1;}
-if(x2<0){x1-=x2;x2-=x2;}
-if(y2<0){y1-=y2;y2-=y2;}
-if(x2>boundx){delta=x2-boundx;x1-=delta;x2-=delta;}
-if(y2>boundy){delta=y2-boundy;y1-=delta;y2-=delta;}
-if(x1>boundx){delta=x1-boundy;y2-=delta;y1-=delta;}
-if(y1>boundy){delta=y1-boundy;y2-=delta;y1-=delta;}
-return makeObj(flipCoords(x1,y1,x2,y2));}
-function makeObj(a)
-{return{x:a[0],y:a[1],x2:a[2],y2:a[3],w:a[2]-a[0],h:a[3]-a[1]};}
-return{flipCoords:flipCoords,setPressed:setPressed,setCurrent:setCurrent,getOffset:getOffset,moveOffset:moveOffset,getCorner:getCorner,getFixed:getFixed};}());var Shade=(function(){var enabled=false,holder=$('<div />').css({position:'absolute',zIndex:240,opacity:0}),shades={top:createShade(),left:createShade().height(boundy),right:createShade().height(boundy),bottom:createShade()};function resizeShades(w,h){shades.left.css({height:px(h)});shades.right.css({height:px(h)});}
-function updateAuto()
-{return updateShade(Coords.getFixed());}
-function updateShade(c)
-{shades.top.css({left:px(c.x),width:px(c.w),height:px(c.y)});shades.bottom.css({top:px(c.y2),left:px(c.x),width:px(c.w),height:px(boundy-c.y2)});shades.right.css({left:px(c.x2),width:px(boundx-c.x2)});shades.left.css({width:px(c.x)});}
-function createShade(){return $('<div />').css({position:'absolute',backgroundColor:options.shadeColor||options.bgColor}).appendTo(holder);}
-function enableShade(){if(!enabled){enabled=true;holder.insertBefore($img);updateAuto();Selection.setBgOpacity(1,0,1);$img2.hide();setBgColor(options.shadeColor||options.bgColor,1);if(Selection.isAwake())
-{setOpacity(options.bgOpacity,1);}
-else setOpacity(1,1);}}
-function setBgColor(color,now){colorChangeMacro(getShades(),color,now);}
-function disableShade(){if(enabled){holder.remove();$img2.show();enabled=false;if(Selection.isAwake()){Selection.setBgOpacity(options.bgOpacity,1,1);}else{Selection.setBgOpacity(1,1,1);Selection.disableHandles();}
-colorChangeMacro($div,0,1);}}
-function setOpacity(opacity,now){if(enabled){if(options.bgFade&&!now){holder.animate({opacity:1-opacity},{queue:false,duration:options.fadeTime});}
-else holder.css({opacity:1-opacity});}}
-function refreshAll(){options.shade?enableShade():disableShade();if(Selection.isAwake())setOpacity(options.bgOpacity);}
-function getShades(){return holder.children();}
-return{update:updateAuto,updateRaw:updateShade,getShades:getShades,setBgColor:setBgColor,enable:enableShade,disable:disableShade,resize:resizeShades,refresh:refreshAll,opacity:setOpacity};}());var Selection=(function(){var awake,hdep=370;var borders={};var handle={};var seehandles=false;var hhs=options.handleOffset;function insertBorder(type)
-{var jq=$('<div />').css({position:'absolute',opacity:options.borderOpacity}).addClass(cssClass(type));$img_holder.append(jq);return jq;}
-function dragDiv(ord,zi)
-{var jq=$('<div />').mousedown(createDragger(ord)).css({cursor:ord+'-resize',position:'absolute',zIndex:zi}).addClass('ord-'+ord);if(Touch.support){jq.bind('touchstart.jcrop',Touch.createDragger(ord));}
-$hdl_holder.append(jq);return jq;}
-function insertHandle(ord)
-{var hs=options.handleSize;return dragDiv(ord,hdep++).css({top:px(-hhs+1),left:px(-hhs+1),opacity:options.handleOpacity}).width(hs).height(hs).addClass(cssClass('handle'));}
-function insertDragbar(ord)
-{var s=options.handleSize,h=s,w=s,t=hhs,l=hhs;switch(ord){case'n':case's':w='100%';break;case'e':case'w':h='100%';break;}
-return dragDiv(ord,hdep++).width(w).height(h).css({top:px(-t+1),left:px(-l+1)});}
-function createHandles(li)
-{var i;for(i=0;i<li.length;i++){handle[li[i]]=insertHandle(li[i]);}}
-function moveHandles(c)
-{var midvert=Math.round((c.h/2)-hhs),midhoriz=Math.round((c.w/2)-hhs),north=-hhs+1,west=-hhs+1,east=c.w-hhs,south=c.h-hhs,x,y;if(handle.e){handle.e.css({top:px(midvert),left:px(east)});handle.w.css({top:px(midvert)});handle.s.css({top:px(south),left:px(midhoriz)});handle.n.css({left:px(midhoriz)});}
-if(handle.ne){handle.ne.css({left:px(east)});handle.se.css({top:px(south),left:px(east)});handle.sw.css({top:px(south)});}
-if(handle.b){handle.b.css({top:px(south)});handle.r.css({left:px(east)});}}
-function moveto(x,y)
-{if(!options.shade){$img2.css({top:px(-y),left:px(-x)});}
-$sel.css({top:px(y),left:px(x)});}
-function resize(w,h)
-{$sel.width(w).height(h);}
-function refresh()
-{var c=Coords.getFixed();Coords.setPressed([c.x,c.y]);Coords.setCurrent([c.x2,c.y2]);updateVisible();}
-function updateVisible(select)
-{if(awake){return update(select);}}
-function update(select)
-{var c=Coords.getFixed();resize(c.w,c.h);moveto(c.x,c.y);if(options.shade)Shade.updateRaw(c);if(seehandles){moveHandles(c);}
-if(!awake){show();}
-if(select){options.onSelect.call(api,unscale(c));}else{options.onChange.call(api,unscale(c));}}
-function setBgOpacity(opacity,force,now)
-{if(!awake&&!force)return;if(options.bgFade&&!now){$img.animate({opacity:opacity},{queue:false,duration:options.fadeTime});}else{$img.css('opacity',opacity);}}
-function show()
-{$sel.show();if(options.shade)Shade.opacity(bgopacity);else setBgOpacity(bgopacity,true);awake=true;}
-function release()
-{disableHandles();$sel.hide();if(options.shade)Shade.opacity(1);else setBgOpacity(1);awake=false;options.onRelease.call(api);}
-function showHandles()
-{if(seehandles){moveHandles(Coords.getFixed());$hdl_holder.show();}}
-function enableHandles()
-{seehandles=true;if(options.allowResize){moveHandles(Coords.getFixed());$hdl_holder.show();return true;}}
-function disableHandles()
-{seehandles=false;$hdl_holder.hide();}
-function animMode(v)
-{if(animating===v){disableHandles();}else{enableHandles();}}
-function done()
-{animMode(false);refresh();}
-if(options.drawBorders){borders={top:insertBorder('hline'),bottom:insertBorder('hline bottom'),left:insertBorder('vline'),right:insertBorder('vline right')};}
-if(options.dragEdges){handle.t=insertDragbar('n');handle.b=insertDragbar('s');handle.r=insertDragbar('e');handle.l=insertDragbar('w');}
-if(options.sideHandles){createHandles(['n','s','e','w']);}
-if(options.cornerHandles){createHandles(['sw','nw','ne','se']);}
-$(document).bind('touchstart.jcrop-ios',function(e){if($(e.currentTarget).hasClass('jcrop-tracker'))e.stopPropagation();});var $track=newTracker().mousedown(createDragger('move')).css({cursor:'move',position:'absolute',zIndex:360});if(Touch.support){$track.bind('touchstart.jcrop',Touch.createDragger('move'));}
-$img_holder.append($track);disableHandles();return{updateVisible:updateVisible,update:update,release:release,refresh:refresh,isAwake:function(){return awake;},setCursor:function(cursor){$track.css('cursor',cursor);},enableHandles:enableHandles,enableOnly:function(){seehandles=true;},showHandles:showHandles,disableHandles:disableHandles,animMode:animMode,setBgOpacity:setBgOpacity,done:done};}());var Tracker=(function(){var onMove=function(){},onDone=function(){},trackDoc=options.trackDocument;function toFront()
-{$trk.css({zIndex:450});if(Touch.support){$(document).bind('touchmove.jcrop',trackTouchMove).bind('touchend.jcrop',trackTouchEnd);}
-if(trackDoc){$(document).bind('mousemove.jcrop',trackMove).bind('mouseup.jcrop',trackUp);}}
-function toBack()
-{$trk.css({zIndex:290});$(document).unbind('.jcrop');}
-function trackMove(e)
-{onMove(mouseAbs(e));return false;}
-function trackUp(e)
-{e.preventDefault();e.stopPropagation();if(btndown){btndown=false;onDone(mouseAbs(e));if(Selection.isAwake()){options.onSelect.call(api,unscale(Coords.getFixed()));}
-toBack();onMove=function(){};onDone=function(){};}
-return false;}
-function activateHandlers(move,done)
-{btndown=true;onMove=move;onDone=done;toFront();return false;}
-function trackTouchMove(e)
-{e.pageX=e.originalEvent.changedTouches[0].pageX;e.pageY=e.originalEvent.changedTouches[0].pageY;return trackMove(e);}
-function trackTouchEnd(e)
-{e.pageX=e.originalEvent.changedTouches[0].pageX;e.pageY=e.originalEvent.changedTouches[0].pageY;return trackUp(e);}
-function setCursor(t)
-{$trk.css('cursor',t);}
-if(!trackDoc){$trk.mousemove(trackMove).mouseup(trackUp).mouseout(trackUp);}
-$img.before($trk);return{activateHandlers:activateHandlers,setCursor:setCursor};}());var KeyManager=(function(){var $keymgr=$('<input type="radio" />').css({position:'fixed',left:'-120px',width:'12px'}),$keywrap=$('<div />').css({position:'absolute',overflow:'hidden'}).append($keymgr);function watchKeys()
-{if(options.keySupport){$keymgr.show();$keymgr.focus();}}
-function onBlur(e)
-{$keymgr.hide();}
-function doNudge(e,x,y)
-{if(options.allowMove){Coords.moveOffset([x,y]);Selection.updateVisible(true);}
-e.preventDefault();e.stopPropagation();}
-function parseKey(e)
-{if(e.ctrlKey||e.metaKey){return true;}
-shift_down=e.shiftKey?true:false;var nudge=shift_down?10:1;switch(e.keyCode){case 37:doNudge(e,-nudge,0);break;case 39:doNudge(e,nudge,0);break;case 38:doNudge(e,0,-nudge);break;case 40:doNudge(e,0,nudge);break;case 27:if(options.allowSelect)Selection.release();break;case 9:return true;}
-return false;}
-if(options.keySupport){$keymgr.keydown(parseKey).blur(onBlur);if(ie6mode||!options.fixedSupport){$keymgr.css({position:'absolute',left:'-20px'});$keywrap.append($keymgr).insertBefore($img);}else{$keymgr.insertBefore($img);}}
-return{watchKeys:watchKeys};}());function setClass(cname)
-{$div.removeClass().addClass(cssClass('holder')).addClass(cname);}
-function animateTo(a,callback)
-{var x1=parseInt(a[0],10)/xscale,y1=parseInt(a[1],10)/yscale,x2=parseInt(a[2],10)/xscale,y2=parseInt(a[3],10)/yscale;if(animating){return;}
-var animto=Coords.flipCoords(x1,y1,x2,y2),c=Coords.getFixed(),initcr=[c.x,c.y,c.x2,c.y2],animat=initcr,interv=options.animationDelay,ix1=animto[0]-initcr[0],iy1=animto[1]-initcr[1],ix2=animto[2]-initcr[2],iy2=animto[3]-initcr[3],pcent=0,velocity=options.swingSpeed;x=animat[0];y=animat[1];x2=animat[2];y2=animat[3];Selection.animMode(true);var anim_timer;function queueAnimator(){window.setTimeout(animator,interv);}
-var animator=(function(){return function(){pcent+=(100-pcent)/velocity;animat[0]=x+((pcent/100)*ix1);animat[1]=y+((pcent/100)*iy1);animat[2]=x2+((pcent/100)*ix2);animat[3]=y2+((pcent/100)*iy2);if(pcent>=99.8){pcent=100;}
-if(pcent<100){setSelectRaw(animat);queueAnimator();}else{Selection.done();if(typeof(callback)==='function'){callback.call(api);}}};}());queueAnimator();}
-function setSelect(rect)
-{setSelectRaw([parseInt(rect[0],10)/xscale,parseInt(rect[1],10)/yscale,parseInt(rect[2],10)/xscale,parseInt(rect[3],10)/yscale]);options.onSelect.call(api,unscale(Coords.getFixed()));Selection.enableHandles();}
-function setSelectRaw(l)
-{Coords.setPressed([l[0],l[1]]);Coords.setCurrent([l[2],l[3]]);Selection.update();}
-function tellSelect()
-{return unscale(Coords.getFixed());}
-function tellScaled()
-{return Coords.getFixed();}
-function setOptionsNew(opt)
-{setOptions(opt);interfaceUpdate();}
-function disableCrop()
-{options.disabled=true;Selection.disableHandles();Selection.setCursor('default');Tracker.setCursor('default');}
-function enableCrop()
-{options.disabled=false;interfaceUpdate();}
-function cancelCrop()
-{Selection.done();Tracker.activateHandlers(null,null);}
-function destroy()
-{$div.remove();$origimg.show();$(obj).removeData('Jcrop');}
-function setImage(src,callback)
-{Selection.release();disableCrop();var img=new Image();img.onload=function(){var iw=img.width;var ih=img.height;var bw=options.boxWidth;var bh=options.boxHeight;$img.width(iw).height(ih);$img.attr('src',src);$img2.attr('src',src);presize($img,bw,bh);boundx=$img.width();boundy=$img.height();$img2.width(boundx).height(boundy);$trk.width(boundx+(bound*2)).height(boundy+(bound*2));$div.width(boundx).height(boundy);Shade.resize(boundx,boundy);enableCrop();if(typeof(callback)==='function'){callback.call(api);}};img.src=src;}
-function colorChangeMacro($obj,color,now){var mycolor=color||options.bgColor;if(options.bgFade&&supportsColorFade()&&options.fadeTime&&!now){$obj.animate({backgroundColor:mycolor},{queue:false,duration:options.fadeTime});}else{$obj.css('backgroundColor',mycolor);}}
-function interfaceUpdate(alt)
-{if(options.allowResize){if(alt){Selection.enableOnly();}else{Selection.enableHandles();}}else{Selection.disableHandles();}
-Tracker.setCursor(options.allowSelect?'crosshair':'default');Selection.setCursor(options.allowMove?'move':'default');if(options.hasOwnProperty('trueSize')){xscale=options.trueSize[0]/boundx;yscale=options.trueSize[1]/boundy;}
-if(options.hasOwnProperty('setSelect')){setSelect(options.setSelect);Selection.done();delete(options.setSelect);}
-Shade.refresh();if(options.bgColor!=bgcolor){colorChangeMacro(options.shade?Shade.getShades():$div,options.shade?(options.shadeColor||options.bgColor):options.bgColor);bgcolor=options.bgColor;}
-if(bgopacity!=options.bgOpacity){bgopacity=options.bgOpacity;if(options.shade)Shade.refresh();else Selection.setBgOpacity(bgopacity);}
-xlimit=options.maxSize[0]||0;ylimit=options.maxSize[1]||0;xmin=options.minSize[0]||0;ymin=options.minSize[1]||0;if(options.hasOwnProperty('outerImage')){$img.attr('src',options.outerImage);delete(options.outerImage);}
-Selection.refresh();}
-if(Touch.support)$trk.bind('touchstart.jcrop',Touch.newSelection);$hdl_holder.hide();interfaceUpdate(true);var api={setImage:setImage,animateTo:animateTo,setSelect:setSelect,setOptions:setOptionsNew,tellSelect:tellSelect,tellScaled:tellScaled,setClass:setClass,disable:disableCrop,enable:enableCrop,cancel:cancelCrop,release:Selection.release,destroy:destroy,focus:KeyManager.watchKeys,getBounds:function(){return[boundx*xscale,boundy*yscale];},getWidgetSize:function(){return[boundx,boundy];},getScaleFactor:function(){return[xscale,yscale];},ui:{holder:$div,selection:$sel}};if($.browser.msie){$div.bind('selectstart',function(){return false;});}
-$origimg.data('Jcrop',api);return api;};$.fn.Jcrop=function(options,callback)
-{var api;this.each(function(){if($(this).data('Jcrop')){if(options==='api')return $(this).data('Jcrop');else $(this).data('Jcrop').setOptions(options);}
-else{if(this.tagName=='IMG')
-$.Jcrop.Loader(this,function(){$(this).css({display:'block',visibility:'hidden'});api=$.Jcrop(this,options);if($.isFunction(callback))callback.call(api);});else{$(this).css({display:'block',visibility:'hidden'});api=$.Jcrop(this,options);if($.isFunction(callback))callback.call(api);}}});return this;};$.Jcrop.Loader=function(imgobj,success,error){var $img=$(imgobj),img=$img[0];function completeCheck(){if(img.complete){$img.unbind('.jcloader');if($.isFunction(success))success.call(img);}
-else window.setTimeout(completeCheck,50);}
-$img.bind('load.jcloader',completeCheck).bind('error.jcloader',function(e){$img.unbind('.jcloader');if($.isFunction(error))error.call(img);});if(img.complete&&$.isFunction(success)){$img.unbind('.jcloader');success.call(img);}};$.Jcrop.defaults={allowSelect:true,allowMove:true,allowResize:true,trackDocument:true,baseClass:'jcrop',addClass:null,bgColor:'black',bgOpacity:0.6,bgFade:false,borderOpacity:0.4,handleOpacity:0.5,handleSize:7,handleOffset:5,aspectRatio:0,keySupport:true,cornerHandles:true,sideHandles:true,drawBorders:true,dragEdges:true,fixedSupport:true,touchSupport:null,shade:null,boxWidth:0,boxHeight:0,boundary:2,fadeTime:400,animationDelay:20,swingSpeed:3,minSelect:[0,0],maxSize:[0,0],minSize:[0,0],onChange:function(){},onSelect:function(){},onDblClick:function(){},onRelease:function(){}};}(jQuery));
\ No newline at end of file
diff --git a/apps/contacts/js/jquery.combobox.js b/apps/contacts/js/jquery.combobox.js
deleted file mode 100644
index d9959eb6cd..0000000000
--- a/apps/contacts/js/jquery.combobox.js
+++ /dev/null
@@ -1,158 +0,0 @@
-/**
- * Inspired by http://jqueryui.com/demos/autocomplete/#combobox
- */
-
-(function( $ ) {
-	$.widget('ui.combobox', {
-		options: { 
-			id: null,
-			name: null,
-			showButton: false,
-			editable: true
-		},
-		_create: function() {
-			var self = this,
-				select = this.element.hide(),
-				selected = select.children(':selected'),
-				value = selected.val() ? selected.text() : '';
-			var input = this.input = $('<input type="text">')
-				.insertAfter( select )
-				.val( value )
-				.autocomplete({
-					delay: 0,
-					minLength: 0,
-					source: function( request, response ) {
-						var matcher = new RegExp( $.ui.autocomplete.escapeRegex(request.term), "i" );
-						response( select.children('option').map(function() {
-							var text = $( this ).text();
-							if ( this.value && ( !request.term || matcher.test(text) ) )
-								return {
-									label: text.replace(
-										new RegExp(
-											'(?![^&;]+;)(?!<[^<>]*)(' +
-											$.ui.autocomplete.escapeRegex(request.term) +
-											')(?![^<>]*>)(?![^&;]+;)', 'gi'
-										), '<strong>$1</strong>'),
-									value: text,
-									option: this
-								};
-						}) );
-					},
-					select: function( event, ui ) {
-						self.input.val($(ui.item.option).text());
-						self.input.trigger('change');
-						ui.item.option.selected = true;
-						self._trigger('selected', event, {
-							item: ui.item.option
-						});
-					},
-					change: function( event, ui ) {
-						if ( !ui.item ) {
-							var matcher = new RegExp( '^' + $.ui.autocomplete.escapeRegex( $(this).val() ) + '$', 'i' ),
-								valid = false;
-							self.input.val($(this).val());
-							//self.input.trigger('change');
-							select.children('option').each(function() {
-								if ( $( this ).text().match( matcher ) ) {
-									this.selected = valid = true;
-									return false;
-								}
-							});
-							if ( !self.options['editable'] && !valid ) {
-								// remove invalid value, as it didn't match anything
-								$( this ).val( "" );
-								select.val( "" );
-								input.data('autocomplete').term = '';
-								return false;
-							}
-						}
-					}
-				})
-				.addClass('ui-widget ui-widget-content ui-corner-left');
-
-			input.data('autocomplete')._renderItem = function( ul, item ) {
-				return $('<li></li>')
-					.data('item.autocomplete', item )
-					.append('<a>' + item.label + '</a>')
-					.appendTo( ul );
-			};
-			$.each(this.options, function(key, value) {
-				self._setOption(key, value);
-			});
-
-			input.dblclick(function() {
-				// pass empty string as value to search for, displaying all results
-				input.autocomplete('search', '');
-			});
-			
-			if(this.options['showButton']) {
-				this.button = $('<button type="button">&nbsp;</button>')
-					.attr('tabIndex', -1 )
-					.attr('title', 'Show All Items')
-					.insertAfter( input )
-					.addClass('svg')
-					.addClass('action')
-					.addClass('combo-button')
-					.click(function() {
-						// close if already visible
-						if ( input.autocomplete('widget').is(':visible') ) {
-							input.autocomplete('close');
-							return;
-						}
-
-						// work around a bug (likely same cause as #5265)
-						$( this ).blur();
-
-						// pass empty string as value to search for, displaying all results
-						input.autocomplete('search', '');
-						input.focus();
-					});
-			}
-		},
-		destroy: function() {
-			this.input.remove();
-			//this.button.remove();
-			this.element.show();
-			$.Widget.prototype.destroy.call( this );
-		},
-		value: function(val) {
-			if(val != undefined) {
-				this.input.val(val);
-			} else {
-				return this.input.val();
-			}
-		},
-		_setOption: function( key, value ) {
-			switch( key ) {
-				case 'id':
-					this.options['id'] = value;
-					this.input.attr('id', value);
-					break;
-				case 'name':
-					this.options['name'] = value;
-					this.input.attr('name', value);
-					break;
-				case 'attributes':
-					var input = this.input;
-					$.each(this.options['attributes'], function(key, value) {
-						input.attr(key, value);
-					});
-					break;
-				case 'classes':
-					var input = this.input;
-					$.each(this.options['classes'], function(key, value) {
-						input.addClass(value);
-					});
-					break;
-				case 'editable':
-				case 'showButton':
-					this.options[key] = value;
-					break;
-			}
-			// In jQuery UI 1.8, you have to manually invoke the _setOption method from the base widget
-			$.Widget.prototype._setOption.apply( this, arguments );
-			// In jQuery UI 1.9 and above, you use the _super method instead
-			//this._super( "_setOption", key, value );
-		}
-	});
-})( jQuery );
diff --git a/apps/contacts/js/jquery.multi-autocomplete.js b/apps/contacts/js/jquery.multi-autocomplete.js
deleted file mode 100644
index 5516a74b03..0000000000
--- a/apps/contacts/js/jquery.multi-autocomplete.js
+++ /dev/null
@@ -1,94 +0,0 @@
-/**
- * Inspired by http://jqueryui.com/demos/autocomplete/#multiple
- */
-
-(function( $ ) {
-	$.widget('ui.multiple_autocomplete', {
-		_create: function() {
-			var self = this;
-			function split( val ) {
-				return val.split( /,\s*/ );
-			}
-			function extractLast( term ) {
-				return split( term ).pop();
-			}
-			function showOptions() {
-				if(!self.element.autocomplete('widget').is(':visible') && self.element.val().trim() == '') {
-					self.element.autocomplete('search', '');
-				}
-			}
-			//console.log('_create: ' + this.options['id']);
-			this.element.bind('click', function( event ) {
-				showOptions();
-			});
-			this.element.bind('input', function( event ) {
-				showOptions();
-			});
-			this.element.bind('blur', function( event ) {
-				var tmp = self.element.val().trim();
-				if(tmp[tmp.length-1] == ',') {
-					self.element.val(tmp.substring(0, tmp.length-1));
-				} else {
-					self.element.val(tmp);
-				}
-				if(self.element.val().trim() != '') {
-					self.element.trigger('change'); // Changes wasn't saved when only using the dropdown.
-				}
-			});
-			this.element.bind( "keydown", function( event ) {
-				if ( event.keyCode === $.ui.keyCode.TAB &&
-						$( this ).data( "autocomplete" ).menu.active ) {
-					event.preventDefault();
-				}
-			})
-			.autocomplete({
-				minLength: 0,
-				source: function( request, response ) {
-					// delegate back to autocomplete, but extract the last term
-					response( $.ui.autocomplete.filter(
-						self.options.source, extractLast( request.term ) ) );
-				},
-				focus: function() {
-					// prevent value inserted on focus
-					return false;
-				},
-				select: function( event, ui ) {
-					var terms = split( this.value );
-					// remove the current input
-					terms.pop();
-					// add the selected item
-					terms.push( ui.item.value );
-					// add placeholder to get the comma-and-space at the end
-					terms.push( "" );
-					this.value = terms.join( ", " );
-					return false;
-				}
-			});
-			/*this.button = $( "<button type='button'>&nbsp;</button>" )
-				.attr( "tabIndex", -1 )
-				.attr( "title", "Show All Items" )
-				.insertAfter( this.element )
-				.addClass('svg')
-				.addClass('action')
-				.addClass('combo-button')
-				.click(function() {
-					// close if already visible
-					if ( self.element.autocomplete( "widget" ).is( ":visible" ) ) {
-						self.element.autocomplete( "close" );
-						return;
-					}
-
-					// work around a bug (likely same cause as #5265)
-					$( this ).blur();
-
-					var tmp = self.element.val().trim();
-					if(tmp[tmp.length-1] != ',') {
-						self.element.val(tmp+', ');
-					}
-					// pass empty string as value to search for, displaying all results
-					self.element.autocomplete( "search", "" );
-					self.element.focus();
-				});*/
-		},
-	});
-})( jQuery );
diff --git a/apps/contacts/js/loader.js b/apps/contacts/js/loader.js
deleted file mode 100644
index 3b1f407048..0000000000
--- a/apps/contacts/js/loader.js
+++ /dev/null
@@ -1,86 +0,0 @@
-/**
- * Copyright (c) 2012 Georg Ehrke <ownclouddev at georgswebsite dot de>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-Contacts_Import={
-	importdialog: function(filename){
-		var path = $('#dir').val();
-		$('body').append('<div id="contacts_import"></div>');
-		$('#contacts_import').load(OC.filePath('contacts', 'ajax', 'importdialog.php'), {filename:filename, path:path},	function(){Contacts_Import.initdialog(filename);});
-	},
-	initdialog: function(filename){
-		$('#contacts_import_dialog').dialog({
-			width : 500,
-			close : function() {
-				$(this).dialog('destroy').remove();
-				$('#contacts_import').remove();
-			}
-		});
-		$('#import_done_button').click(function(){
-			$('#contacts_import_dialog').dialog('destroy').remove();
-			$('#contacts_import').remove();
-		});
-		$('#progressbar').progressbar({value: 0});
-		$('#startimport').click(function(){
-			var filename = $('#filename').val();
-			var path = $('#path').val();
-			var method = 'old';
-			var addressbookid = $('#contacts option:selected').val();
-			if($('#contacts option:selected').val() == 'newaddressbook'){
-				var method = 'new';
-				var addressbookname = $('#newaddressbook').val();
-				var addressbookname = $.trim(addressbookname);
-				if(addressbookname == ''){
-					$('#newaddressbook').css('background-color', '#FF2626');
-					$('#newaddressbook').focus(function(){
-						$('#newaddressbook').css('background-color', '#F8F8F8');
-					});
-					return false;
-				}
-			}
-			$('#newaddressbook').attr('readonly', 'readonly');
-			$('#contacts').attr('disabled', 'disabled');
-			var progresskey = $('#progresskey').val();
-			$.post(OC.filePath('contacts', '', 'import.php') + '?progresskey='+progresskey, {method: String (method), addressbookname: String (addressbookname), path: String (path), file: String (filename), id: String (addressbookid)}, function(jsondata){
-				if(jsondata.status == 'success'){
-					$('#progressbar').progressbar('option', 'value', 100);
-					$('#import_done').find('p').html(t('contacts', 'Result: ') + jsondata.data.imported + t('contacts', ' imported, ') + jsondata.data.failed + t('contacts', ' failed.'));
-				} else {
-					$('#import_done').find('p').html(jsondata.message);
-				}
-				$('#import_done').show().find('p').addClass('bold');
-				$('#progressbar').fadeOut('slow');
-			});
-			$('#form_container').css('display', 'none');
-			$('#progressbar_container').css('display', 'block');
-			window.setTimeout('Contacts_Import.getimportstatus(\'' + progresskey + '\')', 500);
-		});
-		$('#contacts').change(function(){
-			if($('#contacts option:selected').val() == 'newaddressbook'){
-				$('#newaddressbookform').slideDown('slow');
-			}else{
-				$('#newaddressbookform').slideUp('slow');
-			}
-		});
-	},
-	getimportstatus: function(progresskey){
-		$.get(OC.filePath('contacts', '', 'import.php') + '?progress=1&progresskey=' + progresskey, function(percent){
-			$('#progressbar').progressbar('option', 'value', parseInt(percent));
-			if(percent < 100){
-				window.setTimeout('Contacts_Import.getimportstatus(\'' + progresskey + '\')', 500);
-			}else{
-				$('#import_done').css('display', 'block');
-			}
-		});
-	}
-}
-$(document).ready(function(){
-	if(typeof FileActions !== 'undefined'){
-		FileActions.register('text/vcard','importaddressbook', FileActions.PERMISSION_READ, '', Contacts_Import.importdialog);
-		FileActions.setDefault('text/vcard','importaddressbook');
-		FileActions.register('text/x-vcard','importaddressbook', FileActions.PERMISSION_READ, '', Contacts_Import.importdialog);
-		FileActions.setDefault('text/x-vcard','importaddressbook');
-	};
-});
\ No newline at end of file
diff --git a/apps/contacts/js/settings.js b/apps/contacts/js/settings.js
deleted file mode 100644
index 69cf473e06..0000000000
--- a/apps/contacts/js/settings.js
+++ /dev/null
@@ -1,196 +0,0 @@
-OC.Contacts = OC.Contacts || {};
-OC.Contacts.Settings = OC.Contacts.Settings || {
-	init:function() {
-		this.Addressbook.adrsettings = $('.addressbooks-settings').first();
-		this.Addressbook.adractions = $('#contacts-settings').find('div.actions');
-		console.log('actions: ' + this.Addressbook.adractions.length);
-		OC.Share.loadIcons('addressbook');
-	},
-	Addressbook:{
-		showActions:function(act) {
-			this.adractions.children().hide();
-			this.adractions.children('.'+act.join(',.')).show();
-		},
-		doActivate:function(id, tgt) {
-			var active = tgt.is(':checked');
-			console.log('doActivate: ', id, active);
-			$.post(OC.filePath('contacts', 'ajax', 'addressbook/activate.php'), {id: id, active: Number(active)}, function(jsondata) {
-				if (jsondata.status == 'success'){
-					if(!active) {
-						$('#contacts h3[data-id="'+id+'"],#contacts ul[data-id="'+id+'"]').remove();
-					} else {
-						OC.Contacts.Contacts.update();
-					}
-				} else {
-					console.log('Error:', jsondata.data.message);
-					OC.Contacts.notify(t('contacts', 'Error') + ': ' + jsondata.data.message);
-					tgt.checked = !active;
-				}
-			});
-		},
-		doDelete:function(id) {
-			console.log('doDelete: ', id);
-			var check = confirm('Do you really want to delete this address book?');
-			if(check == false){
-				return false;
-			} else {
-				$.post(OC.filePath('contacts', 'ajax', 'addressbook/delete.php'), { id: id}, function(jsondata) {
-					if (jsondata.status == 'success'){
-						$('#contacts h3[data-id="'+id+'"],#contacts ul[data-id="'+id+'"]').remove();
-						$('.addressbooks-settings tr[data-id="'+id+'"]').remove()
-						OC.Contacts.Contacts.update();
-					} else {
-						OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
-					}
-				});
-			}
-		},
-		doEdit:function(id) {
-			console.log('doEdit: ', id);
-			this.showActions(['active', 'name', 'description', 'save', 'cancel']);
-			var name = this.adrsettings.find('[data-id="'+id+'"]').find('.name').text();
-			var description = this.adrsettings.find('[data-id="'+id+'"]').find('.description').text();
-			var active = this.adrsettings.find('[data-id="'+id+'"]').find(':checkbox').is(':checked');
-			console.log('name, desc', name, description);
-			this.adractions.find('.active').prop('checked', active);
-			this.adractions.find('.name').val(name);
-			this.adractions.find('.description').val(description);
-			this.adractions.data('id', id);
-		},
-		doSave:function() {
-			var name = this.adractions.find('.name').val();
-			var description = this.adractions.find('.description').val();
-			var active = this.adractions.find('.active').is(':checked');
-			var id = this.adractions.data('id');
-			console.log('doSave:', id, name, description, active);
-
-			if(name.length == 0) {
-				OC.dialogs.alert(t('contacts', 'Displayname cannot be empty.'), t('contacts', 'Error'));
-				return false;
-			}
-			var url;
-			if (id == 'new'){
-				url = OC.filePath('contacts', 'ajax', 'addressbook/add.php');
-			}else{
-				url = OC.filePath('contacts', 'ajax', 'addressbook/update.php');
-			}
-			self = this;
-			$.post(url, { id: id, name: name, active: Number(active), description: description },
-				function(jsondata){
-					if(jsondata.status == 'success'){
-						self.showActions(['new',]);
-						self.adractions.removeData('id');
-						active = Boolean(Number(jsondata.data.addressbook.active));
-						if(id == 'new') {
-							self.adrsettings.find('table')
-								.append('<tr class="addressbook" data-id="'+jsondata.data.addressbook.id+'" data-uri="'+jsondata.data.addressbook.uri+'">'
-									+ '<td class="active"><input type="checkbox" '+(active ? 'checked="checked"' : '')+' /></td>'
-									+ '<td class="name">'+jsondata.data.addressbook.displayname+'</td>'
-									+ '<td class="description">'+jsondata.data.addressbook.description+'</td>'
-									+ '<td class="action"><a class="svg action globe" title="'+t('contacts', 'Show CardDav link')+'"></a></td>'
-									+ '<td class="action"><a class="svg action cloud" title="'+t('contacts', 'Show read-only VCF link')+'"></a></td>'
-									+ '<td class="action"><a class="svg action download" title="'+t('contacts', 'Download')+'" '
-									+ 'href="'+OC.linkTo('contacts', 'export.php')+'?bookid='+jsondata.data.addressbook.id+'"></a></td>'
-									+ '<td class="action"><a class="svg action edit" title="'+t('contacts', 'Edit')+'"></a></td>'
-									+ '<td class="action"><a class="svg action delete" title="'+t('contacts', 'Delete')+'"></a></td>'
-									+ '</tr>');
-						} else {
-						var row = self.adrsettings.find('tr[data-id="'+id+'"]');
-							row.find('td.active').find('input:checkbox').prop('checked', active);
-							row.find('td.name').text(jsondata.data.addressbook.displayname);
-							row.find('td.description').text(jsondata.data.addressbook.description);
-						}
-						OC.Contacts.Contacts.update();
-					} else {
-						OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
-					}
-			});
-		},
-		showLink:function(id, row, link) {
-			console.log('row:', row.length);
-			row.next('tr.link').remove();
-			var linkrow = $('<tr class="link"><td colspan="5"><input style="width: 95%;" type="text" value="'+link+'" /></td>'
-				+ '<td colspan="3"><button>'+t('contacts', 'Cancel')+'</button></td></tr>').insertAfter(row);
-			linkrow.find('input').focus().select();
-			linkrow.find('button').click(function() {
-				$(this).parents('tr').first().remove();
-			});
-		},
-		showCardDAV:function(id) {
-			console.log('showCardDAV: ', id);
-			var row = this.adrsettings.find('tr[data-id="'+id+'"]');
-			this.showLink(id, row, totalurl+'/'+encodeURIComponent(oc_current_user));
-		},
-		showVCF:function(id) {
-			console.log('showVCF: ', id);
-			var row = this.adrsettings.find('tr[data-id="'+id+'"]');
-			var link = totalurl+'/'+encodeURIComponent(oc_current_user)+'/'+encodeURIComponent(row.data('uri'))+'?export';
-			console.log(link);
-			this.showLink(id, row, link);
-		}
-	}
-};
-
-
-$(document).ready(function() {
-	OC.Contacts.Settings.init();
-
-	var moreless = $('#contacts-settings').find('.moreless').first();
-	moreless.keydown(function(event) {
-		if(event.which == 13 || event.which == 32) {
-			moreless.click();
-		}
-	});
-	moreless.on('click', function(event) {
-		event.preventDefault();
-		if(OC.Contacts.Settings.Addressbook.adrsettings.is(':visible')) {
-			OC.Contacts.Settings.Addressbook.adrsettings.slideUp();
-			OC.Contacts.Settings.Addressbook.adrsettings.prev('dt').hide();
-			moreless.text(t('contacts', 'More...'));
-		} else {
-			OC.Contacts.Settings.Addressbook.adrsettings.slideDown();
-			OC.Contacts.Settings.Addressbook.adrsettings.prev('dt').show();
-			moreless.text(t('contacts', 'Less...'));
-		}
-	});
-
-	OC.Contacts.Settings.Addressbook.adrsettings.keydown(function(event) {
-		if(event.which == 13 || event.which == 32) {
-			OC.Contacts.Settings.Addressbook.adrsettings.click();
-		}
-	});
-
-
-	OC.Contacts.Settings.Addressbook.adrsettings.on('click', function(event){
-		$('.tipsy').remove();
-		var tgt = $(event.target);
-		if(tgt.is('a') || tgt.is(':checkbox')) {
-			var id = tgt.parents('tr').first().data('id');
-			if(!id) {
-				return;
-			}
-			if(tgt.is(':checkbox')) {
-				OC.Contacts.Settings.Addressbook.doActivate(id, tgt);
-			} else if(tgt.is('a')) {
-				if(tgt.hasClass('edit')) {
-					OC.Contacts.Settings.Addressbook.doEdit(id);
-				} else if(tgt.hasClass('delete')) {
-					OC.Contacts.Settings.Addressbook.doDelete(id);
-				} else if(tgt.hasClass('globe')) {
-					OC.Contacts.Settings.Addressbook.showCardDAV(id);
-				} else if(tgt.hasClass('cloud')) {
-					OC.Contacts.Settings.Addressbook.showVCF(id);
-				}
-			}
-		} else if(tgt.is('button')) {
-			event.preventDefault();
-			if(tgt.hasClass('save')) {
-				OC.Contacts.Settings.Addressbook.doSave();
-			} else if(tgt.hasClass('cancel')) {
-				OC.Contacts.Settings.Addressbook.showActions(['new']);
-			} else if(tgt.hasClass('new')) {
-				OC.Contacts.Settings.Addressbook.doEdit('new');
-			}
-		}
-	});
-});
diff --git a/apps/contacts/l10n/.gitkeep b/apps/contacts/l10n/.gitkeep
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/apps/contacts/l10n/ar.php b/apps/contacts/l10n/ar.php
deleted file mode 100644
index 2b28d6ca6d..0000000000
--- a/apps/contacts/l10n/ar.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "خطء خلال توقيف كتاب العناوين.",
-"Error updating addressbook." => "خطء خلال تعديل كتاب العناوين",
-"There was an error adding the contact." => "خطء خلال اضافة معرفه جديده.",
-"Cannot add empty property." => "لا يمكنك اضافه صفه خاليه.",
-"At least one of the address fields has to be filled out." => "يجب ملء على الاقل خانه واحده من العنوان.",
-"Information about vCard is incorrect. Please reload the page." => "المعلومات الموجودة في ال vCard غير صحيحة. الرجاء إعادة تحديث الصفحة.",
-"Contacts" => "المعارف",
-"This is not your addressbook." => "هذا ليس دفتر عناوينك.",
-"Contact could not be found." => "لم يتم العثور على الشخص.",
-"Work" => "الوظيفة",
-"Home" => "البيت",
-"Mobile" => "الهاتف المحمول",
-"Text" => "معلومات إضافية",
-"Voice" => "صوت",
-"Fax" => "الفاكس",
-"Video" => "الفيديو",
-"Pager" => "الرنان",
-"Birthday" => "تاريخ الميلاد",
-"Contact" => "معرفه",
-"Add Contact" => "أضف شخص ",
-"Addressbooks" => "كتب العناوين",
-"Organization" => "المؤسسة",
-"Delete" => "حذف",
-"Preferred" => "مفضل",
-"Phone" => "الهاتف",
-"Email" => "البريد الالكتروني",
-"Address" => "عنوان",
-"Download contact" => "انزال المعرفه",
-"Delete contact" => "امحي المعرفه",
-"Type" => "نوع",
-"PO Box" => "العنوان البريدي",
-"Extended" => "إضافة",
-"City" => "المدينة",
-"Region" => "المنطقة",
-"Zipcode" => "رقم المنطقة",
-"Country" => "البلد",
-"Addressbook" => "كتاب العناوين",
-"Download" => "انزال",
-"Edit" => "تعديل",
-"New Address Book" => "كتاب عناوين جديد",
-"Save" => "حفظ",
-"Cancel" => "الغاء"
-);
diff --git a/apps/contacts/l10n/ca.php b/apps/contacts/l10n/ca.php
deleted file mode 100644
index 7ce9d6d456..0000000000
--- a/apps/contacts/l10n/ca.php
+++ /dev/null
@@ -1,235 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "Error en (des)activar la llibreta d'adreces.",
-"id is not set." => "no s'ha establert la id.",
-"Cannot update addressbook with an empty name." => "No es pot actualitzar la llibreta d'adreces amb un nom buit",
-"Error updating addressbook." => "Error en actualitzar la llibreta d'adreces.",
-"No ID provided" => "No heu facilitat cap ID",
-"Error setting checksum." => "Error en establir la suma de verificació.",
-"No categories selected for deletion." => "No heu seleccionat les categories a eliminar.",
-"No address books found." => "No s'han trobat llibretes d'adreces.",
-"No contacts found." => "No s'han trobat contactes.",
-"There was an error adding the contact." => "S'ha produït un error en afegir el contacte.",
-"element name is not set." => "no s'ha establert el nom de l'element.",
-"Could not parse contact: " => "No s'ha pogut processar el contacte:",
-"Cannot add empty property." => "No es pot afegir una propietat buida.",
-"At least one of the address fields has to be filled out." => "Almenys heu d'omplir un dels camps d'adreça.",
-"Trying to add duplicate property: " => "Esteu intentant afegir una propietat duplicada:",
-"Missing IM parameter." => "Falta el paràmetre IM.",
-"Unknown IM: " => "IM desconegut:",
-"Information about vCard is incorrect. Please reload the page." => "La informació de la vCard és incorrecta. Carregueu la pàgina de nou.",
-"Missing ID" => "Falta la ID",
-"Error parsing VCard for ID: \"" => "Error en analitzar la ID de la VCard: \"",
-"checksum is not set." => "no s'ha establert la suma de verificació.",
-"Information about vCard is incorrect. Please reload the page: " => "La informació de la vCard és incorrecta. Carregueu de nou la pàgina:",
-"Something went FUBAR. " => "Alguna cosa ha anat FUBAR.",
-"No contact ID was submitted." => "No s'ha tramès cap ID de contacte.",
-"Error reading contact photo." => "Error en llegir la foto del contacte.",
-"Error saving temporary file." => "Error en desar el fitxer temporal.",
-"The loading photo is not valid." => "La foto carregada no és vàlida.",
-"Contact ID is missing." => "falta la ID del contacte.",
-"No photo path was submitted." => "No heu tramès el camí de la foto.",
-"File doesn't exist:" => "El fitxer no existeix:",
-"Error loading image." => "Error en carregar la imatge.",
-"Error getting contact object." => "Error en obtenir l'objecte contacte.",
-"Error getting PHOTO property." => "Error en obtenir la propietat PHOTO.",
-"Error saving contact." => "Error en desar el contacte.",
-"Error resizing image" => "Error en modificar la mida de la imatge",
-"Error cropping image" => "Error en retallar la imatge",
-"Error creating temporary image" => "Error en crear la imatge temporal",
-"Error finding image: " => "Error en trobar la imatge:",
-"Error uploading contacts to storage." => "Error en carregar contactes a l'emmagatzemament.",
-"There is no error, the file uploaded with success" => "No hi ha errors, el fitxer s'ha carregat correctament",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "El fitxer carregat supera la directiva upload_max_filesize de php.ini",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "El fitxer carregat supera la directiva MAX_FILE_SIZE especificada al formulari HTML",
-"The uploaded file was only partially uploaded" => "El fitxer només s'ha carregat parcialment",
-"No file was uploaded" => "No s'ha carregat cap fitxer",
-"Missing a temporary folder" => "Falta un fitxer temporal",
-"Couldn't save temporary image: " => "No s'ha pogut desar la imatge temporal: ",
-"Couldn't load temporary image: " => "No s'ha pogut carregar la imatge temporal: ",
-"No file was uploaded. Unknown error" => "No s'ha carregat cap fitxer. Error desconegut",
-"Contacts" => "Contactes",
-"Sorry, this functionality has not been implemented yet" => "Aquesta funcionalitat encara no està implementada",
-"Not implemented" => "No implementada",
-"Couldn't get a valid address." => "No s'ha pogut obtenir una adreça vàlida.",
-"Error" => "Error",
-"You do not have permission to add contacts to " => "No teniu permisos per afegir contactes a ",
-"Please select one of your own address books." => "Seleccioneu una de les vostres llibretes d'adreces",
-"Permission error" => "Error de permisos",
-"This property has to be non-empty." => "Aquesta propietat no pot ser buida.",
-"Couldn't serialize elements." => "No s'han pogut serialitzar els elements.",
-"'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "'deleteProperty' s'ha cridat sense argument de tipus. Informeu-ne a  bugs.owncloud.org",
-"Edit name" => "Edita el nom",
-"No files selected for upload." => "No s'han seleccionat fitxers per a la pujada.",
-"The file you are trying to upload exceed the maximum size for file uploads on this server." => "El fitxer que intenteu pujar excedeix la mida màxima de pujada en aquest servidor.",
-"Error loading profile picture." => "Error en carregar la imatge de perfil.",
-"Select type" => "Seleccioneu un tipus",
-"Some contacts are marked for deletion, but not deleted yet. Please wait for them to be deleted." => "Heu marcat eliminar alguns contactes, però encara no s'han eliminat. Espereu mentre s'esborren.",
-"Do you want to merge these address books?" => "Voleu fusionar aquestes llibretes d'adreces?",
-"Result: " => "Resultat: ",
-" imported, " => " importat, ",
-" failed." => " fallada.",
-"Displayname cannot be empty." => "El nom a mostrar no pot ser buit",
-"Addressbook not found: " => "No s'ha trobat la llibreta d'adreces: ",
-"This is not your addressbook." => "Aquesta no és la vostra llibreta d'adreces",
-"Contact could not be found." => "No s'ha trobat el contacte.",
-"Jabber" => "Jabber",
-"AIM" => "AIM",
-"MSN" => "MSN",
-"Twitter" => "Twitter",
-"GoogleTalk" => "GoogleTalk",
-"Facebook" => "Facebook",
-"XMPP" => "XMPP",
-"ICQ" => "ICQ",
-"Yahoo" => "Yahoo",
-"Skype" => "Skype",
-"QQ" => "QQ",
-"GaduGadu" => "GaduGadu",
-"Work" => "Feina",
-"Home" => "Casa",
-"Other" => "Altres",
-"Mobile" => "Mòbil",
-"Text" => "Text",
-"Voice" => "Veu",
-"Message" => "Missatge",
-"Fax" => "Fax",
-"Video" => "Vídeo",
-"Pager" => "Paginador",
-"Internet" => "Internet",
-"Birthday" => "Aniversari",
-"Business" => "Negocis",
-"Call" => "Trucada",
-"Clients" => "Clients",
-"Deliverer" => "Emissari",
-"Holidays" => "Vacances",
-"Ideas" => "Idees",
-"Journey" => "Viatge",
-"Jubilee" => "Aniversari",
-"Meeting" => "Reunió",
-"Personal" => "Personal",
-"Projects" => "Projectes",
-"Questions" => "Preguntes",
-"{name}'s Birthday" => "Aniversari de {name}",
-"Contact" => "Contacte",
-"You do not have the permissions to edit this contact." => "No teniu permisos per editar aquest contacte",
-"You do not have the permissions to delete this contact." => "No teniu permisos per esborrar aquest contacte",
-"Add Contact" => "Afegeix un contacte",
-"Import" => "Importa",
-"Settings" => "Configuració",
-"Addressbooks" => "Llibretes d'adreces",
-"Close" => "Tanca",
-"Keyboard shortcuts" => "Dreceres de teclat",
-"Navigation" => "Navegació",
-"Next contact in list" => "Següent contacte de la llista",
-"Previous contact in list" => "Contacte anterior de la llista",
-"Expand/collapse current addressbook" => "Expandeix/col·lapsa la llibreta d'adreces",
-"Next addressbook" => "Llibreta d'adreces següent",
-"Previous addressbook" => "Llibreta d'adreces anterior",
-"Actions" => "Accions",
-"Refresh contacts list" => "Carrega de nou la llista de contactes",
-"Add new contact" => "Afegeix un contacte nou",
-"Add new addressbook" => "Afegeix una llibreta d'adreces nova",
-"Delete current contact" => "Esborra el contacte",
-"Drop photo to upload" => "Elimina la foto a carregar",
-"Delete current photo" => "Elimina la foto actual",
-"Edit current photo" => "Edita la foto actual",
-"Upload new photo" => "Carrega una foto nova",
-"Select photo from ownCloud" => "Selecciona una foto de ownCloud",
-"Format custom, Short name, Full name, Reverse or Reverse with comma" => "Format personalitzat, Nom curt, Nom sencer, Invertit o Invertit amb coma",
-"Edit name details" => "Edita detalls del nom",
-"Organization" => "Organització",
-"Delete" => "Suprimeix",
-"Nickname" => "Sobrenom",
-"Enter nickname" => "Escriviu el sobrenom",
-"Web site" => "Adreça web",
-"http://www.somesite.com" => "http://www.somesite.com",
-"Go to web site" => "Vés a la web",
-"dd-mm-yyyy" => "dd-mm-yyyy",
-"Groups" => "Grups",
-"Separate groups with commas" => "Separeu els grups amb comes",
-"Edit groups" => "Edita els grups",
-"Preferred" => "Preferit",
-"Please specify a valid email address." => "Especifiqueu una adreça de correu electrònic correcta",
-"Enter email address" => "Escriviu una adreça de correu electrònic",
-"Mail to address" => "Envia per correu electrònic a l'adreça",
-"Delete email address" => "Elimina l'adreça de correu electrònic",
-"Enter phone number" => "Escriviu el número de telèfon",
-"Delete phone number" => "Elimina el número de telèfon",
-"Instant Messenger" => "Instant Messenger",
-"Delete IM" => "Elimina IM",
-"View on map" => "Visualitza al mapa",
-"Edit address details" => "Edita els detalls de l'adreça",
-"Add notes here." => "Afegiu notes aquí.",
-"Add field" => "Afegeix un camp",
-"Phone" => "Telèfon",
-"Email" => "Correu electrònic",
-"Instant Messaging" => "Missatgeria instantània",
-"Address" => "Adreça",
-"Note" => "Nota",
-"Download contact" => "Baixa el contacte",
-"Delete contact" => "Suprimeix el contacte",
-"The temporary image has been removed from cache." => "La imatge temporal ha estat eliminada de la memòria de cau.",
-"Edit address" => "Edita l'adreça",
-"Type" => "Tipus",
-"PO Box" => "Adreça postal",
-"Street address" => "Adreça",
-"Street and number" => "Carrer i número",
-"Extended" => "Addicional",
-"Apartment number etc." => "Número d'apartament, etc.",
-"City" => "Ciutat",
-"Region" => "Comarca",
-"E.g. state or province" => "p. ex. Estat o província ",
-"Zipcode" => "Codi postal",
-"Postal code" => "Codi postal",
-"Country" => "País",
-"Addressbook" => "Llibreta d'adreces",
-"Hon. prefixes" => "Prefix honorífic:",
-"Miss" => "Srta",
-"Ms" => "Sra",
-"Mr" => "Sr",
-"Sir" => "Senyor",
-"Mrs" => "Sra",
-"Dr" => "Dr",
-"Given name" => "Nom específic",
-"Additional names" => "Noms addicionals",
-"Family name" => "Nom de familia",
-"Hon. suffixes" => "Sufix honorífic:",
-"J.D." => "J.D.",
-"M.D." => "M.D.",
-"D.O." => "D.O.",
-"D.C." => "D.C.",
-"Ph.D." => "Ph.D.",
-"Esq." => "Esq.",
-"Jr." => "Jr.",
-"Sn." => "Sn.",
-"Import a contacts file" => "Importa un fitxer de contactes",
-"Please choose the addressbook" => "Escolliu la llibreta d'adreces",
-"create a new addressbook" => "crea una llibreta d'adreces nova",
-"Name of new addressbook" => "Nom de la nova llibreta d'adreces",
-"Importing contacts" => "S'estan important contactes",
-"Contacts imported successfully" => "Els contactes s'han importat correctament",
-"Close Dialog" => "Tanca el diàleg",
-"Import Addressbook" => "Importa la llibreta d'adreces",
-"Select address book to import to:" => "Seleccioneu la llibreta d'adreces a la que voleu importar:",
-"Drop a VCF file to import contacts." => "Elimina un fitxer VCF per importar contactes.",
-"Select from HD" => "Selecciona de HD",
-"You have no contacts in your addressbook." => "No teniu contactes a la llibreta d'adreces.",
-"Add contact" => "Afegeix un contacte",
-"Select Address Books" => "Selecccioneu llibretes d'adreces",
-"Enter name" => "Escriviu un nom",
-"Enter description" => "Escriviu una descripció",
-"CardDAV syncing addresses" => "Adreces de sincronització CardDAV",
-"more info" => "més informació",
-"Primary address (Kontact et al)" => "Adreça primària (Kontact i al)",
-"iOS/OS X" => "iOS/OS X",
-"Show CardDav link" => "Mostra l'enllaç CardDav",
-"Show read-only VCF link" => "Mostra l'enllaç VCF només de lectura",
-"Share" => "Comparteix",
-"Download" => "Baixa",
-"Edit" => "Edita",
-"New Address Book" => "Nova llibreta d'adreces",
-"Name" => "Nom",
-"Description" => "Descripció",
-"Save" => "Desa",
-"Cancel" => "Cancel·la",
-"More..." => "Més..."
-);
diff --git a/apps/contacts/l10n/cs_CZ.php b/apps/contacts/l10n/cs_CZ.php
deleted file mode 100644
index 5065fd2938..0000000000
--- a/apps/contacts/l10n/cs_CZ.php
+++ /dev/null
@@ -1,235 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "Chyba při (de)aktivaci adresáře.",
-"id is not set." => "id neni nastaveno.",
-"Cannot update addressbook with an empty name." => "Nelze aktualizovat adresář s prázdným jménem.",
-"Error updating addressbook." => "Chyba při aktualizaci adresáře.",
-"No ID provided" => "ID nezadáno",
-"Error setting checksum." => "Chyba při nastavování kontrolního součtu.",
-"No categories selected for deletion." => "Žádné kategorie nebyly vybrány k smazání.",
-"No address books found." => "Žádný adresář nenalezen.",
-"No contacts found." => "Žádné kontakty nenalezeny.",
-"There was an error adding the contact." => "Během přidávání kontaktu nastala chyba.",
-"element name is not set." => "jméno elementu není nastaveno.",
-"Could not parse contact: " => "Nelze analyzovat kontakty",
-"Cannot add empty property." => "Nelze přidat prazdný údaj.",
-"At least one of the address fields has to be filled out." => "Musí být uveden nejméně jeden z adresních údajů",
-"Trying to add duplicate property: " => "Pokoušíte se přidat duplicitní atribut: ",
-"Missing IM parameter." => "Chybějící parametr IM",
-"Unknown IM: " => "Neznámý IM:",
-"Information about vCard is incorrect. Please reload the page." => "Informace o vCard je nesprávná. Obnovte stránku, prosím.",
-"Missing ID" => "Chybí ID",
-"Error parsing VCard for ID: \"" => "Chyba při parsování VCard pro ID: \"",
-"checksum is not set." => "kontrolní součet není nastaven.",
-"Information about vCard is incorrect. Please reload the page: " => "Informace o vCard je nesprávná. Obnovte stránku, prosím.",
-"Something went FUBAR. " => "Něco se pokazilo. ",
-"No contact ID was submitted." => "Nebylo nastaveno ID kontaktu.",
-"Error reading contact photo." => "Chyba při načítání fotky kontaktu.",
-"Error saving temporary file." => "Chyba při ukládání dočasného souboru.",
-"The loading photo is not valid." => "Načítaná fotka je vadná.",
-"Contact ID is missing." => "Chybí ID kontaktu.",
-"No photo path was submitted." => "Žádná fotka nebyla nahrána.",
-"File doesn't exist:" => "Soubor neexistuje:",
-"Error loading image." => "Chyba při načítání obrázku.",
-"Error getting contact object." => "Chyba při převzetí objektu kontakt.",
-"Error getting PHOTO property." => "Chyba při získávání fotky.",
-"Error saving contact." => "Chyba při ukládání kontaktu.",
-"Error resizing image" => "Chyba při změně velikosti obrázku.",
-"Error cropping image" => "Chyba při osekávání obrázku.",
-"Error creating temporary image" => "Chyba při vytváření dočasného obrázku.",
-"Error finding image: " => "Chyba při hledání obrázku:",
-"Error uploading contacts to storage." => "Chyba při nahrávání kontaktů do úložiště.",
-"There is no error, the file uploaded with success" => "Nevyskytla se žádná chyba, soubor byl úspěšně nahrán",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Nahrávaný soubor překračuje nastavení upload_max_filesize directive v php.ini",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Nahrávaný soubor překračuje nastavení MAX_FILE_SIZE z voleb HTML formuláře",
-"The uploaded file was only partially uploaded" => "Nahrávaný soubor se nahrál pouze z části",
-"No file was uploaded" => "Žádný soubor nebyl nahrán",
-"Missing a temporary folder" => "Chybí dočasný adresář",
-"Couldn't save temporary image: " => "Nemohu uložit dočasný obrázek: ",
-"Couldn't load temporary image: " => "Nemohu načíst dočasný obrázek: ",
-"No file was uploaded. Unknown error" => "Soubor nebyl odeslán. Neznámá chyba",
-"Contacts" => "Kontakty",
-"Sorry, this functionality has not been implemented yet" => "Bohužel, tato funkce nebyla ještě implementována.",
-"Not implemented" => "Neimplementováno",
-"Couldn't get a valid address." => "Nelze získat platnou adresu.",
-"Error" => "Chyba",
-"You do not have permission to add contacts to " => "Nemáte práva přidat kontakt do",
-"Please select one of your own address books." => "Prosím vyberte jeden z vašich adresářů",
-"Permission error" => "Chyba přístupových práv",
-"This property has to be non-empty." => "Tento parametr nemuže zůstat nevyplněn.",
-"Couldn't serialize elements." => "Prvky nelze převést..",
-"'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "'deleteProperty' voláno bez argumentu. Prosím oznamte chybu na bugs.owncloud.org",
-"Edit name" => "Upravit jméno",
-"No files selected for upload." => "Žádné soubory nebyly vybrány k nahrání.",
-"The file you are trying to upload exceed the maximum size for file uploads on this server." => "Soubor, který se pokoušíte odeslat, přesahuje maximální povolenou velikost.",
-"Error loading profile picture." => "Chyba při otevírání obrázku profilu",
-"Select type" => "Vybrat typ",
-"Some contacts are marked for deletion, but not deleted yet. Please wait for them to be deleted." => "Některé kontakty jsou označeny ke smazání. Počkete prosím na dokončení operace.",
-"Do you want to merge these address books?" => "Chcete spojit tyto adresáře?",
-"Result: " => "Výsledek: ",
-" imported, " => "importováno v pořádku,",
-" failed." => "neimportováno.",
-"Displayname cannot be empty." => "Zobrazované jméno nemůže zůstat prázdné.",
-"Addressbook not found: " => "Adresář nenalezen:",
-"This is not your addressbook." => "Toto není Váš adresář.",
-"Contact could not be found." => "Kontakt nebyl nalezen.",
-"Jabber" => "Jabber",
-"AIM" => "AIM",
-"MSN" => "MSN",
-"Twitter" => "Twitter",
-"GoogleTalk" => "GoogleTalk",
-"Facebook" => "Facebook",
-"XMPP" => "XMPP",
-"ICQ" => "ICQ",
-"Yahoo" => "Yahoo",
-"Skype" => "Skype",
-"QQ" => "QQ",
-"GaduGadu" => "GaduGadu",
-"Work" => "Pracovní",
-"Home" => "Domácí",
-"Other" => "Ostatní",
-"Mobile" => "Mobil",
-"Text" => "Text",
-"Voice" => "Hlas",
-"Message" => "Zpráva",
-"Fax" => "Fax",
-"Video" => "Video",
-"Pager" => "Pager",
-"Internet" => "Internet",
-"Birthday" => "Narozeniny",
-"Business" => "Pracovní",
-"Call" => "Volat",
-"Clients" => "Klienti",
-"Deliverer" => "Dodavatel",
-"Holidays" => "Prázdniny",
-"Ideas" => "Nápady",
-"Journey" => "Cestování",
-"Jubilee" => "Jubileum",
-"Meeting" => "Schůzka",
-"Personal" => "Osobní",
-"Projects" => "Projekty",
-"Questions" => "Dotazy",
-"{name}'s Birthday" => "Narozeniny {name}",
-"Contact" => "Kontakt",
-"You do not have the permissions to edit this contact." => "Nemáte práva editovat tento kontakt",
-"You do not have the permissions to delete this contact." => "Nemáte práva smazat tento kontakt",
-"Add Contact" => "Přidat kontakt",
-"Import" => "Import",
-"Settings" => "Nastavení",
-"Addressbooks" => "Adresáře",
-"Close" => "Zavřít",
-"Keyboard shortcuts" => "Klávesoví zkratky",
-"Navigation" => "Navigace",
-"Next contact in list" => "Následující kontakt v seznamu",
-"Previous contact in list" => "Předchozí kontakt v seznamu",
-"Expand/collapse current addressbook" => "Rozbalit/sbalit aktuální Adresář",
-"Next addressbook" => "Následující Adresář",
-"Previous addressbook" => "Předchozí Adresář",
-"Actions" => "Akce",
-"Refresh contacts list" => "Občerstvit seznam kontaktů",
-"Add new contact" => "Přidat kontakt",
-"Add new addressbook" => "Předat nový Adresář",
-"Delete current contact" => "Odstranit aktuální kontakt",
-"Drop photo to upload" => "Přetáhněte sem fotku pro její nahrání",
-"Delete current photo" => "Smazat současnou fotku",
-"Edit current photo" => "Upravit současnou fotku",
-"Upload new photo" => "Nahrát novou fotku",
-"Select photo from ownCloud" => "Vybrat fotku z ownCloudu",
-"Format custom, Short name, Full name, Reverse or Reverse with comma" => "Formát vlastní, křestní, celé jméno, obráceně nebo obráceně oddelené čárkami",
-"Edit name details" => "Upravit podrobnosti jména",
-"Organization" => "Organizace",
-"Delete" => "Odstranit",
-"Nickname" => "Přezdívka",
-"Enter nickname" => "Zadejte přezdívku",
-"Web site" => "Web",
-"http://www.somesite.com" => "http://www.somesite.com",
-"Go to web site" => "Přejít na web",
-"dd-mm-yyyy" => "dd. mm. yyyy",
-"Groups" => "Skupiny",
-"Separate groups with commas" => "Oddělte skupiny čárkami",
-"Edit groups" => "Upravit skupiny",
-"Preferred" => "Preferovaný",
-"Please specify a valid email address." => "Prosím zadejte platnou e-mailovou adresu",
-"Enter email address" => "Zadat e-mailovou adresu",
-"Mail to address" => "Odeslat na adresu",
-"Delete email address" => "Smazat e-mail",
-"Enter phone number" => "Zadat telefoní číslo",
-"Delete phone number" => "Smazat telefoní číslo",
-"Instant Messenger" => "Instant Messenger",
-"Delete IM" => "Smazat IM",
-"View on map" => "Zobrazit na mapě",
-"Edit address details" => "Upravit podrobnosti adresy",
-"Add notes here." => "Zde můžete připsat poznámky.",
-"Add field" => "Přidat políčko",
-"Phone" => "Telefon",
-"Email" => "Email",
-"Instant Messaging" => "Instant Messaging",
-"Address" => "Adresa",
-"Note" => "Poznámka",
-"Download contact" => "Stáhnout kontakt",
-"Delete contact" => "Odstranit kontakt",
-"The temporary image has been removed from cache." => "Obrázek byl odstraněn z dočasné paměti.",
-"Edit address" => "Upravit adresu",
-"Type" => "Typ",
-"PO Box" => "PO box",
-"Street address" => "Ulice",
-"Street and number" => "Ulice a číslo",
-"Extended" => "Rozšířené",
-"Apartment number etc." => "Byt číslo atd.",
-"City" => "Město",
-"Region" => "Kraj",
-"E.g. state or province" => "Např. stát nebo okres",
-"Zipcode" => "PSČ",
-"Postal code" => "PSČ",
-"Country" => "Země",
-"Addressbook" => "Adresář",
-"Hon. prefixes" => "Tituly před",
-"Miss" => "Slečna",
-"Ms" => "Ms",
-"Mr" => "Pan",
-"Sir" => "Sir",
-"Mrs" => "Paní",
-"Dr" => "Dr",
-"Given name" => "Křestní jméno",
-"Additional names" => "Další jména",
-"Family name" => "Příjmení",
-"Hon. suffixes" => "Tituly za",
-"J.D." => "JUDr.",
-"M.D." => "MUDr.",
-"D.O." => "D.O.",
-"D.C." => "D.C.",
-"Ph.D." => "Ph.D.",
-"Esq." => "Esq.",
-"Jr." => "ml.",
-"Sn." => "st.",
-"Import a contacts file" => "Importovat soubor kontaktů",
-"Please choose the addressbook" => "Prosím zvolte adresář",
-"create a new addressbook" => "vytvořit nový adresář",
-"Name of new addressbook" => "Jméno nového adresáře",
-"Importing contacts" => "Importování kontaktů",
-"Contacts imported successfully" => "Kontakty úspěšně importovány",
-"Close Dialog" => "Zavírací dialog",
-"Import Addressbook" => "Importovat adresář",
-"Select address book to import to:" => "Vyberte adresář do kterého chcete importovat:",
-"Drop a VCF file to import contacts." => "Pro import kontaktů sem přetáhněte soubor VCF",
-"Select from HD" => "Vybrat z disku",
-"You have no contacts in your addressbook." => "Nemáte žádné kontakty v adresáři.",
-"Add contact" => "Přidat kontakt",
-"Select Address Books" => "Vybrat Adresář",
-"Enter name" => "Vložte jméno",
-"Enter description" => "Vložte popis",
-"CardDAV syncing addresses" => "Adresa pro synchronizaci pomocí CardDAV:",
-"more info" => "víc informací",
-"Primary address (Kontact et al)" => "Hlavní adresa (Kontakt etc)",
-"iOS/OS X" => "iOS/OS X",
-"Show CardDav link" => "Zobrazit odklaz CardDAV:",
-"Show read-only VCF link" => "Zobrazit odkaz VCF pouze pro čtení",
-"Share" => "Sdílet",
-"Download" => "Stažení",
-"Edit" => "Editovat",
-"New Address Book" => "Nový adresář",
-"Name" => "Název",
-"Description" => "Popis",
-"Save" => "Uložit",
-"Cancel" => "Storno",
-"More..." => "Více..."
-);
diff --git a/apps/contacts/l10n/da.php b/apps/contacts/l10n/da.php
deleted file mode 100644
index 97c5f1307c..0000000000
--- a/apps/contacts/l10n/da.php
+++ /dev/null
@@ -1,158 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "Fejl ved (de)aktivering af adressebogen",
-"id is not set." => "Intet ID medsendt.",
-"Cannot update addressbook with an empty name." => "Kan ikke opdatére adressebogen med et tomt navn.",
-"Error updating addressbook." => "Fejl ved opdatering af adressebog",
-"No ID provided" => "Intet ID medsendt",
-"Error setting checksum." => "Kunne ikke sætte checksum.",
-"No categories selected for deletion." => "Der ikke valgt nogle grupper at slette.",
-"No address books found." => "Der blev ikke fundet nogen adressebøger.",
-"No contacts found." => "Der blev ikke fundet nogen kontaktpersoner.",
-"There was an error adding the contact." => "Der opstod en fejl ved tilføjelse af kontaktpersonen.",
-"element name is not set." => "Elementnavnet er ikke medsendt.",
-"Cannot add empty property." => "Kan ikke tilføje en egenskab uden indhold.",
-"At least one of the address fields has to be filled out." => "Der skal udfyldes mindst et adressefelt.",
-"Trying to add duplicate property: " => "Kan ikke tilføje overlappende element.",
-"Information about vCard is incorrect. Please reload the page." => "Informationen om vCard er forkert. Genindlæs siden.",
-"Missing ID" => "Manglende ID",
-"Error parsing VCard for ID: \"" => "Kunne ikke indlæse VCard med ID'et: \"",
-"checksum is not set." => "Checksum er ikke medsendt.",
-"Information about vCard is incorrect. Please reload the page: " => "Informationen om dette VCard stemmer ikke. Genindlæs venligst siden: ",
-"Something went FUBAR. " => "Noget gik grueligt galt. ",
-"No contact ID was submitted." => "Ingen ID for kontakperson medsendt.",
-"Error reading contact photo." => "Kunne ikke indlæse foto for kontakperson.",
-"Error saving temporary file." => "Kunne ikke gemme midlertidig fil.",
-"The loading photo is not valid." => "Billedet under indlæsning er ikke gyldigt.",
-"Contact ID is missing." => "Kontaktperson ID mangler.",
-"No photo path was submitted." => "Der blev ikke medsendt en sti til fotoet.",
-"File doesn't exist:" => "Filen eksisterer ikke:",
-"Error loading image." => "Kunne ikke indlæse billede.",
-"Error getting contact object." => "Fejl ved indlæsning af kontaktpersonobjektet.",
-"Error getting PHOTO property." => "Fejl ved indlæsning af PHOTO feltet.",
-"Error saving contact." => "Kunne ikke gemme kontaktpersonen.",
-"Error resizing image" => "Kunne ikke ændre billedets størrelse",
-"Error cropping image" => "Kunne ikke beskære billedet",
-"Error creating temporary image" => "Kunne ikke oprette midlertidigt billede",
-"Error finding image: " => "Kunne ikke finde billedet: ",
-"Error uploading contacts to storage." => "Kunne ikke uploade kontaktepersoner til midlertidig opbevaring.",
-"There is no error, the file uploaded with success" => "Der skete ingen fejl, filen blev succesfuldt uploadet",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Den uploadede fil er større end upload_max_filesize indstillingen i php.ini",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Den uploadede fil overstiger MAX_FILE_SIZE indstilingen, som specificeret i HTML formularen",
-"The uploaded file was only partially uploaded" => "Filen blev kun delvist uploadet.",
-"No file was uploaded" => "Ingen fil uploadet",
-"Missing a temporary folder" => "Manglende midlertidig mappe.",
-"Couldn't save temporary image: " => "Kunne ikke gemme midlertidigt billede: ",
-"Couldn't load temporary image: " => "Kunne ikke indlæse midlertidigt billede",
-"No file was uploaded. Unknown error" => "Ingen fil blev uploadet. Ukendt fejl.",
-"Contacts" => "Kontaktpersoner",
-"Sorry, this functionality has not been implemented yet" => "Denne funktion er desværre ikke implementeret endnu",
-"Not implemented" => "Ikke implementeret",
-"Couldn't get a valid address." => "Kunne ikke finde en gyldig adresse.",
-"Error" => "Fejl",
-"This property has to be non-empty." => "Dette felt må ikke være tomt.",
-"Couldn't serialize elements." => "Kunne ikke serialisere elementerne.",
-"'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "'deleteProperty' kaldet uden typeargument. Indrapporter fejl på bugs.owncloud.org",
-"Edit name" => "Rediger navn",
-"No files selected for upload." => "Der er ikke valgt nogen filer at uploade.",
-"The file you are trying to upload exceed the maximum size for file uploads on this server." => "Dr.",
-"Select type" => "Vælg type",
-"Result: " => "Resultat:",
-" imported, " => " importeret ",
-" failed." => " fejl.",
-"This is not your addressbook." => "Dette er ikke din adressebog.",
-"Contact could not be found." => "Kontaktperson kunne ikke findes.",
-"Work" => "Arbejde",
-"Home" => "Hjemme",
-"Mobile" => "Mobil",
-"Text" => "SMS",
-"Voice" => "Telefonsvarer",
-"Message" => "Besked",
-"Fax" => "Fax",
-"Video" => "Video",
-"Pager" => "Personsøger",
-"Internet" => "Internet",
-"Birthday" => "Fødselsdag",
-"{name}'s Birthday" => "{name}s fødselsdag",
-"Contact" => "Kontaktperson",
-"Add Contact" => "Tilføj kontaktperson",
-"Import" => "Importer",
-"Addressbooks" => "Adressebøger",
-"Close" => "Luk",
-"Drop photo to upload" => "Drop foto for at uploade",
-"Delete current photo" => "Slet nuværende foto",
-"Edit current photo" => "Rediger nuværende foto",
-"Upload new photo" => "Upload nyt foto",
-"Select photo from ownCloud" => "Vælg foto fra ownCloud",
-"Format custom, Short name, Full name, Reverse or Reverse with comma" => "Formatter som valgfrit, fuldt navn, efternavn først eller efternavn først med komma",
-"Edit name details" => "Rediger navnedetaljer.",
-"Organization" => "Organisation",
-"Delete" => "Slet",
-"Nickname" => "Kaldenavn",
-"Enter nickname" => "Indtast kaldenavn",
-"dd-mm-yyyy" => "dd-mm-åååå",
-"Groups" => "Grupper",
-"Separate groups with commas" => "Opdel gruppenavne med kommaer",
-"Edit groups" => "Rediger grupper",
-"Preferred" => "Foretrukken",
-"Please specify a valid email address." => "Indtast venligst en gyldig email-adresse.",
-"Enter email address" => "Indtast email-adresse",
-"Mail to address" => "Send mail til adresse",
-"Delete email address" => "Slet email-adresse",
-"Enter phone number" => "Indtast telefonnummer",
-"Delete phone number" => "Slet telefonnummer",
-"View on map" => "Vis på kort",
-"Edit address details" => "Rediger adresse detaljer",
-"Add notes here." => "Tilføj noter her.",
-"Add field" => "Tilføj element",
-"Phone" => "Telefon",
-"Email" => "Email",
-"Address" => "Adresse",
-"Note" => "Note",
-"Download contact" => "Download kontaktperson",
-"Delete contact" => "Slet kontaktperson",
-"The temporary image has been removed from cache." => "Det midlertidige billede er ikke længere tilgængeligt.",
-"Edit address" => "Rediger adresse",
-"Type" => "Type",
-"PO Box" => "Postboks",
-"Extended" => "Udvidet",
-"City" => "By",
-"Region" => "Region",
-"Zipcode" => "Postnummer",
-"Country" => "Land",
-"Addressbook" => "Adressebog",
-"Hon. prefixes" => "Foranstillede titler",
-"Miss" => "Frøken",
-"Ms" => "Fru",
-"Mr" => "Hr.",
-"Sir" => "Sir",
-"Mrs" => "Fru",
-"Dr" => "Dr.",
-"Given name" => "Fornavn",
-"Additional names" => "Mellemnavne",
-"Family name" => "Efternavn",
-"Hon. suffixes" => "Efterstillede titler",
-"J.D." => "Cand. Jur.",
-"M.D." => "M.D.",
-"D.O." => "D.O.",
-"D.C." => "D.C.",
-"Ph.D." => "Ph.D.",
-"Esq." => "Esq.",
-"Jr." => "Jr.",
-"Sn." => "Sn.",
-"Import a contacts file" => "Importer fil med kontaktpersoner",
-"Please choose the addressbook" => "Vælg venligst adressebog",
-"create a new addressbook" => "Opret ny adressebog",
-"Name of new addressbook" => "Navn på ny adressebog",
-"Importing contacts" => "Importerer kontaktpersoner",
-"You have no contacts in your addressbook." => "Du har ingen kontaktpersoner i din adressebog.",
-"Add contact" => "Tilføj kontaktpeson.",
-"CardDAV syncing addresses" => "CardDAV synkroniserings adresse",
-"more info" => "mere info",
-"Primary address (Kontact et al)" => "Primær adresse (Kontak m. fl.)",
-"iOS/OS X" => "iOS/OS X",
-"Download" => "Download",
-"Edit" => "Rediger",
-"New Address Book" => "Ny adressebog",
-"Save" => "Gem",
-"Cancel" => "Fortryd"
-);
diff --git a/apps/contacts/l10n/de.php b/apps/contacts/l10n/de.php
deleted file mode 100644
index c2e8884fc2..0000000000
--- a/apps/contacts/l10n/de.php
+++ /dev/null
@@ -1,229 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "(De-)Aktivierung des Adressbuches fehlgeschlagen",
-"id is not set." => "ID ist nicht angegeben.",
-"Cannot update addressbook with an empty name." => "Adressbuch kann nicht mir leeren Namen aktualisiert werden.",
-"Error updating addressbook." => "Adressbuch aktualisieren fehlgeschlagen.",
-"No ID provided" => "Keine ID angegeben",
-"Error setting checksum." => "Fehler beim Setzen der Prüfsumme.",
-"No categories selected for deletion." => "Keine Kategorien zum Löschen ausgewählt.",
-"No address books found." => "Keine Adressbücher gefunden.",
-"No contacts found." => "Keine Kontakte gefunden.",
-"There was an error adding the contact." => "Erstellen des Kontakts fehlgeschlagen.",
-"element name is not set." => "Kein Name für das Element angegeben.",
-"Could not parse contact: " => "Konnte folgenden Kontakt nicht verarbeiten:",
-"Cannot add empty property." => "Feld darf nicht leer sein.",
-"At least one of the address fields has to be filled out." => "Mindestens eines der Adressfelder muss ausgefüllt werden.",
-"Trying to add duplicate property: " => "Versuche doppelte Eigenschaft hinzuzufügen: ",
-"Missing IM parameter." => "IM-Parameter fehlt.",
-"Unknown IM: " => "IM unbekannt:",
-"Information about vCard is incorrect. Please reload the page." => "Die Information der vCard ist fehlerhaft. Bitte aktualisieren Sie die Seite.",
-"Missing ID" => "Fehlende ID",
-"Error parsing VCard for ID: \"" => "Fehler beim Einlesen der VCard für die ID: \"",
-"checksum is not set." => "Keine Prüfsumme angegeben.",
-"Information about vCard is incorrect. Please reload the page: " => "Die Informationen zur vCard sind fehlerhaft. Bitte Seite neu laden: ",
-"Something went FUBAR. " => "Irgendwas ist hier so richtig schief gelaufen. ",
-"No contact ID was submitted." => "Es wurde keine Kontakt-ID übermittelt.",
-"Error reading contact photo." => "Fehler beim Auslesen des Kontaktfotos.",
-"Error saving temporary file." => "Fehler beim Speichern der temporären Datei.",
-"The loading photo is not valid." => "Das Kontaktfoto ist fehlerhaft.",
-"Contact ID is missing." => "Keine Kontakt-ID angegeben.",
-"No photo path was submitted." => "Kein Foto-Pfad übermittelt.",
-"File doesn't exist:" => "Datei existiert nicht: ",
-"Error loading image." => "Fehler beim Laden des Bildes.",
-"Error getting contact object." => "Fehler beim Abruf des Kontakt-Objektes.",
-"Error getting PHOTO property." => "Fehler beim Abrufen der PHOTO-Eigenschaft.",
-"Error saving contact." => "Fehler beim Speichern des Kontaktes.",
-"Error resizing image" => "Fehler bei der Größenänderung des Bildes",
-"Error cropping image" => "Fehler beim Zuschneiden des Bildes",
-"Error creating temporary image" => "Fehler beim Erstellen des temporären Bildes",
-"Error finding image: " => "Fehler beim Suchen des Bildes: ",
-"Error uploading contacts to storage." => "Übertragen der Kontakte fehlgeschlagen.",
-"There is no error, the file uploaded with success" => "Alles bestens, Datei erfolgreich übertragen.",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Datei größer, als durch die upload_max_filesize Direktive in php.ini erlaubt",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Datei größer, als die MAX_FILE_SIZE Direktive erlaubt, die im HTML Formular spezifiziert ist",
-"The uploaded file was only partially uploaded" => "Datei konnte nur teilweise übertragen werden",
-"No file was uploaded" => "Keine Datei konnte übertragen werden.",
-"Missing a temporary folder" => "Kein temporärer Ordner vorhanden",
-"Couldn't save temporary image: " => "Konnte das temporäre Bild nicht speichern:",
-"Couldn't load temporary image: " => "Konnte das temporäre Bild nicht laden:",
-"No file was uploaded. Unknown error" => "Keine Datei hochgeladen. Unbekannter Fehler",
-"Contacts" => "Kontakte",
-"Sorry, this functionality has not been implemented yet" => "Diese Funktion steht leider noch nicht zur Verfügung",
-"Not implemented" => "Nicht verfügbar",
-"Couldn't get a valid address." => "Konnte keine gültige Adresse abrufen.",
-"Error" => "Fehler",
-"You do not have permission to add contacts to " => "Sie besitzen nicht die erforderlichen Rechte, um Kontakte hinzuzufügen",
-"Please select one of your own address books." => "Bitte wählen Sie eines Ihrer Adressbücher aus.",
-"Permission error" => "Berechtigungsfehler",
-"This property has to be non-empty." => "Dieses Feld darf nicht leer sein.",
-"Couldn't serialize elements." => "Konnte Elemente nicht serialisieren",
-"'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "'deleteProperty' wurde ohne Argumente aufgerufen. Bitte melden Sie dies auf bugs.owncloud.org",
-"Edit name" => "Name ändern",
-"No files selected for upload." => "Keine Datei(en) zum Hochladen ausgewählt.",
-"The file you are trying to upload exceed the maximum size for file uploads on this server." => "Die Datei, die Sie hochladen möchten, überschreitet die maximale Größe für Datei-Uploads auf diesem Server.",
-"Error loading profile picture." => "Fehler beim Laden des Profilbildes.",
-"Select type" => "Wähle Typ",
-"Some contacts are marked for deletion, but not deleted yet. Please wait for them to be deleted." => "Einige zum Löschen markiert Kontakte wurden noch nicht gelöscht. Bitte warten.",
-"Do you want to merge these address books?" => "Möchten Sie diese Adressbücher zusammenführen?",
-"Result: " => "Ergebnis: ",
-" imported, " => " importiert, ",
-" failed." => " fehlgeschlagen.",
-"Displayname cannot be empty." => "Der Anzeigename darf nicht leer sein.",
-"Addressbook not found: " => "Adressbuch nicht gefunden:",
-"This is not your addressbook." => "Dies ist nicht Ihr Adressbuch.",
-"Contact could not be found." => "Kontakt konnte nicht gefunden werden.",
-"Jabber" => "Jabber",
-"AIM" => "AIM",
-"MSN" => "MSN",
-"Twitter" => "Twitter",
-"GoogleTalk" => "GoogleTalk",
-"Facebook" => "Facebook",
-"XMPP" => "XMPP",
-"ICQ" => "ICQ",
-"Yahoo" => "Yahoo",
-"Skype" => "Skype",
-"QQ" => "QQ",
-"GaduGadu" => "GaduGadu",
-"Work" => "Arbeit",
-"Home" => "Zuhause",
-"Other" => "Andere",
-"Mobile" => "Mobil",
-"Text" => "Text",
-"Voice" => "Anruf",
-"Message" => "Mitteilung",
-"Fax" => "Fax",
-"Video" => "Video",
-"Pager" => "Pager",
-"Internet" => "Internet",
-"Birthday" => "Geburtstag",
-"Business" => "Geschäftlich",
-"Call" => "Anruf",
-"Clients" => "Kunden",
-"Deliverer" => "Lieferant",
-"Holidays" => "Feiertage",
-"Ideas" => "Ideen",
-"Journey" => "Reise",
-"Jubilee" => "Jubiläum",
-"Meeting" => "Besprechung",
-"Personal" => "Persönlich",
-"Projects" => "Projekte",
-"Questions" => "Fragen",
-"{name}'s Birthday" => "Geburtstag von {name}",
-"Contact" => "Kontakt",
-"You do not have the permissions to edit this contact." => "Sie besitzen nicht die erforderlichen Rechte, um diesen Kontakt zu bearbeiten.",
-"You do not have the permissions to delete this contact." => "Sie besitzen nicht die erforderlichen Rechte, um diesen Kontakte zu löschen.",
-"Add Contact" => "Kontakt hinzufügen",
-"Import" => "Importieren",
-"Settings" => "Einstellungen",
-"Addressbooks" => "Adressbücher",
-"Close" => "Schließen",
-"Keyboard shortcuts" => "Tastaturbefehle",
-"Navigation" => "Navigation",
-"Next contact in list" => "Nächster Kontakt aus der Liste",
-"Previous contact in list" => "Vorheriger Kontakt aus der Liste",
-"Expand/collapse current addressbook" => "Ausklappen/Einklappen des Adressbuches",
-"Next addressbook" => "Nächstes Adressbuch",
-"Previous addressbook" => "Vorheriges Adressbuch",
-"Actions" => "Aktionen",
-"Refresh contacts list" => "Kontaktliste neu laden",
-"Add new contact" => "Neuen Kontakt hinzufügen",
-"Add new addressbook" => "Neues Adressbuch hinzufügen",
-"Delete current contact" => "Aktuellen Kontakt löschen",
-"Drop photo to upload" => "Ziehen Sie ein Foto zum Hochladen hierher",
-"Delete current photo" => "Derzeitiges Foto löschen",
-"Edit current photo" => "Foto ändern",
-"Upload new photo" => "Neues Foto hochladen",
-"Select photo from ownCloud" => "Foto aus der ownCloud auswählen",
-"Format custom, Short name, Full name, Reverse or Reverse with comma" => "Format benutzerdefiniert, Kurzname, Vollname, Rückwärts oder Rückwärts mit Komma",
-"Edit name details" => "Name ändern",
-"Organization" => "Organisation",
-"Delete" => "Löschen",
-"Nickname" => "Spitzname",
-"Enter nickname" => "Spitzname angeben",
-"Web site" => "Webseite",
-"http://www.somesite.com" => "http://www.somesite.com",
-"Go to web site" => "Webseite aufrufen",
-"dd-mm-yyyy" => "dd.mm.yyyy",
-"Groups" => "Gruppen",
-"Separate groups with commas" => "Gruppen mit Komma getrennt",
-"Edit groups" => "Gruppen editieren",
-"Preferred" => "Bevorzugt",
-"Please specify a valid email address." => "Bitte eine gültige E-Mail-Adresse angeben.",
-"Enter email address" => "E-Mail-Adresse angeben",
-"Mail to address" => "E-Mail an diese Adresse schreiben",
-"Delete email address" => "E-Mail-Adresse löschen",
-"Enter phone number" => "Telefonnummer angeben",
-"Delete phone number" => "Telefonnummer löschen",
-"Instant Messenger" => "Instant Messenger",
-"Delete IM" => "IM löschen",
-"View on map" => "Auf Karte anzeigen",
-"Edit address details" => "Adressinformationen ändern",
-"Add notes here." => "Füge hier Notizen ein.",
-"Add field" => "Feld hinzufügen",
-"Phone" => "Telefon",
-"Email" => "E-Mail",
-"Instant Messaging" => "Instant Messaging",
-"Address" => "Adresse",
-"Note" => "Notiz",
-"Download contact" => "Kontakt herunterladen",
-"Delete contact" => "Kontakt löschen",
-"The temporary image has been removed from cache." => "Das temporäre Bild wurde aus dem Cache gelöscht.",
-"Edit address" => "Adresse ändern",
-"Type" => "Typ",
-"PO Box" => "Postfach",
-"Street address" => "Straßenanschrift",
-"Street and number" => "Straße und Nummer",
-"Extended" => "Erweitert",
-"Apartment number etc." => "Wohnungsnummer usw.",
-"City" => "Stadt",
-"Region" => "Region",
-"E.g. state or province" => "Z.B. Staat oder Bezirk",
-"Zipcode" => "Postleitzahl",
-"Postal code" => "PLZ",
-"Country" => "Land",
-"Addressbook" => "Adressbuch",
-"Hon. prefixes" => "Höflichkeitspräfixe",
-"Miss" => "Frau",
-"Ms" => "Frau",
-"Mr" => "Herr",
-"Sir" => "Herr",
-"Mrs" => "Frau",
-"Dr" => "Dr.",
-"Given name" => "Vorname",
-"Additional names" => "Zusätzliche Namen",
-"Family name" => "Familienname",
-"Hon. suffixes" => "Höflichkeitssuffixe",
-"J.D." => "Dr. Jur.",
-"M.D." => "Dr. med.",
-"D.O." => "DGOM",
-"D.C." => "MChiro",
-"Ph.D." => "Dr.",
-"Esq." => "Hochwohlgeborenen",
-"Jr." => "Jr.",
-"Sn." => "Senior",
-"Import a contacts file" => "Kontaktdatei importieren",
-"Please choose the addressbook" => "Bitte Adressbuch auswählen",
-"create a new addressbook" => "Neues Adressbuch erstellen",
-"Name of new addressbook" => "Name des neuen Adressbuchs",
-"Importing contacts" => "Kontakte werden importiert",
-"You have no contacts in your addressbook." => "Sie haben keine Kontakte im Adressbuch.",
-"Add contact" => "Kontakt hinzufügen",
-"Select Address Books" => "Wähle Adressbuch",
-"Enter name" => "Name eingeben",
-"Enter description" => "Beschreibung eingeben",
-"CardDAV syncing addresses" => "CardDAV Sync-Adressen",
-"more info" => "mehr Informationen",
-"Primary address (Kontact et al)" => "Primäre Adresse (für Kontakt o.ä.)",
-"iOS/OS X" => "iOS/OS X",
-"Show CardDav link" => "CardDav-Link anzeigen",
-"Show read-only VCF link" => "Schreibgeschützten VCF-Link anzeigen",
-"Share" => "Teilen",
-"Download" => "Herunterladen",
-"Edit" => "Bearbeiten",
-"New Address Book" => "Neues Adressbuch",
-"Name" => "Name",
-"Description" => "Beschreibung",
-"Save" => "Speichern",
-"Cancel" => "Abbrechen",
-"More..." => "Mehr..."
-);
diff --git a/apps/contacts/l10n/el.php b/apps/contacts/l10n/el.php
deleted file mode 100644
index edca7d7b96..0000000000
--- a/apps/contacts/l10n/el.php
+++ /dev/null
@@ -1,235 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "Σφάλμα (απ)ενεργοποίησης βιβλίου διευθύνσεων",
-"id is not set." => "δεν ορίστηκε id",
-"Cannot update addressbook with an empty name." => "Δε μπορεί να γίνει αλλαγή βιβλίου διευθύνσεων χωρίς όνομα",
-"Error updating addressbook." => "Σφάλμα ενημέρωσης βιβλίου διευθύνσεων.",
-"No ID provided" => "Δε δόθηκε ID",
-"Error setting checksum." => "Λάθος κατά τον ορισμό checksum ",
-"No categories selected for deletion." => "Δε επελέγησαν κατηγορίες για διαγραφή",
-"No address books found." => "Δε βρέθηκε βιβλίο διευθύνσεων",
-"No contacts found." => "Δεν βρέθηκαν επαφές",
-"There was an error adding the contact." => "Σφάλμα κατά την προσθήκη επαφής.",
-"element name is not set." => "δεν ορίστηκε όνομα στοιχείου",
-"Could not parse contact: " => "Δε αναγνώστηκε η επαφή",
-"Cannot add empty property." => "Αδύνατη προσθήκη κενής ιδιότητας.",
-"At least one of the address fields has to be filled out." => "Πρέπει να συμπληρωθεί τουλάχιστον ένα από τα παιδία διεύθυνσης.",
-"Trying to add duplicate property: " => "Προσπάθεια προσθήκης διπλότυπης ιδιότητας:",
-"Missing IM parameter." => "Λείπει IM παράμετρος.",
-"Unknown IM: " => "Άγνωστο IM:",
-"Information about vCard is incorrect. Please reload the page." => "Οι πληροφορίες σχετικά με vCard είναι εσφαλμένες. Παρακαλώ επαναφορτώστε τη σελίδα.",
-"Missing ID" => "Λείπει ID",
-"Error parsing VCard for ID: \"" => "Σφάλμα κατά την ανάγνωση του VCard για το ID:\"",
-"checksum is not set." => "δε ορίστηκε checksum ",
-"Information about vCard is incorrect. Please reload the page: " => "Οι πληροφορίες για τη vCard είναι λανθασμένες.Παρακαλώ ξαναφορτώστε τη σελίδα: ",
-"Something went FUBAR. " => "Κάτι χάθηκε στο άγνωστο. ",
-"No contact ID was submitted." => "Δε υπεβλήθει ID επαφής",
-"Error reading contact photo." => "Σφάλμα ανάγνωσης εικόνας επαφής",
-"Error saving temporary file." => "Σφάλμα αποθήκευσης προσωρινού αρχείου",
-"The loading photo is not valid." => "Η φορτωμένη φωτογραφία δεν είναι έγκυρη",
-"Contact ID is missing." => "Λείπει ID επαφής",
-"No photo path was submitted." => "Δε δόθηκε διαδρομή εικόνας",
-"File doesn't exist:" => "Το αρχείο δεν υπάρχει:",
-"Error loading image." => "Σφάλμα φόρτωσης εικόνας",
-"Error getting contact object." => "Σφάλμα κατά τη λήψη αντικειμένου επαφής",
-"Error getting PHOTO property." => "Σφάλμα κατά τη λήψη ιδιοτήτων ΦΩΤΟΓΡΑΦΙΑΣ.",
-"Error saving contact." => "Σφάλμα κατά την αποθήκευση επαφής.",
-"Error resizing image" => "Σφάλμα κατά την αλλαγή μεγέθους εικόνας",
-"Error cropping image" => "Σφάλμα κατά την περικοπή εικόνας",
-"Error creating temporary image" => "Σφάλμα κατά την δημιουργία προσωρινής εικόνας",
-"Error finding image: " => "Σφάλμα κατά την εύρεση της εικόνας: ",
-"Error uploading contacts to storage." => "Σφάλμα κατά την αποθήκευση επαφών",
-"There is no error, the file uploaded with success" => "Δεν υπάρχει σφάλμα, το αρχείο ανέβηκε με επιτυχία ",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Το μέγεθος του αρχείου ξεπερνάει το upload_max_filesize του php.ini",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Το ανεβασμένο αρχείο υπερβαίνει το MAX_FILE_SIZE που ορίζεται στην  HTML φόρμα",
-"The uploaded file was only partially uploaded" => "Το αρχείο ανέβηκε μερικώς",
-"No file was uploaded" => "Δεν ανέβηκε κάποιο αρχείο",
-"Missing a temporary folder" => "Λείπει ο προσωρινός φάκελος",
-"Couldn't save temporary image: " => "Δεν ήταν δυνατή η αποθήκευση της προσωρινής εικόνας: ",
-"Couldn't load temporary image: " => "Δεν ήταν δυνατή η φόρτωση της προσωρινής εικόνας: ",
-"No file was uploaded. Unknown error" => "Δεν ανέβηκε κάποιο αρχείο. Άγνωστο σφάλμα",
-"Contacts" => "Επαφές",
-"Sorry, this functionality has not been implemented yet" => "Λυπούμαστε, αυτή η λειτουργία δεν έχει υλοποιηθεί ακόμα",
-"Not implemented" => "Δεν έχει υλοποιηθεί",
-"Couldn't get a valid address." => "Αδυναμία λήψης έγκυρης διεύθυνσης",
-"Error" => "Σφάλμα",
-"You do not have permission to add contacts to " => "Δεν έχετε επαρκή δικαιώματα για προσθέσετε επαφές στο ",
-"Please select one of your own address books." => "Παρακαλούμε επιλέξτε ένα από τα δικάς σας βιβλία διευθύνσεων.",
-"Permission error" => "Σφάλμα δικαιωμάτων",
-"This property has to be non-empty." => "Το πεδίο δεν πρέπει να είναι άδειο.",
-"Couldn't serialize elements." => "Αδύνατο να μπουν σε σειρά τα στοιχεία",
-"'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "το 'deleteProperty' καλέστηκε χωρίς  without type argument. Παρακαλώ αναφέρατε στο bugs.owncloud.org",
-"Edit name" => "Αλλαγή ονόματος",
-"No files selected for upload." => "Δεν επιλέχτηκαν αρχεία για μεταφόρτωση",
-"The file you are trying to upload exceed the maximum size for file uploads on this server." => "Το αρχείο που προσπαθείτε να ανεβάσετε υπερβαίνει το μέγιστο μέγεθος για τις προσθήκες αρχείων σε αυτόν τον server.",
-"Error loading profile picture." => "Σφάλμα στην φόρτωση εικόνας προφίλ.",
-"Select type" => "Επιλογή τύπου",
-"Some contacts are marked for deletion, but not deleted yet. Please wait for them to be deleted." => "Κάποιες επαφές σημειώθηκαν προς διαγραφή,δεν έχουν διαγραφεί ακόμα. Παρακαλώ περιμένετε μέχρι να διαγραφούν.",
-"Do you want to merge these address books?" => "Επιθυμείτε να συγχωνεύσετε αυτά τα δύο βιβλία διευθύνσεων?",
-"Result: " => "Αποτέλεσμα: ",
-" imported, " => " εισάγεται,",
-" failed." => " απέτυχε.",
-"Displayname cannot be empty." => "Το όνομα προβολής δεν μπορεί να είναι κενό. ",
-"Addressbook not found: " => "Το βιβλίο διευθύνσεων δεν βρέθηκε:",
-"This is not your addressbook." => "Αυτό δεν είναι το βιβλίο διευθύνσεων σας.",
-"Contact could not be found." => "Η επαφή δεν μπόρεσε να βρεθεί.",
-"Jabber" => "Jabber",
-"AIM" => "AIM",
-"MSN" => "MSN",
-"Twitter" => "Twitter",
-"GoogleTalk" => "GoogleTalk",
-"Facebook" => "Facebook",
-"XMPP" => "XMPP",
-"ICQ" => "ICQ",
-"Yahoo" => "Yahoo",
-"Skype" => "Skype",
-"QQ" => "QQ",
-"GaduGadu" => "GaduGadu",
-"Work" => "Εργασία",
-"Home" => "Σπίτι",
-"Other" => "Άλλο",
-"Mobile" => "Κινητό",
-"Text" => "Κείμενο",
-"Voice" => "Ομιλία",
-"Message" => "Μήνυμα",
-"Fax" => "Φαξ",
-"Video" => "Βίντεο",
-"Pager" => "Βομβητής",
-"Internet" => "Διαδίκτυο",
-"Birthday" => "Γενέθλια",
-"Business" => "Επιχείρηση",
-"Call" => "Κάλεσε",
-"Clients" => "Πελάτες",
-"Deliverer" => "Προμηθευτής",
-"Holidays" => "Διακοπές",
-"Ideas" => "Ιδέες",
-"Journey" => "Ταξίδι",
-"Jubilee" => "Ιωβηλαίο",
-"Meeting" => "Συνάντηση",
-"Personal" => "Προσωπικό",
-"Projects" => "Έργα",
-"Questions" => "Ερωτήσεις",
-"{name}'s Birthday" => "{name} έχει Γενέθλια",
-"Contact" => "Επαφή",
-"You do not have the permissions to edit this contact." => "Δεν διαθέτε επαρκή δικαιώματα για την επεξεργασία αυτής της επαφής.",
-"You do not have the permissions to delete this contact." => "Δεν διαθέτε επαρκή δικαιώματα για την διαγραφή αυτής της επαφής.",
-"Add Contact" => "Προσθήκη επαφής",
-"Import" => "Εισαγωγή",
-"Settings" => "Ρυθμίσεις",
-"Addressbooks" => "Βιβλία διευθύνσεων",
-"Close" => "Κλείσιμο  ",
-"Keyboard shortcuts" => "Συντομεύσεις πλητρολογίου",
-"Navigation" => "Πλοήγηση",
-"Next contact in list" => "Επόμενη επαφή στη λίστα",
-"Previous contact in list" => "Προηγούμενη επαφή στη λίστα",
-"Expand/collapse current addressbook" => "Ανάπτυξη/σύμπτυξη τρέχοντος βιβλίου διευθύνσεων",
-"Next addressbook" => "Επόμενο βιβλίο διευθύνσεων",
-"Previous addressbook" => "Προηγούμενο βιβλίο διευθύνσεων",
-"Actions" => "Ενέργειες",
-"Refresh contacts list" => "Ανανέωσε τη λίστα επαφών",
-"Add new contact" => "Προσθήκη νέας επαφής",
-"Add new addressbook" => "Προσθήκη νέου βιβλίου επαφών",
-"Delete current contact" => "Διαγραφή τρέχουσας επαφής",
-"Drop photo to upload" => "Ρίξε μια φωτογραφία για ανέβασμα",
-"Delete current photo" => "Διαγραφή τρέχουσας φωτογραφίας",
-"Edit current photo" => "Επεξεργασία τρέχουσας φωτογραφίας",
-"Upload new photo" => "Ανέβασε νέα φωτογραφία",
-"Select photo from ownCloud" => "Επέλεξε φωτογραφία από το ownCloud",
-"Format custom, Short name, Full name, Reverse or Reverse with comma" => "Format custom, Όνομα, Επώνυμο, Αντίστροφο ή Αντίστροφο με κόμμα",
-"Edit name details" => "Αλλάξτε τις λεπτομέρειες ονόματος",
-"Organization" => "Οργανισμός",
-"Delete" => "Διαγραφή",
-"Nickname" => "Παρατσούκλι",
-"Enter nickname" => "Εισάγετε παρατσούκλι",
-"Web site" => "Ιστότοπος",
-"http://www.somesite.com" => "http://www.somesite.com",
-"Go to web site" => "Πήγαινε στον ιστότοπο",
-"dd-mm-yyyy" => "ΗΗ-ΜΜ-ΕΕΕΕ",
-"Groups" => "Ομάδες",
-"Separate groups with commas" => "Διαχώρισε τις ομάδες με κόμμα ",
-"Edit groups" => "Επεξεργασία ομάδων",
-"Preferred" => "Προτιμώμενο",
-"Please specify a valid email address." => "Παρακαλώ εισήγαγε μια έγκυρη διεύθυνση ηλεκτρονικού ταχυδρομείου",
-"Enter email address" => "Εισήγαγε  διεύθυνση ηλεκτρονικού ταχυδρομείου",
-"Mail to address" => "Αποστολή σε διεύθυνση",
-"Delete email address" => "Διαγραφή διεύθυνση email",
-"Enter phone number" => "Εισήγαγε αριθμό τηλεφώνου",
-"Delete phone number" => "Διέγραψε αριθμό τηλεφώνου",
-"Instant Messenger" => "Instant Messenger",
-"Delete IM" => "Διαγραφή IM",
-"View on map" => "Προβολή στο χάρτη",
-"Edit address details" => "Επεξεργασία λεπτομερειών διεύθυνσης",
-"Add notes here." => "Πρόσθεσε τις σημειώσεις εδώ",
-"Add field" => "Προσθήκη πεδίου",
-"Phone" => "Τηλέφωνο",
-"Email" => "Email",
-"Instant Messaging" => "Άμεσα μυνήματα",
-"Address" => "Διεύθυνση",
-"Note" => "Σημείωση",
-"Download contact" => "Λήψη επαφής",
-"Delete contact" => "Διαγραφή επαφής",
-"The temporary image has been removed from cache." => "Η προσωρινή εικόνα αφαιρέθηκε από την κρυφή μνήμη.",
-"Edit address" => "Επεξεργασία διεύθυνσης",
-"Type" => "Τύπος",
-"PO Box" => "Ταχ. Θυρίδα",
-"Street address" => "Διεύθυνση οδού",
-"Street and number" => "Οδός και αριθμός",
-"Extended" => "Εκτεταμένη",
-"Apartment number etc." => "Αριθμός διαμερίσματος",
-"City" => "Πόλη",
-"Region" => "Περιοχή",
-"E.g. state or province" => "Π.χ. Πολιτεία ή επαρχεία",
-"Zipcode" => "Τ.Κ.",
-"Postal code" => "Ταχυδρομικός Κωδικός",
-"Country" => "Χώρα",
-"Addressbook" => "Βιβλίο διευθύνσεων",
-"Hon. prefixes" => "προθέματα",
-"Miss" => "Δις",
-"Ms" => "Κα",
-"Mr" => "Κα",
-"Sir" => "Σερ",
-"Mrs" => "Κα",
-"Dr" => "Δρ.",
-"Given name" => "Όνομα",
-"Additional names" => "Επιπλέον ονόματα",
-"Family name" => "Επώνυμο",
-"Hon. suffixes" => "καταλήξεις",
-"J.D." => "J.D.",
-"M.D." => "M.D.",
-"D.O." => "D.O.",
-"D.C." => "D.C.",
-"Ph.D." => "Ph.D.",
-"Esq." => "Esq.",
-"Jr." => "Jr.",
-"Sn." => "Sn.",
-"Import a contacts file" => "Εισαγωγή αρχείου επαφών",
-"Please choose the addressbook" => "Παρακαλώ επέλεξε βιβλίο διευθύνσεων",
-"create a new addressbook" => "Δημιουργία νέου βιβλίου διευθύνσεων",
-"Name of new addressbook" => "Όνομα νέου βιβλίου διευθύνσεων",
-"Importing contacts" => "Εισαγωγή επαφών",
-"Contacts imported successfully" => "Οι επαφές εισήχθησαν επιτυχώς",
-"Close Dialog" => "Κλείσιμο διαλόγου",
-"Import Addressbook" => "Εισαγωγή βιβλίου διευθύνσεων",
-"Select address book to import to:" => "Επέλεξε σε ποιο βιβλίο διευθύνσεων για εισαγωγή:",
-"Drop a VCF file to import contacts." => "Εισάγεται ένα VCF αρχείο για εισαγωγή επαφών",
-"Select from HD" => "Επιλογή από HD",
-"You have no contacts in your addressbook." => "Δεν έχεις επαφές στο βιβλίο διευθύνσεων",
-"Add contact" => "Προσθήκη επαφής",
-"Select Address Books" => "Επέλεξε βιβλίο διευθύνσεων",
-"Enter name" => "Εισαγωγή ονόματος",
-"Enter description" => "Εισαγωγή περιγραφής",
-"CardDAV syncing addresses" => "συγχρονισμός διευθύνσεων μέσω CardDAV ",
-"more info" => "περισσότερες πληροφορίες",
-"Primary address (Kontact et al)" => "Κύρια διεύθυνση",
-"iOS/OS X" => "iOS/OS X",
-"Show CardDav link" => "Εμφάνιση συνδέσμου CardDav",
-"Show read-only VCF link" => "Εμφάνιση συνδέσμου VCF μόνο για ανάγνωση",
-"Share" => "Μοιράσου",
-"Download" => "Λήψη",
-"Edit" => "Επεξεργασία",
-"New Address Book" => "Νέο βιβλίο διευθύνσεων",
-"Name" => "Όνομα",
-"Description" => "Περιγραφή",
-"Save" => "Αποθήκευση",
-"Cancel" => "Ακύρωση",
-"More..." => "Περισσότερα..."
-);
diff --git a/apps/contacts/l10n/eo.php b/apps/contacts/l10n/eo.php
deleted file mode 100644
index e4eb06db2a..0000000000
--- a/apps/contacts/l10n/eo.php
+++ /dev/null
@@ -1,190 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "Eraro dum (mal)aktivigo de adresaro.",
-"id is not set." => "identigilo ne agordiĝis.",
-"Cannot update addressbook with an empty name." => "Ne eblas ĝisdatigi adresaron kun malplena nomo.",
-"Error updating addressbook." => "Eraro dum ĝisdatigo de adresaro.",
-"No ID provided" => "Neniu identigilo proviziĝis.",
-"Error setting checksum." => "Eraro dum agordado de kontrolsumo.",
-"No categories selected for deletion." => "Neniu kategorio elektiĝis por forigi.",
-"No address books found." => "Neniu adresaro troviĝis.",
-"No contacts found." => "Neniu kontakto troviĝis.",
-"There was an error adding the contact." => "Eraro okazis dum aldono de kontakto.",
-"element name is not set." => "eronomo ne agordiĝis.",
-"Could not parse contact: " => "Ne eblis analizi kontakton:",
-"Cannot add empty property." => "Ne eblas aldoni malplenan propraĵon.",
-"At least one of the address fields has to be filled out." => "Almenaŭ unu el la adreskampoj necesas pleniĝi.",
-"Trying to add duplicate property: " => "Provante aldoni duobligitan propraĵon:",
-"Information about vCard is incorrect. Please reload the page." => "Informo pri vCard estas malĝusta. Bonvolu reŝargi la paĝon.",
-"Missing ID" => "Mankas identigilo",
-"Error parsing VCard for ID: \"" => "Eraro dum analizo de VCard por identigilo:",
-"checksum is not set." => "kontrolsumo ne agordiĝis.",
-"Information about vCard is incorrect. Please reload the page: " => "Informo pri vCard malĝustas. Bonvolu reŝargi la paĝon:",
-"Something went FUBAR. " => "Io FUBAR-is.",
-"No contact ID was submitted." => "Neniu kontaktidentigilo sendiĝis.",
-"Error reading contact photo." => "Eraro dum lego de kontakta foto.",
-"Error saving temporary file." => "Eraro dum konservado de provizora dosiero.",
-"The loading photo is not valid." => "La alŝutata foto ne validas.",
-"Contact ID is missing." => "Kontaktidentigilo mankas.",
-"No photo path was submitted." => "Neniu vojo al foto sendiĝis.",
-"File doesn't exist:" => "Dosiero ne ekzistas:",
-"Error loading image." => "Eraro dum ŝargado de bildo.",
-"Error getting contact object." => "Eraro dum ekhaviĝis kontakta objekto.",
-"Error getting PHOTO property." => "Eraro dum ekhaviĝis la propraĵon PHOTO.",
-"Error saving contact." => "Eraro dum konserviĝis kontakto.",
-"Error resizing image" => "Eraro dum aligrandiĝis bildo",
-"Error cropping image" => "Eraro dum stuciĝis bildo.",
-"Error creating temporary image" => "Eraro dum kreiĝis provizora bildo.",
-"Error finding image: " => "Eraro dum serĉo de bildo: ",
-"Error uploading contacts to storage." => "Eraro dum alŝutiĝis kontaktoj al konservejo.",
-"There is no error, the file uploaded with success" => "Ne estas eraro, la dosiero alŝutiĝis sukcese.",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "La alŝutita dosiero transpasas la preskribon upload_max_filesize en php.ini",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "La alŝutita dosiero transpasas la preskribon MAX_FILE_SIZE kiu specifiĝis en la HTML-formularo",
-"The uploaded file was only partially uploaded" => "la alŝutita dosiero nur parte alŝutiĝis",
-"No file was uploaded" => "Neniu dosiero alŝutiĝis.",
-"Missing a temporary folder" => "Mankas provizora dosierujo.",
-"Couldn't save temporary image: " => "Ne eblis konservi provizoran bildon: ",
-"Couldn't load temporary image: " => "Ne eblis ŝargi provizoran bildon: ",
-"No file was uploaded. Unknown error" => "Neniu dosiero alŝutiĝis. Nekonata eraro.",
-"Contacts" => "Kontaktoj",
-"Sorry, this functionality has not been implemented yet" => "Pardonu, ĉi tiu funkcio ankoraŭ ne estas realigita.",
-"Not implemented" => "Ne disponebla",
-"Couldn't get a valid address." => "Ne eblis ekhavi validan adreson.",
-"Error" => "Eraro",
-"This property has to be non-empty." => "Ĉi tiu propraĵo devas ne esti malplena.",
-"Couldn't serialize elements." => "Ne eblis seriigi erojn.",
-"Edit name" => "Redakti nomon",
-"No files selected for upload." => "Neniu dosiero elektita por alŝuto.",
-"The file you are trying to upload exceed the maximum size for file uploads on this server." => "La dosiero, kiun vi provas alŝuti, transpasas la maksimuman grandon por dosieraj alŝutoj en ĉi tiu servilo.",
-"Select type" => "Elektu tipon",
-"Result: " => "Rezulto: ",
-" imported, " => " enportoj, ",
-" failed." => "malsukcesoj.",
-"Addressbook not found: " => "Adresaro ne troviĝis:",
-"This is not your addressbook." => "Ĉi tiu ne estas via adresaro.",
-"Contact could not be found." => "Ne eblis trovi la kontakton.",
-"Work" => "Laboro",
-"Home" => "Hejmo",
-"Other" => "Alia",
-"Mobile" => "Poŝtelefono",
-"Text" => "Teksto",
-"Voice" => "Voĉo",
-"Message" => "Mesaĝo",
-"Fax" => "Fakso",
-"Video" => "Videaĵo",
-"Pager" => "Televokilo",
-"Internet" => "Interreto",
-"Birthday" => "Naskiĝotago",
-"Business" => "Negoco",
-"Call" => "Voko",
-"Clients" => "Klientoj",
-"Deliverer" => "Liveranto",
-"Holidays" => "Ferioj",
-"Ideas" => "Ideoj",
-"Journey" => "Vojaĝo",
-"Jubilee" => "Jubileo",
-"Meeting" => "Kunveno",
-"Personal" => "Persona",
-"Projects" => "Projektoj",
-"Questions" => "Demandoj",
-"{name}'s Birthday" => "Naskiĝtago de {name}",
-"Contact" => "Kontakto",
-"Add Contact" => "Aldoni kontakton",
-"Import" => "Enporti",
-"Settings" => "Agordo",
-"Addressbooks" => "Adresaroj",
-"Close" => "Fermi",
-"Keyboard shortcuts" => "Fulmoklavoj",
-"Navigation" => "Navigado",
-"Next contact in list" => "Jena kontakto en la listo",
-"Previous contact in list" => "Maljena kontakto en la listo",
-"Next addressbook" => "Jena adresaro",
-"Previous addressbook" => "Maljena adresaro",
-"Actions" => "Agoj",
-"Refresh contacts list" => "Refreŝigi la kontaktoliston",
-"Add new contact" => "Aldoni novan kontakton",
-"Add new addressbook" => "Aldoni novan adresaron",
-"Delete current contact" => "Forigi la nunan kontakton",
-"Drop photo to upload" => "Demeti foton por alŝuti",
-"Delete current photo" => "Forigi nunan foton",
-"Edit current photo" => "Redakti nunan foton",
-"Upload new photo" => "Alŝuti novan foton",
-"Select photo from ownCloud" => "Elekti foton el ownCloud",
-"Format custom, Short name, Full name, Reverse or Reverse with comma" => "Propra formo, Mallonga nomo, Longa nomo, Inversa aŭ Inversa kun komo",
-"Edit name details" => "Redakti detalojn de nomo",
-"Organization" => "Organizaĵo",
-"Delete" => "Forigi",
-"Nickname" => "Kromnomo",
-"Enter nickname" => "Enigu kromnomon",
-"Web site" => "TTT-ejo",
-"http://www.somesite.com" => "http://www.iuejo.com",
-"Go to web site" => "Iri al TTT-ejon",
-"dd-mm-yyyy" => "yyyy-mm-dd",
-"Groups" => "Grupoj",
-"Separate groups with commas" => "Disigi grupojn per komoj",
-"Edit groups" => "Redakti grupojn",
-"Preferred" => "Preferata",
-"Please specify a valid email address." => "Bonvolu specifi validan retpoŝtadreson.",
-"Enter email address" => "Enigi retpoŝtadreson",
-"Mail to address" => "Retpoŝtmesaĝo al adreso",
-"Delete email address" => "Forigi retpoŝþadreson",
-"Enter phone number" => "Enigi telefonnumeron",
-"Delete phone number" => "Forigi telefonnumeron",
-"View on map" => "Vidi en mapo",
-"Edit address details" => "Redakti detalojn de adreso",
-"Add notes here." => "Aldoni notojn ĉi tie.",
-"Add field" => "Aldoni kampon",
-"Phone" => "Telefono",
-"Email" => "Retpoŝtadreso",
-"Address" => "Adreso",
-"Note" => "Noto",
-"Download contact" => "Elŝuti kontakton",
-"Delete contact" => "Forigi kontakton",
-"The temporary image has been removed from cache." => "La provizora bildo estas forigita de la kaŝmemoro.",
-"Edit address" => "Redakti adreson",
-"Type" => "Tipo",
-"PO Box" => "Abonkesto",
-"Street address" => "Stratadreso",
-"Street and number" => "Strato kaj numero",
-"Extended" => "Etendita",
-"City" => "Urbo",
-"Region" => "Regiono",
-"Zipcode" => "Poŝtokodo",
-"Postal code" => "Poŝtkodo",
-"Country" => "Lando",
-"Addressbook" => "Adresaro",
-"Hon. prefixes" => "Honoraj antaŭmetaĵoj",
-"Miss" => "f-ino",
-"Ms" => "s-ino",
-"Mr" => "s-ro",
-"Sir" => "s-ro",
-"Mrs" => "s-ino",
-"Dr" => "d-ro",
-"Given name" => "Persona nomo",
-"Additional names" => "Pliaj nomoj",
-"Family name" => "Familia nomo",
-"Hon. suffixes" => "Honoraj postmetaĵoj",
-"Import a contacts file" => "Enporti kontaktodosieron",
-"Please choose the addressbook" => "Bonvolu elekti adresaron",
-"create a new addressbook" => "krei novan adresaron",
-"Name of new addressbook" => "Nomo de nova adresaro",
-"Importing contacts" => "Enportante kontaktojn",
-"You have no contacts in your addressbook." => "Vi ne havas kontaktojn en via adresaro",
-"Add contact" => "Aldoni kontakton",
-"Select Address Books" => "Elektu adresarojn",
-"Enter name" => "Enigu nomon",
-"Enter description" => "Enigu priskribon",
-"CardDAV syncing addresses" => "adresoj por CardDAV-sinkronigo",
-"more info" => "pli da informo",
-"Primary address (Kontact et al)" => "Ĉefa adreso (por Kontakt kaj aliaj)",
-"iOS/OS X" => "iOS/OS X",
-"Show CardDav link" => "Montri CardDav-ligilon",
-"Show read-only VCF link" => "Montri nur legeblan VCF-ligilon",
-"Download" => "Elŝuti",
-"Edit" => "Redakti",
-"New Address Book" => "Nova adresaro",
-"Name" => "Nomo",
-"Description" => "Priskribo",
-"Save" => "Konservi",
-"Cancel" => "Nuligi",
-"More..." => "Pli..."
-);
diff --git a/apps/contacts/l10n/es.php b/apps/contacts/l10n/es.php
deleted file mode 100644
index c80c2987e1..0000000000
--- a/apps/contacts/l10n/es.php
+++ /dev/null
@@ -1,214 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "Error al (des)activar libreta de direcciones.",
-"id is not set." => "no se ha puesto ninguna ID.",
-"Cannot update addressbook with an empty name." => "No se puede actualizar una libreta de direcciones sin nombre.",
-"Error updating addressbook." => "Error al actualizar la libreta de direcciones.",
-"No ID provided" => "No se ha proporcionado una ID",
-"Error setting checksum." => "Error al establecer la suma de verificación.",
-"No categories selected for deletion." => "No se seleccionaron categorías para borrar.",
-"No address books found." => "No se encontraron libretas de direcciones.",
-"No contacts found." => "No se encontraron contactos.",
-"There was an error adding the contact." => "Se ha producido un error al añadir el contacto.",
-"element name is not set." => "no se ha puesto ningún nombre de elemento.",
-"Cannot add empty property." => "No se puede añadir una propiedad vacía.",
-"At least one of the address fields has to be filled out." => "Al menos uno de los campos de direcciones se tiene que rellenar.",
-"Trying to add duplicate property: " => "Intentando añadir una propiedad duplicada: ",
-"Missing IM parameter." => "Falta un parámetro del MI.",
-"Unknown IM: " => "MI desconocido:",
-"Information about vCard is incorrect. Please reload the page." => "La información sobre el vCard es incorrecta. Por favor vuelve a cargar la página.",
-"Missing ID" => "Falta la ID",
-"Error parsing VCard for ID: \"" => "Error al analizar el VCard para la ID: \"",
-"checksum is not set." => "no se ha puesto ninguna suma de comprobación.",
-"Information about vCard is incorrect. Please reload the page: " => "La información sobre la vCard es incorrecta. Por favor, recarga la página:",
-"Something went FUBAR. " => "Plof. Algo ha fallado.",
-"No contact ID was submitted." => "No se ha mandado ninguna ID de contacto.",
-"Error reading contact photo." => "Error leyendo fotografía del contacto.",
-"Error saving temporary file." => "Error al guardar archivo temporal.",
-"The loading photo is not valid." => "La foto que se estaba cargando no es válida.",
-"Contact ID is missing." => "Falta la ID del contacto.",
-"No photo path was submitted." => "No se ha introducido la ruta de la foto.",
-"File doesn't exist:" => "Archivo inexistente:",
-"Error loading image." => "Error cargando imagen.",
-"Error getting contact object." => "Fallo al coger el contacto.",
-"Error getting PHOTO property." => "Fallo al coger las propiedades de la foto .",
-"Error saving contact." => "Fallo al salvar un contacto",
-"Error resizing image" => "Fallo al cambiar de tamaño una foto",
-"Error cropping image" => "Fallo al cortar el tamaño de la foto",
-"Error creating temporary image" => "Fallo al crear la foto temporal",
-"Error finding image: " => "Fallo al encontrar la imagen",
-"Error uploading contacts to storage." => "Error al subir contactos al almacenamiento.",
-"There is no error, the file uploaded with success" => "No hay ningún error, el archivo se ha subido con éxito",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "El archivo subido sobrepasa la directiva upload_max_filesize de php.ini",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "El archivo subido sobrepasa la directiva MAX_FILE_SIZE especificada en el formulario HTML",
-"The uploaded file was only partially uploaded" => "El archivo se ha subido parcialmente",
-"No file was uploaded" => "No se ha subido ningún archivo",
-"Missing a temporary folder" => "Falta la carpeta temporal",
-"Couldn't save temporary image: " => "Fallo no pudo salvar a una imagen temporal",
-"Couldn't load temporary image: " => "Fallo no pudo cargara de una imagen temporal",
-"No file was uploaded. Unknown error" => "Fallo no se subió el fichero",
-"Contacts" => "Contactos",
-"Sorry, this functionality has not been implemented yet" => "Perdón esta función no esta aún implementada",
-"Not implemented" => "No esta implementada",
-"Couldn't get a valid address." => "Fallo : no hay dirección valida",
-"Error" => "Fallo",
-"This property has to be non-empty." => "Este campo no puede estar vacío.",
-"Couldn't serialize elements." => "Fallo no podido ordenar los elementos",
-"'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "La propiedad de \"borrar\" se llamado sin argumentos envia fallos a\nbugs.owncloud.org",
-"Edit name" => "Edita el Nombre",
-"No files selected for upload." => "No hay ficheros seleccionados para subir",
-"The file you are trying to upload exceed the maximum size for file uploads on this server." => "El fichero que quieres subir excede el tamaño máximo permitido en este servidor.",
-"Select type" => "Selecciona el tipo",
-"Result: " => "Resultado :",
-" imported, " => "Importado.",
-" failed." => "Fallo.",
-"This is not your addressbook." => "Esta no es tu agenda de contactos.",
-"Contact could not be found." => "No se ha podido encontrar el contacto.",
-"Jabber" => "Jabber",
-"AIM" => "AIM",
-"MSN" => "MSN",
-"Twitter" => "Twitter",
-"GoogleTalk" => "Google Talk",
-"Facebook" => "Facebook",
-"XMPP" => "XMPP",
-"ICQ" => "ICQ",
-"Yahoo" => "Yahoo",
-"Skype" => "Skype",
-"QQ" => "QQ",
-"GaduGadu" => "GaduGadu",
-"Work" => "Trabajo",
-"Home" => "Particular",
-"Other" => "Otro",
-"Mobile" => "Móvil",
-"Text" => "Texto",
-"Voice" => "Voz",
-"Message" => "Mensaje",
-"Fax" => "Fax",
-"Video" => "Vídeo",
-"Pager" => "Localizador",
-"Internet" => "Internet",
-"Birthday" => "Cumpleaños",
-"Business" => "Negocio",
-"Call" => "Llamada",
-"Clients" => "Clientes",
-"Holidays" => "Vacaciones",
-"Ideas" => "Ideas",
-"Journey" => "Jornada",
-"Meeting" => "Reunión",
-"Personal" => "Personal",
-"Projects" => "Proyectos",
-"Questions" => "Preguntas",
-"{name}'s Birthday" => "Cumpleaños de {name}",
-"Contact" => "Contacto",
-"Add Contact" => "Añadir contacto",
-"Import" => "Importar",
-"Settings" => "Configuración",
-"Addressbooks" => "Libretas de direcciones",
-"Close" => "Cierra.",
-"Keyboard shortcuts" => "Atajos de teclado",
-"Navigation" => "Navegación",
-"Next contact in list" => "Siguiente contacto en la lista",
-"Previous contact in list" => "Anterior contacto en la lista",
-"Actions" => "Acciones",
-"Refresh contacts list" => "Refrescar la lista de contactos",
-"Add new contact" => "Añadir un nuevo contacto",
-"Add new addressbook" => "Añadir nueva libreta de direcciones",
-"Delete current contact" => "Eliminar contacto actual",
-"Drop photo to upload" => "Suelta una foto para subirla",
-"Delete current photo" => "Eliminar fotografía actual",
-"Edit current photo" => "Editar fotografía actual",
-"Upload new photo" => "Subir nueva fotografía",
-"Select photo from ownCloud" => "Seleccionar fotografía desde ownCloud",
-"Format custom, Short name, Full name, Reverse or Reverse with comma" => "Formato personalizado, nombre abreviado, nombre completo, al revés o al revés con coma",
-"Edit name details" => "Editar los detalles del nombre",
-"Organization" => "Organización",
-"Delete" => "Borrar",
-"Nickname" => "Alias",
-"Enter nickname" => "Introduce un alias",
-"Web site" => "Sitio Web",
-"http://www.somesite.com" => "http://www.unsitio.com",
-"Go to web site" => "Ir al sitio Web",
-"dd-mm-yyyy" => "dd-mm-yyyy",
-"Groups" => "Grupos",
-"Separate groups with commas" => "Separa los grupos con comas",
-"Edit groups" => "Editar grupos",
-"Preferred" => "Preferido",
-"Please specify a valid email address." => "Por favor especifica una dirección de correo electrónico válida.",
-"Enter email address" => "Introduce una dirección de correo electrónico",
-"Mail to address" => "Enviar por correo a la dirección",
-"Delete email address" => "Eliminar dirección de correo electrónico",
-"Enter phone number" => "Introduce un número de teléfono",
-"Delete phone number" => "Eliminar número de teléfono",
-"Instant Messenger" => "Mensajero instantáneo",
-"View on map" => "Ver en el mapa",
-"Edit address details" => "Editar detalles de la dirección",
-"Add notes here." => "Añade notas aquí.",
-"Add field" => "Añadir campo",
-"Phone" => "Teléfono",
-"Email" => "Correo electrónico",
-"Instant Messaging" => "Mensajería instantánea",
-"Address" => "Dirección",
-"Note" => "Nota",
-"Download contact" => "Descargar contacto",
-"Delete contact" => "Eliminar contacto",
-"The temporary image has been removed from cache." => "La foto temporal se ha borrado del cache.",
-"Edit address" => "Editar dirección",
-"Type" => "Tipo",
-"PO Box" => "Código postal",
-"Street and number" => "Calle y número",
-"Extended" => "Extendido",
-"Apartment number etc." => "Número del apartamento, etc.",
-"City" => "Ciudad",
-"Region" => "Región",
-"E.g. state or province" => "Ej: región o provincia",
-"Zipcode" => "Código postal",
-"Postal code" => "Código postal",
-"Country" => "País",
-"Addressbook" => "Libreta de direcciones",
-"Hon. prefixes" => "Prefijos honoríficos",
-"Miss" => "Srta",
-"Ms" => "Sra.",
-"Mr" => "Sr.",
-"Sir" => "Señor",
-"Mrs" => "Sra",
-"Dr" => "Dr",
-"Given name" => "Nombre",
-"Additional names" => "Nombres adicionales",
-"Family name" => "Apellido",
-"Hon. suffixes" => "Sufijos honoríficos",
-"J.D." => "J.D.",
-"M.D." => "M.D.",
-"D.O." => "D.O.",
-"D.C." => "D.C.",
-"Ph.D." => "Dr",
-"Esq." => "Don",
-"Jr." => "Jr.",
-"Sn." => "Sn.",
-"Import a contacts file" => "Importar archivo de contactos",
-"Please choose the addressbook" => "Por favor escoge la agenda",
-"create a new addressbook" => "crear una nueva agenda",
-"Name of new addressbook" => "Nombre de la nueva agenda",
-"Importing contacts" => "Importando contactos",
-"Contacts imported successfully" => "Contactos importados correctamente",
-"Close Dialog" => "Cerrar Diálogo",
-"Import Addressbook" => "Importar agenda",
-"Select address book to import to:" => "Selecciona una agenda para importar a:",
-"Drop a VCF file to import contacts." => "Suelta un archivo VCF para importar contactos.",
-"Select from HD" => "Seleccionar del disco duro",
-"You have no contacts in your addressbook." => "No hay contactos en tu agenda.",
-"Add contact" => "Añadir contacto",
-"Enter name" => "Introducir nombre",
-"Enter description" => "Introducir descripción",
-"CardDAV syncing addresses" => "Sincronizando direcciones",
-"more info" => "más información",
-"Primary address (Kontact et al)" => "Dirección primaria (Kontact et al)",
-"iOS/OS X" => "iOS/OS X",
-"Share" => "Compartir",
-"Download" => "Descargar",
-"Edit" => "Editar",
-"New Address Book" => "Nueva libreta de direcciones",
-"Name" => "Nombre",
-"Description" => "Descripción",
-"Save" => "Guardar",
-"Cancel" => "Cancelar",
-"More..." => "Más..."
-);
diff --git a/apps/contacts/l10n/et_EE.php b/apps/contacts/l10n/et_EE.php
deleted file mode 100644
index e15ea0c10b..0000000000
--- a/apps/contacts/l10n/et_EE.php
+++ /dev/null
@@ -1,161 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "Viga aadressiraamatu (de)aktiveerimisel.",
-"id is not set." => "ID on määramata.",
-"Cannot update addressbook with an empty name." => "Tühja nimega aadressiraamatut ei saa uuendada.",
-"Error updating addressbook." => "Viga aadressiraamatu uuendamisel.",
-"No ID provided" => "ID-d pole sisestatud",
-"Error setting checksum." => "Viga kontrollsumma määramisel.",
-"No categories selected for deletion." => "Kustutamiseks pole valitud ühtegi kategooriat.",
-"No address books found." => "Ei leitud ühtegi aadressiraamatut.",
-"No contacts found." => "Ühtegi kontakti ei leitud.",
-"There was an error adding the contact." => "Konktakti lisamisel tekkis viga.",
-"element name is not set." => "elemendi nime pole määratud.",
-"Cannot add empty property." => "Tühja omadust ei saa lisada.",
-"At least one of the address fields has to be filled out." => "Vähemalt üks aadressiväljadest peab olema täidetud.",
-"Trying to add duplicate property: " => "Proovitakse lisada topeltomadust: ",
-"Information about vCard is incorrect. Please reload the page." => "Visiitkaardi info pole korrektne. Palun lae leht uuesti.",
-"Missing ID" => "Puudub ID",
-"Error parsing VCard for ID: \"" => "Viga VCard-ist ID parsimisel: \"",
-"checksum is not set." => "kontrollsummat pole määratud.",
-"Information about vCard is incorrect. Please reload the page: " => "vCard info pole korrektne. Palun lae lehekülg uuesti: ",
-"Something went FUBAR. " => "Midagi läks tõsiselt metsa.",
-"No contact ID was submitted." => "Kontakti ID-d pole sisestatud.",
-"Error reading contact photo." => "Viga kontakti foto lugemisel.",
-"Error saving temporary file." => "Viga ajutise faili salvestamisel.",
-"The loading photo is not valid." => "Laetav pilt pole korrektne pildifail.",
-"Contact ID is missing." => "Kontakti ID puudub.",
-"No photo path was submitted." => "Foto asukohta pole määratud.",
-"File doesn't exist:" => "Faili pole olemas:",
-"Error loading image." => "Viga pildi laadimisel.",
-"Error getting contact object." => "Viga kontakti objekti hankimisel.",
-"Error getting PHOTO property." => "Viga PHOTO omaduse hankimisel.",
-"Error saving contact." => "Viga kontakti salvestamisel.",
-"Error resizing image" => "Viga pildi suuruse muutmisel",
-"Error cropping image" => "Viga pildi lõikamisel",
-"Error creating temporary image" => "Viga ajutise pildi loomisel",
-"Error finding image: " => "Viga pildi leidmisel: ",
-"Error uploading contacts to storage." => "Viga kontaktide üleslaadimisel kettale.",
-"There is no error, the file uploaded with success" => "Ühtegi tõrget polnud, fail on üles laetud",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Üleslaetud fail ületab php.ini failis määratud upload_max_filesize suuruse",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Üleslaetud fail ületab MAX_FILE_SIZE suuruse, mis on HTML vormi jaoks määratud",
-"The uploaded file was only partially uploaded" => "Fail laeti üles ainult osaliselt",
-"No file was uploaded" => "Ühtegi faili ei laetud üles",
-"Missing a temporary folder" => "Ajutiste failide kaust puudub",
-"Couldn't save temporary image: " => "Ajutise pildi salvestamine ebaõnnestus: ",
-"Couldn't load temporary image: " => "Ajutise pildi laadimine ebaõnnestus: ",
-"No file was uploaded. Unknown error" => "Ühtegi faili ei laetud üles. Tundmatu viga",
-"Contacts" => "Kontaktid",
-"Sorry, this functionality has not been implemented yet" => "Vabandust, aga see funktsioon pole veel valmis",
-"Not implemented" => "Pole implementeeritud",
-"Couldn't get a valid address." => "Kehtiva aadressi hankimine ebaõnnestus",
-"Error" => "Viga",
-"This property has to be non-empty." => "See omadus ei tohi olla tühi.",
-"Edit name" => "Muuda nime",
-"No files selected for upload." => "Üleslaadimiseks pole faile valitud.",
-"Select type" => "Vali tüüp",
-"Result: " => "Tulemus: ",
-" imported, " => " imporditud, ",
-" failed." => " ebaõnnestus.",
-"This is not your addressbook." => "See pole sinu aadressiraamat.",
-"Contact could not be found." => "Kontakti ei leitud.",
-"Work" => "Töö",
-"Home" => "Kodu",
-"Mobile" => "Mobiil",
-"Text" => "Tekst",
-"Voice" => "Hääl",
-"Message" => "Sõnum",
-"Fax" => "Faks",
-"Video" => "Video",
-"Pager" => "Piipar",
-"Internet" => "Internet",
-"Birthday" => "Sünnipäev",
-"{name}'s Birthday" => "{name} sünnipäev",
-"Contact" => "Kontakt",
-"Add Contact" => "Lisa kontakt",
-"Import" => "Impordi",
-"Addressbooks" => "Aadressiraamatud",
-"Close" => "Sule",
-"Drop photo to upload" => "Lohista üleslaetav foto siia",
-"Delete current photo" => "Kustuta praegune foto",
-"Edit current photo" => "Muuda praegust pilti",
-"Upload new photo" => "Lae üles uus foto",
-"Select photo from ownCloud" => "Vali foto ownCloudist",
-"Format custom, Short name, Full name, Reverse or Reverse with comma" => "Kohandatud vorming, Lühike nimi, Täielik nimi, vastupidine või vastupidine komadega",
-"Edit name details" => "Muuda nime üksikasju",
-"Organization" => "Organisatsioon",
-"Delete" => "Kustuta",
-"Nickname" => "Hüüdnimi",
-"Enter nickname" => "Sisesta hüüdnimi",
-"dd-mm-yyyy" => "dd.mm.yyyy",
-"Groups" => "Grupid",
-"Separate groups with commas" => "Eralda grupid komadega",
-"Edit groups" => "Muuda gruppe",
-"Preferred" => "Eelistatud",
-"Please specify a valid email address." => "Palun sisesta korrektne e-posti aadress.",
-"Enter email address" => "Sisesta e-posti aadress",
-"Mail to address" => "Kiri aadressile",
-"Delete email address" => "Kustuta e-posti aadress",
-"Enter phone number" => "Sisesta telefoninumber",
-"Delete phone number" => "Kustuta telefoninumber",
-"View on map" => "Vaata kaardil",
-"Edit address details" => "Muuda aaressi infot",
-"Add notes here." => "Lisa märkmed siia.",
-"Add field" => "Lisa väli",
-"Phone" => "Telefon",
-"Email" => "E-post",
-"Address" => "Aadress",
-"Note" => "Märkus",
-"Download contact" => "Lae kontakt alla",
-"Delete contact" => "Kustuta kontakt",
-"The temporary image has been removed from cache." => "Ajutine pilt on puhvrist eemaldatud.",
-"Edit address" => "Muuda aadressi",
-"Type" => "Tüüp",
-"PO Box" => "Postkontori postkast",
-"Extended" => "Laiendatud",
-"City" => "Linn",
-"Region" => "Piirkond",
-"Zipcode" => "Postiindeks",
-"Country" => "Riik",
-"Addressbook" => "Aadressiraamat",
-"Hon. prefixes" => "Eesliited",
-"Miss" => "Preili",
-"Ms" => "Pr",
-"Mr" => "Hr",
-"Sir" => "Härra",
-"Mrs" => "Proua",
-"Dr" => "Dr",
-"Given name" => "Eesnimi",
-"Additional names" => "Lisanimed",
-"Family name" => "Perekonnanimi",
-"Hon. suffixes" => "Järelliited",
-"J.D." => "J.D.",
-"M.D." => "M.D.",
-"D.O." => "D.O.",
-"D.C." => "D.C.",
-"Ph.D." => "Ph.D.",
-"Esq." => "Esq.",
-"Jr." => "Jr.",
-"Sn." => "Senior.",
-"Import a contacts file" => "Impordi kontaktifail",
-"Please choose the addressbook" => "Palun vali aadressiraamat",
-"create a new addressbook" => "loo uus aadressiraamat",
-"Name of new addressbook" => "Uue aadressiraamatu nimi",
-"Importing contacts" => "Kontaktide importimine",
-"Contacts imported successfully" => "Kontaktid on imporditud",
-"Close Dialog" => "Sulge dialoog",
-"Import Addressbook" => "Impordi aadressiraamat",
-"Select address book to import to:" => "Vali aadressiraamat, millesse importida:",
-"Drop a VCF file to import contacts." => "Lohista siia VCF-fail, millest kontakte importida.",
-"Select from HD" => "Vali kõvakettalt",
-"You have no contacts in your addressbook." => "Sinu aadressiraamatus pole ühtegi kontakti.",
-"Add contact" => "Lisa kontakt",
-"CardDAV syncing addresses" => "CardDAV sünkroniseerimise aadressid",
-"more info" => "lisainfo",
-"Primary address (Kontact et al)" => "Peamine aadress",
-"iOS/OS X" => "iOS/OS X",
-"Download" => "Lae alla",
-"Edit" => "Muuda",
-"New Address Book" => "Uus aadressiraamat",
-"Save" => "Salvesta",
-"Cancel" => "Loobu"
-);
diff --git a/apps/contacts/l10n/eu.php b/apps/contacts/l10n/eu.php
deleted file mode 100644
index b676b45c0f..0000000000
--- a/apps/contacts/l10n/eu.php
+++ /dev/null
@@ -1,175 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "Errore bat egon da helbide-liburua (des)gaitzen",
-"id is not set." => "IDa ez da ezarri.",
-"Cannot update addressbook with an empty name." => "Ezin da helbide liburua eguneratu izen huts batekin.",
-"Error updating addressbook." => "Errore bat egon da helbide liburua eguneratzen.",
-"No ID provided" => "Ez da IDrik eman",
-"Error setting checksum." => "Errorea kontrol-batura ezartzean.",
-"No categories selected for deletion." => "Ez dira ezabatzeko kategoriak hautatu.",
-"No address books found." => "Ez da helbide libururik aurkitu.",
-"No contacts found." => "Ez da kontakturik aurkitu.",
-"There was an error adding the contact." => "Errore bat egon da kontaktua gehitzerakoan",
-"element name is not set." => "elementuaren izena ez da ezarri.",
-"Could not parse contact: " => "Ezin izan da kontaktua analizatu:",
-"Cannot add empty property." => "Ezin da propieta hutsa gehitu.",
-"At least one of the address fields has to be filled out." => "Behintzat helbide eremuetako bat bete behar da.",
-"Trying to add duplicate property: " => "Propietate bikoiztuta gehitzen saiatzen ari zara:",
-"Information about vCard is incorrect. Please reload the page." => "vCard-aren inguruko informazioa okerra da. Mesedez birkargatu orrialdea.",
-"Missing ID" => "ID falta da",
-"Error parsing VCard for ID: \"" => "Errorea VCard analizatzean hurrengo IDrako: \"",
-"checksum is not set." => "Kontrol-batura ezarri gabe dago.",
-"Information about vCard is incorrect. Please reload the page: " => "vCard honen informazioa ez da zuzena.Mezedez birkargatu orria:",
-"No contact ID was submitted." => "Ez da kontaktuaren IDrik eman.",
-"Error reading contact photo." => "Errore bat izan da kontaktuaren argazkia igotzerakoan.",
-"Error saving temporary file." => "Errore bat izan da aldi bateko fitxategia gordetzerakoan.",
-"The loading photo is not valid." => "Kargatzen ari den argazkia ez da egokia.",
-"Contact ID is missing." => "Kontaktuaren IDa falta da.",
-"No photo path was submitted." => "Ez da argazkiaren bide-izenik eman.",
-"File doesn't exist:" => "Fitxategia ez da existitzen:",
-"Error loading image." => "Errore bat izan da irudia kargatzearkoan.",
-"Error getting contact object." => "Errore bat izan da kontaktu objetua lortzean.",
-"Error getting PHOTO property." => "Errore bat izan da PHOTO propietatea lortzean.",
-"Error saving contact." => "Errore bat izan da kontaktua gordetzean.",
-"Error resizing image" => "Errore bat izan da irudiaren tamaina aldatzean",
-"Error cropping image" => "Errore bat izan da irudia mozten",
-"Error creating temporary image" => "Errore bat izan da aldi bateko irudia sortzen",
-"Error finding image: " => "Ezin izan da irudia aurkitu:",
-"Error uploading contacts to storage." => "Errore bat egon da kontaktuak biltegira igotzerakoan.",
-"There is no error, the file uploaded with success" => "Ez da errorerik egon, fitxategia ongi igo da",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Igotako fitxategia php.ini fitxategiko upload_max_filesize direktiba baino handiagoa da",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Igotako fitxategia HTML formularioan zehaztutako MAX_FILE_SIZE direktiba baino handidagoa da.",
-"The uploaded file was only partially uploaded" => "Igotako fitxategiaren zati bat bakarrik igo da",
-"No file was uploaded" => "Ez da fitxategirik igo",
-"Missing a temporary folder" => "Aldi bateko karpeta falta da",
-"Couldn't save temporary image: " => "Ezin izan da aldi bateko irudia gorde:",
-"Couldn't load temporary image: " => "Ezin izan da aldi bateko irudia kargatu:",
-"No file was uploaded. Unknown error" => "Ez da fitxategirik igo. Errore ezezaguna",
-"Contacts" => "Kontaktuak",
-"Sorry, this functionality has not been implemented yet" => "Barkatu, aukera hau ez da oriandik inplementatu",
-"Not implemented" => "Inplementatu gabe",
-"Couldn't get a valid address." => "Ezin izan da eposta baliagarri bat hartu.",
-"Error" => "Errorea",
-"This property has to be non-empty." => "Propietate hau ezin da hutsik egon.",
-"Couldn't serialize elements." => "Ezin izan dira elementuak serializatu.",
-"'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "'deleteProperty' argumenturik gabe deitu da. Mezedez abisatu bugs.owncloud.org-en",
-"Edit name" => "Editatu izena",
-"No files selected for upload." => "Ez duzu igotzeko fitxategirik hautatu.",
-"The file you are trying to upload exceed the maximum size for file uploads on this server." => "Igo nahi duzun fitxategia zerbitzariak onartzen duen tamaina baino handiagoa da.",
-"Select type" => "Hautatu mota",
-"Result: " => "Emaitza:",
-" imported, " => " inportatua, ",
-" failed." => "huts egin du.",
-"This is not your addressbook." => "Hau ez da zure helbide liburua.",
-"Contact could not be found." => "Ezin izan da kontaktua aurkitu.",
-"Work" => "Lana",
-"Home" => "Etxea",
-"Other" => "Bestelakoa",
-"Mobile" => "Mugikorra",
-"Text" => "Testua",
-"Voice" => "Ahotsa",
-"Message" => "Mezua",
-"Fax" => "Fax-a",
-"Video" => "Bideoa",
-"Pager" => "Bilagailua",
-"Internet" => "Internet",
-"Birthday" => "Jaioteguna",
-"Call" => "Deia",
-"Clients" => "Bezeroak",
-"Holidays" => "Oporrak",
-"Ideas" => "Ideiak",
-"Journey" => "Bidaia",
-"Meeting" => "Bilera",
-"Personal" => "Pertsonala",
-"Projects" => "Proiektuak",
-"Questions" => "Galderak",
-"{name}'s Birthday" => "{name}ren jaioteguna",
-"Contact" => "Kontaktua",
-"Add Contact" => "Gehitu kontaktua",
-"Import" => "Inportatu",
-"Settings" => "Ezarpenak",
-"Addressbooks" => "Helbide Liburuak",
-"Close" => "Itxi",
-"Keyboard shortcuts" => "Teklatuaren lasterbideak",
-"Navigation" => "Nabigazioa",
-"Next contact in list" => "Hurrengoa kontaktua zerrendan",
-"Previous contact in list" => "Aurreko kontaktua zerrendan",
-"Expand/collapse current addressbook" => "Zabaldu/tolestu uneko helbide-liburua",
-"Actions" => "Ekintzak",
-"Refresh contacts list" => "Gaurkotu kontaktuen zerrenda",
-"Add new contact" => "Gehitu kontaktu berria",
-"Add new addressbook" => "Gehitu helbide-liburu berria",
-"Delete current contact" => "Ezabatu uneko kontaktuak",
-"Drop photo to upload" => "Askatu argazkia igotzeko",
-"Delete current photo" => "Ezabatu oraingo argazkia",
-"Edit current photo" => "Editatu oraingo argazkia",
-"Upload new photo" => "Igo argazki berria",
-"Select photo from ownCloud" => "Hautatu argazki bat ownCloudetik",
-"Edit name details" => "Editatu izenaren zehaztasunak",
-"Organization" => "Erakundea",
-"Delete" => "Ezabatu",
-"Nickname" => "Ezizena",
-"Enter nickname" => "Sartu ezizena",
-"Web site" => "Web orria",
-"http://www.somesite.com" => "http://www.webgunea.com",
-"Go to web site" => "Web orrira joan",
-"dd-mm-yyyy" => "yyyy-mm-dd",
-"Groups" => "Taldeak",
-"Separate groups with commas" => "Banatu taldeak komekin",
-"Edit groups" => "Editatu taldeak",
-"Preferred" => "Hobetsia",
-"Please specify a valid email address." => "Mesedez sartu eposta helbide egoki bat",
-"Enter email address" => "Sartu eposta helbidea",
-"Mail to address" => "Bidali helbidera",
-"Delete email address" => "Ezabatu eposta helbidea",
-"Enter phone number" => "Sartu telefono zenbakia",
-"Delete phone number" => "Ezabatu telefono zenbakia",
-"View on map" => "Ikusi mapan",
-"Edit address details" => "Editatu helbidearen zehaztasunak",
-"Add notes here." => "Gehitu oharrak hemen.",
-"Add field" => "Gehitu eremua",
-"Phone" => "Telefonoa",
-"Email" => "Eposta",
-"Address" => "Helbidea",
-"Note" => "Oharra",
-"Download contact" => "Deskargatu kontaktua",
-"Delete contact" => "Ezabatu kontaktua",
-"The temporary image has been removed from cache." => "Aldi bateko irudia cachetik ezabatu da.",
-"Edit address" => "Editatu helbidea",
-"Type" => "Mota",
-"PO Box" => "Posta kutxa",
-"Street address" => "Kalearen helbidea",
-"Street and number" => "Kalea eta zenbakia",
-"Extended" => "Hedatua",
-"Apartment number etc." => "Etxe zenbakia eab.",
-"City" => "Hiria",
-"Region" => "Eskualdea",
-"Zipcode" => "Posta kodea",
-"Postal code" => "Posta kodea",
-"Country" => "Herrialdea",
-"Addressbook" => "Helbide-liburua",
-"Import a contacts file" => "Inporatu kontaktuen fitxategia",
-"Please choose the addressbook" => "Mesedez, aukeratu helbide liburua",
-"create a new addressbook" => "sortu helbide liburu berria",
-"Name of new addressbook" => "Helbide liburuaren izena",
-"Importing contacts" => "Kontaktuak inportatzen",
-"Contacts imported successfully" => "Kontaktuak ongi inportatu dira",
-"Close Dialog" => "Dialogoa itxi",
-"Import Addressbook" => "Inporatu helbide liburua",
-"Select address book to import to:" => "Hautau helburuko helbide liburua:",
-"Drop a VCF file to import contacts." => "Askatu VCF fitxategia kontaktuak inportatzeko.",
-"Select from HD" => "Hautatu disko gogorretik",
-"You have no contacts in your addressbook." => "Ez duzu kontakturik zure helbide liburuan.",
-"Add contact" => "Gehitu kontaktua",
-"Select Address Books" => "Hautatu helbide-liburuak",
-"Enter name" => "Sartu izena",
-"Enter description" => "Sartu deskribapena",
-"CardDAV syncing addresses" => "CardDAV sinkronizazio helbideak",
-"more info" => "informazio gehiago",
-"Primary address (Kontact et al)" => "Helbide nagusia",
-"iOS/OS X" => "iOS/OS X",
-"Download" => "Deskargatu",
-"Edit" => "Editatu",
-"New Address Book" => "Helbide-liburu berria",
-"Save" => "Gorde",
-"Cancel" => "Ezeztatu"
-);
diff --git a/apps/contacts/l10n/fa.php b/apps/contacts/l10n/fa.php
deleted file mode 100644
index 9ee6ee5466..0000000000
--- a/apps/contacts/l10n/fa.php
+++ /dev/null
@@ -1,164 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "خطا در (غیر) فعال سازی کتابچه نشانه ها",
-"id is not set." => "شناسه تعیین نشده",
-"Cannot update addressbook with an empty name." => "نمی توانید کتابچه نشانی ها را با یک نام خالی بروزرسانی کنید",
-"Error updating addressbook." => "خطا در هنگام بروزرسانی کتابچه نشانی ها",
-"No ID provided" => "هیچ شناسه ای ارائه نشده",
-"Error setting checksum." => "خطا در تنظیم checksum",
-"No categories selected for deletion." => "هیچ گروهی برای حذف شدن در نظر گرفته نشده",
-"No address books found." => "هیچ کتابچه نشانی پیدا نشد",
-"No contacts found." => "هیچ شخصی پیدا نشد",
-"There was an error adding the contact." => "یک خطا در افزودن اطلاعات شخص مورد نظر",
-"element name is not set." => "نام اصلی تنظیم نشده است",
-"Cannot add empty property." => "نمیتوان یک  خاصیت خالی ایجاد کرد",
-"At least one of the address fields has to be filled out." => "At least one of the address fields has to be filled out. ",
-"Trying to add duplicate property: " => "امتحان کردن برای وارد کردن مشخصات تکراری",
-"Information about vCard is incorrect. Please reload the page." => "اطلاعات درمورد vCard شما اشتباه است لطفا صفحه را دوباره بار گذاری کنید",
-"Missing ID" => "نشانی گم شده",
-"Error parsing VCard for ID: \"" => "خطا در تجزیه کارت ویزا برای شناسه:",
-"checksum is not set." => "checksum تنظیم شده نیست",
-"Information about vCard is incorrect. Please reload the page: " => "اطلاعات کارت ویزا شما غلط است لطفا صفحه را دوباره بارگزاری کنید",
-"Something went FUBAR. " => "چند چیز به FUBAR رفتند",
-"No contact ID was submitted." => "هیچ اطلاعاتی راجع به شناسه ارسال نشده",
-"Error reading contact photo." => "خطا در خواندن اطلاعات تصویر",
-"Error saving temporary file." => "خطا در ذخیره پرونده موقت",
-"The loading photo is not valid." => "بارگزاری تصویر امکان پذیر نیست",
-"Contact ID is missing." => "اطلاعات شناسه گم شده",
-"No photo path was submitted." => "هیچ نشانی از تصویرارسال نشده",
-"File doesn't exist:" => "پرونده وجود ندارد",
-"Error loading image." => "خطا در بارگزاری تصویر",
-"Error getting contact object." => "خطا در گرفتن اطلاعات شخص",
-"Error getting PHOTO property." => "خطا در دربافت تصویر ویژگی شخصی",
-"Error saving contact." => "خطا در ذخیره سازی اطلاعات",
-"Error resizing image" => "خطا در تغییر دادن اندازه تصویر",
-"Error cropping image" => "خطا در برداشت تصویر",
-"Error creating temporary image" => "خطا در ساخت تصویر  temporary",
-"Error finding image: " => "خطا در پیدا کردن تصویر:",
-"Error uploading contacts to storage." => "خطا در هنگام بارگذاری و ذخیره سازی",
-"There is no error, the file uploaded with success" => "هیچ خطایی نیست بارگذاری پرونده موفقیت آمیز بود",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "حجم آپلود از طریق Php.ini تعیین می شود",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "حداکثر حجم قابل بار گذاری از طریق HTML MAX_FILE_SIZE است",
-"The uploaded file was only partially uploaded" => "پرونده بارگذاری شده فقط تاحدودی بارگذاری شده",
-"No file was uploaded" => "هیچ پروندهای بارگذاری نشده",
-"Missing a temporary folder" => "یک پوشه موقت گم شده",
-"Couldn't save temporary image: " => "قابلیت ذخیره تصویر  موقت وجود ندارد:",
-"Couldn't load temporary image: " => "قابلیت بارگذاری تصویر  موقت وجود ندارد:",
-"No file was uploaded. Unknown error" => "هیچ فایلی آپلود نشد.خطای ناشناس",
-"Contacts" => "اشخاص",
-"Sorry, this functionality has not been implemented yet" => "با عرض پوزش،این قابلیت هنوز اجرا نشده است",
-"Not implemented" => "انجام نشد",
-"Couldn't get a valid address." => "Couldn't get a valid address.",
-"Error" => "خطا",
-"This property has to be non-empty." => "این ویژگی باید به صورت غیر تهی عمل کند",
-"Couldn't serialize elements." => "قابلیت مرتب سازی عناصر وجود ندارد",
-"'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "پاک کردن ویژگی بدون استدلال انجام شده.لطفا این مورد را گزارش دهید:bugs.owncloud.org",
-"Edit name" => "نام تغییر",
-"No files selected for upload." => "هیچ فایلی برای آپلود انتخاب نشده است",
-"The file you are trying to upload exceed the maximum size for file uploads on this server." => "حجم فایل بسیار بیشتر از حجم تنظیم شده در تنظیمات سرور است",
-"Select type" => "نوع را انتخاب کنید",
-"Result: " => "نتیجه:",
-" imported, " => "وارد شد،",
-" failed." => "ناموفق",
-"This is not your addressbook." => "این کتابچه ی نشانه های شما نیست",
-"Contact could not be found." => "اتصال ویا تماسی یافت نشد",
-"Work" => "کار",
-"Home" => "خانه",
-"Mobile" => "موبایل",
-"Text" => "متن",
-"Voice" => "صدا",
-"Message" => "پیغام",
-"Fax" => "دورنگار:",
-"Video" => "رسانه تصویری",
-"Pager" => "صفحه",
-"Internet" => "اینترنت",
-"Birthday" => "روزتولد",
-"{name}'s Birthday" => "روز تولد {name} است",
-"Contact" => "اشخاص",
-"Add Contact" => "افزودن اطلاعات شخص مورد نظر",
-"Import" => "وارد کردن",
-"Addressbooks" => "کتابچه ی نشانی ها",
-"Close" => "بستن",
-"Drop photo to upload" => "تصویر را به اینجا بکشید تا بار گذازی شود",
-"Delete current photo" => "پاک کردن تصویر کنونی",
-"Edit current photo" => "ویرایش تصویر کنونی",
-"Upload new photo" => "بار گذاری یک تصویر جدید",
-"Select photo from ownCloud" => "انتخاب یک تصویر از ابر های شما",
-"Format custom, Short name, Full name, Reverse or Reverse with comma" => "Format custom, Short name, Full name, Reverse or Reverse with comma",
-"Edit name details" => "ویرایش نام جزئیات",
-"Organization" => "نهاد(ارگان)",
-"Delete" => "پاک کردن",
-"Nickname" => "نام مستعار",
-"Enter nickname" => "یک نام مستعار وارد کنید",
-"dd-mm-yyyy" => "dd-mm-yyyy",
-"Groups" => "گروه ها",
-"Separate groups with commas" => "جدا کردن گروه ها به وسیله درنگ نما",
-"Edit groups" => "ویرایش گروه ها",
-"Preferred" => "مقدم",
-"Please specify a valid email address." => "لطفا یک پست الکترونیکی معتبر وارد کنید",
-"Enter email address" => "یک  پست الکترونیکی وارد کنید",
-"Mail to address" => "به نشانی  ارسال شد",
-"Delete email address" => "پاک کردن نشانی پست الکترونیکی",
-"Enter phone number" => "شماره تلفن راوارد کنید",
-"Delete phone number" => "پاک کردن شماره تلفن",
-"View on map" => "دیدن روی نقشه",
-"Edit address details" => "ویرایش جزئیات نشانی ها",
-"Add notes here." => "اینجا یادداشت ها را بیافزایید",
-"Add field" => "اضافه کردن فیلد",
-"Phone" => "شماره تلفن",
-"Email" => "نشانی پست الکترنیک",
-"Address" => "نشانی",
-"Note" => "یادداشت",
-"Download contact" => "دانلود مشخصات اشخاص",
-"Delete contact" => "پاک کردن  اطلاعات شخص مورد نظر",
-"The temporary image has been removed from cache." => "تصویر موقت از کش پاک شد.",
-"Edit address" => "ویرایش نشانی",
-"Type" => "نوع",
-"PO Box" => "صندوق پستی",
-"Extended" => "تمدید شده",
-"City" => "شهر",
-"Region" => "ناحیه",
-"Zipcode" => "کد پستی",
-"Country" => "کشور",
-"Addressbook" => "کتابچه ی نشانی ها",
-"Hon. prefixes" => "پیشوند های محترمانه",
-"Miss" => "خانم",
-"Ms" => "خانم",
-"Mr" => "آقا",
-"Sir" => "آقا",
-"Mrs" => "خانم",
-"Dr" => "دکتر",
-"Given name" => "نام معلوم",
-"Additional names" => "نام های دیگر",
-"Family name" => "نام خانوادگی",
-"Hon. suffixes" => "پسوند های محترم",
-"J.D." => "J.D.",
-"M.D." => "M.D.",
-"D.O." => "D.O.",
-"D.C." => "D.C.",
-"Ph.D." => "دکتری",
-"Esq." => "Esq.",
-"Jr." => "Jr.",
-"Sn." => "Sn.",
-"Import a contacts file" => "وارد کردن پرونده حاوی اطلاعات",
-"Please choose the addressbook" => "لطفا یک کتابچه نشانی انتخاب کنید",
-"create a new addressbook" => "یک کتابچه نشانی بسازید",
-"Name of new addressbook" => "نام کتابچه نشانی جدید",
-"Importing contacts" => "وارد کردن اشخاص",
-"Contacts imported successfully" => "اشخاص با موفقیت افزوده شدند",
-"Close Dialog" => "بستن دیالوگ",
-"Import Addressbook" => "وارد کردن کتابچه نشانی",
-"Select address book to import to:" => "یک کتابچه نشانی انتخاب کنید تا وارد شود",
-"Drop a VCF file to import contacts." => "یک پرونده VCF را به اینجا بکشید تا اشخاص افزوده شوند",
-"Select from HD" => "انتخاب از دیسک سخت",
-"You have no contacts in your addressbook." => "شماهیچ شخصی در  کتابچه نشانی خود ندارید",
-"Add contact" => "افزودن اطلاعات شخص مورد نظر",
-"CardDAV syncing addresses" => "CardDAV syncing addresses ",
-"more info" => "اطلاعات بیشتر",
-"Primary address (Kontact et al)" => "نشانی اولیه",
-"iOS/OS X" => "iOS/OS X ",
-"Download" => "بارگیری",
-"Edit" => "ویرایش",
-"New Address Book" => "کتابچه نشانه های جدید",
-"Save" => "ذخیره سازی",
-"Cancel" => "انصراف"
-);
diff --git a/apps/contacts/l10n/fi_FI.php b/apps/contacts/l10n/fi_FI.php
deleted file mode 100644
index 23cafe44dc..0000000000
--- a/apps/contacts/l10n/fi_FI.php
+++ /dev/null
@@ -1,159 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Error updating addressbook." => "Virhe päivitettäessä osoitekirjaa.",
-"Error setting checksum." => "Virhe asettaessa tarkistussummaa.",
-"No categories selected for deletion." => "Luokkia ei ole valittu poistettavaksi.",
-"No address books found." => "Osoitekirjoja ei löytynyt.",
-"No contacts found." => "Yhteystietoja ei löytynyt.",
-"There was an error adding the contact." => "Virhe yhteystietoa lisättäessä.",
-"Cannot add empty property." => "Tyhjää ominaisuutta ei voi lisätä.",
-"At least one of the address fields has to be filled out." => "Vähintään yksi osoitekenttä tulee täyttää.",
-"Information about vCard is incorrect. Please reload the page." => "vCardin tiedot eivät kelpaa. Lataa sivu uudelleen.",
-"Error parsing VCard for ID: \"" => "Virhe jäsennettäessä vCardia tunnisteelle: \"",
-"Error saving temporary file." => "Virhe tallennettaessa tilapäistiedostoa.",
-"No photo path was submitted." => "Kuvan polkua ei annettu.",
-"File doesn't exist:" => "Tiedostoa ei ole olemassa:",
-"Error loading image." => "Virhe kuvaa ladatessa.",
-"Error saving contact." => "Virhe yhteystietoa tallennettaessa.",
-"Error resizing image" => "Virhe asettaessa kuvaa uuteen kokoon",
-"Error cropping image" => "Virhe rajatessa kuvaa",
-"Error creating temporary image" => "Virhe luotaessa väliaikaista kuvaa",
-"There is no error, the file uploaded with success" => "Ei virhettä, tiedosto lähetettiin onnistuneesti",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Lähetetyn tiedoston koko ylittää upload_max_filesize-asetuksen arvon php.ini-tiedostossa",
-"The uploaded file was only partially uploaded" => "Lähetetty tiedosto lähetettiin vain osittain",
-"No file was uploaded" => "Tiedostoa ei lähetetty",
-"Missing a temporary folder" => "Tilapäiskansio puuttuu",
-"Couldn't save temporary image: " => "Väliaikaiskuvan tallennus epäonnistui:",
-"Couldn't load temporary image: " => "Väliaikaiskuvan lataus epäonnistui:",
-"No file was uploaded. Unknown error" => "Tiedostoa ei lähetetty. Tuntematon virhe",
-"Contacts" => "Yhteystiedot",
-"Error" => "Virhe",
-"Edit name" => "Muokkaa nimeä",
-"No files selected for upload." => "Tiedostoja ei ole valittu lähetettäväksi.",
-"Error loading profile picture." => "Virhe profiilikuvaa ladatessa.",
-"Select type" => "Valitse tyyppi",
-"Some contacts are marked for deletion, but not deleted yet. Please wait for them to be deleted." => "Jotkin yhteystiedot on merkitty poistettaviksi, mutta niitä ei ole vielä poistettu. Odota hetki, että kyseiset yhteystiedot poistetaan.",
-"Do you want to merge these address books?" => "Haluatko yhdistää nämä osoitekirjat?",
-"Result: " => "Tulos: ",
-" imported, " => " tuotu, ",
-" failed." => " epäonnistui.",
-"Displayname cannot be empty." => "Näyttönimi ei voi olla tyhjä.",
-"Addressbook not found: " => "Osoitekirjaa ei löytynyt:",
-"This is not your addressbook." => "Tämä ei ole osoitekirjasi.",
-"Contact could not be found." => "Yhteystietoa ei löytynyt.",
-"Jabber" => "Jabber",
-"AIM" => "AIM",
-"MSN" => "MSN",
-"Twitter" => "Twitter",
-"GoogleTalk" => "Google Talk",
-"Facebook" => "Facebook",
-"XMPP" => "XMPP",
-"ICQ" => "ICQ",
-"Yahoo" => "Yahoo",
-"Skype" => "Skype",
-"QQ" => "QQ",
-"GaduGadu" => "GaduGadu",
-"Work" => "Työ",
-"Home" => "Koti",
-"Other" => "Muu",
-"Mobile" => "Mobiili",
-"Text" => "Teksti",
-"Voice" => "Ääni",
-"Message" => "Viesti",
-"Fax" => "Faksi",
-"Video" => "Video",
-"Pager" => "Hakulaite",
-"Internet" => "Internet",
-"Birthday" => "Syntymäpäivä",
-"Business" => "Työ",
-"Questions" => "Kysymykset",
-"{name}'s Birthday" => "Henkilön {name} syntymäpäivä",
-"Contact" => "Yhteystieto",
-"Add Contact" => "Lisää yhteystieto",
-"Import" => "Tuo",
-"Settings" => "Asetukset",
-"Addressbooks" => "Osoitekirjat",
-"Close" => "Sulje",
-"Keyboard shortcuts" => "Pikanäppäimet",
-"Next contact in list" => "Seuraava yhteystieto luettelossa",
-"Previous contact in list" => "Edellinen yhteystieto luettelossa",
-"Next addressbook" => "Seuraava osoitekirja",
-"Previous addressbook" => "Edellinen osoitekirja",
-"Actions" => "Toiminnot",
-"Refresh contacts list" => "Päivitä yhteystietoluettelo",
-"Add new contact" => "Lisää uusi yhteystieto",
-"Add new addressbook" => "Lisää uusi osoitekirja",
-"Delete current contact" => "Poista nykyinen yhteystieto",
-"Delete current photo" => "Poista nykyinen valokuva",
-"Edit current photo" => "Muokkaa nykyistä valokuvaa",
-"Upload new photo" => "Lähetä uusi valokuva",
-"Select photo from ownCloud" => "Valitse valokuva ownCloudista",
-"Edit name details" => "Muokkaa nimitietoja",
-"Organization" => "Organisaatio",
-"Delete" => "Poista",
-"Nickname" => "Kutsumanimi",
-"Enter nickname" => "Anna kutsumanimi",
-"Web site" => "Verkkosivu",
-"http://www.somesite.com" => "http://www.somesite.com",
-"Go to web site" => "Siirry verkkosivulle",
-"Groups" => "Ryhmät",
-"Separate groups with commas" => "Erota ryhmät pilkuilla",
-"Edit groups" => "Muokkaa ryhmiä",
-"Preferred" => "Ensisijainen",
-"Please specify a valid email address." => "Anna kelvollinen sähköpostiosoite.",
-"Enter email address" => "Anna sähköpostiosoite",
-"Mail to address" => "Lähetä sähköpostia",
-"Delete email address" => "Poista sähköpostiosoite",
-"Enter phone number" => "Anna puhelinnumero",
-"Delete phone number" => "Poista puhelinnumero",
-"Instant Messenger" => "Pikaviestin",
-"View on map" => "Näytä kartalla",
-"Edit address details" => "Muokkaa osoitetietoja",
-"Add notes here." => "Lisää huomiot tähän.",
-"Add field" => "Lisää kenttä",
-"Phone" => "Puhelin",
-"Email" => "Sähköposti",
-"Address" => "Osoite",
-"Note" => "Huomio",
-"Download contact" => "Lataa yhteystieto",
-"Delete contact" => "Poista yhteystieto",
-"The temporary image has been removed from cache." => "Väliaikainen kuva on poistettu välimuistista.",
-"Edit address" => "Muokkaa osoitetta",
-"Type" => "Tyyppi",
-"PO Box" => "Postilokero",
-"Street address" => "Katuosoite",
-"Street and number" => "Katu ja numero",
-"Extended" => "Laajennettu",
-"Apartment number etc." => "Asunnon numero jne.",
-"City" => "Paikkakunta",
-"Region" => "Alue",
-"Zipcode" => "Postinumero",
-"Postal code" => "Postinumero",
-"Country" => "Maa",
-"Addressbook" => "Osoitekirja",
-"Given name" => "Etunimi",
-"Additional names" => "Lisänimet",
-"Family name" => "Sukunimi",
-"Import a contacts file" => "Tuo yhteystiedon sisältävä tiedosto",
-"Please choose the addressbook" => "Valitse osoitekirja",
-"create a new addressbook" => "luo uusi osoitekirja",
-"Name of new addressbook" => "Uuden osoitekirjan nimi",
-"Importing contacts" => "Tuodaan yhteystietoja",
-"You have no contacts in your addressbook." => "Osoitekirjassasi ei ole yhteystietoja.",
-"Add contact" => "Lisää yhteystieto",
-"Select Address Books" => "Valitse osoitekirjat",
-"Enter name" => "Anna nimi",
-"Enter description" => "Anna kuvaus",
-"CardDAV syncing addresses" => "CardDAV-synkronointiosoitteet",
-"iOS/OS X" => "iOS/OS X",
-"Show CardDav link" => "Näytä CardDav-linkki",
-"Show read-only VCF link" => "Näytä vain luku -muodossa oleva VCF-linkki",
-"Share" => "Jaa",
-"Download" => "Lataa",
-"Edit" => "Muokkaa",
-"New Address Book" => "Uusi osoitekirja",
-"Name" => "Nimi",
-"Description" => "Kuvaus",
-"Save" => "Tallenna",
-"Cancel" => "Peru",
-"More..." => "Lisää..."
-);
diff --git a/apps/contacts/l10n/fr.php b/apps/contacts/l10n/fr.php
deleted file mode 100644
index 91df9a4b51..0000000000
--- a/apps/contacts/l10n/fr.php
+++ /dev/null
@@ -1,235 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "Des erreurs se sont produites lors de l'activation/désactivation du carnet d'adresses.",
-"id is not set." => "L'ID n'est pas défini.",
-"Cannot update addressbook with an empty name." => "Impossible de mettre à jour le carnet d'adresses avec un nom vide.",
-"Error updating addressbook." => "Erreur lors de la mise à jour du carnet d'adresses.",
-"No ID provided" => "Aucun ID fourni",
-"Error setting checksum." => "Erreur lors du paramétrage du hachage.",
-"No categories selected for deletion." => "Pas de catégories sélectionnées pour la suppression.",
-"No address books found." => "Pas de carnet d'adresses trouvé.",
-"No contacts found." => "Aucun contact trouvé.",
-"There was an error adding the contact." => "Une erreur s'est produite lors de l'ajout du contact.",
-"element name is not set." => "Le champ Nom n'est pas défini.",
-"Could not parse contact: " => "Impossible de lire le contact :",
-"Cannot add empty property." => "Impossible d'ajouter un champ vide.",
-"At least one of the address fields has to be filled out." => "Au moins un des champs d'adresses doit être complété.",
-"Trying to add duplicate property: " => "Ajout d'une propriété en double:",
-"Missing IM parameter." => "Paramètre de Messagerie Instantanée manquants.",
-"Unknown IM: " => "Messagerie Instantanée inconnue",
-"Information about vCard is incorrect. Please reload the page." => "Les informations relatives à cette vCard sont incorrectes. Veuillez recharger la page.",
-"Missing ID" => "ID manquant",
-"Error parsing VCard for ID: \"" => "Erreur lors de l'analyse du VCard pour l'ID: \"",
-"checksum is not set." => "L'hachage n'est pas défini.",
-"Information about vCard is incorrect. Please reload the page: " => "L'informatiion à propos de la vCard est incorrect. Merci de rafraichir la page:",
-"Something went FUBAR. " => "Quelque chose est FUBAR.",
-"No contact ID was submitted." => "Aucun ID de contact envoyé",
-"Error reading contact photo." => "Erreur de lecture de la photo du contact.",
-"Error saving temporary file." => "Erreur de sauvegarde du fichier temporaire.",
-"The loading photo is not valid." => "La photo chargée est invalide.",
-"Contact ID is missing." => "L'ID du contact est manquant.",
-"No photo path was submitted." => "Le chemin de la photo n'a pas été envoyé.",
-"File doesn't exist:" => "Fichier inexistant:",
-"Error loading image." => "Erreur lors du chargement de l'image.",
-"Error getting contact object." => "Erreur lors de l'obtention de l'objet contact",
-"Error getting PHOTO property." => "Erreur lors de l'obtention des propriétés de la photo",
-"Error saving contact." => "Erreur de sauvegarde du contact",
-"Error resizing image" => "Erreur de redimensionnement de l'image",
-"Error cropping image" => "Erreur lors du rognage de l'image",
-"Error creating temporary image" => "Erreur de création de l'image temporaire",
-"Error finding image: " => "Erreur pour trouver l'image :",
-"Error uploading contacts to storage." => "Erreur lors de l'envoi des contacts vers le stockage.",
-"There is no error, the file uploaded with success" => "Il n'y a pas d'erreur, le fichier a été envoyé avec succes.",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Le fichier envoyé dépasse la directive upload_max_filesize dans php.ini",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Le fichier envoyé dépasse la directive MAX_FILE_SIZE qui est spécifiée dans le formulaire HTML.",
-"The uploaded file was only partially uploaded" => "Le fichier envoyé n'a été que partiellement envoyé.",
-"No file was uploaded" => "Pas de fichier envoyé.",
-"Missing a temporary folder" => "Absence de dossier temporaire.",
-"Couldn't save temporary image: " => "Impossible de sauvegarder l'image temporaire :",
-"Couldn't load temporary image: " => "Impossible de charger l'image temporaire :",
-"No file was uploaded. Unknown error" => "Aucun fichier n'a été chargé. Erreur inconnue",
-"Contacts" => "Contacts",
-"Sorry, this functionality has not been implemented yet" => "Désolé cette fonctionnalité n'a pas encore été implémentée",
-"Not implemented" => "Pas encore implémenté",
-"Couldn't get a valid address." => "Impossible de trouver une adresse valide.",
-"Error" => "Erreur",
-"You do not have permission to add contacts to " => "Vous n'avez pas l'autorisation d'ajouter des contacts à",
-"Please select one of your own address books." => "Veuillez sélectionner l'un de vos carnets d'adresses.",
-"Permission error" => "Erreur de permission",
-"This property has to be non-empty." => "Cette valeur ne doit pas être vide",
-"Couldn't serialize elements." => "Impossible de sérialiser les éléments.",
-"'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "'deleteProperty' a été appelé sans type d'arguments. Merci de rapporter un bug à bugs.owncloud.org",
-"Edit name" => "Éditer le nom",
-"No files selected for upload." => "Aucun fichiers choisis pour être chargés",
-"The file you are trying to upload exceed the maximum size for file uploads on this server." => "Le fichier que vous tentez de charger dépasse la taille maximum de fichier autorisée sur ce serveur.",
-"Error loading profile picture." => "Erreur pendant le chargement de la photo de profil.",
-"Select type" => "Sélectionner un type",
-"Some contacts are marked for deletion, but not deleted yet. Please wait for them to be deleted." => "Certains contacts sont marqués pour être supprimés, mais ne le sont pas encore. Veuillez attendre que l'opération se termine.",
-"Do you want to merge these address books?" => "Voulez-vous fusionner ces carnets d'adresses ?",
-"Result: " => "Résultat :",
-" imported, " => "importé,",
-" failed." => "échoué.",
-"Displayname cannot be empty." => "Le nom d'affichage ne peut pas être vide.",
-"Addressbook not found: " => "Carnet d'adresse introuvable : ",
-"This is not your addressbook." => "Ce n'est pas votre carnet d'adresses.",
-"Contact could not be found." => "Ce contact n'a pu être trouvé.",
-"Jabber" => "Jabber",
-"AIM" => "Messagerie Instantanée",
-"MSN" => "MSN",
-"Twitter" => "Twitter",
-"GoogleTalk" => "GoogleTalk",
-"Facebook" => "Facebook",
-"XMPP" => "XMPP",
-"ICQ" => "ICQ",
-"Yahoo" => "Yahoo",
-"Skype" => "Skype",
-"QQ" => "QQ",
-"GaduGadu" => "GaduGadu",
-"Work" => "Travail",
-"Home" => "Domicile",
-"Other" => "Autre",
-"Mobile" => "Mobile",
-"Text" => "Texte",
-"Voice" => "Voix",
-"Message" => "Message",
-"Fax" => "Fax",
-"Video" => "Vidéo",
-"Pager" => "Bipeur",
-"Internet" => "Internet",
-"Birthday" => "Anniversaire",
-"Business" => "Business",
-"Call" => "Appel",
-"Clients" => "Clients",
-"Deliverer" => "Livreur",
-"Holidays" => "Vacances",
-"Ideas" => "Idées",
-"Journey" => "Trajet",
-"Jubilee" => "Jubilé",
-"Meeting" => "Rendez-vous",
-"Personal" => "Personnel",
-"Projects" => "Projets",
-"Questions" => "Questions",
-"{name}'s Birthday" => "Anniversaire de {name}",
-"Contact" => "Contact",
-"You do not have the permissions to edit this contact." => "Vous n'avez pas l'autorisation de modifier ce contact.",
-"You do not have the permissions to delete this contact." => "Vous n'avez pas l'autorisation de supprimer ce contact.",
-"Add Contact" => "Ajouter un Contact",
-"Import" => "Importer",
-"Settings" => "Paramètres",
-"Addressbooks" => "Carnets d'adresses",
-"Close" => "Fermer",
-"Keyboard shortcuts" => "Raccourcis clavier",
-"Navigation" => "Navigation",
-"Next contact in list" => "Contact suivant dans la liste",
-"Previous contact in list" => "Contact précédent dans la liste",
-"Expand/collapse current addressbook" => "Dé/Replier le carnet d'adresses courant",
-"Next addressbook" => "Carnet d'adresses suivant",
-"Previous addressbook" => "Carnet d'adresses précédent",
-"Actions" => "Actions",
-"Refresh contacts list" => "Actualiser la liste des contacts",
-"Add new contact" => "Ajouter un nouveau contact",
-"Add new addressbook" => "Ajouter un nouveau carnet d'adresses",
-"Delete current contact" => "Effacer le contact sélectionné",
-"Drop photo to upload" => "Glisser une photo pour l'envoi",
-"Delete current photo" => "Supprimer la photo actuelle",
-"Edit current photo" => "Editer la photo actuelle",
-"Upload new photo" => "Envoyer une nouvelle photo",
-"Select photo from ownCloud" => "Sélectionner une photo depuis ownCloud",
-"Format custom, Short name, Full name, Reverse or Reverse with comma" => "Formatage personnalisé, Nom court, Nom complet, Inversé, Inversé avec virgule",
-"Edit name details" => "Editer les noms",
-"Organization" => "Société",
-"Delete" => "Supprimer",
-"Nickname" => "Surnom",
-"Enter nickname" => "Entrer un surnom",
-"Web site" => "Page web",
-"http://www.somesite.com" => "http://www.somesite.com",
-"Go to web site" => "Allez à la page web",
-"dd-mm-yyyy" => "jj-mm-aaaa",
-"Groups" => "Groupes",
-"Separate groups with commas" => "Séparer les groupes avec des virgules",
-"Edit groups" => "Editer les groupes",
-"Preferred" => "Préféré",
-"Please specify a valid email address." => "Merci d'entrer une adresse e-mail valide.",
-"Enter email address" => "Entrer une adresse e-mail",
-"Mail to address" => "Envoyer à l'adresse",
-"Delete email address" => "Supprimer l'adresse e-mail",
-"Enter phone number" => "Entrer un numéro de téléphone",
-"Delete phone number" => "Supprimer le numéro de téléphone",
-"Instant Messenger" => "Instant Messenger",
-"Delete IM" => "Supprimer la Messagerie Instantanée",
-"View on map" => "Voir sur une carte",
-"Edit address details" => "Editer les adresses",
-"Add notes here." => "Ajouter des notes ici.",
-"Add field" => "Ajouter un champ.",
-"Phone" => "Téléphone",
-"Email" => "E-mail",
-"Instant Messaging" => "Messagerie instantanée",
-"Address" => "Adresse",
-"Note" => "Note",
-"Download contact" => "Télécharger le contact",
-"Delete contact" => "Supprimer le contact",
-"The temporary image has been removed from cache." => "L'image temporaire a été supprimée du cache.",
-"Edit address" => "Editer l'adresse",
-"Type" => "Type",
-"PO Box" => "Boîte postale",
-"Street address" => "Adresse postale",
-"Street and number" => "Rue et numéro",
-"Extended" => "Étendu",
-"Apartment number etc." => "Numéro d'appartement, etc.",
-"City" => "Ville",
-"Region" => "Région",
-"E.g. state or province" => "Ex: état ou province",
-"Zipcode" => "Code postal",
-"Postal code" => "Code postal",
-"Country" => "Pays",
-"Addressbook" => "Carnet d'adresses",
-"Hon. prefixes" => "Préfixe hon.",
-"Miss" => "Mlle",
-"Ms" => "Mme",
-"Mr" => "M.",
-"Sir" => "Sir",
-"Mrs" => "Mme",
-"Dr" => "Dr",
-"Given name" => "Prénom",
-"Additional names" => "Nom supplémentaires",
-"Family name" => "Nom de famille",
-"Hon. suffixes" => "Suffixes hon.",
-"J.D." => "J.D.",
-"M.D." => "Dr.",
-"D.O." => "D.O.",
-"D.C." => "D.C.",
-"Ph.D." => "Dr",
-"Esq." => "Esq.",
-"Jr." => "Jr.",
-"Sn." => "Sn.",
-"Import a contacts file" => "Importer un fichier de contacts",
-"Please choose the addressbook" => "Choisissez le carnet d'adresses SVP",
-"create a new addressbook" => "Créer un nouveau carnet d'adresses",
-"Name of new addressbook" => "Nom du nouveau carnet d'adresses",
-"Importing contacts" => "Importation des contacts",
-"Contacts imported successfully" => "Contacts importés avec succes",
-"Close Dialog" => "Fermer la boite de dialogue",
-"Import Addressbook" => "Importer un carnet d'adresses.",
-"Select address book to import to:" => "Selectionner le carnet d'adresses à importer vers:",
-"Drop a VCF file to import contacts." => "Glisser un fichier VCF pour importer des contacts.",
-"Select from HD" => "Selectionner depuis le disque dur",
-"You have no contacts in your addressbook." => "Il n'y a pas de contact dans votre carnet d'adresses.",
-"Add contact" => "Ajouter un contact",
-"Select Address Books" => "Choix du carnet d'adresses",
-"Enter name" => "Saisissez le nom",
-"Enter description" => "Saisissez une description",
-"CardDAV syncing addresses" => "Synchronisation des contacts CardDAV",
-"more info" => "Plus d'infos",
-"Primary address (Kontact et al)" => "Adresse principale",
-"iOS/OS X" => "iOS/OS X",
-"Show CardDav link" => "Afficher le lien CardDav",
-"Show read-only VCF link" => "Afficher les liens VCF en lecture seule",
-"Share" => "Partager",
-"Download" => "Télécharger",
-"Edit" => "Modifier",
-"New Address Book" => "Nouveau Carnet d'adresses",
-"Name" => "Nom",
-"Description" => "Description",
-"Save" => "Sauvegarder",
-"Cancel" => "Annuler",
-"More..." => "Plus…"
-);
diff --git a/apps/contacts/l10n/gl.php b/apps/contacts/l10n/gl.php
deleted file mode 100644
index f25219b22c..0000000000
--- a/apps/contacts/l10n/gl.php
+++ /dev/null
@@ -1,157 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "Produciuse un erro (des)activando a axenda.",
-"id is not set." => "non se estableceu o id.",
-"Cannot update addressbook with an empty name." => "Non se pode actualizar a libreta de enderezos sen completar o nome.",
-"Error updating addressbook." => "Produciuse un erro actualizando a axenda.",
-"No ID provided" => "Non se proveeu ID",
-"Error setting checksum." => "Erro establecendo a suma de verificación",
-"No categories selected for deletion." => "Non se seleccionaron categorías para borrado.",
-"No address books found." => "Non se atoparon libretas de enderezos.",
-"No contacts found." => "Non se atoparon contactos.",
-"There was an error adding the contact." => "Produciuse un erro engadindo o contacto.",
-"element name is not set." => "non se nomeou o elemento.",
-"Cannot add empty property." => "Non se pode engadir unha propiedade baleira.",
-"At least one of the address fields has to be filled out." => "Polo menos un dos campos do enderezo ten que ser cuberto.",
-"Trying to add duplicate property: " => "Tentando engadir propiedade duplicada: ",
-"Information about vCard is incorrect. Please reload the page." => "A información sobre a vCard é incorrecta. Por favor volva cargar a páxina.",
-"Missing ID" => "ID perdido",
-"Error parsing VCard for ID: \"" => "Erro procesando a VCard para o ID: \"",
-"checksum is not set." => "non se estableceu a suma de verificación.",
-"Information about vCard is incorrect. Please reload the page: " => "A información sobre a vCard é incorrecta. Por favor, recargue a páxina: ",
-"No contact ID was submitted." => "Non se enviou ningún ID de contacto.",
-"Error reading contact photo." => "Erro lendo a fotografía do contacto.",
-"Error saving temporary file." => "Erro gardando o ficheiro temporal.",
-"The loading photo is not valid." => "A fotografía cargada non é válida.",
-"Contact ID is missing." => "Falta o ID do contacto.",
-"No photo path was submitted." => "Non se enviou a ruta a unha foto.",
-"File doesn't exist:" => "O ficheiro non existe:",
-"Error loading image." => "Erro cargando imaxe.",
-"Error getting contact object." => "Erro obtendo o obxeto contacto.",
-"Error getting PHOTO property." => "Erro obtendo a propiedade PHOTO.",
-"Error saving contact." => "Erro gardando o contacto.",
-"Error resizing image" => "Erro cambiando o tamaño da imaxe",
-"Error cropping image" => "Erro recortando a imaxe",
-"Error creating temporary image" => "Erro creando a imaxe temporal",
-"Error finding image: " => "Erro buscando a imaxe: ",
-"Error uploading contacts to storage." => "Erro subindo os contactos ao almacén.",
-"There is no error, the file uploaded with success" => "Non houbo erros, o ficheiro subeuse con éxito",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "O ficheiro subido supera a directiva upload_max_filesize no php.ini",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "O ficheiro subido supera a directiva MAX_FILE_SIZE especificada no formulario HTML",
-"The uploaded file was only partially uploaded" => "O ficheiro so foi parcialmente subido",
-"No file was uploaded" => "Non se subeu ningún ficheiro",
-"Missing a temporary folder" => "Falta o cartafol temporal",
-"Couldn't save temporary image: " => "Non se puido gardar a imaxe temporal: ",
-"Couldn't load temporary image: " => "Non se puido cargar a imaxe temporal: ",
-"No file was uploaded. Unknown error" => "Non se subeu ningún ficheiro. Erro descoñecido.",
-"Contacts" => "Contactos",
-"Sorry, this functionality has not been implemented yet" => "Sentímolo, esta función aínda non foi implementada.",
-"Not implemented" => "Non implementada.",
-"Couldn't get a valid address." => "Non se puido obter un enderezo de correo válido.",
-"Error" => "Erro",
-"This property has to be non-empty." => "Esta propiedade non pode quedar baldeira.",
-"Couldn't serialize elements." => "Non se puido serializar os elementos.",
-"'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "'deleteProperty' chamado sen argumento. Por favor, informe en bugs.owncloud.org",
-"Edit name" => "Editar nome",
-"No files selected for upload." => "Sen ficheiros escollidos para subir.",
-"The file you are trying to upload exceed the maximum size for file uploads on this server." => "O ficheiro que tenta subir supera o tamaño máximo permitido neste servidor.",
-"Select type" => "Seleccione tipo",
-"Result: " => "Resultado: ",
-" imported, " => " importado, ",
-" failed." => " fallou.",
-"This is not your addressbook." => "Esta non é a súa axenda.",
-"Contact could not be found." => "Non se atopou o contacto.",
-"Work" => "Traballo",
-"Home" => "Casa",
-"Mobile" => "Móbil",
-"Text" => "Texto",
-"Voice" => "Voz",
-"Message" => "Mensaxe",
-"Fax" => "Fax",
-"Video" => "Vídeo",
-"Pager" => "Paxinador",
-"Internet" => "Internet",
-"Birthday" => "Aniversario",
-"{name}'s Birthday" => "Cumpleanos de {name}",
-"Contact" => "Contacto",
-"Add Contact" => "Engadir contacto",
-"Import" => "Importar",
-"Addressbooks" => "Axendas",
-"Close" => "Pechar",
-"Drop photo to upload" => "Solte a foto a subir",
-"Delete current photo" => "Borrar foto actual",
-"Edit current photo" => "Editar a foto actual",
-"Upload new photo" => "Subir unha nova foto",
-"Select photo from ownCloud" => "Escoller foto desde ownCloud",
-"Format custom, Short name, Full name, Reverse or Reverse with comma" => "Formato personalizado, Nome corto, Nome completo, Inverso ou Inverso con coma",
-"Edit name details" => "Editar detalles do nome",
-"Organization" => "Organización",
-"Delete" => "Eliminar",
-"Nickname" => "Apodo",
-"Enter nickname" => "Introuza apodo",
-"dd-mm-yyyy" => "dd-mm-yyyy",
-"Groups" => "Grupos",
-"Separate groups with commas" => "Separe grupos con comas",
-"Edit groups" => "Editar grupos",
-"Preferred" => "Preferido",
-"Please specify a valid email address." => "Por favor indique un enderezo de correo electrónico válido.",
-"Enter email address" => "Introduza enderezo de correo electrónico",
-"Mail to address" => "Correo ao enderezo",
-"Delete email address" => "Borrar enderezo de correo electrónico",
-"Enter phone number" => "Introducir número de teléfono",
-"Delete phone number" => "Borrar número de teléfono",
-"View on map" => "Ver no mapa",
-"Edit address details" => "Editar detalles do enderezo",
-"Add notes here." => "Engadir aquí as notas.",
-"Add field" => "Engadir campo",
-"Phone" => "Teléfono",
-"Email" => "Correo electrónico",
-"Address" => "Enderezo",
-"Note" => "Nota",
-"Download contact" => "Descargar contacto",
-"Delete contact" => "Borrar contacto",
-"The temporary image has been removed from cache." => "A imaxe temporal foi eliminada da caché.",
-"Edit address" => "Editar enderezo",
-"Type" => "Escribir",
-"PO Box" => "Apartado de correos",
-"Extended" => "Ampliado",
-"City" => "Cidade",
-"Region" => "Autonomía",
-"Zipcode" => "Código postal",
-"Country" => "País",
-"Addressbook" => "Axenda",
-"Hon. prefixes" => "Prefixos honoríficos",
-"Miss" => "Srta",
-"Ms" => "Sra/Srta",
-"Mr" => "Sr",
-"Sir" => "Sir",
-"Mrs" => "Sra",
-"Dr" => "Dr",
-"Given name" => "Apodo",
-"Additional names" => "Nomes adicionais",
-"Family name" => "Nome familiar",
-"Hon. suffixes" => "Sufixos honorarios",
-"J.D." => "J.D.",
-"M.D." => "M.D.",
-"D.O." => "D.O.",
-"D.C." => "D.C.",
-"Ph.D." => "Ph.D.",
-"Esq." => "Esq.",
-"Jr." => "Jr.",
-"Sn." => "Sn.",
-"Import a contacts file" => "Importar un ficheiro de contactos",
-"Please choose the addressbook" => "Por favor escolla unha libreta de enderezos",
-"create a new addressbook" => "crear unha nova libreta de enderezos",
-"Name of new addressbook" => "Nome da nova libreta de enderezos",
-"Importing contacts" => "Importando contactos",
-"You have no contacts in your addressbook." => "Non ten contactos na súa libreta de enderezos.",
-"Add contact" => "Engadir contacto",
-"CardDAV syncing addresses" => "Enderezos CardDAV a sincronizar",
-"more info" => "máis información",
-"Primary address (Kontact et al)" => "Enderezo primario (Kontact et al)",
-"iOS/OS X" => "iOS/OS X",
-"Download" => "Descargar",
-"Edit" => "Editar",
-"New Address Book" => "Nova axenda",
-"Save" => "Gardar",
-"Cancel" => "Cancelar"
-);
diff --git a/apps/contacts/l10n/he.php b/apps/contacts/l10n/he.php
deleted file mode 100644
index b224403ad2..0000000000
--- a/apps/contacts/l10n/he.php
+++ /dev/null
@@ -1,135 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "שגיאה בהפעלה או בנטרול פנקס הכתובות.",
-"id is not set." => "מספר מזהה לא נקבע.",
-"Cannot update addressbook with an empty name." => "אי אפשר לעדכן ספר כתובות ללא שם",
-"Error updating addressbook." => "שגיאה בעדכון פנקס הכתובות.",
-"No ID provided" => "לא צוין מזהה",
-"Error setting checksum." => "שגיאה בהגדרת נתוני הביקורת.",
-"No categories selected for deletion." => "לא נבחור קטגוריות למחיקה.",
-"No address books found." => "לא נמצאו פנקסי כתובות.",
-"No contacts found." => "לא נמצאו אנשי קשר.",
-"There was an error adding the contact." => "אירעה שגיאה בעת הוספת איש הקשר.",
-"element name is not set." => "שם האלמנט לא נקבע.",
-"Cannot add empty property." => "לא ניתן להוסיף מאפיין ריק.",
-"At least one of the address fields has to be filled out." => "יש למלא לפחות אחד משדות הכתובת.",
-"Trying to add duplicate property: " => "ניסיון להוספת מאפיין כפול: ",
-"Information about vCard is incorrect. Please reload the page." => "המידע אודות vCard אינו נכון. נא לטעון מחדש את הדף.",
-"Missing ID" => "מזהה חסר",
-"Error parsing VCard for ID: \"" => "שגיאה בפענוח ה VCard עבור מספר המזהה: \"",
-"checksum is not set." => "סיכום ביקורת לא נקבע.",
-"Information about vCard is incorrect. Please reload the page: " => "המידע עבור ה vCard אינו נכון. אנא טען את העמוד: ",
-"Something went FUBAR. " => "משהו לא התנהל כצפוי.",
-"No contact ID was submitted." => "מספר מזהה של אישר הקשר לא נשלח.",
-"Error reading contact photo." => "שגיאה בקריאת תמונת איש הקשר.",
-"Error saving temporary file." => "שגיאה בשמירת קובץ זמני.",
-"The loading photo is not valid." => "התמונה הנטענת אינה תקנית.",
-"Contact ID is missing." => "מספר מזהה של אישר הקשר חסר.",
-"No photo path was submitted." => "כתובת התמונה לא נשלחה",
-"File doesn't exist:" => "קובץ לא קיים:",
-"Error loading image." => "שגיאה בטעינת התמונה.",
-"Error getting contact object." => "שגיאה בקבלת אוביאקט איש הקשר",
-"Error getting PHOTO property." => "שגיאה בקבלת מידע של תמונה",
-"Error saving contact." => "שגיאה בשמירת איש הקשר",
-"Error resizing image" => "שגיאה בשינוי גודל התמונה",
-"Error uploading contacts to storage." => "התרשה שגיאה בהעלאת אנשי הקשר לאכסון.",
-"There is no error, the file uploaded with success" => "לא התרחשה שגיאה, הקובץ הועלה בהצלחה",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "גודל הקובץ שהועלה גדול מהערך upload_max_filesize שמוגדר בקובץ php.ini",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "הקובץ שהועלה גדוך מהערך MAX_FILE_SIZE שהוגדר בתופס HTML",
-"The uploaded file was only partially uploaded" => "הקובץ הועלה באופן חלקי בלבד",
-"No file was uploaded" => "שום קובץ לא הועלה",
-"Missing a temporary folder" => "תקיה זמנית חסרה",
-"Contacts" => "אנשי קשר",
-"This is not your addressbook." => "זהו אינו ספר הכתובות שלך",
-"Contact could not be found." => "לא ניתן לאתר איש קשר",
-"Work" => "עבודה",
-"Home" => "בית",
-"Mobile" => "נייד",
-"Text" => "טקסט",
-"Voice" => "קולי",
-"Message" => "הודעה",
-"Fax" => "פקס",
-"Video" => "וידאו",
-"Pager" => "זימונית",
-"Internet" => "אינטרנט",
-"Birthday" => "יום הולדת",
-"{name}'s Birthday" => "יום ההולדת של {name}",
-"Contact" => "איש קשר",
-"Add Contact" => "הוספת איש קשר",
-"Import" => "יבא",
-"Addressbooks" => "פנקסי כתובות",
-"Drop photo to upload" => "גרור ושחרר תמונה בשביל להעלות",
-"Delete current photo" => "מחק תמונה נוכחית",
-"Edit current photo" => "ערוך תמונה נוכחית",
-"Upload new photo" => "העלה תמונה חדשה",
-"Select photo from ownCloud" => "בחר תמונה מ ownCloud",
-"Edit name details" => "ערוך פרטי שם",
-"Organization" => "ארגון",
-"Delete" => "מחיקה",
-"Nickname" => "כינוי",
-"Enter nickname" => "הכנס כינוי",
-"dd-mm-yyyy" => "dd-mm-yyyy",
-"Groups" => "קבוצות",
-"Separate groups with commas" => "הפרד קבוצות עם פסיקים",
-"Edit groups" => "ערוך קבוצות",
-"Preferred" => "מועדף",
-"Please specify a valid email address." => "אנא הזן כתובת דוא\"ל חוקית",
-"Enter email address" => "הזן כתובת דוא\"ל",
-"Mail to address" => "כתובת",
-"Delete email address" => "מחק כתובת דוא\"ל",
-"Enter phone number" => "הכנס מספר טלפון",
-"Delete phone number" => "מחק מספר טלפון",
-"View on map" => "ראה במפה",
-"Edit address details" => "ערוך פרטי כתובת",
-"Add notes here." => "הוסף הערות כאן.",
-"Add field" => "הוסף שדה",
-"Phone" => "טלפון",
-"Email" => "דואר אלקטרוני",
-"Address" => "כתובת",
-"Note" => "הערה",
-"Download contact" => "הורדת איש קשר",
-"Delete contact" => "מחיקת איש קשר",
-"Edit address" => "ערוך כתובת",
-"Type" => "סוג",
-"PO Box" => "תא דואר",
-"Extended" => "מורחב",
-"City" => "עיר",
-"Region" => "אזור",
-"Zipcode" => "מיקוד",
-"Country" => "מדינה",
-"Addressbook" => "פנקס כתובות",
-"Hon. prefixes" => "קידומות שם",
-"Miss" => "גב'",
-"Ms" => "גב'",
-"Mr" => "מר'",
-"Sir" => "אדון",
-"Mrs" => "גב'",
-"Dr" => "ד\"ר",
-"Given name" => "שם",
-"Additional names" => "שמות נוספים",
-"Family name" => "שם משפחה",
-"Hon. suffixes" => "סיומות שם",
-"J.D." => "J.D.",
-"M.D." => "M.D.",
-"D.O." => "D.O.",
-"D.C." => "D.C.",
-"Ph.D." => "Ph.D.",
-"Esq." => "Esq.",
-"Jr." => "Jr.",
-"Sn." => "Sn.",
-"Import a contacts file" => "יבא קובץ אנשי קשר",
-"Please choose the addressbook" => "אנא בחר ספר כתובות",
-"create a new addressbook" => "צור ספר כתובות חדש",
-"Name of new addressbook" => "שם ספר כתובות החדש",
-"Importing contacts" => "מיבא אנשי קשר",
-"You have no contacts in your addressbook." => "איך לך אנשי קשר בספר הכתובות",
-"Add contact" => "הוסף איש קשר",
-"CardDAV syncing addresses" => "CardDAV מסנכרן כתובות",
-"more info" => "מידע נוסף",
-"Primary address (Kontact et al)" => "כתובת ראשית",
-"iOS/OS X" => "iOS/OS X",
-"Download" => "הורדה",
-"Edit" => "עריכה",
-"New Address Book" => "פנקס כתובות חדש",
-"Save" => "שמירה",
-"Cancel" => "ביטול"
-);
diff --git a/apps/contacts/l10n/hr.php b/apps/contacts/l10n/hr.php
deleted file mode 100644
index 769a6ced0f..0000000000
--- a/apps/contacts/l10n/hr.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "Pogreška pri (de)aktivaciji adresara.",
-"id is not set." => "id nije postavljen.",
-"Cannot update addressbook with an empty name." => "Ne mogu ažurirati adresar sa praznim nazivom.",
-"Error updating addressbook." => "Pogreška pri ažuriranju adresara.",
-"No ID provided" => "Nema dodijeljenog ID identifikatora",
-"Error setting checksum." => "Pogreška pri postavljanju checksuma.",
-"No categories selected for deletion." => "Niti jedna kategorija nije odabrana za brisanje.",
-"No address books found." => "Nema adresara.",
-"No contacts found." => "Nema kontakata.",
-"There was an error adding the contact." => "Dogodila se pogreška prilikom dodavanja kontakta.",
-"element name is not set." => "naziv elementa nije postavljen.",
-"Cannot add empty property." => "Prazno svojstvo se ne može dodati.",
-"At least one of the address fields has to be filled out." => "Morate ispuniti barem jedno od adresnih polja.",
-"Trying to add duplicate property: " => "Pokušali ste dodati duplo svojstvo:",
-"Information about vCard is incorrect. Please reload the page." => "Informacija o vCard je neispravna. Osvježite stranicu.",
-"Missing ID" => "Nedostupan ID identifikator",
-"Error parsing VCard for ID: \"" => "Pogreška pri raščlanjivanju VCard za ID:",
-"checksum is not set." => "checksum nije postavljen.",
-"Information about vCard is incorrect. Please reload the page: " => "Informacije o VCard su pogrešne. Molimo, učitajte ponovno stranicu:",
-"Something went FUBAR. " => "Nešto je otišlo... krivo...",
-"No contact ID was submitted." => "ID kontakta nije podnešen.",
-"Error reading contact photo." => "Pogreška pri čitanju kontakt fotografije.",
-"Error saving temporary file." => "Pogreška pri spremanju privremene datoteke.",
-"The loading photo is not valid." => "Fotografija nije valjana.",
-"Contact ID is missing." => "ID kontakta nije dostupan.",
-"No photo path was submitted." => "Putanja do fotografije nije podnešena.",
-"File doesn't exist:" => "Datoteka ne postoji:",
-"Error loading image." => "Pogreška pri učitavanju slike.",
-"Error uploading contacts to storage." => "Pogreška pri slanju kontakata.",
-"There is no error, the file uploaded with success" => "Nema pogreške, datoteka je poslana uspješno.",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Veličina poslane datoteke prelazi veličinu prikazanu u upload_max_filesize direktivi u konfiguracijskoj datoteci php.ini",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Poslana datoteka prelazi veličinu prikazanu u MAX_FILE_SIZE direktivi u HTML formi",
-"The uploaded file was only partially uploaded" => "Poslana datoteka je parcijalno poslana",
-"No file was uploaded" => "Datoteka nije poslana",
-"Missing a temporary folder" => "Nedostaje privremeni direktorij",
-"Contacts" => "Kontakti",
-"This is not your addressbook." => "Ovo nije vaš adresar.",
-"Contact could not be found." => "Kontakt ne postoji.",
-"Work" => "Posao",
-"Home" => "Kuća",
-"Mobile" => "Mobitel",
-"Text" => "Tekst",
-"Voice" => "Glasovno",
-"Message" => "Poruka",
-"Fax" => "Fax",
-"Video" => "Video",
-"Pager" => "Pager",
-"Internet" => "Internet",
-"Birthday" => "Rođendan",
-"{name}'s Birthday" => "{name} Rođendan",
-"Contact" => "Kontakt",
-"Add Contact" => "Dodaj kontakt",
-"Import" => "Uvezi",
-"Addressbooks" => "Adresari",
-"Drop photo to upload" => "Dovucite fotografiju za slanje",
-"Edit current photo" => "Uredi trenutnu sliku",
-"Edit name details" => "Uredi detalje imena",
-"Organization" => "Organizacija",
-"Delete" => "Obriši",
-"Nickname" => "Nadimak",
-"Enter nickname" => "Unesi nadimank",
-"dd-mm-yyyy" => "dd-mm-yyyy",
-"Groups" => "Grupe",
-"Edit groups" => "Uredi grupe",
-"Preferred" => "Preferirano",
-"Enter email address" => "Unesi email adresu",
-"Enter phone number" => "Unesi broj telefona",
-"View on map" => "Prikaži na karti",
-"Edit address details" => "Uredi detalje adrese",
-"Add notes here." => "Dodaj bilješke ovdje.",
-"Add field" => "Dodaj polje",
-"Phone" => "Telefon",
-"Email" => "E-mail",
-"Address" => "Adresa",
-"Note" => "Bilješka",
-"Download contact" => "Preuzmi kontakt",
-"Delete contact" => "Izbriši kontakt",
-"Edit address" => "Uredi adresu",
-"Type" => "Tip",
-"PO Box" => "Poštanski Pretinac",
-"Extended" => "Prošireno",
-"City" => "Grad",
-"Region" => "Regija",
-"Zipcode" => "Poštanski broj",
-"Country" => "Država",
-"Addressbook" => "Adresar",
-"Download" => "Preuzimanje",
-"Edit" => "Uredi",
-"New Address Book" => "Novi adresar",
-"Save" => "Spremi",
-"Cancel" => "Prekini"
-);
diff --git a/apps/contacts/l10n/hu_HU.php b/apps/contacts/l10n/hu_HU.php
deleted file mode 100644
index 4febe9c29f..0000000000
--- a/apps/contacts/l10n/hu_HU.php
+++ /dev/null
@@ -1,158 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "Címlista (de)aktiválása sikertelen",
-"id is not set." => "ID nincs beállítva",
-"Cannot update addressbook with an empty name." => "Üres névvel nem frissíthető a címlista",
-"Error updating addressbook." => "Hiba a címlista frissítésekor",
-"No ID provided" => "Nincs ID megadva",
-"Error setting checksum." => "Hiba az ellenőrzőösszeg beállításakor",
-"No categories selected for deletion." => "Nincs kiválasztva törlendő kategória",
-"No address books found." => "Nem található címlista",
-"No contacts found." => "Nem található kontakt",
-"There was an error adding the contact." => "Hiba a kapcsolat hozzáadásakor",
-"element name is not set." => "az elem neve nincs beállítva",
-"Cannot add empty property." => "Nem adható hozzá üres tulajdonság",
-"At least one of the address fields has to be filled out." => "Legalább egy címmező kitöltendő",
-"Trying to add duplicate property: " => "Kísérlet dupla tulajdonság hozzáadására: ",
-"Information about vCard is incorrect. Please reload the page." => "A vCardról szóló információ helytelen. Töltsd újra az oldalt.",
-"Missing ID" => "Hiányzó ID",
-"Error parsing VCard for ID: \"" => "VCard elemzése sikertelen a következő ID-hoz: \"",
-"checksum is not set." => "az ellenőrzőösszeg nincs beállítva",
-"Information about vCard is incorrect. Please reload the page: " => "Helytelen információ a vCardról. Töltse újra az oldalt: ",
-"Something went FUBAR. " => "Valami balul sült el.",
-"No contact ID was submitted." => "Nincs ID megadva a kontakthoz",
-"Error reading contact photo." => "A kontakt képének beolvasása sikertelen",
-"Error saving temporary file." => "Ideiglenes fájl mentése sikertelen",
-"The loading photo is not valid." => "A kép érvénytelen",
-"Contact ID is missing." => "Hiányzik a kapcsolat ID",
-"No photo path was submitted." => "Nincs fénykép-útvonal megadva",
-"File doesn't exist:" => "A fájl nem létezik:",
-"Error loading image." => "Kép betöltése sikertelen",
-"Error getting contact object." => "A kontakt-objektum feldolgozása sikertelen",
-"Error getting PHOTO property." => "A PHOTO-tulajdonság  feldolgozása sikertelen",
-"Error saving contact." => "A kontakt mentése sikertelen",
-"Error resizing image" => "Képméretezés sikertelen",
-"Error cropping image" => "Képvágás sikertelen",
-"Error creating temporary image" => "Ideiglenes kép létrehozása sikertelen",
-"Error finding image: " => "A kép nem található",
-"Error uploading contacts to storage." => "Hiba a kapcsolatok feltöltésekor",
-"There is no error, the file uploaded with success" => "Nincs hiba, a fájl sikeresen feltöltődött",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "A feltöltött fájl mérete meghaladja az upload_max_filesize értéket a php.ini-ben",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "A feltöltött fájl mérete meghaladja a HTML form-ban megadott MAX_FILE_SIZE értéket",
-"The uploaded file was only partially uploaded" => "A fájl csak részlegesen lett feltöltve",
-"No file was uploaded" => "Nincs feltöltött fájl",
-"Missing a temporary folder" => "Hiányzik az ideiglenes könyvtár",
-"Couldn't save temporary image: " => "Ideiglenes kép létrehozása sikertelen",
-"Couldn't load temporary image: " => "Ideiglenes kép betöltése sikertelen",
-"No file was uploaded. Unknown error" => "Nem történt feltöltés. Ismeretlen hiba",
-"Contacts" => "Kapcsolatok",
-"Sorry, this functionality has not been implemented yet" => "Sajnáljuk, ez a funkció még nem támogatott",
-"Not implemented" => "Nem támogatott",
-"Couldn't get a valid address." => "Érvényes cím lekérése sikertelen",
-"Error" => "Hiba",
-"This property has to be non-empty." => "Ezt a tulajdonságot muszáj kitölteni",
-"Couldn't serialize elements." => "Sorbarakás sikertelen",
-"'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "A 'deleteProperty' argumentum nélkül lett meghívva. Kérjük, jelezze a hibát.",
-"Edit name" => "Név szerkesztése",
-"No files selected for upload." => "Nincs kiválasztva feltöltendő fájl",
-"The file you are trying to upload exceed the maximum size for file uploads on this server." => "A feltöltendő fájl mérete meghaladja a megengedett mértéket",
-"Select type" => "Típus kiválasztása",
-"Result: " => "Eredmény: ",
-" imported, " => "  beimportálva,  ",
-" failed." => "  sikertelen",
-"This is not your addressbook." => "Ez nem a te címjegyzéked.",
-"Contact could not be found." => "Kapcsolat nem található.",
-"Work" => "Munkahelyi",
-"Home" => "Otthoni",
-"Mobile" => "Mobiltelefonszám",
-"Text" => "Szöveg",
-"Voice" => "Hang",
-"Message" => "Üzenet",
-"Fax" => "Fax",
-"Video" => "Video",
-"Pager" => "Személyhívó",
-"Internet" => "Internet",
-"Birthday" => "Születésnap",
-"{name}'s Birthday" => "{name} születésnapja",
-"Contact" => "Kapcsolat",
-"Add Contact" => "Kapcsolat hozzáadása",
-"Import" => "Import",
-"Addressbooks" => "Címlisták",
-"Close" => "Bezár",
-"Drop photo to upload" => "Húzza ide a feltöltendő képet",
-"Delete current photo" => "Aktuális kép törlése",
-"Edit current photo" => "Aktuális kép szerkesztése",
-"Upload new photo" => "Új kép feltöltése",
-"Select photo from ownCloud" => "Kép kiválasztása ownCloud-ból",
-"Format custom, Short name, Full name, Reverse or Reverse with comma" => "Formátum egyedi, Rövid név, Teljes név, Visszafelé vagy Visszafelé vesszővel",
-"Edit name details" => "Név részleteinek szerkesztése",
-"Organization" => "Szervezet",
-"Delete" => "Törlés",
-"Nickname" => "Becenév",
-"Enter nickname" => "Becenév megadása",
-"dd-mm-yyyy" => "yyyy-mm-dd",
-"Groups" => "Csoportok",
-"Separate groups with commas" => "Vesszővel válassza el a csoportokat",
-"Edit groups" => "Csoportok szerkesztése",
-"Preferred" => "Előnyben részesített",
-"Please specify a valid email address." => "Adjon meg érvényes email címet",
-"Enter email address" => "Adja meg az email címet",
-"Mail to address" => "Postai cím",
-"Delete email address" => "Email cím törlése",
-"Enter phone number" => "Adja meg a telefonszámot",
-"Delete phone number" => "Telefonszám törlése",
-"View on map" => "Megtekintés a térképen",
-"Edit address details" => "Cím részleteinek szerkesztése",
-"Add notes here." => "Megjegyzések",
-"Add field" => "Mező hozzáadása",
-"Phone" => "Telefonszám",
-"Email" => "E-mail",
-"Address" => "Cím",
-"Note" => "Jegyzet",
-"Download contact" => "Kapcsolat letöltése",
-"Delete contact" => "Kapcsolat törlése",
-"The temporary image has been removed from cache." => "Az ideiglenes kép el lett távolítva a gyorsítótárból",
-"Edit address" => "Cím szerkesztése",
-"Type" => "Típus",
-"PO Box" => "Postafiók",
-"Extended" => "Kiterjesztett",
-"City" => "Város",
-"Region" => "Megye",
-"Zipcode" => "Irányítószám",
-"Country" => "Ország",
-"Addressbook" => "Címlista",
-"Hon. prefixes" => "Előtag",
-"Miss" => "Miss",
-"Ms" => "Ms",
-"Mr" => "Mr",
-"Sir" => "Sir",
-"Mrs" => "Mrs",
-"Dr" => "Dr.",
-"Given name" => "Teljes név",
-"Additional names" => "További nevek",
-"Family name" => "Családnév",
-"Hon. suffixes" => "Utótag",
-"J.D." => "J.D.",
-"M.D." => "M.D.",
-"D.O." => "D.O.",
-"D.C." => "D.C.",
-"Ph.D." => "Ph.D.",
-"Esq." => "Esq.",
-"Jr." => "Ifj.",
-"Sn." => "Id.",
-"Import a contacts file" => "Kapcsolat-fájl importálása",
-"Please choose the addressbook" => "Válassza ki a címlistát",
-"create a new addressbook" => "Címlista létrehozása",
-"Name of new addressbook" => "Új címlista neve",
-"Importing contacts" => "Kapcsolatok importálása",
-"You have no contacts in your addressbook." => "Nincsenek kapcsolatok a címlistában",
-"Add contact" => "Kapcsolat hozzáadása",
-"CardDAV syncing addresses" => "CardDAV szinkronizációs címek",
-"more info" => "további információ",
-"Primary address (Kontact et al)" => "Elsődleges cím",
-"iOS/OS X" => "iOS/OS X",
-"Download" => "Letöltés",
-"Edit" => "Szerkesztés",
-"New Address Book" => "Új címlista",
-"Save" => "Mentés",
-"Cancel" => "Mégsem"
-);
diff --git a/apps/contacts/l10n/ia.php b/apps/contacts/l10n/ia.php
deleted file mode 100644
index 4d455f7c97..0000000000
--- a/apps/contacts/l10n/ia.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php $TRANSLATIONS = array(
-"No address books found." => "Nulle adressario trovate",
-"No contacts found." => "Nulle contactos trovate.",
-"Cannot add empty property." => "Non pote adder proprietate vacue.",
-"Error saving temporary file." => "Error durante le scriptura in le file temporari",
-"Error loading image." => "Il habeva un error durante le cargamento del imagine.",
-"No file was uploaded" => "Nulle file esseva incargate.",
-"Missing a temporary folder" => "Manca un dossier temporari",
-"Contacts" => "Contactos",
-"This is not your addressbook." => "Iste non es tu libro de adresses",
-"Contact could not be found." => "Contacto non poterea esser legite",
-"Work" => "Travalio",
-"Home" => "Domo",
-"Mobile" => "Mobile",
-"Text" => "Texto",
-"Voice" => "Voce",
-"Message" => "Message",
-"Fax" => "Fax",
-"Video" => "Video",
-"Pager" => "Pager",
-"Internet" => "Internet",
-"Birthday" => "Anniversario",
-"Contact" => "Contacto",
-"Add Contact" => "Adder contacto",
-"Import" => "Importar",
-"Addressbooks" => "Adressarios",
-"Delete current photo" => "Deler photo currente",
-"Edit current photo" => "Modificar photo currente",
-"Upload new photo" => "Incargar nove photo",
-"Select photo from ownCloud" => "Seliger photo ex ownCloud",
-"Organization" => "Organisation",
-"Delete" => "Deler",
-"Nickname" => "Pseudonymo",
-"Enter nickname" => "Inserer pseudonymo",
-"Groups" => "Gruppos",
-"Edit groups" => "Modificar gruppos",
-"Preferred" => "Preferite",
-"Enter email address" => "Entrar un adresse de e-posta",
-"Delete email address" => "Deler adresse de E-posta",
-"Enter phone number" => "Entrar un numero de telephono",
-"Delete phone number" => "Deler numero de telephono",
-"View on map" => "Vider in un carta",
-"Add notes here." => "Adder notas hic",
-"Add field" => "Adder campo",
-"Phone" => "Phono",
-"Email" => "E-posta",
-"Address" => "Adresse",
-"Note" => "Nota",
-"Download contact" => "Discargar contacto",
-"Delete contact" => "Deler contacto",
-"Edit address" => "Modificar adresses",
-"Type" => "Typo",
-"PO Box" => "Cassa postal",
-"Extended" => "Extendite",
-"City" => "Citate",
-"Region" => "Region",
-"Zipcode" => "Codice postal",
-"Country" => "Pais",
-"Addressbook" => "Adressario",
-"Hon. prefixes" => "Prefixos honorific",
-"Miss" => "Senioretta",
-"Mr" => "Sr.",
-"Mrs" => "Sra.",
-"Dr" => "Dr.",
-"Given name" => "Nomine date",
-"Additional names" => "Nomines additional",
-"Family name" => "Nomine de familia",
-"Hon. suffixes" => "Suffixos honorific",
-"Import a contacts file" => "Importar un file de contactos",
-"Please choose the addressbook" => "Per favor selige le adressario",
-"create a new addressbook" => "Crear un nove adressario",
-"Name of new addressbook" => "Nomine del nove gruppo:",
-"Import" => "Importar",
-"Contacts imported successfully" => "Contactos importate con successo.",
-"Close Dialog" => "Clauder dialogo",
-"Import Addressbook" => "Importar adressario.",
-"Add contact" => "Adder adressario",
-"more info" => "plus info",
-"iOS/OS X" => "iOS/OS X",
-"Download" => "Discargar",
-"Edit" => "Modificar",
-"New Address Book" => "Nove adressario",
-"Save" => "Salveguardar",
-"Cancel" => "Cancellar"
-);
diff --git a/apps/contacts/l10n/it.php b/apps/contacts/l10n/it.php
deleted file mode 100644
index b10130f8d7..0000000000
--- a/apps/contacts/l10n/it.php
+++ /dev/null
@@ -1,235 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "Errore nel (dis)attivare la rubrica.",
-"id is not set." => "ID non impostato.",
-"Cannot update addressbook with an empty name." => "Impossibile aggiornare una rubrica senza nome.",
-"Error updating addressbook." => "Errore durante l'aggiornamento della rubrica.",
-"No ID provided" => "Nessun ID fornito",
-"Error setting checksum." => "Errore di impostazione del codice di controllo.",
-"No categories selected for deletion." => "Nessuna categoria selezionata per l'eliminazione.",
-"No address books found." => "Nessuna rubrica trovata.",
-"No contacts found." => "Nessun contatto trovato.",
-"There was an error adding the contact." => "Si è verificato un errore nell'aggiunta del contatto.",
-"element name is not set." => "il nome dell'elemento non è impostato.",
-"Could not parse contact: " => "Impossibile elaborare il contatto: ",
-"Cannot add empty property." => "Impossibile aggiungere una proprietà vuota.",
-"At least one of the address fields has to be filled out." => "Deve essere inserito almeno un indirizzo.",
-"Trying to add duplicate property: " => "P",
-"Missing IM parameter." => "Parametro IM mancante.",
-"Unknown IM: " => "IM sconosciuto:",
-"Information about vCard is incorrect. Please reload the page." => "Informazioni sulla vCard non corrette. Ricarica la pagina.",
-"Missing ID" => "ID mancante",
-"Error parsing VCard for ID: \"" => "Errore in fase di elaborazione del file VCard per l'ID: \"",
-"checksum is not set." => "il codice di controllo non è impostato.",
-"Information about vCard is incorrect. Please reload the page: " => "Le informazioni della vCard non sono corrette. Ricarica la pagina: ",
-"Something went FUBAR. " => "Qualcosa è andato storto. ",
-"No contact ID was submitted." => "Nessun ID di contatto inviato.",
-"Error reading contact photo." => "Errore di lettura della foto del contatto.",
-"Error saving temporary file." => "Errore di salvataggio del file temporaneo.",
-"The loading photo is not valid." => "La foto caricata non è valida.",
-"Contact ID is missing." => "Manca l'ID del contatto.",
-"No photo path was submitted." => "Non è stato inviato alcun percorso a una foto.",
-"File doesn't exist:" => "Il file non esiste:",
-"Error loading image." => "Errore di caricamento immagine.",
-"Error getting contact object." => "Errore di recupero dell'oggetto contatto.",
-"Error getting PHOTO property." => "Errore di recupero della proprietà FOTO.",
-"Error saving contact." => "Errore di salvataggio del contatto.",
-"Error resizing image" => "Errore di ridimensionamento dell'immagine",
-"Error cropping image" => "Errore di ritaglio dell'immagine",
-"Error creating temporary image" => "Errore durante la creazione dell'immagine temporanea",
-"Error finding image: " => "Errore durante la ricerca dell'immagine: ",
-"Error uploading contacts to storage." => "Errore di invio dei contatti in archivio.",
-"There is no error, the file uploaded with success" => "Non ci sono errori, il file è stato inviato correttamente",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Il file inviato supera la direttiva upload_max_filesize nel php.ini",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Il file inviato supera la direttiva MAX_FILE_SIZE specificata nel modulo HTML",
-"The uploaded file was only partially uploaded" => "Il file è stato inviato solo parzialmente",
-"No file was uploaded" => "Nessun file è stato inviato",
-"Missing a temporary folder" => "Manca una cartella temporanea",
-"Couldn't save temporary image: " => "Impossibile salvare l'immagine temporanea: ",
-"Couldn't load temporary image: " => "Impossibile caricare l'immagine temporanea: ",
-"No file was uploaded. Unknown error" => "Nessun file è stato inviato. Errore sconosciuto",
-"Contacts" => "Contatti",
-"Sorry, this functionality has not been implemented yet" => "Siamo spiacenti, questa funzionalità non è stata ancora implementata",
-"Not implemented" => "Non implementata",
-"Couldn't get a valid address." => "Impossibile ottenere un indirizzo valido.",
-"Error" => "Errore",
-"You do not have permission to add contacts to " => "Non hai i permessi per aggiungere contatti a",
-"Please select one of your own address books." => "Seleziona una delle tue rubriche.",
-"Permission error" => "Errore relativo ai permessi",
-"This property has to be non-empty." => "Questa proprietà non può essere vuota.",
-"Couldn't serialize elements." => "Impossibile serializzare gli elementi.",
-"'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "'deleteProperty' invocata senza l'argomento di tipo. Segnalalo a bugs.owncloud.org",
-"Edit name" => "Modifica il nome",
-"No files selected for upload." => "Nessun file selezionato per l'invio",
-"The file you are trying to upload exceed the maximum size for file uploads on this server." => "Il file che stai cercando di inviare supera la dimensione massima per l'invio dei file su questo server.",
-"Error loading profile picture." => "Errore durante il caricamento dell'immagine di profilo.",
-"Select type" => "Seleziona il tipo",
-"Some contacts are marked for deletion, but not deleted yet. Please wait for them to be deleted." => "Alcuni contatti sono marcati per l'eliminazione, ma non sono stati ancora rimossi. Attendi fino al completamento dell'operazione.",
-"Do you want to merge these address books?" => "Vuoi unire queste rubriche?",
-"Result: " => "Risultato: ",
-" imported, " => " importato, ",
-" failed." => " non riuscito.",
-"Displayname cannot be empty." => "Il nome visualizzato non può essere vuoto.",
-"Addressbook not found: " => "Rubrica non trovata:",
-"This is not your addressbook." => "Questa non è la tua rubrica.",
-"Contact could not be found." => "Il contatto non può essere trovato.",
-"Jabber" => "Jabber",
-"AIM" => "AIM",
-"MSN" => "MSN",
-"Twitter" => "Twitter",
-"GoogleTalk" => "GoogleTalk",
-"Facebook" => "Facebook",
-"XMPP" => "XMPP",
-"ICQ" => "ICQ",
-"Yahoo" => "Yahoo",
-"Skype" => "Skype",
-"QQ" => "QQ",
-"GaduGadu" => "GaduGadu",
-"Work" => "Lavoro",
-"Home" => "Casa",
-"Other" => "Altro",
-"Mobile" => "Cellulare",
-"Text" => "Testo",
-"Voice" => "Voce",
-"Message" => "Messaggio",
-"Fax" => "Fax",
-"Video" => "Video",
-"Pager" => "Cercapersone",
-"Internet" => "Internet",
-"Birthday" => "Compleanno",
-"Business" => "Lavoro",
-"Call" => "Chiama",
-"Clients" => "Client",
-"Deliverer" => "Corriere",
-"Holidays" => "Festività",
-"Ideas" => "Idee",
-"Journey" => "Viaggio",
-"Jubilee" => "Anniversario",
-"Meeting" => "Riunione",
-"Personal" => "Personale",
-"Projects" => "Progetti",
-"Questions" => "Domande",
-"{name}'s Birthday" => "Data di nascita di {name}",
-"Contact" => "Contatto",
-"You do not have the permissions to edit this contact." => "Non hai i permessi per modificare questo contatto.",
-"You do not have the permissions to delete this contact." => "Non hai i permessi per eliminare questo contatto.",
-"Add Contact" => "Aggiungi contatto",
-"Import" => "Importa",
-"Settings" => "Impostazioni",
-"Addressbooks" => "Rubriche",
-"Close" => "Chiudi",
-"Keyboard shortcuts" => "Scorciatoie da tastiera",
-"Navigation" => "Navigazione",
-"Next contact in list" => "Contatto successivo in elenco",
-"Previous contact in list" => "Contatto precedente in elenco",
-"Expand/collapse current addressbook" => "Espandi/Contrai la rubrica corrente",
-"Next addressbook" => "Rubrica successiva",
-"Previous addressbook" => "Rubrica precedente",
-"Actions" => "Azioni",
-"Refresh contacts list" => "Aggiorna l'elenco dei contatti",
-"Add new contact" => "Aggiungi un nuovo contatto",
-"Add new addressbook" => "Aggiungi una nuova rubrica",
-"Delete current contact" => "Elimina il contatto corrente",
-"Drop photo to upload" => "Rilascia una foto da inviare",
-"Delete current photo" => "Elimina la foto corrente",
-"Edit current photo" => "Modifica la foto corrente",
-"Upload new photo" => "Invia una nuova foto",
-"Select photo from ownCloud" => "Seleziona la foto da ownCloud",
-"Format custom, Short name, Full name, Reverse or Reverse with comma" => "Formato personalizzato, nome breve, nome completo, invertito o invertito con virgola",
-"Edit name details" => "Modifica dettagli del nome",
-"Organization" => "Organizzazione",
-"Delete" => "Elimina",
-"Nickname" => "Pseudonimo",
-"Enter nickname" => "Inserisci pseudonimo",
-"Web site" => "Sito web",
-"http://www.somesite.com" => "http://www.somesite.com",
-"Go to web site" => "Vai al sito web",
-"dd-mm-yyyy" => "gg-mm-aaaa",
-"Groups" => "Gruppi",
-"Separate groups with commas" => "Separa i gruppi con virgole",
-"Edit groups" => "Modifica gruppi",
-"Preferred" => "Preferito",
-"Please specify a valid email address." => "Specifica un indirizzo email valido",
-"Enter email address" => "Inserisci indirizzo email",
-"Mail to address" => "Invia per email",
-"Delete email address" => "Elimina l'indirizzo email",
-"Enter phone number" => "Inserisci il numero di telefono",
-"Delete phone number" => "Elimina il numero di telefono",
-"Instant Messenger" => "Client di messaggistica istantanea",
-"Delete IM" => "Elimina IM",
-"View on map" => "Visualizza sulla mappa",
-"Edit address details" => "Modifica dettagli dell'indirizzo",
-"Add notes here." => "Aggiungi qui le note.",
-"Add field" => "Aggiungi campo",
-"Phone" => "Telefono",
-"Email" => "Email",
-"Instant Messaging" => "Messaggistica istantanea",
-"Address" => "Indirizzo",
-"Note" => "Nota",
-"Download contact" => "Scarica contatto",
-"Delete contact" => "Elimina contatto",
-"The temporary image has been removed from cache." => "L'immagine temporanea è stata rimossa dalla cache.",
-"Edit address" => "Modifica indirizzo",
-"Type" => "Tipo",
-"PO Box" => "Casella postale",
-"Street address" => "Indirizzo",
-"Street and number" => "Via e numero",
-"Extended" => "Esteso",
-"Apartment number etc." => "Numero appartamento ecc.",
-"City" => "Città",
-"Region" => "Regione",
-"E.g. state or province" => "Ad es. stato o provincia",
-"Zipcode" => "CAP",
-"Postal code" => "CAP",
-"Country" => "Stato",
-"Addressbook" => "Rubrica",
-"Hon. prefixes" => "Prefissi onorifici",
-"Miss" => "Sig.na",
-"Ms" => "Sig.ra",
-"Mr" => "Sig.",
-"Sir" => "Sig.",
-"Mrs" => "Sig.ra",
-"Dr" => "Dott.",
-"Given name" => "Nome",
-"Additional names" => "Nomi aggiuntivi",
-"Family name" => "Cognome",
-"Hon. suffixes" => "Suffissi onorifici",
-"J.D." => "J.D.",
-"M.D." => "M.D.",
-"D.O." => "D.O.",
-"D.C." => "D.C.",
-"Ph.D." => "Ph.D.",
-"Esq." => "Esq.",
-"Jr." => "Jr.",
-"Sn." => "Sn.",
-"Import a contacts file" => "Importa un file di contatti",
-"Please choose the addressbook" => "Scegli la rubrica",
-"create a new addressbook" => "crea una nuova rubrica",
-"Name of new addressbook" => "Nome della nuova rubrica",
-"Importing contacts" => "Importazione contatti",
-"Contacts imported successfully" => "Contatti importati correttamente",
-"Close Dialog" => "Chiudi finestra",
-"Import Addressbook" => "Importa rubrica",
-"Select address book to import to:" => "Seleziona la rubrica di destinazione:",
-"Drop a VCF file to import contacts." => "Rilascia un file VCF per importare i contatti.",
-"Select from HD" => "Seleziona da disco",
-"You have no contacts in your addressbook." => "Non hai contatti nella rubrica.",
-"Add contact" => "Aggiungi contatto",
-"Select Address Books" => "Seleziona rubriche",
-"Enter name" => "Inserisci il nome",
-"Enter description" => "Inserisci una descrizione",
-"CardDAV syncing addresses" => "Indirizzi di sincronizzazione CardDAV",
-"more info" => "altre informazioni",
-"Primary address (Kontact et al)" => "Indirizzo principale (Kontact e altri)",
-"iOS/OS X" => "iOS/OS X",
-"Show CardDav link" => "Mostra collegamento CardDav",
-"Show read-only VCF link" => "Mostra collegamento VCF in sola lettura",
-"Share" => "Condividi",
-"Download" => "Scarica",
-"Edit" => "Modifica",
-"New Address Book" => "Nuova rubrica",
-"Name" => "Nome",
-"Description" => "Descrizione",
-"Save" => "Salva",
-"Cancel" => "Annulla",
-"More..." => "Altro..."
-);
diff --git a/apps/contacts/l10n/ja_JP.php b/apps/contacts/l10n/ja_JP.php
deleted file mode 100644
index 9b5874d459..0000000000
--- a/apps/contacts/l10n/ja_JP.php
+++ /dev/null
@@ -1,229 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "アドレス帳の有効／無効化に失敗しました。",
-"id is not set." => "idが設定されていません。",
-"Cannot update addressbook with an empty name." => "空白の名前でアドレス帳を更新することはできません。",
-"Error updating addressbook." => "アドレス帳の更新に失敗しました。",
-"No ID provided" => "IDが提供されていません",
-"Error setting checksum." => "チェックサムの設定エラー。",
-"No categories selected for deletion." => "削除するカテゴリが選択されていません。",
-"No address books found." => "アドレス帳が見つかりません。",
-"No contacts found." => "連絡先が見つかりません。",
-"There was an error adding the contact." => "連絡先の追加でエラーが発生しました。",
-"element name is not set." => "要素名が設定されていません。",
-"Could not parse contact: " => "連絡先を解析できませんでした:",
-"Cannot add empty property." => "項目の新規追加に失敗しました。",
-"At least one of the address fields has to be filled out." => "住所の項目のうち１つは入力して下さい。",
-"Trying to add duplicate property: " => "重複する属性を追加: ",
-"Missing IM parameter." => "IMのパラメータが不足しています。",
-"Unknown IM: " => "不明なIM:",
-"Information about vCard is incorrect. Please reload the page." => "vCardの情報に誤りがあります。ページをリロードして下さい。",
-"Missing ID" => "IDが見つかりません",
-"Error parsing VCard for ID: \"" => "VCardからIDの抽出エラー: \"",
-"checksum is not set." => "チェックサムが設定されていません。",
-"Information about vCard is incorrect. Please reload the page: " => "vCardの情報が正しくありません。ページを再読み込みしてください: ",
-"Something went FUBAR. " => "何かがFUBARへ移動しました。",
-"No contact ID was submitted." => "連絡先IDは登録されませんでした。",
-"Error reading contact photo." => "連絡先写真の読み込みエラー。",
-"Error saving temporary file." => "一時ファイルの保存エラー。",
-"The loading photo is not valid." => "写真の読み込みは無効です。",
-"Contact ID is missing." => "連絡先 IDが見つかりません。",
-"No photo path was submitted." => "写真のパスが登録されていません。",
-"File doesn't exist:" => "ファイルが存在しません:",
-"Error loading image." => "画像の読み込みエラー。",
-"Error getting contact object." => "連絡先オブジェクトの取得エラー。",
-"Error getting PHOTO property." => "写真属性の取得エラー。",
-"Error saving contact." => "連絡先の保存エラー。",
-"Error resizing image" => "画像のリサイズエラー",
-"Error cropping image" => "画像の切り抜きエラー",
-"Error creating temporary image" => "一時画像の生成エラー",
-"Error finding image: " => "画像検索エラー: ",
-"Error uploading contacts to storage." => "ストレージへの連絡先のアップロードエラー。",
-"There is no error, the file uploaded with success" => "エラーはありません。ファイルのアップロードは成功しました",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "アップロードファイルは php.ini 内の upload_max_filesize の制限を超えています",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "アップロードファイルはHTMLフォームで指定された MAX_FILE_SIZE の制限を超えています",
-"The uploaded file was only partially uploaded" => "アップロードファイルは一部分だけアップロードされました",
-"No file was uploaded" => "ファイルはアップロードされませんでした",
-"Missing a temporary folder" => "一時保存フォルダが見つかりません",
-"Couldn't save temporary image: " => "一時的な画像の保存ができませんでした: ",
-"Couldn't load temporary image: " => "一時的な画像の読み込みができませんでした: ",
-"No file was uploaded. Unknown error" => "ファイルは何もアップロードされていません。不明なエラー",
-"Contacts" => "連絡先",
-"Sorry, this functionality has not been implemented yet" => "申し訳ありません。この機能はまだ実装されていません",
-"Not implemented" => "未実装",
-"Couldn't get a valid address." => "有効なアドレスを取得できませんでした。",
-"Error" => "エラー",
-"You do not have permission to add contacts to " => "連絡先を追加する権限がありません",
-"Please select one of your own address books." => "アドレス帳を一つ選択してください",
-"Permission error" => "権限エラー",
-"This property has to be non-empty." => "この属性は空にできません。",
-"Couldn't serialize elements." => "要素をシリアライズできませんでした。",
-"'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "'deleteProperty' は型の引数無しで呼び出されました。bugs.owncloud.org へ報告してください。",
-"Edit name" => "名前を編集",
-"No files selected for upload." => "アップロードするファイルが選択されていません。",
-"The file you are trying to upload exceed the maximum size for file uploads on this server." => "アップロードしようとしているファイルは、このサーバの最大ファイルアップロードサイズを超えています。",
-"Error loading profile picture." => "プロファイルの画像の読み込みエラー",
-"Select type" => "タイプを選択",
-"Some contacts are marked for deletion, but not deleted yet. Please wait for them to be deleted." => "いくつかの連絡先が削除とマークされていますが、まだ削除されていません。削除するまでお待ちください。",
-"Do you want to merge these address books?" => "これらのアドレス帳をマージしてもよろしいですか？",
-"Result: " => "結果: ",
-" imported, " => " をインポート、 ",
-" failed." => " は失敗しました。",
-"Displayname cannot be empty." => "表示名は空にできません。",
-"Addressbook not found: " => "アドレス帳が見つかりません:",
-"This is not your addressbook." => "これはあなたの電話帳ではありません。",
-"Contact could not be found." => "連絡先を見つける事ができません。",
-"Jabber" => "Jabber",
-"AIM" => "AIM",
-"MSN" => "MSN",
-"Twitter" => "Twitter",
-"GoogleTalk" => "Googleトーク",
-"Facebook" => "Facebook",
-"XMPP" => "XMPP",
-"ICQ" => "ICQ",
-"Yahoo" => "Yahoo",
-"Skype" => "Skype",
-"QQ" => "QQ",
-"GaduGadu" => "GaduGadu",
-"Work" => "勤務先",
-"Home" => "住居",
-"Other" => "その他",
-"Mobile" => "携帯電話",
-"Text" => "TTY TDD",
-"Voice" => "音声番号",
-"Message" => "メッセージ",
-"Fax" => "FAX",
-"Video" => "テレビ電話",
-"Pager" => "ポケベル",
-"Internet" => "インターネット",
-"Birthday" => "誕生日",
-"Business" => "ビジネス",
-"Call" => "電話",
-"Clients" => "顧客",
-"Deliverer" => "運送会社",
-"Holidays" => "休日",
-"Ideas" => "アイデア",
-"Journey" => "旅行",
-"Jubilee" => "記念祭",
-"Meeting" => "打ち合わせ",
-"Personal" => "個人",
-"Projects" => "プロジェクト",
-"Questions" => "質問",
-"{name}'s Birthday" => "{name}の誕生日",
-"Contact" => "連絡先",
-"You do not have the permissions to edit this contact." => "この連絡先を編集する権限がありません",
-"You do not have the permissions to delete this contact." => "この連絡先を削除する権限がありません",
-"Add Contact" => "連絡先の追加",
-"Import" => "インポート",
-"Settings" => "設定",
-"Addressbooks" => "アドレス帳",
-"Close" => "閉じる",
-"Keyboard shortcuts" => "キーボードショートカット",
-"Navigation" => "ナビゲーション",
-"Next contact in list" => "リスト内の次の連絡先",
-"Previous contact in list" => "リスト内の前の連絡先",
-"Expand/collapse current addressbook" => "現在のアドレス帳を展開する／折りたたむ",
-"Next addressbook" => "次のアドレス帳",
-"Previous addressbook" => "前のアドレス帳",
-"Actions" => "アクション",
-"Refresh contacts list" => "連絡先リストを再読込する",
-"Add new contact" => "新しい連絡先を追加",
-"Add new addressbook" => "新しいアドレス帳を追加",
-"Delete current contact" => "現在の連絡先を削除",
-"Drop photo to upload" => "写真をドロップしてアップロード",
-"Delete current photo" => "現在の写真を削除",
-"Edit current photo" => "現在の写真を編集",
-"Upload new photo" => "新しい写真をアップロード",
-"Select photo from ownCloud" => "ownCloudから写真を選択",
-"Format custom, Short name, Full name, Reverse or Reverse with comma" => "編集フォーマット、ショートネーム、フルネーム、逆順、カンマ区切りの逆順",
-"Edit name details" => "名前の詳細を編集",
-"Organization" => "所属",
-"Delete" => "削除",
-"Nickname" => "ニックネーム",
-"Enter nickname" => "ニックネームを入力",
-"Web site" => "ウェブサイト",
-"http://www.somesite.com" => "http://www.somesite.com",
-"Go to web site" => "Webサイトへ移動",
-"dd-mm-yyyy" => "yyyy-mm-dd",
-"Groups" => "グループ",
-"Separate groups with commas" => "コンマでグループを分割",
-"Edit groups" => "グループを編集",
-"Preferred" => "推奨",
-"Please specify a valid email address." => "有効なメールアドレスを指定してください。",
-"Enter email address" => "メールアドレスを入力",
-"Mail to address" => "アドレスへメールを送る",
-"Delete email address" => "メールアドレスを削除",
-"Enter phone number" => "電話番号を入力",
-"Delete phone number" => "電話番号を削除",
-"Instant Messenger" => "インスタントメッセンジャー",
-"Delete IM" => "IMを削除",
-"View on map" => "地図で表示",
-"Edit address details" => "住所の詳細を編集",
-"Add notes here." => "ここにメモを追加。",
-"Add field" => "項目を追加",
-"Phone" => "電話番号",
-"Email" => "メールアドレス",
-"Instant Messaging" => "インスタントメッセージ",
-"Address" => "住所",
-"Note" => "メモ",
-"Download contact" => "連絡先のダウンロード",
-"Delete contact" => "連絡先の削除",
-"The temporary image has been removed from cache." => "一時画像はキャッシュから削除されました。",
-"Edit address" => "住所を編集",
-"Type" => "種類",
-"PO Box" => "私書箱",
-"Street address" => "住所1",
-"Street and number" => "番地",
-"Extended" => "住所2",
-"Apartment number etc." => "アパート名等",
-"City" => "都市",
-"Region" => "都道府県",
-"E.g. state or province" => "例：東京都、大阪府",
-"Zipcode" => "郵便番号",
-"Postal code" => "郵便番号",
-"Country" => "国名",
-"Addressbook" => "アドレス帳",
-"Hon. prefixes" => "敬称",
-"Miss" => "Miss",
-"Ms" => "Ms",
-"Mr" => "Mr",
-"Sir" => "Sir",
-"Mrs" => "Mrs",
-"Dr" => "Dr",
-"Given name" => "名",
-"Additional names" => "ミドルネーム",
-"Family name" => "姓",
-"Hon. suffixes" => "称号",
-"J.D." => "J.D.",
-"M.D." => "M.D.",
-"D.O." => "D.O.",
-"D.C." => "D.C.",
-"Ph.D." => "Ph.D.",
-"Esq." => "Esq.",
-"Jr." => "Jr.",
-"Sn." => "Sn.",
-"Import a contacts file" => "連絡先ファイルをインポート",
-"Please choose the addressbook" => "アドレス帳を選択してください",
-"create a new addressbook" => "新しいアドレス帳を作成",
-"Name of new addressbook" => "新しいアドレスブックの名前",
-"Importing contacts" => "連絡先をインポート",
-"You have no contacts in your addressbook." => "アドレス帳に連絡先が登録されていません。",
-"Add contact" => "連絡先を追加",
-"Select Address Books" => "アドレス帳を選択してください",
-"Enter name" => "名前を入力",
-"Enter description" => "説明を入力してください",
-"CardDAV syncing addresses" => "CardDAV同期アドレス",
-"more info" => "詳細情報",
-"Primary address (Kontact et al)" => "プライマリアドレス（Kontact 他）",
-"iOS/OS X" => "iOS/OS X",
-"Show CardDav link" => "CarDavリンクを表示",
-"Show read-only VCF link" => "読み取り専用のVCFリンクを表示",
-"Share" => "共有",
-"Download" => "ダウンロード",
-"Edit" => "編集",
-"New Address Book" => "新規のアドレス帳",
-"Name" => "名前",
-"Description" => "説明",
-"Save" => "保存",
-"Cancel" => "取り消し",
-"More..." => "もっと..."
-);
diff --git a/apps/contacts/l10n/ko.php b/apps/contacts/l10n/ko.php
deleted file mode 100644
index 4349224f53..0000000000
--- a/apps/contacts/l10n/ko.php
+++ /dev/null
@@ -1,155 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "주소록을 (비)활성화하는 데 실패했습니다.",
-"id is not set." => "아이디가 설정되어 있지 않습니다. ",
-"Cannot update addressbook with an empty name." => "주소록에 이름란이 비어있으면 업데이트를 할 수 없습니다. ",
-"Error updating addressbook." => "주소록을 업데이트할 수 없습니다.",
-"No ID provided" => "제공되는 아이디 없음",
-"Error setting checksum." => "오류 검사합계 설정",
-"No categories selected for deletion." => "삭제 카테고리를 선택하지 않았습니다. ",
-"No address books found." => "주소록을 찾을 수 없습니다.",
-"No contacts found." => "연락처를 찾을 수 없습니다.",
-"There was an error adding the contact." => "연락처를 추가하는 중 오류가 발생하였습니다.",
-"element name is not set." => "element 이름이 설정되지 않았습니다.",
-"Cannot add empty property." => "빈 속성을 추가할 수 없습니다.",
-"At least one of the address fields has to be filled out." => "최소한 하나의 주소록 항목을 입력해야 합니다.",
-"Trying to add duplicate property: " => "중복 속성 추가 시도: ",
-"Information about vCard is incorrect. Please reload the page." => "vCard 정보가 올바르지 않습니다. 페이지를 새로 고치십시오.",
-"Missing ID" => "아이디 분실",
-"Error parsing VCard for ID: \"" => "아이디에 대한 VCard 분석 오류",
-"checksum is not set." => "체크섬이 설정되지 않았습니다.",
-"Information about vCard is incorrect. Please reload the page: " => " vCard에 대한 정보가 잘못되었습니다. 페이지를 다시 로드하세요:",
-"No contact ID was submitted." => "접속 아이디가 기입되지 않았습니다.",
-"Error reading contact photo." => "사진 읽기 오류",
-"Error saving temporary file." => "임시 파일을 저장하는 동안 오류가 발생했습니다. ",
-"The loading photo is not valid." => "로딩 사진이 유효하지 않습니다. ",
-"Contact ID is missing." => "접속 아이디가 없습니다. ",
-"No photo path was submitted." => "사진 경로가 제출되지 않았습니다. ",
-"File doesn't exist:" => "파일이 존재하지 않습니다. ",
-"Error loading image." => "로딩 이미지 오류입니다.",
-"Error getting contact object." => "연락처 개체를 가져오는 중 오류가 발생했습니다. ",
-"Error getting PHOTO property." => "사진 속성을 가져오는 중 오류가 발생했습니다. ",
-"Error saving contact." => "연락처 저장 중 오류가 발생했습니다.",
-"Error resizing image" => "이미지 크기 조정 중 오류가 발생했습니다.",
-"Error cropping image" => "이미지를 자르던 중 오류가 발생했습니다.",
-"Error creating temporary image" => "임시 이미지를 생성 중 오류가 발생했습니다.",
-"Error finding image: " => "이미지를 찾던 중 오류가 발생했습니다:",
-"Error uploading contacts to storage." => "스토리지 에러 업로드 연락처.",
-"There is no error, the file uploaded with success" => "오류없이 파일업로드 성공.",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "php.ini 형식으로 업로드 된 이 파일은 MAX_FILE_SIZE를 초과하였다.",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "HTML형식으로 업로드 된 이 파일은 MAX_FILE_SIZE를 초과하였다.",
-"The uploaded file was only partially uploaded" => "이 업로드된 파일은 부분적으로만 업로드 되었습니다.",
-"No file was uploaded" => "파일이 업로드 되어있지 않습니다",
-"Missing a temporary folder" => "임시 폴더 분실",
-"Couldn't save temporary image: " => "임시 이미지를 저장할 수 없습니다:",
-"Couldn't load temporary image: " => "임시 이미지를 불러올 수 없습니다. ",
-"No file was uploaded. Unknown error" => "파일이 업로드 되지 않았습니다. 알 수 없는 오류.",
-"Contacts" => "연락처",
-"Sorry, this functionality has not been implemented yet" => "죄송합니다. 이 기능은 아직 구현되지 않았습니다. ",
-"Not implemented" => "구현되지 않음",
-"Couldn't get a valid address." => "유효한 주소를 얻을 수 없습니다.",
-"Error" => "오류",
-"Couldn't serialize elements." => "요소를 직렬화 할 수 없습니다.",
-"'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "'deleteProperty'가 문서형식이 없이 불려왔습니다. bugs.owncloud.org에 보고해주세요. ",
-"Edit name" => "이름 편집",
-"No files selected for upload." => "업로드를 위한 파일이 선택되지 않았습니다. ",
-"The file you are trying to upload exceed the maximum size for file uploads on this server." => "이 파일은 이 서버 파일 업로드 최대 용량을 초과 합니다. ",
-"Select type" => "유형 선택",
-"Result: " => "결과:",
-" imported, " => "불러오기,",
-" failed." => "실패.",
-"This is not your addressbook." => "내 주소록이 아닙니다.",
-"Contact could not be found." => "연락처를 찾을 수 없습니다.",
-"Work" => "직장",
-"Home" => "자택",
-"Mobile" => "휴대폰",
-"Text" => "문자 번호",
-"Voice" => "음성 번호",
-"Message" => "메세지",
-"Fax" => "팩스 번호",
-"Video" => "영상 번호",
-"Pager" => "호출기",
-"Internet" => "인터넷",
-"Birthday" => "생일",
-"{name}'s Birthday" => "{이름}의 생일",
-"Contact" => "연락처",
-"Add Contact" => "연락처 추가",
-"Import" => "입력",
-"Addressbooks" => "주소록",
-"Close" => "닫기",
-"Drop photo to upload" => "Drop photo to upload",
-"Delete current photo" => "현재 사진 삭제",
-"Edit current photo" => "현재 사진 편집",
-"Upload new photo" => "새로운 사진 업로드",
-"Select photo from ownCloud" => "ownCloud에서 사진 선택",
-"Format custom, Short name, Full name, Reverse or Reverse with comma" => "Format custom, Short name, Full name, Reverse or Reverse with comma",
-"Edit name details" => "이름 세부사항을 편집합니다. ",
-"Organization" => "조직",
-"Delete" => "삭제",
-"Nickname" => "별명",
-"Enter nickname" => "별명 입력",
-"dd-mm-yyyy" => "일-월-년",
-"Groups" => "그룹",
-"Separate groups with commas" => "쉼표로 그룹 구분",
-"Edit groups" => "그룹 편집",
-"Preferred" => "선호함",
-"Please specify a valid email address." => "올바른 이메일 주소를 입력하세요.",
-"Enter email address" => "이메일 주소 입력",
-"Delete email address" => "이메일 주소 삭제",
-"Enter phone number" => "전화번호 입력",
-"Delete phone number" => "전화번호 삭제",
-"View on map" => "지도에서 보기",
-"Edit address details" => "상세 주소 수정",
-"Add notes here." => "여기에 노트 추가.",
-"Add field" => "파일 추가",
-"Phone" => "전화 번호",
-"Email" => "전자 우편",
-"Address" => "주소",
-"Note" => "노트",
-"Download contact" => "연락처 다운로드",
-"Delete contact" => "연락처 삭제",
-"The temporary image has been removed from cache." => "임시 이미지가 캐시에서 제거 되었습니다. ",
-"Edit address" => "주소 수정",
-"Type" => "종류",
-"PO Box" => "사서함",
-"Extended" => "확장",
-"City" => "도시",
-"Region" => "지역",
-"Zipcode" => "우편 번호",
-"Country" => "국가",
-"Addressbook" => "주소록",
-"Hon. prefixes" => "Hon. prefixes",
-"Miss" => "Miss",
-"Ms" => "Ms",
-"Mr" => "Mr",
-"Sir" => "Sir",
-"Mrs" => "Mrs",
-"Dr" => "Dr",
-"Given name" => "Given name",
-"Additional names" => "추가 이름",
-"Family name" => "성",
-"Hon. suffixes" => "Hon. suffixes",
-"J.D." => "J.D.",
-"M.D." => "M.D.",
-"D.O." => "D.O.",
-"D.C." => "D.C.",
-"Ph.D." => "Ph.D.",
-"Esq." => "Esq.",
-"Jr." => "Jr.",
-"Sn." => "Sn.",
-"Import a contacts file" => "연락처 파일 입력",
-"Please choose the addressbook" => "주소록을 선택해 주세요.",
-"create a new addressbook" => "새 주소록 만들기",
-"Name of new addressbook" => "새 주소록 이름",
-"Importing contacts" => "연락처 입력",
-"You have no contacts in your addressbook." => "당신의 주소록에는 연락처가 없습니다. ",
-"Add contact" => "연락처 추가",
-"CardDAV syncing addresses" => "CardDAV 주소 동기화",
-"more info" => "더 많은 정보",
-"Primary address (Kontact et al)" => "기본 주소 (Kontact et al)",
-"iOS/OS X" => "iOS/OS X",
-"Download" => "다운로드",
-"Edit" => "편집",
-"New Address Book" => "새 주소록",
-"Save" => "저장",
-"Cancel" => "취소"
-);
diff --git a/apps/contacts/l10n/lb.php b/apps/contacts/l10n/lb.php
deleted file mode 100644
index 22ca20e751..0000000000
--- a/apps/contacts/l10n/lb.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "Fehler beim (de)aktivéieren vum Adressbuch.",
-"id is not set." => "ID ass net gesat.",
-"Error updating addressbook." => "Fehler beim updaten vum Adressbuch.",
-"No ID provided" => "Keng ID uginn",
-"Error setting checksum." => "Fehler beim setzen vun der Checksum.",
-"No categories selected for deletion." => "Keng Kategorien fir ze läschen ausgewielt.",
-"No address books found." => "Keen Adressbuch fonnt.",
-"No contacts found." => "Keng Kontakter fonnt.",
-"There was an error adding the contact." => "Fehler beim bäisetzen vun engem Kontakt.",
-"Cannot add empty property." => "Ka keng eidel Proprietéit bäisetzen.",
-"Trying to add duplicate property: " => "Probéieren duebel Proprietéit bäi ze setzen:",
-"Information about vCard is incorrect. Please reload the page." => "Informatioun iwwert vCard ass net richteg. Lued d'Säit wegl nei.",
-"Missing ID" => "ID fehlt",
-"No contact ID was submitted." => "Kontakt ID ass net mat geschéckt ginn.",
-"Error reading contact photo." => "Fehler beim liesen vun der Kontakt Photo.",
-"Error saving temporary file." => "Fehler beim späicheren vum temporäre Fichier.",
-"The loading photo is not valid." => "Déi geluede Photo ass net gülteg.",
-"Contact ID is missing." => "Kontakt ID fehlt.",
-"File doesn't exist:" => "Fichier existéiert net:",
-"Error loading image." => "Fehler beim lueden vum Bild.",
-"No file was uploaded" => "Et ass kee Fichier ropgeluede ginn",
-"Contacts" => "Kontakter",
-"Error" => "Fehler",
-"Result: " => "Resultat: ",
-" imported, " => " importéiert, ",
-"This is not your addressbook." => "Dat do ass net däin Adressbuch.",
-"Contact could not be found." => "Konnt den Kontakt net fannen.",
-"Work" => "Aarbecht",
-"Home" => "Doheem",
-"Mobile" => "GSM",
-"Text" => "SMS",
-"Voice" => "Voice",
-"Message" => "Message",
-"Fax" => "Fax",
-"Video" => "Video",
-"Pager" => "Pager",
-"Internet" => "Internet",
-"Birthday" => "Gebuertsdag",
-"{name}'s Birthday" => "{name} säi Gebuertsdag",
-"Contact" => "Kontakt",
-"Add Contact" => "Kontakt bäisetzen",
-"Addressbooks" => "Adressbicher ",
-"Close" => "Zoumaachen",
-"Organization" => "Firma",
-"Delete" => "Läschen",
-"Nickname" => "Spëtznumm",
-"Enter nickname" => "Gëff e Spëtznumm an",
-"dd-mm-yyyy" => "dd-mm-yyyy",
-"Groups" => "Gruppen",
-"Edit groups" => "Gruppen editéieren",
-"Enter phone number" => "Telefonsnummer aginn",
-"Delete phone number" => "Telefonsnummer läschen",
-"View on map" => "Op da Kaart uweisen",
-"Edit address details" => "Adress Detailer editéieren",
-"Phone" => "Telefon",
-"Email" => "Email",
-"Address" => "Adress",
-"Note" => "Note",
-"Download contact" => "Kontakt eroflueden",
-"Delete contact" => "Kontakt läschen",
-"Type" => "Typ",
-"PO Box" => "Postleetzuel",
-"Extended" => "Erweidert",
-"City" => "Staat",
-"Region" => "Regioun",
-"Zipcode" => "Postleetzuel",
-"Country" => "Land",
-"Addressbook" => "Adressbuch",
-"Mr" => "M",
-"Sir" => "Sir",
-"Mrs" => "Mme",
-"Dr" => "Dr",
-"Given name" => "Virnumm",
-"Additional names" => "Weider Nimm",
-"Family name" => "Famillje Numm",
-"Ph.D." => "Ph.D.",
-"Jr." => "Jr.",
-"Sn." => "Sn.",
-"iOS/OS X" => "iOS/OS X",
-"Download" => "Download",
-"Edit" => "Editéieren",
-"New Address Book" => "Neit Adressbuch",
-"Save" => "Späicheren",
-"Cancel" => "Ofbriechen"
-);
diff --git a/apps/contacts/l10n/lt_LT.php b/apps/contacts/l10n/lt_LT.php
deleted file mode 100644
index 3b31aa7931..0000000000
--- a/apps/contacts/l10n/lt_LT.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "Klaida (de)aktyvuojant adresų knygą.",
-"No contacts found." => "Kontaktų nerasta.",
-"There was an error adding the contact." => "Pridedant kontaktą įvyko klaida.",
-"Information about vCard is incorrect. Please reload the page." => "Informacija apie vCard yra neteisinga. ",
-"Error reading contact photo." => "Klaida skaitant kontakto nuotrauką.",
-"The loading photo is not valid." => "Netinkama įkeliama nuotrauka.",
-"File doesn't exist:" => "Failas neegzistuoja:",
-"Error loading image." => "Klaida įkeliant nuotrauką.",
-"There is no error, the file uploaded with success" => "Failas įkeltas sėkmingai, be klaidų",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Įkeliamo failo dydis viršija upload_max_filesize nustatymą php.ini",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Įkeliamo failo dydis viršija MAX_FILE_SIZE nustatymą, kuris naudojamas HTML formoje.",
-"The uploaded file was only partially uploaded" => "Failas buvo įkeltas tik dalinai",
-"No file was uploaded" => "Nebuvo įkeltas joks failas",
-"Contacts" => "Kontaktai",
-"This is not your addressbook." => "Tai ne jūsų adresų knygelė.",
-"Contact could not be found." => "Kontaktas nerastas",
-"Work" => "Darbo",
-"Home" => "Namų",
-"Mobile" => "Mobilusis",
-"Text" => "Žinučių",
-"Voice" => "Balso",
-"Message" => "Žinutė",
-"Fax" => "Faksas",
-"Video" => "Vaizdo",
-"Pager" => "Pranešimų gaviklis",
-"Internet" => "Internetas",
-"Birthday" => "Gimtadienis",
-"Contact" => "Kontaktas",
-"Add Contact" => "Pridėti kontaktą",
-"Addressbooks" => "Adresų knygos",
-"Organization" => "Organizacija",
-"Delete" => "Trinti",
-"Nickname" => "Slapyvardis",
-"Enter nickname" => "Įveskite slapyvardį",
-"Phone" => "Telefonas",
-"Email" => "El. paštas",
-"Address" => "Adresas",
-"Download contact" => "Atsisųsti kontaktą",
-"Delete contact" => "Ištrinti kontaktą",
-"Type" => "Tipas",
-"PO Box" => "Pašto dėžutė",
-"City" => "Miestas",
-"Region" => "Regionas",
-"Zipcode" => "Pašto indeksas",
-"Country" => "Šalis",
-"Addressbook" => "Adresų knyga",
-"Download" => "Atsisiųsti",
-"Edit" => "Keisti",
-"New Address Book" => "Nauja adresų knyga",
-"Save" => "Išsaugoti",
-"Cancel" => "Atšaukti"
-);
diff --git a/apps/contacts/l10n/mk.php b/apps/contacts/l10n/mk.php
deleted file mode 100644
index dbdd633e51..0000000000
--- a/apps/contacts/l10n/mk.php
+++ /dev/null
@@ -1,164 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "Грешка (де)активирање на адресарот.",
-"id is not set." => "ид не е поставено.",
-"Cannot update addressbook with an empty name." => "Неможе да се ажурира адресар со празно име.",
-"Error updating addressbook." => "Грешка при ажурирање на адресарот.",
-"No ID provided" => "Нема доставено ИД",
-"Error setting checksum." => "Грешка во поставување сума за проверка.",
-"No categories selected for deletion." => "Нема избрано категории за бришење.",
-"No address books found." => "Не се најдени адресари.",
-"No contacts found." => "Не се најдени контакти.",
-"There was an error adding the contact." => "Имаше грешка при додавање на контактот.",
-"element name is not set." => "име за елементот не е поставена.",
-"Cannot add empty property." => "Неможе да се додаде празна вредност.",
-"At least one of the address fields has to be filled out." => "Барем една од полињата за адреса треба да биде пополнето.",
-"Trying to add duplicate property: " => "Се обидовте да внесете дупликат вредност:",
-"Information about vCard is incorrect. Please reload the page." => "Информацијата за vCard не е точна. Ве молам превчитајте ја страницава.",
-"Missing ID" => "Недостасува ИД",
-"Error parsing VCard for ID: \"" => "Грешка при парсирање VCard за ИД: \"",
-"checksum is not set." => "сумата за проверка не е поставена.",
-"Information about vCard is incorrect. Please reload the page: " => "Информацијата за vCard не е точна. Ве молам превчитајте ја страницава:",
-"Something went FUBAR. " => "Нешто се расипа.",
-"No contact ID was submitted." => "Не беше доставено ИД за контакт.",
-"Error reading contact photo." => "Грешка во читање на контакт фотографија.",
-"Error saving temporary file." => "Грешка во снимање на привремена датотека.",
-"The loading photo is not valid." => "Фотографијата која се вчитува е невалидна.",
-"Contact ID is missing." => "ИД за контакт недостасува.",
-"No photo path was submitted." => "Не беше поднесена патека за фотографија.",
-"File doesn't exist:" => "Не постои датотеката:",
-"Error loading image." => "Грешка во вчитување на слика.",
-"Error getting contact object." => "Грешка при преземањето на контакт објектот,",
-"Error getting PHOTO property." => "Грешка при утврдувањето на карактеристиките на фотографијата.",
-"Error saving contact." => "Грешка при снимање на контактите.",
-"Error resizing image" => "Грешка при скалирање на фотографијата",
-"Error cropping image" => "Грешка при сечење на фотографијата",
-"Error creating temporary image" => "Грешка при креирањето на привремената фотографија",
-"Error finding image: " => "Грешка при наоѓањето на фотографијата:",
-"Error uploading contacts to storage." => "Грешка во снимање на контактите на диск.",
-"There is no error, the file uploaded with success" => "Датотеката беше успешно подигната.",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Големината на датотеката ја надминува upload_max_filesize директивата во php.ini",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Големината на датотеката ја надминува MAX_FILE_SIZE директивата која беше специфицирана во HTML формата",
-"The uploaded file was only partially uploaded" => "Датотеката беше само делумно подигната.",
-"No file was uploaded" => "Не беше подигната датотека.",
-"Missing a temporary folder" => "Недостасува привремена папка",
-"Couldn't save temporary image: " => "Не можеше да се сними привремената фотографија:",
-"Couldn't load temporary image: " => "Не можеше да се вчита привремената фотографија:",
-"No file was uploaded. Unknown error" => "Ниту еден фајл не се вчита. Непозната грешка",
-"Contacts" => "Контакти",
-"Sorry, this functionality has not been implemented yet" => "Жалам, оваа функционалност уште не е имплементирана",
-"Not implemented" => "Не е имплементирано",
-"Couldn't get a valid address." => "Не можев да добијам исправна адреса.",
-"Error" => "Грешка",
-"This property has to be non-empty." => "Својството не смее да биде празно.",
-"Couldn't serialize elements." => "Не може да се серијализираат елементите.",
-"'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "'deleteProperty' повикан без тип на аргументот. Пријавете грешка/проблем на bugs.owncloud.org",
-"Edit name" => "Уреди го името",
-"No files selected for upload." => "Ниту еден фајл не е избран за вчитување.",
-"The file you are trying to upload exceed the maximum size for file uploads on this server." => "Датотеката која се обидувате да ја префрлите ја надминува максималната големина дефинирана за пренос на овој сервер.",
-"Select type" => "Одбери тип",
-"Result: " => "Резултат: ",
-" imported, " => "увезено,",
-" failed." => "неуспешно.",
-"This is not your addressbook." => "Ова не е во Вашиот адресар.",
-"Contact could not be found." => "Контактот неможе да биде најден.",
-"Work" => "Работа",
-"Home" => "Дома",
-"Mobile" => "Мобилен",
-"Text" => "Текст",
-"Voice" => "Глас",
-"Message" => "Порака",
-"Fax" => "Факс",
-"Video" => "Видео",
-"Pager" => "Пејџер",
-"Internet" => "Интернет",
-"Birthday" => "Роденден",
-"{name}'s Birthday" => "Роденден на {name}",
-"Contact" => "Контакт",
-"Add Contact" => "Додади контакт",
-"Import" => "Внеси",
-"Addressbooks" => "Адресари",
-"Close" => "Затвои",
-"Drop photo to upload" => "Довлечкај фотографија за да се подигне",
-"Delete current photo" => "Избриши моментална фотографија",
-"Edit current photo" => "Уреди моментална фотографија",
-"Upload new photo" => "Подигни нова фотографија",
-"Select photo from ownCloud" => "Изберете фотографија од ownCloud",
-"Format custom, Short name, Full name, Reverse or Reverse with comma" => "Прилагоден формат, кратко име, цело име, обратно или обратно со запирка",
-"Edit name details" => "Уреди детали за име",
-"Organization" => "Организација",
-"Delete" => "Избриши",
-"Nickname" => "Прекар",
-"Enter nickname" => "Внеси прекар",
-"dd-mm-yyyy" => "dd-mm-yyyy",
-"Groups" => "Групи",
-"Separate groups with commas" => "Одвоете ги групите со запирка",
-"Edit groups" => "Уреди групи",
-"Preferred" => "Претпочитано",
-"Please specify a valid email address." => "Ве молам внесете правилна адреса за е-пошта.",
-"Enter email address" => "Внесете е-пошта",
-"Mail to address" => "Прати порака до адреса",
-"Delete email address" => "Избриши адреса за е-пошта",
-"Enter phone number" => "Внесете телефонски број",
-"Delete phone number" => "Избриши телефонски број",
-"View on map" => "Погледајте на мапа",
-"Edit address details" => "Уреди детали за адреса",
-"Add notes here." => "Внесете забелешки тука.",
-"Add field" => "Додади поле",
-"Phone" => "Телефон",
-"Email" => "Е-пошта",
-"Address" => "Адреса",
-"Note" => "Забелешка",
-"Download contact" => "Преземи го контактот",
-"Delete contact" => "Избриши го контактот",
-"The temporary image has been removed from cache." => "Привремената слика е отстранета од кешот.",
-"Edit address" => "Уреди адреса",
-"Type" => "Тип",
-"PO Box" => "Поштенски фах",
-"Extended" => "Дополнително",
-"City" => "Град",
-"Region" => "Регион",
-"Zipcode" => "Поштенски код",
-"Country" => "Држава",
-"Addressbook" => "Адресар",
-"Hon. prefixes" => "Префикси за титула",
-"Miss" => "Г-ца",
-"Ms" => "Г-ѓа",
-"Mr" => "Г-дин",
-"Sir" => "Сер",
-"Mrs" => "Г-ѓа",
-"Dr" => "Др",
-"Given name" => "Лично име",
-"Additional names" => "Дополнителни имиња",
-"Family name" => "Презиме",
-"Hon. suffixes" => "Суфикси за титула",
-"J.D." => "J.D.",
-"M.D." => "Д.М.",
-"D.O." => "D.O.",
-"D.C." => "D.C.",
-"Ph.D." => "Д-р",
-"Esq." => "Esq.",
-"Jr." => "Помлад.",
-"Sn." => "Постар.",
-"Import a contacts file" => "Внеси датотека со контакти",
-"Please choose the addressbook" => "Ве молам изберете адресар",
-"create a new addressbook" => "креирај нов адресар",
-"Name of new addressbook" => "Име на новиот адресар",
-"Importing contacts" => "Внесување контакти",
-"Contacts imported successfully" => "Контаките беа внесени успешно",
-"Close Dialog" => "Дијалог за затварање",
-"Import Addressbook" => "Внеси адресар",
-"Select address book to import to:" => "Изберете адресар да се внесе:",
-"Drop a VCF file to import contacts." => "Довлечкај VCF датотека да се внесат контакти.",
-"Select from HD" => "Изберете од хард диск",
-"You have no contacts in your addressbook." => "Немате контакти во Вашиот адресар.",
-"Add contact" => "Додади контакт",
-"CardDAV syncing addresses" => "Адреса за синхронизација со CardDAV",
-"more info" => "повеќе информации",
-"Primary address (Kontact et al)" => "Примарна адреса",
-"iOS/OS X" => "iOS/OS X",
-"Download" => "Преземи",
-"Edit" => "Уреди",
-"New Address Book" => "Нов адресар",
-"Save" => "Сними",
-"Cancel" => "Откажи"
-);
diff --git a/apps/contacts/l10n/ms_MY.php b/apps/contacts/l10n/ms_MY.php
deleted file mode 100644
index 3fce9eae5a..0000000000
--- a/apps/contacts/l10n/ms_MY.php
+++ /dev/null
@@ -1,178 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "Ralat nyahaktif buku alamat.",
-"id is not set." => "ID tidak ditetapkan.",
-"Cannot update addressbook with an empty name." => "Tidak boleh kemaskini buku alamat dengan nama yang kosong.",
-"Error updating addressbook." => "Masalah mengemaskini buku alamat.",
-"No ID provided" => "tiada ID diberi",
-"Error setting checksum." => "Ralat menetapkan checksum.",
-"No categories selected for deletion." => "Tiada kategori dipilih untuk dibuang.",
-"No address books found." => "Tiada buku alamat dijumpai.",
-"No contacts found." => "Tiada kenalan dijumpai.",
-"There was an error adding the contact." => "Terdapat masalah menambah maklumat.",
-"element name is not set." => "nama elemen tidak ditetapkan.",
-"Cannot add empty property." => "Tidak boleh menambah ruang kosong.",
-"At least one of the address fields has to be filled out." => "Sekurangnya satu ruangan alamat perlu diisikan.",
-"Trying to add duplicate property: " => "Cuba untuk letak nilai duplikasi:",
-"Information about vCard is incorrect. Please reload the page." => "Maklumat vCard tidak tepat. Sila reload semula halaman ini.",
-"Missing ID" => "ID Hilang",
-"Error parsing VCard for ID: \"" => "Ralat VCard untuk ID: \"",
-"checksum is not set." => "checksum tidak ditetapkan.",
-"Information about vCard is incorrect. Please reload the page: " => "Maklumat tentang vCard tidak betul.",
-"Something went FUBAR. " => "Sesuatu tidak betul.",
-"No contact ID was submitted." => "Tiada ID kenalan yang diberi.",
-"Error reading contact photo." => "Ralat pada foto kenalan.",
-"Error saving temporary file." => "Ralat menyimpan fail sementara",
-"The loading photo is not valid." => "Foto muatan tidak sah.",
-"Contact ID is missing." => "ID Kenalan telah hilang.",
-"No photo path was submitted." => "Tiada direktori gambar yang diberi.",
-"File doesn't exist:" => "Fail tidak wujud:",
-"Error loading image." => "Ralat pada muatan imej.",
-"Error getting contact object." => "Ralat mendapatkan objek pada kenalan.",
-"Error getting PHOTO property." => "Ralat mendapatkan maklumat gambar.",
-"Error saving contact." => "Ralat menyimpan kenalan.",
-"Error resizing image" => "Ralat mengubah saiz imej",
-"Error cropping image" => "Ralat memotong imej",
-"Error creating temporary image" => "Ralat mencipta imej sementara",
-"Error finding image: " => "Ralat mencari imej: ",
-"Error uploading contacts to storage." => "Ralat memuatnaik senarai kenalan.",
-"There is no error, the file uploaded with success" => "Tiada ralat berlaku, fail berjaya dimuatnaik",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Saiz fail yang dimuatnaik melebihi upload_max_filesize yang ditetapkan dalam php.ini",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Saiz fail yang dimuatnaik melebihi MAX_FILE_SIZE yang ditetapkan dalam borang HTML",
-"The uploaded file was only partially uploaded" => "Fail yang dimuatnaik tidak lengkap",
-"No file was uploaded" => "Tiada fail dimuatnaik",
-"Missing a temporary folder" => "Direktori sementara hilang",
-"Couldn't save temporary image: " => "Tidak boleh menyimpan imej sementara: ",
-"Couldn't load temporary image: " => "Tidak boleh membuka imej sementara: ",
-"No file was uploaded. Unknown error" => "Tiada fail dimuatnaik. Ralat tidak diketahui.",
-"Contacts" => "Hubungan-hubungan",
-"Sorry, this functionality has not been implemented yet" => "Maaf, fungsi ini masih belum boleh diguna lagi",
-"Not implemented" => "Tidak digunakan",
-"Couldn't get a valid address." => "Tidak boleh mendapat alamat yang sah.",
-"Error" => "Ralat",
-"This property has to be non-empty." => "Nilai ini tidak boleh kosong.",
-"Couldn't serialize elements." => "Tidak boleh menggabungkan elemen.",
-"'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "'deleteProperty' dipanggil tanpa argumen taip. Sila maklumkan di bugs.owncloud.org",
-"Edit name" => "Ubah nama",
-"No files selected for upload." => "Tiada fail dipilih untuk muatnaik.",
-"The file you are trying to upload exceed the maximum size for file uploads on this server." => "Fail yang ingin dimuatnaik melebihi saiz yang dibenarkan.",
-"Select type" => "PIlih jenis",
-"Result: " => "Hasil: ",
-" imported, " => " import, ",
-" failed." => " gagal.",
-"Addressbook not found: " => "Buku alamat tidak ditemui:",
-"This is not your addressbook." => "Ini bukan buku alamat anda.",
-"Contact could not be found." => "Hubungan tidak dapat ditemui",
-"Work" => "Kerja",
-"Home" => "Rumah",
-"Other" => "Lain",
-"Mobile" => "Mudah alih",
-"Text" => "Teks",
-"Voice" => "Suara",
-"Message" => "Mesej",
-"Fax" => "Fax",
-"Video" => "Video",
-"Pager" => "Alat Kelui",
-"Internet" => "Internet",
-"Birthday" => "Hari lahir",
-"Business" => "Perniagaan",
-"Clients" => "klien",
-"Holidays" => "Hari kelepasan",
-"Ideas" => "Idea",
-"Journey" => "Perjalanan",
-"Jubilee" => "Jubli",
-"Meeting" => "Mesyuarat",
-"Personal" => "Peribadi",
-"Projects" => "Projek",
-"{name}'s Birthday" => "Hari Lahir {name}",
-"Contact" => "Hubungan",
-"Add Contact" => "Tambah kenalan",
-"Import" => "Import",
-"Settings" => "Tetapan",
-"Addressbooks" => "Senarai Buku Alamat",
-"Close" => "Tutup",
-"Next addressbook" => "Buku alamat seterusnya",
-"Previous addressbook" => "Buku alamat sebelumnya",
-"Drop photo to upload" => "Letak foto disini untuk muatnaik",
-"Delete current photo" => "Padam foto semasa",
-"Edit current photo" => "Ubah foto semasa",
-"Upload new photo" => "Muatnaik foto baru",
-"Select photo from ownCloud" => "Pilih foto dari ownCloud",
-"Format custom, Short name, Full name, Reverse or Reverse with comma" => "Format bebas, Nama pendek, Nama penuh, Unduran dengan koma",
-"Edit name details" => "Ubah butiran nama",
-"Organization" => "Organisasi",
-"Delete" => "Padam",
-"Nickname" => "Nama Samaran",
-"Enter nickname" => "Masukkan nama samaran",
-"dd-mm-yyyy" => "dd-mm-yyyy",
-"Groups" => "Kumpulan",
-"Separate groups with commas" => "Asingkan kumpulan dengan koma",
-"Edit groups" => "Ubah kumpulan",
-"Preferred" => "Pilihan",
-"Please specify a valid email address." => "Berikan alamat emel yang sah.",
-"Enter email address" => "Masukkan alamat emel",
-"Mail to address" => "Hantar ke alamat",
-"Delete email address" => "Padam alamat emel",
-"Enter phone number" => "Masukkan nombor telefon",
-"Delete phone number" => "Padam nombor telefon",
-"View on map" => "Lihat pada peta",
-"Edit address details" => "Ubah butiran alamat",
-"Add notes here." => "Letak nota disini.",
-"Add field" => "Letak ruangan",
-"Phone" => "Telefon",
-"Email" => "Emel",
-"Address" => "Alamat",
-"Note" => "Nota",
-"Download contact" => "Muat turun hubungan",
-"Delete contact" => "Padam hubungan",
-"The temporary image has been removed from cache." => "Imej sementara telah dibuang dari cache.",
-"Edit address" => "Ubah alamat",
-"Type" => "Jenis",
-"PO Box" => "Peti surat",
-"Extended" => "Sambungan",
-"City" => "bandar",
-"Region" => "Wilayah",
-"Zipcode" => "Poskod",
-"Country" => "Negara",
-"Addressbook" => "Buku alamat",
-"Hon. prefixes" => "Awalan nama",
-"Miss" => "Cik",
-"Ms" => "Cik",
-"Mr" => "Encik",
-"Sir" => "Tuan",
-"Mrs" => "Puan",
-"Dr" => "Dr",
-"Given name" => "Nama diberi",
-"Additional names" => "Nama tambahan",
-"Family name" => "Nama keluarga",
-"Hon. suffixes" => "Awalan nama",
-"J.D." => "J.D.",
-"M.D." => "M.D.",
-"D.O." => "D.O.",
-"D.C." => "D.C.",
-"Ph.D." => "Ph.D.",
-"Esq." => "Esq.",
-"Jr." => "Jr.",
-"Sn." => "Sn.",
-"Import a contacts file" => "Import fail kenalan",
-"Please choose the addressbook" => "Sila pilih buku alamat",
-"create a new addressbook" => "Cipta buku alamat baru",
-"Name of new addressbook" => "Nama buku alamat",
-"Importing contacts" => "Import senarai kenalan",
-"You have no contacts in your addressbook." => "Anda tidak mempunyai sebarang kenalan didalam buku alamat.",
-"Add contact" => "Letak kenalan",
-"Select Address Books" => "Pilih Buku Alamat",
-"Enter name" => "Masukkan nama",
-"Enter description" => "Masukkan keterangan",
-"CardDAV syncing addresses" => "alamat selarian CardDAV",
-"more info" => "maklumat lanjut",
-"Primary address (Kontact et al)" => "Alamat utama",
-"iOS/OS X" => "iOS/OS X",
-"Download" => "Muat naik",
-"Edit" => "Sunting",
-"New Address Book" => "Buku Alamat Baru",
-"Name" => "Nama",
-"Description" => "Keterangan",
-"Save" => "Simpan",
-"Cancel" => "Batal",
-"More..." => "Lagi..."
-);
diff --git a/apps/contacts/l10n/nb_NO.php b/apps/contacts/l10n/nb_NO.php
deleted file mode 100644
index 5f7c49c8b9..0000000000
--- a/apps/contacts/l10n/nb_NO.php
+++ /dev/null
@@ -1,141 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "Et problem oppsto med å (de)aktivere adresseboken.",
-"id is not set." => "id er ikke satt.",
-"Cannot update addressbook with an empty name." => "Kan ikke oppdatere adressebøker uten navn.",
-"Error updating addressbook." => "Et problem oppsto med å oppdatere adresseboken.",
-"No ID provided" => "Ingen ID angitt",
-"No categories selected for deletion." => "Ingen kategorier valgt for sletting.",
-"No address books found." => "Ingen adressebok funnet.",
-"No contacts found." => "Ingen kontakter funnet.",
-"There was an error adding the contact." => "Et problem oppsto med å legge til kontakten.",
-"Cannot add empty property." => "Kan ikke legge til tomt felt.",
-"At least one of the address fields has to be filled out." => "Minst en av adressefeltene må oppgis.",
-"Information about vCard is incorrect. Please reload the page." => "Informasjonen om vCard-filen er ikke riktig. Last inn siden på nytt.",
-"Missing ID" => "Manglende ID",
-"Something went FUBAR. " => "Noe gikk fryktelig galt.",
-"Error reading contact photo." => "Klarte ikke å lese kontaktbilde.",
-"Error saving temporary file." => "Klarte ikke å lagre midlertidig fil.",
-"The loading photo is not valid." => "Bildet som lastes inn er ikke gyldig.",
-"Contact ID is missing." => "Kontakt-ID mangler.",
-"No photo path was submitted." => "Ingen filsti ble lagt inn.",
-"File doesn't exist:" => "Filen eksisterer ikke:",
-"Error loading image." => "Klarte ikke å laste bilde.",
-"Error saving contact." => "Klarte ikke å lagre kontakt.",
-"Error resizing image" => "Klarte ikke å endre størrelse på bildet",
-"Error cropping image" => "Klarte ikke å beskjære bildet",
-"Error creating temporary image" => "Klarte ikke å lage et midlertidig bilde",
-"Error finding image: " => "Kunne ikke finne bilde:",
-"Error uploading contacts to storage." => "Klarte ikke å laste opp kontakter til lagringsplassen",
-"There is no error, the file uploaded with success" => "Pust ut, ingen feil. Filen ble lastet opp problemfritt",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Filen du prøvde å laste opp var større enn grensen upload_max_filesize i php.ini",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Filen du prøvde å laste opp var større enn grensen satt i MAX_FILE_SIZE i HTML-skjemaet.",
-"The uploaded file was only partially uploaded" => "Filen du prøvde å laste opp ble kun delvis lastet opp",
-"No file was uploaded" => "Ingen filer ble lastet opp",
-"Missing a temporary folder" => "Mangler midlertidig mappe",
-"Couldn't save temporary image: " => "Kunne ikke lagre midlertidig bilde:",
-"Couldn't load temporary image: " => "Kunne ikke laste midlertidig bilde:",
-"No file was uploaded. Unknown error" => "Ingen filer ble lastet opp. Ukjent feil.",
-"Contacts" => "Kontakter",
-"Error" => "Feil",
-"Edit name" => "Endre navn",
-"No files selected for upload." => "Ingen filer valgt for opplasting.",
-"The file you are trying to upload exceed the maximum size for file uploads on this server." => "Filen du prøver å laste opp er for stor.",
-"Select type" => "Velg type",
-"Result: " => "Resultat:",
-" imported, " => "importert,",
-" failed." => "feilet.",
-"This is not your addressbook." => "Dette er ikke dine adressebok.",
-"Contact could not be found." => "Kontakten ble ikke funnet.",
-"Work" => "Arbeid",
-"Home" => "Hjem",
-"Mobile" => "Mobil",
-"Text" => "Tekst",
-"Voice" => "Svarer",
-"Message" => "Melding",
-"Fax" => "Faks",
-"Video" => "Video",
-"Pager" => "Pager",
-"Internet" => "Internett",
-"Birthday" => "Bursdag",
-"{name}'s Birthday" => "{name}s bursdag",
-"Contact" => "Kontakt",
-"Add Contact" => "Ny kontakt",
-"Import" => "Importer",
-"Addressbooks" => "Adressebøker",
-"Close" => "Lukk",
-"Drop photo to upload" => "Dra bilder hit for å laste opp",
-"Delete current photo" => "Fjern nåværende bilde",
-"Edit current photo" => "Rediger nåværende bilde",
-"Upload new photo" => "Last opp nytt bilde",
-"Select photo from ownCloud" => "Velg bilde fra ownCloud",
-"Edit name details" => "Endre detaljer rundt navn",
-"Organization" => "Organisasjon",
-"Delete" => "Slett",
-"Nickname" => "Kallenavn",
-"Enter nickname" => "Skriv inn kallenavn",
-"dd-mm-yyyy" => "dd-mm-åååå",
-"Groups" => "Grupper",
-"Separate groups with commas" => "Skill gruppene med komma",
-"Edit groups" => "Endre grupper",
-"Preferred" => "Foretrukket",
-"Please specify a valid email address." => "Vennligst angi en gyldig e-postadresse.",
-"Enter email address" => "Skriv inn e-postadresse",
-"Mail to address" => "Send e-post til adresse",
-"Delete email address" => "Fjern e-postadresse",
-"Enter phone number" => "Skriv inn telefonnummer",
-"Delete phone number" => "Fjern telefonnummer",
-"View on map" => "Se på kart",
-"Edit address details" => "Endre detaljer rundt adresse",
-"Add notes here." => "Legg inn notater her.",
-"Add field" => "Legg til felt",
-"Phone" => "Telefon",
-"Email" => "E-post",
-"Address" => "Adresse",
-"Note" => "Notat",
-"Download contact" => "Hend ned kontakten",
-"Delete contact" => "Slett kontakt",
-"The temporary image has been removed from cache." => "Det midlertidige bildet er fjernet fra cache.",
-"Edit address" => "Endre adresse",
-"Type" => "Type",
-"PO Box" => "Postboks",
-"Extended" => "Utvidet",
-"City" => "By",
-"Region" => "Området",
-"Zipcode" => "Postnummer",
-"Country" => "Land",
-"Addressbook" => "Adressebok",
-"Hon. prefixes" => "Ærestitler",
-"Miss" => "Frøken",
-"Mr" => "Herr",
-"Mrs" => "Fru",
-"Dr" => "Dr",
-"Given name" => "Fornavn",
-"Additional names" => "Ev. mellomnavn",
-"Family name" => "Etternavn",
-"Hon. suffixes" => "Titler",
-"Ph.D." => "Stipendiat",
-"Jr." => "Jr.",
-"Sn." => "Sr.",
-"New Addressbook" => "Ny adressebok",
-"Edit Addressbook" => "Endre adressebok",
-"Displayname" => "Visningsnavn",
-"Active" => "Aktiv",
-"Save" => "Lagre",
-"Submit" => "Send inn",
-"Cancel" => "Avbryt",
-"Import a contacts file" => "Importer en fil med kontakter.",
-"Please choose the addressbook" => "Vennligst velg adressebok",
-"create a new addressbook" => "Lag ny adressebok",
-"Name of new addressbook" => "Navn på ny adressebok",
-"Importing contacts" => "Importerer kontakter",
-"You have no contacts in your addressbook." => "Du har ingen kontakter i din adressebok",
-"Add contact" => "Ny kontakt",
-"CardDAV syncing addresses" => "Synkroniseringsadresse for CardDAV",
-"more info" => "mer info",
-"iOS/OS X" => "iOS/OS X",
-"Download" => "Hent ned",
-"Edit" => "Rediger",
-"New Address Book" => "Ny adressebok",
-"Save" => "Lagre",
-"Cancel" => "Avbryt"
-);
diff --git a/apps/contacts/l10n/nl.php b/apps/contacts/l10n/nl.php
deleted file mode 100644
index a8646e9d4e..0000000000
--- a/apps/contacts/l10n/nl.php
+++ /dev/null
@@ -1,226 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "Fout bij het (de)activeren van het adresboek.",
-"id is not set." => "id is niet ingesteld.",
-"Cannot update addressbook with an empty name." => "Kan adresboek zonder naam niet wijzigen",
-"Error updating addressbook." => "Fout bij het updaten van het adresboek.",
-"No ID provided" => "Geen ID opgegeven",
-"Error setting checksum." => "Instellen controlegetal mislukt",
-"No categories selected for deletion." => "Geen categorieën geselecteerd om te verwijderen.",
-"No address books found." => "Geen adresboek gevonden",
-"No contacts found." => "Geen contracten gevonden",
-"There was an error adding the contact." => "Er was een fout bij het toevoegen van het contact.",
-"element name is not set." => "onderdeel naam is niet opgegeven.",
-"Could not parse contact: " => "Kon het contact niet verwerken",
-"Cannot add empty property." => "Kan geen lege eigenschap toevoegen.",
-"At least one of the address fields has to be filled out." => "Minstens één van de adresvelden moet ingevuld worden.",
-"Trying to add duplicate property: " => "Eigenschap bestaat al: ",
-"Missing IM parameter." => "IM parameter ontbreekt",
-"Unknown IM: " => "Onbekende IM:",
-"Information about vCard is incorrect. Please reload the page." => "Informatie over de vCard is onjuist. Herlaad de pagina.",
-"Missing ID" => "Ontbrekend ID",
-"Error parsing VCard for ID: \"" => "Fout bij inlezen VCard voor ID: \"",
-"checksum is not set." => "controlegetal is niet opgegeven.",
-"Information about vCard is incorrect. Please reload the page: " => "Informatie over vCard is fout. Herlaad de pagina: ",
-"Something went FUBAR. " => "Er ging iets totaal verkeerd. ",
-"No contact ID was submitted." => "Geen contact ID opgestuurd.",
-"Error reading contact photo." => "Lezen van contact foto mislukt.",
-"Error saving temporary file." => "Tijdelijk bestand opslaan mislukt.",
-"The loading photo is not valid." => "De geladen foto is niet goed.",
-"Contact ID is missing." => "Contact ID ontbreekt.",
-"No photo path was submitted." => "Geen fotopad opgestuurd.",
-"File doesn't exist:" => "Bestand bestaat niet:",
-"Error loading image." => "Fout bij laden plaatje.",
-"Error getting contact object." => "Fout om contact object te verkrijgen",
-"Error getting PHOTO property." => "Fout om PHOTO eigenschap te verkrijgen",
-"Error saving contact." => "Fout om contact op te slaan",
-"Error resizing image" => "Fout tijdens aanpassen plaatje",
-"Error cropping image" => "Fout tijdens aanpassen plaatje",
-"Error creating temporary image" => "Fout om een tijdelijk plaatje te maken",
-"Error finding image: " => "Fout kan plaatje niet vinden:",
-"Error uploading contacts to storage." => "Fout bij opslaan van contacten.",
-"There is no error, the file uploaded with success" => "De upload van het bestand is goedgegaan.",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Het bestand overschrijdt de upload_max_filesize instelling in php.ini",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Het bestand overschrijdt de MAX_FILE_SIZE instelling dat is opgegeven in het HTML formulier",
-"The uploaded file was only partially uploaded" => "Het bestand is gedeeltelijk geüpload",
-"No file was uploaded" => "Er is geen bestand geüpload",
-"Missing a temporary folder" => "Er ontbreekt een tijdelijke map",
-"Couldn't save temporary image: " => "Kan tijdelijk plaatje niet op slaan:",
-"Couldn't load temporary image: " => "Kan tijdelijk plaatje niet op laden:",
-"No file was uploaded. Unknown error" => "Er was geen bestand geladen.  Onbekende fout",
-"Contacts" => "Contacten",
-"Sorry, this functionality has not been implemented yet" => "Sorry, deze functionaliteit is nog niet geïmplementeerd",
-"Not implemented" => "Niet geïmplementeerd",
-"Couldn't get a valid address." => "Kan geen geldig adres krijgen",
-"Error" => "Fout",
-"You do not have permission to add contacts to " => "U hebt geen permissie om contacten toe te voegen aan",
-"Please select one of your own address books." => "Selecteer één van uw eigen adresboeken",
-"Permission error" => "Permissie fout",
-"This property has to be non-empty." => "Dit veld mag niet leeg blijven",
-"Couldn't serialize elements." => "Kan de elementen niet serializen",
-"'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "'deleteProperty' aangeroepen zonder type argument. Rapporteer dit a.u.b. via http://bugs.owncloud.org",
-"Edit name" => "Pas naam aan",
-"No files selected for upload." => "Geen bestanden geselecteerd voor upload.",
-"The file you are trying to upload exceed the maximum size for file uploads on this server." => "Het bestand dat u probeert te uploaden overschrijdt de maximale bestand grootte voor bestand uploads voor deze server.",
-"Error loading profile picture." => "Fout profiel plaatje kan niet worden geladen.",
-"Select type" => "Selecteer type",
-"Some contacts are marked for deletion, but not deleted yet. Please wait for them to be deleted." => "Enkele contacten zijn gemarkeerd om verwijderd te worden, maar zijn nog niet verwijderd.  Wacht totdat ze zijn verwijderd.",
-"Do you want to merge these address books?" => "Wilt u deze adresboeken samenvoegen?",
-"Result: " => "Resultaat:",
-" imported, " => "geïmporteerd,",
-" failed." => "gefaald.",
-"Displayname cannot be empty." => "Displaynaam mag niet leeg zijn.",
-"Addressbook not found: " => "Adresboek niet gevonden:",
-"This is not your addressbook." => "Dit is niet uw adresboek.",
-"Contact could not be found." => "Contact kon niet worden gevonden.",
-"Jabber" => "Jabber",
-"AIM" => "AIM",
-"MSN" => "MSN",
-"Twitter" => "Twitter",
-"GoogleTalk" => "GoogleTalk",
-"Facebook" => "Facebook",
-"XMPP" => "XMPP",
-"ICQ" => "ICQ",
-"Yahoo" => "Yahoo",
-"Skype" => "Skype",
-"QQ" => "QQ",
-"GaduGadu" => "GaduGadu",
-"Work" => "Werk",
-"Home" => "Thuis",
-"Other" => "Anders",
-"Mobile" => "Mobiel",
-"Text" => "Tekst",
-"Voice" => "Stem",
-"Message" => "Bericht",
-"Fax" => "Fax",
-"Video" => "Video",
-"Pager" => "Pieper",
-"Internet" => "Internet",
-"Birthday" => "Verjaardag",
-"Business" => "Business",
-"Call" => "Bel",
-"Clients" => "Klanten",
-"Deliverer" => "Leverancier",
-"Holidays" => "Vakanties",
-"Ideas" => "Ideeën",
-"Journey" => "Reis",
-"Jubilee" => "Jubileum",
-"Meeting" => "Vergadering",
-"Personal" => "Persoonlijk",
-"Projects" => "Projecten",
-"Questions" => "Vragen",
-"{name}'s Birthday" => "{name}'s verjaardag",
-"Contact" => "Contact",
-"You do not have the permissions to edit this contact." => "U heeft geen permissie om dit contact te bewerken.",
-"You do not have the permissions to delete this contact." => "U heeft geen permissie om dit contact te verwijderen.",
-"Add Contact" => "Contact toevoegen",
-"Import" => "Importeer",
-"Settings" => "Instellingen",
-"Addressbooks" => "Adresboeken",
-"Close" => "Sluiten",
-"Keyboard shortcuts" => "Sneltoetsen",
-"Navigation" => "Navigatie",
-"Next contact in list" => "Volgende contact in de lijst",
-"Previous contact in list" => "Vorige contact in de lijst",
-"Expand/collapse current addressbook" => "Uitklappen / inklappen huidig adresboek",
-"Next addressbook" => "Volgende adresboek",
-"Previous addressbook" => "Vorige adresboek",
-"Actions" => "Acties",
-"Refresh contacts list" => "Vernieuw contact lijst",
-"Add new contact" => "Voeg nieuw contact toe",
-"Add new addressbook" => "Voeg nieuw adresboek toe",
-"Delete current contact" => "Verwijder huidig contact",
-"Drop photo to upload" => "Verwijder foto uit upload",
-"Delete current photo" => "Verwijdere huidige foto",
-"Edit current photo" => "Wijzig huidige foto",
-"Upload new photo" => "Upload nieuwe foto",
-"Select photo from ownCloud" => "Selecteer foto uit ownCloud",
-"Format custom, Short name, Full name, Reverse or Reverse with comma" => "Formateer aangepast, Korte naam, Volledige naam, Achteruit of Achteruit met komma",
-"Edit name details" => "Wijzig naam gegevens",
-"Organization" => "Organisatie",
-"Delete" => "Verwijderen",
-"Nickname" => "Roepnaam",
-"Enter nickname" => "Voer roepnaam in",
-"Web site" => "Website",
-"http://www.somesite.com" => "http://www.willekeurigesite.com",
-"Go to web site" => "Ga naar website",
-"dd-mm-yyyy" => "dd-mm-yyyy",
-"Groups" => "Groepen",
-"Separate groups with commas" => "Gebruik komma bij meerder groepen",
-"Edit groups" => "Wijzig groepen",
-"Preferred" => "Voorkeur",
-"Please specify a valid email address." => "Geef een geldig email adres op.",
-"Enter email address" => "Voer email adres in",
-"Mail to address" => "Mail naar adres",
-"Delete email address" => "Verwijder email adres",
-"Enter phone number" => "Voer telefoonnummer in",
-"Delete phone number" => "Verwijdere telefoonnummer",
-"Instant Messenger" => "Instant Messenger",
-"Delete IM" => "Verwijder IM",
-"View on map" => "Bekijk op een kaart",
-"Edit address details" => "Wijzig adres gegevens",
-"Add notes here." => "Voeg notitie toe",
-"Add field" => "Voeg veld toe",
-"Phone" => "Telefoon",
-"Email" => "E-mail",
-"Instant Messaging" => "Instant Messaging",
-"Address" => "Adres",
-"Note" => "Notitie",
-"Download contact" => "Download contact",
-"Delete contact" => "Verwijder contact",
-"The temporary image has been removed from cache." => "Het tijdelijke plaatje is uit de cache verwijderd.",
-"Edit address" => "Wijzig adres",
-"Type" => "Type",
-"PO Box" => "Postbus",
-"Street address" => "Adres",
-"Street and number" => "Straat en nummer",
-"Extended" => "Uitgebreide",
-"Apartment number etc." => "Apartement nummer",
-"City" => "Stad",
-"Region" => "Regio",
-"E.g. state or province" => "Provincie",
-"Zipcode" => "Postcode",
-"Postal code" => "Postcode",
-"Country" => "Land",
-"Addressbook" => "Adresboek",
-"Hon. prefixes" => "Hon. prefixes",
-"Miss" => "Mw",
-"Ms" => "Mw",
-"Mr" => "M",
-"Sir" => "M",
-"Mrs" => "Mw",
-"Dr" => "M",
-"Given name" => "Voornaam",
-"Additional names" => "Extra namen",
-"Family name" => "Achternaam",
-"Import a contacts file" => "Importeer een contacten bestand",
-"Please choose the addressbook" => "Kies een adresboek",
-"create a new addressbook" => "Maak een nieuw adresboek",
-"Name of new addressbook" => "Naam van nieuw adresboek",
-"Importing contacts" => "Importeren van contacten",
-"Contacts imported successfully" => "Contacten zijn geïmporteerd",
-"Close Dialog" => "Sluit venster",
-"Import Addressbook" => "Importeer adresboek",
-"Select address book to import to:" => "Selecteer adresboek voor import:",
-"Drop a VCF file to import contacts." => "Sleep een VCF bestand om de contacten te importeren.",
-"Select from HD" => "Selecteer van schijf",
-"You have no contacts in your addressbook." => "Je hebt geen contacten in je adresboek",
-"Add contact" => "Contactpersoon toevoegen",
-"Select Address Books" => "Selecteer adresboeken",
-"Enter name" => "Naam",
-"Enter description" => "Beschrijving",
-"CardDAV syncing addresses" => "CardDAV synchroniseert de adressen",
-"more info" => "meer informatie",
-"Primary address (Kontact et al)" => "Standaardadres",
-"iOS/OS X" => "IOS/OS X",
-"Show CardDav link" => "Laat CardDav link zien",
-"Show read-only VCF link" => "Laat alleen lezen VCF link zien",
-"Share" => "Deel",
-"Download" => "Download",
-"Edit" => "Bewerken",
-"New Address Book" => "Nieuw Adresboek",
-"Name" => "Naam",
-"Description" => "Beschrijving",
-"Save" => "Opslaan",
-"Cancel" => "Anuleren",
-"More..." => "Meer..."
-);
diff --git a/apps/contacts/l10n/nn_NO.php b/apps/contacts/l10n/nn_NO.php
deleted file mode 100644
index 2e3ab16da3..0000000000
--- a/apps/contacts/l10n/nn_NO.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "Ein feil oppstod ved (de)aktivering av adressebok.",
-"Error updating addressbook." => "Eit problem oppstod ved å oppdatere adresseboka.",
-"There was an error adding the contact." => "Det kom ei feilmelding då kontakta vart lagt til.",
-"Cannot add empty property." => "Kan ikkje leggja til tomt felt.",
-"At least one of the address fields has to be filled out." => "Minst eit av adressefelta må fyllast ut.",
-"Information about vCard is incorrect. Please reload the page." => "Informasjonen om vCard-et er feil, ver venleg og last sida på nytt.",
-"Contacts" => "Kotaktar",
-"This is not your addressbook." => "Dette er ikkje di adressebok.",
-"Contact could not be found." => "Fann ikkje kontakten.",
-"Work" => "Arbeid",
-"Home" => "Heime",
-"Mobile" => "Mobil",
-"Text" => "Tekst",
-"Voice" => "Tale",
-"Fax" => "Faks",
-"Video" => "Video",
-"Pager" => "Personsøkjar",
-"Birthday" => "Bursdag",
-"Contact" => "Kontakt",
-"Add Contact" => "Legg til kontakt",
-"Addressbooks" => "Adressebøker",
-"Organization" => "Organisasjon",
-"Delete" => "Slett",
-"Preferred" => "Føretrekt",
-"Phone" => "Telefonnummer",
-"Email" => "Epost",
-"Address" => "Adresse",
-"Download contact" => "Last ned kontakt",
-"Delete contact" => "Slett kontakt",
-"Type" => "Skriv",
-"PO Box" => "Postboks",
-"Extended" => "Utvida",
-"City" => "Stad",
-"Region" => "Region/fylke",
-"Zipcode" => "Postnummer",
-"Country" => "Land",
-"Addressbook" => "Adressebok",
-"Download" => "Last ned",
-"Edit" => "Endra",
-"New Address Book" => "Ny adressebok",
-"Save" => "Lagre",
-"Cancel" => "Kanseller"
-);
diff --git a/apps/contacts/l10n/pl.php b/apps/contacts/l10n/pl.php
deleted file mode 100644
index 924622ebb0..0000000000
--- a/apps/contacts/l10n/pl.php
+++ /dev/null
@@ -1,219 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "Błąd (de)aktywowania książki adresowej.",
-"id is not set." => "id nie ustawione.",
-"Cannot update addressbook with an empty name." => "Nie można zaktualizować książki adresowej z pustą nazwą.",
-"Error updating addressbook." => "Błąd uaktualniania książki adresowej.",
-"No ID provided" => "Brak opatrzonego ID ",
-"Error setting checksum." => "Błąd ustawień sumy kontrolnej",
-"No categories selected for deletion." => "Nie zaznaczono kategorii do usunięcia",
-"No address books found." => "Nie znaleziono książek adresowych",
-"No contacts found." => "Nie znaleziono kontaktów.",
-"There was an error adding the contact." => "Wystąpił błąd podczas dodawania kontaktu.",
-"element name is not set." => "nazwa elementu nie jest ustawiona.",
-"Could not parse contact: " => "Nie można parsować kontaktu:",
-"Cannot add empty property." => "Nie można dodać pustego elementu.",
-"At least one of the address fields has to be filled out." => "Należy wypełnić przynajmniej jedno pole adresu.",
-"Trying to add duplicate property: " => "Próba dodania z duplikowanej właściwości:",
-"Information about vCard is incorrect. Please reload the page." => "Informacje o vCard są nieprawidłowe. Proszę odświeżyć stronę.",
-"Missing ID" => "Brak ID",
-"Error parsing VCard for ID: \"" => "Wystąpił błąd podczas przetwarzania VCard ID: \"",
-"checksum is not set." => "checksum-a nie ustawiona",
-"Information about vCard is incorrect. Please reload the page: " => "Informacje na temat vCard są niepoprawne. Proszę przeładuj stronę:",
-"Something went FUBAR. " => "Gdyby coś poszło FUBAR.",
-"No contact ID was submitted." => "ID kontaktu nie został utworzony.",
-"Error reading contact photo." => "Błąd odczytu zdjęcia kontaktu.",
-"Error saving temporary file." => "Wystąpił błąd podczas zapisywania pliku tymczasowego.",
-"The loading photo is not valid." => "Wczytywane zdjęcie nie jest poprawne.",
-"Contact ID is missing." => "Brak kontaktu id.",
-"No photo path was submitted." => "Ścieżka do zdjęcia nie została podana.",
-"File doesn't exist:" => "Plik nie istnieje:",
-"Error loading image." => "Błąd ładowania obrazu.",
-"Error getting contact object." => "Błąd pobrania kontaktu.",
-"Error getting PHOTO property." => "Błąd uzyskiwania właściwości ZDJĘCIA.",
-"Error saving contact." => "Błąd zapisu kontaktu.",
-"Error resizing image" => "Błąd zmiany rozmiaru obrazu",
-"Error cropping image" => "Błąd przycinania obrazu",
-"Error creating temporary image" => "Błąd utworzenia obrazu tymczasowego",
-"Error finding image: " => "Błąd znajdowanie obrazu: ",
-"Error uploading contacts to storage." => "Wystąpił błąd podczas wysyłania kontaktów do magazynu.",
-"There is no error, the file uploaded with success" => "Nie było błędów, plik wyczytano poprawnie.",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Załadowany plik przekracza wielkość upload_max_filesize w php.ini ",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Wczytywany plik przekracza wielkość MAX_FILE_SIZE, która została określona w formularzu HTML",
-"The uploaded file was only partially uploaded" => "Załadowany plik tylko częściowo został wysłany.",
-"No file was uploaded" => "Plik nie został załadowany",
-"Missing a temporary folder" => "Brak folderu tymczasowego",
-"Couldn't save temporary image: " => "Nie można zapisać obrazu tymczasowego: ",
-"Couldn't load temporary image: " => "Nie można wczytać obrazu tymczasowego: ",
-"No file was uploaded. Unknown error" => "Plik nie został załadowany. Nieznany błąd",
-"Contacts" => "Kontakty",
-"Sorry, this functionality has not been implemented yet" => "Niestety, ta funkcja nie została jeszcze zaimplementowana",
-"Not implemented" => "Nie wdrożono",
-"Couldn't get a valid address." => "Nie można pobrać prawidłowego adresu.",
-"Error" => "Błąd",
-"This property has to be non-empty." => "Ta właściwość nie może być pusta.",
-"Couldn't serialize elements." => "Nie można serializować elementów.",
-"'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "\"deleteProperty' wywołana bez argumentu typu. Proszę raportuj na bugs.owncloud.org",
-"Edit name" => "Zmień nazwę",
-"No files selected for upload." => "Żadne pliki nie zostały zaznaczone do wysłania.",
-"The file you are trying to upload exceed the maximum size for file uploads on this server." => "Plik, który próbujesz wysłać przekracza maksymalny rozmiar pliku przekazywania na tym serwerze.",
-"Error loading profile picture." => "Błąd wczytywania zdjęcia profilu.",
-"Select type" => "Wybierz typ",
-"Some contacts are marked for deletion, but not deleted yet. Please wait for them to be deleted." => "Niektóre kontakty są zaznaczone do usunięcia, ale nie są usunięte jeszcze. Proszę czekać na ich usunięcie.",
-"Do you want to merge these address books?" => "Czy chcesz scalić te książki adresowe?",
-"Result: " => "Wynik: ",
-" imported, " => " importowane, ",
-" failed." => "  nie powiodło się.",
-"Displayname cannot be empty." => "Nazwa nie może być pusta.",
-"Addressbook not found: " => "Nie znaleziono książki adresowej:",
-"This is not your addressbook." => "To nie jest Twoja książka adresowa.",
-"Contact could not be found." => "Nie można odnaleźć kontaktu.",
-"Jabber" => "Jabber",
-"AIM" => "AIM",
-"MSN" => "MSN",
-"Twitter" => "Twitter",
-"GoogleTalk" => "GoogleTalk",
-"Facebook" => "Facebook",
-"XMPP" => "XMPP",
-"ICQ" => "ICQ",
-"Yahoo" => "Yahoo",
-"Skype" => "Skype",
-"QQ" => "QQ",
-"GaduGadu" => "GG",
-"Work" => "Praca",
-"Home" => "Dom",
-"Other" => "Inne",
-"Mobile" => "Komórka",
-"Text" => "Połączenie tekstowe",
-"Voice" => "Połączenie głosowe",
-"Message" => "Wiadomość",
-"Fax" => "Faks",
-"Video" => "Połączenie wideo",
-"Pager" => "Pager",
-"Internet" => "Internet",
-"Birthday" => "Urodziny",
-"Business" => "Biznesowe",
-"Call" => "Wywołanie",
-"Clients" => "Klienci",
-"Deliverer" => "Doręczanie",
-"Holidays" => "Święta",
-"Ideas" => "Pomysły",
-"Journey" => "Podróż",
-"Jubilee" => "Jubileusz",
-"Meeting" => "Spotkanie",
-"Personal" => "Osobiste",
-"Projects" => "Projekty",
-"Questions" => "Pytania",
-"{name}'s Birthday" => "{name} Urodzony",
-"Contact" => "Kontakt",
-"Add Contact" => "Dodaj kontakt",
-"Import" => "Import",
-"Settings" => "Ustawienia",
-"Addressbooks" => "Książki adresowe",
-"Close" => "Zamknij",
-"Keyboard shortcuts" => "Skróty klawiatury",
-"Navigation" => "Nawigacja",
-"Next contact in list" => "Następny kontakt na liście",
-"Previous contact in list" => "Poprzedni kontakt na liście",
-"Expand/collapse current addressbook" => "Rozwiń/Zwiń bieżącą książkę adresową",
-"Next addressbook" => "Następna książka adresowa",
-"Previous addressbook" => "Poprzednia książka adresowa",
-"Actions" => "Akcje",
-"Refresh contacts list" => "Odśwież listę kontaktów",
-"Add new contact" => "Dodaj nowy kontakt",
-"Add new addressbook" => "Dodaj nowa książkę adresową",
-"Delete current contact" => "Usuń obecny kontakt",
-"Drop photo to upload" => "Upuść fotografię aby załadować",
-"Delete current photo" => "Usuń aktualne zdjęcie",
-"Edit current photo" => "Edytuj aktualne zdjęcie",
-"Upload new photo" => "Wczytaj nowe zdjęcie",
-"Select photo from ownCloud" => "Wybierz zdjęcie z ownCloud",
-"Format custom, Short name, Full name, Reverse or Reverse with comma" => "Format niestandardowy, krótkie nazwy, imię i nazwisko, Odwracać lub Odwrócić z przecinkiem",
-"Edit name details" => "Edytuj szczegóły nazwy",
-"Organization" => "Organizacja",
-"Delete" => "Usuwa książkę adresową",
-"Nickname" => "Nazwa",
-"Enter nickname" => "Wpisz nazwę",
-"Web site" => "Strona www",
-"http://www.somesite.com" => "http://www.jakasstrona.pl",
-"Go to web site" => "Idż do strony www",
-"dd-mm-yyyy" => "dd-mm-rrrr",
-"Groups" => "Grupy",
-"Separate groups with commas" => "Oddziel grupy przecinkami",
-"Edit groups" => "Edytuj grupy",
-"Preferred" => "Preferowane",
-"Please specify a valid email address." => "Określ prawidłowy adres e-mail.",
-"Enter email address" => "Wpisz adres email",
-"Mail to address" => "Mail na adres",
-"Delete email address" => "Usuń adres mailowy",
-"Enter phone number" => "Wpisz numer telefonu",
-"Delete phone number" => "Usuń numer telefonu",
-"View on map" => "Zobacz na mapie",
-"Edit address details" => "Edytuj szczegóły adresu",
-"Add notes here." => "Dodaj notatkę tutaj.",
-"Add field" => "Dodaj pole",
-"Phone" => "Telefon",
-"Email" => "E-mail",
-"Address" => "Adres",
-"Note" => "Uwaga",
-"Download contact" => "Pobiera kontakt",
-"Delete contact" => "Usuwa kontakt",
-"The temporary image has been removed from cache." => "Tymczasowy obraz został usunięty z pamięci podręcznej.",
-"Edit address" => "Edytuj adres",
-"Type" => "Typ",
-"PO Box" => "Skrzynka pocztowa",
-"Street address" => "Ulica",
-"Street and number" => "Ulica i numer",
-"Extended" => "Rozszerzony",
-"Apartment number etc." => "Numer lokalu",
-"City" => "Miasto",
-"Region" => "Region",
-"E.g. state or province" => "Np. stanu lub prowincji",
-"Zipcode" => "Kod pocztowy",
-"Postal code" => "Kod pocztowy",
-"Country" => "Kraj",
-"Addressbook" => "Książka adresowa",
-"Hon. prefixes" => "Prefiksy Hon.",
-"Miss" => "Panna",
-"Ms" => "Ms",
-"Mr" => "Pan",
-"Sir" => "Sir",
-"Mrs" => "Pani",
-"Dr" => "Dr",
-"Given name" => "Podaj imię",
-"Additional names" => "Dodatkowe nazwy",
-"Family name" => "Nazwa rodziny",
-"Hon. suffixes" => "Sufiksy Hon.",
-"J.D." => "J.D.",
-"M.D." => "M.D.",
-"D.O." => "D.O.",
-"D.C." => "D.C.",
-"Ph.D." => "Ph.D.",
-"Esq." => "Esq.",
-"Jr." => "Jr.",
-"Sn." => "Sn.",
-"Import a contacts file" => "Importuj plik z kontaktami",
-"Please choose the addressbook" => "Proszę wybrać książkę adresową",
-"create a new addressbook" => "utwórz nową książkę adresową",
-"Name of new addressbook" => "Nazwa nowej książki adresowej",
-"Importing contacts" => "importuj kontakty",
-"You have no contacts in your addressbook." => "Nie masz żadnych kontaktów w swojej książce adresowej.",
-"Add contact" => "Dodaj kontakt",
-"Select Address Books" => "Wybierz książki adresowe",
-"Enter name" => "Wpisz nazwę",
-"Enter description" => "Wprowadź opis",
-"CardDAV syncing addresses" => "adres do synchronizacji CardDAV",
-"more info" => "więcej informacji",
-"Primary address (Kontact et al)" => "Pierwszy adres",
-"iOS/OS X" => "iOS/OS X",
-"Show CardDav link" => "Pokaż link CardDAV",
-"Show read-only VCF link" => "Pokaż tylko do odczytu łącze VCF",
-"Share" => "Udostępnij",
-"Download" => "Pobiera książkę adresową",
-"Edit" => "Edytuje książkę adresową",
-"New Address Book" => "Nowa książka adresowa",
-"Name" => "Nazwa",
-"Description" => "Opis",
-"Save" => "Zapisz",
-"Cancel" => "Anuluj",
-"More..." => "Więcej..."
-);
diff --git a/apps/contacts/l10n/pt_BR.php b/apps/contacts/l10n/pt_BR.php
deleted file mode 100644
index de43e6cbb0..0000000000
--- a/apps/contacts/l10n/pt_BR.php
+++ /dev/null
@@ -1,158 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "Erro ao (des)ativar agenda.",
-"id is not set." => "ID não definido.",
-"Cannot update addressbook with an empty name." => "Não é possível atualizar sua agenda com um nome em branco.",
-"Error updating addressbook." => "Erro ao atualizar agenda.",
-"No ID provided" => "Nenhum ID fornecido",
-"Error setting checksum." => "Erro ajustando checksum.",
-"No categories selected for deletion." => "Nenhum categoria selecionada para remoção.",
-"No address books found." => "Nenhuma agenda de endereços encontrada.",
-"No contacts found." => "Nenhum contato encontrado.",
-"There was an error adding the contact." => "Ocorreu um erro ao adicionar o contato.",
-"element name is not set." => "nome do elemento não definido.",
-"Cannot add empty property." => "Não é possível adicionar propriedade vazia.",
-"At least one of the address fields has to be filled out." => "Pelo menos um dos campos de endereço tem que ser preenchido.",
-"Trying to add duplicate property: " => "Tentando adiciona propriedade duplicada:",
-"Information about vCard is incorrect. Please reload the page." => "Informações sobre vCard é incorreta. Por favor, recarregue a página.",
-"Missing ID" => "Faltando ID",
-"Error parsing VCard for ID: \"" => "Erro de identificação VCard para ID:",
-"checksum is not set." => "checksum não definido.",
-"Information about vCard is incorrect. Please reload the page: " => "Informação sobre vCard incorreto. Por favor, recarregue a página:",
-"Something went FUBAR. " => "Something went FUBAR. ",
-"No contact ID was submitted." => "Nenhum ID do contato foi submetido.",
-"Error reading contact photo." => "Erro de leitura na foto do contato.",
-"Error saving temporary file." => "Erro ao salvar arquivo temporário.",
-"The loading photo is not valid." => "Foto carregada não é válida.",
-"Contact ID is missing." => "ID do contato está faltando.",
-"No photo path was submitted." => "Nenhum caminho para foto foi submetido.",
-"File doesn't exist:" => "Arquivo não existe:",
-"Error loading image." => "Erro ao carregar imagem.",
-"Error getting contact object." => "Erro ao obter propriedade de contato.",
-"Error getting PHOTO property." => "Erro ao obter propriedade da FOTO.",
-"Error saving contact." => "Erro ao salvar contato.",
-"Error resizing image" => "Erro ao modificar tamanho da imagem",
-"Error cropping image" => "Erro ao recortar imagem",
-"Error creating temporary image" => "Erro ao criar imagem temporária",
-"Error finding image: " => "Erro ao localizar imagem:",
-"Error uploading contacts to storage." => "Erro enviando contatos para armazenamento.",
-"There is no error, the file uploaded with success" => "Arquivo enviado com sucesso",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "O arquivo enviado excede a diretiva upload_max_filesize em php.ini",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "O arquivo carregado excede o argumento MAX_FILE_SIZE especificado no formulário HTML",
-"The uploaded file was only partially uploaded" => "O arquivo foi parcialmente carregado",
-"No file was uploaded" => "Nenhum arquivo carregado",
-"Missing a temporary folder" => "Diretório temporário não encontrado",
-"Couldn't save temporary image: " => "Não foi possível salvar a imagem temporária:",
-"Couldn't load temporary image: " => "Não foi possível carregar a imagem temporária:",
-"No file was uploaded. Unknown error" => "Nenhum arquivo foi transferido. Erro desconhecido",
-"Contacts" => "Contatos",
-"Sorry, this functionality has not been implemented yet" => "Desculpe, esta funcionalidade não foi implementada ainda",
-"Not implemented" => "não implementado",
-"Couldn't get a valid address." => "Não foi possível obter um endereço válido.",
-"Error" => "Erro",
-"This property has to be non-empty." => "Esta propriedade não pode estar vazia.",
-"Couldn't serialize elements." => "Não foi possível serializar elementos.",
-"'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "\"deleteProperty\" chamado sem argumento de tipo. Por favor, informe a bugs.owncloud.org",
-"Edit name" => "Editar nome",
-"No files selected for upload." => "Nenhum arquivo selecionado para carregar.",
-"The file you are trying to upload exceed the maximum size for file uploads on this server." => "O arquivo que você está tentando carregar excede o tamanho máximo para este servidor.",
-"Select type" => "Selecione o tipo",
-"Result: " => "Resultado:",
-" imported, " => "importado,",
-" failed." => "falhou.",
-"This is not your addressbook." => "Esta não é a sua agenda de endereços.",
-"Contact could not be found." => "Contato não pôde ser encontrado.",
-"Work" => "Trabalho",
-"Home" => "Home",
-"Mobile" => "Móvel",
-"Text" => "Texto",
-"Voice" => "Voz",
-"Message" => "Mensagem",
-"Fax" => "Fax",
-"Video" => "Vídeo",
-"Pager" => "Pager",
-"Internet" => "Internet",
-"Birthday" => "Aniversário",
-"{name}'s Birthday" => "Aniversário de {name}",
-"Contact" => "Contato",
-"Add Contact" => "Adicionar Contato",
-"Import" => "Importar",
-"Addressbooks" => "Agendas de Endereço",
-"Close" => "Fechar.",
-"Drop photo to upload" => "Arraste a foto para ser carregada",
-"Delete current photo" => "Deletar imagem atual",
-"Edit current photo" => "Editar imagem atual",
-"Upload new photo" => "Carregar nova foto",
-"Select photo from ownCloud" => "Selecionar foto do OwnCloud",
-"Format custom, Short name, Full name, Reverse or Reverse with comma" => "Formato personalizado, Nome curto, Nome completo, Inverter ou Inverter com vírgula",
-"Edit name details" => "Editar detalhes do nome",
-"Organization" => "Organização",
-"Delete" => "Excluir",
-"Nickname" => "Apelido",
-"Enter nickname" => "Digite o apelido",
-"dd-mm-yyyy" => "dd-mm-aaaa",
-"Groups" => "Grupos",
-"Separate groups with commas" => "Separe grupos por virgula",
-"Edit groups" => "Editar grupos",
-"Preferred" => "Preferido",
-"Please specify a valid email address." => "Por favor, especifique um email válido.",
-"Enter email address" => "Digite um endereço de email",
-"Mail to address" => "Correio para endereço",
-"Delete email address" => "Remover endereço de email",
-"Enter phone number" => "Digite um número de telefone",
-"Delete phone number" => "Remover número de telefone",
-"View on map" => "Visualizar no mapa",
-"Edit address details" => "Editar detalhes de endereço",
-"Add notes here." => "Adicionar notas",
-"Add field" => "Adicionar campo",
-"Phone" => "Telefone",
-"Email" => "E-mail",
-"Address" => "Endereço",
-"Note" => "Nota",
-"Download contact" => "Baixar contato",
-"Delete contact" => "Apagar contato",
-"The temporary image has been removed from cache." => "A imagem temporária foi removida cache.",
-"Edit address" => "Editar endereço",
-"Type" => "Digite",
-"PO Box" => "Caixa Postal",
-"Extended" => "Estendido",
-"City" => "Cidade",
-"Region" => "Região",
-"Zipcode" => "CEP",
-"Country" => "País",
-"Addressbook" => "Agenda de Endereço",
-"Hon. prefixes" => "Exmo. Prefixos ",
-"Miss" => "Senhorita",
-"Ms" => "Srta.",
-"Mr" => "Sr.",
-"Sir" => "Senhor",
-"Mrs" => "Sra.",
-"Dr" => "Dr",
-"Given name" => "Primeiro Nome",
-"Additional names" => "Segundo Nome",
-"Family name" => "Sobrenome",
-"Hon. suffixes" => "Exmo. Sufixos",
-"J.D." => "J.D.",
-"M.D." => "M.D.",
-"D.O." => "D.O.",
-"D.C." => "D.C.",
-"Ph.D." => "Ph.D.",
-"Esq." => "Esq.",
-"Jr." => "Jr.",
-"Sn." => "Sn.",
-"Import a contacts file" => "Importar arquivos de contato.",
-"Please choose the addressbook" => "Por favor, selecione uma agenda de endereços",
-"create a new addressbook" => "Criar nova agenda de endereços",
-"Name of new addressbook" => "Nome da nova agenda de endereços",
-"Importing contacts" => "Importar contatos",
-"You have no contacts in your addressbook." => "Voce não tem contatos em sua agenda de endereços.",
-"Add contact" => "Adicionar contatos",
-"CardDAV syncing addresses" => "Sincronizando endereços CardDAV",
-"more info" => "leia mais",
-"Primary address (Kontact et al)" => "Endereço primário(Kontact et al)",
-"iOS/OS X" => "iOS/OS X",
-"Download" => "Baixar",
-"Edit" => "Editar",
-"New Address Book" => "Nova agenda",
-"Save" => "Salvar",
-"Cancel" => "Cancelar"
-);
diff --git a/apps/contacts/l10n/pt_PT.php b/apps/contacts/l10n/pt_PT.php
deleted file mode 100644
index 38708c8620..0000000000
--- a/apps/contacts/l10n/pt_PT.php
+++ /dev/null
@@ -1,224 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "Erro a (des)ativar o livro de endereços",
-"id is not set." => "id não está definido",
-"Cannot update addressbook with an empty name." => "Não é possivel actualizar o livro de endereços com o nome vazio.",
-"Error updating addressbook." => "Erro a atualizar o livro de endereços",
-"No ID provided" => "Nenhum ID inserido",
-"Error setting checksum." => "Erro a definir checksum.",
-"No categories selected for deletion." => "Nenhuma categoria selecionada para eliminar.",
-"No address books found." => "Nenhum livro de endereços encontrado.",
-"No contacts found." => "Nenhum contacto encontrado.",
-"There was an error adding the contact." => "Erro ao adicionar contato",
-"element name is not set." => "o nome do elemento não está definido.",
-"Could not parse contact: " => "Incapaz de processar contacto",
-"Cannot add empty property." => "Não é possivel adicionar uma propriedade vazia",
-"At least one of the address fields has to be filled out." => "Pelo menos um dos campos de endereço precisa de estar preenchido",
-"Trying to add duplicate property: " => "A tentar adicionar propriedade duplicada: ",
-"Missing IM parameter." => "Falta o parâmetro de mensagens instantâneas (IM)",
-"Unknown IM: " => "Mensagens instantâneas desconhecida (IM)",
-"Information about vCard is incorrect. Please reload the page." => "A informação sobre o vCard está incorreta. Por favor refresque a página",
-"Missing ID" => "Falta ID",
-"Error parsing VCard for ID: \"" => "Erro a analisar VCard para o ID: \"",
-"checksum is not set." => "Checksum não está definido.",
-"Information about vCard is incorrect. Please reload the page: " => "A informação sobre o VCard está incorrecta. Por favor refresque a página: ",
-"Something went FUBAR. " => "Algo provocou um FUBAR. ",
-"No contact ID was submitted." => "Nenhum ID de contacto definido.",
-"Error reading contact photo." => "Erro a ler a foto do contacto.",
-"Error saving temporary file." => "Erro a guardar ficheiro temporário.",
-"The loading photo is not valid." => "A foto carregada não é valida.",
-"Contact ID is missing." => "Falta o ID do contacto.",
-"No photo path was submitted." => "Nenhum caminho da foto definido.",
-"File doesn't exist:" => "O ficheiro não existe:",
-"Error loading image." => "Erro a carregar a imagem.",
-"Error getting contact object." => "Erro a obter o objecto dos contactos",
-"Error getting PHOTO property." => "Erro a obter a propriedade Foto",
-"Error saving contact." => "Erro a guardar o contacto.",
-"Error resizing image" => "Erro a redimensionar a imagem",
-"Error cropping image" => "Erro a recorar a imagem",
-"Error creating temporary image" => "Erro a criar a imagem temporária",
-"Error finding image: " => "Erro enquanto pesquisava pela imagem: ",
-"Error uploading contacts to storage." => "Erro a carregar os contactos para o armazenamento.",
-"There is no error, the file uploaded with success" => "Não ocorreu erros, o ficheiro foi submetido com sucesso",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "O tamanho do ficheiro carregado excede o parametro upload_max_filesize em php.ini",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "O tamanho do ficheiro carregado ultrapassa o valor MAX_FILE_SIZE definido no formulário HTML",
-"The uploaded file was only partially uploaded" => "O ficheiro seleccionado foi apenas carregado parcialmente",
-"No file was uploaded" => "Nenhum ficheiro foi submetido",
-"Missing a temporary folder" => "Está a faltar a pasta temporária",
-"Couldn't save temporary image: " => "Não foi possível guardar a imagem temporária: ",
-"Couldn't load temporary image: " => "Não é possível carregar a imagem temporária: ",
-"No file was uploaded. Unknown error" => "Nenhum ficheiro foi carregado. Erro desconhecido",
-"Contacts" => "Contactos",
-"Sorry, this functionality has not been implemented yet" => "Desculpe, esta funcionalidade ainda não está implementada",
-"Not implemented" => "Não implementado",
-"Couldn't get a valid address." => "Não foi possível obter um endereço válido.",
-"Error" => "Erro",
-"This property has to be non-empty." => "Esta propriedade não pode estar vazia.",
-"Couldn't serialize elements." => "Não foi possivel serializar os elementos",
-"'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "'deleteProperty' chamada sem argumento definido. Por favor report o problema em bugs.owncloud.org",
-"Edit name" => "Editar nome",
-"No files selected for upload." => "Nenhum ficheiro seleccionado para enviar.",
-"The file you are trying to upload exceed the maximum size for file uploads on this server." => "O tamanho do ficheiro que está a tentar carregar ultrapassa o limite máximo definido para ficheiros no servidor.",
-"Error loading profile picture." => "Erro ao carregar imagem de perfil.",
-"Select type" => "Seleccionar tipo",
-"Some contacts are marked for deletion, but not deleted yet. Please wait for them to be deleted." => "Alguns contactos forma marcados para apagar, mas ainda não foram apagados. Por favor espere que ele sejam apagados.",
-"Do you want to merge these address books?" => "Quer fundir estes Livros de endereços?",
-"Result: " => "Resultado: ",
-" imported, " => " importado, ",
-" failed." => " falhou.",
-"Displayname cannot be empty." => "Displayname não pode ser vazio",
-"Addressbook not found: " => "Livro de endereços não encontrado.",
-"This is not your addressbook." => "Esta não é a sua lista de contactos",
-"Contact could not be found." => "O contacto não foi encontrado",
-"Jabber" => "Jabber",
-"AIM" => "AIM",
-"MSN" => "MSN",
-"Twitter" => "Twitter",
-"GoogleTalk" => "GoogleTalk",
-"Facebook" => "Facebook",
-"XMPP" => "XMPP",
-"ICQ" => "ICQ",
-"Yahoo" => "Yahoo",
-"Skype" => "Skype",
-"QQ" => "QQ",
-"GaduGadu" => "GaduGadu",
-"Work" => "Emprego",
-"Home" => "Casa",
-"Other" => "Outro",
-"Mobile" => "Telemovel",
-"Text" => "Texto",
-"Voice" => "Voz",
-"Message" => "Mensagem",
-"Fax" => "Fax",
-"Video" => "Vídeo",
-"Pager" => "Pager",
-"Internet" => "Internet",
-"Birthday" => "Aniversário",
-"Business" => "Empresa",
-"Call" => "Telefonar",
-"Clients" => "Clientes",
-"Deliverer" => "Fornecedor",
-"Holidays" => "Férias",
-"Ideas" => "Ideias",
-"Journey" => "Viagem",
-"Jubilee" => "Jubileu",
-"Meeting" => "Encontro",
-"Personal" => "Pessoal",
-"Projects" => "Projectos",
-"Questions" => "Questões",
-"{name}'s Birthday" => "Aniversário de {name}",
-"Contact" => "Contacto",
-"Add Contact" => "Adicionar Contacto",
-"Import" => "Importar",
-"Settings" => "Configurações",
-"Addressbooks" => "Livros de endereços",
-"Close" => "Fechar",
-"Keyboard shortcuts" => "Atalhos de teclado",
-"Navigation" => "Navegação",
-"Next contact in list" => "Próximo contacto na lista",
-"Previous contact in list" => "Contacto anterior na lista",
-"Expand/collapse current addressbook" => "Expandir/encolher o livro de endereços atual",
-"Next addressbook" => "Próximo livro de endereços",
-"Previous addressbook" => "Livro de endereços anterior",
-"Actions" => "Ações",
-"Refresh contacts list" => "Recarregar lista de contactos",
-"Add new contact" => "Adicionar novo contacto",
-"Add new addressbook" => "Adicionar novo Livro de endereços",
-"Delete current contact" => "Apagar o contacto atual",
-"Drop photo to upload" => "Arraste e solte fotos para carregar",
-"Delete current photo" => "Eliminar a foto actual",
-"Edit current photo" => "Editar a foto actual",
-"Upload new photo" => "Carregar nova foto",
-"Select photo from ownCloud" => "Selecionar uma foto da ownCloud",
-"Format custom, Short name, Full name, Reverse or Reverse with comma" => "Formate personalizado, Nome curto, Nome completo, Reverso ou Reverso com virgula",
-"Edit name details" => "Editar detalhes do nome",
-"Organization" => "Organização",
-"Delete" => "Apagar",
-"Nickname" => "Alcunha",
-"Enter nickname" => "Introduza alcunha",
-"Web site" => "Página web",
-"http://www.somesite.com" => "http://www.somesite.com",
-"Go to web site" => "Ir para página web",
-"dd-mm-yyyy" => "dd-mm-aaaa",
-"Groups" => "Grupos",
-"Separate groups with commas" => "Separe os grupos usando virgulas",
-"Edit groups" => "Editar grupos",
-"Preferred" => "Preferido",
-"Please specify a valid email address." => "Por favor indique um endereço de correio válido",
-"Enter email address" => "Introduza endereço de email",
-"Mail to address" => "Enviar correio para o endereço",
-"Delete email address" => "Eliminar o endereço de correio",
-"Enter phone number" => "Insira o número de telefone",
-"Delete phone number" => "Eliminar o número de telefone",
-"Instant Messenger" => "Mensageiro instantâneo",
-"Delete IM" => "Apagar mensageiro instantâneo (IM)",
-"View on map" => "Ver no mapa",
-"Edit address details" => "Editar os detalhes do endereço",
-"Add notes here." => "Insira notas aqui.",
-"Add field" => "Adicionar campo",
-"Phone" => "Telefone",
-"Email" => "Email",
-"Instant Messaging" => "Mensagens Instantâneas",
-"Address" => "Morada",
-"Note" => "Nota",
-"Download contact" => "Transferir contacto",
-"Delete contact" => "Apagar contato",
-"The temporary image has been removed from cache." => "A imagem temporária foi retirada do cache.",
-"Edit address" => "Editar endereço",
-"Type" => "Tipo",
-"PO Box" => "Apartado",
-"Street address" => "Endereço da Rua",
-"Street and number" => "Rua e número",
-"Extended" => "Extendido",
-"Apartment number etc." => "Número de Apartamento, etc.",
-"City" => "Cidade",
-"Region" => "Região",
-"E.g. state or province" => "Por Ex. Estado ou província",
-"Zipcode" => "Código Postal",
-"Postal code" => "Código Postal",
-"Country" => "País",
-"Addressbook" => "Livro de endereços",
-"Hon. prefixes" => "Prefixos honoráveis",
-"Miss" => "Menina",
-"Ms" => "Sra",
-"Mr" => "Sr",
-"Sir" => "Sr",
-"Mrs" => "Senhora",
-"Dr" => "Dr",
-"Given name" => "Nome introduzido",
-"Additional names" => "Nomes adicionais",
-"Family name" => "Nome de familia",
-"Hon. suffixes" => "Sufixos Honoráveis",
-"J.D." => "D.J.",
-"M.D." => "D.M.",
-"D.O." => "Dr.",
-"D.C." => "Dr.",
-"Ph.D." => "Dr.",
-"Esq." => "Esq.",
-"Jr." => "Jr.",
-"Sn." => "r.",
-"Import a contacts file" => "Importar um ficheiro de contactos",
-"Please choose the addressbook" => "Por favor seleccione o livro de endereços",
-"create a new addressbook" => "Criar um novo livro de endereços",
-"Name of new addressbook" => "Nome do novo livro de endereços",
-"Importing contacts" => "A importar os contactos",
-"You have no contacts in your addressbook." => "Não tem contactos no seu livro de endereços.",
-"Add contact" => "Adicionar contacto",
-"Select Address Books" => "Selecionar Livros de contactos",
-"Enter name" => "Introduzir nome",
-"Enter description" => "Introduzir descrição",
-"CardDAV syncing addresses" => "CardDAV a sincronizar endereços",
-"more info" => "mais informação",
-"Primary address (Kontact et al)" => "Endereço primario (Kontact et al)",
-"iOS/OS X" => "iOS/OS X",
-"Show CardDav link" => "Mostrar ligação CardDAV",
-"Show read-only VCF link" => "Mostrar ligações VCF só de leitura",
-"Share" => "Partilhar",
-"Download" => "Transferir",
-"Edit" => "Editar",
-"New Address Book" => "Novo livro de endereços",
-"Name" => "Nome",
-"Description" => "Descrição",
-"Save" => "Guardar",
-"Cancel" => "Cancelar",
-"More..." => "Mais..."
-);
diff --git a/apps/contacts/l10n/ro.php b/apps/contacts/l10n/ro.php
deleted file mode 100644
index 291e8d54f7..0000000000
--- a/apps/contacts/l10n/ro.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "(Dez)activarea agendei a întâmpinat o eroare.",
-"id is not set." => "ID-ul nu este stabilit",
-"Error updating addressbook." => "Eroare la actualizarea agendei.",
-"No ID provided" => "Nici un ID nu a fost furnizat",
-"Error setting checksum." => "Eroare la stabilirea sumei de control",
-"No categories selected for deletion." => "Nici o categorie selectată pentru ștergere",
-"No address books found." => "Nici o carte de adrese găsită",
-"No contacts found." => "Nici un contact găsit",
-"There was an error adding the contact." => "O eroare a împiedicat adăugarea contactului.",
-"element name is not set." => "numele elementului nu este stabilit.",
-"Cannot add empty property." => "Nu se poate adăuga un câmp gol.",
-"At least one of the address fields has to be filled out." => "Cel puțin unul din câmpurile adresei trebuie completat.",
-"Information about vCard is incorrect. Please reload the page." => "Informațiile cărții de vizită sunt incorecte. Te rog reîncarcă pagina.",
-"Missing ID" => "ID lipsă",
-"Error parsing VCard for ID: \"" => "Eroare la prelucrarea VCard-ului pentru ID:\"",
-"checksum is not set." => "suma de control nu este stabilită.",
-"No contact ID was submitted." => "Nici un ID de contact nu a fost transmis",
-"Error reading contact photo." => "Eroare la citerea fotografiei de contact",
-"Error saving temporary file." => "Eroare la salvarea fișierului temporar.",
-"The loading photo is not valid." => "Fotografia care se încarcă nu este validă.",
-"Contact ID is missing." => "ID-ul de contact lipsește.",
-"No photo path was submitted." => "Nici o adresă către fotografie nu a fost transmisă",
-"File doesn't exist:" => "Fișierul nu există:",
-"Error loading image." => "Eroare la încărcarea imaginii.",
-"Contacts" => "Contacte",
-"This is not your addressbook." => "Nu se găsește în agendă.",
-"Contact could not be found." => "Contactul nu a putut fi găsit.",
-"Work" => "Servicu",
-"Home" => "Acasă",
-"Mobile" => "Mobil",
-"Text" => "Text",
-"Voice" => "Voce",
-"Message" => "Mesaj",
-"Fax" => "Fax",
-"Video" => "Video",
-"Pager" => "Pager",
-"Internet" => "Internet",
-"Birthday" => "Zi de naștere",
-"{name}'s Birthday" => "Ziua de naștere a {name}",
-"Contact" => "Contact",
-"Add Contact" => "Adaugă contact",
-"Addressbooks" => "Agende",
-"Edit name details" => "Introdu detalii despre nume",
-"Organization" => "Organizație",
-"Delete" => "Șterge",
-"Nickname" => "Pseudonim",
-"Enter nickname" => "Introdu pseudonim",
-"dd-mm-yyyy" => "zz-ll-aaaa",
-"Groups" => "Grupuri",
-"Separate groups with commas" => "Separă grupurile cu virgule",
-"Edit groups" => "Editează grupuri",
-"Preferred" => "Preferat",
-"Please specify a valid email address." => "Te rog să specifici un e-mail corect",
-"Enter email address" => "Introdu adresa de e-mail",
-"Mail to address" => "Trimite mesaj la e-mail",
-"Delete email address" => "Șterge e-mail",
-"Phone" => "Telefon",
-"Email" => "Email",
-"Address" => "Adresă",
-"Download contact" => "Descarcă acest contact",
-"Delete contact" => "Șterge contact",
-"Type" => "Tip",
-"PO Box" => "CP",
-"Extended" => "Extins",
-"City" => "Oraș",
-"Region" => "Regiune",
-"Zipcode" => "Cod poștal",
-"Country" => "Țară",
-"Addressbook" => "Agendă",
-"Download" => "Descarcă",
-"Edit" => "Editează",
-"New Address Book" => "Agendă nouă",
-"Save" => "Salvează",
-"Cancel" => "Anulează"
-);
diff --git a/apps/contacts/l10n/ru.php b/apps/contacts/l10n/ru.php
deleted file mode 100644
index eaeb385d3b..0000000000
--- a/apps/contacts/l10n/ru.php
+++ /dev/null
@@ -1,229 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "Ошибка (де)активации адресной книги.",
-"id is not set." => "id не установлен.",
-"Cannot update addressbook with an empty name." => "Нельзя обновить адресную книгу с пустым именем.",
-"Error updating addressbook." => "Ошибка обновления адресной книги.",
-"No ID provided" => "ID не предоставлен",
-"Error setting checksum." => "Ошибка установки контрольной суммы.",
-"No categories selected for deletion." => "Категории для удаления не установлены.",
-"No address books found." => "Адресные книги не найдены.",
-"No contacts found." => "Контакты не найдены.",
-"There was an error adding the contact." => "Произошла ошибка при добавлении контакта.",
-"element name is not set." => "имя элемента не установлено.",
-"Could not parse contact: " => "Невозможно распознать контакт:",
-"Cannot add empty property." => "Невозможно добавить пустой параметр.",
-"At least one of the address fields has to be filled out." => "Как минимум одно поле адреса должно быть заполнено.",
-"Trying to add duplicate property: " => "При попытке добавить дубликат:",
-"Missing IM parameter." => "Отсутствует параметр IM.",
-"Unknown IM: " => "Неизвестный IM:",
-"Information about vCard is incorrect. Please reload the page." => "Информация о vCard некорректна. Пожалуйста, обновите страницу.",
-"Missing ID" => "Отсутствует ID",
-"Error parsing VCard for ID: \"" => "Ошибка обработки VCard для ID: \"",
-"checksum is not set." => "контрольная сумма не установлена.",
-"Information about vCard is incorrect. Please reload the page: " => "Информация о vCard не корректна. Перезагрузите страницу: ",
-"Something went FUBAR. " => "Что-то пошло FUBAR.",
-"No contact ID was submitted." => "Нет контакта ID",
-"Error reading contact photo." => "Ошибка чтения фотографии контакта.",
-"Error saving temporary file." => "Ошибка сохранения временного файла.",
-"The loading photo is not valid." => "Загружаемая фотография испорчена.",
-"Contact ID is missing." => "ID контакта отсутствует.",
-"No photo path was submitted." => "Нет фото по адресу.",
-"File doesn't exist:" => "Файл не существует:",
-"Error loading image." => "Ошибка загрузки картинки.",
-"Error getting contact object." => "Ошибка при получении контактов",
-"Error getting PHOTO property." => "Ошибка при получении ФОТО.",
-"Error saving contact." => "Ошибка при сохранении контактов.",
-"Error resizing image" => "Ошибка изменения размера изображений",
-"Error cropping image" => "Ошибка обрезки изображений",
-"Error creating temporary image" => "Ошибка создания временных изображений",
-"Error finding image: " => "Ошибка поиска изображений:",
-"Error uploading contacts to storage." => "Ошибка загрузки контактов в хранилище.",
-"There is no error, the file uploaded with success" => "Файл загружен успешно.",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Загружаемый файл первосходит значение переменной upload_max_filesize, установленно в php.ini",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Загружаемый файл превосходит значение переменной MAX_FILE_SIZE, указанной в форме HTML",
-"The uploaded file was only partially uploaded" => "Файл загружен частично",
-"No file was uploaded" => "Файл не был загружен",
-"Missing a temporary folder" => "Отсутствует временная папка",
-"Couldn't save temporary image: " => "Не удалось сохранить временное изображение:",
-"Couldn't load temporary image: " => "Не удалось загрузить временное изображение:",
-"No file was uploaded. Unknown error" => "Файл не был загружен. Неизвестная ошибка",
-"Contacts" => "Контакты",
-"Sorry, this functionality has not been implemented yet" => "К сожалению, эта функция не была реализована",
-"Not implemented" => "Не реализовано",
-"Couldn't get a valid address." => "Не удалось получить адрес.",
-"Error" => "Ошибка",
-"You do not have permission to add contacts to " => "У вас нет разрешений добавлять контакты в",
-"Please select one of your own address books." => "Выберите одну из ваших собственных адресных книг.",
-"Permission error" => "Ошибка доступа",
-"This property has to be non-empty." => "Это свойство должно быть не пустым.",
-"Couldn't serialize elements." => "Не удалось сериализовать элементы.",
-"'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "'deleteProperty' called without type argument. Please report at bugs.owncloud.org",
-"Edit name" => "Изменить имя",
-"No files selected for upload." => "Нет выбранных файлов для загрузки.",
-"The file you are trying to upload exceed the maximum size for file uploads on this server." => "Файл, который вы пытаетесь загрузить превышать максимальный размер загружаемых файлов на этом сервере.",
-"Error loading profile picture." => "Ошибка загрузки изображения профиля.",
-"Select type" => "Выберите тип",
-"Some contacts are marked for deletion, but not deleted yet. Please wait for them to be deleted." => "Некоторые контакты помечены на удаление, но ещё не удалены. Подождите, пока они удаляются.",
-"Do you want to merge these address books?" => "Вы хотите соединить эти адресные книги?",
-"Result: " => "Результат:",
-" imported, " => "импортировано, ",
-" failed." => "не удалось.",
-"Displayname cannot be empty." => "Отображаемое имя не может быть пустым.",
-"Addressbook not found: " => "Адресная книга не найдена:",
-"This is not your addressbook." => "Это не ваша адресная книга.",
-"Contact could not be found." => "Контакт не найден.",
-"Jabber" => "Jabber",
-"AIM" => "AIM",
-"MSN" => "MSN",
-"Twitter" => "Twitter",
-"GoogleTalk" => "GoogleTalk",
-"Facebook" => "Facebook",
-"XMPP" => "XMPP",
-"ICQ" => "ICQ",
-"Yahoo" => "Yahoo",
-"Skype" => "Skype",
-"QQ" => "QQ",
-"GaduGadu" => "GaduGadu",
-"Work" => "Рабочий",
-"Home" => "Домашний",
-"Other" => "Другое",
-"Mobile" => "Мобильный",
-"Text" => "Текст",
-"Voice" => "Голос",
-"Message" => "Сообщение",
-"Fax" => "Факс",
-"Video" => "Видео",
-"Pager" => "Пейджер",
-"Internet" => "Интернет",
-"Birthday" => "День рождения",
-"Business" => "Бизнес",
-"Call" => "Вызов",
-"Clients" => "Клиенты",
-"Deliverer" => "Посыльный",
-"Holidays" => "Праздники",
-"Ideas" => "Идеи",
-"Journey" => "Поездка",
-"Jubilee" => "Юбилей",
-"Meeting" => "Встреча",
-"Personal" => "Личный",
-"Projects" => "Проекты",
-"Questions" => "Вопросы",
-"{name}'s Birthday" => "День рождения {name}",
-"Contact" => "Контакт",
-"You do not have the permissions to edit this contact." => "У вас нет разрешений редактировать этот контакт.",
-"You do not have the permissions to delete this contact." => "У вас нет разрешений удалять этот контакт.",
-"Add Contact" => "Добавить Контакт",
-"Import" => "Импорт",
-"Settings" => "Настройки",
-"Addressbooks" => "Адресные книги",
-"Close" => "Закрыть",
-"Keyboard shortcuts" => "Горячие клавиши",
-"Navigation" => "Навигация",
-"Next contact in list" => "Следующий контакт в списке",
-"Previous contact in list" => "Предыдущий контакт в списке",
-"Expand/collapse current addressbook" => "Развернуть/свернуть текущую адресную книгу",
-"Next addressbook" => "Следующая адресная книга",
-"Previous addressbook" => "Предыдущая адресная книга",
-"Actions" => "Действия",
-"Refresh contacts list" => "Обновить список контактов",
-"Add new contact" => "Добавить новый контакт",
-"Add new addressbook" => "Добавить новую адресную книгу",
-"Delete current contact" => "Удалить текущий контакт",
-"Drop photo to upload" => "Перетяните фотографии для загрузки",
-"Delete current photo" => "Удалить текущую фотографию",
-"Edit current photo" => "Редактировать текущую фотографию",
-"Upload new photo" => "Загрузить новую фотографию",
-"Select photo from ownCloud" => "Выбрать фотографию из ownCloud",
-"Format custom, Short name, Full name, Reverse or Reverse with comma" => "Формат Краткое имя, Полное имя",
-"Edit name details" => "Изменить детали имени",
-"Organization" => "Организация",
-"Delete" => "Удалить",
-"Nickname" => "Псевдоним",
-"Enter nickname" => "Введите псевдоним",
-"Web site" => "Веб-сайт",
-"http://www.somesite.com" => "http://www.somesite.com",
-"Go to web site" => "Перейти на веб-сайт",
-"dd-mm-yyyy" => "dd-mm-yyyy",
-"Groups" => "Группы",
-"Separate groups with commas" => "Разделить группы запятыми",
-"Edit groups" => "Редактировать группы",
-"Preferred" => "Предпочитаемый",
-"Please specify a valid email address." => "Укажите действительный адрес электронной почты.",
-"Enter email address" => "Укажите адрес электронной почты",
-"Mail to address" => "Написать по адресу",
-"Delete email address" => "Удалить адрес электронной почты",
-"Enter phone number" => "Ввести номер телефона",
-"Delete phone number" => "Удалить номер телефона",
-"Instant Messenger" => "Instant Messenger",
-"Delete IM" => "Удалить IM",
-"View on map" => "Показать на карте",
-"Edit address details" => "Ввести детали адреса",
-"Add notes here." => "Добавьте заметки здесь.",
-"Add field" => "Добавить поле",
-"Phone" => "Телефон",
-"Email" => "Ящик эл. почты",
-"Instant Messaging" => "Быстрые сообщения",
-"Address" => "Адрес",
-"Note" => "Заметка",
-"Download contact" => "Скачать контакт",
-"Delete contact" => "Удалить контакт",
-"The temporary image has been removed from cache." => "Временный образ был удален из кэша.",
-"Edit address" => "Редактировать адрес",
-"Type" => "Тип",
-"PO Box" => "АО",
-"Street address" => "Улица",
-"Street and number" => "Улица и дом",
-"Extended" => "Расширенный",
-"Apartment number etc." => "Номер квартиры и т.д.",
-"City" => "Город",
-"Region" => "Область",
-"E.g. state or province" => "Например, область или район",
-"Zipcode" => "Почтовый индекс",
-"Postal code" => "Почтовый индекс",
-"Country" => "Страна",
-"Addressbook" => "Адресная книга",
-"Hon. prefixes" => "Уважительные префиксы",
-"Miss" => "Мисс",
-"Ms" => "Г-жа",
-"Mr" => "Г-н",
-"Sir" => "Сэр",
-"Mrs" => "Г-жа",
-"Dr" => "Доктор",
-"Given name" => "Имя",
-"Additional names" => "Дополнительные имена (отчество)",
-"Family name" => "Фамилия",
-"Hon. suffixes" => "Hon. suffixes",
-"J.D." => "Уважительные суффиксы",
-"M.D." => "M.D.",
-"D.O." => "D.O.",
-"D.C." => "D.C.",
-"Ph.D." => "Ph.D.",
-"Esq." => "Esq.",
-"Jr." => "Jr.",
-"Sn." => "Sn.",
-"Import a contacts file" => "Загрузить файл контактов",
-"Please choose the addressbook" => "Выберите адресную книгу",
-"create a new addressbook" => "создать новую адресную книгу",
-"Name of new addressbook" => "Имя новой адресной книги",
-"Importing contacts" => "Импорт контактов",
-"You have no contacts in your addressbook." => "В адресной книге нет контактов.",
-"Add contact" => "Добавить контакт",
-"Select Address Books" => "Выбрать адресную книгу",
-"Enter name" => "Введите имя",
-"Enter description" => "Ввдите описание",
-"CardDAV syncing addresses" => "CardDAV синхронизации адресов",
-"more info" => "дополнительная информация",
-"Primary address (Kontact et al)" => "Первичный адрес (Kontact и др.)",
-"iOS/OS X" => "iOS/OS X",
-"Show CardDav link" => "Показать ссылку CardDav",
-"Show read-only VCF link" => "Показать нередактируемую ссылку VCF",
-"Share" => "Опубликовать",
-"Download" => "Скачать",
-"Edit" => "Редактировать",
-"New Address Book" => "Новая адресная книга",
-"Name" => "Имя",
-"Description" => "Описание",
-"Save" => "Сохранить",
-"Cancel" => "Отменить",
-"More..." => "Ещё..."
-);
diff --git a/apps/contacts/l10n/sk_SK.php b/apps/contacts/l10n/sk_SK.php
deleted file mode 100644
index 54ae324d93..0000000000
--- a/apps/contacts/l10n/sk_SK.php
+++ /dev/null
@@ -1,184 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "Chyba (de)aktivácie adresára.",
-"id is not set." => "ID nie je nastavené.",
-"Cannot update addressbook with an empty name." => "Nedá sa upraviť adresár s prázdnym menom.",
-"Error updating addressbook." => "Chyba aktualizácie adresára.",
-"No ID provided" => "ID nezadané",
-"Error setting checksum." => "Chyba pri nastavovaní kontrolného súčtu.",
-"No categories selected for deletion." => "Žiadne kategórie neboli vybraté na odstránenie.",
-"No address books found." => "Žiadny adresár nenájdený.",
-"No contacts found." => "Žiadne kontakty nenájdené.",
-"There was an error adding the contact." => "Vyskytla sa chyba pri pridávaní kontaktu.",
-"element name is not set." => "meno elementu nie je nastavené.",
-"Cannot add empty property." => "Nemôžem pridať prázdny údaj.",
-"At least one of the address fields has to be filled out." => "Musí byť uvedený aspoň jeden adresný údaj.",
-"Trying to add duplicate property: " => "Pokúšate sa pridať rovnaký atribút:",
-"Information about vCard is incorrect. Please reload the page." => "Informácie o vCard sú neplatné. Prosím obnovte stránku.",
-"Missing ID" => "Chýba ID",
-"Error parsing VCard for ID: \"" => "Chyba pri vyňatí ID z VCard:",
-"checksum is not set." => "kontrolný súčet nie je nastavený.",
-"Information about vCard is incorrect. Please reload the page: " => "Informácia o vCard je nesprávna. Obnovte stránku, prosím.",
-"Something went FUBAR. " => "Niečo sa pokazilo.",
-"No contact ID was submitted." => "Nebolo nastavené ID kontaktu.",
-"Error reading contact photo." => "Chyba pri čítaní fotky kontaktu.",
-"Error saving temporary file." => "Chyba pri ukladaní dočasného súboru.",
-"The loading photo is not valid." => "Načítaná fotka je vadná.",
-"Contact ID is missing." => "Chýba ID kontaktu.",
-"No photo path was submitted." => "Žiadna fotka nebola poslaná.",
-"File doesn't exist:" => "Súbor neexistuje:",
-"Error loading image." => "Chyba pri nahrávaní obrázka.",
-"Error getting contact object." => "Chyba počas prevzatia objektu kontakt.",
-"Error getting PHOTO property." => "Chyba počas získavania fotky.",
-"Error saving contact." => "Chyba počas ukladania kontaktu.",
-"Error resizing image" => "Chyba počas zmeny obrázku.",
-"Error cropping image" => "Chyba počas orezania obrázku.",
-"Error creating temporary image" => "Chyba počas vytvárania dočasného obrázku.",
-"Error finding image: " => "Chyba vyhľadania obrázku: ",
-"Error uploading contacts to storage." => "Chyba pri ukladaní kontaktov na úložisko.",
-"There is no error, the file uploaded with success" => "Nevyskytla sa žiadna chyba, súbor úspešne uložené.",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Ukladaný súbor prekračuje nastavenie upload_max_filesize v php.ini",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Ukladaný súbor prekračuje nastavenie MAX_FILE_SIZE z volieb HTML formulára.",
-"The uploaded file was only partially uploaded" => "Ukladaný súbor sa nahral len čiastočne",
-"No file was uploaded" => "Žiadny súbor nebol uložený",
-"Missing a temporary folder" => "Chýba dočasný priečinok",
-"Couldn't save temporary image: " => "Nemôžem uložiť dočasný obrázok: ",
-"Couldn't load temporary image: " => "Nemôžem načítať dočasný obrázok: ",
-"No file was uploaded. Unknown error" => "Žiaden súbor nebol odoslaný. Neznáma chyba",
-"Contacts" => "Kontakty",
-"Sorry, this functionality has not been implemented yet" => "Bohužiaľ, táto funkcia ešte nebola implementovaná",
-"Not implemented" => "Neimplementované",
-"Couldn't get a valid address." => "Nemôžem získať platnú adresu.",
-"Error" => "Chyba",
-"This property has to be non-empty." => "Tento parameter nemôže byť prázdny.",
-"Couldn't serialize elements." => "Nemôžem previesť prvky.",
-"'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "'deleteProperty' zavolané bez argument. Prosím oznámte chybu na bugs.owncloud.org",
-"Edit name" => "Upraviť meno",
-"No files selected for upload." => "Žiadne súbory neboli vybrané k nahratiu",
-"The file you are trying to upload exceed the maximum size for file uploads on this server." => "Súbor, ktorý sa pokúšate nahrať, presahuje maximálnu povolenú veľkosť.",
-"Select type" => "Vybrať typ",
-"Result: " => "Výsledok: ",
-" imported, " => " importovaných, ",
-" failed." => " zlyhaných.",
-"This is not your addressbook." => "Toto nie je váš adresár.",
-"Contact could not be found." => "Kontakt nebol nájdený.",
-"Work" => "Práca",
-"Home" => "Domov",
-"Other" => "Iné",
-"Mobile" => "Mobil",
-"Text" => "SMS",
-"Voice" => "Odkazová schránka",
-"Message" => "Správa",
-"Fax" => "Fax",
-"Video" => "Video",
-"Pager" => "Pager",
-"Internet" => "Internet",
-"Birthday" => "Narodeniny",
-"Business" => "Biznis",
-"Clients" => "Klienti",
-"Holidays" => "Prázdniny",
-"Meeting" => "Stretnutie",
-"Projects" => "Projekty",
-"Questions" => "Otázky",
-"{name}'s Birthday" => "Narodeniny {name}",
-"Contact" => "Kontakt",
-"Add Contact" => "Pridať Kontakt.",
-"Import" => "Importovať",
-"Addressbooks" => "Adresáre",
-"Close" => "Zatvoriť",
-"Keyboard shortcuts" => "Klávesové skratky",
-"Navigation" => "Navigácia",
-"Next contact in list" => "Ďalší kontakt v zozname",
-"Previous contact in list" => "Predchádzajúci kontakt v zozname",
-"Actions" => "Akcie",
-"Refresh contacts list" => "Obnov zoznam kontaktov",
-"Add new contact" => "Pridaj nový kontakt",
-"Add new addressbook" => "Pridaj nový adresár",
-"Delete current contact" => "Vymaž súčasný kontakt",
-"Drop photo to upload" => "Pretiahnite sem fotku pre nahratie",
-"Delete current photo" => "Odstrániť súčasnú fotku",
-"Edit current photo" => "Upraviť súčasnú fotku",
-"Upload new photo" => "Nahrať novú fotku",
-"Select photo from ownCloud" => "Vybrať fotku z ownCloud",
-"Format custom, Short name, Full name, Reverse or Reverse with comma" => "Formát vlastný, krátke meno, celé meno, obrátené alebo obrátené s čiarkami",
-"Edit name details" => "Upraviť podrobnosti mena",
-"Organization" => "Organizácia",
-"Delete" => "Odstrániť",
-"Nickname" => "Prezývka",
-"Enter nickname" => "Zadajte prezývku",
-"dd-mm-yyyy" => "dd. mm. yyyy",
-"Groups" => "Skupiny",
-"Separate groups with commas" => "Oddelte skupiny čiarkami",
-"Edit groups" => "Úprava skupín",
-"Preferred" => "Uprednostňované",
-"Please specify a valid email address." => "Prosím zadajte platnú e-mailovú adresu.",
-"Enter email address" => "Zadajte e-mailové adresy",
-"Mail to address" => "Odoslať na adresu",
-"Delete email address" => "Odstrániť e-mailové adresy",
-"Enter phone number" => "Zadajte telefónne číslo",
-"Delete phone number" => "Odstrániť telefónne číslo",
-"View on map" => "Zobraziť na mape",
-"Edit address details" => "Upraviť podrobnosti adresy",
-"Add notes here." => "Tu môžete pridať poznámky.",
-"Add field" => "Pridať pole",
-"Phone" => "Telefón",
-"Email" => "E-mail",
-"Address" => "Adresa",
-"Note" => "Poznámka",
-"Download contact" => "Stiahnuť kontakt",
-"Delete contact" => "Odstrániť kontakt",
-"The temporary image has been removed from cache." => "Dočasný obrázok bol odstránený z cache.",
-"Edit address" => "Upraviť adresu",
-"Type" => "Typ",
-"PO Box" => "PO Box",
-"Street address" => "Ulica",
-"Street and number" => "Ulica a číslo",
-"Extended" => "Rozšírené",
-"City" => "Mesto",
-"Region" => "Región",
-"Zipcode" => "PSČ",
-"Postal code" => "PSČ",
-"Country" => "Krajina",
-"Addressbook" => "Adresár",
-"Hon. prefixes" => "Tituly pred",
-"Miss" => "Slečna",
-"Ms" => "Pani",
-"Mr" => "Pán",
-"Sir" => "Sir",
-"Mrs" => "Pani",
-"Dr" => "Dr.",
-"Given name" => "Krstné meno",
-"Additional names" => "Ďalšie mená",
-"Family name" => "Priezvisko",
-"Hon. suffixes" => "Tituly za",
-"J.D." => "JUDr.",
-"M.D." => "MUDr.",
-"D.O." => "D.O.",
-"D.C." => "D.C.",
-"Ph.D." => "Ph.D.",
-"Esq." => "Esq.",
-"Jr." => "ml.",
-"Sn." => "st.",
-"Import a contacts file" => "Importovať súbor kontaktu",
-"Please choose the addressbook" => "Prosím zvolte adresár",
-"create a new addressbook" => "vytvoriť nový adresár",
-"Name of new addressbook" => "Meno nového adresára",
-"Importing contacts" => "Importovanie kontaktov",
-"Contacts imported successfully" => "Kontakty úspešne importované",
-"Close Dialog" => "Zatvoriť ponuku",
-"Import Addressbook" => "Importovanie adresára",
-"Select address book to import to:" => "Vyberte adresár, do ktorého chcete importovať:",
-"Drop a VCF file to import contacts." => "Pretiahnite VCF súbor pre import kontaktov.",
-"Select from HD" => "Vyberte z pevného disku",
-"You have no contacts in your addressbook." => "Nemáte žiadne kontakty v adresári.",
-"Add contact" => "Pridať kontakt",
-"Enter name" => "Zadaj meno",
-"CardDAV syncing addresses" => "Adresy pre synchronizáciu s CardDAV",
-"more info" => "viac informácií",
-"Primary address (Kontact et al)" => "Predvolená adresa (Kontakt etc)",
-"iOS/OS X" => "iOS/OS X",
-"Download" => "Stiahnuť",
-"Edit" => "Upraviť",
-"New Address Book" => "Nový adresár",
-"Save" => "Uložiť",
-"Cancel" => "Zrušiť"
-);
diff --git a/apps/contacts/l10n/sl.php b/apps/contacts/l10n/sl.php
deleted file mode 100644
index f65f0452f1..0000000000
--- a/apps/contacts/l10n/sl.php
+++ /dev/null
@@ -1,235 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "Napaka med (de)aktivacijo imenika.",
-"id is not set." => "id ni nastavljen.",
-"Cannot update addressbook with an empty name." => "Ne morem posodobiti imenika s praznim imenom.",
-"Error updating addressbook." => "Napaka pri posodabljanju imenika.",
-"No ID provided" => "ID ni bil podan",
-"Error setting checksum." => "Napaka pri nastavljanju nadzorne vsote.",
-"No categories selected for deletion." => "Nobena kategorija ni bila izbrana za izbris.",
-"No address books found." => "Ni bilo najdenih imenikov.",
-"No contacts found." => "Ni bilo najdenih stikov.",
-"There was an error adding the contact." => "Med dodajanjem stika je prišlo do napake",
-"element name is not set." => "ime elementa ni nastavljeno.",
-"Could not parse contact: " => "Ne morem razčleniti stika:",
-"Cannot add empty property." => "Ne morem dodati prazne lastnosti.",
-"At least one of the address fields has to be filled out." => "Vsaj eno izmed polj je še potrebno izpolniti.",
-"Trying to add duplicate property: " => "Poskušam dodati podvojeno lastnost:",
-"Missing IM parameter." => "Manjkajoč IM parameter.",
-"Unknown IM: " => "Neznan IM:",
-"Information about vCard is incorrect. Please reload the page." => "Informacije o vCard niso pravilne. Prosimo, če ponovno naložite stran.",
-"Missing ID" => "Manjkajoč ID",
-"Error parsing VCard for ID: \"" => "Napaka pri razčlenjevanju VCard za ID: \"",
-"checksum is not set." => "nadzorna vsota ni nastavljena.",
-"Information about vCard is incorrect. Please reload the page: " => "Informacija o vCard je napačna. Prosimo, če ponovno naložite stran: ",
-"Something went FUBAR. " => "Nekaj je šlo v franže. ",
-"No contact ID was submitted." => "ID stika ni bil poslan.",
-"Error reading contact photo." => "Napaka pri branju slike stika.",
-"Error saving temporary file." => "Napaka pri shranjevanju začasne datoteke.",
-"The loading photo is not valid." => "Slika, ki se nalaga ni veljavna.",
-"Contact ID is missing." => "Manjka ID stika.",
-"No photo path was submitted." => "Pot slike ni bila poslana.",
-"File doesn't exist:" => "Datoteka ne obstaja:",
-"Error loading image." => "Napaka pri nalaganju slike.",
-"Error getting contact object." => "Napaka pri pridobivanju kontakta predmeta.",
-"Error getting PHOTO property." => "Napaka pri pridobivanju lastnosti fotografije.",
-"Error saving contact." => "Napaka pri shranjevanju stika.",
-"Error resizing image" => "Napaka pri spreminjanju velikosti slike",
-"Error cropping image" => "Napaka pri obrezovanju slike",
-"Error creating temporary image" => "Napaka pri ustvarjanju začasne slike",
-"Error finding image: " => "Napaka pri iskanju datoteke: ",
-"Error uploading contacts to storage." => "Napaka pri nalaganju stikov v hrambo.",
-"There is no error, the file uploaded with success" => "Datoteka je bila uspešno naložena.",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Naložena datoteka presega velikost, ki jo določa parameter upload_max_filesize v datoteki php.ini",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Naložena datoteka presega velikost, ki jo določa parameter MAX_FILE_SIZE v HTML obrazcu",
-"The uploaded file was only partially uploaded" => "Datoteka je bila le delno naložena",
-"No file was uploaded" => "Nobena datoteka ni bila naložena",
-"Missing a temporary folder" => "Manjka začasna mapa",
-"Couldn't save temporary image: " => "Začasne slike ni bilo mogoče shraniti: ",
-"Couldn't load temporary image: " => "Začasne slike ni bilo mogoče naložiti: ",
-"No file was uploaded. Unknown error" => "Nobena datoteka ni bila naložena. Neznana napaka",
-"Contacts" => "Stiki",
-"Sorry, this functionality has not been implemented yet" => "Žal ta funkcionalnost še ni podprta",
-"Not implemented" => "Ni podprto",
-"Couldn't get a valid address." => "Ne morem dobiti veljavnega naslova.",
-"Error" => "Napaka",
-"You do not have permission to add contacts to " => "Nimate dovoljenja za dodajanje stikov v",
-"Please select one of your own address books." => "Prosimo, če izberete enega izmed vaših adresarjev.",
-"Permission error" => "Napaka dovoljenj",
-"This property has to be non-empty." => "Ta lastnost ne sme biti prazna",
-"Couldn't serialize elements." => "Predmetov ni bilo mogoče dati v zaporedje.",
-"'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "\"deleteProperty\" je bila klicana brez vrste argumenta. Prosimo, če oddate  poročilo o napaki na bugs.owncloud.org",
-"Edit name" => "Uredi ime",
-"No files selected for upload." => "Nobena datoteka ni bila izbrana za nalaganje.",
-"The file you are trying to upload exceed the maximum size for file uploads on this server." => "Datoteka, ki jo poskušate naložiti, presega največjo dovoljeno velikost za nalaganje na tem strežniku.",
-"Error loading profile picture." => "Napaka pri nalaganju slike profila.",
-"Select type" => "Izberite vrsto",
-"Some contacts are marked for deletion, but not deleted yet. Please wait for them to be deleted." => "Nekateri stiki so označeni za izbris, vendar še niso izbrisani. Prosimo, če počakate na njihov izbris.",
-"Do you want to merge these address books?" => "Ali želite združiti adresarje?",
-"Result: " => "Rezultati: ",
-" imported, " => " uvoženih, ",
-" failed." => " je spodletelo.",
-"Displayname cannot be empty." => "Ime za prikaz ne more biti prazno.",
-"Addressbook not found: " => "Adresar ni bil najden:",
-"This is not your addressbook." => "To ni vaš imenik.",
-"Contact could not be found." => "Stika ni bilo mogoče najti.",
-"Jabber" => "Jabber",
-"AIM" => "AIM",
-"MSN" => "MSN",
-"Twitter" => "Twitter",
-"GoogleTalk" => "GoogleTalk",
-"Facebook" => "Facebook",
-"XMPP" => "XMPP",
-"ICQ" => "ICQ",
-"Yahoo" => "Yahoo",
-"Skype" => "Skype",
-"QQ" => "QQ",
-"GaduGadu" => "GaduGadu",
-"Work" => "Delo",
-"Home" => "Doma",
-"Other" => "Drugo",
-"Mobile" => "Mobilni telefon",
-"Text" => "Besedilo",
-"Voice" => "Glas",
-"Message" => "Sporočilo",
-"Fax" => "Faks",
-"Video" => "Video",
-"Pager" => "Pozivnik",
-"Internet" => "Internet",
-"Birthday" => "Rojstni dan",
-"Business" => "Poslovno",
-"Call" => "Klic",
-"Clients" => "Stranka",
-"Deliverer" => "Dostavljalec",
-"Holidays" => "Prazniki",
-"Ideas" => "Ideje",
-"Journey" => "Potovanje",
-"Jubilee" => "Jubilej",
-"Meeting" => "Sestanek",
-"Personal" => "Osebno",
-"Projects" => "Projekti",
-"Questions" => "Vprašanja",
-"{name}'s Birthday" => "{name} - rojstni dan",
-"Contact" => "Stik",
-"You do not have the permissions to edit this contact." => "Nimate dovoljenj za urejanje tega stika.",
-"You do not have the permissions to delete this contact." => "Nimate dovoljenj za izbris tega stika.",
-"Add Contact" => "Dodaj stik",
-"Import" => "Uvozi",
-"Settings" => "Nastavitve",
-"Addressbooks" => "Imeniki",
-"Close" => "Zapri",
-"Keyboard shortcuts" => "Bližnjice na tipkovnici",
-"Navigation" => "Krmarjenje",
-"Next contact in list" => "Naslednji stik na seznamu",
-"Previous contact in list" => "Predhodni stik na seznamu",
-"Expand/collapse current addressbook" => "Razširi/skrči trenutni adresar",
-"Next addressbook" => "Naslednji adresar",
-"Previous addressbook" => "Predhodni adresar",
-"Actions" => "Dejanja",
-"Refresh contacts list" => "Osveži seznam stikov",
-"Add new contact" => "Dodaj nov stik",
-"Add new addressbook" => "Dodaj nov adresar",
-"Delete current contact" => "Izbriši trenutni stik",
-"Drop photo to upload" => "Spustite sliko tukaj, da bi jo naložili",
-"Delete current photo" => "Izbriši trenutno sliko",
-"Edit current photo" => "Uredi trenutno sliko",
-"Upload new photo" => "Naloži novo sliko",
-"Select photo from ownCloud" => "Izberi sliko iz ownCloud",
-"Format custom, Short name, Full name, Reverse or Reverse with comma" => "Format po meri, Kratko ime, Polno ime, Obratno ali Obratno z vejico",
-"Edit name details" => "Uredite podrobnosti imena",
-"Organization" => "Organizacija",
-"Delete" => "Izbriši",
-"Nickname" => "Vzdevek",
-"Enter nickname" => "Vnesite vzdevek",
-"Web site" => "Spletna stran",
-"http://www.somesite.com" => "http://www.nekastran.si",
-"Go to web site" => "Pojdi na spletno stran",
-"dd-mm-yyyy" => "dd. mm. yyyy",
-"Groups" => "Skupine",
-"Separate groups with commas" => "Skupine ločite z vejicami",
-"Edit groups" => "Uredi skupine",
-"Preferred" => "Prednosten",
-"Please specify a valid email address." => "Prosimo, če navedete veljaven e-poštni naslov.",
-"Enter email address" => "Vnesite e-poštni naslov",
-"Mail to address" => "E-pošta naslovnika",
-"Delete email address" => "Izbriši e-poštni naslov",
-"Enter phone number" => "Vpiši telefonsko številko",
-"Delete phone number" => "Izbriši telefonsko številko",
-"Instant Messenger" => "Takojšni sporočilnik",
-"Delete IM" => "Izbriši IM",
-"View on map" => "Prikaz na zemljevidu",
-"Edit address details" => "Uredi podrobnosti",
-"Add notes here." => "Opombe dodajte tukaj.",
-"Add field" => "Dodaj polje",
-"Phone" => "Telefon",
-"Email" => "E-pošta",
-"Instant Messaging" => "Neposredno sporočanje",
-"Address" => "Naslov",
-"Note" => "Opomba",
-"Download contact" => "Prenesi stik",
-"Delete contact" => "Izbriši stik",
-"The temporary image has been removed from cache." => "Začasna slika je bila odstranjena iz predpomnilnika.",
-"Edit address" => "Uredi naslov",
-"Type" => "Vrsta",
-"PO Box" => "Poštni predal",
-"Street address" => "Ulični naslov",
-"Street and number" => "Ulica in štelika",
-"Extended" => "Razširjeno",
-"Apartment number etc." => "Številka stanovanja itd.",
-"City" => "Mesto",
-"Region" => "Regija",
-"E.g. state or province" => "Npr. dežela ali pokrajina",
-"Zipcode" => "Poštna št.",
-"Postal code" => "Poštna številka",
-"Country" => "Dežela",
-"Addressbook" => "Imenik",
-"Hon. prefixes" => "Predpone",
-"Miss" => "gdč.",
-"Ms" => "ga.",
-"Mr" => "g.",
-"Sir" => "g.",
-"Mrs" => "ga.",
-"Dr" => "dr.",
-"Given name" => "Ime",
-"Additional names" => "Dodatna imena",
-"Family name" => "Priimek",
-"Hon. suffixes" => "Pripone",
-"J.D." => "univ. dipl. prav.",
-"M.D." => "dr. med.",
-"D.O." => "dr. med., spec. spl. med.",
-"D.C." => "dr. med., spec. kiropraktike",
-"Ph.D." => "dr.",
-"Esq." => "Esq.",
-"Jr." => "mlajši",
-"Sn." => "starejši",
-"Import a contacts file" => "Uvozi datoteko s stiki",
-"Please choose the addressbook" => "Prosimo, če izberete imenik",
-"create a new addressbook" => "Ustvari nov imenik",
-"Name of new addressbook" => "Ime novega imenika",
-"Importing contacts" => "Uvažam stike",
-"Contacts imported successfully" => "Stiki so bili uspešno uvoženi",
-"Close Dialog" => "Zapri dialog",
-"Import Addressbook" => "Uvozi imenik",
-"Select address book to import to:" => "Izberite imenik v katerega boste uvažali:",
-"Drop a VCF file to import contacts." => "Za uvoz stikov spustite VCF datoteko tukaj.",
-"Select from HD" => "Izberi iz HD",
-"You have no contacts in your addressbook." => "V vašem imeniku ni stikov.",
-"Add contact" => "Dodaj stik",
-"Select Address Books" => "Izberite adresarje",
-"Enter name" => "Vnesite ime",
-"Enter description" => "Vnesite opis",
-"CardDAV syncing addresses" => "CardDAV naslovi za sinhronizacijo",
-"more info" => "več informacij",
-"Primary address (Kontact et al)" => "Primarni naslov (za kontakt et al)",
-"iOS/OS X" => "iOS/OS X",
-"Show CardDav link" => "Pokaži CardDav povezavo",
-"Show read-only VCF link" => "Pokaži VCF povezavo samo za branje",
-"Share" => "Souporaba",
-"Download" => "Prenesi",
-"Edit" => "Uredi",
-"New Address Book" => "Nov imenik",
-"Name" => "Ime",
-"Description" => "Opis",
-"Save" => "Shrani",
-"Cancel" => "Prekliči",
-"More..." => "Več..."
-);
diff --git a/apps/contacts/l10n/sr.php b/apps/contacts/l10n/sr.php
deleted file mode 100644
index f54741c182..0000000000
--- a/apps/contacts/l10n/sr.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Information about vCard is incorrect. Please reload the page." => "Подаци о вКарти су неисправни. Поново учитајте страницу.",
-"Contacts" => "Контакти",
-"This is not your addressbook." => "Ово није ваш адресар.",
-"Contact could not be found." => "Контакт се не може наћи.",
-"Work" => "Посао",
-"Home" => "Кућа",
-"Mobile" => "Мобилни",
-"Text" => "Текст",
-"Voice" => "Глас",
-"Fax" => "Факс",
-"Video" => "Видео",
-"Pager" => "Пејџер",
-"Birthday" => "Рођендан",
-"Contact" => "Контакт",
-"Add Contact" => "Додај контакт",
-"Addressbooks" => "Адресар",
-"Organization" => "Организација",
-"Delete" => "Обриши",
-"Preferred" => "Пожељан",
-"Phone" => "Телефон",
-"Email" => "Е-маил",
-"Address" => "Адреса",
-"Download contact" => "Преузми контакт",
-"Delete contact" => "Обриши контакт",
-"Type" => "Тип",
-"PO Box" => "Поштански број",
-"Extended" => "Прошири",
-"City" => "Град",
-"Region" => "Регија",
-"Zipcode" => "Зип код",
-"Country" => "Земља",
-"Addressbook" => "Адресар",
-"Download" => "Преузимање",
-"Edit" => "Уреди",
-"New Address Book" => "Нови адресар",
-"Save" => "Сними",
-"Cancel" => "Откажи"
-);
diff --git a/apps/contacts/l10n/sr@latin.php b/apps/contacts/l10n/sr@latin.php
deleted file mode 100644
index f06539ab43..0000000000
--- a/apps/contacts/l10n/sr@latin.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Information about vCard is incorrect. Please reload the page." => "Podaci o vKarti su neispravni. Ponovo učitajte stranicu.",
-"This is not your addressbook." => "Ovo nije vaš adresar.",
-"Contact could not be found." => "Kontakt se ne može naći.",
-"Work" => "Posao",
-"Home" => "Kuća",
-"Mobile" => "Mobilni",
-"Text" => "Tekst",
-"Voice" => "Glas",
-"Fax" => "Faks",
-"Video" => "Video",
-"Pager" => "Pejdžer",
-"Birthday" => "Rođendan",
-"Add Contact" => "Dodaj kontakt",
-"Organization" => "Organizacija",
-"Delete" => "Obriši",
-"Phone" => "Telefon",
-"Email" => "E-mail",
-"Address" => "Adresa",
-"PO Box" => "Poštanski broj",
-"Extended" => "Proširi",
-"City" => "Grad",
-"Region" => "Regija",
-"Zipcode" => "Zip kod",
-"Country" => "Zemlja",
-"Edit" => "Uredi"
-);
diff --git a/apps/contacts/l10n/sv.php b/apps/contacts/l10n/sv.php
deleted file mode 100644
index 88aac866f6..0000000000
--- a/apps/contacts/l10n/sv.php
+++ /dev/null
@@ -1,229 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "Fel (av)aktivera adressbok.",
-"id is not set." => "ID är inte satt.",
-"Cannot update addressbook with an empty name." => "Kan inte uppdatera adressboken med ett tomt namn.",
-"Error updating addressbook." => "Fel uppstod när adressbok skulle uppdateras.",
-"No ID provided" => "Inget ID angett",
-"Error setting checksum." => "Fel uppstod när kontrollsumma skulle sättas.",
-"No categories selected for deletion." => "Inga kategorier valda för borttaging",
-"No address books found." => "Ingen adressbok funnen.",
-"No contacts found." => "Inga kontakter funna.",
-"There was an error adding the contact." => "Det uppstod ett fel när kontakten skulle läggas till.",
-"element name is not set." => "elementnamn ej angett.",
-"Could not parse contact: " => "Kunde inte läsa kontakt:",
-"Cannot add empty property." => "Kan inte lägga till en tom egenskap.",
-"At least one of the address fields has to be filled out." => "Minst ett fält måste fyllas i.",
-"Trying to add duplicate property: " => "Försöker lägga till dubblett:",
-"Missing IM parameter." => "IM parameter saknas.",
-"Unknown IM: " => "Okänt IM:",
-"Information about vCard is incorrect. Please reload the page." => "Information om vCard är felaktigt. Vänligen ladda om sidan.",
-"Missing ID" => "ID saknas",
-"Error parsing VCard for ID: \"" => "Fel vid läsning av VCard för ID: \"",
-"checksum is not set." => "kontrollsumma är inte satt.",
-"Information about vCard is incorrect. Please reload the page: " => "Informationen om vCard är fel. Ladda om sidan:",
-"Something went FUBAR. " => "Något gick fel.",
-"No contact ID was submitted." => "Inget kontakt-ID angavs.",
-"Error reading contact photo." => "Fel uppstod vid läsning av kontaktfoto.",
-"Error saving temporary file." => "Fel uppstod när temporär fil skulle sparas.",
-"The loading photo is not valid." => "Det laddade fotot är inte giltigt.",
-"Contact ID is missing." => "Kontakt-ID saknas.",
-"No photo path was submitted." => "Ingen sökväg till foto angavs.",
-"File doesn't exist:" => "Filen existerar inte.",
-"Error loading image." => "Fel uppstod när bild laddades.",
-"Error getting contact object." => "Fel vid hämtning av kontakt.",
-"Error getting PHOTO property." => "Fel vid hämtning av egenskaper för FOTO.",
-"Error saving contact." => "Fel vid sparande av kontakt.",
-"Error resizing image" => "Fel vid storleksförändring av bilden",
-"Error cropping image" => "Fel vid beskärning av bilden",
-"Error creating temporary image" => "Fel vid skapande av tillfällig bild",
-"Error finding image: " => "Kunde inte hitta bild:",
-"Error uploading contacts to storage." => "Fel uppstod när kontakt skulle lagras.",
-"There is no error, the file uploaded with success" => "Inga fel uppstod. Filen laddades upp utan problem.",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Den uppladdade filen överskrider upload_max_filesize direktivet i php.ini",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Den uppladdade filen överskrider MAX_FILE_SIZE direktivet som har angetts i HTML formuläret",
-"The uploaded file was only partially uploaded" => "Den uppladdade filen var bara delvist uppladdad",
-"No file was uploaded" => "Ingen fil laddades upp",
-"Missing a temporary folder" => "En temporär mapp saknas",
-"Couldn't save temporary image: " => "Kunde inte spara tillfällig bild:",
-"Couldn't load temporary image: " => "Kunde inte ladda tillfällig bild:",
-"No file was uploaded. Unknown error" => "Ingen fil uppladdad. Okänt fel",
-"Contacts" => "Kontakter",
-"Sorry, this functionality has not been implemented yet" => "Tyvärr är denna funktion inte införd än",
-"Not implemented" => "Inte införd",
-"Couldn't get a valid address." => "Kunde inte hitta en giltig adress.",
-"Error" => "Fel",
-"You do not have permission to add contacts to " => "Du saknar behörighet att skapa kontakter i",
-"Please select one of your own address books." => "Välj en av dina egna adressböcker.",
-"Permission error" => "Behörighetsfel",
-"This property has to be non-empty." => "Denna egenskap får inte vara tom.",
-"Couldn't serialize elements." => "Kunde inte serialisera element.",
-"'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "\"deleteProperty\" anropades utan typargument. Vänligen rapportera till bugs.owncloud.org",
-"Edit name" => "Ändra namn",
-"No files selected for upload." => "Inga filer valda för uppladdning",
-"The file you are trying to upload exceed the maximum size for file uploads on this server." => "Filen du försöker ladda upp är större än den maximala storleken för filuppladdning på denna server.",
-"Error loading profile picture." => "Fel vid hämtning av profilbild.",
-"Select type" => "Välj typ",
-"Some contacts are marked for deletion, but not deleted yet. Please wait for them to be deleted." => "Vissa kontakter är markerade för radering, men är inte raderade än. Vänta tills dom är raderade.",
-"Do you want to merge these address books?" => "Vill du slå samman dessa adressböcker?",
-"Result: " => "Resultat:",
-" imported, " => "importerad,",
-" failed." => "misslyckades.",
-"Displayname cannot be empty." => "Visningsnamn får inte vara tomt.",
-"Addressbook not found: " => "Adressboken hittades inte:",
-"This is not your addressbook." => "Det här är inte din adressbok.",
-"Contact could not be found." => "Kontakt kunde inte hittas.",
-"Jabber" => "Jabber",
-"AIM" => "AIM",
-"MSN" => "MSN",
-"Twitter" => "Twitter",
-"GoogleTalk" => "GoogleTalk",
-"Facebook" => "Facebook",
-"XMPP" => "XMPP",
-"ICQ" => "ICQ",
-"Yahoo" => "Yahoo",
-"Skype" => "Skype",
-"QQ" => "QQ",
-"GaduGadu" => "GaduGadu",
-"Work" => "Arbete",
-"Home" => "Hem",
-"Other" => "Annat",
-"Mobile" => "Mobil",
-"Text" => "Text",
-"Voice" => "Röst",
-"Message" => "Meddelande",
-"Fax" => "Fax",
-"Video" => "Video",
-"Pager" => "Personsökare",
-"Internet" => "Internet",
-"Birthday" => "Födelsedag",
-"Business" => "Företag",
-"Call" => "Ring",
-"Clients" => "Kunder",
-"Deliverer" => "Leverera",
-"Holidays" => "Helgdagar",
-"Ideas" => "Idéer",
-"Journey" => "Resa",
-"Jubilee" => "Jubileum",
-"Meeting" => "Möte",
-"Personal" => "Privat",
-"Projects" => "Projekt",
-"Questions" => "Frågor",
-"{name}'s Birthday" => "{name}'s födelsedag",
-"Contact" => "Kontakt",
-"You do not have the permissions to edit this contact." => "Du saknar behörighet för att ändra denna kontakt.",
-"You do not have the permissions to delete this contact." => "Du saknar behörighet för att radera denna kontakt.",
-"Add Contact" => "Lägg till kontakt",
-"Import" => "Importera",
-"Settings" => "Inställningar",
-"Addressbooks" => "Adressböcker",
-"Close" => "Stäng",
-"Keyboard shortcuts" => "Kortkommandon",
-"Navigation" => "Navigering",
-"Next contact in list" => "Nästa kontakt i listan",
-"Previous contact in list" => "Föregående kontakt i listan",
-"Expand/collapse current addressbook" => "Visa/dölj aktuell adressbok",
-"Next addressbook" => "Nästa adressbok",
-"Previous addressbook" => "Föregående adressbok",
-"Actions" => "Åtgärder",
-"Refresh contacts list" => "Uppdatera kontaktlistan",
-"Add new contact" => "Lägg till ny kontakt",
-"Add new addressbook" => "Lägg till ny adressbok",
-"Delete current contact" => "Radera denna kontakt",
-"Drop photo to upload" => "Släpp foto för att ladda upp",
-"Delete current photo" => "Ta bort aktuellt foto",
-"Edit current photo" => "Redigera aktuellt foto",
-"Upload new photo" => "Ladda upp ett nytt foto",
-"Select photo from ownCloud" => "Välj foto från ownCloud",
-"Format custom, Short name, Full name, Reverse or Reverse with comma" => " anpassad, korta namn, hela namn, bakåt eller bakåt med komma",
-"Edit name details" => "Redigera detaljer för namn",
-"Organization" => "Organisation",
-"Delete" => "Radera",
-"Nickname" => "Smeknamn",
-"Enter nickname" => "Ange smeknamn",
-"Web site" => "Webbplats",
-"http://www.somesite.com" => "http://www.somesite.com",
-"Go to web site" => "Gå till webbplats",
-"dd-mm-yyyy" => "dd-mm-åååå",
-"Groups" => "Grupper",
-"Separate groups with commas" => "Separera grupperna med kommatecken",
-"Edit groups" => "Editera grupper",
-"Preferred" => "Föredragen",
-"Please specify a valid email address." => "Vänligen ange en giltig e-postadress.",
-"Enter email address" => "Ange e-postadress",
-"Mail to address" => "Posta till adress.",
-"Delete email address" => "Ta bort e-postadress",
-"Enter phone number" => "Ange telefonnummer",
-"Delete phone number" => "Ta bort telefonnummer",
-"Instant Messenger" => "Instant Messenger",
-"Delete IM" => "Radera IM",
-"View on map" => "Visa på karta",
-"Edit address details" => "Redigera detaljer för adress",
-"Add notes here." => "Lägg till noteringar här.",
-"Add field" => "Lägg till fält",
-"Phone" => "Telefon",
-"Email" => "E-post",
-"Instant Messaging" => "Instant Messaging",
-"Address" => "Adress",
-"Note" => "Notering",
-"Download contact" => "Ladda ner kontakt",
-"Delete contact" => "Radera kontakt",
-"The temporary image has been removed from cache." => "Den tillfälliga bilden har raderats från cache.",
-"Edit address" => "Editera adress",
-"Type" => "Typ",
-"PO Box" => "Postbox",
-"Street address" => "Gatuadress",
-"Street and number" => "Gata och nummer",
-"Extended" => "Utökad",
-"Apartment number etc." => "Lägenhetsnummer",
-"City" => "Stad",
-"Region" => "Län",
-"E.g. state or province" => "T.ex. stat eller provins",
-"Zipcode" => "Postnummer",
-"Postal code" => "Postnummer",
-"Country" => "Land",
-"Addressbook" => "Adressbok",
-"Hon. prefixes" => "Ledande titlar",
-"Miss" => "Fröken",
-"Ms" => "Fru",
-"Mr" => "Herr",
-"Sir" => "Herr",
-"Mrs" => "Fru",
-"Dr" => "Dr.",
-"Given name" => "Förnamn",
-"Additional names" => "Mellannamn",
-"Family name" => "Efternamn",
-"Hon. suffixes" => "Efterställda titlar",
-"J.D." => "Kand. Jur.",
-"M.D." => "M.D.",
-"D.O." => "D.O.",
-"D.C." => "D.C.",
-"Ph.D." => "Fil.dr.",
-"Esq." => "Esq.",
-"Jr." => "Jr.",
-"Sn." => "Sn.",
-"Import a contacts file" => "Importera en kontaktfil",
-"Please choose the addressbook" => "Vänligen välj adressboken",
-"create a new addressbook" => "skapa en ny adressbok",
-"Name of new addressbook" => "Namn för ny adressbok",
-"Importing contacts" => "Importerar kontakter",
-"You have no contacts in your addressbook." => "Du har inga kontakter i din adressbok.",
-"Add contact" => "Lägg till en kontakt",
-"Select Address Books" => "Välj adressböcker",
-"Enter name" => "Ange namn",
-"Enter description" => "Ange beskrivning",
-"CardDAV syncing addresses" => "CardDAV synkningsadresser",
-"more info" => "mer information",
-"Primary address (Kontact et al)" => "Primär adress (Kontakt o.a.)",
-"iOS/OS X" => "iOS/OS X",
-"Show CardDav link" => "Visa CardDav-länk",
-"Show read-only VCF link" => "Visa skrivskyddad VCF-länk",
-"Share" => "Dela",
-"Download" => "Nedladdning",
-"Edit" => "Redigera",
-"New Address Book" => "Ny adressbok",
-"Name" => "Namn",
-"Description" => "Beskrivning",
-"Save" => "Spara",
-"Cancel" => "Avbryt",
-"More..." => "Mer..."
-);
diff --git a/apps/contacts/l10n/th_TH.php b/apps/contacts/l10n/th_TH.php
deleted file mode 100644
index 6afc64e61d..0000000000
--- a/apps/contacts/l10n/th_TH.php
+++ /dev/null
@@ -1,213 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "เกิดข้อผิดพลาดใน (ยกเลิก)การเปิดใช้งานสมุดบันทึกที่อยู่",
-"id is not set." => "ยังไม่ได้กำหนดรหัส",
-"Cannot update addressbook with an empty name." => "ไม่สามารถอัพเดทสมุดบันทึกที่อยู่โดยไม่มีชื่อได้",
-"Error updating addressbook." => "เกิดข้อผิดพลาดในการอัพเดทสมุดบันทึกที่อยู่",
-"No ID provided" => "ยังไม่ได้ใส่รหัส",
-"Error setting checksum." => "เกิดข้อผิดพลาดในการตั้งค่า checksum",
-"No categories selected for deletion." => "ยังไม่ได้เลือกหมวดหมู่ที่ต้องการลบ",
-"No address books found." => "ไม่พบสมุดบันทึกที่อยู่ที่ต้องการ",
-"No contacts found." => "ไม่พบข้อมูลการติดต่อที่ต้องการ",
-"There was an error adding the contact." => "เกิดข้อผิดพลาดในการเพิ่มรายชื่อผู้ติดต่อใหม่",
-"element name is not set." => "ยังไม่ได้กำหนดชื่อ",
-"Could not parse contact: " => "ไม่สามารถแจกแจงรายชื่อผู้ติดต่อได้",
-"Cannot add empty property." => "ไม่สามารถเพิ่มรายละเอียดที่ไม่มีข้อมูลได้",
-"At least one of the address fields has to be filled out." => "อย่างน้อยที่สุดช่องข้อมูลที่อยู่จะต้องถูกกรอกลงไป",
-"Trying to add duplicate property: " => "พยายามที่จะเพิ่มทรัพยากรที่ซ้ำซ้อนกัน: ",
-"Information about vCard is incorrect. Please reload the page." => "ข้อมูลเกี่ยวกับ vCard ไม่ถูกต้อง กรุณาโหลดหน้าเวปใหม่อีกครั้ง",
-"Missing ID" => "รหัสสูญหาย",
-"Error parsing VCard for ID: \"" => "พบข้อผิดพลาดในการแยกรหัส VCard:\"",
-"checksum is not set." => "ยังไม่ได้กำหนดค่า checksum",
-"Information about vCard is incorrect. Please reload the page: " => "ข้อมูล vCard ไม่ถูกต้อง กรุณาโหลดหน้าเว็บใหม่อีกครั้ง: ",
-"Something went FUBAR. " => "มีบางอย่างเกิดการ FUBAR. ",
-"No contact ID was submitted." => "ไม่มีรหัสข้อมูลการติดต่อถูกส่งมา",
-"Error reading contact photo." => "เกิดข้อผิดพลาดในการอ่านรูปภาพของข้อมูลการติดต่อ",
-"Error saving temporary file." => "เกิดข้อผิดพลาดในการบันทึกไฟล์ชั่วคราว",
-"The loading photo is not valid." => "โหลดรูปภาพไม่ถูกต้อง",
-"Contact ID is missing." => "รหัสข้อมูลการติดต่อเกิดการสูญหาย",
-"No photo path was submitted." => "ไม่พบตำแหน่งพาธของรูปภาพ",
-"File doesn't exist:" => "ไม่มีไฟล์ดังกล่าว",
-"Error loading image." => "เกิดข้อผิดพลาดในการโหลดรูปภาพ",
-"Error getting contact object." => "เกิดข้อผิดพลาดในการดึงข้อมูลติดต่อ",
-"Error getting PHOTO property." => "เกิดข้อผิดพลาดในการดึงคุณสมบัติของรูปภาพ",
-"Error saving contact." => "เกิดข้อผิดพลาดในการบันทึกข้อมูลผู้ติดต่อ",
-"Error resizing image" => "เกิดข้อผิดพลาดในการปรับขนาดรูปภาพ",
-"Error cropping image" => "เกิดข้อผิดพลาดในการครอบตัดภาพ",
-"Error creating temporary image" => "เกิดข้อผิดพลาดในการสร้างรูปภาพชั่วคราว",
-"Error finding image: " => "เกิดข้อผิดพลาดในการค้นหารูปภาพ: ",
-"Error uploading contacts to storage." => "เกิดข้อผิดพลาดในการอัพโหลดข้อมูลการติดต่อไปยังพื้นที่จัดเก็บข้อมูล",
-"There is no error, the file uploaded with success" => "ไม่พบข้อผิดพลาดใดๆ, ไฟล์ถูกอัพโหลดเรียบร้อยแล้ว",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "ไฟล์ที่อัพโหลดมีขนาดไฟล์ใหญ่เกินจำนวนที่กำหนดไว้ในคำสั่ง upload_max_filesize ที่อยู่ในไฟล์ php.ini",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "ไฟล์ที่อัพโหลดมีขนาดไฟล์ใหญ่เกินจำนวนที่กำหนดไว้ในคำสั่ง MAX_FILE_SIZE ที่ถูกระบุไว้ในรูปแบบของ HTML",
-"The uploaded file was only partially uploaded" => "ไฟล์ถูกอัพโหลดได้เพียงบางส่วนเท่านั้น",
-"No file was uploaded" => "ไม่มีไฟล์ที่ถูกอัพโหลด",
-"Missing a temporary folder" => "โฟลเดอร์ชั่วคราวเกิดการสูญหาย",
-"Couldn't save temporary image: " => "ไม่สามารถบันทึกรูปภาพชั่วคราวได้: ",
-"Couldn't load temporary image: " => "ไม่สามารถโหลดรูปภาพชั่วคราวได้: ",
-"No file was uploaded. Unknown error" => "ยังไม่มีไฟล์ใดที่ถูกอัพโหลด เกิดข้อผิดพลาดที่ไม่ทราบสาเหตุ",
-"Contacts" => "ข้อมูลการติดต่อ",
-"Sorry, this functionality has not been implemented yet" => "ขออภัย, ฟังก์ชั่นการทำงานนี้ยังไม่ได้ถูกดำเนินการ",
-"Not implemented" => "ยังไม่ได้ถูกดำเนินการ",
-"Couldn't get a valid address." => "ไม่สามารถดึงที่อยู่ที่ถูกต้องได้",
-"Error" => "พบข้อผิดพลาด",
-"This property has to be non-empty." => "คุณสมบัตินี้ต้องไม่มีข้อมูลว่างอยู่",
-"Couldn't serialize elements." => "ไม่สามารถทำสัญลักษณ์องค์ประกอบต่างๆให้เป็นตัวเลขตามลำดับได้",
-"'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "'deleteProperty' ถูกเรียกใช้โดยไม่มีอาร์กิวเมนต์ กรุณาแจ้งได้ที่ bugs.owncloud.org",
-"Edit name" => "แก้ไขชื่อ",
-"No files selected for upload." => "ยังไม่ได้เลือกไฟล์ำสำหรับอัพโหลด",
-"The file you are trying to upload exceed the maximum size for file uploads on this server." => "ไฟล์ที่คุณกำลังพยายามที่จะอัพโหลดมีขนาดเกินจำนวนสูงสุดที่สามารถอัพโหลดได้สำหรับเซิร์ฟเวอร์นี้",
-"Error loading profile picture." => "เกิดข้อผิดพลาดในการโหลดรูปภาพประจำตัว",
-"Select type" => "เลือกชนิด",
-"Some contacts are marked for deletion, but not deleted yet. Please wait for them to be deleted." => "ข้อมูลผู้ติดต่อบางรายการได้ถูกทำเครื่องหมายสำหรับลบทิ้งเอาไว้, แต่ยังไม่ได้ถูกลบทิ้ง, กรุณารอให้รายการดังกล่าวถูกลบทิ้งเสียก่อน",
-"Do you want to merge these address books?" => "คุณต้องการผสานข้อมูลสมุดบันทึกที่อยู่เหล่านี้หรือไม่?",
-"Result: " => "ผลลัพธ์: ",
-" imported, " => " นำเข้าข้อมูลแล้ว, ",
-" failed." => " ล้มเหลว.",
-"Displayname cannot be empty." => "ชื่อที่ใช้แสดงไม่สามารถเว้นว่างได้",
-"Addressbook not found: " => "ไม่พบสมุดบันทึกที่อยู่ที่ต้องการ",
-"This is not your addressbook." => "นี่ไม่ใช่สมุดบันทึกที่อยู่ของคุณ",
-"Contact could not be found." => "ไม่พบข้อมูลการติดต่อ",
-"Work" => "ที่ทำงาน",
-"Home" => "บ้าน",
-"Other" => "อื่นๆ",
-"Mobile" => "มือถือ",
-"Text" => "ข้อความ",
-"Voice" => "เสียงพูด",
-"Message" => "ข้อความ",
-"Fax" => "โทรสาร",
-"Video" => "วีดีโอ",
-"Pager" => "เพจเจอร์",
-"Internet" => "อินเทอร์เน็ต",
-"Birthday" => "วันเกิด",
-"Business" => "ธุรกิจ",
-"Call" => "โทร",
-"Clients" => "ลูกค้า",
-"Deliverer" => "ผู้จัดส่ง",
-"Holidays" => "วันหยุด",
-"Ideas" => "ไอเดีย",
-"Journey" => "การเดินทาง",
-"Jubilee" => "งานเฉลิมฉลอง",
-"Meeting" => "ประชุม",
-"Personal" => "ส่วนตัว",
-"Projects" => "โปรเจค",
-"Questions" => "คำถาม",
-"{name}'s Birthday" => "วันเกิดของ {name}",
-"Contact" => "ข้อมูลการติดต่อ",
-"Add Contact" => "เพิ่มรายชื่อผู้ติดต่อใหม่",
-"Import" => "นำเข้า",
-"Settings" => "ตั้งค่า",
-"Addressbooks" => "สมุดบันทึกที่อยู่",
-"Close" => "ปิด",
-"Keyboard shortcuts" => "ปุ่มลัด",
-"Navigation" => "ระบบเมนู",
-"Next contact in list" => "ข้อมูลผู้ติดต่อถัดไปในรายการ",
-"Previous contact in list" => "ข้อมูลผู้ติดต่อก่อนหน้าในรายการ",
-"Expand/collapse current addressbook" => "ขยาย/ย่อ สมุดบันทึกที่อยู่ปัจจุบัน",
-"Next addressbook" => "สมุดบันทึกที่อยู่ถัดไป",
-"Previous addressbook" => "สมุดบันทึกที่อยู่ก่อนหน้า",
-"Actions" => "การกระทำ",
-"Refresh contacts list" => "รีเฟรชรายชื่อผู้ติดต่อใหม่",
-"Add new contact" => "เพิ่มข้อมูลผู้ติดต่อใหม่",
-"Add new addressbook" => "เพิ่มสมุดบันทึกที่อยู่ใหม่",
-"Delete current contact" => "ลบข้อมูลผู้ติดต่อปัจจุบัน",
-"Drop photo to upload" => "วางรูปภาพที่ต้องการอัพโหลด",
-"Delete current photo" => "ลบรูปภาพปัจจุบัน",
-"Edit current photo" => "แก้ไขรูปภาพปัจจุบัน",
-"Upload new photo" => "อัพโหลดรูปภาพใหม่",
-"Select photo from ownCloud" => "เลือกรูปภาพจาก ownCloud",
-"Format custom, Short name, Full name, Reverse or Reverse with comma" => "กำหนดรูปแบบของชื่อย่อ, ชื่อจริง, ย้อนค่ากลัีบด้วยคอมม่าเอง",
-"Edit name details" => "แก้ไขรายละเอียดของชื่อ",
-"Organization" => "หน่วยงาน",
-"Delete" => "ลบ",
-"Nickname" => "ชื่อเล่น",
-"Enter nickname" => "กรอกชื่อเล่น",
-"Web site" => "เว็บไซต์",
-"http://www.somesite.com" => "http://www.somesite.com",
-"Go to web site" => "ไปที่เว็บไซต์",
-"dd-mm-yyyy" => "dd-mm-yyyy",
-"Groups" => "กลุ่ม",
-"Separate groups with commas" => "คั่นระหว่างรายชื่อกลุ่มด้วยเครื่องหมายจุลภาีคหรือคอมม่า",
-"Edit groups" => "แก้ไขกลุ่ม",
-"Preferred" => "พิเศษ",
-"Please specify a valid email address." => "กรุณาระบุที่อยู่อีเมลที่ถูกต้อง",
-"Enter email address" => "กรอกที่อยู่อีเมล",
-"Mail to address" => "ส่งอีเมลไปที่",
-"Delete email address" => "ลบที่อยู่อีเมล",
-"Enter phone number" => "กรอกหมายเลขโทรศัพท์",
-"Delete phone number" => "ลบหมายเลขโทรศัพท์",
-"View on map" => "ดูบนแผนที่",
-"Edit address details" => "แก้ไขรายละเอียดที่อยู่",
-"Add notes here." => "เพิ่มหมายเหตุกำกับไว้ที่นี่",
-"Add field" => "เพิ่มช่องรับข้อมูล",
-"Phone" => "โทรศัพท์",
-"Email" => "อีเมล์",
-"Address" => "ที่อยู่",
-"Note" => "หมายเหตุ",
-"Download contact" => "ดาวน์โหลดข้อมูลการติดต่อ",
-"Delete contact" => "ลบข้อมูลการติดต่อ",
-"The temporary image has been removed from cache." => "รูปภาพชั่วคราวดังกล่าวได้ถูกลบออกจากหน่วยความจำแคชแล้ว",
-"Edit address" => "แก้ไขที่อยู่",
-"Type" => "ประเภท",
-"PO Box" => "ตู้ ปณ.",
-"Street address" => "ที่อยู่",
-"Street and number" => "ถนนและหมายเลข",
-"Extended" => "เพิ่ม",
-"Apartment number etc." => "หมายเลขอพาร์ทเมนต์ ฯลฯ",
-"City" => "เมือง",
-"Region" => "ภูมิภาค",
-"E.g. state or province" => "เช่น รัฐ หรือ จังหวัด",
-"Zipcode" => "รหัสไปรษณีย์",
-"Postal code" => "รหัสไปรษณีย์",
-"Country" => "ประเทศ",
-"Addressbook" => "สมุดบันทึกที่อยู่",
-"Hon. prefixes" => "คำนำหน้าชื่อคนรัก",
-"Miss" => "นางสาว",
-"Ms" => "น.ส.",
-"Mr" => "นาย",
-"Sir" => "คุณ",
-"Mrs" => "นาง",
-"Dr" => "ดร.",
-"Given name" => "ชื่อที่ใช้",
-"Additional names" => "ชื่ออื่นๆ",
-"Family name" => "ชื่อครอบครัว",
-"Hon. suffixes" => "คำแนบท้ายชื่อคนรัก",
-"J.D." => "J.D.",
-"M.D." => "M.D.",
-"D.O." => "D.O.",
-"D.C." => "D.C.",
-"Ph.D." => "ปริญญาเอก",
-"Esq." => "Esq.",
-"Jr." => "จูเนียร์",
-"Sn." => "ซีเนียร์",
-"Import a contacts file" => "นำเข้าไฟล์ข้อมูลการติดต่อ",
-"Please choose the addressbook" => "กรุณาเลือกสมุดบันทึกที่อยู่",
-"create a new addressbook" => "สร้างสมุดบันทึกที่อยู่ใหม่",
-"Name of new addressbook" => "กำหนดชื่อของสมุดที่อยู่ที่สร้างใหม่",
-"Importing contacts" => "นำเข้าข้อมูลการติดต่อ",
-"Contacts imported successfully" => "ข้อมูลการติดต่อถูกนำเข้าข้อมูลเรียบร้อยแล้ว",
-"Close Dialog" => "ปิดกล่องข้อความ",
-"Import Addressbook" => "นำเข้าข้อมูลสมุดบันทึกที่อยู่",
-"Select address book to import to:" => "เลือกสมุดบันทึกที่อยู่ที่ต้องการนำเข้า:",
-"Drop a VCF file to import contacts." => "วางไฟล์ VCF ที่ต้องการนำเข้าข้อมูลการติดต่อ",
-"Select from HD" => "เลือกจากฮาร์ดดิส",
-"You have no contacts in your addressbook." => "คุณยังไม่มีข้อมูลการติดต่อใดๆในสมุดบันทึกที่อยู่ของคุณ",
-"Add contact" => "เพิ่มชื่อผู้ติดต่อ",
-"Select Address Books" => "เลือกสมุดบันทึกที่อยู่",
-"Enter name" => "กรอกชื่อ",
-"Enter description" => "กรอกคำอธิบาย",
-"CardDAV syncing addresses" => "ที่อยู่ที่ใช้เชื่อมข้อมูลกับ CardDAV",
-"more info" => "ข้อมูลเพิ่มเติม",
-"Primary address (Kontact et al)" => "ที่อยู่หลัก (สำหรับติดต่อ)",
-"iOS/OS X" => "iOS/OS X",
-"Show CardDav link" => "แสดงลิงก์ CardDav",
-"Show read-only VCF link" => "แสดงลิงก์ VCF สำหรับอ่านเท่านั้น",
-"Share" => "แชร์",
-"Download" => "ดาวน์โหลด",
-"Edit" => "แก้ไข",
-"New Address Book" => "สร้างสมุดบันทึกข้อมูลการติดต่อใหม่",
-"Name" => "ชื่อ",
-"Description" => "คำอธิบาย",
-"Save" => "บันทึก",
-"Cancel" => "ยกเลิก",
-"More..." => "เพิ่มเติม..."
-);
diff --git a/apps/contacts/l10n/tr.php b/apps/contacts/l10n/tr.php
deleted file mode 100644
index e2a769410f..0000000000
--- a/apps/contacts/l10n/tr.php
+++ /dev/null
@@ -1,199 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "Adres defteri etkisizleştirilirken hata oluştu.",
-"id is not set." => "id atanmamış.",
-"Cannot update addressbook with an empty name." => "Adres defterini boş bir isimle güncelleyemezsiniz.",
-"Error updating addressbook." => "Adres defteri güncellenirken hata oluştu.",
-"No ID provided" => "ID verilmedi",
-"Error setting checksum." => "İmza oluşturulurken hata.",
-"No categories selected for deletion." => "Silmek için bir kategori seçilmedi.",
-"No address books found." => "Adres defteri bulunamadı.",
-"No contacts found." => "Bağlantı bulunamadı.",
-"There was an error adding the contact." => "Kişi eklenirken hata oluştu.",
-"element name is not set." => "eleman ismi atanmamış.",
-"Could not parse contact: " => "Kişi bilgisi ayrıştırılamadı.",
-"Cannot add empty property." => "Boş özellik eklenemiyor.",
-"At least one of the address fields has to be filled out." => "En az bir adres alanı doldurulmalı.",
-"Trying to add duplicate property: " => "Yinelenen özellik eklenmeye çalışılıyor: ",
-"Information about vCard is incorrect. Please reload the page." => "vCard bilgileri doğru değil. Lütfen sayfayı yenileyin.",
-"Missing ID" => "Eksik ID",
-"Error parsing VCard for ID: \"" => "ID için VCard ayrıştırılamadı:\"",
-"checksum is not set." => "checksum atanmamış.",
-"Information about vCard is incorrect. Please reload the page: " => "vCard hakkındaki bilgi hatalı. Lütfen sayfayı yeniden yükleyin: ",
-"Something went FUBAR. " => "Bir şey FUBAR gitti.",
-"No contact ID was submitted." => "Bağlantı ID'si girilmedi.",
-"Error reading contact photo." => "Bağlantı fotoğrafı okunamadı.",
-"Error saving temporary file." => "Geçici dosya kaydetme hatası.",
-"The loading photo is not valid." => "Yüklenecek fotograf geçerli değil.",
-"Contact ID is missing." => "Bağlantı ID'si eksik.",
-"No photo path was submitted." => "Fotoğraf girilmedi.",
-"File doesn't exist:" => "Dosya mevcut değil:",
-"Error loading image." => "İmaj yükleme hatası.",
-"Error getting contact object." => "Bağlantı nesnesini kaydederken hata.",
-"Error getting PHOTO property." => "Resim özelleğini alırken hata oluştu.",
-"Error saving contact." => "Bağlantıyı kaydederken hata",
-"Error resizing image" => "Görüntü yeniden boyutlandırılamadı.",
-"Error cropping image" => "Görüntü kırpılamadı.",
-"Error creating temporary image" => "Geçici resim oluştururken hata oluştu",
-"Error finding image: " => "Resim ararken hata oluştu:",
-"Error uploading contacts to storage." => "Bağlantıları depoya yükleme hatası",
-"There is no error, the file uploaded with success" => "Dosya başarıyla yüklendi, hata oluşmadı",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Dosyanın boyutu php.ini dosyasındaki upload_max_filesize limitini aşıyor",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Yüklenecek dosyanın boyutu HTML formunda belirtilen MAX_FILE_SIZE limitini aşıyor",
-"The uploaded file was only partially uploaded" => "Dosya kısmen karşıya yüklenebildi",
-"No file was uploaded" => "Hiç dosya gönderilmedi",
-"Missing a temporary folder" => "Geçici dizin eksik",
-"Couldn't save temporary image: " => "Geçici resmi saklayamadı : ",
-"Couldn't load temporary image: " => "Geçici resmi yükleyemedi :",
-"No file was uploaded. Unknown error" => "Dosya yüklenmedi. Bilinmeyen hata",
-"Contacts" => "Kişiler",
-"Sorry, this functionality has not been implemented yet" => "Üzgünüz, bu özellik henüz tamamlanmadı.",
-"Not implemented" => "Tamamlanmadı.",
-"Couldn't get a valid address." => "Geçerli bir adres alınamadı.",
-"Error" => "Hata",
-"This property has to be non-empty." => "Bu özellik boş bırakılmamalı.",
-"Couldn't serialize elements." => "Öğeler seri hale getiremedi",
-"'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "'deleteProperty' tip argümanı olmadan çağrıldı. Lütfen bugs.owncloud.org a rapor ediniz.",
-"Edit name" => "İsmi düzenle",
-"No files selected for upload." => "Yükleme için dosya seçilmedi.",
-"The file you are trying to upload exceed the maximum size for file uploads on this server." => "Yüklemeye çalıştığınız dosya sunucudaki dosya yükleme maksimum boyutunu aşmaktadır. ",
-"Select type" => "Tür seç",
-"Result: " => "Sonuç: ",
-" imported, " => " içe aktarıldı, ",
-" failed." => " hatalı.",
-"This is not your addressbook." => "Bu sizin adres defteriniz değil.",
-"Contact could not be found." => "Kişi bulunamadı.",
-"Work" => "İş",
-"Home" => "Ev",
-"Other" => "Diğer",
-"Mobile" => "Mobil",
-"Text" => "Metin",
-"Voice" => "Ses",
-"Message" => "mesaj",
-"Fax" => "Faks",
-"Video" => "Video",
-"Pager" => "Sayfalayıcı",
-"Internet" => "İnternet",
-"Birthday" => "Doğum günü",
-"Business" => "İş",
-"Call" => "Çağrı",
-"Clients" => "Müşteriler",
-"Deliverer" => "Dağıtıcı",
-"Holidays" => "Tatiller",
-"Ideas" => "Fikirler",
-"Journey" => "Seyahat",
-"Jubilee" => "Yıl Dönümü",
-"Meeting" => "Toplantı",
-"Personal" => "Kişisel",
-"Projects" => "Projeler",
-"Questions" => "Sorular",
-"{name}'s Birthday" => "{name}'nin Doğumgünü",
-"Contact" => "Kişi",
-"Add Contact" => "Kişi Ekle",
-"Import" => "İçe aktar",
-"Addressbooks" => "Adres defterleri",
-"Close" => "Kapat",
-"Keyboard shortcuts" => "Klavye kısayolları",
-"Navigation" => "Dolaşım",
-"Next contact in list" => "Listedeki sonraki kişi",
-"Previous contact in list" => "Listedeki önceki kişi",
-"Expand/collapse current addressbook" => "Şuanki adres defterini genişlet/daralt",
-"Actions" => "Eylemler",
-"Refresh contacts list" => "Kişi listesini tazele",
-"Add new contact" => "Yeni kişi ekle",
-"Add new addressbook" => "Yeni adres defteri ekle",
-"Delete current contact" => "Şuanki kişiyi sil",
-"Drop photo to upload" => "Fotoğrafı yüklenmesi için bırakın",
-"Delete current photo" => "Mevcut fotoğrafı sil",
-"Edit current photo" => "Mevcut fotoğrafı düzenle",
-"Upload new photo" => "Yeni fotoğraf yükle",
-"Select photo from ownCloud" => "ownCloud'dan bir fotoğraf seç",
-"Format custom, Short name, Full name, Reverse or Reverse with comma" => "Biçin özel, Kısa isim, Tam isim, Ters veya noktalı ters",
-"Edit name details" => "İsim detaylarını düzenle",
-"Organization" => "Organizasyon",
-"Delete" => "Sil",
-"Nickname" => "Takma ad",
-"Enter nickname" => "Takma adı girin",
-"Web site" => "Web sitesi",
-"http://www.somesite.com" => "http://www.somesite.com",
-"Go to web site" => "Web sitesine git",
-"dd-mm-yyyy" => "gg-aa-yyyy",
-"Groups" => "Gruplar",
-"Separate groups with commas" => "Grupları birbirinden virgülle ayırın",
-"Edit groups" => "Grupları düzenle",
-"Preferred" => "Tercih edilen",
-"Please specify a valid email address." => "Lütfen geçerli bir eposta adresi belirtin.",
-"Enter email address" => "Eposta adresini girin",
-"Mail to address" => "Eposta adresi",
-"Delete email address" => "Eposta adresini sil",
-"Enter phone number" => "Telefon numarasını gir",
-"Delete phone number" => "Telefon numarasını sil",
-"View on map" => "Haritada gör",
-"Edit address details" => "Adres detaylarını düzenle",
-"Add notes here." => "Notları buraya ekleyin.",
-"Add field" => "Alan ekle",
-"Phone" => "Telefon",
-"Email" => "Eposta",
-"Address" => "Adres",
-"Note" => "Not",
-"Download contact" => "Kişiyi indir",
-"Delete contact" => "Kişiyi sil",
-"The temporary image has been removed from cache." => "Geçici resim ön bellekten silinmiştir.",
-"Edit address" => "Adresi düzenle",
-"Type" => "Tür",
-"PO Box" => "Posta Kutusu",
-"Street address" => "Sokak adresi",
-"Street and number" => "Sokak ve Numara",
-"Extended" => "Uzatılmış",
-"Apartment number etc." => "Apartman numarası vb.",
-"City" => "Şehir",
-"Region" => "Bölge",
-"E.g. state or province" => "Örn. eyalet veya il",
-"Zipcode" => "Posta kodu",
-"Postal code" => "Posta kodu",
-"Country" => "Ülke",
-"Addressbook" => "Adres defteri",
-"Hon. prefixes" => "Kısaltmalar",
-"Miss" => "Bayan",
-"Ms" => "Bayan",
-"Mr" => "Bay",
-"Sir" => "Bay",
-"Mrs" => "Bayan",
-"Dr" => "Dr",
-"Given name" => "Verilen isim",
-"Additional names" => "İlave isimler",
-"Family name" => "Soyad",
-"Hon. suffixes" => "Kısaltmalar",
-"J.D." => "J.D.",
-"M.D." => "Dr.",
-"D.O." => "D.O.",
-"D.C." => "D.C.",
-"Ph.D." => "Dr.",
-"Esq." => "Esq.",
-"Jr." => "Jr.",
-"Sn." => "Sn.",
-"Import a contacts file" => "Bağlantı dosyasını içeri aktar",
-"Please choose the addressbook" => "Yeni adres defterini seç",
-"create a new addressbook" => "Yeni adres defteri oluştur",
-"Name of new addressbook" => "Yeni adres defteri için isim",
-"Importing contacts" => "Bağlantıları içe aktar",
-"Contacts imported successfully" => "Bağlantılar başarıyla içe aktarıldı",
-"Close Dialog" => "Diyaloğu kapat",
-"Import Addressbook" => "Adres defterini içeri aktar",
-"Select address book to import to:" => "İçe aktarılacak adres defterini seçin:",
-"Drop a VCF file to import contacts." => "Bağlantıları içe aktarmak için bir VCF dosyası bırakın.",
-"Select from HD" => "HD'den seç",
-"You have no contacts in your addressbook." => "Adres defterinizde hiç bağlantı yok.",
-"Add contact" => "Bağlatı ekle",
-"Select Address Books" => "Adres deftelerini seçiniz",
-"Enter name" => "İsim giriniz",
-"Enter description" => "Tanım giriniz",
-"CardDAV syncing addresses" => "CardDAV adresleri eşzamanlıyor",
-"more info" => "daha fazla bilgi",
-"Primary address (Kontact et al)" => "Birincil adres (Bağlantı ve arkadaşları)",
-"iOS/OS X" => "iOS/OS X",
-"Download" => "İndir",
-"Edit" => "Düzenle",
-"New Address Book" => "Yeni Adres Defteri",
-"Save" => "Kaydet",
-"Cancel" => "İptal"
-);
diff --git a/apps/contacts/l10n/uk.php b/apps/contacts/l10n/uk.php
deleted file mode 100644
index dcd9efff34..0000000000
--- a/apps/contacts/l10n/uk.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php $TRANSLATIONS = array(
-"At least one of the address fields has to be filled out." => "Має бути заповнено щонайменше одне поле.",
-"This is not your addressbook." => "Це не ваша адресна книга.",
-"Mobile" => "Мобільний",
-"Text" => "Текст",
-"Voice" => "Голос",
-"Fax" => "Факс",
-"Video" => "Відео",
-"Pager" => "Пейджер",
-"Birthday" => "День народження",
-"Add Contact" => "Додати контакт",
-"Organization" => "Організація",
-"Delete" => "Видалити",
-"Phone" => "Телефон",
-"Email" => "Ел.пошта",
-"Address" => "Адреса",
-"Delete contact" => "Видалити контакт",
-"Extended" => "Розширено",
-"City" => "Місто",
-"Zipcode" => "Поштовий індекс",
-"Country" => "Країна",
-"Download" => "Завантажити",
-"New Address Book" => "Нова адресна книга"
-);
diff --git a/apps/contacts/l10n/vi.php b/apps/contacts/l10n/vi.php
deleted file mode 100644
index d484fb405c..0000000000
--- a/apps/contacts/l10n/vi.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php $TRANSLATIONS = array(
-"id is not set." => "id không được thiết lập.",
-"No ID provided" => "Không có ID được cung cấp",
-"No address books found." => "Không tìm thấy sổ địa chỉ.",
-"No contacts found." => "Không tìm thấy danh sách",
-"element name is not set." => "tên phần tử không được thiết lập.",
-"Missing ID" => "Missing ID",
-"Error reading contact photo." => "Lỗi đọc liên lạc hình ảnh.",
-"The loading photo is not valid." => "Các hình ảnh tải không hợp lệ.",
-"File doesn't exist:" => "Tập tin không tồn tại",
-"Error loading image." => "Lỗi khi tải hình ảnh.",
-"Error uploading contacts to storage." => "Lỗi tải lên danh sách địa chỉ để lưu trữ.",
-"There is no error, the file uploaded with success" => "Không có lỗi, các tập tin tải lên thành công",
-"Contacts" => "Liên lạc",
-"Work" => "Công việc",
-"Home" => "Nhà",
-"Mobile" => "Di động",
-"Fax" => "Fax",
-"Video" => "Video",
-"Pager" => "số trang",
-"Birthday" => "Ngày sinh nhật",
-"Contact" => "Danh sách",
-"Add Contact" => "Thêm liên lạc",
-"Addressbooks" => "Sổ địa chỉ",
-"Organization" => "Tổ chức",
-"Delete" => "Xóa",
-"Phone" => "Điện thoại",
-"Email" => "Email",
-"Address" => "Địa chỉ",
-"Delete contact" => "Xóa liên lạc",
-"PO Box" => "Hòm thư bưu điện",
-"City" => "Thành phố",
-"Region" => "Vùng/miền",
-"Zipcode" => "Mã bưu điện",
-"Country" => "Quốc gia",
-"Addressbook" => "Sổ địa chỉ",
-"Download" => "Tải về",
-"Edit" => "Sửa",
-"Save" => "Lưu",
-"Cancel" => "Hủy"
-);
diff --git a/apps/contacts/l10n/xgettextfiles b/apps/contacts/l10n/xgettextfiles
deleted file mode 100644
index e291074fba..0000000000
--- a/apps/contacts/l10n/xgettextfiles
+++ /dev/null
@@ -1,18 +0,0 @@
-../appinfo/app.php
-../ajax/activation.php
-../ajax/addbook.php
-../ajax/addproperty.php
-../ajax/createaddressbook.php
-../ajax/deletebook.php
-../ajax/deleteproperty.php
-../ajax/contactdetails.php
-../ajax/saveproperty.php
-../ajax/updateaddressbook.php
-../lib/app.php
-../templates/index.php
-../templates/part.chooseaddressbook.php
-../templates/part.chooseaddressbook.rowfields.php
-../templates/part.editaddressbook.php
-../templates/part.property.php
-../templates/part.setpropertyform.php
-../templates/settings.php
diff --git a/apps/contacts/l10n/zh_CN.php b/apps/contacts/l10n/zh_CN.php
deleted file mode 100644
index b3bac7aedf..0000000000
--- a/apps/contacts/l10n/zh_CN.php
+++ /dev/null
@@ -1,158 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "(取消)激活地址簿错误。",
-"id is not set." => "没有设置 id。",
-"Cannot update addressbook with an empty name." => "无法使用一个空名称更新地址簿",
-"Error updating addressbook." => "更新地址簿错误",
-"No ID provided" => "未提供 ID",
-"Error setting checksum." => "设置校验值错误。",
-"No categories selected for deletion." => "未选中要删除的分类。",
-"No address books found." => "找不到地址簿。",
-"No contacts found." => "找不到联系人。",
-"There was an error adding the contact." => "添加联系人时出错。",
-"element name is not set." => "元素名称未设置",
-"Cannot add empty property." => "无法添加空属性。",
-"At least one of the address fields has to be filled out." => "至少需要填写一项地址。",
-"Trying to add duplicate property: " => "试图添加重复属性： ",
-"Information about vCard is incorrect. Please reload the page." => "vCard 的信息不正确。请重新加载页面。",
-"Missing ID" => "缺少 ID",
-"Error parsing VCard for ID: \"" => "无法解析如下ID的 VCard：“",
-"checksum is not set." => "未设置校验值。",
-"Information about vCard is incorrect. Please reload the page: " => "vCard 信息不正确。请刷新页面: ",
-"Something went FUBAR. " => "有一些信息无法被处理。",
-"No contact ID was submitted." => "未提交联系人 ID。",
-"Error reading contact photo." => "读取联系人照片错误。",
-"Error saving temporary file." => "保存临时文件错误。",
-"The loading photo is not valid." => "装入的照片不正确。",
-"Contact ID is missing." => "缺少联系人 ID。",
-"No photo path was submitted." => "未提供照片路径。",
-"File doesn't exist:" => "文件不存在:",
-"Error loading image." => "加载图片错误。",
-"Error getting contact object." => "获取联系人目标时出错。",
-"Error getting PHOTO property." => "获取照片属性时出错。",
-"Error saving contact." => "保存联系人时出错。",
-"Error resizing image" => "缩放图像时出错",
-"Error cropping image" => "裁切图像时出错",
-"Error creating temporary image" => "创建临时图像时出错",
-"Error finding image: " => "查找图像时出错: ",
-"Error uploading contacts to storage." => "上传联系人到存储空间时出错",
-"There is no error, the file uploaded with success" => "文件上传成功，没有错误发生",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "上传的文件长度超出了 php.ini 中 upload_max_filesize 的限制",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "上传的文件长度超出了 HTML 表单中 MAX_FILE_SIZE 的限制",
-"The uploaded file was only partially uploaded" => "已上传文件只上传了部分",
-"No file was uploaded" => "没有文件被上传",
-"Missing a temporary folder" => "缺少临时目录",
-"Couldn't save temporary image: " => "无法保存临时图像: ",
-"Couldn't load temporary image: " => "无法加载临时图像: ",
-"No file was uploaded. Unknown error" => "没有文件被上传。未知错误",
-"Contacts" => "联系人",
-"Sorry, this functionality has not been implemented yet" => "抱歉，这个功能暂时还没有被实现",
-"Not implemented" => "未实现",
-"Couldn't get a valid address." => "无法获取一个合法的地址。",
-"Error" => "错误",
-"This property has to be non-empty." => "这个属性必须是非空的",
-"Couldn't serialize elements." => "无法序列化元素",
-"'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "'deleteProperty' 调用时没有类型声明。请到 bugs.owncloud.org 汇报错误",
-"Edit name" => "编辑名称",
-"No files selected for upload." => "没有选择文件以上传",
-"The file you are trying to upload exceed the maximum size for file uploads on this server." => "您试图上传的文件超出了该服务器的最大文件限制",
-"Select type" => "选择类型",
-"Result: " => "结果: ",
-" imported, " => " 已导入， ",
-" failed." => " 失败。",
-"This is not your addressbook." => "这不是您的地址簿。",
-"Contact could not be found." => "无法找到联系人。",
-"Work" => "工作",
-"Home" => "家庭",
-"Mobile" => "移动电话",
-"Text" => "文本",
-"Voice" => "语音",
-"Message" => "消息",
-"Fax" => "传真",
-"Video" => "视频",
-"Pager" => "传呼机",
-"Internet" => "互联网",
-"Birthday" => "生日",
-"{name}'s Birthday" => "{name} 的生日",
-"Contact" => "联系人",
-"Add Contact" => "添加联系人",
-"Import" => "导入",
-"Addressbooks" => "地址簿",
-"Close" => "关闭",
-"Drop photo to upload" => "拖拽图片进行上传",
-"Delete current photo" => "删除当前照片",
-"Edit current photo" => "编辑当前照片",
-"Upload new photo" => "上传新照片",
-"Select photo from ownCloud" => "从 ownCloud 选择照片",
-"Format custom, Short name, Full name, Reverse or Reverse with comma" => "自定义格式，简称，全名，姓在前，姓在前并用逗号分割",
-"Edit name details" => "编辑名称详情",
-"Organization" => "组织",
-"Delete" => "删除",
-"Nickname" => "昵称",
-"Enter nickname" => "输入昵称",
-"dd-mm-yyyy" => "yyyy-mm-dd",
-"Groups" => "分组",
-"Separate groups with commas" => "用逗号隔开分组",
-"Edit groups" => "编辑分组",
-"Preferred" => "偏好",
-"Please specify a valid email address." => "请指定合法的电子邮件地址",
-"Enter email address" => "输入电子邮件地址",
-"Mail to address" => "发送邮件到地址",
-"Delete email address" => "删除电子邮件地址",
-"Enter phone number" => "输入电话号码",
-"Delete phone number" => "删除电话号码",
-"View on map" => "在地图上显示",
-"Edit address details" => "编辑地址细节。",
-"Add notes here." => "添加注释。",
-"Add field" => "添加字段",
-"Phone" => "电话",
-"Email" => "电子邮件",
-"Address" => "地址",
-"Note" => "注释",
-"Download contact" => "下载联系人",
-"Delete contact" => "删除联系人",
-"The temporary image has been removed from cache." => "临时图像文件已从缓存中删除",
-"Edit address" => "编辑地址",
-"Type" => "类型",
-"PO Box" => "邮箱",
-"Extended" => "扩展",
-"City" => "城市",
-"Region" => "地区",
-"Zipcode" => "邮编",
-"Country" => "国家",
-"Addressbook" => "地址簿",
-"Hon. prefixes" => "名誉字首",
-"Miss" => "小姐",
-"Ms" => "女士",
-"Mr" => "先生",
-"Sir" => "先生",
-"Mrs" => "夫人",
-"Dr" => "博士",
-"Given name" => "名",
-"Additional names" => "其他名称",
-"Family name" => "姓",
-"Hon. suffixes" => "名誉后缀",
-"J.D." => "法律博士",
-"M.D." => "医学博士",
-"D.O." => "骨科医学博士",
-"D.C." => "教育学博士",
-"Ph.D." => "哲学博士",
-"Esq." => "先生",
-"Jr." => "小",
-"Sn." => "老",
-"Import a contacts file" => "导入联系人文件",
-"Please choose the addressbook" => "请选择地址簿",
-"create a new addressbook" => "创建新地址簿",
-"Name of new addressbook" => "新地址簿名称",
-"Importing contacts" => "导入联系人",
-"You have no contacts in your addressbook." => "您的地址簿中没有联系人。",
-"Add contact" => "添加联系人",
-"CardDAV syncing addresses" => "CardDAV 同步地址",
-"more info" => "更多信息",
-"Primary address (Kontact et al)" => "首选地址 (Kontact 等)",
-"iOS/OS X" => "iOS/OS X",
-"Download" => "下载",
-"Edit" => "编辑",
-"New Address Book" => "新建地址簿",
-"Save" => "保存",
-"Cancel" => "取消"
-);
diff --git a/apps/contacts/l10n/zh_TW.php b/apps/contacts/l10n/zh_TW.php
deleted file mode 100644
index 0d007ef9c8..0000000000
--- a/apps/contacts/l10n/zh_TW.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "在啟用或關閉電話簿時發生錯誤",
-"Error updating addressbook." => "電話簿更新中發生錯誤",
-"No ID provided" => "未提供 ID",
-"No contacts found." => "沒有找到聯絡人",
-"There was an error adding the contact." => "添加通訊錄發生錯誤",
-"Cannot add empty property." => "不可添加空白內容",
-"At least one of the address fields has to be filled out." => "至少必須填寫一欄地址",
-"Error adding contact property." => "添加通訊錄內容中發生錯誤",
-"No ID provided" => "未提供 ID",
-"Error adding addressbook." => "添加電話簿中發生錯誤",
-"Error activating addressbook." => "啟用電話簿中發生錯誤",
-"Information about vCard is incorrect. Please reload the page." => "有關 vCard 的資訊不正確，請重新載入此頁。",
-"Missing ID" => "遺失ID",
-"No file was uploaded" => "沒有已上傳的檔案",
-"Contacts" => "通訊錄",
-"This is not your addressbook." => "這不是你的電話簿",
-"Contact could not be found." => "通訊錄未發現",
-"Work" => "公司",
-"Home" => "住宅",
-"Mobile" => "行動電話",
-"Text" => "文字",
-"Voice" => "語音",
-"Message" => "訊息",
-"Fax" => "傳真",
-"Video" => "影片",
-"Pager" => "呼叫器",
-"Internet" => "網際網路",
-"Birthday" => "生日",
-"{name}'s Birthday" => "{name}的生日",
-"Contact" => "通訊錄",
-"Add Contact" => "添加通訊錄",
-"Addressbooks" => "電話簿",
-"Edit name details" => "編輯姓名詳細資訊",
-"Organization" => "組織",
-"Delete" => "刪除",
-"Nickname" => "綽號",
-"Enter nickname" => "輸入綽號",
-"dd-mm-yyyy" => "dd-mm-yyyy",
-"Groups" => "群組",
-"Separate groups with commas" => "用逗號分隔群組",
-"Edit groups" => "編輯群組",
-"Preferred" => "首選",
-"Please specify a valid email address." => "註填入合法的電子郵件住址",
-"Enter email address" => "輸入電子郵件地址",
-"Mail to address" => "寄送住址",
-"Delete email address" => "刪除電子郵件住址",
-"Enter phone number" => "輸入電話號碼",
-"Delete phone number" => "刪除電話號碼",
-"Edit address details" => "電子郵件住址詳細資訊",
-"Add notes here." => "在這裡新增註解",
-"Add field" => "新增欄位",
-"Phone" => "電話",
-"Email" => "電子郵件",
-"Address" => "地址",
-"Note" => "註解",
-"Download contact" => "下載通訊錄",
-"Delete contact" => "刪除通訊錄",
-"Type" => "類型",
-"PO Box" => "通訊地址",
-"Extended" => "分機",
-"City" => "城市",
-"Region" => "地區",
-"Zipcode" => "郵遞區號",
-"Country" => "國家",
-"Addressbook" => "電話簿",
-"Mr" => "先生",
-"Sir" => "先生",
-"Mrs" => "小姐",
-"Dr" => "博士（醫生）",
-"Given name" => "給定名（名）",
-"Additional names" => "額外名",
-"Family name" => "家族名（姓）",
-"Download" => "下載",
-"Edit" => "編輯",
-"New Address Book" => "新電話簿",
-"Save" => "儲存",
-"Cancel" => "取消"
-);
diff --git a/apps/contacts/lib/addressbook.php b/apps/contacts/lib/addressbook.php
deleted file mode 100644
index b487260d32..0000000000
--- a/apps/contacts/lib/addressbook.php
+++ /dev/null
@@ -1,341 +0,0 @@
-<?php
-/**
- * ownCloud - Addressbook
- *
- * @author Jakob Sack
- * @copyright 2011 Jakob Sack mail@jakobsack.de
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *
- * You should have received a copy of the GNU Affero General Public
- * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-/*
- *
- * The following SQL statement is just a help for developers and will not be
- * executed!
- *
- * CREATE TABLE contacts_addressbooks (
- * id INT(11) UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
- * userid VARCHAR(255) NOT NULL,
- * displayname VARCHAR(255),
- * uri VARCHAR(100),
- * description TEXT,
- * ctag INT(11) UNSIGNED NOT NULL DEFAULT '1'
- * );
- *
- */
-/**
- * This class manages our addressbooks.
- */
-class OC_Contacts_Addressbook {
-	/**
-	 * @brief Returns the list of addressbooks for a specific user.
-	 * @param string $uid
-	 * @param boolean $active Only return addressbooks with this $active state, default(=false) is don't care
-	 * @return array or false.
-	 */
-	public static function all($uid, $active=false) {
-		$values = array($uid);
-		$active_where = '';
-		if ($active) {
-			$active_where = ' AND `active` = ?';
-			$values[] = 1;
-		}
-		try {
-			$stmt = OCP\DB::prepare( 'SELECT * FROM `*PREFIX*contacts_addressbooks` WHERE `userid` = ? ' . $active_where . ' ORDER BY `displayname`' );
-			$result = $stmt->execute($values);
-		} catch(Exception $e) {
-			OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.' exception: '.$e->getMessage(), OCP\Util::ERROR);
-			OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.' uid: '.$uid, OCP\Util::DEBUG);
-			return false;
-		}
-
-		$addressbooks = array();
-		while( $row = $result->fetchRow()) {
-			$addressbooks[] = $row;
-		}
-		$addressbooks = array_merge($addressbooks, OCP\Share::getItemsSharedWith('addressbook', OC_Share_Backend_Addressbook::FORMAT_ADDRESSBOOKS));
-		if(!$active && !count($addressbooks)) {
-			$id = self::addDefault($uid);
-			return array(self::find($id),);
-		}
-		return $addressbooks;
-	}
-
-	/**
-	 * @brief Get active addressbook IDs for a user.
-	 * @param integer $uid User id. If null current user will be used.
-	 * @return array
-	 */
-	public static function activeIds($uid = null) {
-		if(is_null($uid)) {
-			$uid = OCP\USER::getUser();
-		}
-		$activeaddressbooks = self::all($uid, true);
-		$ids = array();
-		foreach($activeaddressbooks as $addressbook) {
-			$ids[] = $addressbook['id'];
-		}
-		return $ids;
-	}
-
-	/**
-	 * @brief Returns the list of active addressbooks for a specific user.
-	 * @param string $uid
-	 * @return array
-	 */
-	public static function active($uid) {
-		return self::all($uid, true);
-	}
-
-	/**
-	 * @brief Returns the list of addressbooks for a principal (DAV term of user)
-	 * @param string $principaluri
-	 * @return array
-	 */
-	public static function allWherePrincipalURIIs($principaluri){
-		$uid = self::extractUserID($principaluri);
-		return self::all($uid);
-	}
-
-	/**
-	 * @brief Gets the data of one address book
-	 * @param integer $id
-	 * @return associative array or false.
-	 */
-	public static function find($id) {
-		try {
-			$stmt = OCP\DB::prepare( 'SELECT * FROM `*PREFIX*contacts_addressbooks` WHERE `id` = ?' );
-			$result = $stmt->execute(array($id));
-			return $result->fetchRow();
-		} catch(Exception $e) {
-			OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.', exception: '.$e->getMessage(), OCP\Util::ERROR);
-			OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.', id: '.$id, OCP\Util::DEBUG);
-			return false;
-		}
-
-		return $result->fetchRow();
-	}
-
-	/**
-	 * @brief Adds default address book
-	 * @return $id ID of the newly created addressbook or false on error.
-	 */
-	public static function addDefault($uid = null) {
-		if(is_null($uid)) {
-			$uid = OCP\USER::getUser();
-		}
-		$id = self::add($uid, 'Contacts', 'Default Address Book');
-		if($id !== false) {
-			self::setActive($id, true);
-		}
-		return $id;
-	}
-
-	/**
-	 * @brief Creates a new address book
-	 * @param string $userid
-	 * @param string $name
-	 * @param string $description
-	 * @return insertid
-	 */
-	public static function add($uid,$name,$description='') {
-		try {
-			$stmt = OCP\DB::prepare( 'SELECT `uri` FROM `*PREFIX*contacts_addressbooks` WHERE `userid` = ? ' );
-			$result = $stmt->execute(array($uid));
-		} catch(Exception $e) {
-			OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.' exception: '.$e->getMessage(), OCP\Util::ERROR);
-			OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.' uid: '.$uid, OCP\Util::DEBUG);
-			return false;
-		}
-		$uris = array();
-		while($row = $result->fetchRow()){
-			$uris[] = $row['uri'];
-		}
-
-		$uri = self::createURI($name, $uris );
-		try {
-			$stmt = OCP\DB::prepare( 'INSERT INTO `*PREFIX*contacts_addressbooks` (`userid`,`displayname`,`uri`,`description`,`ctag`) VALUES(?,?,?,?,?)' );
-			$result = $stmt->execute(array($uid,$name,$uri,$description,1));
-		} catch(Exception $e) {
-			OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.', exception: '.$e->getMessage(), OCP\Util::ERROR);
-			OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.', uid: '.$uid, OCP\Util::DEBUG);
-			return false;
-		}
-
-		return OCP\DB::insertid('*PREFIX*contacts_addressbooks');
-	}
-
-	/**
-	 * @brief Creates a new address book from the data sabredav provides
-	 * @param string $principaluri
-	 * @param string $uri
-	 * @param string $name
-	 * @param string $description
-	 * @return insertid or false
-	 */
-	public static function addFromDAVData($principaluri,$uri,$name,$description) {
-		$uid = self::extractUserID($principaluri);
-
-		try {
-			$stmt = OCP\DB::prepare('INSERT INTO `*PREFIX*contacts_addressbooks` (`userid`,`displayname`,`uri`,`description`,`ctag`) VALUES(?,?,?,?,?)');
-			$result = $stmt->execute(array($uid,$name,$uri,$description,1));
-		} catch(Exception $e) {
-			OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.', exception: '.$e->getMessage(), OCP\Util::ERROR);
-			OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.', uid: '.$uid, OCP\Util::DEBUG);
-			OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.', uri: '.$uri, OCP\Util::DEBUG);
-			return false;
-		}
-
-		return OCP\DB::insertid('*PREFIX*contacts_addressbooks');
-	}
-
-	/**
-	 * @brief Edits an addressbook
-	 * @param integer $id
-	 * @param string $name
-	 * @param string $description
-	 * @return boolean
-	 */
-	public static function edit($id,$name,$description) {
-		// Need these ones for checking uri
-		$addressbook = self::find($id);
-		if ($addressbook['userid'] != OCP\User::getUser()) {
-			$sharedAddressbook = OCP\Share::getItemSharedWithBySource('addressbook', $id);
-			if (!$sharedAddressbook || !($sharedAddressbook['permissions'] & OCP\Share::PERMISSION_UPDATE)) {
-				return false;
-			}
-		}
-		if(is_null($name)) {
-			$name = $addressbook['name'];
-		}
-		if(is_null($description)) {
-			$description = $addressbook['description'];
-		}
-
-		try {
-			$stmt = OCP\DB::prepare('UPDATE `*PREFIX*contacts_addressbooks` SET `displayname`=?,`description`=?, `ctag`=`ctag`+1 WHERE `id`=?');
-			$result = $stmt->execute(array($name,$description,$id));
-		} catch(Exception $e) {
-			OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.', exception: '.$e->getMessage(), OCP\Util::ERROR);
-			OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.', id: '.$id, OCP\Util::DEBUG);
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * @brief Activates an addressbook
-	 * @param integer $id
-	 * @param boolean $active
-	 * @return boolean
-	 */
-	public static function setActive($id,$active) {
-		$sql = 'UPDATE `*PREFIX*contacts_addressbooks` SET `active` = ? WHERE `id` = ?';
-		OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.', id: '.$id.', active: '.intval($active), OCP\Util::ERROR);
-		try {
-			$stmt = OCP\DB::prepare($sql);
-			$stmt->execute(array(intval($active), $id));
-			return true;
-		} catch(Exception $e) {
-			OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.', exception for '.$id.': '.$e->getMessage(), OCP\Util::ERROR);
-			return false;
-		}
-	}
-
-	/**
-	 * @brief Checks if an addressbook is active.
-	 * @param integer $id ID of the address book.
-	 * @return boolean
-	 */
-	public static function isActive($id) {
-		$sql = 'SELECT `active` FROM `*PREFIX*contacts_addressbooks` WHERE `id` = ?';
-		try {
-			$stmt = OCP\DB::prepare( $sql );
-			$result = $stmt->execute(array($id));
-			$row = $result->fetchRow();
-			return (bool)$row['active'];
-		} catch(Exception $e) {
-			OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.', exception: '.$e->getMessage(), OCP\Util::ERROR);
-		}
-	}
-
-	/**
-	 * @brief removes an address book
-	 * @param integer $id
-	 * @return boolean
-	 */
-	public static function delete($id) {
-		$addressbook = self::find($id);
-		if ($addressbook['userid'] != OCP\User::getUser()) {
-			$sharedAddressbook = OCP\Share::getItemSharedWithBySource('addressbook', $id);
-			if (!$sharedAddressbook || !($sharedAddressbook['permissions'] & OCP\Share::PERMISSION_DELETE)) {
-				return false;
-			}
-		}
-		self::setActive($id, false);
-		try {
-			$stmt = OCP\DB::prepare( 'DELETE FROM `*PREFIX*contacts_addressbooks` WHERE `id` = ?' );
-			$stmt->execute(array($id));
-		} catch(Exception $e) {
-			OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.', exception for '.$id.': '.$e->getMessage(), OCP\Util::ERROR);
-			return false;
-		}
-
-		$cards = OC_Contacts_VCard::all($id);
-		foreach($cards as $card){
-			OC_Contacts_VCard::delete($card['id']);
-		}
-
-		return true;
-	}
-
-	/**
-	 * @brief Updates ctag for addressbook
-	 * @param integer $id
-	 * @return boolean
-	 */
-	public static function touch($id) {
-		$stmt = OCP\DB::prepare( 'UPDATE `*PREFIX*contacts_addressbooks` SET `ctag` = `ctag` + 1 WHERE `id` = ?' );
-		$stmt->execute(array($id));
-
-		return true;
-	}
-
-	/**
-	 * @brief Creates a URI for Addressbook
-	 * @param string $name name of the addressbook
-	 * @param array  $existing existing addressbook URIs
-	 * @return string new name
-	 */
-	public static function createURI($name,$existing) {
-		$name = str_replace(' ', '_', strtolower($name));
-		$newname = $name;
-		$i = 1;
-		while(in_array($newname, $existing)) {
-			$newname = $name.$i;
-			$i = $i + 1;
-		}
-		return $newname;
-	}
-
-	/**
-	 * @brief gets the userid from a principal path
-	 * @return string
-	 */
-	public static function extractUserID($principaluri) {
-		list($prefix, $userid) = Sabre_DAV_URLUtil::splitPath($principaluri);
-		return $userid;
-	}
-}
diff --git a/apps/contacts/lib/app.php b/apps/contacts/lib/app.php
deleted file mode 100644
index e8e1937404..0000000000
--- a/apps/contacts/lib/app.php
+++ /dev/null
@@ -1,331 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011 Bart Visscher bartv@thisnet.nl
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-/**
- * This class manages our app actions
- */
-OC_Contacts_App::$l10n = OC_L10N::get('contacts');
-class OC_Contacts_App {
-	/*
-	 * @brief language object for calendar app
-	 */
-
-	public static $l10n;
-	/*
-	 * @brief categories of the user
-	 */
-	public static $categories = null;
-
-	public static function getAddressbook($id) {
-		// TODO: Throw an exception instead of returning json.
-		$addressbook = OC_Contacts_Addressbook::find( $id );
-		if($addressbook === false || $addressbook['userid'] != OCP\USER::getUser()) {
-			if ($addressbook === false) {
-				OCP\Util::writeLog('contacts',
-					'Addressbook not found: '. $id,
-					OCP\Util::ERROR);
-				//throw new Exception('Addressbook not found: '. $id);
-				OCP\JSON::error(
-					array(
-						'data' => array(
-							'message' => self::$l10n->t('Addressbook not found: ' . $id)
-						)
-					)
-				);
-			} else {
-				$sharedAddressbook = OCP\Share::getItemSharedWithBySource('addressbook', $id, OC_Share_Backend_Addressbook::FORMAT_ADDRESSBOOKS);
-				if ($sharedAddressbook) {
-					return $sharedAddressbook;
-				} else {
-					OCP\Util::writeLog('contacts',
-						'Addressbook('.$id.') is not from '.OCP\USER::getUser(),
-						OCP\Util::ERROR);
-					//throw new Exception('This is not your addressbook.');
-					OCP\JSON::error(
-						array(
-							'data' => array(
-								'message' => self::$l10n->t('This is not your addressbook.')
-							)
-						)
-					);
-				}
-			}
-		}
-		return $addressbook;
-	}
-
-	public static function getContactObject($id) {
-		$card = OC_Contacts_VCard::find( $id );
-		if( $card === false ) {
-			OCP\Util::writeLog('contacts',
-				'Contact could not be found: '.$id,
-				OCP\Util::ERROR);
-			OCP\JSON::error(
-				array(
-					'data' => array(
-						'message' => self::$l10n->t('Contact could not be found.')
-							.' '.print_r($id, true)
-					)
-				)
-			);
-			exit();
-		}
-
-		self::getAddressbook( $card['addressbookid'] );//access check
-		return $card;
-	}
-
-	/**
-	 * @brief Gets the VCard as an OC_VObject
-	 * @returns The card or null if the card could not be parsed.
-	 */
-	public static function getContactVCard($id) {
-		$card = self::getContactObject( $id );
-
-		$vcard = OC_VObject::parse($card['carddata']);
-		if (!is_null($vcard) && !isset($vcard->REV)) {
-			$rev = new DateTime('@'.$card['lastmodified']);
-			$vcard->setString('REV', $rev->format(DateTime::W3C));
-		}
-		return $vcard;
-	}
-
-	public static function getPropertyLineByChecksum($vcard, $checksum) {
-		$line = null;
-		for($i=0;$i<count($vcard->children);$i++) {
-			if(md5($vcard->children[$i]->serialize()) == $checksum ) {
-				$line = $i;
-				break;
-			}
-		}
-		return $line;
-	}
-
-	/**
-	 * @return array of vcard prop => label
-	 */
-	public static function getIMOptions($im = null) {
-		$l10n = self::$l10n;
-		$ims = array(
-				'jabber' => array(
-					'displayname' => (string)$l10n->t('Jabber'),
-					'xname' => 'X-JABBER',
-					'protocol' => 'xmpp',
-				),
-				'aim' => array(
-					'displayname' => (string)$l10n->t('AIM'),
-					'xname' => 'X-AIM',
-					'protocol' => 'aim',
-				),
-				'msn' => array(
-					'displayname' => (string)$l10n->t('MSN'),
-					'xname' => 'X-MSN',
-					'protocol' => 'msn',
-				),
-				'twitter' => array(
-					'displayname' => (string)$l10n->t('Twitter'),
-					'xname' => 'X-TWITTER',
-					'protocol' => null,
-				),
-				'googletalk' => array(
-					'displayname' => (string)$l10n->t('GoogleTalk'),
-					'xname' => null,
-					'protocol' => 'xmpp',
-				),
-				'facebook' => array(
-					'displayname' => (string)$l10n->t('Facebook'),
-					'xname' => null,
-					'protocol' => 'xmpp',
-				),
-				'xmpp' => array(
-					'displayname' => (string)$l10n->t('XMPP'),
-					'xname' => null,
-					'protocol' => 'xmpp',
-				),
-				'icq' => array(
-					'displayname' => (string)$l10n->t('ICQ'),
-					'xname' => 'X-ICQ',
-					'protocol' => 'icq',
-				),
-				'yahoo' => array(
-					'displayname' => (string)$l10n->t('Yahoo'),
-					'xname' => 'X-YAHOO',
-					'protocol' => 'ymsgr',
-				),
-				'skype' => array(
-					'displayname' => (string)$l10n->t('Skype'),
-					'xname' => 'X-SKYPE',
-					'protocol' => 'skype',
-				),
-				'qq' => array(
-					'displayname' => (string)$l10n->t('QQ'),
-					'xname' => 'X-SKYPE',
-					'protocol' => 'x-apple',
-				),
-				'gadugadu' => array(
-					'displayname' => (string)$l10n->t('GaduGadu'),
-					'xname' => 'X-SKYPE',
-					'protocol' => 'x-apple',
-				),
-		);
-		if(is_null($im)) {
-			return $ims;
-		} else {
-			$ims['ymsgr'] = $ims['yahoo'];
-			$ims['gtalk'] = $ims['googletalk'];
-			return isset($ims[$im]) ? $ims[$im] : null;
-		}
-	}
-
-	/**
-	 * @return types for property $prop
-	 */
-	public static function getTypesOfProperty($prop) {
-		$l = self::$l10n;
-		switch($prop) {
-			case 'ADR':
-			case 'IMPP':
-				return array(
-					'WORK' => $l->t('Work'),
-					'HOME' => $l->t('Home'),
-					'OTHER' =>  $l->t('Other'),
-				);
-			case 'TEL':
-				return array(
-					'HOME'  =>  $l->t('Home'),
-					'CELL'  =>  $l->t('Mobile'),
-					'WORK'  =>  $l->t('Work'),
-					'TEXT'  =>  $l->t('Text'),
-					'VOICE' =>  $l->t('Voice'),
-					'MSG'   =>  $l->t('Message'),
-					'FAX'   =>  $l->t('Fax'),
-					'VIDEO' =>  $l->t('Video'),
-					'PAGER' =>  $l->t('Pager'),
-					'OTHER' =>  $l->t('Other'),
-				);
-			case 'EMAIL':
-				return array(
-					'WORK' => $l->t('Work'),
-					'HOME' => $l->t('Home'),
-					'INTERNET' => $l->t('Internet'),
-				);
-		}
-	}
-
-	/**
-	 * @brief returns the vcategories object of the user
-	 * @return (object) $vcategories
-	 */
-	protected static function getVCategories() {
-		if (is_null(self::$categories)) {
-			self::$categories = new OC_VCategories('contacts',
-				null,
-				self::getDefaultCategories());
-		}
-		return self::$categories;
-	}
-
-	/**
-	 * @brief returns the categories for the user
-	 * @return (Array) $categories
-	 */
-	public static function getCategories() {
-		$categories = self::getVCategories()->categories();
-		if(count($categories) == 0) {
-			self::scanCategories();
-			$categories = self::$categories->categories();
-		}
-		return ($categories ? $categories : self::getDefaultCategories());
-	}
-
-	/**
-	 * @brief returns the default categories of ownCloud
-	 * @return (array) $categories
-	 */
-	public static function getDefaultCategories(){
-		return array(
-			(string)self::$l10n->t('Birthday'),
-			(string)self::$l10n->t('Business'),
-			(string)self::$l10n->t('Call'),
-			(string)self::$l10n->t('Clients'),
-			(string)self::$l10n->t('Deliverer'),
-			(string)self::$l10n->t('Holidays'),
-			(string)self::$l10n->t('Ideas'),
-			(string)self::$l10n->t('Journey'),
-			(string)self::$l10n->t('Jubilee'),
-			(string)self::$l10n->t('Meeting'),
-			(string)self::$l10n->t('Other'),
-			(string)self::$l10n->t('Personal'),
-			(string)self::$l10n->t('Projects'),
-			(string)self::$l10n->t('Questions'),
-			(string)self::$l10n->t('Work'),
-		);
-	}
-
-	/**
-	 * scan vcards for categories.
-	 * @param $vccontacts VCards to scan. null to check all vcards for the current user.
-	 */
-	public static function scanCategories($vccontacts = null) {
-		if (is_null($vccontacts)) {
-			$vcaddressbooks = OC_Contacts_Addressbook::all(OCP\USER::getUser());
-			if(count($vcaddressbooks) > 0) {
-				$vcaddressbookids = array();
-				foreach($vcaddressbooks as $vcaddressbook) {
-					$vcaddressbookids[] = $vcaddressbook['id'];
-				}
-				$start = 0;
-				$batchsize = 10;
-				while($vccontacts =
-					OC_Contacts_VCard::all($vcaddressbookids, $start, $batchsize)) {
-					$cards = array();
-					foreach($vccontacts as $vccontact) {
-						$cards[] = $vccontact['carddata'];
-					}
-					OCP\Util::writeLog('contacts',
-						__CLASS__.'::'.__METHOD__
-							.', scanning: '.$batchsize.' starting from '.$start,
-						OCP\Util::DEBUG);
-					// only reset on first batch.
-					self::getVCategories()->rescan($cards,
-						true,
-						($start == 0 ? true : false));
-					$start += $batchsize;
-				}
-			}
-		}
-	}
-
-	/**
-	 * check VCard for new categories.
-	 * @see OC_VCategories::loadFromVObject
-	 */
-	public static function loadCategoriesFromVCard(OC_VObject $contact) {
-		self::getVCategories()->loadFromVObject($contact, true);
-	}
-
-	/**
-	 * @brief Get the last modification time.
-	 * @param $vcard OC_VObject
-	 * $return DateTime | null
-	 */
-	public static function lastModified($vcard) {
-		$rev = $vcard->getAsString('REV');
-		if ($rev) {
-			return DateTime::createFromFormat(DateTime::W3C, $rev);
-		}
-	}
-
-	public static function setLastModifiedHeader($contact) {
-		$rev = $contact->getAsString('REV');
-		if ($rev) {
-			$rev = DateTime::createFromFormat(DateTime::W3C, $rev);
-			OCP\Response::setLastModifiedHeader($rev);
-		}
-	}
-}
diff --git a/apps/contacts/lib/hooks.php b/apps/contacts/lib/hooks.php
deleted file mode 100644
index 8b7adc60f2..0000000000
--- a/apps/contacts/lib/hooks.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-/**
- * ownCloud - Addressbook
- *
- * @author Jakob Sack
- * @copyright 2011 Jakob Sack mail@jakobsack.de
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *
- * You should have received a copy of the GNU Affero General Public
- * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-/**
- * The following signals are being emitted:
- * 
- * OC_Contacts_VCard::post_moveToAddressbook(array('aid' => $aid, 'id' => $id))
- * OC_Contacts_VCard::pre_deleteVCard(array('aid' => $aid, 'id' => $id, 'uri' = $uri)); (NOTE: the values can be null depending on which method emits them)
- * OC_Contacts_VCard::post_updateVCard($id)
- * OC_Contacts_VCard::post_createVCard($newid)
- */
-
-/**
- * This class contains all hooks.
- */
-class OC_Contacts_Hooks{
-	/**
-	 * @brief Add default Addressbook for a certain user
-	 * @param paramters parameters from postCreateUser-Hook
-	 * @return array
-	 */
-	static public function createUser($parameters) {
-		OC_Contacts_Addressbook::addDefault($parameters['uid']);
-		return true;
-	}
-
-	/**
-	 * @brief Deletes all Addressbooks of a certain user
-	 * @param paramters parameters from postDeleteUser-Hook
-	 * @return array
-	 */
-	static public function deleteUser($parameters) {
-		$addressbooks = OC_Contacts_Addressbook::all($parameters['uid']);
-
-		foreach($addressbooks as $addressbook) {
-			OC_Contacts_Addressbook::delete($addressbook['id']);
-		}
-
-		return true;
-	}
-
-	static public function getCalenderSources($parameters) {
-		$base_url = OCP\Util::linkTo('calendar', 'ajax/events.php').'?calendar_id=';
-		foreach(OC_Contacts_Addressbook::all(OCP\USER::getUser()) as $addressbook) {
-			$parameters['sources'][] 
-				= array(
-					'url' => $base_url.'birthday_'. $addressbook['id'],
-					'backgroundColor' => '#cccccc',
-					'borderColor' => '#888',
-					'textColor' => 'black',
-					'cache' => true,
-					'editable' => false,
-				);
-		}
-	}
-
-	static public function getBirthdayEvents($parameters) {
-		$name = $parameters['calendar_id'];
-		if (strpos($name, 'birthday_') != 0) {
-			return;
-		}
-		$info = explode('_', $name);
-		$aid = $info[1];
-		OC_Contacts_App::getAddressbook($aid);
-		foreach(OC_Contacts_VCard::all($aid) as $card){
-			$vcard = OC_VObject::parse($card['carddata']);
-			if (!$vcard) {
-				continue;
-			}
-			$birthday = $vcard->BDAY;
-			if ($birthday) {
-				$date = new DateTime($birthday);
-				$vevent = new OC_VObject('VEVENT');
-				//$vevent->setDateTime('LAST-MODIFIED', new DateTime($vcard->REV));
-				$vevent->setDateTime('DTSTART', $date, 
-					Sabre_VObject_Element_DateTime::DATE);
-				$vevent->setString('DURATION', 'P1D');
-				$vevent->setString('UID', substr(md5(rand().time()), 0, 10));
-				// DESCRIPTION?
-				$vevent->setString('RRULE', 'FREQ=YEARLY');
-				$title = str_replace('{name}',
-					$vcard->getAsString('FN'), 
-					OC_Contacts_App::$l10n->t('{name}\'s Birthday'));
-				$parameters['events'][] = array(
-					'id' => 0,//$card['id'],
-					'vevent' => $vevent,
-					'repeating' => true,
-					'summary' => $title,
-					'calendardata' => "BEGIN:VCALENDAR\nVERSION:2.0\n"
-						. "PRODID:ownCloud Contacts " 
-						. OCP\App::getAppVersion('contacts') . "\n" 
-						. $vevent->serialize() .  "END:VCALENDAR"
-					);
-			}
-		}
-	}
-}
diff --git a/apps/contacts/lib/sabre/addressbook.php b/apps/contacts/lib/sabre/addressbook.php
deleted file mode 100644
index e9eb77472b..0000000000
--- a/apps/contacts/lib/sabre/addressbook.php
+++ /dev/null
@@ -1,128 +0,0 @@
-<?php
-/**
- * ownCloud - Addressbook
- *
- * @author Thomas Tanghus
- * @copyright 2012 Thomas Tanghus (thomas@tanghus.net)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *
- * You should have received a copy of the GNU Affero General Public
- * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-/**
- * This class overrides __construct to get access to $addressBookInfo and
- * $carddavBackend, Sabre_CardDAV_AddressBook::getACL() to return read/write
- * permissions based on user and shared state and it overrides
- * Sabre_CardDAV_AddressBook::getChild() and Sabre_CardDAV_AddressBook::getChildren()
- * to instantiate OC_Connector_Sabre_CardDAV_Cards.
-*/
-class OC_Connector_Sabre_CardDAV_AddressBook extends Sabre_CardDAV_AddressBook {
-
-	/**
-	* CardDAV backend
-	*
-	* @var Sabre_CardDAV_Backend_Abstract
-	*/
-	private $carddavBackend;
-
-	/**
-	* Constructor
-	*
-	* @param Sabre_CardDAV_Backend_Abstract $carddavBackend
-	* @param array $addressBookInfo
-	*/
-	public function __construct(
-		Sabre_CardDAV_Backend_Abstract $carddavBackend,
-		array $addressBookInfo) {
-
-		$this->carddavBackend = $carddavBackend;
-		$this->addressBookInfo = $addressBookInfo;
-		parent::__construct($carddavBackend, $addressBookInfo);
-
-	}
-
-	/**
-	* Returns a list of ACE's for this node.
-	*
-	* Each ACE has the following properties:
-	*   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
-	*     currently the only supported privileges
-	*   * 'principal', a url to the principal who owns the node
-	*   * 'protected' (optional), indicating that this ACE is not allowed to
-	*      be updated.
-	*
-	* @return array
-	*/
-	public function getACL() {
-
-		$readprincipal = $this->getOwner();
-		$writeprincipal = $this->getOwner();
-		$uid = OC_Contacts_Addressbook::extractUserID($this->getOwner());
-
-		if($uid != OCP\USER::getUser()) {
-			$sharedAddressbook = OCP\Share::getItemSharedWithBySource('addressbook', $this->addressBookInfo['id']);
-			if ($sharedAddressbook && ($sharedAddressbook['permissions'] & OCP\Share::PERMISSION_READ)) {
-				$readprincipal = 'principals/' . OCP\USER::getUser();
-			}
-			if ($sharedAddressbook && ($sharedAddressbook['permissions'] & OCP\Share::PERMISSION_UPDATE)) {
-				$writeprincipal = 'principals/' . OCP\USER::getUser();
-			}
-		}
-
-		return array(
-			array(
-				'privilege' => '{DAV:}read',
-				'principal' => $readprincipal,
-				'protected' => true,
-			),
-			array(
-				'privilege' => '{DAV:}write',
-				'principal' => $writeprincipal,
-				'protected' => true,
-			),
-
-		);
-
-	}
-
-	/**
-	* Returns a card
-	*
-	* @param string $name
-	* @return OC_Connector_Sabre_DAV_Card
-	*/
-	public function getChild($name) {
-
-		$obj = $this->carddavBackend->getCard($this->addressBookInfo['id'],$name);
-		if (!$obj) throw new Sabre_DAV_Exception_NotFound('Card not found');
-		return new OC_Connector_Sabre_CardDAV_Card($this->carddavBackend,$this->addressBookInfo,$obj);
-
-	}
-
-	/**
-	* Returns the full list of cards
-	*
-	* @return array
-	*/
-	public function getChildren() {
-
-		$objs = $this->carddavBackend->getCards($this->addressBookInfo['id']);
-		$children = array();
-		foreach($objs as $obj) {
-			$children[] = new OC_Connector_Sabre_CardDAV_Card($this->carddavBackend,$this->addressBookInfo,$obj);
-		}
-		return $children;
-
-	}
-}
\ No newline at end of file
diff --git a/apps/contacts/lib/sabre/addressbookroot.php b/apps/contacts/lib/sabre/addressbookroot.php
deleted file mode 100644
index 69cd602128..0000000000
--- a/apps/contacts/lib/sabre/addressbookroot.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * ownCloud - Addressbook
- *
- * @author Thomas Tanghus
- * @copyright 2012 Thomas Tanghus (thomas@tanghus.net)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *
- * You should have received a copy of the GNU Affero General Public
- * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-/**
- * This class overrides Sabre_CardDAV_AddressBookRoot::getChildForPrincipal()
- * to instantiate OC_Connector_CardDAV_UserAddressBooks.
-*/
-class OC_Connector_Sabre_CardDAV_AddressBookRoot extends Sabre_CardDAV_AddressBookRoot {
-
-	/**
-	* This method returns a node for a principal.
-	*
-	* The passed array contains principal information, and is guaranteed to
-	* at least contain a uri item. Other properties may or may not be
-	* supplied by the authentication backend.
-	*
-	* @param array $principal
-	* @return Sabre_DAV_INode
-	*/
-	public function getChildForPrincipal(array $principal) {
-
-		return new OC_Connector_Sabre_CardDAV_UserAddressBooks($this->carddavBackend, $principal['uri']);
-
-	}
-
-}
\ No newline at end of file
diff --git a/apps/contacts/lib/sabre/backend.php b/apps/contacts/lib/sabre/backend.php
deleted file mode 100644
index 04737eb3ab..0000000000
--- a/apps/contacts/lib/sabre/backend.php
+++ /dev/null
@@ -1,210 +0,0 @@
-<?php
-/**
- * ownCloud - Addressbook
- *
- * @author Jakob Sack
- * @copyright 2011 Jakob Sack mail@jakobsack.de
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *
- * You should have received a copy of the GNU Affero General Public
- * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-/**
- * This CardDAV backend uses PDO to store addressbooks
- */
-class OC_Connector_Sabre_CardDAV extends Sabre_CardDAV_Backend_Abstract {
-	/**
-	 * Returns the list of addressbooks for a specific user.
-	 *
-	 * @param string $principaluri
-	 * @return array
-	 */
-	public function getAddressBooksForUser($principaluri) {
-		$data = OC_Contacts_Addressbook::allWherePrincipalURIIs($principaluri);
-		$addressbooks = array();
-
-		foreach($data as $i) {
-			$addressbooks[] = array(
-				'id'  => $i['id'],
-				'uri' => $i['uri'],
-				'principaluri' => 'principals/'.$i['userid'],
-				'{DAV:}displayname' => $i['displayname'],
-				'{' . Sabre_CardDAV_Plugin::NS_CARDDAV . '}addressbook-description'
-						=> $i['description'],
-				'{http://calendarserver.org/ns/}getctag' => $i['ctag'],
-			);
-		}
-
-		return $addressbooks;
-	}
-
-
-	/**
-	 * Updates an addressbook's properties
-	 *
-	 * See Sabre_DAV_IProperties for a description of the mutations array, as
-	 * well as the return value.
-	 *
-	 * @param mixed $addressbookid
-	 * @param array $mutations
-	 * @see Sabre_DAV_IProperties::updateProperties
-	 * @return bool|array
-	 */
-	public function updateAddressBook($addressbookid, array $mutations) {
-		$name = null;
-		$description = null;
-
-		foreach($mutations as $property=>$newvalue) {
-			switch($property) {
-				case '{DAV:}displayname' :
-					$name = $newvalue;
-					break;
-				case '{' . Sabre_CardDAV_Plugin::NS_CARDDAV
-						. '}addressbook-description' :
-					$description = $newvalue;
-					break;
-				default :
-					// If any unsupported values were being updated, we must
-					// let the entire request fail.
-					return false;
-			}
-		}
-
-		OC_Contacts_Addressbook::edit($addressbookid, $name, $description);
-
-		return true;
-
-	}
-
-	/**
-	 * Creates a new address book
-	 *
-	 * @param string $principaluri
-	 * @param string $url Just the 'basename' of the url.
-	 * @param array $properties
-	 * @return void
-	 */
-	public function createAddressBook($principaluri, $url, array $properties) {
-
-		$displayname = null;
-		$description = null;
-
-		foreach($properties as $property=>$newvalue) {
-
-			switch($property) {
-				case '{DAV:}displayname' :
-					$displayname = $newvalue;
-					break;
-				case '{' . Sabre_CardDAV_Plugin::NS_CARDDAV
-						. '}addressbook-description' :
-					$description = $newvalue;
-					break;
-				default :
-					throw new Sabre_DAV_Exception_BadRequest('Unknown property: '
-						. $property);
-			}
-
-		}
-
-		OC_Contacts_Addressbook::addFromDAVData(
-					$principaluri,
-					$url,
-					$name,
-					$description
-		);
-	}
-
-	/**
-	 * Deletes an entire addressbook and all its contents
-	 *
-	 * @param int $addressbookid
-	 * @return void
-	 */
-	public function deleteAddressBook($addressbookid) {
-		OC_Contacts_Addressbook::delete($addressbookid);
-	}
-
-	/**
-	 * Returns all cards for a specific addressbook id.
-	 *
-	 * @param mixed $addressbookid
-	 * @return array
-	 */
-	public function getCards($addressbookid) {
-		$data = OC_Contacts_VCard::all($addressbookid);
-		$cards = array();
-		foreach($data as $i){
-			//OCP\Util::writeLog('contacts', __METHOD__.', uri: ' . $i['uri'], OCP\Util::DEBUG);
-			$cards[] = array(
-				'id' => $i['id'],
-				//'carddata' => $i['carddata'],
-				'size' => strlen($i['carddata']),
-				'etag' => md5($i['carddata']),
-				'uri' => $i['uri'],
-				'lastmodified' => $i['lastmodified'] );
-		}
-
-		return $cards;
-	}
-
-	/**
-	 * Returns a specfic card
-	 *
-	 * @param mixed $addressbookid
-	 * @param string $carduri
-	 * @return array
-	 */
-	public function getCard($addressbookid, $carduri) {
-		return OC_Contacts_VCard::findWhereDAVDataIs($addressbookid, $carduri);
-
-	}
-
-	/**
-	 * Creates a new card
-	 *
-	 * @param mixed $addressbookid
-	 * @param string $carduri
-	 * @param string $carddata
-	 * @return bool
-	 */
-	public function createCard($addressbookid, $carduri, $carddata) {
-		OC_Contacts_VCard::addFromDAVData($addressbookid, $carduri, $carddata);
-		return true;
-	}
-
-	/**
-	 * Updates a card
-	 *
-	 * @param mixed $addressbookid
-	 * @param string $carduri
-	 * @param string $carddata
-	 * @return bool
-	 */
-	public function updateCard($addressbookid, $carduri, $carddata) {
-		return OC_Contacts_VCard::editFromDAVData(
-			$addressbookid, $carduri, $carddata
-		);
-	}
-
-	/**
-	 * Deletes a card
-	 *
-	 * @param mixed $addressbookid
-	 * @param string $carduri
-	 * @return bool
-	 */
-	public function deleteCard($addressbookid, $carduri) {
-		return OC_Contacts_VCard::deleteFromDAVData($addressbookid, $carduri);
-	}
-}
diff --git a/apps/contacts/lib/sabre/card.php b/apps/contacts/lib/sabre/card.php
deleted file mode 100644
index f4414a25f7..0000000000
--- a/apps/contacts/lib/sabre/card.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-/**
- * ownCloud - Addressbook
- *
- * @author Thomas Tanghus
- * @copyright 2012 Thomas Tanghus (thomas@tanghus.net)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *
- * You should have received a copy of the GNU Affero General Public
- * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-/**
- * This class overrides Sabre_CardDAV_Card::getACL()
- * to return read/write permissions based on user and shared state.
-*/
-class OC_Connector_Sabre_CardDAV_Card extends Sabre_CardDAV_Card {
-
-    /**
-     * Array with information about the containing addressbook
-     *
-     * @var array
-     */
-    private $addressBookInfo;
-
-    /**
-     * Constructor
-     *
-     * @param Sabre_CardDAV_Backend_Abstract $carddavBackend
-     * @param array $addressBookInfo
-     * @param array $cardData
-     */
-    public function __construct(Sabre_CardDAV_Backend_Abstract $carddavBackend, array $addressBookInfo, array $cardData) {
-
-        $this->addressBookInfo = $addressBookInfo;
-		parent::__construct($carddavBackend, $addressBookInfo, $cardData);
-
-    }
-
-	/**
-	* Returns a list of ACE's for this node.
-	*
-	* Each ACE has the following properties:
-	*   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
-	*     currently the only supported privileges
-	*   * 'principal', a url to the principal who owns the node
-	*   * 'protected' (optional), indicating that this ACE is not allowed to
-	*      be updated.
-	*
-	* @return array
-	*/
-	public function getACL() {
-
-		$readprincipal = $this->getOwner();
-		$writeprincipal = $this->getOwner();
-		$uid = OC_Contacts_Addressbook::extractUserID($this->getOwner());
-
-		if($uid != OCP\USER::getUser()) {
-			$sharedAddressbook = OCP\Share::getItemSharedWithBySource('addressbook', $this->addressBookInfo['id']);
-			if ($sharedAddressbook && ($sharedAddressbook['permissions'] & OCP\Share::PERMISSION_READ)) {
-				$readprincipal = 'principals/' . OCP\USER::getUser();
-			}
-			if ($sharedAddressbook && ($sharedAddressbook['permissions'] & OCP\Share::PERMISSION_UPDATE)) {
-				$writeprincipal = 'principals/' . OCP\USER::getUser();
-			}
-		}
-
-		return array(
-			array(
-				'privilege' => '{DAV:}read',
-				'principal' => $readprincipal,
-				'protected' => true,
-			),
-			array(
-				'privilege' => '{DAV:}write',
-				'principal' => $writeprincipal,
-				'protected' => true,
-			),
-
-		);
-
-	}
-
-}
\ No newline at end of file
diff --git a/apps/contacts/lib/sabre/useraddressbooks.php b/apps/contacts/lib/sabre/useraddressbooks.php
deleted file mode 100644
index 328b433bd6..0000000000
--- a/apps/contacts/lib/sabre/useraddressbooks.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * ownCloud - Addressbook
- *
- * @author Thomas Tanghus
- * @copyright 2012 Thomas Tanghus (thomas@tanghus.net)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *
- * You should have received a copy of the GNU Affero General Public
- * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-/**
- * This class overrides Sabre_CardDAV_UserAddressBooks::getChildren()
- * to instantiate OC_Connector_Sabre_CardDAV_AddressBooks.
-*/
-class OC_Connector_Sabre_CardDAV_UserAddressBooks extends Sabre_CardDAV_UserAddressBooks {
-
-	/**
-	* Returns a list of addressbooks
-	*
-	* @return array
-	*/
-	public function getChildren() {
-
-		$addressbooks = $this->carddavBackend->getAddressbooksForUser($this->principalUri);
-		$objs = array();
-		foreach($addressbooks as $addressbook) {
-			$objs[] = new OC_Connector_Sabre_CardDAV_AddressBook($this->carddavBackend, $addressbook);
-		}
-		return $objs;
-
-	}
-
-}
\ No newline at end of file
diff --git a/apps/contacts/lib/sabre/vcfexportplugin.php b/apps/contacts/lib/sabre/vcfexportplugin.php
deleted file mode 100644
index f0ba60b303..0000000000
--- a/apps/contacts/lib/sabre/vcfexportplugin.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-
-/**
- * VCF Exporter
- *
- * This plugin adds the ability to export entire address books as .vcf files.
- * This is useful for clients that don't support CardDAV yet. They often do
- * support vcf files.
- *
- * @package Sabre
- * @subpackage CardDAV
- * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class OC_Connector_Sabre_CardDAV_VCFExportPlugin extends Sabre_DAV_ServerPlugin {
-
-    /**
-     * Reference to Server class
-     *
-     * @var Sabre_DAV_Server
-     */
-    private $server;
-
-    /**
-     * Initializes the plugin and registers event handlers
-     *
-     * @param Sabre_DAV_Server $server
-     * @return void
-     */
-    public function initialize(Sabre_DAV_Server $server) {
-
-        $this->server = $server;
-        $this->server->subscribeEvent('beforeMethod', array($this,'beforeMethod'), 90);
-
-    }
-
-    /**
-     * 'beforeMethod' event handles. This event handles intercepts GET requests ending
-     * with ?export
-     *
-     * @param string $method
-     * @param string $uri
-     * @return bool
-     */
-    public function beforeMethod($method, $uri) {
-
-        if ($method!='GET') return;
-        if ($this->server->httpRequest->getQueryString()!='export') return;
-
-        // splitting uri
-        list($uri) = explode('?', $uri, 2);
-
-        $node = $this->server->tree->getNodeForPath($uri);
-
-        if (!($node instanceof Sabre_CardDAV_IAddressBook)) return;
-
-        // Checking ACL, if available.
-        if ($aclPlugin = $this->server->getPlugin('acl')) {
-            $aclPlugin->checkPrivileges($uri, '{DAV:}read');
-        }
-
-        $this->server->httpResponse->setHeader('Content-Type', 'text/directory');
-        $this->server->httpResponse->sendStatus(200);
-
-        $nodes = $this->server->getPropertiesForPath($uri, array(
-            '{' . Sabre_CardDAV_Plugin::NS_CARDDAV . '}address-data',
-        ), 1);
-
-        $this->server->httpResponse->sendBody($this->generateVCF($nodes));
-
-        // Returning false to break the event chain
-        return false;
-
-    }
-
-    /**
-     * Merges all vcard objects, and builds one big vcf export
-     *
-     * @param array $nodes
-     * @return string
-     */
-    public function generateVCF(array $nodes) {
-        $objects = array();
-
-        foreach($nodes as $node) {
-
-            if (!isset($node[200]['{' . Sabre_CardDAV_Plugin::NS_CARDDAV . '}address-data'])) {
-                continue;
-            }
-            $nodeData = $node[200]['{' . Sabre_CardDAV_Plugin::NS_CARDDAV . '}address-data'];
-            $objects[] = $nodeData;
-
-        }
-
-        return implode("\r\n", $objects);
-
-    }
-
-}
diff --git a/apps/contacts/lib/search.php b/apps/contacts/lib/search.php
deleted file mode 100644
index c86bc12c5b..0000000000
--- a/apps/contacts/lib/search.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-class OC_Search_Provider_Contacts extends OC_Search_Provider{
-	function search($query){
-		$addressbooks = OC_Contacts_Addressbook::all(OCP\USER::getUser(), 1);
-		if(count($addressbooks)==0 || !OCP\App::isEnabled('contacts')) {
-			return array();
-		}
-		$results=array();
-		$l = new OC_l10n('contacts');
-		foreach($addressbooks as $addressbook){
-			$vcards = OC_Contacts_VCard::all($addressbook['id']);
-			foreach($vcards as $vcard){
-				if(substr_count(strtolower($vcard['fullname']), strtolower($query)) > 0) {
-					$link = OCP\Util::linkTo('contacts', 'index.php').'?id='.urlencode($vcard['id']);
-					$results[]=new OC_Search_Result($vcard['fullname'], '', $link, (string)$l->t('Contact'));//$name,$text,$link,$type
-				}
-			}
-		}
-		return $results;
-	}
-}
diff --git a/apps/contacts/lib/share/addressbook.php b/apps/contacts/lib/share/addressbook.php
deleted file mode 100644
index acabeab2ad..0000000000
--- a/apps/contacts/lib/share/addressbook.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Bart Visscher <bartv@thisnet.nl>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-class OC_Share_Backend_Addressbook implements OCP\Share_Backend_Collection {
-	const FORMAT_ADDRESSBOOKS = 1;
-
-	/**
-	* @brief Get the source of the item to be stored in the database
-	* @param string Item
-	* @param string Owner of the item
-	* @return mixed|array|false Source
-	*
-	* Return an array if the item is file dependent, the array needs two keys: 'item' and 'file'
-	* Return false if the item does not exist for the user
-	*
-	* The formatItems() function will translate the source returned back into the item
-	*/
-	public function isValidSource($itemSource, $uidOwner) {
-		$addressbook = OC_Contacts_Addressbook::find( $itemSource );
-		if( $addressbook === false || $addressbook['userid'] != $uidOwner) {
-			return false;
-		}
-		return true;
-	}
-
-	/**
-	* @brief Get a unique name of the item for the specified user
-	* @param string Item
-	* @param string|false User the item is being shared with
-	* @param array|null List of similar item names already existing as shared items
-	* @return string Target name
-	*
-	* This function needs to verify that the user does not already have an item with this name.
-	* If it does generate a new name e.g. name_#
-	*/
-	public function generateTarget($itemSource, $shareWith, $exclude = null) {
-		$addressbook = OC_Contacts_Addressbook::find( $itemSource );
-		$user_addressbooks = array();
-		foreach(OC_Contacts_Addressbook::all($shareWith) as $user_addressbook) {
-			$user_addressbooks[] = $user_addressbook['displayname'];
-		}
-		$name = $addressbook['userid']."'s ".$addressbook['displayname'];
-		$suffix = '';
-		while (in_array($name.$suffix, $user_addressbooks)) {
-			$suffix++;
-		}
-
-		return $name.$suffix;
-	}
-
-	/**
-	* @brief Converts the shared item sources back into the item in the specified format
-	* @param array Shared items
-	* @param int Format
-	* @return ?
-	*
-	* The items array is a 3-dimensional array with the item_source as the first key and the share id as the second key to an array with the share info.
-	* The key/value pairs included in the share info depend on the function originally called:
-	* If called by getItem(s)Shared: id, item_type, item, item_source, share_type, share_with, permissions, stime, file_source
-	* If called by getItem(s)SharedWith: id, item_type, item, item_source, item_target, share_type, share_with, permissions, stime, file_source, file_target
-	* This function allows the backend to control the output of shared items with custom formats.
-	* It is only called through calls to the public getItem(s)Shared(With) functions.
-	*/
-	public function formatItems($items, $format, $parameters = null) {
-		$addressbooks = array();
-		if ($format == self::FORMAT_ADDRESSBOOKS) {
-			foreach ($items as $item) {
-				$addressbook = OC_Contacts_Addressbook::find($item['item_source']);
-				if ($addressbook) {
-					$addressbook['displayname'] = $item['item_target'];
-					$addressbook['permissions'] = $item['permissions'];
-					$addressbooks[] = $addressbook;
-				}
-			}
-		}
-		return $addressbooks;
-	}
-
-	public function getChildren($itemSource) {
-		$query = OCP\DB::prepare('SELECT `id` FROM `*PREFIX*contacts_cards` WHERE `addressbookid` = ?');
-		$result = $query->execute(array($itemSource));
-		$sources = array();
-		while ($contact = $result->fetchRow()) {
-			$sources[] = $contact['id'];
-		}
-		return $sources;
-	}
-
-}
diff --git a/apps/contacts/lib/share/contact.php b/apps/contacts/lib/share/contact.php
deleted file mode 100644
index 718c8f9025..0000000000
--- a/apps/contacts/lib/share/contact.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/**
-* ownCloud
-*
-* @author Michael Gapczynski
-* @copyright 2012 Michael Gapczynski mtgap@owncloud.com
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either
-* version 3 of the License, or any later version.
-*
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-*
-* You should have received a copy of the GNU Affero General Public
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-class OC_Share_Backend_Contact implements OCP\Share_Backend {
-
-	const FORMAT_CONTACT = 0;
-
-	private static $contact;
-
-	public function isValidSource($itemSource, $uidOwner) {
-		self::$contact = OC_Contacts_VCard::find($itemSource);
-		if (self::$contact) {
-			return true;
-		}
-		return false;
-	}
-	
-	public function generateTarget($itemSource, $shareWith, $exclude = null) {
-		// TODO Get default addressbook and check for conflicts
-		return self::$contact['fullname'];
-	}
-	
-	public function formatItems($items, $format, $parameters = null) {
-		$contacts = array();
-		if ($format == self::FORMAT_CONTACT) {
-			foreach ($items as $item) {
-				$contact = OC_Contacts_VCard::find($item['item_source']);
-				$contact['fullname'] = $item['item_target'];
-				$contacts[] = $contact;
-			}
-		}
-		return $contacts;
-	}
-
-}
\ No newline at end of file
diff --git a/apps/contacts/lib/vcard.php b/apps/contacts/lib/vcard.php
deleted file mode 100644
index 91a5b806b1..0000000000
--- a/apps/contacts/lib/vcard.php
+++ /dev/null
@@ -1,733 +0,0 @@
-<?php
-/**
- * ownCloud - Addressbook
- *
- * @author Jakob Sack
- * @copyright 2011 Jakob Sack mail@jakobsack.de
- * @copyright 2012 Thomas Tanghus <thomas@tanghus.net>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *
- * You should have received a copy of the GNU Affero General Public
- * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-/*
- *
- * The following SQL statement is just a help for developers and will not be
- * executed!
- *
- * CREATE TABLE contacts_cards (
- * id INT(11) UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
- * addressbookid INT(11) UNSIGNED NOT NULL,
- * fullname VARCHAR(255),
- * carddata TEXT,
- * uri VARCHAR(100),
- * lastmodified INT(11) UNSIGNED
- * );
- */
-
-/**
- * This class manages our vCards
- */
-class OC_Contacts_VCard {
-	/**
-	 * @brief Returns all cards of an address book
-	 * @param integer $id
-	 * @return array|false
-	 *
-	 * The cards are associative arrays. You'll find the original vCard in
-	 * ['carddata']
-	 */
-	public static function all($id, $start=null, $num=null){
-		$result = null;
-		if(is_array($id) && count($id)) {
-			$id_sql = join(',', array_fill(0, count($id), '?'));
-			$sql = 'SELECT * FROM `*PREFIX*contacts_cards` WHERE `addressbookid` IN ('.$id_sql.') ORDER BY `fullname`';
-			try {
-				$stmt = OCP\DB::prepare( $sql, $num, $start );
-				$result = $stmt->execute($id);
-			} catch(Exception $e) {
-				OCP\Util::writeLog('contacts', __METHOD__.', exception: '.$e->getMessage(), OCP\Util::ERROR);
-				OCP\Util::writeLog('contacts', __METHOD__.', ids: '.join(',', $id), OCP\Util::DEBUG);
-				OCP\Util::writeLog('contacts', __METHOD__.'SQL:'.$sql, OCP\Util::DEBUG);
-				return false;
-			}
-		} elseif(is_int($id) || is_string($id)) {
-			try {
-				$sql = 'SELECT * FROM `*PREFIX*contacts_cards` WHERE `addressbookid` = ? ORDER BY `fullname`';
-				$stmt = OCP\DB::prepare( $sql, $num, $start );
-				$result = $stmt->execute(array($id));
-			} catch(Exception $e) {
-				OCP\Util::writeLog('contacts', __METHOD__.', exception: '.$e->getMessage(), OCP\Util::ERROR);
-				OCP\Util::writeLog('contacts', __METHOD__.', ids: '. $id, OCP\Util::DEBUG);
-				return false;
-			}
-		} else {
-			OCP\Util::writeLog('contacts', __METHOD__.'. Addressbook id(s) argument is empty: '. print_r($id, true), OCP\Util::DEBUG);
-			return false;
-		}
-		$cards = array();
-		if(!is_null($result)) {
-			while( $row = $result->fetchRow()){
-				$cards[] = $row;
-			}
-		}
-
-		return $cards;
-	}
-
-	/**
-	 * @brief Returns a card
-	 * @param integer $id
-	 * @return associative array or false.
-	 */
-	public static function find($id){
-		try {
-			$stmt = OCP\DB::prepare( 'SELECT * FROM `*PREFIX*contacts_cards` WHERE `id` = ?' );
-			$result = $stmt->execute(array($id));
-		} catch(Exception $e) {
-			OCP\Util::writeLog('contacts', __METHOD__.', exception: '.$e->getMessage(), OCP\Util::ERROR);
-			OCP\Util::writeLog('contacts', __METHOD__.', id: '. $id, OCP\Util::DEBUG);
-			return false;
-		}
-
-		return $result->fetchRow();
-	}
-
-	/**
-	 * @brief finds a card by its DAV Data
-	 * @param integer $aid Addressbook id
-	 * @param string $uri the uri ('filename')
-	 * @return associative array or false.
-	 */
-	public static function findWhereDAVDataIs($aid,$uri){
-		try {
-			$stmt = OCP\DB::prepare( 'SELECT * FROM `*PREFIX*contacts_cards` WHERE `addressbookid` = ? AND `uri` = ?' );
-			$result = $stmt->execute(array($aid,$uri));
-		} catch(Exception $e) {
-			OCP\Util::writeLog('contacts', __METHOD__.', exception: '.$e->getMessage(), OCP\Util::ERROR);
-			OCP\Util::writeLog('contacts', __METHOD__.', aid: '.$aid.' uri'.$uri, OCP\Util::DEBUG);
-			return false;
-		}
-
-		return $result->fetchRow();
-	}
-
-	/**
-	* @brief Format property TYPE parameters for upgrading from v. 2.1
-	* @param $property Reference to a Sabre_VObject_Property.
-	* In version 2.1 e.g. a phone can be formatted like: TEL;HOME;CELL:123456789
-	* This has to be changed to either TEL;TYPE=HOME,CELL:123456789 or TEL;TYPE=HOME;TYPE=CELL:123456789 - both are valid.
-	*/
-	public static function formatPropertyTypes(&$property) {
-		foreach($property->parameters as $key=>&$parameter){
-			$types = OC_Contacts_App::getTypesOfProperty($property->name);
-			if(is_array($types) && in_array(strtoupper($parameter->name), array_keys($types)) || strtoupper($parameter->name) == 'PREF') {
-				$property->parameters[] = new Sabre_VObject_Parameter('TYPE', $parameter->name);
-			}
-			unset($property->parameters[$key]);
-		}
-	}
-
-	/**
-	* @brief Decode properties for upgrading from v. 2.1
-	* @param $property Reference to a Sabre_VObject_Property.
-	* The only encoding allowed in version 3.0 is 'b' for binary. All encoded strings
-	* must therefor be decoded and the parameters removed.
-	*/
-	public static function decodeProperty(&$property) {
-		// Check out for encoded string and decode them :-[
-		foreach($property->parameters as $key=>&$parameter){
-			if(strtoupper($parameter->name) == 'ENCODING') {
-				if(strtoupper($parameter->value) == 'QUOTED-PRINTABLE') { // what kind of other encodings could be used?
-					$property->value = quoted_printable_decode($property->value);
-					unset($property->parameters[$key]);
-				}
-			} elseif(strtoupper($parameter->name) == 'CHARSET') {
-					unset($property->parameters[$key]);
-			}
-		}
-	}
-
-	/**
-	* @brief Checks if a contact with the same UID already exist in the address book.
-	* @param $aid Address book ID.
-	* @param $uid UID (passed by reference).
-	* @returns true if the UID has been changed.
-	*/
-	protected static function trueUID($aid, &$uid) {
-		$stmt = OCP\DB::prepare( 'SELECT * FROM `*PREFIX*contacts_cards` WHERE `addressbookid` = ? AND `uri` = ?' );
-		$uri = $uid.'.vcf';
-		try {
-			$result = $stmt->execute(array($aid,$uri));
-		} catch(Exception $e) {
-			OCP\Util::writeLog('contacts', __METHOD__.', exception: '.$e->getMessage(), OCP\Util::ERROR);
-			OCP\Util::writeLog('contacts', __METHOD__.', aid: '.$aid.' uid'.$uid, OCP\Util::DEBUG);
-			return false;
-		}
-		if($result->numRows() > 0) {
-			while(true) {
-				$tmpuid = substr(md5(rand().time()), 0, 10);
-				$uri = $tmpuid.'.vcf';
-				$result = $stmt->execute(array($aid, $uri));
-				if($result->numRows() > 0) {
-					continue;
-				} else {
-					$uid = $tmpuid;
-					return true;
-				}
-			}
-		} else {
-			return false;
-		}
-	}
-
-	/**
-	* @brief Tries to update imported VCards to adhere to rfc2426 (VERSION: 3.0) and add mandatory fields if missing.
-	* @param aid Address book id.
-	* @param vcard An OC_VObject of type VCARD (passed by reference).
-	*/
-	protected static function updateValuesFromAdd($aid, &$vcard) { // any suggestions for a better method name? ;-)
-		$stringprops = array('N', 'FN', 'ORG', 'NICK', 'ADR', 'NOTE');
-		$typeprops = array('ADR', 'TEL', 'EMAIL');
-		$upgrade = false;
-		$fn = $n = $uid = $email = $org = null;
-		$version = $vcard->getAsString('VERSION');
-		// Add version if needed
-		if($version && $version < '3.0') {
-			$upgrade = true;
-			OCP\Util::writeLog('contacts', 'OC_Contacts_VCard::updateValuesFromAdd. Updating from version: '.$version, OCP\Util::DEBUG);
-		}
-		foreach($vcard->children as &$property){
-			// Decode string properties and remove obsolete properties.
-			if($upgrade && in_array($property->name, $stringprops)) {
-				self::decodeProperty($property);
-			}
-			$property->value = str_replace("\r\n", "\n", iconv(mb_detect_encoding($property->value, 'UTF-8, ISO-8859-1'), 'utf-8', $property->value));
-			if(in_array($property->name, $stringprops)) {
-				$property->value = strip_tags($property->value);
-			}
-			// Fix format of type parameters.
-			if($upgrade && in_array($property->name, $typeprops)) {
-				OCP\Util::writeLog('contacts', 'OC_Contacts_VCard::updateValuesFromAdd. before: '.$property->serialize(), OCP\Util::DEBUG);
-				self::formatPropertyTypes($property);
-				OCP\Util::writeLog('contacts', 'OC_Contacts_VCard::updateValuesFromAdd. after: '.$property->serialize(), OCP\Util::DEBUG);
-			}
-			if($property->name == 'FN') {
-				$fn = $property->value;
-			}
-			if($property->name == 'N') {
-				$n = $property->value;
-			}
-			if($property->name == 'UID') {
-				$uid = $property->value;
-			}
-			if($property->name == 'ORG') {
-				$org = $property->value;
-			}
-			if($property->name == 'EMAIL' && is_null($email)) { // only use the first email as substitute for missing N or FN.
-				$email = $property->value;
-			}
-		}
-		// Check for missing 'N', 'FN' and 'UID' properties
-		if(!$fn) {
-			if($n && $n != ';;;;') {
-				$fn = join(' ', array_reverse(array_slice(explode(';', $n), 0, 2)));
-			} elseif($email) {
-				$fn = $email;
-			} elseif($org) {
-				$fn = $org;
-			} else {
-				$fn = 'Unknown Name';
-			}
-			$vcard->setString('FN', $fn);
-			OCP\Util::writeLog('contacts', 'OC_Contacts_VCard::updateValuesFromAdd. Added missing \'FN\' field: '.$fn, OCP\Util::DEBUG);
-		}
-		if(!$n || $n == ';;;;') { // Fix missing 'N' field. Ugly hack ahead ;-)
-			$slice = array_reverse(array_slice(explode(' ', $fn), 0, 2)); // Take 2 first name parts of 'FN' and reverse.
-			if(count($slice) < 2) { // If not enought, add one more...
-				$slice[] = "";
-			}
-			$n = implode(';', $slice).';;;';
-			$vcard->setString('N', $n);
-			OCP\Util::writeLog('contacts', 'OC_Contacts_VCard::updateValuesFromAdd. Added missing \'N\' field: '.$n, OCP\Util::DEBUG);
-		}
-		if(!$uid) {
-			$vcard->setUID();
-			$uid = $vcard->getAsString('UID');
-			OCP\Util::writeLog('contacts', 'OC_Contacts_VCard::updateValuesFromAdd. Added missing \'UID\' field: '.$uid, OCP\Util::DEBUG);
-		}
-		if(self::trueUID($aid, $uid)) {
-			$vcard->setString('UID', $uid);
-		}
-		$now = new DateTime;
-		$vcard->setString('REV', $now->format(DateTime::W3C));
-	}
-
-	/**
-	 * @brief Adds a card
-	 * @param $aid integer Addressbook id
-	 * @param $card OC_VObject  vCard file
-	 * @param $uri string the uri of the card, default based on the UID
-	 * @param $isChecked boolean If the vCard should be checked for validity and version.
-	 * @return insertid on success or false.
-	 */
-	public static function add($aid, OC_VObject $card, $uri=null, $isChecked=false){
-		if(is_null($card)) {
-			OCP\Util::writeLog('contacts', 'OC_Contacts_VCard::add. No vCard supplied', OCP\Util::ERROR);
-			return null;
-		};
-		$addressbook = OC_Contacts_Addressbook::find($aid);
-		if ($addressbook['userid'] != OCP\User::getUser()) {
-			$sharedAddressbook = OCP\Share::getItemSharedWithBySource('addressbook', $aid);
-			if (!$sharedAddressbook || !($sharedAddressbook['permissions'] & OCP\Share::PERMISSION_CREATE)) {
-				return false;
-			}
-		}
-		if(!$isChecked) {
-			OC_Contacts_App::loadCategoriesFromVCard($card);
-			self::updateValuesFromAdd($aid, $card);
-		}
-		$card->setString('VERSION', '3.0');
-		// Add product ID is missing.
-		$prodid = trim($card->getAsString('PRODID'));
-		if(!$prodid) {
-			$appinfo = OCP\App::getAppInfo('contacts');
-			$appversion = OCP\App::getAppVersion('contacts');
-			$prodid = '-//ownCloud//NONSGML '.$appinfo['name'].' '.$appversion.'//EN';
-			$card->setString('PRODID', $prodid);
-		}
-
-		$fn = $card->getAsString('FN');
-		if (empty($fn)) {
-			$fn = '';
-		}
-
-		if (!$uri) {
-			$uid = $card->getAsString('UID');
-			$uri = $uid.'.vcf';
-		}
-
-		$data = $card->serialize();
-		$stmt = OCP\DB::prepare( 'INSERT INTO `*PREFIX*contacts_cards` (`addressbookid`,`fullname`,`carddata`,`uri`,`lastmodified`) VALUES(?,?,?,?,?)' );
-		try {
-			$result = $stmt->execute(array($aid,$fn,$data,$uri,time()));
-		} catch(Exception $e) {
-			OCP\Util::writeLog('contacts', __METHOD__.', exception: '.$e->getMessage(), OCP\Util::ERROR);
-			OCP\Util::writeLog('contacts', __METHOD__.', aid: '.$aid.' uri'.$uri, OCP\Util::DEBUG);
-			return false;
-		}
-		$newid = OCP\DB::insertid('*PREFIX*contacts_cards');
-
-		OC_Contacts_Addressbook::touch($aid);
-		OC_Hook::emit('OC_Contacts_VCard', 'post_createVCard', $newid);
-		return $newid;
-	}
-
-	/**
-	 * @brief Adds a card with the data provided by sabredav
-	 * @param integer $id Addressbook id
-	 * @param string $uri   the uri the card will have
-	 * @param string $data  vCard file
-	 * @return insertid
-	 */
-	public static function addFromDAVData($id,$uri,$data){
-		$card = OC_VObject::parse($data);
-		return self::add($id, $card, $uri);
-	}
-
-	/**
-	 * @brief Mass updates an array of cards
-	 * @param array $objects  An array of [id, carddata].
-	 */
-	public static function updateDataByID($objects){
-		$stmt = OCP\DB::prepare( 'UPDATE `*PREFIX*contacts_cards` SET `carddata` = ?, `lastmodified` = ? WHERE `id` = ?' );
-		$now = new DateTime;
-		foreach($objects as $object) {
-			$vcard = OC_VObject::parse($object[1]);
-			if(!is_null($vcard)) {
-				$oldcard = self::find($object[0]);
-				if (!$oldcard) {
-					return false;
-				}
-				$addressbook = OC_Contacts_Addressbook::find($oldcard['addressbookid']);
-				if ($addressbook['userid'] != OCP\User::getUser()) {
-					$sharedContact = OCP\Share::getItemSharedWithBySource('contact', $object[0], OCP\Share::FORMAT_NONE, null, true);
-					if (!$sharedContact || !($sharedContact['permissions'] & OCP\Share::PERMISSION_UPDATE)) {
-						return false;
-					}
-				}
-				$vcard->setString('REV', $now->format(DateTime::W3C));
-				$data = $vcard->serialize();
-				try {
-					$result = $stmt->execute(array($data,time(),$object[0]));
-					//OCP\Util::writeLog('contacts','OC_Contacts_VCard::updateDataByID, id: '.$object[0].': '.$object[1],OCP\Util::DEBUG);
-				} catch(Exception $e) {
-					OCP\Util::writeLog('contacts', __METHOD__.', exception: '.$e->getMessage(), OCP\Util::ERROR);
-					OCP\Util::writeLog('contacts', __METHOD__.', id: '.$object[0], OCP\Util::DEBUG);
-				}
-			}
-		}
-	}
-
-	/**
-	 * @brief edits a card
-	 * @param integer $id id of card
-	 * @param OC_VObject $card  vCard file
-	 * @return boolean
-	 */
-	public static function edit($id, OC_VObject $card){
-		$oldcard = self::find($id);
-		if (!$oldcard) {
-			return false;
-		}
-		if(is_null($card)) {
-			return false;
-		}
-		// NOTE: Owner checks are being made in the ajax files, which should be done inside the lib files to prevent any redundancies with sharing checks
-		$addressbook = OC_Contacts_Addressbook::find($oldcard['addressbookid']);
-		if ($addressbook['userid'] != OCP\User::getUser()) {
-			$sharedContact = OCP\Share::getItemSharedWithBySource('contact', $id, OCP\Share::FORMAT_NONE, null, true);
-			if (!$sharedContact || !($sharedContact['permissions'] & OCP\Share::PERMISSION_UPDATE)) {
-				throw new Exception(OC_Contacts_App::$l10n->t('You do not have the permissions to edit this contact.'));
-			}
-		}
-		OC_Contacts_App::loadCategoriesFromVCard($card);
-
-		$fn = $card->getAsString('FN');
-		if (empty($fn)) {
-			$fn = null;
-		}
-
-		$now = new DateTime;
-		$card->setString('REV', $now->format(DateTime::W3C));
-
-		$data = $card->serialize();
-		$stmt = OCP\DB::prepare( 'UPDATE `*PREFIX*contacts_cards` SET `fullname` = ?,`carddata` = ?, `lastmodified` = ? WHERE `id` = ?' );
-		try {
-			$result = $stmt->execute(array($fn,$data,time(),$id));
-		} catch(Exception $e) {
-			OCP\Util::writeLog('contacts', __METHOD__.', exception: '
-				. $e->getMessage(), OCP\Util::ERROR);
-			OCP\Util::writeLog('contacts', __METHOD__.', id'.$id, OCP\Util::DEBUG);
-			return false;
-		}
-
-		OC_Contacts_Addressbook::touch($oldcard['addressbookid']);
-		OC_Hook::emit('OC_Contacts_VCard', 'post_updateVCard', $id);
-		return true;
-	}
-
-	/**
-	 * @brief edits a card with the data provided by sabredav
-	 * @param integer $id Addressbook id
-	 * @param string $uri   the uri of the card
-	 * @param string $data  vCard file
-	 * @return boolean
-	 */
-	public static function editFromDAVData($aid, $uri, $data){
-		$oldcard = self::findWhereDAVDataIs($aid, $uri);
-		$card = OC_VObject::parse($data);
-		if(!$card) {
-			OCP\Util::writeLog('contacts', __METHOD__.
-				', Unable to parse VCARD, uri: '.$uri, OCP\Util::ERROR);
-			return false;
-		}
-		try {
-			self::edit($oldcard['id'], $card);
-			return true;
-		} catch(Exception $e) {
-			OCP\Util::writeLog('contacts', __METHOD__.', exception: '
-				. $e->getMessage() . ', '
-				. OCP\USER::getUser(), OCP\Util::ERROR);
-			OCP\Util::writeLog('contacts', __METHOD__.', uri'
-				. $uri, OCP\Util::DEBUG);
-			return false;
-		}
-	}
-
-	/**
-	 * @brief deletes a card
-	 * @param integer $id id of card
-	 * @return boolean
-	 */
-	public static function delete($id){
-		$card = self::find($id);
-		if (!$card) {
-			return false;
-		}
-		$addressbook = OC_Contacts_Addressbook::find($card['addressbookid']);
-		if ($addressbook['userid'] != OCP\User::getUser()) {
-			$sharedContact = OCP\Share::getItemSharedWithBySource('contact',
-				$id, OCP\Share::FORMAT_NONE, null, true);
-			if (!$sharedContact
-				|| !($sharedContact['permissions'] & OCP\Share::PERMISSION_DELETE)) {
-				throw new Exception(
-					OC_Contacts_App::$l10n->t(
-						'You do not have the permissions to delete this contact.'
-					)
-				);
-			}
-		}
-		OC_Hook::emit('OC_Contacts_VCard', 'pre_deleteVCard',
-			array('aid' => null, 'id' => $id, 'uri' => null)
-		);
-		$stmt = OCP\DB::prepare('DELETE FROM `*PREFIX*contacts_cards` WHERE `id` = ?');
-		try {
-			$stmt->execute(array($id));
-		} catch(Exception $e) {
-			OCP\Util::writeLog('contacts', __METHOD__.
-				', exception: ' . $e->getMessage(), OCP\Util::ERROR);
-			OCP\Util::writeLog('contacts', __METHOD__.', id: '
-				. $id, OCP\Util::DEBUG);
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * @brief deletes a card with the data provided by sabredav
-	 * @param integer $aid Addressbook id
-	 * @param string $uri the uri of the card
-	 * @return boolean
-	 */
-	public static function deleteFromDAVData($aid,$uri){
-		$addressbook = OC_Contacts_Addressbook::find($aid);
-		if ($addressbook['userid'] != OCP\User::getUser()) {
-			$query = OCP\DB::prepare( 'SELECT `id` FROM `*PREFIX*contacts_cards` WHERE `addressbookid` = ? AND `uri` = ?' );
-			$id = $query->execute(array($aid, $uri))->fetchOne();
-			if (!$id) {
-				return false;
-			}
-			$sharedContact = OCP\Share::getItemSharedWithBySource('contact', $id, OCP\Share::FORMAT_NONE, null, true);
-			if (!$sharedContact || !($sharedContact['permissions'] & OCP\Share::PERMISSION_DELETE)) {
-				return false;
-			}
-		}
-		OC_Hook::emit('OC_Contacts_VCard', 'pre_deleteVCard', array('aid' => $aid, 'id' => null, 'uri' => $uri));
-		$stmt = OCP\DB::prepare( 'DELETE FROM `*PREFIX*contacts_cards` WHERE `addressbookid` = ? AND `uri`=?' );
-		try {
-			$stmt->execute(array($aid,$uri));
-		} catch(Exception $e) {
-			OCP\Util::writeLog('contacts', __METHOD__.', exception: '.$e->getMessage(), OCP\Util::ERROR);
-			OCP\Util::writeLog('contacts', __METHOD__.', aid: '.$aid.' uri: '.$uri, OCP\Util::DEBUG);
-			return false;
-		}
-		OC_Contacts_Addressbook::touch($aid);
-
-		return true;
-	}
-
-	/**
-	 * @brief Escapes delimiters from an array and returns a string.
-	 * @param array $value
-	 * @param char $delimiter
-	 * @return string
-	 */
-	public static function escapeDelimiters($value, $delimiter=';') {
-		foreach($value as &$i ) {
-			$i = implode("\\$delimiter", explode($delimiter, $i));
-		}
-		return implode($delimiter, $value);
-	}
-
-
-	/**
-	 * @brief Creates an array out of a multivalue property
-	 * @param string $value
-	 * @param char $delimiter
-	 * @return array
-	 */
-	public static function unescapeDelimiters($value, $delimiter=';') {
-		$array = explode($delimiter, $value);
-		for($i=0;$i<count($array);$i++) {
-			if(substr($array[$i], -1, 1)=="\\") {
-				if(isset($array[$i+1])) {
-					$array[$i] = substr($array[$i], 0, count($array[$i])-2).$delimiter.$array[$i+1];
-					unset($array[$i+1]);
-				} else {
-					$array[$i] = substr($array[$i], 0, count($array[$i])-2).$delimiter;
-				}
-				$i = $i - 1;
-			}
-		}
-		$array = array_map('trim', $array);
-		return $array;
-	}
-
-	/**
-	 * @brief Data structure of vCard
-	 * @param object $property
-	 * @return associative array
-	 *
-	 * look at code ...
-	 */
-	public static function structureContact($object) {
-		$details = array();
-
-		foreach($object->children as $property) {
-			$pname = $property->name;
-			$temp = self::structureProperty($property);
-			if(!is_null($temp)) {
-				// Get Apple X-ABLabels
-				if(isset($object->{$property->group . '.X-ABLABEL'})) {
-					$temp['label'] = $object->{$property->group . '.X-ABLABEL'}->value;
-					if($temp['label'] == '_$!<Other>!$_') {
-						$temp['label'] = OC_Contacts_App::$l10n->t('Other');
-					}
-				}
-				if(array_key_exists($pname, $details)) {
-					$details[$pname][] = $temp;
-				}
-				else{
-					$details[$pname] = array($temp);
-				}
-			}
-		}
-		return $details;
-	}
-
-	/**
-	 * @brief Data structure of properties
-	 * @param object $property
-	 * @return associative array
-	 *
-	 * returns an associative array with
-	 * ['name'] name of property
-	 * ['value'] htmlspecialchars escaped value of property
-	 * ['parameters'] associative array name=>value
-	 * ['checksum'] checksum of whole property
-	 * NOTE: $value is not escaped anymore. It shouldn't make any difference
-	 * but we should look out for any problems.
-	 */
-	public static function structureProperty($property) {
-		$value = $property->value;
-		//$value = htmlspecialchars($value);
-		if($property->name == 'ADR' || $property->name == 'N') {
-			$value = self::unescapeDelimiters($value);
-		} elseif($property->name == 'BDAY') {
-			if(strpos($value, '-') === false) {
-				if(strlen($value) >= 8) {
-					$value = substr($value, 0, 4).'-'.substr($value, 4, 2).'-'.substr($value, 6, 2);
-				} else {
-					return null; // Badly malformed :-(
-				}
-			}
-		}
-		if(is_string($value)) {
-			$value = strtr($value, array('\,' => ',', '\;' => ';'));
-		}
-		$temp = array(
-			'name' => $property->name,
-			'value' => $value,
-			'parameters' => array(),
-			'checksum' => md5($property->serialize()));
-		foreach($property->parameters as $parameter){
-			// Faulty entries by kaddressbook
-			// Actually TYPE=PREF is correct according to RFC 2426
-			// but this way is more handy in the UI. Tanghus.
-			if($parameter->name == 'TYPE' && strtoupper($parameter->value) == 'PREF') {
-				$parameter->name = 'PREF';
-				$parameter->value = '1';
-			}
-			// NOTE: Apparently Sabre_VObject_Reader can't always deal with value list parameters
-			// like TYPE=HOME,CELL,VOICE. Tanghus.
-			if (in_array($property->name, array('TEL', 'EMAIL')) && $parameter->name == 'TYPE') {
-				if (isset($temp['parameters'][$parameter->name])) {
-					$temp['parameters'][$parameter->name][] = $parameter->value;
-				}
-				else {
-					$temp['parameters'][$parameter->name] = array($parameter->value);
-				}
-			}
-			else{
-				$temp['parameters'][$parameter->name] = $parameter->value;
-			}
-		}
-		return $temp;
-	}
-
-	/**
-	 * @brief Move card(s) to an address book
-	 * @param integer $aid Address book id
-	 * @param $id Array or integer of cards to be moved.
-	 * @return boolean
-	 *
-	 */
-	public static function moveToAddressBook($aid, $id, $isAddressbook = false) {
-		OC_Contacts_App::getAddressbook($aid); // check for user ownership.
-		$addressbook = OC_Contacts_Addressbook::find($aid);
-		if ($addressbook['userid'] != OCP\User::getUser()) {
-			$sharedAddressbook = OCP\Share::getItemSharedWithBySource('addressbook', $aid);
-			if (!$sharedAddressbook || !($sharedAddressbook['permissions'] & OCP\Share::PERMISSION_CREATE)) {
-				return false;
-			}
-		}
-		if(is_array($id)) {
-			foreach ($id as $index => $cardId) {
-				$card = self::find($cardId);
-				if (!$card) {
-					unset($id[$index]);
-				}
-				$oldAddressbook = OC_Contacts_Addressbook::find($card['addressbookid']);
-				if ($oldAddressbook['userid'] != OCP\User::getUser()) {
-					$sharedContact = OCP\Share::getItemSharedWithBySource('contact', $cardId, OCP\Share::FORMAT_NONE, null, true);
-					if (!$sharedContact || !($sharedContact['permissions'] & OCP\Share::PERMISSION_DELETE)) {
-						unset($id[$index]);
-					}
-				}
-			}
-			$id_sql = join(',', array_fill(0, count($id), '?'));
-			$prep = 'UPDATE `*PREFIX*contacts_cards` SET `addressbookid` = ? WHERE `id` IN ('.$id_sql.')';
-			try {
-				$stmt = OCP\DB::prepare( $prep );
-				//$aid = array($aid);
-				$vals = array_merge((array)$aid, $id);
-				$result = $stmt->execute($vals);
-			} catch(Exception $e) {
-				OCP\Util::writeLog('contacts', __METHOD__.', exception: '.$e->getMessage(), OCP\Util::ERROR);
-				OCP\Util::writeLog('contacts', __METHOD__.', ids: '.join(',', $vals), OCP\Util::DEBUG);
-				OCP\Util::writeLog('contacts', __METHOD__.', SQL:'.$prep, OCP\Util::DEBUG);
-				return false;
-			}
-		} else {
-			$stmt = null;
-			if($isAddressbook) {
-				$stmt = OCP\DB::prepare( 'UPDATE `*PREFIX*contacts_cards` SET `addressbookid` = ? WHERE `addressbookid` = ?' );
-			} else {
-				$card = self::find($id);
-				if (!$card) {
-					return false;
-				}
-				$oldAddressbook = OC_Contacts_Addressbook::find($card['addressbookid']);
-				if ($oldAddressbook['userid'] != OCP\User::getUser()) {
-					$sharedContact = OCP\Share::getItemSharedWithBySource('contact', $id, OCP\Share::FORMAT_NONE, null, true);
-					if (!$sharedContact || !($sharedContact['permissions'] & OCP\Share::PERMISSION_DELETE)) {
-						return false;
-					}
-				}
-				$stmt = OCP\DB::prepare( 'UPDATE `*PREFIX*contacts_cards` SET `addressbookid` = ? WHERE `id` = ?' );
-			}
-			try {
-				$result = $stmt->execute(array($aid, $id));
-			} catch(Exception $e) {
-				OCP\Util::writeLog('contacts', __METHOD__.', exception: '.$e->getMessage(), OCP\Util::DEBUG);
-				OCP\Util::writeLog('contacts', __METHOD__.' id: '.$id, OCP\Util::DEBUG);
-				return false;
-			}
-		}
-		OC_Hook::emit('OC_Contacts_VCard', 'post_moveToAddressbook', array('aid' => $aid, 'id' => $id));
-		OC_Contacts_Addressbook::touch($aid);
-		return true;
-	}
-}
diff --git a/apps/contacts/photo.php b/apps/contacts/photo.php
deleted file mode 100644
index f5c8e6fe4b..0000000000
--- a/apps/contacts/photo.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Thomas Tanghus <thomas@tanghus.net>
- * Copyright (c) 2011, 2012 Bart Visscher <bartv@thisnet.nl>
- * Copyright (c) 2011 Jakob Sack mail@jakobsack.de
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-// Init owncloud
-
-OCP\User::checkLoggedIn();
-OCP\App::checkAppEnabled('contacts');
-
-function getStandardImage() {
-	//OCP\Response::setExpiresHeader('P10D');
-	OCP\Response::enableCaching();
-	OCP\Response::redirect(OCP\Util::imagePath('contacts', 'person_large.png'));
-}
-
-$id = isset($_GET['id']) ? $_GET['id'] : null;
-$etag = null;
-$caching = null;
-
-if(is_null($id)) {
-	getStandardImage();
-}
-
-if(!extension_loaded('gd') || !function_exists('gd_info')) {
-	OCP\Util::writeLog('contacts',
-		'photo.php. GD module not installed', OCP\Util::DEBUG);
-	getStandardImage();
-}
-
-$contact = OC_Contacts_App::getContactVCard($id);
-$image = new OC_Image();
-if (!$image) {
-	getStandardImage();
-}
-// invalid vcard
-if (is_null($contact)) {
-	OCP\Util::writeLog('contacts',
-		'photo.php. The VCard for ID ' . $id . ' is not RFC compatible',
-		OCP\Util::ERROR);
-} else {
-	// Photo :-)
-	if ($image->loadFromBase64($contact->getAsString('PHOTO'))) {
-		// OK
-		$etag = md5($contact->getAsString('PHOTO'));
-	}
-	else
-	// Logo :-/
-	if ($image->loadFromBase64($contact->getAsString('LOGO'))) {
-		// OK
-		$etag = md5($contact->getAsString('LOGO'));
-	}
-	if ($image->valid()) {
-		$modified = OC_Contacts_App::lastModified($contact);
-		// Force refresh if modified within the last minute.
-		if(!is_null($modified)) {
-			$caching = (time() - $modified->format('U') > 60) ? null : 0;
-		}
-		OCP\Response::enableCaching($caching);
-		if(!is_null($modified)) {
-			OCP\Response::setLastModifiedHeader($modified);
-		}
-		if($etag) {
-			OCP\Response::setETagHeader($etag);
-		}
-		$max_size = 200;
-		if ($image->width() > $max_size || $image->height() > $max_size) {
-			$image->resize($max_size);
-		}
-	}
-}
-if (!$image->valid()) {
-	// Not found :-(
-	getStandardImage();
-}
-header('Content-Type: '.$image->mimeType());
-$image->show();
-
diff --git a/apps/contacts/settings.php b/apps/contacts/settings.php
deleted file mode 100644
index 5f639399c9..0000000000
--- a/apps/contacts/settings.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-$tmpl = new OCP\Template( 'contacts', 'settings');
-$tmpl->assign('addressbooks', OC_Contacts_Addressbook::all(OCP\USER::getUser()), false);
-
-$tmpl->printPage();
diff --git a/apps/contacts/templates/index.php b/apps/contacts/templates/index.php
deleted file mode 100644
index 744381026a..0000000000
--- a/apps/contacts/templates/index.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<div id='notification'></div>
-<script type='text/javascript'>
-	var totalurl = '<?php echo OCP\Util::linkToRemote('carddav'); ?>addressbooks';
-	var categories = <?php echo json_encode($_['categories']); ?>;
-	var id = '<?php echo $_['id']; ?>';
-	var lang = '<?php echo OCP\Config::getUserValue(OCP\USER::getUser(), 'core', 'lang', 'en'); ?>';
-</script>
-<div id="leftcontent">
-	<div class="hidden" id="statusbar"></div>
-	<div id="contacts">
-	</div>
-	<div id="uploadprogressbar"></div>
-	<div id="bottomcontrols">
-			<button class="svg" id="contacts_newcontact" title="<?php echo $l->t('Add Contact'); ?>"><img class="svg" src="<?php echo OCP\Util::imagePath('contacts', 'contact-new.svg'); ?>" alt="<?php echo $l->t('Add Contact'); ?>" /></button>
-			<button class="svg import tip" title="<?php echo $l->t('Import'); ?>">
-				<img class="svg" src="<?php echo OCP\Util::imagePath('core', 'actions/upload.svg') ?>" alt="<?php echo $l->t('Import'); ?>" />
-			</button>
-			<button class="svg settings tip" title="<?php echo $l->t('Settings'); ?>"><img class="svg" src="<?php echo OCP\Util::imagePath('core', 'actions/settings.svg') ?>" alt="<?php echo $l->t('Addressbooks'); ?>" /></button>
-		<form id="import_upload_form" action="<?php echo OCP\Util::linkTo('contacts', 'ajax/uploadimport.php'); ?>" method="post" enctype="multipart/form-data" target="import_upload_target">
-			<input class="float" id="import_upload_start" type="file" accept="text/directory,text/vcard,text/x-vcard" name="importfile" />
-			<input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $_['uploadMaxFilesize'] ?>" id="max_upload">
-		</form>
-		<iframe name="import_upload_target" id='import_upload_target' src=""></iframe>
-	</div>
-</div>
-<div id="rightcontent" class="rightcontent" data-id="<?php echo $_['id']; ?>">
-	<?php
-		if($_['has_contacts']) {
-			echo $this->inc('part.contact');
-		}
-		else{
-			echo $this->inc('part.no_contacts');
-		}
-	?>
-	<div class="hidden popup" id="ninjahelp">
-		<a class="close" tabindex="0" role="button" title="<?php echo $l->t('Close'); ?>"></a>
-		<h2><?php echo $l->t('Keyboard shortcuts'); ?></h2>
-		<div class="help-section">
-			<h3><?php echo $l->t('Navigation'); ?></h3>
-			<dl>
-				<dt>j/Down</dt>
-				<dd><?php echo $l->t('Next contact in list'); ?></dd>
-				<dt>k/Up</dt>
-				<dd><?php echo $l->t('Previous contact in list'); ?></dd>
-				<dt>o</dt>
-				<dd><?php echo $l->t('Expand/collapse current addressbook'); ?></dd>
-				<dt>n/PageDown</dt>
-				<dd><?php echo $l->t('Next addressbook'); ?></dd>
-				<dt>p/PageUp</dt>
-				<dd><?php echo $l->t('Previous addressbook'); ?></dd>
-			</dl>
-		</div>
-		<div class="help-section">
-			<h3><?php echo $l->t('Actions'); ?></h3>
-			<dl>
-				<dt>r</dt>
-				<dd><?php echo $l->t('Refresh contacts list'); ?></dd>
-				<dt>a</dt>
-				<dd><?php echo $l->t('Add new contact'); ?></dd>
-				<!-- dt>Shift-a</dt>
-				<dd><?php echo $l->t('Add new addressbook'); ?></dd -->
-				<dt>Shift-Delete</dt>
-				<dd><?php echo $l->t('Delete current contact'); ?></dd>
-			</dl>
-		</div>
-	</div>
-</div>
-<!-- Dialogs -->
-<div id="dialog_holder"></div>
-<!-- End of Dialogs -->
-<menu type="context" id="addressbookmenu">
-	<menuitem label="Delete" icon="<?php echo OCP\Util::imagePath('core', 'actions/delete.svg') ?>" onclick="alert('Really? ' + $(this).attr('data-id'))"></menuitem>
-	<menuitem label="Rename" icon="<?php echo OCP\Util::imagePath('core', 'actions/rename.svg') ?>" onclick="alert('Can\'t do that')"></menuitem>
-</menu>
diff --git a/apps/contacts/templates/part.contact.php b/apps/contacts/templates/part.contact.php
deleted file mode 100644
index 87ed07c0ec..0000000000
--- a/apps/contacts/templates/part.contact.php
+++ /dev/null
@@ -1,145 +0,0 @@
-<div id="appsettings" class="popup bottomleft hidden"></div>
-<?php
-$id = isset($_['id']) ? $_['id'] : '';
-?>
-<div id="card">
-	<form class="float" id="file_upload_form" action="<?php echo OCP\Util::linkTo('contacts', 'ajax/uploadphoto.php'); ?>" method="post" enctype="multipart/form-data" target="file_upload_target">
-		<input type="hidden" name="requesttoken" value="<?php echo $_['requesttoken'] ?>">
-		<input type="hidden" name="id" value="<?php echo $_['id'] ?>">
-		<input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $_['uploadMaxFilesize'] ?>" id="max_upload">
-		<input type="hidden" class="max_human_file_size" value="(max <?php echo $_['uploadMaxHumanFilesize']; ?>)">
-		<input id="file_upload_start" type="file" accept="image/*" name="imagefile" />
-	</form>
-
-	<div id="contact_photo">
-
-	<iframe name="file_upload_target" id='file_upload_target' src=""></iframe>
-	<div class="tip propertycontainer" id="contacts_details_photo_wrapper" title="<?php echo $l->t('Drop photo to upload'); ?> (max <?php echo $_['uploadMaxHumanFilesize']; ?>)" data-element="PHOTO">
-	<ul id="phototools" class="transparent hidden">
-		<li><a class="svg delete" title="<?php echo $l->t('Delete current photo'); ?>"></a></li>
-		<li><a class="svg edit" title="<?php echo $l->t('Edit current photo'); ?>"></a></li>
-		<li><a class="svg upload" title="<?php echo $l->t('Upload new photo'); ?>"></a></li>
-		<li><a class="svg cloud" title="<?php echo $l->t('Select photo from ownCloud'); ?>"></a></li>
-	</ul>
-	</div>
-	</div> <!-- contact_photo -->
-
-	<form method="post">
-
-	<div id="contact_identity">
-	<input type="hidden" name="id" value="<?php echo $_['id'] ?>">
-	<input type="hidden" name="requesttoken" value="<?php echo $_['requesttoken'] ?>">
-	<fieldset id="ident" class="contactpart">
-	<span class="propertycontainer" data-element="N"><input type="hidden" id="n" class="contacts_property" name="value" value="" /></span>
-	<span id="name" class="propertycontainer" data-element="FN">
-	<select class="float" id="fn_select" title="<?php echo $l->t('Format custom, Short name, Full name, Reverse or Reverse with comma'); ?>">
-	</select><a role="button" id="edit_name" class="action edit" title="<?php echo $l->t('Edit name details'); ?>"></a>
-	</span>
-	<dl id="identityprops" class="form">
-		<dt class="hidden" id="org_label" data-element="ORG"><label for="org"><?php echo $l->t('Organization'); ?></label></dt>
-		<dd class="propertycontainer hidden" id="org_value" data-element="ORG"><input id="org" required="required" type="text" class="contacts_property big" name="value" value="" placeholder="<?php echo $l->t('Organization'); ?>" /><a role="button" class="action delete" title="<?php echo $l->t('Delete'); ?>"></a></dd>
-		<dt class="hidden" id="nickname_label" data-element="NICKNAME"><label for="nickname"><?php echo $l->t('Nickname'); ?></label></dt>
-		<dd class="propertycontainer hidden" id="nickname_value" data-element="NICKNAME"><input id="nickname" required="required" type="text" class="contacts_property big" name="value" value="" placeholder="<?php echo $l->t('Enter nickname'); ?>" /><a role="button" class="action delete" title="<?php echo $l->t('Delete'); ?>"></a></dd>
-		<dt class="hidden" id="url_label" data-element="URL"><label for="url"><?php echo $l->t('Web site'); ?></label></dt>
-		<dd class="propertycontainer hidden" id="url_value" data-element="URL"><input id="url" required="required" type="url" class="contacts_property big" name="value" value="" placeholder="<?php echo $l->t('http://www.somesite.com'); ?>" /><a role="button" class="action globe" title="<?php echo $l->t('Go to web site'); ?>"><a role="button" class="action delete" title="<?php echo $l->t('Delete'); ?>"></a></dd>
-		<dt class="hidden" id="bday_label" data-element="BDAY"><label for="bday"><?php echo $l->t('Birthday'); ?></label></dt>
-		<dd class="propertycontainer hidden" id="bday_value" data-element="BDAY"><input id="bday"  required="required" name="value" type="text" class="contacts_property big" value="" placeholder="<?php echo $l->t('dd-mm-yyyy'); ?>" /><a role="button" class="action delete" title="<?php echo $l->t('Delete'); ?>"></a></dd>
-		<dt class="hidden" id="categories_label" data-element="CATEGORIES"><label for="categories"><?php echo $l->t('Groups'); ?></label></dt>
-		<dd class="propertycontainer hidden" id="categories_value" data-element="CATEGORIES"><input id="categories" required="required" type="text" class="contacts_property bold" name="value" value="" placeholder="
-<?php echo $l->t('Separate groups with commas'); ?>" />
-		<a role="button" class="action delete" title="<?php echo $l->t('Delete'); ?>"></a><a role="button" class="action edit" title="<?php echo $l->t('Edit groups'); ?>"></a></dd>
-	</dl>
-	</fieldset>
-	</div> <!-- contact_identity -->
-
-	<!-- email addresses -->
-	<div id="emails" class="hidden contactsection">
-		<ul id="emaillist" class="propertylist">
-		<li class="template hidden" data-element="EMAIL">
-			<input type="checkbox" class="contacts_property tip" name="parameters[TYPE][]" value="PREF" title="<?php echo $l->t('Preferred'); ?>" />
-			<input type="email" required="required" class="nonempty contacts_property" name="value" value="" x-moz-errormessage="<?php echo $l->t('Please specify a valid email address.'); ?>" placeholder="<?php echo $l->t('Enter email address'); ?>" />
-			<select multiple="multiple" name="parameters[TYPE][]">
-				<?php echo OCP\html_select_options($_['email_types'], array()) ?>
-			</select>
-			<span class="listactions"><a class="action mail" title="<?php echo $l->t('Mail to address'); ?>"></a>
-			<a role="button" class="action delete" title="<?php echo $l->t('Delete email address'); ?>"></a></span></li>
-		</ul>
-	</div> <!-- email addresses-->
-
-	<!-- Phone numbers -->
-	<div id="phones" class="hidden contactsection">
-		<ul id="phonelist" class="propertylist">
-			<li class="template hidden" data-element="TEL">
-			<input type="checkbox" class="contacts_property tip" name="parameters[TYPE][]" value="PREF" title="<?php echo $l->t('Preferred'); ?>" />
-			<input type="text" required="required" class="nonempty contacts_property" name="value" value=""
-					placeholder="<?php echo $l->t('Enter phone number'); ?>" />
-			<select multiple="multiple" name="parameters[TYPE][]">
-				<?php echo OCP\html_select_options($_['phone_types'], array()) ?>
-			</select>
-			<a role="button" class="action delete" title="<?php echo $l->t('Delete phone number'); ?>"></a></li>
-		</ul>
-	</div> <!-- Phone numbers -->
-
-	<!-- IMPP -->
-	<div id="ims" class="hidden contactsection">
-		<ul id="imlist" class="propertylist">
-			<li class="template hidden" data-element="IMPP">
-			<div class="select_wrapper">
-			<select class="impp" name="parameters[X-SERVICE-TYPE]">
-				<?php echo OCP\html_select_options($_['im_protocols'], array()) ?>
-			</select>
-			</div>
-			<div class="select_wrapper">
-			<select class="types" name="parameters[TYPE][]">
-				<option></option>
-				<?php echo OCP\html_select_options($_['impp_types'], array()) ?>
-			</select>
-			</div>
-			<input type="checkbox" class="contacts_property impp tip" name="parameters[TYPE][]" value="PREF" title="<?php echo $l->t('Preferred'); ?>" />
-			<input type="text" required="required" class="nonempty contacts_property" name="value" value=""
-					placeholder="<?php echo $l->t('Instant Messenger'); ?>" />
-			<a role="button" class="action delete" title="<?php echo $l->t('Delete IM'); ?>"></a></li>
-		</ul>
-	</div> <!-- IMPP -->
-
-	<!-- Addresses -->
-	<div id="addresses" class="hidden contactsection">
-		<dl class="addresscard template hidden" data-element="ADR"><dt>
-		<input class="adr contacts_property" name="value" type="hidden" value="" />
-		<input type="hidden" class="adr_type contacts_property" name="parameters[TYPE][]" value="" />
-		<span class="adr_type_label"></span><a class="action globe" title="<?php echo $l->t('View on map'); ?>"></a><a class="action edit" title="<?php echo $l->t('Edit address details'); ?>"></a><a role="button" class="action delete" title="Delete address"></a>
-		</dt><dd><ul class="addresslist"></ul></dd></dl>
-	</div> <!-- Addresses -->
-
-	<div id="contact_note" class="hidden contactsection">
-		<div id="note" class="propertycontainer" data-element="NOTE">
-			<textarea class="contacts_property" name="value" required="required" placeholder="<?php echo $l->t('Add notes here.'); ?>" cols="60" wrap="hard"></textarea>
-		</div>
-	</div> <!-- contact_note -->
-
-	</form>
-
-	<div id="actionbar">
-		<div id="contacts_propertymenu">
-		<button class="button" id="contacts_propertymenu_button"><?php echo $l->t('Add field'); ?></button>
-		<ul id="contacts_propertymenu_dropdown" role="menu" class="hidden">
-			<li><a role="menuitem" data-type="ORG"><?php echo $l->t('Organization'); ?></a></li>
-			<li><a role="menuitem" data-type="NICKNAME"><?php echo $l->t('Nickname'); ?></a></li>
-			<li><a role="menuitem" data-type="BDAY"><?php echo $l->t('Birthday'); ?></a></li>
-			<li><a role="menuitem" data-type="TEL"><?php echo $l->t('Phone'); ?></a></li>
-			<li><a role="menuitem" data-type="EMAIL"><?php echo $l->t('Email'); ?></a></li>
-			<li><a role="menuitem" data-type="IMPP"><?php echo $l->t('Instant Messaging'); ?></a></li>
-			<li><a role="menuitem" data-type="ADR"><?php echo $l->t('Address'); ?></a></li>
-			<li><a role="menuitem" data-type="NOTE"><?php echo $l->t('Note'); ?></a></li>
-			<li><a role="menuitem" data-type="URL"><?php echo $l->t('Web site'); ?></a></li>
-			<li><a role="menuitem" data-type="CATEGORIES"><?php echo $l->t('Groups'); ?></a></li>
-		</ul>
-		</div>
-		<button class="svg action" id="contacts_downloadcard" title="<?php echo $l->t('Download contact');?>"></button>
-		<button class="svg action" id="contacts_deletecard" title="<?php echo $l->t('Delete contact');?>"></button>
-	</div>
-
-</div> <!-- card -->
-<div id="edit_photo_dialog" title="Edit photo">
-		<div id="edit_photo_dialog_img"></div>
-</div>
diff --git a/apps/contacts/templates/part.cropphoto.php b/apps/contacts/templates/part.cropphoto.php
deleted file mode 100644
index 3f5817622b..0000000000
--- a/apps/contacts/templates/part.cropphoto.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php 
-$id = $_['id'];
-$tmpkey = $_['tmpkey'];
-$requesttoken = $_['requesttoken'];
-?>
-<script type="text/javascript">
-	jQuery(function($) {
-		$('#cropbox').Jcrop({
-			onChange:	showCoords,
-			onSelect:	showCoords,
-			onRelease:	clearCoords,
-			maxSize:	[399, 399],
-			bgColor:	'black',
-			bgOpacity:	.4,
-			boxWidth: 	400,
-			boxHeight:	400,
-			setSelect:	[ 100, 130, 50, 50 ]//,
-			//aspectRatio: 0.8
-		});
-	});
-	// Simple event handler, called from onChange and onSelect
-	// event handlers, as per the Jcrop invocation above
-	function showCoords(c) {
-		$('#x1').val(c.x);
-		$('#y1').val(c.y);
-		$('#x2').val(c.x2);
-		$('#y2').val(c.y2);
-		$('#w').val(c.w);
-		$('#h').val(c.h);
-	};
-
-	function clearCoords() {
-		$('#coords input').val('');
-	};
-	/*
-	$('#coords').submit(function() {
-		alert('Handler for .submit() called.');
-		return true;
-	});*/
-</script>
-<?php if(OC_Cache::hasKey($tmpkey)) { ?>
-<img id="cropbox" src="<?php echo OCP\Util::linkToAbsolute('contacts', 'tmpphoto.php'); ?>?tmpkey=<?php echo $tmpkey; ?>" />
-<form id="cropform"
-	class="coords"
-	method="post"
-	enctype="multipart/form-data"
-	target="crop_target"
-	action="<?php echo OCP\Util::linkToAbsolute('contacts', 'ajax/savecrop.php'); ?>">
-
-	<input type="hidden" id="id" name="id" value="<?php echo $id; ?>" />
-	<input type="hidden" name="requesttoken" value="<?php echo $requesttoken; ?>">
-	<input type="hidden" id="tmpkey" name="tmpkey" value="<?php echo $tmpkey; ?>" />
-	<fieldset id="coords">
-	<input type="hidden" id="x1" name="x1" value="" />
-	<input type="hidden" id="y1" name="y1" value="" />
-	<input type="hidden" id="x2" name="x2" value="" />
-	<input type="hidden" id="y2" name="y2" value="" />
-	<input type="hidden" id="w" name="w" value="" />
-	<input type="hidden" id="h" name="h" value="" />
-	</fieldset>
-	<iframe name="crop_target" id='crop_target' src=""></iframe>
-</form>
-<?php
-} else { 
-	echo $l->t('The temporary image has been removed from cache.');
-}
-?>
diff --git a/apps/contacts/templates/part.edit_address_dialog.php b/apps/contacts/templates/part.edit_address_dialog.php
deleted file mode 100644
index 81e24ba4d0..0000000000
--- a/apps/contacts/templates/part.edit_address_dialog.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-$adr = isset($_['adr'])?$_['adr']:array();
-$id = isset($_['id'])?$_['id']:array();
-$types = isset($_['types'])?$_['types']:array();
-?>
-<div id="edit_address_dialog" title="<?php echo $l->t('Edit address'); ?>">
-	<fieldset id="address">
-		<dl class="form">
-			<dt>
-				<label class="label" for="adr_type"><?php echo $l->t('Type'); ?></label>
-			</dt>
-			<dd>
-				<select id="adr_type" name="parameters[ADR][TYPE]" size="1">
-					<?php echo OCP\html_select_options($_['adr_types'], $types) ?>
-				</select>
-			</dd>
-			<dt>
-				<label class="label" for="adr_pobox"><?php echo $l->t('PO Box'); ?></label>
-			</dt>
-			<dd>
-				<input type="text" id="adr_pobox" name="value[ADR][0]" placeholder="<?php echo $l->t('PO Box'); ?>" value="<?php echo isset($adr[0])?$adr[0]:''; ?>">
-			</dd>
-			<dt>
-				<label class="label" for="adr_street"><?php echo $l->t('Street address'); ?></label>
-			</dt>
-			<dd>
-				<input type="text" id="adr_street" name="value[ADR][2]" placeholder="<?php echo $l->t('Street and number'); ?>" value="<?php echo isset($adr[2])?$adr[2]:''; ?>">
-			</dd>
-			<dt>
-				<label class="label" for="adr_extended"><?php echo $l->t('Extended'); ?></label>
-			</dt>
-			<dd>
-				<input type="text" id="adr_extended" name="value[ADR][1]" placeholder="<?php echo $l->t('Apartment number etc.'); ?>" value="<?php echo isset($adr[1])?$adr[1]:''; ?>">
-			</dd>
-			<dt>
-				<label class="label" for="adr_city"><?php echo $l->t('City'); ?></label>
-			</dt>
-			<dd>
-				<input type="text" id="adr_city" name="value[ADR][3]" placeholder="<?php echo $l->t('City'); ?>" value="<?php echo isset($adr[3])?$adr[3]:''; ?>">
-			</dd>
-			<dt>
-				<label class="label" for="adr_region"><?php echo $l->t('Region'); ?></label>
-			</dt>
-			<dd>
-				<input type="text" id="adr_region" name="value[ADR][4]" placeholder="<?php echo $l->t('E.g. state or province'); ?>" value="<?php echo isset($adr[4])?$adr[4]:''; ?>">
-			</dd>
-			<dt>
-				<label class="label" for="adr_zipcode"><?php echo $l->t('Zipcode'); ?></label>
-			</dt>
-			<dd>
-				<input type="text" id="adr_zipcode" name="value[ADR][5]" placeholder="<?php echo $l->t('Postal code'); ?>" value="<?php echo isset($adr[5])?$adr[5]:''; ?>">
-			</dd>
-			<dt>
-				<label class="label" for="adr_country"><?php echo $l->t('Country'); ?></label>
-			</dt>
-			<dd>
-				<input type="text" id="adr_country" name="value[ADR][6]" placeholder="<?php echo $l->t('Country'); ?>" value="<?php echo isset($adr[6])?$adr[6]:''; ?>">
-			</dd>
-		</dl>
-		<div style="width: 100%; text-align:center;">Powered by <a href="http://geonames.org/" target="_blank">geonames.org</a></div>
-	</fieldset>
-	</form>
-</div>
diff --git a/apps/contacts/templates/part.edit_name_dialog.php b/apps/contacts/templates/part.edit_name_dialog.php
deleted file mode 100644
index f984c232a3..0000000000
--- a/apps/contacts/templates/part.edit_name_dialog.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-$name = isset($_['name'])?$_['name']:'';
-//print_r($name);
-$id = isset($_['id'])?$_['id']:'';
-$addressbooks = isset($_['addressbooks'])?$_['addressbooks']:null;
-?>
-<div id="edit_name_dialog" title="Edit name">
-	<form>
-	<fieldset>
-	<dl class="form">
-		<?php if(!is_null($addressbooks)) { 
-			if(count($_['addressbooks'])==1) {
-		?>
-			<input type="hidden" id="aid" name="aid" value="<?php echo $_['addressbooks'][0]['id']; ?>">
-		<?php } else { ?>
-		<dt><label for="addressbook"><?php echo $l->t('Addressbook'); ?></label></dt>
-		<dd>
-			<select id="aid" name="aid" size="1">
-				<?php echo OCP\html_select_options($_['addressbooks'], null, array('value'=>'id', 'label'=>'displayname')); ?>
-			</select>
-		</dd>
-		<?php }} ?>
-		<dt><label for="pre"><?php echo $l->t('Hon. prefixes'); ?></label></dt>
-		<dd>
-			<input name="pre" id="pre" value="<?php echo isset($name[3]) ? $name[3] : ''; ?>" type="text" list="prefixes" />
-			<datalist id="prefixes">
-				<option value="<?php echo $l->t('Miss'); ?>">
-				<option value="<?php echo $l->t('Ms'); ?>">
-				<option value="<?php echo $l->t('Mr'); ?>">
-				<option value="<?php echo $l->t('Sir'); ?>">
-				<option value="<?php echo $l->t('Mrs'); ?>">
-				<option value="<?php echo $l->t('Dr'); ?>">
-			</datalist>
-		</dd>
-		<dt><label for="giv"><?php echo $l->t('Given name'); ?></label></dt>
-		<dd><input name="giv" id="giv" value="<?php echo isset($name[1]) ? $name[1] : ''; ?>" type="text" /></dd>
-		<dt><label for="add"><?php echo $l->t('Additional names'); ?></label></dt>
-		<dd><input name="add" id="add" value="<?php echo isset($name[2]) ? $name[2] : ''; ?>" type="text" /></dd>
-		<dt><label for="fam"><?php echo $l->t('Family name'); ?></label></dt>
-		<dd><input name="fam" id="fam" value="<?php echo isset($name[0]) ? $name[0] : ''; ?>" type="text" /></dd>
-		<dt><label for="suf"><?php echo $l->t('Hon. suffixes'); ?></label></dt>
-		<dd>
-			<input name="suf" id="suf" value="<?php echo isset($name[4]) ? $name[4] : ''; ?>" type="text" list="suffixes" />
-			<datalist id="suffixes">
-				<option value="<?php echo $l->t('J.D.'); ?>">
-				<option value="<?php echo $l->t('M.D.'); ?>">
-				<option value="<?php echo $l->t('D.O.'); ?>">
-				<option value="<?php echo $l->t('D.C.'); ?>">
-				<option value="<?php echo $l->t('Ph.D.'); ?>">
-				<option value="<?php echo $l->t('Esq.'); ?>">
-				<option value="<?php echo $l->t('Jr.'); ?>">
-				<option value="<?php echo $l->t('Sn.'); ?>">
-			</datalist>
-		</dd>
-	</dl>
-	</fieldset>
-	</form>
-</div>
diff --git a/apps/contacts/templates/part.import.php b/apps/contacts/templates/part.import.php
deleted file mode 100644
index 32c8dc50dd..0000000000
--- a/apps/contacts/templates/part.import.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<div id="contacts_import_dialog" title="<?php echo $l->t("Import a contacts file"); ?>">
-	<div id="form_container">
-		<input type="hidden" id="filename" value="<?php echo $_['filename'];?>">
-		<input type="hidden" id="path" value="<?php echo $_['path'];?>">
-		<input type="hidden" id="progresskey" value="<?php echo rand() ?>">
-		<p class="bold" style="text-align:center;"><?php echo $l->t('Please choose the addressbook'); ?></p>
-		<select style="width:100%;" id="contacts" name="contacts">
-		<?php
-		$contacts_options = OC_Contacts_Addressbook::all(OCP\USER::getUser());
-		$contacts_options[] = array('id'=>'newaddressbook', 'displayname'=>$l->t('create a new addressbook'));
-		echo OCP\html_select_options($contacts_options, $contacts_options[0]['id'], array('value'=>'id', 'label'=>'displayname'));
-		?>
-		</select>
-		<div id="newaddressbookform" style="display: none;">
-			<input type="text" style="width: 97%;" placeholder="<?php echo $l->t('Name of new addressbook'); ?>" id="newaddressbook" name="newaddressbook">
-		</div>
-		<input type="button" value="<?php echo $l->t("Import");?>!" id="startimport">
-	</div>
-<div id="progressbar_container" style="display: none">
-	<p style="text-align:center;"><?php echo $l->t('Importing contacts'); ?></p>
-	<div id="progressbar"></div>
-		<div id="import_done" style="display: none;">
-			<p style="text-align:center;"></p>
-			<input type="button" value="<?php echo $l->t('Close'); ?>" id="import_done_button">
-		</div>
-	</div>
-</div>
\ No newline at end of file
diff --git a/apps/contacts/templates/part.no_contacts.php b/apps/contacts/templates/part.no_contacts.php
deleted file mode 100644
index 1802939483..0000000000
--- a/apps/contacts/templates/part.no_contacts.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<div id="appsettings" class="popup bottomleft hidden"></div>
-<div id="firstrun">
-	<?php echo $l->t('You have no contacts in your addressbook.') ?>
-	<div id="selections">
-		<input type="button" value="<?php echo $l->t('Add contact') ?>" onclick="OC.Contacts.Card.editNew()" />
-	</div>
-</div>
diff --git a/apps/contacts/templates/part.selectaddressbook.php b/apps/contacts/templates/part.selectaddressbook.php
deleted file mode 100644
index 812a3b891f..0000000000
--- a/apps/contacts/templates/part.selectaddressbook.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<div id="selectaddressbook_dialog" title="<?php echo $l->t("Select Address Books"); ?>">
-<script type="text/javascript">
-$(document).ready(function() {
-	$('input.name,input.desc').on('focus', function(e) {
-		$('#book_new').prop('checked', true);
-	});
-});
-</script>
-<form>
-<table style="width: 100%">
-	<?php foreach($_['addressbooks'] as $idx => $addressbook) { ?>
-	<tr>
-		<td>
-			<input id="book_<?php echo $addressbook['id']; ?>" name="book" type="radio" value="<?php echo $addressbook['id']; ?>" <?php echo ($idx==0?'checked="checked"':'')?>>
-		</td>
-		<td>
-			<label for="book_<?php echo $addressbook['id']; ?>"><?php echo $addressbook['displayname']; ?></label>
-		</td>
-		<td><?php echo $addressbook['description']; ?></td>
-	</tr>
-	<?php } ?>
-	<tr>
-		<td>
-			<input id="book_new" name="book" type="radio" value="new">
-		</td>
-		<th>
-			<input type="text" class="name" name="displayname" placeholder="<?php echo $l->t("Enter name"); ?>" />
-		</th>
-		<td><input type="text" class="desc" name="description" placeholder="<?php echo $l->t("Enter description"); ?>" /></td>
-	</tr>
-</table>
-</form>
-</div>
-
diff --git a/apps/contacts/templates/settings.php b/apps/contacts/templates/settings.php
deleted file mode 100644
index e3536c7b46..0000000000
--- a/apps/contacts/templates/settings.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<form id="contacts-settings">
-	<fieldset class="personalblock">
-		<?php echo $l->t('CardDAV syncing addresses'); ?> (<a href="http://owncloud.org/synchronisation/" target="_blank"><?php echo $l->t('more info'); ?></a>)
-		<dl>
-		<dt><?php echo $l->t('Primary address (Kontact et al)'); ?></dt>
-		<dd><code><?php echo OCP\Util::linkToRemote('carddav'); ?></code></dd>
-		<dt><?php echo $l->t('iOS/OS X'); ?></dt>
-		<dd><code><?php echo OCP\Util::linkToRemote('carddav'); ?>principals/<?php echo OCP\USER::getUser(); ?></code>/</dd>
-		<dt class="hidden"><?php echo $l->t('Addressbooks'); ?></dt>
-		<dd class="addressbooks-settings hidden">
-			<table>
-			<?php foreach($_['addressbooks'] as $addressbook) { ?>
-			<tr class="addressbook" data-id="<?php echo $addressbook['id'] ?>" data-uri="<?php echo $addressbook['uri'] ?>">
-				<td class="active">
-					<input type="checkbox" <?php echo (($addressbook['active']) == '1' ? ' checked="checked"' : ''); ?> />
-				</td>
-				<td class="name"><?php echo $addressbook['displayname'] ?></td>
-				<td class="description"><?php echo $addressbook['description'] ?></td>
-				<td class="action">
-					<a class="svg action globe" title="<?php echo $l->t('Show CardDav link'); ?>"></a>
-				</td>
-				<td class="action">
-					<a class="svg action cloud" title="<?php echo $l->t('Show read-only VCF link'); ?>"></a>
-				</td>
-				<td class="action">
-					<a class="svg action share" data-item-type="addressbook" data-item="<?php echo $addressbook['id'] ?>" title="<?php echo $l->t("Share"); ?>"></a>
-				</td>
-				<td class="action">
-					<a class="svg action download" title="<?php echo $l->t('Download'); ?>"
-						href="<?php echo OCP\Util::linkToAbsolute('contacts', 'export.php'); ?>?bookid=<?php echo $addressbook['id'] ?>"></a>
-				</td>
-				<td class="action">
-					<a class="svg action edit" title="<?php echo $l->t("Edit"); ?>"></a>
-				</td>
-				<td class="action">
-					<a class="svg action delete" title="<?php echo $l->t("Delete"); ?>"></a>
-				</td>
-			</tr>
-			<?php } ?>
-			</table>
-			<div class="actions" style="width: 100%;">
-				<input class="active hidden" type="checkbox" />
-				<button class="new"><?php echo $l->t('New Address Book') ?></button>
-				<input class="name hidden" type="text" autofocus="autofocus" placeholder="<?php echo $l->t('Name'); ?>" />
-				<input class="description hidden" type="text" placeholder="<?php echo $l->t('Description'); ?>" />
-				<button class="save hidden"><?php echo $l->t('Save') ?></button>
-				<button class="cancel hidden"><?php echo $l->t('Cancel') ?></button>
-			</div>
-		</dd>
-		</dl>
-		<div style="width: 100%; clear: both;">
-			<button class="moreless"><?php echo $l->t('More...') ?></button>
-		</div>
-	</fieldset>
-</form>
diff --git a/apps/contacts/thumbnail.php b/apps/contacts/thumbnail.php
deleted file mode 100644
index 1e3714ae6c..0000000000
--- a/apps/contacts/thumbnail.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-/**
- * ownCloud - Addressbook
- *
- * @author Thomas Tanghus
- * @copyright 2011-2012 Thomas Tanghus <thomas@tanghus.net>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *
- * You should have received a copy of the GNU Affero General Public
- * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-OCP\JSON::checkLoggedIn();
-//OCP\User::checkLoggedIn();
-OCP\App::checkAppEnabled('contacts');
-session_write_close();
-
-function getStandardImage() {
-	OCP\Response::enableCaching();
-	OCP\Response::redirect(OCP\Util::imagePath('contacts', 'person.png'));
-}
-
-if(!extension_loaded('gd') || !function_exists('gd_info')) {
-	OCP\Util::writeLog('contacts',
-		'thumbnail.php. GD module not installed', OCP\Util::DEBUG);
-	getStandardImage();
-	exit();
-}
-
-$id = $_GET['id'];
-$caching = null;
-
-$contact = OC_Contacts_App::getContactVCard($id);
-
-// invalid vcard
-if(is_null($contact)) {
-	OCP\Util::writeLog('contacts',
-		'thumbnail.php. The VCard for ID ' . $id . ' is not RFC compatible',
-		OCP\Util::ERROR);
-	getStandardImage();
-	exit();
-}
-OCP\Response::enableCaching($caching);
-OC_Contacts_App::setLastModifiedHeader($contact);
-
-$thumbnail_size = 23;
-
-// Find the photo from VCard.
-$image = new OC_Image();
-$photo = $contact->getAsString('PHOTO');
-if($photo) {
-	if($image->loadFromBase64($photo)) {
-		if($image->centerCrop()) {
-			if($image->resize($thumbnail_size)) {
-				$modified = OC_Contacts_App::lastModified($contact);
-				// Force refresh if modified within the last minute.
-				if(!is_null($modified)) {
-					$caching = (time() - $modified->format('U') > 60) ? null : 0;
-				}
-				OCP\Response::enableCaching($caching);
-				if(!is_null($modified)) {
-					OCP\Response::setLastModifiedHeader($modified);
-				}
-				OCP\Response::setETagHeader(md5($photo));
-				if($image->show()) {
-					exit();
-				} else {
-					OCP\Util::writeLog('contacts',
-						'thumbnail.php. Couldn\'t display thumbnail for ID ' . $id,
-						OCP\Util::ERROR);
-				}
-			} else {
-				OCP\Util::writeLog('contacts',
-					'thumbnail.php. Couldn\'t resize thumbnail for ID ' . $id,
-					OCP\Util::ERROR);
-			}
-		}else{
-			OCP\Util::writeLog('contacts',
-				'thumbnail.php. Couldn\'t crop thumbnail for ID ' . $id,
-				OCP\Util::ERROR);
-		}
-	} else {
-		OCP\Util::writeLog('contacts',
-			'thumbnail.php. Couldn\'t load image string for ID ' . $id,
-			OCP\Util::ERROR);
-	}
-}
-getStandardImage();
diff --git a/apps/contacts/tmpphoto.php b/apps/contacts/tmpphoto.php
deleted file mode 100644
index 156d5c8030..0000000000
--- a/apps/contacts/tmpphoto.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/**
- * ownCloud - Image generator for contacts.
- *
- * @author Thomas Tanghus
- * @copyright 2012 Thomas Tanghus <thomas@tanghus.net>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *
- * You should have received a copy of the GNU Affero General Public
- * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-$tmpkey = $_GET['tmpkey'];
-$maxsize = isset($_GET['maxsize']) ? $_GET['maxsize'] : -1;
-header("Cache-Control: no-cache, no-store, must-revalidate");
-
-OCP\Util::writeLog('contacts', 'tmpphoto.php: tmpkey: '.$tmpkey, OCP\Util::DEBUG);
-
-$image = new OC_Image();
-$image->loadFromData(OC_Cache::get($tmpkey));
-if($maxsize != -1) {
-	$image->resize($maxsize);
-}
-$image();
diff --git a/apps/external/ajax/setsites.php b/apps/external/ajax/setsites.php
deleted file mode 100644
index 0f9e061d0e..0000000000
--- a/apps/external/ajax/setsites.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-/**
- * 2012 Frank Karlitschek frank@owncloud.org
- * This file is licensed under the Affero General Public License version 3 or later.
- * See the COPYING-README file.
- */
-
- 
-OCP\User::checkAdminUser();
-OCP\JSON::callCheck();
-
-$sites = array();
-for ($i = 0; $i < sizeof($_POST['site_name']); $i++) {
-	if (!empty($_POST['site_name'][$i]) && !empty($_POST['site_url'][$i])) {
-		array_push($sites, array(strip_tags($_POST['site_name'][$i]), strip_tags($_POST['site_url'][$i])));
-	}
-}
-
-if (sizeof($sites) == 0)
-	OC_Appconfig::deleteKey('external', 'sites');
-else
-	OCP\Config::setAppValue('external', 'sites', json_encode($sites));
-
-echo 'true';
diff --git a/apps/external/appinfo/app.php b/apps/external/appinfo/app.php
deleted file mode 100644
index 1a02f3a1be..0000000000
--- a/apps/external/appinfo/app.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-/**
- * ownCloud - External plugin
- *
- * @author Frank Karlitschek
- * @copyright 2012 Frank Karlitschek frank@owncloud.org
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either 
- * version 3 of the License, or any later version.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *  
- * You should have received a copy of the GNU Lesser General Public 
- * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
- * 
- */
-
-OC::$CLASSPATH['OC_External'] = 'apps/external/lib/external.php';
-OCP\Util::addStyle( 'external', 'style');
-
-OCP\App::registerAdmin('external', 'settings');
-
-$sites = OC_External::getSites();
-for ($i = 0; $i < sizeof($sites); $i++) {
-	OCP\App::addNavigationEntry(
-			array('id' => 'external_index' . ($i + 1), 'order' => 80 + $i, 'href' => OCP\Util::linkTo('external', 'index.php') . '?id=' . ($i + 1), 'icon' => OCP\Util::imagePath('external', 'external.png'), 'name' => $sites[$i][0]));
-}
diff --git a/apps/external/appinfo/info.xml b/apps/external/appinfo/info.xml
deleted file mode 100644
index c4d0b55481..0000000000
--- a/apps/external/appinfo/info.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<info>
-	<id>external</id>
-	<name>External</name>
-	<description>Show external Application in the ownCloud menu</description>
-	<licence>AGPL</licence>
-	<author>Frank Karlitschek</author>
-	<require>4</require>
-	<shipped>true</shipped>
-</info>
diff --git a/apps/external/appinfo/version b/apps/external/appinfo/version
deleted file mode 100644
index 9f8e9b69a3..0000000000
--- a/apps/external/appinfo/version
+++ /dev/null
@@ -1 +0,0 @@
-1.0
\ No newline at end of file
diff --git a/apps/external/css/style.css b/apps/external/css/style.css
deleted file mode 100644
index f891cb4bc5..0000000000
--- a/apps/external/css/style.css
+++ /dev/null
@@ -1,14 +0,0 @@
-/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- /
-/* vim: set shiftwidth=4 tabstop=8 autoindent cindent expandtab: */
-
-.site_url {
-    width: 250px;
-}
-
-.delete_button {
-    display: none;
-}
-
-.external_sites {
-    width: 450px;
-}
diff --git a/apps/external/img/external.png b/apps/external/img/external.png
deleted file mode 100644
index 9e56f2919f..0000000000
Binary files a/apps/external/img/external.png and /dev/null differ
diff --git a/apps/external/img/external.svg b/apps/external/img/external.svg
deleted file mode 100644
index b47305fbd0..0000000000
--- a/apps/external/img/external.svg
+++ /dev/null
@@ -1,292 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.0"
-   width="16"
-   height="16"
-   id="svg2457"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="world.svg"
-   inkscape:export-filename="/home/jancborchardt/owncloud-sharing/core/img/actions/settings.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <metadata
-     id="metadata23">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1280"
-     inkscape:window-height="776"
-     id="namedview21"
-     showgrid="false"
-     inkscape:zoom="17.875"
-     inkscape:cx="-12.837249"
-     inkscape:cy="5.7622378"
-     inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2457" />
-  <defs
-     id="defs2459">
-    <linearGradient
-       id="linearGradient5128">
-      <stop
-         id="stop5130"
-         style="stop-color:#e5e5e5;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop5132"
-         style="stop-color:#ababab;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="86.132919"
-       y1="105.105"
-       x2="84.63858"
-       y2="20.895"
-       id="linearGradient3260"
-       xlink:href="#linearGradient5128"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(9.6142312e-2,0,0,9.6142312e-2,1.8468935,1.9430362)" />
-    <linearGradient
-       id="linearGradient3397">
-      <stop
-         id="stop3399"
-         style="stop-color:#aaaaaa;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3401"
-         style="stop-color:#8c8c8c;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="21"
-       y1="0"
-       x2="21"
-       y2="16.004715"
-       id="linearGradient3264"
-       xlink:href="#linearGradient3397"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-17.058189,0)" />
-    <linearGradient
-       x1="63.9995"
-       y1="3.1001"
-       x2="63.9995"
-       y2="122.8994"
-       id="linearGradient3309"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         id="stop3311"
-         style="stop-color:#f6f6f6;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3313"
-         style="stop-color:#cccccc;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="25"
-       y1="0"
-       x2="25"
-       y2="16.000105"
-       id="linearGradient3262"
-       xlink:href="#linearGradient3309"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-17.058189,0)" />
-    <linearGradient
-       id="linearGradient3678">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3680" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3682" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3309-5"
-       id="linearGradient3066-2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-17.058189,0)"
-       x1="25"
-       y1="0"
-       x2="25"
-       y2="16.000105" />
-    <linearGradient
-       x1="63.9995"
-       y1="3.1001"
-       x2="63.9995"
-       y2="122.8994"
-       id="linearGradient3309-5"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         id="stop3311-3"
-         style="stop-color:#f6f6f6;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3313-3"
-         style="stop-color:#cccccc;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3678"
-       id="linearGradient3920"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-17.058189,-0.444)"
-       x1="25"
-       y1="0"
-       x2="25"
-       y2="16.000105" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3678-0"
-       id="linearGradient3920-6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-17.058189,-0.444)"
-       x1="25"
-       y1="0"
-       x2="25"
-       y2="16.000105" />
-    <linearGradient
-       id="linearGradient3678-0">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3680-5" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3682-7" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-5-7"
-       id="linearGradient3784"
-       x1="0.5"
-       y1="7.5560002"
-       x2="15.5"
-       y2="7.5560002"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="46.395508"
-       y1="12.707516"
-       x2="46.395508"
-       y2="38.409042"
-       id="linearGradient3795-2"
-       xlink:href="#linearGradient3587-6-5-3-5-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.4100229,0,0,0.5447147,28.02322,-5.9219706)" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-5-7">
-      <stop
-         id="stop3589-9-2-2-6-2"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-73-5-1"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-5-7"
-       id="linearGradient3810"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.4100229,0,0,0.5447147,28.02322,-5.9219706)"
-       x1="46.395508"
-       y1="12.707516"
-       x2="46.395508"
-       y2="38.409042" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-5-7"
-       id="linearGradient3813"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.4100229,0,0,0.5447147,10.462268,-5.974418)"
-       x1="46.395508"
-       y1="12.707516"
-       x2="46.395508"
-       y2="38.409042" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-5-7"
-       id="linearGradient3816"
-       gradientUnits="userSpaceOnUse"
-       x1="7.4930072"
-       y1="0.0035526801"
-       x2="7.4930072"
-       y2="14.998127" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-5-7"
-       id="linearGradient3798"
-       x1="8.8461542"
-       y1="0.89504272"
-       x2="8.8461542"
-       y2="15.048951"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-5-7-2"
-       id="linearGradient3798-6"
-       x1="8.8461542"
-       y1="0.89504272"
-       x2="8.8461542"
-       y2="15.048951"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-5-7-2">
-      <stop
-         id="stop3589-9-2-2-6-2-9"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-73-5-1-7"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="translate(-1,-1)"
-       y2="15.048951"
-       x2="8.8461542"
-       y1="0.89504272"
-       x1="8.8461542"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3815"
-       xlink:href="#linearGradient3587-6-5-3-5-7-2"
-       inkscape:collect="always" />
-  </defs>
-  <path
-     inkscape:connector-curvature="0"
-     style="opacity:1;fill:#000000;fill-opacity:1;stroke:none"
-     d="M 8,1 C 4.1340071,1 1,4.134007 1,7.9999999 1,11.865994 4.1340071,15 8,15 11.865994,15 15,11.865994 15,7.9999999 15,4.134007 11.865994,1 8,1 z m 0.8020833,0.8932295 c 1.2010717,0.026708 2.2624547,0.7482116 3.3359377,1.2213541 L 13.869792,5.511719 13.596354,6.5416669 14.125,6.8697919 14.1159,8.0911458 c -0.0121,0.349374 0.005,0.6992101 -0.0091,1.048177 -0.166346,0.6623539 -0.550627,1.2665712 -0.875,1.8684892 -0.219888,0.108406 0.02005,-0.7185 -0.11849,-0.97526 C 13.14504,9.4386408 12.642422,9.4660089 12.302112,9.7955727 11.881413,10.041226 10.955977,10.114914 10.92581,9.4492183 10.687264,8.6490761 10.891165,7.7966268 11.217384,7.0520835 L 10.679623,6.3958335 10.87103,4.7096354 10.014259,3.8437502 10.21478,2.8958336 9.2121752,2.3307295 C 9.0145444,2.1755339 8.6384357,2.114115 8.5559252,1.902344 8.6372992,1.897654 8.7219474,1.891447 8.8020189,1.893224 z m -2.4609375,0.00912 c 0.031442,0.00459 0.069992,0.026431 0.1276042,0.072917 C 6.8067806,2.1608975 6.3863479,2.3716106 6.2864583,2.5677086 5.7466682,2.9328038 6.4524911,3.2318365 6.6875,3.5247398 7.0642392,3.4164892 7.4410308,2.8779535 7.9908854,3.0416669 8.6942527,2.8222093 8.5821719,3.630807 8.984375,3.9895836 9.036567,4.1585309 9.8643709,4.7080895 9.3671875,4.5273437 8.9577408,4.2098855 8.5022772,4.2337911 8.2096354,4.6914062 7.4187262,5.1199798 7.8867869,3.8662153 7.5078125,3.5611981 6.9348738,2.9219861 7.1750002,4.0387484 7.1067708,4.3723957 6.7342944,4.364267 6.0387231,4.0858224 5.6575521,4.5364583 L 6.03125,5.1471356 6.4778646,4.4635416 C 6.5864179,4.2161129 6.7226128,4.6558348 6.8424479,4.736979 6.9855355,5.0129459 7.6653536,5.4804485 7.1523438,5.6119794 6.3917179,6.0339397 5.7934201,6.6737624 5.1471354,7.2434895 4.9290953,7.7034971 4.4841468,7.6508764 4.2083333,7.2708332 3.5410706,6.8603335 3.5906422,7.9274218 3.625,8.3281249 l 0.5833333,-0.3645833 0,0.6015625 C 4.19179,8.6789089 4.2058787,8.7972867 4.1992147,8.9114582 3.790491,9.3384813 3.3785344,8.3120287 3.0234334,8.0820311 L 2.9960896,6.5781252 C 3.0089957,6.1556005 2.9197821,5.7229754 3.0052082,5.3111981 3.8089547,4.4486619 4.6253679,3.5550749 5.1015624,2.4583336 l 0.7838542,0 C 6.4331575,2.7236662 6.1210544,1.8701843 6.3411457,1.902344 z M 5.1835938,9.722656 c 0.095099,-0.010145 0.2032823,0.011573 0.3190103,0.072921 0.7379441,0.1056226 1.289687,0.640901 1.8776042,1.048178 0.4687224,0.464525 1.4828124,0.315782 1.5950521,1.102865 -0.1706086,0.853749 -1.0104785,1.312191 -1.75,1.61328 C 7.0406658,13.662851 6.8423351,13.744732 6.6328125,13.77865 5.9471995,13.950405 5.6507787,13.2474 5.5117188,12.721359 5.2012551,12.071255 4.4254987,11.578795 4.5364583,10.779953 4.5547311,10.382752 4.7714976,9.7666104 5.1835938,9.7226607 z"
-     id="path3002" />
-</svg>
diff --git a/apps/external/index.php b/apps/external/index.php
deleted file mode 100644
index 3b6f06e1bf..0000000000
--- a/apps/external/index.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-/**
- * ownCloud - External plugin
- *
- * @author Frank Karlitschek
- * @copyright 2012 Frank Karlitschek frank@owncloud.org
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either 
- * version 3 of the License, or any later version.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *  
- * You should have received a copy of the GNU Lesser General Public 
- * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
- * 
- */
-
-require_once('lib/external.php');
-
-OCP\User::checkLoggedIn();
-
-if (isset($_GET['id'])) {
-
-	$id = $_GET['id'];
-	$id = (int) $id;
-
-	$sites = OC_External::getSites();
-	if (sizeof($sites) >= $id) {
-		$url = $sites[$id - 1][1];
-		OCP\App::setActiveNavigationEntry('external_index' . $id);
-
-		$tmpl = new OCP\Template('external', 'frame', 'user');
-		$tmpl->assign('url', $url);
-		$tmpl->printPage();
-	}
-}
diff --git a/apps/external/js/admin.js b/apps/external/js/admin.js
deleted file mode 100644
index 0caaabd0b9..0000000000
--- a/apps/external/js/admin.js
+++ /dev/null
@@ -1,57 +0,0 @@
-$(document).ready(function(){
-    	newSiteHtml = '<li><input type="text" class="site_name" name="site_name[]" value="" placeholder="Name" />\n\
-    <input type="text" name="site_url[]" class="site_url" value=""  placeholder="URL" />\n\
-<img class="svg action delete_button" src="'+OC.imagePath("core", "actions/delete") +'" title="Remove site" /></li>';
-
-	// Handler functions
-	function addSiteEventHandler(event) {
-		event.preventDefault();
-		
-		saveSites();
-	}
-
-	function deleteButtonEventHandler(event) {
-		event.preventDefault();
-
-		$(this).tipsy('hide');
-		$(this).parent().remove();
-
-		saveSites();
-	}
-
-	function saveSites() {
-		var post = $('#external').serialize();
-		$.post( OC.filePath('external','ajax','setsites.php') , post, function(data) {
-			// OC.msg.finishedSaving('#site_name .msg', data); 
-		});
-	}
-
-	function showDeleteButton(event) {
-		$(this).find('img.delete_button').fadeIn(100);
-	} 
-
-	function hideDeleteButton(event) {
-		$(this).find('img.delete_button').fadeOut(100);
-	}
-
-	// Initialize events
-	$('input[name^=site_]').change(addSiteEventHandler);
-	$('img.delete_button').click(deleteButtonEventHandler);
-	$('img.delete_button').tipsy();
-
-	$('#external li').hover(showDeleteButton, hideDeleteButton);
-
-	$('#add_external_site').click(function(event) {
-		event.preventDefault();
-		$('#external ul').append(newSiteHtml);
-
-		$('input.site_url:last').prev('input.site_name').andSelf().change(addSiteEventHandler);
-		$('img.delete_button').click(deleteButtonEventHandler);
-		$('img.delete_button:last').tipsy();
-		$('#external li:last').hover(showDeleteButton, hideDeleteButton);
-		
-	});
-
-});
-
-
diff --git a/apps/external/lib/external.php b/apps/external/lib/external.php
deleted file mode 100644
index d13a7cf6dd..0000000000
--- a/apps/external/lib/external.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/**
- * ownCloud - gallery application
- *
- * @author Bartek Przybylski
- * @copyright 2012 Bartek Przybylski bart.p.pl@gmail.com
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either 
- * version 3 of the License, or any later version.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *  
- * You should have received a copy of the GNU Lesser General Public 
- * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
- * 
- */
-
-class OC_External {
-
-	public static function getSites() {
-		if (($sites = json_decode(OCP\Config::getAppValue("external", "sites", ''))) != NULL) {
-			return $sites;	
-		}
-
-		return array();
-	}
-
-}
diff --git a/apps/external/settings.php b/apps/external/settings.php
deleted file mode 100644
index 488444c119..0000000000
--- a/apps/external/settings.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-OCP\User::checkAdminUser();
-
-OCP\Util::addscript( "external", "admin" );
-
-$tmpl = new OCP\Template( 'external', 'settings');
-
-return $tmpl->fetchPage();
diff --git a/apps/external/templates/frame.php b/apps/external/templates/frame.php
deleted file mode 100644
index 38b4008353..0000000000
--- a/apps/external/templates/frame.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<iframe src="<?php echo $_['url']; ?>" width="100%" id="ifm" ></iframe>
-
-
-<script language="JavaScript">
-<!--
-
-function pageY(elem) {
-    return elem.offsetParent ? (elem.offsetTop + pageY(elem.offsetParent)) : elem.offsetTop;
-}
-var buffer = 5; //scroll bar buffer
-function resizeIframe() {
-    var height = document.documentElement.clientHeight;
-    height -= pageY(document.getElementById('ifm'))+ buffer ;
-    height = (height < 0) ? 0 : height;
-    document.getElementById('ifm').style.height = height + 'px';
-}
-
-document.getElementById('ifm').onload=resizeIframe;
-window.onresize = resizeIframe;
-
-//-->
-</script>
-
-
-
-
diff --git a/apps/external/templates/settings.php b/apps/external/templates/settings.php
deleted file mode 100644
index b8139727eb..0000000000
--- a/apps/external/templates/settings.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<form id="external">
-	<fieldset class="personalblock">
-		<strong>External Sites</strong><br />
-		<ul class="external_sites">
-
-		<?php
-		$sites = OC_External::getSites();
-		for($i = 0; $i < sizeof($sites); $i++) {
-			echo '<li><input type="text" name="site_name[]" class="site_name" value="'.$sites[$i][0].'" placeholder="'.$l->t('Name').'" />
-			<input type="text" class="site_url" name="site_url[]"  value="'.$sites[$i][1].'"  placeholder="'.$l->t('URL').'" />
-			<img class="svg action delete_button" src="'.OCP\image_path("", "actions/delete.svg") .'" title="'.$l->t("Remove site").'" />
-			</li>';
-		}
-		?>
-
-		</ul>
-
-        <input type="button" id="add_external_site" value="Add" />
-		<span class="msg"></span>
-	</fieldset>
-</form>
diff --git a/apps/files/admin.php b/apps/files/admin.php
index d05eb7267b..b49c0f61a0 100644
--- a/apps/files/admin.php
+++ b/apps/files/admin.php
@@ -23,7 +23,7 @@
 
 
 // Init owncloud
- 
+
 
 OCP\User::checkAdminUser();
 
diff --git a/apps/files/ajax/autocomplete.php b/apps/files/ajax/autocomplete.php
index e504bb24bf..fae38368a8 100644
--- a/apps/files/ajax/autocomplete.php
+++ b/apps/files/ajax/autocomplete.php
@@ -11,20 +11,20 @@ OCP\JSON::checkLoggedIn();
 $query = $_GET['term'];
 $dirOnly=(isset($_GET['dironly']))?($_GET['dironly']=='true'):false;
 
-if($query[0]!='/'){
+if($query[0]!='/') {
 	$query='/'.$query;
 }
 
-if(substr($query,-1,1)=='/'){
+if(substr($query, -1, 1)=='/') {
 	$base=$query;
-}else{
+} else {
 	$base=dirname($query);
 }
 
-$query=substr($query,strlen($base));
+$query=substr($query, strlen($base));
 
-if($base!='/'){
-	$query=substr($query,1);
+if($base!='/') {
+	$query=substr($query, 1);
 }
 $queryLen=strlen($query);
 $query=strtolower($query);
@@ -33,17 +33,17 @@ $query=strtolower($query);
 
 $files=array();
 
-if(OC_Filesystem::file_exists($base) and OC_Filesystem::is_dir($base)){
+if(OC_Filesystem::file_exists($base) and OC_Filesystem::is_dir($base)) {
 	$dh = OC_Filesystem::opendir($base);
-	if($dh){
-		if(substr($base,-1,1)!='/'){
+	if($dh) {
+		if(substr($base, -1, 1)!='/') {
 			$base=$base.'/';
 		}
 		while (($file = readdir($dh)) !== false) {
-			if ($file != "." && $file != ".."){
-				if(substr(strtolower($file),0,$queryLen)==$query){
+			if ($file != "." && $file != "..") {
+				if(substr(strtolower($file), 0, $queryLen)==$query) {
 					$item=$base.$file;
-					if((!$dirOnly or OC_Filesystem::is_dir($item))){
+					if((!$dirOnly or OC_Filesystem::is_dir($item))) {
 						$files[]=(object)array('id'=>$item,'label'=>$item,'name'=>$item);
 					}
 				}
diff --git a/apps/files/ajax/delete.php b/apps/files/ajax/delete.php
index 695f803884..e9bcea1893 100644
--- a/apps/files/ajax/delete.php
+++ b/apps/files/ajax/delete.php
@@ -15,7 +15,7 @@ $filesWithError = '';
 $success = true;
 //Now delete
 foreach($files as $file) {
-    if( !OC_Files::delete( $dir, $file )){
+    if( !OC_Files::delete( $dir, $file )) {
 		$filesWithError .= $file . "\n";
 		$success = false;
 	}
diff --git a/apps/files/ajax/list.php b/apps/files/ajax/list.php
index dae0c1a828..2254526231 100644
--- a/apps/files/ajax/list.php
+++ b/apps/files/ajax/list.php
@@ -14,19 +14,19 @@ $doBreadcrumb = isset( $_GET['breadcrumb'] ) ? true : false;
 $data = array();
 
 // Make breadcrumb
-if($doBreadcrumb){
+if($doBreadcrumb) {
 	$breadcrumb = array();
 	$pathtohere = "/";
 	foreach( explode( "/", $dir ) as $i ){
-		if( $i != "" ){
+		if( $i != "" ) {
 			$pathtohere .= "$i/";
 			$breadcrumb[] = array( "dir" => $pathtohere, "name" => $i );
 		}
 	}
-	
+
 	$breadcrumbNav = new OCP\Template( "files", "part.breadcrumb", "" );
 	$breadcrumbNav->assign( "breadcrumb", $breadcrumb );
-	
+
 	$data['breadcrumb'] = $breadcrumbNav->fetchPage();
 }
 
diff --git a/apps/files/ajax/move.php b/apps/files/ajax/move.php
index 3d4003a8ed..8b3149ef14 100644
--- a/apps/files/ajax/move.php
+++ b/apps/files/ajax/move.php
@@ -12,8 +12,8 @@ $file = stripslashes($_GET["file"]);
 $target = stripslashes($_GET["target"]);
 
 
-if(OC_Files::move($dir,$file,$target,$file)){
+if(OC_Files::move($dir, $file, $target, $file)) {
 	OCP\JSON::success(array("data" => array( "dir" => $dir, "files" => $file )));
-}else{
+} else {
 	OCP\JSON::error(array("data" => array( "message" => "Could not move $file" )));
 }
diff --git a/apps/files/ajax/newfile.php b/apps/files/ajax/newfile.php
index cc9208ad08..4619315ce0 100644
--- a/apps/files/ajax/newfile.php
+++ b/apps/files/ajax/newfile.php
@@ -3,7 +3,7 @@
 // Init owncloud
 global $eventSource;
 
-if(!OC_User::isLoggedIn()){
+if(!OC_User::isLoggedIn()) {
 	exit;
 }
 
@@ -15,9 +15,9 @@ $filename = isset( $_REQUEST['filename'] ) ? stripslashes($_REQUEST['filename'])
 $content = isset( $_REQUEST['content'] ) ? $_REQUEST['content'] : '';
 $source = isset( $_REQUEST['source'] ) ? stripslashes($_REQUEST['source']) : '';
 
-if($source){
+if($source) {
 	$eventSource=new OC_EventSource();
-}else{
+} else {
 	OC_JSON::callCheck();
 }
 
@@ -25,12 +25,12 @@ if($filename == '') {
 	OCP\JSON::error(array("data" => array( "message" => "Empty Filename" )));
 	exit();
 }
-if(strpos($filename,'/')!==false){
+if(strpos($filename, '/')!==false) {
 	OCP\JSON::error(array("data" => array( "message" => "Invalid Filename" )));
 	exit();
 }
 
-function progress($notification_code, $severity, $message, $message_code, $bytes_transferred, $bytes_max){
+function progress($notification_code, $severity, $message, $message_code, $bytes_transferred, $bytes_max) {
 	static $filesize = 0;
 	static $lastsize = 0;
 	global $eventSource;
@@ -39,14 +39,14 @@ function progress($notification_code, $severity, $message, $message_code, $bytes
 		case STREAM_NOTIFY_FILE_SIZE_IS:
 			$filesize = $bytes_max;
 			break;
-			
+
 		case STREAM_NOTIFY_PROGRESS:
 			if ($bytes_transferred > 0) {
 				if (!isset($filesize)) {
 				} else {
 					$progress = (int)(($bytes_transferred/$filesize)*100);
-					if($progress>$lastsize){//limit the number or messages send
-						$eventSource->send('progress',$progress);
+					if($progress>$lastsize) {//limit the number or messages send
+						$eventSource->send('progress', $progress);
 					}
 					$lastsize=$progress;
 				}
@@ -55,31 +55,31 @@ function progress($notification_code, $severity, $message, $message_code, $bytes
 	}
 }
 
-if($source){
-	if(substr($source,0,8)!='https://' and substr($source,0,7)!='http://'){
+if($source) {
+	if(substr($source, 0, 8)!='https://' and substr($source, 0, 7)!='http://') {
 		OCP\JSON::error(array("data" => array( "message" => "Not a valid source" )));
 		exit();
 	}
 
 	$ctx = stream_context_create(null, array('notification' =>'progress'));
-	$sourceStream=fopen($source,'rb', false, $ctx);
+	$sourceStream=fopen($source, 'rb', false, $ctx);
 	$target=$dir.'/'.$filename;
-	$result=OC_Filesystem::file_put_contents($target,$sourceStream);
-	if($result){
+	$result=OC_Filesystem::file_put_contents($target, $sourceStream);
+	if($result) {
 		$mime=OC_Filesystem::getMimetype($target);
-		$eventSource->send('success',$mime);
-	}else{
-		$eventSource->send('error',"Error while downloading ".$source. ' to '.$target);
+		$eventSource->send('success', $mime);
+	} else {
+		$eventSource->send('error', "Error while downloading ".$source. ' to '.$target);
 	}
 	$eventSource->close();
 	exit();
-}else{
-	if($content){
-		if(OC_Filesystem::file_put_contents($dir.'/'.$filename,$content)){
+} else {
+	if($content) {
+		if(OC_Filesystem::file_put_contents($dir.'/'.$filename, $content)) {
 			OCP\JSON::success(array("data" => array('content'=>$content)));
 			exit();
 		}
-	}elseif(OC_Files::newFile($dir, $filename, 'file')){
+	}elseif(OC_Files::newFile($dir, $filename, 'file')) {
 		OCP\JSON::success(array("data" => array('content'=>$content)));
 		exit();
 	}
diff --git a/apps/files/ajax/newfolder.php b/apps/files/ajax/newfolder.php
index ae92bcf09b..34c2d0ca14 100644
--- a/apps/files/ajax/newfolder.php
+++ b/apps/files/ajax/newfolder.php
@@ -14,7 +14,7 @@ if(trim($foldername) == '') {
 	OCP\JSON::error(array("data" => array( "message" => "Empty Foldername" )));
 	exit();
 }
-if(strpos($foldername,'/')!==false){
+if(strpos($foldername, '/')!==false) {
 	OCP\JSON::error(array("data" => array( "message" => "Invalid Foldername" )));
 	exit();
 }
diff --git a/apps/files/ajax/rawlist.php b/apps/files/ajax/rawlist.php
index d159f6e152..e0aa0bdac5 100644
--- a/apps/files/ajax/rawlist.php
+++ b/apps/files/ajax/rawlist.php
@@ -5,19 +5,19 @@ $RUNTIME_APPTYPES=array('filesystem');
 
 // Init owncloud
 
-require_once('lib/template.php');
+require_once 'lib/template.php';
 
 OCP\JSON::checkLoggedIn();
 
 // Load the files
 $dir = isset( $_GET['dir'] ) ? $_GET['dir'] : '';
-$mimetype = isset($_GET['mimetype']) ? $_GET['mimetype'] : ''; 
+$mimetype = isset($_GET['mimetype']) ? $_GET['mimetype'] : '';
 
 // make filelist
 $files = array();
-foreach( OC_Files::getdirectorycontent( $dir, $mimetype ) as $i ){
+foreach( OC_Files::getdirectorycontent( $dir, $mimetype ) as $i ) {
 	$i["date"] = OCP\Util::formatDate($i["mtime"] );
-  $i['mimetype_icon'] = $i['type'] == 'dir' ? \mimetype_icon('dir'): \mimetype_icon($i['mimetype']);
+	$i['mimetype_icon'] = $i['type'] == 'dir' ? \mimetype_icon('dir'): \mimetype_icon($i['mimetype']);
 	$files[] = $i;
 }
 
diff --git a/apps/files/ajax/scan.php b/apps/files/ajax/scan.php
index eef3885851..d2ec1ab516 100644
--- a/apps/files/ajax/scan.php
+++ b/apps/files/ajax/scan.php
@@ -6,38 +6,38 @@ $force=isset($_GET['force']) and $_GET['force']=='true';
 $dir=isset($_GET['dir'])?$_GET['dir']:'';
 $checkOnly=isset($_GET['checkonly']) and $_GET['checkonly']=='true';
 
-if(!$checkOnly){
+if(!$checkOnly) {
 	$eventSource=new OC_EventSource();
 }
 
 session_write_close();
 
 //create the file cache if necesary
-if($force or !OC_FileCache::inCache('')){
-	if(!$checkOnly){
+if($force or !OC_FileCache::inCache('')) {
+	if(!$checkOnly) {
 		OCP\DB::beginTransaction();
-		
-		if(OC_Cache::isFast()){
+
+		if(OC_Cache::isFast()) {
 			OC_Cache::clear('fileid/'); //make sure the old fileid's don't mess things up
 		}
-		
+
 		OC_FileCache::scan($dir,$eventSource);
 		OC_FileCache::clean();
 		OCP\DB::commit();
-		$eventSource->send('success',true);
-	}else{
+		$eventSource->send('success', true);
+	} else {
 		OCP\JSON::success(array('data'=>array('done'=>true)));
 		exit;
 	}
-}else{
-	if($checkOnly){
+} else {
+	if($checkOnly) {
 		OCP\JSON::success(array('data'=>array('done'=>false)));
 		exit;
 	}
-	if(isset($eventSource)){
-		$eventSource->send('success',false);
-	}else{
+	if(isset($eventSource)) {
+		$eventSource->send('success', false);
+	} else {
 		exit;
 	}
 }
-$eventSource->close();
\ No newline at end of file
+$eventSource->close();
diff --git a/apps/files/ajax/timezone.php b/apps/files/ajax/timezone.php
index 0be441a36a..b71fa3940c 100644
--- a/apps/files/ajax/timezone.php
+++ b/apps/files/ajax/timezone.php
@@ -3,4 +3,3 @@
 	// see lib/base.php for an example
 	//session_start();
 	$_SESSION['timezone'] = $_GET['time'];
-        
\ No newline at end of file
diff --git a/apps/files/ajax/upload.php b/apps/files/ajax/upload.php
index 74e6eb560d..813a6c67b5 100644
--- a/apps/files/ajax/upload.php
+++ b/apps/files/ajax/upload.php
@@ -38,24 +38,24 @@ $totalSize=0;
 foreach($files['size'] as $size){
 	$totalSize+=$size;
 }
-if($totalSize>OC_Filesystem::free_space('/')){
+if($totalSize>OC_Filesystem::free_space('/')) {
 	OCP\JSON::error(array("data" => array( "message" => "Not enough space available" )));
 	exit();
 }
 
 $result=array();
-if(strpos($dir,'..') === false){
+if(strpos($dir, '..') === false) {
 	$fileCount=count($files['name']);
 	for($i=0;$i<$fileCount;$i++){
         $target = OCP\Files::buildNotExistingFileName(stripslashes($dir), $files['name'][$i]);
-		if(is_uploaded_file($files['tmp_name'][$i]) and OC_Filesystem::fromTmpFile($files['tmp_name'][$i],$target)){
+		if(is_uploaded_file($files['tmp_name'][$i]) and OC_Filesystem::fromTmpFile($files['tmp_name'][$i], $target)) {
 			$meta=OC_FileCache_Cached::get($target);
 			$result[]=array( "status" => "success", 'mime'=>$meta['mimetype'],'size'=>$meta['size'],'name'=>basename($target));
 		}
 	}
 	OCP\JSON::encodedPrint($result);
 	exit();
-}else{
+} else {
 	$error='invalid dir';
 }
 
diff --git a/apps/files/appinfo/update.php b/apps/files/appinfo/update.php
index b2480a58f5..32ac89f006 100644
--- a/apps/files/appinfo/update.php
+++ b/apps/files/appinfo/update.php
@@ -41,5 +41,3 @@ foreach($filesToRemove as $file) {
 		break;
     }
 }
-
-
diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index 7298a7ef6e..bdd35285e7 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -3,7 +3,7 @@
  See the COPYING-README file. */
 
 /* FILE MENU */
-.actions { padding:.3em; float:left; height:2em; }
+.actions { padding:.3em; float:left; height:2em; width:10em; }
 .actions input, .actions button, .actions .button { margin:0; }
 #file_menu { right:0; position:absolute; top:0; }
 #file_menu a { display:block; float:left; background-image:none; text-decoration:none; }
@@ -19,7 +19,8 @@
 #new>ul>li { margin:.3em; padding-left:2em; background-repeat:no-repeat; cursor:pointer; padding-bottom:0.1em }
 #new>ul>li>p { cursor:pointer; }
 #new>ul>li>input { padding:0.3em; margin:-0.3em; }
-#new, .file_upload_filename { background:#5bb75b; border:1px solid; border-color:#51a351 #51a351 #387038; -moz-box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #cfc inset; -webkit-box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #cfc inset; box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #cfc inset; }
+#new, .file_upload_filename { background:#5bb75b; border:1px solid; border-color:#51a351 #419341 #387038; -moz-box-shadow:0 1px 1px #f8f8f8, 1px 1px 1px #ada inset; -webkit-box-shadow:0 1px 1px #f8f8f8, 1px 1px 1px #ada inset; box-shadow:0 1px 1px #f8f8f8, 1px 1px 1px #ada inset; }
+#new .popup { border-top-left-radius:0; }
 
 #file_newfolder_name { background-image:url('%webroot%/core/img/places/folder.svg'); font-weight:normal; width:7em; }
 .file_upload_start, .file_upload_filename { font-size:1em; }
@@ -88,4 +89,4 @@ a.action>img { max-height:16px; max-width:16px; vertical-align:text-bottom; }
 #navigation>ul>li:first-child { background:url('%webroot%/core/img/breadcrumb-start.svg') no-repeat 12.5em 0px; width:12.5em; padding-right:1em; position:fixed; }
 #navigation>ul>li:first-child+li { padding-top:2.9em; }
 
-#scanning-message{ top:40%; left:40%; position:absolute; display:none; }
\ No newline at end of file
+#scanning-message{ top:40%; left:40%; position:absolute; display:none; }
diff --git a/apps/files/download.php b/apps/files/download.php
index 4e2478d1ad..44a328e25d 100644
--- a/apps/files/download.php
+++ b/apps/files/download.php
@@ -22,7 +22,7 @@
 */
 
 // Init owncloud
- 
+
 
 // Check if we are a user
 OCP\User::checkLoggedIn();
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index 049afea4f6..b57e75c900 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -379,7 +379,7 @@ $(document).ready(function() {
 			stop: function(e, data) {
 				if(data.dataType != 'iframe ') {
 					$('#upload input.stop').hide();
-				}	
+				}
 				$('#uploadprogressbar').progressbar('value',100);
 				$('#uploadprogressbar').fadeOut();
 			}
@@ -542,7 +542,7 @@ $(document).ready(function() {
 			scanFiles();
 		}
 	}, "json");
-	
+
 	var lastWidth = 0;
 	var breadcrumbs = [];
 	var breadcrumbsWidth = $('#navigation').get(0).offsetWidth;
@@ -603,7 +603,7 @@ $(document).ready(function() {
 	$(window).resize(function() {
 		resizeBreadcrumbs(false);
 	});
-	
+
 	resizeBreadcrumbs(true);
 });
 
diff --git a/apps/files/l10n/ar.php b/apps/files/l10n/ar.php
index 724152dc11..52480ce7ff 100644
--- a/apps/files/l10n/ar.php
+++ b/apps/files/l10n/ar.php
@@ -17,9 +17,6 @@
 "Nothing in here. Upload something!" => "لا يوجد شيء هنا. إرفع بعض الملفات!",
 "Name" => "الاسم",
 "Download" => "تحميل",
-"Size" => "حجم",
-"Modified" => "معدل",
-"Delete" => "محذوف",
 "Upload too large" => "حجم الترفيع أعلى من المسموح",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "حجم الملفات التي تريد ترفيعها أعلى من المسموح على الخادم."
 );
diff --git a/apps/files/l10n/bg_BG.php b/apps/files/l10n/bg_BG.php
index 89fc454434..624e08959f 100644
--- a/apps/files/l10n/bg_BG.php
+++ b/apps/files/l10n/bg_BG.php
@@ -28,9 +28,6 @@
 "Name" => "Име",
 "Share" => "Споделяне",
 "Download" => "Изтегляне",
-"Size" => "Размер",
-"Modified" => "Променено",
-"Delete" => "Изтриване",
 "Upload too large" => "Файлът е прекалено голям",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Файловете които се опитвате да качите са по-големи от позволеното за сървъра.",
 "Files are being scanned, please wait." => "Файловете се претърсват, изчакайте."
diff --git a/apps/files/l10n/ca.php b/apps/files/l10n/ca.php
index e48148421b..81bbfe03a0 100644
--- a/apps/files/l10n/ca.php
+++ b/apps/files/l10n/ca.php
@@ -44,10 +44,6 @@
 "Name" => "Nom",
 "Share" => "Comparteix",
 "Download" => "Baixa",
-"Size" => "Mida",
-"Modified" => "Modificat",
-"Delete all" => "Esborra-ho tot",
-"Delete" => "Suprimeix",
 "Upload too large" => "La pujada és massa gran",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Els fitxers que esteu intentant pujar excedeixen la mida màxima de pujada del servidor",
 "Files are being scanned, please wait." => "S'estan escanejant els fitxers, espereu",
diff --git a/apps/files/l10n/cs_CZ.php b/apps/files/l10n/cs_CZ.php
index 38f235343c..4dc4b8b0cb 100644
--- a/apps/files/l10n/cs_CZ.php
+++ b/apps/files/l10n/cs_CZ.php
@@ -44,10 +44,6 @@
 "Name" => "Název",
 "Share" => "Sdílet",
 "Download" => "Stáhnout",
-"Size" => "Velikost",
-"Modified" => "Změněno",
-"Delete all" => "Smazat vše",
-"Delete" => "Vymazat",
 "Upload too large" => "Příliš velký soubor",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Soubory, které se snažíte uložit, překračují maximální velikosti uploadu na tomto serveru.",
 "Files are being scanned, please wait." => "Soubory se prohledávají, prosím čekejte.",
diff --git a/apps/files/l10n/da.php b/apps/files/l10n/da.php
index 8cefa27e64..56af0fa61d 100644
--- a/apps/files/l10n/da.php
+++ b/apps/files/l10n/da.php
@@ -44,9 +44,6 @@
 "Name" => "Navn",
 "Share" => "Del",
 "Download" => "Download",
-"Size" => "Størrelse",
-"Modified" => "Ændret",
-"Delete" => "Slet",
 "Upload too large" => "Upload for stor",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Filerne, du prøver at uploade, er større end den maksimale størrelse for fil-upload på denne server.",
 "Files are being scanned, please wait." => "Filerne bliver indlæst, vent venligst.",
diff --git a/apps/files/l10n/de.php b/apps/files/l10n/de.php
index 4a85912d31..5da3a99721 100644
--- a/apps/files/l10n/de.php
+++ b/apps/files/l10n/de.php
@@ -44,10 +44,6 @@
 "Name" => "Name",
 "Share" => "Teilen",
 "Download" => "Herunterladen",
-"Size" => "Größe",
-"Modified" => "Bearbeitet",
-"Delete all" => "Alle löschen",
-"Delete" => "Löschen",
 "Upload too large" => "Upload zu groß",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Die Datei überschreitet die Maximalgröße für Uploads auf diesem Server.",
 "Files are being scanned, please wait." => "Dateien werden gescannt, bitte warten.",
diff --git a/apps/files/l10n/el.php b/apps/files/l10n/el.php
index 4e93489fd3..3ab4b12094 100644
--- a/apps/files/l10n/el.php
+++ b/apps/files/l10n/el.php
@@ -44,10 +44,6 @@
 "Name" => "Όνομα",
 "Share" => "Διαμοίρασε",
 "Download" => "Λήψη",
-"Size" => "Μέγεθος",
-"Modified" => "Τροποποιήθηκε",
-"Delete all" => "Διαγραφή όλων",
-"Delete" => "Διαγραφή",
 "Upload too large" => "Πολύ μεγάλο το αρχείο προς μεταφόρτωση",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Τα αρχεία που προσπαθείτε να ανεβάσετε υπερβαίνουν το μέγιστο μέγεθος μεταφόρτωσης αρχείων σε αυτόν το διακομιστή.",
 "Files are being scanned, please wait." => "Τα αρχεία ανιχνεύονται, παρακαλώ περιμένετε",
diff --git a/apps/files/l10n/eo.php b/apps/files/l10n/eo.php
index 2976a2127c..acaf06e830 100644
--- a/apps/files/l10n/eo.php
+++ b/apps/files/l10n/eo.php
@@ -44,10 +44,6 @@
 "Name" => "Nomo",
 "Share" => "Kunhavigi",
 "Download" => "Elŝuti",
-"Size" => "Grando",
-"Modified" => "Modifita",
-"Delete all" => "Forigi ĉion",
-"Delete" => "Forigi",
 "Upload too large" => "Elŝuto tro larĝa",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "La dosieroj, kiujn vi provas alŝuti, transpasas la maksimuman grandon por dosieralŝutoj en ĉi tiu servilo.",
 "Files are being scanned, please wait." => "Dosieroj estas skanataj, bonvolu atendi.",
diff --git a/apps/files/l10n/es.php b/apps/files/l10n/es.php
index 6fcf908694..6cd51d60e2 100644
--- a/apps/files/l10n/es.php
+++ b/apps/files/l10n/es.php
@@ -44,10 +44,6 @@
 "Name" => "Nombre",
 "Share" => "Compartir",
 "Download" => "Descargar",
-"Size" => "Tamaño",
-"Modified" => "Modificado",
-"Delete all" => "Eliminar todo",
-"Delete" => "Eliminado",
 "Upload too large" => "El archivo es demasiado grande",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Los archivos que estás intentando subir sobrepasan el tamaño máximo permitido por este servidor.",
 "Files are being scanned, please wait." => "Se están escaneando los archivos, por favor espere.",
diff --git a/apps/files/l10n/et_EE.php b/apps/files/l10n/et_EE.php
index c455a8ffe6..956c5cc911 100644
--- a/apps/files/l10n/et_EE.php
+++ b/apps/files/l10n/et_EE.php
@@ -8,6 +8,13 @@
 "Failed to write to disk" => "Kettale kirjutamine ebaõnnestus",
 "Files" => "Failid",
 "Delete" => "Kustuta",
+"already exists" => "on juba olemas",
+"replace" => "asenda",
+"cancel" => "loobu",
+"replaced" => "asendatud",
+"with" => "millega",
+"undo" => "tagasi",
+"deleted" => "kustutatud",
 "generating ZIP-file, it may take some time." => "ZIP-faili loomine, see võib veidi aega võtta.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Sinu faili üleslaadimine ebaõnnestus, kuna see on kaust või selle suurus on 0 baiti",
 "Upload Error" => "Üleslaadimise viga",
@@ -37,10 +44,6 @@
 "Name" => "Nimi",
 "Share" => "Jaga",
 "Download" => "Lae alla",
-"Size" => "Suurus",
-"Modified" => "Muudetud",
-"Delete all" => "Kustuta kõik",
-"Delete" => "Kustuta",
 "Upload too large" => "Üleslaadimine on liiga suur",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Failid, mida sa proovid üles laadida, ületab serveri poolt üleslaetavatele failidele määratud maksimaalse suuruse.",
 "Files are being scanned, please wait." => "Faile skannitakse, palun oota",
diff --git a/apps/files/l10n/eu.php b/apps/files/l10n/eu.php
index 99c918e220..d9c2689d1c 100644
--- a/apps/files/l10n/eu.php
+++ b/apps/files/l10n/eu.php
@@ -44,10 +44,6 @@
 "Name" => "Izena",
 "Share" => "Elkarbanatu",
 "Download" => "Deskargatu",
-"Size" => "Tamaina",
-"Modified" => "Aldatuta",
-"Delete all" => "Ezabatu dena",
-"Delete" => "Ezabatu",
 "Upload too large" => "Igotakoa handiegia da",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Igotzen saiatzen ari zaren fitxategiak zerbitzari honek igotzeko onartzen duena baino handiagoak dira.",
 "Files are being scanned, please wait." => "Fitxategiak eskaneatzen ari da, itxoin mezedez.",
diff --git a/apps/files/l10n/fa.php b/apps/files/l10n/fa.php
index 78d8d77691..4dac88fc54 100644
--- a/apps/files/l10n/fa.php
+++ b/apps/files/l10n/fa.php
@@ -44,10 +44,6 @@
 "Name" => "نام",
 "Share" => "به اشتراک گذاری",
 "Download" => "بارگیری",
-"Size" => "اندازه",
-"Modified" => "تغییر یافته",
-"Delete all" => "پاک کردن همه",
-"Delete" => "پاک کردن",
 "Upload too large" => "حجم بارگذاری بسیار زیاد است",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "فایلها بیش از حد تعیین شده در این سرور هستند\nمترجم:با تغییر فایل php,ini میتوان این محدودیت را برطرف کرد",
 "Files are being scanned, please wait." => "پرونده ها در حال بازرسی هستند لطفا صبر کنید",
diff --git a/apps/files/l10n/fr.php b/apps/files/l10n/fr.php
index 9f9763636c..6eb4341bd6 100644
--- a/apps/files/l10n/fr.php
+++ b/apps/files/l10n/fr.php
@@ -44,10 +44,6 @@
 "Name" => "Nom",
 "Share" => "Partager",
 "Download" => "Téléchargement",
-"Size" => "Taille",
-"Modified" => "Modifié",
-"Delete all" => "Supprimer tout",
-"Delete" => "Supprimer",
 "Upload too large" => "Fichier trop volumineux",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Les fichiers que vous essayez d'envoyer dépassent la taille maximale permise par ce serveur.",
 "Files are being scanned, please wait." => "Les fichiers sont analysés, patientez svp.",
diff --git a/apps/files/l10n/gl.php b/apps/files/l10n/gl.php
index bf86fc9b80..3a36a23f0c 100644
--- a/apps/files/l10n/gl.php
+++ b/apps/files/l10n/gl.php
@@ -44,9 +44,6 @@
 "Name" => "Nome",
 "Share" => "Compartir",
 "Download" => "Descargar",
-"Size" => "Tamaño",
-"Modified" => "Modificado",
-"Delete" => "Eliminar",
 "Upload too large" => "Envío demasiado grande",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Os ficheiros que trata de subir superan o tamaño máximo permitido neste servidor",
 "Files are being scanned, please wait." => "Estanse analizando os ficheiros, espere por favor.",
diff --git a/apps/files/l10n/he.php b/apps/files/l10n/he.php
index 5e3df214c4..65d093e366 100644
--- a/apps/files/l10n/he.php
+++ b/apps/files/l10n/he.php
@@ -37,9 +37,6 @@
 "Name" => "שם",
 "Share" => "שיתוף",
 "Download" => "הורדה",
-"Size" => "גודל",
-"Modified" => "זמן שינוי",
-"Delete" => "מחיקה",
 "Upload too large" => "העלאה גדולה מידי",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "הקבצים שניסית להעלות חרגו מהגודל המקסימלי להעלאת קבצים על שרת זה.",
 "Files are being scanned, please wait." => "הקבצים נסרקים, נא להמתין.",
diff --git a/apps/files/l10n/hr.php b/apps/files/l10n/hr.php
index a3a6785294..cb8eb4033c 100644
--- a/apps/files/l10n/hr.php
+++ b/apps/files/l10n/hr.php
@@ -8,6 +8,13 @@
 "Failed to write to disk" => "Neuspjelo pisanje na disk",
 "Files" => "Datoteke",
 "Delete" => "Briši",
+"already exists" => "već postoji",
+"replace" => "zamjeni",
+"cancel" => "odustani",
+"replaced" => "zamjenjeno",
+"with" => "sa",
+"undo" => "vrati",
+"deleted" => "izbrisano",
 "generating ZIP-file, it may take some time." => "generiranje ZIP datoteke, ovo može potrajati.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Nemoguće poslati datoteku jer je prazna ili je direktorij",
 "Upload Error" => "Pogreška pri slanju",
@@ -37,9 +44,6 @@
 "Name" => "Naziv",
 "Share" => "podjeli",
 "Download" => "Preuzmi",
-"Size" => "Veličina",
-"Modified" => "Zadnja promjena",
-"Delete" => "Briši",
 "Upload too large" => "Prijenos je preobiman",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Datoteke koje pokušavate prenijeti prelaze maksimalnu veličinu za prijenos datoteka na ovom poslužitelju.",
 "Files are being scanned, please wait." => "Datoteke se skeniraju, molimo pričekajte.",
diff --git a/apps/files/l10n/hu_HU.php b/apps/files/l10n/hu_HU.php
index 0a66cbda4a..8d52765e93 100644
--- a/apps/files/l10n/hu_HU.php
+++ b/apps/files/l10n/hu_HU.php
@@ -44,10 +44,6 @@
 "Name" => "Név",
 "Share" => "Megosztás",
 "Download" => "Letöltés",
-"Size" => "Méret",
-"Modified" => "Módosítva",
-"Delete all" => "Mindent töröl",
-"Delete" => "Törlés",
 "Upload too large" => "Feltöltés túl nagy",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "A fájlokat amit próbálsz feltölteni meghaladta a legnagyobb fájlméretet ezen a szerveren.",
 "Files are being scanned, please wait." => "File-ok vizsgálata, kis türelmet",
diff --git a/apps/files/l10n/ia.php b/apps/files/l10n/ia.php
index 40df7af98f..f9205cb5f6 100644
--- a/apps/files/l10n/ia.php
+++ b/apps/files/l10n/ia.php
@@ -13,8 +13,5 @@
 "Nothing in here. Upload something!" => "Nihil hic. Incarga alcun cosa!",
 "Name" => "Nomine",
 "Download" => "Discargar",
-"Size" => "Dimension",
-"Modified" => "Modificate",
-"Delete" => "Deler",
 "Upload too large" => "Incargamento troppo longe"
 );
diff --git a/apps/files/l10n/id.php b/apps/files/l10n/id.php
index c66f786125..399056bf27 100644
--- a/apps/files/l10n/id.php
+++ b/apps/files/l10n/id.php
@@ -1,13 +1,32 @@
 <?php $TRANSLATIONS = array(
 "There is no error, the file uploaded with success" => "Tidak ada galat, berkas sukses diunggah",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "File yang diunggah melampaui directive upload_max_filesize di php.ini",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "File yang diunggah melampaui directive MAX_FILE_SIZE yang disebutan dalam form HTML.",
 "The uploaded file was only partially uploaded" => "Berkas hanya diunggah sebagian",
 "No file was uploaded" => "Tidak ada berkas yang diunggah",
 "Missing a temporary folder" => "Kehilangan folder temporer",
 "Failed to write to disk" => "Gagal menulis ke disk",
 "Files" => "Berkas",
 "Delete" => "Hapus",
+"already exists" => "sudah ada",
+"replace" => "mengganti",
+"cancel" => "batalkan",
+"replaced" => "diganti",
+"with" => "dengan",
+"undo" => "batal dikerjakan",
+"deleted" => "dihapus",
+"generating ZIP-file, it may take some time." => "membuat berkas ZIP, ini mungkin memakan waktu.",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Gagal mengunggah berkas anda karena berupa direktori atau mempunyai ukuran 0 byte",
+"Upload Error" => "Terjadi Galat Pengunggahan",
+"Pending" => "Menunggu",
+"Upload cancelled." => "Pengunggahan dibatalkan.",
+"Invalid name, '/' is not allowed." => "Kesalahan nama, '/' tidak diijinkan.",
 "Size" => "Ukuran",
 "Modified" => "Dimodifikasi",
+"folder" => "folder",
+"folders" => "folder-folder",
+"file" => "berkas",
+"files" => "berkas-berkas",
 "File handling" => "Penanganan berkas",
 "Maximum upload size" => "Ukuran unggah maksimum",
 "max. possible: " => "Kemungkinan maks:",
@@ -25,9 +44,6 @@
 "Name" => "Nama",
 "Share" => "Bagikan",
 "Download" => "Unduh",
-"Size" => "Ukuran",
-"Modified" => "Dimodifikasi",
-"Delete" => "Hapus",
 "Upload too large" => "Unggahan terlalu besar",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Berkas yang anda coba unggah melebihi ukuran maksimum untuk pengunggahan berkas di server ini.",
 "Files are being scanned, please wait." => "Berkas sedang dipindai, silahkan tunggu.",
diff --git a/apps/files/l10n/it.php b/apps/files/l10n/it.php
index 9bf02fb188..6fda30a8f3 100644
--- a/apps/files/l10n/it.php
+++ b/apps/files/l10n/it.php
@@ -44,10 +44,6 @@
 "Name" => "Nome",
 "Share" => "Condividi",
 "Download" => "Scarica",
-"Size" => "Dimensione",
-"Modified" => "Modificato",
-"Delete all" => "Elimina tutto",
-"Delete" => "Elimina",
 "Upload too large" => "Il file caricato è troppo grande",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "I file che stai provando a caricare superano la dimensione massima consentita su questo server.",
 "Files are being scanned, please wait." => "Scansione dei file in corso, attendi",
diff --git a/apps/files/l10n/ja_JP.php b/apps/files/l10n/ja_JP.php
index 868a2cfe70..8c19e45501 100644
--- a/apps/files/l10n/ja_JP.php
+++ b/apps/files/l10n/ja_JP.php
@@ -44,9 +44,6 @@
 "Name" => "名前",
 "Share" => "共有",
 "Download" => "ダウンロード",
-"Size" => "サイズ",
-"Modified" => "更新日時",
-"Delete" => "削除",
 "Upload too large" => "ファイルサイズが大きすぎます",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "アップロードしようとしているファイルは、サーバで規定された最大サイズを超えています。",
 "Files are being scanned, please wait." => "ファイルをスキャンしています、しばらくお待ちください。",
diff --git a/apps/files/l10n/ko.php b/apps/files/l10n/ko.php
index 66b0c65d8c..218dd0ea2d 100644
--- a/apps/files/l10n/ko.php
+++ b/apps/files/l10n/ko.php
@@ -36,10 +36,6 @@
 "Name" => "이름",
 "Share" => "공유",
 "Download" => "다운로드",
-"Size" => "크기",
-"Modified" => "수정됨",
-"Delete all" => "모두 삭제",
-"Delete" => "삭제",
 "Upload too large" => "업로드 용량 초과",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "이 파일이 서버에서 허용하는 최대 업로드 가능 용량보다 큽니다.",
 "Files are being scanned, please wait." => "파일을 검색중입니다, 기다려 주십시오.",
diff --git a/apps/files/l10n/lb.php b/apps/files/l10n/lb.php
index d3f1207cfb..f7a10fbc5c 100644
--- a/apps/files/l10n/lb.php
+++ b/apps/files/l10n/lb.php
@@ -27,9 +27,6 @@
 "Name" => "Numm",
 "Share" => "Share",
 "Download" => "Eroflueden",
-"Size" => "Gréisst",
-"Modified" => "Geännert",
-"Delete" => "Läschen",
 "Upload too large" => "Upload ze grouss",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Déi Dateien déi Dir probéiert erop ze lueden sinn méi grouss wei déi Maximal Gréisst déi op dësem Server erlaabt ass.",
 "Files are being scanned, please wait." => "Fichieren gi gescannt, war weg.",
diff --git a/apps/files/l10n/lt_LT.php b/apps/files/l10n/lt_LT.php
index 9b2b364c9b..90b0314307 100644
--- a/apps/files/l10n/lt_LT.php
+++ b/apps/files/l10n/lt_LT.php
@@ -36,9 +36,6 @@
 "Name" => "Pavadinimas",
 "Share" => "Dalintis",
 "Download" => "Atsisiųsti",
-"Size" => "Dydis",
-"Modified" => "Pakeista",
-"Delete" => "Ištrinti",
 "Upload too large" => "Įkėlimui failas per didelis",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Bandomų įkelti failų dydis viršija maksimalų leidžiamą šiame serveryje",
 "Files are being scanned, please wait." => "Skenuojami failai, prašome palaukti.",
diff --git a/apps/files/l10n/mk.php b/apps/files/l10n/mk.php
index b060c08765..4e1eccff25 100644
--- a/apps/files/l10n/mk.php
+++ b/apps/files/l10n/mk.php
@@ -37,10 +37,6 @@
 "Name" => "Име",
 "Share" => "Сподели",
 "Download" => "Преземи",
-"Size" => "Големина",
-"Modified" => "Променето",
-"Delete all" => "Избриши сѐ",
-"Delete" => "Избриши",
 "Upload too large" => "Датотеката е премногу голема",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Датотеките кои се обидувате да ги подигнете ја надминуваат максималната големина за подигнување датотеки на овој сервер.",
 "Files are being scanned, please wait." => "Се скенираат датотеки, ве молам почекајте.",
diff --git a/apps/files/l10n/ms_MY.php b/apps/files/l10n/ms_MY.php
index 456a30a9d1..de472a7c65 100644
--- a/apps/files/l10n/ms_MY.php
+++ b/apps/files/l10n/ms_MY.php
@@ -43,9 +43,6 @@
 "Name" => "Nama ",
 "Share" => "Kongsi",
 "Download" => "Muat turun",
-"Size" => "Saiz",
-"Modified" => "Dimodifikasi",
-"Delete" => "Padam",
 "Upload too large" => "Muat naik terlalu besar",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Fail yang cuba dimuat naik melebihi saiz maksimum fail upload server",
 "Files are being scanned, please wait." => "Fail sedang diimbas, harap bersabar.",
diff --git a/apps/files/l10n/nb_NO.php b/apps/files/l10n/nb_NO.php
index 4a2bf36fd5..92d0c23bfd 100644
--- a/apps/files/l10n/nb_NO.php
+++ b/apps/files/l10n/nb_NO.php
@@ -8,8 +8,19 @@
 "Failed to write to disk" => "Klarte ikke å skrive til disk",
 "Files" => "Filer",
 "Delete" => "Slett",
+"already exists" => "eksisterer allerede",
+"replace" => "erstatt",
+"cancel" => "avbryt",
+"replaced" => "erstattet",
+"with" => "med",
+"undo" => "angre",
+"deleted" => "slettet",
 "generating ZIP-file, it may take some time." => "opprettet ZIP-fil, dette kan ta litt tid",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Kan ikke laste opp filen din siden det er en mappe eller den har 0 bytes",
+"Upload Error" => "Opplasting feilet",
 "Pending" => "Ventende",
+"Upload cancelled." => "Opplasting avbrutt.",
+"Invalid name, '/' is not allowed." => "Ugyldig navn, '/' er ikke tillatt. ",
 "Size" => "Størrelse",
 "Modified" => "Endret",
 "folder" => "mappe",
@@ -33,10 +44,6 @@
 "Name" => "Navn",
 "Share" => "Del",
 "Download" => "Last ned",
-"Size" => "Størrelse",
-"Modified" => "Endret",
-"Delete all" => "Slett alle",
-"Delete" => "Slett",
 "Upload too large" => "Opplasting for stor",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Filene du prøver å laste opp er for store for å laste opp til denne serveren.",
 "Files are being scanned, please wait." => "Skanner etter filer, vennligst vent.",
diff --git a/apps/files/l10n/nl.php b/apps/files/l10n/nl.php
index 98e52faf98..fb7ea34b9b 100644
--- a/apps/files/l10n/nl.php
+++ b/apps/files/l10n/nl.php
@@ -44,10 +44,6 @@
 "Name" => "Naam",
 "Share" => "Delen",
 "Download" => "Download",
-"Size" => "Bestandsgrootte",
-"Modified" => "Laatst aangepast",
-"Delete all" => "Alles verwijderen",
-"Delete" => "Verwijder",
 "Upload too large" => "Bestanden te groot",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "De bestanden die u probeert te uploaden zijn groter dan de maximaal toegestane  bestandsgrootte voor deze server.",
 "Files are being scanned, please wait." => "Bestanden worden gescand, even wachten.",
diff --git a/apps/files/l10n/nn_NO.php b/apps/files/l10n/nn_NO.php
index a2263b3df2..d6af730249 100644
--- a/apps/files/l10n/nn_NO.php
+++ b/apps/files/l10n/nn_NO.php
@@ -17,9 +17,6 @@
 "Nothing in here. Upload something!" => "Ingenting her. Last noko opp!",
 "Name" => "Namn",
 "Download" => "Last ned",
-"Size" => "Storleik",
-"Modified" => "Endra",
-"Delete" => "Slett",
 "Upload too large" => "For stor opplasting",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Filene du prøver å laste opp er større enn maksgrensa til denne tenaren."
 );
diff --git a/apps/files/l10n/pl.php b/apps/files/l10n/pl.php
index 7b67fd4722..eb791330bf 100644
--- a/apps/files/l10n/pl.php
+++ b/apps/files/l10n/pl.php
@@ -44,9 +44,6 @@
 "Name" => "Nazwa",
 "Share" => "Współdziel",
 "Download" => "Pobiera element",
-"Size" => "Rozmiar",
-"Modified" => "Czas modyfikacji",
-"Delete" => "Usuwa element",
 "Upload too large" => "Wysyłany plik ma za duży rozmiar",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Pliki które próbujesz przesłać, przekraczają maksymalną, dopuszczalną wielkość.",
 "Files are being scanned, please wait." => "Skanowanie plików, proszę czekać.",
diff --git a/apps/files/l10n/pt_BR.php b/apps/files/l10n/pt_BR.php
index e0da05ba99..09c4f2b026 100644
--- a/apps/files/l10n/pt_BR.php
+++ b/apps/files/l10n/pt_BR.php
@@ -44,10 +44,6 @@
 "Name" => "Nome",
 "Share" => "Compartilhar",
 "Download" => "Baixar",
-"Size" => "Tamanho",
-"Modified" => "Modificado",
-"Delete all" => "Deletar Tudo",
-"Delete" => "Excluir",
 "Upload too large" => "Arquivo muito grande",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Os arquivos que você está tentando carregar excedeu o tamanho máximo para arquivos no servidor.",
 "Files are being scanned, please wait." => "Arquivos sendo escaneados, por favor aguarde.",
diff --git a/apps/files/l10n/pt_PT.php b/apps/files/l10n/pt_PT.php
index eaf5a69a04..e413d7cbe7 100644
--- a/apps/files/l10n/pt_PT.php
+++ b/apps/files/l10n/pt_PT.php
@@ -44,9 +44,6 @@
 "Name" => "Nome",
 "Share" => "Partilhar",
 "Download" => "Transferir",
-"Size" => "Tamanho",
-"Modified" => "Modificado",
-"Delete" => "Apagar",
 "Upload too large" => "Envio muito grande",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Os ficheiro que estás a tentar enviar excedem o tamanho máximo de envio neste servidor.",
 "Files are being scanned, please wait." => "Os ficheiros estão a ser analisados, por favor aguarde.",
diff --git a/apps/files/l10n/sk_SK.php b/apps/files/l10n/sk_SK.php
index 9e9a543d38..8a31c55032 100644
--- a/apps/files/l10n/sk_SK.php
+++ b/apps/files/l10n/sk_SK.php
@@ -37,7 +37,6 @@
 "Name" => "Meno",
 "Share" => "Zdielať",
 "Download" => "Stiahnuť",
-"Delete all" => "Odstrániť všetko",
 "Upload too large" => "Nahrávanie príliš veľké",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Súbory ktoré sa snažíte nahrať presahujú maximálnu veľkosť pre nahratie súborov na tento server.",
 "Files are being scanned, please wait." => "Súbory sa práve prehľadávajú, prosím čakajte.",
diff --git a/apps/files/l10n/sl.php b/apps/files/l10n/sl.php
index b94735c391..f6322b2507 100644
--- a/apps/files/l10n/sl.php
+++ b/apps/files/l10n/sl.php
@@ -43,8 +43,7 @@
 "Nothing in here. Upload something!" => "Tukaj ni ničesar. Naložite kaj!",
 "Name" => "Ime",
 "Share" => "Souporaba",
-"Download" => "Prejmi",
-"Delete all" => "Izbriši vse",
+"Download" => "Prenesi",
 "Upload too large" => "Nalaganje ni mogoče, ker je preveliko",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Datoteke, ki jih želite naložiti, presegajo največjo dovoljeno velikost na tem strežniku.",
 "Files are being scanned, please wait." => "Preiskujem datoteke, prosimo počakajte.",
diff --git a/apps/files/l10n/th_TH.php b/apps/files/l10n/th_TH.php
index eca0e29a18..eed9c36e13 100644
--- a/apps/files/l10n/th_TH.php
+++ b/apps/files/l10n/th_TH.php
@@ -44,7 +44,6 @@
 "Name" => "ชื่อ",
 "Share" => "แชร์",
 "Download" => "ดาวน์โหลด",
-"Delete all" => "ลบทั้งหมด",
 "Upload too large" => "ไฟล์ที่อัพโหลดมีขนาดใหญ่เกินไป",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "ไฟล์ที่คุณพยายามที่จะอัพโหลดมีขนาดเกินกว่าขนาดสูงสุดที่กำหนดไว้ให้อัพโหลดได้สำหรับเซิร์ฟเวอร์นี้",
 "Files are being scanned, please wait." => "ไฟล์กำลังอยู่ระหว่างการสแกน, กรุณารอสักครู่.",
diff --git a/apps/files/l10n/tr.php b/apps/files/l10n/tr.php
index 528eede664..224322b24e 100644
--- a/apps/files/l10n/tr.php
+++ b/apps/files/l10n/tr.php
@@ -39,7 +39,6 @@
 "Name" => "Ad",
 "Share" => "Paylaş",
 "Download" => "İndir",
-"Delete all" => "Hepsini sil",
 "Upload too large" => "Yüklemeniz çok büyük",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Yüklemeye çalıştığınız dosyalar bu sunucudaki maksimum yükleme boyutunu aşıyor.",
 "Files are being scanned, please wait." => "Dosyalar taranıyor, lütfen bekleyin.",
diff --git a/apps/files/l10n/zh_CN.php b/apps/files/l10n/zh_CN.php
index ec5ed8ffb4..dc78301884 100644
--- a/apps/files/l10n/zh_CN.php
+++ b/apps/files/l10n/zh_CN.php
@@ -44,7 +44,6 @@
 "Name" => "名称",
 "Share" => "共享",
 "Download" => "下载",
-"Delete all" => "删除所有",
 "Upload too large" => "上传文件过大",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "您正尝试上传的文件超过了此服务器可以上传的最大大小",
 "Files are being scanned, please wait." => "文件正在被扫描，请稍候。",
diff --git a/apps/files/l10n/zh_TW.php b/apps/files/l10n/zh_TW.php
index 9151a4805d..bc8aa4ff89 100644
--- a/apps/files/l10n/zh_TW.php
+++ b/apps/files/l10n/zh_TW.php
@@ -27,7 +27,6 @@
 "Name" => "名稱",
 "Share" => "分享",
 "Download" => "下載",
-"Delete all" => "全部刪除",
 "Upload too large" => "上傳過大",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "你試圖上傳的檔案已超過伺服器的最大容量限制。　",
 "Files are being scanned, please wait." => "正在掃描檔案，請稍等。",
diff --git a/apps/files/settings.php b/apps/files/settings.php
index cd6dd8c161..b02c3738c6 100644
--- a/apps/files/settings.php
+++ b/apps/files/settings.php
@@ -23,7 +23,7 @@
 
 
 // Init owncloud
- 
+
 
 // Check if we are a user
 OCP\User::checkLoggedIn();
diff --git a/apps/files/templates/admin.php b/apps/files/templates/admin.php
index 23021ec664..3ad0629750 100644
--- a/apps/files/templates/admin.php
+++ b/apps/files/templates/admin.php
@@ -14,6 +14,3 @@
 		<input type="submit" name="submitFilesAdminSettings" id="submitFilesAdminSettings" value="Save"/>
 	</fieldset>
 </form>
-
-
-
diff --git a/apps/files/templates/part.breadcrumb.php b/apps/files/templates/part.breadcrumb.php
index 22d9bb4490..875fc747bb 100644
--- a/apps/files/templates/part.breadcrumb.php
+++ b/apps/files/templates/part.breadcrumb.php
@@ -1,6 +1,6 @@
 	<?php for($i=0; $i<count($_["breadcrumb"]); $i++):
         $crumb = $_["breadcrumb"][$i]; ?>
 		<div class="crumb <?php if($i == count($_["breadcrumb"])-1) echo 'last';?> svg" data-dir='<?php echo $crumb["dir"];?>' style='background-image:url("<?php echo OCP\image_path('core','breadcrumb.png');?>")'>
-    		<a href="<?php echo $_['baseURL'].$crumb["dir"]; ?>"><?php echo OCP\Util::sanitizeHTML($crumb["name"]); ?></a>
+		<a href="<?php echo $_['baseURL'].$crumb["dir"]; ?>"><?php echo OCP\Util::sanitizeHTML($crumb["name"]); ?></a>
 		</div>
 	<?php endfor;?>
diff --git a/apps/files_archive/appinfo/app.php b/apps/files_archive/appinfo/app.php
deleted file mode 100644
index 67376c4a03..0000000000
--- a/apps/files_archive/appinfo/app.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Robin Appelman <icewind@owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-OC::$CLASSPATH['OC_Filestorage_Archive']='apps/files_archive/lib/storage.php';
-
-OCP\Util::connectHook('OC_Filesystem','get_mountpoint','OC_Filestorage_Archive','autoMount');
-
-OCP\Util::addscript( 'files_archive', 'archive' );
diff --git a/apps/files_archive/appinfo/info.xml b/apps/files_archive/appinfo/info.xml
deleted file mode 100644
index 93ec68ee10..0000000000
--- a/apps/files_archive/appinfo/info.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<info>
-	<id>files_archive</id>
-	<name>Archive support</name>
-	<description>Transparent opening of archives</description>
-	<licence>AGPL</licence>
-	<author>Robin Appelman</author>
-	<require>4</require>
-	<shipped>true</shipped>
-	<types>
-		<filesystem/>
-	</types>
-	<default_enable/>
-</info>
diff --git a/apps/files_archive/appinfo/version b/apps/files_archive/appinfo/version
deleted file mode 100644
index 2f4536184b..0000000000
--- a/apps/files_archive/appinfo/version
+++ /dev/null
@@ -1 +0,0 @@
-0.2
\ No newline at end of file
diff --git a/apps/files_archive/js/archive.js b/apps/files_archive/js/archive.js
deleted file mode 100644
index 4357198b00..0000000000
--- a/apps/files_archive/js/archive.js
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * Copyright (c) 2012 Robin Appelman <icewind@owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-$(document).ready(function() {
-	if(typeof FileActions!=='undefined'){
-		FileActions.register('application/zip','Open', FileActions.PERMISSION_READ, '',function(filename){
-			window.location=OC.linkTo('files', 'index.php')+'?dir='+encodeURIComponent($('#dir').val()).replace(/%2F/g, '/')+'/'+encodeURIComponent(filename);
-		});
-		FileActions.setDefault('application/zip','Open');
-		FileActions.register('application/x-gzip','Open', FileActions.PERMISSION_READ, '',function(filename){
-			window.location=OC.linkTo('files', 'index.php')+'?dir='+encodeURIComponent($('#dir').val()).replace(/%2F/g, '/')+'/'+encodeURIComponent(filename);
-		});
-		FileActions.setDefault('application/x-gzip','Open');
-	}
-});
diff --git a/apps/files_archive/lib/storage.php b/apps/files_archive/lib/storage.php
deleted file mode 100644
index 3c14c3e1fd..0000000000
--- a/apps/files_archive/lib/storage.php
+++ /dev/null
@@ -1,174 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Robin Appelman <icewind@owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-class OC_Filestorage_Archive extends OC_Filestorage_Common{
-	/**
-	 * underlying local storage used for missing functions
-	 * @var OC_Archive
-	 */
-	private $archive;
-	private $path;
-	private static $mounted=array();
-	private static $enableAutomount=true;
-	private static $rootView;
-	
-	private function stripPath($path){//files should never start with /
-		if(!$path || $path[0]=='/'){
-			$path=substr($path,1);
-		}
-		return $path;
-	}
-	
-	public function __construct($params){
-		$this->archive=OC_Archive::open($params['archive']);
-		$this->path=$params['archive'];
-	}
-
-	public function mkdir($path){
-		$path=$this->stripPath($path);
-		return $this->archive->addFolder($path);
-	}
-	public function rmdir($path){
-		$path=$this->stripPath($path);
-		return $this->archive->remove($path.'/');
-	}
-	public function opendir($path){
-		if(substr($path,-1)!=='/'){
-			$path.='/';
-		}
-		$path=$this->stripPath($path);
-		$files=$this->archive->getFolder($path);
-		$content=array();
-		foreach($files as $file){
-			if(substr($file,-1)=='/'){
-				$file=substr($file,0,-1);
-			}
-			if($file and strpos($file,'/')===false){
-				$content[]=$file;
-			}
-		}
-		$id=md5($this->path.$path);
-		OC_FakeDirStream::$dirs[$id]=$content;
-		return opendir('fakedir://'.$id);
-	}
-	public function stat($path){
-		$ctime=-1;
-		$path=$this->stripPath($path);
-		if($path==''){
-			$stat=stat($this->path);
-			$stat['size']=0;
-		}else{
-			if($this->is_dir($path)){
-				$stat=array('size'=>0);
-				$stat['mtime']=filemtime($this->path);
-			}else{
-				$stat=array();
-				$stat['mtime']=$this->archive->mtime($path);
-				$stat['size']=$this->archive->filesize($path);
-				if(!$stat['mtime']){
-					$stat['mtime']=time();
-				}
-			}
-		}
-		$stat['ctime']=$ctime;
-		return $stat;
-	}
-	public function filetype($path){
-		$path=$this->stripPath($path);
-		if($path==''){
-			return 'dir';
-		}
-		if(substr($path,-1)=='/'){
-			return $this->archive->fileExists($path)?'dir':'file';
-		}else{
-			return $this->archive->fileExists($path.'/')?'dir':'file';
-		}
-	}
-	public function isReadable($path){
-		return is_readable($this->path);
-	}
-	public function isUpdatable($path){
-		return is_writable($this->path);
-	}
-	public function file_exists($path){
-		$path=$this->stripPath($path);
-		if($path==''){
-			return file_exists($this->path);
-		}
-		return $this->archive->fileExists($path);
-	}
-	public function unlink($path){
-		$path=$this->stripPath($path);
-		return $this->archive->remove($path);
-	}
-	public function fopen($path,$mode){
-		$path=$this->stripPath($path);
-		return $this->archive->getStream($path,$mode);
-	}
-	public function free_space($path){
-		return 0;
-	}
-	public function touch($path, $mtime=null){
-		if(is_null($mtime)){
-			$tmpFile=OCP\Files::tmpFile();
-			$this->archive->extractFile($path,$tmpFile);
-			$this->archive->addfile($path,$tmpFile);
-		}else{
-			return false;//not supported
-		}
-	}
-	private function toTmpFile($path){
-		$tmpFile=OC_Helper::tmpFile($extension);
-		$this->archive->extractFile($path,$tmpFile);
-		return $tmpFile;
-	}
-	public function file_put_contents($path,$data) {
-		$path=$this->stripPath($path);
-		return $this->archive->addFile($path,$data);
-	}
-	public function file_get_contents($path) {
-		$path=$this->stripPath($path);
-		return $this->archive->getFile($path);
-	}
-
-	/**
-	 * automount paths from file hooks
-	 * @param aray params
-	 */
-	public static function autoMount($params){
-		if(!self::$enableAutomount){
-			return;
-		}
-		$path=$params['path'];
-		if(!self::$rootView){
-			self::$rootView=new OC_FilesystemView('');
-		}
-		self::$enableAutomount=false;//prevent recursion
-		$supported=array('zip','tar.gz','tar.bz2','tgz');
-		foreach($supported as $type){
-			$ext='.'.$type.'/';
-			if(($pos=strpos(strtolower($path),$ext))!==false){
-				$archive=substr($path,0,$pos+strlen($ext)-1);
-				if(self::$rootView->file_exists($archive) and  array_search($archive,self::$mounted)===false){
-					$localArchive=self::$rootView->getLocalFile($archive);
-					OC_Filesystem::mount('OC_Filestorage_Archive',array('archive'=>$localArchive),$archive.'/');
-					self::$mounted[]=$archive;
-				}
-			}
-		}
-		self::$enableAutomount=true;
-	}
-
-	public function rename($path1,$path2){
-		return $this->archive->rename($path1,$path2);
-	}
-
-	public function hasUpdated($path,$time){
-		return $this->filemtime($this->path)>$time;
-	}
-}
diff --git a/apps/files_archive/tests/data/data.tar.gz b/apps/files_archive/tests/data/data.tar.gz
deleted file mode 100644
index 39f2cdada0..0000000000
Binary files a/apps/files_archive/tests/data/data.tar.gz and /dev/null differ
diff --git a/apps/files_archive/tests/data/data.zip b/apps/files_archive/tests/data/data.zip
deleted file mode 100644
index eccef53eb4..0000000000
Binary files a/apps/files_archive/tests/data/data.zip and /dev/null differ
diff --git a/apps/files_archive/tests/data/lorem.txt b/apps/files_archive/tests/data/lorem.txt
deleted file mode 100644
index b62c3fb2ff..0000000000
--- a/apps/files_archive/tests/data/lorem.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
-Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
-Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.
-Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
\ No newline at end of file
diff --git a/apps/files_archive/tests/storage.php b/apps/files_archive/tests/storage.php
deleted file mode 100644
index 74ddf22870..0000000000
--- a/apps/files_archive/tests/storage.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Robin Appelman <icewind@owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-class Test_Filestorage_Archive_Zip extends Test_FileStorage {
-	/**
-	 * @var string tmpDir
-	 */
-	private $tmpFile;
-	
-	public function setUp(){
-		$this->tmpFile=OCP\Files::tmpFile('.zip');
-		$this->instance=new OC_Filestorage_Archive(array('archive'=>$this->tmpFile));
-	}
-
-	public function tearDown(){
-		unlink($this->tmpFile);
-	}
-}
-
-class Test_Filestorage_Archive_Tar extends Test_FileStorage {
-	/**
-	 * @var string tmpDir
-	 */
-	private $tmpFile;
-
-	public function setUp(){
-		$this->tmpFile=OCP\Files::tmpFile('.tar.gz');
-		$this->instance=new OC_Filestorage_Archive(array('archive'=>$this->tmpFile));
-	}
-
-	public function tearDown(){
-		unlink($this->tmpFile);
-	}
-}
diff --git a/apps/files_encryption/appinfo/info.xml b/apps/files_encryption/appinfo/info.xml
index 8e64b0cafd..419bdb1b12 100644
--- a/apps/files_encryption/appinfo/info.xml
+++ b/apps/files_encryption/appinfo/info.xml
@@ -2,7 +2,7 @@
 <info>
 	<id>files_encryption</id>
 	<name>Encryption</name>
-	<description>Server side encryption of files. Warning: You will lose your data if you enable this App and forget your password. Encryption is not yet compatible with LDAP.</description>
+	<description>Server side encryption of files. DEPRECATED. This app is no longer supported and will be replaced with an improved version in ownCloud 5. Only enable this features if you want to read old encrypted data. Warning: You will lose your data if you enable this App and forget your password. Encryption is not yet compatible with LDAP.</description>
 	<licence>AGPL</licence>
 	<author>Robin Appelman</author>
 	<require>4</require>
diff --git a/apps/files_encryption/js/settings.js b/apps/files_encryption/js/settings.js
index 8cc433246c..a160b9e0e1 100644
--- a/apps/files_encryption/js/settings.js
+++ b/apps/files_encryption/js/settings.js
@@ -11,7 +11,7 @@ $(document).ready(function(){
 		onuncheck:blackListChange,
 		createText:'...',
 	});
-	
+
 	function blackListChange(){
 		var blackList=$('#encryption_blacklist').val().join(',');
 		OC.AppConfig.setValue('files_encryption','type_blacklist',blackList);
diff --git a/apps/files_encryption/l10n/es.php b/apps/files_encryption/l10n/es.php
index 26ace24e33..b7e7601b35 100644
--- a/apps/files_encryption/l10n/es.php
+++ b/apps/files_encryption/l10n/es.php
@@ -1,3 +1,6 @@
 <?php $TRANSLATIONS = array(
-"Encryption" => "Cifrado"
+"Encryption" => "Cifrado",
+"Exclude the following file types from encryption" => "Excluir del cifrado los siguientes tipos de archivo",
+"None" => "Ninguno",
+"Enable Encryption" => "Habilitar cifrado"
 );
diff --git a/apps/files_encryption/l10n/eu.php b/apps/files_encryption/l10n/eu.php
new file mode 100644
index 0000000000..57b6a4927b
--- /dev/null
+++ b/apps/files_encryption/l10n/eu.php
@@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Encryption" => "Enkriptazioa",
+"Exclude the following file types from encryption" => "Ez enkriptatu hurrengo fitxategi motak",
+"None" => "Bat ere ez",
+"Enable Encryption" => "Gaitu enkriptazioa"
+);
diff --git a/apps/files_encryption/l10n/hu_HU.php b/apps/files_encryption/l10n/hu_HU.php
new file mode 100644
index 0000000000..4352d8b771
--- /dev/null
+++ b/apps/files_encryption/l10n/hu_HU.php
@@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Encryption" => "Titkosítás",
+"Exclude the following file types from encryption" => "A következő fájl típusok kizárása a titkosításból",
+"None" => "Egyik sem",
+"Enable Encryption" => "Titkosítás engedélyezése"
+);
diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php
index 849e88ee0b..0770bca018 100644
--- a/apps/files_encryption/lib/crypt.php
+++ b/apps/files_encryption/lib/crypt.php
@@ -188,7 +188,7 @@ class OC_Crypt {
 			fclose($handleread);
 		}
 	}
-	
+
 	/**
 	 * encrypt data in 8192b sized blocks
 	 */
@@ -200,7 +200,7 @@ class OC_Crypt {
 		}
 		return $result;
 	}
-	
+
 	/**
 	 * decrypt data in 8192b sized blocks
 	 */
diff --git a/apps/files_encryption/lib/cryptstream.php b/apps/files_encryption/lib/cryptstream.php
index 46471911d9..75ad62659d 100644
--- a/apps/files_encryption/lib/cryptstream.php
+++ b/apps/files_encryption/lib/cryptstream.php
@@ -64,16 +64,16 @@ class OC_CryptStream{
 		}
 		return is_resource($this->source);
 	}
-	
+
 	public function stream_seek($offset, $whence=SEEK_SET){
 		$this->flush();
 		fseek($this->source,$offset,$whence);
 	}
-	
+
 	public function stream_tell(){
 		return ftell($this->source);
 	}
-	
+
 	public function stream_read($count){
 		//$count will always be 8192 https://bugs.php.net/bug.php?id=21641
 		//This makes this function a lot simpler but will breake everything the moment it's fixed
@@ -95,7 +95,7 @@ class OC_CryptStream{
 		}
 		return $result;
 	}
-	
+
 	public function stream_write($data){
 		$length=strlen($data);
 		$currentPos=ftell($this->source);
@@ -143,11 +143,11 @@ class OC_CryptStream{
 	public function stream_stat(){
 		return fstat($this->source);
 	}
-	
+
 	public function stream_lock($mode){
 		flock($this->source,$mode);
 	}
-	
+
 	public function stream_flush(){
 		return fflush($this->source);
 	}
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index f25e4a662f..247924b2aa 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -28,7 +28,7 @@
 class OC_FileProxy_Encryption extends OC_FileProxy{
 	private static $blackList=null; //mimetypes blacklisted from encryption
 	private static $enableEncryption=null;
-	
+
 	/**
 	 * check if a file should be encrypted during write
 	 * @param string $path
@@ -62,7 +62,7 @@ class OC_FileProxy_Encryption extends OC_FileProxy{
 		$metadata=OC_FileCache_Cached::get($path,'');
 		return isset($metadata['encrypted']) and (bool)$metadata['encrypted'];
 	}
-	
+
 	public function preFile_put_contents($path,&$data){
 		if(self::shouldEncrypt($path)){
 			if (!is_resource($data)) {//stream put contents should have been converter to fopen
@@ -72,7 +72,7 @@ class OC_FileProxy_Encryption extends OC_FileProxy{
 			}
 		}
 	}
-	
+
 	public function postFile_get_contents($path,$data){
 		if(self::isEncrypted($path)){
 			$cached=OC_FileCache_Cached::get($path,'');
@@ -80,7 +80,7 @@ class OC_FileProxy_Encryption extends OC_FileProxy{
 		}
 		return $data;
 	}
-	
+
 	public function postFopen($path,&$result){
 		if(!$result){
 			return $result;
diff --git a/apps/files_encryption/tests/encryption.php b/apps/files_encryption/tests/encryption.php
index 286770a69f..f70411ed63 100644
--- a/apps/files_encryption/tests/encryption.php
+++ b/apps/files_encryption/tests/encryption.php
@@ -23,7 +23,7 @@ class Test_Encryption extends UnitTestCase {
 		$decrypted=OC_Crypt::decrypt($encrypted,$key);
 		$decrypted=rtrim($decrypted, "\0");
 		$this->assertEqual($decrypted,$chunk);
-		
+
 		$encrypted=OC_Crypt::blockEncrypt($source,$key);
 		$decrypted=OC_Crypt::blockDecrypt($encrypted,$key);
 		$this->assertNotEqual($encrypted,$source);
@@ -56,7 +56,7 @@ class Test_Encryption extends UnitTestCase {
 
 	function testBinary(){
 		$key=uniqid();
-	
+
 		$file=__DIR__.'/binary';
 		$source=file_get_contents($file); //binary file
 		$encrypted=OC_Crypt::encrypt($source,$key);
diff --git a/apps/files_encryption/tests/proxy.php b/apps/files_encryption/tests/proxy.php
index 5463836a20..c4952d13d3 100644
--- a/apps/files_encryption/tests/proxy.php
+++ b/apps/files_encryption/tests/proxy.php
@@ -9,18 +9,18 @@
 class Test_CryptProxy extends UnitTestCase {
 	private $oldConfig;
 	private $oldKey;
-	
+
 	public function setUp(){
 		$user=OC_User::getUser();
 
 		$this->oldConfig=OCP\Config::getAppValue('files_encryption','enable_encryption','true');
 		OCP\Config::setAppValue('files_encryption','enable_encryption','true');
 		$this->oldKey=isset($_SESSION['enckey'])?$_SESSION['enckey']:null;
-	
-		
+
+
 		//set testing key
 		$_SESSION['enckey']=md5(time());
-	
+
 		//clear all proxies and hooks so we can do clean testing
 		OC_FileProxy::clearProxies();
 		OC_Hook::clear('OC_Filesystem');
@@ -52,11 +52,11 @@ class Test_CryptProxy extends UnitTestCase {
 		$original=file_get_contents($file);
 
 		OC_Filesystem::file_put_contents('/file',$original);
-		
+
 		OC_FileProxy::$enabled=false;
 		$stored=OC_Filesystem::file_get_contents('/file');
 		OC_FileProxy::$enabled=true;
-		
+
 		$fromFile=OC_Filesystem::file_get_contents('/file');
 		$this->assertNotEqual($original,$stored);
 		$this->assertEqual(strlen($original),strlen($fromFile));
diff --git a/apps/files_encryption/tests/stream.php b/apps/files_encryption/tests/stream.php
index d95ea792f7..517d497344 100644
--- a/apps/files_encryption/tests/stream.php
+++ b/apps/files_encryption/tests/stream.php
@@ -8,7 +8,7 @@
 
 class Test_CryptStream extends UnitTestCase {
 	private $tmpFiles=array();
-	
+
 	function testStream(){
 		$stream=$this->getStream('test1','w',strlen('foobar'));
 		fwrite($stream,'foobar');
diff --git a/apps/files_external/ajax/addRootCertificate.php b/apps/files_external/ajax/addRootCertificate.php
index d28a7d24b2..a8719fc7a3 100644
--- a/apps/files_external/ajax/addRootCertificate.php
+++ b/apps/files_external/ajax/addRootCertificate.php
@@ -14,7 +14,7 @@ $fh = fopen($to, 'r');
 $data = fread($fh, filesize($to));
 fclose($fh);
 if (!strpos($data, 'BEGIN CERTIFICATE')) {
-	$pem = chunk_split(base64_encode($data), 64, "\n");
+	$pem = chunk_split(base64_encode($data), 64, "\n");
 	$pem = "-----BEGIN CERTIFICATE-----\n".$pem."-----END CERTIFICATE-----\n";
 	$fh = fopen($to, 'w');
 	fwrite($fh, $pem);
@@ -25,4 +25,3 @@ OC_Mount_Config::createCertificateBundle();
 
 header("Location: settings/personal.php");
 exit;
-?>
\ No newline at end of file
diff --git a/apps/files_external/ajax/dropbox.php b/apps/files_external/ajax/dropbox.php
index 5f2ff17e62..f5923940dc 100644
--- a/apps/files_external/ajax/dropbox.php
+++ b/apps/files_external/ajax/dropbox.php
@@ -37,5 +37,3 @@ if (isset($_POST['app_key']) && isset($_POST['app_secret'])) {
 } else {
 	OCP\JSON::error(array('data' => array('message' => 'Please provide a valid Dropbox app key and secret.')));
 }
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/ajax/google.php b/apps/files_external/ajax/google.php
index 23ecfc3708..4cd01c06cc 100644
--- a/apps/files_external/ajax/google.php
+++ b/apps/files_external/ajax/google.php
@@ -47,5 +47,3 @@ if (isset($_POST['step'])) {
 			break;
 	}
 }
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/ajax/removeRootCertificate.php b/apps/files_external/ajax/removeRootCertificate.php
index f78f85b8fe..9b78e180d9 100644
--- a/apps/files_external/ajax/removeRootCertificate.php
+++ b/apps/files_external/ajax/removeRootCertificate.php
@@ -9,4 +9,3 @@ $cert = $_POST['cert'];
 $file = \OCP\Config::getSystemValue('datadirectory').$view->getAbsolutePath("").'uploads/'.$cert;
 unlink($file);
 OC_Mount_Config::createCertificateBundle();
-?>
\ No newline at end of file
diff --git a/apps/files_external/js/settings.js b/apps/files_external/js/settings.js
index 23f02bbefc..f346007090 100644
--- a/apps/files_external/js/settings.js
+++ b/apps/files_external/js/settings.js
@@ -70,7 +70,7 @@ OC.MountConfig={
 
 $(document).ready(function() {
 	$('.chzn-select').chosen();
-	
+
 	$('#selectBackend').live('change', function() {
 		var tr = $(this).parent().parent();
 		$('#externalStorage tbody').append($(tr).clone());
@@ -133,7 +133,7 @@ $(document).ready(function() {
 			}
 		}
 		return defaultMountPoint+append;
-	} 
+	}
 
 	$('#externalStorage td').live('change', function() {
 		OC.MountConfig.saveStorage($(this).parent());
diff --git a/apps/files_external/l10n/cs_CZ.php b/apps/files_external/l10n/cs_CZ.php
index 8f11d7da11..e8a38d8661 100644
--- a/apps/files_external/l10n/cs_CZ.php
+++ b/apps/files_external/l10n/cs_CZ.php
@@ -1,13 +1,18 @@
 <?php $TRANSLATIONS = array(
 "External Storage" => "Externí úložiště",
 "Mount point" => "Přípojný bod",
+"Backend" => "Končící",
 "Configuration" => "Konfigurace",
 "Options" => "Nastavení",
+"Applicable" => "Platný",
 "Add mount point" => "Přidat přípojný bod",
+"None set" => "Nenastaveno",
 "All Users" => "Všichni uživatelé",
 "Groups" => "Skupiny",
 "Users" => "Uživatelé",
 "Delete" => "Smazat",
+"SSL root certificates" => "Kořenové SSL certifikáty",
+"Import Root Certificate" => "Import kořenového certifikátu",
 "Enable User External Storage" => "Zapnout uživatelské externí úložiště",
 "Allow users to mount their own external storage" => "Povolit uživatelů připojit jejich vlastní externí úložiště"
 );
diff --git a/apps/files_external/l10n/el.php b/apps/files_external/l10n/el.php
index a4a910ce63..7dcf13b397 100644
--- a/apps/files_external/l10n/el.php
+++ b/apps/files_external/l10n/el.php
@@ -1,5 +1,6 @@
 <?php $TRANSLATIONS = array(
 "External Storage" => "Εξωτερική αποθήκευση",
+"Mount point" => "Σημείο προσάρτησης",
 "Configuration" => "Ρυθμίσεις",
 "Options" => "Επιλογές",
 "All Users" => "Όλοι οι χρήστες",
diff --git a/apps/files_external/l10n/eu.php b/apps/files_external/l10n/eu.php
new file mode 100644
index 0000000000..a594cdff1f
--- /dev/null
+++ b/apps/files_external/l10n/eu.php
@@ -0,0 +1,16 @@
+<?php $TRANSLATIONS = array(
+"External Storage" => "Kanpoko Biltegiratzea",
+"Mount point" => "Montatze puntua",
+"Configuration" => "Konfigurazioa",
+"Options" => "Aukerak",
+"Add mount point" => "Gehitu muntatze puntua",
+"None set" => "Ezarri gabe",
+"All Users" => "Erabiltzaile guztiak",
+"Groups" => "Taldeak",
+"Users" => "Erabiltzaileak",
+"Delete" => "Ezabatu",
+"SSL root certificates" => "SSL erro ziurtagiriak",
+"Import Root Certificate" => "Inportatu Erro Ziurtagiria",
+"Enable User External Storage" => "Gaitu erabiltzaileentzako Kanpo Biltegiratzea",
+"Allow users to mount their own external storage" => "Baimendu erabiltzaileak bere kanpo biltegiratzeak muntatzen"
+);
diff --git a/apps/files_external/l10n/nb_NO.php b/apps/files_external/l10n/nb_NO.php
new file mode 100644
index 0000000000..273b40cf8e
--- /dev/null
+++ b/apps/files_external/l10n/nb_NO.php
@@ -0,0 +1,8 @@
+<?php $TRANSLATIONS = array(
+"Configuration" => "Konfigurasjon",
+"Options" => "Innstillinger",
+"All Users" => "Alle brukere",
+"Groups" => "Grupper",
+"Users" => "Brukere",
+"Delete" => "Slett"
+);
diff --git a/apps/files_external/l10n/nl.php b/apps/files_external/l10n/nl.php
new file mode 100644
index 0000000000..f3f38260a8
--- /dev/null
+++ b/apps/files_external/l10n/nl.php
@@ -0,0 +1,18 @@
+<?php $TRANSLATIONS = array(
+"External Storage" => "Externe opslag",
+"Mount point" => "Aankoppelpunt",
+"Backend" => "Backend",
+"Configuration" => "Configuratie",
+"Options" => "Opties",
+"Applicable" => "Van toepassing",
+"Add mount point" => "Voeg aankoppelpunt toe",
+"None set" => "Niets ingesteld",
+"All Users" => "Alle gebruikers",
+"Groups" => "Groepen",
+"Users" => "Gebruikers",
+"Delete" => "Verwijder",
+"SSL root certificates" => "SSL root certificaten",
+"Import Root Certificate" => "Importeer root certificaat",
+"Enable User External Storage" => "Zet gebruiker's externe opslag aan",
+"Allow users to mount their own external storage" => "Sta gebruikers toe om hun eigen externe opslag aan te koppelen"
+);
diff --git a/apps/files_external/lib/amazons3.php b/apps/files_external/lib/amazons3.php
index 3c2e333017..41ec3c70b4 100644
--- a/apps/files_external/lib/amazons3.php
+++ b/apps/files_external/lib/amazons3.php
@@ -29,7 +29,7 @@ class OC_Filestorage_AmazonS3 extends OC_Filestorage_Common {
 	private $objects = array();
 
 	private static $tempFiles = array();
-	
+
 	// TODO options: storage class, encryption server side, encrypt before upload?
 
 	public function __construct($params) {
@@ -216,7 +216,7 @@ class OC_Filestorage_AmazonS3 extends OC_Filestorage_Common {
 	}
 
 	public function free_space($path) {
-		// Infinite? 
+		// Infinite?
 		return false;
 	}
 
@@ -232,5 +232,3 @@ class OC_Filestorage_AmazonS3 extends OC_Filestorage_Common {
 	}
 
 }
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/lib/dropbox.php b/apps/files_external/lib/dropbox.php
index b90563a506..bb86894e55 100755
--- a/apps/files_external/lib/dropbox.php
+++ b/apps/files_external/lib/dropbox.php
@@ -251,5 +251,3 @@ class OC_Filestorage_Dropbox extends OC_Filestorage_Common {
 	}
 
 }
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/lib/ftp.php b/apps/files_external/lib/ftp.php
index 63f14a2877..818273f6c2 100644
--- a/apps/files_external/lib/ftp.php
+++ b/apps/files_external/lib/ftp.php
@@ -14,7 +14,7 @@ class OC_FileStorage_FTP extends OC_FileStorage_StreamWrapper{
 	private $root;
 
 	private static $tempFiles=array();
-	
+
 	public function __construct($params){
 		$this->host=$params['host'];
 		$this->user=$params['user'];
diff --git a/apps/files_external/lib/google.php b/apps/files_external/lib/google.php
index 73317bbf71..9b83dcee53 100644
--- a/apps/files_external/lib/google.php
+++ b/apps/files_external/lib/google.php
@@ -119,7 +119,7 @@ class OC_Filestorage_Google extends OC_Filestorage_Common {
 				}
 			}
 		}
-		return false; 
+		return false;
 	}
 
 	private function getFeed($feedUri, $httpMethod, $postData = null) {
@@ -174,7 +174,7 @@ class OC_Filestorage_Google extends OC_Filestorage_Common {
 				return 'html';
 		}
 	}
-	
+
 
 	public function mkdir($path) {
 		$collection = dirname($path);
@@ -254,7 +254,7 @@ class OC_Filestorage_Google extends OC_Filestorage_Common {
 		} else if ($entry = $this->getResource($path)) {
 			// NOTE: Native resources don't have a file size
 			$stat['size'] = $entry->getElementsByTagNameNS('http://schemas.google.com/g/2005', 'quotaBytesUsed')->item(0)->nodeValue;
-// 			if (isset($atime = $entry->getElementsByTagNameNS('http://schemas.google.com/g/2005', 'lastViewed')->item(0)->nodeValue)) 
+// 			if (isset($atime = $entry->getElementsByTagNameNS('http://schemas.google.com/g/2005', 'lastViewed')->item(0)->nodeValue))
 // 			$stat['atime'] = strtotime($entry->getElementsByTagNameNS('http://schemas.google.com/g/2005', 'lastViewed')->item(0)->nodeValue);
 			$stat['mtime'] = strtotime($entry->getElementsByTagName('updated')->item(0)->nodeValue);
 			$stat['ctime'] = strtotime($entry->getElementsByTagName('published')->item(0)->nodeValue);
@@ -304,7 +304,7 @@ class OC_Filestorage_Google extends OC_Filestorage_Common {
 		}
 		return false;
 	}
-	
+
 	public function file_exists($path) {
 		if ($path == '' || $path == '/') {
 			return true;
@@ -313,7 +313,7 @@ class OC_Filestorage_Google extends OC_Filestorage_Common {
 		}
 		return false;
 	}
-	
+
 	public function unlink($path) {
 		// Get resource self link to trash resource
 		if ($entry = $this->getResource($path)) {
@@ -482,7 +482,7 @@ class OC_Filestorage_Google extends OC_Filestorage_Common {
 			// TODO Wait for resource entry
 		}
 	}
-	
+
 	public function getMimeType($path, $entry = null) {
 		// Entry can be passed, because extension is required for opendir and the entry can't be cached without the extension
 		if ($entry == null) {
@@ -522,7 +522,7 @@ class OC_Filestorage_Google extends OC_Filestorage_Common {
 		}
 		return false;
 	}
-	
+
 	public function free_space($path) {
 		if ($dom = $this->getFeed('https://docs.google.com/feeds/metadata/default', 'GET')) {
 			// NOTE: Native Google Docs resources don't count towards quota
@@ -532,9 +532,9 @@ class OC_Filestorage_Google extends OC_Filestorage_Common {
 		}
 		return false;
 	}
-  
+
 	public function touch($path, $mtime = null) {
-	  
+
 	}
 
 }
\ No newline at end of file
diff --git a/apps/files_external/lib/swift.php b/apps/files_external/lib/swift.php
index 94ccde1ff8..1868bc4ba7 100644
--- a/apps/files_external/lib/swift.php
+++ b/apps/files_external/lib/swift.php
@@ -274,7 +274,7 @@ class OC_FileStorage_SWIFT extends OC_Filestorage_Common{
 		}
 		$this->auth = new CF_Authentication($this->user, $this->token, null, $this->host);
 		$this->auth->authenticate();
-		
+
 		$this->conn = new CF_Connection($this->auth);
 
 		if(!$this->containerExists($this->root)){
@@ -303,7 +303,7 @@ class OC_FileStorage_SWIFT extends OC_Filestorage_Common{
 				$parentContainer=$this->getContainer(dirname($path));
 				$this->removeSubContainer($parentContainer,basename($path));
 			}
-			
+
 			$this->conn->delete_container($this->getContainerName($path));
 			unset($this->containers[$path]);
 			return true;
@@ -410,7 +410,7 @@ class OC_FileStorage_SWIFT extends OC_Filestorage_Common{
 			case 'rb':
 				$fp = fopen('php://temp', 'r+');
 				$obj->stream($fp);
-				
+
 				rewind($fp);
 				return $fp;
 			case 'w':
@@ -451,7 +451,7 @@ class OC_FileStorage_SWIFT extends OC_Filestorage_Common{
 		if(is_null($mtime)){
 			$mtime=time();
 		}
-		
+
 		//emulate setting mtime with metadata
 		$obj->metadata['Mtime']=$mtime;
 		$obj->sync_metadata();
diff --git a/apps/files_external/lib/webdav.php b/apps/files_external/lib/webdav.php
index e3f73c5c0a..1b9c3e3333 100644
--- a/apps/files_external/lib/webdav.php
+++ b/apps/files_external/lib/webdav.php
@@ -18,7 +18,7 @@ class OC_FileStorage_DAV extends OC_Filestorage_Common{
 	private $client;
 
 	private static $tempFiles=array();
-	
+
 	public function __construct($params){
 		$host = $params['host'];
 		//remove leading http[s], will be generated in createBaseUri()
@@ -35,7 +35,7 @@ class OC_FileStorage_DAV extends OC_Filestorage_Common{
 		if(substr($this->root,-1,1)!='/'){
 			$this->root.='/';
 		}
-		
+
 		$settings = array(
 			'baseUri' => $this->createBaseUri(),
 			'userName' => $this->user,
@@ -43,7 +43,7 @@ class OC_FileStorage_DAV extends OC_Filestorage_Common{
 		);
 
 		$this->client = new OC_Connector_Sabre_Client($settings);
-		
+
 		if($caview = \OCP\Files::getStorage('files_external')) {
 			$certPath=\OCP\Config::getSystemValue('datadirectory').$caview->getAbsolutePath("").'rootcerts.crt';
 			if (file_exists($certPath))  {
@@ -296,4 +296,3 @@ class OC_FileStorage_DAV extends OC_Filestorage_Common{
 		}
 	}
 }
-
diff --git a/apps/files_external/personal.php b/apps/files_external/personal.php
index dec501741b..f0d76460f5 100755
--- a/apps/files_external/personal.php
+++ b/apps/files_external/personal.php
@@ -31,5 +31,3 @@ $tmpl->assign('mounts', OC_Mount_Config::getPersonalMountPoints());
 $tmpl->assign('certs', OC_Mount_Config::getCertificates());
 $tmpl->assign('backends', $backends);
 return $tmpl->fetchPage();
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/settings.php b/apps/files_external/settings.php
index acc9036b29..b586ce1e8c 100644
--- a/apps/files_external/settings.php
+++ b/apps/files_external/settings.php
@@ -30,5 +30,3 @@ $tmpl->assign('groups', OC_Group::getGroups());
 $tmpl->assign('users', OCP\User::getUsers());
 $tmpl->assign('allowUserMounting', OCP\Config::getAppValue('files_external', 'allow_user_mounting', 'yes'));
 return $tmpl->fetchPage();
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/templates/settings.php b/apps/files_external/templates/settings.php
index 397f0d951b..c44b09b180 100644
--- a/apps/files_external/templates/settings.php
+++ b/apps/files_external/templates/settings.php
@@ -80,9 +80,9 @@
 			</tbody>
 		</table>
 		<br />
-		
+
 		<?php if (!$_['isAdminPage']):  ?>
-  		<table id="sslCertificate" data-admin='<?php echo json_encode($_['isAdminPage']); ?>'>
+		<table id="sslCertificate" data-admin='<?php echo json_encode($_['isAdminPage']); ?>'>
 			<thead>
 				<tr>
 					<th><?php echo $l->t('SSL root certificates'); ?></th>
@@ -91,17 +91,17 @@
 			</thead>
 			<tbody width="100%">
 			<?php foreach ($_['certs'] as $rootCert): ?>
-			<tr id="<?php echo $rootCert ?>">	
+			<tr id="<?php echo $rootCert ?>">
 			<td class="rootCert"><?php echo $rootCert ?></td>
 			<td <?php echo ($rootCert != '') ? 'class="remove"' : 'style="visibility:hidden;"'; ?>><img alt="<?php echo $l->t('Delete'); ?>" title="<?php echo $l->t('Delete'); ?>" class="svg action" src="<?php echo image_path('core', 'actions/delete.svg'); ?>" /></td>
 			</tr>
 			<?php endforeach; ?>
 			</tbody>
-		</table>		
+		</table>
         <input type="file" id="rootcert_import" name="rootcert_import" style="width:230px;">
-        <input type="submit" name="cert_import" value="<?php echo $l->t('Import Root Certificate'); ?>" />		
+        <input type="submit" name="cert_import" value="<?php echo $l->t('Import Root Certificate'); ?>" />
 		<?php endif; ?>
-		
+
 		<?php if ($_['isAdminPage']): ?>
 			<br />
 			<input type="checkbox" name="allowUserMounting" id="allowUserMounting" value="1" <?php if ($_['allowUserMounting'] == 'yes') echo ' checked="checked"'; ?> />
diff --git a/apps/files_external/tests/ftp.php b/apps/files_external/tests/ftp.php
index 97796bca12..3548880e83 100644
--- a/apps/files_external/tests/ftp.php
+++ b/apps/files_external/tests/ftp.php
@@ -5,7 +5,7 @@
  * later.
  * See the COPYING-README file.
  */
- 
+
 $config=include('apps/files_external/tests/config.php');
 if(!is_array($config) or !isset($config['ftp']) or !$config['ftp']['run']){
 	abstract class Test_Filestorage_FTP extends Test_FileStorage{}
@@ -26,4 +26,3 @@ if(!is_array($config) or !isset($config['ftp']) or !$config['ftp']['run']){
 		}
 	}
 }
-
diff --git a/apps/files_external/tests/google.php b/apps/files_external/tests/google.php
index 806db5a6aa..b0bd9cbbea 100644
--- a/apps/files_external/tests/google.php
+++ b/apps/files_external/tests/google.php
@@ -26,7 +26,7 @@ if(!is_array($config) or !isset($config['google']) or !$config['google']['run'])
 	return;
 }else{
 	class Test_Filestorage_Google extends Test_FileStorage {
-		
+
 		private $config;
 
 		public function setUp(){
@@ -41,4 +41,3 @@ if(!is_array($config) or !isset($config['google']) or !$config['google']['run'])
 		}
 	}
 }
-
diff --git a/apps/files_external/tests/swift.php b/apps/files_external/tests/swift.php
index 1520c9473d..bfe7b77aac 100644
--- a/apps/files_external/tests/swift.php
+++ b/apps/files_external/tests/swift.php
@@ -21,11 +21,10 @@ if(!is_array($config) or !isset($config['swift']) or !$config['swift']['run']){
 			$this->instance=new OC_Filestorage_SWIFT($this->config['swift']);
 		}
 
-		
+
 		public function tearDown(){
 		    $this->instance->rmdir('');
 		}
-		
+
 	}
 }
-
diff --git a/apps/files_external/tests/test.php b/apps/files_external/tests/test.php
index bd24404f3b..5387279fb0 100644
--- a/apps/files_external/tests/test.php
+++ b/apps/files_external/tests/test.php
@@ -4,4 +4,3 @@ echo "<pre>";
 print_r(OC_Mount_Config::getSystemMountPoints());
 echo "</pre>";
 // OC_Mount_Config::addMountPoint('Photos', 'OC_Filestorage_SWIFT', array('host' => 'gapinthecloud.com', 'user' => 'Gap', 'token' => '23423afdasFJEW22', 'secure' => 'true', 'root' => ''), OC_Mount_Config::MOUNT_TYPE_GROUP, 'admin', false);
-?>
diff --git a/apps/files_external/tests/webdav.php b/apps/files_external/tests/webdav.php
index 14abbef2cb..49c44124f3 100644
--- a/apps/files_external/tests/webdav.php
+++ b/apps/files_external/tests/webdav.php
@@ -26,4 +26,3 @@ if(!is_array($config) or !isset($config['webdav']) or !$config['webdav']['run'])
 		}
 	}
 }
-
diff --git a/apps/files_imageviewer/appinfo/app.php b/apps/files_imageviewer/appinfo/app.php
deleted file mode 100644
index 6184585cff..0000000000
--- a/apps/files_imageviewer/appinfo/app.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-OCP\Util::addscript( 'files_imageviewer', 'lightbox' );
-OCP\Util::addscript('files_imageviewer', 'jquery.mousewheel-3.0.4.pack');
-OCP\Util::addscript('files_imageviewer', 'jquery.fancybox-1.3.4.pack');
-OCP\Util::addStyle( 'files_imageviewer', 'jquery.fancybox-1.3.4' );
diff --git a/apps/files_imageviewer/appinfo/info.xml b/apps/files_imageviewer/appinfo/info.xml
deleted file mode 100644
index 1e3192f6ed..0000000000
--- a/apps/files_imageviewer/appinfo/info.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<info>
-	<id>files_imageviewer</id>
-	<name>Image Viewer</name>
-	<description>Simple image viewer for owncloud</description>
-	<licence>AGPL</licence>
-	<author>Robin Appelman</author>
-	<require>4</require>
-	<shipped>true</shipped>
-	<default_enable/>
-</info>
diff --git a/apps/files_imageviewer/appinfo/version b/apps/files_imageviewer/appinfo/version
deleted file mode 100644
index 9f8e9b69a3..0000000000
--- a/apps/files_imageviewer/appinfo/version
+++ /dev/null
@@ -1 +0,0 @@
-1.0
\ No newline at end of file
diff --git a/apps/files_imageviewer/css/jquery.fancybox-1.3.4.css b/apps/files_imageviewer/css/jquery.fancybox-1.3.4.css
deleted file mode 100644
index 6e982805a4..0000000000
--- a/apps/files_imageviewer/css/jquery.fancybox-1.3.4.css
+++ /dev/null
@@ -1,359 +0,0 @@
-/*
- * FancyBox - jQuery Plugin
- * Simple and fancy lightbox alternative
- *
- * Examples and documentation at: http://fancybox.net
- * 
- * Copyright (c) 2008 - 2010 Janis Skarnelis
- * That said, it is hardly a one-person project. Many people have submitted bugs, code, and offered their advice freely. Their support is greatly appreciated.
- * 
- * Version: 1.3.4 (11/11/2010)
- * Requires: jQuery v1.3+
- *
- * Dual licensed under the MIT and GPL licenses:
- *   http://www.opensource.org/licenses/mit-license.php
- *   http://www.gnu.org/licenses/gpl.html
- */
-
-#fancybox-loading {
-	position: fixed;
-	top: 50%;
-	left: 50%;
-	width: 40px;
-	height: 40px;
-	margin-top: -20px;
-	margin-left: -20px;
-	cursor: pointer;
-	overflow: hidden;
-	z-index: 1104;
-	display: none;
-}
-
-#fancybox-loading div {
-	position: absolute;
-	top: 0;
-	left: 0;
-	width: 40px;
-	height: 480px;
-	background-image: url('%appswebroot%/files_imageviewer/img/fancybox.png');
-}
-
-#fancybox-overlay {
-	position: absolute;
-	top: 0;
-	left: 0;
-	width: 100%;
-	z-index: 1100;
-	display: none;
-}
-
-#fancybox-tmp {
-	padding: 0;
-	margin: 0;
-	border: 0;
-	overflow: auto;
-	display: none;
-}
-
-#fancybox-wrap {
-	position: absolute;
-	top: 0;
-	left: 0;
-	padding: 20px;
-	z-index: 1101;
-	outline: none;
-	display: none;
-}
-
-#fancybox-outer {
-	position: relative;
-	width: 100%;
-	height: 100%;
-	background: #fff;
-}
-
-#fancybox-content {
-	width: 0;
-	height: 0;
-	padding: 0;
-	outline: none;
-	position: relative;
-	overflow: hidden;
-	z-index: 1102;
-	border: 0px solid #fff;
-}
-
-#fancybox-hide-sel-frame {
-	position: absolute;
-	top: 0;
-	left: 0;
-	width: 100%;
-	height: 100%;
-	background: transparent;
-	z-index: 1101;
-}
-
-#fancybox-close {
-	position: absolute;
-	top: -15px;
-	right: -15px;
-	width: 30px;
-	height: 30px;
-	background: transparent url('%appswebroot%/files_imageviewer/img/fancybox.png') -40px 0px;
-	cursor: pointer;
-	z-index: 1103;
-	display: none;
-}
-
-#fancybox-error {
-	color: #444;
-	font: normal 12px/20px Arial;
-	padding: 14px;
-	margin: 0;
-}
-
-#fancybox-img {
-	width: 100%;
-	height: 100%;
-	padding: 0;
-	margin: 0;
-	border: none;
-	outline: none;
-	line-height: 0;
-	vertical-align: top;
-}
-
-#fancybox-frame {
-	width: 100%;
-	height: 100%;
-	border: none;
-	display: block;
-}
-
-#fancybox-left, #fancybox-right {
-	position: absolute;
-	bottom: 0px;
-	height: 100%;
-	width: 35%;
-	cursor: pointer;
-	outline: none;
-	background: transparent url('%appswebroot%/files_imageviewer/img/blank.gif');
-	z-index: 1102;
-	display: none;
-}
-
-#fancybox-left {
-	left: 0px;
-}
-
-#fancybox-right {
-	right: 0px;
-}
-
-#fancybox-left-ico, #fancybox-right-ico {
-	position: absolute;
-	top: 50%;
-	left: -9999px;
-	width: 30px;
-	height: 30px;
-	margin-top: -15px;
-	cursor: pointer;
-	z-index: 1102;
-	display: block;
-}
-
-#fancybox-left-ico {
-	background-image: url('%appswebroot%/files_imageviewer/img/fancybox.png');
-	background-position: -40px -30px;
-}
-
-#fancybox-right-ico {
-	background-image: url('%appswebroot%/files_imageviewer/img/fancybox.png');
-	background-position: -40px -60px;
-}
-
-#fancybox-left:hover, #fancybox-right:hover {
-	visibility: visible; /* IE6 */
-}
-
-#fancybox-left:hover span {
-	left: 20px;
-}
-
-#fancybox-right:hover span {
-	left: auto;
-	right: 20px;
-}
-
-.fancybox-bg {
-	position: absolute;
-	padding: 0;
-	margin: 0;
-	border: 0;
-	width: 20px;
-	height: 20px;
-	z-index: 1001;
-}
-
-#fancybox-bg-n {
-	top: -20px;
-	left: 0;
-	width: 100%;
-	background-image: url('%appswebroot%/files_imageviewer/img/fancybox-x.png');
-}
-
-#fancybox-bg-ne {
-	top: -20px;
-	right: -20px;
-	background-image: url('%appswebroot%/files_imageviewer/img/fancybox.png');
-	background-position: -40px -162px;
-}
-
-#fancybox-bg-e {
-	top: 0;
-	right: -20px;
-	height: 100%;
-	background-image: url('%appswebroot%/files_imageviewer/img/fancybox-y.png');
-	background-position: -20px 0px;
-}
-
-#fancybox-bg-se {
-	bottom: -20px;
-	right: -20px;
-	background-image: url('%appswebroot%/files_imageviewer/img/fancybox.png');
-	background-position: -40px -182px; 
-}
-
-#fancybox-bg-s {
-	bottom: -20px;
-	left: 0;
-	width: 100%;
-	background-image: url('%appswebroot%/files_imageviewer/img/fancybox-x.png');
-	background-position: 0px -20px;
-}
-
-#fancybox-bg-sw {
-	bottom: -20px;
-	left: -20px;
-	background-image: url('%appswebroot%/files_imageviewer/img/fancybox.png');
-	background-position: -40px -142px;
-}
-
-#fancybox-bg-w {
-	top: 0;
-	left: -20px;
-	height: 100%;
-	background-image: url('%appswebroot%/files_imageviewer/img/fancybox-y.png');
-}
-
-#fancybox-bg-nw {
-	top: -20px;
-	left: -20px;
-	background-image: url('%appswebroot%/files_imageviewer/img/fancybox.png');
-	background-position: -40px -122px;
-}
-
-#fancybox-title {
-	font-family: Helvetica;
-	font-size: 12px;
-	z-index: 1102;
-}
-
-.fancybox-title-inside {
-	padding-bottom: 10px;
-	text-align: center;
-	color: #333;
-	background: #fff;
-	position: relative;
-}
-
-.fancybox-title-outside {
-	padding-top: 10px;
-	color: #fff;
-}
-
-.fancybox-title-over {
-	position: absolute;
-	bottom: 0;
-	left: 0;
-	color: #FFF;
-	text-align: left;
-}
-
-#fancybox-title-over {
-	padding: 10px;
-	background-image: url('%appswebroot%/files_imageviewer/img/fancy_title_over.png');
-	display: block;
-}
-
-.fancybox-title-float {
-	position: absolute;
-	left: 0;
-	bottom: -20px;
-	height: 32px;
-}
-
-#fancybox-title-float-wrap {
-	border: none;
-	border-collapse: collapse;
-	width: auto;
-}
-
-#fancybox-title-float-wrap td {
-	border: none;
-	white-space: nowrap;
-}
-
-#fancybox-title-float-left {
-	padding: 0 0 0 15px;
-	background: url('%appswebroot%/files_imageviewer/img/fancybox.png') -40px -90px no-repeat;
-}
-
-#fancybox-title-float-main {
-	color: #FFF;
-	line-height: 29px;
-	font-weight: bold;
-	padding: 0 0 3px 0;
-	background: url('%appswebroot%/files_imageviewer/img/fancybox-x.png') 0px -40px;
-}
-
-#fancybox-title-float-right {
-	padding: 0 0 0 15px;
-	background: url('%appswebroot%/files_imageviewer/img/fancybox.png') -55px -90px no-repeat;
-}
-
-/* IE6 */
-
-.fancybox-ie6 #fancybox-close { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/files_imageviewer/img/fancy_close.png', sizingMethod='scale'); }
-
-.fancybox-ie6 #fancybox-left-ico { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/files_imageviewer/img/fancy_nav_left.png', sizingMethod='scale'); }
-.fancybox-ie6 #fancybox-right-ico { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/files_imageviewer/img/fancy_nav_right.png', sizingMethod='scale'); }
-
-.fancybox-ie6 #fancybox-title-over { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/files_imageviewer/img/fancy_title_over.png', sizingMethod='scale'); zoom: 1; }
-.fancybox-ie6 #fancybox-title-float-left { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/files_imageviewer/img/fancy_title_left.png', sizingMethod='scale'); }
-.fancybox-ie6 #fancybox-title-float-main { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/files_imageviewer/img/fancy_title_main.png', sizingMethod='scale'); }
-.fancybox-ie6 #fancybox-title-float-right { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/files_imageviewer/img/fancy_title_right.png', sizingMethod='scale'); }
-
-.fancybox-ie6 #fancybox-bg-w, .fancybox-ie6 #fancybox-bg-e, .fancybox-ie6 #fancybox-left, .fancybox-ie6 #fancybox-right, #fancybox-hide-sel-frame {
-	height: expression(this.parentNode.clientHeight + "px");
-}
-
-#fancybox-loading.fancybox-ie6 {
-	position: absolute; margin-top: 0;
-	top: expression( (-20 + (document.documentElement.clientHeight ? document.documentElement.clientHeight/2 : document.body.clientHeight/2 ) + ( ignoreMe = document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop )) + 'px');
-}
-
-#fancybox-loading.fancybox-ie6 div	{ background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/files_imageviewer/img/fancy_loading.png', sizingMethod='scale'); }
-
-/* IE6, IE7, IE8 */
-
-.fancybox-ie .fancybox-bg { background: transparent !important; }
-
-.fancybox-ie #fancybox-bg-n { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/files_imageviewer/img/fancy_shadow_n.png', sizingMethod='scale'); }
-.fancybox-ie #fancybox-bg-ne { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/files_imageviewer/img/fancy_shadow_ne.png', sizingMethod='scale'); }
-.fancybox-ie #fancybox-bg-e { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/files_imageviewer/img/fancy_shadow_e.png', sizingMethod='scale'); }
-.fancybox-ie #fancybox-bg-se { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/files_imageviewer/img/fancy_shadow_se.png', sizingMethod='scale'); }
-.fancybox-ie #fancybox-bg-s { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/files_imageviewer/img/fancy_shadow_s.png', sizingMethod='scale'); }
-.fancybox-ie #fancybox-bg-sw { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/files_imageviewer/img/fancy_shadow_sw.png', sizingMethod='scale'); }
-.fancybox-ie #fancybox-bg-w { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/files_imageviewer/img/fancy_shadow_w.png', sizingMethod='scale'); }
-.fancybox-ie #fancybox-bg-nw { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/files_imageviewer/img/fancy_shadow_nw.png', sizingMethod='scale'); }
diff --git a/apps/files_imageviewer/img/blank.gif b/apps/files_imageviewer/img/blank.gif
deleted file mode 100644
index 35d42e808f..0000000000
Binary files a/apps/files_imageviewer/img/blank.gif and /dev/null differ
diff --git a/apps/files_imageviewer/img/fancy_close.png b/apps/files_imageviewer/img/fancy_close.png
deleted file mode 100644
index 07035307ad..0000000000
Binary files a/apps/files_imageviewer/img/fancy_close.png and /dev/null differ
diff --git a/apps/files_imageviewer/img/fancy_loading.png b/apps/files_imageviewer/img/fancy_loading.png
deleted file mode 100644
index 2503017960..0000000000
Binary files a/apps/files_imageviewer/img/fancy_loading.png and /dev/null differ
diff --git a/apps/files_imageviewer/img/fancy_nav_left.png b/apps/files_imageviewer/img/fancy_nav_left.png
deleted file mode 100644
index ebaa6a4fd3..0000000000
Binary files a/apps/files_imageviewer/img/fancy_nav_left.png and /dev/null differ
diff --git a/apps/files_imageviewer/img/fancy_nav_right.png b/apps/files_imageviewer/img/fancy_nav_right.png
deleted file mode 100644
index 873294e969..0000000000
Binary files a/apps/files_imageviewer/img/fancy_nav_right.png and /dev/null differ
diff --git a/apps/files_imageviewer/img/fancy_shadow_e.png b/apps/files_imageviewer/img/fancy_shadow_e.png
deleted file mode 100644
index 2eda089364..0000000000
Binary files a/apps/files_imageviewer/img/fancy_shadow_e.png and /dev/null differ
diff --git a/apps/files_imageviewer/img/fancy_shadow_n.png b/apps/files_imageviewer/img/fancy_shadow_n.png
deleted file mode 100644
index 69aa10e233..0000000000
Binary files a/apps/files_imageviewer/img/fancy_shadow_n.png and /dev/null differ
diff --git a/apps/files_imageviewer/img/fancy_shadow_ne.png b/apps/files_imageviewer/img/fancy_shadow_ne.png
deleted file mode 100644
index 79f6980a3b..0000000000
Binary files a/apps/files_imageviewer/img/fancy_shadow_ne.png and /dev/null differ
diff --git a/apps/files_imageviewer/img/fancy_shadow_nw.png b/apps/files_imageviewer/img/fancy_shadow_nw.png
deleted file mode 100644
index 7182cd938a..0000000000
Binary files a/apps/files_imageviewer/img/fancy_shadow_nw.png and /dev/null differ
diff --git a/apps/files_imageviewer/img/fancy_shadow_s.png b/apps/files_imageviewer/img/fancy_shadow_s.png
deleted file mode 100644
index d8858bfb78..0000000000
Binary files a/apps/files_imageviewer/img/fancy_shadow_s.png and /dev/null differ
diff --git a/apps/files_imageviewer/img/fancy_shadow_se.png b/apps/files_imageviewer/img/fancy_shadow_se.png
deleted file mode 100644
index 541e3ffd3e..0000000000
Binary files a/apps/files_imageviewer/img/fancy_shadow_se.png and /dev/null differ
diff --git a/apps/files_imageviewer/img/fancy_shadow_sw.png b/apps/files_imageviewer/img/fancy_shadow_sw.png
deleted file mode 100644
index b451689fa7..0000000000
Binary files a/apps/files_imageviewer/img/fancy_shadow_sw.png and /dev/null differ
diff --git a/apps/files_imageviewer/img/fancy_shadow_w.png b/apps/files_imageviewer/img/fancy_shadow_w.png
deleted file mode 100644
index 8a4e4a887f..0000000000
Binary files a/apps/files_imageviewer/img/fancy_shadow_w.png and /dev/null differ
diff --git a/apps/files_imageviewer/img/fancy_title_left.png b/apps/files_imageviewer/img/fancy_title_left.png
deleted file mode 100644
index 6049223d1e..0000000000
Binary files a/apps/files_imageviewer/img/fancy_title_left.png and /dev/null differ
diff --git a/apps/files_imageviewer/img/fancy_title_main.png b/apps/files_imageviewer/img/fancy_title_main.png
deleted file mode 100644
index 8044271f29..0000000000
Binary files a/apps/files_imageviewer/img/fancy_title_main.png and /dev/null differ
diff --git a/apps/files_imageviewer/img/fancy_title_over.png b/apps/files_imageviewer/img/fancy_title_over.png
deleted file mode 100644
index d9f458f4bb..0000000000
Binary files a/apps/files_imageviewer/img/fancy_title_over.png and /dev/null differ
diff --git a/apps/files_imageviewer/img/fancy_title_right.png b/apps/files_imageviewer/img/fancy_title_right.png
deleted file mode 100644
index e36d9db2a7..0000000000
Binary files a/apps/files_imageviewer/img/fancy_title_right.png and /dev/null differ
diff --git a/apps/files_imageviewer/img/fancybox-x.png b/apps/files_imageviewer/img/fancybox-x.png
deleted file mode 100644
index c2130f8698..0000000000
Binary files a/apps/files_imageviewer/img/fancybox-x.png and /dev/null differ
diff --git a/apps/files_imageviewer/img/fancybox-y.png b/apps/files_imageviewer/img/fancybox-y.png
deleted file mode 100644
index 62f3176199..0000000000
Binary files a/apps/files_imageviewer/img/fancybox-y.png and /dev/null differ
diff --git a/apps/files_imageviewer/img/fancybox.png b/apps/files_imageviewer/img/fancybox.png
deleted file mode 100644
index 65e14f68fd..0000000000
Binary files a/apps/files_imageviewer/img/fancybox.png and /dev/null differ
diff --git a/apps/files_imageviewer/js/jquery.fancybox-1.3.4.js b/apps/files_imageviewer/js/jquery.fancybox-1.3.4.js
deleted file mode 100644
index e5493cd939..0000000000
--- a/apps/files_imageviewer/js/jquery.fancybox-1.3.4.js
+++ /dev/null
@@ -1,1156 +0,0 @@
-/*
- * FancyBox - jQuery Plugin
- * Simple and fancy lightbox alternative
- *
- * Examples and documentation at: http://fancybox.net
- *
- * Copyright (c) 2008 - 2010 Janis Skarnelis
- * That said, it is hardly a one-person project. Many people have submitted bugs, code, and offered their advice freely. Their support is greatly appreciated.
- *
- * Version: 1.3.4 (11/11/2010)
- * Requires: jQuery v1.3+
- *
- * Dual licensed under the MIT and GPL licenses:
- *   http://www.opensource.org/licenses/mit-license.php
- *   http://www.gnu.org/licenses/gpl.html
- */
-
-;(function($) {
-	var tmp, loading, overlay, wrap, outer, content, close, title, nav_left, nav_right,
-
-		selectedIndex = 0, selectedOpts = {}, selectedArray = [], currentIndex = 0, currentOpts = {}, currentArray = [],
-
-		ajaxLoader = null, imgPreloader = new Image(), imgRegExp = /\.(jpg|gif|png|bmp|jpeg)(.*)?$/i, swfRegExp = /[^\.]\.(swf)\s*$/i,
-
-		loadingTimer, loadingFrame = 1,
-
-		titleHeight = 0, titleStr = '', start_pos, final_pos, busy = false, fx = $.extend($('<div/>')[0], { prop: 0 }),
-
-		isIE6 = $.browser.msie && $.browser.version < 7 && !window.XMLHttpRequest,
-
-		/*
-		 * Private methods 
-		 */
-
-		_abort = function() {
-			loading.hide();
-
-			imgPreloader.onerror = imgPreloader.onload = null;
-
-			if (ajaxLoader) {
-				ajaxLoader.abort();
-			}
-
-			tmp.empty();
-		},
-
-		_error = function() {
-			if (false === selectedOpts.onError(selectedArray, selectedIndex, selectedOpts)) {
-				loading.hide();
-				busy = false;
-				return;
-			}
-
-			selectedOpts.titleShow = false;
-
-			selectedOpts.width = 'auto';
-			selectedOpts.height = 'auto';
-
-			tmp.html( '<p id="fancybox-error">The requested content cannot be loaded.<br />Please try again later.</p>' );
-
-			_process_inline();
-		},
-
-		_start = function() {
-			var obj = selectedArray[ selectedIndex ],
-				href, 
-				type, 
-				title,
-				str,
-				emb,
-				ret;
-
-			_abort();
-
-			selectedOpts = $.extend({}, $.fn.fancybox.defaults, (typeof $(obj).data('fancybox') == 'undefined' ? selectedOpts : $(obj).data('fancybox')));
-
-			ret = selectedOpts.onStart(selectedArray, selectedIndex, selectedOpts);
-
-			if (ret === false) {
-				busy = false;
-				return;
-			} else if (typeof ret == 'object') {
-				selectedOpts = $.extend(selectedOpts, ret);
-			}
-
-			title = selectedOpts.title || (obj.nodeName ? $(obj).attr('title') : obj.title) || '';
-			
-			if (obj.nodeName && !selectedOpts.orig) {
-				selectedOpts.orig = $(obj).children("img:first").length ? $(obj).children("img:first") : $(obj);
-			}
-
-			if (title === '' && selectedOpts.orig && selectedOpts.titleFromAlt) {
-				title = selectedOpts.orig.attr('alt');
-			}
-
-			title = title.replace(/</, "&lt;").replace(/>/, "&gt;");
-			
-			href = selectedOpts.href || (obj.nodeName ? $(obj).attr('href') : obj.href) || null;
-
-			if ((/^(?:javascript)/i).test(href) || href == '#') {
-				href = null;
-			}
-
-			if (selectedOpts.type) {
-				type = selectedOpts.type;
-
-				if (!href) {
-					href = selectedOpts.content;
-				}
-
-			} else if (selectedOpts.content) {
-				type = 'html';
-
-			} else if (href) {
-				if (href.match(imgRegExp)) {
-					type = 'image';
-
-				} else if (href.match(swfRegExp)) {
-					type = 'swf';
-
-				} else if ($(obj).hasClass("iframe")) {
-					type = 'iframe';
-
-				} else if (href.indexOf("#") === 0) {
-					type = 'inline';
-
-				} 
-			}
-
-			if (!type) {
-				_error();
-				return;
-			}
-
-			if (type == 'inline') {
-				obj	= href.substr(href.indexOf("#"));
-				type = $(obj).length > 0 ? 'inline' : 'ajax';
-			}
-
-			selectedOpts.type = type;
-			selectedOpts.href = href;
-			selectedOpts.title = title;
-
-			if (selectedOpts.autoDimensions) {
-				if (selectedOpts.type == 'html' || selectedOpts.type == 'inline' || selectedOpts.type == 'ajax') {
-					selectedOpts.width = 'auto';
-					selectedOpts.height = 'auto';
-				} else {
-					selectedOpts.autoDimensions = false;	
-				}
-			}
-
-			if (selectedOpts.modal) {
-				selectedOpts.overlayShow = true;
-				selectedOpts.hideOnOverlayClick = false;
-				selectedOpts.hideOnContentClick = false;
-				selectedOpts.enableEscapeButton = false;
-				selectedOpts.showCloseButton = false;
-			}
-
-			selectedOpts.padding = parseInt(selectedOpts.padding, 10);
-			selectedOpts.margin = parseInt(selectedOpts.margin, 10);
-
-			tmp.css('padding', (selectedOpts.padding + selectedOpts.margin));
-
-			$('.fancybox-inline-tmp').unbind('fancybox-cancel').bind('fancybox-change', function() {
-				$(this).replaceWith(content.children());				
-			});
-
-			switch (type) {
-				case 'html' :
-					tmp.html( selectedOpts.content );
-					_process_inline();
-				break;
-
-				case 'inline' :
-					if ( $(obj).parent().is('#fancybox-content') === true) {
-						busy = false;
-						return;
-					}
-
-					$('<div class="fancybox-inline-tmp" />')
-						.hide()
-						.insertBefore( $(obj) )
-						.bind('fancybox-cleanup', function() {
-							$(this).replaceWith(content.children());
-						}).bind('fancybox-cancel', function() {
-							$(this).replaceWith(tmp.children());
-						});
-
-					$(obj).appendTo(tmp);
-
-					_process_inline();
-				break;
-
-				case 'image':
-					busy = false;
-
-					$.fancybox.showActivity();
-
-					imgPreloader = new Image();
-
-					imgPreloader.onerror = function() {
-						_error();
-					};
-
-					imgPreloader.onload = function() {
-						busy = true;
-
-						imgPreloader.onerror = imgPreloader.onload = null;
-
-						_process_image();
-					};
-
-					imgPreloader.src = href;
-				break;
-
-				case 'swf':
-					selectedOpts.scrolling = 'no';
-
-					str = '<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" width="' + selectedOpts.width + '" height="' + selectedOpts.height + '"><param name="movie" value="' + href + '"></param>';
-					emb = '';
-
-					$.each(selectedOpts.swf, function(name, val) {
-						str += '<param name="' + name + '" value="' + val + '"></param>';
-						emb += ' ' + name + '="' + val + '"';
-					});
-
-					str += '<embed src="' + href + '" type="application/x-shockwave-flash" width="' + selectedOpts.width + '" height="' + selectedOpts.height + '"' + emb + '></embed></object>';
-
-					tmp.html(str);
-
-					_process_inline();
-				break;
-
-				case 'ajax':
-					busy = false;
-
-					$.fancybox.showActivity();
-
-					selectedOpts.ajax.win = selectedOpts.ajax.success;
-
-					ajaxLoader = $.ajax($.extend({}, selectedOpts.ajax, {
-						url	: href,
-						data : selectedOpts.ajax.data || {},
-						error : function(XMLHttpRequest, textStatus, errorThrown) {
-							if ( XMLHttpRequest.status > 0 ) {
-								_error();
-							}
-						},
-						success : function(data, textStatus, XMLHttpRequest) {
-							var o = typeof XMLHttpRequest == 'object' ? XMLHttpRequest : ajaxLoader;
-							if (o.status == 200) {
-								if ( typeof selectedOpts.ajax.win == 'function' ) {
-									ret = selectedOpts.ajax.win(href, data, textStatus, XMLHttpRequest);
-
-									if (ret === false) {
-										loading.hide();
-										return;
-									} else if (typeof ret == 'string' || typeof ret == 'object') {
-										data = ret;
-									}
-								}
-
-								tmp.html( data );
-								_process_inline();
-							}
-						}
-					}));
-
-				break;
-
-				case 'iframe':
-					_show();
-				break;
-			}
-		},
-
-		_process_inline = function() {
-			var
-				w = selectedOpts.width,
-				h = selectedOpts.height;
-
-			if (w.toString().indexOf('%') > -1) {
-				w = parseInt( ($(window).width() - (selectedOpts.margin * 2)) * parseFloat(w) / 100, 10) + 'px';
-
-			} else {
-				w = w == 'auto' ? 'auto' : w + 'px';	
-			}
-
-			if (h.toString().indexOf('%') > -1) {
-				h = parseInt( ($(window).height() - (selectedOpts.margin * 2)) * parseFloat(h) / 100, 10) + 'px';
-
-			} else {
-				h = h == 'auto' ? 'auto' : h + 'px';	
-			}
-
-			tmp.wrapInner('<div style="width:' + w + ';height:' + h + ';overflow: ' + (selectedOpts.scrolling == 'auto' ? 'auto' : (selectedOpts.scrolling == 'yes' ? 'scroll' : 'hidden')) + ';position:relative;"></div>');
-
-			selectedOpts.width = tmp.width();
-			selectedOpts.height = tmp.height();
-
-			_show();
-		},
-
-		_process_image = function() {
-			selectedOpts.width = imgPreloader.width;
-			selectedOpts.height = imgPreloader.height;
-
-			$("<img />").attr({
-				'id' : 'fancybox-img',
-				'src' : imgPreloader.src,
-				'alt' : selectedOpts.title
-			}).appendTo( tmp );
-
-			_show();
-		},
-
-		_show = function() {
-			var pos, equal;
-
-			loading.hide();
-
-			if (wrap.is(":visible") && false === currentOpts.onCleanup(currentArray, currentIndex, currentOpts)) {
-				$.event.trigger('fancybox-cancel');
-
-				busy = false;
-				return;
-			}
-
-			busy = true;
-
-			$(content.add( overlay )).unbind();
-
-			$(window).unbind("resize.fb scroll.fb");
-			$(document).unbind('keydown.fb');
-
-			if (wrap.is(":visible") && currentOpts.titlePosition !== 'outside') {
-				wrap.css('height', wrap.height());
-			}
-
-			currentArray = selectedArray;
-			currentIndex = selectedIndex;
-			currentOpts = selectedOpts;
-
-			if (currentOpts.overlayShow) {
-				overlay.css({
-					'background-color' : currentOpts.overlayColor,
-					'opacity' : currentOpts.overlayOpacity,
-					'cursor' : currentOpts.hideOnOverlayClick ? 'pointer' : 'auto',
-					'height' : $(document).height()
-				});
-
-				if (!overlay.is(':visible')) {
-					if (isIE6) {
-						$('select:not(#fancybox-tmp select)').filter(function() {
-							return this.style.visibility !== 'hidden';
-						}).css({'visibility' : 'hidden'}).one('fancybox-cleanup', function() {
-							this.style.visibility = 'inherit';
-						});
-					}
-
-					overlay.show();
-				}
-			} else {
-				overlay.hide();
-			}
-
-			final_pos = _get_zoom_to();
-
-			_process_title();
-
-			if (wrap.is(":visible")) {
-				$( close.add( nav_left ).add( nav_right ) ).hide();
-
-				pos = wrap.position(),
-
-				start_pos = {
-					top	 : pos.top,
-					left : pos.left,
-					width : wrap.width(),
-					height : wrap.height()
-				};
-
-				equal = (start_pos.width == final_pos.width && start_pos.height == final_pos.height);
-
-				content.fadeTo(currentOpts.changeFade, 0.3, function() {
-					var finish_resizing = function() {
-						content.html( tmp.contents() ).fadeTo(currentOpts.changeFade, 1, _finish);
-					};
-
-					$.event.trigger('fancybox-change');
-
-					content
-						.empty()
-						.removeAttr('filter')
-						.css({
-							'border-width' : currentOpts.padding,
-							'width'	: final_pos.width - currentOpts.padding * 2,
-							'height' : selectedOpts.autoDimensions ? 'auto' : final_pos.height - titleHeight - currentOpts.padding * 2
-						});
-
-					if (equal) {
-						finish_resizing();
-
-					} else {
-						fx.prop = 0;
-
-						$(fx).animate({prop: 1}, {
-							 duration : currentOpts.changeSpeed,
-							 easing : currentOpts.easingChange,
-							 step : _draw,
-							 complete : finish_resizing
-						});
-					}
-				});
-
-				return;
-			}
-
-			wrap.removeAttr("style");
-
-			content.css('border-width', currentOpts.padding);
-
-			if (currentOpts.transitionIn == 'elastic') {
-				start_pos = _get_zoom_from();
-
-				content.html( tmp.contents() );
-
-				wrap.show();
-
-				if (currentOpts.opacity) {
-					final_pos.opacity = 0;
-				}
-
-				fx.prop = 0;
-
-				$(fx).animate({prop: 1}, {
-					 duration : currentOpts.speedIn,
-					 easing : currentOpts.easingIn,
-					 step : _draw,
-					 complete : _finish
-				});
-
-				return;
-			}
-
-			if (currentOpts.titlePosition == 'inside' && titleHeight > 0) {	
-				title.show();	
-			}
-
-			content
-				.css({
-					'width' : final_pos.width - currentOpts.padding * 2,
-					'height' : selectedOpts.autoDimensions ? 'auto' : final_pos.height - titleHeight - currentOpts.padding * 2
-				})
-				.html( tmp.contents() );
-
-			wrap
-				.css(final_pos)
-				.fadeIn( currentOpts.transitionIn == 'none' ? 0 : currentOpts.speedIn, _finish );
-		},
-
-		_format_title = function(title) {
-			if (title && title.length) {
-				if (currentOpts.titlePosition == 'float') {
-					return '<table id="fancybox-title-float-wrap" cellpadding="0" cellspacing="0"><tr><td id="fancybox-title-float-left"></td><td id="fancybox-title-float-main">' + title + '</td><td id="fancybox-title-float-right"></td></tr></table>';
-				}
-
-				return '<div id="fancybox-title-' + currentOpts.titlePosition + '">' + title + '</div>';
-			}
-
-			return false;
-		},
-
-		_process_title = function() {
-			titleStr = currentOpts.title || '';
-			titleHeight = 0;
-
-			title
-				.empty()
-				.removeAttr('style')
-				.removeClass();
-
-			if (currentOpts.titleShow === false) {
-				title.hide();
-				return;
-			}
-
-			titleStr = $.isFunction(currentOpts.titleFormat) ? currentOpts.titleFormat(titleStr, currentArray, currentIndex, currentOpts) : _format_title(titleStr);
-
-			if (!titleStr || titleStr === '') {
-				title.hide();
-				return;
-			}
-
-			title
-				.addClass('fancybox-title-' + currentOpts.titlePosition)
-				.html( titleStr )
-				.appendTo( 'body' )
-				.show();
-
-			switch (currentOpts.titlePosition) {
-				case 'inside':
-					title
-						.css({
-							'width' : final_pos.width - (currentOpts.padding * 2),
-							'marginLeft' : currentOpts.padding,
-							'marginRight' : currentOpts.padding
-						});
-
-					titleHeight = title.outerHeight(true);
-
-					title.appendTo( outer );
-
-					final_pos.height += titleHeight;
-				break;
-
-				case 'over':
-					title
-						.css({
-							'marginLeft' : currentOpts.padding,
-							'width'	: final_pos.width - (currentOpts.padding * 2),
-							'bottom' : currentOpts.padding
-						})
-						.appendTo( outer );
-				break;
-
-				case 'float':
-					title
-						.css('left', parseInt((title.width() - final_pos.width - 40)/ 2, 10) * -1)
-						.appendTo( wrap );
-				break;
-
-				default:
-					title
-						.css({
-							'width' : final_pos.width - (currentOpts.padding * 2),
-							'paddingLeft' : currentOpts.padding,
-							'paddingRight' : currentOpts.padding
-						})
-						.appendTo( wrap );
-				break;
-			}
-
-			title.hide();
-		},
-
-		_set_navigation = function() {
-			if (currentOpts.enableEscapeButton || currentOpts.enableKeyboardNav) {
-				$(document).bind('keydown.fb', function(e) {
-					if (e.keyCode == 27 && currentOpts.enableEscapeButton) {
-						e.preventDefault();
-						$.fancybox.close();
-
-					} else if ((e.keyCode == 37 || e.keyCode == 39) && currentOpts.enableKeyboardNav && e.target.tagName !== 'INPUT' && e.target.tagName !== 'TEXTAREA' && e.target.tagName !== 'SELECT') {
-						e.preventDefault();
-						$.fancybox[ e.keyCode == 37 ? 'prev' : 'next']();
-					}
-				});
-			}
-
-			if (!currentOpts.showNavArrows) { 
-				nav_left.hide();
-				nav_right.hide();
-				return;
-			}
-
-			if ((currentOpts.cyclic && currentArray.length > 1) || currentIndex !== 0) {
-				nav_left.show();
-			}
-
-			if ((currentOpts.cyclic && currentArray.length > 1) || currentIndex != (currentArray.length -1)) {
-				nav_right.show();
-			}
-		},
-
-		_finish = function () {
-			if (!$.support.opacity) {
-				content.get(0).style.removeAttribute('filter');
-				wrap.get(0).style.removeAttribute('filter');
-			}
-
-			if (selectedOpts.autoDimensions) {
-				content.css('height', 'auto');
-			}
-
-			wrap.css('height', 'auto');
-
-			if (titleStr && titleStr.length) {
-				title.show();
-			}
-
-			if (currentOpts.showCloseButton) {
-				close.show();
-			}
-
-			_set_navigation();
-	
-			if (currentOpts.hideOnContentClick)	{
-				content.bind('click', $.fancybox.close);
-			}
-
-			if (currentOpts.hideOnOverlayClick)	{
-				overlay.bind('click', $.fancybox.close);
-			}
-
-			$(window).bind("resize.fb", $.fancybox.resize);
-
-			if (currentOpts.centerOnScroll) {
-				$(window).bind("scroll.fb", $.fancybox.center);
-			}
-
-			if (currentOpts.type == 'iframe') {
-				$('<iframe id="fancybox-frame" name="fancybox-frame' + new Date().getTime() + '" frameborder="0" hspace="0" ' + ($.browser.msie ? 'allowtransparency="true""' : '') + ' scrolling="' + selectedOpts.scrolling + '" src="' + currentOpts.href + '"></iframe>').appendTo(content);
-			}
-
-			wrap.show();
-
-			busy = false;
-
-			$.fancybox.center();
-
-			currentOpts.onComplete(currentArray, currentIndex, currentOpts);
-
-			_preload_images();
-		},
-
-		_preload_images = function() {
-			var href, 
-				objNext;
-
-			if ((currentArray.length -1) > currentIndex) {
-				href = currentArray[ currentIndex + 1 ].href;
-
-				if (typeof href !== 'undefined' && href.match(imgRegExp)) {
-					objNext = new Image();
-					objNext.src = href;
-				}
-			}
-
-			if (currentIndex > 0) {
-				href = currentArray[ currentIndex - 1 ].href;
-
-				if (typeof href !== 'undefined' && href.match(imgRegExp)) {
-					objNext = new Image();
-					objNext.src = href;
-				}
-			}
-		},
-
-		_draw = function(pos) {
-			var dim = {
-				width : parseInt(start_pos.width + (final_pos.width - start_pos.width) * pos, 10),
-				height : parseInt(start_pos.height + (final_pos.height - start_pos.height) * pos, 10),
-
-				top : parseInt(start_pos.top + (final_pos.top - start_pos.top) * pos, 10),
-				left : parseInt(start_pos.left + (final_pos.left - start_pos.left) * pos, 10)
-			};
-
-			if (typeof final_pos.opacity !== 'undefined') {
-				dim.opacity = pos < 0.5 ? 0.5 : pos;
-			}
-
-			wrap.css(dim);
-
-			content.css({
-				'width' : dim.width - currentOpts.padding * 2,
-				'height' : dim.height - (titleHeight * pos) - currentOpts.padding * 2
-			});
-		},
-
-		_get_viewport = function() {
-			return [
-				$(window).width() - (currentOpts.margin * 2),
-				$(window).height() - (currentOpts.margin * 2),
-				$(document).scrollLeft() + currentOpts.margin,
-				$(document).scrollTop() + currentOpts.margin
-			];
-		},
-
-		_get_zoom_to = function () {
-			var view = _get_viewport(),
-				to = {},
-				resize = currentOpts.autoScale,
-				double_padding = currentOpts.padding * 2,
-				ratio;
-
-			if (currentOpts.width.toString().indexOf('%') > -1) {
-				to.width = parseInt((view[0] * parseFloat(currentOpts.width)) / 100, 10);
-			} else {
-				to.width = currentOpts.width + double_padding;
-			}
-
-			if (currentOpts.height.toString().indexOf('%') > -1) {
-				to.height = parseInt((view[1] * parseFloat(currentOpts.height)) / 100, 10);
-			} else {
-				to.height = currentOpts.height + double_padding;
-			}
-
-			if (resize && (to.width > view[0] || to.height > view[1])) {
-				if (selectedOpts.type == 'image' || selectedOpts.type == 'swf') {
-					ratio = (currentOpts.width ) / (currentOpts.height );
-
-					if ((to.width ) > view[0]) {
-						to.width = view[0];
-						to.height = parseInt(((to.width - double_padding) / ratio) + double_padding, 10);
-					}
-
-					if ((to.height) > view[1]) {
-						to.height = view[1];
-						to.width = parseInt(((to.height - double_padding) * ratio) + double_padding, 10);
-					}
-
-				} else {
-					to.width = Math.min(to.width, view[0]);
-					to.height = Math.min(to.height, view[1]);
-				}
-			}
-
-			to.top = parseInt(Math.max(view[3] - 20, view[3] + ((view[1] - to.height - 40) * 0.5)), 10);
-			to.left = parseInt(Math.max(view[2] - 20, view[2] + ((view[0] - to.width - 40) * 0.5)), 10);
-
-			return to;
-		},
-
-		_get_obj_pos = function(obj) {
-			var pos = obj.offset();
-
-			pos.top += parseInt( obj.css('paddingTop'), 10 ) || 0;
-			pos.left += parseInt( obj.css('paddingLeft'), 10 ) || 0;
-
-			pos.top += parseInt( obj.css('border-top-width'), 10 ) || 0;
-			pos.left += parseInt( obj.css('border-left-width'), 10 ) || 0;
-
-			pos.width = obj.width();
-			pos.height = obj.height();
-
-			return pos;
-		},
-
-		_get_zoom_from = function() {
-			var orig = selectedOpts.orig ? $(selectedOpts.orig) : false,
-				from = {},
-				pos,
-				view;
-
-			if (orig && orig.length) {
-				pos = _get_obj_pos(orig);
-
-				from = {
-					width : pos.width + (currentOpts.padding * 2),
-					height : pos.height + (currentOpts.padding * 2),
-					top	: pos.top - currentOpts.padding - 20,
-					left : pos.left - currentOpts.padding - 20
-				};
-
-			} else {
-				view = _get_viewport();
-
-				from = {
-					width : currentOpts.padding * 2,
-					height : currentOpts.padding * 2,
-					top	: parseInt(view[3] + view[1] * 0.5, 10),
-					left : parseInt(view[2] + view[0] * 0.5, 10)
-				};
-			}
-
-			return from;
-		},
-
-		_animate_loading = function() {
-			if (!loading.is(':visible')){
-				clearInterval(loadingTimer);
-				return;
-			}
-
-			$('div', loading).css('top', (loadingFrame * -40) + 'px');
-
-			loadingFrame = (loadingFrame + 1) % 12;
-		};
-
-	/*
-	 * Public methods 
-	 */
-
-	$.fn.fancybox = function(options) {
-		if (!$(this).length) {
-			return this;
-		}
-
-		$(this)
-			.data('fancybox', $.extend({}, options, ($.metadata ? $(this).metadata() : {})))
-			.unbind('click.fb')
-			.bind('click.fb', function(e) {
-				e.preventDefault();
-
-				if (busy) {
-					return;
-				}
-
-				busy = true;
-
-				$(this).blur();
-
-				selectedArray = [];
-				selectedIndex = 0;
-
-				var rel = $(this).attr('rel') || '';
-
-				if (!rel || rel == '' || rel === 'nofollow') {
-					selectedArray.push(this);
-
-				} else {
-					selectedArray = $("a[rel=" + rel + "], area[rel=" + rel + "]");
-					selectedIndex = selectedArray.index( this );
-				}
-
-				_start();
-
-				return;
-			});
-
-		return this;
-	};
-
-	$.fancybox = function(obj) {
-		var opts;
-
-		if (busy) {
-			return;
-		}
-
-		busy = true;
-		opts = typeof arguments[1] !== 'undefined' ? arguments[1] : {};
-
-		selectedArray = [];
-		selectedIndex = parseInt(opts.index, 10) || 0;
-
-		if ($.isArray(obj)) {
-			for (var i = 0, j = obj.length; i < j; i++) {
-				if (typeof obj[i] == 'object') {
-					$(obj[i]).data('fancybox', $.extend({}, opts, obj[i]));
-				} else {
-					obj[i] = $({}).data('fancybox', $.extend({content : obj[i]}, opts));
-				}
-			}
-
-			selectedArray = jQuery.merge(selectedArray, obj);
-
-		} else {
-			if (typeof obj == 'object') {
-				$(obj).data('fancybox', $.extend({}, opts, obj));
-			} else {
-				obj = $({}).data('fancybox', $.extend({content : obj}, opts));
-			}
-
-			selectedArray.push(obj);
-		}
-
-		if (selectedIndex > selectedArray.length || selectedIndex < 0) {
-			selectedIndex = 0;
-		}
-
-		_start();
-	};
-
-	$.fancybox.showActivity = function() {
-		clearInterval(loadingTimer);
-
-		loading.show();
-		loadingTimer = setInterval(_animate_loading, 66);
-	};
-
-	$.fancybox.hideActivity = function() {
-		loading.hide();
-	};
-
-	$.fancybox.next = function() {
-		return $.fancybox.pos( currentIndex + 1);
-	};
-
-	$.fancybox.prev = function() {
-		return $.fancybox.pos( currentIndex - 1);
-	};
-
-	$.fancybox.pos = function(pos) {
-		if (busy) {
-			return;
-		}
-
-		pos = parseInt(pos);
-
-		selectedArray = currentArray;
-
-		if (pos > -1 && pos < currentArray.length) {
-			selectedIndex = pos;
-			_start();
-
-		} else if (currentOpts.cyclic && currentArray.length > 1) {
-			selectedIndex = pos >= currentArray.length ? 0 : currentArray.length - 1;
-			_start();
-		}
-
-		return;
-	};
-
-	$.fancybox.cancel = function() {
-		if (busy) {
-			return;
-		}
-
-		busy = true;
-
-		$.event.trigger('fancybox-cancel');
-
-		_abort();
-
-		selectedOpts.onCancel(selectedArray, selectedIndex, selectedOpts);
-
-		busy = false;
-	};
-
-	// Note: within an iframe use - parent.$.fancybox.close();
-	$.fancybox.close = function() {
-		if (busy || wrap.is(':hidden')) {
-			return;
-		}
-
-		busy = true;
-
-		if (currentOpts && false === currentOpts.onCleanup(currentArray, currentIndex, currentOpts)) {
-			busy = false;
-			return;
-		}
-
-		_abort();
-
-		$(close.add( nav_left ).add( nav_right )).hide();
-
-		$(content.add( overlay )).unbind();
-
-		$(window).unbind("resize.fb scroll.fb");
-		$(document).unbind('keydown.fb');
-
-		content.find('iframe').attr('src', isIE6 && /^https/i.test(window.location.href || '') ? 'javascript:void(false)' : 'about:blank');
-
-		if (currentOpts.titlePosition !== 'inside') {
-			title.empty();
-		}
-
-		wrap.stop();
-
-		function _cleanup() {
-			overlay.fadeOut('fast');
-
-			title.empty().hide();
-			wrap.hide();
-
-			$.event.trigger('fancybox-cleanup');
-
-			content.empty();
-
-			currentOpts.onClosed(currentArray, currentIndex, currentOpts);
-
-			currentArray = selectedOpts	= [];
-			currentIndex = selectedIndex = 0;
-			currentOpts = selectedOpts	= {};
-
-			busy = false;
-		}
-
-		if (currentOpts.transitionOut == 'elastic') {
-			start_pos = _get_zoom_from();
-
-			var pos = wrap.position();
-
-			final_pos = {
-				top	 : pos.top ,
-				left : pos.left,
-				width :	wrap.width(),
-				height : wrap.height()
-			};
-
-			if (currentOpts.opacity) {
-				final_pos.opacity = 1;
-			}
-
-			title.empty().hide();
-
-			fx.prop = 1;
-
-			$(fx).animate({ prop: 0 }, {
-				 duration : currentOpts.speedOut,
-				 easing : currentOpts.easingOut,
-				 step : _draw,
-				 complete : _cleanup
-			});
-
-		} else {
-			wrap.fadeOut( currentOpts.transitionOut == 'none' ? 0 : currentOpts.speedOut, _cleanup);
-		}
-	};
-
-	$.fancybox.resize = function() {
-		if (overlay.is(':visible')) {
-			overlay.css('height', $(document).height());
-		}
-
-		$.fancybox.center(true);
-	};
-
-	$.fancybox.center = function() {
-		var view, align;
-
-		if (busy) {
-			return;	
-		}
-
-		align = arguments[0] === true ? 1 : 0;
-		view = _get_viewport();
-
-		if (!align && (wrap.width() > view[0] || wrap.height() > view[1])) {
-			return;	
-		}
-
-		wrap
-			.stop()
-			.animate({
-				'top' : parseInt(Math.max(view[3] - 20, view[3] + ((view[1] - content.height() - 40) * 0.5) - currentOpts.padding)),
-				'left' : parseInt(Math.max(view[2] - 20, view[2] + ((view[0] - content.width() - 40) * 0.5) - currentOpts.padding))
-			}, typeof arguments[0] == 'number' ? arguments[0] : 200);
-	};
-
-	$.fancybox.init = function() {
-		if ($("#fancybox-wrap").length) {
-			return;
-		}
-
-		$('body').append(
-			tmp	= $('<div id="fancybox-tmp"></div>'),
-			loading	= $('<div id="fancybox-loading"><div></div></div>'),
-			overlay	= $('<div id="fancybox-overlay"></div>'),
-			wrap = $('<div id="fancybox-wrap"></div>')
-		);
-
-		outer = $('<div id="fancybox-outer"></div>')
-			.append('<div class="fancybox-bg" id="fancybox-bg-n"></div><div class="fancybox-bg" id="fancybox-bg-ne"></div><div class="fancybox-bg" id="fancybox-bg-e"></div><div class="fancybox-bg" id="fancybox-bg-se"></div><div class="fancybox-bg" id="fancybox-bg-s"></div><div class="fancybox-bg" id="fancybox-bg-sw"></div><div class="fancybox-bg" id="fancybox-bg-w"></div><div class="fancybox-bg" id="fancybox-bg-nw"></div>')
-			.appendTo( wrap );
-
-		outer.append(
-			content = $('<div id="fancybox-content"></div>'),
-			close = $('<a id="fancybox-close"></a>'),
-			title = $('<div id="fancybox-title"></div>'),
-
-			nav_left = $('<a href="javascript:;" id="fancybox-left"><span class="fancy-ico" id="fancybox-left-ico"></span></a>'),
-			nav_right = $('<a href="javascript:;" id="fancybox-right"><span class="fancy-ico" id="fancybox-right-ico"></span></a>')
-		);
-
-		close.click($.fancybox.close);
-		loading.click($.fancybox.cancel);
-
-		nav_left.click(function(e) {
-			e.preventDefault();
-			$.fancybox.prev();
-		});
-
-		nav_right.click(function(e) {
-			e.preventDefault();
-			$.fancybox.next();
-		});
-
-		if ($.fn.mousewheel) {
-			wrap.bind('mousewheel.fb', function(e, delta) {
-				if (busy) {
-					e.preventDefault();
-
-				} else if ($(e.target).get(0).clientHeight == 0 || $(e.target).get(0).scrollHeight === $(e.target).get(0).clientHeight) {
-					e.preventDefault();
-					$.fancybox[ delta > 0 ? 'prev' : 'next']();
-				}
-			});
-		}
-
-		if (!$.support.opacity) {
-			wrap.addClass('fancybox-ie');
-		}
-
-		if (isIE6) {
-			loading.addClass('fancybox-ie6');
-			wrap.addClass('fancybox-ie6');
-
-			$('<iframe id="fancybox-hide-sel-frame" src="' + (/^https/i.test(window.location.href || '') ? 'javascript:void(false)' : 'about:blank' ) + '" scrolling="no" border="0" frameborder="0" tabindex="-1"></iframe>').prependTo(outer);
-		}
-	};
-
-	$.fn.fancybox.defaults = {
-		padding : 10,
-		margin : 40,
-		opacity : false,
-		modal : false,
-		cyclic : false,
-		scrolling : 'auto',	// 'auto', 'yes' or 'no'
-
-		width : 560,
-		height : 340,
-
-		autoScale : true,
-		autoDimensions : true,
-		centerOnScroll : false,
-
-		ajax : {},
-		swf : { wmode: 'transparent' },
-
-		hideOnOverlayClick : true,
-		hideOnContentClick : false,
-
-		overlayShow : true,
-		overlayOpacity : 0.7,
-		overlayColor : '#777',
-
-		titleShow : true,
-		titlePosition : 'float', // 'float', 'outside', 'inside' or 'over'
-		titleFormat : null,
-		titleFromAlt : false,
-
-		transitionIn : 'fade', // 'elastic', 'fade' or 'none'
-		transitionOut : 'fade', // 'elastic', 'fade' or 'none'
-
-		speedIn : 300,
-		speedOut : 300,
-
-		changeSpeed : 300,
-		changeFade : 'fast',
-
-		easingIn : 'swing',
-		easingOut : 'swing',
-
-		showCloseButton	 : true,
-		showNavArrows : true,
-		enableEscapeButton : true,
-		enableKeyboardNav : true,
-
-		onStart : function(){},
-		onCancel : function(){},
-		onComplete : function(){},
-		onCleanup : function(){},
-		onClosed : function(){},
-		onError : function(){}
-	};
-
-	$(document).ready(function() {
-		$.fancybox.init();
-	});
-
-})(jQuery);
\ No newline at end of file
diff --git a/apps/files_imageviewer/js/jquery.fancybox-1.3.4.pack.js b/apps/files_imageviewer/js/jquery.fancybox-1.3.4.pack.js
deleted file mode 100644
index 260f2c2d46..0000000000
--- a/apps/files_imageviewer/js/jquery.fancybox-1.3.4.pack.js
+++ /dev/null
@@ -1 +0,0 @@
-(function(B){var L,T,Q,M,d,m,J,A,O,z,C=0,H={},j=[],e=0,G={},y=[],f=null,o=new Image(),i=/\.(jpg|gif|png|bmp|jpeg)(.*)?$/i,k=/[^\.]\.(swf)\s*$/i,p,N=1,h=0,t="",b,c,P=false,s=B.extend(B("<div/>")[0],{prop:0}),S=B.browser.msie&&B.browser.version<7&&!window.XMLHttpRequest,r=function(){T.hide();o.onerror=o.onload=null;if(f){f.abort()}L.empty()},x=function(){if(false===H.onError(j,C,H)){T.hide();P=false;return}H.titleShow=false;H.width="auto";H.height="auto";L.html('<p id="fancybox-error">The requested content cannot be loaded.<br />Please try again later.</p>');n()},w=function(){var Z=j[C],W,Y,ab,aa,V,X;r();H=B.extend({},B.fn.fancybox.defaults,(typeof B(Z).data("fancybox")=="undefined"?H:B(Z).data("fancybox")));X=H.onStart(j,C,H);if(X===false){P=false;return}else{if(typeof X=="object"){H=B.extend(H,X)}}ab=H.title||(Z.nodeName?B(Z).attr("title"):Z.title)||"";if(Z.nodeName&&!H.orig){H.orig=B(Z).children("img:first").length?B(Z).children("img:first"):B(Z)}if(ab===""&&H.orig&&H.titleFromAlt){ab=H.orig.attr("alt")}ab=ab.replace(/</,"&lt;").replace(/>/,"&gt;");W=H.href||(Z.nodeName?B(Z).attr("href"):Z.href)||null;if((/^(?:javascript)/i).test(W)||W=="#"){W=null}if(H.type){Y=H.type;if(!W){W=H.content}}else{if(H.content){Y="html"}else{if(W){if(W.match(i)){Y="image"}else{if(W.match(k)){Y="swf"}else{if(B(Z).hasClass("iframe")){Y="iframe"}else{if(W.indexOf("#")===0){Y="inline"}}}}}}}if(!Y){x();return}if(Y=="inline"){Z=W.substr(W.indexOf("#"));Y=B(Z).length>0?"inline":"ajax"}H.type=Y;H.href=W;H.title=ab;if(H.autoDimensions){if(H.type=="html"||H.type=="inline"||H.type=="ajax"){H.width="auto";H.height="auto"}else{H.autoDimensions=false}}if(H.modal){H.overlayShow=true;H.hideOnOverlayClick=false;H.hideOnContentClick=false;H.enableEscapeButton=false;H.showCloseButton=false}H.padding=parseInt(H.padding,10);H.margin=parseInt(H.margin,10);L.css("padding",(H.padding+H.margin));B(".fancybox-inline-tmp").unbind("fancybox-cancel").bind("fancybox-change",function(){B(this).replaceWith(m.children())});switch(Y){case"html":L.html(H.content);n();break;case"inline":if(B(Z).parent().is("#fancybox-content")===true){P=false;return}B('<div class="fancybox-inline-tmp" />').hide().insertBefore(B(Z)).bind("fancybox-cleanup",function(){B(this).replaceWith(m.children())}).bind("fancybox-cancel",function(){B(this).replaceWith(L.children())});B(Z).appendTo(L);n();break;case"image":P=false;B.fancybox.showActivity();o=new Image();o.onerror=function(){x()};o.onload=function(){P=true;o.onerror=o.onload=null;F()};o.src=W;break;case"swf":H.scrolling="no";aa='<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" width="'+H.width+'" height="'+H.height+'"><param name="movie" value="'+W+'"></param>';V="";B.each(H.swf,function(ac,ad){aa+='<param name="'+ac+'" value="'+ad+'"></param>';V+=" "+ac+'="'+ad+'"'});aa+='<embed src="'+W+'" type="application/x-shockwave-flash" width="'+H.width+'" height="'+H.height+'"'+V+"></embed></object>";L.html(aa);n();break;case"ajax":P=false;B.fancybox.showActivity();H.ajax.win=H.ajax.success;f=B.ajax(B.extend({},H.ajax,{url:W,data:H.ajax.data||{},error:function(ac,ae,ad){if(ac.status>0){x()}},success:function(ad,af,ac){var ae=typeof ac=="object"?ac:f;if(ae.status==200){if(typeof H.ajax.win=="function"){X=H.ajax.win(W,ad,af,ac);if(X===false){T.hide();return}else{if(typeof X=="string"||typeof X=="object"){ad=X}}}L.html(ad);n()}}}));break;case"iframe":E();break}},n=function(){var V=H.width,W=H.height;if(V.toString().indexOf("%")>-1){V=parseInt((B(window).width()-(H.margin*2))*parseFloat(V)/100,10)+"px"}else{V=V=="auto"?"auto":V+"px"}if(W.toString().indexOf("%")>-1){W=parseInt((B(window).height()-(H.margin*2))*parseFloat(W)/100,10)+"px"}else{W=W=="auto"?"auto":W+"px"}L.wrapInner('<div style="width:'+V+";height:"+W+";overflow: "+(H.scrolling=="auto"?"auto":(H.scrolling=="yes"?"scroll":"hidden"))+';position:relative;"></div>');H.width=L.width();H.height=L.height();E()},F=function(){H.width=o.width;H.height=o.height;B("<img />").attr({id:"fancybox-img",src:o.src,alt:H.title}).appendTo(L);E()},E=function(){var W,V;T.hide();if(M.is(":visible")&&false===G.onCleanup(y,e,G)){B.event.trigger("fancybox-cancel");P=false;return}P=true;B(m.add(Q)).unbind();B(window).unbind("resize.fb scroll.fb");B(document).unbind("keydown.fb");if(M.is(":visible")&&G.titlePosition!=="outside"){M.css("height",M.height())}y=j;e=C;G=H;if(G.overlayShow){Q.css({"background-color":G.overlayColor,opacity:G.overlayOpacity,cursor:G.hideOnOverlayClick?"pointer":"auto",height:B(document).height()});if(!Q.is(":visible")){if(S){B("select:not(#fancybox-tmp select)").filter(function(){return this.style.visibility!=="hidden"}).css({visibility:"hidden"}).one("fancybox-cleanup",function(){this.style.visibility="inherit"})}Q.show()}}else{Q.hide()}c=R();l();if(M.is(":visible")){B(J.add(O).add(z)).hide();W=M.position(),b={top:W.top,left:W.left,width:M.width(),height:M.height()};V=(b.width==c.width&&b.height==c.height);m.fadeTo(G.changeFade,0.3,function(){var X=function(){m.html(L.contents()).fadeTo(G.changeFade,1,v)};B.event.trigger("fancybox-change");m.empty().removeAttr("filter").css({"border-width":G.padding,width:c.width-G.padding*2,height:H.autoDimensions?"auto":c.height-h-G.padding*2});if(V){X()}else{s.prop=0;B(s).animate({prop:1},{duration:G.changeSpeed,easing:G.easingChange,step:U,complete:X})}});return}M.removeAttr("style");m.css("border-width",G.padding);if(G.transitionIn=="elastic"){b=I();m.html(L.contents());M.show();if(G.opacity){c.opacity=0}s.prop=0;B(s).animate({prop:1},{duration:G.speedIn,easing:G.easingIn,step:U,complete:v});return}if(G.titlePosition=="inside"&&h>0){A.show()}m.css({width:c.width-G.padding*2,height:H.autoDimensions?"auto":c.height-h-G.padding*2}).html(L.contents());M.css(c).fadeIn(G.transitionIn=="none"?0:G.speedIn,v)},D=function(V){if(V&&V.length){if(G.titlePosition=="float"){return'<table id="fancybox-title-float-wrap" cellpadding="0" cellspacing="0"><tr><td id="fancybox-title-float-left"></td><td id="fancybox-title-float-main">'+V+'</td><td id="fancybox-title-float-right"></td></tr></table>'}return'<div id="fancybox-title-'+G.titlePosition+'">'+V+"</div>"}return false},l=function(){t=G.title||"";h=0;A.empty().removeAttr("style").removeClass();if(G.titleShow===false){A.hide();return}t=B.isFunction(G.titleFormat)?G.titleFormat(t,y,e,G):D(t);if(!t||t===""){A.hide();return}A.addClass("fancybox-title-"+G.titlePosition).html(t).appendTo("body").show();switch(G.titlePosition){case"inside":A.css({width:c.width-(G.padding*2),marginLeft:G.padding,marginRight:G.padding});h=A.outerHeight(true);A.appendTo(d);c.height+=h;break;case"over":A.css({marginLeft:G.padding,width:c.width-(G.padding*2),bottom:G.padding}).appendTo(d);break;case"float":A.css("left",parseInt((A.width()-c.width-40)/2,10)*-1).appendTo(M);break;default:A.css({width:c.width-(G.padding*2),paddingLeft:G.padding,paddingRight:G.padding}).appendTo(M);break}A.hide()},g=function(){if(G.enableEscapeButton||G.enableKeyboardNav){B(document).bind("keydown.fb",function(V){if(V.keyCode==27&&G.enableEscapeButton){V.preventDefault();B.fancybox.close()}else{if((V.keyCode==37||V.keyCode==39)&&G.enableKeyboardNav&&V.target.tagName!=="INPUT"&&V.target.tagName!=="TEXTAREA"&&V.target.tagName!=="SELECT"){V.preventDefault();B.fancybox[V.keyCode==37?"prev":"next"]()}}})}if(!G.showNavArrows){O.hide();z.hide();return}if((G.cyclic&&y.length>1)||e!==0){O.show()}if((G.cyclic&&y.length>1)||e!=(y.length-1)){z.show()}},v=function(){if(!B.support.opacity){m.get(0).style.removeAttribute("filter");M.get(0).style.removeAttribute("filter")}if(H.autoDimensions){m.css("height","auto")}M.css("height","auto");if(t&&t.length){A.show()}if(G.showCloseButton){J.show()}g();if(G.hideOnContentClick){m.bind("click",B.fancybox.close)}if(G.hideOnOverlayClick){Q.bind("click",B.fancybox.close)}B(window).bind("resize.fb",B.fancybox.resize);if(G.centerOnScroll){B(window).bind("scroll.fb",B.fancybox.center)}if(G.type=="iframe"){B('<iframe id="fancybox-frame" name="fancybox-frame'+new Date().getTime()+'" frameborder="0" hspace="0" '+(B.browser.msie?'allowtransparency="true""':"")+' scrolling="'+H.scrolling+'" src="'+G.href+'"></iframe>').appendTo(m)}M.show();P=false;B.fancybox.center();G.onComplete(y,e,G);K()},K=function(){var V,W;if((y.length-1)>e){V=y[e+1].href;if(typeof V!=="undefined"&&V.match(i)){W=new Image();W.src=V}}if(e>0){V=y[e-1].href;if(typeof V!=="undefined"&&V.match(i)){W=new Image();W.src=V}}},U=function(W){var V={width:parseInt(b.width+(c.width-b.width)*W,10),height:parseInt(b.height+(c.height-b.height)*W,10),top:parseInt(b.top+(c.top-b.top)*W,10),left:parseInt(b.left+(c.left-b.left)*W,10)};if(typeof c.opacity!=="undefined"){V.opacity=W<0.5?0.5:W}M.css(V);m.css({width:V.width-G.padding*2,height:V.height-(h*W)-G.padding*2})},u=function(){return[B(window).width()-(G.margin*2),B(window).height()-(G.margin*2),B(document).scrollLeft()+G.margin,B(document).scrollTop()+G.margin]},R=function(){var V=u(),Z={},W=G.autoScale,X=G.padding*2,Y;if(G.width.toString().indexOf("%")>-1){Z.width=parseInt((V[0]*parseFloat(G.width))/100,10)}else{Z.width=G.width+X}if(G.height.toString().indexOf("%")>-1){Z.height=parseInt((V[1]*parseFloat(G.height))/100,10)}else{Z.height=G.height+X}if(W&&(Z.width>V[0]||Z.height>V[1])){if(H.type=="image"||H.type=="swf"){Y=(G.width)/(G.height);if((Z.width)>V[0]){Z.width=V[0];Z.height=parseInt(((Z.width-X)/Y)+X,10)}if((Z.height)>V[1]){Z.height=V[1];Z.width=parseInt(((Z.height-X)*Y)+X,10)}}else{Z.width=Math.min(Z.width,V[0]);Z.height=Math.min(Z.height,V[1])}}Z.top=parseInt(Math.max(V[3]-20,V[3]+((V[1]-Z.height-40)*0.5)),10);Z.left=parseInt(Math.max(V[2]-20,V[2]+((V[0]-Z.width-40)*0.5)),10);return Z},q=function(V){var W=V.offset();W.top+=parseInt(V.css("paddingTop"),10)||0;W.left+=parseInt(V.css("paddingLeft"),10)||0;W.top+=parseInt(V.css("border-top-width"),10)||0;W.left+=parseInt(V.css("border-left-width"),10)||0;W.width=V.width();W.height=V.height();return W},I=function(){var Y=H.orig?B(H.orig):false,X={},W,V;if(Y&&Y.length){W=q(Y);X={width:W.width+(G.padding*2),height:W.height+(G.padding*2),top:W.top-G.padding-20,left:W.left-G.padding-20}}else{V=u();X={width:G.padding*2,height:G.padding*2,top:parseInt(V[3]+V[1]*0.5,10),left:parseInt(V[2]+V[0]*0.5,10)}}return X},a=function(){if(!T.is(":visible")){clearInterval(p);return}B("div",T).css("top",(N*-40)+"px");N=(N+1)%12};B.fn.fancybox=function(V){if(!B(this).length){return this}B(this).data("fancybox",B.extend({},V,(B.metadata?B(this).metadata():{}))).unbind("click.fb").bind("click.fb",function(X){X.preventDefault();if(P){return}P=true;B(this).blur();j=[];C=0;var W=B(this).attr("rel")||"";if(!W||W==""||W==="nofollow"){j.push(this)}else{j=B("a[rel="+W+"], area[rel="+W+"]");C=j.index(this)}w();return});return this};B.fancybox=function(Y){var X;if(P){return}P=true;X=typeof arguments[1]!=="undefined"?arguments[1]:{};j=[];C=parseInt(X.index,10)||0;if(B.isArray(Y)){for(var W=0,V=Y.length;W<V;W++){if(typeof Y[W]=="object"){B(Y[W]).data("fancybox",B.extend({},X,Y[W]))}else{Y[W]=B({}).data("fancybox",B.extend({content:Y[W]},X))}}j=jQuery.merge(j,Y)}else{if(typeof Y=="object"){B(Y).data("fancybox",B.extend({},X,Y))}else{Y=B({}).data("fancybox",B.extend({content:Y},X))}j.push(Y)}if(C>j.length||C<0){C=0}w()};B.fancybox.showActivity=function(){clearInterval(p);T.show();p=setInterval(a,66)};B.fancybox.hideActivity=function(){T.hide()};B.fancybox.next=function(){return B.fancybox.pos(e+1)};B.fancybox.prev=function(){return B.fancybox.pos(e-1)};B.fancybox.pos=function(V){if(P){return}V=parseInt(V);j=y;if(V>-1&&V<y.length){C=V;w()}else{if(G.cyclic&&y.length>1){C=V>=y.length?0:y.length-1;w()}}return};B.fancybox.cancel=function(){if(P){return}P=true;B.event.trigger("fancybox-cancel");r();H.onCancel(j,C,H);P=false};B.fancybox.close=function(){if(P||M.is(":hidden")){return}P=true;if(G&&false===G.onCleanup(y,e,G)){P=false;return}r();B(J.add(O).add(z)).hide();B(m.add(Q)).unbind();B(window).unbind("resize.fb scroll.fb");B(document).unbind("keydown.fb");m.find("iframe").attr("src",S&&/^https/i.test(window.location.href||"")?"javascript:void(false)":"about:blank");if(G.titlePosition!=="inside"){A.empty()}M.stop();function V(){Q.fadeOut("fast");A.empty().hide();M.hide();B.event.trigger("fancybox-cleanup");m.empty();G.onClosed(y,e,G);y=H=[];e=C=0;G=H={};P=false}if(G.transitionOut=="elastic"){b=I();var W=M.position();c={top:W.top,left:W.left,width:M.width(),height:M.height()};if(G.opacity){c.opacity=1}A.empty().hide();s.prop=1;B(s).animate({prop:0},{duration:G.speedOut,easing:G.easingOut,step:U,complete:V})}else{M.fadeOut(G.transitionOut=="none"?0:G.speedOut,V)}};B.fancybox.resize=function(){if(Q.is(":visible")){Q.css("height",B(document).height())}B.fancybox.center(true)};B.fancybox.center=function(){var V,W;if(P){return}W=arguments[0]===true?1:0;V=u();if(!W&&(M.width()>V[0]||M.height()>V[1])){return}M.stop().animate({top:parseInt(Math.max(V[3]-20,V[3]+((V[1]-m.height()-40)*0.5)-G.padding)),left:parseInt(Math.max(V[2]-20,V[2]+((V[0]-m.width()-40)*0.5)-G.padding))},typeof arguments[0]=="number"?arguments[0]:200)};B.fancybox.init=function(){if(B("#fancybox-wrap").length){return}B("body").append(L=B('<div id="fancybox-tmp"></div>'),T=B('<div id="fancybox-loading"><div></div></div>'),Q=B('<div id="fancybox-overlay"></div>'),M=B('<div id="fancybox-wrap"></div>'));d=B('<div id="fancybox-outer"></div>').append('<div class="fancybox-bg" id="fancybox-bg-n"></div><div class="fancybox-bg" id="fancybox-bg-ne"></div><div class="fancybox-bg" id="fancybox-bg-e"></div><div class="fancybox-bg" id="fancybox-bg-se"></div><div class="fancybox-bg" id="fancybox-bg-s"></div><div class="fancybox-bg" id="fancybox-bg-sw"></div><div class="fancybox-bg" id="fancybox-bg-w"></div><div class="fancybox-bg" id="fancybox-bg-nw"></div>').appendTo(M);d.append(m=B('<div id="fancybox-content"></div>'),J=B('<a id="fancybox-close"></a>'),A=B('<div id="fancybox-title"></div>'),O=B('<a href="javascript:;" id="fancybox-left"><span class="fancy-ico" id="fancybox-left-ico"></span></a>'),z=B('<a href="javascript:;" id="fancybox-right"><span class="fancy-ico" id="fancybox-right-ico"></span></a>'));J.click(B.fancybox.close);T.click(B.fancybox.cancel);O.click(function(V){V.preventDefault();B.fancybox.prev()});z.click(function(V){V.preventDefault();B.fancybox.next()});if(B.fn.mousewheel){M.bind("mousewheel.fb",function(V,W){if(P){V.preventDefault()}else{if(B(V.target).get(0).clientHeight==0||B(V.target).get(0).scrollHeight===B(V.target).get(0).clientHeight){V.preventDefault();B.fancybox[W>0?"prev":"next"]()}}})}if(!B.support.opacity){M.addClass("fancybox-ie")}if(S){T.addClass("fancybox-ie6");M.addClass("fancybox-ie6");B('<iframe id="fancybox-hide-sel-frame" src="'+(/^https/i.test(window.location.href||"")?"javascript:void(false)":"about:blank")+'" scrolling="no" border="0" frameborder="0" tabindex="-1"></iframe>').prependTo(d)}};B.fn.fancybox.defaults={padding:10,margin:40,opacity:false,modal:false,cyclic:false,scrolling:"auto",width:560,height:340,autoScale:true,autoDimensions:true,centerOnScroll:false,ajax:{},swf:{wmode:"transparent"},hideOnOverlayClick:true,hideOnContentClick:false,overlayShow:true,overlayOpacity:0.7,overlayColor:"#777",titleShow:true,titlePosition:"float",titleFormat:null,titleFromAlt:false,transitionIn:"fade",transitionOut:"fade",speedIn:300,speedOut:300,changeSpeed:300,changeFade:"fast",easingIn:"swing",easingOut:"swing",showCloseButton:true,showNavArrows:true,enableEscapeButton:true,enableKeyboardNav:true,onStart:function(){},onCancel:function(){},onComplete:function(){},onCleanup:function(){},onClosed:function(){},onError:function(){}};B(document).ready(function(){B.fancybox.init()})})(jQuery);
\ No newline at end of file
diff --git a/apps/files_imageviewer/js/jquery.mousewheel-3.0.4.js b/apps/files_imageviewer/js/jquery.mousewheel-3.0.4.js
deleted file mode 100644
index b7932415ce..0000000000
--- a/apps/files_imageviewer/js/jquery.mousewheel-3.0.4.js
+++ /dev/null
@@ -1,78 +0,0 @@
-/*! Copyright (c) 2010 Brandon Aaron (http://brandonaaron.net)
- * Licensed under the MIT License (LICENSE.txt).
- *
- * Thanks to: http://adomas.org/javascript-mouse-wheel/ for some pointers.
- * Thanks to: Mathias Bank(http://www.mathias-bank.de) for a scope bug fix.
- * Thanks to: Seamus Leahy for adding deltaX and deltaY
- *
- * Version: 3.0.4
- * 
- * Requires: 1.2.2+
- */
-
-(function($) {
-
-var types = ['DOMMouseScroll', 'mousewheel'];
-
-$.event.special.mousewheel = {
-    setup: function() {
-        if ( this.addEventListener ) {
-            for ( var i=types.length; i; ) {
-                this.addEventListener( types[--i], handler, false );
-            }
-        } else {
-            this.onmousewheel = handler;
-        }
-    },
-    
-    teardown: function() {
-        if ( this.removeEventListener ) {
-            for ( var i=types.length; i; ) {
-                this.removeEventListener( types[--i], handler, false );
-            }
-        } else {
-            this.onmousewheel = null;
-        }
-    }
-};
-
-$.fn.extend({
-    mousewheel: function(fn) {
-        return fn ? this.bind("mousewheel", fn) : this.trigger("mousewheel");
-    },
-    
-    unmousewheel: function(fn) {
-        return this.unbind("mousewheel", fn);
-    }
-});
-
-
-function handler(event) {
-    var orgEvent = event || window.event, args = [].slice.call( arguments, 1 ), delta = 0, returnValue = true, deltaX = 0, deltaY = 0;
-    event = $.event.fix(orgEvent);
-    event.type = "mousewheel";
-    
-    // Old school scrollwheel delta
-    if ( event.wheelDelta ) { delta = event.wheelDelta/120; }
-    if ( event.detail     ) { delta = -event.detail/3; }
-    
-    // New school multidimensional scroll (touchpads) deltas
-    deltaY = delta;
-    
-    // Gecko
-    if ( orgEvent.axis !== undefined && orgEvent.axis === orgEvent.HORIZONTAL_AXIS ) {
-        deltaY = 0;
-        deltaX = -1*delta;
-    }
-    
-    // Webkit
-    if ( orgEvent.wheelDeltaY !== undefined ) { deltaY = orgEvent.wheelDeltaY/120; }
-    if ( orgEvent.wheelDeltaX !== undefined ) { deltaX = -1*orgEvent.wheelDeltaX/120; }
-    
-    // Add event and delta to the front of the arguments
-    args.unshift(event, delta, deltaX, deltaY);
-    
-    return $.event.handle.apply(this, args);
-}
-
-})(jQuery);
\ No newline at end of file
diff --git a/apps/files_imageviewer/js/jquery.mousewheel-3.0.4.pack.js b/apps/files_imageviewer/js/jquery.mousewheel-3.0.4.pack.js
deleted file mode 100644
index cb66588e29..0000000000
--- a/apps/files_imageviewer/js/jquery.mousewheel-3.0.4.pack.js
+++ /dev/null
@@ -1,14 +0,0 @@
-/*! Copyright (c) 2010 Brandon Aaron (http://brandonaaron.net)
-* Licensed under the MIT License (LICENSE.txt).
-*
-* Thanks to: http://adomas.org/javascript-mouse-wheel/ for some pointers.
-* Thanks to: Mathias Bank(http://www.mathias-bank.de) for a scope bug fix.
-* Thanks to: Seamus Leahy for adding deltaX and deltaY
-*
-* Version: 3.0.4
-*
-* Requires: 1.2.2+
-*/
-
-(function(d){function g(a){var b=a||window.event,i=[].slice.call(arguments,1),c=0,h=0,e=0;a=d.event.fix(b);a.type="mousewheel";if(a.wheelDelta)c=a.wheelDelta/120;if(a.detail)c=-a.detail/3;e=c;if(b.axis!==undefined&&b.axis===b.HORIZONTAL_AXIS){e=0;h=-1*c}if(b.wheelDeltaY!==undefined)e=b.wheelDeltaY/120;if(b.wheelDeltaX!==undefined)h=-1*b.wheelDeltaX/120;i.unshift(a,c,h,e);return d.event.handle.apply(this,i)}var f=["DOMMouseScroll","mousewheel"];d.event.special.mousewheel={setup:function(){if(this.addEventListener)for(var a=
-f.length;a;)this.addEventListener(f[--a],g,false);else this.onmousewheel=g},teardown:function(){if(this.removeEventListener)for(var a=f.length;a;)this.removeEventListener(f[--a],g,false);else this.onmousewheel=null}};d.fn.extend({mousewheel:function(a){return a?this.bind("mousewheel",a):this.trigger("mousewheel")},unmousewheel:function(a){return this.unbind("mousewheel",a)}})})(jQuery);
\ No newline at end of file
diff --git a/apps/files_imageviewer/js/lightbox.js b/apps/files_imageviewer/js/lightbox.js
deleted file mode 100644
index ff12d808bc..0000000000
--- a/apps/files_imageviewer/js/lightbox.js
+++ /dev/null
@@ -1,31 +0,0 @@
-$(document).ready(function() {
-	if(typeof FileActions!=='undefined'){
-		FileActions.register('image','View', FileActions.PERMISSION_READ, '',function(filename){
-			viewImage($('#dir').val(),filename);
-		});
-		FileActions.setDefault('image','View');
-	}
-	OC.search.customResults.Images=function(row,item){
-		var image=item.link.substr(item.link.indexOf('?file=')+6);
-		var a=row.find('a');
-		a.attr('href','#');
-		a.click(function(){
-			var pos=image.lastIndexOf('/')
-			var file=image.substr(pos + 1);
-			var dir=image.substr(0,pos);
-			viewImage(dir,file);
-		});
-	}
-});
-
-function viewImage(dir, file) {
-	if(file.indexOf('.psd')>0){//can't view those
-		return;
-	}
-	var location=OC.filePath('files','ajax','download.php')+encodeURIComponent('?files='+encodeURIComponent(file)+'&dir='+encodeURIComponent(dir));
-	$.fancybox({
-		"href": location,
-		"title": file.replace(/</, "&lt;").replace(/>/, "&gt;"),
-		"titlePosition": "inside"
-	});
-}
diff --git a/apps/files_odfviewer/appinfo/app.php b/apps/files_odfviewer/appinfo/app.php
deleted file mode 100644
index f5fe338c0e..0000000000
--- a/apps/files_odfviewer/appinfo/app.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-OCP\Util::addStyle( 'files_odfviewer', 'webodf' );
-OCP\Util::addStyle( 'files_odfviewer', 'odfviewer' );
-OCP\Util::addScript('files_odfviewer', 'viewer' );
-OCP\Util::addScript('files_odfviewer', 'webodf');
diff --git a/apps/files_odfviewer/appinfo/info.xml b/apps/files_odfviewer/appinfo/info.xml
deleted file mode 100644
index 5d93058eeb..0000000000
--- a/apps/files_odfviewer/appinfo/info.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-<info>
-	<id>files_odfviewer</id>
-	<name>ODF Viewer</name>
-	<description>Simple ODF viewer for owncloud</description>
-	<version>0.1</version>
-	<licence>AGPL</licence>
-	<author>Thomas Müller</author>
-	<require>4</require>
-	<shipped>true</shipped>
-	<default_enable/>
-</info>
diff --git a/apps/files_odfviewer/css/odfviewer.css b/apps/files_odfviewer/css/odfviewer.css
deleted file mode 100644
index 097276a00f..0000000000
--- a/apps/files_odfviewer/css/odfviewer.css
+++ /dev/null
@@ -1,20 +0,0 @@
-#odf-canvas{
-  position: relative;
-  top: 37px;
-  left: 1px;
-  border:1px solid darkgray; 
-  box-shadow: 0px 4px 10px #000;
-  -moz-box-shadow: 0px 4px 10px #000;
-  -webkit-box-shadow: 0px 4px 10px #000;
-}
-
-#odf_close{
-	margin-left: auto;
-	margin-right: 167px;	
-	float: right;
-}
-
-#odf-toolbar{
-    padding: 0 0 0 1em
-}
-
diff --git a/apps/files_odfviewer/css/webodf.css b/apps/files_odfviewer/css/webodf.css
deleted file mode 100644
index 0ceca2f851..0000000000
--- a/apps/files_odfviewer/css/webodf.css
+++ /dev/null
@@ -1,196 +0,0 @@
-@namespace draw url(urn:oasis:names:tc:opendocument:xmlns:drawing:1.0);
-@namespace fo url(urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0);
-@namespace office url(urn:oasis:names:tc:opendocument:xmlns:office:1.0);
-@namespace presentation url(urn:oasis:names:tc:opendocument:xmlns:presentation:1.0);
-@namespace style url(urn:oasis:names:tc:opendocument:xmlns:style:1.0);
-@namespace svg url(urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0);
-@namespace table url(urn:oasis:names:tc:opendocument:xmlns:table:1.0);
-@namespace text url(urn:oasis:names:tc:opendocument:xmlns:text:1.0);
-@namespace runtimens url(urn:webodf); /* namespace for runtime only */
-
-office|document > *, office|document-content > * {
-  display: none;
-}
-office|body, office|document {
-  display: inline-block;
-  position: relative;
-}
-
-text|p, text|h {
-  display: block;
-  padding: 3px 3px 3px 3px;
-  margin: 5px 5px 5px 5px;
-}
-text|h {
-  font-weight: bold;
-}
-*[runtimens|containsparagraphanchor] {
-  position: relative;
-}
-text|s:before { /* this needs to be the number of spaces given by text:c */
-  content: ' ';
-}
-text|tab:before {
-  display: inline;
-  content: '        ';
-}
-text|line-break {
-  content: " ";
-  display: block;
-}
-text|tracked-changes {
-  /*Consumers that do not support change tracking, should ignore changes.*/
-  display: none;
-}
-office|binary-data {
-  display: none;
-}
-office|text {
-  display: block;
-  width: 216mm; /* default to A4 width */
-  min-height: 279mm;
-  padding-left: 32mm;
-  padding-right: 32mm;
-  padding-top: 25mm;
-  padding-bottom: 13mm;
-  margin: 2px;
-  text-align: left;
-  overflow: hidden;
-}
-office|spreadsheet {
-  display: block;
-  border-collapse: collapse;
-  empty-cells: show;
-  font-family: sans-serif;
-  font-size: 10pt;
-  text-align: left;
-  page-break-inside: avoid;
-  overflow: hidden;
-}
-office|presentation {
-  display: inline-block;
-  text-align: left;
-}
-draw|page {
-  display: block;
-  height: 21cm;
-  width: 28cm;
-  margin: 3px;
-  position: relative;
-  overflow: hidden;
-}
-presentation|notes {
-    display: none;
-}
-@media print {
-  draw|page {
-    border: 1pt solid black;
-    page-break-inside: avoid;
-  }
-  presentation|notes {
-    /*TODO*/
-  }
-}
-office|spreadsheet text|p {
-  border: 0px;
-  padding: 1px;
-  margin: 0px;
-}
-office|spreadsheet table|table {
-  margin: 3px;
-}
-office|spreadsheet table|table:after {
-  /* show sheet name the end of the sheet */
-  /*content: attr(table|name);*/ /* gives parsing error in opera */
-}
-office|spreadsheet table|table-row {
-  counter-increment: row;
-}
-office|spreadsheet table|table-row:before {
-  width: 3em;
-  background: #cccccc;
-  border: 1px solid black;
-  text-align: center;
-  content: counter(row);
-}
-office|spreadsheet table|table-cell {
-  border: 1px solid #cccccc;
-}
-table|table {
-  display: table;
-}
-draw|frame table|table {
-  width: 100%;
-  height: 100%;
-  background: white;
-}
-table|table-row {
-  display: table-row;
-}
-table|table-column {
-  display: table-column;
-}
-table|table-cell {
-  display: table-cell;
-}
-draw|frame {
-  display: block;
-}
-draw|image {
-  display: block;
-  width: 100%;
-  height: 100%;
-  top: 0px;
-  left: 0px;
-  background-repeat: no-repeat;
-  background-size: 100% 100%;
-  -moz-background-size: 100% 100%;
-}
-/* only show the first image in frame */
-draw|frame > draw|image:nth-of-type(n+2) {
-  display: none;
-}
-text|list {
-    display: block;
-    padding-left: 1.5em;
-    counter-reset: list;
-}
-text|list-item {
-    display: block;
-}
-text|list-item:before {
-    display: inline-block;
-    content: '•';
-    counter-increment: list;
-    width: 0.5em;
-    margin-left: -0.5em;
-    padding: 0px;
-    border: 0px;
-}
-text|list-item > *:first-child {
-    display: inline-block;
-}
-text|a {
-    color: blue;
-    text-decoration: underline;
-}
-text|note-citation {
-    vertical-align: super;
-    font-size: smaller;
-}
-text|note-body {
-    display: none;
-}
-text|note:hover text|note-citation {
-    background: #dddddd;
-}
-text|note:hover text|note-body {
-    display: block;
-    left:1em;
-    max-width: 80%;
-    position: absolute;
-    background: #ffffaa;
-}
-svg|title, svg|desc {
-    display: none;
-}
diff --git a/apps/files_odfviewer/js/viewer.js b/apps/files_odfviewer/js/viewer.js
deleted file mode 100644
index 586da12687..0000000000
--- a/apps/files_odfviewer/js/viewer.js
+++ /dev/null
@@ -1,60 +0,0 @@
-function viewOdf(dir, file) {
-	var location=OC.filePath('files','ajax','download.php')+'?files='+file+'&dir='+dir;
-
-	// fade out files menu and add odf menu
-	$('.actions,#file_action_panel').fadeOut('slow').promise().done(function() {
-		// odf action toolbar
-		var odfToolbarHtml = 
-			'<div id="odf-toolbar">' +
-			'<input type="button" id="odf_close" value="Close">' +
-			'</div>';
-		$('#controls').append(odfToolbarHtml);
-
-	});
-
-	// fade out file list and show pdf canvas
-	$('table').fadeOut('slow').promise().done(function(){;
-		var canvashtml = '<div id="odf-canvas"></div>';
-		$('table').after(canvashtml);
-
-		var odfelement = document.getElementById("odf-canvas");
-		var odfcanvas = new odf.OdfCanvas(odfelement);
-		odfcanvas.load(location);
-	});
-}
-
-function closeOdfViewer(){
-	// Fade out odf-toolbar
-	$('#odf-toolbar').fadeOut('slow');
-	// Fade out editor
-	$('#odf-canvas').fadeOut('slow', function(){
-		$('#odf-toolbar').remove();
-		$('#odf-canvas').remove();
-		$('.actions,#file_access_panel').fadeIn('slow');
-		$('table').fadeIn('slow');	
-	});
-	is_editor_shown = false;
-}
-
-$(document).ready(function() {
-	if(typeof FileActions!=='undefined'){
-
-		var supportedMimes = new Array(
-			'application/vnd.oasis.opendocument.text', 
-			'application/vnd.oasis.opendocument.spreadsheet',
-			'application/vnd.oasis.opendocument.graphics',
-			'application/vnd.oasis.opendocument.presentation');
-		for (var i = 0; i < supportedMimes.length; ++i){
-			var mime = supportedMimes[i];
-			FileActions.register(mime,'View','',function(filename){
-				viewOdf($('#dir').val(),filename);
-			});
-			FileActions.setDefault(mime,'View');
-		}
-	}
-	
-	$('#odf_close').live('click',function() {
-		closeOdfViewer();	
-	});
-});
-
diff --git a/apps/files_odfviewer/js/webodf-debug.js b/apps/files_odfviewer/js/webodf-debug.js
deleted file mode 100644
index 6c7c7e1d6f..0000000000
--- a/apps/files_odfviewer/js/webodf-debug.js
+++ /dev/null
@@ -1,7124 +0,0 @@
-/*
-
- @licstart
- The JavaScript code in this page is free software: you can redistribute it
- and/or modify it under the terms of the GNU Affero General Public License
- (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- the License, or (at your option) any later version.  The code is distributed
- WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
-
- As additional permission under GNU AGPL version 3 section 7, you
- may distribute non-source (e.g., minimized or compacted) forms of
- that code without the copy of the GNU GPL normally required by
- section 4, provided you include this license notice and a URL
- through which recipients can access the Corresponding Source.
-
- As a special exception to the AGPL, any HTML file which merely makes function
- calls to this code, and for that purpose includes it by reference shall be
- deemed a separate work for copyright law purposes. In addition, the copyright
- holders of this code give you permission to combine this code with free
- software libraries that are released under the GNU LGPL. You may copy and
- distribute such a system following the terms of the GNU AGPL for this code
- and the LGPL for the libraries. If you modify this code, you may extend this
- exception to your version of the code, but you are not obligated to do so.
- If you do not wish to do so, delete this exception statement from your
- version.
-
- This license applies to this entire compilation.
- @licend
- @source: http://www.webodf.org/
- @source: http://gitorious.org/odfkit/webodf/
-*/
-var core = {};
-var gui = {};
-var xmldom = {};
-var odf = {};
-function Runtime() {
-}
-Runtime.ByteArray = function(size) {
-};
-Runtime.ByteArray.prototype.slice = function(start, end) {
-};
-Runtime.prototype.byteArrayFromArray = function(array) {
-};
-Runtime.prototype.byteArrayFromString = function(string, encoding) {
-};
-Runtime.prototype.byteArrayToString = function(bytearray, encoding) {
-};
-Runtime.prototype.concatByteArrays = function(bytearray1, bytearray2) {
-};
-Runtime.prototype.read = function(path, offset, length, callback) {
-};
-Runtime.prototype.readFile = function(path, encoding, callback) {
-};
-Runtime.prototype.readFileSync = function(path, encoding) {
-};
-Runtime.prototype.loadXML = function(path, callback) {
-};
-Runtime.prototype.writeFile = function(path, data, callback) {
-};
-Runtime.prototype.isFile = function(path, callback) {
-};
-Runtime.prototype.getFileSize = function(path, callback) {
-};
-Runtime.prototype.deleteFile = function(path, callback) {
-};
-Runtime.prototype.log = function(msgOrCategory, msg) {
-};
-Runtime.prototype.setTimeout = function(callback, milliseconds) {
-};
-Runtime.prototype.libraryPaths = function() {
-};
-Runtime.prototype.type = function() {
-};
-Runtime.prototype.getDOMImplementation = function() {
-};
-Runtime.prototype.getWindow = function() {
-};
-var IS_COMPILED_CODE = false;
-Runtime.byteArrayToString = function(bytearray, encoding) {
-  function byteArrayToString(bytearray) {
-    var s = "", i, l = bytearray.length;
-    for(i = 0;i < l;i += 1) {
-      s += String.fromCharCode(bytearray[i] & 255)
-    }
-    return s
-  }
-  function utf8ByteArrayToString(bytearray) {
-    var s = "", i, l = bytearray.length, c0, c1, c2;
-    for(i = 0;i < l;i += 1) {
-      c0 = bytearray[i];
-      if(c0 < 128) {
-        s += String.fromCharCode(c0)
-      }else {
-        i += 1;
-        c1 = bytearray[i];
-        if(c0 < 224) {
-          s += String.fromCharCode((c0 & 31) << 6 | c1 & 63)
-        }else {
-          i += 1;
-          c2 = bytearray[i];
-          s += String.fromCharCode((c0 & 15) << 12 | (c1 & 63) << 6 | c2 & 63)
-        }
-      }
-    }
-    return s
-  }
-  var result;
-  if(encoding === "utf8") {
-    result = utf8ByteArrayToString(bytearray)
-  }else {
-    if(encoding !== "binary") {
-      this.log("Unsupported encoding: " + encoding)
-    }
-    result = byteArrayToString(bytearray)
-  }
-  return result
-};
-Runtime.getFunctionName = function getFunctionName(f) {
-  var m;
-  if(f.name === undefined) {
-    m = (new RegExp("function\\s+(\\w+)")).exec(f);
-    return m && m[1]
-  }
-  return f.name
-};
-function BrowserRuntime(logoutput) {
-  var self = this, cache = {}, useNativeArray = window.ArrayBuffer && window.Uint8Array;
-  this.ByteArray = useNativeArray ? function ByteArray(size) {
-    Uint8Array.prototype.slice = function(begin, end) {
-      if(end === undefined) {
-        if(begin === undefined) {
-          begin = 0
-        }
-        end = this.length
-      }
-      var view = this.subarray(begin, end), array, i;
-      end -= begin;
-      array = new Uint8Array(new ArrayBuffer(end));
-      for(i = 0;i < end;i += 1) {
-        array[i] = view[i]
-      }
-      return array
-    };
-    return new Uint8Array(new ArrayBuffer(size))
-  } : function ByteArray(size) {
-    var a = [];
-    a.length = size;
-    return a
-  };
-  this.concatByteArrays = useNativeArray ? function(bytearray1, bytearray2) {
-    var i, l1 = bytearray1.length, l2 = bytearray2.length, a = new this.ByteArray(l1 + l2);
-    for(i = 0;i < l1;i += 1) {
-      a[i] = bytearray1[i]
-    }
-    for(i = 0;i < l2;i += 1) {
-      a[i + l1] = bytearray2[i]
-    }
-    return a
-  } : function(bytearray1, bytearray2) {
-    return bytearray1.concat(bytearray2)
-  };
-  function utf8ByteArrayFromString(string) {
-    var l = string.length, bytearray, i, n, j = 0;
-    for(i = 0;i < l;i += 1) {
-      n = string.charCodeAt(i);
-      j += 1 + (n > 128) + (n > 2048)
-    }
-    bytearray = new self.ByteArray(j);
-    j = 0;
-    for(i = 0;i < l;i += 1) {
-      n = string.charCodeAt(i);
-      if(n < 128) {
-        bytearray[j] = n;
-        j += 1
-      }else {
-        if(n < 2048) {
-          bytearray[j] = 192 | n >>> 6;
-          bytearray[j + 1] = 128 | n & 63;
-          j += 2
-        }else {
-          bytearray[j] = 224 | n >>> 12 & 15;
-          bytearray[j + 1] = 128 | n >>> 6 & 63;
-          bytearray[j + 2] = 128 | n & 63;
-          j += 3
-        }
-      }
-    }
-    return bytearray
-  }
-  function byteArrayFromString(string) {
-    var l = string.length, a = new self.ByteArray(l), i;
-    for(i = 0;i < l;i += 1) {
-      a[i] = string.charCodeAt(i) & 255
-    }
-    return a
-  }
-  this.byteArrayFromArray = function(array) {
-    return array.slice()
-  };
-  this.byteArrayFromString = function(string, encoding) {
-    var result;
-    if(encoding === "utf8") {
-      result = utf8ByteArrayFromString(string)
-    }else {
-      if(encoding !== "binary") {
-        self.log("unknown encoding: " + encoding)
-      }
-      result = byteArrayFromString(string)
-    }
-    return result
-  };
-  this.byteArrayToString = Runtime.byteArrayToString;
-  function log(msgOrCategory, msg) {
-    var node, doc, category;
-    if(msg) {
-      category = msgOrCategory
-    }else {
-      msg = msgOrCategory
-    }
-    if(logoutput) {
-      doc = logoutput.ownerDocument;
-      if(category) {
-        node = doc.createElement("span");
-        node.className = category;
-        node.appendChild(doc.createTextNode(category));
-        logoutput.appendChild(node);
-        logoutput.appendChild(doc.createTextNode(" "))
-      }
-      node = doc.createElement("span");
-      node.appendChild(doc.createTextNode(msg));
-      logoutput.appendChild(node);
-      logoutput.appendChild(doc.createElement("br"))
-    }else {
-      if(console) {
-        console.log(msg)
-      }
-    }
-  }
-  function readFile(path, encoding, callback) {
-    if(cache.hasOwnProperty(path)) {
-      callback(null, cache[path]);
-      return
-    }
-    var xhr = new XMLHttpRequest;
-    function handleResult() {
-      var data;
-      if(xhr.readyState === 4) {
-        if(xhr.status === 0 && !xhr.responseText) {
-          callback("File " + path + " is empty.")
-        }else {
-          if(xhr.status === 200 || xhr.status === 0) {
-            if(encoding === "binary") {
-              if(typeof VBArray !== "undefined") {
-                data = (new VBArray(xhr.responseBody)).toArray()
-              }else {
-                data = self.byteArrayFromString(xhr.responseText, "binary")
-              }
-            }else {
-              data = xhr.responseText
-            }
-            cache[path] = data;
-            callback(null, data)
-          }else {
-            callback(xhr.responseText || xhr.statusText)
-          }
-        }
-      }
-    }
-    xhr.open("GET", path, true);
-    xhr.onreadystatechange = handleResult;
-    if(xhr.overrideMimeType) {
-      if(encoding !== "binary") {
-        xhr.overrideMimeType("text/plain; charset=" + encoding)
-      }else {
-        xhr.overrideMimeType("text/plain; charset=x-user-defined")
-      }
-    }
-    try {
-      xhr.send(null)
-    }catch(e) {
-      callback(e.message)
-    }
-  }
-  function read(path, offset, length, callback) {
-    if(cache.hasOwnProperty(path)) {
-      callback(null, cache[path].slice(offset, offset + length));
-      return
-    }
-    var xhr = new XMLHttpRequest;
-    function handleResult() {
-      var data;
-      if(xhr.readyState === 4) {
-        if(xhr.status === 0 && !xhr.responseText) {
-          callback("File " + path + " is empty.")
-        }else {
-          if(xhr.status === 200 || xhr.status === 0) {
-            if(typeof VBArray !== "undefined") {
-              data = (new VBArray(xhr.responseBody)).toArray()
-            }else {
-              data = self.byteArrayFromString(xhr.responseText, "binary")
-            }
-            cache[path] = data;
-            callback(null, data.slice(offset, offset + length))
-          }else {
-            callback(xhr.responseText || xhr.statusText)
-          }
-        }
-      }
-    }
-    xhr.open("GET", path, true);
-    xhr.onreadystatechange = handleResult;
-    if(xhr.overrideMimeType) {
-      xhr.overrideMimeType("text/plain; charset=x-user-defined")
-    }
-    try {
-      xhr.send(null)
-    }catch(e) {
-      callback(e.message)
-    }
-  }
-  function readFileSync(path, encoding) {
-    var xhr = new XMLHttpRequest, result;
-    xhr.open("GET", path, false);
-    if(xhr.overrideMimeType) {
-      if(encoding !== "binary") {
-        xhr.overrideMimeType("text/plain; charset=" + encoding)
-      }else {
-        xhr.overrideMimeType("text/plain; charset=x-user-defined")
-      }
-    }
-    try {
-      xhr.send(null);
-      if(xhr.status === 200 || xhr.status === 0) {
-        result = xhr.responseText
-      }
-    }catch(e) {
-    }
-    return result
-  }
-  function writeFile(path, data, callback) {
-    cache[path] = data;
-    var xhr = new XMLHttpRequest;
-    function handleResult() {
-      if(xhr.readyState === 4) {
-        if(xhr.status === 0 && !xhr.responseText) {
-          callback("File " + path + " is empty.")
-        }else {
-          if(xhr.status >= 200 && xhr.status < 300 || xhr.status === 0) {
-            callback(null)
-          }else {
-            callback("Status " + String(xhr.status) + ": " + xhr.responseText || xhr.statusText)
-          }
-        }
-      }
-    }
-    xhr.open("PUT", path, true);
-    xhr.onreadystatechange = handleResult;
-    if(data.buffer && !xhr.sendAsBinary) {
-      data = data.buffer
-    }else {
-      data = self.byteArrayToString(data, "binary")
-    }
-    try {
-      if(xhr.sendAsBinary) {
-        xhr.sendAsBinary(data)
-      }else {
-        xhr.send(data)
-      }
-    }catch(e) {
-      self.log("HUH? " + e + " " + data);
-      callback(e.message)
-    }
-  }
-  function deleteFile(path, callback) {
-    var xhr = new XMLHttpRequest;
-    xhr.open("DELETE", path, true);
-    xhr.onreadystatechange = function() {
-      if(xhr.readyState === 4) {
-        if(xhr.status < 200 && xhr.status >= 300) {
-          callback(xhr.responseText)
-        }else {
-          callback(null)
-        }
-      }
-    };
-    xhr.send(null)
-  }
-  function loadXML(path, callback) {
-    var xhr = new XMLHttpRequest;
-    function handleResult() {
-      if(xhr.readyState === 4) {
-        if(xhr.status === 0 && !xhr.responseText) {
-          callback("File " + path + " is empty.")
-        }else {
-          if(xhr.status === 200 || xhr.status === 0) {
-            callback(null, xhr.responseXML)
-          }else {
-            callback(xhr.responseText)
-          }
-        }
-      }
-    }
-    xhr.open("GET", path, true);
-    if(xhr.overrideMimeType) {
-      xhr.overrideMimeType("text/xml")
-    }
-    xhr.onreadystatechange = handleResult;
-    try {
-      xhr.send(null)
-    }catch(e) {
-      callback(e.message)
-    }
-  }
-  function isFile(path, callback) {
-    self.getFileSize(path, function(size) {
-      callback(size !== -1)
-    })
-  }
-  function getFileSize(path, callback) {
-    var xhr = new XMLHttpRequest;
-    xhr.open("HEAD", path, true);
-    xhr.onreadystatechange = function() {
-      if(xhr.readyState !== 4) {
-        return
-      }
-      var cl = xhr.getResponseHeader("Content-Length");
-      if(cl) {
-        callback(parseInt(cl, 10))
-      }else {
-        callback(-1)
-      }
-    };
-    xhr.send(null)
-  }
-  function wrap(nativeFunction, nargs) {
-    if(!nativeFunction) {
-      return null
-    }
-    return function() {
-      cache = {};
-      var callback = arguments[nargs], args = Array.prototype.slice.call(arguments, 0, nargs), callbackname = "callback" + String(Math.random()).substring(2);
-      window[callbackname] = function() {
-        delete window[callbackname];
-        callback.apply(this, arguments)
-      };
-      args.push(callbackname);
-      nativeFunction.apply(this, args)
-    }
-  }
-  this.readFile = readFile;
-  this.read = read;
-  this.readFileSync = readFileSync;
-  this.writeFile = writeFile;
-  this.deleteFile = deleteFile;
-  this.loadXML = loadXML;
-  this.isFile = isFile;
-  this.getFileSize = getFileSize;
-  this.log = log;
-  this.setTimeout = function(f, msec) {
-    setTimeout(function() {
-      f()
-    }, msec)
-  };
-  this.libraryPaths = function() {
-    return["lib"]
-  };
-  this.setCurrentDirectory = function(dir) {
-  };
-  this.type = function() {
-    return"BrowserRuntime"
-  };
-  this.getDOMImplementation = function() {
-    return window.document.implementation
-  };
-  this.exit = function(exitCode) {
-    log("Calling exit with code " + String(exitCode) + ", but exit() is not implemented.")
-  };
-  this.getWindow = function() {
-    return window
-  }
-}
-function NodeJSRuntime() {
-  var self = this, fs = require("fs"), currentDirectory = "";
-  this.ByteArray = function(size) {
-    return new Buffer(size)
-  };
-  this.byteArrayFromArray = function(array) {
-    var ba = new Buffer(array.length), i, l = array.length;
-    for(i = 0;i < l;i += 1) {
-      ba[i] = array[i]
-    }
-    return ba
-  };
-  this.concatByteArrays = function(a, b) {
-    var ba = new Buffer(a.length + b.length);
-    a.copy(ba, 0, 0);
-    b.copy(ba, a.length, 0);
-    return ba
-  };
-  this.byteArrayFromString = function(string, encoding) {
-    return new Buffer(string, encoding)
-  };
-  this.byteArrayToString = function(bytearray, encoding) {
-    return bytearray.toString(encoding)
-  };
-  function isFile(path, callback) {
-    if(currentDirectory) {
-      path = currentDirectory + "/" + path
-    }
-    fs.stat(path, function(err, stats) {
-      callback(!err && stats.isFile())
-    })
-  }
-  function loadXML(path, callback) {
-    throw"Not implemented.";
-  }
-  this.readFile = function(path, encoding, callback) {
-    if(encoding !== "binary") {
-      fs.readFile(path, encoding, callback)
-    }else {
-      fs.readFile(path, null, callback)
-    }
-  };
-  this.writeFile = function(path, data, callback) {
-    fs.writeFile(path, data, "binary", function(err) {
-      callback(err || null)
-    })
-  };
-  this.deleteFile = fs.unlink;
-  this.read = function(path, offset, length, callback) {
-    if(currentDirectory) {
-      path = currentDirectory + "/" + path
-    }
-    fs.open(path, "r+", 666, function(err, fd) {
-      if(err) {
-        callback(err);
-        return
-      }
-      var buffer = new Buffer(length);
-      fs.read(fd, buffer, 0, length, offset, function(err, bytesRead) {
-        fs.close(fd);
-        callback(err, buffer)
-      })
-    })
-  };
-  this.readFileSync = function(path, encoding) {
-    if(!encoding) {
-      return""
-    }
-    return fs.readFileSync(path, encoding)
-  };
-  this.loadXML = loadXML;
-  this.isFile = isFile;
-  this.getFileSize = function(path, callback) {
-    if(currentDirectory) {
-      path = currentDirectory + "/" + path
-    }
-    fs.stat(path, function(err, stats) {
-      if(err) {
-        callback(-1)
-      }else {
-        callback(stats.size)
-      }
-    })
-  };
-  this.log = function(msg) {
-    process.stderr.write(msg + "\n")
-  };
-  this.setTimeout = function(f, msec) {
-    setTimeout(function() {
-      f()
-    }, msec)
-  };
-  this.libraryPaths = function() {
-    return[__dirname]
-  };
-  this.setCurrentDirectory = function(dir) {
-    currentDirectory = dir
-  };
-  this.currentDirectory = function() {
-    return currentDirectory
-  };
-  this.type = function() {
-    return"NodeJSRuntime"
-  };
-  this.getDOMImplementation = function() {
-    return null
-  };
-  this.exit = process.exit;
-  this.getWindow = function() {
-    return null
-  }
-}
-function RhinoRuntime() {
-  var self = this, dom = Packages.javax.xml.parsers.DocumentBuilderFactory.newInstance(), builder, entityresolver, currentDirectory = "";
-  dom.setValidating(false);
-  dom.setNamespaceAware(true);
-  dom.setExpandEntityReferences(false);
-  dom.setSchema(null);
-  entityresolver = Packages.org.xml.sax.EntityResolver({resolveEntity:function(publicId, systemId) {
-    var file, open = function(path) {
-      var reader = new Packages.java.io.FileReader(path), source = new Packages.org.xml.sax.InputSource(reader);
-      return source
-    };
-    file = systemId;
-    return open(file)
-  }});
-  builder = dom.newDocumentBuilder();
-  builder.setEntityResolver(entityresolver);
-  this.ByteArray = function ByteArray(size) {
-    return[size]
-  };
-  this.byteArrayFromArray = function(array) {
-    return array
-  };
-  this.byteArrayFromString = function(string, encoding) {
-    var a = [], i, l = string.length;
-    for(i = 0;i < l;i += 1) {
-      a[i] = string.charCodeAt(i) & 255
-    }
-    return a
-  };
-  this.byteArrayToString = Runtime.byteArrayToString;
-  this.concatByteArrays = function(bytearray1, bytearray2) {
-    return bytearray1.concat(bytearray2)
-  };
-  function loadXML(path, callback) {
-    var file = new Packages.java.io.File(path), document;
-    try {
-      document = builder.parse(file)
-    }catch(err) {
-      print(err);
-      callback(err);
-      return
-    }
-    callback(null, document)
-  }
-  function runtimeReadFile(path, encoding, callback) {
-    var file = new Packages.java.io.File(path), data, rhinoencoding = encoding === "binary" ? "latin1" : encoding;
-    if(!file.isFile()) {
-      callback(path + " is not a file.")
-    }else {
-      data = readFile(path, rhinoencoding);
-      if(encoding === "binary") {
-        data = self.byteArrayFromString(data, "binary")
-      }
-      callback(null, data)
-    }
-  }
-  function runtimeReadFileSync(path, encoding) {
-    var file = new Packages.java.io.File(path), data, i;
-    if(!file.isFile()) {
-      return null
-    }
-    if(encoding === "binary") {
-      encoding = "latin1"
-    }
-    return readFile(path, encoding)
-  }
-  function isFile(path, callback) {
-    if(currentDirectory) {
-      path = currentDirectory + "/" + path
-    }
-    var file = new Packages.java.io.File(path);
-    callback(file.isFile())
-  }
-  this.loadXML = loadXML;
-  this.readFile = runtimeReadFile;
-  this.writeFile = function(path, data, callback) {
-    var out = new Packages.java.io.FileOutputStream(path), i, l = data.length;
-    for(i = 0;i < l;i += 1) {
-      out.write(data[i])
-    }
-    out.close();
-    callback(null)
-  };
-  this.deleteFile = function(path, callback) {
-    var file = new Packages.java.io.File(path);
-    if(file["delete"]()) {
-      callback(null)
-    }else {
-      callback("Could not delete " + path)
-    }
-  };
-  this.read = function(path, offset, length, callback) {
-    if(currentDirectory) {
-      path = currentDirectory + "/" + path
-    }
-    var data = runtimeReadFileSync(path, "binary");
-    if(data) {
-      callback(null, this.byteArrayFromString(data.substring(offset, offset + length), "binary"))
-    }else {
-      callback("Cannot read " + path)
-    }
-  };
-  this.readFileSync = function(path, encoding) {
-    if(!encoding) {
-      return""
-    }
-    return readFile(path, encoding)
-  };
-  this.isFile = isFile;
-  this.getFileSize = function(path, callback) {
-    if(currentDirectory) {
-      path = currentDirectory + "/" + path
-    }
-    var file = new Packages.java.io.File(path);
-    callback(file.length())
-  };
-  this.log = print;
-  this.setTimeout = function(f, msec) {
-    f()
-  };
-  this.libraryPaths = function() {
-    return["lib"]
-  };
-  this.setCurrentDirectory = function(dir) {
-    currentDirectory = dir
-  };
-  this.currentDirectory = function() {
-    return currentDirectory
-  };
-  this.type = function() {
-    return"RhinoRuntime"
-  };
-  this.getDOMImplementation = function() {
-    return builder.getDOMImplementation()
-  };
-  this.exit = quit;
-  this.getWindow = function() {
-    return null
-  }
-}
-var runtime = function() {
-  var result;
-  if(typeof window !== "undefined") {
-    result = new BrowserRuntime(window.document.getElementById("logoutput"))
-  }else {
-    if(typeof require !== "undefined") {
-      result = new NodeJSRuntime
-    }else {
-      result = new RhinoRuntime
-    }
-  }
-  return result
-}();
-(function() {
-  var cache = {}, dircontents = {};
-  function getOrDefinePackage(packageNameComponents) {
-    var topname = packageNameComponents[0], i, pkg;
-    pkg = eval("if (typeof " + topname + " === 'undefined') {" + "eval('" + topname + " = {};');}" + topname);
-    for(i = 1;i < packageNameComponents.length - 1;i += 1) {
-      if(!pkg.hasOwnProperty(packageNameComponents[i])) {
-        pkg = pkg[packageNameComponents[i]] = {}
-      }
-    }
-    return pkg[packageNameComponents[packageNameComponents.length - 1]]
-  }
-  runtime.loadClass = function(classpath) {
-    if(IS_COMPILED_CODE) {
-      return
-    }
-    if(cache.hasOwnProperty(classpath)) {
-      return
-    }
-    var names = classpath.split("."), impl;
-    impl = getOrDefinePackage(names);
-    if(impl) {
-      cache[classpath] = true;
-      return
-    }
-    function getPathFromManifests(classpath) {
-      var path = classpath.replace(".", "/") + ".js", dirs = runtime.libraryPaths(), i, dir, code;
-      if(runtime.currentDirectory) {
-        dirs.push(runtime.currentDirectory())
-      }
-      for(i = 0;i < dirs.length;i += 1) {
-        dir = dirs[i];
-        if(!dircontents.hasOwnProperty(dir)) {
-          code = runtime.readFileSync(dirs[i] + "/manifest.js", "utf8");
-          if(code && code.length) {
-            try {
-              dircontents[dir] = eval(code)
-            }catch(e1) {
-              dircontents[dir] = null;
-              runtime.log("Cannot load manifest for " + dir + ".")
-            }
-          }else {
-            dircontents[dir] = null
-          }
-        }
-        code = null;
-        dir = dircontents[dir];
-        if(dir && dir.indexOf && dir.indexOf(path) !== -1) {
-          return dirs[i] + "/" + path
-        }
-      }
-      return null
-    }
-    function load(classpath) {
-      var code, path;
-      path = getPathFromManifests(classpath);
-      if(!path) {
-        throw classpath + " is not listed in any manifest.js.";
-      }
-      try {
-        code = runtime.readFileSync(path, "utf8")
-      }catch(e2) {
-        runtime.log("Error loading " + classpath + " " + e2);
-        throw e2;
-      }
-      if(code === undefined) {
-        throw"Cannot load class " + classpath;
-      }
-      try {
-        code = eval(classpath + " = eval(code);")
-      }catch(e4) {
-        runtime.log("Error loading " + classpath + " " + e4);
-        throw e4;
-      }
-      return code
-    }
-    impl = load(classpath);
-    if(!impl || Runtime.getFunctionName(impl) !== names[names.length - 1]) {
-      runtime.log("Loaded code is not for " + names[names.length - 1]);
-      throw"Loaded code is not for " + names[names.length - 1];
-    }
-    cache[classpath] = true
-  }
-})();
-(function(args) {
-  args = Array.prototype.slice.call(args);
-  function run(argv) {
-    if(!argv.length) {
-      return
-    }
-    var script = argv[0];
-    runtime.readFile(script, "utf8", function(err, code) {
-      var path = "", paths = runtime.libraryPaths();
-      if(script.indexOf("/") !== -1) {
-        path = script.substring(0, script.indexOf("/"))
-      }
-      runtime.setCurrentDirectory(path);
-      function run() {
-        var script, path, paths, args, argv, result;
-        result = eval(code);
-        if(result) {
-          runtime.exit(result)
-        }
-        return
-      }
-      if(err) {
-        runtime.log(err);
-        runtime.exit(1)
-      }else {
-        run.apply(null, argv)
-      }
-    })
-  }
-  if(runtime.type() === "NodeJSRuntime") {
-    run(process.argv.slice(2))
-  }else {
-    if(runtime.type() === "RhinoRuntime") {
-      run(args)
-    }else {
-      run(args.slice(1))
-    }
-  }
-})(typeof arguments !== "undefined" && arguments);
-core.Base64 = function() {
-  var b64chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/", b64charcodes = function() {
-    var a = [], i, codeA = "A".charCodeAt(0), codea = "a".charCodeAt(0), code0 = "0".charCodeAt(0);
-    for(i = 0;i < 26;i += 1) {
-      a.push(codeA + i)
-    }
-    for(i = 0;i < 26;i += 1) {
-      a.push(codea + i)
-    }
-    for(i = 0;i < 10;i += 1) {
-      a.push(code0 + i)
-    }
-    a.push("+".charCodeAt(0));
-    a.push("/".charCodeAt(0));
-    return a
-  }(), b64tab = function(bin) {
-    var t = {}, i, l;
-    for(i = 0, l = bin.length;i < l;i += 1) {
-      t[bin.charAt(i)] = i
-    }
-    return t
-  }(b64chars), convertUTF16StringToBase64, convertBase64ToUTF16String, btoa, atob;
-  function stringToArray(s) {
-    var a = [], i, l = s.length;
-    for(i = 0;i < l;i += 1) {
-      a[i] = s.charCodeAt(i) & 255
-    }
-    return a
-  }
-  function convertUTF8ArrayToBase64(bin) {
-    var n, b64 = "", i, l = bin.length - 2;
-    for(i = 0;i < l;i += 3) {
-      n = bin[i] << 16 | bin[i + 1] << 8 | bin[i + 2];
-      b64 += b64chars[n >>> 18];
-      b64 += b64chars[n >>> 12 & 63];
-      b64 += b64chars[n >>> 6 & 63];
-      b64 += b64chars[n & 63]
-    }
-    if(i === l + 1) {
-      n = bin[i] << 4;
-      b64 += b64chars[n >>> 6];
-      b64 += b64chars[n & 63];
-      b64 += "=="
-    }else {
-      if(i === l) {
-        n = bin[i] << 10 | bin[i + 1] << 2;
-        b64 += b64chars[n >>> 12];
-        b64 += b64chars[n >>> 6 & 63];
-        b64 += b64chars[n & 63];
-        b64 += "="
-      }
-    }
-    return b64
-  }
-  function convertBase64ToUTF8Array(b64) {
-    b64 = b64.replace(/[^A-Za-z0-9+\/]+/g, "");
-    var bin = [], padlen = b64.length % 4, i, l = b64.length, n;
-    for(i = 0;i < l;i += 4) {
-      n = (b64tab[b64.charAt(i)] || 0) << 18 | (b64tab[b64.charAt(i + 1)] || 0) << 12 | (b64tab[b64.charAt(i + 2)] || 0) << 6 | (b64tab[b64.charAt(i + 3)] || 0);
-      bin.push(n >> 16, n >> 8 & 255, n & 255)
-    }
-    bin.length -= [0, 0, 2, 1][padlen];
-    return bin
-  }
-  function convertUTF16ArrayToUTF8Array(uni) {
-    var bin = [], i, l = uni.length, n;
-    for(i = 0;i < l;i += 1) {
-      n = uni[i];
-      if(n < 128) {
-        bin.push(n)
-      }else {
-        if(n < 2048) {
-          bin.push(192 | n >>> 6, 128 | n & 63)
-        }else {
-          bin.push(224 | n >>> 12 & 15, 128 | n >>> 6 & 63, 128 | n & 63)
-        }
-      }
-    }
-    return bin
-  }
-  function convertUTF8ArrayToUTF16Array(bin) {
-    var uni = [], i, l = bin.length, c0, c1, c2;
-    for(i = 0;i < l;i += 1) {
-      c0 = bin[i];
-      if(c0 < 128) {
-        uni.push(c0)
-      }else {
-        i += 1;
-        c1 = bin[i];
-        if(c0 < 224) {
-          uni.push((c0 & 31) << 6 | c1 & 63)
-        }else {
-          i += 1;
-          c2 = bin[i];
-          uni.push((c0 & 15) << 12 | (c1 & 63) << 6 | c2 & 63)
-        }
-      }
-    }
-    return uni
-  }
-  function convertUTF8StringToBase64(bin) {
-    return convertUTF8ArrayToBase64(stringToArray(bin))
-  }
-  function convertBase64ToUTF8String(b64) {
-    return String.fromCharCode.apply(String, convertBase64ToUTF8Array(b64))
-  }
-  function convertUTF8StringToUTF16Array(bin) {
-    return convertUTF8ArrayToUTF16Array(stringToArray(bin))
-  }
-  function convertUTF8ArrayToUTF16String(bin) {
-    var b = convertUTF8ArrayToUTF16Array(bin), r = "", i = 0, chunksize = 45E3;
-    while(i < b.length) {
-      r += String.fromCharCode.apply(String, b.slice(i, i + chunksize));
-      i += chunksize
-    }
-    return r
-  }
-  function convertUTF8StringToUTF16String_internal(bin, i, end) {
-    var str = "", c0, c1, c2, j;
-    for(j = i;j < end;j += 1) {
-      c0 = bin.charCodeAt(j) & 255;
-      if(c0 < 128) {
-        str += String.fromCharCode(c0)
-      }else {
-        j += 1;
-        c1 = bin.charCodeAt(j) & 255;
-        if(c0 < 224) {
-          str += String.fromCharCode((c0 & 31) << 6 | c1 & 63)
-        }else {
-          j += 1;
-          c2 = bin.charCodeAt(j) & 255;
-          str += String.fromCharCode((c0 & 15) << 12 | (c1 & 63) << 6 | c2 & 63)
-        }
-      }
-    }
-    return str
-  }
-  function convertUTF8StringToUTF16String(bin, callback) {
-    var partsize = 1E5, numparts = bin.length / partsize, str = "", pos = 0;
-    if(bin.length < partsize) {
-      callback(convertUTF8StringToUTF16String_internal(bin, 0, bin.length), true);
-      return
-    }
-    if(typeof bin !== "string") {
-      bin = bin.slice()
-    }
-    function f() {
-      var end = pos + partsize;
-      if(end > bin.length) {
-        end = bin.length
-      }
-      str += convertUTF8StringToUTF16String_internal(bin, pos, end);
-      pos = end;
-      end = pos === bin.length;
-      if(callback(str, end) && !end) {
-        runtime.setTimeout(f, 0)
-      }
-    }
-    f()
-  }
-  function convertUTF16StringToUTF8Array(uni) {
-    return convertUTF16ArrayToUTF8Array(stringToArray(uni))
-  }
-  function convertUTF16ArrayToUTF8String(uni) {
-    return String.fromCharCode.apply(String, convertUTF16ArrayToUTF8Array(uni))
-  }
-  function convertUTF16StringToUTF8String(uni) {
-    return String.fromCharCode.apply(String, convertUTF16ArrayToUTF8Array(stringToArray(uni)))
-  }
-  btoa = runtime.getWindow() && runtime.getWindow().btoa;
-  if(btoa) {
-    convertUTF16StringToBase64 = function(uni) {
-      return btoa(convertUTF16StringToUTF8String(uni))
-    }
-  }else {
-    btoa = convertUTF8StringToBase64;
-    convertUTF16StringToBase64 = function(uni) {
-      return convertUTF8ArrayToBase64(convertUTF16StringToUTF8Array(uni))
-    }
-  }
-  atob = runtime.getWindow() && runtime.getWindow().atob;
-  if(atob) {
-    convertBase64ToUTF16String = function(b64) {
-      var b = atob(b64);
-      return convertUTF8StringToUTF16String_internal(b, 0, b.length)
-    }
-  }else {
-    atob = convertBase64ToUTF8String;
-    convertBase64ToUTF16String = function(b64) {
-      return convertUTF8ArrayToUTF16String(convertBase64ToUTF8Array(b64))
-    }
-  }
-  function Base64() {
-    this.convertUTF8ArrayToBase64 = convertUTF8ArrayToBase64;
-    this.convertByteArrayToBase64 = convertUTF8ArrayToBase64;
-    this.convertBase64ToUTF8Array = convertBase64ToUTF8Array;
-    this.convertBase64ToByteArray = convertBase64ToUTF8Array;
-    this.convertUTF16ArrayToUTF8Array = convertUTF16ArrayToUTF8Array;
-    this.convertUTF16ArrayToByteArray = convertUTF16ArrayToUTF8Array;
-    this.convertUTF8ArrayToUTF16Array = convertUTF8ArrayToUTF16Array;
-    this.convertByteArrayToUTF16Array = convertUTF8ArrayToUTF16Array;
-    this.convertUTF8StringToBase64 = convertUTF8StringToBase64;
-    this.convertBase64ToUTF8String = convertBase64ToUTF8String;
-    this.convertUTF8StringToUTF16Array = convertUTF8StringToUTF16Array;
-    this.convertUTF8ArrayToUTF16String = convertUTF8ArrayToUTF16String;
-    this.convertByteArrayToUTF16String = convertUTF8ArrayToUTF16String;
-    this.convertUTF8StringToUTF16String = convertUTF8StringToUTF16String;
-    this.convertUTF16StringToUTF8Array = convertUTF16StringToUTF8Array;
-    this.convertUTF16StringToByteArray = convertUTF16StringToUTF8Array;
-    this.convertUTF16ArrayToUTF8String = convertUTF16ArrayToUTF8String;
-    this.convertUTF16StringToUTF8String = convertUTF16StringToUTF8String;
-    this.convertUTF16StringToBase64 = convertUTF16StringToBase64;
-    this.convertBase64ToUTF16String = convertBase64ToUTF16String;
-    this.fromBase64 = convertBase64ToUTF8String;
-    this.toBase64 = convertUTF8StringToBase64;
-    this.atob = atob;
-    this.btoa = btoa;
-    this.utob = convertUTF16StringToUTF8String;
-    this.btou = convertUTF8StringToUTF16String;
-    this.encode = convertUTF16StringToBase64;
-    this.encodeURI = function(u) {
-      return convertUTF16StringToBase64(u).replace(/[+\/]/g, function(m0) {
-        return m0 === "+" ? "-" : "_"
-      }).replace(/\\=+$/, "")
-    };
-    this.decode = function(a) {
-      return convertBase64ToUTF16String(a.replace(/[\-_]/g, function(m0) {
-        return m0 === "-" ? "+" : "/"
-      }))
-    }
-  }
-  return Base64
-}();
-core.RawDeflate = function() {
-  var zip_WSIZE = 32768, zip_STORED_BLOCK = 0, zip_STATIC_TREES = 1, zip_DYN_TREES = 2, zip_DEFAULT_LEVEL = 6, zip_FULL_SEARCH = true, zip_INBUFSIZ = 32768, zip_INBUF_EXTRA = 64, zip_OUTBUFSIZ = 1024 * 8, zip_window_size = 2 * zip_WSIZE, zip_MIN_MATCH = 3, zip_MAX_MATCH = 258, zip_BITS = 16, zip_LIT_BUFSIZE = 8192, zip_HASH_BITS = 13, zip_DIST_BUFSIZE = zip_LIT_BUFSIZE, zip_HASH_SIZE = 1 << zip_HASH_BITS, zip_HASH_MASK = zip_HASH_SIZE - 1, zip_WMASK = zip_WSIZE - 1, zip_NIL = 0, zip_TOO_FAR = 4096, 
-  zip_MIN_LOOKAHEAD = zip_MAX_MATCH + zip_MIN_MATCH + 1, zip_MAX_DIST = zip_WSIZE - zip_MIN_LOOKAHEAD, zip_SMALLEST = 1, zip_MAX_BITS = 15, zip_MAX_BL_BITS = 7, zip_LENGTH_CODES = 29, zip_LITERALS = 256, zip_END_BLOCK = 256, zip_L_CODES = zip_LITERALS + 1 + zip_LENGTH_CODES, zip_D_CODES = 30, zip_BL_CODES = 19, zip_REP_3_6 = 16, zip_REPZ_3_10 = 17, zip_REPZ_11_138 = 18, zip_HEAP_SIZE = 2 * zip_L_CODES + 1, zip_H_SHIFT = parseInt((zip_HASH_BITS + zip_MIN_MATCH - 1) / zip_MIN_MATCH, 10), zip_free_queue, 
-  zip_qhead, zip_qtail, zip_initflag, zip_outbuf = null, zip_outcnt, zip_outoff, zip_complete, zip_window, zip_d_buf, zip_l_buf, zip_prev, zip_bi_buf, zip_bi_valid, zip_block_start, zip_ins_h, zip_hash_head, zip_prev_match, zip_match_available, zip_match_length, zip_prev_length, zip_strstart, zip_match_start, zip_eofile, zip_lookahead, zip_max_chain_length, zip_max_lazy_match, zip_compr_level, zip_good_match, zip_nice_match, zip_dyn_ltree, zip_dyn_dtree, zip_static_ltree, zip_static_dtree, zip_bl_tree, 
-  zip_l_desc, zip_d_desc, zip_bl_desc, zip_bl_count, zip_heap, zip_heap_len, zip_heap_max, zip_depth, zip_length_code, zip_dist_code, zip_base_length, zip_base_dist, zip_flag_buf, zip_last_lit, zip_last_dist, zip_last_flags, zip_flags, zip_flag_bit, zip_opt_len, zip_static_len, zip_deflate_data, zip_deflate_pos, zip_extra_lbits = [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 0], zip_extra_dbits = [0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 
-  9, 10, 10, 11, 11, 12, 12, 13, 13], zip_extra_blbits = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 3, 7], zip_bl_order = [16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15], zip_configuration_table;
-  if(zip_LIT_BUFSIZE > zip_INBUFSIZ) {
-    runtime.log("error: zip_INBUFSIZ is too small")
-  }
-  if(zip_WSIZE << 1 > 1 << zip_BITS) {
-    runtime.log("error: zip_WSIZE is too large")
-  }
-  if(zip_HASH_BITS > zip_BITS - 1) {
-    runtime.log("error: zip_HASH_BITS is too large")
-  }
-  if(zip_HASH_BITS < 8 || zip_MAX_MATCH !== 258) {
-    runtime.log("error: Code too clever")
-  }
-  function Zip_DeflateCT() {
-    this.fc = 0;
-    this.dl = 0
-  }
-  function Zip_DeflateTreeDesc() {
-    this.dyn_tree = null;
-    this.static_tree = null;
-    this.extra_bits = null;
-    this.extra_base = 0;
-    this.elems = 0;
-    this.max_length = 0;
-    this.max_code = 0
-  }
-  function Zip_DeflateConfiguration(a, b, c, d) {
-    this.good_length = a;
-    this.max_lazy = b;
-    this.nice_length = c;
-    this.max_chain = d
-  }
-  function Zip_DeflateBuffer() {
-    this.next = null;
-    this.len = 0;
-    this.ptr = [];
-    this.ptr.length = zip_OUTBUFSIZ;
-    this.off = 0
-  }
-  zip_configuration_table = [new Zip_DeflateConfiguration(0, 0, 0, 0), new Zip_DeflateConfiguration(4, 4, 8, 4), new Zip_DeflateConfiguration(4, 5, 16, 8), new Zip_DeflateConfiguration(4, 6, 32, 32), new Zip_DeflateConfiguration(4, 4, 16, 16), new Zip_DeflateConfiguration(8, 16, 32, 32), new Zip_DeflateConfiguration(8, 16, 128, 128), new Zip_DeflateConfiguration(8, 32, 128, 256), new Zip_DeflateConfiguration(32, 128, 258, 1024), new Zip_DeflateConfiguration(32, 258, 258, 4096)];
-  function zip_deflate_start(level) {
-    var i;
-    if(!level) {
-      level = zip_DEFAULT_LEVEL
-    }else {
-      if(level < 1) {
-        level = 1
-      }else {
-        if(level > 9) {
-          level = 9
-        }
-      }
-    }
-    zip_compr_level = level;
-    zip_initflag = false;
-    zip_eofile = false;
-    if(zip_outbuf !== null) {
-      return
-    }
-    zip_free_queue = zip_qhead = zip_qtail = null;
-    zip_outbuf = [];
-    zip_outbuf.length = zip_OUTBUFSIZ;
-    zip_window = [];
-    zip_window.length = zip_window_size;
-    zip_d_buf = [];
-    zip_d_buf.length = zip_DIST_BUFSIZE;
-    zip_l_buf = [];
-    zip_l_buf.length = zip_INBUFSIZ + zip_INBUF_EXTRA;
-    zip_prev = [];
-    zip_prev.length = 1 << zip_BITS;
-    zip_dyn_ltree = [];
-    zip_dyn_ltree.length = zip_HEAP_SIZE;
-    for(i = 0;i < zip_HEAP_SIZE;i++) {
-      zip_dyn_ltree[i] = new Zip_DeflateCT
-    }
-    zip_dyn_dtree = [];
-    zip_dyn_dtree.length = 2 * zip_D_CODES + 1;
-    for(i = 0;i < 2 * zip_D_CODES + 1;i++) {
-      zip_dyn_dtree[i] = new Zip_DeflateCT
-    }
-    zip_static_ltree = [];
-    zip_static_ltree.length = zip_L_CODES + 2;
-    for(i = 0;i < zip_L_CODES + 2;i++) {
-      zip_static_ltree[i] = new Zip_DeflateCT
-    }
-    zip_static_dtree = [];
-    zip_static_dtree.length = zip_D_CODES;
-    for(i = 0;i < zip_D_CODES;i++) {
-      zip_static_dtree[i] = new Zip_DeflateCT
-    }
-    zip_bl_tree = [];
-    zip_bl_tree.length = 2 * zip_BL_CODES + 1;
-    for(i = 0;i < 2 * zip_BL_CODES + 1;i++) {
-      zip_bl_tree[i] = new Zip_DeflateCT
-    }
-    zip_l_desc = new Zip_DeflateTreeDesc;
-    zip_d_desc = new Zip_DeflateTreeDesc;
-    zip_bl_desc = new Zip_DeflateTreeDesc;
-    zip_bl_count = [];
-    zip_bl_count.length = zip_MAX_BITS + 1;
-    zip_heap = [];
-    zip_heap.length = 2 * zip_L_CODES + 1;
-    zip_depth = [];
-    zip_depth.length = 2 * zip_L_CODES + 1;
-    zip_length_code = [];
-    zip_length_code.length = zip_MAX_MATCH - zip_MIN_MATCH + 1;
-    zip_dist_code = [];
-    zip_dist_code.length = 512;
-    zip_base_length = [];
-    zip_base_length.length = zip_LENGTH_CODES;
-    zip_base_dist = [];
-    zip_base_dist.length = zip_D_CODES;
-    zip_flag_buf = [];
-    zip_flag_buf.length = parseInt(zip_LIT_BUFSIZE / 8, 10)
-  }
-  var zip_deflate_end = function() {
-    zip_free_queue = zip_qhead = zip_qtail = null;
-    zip_outbuf = null;
-    zip_window = null;
-    zip_d_buf = null;
-    zip_l_buf = null;
-    zip_prev = null;
-    zip_dyn_ltree = null;
-    zip_dyn_dtree = null;
-    zip_static_ltree = null;
-    zip_static_dtree = null;
-    zip_bl_tree = null;
-    zip_l_desc = null;
-    zip_d_desc = null;
-    zip_bl_desc = null;
-    zip_bl_count = null;
-    zip_heap = null;
-    zip_depth = null;
-    zip_length_code = null;
-    zip_dist_code = null;
-    zip_base_length = null;
-    zip_base_dist = null;
-    zip_flag_buf = null
-  };
-  var zip_reuse_queue = function(p) {
-    p.next = zip_free_queue;
-    zip_free_queue = p
-  };
-  var zip_new_queue = function() {
-    var p;
-    if(zip_free_queue !== null) {
-      p = zip_free_queue;
-      zip_free_queue = zip_free_queue.next
-    }else {
-      p = new Zip_DeflateBuffer
-    }
-    p.next = null;
-    p.len = p.off = 0;
-    return p
-  };
-  var zip_head1 = function(i) {
-    return zip_prev[zip_WSIZE + i]
-  };
-  var zip_head2 = function(i, val) {
-    zip_prev[zip_WSIZE + i] = val;
-    return val
-  };
-  var zip_qoutbuf = function() {
-    var q, i;
-    if(zip_outcnt !== 0) {
-      q = zip_new_queue();
-      if(zip_qhead === null) {
-        zip_qhead = zip_qtail = q
-      }else {
-        zip_qtail = zip_qtail.next = q
-      }
-      q.len = zip_outcnt - zip_outoff;
-      for(i = 0;i < q.len;i++) {
-        q.ptr[i] = zip_outbuf[zip_outoff + i]
-      }
-      zip_outcnt = zip_outoff = 0
-    }
-  };
-  var zip_put_byte = function(c) {
-    zip_outbuf[zip_outoff + zip_outcnt++] = c;
-    if(zip_outoff + zip_outcnt === zip_OUTBUFSIZ) {
-      zip_qoutbuf()
-    }
-  };
-  var zip_put_short = function(w) {
-    w &= 65535;
-    if(zip_outoff + zip_outcnt < zip_OUTBUFSIZ - 2) {
-      zip_outbuf[zip_outoff + zip_outcnt++] = w & 255;
-      zip_outbuf[zip_outoff + zip_outcnt++] = w >>> 8
-    }else {
-      zip_put_byte(w & 255);
-      zip_put_byte(w >>> 8)
-    }
-  };
-  var zip_INSERT_STRING = function() {
-    zip_ins_h = (zip_ins_h << zip_H_SHIFT ^ zip_window[zip_strstart + zip_MIN_MATCH - 1] & 255) & zip_HASH_MASK;
-    zip_hash_head = zip_head1(zip_ins_h);
-    zip_prev[zip_strstart & zip_WMASK] = zip_hash_head;
-    zip_head2(zip_ins_h, zip_strstart)
-  };
-  var zip_Buf_size = 16;
-  var zip_send_bits = function(value, length) {
-    if(zip_bi_valid > zip_Buf_size - length) {
-      zip_bi_buf |= value << zip_bi_valid;
-      zip_put_short(zip_bi_buf);
-      zip_bi_buf = value >> zip_Buf_size - zip_bi_valid;
-      zip_bi_valid += length - zip_Buf_size
-    }else {
-      zip_bi_buf |= value << zip_bi_valid;
-      zip_bi_valid += length
-    }
-  };
-  var zip_SEND_CODE = function(c, tree) {
-    zip_send_bits(tree[c].fc, tree[c].dl)
-  };
-  var zip_D_CODE = function(dist) {
-    return(dist < 256 ? zip_dist_code[dist] : zip_dist_code[256 + (dist >> 7)]) & 255
-  };
-  var zip_SMALLER = function(tree, n, m) {
-    return tree[n].fc < tree[m].fc || tree[n].fc === tree[m].fc && zip_depth[n] <= zip_depth[m]
-  };
-  var zip_read_buff = function(buff, offset, n) {
-    var i;
-    for(i = 0;i < n && zip_deflate_pos < zip_deflate_data.length;i++) {
-      buff[offset + i] = zip_deflate_data.charCodeAt(zip_deflate_pos++) & 255
-    }
-    return i
-  };
-  var zip_fill_window = function() {
-    var n, m;
-    var more = zip_window_size - zip_lookahead - zip_strstart;
-    if(more === -1) {
-      more--
-    }else {
-      if(zip_strstart >= zip_WSIZE + zip_MAX_DIST) {
-        for(n = 0;n < zip_WSIZE;n++) {
-          zip_window[n] = zip_window[n + zip_WSIZE]
-        }
-        zip_match_start -= zip_WSIZE;
-        zip_strstart -= zip_WSIZE;
-        zip_block_start -= zip_WSIZE;
-        for(n = 0;n < zip_HASH_SIZE;n++) {
-          m = zip_head1(n);
-          zip_head2(n, m >= zip_WSIZE ? m - zip_WSIZE : zip_NIL)
-        }
-        for(n = 0;n < zip_WSIZE;n++) {
-          m = zip_prev[n];
-          zip_prev[n] = m >= zip_WSIZE ? m - zip_WSIZE : zip_NIL
-        }
-        more += zip_WSIZE
-      }
-    }
-    if(!zip_eofile) {
-      n = zip_read_buff(zip_window, zip_strstart + zip_lookahead, more);
-      if(n <= 0) {
-        zip_eofile = true
-      }else {
-        zip_lookahead += n
-      }
-    }
-  };
-  var zip_lm_init = function() {
-    var j;
-    for(j = 0;j < zip_HASH_SIZE;j++) {
-      zip_prev[zip_WSIZE + j] = 0
-    }
-    zip_max_lazy_match = zip_configuration_table[zip_compr_level].max_lazy;
-    zip_good_match = zip_configuration_table[zip_compr_level].good_length;
-    if(!zip_FULL_SEARCH) {
-      zip_nice_match = zip_configuration_table[zip_compr_level].nice_length
-    }
-    zip_max_chain_length = zip_configuration_table[zip_compr_level].max_chain;
-    zip_strstart = 0;
-    zip_block_start = 0;
-    zip_lookahead = zip_read_buff(zip_window, 0, 2 * zip_WSIZE);
-    if(zip_lookahead <= 0) {
-      zip_eofile = true;
-      zip_lookahead = 0;
-      return
-    }
-    zip_eofile = false;
-    while(zip_lookahead < zip_MIN_LOOKAHEAD && !zip_eofile) {
-      zip_fill_window()
-    }
-    zip_ins_h = 0;
-    for(j = 0;j < zip_MIN_MATCH - 1;j++) {
-      zip_ins_h = (zip_ins_h << zip_H_SHIFT ^ zip_window[j] & 255) & zip_HASH_MASK
-    }
-  };
-  var zip_longest_match = function(cur_match) {
-    var chain_length = zip_max_chain_length;
-    var scanp = zip_strstart;
-    var matchp;
-    var len;
-    var best_len = zip_prev_length;
-    var limit = zip_strstart > zip_MAX_DIST ? zip_strstart - zip_MAX_DIST : zip_NIL;
-    var strendp = zip_strstart + zip_MAX_MATCH;
-    var scan_end1 = zip_window[scanp + best_len - 1];
-    var scan_end = zip_window[scanp + best_len];
-    if(zip_prev_length >= zip_good_match) {
-      chain_length >>= 2
-    }
-    do {
-      matchp = cur_match;
-      if(zip_window[matchp + best_len] !== scan_end || zip_window[matchp + best_len - 1] !== scan_end1 || zip_window[matchp] !== zip_window[scanp] || zip_window[++matchp] !== zip_window[scanp + 1]) {
-        continue
-      }
-      scanp += 2;
-      matchp++;
-      do {
-        ++scanp
-      }while(zip_window[scanp] === zip_window[++matchp] && zip_window[++scanp] === zip_window[++matchp] && zip_window[++scanp] === zip_window[++matchp] && zip_window[++scanp] === zip_window[++matchp] && zip_window[++scanp] === zip_window[++matchp] && zip_window[++scanp] === zip_window[++matchp] && zip_window[++scanp] === zip_window[++matchp] && zip_window[++scanp] === zip_window[++matchp] && scanp < strendp);
-      len = zip_MAX_MATCH - (strendp - scanp);
-      scanp = strendp - zip_MAX_MATCH;
-      if(len > best_len) {
-        zip_match_start = cur_match;
-        best_len = len;
-        if(zip_FULL_SEARCH) {
-          if(len >= zip_MAX_MATCH) {
-            break
-          }
-        }else {
-          if(len >= zip_nice_match) {
-            break
-          }
-        }
-        scan_end1 = zip_window[scanp + best_len - 1];
-        scan_end = zip_window[scanp + best_len]
-      }
-    }while((cur_match = zip_prev[cur_match & zip_WMASK]) > limit && --chain_length !== 0);
-    return best_len
-  };
-  var zip_ct_tally = function(dist, lc) {
-    zip_l_buf[zip_last_lit++] = lc;
-    if(dist === 0) {
-      zip_dyn_ltree[lc].fc++
-    }else {
-      dist--;
-      zip_dyn_ltree[zip_length_code[lc] + zip_LITERALS + 1].fc++;
-      zip_dyn_dtree[zip_D_CODE(dist)].fc++;
-      zip_d_buf[zip_last_dist++] = dist;
-      zip_flags |= zip_flag_bit
-    }
-    zip_flag_bit <<= 1;
-    if((zip_last_lit & 7) === 0) {
-      zip_flag_buf[zip_last_flags++] = zip_flags;
-      zip_flags = 0;
-      zip_flag_bit = 1
-    }
-    if(zip_compr_level > 2 && (zip_last_lit & 4095) === 0) {
-      var out_length = zip_last_lit * 8;
-      var in_length = zip_strstart - zip_block_start;
-      var dcode;
-      for(dcode = 0;dcode < zip_D_CODES;dcode++) {
-        out_length += zip_dyn_dtree[dcode].fc * (5 + zip_extra_dbits[dcode])
-      }
-      out_length >>= 3;
-      if(zip_last_dist < parseInt(zip_last_lit / 2, 10) && out_length < parseInt(in_length / 2, 10)) {
-        return true
-      }
-    }
-    return zip_last_lit === zip_LIT_BUFSIZE - 1 || zip_last_dist === zip_DIST_BUFSIZE
-  };
-  var zip_pqdownheap = function(tree, k) {
-    var v = zip_heap[k];
-    var j = k << 1;
-    while(j <= zip_heap_len) {
-      if(j < zip_heap_len && zip_SMALLER(tree, zip_heap[j + 1], zip_heap[j])) {
-        j++
-      }
-      if(zip_SMALLER(tree, v, zip_heap[j])) {
-        break
-      }
-      zip_heap[k] = zip_heap[j];
-      k = j;
-      j <<= 1
-    }
-    zip_heap[k] = v
-  };
-  var zip_gen_bitlen = function(desc) {
-    var tree = desc.dyn_tree;
-    var extra = desc.extra_bits;
-    var base = desc.extra_base;
-    var max_code = desc.max_code;
-    var max_length = desc.max_length;
-    var stree = desc.static_tree;
-    var h;
-    var n, m;
-    var bits;
-    var xbits;
-    var f;
-    var overflow = 0;
-    for(bits = 0;bits <= zip_MAX_BITS;bits++) {
-      zip_bl_count[bits] = 0
-    }
-    tree[zip_heap[zip_heap_max]].dl = 0;
-    for(h = zip_heap_max + 1;h < zip_HEAP_SIZE;h++) {
-      n = zip_heap[h];
-      bits = tree[tree[n].dl].dl + 1;
-      if(bits > max_length) {
-        bits = max_length;
-        overflow++
-      }
-      tree[n].dl = bits;
-      if(n > max_code) {
-        continue
-      }
-      zip_bl_count[bits]++;
-      xbits = 0;
-      if(n >= base) {
-        xbits = extra[n - base]
-      }
-      f = tree[n].fc;
-      zip_opt_len += f * (bits + xbits);
-      if(stree !== null) {
-        zip_static_len += f * (stree[n].dl + xbits)
-      }
-    }
-    if(overflow === 0) {
-      return
-    }
-    do {
-      bits = max_length - 1;
-      while(zip_bl_count[bits] === 0) {
-        bits--
-      }
-      zip_bl_count[bits]--;
-      zip_bl_count[bits + 1] += 2;
-      zip_bl_count[max_length]--;
-      overflow -= 2
-    }while(overflow > 0);
-    for(bits = max_length;bits !== 0;bits--) {
-      n = zip_bl_count[bits];
-      while(n !== 0) {
-        m = zip_heap[--h];
-        if(m > max_code) {
-          continue
-        }
-        if(tree[m].dl !== bits) {
-          zip_opt_len += (bits - tree[m].dl) * tree[m].fc;
-          tree[m].fc = bits
-        }
-        n--
-      }
-    }
-  };
-  var zip_bi_reverse = function(code, len) {
-    var res = 0;
-    do {
-      res |= code & 1;
-      code >>= 1;
-      res <<= 1
-    }while(--len > 0);
-    return res >> 1
-  };
-  var zip_gen_codes = function(tree, max_code) {
-    var next_code = [];
-    next_code.length = zip_MAX_BITS + 1;
-    var code = 0;
-    var bits;
-    var n;
-    for(bits = 1;bits <= zip_MAX_BITS;bits++) {
-      code = code + zip_bl_count[bits - 1] << 1;
-      next_code[bits] = code
-    }
-    for(n = 0;n <= max_code;n++) {
-      var len = tree[n].dl;
-      if(len === 0) {
-        continue
-      }
-      tree[n].fc = zip_bi_reverse(next_code[len]++, len)
-    }
-  };
-  var zip_build_tree = function(desc) {
-    var tree = desc.dyn_tree;
-    var stree = desc.static_tree;
-    var elems = desc.elems;
-    var n, m;
-    var max_code = -1;
-    var node = elems;
-    zip_heap_len = 0;
-    zip_heap_max = zip_HEAP_SIZE;
-    for(n = 0;n < elems;n++) {
-      if(tree[n].fc !== 0) {
-        zip_heap[++zip_heap_len] = max_code = n;
-        zip_depth[n] = 0
-      }else {
-        tree[n].dl = 0
-      }
-    }
-    while(zip_heap_len < 2) {
-      var xnew = zip_heap[++zip_heap_len] = max_code < 2 ? ++max_code : 0;
-      tree[xnew].fc = 1;
-      zip_depth[xnew] = 0;
-      zip_opt_len--;
-      if(stree !== null) {
-        zip_static_len -= stree[xnew].dl
-      }
-    }
-    desc.max_code = max_code;
-    for(n = zip_heap_len >> 1;n >= 1;n--) {
-      zip_pqdownheap(tree, n)
-    }
-    do {
-      n = zip_heap[zip_SMALLEST];
-      zip_heap[zip_SMALLEST] = zip_heap[zip_heap_len--];
-      zip_pqdownheap(tree, zip_SMALLEST);
-      m = zip_heap[zip_SMALLEST];
-      zip_heap[--zip_heap_max] = n;
-      zip_heap[--zip_heap_max] = m;
-      tree[node].fc = tree[n].fc + tree[m].fc;
-      if(zip_depth[n] > zip_depth[m] + 1) {
-        zip_depth[node] = zip_depth[n]
-      }else {
-        zip_depth[node] = zip_depth[m] + 1
-      }
-      tree[n].dl = tree[m].dl = node;
-      zip_heap[zip_SMALLEST] = node++;
-      zip_pqdownheap(tree, zip_SMALLEST)
-    }while(zip_heap_len >= 2);
-    zip_heap[--zip_heap_max] = zip_heap[zip_SMALLEST];
-    zip_gen_bitlen(desc);
-    zip_gen_codes(tree, max_code)
-  };
-  var zip_scan_tree = function(tree, max_code) {
-    var n;
-    var prevlen = -1;
-    var curlen;
-    var nextlen = tree[0].dl;
-    var count = 0;
-    var max_count = 7;
-    var min_count = 4;
-    if(nextlen === 0) {
-      max_count = 138;
-      min_count = 3
-    }
-    tree[max_code + 1].dl = 65535;
-    for(n = 0;n <= max_code;n++) {
-      curlen = nextlen;
-      nextlen = tree[n + 1].dl;
-      if(++count < max_count && curlen === nextlen) {
-        continue
-      }else {
-        if(count < min_count) {
-          zip_bl_tree[curlen].fc += count
-        }else {
-          if(curlen !== 0) {
-            if(curlen !== prevlen) {
-              zip_bl_tree[curlen].fc++
-            }
-            zip_bl_tree[zip_REP_3_6].fc++
-          }else {
-            if(count <= 10) {
-              zip_bl_tree[zip_REPZ_3_10].fc++
-            }else {
-              zip_bl_tree[zip_REPZ_11_138].fc++
-            }
-          }
-        }
-      }
-      count = 0;
-      prevlen = curlen;
-      if(nextlen === 0) {
-        max_count = 138;
-        min_count = 3
-      }else {
-        if(curlen === nextlen) {
-          max_count = 6;
-          min_count = 3
-        }else {
-          max_count = 7;
-          min_count = 4
-        }
-      }
-    }
-  };
-  var zip_build_bl_tree = function() {
-    var max_blindex;
-    zip_scan_tree(zip_dyn_ltree, zip_l_desc.max_code);
-    zip_scan_tree(zip_dyn_dtree, zip_d_desc.max_code);
-    zip_build_tree(zip_bl_desc);
-    for(max_blindex = zip_BL_CODES - 1;max_blindex >= 3;max_blindex--) {
-      if(zip_bl_tree[zip_bl_order[max_blindex]].dl !== 0) {
-        break
-      }
-    }
-    zip_opt_len += 3 * (max_blindex + 1) + 5 + 5 + 4;
-    return max_blindex
-  };
-  var zip_bi_windup = function() {
-    if(zip_bi_valid > 8) {
-      zip_put_short(zip_bi_buf)
-    }else {
-      if(zip_bi_valid > 0) {
-        zip_put_byte(zip_bi_buf)
-      }
-    }
-    zip_bi_buf = 0;
-    zip_bi_valid = 0
-  };
-  var zip_compress_block = function(ltree, dtree) {
-    var dist;
-    var lc;
-    var lx = 0;
-    var dx = 0;
-    var fx = 0;
-    var flag = 0;
-    var code;
-    var extra;
-    if(zip_last_lit !== 0) {
-      do {
-        if((lx & 7) === 0) {
-          flag = zip_flag_buf[fx++]
-        }
-        lc = zip_l_buf[lx++] & 255;
-        if((flag & 1) === 0) {
-          zip_SEND_CODE(lc, ltree)
-        }else {
-          code = zip_length_code[lc];
-          zip_SEND_CODE(code + zip_LITERALS + 1, ltree);
-          extra = zip_extra_lbits[code];
-          if(extra !== 0) {
-            lc -= zip_base_length[code];
-            zip_send_bits(lc, extra)
-          }
-          dist = zip_d_buf[dx++];
-          code = zip_D_CODE(dist);
-          zip_SEND_CODE(code, dtree);
-          extra = zip_extra_dbits[code];
-          if(extra !== 0) {
-            dist -= zip_base_dist[code];
-            zip_send_bits(dist, extra)
-          }
-        }
-        flag >>= 1
-      }while(lx < zip_last_lit)
-    }
-    zip_SEND_CODE(zip_END_BLOCK, ltree)
-  };
-  var zip_send_tree = function(tree, max_code) {
-    var n;
-    var prevlen = -1;
-    var curlen;
-    var nextlen = tree[0].dl;
-    var count = 0;
-    var max_count = 7;
-    var min_count = 4;
-    if(nextlen === 0) {
-      max_count = 138;
-      min_count = 3
-    }
-    for(n = 0;n <= max_code;n++) {
-      curlen = nextlen;
-      nextlen = tree[n + 1].dl;
-      if(++count < max_count && curlen === nextlen) {
-        continue
-      }else {
-        if(count < min_count) {
-          do {
-            zip_SEND_CODE(curlen, zip_bl_tree)
-          }while(--count !== 0)
-        }else {
-          if(curlen !== 0) {
-            if(curlen !== prevlen) {
-              zip_SEND_CODE(curlen, zip_bl_tree);
-              count--
-            }
-            zip_SEND_CODE(zip_REP_3_6, zip_bl_tree);
-            zip_send_bits(count - 3, 2)
-          }else {
-            if(count <= 10) {
-              zip_SEND_CODE(zip_REPZ_3_10, zip_bl_tree);
-              zip_send_bits(count - 3, 3)
-            }else {
-              zip_SEND_CODE(zip_REPZ_11_138, zip_bl_tree);
-              zip_send_bits(count - 11, 7)
-            }
-          }
-        }
-      }
-      count = 0;
-      prevlen = curlen;
-      if(nextlen === 0) {
-        max_count = 138;
-        min_count = 3
-      }else {
-        if(curlen === nextlen) {
-          max_count = 6;
-          min_count = 3
-        }else {
-          max_count = 7;
-          min_count = 4
-        }
-      }
-    }
-  };
-  var zip_send_all_trees = function(lcodes, dcodes, blcodes) {
-    var rank;
-    zip_send_bits(lcodes - 257, 5);
-    zip_send_bits(dcodes - 1, 5);
-    zip_send_bits(blcodes - 4, 4);
-    for(rank = 0;rank < blcodes;rank++) {
-      zip_send_bits(zip_bl_tree[zip_bl_order[rank]].dl, 3)
-    }
-    zip_send_tree(zip_dyn_ltree, lcodes - 1);
-    zip_send_tree(zip_dyn_dtree, dcodes - 1)
-  };
-  var zip_init_block = function() {
-    var n;
-    for(n = 0;n < zip_L_CODES;n++) {
-      zip_dyn_ltree[n].fc = 0
-    }
-    for(n = 0;n < zip_D_CODES;n++) {
-      zip_dyn_dtree[n].fc = 0
-    }
-    for(n = 0;n < zip_BL_CODES;n++) {
-      zip_bl_tree[n].fc = 0
-    }
-    zip_dyn_ltree[zip_END_BLOCK].fc = 1;
-    zip_opt_len = zip_static_len = 0;
-    zip_last_lit = zip_last_dist = zip_last_flags = 0;
-    zip_flags = 0;
-    zip_flag_bit = 1
-  };
-  var zip_flush_block = function(eof) {
-    var opt_lenb, static_lenb;
-    var max_blindex;
-    var stored_len;
-    stored_len = zip_strstart - zip_block_start;
-    zip_flag_buf[zip_last_flags] = zip_flags;
-    zip_build_tree(zip_l_desc);
-    zip_build_tree(zip_d_desc);
-    max_blindex = zip_build_bl_tree();
-    opt_lenb = zip_opt_len + 3 + 7 >> 3;
-    static_lenb = zip_static_len + 3 + 7 >> 3;
-    if(static_lenb <= opt_lenb) {
-      opt_lenb = static_lenb
-    }
-    if(stored_len + 4 <= opt_lenb && zip_block_start >= 0) {
-      var i;
-      zip_send_bits((zip_STORED_BLOCK << 1) + eof, 3);
-      zip_bi_windup();
-      zip_put_short(stored_len);
-      zip_put_short(~stored_len);
-      for(i = 0;i < stored_len;i++) {
-        zip_put_byte(zip_window[zip_block_start + i])
-      }
-    }else {
-      if(static_lenb === opt_lenb) {
-        zip_send_bits((zip_STATIC_TREES << 1) + eof, 3);
-        zip_compress_block(zip_static_ltree, zip_static_dtree)
-      }else {
-        zip_send_bits((zip_DYN_TREES << 1) + eof, 3);
-        zip_send_all_trees(zip_l_desc.max_code + 1, zip_d_desc.max_code + 1, max_blindex + 1);
-        zip_compress_block(zip_dyn_ltree, zip_dyn_dtree)
-      }
-    }
-    zip_init_block();
-    if(eof !== 0) {
-      zip_bi_windup()
-    }
-  };
-  var zip_deflate_fast = function() {
-    while(zip_lookahead !== 0 && zip_qhead === null) {
-      var flush;
-      zip_INSERT_STRING();
-      if(zip_hash_head !== zip_NIL && zip_strstart - zip_hash_head <= zip_MAX_DIST) {
-        zip_match_length = zip_longest_match(zip_hash_head);
-        if(zip_match_length > zip_lookahead) {
-          zip_match_length = zip_lookahead
-        }
-      }
-      if(zip_match_length >= zip_MIN_MATCH) {
-        flush = zip_ct_tally(zip_strstart - zip_match_start, zip_match_length - zip_MIN_MATCH);
-        zip_lookahead -= zip_match_length;
-        if(zip_match_length <= zip_max_lazy_match) {
-          zip_match_length--;
-          do {
-            zip_strstart++;
-            zip_INSERT_STRING()
-          }while(--zip_match_length !== 0);
-          zip_strstart++
-        }else {
-          zip_strstart += zip_match_length;
-          zip_match_length = 0;
-          zip_ins_h = zip_window[zip_strstart] & 255;
-          zip_ins_h = (zip_ins_h << zip_H_SHIFT ^ zip_window[zip_strstart + 1] & 255) & zip_HASH_MASK
-        }
-      }else {
-        flush = zip_ct_tally(0, zip_window[zip_strstart] & 255);
-        zip_lookahead--;
-        zip_strstart++
-      }
-      if(flush) {
-        zip_flush_block(0);
-        zip_block_start = zip_strstart
-      }
-      while(zip_lookahead < zip_MIN_LOOKAHEAD && !zip_eofile) {
-        zip_fill_window()
-      }
-    }
-  };
-  var zip_deflate_better = function() {
-    while(zip_lookahead !== 0 && zip_qhead === null) {
-      zip_INSERT_STRING();
-      zip_prev_length = zip_match_length;
-      zip_prev_match = zip_match_start;
-      zip_match_length = zip_MIN_MATCH - 1;
-      if(zip_hash_head !== zip_NIL && zip_prev_length < zip_max_lazy_match && zip_strstart - zip_hash_head <= zip_MAX_DIST) {
-        zip_match_length = zip_longest_match(zip_hash_head);
-        if(zip_match_length > zip_lookahead) {
-          zip_match_length = zip_lookahead
-        }
-        if(zip_match_length === zip_MIN_MATCH && zip_strstart - zip_match_start > zip_TOO_FAR) {
-          zip_match_length--
-        }
-      }
-      if(zip_prev_length >= zip_MIN_MATCH && zip_match_length <= zip_prev_length) {
-        var flush;
-        flush = zip_ct_tally(zip_strstart - 1 - zip_prev_match, zip_prev_length - zip_MIN_MATCH);
-        zip_lookahead -= zip_prev_length - 1;
-        zip_prev_length -= 2;
-        do {
-          zip_strstart++;
-          zip_INSERT_STRING()
-        }while(--zip_prev_length !== 0);
-        zip_match_available = 0;
-        zip_match_length = zip_MIN_MATCH - 1;
-        zip_strstart++;
-        if(flush) {
-          zip_flush_block(0);
-          zip_block_start = zip_strstart
-        }
-      }else {
-        if(zip_match_available !== 0) {
-          if(zip_ct_tally(0, zip_window[zip_strstart - 1] & 255)) {
-            zip_flush_block(0);
-            zip_block_start = zip_strstart
-          }
-          zip_strstart++;
-          zip_lookahead--
-        }else {
-          zip_match_available = 1;
-          zip_strstart++;
-          zip_lookahead--
-        }
-      }
-      while(zip_lookahead < zip_MIN_LOOKAHEAD && !zip_eofile) {
-        zip_fill_window()
-      }
-    }
-  };
-  var zip_ct_init = function() {
-    var n;
-    var bits;
-    var length;
-    var code;
-    var dist;
-    if(zip_static_dtree[0].dl !== 0) {
-      return
-    }
-    zip_l_desc.dyn_tree = zip_dyn_ltree;
-    zip_l_desc.static_tree = zip_static_ltree;
-    zip_l_desc.extra_bits = zip_extra_lbits;
-    zip_l_desc.extra_base = zip_LITERALS + 1;
-    zip_l_desc.elems = zip_L_CODES;
-    zip_l_desc.max_length = zip_MAX_BITS;
-    zip_l_desc.max_code = 0;
-    zip_d_desc.dyn_tree = zip_dyn_dtree;
-    zip_d_desc.static_tree = zip_static_dtree;
-    zip_d_desc.extra_bits = zip_extra_dbits;
-    zip_d_desc.extra_base = 0;
-    zip_d_desc.elems = zip_D_CODES;
-    zip_d_desc.max_length = zip_MAX_BITS;
-    zip_d_desc.max_code = 0;
-    zip_bl_desc.dyn_tree = zip_bl_tree;
-    zip_bl_desc.static_tree = null;
-    zip_bl_desc.extra_bits = zip_extra_blbits;
-    zip_bl_desc.extra_base = 0;
-    zip_bl_desc.elems = zip_BL_CODES;
-    zip_bl_desc.max_length = zip_MAX_BL_BITS;
-    zip_bl_desc.max_code = 0;
-    length = 0;
-    for(code = 0;code < zip_LENGTH_CODES - 1;code++) {
-      zip_base_length[code] = length;
-      for(n = 0;n < 1 << zip_extra_lbits[code];n++) {
-        zip_length_code[length++] = code
-      }
-    }
-    zip_length_code[length - 1] = code;
-    dist = 0;
-    for(code = 0;code < 16;code++) {
-      zip_base_dist[code] = dist;
-      for(n = 0;n < 1 << zip_extra_dbits[code];n++) {
-        zip_dist_code[dist++] = code
-      }
-    }
-    dist >>= 7;
-    n = code;
-    for(code = n;code < zip_D_CODES;code++) {
-      zip_base_dist[code] = dist << 7;
-      for(n = 0;n < 1 << zip_extra_dbits[code] - 7;n++) {
-        zip_dist_code[256 + dist++] = code
-      }
-    }
-    for(bits = 0;bits <= zip_MAX_BITS;bits++) {
-      zip_bl_count[bits] = 0
-    }
-    n = 0;
-    while(n <= 143) {
-      zip_static_ltree[n++].dl = 8;
-      zip_bl_count[8]++
-    }
-    while(n <= 255) {
-      zip_static_ltree[n++].dl = 9;
-      zip_bl_count[9]++
-    }
-    while(n <= 279) {
-      zip_static_ltree[n++].dl = 7;
-      zip_bl_count[7]++
-    }
-    while(n <= 287) {
-      zip_static_ltree[n++].dl = 8;
-      zip_bl_count[8]++
-    }
-    zip_gen_codes(zip_static_ltree, zip_L_CODES + 1);
-    for(n = 0;n < zip_D_CODES;n++) {
-      zip_static_dtree[n].dl = 5;
-      zip_static_dtree[n].fc = zip_bi_reverse(n, 5)
-    }
-    zip_init_block()
-  };
-  var zip_init_deflate = function() {
-    if(zip_eofile) {
-      return
-    }
-    zip_bi_buf = 0;
-    zip_bi_valid = 0;
-    zip_ct_init();
-    zip_lm_init();
-    zip_qhead = null;
-    zip_outcnt = 0;
-    zip_outoff = 0;
-    if(zip_compr_level <= 3) {
-      zip_prev_length = zip_MIN_MATCH - 1;
-      zip_match_length = 0
-    }else {
-      zip_match_length = zip_MIN_MATCH - 1;
-      zip_match_available = 0
-    }
-    zip_complete = false
-  };
-  var zip_qcopy = function(buff, off, buff_size) {
-    var n, i, j;
-    n = 0;
-    while(zip_qhead !== null && n < buff_size) {
-      i = buff_size - n;
-      if(i > zip_qhead.len) {
-        i = zip_qhead.len
-      }
-      for(j = 0;j < i;j++) {
-        buff[off + n + j] = zip_qhead.ptr[zip_qhead.off + j]
-      }
-      zip_qhead.off += i;
-      zip_qhead.len -= i;
-      n += i;
-      if(zip_qhead.len === 0) {
-        var p;
-        p = zip_qhead;
-        zip_qhead = zip_qhead.next;
-        zip_reuse_queue(p)
-      }
-    }
-    if(n === buff_size) {
-      return n
-    }
-    if(zip_outoff < zip_outcnt) {
-      i = buff_size - n;
-      if(i > zip_outcnt - zip_outoff) {
-        i = zip_outcnt - zip_outoff
-      }
-      for(j = 0;j < i;j++) {
-        buff[off + n + j] = zip_outbuf[zip_outoff + j]
-      }
-      zip_outoff += i;
-      n += i;
-      if(zip_outcnt === zip_outoff) {
-        zip_outcnt = zip_outoff = 0
-      }
-    }
-    return n
-  };
-  var zip_deflate_internal = function(buff, off, buff_size) {
-    var n;
-    if(!zip_initflag) {
-      zip_init_deflate();
-      zip_initflag = true;
-      if(zip_lookahead === 0) {
-        zip_complete = true;
-        return 0
-      }
-    }
-    if((n = zip_qcopy(buff, off, buff_size)) === buff_size) {
-      return buff_size
-    }
-    if(zip_complete) {
-      return n
-    }
-    if(zip_compr_level <= 3) {
-      zip_deflate_fast()
-    }else {
-      zip_deflate_better()
-    }
-    if(zip_lookahead === 0) {
-      if(zip_match_available !== 0) {
-        zip_ct_tally(0, zip_window[zip_strstart - 1] & 255)
-      }
-      zip_flush_block(1);
-      zip_complete = true
-    }
-    return n + zip_qcopy(buff, n + off, buff_size - n)
-  };
-  var zip_deflate = function(str, level) {
-    var i, j;
-    zip_deflate_data = str;
-    zip_deflate_pos = 0;
-    if(typeof level === "undefined") {
-      level = zip_DEFAULT_LEVEL
-    }
-    zip_deflate_start(level);
-    var buff = new Array(1024);
-    var aout = [];
-    while((i = zip_deflate_internal(buff, 0, buff.length)) > 0) {
-      var cbuf = [];
-      cbuf.length = i;
-      for(j = 0;j < i;j++) {
-        cbuf[j] = String.fromCharCode(buff[j])
-      }
-      aout[aout.length] = cbuf.join("")
-    }
-    zip_deflate_data = null;
-    return aout.join("")
-  };
-  this.deflate = zip_deflate
-};
-core.ByteArray = function ByteArray(data) {
-  this.pos = 0;
-  this.data = data;
-  this.readUInt32LE = function() {
-    var data = this.data, pos = this.pos += 4;
-    return data[--pos] << 24 | data[--pos] << 16 | data[--pos] << 8 | data[--pos]
-  };
-  this.readUInt16LE = function() {
-    var data = this.data, pos = this.pos += 2;
-    return data[--pos] << 8 | data[--pos]
-  }
-};
-core.ByteArrayWriter = function ByteArrayWriter(encoding) {
-  var self = this, data = new runtime.ByteArray(0);
-  this.appendByteArrayWriter = function(writer) {
-    data = runtime.concatByteArrays(data, writer.getByteArray())
-  };
-  this.appendByteArray = function(array) {
-    data = runtime.concatByteArrays(data, array)
-  };
-  this.appendArray = function(array) {
-    data = runtime.concatByteArrays(data, runtime.byteArrayFromArray(array))
-  };
-  this.appendUInt16LE = function(value) {
-    self.appendArray([value & 255, value >> 8 & 255])
-  };
-  this.appendUInt32LE = function(value) {
-    self.appendArray([value & 255, value >> 8 & 255, value >> 16 & 255, value >> 24 & 255])
-  };
-  this.appendString = function(string) {
-    data = runtime.concatByteArrays(data, runtime.byteArrayFromString(string, encoding))
-  };
-  this.getLength = function() {
-    return data.length
-  };
-  this.getByteArray = function() {
-    return data
-  }
-};
-core.RawInflate = function RawInflate() {
-  var zip_WSIZE = 32768;
-  var zip_STORED_BLOCK = 0;
-  var zip_STATIC_TREES = 1;
-  var zip_DYN_TREES = 2;
-  var zip_lbits = 9;
-  var zip_dbits = 6;
-  var zip_INBUFSIZ = 32768;
-  var zip_INBUF_EXTRA = 64;
-  var zip_slide;
-  var zip_wp;
-  var zip_fixed_tl = null;
-  var zip_fixed_td;
-  var zip_fixed_bl, fixed_bd;
-  var zip_bit_buf;
-  var zip_bit_len;
-  var zip_method;
-  var zip_eof;
-  var zip_copy_leng;
-  var zip_copy_dist;
-  var zip_tl, zip_td;
-  var zip_bl, zip_bd;
-  var zip_inflate_data;
-  var zip_inflate_pos;
-  var zip_MASK_BITS = new Array(0, 1, 3, 7, 15, 31, 63, 127, 255, 511, 1023, 2047, 4095, 8191, 16383, 32767, 65535);
-  var zip_cplens = new Array(3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31, 35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0);
-  var zip_cplext = new Array(0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 0, 99, 99);
-  var zip_cpdist = new Array(1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193, 257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145, 8193, 12289, 16385, 24577);
-  var zip_cpdext = new Array(0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13);
-  var zip_border = new Array(16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15);
-  var zip_HuftList = function() {
-    this.next = null;
-    this.list = null
-  };
-  var zip_HuftNode = function() {
-    this.e = 0;
-    this.b = 0;
-    this.n = 0;
-    this.t = null
-  };
-  var zip_HuftBuild = function(b, n, s, d, e, mm) {
-    this.BMAX = 16;
-    this.N_MAX = 288;
-    this.status = 0;
-    this.root = null;
-    this.m = 0;
-    var a;
-    var c = new Array(this.BMAX + 1);
-    var el;
-    var f;
-    var g;
-    var h;
-    var i;
-    var j;
-    var k;
-    var lx = new Array(this.BMAX + 1);
-    var p;
-    var pidx;
-    var q;
-    var r = new zip_HuftNode;
-    var u = new Array(this.BMAX);
-    var v = new Array(this.N_MAX);
-    var w;
-    var x = new Array(this.BMAX + 1);
-    var xp;
-    var y;
-    var z;
-    var o;
-    var tail;
-    tail = this.root = null;
-    for(i = 0;i < c.length;i++) {
-      c[i] = 0
-    }
-    for(i = 0;i < lx.length;i++) {
-      lx[i] = 0
-    }
-    for(i = 0;i < u.length;i++) {
-      u[i] = null
-    }
-    for(i = 0;i < v.length;i++) {
-      v[i] = 0
-    }
-    for(i = 0;i < x.length;i++) {
-      x[i] = 0
-    }
-    el = n > 256 ? b[256] : this.BMAX;
-    p = b;
-    pidx = 0;
-    i = n;
-    do {
-      c[p[pidx]]++;
-      pidx++
-    }while(--i > 0);
-    if(c[0] == n) {
-      this.root = null;
-      this.m = 0;
-      this.status = 0;
-      return
-    }
-    for(j = 1;j <= this.BMAX;j++) {
-      if(c[j] != 0) {
-        break
-      }
-    }
-    k = j;
-    if(mm < j) {
-      mm = j
-    }
-    for(i = this.BMAX;i != 0;i--) {
-      if(c[i] != 0) {
-        break
-      }
-    }
-    g = i;
-    if(mm > i) {
-      mm = i
-    }
-    for(y = 1 << j;j < i;j++, y <<= 1) {
-      if((y -= c[j]) < 0) {
-        this.status = 2;
-        this.m = mm;
-        return
-      }
-    }
-    if((y -= c[i]) < 0) {
-      this.status = 2;
-      this.m = mm;
-      return
-    }
-    c[i] += y;
-    x[1] = j = 0;
-    p = c;
-    pidx = 1;
-    xp = 2;
-    while(--i > 0) {
-      x[xp++] = j += p[pidx++]
-    }
-    p = b;
-    pidx = 0;
-    i = 0;
-    do {
-      if((j = p[pidx++]) != 0) {
-        v[x[j]++] = i
-      }
-    }while(++i < n);
-    n = x[g];
-    x[0] = i = 0;
-    p = v;
-    pidx = 0;
-    h = -1;
-    w = lx[0] = 0;
-    q = null;
-    z = 0;
-    for(;k <= g;k++) {
-      a = c[k];
-      while(a-- > 0) {
-        while(k > w + lx[1 + h]) {
-          w += lx[1 + h];
-          h++;
-          z = (z = g - w) > mm ? mm : z;
-          if((f = 1 << (j = k - w)) > a + 1) {
-            f -= a + 1;
-            xp = k;
-            while(++j < z) {
-              if((f <<= 1) <= c[++xp]) {
-                break
-              }
-              f -= c[xp]
-            }
-          }
-          if(w + j > el && w < el) {
-            j = el - w
-          }
-          z = 1 << j;
-          lx[1 + h] = j;
-          q = new Array(z);
-          for(o = 0;o < z;o++) {
-            q[o] = new zip_HuftNode
-          }
-          if(tail == null) {
-            tail = this.root = new zip_HuftList
-          }else {
-            tail = tail.next = new zip_HuftList
-          }
-          tail.next = null;
-          tail.list = q;
-          u[h] = q;
-          if(h > 0) {
-            x[h] = i;
-            r.b = lx[h];
-            r.e = 16 + j;
-            r.t = q;
-            j = (i & (1 << w) - 1) >> w - lx[h];
-            u[h - 1][j].e = r.e;
-            u[h - 1][j].b = r.b;
-            u[h - 1][j].n = r.n;
-            u[h - 1][j].t = r.t
-          }
-        }
-        r.b = k - w;
-        if(pidx >= n) {
-          r.e = 99
-        }else {
-          if(p[pidx] < s) {
-            r.e = p[pidx] < 256 ? 16 : 15;
-            r.n = p[pidx++]
-          }else {
-            r.e = e[p[pidx] - s];
-            r.n = d[p[pidx++] - s]
-          }
-        }
-        f = 1 << k - w;
-        for(j = i >> w;j < z;j += f) {
-          q[j].e = r.e;
-          q[j].b = r.b;
-          q[j].n = r.n;
-          q[j].t = r.t
-        }
-        for(j = 1 << k - 1;(i & j) != 0;j >>= 1) {
-          i ^= j
-        }
-        i ^= j;
-        while((i & (1 << w) - 1) != x[h]) {
-          w -= lx[h];
-          h--
-        }
-      }
-    }
-    this.m = lx[1];
-    this.status = y != 0 && g != 1 ? 1 : 0
-  };
-  var zip_GET_BYTE = function() {
-    if(zip_inflate_data.length == zip_inflate_pos) {
-      return-1
-    }
-    return zip_inflate_data[zip_inflate_pos++]
-  };
-  var zip_NEEDBITS = function(n) {
-    while(zip_bit_len < n) {
-      zip_bit_buf |= zip_GET_BYTE() << zip_bit_len;
-      zip_bit_len += 8
-    }
-  };
-  var zip_GETBITS = function(n) {
-    return zip_bit_buf & zip_MASK_BITS[n]
-  };
-  var zip_DUMPBITS = function(n) {
-    zip_bit_buf >>= n;
-    zip_bit_len -= n
-  };
-  var zip_inflate_codes = function(buff, off, size) {
-    var e;
-    var t;
-    var n;
-    if(size == 0) {
-      return 0
-    }
-    n = 0;
-    for(;;) {
-      zip_NEEDBITS(zip_bl);
-      t = zip_tl.list[zip_GETBITS(zip_bl)];
-      e = t.e;
-      while(e > 16) {
-        if(e == 99) {
-          return-1
-        }
-        zip_DUMPBITS(t.b);
-        e -= 16;
-        zip_NEEDBITS(e);
-        t = t.t[zip_GETBITS(e)];
-        e = t.e
-      }
-      zip_DUMPBITS(t.b);
-      if(e == 16) {
-        zip_wp &= zip_WSIZE - 1;
-        buff[off + n++] = zip_slide[zip_wp++] = t.n;
-        if(n == size) {
-          return size
-        }
-        continue
-      }
-      if(e == 15) {
-        break
-      }
-      zip_NEEDBITS(e);
-      zip_copy_leng = t.n + zip_GETBITS(e);
-      zip_DUMPBITS(e);
-      zip_NEEDBITS(zip_bd);
-      t = zip_td.list[zip_GETBITS(zip_bd)];
-      e = t.e;
-      while(e > 16) {
-        if(e == 99) {
-          return-1
-        }
-        zip_DUMPBITS(t.b);
-        e -= 16;
-        zip_NEEDBITS(e);
-        t = t.t[zip_GETBITS(e)];
-        e = t.e
-      }
-      zip_DUMPBITS(t.b);
-      zip_NEEDBITS(e);
-      zip_copy_dist = zip_wp - t.n - zip_GETBITS(e);
-      zip_DUMPBITS(e);
-      while(zip_copy_leng > 0 && n < size) {
-        zip_copy_leng--;
-        zip_copy_dist &= zip_WSIZE - 1;
-        zip_wp &= zip_WSIZE - 1;
-        buff[off + n++] = zip_slide[zip_wp++] = zip_slide[zip_copy_dist++]
-      }
-      if(n == size) {
-        return size
-      }
-    }
-    zip_method = -1;
-    return n
-  };
-  var zip_inflate_stored = function(buff, off, size) {
-    var n;
-    n = zip_bit_len & 7;
-    zip_DUMPBITS(n);
-    zip_NEEDBITS(16);
-    n = zip_GETBITS(16);
-    zip_DUMPBITS(16);
-    zip_NEEDBITS(16);
-    if(n != (~zip_bit_buf & 65535)) {
-      return-1
-    }
-    zip_DUMPBITS(16);
-    zip_copy_leng = n;
-    n = 0;
-    while(zip_copy_leng > 0 && n < size) {
-      zip_copy_leng--;
-      zip_wp &= zip_WSIZE - 1;
-      zip_NEEDBITS(8);
-      buff[off + n++] = zip_slide[zip_wp++] = zip_GETBITS(8);
-      zip_DUMPBITS(8)
-    }
-    if(zip_copy_leng == 0) {
-      zip_method = -1
-    }
-    return n
-  };
-  var zip_fixed_bd;
-  var zip_inflate_fixed = function(buff, off, size) {
-    if(zip_fixed_tl == null) {
-      var i;
-      var l = new Array(288);
-      var h;
-      for(i = 0;i < 144;i++) {
-        l[i] = 8
-      }
-      for(;i < 256;i++) {
-        l[i] = 9
-      }
-      for(;i < 280;i++) {
-        l[i] = 7
-      }
-      for(;i < 288;i++) {
-        l[i] = 8
-      }
-      zip_fixed_bl = 7;
-      h = new zip_HuftBuild(l, 288, 257, zip_cplens, zip_cplext, zip_fixed_bl);
-      if(h.status != 0) {
-        alert("HufBuild error: " + h.status);
-        return-1
-      }
-      zip_fixed_tl = h.root;
-      zip_fixed_bl = h.m;
-      for(i = 0;i < 30;i++) {
-        l[i] = 5
-      }
-      zip_fixed_bd = 5;
-      h = new zip_HuftBuild(l, 30, 0, zip_cpdist, zip_cpdext, zip_fixed_bd);
-      if(h.status > 1) {
-        zip_fixed_tl = null;
-        alert("HufBuild error: " + h.status);
-        return-1
-      }
-      zip_fixed_td = h.root;
-      zip_fixed_bd = h.m
-    }
-    zip_tl = zip_fixed_tl;
-    zip_td = zip_fixed_td;
-    zip_bl = zip_fixed_bl;
-    zip_bd = zip_fixed_bd;
-    return zip_inflate_codes(buff, off, size)
-  };
-  var zip_inflate_dynamic = function(buff, off, size) {
-    var i;
-    var j;
-    var l;
-    var n;
-    var t;
-    var nb;
-    var nl;
-    var nd;
-    var ll = new Array(286 + 30);
-    var h;
-    for(i = 0;i < ll.length;i++) {
-      ll[i] = 0
-    }
-    zip_NEEDBITS(5);
-    nl = 257 + zip_GETBITS(5);
-    zip_DUMPBITS(5);
-    zip_NEEDBITS(5);
-    nd = 1 + zip_GETBITS(5);
-    zip_DUMPBITS(5);
-    zip_NEEDBITS(4);
-    nb = 4 + zip_GETBITS(4);
-    zip_DUMPBITS(4);
-    if(nl > 286 || nd > 30) {
-      return-1
-    }
-    for(j = 0;j < nb;j++) {
-      zip_NEEDBITS(3);
-      ll[zip_border[j]] = zip_GETBITS(3);
-      zip_DUMPBITS(3)
-    }
-    for(;j < 19;j++) {
-      ll[zip_border[j]] = 0
-    }
-    zip_bl = 7;
-    h = new zip_HuftBuild(ll, 19, 19, null, null, zip_bl);
-    if(h.status != 0) {
-      return-1
-    }
-    zip_tl = h.root;
-    zip_bl = h.m;
-    n = nl + nd;
-    i = l = 0;
-    while(i < n) {
-      zip_NEEDBITS(zip_bl);
-      t = zip_tl.list[zip_GETBITS(zip_bl)];
-      j = t.b;
-      zip_DUMPBITS(j);
-      j = t.n;
-      if(j < 16) {
-        ll[i++] = l = j
-      }else {
-        if(j == 16) {
-          zip_NEEDBITS(2);
-          j = 3 + zip_GETBITS(2);
-          zip_DUMPBITS(2);
-          if(i + j > n) {
-            return-1
-          }
-          while(j-- > 0) {
-            ll[i++] = l
-          }
-        }else {
-          if(j == 17) {
-            zip_NEEDBITS(3);
-            j = 3 + zip_GETBITS(3);
-            zip_DUMPBITS(3);
-            if(i + j > n) {
-              return-1
-            }
-            while(j-- > 0) {
-              ll[i++] = 0
-            }
-            l = 0
-          }else {
-            zip_NEEDBITS(7);
-            j = 11 + zip_GETBITS(7);
-            zip_DUMPBITS(7);
-            if(i + j > n) {
-              return-1
-            }
-            while(j-- > 0) {
-              ll[i++] = 0
-            }
-            l = 0
-          }
-        }
-      }
-    }
-    zip_bl = zip_lbits;
-    h = new zip_HuftBuild(ll, nl, 257, zip_cplens, zip_cplext, zip_bl);
-    if(zip_bl == 0) {
-      h.status = 1
-    }
-    if(h.status != 0) {
-      return-1
-    }
-    zip_tl = h.root;
-    zip_bl = h.m;
-    for(i = 0;i < nd;i++) {
-      ll[i] = ll[i + nl]
-    }
-    zip_bd = zip_dbits;
-    h = new zip_HuftBuild(ll, nd, 0, zip_cpdist, zip_cpdext, zip_bd);
-    zip_td = h.root;
-    zip_bd = h.m;
-    if(zip_bd == 0 && nl > 257) {
-      return-1
-    }
-    if(h.status != 0) {
-      return-1
-    }
-    return zip_inflate_codes(buff, off, size)
-  };
-  var zip_inflate_start = function() {
-    var i;
-    if(zip_slide == null) {
-      zip_slide = new Array(2 * zip_WSIZE)
-    }
-    zip_wp = 0;
-    zip_bit_buf = 0;
-    zip_bit_len = 0;
-    zip_method = -1;
-    zip_eof = false;
-    zip_copy_leng = zip_copy_dist = 0;
-    zip_tl = null
-  };
-  var zip_inflate_internal = function(buff, off, size) {
-    var n, i;
-    n = 0;
-    while(n < size) {
-      if(zip_eof && zip_method == -1) {
-        return n
-      }
-      if(zip_copy_leng > 0) {
-        if(zip_method != zip_STORED_BLOCK) {
-          while(zip_copy_leng > 0 && n < size) {
-            zip_copy_leng--;
-            zip_copy_dist &= zip_WSIZE - 1;
-            zip_wp &= zip_WSIZE - 1;
-            buff[off + n++] = zip_slide[zip_wp++] = zip_slide[zip_copy_dist++]
-          }
-        }else {
-          while(zip_copy_leng > 0 && n < size) {
-            zip_copy_leng--;
-            zip_wp &= zip_WSIZE - 1;
-            zip_NEEDBITS(8);
-            buff[off + n++] = zip_slide[zip_wp++] = zip_GETBITS(8);
-            zip_DUMPBITS(8)
-          }
-          if(zip_copy_leng == 0) {
-            zip_method = -1
-          }
-        }
-        if(n == size) {
-          return n
-        }
-      }
-      if(zip_method == -1) {
-        if(zip_eof) {
-          break
-        }
-        zip_NEEDBITS(1);
-        if(zip_GETBITS(1) != 0) {
-          zip_eof = true
-        }
-        zip_DUMPBITS(1);
-        zip_NEEDBITS(2);
-        zip_method = zip_GETBITS(2);
-        zip_DUMPBITS(2);
-        zip_tl = null;
-        zip_copy_leng = 0
-      }
-      switch(zip_method) {
-        case 0:
-          i = zip_inflate_stored(buff, off + n, size - n);
-          break;
-        case 1:
-          if(zip_tl != null) {
-            i = zip_inflate_codes(buff, off + n, size - n)
-          }else {
-            i = zip_inflate_fixed(buff, off + n, size - n)
-          }
-          break;
-        case 2:
-          if(zip_tl != null) {
-            i = zip_inflate_codes(buff, off + n, size - n)
-          }else {
-            i = zip_inflate_dynamic(buff, off + n, size - n)
-          }
-          break;
-        default:
-          i = -1;
-          break
-      }
-      if(i == -1) {
-        if(zip_eof) {
-          return 0
-        }
-        return-1
-      }
-      n += i
-    }
-    return n
-  };
-  var zip_inflate = function(data, size) {
-    var i, j;
-    zip_inflate_start();
-    zip_inflate_data = data;
-    zip_inflate_pos = 0;
-    var buff = new runtime.ByteArray(size);
-    zip_inflate_internal(buff, 0, size);
-    zip_inflate_data = null;
-    return buff
-  };
-  this.inflate = zip_inflate
-};
-core.Cursor = function Cursor(selection, document) {
-  var cursorns, cursorNode;
-  cursorns = "urn:webodf:names:cursor";
-  cursorNode = document.createElementNS(cursorns, "cursor");
-  function putCursorIntoTextNode(container, offset) {
-    var len, ref, textnode, parent;
-    parent = container.parentNode;
-    if(offset === 0) {
-      parent.insertBefore(cursorNode, container)
-    }else {
-      if(offset === container.length) {
-        parent.appendChild(cursorNode)
-      }else {
-        len = container.length;
-        ref = container.nextSibling;
-        textnode = document.createTextNode(container.substringData(offset, len));
-        container.deleteData(offset, len);
-        if(ref) {
-          parent.insertBefore(textnode, ref)
-        }else {
-          parent.appendChild(textnode)
-        }
-        parent.insertBefore(cursorNode, textnode)
-      }
-    }
-  }
-  function putCursorIntoContainer(container, offset) {
-    var node;
-    node = container.firstChild;
-    while(node && offset) {
-      node = node.nextSibling;
-      offset -= 1
-    }
-    container.insertBefore(cursorNode, node)
-  }
-  function getPotentialParentOrNode(parent, node) {
-    var n = node;
-    while(n && n !== parent) {
-      n = n.parentNode
-    }
-    return n || node
-  }
-  function removeCursorFromSelectionRange(range, cursorpos) {
-    var cursorParent, start, end;
-    cursorParent = cursorNode.parentNode;
-    start = getPotentialParentOrNode(cursorNode, range.startContainer);
-    end = getPotentialParentOrNode(cursorNode, range.endContainer);
-    if(start === cursorNode) {
-      range.setStart(cursorParent, cursorpos)
-    }else {
-      if(start === cursorParent && range.startOffset > cursorpos) {
-        range.setStart(cursorParent, range.startOffset - 1)
-      }
-    }
-    if(range.endContainer === cursorNode) {
-      range.setEnd(cursorParent, cursorpos)
-    }else {
-      if(range.endContainer === cursorParent && range.endOffset > cursorpos) {
-        range.setEnd(cursorParent, range.endOffset - 1)
-      }
-    }
-  }
-  function adaptRangeToMergedText(range, prev, textnodetomerge, cursorpos) {
-    var diff = prev.length - textnodetomerge.length;
-    if(range.startContainer === textnodetomerge) {
-      range.setStart(prev, diff + range.startOffset)
-    }else {
-      if(range.startContainer === prev.parentNode && range.startOffset === cursorpos) {
-        range.setStart(prev, diff)
-      }
-    }
-    if(range.endContainer === textnodetomerge) {
-      range.setEnd(prev, diff + range.endOffset)
-    }else {
-      if(range.endContainer === prev.parentNode && range.endOffset === cursorpos) {
-        range.setEnd(prev, diff)
-      }
-    }
-  }
-  function removeCursor() {
-    var i, cursorpos, node, textnodetoremove, range;
-    if(!cursorNode.parentNode) {
-      return
-    }
-    cursorpos = 0;
-    node = cursorNode.parentNode.firstChild;
-    while(node && node !== cursorNode) {
-      cursorpos += 1;
-      node = node.nextSibling
-    }
-    if(cursorNode.previousSibling && cursorNode.previousSibling.nodeType === 3 && cursorNode.nextSibling && cursorNode.nextSibling.nodeType === 3) {
-      textnodetoremove = cursorNode.nextSibling;
-      cursorNode.previousSibling.appendData(textnodetoremove.nodeValue)
-    }
-    for(i = 0;i < selection.rangeCount;i += 1) {
-      removeCursorFromSelectionRange(selection.getRangeAt(i), cursorpos)
-    }
-    if(textnodetoremove) {
-      for(i = 0;i < selection.rangeCount;i += 1) {
-        adaptRangeToMergedText(selection.getRangeAt(i), cursorNode.previousSibling, textnodetoremove, cursorpos)
-      }
-      textnodetoremove.parentNode.removeChild(textnodetoremove)
-    }
-    cursorNode.parentNode.removeChild(cursorNode)
-  }
-  function putCursor(container, offset) {
-    if(container.nodeType === 3) {
-      putCursorIntoTextNode(container, offset)
-    }else {
-      if(container.nodeType !== 9) {
-        putCursorIntoContainer(container, offset)
-      }
-    }
-  }
-  this.getNode = function() {
-    return cursorNode
-  };
-  this.updateToSelection = function() {
-    var range;
-    removeCursor();
-    if(selection.focusNode) {
-      putCursor(selection.focusNode, selection.focusOffset)
-    }
-  };
-  this.remove = function() {
-    removeCursor()
-  }
-};
-core.UnitTest = function UnitTest() {
-};
-core.UnitTest.prototype.setUp = function() {
-};
-core.UnitTest.prototype.tearDown = function() {
-};
-core.UnitTest.prototype.description = function() {
-};
-core.UnitTest.prototype.tests = function() {
-};
-core.UnitTest.prototype.asyncTests = function() {
-};
-core.UnitTestRunner = function UnitTestRunner() {
-  var failedTests = 0;
-  function debug(msg) {
-    runtime.log(msg)
-  }
-  function testFailed(msg) {
-    failedTests += 1;
-    runtime.log("fail", msg)
-  }
-  function testPassed(msg) {
-    runtime.log("pass", msg)
-  }
-  function areArraysEqual(a, b) {
-    var i;
-    try {
-      if(a.length !== b.length) {
-        return false
-      }
-      for(i = 0;i < a.length;i += 1) {
-        if(a[i] !== b[i]) {
-          return false
-        }
-      }
-    }catch(ex) {
-      return false
-    }
-    return true
-  }
-  function isResultCorrect(actual, expected) {
-    if(expected === 0) {
-      return actual === expected && 1 / actual === 1 / expected
-    }
-    if(actual === expected) {
-      return true
-    }
-    if(typeof expected === "number" && isNaN(expected)) {
-      return typeof actual === "number" && isNaN(actual)
-    }
-    if(Object.prototype.toString.call(expected) === Object.prototype.toString.call([])) {
-      return areArraysEqual(actual, expected)
-    }
-    return false
-  }
-  function stringify(v) {
-    if(v === 0 && 1 / v < 0) {
-      return"-0"
-    }
-    return String(v)
-  }
-  function shouldBe(t, a, b) {
-    if(typeof a !== "string" || typeof b !== "string") {
-      debug("WARN: shouldBe() expects string arguments")
-    }
-    var exception, av, bv;
-    try {
-      av = eval(a)
-    }catch(e) {
-      exception = e
-    }
-    bv = eval(b);
-    if(exception) {
-      testFailed(a + " should be " + bv + ". Threw exception " + exception)
-    }else {
-      if(isResultCorrect(av, bv)) {
-        testPassed(a + " is " + b)
-      }else {
-        if(typeof av === typeof bv) {
-          testFailed(a + " should be " + bv + ". Was " + stringify(av) + ".")
-        }else {
-          testFailed(a + " should be " + bv + " (of type " + typeof bv + "). Was " + av + " (of type " + typeof av + ").")
-        }
-      }
-    }
-  }
-  function shouldBeNonNull(t, a) {
-    var exception, av;
-    try {
-      av = eval(a)
-    }catch(e) {
-      exception = e
-    }
-    if(exception) {
-      testFailed(a + " should be non-null. Threw exception " + exception)
-    }else {
-      if(av !== null) {
-        testPassed(a + " is non-null.")
-      }else {
-        testFailed(a + " should be non-null. Was " + av)
-      }
-    }
-  }
-  function shouldBeNull(t, a) {
-    shouldBe(t, a, "null")
-  }
-  this.shouldBeNull = shouldBeNull;
-  this.shouldBeNonNull = shouldBeNonNull;
-  this.shouldBe = shouldBe;
-  this.countFailedTests = function() {
-    return failedTests
-  }
-};
-core.UnitTester = function UnitTester() {
-  var failedTests = 0, results = {};
-  this.runTests = function(TestClass, callback) {
-    var testName = Runtime.getFunctionName(TestClass), tname, runner = new core.UnitTestRunner, test = new TestClass(runner), testResults = {}, i, t, tests, lastFailCount;
-    if(testName.hasOwnProperty(results)) {
-      runtime.log("Test " + testName + " has already run.");
-      return
-    }
-    runtime.log("Running " + testName + ": " + test.description());
-    tests = test.tests();
-    for(i = 0;i < tests.length;i += 1) {
-      t = tests[i];
-      tname = Runtime.getFunctionName(t);
-      runtime.log("Running " + tname);
-      lastFailCount = runner.countFailedTests();
-      test.setUp();
-      t();
-      test.tearDown();
-      testResults[tname] = lastFailCount === runner.countFailedTests()
-    }
-    function runAsyncTests(todo) {
-      if(todo.length === 0) {
-        results[testName] = testResults;
-        failedTests += runner.countFailedTests();
-        callback();
-        return
-      }
-      t = todo[0];
-      var tname = Runtime.getFunctionName(t);
-      runtime.log("Running " + tname);
-      lastFailCount = runner.countFailedTests();
-      test.setUp();
-      t(function() {
-        test.tearDown();
-        testResults[tname] = lastFailCount === runner.countFailedTests();
-        runAsyncTests(todo.slice(1))
-      })
-    }
-    runAsyncTests(test.asyncTests())
-  };
-  this.countFailedTests = function() {
-    return failedTests
-  };
-  this.results = function() {
-    return results
-  }
-};
-core.PointWalker = function PointWalker(node) {
-  var currentNode = node, before = null, after = node && node.firstChild, root = node, pos = 0;
-  function getPosition(node) {
-    var p = -1, n = node;
-    while(n) {
-      n = n.previousSibling;
-      p += 1
-    }
-    return p
-  }
-  this.setPoint = function(node, position) {
-    currentNode = node;
-    pos = position;
-    if(currentNode.nodeType === 3) {
-      after = null;
-      before = null
-    }else {
-      after = currentNode.firstChild;
-      while(position) {
-        position -= 1;
-        after = after.nextSibling
-      }
-      if(after) {
-        before = after.previousSibling
-      }else {
-        before = currentNode.lastChild
-      }
-    }
-  };
-  this.stepForward = function() {
-    var len;
-    if(currentNode.nodeType === 3) {
-      if(typeof currentNode.nodeValue.length === "number") {
-        len = currentNode.nodeValue.length
-      }else {
-        len = currentNode.nodeValue.length()
-      }
-      if(pos < len) {
-        pos += 1;
-        return true
-      }
-    }
-    if(after) {
-      if(after.nodeType === 1) {
-        currentNode = after;
-        before = null;
-        after = currentNode.firstChild;
-        pos = 0
-      }else {
-        if(after.nodeType === 3) {
-          currentNode = after;
-          before = null;
-          after = null;
-          pos = 0
-        }else {
-          before = after;
-          after = after.nextSibling;
-          pos += 1
-        }
-      }
-      return true
-    }
-    if(currentNode !== root) {
-      before = currentNode;
-      after = before.nextSibling;
-      currentNode = currentNode.parentNode;
-      pos = getPosition(before) + 1;
-      return true
-    }
-    return false
-  };
-  this.stepBackward = function() {
-    if(currentNode.nodeType === 3) {
-      if(pos > 0) {
-        pos -= 1;
-        return true
-      }
-    }
-    if(before) {
-      if(before.nodeType === 1) {
-        currentNode = before;
-        before = currentNode.lastChild;
-        after = null;
-        pos = getPosition(before) + 1
-      }else {
-        if(before.nodeType === 3) {
-          currentNode = before;
-          before = null;
-          after = null;
-          if(typeof currentNode.nodeValue.length === "number") {
-            pos = currentNode.nodeValue.length
-          }else {
-            pos = currentNode.nodeValue.length()
-          }
-        }else {
-          after = before;
-          before = before.previousSibling;
-          pos -= 1
-        }
-      }
-      return true
-    }
-    if(currentNode !== root) {
-      after = currentNode;
-      before = after.previousSibling;
-      currentNode = currentNode.parentNode;
-      pos = getPosition(after);
-      return true
-    }
-    return false
-  };
-  this.node = function() {
-    return currentNode
-  };
-  this.position = function() {
-    return pos
-  };
-  this.precedingSibling = function() {
-    return before
-  };
-  this.followingSibling = function() {
-    return after
-  }
-};
-core.Async = function Async() {
-  this.forEach = function(items, f, callback) {
-    var i, l = items.length, itemsDone = 0;
-    function end(err) {
-      if(itemsDone !== l) {
-        if(err) {
-          itemsDone = l;
-          callback(err)
-        }else {
-          itemsDone += 1;
-          if(itemsDone === l) {
-            callback(null)
-          }
-        }
-      }
-    }
-    for(i = 0;i < l;i += 1) {
-      f(items[i], end)
-    }
-  }
-};
-runtime.loadClass("core.RawInflate");
-runtime.loadClass("core.ByteArray");
-runtime.loadClass("core.ByteArrayWriter");
-runtime.loadClass("core.Base64");
-core.Zip = function Zip(url, entriesReadCallback) {
-  var entries, filesize, nEntries, inflate = (new core.RawInflate).inflate, zip = this, base64 = new core.Base64;
-  function crc32(data) {
-    var table = [0, 1996959894, 3993919788, 2567524794, 124634137, 1886057615, 3915621685, 2657392035, 249268274, 2044508324, 3772115230, 2547177864, 162941995, 2125561021, 3887607047, 2428444049, 498536548, 1789927666, 4089016648, 2227061214, 450548861, 1843258603, 4107580753, 2211677639, 325883990, 1684777152, 4251122042, 2321926636, 335633487, 1661365465, 4195302755, 2366115317, 997073096, 1281953886, 3579855332, 2724688242, 1006888145, 1258607687, 3524101629, 2768942443, 901097722, 1119000684, 
-    3686517206, 2898065728, 853044451, 1172266101, 3705015759, 2882616665, 651767980, 1373503546, 3369554304, 3218104598, 565507253, 1454621731, 3485111705, 3099436303, 671266974, 1594198024, 3322730930, 2970347812, 795835527, 1483230225, 3244367275, 3060149565, 1994146192, 31158534, 2563907772, 4023717930, 1907459465, 112637215, 2680153253, 3904427059, 2013776290, 251722036, 2517215374, 3775830040, 2137656763, 141376813, 2439277719, 3865271297, 1802195444, 476864866, 2238001368, 4066508878, 1812370925, 
-    453092731, 2181625025, 4111451223, 1706088902, 314042704, 2344532202, 4240017532, 1658658271, 366619977, 2362670323, 4224994405, 1303535960, 984961486, 2747007092, 3569037538, 1256170817, 1037604311, 2765210733, 3554079995, 1131014506, 879679996, 2909243462, 3663771856, 1141124467, 855842277, 2852801631, 3708648649, 1342533948, 654459306, 3188396048, 3373015174, 1466479909, 544179635, 3110523913, 3462522015, 1591671054, 702138776, 2966460450, 3352799412, 1504918807, 783551873, 3082640443, 3233442989, 
-    3988292384, 2596254646, 62317068, 1957810842, 3939845945, 2647816111, 81470997, 1943803523, 3814918930, 2489596804, 225274430, 2053790376, 3826175755, 2466906013, 167816743, 2097651377, 4027552580, 2265490386, 503444072, 1762050814, 4150417245, 2154129355, 426522225, 1852507879, 4275313526, 2312317920, 282753626, 1742555852, 4189708143, 2394877945, 397917763, 1622183637, 3604390888, 2714866558, 953729732, 1340076626, 3518719985, 2797360999, 1068828381, 1219638859, 3624741850, 2936675148, 906185462, 
-    1090812512, 3747672003, 2825379669, 829329135, 1181335161, 3412177804, 3160834842, 628085408, 1382605366, 3423369109, 3138078467, 570562233, 1426400815, 3317316542, 2998733608, 733239954, 1555261956, 3268935591, 3050360625, 752459403, 1541320221, 2607071920, 3965973030, 1969922972, 40735498, 2617837225, 3943577151, 1913087877, 83908371, 2512341634, 3803740692, 2075208622, 213261112, 2463272603, 3855990285, 2094854071, 198958881, 2262029012, 4057260610, 1759359992, 534414190, 2176718541, 4139329115, 
-    1873836001, 414664567, 2282248934, 4279200368, 1711684554, 285281116, 2405801727, 4167216745, 1634467795, 376229701, 2685067896, 3608007406, 1308918612, 956543938, 2808555105, 3495958263, 1231636301, 1047427035, 2932959818, 3654703836, 1088359270, 936918E3, 2847714899, 3736837829, 1202900863, 817233897, 3183342108, 3401237130, 1404277552, 615818150, 3134207493, 3453421203, 1423857449, 601450431, 3009837614, 3294710456, 1567103746, 711928724, 3020668471, 3272380065, 1510334235, 755167117], crc = 
-    0, i, iTop = data.length, x = 0, y = 0;
-    crc = crc ^ -1;
-    for(i = 0;i < iTop;i += 1) {
-      y = (crc ^ data[i]) & 255;
-      x = table[y];
-      crc = crc >>> 8 ^ x
-    }
-    return crc ^ -1
-  }
-  function dosTime2Date(dostime) {
-    var year = (dostime >> 25 & 127) + 1980, month = (dostime >> 21 & 15) - 1, mday = dostime >> 16 & 31, hour = dostime >> 11 & 15, min = dostime >> 5 & 63, sec = (dostime & 31) << 1, d = new Date(year, month, mday, hour, min, sec);
-    return d
-  }
-  function date2DosTime(date) {
-    var y = date.getFullYear();
-    return y < 1980 ? 0 : y - 1980 << 25 | date.getMonth() + 1 << 21 | date.getDate() << 16 | date.getHours() << 11 | date.getMinutes() << 5 | date.getSeconds() >> 1
-  }
-  function ZipEntry(url, stream) {
-    var sig, namelen, extralen, commentlen, compressionMethod, compressedSize, uncompressedSize, offset, crc, entry = this;
-    function handleEntryData(data, callback) {
-      var stream = new core.ByteArray(data), sig = stream.readUInt32LE(), filenamelen, extralen;
-      if(sig !== 67324752) {
-        callback("File entry signature is wrong." + sig.toString() + " " + data.length.toString(), null);
-        return
-      }
-      stream.pos += 22;
-      filenamelen = stream.readUInt16LE();
-      extralen = stream.readUInt16LE();
-      stream.pos += filenamelen + extralen;
-      if(compressionMethod) {
-        data = data.slice(stream.pos, stream.pos + compressedSize);
-        if(compressedSize !== data.length) {
-          callback("The amount of compressed bytes read was " + data.length.toString() + " instead of " + compressedSize.toString() + " for " + entry.filename + " in " + url + ".", null);
-          return
-        }
-        data = inflate(data, uncompressedSize)
-      }else {
-        data = data.slice(stream.pos, stream.pos + uncompressedSize)
-      }
-      if(uncompressedSize !== data.length) {
-        callback("The amount of bytes read was " + data.length.toString() + " instead of " + uncompressedSize.toString() + " for " + entry.filename + " in " + url + ".", null);
-        return
-      }
-      entry.data = data;
-      callback(null, data)
-    }
-    function load(callback) {
-      if(entry.data !== undefined) {
-        callback(null, entry.data);
-        return
-      }
-      var size = compressedSize + 34 + namelen + extralen + 256;
-      if(size + offset > filesize) {
-        size = filesize - offset
-      }
-      runtime.read(url, offset, size, function(err, data) {
-        if(err) {
-          callback(err, data)
-        }else {
-          handleEntryData(data, callback)
-        }
-      })
-    }
-    this.load = load;
-    function set(filename, data, compressed, date) {
-      entry.filename = filename;
-      entry.data = data;
-      entry.compressed = compressed;
-      entry.date = date
-    }
-    this.set = set;
-    this.error = null;
-    if(!stream) {
-      return
-    }
-    sig = stream.readUInt32LE();
-    if(sig !== 33639248) {
-      this.error = "Central directory entry has wrong signature at position " + (stream.pos - 4).toString() + ' for file "' + url + '": ' + stream.data.length.toString();
-      return
-    }
-    stream.pos += 6;
-    compressionMethod = stream.readUInt16LE();
-    this.date = dosTime2Date(stream.readUInt32LE());
-    crc = stream.readUInt32LE();
-    compressedSize = stream.readUInt32LE();
-    uncompressedSize = stream.readUInt32LE();
-    namelen = stream.readUInt16LE();
-    extralen = stream.readUInt16LE();
-    commentlen = stream.readUInt16LE();
-    stream.pos += 8;
-    offset = stream.readUInt32LE();
-    this.filename = runtime.byteArrayToString(stream.data.slice(stream.pos, stream.pos + namelen), "utf8");
-    stream.pos += namelen + extralen + commentlen
-  }
-  function handleCentralDirectory(data, callback) {
-    var stream = new core.ByteArray(data), i, e;
-    entries = [];
-    for(i = 0;i < nEntries;i += 1) {
-      e = new ZipEntry(url, stream);
-      if(e.error) {
-        callback(e.error, zip);
-        return
-      }
-      entries[entries.length] = e
-    }
-    callback(null, zip)
-  }
-  function handleCentralDirectoryEnd(data, callback) {
-    if(data.length !== 22) {
-      callback("Central directory length should be 22.", zip);
-      return
-    }
-    var stream = new core.ByteArray(data), sig, disk, cddisk, diskNEntries, cdsSize, cdsOffset;
-    sig = stream.readUInt32LE();
-    if(sig !== 101010256) {
-      callback("Central directory signature is wrong: " + sig.toString(), zip);
-      return
-    }
-    disk = stream.readUInt16LE();
-    if(disk !== 0) {
-      callback("Zip files with non-zero disk numbers are not supported.", zip);
-      return
-    }
-    cddisk = stream.readUInt16LE();
-    if(cddisk !== 0) {
-      callback("Zip files with non-zero disk numbers are not supported.", zip);
-      return
-    }
-    diskNEntries = stream.readUInt16LE();
-    nEntries = stream.readUInt16LE();
-    if(diskNEntries !== nEntries) {
-      callback("Number of entries is inconsistent.", zip);
-      return
-    }
-    cdsSize = stream.readUInt32LE();
-    cdsOffset = stream.readUInt16LE();
-    cdsOffset = filesize - 22 - cdsSize;
-    runtime.read(url, cdsOffset, filesize - cdsOffset, function(err, data) {
-      handleCentralDirectory(data, callback)
-    })
-  }
-  function load(filename, callback) {
-    var entry = null, end = filesize, e, i;
-    for(i = 0;i < entries.length;i += 1) {
-      e = entries[i];
-      if(e.filename === filename) {
-        entry = e;
-        break
-      }
-    }
-    if(entry) {
-      if(entry.data) {
-        callback(null, entry.data)
-      }else {
-        entry.load(callback)
-      }
-    }else {
-      callback(filename + " not found.", null)
-    }
-  }
-  function loadAsString(filename, callback) {
-    load(filename, function(err, data) {
-      if(err) {
-        return callback(err, null)
-      }
-      data = runtime.byteArrayToString(data, "utf8");
-      callback(null, data)
-    })
-  }
-  function loadContentXmlAsFragments(filename, handler) {
-    loadAsString(filename, function(err, data) {
-      if(err) {
-        return handler.rootElementReady(err)
-      }
-      handler.rootElementReady(null, data, true)
-    })
-  }
-  function loadAsDataURL(filename, mimetype, callback) {
-    load(filename, function(err, data) {
-      if(err) {
-        return callback(err, null)
-      }
-      var p = data, chunksize = 45E3, i = 0, url;
-      if(!mimetype) {
-        if(p[1] === 80 && p[2] === 78 && p[3] === 71) {
-          mimetype = "image/png"
-        }else {
-          if(p[0] === 255 && p[1] === 216 && p[2] === 255) {
-            mimetype = "image/jpeg"
-          }else {
-            if(p[0] === 71 && p[1] === 73 && p[2] === 70) {
-              mimetype = "image/gif"
-            }else {
-              mimetype = ""
-            }
-          }
-        }
-      }
-      url = "data:" + mimetype + ";base64,";
-      while(i < data.length) {
-        url += base64.convertUTF8ArrayToBase64(p.slice(i, Math.min(i + chunksize, p.length)));
-        i += chunksize
-      }
-      callback(null, url)
-    })
-  }
-  function loadAsDOM(filename, callback) {
-    loadAsString(filename, function(err, xmldata) {
-      if(err) {
-        callback(err, null);
-        return
-      }
-      var parser = new DOMParser;
-      xmldata = parser.parseFromString(xmldata, "text/xml");
-      callback(null, xmldata)
-    })
-  }
-  function save(filename, data, compressed, date) {
-    var i, entry;
-    for(i = 0;i < entries.length;i += 1) {
-      entry = entries[i];
-      if(entry.filename === filename) {
-        entry.set(filename, data, compressed, date);
-        return
-      }
-    }
-    entry = new ZipEntry(url);
-    entry.set(filename, data, compressed, date);
-    entries.push(entry)
-  }
-  function writeEntry(entry) {
-    var data = new core.ByteArrayWriter("utf8"), length = 0;
-    data.appendArray([80, 75, 3, 4, 20, 0, 0, 0, 0, 0]);
-    if(entry.data) {
-      length = entry.data.length
-    }
-    data.appendUInt32LE(date2DosTime(entry.date));
-    data.appendUInt32LE(crc32(entry.data));
-    data.appendUInt32LE(length);
-    data.appendUInt32LE(length);
-    data.appendUInt16LE(entry.filename.length);
-    data.appendUInt16LE(0);
-    data.appendString(entry.filename);
-    if(entry.data) {
-      data.appendByteArray(entry.data)
-    }
-    return data
-  }
-  function writeCODEntry(entry, offset) {
-    var data = new core.ByteArrayWriter("utf8"), length = 0;
-    data.appendArray([80, 75, 1, 2, 20, 0, 20, 0, 0, 0, 0, 0]);
-    if(entry.data) {
-      length = entry.data.length
-    }
-    data.appendUInt32LE(date2DosTime(entry.date));
-    data.appendUInt32LE(crc32(entry.data));
-    data.appendUInt32LE(length);
-    data.appendUInt32LE(length);
-    data.appendUInt16LE(entry.filename.length);
-    data.appendArray([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]);
-    data.appendUInt32LE(offset);
-    data.appendString(entry.filename);
-    return data
-  }
-  function loadAllEntries(position, callback) {
-    if(position === entries.length) {
-      callback(null);
-      return
-    }
-    var entry = entries[position];
-    if(entry.data !== undefined) {
-      loadAllEntries(position + 1, callback);
-      return
-    }
-    entry.load(function(err) {
-      if(err) {
-        callback(err);
-        return
-      }
-      loadAllEntries(position + 1, callback)
-    })
-  }
-  function write(callback) {
-    loadAllEntries(0, function(err) {
-      if(err) {
-        callback(err);
-        return
-      }
-      var data = new core.ByteArrayWriter("utf8"), i, e, codoffset, codsize, offsets = [0];
-      for(i = 0;i < entries.length;i += 1) {
-        data.appendByteArrayWriter(writeEntry(entries[i]));
-        offsets.push(data.getLength())
-      }
-      codoffset = data.getLength();
-      for(i = 0;i < entries.length;i += 1) {
-        e = entries[i];
-        data.appendByteArrayWriter(writeCODEntry(e, offsets[i]))
-      }
-      codsize = data.getLength() - codoffset;
-      data.appendArray([80, 75, 5, 6, 0, 0, 0, 0]);
-      data.appendUInt16LE(entries.length);
-      data.appendUInt16LE(entries.length);
-      data.appendUInt32LE(codsize);
-      data.appendUInt32LE(codoffset);
-      data.appendArray([0, 0]);
-      runtime.writeFile(url, data.getByteArray(), callback)
-    })
-  }
-  this.load = load;
-  this.save = save;
-  this.write = write;
-  this.loadContentXmlAsFragments = loadContentXmlAsFragments;
-  this.loadAsString = loadAsString;
-  this.loadAsDOM = loadAsDOM;
-  this.loadAsDataURL = loadAsDataURL;
-  this.getEntries = function() {
-    return entries.slice()
-  };
-  filesize = -1;
-  if(entriesReadCallback === null) {
-    entries = [];
-    return
-  }
-  runtime.getFileSize(url, function(size) {
-    filesize = size;
-    if(filesize < 0) {
-      entriesReadCallback("File '" + url + "' cannot be read.", zip)
-    }else {
-      runtime.read(url, filesize - 22, 22, function(err, data) {
-        if(err || entriesReadCallback === null) {
-          entriesReadCallback(err, zip)
-        }else {
-          handleCentralDirectoryEnd(data, entriesReadCallback)
-        }
-      })
-    }
-  })
-};
-xmldom.LSSerializerFilter = function LSSerializerFilter() {
-};
-if(typeof Object.create !== "function") {
-  Object["create"] = function(o) {
-    var F = function() {
-    };
-    F.prototype = o;
-    return new F
-  }
-}
-xmldom.LSSerializer = function LSSerializer() {
-  var self = this;
-  function serializeAttribute(prefix, attr) {
-    var s = prefix + attr.localName + '="' + attr.nodeValue + '"';
-    return s
-  }
-  function attributePrefix(nsmap, prefix, ns) {
-    if(nsmap.hasOwnProperty(ns)) {
-      return nsmap[ns] + ":"
-    }
-    if(nsmap[ns] !== prefix) {
-      nsmap[ns] = prefix
-    }
-    return prefix + ":"
-  }
-  function startNode(nsmap, node) {
-    var s = "", atts = node.attributes, length, i, attr, attstr = "", accept, prefix;
-    if(atts) {
-      if(nsmap[node.namespaceURI] !== node.prefix) {
-        nsmap[node.namespaceURI] = node.prefix
-      }
-      s += "<" + node.nodeName;
-      length = atts.length;
-      for(i = 0;i < length;i += 1) {
-        attr = atts.item(i);
-        if(attr.namespaceURI !== "http://www.w3.org/2000/xmlns/") {
-          accept = self.filter ? self.filter.acceptNode(attr) : 1;
-          if(accept === 1) {
-            if(attr.namespaceURI) {
-              prefix = attributePrefix(nsmap, attr.prefix, attr.namespaceURI)
-            }else {
-              prefix = ""
-            }
-            attstr += " " + serializeAttribute(prefix, attr)
-          }
-        }
-      }
-      for(i in nsmap) {
-        if(nsmap.hasOwnProperty(i)) {
-          prefix = nsmap[i];
-          if(!prefix) {
-            s += ' xmlns="' + i + '"'
-          }else {
-            if(prefix !== "xmlns") {
-              s += " xmlns:" + nsmap[i] + '="' + i + '"'
-            }
-          }
-        }
-      }
-      s += attstr + ">"
-    }
-    return s
-  }
-  function endNode(node) {
-    var s = "";
-    if(node.nodeType === 1) {
-      s += "</" + node.nodeName + ">"
-    }
-    return s
-  }
-  function serializeNode(parentnsmap, node) {
-    var s = "", nsmap = Object.create(parentnsmap), accept = self.filter ? self.filter.acceptNode(node) : 1, child;
-    if(accept === 1) {
-      s += startNode(nsmap, node)
-    }
-    if(accept === 1 || accept === 3) {
-      child = node.firstChild;
-      while(child) {
-        s += serializeNode(nsmap, child);
-        child = child.nextSibling
-      }
-      if(node.nodeValue) {
-        s += node.nodeValue
-      }
-    }
-    if(accept === 1) {
-      s += endNode(node)
-    }
-    return s
-  }
-  function invertMap(map) {
-    var m = {}, i;
-    for(i in map) {
-      if(map.hasOwnProperty(i)) {
-        m[map[i]] = i
-      }
-    }
-    return m
-  }
-  this.filter = null;
-  this.writeToString = function(node, nsmap) {
-    if(!node) {
-      return""
-    }
-    nsmap = nsmap ? invertMap(nsmap) : {};
-    return serializeNode(nsmap, node)
-  }
-};
-xmldom.RelaxNGParser = function RelaxNGParser() {
-  var self = this, rngns = "http://relaxng.org/ns/structure/1.0", xmlnsns = "http://www.w3.org/2000/xmlns/", start, nsmap = {"http://www.w3.org/XML/1998/namespace":"xml"}, parse;
-  function RelaxNGParseError(error, context) {
-    this.message = function() {
-      if(context) {
-        error += context.nodeType === 1 ? " Element " : " Node ";
-        error += context.nodeName;
-        if(context.nodeValue) {
-          error += " with value '" + context.nodeValue + "'"
-        }
-        error += "."
-      }
-      return error
-    }
-  }
-  function splitToDuos(e) {
-    if(e.e.length <= 2) {
-      return e
-    }
-    var o = {name:e.name, e:e.e.slice(0, 2)};
-    return splitToDuos({name:e.name, e:[o].concat(e.e.slice(2))})
-  }
-  function splitQName(name) {
-    var r = name.split(":", 2), prefix = "", i;
-    if(r.length === 1) {
-      r = ["", r[0]]
-    }else {
-      prefix = r[0]
-    }
-    for(i in nsmap) {
-      if(nsmap[i] === prefix) {
-        r[0] = i
-      }
-    }
-    return r
-  }
-  function splitQNames(def) {
-    var i, l = def.names ? def.names.length : 0, name, localnames = def.localnames = [l], namespaces = def.namespaces = [l];
-    for(i = 0;i < l;i += 1) {
-      name = splitQName(def.names[i]);
-      namespaces[i] = name[0];
-      localnames[i] = name[1]
-    }
-  }
-  function trim(str) {
-    str = str.replace(/^\s\s*/, "");
-    var ws = /\s/, i = str.length - 1;
-    while(ws.test(str.charAt(i))) {
-      i -= 1
-    }
-    return str.slice(0, i + 1)
-  }
-  function copyAttributes(atts, name, names) {
-    var a = {}, i, att;
-    for(i = 0;i < atts.length;i += 1) {
-      att = atts.item(i);
-      if(!att.namespaceURI) {
-        if(att.localName === "name" && (name === "element" || name === "attribute")) {
-          names.push(att.value)
-        }
-        if(att.localName === "name" || att.localName === "combine" || att.localName === "type") {
-          att.value = trim(att.value)
-        }
-        a[att.localName] = att.value
-      }else {
-        if(att.namespaceURI === xmlnsns) {
-          nsmap[att.value] = att.localName
-        }
-      }
-    }
-    return a
-  }
-  function parseChildren(c, e, elements, names) {
-    var text = "", ce;
-    while(c) {
-      if(c.nodeType === 1 && c.namespaceURI === rngns) {
-        ce = parse(c, elements, e);
-        if(ce) {
-          if(ce.name === "name") {
-            names.push(nsmap[ce.a.ns] + ":" + ce.text);
-            e.push(ce)
-          }else {
-            if(ce.name === "choice" && ce.names && ce.names.length) {
-              names = names.concat(ce.names);
-              delete ce.names;
-              e.push(ce)
-            }else {
-              e.push(ce)
-            }
-          }
-        }
-      }else {
-        if(c.nodeType === 3) {
-          text += c.nodeValue
-        }
-      }
-      c = c.nextSibling
-    }
-    return text
-  }
-  function combineDefines(combine, name, e, siblings) {
-    var i, ce;
-    for(i = 0;siblings && i < siblings.length;i += 1) {
-      ce = siblings[i];
-      if(ce.name === "define" && ce.a && ce.a.name === name) {
-        ce.e = [{name:combine, e:ce.e.concat(e)}];
-        return ce
-      }
-    }
-    return null
-  }
-  parse = function parse(element, elements, siblings) {
-    var e = [], a, ce, i, text, name = element.localName, names = [];
-    a = copyAttributes(element.attributes, name, names);
-    a.combine = a.combine || undefined;
-    text = parseChildren(element.firstChild, e, elements, names);
-    if(name !== "value" && name !== "param") {
-      text = /^\s*([\s\S]*\S)?\s*$/.exec(text)[1]
-    }
-    if(name === "value" && a.type === undefined) {
-      a.type = "token";
-      a.datatypeLibrary = ""
-    }
-    if((name === "attribute" || name === "element") && a.name !== undefined) {
-      i = splitQName(a.name);
-      e = [{name:"name", text:i[1], a:{ns:i[0]}}].concat(e);
-      delete a.name
-    }
-    if(name === "name" || name === "nsName" || name === "value") {
-      if(a.ns === undefined) {
-        a.ns = ""
-      }
-    }else {
-      delete a.ns
-    }
-    if(name === "name") {
-      i = splitQName(text);
-      a.ns = i[0];
-      text = i[1]
-    }
-    if(e.length > 1 && (name === "define" || name === "oneOrMore" || name === "zeroOrMore" || name === "optional" || name === "list" || name === "mixed")) {
-      e = [{name:"group", e:splitToDuos({name:"group", e:e}).e}]
-    }
-    if(e.length > 2 && name === "element") {
-      e = [e[0]].concat({name:"group", e:splitToDuos({name:"group", e:e.slice(1)}).e})
-    }
-    if(e.length === 1 && name === "attribute") {
-      e.push({name:"text", text:text})
-    }
-    if(e.length === 1 && (name === "choice" || name === "group" || name === "interleave")) {
-      name = e[0].name;
-      names = e[0].names;
-      a = e[0].a;
-      text = e[0].text;
-      e = e[0].e
-    }else {
-      if(e.length > 2 && (name === "choice" || name === "group" || name === "interleave")) {
-        e = splitToDuos({name:name, e:e}).e
-      }
-    }
-    if(name === "mixed") {
-      name = "interleave";
-      e = [e[0], {name:"text"}]
-    }
-    if(name === "optional") {
-      name = "choice";
-      e = [e[0], {name:"empty"}]
-    }
-    if(name === "zeroOrMore") {
-      name = "choice";
-      e = [{name:"oneOrMore", e:[e[0]]}, {name:"empty"}]
-    }
-    if(name === "define" && a.combine) {
-      ce = combineDefines(a.combine, a.name, e, siblings);
-      if(ce) {
-        return
-      }
-    }
-    ce = {name:name};
-    if(e && e.length > 0) {
-      ce.e = e
-    }
-    for(i in a) {
-      if(a.hasOwnProperty(i)) {
-        ce.a = a;
-        break
-      }
-    }
-    if(text !== undefined) {
-      ce.text = text
-    }
-    if(names && names.length > 0) {
-      ce.names = names
-    }
-    if(name === "element") {
-      ce.id = elements.length;
-      elements.push(ce);
-      ce = {name:"elementref", id:ce.id}
-    }
-    return ce
-  };
-  function resolveDefines(def, defines) {
-    var i = 0, e, defs, end, name = def.name;
-    while(def.e && i < def.e.length) {
-      e = def.e[i];
-      if(e.name === "ref") {
-        defs = defines[e.a.name];
-        if(!defs) {
-          throw e.a.name + " was not defined.";
-        }
-        end = def.e.slice(i + 1);
-        def.e = def.e.slice(0, i);
-        def.e = def.e.concat(defs.e);
-        def.e = def.e.concat(end)
-      }else {
-        i += 1;
-        resolveDefines(e, defines)
-      }
-    }
-    e = def.e;
-    if(name === "choice") {
-      if(!e || !e[1] || e[1].name === "empty") {
-        if(!e || !e[0] || e[0].name === "empty") {
-          delete def.e;
-          def.name = "empty"
-        }else {
-          e[1] = e[0];
-          e[0] = {name:"empty"}
-        }
-      }
-    }
-    if(name === "group" || name === "interleave") {
-      if(e[0].name === "empty") {
-        if(e[1].name === "empty") {
-          delete def.e;
-          def.name = "empty"
-        }else {
-          name = def.name = e[1].name;
-          def.names = e[1].names;
-          e = def.e = e[1].e
-        }
-      }else {
-        if(e[1].name === "empty") {
-          name = def.name = e[0].name;
-          def.names = e[0].names;
-          e = def.e = e[0].e
-        }
-      }
-    }
-    if(name === "oneOrMore" && e[0].name === "empty") {
-      delete def.e;
-      def.name = "empty"
-    }
-    if(name === "attribute") {
-      splitQNames(def)
-    }
-    if(name === "interleave") {
-      if(e[0].name === "interleave") {
-        if(e[1].name === "interleave") {
-          e = def.e = e[0].e.concat(e[1].e)
-        }else {
-          e = def.e = [e[1]].concat(e[0].e)
-        }
-      }else {
-        if(e[1].name === "interleave") {
-          e = def.e = [e[0]].concat(e[1].e)
-        }
-      }
-    }
-  }
-  function resolveElements(def, elements) {
-    var i = 0, e, name;
-    while(def.e && i < def.e.length) {
-      e = def.e[i];
-      if(e.name === "elementref") {
-        e.id = e.id || 0;
-        def.e[i] = elements[e.id]
-      }else {
-        if(e.name !== "element") {
-          resolveElements(e, elements)
-        }
-      }
-      i += 1
-    }
-  }
-  function main(dom, callback) {
-    var elements = [], grammar = parse(dom && dom.documentElement, elements, undefined), i, e, defines = {};
-    for(i = 0;i < grammar.e.length;i += 1) {
-      e = grammar.e[i];
-      if(e.name === "define") {
-        defines[e.a.name] = e
-      }else {
-        if(e.name === "start") {
-          start = e
-        }
-      }
-    }
-    if(!start) {
-      return[new RelaxNGParseError("No Relax NG start element was found.")]
-    }
-    resolveDefines(start, defines);
-    for(i in defines) {
-      if(defines.hasOwnProperty(i)) {
-        resolveDefines(defines[i], defines)
-      }
-    }
-    for(i = 0;i < elements.length;i += 1) {
-      resolveDefines(elements[i], defines)
-    }
-    if(callback) {
-      self.rootPattern = callback(start.e[0], elements)
-    }
-    resolveElements(start, elements);
-    for(i = 0;i < elements.length;i += 1) {
-      resolveElements(elements[i], elements)
-    }
-    self.start = start;
-    self.elements = elements;
-    self.nsmap = nsmap;
-    return null
-  }
-  this.parseRelaxNGDOM = main
-};
-runtime.loadClass("xmldom.RelaxNGParser");
-xmldom.RelaxNG = function RelaxNG() {
-  var xmlnsns = "http://www.w3.org/2000/xmlns/", createChoice, createInterleave, createGroup, createAfter, createOneOrMore, createValue, createAttribute, createNameClass, createData, makePattern, notAllowed = {type:"notAllowed", nullable:false, hash:"notAllowed", textDeriv:function() {
-    return notAllowed
-  }, startTagOpenDeriv:function() {
-    return notAllowed
-  }, attDeriv:function() {
-    return notAllowed
-  }, startTagCloseDeriv:function() {
-    return notAllowed
-  }, endTagDeriv:function() {
-    return notAllowed
-  }}, empty = {type:"empty", nullable:true, hash:"empty", textDeriv:function() {
-    return notAllowed
-  }, startTagOpenDeriv:function() {
-    return notAllowed
-  }, attDeriv:function(context, attribute) {
-    return notAllowed
-  }, startTagCloseDeriv:function() {
-    return empty
-  }, endTagDeriv:function() {
-    return notAllowed
-  }}, text = {type:"text", nullable:true, hash:"text", textDeriv:function() {
-    return text
-  }, startTagOpenDeriv:function() {
-    return notAllowed
-  }, attDeriv:function() {
-    return notAllowed
-  }, startTagCloseDeriv:function() {
-    return text
-  }, endTagDeriv:function() {
-    return notAllowed
-  }}, applyAfter, childDeriv, rootPattern;
-  function memoize0arg(func) {
-    return function() {
-      var cache;
-      return function() {
-        if(cache === undefined) {
-          cache = func()
-        }
-        return cache
-      }
-    }()
-  }
-  function memoize1arg(type, func) {
-    return function() {
-      var cache = {}, cachecount = 0;
-      return function(a) {
-        var ahash = a.hash || a.toString(), v;
-        v = cache[ahash];
-        if(v !== undefined) {
-          return v
-        }
-        cache[ahash] = v = func(a);
-        v.hash = type + cachecount.toString();
-        cachecount += 1;
-        return v
-      }
-    }()
-  }
-  function memoizeNode(func) {
-    return function() {
-      var cache = {};
-      return function(node) {
-        var v, m;
-        m = cache[node.localName];
-        if(m === undefined) {
-          cache[node.localName] = m = {}
-        }else {
-          v = m[node.namespaceURI];
-          if(v !== undefined) {
-            return v
-          }
-        }
-        m[node.namespaceURI] = v = func(node);
-        return v
-      }
-    }()
-  }
-  function memoize2arg(type, fastfunc, func) {
-    return function() {
-      var cache = {}, cachecount = 0;
-      return function(a, b) {
-        var v = fastfunc && fastfunc(a, b), ahash, bhash, m;
-        if(v !== undefined) {
-          return v
-        }
-        ahash = a.hash || a.toString();
-        bhash = b.hash || b.toString();
-        m = cache[ahash];
-        if(m === undefined) {
-          cache[ahash] = m = {}
-        }else {
-          v = m[bhash];
-          if(v !== undefined) {
-            return v
-          }
-        }
-        m[bhash] = v = func(a, b);
-        v.hash = type + cachecount.toString();
-        cachecount += 1;
-        return v
-      }
-    }()
-  }
-  function unorderedMemoize2arg(type, fastfunc, func) {
-    return function() {
-      var cache = {}, cachecount = 0;
-      return function(a, b) {
-        var v = fastfunc && fastfunc(a, b), ahash, bhash, m;
-        if(v !== undefined) {
-          return v
-        }
-        ahash = a.hash || a.toString();
-        bhash = b.hash || b.toString();
-        if(ahash < bhash) {
-          m = ahash;
-          ahash = bhash;
-          bhash = m;
-          m = a;
-          a = b;
-          b = m
-        }
-        m = cache[ahash];
-        if(m === undefined) {
-          cache[ahash] = m = {}
-        }else {
-          v = m[bhash];
-          if(v !== undefined) {
-            return v
-          }
-        }
-        m[bhash] = v = func(a, b);
-        v.hash = type + cachecount.toString();
-        cachecount += 1;
-        return v
-      }
-    }()
-  }
-  function getUniqueLeaves(leaves, pattern) {
-    if(pattern.p1.type === "choice") {
-      getUniqueLeaves(leaves, pattern.p1)
-    }else {
-      leaves[pattern.p1.hash] = pattern.p1
-    }
-    if(pattern.p2.type === "choice") {
-      getUniqueLeaves(leaves, pattern.p2)
-    }else {
-      leaves[pattern.p2.hash] = pattern.p2
-    }
-  }
-  createChoice = memoize2arg("choice", function(p1, p2) {
-    if(p1 === notAllowed) {
-      return p2
-    }
-    if(p2 === notAllowed) {
-      return p1
-    }
-    if(p1 === p2) {
-      return p1
-    }
-  }, function(p1, p2) {
-    function makeChoice(p1, p2) {
-      return{type:"choice", p1:p1, p2:p2, nullable:p1.nullable || p2.nullable, textDeriv:function(context, text) {
-        return createChoice(p1.textDeriv(context, text), p2.textDeriv(context, text))
-      }, startTagOpenDeriv:memoizeNode(function(node) {
-        return createChoice(p1.startTagOpenDeriv(node), p2.startTagOpenDeriv(node))
-      }), attDeriv:function(context, attribute) {
-        return createChoice(p1.attDeriv(context, attribute), p2.attDeriv(context, attribute))
-      }, startTagCloseDeriv:memoize0arg(function() {
-        return createChoice(p1.startTagCloseDeriv(), p2.startTagCloseDeriv())
-      }), endTagDeriv:memoize0arg(function() {
-        return createChoice(p1.endTagDeriv(), p2.endTagDeriv())
-      })}
-    }
-    var leaves = {}, i;
-    getUniqueLeaves(leaves, {p1:p1, p2:p2});
-    p1 = undefined;
-    p2 = undefined;
-    for(i in leaves) {
-      if(leaves.hasOwnProperty(i)) {
-        if(p1 === undefined) {
-          p1 = leaves[i]
-        }else {
-          if(p2 === undefined) {
-            p2 = leaves[i]
-          }else {
-            p2 = createChoice(p2, leaves[i])
-          }
-        }
-      }
-    }
-    return makeChoice(p1, p2)
-  });
-  createInterleave = unorderedMemoize2arg("interleave", function(p1, p2) {
-    if(p1 === notAllowed || p2 === notAllowed) {
-      return notAllowed
-    }
-    if(p1 === empty) {
-      return p2
-    }
-    if(p2 === empty) {
-      return p1
-    }
-  }, function(p1, p2) {
-    return{type:"interleave", p1:p1, p2:p2, nullable:p1.nullable && p2.nullable, textDeriv:function(context, text) {
-      return createChoice(createInterleave(p1.textDeriv(context, text), p2), createInterleave(p1, p2.textDeriv(context, text)))
-    }, startTagOpenDeriv:memoizeNode(function(node) {
-      return createChoice(applyAfter(function(p) {
-        return createInterleave(p, p2)
-      }, p1.startTagOpenDeriv(node)), applyAfter(function(p) {
-        return createInterleave(p1, p)
-      }, p2.startTagOpenDeriv(node)))
-    }), attDeriv:function(context, attribute) {
-      return createChoice(createInterleave(p1.attDeriv(context, attribute), p2), createInterleave(p1, p2.attDeriv(context, attribute)))
-    }, startTagCloseDeriv:memoize0arg(function() {
-      return createInterleave(p1.startTagCloseDeriv(), p2.startTagCloseDeriv())
-    })}
-  });
-  createGroup = memoize2arg("group", function(p1, p2) {
-    if(p1 === notAllowed || p2 === notAllowed) {
-      return notAllowed
-    }
-    if(p1 === empty) {
-      return p2
-    }
-    if(p2 === empty) {
-      return p1
-    }
-  }, function(p1, p2) {
-    return{type:"group", p1:p1, p2:p2, nullable:p1.nullable && p2.nullable, textDeriv:function(context, text) {
-      var p = createGroup(p1.textDeriv(context, text), p2);
-      if(p1.nullable) {
-        return createChoice(p, p2.textDeriv(context, text))
-      }
-      return p
-    }, startTagOpenDeriv:function(node) {
-      var x = applyAfter(function(p) {
-        return createGroup(p, p2)
-      }, p1.startTagOpenDeriv(node));
-      if(p1.nullable) {
-        return createChoice(x, p2.startTagOpenDeriv(node))
-      }
-      return x
-    }, attDeriv:function(context, attribute) {
-      return createChoice(createGroup(p1.attDeriv(context, attribute), p2), createGroup(p1, p2.attDeriv(context, attribute)))
-    }, startTagCloseDeriv:memoize0arg(function() {
-      return createGroup(p1.startTagCloseDeriv(), p2.startTagCloseDeriv())
-    })}
-  });
-  createAfter = memoize2arg("after", function(p1, p2) {
-    if(p1 === notAllowed || p2 === notAllowed) {
-      return notAllowed
-    }
-  }, function(p1, p2) {
-    return{type:"after", p1:p1, p2:p2, nullable:false, textDeriv:function(context, text) {
-      return createAfter(p1.textDeriv(context, text), p2)
-    }, startTagOpenDeriv:memoizeNode(function(node) {
-      return applyAfter(function(p) {
-        return createAfter(p, p2)
-      }, p1.startTagOpenDeriv(node))
-    }), attDeriv:function(context, attribute) {
-      return createAfter(p1.attDeriv(context, attribute), p2)
-    }, startTagCloseDeriv:memoize0arg(function() {
-      return createAfter(p1.startTagCloseDeriv(), p2)
-    }), endTagDeriv:memoize0arg(function() {
-      return p1.nullable ? p2 : notAllowed
-    })}
-  });
-  createOneOrMore = memoize1arg("oneormore", function(p) {
-    if(p === notAllowed) {
-      return notAllowed
-    }
-    return{type:"oneOrMore", p:p, nullable:p.nullable, textDeriv:function(context, text) {
-      return createGroup(p.textDeriv(context, text), createChoice(this, empty))
-    }, startTagOpenDeriv:function(node) {
-      var oneOrMore = this;
-      return applyAfter(function(pf) {
-        return createGroup(pf, createChoice(oneOrMore, empty))
-      }, p.startTagOpenDeriv(node))
-    }, attDeriv:function(context, attribute) {
-      var oneOrMore = this;
-      return createGroup(p.attDeriv(context, attribute), createChoice(oneOrMore, empty))
-    }, startTagCloseDeriv:memoize0arg(function() {
-      return createOneOrMore(p.startTagCloseDeriv())
-    })}
-  });
-  function createElement(nc, p) {
-    return{type:"element", nc:nc, nullable:false, textDeriv:function() {
-      return notAllowed
-    }, startTagOpenDeriv:function(node) {
-      if(nc.contains(node)) {
-        return createAfter(p, empty)
-      }
-      return notAllowed
-    }, attDeriv:function(context, attribute) {
-      return notAllowed
-    }, startTagCloseDeriv:function() {
-      return this
-    }}
-  }
-  function valueMatch(context, pattern, text) {
-    return pattern.nullable && /^\s+$/.test(text) || pattern.textDeriv(context, text).nullable
-  }
-  createAttribute = memoize2arg("attribute", undefined, function(nc, p) {
-    return{type:"attribute", nullable:false, nc:nc, p:p, attDeriv:function(context, attribute) {
-      if(nc.contains(attribute) && valueMatch(context, p, attribute.nodeValue)) {
-        return empty
-      }
-      return notAllowed
-    }, startTagCloseDeriv:function() {
-      return notAllowed
-    }}
-  });
-  function createList() {
-    return{type:"list", nullable:false, hash:"list", textDeriv:function(context, text) {
-      return empty
-    }}
-  }
-  createValue = memoize1arg("value", function(value) {
-    return{type:"value", nullable:false, value:value, textDeriv:function(context, text) {
-      return text === value ? empty : notAllowed
-    }, attDeriv:function() {
-      return notAllowed
-    }, startTagCloseDeriv:function() {
-      return this
-    }}
-  });
-  createData = memoize1arg("data", function(type) {
-    return{type:"data", nullable:false, dataType:type, textDeriv:function() {
-      return empty
-    }, attDeriv:function() {
-      return notAllowed
-    }, startTagCloseDeriv:function() {
-      return this
-    }}
-  });
-  function createDataExcept() {
-    return{type:"dataExcept", nullable:false, hash:"dataExcept"}
-  }
-  applyAfter = function applyAfter(f, p) {
-    var result;
-    if(p.type === "after") {
-      result = createAfter(p.p1, f(p.p2))
-    }else {
-      if(p.type === "choice") {
-        result = createChoice(applyAfter(f, p.p1), applyAfter(f, p.p2))
-      }else {
-        result = p
-      }
-    }
-    return result
-  };
-  function attsDeriv(context, pattern, attributes, position) {
-    if(pattern === notAllowed) {
-      return notAllowed
-    }
-    if(position >= attributes.length) {
-      return pattern
-    }
-    if(position === 0) {
-      position = 0
-    }
-    var a = attributes.item(position);
-    while(a.namespaceURI === xmlnsns) {
-      position += 1;
-      if(position >= attributes.length) {
-        return pattern
-      }
-      a = attributes.item(position)
-    }
-    a = attsDeriv(context, pattern.attDeriv(context, attributes.item(position)), attributes, position + 1);
-    return a
-  }
-  function childrenDeriv(context, pattern, walker) {
-    var element = walker.currentNode, childNode = walker.firstChild(), numberOfTextNodes = 0, childNodes = [], i, p;
-    while(childNode) {
-      if(childNode.nodeType === 1) {
-        childNodes.push(childNode)
-      }else {
-        if(childNode.nodeType === 3 && !/^\s*$/.test(childNode.nodeValue)) {
-          childNodes.push(childNode.nodeValue);
-          numberOfTextNodes += 1
-        }
-      }
-      childNode = walker.nextSibling()
-    }
-    if(childNodes.length === 0) {
-      childNodes = [""]
-    }
-    p = pattern;
-    for(i = 0;p !== notAllowed && i < childNodes.length;i += 1) {
-      childNode = childNodes[i];
-      if(typeof childNode === "string") {
-        if(/^\s*$/.test(childNode)) {
-          p = createChoice(p, p.textDeriv(context, childNode))
-        }else {
-          p = p.textDeriv(context, childNode)
-        }
-      }else {
-        walker.currentNode = childNode;
-        p = childDeriv(context, p, walker)
-      }
-    }
-    walker.currentNode = element;
-    return p
-  }
-  childDeriv = function childDeriv(context, pattern, walker) {
-    var childNode = walker.currentNode, p;
-    p = pattern.startTagOpenDeriv(childNode);
-    p = attsDeriv(context, p, childNode.attributes, 0);
-    p = p.startTagCloseDeriv();
-    p = childrenDeriv(context, p, walker);
-    p = p.endTagDeriv();
-    return p
-  };
-  function addNames(name, ns, pattern) {
-    if(pattern.e[0].a) {
-      name.push(pattern.e[0].text);
-      ns.push(pattern.e[0].a.ns)
-    }else {
-      addNames(name, ns, pattern.e[0])
-    }
-    if(pattern.e[1].a) {
-      name.push(pattern.e[1].text);
-      ns.push(pattern.e[1].a.ns)
-    }else {
-      addNames(name, ns, pattern.e[1])
-    }
-  }
-  createNameClass = function createNameClass(pattern) {
-    var name, ns, hash, i, result;
-    if(pattern.name === "name") {
-      name = pattern.text;
-      ns = pattern.a.ns;
-      result = {name:name, ns:ns, hash:"{" + ns + "}" + name, contains:function(node) {
-        return node.namespaceURI === ns && node.localName === name
-      }}
-    }else {
-      if(pattern.name === "choice") {
-        name = [];
-        ns = [];
-        addNames(name, ns, pattern);
-        hash = "";
-        for(i = 0;i < name.length;i += 1) {
-          hash += "{" + ns[i] + "}" + name[i] + ","
-        }
-        result = {hash:hash, contains:function(node) {
-          var i;
-          for(i = 0;i < name.length;i += 1) {
-            if(name[i] === node.localName && ns[i] === node.namespaceURI) {
-              return true
-            }
-          }
-          return false
-        }}
-      }else {
-        result = {hash:"anyName", contains:function() {
-          return true
-        }}
-      }
-    }
-    return result
-  };
-  function resolveElement(pattern, elements) {
-    var element, p, i, hash;
-    hash = "element" + pattern.id.toString();
-    p = elements[pattern.id] = {hash:hash};
-    element = createElement(createNameClass(pattern.e[0]), makePattern(pattern.e[1], elements));
-    for(i in element) {
-      if(element.hasOwnProperty(i)) {
-        p[i] = element[i]
-      }
-    }
-    return p
-  }
-  makePattern = function makePattern(pattern, elements) {
-    var p, i;
-    if(pattern.name === "elementref") {
-      p = pattern.id || 0;
-      pattern = elements[p];
-      if(pattern.name !== undefined) {
-        return resolveElement(pattern, elements)
-      }
-      return pattern
-    }
-    switch(pattern.name) {
-      case "empty":
-        return empty;
-      case "notAllowed":
-        return notAllowed;
-      case "text":
-        return text;
-      case "choice":
-        return createChoice(makePattern(pattern.e[0], elements), makePattern(pattern.e[1], elements));
-      case "interleave":
-        p = makePattern(pattern.e[0], elements);
-        for(i = 1;i < pattern.e.length;i += 1) {
-          p = createInterleave(p, makePattern(pattern.e[i], elements))
-        }
-        return p;
-      case "group":
-        return createGroup(makePattern(pattern.e[0], elements), makePattern(pattern.e[1], elements));
-      case "oneOrMore":
-        return createOneOrMore(makePattern(pattern.e[0], elements));
-      case "attribute":
-        return createAttribute(createNameClass(pattern.e[0]), makePattern(pattern.e[1], elements));
-      case "value":
-        return createValue(pattern.text);
-      case "data":
-        p = pattern.a && pattern.a.type;
-        if(p === undefined) {
-          p = ""
-        }
-        return createData(p);
-      case "list":
-        return createList()
-    }
-    throw"No support for " + pattern.name;
-  };
-  this.makePattern = function(pattern, elements) {
-    var copy = {}, i;
-    for(i in elements) {
-      if(elements.hasOwnProperty(i)) {
-        copy[i] = elements[i]
-      }
-    }
-    i = makePattern(pattern, copy);
-    return i
-  };
-  this.validate = function validate(walker, callback) {
-    var errors;
-    walker.currentNode = walker.root;
-    errors = childDeriv(null, rootPattern, walker);
-    if(!errors.nullable) {
-      runtime.log("Error in Relax NG validation: " + errors);
-      callback(["Error in Relax NG validation: " + errors])
-    }else {
-      callback(null)
-    }
-  };
-  this.init = function init(rootPattern1) {
-    rootPattern = rootPattern1
-  }
-};
-runtime.loadClass("xmldom.RelaxNGParser");
-xmldom.RelaxNG2 = function RelaxNG2() {
-  var start, validateNonEmptyPattern, nsmap, depth = 0, p = "                                                                ";
-  function RelaxNGParseError(error, context) {
-    this.message = function() {
-      if(context) {
-        error += context.nodeType === 1 ? " Element " : " Node ";
-        error += context.nodeName;
-        if(context.nodeValue) {
-          error += " with value '" + context.nodeValue + "'"
-        }
-        error += "."
-      }
-      return error
-    }
-  }
-  function validateOneOrMore(elementdef, walker, element) {
-    var node, i = 0, err;
-    do {
-      node = walker.currentNode;
-      err = validateNonEmptyPattern(elementdef.e[0], walker, element);
-      i += 1
-    }while(!err && node !== walker.currentNode);
-    if(i > 1) {
-      walker.currentNode = node;
-      return null
-    }
-    return err
-  }
-  function qName(node) {
-    return nsmap[node.namespaceURI] + ":" + node.localName
-  }
-  function isWhitespace(node) {
-    return node && node.nodeType === 3 && /^\s+$/.test(node.nodeValue)
-  }
-  function validatePattern(elementdef, walker, element, data) {
-    if(elementdef.name === "empty") {
-      return null
-    }
-    return validateNonEmptyPattern(elementdef, walker, element, data)
-  }
-  function validateAttribute(elementdef, walker, element) {
-    if(elementdef.e.length !== 2) {
-      throw"Attribute with wrong # of elements: " + elementdef.e.length;
-    }
-    var att, a, l = elementdef.localnames.length, i;
-    for(i = 0;i < l;i += 1) {
-      a = element.getAttributeNS(elementdef.namespaces[i], elementdef.localnames[i]);
-      if(a === "" && !element.hasAttributeNS(elementdef.namespaces[i], elementdef.localnames[i])) {
-        a = undefined
-      }
-      if(att !== undefined && a !== undefined) {
-        return[new RelaxNGParseError("Attribute defined too often.", element)]
-      }
-      att = a
-    }
-    if(att === undefined) {
-      return[new RelaxNGParseError("Attribute not found: " + elementdef.names, element)]
-    }
-    return validatePattern(elementdef.e[1], walker, element, att)
-  }
-  function validateTop(elementdef, walker, element) {
-    return validatePattern(elementdef, walker, element)
-  }
-  function validateElement(elementdef, walker, element) {
-    if(elementdef.e.length !== 2) {
-      throw"Element with wrong # of elements: " + elementdef.e.length;
-    }
-    depth += 1;
-    var node = walker.currentNode, type = node ? node.nodeType : 0, error = null;
-    while(type > 1) {
-      if(type !== 8 && (type !== 3 || !/^\s+$/.test(walker.currentNode.nodeValue))) {
-        depth -= 1;
-        return[new RelaxNGParseError("Not allowed node of type " + type + ".")]
-      }
-      node = walker.nextSibling();
-      type = node ? node.nodeType : 0
-    }
-    if(!node) {
-      depth -= 1;
-      return[new RelaxNGParseError("Missing element " + elementdef.names)]
-    }
-    if(elementdef.names && elementdef.names.indexOf(qName(node)) === -1) {
-      depth -= 1;
-      return[new RelaxNGParseError("Found " + node.nodeName + " instead of " + elementdef.names + ".", node)]
-    }
-    if(walker.firstChild()) {
-      error = validateTop(elementdef.e[1], walker, node);
-      while(walker.nextSibling()) {
-        type = walker.currentNode.nodeType;
-        if(!isWhitespace(walker.currentNode) && type !== 8) {
-          depth -= 1;
-          return[new RelaxNGParseError("Spurious content.", walker.currentNode)]
-        }
-      }
-      if(walker.parentNode() !== node) {
-        depth -= 1;
-        return[new RelaxNGParseError("Implementation error.")]
-      }
-    }else {
-      error = validateTop(elementdef.e[1], walker, node)
-    }
-    depth -= 1;
-    node = walker.nextSibling();
-    return error
-  }
-  function validateChoice(elementdef, walker, element, data) {
-    if(elementdef.e.length !== 2) {
-      throw"Choice with wrong # of options: " + elementdef.e.length;
-    }
-    var node = walker.currentNode, err;
-    if(elementdef.e[0].name === "empty") {
-      err = validateNonEmptyPattern(elementdef.e[1], walker, element, data);
-      if(err) {
-        walker.currentNode = node
-      }
-      return null
-    }
-    err = validatePattern(elementdef.e[0], walker, element, data);
-    if(err) {
-      walker.currentNode = node;
-      err = validateNonEmptyPattern(elementdef.e[1], walker, element, data)
-    }
-    return err
-  }
-  function validateInterleave(elementdef, walker, element) {
-    var l = elementdef.e.length, n = [l], err, i, todo = l, donethisround, node, subnode, e;
-    while(todo > 0) {
-      donethisround = 0;
-      node = walker.currentNode;
-      for(i = 0;i < l;i += 1) {
-        subnode = walker.currentNode;
-        if(n[i] !== true && n[i] !== subnode) {
-          e = elementdef.e[i];
-          err = validateNonEmptyPattern(e, walker, element);
-          if(err) {
-            walker.currentNode = subnode;
-            if(n[i] === undefined) {
-              n[i] = false
-            }
-          }else {
-            if(subnode === walker.currentNode || e.name === "oneOrMore" || e.name === "choice" && (e.e[0].name === "oneOrMore" || e.e[1].name === "oneOrMore")) {
-              donethisround += 1;
-              n[i] = subnode
-            }else {
-              donethisround += 1;
-              n[i] = true
-            }
-          }
-        }
-      }
-      if(node === walker.currentNode && donethisround === todo) {
-        return null
-      }
-      if(donethisround === 0) {
-        for(i = 0;i < l;i += 1) {
-          if(n[i] === false) {
-            return[new RelaxNGParseError("Interleave does not match.", element)]
-          }
-        }
-        return null
-      }
-      todo = 0;
-      for(i = 0;i < l;i += 1) {
-        if(n[i] !== true) {
-          todo += 1
-        }
-      }
-    }
-    return null
-  }
-  function validateGroup(elementdef, walker, element) {
-    if(elementdef.e.length !== 2) {
-      throw"Group with wrong # of members: " + elementdef.e.length;
-    }
-    return validateNonEmptyPattern(elementdef.e[0], walker, element) || validateNonEmptyPattern(elementdef.e[1], walker, element)
-  }
-  function validateText(elementdef, walker, element) {
-    var node = walker.currentNode, type = node ? node.nodeType : 0, error = null;
-    while(node !== element && type !== 3) {
-      if(type === 1) {
-        return[new RelaxNGParseError("Element not allowed here.", node)]
-      }
-      node = walker.nextSibling();
-      type = node ? node.nodeType : 0
-    }
-    walker.nextSibling();
-    return null
-  }
-  validateNonEmptyPattern = function validateNonEmptyPattern(elementdef, walker, element, data) {
-    var name = elementdef.name, err = null;
-    if(name === "text") {
-      err = validateText(elementdef, walker, element)
-    }else {
-      if(name === "data") {
-        err = null
-      }else {
-        if(name === "value") {
-          if(data !== elementdef.text) {
-            err = [new RelaxNGParseError("Wrong value, should be '" + elementdef.text + "', not '" + data + "'", element)]
-          }
-        }else {
-          if(name === "list") {
-            err = null
-          }else {
-            if(name === "attribute") {
-              err = validateAttribute(elementdef, walker, element)
-            }else {
-              if(name === "element") {
-                err = validateElement(elementdef, walker, element)
-              }else {
-                if(name === "oneOrMore") {
-                  err = validateOneOrMore(elementdef, walker, element)
-                }else {
-                  if(name === "choice") {
-                    err = validateChoice(elementdef, walker, element, data)
-                  }else {
-                    if(name === "group") {
-                      err = validateGroup(elementdef, walker, element)
-                    }else {
-                      if(name === "interleave") {
-                        err = validateInterleave(elementdef, walker, element)
-                      }else {
-                        throw name + " not allowed in nonEmptyPattern.";
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-    return err
-  };
-  this.validate = function validate(walker, callback) {
-    walker.currentNode = walker.root;
-    var errors = validatePattern(start.e[0], walker, walker.root);
-    callback(errors)
-  };
-  this.init = function init(start1, nsmap1) {
-    start = start1;
-    nsmap = nsmap1
-  }
-};
-xmldom.OperationalTransformInterface = function() {
-};
-xmldom.OperationalTransformInterface.prototype.retain = function(amount) {
-};
-xmldom.OperationalTransformInterface.prototype.insertCharacters = function(chars) {
-};
-xmldom.OperationalTransformInterface.prototype.insertElementStart = function(tagname, attributes) {
-};
-xmldom.OperationalTransformInterface.prototype.insertElementEnd = function() {
-};
-xmldom.OperationalTransformInterface.prototype.deleteCharacters = function(amount) {
-};
-xmldom.OperationalTransformInterface.prototype.deleteElementStart = function() {
-};
-xmldom.OperationalTransformInterface.prototype.deleteElementEnd = function() {
-};
-xmldom.OperationalTransformInterface.prototype.replaceAttributes = function(atts) {
-};
-xmldom.OperationalTransformInterface.prototype.updateAttributes = function(atts) {
-};
-xmldom.OperationalTransformDOM = function OperationalTransformDOM(root, serializer) {
-  var pos, length;
-  function retain(amount) {
-  }
-  function insertCharacters(chars) {
-  }
-  function insertElementStart(tagname, attributes) {
-  }
-  function insertElementEnd() {
-  }
-  function deleteCharacters(amount) {
-  }
-  function deleteElementStart() {
-  }
-  function deleteElementEnd() {
-  }
-  function replaceAttributes(atts) {
-  }
-  function updateAttributes(atts) {
-  }
-  function atEnd() {
-    return pos === length
-  }
-  this.retain = retain;
-  this.insertCharacters = insertCharacters;
-  this.insertElementStart = insertElementStart;
-  this.insertElementEnd = insertElementEnd;
-  this.deleteCharacters = deleteCharacters;
-  this.deleteElementStart = deleteElementStart;
-  this.deleteElementEnd = deleteElementEnd;
-  this.replaceAttributes = replaceAttributes;
-  this.updateAttributes = updateAttributes;
-  this.atEnd = atEnd
-};
-xmldom.XPath = function() {
-  var createXPathPathIterator, parsePredicates;
-  function isSmallestPositive(a, b, c) {
-    return a !== -1 && (a < b || b === -1) && (a < c || c === -1)
-  }
-  function parseXPathStep(xpath, pos, end, steps) {
-    var location = "", predicates = [], value, brapos = xpath.indexOf("[", pos), slapos = xpath.indexOf("/", pos), eqpos = xpath.indexOf("=", pos), depth = 0, start = 0;
-    if(isSmallestPositive(slapos, brapos, eqpos)) {
-      location = xpath.substring(pos, slapos);
-      pos = slapos + 1
-    }else {
-      if(isSmallestPositive(brapos, slapos, eqpos)) {
-        location = xpath.substring(pos, brapos);
-        pos = parsePredicates(xpath, brapos, predicates)
-      }else {
-        if(isSmallestPositive(eqpos, slapos, brapos)) {
-          location = xpath.substring(pos, eqpos);
-          pos = eqpos
-        }else {
-          location = xpath.substring(pos, end);
-          pos = end
-        }
-      }
-    }
-    steps.push({location:location, predicates:predicates});
-    return pos
-  }
-  function parseXPath(xpath) {
-    var steps = [], p = 0, end = xpath.length, value;
-    while(p < end) {
-      p = parseXPathStep(xpath, p, end, steps);
-      if(p < end && xpath[p] === "=") {
-        value = xpath.substring(p + 1, end);
-        if(value.length > 2 && (value[0] === "'" || value[0] === '"')) {
-          value = value.slice(1, value.length - 1)
-        }else {
-          try {
-            value = parseInt(value, 10)
-          }catch(e) {
-          }
-        }
-        p = end
-      }
-    }
-    return{steps:steps, value:value}
-  }
-  parsePredicates = function parsePredicates(xpath, start, predicates) {
-    var pos = start, l = xpath.length, selector, depth = 0;
-    while(pos < l) {
-      if(xpath[pos] === "]") {
-        depth -= 1;
-        if(depth <= 0) {
-          predicates.push(parseXPath(xpath.substring(start, pos)))
-        }
-      }else {
-        if(xpath[pos] === "[") {
-          if(depth <= 0) {
-            start = pos + 1
-          }
-          depth += 1
-        }
-      }
-      pos += 1
-    }
-    return pos
-  };
-  function XPathIterator() {
-  }
-  XPathIterator.prototype.next = function() {
-  };
-  XPathIterator.prototype.reset = function() {
-  };
-  function NodeIterator() {
-    var node, done = false;
-    this.setNode = function setNode(n) {
-      node = n
-    };
-    this.reset = function() {
-      done = false
-    };
-    this.next = function next() {
-      var val = done ? null : node;
-      done = true;
-      return val
-    }
-  }
-  function AttributeIterator(it, namespace, localName) {
-    this.reset = function reset() {
-      it.reset()
-    };
-    this.next = function next() {
-      var node = it.next(), attr;
-      while(node) {
-        node = node.getAttributeNodeNS(namespace, localName);
-        if(node) {
-          return node
-        }
-        node = it.next()
-      }
-      return node
-    }
-  }
-  function AllChildElementIterator(it, recurse) {
-    var root = it.next(), node = null;
-    this.reset = function reset() {
-      it.reset();
-      root = it.next();
-      node = null
-    };
-    this.next = function next() {
-      while(root) {
-        if(node) {
-          if(recurse && node.firstChild) {
-            node = node.firstChild
-          }else {
-            while(!node.nextSibling && node !== root) {
-              node = node.parentNode
-            }
-            if(node === root) {
-              root = it.next()
-            }else {
-              node = node.nextSibling
-            }
-          }
-        }else {
-          do {
-            node = root.firstChild;
-            if(!node) {
-              root = it.next()
-            }
-          }while(root && !node)
-        }
-        if(node && node.nodeType === 1) {
-          return node
-        }
-      }
-      return null
-    }
-  }
-  function ConditionIterator(it, condition) {
-    this.reset = function reset() {
-      it.reset()
-    };
-    this.next = function next() {
-      var n = it.next();
-      while(n && !condition(n)) {
-        n = it.next()
-      }
-      return n
-    }
-  }
-  function createNodenameFilter(it, name, namespaceResolver) {
-    var s = name.split(":", 2), namespace = namespaceResolver(s[0]), localName = s[1];
-    return new ConditionIterator(it, function(node) {
-      return node.localName === localName && node.namespaceURI === namespace
-    })
-  }
-  function createPredicateFilteredIterator(it, p, namespaceResolver) {
-    var nit = new NodeIterator, pit = createXPathPathIterator(nit, p, namespaceResolver), value = p.value;
-    if(value === undefined) {
-      return new ConditionIterator(it, function(node) {
-        nit.setNode(node);
-        pit.reset();
-        return pit.next()
-      })
-    }
-    return new ConditionIterator(it, function(node) {
-      nit.setNode(node);
-      pit.reset();
-      var n = pit.next();
-      return n && n.nodeValue === value
-    })
-  }
-  createXPathPathIterator = function createXPathPathIterator(it, xpath, namespaceResolver) {
-    var i, j, step, location, namespace, localName, prefix, p;
-    for(i = 0;i < xpath.steps.length;i += 1) {
-      step = xpath.steps[i];
-      location = step.location;
-      if(location === "") {
-        it = new AllChildElementIterator(it, false)
-      }else {
-        if(location[0] === "@") {
-          p = location.slice(1).split(":", 2);
-          it = new AttributeIterator(it, namespaceResolver(p[0]), p[1])
-        }else {
-          if(location !== ".") {
-            it = new AllChildElementIterator(it, false);
-            if(location.indexOf(":") !== -1) {
-              it = createNodenameFilter(it, location, namespaceResolver)
-            }
-          }
-        }
-      }
-      for(j = 0;j < step.predicates.length;j += 1) {
-        p = step.predicates[j];
-        it = createPredicateFilteredIterator(it, p, namespaceResolver)
-      }
-    }
-    return it
-  };
-  function fallback(node, xpath, namespaceResolver) {
-    var it = new NodeIterator, i, nodelist, parsedXPath, pos;
-    it.setNode(node);
-    parsedXPath = parseXPath(xpath);
-    it = createXPathPathIterator(it, parsedXPath, namespaceResolver);
-    nodelist = [];
-    i = it.next();
-    while(i) {
-      nodelist.push(i);
-      i = it.next()
-    }
-    return nodelist
-  }
-  function getODFElementsWithXPath(node, xpath, namespaceResolver) {
-    var doc = node.ownerDocument, nodes, elements = [], n = null;
-    if(!doc || !doc.evaluate || !n) {
-      elements = fallback(node, xpath, namespaceResolver)
-    }else {
-      nodes = doc.evaluate(xpath, node, namespaceResolver, XPathResult.UNORDERED_NODE_ITERATOR_TYPE, null);
-      n = nodes.iterateNext();
-      while(n !== null) {
-        if(n.nodeType === 1) {
-          elements.push(n)
-        }
-        n = nodes.iterateNext()
-      }
-    }
-    return elements
-  }
-  xmldom.XPath = function XPath() {
-    this.getODFElementsWithXPath = getODFElementsWithXPath
-  };
-  return xmldom.XPath
-}();
-odf.StyleInfo = function StyleInfo() {
-  var chartns = "urn:oasis:names:tc:opendocument:xmlns:chart:1.0", dbns = "urn:oasis:names:tc:opendocument:xmlns:database:1.0", dr3dns = "urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0", drawns = "urn:oasis:names:tc:opendocument:xmlns:drawing:1.0", fons = "urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0", formns = "urn:oasis:names:tc:opendocument:xmlns:form:1.0", numberns = "urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0", officens = "urn:oasis:names:tc:opendocument:xmlns:office:1.0", 
-  presentationns = "urn:oasis:names:tc:opendocument:xmlns:presentation:1.0", stylens = "urn:oasis:names:tc:opendocument:xmlns:style:1.0", svgns = "urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0", tablens = "urn:oasis:names:tc:opendocument:xmlns:table:1.0", textns = "urn:oasis:names:tc:opendocument:xmlns:text:1.0", elementstyles = {"text":[{ens:stylens, en:"tab-stop", ans:stylens, a:"leader-text-style"}, {ens:stylens, en:"drop-cap", ans:stylens, a:"style-name"}, {ens:textns, en:"notes-configuration", 
-  ans:textns, a:"citation-body-style-name"}, {ens:textns, en:"notes-configuration", ans:textns, a:"citation-style-name"}, {ens:textns, en:"a", ans:textns, a:"style-name"}, {ens:textns, en:"alphabetical-index", ans:textns, a:"style-name"}, {ens:textns, en:"linenumbering-configuration", ans:textns, a:"style-name"}, {ens:textns, en:"list-level-style-number", ans:textns, a:"style-name"}, {ens:textns, en:"ruby-text", ans:textns, a:"style-name"}, {ens:textns, en:"span", ans:textns, a:"style-name"}, {ens:textns, 
-  en:"a", ans:textns, a:"visited-style-name"}, {ens:stylens, en:"text-properties", ans:stylens, a:"text-line-through-text-style"}, {ens:textns, en:"alphabetical-index-source", ans:textns, a:"main-entry-style-name"}, {ens:textns, en:"index-entry-bibliography", ans:textns, a:"style-name"}, {ens:textns, en:"index-entry-chapter", ans:textns, a:"style-name"}, {ens:textns, en:"index-entry-link-end", ans:textns, a:"style-name"}, {ens:textns, en:"index-entry-link-start", ans:textns, a:"style-name"}, {ens:textns, 
-  en:"index-entry-page-number", ans:textns, a:"style-name"}, {ens:textns, en:"index-entry-span", ans:textns, a:"style-name"}, {ens:textns, en:"index-entry-tab-stop", ans:textns, a:"style-name"}, {ens:textns, en:"index-entry-text", ans:textns, a:"style-name"}, {ens:textns, en:"index-title-template", ans:textns, a:"style-name"}, {ens:textns, en:"list-level-style-bullet", ans:textns, a:"style-name"}, {ens:textns, en:"outline-level-style", ans:textns, a:"style-name"}], "paragraph":[{ens:drawns, en:"caption", 
-  ans:drawns, a:"text-style-name"}, {ens:drawns, en:"circle", ans:drawns, a:"text-style-name"}, {ens:drawns, en:"connector", ans:drawns, a:"text-style-name"}, {ens:drawns, en:"control", ans:drawns, a:"text-style-name"}, {ens:drawns, en:"custom-shape", ans:drawns, a:"text-style-name"}, {ens:drawns, en:"ellipse", ans:drawns, a:"text-style-name"}, {ens:drawns, en:"frame", ans:drawns, a:"text-style-name"}, {ens:drawns, en:"line", ans:drawns, a:"text-style-name"}, {ens:drawns, en:"measure", ans:drawns, 
-  a:"text-style-name"}, {ens:drawns, en:"path", ans:drawns, a:"text-style-name"}, {ens:drawns, en:"polygon", ans:drawns, a:"text-style-name"}, {ens:drawns, en:"polyline", ans:drawns, a:"text-style-name"}, {ens:drawns, en:"rect", ans:drawns, a:"text-style-name"}, {ens:drawns, en:"regular-polygon", ans:drawns, a:"text-style-name"}, {ens:officens, en:"annotation", ans:drawns, a:"text-style-name"}, {ens:formns, en:"column", ans:formns, a:"text-style-name"}, {ens:stylens, en:"style", ans:stylens, a:"next-style-name"}, 
-  {ens:tablens, en:"body", ans:tablens, a:"paragraph-style-name"}, {ens:tablens, en:"even-columns", ans:tablens, a:"paragraph-style-name"}, {ens:tablens, en:"even-rows", ans:tablens, a:"paragraph-style-name"}, {ens:tablens, en:"first-column", ans:tablens, a:"paragraph-style-name"}, {ens:tablens, en:"first-row", ans:tablens, a:"paragraph-style-name"}, {ens:tablens, en:"last-column", ans:tablens, a:"paragraph-style-name"}, {ens:tablens, en:"last-row", ans:tablens, a:"paragraph-style-name"}, {ens:tablens, 
-  en:"odd-columns", ans:tablens, a:"paragraph-style-name"}, {ens:tablens, en:"odd-rows", ans:tablens, a:"paragraph-style-name"}, {ens:textns, en:"notes-configuration", ans:textns, a:"default-style-name"}, {ens:textns, en:"alphabetical-index-entry-template", ans:textns, a:"style-name"}, {ens:textns, en:"bibliography-entry-template", ans:textns, a:"style-name"}, {ens:textns, en:"h", ans:textns, a:"style-name"}, {ens:textns, en:"illustration-index-entry-template", ans:textns, a:"style-name"}, {ens:textns, 
-  en:"index-source-style", ans:textns, a:"style-name"}, {ens:textns, en:"object-index-entry-template", ans:textns, a:"style-name"}, {ens:textns, en:"p", ans:textns, a:"style-name"}, {ens:textns, en:"table-index-entry-template", ans:textns, a:"style-name"}, {ens:textns, en:"table-of-content-entry-template", ans:textns, a:"style-name"}, {ens:textns, en:"table-index-entry-template", ans:textns, a:"style-name"}, {ens:textns, en:"user-index-entry-template", ans:textns, a:"style-name"}, {ens:stylens, en:"page-layout-properties", 
-  ans:stylens, a:"register-truth-ref-style-name"}], "chart":[{ens:chartns, en:"axis", ans:chartns, a:"style-name"}, {ens:chartns, en:"chart", ans:chartns, a:"style-name"}, {ens:chartns, en:"data-label", ans:chartns, a:"style-name"}, {ens:chartns, en:"data-point", ans:chartns, a:"style-name"}, {ens:chartns, en:"equation", ans:chartns, a:"style-name"}, {ens:chartns, en:"error-indicator", ans:chartns, a:"style-name"}, {ens:chartns, en:"floor", ans:chartns, a:"style-name"}, {ens:chartns, en:"footer", 
-  ans:chartns, a:"style-name"}, {ens:chartns, en:"grid", ans:chartns, a:"style-name"}, {ens:chartns, en:"legend", ans:chartns, a:"style-name"}, {ens:chartns, en:"mean-value", ans:chartns, a:"style-name"}, {ens:chartns, en:"plot-area", ans:chartns, a:"style-name"}, {ens:chartns, en:"regression-curve", ans:chartns, a:"style-name"}, {ens:chartns, en:"series", ans:chartns, a:"style-name"}, {ens:chartns, en:"stock-gain-marker", ans:chartns, a:"style-name"}, {ens:chartns, en:"stock-loss-marker", ans:chartns, 
-  a:"style-name"}, {ens:chartns, en:"stock-range-line", ans:chartns, a:"style-name"}, {ens:chartns, en:"subtitle", ans:chartns, a:"style-name"}, {ens:chartns, en:"title", ans:chartns, a:"style-name"}, {ens:chartns, en:"wall", ans:chartns, a:"style-name"}], "section":[{ens:textns, en:"alphabetical-index", ans:textns, a:"style-name"}, {ens:textns, en:"bibliography", ans:textns, a:"style-name"}, {ens:textns, en:"illustration-index", ans:textns, a:"style-name"}, {ens:textns, en:"index-title", ans:textns, 
-  a:"style-name"}, {ens:textns, en:"object-index", ans:textns, a:"style-name"}, {ens:textns, en:"section", ans:textns, a:"style-name"}, {ens:textns, en:"table-of-content", ans:textns, a:"style-name"}, {ens:textns, en:"table-index", ans:textns, a:"style-name"}, {ens:textns, en:"user-index", ans:textns, a:"style-name"}], "ruby":[{ens:textns, en:"ruby", ans:textns, a:"style-name"}], "table":[{ens:dbns, en:"query", ans:dbns, a:"style-name"}, {ens:dbns, en:"table-representation", ans:dbns, a:"style-name"}, 
-  {ens:tablens, en:"background", ans:tablens, a:"style-name"}, {ens:tablens, en:"table", ans:tablens, a:"style-name"}], "table-column":[{ens:dbns, en:"column", ans:dbns, a:"style-name"}, {ens:tablens, en:"table-column", ans:tablens, a:"style-name"}], "table-row":[{ens:dbns, en:"query", ans:dbns, a:"default-row-style-name"}, {ens:dbns, en:"table-representation", ans:dbns, a:"default-row-style-name"}, {ens:tablens, en:"table-row", ans:tablens, a:"style-name"}], "table-cell":[{ens:dbns, en:"column", 
-  ans:dbns, a:"default-cell-style-name"}, {ens:tablens, en:"table-column", ans:tablens, a:"default-cell-style-name"}, {ens:tablens, en:"table-row", ans:tablens, a:"default-cell-style-name"}, {ens:tablens, en:"body", ans:tablens, a:"style-name"}, {ens:tablens, en:"covered-table-cell", ans:tablens, a:"style-name"}, {ens:tablens, en:"even-columns", ans:tablens, a:"style-name"}, {ens:tablens, en:"covered-table-cell", ans:tablens, a:"style-name"}, {ens:tablens, en:"even-columns", ans:tablens, a:"style-name"}, 
-  {ens:tablens, en:"even-rows", ans:tablens, a:"style-name"}, {ens:tablens, en:"first-column", ans:tablens, a:"style-name"}, {ens:tablens, en:"first-row", ans:tablens, a:"style-name"}, {ens:tablens, en:"last-column", ans:tablens, a:"style-name"}, {ens:tablens, en:"last-row", ans:tablens, a:"style-name"}, {ens:tablens, en:"odd-columns", ans:tablens, a:"style-name"}, {ens:tablens, en:"odd-rows", ans:tablens, a:"style-name"}, {ens:tablens, en:"table-cell", ans:tablens, a:"style-name"}], "graphic":[{ens:dr3dns, 
-  en:"cube", ans:drawns, a:"style-name"}, {ens:dr3dns, en:"extrude", ans:drawns, a:"style-name"}, {ens:dr3dns, en:"rotate", ans:drawns, a:"style-name"}, {ens:dr3dns, en:"scene", ans:drawns, a:"style-name"}, {ens:dr3dns, en:"sphere", ans:drawns, a:"style-name"}, {ens:drawns, en:"caption", ans:drawns, a:"style-name"}, {ens:drawns, en:"circle", ans:drawns, a:"style-name"}, {ens:drawns, en:"connector", ans:drawns, a:"style-name"}, {ens:drawns, en:"control", ans:drawns, a:"style-name"}, {ens:drawns, en:"custom-shape", 
-  ans:drawns, a:"style-name"}, {ens:drawns, en:"ellipse", ans:drawns, a:"style-name"}, {ens:drawns, en:"frame", ans:drawns, a:"style-name"}, {ens:drawns, en:"g", ans:drawns, a:"style-name"}, {ens:drawns, en:"line", ans:drawns, a:"style-name"}, {ens:drawns, en:"measure", ans:drawns, a:"style-name"}, {ens:drawns, en:"page-thumbnail", ans:drawns, a:"style-name"}, {ens:drawns, en:"path", ans:drawns, a:"style-name"}, {ens:drawns, en:"polygon", ans:drawns, a:"style-name"}, {ens:drawns, en:"polyline", ans:drawns, 
-  a:"style-name"}, {ens:drawns, en:"rect", ans:drawns, a:"style-name"}, {ens:drawns, en:"regular-polygon", ans:drawns, a:"style-name"}, {ens:officens, en:"annotation", ans:drawns, a:"style-name"}], "presentation":[{ens:dr3dns, en:"cube", ans:presentationns, a:"style-name"}, {ens:dr3dns, en:"extrude", ans:presentationns, a:"style-name"}, {ens:dr3dns, en:"rotate", ans:presentationns, a:"style-name"}, {ens:dr3dns, en:"scene", ans:presentationns, a:"style-name"}, {ens:dr3dns, en:"sphere", ans:presentationns, 
-  a:"style-name"}, {ens:drawns, en:"caption", ans:presentationns, a:"style-name"}, {ens:drawns, en:"circle", ans:presentationns, a:"style-name"}, {ens:drawns, en:"connector", ans:presentationns, a:"style-name"}, {ens:drawns, en:"control", ans:presentationns, a:"style-name"}, {ens:drawns, en:"custom-shape", ans:presentationns, a:"style-name"}, {ens:drawns, en:"ellipse", ans:presentationns, a:"style-name"}, {ens:drawns, en:"frame", ans:presentationns, a:"style-name"}, {ens:drawns, en:"g", ans:presentationns, 
-  a:"style-name"}, {ens:drawns, en:"line", ans:presentationns, a:"style-name"}, {ens:drawns, en:"measure", ans:presentationns, a:"style-name"}, {ens:drawns, en:"page-thumbnail", ans:presentationns, a:"style-name"}, {ens:drawns, en:"path", ans:presentationns, a:"style-name"}, {ens:drawns, en:"polygon", ans:presentationns, a:"style-name"}, {ens:drawns, en:"polyline", ans:presentationns, a:"style-name"}, {ens:drawns, en:"rect", ans:presentationns, a:"style-name"}, {ens:drawns, en:"regular-polygon", 
-  ans:presentationns, a:"style-name"}, {ens:officens, en:"annotation", ans:presentationns, a:"style-name"}], "drawing-page":[{ens:drawns, en:"page", ans:drawns, a:"style-name"}, {ens:presentationns, en:"notes", ans:drawns, a:"style-name"}, {ens:stylens, en:"handout-master", ans:drawns, a:"style-name"}, {ens:stylens, en:"master-page", ans:drawns, a:"style-name"}], "list-style":[{ens:textns, en:"list", ans:textns, a:"style-name"}, {ens:textns, en:"numbered-paragraph", ans:textns, a:"style-name"}, {ens:textns, 
-  en:"list-item", ans:textns, a:"style-override"}, {ens:stylens, en:"style", ans:stylens, a:"list-style-name"}, {ens:stylens, en:"style", ans:stylens, a:"data-style-name"}, {ens:stylens, en:"style", ans:stylens, a:"percentage-data-style-name"}, {ens:presentationns, en:"date-time-decl", ans:stylens, a:"data-style-name"}, {ens:textns, en:"creation-date", ans:stylens, a:"data-style-name"}, {ens:textns, en:"creation-time", ans:stylens, a:"data-style-name"}, {ens:textns, en:"database-display", ans:stylens, 
-  a:"data-style-name"}, {ens:textns, en:"date", ans:stylens, a:"data-style-name"}, {ens:textns, en:"editing-duration", ans:stylens, a:"data-style-name"}, {ens:textns, en:"expression", ans:stylens, a:"data-style-name"}, {ens:textns, en:"meta-field", ans:stylens, a:"data-style-name"}, {ens:textns, en:"modification-date", ans:stylens, a:"data-style-name"}, {ens:textns, en:"modification-time", ans:stylens, a:"data-style-name"}, {ens:textns, en:"print-date", ans:stylens, a:"data-style-name"}, {ens:textns, 
-  en:"print-time", ans:stylens, a:"data-style-name"}, {ens:textns, en:"table-formula", ans:stylens, a:"data-style-name"}, {ens:textns, en:"time", ans:stylens, a:"data-style-name"}, {ens:textns, en:"user-defined", ans:stylens, a:"data-style-name"}, {ens:textns, en:"user-field-get", ans:stylens, a:"data-style-name"}, {ens:textns, en:"user-field-input", ans:stylens, a:"data-style-name"}, {ens:textns, en:"variable-get", ans:stylens, a:"data-style-name"}, {ens:textns, en:"variable-input", ans:stylens, 
-  a:"data-style-name"}, {ens:textns, en:"variable-set", ans:stylens, a:"data-style-name"}], "data":[{ens:stylens, en:"style", ans:stylens, a:"data-style-name"}, {ens:stylens, en:"style", ans:stylens, a:"percentage-data-style-name"}, {ens:presentationns, en:"date-time-decl", ans:stylens, a:"data-style-name"}, {ens:textns, en:"creation-date", ans:stylens, a:"data-style-name"}, {ens:textns, en:"creation-time", ans:stylens, a:"data-style-name"}, {ens:textns, en:"database-display", ans:stylens, a:"data-style-name"}, 
-  {ens:textns, en:"date", ans:stylens, a:"data-style-name"}, {ens:textns, en:"editing-duration", ans:stylens, a:"data-style-name"}, {ens:textns, en:"expression", ans:stylens, a:"data-style-name"}, {ens:textns, en:"meta-field", ans:stylens, a:"data-style-name"}, {ens:textns, en:"modification-date", ans:stylens, a:"data-style-name"}, {ens:textns, en:"modification-time", ans:stylens, a:"data-style-name"}, {ens:textns, en:"print-date", ans:stylens, a:"data-style-name"}, {ens:textns, en:"print-time", 
-  ans:stylens, a:"data-style-name"}, {ens:textns, en:"table-formula", ans:stylens, a:"data-style-name"}, {ens:textns, en:"time", ans:stylens, a:"data-style-name"}, {ens:textns, en:"user-defined", ans:stylens, a:"data-style-name"}, {ens:textns, en:"user-field-get", ans:stylens, a:"data-style-name"}, {ens:textns, en:"user-field-input", ans:stylens, a:"data-style-name"}, {ens:textns, en:"variable-get", ans:stylens, a:"data-style-name"}, {ens:textns, en:"variable-input", ans:stylens, a:"data-style-name"}, 
-  {ens:textns, en:"variable-set", ans:stylens, a:"data-style-name"}], "page-layout":[{ens:presentationns, en:"notes", ans:stylens, a:"page-layout-name"}, {ens:stylens, en:"handout-master", ans:stylens, a:"page-layout-name"}, {ens:stylens, en:"master-page", ans:stylens, a:"page-layout-name"}]}, elements;
-  function canElementHaveStyle(family, element) {
-    var elname = elements[element.localName], elns = elname && elname[element.namespaceURI], length = elns ? elns.length : 0, i;
-    return elns && elns.length > 0
-  }
-  function getStyleRef(family, element) {
-    var elname = elements[element.localName], elns = elname && elname[element.namespaceURI], length = elns ? elns.length : 0, i, attr;
-    for(i = 0;i < length;i += 1) {
-      attr = element.getAttributeNS(elns[i].ns, elns[i].localname)
-    }
-    return null
-  }
-  function getUsedStylesForAutomatic(element, keys) {
-    var elname = elements[element.localName], elns = elname && elname[element.namespaceURI], length = elns ? elns.length : 0, i, attr, group, map, e;
-    for(i = 0;i < length;i += 1) {
-      attr = element.getAttributeNS(elns[i].ns, elns[i].localname);
-      if(attr) {
-        group = elns[i].keygroup;
-        map = keys[group];
-        if(!map) {
-          map = keys[group] = {}
-        }
-        map[attr] = 1
-      }
-    }
-    i = element.firstChild;
-    while(i) {
-      if(i.nodeType === 1) {
-        e = i;
-        getUsedStylesForAutomatic(e, keys)
-      }
-      i = i.nextSibling
-    }
-  }
-  function inverse(elementstyles) {
-    var keyname, i, list, item, l, elements = {}, map, array;
-    for(keyname in elementstyles) {
-      if(elementstyles.hasOwnProperty(keyname)) {
-        list = elementstyles[keyname];
-        l = list.length;
-        for(i = 0;i < l;i += 1) {
-          item = list[i];
-          map = elements[item.en] = elements[item.en] || {};
-          array = map[item.ens] = map[item.ens] || [];
-          array.push({ns:item.ans, localname:item.a, keygroup:keyname})
-        }
-      }
-    }
-    return elements
-  }
-  this.UsedKeysList = function(element) {
-    var usedKeys = {};
-    this.uses = function(element) {
-      var localName = element.localName, name = element.getAttributeNS(drawns, "name") || element.getAttributeNS(stylens, "name"), keyName, map;
-      if(localName === "style") {
-        keyName = element.getAttributeNS(stylens, "family")
-      }else {
-        if(element.namespaceURI === numberns) {
-          keyName = "data"
-        }else {
-          keyName = localName
-        }
-      }
-      map = usedKeys[keyName];
-      return map ? map[name] > 0 : false
-    };
-    getUsedStylesForAutomatic(element, usedKeys)
-  };
-  this.canElementHaveStyle = canElementHaveStyle;
-  elements = inverse(elementstyles)
-};
-odf.Style2CSS = function Style2CSS() {
-  var xlinkns = "http://www.w3.org/1999/xlink", drawns = "urn:oasis:names:tc:opendocument:xmlns:drawing:1.0", fons = "urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0", officens = "urn:oasis:names:tc:opendocument:xmlns:office:1.0", presentationns = "urn:oasis:names:tc:opendocument:xmlns:presentation:1.0", stylens = "urn:oasis:names:tc:opendocument:xmlns:style:1.0", svgns = "urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0", tablens = "urn:oasis:names:tc:opendocument:xmlns:table:1.0", 
-  textns = "urn:oasis:names:tc:opendocument:xmlns:text:1.0", namespaces = {"draw":drawns, "fo":fons, "office":officens, "presentation":presentationns, "style":stylens, "svg":svgns, "table":tablens, "text":textns, "xlink":xlinkns}, familynamespaceprefixes = {"graphic":"draw", "paragraph":"text", "presentation":"presentation", "ruby":"text", "section":"text", "table":"table", "table-cell":"table", "table-column":"table", "table-row":"table", "text":"text", "list":"text"}, familytagnames = {"graphic":["circle", 
-  "connected", "control", "custom-shape", "ellipse", "frame", "g", "line", "measure", "page", "page-thumbnail", "path", "polygon", "polyline", "rect", "regular-polygon"], "paragraph":["alphabetical-index-entry-template", "h", "illustration-index-entry-template", "index-source-style", "object-index-entry-template", "p", "table-index-entry-template", "table-of-content-entry-template", "user-index-entry-template"], "presentation":["caption", "circle", "connector", "control", "custom-shape", "ellipse", 
-  "frame", "g", "line", "measure", "page-thumbnail", "path", "polygon", "polyline", "rect", "regular-polygon"], "ruby":["ruby", "ruby-text"], "section":["alphabetical-index", "bibliography", "illustration-index", "index-title", "object-index", "section", "table-of-content", "table-index", "user-index"], "table":["background", "table"], "table-cell":["body", "covered-table-cell", "even-columns", "even-rows", "first-column", "first-row", "last-column", "last-row", "odd-columns", "odd-rows", "table-cell"], 
-  "table-column":["table-column"], "table-row":["table-row"], "text":["a", "index-entry-chapter", "index-entry-link-end", "index-entry-link-start", "index-entry-page-number", "index-entry-span", "index-entry-tab-stop", "index-entry-text", "index-title-template", "linenumbering-configuration", "list-level-style-number", "list-level-style-bullet", "outline-level-style", "span"], "list":["list-item"]}, textPropertySimpleMapping = [[fons, "color", "color"], [fons, "background-color", "background-color"], 
-  [fons, "font-weight", "font-weight"], [fons, "font-style", "font-style"], [fons, "font-size", "font-size"]], bgImageSimpleMapping = [[stylens, "repeat", "background-repeat"]], paragraphPropertySimpleMapping = [[fons, "background-color", "background-color"], [fons, "text-align", "text-align"], [fons, "padding-left", "padding-left"], [fons, "padding-right", "padding-right"], [fons, "padding-top", "padding-top"], [fons, "padding-bottom", "padding-bottom"], [fons, "border-left", "border-left"], [fons, 
-  "border-right", "border-right"], [fons, "border-top", "border-top"], [fons, "border-bottom", "border-bottom"], [fons, "margin-left", "margin-left"], [fons, "margin-right", "margin-right"], [fons, "margin-top", "margin-top"], [fons, "margin-bottom", "margin-bottom"], [fons, "border", "border"]], graphicPropertySimpleMapping = [[drawns, "fill-color", "background-color"], [drawns, "fill", "background"], [fons, "min-height", "min-height"], [drawns, "stroke", "border"], [svgns, "stroke-color", "border-color"]], 
-  tablecellPropertySimpleMapping = [[fons, "background-color", "background-color"], [fons, "border-left", "border-left"], [fons, "border-right", "border-right"], [fons, "border-top", "border-top"], [fons, "border-bottom", "border-bottom"]];
-  function namespaceResolver(prefix) {
-    return namespaces[prefix] || null
-  }
-  function getStyleMap(doc, stylesnode) {
-    var stylemap = {}, node, name, family, map;
-    if(!stylesnode) {
-      return stylemap
-    }
-    node = stylesnode.firstChild;
-    while(node) {
-      if(node.namespaceURI === stylens && node.localName === "style") {
-        family = node.getAttributeNS(stylens, "family")
-      }else {
-        if(node.namespaceURI === textns && node.localName === "list-style") {
-          family = "list"
-        }
-      }
-      name = family && node.getAttributeNS && node.getAttributeNS(stylens, "name");
-      if(name) {
-        if(!stylemap[family]) {
-          stylemap[family] = {}
-        }
-        stylemap[family][name] = node
-      }
-      node = node.nextSibling
-    }
-    return stylemap
-  }
-  function findStyle(stylestree, name) {
-    if(!name || !stylestree) {
-      return null
-    }
-    if(stylestree[name]) {
-      return stylestree[name]
-    }
-    var derivedStyles = stylestree.derivedStyles, n, style;
-    for(n in stylestree) {
-      if(stylestree.hasOwnProperty(n)) {
-        style = findStyle(stylestree[n].derivedStyles, name);
-        if(style) {
-          return style
-        }
-      }
-    }
-    return null
-  }
-  function addStyleToStyleTree(stylename, stylesmap, stylestree) {
-    var style = stylesmap[stylename], parentname, parentstyle;
-    if(!style) {
-      return
-    }
-    parentname = style.getAttributeNS(stylens, "parent-style-name");
-    parentstyle = null;
-    if(parentname) {
-      parentstyle = findStyle(stylestree, parentname);
-      if(!parentstyle && stylesmap[parentname]) {
-        addStyleToStyleTree(parentname, stylesmap, stylestree);
-        parentstyle = stylesmap[parentname];
-        stylesmap[parentname] = null
-      }
-    }
-    if(parentstyle) {
-      if(!parentstyle.derivedStyles) {
-        parentstyle.derivedStyles = {}
-      }
-      parentstyle.derivedStyles[stylename] = style
-    }else {
-      stylestree[stylename] = style
-    }
-  }
-  function addStyleMapToStyleTree(stylesmap, stylestree) {
-    var name;
-    for(name in stylesmap) {
-      if(stylesmap.hasOwnProperty(name)) {
-        addStyleToStyleTree(name, stylesmap, stylestree);
-        stylesmap[name] = null
-      }
-    }
-  }
-  function createSelector(family, name) {
-    var prefix = familynamespaceprefixes[family], namepart, selector = "", first = true;
-    if(prefix === null) {
-      return null
-    }
-    namepart = "[" + prefix + '|style-name="' + name + '"]';
-    if(prefix === "presentation") {
-      prefix = "draw";
-      namepart = '[presentation|style-name="' + name + '"]'
-    }
-    return prefix + "|" + familytagnames[family].join(namepart + "," + prefix + "|") + namepart
-  }
-  function getSelectors(family, name, node) {
-    var selectors = [], n, ss, s;
-    selectors.push(createSelector(family, name));
-    for(n in node.derivedStyles) {
-      if(node.derivedStyles.hasOwnProperty(n)) {
-        ss = getSelectors(family, n, node.derivedStyles[n]);
-        for(s in ss) {
-          if(ss.hasOwnProperty(s)) {
-            selectors.push(ss[s])
-          }
-        }
-      }
-    }
-    return selectors
-  }
-  function getDirectChild(node, ns, name) {
-    if(!node) {
-      return null
-    }
-    var c = node.firstChild, e;
-    while(c) {
-      if(c.namespaceURI === ns && c.localName === name) {
-        e = c;
-        return e
-      }
-      c = c.nextSibling
-    }
-    return null
-  }
-  function applySimpleMapping(props, mapping) {
-    var rule = "", r, value;
-    for(r in mapping) {
-      if(mapping.hasOwnProperty(r)) {
-        r = mapping[r];
-        value = props.getAttributeNS(r[0], r[1]);
-        if(value) {
-          rule += r[2] + ":" + value + ";"
-        }
-      }
-    }
-    return rule
-  }
-  function getFontDeclaration(name) {
-    return'"' + name + '"'
-  }
-  function getTextProperties(props) {
-    var rule = "", value;
-    rule += applySimpleMapping(props, textPropertySimpleMapping);
-    value = props.getAttributeNS(stylens, "text-underline-style");
-    if(value === "solid") {
-      rule += "text-decoration: underline;"
-    }
-    value = props.getAttributeNS(stylens, "font-name");
-    if(value) {
-      value = getFontDeclaration(value);
-      if(value) {
-        rule += "font-family: " + value + ";"
-      }
-    }
-    return rule
-  }
-  function getParagraphProperties(props) {
-    var rule = "", imageProps, url, element;
-    rule += applySimpleMapping(props, paragraphPropertySimpleMapping);
-    imageProps = props.getElementsByTagNameNS(stylens, "background-image");
-    if(imageProps.length > 0) {
-      url = imageProps.item(0).getAttributeNS(xlinkns, "href");
-      if(url) {
-        rule += "background-image: url('odfkit:" + url + "');";
-        element = imageProps.item(0);
-        rule += applySimpleMapping(element, bgImageSimpleMapping)
-      }
-    }
-    return rule
-  }
-  function getGraphicProperties(props) {
-    var rule = "";
-    rule += applySimpleMapping(props, graphicPropertySimpleMapping);
-    return rule
-  }
-  function getTableCellProperties(props) {
-    var rule = "";
-    rule += applySimpleMapping(props, tablecellPropertySimpleMapping);
-    return rule
-  }
-  function addStyleRule(sheet, family, name, node) {
-    var selectors = getSelectors(family, name, node), selector = selectors.join(","), rule = "", properties = getDirectChild(node, stylens, "text-properties");
-    if(properties) {
-      rule += getTextProperties(properties)
-    }
-    properties = getDirectChild(node, stylens, "paragraph-properties");
-    if(properties) {
-      rule += getParagraphProperties(properties)
-    }
-    properties = getDirectChild(node, stylens, "graphic-properties");
-    if(properties) {
-      rule += getGraphicProperties(properties)
-    }
-    properties = getDirectChild(node, stylens, "table-cell-properties");
-    if(properties) {
-      rule += getTableCellProperties(properties)
-    }
-    if(rule.length === 0) {
-      return
-    }
-    rule = selector + "{" + rule + "}";
-    try {
-      sheet.insertRule(rule, sheet.cssRules.length)
-    }catch(e) {
-      throw e;
-    }
-  }
-  function getNumberRule(node) {
-    var style = node.getAttributeNS(stylens, "num-format"), suffix = node.getAttributeNS(stylens, "num-suffix"), prefix = node.getAttributeNS(stylens, "num-prefix"), rule = "", stylemap = {1:"decimal", "a":"lower-latin", "A":"upper-latin", "i":"lower-roman", "I":"upper-roman"}, content = "";
-    content = prefix || "";
-    if(stylemap.hasOwnProperty(style)) {
-      content += " counter(list, " + stylemap[style] + ")"
-    }else {
-      if(style) {
-        content += "'" + style + "';"
-      }else {
-        content += " ''"
-      }
-    }
-    if(suffix) {
-      content += " '" + suffix + "'"
-    }
-    rule = "content: " + content + ";";
-    return rule
-  }
-  function getImageRule(node) {
-    var rule = "content: none;";
-    return rule
-  }
-  function getBulletRule(node) {
-    var rule = "", bulletChar = node.getAttributeNS(textns, "bullet-char");
-    return"content: '" + bulletChar + "';"
-  }
-  function addListStyleRule(sheet, name, node, itemrule) {
-    var selector = 'text|list[text|style-name="' + name + '"]', level = node.getAttributeNS(textns, "level"), rule = "";
-    level = level && parseInt(level, 10);
-    while(level > 1) {
-      selector += " > text|list-item > text|list";
-      level -= 1
-    }
-    selector += " > list-item:before";
-    rule = itemrule;
-    rule = selector + "{" + rule + "}";
-    try {
-      sheet.insertRule(rule, sheet.cssRules.length)
-    }catch(e) {
-      throw e;
-    }
-  }
-  function addListStyleRules(sheet, name, node) {
-    var n = node.firstChild, e, itemrule;
-    while(n) {
-      if(n.namespaceURI === textns) {
-        e = n;
-        if(n.localName === "list-level-style-number") {
-          itemrule = getNumberRule(e);
-          addListStyleRule(sheet, name, e, itemrule)
-        }else {
-          if(n.localName === "list-level-style-image") {
-            itemrule = getImageRule(e);
-            addListStyleRule(sheet, name, e, itemrule)
-          }else {
-            if(n.localName === "list-level-style-bullet") {
-              itemrule = getBulletRule(e);
-              addListStyleRule(sheet, name, e, itemrule)
-            }
-          }
-        }
-      }
-      n = n.nextSibling
-    }
-  }
-  function addRule(sheet, family, name, node) {
-    if(family === "list") {
-      addListStyleRules(sheet, name, node)
-    }else {
-      addStyleRule(sheet, family, name, node)
-    }
-  }
-  function addRules(sheet, family, name, node) {
-    addRule(sheet, family, name, node);
-    var n;
-    for(n in node.derivedStyles) {
-      if(node.derivedStyles.hasOwnProperty(n)) {
-        addRules(sheet, family, n, node.derivedStyles[n])
-      }
-    }
-  }
-  this.namespaces = namespaces;
-  this.namespaceResolver = namespaceResolver;
-  this.namespaceResolver.lookupNamespaceURI = this.namespaceResolver;
-  this.style2css = function(stylesheet, styles, autostyles) {
-    var doc, prefix, styletree, tree, name, rule, family, stylenodes, styleautonodes;
-    while(stylesheet.cssRules.length) {
-      stylesheet.deleteRule(stylesheet.cssRules.length - 1)
-    }
-    doc = null;
-    if(styles) {
-      doc = styles.ownerDocument
-    }
-    if(autostyles) {
-      doc = autostyles.ownerDocument
-    }
-    if(!doc) {
-      return
-    }
-    for(prefix in namespaces) {
-      if(namespaces.hasOwnProperty(prefix)) {
-        rule = "@namespace " + prefix + " url(" + namespaces[prefix] + ");";
-        try {
-          stylesheet.insertRule(rule, stylesheet.cssRules.length)
-        }catch(e) {
-        }
-      }
-    }
-    stylenodes = getStyleMap(doc, styles);
-    styleautonodes = getStyleMap(doc, autostyles);
-    styletree = {};
-    for(family in familynamespaceprefixes) {
-      if(familynamespaceprefixes.hasOwnProperty(family)) {
-        tree = styletree[family] = {};
-        addStyleMapToStyleTree(stylenodes[family], tree);
-        addStyleMapToStyleTree(styleautonodes[family], tree);
-        for(name in tree) {
-          if(tree.hasOwnProperty(name)) {
-            addRules(stylesheet, family, name, tree[name])
-          }
-        }
-      }
-    }
-  }
-};
-runtime.loadClass("core.Base64");
-runtime.loadClass("xmldom.XPath");
-runtime.loadClass("odf.Style2CSS");
-odf.FontLoader = function() {
-  var style2CSS = new odf.Style2CSS, xpath = new xmldom.XPath, base64 = new core.Base64;
-  function getEmbeddedFontDeclarations(fontFaceDecls) {
-    var decls = {}, fonts, i, font, name, uris, href;
-    if(!fontFaceDecls) {
-      return decls
-    }
-    fonts = xpath.getODFElementsWithXPath(fontFaceDecls, "style:font-face[svg:font-face-src]", style2CSS.namespaceResolver);
-    for(i = 0;i < fonts.length;i += 1) {
-      font = fonts[i];
-      name = font.getAttributeNS(style2CSS.namespaces["style"], "name");
-      uris = xpath.getODFElementsWithXPath(font, "svg:font-face-src/svg:font-face-uri", style2CSS.namespaceResolver);
-      if(uris.length > 0) {
-        href = uris[0].getAttributeNS(style2CSS.namespaces["xlink"], "href");
-        decls[name] = {href:href}
-      }
-    }
-    return decls
-  }
-  function addFontToCSS(name, font, fontdata, stylesheet) {
-    stylesheet = document.styleSheets[0];
-    var rule = '@font-face { font-family: "' + name + '"; src: ' + "url(data:application/x-font-ttf;charset=binary;base64," + base64.convertUTF8ArrayToBase64(fontdata) + ') format("truetype"); }';
-    try {
-      stylesheet.insertRule(rule, stylesheet.cssRules.length)
-    }catch(e) {
-      runtime.log("Problem inserting rule in CSS: " + rule)
-    }
-  }
-  function loadFontIntoCSS(embeddedFontDeclarations, zip, pos, stylesheet, callback) {
-    var name, i = 0, n;
-    for(n in embeddedFontDeclarations) {
-      if(embeddedFontDeclarations.hasOwnProperty(n)) {
-        if(i === pos) {
-          name = n
-        }
-        i += 1
-      }
-    }
-    if(!name) {
-      return callback()
-    }
-    zip.load(embeddedFontDeclarations[name].href, function(err, fontdata) {
-      if(err) {
-        runtime.log(err)
-      }else {
-        addFontToCSS(name, embeddedFontDeclarations[name], fontdata, stylesheet)
-      }
-      return loadFontIntoCSS(embeddedFontDeclarations, zip, pos + 1, stylesheet, callback)
-    })
-  }
-  function loadFontsIntoCSS(embeddedFontDeclarations, zip, stylesheet) {
-    loadFontIntoCSS(embeddedFontDeclarations, zip, 0, stylesheet, function() {
-    })
-  }
-  odf.FontLoader = function FontLoader() {
-    var self = this;
-    this.loadFonts = function(fontFaceDecls, zip, stylesheet) {
-      var embeddedFontDeclarations = getEmbeddedFontDeclarations(fontFaceDecls);
-      loadFontsIntoCSS(embeddedFontDeclarations, zip, stylesheet)
-    }
-  };
-  return odf.FontLoader
-}();
-runtime.loadClass("core.Base64");
-runtime.loadClass("core.Zip");
-runtime.loadClass("xmldom.LSSerializer");
-runtime.loadClass("odf.StyleInfo");
-runtime.loadClass("odf.Style2CSS");
-runtime.loadClass("odf.FontLoader");
-odf.OdfContainer = function() {
-  var styleInfo = new odf.StyleInfo, style2CSS = new odf.Style2CSS, namespaces = style2CSS.namespaces, officens = "urn:oasis:names:tc:opendocument:xmlns:office:1.0", manifestns = "urn:oasis:names:tc:opendocument:xmlns:manifest:1.0", nodeorder = ["meta", "settings", "scripts", "font-face-decls", "styles", "automatic-styles", "master-styles", "body"], base64 = new core.Base64, fontLoader = new odf.FontLoader, partMimetypes = {};
-  function getDirectChild(node, ns, name) {
-    node = node ? node.firstChild : null;
-    while(node) {
-      if(node.localName === name && node.namespaceURI === ns) {
-        return node
-      }
-      node = node.nextSibling
-    }
-    return null
-  }
-  function getNodePosition(child) {
-    var childpos = 0, i, l = nodeorder.length;
-    for(i = 0;i < l;i += 1) {
-      if(child.namespaceURI === officens && child.localName === nodeorder[i]) {
-        return i
-      }
-    }
-    return-1
-  }
-  function OdfNodeFilter(odfroot, usedStylesElement) {
-    var automaticStyles = odfroot.automaticStyles, usedKeysList;
-    if(usedStylesElement) {
-      usedKeysList = new styleInfo.UsedKeysList(usedStylesElement)
-    }
-    this.acceptNode = function(node) {
-      var styleName, styleFamily, result;
-      if(node.namespaceURI === "http://www.w3.org/1999/xhtml") {
-        result = 3
-      }else {
-        if(usedKeysList && node.parentNode === automaticStyles && node.nodeType === 1) {
-          if(usedKeysList.uses(node)) {
-            result = 1
-          }else {
-            result = 2
-          }
-        }else {
-          result = 1
-        }
-      }
-      return result
-    }
-  }
-  function setChild(node, child) {
-    if(!child) {
-      return
-    }
-    var childpos = getNodePosition(child), pos, c = node.firstChild;
-    if(childpos === -1) {
-      return
-    }
-    while(c) {
-      pos = getNodePosition(c);
-      if(pos !== -1 && pos > childpos) {
-        break
-      }
-      c = c.nextSibling
-    }
-    node.insertBefore(child, c)
-  }
-  function ODFElement() {
-  }
-  function ODFDocumentElement(odfcontainer) {
-    this.OdfContainer = odfcontainer
-  }
-  ODFDocumentElement.prototype = new ODFElement;
-  ODFDocumentElement.prototype.constructor = ODFDocumentElement;
-  ODFDocumentElement.namespaceURI = officens;
-  ODFDocumentElement.localName = "document";
-  function OdfPart(name, container, zip) {
-    var self = this, privatedata;
-    this.size = 0;
-    this.type = null;
-    this.name = name;
-    this.container = container;
-    this.url = null;
-    this.mimetype = null;
-    this.document = null;
-    this.onreadystatechange = null;
-    this.onchange = null;
-    this.EMPTY = 0;
-    this.LOADING = 1;
-    this.DONE = 2;
-    this.state = this.EMPTY;
-    this.load = function() {
-      var mimetype = partMimetypes[name];
-      this.mimetype = mimetype;
-      zip.loadAsDataURL(name, mimetype, function(err, url) {
-        self.url = url;
-        if(self.onchange) {
-          self.onchange(self)
-        }
-        if(self.onstatereadychange) {
-          self.onstatereadychange(self)
-        }
-      })
-    };
-    this.abort = function() {
-    }
-  }
-  OdfPart.prototype.load = function() {
-  };
-  OdfPart.prototype.getUrl = function() {
-    if(this.data) {
-      return"data:;base64," + base64.toBase64(this.data)
-    }
-    return null
-  };
-  function OdfPartList(odfcontainer) {
-    var self = this;
-    this.length = 0;
-    this.item = function(index) {
-    }
-  }
-  odf.OdfContainer = function OdfContainer(url, onstatereadychange) {
-    var self = this, zip = null, contentXmlCompletelyLoaded = false;
-    this.onstatereadychange = onstatereadychange;
-    this.onchange = null;
-    this.state = null;
-    this.rootElement = null;
-    this.parts = null;
-    function removeProcessingInstructions(element) {
-      var n = element.firstChild, next, e;
-      while(n) {
-        next = n.nextSibling;
-        if(n.nodeType === 1) {
-          e = n;
-          removeProcessingInstructions(e)
-        }else {
-          if(n.nodeType === 7) {
-            element.removeChild(n)
-          }
-        }
-        n = next
-      }
-    }
-    function importRootNode(xmldoc) {
-      var doc = self.rootElement.ownerDocument, node;
-      if(xmldoc) {
-        removeProcessingInstructions(xmldoc.documentElement);
-        try {
-          node = doc.importNode(xmldoc.documentElement, true)
-        }catch(e) {
-        }
-      }
-      return node
-    }
-    function setState(state) {
-      self.state = state;
-      if(self.onchange) {
-        self.onchange(self)
-      }
-      if(self.onstatereadychange) {
-        self.onstatereadychange(self)
-      }
-    }
-    function handleFlatXml(xmldoc) {
-      var root = importRootNode(xmldoc);
-      if(!root || root.localName !== "document" || root.namespaceURI !== officens) {
-        setState(OdfContainer.INVALID);
-        return
-      }
-      self.rootElement = root;
-      root.fontFaceDecls = getDirectChild(root, officens, "font-face-decls");
-      root.styles = getDirectChild(root, officens, "styles");
-      root.automaticStyles = getDirectChild(root, officens, "automatic-styles");
-      root.masterStyles = getDirectChild(root, officens, "master-styles");
-      root.body = getDirectChild(root, officens, "body");
-      root.meta = getDirectChild(root, officens, "meta");
-      setState(OdfContainer.DONE)
-    }
-    function handleStylesXml(xmldoc) {
-      var node = importRootNode(xmldoc), root = self.rootElement;
-      if(!node || node.localName !== "document-styles" || node.namespaceURI !== officens) {
-        setState(OdfContainer.INVALID);
-        return
-      }
-      root.fontFaceDecls = getDirectChild(node, officens, "font-face-decls");
-      setChild(root, root.fontFaceDecls);
-      root.styles = getDirectChild(node, officens, "styles");
-      setChild(root, root.styles);
-      root.automaticStyles = getDirectChild(node, officens, "automatic-styles");
-      setChild(root, root.automaticStyles);
-      root.masterStyles = getDirectChild(node, officens, "master-styles");
-      setChild(root, root.masterStyles);
-      fontLoader.loadFonts(root.fontFaceDecls, zip, null)
-    }
-    function handleContentXml(xmldoc) {
-      var node = importRootNode(xmldoc), root, automaticStyles, fontFaceDecls, c;
-      if(!node || node.localName !== "document-content" || node.namespaceURI !== officens) {
-        setState(OdfContainer.INVALID);
-        return
-      }
-      root = self.rootElement;
-      fontFaceDecls = getDirectChild(node, officens, "font-face-decls");
-      if(root.fontFaceDecls && fontFaceDecls) {
-        c = fontFaceDecls.firstChild;
-        while(c) {
-          root.fontFaceDecls.appendChild(c);
-          c = fontFaceDecls.firstChild
-        }
-      }else {
-        if(fontFaceDecls) {
-          root.fontFaceDecls = fontFaceDecls;
-          setChild(root, fontFaceDecls)
-        }
-      }
-      automaticStyles = getDirectChild(node, officens, "automatic-styles");
-      if(root.automaticStyles && automaticStyles) {
-        c = automaticStyles.firstChild;
-        while(c) {
-          root.automaticStyles.appendChild(c);
-          c = automaticStyles.firstChild
-        }
-      }else {
-        if(automaticStyles) {
-          root.automaticStyles = automaticStyles;
-          setChild(root, automaticStyles)
-        }
-      }
-      root.body = getDirectChild(node, officens, "body");
-      setChild(root, root.body)
-    }
-    function handleMetaXml(xmldoc) {
-      var node = importRootNode(xmldoc), root;
-      if(!node || node.localName !== "document-meta" || node.namespaceURI !== officens) {
-        return
-      }
-      root = self.rootElement;
-      root.meta = getDirectChild(node, officens, "meta");
-      setChild(root, root.meta)
-    }
-    function handleSettingsXml(xmldoc) {
-      var node = importRootNode(xmldoc), root;
-      if(!node || node.localName !== "document-settings" || node.namespaceURI !== officens) {
-        return
-      }
-      root = self.rootElement;
-      root.settings = getDirectChild(node, officens, "settings");
-      setChild(root, root.settings)
-    }
-    function handleManifestXml(xmldoc) {
-      var node = importRootNode(xmldoc), root, n;
-      if(!node || node.localName !== "manifest" || node.namespaceURI !== manifestns) {
-        return
-      }
-      root = self.rootElement;
-      root.manifest = node;
-      n = root.manifest.firstChild;
-      while(n) {
-        if(n.nodeType === 1 && n.localName === "file-entry" && n.namespaceURI === manifestns) {
-          partMimetypes[n.getAttributeNS(manifestns, "full-path")] = n.getAttributeNS(manifestns, "media-type")
-        }
-        n = n.nextSibling
-      }
-    }
-    function getContentXmlNode(callback) {
-      var handler = {rootElementReady:function(err, rootxml, done) {
-        contentXmlCompletelyLoaded = err || done;
-        if(err) {
-          return callback(err, null)
-        }
-        var parser = new DOMParser;
-        rootxml = parser.parseFromString(rootxml, "text/xml");
-        callback(null, rootxml)
-      }, bodyChildElementsReady:function(err, nodes, done) {
-      }};
-      zip.loadContentXmlAsFragments("content.xml", handler)
-    }
-    function getXmlNode(filepath, callback) {
-      zip.loadAsDOM(filepath, callback)
-    }
-    function loadComponents() {
-      getXmlNode("styles.xml", function(err, xmldoc) {
-        handleStylesXml(xmldoc);
-        if(self.state === OdfContainer.INVALID) {
-          return
-        }
-        getXmlNode("content.xml", function(err, xmldoc) {
-          handleContentXml(xmldoc);
-          if(self.state === OdfContainer.INVALID) {
-            return
-          }
-          getXmlNode("meta.xml", function(err, xmldoc) {
-            handleMetaXml(xmldoc);
-            if(self.state === OdfContainer.INVALID) {
-              return
-            }
-            getXmlNode("settings.xml", function(err, xmldoc) {
-              if(xmldoc) {
-                handleSettingsXml(xmldoc)
-              }
-              getXmlNode("META-INF/manifest.xml", function(err, xmldoc) {
-                if(xmldoc) {
-                  handleManifestXml(xmldoc)
-                }
-                if(self.state !== OdfContainer.INVALID) {
-                  setState(OdfContainer.DONE)
-                }
-              })
-            })
-          })
-        })
-      })
-    }
-    function documentElement(name, map) {
-      var s = "", i;
-      for(i in map) {
-        if(map.hasOwnProperty(i)) {
-          s += " xmlns:" + i + '="' + map[i] + '"'
-        }
-      }
-      return'<?xml version="1.0" encoding="UTF-8"?><office:' + name + " " + s + ' office:version="1.2">'
-    }
-    function serializeMetaXml() {
-      var nsmap = style2CSS.namespaces, serializer = new xmldom.LSSerializer, s = documentElement("document-meta", nsmap);
-      serializer.filter = new OdfNodeFilter(self.rootElement);
-      s += serializer.writeToString(self.rootElement.meta, nsmap);
-      s += "</office:document-meta>";
-      return s
-    }
-    function serializeSettingsXml() {
-      var nsmap = style2CSS.namespaces, serializer = new xmldom.LSSerializer, s = documentElement("document-settings", nsmap);
-      serializer.filter = new OdfNodeFilter(self.rootElement);
-      s += serializer.writeToString(self.rootElement.settings, nsmap);
-      s += "</office:document-settings>";
-      return s
-    }
-    function serializeStylesXml() {
-      var nsmap = style2CSS.namespaces, serializer = new xmldom.LSSerializer, s = documentElement("document-styles", nsmap);
-      serializer.filter = new OdfNodeFilter(self.rootElement, self.rootElement.masterStyles);
-      s += serializer.writeToString(self.rootElement.fontFaceDecls, nsmap);
-      s += serializer.writeToString(self.rootElement.styles, nsmap);
-      s += serializer.writeToString(self.rootElement.automaticStyles, nsmap);
-      s += serializer.writeToString(self.rootElement.masterStyles, nsmap);
-      s += "</office:document-styles>";
-      return s
-    }
-    function serializeContentXml() {
-      var nsmap = style2CSS.namespaces, serializer = new xmldom.LSSerializer, s = documentElement("document-content", nsmap);
-      serializer.filter = new OdfNodeFilter(self.rootElement, self.rootElement.body);
-      s += serializer.writeToString(self.rootElement.automaticStyles, nsmap);
-      s += serializer.writeToString(self.rootElement.body, nsmap);
-      s += "</office:document-content>";
-      return s
-    }
-    function createElement(Type) {
-      var original = document.createElementNS(Type.namespaceURI, Type.localName), method, iface = new Type;
-      for(method in iface) {
-        if(iface.hasOwnProperty(method)) {
-          original[method] = iface[method]
-        }
-      }
-      return original
-    }
-    function loadFromXML(url, callback) {
-      runtime.loadXML(url, function(err, dom) {
-        if(err) {
-          callback(err)
-        }else {
-          handleFlatXml(dom)
-        }
-      })
-    }
-    this.getPart = function(partname) {
-      return new OdfPart(partname, self, zip)
-    };
-    this.save = function(callback) {
-      var data;
-      data = runtime.byteArrayFromString(serializeSettingsXml(), "utf8");
-      zip.save("settings.xml", data, true, new Date);
-      data = runtime.byteArrayFromString(serializeMetaXml(), "utf8");
-      zip.save("meta.xml", data, true, new Date);
-      data = runtime.byteArrayFromString(serializeStylesXml(), "utf8");
-      zip.save("styles.xml", data, true, new Date);
-      data = runtime.byteArrayFromString(serializeContentXml(), "utf8");
-      zip.save("content.xml", data, true, new Date);
-      zip.write(function(err) {
-        callback(err)
-      })
-    };
-    this.state = OdfContainer.LOADING;
-    this.rootElement = createElement(ODFDocumentElement);
-    this.parts = new OdfPartList(this);
-    zip = new core.Zip(url, function(err, zipobject) {
-      zip = zipobject;
-      if(err) {
-        loadFromXML(url, function(xmlerr) {
-          if(err) {
-            zip.error = err + "\n" + xmlerr;
-            setState(OdfContainer.INVALID)
-          }
-        })
-      }else {
-        loadComponents()
-      }
-    })
-  };
-  odf.OdfContainer.EMPTY = 0;
-  odf.OdfContainer.LOADING = 1;
-  odf.OdfContainer.DONE = 2;
-  odf.OdfContainer.INVALID = 3;
-  odf.OdfContainer.SAVING = 4;
-  odf.OdfContainer.MODIFIED = 5;
-  odf.OdfContainer.getContainer = function(url) {
-    return new odf.OdfContainer(url, null)
-  };
-  return odf.OdfContainer
-}();
-odf.Formatting = function Formatting() {
-  var odfContainer, styleInfo = new odf.StyleInfo;
-  function RangeElementIterator(range) {
-    function getNthChild(parent, n) {
-      var c = parent && parent.firstChild;
-      while(c && n) {
-        c = c.nextSibling;
-        n -= 1
-      }
-      return c
-    }
-    var start = getNthChild(range.startContainer, range.startOffset), end = getNthChild(range.endContainer, range.endOffset), current = start;
-    this.next = function() {
-      var c = current;
-      if(c === null) {
-        return c
-      }
-      return null
-    }
-  }
-  function getParentStyle(element) {
-    var n = element.firstChild, e;
-    if(n.nodeType === 1) {
-      e = n;
-      return e
-    }
-    return null
-  }
-  function getParagraphStyles(range) {
-    var iter = new RangeElementIterator(range), e, styles = [];
-    e = iter.next();
-    while(e) {
-      if(styleInfo.canElementHaveStyle("paragraph", e)) {
-        styles.push(e)
-      }
-    }
-    return styles
-  }
-  this.setOdfContainer = function(odfcontainer) {
-    odfContainer = odfcontainer
-  };
-  this.isCompletelyBold = function(selection) {
-    return false
-  };
-  this.getAlignment = function(selection) {
-    var styles = this.getParagraphStyles(selection), i, l = styles.length;
-    return undefined
-  };
-  this.getParagraphStyles = function(selection) {
-    var i, j, s, styles = [];
-    for(i = 0;i < selection.length;i += 0) {
-      s = getParagraphStyles(selection[i]);
-      for(j = 0;j < s.length;j += 1) {
-        if(styles.indexOf(s[j]) === -1) {
-          styles.push(s[j])
-        }
-      }
-    }
-    return styles
-  };
-  this.getTextStyles = function(selection) {
-    return[]
-  }
-};
-runtime.loadClass("odf.OdfContainer");
-runtime.loadClass("odf.Formatting");
-runtime.loadClass("xmldom.XPath");
-odf.OdfCanvas = function() {
-  function LoadingQueue() {
-    var queue = [], taskRunning = false;
-    function run(task) {
-      taskRunning = true;
-      runtime.setTimeout(function() {
-        try {
-          task()
-        }catch(e) {
-          runtime.log(e)
-        }
-        taskRunning = false;
-        if(queue.length > 0) {
-          run(queue.pop())
-        }
-      }, 10)
-    }
-    this.clearQueue = function() {
-      queue.length = 0
-    };
-    this.addToQueue = function(loadingTask) {
-      if(queue.length === 0 && !taskRunning) {
-        return run(loadingTask)
-      }
-      queue.push(loadingTask)
-    }
-  }
-  function PageSwitcher(css) {
-    var sheet = css.sheet, position = 1;
-    function updateCSS() {
-      while(sheet.cssRules.length > 0) {
-        sheet.deleteRule(0)
-      }
-      sheet.insertRule("office|presentation draw|page {display:none;}", 0);
-      sheet.insertRule("office|presentation draw|page:nth-child(" + position + ") {display:block;}", 1)
-    }
-    this.showNextPage = function() {
-      position += 1;
-      updateCSS()
-    };
-    this.showPreviousPage = function() {
-      if(position > 1) {
-        position -= 1;
-        updateCSS()
-      }
-    };
-    this.css = css
-  }
-  function listenEvent(eventTarget, eventType, eventHandler) {
-    if(eventTarget.addEventListener) {
-      eventTarget.addEventListener(eventType, eventHandler, false)
-    }else {
-      if(eventTarget.attachEvent) {
-        eventType = "on" + eventType;
-        eventTarget.attachEvent(eventType, eventHandler)
-      }else {
-        eventTarget["on" + eventType] = eventHandler
-      }
-    }
-  }
-  function SelectionWatcher(element) {
-    var selection = [], count = 0, listeners = [];
-    function isAncestorOf(ancestor, descendant) {
-      while(descendant) {
-        if(descendant === ancestor) {
-          return true
-        }
-        descendant = descendant.parentNode
-      }
-      return false
-    }
-    function fallsWithin(element, range) {
-      return isAncestorOf(element, range.startContainer) && isAncestorOf(element, range.endContainer)
-    }
-    function getCurrentSelection() {
-      var s = [], selection = runtime.getWindow().getSelection(), i, r;
-      for(i = 0;i < selection.rangeCount;i += 1) {
-        r = selection.getRangeAt(i);
-        if(r !== null && fallsWithin(element, r)) {
-          s.push(r)
-        }
-      }
-      return s
-    }
-    function rangesNotEqual(rangeA, rangeB) {
-      if(rangeA === rangeB) {
-        return false
-      }
-      if(rangeA === null || rangeB === null) {
-        return true
-      }
-      return rangeA.startContainer !== rangeB.startContainer || rangeA.startOffset !== rangeB.startOffset || rangeA.endContainer !== rangeB.endContainer || rangeA.endOffset !== rangeB.endOffset
-    }
-    function emitNewSelection() {
-      var i, l = listeners.length;
-      for(i = 0;i < l;i += 1) {
-        listeners[i](element, selection)
-      }
-    }
-    function copySelection(selection) {
-      var s = [selection.length], i, oldr, r, doc = element.ownerDocument;
-      for(i = 0;i < selection.length;i += 1) {
-        oldr = selection[i];
-        r = doc.createRange();
-        r.setStart(oldr.startContainer, oldr.startOffset);
-        r.setEnd(oldr.endContainer, oldr.endOffset);
-        s[i] = r
-      }
-      return s
-    }
-    function checkSelection() {
-      var s = getCurrentSelection(), i;
-      if(s.length === selection.length) {
-        for(i = 0;i < s.length;i += 1) {
-          if(rangesNotEqual(s[i], selection[i])) {
-            break
-          }
-        }
-        if(i === s.length) {
-          return
-        }
-      }
-      selection = s;
-      selection = copySelection(s);
-      emitNewSelection()
-    }
-    this.addListener = function(eventName, handler) {
-      var i, l = listeners.length;
-      for(i = 0;i < l;i += 1) {
-        if(listeners[i] === handler) {
-          return
-        }
-      }
-      listeners.push(handler)
-    };
-    listenEvent(element, "mouseup", checkSelection);
-    listenEvent(element, "keyup", checkSelection);
-    listenEvent(element, "keydown", checkSelection)
-  }
-  var style2CSS = new odf.Style2CSS, namespaces = style2CSS.namespaces, drawns = namespaces.draw, fons = namespaces.fo, officens = namespaces.office, svgns = namespaces.svg, textns = namespaces.text, xlinkns = namespaces.xlink, window = runtime.getWindow(), xpath = new xmldom.XPath, eventHandlers = {}, editparagraph, loadingQueue = new LoadingQueue;
-  function addEventListener(eventType, eventHandler) {
-    var handlers = eventHandlers[eventType];
-    if(handlers === undefined) {
-      handlers = eventHandlers[eventType] = []
-    }
-    if(eventHandler && handlers.indexOf(eventHandler) === -1) {
-      handlers.push(eventHandler)
-    }
-  }
-  function fireEvent(eventType, args) {
-    if(!eventHandlers.hasOwnProperty(eventType)) {
-      return
-    }
-    var handlers = eventHandlers[eventType], i;
-    for(i = 0;i < handlers.length;i += 1) {
-      handlers[i](args)
-    }
-  }
-  function clear(element) {
-    while(element.firstChild) {
-      element.removeChild(element.firstChild)
-    }
-  }
-  function handleStyles(odfelement, stylesxmlcss) {
-    var style2css = new odf.Style2CSS;
-    style2css.style2css(stylesxmlcss.sheet, odfelement.styles, odfelement.automaticStyles)
-  }
-  function setFramePosition(id, frame, stylesheet) {
-    frame.setAttribute("styleid", id);
-    var rule, anchor = frame.getAttributeNS(textns, "anchor-type"), x = frame.getAttributeNS(svgns, "x"), y = frame.getAttributeNS(svgns, "y"), width = frame.getAttributeNS(svgns, "width"), height = frame.getAttributeNS(svgns, "height"), minheight = frame.getAttributeNS(fons, "min-height"), minwidth = frame.getAttributeNS(fons, "min-width");
-    if(anchor === "as-char") {
-      rule = "display: inline-block;"
-    }else {
-      if(anchor || x || y) {
-        rule = "position: absolute;"
-      }else {
-        if(width || height || minheight || minwidth) {
-          rule = "display: block;"
-        }
-      }
-    }
-    if(x) {
-      rule += "left: " + x + ";"
-    }
-    if(y) {
-      rule += "top: " + y + ";"
-    }
-    if(width) {
-      rule += "width: " + width + ";"
-    }
-    if(height) {
-      rule += "height: " + height + ";"
-    }
-    if(minheight) {
-      rule += "min-height: " + minheight + ";"
-    }
-    if(minwidth) {
-      rule += "min-width: " + minwidth + ";"
-    }
-    if(rule) {
-      rule = "draw|" + frame.localName + '[styleid="' + id + '"] {' + rule + "}";
-      stylesheet.insertRule(rule, stylesheet.cssRules.length)
-    }
-  }
-  function getUrlFromBinaryDataElement(image) {
-    var node = image.firstChild;
-    while(node) {
-      if(node.namespaceURI === officens && node.localName === "binary-data") {
-        return"data:image/png;base64," + node.textContent
-      }
-      node = node.nextSibling
-    }
-    return""
-  }
-  function setImage(id, container, image, stylesheet) {
-    image.setAttribute("styleid", id);
-    var url = image.getAttributeNS(xlinkns, "href"), part, node;
-    function callback(url) {
-      var rule = "background-image: url(" + url + ");";
-      rule = 'draw|image[styleid="' + id + '"] {' + rule + "}";
-      stylesheet.insertRule(rule, stylesheet.cssRules.length)
-    }
-    if(url) {
-      try {
-        if(container.getPartUrl) {
-          url = container.getPartUrl(url);
-          callback(url)
-        }else {
-          part = container.getPart(url);
-          part.onchange = function(part) {
-            callback(part.url)
-          };
-          part.load()
-        }
-      }catch(e) {
-        runtime.log("slight problem: " + e)
-      }
-    }else {
-      url = getUrlFromBinaryDataElement(image);
-      callback(url)
-    }
-  }
-  function formatParagraphAnchors(odfbody) {
-    var runtimens = "urn:webodf", n, i, nodes = xpath.getODFElementsWithXPath(odfbody, ".//*[*[@text:anchor-type='paragraph']]", style2CSS.namespaceResolver);
-    for(i = 0;i < nodes.length;i += 1) {
-      n = nodes[i];
-      if(n.setAttributeNS) {
-        n.setAttributeNS(runtimens, "containsparagraphanchor", true)
-      }
-    }
-  }
-  function modifyImages(container, odfbody, stylesheet) {
-    var node, frames, i, images;
-    function namespaceResolver(prefix) {
-      return namespaces[prefix]
-    }
-    frames = [];
-    node = odfbody.firstChild;
-    while(node && node !== odfbody) {
-      if(node.namespaceURI === drawns) {
-        frames[frames.length] = node
-      }
-      if(node.firstChild) {
-        node = node.firstChild
-      }else {
-        while(node && node !== odfbody && !node.nextSibling) {
-          node = node.parentNode
-        }
-        if(node && node.nextSibling) {
-          node = node.nextSibling
-        }
-      }
-    }
-    for(i = 0;i < frames.length;i += 1) {
-      node = frames[i];
-      setFramePosition("frame" + String(i), node, stylesheet)
-    }
-    formatParagraphAnchors(odfbody)
-  }
-  function loadImages(container, odffragment, stylesheet) {
-    var i, images, node;
-    function loadImage(name, container, node, stylesheet) {
-      loadingQueue.addToQueue(function() {
-        setImage(name, container, node, stylesheet)
-      })
-    }
-    images = odffragment.getElementsByTagNameNS(drawns, "image");
-    for(i = 0;i < images.length;i += 1) {
-      node = images.item(i);
-      loadImage("image" + String(i), container, node, stylesheet)
-    }
-  }
-  function setVideo(id, container, plugin, stylesheet) {
-    var video, source, url, videoType, doc = plugin.ownerDocument, part, node;
-    url = plugin.getAttributeNS(xlinkns, "href");
-    function callback(url, mimetype) {
-      if(mimetype.substr(0, 6) === "video/") {
-        video = doc.createElementNS(doc.documentElement.namespaceURI, "video");
-        video.setAttribute("controls", "controls");
-        source = doc.createElement("source");
-        source.setAttribute("src", url);
-        source.setAttribute("type", mimetype);
-        video.appendChild(source);
-        plugin.parentNode.appendChild(video)
-      }else {
-        plugin.innerHtml = "Unrecognised Plugin"
-      }
-    }
-    if(url) {
-      try {
-        if(container.getPartUrl) {
-          url = container.getPartUrl(url);
-          callback(url, "video/mp4")
-        }else {
-          part = container.getPart(url);
-          part.onchange = function(part) {
-            callback(part.url, part.mimetype)
-          };
-          part.load()
-        }
-      }catch(e) {
-        runtime.log("slight problem: " + e)
-      }
-    }else {
-      runtime.log("using MP4 data fallback");
-      url = getUrlFromBinaryDataElement(plugin);
-      callback(url, "video/mp4")
-    }
-  }
-  function loadVideos(container, odffragment, stylesheet) {
-    var i, plugins, node;
-    function loadVideo(name, container, node, stylesheet) {
-      loadingQueue.addToQueue(function() {
-        setVideo(name, container, node, stylesheet)
-      })
-    }
-    plugins = odffragment.getElementsByTagNameNS(drawns, "plugin");
-    runtime.log("Loading Videos:");
-    for(i = 0;i < plugins.length;i += 1) {
-      runtime.log("...Found a video.");
-      node = plugins.item(i);
-      loadVideo("video" + String(i), container, node, stylesheet)
-    }
-  }
-  function addStyleSheet(document) {
-    var styles = document.getElementsByTagName("style"), head = document.getElementsByTagName("head")[0], text = "", prefix, a = "", b;
-    if(styles && styles.length > 0) {
-      styles = styles[0].cloneNode(false)
-    }else {
-      styles = document.createElement("style")
-    }
-    for(prefix in namespaces) {
-      if(namespaces.hasOwnProperty(prefix) && prefix) {
-        text += "@namespace " + prefix + " url(" + namespaces[prefix] + ");\n"
-      }
-    }
-    styles.appendChild(document.createTextNode(text));
-    head.appendChild(styles);
-    return styles
-  }
-  odf.OdfCanvas = function OdfCanvas(element) {
-    var self = this, document = element.ownerDocument, odfcontainer, formatting = new odf.Formatting, selectionWatcher = new SelectionWatcher(element), slidecssindex = 0, pageSwitcher = new PageSwitcher(addStyleSheet(document)), stylesxmlcss = addStyleSheet(document), positioncss = addStyleSheet(document), editable = false, zoomLevel = 1;
-    function fixContainerSize() {
-      var sizer = element.firstChild, odfdoc = sizer.firstChild;
-      if(!odfdoc) {
-        return
-      }
-      element.style.WebkitTransform = "scale(" + zoomLevel + ")";
-      element.style.WebkitTransformOrigin = "left top";
-      element.style.width = Math.round(zoomLevel * odfdoc.offsetWidth) + "px";
-      element.style.height = Math.round(zoomLevel * odfdoc.offsetHeight) + "px"
-    }
-    function handleContent(container, odfnode) {
-      var css = positioncss.sheet, sizer;
-      modifyImages(container, odfnode.body, css);
-      css.insertRule("draw|page { background-color:#fff; }", css.cssRules.length);
-      clear(element);
-      sizer = document.createElement("div");
-      sizer.style.display = "inline-block";
-      sizer.style.background = "white";
-      sizer.appendChild(odfnode);
-      element.appendChild(sizer);
-      loadImages(container, odfnode.body, css);
-      loadVideos(container, odfnode.body, css);
-      fixContainerSize()
-    }
-    function refreshOdf(container) {
-      if(odfcontainer !== container) {
-        return
-      }
-      function callback() {
-        clear(element);
-        element.style.display = "inline-block";
-        var odfnode = container.rootElement;
-        element.ownerDocument.importNode(odfnode, true);
-        formatting.setOdfContainer(container);
-        handleStyles(odfnode, stylesxmlcss);
-        handleContent(container, odfnode);
-        fireEvent("statereadychange")
-      }
-      if(odfcontainer.state === odf.OdfContainer.DONE) {
-        callback()
-      }else {
-        odfcontainer.onchange = callback
-      }
-    }
-    this.odfContainer = function() {
-      return odfcontainer
-    };
-    this.slidevisibilitycss = function() {
-      return pageSwitcher.css
-    };
-    this["load"] = this.load = function(url) {
-      loadingQueue.clearQueue();
-      element.innerHTML = "loading " + url;
-      odfcontainer = new odf.OdfContainer(url, function(container) {
-        odfcontainer = container;
-        refreshOdf(container)
-      });
-      odfcontainer.onstatereadychange = refreshOdf
-    };
-    function stopEditing() {
-      if(!editparagraph) {
-        return
-      }
-      var fragment = editparagraph.ownerDocument.createDocumentFragment();
-      while(editparagraph.firstChild) {
-        fragment.insertBefore(editparagraph.firstChild, null)
-      }
-      editparagraph.parentNode.replaceChild(fragment, editparagraph)
-    }
-    this.save = function(callback) {
-      stopEditing();
-      odfcontainer.save(callback)
-    };
-    function cancelPropagation(event) {
-      if(event.stopPropagation) {
-        event.stopPropagation()
-      }else {
-        event.cancelBubble = true
-      }
-    }
-    function cancelEvent(event) {
-      if(event.preventDefault) {
-        event.preventDefault();
-        event.stopPropagation()
-      }else {
-        event.returnValue = false;
-        event.cancelBubble = true
-      }
-    }
-    this.setEditable = function(iseditable) {
-      editable = iseditable;
-      if(!editable) {
-        stopEditing()
-      }
-    };
-    function processClick(evt) {
-      evt = evt || window.event;
-      var e = evt.target, selection = window.getSelection(), range = selection.rangeCount > 0 ? selection.getRangeAt(0) : null, startContainer = range && range.startContainer, startOffset = range && range.startOffset, endContainer = range && range.endContainer, endOffset = range && range.endOffset;
-      while(e && !((e.localName === "p" || e.localName === "h") && e.namespaceURI === textns)) {
-        e = e.parentNode
-      }
-      if(!editable) {
-        return
-      }
-      if(!e || e.parentNode === editparagraph) {
-        return
-      }
-      if(!editparagraph) {
-        editparagraph = e.ownerDocument.createElement("p");
-        if(!editparagraph.style) {
-          editparagraph = e.ownerDocument.createElementNS("http://www.w3.org/1999/xhtml", "p")
-        }
-        editparagraph.style.margin = "0px";
-        editparagraph.style.padding = "0px";
-        editparagraph.style.border = "0px";
-        editparagraph.setAttribute("contenteditable", true)
-      }else {
-        if(editparagraph.parentNode) {
-          stopEditing()
-        }
-      }
-      e.parentNode.replaceChild(editparagraph, e);
-      editparagraph.appendChild(e);
-      editparagraph.focus();
-      if(range) {
-        selection.removeAllRanges();
-        range = e.ownerDocument.createRange();
-        range.setStart(startContainer, startOffset);
-        range.setEnd(endContainer, endOffset);
-        selection.addRange(range)
-      }
-      cancelEvent(evt)
-    }
-    this.addListener = function(eventName, handler) {
-      if(eventName === "selectionchange") {
-        selectionWatcher.addListener(eventName, handler)
-      }else {
-        addEventListener(eventName, handler)
-      }
-    };
-    this.getFormatting = function() {
-      return formatting
-    };
-    this.setZoomLevel = function(zoom) {
-      zoomLevel = zoom;
-      fixContainerSize()
-    };
-    this.getZoomLevel = function() {
-      return zoomLevel
-    };
-    this.fitToContainingElement = function(width, height) {
-      var realWidth = element.offsetWidth / zoomLevel, realHeight = element.offsetHeight / zoomLevel;
-      zoomLevel = width / realWidth;
-      if(height / realHeight < zoomLevel) {
-        zoomLevel = height / realHeight
-      }
-      fixContainerSize()
-    };
-    this.fitToWidth = function(width) {
-      var realWidth = element.offsetWidth / zoomLevel;
-      zoomLevel = width / realWidth;
-      fixContainerSize()
-    };
-    this.fitToHeight = function(height) {
-      var realHeight = element.offsetHeight / zoomLevel;
-      zoomLevel = height / realHeight;
-      fixContainerSize()
-    };
-    this.showNextPage = function() {
-      pageSwitcher.showNextPage()
-    };
-    this.showPreviousPage = function() {
-      pageSwitcher.showPreviousPage()
-    };
-    this.showAllPages = function() {
-    };
-    listenEvent(element, "click", processClick)
-  };
-  return odf.OdfCanvas
-}();
-runtime.loadClass("xmldom.XPath");
-runtime.loadClass("odf.Style2CSS");
-gui.PresenterUI = function() {
-  var s2css = new odf.Style2CSS, xpath = new xmldom.XPath, nsResolver = s2css.namespaceResolver;
-  return function PresenterUI(odf_element) {
-    var self = this;
-    self.setInitialSlideMode = function() {
-      self.startSlideMode("single")
-    };
-    self.keyDownHandler = function(ev) {
-      if(ev.target.isContentEditable) {
-        return
-      }
-      if(ev.target.nodeName === "input") {
-        return
-      }
-      switch(ev.keyCode) {
-        case 84:
-          self.toggleToolbar();
-          break;
-        case 37:
-        ;
-        case 8:
-          self.prevSlide();
-          break;
-        case 39:
-        ;
-        case 32:
-          self.nextSlide();
-          break;
-        case 36:
-          self.firstSlide();
-          break;
-        case 35:
-          self.lastSlide();
-          break
-      }
-    };
-    self.root = function() {
-      return self.odf_canvas.odfContainer().rootElement
-    };
-    self.firstSlide = function() {
-      self.slideChange(function(old, pc) {
-        return 0
-      })
-    };
-    self.lastSlide = function() {
-      self.slideChange(function(old, pc) {
-        return pc - 1
-      })
-    };
-    self.nextSlide = function() {
-      self.slideChange(function(old, pc) {
-        return old + 1 < pc ? old + 1 : -1
-      })
-    };
-    self.prevSlide = function() {
-      self.slideChange(function(old, pc) {
-        return old < 1 ? -1 : old - 1
-      })
-    };
-    self.slideChange = function(indexChanger) {
-      var pages = self.getPages(self.odf_canvas.odfContainer().rootElement), last = -1, i = 0, newidx, pagelist;
-      pages.forEach(function(tuple) {
-        var name = tuple[0], node = tuple[1];
-        if(node.hasAttribute("slide_current")) {
-          last = i;
-          node.removeAttribute("slide_current")
-        }
-        i += 1
-      });
-      newidx = indexChanger(last, pages.length);
-      if(newidx === -1) {
-        newidx = last
-      }
-      pages[newidx][1].setAttribute("slide_current", "1");
-      pagelist = document.getElementById("pagelist");
-      pagelist.selectedIndex = newidx;
-      if(self.slide_mode === "cont") {
-        window.scrollBy(0, pages[newidx][1].getBoundingClientRect().top - 30)
-      }
-    };
-    self.selectSlide = function(idx) {
-      self.slideChange(function(old, pc) {
-        if(idx >= pc) {
-          return-1
-        }
-        if(idx < 0) {
-          return-1
-        }
-        return idx
-      })
-    };
-    self.scrollIntoContView = function(idx) {
-      var pages = self.getPages(self.odf_canvas.odfContainer().rootElement);
-      if(pages.length === 0) {
-        return
-      }
-      window.scrollBy(0, pages[idx][1].getBoundingClientRect().top - 30)
-    };
-    self.getPages = function(root) {
-      var pagenodes = root.getElementsByTagNameNS(nsResolver("draw"), "page"), pages = [], i;
-      for(i = 0;i < pagenodes.length;i += 1) {
-        pages.push([pagenodes[i].getAttribute("draw:name"), pagenodes[i]])
-      }
-      return pages
-    };
-    self.fillPageList = function(odfdom_root, html_select) {
-      var pages = self.getPages(odfdom_root), i, html_option, res, page_denom;
-      while(html_select.firstChild) {
-        html_select.removeChild(html_select.firstChild)
-      }
-      for(i = 0;i < pages.length;i += 1) {
-        html_option = document.createElement("option");
-        res = xpath.getODFElementsWithXPath(pages[i][1], './draw:frame[@presentation:class="title"]//draw:text-box/text:p', xmldom.XPath);
-        page_denom = res.length > 0 ? res[0].textContent : pages[i][0];
-        html_option.textContent = i + 1 + ": " + page_denom;
-        html_select.appendChild(html_option)
-      }
-    };
-    self.startSlideMode = function(mode) {
-      var pagelist = document.getElementById("pagelist"), css = self.odf_canvas.slidevisibilitycss().sheet;
-      self.slide_mode = mode;
-      while(css.cssRules.length > 0) {
-        css.deleteRule(0)
-      }
-      self.selectSlide(0);
-      if(self.slide_mode === "single") {
-        css.insertRule("draw|page { position:fixed; left:0px;top:30px; z-index:1; }", 0);
-        css.insertRule("draw|page[slide_current]  { z-index:2;}", 1);
-        css.insertRule("draw|page  { -webkit-transform: scale(1);}", 2);
-        self.fitToWindow();
-        window.addEventListener("resize", self.fitToWindow, false)
-      }else {
-        if(self.slide_mode === "cont") {
-          window.removeEventListener("resize", self.fitToWindow, false)
-        }
-      }
-      self.fillPageList(self.odf_canvas.odfContainer().rootElement, pagelist)
-    };
-    self.toggleToolbar = function() {
-      var css, found, i;
-      css = self.odf_canvas.slidevisibilitycss().sheet;
-      found = -1;
-      for(i = 0;i < css.cssRules.length;i += 1) {
-        if(css.cssRules[i].cssText.substring(0, 8) === ".toolbar") {
-          found = i;
-          break
-        }
-      }
-      if(found > -1) {
-        css.deleteRule(found)
-      }else {
-        css.insertRule(".toolbar { position:fixed; left:0px;top:-200px; z-index:0; }", 0)
-      }
-    };
-    self.fitToWindow = function() {
-      function ruleByFactor(f) {
-        return"draw|page { \n" + "-moz-transform: scale(" + f + "); \n" + "-moz-transform-origin: 0% 0%; " + "-webkit-transform-origin: 0% 0%; -webkit-transform: scale(" + f + "); " + "-o-transform-origin: 0% 0%; -o-transform: scale(" + f + "); " + "-ms-transform-origin: 0% 0%; -ms-transform: scale(" + f + "); " + "}"
-      }
-      var pages = self.getPages(self.root()), factorVert = (window.innerHeight - 40) / pages[0][1].clientHeight, factorHoriz = (window.innerWidth - 10) / pages[0][1].clientWidth, factor = factorVert < factorHoriz ? factorVert : factorHoriz, css = self.odf_canvas.slidevisibilitycss().sheet;
-      css.deleteRule(2);
-      css.insertRule(ruleByFactor(factor), 2)
-    };
-    self.load = function(url) {
-      self.odf_canvas.load(url)
-    };
-    self.odf_element = odf_element;
-    self.odf_canvas = new odf.OdfCanvas(self.odf_element);
-    self.odf_canvas.addListener("statereadychange", self.setInitialSlideMode);
-    self.slide_mode = "undefined";
-    document.addEventListener("keydown", self.keyDownHandler, false)
-  }
-}();
-gui.Caret = function Caret(selection, rootNode) {
-  var document = rootNode.ownerDocument, cursorns, cursorNode;
-  cursorns = "urn:webodf:names:cursor";
-  cursorNode = document.createElementNS(cursorns, "cursor");
-  this.updateToSelection = function() {
-    var range;
-    if(selection.rangeCount === 1) {
-      range = selection.getRangeAt(0)
-    }
-  }
-};
-runtime.loadClass("core.Cursor");
-gui.SelectionMover = function SelectionMover(selection, pointWalker) {
-  var doc = pointWalker.node().ownerDocument, cursor = new core.Cursor(selection, doc);
-  function getActiveRange(node) {
-    var range;
-    if(selection.rangeCount === 0) {
-      selection.addRange(node.ownerDocument.createRange())
-    }
-    return selection.getRangeAt(selection.rangeCount - 1)
-  }
-  function setStart(node, offset) {
-    var ranges = [], i, range;
-    for(i = 0;i < selection.rangeCount;i += 1) {
-      ranges[i] = selection.getRangeAt(i)
-    }
-    selection.removeAllRanges();
-    if(ranges.length === 0) {
-      ranges[0] = node.ownerDocument.createRange()
-    }
-    ranges[ranges.length - 1].setStart(pointWalker.node(), pointWalker.position());
-    for(i = 0;i < ranges.length;i += 1) {
-      selection.addRange(ranges[i])
-    }
-  }
-  function doMove(extend, move) {
-    if(selection.rangeCount === 0) {
-      return
-    }
-    var range = selection.getRangeAt(0), element;
-    if(!range.startContainer || range.startContainer.nodeType !== 1) {
-      return
-    }
-    element = range.startContainer;
-    pointWalker.setPoint(element, range.startOffset);
-    move();
-    setStart(pointWalker.node(), pointWalker.position())
-  }
-  function doMoveForward(extend, move) {
-    if(selection.rangeCount === 0) {
-      return
-    }
-    move();
-    var range = selection.getRangeAt(0), element;
-    if(!range.startContainer || range.startContainer.nodeType !== 1) {
-      return
-    }
-    element = range.startContainer;
-    pointWalker.setPoint(element, range.startOffset)
-  }
-  function moveCursor(node, offset, selectMode) {
-    if(selectMode) {
-      selection.extend(node, offset)
-    }else {
-      selection.collapse(node, offset)
-    }
-    cursor.updateToSelection()
-  }
-  function moveCursorLeft() {
-    var element;
-    if(!selection.focusNode || selection.focusNode.nodeType !== 1) {
-      return
-    }
-    element = selection.focusNode;
-    pointWalker.setPoint(element, selection.focusOffset);
-    pointWalker.stepBackward();
-    moveCursor(pointWalker.node(), pointWalker.position(), false)
-  }
-  function moveCursorRight() {
-    cursor.remove();
-    var element;
-    if(!selection.focusNode || selection.focusNode.nodeType !== 1) {
-      return
-    }
-    element = selection.focusNode;
-    pointWalker.setPoint(element, selection.focusOffset);
-    pointWalker.stepForward();
-    moveCursor(pointWalker.node(), pointWalker.position(), false)
-  }
-  function moveCursorUp() {
-    var rect = cursor.getNode().getBoundingClientRect(), x = rect.left, y = rect.top, arrived = false, left = 200;
-    while(!arrived && left) {
-      left -= 1;
-      moveCursorLeft();
-      rect = cursor.getNode().getBoundingClientRect();
-      arrived = rect.top !== y && rect.left < x
-    }
-  }
-  function moveCursorDown() {
-    cursor.updateToSelection();
-    var rect = cursor.getNode().getBoundingClientRect(), x = rect.left, y = rect.top, arrived = false, left = 200;
-    while(!arrived) {
-      left -= 1;
-      moveCursorRight();
-      rect = cursor.getNode().getBoundingClientRect();
-      arrived = rect.top !== y && rect.left > x
-    }
-  }
-  this.movePointForward = function(extend) {
-    doMove(extend, pointWalker.stepForward)
-  };
-  this.movePointBackward = function(extend) {
-    doMove(extend, pointWalker.stepBackward)
-  };
-  this.moveLineForward = function(extend) {
-    if(selection.modify) {
-      selection.modify(extend ? "extend" : "move", "forward", "line")
-    }else {
-      doMove(extend, moveCursorDown)
-    }
-  };
-  this.moveLineBackward = function(extend) {
-    if(selection.modify) {
-      selection.modify(extend ? "extend" : "move", "backward", "line")
-    }else {
-      doMove(extend, function() {
-      })
-    }
-  };
-  return this
-};
-runtime.loadClass("core.PointWalker");
-runtime.loadClass("core.Cursor");
-gui.XMLEdit = function XMLEdit(element, stylesheet) {
-  var simplecss, cssprefix, documentElement, customNS = "customns", walker = null;
-  if(!element.id) {
-    element.id = "xml" + String(Math.random()).substring(2)
-  }
-  cssprefix = "#" + element.id + " ";
-  function installHandlers() {
-  }
-  simplecss = cssprefix + "*," + cssprefix + ":visited, " + cssprefix + ":link {display:block; margin: 0px; margin-left: 10px; font-size: medium; color: black; background: white; font-variant: normal; font-weight: normal; font-style: normal; font-family: sans-serif; text-decoration: none; white-space: pre-wrap; height: auto; width: auto}\n" + cssprefix + ":before {color: blue; content: '<' attr(customns_name) attr(customns_atts) '>';}\n" + cssprefix + ":after {color: blue; content: '</' attr(customns_name) '>';}\n" + 
-  cssprefix + "{overflow: auto;}\n";
-  function listenEvent(eventTarget, eventType, eventHandler) {
-    if(eventTarget.addEventListener) {
-      eventTarget.addEventListener(eventType, eventHandler, false)
-    }else {
-      if(eventTarget.attachEvent) {
-        eventType = "on" + eventType;
-        eventTarget.attachEvent(eventType, eventHandler)
-      }else {
-        eventTarget["on" + eventType] = eventHandler
-      }
-    }
-  }
-  function cancelEvent(event) {
-    if(event.preventDefault) {
-      event.preventDefault()
-    }else {
-      event.returnValue = false
-    }
-  }
-  function isCaretMoveCommand(charCode) {
-    if(charCode >= 16 && charCode <= 20) {
-      return true
-    }
-    if(charCode >= 33 && charCode <= 40) {
-      return true
-    }
-    return false
-  }
-  function syncSelectionWithWalker() {
-    var sel = element.ownerDocument.defaultView.getSelection(), r;
-    if(!sel || sel.rangeCount <= 0 || !walker) {
-      return
-    }
-    r = sel.getRangeAt(0);
-    walker.setPoint(r.startContainer, r.startOffset)
-  }
-  function syncWalkerWithSelection() {
-    var sel = element.ownerDocument.defaultView.getSelection(), n, r;
-    sel.removeAllRanges();
-    if(!walker || !walker.node()) {
-      return
-    }
-    n = walker.node();
-    r = n.ownerDocument.createRange();
-    r.setStart(n, walker.position());
-    r.collapse(true);
-    sel.addRange(r)
-  }
-  function handleKeyDown(event) {
-    var charCode = event.charCode || event.keyCode;
-    walker = null;
-    if(walker && charCode === 39) {
-      syncSelectionWithWalker();
-      walker.stepForward();
-      syncWalkerWithSelection()
-    }else {
-      if(walker && charCode === 37) {
-        syncSelectionWithWalker();
-        walker.stepBackward();
-        syncWalkerWithSelection()
-      }else {
-        if(isCaretMoveCommand(charCode)) {
-          return
-        }
-      }
-    }
-    cancelEvent(event)
-  }
-  function handleKeyPress(event) {
-  }
-  function handleClick(event) {
-    var sel = element.ownerDocument.defaultView.getSelection(), r = sel.getRangeAt(0), n = r.startContainer;
-    cancelEvent(event)
-  }
-  function initElement(element) {
-    listenEvent(element, "click", handleClick);
-    listenEvent(element, "keydown", handleKeyDown);
-    listenEvent(element, "keypress", handleKeyPress);
-    listenEvent(element, "drop", cancelEvent);
-    listenEvent(element, "dragend", cancelEvent);
-    listenEvent(element, "beforepaste", cancelEvent);
-    listenEvent(element, "paste", cancelEvent)
-  }
-  function cleanWhitespace(node) {
-    var n = node.firstChild, p, re = /^\s*$/;
-    while(n && n !== node) {
-      p = n;
-      n = n.nextSibling || n.parentNode;
-      if(p.nodeType === 3 && re.test(p.nodeValue)) {
-        p.parentNode.removeChild(p)
-      }
-    }
-  }
-  function setCssHelperAttributes(node) {
-    var atts, attsv, a, i;
-    atts = node.attributes;
-    attsv = "";
-    for(i = atts.length - 1;i >= 0;i -= 1) {
-      a = atts.item(i);
-      attsv = attsv + " " + a.nodeName + '="' + a.nodeValue + '"'
-    }
-    node.setAttribute("customns_name", node.nodeName);
-    node.setAttribute("customns_atts", attsv)
-  }
-  function addExplicitAttributes(node) {
-    var n = node.firstChild;
-    while(n && n !== node) {
-      if(n.nodeType === 1) {
-        addExplicitAttributes(n)
-      }
-      n = n.nextSibling || n.parentNode
-    }
-    setCssHelperAttributes(node);
-    cleanWhitespace(node)
-  }
-  function getNamespacePrefixes(node, prefixes) {
-    var n = node.firstChild, atts, att, i;
-    while(n && n !== node) {
-      if(n.nodeType === 1) {
-        getNamespacePrefixes(n, prefixes);
-        atts = n.attributes;
-        for(i = atts.length - 1;i >= 0;i -= 1) {
-          att = atts.item(i);
-          if(att.namespaceURI === "http://www.w3.org/2000/xmlns/") {
-            if(!prefixes[att.nodeValue]) {
-              prefixes[att.nodeValue] = att.localName
-            }
-          }
-        }
-      }
-      n = n.nextSibling || n.parentNode
-    }
-  }
-  function generateUniquePrefixes(prefixes) {
-    var taken = {}, ns, p, n = 0;
-    for(ns in prefixes) {
-      if(prefixes.hasOwnProperty(ns) && ns) {
-        p = prefixes[ns];
-        if(!p || taken.hasOwnProperty(p) || p === "xmlns") {
-          do {
-            p = "ns" + n;
-            n += 1
-          }while(taken.hasOwnProperty(p));
-          prefixes[ns] = p
-        }
-        taken[p] = true
-      }
-    }
-  }
-  function createCssFromXmlInstance(node) {
-    var prefixes = {}, css = "@namespace customns url(customns);\n", name, pre, ns, names, csssel;
-    getNamespacePrefixes(node, prefixes);
-    generateUniquePrefixes(prefixes);
-    return css
-  }
-  function updateCSS() {
-    var css = element.ownerDocument.createElement("style"), text = createCssFromXmlInstance(element);
-    css.type = "text/css";
-    text = text + simplecss;
-    css.appendChild(element.ownerDocument.createTextNode(text));
-    stylesheet = stylesheet.parentNode.replaceChild(css, stylesheet)
-  }
-  function getXML() {
-    return documentElement
-  }
-  function setXML(xml) {
-    var node = xml.documentElement || xml;
-    node = element.ownerDocument.importNode(node, true);
-    documentElement = node;
-    addExplicitAttributes(node);
-    while(element.lastChild) {
-      element.removeChild(element.lastChild)
-    }
-    element.appendChild(node);
-    updateCSS();
-    walker = new core.PointWalker(node)
-  }
-  initElement(element);
-  this.updateCSS = updateCSS;
-  this.setXML = setXML;
-  this.getXML = getXML
-};
-(function() {
-  return["core/Async.js", "core/Base64.js", "core/ByteArray.js", "core/ByteArrayWriter.js", "core/Cursor.js", "core/JSLint.js", "core/PointWalker.js", "core/RawDeflate.js", "core/RawInflate.js", "core/UnitTester.js", "core/Zip.js", "gui/Caret.js", "gui/SelectionMover.js", "gui/XMLEdit.js", "gui/PresenterUI.js", "odf/FontLoader.js", "odf/Formatting.js", "odf/OdfCanvas.js", "odf/OdfContainer.js", "odf/Style2CSS.js", "odf/StyleInfo.js", "xmldom/LSSerializer.js", "xmldom/LSSerializerFilter.js", "xmldom/OperationalTransformDOM.js", 
-  "xmldom/OperationalTransformInterface.js", "xmldom/RelaxNG.js", "xmldom/RelaxNG2.js", "xmldom/RelaxNGParser.js", "xmldom/XPath.js"]
-})();
-
diff --git a/apps/files_odfviewer/js/webodf.js b/apps/files_odfviewer/js/webodf.js
deleted file mode 100644
index 1b85527260..0000000000
--- a/apps/files_odfviewer/js/webodf.js
+++ /dev/null
@@ -1,343 +0,0 @@
-// Input 0
-/*
-
- @licstart
- The JavaScript code in this page is free software: you can redistribute it
- and/or modify it under the terms of the GNU Affero General Public License
- (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- the License, or (at your option) any later version.  The code is distributed
- WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
-
- As additional permission under GNU AGPL version 3 section 7, you
- may distribute non-source (e.g., minimized or compacted) forms of
- that code without the copy of the GNU GPL normally required by
- section 4, provided you include this license notice and a URL
- through which recipients can access the Corresponding Source.
-
- As a special exception to the AGPL, any HTML file which merely makes function
- calls to this code, and for that purpose includes it by reference shall be
- deemed a separate work for copyright law purposes. In addition, the copyright
- holders of this code give you permission to combine this code with free
- software libraries that are released under the GNU LGPL. You may copy and
- distribute such a system following the terms of the GNU AGPL for this code
- and the LGPL for the libraries. If you modify this code, you may extend this
- exception to your version of the code, but you are not obligated to do so.
- If you do not wish to do so, delete this exception statement from your
- version.
-
- This license applies to this entire compilation.
- @licend
- @source: http://www.webodf.org/
- @source: http://gitorious.org/odfkit/webodf/
-*/
-var core={},gui={},xmldom={},odf={};
-// Input 1
-function Runtime(){}Runtime.ByteArray=function(){};Runtime.ByteArray.prototype.slice=function(){};Runtime.prototype.byteArrayFromArray=function(){};Runtime.prototype.byteArrayFromString=function(){};Runtime.prototype.byteArrayToString=function(){};Runtime.prototype.concatByteArrays=function(){};Runtime.prototype.read=function(){};Runtime.prototype.readFile=function(){};Runtime.prototype.readFileSync=function(){};Runtime.prototype.loadXML=function(){};Runtime.prototype.writeFile=function(){};
-Runtime.prototype.isFile=function(){};Runtime.prototype.getFileSize=function(){};Runtime.prototype.deleteFile=function(){};Runtime.prototype.log=function(){};Runtime.prototype.setTimeout=function(){};Runtime.prototype.libraryPaths=function(){};Runtime.prototype.type=function(){};Runtime.prototype.getDOMImplementation=function(){};Runtime.prototype.getWindow=function(){};var IS_COMPILED_CODE=!0;
-Runtime.byteArrayToString=function(j,l){function f(c){var b="",d,a=c.length;for(d=0;d<a;d+=1)b+=String.fromCharCode(c[d]&255);return b}function g(c){var b="",d,a=c.length,e,i,h;for(d=0;d<a;d+=1)e=c[d],128>e?b+=String.fromCharCode(e):(d+=1,i=c[d],224>e?b+=String.fromCharCode((e&31)<<6|i&63):(d+=1,h=c[d],b+=String.fromCharCode((e&15)<<12|(i&63)<<6|h&63)));return b}var a;"utf8"===l?a=g(j):("binary"!==l&&this.log("Unsupported encoding: "+l),a=f(j));return a};
-Runtime.getFunctionName=function(j){return void 0===j.name?(j=/function\s+(\w+)/.exec(j))&&j[1]:j.name};
-function BrowserRuntime(j){function l(c,b){var d,a,e;b?e=c:b=c;j?(a=j.ownerDocument,e&&(d=a.createElement("span"),d.className=e,d.appendChild(a.createTextNode(e)),j.appendChild(d),j.appendChild(a.createTextNode(" "))),d=a.createElement("span"),d.appendChild(a.createTextNode(b)),j.appendChild(d),j.appendChild(a.createElement("br"))):console&&console.log(b)}var f=this,g={},a=window.ArrayBuffer&&window.Uint8Array;this.ByteArray=a?function(c){Uint8Array.prototype.slice=function(b,c){void 0===c&&(void 0===
-b&&(b=0),c=this.length);var a=this.subarray(b,c),e,i,c=c-b;e=new Uint8Array(new ArrayBuffer(c));for(i=0;i<c;i+=1)e[i]=a[i];return e};return new Uint8Array(new ArrayBuffer(c))}:function(c){var b=[];b.length=c;return b};this.concatByteArrays=a?function(c,b){var d,a=c.length,e=b.length,i=new this.ByteArray(a+e);for(d=0;d<a;d+=1)i[d]=c[d];for(d=0;d<e;d+=1)i[d+a]=b[d];return i}:function(c,b){return c.concat(b)};this.byteArrayFromArray=function(c){return c.slice()};this.byteArrayFromString=function(c,b){var d;
-if("utf8"===b){d=c.length;var a,e,i,h=0;for(e=0;e<d;e+=1)i=c.charCodeAt(e),h+=1+(128<i)+(2048<i);a=new f.ByteArray(h);for(e=h=0;e<d;e+=1)i=c.charCodeAt(e),128>i?(a[h]=i,h+=1):2048>i?(a[h]=192|i>>>6,a[h+1]=128|i&63,h+=2):(a[h]=224|i>>>12&15,a[h+1]=128|i>>>6&63,a[h+2]=128|i&63,h+=3)}else{"binary"!==b&&f.log("unknown encoding: "+b);d=c.length;a=new f.ByteArray(d);for(e=0;e<d;e+=1)a[e]=c.charCodeAt(e)&255}return d=a};this.byteArrayToString=Runtime.byteArrayToString;this.readFile=function(c,b,d){if(g.hasOwnProperty(c))d(null,
-g[c]);else{var a=new XMLHttpRequest;a.open("GET",c,!0);a.onreadystatechange=function(){var e;4===a.readyState&&(0===a.status&&!a.responseText?d("File "+c+" is empty."):200===a.status||0===a.status?(e="binary"===b?"undefined"!==typeof VBArray?(new VBArray(a.responseBody)).toArray():f.byteArrayFromString(a.responseText,"binary"):a.responseText,g[c]=e,d(null,e)):d(a.responseText||a.statusText))};a.overrideMimeType&&("binary"!==b?a.overrideMimeType("text/plain; charset="+b):a.overrideMimeType("text/plain; charset=x-user-defined"));
-try{a.send(null)}catch(e){d(e.message)}}};this.read=function(c,b,a,k){if(g.hasOwnProperty(c))k(null,g[c].slice(b,b+a));else{var e=new XMLHttpRequest;e.open("GET",c,!0);e.onreadystatechange=function(){var i;4===e.readyState&&(0===e.status&&!e.responseText?k("File "+c+" is empty."):200===e.status||0===e.status?(i="undefined"!==typeof VBArray?(new VBArray(e.responseBody)).toArray():f.byteArrayFromString(e.responseText,"binary"),g[c]=i,k(null,i.slice(b,b+a))):k(e.responseText||e.statusText))};e.overrideMimeType&&
-e.overrideMimeType("text/plain; charset=x-user-defined");try{e.send(null)}catch(i){k(i.message)}}};this.readFileSync=function(c,b){var a=new XMLHttpRequest,k;a.open("GET",c,!1);a.overrideMimeType&&("binary"!==b?a.overrideMimeType("text/plain; charset="+b):a.overrideMimeType("text/plain; charset=x-user-defined"));try{if(a.send(null),200===a.status||0===a.status)k=a.responseText}catch(e){}return k};this.writeFile=function(c,b,a){g[c]=b;var k=new XMLHttpRequest;k.open("PUT",c,!0);k.onreadystatechange=
-function(){4===k.readyState&&(0===k.status&&!k.responseText?a("File "+c+" is empty."):200<=k.status&&300>k.status||0===k.status?a(null):a("Status "+k.status+": "+k.responseText||k.statusText))};b=b.buffer&&!k.sendAsBinary?b.buffer:f.byteArrayToString(b,"binary");try{k.sendAsBinary?k.sendAsBinary(b):k.send(b)}catch(e){f.log("HUH? "+e+" "+b),a(e.message)}};this.deleteFile=function(a,b){var d=new XMLHttpRequest;d.open("DELETE",a,!0);d.onreadystatechange=function(){4===d.readyState&&(200>d.status&&300<=
-d.status?b(d.responseText):b(null))};d.send(null)};this.loadXML=function(a,b){var d=new XMLHttpRequest;d.open("GET",a,!0);d.overrideMimeType&&d.overrideMimeType("text/xml");d.onreadystatechange=function(){4===d.readyState&&(0===d.status&&!d.responseText?b("File "+a+" is empty."):200===d.status||0===d.status?b(null,d.responseXML):b(d.responseText))};try{d.send(null)}catch(k){b(k.message)}};this.isFile=function(a,b){f.getFileSize(a,function(a){b(-1!==a)})};this.getFileSize=function(a,b){var d=new XMLHttpRequest;
-d.open("HEAD",a,!0);d.onreadystatechange=function(){if(4===d.readyState){var a=d.getResponseHeader("Content-Length");a?b(parseInt(a,10)):b(-1)}};d.send(null)};this.log=l;this.setTimeout=function(a,b){setTimeout(function(){a()},b)};this.libraryPaths=function(){return["lib"]};this.setCurrentDirectory=function(){};this.type=function(){return"BrowserRuntime"};this.getDOMImplementation=function(){return window.document.implementation};this.exit=function(a){l("Calling exit with code "+a+", but exit() is not implemented.")};
-this.getWindow=function(){return window}}
-function NodeJSRuntime(){var j=require("fs"),l="";this.ByteArray=function(f){return new Buffer(f)};this.byteArrayFromArray=function(f){var g=new Buffer(f.length),a,c=f.length;for(a=0;a<c;a+=1)g[a]=f[a];return g};this.concatByteArrays=function(f,g){var a=new Buffer(f.length+g.length);f.copy(a,0,0);g.copy(a,f.length,0);return a};this.byteArrayFromString=function(f,g){return new Buffer(f,g)};this.byteArrayToString=function(f,g){return f.toString(g)};this.readFile=function(f,g,a){"binary"!==g?j.readFile(f,
-g,a):j.readFile(f,null,a)};this.writeFile=function(f,g,a){j.writeFile(f,g,"binary",function(c){a(c||null)})};this.deleteFile=j.unlink;this.read=function(f,g,a,c){l&&(f=l+"/"+f);j.open(f,"r+",666,function(b,d){if(b)c(b);else{var k=new Buffer(a);j.read(d,k,0,a,g,function(a){j.close(d);c(a,k)})}})};this.readFileSync=function(f,g){return!g?"":j.readFileSync(f,g)};this.loadXML=function(){throw"Not implemented.";};this.isFile=function(f,g){l&&(f=l+"/"+f);j.stat(f,function(a,c){g(!a&&c.isFile())})};this.getFileSize=
-function(f,g){l&&(f=l+"/"+f);j.stat(f,function(a,c){a?g(-1):g(c.size)})};this.log=function(f){process.stderr.write(f+"\n")};this.setTimeout=function(f,g){setTimeout(function(){f()},g)};this.libraryPaths=function(){return[__dirname]};this.setCurrentDirectory=function(f){l=f};this.currentDirectory=function(){return l};this.type=function(){return"NodeJSRuntime"};this.getDOMImplementation=function(){return null};this.exit=process.exit;this.getWindow=function(){return null}}
-function RhinoRuntime(){var j=this,l=Packages.javax.xml.parsers.DocumentBuilderFactory.newInstance(),f,g,a="";l.setValidating(!1);l.setNamespaceAware(!0);l.setExpandEntityReferences(!1);l.setSchema(null);g=Packages.org.xml.sax.EntityResolver({resolveEntity:function(a,b){var d=new Packages.java.io.FileReader(b);return new Packages.org.xml.sax.InputSource(d)}});f=l.newDocumentBuilder();f.setEntityResolver(g);this.ByteArray=function(a){return[a]};this.byteArrayFromArray=function(a){return a};this.byteArrayFromString=
-function(a){var b=[],d,k=a.length;for(d=0;d<k;d+=1)b[d]=a.charCodeAt(d)&255;return b};this.byteArrayToString=Runtime.byteArrayToString;this.concatByteArrays=function(a,b){return a.concat(b)};this.loadXML=function(a,b){var d=new Packages.java.io.File(a),k;try{k=f.parse(d)}catch(e){print(e);b(e);return}b(null,k)};this.readFile=function(a,b,d){var k=new Packages.java.io.File(a),e="binary"===b?"latin1":b;k.isFile()?(a=readFile(a,e),"binary"===b&&(a=j.byteArrayFromString(a,"binary")),d(null,a)):d(a+" is not a file.")};
-this.writeFile=function(a,b,d){var a=new Packages.java.io.FileOutputStream(a),k,e=b.length;for(k=0;k<e;k+=1)a.write(b[k]);a.close();d(null)};this.deleteFile=function(a,b){(new Packages.java.io.File(a))["delete"]()?b(null):b("Could not delete "+a)};this.read=function(c,b,d,k){a&&(c=a+"/"+c);var e;e=c;var i="binary";(new Packages.java.io.File(e)).isFile()?("binary"===i&&(i="latin1"),e=readFile(e,i)):e=null;e?k(null,this.byteArrayFromString(e.substring(b,b+d),"binary")):k("Cannot read "+c)};this.readFileSync=
-function(a,b){return!b?"":readFile(a,b)};this.isFile=function(c,b){a&&(c=a+"/"+c);var d=new Packages.java.io.File(c);b(d.isFile())};this.getFileSize=function(c,b){a&&(c=a+"/"+c);var d=new Packages.java.io.File(c);b(d.length())};this.log=print;this.setTimeout=function(a){a()};this.libraryPaths=function(){return["lib"]};this.setCurrentDirectory=function(c){a=c};this.currentDirectory=function(){return a};this.type=function(){return"RhinoRuntime"};this.getDOMImplementation=function(){return f.getDOMImplementation()};
-this.exit=quit;this.getWindow=function(){return null}}var runtime=function(){return"undefined"!==typeof window?new BrowserRuntime(window.document.getElementById("logoutput")):"undefined"!==typeof require?new NodeJSRuntime:new RhinoRuntime}();
-(function(){function j(f){var a=f[0],c;c=eval("if (typeof "+a+" === 'undefined') {eval('"+a+" = {};');}"+a);for(a=1;a<f.length-1;a+=1)c.hasOwnProperty(f[a])||(c=c[f[a]]={});return c[f[f.length-1]]}var l={},f={};runtime.loadClass=function(g){function a(a){var a=a.replace(".","/")+".js",b=runtime.libraryPaths(),e,c,h;runtime.currentDirectory&&b.push(runtime.currentDirectory());for(e=0;e<b.length;e+=1){c=b[e];if(!f.hasOwnProperty(c))if((h=runtime.readFileSync(b[e]+"/manifest.js","utf8"))&&h.length)try{f[c]=
-eval(h)}catch(n){f[c]=null,runtime.log("Cannot load manifest for "+c+".")}else f[c]=null;if((c=f[c])&&c.indexOf&&-1!==c.indexOf(a))return b[e]+"/"+a}return null}if(!IS_COMPILED_CODE&&!l.hasOwnProperty(g)){var c=g.split("."),b;b=j(c);if(!b&&(b=function(b){var c,e;e=a(b);if(!e)throw b+" is not listed in any manifest.js.";try{c=runtime.readFileSync(e,"utf8")}catch(i){throw runtime.log("Error loading "+b+" "+i),i;}if(void 0===c)throw"Cannot load class "+b;try{c=eval(b+" = eval(code);")}catch(h){throw runtime.log("Error loading "+
-b+" "+h),h;}return c}(g),!b||Runtime.getFunctionName(b)!==c[c.length-1]))throw runtime.log("Loaded code is not for "+c[c.length-1]),"Loaded code is not for "+c[c.length-1];l[g]=!0}}})();
-(function(j){function l(f){if(f.length){var g=f[0];runtime.readFile(g,"utf8",function(a,c){function b(){var a;(a=eval(c))&&runtime.exit(a)}var d="";runtime.libraryPaths();-1!==g.indexOf("/")&&(d=g.substring(0,g.indexOf("/")));runtime.setCurrentDirectory(d);a?(runtime.log(a),runtime.exit(1)):b.apply(null,f)})}}j=Array.prototype.slice.call(j);"NodeJSRuntime"===runtime.type()?l(process.argv.slice(2)):"RhinoRuntime"===runtime.type()?l(j):l(j.slice(1))})("undefined"!==typeof arguments&&arguments);
-// Input 2
-core.Base64=function(){function j(a){var b=[],c,e=a.length;for(c=0;c<e;c+=1)b[c]=a.charCodeAt(c)&255;return b}function l(a){var b,c="",e,d=a.length-2;for(e=0;e<d;e+=3)b=a[e]<<16|a[e+1]<<8|a[e+2],c+=u[b>>>18],c+=u[b>>>12&63],c+=u[b>>>6&63],c+=u[b&63];e===d+1?(b=a[e]<<4,c+=u[b>>>6],c+=u[b&63],c+="=="):e===d&&(b=a[e]<<10|a[e+1]<<2,c+=u[b>>>12],c+=u[b>>>6&63],c+=u[b&63],c+="=");return c}function f(a){var a=a.replace(/[^A-Za-z0-9+\/]+/g,""),b=[],c=a.length%4,e,d=a.length,i;for(e=0;e<d;e+=4)i=(s[a.charAt(e)]||
-0)<<18|(s[a.charAt(e+1)]||0)<<12|(s[a.charAt(e+2)]||0)<<6|(s[a.charAt(e+3)]||0),b.push(i>>16,i>>8&255,i&255);b.length-=[0,0,2,1][c];return b}function g(a){var b=[],c,e=a.length,d;for(c=0;c<e;c+=1)d=a[c],128>d?b.push(d):2048>d?b.push(192|d>>>6,128|d&63):b.push(224|d>>>12&15,128|d>>>6&63,128|d&63);return b}function a(a){var b=[],c,e=a.length,d,i,m;for(c=0;c<e;c+=1)d=a[c],128>d?b.push(d):(c+=1,i=a[c],224>d?b.push((d&31)<<6|i&63):(c+=1,m=a[c],b.push((d&15)<<12|(i&63)<<6|m&63)));return b}function c(a){return l(j(a))}
-function b(a){return String.fromCharCode.apply(String,f(a))}function d(b){return a(j(b))}function k(b){for(var b=a(b),c="",e=0;e<b.length;)c+=String.fromCharCode.apply(String,b.slice(e,e+45E3)),e+=45E3;return c}function e(a,b,c){var e="",d,i,m;for(m=b;m<c;m+=1)b=a.charCodeAt(m)&255,128>b?e+=String.fromCharCode(b):(m+=1,d=a.charCodeAt(m)&255,224>b?e+=String.fromCharCode((b&31)<<6|d&63):(m+=1,i=a.charCodeAt(m)&255,e+=String.fromCharCode((b&15)<<12|(d&63)<<6|i&63)));return e}function i(a,b){function c(){var m=
-n+d;m>a.length&&(m=a.length);i+=e(a,n,m);n=m;m=n===a.length;b(i,m)&&!m&&runtime.setTimeout(c,0)}var d=1E5,i="",n=0;a.length<d?b(e(a,0,a.length),!0):("string"!==typeof a&&(a=a.slice()),c())}function h(a){return g(j(a))}function n(a){return String.fromCharCode.apply(String,g(a))}function o(a){return String.fromCharCode.apply(String,g(j(a)))}var u="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";(function(){var a=[],b;for(b=0;26>b;b+=1)a.push(65+b);for(b=0;26>b;b+=1)a.push(97+b);for(b=
-0;10>b;b+=1)a.push(48+b);a.push(43);a.push(47);return a})();var s=function(a){var b={},c,e;c=0;for(e=a.length;c<e;c+=1)b[a.charAt(c)]=c;return b}(u),p,w,B,A;(B=runtime.getWindow()&&runtime.getWindow().btoa)?p=function(a){return B(o(a))}:(B=c,p=function(a){return l(h(a))});(A=runtime.getWindow()&&runtime.getWindow().atob)?w=function(a){a=A(a);return e(a,0,a.length)}:(A=b,w=function(a){return k(f(a))});return function(){this.convertByteArrayToBase64=this.convertUTF8ArrayToBase64=l;this.convertBase64ToByteArray=
-this.convertBase64ToUTF8Array=f;this.convertUTF16ArrayToByteArray=this.convertUTF16ArrayToUTF8Array=g;this.convertByteArrayToUTF16Array=this.convertUTF8ArrayToUTF16Array=a;this.convertUTF8StringToBase64=c;this.convertBase64ToUTF8String=b;this.convertUTF8StringToUTF16Array=d;this.convertByteArrayToUTF16String=this.convertUTF8ArrayToUTF16String=k;this.convertUTF8StringToUTF16String=i;this.convertUTF16StringToByteArray=this.convertUTF16StringToUTF8Array=h;this.convertUTF16ArrayToUTF8String=n;this.convertUTF16StringToUTF8String=
-o;this.convertUTF16StringToBase64=p;this.convertBase64ToUTF16String=w;this.fromBase64=b;this.toBase64=c;this.atob=A;this.btoa=B;this.utob=o;this.btou=i;this.encode=p;this.encodeURI=function(a){return p(a).replace(/[+\/]/g,function(a){return a==="+"?"-":"_"}).replace(/\\=+$/,"")};this.decode=function(a){return w(a.replace(/[\-_]/g,function(a){return a==="-"?"+":"/"}))}}}();
-// Input 3
-core.RawDeflate=function(){function j(){this.dl=this.fc=0}function l(){this.extra_bits=this.static_tree=this.dyn_tree=null;this.max_code=this.max_length=this.elems=this.extra_base=0}function f(a,b,c,e){this.good_length=a;this.max_lazy=b;this.nice_length=c;this.max_chain=e}function g(){this.next=null;this.len=0;this.ptr=[];this.ptr.length=a;this.off=0}var a=8192,c,b,d,k,e=null,i,h,n,o,u,s,p,w,B,A,q,x,E,C,z,F,m,t,r,y,L,T,O,N,v,J,G,R,K,H,D,U,M,I,V,Z,S,$,Y,ha,ca,da,P,ia,pa,aa,ea,W,ba,ja,qa,ra=[0,0,0,
-0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,0],fa=[0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13],Ha=[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,3,7],va=[16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15],ka;ka=[new f(0,0,0,0),new f(4,4,8,4),new f(4,5,16,8),new f(4,6,32,32),new f(4,4,16,16),new f(8,16,32,32),new f(8,16,128,128),new f(8,32,128,256),new f(32,128,258,1024),new f(32,258,258,4096)];var la=function(m){e[h+i++]=m;if(h+i===a){var r;if(0!==i){null!==c?(m=c,c=c.next):m=new g;
-m.next=null;m.len=m.off=0;null===b?b=d=m:d=d.next=m;m.len=i-h;for(r=0;r<m.len;r++)m.ptr[r]=e[h+r];i=h=0}}},ma=function(b){b&=65535;h+i<a-2?(e[h+i++]=b&255,e[h+i++]=b>>>8):(la(b&255),la(b>>>8))},na=function(){q=(q<<5^o[m+3-1]&255)&8191;x=p[32768+q];p[m&32767]=x;p[32768+q]=m},Q=function(a,b){B>16-b?(w|=a<<B,ma(w),w=a>>16-B,B+=b-16):(w|=a<<B,B+=b)},X=function(a,b){Q(b[a].fc,b[a].dl)},wa=function(a,b,c){return a[b].fc<a[c].fc||a[b].fc===a[c].fc&&S[b]<=S[c]},xa=function(a,b,c){var e;for(e=0;e<c&&qa<ja.length;e++)a[b+
-e]=ja.charCodeAt(qa++)&255;return e},sa=function(){var a,b,c=65536-y-m;if(-1===c)c--;else if(65274<=m){for(a=0;32768>a;a++)o[a]=o[a+32768];t-=32768;m-=32768;A-=32768;for(a=0;8192>a;a++)b=p[32768+a],p[32768+a]=32768<=b?b-32768:0;for(a=0;32768>a;a++)b=p[a],p[a]=32768<=b?b-32768:0;c+=32768}r||(a=xa(o,m+y,c),0>=a?r=!0:y+=a)},ya=function(a){var b=L,c=m,e,d=F,i=32506<m?m-32506:0,r=m+258,n=o[c+d-1],h=o[c+d];F>=N&&(b>>=2);do if(e=a,!(o[e+d]!==h||o[e+d-1]!==n||o[e]!==o[c]||o[++e]!==o[c+1])){c+=2;e++;do++c;
-while(o[c]===o[++e]&&o[++c]===o[++e]&&o[++c]===o[++e]&&o[++c]===o[++e]&&o[++c]===o[++e]&&o[++c]===o[++e]&&o[++c]===o[++e]&&o[++c]===o[++e]&&c<r);e=258-(r-c);c=r-258;if(e>d){t=a;d=e;if(258<=e)break;n=o[c+d-1];h=o[c+d]}}while((a=p[a&32767])>i&&0!==--b);return d},ga=function(a,b){s[P++]=b;0===a?v[b].fc++:(a--,v[$[b]+256+1].fc++,J[(256>a?Y[a]:Y[256+(a>>7)])&255].fc++,u[ia++]=a,aa|=ea);ea<<=1;0===(P&7)&&(da[pa++]=aa,aa=0,ea=1);if(2<O&&0===(P&4095)){var c=8*P,e=m-A,d;for(d=0;30>d;d++)c+=J[d].fc*(5+fa[d]);
-c>>=3;if(ia<parseInt(P/2,10)&&c<parseInt(e/2,10))return!0}return 8191===P||8192===ia},ta=function(a,b){for(var c=I[b],e=b<<1;e<=V;){e<V&&wa(a,I[e+1],I[e])&&e++;if(wa(a,c,I[e]))break;I[b]=I[e];b=e;e<<=1}I[b]=c},za=function(a,b){var c=0;do c|=a&1,a>>=1,c<<=1;while(0<--b);return c>>1},Aa=function(a,b){var c=[];c.length=16;var e=0,d;for(d=1;15>=d;d++)e=e+M[d-1]<<1,c[d]=e;for(e=0;e<=b;e++)d=a[e].dl,0!==d&&(a[e].fc=za(c[d]++,d))},ua=function(a){var b=a.dyn_tree,c=a.static_tree,e=a.elems,d,m=-1,i=e;V=0;
-Z=573;for(d=0;d<e;d++)0!==b[d].fc?(I[++V]=m=d,S[d]=0):b[d].dl=0;for(;2>V;)d=I[++V]=2>m?++m:0,b[d].fc=1,S[d]=0,W--,null!==c&&(ba-=c[d].dl);a.max_code=m;for(d=V>>1;1<=d;d--)ta(b,d);do d=I[1],I[1]=I[V--],ta(b,1),c=I[1],I[--Z]=d,I[--Z]=c,b[i].fc=b[d].fc+b[c].fc,S[i]=S[d]>S[c]+1?S[d]:S[c]+1,b[d].dl=b[c].dl=i,I[1]=i++,ta(b,1);while(2<=V);I[--Z]=I[1];i=a.dyn_tree;d=a.extra_bits;var e=a.extra_base,c=a.max_code,r=a.max_length,n=a.static_tree,t,h,f,k,q=0;for(h=0;15>=h;h++)M[h]=0;i[I[Z]].dl=0;for(a=Z+1;573>
-a;a++)if(t=I[a],h=i[i[t].dl].dl+1,h>r&&(h=r,q++),i[t].dl=h,!(t>c))M[h]++,f=0,t>=e&&(f=d[t-e]),k=i[t].fc,W+=k*(h+f),null!==n&&(ba+=k*(n[t].dl+f));if(0!==q){do{for(h=r-1;0===M[h];)h--;M[h]--;M[h+1]+=2;M[r]--;q-=2}while(0<q);for(h=r;0!==h;h--)for(t=M[h];0!==t;)d=I[--a],d>c||(i[d].dl!==h&&(W+=(h-i[d].dl)*i[d].fc,i[d].fc=h),t--)}Aa(b,m)},Ba=function(a,b){var c,e=-1,d,m=a[0].dl,i=0,h=7,r=4;0===m&&(h=138,r=3);a[b+1].dl=65535;for(c=0;c<=b;c++)if(d=m,m=a[c+1].dl,!(++i<h&&d===m))(i<r?K[d].fc+=i:0!==d?(d!==
-e&&K[d].fc++,K[16].fc++):10>=i?K[17].fc++:K[18].fc++,i=0,e=d,0===m)?(h=138,r=3):d===m?(h=6,r=3):(h=7,r=4)},Ca=function(){8<B?ma(w):0<B&&la(w);B=w=0},Da=function(a,b){var c,e=0,d=0,m=0,i=0,h,r;if(0!==P){do{0===(e&7)&&(i=da[m++]);c=s[e++]&255;if(0===(i&1))X(c,a);else if(h=$[c],X(h+256+1,a),r=ra[h],0!==r&&(c-=ha[h],Q(c,r)),c=u[d++],h=(256>c?Y[c]:Y[256+(c>>7)])&255,X(h,b),r=fa[h],0!==r)c-=ca[h],Q(c,r);i>>=1}while(e<P)}X(256,a)},Ea=function(a,b){var c,e=-1,d,m=a[0].dl,i=0,h=7,r=4;0===m&&(h=138,r=3);for(c=
-0;c<=b;c++)if(d=m,m=a[c+1].dl,!(++i<h&&d===m)){if(i<r){do X(d,K);while(0!==--i)}else 0!==d?(d!==e&&(X(d,K),i--),X(16,K),Q(i-3,2)):10>=i?(X(17,K),Q(i-3,3)):(X(18,K),Q(i-11,7));i=0;e=d;0===m?(h=138,r=3):d===m?(h=6,r=3):(h=7,r=4)}},Fa=function(){var a;for(a=0;286>a;a++)v[a].fc=0;for(a=0;30>a;a++)J[a].fc=0;for(a=0;19>a;a++)K[a].fc=0;v[256].fc=1;aa=P=ia=pa=W=ba=0;ea=1},oa=function(a){var b,c,e,d;d=m-A;da[pa]=aa;ua(H);ua(D);Ba(v,H.max_code);Ba(J,D.max_code);ua(U);for(e=18;3<=e&&0===K[va[e]].dl;e--);W+=
-3*(e+1)+14;b=W+3+7>>3;c=ba+3+7>>3;c<=b&&(b=c);if(d+4<=b&&0<=A){Q(0+a,3);Ca();ma(d);ma(~d);for(e=0;e<d;e++)la(o[A+e])}else if(c===b)Q(2+a,3),Da(G,R);else{Q(4+a,3);d=H.max_code+1;b=D.max_code+1;e+=1;Q(d-257,5);Q(b-1,5);Q(e-4,4);for(c=0;c<e;c++)Q(K[va[c]].dl,3);Ea(v,d-1);Ea(J,b-1);Da(v,J)}Fa();0!==a&&Ca()},Ga=function(a,d,m){var r,t,n;for(r=0;null!==b&&r<m;){t=m-r;t>b.len&&(t=b.len);for(n=0;n<t;n++)a[d+r+n]=b.ptr[b.off+n];b.off+=t;b.len-=t;r+=t;0===b.len&&(t=b,b=b.next,t.next=c,c=t)}if(r===m)return r;
-if(h<i){t=m-r;t>i-h&&(t=i-h);for(n=0;n<t;n++)a[d+r+n]=e[h+n];h+=t;r+=t;i===h&&(i=h=0)}return r},Ia=function(a,c,e){var d;if(!k){if(!r){B=w=0;var f,g;if(0===R[0].dl){H.dyn_tree=v;H.static_tree=G;H.extra_bits=ra;H.extra_base=257;H.elems=286;H.max_length=15;H.max_code=0;D.dyn_tree=J;D.static_tree=R;D.extra_bits=fa;D.extra_base=0;D.elems=30;D.max_length=15;D.max_code=0;U.dyn_tree=K;U.static_tree=null;U.extra_bits=Ha;U.extra_base=0;U.elems=19;U.max_length=7;for(g=f=U.max_code=0;28>g;g++){ha[g]=f;for(d=
-0;d<1<<ra[g];d++)$[f++]=g}$[f-1]=g;for(g=f=0;16>g;g++){ca[g]=f;for(d=0;d<1<<fa[g];d++)Y[f++]=g}for(f>>=7;30>g;g++){ca[g]=f<<7;for(d=0;d<1<<fa[g]-7;d++)Y[256+f++]=g}for(d=0;15>=d;d++)M[d]=0;for(d=0;143>=d;)G[d++].dl=8,M[8]++;for(;255>=d;)G[d++].dl=9,M[9]++;for(;279>=d;)G[d++].dl=7,M[7]++;for(;287>=d;)G[d++].dl=8,M[8]++;Aa(G,287);for(d=0;30>d;d++)R[d].dl=5,R[d].fc=za(d,5);Fa()}for(d=0;8192>d;d++)p[32768+d]=0;T=ka[O].max_lazy;N=ka[O].good_length;L=ka[O].max_chain;A=m=0;y=xa(o,0,65536);if(0>=y)r=!0,y=
-0;else{for(r=!1;262>y&&!r;)sa();for(d=q=0;2>d;d++)q=(q<<5^o[d]&255)&8191}b=null;h=i=0;3>=O?(F=2,z=0):(z=2,C=0);n=!1}k=!0;if(0===y)return n=!0,0}if((d=Ga(a,c,e))===e)return e;if(n)return d;if(3>=O)for(;0!==y&&null===b;){na();0!==x&&32506>=m-x&&(z=ya(x),z>y&&(z=y));if(3<=z)if(g=ga(m-t,z-3),y-=z,z<=T){z--;do m++,na();while(0!==--z);m++}else m+=z,z=0,q=o[m]&255,q=(q<<5^o[m+1]&255)&8191;else g=ga(0,o[m]&255),y--,m++;g&&(oa(0),A=m);for(;262>y&&!r;)sa()}else for(;0!==y&&null===b;){na();F=z;E=t;z=2;0!==x&&
-F<T&&32506>=m-x&&(z=ya(x),z>y&&(z=y),3===z&&4096<m-t&&z--);if(3<=F&&z<=F){g=ga(m-1-E,F-3);y-=F-1;F-=2;do m++,na();while(0!==--F);C=0;z=2;m++;g&&(oa(0),A=m)}else 0!==C?ga(0,o[m-1]&255)&&(oa(0),A=m):C=1,m++,y--;for(;262>y&&!r;)sa()}0===y&&(0!==C&&ga(0,o[m-1]&255),oa(1),n=!0);return d+Ga(a,d+c,e-d)};this.deflate=function(m,i){var h,t;ja=m;qa=0;"undefined"===typeof i&&(i=6);(h=i)?1>h?h=1:9<h&&(h=9):h=6;O=h;r=k=!1;if(null===e){c=b=d=null;e=[];e.length=a;o=[];o.length=65536;u=[];u.length=8192;s=[];s.length=
-32832;p=[];p.length=65536;v=[];v.length=573;for(h=0;573>h;h++)v[h]=new j;J=[];J.length=61;for(h=0;61>h;h++)J[h]=new j;G=[];G.length=288;for(h=0;288>h;h++)G[h]=new j;R=[];R.length=30;for(h=0;30>h;h++)R[h]=new j;K=[];K.length=39;for(h=0;39>h;h++)K[h]=new j;H=new l;D=new l;U=new l;M=[];M.length=16;I=[];I.length=573;S=[];S.length=573;$=[];$.length=256;Y=[];Y.length=512;ha=[];ha.length=29;ca=[];ca.length=30;da=[];da.length=1024}for(var n=Array(1024),f=[];0<(h=Ia(n,0,n.length));){var g=[];g.length=h;for(t=
-0;t<h;t++)g[t]=String.fromCharCode(n[t]);f[f.length]=g.join("")}ja=null;return f.join("")}};
-// Input 4
-core.ByteArray=function(j){this.pos=0;this.data=j;this.readUInt32LE=function(){var j=this.data,f=this.pos+=4;return j[--f]<<24|j[--f]<<16|j[--f]<<8|j[--f]};this.readUInt16LE=function(){var j=this.data,f=this.pos+=2;return j[--f]<<8|j[--f]}};
-// Input 5
-core.ByteArrayWriter=function(j){var l=this,f=new runtime.ByteArray(0);this.appendByteArrayWriter=function(g){f=runtime.concatByteArrays(f,g.getByteArray())};this.appendByteArray=function(g){f=runtime.concatByteArrays(f,g)};this.appendArray=function(g){f=runtime.concatByteArrays(f,runtime.byteArrayFromArray(g))};this.appendUInt16LE=function(f){l.appendArray([f&255,f>>8&255])};this.appendUInt32LE=function(f){l.appendArray([f&255,f>>8&255,f>>16&255,f>>24&255])};this.appendString=function(g){f=runtime.concatByteArrays(f,
-runtime.byteArrayFromString(g,j))};this.getLength=function(){return f.length};this.getByteArray=function(){return f}};
-// Input 6
-core.RawInflate=function(){var j,l,f=null,g,a,c,b,d,k,e,i,h,n,o,u,s,p,w=[0,1,3,7,15,31,63,127,255,511,1023,2047,4095,8191,16383,32767,65535],B=[3,4,5,6,7,8,9,10,11,13,15,17,19,23,27,31,35,43,51,59,67,83,99,115,131,163,195,227,258,0,0],A=[0,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,0,99,99],q=[1,2,3,4,5,7,9,13,17,25,33,49,65,97,129,193,257,385,513,769,1025,1537,2049,3073,4097,6145,8193,12289,16385,24577],x=[0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13],E=[16,17,18,
-0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15],C=function(){this.list=this.next=null},z=function(){this.n=this.b=this.e=0;this.t=null},F=function(a,b,c,d,e,m){this.BMAX=16;this.N_MAX=288;this.status=0;this.root=null;this.m=0;var h=Array(this.BMAX+1),i,r,t,n,f,k,g,q=Array(this.BMAX+1),o,j,p,y=new z,x=Array(this.BMAX);n=Array(this.N_MAX);var E,s=Array(this.BMAX+1),B,A,u;u=this.root=null;for(f=0;f<h.length;f++)h[f]=0;for(f=0;f<q.length;f++)q[f]=0;for(f=0;f<x.length;f++)x[f]=null;for(f=0;f<n.length;f++)n[f]=
-0;for(f=0;f<s.length;f++)s[f]=0;i=256<b?a[256]:this.BMAX;o=a;j=0;f=b;do h[o[j]]++,j++;while(0<--f);if(h[0]==b)this.root=null,this.status=this.m=0;else{for(k=1;k<=this.BMAX&&0==h[k];k++);g=k;m<k&&(m=k);for(f=this.BMAX;0!=f&&0==h[f];f--);t=f;m>f&&(m=f);for(B=1<<k;k<f;k++,B<<=1)if(0>(B-=h[k])){this.status=2;this.m=m;return}if(0>(B-=h[f]))this.status=2,this.m=m;else{h[f]+=B;s[1]=k=0;o=h;j=1;for(p=2;0<--f;)s[p++]=k+=o[j++];o=a;f=j=0;do if(0!=(k=o[j++]))n[s[k]++]=f;while(++f<b);b=s[t];s[0]=f=0;o=n;j=0;
-n=-1;E=q[0]=0;p=null;for(A=0;g<=t;g++)for(a=h[g];0<a--;){for(;g>E+q[1+n];){E+=q[1+n];n++;A=(A=t-E)>m?m:A;if((r=1<<(k=g-E))>a+1){r-=a+1;for(p=g;++k<A&&!((r<<=1)<=h[++p]);)r-=h[p]}E+k>i&&E<i&&(k=i-E);A=1<<k;q[1+n]=k;p=Array(A);for(r=0;r<A;r++)p[r]=new z;u=null==u?this.root=new C:u.next=new C;u.next=null;u.list=p;x[n]=p;0<n&&(s[n]=f,y.b=q[n],y.e=16+k,y.t=p,k=(f&(1<<E)-1)>>E-q[n],x[n-1][k].e=y.e,x[n-1][k].b=y.b,x[n-1][k].n=y.n,x[n-1][k].t=y.t)}y.b=g-E;j>=b?y.e=99:o[j]<c?(y.e=256>o[j]?16:15,y.n=o[j++]):
-(y.e=e[o[j]-c],y.n=d[o[j++]-c]);r=1<<g-E;for(k=f>>E;k<A;k+=r)p[k].e=y.e,p[k].b=y.b,p[k].n=y.n,p[k].t=y.t;for(k=1<<g-1;0!=(f&k);k>>=1)f^=k;for(f^=k;(f&(1<<E)-1)!=s[n];)E-=q[n],n--}this.m=q[1];this.status=0!=B&&1!=t?1:0}}},m=function(a){for(;b<a;)c|=(s.length==p?-1:s[p++])<<b,b+=8},t=function(a){return c&w[a]},r=function(a){c>>=a;b-=a},y=function(a,b,c){var f,k,g;if(0==c)return 0;for(g=0;;){m(o);k=h.list[t(o)];for(f=k.e;16<f;){if(99==f)return-1;r(k.b);f-=16;m(f);k=k.t[t(f)];f=k.e}r(k.b);if(16==f)l&=
-32767,a[b+g++]=j[l++]=k.n;else{if(15==f)break;m(f);e=k.n+t(f);r(f);m(u);k=n.list[t(u)];for(f=k.e;16<f;){if(99==f)return-1;r(k.b);f-=16;m(f);k=k.t[t(f)];f=k.e}r(k.b);m(f);i=l-k.n-t(f);for(r(f);0<e&&g<c;)e--,i&=32767,l&=32767,a[b+g++]=j[l++]=j[i++]}if(g==c)return c}d=-1;return g},L,T=function(a,b,c){var d,e,f,i,k,g,j,p=Array(316);for(d=0;d<p.length;d++)p[d]=0;m(5);g=257+t(5);r(5);m(5);j=1+t(5);r(5);m(4);d=4+t(4);r(4);if(286<g||30<j)return-1;for(e=0;e<d;e++)m(3),p[E[e]]=t(3),r(3);for(;19>e;e++)p[E[e]]=
-0;o=7;e=new F(p,19,19,null,null,o);if(0!=e.status)return-1;h=e.root;o=e.m;i=g+j;for(d=f=0;d<i;)if(m(o),k=h.list[t(o)],e=k.b,r(e),e=k.n,16>e)p[d++]=f=e;else if(16==e){m(2);e=3+t(2);r(2);if(d+e>i)return-1;for(;0<e--;)p[d++]=f}else{17==e?(m(3),e=3+t(3),r(3)):(m(7),e=11+t(7),r(7));if(d+e>i)return-1;for(;0<e--;)p[d++]=0;f=0}o=9;e=new F(p,g,257,B,A,o);0==o&&(e.status=1);if(0!=e.status)return-1;h=e.root;o=e.m;for(d=0;d<j;d++)p[d]=p[d+g];u=6;e=new F(p,j,0,q,x,u);n=e.root;u=e.m;return 0==u&&257<g||0!=e.status?
--1:y(a,b,c)};this.inflate=function(E,C){null==j&&(j=Array(65536));b=c=l=0;d=-1;k=!1;e=i=0;h=null;s=E;p=0;var z=new runtime.ByteArray(C);a:{var w,G;for(w=0;w<C&&!(k&&-1==d);){if(0<e){if(0!=d)for(;0<e&&w<C;)e--,i&=32767,l&=32767,z[0+w++]=j[l++]=j[i++];else{for(;0<e&&w<C;)e--,l&=32767,m(8),z[0+w++]=j[l++]=t(8),r(8);0==e&&(d=-1)}if(w==C)break}if(-1==d){if(k)break;m(1);0!=t(1)&&(k=!0);r(1);m(2);d=t(2);r(2);h=null;e=0}switch(d){case 0:G=z;var R=0+w,K=C-w,H=void 0,H=b&7;r(H);m(16);H=t(16);r(16);m(16);if(H!=
-(~c&65535))G=-1;else{r(16);e=H;for(H=0;0<e&&H<K;)e--,l&=32767,m(8),G[R+H++]=j[l++]=t(8),r(8);0==e&&(d=-1);G=H}break;case 1:if(null!=h)G=y(z,0+w,C-w);else b:{G=z;R=0+w;K=C-w;if(null==f){for(var D=void 0,H=Array(288),D=void 0,D=0;144>D;D++)H[D]=8;for(;256>D;D++)H[D]=9;for(;280>D;D++)H[D]=7;for(;288>D;D++)H[D]=8;a=7;D=new F(H,288,257,B,A,a);if(0!=D.status){alert("HufBuild error: "+D.status);G=-1;break b}f=D.root;a=D.m;for(D=0;30>D;D++)H[D]=5;L=5;D=new F(H,30,0,q,x,L);if(1<D.status){f=null;alert("HufBuild error: "+
-D.status);G=-1;break b}g=D.root;L=D.m}h=f;n=g;o=a;u=L;G=y(G,R,K)}break;case 2:G=null!=h?y(z,0+w,C-w):T(z,0+w,C-w);break;default:G=-1}if(-1==G)break a;w+=G}}s=null;return z}};
-// Input 7
-core.Cursor=function(j,l){function f(a,b){for(var d=b;d&&d!==a;)d=d.parentNode;return d||b}function g(){var c,b,d;if(a.parentNode){b=0;for(c=a.parentNode.firstChild;c&&c!==a;)b+=1,c=c.nextSibling;a.previousSibling&&3===a.previousSibling.nodeType&&a.nextSibling&&3===a.nextSibling.nodeType&&(d=a.nextSibling,a.previousSibling.appendData(d.nodeValue));for(c=0;c<j.rangeCount;c+=1){var k=j.getRangeAt(c),e=b,i=void 0,h=void 0,i=a.parentNode,h=f(a,k.startContainer);f(a,k.endContainer);h===a?k.setStart(i,
-e):h===i&&k.startOffset>e&&k.setStart(i,k.startOffset-1);k.endContainer===a?k.setEnd(i,e):k.endContainer===i&&k.endOffset>e&&k.setEnd(i,k.endOffset-1)}if(d){for(c=0;c<j.rangeCount;c+=1){var k=j.getRangeAt(c),e=a.previousSibling,i=d,h=b,n=e.length-i.length;k.startContainer===i?k.setStart(e,n+k.startOffset):k.startContainer===e.parentNode&&k.startOffset===h&&k.setStart(e,n);k.endContainer===i?k.setEnd(e,n+k.endOffset):k.endContainer===e.parentNode&&k.endOffset===h&&k.setEnd(e,n)}d.parentNode.removeChild(d)}a.parentNode.removeChild(a)}}
-var a;a=l.createElementNS("urn:webodf:names:cursor","cursor");this.getNode=function(){return a};this.updateToSelection=function(){g();if(j.focusNode){var c=j.focusNode,b=j.focusOffset;if(3===c.nodeType){var d,f,e,i;i=c.parentNode;0===b?i.insertBefore(a,c):b===c.length?i.appendChild(a):(d=c.length,f=c.nextSibling,e=l.createTextNode(c.substringData(b,d)),c.deleteData(b,d),f?i.insertBefore(e,f):i.appendChild(e),i.insertBefore(a,e))}else if(9!==c.nodeType){for(d=c.firstChild;d&&b;)d=d.nextSibling,b-=
-1;c.insertBefore(a,d)}}};this.remove=function(){g()}};
-// Input 8
-core.UnitTest=function(){};core.UnitTest.prototype.setUp=function(){};core.UnitTest.prototype.tearDown=function(){};core.UnitTest.prototype.description=function(){};core.UnitTest.prototype.tests=function(){};core.UnitTest.prototype.asyncTests=function(){};
-core.UnitTestRunner=function(){function j(a){g+=1;runtime.log("fail",a)}function l(a,c){var b;try{if(a.length!==c.length)return!1;for(b=0;b<a.length;b+=1)if(a[b]!==c[b])return!1}catch(d){return!1}return!0}function f(a,c,b){("string"!==typeof c||"string"!==typeof b)&&runtime.log("WARN: shouldBe() expects string arguments");var d,f;try{f=eval(c)}catch(e){d=e}a=eval(b);d?j(c+" should be "+a+". Threw exception "+d):(0===a?f===a&&1/f===1/a:f===a||("number"===typeof a&&isNaN(a)?"number"===typeof f&&isNaN(f):
-Object.prototype.toString.call(a)===Object.prototype.toString.call([])&&l(f,a)))?runtime.log("pass",c+" is "+b):typeof f===typeof a?j(c+" should be "+a+". Was "+(0===f&&0>1/f?"-0":""+f)+"."):j(c+" should be "+a+" (of type "+typeof a+"). Was "+f+" (of type "+typeof f+").")}var g=0;this.shouldBeNull=function(a,c){f(a,c,"null")};this.shouldBeNonNull=function(a,c){var b,d;try{d=eval(c)}catch(f){b=f}b?j(c+" should be non-null. Threw exception "+b):null!==d?runtime.log("pass",c+" is non-null."):j(c+" should be non-null. Was "+
-d)};this.shouldBe=f;this.countFailedTests=function(){return g}};
-core.UnitTester=function(){var j=0,l={};this.runTests=function(f,g){function a(b){if(0===b.length)l[c]=e,j+=d.countFailedTests(),g();else{h=b[0];var f=Runtime.getFunctionName(h);runtime.log("Running "+f);o=d.countFailedTests();k.setUp();h(function(){k.tearDown();e[f]=o===d.countFailedTests();a(b.slice(1))})}}var c=Runtime.getFunctionName(f),b,d=new core.UnitTestRunner,k=new f(d),e={},i,h,n,o;if(c.hasOwnProperty(l))runtime.log("Test "+c+" has already run.");else{runtime.log("Running "+c+": "+k.description());
-n=k.tests();for(i=0;i<n.length;i+=1)h=n[i],b=Runtime.getFunctionName(h),runtime.log("Running "+b),o=d.countFailedTests(),k.setUp(),h(),k.tearDown(),e[b]=o===d.countFailedTests();a(k.asyncTests())}};this.countFailedTests=function(){return j};this.results=function(){return l}};
-// Input 9
-core.PointWalker=function(j){function l(a){for(var c=-1;a;)a=a.previousSibling,c+=1;return c}var f=j,g=null,a=j&&j.firstChild,c=0;this.setPoint=function(b,d){f=b;c=d;if(3===f.nodeType)g=a=null;else{for(a=f.firstChild;d;)d-=1,a=a.nextSibling;g=a?a.previousSibling:f.lastChild}};this.stepForward=function(){var b;return 3===f.nodeType&&(b="number"===typeof f.nodeValue.length?f.nodeValue.length:f.nodeValue.length(),c<b)?(c+=1,!0):a?(1===a.nodeType?(f=a,g=null,a=f.firstChild,c=0):3===a.nodeType?(f=a,a=
-g=null,c=0):(g=a,a=a.nextSibling,c+=1),!0):f!==j?(g=f,a=g.nextSibling,f=f.parentNode,c=l(g)+1,!0):!1};this.stepBackward=function(){return 3===f.nodeType&&0<c?(c-=1,!0):g?(1===g.nodeType?(f=g,g=f.lastChild,a=null,c=l(g)+1):3===g.nodeType?(f=g,a=g=null,c="number"===typeof f.nodeValue.length?f.nodeValue.length:f.nodeValue.length()):(a=g,g=g.previousSibling,c-=1),!0):f!==j?(a=f,g=a.previousSibling,f=f.parentNode,c=l(a),!0):!1};this.node=function(){return f};this.position=function(){return c};this.precedingSibling=
-function(){return g};this.followingSibling=function(){return a}};
-// Input 10
-core.Async=function(){this.forEach=function(j,l,f){function g(a){b!==c&&(a?(b=c,f(a)):(b+=1,b===c&&f(null)))}var a,c=j.length,b=0;for(a=0;a<c;a+=1)l(j[a],g)}};
-// Input 11
-runtime.loadClass("core.RawInflate");runtime.loadClass("core.ByteArray");runtime.loadClass("core.ByteArrayWriter");runtime.loadClass("core.Base64");
-core.Zip=function(j,l){function f(a){var b=[0,1996959894,3993919788,2567524794,124634137,1886057615,3915621685,2657392035,249268274,2044508324,3772115230,2547177864,162941995,2125561021,3887607047,2428444049,498536548,1789927666,4089016648,2227061214,450548861,1843258603,4107580753,2211677639,325883990,1684777152,4251122042,2321926636,335633487,1661365465,4195302755,2366115317,997073096,1281953886,3579855332,2724688242,1006888145,1258607687,3524101629,2768942443,901097722,1119000684,3686517206,2898065728,
-853044451,1172266101,3705015759,2882616665,651767980,1373503546,3369554304,3218104598,565507253,1454621731,3485111705,3099436303,671266974,1594198024,3322730930,2970347812,795835527,1483230225,3244367275,3060149565,1994146192,31158534,2563907772,4023717930,1907459465,112637215,2680153253,3904427059,2013776290,251722036,2517215374,3775830040,2137656763,141376813,2439277719,3865271297,1802195444,476864866,2238001368,4066508878,1812370925,453092731,2181625025,4111451223,1706088902,314042704,2344532202,
-4240017532,1658658271,366619977,2362670323,4224994405,1303535960,984961486,2747007092,3569037538,1256170817,1037604311,2765210733,3554079995,1131014506,879679996,2909243462,3663771856,1141124467,855842277,2852801631,3708648649,1342533948,654459306,3188396048,3373015174,1466479909,544179635,3110523913,3462522015,1591671054,702138776,2966460450,3352799412,1504918807,783551873,3082640443,3233442989,3988292384,2596254646,62317068,1957810842,3939845945,2647816111,81470997,1943803523,3814918930,2489596804,
-225274430,2053790376,3826175755,2466906013,167816743,2097651377,4027552580,2265490386,503444072,1762050814,4150417245,2154129355,426522225,1852507879,4275313526,2312317920,282753626,1742555852,4189708143,2394877945,397917763,1622183637,3604390888,2714866558,953729732,1340076626,3518719985,2797360999,1068828381,1219638859,3624741850,2936675148,906185462,1090812512,3747672003,2825379669,829329135,1181335161,3412177804,3160834842,628085408,1382605366,3423369109,3138078467,570562233,1426400815,3317316542,
-2998733608,733239954,1555261956,3268935591,3050360625,752459403,1541320221,2607071920,3965973030,1969922972,40735498,2617837225,3943577151,1913087877,83908371,2512341634,3803740692,2075208622,213261112,2463272603,3855990285,2094854071,198958881,2262029012,4057260610,1759359992,534414190,2176718541,4139329115,1873836001,414664567,2282248934,4279200368,1711684554,285281116,2405801727,4167216745,1634467795,376229701,2685067896,3608007406,1308918612,956543938,2808555105,3495958263,1231636301,1047427035,
-2932959818,3654703836,1088359270,936918E3,2847714899,3736837829,1202900863,817233897,3183342108,3401237130,1404277552,615818150,3134207493,3453421203,1423857449,601450431,3009837614,3294710456,1567103746,711928724,3020668471,3272380065,1510334235,755167117],c,e,d=a.length,f=0,f=0;c=-1;for(e=0;e<d;e+=1)f=(c^a[e])&255,f=b[f],c=c>>>8^f;return c^-1}function g(a){return new Date((a>>25&127)+1980,(a>>21&15)-1,a>>16&31,a>>11&15,a>>5&63,(a&31)<<1)}function a(a){var b=a.getFullYear();return 1980>b?0:b-1980<<
-25|a.getMonth()+1<<21|a.getDate()<<16|a.getHours()<<11|a.getMinutes()<<5|a.getSeconds()>>1}function c(a,b){var c,e,d,f,h,i,m,n=this;this.load=function(b){if(void 0!==n.data)b(null,n.data);else{var d=h+34+c+e+256;d+m>o&&(d=o-m);runtime.read(a,m,d,function(c,e){if(c)b(c,e);else a:{var d=e,m=new core.ByteArray(d),k=m.readUInt32LE(),g;if(67324752!==k)b("File entry signature is wrong."+k.toString()+" "+d.length.toString(),null);else{m.pos+=22;k=m.readUInt16LE();g=m.readUInt16LE();m.pos+=k+g;if(f){d=d.slice(m.pos,
-m.pos+h);if(h!==d.length){b("The amount of compressed bytes read was "+d.length.toString()+" instead of "+h.toString()+" for "+n.filename+" in "+a+".",null);break a}d=s(d,i)}else d=d.slice(m.pos,m.pos+i);i!==d.length?b("The amount of bytes read was "+d.length.toString()+" instead of "+i.toString()+" for "+n.filename+" in "+a+".",null):(n.data=d,b(null,d))}}})}};this.set=function(a,b,c,e){n.filename=a;n.data=b;n.compressed=c;n.date=e};this.error=null;b&&(33639248!==b.readUInt32LE()?this.error="Central directory entry has wrong signature at position "+
-(b.pos-4).toString()+' for file "'+a+'": '+b.data.length.toString():(b.pos+=6,f=b.readUInt16LE(),this.date=g(b.readUInt32LE()),b.readUInt32LE(),h=b.readUInt32LE(),i=b.readUInt32LE(),c=b.readUInt16LE(),e=b.readUInt16LE(),d=b.readUInt16LE(),b.pos+=8,m=b.readUInt32LE(),this.filename=runtime.byteArrayToString(b.data.slice(b.pos,b.pos+c),"utf8"),b.pos+=c+e+d))}function b(a,b){if(22!==a.length)b("Central directory length should be 22.",p);else{var e=new core.ByteArray(a),d;d=e.readUInt32LE();101010256!==
-d?b("Central directory signature is wrong: "+d.toString(),p):0!==e.readUInt16LE()?b("Zip files with non-zero disk numbers are not supported.",p):0!==e.readUInt16LE()?b("Zip files with non-zero disk numbers are not supported.",p):(d=e.readUInt16LE(),u=e.readUInt16LE(),d!==u?b("Number of entries is inconsistent.",p):(d=e.readUInt32LE(),e=e.readUInt16LE(),e=o-22-d,runtime.read(j,e,o-e,function(a,e){a:{var d=new core.ByteArray(e),f,m;n=[];for(f=0;f<u;f+=1){m=new c(j,d);if(m.error){b(m.error,p);break a}n[n.length]=
-m}b(null,p)}})))}}function d(a,b){var c=null,e,d;for(d=0;d<n.length;d+=1)if(e=n[d],e.filename===a){c=e;break}c?c.data?b(null,c.data):c.load(b):b(a+" not found.",null)}function k(a,b){d(a,function(a,c){if(a)return b(a,null);c=runtime.byteArrayToString(c,"utf8");b(null,c)})}function e(b){var c=new core.ByteArrayWriter("utf8"),e=0;c.appendArray([80,75,3,4,20,0,0,0,0,0]);b.data&&(e=b.data.length);c.appendUInt32LE(a(b.date));c.appendUInt32LE(f(b.data));c.appendUInt32LE(e);c.appendUInt32LE(e);c.appendUInt16LE(b.filename.length);
-c.appendUInt16LE(0);c.appendString(b.filename);b.data&&c.appendByteArray(b.data);return c}function i(b,c){var e=new core.ByteArrayWriter("utf8"),d=0;e.appendArray([80,75,1,2,20,0,20,0,0,0,0,0]);b.data&&(d=b.data.length);e.appendUInt32LE(a(b.date));e.appendUInt32LE(f(b.data));e.appendUInt32LE(d);e.appendUInt32LE(d);e.appendUInt16LE(b.filename.length);e.appendArray([0,0,0,0,0,0,0,0,0,0,0,0]);e.appendUInt32LE(c);e.appendString(b.filename);return e}function h(a,b){if(a===n.length)b(null);else{var c=n[a];
-void 0!==c.data?h(a+1,b):c.load(function(c){c?b(c):h(a+1,b)})}}var n,o,u,s=(new core.RawInflate).inflate,p=this,w=new core.Base64;this.load=d;this.save=function(a,b,e,d){var f,h;for(f=0;f<n.length;f+=1)if(h=n[f],h.filename===a){h.set(a,b,e,d);return}h=new c(j);h.set(a,b,e,d);n.push(h)};this.write=function(a){h(0,function(b){if(b)a(b);else{var b=new core.ByteArrayWriter("utf8"),c,d,f,h=[0];for(c=0;c<n.length;c+=1)b.appendByteArrayWriter(e(n[c])),h.push(b.getLength());f=b.getLength();for(c=0;c<n.length;c+=
-1)d=n[c],b.appendByteArrayWriter(i(d,h[c]));c=b.getLength()-f;b.appendArray([80,75,5,6,0,0,0,0]);b.appendUInt16LE(n.length);b.appendUInt16LE(n.length);b.appendUInt32LE(c);b.appendUInt32LE(f);b.appendArray([0,0]);runtime.writeFile(j,b.getByteArray(),a)}})};this.loadContentXmlAsFragments=function(a,b){k(a,function(a,c){if(a)return b.rootElementReady(a);b.rootElementReady(null,c,!0)})};this.loadAsString=k;this.loadAsDOM=function(a,b){k(a,function(a,c){a?b(a,null):(c=(new DOMParser).parseFromString(c,
-"text/xml"),b(null,c))})};this.loadAsDataURL=function(a,b,c){d(a,function(a,e){if(a)return c(a,null);var d=0,f;b||(b=80===e[1]&&78===e[2]&&71===e[3]?"image/png":255===e[0]&&216===e[1]&&255===e[2]?"image/jpeg":71===e[0]&&73===e[1]&&70===e[2]?"image/gif":"");for(f="data:"+b+";base64,";d<e.length;)f+=w.convertUTF8ArrayToBase64(e.slice(d,Math.min(d+45E3,e.length))),d+=45E3;c(null,f)})};this.getEntries=function(){return n.slice()};o=-1;null===l?n=[]:runtime.getFileSize(j,function(a){o=a;0>o?l("File '"+
-j+"' cannot be read.",p):runtime.read(j,o-22,22,function(a,c){a||null===l?l(a,p):b(c,l)})})};
-// Input 12
-xmldom.LSSerializerFilter=function(){};
-// Input 13
-"function"!==typeof Object.create&&(Object.create=function(j){var l=function(){};l.prototype=j;return new l});
-xmldom.LSSerializer=function(){function j(f,g){var a="",c=Object.create(f),b=l.filter?l.filter.acceptNode(g):1,d;if(1===b){d="";var k=g.attributes,e,i,h,n="",o;if(k){c[g.namespaceURI]!==g.prefix&&(c[g.namespaceURI]=g.prefix);d+="<"+g.nodeName;e=k.length;for(i=0;i<e;i+=1)if(h=k.item(i),"http://www.w3.org/2000/xmlns/"!==h.namespaceURI&&(o=l.filter?l.filter.acceptNode(h):1,1===o)){if(h.namespaceURI){o=h.prefix;var u=h.namespaceURI;c.hasOwnProperty(u)?o=c[u]+":":(c[u]!==o&&(c[u]=o),o+=":")}else o="";
-n+=" "+(o+h.localName+'="'+h.nodeValue+'"')}for(i in c)c.hasOwnProperty(i)&&((o=c[i])?"xmlns"!==o&&(d+=" xmlns:"+c[i]+'="'+i+'"'):d+=' xmlns="'+i+'"');d+=n+">"}a+=d}if(1===b||3===b){for(d=g.firstChild;d;)a+=j(c,d),d=d.nextSibling;g.nodeValue&&(a+=g.nodeValue)}1===b&&(c="",1===g.nodeType&&(c+="</"+g.nodeName+">"),a+=c);return a}var l=this;this.filter=null;this.writeToString=function(f,g){if(!f)return"";var a;if(g){a=g;var c={},b;for(b in a)a.hasOwnProperty(b)&&(c[a[b]]=b);a=c}else a={};return j(a,
-f)}};
-// Input 14
-xmldom.RelaxNGParser=function(){function j(a,b){this.message=function(){b&&(a+=1===b.nodeType?" Element ":" Node ",a+=b.nodeName,b.nodeValue&&(a+=" with value '"+b.nodeValue+"'"),a+=".");return a}}function l(a){if(2>=a.e.length)return a;var b={name:a.name,e:a.e.slice(0,2)};return l({name:a.name,e:[b].concat(a.e.slice(2))})}function f(a){var a=a.split(":",2),b="",c;1===a.length?a=["",a[0]]:b=a[0];for(c in d)d[c]===b&&(a[0]=c);return a}function g(a,b){for(var c=0,d,k,j=a.name;a.e&&c<a.e.length;)if(d=
-a.e[c],"ref"===d.name){k=b[d.a.name];if(!k)throw d.a.name+" was not defined.";d=a.e.slice(c+1);a.e=a.e.slice(0,c);a.e=a.e.concat(k.e);a.e=a.e.concat(d)}else c+=1,g(d,b);d=a.e;if("choice"===j&&(!d||!d[1]||"empty"===d[1].name))!d||!d[0]||"empty"===d[0].name?(delete a.e,a.name="empty"):(d[1]=d[0],d[0]={name:"empty"});if("group"===j||"interleave"===j)"empty"===d[0].name?"empty"===d[1].name?(delete a.e,a.name="empty"):(j=a.name=d[1].name,a.names=d[1].names,d=a.e=d[1].e):"empty"===d[1].name&&(j=a.name=
-d[0].name,a.names=d[0].names,d=a.e=d[0].e);"oneOrMore"===j&&"empty"===d[0].name&&(delete a.e,a.name="empty");if("attribute"===j){k=a.names?a.names.length:0;for(var s,p=a.localnames=[k],w=a.namespaces=[k],c=0;c<k;c+=1)s=f(a.names[c]),w[c]=s[0],p[c]=s[1]}"interleave"===j&&("interleave"===d[0].name?"interleave"===d[1].name?a.e=d[0].e.concat(d[1].e):a.e=[d[1]].concat(d[0].e):"interleave"===d[1].name&&(a.e=[d[0]].concat(d[1].e)))}function a(b,c){for(var d=0,f;b.e&&d<b.e.length;)f=b.e[d],"elementref"===
-f.name?(f.id=f.id||0,b.e[d]=c[f.id]):"element"!==f.name&&a(f,c),d+=1}var c=this,b,d={"http://www.w3.org/XML/1998/namespace":"xml"},k;k=function(a,b,c){var g=[],j,u,s=a.localName,p=[];j=a.attributes;var w=s,B=p,A={},q,x;for(q=0;q<j.length;q+=1)if(x=j.item(q),x.namespaceURI)"http://www.w3.org/2000/xmlns/"===x.namespaceURI&&(d[x.value]=x.localName);else{"name"===x.localName&&("element"===w||"attribute"===w)&&B.push(x.value);if("name"===x.localName||"combine"===x.localName||"type"===x.localName){var E=
-x,C;C=x.value;C=C.replace(/^\s\s*/,"");for(var z=/\s/,F=C.length-1;z.test(C.charAt(F));)F-=1;C=C.slice(0,F+1);E.value=C}A[x.localName]=x.value}j=A;j.combine=j.combine||void 0;a=a.firstChild;w=g;B=p;for(A="";a;){if(1===a.nodeType&&"http://relaxng.org/ns/structure/1.0"===a.namespaceURI){if(q=k(a,b,w))"name"===q.name?B.push(d[q.a.ns]+":"+q.text):"choice"===q.name&&q.names&&q.names.length&&(B=B.concat(q.names),delete q.names),w.push(q)}else 3===a.nodeType&&(A+=a.nodeValue);a=a.nextSibling}a=A;"value"!==
-s&&"param"!==s&&(a=/^\s*([\s\S]*\S)?\s*$/.exec(a)[1]);"value"===s&&void 0===j.type&&(j.type="token",j.datatypeLibrary="");if(("attribute"===s||"element"===s)&&void 0!==j.name)u=f(j.name),g=[{name:"name",text:u[1],a:{ns:u[0]}}].concat(g),delete j.name;"name"===s||"nsName"===s||"value"===s?void 0===j.ns&&(j.ns=""):delete j.ns;"name"===s&&(u=f(a),j.ns=u[0],a=u[1]);if(1<g.length&&("define"===s||"oneOrMore"===s||"zeroOrMore"===s||"optional"===s||"list"===s||"mixed"===s))g=[{name:"group",e:l({name:"group",
-e:g}).e}];2<g.length&&"element"===s&&(g=[g[0]].concat({name:"group",e:l({name:"group",e:g.slice(1)}).e}));1===g.length&&"attribute"===s&&g.push({name:"text",text:a});if(1===g.length&&("choice"===s||"group"===s||"interleave"===s))s=g[0].name,p=g[0].names,j=g[0].a,a=g[0].text,g=g[0].e;else if(2<g.length&&("choice"===s||"group"===s||"interleave"===s))g=l({name:s,e:g}).e;"mixed"===s&&(s="interleave",g=[g[0],{name:"text"}]);"optional"===s&&(s="choice",g=[g[0],{name:"empty"}]);"zeroOrMore"===s&&(s="choice",
-g=[{name:"oneOrMore",e:[g[0]]},{name:"empty"}]);if("define"===s&&j.combine){a:{w=j.combine;B=j.name;A=g;for(q=0;c&&q<c.length;q+=1)if(x=c[q],"define"===x.name&&x.a&&x.a.name===B){x.e=[{name:w,e:x.e.concat(A)}];c=x;break a}c=null}if(c)return}c={name:s};g&&0<g.length&&(c.e=g);for(u in j)if(j.hasOwnProperty(u)){c.a=j;break}void 0!==a&&(c.text=a);p&&0<p.length&&(c.names=p);"element"===s&&(c.id=b.length,b.push(c),c={name:"elementref",id:c.id});return c};this.parseRelaxNGDOM=function(e,f){var h=[],n=k(e&&
-e.documentElement,h,void 0),o,l,s={};for(o=0;o<n.e.length;o+=1)l=n.e[o],"define"===l.name?s[l.a.name]=l:"start"===l.name&&(b=l);if(!b)return[new j("No Relax NG start element was found.")];g(b,s);for(o in s)s.hasOwnProperty(o)&&g(s[o],s);for(o=0;o<h.length;o+=1)g(h[o],s);f&&(c.rootPattern=f(b.e[0],h));a(b,h);for(o=0;o<h.length;o+=1)a(h[o],h);c.start=b;c.elements=h;c.nsmap=d;return null}};
-// Input 15
-runtime.loadClass("xmldom.RelaxNGParser");
-xmldom.RelaxNG=function(){function j(a){return function(){var b;return function(){void 0===b&&(b=a());return b}}()}function l(a,b){return function(){var c={},d=0;return function(e){var f=e.hash||e.toString(),h;h=c[f];if(void 0!==h)return h;c[f]=h=b(e);h.hash=a+d.toString();d+=1;return h}}()}function f(a){return function(){var b={};return function(c){var d,e;e=b[c.localName];if(void 0===e)b[c.localName]=e={};else if(d=e[c.namespaceURI],void 0!==d)return d;return e[c.namespaceURI]=d=a(c)}}()}function g(a,
-b,c){return function(){var d={},e=0;return function(f,h){var i=b&&b(f,h),g,k;if(void 0!==i)return i;i=f.hash||f.toString();g=h.hash||h.toString();k=d[i];if(void 0===k)d[i]=k={};else if(i=k[g],void 0!==i)return i;k[g]=i=c(f,h);i.hash=a+e.toString();e+=1;return i}}()}function a(b,c){"choice"===c.p1.type?a(b,c.p1):b[c.p1.hash]=c.p1;"choice"===c.p2.type?a(b,c.p2):b[c.p2.hash]=c.p2}function c(a,b){return{type:"element",nc:a,nullable:!1,textDeriv:function(){return q},startTagOpenDeriv:function(c){return a.contains(c)?
-o(b,x):q},attDeriv:function(){return q},startTagCloseDeriv:function(){return this}}}function b(){return{type:"list",nullable:!1,hash:"list",textDeriv:function(){return x}}}function d(a,b,c,f){if(b===q)return q;if(f>=c.length)return b;0===f&&(f=0);for(var h=c.item(f);h.namespaceURI===e;){f+=1;if(f>=c.length)return b;h=c.item(f)}return h=d(a,b.attDeriv(a,c.item(f)),c,f+1)}function k(a,b,c){c.e[0].a?(a.push(c.e[0].text),b.push(c.e[0].a.ns)):k(a,b,c.e[0]);c.e[1].a?(a.push(c.e[1].text),b.push(c.e[1].a.ns)):
-k(a,b,c.e[1])}var e="http://www.w3.org/2000/xmlns/",i,h,n,o,u,s,p,w,B,A,q={type:"notAllowed",nullable:!1,hash:"notAllowed",textDeriv:function(){return q},startTagOpenDeriv:function(){return q},attDeriv:function(){return q},startTagCloseDeriv:function(){return q},endTagDeriv:function(){return q}},x={type:"empty",nullable:!0,hash:"empty",textDeriv:function(){return q},startTagOpenDeriv:function(){return q},attDeriv:function(){return q},startTagCloseDeriv:function(){return x},endTagDeriv:function(){return q}},
-E={type:"text",nullable:!0,hash:"text",textDeriv:function(){return E},startTagOpenDeriv:function(){return q},attDeriv:function(){return q},startTagCloseDeriv:function(){return E},endTagDeriv:function(){return q}},C,z,F;i=g("choice",function(a,b){if(a===q)return b;if(b===q||a===b)return a},function(b,c){var d={},e;a(d,{p1:b,p2:c});c=b=void 0;for(e in d)d.hasOwnProperty(e)&&(void 0===b?b=d[e]:c=void 0===c?d[e]:i(c,d[e]));return function(a,b){return{type:"choice",p1:a,p2:b,nullable:a.nullable||b.nullable,
-textDeriv:function(c,d){return i(a.textDeriv(c,d),b.textDeriv(c,d))},startTagOpenDeriv:f(function(c){return i(a.startTagOpenDeriv(c),b.startTagOpenDeriv(c))}),attDeriv:function(c,d){return i(a.attDeriv(c,d),b.attDeriv(c,d))},startTagCloseDeriv:j(function(){return i(a.startTagCloseDeriv(),b.startTagCloseDeriv())}),endTagDeriv:j(function(){return i(a.endTagDeriv(),b.endTagDeriv())})}}(b,c)});h=function(a,b,c){return function(){var d={},e=0;return function(f,h){var i=b&&b(f,h),k,g;if(void 0!==i)return i;
-i=f.hash||f.toString();k=h.hash||h.toString();i<k&&(g=i,i=k,k=g,g=f,f=h,h=g);g=d[i];if(void 0===g)d[i]=g={};else if(i=g[k],void 0!==i)return i;g[k]=i=c(f,h);i.hash=a+e.toString();e+=1;return i}}()}("interleave",function(a,b){if(a===q||b===q)return q;if(a===x)return b;if(b===x)return a},function(a,b){return{type:"interleave",p1:a,p2:b,nullable:a.nullable&&b.nullable,textDeriv:function(c,d){return i(h(a.textDeriv(c,d),b),h(a,b.textDeriv(c,d)))},startTagOpenDeriv:f(function(c){return i(C(function(a){return h(a,
-b)},a.startTagOpenDeriv(c)),C(function(b){return h(a,b)},b.startTagOpenDeriv(c)))}),attDeriv:function(c,d){return i(h(a.attDeriv(c,d),b),h(a,b.attDeriv(c,d)))},startTagCloseDeriv:j(function(){return h(a.startTagCloseDeriv(),b.startTagCloseDeriv())})}});n=g("group",function(a,b){if(a===q||b===q)return q;if(a===x)return b;if(b===x)return a},function(a,b){return{type:"group",p1:a,p2:b,nullable:a.nullable&&b.nullable,textDeriv:function(c,d){var e=n(a.textDeriv(c,d),b);return a.nullable?i(e,b.textDeriv(c,
-d)):e},startTagOpenDeriv:function(c){var d=C(function(a){return n(a,b)},a.startTagOpenDeriv(c));return a.nullable?i(d,b.startTagOpenDeriv(c)):d},attDeriv:function(c,d){return i(n(a.attDeriv(c,d),b),n(a,b.attDeriv(c,d)))},startTagCloseDeriv:j(function(){return n(a.startTagCloseDeriv(),b.startTagCloseDeriv())})}});o=g("after",function(a,b){if(a===q||b===q)return q},function(a,b){return{type:"after",p1:a,p2:b,nullable:!1,textDeriv:function(c,d){return o(a.textDeriv(c,d),b)},startTagOpenDeriv:f(function(c){return C(function(a){return o(a,
-b)},a.startTagOpenDeriv(c))}),attDeriv:function(c,d){return o(a.attDeriv(c,d),b)},startTagCloseDeriv:j(function(){return o(a.startTagCloseDeriv(),b)}),endTagDeriv:j(function(){return a.nullable?b:q})}});u=l("oneormore",function(a){return a===q?q:{type:"oneOrMore",p:a,nullable:a.nullable,textDeriv:function(b,c){return n(a.textDeriv(b,c),i(this,x))},startTagOpenDeriv:function(b){var c=this;return C(function(a){return n(a,i(c,x))},a.startTagOpenDeriv(b))},attDeriv:function(b,c){return n(a.attDeriv(b,
-c),i(this,x))},startTagCloseDeriv:j(function(){return u(a.startTagCloseDeriv())})}});p=g("attribute",void 0,function(a,b){return{type:"attribute",nullable:!1,nc:a,p:b,attDeriv:function(c,d){return a.contains(d)&&(b.nullable&&/^\s+$/.test(d.nodeValue)||b.textDeriv(c,d.nodeValue).nullable)?x:q},startTagCloseDeriv:function(){return q}}});s=l("value",function(a){return{type:"value",nullable:!1,value:a,textDeriv:function(b,c){return c===a?x:q},attDeriv:function(){return q},startTagCloseDeriv:function(){return this}}});
-B=l("data",function(a){return{type:"data",nullable:!1,dataType:a,textDeriv:function(){return x},attDeriv:function(){return q},startTagCloseDeriv:function(){return this}}});C=function t(a,b){return"after"===b.type?o(b.p1,a(b.p2)):"choice"===b.type?i(t(a,b.p1),t(a,b.p2)):b};z=function(a,b,c){for(var e=c.currentNode,b=b.startTagOpenDeriv(e),b=d(a,b,e.attributes,0),f=b=b.startTagCloseDeriv(),e=c.currentNode,b=c.firstChild(),h=[],g;b;)1===b.nodeType?h.push(b):3===b.nodeType&&!/^\s*$/.test(b.nodeValue)&&
-h.push(b.nodeValue),b=c.nextSibling();0===h.length&&(h=[""]);g=f;for(f=0;g!==q&&f<h.length;f+=1)b=h[f],"string"===typeof b?g=/^\s*$/.test(b)?i(g,g.textDeriv(a,b)):g.textDeriv(a,b):(c.currentNode=b,g=z(a,g,c));c.currentNode=e;return b=g.endTagDeriv()};w=function(a){var b,c,d;if("name"===a.name)b=a.text,c=a.a.ns,a={name:b,ns:c,hash:"{"+c+"}"+b,contains:function(a){return a.namespaceURI===c&&a.localName===b}};else if("choice"===a.name){b=[];c=[];k(b,c,a);a="";for(d=0;d<b.length;d+=1)a+="{"+c[d]+"}"+
-b[d]+",";a={hash:a,contains:function(a){var d;for(d=0;d<b.length;d+=1)if(b[d]===a.localName&&c[d]===a.namespaceURI)return!0;return!1}}}else a={hash:"anyName",contains:function(){return!0}};return a};A=function r(a,d){var e,f;if("elementref"===a.name){e=a.id||0;a=d[e];if(void 0!==a.name){var g=a;e=d[g.id]={hash:"element"+g.id.toString()};g=c(w(g.e[0]),A(g.e[1],d));for(f in g)g.hasOwnProperty(f)&&(e[f]=g[f]);f=e}else f=a;return f}switch(a.name){case "empty":return x;case "notAllowed":return q;case "text":return E;
-case "choice":return i(r(a.e[0],d),r(a.e[1],d));case "interleave":e=r(a.e[0],d);for(f=1;f<a.e.length;f+=1)e=h(e,r(a.e[f],d));return e;case "group":return n(r(a.e[0],d),r(a.e[1],d));case "oneOrMore":return u(r(a.e[0],d));case "attribute":return p(w(a.e[0]),r(a.e[1],d));case "value":return s(a.text);case "data":return e=a.a&&a.a.type,void 0===e&&(e=""),B(e);case "list":return b()}throw"No support for "+a.name;};this.makePattern=function(a,b){var c={},d;for(d in b)b.hasOwnProperty(d)&&(c[d]=b[d]);return d=
-A(a,c)};this.validate=function(a,b){var c;a.currentNode=a.root;c=z(null,F,a);c.nullable?b(null):(runtime.log("Error in Relax NG validation: "+c),b(["Error in Relax NG validation: "+c]))};this.init=function(a){F=a}};
-// Input 16
-runtime.loadClass("xmldom.RelaxNGParser");
-xmldom.RelaxNG2=function(){function j(a,c){this.message=function(){c&&(a+=1===c.nodeType?" Element ":" Node ",a+=c.nodeName,c.nodeValue&&(a+=" with value '"+c.nodeValue+"'"),a+=".");return a}}function l(b,c,f,e){return"empty"===b.name?null:a(b,c,f,e)}function f(a,d){if(2!==a.e.length)throw"Element with wrong # of elements: "+a.e.length;for(var f=d.currentNode,e=f?f.nodeType:0,g=null;1<e;){if(8!==e&&(3!==e||!/^\s+$/.test(d.currentNode.nodeValue)))return[new j("Not allowed node of type "+e+".")];e=
-(f=d.nextSibling())?f.nodeType:0}if(!f)return[new j("Missing element "+a.names)];if(a.names&&-1===a.names.indexOf(c[f.namespaceURI]+":"+f.localName))return[new j("Found "+f.nodeName+" instead of "+a.names+".",f)];if(d.firstChild()){for(g=l(a.e[1],d,f);d.nextSibling();)if(e=d.currentNode.nodeType,(!d.currentNode||!(3===d.currentNode.nodeType&&/^\s+$/.test(d.currentNode.nodeValue)))&&8!==e)return[new j("Spurious content.",d.currentNode)];if(d.parentNode()!==f)return[new j("Implementation error.")]}else g=
-l(a.e[1],d,f);d.nextSibling();return g}var g,a,c;a=function(b,c,g,e){var i=b.name,h=null;if("text"===i)a:{for(var n=(b=c.currentNode)?b.nodeType:0;b!==g&&3!==n;){if(1===n){h=[new j("Element not allowed here.",b)];break a}n=(b=c.nextSibling())?b.nodeType:0}c.nextSibling();h=null}else if("data"===i)h=null;else if("value"===i)e!==b.text&&(h=[new j("Wrong value, should be '"+b.text+"', not '"+e+"'",g)]);else if("list"===i)h=null;else if("attribute"===i)a:{if(2!==b.e.length)throw"Attribute with wrong # of elements: "+
-b.e.length;i=b.localnames.length;for(h=0;h<i;h+=1){e=g.getAttributeNS(b.namespaces[h],b.localnames[h]);""===e&&!g.hasAttributeNS(b.namespaces[h],b.localnames[h])&&(e=void 0);if(void 0!==n&&void 0!==e){h=[new j("Attribute defined too often.",g)];break a}n=e}h=void 0===n?[new j("Attribute not found: "+b.names,g)]:l(b.e[1],c,g,n)}else if("element"===i)h=f(b,c,g);else if("oneOrMore"===i){e=0;do n=c.currentNode,i=a(b.e[0],c,g),e+=1;while(!i&&n!==c.currentNode);1<e?(c.currentNode=n,h=null):h=i}else if("choice"===
-i){if(2!==b.e.length)throw"Choice with wrong # of options: "+b.e.length;n=c.currentNode;if("empty"===b.e[0].name){if(i=a(b.e[1],c,g,e))c.currentNode=n;h=null}else{if(i=l(b.e[0],c,g,e))c.currentNode=n,i=a(b.e[1],c,g,e);h=i}}else if("group"===i){if(2!==b.e.length)throw"Group with wrong # of members: "+b.e.length;h=a(b.e[0],c,g)||a(b.e[1],c,g)}else if("interleave"===i)a:{for(var n=b.e.length,e=[n],o=n,u,s,p,w;0<o;){u=0;s=c.currentNode;for(h=0;h<n;h+=1)p=c.currentNode,!0!==e[h]&&e[h]!==p&&(w=b.e[h],(i=
-a(w,c,g))?(c.currentNode=p,void 0===e[h]&&(e[h]=!1)):p===c.currentNode||"oneOrMore"===w.name||"choice"===w.name&&("oneOrMore"===w.e[0].name||"oneOrMore"===w.e[1].name)?(u+=1,e[h]=p):(u+=1,e[h]=!0));if(s===c.currentNode&&u===o)break;if(0===u){for(h=0;h<n;h+=1)if(!1===e[h]){h=[new j("Interleave does not match.",g)];break a}break}for(h=o=0;h<n;h+=1)!0!==e[h]&&(o+=1)}h=null}else throw i+" not allowed in nonEmptyPattern.";return h};this.validate=function(a,c){a.currentNode=a.root;var f=l(g.e[0],a,a.root);
-c(f)};this.init=function(a,d){g=a;c=d}};
-// Input 17
-xmldom.OperationalTransformInterface=function(){};xmldom.OperationalTransformInterface.prototype.retain=function(){};xmldom.OperationalTransformInterface.prototype.insertCharacters=function(){};xmldom.OperationalTransformInterface.prototype.insertElementStart=function(){};xmldom.OperationalTransformInterface.prototype.insertElementEnd=function(){};xmldom.OperationalTransformInterface.prototype.deleteCharacters=function(){};xmldom.OperationalTransformInterface.prototype.deleteElementStart=function(){};
-xmldom.OperationalTransformInterface.prototype.deleteElementEnd=function(){};xmldom.OperationalTransformInterface.prototype.replaceAttributes=function(){};xmldom.OperationalTransformInterface.prototype.updateAttributes=function(){};
-// Input 18
-xmldom.OperationalTransformDOM=function(){this.retain=function(){};this.insertCharacters=function(){};this.insertElementStart=function(){};this.insertElementEnd=function(){};this.deleteCharacters=function(){};this.deleteElementStart=function(){};this.deleteElementEnd=function(){};this.replaceAttributes=function(){};this.updateAttributes=function(){};this.atEnd=function(){return!0}};
-// Input 19
-xmldom.XPath=function(){function j(a,b,c){return-1!==a&&(a<b||-1===b)&&(a<c||-1===c)}function l(a){for(var b=[],c=0,d=a.length,e;c<d;){var f=a,g=d,i=b,k="",l=[],E=f.indexOf("[",c),C=f.indexOf("/",c),z=f.indexOf("=",c);j(C,E,z)?(k=f.substring(c,C),c=C+1):j(E,C,z)?(k=f.substring(c,E),c=h(f,E,l)):j(z,C,E)?(k=f.substring(c,z),c=z):(k=f.substring(c,g),c=g);i.push({location:k,predicates:l});if(c<d&&"="===a[c]){e=a.substring(c+1,d);if(2<e.length&&("'"===e[0]||'"'===e[0]))e=e.slice(1,e.length-1);else try{e=
-parseInt(e,10)}catch(F){}c=d}}return{steps:b,value:e}}function f(){}function g(){var a,c=!1;this.setNode=function(c){a=c};this.reset=function(){c=!1};this.next=function(){var b=c?null:a;c=!0;return b}}function a(a,c,b){this.reset=function(){a.reset()};this.next=function(){for(var d=a.next();d&&!(d=d.getAttributeNodeNS(c,b));)d=a.next();return d}}function c(a,c){var b=a.next(),d=null;this.reset=function(){a.reset();b=a.next();d=null};this.next=function(){for(;b;){if(d)if(c&&d.firstChild)d=d.firstChild;
-else{for(;!d.nextSibling&&d!==b;)d=d.parentNode;d===b?b=a.next():d=d.nextSibling}else{do(d=b.firstChild)||(b=a.next());while(b&&!d)}if(d&&1===d.nodeType)return d}return null}}function b(a,c){this.reset=function(){a.reset()};this.next=function(){for(var b=a.next();b&&!c(b);)b=a.next();return b}}function d(a,c,d){var c=c.split(":",2),e=d(c[0]),f=c[1];return new b(a,function(a){return a.localName===f&&a.namespaceURI===e})}function k(a,c,d){var e=new g,f=i(e,c,d),h=c.value;return void 0===h?new b(a,function(a){e.setNode(a);
-f.reset();return f.next()}):new b(a,function(a){e.setNode(a);f.reset();return(a=f.next())&&a.nodeValue===h})}function e(a,c,b){var d=a.ownerDocument,e=[],e=new g;e.setNode(a);a=l(c);e=i(e,a,b);a=[];for(b=e.next();b;)a.push(b),b=e.next();return e=a}var i,h;h=function(a,c,b){for(var d=c,e=a.length,f=0;d<e;)"]"===a[d]?(f-=1,0>=f&&b.push(l(a.substring(c,d)))):"["===a[d]&&(0>=f&&(c=d+1),f+=1),d+=1;return d};f.prototype.next=function(){};f.prototype.reset=function(){};i=function(b,e,f){var g,h,i,j;for(g=
-0;g<e.steps.length;g+=1){i=e.steps[g];h=i.location;""===h?b=new c(b,!1):"@"===h[0]?(j=h.slice(1).split(":",2),b=new a(b,f(j[0]),j[1])):"."!==h&&(b=new c(b,!1),-1!==h.indexOf(":")&&(b=d(b,h,f)));for(h=0;h<i.predicates.length;h+=1)j=i.predicates[h],b=k(b,j,f)}return b};xmldom.XPath=function(){this.getODFElementsWithXPath=e};return xmldom.XPath}();
-// Input 20
-odf.StyleInfo=function(){function j(f,g){for(var a=l[f.localName],c=a&&a[f.namespaceURI],b=c?c.length:0,d,k,e,a=0;a<b;a+=1)if(d=f.getAttributeNS(c[a].ns,c[a].localname))k=c[a].keygroup,(e=g[k])||(e=g[k]={}),e[d]=1;for(a=f.firstChild;a;)1===a.nodeType&&(c=a,j(c,g)),a=a.nextSibling}var l;this.UsedKeysList=function(f){var g={};this.uses=function(a){var c=a.localName,b=a.getAttributeNS("urn:oasis:names:tc:opendocument:xmlns:drawing:1.0","name")||a.getAttributeNS("urn:oasis:names:tc:opendocument:xmlns:style:1.0",
-"name"),a="style"===c?a.getAttributeNS("urn:oasis:names:tc:opendocument:xmlns:style:1.0","family"):"urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"===a.namespaceURI?"data":c;return(a=g[a])?0<a[b]:!1};j(f,g)};this.canElementHaveStyle=function(f,g){var a=l[g.localName];return(a=a&&a[g.namespaceURI])&&0<a.length};l=function(f){var g,a,c,b,d,j={},e;for(g in f)if(f.hasOwnProperty(g)){c=f[g];d=c.length;for(a=0;a<d;a+=1)b=c[a],e=j[b.en]=j[b.en]||{},e=e[b.ens]=e[b.ens]||[],e.push({ns:b.ans,localname:b.a,
-keygroup:g})}return j}({text:[{ens:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",en:"tab-stop",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"leader-text-style"},{ens:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",en:"drop-cap",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"notes-configuration",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"citation-body-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",
-en:"notes-configuration",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"citation-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"a",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"alphabetical-index",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"linenumbering-configuration",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",
-a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"list-level-style-number",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"ruby-text",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"span",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"a",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",
-a:"visited-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",en:"text-properties",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"text-line-through-text-style"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"alphabetical-index-source",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"main-entry-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"index-entry-bibliography",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},
-{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"index-entry-chapter",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"index-entry-link-end",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"index-entry-link-start",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",
-en:"index-entry-page-number",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"index-entry-span",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"index-entry-tab-stop",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"index-entry-text",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",
-a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"index-title-template",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"list-level-style-bullet",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"outline-level-style",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"}],paragraph:[{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",
-en:"caption",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"text-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"circle",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"text-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"connector",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"text-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"control",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",
-a:"text-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"custom-shape",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"text-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"ellipse",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"text-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"frame",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"text-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",
-en:"line",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"text-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"measure",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"text-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"path",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"text-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"polygon",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",
-a:"text-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"polyline",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"text-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"rect",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"text-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"regular-polygon",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"text-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:office:1.0",
-en:"annotation",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"text-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:form:1.0",en:"column",ans:"urn:oasis:names:tc:opendocument:xmlns:form:1.0",a:"text-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",en:"style",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"next-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",en:"body",ans:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",a:"paragraph-style-name"},
-{ens:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",en:"even-columns",ans:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",a:"paragraph-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",en:"even-rows",ans:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",a:"paragraph-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",en:"first-column",ans:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",a:"paragraph-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",
-en:"first-row",ans:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",a:"paragraph-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",en:"last-column",ans:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",a:"paragraph-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",en:"last-row",ans:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",a:"paragraph-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",en:"odd-columns",ans:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",
-a:"paragraph-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",en:"odd-rows",ans:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",a:"paragraph-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"notes-configuration",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"default-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"alphabetical-index-entry-template",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",
-en:"bibliography-entry-template",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"h",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"illustration-index-entry-template",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"index-source-style",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",
-a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"object-index-entry-template",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"p",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"table-index-entry-template",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",
-en:"table-of-content-entry-template",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"table-index-entry-template",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"user-index-entry-template",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",en:"page-layout-properties",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",
-a:"register-truth-ref-style-name"}],chart:[{ens:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",en:"axis",ans:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",en:"chart",ans:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",en:"data-label",ans:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",
-en:"data-point",ans:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",en:"equation",ans:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",en:"error-indicator",ans:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",en:"floor",ans:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",a:"style-name"},
-{ens:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",en:"footer",ans:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",en:"grid",ans:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",en:"legend",ans:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",en:"mean-value",ans:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",
-a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",en:"plot-area",ans:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",en:"regression-curve",ans:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",en:"series",ans:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",en:"stock-gain-marker",
-ans:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",en:"stock-loss-marker",ans:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",en:"stock-range-line",ans:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",en:"subtitle",ans:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",a:"style-name"},
-{ens:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",en:"title",ans:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",en:"wall",ans:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",a:"style-name"}],section:[{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"alphabetical-index",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"bibliography",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",
-a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"illustration-index",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"index-title",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"object-index",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"section",
-ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"table-of-content",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"table-index",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"user-index",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"}],ruby:[{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",
-en:"ruby",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"}],table:[{ens:"urn:oasis:names:tc:opendocument:xmlns:database:1.0",en:"query",ans:"urn:oasis:names:tc:opendocument:xmlns:database:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:database:1.0",en:"table-representation",ans:"urn:oasis:names:tc:opendocument:xmlns:database:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",en:"background",ans:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",
-a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",en:"table",ans:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",a:"style-name"}],"table-column":[{ens:"urn:oasis:names:tc:opendocument:xmlns:database:1.0",en:"column",ans:"urn:oasis:names:tc:opendocument:xmlns:database:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",en:"table-column",ans:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",a:"style-name"}],"table-row":[{ens:"urn:oasis:names:tc:opendocument:xmlns:database:1.0",
-en:"query",ans:"urn:oasis:names:tc:opendocument:xmlns:database:1.0",a:"default-row-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:database:1.0",en:"table-representation",ans:"urn:oasis:names:tc:opendocument:xmlns:database:1.0",a:"default-row-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",en:"table-row",ans:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",a:"style-name"}],"table-cell":[{ens:"urn:oasis:names:tc:opendocument:xmlns:database:1.0",en:"column",ans:"urn:oasis:names:tc:opendocument:xmlns:database:1.0",
-a:"default-cell-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",en:"table-column",ans:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",a:"default-cell-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",en:"table-row",ans:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",a:"default-cell-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",en:"body",ans:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",
-en:"covered-table-cell",ans:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",en:"even-columns",ans:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",en:"covered-table-cell",ans:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",en:"even-columns",ans:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",
-a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",en:"even-rows",ans:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",en:"first-column",ans:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",en:"first-row",ans:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",en:"last-column",
-ans:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",en:"last-row",ans:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",en:"odd-columns",ans:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",en:"odd-rows",ans:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",
-en:"table-cell",ans:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",a:"style-name"}],graphic:[{ens:"urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0",en:"cube",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0",en:"extrude",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0",en:"rotate",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"style-name"},
-{ens:"urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0",en:"scene",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0",en:"sphere",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"caption",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"circle",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",
-a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"connector",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"control",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"custom-shape",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",
-en:"ellipse",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"frame",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"g",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"line",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",
-en:"measure",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"page-thumbnail",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"path",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"polygon",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"style-name"},
-{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"polyline",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"rect",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"regular-polygon",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:office:1.0",en:"annotation",
-ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"style-name"}],presentation:[{ens:"urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0",en:"cube",ans:"urn:oasis:names:tc:opendocument:xmlns:presentation:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0",en:"extrude",ans:"urn:oasis:names:tc:opendocument:xmlns:presentation:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0",en:"rotate",ans:"urn:oasis:names:tc:opendocument:xmlns:presentation:1.0",a:"style-name"},
-{ens:"urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0",en:"scene",ans:"urn:oasis:names:tc:opendocument:xmlns:presentation:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0",en:"sphere",ans:"urn:oasis:names:tc:opendocument:xmlns:presentation:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"caption",ans:"urn:oasis:names:tc:opendocument:xmlns:presentation:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"circle",
-ans:"urn:oasis:names:tc:opendocument:xmlns:presentation:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"connector",ans:"urn:oasis:names:tc:opendocument:xmlns:presentation:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"control",ans:"urn:oasis:names:tc:opendocument:xmlns:presentation:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"custom-shape",ans:"urn:oasis:names:tc:opendocument:xmlns:presentation:1.0",
-a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"ellipse",ans:"urn:oasis:names:tc:opendocument:xmlns:presentation:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"frame",ans:"urn:oasis:names:tc:opendocument:xmlns:presentation:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"g",ans:"urn:oasis:names:tc:opendocument:xmlns:presentation:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",
-en:"line",ans:"urn:oasis:names:tc:opendocument:xmlns:presentation:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"measure",ans:"urn:oasis:names:tc:opendocument:xmlns:presentation:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"page-thumbnail",ans:"urn:oasis:names:tc:opendocument:xmlns:presentation:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"path",ans:"urn:oasis:names:tc:opendocument:xmlns:presentation:1.0",
-a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"polygon",ans:"urn:oasis:names:tc:opendocument:xmlns:presentation:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"polyline",ans:"urn:oasis:names:tc:opendocument:xmlns:presentation:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"rect",ans:"urn:oasis:names:tc:opendocument:xmlns:presentation:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",
-en:"regular-polygon",ans:"urn:oasis:names:tc:opendocument:xmlns:presentation:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:office:1.0",en:"annotation",ans:"urn:oasis:names:tc:opendocument:xmlns:presentation:1.0",a:"style-name"}],"drawing-page":[{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"page",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:presentation:1.0",en:"notes",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",
-a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",en:"handout-master",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",en:"master-page",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"style-name"}],"list-style":[{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"list",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",
-en:"numbered-paragraph",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"list-item",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-override"},{ens:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",en:"style",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"list-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",en:"style",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},
-{ens:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",en:"style",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"percentage-data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:presentation:1.0",en:"date-time-decl",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"creation-date",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",
-en:"creation-time",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"database-display",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"date",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"editing-duration",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",
-a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"expression",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"meta-field",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"modification-date",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",
-en:"modification-time",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"print-date",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"print-time",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"table-formula",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",
-a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"time",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"user-defined",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"user-field-get",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",
-en:"user-field-input",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"variable-get",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"variable-input",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"variable-set",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",
-a:"data-style-name"}],data:[{ens:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",en:"style",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",en:"style",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"percentage-data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:presentation:1.0",en:"date-time-decl",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",
-en:"creation-date",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"creation-time",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"database-display",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"date",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",
-a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"editing-duration",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"expression",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"meta-field",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",
-en:"modification-date",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"modification-time",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"print-date",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"print-time",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",
-a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"table-formula",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"time",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"user-defined",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",
-en:"user-field-get",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"user-field-input",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"variable-get",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"variable-input",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",
-a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"variable-set",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"}],"page-layout":[{ens:"urn:oasis:names:tc:opendocument:xmlns:presentation:1.0",en:"notes",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"page-layout-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",en:"handout-master",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"page-layout-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",
-en:"master-page",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"page-layout-name"}]})};
-// Input 21
-odf.Style2CSS=function(){function j(a,b){var c={},d,e,f;if(!b)return c;for(d=b.firstChild;d;){d.namespaceURI===h&&"style"===d.localName?f=d.getAttributeNS(h,"family"):d.namespaceURI===n&&"list-style"===d.localName&&(f="list");if(e=f&&d.getAttributeNS&&d.getAttributeNS(h,"name"))c[f]||(c[f]={}),c[f][e]=d;d=d.nextSibling}return c}function l(a,c){if(!c||!a)return null;if(a[c])return a[c];var b,d;for(b in a)if(a.hasOwnProperty(b)&&(d=l(a[b].derivedStyles,c)))return d;return null}function f(a,c,b){var d=
-c[a],e,g;d&&((e=d.getAttributeNS(h,"parent-style-name"),g=null,e&&(g=l(b,e),!g&&c[e]&&(f(e,c,b),g=c[e],c[e]=null)),g)?(g.derivedStyles||(g.derivedStyles={}),g.derivedStyles[a]=d):b[a]=d)}function g(a,c){for(var b in a)a.hasOwnProperty(b)&&(f(b,a,c),a[b]=null)}function a(a,c){var b=u[a],d;if(null===b)return null;d="["+b+'|style-name="'+c+'"]';"presentation"===b&&(b="draw",d='[presentation|style-name="'+c+'"]');return b+"|"+s[a].join(d+","+b+"|")+d}function c(b,d,e){var f=[],g,h;f.push(a(b,d));for(g in e.derivedStyles)if(e.derivedStyles.hasOwnProperty(g))for(h in d=
-c(b,g,e.derivedStyles[g]),d)d.hasOwnProperty(h)&&f.push(d[h]);return f}function b(a,b,c){if(!a)return null;for(a=a.firstChild;a;){if(a.namespaceURI===b&&a.localName===c)return b=a;a=a.nextSibling}return null}function d(a,b){var c="",d,e;for(d in b)b.hasOwnProperty(d)&&(d=b[d],(e=a.getAttributeNS(d[0],d[1]))&&(c+=d[2]+":"+e+";"));return c}function k(a,b,c,d){b='text|list[text|style-name="'+b+'"]';for(c=(c=c.getAttributeNS(n,"level"))&&parseInt(c,10);1<c;)b+=" > text|list-item > text|list",c-=1;try{a.insertRule(b+
-" > list-item:before{"+d+"}",a.cssRules.length)}catch(e){throw e;}}function e(a,f,g,j){if("list"===f)for(var l=j.firstChild,m,t;l;){if(l.namespaceURI===n)if(m=l,"list-level-style-number"===l.localName){t=m;var r=t.getAttributeNS(h,"num-format"),o=t.getAttributeNS(h,"num-suffix"),s="",s={1:"decimal",a:"lower-latin",A:"upper-latin",i:"lower-roman",I:"upper-roman"},u="",u=t.getAttributeNS(h,"num-prefix")||"",u=s.hasOwnProperty(r)?u+(" counter(list, "+s[r]+")"):r?u+("'"+r+"';"):u+" ''";o&&(u+=" '"+o+
-"'");t=s="content: "+u+";";k(a,g,m,t)}else"list-level-style-image"===l.localName?(t="content: none;",k(a,g,m,t)):"list-level-style-bullet"===l.localName&&(t="content: '"+m.getAttributeNS(n,"bullet-char")+"';",k(a,g,m,t));l=l.nextSibling}else{g=c(f,g,j).join(",");l="";if(m=b(j,h,"text-properties")){t=""+d(m,p);r=m.getAttributeNS(h,"text-underline-style");"solid"===r&&(t+="text-decoration: underline;");if(r=m.getAttributeNS(h,"font-name"))(r='"'+r+'"')&&(t+="font-family: "+r+";");l+=t}if(m=b(j,h,"paragraph-properties")){t=
-m;m=""+d(t,B);t=t.getElementsByTagNameNS(h,"background-image");if(0<t.length&&(r=t.item(0).getAttributeNS(i,"href")))m+="background-image: url('odfkit:"+r+"');",t=t.item(0),m+=d(t,w);l+=m}if(m=b(j,h,"graphic-properties"))m=""+d(m,A),l+=m;if(m=b(j,h,"table-cell-properties"))m=""+d(m,q),l+=m;if(0!==l.length)try{a.insertRule(g+"{"+l+"}",a.cssRules.length)}catch(O){throw O;}}for(var N in j.derivedStyles)j.derivedStyles.hasOwnProperty(N)&&e(a,f,N,j.derivedStyles[N])}var i="http://www.w3.org/1999/xlink",
-h="urn:oasis:names:tc:opendocument:xmlns:style:1.0",n="urn:oasis:names:tc:opendocument:xmlns:text:1.0",o={draw:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",fo:"urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0",office:"urn:oasis:names:tc:opendocument:xmlns:office:1.0",presentation:"urn:oasis:names:tc:opendocument:xmlns:presentation:1.0",style:h,svg:"urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0",table:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",text:n,xlink:i},u=
-{graphic:"draw",paragraph:"text",presentation:"presentation",ruby:"text",section:"text",table:"table","table-cell":"table","table-column":"table","table-row":"table",text:"text",list:"text"},s={graphic:"circle,connected,control,custom-shape,ellipse,frame,g,line,measure,page,page-thumbnail,path,polygon,polyline,rect,regular-polygon".split(","),paragraph:"alphabetical-index-entry-template,h,illustration-index-entry-template,index-source-style,object-index-entry-template,p,table-index-entry-template,table-of-content-entry-template,user-index-entry-template".split(","),
-presentation:"caption,circle,connector,control,custom-shape,ellipse,frame,g,line,measure,page-thumbnail,path,polygon,polyline,rect,regular-polygon".split(","),ruby:["ruby","ruby-text"],section:"alphabetical-index,bibliography,illustration-index,index-title,object-index,section,table-of-content,table-index,user-index".split(","),table:["background","table"],"table-cell":"body,covered-table-cell,even-columns,even-rows,first-column,first-row,last-column,last-row,odd-columns,odd-rows,table-cell".split(","),
-"table-column":["table-column"],"table-row":["table-row"],text:"a,index-entry-chapter,index-entry-link-end,index-entry-link-start,index-entry-page-number,index-entry-span,index-entry-tab-stop,index-entry-text,index-title-template,linenumbering-configuration,list-level-style-number,list-level-style-bullet,outline-level-style,span".split(","),list:["list-item"]},p=[["urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0","color","color"],["urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0",
-"background-color","background-color"],["urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0","font-weight","font-weight"],["urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0","font-style","font-style"],["urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0","font-size","font-size"]],w=[[h,"repeat","background-repeat"]],B=[["urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0","background-color","background-color"],["urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0",
-"text-align","text-align"],["urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0","padding-left","padding-left"],["urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0","padding-right","padding-right"],["urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0","padding-top","padding-top"],["urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0","padding-bottom","padding-bottom"],["urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0","border-left","border-left"],["urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0",
-"border-right","border-right"],["urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0","border-top","border-top"],["urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0","border-bottom","border-bottom"],["urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0","margin-left","margin-left"],["urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0","margin-right","margin-right"],["urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0","margin-top","margin-top"],["urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0",
-"margin-bottom","margin-bottom"],["urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0","border","border"]],A=[["urn:oasis:names:tc:opendocument:xmlns:drawing:1.0","fill-color","background-color"],["urn:oasis:names:tc:opendocument:xmlns:drawing:1.0","fill","background"],["urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0","min-height","min-height"],["urn:oasis:names:tc:opendocument:xmlns:drawing:1.0","stroke","border"],["urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0",
-"stroke-color","border-color"]],q=[["urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0","background-color","background-color"],["urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0","border-left","border-left"],["urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0","border-right","border-right"],["urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0","border-top","border-top"],["urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0","border-bottom","border-bottom"]];
-this.namespaces=o;this.namespaceResolver=function(a){return o[a]||null};this.namespaceResolver.lookupNamespaceURI=this.namespaceResolver;this.style2css=function(a,b,c){for(var d,f,h,i,k;a.cssRules.length;)a.deleteRule(a.cssRules.length-1);d=null;b&&(d=b.ownerDocument);c&&(d=c.ownerDocument);if(d){for(f in o)if(o.hasOwnProperty(f)){i="@namespace "+f+" url("+o[f]+");";try{a.insertRule(i,a.cssRules.length)}catch(p){}}b=j(d,b);f=j(d,c);c={};for(k in u)if(u.hasOwnProperty(k))for(h in d=c[k]={},g(b[k],
-d),g(f[k],d),d)d.hasOwnProperty(h)&&e(a,k,h,d[h])}}};
-// Input 22
-runtime.loadClass("core.Base64");runtime.loadClass("xmldom.XPath");runtime.loadClass("odf.Style2CSS");
-odf.FontLoader=function(){function j(c,b,d,f,e){var g,h=0,l;for(l in c)c.hasOwnProperty(l)&&(h===d&&(g=l),h+=1);if(!g)return e();b.load(c[g].href,function(h,l){if(h)runtime.log(h);else{var n=f,n=document.styleSheets[0],p='@font-face { font-family: "'+g+'"; src: url(data:application/x-font-ttf;charset=binary;base64,'+a.convertUTF8ArrayToBase64(l)+') format("truetype"); }';try{n.insertRule(p,n.cssRules.length)}catch(w){runtime.log("Problem inserting rule in CSS: "+p)}}return j(c,b,d+1,f,e)})}function l(a,
-b,d){j(a,b,0,d,function(){})}var f=new odf.Style2CSS,g=new xmldom.XPath,a=new core.Base64;odf.FontLoader=function(){this.loadFonts=function(a,b,d){var j={},e,i,h;if(a){a=g.getODFElementsWithXPath(a,"style:font-face[svg:font-face-src]",f.namespaceResolver);for(e=0;e<a.length;e+=1)i=a[e],h=i.getAttributeNS(f.namespaces.style,"name"),i=g.getODFElementsWithXPath(i,"svg:font-face-src/svg:font-face-uri",f.namespaceResolver),0<i.length&&(i=i[0].getAttributeNS(f.namespaces.xlink,"href"),j[h]={href:i})}l(j,
-b,d)}};return odf.FontLoader}();
-// Input 23
-runtime.loadClass("core.Base64");runtime.loadClass("core.Zip");runtime.loadClass("xmldom.LSSerializer");runtime.loadClass("odf.StyleInfo");runtime.loadClass("odf.Style2CSS");runtime.loadClass("odf.FontLoader");
-odf.OdfContainer=function(){function j(a,b,c){for(a=a?a.firstChild:null;a;){if(a.localName===c&&a.namespaceURI===b)return a;a=a.nextSibling}return null}function l(a){var b,c=h.length;for(b=0;b<c;b+=1)if(a.namespaceURI===e&&a.localName===h[b])return b;return-1}function f(a,b){var c=a.automaticStyles,e;b&&(e=new d.UsedKeysList(b));this.acceptNode=function(a){return"http://www.w3.org/1999/xhtml"===a.namespaceURI?3:e&&a.parentNode===c&&1===a.nodeType?e.uses(a)?1:2:1}}function g(a,b){if(b){var c=l(b),
-d,e=a.firstChild;if(-1!==c){for(;e;){d=l(e);if(-1!==d&&d>c)break;e=e.nextSibling}a.insertBefore(b,e)}}}function a(a){this.OdfContainer=a}function c(a,b,c){var d=this;this.size=0;this.type=null;this.name=a;this.container=b;this.onchange=this.onreadystatechange=this.document=this.mimetype=this.url=null;this.EMPTY=0;this.LOADING=1;this.DONE=2;this.state=this.EMPTY;this.load=function(){var b=u[a];this.mimetype=b;c.loadAsDataURL(a,b,function(a,b){d.url=b;if(d.onchange)d.onchange(d);if(d.onstatereadychange)d.onstatereadychange(d)})};
-this.abort=function(){}}function b(){this.length=0;this.item=function(){}}var d=new odf.StyleInfo,k=new odf.Style2CSS,e="urn:oasis:names:tc:opendocument:xmlns:office:1.0",i="urn:oasis:names:tc:opendocument:xmlns:manifest:1.0",h="meta,settings,scripts,font-face-decls,styles,automatic-styles,master-styles,body".split(","),n=new core.Base64,o=new odf.FontLoader,u={};a.prototype=new function(){};a.prototype.constructor=a;a.namespaceURI=e;a.localName="document";c.prototype.load=function(){};c.prototype.getUrl=
-function(){return this.data?"data:;base64,"+n.toBase64(this.data):null};odf.OdfContainer=function p(d,h){function l(a){for(var b=a.firstChild,c;b;)c=b.nextSibling,1===b.nodeType?l(b):7===b.nodeType&&a.removeChild(b),b=c}function n(a){var b=v.rootElement.ownerDocument,c;if(a){l(a.documentElement);try{c=b.importNode(a.documentElement,!0)}catch(d){}}return c}function x(a){v.state=a;if(v.onchange)v.onchange(v);if(v.onstatereadychange)v.onstatereadychange(v)}function E(a){var a=n(a),b=v.rootElement;!a||
-"document-styles"!==a.localName||a.namespaceURI!==e?x(p.INVALID):(b.fontFaceDecls=j(a,e,"font-face-decls"),g(b,b.fontFaceDecls),b.styles=j(a,e,"styles"),g(b,b.styles),b.automaticStyles=j(a,e,"automatic-styles"),g(b,b.automaticStyles),b.masterStyles=j(a,e,"master-styles"),g(b,b.masterStyles),o.loadFonts(b.fontFaceDecls,J,null))}function C(a){var a=n(a),b,c,d;if(!a||"document-content"!==a.localName||a.namespaceURI!==e)x(p.INVALID);else{b=v.rootElement;c=j(a,e,"font-face-decls");if(b.fontFaceDecls&&
-c)for(d=c.firstChild;d;)b.fontFaceDecls.appendChild(d),d=c.firstChild;else c&&(b.fontFaceDecls=c,g(b,c));c=j(a,e,"automatic-styles");if(b.automaticStyles&&c)for(d=c.firstChild;d;)b.automaticStyles.appendChild(d),d=c.firstChild;else c&&(b.automaticStyles=c,g(b,c));b.body=j(a,e,"body");g(b,b.body)}}function z(a){var a=n(a),b;if(a&&!("document-meta"!==a.localName||a.namespaceURI!==e))b=v.rootElement,b.meta=j(a,e,"meta"),g(b,b.meta)}function F(a){var a=n(a),b;if(a&&!("document-settings"!==a.localName||
-a.namespaceURI!==e))b=v.rootElement,b.settings=j(a,e,"settings"),g(b,b.settings)}function m(a,b){J.loadAsDOM(a,b)}function t(){m("styles.xml",function(a,b){E(b);v.state!==p.INVALID&&m("content.xml",function(a,b){C(b);v.state!==p.INVALID&&m("meta.xml",function(a,b){z(b);v.state!==p.INVALID&&m("settings.xml",function(a,b){b&&F(b);m("META-INF/manifest.xml",function(a,b){if(b){var c=n(b),d;if(c&&!("manifest"!==c.localName||c.namespaceURI!==i)){d=v.rootElement;d.manifest=c;for(c=d.manifest.firstChild;c;)1===
-c.nodeType&&"file-entry"===c.localName&&c.namespaceURI===i&&(u[c.getAttributeNS(i,"full-path")]=c.getAttributeNS(i,"media-type")),c=c.nextSibling}}v.state!==p.INVALID&&x(p.DONE)})})})})})}function r(a,b){var c="",d;for(d in b)b.hasOwnProperty(d)&&(c+=" xmlns:"+d+'="'+b[d]+'"');return'<?xml version="1.0" encoding="UTF-8"?><office:'+a+" "+c+' office:version="1.2">'}function y(){var a=k.namespaces,b=new xmldom.LSSerializer,c=r("document-meta",a);b.filter=new f(v.rootElement);c+=b.writeToString(v.rootElement.meta,
-a);return c+"</office:document-meta>"}function L(){var a=k.namespaces,b=new xmldom.LSSerializer,c=r("document-settings",a);b.filter=new f(v.rootElement);c+=b.writeToString(v.rootElement.settings,a);return c+"</office:document-settings>"}function T(){var a=k.namespaces,b=new xmldom.LSSerializer,c=r("document-styles",a);b.filter=new f(v.rootElement,v.rootElement.masterStyles);c+=b.writeToString(v.rootElement.fontFaceDecls,a);c+=b.writeToString(v.rootElement.styles,a);c+=b.writeToString(v.rootElement.automaticStyles,
-a);c+=b.writeToString(v.rootElement.masterStyles,a);return c+"</office:document-styles>"}function O(){var a=k.namespaces,b=new xmldom.LSSerializer,c=r("document-content",a);b.filter=new f(v.rootElement,v.rootElement.body);c+=b.writeToString(v.rootElement.automaticStyles,a);c+=b.writeToString(v.rootElement.body,a);return c+"</office:document-content>"}function N(a,b){runtime.loadXML(a,function(a,c){if(a)b(a);else{var d=n(c);!d||"document"!==d.localName||d.namespaceURI!==e?x(p.INVALID):(v.rootElement=
-d,d.fontFaceDecls=j(d,e,"font-face-decls"),d.styles=j(d,e,"styles"),d.automaticStyles=j(d,e,"automatic-styles"),d.masterStyles=j(d,e,"master-styles"),d.body=j(d,e,"body"),d.meta=j(d,e,"meta"),x(p.DONE))}})}var v=this,J=null;this.onstatereadychange=h;this.parts=this.rootElement=this.state=this.onchange=null;this.getPart=function(a){return new c(a,v,J)};this.save=function(a){var b;b=runtime.byteArrayFromString(L(),"utf8");J.save("settings.xml",b,!0,new Date);b=runtime.byteArrayFromString(y(),"utf8");
-J.save("meta.xml",b,!0,new Date);b=runtime.byteArrayFromString(T(),"utf8");J.save("styles.xml",b,!0,new Date);b=runtime.byteArrayFromString(O(),"utf8");J.save("content.xml",b,!0,new Date);J.write(function(b){a(b)})};this.state=p.LOADING;this.rootElement=function(a){var b=document.createElementNS(a.namespaceURI,a.localName),c,a=new a;for(c in a)a.hasOwnProperty(c)&&(b[c]=a[c]);return b}(a);this.parts=new b(this);J=new core.Zip(d,function(a,b){J=b;a?N(d,function(b){a&&(J.error=a+"\n"+b,x(p.INVALID))}):
-t()})};odf.OdfContainer.EMPTY=0;odf.OdfContainer.LOADING=1;odf.OdfContainer.DONE=2;odf.OdfContainer.INVALID=3;odf.OdfContainer.SAVING=4;odf.OdfContainer.MODIFIED=5;odf.OdfContainer.getContainer=function(a){return new odf.OdfContainer(a,null)};return odf.OdfContainer}();
-// Input 24
-odf.Formatting=function(){function j(f){function g(a,b){for(var d=a&&a.firstChild;d&&b;)d=d.nextSibling,b-=1;return d}var a=g(f.startContainer,f.startOffset);g(f.endContainer,f.endOffset);this.next=function(){return null===a?a:null}}var l=new odf.StyleInfo;this.setOdfContainer=function(){};this.isCompletelyBold=function(){return!1};this.getAlignment=function(f){this.getParagraphStyles(f)};this.getParagraphStyles=function(f){var g,a,c,b=[];for(g=0;g<f.length;g+=0){a=void 0;c=[];for(a=(new j(f[g])).next();a;)l.canElementHaveStyle("paragraph",
-a)&&c.push(a);for(a=0;a<c.length;a+=1)-1===b.indexOf(c[a])&&b.push(c[a])}return b};this.getTextStyles=function(){return[]}};
-// Input 25
-runtime.loadClass("odf.OdfContainer");runtime.loadClass("odf.Formatting");runtime.loadClass("xmldom.XPath");
-odf.OdfCanvas=function(){function j(a){function b(){for(;0<c.cssRules.length;)c.deleteRule(0);c.insertRule("office|presentation draw|page {display:none;}",0);c.insertRule("office|presentation draw|page:nth-child("+d+") {display:block;}",1)}var c=a.sheet,d=1;this.showNextPage=function(){d+=1;b()};this.showPreviousPage=function(){1<d&&(d-=1,b())};this.css=a}function l(a,b,c){a.addEventListener?a.addEventListener(b,c,!1):a.attachEvent?a.attachEvent("on"+b,c):a["on"+b]=c}function f(a){function b(a,c){for(;c;){if(c===
-a)return!0;c=c.parentNode}return!1}function c(){var f=[],g=runtime.getWindow().getSelection(),h,i;for(h=0;h<g.rangeCount;h+=1)i=g.getRangeAt(h),null!==i&&b(a,i.startContainer)&&b(a,i.endContainer)&&f.push(i);if(f.length===d.length){for(g=0;g<f.length&&!(f[g]===d[g]?0:null===f[g]||null===d[g]||f[g].startContainer!==d[g].startContainer||f[g].startOffset!==d[g].startOffset||f[g].endContainer!==d[g].endContainer||f[g].endOffset!==d[g].endOffset);g+=1);if(g===f.length)return}d=f;var g=[f.length],j,k=a.ownerDocument;
-for(h=0;h<f.length;h+=1)i=f[h],j=k.createRange(),j.setStart(i.startContainer,i.startOffset),j.setEnd(i.endContainer,i.endOffset),g[h]=j;d=g;g=e.length;for(f=0;f<g;f+=1)e[f](a,d)}var d=[],e=[];this.addListener=function(a,b){var c,d=e.length;for(c=0;c<d;c+=1)if(e[c]===b)return;e.push(b)};l(a,"mouseup",c);l(a,"keyup",c);l(a,"keydown",c)}function g(a){for(a=a.firstChild;a;){if(a.namespaceURI===o&&"binary-data"===a.localName)return"data:image/png;base64,"+a.textContent;a=a.nextSibling}return""}function a(a,
-b,c,d){function e(b){b='draw|image[styleid="'+a+'"] {'+("background-image: url("+b+");")+"}";d.insertRule(b,d.cssRules.length)}c.setAttribute("styleid",a);var f=c.getAttributeNS(p,"href"),h;if(f)try{b.getPartUrl?(f=b.getPartUrl(f),e(f)):(h=b.getPart(f),h.onchange=function(a){e(a.url)},h.load())}catch(i){runtime.log("slight problem: "+i)}else f=g(c),e(f)}function c(b,c,d){function e(b,c,d,f){x.addToQueue(function(){a(b,c,d,f)})}var f,g;f=c.getElementsByTagNameNS(h,"image");for(c=0;c<f.length;c+=1)g=
-f.item(c),e("image"+c,b,g,d)}function b(a,b,c){function d(a,b){"video/"===b.substr(0,6)?(e=h.createElementNS(h.documentElement.namespaceURI,"video"),e.setAttribute("controls","controls"),f=h.createElement("source"),f.setAttribute("src",a),f.setAttribute("type",b),e.appendChild(f),c.parentNode.appendChild(e)):c.innerHtml="Unrecognised Plugin"}var e,f,h=c.ownerDocument,i;if(a=c.getAttributeNS(p,"href"))try{b.getPartUrl?(a=b.getPartUrl(a),d(a,"video/mp4")):(i=b.getPart(a),i.onchange=function(a){d(a.url,
-a.mimetype)},i.load())}catch(j){runtime.log("slight problem: "+j)}else runtime.log("using MP4 data fallback"),a=g(c),d(a,"video/mp4")}function d(a,c,d){function e(a,c,d,f){x.addToQueue(function(){b(a,c,d,f)})}var f,g;f=c.getElementsByTagNameNS(h,"plugin");runtime.log("Loading Videos:");for(c=0;c<f.length;c+=1)runtime.log("...Found a video."),g=f.item(c),e("video"+c,a,g,d)}function k(a){var b=a.getElementsByTagName("style"),c=a.getElementsByTagName("head")[0],d="",e,b=b&&0<b.length?b[0].cloneNode(!1):
-a.createElement("style");for(e in i)i.hasOwnProperty(e)&&e&&(d+="@namespace "+e+" url("+i[e]+");\n");b.appendChild(a.createTextNode(d));c.appendChild(b);return b}var e=new odf.Style2CSS,i=e.namespaces,h=i.draw,n=i.fo,o=i.office,u=i.svg,s=i.text,p=i.xlink,w=runtime.getWindow(),B=new xmldom.XPath,A={},q,x=new function(){function a(d){c=!0;runtime.setTimeout(function(){try{d()}catch(e){runtime.log(e)}c=!1;0<b.length&&a(b.pop())},10)}var b=[],c=!1;this.clearQueue=function(){b.length=0};this.addToQueue=
-function(d){if(0===b.length&&!c)return a(d);b.push(d)}};odf.OdfCanvas=function(a){function b(){var c=a.firstChild.firstChild;c&&(a.style.WebkitTransform="scale("+v+")",a.style.WebkitTransformOrigin="left top",a.style.width=Math.round(v*c.offsetWidth)+"px",a.style.height=Math.round(v*c.offsetHeight)+"px")}function g(f){function i(){for(var g=a;g.firstChild;)g.removeChild(g.firstChild);a.style.display="inline-block";g=f.rootElement;a.ownerDocument.importNode(g,!0);o.setOdfContainer(f);var j=T;(new odf.Style2CSS).style2css(j.sheet,
-g.styles,g.automaticStyles);var j=f,k=O.sheet,l;l=g.body;var p,q,w;q=[];for(p=l.firstChild;p&&p!==l;)if(p.namespaceURI===h&&(q[q.length]=p),p.firstChild)p=p.firstChild;else{for(;p&&p!==l&&!p.nextSibling;)p=p.parentNode;p&&p.nextSibling&&(p=p.nextSibling)}for(w=0;w<q.length;w+=1){p=q[w];var t="frame"+w,x=k;p.setAttribute("styleid",t);var v=void 0,y=p.getAttributeNS(s,"anchor-type"),G=p.getAttributeNS(u,"x"),z=p.getAttributeNS(u,"y"),F=p.getAttributeNS(u,"width"),L=p.getAttributeNS(u,"height"),P=p.getAttributeNS(n,
-"min-height"),N=p.getAttributeNS(n,"min-width");if("as-char"===y)v="display: inline-block;";else if(y||G||z)v="position: absolute;";else if(F||L||P||N)v="display: block;";G&&(v+="left: "+G+";");z&&(v+="top: "+z+";");F&&(v+="width: "+F+";");L&&(v+="height: "+L+";");P&&(v+="min-height: "+P+";");N&&(v+="min-width: "+N+";");v&&(v="draw|"+p.localName+'[styleid="'+t+'"] {'+v+"}",x.insertRule(v,x.cssRules.length))}w=B.getODFElementsWithXPath(l,".//*[*[@text:anchor-type='paragraph']]",e.namespaceResolver);
-for(q=0;q<w.length;q+=1)l=w[q],l.setAttributeNS&&l.setAttributeNS("urn:webodf","containsparagraphanchor",!0);k.insertRule("draw|page { background-color:#fff; }",k.cssRules.length);for(l=a;l.firstChild;)l.removeChild(l.firstChild);l=m.createElement("div");l.style.display="inline-block";l.style.background="white";l.appendChild(g);a.appendChild(l);c(j,g.body,k);d(j,g.body,k);b();if(A.hasOwnProperty("statereadychange")){g=A.statereadychange;for(j=0;j<g.length;j+=1)g[j](void 0)}}p===f&&(p.state===odf.OdfContainer.DONE?
-i():p.onchange=i)}function i(){if(q){for(var a=q.ownerDocument.createDocumentFragment();q.firstChild;)a.insertBefore(q.firstChild,null);q.parentNode.replaceChild(a,q)}}var m=a.ownerDocument,p,o=new odf.Formatting,y=new f(a),L=new j(k(m)),T=k(m),O=k(m),N=!1,v=1;this.odfContainer=function(){return p};this.slidevisibilitycss=function(){return L.css};this.load=this.load=function(b){x.clearQueue();a.innerHTML="loading "+b;p=new odf.OdfContainer(b,function(a){p=a;g(a)});p.onstatereadychange=g};this.save=
-function(a){i();p.save(a)};this.setEditable=function(a){(N=a)||i()};this.addListener=function(a,b){if("selectionchange"===a)y.addListener(a,b);else{var c=A[a];void 0===c&&(c=A[a]=[]);b&&-1===c.indexOf(b)&&c.push(b)}};this.getFormatting=function(){return o};this.setZoomLevel=function(a){v=a;b()};this.getZoomLevel=function(){return v};this.fitToContainingElement=function(c,d){var e=a.offsetHeight/v;v=c/(a.offsetWidth/v);d/e<v&&(v=d/e);b()};this.fitToWidth=function(c){v=c/(a.offsetWidth/v);b()};this.fitToHeight=
-function(c){v=c/(a.offsetHeight/v);b()};this.showNextPage=function(){L.showNextPage()};this.showPreviousPage=function(){L.showPreviousPage()};this.showAllPages=function(){};l(a,"click",function(a){for(var a=a||w.event,b=a.target,c=w.getSelection(),d=0<c.rangeCount?c.getRangeAt(0):null,e=d&&d.startContainer,f=d&&d.startOffset,g=d&&d.endContainer,h=d&&d.endOffset;b&&!(("p"===b.localName||"h"===b.localName)&&b.namespaceURI===s);)b=b.parentNode;N&&b&&b.parentNode!==q&&((q?q.parentNode&&i():(q=b.ownerDocument.createElement("p"),
-q.style||(q=b.ownerDocument.createElementNS("http://www.w3.org/1999/xhtml","p")),q.style.margin="0px",q.style.padding="0px",q.style.border="0px",q.setAttribute("contenteditable",!0)),b.parentNode.replaceChild(q,b),q.appendChild(b),q.focus(),d&&(c.removeAllRanges(),d=b.ownerDocument.createRange(),d.setStart(e,f),d.setEnd(g,h),c.addRange(d)),a.preventDefault)?(a.preventDefault(),a.stopPropagation()):(a.returnValue=!1,a.cancelBubble=!0))})};return odf.OdfCanvas}();
-// Input 26
-runtime.loadClass("xmldom.XPath");runtime.loadClass("odf.Style2CSS");
-gui.PresenterUI=function(){var j=new odf.Style2CSS,l=new xmldom.XPath,f=j.namespaceResolver;return function(g){var a=this;a.setInitialSlideMode=function(){a.startSlideMode("single")};a.keyDownHandler=function(c){if(!(c.target.isContentEditable||"input"===c.target.nodeName))switch(c.keyCode){case 84:a.toggleToolbar();break;case 37:case 8:a.prevSlide();break;case 39:case 32:a.nextSlide();break;case 36:a.firstSlide();break;case 35:a.lastSlide()}};a.root=function(){return a.odf_canvas.odfContainer().rootElement};
-a.firstSlide=function(){a.slideChange(function(){return 0})};a.lastSlide=function(){a.slideChange(function(a,b){return b-1})};a.nextSlide=function(){a.slideChange(function(a,b){return a+1<b?a+1:-1})};a.prevSlide=function(){a.slideChange(function(a){return 1>a?-1:a-1})};a.slideChange=function(c){var b=a.getPages(a.odf_canvas.odfContainer().rootElement),d=-1,f=0;b.forEach(function(a){a=a[1];a.hasAttribute("slide_current")&&(d=f,a.removeAttribute("slide_current"));f+=1});c=c(d,b.length);-1===c&&(c=d);
-b[c][1].setAttribute("slide_current","1");document.getElementById("pagelist").selectedIndex=c;"cont"===a.slide_mode&&window.scrollBy(0,b[c][1].getBoundingClientRect().top-30)};a.selectSlide=function(c){a.slideChange(function(a,d){return c>=d||0>c?-1:c})};a.scrollIntoContView=function(c){var b=a.getPages(a.odf_canvas.odfContainer().rootElement);0!==b.length&&window.scrollBy(0,b[c][1].getBoundingClientRect().top-30)};a.getPages=function(a){var a=a.getElementsByTagNameNS(f("draw"),"page"),b=[],d;for(d=
-0;d<a.length;d+=1)b.push([a[d].getAttribute("draw:name"),a[d]]);return b};a.fillPageList=function(c,b){for(var d=a.getPages(c),f,e,g;b.firstChild;)b.removeChild(b.firstChild);for(f=0;f<d.length;f+=1)e=document.createElement("option"),g=l.getODFElementsWithXPath(d[f][1],'./draw:frame[@presentation:class="title"]//draw:text-box/text:p',xmldom.XPath),g=0<g.length?g[0].textContent:d[f][0],e.textContent=f+1+": "+g,b.appendChild(e)};a.startSlideMode=function(c){var b=document.getElementById("pagelist"),
-d=a.odf_canvas.slidevisibilitycss().sheet;for(a.slide_mode=c;0<d.cssRules.length;)d.deleteRule(0);a.selectSlide(0);"single"===a.slide_mode?(d.insertRule("draw|page { position:fixed; left:0px;top:30px; z-index:1; }",0),d.insertRule("draw|page[slide_current]  { z-index:2;}",1),d.insertRule("draw|page  { -webkit-transform: scale(1);}",2),a.fitToWindow(),window.addEventListener("resize",a.fitToWindow,!1)):"cont"===a.slide_mode&&window.removeEventListener("resize",a.fitToWindow,!1);a.fillPageList(a.odf_canvas.odfContainer().rootElement,
-b)};a.toggleToolbar=function(){var c,b,d;c=a.odf_canvas.slidevisibilitycss().sheet;b=-1;for(d=0;d<c.cssRules.length;d+=1)if(".toolbar"===c.cssRules[d].cssText.substring(0,8)){b=d;break}-1<b?c.deleteRule(b):c.insertRule(".toolbar { position:fixed; left:0px;top:-200px; z-index:0; }",0)};a.fitToWindow=function(){var c=a.getPages(a.root()),b=(window.innerHeight-40)/c[0][1].clientHeight,c=(window.innerWidth-10)/c[0][1].clientWidth,b=b<c?b:c,c=a.odf_canvas.slidevisibilitycss().sheet;c.deleteRule(2);c.insertRule("draw|page { \n-moz-transform: scale("+
-b+"); \n-moz-transform-origin: 0% 0%; -webkit-transform-origin: 0% 0%; -webkit-transform: scale("+b+"); -o-transform-origin: 0% 0%; -o-transform: scale("+b+"); -ms-transform-origin: 0% 0%; -ms-transform: scale("+b+"); }",2)};a.load=function(c){a.odf_canvas.load(c)};a.odf_element=g;a.odf_canvas=new odf.OdfCanvas(a.odf_element);a.odf_canvas.addListener("statereadychange",a.setInitialSlideMode);a.slide_mode="undefined";document.addEventListener("keydown",a.keyDownHandler,!1)}}();
-// Input 27
-gui.Caret=function(j,l){l.ownerDocument.createElementNS("urn:webodf:names:cursor","cursor");this.updateToSelection=function(){1===j.rangeCount&&j.getRangeAt(0)}};
-// Input 28
-runtime.loadClass("core.Cursor");
-gui.SelectionMover=function(j,l){function f(a,c){if(0!==j.rangeCount){var f=j.getRangeAt(0);if(f.startContainer&&1===f.startContainer.nodeType){l.setPoint(f.startContainer,f.startOffset);c();f=l.node();l.position();var e=[],g;for(g=0;g<j.rangeCount;g+=1)e[g]=j.getRangeAt(g);j.removeAllRanges();0===e.length&&(e[0]=f.ownerDocument.createRange());e[e.length-1].setStart(l.node(),l.position());for(g=0;g<e.length;g+=1)j.addRange(e[g])}}}function g(){c.updateToSelection();for(var a=c.getNode().getBoundingClientRect(),
-d=a.left,f=a.top,a=!1;!a;){c.remove();if(j.focusNode&&1===j.focusNode.nodeType){l.setPoint(j.focusNode,j.focusOffset);l.stepForward();var a=l.node(),e=l.position();j.collapse(a,e);c.updateToSelection()}a=c.getNode().getBoundingClientRect();a=a.top!==f&&a.left>d}}var a=l.node().ownerDocument,c=new core.Cursor(j,a);this.movePointForward=function(a){f(a,l.stepForward)};this.movePointBackward=function(a){f(a,l.stepBackward)};this.moveLineForward=function(a){j.modify?j.modify(a?"extend":"move","forward",
-"line"):f(a,g)};this.moveLineBackward=function(a){j.modify?j.modify(a?"extend":"move","backward","line"):f(a,function(){})};return this};
-// Input 29
-runtime.loadClass("core.PointWalker");runtime.loadClass("core.Cursor");
-gui.XMLEdit=function(j,l){function f(a,b,c){a.addEventListener?a.addEventListener(b,c,!1):a.attachEvent?a.attachEvent("on"+b,c):a["on"+b]=c}function g(a){a.preventDefault?a.preventDefault():a.returnValue=!1}function a(){var a=j.ownerDocument.defaultView.getSelection();a&&!(0>=a.rangeCount)&&s&&(a=a.getRangeAt(0),s.setPoint(a.startContainer,a.startOffset))}function c(){var a=j.ownerDocument.defaultView.getSelection(),b,c;a.removeAllRanges();s&&s.node()&&(b=s.node(),c=b.ownerDocument.createRange(),
-c.setStart(b,s.position()),c.collapse(!0),a.addRange(c))}function b(b){var d=b.charCode||b.keyCode;if(s=null,s&&37===d)a(),s.stepBackward(),c();else if(16<=d&&20>=d||33<=d&&40>=d)return;g(b)}function d(){}function k(a){j.ownerDocument.defaultView.getSelection().getRangeAt(0);g(a)}function e(a){for(var b=a.firstChild;b&&b!==a;)1===b.nodeType&&e(b),b=b.nextSibling||b.parentNode;var c,d,f,b=a.attributes;c="";for(f=b.length-1;0<=f;f-=1)d=b.item(f),c=c+" "+d.nodeName+'="'+d.nodeValue+'"';a.setAttribute("customns_name",
-a.nodeName);a.setAttribute("customns_atts",c);b=a.firstChild;for(d=/^\s*$/;b&&b!==a;)c=b,b=b.nextSibling||b.parentNode,3===c.nodeType&&d.test(c.nodeValue)&&c.parentNode.removeChild(c)}function i(a,b){for(var c=a.firstChild,d,e,f;c&&c!==a;){if(1===c.nodeType){i(c,b);d=c.attributes;for(f=d.length-1;0<=f;f-=1)e=d.item(f),"http://www.w3.org/2000/xmlns/"===e.namespaceURI&&!b[e.nodeValue]&&(b[e.nodeValue]=e.localName)}c=c.nextSibling||c.parentNode}}function h(){var a=j.ownerDocument.createElement("style"),
-b;b={};i(j,b);var c={},d,e,f=0;for(d in b)if(b.hasOwnProperty(d)&&d){e=b[d];if(!e||c.hasOwnProperty(e)||"xmlns"===e){do e="ns"+f,f+=1;while(c.hasOwnProperty(e));b[d]=e}c[e]=!0}a.type="text/css";b="@namespace customns url(customns);\n"+n;a.appendChild(j.ownerDocument.createTextNode(b));l=l.parentNode.replaceChild(a,l)}var n,o,u,s=null;j.id||(j.id="xml"+(""+Math.random()).substring(2));o="#"+j.id+" ";n=o+"*,"+o+":visited, "+o+":link {display:block; margin: 0px; margin-left: 10px; font-size: medium; color: black; background: white; font-variant: normal; font-weight: normal; font-style: normal; font-family: sans-serif; text-decoration: none; white-space: pre-wrap; height: auto; width: auto}\n"+
-o+":before {color: blue; content: '<' attr(customns_name) attr(customns_atts) '>';}\n"+o+":after {color: blue; content: '</' attr(customns_name) '>';}\n"+o+"{overflow: auto;}\n";(function(a){f(a,"click",k);f(a,"keydown",b);f(a,"keypress",d);f(a,"drop",g);f(a,"dragend",g);f(a,"beforepaste",g);f(a,"paste",g)})(j);this.updateCSS=h;this.setXML=function(a){a=a.documentElement||a;u=a=j.ownerDocument.importNode(a,true);for(e(a);j.lastChild;)j.removeChild(j.lastChild);j.appendChild(a);h();s=new core.PointWalker(a)};
-this.getXML=function(){return u}};
-// Input 30
-(function(){return"core/Async.js,core/Base64.js,core/ByteArray.js,core/ByteArrayWriter.js,core/Cursor.js,core/JSLint.js,core/PointWalker.js,core/RawDeflate.js,core/RawInflate.js,core/UnitTester.js,core/Zip.js,gui/Caret.js,gui/SelectionMover.js,gui/XMLEdit.js,gui/PresenterUI.js,odf/FontLoader.js,odf/Formatting.js,odf/OdfCanvas.js,odf/OdfContainer.js,odf/Style2CSS.js,odf/StyleInfo.js,xmldom/LSSerializer.js,xmldom/LSSerializerFilter.js,xmldom/OperationalTransformDOM.js,xmldom/OperationalTransformInterface.js,xmldom/RelaxNG.js,xmldom/RelaxNG2.js,xmldom/RelaxNGParser.js,xmldom/XPath.js".split(",")})();
diff --git a/apps/files_odfviewer/src/.gitignore b/apps/files_odfviewer/src/.gitignore
deleted file mode 100644
index 378eac25d3..0000000000
--- a/apps/files_odfviewer/src/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-build
diff --git a/apps/files_odfviewer/src/update.sh b/apps/files_odfviewer/src/update.sh
deleted file mode 100755
index dad9bf35fb..0000000000
--- a/apps/files_odfviewer/src/update.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-cd webodf
-git pull
-cd ..
-rm -Rf build
-mkdir build
-cd build
-cmake ../webodf
-make webodf.js webodf-debug.js
-cp webodf/webodf*.js ../../js/
diff --git a/apps/files_odfviewer/src/webodf/.gitignore b/apps/files_odfviewer/src/webodf/.gitignore
deleted file mode 100644
index 5f9afa1071..0000000000
--- a/apps/files_odfviewer/src/webodf/.gitignore
+++ /dev/null
@@ -1,17 +0,0 @@
-#android/bin
-#android/gen
-nativeQtClient/nativeQtClient.pro.user
-programs/firefoxextension/content/webodf.js
-programs/firefoxextension/content/webodf.css
-programs/firefoxextension/install.rdf
-programs/ios/WebODF.xcodeproj/project.xcworkspace
-programs/ios/WebODF.xcodeproj/xcuserdata
-programs/ios/www/ZoomIn.png
-programs/ios/www/ZoomOut.png
-programs/ios/www/app/
-programs/ios/www/sencha-touch.css
-programs/ios/www/sencha-touch.js
-programs/ios/www/webodf.css
-programs/ios/www/webodf.js
-.DS_Store
-programs/ios/build/
diff --git a/apps/files_odfviewer/src/webodf/.gitmodules b/apps/files_odfviewer/src/webodf/.gitmodules
deleted file mode 100644
index 0d440b2a36..0000000000
--- a/apps/files_odfviewer/src/webodf/.gitmodules
+++ /dev/null
@@ -1,9 +0,0 @@
-[submodule "webodf/extjs"]
-	path = webodf/extjs
-	url = git://github.com/probonogeek/extjs.git
-[submodule "simplerevisionserver/pywebdav"]
-	path = simplerevisionserver/pywebdav
-	url = ssh://vandenoever@heap.kogmbh.net/srv/git/pywebdav
-[submodule "extjs"]
-	path = extjs
-	url = git://github.com/probonogeek/extjs.git
diff --git a/apps/files_odfviewer/src/webodf/CMakeLists.txt b/apps/files_odfviewer/src/webodf/CMakeLists.txt
deleted file mode 100644
index dfac345df1..0000000000
--- a/apps/files_odfviewer/src/webodf/CMakeLists.txt
+++ /dev/null
@@ -1,160 +0,0 @@
-# WebODF is mostly a JavaScript project. CMake needs to know about the C++ parts
-project (WebODF C CXX)
-# version 2.8.2 is needed to have support for zip files in external projects
-cmake_minimum_required(VERSION 2.8.2)
-
-# At this point, the version number that is used throughout is defined
-set(WEBODF_VERSION 0.3.0)
-
-# This makefile 'compiles' WebODF using various tools, instruments the code and
-# builds and packages programs that use WebODF.
-
-# Find installed dependencies
-find_package(Qt4 4.7.0 COMPONENTS QtCore QtGui QtXml QtNetwork QtWebKit)
-if (NOT QT4_FOUND)
-  message(WARNING "Qt4 with modules QtCore QtGui QtXml QtNetwork QtWebKit was not found. qtjsruntime will no be built.")
-endif (NOT QT4_FOUND)
-
-# java runtime is needed for Closure Compiler
-find_package(Java COMPONENTS Runtime)
-
-if (CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR)
-  message(FATAL_ERROR "Compiling in the source directortory is not supported. Use for example 'mkdir build; cd build; cmake ..'.")
-endif (CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR)
-
-# Tools must be obtained to work with:
-include (ExternalProject)
-
-if(Java_JAVA_EXECUTABLE)
-    # Closure Compiler
-    ExternalProject_Add(
-        ClosureCompiler
-        URL "http://closure-compiler.googlecode.com/files/compiler-20120305.tar.gz"
-        URL_MD5 513344df6f18bfa00b17f034cabf897d
-        CONFIGURE_COMMAND ""
-        BUILD_COMMAND ""
-        INSTALL_COMMAND ""
-    )
-    set(CLOSURE_JAR ${CMAKE_BINARY_DIR}/ClosureCompiler-prefix/src/ClosureCompiler/compiler.jar)
-endif(Java_JAVA_EXECUTABLE)
-
-# Rhino
-if(Java_JAVA_EXECUTABLE)
-    ExternalProject_Add(
-        Rhino
-        URL "http://ftp.mozilla.org/pub/js/rhino1_7R3.zip"
-        URL_MD5 99d94103662a8d0b571e247a77432ac5
-        CONFIGURE_COMMAND ""
-        BUILD_COMMAND ""
-        INSTALL_COMMAND ""
-    )
-    set(RHINO ${CMAKE_BINARY_DIR}/Rhino-prefix/src/Rhino/js.jar)
-endif(Java_JAVA_EXECUTABLE)
-
-# JSDoc
-ExternalProject_Add(
-    JsDoc
-    URL "http://jsdoc-toolkit.googlecode.com/files/jsdoc_toolkit-2.4.0.zip"
-    URL_MD5 a8f78f5ecd24b54501147b2af341a231
-    CONFIGURE_COMMAND ""
-    BUILD_COMMAND ""
-    INSTALL_COMMAND ""
-)
-set(JSDOCDIR ${CMAKE_BINARY_DIR}/JsDoc-prefix/src/JsDoc/jsdoc-toolkit)
-
-# Node.JS
-ExternalProject_Add(
-    NodeJS
-    URL "http://nodejs.org/dist/v0.6.15/node-v0.6.15.tar.gz"
-    URL_MD5 852cfb1ed8125a4cdba456446d869d19
-    CONFIGURE_COMMAND "./configure"
-    BUILD_IN_SOURCE 1
-    INSTALL_COMMAND ""
-)
-set(NODE ${CMAKE_BINARY_DIR}/NodeJS-prefix/src/NodeJS/out/Release/node)
-
-# JSCoverage
-ExternalProject_Add(
-    JSCoverage
-    URL "http://siliconforks.com/jscoverage/download/jscoverage-0.5.1.tar.bz2"
-    URL_MD5 a70d79a6759367fbcc0bcc18d6866ff3
-    PATCH_COMMAND patch -p0 < ${CMAKE_CURRENT_SOURCE_DIR}/JSCoverage.patch
-    CONFIGURE_COMMAND "./configure"
-    BUILD_IN_SOURCE 1
-    INSTALL_COMMAND ""
-)
-set(JSCOVERAGE ${CMAKE_BINARY_DIR}/JSCoverage-prefix/src/JSCoverage/jscoverage)
-
-# Android
-if (NOT ANDROID_SDK_DIR)
-  find_path(ANDROID_SDK_DIR platform-tools/aapt)
-endif(NOT ANDROID_SDK_DIR)
-if (NOT ANT)
-  find_file(ANT NAMES ant ant.exe /usr/bin /usr/local/bin)
-endif(NOT ANT)
-
-
-
-set(LIBJSFILES lib/packages.js lib/runtime.js lib/core/Base64.js
-    lib/core/RawDeflate.js lib/core/ByteArray.js
-    lib/core/ByteArrayWriter.js lib/core/RawInflate.js
-    lib/core/Cursor.js lib/core/UnitTester.js
-    lib/core/PointWalker.js lib/core/Async.js
-    lib/core/Zip.js
-
-    lib/xmldom/LSSerializerFilter.js lib/xmldom/LSSerializer.js
-    lib/xmldom/RelaxNGParser.js lib/xmldom/RelaxNG.js
-    lib/xmldom/RelaxNG2.js lib/xmldom/OperationalTransformInterface.js
-    lib/xmldom/OperationalTransformDOM.js
-    lib/xmldom/XPath.js
-
-    lib/odf/StyleInfo.js lib/odf/Style2CSS.js
-    lib/odf/FontLoader.js lib/odf/OdfContainer.js
-    lib/odf/Formatting.js lib/odf/OdfCanvas.js
-
-    lib/gui/PresenterUI.js lib/gui/Caret.js
-    lib/gui/SelectionMover.js lib/gui/XMLEdit.js
-
-    lib/manifest.js
-)
-
-set(HTML5UIFILES
-  app/app.js app/controller/Files.js app/model/FileSystem.js
-  app/views/FileDetail.js app/views/FilesList.js app/views/OdfView.js
-  app/views/Viewport.js sencha-touch.css sencha-touch.js
-  app/store/FileStore.js
-  ZoomOut.png ZoomIn.png go-previous.png go-next.png
-  zoom-fit-width.png zoom-fit-best.png zoom-fit-height.png
-)
-
-add_subdirectory(webodf)
-add_subdirectory(programs)
-
-# package webodf
-set(WEBODFZIP webodf-${WEBODF_VERSION}.zip)
-set(WEBODFZIP_FILES
-  ${CMAKE_BINARY_DIR}/webodf/webodf-debug.js
-  ${CMAKE_BINARY_DIR}/webodf/webodf.js
-  ${CMAKE_SOURCE_DIR}/webodf/webodf.css
-)
-add_custom_command(
-    OUTPUT ${WEBODFZIP}
-    # zip using javascript code running in node.js
-    COMMAND ${NODE} ARGS webodf/lib/runtime.js packwebodf.js
-        ${CMAKE_BINARY_DIR}/${WEBODFZIP}
-#input files
-        ${WEBODFZIP_FILES}
-#output files
-        webodf-debug.js
-        webodf.js
-        webodf.css
-    DEPENDS NodeJS
-        packwebodf.js
-        ${WEBODFZIP_FILES}
-        webodf-debug.js
-        webodf.js
-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-)
-add_custom_target(zip ALL DEPENDS ${WEBODFZIP})
-
-# vim:expandtab
diff --git a/apps/files_odfviewer/src/webodf/JSCoverage.patch b/apps/files_odfviewer/src/webodf/JSCoverage.patch
deleted file mode 100644
index b769f40b9d..0000000000
--- a/apps/files_odfviewer/src/webodf/JSCoverage.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./util.c_	2011-04-20 11:22:46.558521731 +0200
-+++ ./util.c	2011-04-20 11:23:23.999880771 +0200
-@@ -478,6 +478,10 @@
-         p->next = head;
-         head = p;
-       }
-+    else if (S_ISDIR(buf.st_mode)) {
-+      head = recursive_dir_list(root, entry_wrt_root, head);
-+      free(entry_wrt_root);
-+    }
-       else {
-         fatal("refusing to follow symbolic link: %s", entry);
-       }
diff --git a/apps/files_odfviewer/src/webodf/packwebodf.js b/apps/files_odfviewer/src/webodf/packwebodf.js
deleted file mode 100644
index 3a0d76c692..0000000000
--- a/apps/files_odfviewer/src/webodf/packwebodf.js
+++ /dev/null
@@ -1,93 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global runtime: true, core: true*/
-runtime.loadClass("core.Zip");
-runtime.loadClass("core.Base64");
-
-function addFiles(zip, pos, inputfiles, zipfiles, callback) {
-    "use strict";
-    if (inputfiles.length !== zipfiles.length) {
-        return callback(
-                "Arrays inputfiles and zipfiles should have the same length.");
-    }
-    if (pos >= inputfiles.length) {
-        zip.write(function (err) {
-            return callback(err);
-        });
-        return;
-    }
-    var inputfile = inputfiles[pos],
-        zipmemberpath = zipfiles[pos];
-    runtime.readFile(inputfile, "binary", function (err, data) {
-        var base64;
-        if (err) {
-            return callback(err);
-        }
-        zip.save(zipmemberpath, data, false, new Date());
-        addFiles(zip, pos + 1, inputfiles, zipfiles, callback);
-    });
-}
-
-function usage() {
-    "use strict";
-    runtime.log("Usage:");
-}
-
-/**
- * This script takes 1+2n arguments
- * First argument is the name of the target zip file.
- * The next n arguments are the input files. The last n arguments are the
- * names of the files in the zip file.
- */
-if (arguments.length % 2 !== 0) {
-    runtime.log("Wrong number of arguments.");
-    usage();
-    runtime.exit(1);
-}
-var args = arguments,
-    n = (args.length - 2) / 2,
-    zipfilename = args[1],
-    inputmembers = [],
-    zipmembers = [],
-    i,
-    zip = new core.Zip(zipfilename, null);
-for (i = 0; i < n; i += 1) {
-    inputmembers[i] = args[2 + i];
-    zipmembers[i] = args[2 + n + i];
-}
-addFiles(zip, 0, inputmembers, zipmembers, function (err) {
-    "use strict";
-    if (err) {
-        runtime.log(err);
-    }
-});
diff --git a/apps/files_odfviewer/src/webodf/programs/CMakeLists.txt b/apps/files_odfviewer/src/webodf/programs/CMakeLists.txt
deleted file mode 100644
index 4621a25d67..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/CMakeLists.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-macro(COPY_FILES _varname _srcdir _tgtdir)
-  foreach(_file ${ARGN})
-    GET_FILENAME_COMPONENT(_subdir ${_file} PATH)
-    FILE(MAKE_DIRECTORY ${_tgtdir}/${_subdir})
-    add_custom_command(
-      OUTPUT ${_tgtdir}/${_file}
-      COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different
-        ${_srcdir}/${_file}
-        ${_tgtdir}/${_file}
-      DEPENDS
-        ${_srcdir}/${_file}
-    )
-    set(${_varname} ${${_varname}} ${_tgtdir}/${_file})
-  endforeach(_file)
-endmacro(COPY_FILES _directory _files)
-
-if(QT4_FOUND)
-  add_subdirectory(qtjsruntime)
-  add_subdirectory(nativeQtClient)
-  add_subdirectory(docnosis)
-endif(QT4_FOUND)
-
-if(ANDROID_SDK_DIR AND ANT)
-  add_subdirectory(android)
-endif(ANDROID_SDK_DIR AND ANT)
-
-add_subdirectory(firefoxextension)
-
-add_subdirectory(touchui)
-add_subdirectory(playbook)
diff --git a/apps/files_odfviewer/src/webodf/programs/android/AndroidManifest.xml b/apps/files_odfviewer/src/webodf/programs/android/AndroidManifest.xml
deleted file mode 100644
index 491bbb80a2..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/android/AndroidManifest.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-	package="org.webodf" android:versionCode="1" android:versionName="1.0">
-	<supports-screens android:largeScreens="true"
-		android:normalScreens="true" android:smallScreens="true"
-		android:resizeable="true" android:anyDensity="true" />
-	<uses-sdk android:minSdkVersion="4" android:targetSdkVersion="4" />
-	<application android:icon="@drawable/icon"
-		android:label="@string/app_name">
-		<activity android:label="@string/app_name" android:name=".WebODFActivity"
-			android:configChanges="orientation|keyboardHidden">
-			<intent-filter>
-				<action android:name="android.intent.action.MAIN" />
-				<category android:name="android.intent.category.LAUNCHER" />
-			</intent-filter>
-			<intent-filter>
-				<action android:name="android.intent.action.VIEW" />
-				<category android:name="android.intent.category.DEFAULT" />
-				<category android:name="android.intent.category.BROWSABLE" />
-				<data android:mimeType="application/vnd.oasis.opendocument.text" />
-			</intent-filter>
-			<intent-filter>
-				<action android:name="android.intent.action.VIEW" />
-				<category android:name="android.intent.category.DEFAULT" />
-				<category android:name="android.intent.category.BROWSABLE" />
-				<data android:mimeType="application/vnd.oasis.opendocument.presentation" />
-			</intent-filter>
-			<intent-filter>
-				<action android:name="android.intent.action.VIEW" />
-				<category android:name="android.intent.category.DEFAULT" />
-				<category android:name="android.intent.category.BROWSABLE" />
-				<data android:mimeType="application/vnd.oasis.opendocument.spreadsheet" />
-			</intent-filter>
-		</activity>
-		<activity android:name="com.phonegap.DroidGap" android:label="@string/app_name"
-			android:configChanges="orientation|keyboardHidden">
-			<intent-filter>
-			</intent-filter>
-		</activity>
-	</application>
-
-</manifest>
diff --git a/apps/files_odfviewer/src/webodf/programs/android/CMakeLists.txt b/apps/files_odfviewer/src/webodf/programs/android/CMakeLists.txt
deleted file mode 100644
index b16c5a2f69..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/android/CMakeLists.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-set(ANDROID_JAR ${ANDROID_SDK_DIR}/platforms/android-8/android.jar)
-
-COPY_FILES(APKDEPS ${CMAKE_SOURCE_DIR}/programs/touchui
-    ${CMAKE_CURRENT_BINARY_DIR}/assets/www ${HTML5UIFILES})
-COPY_FILES(APKDEPS ${CMAKE_CURRENT_SOURCE_DIR}/assets/www
-    ${CMAKE_CURRENT_BINARY_DIR}/assets/www
-    index.html icon.png phonegap-1.4.1.js)
-COPY_FILES(APKDEPS ${CMAKE_CURRENT_SOURCE_DIR}/res
-    ${CMAKE_CURRENT_BINARY_DIR}/res
-    drawable-hdpi/ic_launcher.png drawable-ldpi/ic_launcher.png
-    drawable/icon.png drawable-mdpi/ic_launcher.png values/strings.xml
-    xml/phonegap.xml xml/plugins.xml layout/selector.xml
-    layout/main.xml layout/listitem.xml)
-COPY_FILES(APKDEPS ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}
-    src/org/webodf/WebODFActivity.java libs/phonegap-1.4.1.jar
-    AndroidManifest.xml)
-COPY_FILES(APKDEPS ${CMAKE_SOURCE_DIR}/webodf
-    ${CMAKE_CURRENT_BINARY_DIR}/assets/www webodf.css)
-COPY_FILES(APKDEPS ${CMAKE_BINARY_DIR}/webodf
-    ${CMAKE_CURRENT_BINARY_DIR}/assets/www webodf.js)
-
-set(WEBODFAPK ${CMAKE_CURRENT_BINARY_DIR}/bin/WebODF-debug.apk)
-add_custom_command(
-    OUTPUT ${WEBODFAPK}
-    COMMAND ${ANDROID_SDK_DIR}/tools/android
-        ARGS update project --path . --target android-7 --name WebODF
-    COMMAND ${ANT}
-        ARGS -lib ${CMAKE_CURRENT_SOURCE_DIR}/libs/phonegap-1.4.1.jar debug
-    DEPENDS ${APKDEPS}
-    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-)
-add_custom_target(apk ALL DEPENDS ${WEBODFAPK})
-set(WEBODFRELEASEAPK ${CMAKE_CURRENT_BINARY_DIR}/bin/WebODF-release.apk)
-add_custom_command(
-    OUTPUT ${WEBODFRELEASEAPK}
-    COMMAND ${ANT}
-        ARGS -lib ${CMAKE_CURRENT_SOURCE_DIR}/libs/phonegap-1.4.1.jar release
-    DEPENDS ${WEBODFAPK} webodf.js
-    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-)
-add_custom_target(releaseapk ALL DEPENDS ${WEBODFRELEASEAPK})
diff --git a/apps/files_odfviewer/src/webodf/programs/android/assets/www/config.xml b/apps/files_odfviewer/src/webodf/programs/android/assets/www/config.xml
deleted file mode 100644
index 21b5ca9ecc..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/android/assets/www/config.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<widget xmlns		= "http://www.w3.org/ns/widgets"
-	xmlns:gap	= "http://phonegap.com/ns/1.0"
-	id		= "org.webodf.phonegap.one"
-	version 	= "1.0.0">
-
-	<name>WebODF: online/offline office</name>
-	<description>
-		A viewer for ODF files.
-	</description>
-	<author href="http://webodf.org/"
-		email="jos.van.den.oever@kogmbh.com">
-		Jos van den Oever
-	</author>
-	<gap:platforms>
-		<gap:platform name="android" minVersion="2.1" />
-		<gap:platform name="webos" />
-		<gap:platform name="symbian.wrt" />
-		<gap:platform name="blackberry" project="widgets"/>
-	</gap:platforms>
-	<icon src="icon.png" gap:role="default" />
-    <feature name="http://api.phonegap.com/1.0/file"/>
-	<preference name="autorotate" value="false" readonly="true"/>
-	<preference name="orientation" value="default"/>
-</widget>
diff --git a/apps/files_odfviewer/src/webodf/programs/android/assets/www/icon.png b/apps/files_odfviewer/src/webodf/programs/android/assets/www/icon.png
deleted file mode 100644
index 2993aa9f14..0000000000
Binary files a/apps/files_odfviewer/src/webodf/programs/android/assets/www/icon.png and /dev/null differ
diff --git a/apps/files_odfviewer/src/webodf/programs/android/assets/www/index.html b/apps/files_odfviewer/src/webodf/programs/android/assets/www/index.html
deleted file mode 100644
index d9a299d24d..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/android/assets/www/index.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<!DOCTYPE html>
-<html>
- <head>
-  <title>WebODF</title>
-  <link href="sencha-touch.css" rel="stylesheet" type="text/css" />
-  <link href="webodf.css" rel="stylesheet" type="text/css" />
-  <script type="text/javascript" src="phonegap-1.4.1.js"></script>
-  <script type="text/javascript" src="sencha-touch.js"></script>
-  <script type="text/javascript" src="webodf.js"></script>
-  <script type="text/javascript" src="app/app.js"></script>
-  <script type="text/javascript" src="app/controller/Files.js"></script>
-  <script type="text/javascript" src="app/model/FileSystem.js"></script>
-  <script type="text/javascript" src="app/store/FileStore.js"></script>
-  <script type="text/javascript" src="app/views/FileDetail.js"></script>
-  <script type="text/javascript" src="app/views/FilesList.js"></script>
-  <script type="text/javascript" src="app/views/OdfView.js"></script>
-  <script type="text/javascript" src="app/views/Viewport.js"></script>
-  <script type="text/javascript">
-var applicationReady = false,
-    deviceReady = false,
-    startScanningDirectories;
-document.addEventListener("deviceready", function () {
-    deviceReady = true;
-    if (applicationReady) {
-        startScanningDirectories();
-    }
-}, false);
-/**
- * Override this function so it waits until the device is ready.
- */
-onApplicationLaunch = function (app) {
-    "use strict";
-    applicationReady = true;
-    startScanningDirectories = function () {
-        if (typeof invokeString !== "undefined" && invokeString) {
-            app.openUrl(invokeString);
-        }
-        app.startScanningDirectories();
-    };
-    if (deviceReady) {
-        startScanningDirectories();
-    }
-};
-  </script>
- </head><body></body>
-</html>
diff --git a/apps/files_odfviewer/src/webodf/programs/android/assets/www/phonegap-1.4.1.js b/apps/files_odfviewer/src/webodf/programs/android/assets/www/phonegap-1.4.1.js
deleted file mode 100644
index 908b8a8a21..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/android/assets/www/phonegap-1.4.1.js
+++ /dev/null
@@ -1,4586 +0,0 @@
-/*
- *     Licensed to the Apache Software Foundation (ASF) under one
- *     or more contributor license agreements.  See the NOTICE file
- *     distributed with this work for additional information
- *     regarding copyright ownership.  The ASF licenses this file
- *     to you under the Apache License, Version 2.0 (the
- *     "License"); you may not use this file except in compliance
- *     with the License.  You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing,
- *     software distributed under the License is distributed on an
- *     "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *     KIND, either express or implied.  See the License for the
- *     specific language governing permissions and limitations
- *     under the License.
- */
-
-// Version 1.2.0
-
-if (typeof PhoneGap === "undefined") {
-
-/**
- * The order of events during page load and PhoneGap startup is as follows:
- *
- * onDOMContentLoaded         Internal event that is received when the web page is loaded and parsed.
- * window.onload              Body onload event.
- * onNativeReady              Internal event that indicates the PhoneGap native side is ready.
- * onPhoneGapInit             Internal event that kicks off creation of all PhoneGap JavaScript objects (runs constructors).
- * onPhoneGapReady            Internal event fired when all PhoneGap JavaScript objects have been created
- * onPhoneGapInfoReady        Internal event fired when device properties are available
- * onDeviceReady              User event fired to indicate that PhoneGap is ready
- * onResume                   User event fired to indicate a start/resume lifecycle event
- * onPause                    User event fired to indicate a pause lifecycle event
- * onDestroy                  Internal event fired when app is being destroyed (User should use window.onunload event, not this one).
- *
- * The only PhoneGap events that user code should register for are:
- *      deviceready           PhoneGap native code is initialized and PhoneGap APIs can be called from JavaScript
- *      pause                 App has moved to background
- *      resume                App has returned to foreground
- *
- * Listeners can be registered as:
- *      document.addEventListener("deviceready", myDeviceReadyListener, false);
- *      document.addEventListener("resume", myResumeListener, false);
- *      document.addEventListener("pause", myPauseListener, false);
- *
- * The DOM lifecycle events should be used for saving and restoring state
- *      window.onload
- *      window.onunload
- */
-
-/**
- * This represents the PhoneGap API itself, and provides a global namespace for accessing
- * information about the state of PhoneGap.
- * @class
- */
-var PhoneGap = {
-    documentEventHandler: {},   // Collection of custom document event handlers
-    windowEventHandler: {}      // Collection of custom window event handlers
-};
-
-/**
- * List of resource files loaded by PhoneGap.
- * This is used to ensure JS and other files are loaded only once.
- */
-PhoneGap.resources = {base: true};
-
-/**
- * Determine if resource has been loaded by PhoneGap
- *
- * @param name
- * @return
- */
-PhoneGap.hasResource = function(name) {
-    return PhoneGap.resources[name];
-};
-
-/**
- * Add a resource to list of loaded resources by PhoneGap
- *
- * @param name
- */
-PhoneGap.addResource = function(name) {
-    PhoneGap.resources[name] = true;
-};
-
-/**
- * Custom pub-sub channel that can have functions subscribed to it
- * @constructor
- */
-PhoneGap.Channel = function (type)
-{
-    this.type = type;
-    this.handlers = {};
-    this.guid = 0;
-    this.fired = false;
-    this.enabled = true;
-};
-
-/**
- * Subscribes the given function to the channel. Any time that
- * Channel.fire is called so too will the function.
- * Optionally specify an execution context for the function
- * and a guid that can be used to stop subscribing to the channel.
- * Returns the guid.
- */
-PhoneGap.Channel.prototype.subscribe = function(f, c, g) {
-    // need a function to call
-    if (f === null) { return; }
-
-    var func = f;
-    if (typeof c === "object" && typeof f === "function") { func = PhoneGap.close(c, f); }
-
-    g = g || func.observer_guid || f.observer_guid || this.guid++;
-    func.observer_guid = g;
-    f.observer_guid = g;
-    this.handlers[g] = func;
-    return g;
-};
-
-/**
- * Like subscribe but the function is only called once and then it
- * auto-unsubscribes itself.
- */
-PhoneGap.Channel.prototype.subscribeOnce = function(f, c) {
-    var g = null;
-    var _this = this;
-    var m = function() {
-        f.apply(c || null, arguments);
-        _this.unsubscribe(g);
-    };
-    if (this.fired) {
-        if (typeof c === "object" && typeof f === "function") { f = PhoneGap.close(c, f); }
-        f.apply(this, this.fireArgs);
-    } else {
-        g = this.subscribe(m);
-    }
-    return g;
-};
-
-/**
- * Unsubscribes the function with the given guid from the channel.
- */
-PhoneGap.Channel.prototype.unsubscribe = function(g) {
-    if (typeof g === "function") { g = g.observer_guid; }
-    this.handlers[g] = null;
-    delete this.handlers[g];
-};
-
-/**
- * Calls all functions subscribed to this channel.
- */
-PhoneGap.Channel.prototype.fire = function(e) {
-    if (this.enabled) {
-        var fail = false;
-        var item, handler, rv;
-        for (item in this.handlers) {
-            if (this.handlers.hasOwnProperty(item)) {
-                handler = this.handlers[item];
-                if (typeof handler === "function") {
-                    rv = (handler.apply(this, arguments) === false);
-                    fail = fail || rv;
-                }
-            }
-        }
-        this.fired = true;
-        this.fireArgs = arguments;
-        return !fail;
-    }
-    return true;
-};
-
-/**
- * Calls the provided function only after all of the channels specified
- * have been fired.
- */
-PhoneGap.Channel.join = function(h, c) {
-    var i = c.length;
-    var f = function() {
-        if (!(--i)) {
-            h();
-        }
-    };
-    var len = i;
-    var j;
-    for (j=0; j<len; j++) {
-        if (!c[j].fired) {
-            c[j].subscribeOnce(f);
-        }
-        else {
-            i--;
-        }
-    }
-    if (!i) {
-        h();
-    }
-};
-
-/**
- * Add an initialization function to a queue that ensures it will run and initialize
- * application constructors only once PhoneGap has been initialized.
- * @param {Function} func The function callback you want run once PhoneGap is initialized
- */
-PhoneGap.addConstructor = function(func) {
-    PhoneGap.onPhoneGapInit.subscribeOnce(function() {
-        try {
-            func();
-        } catch(e) {
-            console.log("Failed to run constructor: " + e);
-        }
-    });
-};
-
-/**
- * Plugins object
- */
-if (!window.plugins) {
-    window.plugins = {};
-}
-
-/**
- * Adds a plugin object to window.plugins.
- * The plugin is accessed using window.plugins.<name>
- *
- * @param name          The plugin name
- * @param obj           The plugin object
- */
-PhoneGap.addPlugin = function(name, obj) {
-    if (!window.plugins[name]) {
-        window.plugins[name] = obj;
-    }
-    else {
-        console.log("Error: Plugin "+name+" already exists.");
-    }
-};
-
-/**
- * onDOMContentLoaded channel is fired when the DOM content
- * of the page has been parsed.
- */
-PhoneGap.onDOMContentLoaded = new PhoneGap.Channel('onDOMContentLoaded');
-
-/**
- * onNativeReady channel is fired when the PhoneGap native code
- * has been initialized.
- */
-PhoneGap.onNativeReady = new PhoneGap.Channel('onNativeReady');
-
-/**
- * onPhoneGapInit channel is fired when the web page is fully loaded and
- * PhoneGap native code has been initialized.
- */
-PhoneGap.onPhoneGapInit = new PhoneGap.Channel('onPhoneGapInit');
-
-/**
- * onPhoneGapReady channel is fired when the JS PhoneGap objects have been created.
- */
-PhoneGap.onPhoneGapReady = new PhoneGap.Channel('onPhoneGapReady');
-
-/**
- * onPhoneGapInfoReady channel is fired when the PhoneGap device properties
- * has been set.
- */
-PhoneGap.onPhoneGapInfoReady = new PhoneGap.Channel('onPhoneGapInfoReady');
-
-/**
- * onPhoneGapConnectionReady channel is fired when the PhoneGap connection properties
- * has been set.
- */
-PhoneGap.onPhoneGapConnectionReady = new PhoneGap.Channel('onPhoneGapConnectionReady');
-
-/**
- * onDestroy channel is fired when the PhoneGap native code
- * is destroyed.  It is used internally.
- * Window.onunload should be used by the user.
- */
-PhoneGap.onDestroy = new PhoneGap.Channel('onDestroy');
-PhoneGap.onDestroy.subscribeOnce(function() {
-    PhoneGap.shuttingDown = true;
-});
-PhoneGap.shuttingDown = false;
-
-// _nativeReady is global variable that the native side can set
-// to signify that the native code is ready. It is a global since
-// it may be called before any PhoneGap JS is ready.
-if (typeof _nativeReady !== 'undefined') { PhoneGap.onNativeReady.fire(); }
-
-/**
- * onDeviceReady is fired only after all PhoneGap objects are created and
- * the device properties are set.
- */
-PhoneGap.onDeviceReady = new PhoneGap.Channel('onDeviceReady');
-
-
-// Array of channels that must fire before "deviceready" is fired
-PhoneGap.deviceReadyChannelsArray = [ PhoneGap.onPhoneGapReady, PhoneGap.onPhoneGapInfoReady, PhoneGap.onPhoneGapConnectionReady];
-
-// Hashtable of user defined channels that must also fire before "deviceready" is fired
-PhoneGap.deviceReadyChannelsMap = {};
-
-/**
- * Indicate that a feature needs to be initialized before it is ready to be used.
- * This holds up PhoneGap's "deviceready" event until the feature has been initialized
- * and PhoneGap.initComplete(feature) is called.
- *
- * @param feature {String}     The unique feature name
- */
-PhoneGap.waitForInitialization = function(feature) {
-    if (feature) {
-        var channel = new PhoneGap.Channel(feature);
-        PhoneGap.deviceReadyChannelsMap[feature] = channel;
-        PhoneGap.deviceReadyChannelsArray.push(channel);
-    }
-};
-
-/**
- * Indicate that initialization code has completed and the feature is ready to be used.
- *
- * @param feature {String}     The unique feature name
- */
-PhoneGap.initializationComplete = function(feature) {
-    var channel = PhoneGap.deviceReadyChannelsMap[feature];
-    if (channel) {
-        channel.fire();
-    }
-};
-
-/**
- * Create all PhoneGap objects once page has fully loaded and native side is ready.
- */
-PhoneGap.Channel.join(function() {
-
-    // Start listening for XHR callbacks
-    setTimeout(function() {
-            if (PhoneGap.UsePolling) {
-                PhoneGap.JSCallbackPolling();
-            }
-            else {
-                var polling = prompt("usePolling", "gap_callbackServer:");
-                PhoneGap.UsePolling = polling;
-                if (polling == "true") {
-                    PhoneGap.UsePolling = true;
-                    PhoneGap.JSCallbackPolling();
-                }
-                else {
-                    PhoneGap.UsePolling = false;
-                    PhoneGap.JSCallback();
-                }
-            }
-        }, 1);
-
-    // Run PhoneGap constructors
-    PhoneGap.onPhoneGapInit.fire();
-
-    // Fire event to notify that all objects are created
-    PhoneGap.onPhoneGapReady.fire();
-
-    // Fire onDeviceReady event once all constructors have run and PhoneGap info has been
-    // received from native side, and any user defined initialization channels.
-    PhoneGap.Channel.join(function() {
-        // Let native code know we are inited on JS side
-        prompt("", "gap_init:");
-
-        PhoneGap.onDeviceReady.fire();
-    }, PhoneGap.deviceReadyChannelsArray);
-
-}, [ PhoneGap.onDOMContentLoaded, PhoneGap.onNativeReady ]);
-
-// Listen for DOMContentLoaded and notify our channel subscribers
-document.addEventListener('DOMContentLoaded', function() {
-    PhoneGap.onDOMContentLoaded.fire();
-}, false);
-
-// Intercept calls to document.addEventListener and watch for deviceready
-PhoneGap.m_document_addEventListener = document.addEventListener;
-
-// Intercept calls to window.addEventListener
-PhoneGap.m_window_addEventListener = window.addEventListener;
-
-/**
- * Add a custom window event handler.
- *
- * @param {String} event            The event name that callback handles
- * @param {Function} callback       The event handler
- */
-PhoneGap.addWindowEventHandler = function(event, callback) {
-    PhoneGap.windowEventHandler[event] = callback;
-};
-
-/**
- * Add a custom document event handler.
- *
- * @param {String} event            The event name that callback handles
- * @param {Function} callback       The event handler
- */
-PhoneGap.addDocumentEventHandler = function(event, callback) {
-    PhoneGap.documentEventHandler[event] = callback;
-};
-
-/**
- * Intercept adding document event listeners and handle our own
- *
- * @param {Object} evt
- * @param {Function} handler
- * @param capture
- */
-document.addEventListener = function(evt, handler, capture) {
-    var e = evt.toLowerCase();
-    if (e === 'deviceready') {
-        PhoneGap.onDeviceReady.subscribeOnce(handler);
-    }
-    else {
-        // If subscribing to Android backbutton
-        if (e === 'backbutton') {
-            PhoneGap.exec(null, null, "App", "overrideBackbutton", [true]);
-        }
-        
-        // If subscribing to an event that is handled by a plugin
-        else if (typeof PhoneGap.documentEventHandler[e] !== "undefined") {
-            if (PhoneGap.documentEventHandler[e](e, handler, true)) {
-                return; // Stop default behavior
-            }
-        }
-        
-        PhoneGap.m_document_addEventListener.call(document, evt, handler, capture);
-    }
-};
-
-/**
- * Intercept adding window event listeners and handle our own
- *
- * @param {Object} evt
- * @param {Function} handler
- * @param capture
- */
-window.addEventListener = function(evt, handler, capture) {
-    var e = evt.toLowerCase();
-        
-    // If subscribing to an event that is handled by a plugin
-    if (typeof PhoneGap.windowEventHandler[e] !== "undefined") {
-        if (PhoneGap.windowEventHandler[e](e, handler, true)) {
-            return; // Stop default behavior
-        }
-    }
-        
-    PhoneGap.m_window_addEventListener.call(window, evt, handler, capture);
-};
-
-// Intercept calls to document.removeEventListener and watch for events that
-// are generated by PhoneGap native code
-PhoneGap.m_document_removeEventListener = document.removeEventListener;
-
-// Intercept calls to window.removeEventListener
-PhoneGap.m_window_removeEventListener = window.removeEventListener;
-
-/**
- * Intercept removing document event listeners and handle our own
- *
- * @param {Object} evt
- * @param {Function} handler
- * @param capture
- */
-document.removeEventListener = function(evt, handler, capture) {
-    var e = evt.toLowerCase();
-
-    // If unsubscribing to Android backbutton
-    if (e === 'backbutton') {
-        PhoneGap.exec(null, null, "App", "overrideBackbutton", [false]);
-    }
-
-    // If unsubcribing from an event that is handled by a plugin
-    if (typeof PhoneGap.documentEventHandler[e] !== "undefined") {
-        if (PhoneGap.documentEventHandler[e](e, handler, false)) {
-            return; // Stop default behavior
-        }
-    }
-
-    PhoneGap.m_document_removeEventListener.call(document, evt, handler, capture);
-};
-
-/**
- * Intercept removing window event listeners and handle our own
- *
- * @param {Object} evt
- * @param {Function} handler
- * @param capture
- */
-window.removeEventListener = function(evt, handler, capture) {
-    var e = evt.toLowerCase();
-
-    // If unsubcribing from an event that is handled by a plugin
-    if (typeof PhoneGap.windowEventHandler[e] !== "undefined") {
-        if (PhoneGap.windowEventHandler[e](e, handler, false)) {
-            return; // Stop default behavior
-        }
-    }
-
-    PhoneGap.m_window_removeEventListener.call(window, evt, handler, capture);
-};
-
-/**
- * Method to fire document event
- *
- * @param {String} type             The event type to fire
- * @param {Object} data             Data to send with event
- */
-PhoneGap.fireDocumentEvent = function(type, data) {
-    var e = document.createEvent('Events');
-    e.initEvent(type);
-    if (data) {
-        for (var i in data) {
-            e[i] = data[i];
-        }
-    }
-    document.dispatchEvent(e);
-};
-
-/**
- * Method to fire window event
- *
- * @param {String} type             The event type to fire
- * @param {Object} data             Data to send with event
- */
-PhoneGap.fireWindowEvent = function(type, data) {
-    var e = document.createEvent('Events');
-    e.initEvent(type);
-    if (data) {
-        for (var i in data) {
-            e[i] = data[i];
-        }
-    }
-    window.dispatchEvent(e);
-};
-
-/**
- * Does a deep clone of the object.
- *
- * @param obj
- * @return {Object}
- */
-PhoneGap.clone = function(obj) {
-    var i, retVal;
-    if(!obj) { 
-        return obj;
-    }
-    
-    if(obj instanceof Array){
-        retVal = [];
-        for(i = 0; i < obj.length; ++i){
-            retVal.push(PhoneGap.clone(obj[i]));
-        }
-        return retVal;
-    }
-    
-    if (typeof obj === "function") {
-        return obj;
-    }
-    
-    if(!(obj instanceof Object)){
-        return obj;
-    }
-    
-    if (obj instanceof Date) {
-        return obj;
-    }
-    
-    retVal = {};
-    for(i in obj){
-        if(!(i in retVal) || retVal[i] !== obj[i]) {
-            retVal[i] = PhoneGap.clone(obj[i]);
-        }
-    }
-    return retVal;
-};
-
-PhoneGap.callbackId = 0;
-PhoneGap.callbacks = {};
-PhoneGap.callbackStatus = {
-    NO_RESULT: 0,
-    OK: 1,
-    CLASS_NOT_FOUND_EXCEPTION: 2,
-    ILLEGAL_ACCESS_EXCEPTION: 3,
-    INSTANTIATION_EXCEPTION: 4,
-    MALFORMED_URL_EXCEPTION: 5,
-    IO_EXCEPTION: 6,
-    INVALID_ACTION: 7,
-    JSON_EXCEPTION: 8,
-    ERROR: 9
-    };
-
-
-/**
- * Execute a PhoneGap command.  It is up to the native side whether this action is synch or async.
- * The native side can return:
- *      Synchronous: PluginResult object as a JSON string
- *      Asynchrounous: Empty string ""
- * If async, the native side will PhoneGap.callbackSuccess or PhoneGap.callbackError,
- * depending upon the result of the action.
- *
- * @param {Function} success    The success callback
- * @param {Function} fail       The fail callback
- * @param {String} service      The name of the service to use
- * @param {String} action       Action to be run in PhoneGap
- * @param {Array.<String>} [args]     Zero or more arguments to pass to the method
- */
-PhoneGap.exec = function(success, fail, service, action, args) {
-    try {
-        var callbackId = service + PhoneGap.callbackId++;
-        if (success || fail) {
-            PhoneGap.callbacks[callbackId] = {success:success, fail:fail};
-        }
-
-        var r = prompt(JSON.stringify(args), "gap:"+JSON.stringify([service, action, callbackId, true]));
-
-        // If a result was returned
-        if (r.length > 0) {
-            eval("var v="+r+";");
-
-            // If status is OK, then return value back to caller
-            if (v.status === PhoneGap.callbackStatus.OK) {
-
-                // If there is a success callback, then call it now with
-                // returned value
-                if (success) {
-                    try {
-                        success(v.message);
-                    } catch (e) {
-                        console.log("Error in success callback: " + callbackId  + " = " + e);
-                    }
-
-                    // Clear callback if not expecting any more results
-                    if (!v.keepCallback) {
-                        delete PhoneGap.callbacks[callbackId];
-                    }
-                }
-                return v.message;
-            }
-
-            // If no result
-            else if (v.status === PhoneGap.callbackStatus.NO_RESULT) {
-
-                // Clear callback if not expecting any more results
-                if (!v.keepCallback) {
-                    delete PhoneGap.callbacks[callbackId];
-                }
-            }
-
-            // If error, then display error
-            else {
-                console.log("Error: Status="+v.status+" Message="+v.message);
-
-                // If there is a fail callback, then call it now with returned value
-                if (fail) {
-                    try {
-                        fail(v.message);
-                    }
-                    catch (e1) {
-                        console.log("Error in error callback: "+callbackId+" = "+e1);
-                    }
-
-                    // Clear callback if not expecting any more results
-                    if (!v.keepCallback) {
-                        delete PhoneGap.callbacks[callbackId];
-                    }
-                }
-                return null;
-            }
-        }
-    } catch (e2) {
-        console.log("Error: "+e2);
-    }
-};
-
-/**
- * Called by native code when returning successful result from an action.
- *
- * @param callbackId
- * @param args
- */
-PhoneGap.callbackSuccess = function(callbackId, args) {
-    if (PhoneGap.callbacks[callbackId]) {
-
-        // If result is to be sent to callback
-        if (args.status === PhoneGap.callbackStatus.OK) {
-            try {
-                if (PhoneGap.callbacks[callbackId].success) {
-                    PhoneGap.callbacks[callbackId].success(args.message);
-                }
-            }
-            catch (e) {
-                console.log("Error in success callback: "+callbackId+" = "+e);
-            }
-        }
-
-        // Clear callback if not expecting any more results
-        if (!args.keepCallback) {
-            delete PhoneGap.callbacks[callbackId];
-        }
-    }
-};
-
-/**
- * Called by native code when returning error result from an action.
- *
- * @param callbackId
- * @param args
- */
-PhoneGap.callbackError = function(callbackId, args) {
-    if (PhoneGap.callbacks[callbackId]) {
-        try {
-            if (PhoneGap.callbacks[callbackId].fail) {
-                PhoneGap.callbacks[callbackId].fail(args.message);
-            }
-        }
-        catch (e) {
-            console.log("Error in error callback: "+callbackId+" = "+e);
-        }
-
-        // Clear callback if not expecting any more results
-        if (!args.keepCallback) {
-            delete PhoneGap.callbacks[callbackId];
-        }
-    }
-};
-
-PhoneGap.JSCallbackPort = null;
-PhoneGap.JSCallbackToken = null;
-
-/**
- * This is only for Android.
- *
- * Internal function that uses XHR to call into PhoneGap Java code and retrieve
- * any JavaScript code that needs to be run.  This is used for callbacks from
- * Java to JavaScript.
- */
-PhoneGap.JSCallback = function() {
-
-    // Exit if shutting down app
-    if (PhoneGap.shuttingDown) {
-        return;
-    }
-
-    // If polling flag was changed, start using polling from now on
-    if (PhoneGap.UsePolling) {
-        PhoneGap.JSCallbackPolling();
-        return;
-    }
-
-    var xmlhttp = new XMLHttpRequest();
-
-    // Callback function when XMLHttpRequest is ready
-    xmlhttp.onreadystatechange=function(){
-        if(xmlhttp.readyState === 4){
-
-            // Exit if shutting down app
-            if (PhoneGap.shuttingDown) {
-                return;
-            }
-
-            // If callback has JavaScript statement to execute
-            if (xmlhttp.status === 200) {
-
-                // Need to url decode the response
-                var msg = decodeURIComponent(xmlhttp.responseText);
-                setTimeout(function() {
-                    try {
-                        var t = eval(msg);
-                    }
-                    catch (e) {
-                        // If we're getting an error here, seeing the message will help in debugging
-                        console.log("JSCallback: Message from Server: " + msg);
-                        console.log("JSCallback Error: "+e);
-                    }
-                }, 1);
-                setTimeout(PhoneGap.JSCallback, 1);
-            }
-
-            // If callback ping (used to keep XHR request from timing out)
-            else if (xmlhttp.status === 404) {
-                setTimeout(PhoneGap.JSCallback, 10);
-            }
-
-            // If security error
-            else if (xmlhttp.status === 403) {
-                console.log("JSCallback Error: Invalid token.  Stopping callbacks.");
-            }
-
-            // If server is stopping
-            else if (xmlhttp.status === 503) {
-                console.log("JSCallback Server Closed: Stopping callbacks.");
-            }
-
-            // If request wasn't GET
-            else if (xmlhttp.status === 400) {
-                console.log("JSCallback Error: Bad request.  Stopping callbacks.");
-            }
-
-            // If error, revert to polling
-            else {
-                console.log("JSCallback Error: Request failed.");
-                PhoneGap.UsePolling = true;
-                PhoneGap.JSCallbackPolling();
-            }
-        }
-    };
-
-    if (PhoneGap.JSCallbackPort === null) {
-        PhoneGap.JSCallbackPort = prompt("getPort", "gap_callbackServer:");
-    }
-    if (PhoneGap.JSCallbackToken === null) {
-        PhoneGap.JSCallbackToken = prompt("getToken", "gap_callbackServer:");
-    }
-    xmlhttp.open("GET", "http://127.0.0.1:"+PhoneGap.JSCallbackPort+"/"+PhoneGap.JSCallbackToken , true);
-    xmlhttp.send();
-};
-
-/**
- * The polling period to use with JSCallbackPolling.
- * This can be changed by the application.  The default is 50ms.
- */
-PhoneGap.JSCallbackPollingPeriod = 50;
-
-/**
- * Flag that can be set by the user to force polling to be used or force XHR to be used.
- */
-PhoneGap.UsePolling = false;    // T=use polling, F=use XHR
-
-/**
- * This is only for Android.
- *
- * Internal function that uses polling to call into PhoneGap Java code and retrieve
- * any JavaScript code that needs to be run.  This is used for callbacks from
- * Java to JavaScript.
- */
-PhoneGap.JSCallbackPolling = function() {
-
-    // Exit if shutting down app
-    if (PhoneGap.shuttingDown) {
-        return;
-    }
-
-    // If polling flag was changed, stop using polling from now on
-    if (!PhoneGap.UsePolling) {
-        PhoneGap.JSCallback();
-        return;
-    }
-
-    var msg = prompt("", "gap_poll:");
-    if (msg) {
-        setTimeout(function() {
-            try {
-                var t = eval(""+msg);
-            }
-            catch (e) {
-                console.log("JSCallbackPolling: Message from Server: " + msg);
-                console.log("JSCallbackPolling Error: "+e);
-            }
-        }, 1);
-        setTimeout(PhoneGap.JSCallbackPolling, 1);
-    }
-    else {
-        setTimeout(PhoneGap.JSCallbackPolling, PhoneGap.JSCallbackPollingPeriod);
-    }
-};
-
-/**
- * Create a UUID
- *
- * @return {String}
- */
-PhoneGap.createUUID = function() {
-    return PhoneGap.UUIDcreatePart(4) + '-' +
-        PhoneGap.UUIDcreatePart(2) + '-' +
-        PhoneGap.UUIDcreatePart(2) + '-' +
-        PhoneGap.UUIDcreatePart(2) + '-' +
-        PhoneGap.UUIDcreatePart(6);
-};
-
-PhoneGap.UUIDcreatePart = function(length) {
-    var uuidpart = "";
-    var i, uuidchar;
-    for (i=0; i<length; i++) {
-        uuidchar = parseInt((Math.random() * 256),0).toString(16);
-        if (uuidchar.length === 1) {
-            uuidchar = "0" + uuidchar;
-        }
-        uuidpart += uuidchar;
-    }
-    return uuidpart;
-};
-
-PhoneGap.close = function(context, func, params) {
-    if (typeof params === 'undefined') {
-        return function() {
-            return func.apply(context, arguments);
-        };
-    } else {
-        return function() {
-            return func.apply(context, params);
-        };
-    }
-};
-
-/**
- * Load a JavaScript file after page has loaded.
- *
- * @param {String} jsfile               The url of the JavaScript file to load.
- * @param {Function} successCallback    The callback to call when the file has been loaded.
- */
-PhoneGap.includeJavascript = function(jsfile, successCallback) {
-    var id = document.getElementsByTagName("head")[0];
-    var el = document.createElement('script');
-    el.type = 'text/javascript';
-    if (typeof successCallback === 'function') {
-        el.onload = successCallback;
-    }
-    el.src = jsfile;
-    id.appendChild(el);
-};
-
-}
-/*
- *     Licensed to the Apache Software Foundation (ASF) under one
- *     or more contributor license agreements.  See the NOTICE file
- *     distributed with this work for additional information
- *     regarding copyright ownership.  The ASF licenses this file
- *     to you under the Apache License, Version 2.0 (the
- *     "License"); you may not use this file except in compliance
- *     with the License.  You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing,
- *     software distributed under the License is distributed on an
- *     "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *     KIND, either express or implied.  See the License for the
- *     specific language governing permissions and limitations
- *     under the License.
- */
-
-if (!PhoneGap.hasResource("device")) {
-PhoneGap.addResource("device");
-
-/**
- * This represents the mobile device, and provides properties for inspecting the model, version, UUID of the
- * phone, etc.
- * @constructor
- */
-var Device = function() {
-    this.available = PhoneGap.available;
-    this.platform = null;
-    this.version = null;
-    this.name = null;
-    this.uuid = null;
-    this.phonegap = null;
-
-    var me = this;
-    this.getInfo(
-        function(info) {
-            me.available = true;
-            me.platform = info.platform;
-            me.version = info.version;
-            me.name = info.name;
-            me.uuid = info.uuid;
-            me.phonegap = info.phonegap;
-            PhoneGap.onPhoneGapInfoReady.fire();
-        },
-        function(e) {
-            me.available = false;
-            console.log("Error initializing PhoneGap: " + e);
-            alert("Error initializing PhoneGap: "+e);
-        });
-};
-
-/**
- * Get device info
- *
- * @param {Function} successCallback The function to call when the heading data is available
- * @param {Function} errorCallback The function to call when there is an error getting the heading data. (OPTIONAL)
- */
-Device.prototype.getInfo = function(successCallback, errorCallback) {
-
-    // successCallback required
-    if (typeof successCallback !== "function") {
-        console.log("Device Error: successCallback is not a function");
-        return;
-    }
-
-    // errorCallback optional
-    if (errorCallback && (typeof errorCallback !== "function")) {
-        console.log("Device Error: errorCallback is not a function");
-        return;
-    }
-
-    // Get info
-    PhoneGap.exec(successCallback, errorCallback, "Device", "getDeviceInfo", []);
-};
-
-PhoneGap.addConstructor(function() {
-    if (typeof navigator.device === "undefined") {
-        navigator.device = window.device = new Device();
-    }
-});
-}
-/*
- *     Licensed to the Apache Software Foundation (ASF) under one
- *     or more contributor license agreements.  See the NOTICE file
- *     distributed with this work for additional information
- *     regarding copyright ownership.  The ASF licenses this file
- *     to you under the Apache License, Version 2.0 (the
- *     "License"); you may not use this file except in compliance
- *     with the License.  You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing,
- *     software distributed under the License is distributed on an
- *     "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *     KIND, either express or implied.  See the License for the
- *     specific language governing permissions and limitations
- *     under the License.
- */
-
-if (!PhoneGap.hasResource("accelerometer")) {
-PhoneGap.addResource("accelerometer");
-
-/** @constructor */
-var Acceleration = function(x, y, z) {
-  this.x = x;
-  this.y = y;
-  this.z = z;
-  this.timestamp = new Date().getTime();
-};
-
-/**
- * This class provides access to device accelerometer data.
- * @constructor
- */
-var Accelerometer = function() {
-
-    /**
-     * The last known acceleration.  type=Acceleration()
-     */
-    this.lastAcceleration = null;
-
-    /**
-     * List of accelerometer watch timers
-     */
-    this.timers = {};
-};
-
-Accelerometer.ERROR_MSG = ["Not running", "Starting", "", "Failed to start"];
-
-/**
- * Asynchronously aquires the current acceleration.
- *
- * @param {Function} successCallback    The function to call when the acceleration data is available
- * @param {Function} errorCallback      The function to call when there is an error getting the acceleration data. (OPTIONAL)
- * @param {AccelerationOptions} options The options for getting the accelerometer data such as timeout. (OPTIONAL)
- */
-Accelerometer.prototype.getCurrentAcceleration = function(successCallback, errorCallback, options) {
-
-    // successCallback required
-    if (typeof successCallback !== "function") {
-        console.log("Accelerometer Error: successCallback is not a function");
-        return;
-    }
-
-    // errorCallback optional
-    if (errorCallback && (typeof errorCallback !== "function")) {
-        console.log("Accelerometer Error: errorCallback is not a function");
-        return;
-    }
-
-    // Get acceleration
-    PhoneGap.exec(successCallback, errorCallback, "Accelerometer", "getAcceleration", []);
-};
-
-/**
- * Asynchronously aquires the acceleration repeatedly at a given interval.
- *
- * @param {Function} successCallback    The function to call each time the acceleration data is available
- * @param {Function} errorCallback      The function to call when there is an error getting the acceleration data. (OPTIONAL)
- * @param {AccelerationOptions} options The options for getting the accelerometer data such as timeout. (OPTIONAL)
- * @return String                       The watch id that must be passed to #clearWatch to stop watching.
- */
-Accelerometer.prototype.watchAcceleration = function(successCallback, errorCallback, options) {
-
-    // Default interval (10 sec)
-    var frequency = (options !== undefined)? options.frequency : 10000;
-
-    // successCallback required
-    if (typeof successCallback !== "function") {
-        console.log("Accelerometer Error: successCallback is not a function");
-        return;
-    }
-
-    // errorCallback optional
-    if (errorCallback && (typeof errorCallback !== "function")) {
-        console.log("Accelerometer Error: errorCallback is not a function");
-        return;
-    }
-
-    // Make sure accelerometer timeout > frequency + 10 sec
-    PhoneGap.exec(
-        function(timeout) {
-            if (timeout < (frequency + 10000)) {
-                PhoneGap.exec(null, null, "Accelerometer", "setTimeout", [frequency + 10000]);
-            }
-        },
-        function(e) { }, "Accelerometer", "getTimeout", []);
-
-    // Start watch timer
-    var id = PhoneGap.createUUID();
-    navigator.accelerometer.timers[id] = setInterval(function() {
-        PhoneGap.exec(successCallback, errorCallback, "Accelerometer", "getAcceleration", []);
-    }, (frequency ? frequency : 1));
-
-    return id;
-};
-
-/**
- * Clears the specified accelerometer watch.
- *
- * @param {String} id       The id of the watch returned from #watchAcceleration.
- */
-Accelerometer.prototype.clearWatch = function(id) {
-
-    // Stop javascript timer & remove from timer list
-    if (id && navigator.accelerometer.timers[id] !== undefined) {
-        clearInterval(navigator.accelerometer.timers[id]);
-        delete navigator.accelerometer.timers[id];
-    }
-};
-
-PhoneGap.addConstructor(function() {
-    if (typeof navigator.accelerometer === "undefined") {
-        navigator.accelerometer = new Accelerometer();
-    }
-});
-}
-/*
- *     Licensed to the Apache Software Foundation (ASF) under one
- *     or more contributor license agreements.  See the NOTICE file
- *     distributed with this work for additional information
- *     regarding copyright ownership.  The ASF licenses this file
- *     to you under the Apache License, Version 2.0 (the
- *     "License"); you may not use this file except in compliance
- *     with the License.  You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing,
- *     software distributed under the License is distributed on an
- *     "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *     KIND, either express or implied.  See the License for the
- *     specific language governing permissions and limitations
- *     under the License.
- */
-
-if (!PhoneGap.hasResource("app")) {
-PhoneGap.addResource("app");
-(function() {
-
-/**
- * Constructor
- * @constructor
- */
-var App = function() {};
-
-/**
- * Clear the resource cache.
- */
-App.prototype.clearCache = function() {
-    PhoneGap.exec(null, null, "App", "clearCache", []);
-};
-
-/**
- * Load the url into the webview or into new browser instance.
- *
- * @param url           The URL to load
- * @param props         Properties that can be passed in to the activity:
- *      wait: int                           => wait msec before loading URL
- *      loadingDialog: "Title,Message"      => display a native loading dialog
- *      loadUrlTimeoutValue: int            => time in msec to wait before triggering a timeout error
- *      clearHistory: boolean              => clear webview history (default=false)
- *      openExternal: boolean              => open in a new browser (default=false)
- *
- * Example:
- *      navigator.app.loadUrl("http://server/myapp/index.html", {wait:2000, loadingDialog:"Wait,Loading App", loadUrlTimeoutValue: 60000});
- */
-App.prototype.loadUrl = function(url, props) {
-    PhoneGap.exec(null, null, "App", "loadUrl", [url, props]);
-};
-
-/**
- * Cancel loadUrl that is waiting to be loaded.
- */
-App.prototype.cancelLoadUrl = function() {
-    PhoneGap.exec(null, null, "App", "cancelLoadUrl", []);
-};
-
-/**
- * Clear web history in this web view.
- * Instead of BACK button loading the previous web page, it will exit the app.
- */
-App.prototype.clearHistory = function() {
-    PhoneGap.exec(null, null, "App", "clearHistory", []);
-};
-
-/**
- * Go to previous page displayed.
- * This is the same as pressing the backbutton on Android device.
- */
-App.prototype.backHistory = function() {
-    PhoneGap.exec(null, null, "App", "backHistory", []);
-};
-
-/**
- * Exit and terminate the application.
- */
-App.prototype.exitApp = function() {
-	return PhoneGap.exec(null, null, "App", "exitApp", []);
-};
-
-PhoneGap.addConstructor(function() {
-    navigator.app = new App();
-});
-}());
-}
-/*
- *     Licensed to the Apache Software Foundation (ASF) under one
- *     or more contributor license agreements.  See the NOTICE file
- *     distributed with this work for additional information
- *     regarding copyright ownership.  The ASF licenses this file
- *     to you under the Apache License, Version 2.0 (the
- *     "License"); you may not use this file except in compliance
- *     with the License.  You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing,
- *     software distributed under the License is distributed on an
- *     "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *     KIND, either express or implied.  See the License for the
- *     specific language governing permissions and limitations
- *     under the License.
- */
-
-if (!PhoneGap.hasResource("battery")) {
-PhoneGap.addResource("battery");
-
-/**
- * This class contains information about the current battery status.
- * @constructor
- */
-var Battery = function() {
-    this._level = null;
-    this._isPlugged = null;
-    this._batteryListener = [];
-    this._lowListener = [];
-    this._criticalListener = [];
-};
-
-/**
- * Registers as an event producer for battery events.
- * 
- * @param {Object} eventType
- * @param {Object} handler
- * @param {Object} add
- */
-Battery.prototype.eventHandler = function(eventType, handler, add) {
-    var me = navigator.battery;
-    if (add) {
-        // If there are no current registered event listeners start the battery listener on native side.
-        if (me._batteryListener.length === 0 && me._lowListener.length === 0 && me._criticalListener.length === 0) {
-            PhoneGap.exec(me._status, me._error, "Battery", "start", []);
-        }
-        
-        // Register the event listener in the proper array
-        if (eventType === "batterystatus") {
-            if (me._batteryListener.indexOf(handler) === -1) {
-                me._batteryListener.push(handler);
-            }
-        } else if (eventType === "batterylow") {
-            if (me._lowListener.indexOf(handler) === -1) {
-                me._lowListener.push(handler);
-            }
-        } else if (eventType === "batterycritical") {
-            if (me._criticalListener.indexOf(handler) === -1) {
-                me._criticalListener.push(handler);
-            }
-        }
-    } else {
-        var pos = -1;
-        // Remove the event listener from the proper array
-        if (eventType === "batterystatus") {
-            pos = me._batteryListener.indexOf(handler);
-            if (pos > -1) {
-                me._batteryListener.splice(pos, 1);        
-            }
-        } else if (eventType === "batterylow") {
-            pos = me._lowListener.indexOf(handler);
-            if (pos > -1) {
-                me._lowListener.splice(pos, 1);        
-            }
-        } else if (eventType === "batterycritical") {
-            pos = me._criticalListener.indexOf(handler);
-            if (pos > -1) {
-                me._criticalListener.splice(pos, 1);        
-            }
-        }
-        
-        // If there are no more registered event listeners stop the battery listener on native side.
-        if (me._batteryListener.length === 0 && me._lowListener.length === 0 && me._criticalListener.length === 0) {
-            PhoneGap.exec(null, null, "Battery", "stop", []);
-        }
-    }
-};
-
-/**
- * Callback for battery status
- * 
- * @param {Object} info			keys: level, isPlugged
- */
-Battery.prototype._status = function(info) {
-	if (info) {
-		var me = this;
-        var level = info.level;
-		if (me._level !== level || me._isPlugged !== info.isPlugged) {
-			// Fire batterystatus event
-			PhoneGap.fireWindowEvent("batterystatus", info);
-
-			// Fire low battery event
-			if (level === 20 || level === 5) {
-				if (level === 20) {
-					PhoneGap.fireWindowEvent("batterylow", info);
-				}
-				else {
-					PhoneGap.fireWindowEvent("batterycritical", info);
-				}
-			}
-		}
-		me._level = level;
-		me._isPlugged = info.isPlugged;	
-	}
-};
-
-/**
- * Error callback for battery start
- */
-Battery.prototype._error = function(e) {
-    console.log("Error initializing Battery: " + e);
-};
-
-PhoneGap.addConstructor(function() {
-    if (typeof navigator.battery === "undefined") {
-        navigator.battery = new Battery();
-        PhoneGap.addWindowEventHandler("batterystatus", navigator.battery.eventHandler);
-        PhoneGap.addWindowEventHandler("batterylow", navigator.battery.eventHandler);
-        PhoneGap.addWindowEventHandler("batterycritical", navigator.battery.eventHandler);
-    }
-});
-}
-/*
- *     Licensed to the Apache Software Foundation (ASF) under one
- *     or more contributor license agreements.  See the NOTICE file
- *     distributed with this work for additional information
- *     regarding copyright ownership.  The ASF licenses this file
- *     to you under the Apache License, Version 2.0 (the
- *     "License"); you may not use this file except in compliance
- *     with the License.  You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing,
- *     software distributed under the License is distributed on an
- *     "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *     KIND, either express or implied.  See the License for the
- *     specific language governing permissions and limitations
- *     under the License.
- */
-
-if (!PhoneGap.hasResource("camera")) {
-PhoneGap.addResource("camera");
-
-/**
- * This class provides access to the device camera.
- *
- * @constructor
- */
-var Camera = function() {
-    this.successCallback = null;
-    this.errorCallback = null;
-    this.options = null;
-};
-
-/**
- * Format of image that returned from getPicture.
- *
- * Example: navigator.camera.getPicture(success, fail,
- *              { quality: 80,
- *                destinationType: Camera.DestinationType.DATA_URL,
- *                sourceType: Camera.PictureSourceType.PHOTOLIBRARY})
- */
-Camera.DestinationType = {
-    DATA_URL: 0,                // Return base64 encoded string
-    FILE_URI: 1                 // Return file uri (content://media/external/images/media/2 for Android)
-};
-Camera.prototype.DestinationType = Camera.DestinationType;
-
-/**
- * Encoding of image returned from getPicture.
- *
- * Example: navigator.camera.getPicture(success, fail,
- *              { quality: 80,
- *                destinationType: Camera.DestinationType.DATA_URL,
- *                sourceType: Camera.PictureSourceType.CAMERA,
- *                encodingType: Camera.EncodingType.PNG})
-*/
-Camera.EncodingType = {
-    JPEG: 0,                    // Return JPEG encoded image
-    PNG: 1                      // Return PNG encoded image
-};
-Camera.prototype.EncodingType = Camera.EncodingType;
-
-/**
- * Type of pictures to select from.  Only applicable when
- *      PictureSourceType is PHOTOLIBRARY or SAVEDPHOTOALBUM
- *
- * Example: navigator.camera.getPicture(success, fail,
- *              { quality: 80,
- *                destinationType: Camera.DestinationType.DATA_URL,
- *                sourceType: Camera.PictureSourceType.PHOTOLIBRARY,
- *                mediaType: Camera.MediaType.PICTURE})
- */
-Camera.MediaType = {
-       PICTURE: 0,      // allow selection of still pictures only. DEFAULT. Will return format specified via DestinationType
-       VIDEO: 1,        // allow selection of video only, ONLY RETURNS URL
-       ALLMEDIA : 2     // allow selection from all media types
-};
-Camera.prototype.MediaType = Camera.MediaType;
-
-
-/**
- * Source to getPicture from.
- *
- * Example: navigator.camera.getPicture(success, fail,
- *              { quality: 80,
- *                destinationType: Camera.DestinationType.DATA_URL,
- *                sourceType: Camera.PictureSourceType.PHOTOLIBRARY})
- */
-Camera.PictureSourceType = {
-    PHOTOLIBRARY : 0,           // Choose image from picture library (same as SAVEDPHOTOALBUM for Android)
-    CAMERA : 1,                 // Take picture from camera
-    SAVEDPHOTOALBUM : 2         // Choose image from picture library (same as PHOTOLIBRARY for Android)
-};
-Camera.prototype.PictureSourceType = Camera.PictureSourceType;
-
-/**
- * Gets a picture from source defined by "options.sourceType", and returns the
- * image as defined by the "options.destinationType" option.
-
- * The defaults are sourceType=CAMERA and destinationType=DATA_URL.
- *
- * @param {Function} successCallback
- * @param {Function} errorCallback
- * @param {Object} options
- */
-Camera.prototype.getPicture = function(successCallback, errorCallback, options) {
-
-    // successCallback required
-    if (typeof successCallback !== "function") {
-        console.log("Camera Error: successCallback is not a function");
-        return;
-    }
-
-    // errorCallback optional
-    if (errorCallback && (typeof errorCallback !== "function")) {
-        console.log("Camera Error: errorCallback is not a function");
-        return;
-    }
-    
-    if (options === null || typeof options === "undefined") {
-        options = {};
-    }
-    if (options.quality === null || typeof options.quality === "undefined") {
-        options.quality = 80;
-    }
-    if (options.maxResolution === null || typeof options.maxResolution === "undefined") {
-        options.maxResolution = 0;
-    }
-    if (options.destinationType === null || typeof options.destinationType === "undefined") {
-        options.destinationType = Camera.DestinationType.FILE_URI;
-    }
-    if (options.sourceType === null || typeof options.sourceType === "undefined") {
-        options.sourceType = Camera.PictureSourceType.CAMERA;
-    }
-    if (options.encodingType === null || typeof options.encodingType === "undefined") {
-        options.encodingType = Camera.EncodingType.JPEG;
-    }
-    if (options.mediaType === null || typeof options.mediaType === "undefined") {
-        options.mediaType = Camera.MediaType.PICTURE;
-    }
-    if (options.targetWidth === null || typeof options.targetWidth === "undefined") {
-        options.targetWidth = -1;
-    } 
-    else if (typeof options.targetWidth === "string") {
-        var width = new Number(options.targetWidth);
-        if (isNaN(width) === false) {
-            options.targetWidth = width.valueOf();
-        }
-    }
-    if (options.targetHeight === null || typeof options.targetHeight === "undefined") {
-        options.targetHeight = -1;
-    } 
-    else if (typeof options.targetHeight === "string") {
-        var height = new Number(options.targetHeight);
-        if (isNaN(height) === false) {
-            options.targetHeight = height.valueOf();
-        }
-    }
-    
-    PhoneGap.exec(successCallback, errorCallback, "Camera", "takePicture", [options]);
-};
-
-PhoneGap.addConstructor(function() {
-    if (typeof navigator.camera === "undefined") {
-        navigator.camera = new Camera();
-    }
-});
-}
-/*
- *     Licensed to the Apache Software Foundation (ASF) under one
- *     or more contributor license agreements.  See the NOTICE file
- *     distributed with this work for additional information
- *     regarding copyright ownership.  The ASF licenses this file
- *     to you under the Apache License, Version 2.0 (the
- *     "License"); you may not use this file except in compliance
- *     with the License.  You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing,
- *     software distributed under the License is distributed on an
- *     "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *     KIND, either express or implied.  See the License for the
- *     specific language governing permissions and limitations
- *     under the License.
- */
-
-if (!PhoneGap.hasResource("capture")) {
-PhoneGap.addResource("capture");
-	
-/**
- * Represents a single file.
- *
- * name {DOMString} name of the file, without path information
- * fullPath {DOMString} the full path of the file, including the name
- * type {DOMString} mime type
- * lastModifiedDate {Date} last modified date
- * size {Number} size of the file in bytes
- */
-var MediaFile = function(name, fullPath, type, lastModifiedDate, size){
-	this.name = name || null;
-	this.fullPath = fullPath || null;
-	this.type = type || null;
-	this.lastModifiedDate = lastModifiedDate || null;
-	this.size = size || 0;
-};
-
-/**
- * Launch device camera application for recording video(s).
- *
- * @param {Function} successCB
- * @param {Function} errorCB
- */
-MediaFile.prototype.getFormatData = function(successCallback, errorCallback){
-	PhoneGap.exec(successCallback, errorCallback, "Capture", "getFormatData", [this.fullPath, this.type]);
-};
-
-/**
- * MediaFileData encapsulates format information of a media file.
- *
- * @param {DOMString} codecs
- * @param {long} bitrate
- * @param {long} height
- * @param {long} width
- * @param {float} duration
- */
-var MediaFileData = function(codecs, bitrate, height, width, duration){
-	this.codecs = codecs || null;
-	this.bitrate = bitrate || 0;
-	this.height = height || 0;
-	this.width = width || 0;
-	this.duration = duration || 0;
-};
-
-/**
- * The CaptureError interface encapsulates all errors in the Capture API.
- */
-var CaptureError = function(){
-	this.code = null;
-};
-
-// Capture error codes
-CaptureError.CAPTURE_INTERNAL_ERR = 0;
-CaptureError.CAPTURE_APPLICATION_BUSY = 1;
-CaptureError.CAPTURE_INVALID_ARGUMENT = 2;
-CaptureError.CAPTURE_NO_MEDIA_FILES = 3;
-CaptureError.CAPTURE_NOT_SUPPORTED = 20;
-
-/**
- * The Capture interface exposes an interface to the camera and microphone of the hosting device.
- */
-var Capture = function(){
-	this.supportedAudioModes = [];
-	this.supportedImageModes = [];
-	this.supportedVideoModes = [];
-};
-
-/**
- * Launch audio recorder application for recording audio clip(s).
- *
- * @param {Function} successCB
- * @param {Function} errorCB
- * @param {CaptureAudioOptions} options
- */
-Capture.prototype.captureAudio = function(successCallback, errorCallback, options){
-	PhoneGap.exec(successCallback, errorCallback, "Capture", "captureAudio", [options]);
-};
-
-/**
- * Launch camera application for taking image(s).
- *
- * @param {Function} successCB
- * @param {Function} errorCB
- * @param {CaptureImageOptions} options
- */
-Capture.prototype.captureImage = function(successCallback, errorCallback, options){
-	PhoneGap.exec(successCallback, errorCallback, "Capture", "captureImage", [options]);
-};
-
-/**
- * Launch camera application for taking image(s).
- *
- * @param {Function} successCB
- * @param {Function} errorCB
- * @param {CaptureImageOptions} options
- */
-Capture.prototype._castMediaFile = function(pluginResult){
-	var mediaFiles = [];
-	var i;
-	for (i = 0; i < pluginResult.message.length; i++) {
-		var mediaFile = new MediaFile();
-		mediaFile.name = pluginResult.message[i].name;
-		mediaFile.fullPath = pluginResult.message[i].fullPath;
-		mediaFile.type = pluginResult.message[i].type;
-		mediaFile.lastModifiedDate = pluginResult.message[i].lastModifiedDate;
-		mediaFile.size = pluginResult.message[i].size;
-		mediaFiles.push(mediaFile);
-	}
-	pluginResult.message = mediaFiles;
-	return pluginResult;
-};
-
-/**
- * Launch device camera application for recording video(s).
- *
- * @param {Function} successCB
- * @param {Function} errorCB
- * @param {CaptureVideoOptions} options
- */
-Capture.prototype.captureVideo = function(successCallback, errorCallback, options){
-	PhoneGap.exec(successCallback, errorCallback, "Capture", "captureVideo", [options]);
-};
-
-/**
- * Encapsulates a set of parameters that the capture device supports.
- */
-var ConfigurationData = function(){
-	// The ASCII-encoded string in lower case representing the media type. 
-	this.type = null;
-	// The height attribute represents height of the image or video in pixels. 
-	// In the case of a sound clip this attribute has value 0. 
-	this.height = 0;
-	// The width attribute represents width of the image or video in pixels. 
-	// In the case of a sound clip this attribute has value 0
-	this.width = 0;
-};
-
-/**
- * Encapsulates all image capture operation configuration options.
- */
-var CaptureImageOptions = function(){
-	// Upper limit of images user can take. Value must be equal or greater than 1.
-	this.limit = 1;
-	// The selected image mode. Must match with one of the elements in supportedImageModes array.
-	this.mode = null;
-};
-
-/**
- * Encapsulates all video capture operation configuration options.
- */
-var CaptureVideoOptions = function(){
-	// Upper limit of videos user can record. Value must be equal or greater than 1.
-	this.limit = 1;
-	// Maximum duration of a single video clip in seconds.
-	this.duration = 0;
-	// The selected video mode. Must match with one of the elements in supportedVideoModes array.
-	this.mode = null;
-};
-
-/**
- * Encapsulates all audio capture operation configuration options.
- */
-var CaptureAudioOptions = function(){
-	// Upper limit of sound clips user can record. Value must be equal or greater than 1.
-	this.limit = 1;
-	// Maximum duration of a single sound clip in seconds.
-	this.duration = 0;
-	// The selected audio mode. Must match with one of the elements in supportedAudioModes array.
-	this.mode = null;
-};
-
-PhoneGap.addConstructor(function(){
-	if (typeof navigator.device.capture === "undefined") {
-		navigator.device.capture = window.device.capture = new Capture();
-	}
-});
-}
-/*
- *     Licensed to the Apache Software Foundation (ASF) under one
- *     or more contributor license agreements.  See the NOTICE file
- *     distributed with this work for additional information
- *     regarding copyright ownership.  The ASF licenses this file
- *     to you under the Apache License, Version 2.0 (the
- *     "License"); you may not use this file except in compliance
- *     with the License.  You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing,
- *     software distributed under the License is distributed on an
- *     "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *     KIND, either express or implied.  See the License for the
- *     specific language governing permissions and limitations
- *     under the License.
- */
-
-if (!PhoneGap.hasResource("compass")) {
-PhoneGap.addResource("compass");
-
-var CompassError = function(){
-    this.code = null;
-};
-
-// Capture error codes
-CompassError.COMPASS_INTERNAL_ERR = 0;
-CompassError.COMPASS_NOT_SUPPORTED = 20;
-
-var CompassHeading = function() {
-    this.magneticHeading = null;
-    this.trueHeading = null;
-    this.headingAccuracy = null;
-    this.timestamp = null;
-};
-
-/**
- * This class provides access to device Compass data.
- * @constructor
- */
-var Compass = function() {
-    /**
-     * The last known Compass position.
-     */
-    this.lastHeading = null;
-
-    /**
-     * List of compass watch timers
-     */
-    this.timers = {};
-};
-
-Compass.ERROR_MSG = ["Not running", "Starting", "", "Failed to start"];
-
-/**
- * Asynchronously aquires the current heading.
- *
- * @param {Function} successCallback The function to call when the heading data is available
- * @param {Function} errorCallback The function to call when there is an error getting the heading data. (OPTIONAL)
- * @param {PositionOptions} options The options for getting the heading data such as timeout. (OPTIONAL)
- */
-Compass.prototype.getCurrentHeading = function(successCallback, errorCallback, options) {
-
-    // successCallback required
-    if (typeof successCallback !== "function") {
-        console.log("Compass Error: successCallback is not a function");
-        return;
-    }
-
-    // errorCallback optional
-    if (errorCallback && (typeof errorCallback !== "function")) {
-        console.log("Compass Error: errorCallback is not a function");
-        return;
-    }
-
-    // Get heading
-    PhoneGap.exec(successCallback, errorCallback, "Compass", "getHeading", []);
-};
-
-/**
- * Asynchronously aquires the heading repeatedly at a given interval.
- *
- * @param {Function} successCallback    The function to call each time the heading data is available
- * @param {Function} errorCallback      The function to call when there is an error getting the heading data. (OPTIONAL)
- * @param {HeadingOptions} options      The options for getting the heading data such as timeout and the frequency of the watch. (OPTIONAL)
- * @return String                       The watch id that must be passed to #clearWatch to stop watching.
- */
-Compass.prototype.watchHeading= function(successCallback, errorCallback, options) {
-
-    // Default interval (100 msec)
-    var frequency = (options !== undefined) ? options.frequency : 100;
-
-    // successCallback required
-    if (typeof successCallback !== "function") {
-        console.log("Compass Error: successCallback is not a function");
-        return;
-    }
-
-    // errorCallback optional
-    if (errorCallback && (typeof errorCallback !== "function")) {
-        console.log("Compass Error: errorCallback is not a function");
-        return;
-    }
-
-    // Make sure compass timeout > frequency + 10 sec
-    PhoneGap.exec(
-        function(timeout) {
-            if (timeout < (frequency + 10000)) {
-                PhoneGap.exec(null, null, "Compass", "setTimeout", [frequency + 10000]);
-            }
-        },
-        function(e) { }, "Compass", "getTimeout", []);
-
-    // Start watch timer to get headings
-    var id = PhoneGap.createUUID();
-    navigator.compass.timers[id] = setInterval(
-        function() {
-            PhoneGap.exec(successCallback, errorCallback, "Compass", "getHeading", []);
-        }, (frequency ? frequency : 1));
-
-    return id;
-};
-
-
-/**
- * Clears the specified heading watch.
- *
- * @param {String} id       The ID of the watch returned from #watchHeading.
- */
-Compass.prototype.clearWatch = function(id) {
-
-    // Stop javascript timer & remove from timer list
-    if (id && navigator.compass.timers[id]) {
-        clearInterval(navigator.compass.timers[id]);
-        delete navigator.compass.timers[id];
-    }
-};
-
-Compass.prototype._castDate = function(pluginResult) {
-    if (pluginResult.message.timestamp) {
-        var timestamp = new Date(pluginResult.message.timestamp);
-        pluginResult.message.timestamp = timestamp;
-    }
-    return pluginResult;
-};
-
-PhoneGap.addConstructor(function() {
-    if (typeof navigator.compass === "undefined") {
-        navigator.compass = new Compass();
-    }
-});
-}
-/*
- *     Licensed to the Apache Software Foundation (ASF) under one
- *     or more contributor license agreements.  See the NOTICE file
- *     distributed with this work for additional information
- *     regarding copyright ownership.  The ASF licenses this file
- *     to you under the Apache License, Version 2.0 (the
- *     "License"); you may not use this file except in compliance
- *     with the License.  You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing,
- *     software distributed under the License is distributed on an
- *     "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *     KIND, either express or implied.  See the License for the
- *     specific language governing permissions and limitations
- *     under the License.
- */
-
-if (!PhoneGap.hasResource("contact")) {
-PhoneGap.addResource("contact");
-
-/**
-* Contains information about a single contact.
-* @constructor
-* @param {DOMString} id unique identifier
-* @param {DOMString} displayName
-* @param {ContactName} name
-* @param {DOMString} nickname
-* @param {Array.<ContactField>} phoneNumbers array of phone numbers
-* @param {Array.<ContactField>} emails array of email addresses
-* @param {Array.<ContactAddress>} addresses array of addresses
-* @param {Array.<ContactField>} ims instant messaging user ids
-* @param {Array.<ContactOrganization>} organizations
-* @param {DOMString} birthday contact's birthday
-* @param {DOMString} note user notes about contact
-* @param {Array.<ContactField>} photos
-* @param {Array.<ContactField>} categories
-* @param {Array.<ContactField>} urls contact's web sites
-*/
-var Contact = function (id, displayName, name, nickname, phoneNumbers, emails, addresses,
-    ims, organizations, birthday, note, photos, categories, urls) {
-    this.id = id || null;
-    this.rawId = null;
-    this.displayName = displayName || null;
-    this.name = name || null; // ContactName
-    this.nickname = nickname || null;
-    this.phoneNumbers = phoneNumbers || null; // ContactField[]
-    this.emails = emails || null; // ContactField[]
-    this.addresses = addresses || null; // ContactAddress[]
-    this.ims = ims || null; // ContactField[]
-    this.organizations = organizations || null; // ContactOrganization[]
-    this.birthday = birthday || null;
-    this.note = note || null;
-    this.photos = photos || null; // ContactField[]
-    this.categories = categories || null; // ContactField[]
-    this.urls = urls || null; // ContactField[]
-};
-
-/**
- *  ContactError.
- *  An error code assigned by an implementation when an error has occurreds
- * @constructor
- */
-var ContactError = function() {
-    this.code=null;
-};
-
-/**
- * Error codes
- */
-ContactError.UNKNOWN_ERROR = 0;
-ContactError.INVALID_ARGUMENT_ERROR = 1;
-ContactError.TIMEOUT_ERROR = 2;
-ContactError.PENDING_OPERATION_ERROR = 3;
-ContactError.IO_ERROR = 4;
-ContactError.NOT_SUPPORTED_ERROR = 5;
-ContactError.PERMISSION_DENIED_ERROR = 20;
-
-/**
-* Removes contact from device storage.
-* @param successCB success callback
-* @param errorCB error callback
-*/
-Contact.prototype.remove = function(successCB, errorCB) {
-    if (this.id === null) {
-        var errorObj = new ContactError();
-        errorObj.code = ContactError.UNKNOWN_ERROR;
-        errorCB(errorObj);
-    }
-    else {
-        PhoneGap.exec(successCB, errorCB, "Contacts", "remove", [this.id]);
-    }
-};
-
-/**
-* Creates a deep copy of this Contact.
-* With the contact ID set to null.
-* @return copy of this Contact
-*/
-Contact.prototype.clone = function() {
-    var clonedContact = PhoneGap.clone(this);
-    var i;
-    clonedContact.id = null;
-    clonedContact.rawId = null;
-    // Loop through and clear out any id's in phones, emails, etc.
-    if (clonedContact.phoneNumbers) {
-        for (i = 0; i < clonedContact.phoneNumbers.length; i++) {
-            clonedContact.phoneNumbers[i].id = null;
-        }
-    }
-    if (clonedContact.emails) {
-        for (i = 0; i < clonedContact.emails.length; i++) {
-            clonedContact.emails[i].id = null;
-        }
-    }
-    if (clonedContact.addresses) {
-        for (i = 0; i < clonedContact.addresses.length; i++) {
-            clonedContact.addresses[i].id = null;
-        }
-    }
-    if (clonedContact.ims) {
-        for (i = 0; i < clonedContact.ims.length; i++) {
-            clonedContact.ims[i].id = null;
-        }
-    }
-    if (clonedContact.organizations) {
-        for (i = 0; i < clonedContact.organizations.length; i++) {
-            clonedContact.organizations[i].id = null;
-        }
-    }
-    if (clonedContact.tags) {
-        for (i = 0; i < clonedContact.tags.length; i++) {
-            clonedContact.tags[i].id = null;
-        }
-    }
-    if (clonedContact.photos) {
-        for (i = 0; i < clonedContact.photos.length; i++) {
-            clonedContact.photos[i].id = null;
-        }
-    }
-    if (clonedContact.urls) {
-        for (i = 0; i < clonedContact.urls.length; i++) {
-            clonedContact.urls[i].id = null;
-        }
-    }
-    return clonedContact;
-};
-
-/**
-* Persists contact to device storage.
-* @param successCB success callback
-* @param errorCB error callback
-*/
-Contact.prototype.save = function(successCB, errorCB) {
-    PhoneGap.exec(successCB, errorCB, "Contacts", "save", [this]);
-};
-
-/**
-* Contact name.
-* @constructor
-* @param formatted
-* @param familyName
-* @param givenName
-* @param middle
-* @param prefix
-* @param suffix
-*/
-var ContactName = function(formatted, familyName, givenName, middle, prefix, suffix) {
-    this.formatted = formatted || null;
-    this.familyName = familyName || null;
-    this.givenName = givenName || null;
-    this.middleName = middle || null;
-    this.honorificPrefix = prefix || null;
-    this.honorificSuffix = suffix || null;
-};
-
-/**
-* Generic contact field.
-* @constructor
-* @param {DOMString} id unique identifier, should only be set by native code
-* @param type
-* @param value
-* @param pref
-*/
-var ContactField = function(type, value, pref) {
-	this.id = null;
-    this.type = type || null;
-    this.value = value || null;
-    this.pref = pref || null;
-};
-
-/**
-* Contact address.
-* @constructor
-* @param {DOMString} id unique identifier, should only be set by native code
-* @param formatted
-* @param streetAddress
-* @param locality
-* @param region
-* @param postalCode
-* @param country
-*/
-var ContactAddress = function(pref, type, formatted, streetAddress, locality, region, postalCode, country) {
-	this.id = null;
-    this.pref = pref || null;
-    this.type = type || null;
-    this.formatted = formatted || null;
-    this.streetAddress = streetAddress || null;
-    this.locality = locality || null;
-    this.region = region || null;
-    this.postalCode = postalCode || null;
-    this.country = country || null;
-};
-
-/**
-* Contact organization.
-* @constructor
-* @param {DOMString} id unique identifier, should only be set by native code
-* @param name
-* @param dept
-* @param title
-* @param startDate
-* @param endDate
-* @param location
-* @param desc
-*/
-var ContactOrganization = function(pref, type, name, dept, title) {
-	this.id = null;
-    this.pref = pref || null;
-    this.type = type || null;
-    this.name = name || null;
-    this.department = dept || null;
-    this.title = title || null;
-};
-
-/**
-* Represents a group of Contacts.
-* @constructor
-*/
-var Contacts = function() {
-    this.inProgress = false;
-    this.records = [];
-};
-/**
-* Returns an array of Contacts matching the search criteria.
-* @param fields that should be searched
-* @param successCB success callback
-* @param errorCB error callback
-* @param {ContactFindOptions} options that can be applied to contact searching
-* @return array of Contacts matching search criteria
-*/
-Contacts.prototype.find = function(fields, successCB, errorCB, options) {
-    if (successCB === null) {
-        throw new TypeError("You must specify a success callback for the find command.");
-    }
-    if (fields === null || fields === "undefined" || fields.length === "undefined" || fields.length <= 0) {
-        if (typeof errorCB === "function") {
-            errorCB({"code": ContactError.INVALID_ARGUMENT_ERROR});
-        }
-    } else {
-        PhoneGap.exec(successCB, errorCB, "Contacts", "search", [fields, options]);        
-    }
-};
-
-/**
-* This function creates a new contact, but it does not persist the contact
-* to device storage. To persist the contact to device storage, invoke
-* contact.save().
-* @param properties an object who's properties will be examined to create a new Contact
-* @returns new Contact object
-*/
-Contacts.prototype.create = function(properties) {
-    var i;
-	var contact = new Contact();
-    for (i in properties) {
-        if (contact[i] !== 'undefined') {
-            contact[i] = properties[i];
-        }
-    }
-    return contact;
-};
-
-/**
-* This function returns and array of contacts.  It is required as we need to convert raw
-* JSON objects into concrete Contact objects.  Currently this method is called after
-* navigator.contacts.find but before the find methods success call back.
-*
-* @param jsonArray an array of JSON Objects that need to be converted to Contact objects.
-* @returns an array of Contact objects
-*/
-Contacts.prototype.cast = function(pluginResult) {
-	var contacts = [];
-	var i;
-	for (i=0; i<pluginResult.message.length; i++) {
-		contacts.push(navigator.contacts.create(pluginResult.message[i]));
-	}
-	pluginResult.message = contacts;
-	return pluginResult;
-};
-
-/**
- * ContactFindOptions.
- * @constructor
- * @param filter used to match contacts against
- * @param multiple boolean used to determine if more than one contact should be returned
- */
-var ContactFindOptions = function(filter, multiple) {
-    this.filter = filter || '';
-    this.multiple = multiple || false;
-};
-
-/**
- * Add the contact interface into the browser.
- */
-PhoneGap.addConstructor(function() {
-    if(typeof navigator.contacts === "undefined") {
-        navigator.contacts = new Contacts();
-    }
-});
-}
-/*
- *     Licensed to the Apache Software Foundation (ASF) under one
- *     or more contributor license agreements.  See the NOTICE file
- *     distributed with this work for additional information
- *     regarding copyright ownership.  The ASF licenses this file
- *     to you under the Apache License, Version 2.0 (the
- *     "License"); you may not use this file except in compliance
- *     with the License.  You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing,
- *     software distributed under the License is distributed on an
- *     "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *     KIND, either express or implied.  See the License for the
- *     specific language governing permissions and limitations
- *     under the License.
- */
-
-// TODO: Needs to be commented
-
-if (!PhoneGap.hasResource("crypto")) {
-PhoneGap.addResource("crypto");
-
-/**
-* @constructor
-*/
-var Crypto = function() {
-};
-
-Crypto.prototype.encrypt = function(seed, string, callback) {
-    this.encryptWin = callback;
-    PhoneGap.exec(null, null, "Crypto", "encrypt", [seed, string]);
-};
-
-Crypto.prototype.decrypt = function(seed, string, callback) {
-    this.decryptWin = callback;
-    PhoneGap.exec(null, null, "Crypto", "decrypt", [seed, string]);
-};
-
-Crypto.prototype.gotCryptedString = function(string) {
-    this.encryptWin(string);
-};
-
-Crypto.prototype.getPlainString = function(string) {
-    this.decryptWin(string);
-};
-
-PhoneGap.addConstructor(function() {
-    if (typeof navigator.Crypto === "undefined") {
-        navigator.Crypto = new Crypto();
-    }
-});
-}
-/*
- *     Licensed to the Apache Software Foundation (ASF) under one
- *     or more contributor license agreements.  See the NOTICE file
- *     distributed with this work for additional information
- *     regarding copyright ownership.  The ASF licenses this file
- *     to you under the Apache License, Version 2.0 (the
- *     "License"); you may not use this file except in compliance
- *     with the License.  You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing,
- *     software distributed under the License is distributed on an
- *     "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *     KIND, either express or implied.  See the License for the
- *     specific language governing permissions and limitations
- *     under the License.
- */
-
-if (!PhoneGap.hasResource("file")) {
-PhoneGap.addResource("file");
-
-/**
- * This class provides some useful information about a file.
- * @constructor
- */
-var FileProperties = function(filePath) {
-    this.filePath = filePath;
-    this.size = 0;
-    this.lastModifiedDate = null;
-};
-
-/**
- * Represents a single file.
- *
- * @constructor
- * @param name {DOMString} name of the file, without path information
- * @param fullPath {DOMString} the full path of the file, including the name
- * @param type {DOMString} mime type
- * @param lastModifiedDate {Date} last modified date
- * @param size {Number} size of the file in bytes
- */
-var File = function(name, fullPath, type, lastModifiedDate, size) {
-    this.name = name || null;
-    this.fullPath = fullPath || null;
-    this.type = type || null;
-    this.lastModifiedDate = lastModifiedDate || null;
-    this.size = size || 0;
-};
-
-/** @constructor */
-var FileError = function() {
-   this.code = null;
-};
-
-// File error codes
-// Found in DOMException
-FileError.NOT_FOUND_ERR = 1;
-FileError.SECURITY_ERR = 2;
-FileError.ABORT_ERR = 3;
-
-// Added by this specification
-FileError.NOT_READABLE_ERR = 4;
-FileError.ENCODING_ERR = 5;
-FileError.NO_MODIFICATION_ALLOWED_ERR = 6;
-FileError.INVALID_STATE_ERR = 7;
-FileError.SYNTAX_ERR = 8;
-FileError.INVALID_MODIFICATION_ERR = 9;
-FileError.QUOTA_EXCEEDED_ERR = 10;
-FileError.TYPE_MISMATCH_ERR = 11;
-FileError.PATH_EXISTS_ERR = 12;
-
-//-----------------------------------------------------------------------------
-// File Reader
-//-----------------------------------------------------------------------------
-
-/**
- * This class reads the mobile device file system.
- *
- * For Android:
- *      The root directory is the root of the file system.
- *      To read from the SD card, the file name is "sdcard/my_file.txt"
- * @constructor
- */
-var FileReader = function() {
-    this.fileName = "";
-
-    this.readyState = 0;
-
-    // File data
-    this.result = null;
-
-    // Error
-    this.error = null;
-
-    // Event handlers
-    this.onloadstart = null;    // When the read starts.
-    this.onprogress = null;     // While reading (and decoding) file or fileBlob data, and reporting partial file data (progess.loaded/progress.total)
-    this.onload = null;         // When the read has successfully completed.
-    this.onerror = null;        // When the read has failed (see errors).
-    this.onloadend = null;      // When the request has completed (either in success or failure).
-    this.onabort = null;        // When the read has been aborted. For instance, by invoking the abort() method.
-};
-
-// States
-FileReader.EMPTY = 0;
-FileReader.LOADING = 1;
-FileReader.DONE = 2;
-
-/**
- * Abort reading file.
- */
-FileReader.prototype.abort = function() {
-    var evt;
-    this.readyState = FileReader.DONE;
-    this.result = null;
-
-    // set error
-    var error = new FileError();
-    error.code = error.ABORT_ERR;
-    this.error = error;
-
-    // If error callback
-    if (typeof this.onerror === "function") {
-        this.onerror({"type":"error", "target":this});
-    }
-    // If abort callback
-    if (typeof this.onabort === "function") {
-        this.onabort({"type":"abort", "target":this});
-    }
-    // If load end callback
-    if (typeof this.onloadend === "function") {
-        this.onloadend({"type":"loadend", "target":this});
-    }
-};
-
-/**
- * Read text file.
- *
- * @param file          {File} File object containing file properties
- * @param encoding      [Optional] (see http://www.iana.org/assignments/character-sets)
- */
-FileReader.prototype.readAsText = function(file, encoding) {
-    this.fileName = "";
-    if (typeof file.fullPath === "undefined") {
-        this.fileName = file;
-    } else {
-        this.fileName = file.fullPath;
-    }
-
-    // LOADING state
-    this.readyState = FileReader.LOADING;
-
-    // If loadstart callback
-    if (typeof this.onloadstart === "function") {
-        this.onloadstart({"type":"loadstart", "target":this});
-    }
-
-    // Default encoding is UTF-8
-    var enc = encoding ? encoding : "UTF-8";
-
-    var me = this;
-
-    // Read file
-    PhoneGap.exec(
-        // Success callback
-        function(r) {
-            var evt;
-
-            // If DONE (cancelled), then don't do anything
-            if (me.readyState === FileReader.DONE) {
-                return;
-            }
-
-            // Save result
-            me.result = r;
-
-            // If onload callback
-            if (typeof me.onload === "function") {
-                me.onload({"type":"load", "target":me});
-            }
-
-            // DONE state
-            me.readyState = FileReader.DONE;
-
-            // If onloadend callback
-            if (typeof me.onloadend === "function") {
-                me.onloadend({"type":"loadend", "target":me});
-            }
-        },
-        // Error callback
-        function(e) {
-            var evt;
-            // If DONE (cancelled), then don't do anything
-            if (me.readyState === FileReader.DONE) {
-                return;
-            }
-
-            // Save error
-            me.error = e;
-
-            // If onerror callback
-            if (typeof me.onerror === "function") {
-                me.onerror({"type":"error", "target":me});
-            }
-
-            // DONE state
-            me.readyState = FileReader.DONE;
-
-            // If onloadend callback
-            if (typeof me.onloadend === "function") {
-                me.onloadend({"type":"loadend", "target":me});
-            }
-        }, "File", "readAsText", [this.fileName, enc]);
-};
-
-
-/**
- * Read file and return data as a base64 encoded data url.
- * A data url is of the form:
- *      data:[<mediatype>][;base64],<data>
- *
- * @param file          {File} File object containing file properties
- */
-FileReader.prototype.readAsDataURL = function(file) {
-    this.fileName = "";
-    if (typeof file.fullPath === "undefined") {
-        this.fileName = file;
-    } else {
-        this.fileName = file.fullPath;
-    }
-
-    // LOADING state
-    this.readyState = FileReader.LOADING;
-
-    // If loadstart callback
-    if (typeof this.onloadstart === "function") {
-        this.onloadstart({"type":"loadstart", "target":this});
-    }
-
-    var me = this;
-
-    // Read file
-    PhoneGap.exec(
-        // Success callback
-        function(r) {
-            var evt;
-
-            // If DONE (cancelled), then don't do anything
-            if (me.readyState === FileReader.DONE) {
-                return;
-            }
-
-            // Save result
-            me.result = r;
-
-            // If onload callback
-            if (typeof me.onload === "function") {
-                me.onload({"type":"load", "target":me});
-            }
-
-            // DONE state
-            me.readyState = FileReader.DONE;
-
-            // If onloadend callback
-            if (typeof me.onloadend === "function") {
-                me.onloadend({"type":"loadend", "target":me});
-            }
-        },
-        // Error callback
-        function(e) {
-            var evt;
-            // If DONE (cancelled), then don't do anything
-            if (me.readyState === FileReader.DONE) {
-                return;
-            }
-
-            // Save error
-            me.error = e;
-
-            // If onerror callback
-            if (typeof me.onerror === "function") {
-                me.onerror({"type":"error", "target":me});
-            }
-
-            // DONE state
-            me.readyState = FileReader.DONE;
-
-            // If onloadend callback
-            if (typeof me.onloadend === "function") {
-                me.onloadend({"type":"loadend", "target":me});
-            }
-        }, "File", "readAsDataURL", [this.fileName]);
-};
-
-/**
- * Read file and return data as a binary data.
- *
- * @param file          {File} File object containing file properties
- */
-FileReader.prototype.readAsBinaryString = function(file) {
-    // TODO - Can't return binary data to browser.
-    this.fileName = file;
-};
-
-/**
- * Read file and return data as a binary data.
- *
- * @param file          {File} File object containing file properties
- */
-FileReader.prototype.readAsArrayBuffer = function(file) {
-    // TODO - Can't return binary data to browser.
-    this.fileName = file;
-};
-
-//-----------------------------------------------------------------------------
-// File Writer
-//-----------------------------------------------------------------------------
-
-/**
- * This class writes to the mobile device file system.
- *
- * For Android:
- *      The root directory is the root of the file system.
- *      To write to the SD card, the file name is "sdcard/my_file.txt"
- *
- * @constructor
- * @param file {File} File object containing file properties
- * @param append if true write to the end of the file, otherwise overwrite the file
- */
-var FileWriter = function(file) {
-    this.fileName = "";
-    this.length = 0;
-    if (file) {
-        this.fileName = file.fullPath || file;
-        this.length = file.size || 0;
-    }
-    // default is to write at the beginning of the file
-    this.position = 0;
-
-    this.readyState = 0; // EMPTY
-
-    this.result = null;
-
-    // Error
-    this.error = null;
-
-    // Event handlers
-    this.onwritestart = null;   // When writing starts
-    this.onprogress = null;     // While writing the file, and reporting partial file data
-    this.onwrite = null;        // When the write has successfully completed.
-    this.onwriteend = null;     // When the request has completed (either in success or failure).
-    this.onabort = null;        // When the write has been aborted. For instance, by invoking the abort() method.
-    this.onerror = null;        // When the write has failed (see errors).
-};
-
-// States
-FileWriter.INIT = 0;
-FileWriter.WRITING = 1;
-FileWriter.DONE = 2;
-
-/**
- * Abort writing file.
- */
-FileWriter.prototype.abort = function() {
-    // check for invalid state
-    if (this.readyState === FileWriter.DONE || this.readyState === FileWriter.INIT) {
-        throw FileError.INVALID_STATE_ERR;
-    }
-
-    // set error
-    var error = new FileError(), evt;
-    error.code = error.ABORT_ERR;
-    this.error = error;
-
-    // If error callback
-    if (typeof this.onerror === "function") {
-        this.onerror({"type":"error", "target":this});
-    }
-    // If abort callback
-    if (typeof this.onabort === "function") {
-        this.onabort({"type":"abort", "target":this});
-    }
-
-    this.readyState = FileWriter.DONE;
-
-    // If write end callback
-    if (typeof this.onwriteend === "function") {
-        this.onwriteend({"type":"writeend", "target":this});
-    }
-};
-
-/**
- * Writes data to the file
- *
- * @param text to be written
- */
-FileWriter.prototype.write = function(text) {
-    // Throw an exception if we are already writing a file
-    if (this.readyState === FileWriter.WRITING) {
-        throw FileError.INVALID_STATE_ERR;
-    }
-
-    // WRITING state
-    this.readyState = FileWriter.WRITING;
-
-    var me = this;
-
-    // If onwritestart callback
-    if (typeof me.onwritestart === "function") {
-        me.onwritestart({"type":"writestart", "target":me});
-    }
-
-    // Write file
-    PhoneGap.exec(
-        // Success callback
-        function(r) {
-            var evt;
-            // If DONE (cancelled), then don't do anything
-            if (me.readyState === FileWriter.DONE) {
-                return;
-            }
-
-            // position always increases by bytes written because file would be extended
-            me.position += r;
-            // The length of the file is now where we are done writing.
-            me.length = me.position;
-
-            // If onwrite callback
-            if (typeof me.onwrite === "function") {
-                me.onwrite({"type":"write", "target":me});
-            }
-
-            // DONE state
-            me.readyState = FileWriter.DONE;
-
-            // If onwriteend callback
-            if (typeof me.onwriteend === "function") {
-                me.onwriteend({"type":"writeend", "target":me});
-            }
-        },
-        // Error callback
-        function(e) {
-            var evt;
-
-            // If DONE (cancelled), then don't do anything
-            if (me.readyState === FileWriter.DONE) {
-                return;
-            }
-
-            // Save error
-            me.error = e;
-
-            // If onerror callback
-            if (typeof me.onerror === "function") {
-                me.onerror({"type":"error", "target":me});
-            }
-
-            // DONE state
-            me.readyState = FileWriter.DONE;
-
-            // If onwriteend callback
-            if (typeof me.onwriteend === "function") {
-                me.onwriteend({"type":"writeend", "target":me});
-            }
-        }, "File", "write", [this.fileName, text, this.position]);
-};
-
-/**
- * Moves the file pointer to the location specified.
- *
- * If the offset is a negative number the position of the file
- * pointer is rewound.  If the offset is greater than the file
- * size the position is set to the end of the file.
- *
- * @param offset is the location to move the file pointer to.
- */
-FileWriter.prototype.seek = function(offset) {
-    // Throw an exception if we are already writing a file
-    if (this.readyState === FileWriter.WRITING) {
-        throw FileError.INVALID_STATE_ERR;
-    }
-
-    if (!offset) {
-        return;
-    }
-
-    // See back from end of file.
-    if (offset < 0) {
-        this.position = Math.max(offset + this.length, 0);
-    }
-    // Offset is bigger then file size so set position
-    // to the end of the file.
-    else if (offset > this.length) {
-        this.position = this.length;
-    }
-    // Offset is between 0 and file size so set the position
-    // to start writing.
-    else {
-        this.position = offset;
-    }
-};
-
-/**
- * Truncates the file to the size specified.
- *
- * @param size to chop the file at.
- */
-FileWriter.prototype.truncate = function(size) {
-    // Throw an exception if we are already writing a file
-    if (this.readyState === FileWriter.WRITING) {
-        throw FileError.INVALID_STATE_ERR;
-    }
-
-    // WRITING state
-    this.readyState = FileWriter.WRITING;
-
-    var me = this;
-
-    // If onwritestart callback
-    if (typeof me.onwritestart === "function") {
-        me.onwritestart({"type":"writestart", "target":this});
-    }
-
-    // Write file
-    PhoneGap.exec(
-        // Success callback
-        function(r) {
-            var evt;
-            // If DONE (cancelled), then don't do anything
-            if (me.readyState === FileWriter.DONE) {
-                return;
-            }
-
-            // Update the length of the file
-            me.length = r;
-            me.position = Math.min(me.position, r);
-
-            // If onwrite callback
-            if (typeof me.onwrite === "function") {
-                me.onwrite({"type":"write", "target":me});
-            }
-
-            // DONE state
-            me.readyState = FileWriter.DONE;
-
-            // If onwriteend callback
-            if (typeof me.onwriteend === "function") {
-                me.onwriteend({"type":"writeend", "target":me});
-            }
-        },
-        // Error callback
-        function(e) {
-            var evt;
-            // If DONE (cancelled), then don't do anything
-            if (me.readyState === FileWriter.DONE) {
-                return;
-            }
-
-            // Save error
-            me.error = e;
-
-            // If onerror callback
-            if (typeof me.onerror === "function") {
-                me.onerror({"type":"error", "target":me});
-            }
-
-            // DONE state
-            me.readyState = FileWriter.DONE;
-
-            // If onwriteend callback
-            if (typeof me.onwriteend === "function") {
-                me.onwriteend({"type":"writeend", "target":me});
-            }
-        }, "File", "truncate", [this.fileName, size]);
-};
-
-/**
- * Information about the state of the file or directory
- *
- * @constructor
- * {Date} modificationTime (readonly)
- */
-var Metadata = function() {
-    this.modificationTime=null;
-};
-
-/**
- * Supplies arguments to methods that lookup or create files and directories
- *
- * @constructor
- * @param {boolean} create file or directory if it doesn't exist
- * @param {boolean} exclusive if true the command will fail if the file or directory exists
- */
-var Flags = function(create, exclusive) {
-    this.create = create || false;
-    this.exclusive = exclusive || false;
-};
-
-/**
- * An interface representing a file system
- *
- * @constructor
- * {DOMString} name the unique name of the file system (readonly)
- * {DirectoryEntry} root directory of the file system (readonly)
- */
-var FileSystem = function() {
-    this.name = null;
-    this.root = null;
-};
-
-/**
- * An interface that lists the files and directories in a directory.
- * @constructor
- */
-var DirectoryReader = function(fullPath){
-    this.fullPath = fullPath || null;
-};
-
-/**
- * Returns a list of entries from a directory.
- *
- * @param {Function} successCallback is called with a list of entries
- * @param {Function} errorCallback is called with a FileError
- */
-DirectoryReader.prototype.readEntries = function(successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "File", "readEntries", [this.fullPath]);
-};
-
-/**
- * An interface representing a directory on the file system.
- *
- * @constructor
- * {boolean} isFile always false (readonly)
- * {boolean} isDirectory always true (readonly)
- * {DOMString} name of the directory, excluding the path leading to it (readonly)
- * {DOMString} fullPath the absolute full path to the directory (readonly)
- * {FileSystem} filesystem on which the directory resides (readonly)
- */
-var DirectoryEntry = function() {
-    this.isFile = false;
-    this.isDirectory = true;
-    this.name = null;
-    this.fullPath = null;
-    this.filesystem = null;
-};
-
-/**
- * Copies a directory to a new location
- *
- * @param {DirectoryEntry} parent the directory to which to copy the entry
- * @param {DOMString} newName the new name of the entry, defaults to the current name
- * @param {Function} successCallback is called with the new entry
- * @param {Function} errorCallback is called with a FileError
- */
-DirectoryEntry.prototype.copyTo = function(parent, newName, successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "File", "copyTo", [this.fullPath, parent, newName]);
-};
-
-/**
- * Looks up the metadata of the entry
- *
- * @param {Function} successCallback is called with a Metadata object
- * @param {Function} errorCallback is called with a FileError
- */
-DirectoryEntry.prototype.getMetadata = function(successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "File", "getMetadata", [this.fullPath]);
-};
-
-/**
- * Gets the parent of the entry
- *
- * @param {Function} successCallback is called with a parent entry
- * @param {Function} errorCallback is called with a FileError
- */
-DirectoryEntry.prototype.getParent = function(successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "File", "getParent", [this.fullPath]);
-};
-
-/**
- * Moves a directory to a new location
- *
- * @param {DirectoryEntry} parent the directory to which to move the entry
- * @param {DOMString} newName the new name of the entry, defaults to the current name
- * @param {Function} successCallback is called with the new entry
- * @param {Function} errorCallback is called with a FileError
- */
-DirectoryEntry.prototype.moveTo = function(parent, newName, successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "File", "moveTo", [this.fullPath, parent, newName]);
-};
-
-/**
- * Removes the entry
- *
- * @param {Function} successCallback is called with no parameters
- * @param {Function} errorCallback is called with a FileError
- */
-DirectoryEntry.prototype.remove = function(successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "File", "remove", [this.fullPath]);
-};
-
-/**
- * Returns a URI that can be used to identify this entry.
- *
- * @param {DOMString} mimeType for a FileEntry, the mime type to be used to interpret the file, when loaded through this URI.
- * @return uri
- */
-DirectoryEntry.prototype.toURI = function(mimeType) {
-    return "file://" + this.fullPath;
-};
-
-/**
- * Creates a new DirectoryReader to read entries from this directory
- */
-DirectoryEntry.prototype.createReader = function(successCallback, errorCallback) {
-    return new DirectoryReader(this.fullPath);
-};
-
-/**
- * Creates or looks up a directory
- *
- * @param {DOMString} path either a relative or absolute path from this directory in which to look up or create a directory
- * @param {Flags} options to create or excluively create the directory
- * @param {Function} successCallback is called with the new entry
- * @param {Function} errorCallback is called with a FileError
- */
-DirectoryEntry.prototype.getDirectory = function(path, options, successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "File", "getDirectory", [this.fullPath, path, options]);
-};
-
-/**
- * Creates or looks up a file
- *
- * @param {DOMString} path either a relative or absolute path from this directory in which to look up or create a file
- * @param {Flags} options to create or excluively create the file
- * @param {Function} successCallback is called with the new entry
- * @param {Function} errorCallback is called with a FileError
- */
-DirectoryEntry.prototype.getFile = function(path, options, successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "File", "getFile", [this.fullPath, path, options]);
-};
-
-/**
- * Deletes a directory and all of it's contents
- *
- * @param {Function} successCallback is called with no parameters
- * @param {Function} errorCallback is called with a FileError
- */
-DirectoryEntry.prototype.removeRecursively = function(successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "File", "removeRecursively", [this.fullPath]);
-};
-
-/**
- * An interface representing a directory on the file system.
- *
- * @constructor
- * {boolean} isFile always true (readonly)
- * {boolean} isDirectory always false (readonly)
- * {DOMString} name of the file, excluding the path leading to it (readonly)
- * {DOMString} fullPath the absolute full path to the file (readonly)
- * {FileSystem} filesystem on which the directory resides (readonly)
- */
-var FileEntry = function() {
-    this.isFile = true;
-    this.isDirectory = false;
-    this.name = null;
-    this.fullPath = null;
-    this.filesystem = null;
-};
-
-/**
- * Copies a file to a new location
- *
- * @param {DirectoryEntry} parent the directory to which to copy the entry
- * @param {DOMString} newName the new name of the entry, defaults to the current name
- * @param {Function} successCallback is called with the new entry
- * @param {Function} errorCallback is called with a FileError
- */
-FileEntry.prototype.copyTo = function(parent, newName, successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "File", "copyTo", [this.fullPath, parent, newName]);
-};
-
-/**
- * Looks up the metadata of the entry
- *
- * @param {Function} successCallback is called with a Metadata object
- * @param {Function} errorCallback is called with a FileError
- */
-FileEntry.prototype.getMetadata = function(successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "File", "getMetadata", [this.fullPath]);
-};
-
-/**
- * Gets the parent of the entry
- *
- * @param {Function} successCallback is called with a parent entry
- * @param {Function} errorCallback is called with a FileError
- */
-FileEntry.prototype.getParent = function(successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "File", "getParent", [this.fullPath]);
-};
-
-/**
- * Moves a directory to a new location
- *
- * @param {DirectoryEntry} parent the directory to which to move the entry
- * @param {DOMString} newName the new name of the entry, defaults to the current name
- * @param {Function} successCallback is called with the new entry
- * @param {Function} errorCallback is called with a FileError
- */
-FileEntry.prototype.moveTo = function(parent, newName, successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "File", "moveTo", [this.fullPath, parent, newName]);
-};
-
-/**
- * Removes the entry
- *
- * @param {Function} successCallback is called with no parameters
- * @param {Function} errorCallback is called with a FileError
- */
-FileEntry.prototype.remove = function(successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "File", "remove", [this.fullPath]);
-};
-
-/**
- * Returns a URI that can be used to identify this entry.
- *
- * @param {DOMString} mimeType for a FileEntry, the mime type to be used to interpret the file, when loaded through this URI.
- * @return uri
- */
-FileEntry.prototype.toURI = function(mimeType) {
-    return "file://" + this.fullPath;
-};
-
-/**
- * Creates a new FileWriter associated with the file that this FileEntry represents.
- *
- * @param {Function} successCallback is called with the new FileWriter
- * @param {Function} errorCallback is called with a FileError
- */
-FileEntry.prototype.createWriter = function(successCallback, errorCallback) {
-    this.file(function(filePointer) {
-        var writer = new FileWriter(filePointer);
-    
-        if (writer.fileName === null || writer.fileName === "") {
-            if (typeof errorCallback === "function") {
-                errorCallback({
-                    "code": FileError.INVALID_STATE_ERR
-                });
-            }
-        }
-    
-        if (typeof successCallback === "function") {
-            successCallback(writer);
-        }       
-    }, errorCallback);
-};
-
-/**
- * Returns a File that represents the current state of the file that this FileEntry represents.
- *
- * @param {Function} successCallback is called with the new File object
- * @param {Function} errorCallback is called with a FileError
- */
-FileEntry.prototype.file = function(successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "File", "getFileMetadata", [this.fullPath]);
-};
-
-/** @constructor */
-var LocalFileSystem = function() {
-};
-
-// File error codes
-LocalFileSystem.TEMPORARY = 0;
-LocalFileSystem.PERSISTENT = 1;
-LocalFileSystem.RESOURCE = 2;
-LocalFileSystem.APPLICATION = 3;
-
-/**
- * Requests a filesystem in which to store application data.
- *
- * @param {int} type of file system being requested
- * @param {Function} successCallback is called with the new FileSystem
- * @param {Function} errorCallback is called with a FileError
- */
-LocalFileSystem.prototype.requestFileSystem = function(type, size, successCallback, errorCallback) {
-    if (type < 0 || type > 3) {
-        if (typeof errorCallback === "function") {
-            errorCallback({
-                "code": FileError.SYNTAX_ERR
-            });
-        }
-    }
-    else {
-        PhoneGap.exec(successCallback, errorCallback, "File", "requestFileSystem", [type, size]);
-    }
-};
-
-/**
- *
- * @param {DOMString} uri referring to a local file in a filesystem
- * @param {Function} successCallback is called with the new entry
- * @param {Function} errorCallback is called with a FileError
- */
-LocalFileSystem.prototype.resolveLocalFileSystemURI = function(uri, successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "File", "resolveLocalFileSystemURI", [uri]);
-};
-
-/**
-* This function returns and array of contacts.  It is required as we need to convert raw
-* JSON objects into concrete Contact objects.  Currently this method is called after
-* navigator.service.contacts.find but before the find methods success call back.
-*
-* @param a JSON Objects that need to be converted to DirectoryEntry or FileEntry objects.
-* @returns an entry
-*/
-LocalFileSystem.prototype._castFS = function(pluginResult) {
-    var entry = null;
-    entry = new DirectoryEntry();
-    entry.isDirectory = pluginResult.message.root.isDirectory;
-    entry.isFile = pluginResult.message.root.isFile;
-    entry.name = pluginResult.message.root.name;
-    entry.fullPath = pluginResult.message.root.fullPath;
-    pluginResult.message.root = entry;
-    return pluginResult;
-};
-
-LocalFileSystem.prototype._castEntry = function(pluginResult) {
-    var entry = null;
-    if (pluginResult.message.isDirectory) {
-        entry = new DirectoryEntry();
-    }
-    else if (pluginResult.message.isFile) {
-        entry = new FileEntry();
-    }
-    entry.isDirectory = pluginResult.message.isDirectory;
-    entry.isFile = pluginResult.message.isFile;
-    entry.name = pluginResult.message.name;
-    entry.fullPath = pluginResult.message.fullPath;
-    pluginResult.message = entry;
-    return pluginResult;
-};
-
-LocalFileSystem.prototype._castEntries = function(pluginResult) {
-    var entries = pluginResult.message;
-    var retVal = [];
-    for (var i=0; i<entries.length; i++) {
-        retVal.push(window.localFileSystem._createEntry(entries[i]));
-    }
-    pluginResult.message = retVal;
-    return pluginResult;
-};
-
-LocalFileSystem.prototype._createEntry = function(castMe) {
-    var entry = null;
-    if (castMe.isDirectory) {
-        entry = new DirectoryEntry();
-    }
-    else if (castMe.isFile) {
-        entry = new FileEntry();
-    }
-    entry.isDirectory = castMe.isDirectory;
-    entry.isFile = castMe.isFile;
-    entry.name = castMe.name;
-    entry.fullPath = castMe.fullPath;
-    return entry;
-};
-
-LocalFileSystem.prototype._castDate = function(pluginResult) {
-    if (pluginResult.message.modificationTime) {
-        var modTime = new Date(pluginResult.message.modificationTime);
-        pluginResult.message.modificationTime = modTime;
-    }
-    else if (pluginResult.message.lastModifiedDate) {
-        var file = new File();
-        file.size = pluginResult.message.size;
-        file.type = pluginResult.message.type;
-        file.name = pluginResult.message.name;
-        file.fullPath = pluginResult.message.fullPath;
-        file.lastModifiedDate = new Date(pluginResult.message.lastModifiedDate);
-        pluginResult.message = file;
-    }
-    return pluginResult;
-};
-
-/**
- * Add the FileSystem interface into the browser.
- */
-PhoneGap.addConstructor(function() {
-    var pgLocalFileSystem = new LocalFileSystem();
-    // Needed for cast methods
-    if (typeof window.localFileSystem === "undefined") {
-        window.localFileSystem = pgLocalFileSystem;
-    }
-    if (typeof window.requestFileSystem === "undefined") {
-        window.requestFileSystem = pgLocalFileSystem.requestFileSystem;
-    }
-    if (typeof window.resolveLocalFileSystemURI === "undefined") {
-        window.resolveLocalFileSystemURI = pgLocalFileSystem.resolveLocalFileSystemURI;
-    }
-});
-}/*
- *     Licensed to the Apache Software Foundation (ASF) under one
- *     or more contributor license agreements.  See the NOTICE file
- *     distributed with this work for additional information
- *     regarding copyright ownership.  The ASF licenses this file
- *     to you under the Apache License, Version 2.0 (the
- *     "License"); you may not use this file except in compliance
- *     with the License.  You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing,
- *     software distributed under the License is distributed on an
- *     "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *     KIND, either express or implied.  See the License for the
- *     specific language governing permissions and limitations
- *     under the License.
- */
-
-if (!PhoneGap.hasResource("filetransfer")) {
-PhoneGap.addResource("filetransfer");
-
-/**
- * FileTransfer uploads a file to a remote server.
- * @constructor
- */
-var FileTransfer = function() {};
-
-/**
- * FileUploadResult
- * @constructor
- */
-var FileUploadResult = function() {
-    this.bytesSent = 0;
-    this.responseCode = null;
-    this.response = null;
-};
-
-/**
- * FileTransferError
- * @constructor
- */
-var FileTransferError = function() {
-    this.code = null;
-};
-
-FileTransferError.FILE_NOT_FOUND_ERR = 1;
-FileTransferError.INVALID_URL_ERR = 2;
-FileTransferError.CONNECTION_ERR = 3;
-
-/**
-* Given an absolute file path, uploads a file on the device to a remote server
-* using a multipart HTTP request.
-* @param filePath {String}           Full path of the file on the device
-* @param server {String}             URL of the server to receive the file
-* @param successCallback (Function}  Callback to be invoked when upload has completed
-* @param errorCallback {Function}    Callback to be invoked upon error
-* @param options {FileUploadOptions} Optional parameters such as file name and mimetype
-*/
-FileTransfer.prototype.upload = function(filePath, server, successCallback, errorCallback, options, debug) {
-
-    // check for options
-    var fileKey = null;
-    var fileName = null;
-    var mimeType = null;
-    var params = null;
-    var chunkedMode = true;
-    if (options) {
-        fileKey = options.fileKey;
-        fileName = options.fileName;
-        mimeType = options.mimeType;
-        if (options.chunkedMode !== null || typeof options.chunkedMode !== "undefined") {
-            chunkedMode = options.chunkedMode;
-        }
-        if (options.params) {
-            params = options.params;
-        }
-        else {
-            params = {};
-        }
-    }
-
-    PhoneGap.exec(successCallback, errorCallback, 'FileTransfer', 'upload', [filePath, server, fileKey, fileName, mimeType, params, debug, chunkedMode]);
-};
-
-/**
- * Downloads a file form a given URL and saves it to the specified directory.
- * @param source {String}          URL of the server to receive the file
- * @param target {String}         Full path of the file on the device
- * @param successCallback (Function}  Callback to be invoked when upload has completed
- * @param errorCallback {Function}    Callback to be invoked upon error
- */
-FileTransfer.prototype.download = function(source, target, successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, 'FileTransfer', 'download', [source, target]);
-};
-
-/**
- * Options to customize the HTTP request used to upload files.
- * @constructor
- * @param fileKey {String}   Name of file request parameter.
- * @param fileName {String}  Filename to be used by the server. Defaults to image.jpg.
- * @param mimeType {String}  Mimetype of the uploaded file. Defaults to image/jpeg.
- * @param params {Object}    Object with key: value params to send to the server.
- */
-var FileUploadOptions = function(fileKey, fileName, mimeType, params) {
-    this.fileKey = fileKey || null;
-    this.fileName = fileName || null;
-    this.mimeType = mimeType || null;
-    this.params = params || null;
-};
-}
-/*
- *     Licensed to the Apache Software Foundation (ASF) under one
- *     or more contributor license agreements.  See the NOTICE file
- *     distributed with this work for additional information
- *     regarding copyright ownership.  The ASF licenses this file
- *     to you under the Apache License, Version 2.0 (the
- *     "License"); you may not use this file except in compliance
- *     with the License.  You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing,
- *     software distributed under the License is distributed on an
- *     "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *     KIND, either express or implied.  See the License for the
- *     specific language governing permissions and limitations
- *     under the License.
- */
-
-if (!PhoneGap.hasResource("geolocation")) {
-PhoneGap.addResource("geolocation");
-
-/**
- * This class provides access to device GPS data.
- * @constructor
- */
-var Geolocation = function() {
-
-    // The last known GPS position.
-    this.lastPosition = null;
-
-    // Geolocation listeners
-    this.listeners = {};
-};
-
-/**
- * Position error object
- *
- * @constructor
- * @param code
- * @param message
- */
-var PositionError = function(code, message) {
-    this.code = code;
-    this.message = message;
-};
-
-PositionError.PERMISSION_DENIED = 1;
-PositionError.POSITION_UNAVAILABLE = 2;
-PositionError.TIMEOUT = 3;
-
-/**
- * Asynchronously aquires the current position.
- *
- * @param {Function} successCallback    The function to call when the position data is available
- * @param {Function} errorCallback      The function to call when there is an error getting the heading position. (OPTIONAL)
- * @param {PositionOptions} options     The options for getting the position data. (OPTIONAL)
- */
-Geolocation.prototype.getCurrentPosition = function(successCallback, errorCallback, options) {
-    if (navigator._geo.listeners.global) {
-        console.log("Geolocation Error: Still waiting for previous getCurrentPosition() request.");
-        try {
-            errorCallback(new PositionError(PositionError.TIMEOUT, "Geolocation Error: Still waiting for previous getCurrentPosition() request."));
-        } catch (e) {
-        }
-        return;
-    }
-    var maximumAge = 10000;
-    var enableHighAccuracy = false;
-    var timeout = 10000;
-    if (typeof options !== "undefined") {
-        if (typeof options.maximumAge !== "undefined") {
-            maximumAge = options.maximumAge;
-        }
-        if (typeof options.enableHighAccuracy !== "undefined") {
-            enableHighAccuracy = options.enableHighAccuracy;
-        }
-        if (typeof options.timeout !== "undefined") {
-            timeout = options.timeout;
-        }
-    }
-    navigator._geo.listeners.global = {"success" : successCallback, "fail" : errorCallback };
-    PhoneGap.exec(null, null, "Geolocation", "getCurrentLocation", [enableHighAccuracy, timeout, maximumAge]);
-};
-
-/**
- * Asynchronously watches the geolocation for changes to geolocation.  When a change occurs,
- * the successCallback is called with the new location.
- *
- * @param {Function} successCallback    The function to call each time the location data is available
- * @param {Function} errorCallback      The function to call when there is an error getting the location data. (OPTIONAL)
- * @param {PositionOptions} options     The options for getting the location data such as frequency. (OPTIONAL)
- * @return String                       The watch id that must be passed to #clearWatch to stop watching.
- */
-Geolocation.prototype.watchPosition = function(successCallback, errorCallback, options) {
-    var maximumAge = 10000;
-    var enableHighAccuracy = false;
-    var timeout = 10000;
-    if (typeof options !== "undefined") {
-        if (typeof options.frequency  !== "undefined") {
-            maximumAge = options.frequency;
-        }
-        if (typeof options.maximumAge !== "undefined") {
-            maximumAge = options.maximumAge;
-        }
-        if (typeof options.enableHighAccuracy !== "undefined") {
-            enableHighAccuracy = options.enableHighAccuracy;
-        }
-        if (typeof options.timeout !== "undefined") {
-            timeout = options.timeout;
-        }
-    }
-    var id = PhoneGap.createUUID();
-    navigator._geo.listeners[id] = {"success" : successCallback, "fail" : errorCallback };
-    PhoneGap.exec(null, null, "Geolocation", "start", [id, enableHighAccuracy, timeout, maximumAge]);
-    return id;
-};
-
-/*
- * Native callback when watch position has a new position.
- * PRIVATE METHOD
- *
- * @param {String} id
- * @param {Number} lat
- * @param {Number} lng
- * @param {Number} alt
- * @param {Number} altacc
- * @param {Number} head
- * @param {Number} vel
- * @param {Number} stamp
- */
-Geolocation.prototype.success = function(id, lat, lng, alt, altacc, head, vel, stamp) {
-    var coords = new Coordinates(lat, lng, alt, altacc, head, vel);
-    var loc = new Position(coords, stamp);
-    try {
-        if (lat === "undefined" || lng === "undefined") {
-            navigator._geo.listeners[id].fail(new PositionError(PositionError.POSITION_UNAVAILABLE, "Lat/Lng are undefined."));
-        }
-        else {
-            navigator._geo.lastPosition = loc;
-            navigator._geo.listeners[id].success(loc);
-        }
-    }
-    catch (e) {
-        console.log("Geolocation Error: Error calling success callback function.");
-    }
-
-    if (id === "global") {
-        delete navigator._geo.listeners.global;
-    }
-};
-
-/**
- * Native callback when watch position has an error.
- * PRIVATE METHOD
- *
- * @param {String} id       The ID of the watch
- * @param {Number} code     The error code
- * @param {String} msg      The error message
- */
-Geolocation.prototype.fail = function(id, code, msg) {
-    try {
-        navigator._geo.listeners[id].fail(new PositionError(code, msg));
-    }
-    catch (e) {
-        console.log("Geolocation Error: Error calling error callback function.");
-    }
-};
-
-/**
- * Clears the specified heading watch.
- *
- * @param {String} id       The ID of the watch returned from #watchPosition
- */
-Geolocation.prototype.clearWatch = function(id) {
-    PhoneGap.exec(null, null, "Geolocation", "stop", [id]);
-    delete navigator._geo.listeners[id];
-};
-
-/**
- * Force the PhoneGap geolocation to be used instead of built-in.
- */
-Geolocation.usingPhoneGap = false;
-Geolocation.usePhoneGap = function() {
-    if (Geolocation.usingPhoneGap) {
-        return;
-    }
-    Geolocation.usingPhoneGap = true;
-
-    // Set built-in geolocation methods to our own implementations
-    // (Cannot replace entire geolocation, but can replace individual methods)
-    navigator.geolocation.setLocation = navigator._geo.setLocation;
-    navigator.geolocation.getCurrentPosition = navigator._geo.getCurrentPosition;
-    navigator.geolocation.watchPosition = navigator._geo.watchPosition;
-    navigator.geolocation.clearWatch = navigator._geo.clearWatch;
-    navigator.geolocation.start = navigator._geo.start;
-    navigator.geolocation.stop = navigator._geo.stop;
-};
-
-PhoneGap.addConstructor(function() {
-    navigator._geo = new Geolocation();
-
-    // No native geolocation object for Android 1.x, so use PhoneGap geolocation
-    if (typeof navigator.geolocation === 'undefined') {
-        navigator.geolocation = navigator._geo;
-        Geolocation.usingPhoneGap = true;
-    }
-});
-}
-/*
- *     Licensed to the Apache Software Foundation (ASF) under one
- *     or more contributor license agreements.  See the NOTICE file
- *     distributed with this work for additional information
- *     regarding copyright ownership.  The ASF licenses this file
- *     to you under the Apache License, Version 2.0 (the
- *     "License"); you may not use this file except in compliance
- *     with the License.  You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing,
- *     software distributed under the License is distributed on an
- *     "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *     KIND, either express or implied.  See the License for the
- *     specific language governing permissions and limitations
- *     under the License.
- */
-
-if (!PhoneGap.hasResource("media")) {
-PhoneGap.addResource("media");
-
-/**
- * This class provides access to the device media, interfaces to both sound and video
- *
- * @constructor
- * @param src                   The file name or url to play
- * @param successCallback       The callback to be called when the file is done playing or recording.
- *                                  successCallback() - OPTIONAL
- * @param errorCallback         The callback to be called if there is an error.
- *                                  errorCallback(int errorCode) - OPTIONAL
- * @param statusCallback        The callback to be called when media status has changed.
- *                                  statusCallback(int statusCode) - OPTIONAL
- * @param positionCallback      The callback to be called when media position has changed.
- *                                  positionCallback(long position) - OPTIONAL
- */
-var Media = function(src, successCallback, errorCallback, statusCallback, positionCallback) {
-
-    // successCallback optional
-    if (successCallback && (typeof successCallback !== "function")) {
-        console.log("Media Error: successCallback is not a function");
-        return;
-    }
-
-    // errorCallback optional
-    if (errorCallback && (typeof errorCallback !== "function")) {
-        console.log("Media Error: errorCallback is not a function");
-        return;
-    }
-
-    // statusCallback optional
-    if (statusCallback && (typeof statusCallback !== "function")) {
-        console.log("Media Error: statusCallback is not a function");
-        return;
-    }
-
-    // statusCallback optional
-    if (positionCallback && (typeof positionCallback !== "function")) {
-        console.log("Media Error: positionCallback is not a function");
-        return;
-    }
-
-    this.id = PhoneGap.createUUID();
-    PhoneGap.mediaObjects[this.id] = this;
-    this.src = src;
-    this.successCallback = successCallback;
-    this.errorCallback = errorCallback;
-    this.statusCallback = statusCallback;
-    this.positionCallback = positionCallback;
-    this._duration = -1;
-    this._position = -1;
-};
-
-// Media messages
-Media.MEDIA_STATE = 1;
-Media.MEDIA_DURATION = 2;
-Media.MEDIA_POSITION = 3;
-Media.MEDIA_ERROR = 9;
-
-// Media states
-Media.MEDIA_NONE = 0;
-Media.MEDIA_STARTING = 1;
-Media.MEDIA_RUNNING = 2;
-Media.MEDIA_PAUSED = 3;
-Media.MEDIA_STOPPED = 4;
-Media.MEDIA_MSG = ["None", "Starting", "Running", "Paused", "Stopped"];
-
-// TODO: Will MediaError be used?
-/**
- * This class contains information about any Media errors.
- * @constructor
- */
-var MediaError = function() {
-    this.code = null;
-    this.message = "";
-};
-
-MediaError.MEDIA_ERR_NONE_ACTIVE    = 0;
-MediaError.MEDIA_ERR_ABORTED        = 1;
-MediaError.MEDIA_ERR_NETWORK        = 2;
-MediaError.MEDIA_ERR_DECODE         = 3;
-MediaError.MEDIA_ERR_NONE_SUPPORTED = 4;
-
-/**
- * Start or resume playing audio file.
- */
-Media.prototype.play = function() {
-    PhoneGap.exec(null, null, "Media", "startPlayingAudio", [this.id, this.src]);
-};
-
-/**
- * Stop playing audio file.
- */
-Media.prototype.stop = function() {
-    return PhoneGap.exec(null, null, "Media", "stopPlayingAudio", [this.id]);
-};
-
-/**
- * Seek or jump to a new time in the track..
- */
-Media.prototype.seekTo = function(milliseconds) {
-    PhoneGap.exec(null, null, "Media", "seekToAudio", [this.id, milliseconds]);
-};
-
-/**
- * Pause playing audio file.
- */
-Media.prototype.pause = function() {
-    PhoneGap.exec(null, null, "Media", "pausePlayingAudio", [this.id]);
-};
-
-/**
- * Get duration of an audio file.
- * The duration is only set for audio that is playing, paused or stopped.
- *
- * @return      duration or -1 if not known.
- */
-Media.prototype.getDuration = function() {
-    return this._duration;
-};
-
-/**
- * Get position of audio.
- */
-Media.prototype.getCurrentPosition = function(success, fail) {
-    PhoneGap.exec(success, fail, "Media", "getCurrentPositionAudio", [this.id]);
-};
-
-/**
- * Start recording audio file.
- */
-Media.prototype.startRecord = function() {
-    PhoneGap.exec(null, null, "Media", "startRecordingAudio", [this.id, this.src]);
-};
-
-/**
- * Stop recording audio file.
- */
-Media.prototype.stopRecord = function() {
-    PhoneGap.exec(null, null, "Media", "stopRecordingAudio", [this.id]);
-};
-
-/**
- * Release the resources.
- */
-Media.prototype.release = function() {
-    PhoneGap.exec(null, null, "Media", "release", [this.id]);
-};
-
-/**
- * Adjust the volume.
- */
-Media.prototype.setVolume = function(volume) {
-    PhoneGap.exec(null, null, "Media", "setVolume", [this.id, volume]);
-};
-
-/**
- * List of media objects.
- * PRIVATE
- */
-PhoneGap.mediaObjects = {};
-
-/**
- * Object that receives native callbacks.
- * PRIVATE
- * @constructor
- */
-PhoneGap.Media = function() {};
-
-/**
- * Get the media object.
- * PRIVATE
- *
- * @param id            The media object id (string)
- */
-PhoneGap.Media.getMediaObject = function(id) {
-    return PhoneGap.mediaObjects[id];
-};
-
-/**
- * Audio has status update.
- * PRIVATE
- *
- * @param id            The media object id (string)
- * @param status        The status code (int)
- * @param msg           The status message (string)
- */
-PhoneGap.Media.onStatus = function(id, msg, value) {
-    var media = PhoneGap.mediaObjects[id];
-    // If state update
-    if (msg === Media.MEDIA_STATE) {
-        if (value === Media.MEDIA_STOPPED) {
-            if (media.successCallback) {
-                media.successCallback();
-            }
-        }
-        if (media.statusCallback) {
-            media.statusCallback(value);
-        }
-    }
-    else if (msg === Media.MEDIA_DURATION) {
-        media._duration = value;
-    }
-    else if (msg === Media.MEDIA_ERROR) {
-        if (media.errorCallback) {
-            media.errorCallback({"code":value});
-        }
-    }
-    else if (msg === Media.MEDIA_POSITION) {
-        media._position = value;
-    }
-};
-}
-/*
- *     Licensed to the Apache Software Foundation (ASF) under one
- *     or more contributor license agreements.  See the NOTICE file
- *     distributed with this work for additional information
- *     regarding copyright ownership.  The ASF licenses this file
- *     to you under the Apache License, Version 2.0 (the
- *     "License"); you may not use this file except in compliance
- *     with the License.  You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing,
- *     software distributed under the License is distributed on an
- *     "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *     KIND, either express or implied.  See the License for the
- *     specific language governing permissions and limitations
- *     under the License.
- */
-
-
-if (!PhoneGap.hasResource("network")) {
-PhoneGap.addResource("network");
-
-/**
- * This class contains information about the current network Connection.
- * @constructor
- */
-var Connection = function() {
-    this.type = null;
-    this._firstRun = true;
-    this._timer = null;
-    this.timeout = 500;
-
-    var me = this;
-    this.getInfo(
-        function(type) {
-            // Need to send events if we are on or offline
-            if (type === "none") {
-                // set a timer if still offline at the end of timer send the offline event
-                me._timer = setTimeout(function(){
-                    me.type = type;
-                    PhoneGap.fireDocumentEvent('offline');
-                    me._timer = null;
-                    }, me.timeout);
-            } else {
-                // If there is a current offline event pending clear it
-                if (me._timer !== null) {
-                    clearTimeout(me._timer);
-                    me._timer = null;
-                }
-                me.type = type;
-                PhoneGap.fireDocumentEvent('online');
-            }
-            
-            // should only fire this once
-            if (me._firstRun) {
-                me._firstRun = false;
-                PhoneGap.onPhoneGapConnectionReady.fire();
-            }            
-        },
-        function(e) {
-            // If we can't get the network info we should still tell PhoneGap
-            // to fire the deviceready event.
-            if (me._firstRun) {
-                me._firstRun = false;
-                PhoneGap.onPhoneGapConnectionReady.fire();
-            }            
-            console.log("Error initializing Network Connection: " + e);
-        });
-};
-
-Connection.UNKNOWN = "unknown";
-Connection.ETHERNET = "ethernet";
-Connection.WIFI = "wifi";
-Connection.CELL_2G = "2g";
-Connection.CELL_3G = "3g";
-Connection.CELL_4G = "4g";
-Connection.NONE = "none";
-
-/**
- * Get connection info
- *
- * @param {Function} successCallback The function to call when the Connection data is available
- * @param {Function} errorCallback The function to call when there is an error getting the Connection data. (OPTIONAL)
- */
-Connection.prototype.getInfo = function(successCallback, errorCallback) {
-    // Get info
-    PhoneGap.exec(successCallback, errorCallback, "Network Status", "getConnectionInfo", []);
-};
-
-
-PhoneGap.addConstructor(function() {
-    if (typeof navigator.network === "undefined") {
-        navigator.network = {};
-    }
-    if (typeof navigator.network.connection === "undefined") {
-        navigator.network.connection = new Connection();
-    }
-});
-}
-/*
- *     Licensed to the Apache Software Foundation (ASF) under one
- *     or more contributor license agreements.  See the NOTICE file
- *     distributed with this work for additional information
- *     regarding copyright ownership.  The ASF licenses this file
- *     to you under the Apache License, Version 2.0 (the
- *     "License"); you may not use this file except in compliance
- *     with the License.  You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing,
- *     software distributed under the License is distributed on an
- *     "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *     KIND, either express or implied.  See the License for the
- *     specific language governing permissions and limitations
- *     under the License.
- */
-
-if (!PhoneGap.hasResource("notification")) {
-PhoneGap.addResource("notification");
-
-/**
- * This class provides access to notifications on the device.
- * @constructor
- */
-var Notification = function() {
-};
-
-/**
- * Open a native alert dialog, with a customizable title and button text.
- *
- * @param {String} message              Message to print in the body of the alert
- * @param {Function} completeCallback   The callback that is called when user clicks on a button.
- * @param {String} title                Title of the alert dialog (default: Alert)
- * @param {String} buttonLabel          Label of the close button (default: OK)
- */
-Notification.prototype.alert = function(message, completeCallback, title, buttonLabel) {
-    var _title = (title || "Alert");
-    var _buttonLabel = (buttonLabel || "OK");
-    PhoneGap.exec(completeCallback, null, "Notification", "alert", [message,_title,_buttonLabel]);
-};
-
-/**
- * Open a native confirm dialog, with a customizable title and button text.
- * The result that the user selects is returned to the result callback.
- *
- * @param {String} message              Message to print in the body of the alert
- * @param {Function} resultCallback     The callback that is called when user clicks on a button.
- * @param {String} title                Title of the alert dialog (default: Confirm)
- * @param {String} buttonLabels         Comma separated list of the labels of the buttons (default: 'OK,Cancel')
- */
-Notification.prototype.confirm = function(message, resultCallback, title, buttonLabels) {
-    var _title = (title || "Confirm");
-    var _buttonLabels = (buttonLabels || "OK,Cancel");
-    PhoneGap.exec(resultCallback, null, "Notification", "confirm", [message,_title,_buttonLabels]);
-};
-
-/**
- * Start spinning the activity indicator on the statusbar
- */
-Notification.prototype.activityStart = function() {
-    PhoneGap.exec(null, null, "Notification", "activityStart", ["Busy","Please wait..."]);
-};
-
-/**
- * Stop spinning the activity indicator on the statusbar, if it's currently spinning
- */
-Notification.prototype.activityStop = function() {
-    PhoneGap.exec(null, null, "Notification", "activityStop", []);
-};
-
-/**
- * Display a progress dialog with progress bar that goes from 0 to 100.
- *
- * @param {String} title        Title of the progress dialog.
- * @param {String} message      Message to display in the dialog.
- */
-Notification.prototype.progressStart = function(title, message) {
-    PhoneGap.exec(null, null, "Notification", "progressStart", [title, message]);
-};
-
-/**
- * Set the progress dialog value.
- *
- * @param {Number} value         0-100
- */
-Notification.prototype.progressValue = function(value) {
-    PhoneGap.exec(null, null, "Notification", "progressValue", [value]);
-};
-
-/**
- * Close the progress dialog.
- */
-Notification.prototype.progressStop = function() {
-    PhoneGap.exec(null, null, "Notification", "progressStop", []);
-};
-
-/**
- * Causes the device to blink a status LED.
- *
- * @param {Integer} count       The number of blinks.
- * @param {String} colour       The colour of the light.
- */
-Notification.prototype.blink = function(count, colour) {
-    // NOT IMPLEMENTED
-};
-
-/**
- * Causes the device to vibrate.
- *
- * @param {Integer} mills       The number of milliseconds to vibrate for.
- */
-Notification.prototype.vibrate = function(mills) {
-    PhoneGap.exec(null, null, "Notification", "vibrate", [mills]);
-};
-
-/**
- * Causes the device to beep.
- * On Android, the default notification ringtone is played "count" times.
- *
- * @param {Integer} count       The number of beeps.
- */
-Notification.prototype.beep = function(count) {
-    PhoneGap.exec(null, null, "Notification", "beep", [count]);
-};
-
-PhoneGap.addConstructor(function() {
-    if (typeof navigator.notification === "undefined") {
-        navigator.notification = new Notification();
-    }
-});
-}
-/*
- *     Licensed to the Apache Software Foundation (ASF) under one
- *     or more contributor license agreements.  See the NOTICE file
- *     distributed with this work for additional information
- *     regarding copyright ownership.  The ASF licenses this file
- *     to you under the Apache License, Version 2.0 (the
- *     "License"); you may not use this file except in compliance
- *     with the License.  You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing,
- *     software distributed under the License is distributed on an
- *     "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *     KIND, either express or implied.  See the License for the
- *     specific language governing permissions and limitations
- *     under the License.
- */
-
-if (!PhoneGap.hasResource("position")) {
-PhoneGap.addResource("position");
-
-/**
- * This class contains position information.
- * @param {Object} lat
- * @param {Object} lng
- * @param {Object} acc
- * @param {Object} alt
- * @param {Object} altacc
- * @param {Object} head
- * @param {Object} vel
- * @constructor
- */
-var Position = function(coords, timestamp) {
-	this.coords = coords;
-	this.timestamp = (timestamp !== 'undefined') ? timestamp : new Date().getTime();
-};
-
-/** @constructor */
-var Coordinates = function(lat, lng, alt, acc, head, vel, altacc) {
-	/**
-	 * The latitude of the position.
-	 */
-	this.latitude = lat;
-	/**
-	 * The longitude of the position,
-	 */
-	this.longitude = lng;
-	/**
-	 * The accuracy of the position.
-	 */
-	this.accuracy = acc;
-	/**
-	 * The altitude of the position.
-	 */
-	this.altitude = alt;
-	/**
-	 * The direction the device is moving at the position.
-	 */
-	this.heading = head;
-	/**
-	 * The velocity with which the device is moving at the position.
-	 */
-	this.speed = vel;
-	/**
-	 * The altitude accuracy of the position.
-	 */
-	this.altitudeAccuracy = (altacc !== 'undefined') ? altacc : null;
-};
-
-/**
- * This class specifies the options for requesting position data.
- * @constructor
- */
-var PositionOptions = function() {
-	/**
-	 * Specifies the desired position accuracy.
-	 */
-	this.enableHighAccuracy = true;
-	/**
-	 * The timeout after which if position data cannot be obtained the errorCallback
-	 * is called.
-	 */
-	this.timeout = 10000;
-};
-
-/**
- * This class contains information about any GSP errors.
- * @constructor
- */
-var PositionError = function() {
-	this.code = null;
-	this.message = "";
-};
-
-PositionError.UNKNOWN_ERROR = 0;
-PositionError.PERMISSION_DENIED = 1;
-PositionError.POSITION_UNAVAILABLE = 2;
-PositionError.TIMEOUT = 3;
-}
-/*
- *     Licensed to the Apache Software Foundation (ASF) under one
- *     or more contributor license agreements.  See the NOTICE file
- *     distributed with this work for additional information
- *     regarding copyright ownership.  The ASF licenses this file
- *     to you under the Apache License, Version 2.0 (the
- *     "License"); you may not use this file except in compliance
- *     with the License.  You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing,
- *     software distributed under the License is distributed on an
- *     "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *     KIND, either express or implied.  See the License for the
- *     specific language governing permissions and limitations
- *     under the License.
- */
-
-/*
- * This is purely for the Android 1.5/1.6 HTML 5 Storage
- * I was hoping that Android 2.0 would deprecate this, but given the fact that
- * most manufacturers ship with Android 1.5 and do not do OTA Updates, this is required
- */
-
-if (!PhoneGap.hasResource("storage")) {
-PhoneGap.addResource("storage");
-
-/**
- * SQL result set object
- * PRIVATE METHOD
- * @constructor
- */
-var DroidDB_Rows = function() {
-    this.resultSet = [];    // results array
-    this.length = 0;        // number of rows
-};
-
-/**
- * Get item from SQL result set
- *
- * @param row           The row number to return
- * @return              The row object
- */
-DroidDB_Rows.prototype.item = function(row) {
-    return this.resultSet[row];
-};
-
-/**
- * SQL result set that is returned to user.
- * PRIVATE METHOD
- * @constructor
- */
-var DroidDB_Result = function() {
-    this.rows = new DroidDB_Rows();
-};
-
-/**
- * Storage object that is called by native code when performing queries.
- * PRIVATE METHOD
- * @constructor
- */
-var DroidDB = function() {
-    this.queryQueue = {};
-};
-
-/**
- * Callback from native code when query is complete.
- * PRIVATE METHOD
- *
- * @param id                Query id
- */
-DroidDB.prototype.completeQuery = function(id, data) {
-    var query = this.queryQueue[id];
-    if (query) {
-        try {
-            delete this.queryQueue[id];
-
-            // Get transaction
-            var tx = query.tx;
-
-            // If transaction hasn't failed
-            // Note: We ignore all query results if previous query
-            //       in the same transaction failed.
-            if (tx && tx.queryList[id]) {
-
-                // Save query results
-                var r = new DroidDB_Result();
-                r.rows.resultSet = data;
-                r.rows.length = data.length;
-                try {
-                    if (typeof query.successCallback === 'function') {
-                        query.successCallback(query.tx, r);
-                    }
-                } catch (ex) {
-                    console.log("executeSql error calling user success callback: "+ex);
-                }
-
-                tx.queryComplete(id);
-            }
-        } catch (e) {
-            console.log("executeSql error: "+e);
-        }
-    }
-};
-
-/**
- * Callback from native code when query fails
- * PRIVATE METHOD
- *
- * @param reason            Error message
- * @param id                Query id
- */
-DroidDB.prototype.fail = function(reason, id) {
-    var query = this.queryQueue[id];
-    if (query) {
-        try {
-            delete this.queryQueue[id];
-
-            // Get transaction
-            var tx = query.tx;
-
-            // If transaction hasn't failed
-            // Note: We ignore all query results if previous query
-            //       in the same transaction failed.
-            if (tx && tx.queryList[id]) {
-                tx.queryList = {};
-
-                try {
-                    if (typeof query.errorCallback === 'function') {
-                        query.errorCallback(query.tx, reason);
-                    }
-                } catch (ex) {
-                    console.log("executeSql error calling user error callback: "+ex);
-                }
-
-                tx.queryFailed(id, reason);
-            }
-
-        } catch (e) {
-            console.log("executeSql error: "+e);
-        }
-    }
-};
-
-/**
- * SQL query object
- * PRIVATE METHOD
- *
- * @constructor
- * @param tx                The transaction object that this query belongs to
- */
-var DroidDB_Query = function(tx) {
-
-    // Set the id of the query
-    this.id = PhoneGap.createUUID();
-
-    // Add this query to the queue
-    droiddb.queryQueue[this.id] = this;
-
-    // Init result
-    this.resultSet = [];
-
-    // Set transaction that this query belongs to
-    this.tx = tx;
-
-    // Add this query to transaction list
-    this.tx.queryList[this.id] = this;
-
-    // Callbacks
-    this.successCallback = null;
-    this.errorCallback = null;
-
-};
-
-/**
- * Transaction object
- * PRIVATE METHOD
- * @constructor
- */
-var DroidDB_Tx = function() {
-
-    // Set the id of the transaction
-    this.id = PhoneGap.createUUID();
-
-    // Callbacks
-    this.successCallback = null;
-    this.errorCallback = null;
-
-    // Query list
-    this.queryList = {};
-};
-
-/**
- * Mark query in transaction as complete.
- * If all queries are complete, call the user's transaction success callback.
- *
- * @param id                Query id
- */
-DroidDB_Tx.prototype.queryComplete = function(id) {
-    delete this.queryList[id];
-
-    // If no more outstanding queries, then fire transaction success
-    if (this.successCallback) {
-        var count = 0;
-        var i;
-        for (i in this.queryList) {
-            if (this.queryList.hasOwnProperty(i)) {
-                count++;
-            }
-        }
-        if (count === 0) {
-            try {
-                this.successCallback();
-            } catch(e) {
-                console.log("Transaction error calling user success callback: " + e);
-            }
-        }
-    }
-};
-
-/**
- * Mark query in transaction as failed.
- *
- * @param id                Query id
- * @param reason            Error message
- */
-DroidDB_Tx.prototype.queryFailed = function(id, reason) {
-
-    // The sql queries in this transaction have already been run, since
-    // we really don't have a real transaction implemented in native code.
-    // However, the user callbacks for the remaining sql queries in transaction
-    // will not be called.
-    this.queryList = {};
-
-    if (this.errorCallback) {
-        try {
-            this.errorCallback(reason);
-        } catch(e) {
-            console.log("Transaction error calling user error callback: " + e);
-        }
-    }
-};
-
-/**
- * Execute SQL statement
- *
- * @param sql                   SQL statement to execute
- * @param params                Statement parameters
- * @param successCallback       Success callback
- * @param errorCallback         Error callback
- */
-DroidDB_Tx.prototype.executeSql = function(sql, params, successCallback, errorCallback) {
-
-    // Init params array
-    if (typeof params === 'undefined') {
-        params = [];
-    }
-
-    // Create query and add to queue
-    var query = new DroidDB_Query(this);
-    droiddb.queryQueue[query.id] = query;
-
-    // Save callbacks
-    query.successCallback = successCallback;
-    query.errorCallback = errorCallback;
-
-    // Call native code
-    PhoneGap.exec(null, null, "Storage", "executeSql", [sql, params, query.id]);
-};
-
-var DatabaseShell = function() {
-};
-
-/**
- * Start a transaction.
- * Does not support rollback in event of failure.
- *
- * @param process {Function}            The transaction function
- * @param successCallback {Function}
- * @param errorCallback {Function}
- */
-DatabaseShell.prototype.transaction = function(process, errorCallback, successCallback) {
-    var tx = new DroidDB_Tx();
-    tx.successCallback = successCallback;
-    tx.errorCallback = errorCallback;
-    try {
-        process(tx);
-    } catch (e) {
-        console.log("Transaction error: "+e);
-        if (tx.errorCallback) {
-            try {
-                tx.errorCallback(e);
-            } catch (ex) {
-                console.log("Transaction error calling user error callback: "+e);
-            }
-        }
-    }
-};
-
-/**
- * Open database
- *
- * @param name              Database name
- * @param version           Database version
- * @param display_name      Database display name
- * @param size              Database size in bytes
- * @return                  Database object
- */
-var DroidDB_openDatabase = function(name, version, display_name, size) {
-    PhoneGap.exec(null, null, "Storage", "openDatabase", [name, version, display_name, size]);
-    var db = new DatabaseShell();
-    return db;
-};
-
-/**
- * For browsers with no localStorage we emulate it with SQLite. Follows the w3c api.
- * TODO: Do similar for sessionStorage.
- */
-
-/**
- * @constructor
- */
-var CupcakeLocalStorage = function() {
-    try {
-
-      this.db = openDatabase('localStorage', '1.0', 'localStorage', 2621440);
-      var storage = {};
-      this.length = 0;
-      function setLength (length) {
-        this.length = length;
-        localStorage.length = length;
-      }
-      this.db.transaction(
-        function (transaction) {
-            var i;
-          transaction.executeSql('CREATE TABLE IF NOT EXISTS storage (id NVARCHAR(40) PRIMARY KEY, body NVARCHAR(255))');
-          transaction.executeSql('SELECT * FROM storage', [], function(tx, result) {
-            for(var i = 0; i < result.rows.length; i++) {
-              storage[result.rows.item(i)['id']] =  result.rows.item(i)['body'];
-            }
-            setLength(result.rows.length);
-            PhoneGap.initializationComplete("cupcakeStorage");
-          });
-
-        },
-        function (err) {
-          alert(err.message);
-        }
-      );
-      this.setItem = function(key, val) {
-        if (typeof(storage[key])=='undefined') {
-          this.length++;
-        }
-        storage[key] = val;
-        this.db.transaction(
-          function (transaction) {
-            transaction.executeSql('CREATE TABLE IF NOT EXISTS storage (id NVARCHAR(40) PRIMARY KEY, body NVARCHAR(255))');
-            transaction.executeSql('REPLACE INTO storage (id, body) values(?,?)', [key,val]);
-          }
-        );
-      };
-      this.getItem = function(key) {
-        return storage[key];
-      };
-      this.removeItem = function(key) {
-        delete storage[key];
-        this.length--;
-        this.db.transaction(
-          function (transaction) {
-            transaction.executeSql('CREATE TABLE IF NOT EXISTS storage (id NVARCHAR(40) PRIMARY KEY, body NVARCHAR(255))');
-            transaction.executeSql('DELETE FROM storage where id=?', [key]);
-          }
-        );
-      };
-      this.clear = function() {
-        storage = {};
-        this.length = 0;
-        this.db.transaction(
-          function (transaction) {
-            transaction.executeSql('CREATE TABLE IF NOT EXISTS storage (id NVARCHAR(40) PRIMARY KEY, body NVARCHAR(255))');
-            transaction.executeSql('DELETE FROM storage', []);
-          }
-        );
-      };
-      this.key = function(index) {
-        var i = 0;
-        for (var j in storage) {
-          if (i==index) {
-            return j;
-          } else {
-            i++;
-          }
-        }
-        return null;
-      };
-
-    } catch(e) {
-      alert("Database error "+e+".");
-        return;
-    }
-};
-
-PhoneGap.addConstructor(function() {
-    var setupDroidDB = function() {
-        navigator.openDatabase = window.openDatabase = DroidDB_openDatabase;
-        window.droiddb = new DroidDB();
-    }
-    if (typeof window.openDatabase === "undefined") {
-        setupDroidDB();
-    } else {
-        window.openDatabase_orig = window.openDatabase;
-        window.openDatabase = function(name, version, desc, size){
-            // Some versions of Android will throw a SECURITY_ERR so we need 
-            // to catch the exception and seutp our own DB handling.
-            var db = null;
-            try {
-                db = window.openDatabase_orig(name, version, desc, size);
-            } 
-            catch (ex) {
-                db = null;
-            }
-
-            if (db == null) {
-                setupDroidDB();
-                return DroidDB_openDatabase(name, version, desc, size);
-            }
-            else {
-                return db;
-            }
-        };
-    }
-    
-    if ((typeof window.localStorage == "undefined") || (window.localStorage == null)) {
-        navigator.localStorage = window.localStorage = new CupcakeLocalStorage();
-        PhoneGap.waitForInitialization("cupcakeStorage");
-    }
-});
-}
diff --git a/apps/files_odfviewer/src/webodf/programs/android/assets/www/scripts.js b/apps/files_odfviewer/src/webodf/programs/android/assets/www/scripts.js
deleted file mode 100644
index dd3b76fb99..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/android/assets/www/scripts.js
+++ /dev/null
@@ -1,4123 +0,0 @@
-/*     PhoneGap v1.4.0 */
-/*
-       Licensed to the Apache Software Foundation (ASF) under one
-       or more contributor license agreements.  See the NOTICE file
-       distributed with this work for additional information
-       regarding copyright ownership.  The ASF licenses this file
-       to you under the Apache License, Version 2.0 (the
-       "License"); you may not use this file except in compliance
-       with the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-       Unless required by applicable law or agreed to in writing,
-       software distributed under the License is distributed on an
-       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-       KIND, either express or implied.  See the License for the
-       specific language governing permissions and limitations
-       under the License.
-*/
-
-
-/*
- * Some base contributions
- * Copyright (c) 2011, Proyectos Equis Ka, S.L.
- */
-
-if (typeof PhoneGap === "undefined") {
-
-if (typeof(DeviceInfo) !== 'object'){
-    DeviceInfo = {};
-}
-/**
- * This represents the PhoneGap API itself, and provides a global namespace for accessing
- * information about the state of PhoneGap.
- * @class
- */
-PhoneGap = {
-    // This queue holds the currently executing command and all pending
-    // commands executed with PhoneGap.exec().
-    commandQueue: [],
-    // Indicates if we're currently in the middle of flushing the command
-    // queue on the native side.
-    commandQueueFlushing: false,
-    _constructors: [],
-    documentEventHandler: {},   // Collection of custom document event handlers
-    windowEventHandler: {} 
-};
-
-/**
- * List of resource files loaded by PhoneGap.
- * This is used to ensure JS and other files are loaded only once.
- */
-PhoneGap.resources = {base: true};
-
-/**
- * Determine if resource has been loaded by PhoneGap
- *
- * @param name
- * @return
- */
-PhoneGap.hasResource = function(name) {
-    return PhoneGap.resources[name];
-};
-
-/**
- * Add a resource to list of loaded resources by PhoneGap
- *
- * @param name
- */
-PhoneGap.addResource = function(name) {
-    PhoneGap.resources[name] = true;
-};
-
-/**
- * Boolean flag indicating if the PhoneGap API is available and initialized.
- */ // TODO: Remove this, it is unused here ... -jm
-PhoneGap.available = DeviceInfo.uuid != undefined;
-
-/**
- * Add an initialization function to a queue that ensures it will run and initialize
- * application constructors only once PhoneGap has been initialized.
- * @param {Function} func The function callback you want run once PhoneGap is initialized
- */
-PhoneGap.addConstructor = function(func) {
-    var state = document.readyState;
-    if ( ( state == 'loaded' || state == 'complete' ) && DeviceInfo.uuid != null )
-    {
-        func();
-    }
-    else
-    {
-        PhoneGap._constructors.push(func);
-    }
-};
-
-(function() 
- {
-    var timer = setInterval(function()
-    {
-                            
-        var state = document.readyState;
-                            
-        if ( ( state == 'loaded' || state == 'complete' ) && DeviceInfo.uuid != null )
-        {
-            clearInterval(timer); // stop looking
-            // run our constructors list
-            while (PhoneGap._constructors.length > 0) 
-            {
-                var constructor = PhoneGap._constructors.shift();
-                try 
-                {
-                    constructor();
-                } 
-                catch(e) 
-                {
-                    if (typeof(console['log']) == 'function')
-                    {
-                        console.log("Failed to run constructor: " + console.processMessage(e));
-                    }
-                    else
-                    {
-                        alert("Failed to run constructor: " + e.message);
-                    }
-                }
-            }
-            // all constructors run, now fire the deviceready event
-            var e = document.createEvent('Events'); 
-            e.initEvent('deviceready');
-            document.dispatchEvent(e);
-        }
-    }, 1);
-})();
-
-// session id for calls
-PhoneGap.sessionKey = 0;
-
-// centralized callbacks
-PhoneGap.callbackId = 0;
-PhoneGap.callbacks = {};
-PhoneGap.callbackStatus = {
-    NO_RESULT: 0,
-    OK: 1,
-    CLASS_NOT_FOUND_EXCEPTION: 2,
-    ILLEGAL_ACCESS_EXCEPTION: 3,
-    INSTANTIATION_EXCEPTION: 4,
-    MALFORMED_URL_EXCEPTION: 5,
-    IO_EXCEPTION: 6,
-    INVALID_ACTION: 7,
-    JSON_EXCEPTION: 8,
-    ERROR: 9
-    };
-
-/**
- * Creates a gap bridge iframe used to notify the native code about queued
- * commands.
- *
- * @private
- */
-PhoneGap.createGapBridge = function() {
-    gapBridge = document.createElement("iframe");
-    gapBridge.setAttribute("style", "display:none;");
-    gapBridge.setAttribute("height","0px");
-    gapBridge.setAttribute("width","0px");
-    gapBridge.setAttribute("frameborder","0");
-    document.documentElement.appendChild(gapBridge);
-    return gapBridge;
-}
-
-/** 
- * Execute a PhoneGap command by queuing it and letting the native side know
- * there are queued commands. The native side will then request all of the
- * queued commands and execute them.
- *
- * Arguments may be in one of two formats:
- *
- * FORMAT ONE (preferable)
- * The native side will call PhoneGap.callbackSuccess or
- * PhoneGap.callbackError, depending upon the result of the action.
- *
- * @param {Function} success    The success callback
- * @param {Function} fail       The fail callback
- * @param {String} service      The name of the service to use
- * @param {String} action       The name of the action to use
- * @param {String[]} [args]     Zero or more arguments to pass to the method
- *      
- * FORMAT TWO
- * @param {String} command    Command to be run in PhoneGap, e.g.
- *                            "ClassName.method"
- * @param {String[]} [args]   Zero or more arguments to pass to the method
- *                            object parameters are passed as an array object
- *                            [object1, object2] each object will be passed as
- *                            JSON strings 
- */
-PhoneGap.exec = function() { 
-    if (!PhoneGap.available) {
-        alert("ERROR: Attempting to call PhoneGap.exec()"
-              +" before 'deviceready'. Ignoring.");
-        return;
-    }
-
-    var successCallback, failCallback, service, action, actionArgs;
-    var callbackId = null;
-    if (typeof arguments[0] !== "string") {
-        // FORMAT ONE
-        successCallback = arguments[0];
-        failCallback = arguments[1];
-        service = arguments[2];
-        action = arguments[3];
-        actionArgs = arguments[4];
-
-        // Since we need to maintain backwards compatibility, we have to pass
-        // an invalid callbackId even if no callback was provided since plugins
-        // will be expecting it. The PhoneGap.exec() implementation allocates
-        // an invalid callbackId and passes it even if no callbacks were given.
-        callbackId = 'INVALID';
-    } else {
-        // FORMAT TWO
-        splitCommand = arguments[0].split(".");
-        action = splitCommand.pop();
-        service = splitCommand.join(".");
-        actionArgs = Array.prototype.splice.call(arguments, 1);
-    }
-    
-    // Start building the command object.
-    var command = {
-        className: service,
-        methodName: action,
-        arguments: []
-    };
-
-    // Register the callbacks and add the callbackId to the positional
-    // arguments if given.
-    if (successCallback || failCallback) {
-        callbackId = service + PhoneGap.callbackId++;
-        PhoneGap.callbacks[callbackId] = 
-            {success:successCallback, fail:failCallback};
-    }
-    if (callbackId != null) {
-        command.arguments.push(callbackId);
-    }
-
-    for (var i = 0; i < actionArgs.length; ++i) {
-        var arg = actionArgs[i];
-        if (arg == undefined || arg == null) {
-            continue;
-        } else if (typeof(arg) == 'object') {
-            command.options = arg;
-        } else {
-            command.arguments.push(arg);
-        }
-    }
-
-    // Stringify and queue the command. We stringify to command now to
-    // effectively clone the command arguments in case they are mutated before
-    // the command is executed.
-    PhoneGap.commandQueue.push(JSON.stringify(command));
-
-    // If the queue length is 1, then that means it was empty before we queued
-    // the given command, so let the native side know that we have some
-    // commands to execute, unless the queue is currently being flushed, in
-    // which case the command will be picked up without notification.
-    if (PhoneGap.commandQueue.length == 1 && !PhoneGap.commandQueueFlushing) {
-        if (!PhoneGap.gapBridge) {
-            PhoneGap.gapBridge = PhoneGap.createGapBridge();
-        }
-
-        PhoneGap.gapBridge.src = "gap://ready";
-    }
-}
-
-/**
- * Called by native code to retrieve all queued commands and clear the queue.
- */
-PhoneGap.getAndClearQueuedCommands = function() {
-  json = JSON.stringify(PhoneGap.commandQueue);
-  PhoneGap.commandQueue = [];
-  return json;
-}
-
-/**
- * Called by native code when returning successful result from an action.
- *
- * @param callbackId
- * @param args
- *        args.status - PhoneGap.callbackStatus
- *        args.message - return value
- *        args.keepCallback - 0 to remove callback, 1 to keep callback in PhoneGap.callbacks[]
- */
-PhoneGap.callbackSuccess = function(callbackId, args) {
-    if (PhoneGap.callbacks[callbackId]) {
-
-        // If result is to be sent to callback
-        if (args.status == PhoneGap.callbackStatus.OK) {
-            try {
-                if (PhoneGap.callbacks[callbackId].success) {
-                       PhoneGap.callbacks[callbackId].success(args.message);
-                }
-            }
-            catch (e) {
-                console.log("Error in success callback: "+callbackId+" = "+e);
-            }
-        }
-    
-        // Clear callback if not expecting any more results
-        if (!args.keepCallback) {
-            delete PhoneGap.callbacks[callbackId];
-        }
-    }
-};
-
-/**
- * Called by native code when returning error result from an action.
- *
- * @param callbackId
- * @param args
- */
-PhoneGap.callbackError = function(callbackId, args) {
-    if (PhoneGap.callbacks[callbackId]) {
-        try {
-            if (PhoneGap.callbacks[callbackId].fail) {
-                PhoneGap.callbacks[callbackId].fail(args.message);
-            }
-        }
-        catch (e) {
-            console.log("Error in error callback: "+callbackId+" = "+e);
-        }
-        
-        // Clear callback if not expecting any more results
-        if (!args.keepCallback) {
-            delete PhoneGap.callbacks[callbackId];
-        }
-    }
-};
-
-
-/**
- * Does a deep clone of the object.
- *
- * @param obj
- * @return
- */
-PhoneGap.clone = function(obj) {
-    if(!obj) { 
-        return obj;
-    }
-
-    if(obj instanceof Array){
-        var retVal = new Array();
-        for(var i = 0; i < obj.length; ++i){
-            retVal.push(PhoneGap.clone(obj[i]));
-        }
-        return retVal;
-    }
-
-    if (obj instanceof Function) {
-        return obj;
-    }
-
-    if(!(obj instanceof Object)){
-        return obj;
-    }
-    
-    if (obj instanceof Date) {
-        return obj;
-    }
-
-    retVal = new Object();
-    for(i in obj){
-        if(!(i in retVal) || retVal[i] != obj[i]) {
-            retVal[i] = PhoneGap.clone(obj[i]);
-        }
-    }
-    return retVal;
-};
-
-// Intercept calls to document.addEventListener 
-PhoneGap.m_document_addEventListener = document.addEventListener;
-
-// Intercept calls to window.addEventListener
-PhoneGap.m_window_addEventListener = window.addEventListener;
-
-/**
- * Add a custom window event handler.
- *
- * @param {String} event            The event name that callback handles
- * @param {Function} callback       The event handler
- */
-PhoneGap.addWindowEventHandler = function(event, callback) {
-    PhoneGap.windowEventHandler[event] = callback;
-}
-
-/**
- * Add a custom document event handler.
- *
- * @param {String} event            The event name that callback handles
- * @param {Function} callback       The event handler
- */
-PhoneGap.addDocumentEventHandler = function(event, callback) {
-    PhoneGap.documentEventHandler[event] = callback;
-}
-
-/**
- * Intercept adding document event listeners and handle our own
- *
- * @param {Object} evt
- * @param {Function} handler
- * @param capture
- */
-document.addEventListener = function(evt, handler, capture) {
-    var e = evt.toLowerCase();
-           
-    // If subscribing to an event that is handled by a plugin
-    if (typeof PhoneGap.documentEventHandler[e] !== "undefined") {
-        if (PhoneGap.documentEventHandler[e](e, handler, true)) {
-            return; // Stop default behavior
-        }
-    }
-    
-    PhoneGap.m_document_addEventListener.call(document, evt, handler, capture); 
-};
-
-/**
- * Intercept adding window event listeners and handle our own
- *
- * @param {Object} evt
- * @param {Function} handler
- * @param capture
- */
-window.addEventListener = function(evt, handler, capture) {
-    var e = evt.toLowerCase();
-        
-    // If subscribing to an event that is handled by a plugin
-    if (typeof PhoneGap.windowEventHandler[e] !== "undefined") {
-        if (PhoneGap.windowEventHandler[e](e, handler, true)) {
-            return; // Stop default behavior
-        }
-    }
-        
-    PhoneGap.m_window_addEventListener.call(window, evt, handler, capture);
-};
-
-// Intercept calls to document.removeEventListener and watch for events that
-// are generated by PhoneGap native code
-PhoneGap.m_document_removeEventListener = document.removeEventListener;
-
-// Intercept calls to window.removeEventListener
-PhoneGap.m_window_removeEventListener = window.removeEventListener;
-
-/**
- * Intercept removing document event listeners and handle our own
- *
- * @param {Object} evt
- * @param {Function} handler
- * @param capture
- */
-document.removeEventListener = function(evt, handler, capture) {
-    var e = evt.toLowerCase();
-
-    // If unsubcribing from an event that is handled by a plugin
-    if (typeof PhoneGap.documentEventHandler[e] !== "undefined") {
-        if (PhoneGap.documentEventHandler[e](e, handler, false)) {
-            return; // Stop default behavior
-        }
-    }
-
-    PhoneGap.m_document_removeEventListener.call(document, evt, handler, capture);
-};
-
-/**
- * Intercept removing window event listeners and handle our own
- *
- * @param {Object} evt
- * @param {Function} handler
- * @param capture
- */
-window.removeEventListener = function(evt, handler, capture) {
-    var e = evt.toLowerCase();
-
-    // If unsubcribing from an event that is handled by a plugin
-    if (typeof PhoneGap.windowEventHandler[e] !== "undefined") {
-        if (PhoneGap.windowEventHandler[e](e, handler, false)) {
-            return; // Stop default behavior
-        }
-    }
-
-    PhoneGap.m_window_removeEventListener.call(window, evt, handler, capture);
-};
-
-/**
- * Method to fire document event
- *
- * @param {String} type             The event type to fire
- * @param {Object} data             Data to send with event
- */
-PhoneGap.fireDocumentEvent = function(type, data) {
-    var e = document.createEvent('Events');
-    e.initEvent(type);
-    if (data) {
-        for (var i in data) {
-            e[i] = data[i];
-        }
-    }
-    document.dispatchEvent(e);
-};
-
-/**
- * Method to fire window event
- *
- * @param {String} type             The event type to fire
- * @param {Object} data             Data to send with event
- */
-PhoneGap.fireWindowEvent = function(type, data) {
-    var e = document.createEvent('Events');
-    e.initEvent(type);
-    if (data) {
-        for (var i in data) {
-            e[i] = data[i];
-        }
-    }
-    window.dispatchEvent(e);
-};
-
-/**
- * Method to fire event from native code
- * Leaving this generic version to handle problems with iOS 3.x. Is currently used by orientation and battery events
- * Remove when iOS 3.x no longer supported and call fireWindowEvent or fireDocumentEvent directly
- */
-PhoneGap.fireEvent = function(type, target, data) {
-    var e = document.createEvent('Events');
-    e.initEvent(type);
-    if (data) {
-        for (var i in data) {
-            e[i] = data[i];
-        }
-    }
-    target = target || document;
-    if (target.dispatchEvent === undefined) { // ie window.dispatchEvent is undefined in iOS 3.x
-        target = document;
-    } 
-
-    target.dispatchEvent(e);
-};
-/**
- * Create a UUID
- *
- * @return
- */
-PhoneGap.createUUID = function() {
-    return PhoneGap.UUIDcreatePart(4) + '-' +
-        PhoneGap.UUIDcreatePart(2) + '-' +
-        PhoneGap.UUIDcreatePart(2) + '-' +
-        PhoneGap.UUIDcreatePart(2) + '-' +
-        PhoneGap.UUIDcreatePart(6);
-};
-
-PhoneGap.UUIDcreatePart = function(length) {
-    var uuidpart = "";
-    for (var i=0; i<length; i++) {
-        var uuidchar = parseInt((Math.random() * 256)).toString(16);
-        if (uuidchar.length == 1) {
-            uuidchar = "0" + uuidchar;
-        }
-        uuidpart += uuidchar;
-    }
-    return uuidpart;
-};
-};
-
-
-if (!PhoneGap.hasResource("debugconsole")) {
-	PhoneGap.addResource("debugconsole");
-	
-/**
- * This class provides access to the debugging console.
- * @constructor
- */
-var DebugConsole = function() {
-    this.winConsole = window.console;
-    this.logLevel = DebugConsole.INFO_LEVEL;
-}
-
-// from most verbose, to least verbose
-DebugConsole.ALL_LEVEL    = 1; // same as first level
-DebugConsole.INFO_LEVEL   = 1;
-DebugConsole.WARN_LEVEL   = 2;
-DebugConsole.ERROR_LEVEL  = 4;
-DebugConsole.NONE_LEVEL   = 8;
-													
-DebugConsole.prototype.setLevel = function(level) {
-    this.logLevel = level;
-};
-
-/**
- * Utility function for rendering and indenting strings, or serializing
- * objects to a string capable of being printed to the console.
- * @param {Object|String} message The string or object to convert to an indented string
- * @private
- */
-DebugConsole.prototype.processMessage = function(message, maxDepth) {
-	if (maxDepth === undefined) maxDepth = 0;
-    if (typeof(message) != 'object') {
-        return (this.isDeprecated ? "WARNING: debug object is deprecated, please use console object \n" + message : message);
-    } else {
-        /**
-         * @function
-         * @ignore
-         */
-        function indent(str) {
-            return str.replace(/^/mg, "    ");
-        }
-        /**
-         * @function
-         * @ignore
-         */
-        function makeStructured(obj, depth) {
-            var str = "";
-            for (var i in obj) {
-                try {
-                    if (typeof(obj[i]) == 'object' && depth < maxDepth) {
-                        str += i + ":\n" + indent(makeStructured(obj[i])) + "\n";
-                    } else {
-                        str += i + " = " + indent(String(obj[i])).replace(/^    /, "") + "\n";
-                    }
-                } catch(e) {
-                    str += i + " = EXCEPTION: " + e.message + "\n";
-                }
-            }
-            return str;
-        }
-        
-        return ("Object:\n" + makeStructured(message, maxDepth));
-    }
-};
-
-/**
- * Print a normal log message to the console
- * @param {Object|String} message Message or object to print to the console
- */
-DebugConsole.prototype.log = function(message, maxDepth) {
-    if (PhoneGap.available && this.logLevel <= DebugConsole.INFO_LEVEL)
-        PhoneGap.exec(null, null, 'com.phonegap.debugconsole', 'log',
-            [ this.processMessage(message, maxDepth), { logLevel: 'INFO' } ]
-        );
-    else
-        this.winConsole.log(message);
-};
-
-/**
- * Print a warning message to the console
- * @param {Object|String} message Message or object to print to the console
- */
-DebugConsole.prototype.warn = function(message, maxDepth) {
-    if (PhoneGap.available && this.logLevel <= DebugConsole.WARN_LEVEL)
-    	PhoneGap.exec(null, null, 'com.phonegap.debugconsole', 'log',
-            [ this.processMessage(message, maxDepth), { logLevel: 'WARN' } ]
-        );
-    else
-        this.winConsole.error(message);
-};
-
-/**
- * Print an error message to the console
- * @param {Object|String} message Message or object to print to the console
- */
-DebugConsole.prototype.error = function(message, maxDepth) {
-    if (PhoneGap.available && this.logLevel <= DebugConsole.ERROR_LEVEL)
-		PhoneGap.exec(null, null, 'com.phonegap.debugconsole', 'log',
-            [ this.processMessage(message, maxDepth), { logLevel: 'ERROR' } ]
-        );
-    else
-        this.winConsole.error(message);
-};
-
-PhoneGap.addConstructor(function() {
-    window.console = new DebugConsole();
-});
-};
-if (!PhoneGap.hasResource("position")) {
-	PhoneGap.addResource("position");
-
-/**
- * This class contains position information.
- * @param {Object} lat
- * @param {Object} lng
- * @param {Object} acc
- * @param {Object} alt
- * @param {Object} altAcc
- * @param {Object} head
- * @param {Object} vel
- * @constructor
- */
-Position = function(coords, timestamp) {
-	this.coords = Coordinates.cloneFrom(coords);
-    this.timestamp = timestamp || new Date().getTime();
-};
-
-Position.prototype.equals = function(other) {
-    return (this.coords && other && other.coords &&
-            this.coords.latitude == other.coords.latitude &&
-            this.coords.longitude == other.coords.longitude);
-};
-
-Position.prototype.clone = function()
-{
-    return new Position(
-        this.coords? this.coords.clone() : null,
-        this.timestamp? this.timestamp : new Date().getTime()
-    );
-}
-
-Coordinates = function(lat, lng, alt, acc, head, vel, altAcc) {
-	/**
-	 * The latitude of the position.
-	 */
-	this.latitude = lat;
-	/**
-	 * The longitude of the position,
-	 */
-	this.longitude = lng;
-	/**
-	 * The altitude of the position.
-	 */
-	this.altitude = alt;
-	/**
-	 * The accuracy of the position.
-	 */
-	this.accuracy = acc;
-	/**
-	 * The direction the device is moving at the position.
-	 */
-	this.heading = head;
-	/**
-	 * The velocity with which the device is moving at the position.
-	 */
-	this.speed = vel;
-	/**
-	 * The altitude accuracy of the position.
-	 */
-	this.altitudeAccuracy = (altAcc != 'undefined') ? altAcc : null; 
-};
-
-Coordinates.prototype.clone = function()
-{
-    return new Coordinates(
-        this.latitude,
-        this.longitude,
-        this.altitude,
-        this.accuracy,
-        this.heading,
-        this.speed,
-        this.altitudeAccuracy
-    );
-};
-
-Coordinates.cloneFrom = function(obj)
-{
-    return new Coordinates(
-        obj.latitude,
-        obj.longitude,
-        obj.altitude,
-        obj.accuracy,
-        obj.heading,
-        obj.speed,
-        obj.altitudeAccuracy
-    );
-};
-
-/**
- * This class specifies the options for requesting position data.
- * @constructor
- */
-PositionOptions = function(enableHighAccuracy, timeout, maximumAge) {
-	/**
-	 * Specifies the desired position accuracy.
-	 */
-	this.enableHighAccuracy = enableHighAccuracy || false;
-	/**
-	 * The timeout after which if position data cannot be obtained the errorCallback
-	 * is called.
-	 */
-	this.timeout = timeout || 10000;
-	/**
-     * The age of a cached position whose age is no greater than the specified time 
-     * in milliseconds. 
-     */
-	this.maximumAge = maximumAge || 0;
-	
-	if (this.maximumAge < 0) {
-		this.maximumAge = 0;
-	}
-};
-
-/**
- * This class contains information about any GPS errors.
- * @constructor
- */
-PositionError = function(code, message) {
-	this.code = code || 0;
-	this.message = message || "";
-};
-
-PositionError.UNKNOWN_ERROR = 0;
-PositionError.PERMISSION_DENIED = 1;
-PositionError.POSITION_UNAVAILABLE = 2;
-PositionError.TIMEOUT = 3;
-
-};if (!PhoneGap.hasResource("acceleration")) {
-	PhoneGap.addResource("acceleration");
- 	
-
-/**
- * This class contains acceleration information
- * @constructor
- * @param {Number} x The force applied by the device in the x-axis.
- * @param {Number} y The force applied by the device in the y-axis.
- * @param {Number} z The force applied by the device in the z-axis.
- */
-Acceleration = function(x, y, z) {
-	/**
-	 * The force applied by the device in the x-axis.
-	 */
-	this.x = x;
-	/**
-	 * The force applied by the device in the y-axis.
-	 */
-	this.y = y;
-	/**
-	 * The force applied by the device in the z-axis.
-	 */
-	this.z = z;
-	/**
-	 * The time that the acceleration was obtained.
-	 */
-	this.timestamp = new Date().getTime();
-}
-
-/**
- * This class specifies the options for requesting acceleration data.
- * @constructor
- */
-AccelerationOptions = function() {
-	/**
-	 * The timeout after which if acceleration data cannot be obtained the errorCallback
-	 * is called.
-	 */
-	this.timeout = 10000;
-}
-};if (!PhoneGap.hasResource("accelerometer")) {
-	PhoneGap.addResource("accelerometer");
-
-/**
- * This class provides access to device accelerometer data.
- * @constructor
- */
-Accelerometer = function() 
-{
-	/**
-	 * The last known acceleration.
-	 */
-	this.lastAcceleration = new Acceleration(0,0,0);
-}
-
-/**
- * Asynchronously aquires the current acceleration.
- * @param {Function} successCallback The function to call when the acceleration
- * data is available
- * @param {Function} errorCallback The function to call when there is an error 
- * getting the acceleration data.
- * @param {AccelerationOptions} options The options for getting the accelerometer data
- * such as timeout.
- */
-Accelerometer.prototype.getCurrentAcceleration = function(successCallback, errorCallback, options) {
-	// If the acceleration is available then call success
-	// If the acceleration is not available then call error
-	
-	// Created for iPhone, Iphone passes back _accel obj litteral
-	if (typeof successCallback == "function") {
-		successCallback(this.lastAcceleration);
-	}
-};
-
-// private callback called from Obj-C by name
-Accelerometer.prototype._onAccelUpdate = function(x,y,z)
-{
-   this.lastAcceleration = new Acceleration(x,y,z);
-};
-
-/**
- * Asynchronously aquires the acceleration repeatedly at a given interval.
- * @param {Function} successCallback The function to call each time the acceleration
- * data is available
- * @param {Function} errorCallback The function to call when there is an error 
- * getting the acceleration data.
- * @param {AccelerationOptions} options The options for getting the accelerometer data
- * such as timeout.
- */
-
-Accelerometer.prototype.watchAcceleration = function(successCallback, errorCallback, options) {
-	//this.getCurrentAcceleration(successCallback, errorCallback, options);
-	// TODO: add the interval id to a list so we can clear all watches
- 	var frequency = (options != undefined && options.frequency != undefined) ? options.frequency : 10000;
-	var updatedOptions = {
-		desiredFrequency:frequency 
-	}
-	PhoneGap.exec(null, null, "com.phonegap.accelerometer", "start", [options]);
-
-	return setInterval(function() {
-		navigator.accelerometer.getCurrentAcceleration(successCallback, errorCallback, options);
-	}, frequency);
-};
-
-/**
- * Clears the specified accelerometer watch.
- * @param {String} watchId The ID of the watch returned from #watchAcceleration.
- */
-Accelerometer.prototype.clearWatch = function(watchId) {
-	PhoneGap.exec(null, null, "com.phonegap.accelerometer", "stop", []);
-	clearInterval(watchId);
-};
-
-Accelerometer.install = function()
-{
-    if (typeof navigator.accelerometer == "undefined") {
-		navigator.accelerometer = new Accelerometer();
-	}
-};
-
-Accelerometer.installDeviceMotionHandler = function()
-{
-	if (!(window.DeviceMotionEvent == undefined)) {
-		// supported natively, so we don't have to add support
-		return;
-	}	
-	
-	var self = this;
-	var devicemotionEvent = 'devicemotion';
-	self.deviceMotionWatchId = null;
-	self.deviceMotionListenerCount = 0;
-	self.deviceMotionLastEventTimestamp = 0;
-	
-	// backup original `window.addEventListener`, `window.removeEventListener`
-    var _addEventListener = window.addEventListener;
-    var _removeEventListener = window.removeEventListener;
-													
-	var windowDispatchAvailable = !(window.dispatchEvent === undefined); // undefined in iOS 3.x
-													
-	var accelWin = function(acceleration) {
-		var evt = document.createEvent('Events');
-	    evt.initEvent(devicemotionEvent);
-	
-		evt.acceleration = null; // not all devices have gyroscope, don't care for now if we actually have it.
-		evt.rotationRate = null; // not all devices have gyroscope, don't care for now if we actually have it:
-		evt.accelerationIncludingGravity = acceleration; // accelerometer, all iOS devices have it
-		
-		var currentTime = new Date().getTime();
-		evt.interval =  (self.deviceMotionLastEventTimestamp == 0) ? 0 : (currentTime - self.deviceMotionLastEventTimestamp);
-		self.deviceMotionLastEventTimestamp = currentTime;
-		
-		if (windowDispatchAvailable) {
-			window.dispatchEvent(evt);
-		} else {
-			document.dispatchEvent(evt);
-		}
-	};
-	
-	var accelFail = function() {
-		
-	};
-													
-    // override `window.addEventListener`
-    window.addEventListener = function() {
-        if (arguments[0] === devicemotionEvent) {
-            ++(self.deviceMotionListenerCount);
-			if (self.deviceMotionListenerCount == 1) { // start
-				self.deviceMotionWatchId = navigator.accelerometer.watchAcceleration(accelWin, accelFail, { frequency:500});
-			}
-		} 
-													
-		if (!windowDispatchAvailable) {
-			return document.addEventListener.apply(this, arguments);
-		} else {
-			return _addEventListener.apply(this, arguments);
-		}
-    };	
-
-    // override `window.removeEventListener'
-    window.removeEventListener = function() {
-        if (arguments[0] === devicemotionEvent) {
-            --(self.deviceMotionListenerCount);
-			if (self.deviceMotionListenerCount == 0) { // stop
-				navigator.accelerometer.clearWatch(self.deviceMotionWatchId);
-			}
-		} 
-		
-		if (!windowDispatchAvailable) {
-			return document.removeEventListener.apply(this, arguments);
-		} else {
-			return _removeEventListener.apply(this, arguments);
-		}
-    };	
-};
-
-
-PhoneGap.addConstructor(Accelerometer.install);
-PhoneGap.addConstructor(Accelerometer.installDeviceMotionHandler);
-
-};
-if (!PhoneGap.hasResource("battery")) {
-PhoneGap.addResource("battery");
-
-/**
- * This class contains information about the current battery status.
- * @constructor
- */
-var Battery = function() {
-    this._level = null;
-    this._isPlugged = null;
-    this._batteryListener = [];
-    this._lowListener = [];
-    this._criticalListener = [];
-};
-
-/**
- * Registers as an event producer for battery events.
- * 
- * @param {Object} eventType
- * @param {Object} handler
- * @param {Object} add
- */
-Battery.prototype.eventHandler = function(eventType, handler, add) {
-    var me = navigator.battery;
-    if (add) {
-        // If there are no current registered event listeners start the battery listener on native side.
-        if (me._batteryListener.length === 0 && me._lowListener.length === 0 && me._criticalListener.length === 0) {
-            PhoneGap.exec(me._status, me._error, "com.phonegap.battery", "start", []);
-        }
-        
-        // Register the event listener in the proper array
-        if (eventType === "batterystatus") {
-            var pos = me._batteryListener.indexOf(handler);
-            if (pos === -1) {
-            	me._batteryListener.push(handler);
-            }
-        } else if (eventType === "batterylow") {
-            var pos = me._lowListener.indexOf(handler);
-            if (pos === -1) {
-            	me._lowListener.push(handler);
-            }
-        } else if (eventType === "batterycritical") {
-            var pos = me._criticalListener.indexOf(handler);
-            if (pos === -1) {
-            	me._criticalListener.push(handler);
-            }
-        }
-    } else {
-        // Remove the event listener from the proper array
-        if (eventType === "batterystatus") {
-            var pos = me._batteryListener.indexOf(handler);
-            if (pos > -1) {
-                me._batteryListener.splice(pos, 1);        
-            }
-        } else if (eventType === "batterylow") {
-            var pos = me._lowListener.indexOf(handler);
-            if (pos > -1) {
-                me._lowListener.splice(pos, 1);        
-            }
-        } else if (eventType === "batterycritical") {
-            var pos = me._criticalListener.indexOf(handler);
-            if (pos > -1) {
-                me._criticalListener.splice(pos, 1);        
-            }
-        }
-        
-        // If there are no more registered event listeners stop the battery listener on native side.
-        if (me._batteryListener.length === 0 && me._lowListener.length === 0 && me._criticalListener.length === 0) {
-            PhoneGap.exec(null, null, "com.phonegap.battery", "stop", []);
-        }
-    }
-};
-
-/**
- * Callback for battery status
- * 
- * @param {Object} info			keys: level, isPlugged
- */
-Battery.prototype._status = function(info) {
-	if (info) {
-		var me = this;
-		if (me._level != info.level || me._isPlugged != info.isPlugged) {
-			// Fire batterystatus event
-			//PhoneGap.fireWindowEvent("batterystatus", info);
-			// use this workaround since iOS 3.x does have window.dispatchEvent
-			PhoneGap.fireEvent("batterystatus", window, info);	
-
-			// Fire low battery event
-			if (info.level == 20 || info.level == 5) {
-				if (info.level == 20) {
-					//PhoneGap.fireWindowEvent("batterylow", info);
-					// use this workaround since iOS 3.x does not have window.dispatchEvent
-					PhoneGap.fireEvent("batterylow", window, info);
-				}
-				else {
-					//PhoneGap.fireWindowEvent("batterycritical", info);
-					// use this workaround since iOS 3.x does not have window.dispatchEvent
-					PhoneGap.fireEvent("batterycritical", window, info);
-				}
-			}
-		}
-		me._level = info.level;
-		me._isPlugged = info.isPlugged;	
-	}
-};
-
-/**
- * Error callback for battery start
- */
-Battery.prototype._error = function(e) {
-    console.log("Error initializing Battery: " + e);
-};
-
-PhoneGap.addConstructor(function() {
-    if (typeof navigator.battery === "undefined") {
-        navigator.battery = new Battery();
-        PhoneGap.addWindowEventHandler("batterystatus", navigator.battery.eventHandler);
-        PhoneGap.addWindowEventHandler("batterylow", navigator.battery.eventHandler);
-        PhoneGap.addWindowEventHandler("batterycritical", navigator.battery.eventHandler);
-    }
-});
-}if (!PhoneGap.hasResource("camera")) {
-	PhoneGap.addResource("camera");
-	
-
-/**
- * This class provides access to the device camera.
- * @constructor
- */
-Camera = function() {
-	
-}
-/**
- *  Available Camera Options
- *  {boolean} allowEdit - true to allow editing image, default = false
- *	{number} quality 0-100 (low to high) default =  100
- *  {Camera.DestinationType} destinationType default = DATA_URL
- *	{Camera.PictureSourceType} sourceType default = CAMERA
- *	{number} targetWidth - width in pixels to scale image default = 0 (no scaling)
- *  {number} targetHeight - height in pixels to scale image default = 0 (no scaling)
- *  {Camera.EncodingType} - encodingType default = JPEG
- *  {boolean} correctOrientation - Rotate the image to correct for the orientation of the device during capture (iOS only)
- *  {boolean} saveToPhotoAlbum - Save the image to the photo album on the device after capture (iOS only)
- */
-/**
- * Format of image that is returned from getPicture.
- *
- * Example: navigator.camera.getPicture(success, fail,
- *              { quality: 80,
- *                destinationType: Camera.DestinationType.DATA_URL,
- *                sourceType: Camera.PictureSourceType.PHOTOLIBRARY})
- */
-Camera.DestinationType = {
-    DATA_URL: 0,                // Return base64 encoded string
-    FILE_URI: 1                 // Return file uri 
-};
-Camera.prototype.DestinationType = Camera.DestinationType;
-
-/**
- * Source to getPicture from.
- *
- * Example: navigator.camera.getPicture(success, fail,
- *              { quality: 80,
- *                destinationType: Camera.DestinationType.DATA_URL,
- *                sourceType: Camera.PictureSourceType.PHOTOLIBRARY})
- */
-Camera.PictureSourceType = {
-    PHOTOLIBRARY : 0,           // Choose image from picture library 
-    CAMERA : 1,                 // Take picture from camera
-    SAVEDPHOTOALBUM : 2         // Choose image from picture library 
-};
-Camera.prototype.PictureSourceType = Camera.PictureSourceType;
-
-/** 
- * Encoding of image returned from getPicture. 
- * 
- * Example: navigator.camera.getPicture(success, fail, 
- *              { quality: 80, 
- *                destinationType: Camera.DestinationType.DATA_URL, 
- *                sourceType: Camera.PictureSourceType.CAMERA, 
- *                encodingType: Camera.EncodingType.PNG}) 
- */ 
-Camera.EncodingType = { 
-	JPEG: 0,                    // Return JPEG encoded image 
-	PNG: 1                      // Return PNG encoded image 
-};
-Camera.prototype.EncodingType = Camera.EncodingType;
-
-/** 
- * Type of pictures to select from.  Only applicable when
- *	PictureSourceType is PHOTOLIBRARY or SAVEDPHOTOALBUM 
- * 
- * Example: navigator.camera.getPicture(success, fail, 
- *              { quality: 80, 
- *                destinationType: Camera.DestinationType.DATA_URL, 
- *                sourceType: Camera.PictureSourceType.PHOTOLIBRARY, 
- *                mediaType: Camera.MediaType.PICTURE}) 
- */ 
-Camera.MediaType = { 
-	PICTURE: 0,             // allow selection of still pictures only. DEFAULT. Will return format specified via DestinationType
-	VIDEO: 1,                // allow selection of video only, ONLY RETURNS URL
-	ALLMEDIA : 2			// allow selection from all media types
-};
-Camera.prototype.MediaType = Camera.MediaType;
-
-/**
- * Gets a picture from source defined by "options.sourceType", and returns the
- * image as defined by the "options.destinationType" option.
-
- * The defaults are sourceType=CAMERA and destinationType=DATA_URL.
- *
- * @param {Function} successCallback
- * @param {Function} errorCallback
- * @param {Object} options
- */
-Camera.prototype.getPicture = function(successCallback, errorCallback, options) {
-	// successCallback required
-	if (typeof successCallback != "function") {
-        console.log("Camera Error: successCallback is not a function");
-        return;
-    }
-
-    // errorCallback optional
-    if (errorCallback && (typeof errorCallback != "function")) {
-        console.log("Camera Error: errorCallback is not a function");
-        return;
-    }
-	
-	PhoneGap.exec(successCallback, errorCallback, "com.phonegap.camera","getPicture",[options]);
-};
-
-
-
-PhoneGap.addConstructor(function() {
-    if (typeof navigator.camera == "undefined") navigator.camera = new Camera();
-});
-};
-
-if (!PhoneGap.hasResource("device")) {
-	PhoneGap.addResource("device");
-
-/**
- * this represents the mobile device, and provides properties for inspecting the model, version, UUID of the
- * phone, etc.
- * @constructor
- */
-Device = function() 
-{
-    this.platform = null;
-    this.version  = null;
-    this.name     = null;
-    this.phonegap      = null;
-    this.uuid     = null;
-    try 
-	{      
-		this.platform = DeviceInfo.platform;
-		this.version  = DeviceInfo.version;
-		this.name     = DeviceInfo.name;
-		this.phonegap = DeviceInfo.gap;
-		this.uuid     = DeviceInfo.uuid;
-
-    } 
-	catch(e) 
-	{
-        // TODO: 
-    }
-	this.available = PhoneGap.available = this.uuid != null;
-}
-
-PhoneGap.addConstructor(function() {
-	if (typeof navigator.device === "undefined") {
-    	navigator.device = window.device = new Device();
-	}
-});
-};
-if (!PhoneGap.hasResource("capture")) {
-	PhoneGap.addResource("capture");
-/**
- * The CaptureError interface encapsulates all errors in the Capture API.
- */
-function CaptureError() {
-   this.code = null;
-};
-
-// Capture error codes
-CaptureError.CAPTURE_INTERNAL_ERR = 0;
-CaptureError.CAPTURE_APPLICATION_BUSY = 1;
-CaptureError.CAPTURE_INVALID_ARGUMENT = 2;
-CaptureError.CAPTURE_NO_MEDIA_FILES = 3;
-CaptureError.CAPTURE_NOT_SUPPORTED = 20;
-
-/**
- * The Capture interface exposes an interface to the camera and microphone of the hosting device.
- */
-function Capture() {
-	this.supportedAudioModes = [];
-	this.supportedImageModes = [];
-	this.supportedVideoModes = [];
-};
-
-/**
- * Launch audio recorder application for recording audio clip(s).
- * 
- * @param {Function} successCB
- * @param {Function} errorCB
- * @param {CaptureAudioOptions} options
- *
- * No audio recorder to launch for iOS - return CAPTURE_NOT_SUPPORTED
- */
-Capture.prototype.captureAudio = function(successCallback, errorCallback, options) {
-	/*if (errorCallback && typeof errorCallback === "function") {
-		errorCallback({
-				"code": CaptureError.CAPTURE_NOT_SUPPORTED
-			});
-	}*/
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.mediacapture", "captureAudio", [options]);
-};
-
-/**
- * Launch camera application for taking image(s).
- * 
- * @param {Function} successCB
- * @param {Function} errorCB
- * @param {CaptureImageOptions} options
- */
-Capture.prototype.captureImage = function(successCallback, errorCallback, options) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.mediacapture", "captureImage", [options]);
-};
-
-/**
- * Casts a PluginResult message property  (array of objects) to an array of MediaFile objects
- * (used in Objective-C)
- *
- * @param {PluginResult} pluginResult
- */
-Capture.prototype._castMediaFile = function(pluginResult) {
-    var mediaFiles = [];
-    var i;
-    for (i=0; i<pluginResult.message.length; i++) {
-        var mediaFile = new MediaFile();
-	    mediaFile.name = pluginResult.message[i].name;
-	    mediaFile.fullPath = pluginResult.message[i].fullPath;
-	    mediaFile.type = pluginResult.message[i].type;
-	    mediaFile.lastModifiedDate = pluginResult.message[i].lastModifiedDate;
-	    mediaFile.size = pluginResult.message[i].size;
-        mediaFiles.push(mediaFile);
-    }
-    pluginResult.message = mediaFiles;
-    return pluginResult;
-};
-
-/**
- * Launch device camera application for recording video(s).
- * 
- * @param {Function} successCB
- * @param {Function} errorCB
- * @param {CaptureVideoOptions} options
- */
-Capture.prototype.captureVideo = function(successCallback, errorCallback, options) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.mediacapture", "captureVideo", [options]);
-};
-
-/**
- * Encapsulates a set of parameters that the capture device supports.
- */
-function ConfigurationData() {
-    // The ASCII-encoded string in lower case representing the media type. 
-    this.type; 
-    // The height attribute represents height of the image or video in pixels. 
-    // In the case of a sound clip this attribute has value 0. 
-    this.height = 0;
-    // The width attribute represents width of the image or video in pixels. 
-    // In the case of a sound clip this attribute has value 0
-    this.width = 0;
-};
-
-/**
- * Encapsulates all image capture operation configuration options.
- */
-var CaptureImageOptions = function() {
-    // Upper limit of images user can take. Value must be equal or greater than 1.
-    this.limit = 1; 
-    // The selected image mode. Must match with one of the elements in supportedImageModes array.
-    this.mode = null; 
-};
-
-/**
- * Encapsulates all video capture operation configuration options.
- */
-var CaptureVideoOptions = function() {
-    // Upper limit of videos user can record. Value must be equal or greater than 1.
-    this.limit = 1;
-    // Maximum duration of a single video clip in seconds.
-    this.duration = 0;
-    // The selected video mode. Must match with one of the elements in supportedVideoModes array.
-    this.mode = null;
-};
-
-/**
- * Encapsulates all audio capture operation configuration options.
- */
-var CaptureAudioOptions = function() {
-    // Upper limit of sound clips user can record. Value must be equal or greater than 1.
-    this.limit = 1;
-    // Maximum duration of a single sound clip in seconds.
-    this.duration = 0;
-    // The selected audio mode. Must match with one of the elements in supportedAudioModes array.
-    this.mode = null;
-};
-
-/**
- * Represents a single file.
- * 
- * name {DOMString} name of the file, without path information
- * fullPath {DOMString} the full path of the file, including the name
- * type {DOMString} mime type
- * lastModifiedDate {Date} last modified date
- * size {Number} size of the file in bytes
- */
-function MediaFile(name, fullPath, type, lastModifiedDate, size) {
-    this.name = name || null;
-    this.fullPath = fullPath || null;
-    this.type = type || null;
-    this.lastModifiedDate = lastModifiedDate || null;
-    this.size = size || 0;
-}
-
-/**
- * Request capture format data for a specific file and type
- * 
- * @param {Function} successCB
- * @param {Function} errorCB
- */
-MediaFile.prototype.getFormatData = function(successCallback, errorCallback) {
-	if (typeof this.fullPath === "undefined" || this.fullPath === null) {
-		errorCallback({
-				"code": CaptureError.CAPTURE_INVALID_ARGUMENT
-			});
-	} else {
-    	PhoneGap.exec(successCallback, errorCallback, "com.phonegap.mediacapture", "getFormatData", [this.fullPath, this.type]);
-	}	
-};
-
-/**
- * MediaFileData encapsulates format information of a media file.
- * 
- * @param {DOMString} codecs
- * @param {long} bitrate
- * @param {long} height
- * @param {long} width
- * @param {float} duration
- */
-function MediaFileData(codecs, bitrate, height, width, duration) {
-    this.codecs = codecs || null;
-    this.bitrate = bitrate || 0;
-    this.height = height || 0;
-    this.width = width || 0;
-    this.duration = duration || 0;
-}
-
-PhoneGap.addConstructor(function() {
-    if (typeof navigator.device === "undefined") {
-        navigator.device = window.device = new Device();
-    }
-    if (typeof navigator.device.capture === "undefined") {
-        navigator.device.capture = window.device.capture = new Capture();
-    }
-});
-};
-if (!PhoneGap.hasResource("contact")) {
-	PhoneGap.addResource("contact");
-
-
-/**
-* Contains information about a single contact.
-* @param {DOMString} id unique identifier
-* @param {DOMString} displayName
-* @param {ContactName} name
-* @param {DOMString} nickname
-* @param {ContactField[]} phoneNumbers array of phone numbers
-* @param {ContactField[]} emails array of email addresses
-* @param {ContactAddress[]} addresses array of addresses
-* @param {ContactField[]} ims instant messaging user ids
-* @param {ContactOrganization[]} organizations
-* @param {DOMString} birthday contact's birthday
-* @param {DOMString} note user notes about contact
-* @param {ContactField[]} photos
-* @param {Array.<ContactField>} categories
-* @param {ContactField[]} urls contact's web sites
-*/
-var Contact = function(id, displayName, name, nickname, phoneNumbers, emails, addresses,
-    ims, organizations, birthday, note, photos, categories, urls) {
-    this.id = id || null;
-    this.displayName = displayName || null;
-    this.name = name || null; // ContactName
-    this.nickname = nickname || null;
-    this.phoneNumbers = phoneNumbers || null; // ContactField[]
-    this.emails = emails || null; // ContactField[]
-    this.addresses = addresses || null; // ContactAddress[]
-    this.ims = ims || null; // ContactField[]
-    this.organizations = organizations || null; // ContactOrganization[]
-    this.birthday = birthday || null; // JS Date
-    this.note = note || null;
-    this.photos = photos || null; // ContactField[]
-    this.categories = categories || null; 
-    this.urls = urls || null; // ContactField[]
-};
-
-/**
-* Converts Dates to milliseconds before sending to iOS
-*/
-Contact.prototype.convertDatesOut = function()
-{
-	var dates = new Array("birthday");
-	for (var i=0; i<dates.length; i++){
-		var value = this[dates[i]];
-		if (value){
-			if (!value instanceof Date){
-				try {
-					value = new Date(value);
-				} catch(exception){
-					value = null;
-				}
-			}
-			if (value instanceof Date){
-				value = value.valueOf();
-			}
-			this[dates[i]] = value;
-		}
-	}
-	
-};
-/**
-* Converts milliseconds to JS Date when returning from iOS
-*/
-Contact.prototype.convertDatesIn = function()
-{
-	var dates = new Array("birthday");
-	for (var i=0; i<dates.length; i++){
-		var value = this[dates[i]];
-		if (value){
-			try {
-				this[dates[i]] = new Date(parseFloat(value));
-			} catch (exception){
-				console.log("exception creating date");
-			}
-		}
-	}
-};
-/**
-* Removes contact from device storage.
-* @param successCB success callback
-* @param errorCB error callback (optional)
-*/
-Contact.prototype.remove = function(successCB, errorCB) {
-	if (this.id == null) {
-        var errorObj = new ContactError();
-        errorObj.code = ContactError.UNKNOWN_ERROR;
-        errorCB(errorObj);
-    }
-    else {
-        PhoneGap.exec(successCB, errorCB, "com.phonegap.contacts", "remove", [{ "contact": this}]);
-    }
-};
-/**
-* iOS ONLY
-* displays contact via iOS UI
-*	NOT part of W3C spec so no official documentation
-*
-* @param errorCB error callback
-* @param options object
-*	allowsEditing: boolean AS STRING
-*		"true" to allow editing the contact
-*		"false" (default) display contact
-*/
-Contact.prototype.display = function(errorCB, options) { 
-	if (this.id == null) {
-        if (typeof errorCB == "function") {
-        	var errorObj = new ContactError();
-        	errorObj.code = ContactError.UNKNOWN_ERROR;
-        	errorCB(errorObj);
-		}
-    }
-    else {
-        PhoneGap.exec(null, errorCB, "com.phonegap.contacts","displayContact", [this.id, options]);
-    }
-};
-
-/**
-* Creates a deep copy of this Contact.
-* With the contact ID set to null.
-* @return copy of this Contact
-*/
-Contact.prototype.clone = function() {
-    var clonedContact = PhoneGap.clone(this);
-    clonedContact.id = null;
-    // Loop through and clear out any id's in phones, emails, etc.
-    if (clonedContact.phoneNumbers) {
-    	for (i=0; i<clonedContact.phoneNumbers.length; i++) {
-    		clonedContact.phoneNumbers[i].id = null;
-    	}
-    }
-    if (clonedContact.emails) {
-    	for (i=0; i<clonedContact.emails.length; i++) {
-    		clonedContact.emails[i].id = null;
-    	}
-    }
-    if (clonedContact.addresses) {
-    	for (i=0; i<clonedContact.addresses.length; i++) {
-    		clonedContact.addresses[i].id = null;
-    	}
-    }
-    if (clonedContact.ims) {
-    	for (i=0; i<clonedContact.ims.length; i++) {
-    		clonedContact.ims[i].id = null;
-    	}
-    }
-    if (clonedContact.organizations) {
-    	for (i=0; i<clonedContact.organizations.length; i++) {
-    		clonedContact.organizations[i].id = null;
-    	}
-    }
-    if (clonedContact.photos) {
-    	for (i=0; i<clonedContact.photos.length; i++) {
-    		clonedContact.photos[i].id = null;
-    	}
-    }
-    if (clonedContact.urls) {
-    	for (i=0; i<clonedContact.urls.length; i++) {
-    		clonedContact.urls[i].id = null;
-    	}
-    }
-    return clonedContact;
-};
-
-/**
-* Persists contact to device storage.
-* @param successCB success callback
-* @param errorCB error callback - optional
-*/
-Contact.prototype.save = function(successCB, errorCB) {
-	// don't modify the original contact
-	var cloned = PhoneGap.clone(this);
-	cloned.convertDatesOut(); 
-	PhoneGap.exec(successCB, errorCB, "com.phonegap.contacts","save", [{"contact": cloned}]);
-};
-
-/**
-* Contact name.
-* @param formatted
-* @param familyName
-* @param givenName
-* @param middle
-* @param prefix
-* @param suffix
-*/
-var ContactName = function(formatted, familyName, givenName, middle, prefix, suffix) {
-    this.formatted = formatted != "undefined" ? formatted : null;
-    this.familyName = familyName != "undefined" ? familyName : null;
-    this.givenName = givenName != "undefined" ? givenName : null;
-    this.middleName = middle != "undefined" ? middle : null;
-    this.honorificPrefix = prefix != "undefined" ? prefix : null;
-    this.honorificSuffix = suffix != "undefined" ? suffix : null;
-};
-
-/**
-* Generic contact field.
-* @param type
-* @param value
-* @param pref
-* @param id
-*/
-var ContactField = function(type, value, pref, id) {
-    this.type = type != "undefined" ? type : null;
-    this.value = value != "undefined" ? value : null;
-    this.pref = pref != "undefined" ? pref : null;
-    this.id = id != "undefined" ? id : null;
-};
-
-/**
-* Contact address.
-* @param pref - boolean is primary / preferred address
-* @param type - string - work, home…..
-* @param formatted
-* @param streetAddress
-* @param locality
-* @param region
-* @param postalCode
-* @param country
-*/
-var ContactAddress = function(pref, type, formatted, streetAddress, locality, region, postalCode, country, id) {
-	this.pref = pref != "undefined" ? pref : null;
-	this.type = type != "undefined" ? type : null;
-    this.formatted = formatted != "undefined" ? formatted : null;
-    this.streetAddress = streetAddress != "undefined" ? streetAddress : null;
-    this.locality = locality != "undefined" ? locality : null;
-    this.region = region != "undefined" ? region : null;
-    this.postalCode = postalCode != "undefined" ? postalCode : null;
-    this.country = country != "undefined" ? country : null;
-    this.id = id != "undefined" ? id : null;
-};
-
-/**
-* Contact organization.
-* @param pref - boolean is primary / preferred address
-* @param type - string - work, home…..
-* @param name
-* @param dept
-* @param title
-*/
-var ContactOrganization = function(pref, type, name, dept, title) {
-	this.pref = pref != "undefined" ? pref : null;
-	this.type = type != "undefined" ? type : null;
-    this.name = name != "undefined" ? name : null;
-    this.department = dept != "undefined" ? dept : null;
-    this.title = title != "undefined" ? title : null;
-};
-
-/**
-* Contact account.
-* @param domain
-* @param username
-* @param userid
-*/
-/*var ContactAccount = function(domain, username, userid) {
-    this.domain = domain != "undefined" ? domain : null;
-    this.username = username != "undefined" ? username : null;
-    this.userid = userid != "undefined" ? userid : null;
-}*/
-
-/**
-* Represents a group of Contacts.
-*/
-var Contacts = function() {
-    this.inProgress = false;
-    this.records = new Array();
-};
-/**
-* Returns an array of Contacts matching the search criteria.
-* @param fields that should be searched
-* @param successCB success callback
-* @param errorCB error callback (optional)
-* @param {ContactFindOptions} options that can be applied to contact searching
-* @return array of Contacts matching search criteria
-*/
-Contacts.prototype.find = function(fields, successCB, errorCB, options) {
-	if (successCB === null) {
-        throw new TypeError("You must specify a success callback for the find command.");
-    }
-    if (fields === null || fields === "undefined" || fields.length === "undefined" || fields.length <= 0) {
-    	if (typeof errorCB === "function") {
-			errorCB({"code": ContactError.INVALID_ARGUMENT_ERROR});
-    	}
-    } else {
-		PhoneGap.exec(successCB, errorCB, "com.phonegap.contacts","search", [{"fields":fields, "findOptions":options}]);
-    }
-};
-/**
-* need to turn the array of JSON strings representing contact objects into actual objects
-* @param array of JSON strings with contact data
-* @return call results callback with array of Contact objects
-*  This function is called from objective C Contacts.search() method.
-*/
-Contacts.prototype._findCallback = function(pluginResult) {
-	var contacts = new Array();
-	try {
-		for (var i=0; i<pluginResult.message.length; i++) {
-			var newContact = navigator.contacts.create(pluginResult.message[i]); 
-			newContact.convertDatesIn();
-			contacts.push(newContact);
-		}
-		pluginResult.message = contacts;
-	} catch(e){
-			console.log("Error parsing contacts: " +e);
-	}
-	return pluginResult;
-}
-
-/**
-* need to turn the JSON string representing contact object into actual object
-* @param JSON string with contact data
-* Call stored results function with  Contact object
-*  This function is called from objective C Contacts remove and save methods
-*/
-Contacts.prototype._contactCallback = function(pluginResult)
-{
-	var newContact = null;
-	if (pluginResult.message){
-		try {
-			newContact = navigator.contacts.create(pluginResult.message);
-			newContact.convertDatesIn();
-		} catch(e){
-			console.log("Error parsing contact");
-		}
-	}
-	pluginResult.message = newContact;
-	return pluginResult;
-	
-};
-/** 
-* Need to return an error object rather than just a single error code
-* @param error code
-* Call optional error callback if found.
-* Called from objective c find, remove, and save methods on error.
-*/
-Contacts.prototype._errCallback = function(pluginResult)
-{
-	var errorObj = new ContactError();
-   	errorObj.code = pluginResult.message;
-	pluginResult.message = errorObj;
-	return pluginResult;
-};
-// iPhone only api to create a new contact via the GUI
-Contacts.prototype.newContactUI = function(successCallback) { 
-    PhoneGap.exec(successCallback, null, "com.phonegap.contacts","newContact", []);
-};
-// iPhone only api to select a contact via the GUI
-Contacts.prototype.chooseContact = function(successCallback, options) {
-    PhoneGap.exec(successCallback, null, "com.phonegap.contacts","chooseContact", options);
-};
-
-
-/**
-* This function creates a new contact, but it does not persist the contact
-* to device storage. To persist the contact to device storage, invoke
-* contact.save().
-* @param properties an object who's properties will be examined to create a new Contact
-* @returns new Contact object
-*/
-Contacts.prototype.create = function(properties) {
-    var i;
-    var contact = new Contact();
-    for (i in properties) {
-        if (contact[i] !== 'undefined') {
-            contact[i] = properties[i];
-        }
-    }
-    return contact;
-};
-
-/**
- * ContactFindOptions.
- * @param filter used to match contacts against
- * @param multiple boolean used to determine if more than one contact should be returned
- */
-var ContactFindOptions = function(filter, multiple, updatedSince) {
-    this.filter = filter || '';
-    this.multiple = multiple || false;
-};
-
-/**
- *  ContactError.
- *  An error code assigned by an implementation when an error has occurred
- */
-var ContactError = function() {
-    this.code=null;
-};
-
-/**
- * Error codes
- */
-ContactError.UNKNOWN_ERROR = 0;
-ContactError.INVALID_ARGUMENT_ERROR = 1;
-ContactError.TIMEOUT_ERROR = 2;
-ContactError.PENDING_OPERATION_ERROR = 3;
-ContactError.IO_ERROR = 4;
-ContactError.NOT_SUPPORTED_ERROR = 5;
-ContactError.PERMISSION_DENIED_ERROR = 20;
-
-/**
- * Add the contact interface into the browser.
- */
-PhoneGap.addConstructor(function() { 
-    if(typeof navigator.contacts == "undefined") {
-    	navigator.contacts = new Contacts();
-    }
-});
-};
-if (!PhoneGap.hasResource("file")) {
-	PhoneGap.addResource("file");
-
-/**
- * This class provides generic read and write access to the mobile device file system.
- * They are not used to read files from a server.
- */
-
-/**
- * This class provides some useful information about a file.
- * This is the fields returned when navigator.fileMgr.getFileProperties() 
- * is called.
- */
-FileProperties = function(filePath) {
-    this.filePath = filePath;
-    this.size = 0;
-    this.lastModifiedDate = null;
-}
-/**
- * Represents a single file.
- * 
- * name {DOMString} name of the file, without path information
- * fullPath {DOMString} the full path of the file, including the name
- * type {DOMString} mime type
- * lastModifiedDate {Date} last modified date
- * size {Number} size of the file in bytes
- */
-File = function(name, fullPath, type, lastModifiedDate, size) {
-	this.name = name || null;
-    this.fullPath = fullPath || null;
-	this.type = type || null;
-    this.lastModifiedDate = lastModifiedDate || null;
-    this.size = size || 0;
-}
-/**
- * Create an event object since we can't set target on DOM event.
- *
- * @param type
- * @param target
- *
- */
-File._createEvent = function(type, target) {
-    // Can't create event object, since we can't set target (its readonly)
-    //var evt = document.createEvent('Events');
-    //evt.initEvent("onload", false, false);
-    var evt = {"type": type};
-    evt.target = target;
-    return evt;
-};
-
-FileError = function() {
-   this.code = null;
-}
-
-// File error codes
-// Found in DOMException
-FileError.NOT_FOUND_ERR = 1;
-FileError.SECURITY_ERR = 2;
-FileError.ABORT_ERR = 3;
-
-// Added by this specification
-FileError.NOT_READABLE_ERR = 4;
-FileError.ENCODING_ERR = 5;
-FileError.NO_MODIFICATION_ALLOWED_ERR = 6;
-FileError.INVALID_STATE_ERR = 7;
-FileError.SYNTAX_ERR = 8;
-FileError.INVALID_MODIFICATION_ERR = 9;
-FileError.QUOTA_EXCEEDED_ERR = 10;
-FileError.TYPE_MISMATCH_ERR = 11;
-FileError.PATH_EXISTS_ERR = 12;
-
-//-----------------------------------------------------------------------------
-// File manager
-//-----------------------------------------------------------------------------
-
-FileMgr = function() {
-}
-
-FileMgr.prototype.testFileExists = function(fileName, successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "testFileExists", [fileName]);
-};
-
-FileMgr.prototype.testDirectoryExists = function(dirName, successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "testDirectoryExists", [dirName]);
-};
-
-FileMgr.prototype.getFreeDiskSpace = function(successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "getFreeDiskSpace", []);
-};
-
-FileMgr.prototype.write = function(fileName, data, position, successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "write", [fileName, data, position]);
-};
-
-FileMgr.prototype.truncate = function(fileName, size, successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "truncateFile", [fileName, size]);
-};
-
-FileMgr.prototype.readAsText = function(fileName, encoding, successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "readFile", [fileName, encoding]);
-};
-
-FileMgr.prototype.readAsDataURL = function(fileName, successCallback, errorCallback) {
-	PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "readAsDataURL", [fileName]);
-};
-
-PhoneGap.addConstructor(function() {
-    if (typeof navigator.fileMgr === "undefined") {
-        navigator.fileMgr = new FileMgr();
-    }
-});
-
-
-//-----------------------------------------------------------------------------
-// File Reader
-//-----------------------------------------------------------------------------
-
-/**
- * This class reads the mobile device file system.
- *
- */
-FileReader = function() {
-    this.fileName = "";
-
-    this.readyState = 0;
-
-    // File data
-    this.result = null;
-
-    // Error
-    this.error = null;
-
-    // Event handlers
-    this.onloadstart = null;    // When the read starts.
-    this.onprogress = null;     // While reading (and decoding) file or fileBlob data, and reporting partial file data (progess.loaded/progress.total)
-    this.onload = null;         // When the read has successfully completed.
-    this.onerror = null;        // When the read has failed (see errors).
-    this.onloadend = null;      // When the request has completed (either in success or failure).
-    this.onabort = null;        // When the read has been aborted. For instance, by invoking the abort() method.
-}
-
-// States
-FileReader.EMPTY = 0;
-FileReader.LOADING = 1;
-FileReader.DONE = 2;
-
-/**
- * Abort reading file.
- */
-FileReader.prototype.abort = function() {
-    var evt;
-    this.readyState = FileReader.DONE;
-    this.result = null;
-
-    // set error
-    var error = new FileError();
-    error.code = error.ABORT_ERR;
-    this.error = error;
-   
-    // If error callback
-    if (typeof this.onerror === "function") {
-        evt = File._createEvent("error", this);
-        this.onerror(evt);
-    }
-    // If abort callback
-    if (typeof this.onabort === "function") {
-        evt = File._createEvent("abort", this);
-        this.onabort(evt);
-    }
-    // If load end callback
-    if (typeof this.onloadend === "function") {
-        evt = File._createEvent("loadend", this);
-        this.onloadend(evt);
-    }
-};
-
-/**
- * Read text file.
- *
- * @param file          The name of the file
- * @param encoding      [Optional] (see http://www.iana.org/assignments/character-sets)
- */
-FileReader.prototype.readAsText = function(file, encoding) {
-    this.fileName = "";
-	if (typeof file.fullPath === "undefined") {
-		this.fileName = file;
-	} else {
-		this.fileName = file.fullPath;
-	}
-
-    // LOADING state
-    this.readyState = FileReader.LOADING;
-
-    // If loadstart callback
-    if (typeof this.onloadstart === "function") {
-        var evt = File._createEvent("loadstart", this);
-        this.onloadstart(evt);
-    }
-
-    // Default encoding is UTF-8
-    var enc = encoding ? encoding : "UTF-8";
-
-    var me = this;
-
-    // Read file
-    navigator.fileMgr.readAsText(this.fileName, enc,
-
-        // Success callback
-        function(r) {
-            var evt;
-
-            // If DONE (cancelled), then don't do anything
-            if (me.readyState === FileReader.DONE) {
-                return;
-            }
-
-            // Save result
-            me.result = decodeURIComponent(r);
-
-            // If onload callback
-            if (typeof me.onload === "function") {
-                evt = File._createEvent("load", me);
-                me.onload(evt);
-            }
-
-            // DONE state
-            me.readyState = FileReader.DONE;
-
-            // If onloadend callback
-            if (typeof me.onloadend === "function") {
-                evt = File._createEvent("loadend", me);
-                me.onloadend(evt);
-            }
-        },
-
-        // Error callback
-        function(e) {
-            var evt;
-            // If DONE (cancelled), then don't do anything
-            if (me.readyState === FileReader.DONE) {
-                return;
-            }
-
-            // Save error
-            me.error = e;
-
-            // If onerror callback
-            if (typeof me.onerror === "function") {
-                evt = File._createEvent("error", me);
-                me.onerror(evt);
-            }
-
-            // DONE state
-            me.readyState = FileReader.DONE;
-
-            // If onloadend callback
-            if (typeof me.onloadend === "function") {
-                evt = File._createEvent("loadend", me);
-                me.onloadend(evt);
-            }
-        }
-        );
-};
-
-
-/**
- * Read file and return data as a base64 encoded data url.
- * A data url is of the form:
- *      data:[<mediatype>][;base64],<data>
- *
- * @param file          {File} File object containing file properties
- */
-FileReader.prototype.readAsDataURL = function(file) {
-    this.fileName = "";
-    
-    if (typeof file.fullPath === "undefined") {
-        this.fileName = file;
-    } else {
-        this.fileName = file.fullPath;
-    }
-
-    // LOADING state
-    this.readyState = FileReader.LOADING;
-
-    // If loadstart callback
-    if (typeof this.onloadstart === "function") {
-        var evt = File._createEvent("loadstart", this);
-        this.onloadstart(evt);
-    }
-
-    var me = this;
-
-    // Read file
-    navigator.fileMgr.readAsDataURL(this.fileName,
-
-        // Success callback
-        function(r) {
-            var evt;
-
-            // If DONE (cancelled), then don't do anything
-            if (me.readyState === FileReader.DONE) {
-                return;
-            }
-
-            // Save result
-            me.result = r;
-
-            // If onload callback
-            if (typeof me.onload === "function") {
-                evt = File._createEvent("load", me);
-                me.onload(evt);
-            }
-
-            // DONE state
-            me.readyState = FileReader.DONE;
-
-            // If onloadend callback
-            if (typeof me.onloadend === "function") {
-                evt = File._createEvent("loadend", me);
-                me.onloadend(evt);
-            }
-        },
-
-        // Error callback
-        function(e) {
-            var evt;
-            // If DONE (cancelled), then don't do anything
-            if (me.readyState === FileReader.DONE) {
-                return;
-            }
-
-            // Save error
-            me.error = e;
-
-            // If onerror callback
-            if (typeof me.onerror === "function") {
-                evt = File._createEvent("error", me);
-                me.onerror(evt);
-            }
-
-            // DONE state
-            me.readyState = FileReader.DONE;
-
-            // If onloadend callback
-            if (typeof me.onloadend === "function") {
-                evt = File._createEvent("loadend", me);
-                me.onloadend(evt);
-            }
-        }
-        );
-};
-
-/**
- * Read file and return data as a binary data.
- *
- * @param file          The name of the file
- */
-FileReader.prototype.readAsBinaryString = function(file) {
-    // TODO - Can't return binary data to browser.
-    this.fileName = file;
-};
-
-/**
- * Read file and return data as a binary data.
- *
- * @param file          The name of the file
- */
-FileReader.prototype.readAsArrayBuffer = function(file) {
-    // TODO - Can't return binary data to browser.
-    this.fileName = file;
-};
-
-//-----------------------------------------------------------------------------
-// File Writer
-//-----------------------------------------------------------------------------
-
-/**
- * This class writes to the mobile device file system.
- *
-  @param file {File} a File object representing a file on the file system
-*/
-FileWriter = function(file) {
-    this.fileName = "";
-    this.length = 0;
-	if (file) {
-	    this.fileName = file.fullPath || file;
-	    this.length = file.size || 0;
-	}
-	
-	// default is to write at the beginning of the file
-    this.position = 0;
-    
-    this.readyState = 0; // EMPTY
-
-    this.result = null;
-
-    // Error
-    this.error = null;
-
-    // Event handlers
-    this.onwritestart = null;	// When writing starts
-    this.onprogress = null;		// While writing the file, and reporting partial file data
-    this.onwrite = null;		// When the write has successfully completed.
-    this.onwriteend = null;		// When the request has completed (either in success or failure).
-    this.onabort = null;		// When the write has been aborted. For instance, by invoking the abort() method.
-    this.onerror = null;		// When the write has failed (see errors).
-}
-
-// States
-FileWriter.INIT = 0;
-FileWriter.WRITING = 1;
-FileWriter.DONE = 2;
-
-/**
- * Abort writing file.
- */
-FileWriter.prototype.abort = function() {
-    // check for invalid state
-	if (this.readyState === FileWriter.DONE || this.readyState === FileWriter.INIT) {
-		throw FileError.INVALID_STATE_ERR;
-	} 
-
-    // set error
-    var error = new FileError(), evt;
-    error.code = error.ABORT_ERR;
-    this.error = error;
-    
-    // If error callback
-    if (typeof this.onerror === "function") {
-        evt = File._createEvent("error", this);
-        this.onerror(evt);
-    }
-    // If abort callback
-    if (typeof this.onabort === "function") {
-        evt = File._createEvent("abort", this);
-        this.onabort(evt);
-    }
-    
-    this.readyState = FileWriter.DONE;
-
-    // If write end callback
-    if (typeof this.onwriteend == "function") {
-        evt = File._createEvent("writeend", this);
-        this.onwriteend(evt);
-    }
-};
-
-/**
- * @Deprecated: use write instead
- * 
- * @param file to write the data to
- * @param text to be written
- * @param bAppend if true write to end of file, otherwise overwrite the file
- */
-FileWriter.prototype.writeAsText = function(file, text, bAppend) {
-	// Throw an exception if we are already writing a file
-	if (this.readyState === FileWriter.WRITING) {
-		throw FileError.INVALID_STATE_ERR;
-	}
-
-	if (bAppend !== true) {
-        bAppend = false; // for null values
-    }
-
-    this.fileName = file;
-
-    // WRITING state
-    this.readyState = FileWriter.WRITING;
-
-    var me = this;
-
-    // If onwritestart callback
-    if (typeof me.onwritestart === "function") {
-        var evt = File._createEvent("writestart", me);
-        me.onwritestart(evt);
-    }
-	
-	
-    // Write file 
-	navigator.fileMgr.writeAsText(file, text, bAppend,
-        // Success callback
-        function(r) {
-            var evt;
-
-            // If DONE (cancelled), then don't do anything
-            if (me.readyState === FileWriter.DONE) {
-                return;
-            }
-
-            // Save result
-            me.result = r;
-
-            // If onwrite callback
-            if (typeof me.onwrite === "function") {
-                evt = File._createEvent("write", me);
-                me.onwrite(evt);
-            }
-
-            // DONE state
-            me.readyState = FileWriter.DONE;
-
-            // If onwriteend callback
-            if (typeof me.onwriteend === "function") {
-                evt = File._createEvent("writeend", me);
-                me.onwriteend(evt);
-            }
-        },
-
-        // Error callback
-        function(e) {
-            var evt;
-
-            // If DONE (cancelled), then don't do anything
-            if (me.readyState === FileWriter.DONE) {
-                return;
-            }
-
-            // Save error
-            me.error = e;
-
-            // If onerror callback
-            if (typeof me.onerror === "function") {
-                evt = File._createEvent("error", me);
-                me.onerror(evt);
-            }
-
-            // DONE state
-            me.readyState = FileWriter.DONE;
-
-            // If onwriteend callback
-            if (typeof me.onwriteend === "function") {
-                evt = File._createEvent("writeend", me);
-                me.onwriteend(evt);
-            }
-        }
-    );
-};
-
-/**
- * Writes data to the file
- *  
- * @param text to be written
- */
-FileWriter.prototype.write = function(text) {
-	// Throw an exception if we are already writing a file
-	if (this.readyState === FileWriter.WRITING) {
-		throw FileError.INVALID_STATE_ERR;
-	}
-
-    // WRITING state
-    this.readyState = FileWriter.WRITING;
-
-    var me = this;
-
-    // If onwritestart callback
-    if (typeof me.onwritestart === "function") {
-        var evt = File._createEvent("writestart", me);
-        me.onwritestart(evt);
-    }
-
-    // Write file
-    navigator.fileMgr.write(this.fileName, text, this.position,
-
-        // Success callback
-        function(r) {
-            var evt;
-            // If DONE (cancelled), then don't do anything
-            if (me.readyState === FileWriter.DONE) {
-                return;
-            }
-
-            
-            // position always increases by bytes written because file would be extended
-            me.position += r;
-			// The length of the file is now where we are done writing.
-			me.length = me.position;
-            
-            // If onwrite callback
-            if (typeof me.onwrite === "function") {
-                evt = File._createEvent("write", me);
-                me.onwrite(evt);
-            }
-
-            // DONE state
-            me.readyState = FileWriter.DONE;
-
-            // If onwriteend callback
-            if (typeof me.onwriteend === "function") {
-                evt = File._createEvent("writeend", me);
-                me.onwriteend(evt);
-            }
-        },
-
-        // Error callback
-        function(e) {
-            var evt;
-
-            // If DONE (cancelled), then don't do anything
-            if (me.readyState === FileWriter.DONE) {
-                return;
-            }
-
-            // Save error
-            me.error = e;
-
-            // If onerror callback
-            if (typeof me.onerror === "function") {
-                evt = File._createEvent("error", me);
-                me.onerror(evt);
-            }
-
-            // DONE state
-            me.readyState = FileWriter.DONE;
-
-            // If onwriteend callback
-            if (typeof me.onwriteend === "function") {
-                evt = File._createEvent("writeend", me);
-                me.onwriteend(evt);
-            }
-        }
-        );
-
-};
-
-/** 
- * Moves the file pointer to the location specified.
- * 
- * If the offset is a negative number the position of the file 
- * pointer is rewound.  If the offset is greater than the file 
- * size the position is set to the end of the file.  
- * 
- * @param offset is the location to move the file pointer to.
- */
-FileWriter.prototype.seek = function(offset) {
-    // Throw an exception if we are already writing a file
-    if (this.readyState === FileWriter.WRITING) {
-        throw FileError.INVALID_STATE_ERR;
-    }
-
-    if (!offset) {
-        return;
-    }
-    
-    // See back from end of file.
-    if (offset < 0) {
-		this.position = Math.max(offset + this.length, 0);
-	}
-    // Offset is bigger then file size so set position 
-    // to the end of the file.
-	else if (offset > this.length) {
-		this.position = this.length;
-	}
-    // Offset is between 0 and file size so set the position
-    // to start writing.
-	else {
-		this.position = offset;
-	}	
-};
-
-/** 
- * Truncates the file to the size specified.
- * 
- * @param size to chop the file at.
- */
-FileWriter.prototype.truncate = function(size) {
-	// Throw an exception if we are already writing a file
-	if (this.readyState === FileWriter.WRITING) {
-		throw FileError.INVALID_STATE_ERR;
-	}
-	// what if no size specified? 
-
-    // WRITING state
-    this.readyState = FileWriter.WRITING;
-
-    var me = this;
-
-    // If onwritestart callback
-    if (typeof me.onwritestart === "function") {
-        var evt = File._createEvent("writestart", me);
-        me.onwritestart(evt);
-    }
-
-    // Write file
-    navigator.fileMgr.truncate(this.fileName, size,
-
-        // Success callback
-        function(r) {
-            var evt;
-            // If DONE (cancelled), then don't do anything
-            if (me.readyState === FileWriter.DONE) {
-                return;
-            }
-
-            // Update the length of the file
-            me.length = r;
-            me.position = Math.min(me.position, r);
-
-            // If onwrite callback
-            if (typeof me.onwrite === "function") {
-                evt = File._createEvent("write", me);
-                me.onwrite(evt);
-            }
-
-            // DONE state
-            me.readyState = FileWriter.DONE;
-
-            // If onwriteend callback
-            if (typeof me.onwriteend === "function") {
-                evt = File._createEvent("writeend", me);
-                me.onwriteend(evt);
-            }
-        },
-
-        // Error callback
-        function(e) {
-            var evt;
-            // If DONE (cancelled), then don't do anything
-            if (me.readyState === FileWriter.DONE) {
-                return;
-            }
-
-            // Save error
-            me.error = e;
-
-            // If onerror callback
-            if (typeof me.onerror === "function") {
-                evt = File._createEvent("error", me);
-                me.onerror(evt);
-            }
-
-            // DONE state
-            me.readyState = FileWriter.DONE;
-
-            // If onwriteend callback
-            if (typeof me.onwriteend === "function") {
-                evt = File._createEvent("writeend", me);
-                me.onwriteend(evt);
-            }
-        }
-    );
-};
-
-LocalFileSystem = function() {
-};
-
-// File error codes
-LocalFileSystem.TEMPORARY = 0;
-LocalFileSystem.PERSISTENT = 1;
-LocalFileSystem.RESOURCE = 2;
-LocalFileSystem.APPLICATION = 3;
-
-/**
- * Requests a filesystem in which to store application data.
- * 
- * @param {int} type of file system being requested
- * @param {Function} successCallback is called with the new FileSystem
- * @param {Function} errorCallback is called with a FileError
- */
-LocalFileSystem.prototype.requestFileSystem = function(type, size, successCallback, errorCallback) {
-	if (type < 0 || type > 3) {
-		if (typeof errorCallback == "function") {
-			errorCallback({
-				"code": FileError.SYNTAX_ERR
-			});
-		}
-	}
-	else {
-		PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "requestFileSystem", [type, size]);
-	}
-};
-
-/**
- * 
- * @param {DOMString} uri referring to a local file in a filesystem
- * @param {Function} successCallback is called with the new entry
- * @param {Function} errorCallback is called with a FileError
- */
-LocalFileSystem.prototype.resolveLocalFileSystemURI = function(uri, successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "resolveLocalFileSystemURI", [uri]);
-};
-
-/**
-* This function  is required as we need to convert raw 
-* JSON objects into concrete File and Directory objects.  
-* 
-* @param a JSON Objects that need to be converted to DirectoryEntry or FileEntry objects.
-* @returns an entry 
-*/
-LocalFileSystem.prototype._castFS = function(pluginResult) {
-    var entry = null;
-    entry = new DirectoryEntry();
-    entry.isDirectory = pluginResult.message.root.isDirectory;
-    entry.isFile = pluginResult.message.root.isFile;
-    entry.name = pluginResult.message.root.name;
-    entry.fullPath = pluginResult.message.root.fullPath;
-    pluginResult.message.root = entry;
-    return pluginResult;    
-}
-
-LocalFileSystem.prototype._castEntry = function(pluginResult) {
-    var entry = null;
-    if (pluginResult.message.isDirectory) {
-        entry = new DirectoryEntry();
-    }
-    else if (pluginResult.message.isFile) {
-		entry = new FileEntry();
-    }
-    entry.isDirectory = pluginResult.message.isDirectory;
-    entry.isFile = pluginResult.message.isFile;
-    entry.name = pluginResult.message.name;
-    entry.fullPath = pluginResult.message.fullPath;
-    pluginResult.message = entry;
-    return pluginResult;    
-}
-
-LocalFileSystem.prototype._castEntries = function(pluginResult) {
-    var entries = pluginResult.message;
-	var retVal = []; 
-	for (i=0; i<entries.length; i++) {
-		retVal.push(window.localFileSystem._createEntry(entries[i]));
-	}
-    pluginResult.message = retVal;
-    return pluginResult;    
-}
-
-LocalFileSystem.prototype._createEntry = function(castMe) {
-	var entry = null;
-    if (castMe.isDirectory) {
-        entry = new DirectoryEntry();
-    }
-    else if (castMe.isFile) {
-        entry = new FileEntry();
-    }
-    entry.isDirectory = castMe.isDirectory;
-    entry.isFile = castMe.isFile;
-    entry.name = castMe.name;
-    entry.fullPath = castMe.fullPath;
-    return entry;    
-
-}
-
-LocalFileSystem.prototype._castDate = function(pluginResult) {
-	if (pluginResult.message.modificationTime) {
-		var metadataObj = new Metadata();
-		
-	    metadataObj.modificationTime = new Date(pluginResult.message.modificationTime);
-	    pluginResult.message = metadataObj;
-	}
-	else if (pluginResult.message.lastModifiedDate) {
-		var file = new File();
-        file.size = pluginResult.message.size;
-        file.type = pluginResult.message.type;
-        file.name = pluginResult.message.name;
-        file.fullPath = pluginResult.message.fullPath;
-		file.lastModifiedDate = new Date(pluginResult.message.lastModifiedDate);
-	    pluginResult.message = file;		
-	}
-
-    return pluginResult;	
-}
-LocalFileSystem.prototype._castError = function(pluginResult) {
-	var fileError = new FileError();
-	fileError.code = pluginResult.message;
-	pluginResult.message = fileError;
-	return pluginResult;
-}
-
-/**
- * Information about the state of the file or directory
- * 
- * {Date} modificationTime (readonly)
- */
-Metadata = function() {
-    this.modificationTime=null;
-};
-
-/**
- * Supplies arguments to methods that lookup or create files and directories
- * 
- * @param {boolean} create file or directory if it doesn't exist 
- * @param {boolean} exclusive if true the command will fail if the file or directory exists
- */
-Flags = function(create, exclusive) {
-    this.create = create || false;
-    this.exclusive = exclusive || false;
-};
-
-/**
- * An interface representing a file system
- * 
- * {DOMString} name the unique name of the file system (readonly)
- * {DirectoryEntry} root directory of the file system (readonly)
- */
-FileSystem = function() {
-    this.name = null;
-    this.root = null;
-};
-
-/**
- * An interface representing a directory on the file system.
- * 
- * {boolean} isFile always false (readonly)
- * {boolean} isDirectory always true (readonly)
- * {DOMString} name of the directory, excluding the path leading to it (readonly)
- * {DOMString} fullPath the absolute full path to the directory (readonly)
- * {FileSystem} filesystem on which the directory resides (readonly)
- */
-DirectoryEntry = function() {
-    this.isFile = false;
-    this.isDirectory = true;
-    this.name = null;
-    this.fullPath = null;
-    this.filesystem = null;
-};
-
-/**
- * Copies a directory to a new location
- * 
- * @param {DirectoryEntry} parent the directory to which to copy the entry
- * @param {DOMString} newName the new name of the entry, defaults to the current name
- * @param {Function} successCallback is called with the new entry
- * @param {Function} errorCallback is called with a FileError
- */
-DirectoryEntry.prototype.copyTo = function(parent, newName, successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "copyTo", [this.fullPath, parent, newName]);
-};
-
-/**
- * Looks up the metadata of the entry
- * 
- * @param {Function} successCallback is called with a Metadata object
- * @param {Function} errorCallback is called with a FileError
- */
-DirectoryEntry.prototype.getMetadata = function(successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "getMetadata", [this.fullPath]);
-};
-
-/**
- * Gets the parent of the entry
- * 
- * @param {Function} successCallback is called with a parent entry
- * @param {Function} errorCallback is called with a FileError
- */
-DirectoryEntry.prototype.getParent = function(successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "getParent", [this.fullPath]);
-};
-
-/**
- * Moves a directory to a new location
- * 
- * @param {DirectoryEntry} parent the directory to which to move the entry
- * @param {DOMString} newName the new name of the entry, defaults to the current name
- * @param {Function} successCallback is called with the new entry
- * @param {Function} errorCallback is called with a FileError
- */
-DirectoryEntry.prototype.moveTo = function(parent, newName, successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "moveTo", [this.fullPath, parent, newName]);
-};
-
-/**
- * Removes the entry
- * 
- * @param {Function} successCallback is called with no parameters
- * @param {Function} errorCallback is called with a FileError
- */
-DirectoryEntry.prototype.remove = function(successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "remove", [this.fullPath]);
-};
-
-/**
- * Returns a URI that can be used to identify this entry.
- * 
- * @param {DOMString} mimeType for a FileEntry, the mime type to be used to interpret the file, when loaded through this URI.
- * @param {Function} successCallback is called with the new entry
- * @param {Function} errorCallback is called with a FileError
- */
-DirectoryEntry.prototype.toURI = function(mimeType, successCallback, errorCallback) {
-    return "file://localhost" + this.fullPath;
-    //PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "toURI", [this.fullPath, mimeType]);
-};
-
-/**
- * Creates a new DirectoryReader to read entries from this directory
- */
-DirectoryEntry.prototype.createReader = function(successCallback, errorCallback) {
-    return new DirectoryReader(this.fullPath);
-};
-
-/**
- * Creates or looks up a directory
- * 
- * @param {DOMString} path either a relative or absolute path from this directory in which to look up or create a directory
- * @param {Flags} options to create or excluively create the directory
- * @param {Function} successCallback is called with the new entry
- * @param {Function} errorCallback is called with a FileError
- */
-DirectoryEntry.prototype.getDirectory = function(path, options, successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "getDirectory", [this.fullPath, path, options]);
-};
-
-/**
- * Creates or looks up a file
- * 
- * @param {DOMString} path either a relative or absolute path from this directory in which to look up or create a file
- * @param {Flags} options to create or excluively create the file
- * @param {Function} successCallback is called with the new entry
- * @param {Function} errorCallback is called with a FileError
- */
-DirectoryEntry.prototype.getFile = function(path, options, successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "getFile", [this.fullPath, path, options]);
-};
-
-/**
- * Deletes a directory and all of it's contents
- * 
- * @param {Function} successCallback is called with no parameters
- * @param {Function} errorCallback is called with a FileError
- */
-DirectoryEntry.prototype.removeRecursively = function(successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "removeRecursively", [this.fullPath]);
-};
-
-/**
- * An interface that lists the files and directories in a directory.
- */
-DirectoryReader = function(fullPath){
-	this.fullPath = fullPath || null;    
-};
-
-/**
- * Returns a list of entries from a directory.
- * 
- * @param {Function} successCallback is called with a list of entries
- * @param {Function} errorCallback is called with a FileError
- */
-DirectoryReader.prototype.readEntries = function(successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "readEntries", [this.fullPath]);
-}
- 
-/**
- * An interface representing a directory on the file system.
- * 
- * {boolean} isFile always true (readonly)
- * {boolean} isDirectory always false (readonly)
- * {DOMString} name of the file, excluding the path leading to it (readonly)
- * {DOMString} fullPath the absolute full path to the file (readonly)
- * {FileSystem} filesystem on which the directory resides (readonly)
- */
-FileEntry = function() {
-    this.isFile = true;
-    this.isDirectory = false;
-    this.name = null;
-    this.fullPath = null;
-    this.filesystem = null;
-};
-
-/**
- * Copies a file to a new location
- * 
- * @param {DirectoryEntry} parent the directory to which to copy the entry
- * @param {DOMString} newName the new name of the entry, defaults to the current name
- * @param {Function} successCallback is called with the new entry
- * @param {Function} errorCallback is called with a FileError
- */
-FileEntry.prototype.copyTo = function(parent, newName, successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "copyTo", [this.fullPath, parent, newName]);
-};
-
-/**
- * Looks up the metadata of the entry
- * 
- * @param {Function} successCallback is called with a Metadata object
- * @param {Function} errorCallback is called with a FileError
- */
-FileEntry.prototype.getMetadata = function(successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "getMetadata", [this.fullPath]);
-};
-
-/**
- * Gets the parent of the entry
- * 
- * @param {Function} successCallback is called with a parent entry
- * @param {Function} errorCallback is called with a FileError
- */
-FileEntry.prototype.getParent = function(successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "getParent", [this.fullPath]);
-};
-
-/**
- * Moves a directory to a new location
- * 
- * @param {DirectoryEntry} parent the directory to which to move the entry
- * @param {DOMString} newName the new name of the entry, defaults to the current name
- * @param {Function} successCallback is called with the new entry
- * @param {Function} errorCallback is called with a FileError
- */
-FileEntry.prototype.moveTo = function(parent, newName, successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "moveTo", [this.fullPath, parent, newName]);
-};
-
-/**
- * Removes the entry
- * 
- * @param {Function} successCallback is called with no parameters
- * @param {Function} errorCallback is called with a FileError
- */
-FileEntry.prototype.remove = function(successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "remove", [this.fullPath]);
-};
-
-/**
- * Returns a URI that can be used to identify this entry.
- * 
- * @param {DOMString} mimeType for a FileEntry, the mime type to be used to interpret the file, when loaded through this URI.
- * @param {Function} successCallback is called with the new entry
- * @param {Function} errorCallback is called with a FileError
- */
-FileEntry.prototype.toURI = function(mimeType, successCallback, errorCallback) {
-    return "file://localhost" + this.fullPath;
-    //PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "toURI", [this.fullPath, mimeType]);
-};
-
-/**
- * Creates a new FileWriter associated with the file that this FileEntry represents.
- * 
- * @param {Function} successCallback is called with the new FileWriter
- * @param {Function} errorCallback is called with a FileError
- */
-FileEntry.prototype.createWriter = function(successCallback, errorCallback) {
-	this.file(function(filePointer) {	
-		var writer = new FileWriter(filePointer);
-		if (writer.fileName == null || writer.fileName == "") {
-			if (typeof errorCallback == "function") {
-				errorCallback({
-					"code": FileError.INVALID_STATE_ERR
-				});
-		}
-		}
-		if (typeof successCallback == "function") {
-			successCallback(writer);
-		}       
-	}, errorCallback);
-};
-
-/**
- * Returns a File that represents the current state of the file that this FileEntry represents.
- * 
- * @param {Function} successCallback is called with the new File object
- * @param {Function} errorCallback is called with a FileError
- */
-FileEntry.prototype.file = function(successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "getFileMetadata", [this.fullPath]);
-};
-
-/**
- * Add the FileSystem interface into the browser.
- */
-PhoneGap.addConstructor(function() {
-	var pgLocalFileSystem = new LocalFileSystem();
-	// Needed for cast methods
-    if(typeof window.localFileSystem == "undefined") window.localFileSystem  = pgLocalFileSystem;
-    if(typeof window.requestFileSystem == "undefined") window.requestFileSystem  = pgLocalFileSystem.requestFileSystem;
-    if(typeof window.resolveLocalFileSystemURI == "undefined") window.resolveLocalFileSystemURI = pgLocalFileSystem.resolveLocalFileSystemURI;
-});
-};
-
-
-
-
-/*
- * Copyright (c) 2011, Matt Kane
- */
-
-if (!PhoneGap.hasResource("filetransfer")) {
-	PhoneGap.addResource("filetransfer");
-
-/**
- * FileTransfer uploads a file to a remote server.
- */
-FileTransfer = function() {}
-
-/**
- * FileUploadResult
- */
-FileUploadResult = function() {
-    this.bytesSent = 0;
-    this.responseCode = null;
-    this.response = null;
-}
-
-/**
- * FileTransferError
- */
-FileTransferError = function(errorCode) {
-    this.code = errorCode || null;
-}
-
-FileTransferError.FILE_NOT_FOUND_ERR = 1;
-FileTransferError.INVALID_URL_ERR = 2;
-FileTransferError.CONNECTION_ERR = 3;
-
-/**
-* Given an absolute file path, uploads a file on the device to a remote server 
-* using a multipart HTTP request.
-* @param filePath {String}           Full path of the file on the device
-* @param server {String}             URL of the server to receive the file
-* @param successCallback (Function}  Callback to be invoked when upload has completed
-* @param errorCallback {Function}    Callback to be invoked upon error
-* @param options {FileUploadOptions} Optional parameters such as file name and mimetype           
-*/
-FileTransfer.prototype.upload = function(filePath, server, successCallback, errorCallback, options) {
-	if(!options.params) {
-		options.params = {};
-	}
-	options.filePath = filePath;
-	options.server = server;
-	if(!options.fileKey) {
-		options.fileKey = 'file';
-	}
-	if(!options.fileName) {
-		options.fileName = 'image.jpg';
-	}
-	if(!options.mimeType) {
-		options.mimeType = 'image/jpeg';
-	}
-	
-	// successCallback required
-	if (typeof successCallback != "function") {
-        console.log("FileTransfer Error: successCallback is not a function");
-        return;
-    }
-
-
-    // errorCallback optional
-    if (errorCallback && (typeof errorCallback != "function")) {
-        console.log("FileTransfer Error: errorCallback is not a function");
-        return;
-    }
-	
-    PhoneGap.exec(successCallback, errorCallback, 'com.phonegap.filetransfer', 'upload', [options]);
-};
-
-FileTransfer.prototype._castTransferError = function(pluginResult) {
-	var fileError = new FileTransferError(pluginResult.message);
-	//fileError.code = pluginResult.message;
-	pluginResult.message = fileError;
-	return pluginResult;
-}
-
-FileTransfer.prototype._castUploadResult = function(pluginResult) {
-	var result = new FileUploadResult();
-	result.bytesSent = pluginResult.message.bytesSent;
-	result.responseCode = pluginResult.message.responseCode;
-	result.response = decodeURIComponent(pluginResult.message.response);
-	pluginResult.message = result;
-	return pluginResult;
-}
-
-/**
- * Downloads a file form a given URL and saves it to the specified directory.
- * @param source {String}          URL of the server to receive the file
- * @param target {String}         Full path of the file on the device
- * @param successCallback (Function}  Callback to be invoked when upload has completed
- * @param errorCallback {Function}    Callback to be invoked upon error
- */
-FileTransfer.prototype.download = function(source, target, successCallback, errorCallback) {
-	PhoneGap.exec(successCallback, errorCallback, 'com.phonegap.filetransfer', 'download', [source, target]);
-};
-
-/**
- * Options to customize the HTTP request used to upload files.
- * @param fileKey {String}   Name of file request parameter.
- * @param fileName {String}  Filename to be used by the server. Defaults to image.jpg.
- * @param mimeType {String}  Mimetype of the uploaded file. Defaults to image/jpeg.
- * @param params {Object}    Object with key: value params to send to the server.
- */
-FileUploadOptions = function(fileKey, fileName, mimeType, params) {
-    this.fileKey = fileKey || null;
-    this.fileName = fileName || null;
-    this.mimeType = mimeType || null;
-    this.params = params || null;
-}
-
-
-PhoneGap.addConstructor(function() {
-    if (typeof navigator.fileTransfer == "undefined") navigator.fileTransfer = new FileTransfer();
-});
-};
-if (!PhoneGap.hasResource("geolocation")) {
-	PhoneGap.addResource("geolocation");
-
-/**
- * This class provides access to device GPS data.
- * @constructor
- */
-Geolocation = function() {
-    // The last known GPS position.
-    this.lastPosition = null;
-    this.listener = null;
-    this.timeoutTimerId = 0;
-
-};
-
-
-/**
- * Asynchronously aquires the current position.
- * @param {Function} successCallback The function to call when the position
- * data is available
- * @param {Function} errorCallback The function to call when there is an error 
- * getting the position data.
- * @param {PositionOptions} options The options for getting the position data
- * such as timeout.
- * PositionOptions.forcePrompt:Bool default false, 
- * - tells iPhone to prompt the user to turn on location services.
- * - may cause your app to exit while the user is sent to the Settings app
- * PositionOptions.distanceFilter:double aka Number
- * - used to represent a distance in meters.
-PositionOptions
-{
-   desiredAccuracy:Number
-   - a distance in meters 
-		< 10   = best accuracy  ( Default value )
-		< 100  = Nearest Ten Meters
-		< 1000 = Nearest Hundred Meters
-		< 3000 = Accuracy Kilometers
-		3000+  = Accuracy 3 Kilometers
-		
-	forcePrompt:Boolean default false ( iPhone Only! )
-    - tells iPhone to prompt the user to turn on location services.
-	- may cause your app to exit while the user is sent to the Settings app
-	
-	distanceFilter:Number
-	- The minimum distance (measured in meters) a device must move laterally before an update event is generated.
-	- measured relative to the previously delivered location
-	- default value: null ( all movements will be reported )
-	
-}
-
- */
- 
-Geolocation.prototype.getCurrentPosition = function(successCallback, errorCallback, options) 
-{
-    // create an always valid local success callback
-    var win = successCallback;
-    if (!win || typeof(win) != 'function')
-    {
-        win = function(position) {};
-    }
-    
-    // create an always valid local error callback
-    var fail = errorCallback;
-    if (!fail || typeof(fail) != 'function')
-    {
-        fail = function(positionError) {};
-    }	
-
-    var self = this;
-    var totalTime = 0;
-	var timeoutTimerId;
-	
-	// set params to our default values
-	var params = new PositionOptions();
-	
-    if (options) 
-    {
-        if (options.maximumAge) 
-        {
-            // special case here if we have a cached value that is younger than maximumAge
-            if(this.lastPosition)
-            {
-                var now = new Date().getTime();
-                if((now - this.lastPosition.timestamp) < options.maximumAge)
-                {
-                    win(this.lastPosition); // send cached position immediately 
-                    return;                 // Note, execution stops here -jm
-                }
-            }
-            params.maximumAge = options.maximumAge;
-        }
-        if (options.enableHighAccuracy) 
-        {
-            params.enableHighAccuracy = (options.enableHighAccuracy == true); // make sure it's truthy
-        }
-        if (options.timeout) 
-        {
-            params.timeout = options.timeout;
-        }
-    }
-
-    var successListener = win;
-    var failListener = fail;
-    if (!this.locationRunning)
-    {
-        successListener = function(position)
-        { 
-            win(position);
-            self.stop();
-        };
-        errorListener = function(positionError)
-        { 
-            fail(positionError);
-            self.stop();
-        };
-    }
-    
-    this.listener = {"success":successListener,"fail":failListener};
-    this.start(params);
-	
-	var onTimeout = function()
-	{
-	    self.setError(new PositionError(PositionError.TIMEOUT,"Geolocation Error: Timeout."));
-	};
-
-    clearTimeout(this.timeoutTimerId);
-    this.timeoutTimerId = setTimeout(onTimeout, params.timeout); 
-};
-
-/**
- * Asynchronously aquires the position repeatedly at a given interval.
- * @param {Function} successCallback The function to call each time the position
- * data is available
- * @param {Function} errorCallback The function to call when there is an error 
- * getting the position data.
- * @param {PositionOptions} options The options for getting the position data
- * such as timeout and the frequency of the watch.
- */
-Geolocation.prototype.watchPosition = function(successCallback, errorCallback, options) {
-	// Invoke the appropriate callback with a new Position object every time the implementation 
-	// determines that the position of the hosting device has changed. 
-
-	var self = this; // those == this & that
-	
-	var params = new PositionOptions();
-
-    if(options)
-    {
-        if (options.maximumAge) {
-            params.maximumAge = options.maximumAge;
-        }
-        if (options.enableHighAccuracy) {
-            params.enableHighAccuracy = options.enableHighAccuracy;
-        }
-        if (options.timeout) {
-            params.timeout = options.timeout;
-        }
-    }
-
-	var that = this;
-    var lastPos = that.lastPosition? that.lastPosition.clone() : null;
-    
-	var intervalFunction = function() {
-        
-		var filterFun = function(position) {
-            if (lastPos == null || !position.equals(lastPos)) {
-                // only call the success callback when there is a change in position, per W3C
-                successCallback(position);
-            }
-            
-            // clone the new position, save it as our last position (internal var)
-            lastPos = position.clone();
-        };
-		
-		that.getCurrentPosition(filterFun, errorCallback, params);
-	};
-	
-    // Retrieve location immediately and schedule next retrieval afterwards
-	intervalFunction();
-	
-	return setInterval(intervalFunction, params.timeout);
-};
-
-
-/**
- * Clears the specified position watch.
- * @param {String} watchId The ID of the watch returned from #watchPosition.
- */
-Geolocation.prototype.clearWatch = function(watchId) {
-	clearInterval(watchId);
-};
-
-/**
- * Called by the geolocation framework when the current location is found.
- * @param {PositionOptions} position The current position.
- */
-Geolocation.prototype.setLocation = function(position) 
-{
-    var _position = new Position(position.coords, position.timestamp);
-
-    if(this.timeoutTimerId)
-    {
-        clearTimeout(this.timeoutTimerId);
-        this.timeoutTimerId = 0;
-    }
-    
-	this.lastError = null;
-    this.lastPosition = _position;
-    
-    if(this.listener && typeof(this.listener.success) == 'function')
-    {
-        this.listener.success(_position);
-    }
-    
-    this.listener = null;
-};
-
-/**
- * Called by the geolocation framework when an error occurs while looking up the current position.
- * @param {String} message The text of the error message.
- */
-Geolocation.prototype.setError = function(error) 
-{
-	var _error = new PositionError(error.code, error.message);
-
-    this.locationRunning = false
-	
-    if(this.timeoutTimerId)
-    {
-        clearTimeout(this.timeoutTimerId);
-        this.timeoutTimerId = 0;
-    }
-    
-    this.lastError = _error;
-    // call error handlers directly
-    if(this.listener && typeof(this.listener.fail) == 'function')
-    {
-        this.listener.fail(_error);
-    }
-    this.listener = null;
-
-};
-
-Geolocation.prototype.start = function(positionOptions) 
-{
-    PhoneGap.exec(null, null, "com.phonegap.geolocation", "startLocation", [positionOptions]);
-    this.locationRunning = true
-
-};
-
-Geolocation.prototype.stop = function() 
-{
-    PhoneGap.exec(null, null, "com.phonegap.geolocation", "stopLocation", []);
-    this.locationRunning = false
-};
-
-
-PhoneGap.addConstructor(function() 
-{
-    if (typeof navigator._geo == "undefined") 
-    {
-        // replace origObj's functions ( listed in funkList ) with the same method name on proxyObj
-        // this is a workaround to prevent UIWebView/MobileSafari default implementation of GeoLocation
-        // because it includes the full page path as the title of the alert prompt
-        var __proxyObj = function (origObj,proxyObj,funkList)
-        {
-            var replaceFunk = function(org,proxy,fName)
-            { 
-                org[fName] = function()
-                { 
-                   return proxy[fName].apply(proxy,arguments); 
-                }; 
-            };
-
-            for(var v in funkList) { replaceFunk(origObj,proxyObj,funkList[v]);}
-        }
-        navigator._geo = new Geolocation();
-        __proxyObj(navigator.geolocation, navigator._geo,
-                 ["setLocation","getCurrentPosition","watchPosition",
-                  "clearWatch","setError","start","stop"]);
-
-    }
-
-});
-};
-if (!PhoneGap.hasResource("compass")) {
-	PhoneGap.addResource("compass");
-
-CompassError = function(){
-   this.code = null;
-};
-
-// Capture error codes
-CompassError.COMPASS_INTERNAL_ERR = 0;
-CompassError.COMPASS_NOT_SUPPORTED = 20;
-
-CompassHeading = function() {
-	this.magneticHeading = null;
-	this.trueHeading = null;
-	this.headingAccuracy = null;
-	this.timestamp = null;
-}	
-/**
- * This class provides access to device Compass data.
- * @constructor
- */
-Compass = function() {
-    /**
-     * List of compass watch timers
-     */
-    this.timers = {};
-};
-
-/**
- * Asynchronously acquires the current heading.
- * @param {Function} successCallback The function to call when the heading
- * data is available
- * @param {Function} errorCallback The function to call when there is an error 
- * getting the heading data.
- * @param {PositionOptions} options The options for getting the heading data (not used).
- */
-Compass.prototype.getCurrentHeading = function(successCallback, errorCallback, options) {
- 	// successCallback required
-    if (typeof successCallback !== "function") {
-        console.log("Compass Error: successCallback is not a function");
-        return;
-    }
-
-    // errorCallback optional
-    if (errorCallback && (typeof errorCallback !== "function")) {
-        console.log("Compass Error: errorCallback is not a function");
-        return;
-    }
-
-    // Get heading
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.geolocation", "getCurrentHeading", []);
-};
-
-/**
- * Asynchronously acquires the heading repeatedly at a given interval.
- * @param {Function} successCallback The function to call each time the heading
- * data is available
- * @param {Function} errorCallback The function to call when there is an error 
- * getting the heading data.
- * @param {HeadingOptions} options The options for getting the heading data
- * such as timeout and the frequency of the watch.
- */
-Compass.prototype.watchHeading= function(successCallback, errorCallback, options) 
-{
-	// Default interval (100 msec)
-    var frequency = (options !== undefined) ? options.frequency : 100;
-
-    // successCallback required
-    if (typeof successCallback !== "function") {
-        console.log("Compass Error: successCallback is not a function");
-        return;
-    }
-
-    // errorCallback optional
-    if (errorCallback && (typeof errorCallback !== "function")) {
-        console.log("Compass Error: errorCallback is not a function");
-        return;
-    }
-
-    // Start watch timer to get headings
-    var id = PhoneGap.createUUID();
-    navigator.compass.timers[id] = setInterval(
-        function() {
-            PhoneGap.exec(successCallback, errorCallback, "com.phonegap.geolocation", "getCurrentHeading", [{repeats: 1}]);
-        }, frequency);
-
-    return id;
-};
-
-
-/**
- * Clears the specified heading watch.
- * @param {String} watchId The ID of the watch returned from #watchHeading.
- */
-Compass.prototype.clearWatch = function(id) 
-{
-	// Stop javascript timer & remove from timer list
-    if (id && navigator.compass.timers[id]) {
-        clearInterval(navigator.compass.timers[id]);
-        delete navigator.compass.timers[id];
-    }
-    if (navigator.compass.timers.length == 0) {
-    	// stop the 
-    	PhoneGap.exec(null, null, "com.phonegap.geolocation", "stopHeading", []);
-    }
-};
-
-/** iOS only
- * Asynchronously fires when the heading changes from the last reading.  The amount of distance 
- * required to trigger the event is specified in the filter paramter.
- * @param {Function} successCallback The function to call each time the heading
- * data is available
- * @param {Function} errorCallback The function to call when there is an error 
- * getting the heading data.
- * @param {HeadingOptions} options The options for getting the heading data
- * 			@param {filter} number of degrees change to trigger a callback with heading data (float)
- *
- * In iOS this function is more efficient than calling watchHeading  with a frequency for updates.
- * Only one watchHeadingFilter can be in effect at one time.  If a watchHeadingFilter is in effect, calling
- * getCurrentHeading or watchHeading will use the existing filter value for specifying heading change. 
-  */
-Compass.prototype.watchHeadingFilter = function(successCallback, errorCallback, options) 
-{
- 
- 	if (options === undefined || options.filter === undefined) {
- 		console.log("Compass Error:  options.filter not specified");
- 		return;
- 	}
-
-    // successCallback required
-    if (typeof successCallback !== "function") {
-        console.log("Compass Error: successCallback is not a function");
-        return;
-    }
-
-    // errorCallback optional
-    if (errorCallback && (typeof errorCallback !== "function")) {
-        console.log("Compass Error: errorCallback is not a function");
-        return;
-    }
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.geolocation", "watchHeadingFilter", [options]);
-}
-Compass.prototype.clearWatchFilter = function() 
-{
-    	PhoneGap.exec(null, null, "com.phonegap.geolocation", "stopHeading", []);
-};
-
-PhoneGap.addConstructor(function() 
-{
-    if (typeof navigator.compass == "undefined") 
-    {
-        navigator.compass = new Compass();
-    }
-});
-};
-
-if (!PhoneGap.hasResource("media")) {
-	PhoneGap.addResource("media");
-
-/**
- * List of media objects.
- * PRIVATE
- */
-PhoneGap.mediaObjects = {};
-
-/**
- * Object that receives native callbacks.
- * PRIVATE
- */
-PhoneGap.Media = function() {};
-
-
-/**
- * Get the media object.
- * PRIVATE
- *
- * @param id            The media object id (string)
- */
-PhoneGap.Media.getMediaObject = function(id) {
-    return PhoneGap.mediaObjects[id];
-};
-
-/**
- * Audio has status update.
- * PRIVATE
- *
- * @param id            The media object id (string)
- * @param msg           The status message (int)
- * @param value        The status code (int)
- */
-PhoneGap.Media.onStatus = function(id, msg, value) {
-    var media = PhoneGap.mediaObjects[id];
-
-    // If state update
-    if (msg == Media.MEDIA_STATE) {
-        if (value == Media.MEDIA_STOPPED) {
-            if (media.successCallback) {
-                media.successCallback();
-            }
-        }
-        if (media.statusCallback) {
-            media.statusCallback(value);
-        }
-    }
-    else if (msg == Media.MEDIA_DURATION) {
-        media._duration = value;
-    }
-    else if (msg == Media.MEDIA_ERROR) {
-        if (media.errorCallback) {
-            media.errorCallback(value);
-        }
-    }
-    else if (msg == Media.MEDIA_POSITION) {
-    	media._position = value;
-    }
-};
-
-/**
- * This class provides access to the device media, interfaces to both sound and video
- *
- * @param src                   The file name or url to play
- * @param successCallback       The callback to be called when the file is done playing or recording.
- *                                  successCallback() - OPTIONAL
- * @param errorCallback         The callback to be called if there is an error.
- *                                  errorCallback(int errorCode) - OPTIONAL
- * @param statusCallback        The callback to be called when media status has changed.
- *                                  statusCallback(int statusCode) - OPTIONAL
- * @param positionCallback      The callback to be called when media position has changed.
- *                                  positionCallback(long position) - OPTIONAL
- */
-Media = function(src, successCallback, errorCallback, statusCallback, positionCallback) {
-
-    // successCallback optional
-    if (successCallback && (typeof successCallback != "function")) {
-        console.log("Media Error: successCallback is not a function");
-        return;
-    }
-
-    // errorCallback optional
-    if (errorCallback && (typeof errorCallback != "function")) {
-        console.log("Media Error: errorCallback is not a function");
-        return;
-    }
-
-    // statusCallback optional
-    if (statusCallback && (typeof statusCallback != "function")) {
-        console.log("Media Error: statusCallback is not a function");
-        return;
-    }
-
-    // positionCallback optional -- NOT SUPPORTED
-    if (positionCallback && (typeof positionCallback != "function")) {
-        console.log("Media Error: positionCallback is not a function");
-        return;
-    }
-
-    this.id = PhoneGap.createUUID();
-    PhoneGap.mediaObjects[this.id] = this;
-    this.src = src;
-    this.successCallback = successCallback;
-    this.errorCallback = errorCallback;
-    this.statusCallback = statusCallback;
-    this.positionCallback = positionCallback;
-    this._duration = -1;
-    this._position = -1;
-};
-
-// Media messages
-Media.MEDIA_STATE = 1;
-Media.MEDIA_DURATION = 2;
-Media.MEDIA_POSITION = 3;
-Media.MEDIA_ERROR = 9;
-
-// Media states
-Media.MEDIA_NONE = 0;
-Media.MEDIA_STARTING = 1;
-Media.MEDIA_RUNNING = 2;
-Media.MEDIA_PAUSED = 3;
-Media.MEDIA_STOPPED = 4;
-Media.MEDIA_MSG = ["None", "Starting", "Running", "Paused", "Stopped"];
-
-// TODO: Will MediaError be used?
-/**
- * This class contains information about any Media errors.
- * @constructor
- */
-
-MediaError = function() {
-	this.code = null,
-	this.message = "";
-}
-
-MediaError.MEDIA_ERR_ABORTED        = 1;
-MediaError.MEDIA_ERR_NETWORK        = 2;
-MediaError.MEDIA_ERR_DECODE         = 3;
-MediaError.MEDIA_ERR_NONE_SUPPORTED = 4;
-
-/**
- * Start or resume playing audio file.
- */
-Media.prototype.play = function(options) {
-    PhoneGap.exec(null, null, "com.phonegap.media", "play", [this.id, this.src, options]);
-};
-
-/**
- * Stop playing audio file.
- */
-Media.prototype.stop = function() {
-    PhoneGap.exec(null, null, "com.phonegap.media","stop", [this.id, this.src]);
-};
-
-/**
- * Pause playing audio file.
- */
-Media.prototype.pause = function() {
-    PhoneGap.exec(null, null, "com.phonegap.media","pause", [this.id, this.src]);
-};
-
-/**
- * Seek or jump to a new time in the track..
- */
-Media.prototype.seekTo = function(milliseconds) {
-    PhoneGap.exec(null, null, "com.phonegap.media", "seekTo", [this.id, this.src, milliseconds]);
-};
-
-/**
- * Get duration of an audio file.
- * The duration is only set for audio that is playing, paused or stopped.
- *
- * @return      duration or -1 if not known.
- */
-Media.prototype.getDuration = function() {
-    return this._duration;
-};
-
-/**
- * Get position of audio.
- *
- * @return
- */
-Media.prototype.getCurrentPosition = function(successCB, errorCB) {
-	var errCallback = (errorCB == undefined || errorCB == null) ? null : errorCB;
-    PhoneGap.exec(successCB, errorCB, "com.phonegap.media", "getCurrentPosition", [this.id, this.src]);
-};
-
-// iOS only.  prepare/load the audio in preparation for playing
-Media.prototype.prepare = function(successCB, errorCB) {
-	PhoneGap.exec(successCB, errorCB, "com.phonegap.media", "prepare", [this.id, this.src]);
-}
-
-/**
- * Start recording audio file.
- */
-Media.prototype.startRecord = function() {
-    PhoneGap.exec(null, null, "com.phonegap.media","startAudioRecord", [this.id, this.src]);
-};
-
-/**
- * Stop recording audio file.
- */
-Media.prototype.stopRecord = function() {
-    PhoneGap.exec(null, null, "com.phonegap.media","stopAudioRecord", [this.id, this.src]);
-};
-
-/**
- * Release the resources.
- */
-Media.prototype.release = function() {
-    PhoneGap.exec(null, null, "com.phonegap.media","release", [this.id, this.src]);
-};
-
-};
-if (!PhoneGap.hasResource("notification")) {
-	PhoneGap.addResource("notification");
-
-/**
- * This class provides access to notifications on the device.
- */
-Notification = function() {
-};
-
-/**
- * Open a native alert dialog, with a customizable title and button text.
- *
- * @param {String} message              Message to print in the body of the alert
- * @param {Function} completeCallback   The callback that is called when user clicks on a button.
- * @param {String} title                Title of the alert dialog (default: Alert)
- * @param {String} buttonLabel          Label of the close button (default: OK)
- */
-Notification.prototype.alert = function(message, completeCallback, title, buttonLabel) {
-    var _title = title;
-    if (title == null || typeof title === 'undefined') {
-        _title = "Alert";
-    }
-    var _buttonLabel = (buttonLabel || "OK");
-    PhoneGap.exec(completeCallback, null, "com.phonegap.notification", "alert", [message,{ "title": _title, "buttonLabel": _buttonLabel}]);
-};
-
-/**
- * Open a native confirm dialog, with a customizable title and button text.
- * The result that the user selects is returned to the result callback.
- *
- * @param {String} message              Message to print in the body of the alert
- * @param {Function} resultCallback     The callback that is called when user clicks on a button.
- * @param {String} title                Title of the alert dialog (default: Confirm)
- * @param {String} buttonLabels         Comma separated list of the labels of the buttons (default: 'OK,Cancel')
- */
-Notification.prototype.confirm = function(message, resultCallback, title, buttonLabels) {
-    var _title = (title || "Confirm");
-    var _buttonLabels = (buttonLabels || "OK,Cancel");
-    this.alert(message, resultCallback, _title, _buttonLabels);
-};
-
-/**
- * Causes the device to blink a status LED.
- * @param {Integer} count The number of blinks.
- * @param {String} colour The colour of the light.
- */
-Notification.prototype.blink = function(count, colour) {
-// NOT IMPLEMENTED	
-};
-
-Notification.prototype.vibrate = function(mills) {
-	PhoneGap.exec(null, null, "com.phonegap.notification", "vibrate", []);
-};
-
-Notification.prototype.beep = function(count, volume) {
-	// No Volume yet for the iphone interface
-	// We can use a canned beep sound and call that
-	new Media('beep.wav').play();
-};
-
-PhoneGap.addConstructor(function() {
-    if (typeof navigator.notification == "undefined") navigator.notification = new Notification();
-});
-};
-if (!PhoneGap.hasResource("orientation")) {
-	PhoneGap.addResource("orientation");
-
-/**
- * This class provides access to the device orientation.
- * @constructor
- */
-Orientation  = function() {
-	/**
-	 * The current orientation, or null if the orientation hasn't changed yet.
-	 */
-	this.currentOrientation = null;
-}
-
-/**
- * Set the current orientation of the phone.  This is called from the device automatically.
- * 
- * When the orientation is changed, the DOMEvent \c orientationChanged is dispatched against
- * the document element.  The event has the property \c orientation which can be used to retrieve
- * the device's current orientation, in addition to the \c Orientation.currentOrientation class property.
- *
- * @param {Number} orientation The orientation to be set
- */
-Orientation.prototype.setOrientation = function(orientation) {
-    Orientation.currentOrientation = orientation;
-    var e = document.createEvent('Events');
-    e.initEvent('orientationChanged', 'false', 'false');
-    e.orientation = orientation;
-    document.dispatchEvent(e);
-};
-
-/**
- * Asynchronously aquires the current orientation.
- * @param {Function} successCallback The function to call when the orientation
- * is known.
- * @param {Function} errorCallback The function to call when there is an error 
- * getting the orientation.
- */
-Orientation.prototype.getCurrentOrientation = function(successCallback, errorCallback) {
-	// If the position is available then call success
-	// If the position is not available then call error
-};
-
-/**
- * Asynchronously aquires the orientation repeatedly at a given interval.
- * @param {Function} successCallback The function to call each time the orientation
- * data is available.
- * @param {Function} errorCallback The function to call when there is an error 
- * getting the orientation data.
- */
-Orientation.prototype.watchOrientation = function(successCallback, errorCallback) {
-	// Invoke the appropriate callback with a new Position object every time the implementation 
-	// determines that the position of the hosting device has changed. 
-	this.getCurrentPosition(successCallback, errorCallback);
-	return setInterval(function() {
-		navigator.orientation.getCurrentOrientation(successCallback, errorCallback);
-	}, 10000);
-};
-
-/**
- * Clears the specified orientation watch.
- * @param {String} watchId The ID of the watch returned from #watchOrientation.
- */
-Orientation.prototype.clearWatch = function(watchId) {
-	clearInterval(watchId);
-};
-
-Orientation.install = function()
-{
-    if (typeof navigator.orientation == "undefined") { 
-		navigator.orientation = new Orientation();
-	}
-	
-	var windowDispatchAvailable = !(window.dispatchEvent === undefined); // undefined in iOS 3.x
-	if (windowDispatchAvailable) {
-		return;
-	} 
-	
-	// the code below is to capture window.add/remove eventListener calls on window
-	// this is for iOS 3.x where listening on 'orientationchange' events don't work on document/window (don't know why)
-	// however, window.onorientationchange DOES handle the 'orientationchange' event (sent through document), so...
-	// then we multiplex the window.onorientationchange event (consequently - people shouldn't overwrite this)
-	
-	var self = this;
-	var orientationchangeEvent = 'orientationchange';
-	var newOrientationchangeEvent = 'orientationchange_pg';
-	
-	// backup original `window.addEventListener`, `window.removeEventListener`
-    var _addEventListener = window.addEventListener;
-    var _removeEventListener = window.removeEventListener;
-
-	window.onorientationchange = function() {
-		PhoneGap.fireEvent(newOrientationchangeEvent, window);
-	}
-	
-    // override `window.addEventListener`
-    window.addEventListener = function() {
-        if (arguments[0] === orientationchangeEvent) {
-			arguments[0] = newOrientationchangeEvent; 
-		} 
-													
-		if (!windowDispatchAvailable) {
-			return document.addEventListener.apply(this, arguments);
-		} else {
-			return _addEventListener.apply(this, arguments);
-		}
-    };	
-
-    // override `window.removeEventListener'
-    window.removeEventListener = function() {
-        if (arguments[0] === orientationchangeEvent) {
-			arguments[0] = newOrientationchangeEvent; 
-		} 
-		
-		if (!windowDispatchAvailable) {
-			return document.removeEventListener.apply(this, arguments);
-		} else {
-			return _removeEventListener.apply(this, arguments);
-		}
-    };	
-};
-
-PhoneGap.addConstructor(Orientation.install);
-
-};
-if (!PhoneGap.hasResource("sms")) {
-	PhoneGap.addResource("sms");
-
-/**
- * This class provides access to the device SMS functionality.
- * @constructor
- */
-Sms = function() {
-
-}
-
-/**
- * Sends an SMS message.
- * @param {Integer} number The phone number to send the message to.
- * @param {String} message The contents of the SMS message to send.
- * @param {Function} successCallback The function to call when the SMS message is sent.
- * @param {Function} errorCallback The function to call when there is an error sending the SMS message.
- * @param {PositionOptions} options The options for accessing the GPS location such as timeout and accuracy.
- */
-Sms.prototype.send = function(number, message, successCallback, errorCallback, options) {
-	// not sure why this is here when it does nothing????
-};
-
-PhoneGap.addConstructor(function() {
-    if (typeof navigator.sms == "undefined") navigator.sms = new Sms();
-});
-};
-if (!PhoneGap.hasResource("telephony")) {
-	PhoneGap.addResource("telephony");
-
-/**
- * This class provides access to the telephony features of the device.
- * @constructor
- */
-Telephony = function() {
-	
-}
-
-/**
- * Calls the specifed number.
- * @param {Integer} number The number to be called.
- */
-Telephony.prototype.call = function(number) {
-	// not sure why this is here when it does nothing????
-};
-
-PhoneGap.addConstructor(function() {
-    if (typeof navigator.telephony == "undefined") navigator.telephony = new Telephony();
-});
-};if (!PhoneGap.hasResource("network")) {
-	PhoneGap.addResource("network");
-
-// //////////////////////////////////////////////////////////////////
-
-Connection = function() {
-	/*
-	 * One of the connection constants below.
-	 */
-	this.type = Connection.UNKNOWN;
-
-	/* initialize from the extended DeviceInfo properties */
-    try {      
-		this.type	= DeviceInfo.connection.type;
-    } 
-	catch(e) {
-    }
-};
-
-Connection.UNKNOWN = "unknown"; // Unknown connection type
-Connection.ETHERNET = "ethernet";
-Connection.WIFI = "wifi";
-Connection.CELL_2G = "2g"; // the default for iOS, for any cellular connection
-Connection.CELL_3G = "3g";
-Connection.CELL_4G = "4g";
-Connection.NONE = "none"; // NO connectivity
-
-
-PhoneGap.addConstructor(function() {
-    if (typeof navigator.network == "undefined") navigator.network = {};
-    if (typeof navigator.network.connection == "undefined") navigator.network.connection = new Connection();
-});
-
-};if (!PhoneGap.hasResource("splashscreen")) {
-	PhoneGap.addResource("splashscreen");
-
-/**
- * This class provides access to the splashscreen
- */
-SplashScreen = function() {
-};
-
-SplashScreen.prototype.show = function() {
-    PhoneGap.exec(null, null, "com.phonegap.splashscreen", "show", []);
-};
-
-SplashScreen.prototype.hide = function() {
-    PhoneGap.exec(null, null, "com.phonegap.splashscreen", "hide", []);
-};
-
-PhoneGap.addConstructor(function() {
-    if (typeof navigator.splashscreen == "undefined") navigator.splashscreen = new SplashScreen();
-});
-
-};
diff --git a/apps/files_odfviewer/src/webodf/programs/android/libs/phonegap-1.4.1.jar b/apps/files_odfviewer/src/webodf/programs/android/libs/phonegap-1.4.1.jar
deleted file mode 100644
index a30e0218e2..0000000000
Binary files a/apps/files_odfviewer/src/webodf/programs/android/libs/phonegap-1.4.1.jar and /dev/null differ
diff --git a/apps/files_odfviewer/src/webodf/programs/android/res/drawable-hdpi/ic_launcher.png b/apps/files_odfviewer/src/webodf/programs/android/res/drawable-hdpi/ic_launcher.png
deleted file mode 100644
index 8074c4c571..0000000000
Binary files a/apps/files_odfviewer/src/webodf/programs/android/res/drawable-hdpi/ic_launcher.png and /dev/null differ
diff --git a/apps/files_odfviewer/src/webodf/programs/android/res/drawable-ldpi/ic_launcher.png b/apps/files_odfviewer/src/webodf/programs/android/res/drawable-ldpi/ic_launcher.png
deleted file mode 100644
index 1095584ec2..0000000000
Binary files a/apps/files_odfviewer/src/webodf/programs/android/res/drawable-ldpi/ic_launcher.png and /dev/null differ
diff --git a/apps/files_odfviewer/src/webodf/programs/android/res/drawable-mdpi/ic_launcher.png b/apps/files_odfviewer/src/webodf/programs/android/res/drawable-mdpi/ic_launcher.png
deleted file mode 100644
index a07c69fa5a..0000000000
Binary files a/apps/files_odfviewer/src/webodf/programs/android/res/drawable-mdpi/ic_launcher.png and /dev/null differ
diff --git a/apps/files_odfviewer/src/webodf/programs/android/res/drawable/icon.png b/apps/files_odfviewer/src/webodf/programs/android/res/drawable/icon.png
deleted file mode 100644
index 13ee5e8612..0000000000
Binary files a/apps/files_odfviewer/src/webodf/programs/android/res/drawable/icon.png and /dev/null differ
diff --git a/apps/files_odfviewer/src/webodf/programs/android/res/layout/listitem.xml b/apps/files_odfviewer/src/webodf/programs/android/res/layout/listitem.xml
deleted file mode 100644
index f0958d609d..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/android/res/layout/listitem.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:padding="10dp"
-    android:textSize="16sp" >
-</TextView>
\ No newline at end of file
diff --git a/apps/files_odfviewer/src/webodf/programs/android/res/layout/main.xml b/apps/files_odfviewer/src/webodf/programs/android/res/layout/main.xml
deleted file mode 100644
index bc12cd8231..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/android/res/layout/main.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical" >
-
-    <TextView
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/hello" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/apps/files_odfviewer/src/webodf/programs/android/res/layout/selector.xml b/apps/files_odfviewer/src/webodf/programs/android/res/layout/selector.xml
deleted file mode 100644
index 4af1380e95..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/android/res/layout/selector.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent" >
-
-    <ScrollView
-        android:layout_width="fill_parent" 
-        android:layout_height="fill_parent">
-        
-        <TextView android:id="@+id/noteview"  
-	          android:layout_width="fill_parent" 
-            android:layout_height="fill_parent"
-            android:textSize="10pt" />
-	  </ScrollView>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/apps/files_odfviewer/src/webodf/programs/android/res/values/strings.xml b/apps/files_odfviewer/src/webodf/programs/android/res/values/strings.xml
deleted file mode 100644
index 44673ed78b..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/android/res/values/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <string name="hello">Hello World, WebODFActivity!</string>
-    <string name="app_name">WebODF</string>
-
-</resources>
\ No newline at end of file
diff --git a/apps/files_odfviewer/src/webodf/programs/android/res/xml/phonegap.xml b/apps/files_odfviewer/src/webodf/programs/android/res/xml/phonegap.xml
deleted file mode 100755
index 97f31ea110..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/android/res/xml/phonegap.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<phonegap>
-    <access origin="http://127.0.0.1*"/>
-    <log level="DEBUG"/>
-</phonegap>
diff --git a/apps/files_odfviewer/src/webodf/programs/android/res/xml/plugins.xml b/apps/files_odfviewer/src/webodf/programs/android/res/xml/plugins.xml
deleted file mode 100644
index 3d8d48d838..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/android/res/xml/plugins.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<plugins>
-    <plugin name="App" value="com.phonegap.App"/>
-    <plugin name="Geolocation" value="com.phonegap.GeoBroker"/>
-    <plugin name="Device" value="com.phonegap.Device"/>
-    <plugin name="Accelerometer" value="com.phonegap.AccelListener"/>
-    <plugin name="Compass" value="com.phonegap.CompassListener"/>
-    <plugin name="Media" value="com.phonegap.AudioHandler"/>
-    <plugin name="Camera" value="com.phonegap.CameraLauncher"/>
-    <plugin name="Contacts" value="com.phonegap.ContactManager"/>
-    <plugin name="Crypto" value="com.phonegap.CryptoHandler"/>
-    <plugin name="File" value="com.phonegap.FileUtils"/>
-    <plugin name="Network Status" value="com.phonegap.NetworkManager"/>
-    <plugin name="Notification" value="com.phonegap.Notification"/>
-    <plugin name="Storage" value="com.phonegap.Storage"/>
-    <plugin name="Temperature" value="com.phonegap.TempListener"/>
-    <plugin name="FileTransfer" value="com.phonegap.FileTransfer"/>
-    <plugin name="Capture" value="com.phonegap.Capture"/>
-</plugins>
\ No newline at end of file
diff --git a/apps/files_odfviewer/src/webodf/programs/android/src/org/webodf/WebODFActivity.java b/apps/files_odfviewer/src/webodf/programs/android/src/org/webodf/WebODFActivity.java
deleted file mode 100644
index 9c826c9210..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/android/src/org/webodf/WebODFActivity.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.webodf;
-
-import android.os.Bundle;
-
-import com.phonegap.DroidGap;
-
-public class WebODFActivity extends DroidGap {
-
-	private String path;
-
-	/** Called when the activity is first created. */
-	@Override
-	public void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		path = null;
-		if (getIntent() != null && getIntent().getData() != null) {
-			path = getIntent().getData().getPath();
-		}
-		setContentView(R.layout.main);
-		super.loadUrl("file:///android_asset/www/index.html");
-	}
-
-	@Override
-	protected void onResume() {
-		super.onResume();
-		if (path == null) {
-			return;
-		}
-		String escapedPath = "file://" + path.replace("'", "\\'");
-		sendJavascript("invokeString = '" + escapedPath + "';");
-	}
-
-}
\ No newline at end of file
diff --git a/apps/files_odfviewer/src/webodf/programs/android/updateWebODF.sh b/apps/files_odfviewer/src/webodf/programs/android/updateWebODF.sh
deleted file mode 100755
index b51e94290b..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/android/updateWebODF.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-# /bin/bash
-cd assets
-for f in `find . -type f`; do cp ../../webodf/$f $f; done
diff --git a/apps/files_odfviewer/src/webodf/programs/docnosis/CMakeLists.txt b/apps/files_odfviewer/src/webodf/programs/docnosis/CMakeLists.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-manifest-schema-v1.0-os.rng b/apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-manifest-schema-v1.0-os.rng
deleted file mode 100644
index 97fe580eab..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-manifest-schema-v1.0-os.rng
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    OASIS OpenDocument v1.0
-    OASIS standard, 1 May 2005
-    Relax-NG Manifest Schema
-
-    $Id$
-
-    © 2002-2005 OASIS Open
-    © 1999-2005 Sun Microsystems, Inc.
--->
-
-<grammar 
-    xmlns="http://relaxng.org/ns/structure/1.0"
-
-    datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
-
-    xmlns:manifest="urn:oasis:names:tc:opendocument:xmlns:manifest:1.0">
-<define name="manifest">
-    <element name="manifest:manifest">
-        <oneOrMore>
-            <ref name="file-entry"/>
-        </oneOrMore>
-    </element>
-</define>
-
-<start>
-    <choice>
-        <ref name="manifest"/>
-    </choice>
-</start>
-<define name="file-entry">
-    <element name="manifest:file-entry">
-        <ref name="file-entry-attlist"/>
-        <optional>
-            <ref name="encryption-data"/>
-        </optional>
-    </element>
-</define>
-<define name="file-entry-attlist" combine="interleave">
-    <attribute name="manifest:full-path">
-        <data type="string"/>
-    </attribute>
-</define>
-<define name="file-entry-attlist" combine="interleave">
-    <optional>
-        <attribute name="manifest:size">
-            <data type="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="file-entry-attlist" combine="interleave">
-    <attribute name="manifest:media-type">
-        <data type="string"/>
-    </attribute>
-</define>
-<define name="encryption-data">
-    <element name="manifest:encryption-data">
-        <ref name="encryption-data-attlist"/>
-        <ref name="algorithm"/>
-        <ref name="key-derivation"/>
-    </element>
-</define>
-<define name="encryption-data-attlist" combine="interleave">
-    <attribute name="manifest:checksum-type">
-        <data type="string"/>
-    </attribute>
-</define>
-<define name="encryption-data-attlist" combine="interleave">
-    <attribute name="manifest:checksum">
-        <data type="base64Binary"/>
-    </attribute>
-</define>
-<define name="algorithm">
-    <element name="manifest:algorithm">
-        <ref name="algorithm-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="algorithm-attlist" combine="interleave">
-    <attribute name="manifest:algorithm-name">
-        <data type="string"/>
-    </attribute>
-</define>
-<define name="algorithm-attlist" combine="interleave">
-    <attribute name="manifest:initialisation-vector">
-        <data type="base64Binary"/>
-    </attribute>
-</define>
-<define name="key-derivation">
-    <element name="manifest:key-derivation">
-        <ref name="key-derivation-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="key-derivation-attlist" combine="interleave">
-    <attribute name="manifest:key-derivation-name">
-        <data type="string"/>
-    </attribute>
-</define>
-<define name="key-derivation-attlist" combine="interleave">
-    <attribute name="manifest:salt">
-        <data type="base64Binary"/>
-    </attribute>
-</define>
-<define name="key-derivation-attlist" combine="interleave">
-    <attribute name="manifest:iteration-count">
-            <data type="nonNegativeInteger"/>
-        </attribute>
-</define>
-</grammar>
diff --git a/apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-manifest-schema-v1.1.rng b/apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-manifest-schema-v1.1.rng
deleted file mode 100644
index 4082d4ba95..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-manifest-schema-v1.1.rng
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    OASIS OpenDocument v1.1
-    OASIS Standard, 1 Feb 2007
-    Relax-NG Manifest Schema
-
-    $Id$
-
-    © 2002-2007 OASIS Open
-    © 1999-2007 Sun Microsystems, Inc.
--->
-
-<grammar 
-    xmlns="http://relaxng.org/ns/structure/1.0"
-
-    datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
-
-    xmlns:manifest="urn:oasis:names:tc:opendocument:xmlns:manifest:1.0">
-<define name="manifest">
-    <element name="manifest:manifest">
-        <oneOrMore>
-            <ref name="file-entry"/>
-        </oneOrMore>
-    </element>
-</define>
-
-<start>
-    <choice>
-        <ref name="manifest"/>
-    </choice>
-</start>
-<define name="file-entry">
-    <element name="manifest:file-entry">
-        <ref name="file-entry-attlist"/>
-        <optional>
-            <ref name="encryption-data"/>
-        </optional>
-    </element>
-</define>
-<define name="file-entry-attlist" combine="interleave">
-    <attribute name="manifest:full-path">
-        <data type="string"/>
-    </attribute>
-</define>
-<define name="file-entry-attlist" combine="interleave">
-    <optional>
-        <attribute name="manifest:size">
-            <data type="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="file-entry-attlist" combine="interleave">
-    <attribute name="manifest:media-type">
-        <data type="string"/>
-    </attribute>
-</define>
-<define name="encryption-data">
-    <element name="manifest:encryption-data">
-        <ref name="encryption-data-attlist"/>
-        <ref name="algorithm"/>
-        <ref name="key-derivation"/>
-    </element>
-</define>
-<define name="encryption-data-attlist" combine="interleave">
-    <attribute name="manifest:checksum-type">
-        <data type="string"/>
-    </attribute>
-</define>
-<define name="encryption-data-attlist" combine="interleave">
-    <attribute name="manifest:checksum">
-        <data type="base64Binary"/>
-    </attribute>
-</define>
-<define name="algorithm">
-    <element name="manifest:algorithm">
-        <ref name="algorithm-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="algorithm-attlist" combine="interleave">
-    <attribute name="manifest:algorithm-name">
-        <data type="string"/>
-    </attribute>
-</define>
-<define name="algorithm-attlist" combine="interleave">
-    <attribute name="manifest:initialisation-vector">
-        <data type="base64Binary"/>
-    </attribute>
-</define>
-<define name="key-derivation">
-    <element name="manifest:key-derivation">
-        <ref name="key-derivation-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="key-derivation-attlist" combine="interleave">
-    <attribute name="manifest:key-derivation-name">
-        <data type="string"/>
-    </attribute>
-</define>
-<define name="key-derivation-attlist" combine="interleave">
-    <attribute name="manifest:salt">
-        <data type="base64Binary"/>
-    </attribute>
-</define>
-<define name="key-derivation-attlist" combine="interleave">
-    <attribute name="manifest:iteration-count">
-            <data type="nonNegativeInteger"/>
-        </attribute>
-</define>
-</grammar>
diff --git a/apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-schema-v1.0-os.rng b/apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-schema-v1.0-os.rng
deleted file mode 100644
index cf4ee51741..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-schema-v1.0-os.rng
+++ /dev/null
@@ -1,17666 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    OASIS OpenDocument v1.0
-    OASIS Standard, 1 May 2005
-    Relax-NG Schema
-
-    $Id$
-
-    © 2002-2005 OASIS Open
-    © 1999-2005 Sun Microsystems, Inc.
--->
-
-<grammar
-    xmlns="http://relaxng.org/ns/structure/1.0"
-    xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
-
-    datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
-
-    xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-    xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0"
-    xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0"
-    xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
-    xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
-    xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
-    xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"
-    xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0"
-    xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
-    xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
-    xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0"
-    xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
-    xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
-    xmlns:anim="urn:oasis:names:tc:opendocument:xmlns:animation:1.0"
-
-    xmlns:dc="http://purl.org/dc/elements/1.1/"
-    xmlns:xlink="http://www.w3.org/1999/xlink"
-    xmlns:math="http://www.w3.org/1998/Math/MathML"
-    xmlns:xforms="http://www.w3.org/2002/xforms"
-
-    xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0"
-    xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"
-    xmlns:smil="urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0"
->
-<define name="office-process-content">
-    <optional>
-        <attribute name="office:process-content" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<start>
-    <choice>
-        <ref name="office-document"/>
-        <ref name="office-document-content"/>
-        <ref name="office-document-styles"/>
-        <ref name="office-document-meta"/>
-        <ref name="office-document-settings"/>
-    </choice>
-</start>
-<define name="office-document">
-    <element name="office:document">
-        <ref name="office-document-attrs"/>
-        <ref name="office-document-common-attrs"/>
-        <ref name="office-meta"/>
-        <ref name="office-settings"/>
-        <ref name="office-scripts"/>
-        <ref name="office-font-face-decls"/>
-        <ref name="office-styles"/>
-        <ref name="office-automatic-styles"/>
-        <ref name="office-master-styles"/>
-        <ref name="office-body"/>
-    </element>
-</define>
-<define name="office-document-content">
-    <element name="office:document-content">
-        <ref name="office-document-common-attrs"/>
-        <ref name="office-scripts"/>
-        <ref name="office-font-face-decls"/>
-        <ref name="office-automatic-styles"/>
-        <ref name="office-body"/>
-    </element>
-</define>
-<define name="office-document-styles">
-    <element name="office:document-styles">
-        <ref name="office-document-common-attrs"/>
-        <ref name="office-font-face-decls"/>
-        <ref name="office-styles"/>
-        <ref name="office-automatic-styles"/>
-        <ref name="office-master-styles"/>
-    </element>
-</define>
-<define name="office-document-meta">
-    <element name="office:document-meta">
-        <ref name="office-document-common-attrs"/>
-        <ref name="office-meta"/>
-    </element>
-</define>
-<define name="office-document-settings">
-    <element name="office:document-settings">
-        <ref name="office-document-common-attrs"/>
-        <ref name="office-settings"/>
-    </element>
-</define>
-<define name="office-document-common-attrs" combine="interleave">
-    <optional>
-        <attribute name="office:version">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="office-document-attrs" combine="interleave">
-    <attribute name="office:mimetype">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="office-meta">
-    <optional>
-        <element name="office:meta">
-            <ref name="office-meta-content"/>
-        </element>
-    </optional>
-</define>
-
-<define name="office-meta-content">
-    <ref name="anyElements"/>
-</define>
-
-<define name="office-meta-content-strict">
-    <zeroOrMore>
-        <ref name="office-meta-data"/>
-    </zeroOrMore>
-</define>
-<define name="office-body">
-    <element name="office:body">
-        <ref name="office-body-content"/>
-    </element>
-</define>
-<define name="office-body-content" combine="choice">
-    <element name="office:text">
-        <ref name="office-text-attlist"/>
-        <ref name="office-text-content-prelude"/>
-        <zeroOrMore>
-            <ref name="office-text-content-main"/>
-        </zeroOrMore>
-        <ref name="office-text-content-epilogue"/>
-    </element>
-</define>
-<define name="office-text-content-prelude">
-    <ref name="office-forms"/>
-    <ref name="text-tracked-changes"/>
-    <ref name="text-decls"/>
-    <ref name="table-decls"/>
-</define>
-<define name="office-text-content-main">
-    <choice>
-        <zeroOrMore>
-            <ref name="text-content"/>
-        </zeroOrMore>
-        <group>
-            <ref name="text-page-sequence"/>
-            <zeroOrMore>
-                <choice>
-                    <ref name="draw-a"/>
-                    <ref name="shape"/>
-                </choice>
-            </zeroOrMore>
-        </group>
-    </choice>
-</define>
-
-<define name="text-content">
-    <choice>
-        <ref name="text-h"/>
-        <ref name="text-p"/>
-        <ref name="text-list"/>
-        <ref name="text-numbered-paragraph"/>
-        <ref name="table-table"/>
-        <ref name="draw-a"/>
-        <ref name="text-section"/>
-        <ref name="text-table-of-content"/>
-        <ref name="text-illustration-index"/>
-        <ref name="text-table-index"/>
-        <ref name="text-object-index"/>
-        <ref name="text-user-index"/>
-        <ref name="text-alphabetical-index"/>
-        <ref name="text-bibliography"/>
-        <ref name="shape"/>
-        <ref name="change-marks"/>
-    </choice>
-</define>
-<define name="office-text-content-epilogue">
-    <ref name="table-functions"/>
-</define>
-<define name="office-text-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:global" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="office-body-content" combine="choice">
-    <element name="office:drawing">
-        <ref name="office-drawing-attlist"/>
-        <ref name="office-drawing-content-prelude"/>
-        <ref name="office-drawing-content-main"/>
-        <ref name="office-drawing-content-epilogue"/>
-    </element>
-</define>
-
-<define name="office-drawing-attlist">
-    <empty/>
-</define>
-<define name="office-drawing-content-prelude">
-    <ref name="text-decls"/>
-    <ref name="table-decls"/>
-</define>
-<define name="office-drawing-content-main">
-    <zeroOrMore>
-        <ref name="draw-page"/>
-    </zeroOrMore>
-</define>
-<define name="office-drawing-content-epilogue">
-    <ref name="table-functions"/>
-</define>
-<define name="office-body-content" combine="choice">
-    <element name="office:presentation">
-        <ref name="office-presentation-attlist"/>
-        <ref name="office-presentation-content-prelude"/>
-        <ref name="office-presentation-content-main"/>
-        <ref name="office-presentation-content-epilogue"/>
-    </element>
-</define>
-
-<define name="office-presentation-attlist">
-    <empty/>
-</define>
-<define name="office-presentation-content-prelude">
-    <ref name="text-decls"/>
-    <ref name="table-decls"/>
-    <ref name="presentation-decls"/>
-</define>
-<define name="office-presentation-content-main">
-    <zeroOrMore>
-        <ref name="draw-page"/>
-    </zeroOrMore>
-</define>
-<define name="office-presentation-content-epilogue">
-    <ref name="presentation-settings"/>
-    <ref name="table-functions"/>
-</define>
-<define name="office-body-content" combine="choice">
-    <element name="office:spreadsheet">
-        <ref name="office-spreadsheet-attlist"/>
-        <ref name="office-spreadsheet-content-prelude"/>
-        <ref name="office-spreadsheet-content-main"/>
-        <ref name="office-spreadsheet-content-epilogue"/>
-    </element>
-</define>
-<define name="office-spreadsheet-content-prelude">
-    <optional>
-        <ref name="table-tracked-changes"/>    
-    </optional>
-    <ref name="text-decls"/>
-    <ref name="table-decls"/>
-</define>
-
-<define name="table-decls">
-    <optional>
-        <ref name="table-calculation-settings"/>    
-    </optional>
-    <optional>
-        <ref name="table-content-validations"/>    
-    </optional>
-    <optional>
-        <ref name="table-label-ranges"/>    
-    </optional>
-</define>
-<define name="office-spreadsheet-content-main">
-    <zeroOrMore>
-        <ref name="table-table"/>
-    </zeroOrMore>
-</define>
-<define name="office-spreadsheet-content-epilogue">
-    <ref name="table-functions"/>    
-</define>
-
-<define name="table-functions">
-    <optional>
-        <ref name="table-named-expressions"/>    
-    </optional>
-    <optional>
-        <ref name="table-database-ranges"/>    
-    </optional>
-    <optional>
-        <ref name="table-data-pilot-tables"/>    
-    </optional>
-    <optional>
-        <ref name="table-consolidation"/>    
-    </optional>
-    <optional>
-        <ref name="table-dde-links"/>    
-    </optional>
-</define>
-<define name="office-body-content" combine="choice">
-    <element name="office:chart">
-        <ref name="office-chart-attlist"/>
-        <ref name="office-chart-content-prelude"/>
-        <ref name="office-chart-content-main"/>
-        <ref name="office-chart-content-epilogue"/>
-    </element>
-</define>
-
-<define name="office-chart-attlist">
-    <empty/>
-</define>
-<define name="office-chart-content-prelude">
-    <ref name="text-decls"/>
-    <ref name="table-decls"/>
-</define>
-<define name="office-chart-content-main">
-    <ref name="chart-chart"/>
-</define>
-<define name="office-chart-content-epilogue">
-    <ref name="table-functions"/>    
-</define>
-<define name="office-body-content" combine="choice">
-    <element name="office:image">
-        <ref name="office-image-attlist"/>
-        <ref name="office-image-content-prelude"/>
-        <ref name="office-image-content-main"/>
-        <ref name="office-image-content-epilogue"/>
-    </element>
-</define>
-
-<define name="office-image-attlist">
-    <empty/>
-</define>
-<define name="office-image-content-prelude">
-    <empty/>
-</define>
-<define name="office-image-content-main">
-    <ref name="draw-frame"/>
-</define>
-<define name="office-image-content-epilogue">
-    <empty/>
-</define>
-<define name="office-settings">
-    <optional>
-        <element name="office:settings">
-            <oneOrMore>
-                <ref name="config-config-item-set"/>
-            </oneOrMore>
-        </element>
-    </optional>
-</define>
-<define name="config-config-item-set">
-    <element name="config:config-item-set">
-        <ref name="config-config-item-set-attlist"/>
-        <ref name="config-items"/>
-    </element>
-</define>
-
-<define name="config-items">
-    <oneOrMore>
-        <choice>
-            <ref name="config-config-item"/>
-            <ref name="config-config-item-set"/>
-            <ref name="config-config-item-map-named"/>
-            <ref name="config-config-item-map-indexed"/>
-        </choice>
-    </oneOrMore>
-</define>
-<define name="config-config-item-set-attlist" combine="interleave">
-    <attribute name="config:name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="config-config-item">
-    <element name="config:config-item">
-        <ref name="config-config-item-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="config-config-item-attlist" combine="interleave">
-    <attribute name="config:name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="config-config-item-attlist" combine="interleave">
-    <attribute name="config:type">
-        <choice>
-            <value>boolean</value>
-            <value>short</value>
-            <value>int</value>
-            <value>long</value>
-            <value>double</value>
-            <value>string</value>
-            <value>datetime</value>
-            <value>base64Binary</value>
-        </choice>
-    </attribute>
-</define>
-<define name="config-config-item-map-indexed">
-    <element name="config:config-item-map-indexed">
-        <ref name="config-config-item-map-indexed-attlist"/>
-        <oneOrMore>
-            <ref name="config-config-item-map-entry"/>
-        </oneOrMore>
-    </element>
-</define>
-<define name="config-config-item-map-indexed-attlist" combine="interleave">
-    <attribute name="config:name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="config-config-item-map-entry">
-    <element name="config:config-item-map-entry">
-        <ref name="config-config-item-map-entry-attlist"/>
-        <ref name="config-items"/>
-    </element>
-</define>
-<define name="config-config-item-map-entry-attlist" combine="interleave">
-    <optional>
-        <attribute name="config:name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="config-config-item-map-named">
-    <element name="config:config-item-map-named">
-        <ref name="config-config-item-map-named-attlist"/>
-        <oneOrMore>
-            <ref name="config-config-item-map-entry"/>
-        </oneOrMore>
-    </element>
-</define>
-<define name="config-config-item-map-named-attlist" combine="interleave">
-    <attribute name="config:name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="office-scripts">
-    <optional>
-        <element name="office:scripts">
-            <zeroOrMore>
-                <ref name="office-script"/>
-            </zeroOrMore>
-            <optional>
-                <ref name="office-event-listeners"/>
-            </optional>
-        </element>
-    </optional>
-</define>
-<define name="office-script">
-    <element name="office:script">
-        <ref name="office-script-attlist"/>
-        <mixed>
-            <ref name="anyElements"/>
-        </mixed>
-    </element>
-</define>
-<define name="office-script-attlist">
-    <attribute name="script:language">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="office-font-face-decls">
-    <optional>
-        <element name="office:font-face-decls">
-            <zeroOrMore>
-                <ref name="style-font-face"/>
-            </zeroOrMore>
-        </element>
-    </optional>
-</define>
-<define name="office-styles">
-    <optional>
-        <element name="office:styles">
-            <interleave>
-                <ref name="styles"/>
-                <zeroOrMore>
-                    <ref name="style-default-style"/>
-                </zeroOrMore>
-                <optional>
-                    <ref name="text-outline-style"/>
-                </optional>
-                <zeroOrMore>
-                    <ref name="text-notes-configuration"/>
-                </zeroOrMore>
-                <optional>
-                    <ref name="text-bibliography-configuration"/>
-                </optional>
-                <optional>
-                    <ref name="text-linenumbering-configuration"/>
-                </optional>
-                <zeroOrMore>
-                    <ref name="draw-gradient"/>
-                </zeroOrMore>
-                <zeroOrMore>
-                    <ref name="svg-linearGradient"/>
-                </zeroOrMore>
-                <zeroOrMore>
-                    <ref name="svg-radialGradient"/>
-                </zeroOrMore>
-                <zeroOrMore>
-                    <ref name="draw-hatch"/>
-                </zeroOrMore>
-                <zeroOrMore>
-                    <ref name="draw-fill-image"/>
-                </zeroOrMore>
-                <zeroOrMore>
-                    <ref name="draw-marker"/>
-                </zeroOrMore>
-                <zeroOrMore>
-                    <ref name="draw-stroke-dash"/>
-                </zeroOrMore>
-                <zeroOrMore>
-                    <ref name="draw-opacity"/>
-                </zeroOrMore>
-                <zeroOrMore>
-                    <ref name="style-presentation-page-layout"/>
-                </zeroOrMore>
-            </interleave>
-        </element>
-    </optional>
-</define>
-<define name="office-automatic-styles">
-    <optional>
-        <element name="office:automatic-styles">
-            <interleave>
-                <ref name="styles"/>
-                <zeroOrMore>
-                    <ref name="style-page-layout"/>
-                </zeroOrMore>
-            </interleave>
-        </element>
-    </optional>
-</define>
-<define name="office-master-styles">
-    <optional>
-        <element name="office:master-styles">
-            <interleave>
-                <zeroOrMore>
-                    <ref name="style-master-page"/>
-                </zeroOrMore>
-                <optional>
-                    <ref name="style-handout-master"/>
-                </optional>
-                <optional>
-                    <ref name="draw-layer-set"/>
-                </optional>
-            </interleave>
-        </element>
-    </optional>
-</define>
-
-<define name="styles">
-    <interleave>
-        <zeroOrMore>
-            <ref name="style-style"/>
-        </zeroOrMore>
-        <zeroOrMore>
-            <ref name="text-list-style"/>
-        </zeroOrMore>
-        <zeroOrMore>
-            <ref name="number-number-style"/>
-        </zeroOrMore>
-        <zeroOrMore>
-            <ref name="number-currency-style"/>
-        </zeroOrMore>
-        <zeroOrMore>
-            <ref name="number-percentage-style"/>
-        </zeroOrMore>
-        <zeroOrMore>
-            <ref name="number-date-style"/>
-        </zeroOrMore>
-        <zeroOrMore>
-            <ref name="number-time-style"/>
-        </zeroOrMore>
-        <zeroOrMore>
-            <ref name="number-boolean-style"/>
-        </zeroOrMore>
-        <zeroOrMore>
-            <ref name="number-text-style"/>
-        </zeroOrMore>
-    </interleave>
-</define>
-<define name="office-meta-data" combine="choice">
-    <element name="meta:generator">
-        <ref name="string"/>
-    </element>
-</define>
-<define name="office-meta-data" combine="choice">
-    <element name="dc:title">
-        <ref name="string"/>
-    </element>
-</define>
-<define name="office-meta-data" combine="choice">
-    <element name="dc:description">
-        <ref name="string"/>
-    </element>
-</define>
-<define name="office-meta-data" combine="choice">
-    <element name="dc:subject">
-        <ref name="string"/>
-    </element>
-</define>
-<define name="office-meta-data" combine="choice">
-    <element name="meta:keyword">
-        <ref name="string"/>
-    </element>
-</define>
-<define name="office-meta-data" combine="choice">
-    <element name="meta:initial-creator">
-        <ref name="string"/>
-    </element>
-</define>
-<define name="office-meta-data" combine="choice">
-    <ref name="dc-creator"/>
-</define>
-<define name="dc-creator">
-    <element name="dc:creator">
-        <ref name="string"/>
-    </element>
-</define>
-<define name="office-meta-data" combine="choice">
-    <element name="meta:printed-by">
-        <ref name="string"/>
-    </element>
-</define>
-<define name="office-meta-data" combine="choice">
-    <element name="meta:creation-date">
-        <ref name="dateTime"/>
-    </element>
-</define>
-<define name="office-meta-data" combine="choice">
-    <ref name="dc-date"/>
-</define>
-<define name="dc-date">
-    <element name="dc:date">
-        <ref name="dateTime"/>
-    </element>
-</define>
-<define name="office-meta-data" combine="choice">
-    <element name="meta:print-date">
-        <ref name="dateTime"/>
-    </element>
-</define>
-<define name="office-meta-data" combine="choice">
-    <element name="meta:template">
-        <attribute name="xlink:href">
-            <ref name="anyURI"/>
-        </attribute>
-        <optional>
-            <attribute name="xlink:type" a:defaultValue="simple">
-                <value>simple</value>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="xlink:actuate" a:defaultValue="onRequest">
-                <value>onRequest</value>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="xlink:title">
-                <ref name="string"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="meta:date">
-                <ref name="dateTime"/>
-            </attribute>
-        </optional>
-    </element>
-</define>
-<define name="office-meta-data" combine="choice">
-    <element name="meta:auto-reload">
-        <optional>
-            <attribute name="xlink:type" a:defaultValue="simple">
-                <value>simple</value>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="xlink:show" a:defaultValue="replace">
-                <value>replace</value>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="xlink:actuate" a:defaultValue="onLoad">
-                <value>onLoad</value>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="xlink:href">
-                <ref name="anyURI"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="meta:delay">
-                <ref name="duration"/>
-            </attribute>
-        </optional>
-    </element>
-</define>
-<define name="office-meta-data" combine="choice">
-    <element name="meta:hyperlink-behaviour">
-        <optional>
-            <attribute name="office:target-frame-name">
-                <ref name="targetFrameName"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="xlink:show">
-                <choice>
-                    <value>new</value>
-                    <value>replace</value>
-                </choice>
-            </attribute>
-        </optional>
-    </element>
-</define>
-<define name="office-meta-data" combine="choice">
-    <element name="dc:language">
-        <ref name="language"/>
-    </element>
-</define>
-<define name="office-meta-data" combine="choice">
-    <element name="meta:editing-cycles">
-        <ref name="nonNegativeInteger"/>
-    </element>
-</define>
-<define name="office-meta-data" combine="choice">
-    <element name="meta:editing-duration">
-        <ref name="duration"/>
-    </element>
-</define>
-<define name="office-meta-data" combine="choice">
-    <element name="meta:document-statistic">
-        <optional>
-            <attribute name="meta:page-count">
-                <ref name="nonNegativeInteger"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="meta:table-count">
-                <ref name="nonNegativeInteger"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="meta:draw-count">
-                <ref name="nonNegativeInteger"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="meta:image-count">
-                <ref name="nonNegativeInteger"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="meta:ole-object-count">
-                <ref name="nonNegativeInteger"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="meta:paragraph-count">
-                <ref name="nonNegativeInteger"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="meta:word-count">
-                <ref name="nonNegativeInteger"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="meta:character-count">
-                <ref name="nonNegativeInteger"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="frame-count">
-                <ref name="nonNegativeInteger"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="sentence-count">
-                <ref name="nonNegativeInteger"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="syllable-count">
-                <ref name="nonNegativeInteger"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="non-whitespace-character-count">
-                <ref name="nonNegativeInteger"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="meta:row-count">
-                <ref name="nonNegativeInteger"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="meta:cell-count">
-                <ref name="nonNegativeInteger"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="meta:object-count">
-                <ref name="nonNegativeInteger"/>
-            </attribute>
-        </optional>
-    </element>
-</define>
-<define name="office-meta-data" combine="choice">
-    <element name="meta:user-defined">
-        <attribute name="meta:name">
-            <ref name="string"/>
-        </attribute>
-        <choice>
-            <group>
-                <attribute name="meta:value-type">
-                    <value>float</value>
-                </attribute>
-                <ref name="double"/>
-            </group>
-            <group>
-                <attribute name="meta:value-type">
-                    <value>date</value>
-                </attribute>
-                <ref name="dateOrDateTime"/>
-            </group>
-            <group>
-                <attribute name="meta:value-type">
-                    <value>time</value>
-                </attribute>
-                <ref name="duration"/>
-            </group>
-            <group>
-                <attribute name="meta:value-type">
-                    <value>boolean</value>
-                </attribute>
-                <ref name="boolean"/>
-            </group>
-            <group>
-                <attribute name="meta:value-type">
-                    <value>string</value>
-                </attribute>
-                <ref name="string"/>
-            </group>
-            <text/>
-        </choice>
-    </element>
-</define>
-<define name="text-h">
-    <element name="text:h">
-        <ref name="heading-attrs"/>
-        <ref name="paragraph-attrs"/>
-        <optional>
-            <ref name="text-number"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="paragraph-content"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="heading-attrs" combine="interleave">
-    <attribute name="text:outline-level">
-        <ref name="positiveInteger"/>
-    </attribute>
-</define>
-<define name="heading-attrs" combine="interleave">
-    <optional>
-        <attribute name="text:restart-numbering" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="heading-attrs" combine="interleave">
-    <optional>
-        <attribute name="text:start-value">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="heading-attrs" combine="interleave">
-    <optional>
-        <attribute name="text:is-list-header" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-number">
-    <element name="text:number">
-        <ref name="string"/>
-    </element>
-</define>
-<define name="text-p">
-    <element name="text:p">
-        <ref name="paragraph-attrs"/>
-        <zeroOrMore>
-            <ref name="paragraph-content"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="paragraph-attrs">
-    <optional>
-        <attribute name="text:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="text:class-names">
-            <ref name="styleNameRefs"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="text:cond-style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="paragraph-attrs" combine="interleave">
-    <optional>
-        <ref name="text-id"/>
-    </optional>
-</define>
-<define name="text-page-sequence">
-    <element name="text:page-sequence">
-        <oneOrMore>
-            <ref name="text-page"/>
-        </oneOrMore>
-    </element>
-</define>
-<define name="text-page">
-    <element name="text:page">
-        <ref name="text-page-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="text-page-attlist">
-    <attribute name="text:master-page-name">
-        <ref name="styleNameRef"/>
-    </attribute>
-</define>
-<define name="text-list">
-    <element name="text:list">
-        <ref name="text-list-attr"/>
-        <optional>
-            <ref name="text-list-header"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="text-list-item"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="text-list-attr" combine="interleave">
-    <optional>
-        <attribute name="text:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-list-attr" combine="interleave">
-    <optional>
-        <attribute name="text:continue-numbering">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-list-item">
-    <element name="text:list-item">
-        <ref name="text-list-item-attr"/>
-        <ref name="text-list-item-content"/>
-    </element>
-</define>
-<define name="text-list-item-content">
-    <optional>
-        <ref name="text-number"/>
-    </optional>
-    <zeroOrMore>
-        <choice>
-            <ref name="text-p"/>
-            <ref name="text-h"/>
-            <ref name="text-list"/>
-        </choice>
-    </zeroOrMore>
-</define>
-<define name="text-list-item-attr" combine="interleave">
-    <optional>
-        <attribute name="text:start-value">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-list-header">
-    <element name="text:list-header">
-        <ref name="text-list-item-content"/>
-    </element>
-</define>
-<define name="text-numbered-paragraph">
-    <element name="text:numbered-paragraph">
-        <ref name="text-numbered-paragraph-attr"/>
-        <optional>
-            <ref name="text-number"/>
-        </optional>
-        <choice>
-            <ref name="text-p"/>
-            <ref name="text-h"/>
-        </choice>
-    </element>
-</define>
-<define name="text-numbered-paragraph-attr" combine="interleave">
-    <optional>
-        <attribute name="text:level" a:defaultValue="1">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-numbered-paragraph-attr" combine="interleave">
-    <ref name="text-list-attr"/>
-</define>
-<define name="text-numbered-paragraph-attr" combine="interleave">
-    <ref name="text-list-item-attr"/>
-</define>
-<define name="text-section">
-    <element name="text:section">
-        <ref name="text-section-attr"/>
-        <choice>
-            <ref name="text-section-source"/>
-            <ref name="text-section-source-dde"/>
-            <empty/>
-        </choice>
-        <zeroOrMore>
-            <ref name="text-content"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="text-section-attr" combine="interleave">
-    <ref name="sectionAttr"/>
-</define>
-<define name="sectionAttr" combine="interleave">
-    <optional>
-        <attribute name="text:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="sectionAttr" combine="interleave">
-    <attribute name="text:name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="sectionAttr" combine="interleave">
-    <optional>
-        <attribute name="text:protected">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="sectionAttr" combine="interleave">
-    <optional>
-        <attribute name="text:protection-key">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-section-attr" combine="interleave">
-    <choice>
-        <attribute name="text:display">
-            <choice>
-                <value>true</value>
-                <value>none</value>
-            </choice>
-        </attribute>
-        <group>
-            <attribute name="text:display">
-                <value>condition</value>
-            </attribute>
-            <attribute name="text:condition">
-                <ref name="string"/>
-            </attribute>
-        </group>
-        <empty/>
-    </choice>
-</define>
-<define name="text-section-source">
-    <element name="text:section-source">
-        <ref name="text-section-source-attr"/>
-    </element>
-</define>
-<define name="text-section-source-attr" combine="interleave">
-    <optional>
-        <attribute name="xlink:href">
-            <ref name="anyURI"/>
-        </attribute>
-        <optional>
-            <attribute name="xlink:type" a:defaultValue="simple">
-                <value>simple</value>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="xlink:show" a:defaultValue="embed">
-                <value>embed</value>
-            </attribute>
-        </optional>
-    </optional>
-</define>
-<define name="text-section-source-attr" combine="interleave">
-    <optional>
-        <attribute name="text:section-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-section-source-attr" combine="interleave">
-    <optional>
-        <attribute name="text:filter-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-section-source-dde">
-    <ref name="office-dde-source"/>
-</define>
-<define name="text-tracked-changes">
-    <optional>
-        <element name="text:tracked-changes">
-            <ref name="text-tracked-changes-attr"/>
-            <zeroOrMore>
-                <ref name="text-changed-region"/>
-            </zeroOrMore>
-        </element>
-    </optional>
-</define>
-<define name="text-tracked-changes-attr" combine="interleave">
-    <optional>
-        <attribute name="text:track-changes" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-changed-region">
-    <element name="text:changed-region">
-        <ref name="text-changed-region-attr"/>
-        <ref name="text-changed-region-content"/>
-    </element>
-</define>
-<define name="text-changed-region-attr" combine="interleave">
-    <attribute name="text:id">
-        <ref name="ID"/>
-    </attribute>
-</define>
-<define name="text-changed-region-content" combine="choice">
-    <element name="text:insertion">
-        <ref name="office-change-info"/>
-    </element>
-</define>
-<define name="text-changed-region-content" combine="choice">
-    <element name="text:deletion">
-        <ref name="office-change-info"/>
-        <zeroOrMore>
-            <ref name="text-content"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="text-changed-region-content" combine="choice">
-    <element name="text:format-change">
-        <ref name="office-change-info"/>
-    </element>
-</define>
-<define name="change-marks">
-    <choice>
-        <element name="text:change">
-            <ref name="change-mark-attr"/>
-        </element>
-        <element name="text:change-start">
-            <ref name="change-mark-attr"/>
-        </element>
-        <element name="text:change-end">
-            <ref name="change-mark-attr"/>
-        </element>
-    </choice>
-</define>
-<define name="change-mark-attr">
-    <attribute name="text:change-id">
-        <ref name="IDREF"/>
-    </attribute>
-</define>
-<define name="text-decls">
-    <optional>
-        <element name="text:variable-decls">
-            <zeroOrMore>
-                <ref name="text-variable-decl"/>
-            </zeroOrMore>
-        </element>
-    </optional>
-    <optional>
-        <element name="text:sequence-decls">
-            <zeroOrMore>
-                <ref name="text-sequence-decl"/>
-            </zeroOrMore>
-        </element>
-    </optional>
-    <optional>
-        <element name="text:user-field-decls">
-            <zeroOrMore>
-                <ref name="text-user-field-decl"/>
-            </zeroOrMore>
-        </element>
-    </optional>
-    <optional>
-        <element name="text:dde-connection-decls">
-            <zeroOrMore>
-                <ref name="text-dde-connection-decl"/>
-            </zeroOrMore>
-        </element>
-    </optional>
-    <optional>
-        <ref name="text-alphabetical-index-auto-mark-file"/>
-    </optional>
-</define>
-<define name="paragraph-content" combine="choice">
-    <text/>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:s">
-        <optional>
-            <attribute name="text:c">
-                <ref name="nonNegativeInteger"/>
-            </attribute>
-        </optional>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:tab">
-        <ref name="text-tab-attr"/>
-    </element>
-</define>
-<define name="text-tab-attr">
-    <optional>
-        <attribute name="text:tab-ref">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:line-break">
-        <empty/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:span">
-        <optional>
-            <attribute name="text:style-name">
-                <ref name="styleNameRef"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="text:class-names">
-                <ref name="styleNameRefs"/>
-            </attribute>
-        </optional>
-        <zeroOrMore>
-            <ref name="paragraph-content"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:a">
-        <ref name="text-a-attlist"/>
-        <optional>
-            <ref name="office-event-listeners"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="paragraph-content"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="text-a-attlist" combine="interleave">
-    <optional>
-        <attribute name="office:name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-a-attlist" combine="interleave">
-    <attribute name="xlink:href">
-        <ref name="anyURI"/>
-    </attribute>
-    <optional>
-        <attribute name="xlink:type" a:defaultValue="simple">
-            <value>simple</value>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="xlink:actuate" a:defaultValue="onRequest">
-            <value>onRequest</value>
-        </attribute>
-    </optional>
-</define>
-<define name="text-a-attlist" combine="interleave">
-    <optional>
-        <attribute name="office:target-frame-name">
-            <ref name="targetFrameName"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="xlink:show">
-            <choice>
-                <value>new</value>
-                <value>replace</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="text-a-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="text:visited-style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="paragraph-content" combine="choice">
-    <choice>
-        <element name="text:bookmark">
-            <attribute name="text:name">
-                <ref name="string"/>
-            </attribute>
-        </element>
-        <element name="text:bookmark-start">
-            <attribute name="text:name">
-                <ref name="string"/>
-            </attribute>
-        </element>
-        <element name="text:bookmark-end">
-            <attribute name="text:name">
-                <ref name="string"/>
-            </attribute>
-        </element>
-    </choice>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:reference-mark">
-        <attribute name="text:name">
-            <ref name="string"/>
-        </attribute>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <choice>
-        <element name="text:reference-mark-start">
-            <attribute name="text:name">
-                <ref name="string"/>
-            </attribute>
-        </element>
-        <element name="text:reference-mark-end">
-            <attribute name="text:name">
-                <ref name="string"/>
-            </attribute>
-        </element>
-    </choice>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:note">
-        <ref name="text-note-class"/>
-        <optional>
-            <attribute name="text:id">
-                <ref name="string"/>
-            </attribute>
-        </optional>
-        <element name="text:note-citation">
-            <optional>
-                <attribute name="text:label">
-                    <ref name="string"/>
-                </attribute>
-            </optional>
-            <text/>
-        </element>
-        <element name="text:note-body">
-            <zeroOrMore>
-                <ref name="text-content"/>
-            </zeroOrMore>
-        </element>
-    </element>
-</define>
-<define name="text-note-class">
-    <attribute name="text:note-class">
-        <choice>
-            <value>footnote</value>
-            <value>endnote</value>
-        </choice>
-    </attribute>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:ruby">
-        <optional>
-            <attribute name="text:style-name">
-                <ref name="styleNameRef"/>
-            </attribute>
-        </optional>
-        <element name="text:ruby-base">
-            <ref name="paragraph-content"/>
-        </element>
-        <element name="text:ruby-text">
-            <optional>
-                <attribute name="text:style-name">
-                    <ref name="styleNameRef"/>
-                </attribute>
-            </optional>
-            <text/>
-        </element>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <ref name="office-annotation"/>
-</define>
-<define name="paragraph-content" combine="choice">
-    <ref name="change-marks"/>
-</define>
-<define name="paragraph-content" combine="choice">
-    <choice>
-        <ref name="shape"/>
-        <ref name="draw-a"/>
-    </choice>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:date">
-        <ref name="text-date-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="text-date-attlist" combine="interleave">
-    <interleave>
-        <ref name="common-field-fixed-attlist"/>
-        <ref name="common-field-data-style-name-attlist"/>
-    </interleave>
-</define>
-<define name="text-date-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:date-value">
-            <ref name="dateOrDateTime"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-date-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:date-adjust">
-            <ref name="duration"/>
-        </attribute>
-    </optional>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:time">
-        <ref name="text-time-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="text-time-attlist" combine="interleave">
-    <interleave>
-        <ref name="common-field-fixed-attlist"/>
-        <ref name="common-field-data-style-name-attlist"/>
-    </interleave>
-</define>
-<define name="text-time-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:time-value">
-            <ref name="timeOrDateTime"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-time-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:time-adjust">
-            <ref name="duration"/>
-        </attribute>
-    </optional>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:page-number">
-        <ref name="text-page-number-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="text-page-number-attlist" combine="interleave">
-    <interleave>
-        <ref name="common-field-num-format-attlist"/>
-        <ref name="common-field-fixed-attlist"/>
-    </interleave>
-</define>
-<define name="text-page-number-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:page-adjust">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-page-number-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:select-page">
-            <choice>
-                <value>previous</value>
-                <value>current</value>
-                <value>next</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:page-continuation">
-        <ref name="text-page-continuation-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="text-page-continuation-attlist" combine="interleave">
-    <attribute name="text:select-page">
-        <choice>
-            <value>previous</value>
-            <value>next</value>
-        </choice>
-    </attribute>
-</define>
-<define name="text-page-continuation-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:string-value">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:sender-firstname">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:sender-lastname">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:sender-initials">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:sender-title">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:sender-position">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:sender-email">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:sender-phone-private">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:sender-fax">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:sender-company">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:sender-phone-work">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:sender-street">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:sender-city">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:sender-postal-code">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:sender-country">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:sender-state-or-province">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:author-name">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:author-initials">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:chapter">
-        <ref name="text-chapter-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="text-chapter-attlist" combine="interleave">
-    <attribute name="text:display">
-        <choice>
-            <value>name</value>
-            <value>number</value>
-            <value>number-and-name</value>
-            <value>plain-number-and-name</value>
-            <value>plain-number</value>
-        </choice>
-    </attribute>
-</define>
-<define name="text-chapter-attlist" combine="interleave">
-    <attribute name="text:outline-level">
-        <ref name="nonNegativeInteger"/>
-    </attribute>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:file-name">
-        <ref name="text-file-name-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="text-file-name-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:display">
-            <choice>
-                <value>full</value>
-                <value>path</value>
-                <value>name</value>
-                <value>name-and-extension</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="text-file-name-attlist" combine="interleave">
-    <ref name="common-field-fixed-attlist"/>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:template-name">
-        <ref name="text-template-name-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="text-template-name-attlist">
-    <optional>
-        <attribute name="text:display">
-            <choice>
-                <value>full</value>
-                <value>path</value>
-                <value>name</value>
-                <value>name-and-extension</value>
-                <value>area</value>
-                <value>title</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:sheet-name">
-        <text/>
-    </element>
-</define>
-<define name="text-variable-decl">
-    <element name="text:variable-decl">
-        <ref name="common-field-name-attlist"/>
-        <ref name="common-value-type-attlist"/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:variable-set">
-        <interleave>
-            <ref name="common-field-name-attlist"/>
-            <ref name="common-field-formula-attlist"/>
-            <ref name="common-value-and-type-attlist"/>
-            <ref name="common-field-display-value-none-attlist"/>
-            <ref name="common-field-data-style-name-attlist"/>
-        </interleave>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:variable-get">
-        <interleave>
-            <ref name="common-field-name-attlist"/>
-            <ref name="common-field-display-value-formula-attlist"/>
-            <ref name="common-field-data-style-name-attlist"/>
-        </interleave>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:variable-input">
-        <interleave>
-            <ref name="common-field-name-attlist"/>
-            <ref name="common-field-description-attlist"/>
-            <ref name="common-value-type-attlist"/>
-            <ref name="common-field-display-value-none-attlist"/>
-            <ref name="common-field-data-style-name-attlist"/>
-        </interleave>
-        <text/>
-    </element>
-</define>
-<define name="text-user-field-decl">
-    <element name="text:user-field-decl">
-        <ref name="common-field-name-attlist"/>
-        <optional>
-            <ref name="common-field-formula-attlist"/>
-        </optional>
-        <ref name="common-value-and-type-attlist"/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:user-field-get">
-        <interleave>
-            <ref name="common-field-name-attlist"/>
-            <ref name="common-field-display-value-formula-none-attlist"/>
-            <ref name="common-field-data-style-name-attlist"/>
-        </interleave>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:user-field-input">
-        <interleave>
-            <ref name="common-field-name-attlist"/>
-            <ref name="common-field-description-attlist"/>
-            <ref name="common-field-data-style-name-attlist"/>
-        </interleave>
-        <text/>
-    </element>
-</define>
-<define name="text-sequence-decl">
-    <element name="text:sequence-decl">
-        <ref name="text-sequence-decl-attlist"/>
-    </element>
-</define>
-<define name="text-sequence-decl-attlist" combine="interleave">
-    <ref name="common-field-name-attlist"/>
-</define>
-<define name="text-sequence-decl-attlist" combine="interleave">
-    <attribute name="text:display-outline-level">
-        <ref name="nonNegativeInteger"/>
-    </attribute>
-</define>
-<define name="text-sequence-decl-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:separation-character">
-            <ref name="character"/>
-        </attribute>
-    </optional>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:sequence">
-        <interleave>
-            <ref name="common-field-name-attlist"/>
-            <ref name="common-field-formula-attlist"/>
-            <ref name="common-field-num-format-attlist"/>
-            <ref name="text-sequence-ref-name"/>
-        </interleave>
-        <text/>
-    </element>
-</define>
-<define name="text-sequence-ref-name">
-    <optional>
-        <attribute name="text:ref-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:expression">
-        <interleave>
-            <ref name="common-field-formula-attlist"/>
-            <optional>
-                <ref name="common-value-and-type-attlist"/>
-            </optional>
-            <ref name="common-field-display-value-formula-attlist"/>
-            <ref name="common-field-data-style-name-attlist"/>
-        </interleave>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:text-input">
-        <ref name="common-field-description-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:initial-creator">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:creation-date">
-        <interleave>
-            <ref name="common-field-fixed-attlist"/>
-            <ref name="common-field-data-style-name-attlist"/>
-            <optional>
-                <attribute name="text:date-value">
-                    <ref name="dateOrDateTime"/>
-                </attribute>
-            </optional>
-        </interleave>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:creation-time">
-        <interleave>
-            <ref name="common-field-fixed-attlist"/>
-            <ref name="common-field-data-style-name-attlist"/>
-            <optional>
-                <attribute name="text:time-value">
-                    <ref name="timeOrDateTime"/>
-                </attribute>
-            </optional>
-        </interleave>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:description">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:user-defined">
-        <interleave>
-            <ref name="common-field-fixed-attlist"/>
-            <attribute name="text:name">
-                <ref name="string"/>
-            </attribute>
-            <ref name="common-field-data-style-name-attlist"/>
-            <optional>
-                <attribute name="office:value">
-                    <ref name="double"/>
-                </attribute>
-            </optional>
-            <optional>
-                <attribute name="office:date-value">
-                    <ref name="dateOrDateTime"/>
-                </attribute>
-            </optional>
-            <optional>
-                <attribute name="office:time-value">
-                    <ref name="duration"/>
-                </attribute>
-            </optional>
-            <optional>
-                <attribute name="office:boolean-value">
-                    <ref name="boolean"/>
-                </attribute>
-            </optional>
-            <optional>
-                <attribute name="office:string-value">
-                    <ref name="string"/>
-                </attribute>
-            </optional>
-        </interleave>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:print-time">
-        <interleave>
-            <ref name="common-field-fixed-attlist"/>
-            <ref name="common-field-data-style-name-attlist"/>
-            <optional>
-                <attribute name="text:time-value">
-                    <ref name="time"/>
-                </attribute>
-            </optional>
-        </interleave>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:print-date">
-        <interleave>
-            <ref name="common-field-fixed-attlist"/>
-            <ref name="common-field-data-style-name-attlist"/>
-            <optional>
-                <attribute name="text:date-value">
-                    <ref name="date"/>
-                </attribute>
-            </optional>
-        </interleave>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:printed-by">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:title">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:subject">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:keywords">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:editing-cycles">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:editing-duration">
-        <interleave>
-            <ref name="common-field-fixed-attlist"/>
-            <ref name="common-field-data-style-name-attlist"/>
-            <optional>
-                <attribute name="text:duration">
-                    <ref name="duration"/>
-                </attribute>
-            </optional>
-        </interleave>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:modification-time">
-        <interleave>
-            <ref name="common-field-fixed-attlist"/>
-            <ref name="common-field-data-style-name-attlist"/>
-            <optional>
-                <attribute name="text:time-value">
-                    <ref name="time"/>
-                </attribute>
-            </optional>
-        </interleave>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:modification-date">
-        <interleave>
-            <ref name="common-field-fixed-attlist"/>
-            <ref name="common-field-data-style-name-attlist"/>
-            <optional>
-                <attribute name="text:date-value">
-                    <ref name="date"/>
-                </attribute>
-            </optional>
-        </interleave>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:creator">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element>
-        <choice>
-            <name>text:page-count</name>
-            <name>text:paragraph-count</name>
-            <name>text:word-count</name>
-            <name>text:character-count</name>
-            <name>text:table-count</name>
-            <name>text:image-count</name>
-            <name>text:object-count</name>
-        </choice>
-        <ref name="common-field-num-format-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="common-field-database-table">
-    <ref name="common-field-database-table-attlist"/>
-    <ref name="common-field-database-name"/>
-</define>
-<define name="common-field-database-name" combine="choice">
-    <optional>
-        <attribute name="text:database-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-field-database-name" combine="choice">
-    <ref name="form-connection-resource"/>
-</define>
-<define name="common-field-database-table-attlist" combine="interleave">
-    <attribute name="text:table-name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="common-field-database-table-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:table-type">
-            <choice>
-                <value>table</value>
-                <value>query</value>
-                <value>command</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:database-display">
-        <ref name="text-database-display-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="text-database-display-attlist" combine="interleave">
-    <ref name="common-field-database-table"/>
-</define>
-<define name="text-database-display-attlist" combine="interleave">
-    <ref name="common-field-data-style-name-attlist"/>
-</define>
-<define name="text-database-display-attlist" combine="interleave">
-    <attribute name="text:column-name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:database-next">
-        <ref name="text-database-next-attlist"/>
-    </element>
-</define>
-<define name="text-database-next-attlist" combine="interleave">
-    <ref name="common-field-database-table"/>
-</define>
-<define name="text-database-next-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:condition">
-            <ref name="formula"/>
-        </attribute>
-    </optional>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:database-row-select">
-        <ref name="text-database-row-select-attlist"/>
-    </element>
-</define>
-<define name="text-database-row-select-attlist" combine="interleave">
-    <ref name="common-field-database-table"/>
-</define>
-<define name="text-database-row-select-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:condition">
-            <ref name="formula"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-database-row-select-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:row-number">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:database-row-number">
-        <interleave>
-            <ref name="common-field-database-table"/>
-            <ref name="common-field-num-format-attlist"/>
-            <optional>
-                <attribute name="text:value">
-                    <ref name="nonNegativeInteger"/>
-                </attribute>
-            </optional>
-        </interleave>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:database-name">
-        <ref name="common-field-database-table"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:page-variable-set">
-        <ref name="text-set-page-variable-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="text-set-page-variable-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:active">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-set-page-variable-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:page-adjust">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:page-variable-get">
-        <ref name="text-get-page-variable-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="text-get-page-variable-attlist" combine="interleave">
-    <ref name="common-field-num-format-attlist"/>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:placeholder">
-        <ref name="text-placeholder-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="text-placeholder-attlist" combine="interleave">
-    <attribute name="text:placeholder-type">
-        <choice>
-            <value>text</value>
-            <value>table</value>
-            <value>text-box</value>
-            <value>image</value>
-            <value>object</value>
-        </choice>
-    </attribute>
-</define>
-<define name="text-placeholder-attlist" combine="interleave">
-    <ref name="common-field-description-attlist"/>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:conditional-text">
-        <ref name="text-conditional-text-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="text-conditional-text-attlist" combine="interleave">
-    <attribute name="text:condition">
-        <ref name="formula"/>
-    </attribute>
-</define>
-<define name="text-conditional-text-attlist" combine="interleave">
-    <attribute name="text:string-value-if-true">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="text-conditional-text-attlist" combine="interleave">
-    <attribute name="text:string-value-if-false">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="text-conditional-text-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:current-value">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:hidden-text">
-        <ref name="text-hidden-text-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="text-hidden-text-attlist" combine="interleave">
-    <attribute name="text:condition">
-        <ref name="formula"/>
-    </attribute>
-</define>
-<define name="text-hidden-text-attlist" combine="interleave">
-    <attribute name="text:string-value">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="text-hidden-text-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:is-hidden">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element>
-        <choice>
-            <name>text:reference-ref</name>
-            <name>text:bookmark-ref</name>
-        </choice>
-        <interleave>
-            <ref name="text-common-ref-content"/>
-            <ref name="text-ref-content"/>
-        </interleave>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:note-ref">
-        <interleave>
-            <ref name="text-common-ref-content"/>
-            <ref name="text-note-ref-content"/>
-            <ref name="text-ref-content"/>
-        </interleave>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:sequence-ref">
-        <interleave>
-            <ref name="text-common-ref-content"/>
-            <ref name="text-sequence-ref-content"/>
-        </interleave>
-    </element>
-</define>
-<define name="text-common-ref-content" combine="interleave">
-    <text/>
-</define>
-<define name="text-common-ref-content" combine="interleave">
-    <optional>
-        <attribute name="text:ref-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-note-ref-content" combine="interleave">
-    <ref name="text-note-class"/>
-</define>
-<define name="text-ref-content" combine="interleave">
-    <optional>
-        <attribute name="text:reference-format">
-            <choice>
-                <value>page</value>
-                <value>chapter</value>
-                <value>direction</value>
-                <value>text</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="text-sequence-ref-content" combine="interleave">
-    <optional>
-        <attribute name="text:reference-format">
-            <choice>
-                <value>page</value>
-                <value>chapter</value>
-                <value>direction</value>
-                <value>text</value>
-                <value>category-and-value</value>
-                <value>caption</value>
-                <value>value</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:script">
-        <interleave>
-            <choice>
-                <group>
-                    <attribute name="xlink:href">
-                        <ref name="anyURI"/>
-                    </attribute>
-                    <optional>
-                        <attribute name="xlink:type" a:defaultValue="simple">
-                            <value>simple</value>
-                        </attribute>
-                    </optional>
-                </group>    
-                <text/>
-            </choice>
-            <optional>
-                <attribute name="script:language">
-                    <ref name="string"/>
-                </attribute>
-            </optional>
-        </interleave>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:execute-macro">
-        <optional>
-            <attribute name="text:name">
-                <ref name="string"/>
-            </attribute>
-        </optional>
-        <optional>
-            <ref name="office-event-listeners"/>
-        </optional>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:hidden-paragraph">
-        <ref name="text-hidden-paragraph-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="text-hidden-paragraph-attlist" combine="interleave">
-    <attribute name="text:condition">
-        <ref name="formula"/>
-    </attribute>
-</define>
-<define name="text-hidden-paragraph-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:is-hidden">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:dde-connection">
-        <attribute name="text:connection-name">
-            <ref name="string"/>
-        </attribute>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:measure">
-        <attribute name="text:kind">
-            <choice>
-                <value>value</value>
-                <value>unit</value>
-                <value>gap</value>
-            </choice>
-        </attribute>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:table-formula">
-        <interleave>
-            <ref name="common-field-formula-attlist"/>
-            <ref name="common-field-display-value-formula-attlist"/>
-            <ref name="common-field-data-style-name-attlist"/>
-        </interleave>
-        <text/>
-    </element>
-</define>
-<define name="common-value-type-attlist">
-    <attribute name="office:value-type">
-        <ref name="valueType"/>
-    </attribute>
-</define>
-<define name="common-value-and-type-attlist">
-    <choice>
-        <group>
-            <attribute name="office:value-type">
-                <value>float</value>
-            </attribute>
-            <attribute name="office:value">
-                <ref name="double"/>
-            </attribute>
-        </group>
-        <group>
-            <attribute name="office:value-type">
-                <value>percentage</value>
-            </attribute>
-            <attribute name="office:value">
-                <ref name="double"/>
-            </attribute>
-        </group>
-        <group>
-            <attribute name="office:value-type">
-                <value>currency</value>
-            </attribute>
-            <attribute name="office:value">
-                <ref name="double"/>
-            </attribute>
-            <optional>
-                <attribute name="office:currency">
-                    <ref name="string"/>
-                </attribute>
-            </optional>
-        </group>
-        <group>
-            <attribute name="office:value-type">
-                <value>date</value>
-            </attribute>
-            <attribute name="office:date-value">
-                <ref name="dateOrDateTime"/>
-            </attribute>
-        </group>
-        <group>
-            <attribute name="office:value-type">
-                <value>time</value>
-            </attribute>
-            <attribute name="office:time-value">
-                <ref name="duration"/>
-            </attribute>
-        </group>
-        <group>
-            <attribute name="office:value-type">
-                <value>boolean</value>
-            </attribute>
-            <attribute name="office:boolean-value">
-                <ref name="boolean"/>
-            </attribute>
-        </group>
-        <group>
-            <attribute name="office:value-type">
-                <value>string</value>
-            </attribute>
-            <optional>
-                <attribute name="office:string-value">
-                    <ref name="string"/>
-                </attribute>
-            </optional>
-        </group>
-    </choice>
-</define>
-<define name="common-field-fixed-attlist">
-    <optional>
-        <attribute name="text:fixed">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-field-name-attlist">
-    <attribute name="text:name">
-        <ref name="variableName"/>
-    </attribute>
-</define>
-<define name="common-field-description-attlist">
-    <optional>
-        <attribute name="text:description">
-            <text/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-field-display-value-none-attlist">
-    <optional>
-        <attribute name="text:display">
-            <choice>
-                <value>value</value>
-                <value>none</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="common-field-display-value-formula-none-attlist">
-    <optional>
-        <attribute name="text:display">
-            <choice>
-                <value>value</value>
-                <value>formula</value>
-                <value>none</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="common-field-display-value-formula-attlist">
-    <optional>
-        <attribute name="text:display">
-            <choice>
-                <value>value</value>
-                <value>formula</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="common-field-formula-attlist">
-    <optional>
-        <attribute name="text:formula">
-            <ref name="formula"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-field-data-style-name-attlist">
-    <optional>
-        <attribute name="style:data-style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-field-num-format-attlist">
-    <optional>
-        <ref name="common-num-format-attlist"/>
-    </optional>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:toc-mark-start">
-        <ref name="text-toc-mark-start-attrs"/>
-    </element>
-</define>
-<define name="text-toc-mark-start-attrs">
-    <ref name="text-id"/>
-    <ref name="text-outline-level"/>
-</define>
-<define name="text-outline-level">
-    <optional>
-        <attribute name="text:outline-level">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-id">
-    <attribute name="text:id">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:toc-mark-end">
-        <ref name="text-id"/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:toc-mark">
-        <attribute name="text:string-value">
-            <ref name="string"/>
-        </attribute>
-        <ref name="text-outline-level"/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:user-index-mark-start">
-        <ref name="text-id"/>
-        <ref name="text-outline-level"/>
-        <ref name="text-index-name"/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:user-index-mark-end">
-        <ref name="text-id"/>
-        <ref name="text-outline-level"/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:user-index-mark">
-        <attribute name="text:string-value">
-            <ref name="string"/>
-        </attribute>
-        <ref name="text-outline-level"/>
-        <ref name="text-index-name"/>
-    </element>
-</define>
-<define name="text-index-name">
-    <attribute name="text:index-name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:alphabetical-index-mark-start">
-        <ref name="text-id"/>
-        <ref name="text-alphabetical-index-mark-attrs"/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:alphabetical-index-mark-end">
-        <ref name="text-id"/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:alphabetical-index-mark">
-        <attribute name="text:string-value">
-            <ref name="string"/>
-        </attribute>
-        <ref name="text-alphabetical-index-mark-attrs"/>
-    </element>
-</define>
-<define name="text-alphabetical-index-mark-attrs" combine="interleave">
-    <optional>
-        <attribute name="text:key1">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="text:key2">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-alphabetical-index-mark-attrs" combine="interleave">
-    <optional>
-        <attribute name="text:string-value-phonetic">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="text:key1-phonetic">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="text:key2-phonetic">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-alphabetical-index-mark-attrs" combine="interleave">
-    <optional>
-        <attribute name="text:main-entry" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:bibliography-mark">
-        <attribute name="text:bibliography-type">
-            <ref name="text-bibliography-types"/>
-        </attribute>
-        <zeroOrMore>
-            <attribute>
-                <choice>
-                    <name>text:identifier</name>
-                    <name>text:address</name>
-                    <name>text:annote</name>
-                    <name>text:author</name>
-                    <name>text:booktitle</name>
-                    <name>text:chapter</name>
-                    <name>text:edition</name>
-                    <name>text:editor</name>
-                    <name>text:howpublished</name>
-                    <name>text:institution</name>
-                    <name>text:journal</name>
-                    <name>text:month</name>
-                    <name>text:note</name>
-                    <name>text:number</name>
-                    <name>text:organizations</name>
-                    <name>text:pages</name>
-                    <name>text:publisher</name>
-                    <name>text:school</name>
-                    <name>text:series</name>
-                    <name>text:title</name>
-                    <name>text:report-type</name>
-                    <name>text:volume</name>
-                    <name>text:year</name>
-                    <name>text:url</name>
-                    <name>text:custom1</name>
-                    <name>text:custom2</name>
-                    <name>text:custom3</name>
-                    <name>text:custom4</name>
-                    <name>text:custom5</name>
-                    <name>text:isbn</name>
-                    <name>text:issn</name>
-                </choice>
-                <ref name="string"/>
-            </attribute>
-        </zeroOrMore>
-        <text/>
-    </element>
-</define>
-<define name="text-bibliography-types">
-    <choice>
-        <value>article</value>
-        <value>book</value>
-        <value>booklet</value>
-        <value>conference</value>
-        <value>custom1</value>
-        <value>custom2</value>
-        <value>custom3</value>
-        <value>custom4</value>
-        <value>custom5</value>
-        <value>email</value>
-        <value>inbook</value>
-        <value>incollection</value>
-        <value>inproceedings</value>
-        <value>journal</value>
-        <value>manual</value>
-        <value>mastersthesis</value>
-        <value>misc</value>
-        <value>phdthesis</value>
-        <value>proceedings</value>
-        <value>techreport</value>
-        <value>unpublished</value>
-        <value>www</value>
-    </choice>
-</define>
-<define name="text-index-body">
-    <element name="text:index-body">
-        <zeroOrMore>
-            <ref name="index-content-main"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="index-content-main">
-    <choice>
-        <ref name="text-content"/>
-        <ref name="text-index-title"/>
-    </choice>
-</define>
-<define name="text-index-title">
-    <element name="text:index-title">
-        <ref name="sectionAttr"/>
-        <zeroOrMore>
-            <ref name="index-content-main"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="text-table-of-content">
-    <element name="text:table-of-content">
-        <ref name="sectionAttr"/>
-        <ref name="text-table-of-content-source"/>
-        <ref name="text-index-body"/>
-    </element>
-</define>
-<define name="text-table-of-content-source">
-    <element name="text:table-of-content-source">
-        <ref name="text-table-of-content-source-attlist"/>
-        <optional>
-            <ref name="text-index-title-template"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="text-table-of-content-entry-template"/>
-        </zeroOrMore>
-        <zeroOrMore>
-            <ref name="text-index-source-styles"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="text-table-of-content-source-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:outline-level">
-            <choice>
-                <ref name="positiveInteger"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="text-table-of-content-source-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:use-outline-level" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-table-of-content-source-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:use-index-marks">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-table-of-content-source-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:use-index-source-styles">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-table-of-content-source-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:index-scope">
-            <choice>
-                <value>document</value>
-                <value>chapter</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="text-table-of-content-source-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:relative-tab-stop-position">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-table-of-content-entry-template">
-    <element name="text:table-of-content-entry-template">
-        <ref name="text-table-of-content-entry-template-attlist"/>
-        <zeroOrMore>
-            <ref name="text-table-of-content-children"/>
-
-        </zeroOrMore>
-    </element>
-</define>
-<define name="text-table-of-content-children">
-    <choice>
-        <ref name="text-index-entry-chapter"/>
-        <ref name="text-index-entry-page-number"/>
-        <ref name="text-index-entry-text"/>
-        <ref name="text-index-entry-span"/>
-        <ref name="text-index-entry-tab-stop"/>
-        <ref name="text-index-entry-link-start"/>
-        <ref name="text-index-entry-link-end"/>
-    </choice>
-</define>
-<define name="text-table-of-content-entry-template-attlist"
-        combine="interleave">
-    <attribute name="text:outline-level">
-        <ref name="positiveInteger"/>
-    </attribute>
-</define>
-<define name="text-table-of-content-entry-template-attlist"
-        combine="interleave">
-    <attribute name="text:style-name">
-        <ref name="styleNameRef"/>
-    </attribute>
-</define>
-<define name="text-illustration-index">
-    <element name="text:illustration-index">
-        <ref name="sectionAttr"/>
-        <ref name="text-illustration-index-source"/>
-        <ref name="text-index-body"/>
-    </element>
-</define>
-<define name="text-illustration-index-source">
-    <element name="text:illustration-index-source">
-        <ref name="text-illustration-index-source-attrs"/>
-        <optional>
-            <ref name="text-index-title-template"/>
-        </optional>
-        <optional>
-            <ref name="text-illustration-index-entry-template"/>
-        </optional>
-    </element>
-</define>
-<define name="text-illustration-index-source-attrs" combine="interleave">
-    <ref name="text-index-scope-attr"/>
-</define>
-<define name="text-index-scope-attr">
-    <optional>
-        <attribute name="text:index-scope" a:defaultValue="document">
-            <choice>
-                <value>document</value>
-                <value>chapter</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="text-illustration-index-source-attrs" combine="interleave">
-    <ref name="text-relative-tab-stop-position-attr"/>
-</define>
-<define name="text-relative-tab-stop-position-attr">
-    <optional>
-        <attribute name="text:relative-tab-stop-position"
-                   a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-illustration-index-source-attrs" combine="interleave">
-    <optional>
-        <attribute name="text:use-caption" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-illustration-index-source-attrs" combine="interleave">
-    <optional>
-        <attribute name="text:caption-sequence-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-illustration-index-source-attrs" combine="interleave">
-    <optional>
-        <attribute name="text:caption-sequence-format">
-            <choice>
-                <value>text</value>
-                <value>category-and-value</value>
-                <value>caption</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="text-illustration-index-entry-template">
-    <element name="text:illustration-index-entry-template">
-        <ref name="text-illustration-index-entry-content"/>
-    </element>
-</define>
-<define name="text-illustration-index-entry-content">
-    <ref name="text-illustration-index-entry-template-attrs"/>
-    <zeroOrMore>
-        <choice>
-            <ref name="text-index-entry-page-number"/>
-            <ref name="text-index-entry-text"/>
-            <ref name="text-index-entry-span"/>
-            <ref name="text-index-entry-tab-stop"/>
-        </choice>
-    </zeroOrMore>
-</define>
-<define name="text-illustration-index-entry-template-attrs">
-    <attribute name="text:style-name">
-        <ref name="styleNameRef"/>
-    </attribute>
-</define>
-<define name="text-table-index">
-    <element name="text:table-index">
-        <ref name="sectionAttr"/>
-        <ref name="text-table-index-source"/>
-        <ref name="text-index-body"/>
-    </element>
-</define>
-<define name="text-table-index-source">
-    <element name="text:table-index-source">
-        <ref name="text-illustration-index-source-attrs"/>
-        <optional>
-            <ref name="text-index-title-template"/>
-        </optional>
-        <optional>
-            <ref name="text-table-index-entry-template"/>
-        </optional>
-    </element>
-</define>
-<define name="text-table-index-entry-template">
-    <element name="text:table-index-entry-template">
-        <ref name="text-illustration-index-entry-content"/>
-    </element>
-</define>
-<define name="text-object-index">
-    <element name="text:object-index">
-        <ref name="sectionAttr"/>
-        <ref name="text-object-index-source"/>
-        <ref name="text-index-body"/>
-    </element>
-</define>
-<define name="text-object-index-source">
-    <element name="text:object-index-source">
-        <ref name="text-object-index-source-attrs"/>
-        <optional>
-            <ref name="text-index-title-template"/>
-        </optional>
-        <optional>
-            <ref name="text-object-index-entry-template"/>
-        </optional>
-    </element>
-</define>
-<define name="text-object-index-source-attrs" combine="interleave">
-    <ref name="text-index-scope-attr"/>
-</define>
-<define name="text-object-index-source-attrs" combine="interleave">
-    <ref name="text-relative-tab-stop-position-attr"/>
-</define>
-<define name="text-object-index-source-attrs" combine="interleave">
-    <optional>
-        <attribute name="text:use-spreadsheet-objects" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-object-index-source-attrs" combine="interleave">
-    <optional>
-        <attribute name="text:use-math-objects" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-object-index-source-attrs" combine="interleave">
-    <optional>
-        <attribute name="text:use-draw-objects" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-object-index-source-attrs" combine="interleave">
-    <optional>
-        <attribute name="text:use-chart-objects" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-object-index-source-attrs" combine="interleave">
-    <optional>
-        <attribute name="text:use-other-objects" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-object-index-entry-template">
-    <element name="text:object-index-entry-template">
-        <ref name="text-illustration-index-entry-content"/>
-    </element>
-</define>
-<define name="text-user-index">
-    <element name="text:user-index">
-        <ref name="sectionAttr"/>
-        <ref name="text-user-index-source"/>
-        <ref name="text-index-body"/>
-    </element>
-</define>
-<define name="text-user-index-source">
-    <element name="text:user-index-source">
-        <ref name="text-user-index-source-attr"/>
-        <optional>
-            <ref name="text-index-title-template"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="text-user-index-entry-template"/>
-        </zeroOrMore>
-        <zeroOrMore>
-            <ref name="text-index-source-styles"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="text-user-index-source-attr" combine="interleave">
-    <ref name="text-index-scope-attr"/>
-    <ref name="text-relative-tab-stop-position-attr"/>
-    <attribute name="text:index-name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="text-user-index-source-attr" combine="interleave">
-    <optional>
-        <attribute name="text:use-index-marks" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="text:use-graphics" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="text:use-tables" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="text:use-floating-frames"
-                     a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="text:use-objects" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-user-index-source-attr" combine="interleave">
-    <optional>
-        <attribute name="text:copy-outline-levels"
-                     a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-user-index-entry-template">
-    <element name="text:user-index-entry-template">
-        <ref name="text-user-index-entry-template-attrs"/>
-        <zeroOrMore>
-            <choice>
-                <ref name="text-index-entry-chapter"/>
-                <ref name="text-index-entry-page-number"/>
-                <ref name="text-index-entry-text"/>
-                <ref name="text-index-entry-span"/>
-                <ref name="text-index-entry-tab-stop"/>
-            </choice>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="text-user-index-entry-template-attrs" combine="interleave">
-    <attribute name="text:outline-level">
-        <ref name="positiveInteger"/>
-    </attribute>
-</define>
-<define name="text-user-index-entry-template-attrs" combine="interleave">
-    <attribute name="text:style-name">
-        <ref name="styleNameRef"/>
-    </attribute>
-</define>
-<define name="text-alphabetical-index">
-    <element name="text:alphabetical-index">
-        <ref name="sectionAttr"/>
-        <ref name="text-alphabetical-index-source"/>
-        <ref name="text-index-body"/>
-    </element>
-</define>
-<define name="text-alphabetical-index-source">
-    <element name="text:alphabetical-index-source">
-        <ref name="text-alphabetical-index-source-attrs"/>
-        <optional>
-            <ref name="text-index-title-template"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="text-alphabetical-index-entry-template"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="text-alphabetical-index-source-attrs" combine="interleave">
-    <ref name="text-index-scope-attr"/>
-    <ref name="text-relative-tab-stop-position-attr"/>
-</define>
-<define name="text-alphabetical-index-source-attrs" combine="interleave">
-    <optional>
-        <attribute name="text:ignore-case" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-alphabetical-index-source-attrs" combine="interleave">
-    <optional>
-        <attribute name="text:main-entry-style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-alphabetical-index-source-attrs" combine="interleave">
-    <optional>
-        <attribute name="text:alphabetical-separators" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-alphabetical-index-source-attrs" combine="interleave">
-    <optional>
-        <attribute name="text:combine-entries" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="text:combine-entries-with-dash"
-                   a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="text:combine-entries-with-pp" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-alphabetical-index-source-attrs" combine="interleave">
-    <optional>
-        <attribute name="text:use-keys-as-entries" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-alphabetical-index-source-attrs" combine="interleave">
-    <optional>
-        <attribute name="text:capitalize-entries" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-alphabetical-index-source-attrs" combine="interleave">
-    <optional>
-        <attribute name="text:comma-separated" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-alphabetical-index-source-attrs" combine="interleave">
-    <optional>
-        <attribute name="fo:language">
-            <ref name="languageCode"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-alphabetical-index-source-attrs" combine="interleave">
-    <optional>
-        <attribute name="fo:country">
-            <ref name="countryCode"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-alphabetical-index-source-attrs" combine="interleave">
-    <optional>
-        <attribute name="text:sort-algorithm">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-alphabetical-index-auto-mark-file">
-    <element name="text:alphabetical-index-auto-mark-file">
-        <attribute name="xlink:href">
-            <ref name="anyURI"/>
-        </attribute>
-        <optional>
-            <attribute name="xlink:type" a:defaultValue="simple">
-                <value>simple</value>
-            </attribute>
-        </optional>
-    </element>
-</define>
-<define name="text-alphabetical-index-entry-template">
-    <element name="text:alphabetical-index-entry-template">
-        <ref name="text-alphabetical-index-entry-template-attrs"/>
-        <zeroOrMore>
-            <choice>
-                <ref name="text-index-entry-chapter"/>
-                <ref name="text-index-entry-page-number"/>
-                <ref name="text-index-entry-text"/>
-                <ref name="text-index-entry-span"/>
-                <ref name="text-index-entry-tab-stop"/>
-            </choice>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="text-alphabetical-index-entry-template-attrs"
-        combine="interleave">
-    <attribute name="text:outline-level">
-        <choice>
-            <value>1</value>
-            <value>2</value>
-            <value>3</value>
-            <value>separator</value>
-        </choice>
-    </attribute>
-</define>
-<define name="text-alphabetical-index-entry-template-attrs"
-        combine="interleave">
-    <attribute name="text:style-name">
-        <ref name="styleNameRef"/>
-    </attribute>
-</define>
-<define name="text-bibliography">
-    <element name="text:bibliography">
-        <ref name="sectionAttr"/>
-        <ref name="text-bibliography-source"/>
-        <ref name="text-index-body"/>
-    </element>
-</define>
-<define name="text-bibliography-source">
-    <element name="text:bibliography-source">
-        <optional>
-            <ref name="text-index-title-template"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="text-bibliography-entry-template"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="text-bibliography-entry-template">
-    <element name="text:bibliography-entry-template">
-        <ref name="text-bibliography-entry-template-attrs"/>
-        <zeroOrMore>
-            <choice>
-                <ref name="text-index-entry-span"/>
-                <ref name="text-index-entry-tab-stop"/>
-                <ref name="text-index-entry-bibliography"/>
-            </choice>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="text-bibliography-entry-template-attrs" combine="interleave">
-    <attribute name="text:bibliography-type">
-        <ref name="text-bibliography-types"/>
-    </attribute>
-</define>
-<define name="text-bibliography-entry-template-attrs" combine="interleave">
-    <attribute name="text:style-name">
-        <ref name="styleNameRef"/>
-    </attribute>
-</define>
-<define name="text-index-source-styles">
-    <element name="text:index-source-styles">
-        <attribute name="text:outline-level">
-            <ref name="positiveInteger"/>
-        </attribute>
-        <zeroOrMore>
-            <ref name="text-index-source-style"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="text-index-source-style">
-    <element name="text:index-source-style">
-        <attribute name="text:style-name">
-            <ref name="styleName"/>
-        </attribute>
-        <empty/>
-    </element>
-</define>
-<define name="text-index-title-template">
-    <element name="text:index-title-template">
-        <optional>
-            <attribute name="text:style-name">
-                <ref name="styleNameRef"/>
-            </attribute>
-        </optional>
-        <text/>
-    </element>
-</define>
-<define name="text-index-entry-chapter">
-    <element name="text:index-entry-chapter">
-        <optional>
-            <attribute name="text:style-name">
-                <ref name="styleNameRef"/>
-            </attribute>
-        </optional>
-        <ref name="text-index-entry-chapter-attrs"/>
-    </element>
-</define>
-<define name="text-index-entry-chapter-attrs">
-    <optional>
-        <attribute name="text:display" a:defaultValue="number">
-            <choice>
-                <value>name</value>
-                <value>number</value>
-                <value>number-and-name</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="text-index-entry-text">
-    <element name="text:index-entry-text">
-        <optional>
-            <attribute name="text:style-name">
-                <ref name="styleNameRef"/>
-            </attribute>
-        </optional>
-    </element>
-</define>
-<define name="text-index-entry-page-number">
-    <element name="text:index-entry-page-number">
-        <optional>
-            <attribute name="text:style-name">
-                <ref name="styleNameRef"/>
-            </attribute>
-        </optional>
-    </element>
-</define>
-<define name="text-index-entry-span">
-    <element name="text:index-entry-span">
-        <optional>
-            <attribute name="text:style-name">
-                <ref name="styleNameRef"/>
-            </attribute>
-        </optional>
-        <text/>
-    </element>
-</define>
-<define name="text-index-entry-bibliography">
-    <element name="text:index-entry-bibliography">
-        <ref name="text-index-entry-bibliography-attrs"/>
-    </element>
-</define>
-<define name="text-index-entry-bibliography-attrs" combine="interleave">
-    <optional>
-        <attribute name="text:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-index-entry-bibliography-attrs" combine="interleave">
-    <attribute name="text:bibliography-data-field">
-        <choice>
-            <value>address</value>
-            <value>annote</value>
-            <value>author</value>
-            <value>bibliography-type</value>
-            <value>booktitle</value>
-            <value>chapter</value>
-            <value>custom1</value>
-            <value>custom2</value>
-            <value>custom3</value>
-            <value>custom4</value>
-            <value>custom5</value>
-            <value>edition</value>
-            <value>editor</value>
-            <value>howpublished</value>
-            <value>identifier</value>
-            <value>institution</value>
-            <value>isbn</value>
-            <value>issn</value>
-            <value>journal</value>
-            <value>month</value>
-            <value>note</value>
-            <value>number</value>
-            <value>organizations</value>
-            <value>pages</value>
-            <value>publisher</value>
-            <value>report-type</value>
-            <value>school</value>
-            <value>series</value>
-            <value>title</value>
-            <value>url</value>
-            <value>volume</value>
-            <value>year</value>
-        </choice>
-    </attribute>
-</define>
-<define name="text-index-entry-tab-stop">
-    <element name="text:index-entry-tab-stop">
-        <optional>
-            <attribute name="text:style-name">
-                <ref name="styleNameRef"/>
-            </attribute>
-        </optional>
-        <ref name="text-index-entry-tab-stop-attrs"/>
-    </element>
-</define>
-<define name="text-index-entry-tab-stop-attrs" combine="interleave">
-    <optional>
-        <attribute name="style:leader-char">
-            <ref name="character"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-index-entry-tab-stop-attrs" combine="interleave">
-    <choice>
-        <attribute name="style:type">
-            <value>right</value>
-        </attribute>
-        <group>
-            <attribute name="style:type">
-                <value>left</value>
-            </attribute>
-            <attribute name="style:position">
-                <ref name="length"/>
-            </attribute>
-        </group>
-    </choice>
-</define>
-<define name="text-index-entry-link-start">
-    <element name="text:index-entry-link-start">
-        <optional>
-            <attribute name="text:style-name">
-                <ref name="styleNameRef"/>
-            </attribute>
-        </optional>
-    </element>
-</define>
-<define name="text-index-entry-link-end">
-    <element name="text:index-entry-link-end">
-        <optional>
-            <attribute name="text:style-name">
-                <ref name="styleNameRef"/>
-            </attribute>
-        </optional>
-    </element>
-</define>
-<define name="table-table">
-    <element name="table:table">
-        <ref name="table-table-attlist"/>
-        <optional>
-            <ref name="table-table-source"/>
-        </optional>
-        <optional>
-            <ref name="office-dde-source"/>
-        </optional>
-        <optional>
-            <ref name="table-scenario"/>
-        </optional>
-        <optional>
-            <ref name="office-forms"/>
-        </optional>
-        <optional>
-            <ref name="table-shapes"/>
-        </optional>
-        <ref name="table-columns-and-groups"/>
-        <ref name="table-rows-and-groups"/>
-    </element>
-</define>
-<define name="table-columns-and-groups">
-    <oneOrMore>
-        <choice>
-            <ref name="table-table-column-group"/>
-            <ref name="table-columns-no-group"/>
-        </choice>
-    </oneOrMore>
-</define>
-
-<define name="table-columns-no-group">
-    <choice>
-        <group>
-            <ref name="table-columns"/>
-            <optional>
-                <ref name="table-table-header-columns"/>
-                <optional>
-                    <ref name="table-columns"/>
-                </optional>
-            </optional>
-        </group>
-        <group>
-            <ref name="table-table-header-columns"/>
-            <optional>
-                <ref name="table-columns"/>
-            </optional>
-        </group>
-    </choice>
-</define>
-
-<define name="table-columns">
-    <choice>
-        <ref name="table-table-columns"/>
-        <oneOrMore>
-                <ref name="table-table-column"/>
-        </oneOrMore>
-    </choice>
-</define>
-
-<define name="table-rows-and-groups">
-    <oneOrMore>
-        <choice>
-            <ref name="table-table-row-group"/>
-            <ref name="table-rows-no-group"/>
-        </choice>
-    </oneOrMore>
-</define>
-
-<define name="table-rows-no-group">
-    <choice>
-        <group>
-            <ref name="table-rows"/>
-            <optional>
-                <ref name="table-table-header-rows"/>
-                <optional>
-                    <ref name="table-rows"/>
-                </optional>
-            </optional>
-        </group>
-        <group>
-            <ref name="table-table-header-rows"/>
-            <optional>
-                <ref name="table-rows"/>
-            </optional>
-        </group>
-    </choice>
-</define>
-
-<define name="table-rows">
-    <choice>
-        <ref name="table-table-rows"/>
-        <oneOrMore>
-                <ref name="table-table-row"/>
-        </oneOrMore>
-    </choice>
-</define>
-<define name="table-table-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-table-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-table-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:protected" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="table:protection-key">
-            <text/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-table-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:print" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-table-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:print-ranges">
-            <ref name="cellRangeAddressList"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-table-row">
-    <element name="table:table-row">
-        <ref name="table-table-row-attlist"/>
-        <oneOrMore>
-            <choice>
-                <ref name="table-table-cell"/>
-                <ref name="table-covered-table-cell"/>
-            </choice>
-        </oneOrMore>
-    </element>
-</define>
-<define name="table-table-row-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:number-rows-repeated" a:defaultValue="1">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-table-row-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-table-row-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:default-cell-style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-table-row-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:visibility" a:defaultValue="visible">
-            <ref name="table-visibility-value"/>
-        </attribute>
-    </optional>
-</define>
-
-<define name="table-visibility-value">
-    <choice>
-        <value>visible</value>
-        <value>collapse</value>
-        <value>filter</value>
-    </choice>
-</define>
-<define name="table-table-cell">
-    <element name="table:table-cell">
-        <ref name="table-table-cell-attlist"/>
-        <ref name="table-table-cell-attlist-extra"/>
-        <ref name="table-table-cell-content"/>
-    </element>
-</define>
-
-<define name="table-covered-table-cell">
-    <element name="table:covered-table-cell">
-        <ref name="table-table-cell-attlist"/>
-        <ref name="table-table-cell-content"/>
-    </element>
-</define>
-
-<define name="table-table-cell-content">
-    <optional>
-        <ref name="table-cell-range-source"/>
-    </optional>
-    <optional>
-        <ref name="office-annotation"/>
-    </optional>
-    <optional>
-        <ref name="table-detective"/>
-    </optional>
-    <zeroOrMore>
-        <ref name="text-content"/>
-    </zeroOrMore>
-</define>
-<define name="table-table-cell-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:number-columns-repeated" a:defaultValue="1">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-table-cell-attlist-extra" combine="interleave">
-    <optional>
-        <attribute name="table:number-columns-spanned" a:defaultValue="1">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="table:number-rows-spanned" a:defaultValue="1">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-table-cell-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-table-cell-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:content-validation-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-table-cell-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:formula">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-table-cell-attlist-extra" combine="interleave">
-    <optional>
-        <attribute name="table:number-matrix-columns-spanned">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="table:number-matrix-rows-spanned">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-table-cell-attlist" combine="interleave">
-    <optional>
-        <ref name="common-value-and-type-attlist"/>
-    </optional>
-</define>
-<define name="table-table-cell-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:protect" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-table-column">
-    <element name="table:table-column">
-        <ref name="table-table-column-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="table-table-column-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:number-columns-repeated" a:defaultValue="1">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-table-column-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-table-column-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:visibility" a:defaultValue="visible">
-            <ref name="table-visibility-value"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-table-column-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:default-cell-style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-table-header-columns">
-    <element name="table:table-header-columns">
-        <oneOrMore>
-            <ref name="table-table-column"/>
-        </oneOrMore>
-    </element>
-</define>
-
-<define name="table-table-columns">
-    <element name="table:table-columns">
-        <oneOrMore>
-            <ref name="table-table-column"/>
-        </oneOrMore>
-    </element>
-</define>
-<define name="table-table-column-group">
-    <element name="table:table-column-group">
-        <ref name="table-table-column-group-attlist"/>
-        <ref name="table-columns-and-groups"/>
-    </element>
-</define>
-<define name="table-table-column-group-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:display" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-table-header-rows">
-    <element name="table:table-header-rows">
-        <oneOrMore>
-            <ref name="table-table-row"/>
-        </oneOrMore>
-    </element>
-</define>
-
-<define name="table-table-rows">
-    <element name="table:table-rows">
-        <oneOrMore>
-            <ref name="table-table-row"/>
-        </oneOrMore>
-    </element>
-</define>
-<define name="table-table-row-group">
-    <element name="table:table-row-group">
-        <ref name="table-table-row-group-attlist"/>
-        <ref name="table-rows-and-groups"/>
-    </element>
-</define>
-<define name="table-table-row-group-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:display" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-table-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:is-sub-table" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="cellAddress">
-    <data type="string">
-        <param name="pattern">($?([^\. ']+|'[^']+'))?\.$?[A-Z]+$?[0-9]+</param>
-    </data>
-</define>
-<define name="cellRangeAddress">
-    <data type="string">
-        <param name="pattern">($?([^\. ']+|'[^']+'))?\.$?[A-Z]+$?[0-9]+(:($?([^\. ']+|'[^']+'))?\.$?[A-Z]+$?[0-9]+)?</param>
-
-    </data>
-</define>
-<define name="cellRangeAddressList">
-    <!-- Value is a space separated list of "cellRangeAddress" patterns -->
-    <data type="string"/> 
-</define>
-<define name="table-table-source">
-    <element name="table:table-source">
-        <ref name="table-table-source-attlist"/>
-        <ref name="table-linked-source-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="table-table-source-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:mode" a:defaultValue="copy-all">
-            <choice>
-                <value>copy-all</value>
-                <value>copy-results-only</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="table-table-source-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:table-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-linked-source-attlist" combine="interleave">
-    <optional>
-        <attribute name="xlink:type" a:defaultValue="simple">
-            <value>simple</value>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="xlink:actuate" a:defaultValue="onRequest">
-            <value>onRequest</value>
-        </attribute>
-    </optional>
-    <attribute name="xlink:href">
-        <ref name="anyURI"/>
-    </attribute>
-</define>
-<define name="table-linked-source-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:filter-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-linked-source-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:filter-options">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-linked-source-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:refresh-delay">
-            <ref name="duration"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-scenario">
-    <element name="table:scenario">
-        <ref name="table-scenario-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="table-scenario-attlist" combine="interleave">
-    <attribute name="table:scenario-ranges">
-        <ref name="cellRangeAddressList"/>
-    </attribute>
-</define>
-<define name="table-scenario-attlist" combine="interleave">
-    <attribute name="table:is-active">
-        <ref name="boolean"/>
-    </attribute>
-</define>
-<define name="table-scenario-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:display-border" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-scenario-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:border-color">
-            <ref name="color"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-scenario-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:copy-back" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-scenario-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:copy-styles" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-scenario-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:copy-formulas" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-scenario-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:comment">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-scenario-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:protected">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-shapes">
-    <element name="table:shapes">
-        <oneOrMore>
-            <ref name="shape"/>
-        </oneOrMore>
-    </element>
-</define>
-<define name="table-cell-range-source">
-    <element name="table:cell-range-source">
-        <ref name="table-table-cell-range-source-attlist"/>
-        <ref name="table-linked-source-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="table-table-cell-range-source-attlist" combine="interleave">
-    <attribute name="table:name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="table-table-cell-range-source-attlist" combine="interleave">
-    <attribute name="table:last-column-spanned">
-        <ref name="positiveInteger"/>
-    </attribute>
-    <attribute name="table:last-row-spanned">
-        <ref name="positiveInteger"/>
-    </attribute>
-</define>
-<define name="table-detective">
-    <element name="table:detective">
-        <zeroOrMore>
-            <ref name="table-highlighted-range"/>
-        </zeroOrMore>
-        <zeroOrMore>
-            <ref name="table-operation"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="table-operation">
-    <element name="table:operation">
-        <ref name="table-operation-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="table-operation-attlist" combine="interleave">
-    <attribute name="table:name">
-        <choice>
-            <value>trace-dependents</value>
-            <value>remove-dependents</value>
-            <value>trace-precedents</value>
-            <value>remove-precedents</value>
-            <value>trace-errors</value>
-        </choice>
-    </attribute>
-</define>
-<define name="table-operation-attlist" combine="interleave">
-    <attribute name="table:index">
-        <ref name="nonNegativeInteger"/>
-    </attribute>
-</define>
-<define name="table-highlighted-range">
-    <element name="table:highlighted-range">
-        <choice>
-            <group>
-                <ref name="table-highlighted-range-attlist"/>
-            </group>
-            <group>
-                <ref name="table-highlighted-range-attlist-invalid"/>
-            </group>
-        </choice>
-        <empty/>
-    </element>
-</define>
-<define name="table-highlighted-range-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:cell-range-address">
-            <ref name="cellRangeAddress"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-highlighted-range-attlist" combine="interleave">
-    <attribute name="table:direction">
-        <choice>
-            <value>from-another-table</value>
-            <value>to-another-table</value>
-            <value>from-same-table</value>
-        </choice>
-    </attribute>
-</define>
-<define name="table-highlighted-range-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:contains-error" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-highlighted-range-attlist-invalid" combine="interleave">
-    <attribute name="table:marked-invalid">
-        <ref name="boolean"/>
-    </attribute>
-</define>
-<define name="office-spreadsheet-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:structure-protected" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="table:protection-key">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-calculation-settings">
-    <element name="table:calculation-settings">
-        <ref name="table-calculation-setting-attlist"/>
-        <optional>
-            <ref name="table-null-date"/>
-        </optional>
-        <optional>
-            <ref name="table-iteration"/>
-        </optional>
-    </element>
-</define>
-<define name="table-calculation-setting-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:case-sensitive" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-calculation-setting-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:precision-as-shown" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-calculation-setting-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:search-criteria-must-apply-to-whole-cell"
-                     a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-calculation-setting-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:automatic-find-labels" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-calculation-setting-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:use-regular-expressions"
-                     a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-calculation-setting-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:null-year" a:defaultValue="1930">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-null-date">
-    <element name="table:null-date">
-        <optional>
-            <attribute name="table:value-type" a:defaultValue="date">
-                <ref name="valueType"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="table:date-value-type" 
-                         a:defaultValue="1899-12-30">
-                <ref name="date"/>
-            </attribute>
-        </optional>
-        <empty/>
-    </element>
-</define>
-<define name="table-iteration">
-    <element name="table:iteration">
-        <optional>
-            <attribute name="table:status" a:defaultValue="disable">
-                <choice>
-                    <value>enable</value>
-                    <value>disable</value>
-                </choice>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="table:steps" a:defaultValue="100">
-                <ref name="positiveInteger"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="table:maximum-difference"
-                         a:defaultValue="0.001">
-                <ref name="double"/>
-            </attribute>
-        </optional>
-        <empty/>
-    </element>
-</define>
-<define name="table-content-validations">
-    <element name="table:content-validations">
-        <oneOrMore>
-            <ref name="table-content-validation"/>
-        </oneOrMore>
-    </element>
-</define>
-
-<define name="table-content-validation">
-    <element name="table:content-validation">
-        <ref name="table-validation-attlist"/>
-        <optional>
-            <ref name="table-help-message"/>
-        </optional>
-        <optional>
-            <choice>
-                <ref name="table-error-message"/>
-                <group>
-                    <ref name="table-error-macro"/>
-                    <optional>
-                        <ref name="office-event-listeners"/>
-                    </optional>
-                </group>
-            </choice>
-        </optional>
-    </element>
-</define>
-<define name="table-validation-attlist" combine="interleave">
-    <attribute name="table:name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="table-validation-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:condition">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-validation-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:base-cell-address">
-            <ref name="cellAddress"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-validation-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:allow-empty-cell" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-validation-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:display-list" a:defaultValue="unsorted">
-            <choice>
-                <value>none</value>
-                <value>unsorted</value>
-                <value>sort-ascending</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="table-help-message">
-    <element name="table:help-message">
-        <optional>
-            <attribute name="table:title">
-                <ref name="string"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="table:display" a:defaultValue="false">
-                <ref name="boolean"/>
-            </attribute>
-        </optional>
-        <zeroOrMore>
-            <ref name="text-p"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="table-error-message">
-    <element name="table:error-message">
-        <optional>
-            <attribute name="table:title">
-                <ref name="string"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="table:display" a:defaultValue="false">
-                <ref name="boolean"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="table:message-type" a:defaultValue="stop">
-                <choice>
-                    <value>stop</value>
-                    <value>warning</value>
-                    <value>information</value>
-                </choice>
-            </attribute>
-        </optional>
-        <zeroOrMore>
-            <ref name="text-p"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="table-error-macro">
-    <element name="table:error-macro">
-        <optional>
-            <attribute name="table:execute" a:defaultValue="true">
-                <ref name="boolean"/>
-            </attribute>
-        </optional>
-    </element>
-</define>
-<define name="table-label-ranges">
-    <element name="table:label-ranges">
-        <zeroOrMore>
-            <ref name="table-label-range"/>
-        </zeroOrMore>
-    </element>
-</define>
-
-<define name="table-label-range">
-    <element name="table:label-range">
-        <ref name="table-label-range-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="table-label-range-attlist" combine="interleave">
-    <attribute name="table:label-cell-range-address">
-        <ref name="cellRangeAddress"/>
-    </attribute>
-</define>
-<define name="table-label-range-attlist" combine="interleave">
-    <attribute name="table:data-cell-range-address">
-        <ref name="cellRangeAddress"/>
-    </attribute>
-</define>
-<define name="table-label-range-attlist" combine="interleave">
-    <attribute name="table:orientation">
-        <choice>
-            <value>column</value>
-            <value>row</value>
-        </choice>
-    </attribute>
-</define>
-<define name="table-named-expressions">
-    <element name="table:named-expressions">
-        <zeroOrMore>
-            <choice>
-                <ref name="table-named-range"/>
-                <ref name="table-named-expression"/>
-            </choice>
-        </zeroOrMore>
-    </element>
-</define>
-
-<define name="table-named-range">
-    <element name="table:named-range">
-        <ref name="table-named-range-attlist"/>
-        <empty/>
-    </element>
-</define>
-
-<define name="table-named-range-attlist" combine="interleave">
-    <attribute name="table:name">
-        <ref name="string"/>
-    </attribute>
-    <attribute name="table:cell-range-address">
-        <ref name="cellRangeAddress"/>
-    </attribute>
-    <optional>
-        <attribute name="table:base-cell-address">
-            <ref name="cellAddress"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="table:range-usable-as" a:defaultValue="none">
-            <choice>
-                <value>none</value>
-                <list>
-                    <oneOrMore>
-                        <choice>
-                            <value>print-range</value>
-                            <value>filter</value>
-                            <value>repeat-row</value>
-                            <value>repeat-column</value>
-                        </choice>
-                    </oneOrMore>
-                </list>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="table-named-expression">
-    <element name="table:named-expression">
-        <ref name="table-named-expression-attlist"/>
-        <empty/>
-    </element>
-</define>
-
-<define name="table-named-expression-attlist" combine="interleave">
-    <attribute name="table:name">
-        <ref name="string"/>
-    </attribute>
-    <attribute name="table:expression">
-        <ref name="string"/>
-    </attribute>
-    <optional>
-        <attribute name="table:base-cell-address">
-            <ref name="cellAddress"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-database-ranges">
-    <element name="table:database-ranges">
-        <zeroOrMore>
-            <ref name="table-database-range"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="table-database-range">
-    <element name="table:database-range">
-        <ref name="table-database-range-attlist"/>
-        <optional>
-            <choice>
-                <ref name="table-database-source-sql"/>
-                <ref name="table-database-source-table"/>
-                <ref name="table-database-source-query"/>
-            </choice>
-        </optional>
-        <optional>
-            <ref name="table-filter"/>
-        </optional>
-        <optional>
-            <ref name="table-sort"/>
-        </optional>
-        <optional>
-            <ref name="table-subtotal-rules"/>
-        </optional>
-    </element>
-</define>
-<define name="table-database-range-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-database-range-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:is-selection" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-database-range-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:on-update-keep-styles" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-database-range-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:on-update-keep-size" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-database-range-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:has-persistent-data" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-database-range-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:orientation" a:defaultValue="row">
-            <choice>
-                <value>column</value>
-                <value>row</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="table-database-range-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:contains-header" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-database-range-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:display-filter-buttons"
-                   a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-database-range-attlist" combine="interleave">
-    <attribute name="table:target-range-address">
-        <ref name="cellRangeAddress"/>
-    </attribute>
-</define>
-<define name="table-database-range-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:refresh-delay">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-database-source-sql">
-    <element name="table:database-source-sql">
-        <ref name="table-database-source-sql-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="table-database-source-sql-attlist" combine="interleave">
-    <attribute name="table:database-name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="table-database-source-sql-attlist" combine="interleave">
-    <attribute name="table:sql-statement">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="table-database-source-sql-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:parse-sql-statement" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-database-source-query">
-    <element name="table:database-source-table">
-        <ref name="table-database-source-table-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="table-database-source-table-attlist" combine="interleave">
-    <attribute name="table:database-name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="table-database-source-table-attlist" combine="interleave">
-    <attribute name="table:database-table-name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="table-database-source-table">
-    <element name="table:database-source-query">
-        <ref name="table-database-source-query-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="table-database-source-query-attlist" combine="interleave">
-    <attribute name="table:database-name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="table-database-source-query-attlist" combine="interleave">
-    <attribute name="table:query-name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="table-sort">
-    <element name="table:sort">
-        <ref name="table-sort-attlist"/>
-        <oneOrMore>
-            <ref name="table-sort-by"/>
-        </oneOrMore>
-    </element>
-</define>
-<define name="table-sort-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:bind-styles-to-content" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-sort-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:target-range-address">
-            <ref name="cellRangeAddress"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-sort-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:case-sensitive" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-sort-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:language">
-            <ref name="languageCode"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-sort-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:country">
-            <ref name="countryCode"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-sort-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:algorithm">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-sort-by">
-    <element name="table:sort-by">
-        <ref name="table-sort-by-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="table-sort-by-attlist" combine="interleave">
-    <attribute name="table:field-number">
-        <ref name="nonNegativeInteger"/>
-    </attribute>
-</define>
-<define name="table-sort-by-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:data-type" a:defaultValue="automatic">
-            <choice>
-                <value>text</value>
-                <value>number</value>
-                <value>automatic</value>
-                <ref name="string"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="table-sort-by-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:order" a:defaultValue="ascending">
-            <choice>
-                <value>ascending</value>
-                <value>descending</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="table-subtotal-rules">
-    <element name="table:subtotal-rules">
-        <ref name="table-subtotal-rules-attlist"/>
-        <optional>
-            <ref name="table-sort-groups"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="table-subtotal-rule"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="table-subtotal-rules-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:bind-styles-to-content" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-subtotal-rules-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:case-sensitive" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-subtotal-rules-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:page-breaks-on-group-change"
-                   a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-sort-groups">
-    <element name="table:sort-groups">
-        <ref name="table-sort-groups-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="table-sort-groups-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:data-type" a:defaultValue="automatic">
-            <choice>
-                <value>text</value>
-                <value>number</value>
-                <value>automatic</value>
-                <ref name="string"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="table-sort-groups-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:order" a:defaultValue="ascending">
-            <choice>
-                <value>ascending</value>
-                <value>descending</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="table-subtotal-rule">
-    <element name="table:subtotal-rule">
-        <ref name="table-subtotal-rule-attlist"/>
-        <zeroOrMore>
-            <ref name="table-subtotal-field"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="table-subtotal-rule-attlist" combine="interleave">
-    <attribute name="table:group-by-field-number">
-        <ref name="nonNegativeInteger"/>
-    </attribute>
-</define>
-<define name="table-subtotal-field">
-    <element name="table:subtotal-field">
-        <ref name="table-subtotal-field-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="table-subtotal-field-attlist" combine="interleave">
-    <attribute name="table:field-number">
-        <ref name="nonNegativeInteger"/>
-    </attribute>
-</define>
-<define name="table-subtotal-field-attlist" combine="interleave">
-    <attribute name="table:function">
-        <choice>
-            <value>auto</value>
-            <value>average</value>
-            <value>count</value>
-            <value>countnums</value>
-            <value>max</value>
-            <value>min</value>
-            <value>product</value>
-            <value>stdev</value>
-            <value>stdevp</value>
-            <value>sum</value>
-            <value>var</value>
-            <value>varp</value>
-            <ref name="string"/>
-        </choice>
-    </attribute>
-</define>
-<define name="table-filter">
-    <element name="table:filter">
-        <ref name="table-filter-attlist"/>
-        <choice>
-            <ref name="table-filter-condition"/>
-            <ref name="table-filter-and"/>
-            <ref name="table-filter-or"/>
-        </choice>
-    </element>
-</define>
-<define name="table-filter-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:target-range-address">
-            <ref name="cellRangeAddress"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-filter-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:condition-source" a:defaultValue="self">
-            <choice>
-                <value>self</value>
-                <value>cell-range</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="table-filter-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:condition-source-range-address">
-            <ref name="cellRangeAddress"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-filter-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:display-duplicates" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-filter-and">
-    <element name="table:filter-and">
-        <oneOrMore>
-            <choice>
-                <ref name="table-filter-or"/>
-                <ref name="table-filter-condition"/>
-            </choice>
-        </oneOrMore>
-    </element>
-</define>
-<define name="table-filter-or">
-    <element name="table:filter-or">
-        <oneOrMore>
-            <choice>
-                <ref name="table-filter-and"/>
-                <ref name="table-filter-condition"/>
-            </choice>
-        </oneOrMore>
-    </element>
-</define>
-<define name="table-filter-condition">
-    <element name="table:filter-condition">
-        <ref name="table-filter-condition-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="table-filter-condition-attlist" combine="interleave">
-    <attribute name="table:field-number">    
-        <ref name="nonNegativeInteger"/>
-    </attribute>
-</define>
-<define name="table-filter-condition-attlist" combine="interleave">
-    <attribute name="table:value">    
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="table-filter-condition-attlist" combine="interleave">
-    <attribute name="table:operator">    
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="table-filter-condition-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:case-sensitive" a:defaultValue="false">    
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-filter-condition-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:data-type" a:defaultValue="text">
-            <choice>
-                <value>text</value>
-                <value>number</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="table-data-pilot-tables">
-    <element name="table:data-pilot-tables">
-        <zeroOrMore>
-            <ref name="table-data-pilot-table"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="table-data-pilot-table">
-    <element name="table:data-pilot-table">
-        <ref name="table-data-pilot-table-attlist"/>
-        <optional>
-            <choice>
-                <ref name="table-database-source-sql"/>
-                <ref name="table-database-source-table"/>
-                <ref name="table-database-source-query"/>
-                <ref name="table-source-service"/>
-                <ref name="table-source-cell-range"/>
-            </choice>
-        </optional>
-        <oneOrMore>
-            <ref name="table-data-pilot-field"/>
-        </oneOrMore>
-    </element>
-</define>
-<define name="table-data-pilot-table-attlist" combine="interleave">
-    <attribute name="table:name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="table-data-pilot-table-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:application-data">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-data-pilot-table-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:grand-total" a:defaultValue="both">
-            <choice>
-                <value>none</value>
-                <value>row</value>
-                <value>column</value>
-                <value>both</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="table-data-pilot-table-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:ignore-empty-rows" a:defaultValue="false">    
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-data-pilot-table-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:identify-categories" a:defaultValue="false">    
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-data-pilot-table-attlist" combine="interleave">
-    <attribute name="table:target-range-address">    
-        <ref name="cellRangeAddress"/>
-    </attribute>
-</define>
-<define name="table-data-pilot-table-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:buttons">    
-            <ref name="cellRangeAddressList"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-data-pilot-table-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:show-filter-button" a:defaultValue="true">    
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-data-pilot-table-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:drill-down-on-double-click"
-                   a:defaultValue="true">    
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-source-cell-range">
-    <element name="table:source-cell-range">
-        <ref name="table-source-cell-range-attlist"/>
-        <optional>
-            <ref name="table-filter"/>
-        </optional>
-    </element>
-</define>
-<define name="table-source-cell-range-attlist" combine="interleave">
-    <attribute name="table:cell-range-address">    
-        <ref name="cellRangeAddress"/>
-    </attribute>
-</define>
-<define name="table-source-service">
-    <element name="table:source-service">
-        <ref name="table-source-service-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="table-source-service-attlist" combine="interleave">
-    <attribute name="table:name">    
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="table-source-service-attlist" combine="interleave">
-    <attribute name="table:source-name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="table-source-service-attlist" combine="interleave">
-    <attribute name="table:object-name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="table-source-service-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:user-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-source-service-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:password">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-data-pilot-field">
-    <element name="table:data-pilot-field">
-        <ref name="table-data-pilot-field-attlist"/>
-        <optional>
-            <ref name="table-data-pilot-level"/>
-        </optional>
-        <optional>
-            <ref name="table-data-pilot-field-reference"/>
-        </optional>
-        <optional>
-            <ref name="table-data-pilot-groups"/>
-        </optional>
-    </element>
-</define>
-<define name="table-data-pilot-field-attlist" combine="interleave">
-    <attribute name="table:source-field-name">    
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="table-data-pilot-field-attlist" combine="interleave">
-    <choice>
-        <attribute name="table:orientation">    
-            <choice>
-                <value>row</value>
-                <value>column</value>
-                <value>data</value>
-                <value>hidden</value>
-            </choice>
-        </attribute>
-        <group>
-            <attribute name="table:orientation">
-                <value>page</value>
-            </attribute>
-            <attribute name="table:selected-page">
-                <ref name="string"/>
-            </attribute>
-        </group>
-    </choice>
-</define>
-<define name="table-data-pilot-field-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:is-data-layout-field" a:defaultValue="false">    
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-data-pilot-field-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:function">
-            <choice>
-                <value>auto</value>
-                <value>average</value>
-                <value>count</value>
-                <value>countnums</value>
-                <value>max</value>
-                <value>min</value>
-                <value>product</value>
-                <value>stdev</value>
-                <value>stdevp</value>
-                <value>sum</value>
-                <value>var</value>
-                <value>varp</value>
-                <ref name="string"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="table-data-pilot-field-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:used-hierarchy" a:defaultValue="-1">    
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-data-pilot-level">
-    <element name="table:data-pilot-level">
-        <ref name="table-data-pilot-level-attlist"/>
-        <optional>
-            <ref name="table-data-pilot-subtotals"/>
-        </optional>
-        <optional>
-            <ref name="table-data-pilot-members"/>
-        </optional>
-        <optional>
-            <ref name="table-data-pilot-display-info"/>
-        </optional>
-        <optional>
-            <ref name="table-data-pilot-sort-info"/>
-        </optional>
-        <optional>
-            <ref name="table-data-pilot-layout-info"/>
-        </optional>
-    </element>
-</define>
-<define name="table-data-pilot-level-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:show-empty">    
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-data-pilot-subtotals">
-    <element name="table:data-pilot-subtotals">
-        <zeroOrMore>
-            <ref name="table-data-pilot-subtotal"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="table-data-pilot-subtotal">
-    <element name="table:data-pilot-subtotal">
-        <ref name="table-data-pilot-subtotal-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="table-data-pilot-subtotal-attlist" combine="interleave">
-    <attribute name="table:function">
-        <choice>
-            <value>auto</value>
-            <value>average</value>
-            <value>count</value>
-            <value>countnums</value>
-            <value>max</value>
-            <value>min</value>
-            <value>product</value>
-            <value>stdev</value>
-            <value>stdevp</value>
-            <value>sum</value>
-            <value>var</value>
-            <value>varp</value>
-            <ref name="string"/>
-        </choice>
-    </attribute>
-</define>
-<define name="table-data-pilot-members">
-    <element name="table:data-pilot-members">
-        <zeroOrMore>
-            <ref name="table-data-pilot-member"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="table-data-pilot-member">
-    <element name="table:data-pilot-member">
-        <ref name="table-data-pilot-member-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="table-data-pilot-member-attlist" combine="interleave">
-    <attribute name="table:name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="table-data-pilot-member-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:display">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-data-pilot-member-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:show-details">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-data-pilot-display-info">
-    <element name="table:data-pilot-display-info">
-        <ref name="table-data-pilot-display-info-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="table-data-pilot-display-info-attlist" combine="interleave">
-    <attribute name="table:enabled">
-        <ref name="boolean"/>
-    </attribute>
-</define>
-<define name="table-data-pilot-display-info-attlist" combine="interleave">
-    <attribute name="table:data-field">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="table-data-pilot-display-info-attlist" combine="interleave">
-    <attribute name="table:member-count">
-        <ref name="nonNegativeInteger"/>
-    </attribute>
-</define>
-<define name="table-data-pilot-display-info-attlist" combine="interleave">
-    <attribute name="table:display-member-mode">
-        <choice>
-            <value>from-top</value>
-            <value>from-bottom</value>
-        </choice>
-    </attribute>
-</define>
-<define name="table-data-pilot-sort-info">
-    <element name="table:data-pilot-sort-info">
-        <ref name="table-data-pilot-sort-info-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="table-data-pilot-sort-info-attlist" combine="interleave">
-    <choice>
-        <group>
-            <attribute name="table:sort-mode">
-                <value>data</value>
-            </attribute>
-            <attribute name="table:data-field">
-                <ref name="string"/>
-            </attribute>
-        </group>
-        <attribute name="table:sort-mode">
-            <choice>
-                <value>none</value>
-                <value>manual</value>
-                <value>name</value>
-            </choice>
-        </attribute>
-    </choice>
-</define>
-<define name="table-data-pilot-sort-info-attlist" combine="interleave">
-    <attribute name="table:order">
-        <choice>
-            <value>ascending</value>
-            <value>descending</value>
-        </choice>
-    </attribute>
-</define>
-<define name="table-data-pilot-layout-info">
-    <element name="table:data-pilot-layout-info">
-        <ref name="table-data-pilot-layout-info-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="table-data-pilot-layout-info-attlist" combine="interleave">
-    <attribute name="table:layout-mode">
-        <choice>
-            <value>tabular-layout</value>
-            <value>outline-subtotals-top</value>
-            <value>outline-subtotals-bottom</value>
-        </choice>
-    </attribute>
-</define>
-<define name="table-data-pilot-layout-info-attlist" combine="interleave">
-    <attribute name="table:add-empty-lines">
-        <ref name="boolean"/>
-    </attribute>
-</define>
-<define name="table-data-pilot-field-reference">
-    <element name="table:data-pilot-field-reference">
-        <ref name="table-data-pilot-field-reference-attlist"/>
-    </element>
-</define>
-<define name="table-data-pilot-field-reference-attlist" combine="interleave">
-    <attribute name="table:field-name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="table-data-pilot-field-reference-attlist" combine="interleave">
-    <choice>
-        <group>
-            <attribute name="table:member-type">
-                <value>named</value>
-            </attribute>
-            <attribute name="table:member-name">
-                <ref name="string"/>
-            </attribute>
-        </group>
-        <attribute name="table:member-type">
-            <choice>
-                <value>previous</value>
-                <value>next</value>
-            </choice>
-        </attribute>
-    </choice>
-</define>
-<define name="table-data-pilot-field-reference-attlist" combine="interleave">
-    <attribute name="table:type">
-        <choice>
-            <value>none</value>
-            <value>member-difference</value>
-            <value>member-percentage</value>
-            <value>member-percentage-difference</value>
-            <value>running-total</value>
-            <value>row-percentage</value>
-            <value>column-percentage</value>
-            <value>total-percentage</value>
-            <value>index</value>
-        </choice>
-    </attribute>
-</define>
-<define name="table-data-pilot-groups">
-    <element name="table:data-pilot-groups">
-        <ref name="table-data-pilot-groups-attlist"/>
-        <oneOrMore>
-            <ref name="table-data-pilot-group"/>
-        </oneOrMore>
-    </element>
-</define>
-<define name="table-data-pilot-groups-attlist" combine="interleave">
-    <attribute name="table:source-field-name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="table-data-pilot-groups-attlist" combine="interleave">
-    <choice>
-        <attribute name="table:date-start">
-            <choice>
-                <ref name="dateOrDateTime"/>
-                <value>auto</value>
-            </choice>
-        </attribute>
-        <attribute name="table:start">
-            <choice>
-                <ref name="double"/>
-                <value>auto</value>
-            </choice>
-        </attribute>
-    </choice>
-</define>
-<define name="table-data-pilot-groups-attlist" combine="interleave">
-    <choice>
-        <attribute name="table:date-end">
-            <choice>
-                <ref name="dateOrDateTime"/>
-                <value>auto</value>
-            </choice>
-        </attribute>
-        <attribute name="table:end">
-            <choice>
-                <ref name="double"/>
-                <value>auto</value>
-            </choice>
-        </attribute>
-    </choice>
-</define>
-<define name="table-data-pilot-groups-attlist" combine="interleave">
-    <attribute name="table:step">
-        <ref name="double"/>
-    </attribute>
-</define>
-<define name="table-data-pilot-groups-attlist" combine="interleave">
-    <attribute name="table:grouped-by">
-        <choice>
-            <value>seconds</value>
-            <value>minutes</value>
-            <value>hours</value>
-            <value>days</value>
-            <value>months</value>
-            <value>quarters</value>
-            <value>years</value>
-        </choice>
-    </attribute>
-</define>
-<define name="table-data-pilot-group">
-    <element name="table:data-pilot-group">
-        <ref name="table-data-pilot-group-attlist"/>
-        <oneOrMore>
-            <ref name="table-data-pilot-group-member"/>
-        </oneOrMore>
-    </element>
-</define>
-<define name="table-data-pilot-group-attlist" combine="interleave">
-    <attribute name="table:name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="table-data-pilot-group-member">
-    <element name="table:data-pilot-group-member">
-        <ref name="table-data-pilot-group-member-attlist"/>
-    </element>
-</define>
-<define name="table-data-pilot-group-member-attlist" combine="interleave">
-    <attribute name="table:name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="table-consolidation">
-    <element name="table:consolidation">
-        <ref name="table-consolidation-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="table-consolidation-attlist" combine="interleave">
-    <attribute name="table:function">    
-        <choice>
-            <value>auto</value>
-            <value>average</value>
-            <value>count</value>
-            <value>countnums</value>
-            <value>max</value>
-            <value>min</value>
-            <value>product</value>
-            <value>stdev</value>
-            <value>stdevp</value>
-            <value>sum</value>
-            <value>var</value>
-            <value>varp</value>
-            <ref name="string"/>
-        </choice>
-    </attribute>
-</define>
-<define name="table-consolidation-attlist" combine="interleave">
-    <attribute name="table:source-cell-range-addresses">    
-        <ref name="cellRangeAddressList"/>
-    </attribute>
-</define>
-<define name="table-consolidation-attlist" combine="interleave">
-    <attribute name="table:target-cell-address">    
-        <ref name="cellAddress"/>
-    </attribute>
-</define>
-<define name="table-consolidation-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:use-labels" a:defaultValue="none">
-            <choice>
-                <value>none</value>
-                <value>row</value>
-                <value>column</value>
-                <value>both</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="table-consolidation-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:link-to-source-data" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-dde-links">
-    <element name="table:dde-links">
-        <oneOrMore>
-            <ref name="table-dde-link"/>
-        </oneOrMore>
-    </element>
-</define>
-<define name="table-tracked-changes">
-    <element name="table:tracked-changes">
-        <ref name="table-tracked-changes-attlist"/>
-        <zeroOrMore>
-            <choice>
-                <ref name="table-cell-content-change"/>
-                <ref name="table-insertion"/>
-                <ref name="table-deletion"/>
-                <ref name="table-movement"/>
-            </choice>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="table-tracked-changes-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:track-changes" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-insertion">
-    <element name="table:insertion">
-        <ref name="table-insertion-attlist"/>
-        <ref name="common-table-change-attlist"/>
-        <ref name="office-change-info"/>
-        <optional>
-            <ref name="table-dependencies"/>
-        </optional>
-        <optional>
-            <ref name="table-deletions"/>
-        </optional>
-    </element>
-</define>
-<define name="table-insertion-attlist" combine="interleave">
-    <attribute name="table:type">
-        <choice>
-            <value>row</value>
-            <value>column</value>
-            <value>table</value>
-        </choice>
-    </attribute>
-</define>
-<define name="table-insertion-attlist" combine="interleave">
-    <attribute name="table:position">
-        <ref name="integer"/>
-    </attribute>
-</define>
-<define name="table-insertion-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:count" a:defaultValue="1">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-insertion-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:table">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-dependencies">
-    <element name="table:dependencies">
-        <oneOrMore>
-            <ref name="table-dependency"/>
-        </oneOrMore>
-    </element>
-</define>
-<define name="table-dependency">
-    <element name="table:dependency">
-        <attribute name="table:id">
-            <ref name="string"/>
-        </attribute>
-        <empty/>
-    </element>
-</define>
-<define name="table-deletions">
-    <element name="table:deletions">
-        <oneOrMore>
-            <choice>
-                <ref name="table-cell-content-deletion"/>
-                <ref name="table-change-deletion"/>
-            </choice>
-        </oneOrMore>
-    </element>
-</define>
-<define name="table-cell-content-deletion">
-    <element name="table:cell-content-deletion">
-        <optional>
-            <attribute name="table:id">
-                <ref name="string"/>
-            </attribute>
-        </optional>
-        <optional>
-            <ref name="table-cell-address"/>
-        </optional>
-        <optional>
-            <ref name="table-change-track-table-cell"/>
-        </optional>
-    </element>
-</define>
-<define name="table-change-deletion">
-    <element name="table:change-deletion">
-        <optional>
-            <attribute name="table:id">
-                <ref name="string"/>
-            </attribute>
-        </optional>
-        <empty/>
-    </element>
-</define>
-<define name="table-deletion">
-    <element name="table:deletion">
-        <ref name="table-deletion-attlist"/>
-        <ref name="common-table-change-attlist"/>
-        <ref name="office-change-info"/>
-        <optional>
-            <ref name="table-dependencies"/>
-        </optional>
-        <optional>
-            <ref name="table-deletions"/>
-        </optional>
-        <optional>
-            <ref name="table-cut-offs"/>
-        </optional>
-    </element>
-</define>
-<define name="table-deletion-attlist" combine="interleave">
-    <attribute name="table:type">
-        <choice>
-            <value>row</value>
-            <value>column</value>
-            <value>table</value>
-        </choice>
-    </attribute>
-</define>
-<define name="table-deletion-attlist" combine="interleave">
-    <attribute name="table:position">
-        <ref name="integer"/>
-    </attribute>
-</define>
-<define name="table-deletion-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:table">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-deletion-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:multi-deletion-spanned">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-cut-offs">
-    <element name="table:cut-offs">
-        <choice>
-            <oneOrMore>
-                <ref name="table-movement-cut-off"/>
-            </oneOrMore>
-            <group>
-                <ref name="table-insertion-cut-off"/>
-                <zeroOrMore>
-                    <ref name="table-movement-cut-off"/>
-                </zeroOrMore>
-            </group>
-        </choice>
-    </element>
-</define>
-<define name="table-insertion-cut-off">
-    <element name="table:insertion-cut-off">
-        <ref name="table-insertion-cut-off-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="table-insertion-cut-off-attlist" combine="interleave">
-    <attribute name="table:id">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="table-insertion-cut-off-attlist" combine="interleave">
-    <attribute name="table:position">
-        <ref name="integer"/>
-    </attribute>
-</define>
-<define name="table-movement-cut-off">
-    <element name="table:movement-cut-off">
-        <ref name="table-movement-cut-off-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="table-movement-cut-off-attlist" combine="interleave">
-    <choice>
-        <attribute name="table:position">
-            <ref name="integer"/>
-        </attribute>
-        <group>
-            <attribute name="table:start-position">
-                <ref name="integer"/>
-            </attribute>
-            <attribute name="table:end-position">
-                <ref name="integer"/>
-            </attribute>
-        </group>
-    </choice>
-</define>
-<define name="table-movement">
-    <element name="table:movement">
-        <ref name="common-table-change-attlist"/>
-        <ref name="table-source-range-address"/>
-        <ref name="table-target-range-address"/>
-        <ref name="office-change-info"/>
-        <optional>
-            <ref name="table-dependencies"/>
-        </optional>
-        <optional>
-            <ref name="table-deletions"/>
-        </optional>
-    </element>
-</define>
-<define name="table-source-range-address">
-    <element name="table:source-range-address">
-        <ref name="common-table-range-attlist"/>
-        <empty/>
-    </element>
-</define>
-
-<define name="table-target-range-address">
-    <element name="table:target-range-address">
-        <ref name="common-table-range-attlist"/>
-        <empty/>
-    </element>
-</define>
-
-
-<define name="common-table-range-attlist" combine="interleave">
-    <choice>
-        <group>
-            <ref name="common-table-cell-address-attlist"/>
-        </group>
-        <group>
-            <ref name="common-table-cell-range-address-attlist"/>
-        </group>
-    </choice>
-</define>
-<define name="common-table-cell-address-attlist" combine="interleave">
-    <attribute name="table:column">
-        <ref name="integer"/>
-    </attribute>
-    <attribute name="table:row">
-        <ref name="integer"/>
-    </attribute>
-    <attribute name="table:table">
-        <ref name="integer"/>
-    </attribute>
-</define>
-<define name="common-table-cell-range-address-attlist" combine="interleave">
-    <attribute name="table:start-column">
-        <ref name="integer"/>
-    </attribute>
-    <attribute name="table:start-row">
-        <ref name="integer"/>
-    </attribute>
-    <attribute name="table:start-table">
-        <ref name="integer"/>
-    </attribute>
-    <attribute name="table:end-column">
-        <ref name="integer"/>
-    </attribute>
-    <attribute name="table:end-row">
-        <ref name="integer"/>
-    </attribute>
-    <attribute name="table:end-table">
-        <ref name="integer"/>
-    </attribute>
-</define>
-<define name="table-change-track-table-cell" combine="interleave">
-    <element name="table:change-track-table-cell">
-        <ref name="table-change-track-table-cell-attlist"/>
-        <zeroOrMore>
-            <ref name="text-p"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="table-change-track-table-cell-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:cell-address">
-            <ref name="cellAddress"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-change-track-table-cell-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:matrix-covered" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-change-track-table-cell-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:formula">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="table:number-matrix-columns-spanned">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="table:number-matrix-rows-spanned">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-    <optional>
-        <ref name="common-value-and-type-attlist"/>
-    </optional>
-</define>
-<define name="table-cell-content-change">
-    <element name="table:cell-content-change">
-        <ref name="common-table-change-attlist"/>
-        <ref name="table-cell-address"/>
-        <ref name="office-change-info"/>
-        <optional>
-            <ref name="table-dependencies"/>
-        </optional>
-        <optional>
-            <ref name="table-deletions"/>
-        </optional>
-        <ref name="table-previous"/>
-    </element>
-</define>
-<define name="table-cell-address">
-    <element name="table:cell-address">
-        <ref name="common-table-cell-address-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="table-previous">
-    <element name="table:previous">
-        <optional>
-            <attribute name="table:id">
-                <ref name="string"/>
-            </attribute>
-        </optional>
-        <ref name="table-change-track-table-cell"/>
-    </element>
-</define>
-<define name="common-table-change-attlist" combine="interleave">
-    <attribute name="table:id">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="common-table-change-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:acceptance-state" a:defaultValue="pending">
-            <choice>
-                <value>accepted</value>
-                <value>rejected</value>
-                <value>pending</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="common-table-change-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:rejecting-change-id">
-            <ref name="string"/> 
-        </attribute>
-    </optional>
-</define>
-<define name="style-handout-master">
-    <element name="style:handout-master">
-        <ref name="common-presentation-header-footer-attlist"/>
-        <ref name="style-handout-master-attlist"/>
-        <zeroOrMore>
-            <ref name="shape"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="style-handout-master-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:presentation-page-layout-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-handout-master-attlist" combine="interleave">
-    <attribute name="style:page-layout-name">
-        <ref name="styleNameRef"/>
-    </attribute>
-</define>
-<define name="style-handout-master-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-layer-set">
-    <element name="draw:layer-set">
-        <zeroOrMore>
-            <ref name="draw-layer"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="draw-layer">
-    <element name="draw:layer">
-        <ref name="draw-layer-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="draw-layer-attlist" combine="interleave">
-    <attribute name="draw:name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="draw-layer-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:protected" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-layer-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:display" a:defaultValue="always">
-            <choice>
-                <value>always</value>
-                <value>screen</value>
-                <value>printer</value>
-                <value>none</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-page">
-    <element name="draw:page">
-        <ref name="common-presentation-header-footer-attlist"/>
-        <ref name="draw-page-attlist"/>
-        <optional>
-            <ref name="office-forms"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="shape"/>
-        </zeroOrMore>
-        <optional>
-            <choice>
-                <ref name="presentation-animations"/>
-                <ref name="animation-element"/>
-            </choice>
-        </optional>
-        <optional>
-            <ref name="presentation-notes"/>
-        </optional>
-    </element>
-</define>
-<define name="draw-page-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-page-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-page-attlist" combine="interleave">
-    <attribute name="draw:master-page-name">
-        <ref name="styleNameRef"/>
-    </attribute>
-</define>
-<define name="draw-page-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:presentation-page-layout-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-presentation-header-footer-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:use-header-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-presentation-header-footer-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:use-footer-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-presentation-header-footer-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:use-date-time-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-page-attlist">
-    <optional>
-        <attribute name="draw:id">
-            <ref name="ID"/>
-        </attribute>
-    </optional>
-</define>
-<define name="shape">
-    <choice>
-        <ref name="draw-rect"/>
-        <ref name="draw-line"/>
-        <ref name="draw-polyline"/>
-        <ref name="draw-polygon"/>
-        <ref name="draw-regular-polygon"/>
-        <ref name="draw-path"/>
-        <ref name="draw-circle"/>
-        <ref name="draw-ellipse"/>
-        <ref name="draw-g"/>
-        <ref name="draw-page-thumbnail"/>
-        <ref name="draw-frame"/>
-        <ref name="draw-measure"/>
-        <ref name="draw-caption"/>
-        <ref name="draw-connector"/>
-        <ref name="draw-control"/>
-        <ref name="dr3d-scene"/>
-        <ref name="draw-custom-shape"/>
-    </choice>
-</define>
-<define name="draw-rect">
-    <element name="draw:rect">
-        <ref name="draw-rect-attlist"/>
-        <ref name="common-draw-position-attlist"/>
-        <ref name="common-draw-size-attlist"/>
-        <ref name="common-draw-shape-with-text-and-styles-attlist"/>
-        <optional>
-            <ref name="office-event-listeners"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="draw-glue-point"/>
-        </zeroOrMore>
-        <ref name="draw-text"/>
-    </element>
-</define>
-<define name="draw-rect-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:corner-radius">
-            <ref name="nonNegativeLength"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-line">
-    <element name="draw:line">
-        <ref name="draw-line-attlist"/>
-        <ref name="common-draw-shape-with-text-and-styles-attlist"/>
-        <optional>
-            <ref name="office-event-listeners"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="draw-glue-point"/>
-        </zeroOrMore>
-        <ref name="draw-text"/>
-    </element>
-</define>
-<define name="draw-line-attlist" combine="interleave">
-    <attribute name="svg:x1">
-        <ref name="coordinate"/>
-    </attribute>
-    <attribute name="svg:y1">
-        <ref name="coordinate"/>
-    </attribute>
-</define>
-<define name="draw-line-attlist" combine="interleave">
-    <attribute name="svg:x2">
-        <ref name="coordinate"/>
-    </attribute>
-    <attribute name="svg:y2">
-        <ref name="coordinate"/>
-    </attribute>
-</define>
-<define name="draw-polyline">
-    <element name="draw:polyline">
-        <ref name="common-draw-points-attlist"/>
-        <ref name="common-draw-position-attlist"/>
-        <ref name="common-draw-size-attlist"/>
-        <ref name="common-draw-viewbox-attlist"/>
-        <ref name="common-draw-shape-with-text-and-styles-attlist"/>
-        <optional>
-            <ref name="office-event-listeners"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="draw-glue-point"/>
-        </zeroOrMore>
-        <ref name="draw-text"/>
-    </element>
-</define>
-<define name="common-draw-points-attlist">
-    <attribute name="draw:points">
-        <ref name="points"/>
-    </attribute>
-</define>
-<define name="draw-polygon">
-    <element name="draw:polygon">
-        <ref name="common-draw-points-attlist"/>
-        <ref name="common-draw-position-attlist"/>
-        <ref name="common-draw-size-attlist"/>
-        <ref name="common-draw-viewbox-attlist"/>
-        <ref name="common-draw-shape-with-text-and-styles-attlist"/>
-        <optional>
-            <ref name="office-event-listeners"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="draw-glue-point"/>
-        </zeroOrMore>
-        <ref name="draw-text"/>
-    </element>
-</define>
-<define name="draw-regular-polygon">
-    <element name="draw:regular-polygon">
-        <ref name="draw-regular-polygon-attlist"/>
-        <ref name="common-draw-position-attlist"/>
-        <ref name="common-draw-size-attlist"/>
-        <ref name="common-draw-shape-with-text-and-styles-attlist"/>
-        <optional>
-            <ref name="office-event-listeners"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="draw-glue-point"/>
-        </zeroOrMore>
-        <ref name="draw-text"/>
-    </element>
-</define>
-<define name="draw-regular-polygon-attlist" combine="interleave">
-    <choice>
-        <attribute name="draw:concave">
-            <value>false</value>
-        </attribute>
-        <group>
-            <attribute name="draw:concave">
-                <value>true</value>
-            </attribute>
-            <ref name="draw-regular-polygon-sharpness-attlist"/>
-        </group>
-    </choice>
-</define>
-<define name="draw-regular-polygon-attlist" combine="interleave">
-    <attribute name="draw:corners">
-        <ref name="positiveInteger"/>
-    </attribute>
-</define>
-<define name="draw-regular-polygon-sharpness-attlist">
-    <attribute name="draw:sharpness">
-        <ref name="percent"/>
-    </attribute>
-</define>
-<define name="draw-path">
-    <element name="draw:path">
-        <ref name="common-draw-path-data-attlist"/>
-        <ref name="common-draw-position-attlist"/>
-        <ref name="common-draw-size-attlist"/>
-        <ref name="common-draw-viewbox-attlist"/>
-        <ref name="common-draw-shape-with-text-and-styles-attlist"/>
-        <optional>
-            <ref name="office-event-listeners"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="draw-glue-point"/>
-        </zeroOrMore>
-        <ref name="draw-text"/>
-    </element>
-</define>
-<define name="common-draw-path-data-attlist">
-    <attribute name="svg:d">
-        <ref name="pathData"/>
-    </attribute>
-</define>
-<define name="draw-circle">
-    <element name="draw:circle">
-        <ref name="draw-circle-attlist"/>
-        <ref name="common-draw-circle-ellipse-attlist"/>
-        <ref name="common-draw-position-attlist"/>
-        <ref name="common-draw-size-attlist"/>
-        <ref name="common-draw-shape-with-text-and-styles-attlist"/>
-        <optional>
-            <ref name="office-event-listeners"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="draw-glue-point"/>
-        </zeroOrMore>
-        <ref name="draw-text"/>
-    </element>
-</define>
-<define name="common-draw-circle-ellipse-attlist" combine="interleave">
-    <optional>
-        <attribute name="svg:cx">
-            <ref name="coordinate"/>
-        </attribute>
-        <attribute name="svg:cy">
-            <ref name="coordinate"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-circle-attlist" combine="interleave">
-    <optional>
-        <attribute name="svg:r">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-draw-circle-ellipse-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:kind" a:defaultValue="full">
-            <choice>
-                <value>full</value>
-                <value>section</value>
-                <value>cut</value>
-                <value>arc</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="common-draw-circle-ellipse-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:start-angle">
-            <ref name="double"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-draw-circle-ellipse-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:end-angle">
-            <ref name="double"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-ellipse">
-    <element name="draw:ellipse">
-        <ref name="common-draw-circle-ellipse-attlist"/>
-        <ref name="draw-ellipse-attlist"/>
-        <ref name="common-draw-position-attlist"/>
-        <ref name="common-draw-size-attlist"/>
-        <ref name="common-draw-shape-with-text-and-styles-attlist"/>
-        <optional>
-            <ref name="office-event-listeners"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="draw-glue-point"/>
-        </zeroOrMore>
-        <ref name="draw-text"/>
-    </element>
-</define>
-<define name="draw-ellipse-attlist" combine="interleave">
-    <optional>
-        <attribute name="svg:rx">
-            <ref name="length"/>
-        </attribute>
-        <attribute name="svg:ry">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-connector">
-    <element name="draw:connector">
-        <ref name="draw-connector-attlist"/>
-        <ref name="common-draw-shape-with-text-and-styles-attlist"/>
-        <optional>
-            <ref name="office-event-listeners"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="draw-glue-point"/>
-        </zeroOrMore>
-        <ref name="draw-text"/>
-    </element>
-</define>
-<define name="draw-connector-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:type" a:defaultValue="standard">
-            <choice>
-                <value>standard</value>
-                <value>lines</value>
-                <value>line</value>
-                <value>curve</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-connector-attlist" combine="interleave">
-    <optional>
-        <attribute name="svg:x1">
-            <ref name="coordinate"/>
-        </attribute>
-        <attribute name="svg:y1">
-            <ref name="coordinate"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-connector-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:start-shape">
-            <ref name="IDREF"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-connector-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:start-glue-point">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-connector-attlist" combine="interleave">
-    <optional>
-        <attribute name="svg:x2">
-            <ref name="coordinate"/>
-        </attribute>
-        <attribute name="svg:y2">
-            <ref name="coordinate"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-connector-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:end-shape">
-            <ref name="IDREF"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-connector-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:end-glue-point">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-connector-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:line-skew">
-            <list>
-                <ref name="length"/>
-                <optional>
-                    <ref name="length"/>
-                    <optional>
-                        <ref name="length"/>
-                    </optional>
-                </optional>
-            </list>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-caption">
-    <element name="draw:caption">
-        <ref name="draw-caption-attlist"/>
-        <ref name="common-draw-position-attlist"/>
-        <ref name="common-draw-size-attlist"/>
-        <ref name="common-draw-shape-with-text-and-styles-attlist"/>    
-        <optional>
-            <ref name="office-event-listeners"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="draw-glue-point"/>
-        </zeroOrMore>
-        <ref name="draw-text"/>
-    </element>
-</define>
-<define name="draw-caption-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:caption-point-x">
-            <ref name="coordinate"/>
-        </attribute>
-        <attribute name="draw:caption-point-y">
-            <ref name="coordinate"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-caption-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:corner-radius">
-            <ref name="nonNegativeLength"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-measure">
-    <element name="draw:measure">
-        <ref name="draw-measure-attlist"/>
-        <ref name="common-draw-shape-with-text-and-styles-attlist"/>
-        <optional>
-            <ref name="office-event-listeners"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="draw-glue-point"/>
-        </zeroOrMore>
-        <ref name="draw-text"/>
-    </element>
-</define>
-<define name="draw-measure-attlist" combine="interleave">
-    <attribute name="svg:x1">
-        <ref name="coordinate"/>
-    </attribute>
-    <attribute name="svg:y1">
-        <ref name="coordinate"/>
-    </attribute>
-</define>
-<define name="draw-measure-attlist" combine="interleave">
-    <attribute name="svg:x2">
-        <ref name="coordinate"/>
-    </attribute>
-    <attribute name="svg:y2">
-        <ref name="coordinate"/>
-    </attribute>
-</define>
-<define name="draw-control">
-    <element name="draw:control">
-        <ref name="draw-control-attlist"/>
-        <ref name="common-draw-position-attlist"/>
-        <ref name="common-draw-size-attlist"/>
-        <ref name="common-draw-shape-with-text-and-styles-attlist"/>    
-        <zeroOrMore>
-            <ref name="draw-glue-point"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="draw-control-attlist" combine="interleave">
-    <attribute name="draw:control">
-        <ref name="IDREF"/>
-    </attribute>
-</define>
-<define name="draw-page-thumbnail">
-    <element name="draw:page-thumbnail">
-        <ref name="draw-page-thumbnail-attlist"/>
-        <ref name="common-draw-position-attlist"/>
-        <ref name="common-draw-size-attlist"/>
-        <ref name="presentation-shape-attlist"/>
-        <ref name="common-draw-shape-with-styles-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="draw-page-thumbnail-attlist">
-    <optional>
-        <attribute name="draw:page-number">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-g">
-    <element name="draw:g">
-        <ref name="draw-g-attlist"/>
-        <ref name="common-draw-z-index-attlist"/>
-        <ref name="common-draw-name-attlist"/>
-        <ref name="common-draw-id-attlist"/>
-        <ref name="common-draw-style-name-attlist"/>
-        <ref name="common-text-spreadsheet-shape-attlist"/>
-        <optional>
-            <ref name="office-event-listeners"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="draw-glue-point"/>
-        </zeroOrMore>
-        <zeroOrMore>
-            <ref name="shape"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="draw-g-attlist" combine="interleave">
-    <optional>
-        <attribute name="svg:y">
-            <ref name="coordinate"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-draw-name-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-draw-position-attlist">
-    <optional>
-        <attribute name="svg:x">
-            <ref name="coordinate"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:y">
-            <ref name="coordinate"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-draw-size-attlist">
-    <optional>
-        <attribute name="svg:width">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:height">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-draw-transform-attlist">
-    <optional>
-        <attribute name="draw:transform">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-draw-viewbox-attlist">
-    <attribute name="svg:viewBox">
-        <list>
-            <ref name="integer"/>
-            <ref name="integer"/>
-            <ref name="integer"/>
-            <ref name="integer"/>
-        </list>
-    </attribute>
-</define>
-<define name="common-draw-style-name-attlist">
-    <choice>
-        <group>
-            <optional>
-                <attribute name="draw:style-name">
-                    <ref name="styleNameRef"/>
-                </attribute>
-            </optional>
-            <optional>
-                <attribute name="draw:class-names">
-                    <ref name="styleNameRefs"/>
-                </attribute>
-            </optional>
-        </group>
-        <group>
-            <optional>
-                <attribute name="presentation:style-name">
-                    <ref name="styleNameRef"/>
-                </attribute>
-            </optional>
-            <optional>
-                <attribute name="presentation:class-names">
-                    <ref name="styleNameRefs"/>
-                </attribute>
-            </optional>
-        </group>
-    </choice>
-</define>
-<define name="common-draw-text-style-name-attlist">
-    <optional>
-        <attribute name="draw:text-style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-draw-layer-name-attlist">
-    <optional>
-        <attribute name="draw:layer">
-            <data type="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-draw-id-attlist">
-    <optional>
-        <attribute name="draw:id">
-            <ref name="ID"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-draw-z-index-attlist">
-    <optional>
-        <attribute name="draw:z-index">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-text-spreadsheet-shape-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:end-cell-address">
-            <ref name="cellAddress"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="table:end-x">
-            <ref name="coordinate"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="table:end-y">
-            <ref name="coordinate"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-text-spreadsheet-shape-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:table-background">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-text-spreadsheet-shape-attlist" combine="interleave">
-    <ref name="common-text-anchor-attlist"/>
-</define>
-
-<define name="common-text-anchor-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:anchor-type">
-            <choice>
-                <value>page</value>
-                <value>frame</value>
-                <value>paragraph</value>
-                <value>char</value>
-                <value>as-char</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="common-text-anchor-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:anchor-page-number">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-text">
-    <zeroOrMore>
-        <choice>
-            <ref name="text-p"/>
-            <ref name="text-list"/>
-        </choice>
-    </zeroOrMore>
-</define>
-<define name="common-draw-shape-with-styles-attlist">
-    <ref name="common-draw-z-index-attlist"/>
-    <ref name="common-draw-id-attlist"/>
-    <ref name="common-draw-layer-name-attlist"/>
-    <ref name="common-draw-style-name-attlist"/>
-    <ref name="common-draw-transform-attlist"/>
-    <ref name="common-draw-name-attlist"/>
-    <ref name="common-text-spreadsheet-shape-attlist"/>
-</define>
-<define name="common-draw-shape-with-text-and-styles-attlist">
-    <ref name="common-draw-shape-with-styles-attlist"/>
-    <ref name="common-draw-text-style-name-attlist"/>
-</define>
-<define name="draw-glue-point">
-    <element name="draw:glue-point">
-        <ref name="draw-glue-point-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="draw-glue-point-attlist" combine="interleave">
-    <attribute name="draw:id">
-        <ref name="nonNegativeInteger"/>
-    </attribute>
-</define>
-<define name="draw-glue-point-attlist" combine="interleave">
-    <attribute name="svg:x">
-        <choice>
-            <ref name="distance"/> 
-            <ref name="percent"/>
-        </choice>
-    </attribute>
-    <attribute name="svg:y">
-        <choice>
-            <ref name="distance"/> 
-            <ref name="percent"/>
-        </choice>
-    </attribute>
-</define>
-<define name="draw-glue-point-attlist" combine="interleave">
-    <attribute name="draw:align">
-        <choice>
-            <value>top-left</value>
-            <value>top</value>
-            <value>top-right</value>
-            <value>left</value>
-            <value>center</value>
-            <value>right</value>
-            <value>bottom-left</value>
-            <value>bottom-right</value>
-        </choice>
-    </attribute>
-</define>
-<define name="draw-glue-points-attlist" combine="interleave">
-    <attribute name="draw:escape-direction">
-        <choice>
-            <value>auto</value>
-            <value>left</value>
-            <value>right</value>
-            <value>up</value>
-            <value>down</value>
-            <value>horizontal</value>
-            <value>vertical</value>
-        </choice>
-    </attribute>
-</define>
-<define name="draw-frame">
-    <element name="draw:frame">
-        <ref name="common-draw-shape-with-text-and-styles-attlist"/>
-        <ref name="common-draw-position-attlist"/>
-        <ref name="common-draw-rel-size-attlist"/>
-        <ref name="presentation-shape-attlist"/>
-        <ref name="draw-frame-attlist"/>
-        <zeroOrMore>
-            <choice>
-                <ref name="draw-text-box"/>
-                <ref name="draw-image"/>
-                <ref name="draw-object"/>
-                <ref name="draw-object-ole"/>
-                <ref name="draw-applet"/>
-                <ref name="draw-floating-frame"/>
-                <ref name="draw-plugin"/>
-            </choice>
-        </zeroOrMore>
-        <optional>
-            <ref name="office-event-listeners"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="draw-glue-point"/>
-        </zeroOrMore>
-        <optional>
-            <ref name="draw-image-map"/>
-        </optional>
-        <optional>
-            <ref name="svg-desc"/>
-        </optional>
-        <optional>
-            <choice>
-                <ref name="draw-contour-polygon"/>
-                <ref name="draw-contour-path"/>
-            </choice>
-        </optional>
-    </element>
-</define>
-<define name="common-draw-rel-size-attlist">
-    <ref name="common-draw-size-attlist"/>
-    <optional>
-        <attribute name="style:rel-width">
-            <choice>
-                <ref name="percent"/>
-                <value>scale</value>
-                <value>scale-min</value>
-            </choice>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:rel-height">
-            <choice>
-                <ref name="percent"/>
-                <value>scale</value>
-                <value>scale-min</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-frame-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:copy-of">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-text-box">
-    <element name="draw:text-box">
-        <ref name="draw-text-box-attlist"/>
-        <zeroOrMore>
-            <ref name="text-content"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="draw-text-box-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:chain-next-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-text-box-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:corner-radius">
-            <ref name="nonNegativeLength"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-text-box-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:min-height">
-            <choice>
-                <ref name="length"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="fo:min-width">
-            <choice>
-                <ref name="length"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-text-box-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:max-height">
-            <choice>
-                <ref name="length"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="fo:max-width">
-            <choice>
-                <ref name="length"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-image">
-    <element name="draw:image">
-        <ref name="draw-image-attlist"/>
-        <choice>
-            <ref name="common-draw-data-attlist"/>
-            <ref name="office-binary-data"/>
-        </choice>
-        <ref name="draw-text"/>
-    </element>
-</define>
-<define name="common-draw-data-attlist" combine="interleave">
-    <group>
-        <attribute name="xlink:href">
-            <ref name="anyURI"/>
-        </attribute>
-        <optional>
-            <attribute name="xlink:type" a:defaultValue="simple">
-                <choice>
-                    <value>simple</value>
-                </choice>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="xlink:show" a:defaultValue="embed">
-                <choice>
-                    <value>embed</value>
-                </choice>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="xlink:actuate" a:defaultValue="onLoad">
-                <choice>
-                    <value>onLoad</value>
-                </choice>
-            </attribute>
-        </optional>
-    </group>
-</define>
-
-<define name="office-binary-data">
-    <element name="office:binary-data">
-        <ref name="base64Binary"/>
-    </element>
-</define>
-<define name="draw-image-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:filter-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-object">
-    <element name="draw:object">
-        <ref name="draw-object-attlist"/>
-        <choice>
-            <ref name="common-draw-data-attlist"/>
-            <ref name="office-document"/>
-            <ref name="math-math"/>
-        </choice>
-    </element>
-</define>
-
-<define name="draw-object-ole">
-    <element name="draw:object-ole">
-        <ref name="draw-object-ole-attlist"/>
-        <choice>
-            <ref name="common-draw-data-attlist"/>
-            <ref name="office-binary-data"/>
-        </choice>
-    </element>
-</define>
-<define name="draw-object-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:notify-on-update-of-ranges">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-object-ole-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:class-id"/>
-    </optional>
-</define>
-<define name="draw-applet">
-    <element name="draw:applet">
-        <ref name="draw-applet-attlist"/>
-        <optional>
-            <ref name="common-draw-data-attlist"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="draw-param"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="draw-applet-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:code"/>
-    </optional>
-</define>
-<define name="draw-applet-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:object"/>
-    </optional>
-</define>
-<define name="draw-applet-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:archive"/>
-    </optional>
-</define>
-<define name="draw-applet-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:may-script" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-plugin">
-    <element name="draw:plugin">
-        <ref name="draw-plugin-attlist"/>
-        <ref name="common-draw-data-attlist"/>
-        <zeroOrMore>
-            <ref name="draw-param"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="draw-plugin-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:mime-type"/>
-    </optional>
-</define>
-<define name="draw-param">
-    <element name="draw:param">
-        <ref name="draw-param-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="draw-param-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:name"/>
-    </optional>
-</define>
-<define name="draw-param-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:value"/>
-    </optional>
-</define>
-<define name="draw-floating-frame">
-    <element name="draw:floating-frame">
-        <ref name="draw-floating-frame-attlist"/>
-        <ref name="common-draw-data-attlist"/>
-    </element>
-</define>
-<define name="draw-floating-frame-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:frame-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-contour-polygon">
-    <element name="draw:contour-polygon">
-        <ref name="common-contour-attlist"/>
-        <ref name="common-draw-size-attlist"/>
-        <ref name="common-draw-viewbox-attlist"/>
-        <ref name="common-draw-points-attlist"/>
-        <empty/>
-    </element>
-</define>
-
-<define name="draw-contour-path">
-    <element name="draw:contour-path">
-        <ref name="common-contour-attlist"/>
-        <ref name="common-draw-size-attlist"/>
-        <ref name="common-draw-viewbox-attlist"/>
-        <ref name="common-draw-path-data-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="common-contour-attlist" combine="interleave">
-    <attribute name="draw:recreate-on-edit">
-        <ref name="boolean"/>
-    </attribute>
-</define>
-<define name="svg-desc">
-    <element name="svg:desc">
-        <text/>
-    </element>
-</define>
-<define name="draw-a">
-    <element name="draw:a">
-        <ref name="draw-a-attlist"/>
-        <ref name="draw-frame"/>
-    </element>
-</define>
-<define name="draw-a-attlist" combine="interleave">
-    <attribute name="xlink:href">
-        <ref name="anyURI"/>
-    </attribute>
-    <optional>
-        <attribute name="xlink:type" a:defaultValue="simple">
-            <value>simple</value>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="xlink:actuate" a:defaultValue="onRequest">
-            <choice>
-                <value>onRequest</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-a-attlist" combine="interleave">
-    <optional>
-        <attribute name="office:target-frame-name">
-            <ref name="targetFrameName"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="xlink:show">
-            <choice>
-                <value>new</value>
-                <value>replace</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-a-attlist" combine="interleave">
-    <optional>
-        <attribute name="office:name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-a-attlist" combine="interleave">
-    <optional>
-        <attribute name="office:server-map" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-image-map">
-    <element name="draw:image-map">
-        <zeroOrMore>
-            <choice>
-                <ref name="draw-area-rectangle"/>
-                <ref name="draw-area-circle"/>
-                <ref name="draw-area-polygon"/>
-            </choice>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="draw-area-rectangle">
-    <element name="draw:area-rectangle">
-        <ref name="common-draw-area-attlist"/>
-        <attribute name="svg:x">
-            <ref name="coordinate"/>
-        </attribute>
-        <attribute name="svg:y">
-            <ref name="coordinate"/>
-        </attribute>
-        <attribute name="svg:width">
-            <ref name="length"/>
-        </attribute>
-        <attribute name="svg:height">
-            <ref name="length"/>
-        </attribute>
-        <optional>
-            <ref name="svg-desc"/>
-        </optional>
-        <optional>
-            <ref name="office-event-listeners"/>
-        </optional>
-    </element>
-</define>
-<define name="draw-area-circle">
-    <element name="draw:area-circle">
-        <ref name="common-draw-area-attlist"/>
-        <attribute name="svg:cx">
-            <ref name="coordinate"/>
-        </attribute>
-        <attribute name="svg:cy">
-            <ref name="coordinate"/>
-        </attribute>
-        <attribute name="svg:r">
-            <ref name="length"/>
-        </attribute>
-        <optional>
-            <ref name="svg-desc"/>
-        </optional>
-        <optional>
-            <ref name="office-event-listeners"/>
-        </optional>
-    </element>
-</define>
-<define name="draw-area-polygon">
-    <element name="draw:area-polygon">
-        <ref name="common-draw-area-attlist"/>
-        <attribute name="svg:x">
-            <ref name="coordinate"/>
-        </attribute>
-        <attribute name="svg:y">
-            <ref name="coordinate"/>
-        </attribute>
-        <attribute name="svg:width">
-            <ref name="length"/>
-        </attribute>
-        <attribute name="svg:height">
-            <ref name="length"/>
-        </attribute>
-        <ref name="common-draw-viewbox-attlist"/>
-        <ref name="common-draw-points-attlist"/>
-        <optional>
-            <ref name="svg-desc"/>
-        </optional>
-        <optional>
-            <ref name="office-event-listeners"/>
-        </optional>
-    </element>
-</define>
-<define name="common-draw-area-attlist" combine="interleave">
-    <optional>
-        <attribute name="xlink:href">
-            <ref name="anyURI"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="xlink:type" a:defaultValue="simple">
-            <choice>
-                <value>simple</value>
-            </choice>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="office:target-frame-name">
-            <ref name="targetFrameName"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="xlink:show">
-            <choice>
-                <value>new</value>
-                <value>replace</value>
-            </choice>
-            </attribute>
-    </optional>
-</define>
-<define name="common-draw-area-attlist" combine="interleave">
-    <optional>
-        <attribute name="office:name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-draw-area-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:nohref">
-            <choice>
-                <value>nohref</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="dr3d-scene">
-    <element name="dr3d:scene">
-        <ref name="dr3d-scene-attlist"/>
-        <ref name="common-draw-position-attlist"/>
-        <ref name="common-draw-size-attlist"/>
-        <ref name="common-draw-style-name-attlist"/>
-        <ref name="common-draw-z-index-attlist"/>
-        <ref name="common-draw-id-attlist"/>
-        <ref name="common-draw-layer-name-attlist"/>
-        <ref name="common-text-spreadsheet-shape-attlist"/>
-        <ref name="common-dr3d-transform-attlist"/>
-        <zeroOrMore>
-            <ref name="dr3d-light"/>
-        </zeroOrMore>
-        <zeroOrMore>
-            <ref name="shapes3d"/>
-        </zeroOrMore>
-    </element>
-</define>
-
-<define name="shapes3d">
-    <choice>
-        <ref name="dr3d-scene"/>
-        <ref name="dr3d-extrude"/>
-        <ref name="dr3d-sphere"/>
-        <ref name="dr3d-rotate"/>
-        <ref name="dr3d-cube"/>
-    </choice>
-</define>
-<define name="dr3d-scene-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:vrp">
-            <ref name="vector3D"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="dr3d:vpn">
-            <ref name="vector3D"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="dr3d:vup">
-            <ref name="vector3D"/>
-        </attribute>
-    </optional>
-</define>
-<define name="dr3d-scene-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:projection">
-            <choice>
-                <value>parallel</value>
-                <value>perspective</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="dr3d-scene-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:distance">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="dr3d-scene-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:focal-length">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="dr3d-scene-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:shadow-slant">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="dr3d-scene-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:shade-mode">
-            <choice>
-                <value>flat</value>
-                <value>phong</value>
-                <value>gouraud</value>
-                <value>draft</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="dr3d-scene-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:ambient-color">
-            <ref name="color"/>
-        </attribute>
-    </optional>
-</define>
-<define name="dr3d-scene-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:lighting-mode">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-dr3d-transform-attlist">
-    <optional>
-        <attribute name="dr3d:transform"/>
-    </optional>
-</define>
-<define name="dr3d-light">
-    <element name="dr3d:light">
-        <ref name="dr3d-light-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="dr3d-light-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:diffuse-color">
-            <ref name="color"/>
-        </attribute>
-    </optional>
-</define>
-<define name="dr3d-light-attlist" combine="interleave">
-    <attribute name="dr3d:direction">
-        <ref name="vector3D"/>
-    </attribute>
-</define>
-<define name="dr3d-light-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:enabled">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="dr3d-light-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:specular">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="dr3d-cube">
-    <element name="dr3d:cube">
-        <ref name="dr3d-cube-attlist"/>
-        <ref name="common-draw-z-index-attlist"/>
-        <ref name="common-draw-id-attlist"/>
-        <ref name="common-draw-layer-name-attlist"/>
-        <ref name="common-draw-style-name-attlist"/>
-        <ref name="common-dr3d-transform-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="dr3d-cube-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:min-edge">
-            <ref name="vector3D"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="dr3d:max-edge">
-            <ref name="vector3D"/>
-        </attribute>
-    </optional>
-</define>
-<define name="dr3d-sphere">
-    <element name="dr3d:sphere">
-        <ref name="dr3d-sphere-attlist"/>
-        <ref name="common-draw-z-index-attlist"/>
-        <ref name="common-draw-id-attlist"/>
-        <ref name="common-draw-layer-name-attlist"/>
-        <ref name="common-draw-style-name-attlist"/>
-        <ref name="common-dr3d-transform-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="dr3d-sphere-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:center">
-            <ref name="vector3D"/>
-        </attribute>
-    </optional>
-</define>
-<define name="dr3d-sphere-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:size">
-            <ref name="vector3D"/>
-        </attribute>
-    </optional>
-</define>
-<define name="dr3d-extrude">
-    <element name="dr3d:extrude">
-        <ref name="common-draw-path-data-attlist"/>
-        <ref name="common-draw-viewbox-attlist"/>
-        <ref name="common-draw-id-attlist"/>
-        <ref name="common-draw-z-index-attlist"/>
-        <ref name="common-draw-layer-name-attlist"/>
-        <ref name="common-draw-style-name-attlist"/>
-        <ref name="common-dr3d-transform-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="dr3d-rotate">
-    <element name="dr3d:rotate">
-        <ref name="common-draw-viewbox-attlist"/>
-        <ref name="common-draw-path-data-attlist"/>
-        <ref name="common-draw-z-index-attlist"/>
-        <ref name="common-draw-id-attlist"/>
-        <ref name="common-draw-layer-name-attlist"/>
-        <ref name="common-draw-style-name-attlist"/>
-        <ref name="common-dr3d-transform-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="draw-custom-shape">
-    <element name="draw:custom-shape">
-        <ref name="draw-custom-shape-attlist"/>
-        <ref name="common-draw-position-attlist"/>
-        <ref name="common-draw-size-attlist"/>
-        <ref name="common-draw-shape-with-text-and-styles-attlist"/>
-        <optional>
-            <ref name="office-event-listeners"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="draw-glue-point"/>
-        </zeroOrMore>
-        <ref name="draw-text"/>
-        <optional>
-            <ref name="draw-enhanced-geometry"/>
-        </optional>
-    </element>
-</define>
-<define name="draw-custom-shape-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:engine">
-            <ref name="namespacedToken"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-custom-shape-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:data">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry">
-    <element name="draw:enhanced-geometry">
-        <ref name="draw-enhanced-geometry-attlist"/>
-        <zeroOrMore>
-            <ref name="draw-equation"/>
-        </zeroOrMore>
-        <zeroOrMore>
-            <ref name="draw-handle"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:type" a:defaultValue="non-primitive">
-            <ref name="custom-shape-type"/>
-        </attribute>
-    </optional>
-</define>
-
-<define name="custom-shape-type">
-    <choice>
-        <value>non-primitive</value>
-        <ref name="string"/>
-    </choice>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="svg:viewBox">
-            <list>
-                <ref name="integer"/>
-                <ref name="integer"/>
-                <ref name="integer"/>
-                <ref name="integer"/>
-            </list>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:mirror-vertical" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="draw:mirror-horizontal" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:text-rotate-angle" a:defaultValue="0">
-            <ref name="double"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:extrusion-allowed" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:text-path-allowed" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:concentric-gradient-fill-allowed"
-                    a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:extrusion" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:extrusion-brightness" a:defaultValue="33%">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:extrusion-depth" a:defaultValue="36pt 0">
-            <list>
-                <ref name="length"/>
-                <ref name="double"/>
-            </list>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:extrusion-diffusion" a:defaultValue="0%">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:extrusion-number-of-line-segments"
-                   a:defaultValue="30">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:extrusion-light-face" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:extrusion-first-light-harsh"
-                   a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:extrusion-second-light-harsh"
-                   a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:extrusion-first-light-level"
-                   a:defaultValue="66%">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:extrusion-second-light-level"
-                   a:defaultValue="66%">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:extrusion-first-light-direction"
-                   a:defaultValue="(5 0 1)">
-            <ref name="vector3D"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:extrusion-second-light-direction"
-                   a:defaultValue="(-5 0 1)">
-            <ref name="vector3D"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:extrusion-metal" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:shade-mode" a:defaultValue="flat">
-            <choice>
-                <value>flat</value>
-                <value>phong</value>
-                <value>gouraud</value>
-                <value>draft</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:extrusion-rotation-angle" a:defaultValue="0 0">
-            <list>
-                <ref name="double"/>
-                <ref name="double"/>
-            </list>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:extrusion-rotation-center">
-            <ref name="vector3D"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:extrusion-shininess" a:defaultValue="50%">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:extrusion-skew" a:defaultValue="50 45">
-            <list>
-                <ref name="double"/>
-                <ref name="double"/>
-            </list>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:extrusion-specularity" a:defaultValue="0%">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:projection" a:defaultValue="parallel">
-            <choice>
-                <value>parallel</value>
-                <value>perspective</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:extrusion-viewpoint" 
-                   a:defaultValue="3.5cm -3.5cm 25cm">
-            <ref name="point3D"/>
-        </attribute>
-    </optional>
-</define>
-
-<define name="point3D">
-    <data type="string"/>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:extrusion-origin" a:defaultValue="0.5 -0.5">
-            <list>
-                <ref name="double"/>
-                <ref name="double"/>
-            </list>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:extrusion-color" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:enhanced-path">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:path-stretchpoint-x" a:defaultValue="0">
-            <ref name="double"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="draw:path-stretchpoint-y" a:defaultValue="0">
-            <ref name="double"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:text-areas">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:glue-points">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:glue-point-type" a:defaultValue="none">
-            <choice>
-                <value>none</value>
-                <value>segments</value>
-                <value>rectangle</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:glue-point-leaving-directions"/>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:text-path" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:text-path-mode" a:defaultValue="normal">
-            <choice>
-                <value>normal</value>
-                <value>path</value>
-                <value>shape</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:text-path-scale" a:defaultValue="path">
-            <choice>
-                <value>path</value>
-                <value>shape</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:text-path-same-letter-heights"
-                   a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:modifiers">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-equation">
-    <element name="draw:equation">
-        <ref name="draw-equation-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="draw-equation-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-equation-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:formula">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-handle">
-    <element name="draw:handle">
-        <ref name="draw-handle-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="draw-handle-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:handle-mirror-vertical" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-handle-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:handle-mirror-horizontal" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-handle-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:handle-switched" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-handle-attlist" combine="interleave">
-    <attribute name="draw:handle-position">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="draw-handle-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:handle-range-x-minimum">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-handle-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:handle-range-x-maximum">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-handle-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:handle-range-y-minimum">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-handle-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:handle-range-y-maximum">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-handle-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:handle-polar">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-handle-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:handle-radius-range-minimum">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-handle-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:handle-radius-range-maximum">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-shape-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:class">
-            <ref name="presentation-classes"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-classes">
-    <choice>
-        <value>title</value>
-        <value>outline</value>
-        <value>subtitle</value>
-        <value>text</value>
-        <value>graphic</value>
-        <value>object</value>
-        <value>chart</value>
-        <value>table</value>
-        <value>orgchart</value>
-        <value>page</value>
-        <value>notes</value>
-        <value>handout</value>
-        <value>header</value>
-        <value>footer</value>
-        <value>date-time</value>
-        <value>page-number</value>
-    </choice>
-</define>
-<define name="presentation-shape-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:placeholder">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-shape-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:user-transformed">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-animations">
-    <element name="presentation:animations">
-        <zeroOrMore>
-            <choice>
-                <ref name="presentation-animation-elements"/>
-                <ref name="presentation-animation-group"/>
-            </choice>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="presentation-animation-elements">
-    <choice>
-        <ref name="presentation-show-shape"/>
-        <ref name="presentation-show-text"/>
-        <ref name="presentation-hide-shape"/>
-        <ref name="presentation-hide-text"/>
-        <ref name="presentation-dim"/>
-        <ref name="presentation-play"/>
-    </choice>
-</define>
-<define name="presentation-sound">
-    <element name="presentation:sound">
-        <ref name="presentation-sound-attlist"/>
-        <attribute name="xlink:href">
-            <ref name="anyURI"/>
-        </attribute>
-        <optional>
-            <attribute name="xlink:type" a:defaultValue="simple">
-                <choice>
-                    <value>simple</value>
-                </choice>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="xlink:actuate" a:defaultValue="onRequest">
-                <choice>
-                    <value>onRequest</value>
-                </choice>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="xlink:show">
-                <choice>
-                    <value>new</value>
-                    <value>replace</value>
-                </choice>
-            </attribute>
-        </optional>
-        <empty/>
-    </element>
-</define>
-<define name="presentation-sound-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:play-full">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-show-shape">
-    <element name="presentation:show-shape">
-        <ref name="common-presentation-effect-attlist"/>
-        <optional>
-            <ref name="presentation-sound"/>
-        </optional>
-    </element>
-</define>
-<define name="common-presentation-effect-attlist" combine="interleave">
-    <attribute name="draw:shape-id">
-        <ref name="IDREF"/>
-    </attribute>
-</define>
-<define name="common-presentation-effect-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:effect" a:defaultValue="none">
-            <ref name="presentationEffects"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentationEffects">
-    <choice>
-        <value>none</value>
-        <value>fade</value>
-        <value>move</value>
-        <value>stripes</value>
-        <value>open</value>
-        <value>close</value>
-        <value>dissolve</value>
-        <value>wavyline</value>
-        <value>random</value>
-        <value>lines</value>
-        <value>laser</value>
-        <value>appear</value>
-        <value>hide</value>
-        <value>move-short</value>
-        <value>checkerboard</value>
-        <value>rotate</value>
-        <value>stretch</value>
-    </choice>
-</define>
-<define name="common-presentation-effect-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:direction" a:defaultValue="none">
-            <ref name="presentationEffectDirections"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentationEffectDirections">
-    <choice>
-        <value>none</value>
-        <value>from-left</value>
-        <value>from-top</value>
-        <value>from-right</value>
-        <value>from-bottom</value>
-        <value>from-center</value>
-        <value>from-upper-left</value>
-        <value>from-upper-right</value>
-        <value>from-lower-left</value>
-        <value>from-lower-right</value>
-        <value>to-left</value>
-        <value>to-top</value>
-        <value>to-right</value>
-        <value>to-bottom</value>
-        <value>to-upper-left</value>
-        <value>to-upper-right</value>
-        <value>to-lower-right</value>
-        <value>to-lower-left</value>
-        <value>path</value>
-        <value>spiral-inward-left</value>
-        <value>spiral-inward-right</value>
-        <value>spiral-outward-left</value>
-        <value>spiral-outward-right</value>
-        <value>vertical</value>
-        <value>horizontal</value>
-        <value>to-center</value>
-        <value>clockwise</value>
-        <value>counter-clockwise</value>
-    </choice>
-</define>
-<define name="common-presentation-effect-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:speed" a:defaultValue="medium">
-            <ref name="presentationSpeeds"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentationSpeeds">
-    <choice>
-        <value>slow</value>
-        <value>medium</value>
-        <value>fast</value>
-    </choice>
-</define>
-<define name="common-presentation-effect-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:delay">
-            <ref name="duration"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-presentation-effect-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:start-scale" a:defaultValue="100%">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-presentation-effect-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:path-id"/>
-    </optional>
-</define>
-<define name="presentation-show-text">
-    <element name="presentation:show-text">
-        <ref name="common-presentation-effect-attlist"/>
-        <optional>
-            <ref name="presentation-sound"/>
-        </optional>
-    </element>
-</define>
-<define name="presentation-hide-shape">
-    <element name="presentation:hide-shape">
-        <ref name="common-presentation-effect-attlist"/>
-        <optional>
-            <ref name="presentation-sound"/>
-        </optional>
-    </element>
-</define>
-<define name="presentation-hide-text">
-    <element name="presentation:hide-text">
-        <ref name="common-presentation-effect-attlist"/>
-        <optional>
-            <ref name="presentation-sound"/>
-        </optional>
-    </element>
-</define>
-<define name="presentation-dim">
-    <element name="presentation:dim">
-        <ref name="presentation-dim-attlist"/>
-        <optional>
-            <ref name="presentation-sound"/>
-        </optional>
-    </element>
-</define>
-<define name="presentation-dim-attlist" combine="interleave">
-    <attribute name="draw:shape-id">
-        <ref name="IDREF"/>
-    </attribute>
-</define>
-<define name="presentation-dim-attlist" combine="interleave">
-    <attribute name="draw:color">
-        <ref name="color"/>
-    </attribute>
-</define>
-<define name="presentation-play">
-    <element name="presentation:play">
-        <ref name="presentation-play-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="presentation-play-attlist" combine="interleave">
-    <attribute name="draw:shape-id">
-        <ref name="IDREF"/>
-    </attribute>
-    <optional>
-        <attribute name="presentation:speed" a:defaultValue="medium">
-            <ref name="presentationSpeeds"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-animation-group">
-    <element name="presentation:animation-group">
-        <zeroOrMore>
-            <ref name="presentation-animation-elements"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="common-anim-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:node-type" a:defaultValue="default">
-            <choice>
-                <value>default</value>
-                <value>on-click</value>
-                <value>with-previous</value>
-                <value>after-previous</value>
-                <value>timing-root</value>
-                <value>main-sequence</value>
-                <value>interactive-sequence</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="common-anim-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:preset-id">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-anim-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:preset-sub-type">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-anim-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:preset-class" a:defaultValue="custom">
-            <choice>
-                <value>custom</value>
-                <value>entrance</value>
-                <value>exit</value>
-                <value>emphasis</value>
-                <value>motion-path</value>
-                <value>ole-action</value>
-                <value>media-call</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="common-anim-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:master-element">
-            <ref name="IDREF"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-anim-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:group-id">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-event-listener">
-    <element name="presentation:event-listener">
-        <ref name="presentation-event-listener-attlist"/>
-        <optional>
-            <ref name="presentation-sound"/>
-        </optional>
-    </element>
-</define>
-<define name="presentation-event-listener-attlist" combine="interleave">
-    <attribute name="script:event-name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="presentation-event-listener-attlist" combine="interleave">
-    <attribute name="presentation:action">
-        <choice>
-            <value>none</value>
-            <value>previous-page</value>
-            <value>next-page</value>
-            <value>first-page</value>
-            <value>last-page</value>
-            <value>hide</value>
-            <value>stop</value>
-            <value>execute</value>
-            <value>show</value>
-            <value>verb</value>
-            <value>fade-out</value>
-            <value>sound</value>
-        </choice>
-    </attribute>
-</define>
-<define name="presentation-event-listener-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:effect" a:defaultValue="none">
-            <ref name="presentationEffects"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-event-listener-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:direction" a:defaultValue="none">
-            <ref name="presentationEffectDirections"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-event-listener-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:speed" a:defaultValue="medium">
-            <ref name="presentationSpeeds"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-event-listener-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:start-scale" a:defaultValue="100%">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-event-listener-attlist" combine="interleave">
-    <optional>
-        <attribute name="xlink:href">
-            <ref name="anyURI"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="xlink:type" a:defaultValue="simple">
-            <choice>
-                <value>simple</value>
-            </choice>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="xlink:show" a:defaultValue="embed">
-            <choice>
-                <value>embed</value>
-            </choice>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="xlink:actuate" a:defaultValue="onRequest">
-            <choice>
-                <value>onRequest</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-event-listener-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:verb">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="presentation:header">
-        <empty/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="presentation:footer">
-        <empty/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="presentation:date-time">
-        <empty/>
-    </element>
-</define>
-<define name="presentation-decls">
-    <zeroOrMore>
-        <ref name="presentation-decl"/>
-    </zeroOrMore>
-</define>
-<define name="presentation-decl" combine="choice">
-    <element name="presentation:header-decl">
-        <ref name="presentation-header-decl-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="presentation-header-decl-attlist" combine="interleave">
-    <attribute name="presentation:name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="presentation-decl" combine="choice">
-    <element name="presentation:footer-decl">
-        <ref name="presentation-footer-decl-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="presentation-footer-decl-attlist" combine="interleave">
-    <attribute name="presentation:name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="presentation-decl" combine="choice">
-    <element name="presentation:date-time-decl">
-        <ref name="presentation-date-time-decl-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="presentation-date-time-decl-attlist" combine="interleave">
-    <attribute name="presentation:name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="presentation-date-time-decl-attlist" combine="interleave">
-    <attribute name="presentation:source">
-        <choice>
-            <value>fixed</value>
-            <value>current-date</value>
-        </choice>
-    </attribute>
-</define>
-<define name="presentation-date-time-decl-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:data-style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-settings">
-    <optional>
-        <element name="presentation:settings">
-            <ref name="presentation-settings-attlist"/>
-            <zeroOrMore>
-                <ref name="presentation-show"/>
-            </zeroOrMore>
-        </element>
-    </optional>
-</define>
-<define name="presentation-settings-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:start-page">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-settings-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:show">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-settings-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:full-screen" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-settings-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:endless" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-settings-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:pause">
-            <ref name="duration"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-settings-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:show-logo" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-settings-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:force-manual" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-settings-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:mouse-visible" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-settings-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:mouse-as-pen" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-settings-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:start-with-navigator"
-                   a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-settings-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:animations" a:defaultValue="enabled">
-            <choice>
-                <value>enabled</value>
-                <value>disabled</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-settings-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:transition-on-click"
-                   a:defaultValue="enabled">
-            <choice>
-                <value>enabled</value>
-                <value>disabled</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-settings-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:stay-on-top" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-show">
-    <element name="presentation:show">
-        <ref name="presentation-show-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="presentation-show-attlist" combine="interleave">
-    <attribute name="presentation:name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="presentation-show-attlist" combine="interleave">
-    <attribute name="presentation:pages"/>
-</define>
-<define name="chart-chart">
-    <element name="chart:chart">
-        <ref name="chart-chart-attlist"/>
-        <optional>
-            <ref name="chart-title"/>
-        </optional>
-        <optional>
-            <ref name="chart-subtitle"/>
-        </optional>
-        <optional>
-            <ref name="chart-footer"/>
-        </optional>
-        <optional>
-            <ref name="chart-legend"/>
-        </optional>
-        <ref name="chart-plot-area"/>
-        <optional>
-            <ref name="table-table"/>
-        </optional>
-    </element>
-</define>
-<define name="chart-chart-attlist" combine="interleave">
-    <attribute name="chart:class">
-        <ref name="namespacedToken"/>
-    </attribute>
-</define>
-<define name="chart-chart-attlist" combine="interleave">
-    <ref name="common-draw-size-attlist"/>
-</define>
-<define name="chart-chart-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:column-mapping">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-chart-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:row-mapping">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-chart-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-title">
-    <element name="chart:title">
-        <ref name="chart-title-attlist"/>
-        <optional>
-            <ref name="text-p"/>
-        </optional>
-    </element>
-</define>
-<define name="chart-title-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:cell-range">
-            <ref name="cellAddress"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-title-attlist" combine="interleave">
-    <ref name="common-draw-position-attlist"/>
-</define>
-<define name="chart-title-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-subtitle">
-    <element name="chart:subtitle">
-        <ref name="chart-title-attlist"/>
-        <optional>
-            <ref name="text-p"/>
-        </optional>
-    </element>
-</define>
-<define name="chart-footer">
-    <element name="chart:footer">
-        <ref name="chart-title-attlist"/>
-        <optional>
-            <ref name="text-p"/>
-        </optional>
-    </element>
-</define>
-<define name="chart-legend">
-    <element name="chart:legend">
-        <ref name="chart-legend-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="chart-legend-attlist" combine="interleave">
-    <choice>
-        <group>
-            <attribute name="chart:legend-position">
-                <choice>
-                    <value>start</value>
-                    <value>end</value>
-                    <value>top</value>
-                    <value>bottom</value>
-                </choice>
-            </attribute>
-            <optional>
-                <attribute name="chart:legend-align">
-                    <choice>
-                        <value>start</value>
-                        <value>center</value>
-                        <value>end</value>
-                    </choice>
-                </attribute>
-            </optional>
-        </group>
-        <attribute name="chart:legend-position">
-            <choice>
-                <value>top-start</value>
-                <value>bottom-start</value>
-                <value>top-end</value>
-                <value>bottom-end</value>
-            </choice>
-        </attribute>
-        <empty/>
-    </choice>
-</define>
-<define name="chart-legend-attlist" combine="interleave">
-    <ref name="common-draw-position-attlist"/>
-</define>
-<define name="chart-legend-attlist" combine="interleave">
-    <choice>
-        <attribute name="style:legend-expansion">
-            <choice>
-                <value>wide</value>
-                <value>high</value>
-                <value>balanced</value>
-            </choice>
-        </attribute>
-        <group>
-            <attribute name="style:legend-expansion">
-                <value>custom</value>
-            </attribute>
-            <attribute name="style:legend-expansion-aspect-ratio">
-                <ref name="double"/>
-            </attribute>
-        </group>
-        <empty/>
-    </choice>
-</define>
-<define name="chart-legend-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-plot-area">
-    <element name="chart:plot-area">
-        <ref name="chart-plot-area-attlist"/>
-        <zeroOrMore>
-            <ref name="dr3d-light"/>
-        </zeroOrMore>
-        <zeroOrMore>
-            <ref name="chart-axis"/>
-        </zeroOrMore>
-        <zeroOrMore>
-            <ref name="chart-series"/>
-        </zeroOrMore>
-        <optional>
-            <ref name="chart-stock-gain-marker"/>
-        </optional>
-        <optional>
-            <ref name="chart-stock-loss-marker"/>
-        </optional>
-        <optional>
-            <ref name="chart-stock-range-line"/>
-        </optional>
-        <optional>
-            <ref name="chart-wall"/>
-        </optional>
-        <optional>
-            <ref name="chart-floor"/>
-        </optional>
-    </element>
-</define>
-<define name="chart-plot-area-attlist" combine="interleave">
-    <ref name="common-draw-position-attlist"/>
-    <ref name="common-draw-size-attlist"/>
-</define>
-<define name="chart-plot-area-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-plot-area-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:cell-range-address">
-            <ref name="cellRangeAddress"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-plot-area-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:data-source-has-labels" a:defaultValue="none">
-            <choice>
-                <value>none</value>
-                <value>row</value>
-                <value>column</value>
-                <value>both</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-plot-area-attlist" combine="interleave">
-    <ref name="dr3d-scene-attlist"/>
-    <ref name="common-dr3d-transform-attlist"/>
-</define>
-<define name="chart-wall">
-    <element name="chart:wall">
-        <ref name="chart-wall-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="chart-wall-attlist" combine="interleave">
-    <optional>
-        <attribute name="svg:width">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-wall-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-floor">
-    <element name="chart:floor">
-        <ref name="chart-floor-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="chart-floor-attlist" combine="interleave">
-    <optional>
-        <attribute name="svg:width">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-floor-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-axis">
-    <element name="chart:axis">
-        <ref name="chart-axis-attlist"/>
-        <optional>
-            <ref name="chart-title"/>
-        </optional>
-        <optional>
-            <ref name="chart-categories"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="chart-grid"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="chart-axis-attlist" combine="interleave">
-    <attribute name="chart:dimension">
-        <choice>
-            <value>x</value>
-            <value>y</value>
-            <value>z</value>
-        </choice>
-    </attribute>
-</define>
-<define name="chart-axis-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-axis-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-grid">
-    <element name="chart:grid">
-        <ref name="chart-grid-attlist"/>
-    </element>
-</define>
-<define name="chart-grid-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:class" a:defaultValue="major">
-            <choice>
-                <value>major</value>
-                <value>minor</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-grid-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-series">
-    <element name="chart:series">
-        <ref name="chart-series-attlist"/>
-        <zeroOrMore>
-            <ref name="chart-domain"/>
-        </zeroOrMore>
-        <optional>
-            <ref name="chart-mean-value"/>
-        </optional>
-        <optional>
-            <ref name="chart-regression-curve"/>
-        </optional>
-        <optional>
-            <ref name="chart-error-indicator"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="chart-data-point"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="chart-series-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:values-cell-range-address">
-            <ref name="cellRangeAddress"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-series-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:label-cell-address">
-            <ref name="cellAddress"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-series-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:class">
-            <ref name="namespacedToken"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-series-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:attached-axis">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-series-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-domain">
-    <element name="chart:domain">
-    <optional>
-        <attribute name="table:cell-range-address">
-            <ref name="cellRangeAddress"/>
-        </attribute>
-    </optional>
-    </element>
-</define>
-<define name="chart-categories">
-    <element name="chart:categories">
-    <optional>
-        <attribute name="table:cell-range-address">
-            <ref name="cellRangeAddress"/>
-        </attribute>
-    </optional>
-    </element>
-</define>
-<define name="chart-data-point">
-    <element name="chart:data-point">
-        <ref name="chart-data-point-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="chart-data-point-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:repeated">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-data-point-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-
-<define name="chart-mean-value">
-    <element name="chart:mean-value">
-        <ref name="chart-mean-value-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="chart-mean-value-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-error-indicator">
-    <element name="chart:error-indicator">
-        <ref name="chart-error-indicator-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="chart-error-indicator-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-regression-curve">
-    <element name="chart:regression-curve">
-        <ref name="chart-regression-curve-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="chart-regression-curve-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-stock-gain-marker">
-    <element name="chart:stock-gain-marker">
-        <ref name="common-stock-marker-attlist"/>
-    </element>
-</define>
-<define name="chart-stock-loss-marker">
-    <element name="chart:stock-loss-marker">
-        <ref name="common-stock-marker-attlist"/>
-    </element>
-</define>
-<define name="chart-stock-range-line">
-    <element name="chart:stock-range-line">
-        <ref name="common-stock-marker-attlist"/>
-    </element>
-</define>
-<define name="common-stock-marker-attlist">
-    <optional>
-        <attribute name="chart:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="office-forms">
-    <optional>
-        <element name="office:forms">
-            <ref name="office-forms-attlist"/>
-            <zeroOrMore>
-                <choice>
-                    <ref name="form-form"/>
-                    <ref name="xforms-model"/>
-                </choice>
-            </zeroOrMore>
-        </element>
-    </optional>
-</define>
-<define name="office-forms-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:automatic-focus" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="office-forms-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:apply-design-mode" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-form">
-    <element name="form:form">
-        <ref name="common-form-control-attlist"/>
-        <ref name="form-form-attlist"/>
-        <optional>
-            <ref name="form-properties"/>
-        </optional>
-        <optional>
-            <ref name="office-event-listeners"/>
-        </optional>
-        <zeroOrMore>
-            <choice>
-                <ref name="controls"/>
-                <ref name="form-form"/>
-            </choice>
-        </zeroOrMore>
-        <optional>
-            <ref name="form-connection-resource"/>
-        </optional>
-    </element>
-</define>
-<define name="form-form-attlist" combine="interleave">
-    <optional>
-        <attribute name="xlink:href">
-            <ref name="anyURI"/>
-        </attribute>
-        <optional>
-            <attribute name="xlink:type" a:defaultValue="simple">
-                <value>simple</value>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="xlink:actuate" a:defaultValue="onRequest">
-                <value>onRequest</value>
-            </attribute>
-        </optional>
-    </optional>
-</define>
-<define name="form-form-attlist" combine="interleave">
-    <optional>
-        <attribute name="office:target-frame" a:defaultValue="_blank">
-            <ref name="targetFrameName"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-form-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:method" a:defaultValue="get">
-            <choice>
-                <value>get</value>
-                <value>post</value>
-                <ref name="string"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="form-form-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:enctype" 
-                    a:defaultValue="application/x-www-form-urlencoded">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-form-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:allow-deletes" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-form-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:allow-inserts" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-form-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:allow-updates" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-form-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:apply-filter" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-form-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:command-type" a:defaultValue="command">
-            <choice>
-                <value>table</value>
-                <value>query</value>
-                <value>command</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="form-form-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:command"/>
-    </optional>
-</define>
-<define name="form-form-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:datasource">
-            <choice>
-                <ref name="anyURI"/>
-                <ref name="string"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="form-form-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:master-fields">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-form-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:detail-fields">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-form-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:escape-processing" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-form-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:filter">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-form-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:ignore-result" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-form-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:navigation-mode">
-            <ref name="navigation"/>
-        </attribute>
-    </optional>
-</define>
-
-<define name="navigation">
-    <choice>
-        <value>none</value>
-        <value>current</value>
-        <value>parent</value>
-    </choice>
-</define>
-<define name="form-form-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:order">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-form-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:tab-cycle">
-            <ref name="tab-cycles"/>
-        </attribute>
-    </optional>
-</define>
-<define name="tab-cycles">
-    <choice>
-        <value>records</value>
-        <value>current</value>
-        <value>page</value>
-    </choice>
-</define>
-<define name="form-connection-resource">
-    <element name="form:connection-resource">
-        <attribute name="xlink:href">
-            <ref name="anyURI"/>
-        </attribute>
-        <empty/>
-    </element>
-</define>
-<define name="xforms-model">
-    <element name="xforms:model">
-        <ref name="anyAttListOrElements"/>
-    </element>
-</define>
-<define name="column-controls" combine="choice">
-    <element name="form:text">
-        <ref name="form-text-attlist"/>
-        <ref name="common-form-control-content"/>
-    </element>
-</define>
-<define name="controls" combine="choice">
-    <ref name="column-controls"/>
-</define>
-<define name="form-text-attlist">
-    <ref name="form-control-attlist"/>
-    <ref name="common-current-value-attlist"/>
-    <ref name="common-disabled-attlist"/>
-    <ref name="common-maxlength-attlist"/>
-    <ref name="common-printable-attlist"/>
-    <ref name="common-readonly-attlist"/>
-    <ref name="common-tab-attlist"/>
-    <ref name="common-title-attlist"/>
-    <ref name="common-value-attlist"/>
-    <ref name="common-convert-empty-attlist"/>
-    <ref name="common-data-field-attlist"/>
-</define>
-<define name="form-control-attlist">
-    <ref name="common-form-control-attlist"/>
-    <ref name="common-control-id-attlist"/>
-    <ref name="xforms-bind-attlist"/>
-</define>
-<define name="common-form-control-content">
-    <optional>
-        <ref name="form-properties"/>
-    </optional>
-    <optional>
-        <ref name="office-event-listeners"/>
-    </optional>
-</define>
-<define name="column-controls" combine="choice">
-    <element name="form:textarea">
-        <ref name="form-textarea-attlist"/>
-        <ref name="common-form-control-content"/>
-        <zeroOrMore>
-            <ref name="text-p"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="form-textarea-attlist">
-    <ref name="form-control-attlist"/>
-    <ref name="common-current-value-attlist"/>
-    <ref name="common-disabled-attlist"/>
-    <ref name="common-maxlength-attlist"/>
-    <ref name="common-printable-attlist"/>
-    <ref name="common-readonly-attlist"/>
-    <ref name="common-tab-attlist"/>
-    <ref name="common-title-attlist"/>
-    <ref name="common-value-attlist"/>
-    <ref name="common-convert-empty-attlist"/>
-    <ref name="common-data-field-attlist"/>
-</define>
-<define name="controls" combine="choice">
-    <element name="form:password">
-        <ref name="form-password-attlist"/>
-        <ref name="common-form-control-content"/>
-    </element>
-</define>
-<define name="form-password-attlist" combine="interleave">
-    <ref name="form-control-attlist"/>
-    <ref name="common-disabled-attlist"/>
-    <ref name="common-maxlength-attlist"/>
-    <ref name="common-printable-attlist"/>
-    <ref name="common-tab-attlist"/>
-    <ref name="common-title-attlist"/>
-    <ref name="common-value-attlist"/>
-    <ref name="common-convert-empty-attlist"/>
-</define>
-<define name="form-password-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:echo-char" a:defaultValue="*">
-            <ref name="character"/>
-        </attribute>
-    </optional>
-</define>
-<define name="controls" combine="choice">
-    <element name="form:file">
-        <ref name="form-file-attlist"/>
-        <ref name="common-form-control-content"/>
-    </element>
-</define>
-<define name="form-file-attlist" combine="interleave">
-    <ref name="form-control-attlist"/>
-    <ref name="common-current-value-attlist"/>
-    <ref name="common-disabled-attlist"/>
-    <ref name="common-maxlength-attlist"/>
-    <ref name="common-printable-attlist"/>
-    <ref name="common-readonly-attlist"/>
-    <ref name="common-tab-attlist"/>
-    <ref name="common-title-attlist"/>
-    <ref name="common-value-attlist"/>
-</define>
-<define name="column-controls" combine="choice">
-    <element name="form:formatted-text">
-        <ref name="form-formatted-text-attlist"/>
-        <ref name="common-form-control-content"/>
-    </element>
-</define>
-<define name="form-formatted-text-attlist" combine="interleave">
-    <ref name="form-control-attlist"/>
-    <ref name="common-current-value-attlist"/>
-    <ref name="common-disabled-attlist"/>
-    <ref name="common-maxlength-attlist"/>
-    <ref name="common-printable-attlist"/>
-    <ref name="common-readonly-attlist"/>
-    <ref name="common-tab-attlist"/>
-    <ref name="common-title-attlist"/>
-    <ref name="common-value-attlist"/>
-    <ref name="common-convert-empty-attlist"/>
-    <ref name="common-data-field-attlist"/>
-</define>
-<define name="form-formatted-text-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:max-value">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-formatted-text-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:min-value">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-formatted-text-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:validation" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="column-controls" combine="choice">
-    <element name="form:number">
-        <ref name="form-number-attlist"/>
-        <ref name="common-numeric-control-attlist"/>
-        <ref name="common-form-control-content"/>
-    </element>
-</define>
-<define name="common-numeric-control-attlist">
-    <ref name="form-control-attlist"/>
-    <ref name="common-disabled-attlist"/>
-    <ref name="common-maxlength-attlist"/>
-    <ref name="common-printable-attlist"/>
-    <ref name="common-readonly-attlist"/>
-    <ref name="common-tab-attlist"/>
-    <ref name="common-title-attlist"/>
-    <ref name="common-convert-empty-attlist"/>
-    <ref name="common-data-field-attlist"/>
-</define>
-<define name="form-number-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:value">
-            <ref name="double"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-number-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:current-value">
-            <ref name="double"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-number-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:min-value">
-            <ref name="double"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-number-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:max-value">
-            <ref name="double"/>
-        </attribute>
-    </optional>
-</define>
-<define name="column-controls" combine="choice">
-    <element name="form:date">
-        <ref name="form-date-attlist"/>
-        <ref name="common-numeric-control-attlist"/>
-        <ref name="common-form-control-content"/>
-    </element>
-</define>
-<define name="controls" combine="choice">
-    <element name="form:time">
-        <ref name="form-time-attlist"/>
-        <ref name="common-numeric-control-attlist"/>
-        <ref name="common-form-control-content"/>
-    </element>
-</define>
-<define name="form-date-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:value">
-            <ref name="date"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-time-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:value">
-            <ref name="time"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-date-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:current-value">
-            <ref name="date"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-time-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:current-value">
-            <ref name="time"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-date-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:min-value">
-            <ref name="date"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-time-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:min-value">
-            <ref name="time"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-date-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:max-value">
-            <ref name="date"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-time-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:max-value">
-            <ref name="time"/>
-        </attribute>
-    </optional>
-</define>
-<define name="controls" combine="choice">
-    <element name="form:fixed-text">
-        <ref name="form-fixed-text-attlist"/>
-        <ref name="common-form-control-content"/>
-    </element>
-</define>
-<define name="form-fixed-text-attlist" combine="interleave">
-    <ref name="form-control-attlist"/>
-    <ref name="for"/>
-    <ref name="common-disabled-attlist"/>
-    <ref name="label"/>
-    <ref name="common-printable-attlist"/>
-    <ref name="common-title-attlist"/>
-</define>
-<define name="form-fixed-text-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:multi-line" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="column-controls" combine="choice">
-    <element name="form:combobox">
-        <ref name="form-combobox-attlist"/>
-        <ref name="common-form-control-content"/>
-        <zeroOrMore>
-            <ref name="form-item"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="form-combobox-attlist" combine="interleave">
-    <ref name="form-control-attlist"/>
-    <ref name="common-current-value-attlist"/>
-    <ref name="common-disabled-attlist"/>
-    <ref name="dropdown"/>
-    <ref name="common-maxlength-attlist"/>
-    <ref name="common-printable-attlist"/>
-    <ref name="common-readonly-attlist"/>
-    <ref name="size"/>
-    <ref name="common-tab-attlist"/>
-    <ref name="common-title-attlist"/>
-    <ref name="common-value-attlist"/>
-    <ref name="common-convert-empty-attlist"/>
-    <ref name="common-data-field-attlist"/>
-    <ref name="list-source"/>
-    <ref name="list-source-type"/>
-</define>
-<define name="form-combobox-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:auto-complete">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-item">
-    <element name="form:item">
-        <ref name="form-item-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="form-item-attlist" combine="interleave">
-    <ref name="label"/>
-</define>
-<define name="column-controls" combine="choice">
-    <element name="form:listbox">
-        <ref name="form-listbox-attlist"/>
-        <ref name="common-form-control-content"/>
-        <zeroOrMore>
-            <ref name="form-option"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="form-listbox-attlist" combine="interleave">
-    <ref name="form-control-attlist"/>
-    <ref name="common-disabled-attlist"/>
-    <ref name="dropdown"/>
-    <ref name="common-printable-attlist"/>
-    <ref name="size"/>
-    <ref name="common-tab-attlist"/>
-    <ref name="common-title-attlist"/>
-    <ref name="bound-column"/>
-    <ref name="common-data-field-attlist"/>
-    <ref name="list-source"/>
-    <ref name="list-source-type"/>
-</define>
-<define name="form-listbox-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:multiple" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-listbox-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:xforms-list-source">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-option">
-    <element name="form:option">
-        <ref name="form-option-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="form-option-attlist" combine="interleave">
-    <ref name="current-selected"/>
-    <ref name="selected"/>
-    <ref name="label"/>
-    <ref name="common-value-attlist"/>
-</define>
-<define name="controls" combine="choice">
-    <element name="form:button">
-        <ref name="form-button-attlist"/>
-        <ref name="common-form-control-content"/>
-    </element>
-</define>
-<define name="form-button-attlist" combine="interleave">
-    <ref name="form-control-attlist"/>
-    <ref name="button-type"/>
-    <ref name="common-disabled-attlist"/>
-    <ref name="label"/>
-    <ref name="image-data"/>
-    <ref name="common-printable-attlist"/>
-    <ref name="common-tab-attlist"/>
-    <ref name="target-frame"/>
-    <ref name="target-location"/>
-    <ref name="common-title-attlist"/>
-    <ref name="common-value-attlist"/>
-    <ref name="common-form-relative-image-position-attlist"/>
-</define>
-<define name="form-button-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:default-button" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-button-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:toggle" a:default-value="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-button-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:focus-on-click">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-button-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:xforms-submission">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="controls" combine="choice">
-    <element name="form:image">
-        <ref name="form-image-attlist"/>
-        <ref name="common-form-control-content"/>
-    </element>
-</define>
-<define name="form-image-attlist" combine="interleave">
-    <ref name="form-control-attlist"/>
-    <ref name="button-type"/>
-    <ref name="common-disabled-attlist"/>
-    <ref name="image-data"/>
-    <ref name="common-printable-attlist"/>
-    <ref name="common-tab-attlist"/>
-    <ref name="target-frame"/>
-    <ref name="target-location"/>
-    <ref name="common-title-attlist"/>
-    <ref name="common-value-attlist"/>
-</define>
-<define name="column-controls" combine="choice">
-    <element name="form:checkbox">
-        <ref name="form-checkbox-attlist"/>
-        <ref name="common-form-control-content"/>
-    </element>
-</define>
-<define name="form-checkbox-attlist" combine="interleave">
-    <ref name="form-control-attlist"/>
-    <ref name="common-disabled-attlist"/>
-    <ref name="label"/>
-    <ref name="common-printable-attlist"/>
-    <ref name="common-tab-attlist"/>
-    <ref name="common-title-attlist"/>
-    <ref name="common-value-attlist"/>
-    <ref name="common-data-field-attlist"/>
-    <ref name="common-form-visual-effect-attlist"/>
-    <ref name="common-form-relative-image-position-attlist"/>
-</define>
-<define name="states">
-    <choice>
-        <value>unchecked</value>
-        <value>checked</value>
-        <value>unknown</value>
-    </choice>
-</define>
-<define name="form-checkbox-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:current-state">
-            <ref name="states"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-checkbox-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:is-tristate" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-checkbox-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:state" a:defaultValue="unchecked">
-            <ref name="states"/>
-        </attribute>
-    </optional>
-</define>
-<define name="controls" combine="choice">
-    <element name="form:radio">
-        <ref name="form-radio-attlist"/>
-        <ref name="common-form-control-content"/>
-    </element>
-</define>
-<define name="form-radio-attlist" combine="interleave">
-    <ref name="form-control-attlist"/>
-    <ref name="current-selected"/>
-    <ref name="common-disabled-attlist"/>
-    <ref name="label"/>
-    <ref name="common-printable-attlist"/>
-    <ref name="selected"/>
-    <ref name="common-tab-attlist"/>
-    <ref name="common-title-attlist"/>
-    <ref name="common-value-attlist"/>
-    <ref name="common-data-field-attlist"/>
-    <ref name="common-form-visual-effect-attlist"/>
-    <ref name="common-form-relative-image-position-attlist"/>
-</define>
-<define name="controls" combine="choice">
-    <element name="form:frame">
-        <ref name="form-frame-attlist"/>
-        <ref name="common-form-control-content"/>
-    </element>
-</define>
-<define name="form-frame-attlist" combine="interleave">
-    <ref name="form-control-attlist"/>
-    <ref name="common-disabled-attlist"/>
-    <ref name="for"/>
-    <ref name="label"/>
-    <ref name="common-printable-attlist"/>
-    <ref name="common-title-attlist"/>
-</define>
-<define name="controls" combine="choice">
-    <element name="form:image-frame">
-        <ref name="form-image-frame-attlist"/>
-        <ref name="common-form-control-content"/>
-    </element>
-</define>
-<define name="form-image-frame-attlist" combine="interleave">
-    <ref name="form-control-attlist"/>
-    <ref name="common-disabled-attlist"/>
-    <ref name="image-data"/>
-    <ref name="common-printable-attlist"/>
-    <ref name="common-readonly-attlist"/>
-    <ref name="common-title-attlist"/>
-    <ref name="common-data-field-attlist"/>
-</define>
-<define name="controls" combine="choice">
-    <element name="form:hidden">
-        <ref name="form-hidden-attlist"/>
-        <ref name="common-form-control-content"/>
-    </element>
-</define>
-<define name="form-hidden-attlist" combine="interleave">
-    <ref name="form-control-attlist"/>
-    <ref name="common-value-attlist"/>
-</define>
-<define name="controls" combine="choice">
-    <element name="form:grid">
-        <ref name="form-grid-attlist"/>
-        <ref name="common-form-control-content"/>
-        <zeroOrMore>
-            <ref name="form-column"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="form-grid-attlist" combine="interleave">
-    <ref name="form-control-attlist"/>
-    <ref name="common-disabled-attlist"/>
-    <ref name="common-printable-attlist"/>
-    <ref name="common-tab-attlist"/>
-    <ref name="common-title-attlist"/>
-</define>
-<define name="form-column">
-    <element name="form:column">
-        <ref name="form-column-attlist"/>
-        <oneOrMore>
-            <ref name="column-controls"/>
-        </oneOrMore>
-    </element>
-</define>
-<define name="form-column-attlist" combine="interleave">
-    <ref name="common-form-control-attlist"/>
-    <ref name="label"/>
-    <ref name="text-style-name"/>
-</define>
-<define name="text-style-name">
-    <optional>
-        <attribute name="form:text-style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="controls" combine="choice">
-    <element name="form:value-range">
-        <ref name="form-value-range-attlist"/>
-        <ref name="common-form-control-content"/>
-    </element>
-</define>
-<define name="form-value-range-attlist" combine="interleave">
-    <ref name="form-control-attlist"/>
-    <ref name="common-disabled-attlist"/>
-    <ref name="common-printable-attlist"/>
-    <ref name="common-tab-attlist"/>
-    <ref name="common-title-attlist"/>
-    <ref name="common-value-attlist"/>
-</define>
-<define name="form-value-range-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:max-value">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-value-range-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:min-value">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-value-range-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:step-size" a:defaultName="1">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-value-range-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:page-step-size">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-value-range-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:delay-for-repeat">
-            <ref name="duration"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-value-range-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:orientation">
-            <choice>
-                <value>horizontal</value>
-                <value>vertical</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="controls" combine="choice">
-    <element name="form:generic-control">
-        <ref name="form-generic-control-attlist"/>
-        <ref name="common-form-control-content"/>
-    </element>
-</define>
-<define name="form-generic-control-attlist" combine="interleave">
-    <ref name="form-control-attlist"/>
-</define>
-<define name="common-form-control-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-form-control-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:control-implementation">
-            <ref name="namespacedToken"/>
-        </attribute>
-    </optional>
-</define>
-<define name="xforms-bind-attlist">
-    <optional>
-        <attribute name="xforms:bind">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="types">
-    <choice>
-        <value>submit</value>
-        <value>reset</value>
-        <value>push</value>
-        <value>url</value>
-    </choice>
-</define>
-<define name="button-type">
-    <optional>
-        <attribute name="form:button-type" a:defaultValue="push">
-            <ref name="types"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-control-id-attlist">
-    <attribute name="form:id">
-        <ref name="ID"/>
-    </attribute>
-</define>
-<define name="current-selected">
-    <optional>
-        <attribute name="form:current-selected" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-value-attlist">
-    <optional>
-        <attribute name="form:value">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-current-value-attlist">
-    <optional>
-        <attribute name="form:current-value">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-disabled-attlist">
-    <optional>
-        <attribute name="form:disabled" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="dropdown">
-    <optional>
-        <attribute name="form:dropdown" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="for">
-    <optional>
-        <attribute name="form:for">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="image-data">
-    <optional>
-        <attribute name="form:image-data">
-            <ref name="anyURI"/>
-        </attribute>
-    </optional>
-</define>
-<define name="label">
-    <optional>
-        <attribute name="form:label">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-maxlength-attlist">
-    <optional>
-        <attribute name="form:max-length">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-printable-attlist">
-    <optional>
-        <attribute name="form:printable" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-readonly-attlist">
-    <optional>
-        <attribute name="form:readonly" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="selected">
-    <optional>
-        <attribute name="form:selected" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="size">
-    <optional>
-        <attribute name="form:size">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-tab-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:tab-index" a:defaultValue="0">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-tab-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:tab-stop" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="target-frame">
-    <optional>
-        <attribute name="office:target-frame" a:defaultValue="_blank">
-            <ref name="targetFrameName"/>
-        </attribute>
-    </optional>
-</define>
-<define name="target-location">
-    <optional>
-        <attribute name="xlink:href">
-            <ref name="anyURI"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-title-attlist">
-    <optional>
-        <attribute name="form:title"/>
-    </optional>
-</define>
-<define name="common-form-visual-effect-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:visual-effect">
-            <choice>
-                <value>flat</value>
-                <value>3d</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="common-form-relative-image-position-attlist"
-        combine="interleave">
-    <choice>
-        <optional>
-            <attribute name="form:image-position" a:defaultValue="center">
-                <value>center</value>
-            </attribute>
-        </optional>
-        <group>
-            <attribute name="form:image-position">
-                <choice>
-                    <value>start</value>
-                    <value>end</value>
-                    <value>top</value>
-                    <value>bottom</value>
-                </choice>
-            </attribute>
-            <optional>
-                <attribute name="form:image-align" a:defaultValue="center">
-                    <choice>
-                        <value>start</value>
-                        <value>center</value>
-                        <value>end</value>
-                    </choice>
-                </attribute>
-            </optional>
-        </group>
-    </choice>
-</define>
-<define name="bound-column">
-    <optional>
-        <attribute name="form:bound-column">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-convert-empty-attlist">
-    <optional>
-        <attribute name="form:convert-empty-to-null" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-data-field-attlist">
-    <optional>
-        <attribute name="form:data-field">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="list-source">
-    <optional>
-        <attribute name="form:list-source">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="list-source-type">
-    <optional>
-        <attribute name="form:list-source-type">
-            <choice>
-                <value>table</value>
-                <value>query</value>
-                <value>sql</value>
-                <value>sql-pass-through</value>
-                <value>value-list</value>
-                <value>table-fields</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="form-properties">
-    <element name="form:properties">
-        <oneOrMore>
-            <ref name="form-property"/>
-        </oneOrMore>
-    </element>
-</define>
-<define name="form-property" combine="choice">
-    <element name="form:property">
-        <ref name="form-property-name"/>
-        <ref name="form-property-value-and-type-attlist"/>
-    </element>
-</define>
-<define name="form-property-name" combine="interleave">
-    <attribute name="form:property-name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="form-property-value-and-type-attlist" combine="interleave">
-    <choice>
-        <ref name="common-value-and-type-attlist"/>
-        <attribute name="office:value-type">
-            <value>void</value>
-        </attribute>
-    </choice>
-</define>
-<define name="form-property" combine="choice">
-    <element name="form:list-property">
-        <ref name="form-property-name"/>
-        <ref name="form-property-type-and-value-list"/>
-    </element>
-</define>
-<define name="form-property-type-and-value-list">
-    <choice>
-        <group>
-            <attribute name="office:value-type">
-                <value>float</value>
-            </attribute>
-            <zeroOrMore>
-                <element name="form:list-value">
-                    <attribute name="office:value">
-                        <ref name="double"/>
-                    </attribute>
-                </element>
-            </zeroOrMore>
-        </group>
-        <group>
-            <attribute name="office:value-type">
-                <value>percentage</value>
-            </attribute>
-            <zeroOrMore>
-                <element name="form:list-value">
-                    <attribute name="office:value">
-                        <ref name="double"/>
-                    </attribute>
-                </element>
-            </zeroOrMore>
-        </group>
-        <group>
-            <attribute name="office:value-type">
-                <value>currency</value>
-            </attribute>
-            <zeroOrMore>
-                <element name="form:list-value">
-                    <attribute name="office:value">
-                        <ref name="double"/>
-                    </attribute>
-                    <optional>
-                        <attribute name="office:currency">
-                            <ref name="string"/>
-                        </attribute>
-                    </optional>
-                </element>
-            </zeroOrMore>
-        </group>
-        <group>
-            <attribute name="office:value-type">
-                <value>date</value>
-            </attribute>
-            <zeroOrMore>
-                <element name="form:list-value">
-                    <attribute name="office:date-value">
-                        <ref name="dateOrDateTime"/>
-                    </attribute>
-                </element>
-            </zeroOrMore>
-        </group>
-        <group>
-            <attribute name="office:value-type">
-                <value>time</value>
-            </attribute>
-            <zeroOrMore>
-                <element name="form:list-value">
-                    <attribute name="office:time-value">
-                        <ref name="duration"/>
-                    </attribute>
-                </element>
-            </zeroOrMore>
-        </group>
-        <group>
-            <attribute name="office:value-type">
-                <value>boolean</value>
-            </attribute>
-            <zeroOrMore>
-                <element name="form:list-value">
-                    <attribute name="office:boolean-value">
-                        <ref name="boolean"/>
-                    </attribute>
-                </element>
-            </zeroOrMore>
-        </group>
-        <group>
-            <attribute name="office:value-type">
-                <value>string</value>
-            </attribute>
-            <zeroOrMore>
-                <element name="form:list-value">
-                    <attribute name="office:string-value">
-                        <ref name="string"/>
-                    </attribute>
-                </element>
-            </zeroOrMore>
-        </group>
-        <attribute name="office:value-type">
-            <value>void</value>
-        </attribute>
-    </choice>
-</define>
-<define name="office-annotation">
-    <element name="office:annotation">
-        <ref name="office-annotation-attlist"/>
-        <ref name="draw-caption-attlist"/>
-        <ref name="common-draw-position-attlist"/>
-        <ref name="common-draw-size-attlist"/>
-        <ref name="common-draw-shape-with-text-and-styles-attlist"/>
-        <optional>
-            <ref name="dc-creator"/>
-        </optional>
-        <optional>
-            <ref name="dc-date"/>
-        </optional>
-        <optional>
-            <ref name="meta-date-string"/>
-        </optional>
-        <zeroOrMore>
-            <choice>
-                <ref name="text-p"/>
-                <ref name="text-list"/>
-            </choice>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="office-annotation-attlist" combine="interleave">
-    <optional>
-        <attribute name="office:display">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="meta-date-string">
-    <element name="meta:date-string">
-        <ref name="string"/>
-    </element>
-</define>
-<define name="common-num-format-prefix-suffix-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:num-prefix">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:num-suffix">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-num-format-attlist" combine="interleave">
-    <choice>
-        <attribute name="style:num-format">
-            <choice>
-                <value>1</value>
-                <value>i</value>
-                <value>I</value>
-                <ref name="string"/>
-                <empty/>
-            </choice>
-        </attribute>
-        <group>
-            <attribute name="style:num-format">
-                <choice>
-                    <value>a</value>
-                    <value>A</value>
-                </choice>
-            </attribute>
-            <ref name="style-num-letter-sync-attlist"/>
-        </group>
-        <empty/>
-    </choice>
-</define>
-<define name="style-num-letter-sync-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:num-letter-sync">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="office-change-info">
-    <element name="office:change-info">
-        <ref name="dc-creator"/>
-        <ref name="dc-date"/>
-        <zeroOrMore>
-            <ref name="text-p"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="office-event-listeners">
-    <element name="office:event-listeners">
-        <zeroOrMore>
-            <choice>
-                <ref name="script-event-listener"/>
-                <ref name="presentation-event-listener"/>
-            </choice>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="script-event-listener" combine="interleave">
-    <element name="script:event-listener">
-        <ref name="script-event-listener-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="script-event-listener-attlist" combine="interleave">
-    <attribute name="script:event-name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="script-event-listener-attlist" combine="interleave">
-    <attribute name="script:language">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="script-event-listener-attlist" combine="interleave">
-    <choice>
-        <attribute name="script:macro-name">
-            <ref name="string"/>
-        </attribute>
-        <group>
-            <attribute name="xlink:href">
-                <ref name="anyURI"/>
-            </attribute>
-            <optional>
-                <attribute name="xlink:type" a:defaultValue="simple">
-                    <value>simple</value>
-                </attribute>
-            </optional>
-            <optional>
-                <attribute name="xlink:actuate" a:defaultValue="onRequest">
-                    <value>onRequest</value>
-                </attribute>
-            </optional>
-        </group>
-    </choice>
-</define>
-<define name="math-math">
-    <element name="math:math">
-        <ref name="mathMarkup"/>
-    </element>
-</define>
-
-<!-- To avoid inclusion of the complete MathML schema, anything -->
-<!-- is allowed within a math:math top-level element            -->
-<define name="mathMarkup">
-    <zeroOrMore>
-        <choice>
-            <attribute>
-                <anyName/>
-            </attribute>
-            <text/>
-            <element>
-                <anyName/>
-                <ref name="mathMarkup"/>
-            </element>
-        </choice>
-    </zeroOrMore>
-</define>
-<define name="text-dde-connection-decl">
-    <element name="text:dde-connection-decl">
-        <ref name="text-dde-connection-decl-attlist"/>
-        <ref name="common-dde-connection-decl-attlist"/>
-    </element>
-</define>
-<define name="text-dde-connection-decl-attlist" combine="interleave">
-    <attribute name="office:name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="common-dde-connection-decl-attlist" combine="interleave">
-    <attribute name="office:dde-application">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="common-dde-connection-decl-attlist" combine="interleave">
-    <attribute name="office:dde-topic">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="common-dde-connection-decl-attlist" combine="interleave">
-    <attribute name="office:dde-item">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="common-dde-connection-decl-attlist" combine="interleave">
-    <optional>
-        <attribute name="office:automatic-update" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-dde-link">
-    <element name="table:dde-link">
-        <ref name="office-dde-source"/>
-        <ref name="table-table"/>
-    </element>
-</define>
-<define name="office-dde-source">
-    <element name="office:dde-source">
-        <ref name="office-dde-source-attlist"/>
-        <ref name="common-dde-connection-decl-attlist"/>
-    </element>
-</define>
-<define name="office-dde-source-attlist" combine="interleave">
-    <optional>
-        <attribute name="office:name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="office-dde-source-attlist" combine="interleave">
-    <optional>
-        <attribute name="office:conversion-mode" 
-                    a:defaultValue="into-default-style-data-style">
-            <choice>
-                <value>into-default-style-data-style</value>
-                <value>into-english-number</value>
-                <value>keep-text</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="animation-element" combine="choice">
-    <element name="anim:animate">
-        <ref name="common-anim-target-attlist"/>
-        <ref name="common-anim-named-target-attlist"/>
-        <ref name="common-anim-values-attlist"/>
-        <ref name="common-anim-spline-mode-attlist"/>
-        <ref name="common-spline-anim-value-attlist"/>
-        <ref name="common-repeat-timing-attlist"/>
-        <ref name="common-fill-timing-attlist"/>
-        <ref name="common-anim-add-accum-attlist"/>
-    </element>
-</define>
-<define name="animation-element" combine="choice">
-    <element name="anim:set">
-        <ref name="common-anim-target-attlist"/>
-        <ref name="common-anim-named-target-attlist"/>
-        <ref name="common-anim-set-values-attlist"/>
-        <ref name="common-fill-timing-attlist"/>
-        <ref name="common-anim-add-accum-attlist"/>
-    </element>
-</define>
-<define name="animation-element" combine="choice">
-    <element name="anim:animateMotion">
-        <ref name="anim-animate-motion-attlist"/>
-        <ref name="common-anim-target-attlist"/>
-        <ref name="common-anim-named-target-attlist"/>
-        <ref name="common-anim-add-accum-attlist"/>
-        <ref name="common-anim-values-attlist"/>
-        <ref name="common-fill-timing-attlist"/>
-        <ref name="common-spline-anim-value-attlist"/>
-    </element>
-</define>
-<define name="anim-animate-motion-attlist" combine="interleave">
-    <optional>
-        <attribute name="svg:path">
-            <ref name="pathData"/>
-        </attribute>
-    </optional>
-</define>
-<define name="anim-animate-motion-attlist" combine="interleave">
-    <optional>
-        <attribute name="svg:origin">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="anim-animate-motion-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:calcMode" a:defaultValue="paced">   
-            <choice>
-                <value>discrete</value>
-                <value>linear</value>
-                <value>paced</value>
-                <value>spline</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="animation-element" combine="choice">
-    <element name="anim:animateColor">
-        <ref name="common-anim-target-attlist"/>
-        <ref name="common-anim-named-target-attlist"/>
-        <ref name="common-anim-add-accum-attlist"/>
-        <ref name="common-anim-values-attlist"/>
-        <ref name="common-anim-spline-mode-attlist"/>
-        <ref name="common-spline-anim-value-attlist"/>
-        <ref name="anim-animate-color-attlist"/>
-        <ref name="common-fill-timing-attlist"/>
-    </element>
-</define>
-<define name="anim-animate-color-attlist" combine="interleave">
-    <optional>
-        <attribute name="anim:color-interpolation" a:defaultValue="rgb">
-            <choice>
-                <value>rgb</value>
-                <value>hsl</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="anim-animate-color-attlist" combine="interleave">
-    <optional>
-        <attribute name="anim:color-interpolation-direction"     
-                                   a:defaultValue="clockwise">
-            <choice>
-                <value>clockwise</value>
-                <value>counter-clockwise</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="animation-element" combine="choice">
-    <element name="anim:animateTransform">
-        <ref name="common-anim-target-attlist"/>
-        <ref name="common-anim-named-target-attlist"/>
-        <ref name="common-anim-add-accum-attlist"/>
-        <ref name="common-anim-values-attlist"/>
-        <ref name="anim-animate-transform-attlist"/>
-        <ref name="common-fill-timing-attlist"/>
-    </element>
-</define>
-<define name="anim-animate-transform-attlist" combine="interleave">
-    <attribute name="svg:type">
-        <choice>
-            <value>translate</value>
-            <value>scale</value>
-            <value>rotate</value>
-            <value>skewX</value>
-            <value>skewY</value> 
-        </choice>
-    </attribute>
-</define>
-<define name="animation-element" combine="choice">
-    <element name="anim:transitionFilter">
-        <ref name="common-anim-target-attlist"/>
-        <ref name="common-anim-add-accum-attlist"/>
-        <ref name="common-anim-values-attlist"/>
-        <ref name="common-anim-spline-mode-attlist "/>
-        <ref name="anim-transition-filter-attlist"/>
-        <ref name="common-fill-timing-attlist"/>
-    </element>
-</define>
-<define name="anim-transition-filter-attlist" combine="interleave">
-    <attribute name="smil:type">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="anim-transition-filter-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:subtype">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="anim-transition-filter-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:direction" a:defaultValue="forward">
-            <choice>
-                <value>forward</value>
-                <value>reverse</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="anim-transition-filter-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:fadeColor">
-            <choice>
-                <value>forward</value>
-                <value>reverse</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="anim-transition-filter-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:mode" a:defaultValue="in">
-            <choice>
-                <value>in</value>
-                <value>out</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="common-anim-attlist" combine="interleave">
-    <optional>
-        <attribute name="anim:id">
-            <ref name="ID"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-anim-target-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:targetElement">
-            <ref name="IDREF"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-anim-named-target-attlist" combine="interleave">
-    <attribute name="smil:attributeName">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="common-anim-target-attlist" combine="interleave">
-    <optional>
-        <attribute name="anim:sub-item">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-anim-values-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:values">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-anim-spline-mode-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:calcMode" a:defaultValue="discrete">   
-            <choice>
-                <value>discrete</value>
-                <value>linear</value>
-                <value>paced</value>
-                <value>spline</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="common-spline-anim-value-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:keyTimes">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-spline-anim-value-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:keySplines">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-anim-add-accum-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:accumulate">
-            <choice>
-                <value>none</value>
-                <value>sum</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="common-anim-add-accum-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:additive">
-            <choice>
-                <value>replace</value>
-                <value>sum</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="common-anim-values-attlist" combine="interleave">
-    <optional>
-        <attribute name="anim:formula">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-anim-set-values-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:to">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-
-<define name="common-anim-values-attlist" combine="interleave">
-    <ref name="common-anim-set-values-attlist"/>
-    <optional>
-        <attribute name="smil:from">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="smil:by">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-begin-end-timing-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:begin">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-begin-end-timing-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:end">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-dur-timing-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:dur">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-endsync-timing-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:endsync">
-            <choice>
-                <value>first</value>
-                <value>last</value>
-                <value>all</value>
-                <value>media</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="common-repeat-timing-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:repeatDur">
-            <ref name="string"/>
-        </attribute>
-        <attribute name="smil:repeatCount">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-fill-timing-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:fill">
-            <choice>
-                <value>remove</value>
-                <value>freeze</value>
-                <value>hold</value>
-                <value>auto</value>
-                <value>default</value>
-                <value>transition</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="common-fill-default-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:fillDefault">
-            <choice>
-                <value>remove</value>
-                <value>freeze</value>
-                <value>hold</value>
-                <value>transition</value>
-                <value>auto</value>
-                <value>inherit</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="common-restart-timing-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:restart" a:defaultValue="default">
-            <choice>
-                <value>never</value>
-                <value>always</value>
-                <value>whenNotActive</value>
-                <value>default</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="common-restart-default-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:restartDefault" a:defaultValue="inherit">
-            <choice>
-                <value>never</value>
-                <value>always</value>
-                <value>whenNotActive</value>
-                <value>inherit</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="common-time-manip-attlist" combine="interleave">
-    <optional>    
-        <attribute name="smil:accelerate" a:defaultValue="0.0">
-            <ref name="double"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-time-manip-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:decelerate" a:defaultValue="0.0">
-            <ref name="double"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-time-manip-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:autoReverse" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="animation-element" combine="choice">
-    <element name="anim:par">
-        <ref name="common-anim-attlist"/>
-        <ref name="common-timing-attlist"/>
-        <ref name="common-endsync-timing-attlist"/>
-        <zeroOrMore>
-            <ref name="animation-element"/>
-        </zeroOrMore>
-    </element>
-</define>
-
-<define name="common-basic-timing-attlist" combine="interleave">
-   <ref name="common-begin-end-timing-attlist"/>
-   <ref name="common-dur-timing-attlist"/>
-   <ref name="common-repeat-timing-attlist"/>
-</define>
-
-<define name="common-timing-attlist" combine="interleave">
-   <ref name="common-basic-timing-attlist"/>
-   <ref name="common-restart-timing-attlist"/>
-   <ref name="common-restart-default-attlist"/>
-   <ref name="common-fill-timing-attlist"/>
-   <ref name="common-fill-default-attlist"/>
-   <ref name="common-time-manip-attlist"/>
-</define>
-<define name="animation-element" combine="choice">
-    <element name="anim:seq">
-        <ref name="common-anim-attlist"/>
-        <ref name="common-endsync-timing-attlist"/>
-        <ref name="common-timing-attlist"/>
-    </element>
-</define>
-<define name="animation-element" combine="choice">
-    <element name="anim:iterate">
-        <ref name="common-anim-attlist"/>
-        <ref name="anin-iterate-attlist"/>
-        <ref name="common-timing-attlist"/>
-        <ref name="common-endsync-timing-attlist"/>
-        <zeroOrMore>
-            <ref name="animation-element"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="anin-iterate-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:targetElement">
-            <ref name="IDREF"/>
-        </attribute>
-    </optional>
-</define>
-<define name="anin-iterate-attlist" combine="interleave">
-    <optional>
-        <attribute name="anim:iterate-type">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="anin-iterate-attlist" combine="interleave">
-    <optional>
-        <attribute name="anim:iterate-interval">
-            <ref name="duration"/>
-        </attribute>
-    </optional>
-</define>
-<define name="animation-element" combine="choice">
-    <element name="anim:audio">
-        <ref name="common-anim-attlist"/>
-        <ref name="anim-audio-attlist"/>
-        <ref name="common-basic-timing-attlist"/>
-    </element>
-</define>
-<define name="anim-audio-attlist" combine="interleave">
-    <optional>
-        <attribute name="xlink:href">
-            <ref name="anyURI"/>
-        </attribute>
-    </optional>
-</define>
-<define name="anim-audio-attlist" combine="interleave">
-    <optional>
-        <attribute name="anim:audio-level">
-            <ref name="double"/>
-        </attribute>
-    </optional>
-</define>
-<define name="animation-element" combine="choice">
-    <element name="anim:command">
-        <ref name="common-anim-attlist"/>
-        <ref name="anim-command-attlist"/>
-        <ref name="common-begin-end-timing-attlist"/>
-        <ref name="common-anim-target-attlist"/>
-        <zeroOrMore>
-            <element name="anim:param">
-                <attribute name="anim:name"/>
-                <attribute name="anim:value"/>
-            </element>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="anim-command-attlist" combine="interleave">
-    <attribute name="anim:command">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="style-style">
-    <element name="style:style">
-        <ref name="style-style-attlist"/>
-        <ref name="style-style-content"/>
-        <zeroOrMore>
-            <ref name="style-map"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="style-style-attlist" combine="interleave">
-    <attribute name="style:name">
-        <ref name="styleName"/>
-    </attribute>
-</define>
-<define name="style-style-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:display-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-style-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:parent-style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-style-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:next-style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-style-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:list-style-name">
-            <choice>
-                <ref name="styleName"/>
-                <empty/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-style-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:master-page-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-style-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:auto-update" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-style-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:data-style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-style-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:class">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-style-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:default-outline-level">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-map">
-    <element name="style:map">
-        <ref name="style-map-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="style-map-attlist" combine="interleave">
-    <attribute name="style:condition">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="style-map-attlist" combine="interleave">
-    <attribute name="style:apply-style-name">
-        <ref name="styleNameRef"/>
-    </attribute>
-</define>
-<define name="style-map-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:base-cell-address">
-            <ref name="cellAddress"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-default-style">
-    <element name="style:default-style">
-        <ref name="style-style-content"/>
-    </element>
-</define>
-<define name="style-page-layout">
-    <element name="style:page-layout">
-        <ref name="style-page-layout-attlist"/>
-        <optional>
-            <ref name="style-page-layout-properties"/>
-        </optional>
-        <optional>
-            <ref name="style-header-style"/>
-        </optional>
-        <optional>
-            <ref name="style-footer-style"/>
-        </optional>
-    </element>
-</define>
-<define name="style-page-layout-attlist" combine="interleave">
-    <attribute name="style:name">
-        <ref name="styleName"/>
-    </attribute>
-</define>
-<define name="style-page-layout-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:page-usage" a:defaultValue="all">
-            <choice>
-                <value>all</value>
-                <value>left</value>
-                <value>right</value>
-                <value>mirrored</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-header-style">
-    <element name="style:header-style">
-        <optional>
-            <ref name="style-header-footer-properties"/>
-        </optional>
-    </element>
-</define>
-<define name="style-footer-style">
-    <element name="style:footer-style">
-        <optional>
-            <ref name="style-header-footer-properties"/>
-        </optional>
-    </element>
-</define>
-<define name="style-master-page">
-    <element name="style:master-page">
-        <ref name="style-master-page-attlist"/>
-        <optional>
-            <ref name="style-header"/>
-            <optional>
-                <ref name="style-header-left"/>
-            </optional>
-        </optional>
-        <optional>
-            <ref name="style-footer"/>
-            <optional>
-                <ref name="style-footer-left"/>
-            </optional>
-        </optional>
-        <optional>
-            <ref name="office-forms"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="style-style"/>
-        </zeroOrMore>
-        <zeroOrMore>
-            <ref name="shape"/>
-        </zeroOrMore>
-        <optional>
-            <ref name="presentation-notes"/>
-        </optional>
-    </element>
-</define>
-<define name="style-master-page-attlist" combine="interleave">
-    <attribute name="style:name">
-        <ref name="styleName"/>
-    </attribute>
-</define>
-<define name="style-master-page-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:display-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-master-page-attlist" combine="interleave">
-    <attribute name="style:page-layout-name">
-        <ref name="styleNameRef"/>
-    </attribute>
-</define>
-<define name="style-master-page-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-master-page-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:next-style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-header">
-    <element name="style:header">
-        <ref name="common-style-header-footer-attlist"/>
-        <ref name="header-footer-content"/>
-    </element>
-</define>
-<define name="style-footer">
-    <element name="style:footer">
-        <ref name="common-style-header-footer-attlist"/>
-        <ref name="header-footer-content"/>
-    </element>
-</define>
-<define name="style-header-left">
-    <element name="style:header-left">
-        <ref name="common-style-header-footer-attlist"/>
-        <ref name="header-footer-content"/>
-    </element>
-</define>
-<define name="style-footer-left">
-    <element name="style:footer-left">
-        <ref name="common-style-header-footer-attlist"/>
-        <ref name="header-footer-content"/>
-    </element>
-</define>
-<define name="header-footer-content">
-    <choice>
-        <group>
-            <ref name="text-decls"/>
-            <zeroOrMore>
-                <choice>
-                    <ref name="text-h"/>
-                    <ref name="text-p"/>
-                    <ref name="text-list"/>
-                    <ref name="table-table"/>
-                    <ref name="text-section"/>
-                    <ref name="text-table-of-content"/>
-                    <ref name="text-illustration-index"/>
-                    <ref name="text-table-index"/>
-                    <ref name="text-object-index"/>
-                    <ref name="text-user-index"/>
-                    <ref name="text-alphabetical-index"/>
-                    <ref name="text-bibliography"/>
-                    <ref name="text-index-title"/>
-                    <ref name="change-marks"/>
-                </choice>
-            </zeroOrMore>
-        </group>
-        <group>
-            <optional>
-                <ref name="style-region-left"/>
-            </optional>
-            <optional>
-                <ref name="style-region-center"/>
-            </optional>
-            <optional>
-                <ref name="style-region-right"/>
-            </optional>
-        </group>
-    </choice>
-</define>
-<define name="common-style-header-footer-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:display" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-region-left">
-    <element name="style:region-left">
-        <ref name="region-content"/>
-    </element>
-</define>
-<define name="style-region-center">
-    <element name="style:region-center">
-        <ref name="region-content"/>
-    </element>
-</define>
-<define name="style-region-right">
-    <element name="style:region-right">
-        <ref name="region-content"/>
-    </element>
-</define>
-
-<define name="region-content">
-    <zeroOrMore>
-        <ref name="text-p"/>
-    </zeroOrMore>
-</define>
-<define name="presentation-notes">
-    <element name="presentation:notes">
-        <ref name="common-presentation-header-footer-attlist"/>
-        <ref name="presentation-notes-attlist"/>
-        <zeroOrMore>
-            <ref name="shape"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="presentation-notes-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:page-layout-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-notes-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-table-template">
-    <element name="table:table-template">
-        <ref name="table-table-template-attlist"/>
-        <optional>
-            <ref name="table-first-row"/>
-        </optional>
-        <optional>
-            <ref name="table-last-row"/>
-        </optional>
-        <optional>
-            <ref name="table-first-column"/>
-        </optional>
-        <optional>
-            <ref name="table-last-column"/>
-        </optional>
-        <choice>
-            <ref name="table-body"/>
-            <group>
-                <ref name="table-even-rows"/>
-                <ref name="table-odd-rows"/>
-            </group>
-            <group>
-                <ref name="table-even-columns"/>
-                <ref name="table-odd-columns"/>
-            </group>
-        </choice>
-    </element>
-</define>
-<define name="table-table-template-attlist" combine="interleave">
-    <attribute name="text:name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="table-table-template-attlist" combine="interleave">
-    <attribute name="text:first-row-start-column">
-        <ref name="rowOrCol"/>
-    </attribute>
-</define>
-
-<define name="table-table-template-attlist" combine="interleave">
-    <attribute name="text:first-row-end-column">
-        <ref name="rowOrCol"/>
-    </attribute>
-</define>
-
-<define name="table-table-template-attlist" combine="interleave">
-    <attribute name="text:last-row-start-column">
-        <ref name="rowOrCol"/>
-    </attribute>
-</define>
-
-<define name="table-table-template-attlist" combine="interleave">
-    <attribute name="text:last-row-end-column">
-        <ref name="rowOrCol"/>
-    </attribute>
-</define>
-
-<define name="rowOrCol">
-    <choice>
-        <value>row</value>
-        <value>column</value>
-    </choice>
-</define>
-<define name="table-first-row">
-    <element name="table:first-row">
-        <ref name="common-table-template-attlist"/>
-        <empty/>
-    </element>
-</define>
-
-<define name="table-last-row">
-    <element name="table:last-row">
-        <ref name="common-table-template-attlist"/>
-        <empty/>
-    </element>
-</define>
-
-<define name="table-first-column">
-    <element name="table:first-column">
-        <ref name="common-table-template-attlist"/>
-        <empty/>
-    </element>
-</define>
-
-<define name="table-last-column">
-    <element name="table:last-column">
-        <ref name="common-table-template-attlist"/>
-        <empty/>
-    </element>
-</define>
-
-<define name="table-body">
-    <element name="table:body">
-        <ref name="common-table-template-attlist"/>
-        <empty/>
-    </element>
-</define>
-
-<define name="table-even-rows">
-    <element name="table:even-rows">
-        <ref name="common-table-template-attlist"/>
-        <empty/>
-    </element>
-</define>
-
-<define name="table-odd-rows">
-    <element name="table:odd-rows">
-        <ref name="common-table-template-attlist"/>
-        <empty/>
-    </element>
-</define>
-
-<define name="table-even-columns">
-    <element name="table:even-columns">
-        <ref name="common-table-template-attlist"/>
-        <empty/>
-    </element>
-</define>
-
-<define name="table-odd-columns">
-    <element name="table:odd-columns">
-        <ref name="common-table-template-attlist"/>
-        <empty/>
-    </element>
-</define>
-
-<define name="common-table-template-attlist" combine="interleave">
-    <attribute name="text:style-name">
-        <ref name="styleNameRef"/>
-    </attribute>
-</define>
-<define name="style-font-face">
-    <element name="style:font-face">
-        <ref name="style-font-face-attlist"/>
-        <optional>
-            <ref name="svg-font-face-src"/>
-        </optional>
-        <optional>
-            <ref name="svg-definition-src"/>
-        </optional>
-    </element>
-</define>
-<define name="style-font-face-attlist" combine="interleave">
-    <optional>
-        <attribute name="svg:font-family">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:font-style">
-            <ref name="fontStyle"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:font-variant">
-            <ref name="fontVariant"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:font-weight">
-            <ref name="fontWeight"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:font-stretch">
-            <choice>
-                <value>normal</value>
-                <value>ultra-condensed</value>
-                <value>extra-condensed</value>
-                <value>condensed</value>
-                <value>semi-condensed</value>
-                <value>semi-expanded</value>
-                <value>expanded</value>
-                <value>extra-expanded</value>
-                <value>ultra-expanded</value>
-            </choice>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:font-size">
-            <ref name="positiveLength"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:unicode-range"/>
-    </optional>
-    <optional>
-        <attribute name="svg:units-per-em">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:panose-1"/>
-    </optional>
-    <optional>
-        <attribute name="svg:stemv">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:stemh">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:slope">
-            <ref name="integer"/>
-        </attribute>
-        </optional>
-    <optional>
-        <attribute name="svg:cap-height">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:x-height">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:accent-height">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:ascent">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:descent">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:widths"/>
-    </optional>
-    <optional>
-        <attribute name="svg:bbox"/>
-    </optional>
-    <optional>
-        <attribute name="svg:ideographic">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:alphabetic">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:mathematical">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:hanging">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:v-ideographic">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:v-alphabetic">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:v-mathematical">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:v-hanging">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:underline-position">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:underline-thickness">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:strikethrough-position">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:strikethrough-thickness">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:overline-position">
-            <ref name="integer"/>
-        </attribute>
-        </optional>
-    <optional>
-        <attribute name="svg:overline-thickness">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-</define>
-
-<define name="svg-font-face-src">
-    <element name="svg:font-face-src">
-        <oneOrMore>
-            <choice>
-                <ref name="svg-font-face-uri"/>
-                <ref name="svg-font-face-name"/>
-            </choice>
-        </oneOrMore>
-    </element>
-</define>
-
-<define name="svg-font-face-uri">
-    <element name="svg:font-face-uri">
-        <ref name="common-svg-font-face-xlink-attlist"/>
-        <zeroOrMore>
-            <ref name="svg-font-face-format"/>
-        </zeroOrMore>
-    </element>
-</define>
-
-<define name="svg-font-face-format">
-    <element name="svg:font-face-format">
-        <optional>
-            <attribute name="svg:string"/>
-        </optional>
-        <empty/>
-    </element>
-</define>
-<define name="svg-font-face-name">
-    <element name="svg:font-face-name">
-        <optional>
-            <attribute name="name"/>
-        </optional>
-        <empty/>
-    </element>
-</define>
-
-<define name="svg-definition-src">
-    <element name="svg:definition-src">
-        <ref name="common-svg-font-face-xlink-attlist"/>
-    <empty/>
-    </element>
-</define>
-
-<define name="common-svg-font-face-xlink-attlist" combine="interleave">
-    <attribute name="xlink:href">
-        <ref name="anyURI"/>
-    </attribute>
-    <optional>
-        <attribute name="xlink:type" a:defaultValue="simple">
-            <value>simple</value>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="xlink:actuate" a:defaultValue="onRequest">
-            <value>onRequest</value>
-        </attribute>
-    </optional>
-</define>
-<define name="style-font-face-attlist" combine="interleave">
-    <attribute name="style:name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="style-font-face-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:font-adornments">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-font-face-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:font-family-generic">
-            <ref name="fontFamilyGeneric"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-font-face-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:font-pitch">
-            <ref name="fontPitch"/>
-        </attribute>
-    </optional>
-</define>
-
-<define name="style-font-face-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:font-charset">
-            <ref name="textEncoding"/>
-        </attribute>
-    </optional>
-</define>
-<define name="number-number-style">
-    <element name="number:number-style">
-        <ref name="common-data-style-attlist"/>
-        <optional>
-            <ref name="style-text-properties"/>
-        </optional>
-        <optional>
-            <ref name="number-text"/>
-        </optional>
-        <optional>
-            <ref name="any-number"/>
-            <optional>
-                <ref name="number-text"/>
-            </optional>
-        </optional>
-        <zeroOrMore>
-            <ref name="style-map"/>
-        </zeroOrMore>
-    </element>
-</define>
-
-<define name="any-number">
-    <choice>
-        <ref name="number-number"/>
-        <ref name="number-scientific-number"/>
-        <ref name="number-fraction"/>
-    </choice>
-</define>
-<define name="number-number">
-    <element name="number:number">
-        <ref name="number-number-attlist"/>
-        <ref name="common-decimal-places-attlist"/>
-        <ref name="common-number-attlist"/>
-        <zeroOrMore>
-            <ref name="number-embedded-text"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="number-number-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:decimal-replacement"/>
-    </optional>
-</define>
-<define name="number-number-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:display-factor" a:defaultValue="1">
-            <ref name="double"/>
-        </attribute>
-    </optional>
-</define>
-<define name="number-embedded-text">
-    <element name="number:embedded-text">
-        <ref name="number-embedded-text-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="number-embedded-text-attlist" combine="interleave">
-    <attribute name="number:position">
-        <ref name="integer"/>
-    </attribute>
-</define>
-<define name="number-scientific-number">
-    <element name="number:scientific-number">
-        <ref name="number-scientific-number-attlist"/>
-        <ref name="common-decimal-places-attlist"/>
-        <ref name="common-number-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="number-scientific-number-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:min-exponent-digits">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-</define>
-<define name="number-fraction">
-    <element name="number:fraction">
-        <ref name="number-fraction-attlist"/>
-        <ref name="common-number-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="number-fraction-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:min-numerator-digits">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-</define>
-<define name="number-fraction-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:min-denominator-digits">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-</define>
-<define name="number-fraction-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:denominator-value">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-</define>
-<define name="number-currency-style">
-    <element name="number:currency-style">
-        <ref name="common-data-style-attlist"/>
-        <ref name="common-auto-reorder-attlist"/>
-        <optional>
-            <ref name="style-text-properties"/>
-        </optional>
-        <optional>
-            <ref name="number-text"/>
-        </optional>
-        <optional>
-            <choice>
-                <group>
-                    <ref name="number-and-text"/>
-                    <optional>
-                        <ref name="currency-symbol-and-text"/>
-                    </optional>
-                </group>
-                <group>
-                    <ref name="currency-symbol-and-text"/>
-                    <optional>
-                        <ref name="number-and-text"/>
-                    </optional>
-                </group>
-            </choice>
-        </optional>
-        <zeroOrMore>
-            <ref name="style-map"/>
-        </zeroOrMore>
-    </element>
-</define>
-
-<define name="currency-symbol-and-text">
-    <ref name="number-currency-symbol"/>
-    <optional>
-        <ref name="number-text"/>
-    </optional>
-</define>
-<define name="number-and-text">
-    <ref name="number-number"/>
-    <optional>
-        <ref name="number-text"/>
-    </optional>
-</define>
-<define name="number-currency-symbol">
-    <element name="number:currency-symbol">
-        <ref name="number-currency-symbol-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="number-currency-symbol-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:language">
-            <ref name="languageCode"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="number:country">
-            <ref name="countryCode"/>
-        </attribute>
-    </optional>
-</define>
-<define name="number-percentage-style">
-    <element name="number:percentage-style">
-        <ref name="common-data-style-attlist"/>
-        <optional>
-            <ref name="style-text-properties"/>
-        </optional>
-        <optional>
-            <ref name="number-text"/>
-        </optional>
-        <optional>
-            <ref name="number-and-text"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="style-map"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="number-date-style">
-    <element name="number:date-style">
-        <ref name="common-data-style-attlist"/>
-        <ref name="common-auto-reorder-attlist"/>
-        <ref name="common-format-source-attlist"/>
-        <optional>
-            <ref name="style-text-properties"/>
-        </optional>
-        <!-- This DTD does not reflect the fact that some elements must not -->
-        <!-- occur more than once. -->
-        <optional>
-            <ref name="number-text"/>
-        </optional>
-        <oneOrMore>
-            <ref name="any-date"/>
-            <optional>
-                <ref name="number-text"/>
-            </optional>
-        </oneOrMore>
-        <zeroOrMore>
-            <ref name="style-map"/>
-        </zeroOrMore>
-    </element>
-</define>
-
-<define name="any-date">
-    <choice>
-        <ref name="number-day"/>
-        <ref name="number-month"/>
-        <ref name="number-year"/>
-        <ref name="number-era"/>
-        <ref name="number-day-of-week"/>
-        <ref name="number-week-of-year"/>
-        <ref name="number-quarter"/>
-        <ref name="number-hours"/>
-        <ref name="number-am-pm"/>
-        <ref name="number-minutes"/>
-        <ref name="number-seconds"/>
-    </choice>
-</define>
-<define name="number-day">
-    <element name="number:day">
-        <ref name="number-day-attlist"/>
-        <ref name="common-calendar-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="number-day-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:style" a:defaultValue="short">
-            <choice>
-                <value>short</value>
-                <value>long</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="number-month">
-    <element name="number:month">
-        <ref name="number-month-attlist"/>
-        <ref name="common-calendar-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="number-month-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:textual" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="number-month-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:possessive-form" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="number-month-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:style" a:defaultValue="short">
-            <choice>
-                <value>short</value>
-                <value>long</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="number-year">
-    <element name="number:year">
-        <ref name="number-year-attlist"/>
-        <ref name="common-calendar-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="number-year-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:style" a:defaultValue="short">
-            <choice>
-                <value>short</value>
-                <value>long</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="number-era">
-    <element name="number:era">
-        <ref name="number-era-attlist"/>
-        <ref name="common-calendar-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="number-era-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:style" a:defaultValue="short">
-            <choice>
-                <value>short</value>
-                <value>long</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="number-day-of-week">
-    <element name="number:day-of-week">
-        <ref name="number-day-of-week-attlist"/>
-        <ref name="common-calendar-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="number-day-of-week-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:style" a:defaultValue="short">
-            <choice>
-                <value>short</value>
-                <value>long</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="number-week-of-year">
-    <element name="number:week-of-year">
-        <ref name="common-calendar-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="number-quarter">
-    <element name="number:quarter">
-        <ref name="number-quarter-attlist"/>
-        <ref name="common-calendar-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="number-quarter-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:style" a:defaultValue="short">
-            <choice>
-                <value>short</value>
-                <value>long</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="number-time-style">
-    <element name="number:time-style">
-        <ref name="number-time-style-attlist"/>
-        <ref name="common-data-style-attlist"/>
-        <ref name="common-format-source-attlist"/>
-        <optional>
-            <ref name="style-text-properties"/>
-        </optional>
-        <!-- This DTD does not reflect the fact that some elements must not -->
-        <!-- occur more than once. -->
-        <optional>
-            <ref name="number-text"/>
-        </optional>
-        <oneOrMore>
-            <ref name="any-time"/>
-            <optional>
-                <ref name="number-text"/>
-            </optional>
-        </oneOrMore>
-        <zeroOrMore>
-            <ref name="style-map"/>
-        </zeroOrMore>
-    </element>
-</define>
-
-<define name="any-time">
-    <choice>
-        <ref name="number-hours"/>
-        <ref name="number-am-pm"/>
-        <ref name="number-minutes"/>
-        <ref name="number-seconds"/>
-    </choice>
-</define>
-<define name="number-time-style-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:truncate-on-overflow" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="number-hours">
-    <element name="number:hours">
-        <ref name="number-hours-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="number-hours-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:style" a:defaultValue="short">
-            <choice>
-                <value>short</value>
-                <value>long</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="number-minutes">
-    <element name="number:minutes">
-        <ref name="number-minutes-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="number-minutes-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:style" a:defaultValue="short">
-            <choice>
-                <value>short</value>
-                <value>long</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="number-seconds">
-    <element name="number:seconds">
-        <ref name="number-seconds-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="number-seconds-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:style" a:defaultValue="short">
-            <choice>
-                <value>short</value>
-                <value>long</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="number-seconds-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:decimal-places" a:defaultValue="0">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-</define>
-<define name="number-am-pm">
-    <element name="number:am-pm">
-        <empty/>
-    </element>
-</define>
-<define name="number-boolean-style">
-    <element name="number:boolean-style">
-        <ref name="common-data-style-attlist"/>
-        <optional>
-            <ref name="style-text-properties"/>
-        </optional>
-        <optional>
-            <ref name="number-text"/>
-        </optional>
-        <optional>
-            <ref name="number-boolean"/>
-            <optional>
-                <ref name="number-text"/>
-            </optional>
-        </optional>
-        <zeroOrMore>
-            <ref name="style-map"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="number-boolean">
-    <element name="number:boolean">
-        <empty/>
-    </element>
-</define>
-<define name="number-text-style">
-    <element name="number:text-style">
-        <ref name="common-data-style-attlist"/>
-        <optional>
-            <ref name="style-text-properties"/>
-        </optional>
-        <optional>
-            <ref name="number-text"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="number-text-content"/>
-            <optional>
-                <ref name="number-text"/>
-            </optional>
-        </zeroOrMore>
-        <zeroOrMore>
-            <ref name="style-map"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="number-text">
-    <element name="number:text">
-        <text/>
-    </element>
-</define>
-<define name="number-text-content">
-    <element name="number:text-content">
-        <empty/>
-    </element>
-</define>
-<define name="common-data-style-attlist" combine="interleave">
-    <attribute name="style:name">
-        <ref name="styleName"/>
-    </attribute>
-</define>
-<define name="style-data-style-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:display-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-data-style-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:language">
-            <ref name="languageCode"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-data-style-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:country">
-            <ref name="countryCode"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-data-style-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:title"/>
-    </optional>
-</define>
-<define name="common-data-style-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:volatile">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-auto-reorder-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:automatic-order" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-format-source-attlist">
-    <optional>
-        <attribute name="number:format-source" a:defaultValue="fixed">
-            <choice>
-                <value>fixed</value>
-                <value>language</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="common-data-style-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:transliteration-format" a:defaultValue="1">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-data-style-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:transliteration-language">
-            <ref name="countryCode"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-data-style-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:transliteration-country">
-            <ref name="countryCode"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-data-style-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:transliteration-style" a:defaultValue="short">
-            <choice>
-                <value>short</value>
-                <value>medium</value>
-                <value>long</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="common-decimal-places-attlist">
-    <optional>
-        <attribute name="number:decimal-places">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-number-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:min-integer-digits">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-number-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:grouping" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-calendar-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:calendar">
-            <choice>
-                <value>gregorian</value>
-                <value>gengou</value>
-                <value>ROC</value>
-                <value>hanja_yoil</value>
-                <value>hanja</value>
-                <value>hijri</value>
-                <value>jewish</value>
-                <value>buddhist</value>
-                <ref name="string"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-style-content" combine="choice">
-    <group>
-        <attribute name="style:family">
-            <value>text</value>
-        </attribute>
-        <optional>
-            <ref name="style-text-properties"/>
-        </optional>
-    </group>
-</define>
-<define name="style-style-content" combine="choice">
-    <group>
-        <attribute name="style:family">
-            <value>paragraph</value>
-        </attribute>
-        <optional>
-            <ref name="style-paragraph-properties"/>
-        </optional>
-        <optional>
-            <ref name="style-text-properties"/>
-        </optional>
-    </group>
-</define>
-<define name="style-style-content" combine="choice">
-    <group>
-        <attribute name="style:family">
-            <value>section</value>
-        </attribute>
-        <optional>
-            <ref name="style-section-properties"/>
-        </optional>
-    </group>
-</define>
-<define name="style-style-content" combine="choice">
-    <group>
-        <attribute name="style:family">
-            <value>ruby</value>
-        </attribute>
-        <optional>
-            <ref name="style-ruby-properties"/>
-        </optional>
-    </group>
-</define>
-<define name="text-linenumbering-configuration">
-    <element name="text:linenumbering-configuration">
-        <ref name="text-linenumbering-configuration-attlist"/>
-        <optional>
-            <ref name="text-linenumbering-separator"/>
-        </optional>
-    </element>
-</define>
-<define name="text-linenumbering-configuration-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:number-lines" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-linenumbering-configuration-attlist" combine="interleave">
-    <optional>
-        <ref name="common-num-format-attlist"/>
-    </optional>
-</define>
-<define name="text-linenumbering-configuration-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-linenumbering-configuration-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:increment">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-linenumbering-configuration-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:number-position" a:defaultValue="left">
-            <choice>
-                <value>left</value>
-                <value>rigth</value>
-                <value>inner</value>
-                <value>outer</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="text-linenumbering-configuration-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:offset">
-            <ref name="nonNegativeLength"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-linenumbering-configuration-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:count-empty-lines" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-linenumbering-configuration-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:count-in-text-boxes" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-linenumbering-configuration-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:restart-on-page" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-linenumbering-separator">
-    <element name="text:linenumbering-separator">
-        <optional>
-            <attribute name="text:increment">
-                <ref name="nonNegativeInteger"/>
-            </attribute>
-        </optional>
-        <text/>
-    </element>
-</define>
-<define name="text-notes-configuration">
-    <element name="text:notes-configuration">
-        <ref name="text-notes-configuration-content"/>
-    </element>
-</define>
-<define name="text-notes-configuration-content" combine="interleave">
-    <ref name="text-note-class"/>
-</define>
-<define name="text-notes-configuration-content" combine="interleave">
-    <optional>
-        <attribute name="text:citation-style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-notes-configuration-content" combine="interleave">
-    <optional>
-        <attribute name="text:citation-body-style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-notes-configuration-content" combine="interleave">
-    <optional>
-        <attribute name="text:default-style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-notes-configuration-content" combine="interleave">
-    <optional>
-        <attribute name="text:master-page-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-notes-configuration-content" combine="interleave">
-    <optional>
-        <attribute name="text:start-value">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-notes-configuration-content" combine="interleave">
-    <ref name="common-num-format-prefix-suffix-attlist"/>
-    <optional>
-        <ref name="common-num-format-attlist"/>
-    </optional>
-</define>
-<define name="text-notes-configuration-content" combine="interleave">
-    <optional>
-        <attribute name="text:start-numbering-at">
-            <choice>
-                <value>document</value>
-                <value>chapter</value>
-                <value>page</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="text-notes-configuration-content" combine="interleave">
-    <optional>
-        <attribute name="text:footnotes-position">
-            <choice>
-                <value>text</value>
-                <value>page</value>
-                <value>section</value>
-                <value>document</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="text-notes-configuration-content" combine="interleave">
-    <optional>
-        <element name="text:note-continuation-notice-forward">
-            <text/>
-        </element>
-    </optional>
-</define>
-<define name="text-notes-configuration-content" combine="interleave">
-    <optional>
-        <element name="text:note-continuation-notice-backward">
-            <text/>
-        </element>
-    </optional>
-</define>
-<define name="text-bibliography-configuration">
-    <element name="text:bibliography-configuration">
-        <ref name="text-bibliography-configuration-attlist"/>
-        <zeroOrMore>
-            <ref name="text-sort-key"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="text-bibliography-configuration-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:prefix">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="text:suffix">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-bibliography-configuration-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:numbered-entries" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-bibliography-configuration-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:sort-by-position" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="fo:language">
-            <ref name="languageCode"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="fo:country">
-            <ref name="countryCode"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="text:sort-algorithm">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-sort-key">
-    <element name="text:sort-key">
-        <ref name="text-sort-key-attlist"/>
-        <empty/>
-    </element>
-</define>
-
-<define name="text-sort-key-attlist" combine="interleave">
-    <attribute name="text:key">
-        <choice>
-            <value>address</value>
-            <value>annote</value>
-            <value>author</value>
-            <value>bibliography-type</value>
-            <value>booktitle</value>
-            <value>chapter</value>
-            <value>custom1</value>
-            <value>custom2</value>
-            <value>custom3</value>
-            <value>custom4</value>
-            <value>custom5</value>
-            <value>edition</value>
-            <value>editor</value>
-            <value>howpublished</value>
-            <value>identifier</value>
-            <value>institution</value>
-            <value>isbn</value>
-            <value>issn</value>
-            <value>journal</value>
-            <value>month</value>
-            <value>note</value>
-            <value>number</value>
-            <value>organizations</value>
-            <value>pages</value>
-            <value>publisher</value>
-            <value>report-type</value>
-            <value>school</value>
-            <value>series</value>
-            <value>title</value>
-            <value>url</value>
-            <value>volume</value>
-            <value>year</value>
-        </choice>
-    </attribute>
-    <optional>
-        <attribute name="text:sort-ascending" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-list-style">
-    <element name="text:list-style">
-        <ref name="text-list-style-attr"/>
-        <zeroOrMore>
-            <ref name="text-list-style-content"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="text-list-style-attr" combine="interleave">
-    <attribute name="style:name">
-        <ref name="styleName"/>
-    </attribute>
-</define>
-<define name="text-list-style-attr" combine="interleave">
-    <optional>
-        <attribute name="style:display-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-list-style-attr" combine="interleave">
-    <optional>
-        <attribute name="text:consecutive-numbering" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-list-level-style-attr">
-    <attribute name="text:level">
-        <ref name="positiveInteger"/>
-    </attribute>
-</define>
-<define name="text-list-style-content" combine="choice">
-    <element name="text:list-level-style-number">
-        <ref name="text-list-level-style-attr"/>
-        <ref name="text-list-level-style-number-attr"/>
-        <optional>
-            <ref name="style-list-level-properties"/>
-        </optional>
-        <optional>
-            <ref name="style-text-properties"/>
-        </optional>
-    </element>
-</define>
-<define name="text-list-level-style-number-attr" combine="interleave">
-    <optional>
-        <attribute name="text:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-list-level-style-number-attr" combine="interleave">
-    <ref name="common-num-format-attlist"/>
-    <ref name="common-num-format-prefix-suffix-attlist"/>
-</define>
-<define name="text-list-level-style-number-attr" combine="interleave">
-    <optional>
-        <attribute name="text:display-levels" a:defaultValue="1">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-list-level-style-number-attr" combine="interleave">
-    <optional>
-        <attribute name="text:start-value" a:defaultValue="1">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-list-style-content" combine="choice">
-    <element name="text:list-level-style-bullet">
-        <ref name="text-list-level-style-attr"/>
-        <ref name="text-list-level-style-bullet-attr"/>
-        <optional>
-            <ref name="style-list-level-properties"/>
-        </optional>
-        <optional>
-            <ref name="style-text-properties"/>
-        </optional>
-    </element>
-</define>
-<define name="text-list-level-style-bullet-attr" combine="interleave">
-    <optional>
-        <attribute name="text:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-list-level-style-bullet-attr" combine="interleave">
-    <attribute name="text:bullet-char">
-        <ref name="character"/>
-    </attribute>
-</define>
-<define name="text-list-level-style-bullet-attr" combine="interleave">
-    <ref name="common-num-format-prefix-suffix-attlist"/>
-</define>
-<define name="text-list-level-style-bullet-attr" combine="interleave">
-    <optional>
-        <attribute name="text:bullet-relative-size">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-list-style-content" combine="choice">
-    <element name="text:list-level-style-image">
-        <ref name="text-list-level-style-attr"/>
-        <ref name="text-list-level-style-image-attr"/>
-        <optional>
-            <ref name="style-list-level-properties"/>
-        </optional>
-    </element>
-</define>
-<define name="text-list-level-style-image-attr" combine="interleave">
-    <choice>
-        <ref name="common-draw-data-attlist"/>
-        <ref name="office-binary-data"/>
-    </choice>
-</define>
-<define name="text-outline-style">
-    <element name="text:outline-style">
-        <oneOrMore>
-            <ref name="text-outline-level-style"/>
-        </oneOrMore>
-    </element>
-</define>
-<define name="text-outline-level-style">
-    <element name="text:outline-level-style">
-        <ref name="text-outline-level-style-attlist"/>
-        <optional>
-            <ref name="style-list-level-properties"/>
-        </optional>
-        <optional>
-            <ref name="style-text-properties"/>
-        </optional>
-    </element>
-</define>
-<define name="text-outline-level-style-attlist" combine="interleave">
-    <attribute name="text:level">
-        <ref name="positiveInteger"/>
-    </attribute>
-</define>
-<define name="text-outline-level-style-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-outline-level-style-attlist" combine="interleave">
-    <ref name="common-num-format-attlist"/>
-    <ref name="common-num-format-prefix-suffix-attlist"/>
-</define>
-<define name="text-outline-level-style-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:display-levels" a:defaultValue="1">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-outline-level-style-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:start-value" a:defaultValue="1">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-style-content" combine="choice">
-    <group>
-        <attribute name="style:family">
-            <value>table</value>
-        </attribute>
-        <optional>
-            <ref name="style-table-properties"/>
-        </optional>
-    </group>
-</define>
-<define name="style-style-content" combine="choice">
-    <group>
-        <attribute name="style:family">
-            <value>table-column</value>
-        </attribute>
-        <optional>
-            <ref name="style-table-column-properties"/>
-        </optional>
-    </group>
-</define>
-<define name="style-style-content" combine="choice">
-    <group>
-        <attribute name="style:family">
-            <value>table-row</value>
-        </attribute>
-        <optional>
-            <ref name="style-table-row-properties"/>
-        </optional>
-    </group>
-</define>
-<define name="style-style-content" combine="choice">
-    <group>
-        <attribute name="style:family">
-            <value>table-cell</value>
-        </attribute>
-        <optional>
-            <ref name="style-table-cell-properties"/>
-        </optional>
-        <optional>
-            <ref name="style-paragraph-properties"/>
-        </optional>
-        <optional>
-            <ref name="style-text-properties"/>
-        </optional>
-    </group>
-</define>
-<define name="style-style-content" combine="choice">
-    <group>
-        <attribute name="style:family">
-            <choice>
-                <value>graphic</value>
-                <value>presentation</value>
-            </choice>
-        </attribute>
-        <optional>
-            <ref name="style-graphic-properties"/>
-        </optional>
-        <optional>
-            <ref name="style-paragraph-properties"/>
-        </optional>
-        <optional>
-            <ref name="style-text-properties"/>
-        </optional>
-    </group>
-</define>
-
-<define name="style-graphic-properties">
-    <element name="style:graphic-properties">
-        <ref name="style-graphic-properties-content"/>
-    </element>
-</define>
-
-<define name="style-graphic-properties-content">
-    <ref name="style-properties-content"/>
-</define>
-
-<define name="style-graphic-properties-content-strict">
-    <ref name="style-graphic-properties-attlist"/>
-    <ref name="style-graphic-fill-properties-attlist"/>
-    <ref name="style-graphic-properties-elements"/>
-</define>
-
-<define name=" style-graphic-properties-elements">
-    <empty/>
-</define>
-<define name="style-style-content" combine="choice">
-    <group>
-        <attribute name="style:family">
-            <value>drawing-page</value>
-        </attribute>
-        <optional>
-            <ref name="style-drawing-page-properties"/>
-        </optional>
-    </group>
-</define>
-
-<define name="style-drawing-page-properties">
-    <element name="style:drawing-page-properties">
-        <ref name="style-drawing-page-properties-content"/>
-    </element>
-</define>
-
-<define name="style-drawing-page-properties-content">
-    <ref name="style-properties-content"/>
-</define>
-
-<define name="style-drawing-page-properties-content-strict">
-    <ref name="style-graphic-fill-properties-attlist"/>
-    <ref name="style-drawing-page-properties-attlist"/>
-    <ref name="style-drawing-page-properties-elements"/>
-</define>
-<define name="draw-gradient">
-    <element name="draw:gradient">
-        <ref name="common-draw-gradient-attlist"/>
-        <ref name="draw-gradient-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="common-draw-gradient-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:name">
-            <ref name="styleName"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-draw-gradient-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:display-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-draw-gradient-attlist" combine="interleave">
-    <attribute name="draw:style">
-        <ref name="gradient-style"/>
-    </attribute>
-</define>
-<define name="gradient-style">
-    <choice>
-        <value>linear</value>
-        <value>axial</value>
-        <value>radial</value>
-        <value>ellipsoid</value>
-        <value>square</value>
-        <value>rectangular</value>
-    </choice>
-</define>
-<define name="common-draw-gradient-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:cx">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="draw:cy">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-gradient-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:start-color">
-            <ref name="color"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="draw:end-color">
-            <ref name="color"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-gradient-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:start-intensity">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="draw:end-intensity">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-draw-gradient-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:angle">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-draw-gradient-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:border">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="svg-linearGradient">
-    <element name="svg:linearGradient">
-        <ref name="common-svg-gradient-attlist"/>
-        <optional>
-            <attribute name="svg:x1" a:defaultValue="0%">
-                <choice>
-                    <ref name="coordinate"/>
-                    <ref name="percent"/>
-                </choice>                
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="svg:y1" a:defaultValue="0%">
-                <choice>
-                    <ref name="coordinate"/>
-                    <ref name="percent"/>
-                </choice>                
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="svg:x2" a:defaultValue="100%">
-                <choice>
-                    <ref name="coordinate"/>
-                    <ref name="percent"/>
-                </choice>                
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="svg:y2" a:defaultValue="100%">
-                <choice>
-                    <ref name="coordinate"/>
-                    <ref name="percent"/>
-                </choice>                
-            </attribute>
-        </optional>
-        <zeroOrMore>
-            <ref name="svg-stop"/>
-        </zeroOrMore>
-    </element>
-</define>
-
-<define name="svg-radialGradient">
-    <element name="svg:radialGradient">
-        <ref name="common-svg-gradient-attlist"/>
-        <optional>
-            <attribute name="svg:cx" a:defaultValue="50%">
-                <choice>
-                    <ref name="coordinate"/>
-                    <ref name="percent"/>
-                </choice>                
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="svg:cy" a:defaultValue="50%">
-                <choice>
-                    <ref name="coordinate"/>
-                    <ref name="percent"/>
-                </choice>                
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="svg:r" a:defaultValue="50%">
-                <choice>
-                    <ref name="coordinate"/>
-                    <ref name="percent"/>
-                </choice>                
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="svg:fx">
-                <choice>
-                    <ref name="coordinate"/>
-                    <ref name="percent"/>
-                </choice>                
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="svg:fy">
-                <choice>
-                    <ref name="coordinate"/>
-                    <ref name="percent"/>
-                </choice>                
-            </attribute>
-        </optional>
-        <zeroOrMore>
-            <ref name="svg-stop"/>
-        </zeroOrMore>
-    </element>
-</define>
-
-<define name="svg-stop">
-    <element name="svg:stop">
-        <attribute name="svg:offset">
-            <choice>
-                <ref name="double"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-        <optional>
-            <attribute name="svg:stop-color">
-                <ref name="color"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="svg:stop-opacity">
-                <ref name="double"/>
-            </attribute>
-        </optional>
-    </element>
-</define>
-
-<define name="common-svg-gradient-attlist" combine="interleave">
-    <optional>
-        <attribute name="svg:gradientUnits" a:defaultValue="objectBoundingBox">
-            <value>objectBoundingBox</value>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:gradientTransform">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:spreadMethod" a:defaultValue="pad">
-            <choice>
-                <value>pad</value>
-                <value>reflect</value>
-                <value>repeat</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="common-svg-gradient-attlist" combine="interleave">
-    <attribute name="draw:name">
-        <ref name="styleName"/>
-    </attribute>
-</define>
-<define name="common-svg-gradient-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:display-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-hatch">
-    <element name="draw:hatch">
-        <ref name="draw-hatch-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="draw-hatch-attlist" combine="interleave">
-    <attribute name="draw:name">
-        <ref name="styleName"/>
-    </attribute>
-</define>
-<define name="draw-hatch-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:display-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-hatch-attlist" combine="interleave">
-    <attribute name="draw:style">
-        <choice>
-            <value>single</value>
-            <value>double</value>
-            <value>triple</value>
-        </choice>
-    </attribute>
-</define>
-<define name="draw-hatch-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:color">
-            <ref name="color"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-hatch-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:distance">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-hatch-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:rotation">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-fill-image">
-    <element name="draw:fill-image">
-        <ref name="draw-fill-image-attlist"/>
-        <attribute name="xlink:href">
-            <ref name="anyURI"/>
-        </attribute>
-        <optional>
-            <attribute name="xlink:type" a:defaultValue="simple">
-                <choice>
-                    <value>simple</value>
-                </choice>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="xlink:show" a:defaultValue="embed">
-                <choice>
-                    <value>embed</value>
-                </choice>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="xlink:actuate" a:defaultValue="onLoad">
-                <choice>
-                    <value>onLoad</value>
-                </choice>
-            </attribute>
-        </optional>
-        <empty/>
-    </element>
-</define>
-<define name="draw-fill-image-attlist" combine="interleave">
-    <attribute name="draw:name">
-        <ref name="styleName"/>
-    </attribute>
-</define>
-<define name="draw-fill-image-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:display-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-fill-image-attlist" combine="interleave">
-    <optional>
-        <attribute name="svg:width">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:height">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-opacity">
-    <element name="draw:opacity">
-        <ref name="common-draw-gradient-attlist"/>
-        <ref name="draw-opacity-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="draw-opacity-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:start">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="draw:end">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-marker">
-    <element name="draw:marker">
-        <ref name="draw-marker-attlist"/>
-        <ref name="common-draw-viewbox-attlist"/>
-        <ref name="common-draw-path-data-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="draw-marker-attlist" combine="interleave">
-    <attribute name="draw:name">
-        <ref name="styleName"/>
-    </attribute>
-</define>
-<define name="draw-marker-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:display-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-stroke-dash">
-    <element name="draw:stroke-dash">
-        <ref name="draw-stroke-dash-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="draw-stroke-dash-attlist" combine="interleave">
-    <attribute name="draw:name">
-        <ref name="styleName"/>
-    </attribute>
-</define>
-<define name="draw-stroke-dash-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:display-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-stroke-dash-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:style">
-            <choice>
-                <value>rect</value>
-                <value>round</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-stroke-dash-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:dots1">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="draw:dots1-length">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="draw:dots2">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="draw:dots2-length">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-stroke-dash-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:distance">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-presentation-page-layout">
-    <element name="style:presentation-page-layout">
-        <attribute name="style:name">
-            <ref name="styleName"/>
-        </attribute>
-        <optional>
-            <attribute name="style:display-name">
-                <ref name="string"/>
-            </attribute>
-        </optional>
-        <zeroOrMore>
-            <ref name="presentation-placeholder"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="presentation-placeholder">
-    <element name="presentation:placeholder">
-        <attribute name="presentation:object">
-            <ref name="presentation-classes"/>
-        </attribute>
-        <attribute name="svg:x">
-            <choice>
-                <ref name="coordinate"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-        <attribute name="svg:y">
-            <choice>
-                <ref name="coordinate"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-        <attribute name="svg:width">
-            <choice>
-                <ref name="length"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-        <attribute name="svg:height">
-            <choice>
-                <ref name="length"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-        <empty/>
-    </element>
-</define>
-<define name="style-style-content" combine="choice">
-    <group>
-        <attribute name="style:family">
-            <value>chart</value>
-        </attribute>
-        <optional>
-            <ref name="style-chart-properties"/>
-        </optional>
-        <optional>
-            <ref name="style-graphic-properties"/>
-        </optional>
-        <optional>
-            <ref name="style-paragraph-properties"/>
-        </optional>
-        <optional>
-            <ref name="style-text-properties"/>
-        </optional>
-    </group>
-</define>
-<define name="style-properties-content">
-    <ref name="anyAttListOrElements"/>
-</define>
-<define name="style-page-layout-properties">
-    <element name="style:page-layout-properties">
-        <ref name="style-page-layout-properties-content"/>
-    </element>
-</define>
-
-<define name="style-page-layout-properties-content">
-    <ref name="style-properties-content"/>
-</define>
-
-<define name="style-page-layout-properties-content-strict">
-    <ref name="style-page-layout-properties-attlist"/>
-    <ref name="style-page-layout-properties-elements"/>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:page-width">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="fo:page-height">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <optional>
-        <ref name="common-num-format-attlist"/>
-    </optional>
-    <ref name="common-num-format-prefix-suffix-attlist"/>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:paper-tray-name">
-            <choice>
-                <value>default</value>
-                <ref name="string"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:print-orientation">
-            <choice>
-                <value>portrait</value>
-                <value>landscape</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <ref name="common-horizontal-margin-attlist"/>
-    <ref name="common-vertical-margin-attlist"/>
-    <ref name="common-margin-attlist"/>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <ref name="common-border-attlist"/>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <ref name="common-border-line-width-attlist"/>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <ref name="common-padding-attlist"/>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <ref name="common-shadow-attlist"/>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <ref name="common-background-color-attlist"/>
-</define>
-<define name="style-page-layout-properties-elements" combine="interleave">
-    <ref name="style-background-image"/>
-</define>
-<define name="style-page-layout-properties-elements" combine="interleave">
-    <ref name="style-columns"/>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:register-truth-ref-style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:print">
-            <list>
-                <zeroOrMore>
-                    <choice>
-                        <value>headers</value>
-                        <value>grid</value>
-                        <value>annotations</value>
-                        <value>objects</value>
-                        <value>charts</value>
-                        <value>drawings</value>
-                        <value>formulas</value>
-                        <value>zero-values</value>
-                    </choice>
-                </zeroOrMore>
-            </list>
-        </attribute>
-    </optional>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:print-page-order">
-            <choice>
-                <value>ttb</value>
-                <value>ltr</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:first-page-number">
-            <choice>
-                <ref name="positiveInteger"/>
-                <value>continue</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:scale-to">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:scale-to-pages">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:table-centering">
-            <choice>
-                <value>horizontal</value>
-                <value>vertical</value>
-                <value>both</value>
-                <value>none</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:footnote-max-height">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <ref name="common-writing-mode-attlist"/>
-</define>
-<define name="style-page-layout-properties-elements" combine="interleave">
-    <ref name="style-footnote-sep"/>
-</define>
-
-<define name="style-footnote-sep">
-    <optional>
-        <element name="style:footnote-sep">
-            <ref name="style-footnote-sep-attlist"/>
-            <empty/>
-        </element>
-    </optional>
-</define>
-<define name="style-footnote-sep-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:width">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:rel-width">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:color">
-            <ref name="color"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:line-style">
-            <ref name="lineStyle"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:adjustment" a:defaultValue="left">
-            <choice>
-                <value>left</value>
-                <value>center</value>
-                <value>right</value>
-            </choice>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:distance-before-sep">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:distance-after-sep">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:layout-grid-mode">
-            <choice>
-                <value>none</value>
-                <value>line</value>
-                <value>both</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:layout-grid-base-height">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:layout-grid-ruby-height">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:layout-grid-lines">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:layout-grid-color">
-            <ref name="color"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:layout-grid-ruby-below">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:layout-grid-print">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:layout-grid-display">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-header-footer-properties">
-    <element name="style:header-footer-properties">
-        <ref name="style-header-footer-properties-content"/>
-    </element>
-</define>
-
-<define name="style-header-footer-properties-content">
-    <ref name="style-properties-content"/>
-</define>
-
-<define name="style-header-footer-properties-content-strict">
-        <ref name="style-header-footer-properties-attlist"/>
-        <ref name="style-header-footer-properties-elements"/>
-</define>
-<define name="style-header-footer-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="svg:height">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="fo:min-height">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-header-footer-properties-attlist" combine="interleave">
-    <ref name="common-horizontal-margin-attlist"/>
-    <ref name="common-vertical-margin-attlist"/>
-    <ref name="common-margin-attlist"/>
-</define>
-<define name="style-header-footer-properties-attlist" combine="interleave">
-    <ref name="common-border-attlist"/>
-</define>
-<define name="style-header-footer-properties-attlist" combine="interleave">
-    <ref name="common-border-line-width-attlist"/>
-</define>
-<define name="style-header-footer-properties-attlist" combine="interleave">
-    <ref name="common-padding-attlist"/>
-</define>
-<define name="style-header-footer-properties-attlist" combine="interleave">
-    <ref name="common-background-color-attlist"/>
-</define>
-<define name="style-header-footer-properties-elements" combine="interleave">
-    <ref name="style-background-image"/>
-</define>
-<define name="style-header-footer-properties-attlist" combine="interleave">
-    <ref name="common-shadow-attlist"/>
-</define>
-<define name="style-header-footer-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:dynamic-spacing">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties">
-    <element name="style:text-properties">
-        <ref name="style-text-properties-content"/>
-    </element>
-</define>
-
-<define name="style-text-properties-content">
-    <ref name="style-properties-content"/>
-</define>
-
-<define name="style-text-properties-content-strict">
-    <ref name="style-text-properties-attlist"/>
-    <ref name="style-text-properties-elements"/>
-</define>
-
-<define name="style-text-properties-elements">
-    <empty/>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:font-variant">
-            <ref name="fontVariant"/>
-        </attribute>
-    </optional>
-</define>
-
-<define name="fontVariant">
-    <choice>
-        <value>normal</value>
-        <value>small-caps</value>
-    </choice>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:text-transform">
-            <choice>
-                <value>none</value>
-                <value>lowercase</value>
-                <value>uppercase</value>
-                <value>capitalize</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-            <attribute name="fo:color">
-            <ref name="color"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:use-window-font-color">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:text-outline">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:text-line-through-type">
-            <ref name="lineType"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:text-line-through-style">
-            <ref name="lineStyle"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:text-line-through-width">
-            <ref name="lineWidth"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:text-line-through-color">
-            <choice>
-                <value>font-color</value>
-                <ref name="color"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:text-line-through-text">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:text-line-through-text-style">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:text-position">
-            <list>
-                <choice>
-                    <ref name="percent"/>
-                    <value>super</value>
-                    <value>sub</value>
-                </choice>
-                <optional>
-                    <ref name="percent"/>
-                </optional>
-            </list>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:font-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:font-name-asian">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:font-name-complex">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:font-family">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:font-family-asian">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:font-family-complex">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:font-family-generic">
-            <ref name="fontFamilyGeneric"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:font-family-generic-asian">
-            <ref name="fontFamilyGeneric"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:font-family-generic-complex">
-            <ref name="fontFamilyGeneric"/>
-        </attribute>
-    </optional>
-</define>
-
-<define name="fontFamilyGeneric">
-    <choice>
-        <value>roman</value>
-        <value>swiss</value>
-        <value>modern</value>
-        <value>decorative</value>
-        <value>script</value>
-        <value>system</value>
-    </choice>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:font-style-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:font-style-name-asian">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:font-style-name-complex">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:font-pitch">
-            <ref name="fontPitch"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:font-pitch-asian">
-            <ref name="fontPitch"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:font-pitch-complex">
-            <ref name="fontPitch"/>
-        </attribute>
-    </optional>
-</define>
-
-<define name="fontPitch">
-    <choice>
-        <value>fixed</value>
-        <value>variable</value>
-    </choice>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:font-charset">
-            <ref name="textEncoding"/>
-        </attribute>
-    </optional>
-</define>
-
-<define name="textEncoding">
-    <data type="string">
-        <param name="pattern">[A-Za-z][A-Za-z0-9._\-]*</param>
-    </data>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:font-size">
-            <choice>
-                <ref name="positiveLength"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:font-size-asian">
-            <choice>
-                <ref name="positiveLength"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:font-size-complex">
-            <choice>
-                <ref name="positiveLength"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:font-size-rel">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:font-size-rel-asian">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:font-size-rel-complex">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:script-type">
-            <choice>
-                <value>latin</value>
-                <value>asian</value>
-                <value>complex</value>
-                <value>ignore</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:letter-spacing">
-            <choice>
-                <ref name="length"/>
-                <value>normal</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:language">
-            <ref name="languageCode"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:language-asian">
-            <ref name="languageCode"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:language-complex">
-            <ref name="languageCode"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:country">
-            <ref name="countryCode"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:country-asian">
-            <ref name="countryCode"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:country-complex">
-            <ref name="countryCode"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:font-style">
-            <ref name="fontStyle"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:font-style-asian">
-            <ref name="fontStyle"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:font-style-complex">
-            <ref name="fontStyle"/>
-        </attribute>
-    </optional>
-</define>
-
-<define name="fontStyle">
-    <choice>
-        <value>normal</value>
-        <value>italic</value>
-        <value>oblique</value>
-    </choice>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:font-relief">
-            <choice>
-            <value>none</value>
-                <value>embossed</value>
-                <value>engraved</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:text-shadow">
-            <ref name="shadowType"/>
-        </attribute>
-    </optional>
-</define>
-
-<define name="shadowType">
-    <choice>
-        <value>none</value>
-        <!-- The follwing string must match an XSL shadow decl -->
-        <ref name="string"/>
-    </choice>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:text-underline-type">
-            <ref name="lineType"/>
-        </attribute>
-    </optional>
-</define>
-
-<define name="lineType">
-    <choice>
-        <value>none</value>
-        <value>single</value>
-        <value>double</value>
-    </choice>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:text-underline-style">
-            <ref name="lineStyle"/>
-        </attribute>
-    </optional>
-</define>
-
-<define name="lineStyle">
-    <choice>
-        <value>none</value>
-        <value>solid</value>
-        <value>dotted</value>
-        <value>dash</value>
-        <value>long-dash</value>
-        <value>dot-dash</value>
-        <value>dot-dot-dash</value>
-        <value>wave</value>
-    </choice>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:text-underline-width">
-            <ref name="lineWidth"/>
-        </attribute>
-    </optional>
-</define>
-
-<define name="lineWidth">
-    <choice>
-        <value>auto</value>
-        <value>normal</value>
-        <value>bold</value>
-        <value>thin</value>
-        <value>dash</value>
-        <value>medium</value>
-        <value>thick</value>
-        <ref name="positiveInteger"/>
-        <ref name="percent"/>
-        <ref name="positiveLength"/>
-    </choice>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:text-underline-color">
-            <choice>
-                <value>font-color</value>
-                <ref name="color"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:font-weight">
-            <ref name="fontWeight"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:font-weight-asian">
-            <ref name="fontWeight"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:font-weight-complex">
-            <ref name="fontWeight"/>
-        </attribute>
-    </optional>
-</define>
-
-<define name="fontWeight">
-    <choice>
-        <value>normal</value>
-        <value>bold</value>
-        <value>100</value>
-        <value>200</value>
-        <value>300</value>
-        <value>400</value>
-        <value>500</value>
-        <value>600</value>
-        <value>700</value>
-        <value>800</value>
-        <value>900</value>
-    </choice>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:text-underline-mode">
-            <ref name="lineMode"/>
-        </attribute>
-    </optional>
-</define>
-
-<define name="lineMode">
-    <choice>
-        <value>continuous</value>
-        <value>skip-white-space</value>
-    </choice>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:text-line-through-mode">
-            <ref name="lineMode"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:letter-kerning">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:text-blinking">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <ref name="common-background-color-attlist"/>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:text-combine">
-            <choice>
-                <value>none</value>
-                <value>letters</value>
-                <value>lines</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:text-combine-start-char">
-            <ref name="character"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:text-combine-end-char">
-            <ref name="character"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:text-emphasize">
-            <choice>
-                <value>none</value>
-                <list>
-                    <choice>
-                        <value>none</value>
-                        <value>accent</value>
-                        <value>dot</value>
-                        <value>circle</value>
-                        <value>disc</value>
-                    </choice>
-                    <choice>
-                        <value>above</value>
-                        <value>below</value>
-                    </choice>
-                </list>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:text-scale">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:text-rotation-angle">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:text-rotation-scale">
-            <choice>
-                <value>fixed</value>
-                <value>line-height</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:hyphenate">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:hyphenation-remain-char-count">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:hyphenation-push-char-count">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <choice>
-        <attribute name="text:display">
-            <value>true</value>
-        </attribute>
-        <attribute name="text:display">
-            <value>none</value>
-        </attribute>
-        <group>
-            <attribute name="text:display">
-                <value>condition</value>
-            </attribute>
-            <attribute name="text:condition">
-                <value>none</value>
-            </attribute>
-        </group>
-        <empty/>
-    </choice>
-</define>
-<define name="style-paragraph-properties">
-    <element name="style:paragraph-properties">
-        <ref name="style-paragraph-properties-content"/>
-    </element>
-</define>
-
-<define name="style-paragraph-properties-content">
-    <ref name="style-properties-content"/>
-</define>
-
-<define name="style-paragraph-properties-content-strict">
-    <ref name="style-paragraph-properties-attlist"/>
-    <ref name="style-paragraph-properties-elements"/>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:line-height">
-            <choice>
-                <value>normal</value>
-                <ref name="nonNegativeLength"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:line-height-at-least">
-            <ref name="nonNegativeLength"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:line-spacing">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:font-independent-line-spacing">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <ref name="common-text-align"/>
-</define>
-
-<define name="common-text-align">
-    <optional>
-        <attribute name="fo:text-align">
-            <choice>
-                <value>start</value>
-                <value>end</value>
-                <value>left</value>
-                <value>right</value>
-                <value>center</value>
-                <value>justify</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:text-align-last">
-            <choice>
-                <value>start</value>
-                <value>center</value>
-                <value>justify</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:justify-single-word">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:keep-together">
-            <choice>
-                <value>auto</value>
-                <value>always</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:widows">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:orphans">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-elements" combine="interleave">
-    <ref name="style-tab-stops"/>
-</define>
-
-<define name="style-tab-stops">
-    <optional>
-        <element name="style:tab-stops">
-            <zeroOrMore>
-                <ref name="style-tab-stop"/>
-            </zeroOrMore>
-        </element>
-    </optional>
-</define>
-
-<define name="style-tab-stop">
-    <element name="style:tab-stop">
-        <ref name="style-tab-stop-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="style-tab-stop-attlist" combine="interleave">
-    <attribute name="style:position">
-        <ref name="nonNegativeLength"/>
-    </attribute>
-</define>
-<define name="style-tab-stop-attlist" combine="interleave">
-    <choice>
-        <optional>
-            <attribute name="style:type" a:defaultValue="left">
-                <choice>
-                    <value>left</value>
-                    <value>center</value>
-                    <value>right</value>
-                </choice>
-            </attribute>
-        </optional>
-        <group>
-            <attribute name="style:type">
-                <value>char</value>
-            </attribute>
-            <ref name="style-tab-stop-char-attlist"/>
-        </group>
-    </choice>
-</define>
-<define name="style-tab-stop-char-attlist" combine="interleave">
-    <attribute name="style:char">
-        <ref name="character"/>
-    </attribute>
-</define>
-<define name="style-tab-stop-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:leader-type">
-            <ref name="lineType"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-tab-stop-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:leader-style">
-            <ref name="lineStyle"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-tab-stop-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:leader-width">
-            <ref name="lineWidth"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-tab-stop-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:leader-color">
-            <choice>
-                <value>font-color</value>
-                <ref name="color"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-tab-stop-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:leader-text" a:defaultValue=" ">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-tab-stop-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:leader-text-style">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:tab-stop-distance">
-            <ref name="nonNegativeLength"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:hyphenation-keep">
-            <choice>
-                <value>auto</value>
-                <value>page</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:hyphenation-ladder-count">
-            <choice>
-                <value>no-limit</value>
-                <ref name="positiveInteger"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-elements" combine="interleave">
-    <ref name="style-drop-cap"/>
-</define>
-
-<define name="style-drop-cap">
-    <optional>
-        <element name="style:drop-cap">
-            <ref name="style-drop-cap-attlist"/>
-            <empty/>
-        </element>
-    </optional>
-</define>
-<define name="style-drop-cap-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:length" a:defaultValue="1">
-            <choice>
-                <value>word</value>
-                <ref name="positiveInteger"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-drop-cap-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:lines" a:defaultValue="1">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-drop-cap-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:distance" a:defaultValue="0cm">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-drop-cap-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-        <optional>
-            <attribute name="style:register-true">
-                <ref name="boolean"/>
-            </attribute>
-        </optional>
-    </define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <ref name="common-horizontal-margin-attlist"/>
-</define>
-
-<define name="common-horizontal-margin-attlist">
-    <optional>
-        <attribute name="fo:margin-left">
-            <choice>
-                <ref name="length"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="fo:margin-right">
-            <choice>
-                <ref name="length"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:text-indent">
-            <choice>
-                <ref name="length"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:auto-text-indent">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <ref name="common-vertical-margin-attlist"/>
-</define>
-
-<define name="common-vertical-margin-attlist">
-    <optional>
-        <attribute name="fo:margin-top">
-            <choice>
-                <ref name="nonNegativeLength"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="fo:margin-bottom">
-            <choice>
-                <ref name="nonNegativeLength"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <ref name="common-margin-attlist"/>
-</define>
-
-<define name="common-margin-attlist">
-    <optional>
-        <attribute name="fo:margin">
-            <choice>
-                <ref name="nonNegativeLength"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <ref name="common-break-attlist"/>
-</define>
-
-<define name="common-break-attlist">
-    <optional>
-        <attribute name="fo:break-before">
-            <choice>
-                <value>auto</value>
-                <value>column</value>
-                <value>page</value>
-            </choice>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="fo:break-after">
-            <choice>
-                <value>auto</value>
-                <value>column</value>
-                <value>page</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <ref name="common-background-color-attlist"/>
-</define>
-
-<define name="common-background-color-attlist">
-    <optional>
-        <attribute name="fo:background-color">
-            <choice>
-                <value>transparent</value>
-                <ref name="color"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-elements" combine="interleave">
-    <ref name="style-background-image"/>
-</define>
-
-<define name="style-background-image">
-    <optional>
-        <element name="style:background-image">
-            <ref name="style-background-image-attlist"/>
-            <choice>
-                <ref name="common-draw-data-attlist"/>
-                <ref name="office-binary-data"/>
-                <empty/>
-            </choice>
-        </element>
-    </optional>
-</define>
-<define name="style-background-image-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:repeat" a:defaultValue="repeat">
-            <choice>
-                <value>no-repeat</value>
-                <value>repeat</value>
-                <value>stretch</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-background-image-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:position" a:defaultValue="center">
-            <choice>
-                <value>left</value>
-                <value>center</value>
-                <value>right</value>
-                <value>top</value>
-                <value>bottom</value>
-                <list>
-                    <ref name="horiBackPos"/>
-                    <ref name="vertBackPos"/>
-                </list>
-                <list>
-                    <ref name="vertBackPos"/>
-                    <ref name="horiBackPos"/>
-                </list>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-
-<define name="horiBackPos">
-    <choice>
-        <value>left</value>
-        <value>center</value>
-        <value>right</value>
-    </choice>
-</define>
-<define name="vertBackPos">
-    <choice>
-        <value>top</value>
-        <value>center</value>
-        <value>bottom</value>
-    </choice>
-</define>
-<define name="style-background-image-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:filter-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-background-image-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:opacity">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <ref name="common-border-attlist"/>
-</define>
-
-<define name="common-border-attlist">
-    <optional>
-        <attribute name="fo:border">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="fo:border-top">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="fo:border-bottom">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="fo:border-left">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="fo:border-right">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <ref name="common-border-line-width-attlist"/>
-</define>
-
-<define name="common-border-line-width-attlist">
-    <optional>
-        <attribute name="style:border-line-width">
-            <ref name="borderWidths"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:border-line-width-top">
-            <ref name="borderWidths"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:border-line-width-bottom">
-            <ref name="borderWidths"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:border-line-width-left">
-            <ref name="borderWidths"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:border-line-width-right">
-            <ref name="borderWidths"/>
-        </attribute>
-    </optional>
-</define>
-
-<define name="borderWidths">
-    <list>
-        <ref name="positiveLength"/>
-        <ref name="positiveLength"/>
-        <ref name="positiveLength"/>
-    </list>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <ref name="common-padding-attlist"/>
-</define>
-
-<define name="common-padding-attlist">
-    <optional>
-        <attribute name="fo:padding">
-            <ref name="nonNegativeLength"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="fo:padding-top">
-            <ref name="nonNegativeLength"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="fo:padding-bottom">
-            <ref name="nonNegativeLength"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="fo:padding-left">
-            <ref name="nonNegativeLength"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="fo:padding-right">
-            <ref name="nonNegativeLength"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <ref name="common-shadow-attlist"/>
-</define>
-
-<define name="common-shadow-attlist">
-    <optional>
-        <attribute name="style:shadow">
-            <ref name="shadowType"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <ref name="common-keep-with-next-attlist"/>
-</define>
-
-<define name="common-keep-with-next-attlist">
-    <optional>
-        <attribute name="fo:keep-with-next">
-            <choice>
-                <value>auto</value>
-                <value>always</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:number-lines" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:line-number">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:text-autospace">
-            <choice>
-                <value>none</value>
-                <value>ideograph-alpha</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:punctuation-wrap">
-            <choice>
-                <value>simple</value>
-                <value>hanging</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:line-break">
-            <choice>
-                <value>normal</value>
-                <value>strict</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:vertical-align" a:defaultValue="auto">
-            <choice>
-                <value>top</value>
-                <value>middle</value>
-                <value>bottom</value>
-                <value>auto</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <ref name="common-writing-mode-attlist"/>
-</define>
-
-<define name="common-writing-mode-attlist">
-    <optional>
-        <attribute name="style:writing-mode">
-            <choice>
-                <value>lr-tb</value>
-                <value>rl-tb</value>
-                <value>tb-rl</value>
-                <value>tb-lr</value>
-                <value>lr</value>
-                <value>rl</value>
-                <value>tb</value>
-                <value>page</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:writing-mode-automatic">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:snap-to-layout-grid">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <ref name="common-page-number-attlist"/>
-</define>
-
-<define name="common-page-number-attlist">
-    <optional>
-        <attribute name="style:page-number">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:background-transparency">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-ruby-properties">
-    <element name="style:ruby-properties">
-        <ref name="style-ruby-properties-content"/>
-    </element>
-</define>
-
-<define name="style-ruby-properties-content">
-    <ref name="style-properties-content"/>
-</define>
-
-<define name="style-ruby-properties-content-strict">
-    <ref name="style-ruby-properties-attlist"/>
-    <ref name="style-ruby-properties-elements"/>
-</define>
-
-<define name="style-ruby-properties-elements">
-    <empty/>
-</define>
-<define name="style-ruby-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:ruby-position">
-            <choice>
-                <value>above</value>
-                <value>below</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-ruby-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:ruby-align">
-            <choice>
-                <value>left</value>
-                <value>center</value>
-                <value>right</value>
-                <value>distribute-letter</value>
-                <value>distribute-space</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-section-properties">
-    <element name="style:section-properties">
-        <ref name="style-section-properties-content"/>
-    </element>
-</define>
-
-<define name="style-section-properties-content">
-    <ref name="style-properties-content"/>
-</define>
-
-<define name="style-section-properties-content-strict">
-    <ref name="style-section-properties-attlist"/>
-    <ref name="style-section-properties-elements"/>
-</define>
-<define name="style-section-properties-attlist" combine="interleave">
-    <ref name="common-background-color-attlist"/>
-</define>
-<define name="style-section-properties-elements" combine="interleave">
-    <ref name="style-background-image"/>
-</define>
-<define name="style-section-properties-attlist" combine="interleave">
-    <ref name="common-horizontal-margin-attlist"/>
-</define>
-<define name="style-section-properties-elements" combine="interleave">
-    <ref name="style-columns"/>
-</define>
-
-<define name="style-columns">
-    <optional>
-        <element name="style:columns">
-            <ref name="style-columns-attlist"/>
-            <optional>
-                <ref name="style-column-sep"/>
-            </optional>
-            <zeroOrMore>
-                <ref name="style-column"/>
-            </zeroOrMore>
-        </element>
-    </optional>
-</define>
-<define name="style-columns-attlist" combine="interleave">
-    <attribute name="fo:column-count">
-        <ref name="positiveInteger"/>
-    </attribute>
-</define>
-<define name="style-columns-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:column-gap">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-column">
-    <element name="style:column">
-        <ref name="style-column-attlist"/>
-    </element>
-</define>
-<define name="style-column-attlist" combine="interleave">
-    <attribute name="style:rel-width">
-        <ref name="relativeLength"/>
-    </attribute>
-</define>
-<define name="style-column-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:start-indent" a:defaultValue="0cm">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-column-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:end-indent" a:defaultValue="0cm">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-column-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:space-before" a:defaultValue="0cm">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-column-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:space-after" a:defaultValue="0cm">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-column-sep">
-    <element name="style:column-sep">
-        <ref name="style-column-sep-attlist"/>
-    </element>
-</define>
-<define name="style-column-sep-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:style" a:defaultValue="solid">
-            <choice>
-                <value>none</value>
-                <value>solid</value>
-                <value>dotted</value>
-                <value>dashed</value>
-                <value>dot-dashed</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-column-sep-attlist" combine="interleave">
-    <attribute name="style:width">
-        <ref name="length"/>
-    </attribute>
-</define>
-<define name="style-column-sep-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:height" a:defaultValue="100%">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-column-sep-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:vertical-align" a:defaultValue="top">
-            <choice>
-                <value>top</value>
-                <value>middle</value>
-                <value>bottom</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-column-sep-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:color" a:defaultValue="#000000">
-            <ref name="color"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-section-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:protect" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-section-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:dont-balance-text-columns">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-section-properties-attlist" combine="interleave">
-    <ref name="common-writing-mode-attlist"/>
-</define>
-<define name="style-section-properties-elements" combine="interleave">
-    <zeroOrMore>
-        <ref name="text-notes-configuration"/>
-    </zeroOrMore>
-</define>
-<define name="style-table-properties">
-    <element name="style:table-properties">
-        <ref name="style-table-properties-content"/>
-    </element>
-</define>
-
-<define name="style-table-properties-content">
-    <ref name="style-properties-content"/>
-</define>
-
-<define name="style-table-properties-content-strict">
-    <ref name="style-table-properties-attlist"/>
-    <ref name="style-table-properties-elements"/>
-</define>
-<define name="style-table-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:width">
-            <ref name="positiveLength"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:rel-width">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-table-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:align">
-            <choice>
-                <value>left</value>
-                <value>center</value>
-                <value>right</value>
-                <value>margins</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-table-properties-attlist" combine="interleave">
-    <ref name="common-horizontal-margin-attlist"/>
-</define>
-<define name="style-table-properties-attlist" combine="interleave">
-    <ref name="common-vertical-margin-attlist"/>
-</define>
-<define name="style-table-properties-attlist" combine="interleave">
-    <ref name="common-margin-attlist"/>
-</define>
-<define name="style-table-properties-attlist" combine="interleave">
-    <ref name="common-page-number-attlist"/>
-</define>
-<define name="style-table-properties-attlist" combine="interleave">
-    <ref name="common-break-attlist"/>
-</define>
-<define name="style-table-properties-attlist" combine="interleave">
-    <ref name="common-background-color-attlist"/>
-</define>
-<define name="style-table-properties-elements" combine="interleave">
-    <ref name="style-background-image"/>
-</define>
-<define name="style-table-properties-attlist" combine="interleave">
-    <ref name="common-shadow-attlist"/>
-</define>
-<define name="style-table-properties-attlist" combine="interleave">
-    <ref name="common-keep-with-next-attlist"/>
-</define>
-<define name="style-table-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:may-break-between-rows">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-table-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:border-model">
-            <choice>
-                <value>collapsing</value>
-                <value>separating</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-table-properties-attlist" combine="interleave">
-    <ref name="common-writing-mode-attlist"/>
-</define>
-<define name="style-table-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:display">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-table-column-properties">
-    <element name="style:table-column-properties">
-        <ref name="style-table-column-properties-content"/>
-    </element>
-</define>
-
-<define name="style-table-column-properties-content">
-    <ref name="style-properties-content"/>
-</define>
-
-<define name="style-table-column-properties-content-strict">
-    <ref name="style-table-column-properties-attlist"/>
-    <ref name="style-table-column-properties-elements"/>
-</define>
-
-<define name="style-table-column-properties-elements">
-    <empty/>
-</define>
-<define name="style-table-column-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:column-width">
-            <ref name="positiveLength"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:rel-column-width">
-            <ref name="relativeLength"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-table-column-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:use-optimal-column-width">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-table-column-properties-attlist" combine="interleave">
-    <ref name="common-break-attlist"/>
-</define>
-<define name="style-table-row-properties">
-    <element name="style:table-row-properties">
-        <ref name="style-table-row-properties-content"/>
-    </element>
-</define>
-
-<define name="style-table-row-properties-content">
-    <ref name="style-properties-content"/>
-</define>
-
-<define name="style-table-row-properties-content-strict">
-    <ref name="style-table-row-properties-attlist"/>
-    <ref name="style-table-row-properties-elements"/>
-</define>
-<define name="style-table-row-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:row-height">
-            <ref name="positiveLength"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:min-row-height">
-            <ref name="nonNegativeLength"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-table-row-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:use-optimal-row-height">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-table-row-properties-attlist" combine="interleave">
-    <ref name="common-background-color-attlist"/>
-</define>
-<define name="style-table-row-properties-elements" combine="interleave">
-    <ref name="style-background-image"/>
-</define>
-<define name="style-table-row-properties-attlist" combine="interleave">
-    <ref name="common-break-attlist"/>
-</define>
-<define name="style-table-row-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:keep-together">
-            <choice>
-                <value>auto</value>
-                <value>always</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-table-cell-properties">
-    <element name="style:table-cell-properties">
-        <ref name="style-table-cell-properties-content"/>
-    </element>
-</define>
-
-<define name="style-table-cell-properties-content">
-    <ref name="style-properties-content"/>
-</define>
-
-<define name="style-table-cell-properties-content-strict">
-    <ref name="style-table-cell-properties-attlist"/>
-    <ref name="style-table-cell-properties-elements"/>
-</define>
-<define name="style-table-cell-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:vertical-align">
-            <choice>
-                <value>top</value>
-                <value>middle</value>
-                <value>bottom</value>
-                <value>automatic</value>
-            </choice>
-            </attribute>
-    </optional>
-</define>
-<define name="style-table-cell-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:text-align-source">
-            <choice>
-                <value>fix</value>
-                <value>value-type</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-table-cell-properties-attlist" combine="interleave">
-    <ref name="common-style-direction-attlist"/>
-</define>
-
-<define name="common-style-direction-attlist">
-    <optional>
-        <attribute name="style:direction">
-            <choice>
-                <value>ltr</value>
-                <value>ttb</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-table-cell-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:glyph-orientation-vertical">
-            <choice>
-                <value>auto</value>
-                <value>0</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-table-cell-properties-attlist" combine="interleave">
-    <ref name="common-shadow-attlist"/>
-</define>
-<define name="style-table-cell-properties-attlist" combine="interleave">
-    <ref name="common-background-color-attlist"/>
-</define>
-<define name="style-table-cell-properties-elements" combine="interleave">
-    <ref name="style-background-image"/>
-</define>
-<define name="style-table-cell-properties-attlist" combine="interleave">
-    <ref name="common-border-attlist"/>
-</define>
-<define name="style-table-cell-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:diagonal-tl-br">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:diagonal-tl-br-widths">
-            <ref name="borderWidths"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:diagonal-bl-tr">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:diagonal-bl-tr-widths">
-            <ref name="borderWidths"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-table-cell-properties-attlist" combine="interleave">
-    <ref name="common-border-line-width-attlist"/>
-</define>
-<define name="style-table-cell-properties-attlist" combine="interleave">
-    <ref name="common-padding-attlist"/>
-</define>
-<define name="style-table-cell-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:wrap-option">
-            <choice>
-                <value>no-wrap</value>
-                <value>wrap</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-table-cell-properties-attlist" combine="interleave">
-    <ref name="common-rotation-angle-attlist"/>
-</define>
-
-<define name="common-rotation-angle-attlist">
-    <optional>
-        <attribute name="style:rotation-angle">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-table-cell-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:rotation-align">
-            <choice>
-                <value>none</value>
-                <value>bottom</value>
-                <value>top</value>
-                <value>center</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-table-cell-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:cell-protect">
-            <choice>
-                <value>none</value>
-                <value>hidden-and-protected</value>
-                <list>
-                    <oneOrMore>
-                        <choice>
-                            <value>protected</value>
-                            <value>formula-hidden</value>
-                        </choice>
-                    </oneOrMore>
-                </list>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-table-cell-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:print-content">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-table-cell-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:decimal-places">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-table-cell-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:repeat-content">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-table-cell-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:shrink-to-fit">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-list-level-properties">
-    <element name="style:list-level-properties">
-        <ref name="style-list-level-properties-content"/>
-    </element>
-</define>
-
-<define name="style-list-level-properties-content">
-    <ref name="style-properties-content"/>
-</define>
-
-<define name="style-list-level-properties-content-strict">
-    <ref name="style-list-level-properties-attlist"/>
-    <ref name="style-list-level-properties-elements"/>
-</define>
-
-<define name="style-list-level-properties-elements">
-    <empty/>
-</define>
-<define name="style-list-level-properties-attlist" combine="interleave">
-    <ref name="common-text-align"/>
-</define>
-<define name="style-list-level-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:space-before">
-            <ref name="nonNegativeLength"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-list-level-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:min-label-width">
-            <ref name="nonNegativeLength"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-list-level-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:min-label-distance">
-            <ref name="nonNegativeLength"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-list-level-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:font-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-list-level-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:width">
-            <ref name="positiveLength"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="fo:height">
-            <ref name="positiveLength"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-list-level-properties-attlist" combine="interleave">
-    <ref name="common-vertical-rel-attlist"/>
-    <ref name="common-vertical-pos-attlist"/>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:stroke">
-            <choice>
-                <value>none</value>
-                <value>dash</value>
-                <value>solid</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:stroke-dash">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:stroke-dash-names">
-            <ref name="styleNameRefs"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="svg:stroke-width">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="svg:stroke-color">
-            <ref name="color"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:marker-start">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:marker-end">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:marker-start-width">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:marker-end-width">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:marker-start-center">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:marker-end-center">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="svg:stroke-opacity">
-            <choice>
-                <data type="double">
-                    <param name="minInclusive">0</param>
-                    <param name="maxInclusive">1</param>
-                </data>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:stroke-linejoin">
-            <choice>
-                <value>miter</value>
-                <value>round</value>
-                <value>bevel</value>
-                <value>middle</value>
-                <value>none</value>
-                <value>inherit</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-fill-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:fill">
-            <choice>
-                <value>none</value>
-                <value>solid</value>
-                <value>bitmap</value>
-                <value>gradient</value>
-                <value>hatch</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-fill-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:fill-color">
-            <ref name="color"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-fill-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:secondary-fill-color">
-            <ref name="color"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-fill-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:fill-gradient-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-fill-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:gradient-step-count">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-fill-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:fill-hatch-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-fill-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:fill-hatch-solid">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-fill-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:fill-image-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-fill-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:repeat">
-            <choice>
-                <value>no-repeat</value>
-                <value>repeat</value>
-                <value>stretch</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-fill-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:fill-image-width">
-            <choice>
-                <ref name="length"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="draw:fill-image-height">
-            <choice>
-                <ref name="length"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-fill-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:fill-image-ref-point-x">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="draw:fill-image-ref-point-y">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="draw:fill-image-ref-point">
-            <choice>
-                <value>top-left</value>
-                <value>top</value>
-                <value>top-right</value>
-                <value>left</value>
-                <value>center</value>
-                <value>right</value>
-                <value>bottom-left</value>
-                <value>bottom</value>
-                <value>bottom-right</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-fill-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:tile-repeat-offset"/>
-    </optional>
-</define>
-<define name="style-graphic-fill-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:opacity">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-fill-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:opacity-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-fill-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="svg:fill-rule">
-            <choice>
-                <value>nonzero</value>
-                <value>evenodd</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:symbol-color">
-            <ref name="color"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:animation">
-            <choice>
-                <value>none</value>
-                <value>scroll</value>
-                <value>alternate</value>
-                <value>slide</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:animation-direction">
-            <choice>
-                <value>left</value>
-                <value>right</value>
-                <value>up</value>
-                <value>down</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:animation-start-inside">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:animation-stop-inside">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:animation-repeat">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:animation-delay">
-            <ref name="duration"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:animation-steps">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:auto-grow-width">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="draw:auto-grow-height">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:fit-to-size">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:fit-to-contour">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:textarea-vertical-align">
-            <choice>
-                <value>top</value>
-                <value>middle</value>
-                <value>bottom</value>
-                <value>justify</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:textarea-horizontal-align">
-            <choice>
-                <value>left</value>
-                <value>center</value>
-                <value>right</value>
-                <value>justify</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:wrap-option">
-            <choice>
-                <value>no-wrap</value>
-                <value>wrap</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-elements" combine="interleave">
-    <optional>
-        <ref name="text-list-style"/>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:color-mode">
-            <choice>
-                <value>greyscale</value>
-                <value>mono</value>
-                <value>watermark</value>
-                <value>standard</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:color-inversion">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:luminance">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:contrast">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:gamma">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:red">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:green">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:blue">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:image-opacity">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:shadow">
-            <choice>
-                <value>visible</value>
-                <value>hidden</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:shadow-offset-x">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="draw:shadow-offset-y">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:shadow-color">
-            <ref name="color"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:shadow-opacity">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:start-line-spacing-horizontal">
-            <ref name="distance"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="draw:start-line-spacing-vertical">
-            <ref name="distance"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:end-line-spacing-horizontal">
-            <ref name="distance"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="draw:end-line-spacing-vertical">
-            <ref name="distance"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:line-distance">
-            <ref name="distance"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:guide-overhang">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:guide-distance">
-            <ref name="distance"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:start-guide">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:end-guide">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:placing">
-            <choice>
-                <value>below</value>
-                <value>above</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:parallel">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:measure-align">
-            <choice>
-                <value>automatic</value>
-                <value>left-outside</value>
-                <value>inside</value>
-                <value>right-outside</value>
-            </choice>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="draw:measure-vertical-align">
-            <choice>
-                <value>automatic</value>
-                <value>above</value>
-                <value>below</value>
-                <value>center</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:unit">
-            <choice>
-                <value>automatic</value>
-                <value>mm</value>
-                <value>cm</value>
-                <value>m</value>
-                <value>km</value>
-                <value>pt</value>
-                <value>pc</value>
-                <value>inch</value>
-                <value>ft</value>
-                <value>mi</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:show-unit">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:decimal-places">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:caption-type">
-            <choice>
-                <value>straight-line</value>
-                <value>angled-line</value>
-                <value>angled-connector-line</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:caption-angle-type">
-            <choice>
-                <value>fixed</value>
-                <value>free</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:caption-angle">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:caption-gap">
-            <ref name="distance"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:caption-escape-direction">
-            <choice>
-                <value>horizontal</value>
-                <value>vertical</value>
-                <value>auto</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:caption-escape">
-            <choice>
-                <ref name="length"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:caption-line-length">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:caption-fit-line-length">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:horizontal-segments">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:vertical-segments">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:edge-rounding">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:edge-rounding-mode">
-            <choice>
-                <value>correct</value>
-                <value>attractive</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:back-scale">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:depth">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:backface-culling">
-            <choice>
-                <value>enabled</value>
-                <value>disabled</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:end-angle">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:close-front">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:close-back">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:lighting-mode">
-            <choice>
-                <value>standard</value>
-                <value>double-sided</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:normals-kind">
-            <choice>
-                <value>object</value>
-                <value>flat</value>
-                <value>sphere</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:normals-direction">
-            <choice>
-                <value>normal</value>
-                <value>inverse</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:texture-generation-mode-x">
-            <choice>
-                <value>object</value>
-                <value>parallel</value>
-                <value>sphere</value>
-            </choice>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="dr3d:texture-generation-mode-y">
-            <choice>
-                <value>object</value>
-                <value>parallel</value>
-                <value>sphere</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:texture-kind">
-            <choice>
-                <value>luminance</value>
-                <value>intesity</value>
-                <value>color</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:texture-filter">
-            <choice>
-                <value>enabled</value>
-                <value>disabled</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:texture-mode">
-            <choice>
-                <value>replace</value>
-                <value>modulate</value>
-                <value>blend</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:ambient-color">
-            <ref name="color"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="dr3d:emissive-color">
-            <ref name="color"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="dr3d:specular-color">
-            <ref name="color"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="dr3d:diffuse-color">
-            <ref name="color"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:shininess">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:shadow">
-            <choice>
-                <value>visible</value>
-                <value>hidden</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <ref name="common-draw-rel-size-attlist"/>
-    <optional>
-        <attribute name="fo:min-width">
-            <choice>
-                <ref name="length"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:min-height">
-            <choice>
-                <ref name="length"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:max-height">
-            <choice>
-                <ref name="length"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="fo:max-width">
-            <choice>
-                <ref name="length"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <ref name="common-horizontal-margin-attlist"/>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <ref name="common-vertical-margin-attlist"/>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <ref name="common-margin-attlist"/>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:print-content">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:protect">
-            <choice>
-                <value>none</value>
-                <list>
-                    <oneOrMore>
-                        <choice>
-                            <value>content</value>
-                            <value>position</value>
-                            <value>size</value>
-                        </choice>
-                    </oneOrMore>
-                </list>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:horizontal-pos">
-            <choice>
-                <value>left</value>
-                <value>center</value>
-                <value>right</value>
-                <value>from-left</value>
-                <value>inside</value>
-                <value>outside</value>
-                <value>from-inside</value>
-            </choice>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:x">
-            <ref name="coordinate"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:horizontal-rel">
-            <choice>
-                    <value>page</value>
-                <value>page-content</value>
-                <value>page-start-margin</value>
-                <value>page-end-margin</value>
-                <value>frame</value>
-                <value>frame-content</value>
-                <value>frame-start-margin</value>
-                <value>frame-end-margin</value>
-                <value>paragraph</value>
-                <value>paragraph-content</value>
-                <value>paragraph-start-margin</value>
-                <value>paragraph-end-margin</value>
-                <value>char</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <ref name="common-vertical-pos-attlist"/>
-</define>
-
-<define name="common-vertical-pos-attlist">
-    <optional>
-        <attribute name="style:vertical-pos">
-            <choice>
-                <value>top</value>
-                <value>middle</value>
-                <value>bottom</value>
-                <value>from-top</value>
-                <value>below</value>
-            </choice>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:y">
-            <ref name="coordinate"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <ref name="common-vertical-rel-attlist"/>
-</define>
-
-<define name="common-vertical-rel-attlist">
-    <optional>
-        <attribute name="style:vertical-rel">
-            <choice>
-                <value>page</value>
-                <value>page-content</value>
-                <value>frame</value>
-                <value>frame-content</value>
-                <value>paragraph</value>
-                <value>paragraph-content</value>
-                <value>char</value>
-                <value>line</value>
-                <value>baseline</value>
-                <value>text</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <ref name="common-text-anchor-attlist"/>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <ref name="common-border-attlist"/>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <ref name="common-border-line-width-attlist"/>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <ref name="common-padding-attlist"/>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <ref name="common-shadow-attlist"/>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <ref name="common-background-color-attlist"/>
-</define>
-<define name="style-graphic-properties-elements" combine="interleave">
-    <ref name="style-background-image"/>
-</define>
-<define name="style-graphic-properties-elements" combine="interleave">
-    <ref name="style-columns"/>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:editable">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:wrap">
-            <choice>
-                <value>none</value>
-                <value>left</value>
-                <value>right</value>
-                <value>parallel</value>
-                <value>dynamic</value>
-                <value>run-through</value>
-                <value>biggest</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:wrap-dynamic-treshold">
-            <ref name="nonNegativeLength"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:number-wrapped-paragraphs">
-            <choice>
-                <value>no-limit</value>
-                <ref name="positiveInteger"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:wrap-contour">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:wrap-contour-mode">
-            <choice>
-                <value>full</value>
-                <value>outside</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:run-through">
-            <choice>
-                <value>foreground</value>
-                <value>background</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:flow-with-text">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:overflow-behavior">
-            <choice>
-                <value>clip</value>
-                <value>auto-create-new-frame</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:mirror">
-            <choice>
-                <value>none</value>
-                <value>vertical</value>
-                <ref name="horizontal-mirror"/>
-                <list>
-                    <value>vertical</value>
-                    <ref name="horizontal-mirror"/>
-                </list>
-                <list>
-                    <ref name="horizontal-mirror"/>
-                    <value>vertical</value>
-                </list>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-
-<define name="horizontal-mirror">
-    <choice>
-        <value>horizontal</value>
-        <value>horizontal-on-odd</value>
-        <value>horizontal-on-even</value>
-    </choice>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:clip">
-            <!-- The attribute value must match the one XSL's clip -->
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:wrap-influence-on-position"
-                    a:defaultValue="iterative">
-            <choice>
-                <value>iterative</value>
-                <value>once-concurrent</value>
-                <value>once-successive</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:frame-display-scrollbar">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:frame-display-border">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:frame-margin-horizontal">
-            <ref name="nonNegativePixelLength"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="draw:frame-margin-vertical">
-            <ref name="nonNegativePixelLength"/>
-        </attribute>
-    </optional>
-</define>
-
-<define name="nonNegativePixelLength">
-    <data type="string">
-        <param name="pattern">([0-9]+(\.[0-9]*)?|\.[0-9]+)(px)</param>
-    </data>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:visible-area-left">
-            <ref name="nonNegativeLength"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="draw:visible-area-top">
-            <ref name="nonNegativeLength"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="draw:visible-area-width">
-            <ref name="positiveLength"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="draw:visible-area-height">
-            <ref name="positiveLength"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:ole-draw-aspect">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties">
-    <element name="style:chart-properties">
-        <ref name="style-chart-properties-content"/>
-    </element>
-</define>
-
-<define name="style-chart-properties-content">
-    <ref name="style-properties-content"/>
-</define>
-
-<define name="style-chart-properties-content-strict">
-    <ref name="style-chart-properties-attlist"/>
-    <ref name="style-chart-properties-elements"/>
-</define>
-
-<define name="style-chart-properties-elements">
-    <empty/>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:scale-text" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:three-dimensional">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:deep">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <choice>
-        <attribute name="chart:symbol-type">
-            <value>none</value>
-        </attribute>
-        <attribute name="chart:symbol-type">
-            <value>automatic</value>
-        </attribute>
-        <group>
-            <attribute name="chart:symbol-type">
-                <value>named-symbol</value>
-            </attribute>
-            <attribute name="chart:symbol-name">
-                <choice>
-                    <value>square</value>
-                    <value>diamond</value>
-                    <value>arrow-down</value>
-                    <value>arrow-up</value>
-                    <value>arrow-right</value>
-                    <value>arrow-left</value>
-                    <value>bow-tie</value>
-                    <value>hourglass</value>
-                    <value>circle</value>
-                    <value>star</value>
-                    <value>x</value>
-                    <value>plus</value>
-                    <value>asterisk</value>
-                    <value>horizontal-bar</value>
-                    <value>vertical-bar</value>
-                </choice>
-            </attribute>
-        </group>
-        <group>
-            <attribute name="chart:symbol-type">
-                <value>image</value>
-            </attribute>
-            <element name="chart:symbol-image">
-                <attribute name="xlink:href">
-                    <ref name="anyURI"/>
-                </attribute>
-            </element>
-        </group>
-        <empty/>
-    </choice>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:symbol-width">
-            <ref name="nonNegativeLength"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="chart:symbol-height">
-            <ref name="nonNegativeLength"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:vertical" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:connect-bars" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:gap-width">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="chart:overlap">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:japanese-candle-stick"
-                    a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:interpolation" a:defaultValue="none">
-            <choice>
-                <value>none</value>
-                <value>cubic-spline</value>
-                <value>b-spline</value>
-            </choice>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="chart:spline-order" a:defaultValue="2">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="chart:spline-resolution" a:defaultValue="20">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:pie-offset" a:defaultValue="0">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:lines" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:solid-type" a:defaultValue="cuboid">
-            <choice>
-                <value>cuboid</value>
-                <value>cylinder</value>
-                <value>cone</value>
-                <value>pyramid</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:stacked" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="chart:percentage" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:link-data-style-to-source">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:visible">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:logarithmic">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:maximum">
-            <ref name="double"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="chart:minimum">
-            <ref name="double"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="chart:origin">
-            <ref name="double"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="chart:interval-major">
-            <ref name="double"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="chart:interval-minor">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:tick-marks-major-inner">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="chart:tick-marks-major-outer">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="chart:tick-marks-minor-inner">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="chart:tick-marks-minor-outer">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:display-label">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="chart:text-overlap">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="text:line-break">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="chart:label-arrangement"
-                   a:defaultValue="side-by-side">
-            <choice>
-                <value>side-by-side</value>
-                <value>stagger-even</value>
-                <value>stagger-odd</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <ref name="common-style-direction-attlist"/>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <ref name="common-rotation-angle-attlist"/>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:data-label-number">
-            <choice>
-                <value>none</value>
-                <value>value</value>
-                <value>percentage</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:data-label-text">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:data-label-symbol">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:mean-value">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:error-category" a:defaultValue="none">
-            <choice>
-                <value>none</value>
-                <value>variance</value>
-                <value>standard-deviation</value>
-                <value>percentage</value>
-                <value>error-margin</value>
-                <value>constant</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:error-percentage">
-            <ref name="double"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:error-margin">
-            <ref name="double"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:error-lower-limit">
-            <ref name="double"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="chart:error-upper-limit">
-            <ref name="double"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:error-upper-indicator">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="chart:error-lower-indicator">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:series-source" a:defaultValue="columns">
-            <choice>
-                <value>columns</value>
-                <value>rows</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:regression-type" a:defaultValue="none">
-            <choice>
-                <value>none</value>
-                <value>linear</value>
-                <value>logarithmic</value>
-                <value>exponential</value>
-                <value>power</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-drawing-page-properties-attlist"
-        combine="interleave">
-    <optional>
-        <attribute name="presentation:transition-type">
-            <choice>
-                <value>manual</value>
-                <value>automatic</value>
-                <value>semi-automatic</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-drawing-page-properties-attlist"
-         combine="interleave">
-    <optional>
-        <attribute name="presentation:transition-style">
-            <choice>
-                <value>none</value>
-                <value>fade-from-left</value>
-                <value>fade-from-top</value>
-                <value>fade-from-right</value>
-                <value>fade-from-bottom</value>
-                <value>fade-from-upperleft</value>
-                <value>fade-from-upperright</value>
-                <value>fade-from-lowerleft</value>
-                <value>fade-from-lowerright</value>
-                <value>move-from-left</value>
-                <value>move-from-top</value>
-                <value>move-from-right</value>
-                <value>move-from-bottom</value>
-                <value>move-from-upperleft</value>
-                <value>move-from-upperright</value>
-                <value>move-from-lowerleft</value>
-                <value>move-from-lowerright</value>
-                <value>uncover-to-left</value>
-                <value>uncover-to-top</value>
-                <value>uncover-to-right</value>    
-                <value>uncover-to-bottom</value>
-                <value>uncover-to-upperleft</value>
-                <value>uncover-to-upperright</value>
-                <value>uncover-to-lowerleft</value>
-                <value>uncover-to-lowerright</value>
-                <value>fade-to-center</value>
-                <value>fade-from-center</value>
-                <value>vertical-stripes</value>
-                <value>horizontal-stripes</value>
-                <value>clockwise</value>
-                <value>counterclockwise</value>
-                <value>open-vertical</value>
-                <value>open-horizontal</value>
-                <value>close-vertical</value>
-                <value>close-horizontal</value>
-                <value>wavyline-from-left</value>
-                <value>wavyline-from-top</value>
-                <value>wavyline-from-right</value>
-                <value>wavyline-from-bottom</value>
-                <value>spiralin-left</value>
-                <value>spiralin-right</value>
-                <value>spiralout-left</value>
-                <value>spiralout-right</value>
-                <value>roll-from-top</value>
-                <value>roll-from-left</value>
-                <value>roll-from-right</value>
-                <value>roll-from-bottom</value>
-                <value>stretch-from-left</value>
-                <value>stretch-from-top</value>
-                <value>stretch-from-right</value>
-                <value>stretch-from-bottom</value>
-
-                <value>vertical-lines</value>
-                <value>horizontal-lines</value>
-                <value>dissolve</value>
-                <value>random</value>
-                <value>vertical-checkerboard</value>
-                <value>horizontal-checkerboard</value>
-                <value>interlocking-horizontal-left</value>
-                <value>interlocking-horizontal-right</value>
-                <value>interlocking-vertical-top</value>
-                <value>interlocking-vertical-bottom</value>
-                <value>fly-away</value>
-                <value>open</value>
-                <value>close</value>
-                <value>melt</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-drawing-page-properties-attlist"
-        combine="interleave">
-    <optional>
-        <attribute name="presentation:transition-speed">
-            <ref name="presentationSpeeds"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-drawing-page-properties-attlist " combine="interleave">
-    <optional>
-        <attribute name="smil:type">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-drawing-page-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:subtype">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-drawing-page-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:direction" a:defaultValue="forward">
-            <choice>
-                <value>forward</value>
-                <value>reverse</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-drawing-page-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:fadeColor">
-            <choice>
-                <value>forward</value>
-                <value>reverse</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-drawing-page-properties-attlist"
-        combine="interleave">
-    <optional>
-        <attribute name="presentation:duration">
-            <ref name="duration"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-drawing-page-properties-attlist"
-         combine="interleave">
-    <optional>
-        <attribute name="presentation:visibility">
-            <choice>
-                <value>visible</value>
-                <value>hidden</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-drawing-page-properties-elements"
-         combine="interleave">
-    <optional>
-        <ref name="presentation-sound"/>
-    </optional>
-</define>
-<define name="style-drawing-page-properties-attlist"
-         combine="interleave">
-    <optional>
-        <attribute name="draw:background-size">
-            <choice>
-                <value>full</value>
-                <value>border</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-drawing-page-properties-attlist"
-         combine="interleave">
-    <optional>
-        <attribute name="presentation:background-objects-visible">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-drawing-page-properties-attlist"
-         combine="interleave">
-    <optional>
-        <attribute name="presentation:background-visible">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-drawing-page-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:display-header">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-drawing-page-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:display-footer">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-drawing-page-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:display-page-number">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-drawing-page-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:display-date-time">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="string">
-    <data type="string"/>
-</define>
-<define name="date">
-    <data type="date"/>
-</define>
-<define name="time">
-    <data type="time"/>
-</define>
-<define name="dateTime">
-    <data type="dateTime"/>
-</define>
-<define name="duration">
-    <data type="duration"/>
-</define>
-<define name="integer">
-    <data type="integer"/>
-</define>
-<define name="nonNegativeInteger">
-    <data type="nonNegativeInteger"/>
-</define>
-<define name="positiveInteger">
-    <data type="positiveInteger"/>
-</define>
-<define name="double">
-    <data type="double"/>
-</define>
-<define name="anyURI">
-    <data type="anyURI"/>
-</define>
-<define name="base64Binary">
-    <data type="base64Binary"/>
-</define>
-<define name="ID">
-    <data type="ID"/>
-</define>
-<define name="IDREF">
-    <data type="IDREF"/>
-</define>
-<define name="boolean">
-    <choice>
-        <value>true</value>
-        <value>false</value>
-    </choice>
-</define>
-<define name="dateOrDateTime">
-    <choice>
-        <data type="date"/>
-        <data type="dateTime"/>
-    </choice>
-</define>
-<define name="timeOrDateTime">
-    <choice>
-        <data type="time"/>
-        <data type="dateTime"/>
-    </choice>
-</define>
-<define name="language">
-    <data type="token">
-        <param name="pattern">[A-Za-z]{1,8}(-[A-Za-z0-9]{1,8})*</param>
-    </data>
-</define>
-<define name="countryCode">
-    <data type="token">
-        <param name="pattern">[A-Za-z0-9]{1,8}</param>
-    </data>
-</define>
-<define name="languageCode">
-    <data type="token">
-        <param name="pattern">[A-Za-z]{1,8}</param>
-    </data>
-</define>
-<define name="character">
-    <data type="string">
-        <param name="length">1</param>
-    </data>
-</define>
-<define name="length">
-    <data type="string">
-        <param name="pattern">-?([0-9]+(\.[0-9]*)?|\.[0-9]+)((cm)|(mm)|(in)|(pt)|(pc)|(px))</param>
-
-    </data>
-</define>
-<define name="nonNegativeLength">
-    <data type="string">
-        <param name="pattern">([0-9]+(\.[0-9]*)?|\.[0-9]+)((cm)|(mm)|(in)|(pt)|(pc)|(px))</param>
-
-    </data>
-</define>
-<define name="positiveLength">
-    <data type="string">
-        <!-- A zero value is not allowed here -->
-        <param name="pattern">([0-9]+(\.[0-9]*)?|\.[0-9]+)((cm)|(mm)|(in)|(pt)|(pc)|(px))</param>
-
-    </data>
-</define>
-<define name="percent">
-    <data type="string">
-        <param name="pattern">-?([0-9]+(\.[0-9]*)?|\.[0-9]+)%</param>
-    </data>
-</define>
-<define name="relativeLength">
-    <data type="string">
-        <param name="pattern">[0-9]+\*</param>
-    </data>
-</define>
-<define name="coordinate">
-    <ref name="length"/>
-</define>
-<define name="distance">
-    <ref name="length"/>
-</define>
-<define name="color">
-    <data type="string">
-        <param name="pattern">#[0-9a-fA-F]{6}</param>
-    </data>
-</define>
-<define name="styleName">
-    <data type="NCName"/>
-</define>
-<define name="styleNameRef">
-    <choice>
-        <data type="NCName"/>
-        <empty/>
-    </choice>
-</define>
-<define name="styleNameRefs">
-    <list>
-        <zeroOrMore>
-            <data type="NCName"/>
-        </zeroOrMore>
-    </list>
-</define>
-<define name="variableName">
-    <data type="string"/>
-</define>
-<define name="formula">
-    <!-- A formula should start with a namespace prefix, -->
-    <!-- but has no restrictions-->
-    <data type="string"/>
-</define>
-
-<define name="targetFrameName">
-    <choice>
-        <value>_self</value>
-        <value>_blank</value>
-        <value>_parent</value>
-        <value>_top</value>
-        <ref name="string"/>
-    </choice>
-</define>
-
-<define name="valueType">
-    <choice>
-        <value>float</value>
-        <value>time</value>
-        <value>date</value>
-        <value>percentage</value>
-        <value>currency</value>
-        <value>boolean</value>
-        <value>string</value>
-    </choice>
-</define>
-
-<define name="points">
-    <data type="string">
-        <param name="pattern">-?[0-9]+,-?[0-9]+([ ]+-?[0-9]+,-?[0-9]+)*</param>
-    </data>
-</define>
-<define name="pathData">
-    <data type="string"/>
-</define>
-
-<define name="vector3D">
-    <data type="string">
-        <param name="pattern">\([ ]*-?([0-9]+(\.[0-9]*)?|\.[0-9]+)([ ]+-?([0-9]+(\.[0-9]*)?|\.[0-9]+)){2}[ ]*\)</param>
-
-    </data>
-</define>
-
-<define name="namespacedToken">
-    <data type="string">
-        <param name="pattern">[0-9a-zA-Z_]+:[0-9a-zA-Z._\-]+</param>
-    </data>
-</define>
-<define name="anyAttListOrElements">
-    <zeroOrMore>
-        <attribute>
-            <anyName/>
-            <text/>
-        </attribute>
-    </zeroOrMore>
-    <ref name="anyElements"/>
-</define>
-<define name="anyElements">
-    <zeroOrMore>
-        <element>
-            <anyName/>
-            <mixed>
-                <ref name="anyAttListOrElements"/>
-            </mixed>
-        </element>
-    </zeroOrMore>
-</define>
-</grammar>
diff --git a/apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-schema-v1.1.rng b/apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-schema-v1.1.rng
deleted file mode 100644
index 3ba6a687c4..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-schema-v1.1.rng
+++ /dev/null
@@ -1,17891 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    OASIS OpenDocument v1.1
-    OASIS Standard, 1 Feb 2007
-    Relax-NG Schema
-
-    $Id$
-
-    © 2002-2007 OASIS Open
-    © 1999-2007 Sun Microsystems, Inc.
--->
-
-<grammar
-    xmlns="http://relaxng.org/ns/structure/1.0"
-    xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
-
-    datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
-
-    xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-    xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0"
-    xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0"
-    xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
-    xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
-    xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
-    xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"
-    xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0"
-    xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
-    xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
-    xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0"
-    xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
-    xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
-    xmlns:anim="urn:oasis:names:tc:opendocument:xmlns:animation:1.0"
-
-    xmlns:dc="http://purl.org/dc/elements/1.1/"
-    xmlns:xlink="http://www.w3.org/1999/xlink"
-    xmlns:math="http://www.w3.org/1998/Math/MathML"
-    xmlns:xforms="http://www.w3.org/2002/xforms"
-
-    xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0"
-    xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"
-    xmlns:smil="urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0"
->
-<define name="office-process-content">
-    <optional>
-        <attribute name="office:process-content" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<start>
-    <choice>
-        <ref name="office-document"/>
-        <ref name="office-document-content"/>
-        <ref name="office-document-styles"/>
-        <ref name="office-document-meta"/>
-        <ref name="office-document-settings"/>
-    </choice>
-</start>
-<define name="office-document">
-    <element name="office:document">
-        <ref name="office-document-attrs"/>
-        <ref name="office-document-common-attrs"/>
-        <ref name="office-meta"/>
-        <ref name="office-settings"/>
-        <ref name="office-scripts"/>
-        <ref name="office-font-face-decls"/>
-        <ref name="office-styles"/>
-        <ref name="office-automatic-styles"/>
-        <ref name="office-master-styles"/>
-        <ref name="office-body"/>
-    </element>
-</define>
-<define name="office-document-content">
-    <element name="office:document-content">
-        <ref name="office-document-common-attrs"/>
-        <ref name="office-scripts"/>
-        <ref name="office-font-face-decls"/>
-        <ref name="office-automatic-styles"/>
-        <ref name="office-body"/>
-    </element>
-</define>
-<define name="office-document-styles">
-    <element name="office:document-styles">
-        <ref name="office-document-common-attrs"/>
-        <ref name="office-font-face-decls"/>
-        <ref name="office-styles"/>
-        <ref name="office-automatic-styles"/>
-        <ref name="office-master-styles"/>
-    </element>
-</define>
-<define name="office-document-meta">
-    <element name="office:document-meta">
-        <ref name="office-document-common-attrs"/>
-        <ref name="office-meta"/>
-    </element>
-</define>
-<define name="office-document-settings">
-    <element name="office:document-settings">
-        <ref name="office-document-common-attrs"/>
-        <ref name="office-settings"/>
-    </element>
-</define>
-<define name="office-document-common-attrs" combine="interleave">
-    <optional>
-        <attribute name="office:version">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="office-document-attrs" combine="interleave">
-    <attribute name="office:mimetype">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="office-meta">
-    <optional>
-        <element name="office:meta">
-            <ref name="office-meta-content"/>
-        </element>
-    </optional>
-</define>
-
-<define name="office-meta-content">
-    <ref name="anyElements"/>
-</define>
-
-<define name="office-meta-content-strict">
-    <zeroOrMore>
-        <ref name="office-meta-data"/>
-    </zeroOrMore>
-</define>
-<define name="office-body">
-    <element name="office:body">
-        <ref name="office-body-content"/>
-    </element>
-</define>
-<define name="office-body-content" combine="choice">
-    <element name="office:text">
-        <ref name="office-text-attlist"/>
-        <ref name="office-text-content-prelude"/>
-        <zeroOrMore>
-            <ref name="office-text-content-main"/>
-        </zeroOrMore>
-        <ref name="office-text-content-epilogue"/>
-    </element>
-</define>
-<define name="office-text-content-prelude">
-    <ref name="office-forms"/>
-    <ref name="text-tracked-changes"/>
-    <ref name="text-decls"/>
-    <ref name="table-decls"/>
-</define>
-<define name="office-text-content-main">
-    <choice>
-        <zeroOrMore>
-            <ref name="text-content"/>
-        </zeroOrMore>
-        <group>
-            <ref name="text-page-sequence"/>
-            <zeroOrMore>
-                <choice>
-                    <ref name="draw-a"/>
-                    <ref name="shape"/>
-                </choice>
-            </zeroOrMore>
-        </group>
-    </choice>
-</define>
-
-<define name="text-content">
-    <choice>
-        <ref name="text-h"/>
-        <ref name="text-p"/>
-        <ref name="text-list"/>
-        <ref name="text-numbered-paragraph"/>
-        <ref name="table-table"/>
-        <ref name="draw-a"/>
-        <ref name="text-section"/>
-        <ref name="text-soft-page-break"/> 
-        <ref name="text-table-of-content"/>
-        <ref name="text-illustration-index"/>
-        <ref name="text-table-index"/>
-        <ref name="text-object-index"/>
-        <ref name="text-user-index"/>
-        <ref name="text-alphabetical-index"/>
-        <ref name="text-bibliography"/>
-        <ref name="shape"/>
-        <ref name="change-marks"/>
-    </choice>
-</define>
-<define name="office-text-content-epilogue">
-    <ref name="table-functions"/>
-</define>
-<define name="office-text-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:global" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="office-text-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:use-soft-page-breaks" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="office-body-content" combine="choice">
-    <element name="office:drawing">
-        <ref name="office-drawing-attlist"/>
-        <ref name="office-drawing-content-prelude"/>
-        <ref name="office-drawing-content-main"/>
-        <ref name="office-drawing-content-epilogue"/>
-    </element>
-</define>
-
-<define name="office-drawing-attlist">
-    <empty/>
-</define>
-<define name="office-drawing-content-prelude">
-    <ref name="text-decls"/>
-    <ref name="table-decls"/>
-</define>
-<define name="office-drawing-content-main">
-    <zeroOrMore>
-        <ref name="draw-page"/>
-    </zeroOrMore>
-</define>
-<define name="office-drawing-content-epilogue">
-    <ref name="table-functions"/>
-</define>
-<define name="office-body-content" combine="choice">
-    <element name="office:presentation">
-        <ref name="office-presentation-attlist"/>
-        <ref name="office-presentation-content-prelude"/>
-        <ref name="office-presentation-content-main"/>
-        <ref name="office-presentation-content-epilogue"/>
-    </element>
-</define>
-
-<define name="office-presentation-attlist">
-    <empty/>
-</define>
-<define name="office-presentation-content-prelude">
-    <ref name="text-decls"/>
-    <ref name="table-decls"/>
-    <ref name="presentation-decls"/>
-</define>
-<define name="office-presentation-content-main">
-    <zeroOrMore>
-        <ref name="draw-page"/>
-    </zeroOrMore>
-</define>
-<define name="office-presentation-content-epilogue">
-    <ref name="presentation-settings"/>
-    <ref name="table-functions"/>
-</define>
-<define name="office-body-content" combine="choice">
-    <element name="office:spreadsheet">
-        <ref name="office-spreadsheet-attlist"/>
-        <ref name="office-spreadsheet-content-prelude"/>
-        <ref name="office-spreadsheet-content-main"/>
-        <ref name="office-spreadsheet-content-epilogue"/>
-    </element>
-</define>
-<define name="office-spreadsheet-content-prelude">
-    <optional>
-        <ref name="table-tracked-changes"/>    
-    </optional>
-    <ref name="text-decls"/>
-    <ref name="table-decls"/>
-</define>
-
-<define name="table-decls">
-    <optional>
-        <ref name="table-calculation-settings"/>    
-    </optional>
-    <optional>
-        <ref name="table-content-validations"/>    
-    </optional>
-    <optional>
-        <ref name="table-label-ranges"/>    
-    </optional>
-</define>
-<define name="office-spreadsheet-content-main">
-    <zeroOrMore>
-        <ref name="table-table"/>
-    </zeroOrMore>
-</define>
-<define name="office-spreadsheet-content-epilogue">
-    <ref name="table-functions"/>    
-</define>
-
-<define name="table-functions">
-    <optional>
-        <ref name="table-named-expressions"/>    
-    </optional>
-    <optional>
-        <ref name="table-database-ranges"/>    
-    </optional>
-    <optional>
-        <ref name="table-data-pilot-tables"/>    
-    </optional>
-    <optional>
-        <ref name="table-consolidation"/>    
-    </optional>
-    <optional>
-        <ref name="table-dde-links"/>    
-    </optional>
-</define>
-<define name="office-body-content" combine="choice">
-    <element name="office:chart">
-        <ref name="office-chart-attlist"/>
-        <ref name="office-chart-content-prelude"/>
-        <ref name="office-chart-content-main"/>
-        <ref name="office-chart-content-epilogue"/>
-    </element>
-</define>
-
-<define name="office-chart-attlist">
-    <empty/>
-</define>
-<define name="office-chart-content-prelude">
-    <ref name="text-decls"/>
-    <ref name="table-decls"/>
-</define>
-<define name="office-chart-content-main">
-    <ref name="chart-chart"/>
-</define>
-<define name="office-chart-content-epilogue">
-    <ref name="table-functions"/>    
-</define>
-<define name="office-body-content" combine="choice">
-    <element name="office:image">
-        <ref name="office-image-attlist"/>
-        <ref name="office-image-content-prelude"/>
-        <ref name="office-image-content-main"/>
-        <ref name="office-image-content-epilogue"/>
-    </element>
-</define>
-
-<define name="office-image-attlist">
-    <empty/>
-</define>
-<define name="office-image-content-prelude">
-    <empty/>
-</define>
-<define name="office-image-content-main">
-    <ref name="draw-frame"/>
-</define>
-<define name="office-image-content-epilogue">
-    <empty/>
-</define>
-<define name="office-settings">
-    <optional>
-        <element name="office:settings">
-            <oneOrMore>
-                <ref name="config-config-item-set"/>
-            </oneOrMore>
-        </element>
-    </optional>
-</define>
-<define name="config-config-item-set">
-    <element name="config:config-item-set">
-        <ref name="config-config-item-set-attlist"/>
-        <ref name="config-items"/>
-    </element>
-</define>
-
-<define name="config-items">
-    <oneOrMore>
-        <choice>
-            <ref name="config-config-item"/>
-            <ref name="config-config-item-set"/>
-            <ref name="config-config-item-map-named"/>
-            <ref name="config-config-item-map-indexed"/>
-        </choice>
-    </oneOrMore>
-</define>
-<define name="config-config-item-set-attlist" combine="interleave">
-    <attribute name="config:name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="config-config-item">
-    <element name="config:config-item">
-        <ref name="config-config-item-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="config-config-item-attlist" combine="interleave">
-    <attribute name="config:name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="config-config-item-attlist" combine="interleave">
-    <attribute name="config:type">
-        <choice>
-            <value>boolean</value>
-            <value>short</value>
-            <value>int</value>
-            <value>long</value>
-            <value>double</value>
-            <value>string</value>
-            <value>datetime</value>
-            <value>base64Binary</value>
-        </choice>
-    </attribute>
-</define>
-<define name="config-config-item-map-indexed">
-    <element name="config:config-item-map-indexed">
-        <ref name="config-config-item-map-indexed-attlist"/>
-        <oneOrMore>
-            <ref name="config-config-item-map-entry"/>
-        </oneOrMore>
-    </element>
-</define>
-<define name="config-config-item-map-indexed-attlist" combine="interleave">
-    <attribute name="config:name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="config-config-item-map-entry">
-    <element name="config:config-item-map-entry">
-        <ref name="config-config-item-map-entry-attlist"/>
-        <ref name="config-items"/>
-    </element>
-</define>
-<define name="config-config-item-map-entry-attlist" combine="interleave">
-    <optional>
-        <attribute name="config:name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="config-config-item-map-named">
-    <element name="config:config-item-map-named">
-        <ref name="config-config-item-map-named-attlist"/>
-        <oneOrMore>
-            <ref name="config-config-item-map-entry"/>
-        </oneOrMore>
-    </element>
-</define>
-<define name="config-config-item-map-named-attlist" combine="interleave">
-    <attribute name="config:name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="office-scripts">
-    <optional>
-        <element name="office:scripts">
-            <zeroOrMore>
-                <ref name="office-script"/>
-            </zeroOrMore>
-            <optional>
-                <ref name="office-event-listeners"/>
-            </optional>
-        </element>
-    </optional>
-</define>
-<define name="office-script">
-    <element name="office:script">
-        <ref name="office-script-attlist"/>
-        <mixed>
-            <ref name="anyElements"/>
-        </mixed>
-    </element>
-</define>
-<define name="office-script-attlist">
-    <attribute name="script:language">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="office-font-face-decls">
-    <optional>
-        <element name="office:font-face-decls">
-            <zeroOrMore>
-                <ref name="style-font-face"/>
-            </zeroOrMore>
-        </element>
-    </optional>
-</define>
-<define name="office-styles">
-    <optional>
-        <element name="office:styles">
-            <interleave>
-                <ref name="styles"/>
-                <zeroOrMore>
-                    <ref name="style-default-style"/>
-                </zeroOrMore>
-                <optional>
-                    <ref name="text-outline-style"/>
-                </optional>
-                <zeroOrMore>
-                    <ref name="text-notes-configuration"/>
-                </zeroOrMore>
-                <optional>
-                    <ref name="text-bibliography-configuration"/>
-                </optional>
-                <optional>
-                    <ref name="text-linenumbering-configuration"/>
-                </optional>
-                <zeroOrMore>
-                    <ref name="draw-gradient"/>
-                </zeroOrMore>
-                <zeroOrMore>
-                    <ref name="svg-linearGradient"/>
-                </zeroOrMore>
-                <zeroOrMore>
-                    <ref name="svg-radialGradient"/>
-                </zeroOrMore>
-                <zeroOrMore>
-                    <ref name="draw-hatch"/>
-                </zeroOrMore>
-                <zeroOrMore>
-                    <ref name="draw-fill-image"/>
-                </zeroOrMore>
-                <zeroOrMore>
-                    <ref name="draw-marker"/>
-                </zeroOrMore>
-                <zeroOrMore>
-                    <ref name="draw-stroke-dash"/>
-                </zeroOrMore>
-                <zeroOrMore>
-                    <ref name="draw-opacity"/>
-                </zeroOrMore>
-                <zeroOrMore>
-                    <ref name="style-presentation-page-layout"/>
-                </zeroOrMore>
-            </interleave>
-        </element>
-    </optional>
-</define>
-<define name="office-automatic-styles">
-    <optional>
-        <element name="office:automatic-styles">
-            <interleave>
-                <ref name="styles"/>
-                <zeroOrMore>
-                    <ref name="style-page-layout"/>
-                </zeroOrMore>
-            </interleave>
-        </element>
-    </optional>
-</define>
-<define name="office-master-styles">
-    <optional>
-        <element name="office:master-styles">
-            <interleave>
-                <zeroOrMore>
-                    <ref name="style-master-page"/>
-                </zeroOrMore>
-                <optional>
-                    <ref name="style-handout-master"/>
-                </optional>
-                <optional>
-                    <ref name="draw-layer-set"/>
-                </optional>
-            </interleave>
-        </element>
-    </optional>
-</define>
-
-<define name="styles">
-    <interleave>
-        <zeroOrMore>
-            <ref name="style-style"/>
-        </zeroOrMore>
-        <zeroOrMore>
-            <ref name="text-list-style"/>
-        </zeroOrMore>
-        <zeroOrMore>
-            <ref name="number-number-style"/>
-        </zeroOrMore>
-        <zeroOrMore>
-            <ref name="number-currency-style"/>
-        </zeroOrMore>
-        <zeroOrMore>
-            <ref name="number-percentage-style"/>
-        </zeroOrMore>
-        <zeroOrMore>
-            <ref name="number-date-style"/>
-        </zeroOrMore>
-        <zeroOrMore>
-            <ref name="number-time-style"/>
-        </zeroOrMore>
-        <zeroOrMore>
-            <ref name="number-boolean-style"/>
-        </zeroOrMore>
-        <zeroOrMore>
-            <ref name="number-text-style"/>
-        </zeroOrMore>
-    </interleave>
-</define>
-<define name="office-meta-data" combine="choice">
-    <element name="meta:generator">
-        <ref name="string"/>
-    </element>
-</define>
-<define name="office-meta-data" combine="choice">
-    <element name="dc:title">
-        <ref name="string"/>
-    </element>
-</define>
-<define name="office-meta-data" combine="choice">
-    <element name="dc:description">
-        <ref name="string"/>
-    </element>
-</define>
-<define name="office-meta-data" combine="choice">
-    <element name="dc:subject">
-        <ref name="string"/>
-    </element>
-</define>
-<define name="office-meta-data" combine="choice">
-    <element name="meta:keyword">
-        <ref name="string"/>
-    </element>
-</define>
-<define name="office-meta-data" combine="choice">
-    <element name="meta:initial-creator">
-        <ref name="string"/>
-    </element>
-</define>
-<define name="office-meta-data" combine="choice">
-    <ref name="dc-creator"/>
-</define>
-<define name="dc-creator">
-    <element name="dc:creator">
-        <ref name="string"/>
-    </element>
-</define>
-<define name="office-meta-data" combine="choice">
-    <element name="meta:printed-by">
-        <ref name="string"/>
-    </element>
-</define>
-<define name="office-meta-data" combine="choice">
-    <element name="meta:creation-date">
-        <ref name="dateTime"/>
-    </element>
-</define>
-<define name="office-meta-data" combine="choice">
-    <ref name="dc-date"/>
-</define>
-<define name="dc-date">
-    <element name="dc:date">
-        <ref name="dateTime"/>
-    </element>
-</define>
-<define name="office-meta-data" combine="choice">
-    <element name="meta:print-date">
-        <ref name="dateTime"/>
-    </element>
-</define>
-<define name="office-meta-data" combine="choice">
-    <element name="meta:template">
-        <attribute name="xlink:href">
-            <ref name="anyURI"/>
-        </attribute>
-        <optional>
-            <attribute name="xlink:type" a:defaultValue="simple">
-                <value>simple</value>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="xlink:actuate" a:defaultValue="onRequest">
-                <value>onRequest</value>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="xlink:title">
-                <ref name="string"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="meta:date">
-                <ref name="dateTime"/>
-            </attribute>
-        </optional>
-    </element>
-</define>
-<define name="office-meta-data" combine="choice">
-    <element name="meta:auto-reload">
-        <optional>
-            <attribute name="xlink:type" a:defaultValue="simple">
-                <value>simple</value>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="xlink:show" a:defaultValue="replace">
-                <value>replace</value>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="xlink:actuate" a:defaultValue="onLoad">
-                <value>onLoad</value>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="xlink:href">
-                <ref name="anyURI"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="meta:delay">
-                <ref name="duration"/>
-            </attribute>
-        </optional>
-    </element>
-</define>
-<define name="office-meta-data" combine="choice">
-    <element name="meta:hyperlink-behaviour">
-        <optional>
-            <attribute name="office:target-frame-name">
-                <ref name="targetFrameName"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="xlink:show">
-                <choice>
-                    <value>new</value>
-                    <value>replace</value>
-                </choice>
-            </attribute>
-        </optional>
-    </element>
-</define>
-<define name="office-meta-data" combine="choice">
-    <element name="dc:language">
-        <ref name="language"/>
-    </element>
-</define>
-<define name="office-meta-data" combine="choice">
-    <element name="meta:editing-cycles">
-        <ref name="nonNegativeInteger"/>
-    </element>
-</define>
-<define name="office-meta-data" combine="choice">
-    <element name="meta:editing-duration">
-        <ref name="duration"/>
-    </element>
-</define>
-<define name="office-meta-data" combine="choice">
-    <element name="meta:document-statistic">
-        <optional>
-            <attribute name="meta:page-count">
-                <ref name="nonNegativeInteger"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="meta:table-count">
-                <ref name="nonNegativeInteger"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="meta:draw-count">
-                <ref name="nonNegativeInteger"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="meta:image-count">
-                <ref name="nonNegativeInteger"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="meta:ole-object-count">
-                <ref name="nonNegativeInteger"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="meta:object-count">
-                <ref name="nonNegativeInteger"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="meta:paragraph-count">
-                <ref name="nonNegativeInteger"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="meta:word-count">
-                <ref name="nonNegativeInteger"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="meta:character-count">
-                <ref name="nonNegativeInteger"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="frame-count">
-                <ref name="nonNegativeInteger"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="sentence-count">
-                <ref name="nonNegativeInteger"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="syllable-count">
-                <ref name="nonNegativeInteger"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="non-whitespace-character-count">
-                <ref name="nonNegativeInteger"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="meta:row-count">
-                <ref name="nonNegativeInteger"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="meta:cell-count">
-                <ref name="nonNegativeInteger"/>
-            </attribute>
-        </optional>
-    </element>
-</define>
-<define name="office-meta-data" combine="choice">
-    <element name="meta:user-defined">
-        <attribute name="meta:name">
-            <ref name="string"/>
-        </attribute>
-        <choice>
-            <group>
-                <attribute name="meta:value-type">
-                    <value>float</value>
-                </attribute>
-                <ref name="double"/>
-            </group>
-            <group>
-                <attribute name="meta:value-type">
-                    <value>date</value>
-                </attribute>
-                <ref name="dateOrDateTime"/>
-            </group>
-            <group>
-                <attribute name="meta:value-type">
-                    <value>time</value>
-                </attribute>
-                <ref name="duration"/>
-            </group>
-            <group>
-                <attribute name="meta:value-type">
-                    <value>boolean</value>
-                </attribute>
-                <ref name="boolean"/>
-            </group>
-            <group>
-                <attribute name="meta:value-type">
-                    <value>string</value>
-                </attribute>
-                <ref name="string"/>
-            </group>
-            <text/>
-        </choice>
-    </element>
-</define>
-<define name="text-h">
-    <element name="text:h">
-        <ref name="heading-attrs"/>
-        <ref name="paragraph-attrs"/>
-        <optional>
-            <ref name="text-number"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="paragraph-content"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="heading-attrs" combine="interleave">
-    <attribute name="text:outline-level">
-        <ref name="positiveInteger"/>
-    </attribute>
-</define>
-<define name="heading-attrs" combine="interleave">
-    <optional>
-        <attribute name="text:restart-numbering" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="heading-attrs" combine="interleave">
-    <optional>
-        <attribute name="text:start-value">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="heading-attrs" combine="interleave">
-    <optional>
-        <attribute name="text:is-list-header" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-number">
-    <element name="text:number">
-        <ref name="string"/>
-    </element>
-</define>
-<define name="text-p">
-    <element name="text:p">
-        <ref name="paragraph-attrs"/>
-        <zeroOrMore>
-            <ref name="paragraph-content"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="paragraph-attrs">
-    <optional>
-        <attribute name="text:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="text:class-names">
-            <ref name="styleNameRefs"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="text:cond-style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="paragraph-attrs" combine="interleave">
-    <optional>
-        <ref name="text-id"/>
-    </optional>
-</define>
-<define name="text-page-sequence">
-    <element name="text:page-sequence">
-        <oneOrMore>
-            <ref name="text-page"/>
-        </oneOrMore>
-    </element>
-</define>
-<define name="text-page">
-    <element name="text:page">
-        <ref name="text-page-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="text-page-attlist">
-    <attribute name="text:master-page-name">
-        <ref name="styleNameRef"/>
-    </attribute>
-</define>
-<define name="text-list">
-    <element name="text:list">
-        <ref name="text-list-attr"/>
-        <optional>
-            <ref name="text-list-header"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="text-list-item"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="text-list-attr" combine="interleave">
-    <optional>
-        <attribute name="text:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-list-attr" combine="interleave">
-    <optional>
-        <attribute name="text:continue-numbering">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-list-item">
-    <element name="text:list-item">
-        <ref name="text-list-item-attr"/>
-        <ref name="text-list-item-content"/>
-    </element>
-</define>
-<define name="text-list-item-content">
-    <optional>
-        <ref name="text-number"/>
-    </optional>
-    <zeroOrMore>
-        <choice>
-            <ref name="text-p"/>
-            <ref name="text-h"/>
-            <ref name="text-list"/>
-            <ref name="text-soft-page-break"/>
-        </choice>
-    </zeroOrMore>
-</define>
-<define name="text-list-item-attr" combine="interleave">
-    <optional>
-        <attribute name="text:start-value">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-list-header">
-    <element name="text:list-header">
-        <ref name="text-list-item-content"/>
-    </element>
-</define>
-<define name="text-numbered-paragraph">
-    <element name="text:numbered-paragraph">
-        <ref name="text-numbered-paragraph-attr"/>
-        <optional>
-            <ref name="text-number"/>
-        </optional>
-        <choice>
-            <ref name="text-p"/>
-            <ref name="text-h"/>
-        </choice>
-    </element>
-</define>
-<define name="text-numbered-paragraph-attr" combine="interleave">
-    <optional>
-        <attribute name="text:level" a:defaultValue="1">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-numbered-paragraph-attr" combine="interleave">
-    <ref name="text-list-attr"/>
-</define>
-<define name="text-numbered-paragraph-attr" combine="interleave">
-    <ref name="text-list-item-attr"/>
-</define>
-<define name="text-section">
-    <element name="text:section">
-        <ref name="text-section-attr"/>
-        <choice>
-            <ref name="text-section-source"/>
-            <ref name="text-section-source-dde"/>
-            <empty/>
-        </choice>
-        <zeroOrMore>
-            <ref name="text-content"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="text-section-attr" combine="interleave">
-    <ref name="sectionAttr"/>
-</define>
-<define name="sectionAttr" combine="interleave">
-    <optional>
-        <attribute name="text:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="sectionAttr" combine="interleave">
-    <attribute name="text:name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="sectionAttr" combine="interleave">
-    <optional>
-        <attribute name="text:protected">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="sectionAttr" combine="interleave">
-    <optional>
-        <attribute name="text:protection-key">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-section-attr" combine="interleave">
-    <choice>
-        <attribute name="text:display">
-            <choice>
-                <value>true</value>
-                <value>none</value>
-            </choice>
-        </attribute>
-        <group>
-            <attribute name="text:display">
-                <value>condition</value>
-            </attribute>
-            <attribute name="text:condition">
-                <ref name="string"/>
-            </attribute>
-        </group>
-        <empty/>
-    </choice>
-</define>
-<define name="text-section-source">
-    <element name="text:section-source">
-        <ref name="text-section-source-attr"/>
-    </element>
-</define>
-<define name="text-section-source-attr" combine="interleave">
-    <optional>
-        <attribute name="xlink:href">
-            <ref name="anyURI"/>
-        </attribute>
-        <optional>
-            <attribute name="xlink:type" a:defaultValue="simple">
-                <value>simple</value>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="xlink:show" a:defaultValue="embed">
-                <value>embed</value>
-            </attribute>
-        </optional>
-    </optional>
-</define>
-<define name="text-section-source-attr" combine="interleave">
-    <optional>
-        <attribute name="text:section-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-section-source-attr" combine="interleave">
-    <optional>
-        <attribute name="text:filter-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-section-source-dde">
-    <ref name="office-dde-source"/>
-</define>
-<define name="text-tracked-changes">
-    <optional>
-        <element name="text:tracked-changes">
-            <ref name="text-tracked-changes-attr"/>
-            <zeroOrMore>
-                <ref name="text-changed-region"/>
-            </zeroOrMore>
-        </element>
-    </optional>
-</define>
-<define name="text-tracked-changes-attr" combine="interleave">
-    <optional>
-        <attribute name="text:track-changes" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-changed-region">
-    <element name="text:changed-region">
-        <ref name="text-changed-region-attr"/>
-        <ref name="text-changed-region-content"/>
-    </element>
-</define>
-<define name="text-changed-region-attr" combine="interleave">
-    <attribute name="text:id">
-        <ref name="ID"/>
-    </attribute>
-</define>
-<define name="text-changed-region-content" combine="choice">
-    <element name="text:insertion">
-        <ref name="office-change-info"/>
-    </element>
-</define>
-<define name="text-changed-region-content" combine="choice">
-    <element name="text:deletion">
-        <ref name="office-change-info"/>
-        <zeroOrMore>
-            <ref name="text-content"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="text-changed-region-content" combine="choice">
-    <element name="text:format-change">
-        <ref name="office-change-info"/>
-    </element>
-</define>
-<define name="change-marks">
-    <choice>
-        <element name="text:change">
-            <ref name="change-mark-attr"/>
-        </element>
-        <element name="text:change-start">
-            <ref name="change-mark-attr"/>
-        </element>
-        <element name="text:change-end">
-            <ref name="change-mark-attr"/>
-        </element>
-    </choice>
-</define>
-<define name="change-mark-attr">
-    <attribute name="text:change-id">
-        <ref name="IDREF"/>
-    </attribute>
-</define>
-<define name="text-soft-page-break">
-    <element name="text:soft-page-break">
-        <empty/>
-    </element>
-</define>
-<define name="text-decls">
-    <optional>
-        <element name="text:variable-decls">
-            <zeroOrMore>
-                <ref name="text-variable-decl"/>
-            </zeroOrMore>
-        </element>
-    </optional>
-    <optional>
-        <element name="text:sequence-decls">
-            <zeroOrMore>
-                <ref name="text-sequence-decl"/>
-            </zeroOrMore>
-        </element>
-    </optional>
-    <optional>
-        <element name="text:user-field-decls">
-            <zeroOrMore>
-                <ref name="text-user-field-decl"/>
-            </zeroOrMore>
-        </element>
-    </optional>
-    <optional>
-        <element name="text:dde-connection-decls">
-            <zeroOrMore>
-                <ref name="text-dde-connection-decl"/>
-            </zeroOrMore>
-        </element>
-    </optional>
-    <optional>
-        <ref name="text-alphabetical-index-auto-mark-file"/>
-    </optional>
-</define>
-<define name="paragraph-content" combine="choice">
-    <text/>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:s">
-        <optional>
-            <attribute name="text:c">
-                <ref name="nonNegativeInteger"/>
-            </attribute>
-        </optional>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:tab">
-        <ref name="text-tab-attr"/>
-    </element>
-</define>
-<define name="text-tab-attr">
-    <optional>
-        <attribute name="text:tab-ref">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:line-break">
-        <empty/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <ref name="text-soft-page-break"/>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:span">
-        <optional>
-            <attribute name="text:style-name">
-                <ref name="styleNameRef"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="text:class-names">
-                <ref name="styleNameRefs"/>
-            </attribute>
-        </optional>
-        <zeroOrMore>
-            <ref name="paragraph-content"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:a">
-        <ref name="text-a-attlist"/>
-        <optional>
-            <ref name="office-event-listeners"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="paragraph-content"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="text-a-attlist" combine="interleave">
-    <optional>
-        <attribute name="office:name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-a-attlist" combine="interleave">
-    <optional>
-        <attribute name="office:title">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-a-attlist" combine="interleave">
-    <attribute name="xlink:href">
-        <ref name="anyURI"/>
-    </attribute>
-    <optional>
-        <attribute name="xlink:type" a:defaultValue="simple">
-            <value>simple</value>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="xlink:actuate" a:defaultValue="onRequest">
-            <value>onRequest</value>
-        </attribute>
-    </optional>
-</define>
-<define name="text-a-attlist" combine="interleave">
-    <optional>
-        <attribute name="office:target-frame-name">
-            <ref name="targetFrameName"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="xlink:show">
-            <choice>
-                <value>new</value>
-                <value>replace</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="text-a-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="text:visited-style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="paragraph-content" combine="choice">
-    <choice>
-        <element name="text:bookmark">
-            <attribute name="text:name">
-                <ref name="string"/>
-            </attribute>
-        </element>
-        <element name="text:bookmark-start">
-            <attribute name="text:name">
-                <ref name="string"/>
-            </attribute>
-        </element>
-        <element name="text:bookmark-end">
-            <attribute name="text:name">
-                <ref name="string"/>
-            </attribute>
-        </element>
-    </choice>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:reference-mark">
-        <attribute name="text:name">
-            <ref name="string"/>
-        </attribute>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <choice>
-        <element name="text:reference-mark-start">
-            <attribute name="text:name">
-                <ref name="string"/>
-            </attribute>
-        </element>
-        <element name="text:reference-mark-end">
-            <attribute name="text:name">
-                <ref name="string"/>
-            </attribute>
-        </element>
-    </choice>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:note">
-        <ref name="text-note-class"/>
-        <optional>
-            <attribute name="text:id">
-                <ref name="string"/>
-            </attribute>
-        </optional>
-        <element name="text:note-citation">
-            <optional>
-                <attribute name="text:label">
-                    <ref name="string"/>
-                </attribute>
-            </optional>
-            <text/>
-        </element>
-        <element name="text:note-body">
-            <zeroOrMore>
-                <ref name="text-content"/>
-            </zeroOrMore>
-        </element>
-    </element>
-</define>
-<define name="text-note-class">
-    <attribute name="text:note-class">
-        <choice>
-            <value>footnote</value>
-            <value>endnote</value>
-        </choice>
-    </attribute>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:ruby">
-        <optional>
-            <attribute name="text:style-name">
-                <ref name="styleNameRef"/>
-            </attribute>
-        </optional>
-        <element name="text:ruby-base">
-            <ref name="paragraph-content"/>
-        </element>
-        <element name="text:ruby-text">
-            <optional>
-                <attribute name="text:style-name">
-                    <ref name="styleNameRef"/>
-                </attribute>
-            </optional>
-            <text/>
-        </element>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <ref name="office-annotation"/>
-</define>
-<define name="paragraph-content" combine="choice">
-    <ref name="change-marks"/>
-</define>
-<define name="paragraph-content" combine="choice">
-    <choice>
-        <ref name="shape"/>
-        <ref name="draw-a"/>
-    </choice>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:date">
-        <ref name="text-date-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="text-date-attlist" combine="interleave">
-    <interleave>
-        <ref name="common-field-fixed-attlist"/>
-        <ref name="common-field-data-style-name-attlist"/>
-    </interleave>
-</define>
-<define name="text-date-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:date-value">
-            <ref name="dateOrDateTime"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-date-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:date-adjust">
-            <ref name="duration"/>
-        </attribute>
-    </optional>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:time">
-        <ref name="text-time-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="text-time-attlist" combine="interleave">
-    <interleave>
-        <ref name="common-field-fixed-attlist"/>
-        <ref name="common-field-data-style-name-attlist"/>
-    </interleave>
-</define>
-<define name="text-time-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:time-value">
-            <ref name="timeOrDateTime"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-time-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:time-adjust">
-            <ref name="duration"/>
-        </attribute>
-    </optional>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:page-number">
-        <ref name="text-page-number-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="text-page-number-attlist" combine="interleave">
-    <interleave>
-        <ref name="common-field-num-format-attlist"/>
-        <ref name="common-field-fixed-attlist"/>
-    </interleave>
-</define>
-<define name="text-page-number-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:page-adjust">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-page-number-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:select-page">
-            <choice>
-                <value>previous</value>
-                <value>current</value>
-                <value>next</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:page-continuation">
-        <ref name="text-page-continuation-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="text-page-continuation-attlist" combine="interleave">
-    <attribute name="text:select-page">
-        <choice>
-            <value>previous</value>
-            <value>next</value>
-        </choice>
-    </attribute>
-</define>
-<define name="text-page-continuation-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:string-value">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:sender-firstname">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:sender-lastname">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:sender-initials">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:sender-title">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:sender-position">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:sender-email">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:sender-phone-private">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:sender-fax">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:sender-company">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:sender-phone-work">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:sender-street">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:sender-city">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:sender-postal-code">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:sender-country">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:sender-state-or-province">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:author-name">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:author-initials">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:chapter">
-        <ref name="text-chapter-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="text-chapter-attlist" combine="interleave">
-    <attribute name="text:display">
-        <choice>
-            <value>name</value>
-            <value>number</value>
-            <value>number-and-name</value>
-            <value>plain-number-and-name</value>
-            <value>plain-number</value>
-        </choice>
-    </attribute>
-</define>
-<define name="text-chapter-attlist" combine="interleave">
-    <attribute name="text:outline-level">
-        <ref name="nonNegativeInteger"/>
-    </attribute>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:file-name">
-        <ref name="text-file-name-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="text-file-name-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:display">
-            <choice>
-                <value>full</value>
-                <value>path</value>
-                <value>name</value>
-                <value>name-and-extension</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="text-file-name-attlist" combine="interleave">
-    <ref name="common-field-fixed-attlist"/>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:template-name">
-        <ref name="text-template-name-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="text-template-name-attlist">
-    <optional>
-        <attribute name="text:display">
-            <choice>
-                <value>full</value>
-                <value>path</value>
-                <value>name</value>
-                <value>name-and-extension</value>
-                <value>area</value>
-                <value>title</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:sheet-name">
-        <text/>
-    </element>
-</define>
-<define name="text-variable-decl">
-    <element name="text:variable-decl">
-        <ref name="common-field-name-attlist"/>
-        <ref name="common-value-type-attlist"/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:variable-set">
-        <interleave>
-            <ref name="common-field-name-attlist"/>
-            <ref name="common-field-formula-attlist"/>
-            <ref name="common-value-and-type-attlist"/>
-            <ref name="common-field-display-value-none-attlist"/>
-            <ref name="common-field-data-style-name-attlist"/>
-        </interleave>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:variable-get">
-        <interleave>
-            <ref name="common-field-name-attlist"/>
-            <ref name="common-field-display-value-formula-attlist"/>
-            <ref name="common-field-data-style-name-attlist"/>
-        </interleave>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:variable-input">
-        <interleave>
-            <ref name="common-field-name-attlist"/>
-            <ref name="common-field-description-attlist"/>
-            <ref name="common-value-type-attlist"/>
-            <ref name="common-field-display-value-none-attlist"/>
-            <ref name="common-field-data-style-name-attlist"/>
-        </interleave>
-        <text/>
-    </element>
-</define>
-<define name="text-user-field-decl">
-    <element name="text:user-field-decl">
-        <ref name="common-field-name-attlist"/>
-        <optional>
-            <ref name="common-field-formula-attlist"/>
-        </optional>
-        <ref name="common-value-and-type-attlist"/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:user-field-get">
-        <interleave>
-            <ref name="common-field-name-attlist"/>
-            <ref name="common-field-display-value-formula-none-attlist"/>
-            <ref name="common-field-data-style-name-attlist"/>
-        </interleave>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:user-field-input">
-        <interleave>
-            <ref name="common-field-name-attlist"/>
-            <ref name="common-field-description-attlist"/>
-            <ref name="common-field-data-style-name-attlist"/>
-        </interleave>
-        <text/>
-    </element>
-</define>
-<define name="text-sequence-decl">
-    <element name="text:sequence-decl">
-        <ref name="text-sequence-decl-attlist"/>
-    </element>
-</define>
-<define name="text-sequence-decl-attlist" combine="interleave">
-    <ref name="common-field-name-attlist"/>
-</define>
-<define name="text-sequence-decl-attlist" combine="interleave">
-    <attribute name="text:display-outline-level">
-        <ref name="nonNegativeInteger"/>
-    </attribute>
-</define>
-<define name="text-sequence-decl-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:separation-character">
-            <ref name="character"/>
-        </attribute>
-    </optional>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:sequence">
-        <interleave>
-            <ref name="common-field-name-attlist"/>
-            <ref name="common-field-formula-attlist"/>
-            <ref name="common-field-num-format-attlist"/>
-            <ref name="text-sequence-ref-name"/>
-        </interleave>
-        <text/>
-    </element>
-</define>
-<define name="text-sequence-ref-name">
-    <optional>
-        <attribute name="text:ref-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:expression">
-        <interleave>
-            <ref name="common-field-formula-attlist"/>
-            <optional>
-                <ref name="common-value-and-type-attlist"/>
-            </optional>
-            <ref name="common-field-display-value-formula-attlist"/>
-            <ref name="common-field-data-style-name-attlist"/>
-        </interleave>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:text-input">
-        <ref name="common-field-description-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:initial-creator">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:creation-date">
-        <interleave>
-            <ref name="common-field-fixed-attlist"/>
-            <ref name="common-field-data-style-name-attlist"/>
-            <optional>
-                <attribute name="text:date-value">
-                    <ref name="dateOrDateTime"/>
-                </attribute>
-            </optional>
-        </interleave>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:creation-time">
-        <interleave>
-            <ref name="common-field-fixed-attlist"/>
-            <ref name="common-field-data-style-name-attlist"/>
-            <optional>
-                <attribute name="text:time-value">
-                    <ref name="timeOrDateTime"/>
-                </attribute>
-            </optional>
-        </interleave>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:description">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:user-defined">
-        <interleave>
-            <ref name="common-field-fixed-attlist"/>
-            <attribute name="text:name">
-                <ref name="string"/>
-            </attribute>
-            <ref name="common-field-data-style-name-attlist"/>
-            <optional>
-                <attribute name="office:value">
-                    <ref name="double"/>
-                </attribute>
-            </optional>
-            <optional>
-                <attribute name="office:date-value">
-                    <ref name="dateOrDateTime"/>
-                </attribute>
-            </optional>
-            <optional>
-                <attribute name="office:time-value">
-                    <ref name="duration"/>
-                </attribute>
-            </optional>
-            <optional>
-                <attribute name="office:boolean-value">
-                    <ref name="boolean"/>
-                </attribute>
-            </optional>
-            <optional>
-                <attribute name="office:string-value">
-                    <ref name="string"/>
-                </attribute>
-            </optional>
-        </interleave>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:print-time">
-        <interleave>
-            <ref name="common-field-fixed-attlist"/>
-            <ref name="common-field-data-style-name-attlist"/>
-            <optional>
-                <attribute name="text:time-value">
-                    <ref name="time"/>
-                </attribute>
-            </optional>
-        </interleave>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:print-date">
-        <interleave>
-            <ref name="common-field-fixed-attlist"/>
-            <ref name="common-field-data-style-name-attlist"/>
-            <optional>
-                <attribute name="text:date-value">
-                    <ref name="date"/>
-                </attribute>
-            </optional>
-        </interleave>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:printed-by">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:title">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:subject">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:keywords">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:editing-cycles">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:editing-duration">
-        <interleave>
-            <ref name="common-field-fixed-attlist"/>
-            <ref name="common-field-data-style-name-attlist"/>
-            <optional>
-                <attribute name="text:duration">
-                    <ref name="duration"/>
-                </attribute>
-            </optional>
-        </interleave>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:modification-time">
-        <interleave>
-            <ref name="common-field-fixed-attlist"/>
-            <ref name="common-field-data-style-name-attlist"/>
-            <optional>
-                <attribute name="text:time-value">
-                    <ref name="time"/>
-                </attribute>
-            </optional>
-        </interleave>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:modification-date">
-        <interleave>
-            <ref name="common-field-fixed-attlist"/>
-            <ref name="common-field-data-style-name-attlist"/>
-            <optional>
-                <attribute name="text:date-value">
-                    <ref name="date"/>
-                </attribute>
-            </optional>
-        </interleave>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:creator">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element>
-        <choice>
-            <name>text:page-count</name>
-            <name>text:paragraph-count</name>
-            <name>text:word-count</name>
-            <name>text:character-count</name>
-            <name>text:table-count</name>
-            <name>text:image-count</name>
-            <name>text:object-count</name>
-        </choice>
-        <ref name="common-field-num-format-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="common-field-database-table">
-    <ref name="common-field-database-table-attlist"/>
-    <ref name="common-field-database-name"/>
-</define>
-<define name="common-field-database-name" combine="choice">
-    <optional>
-        <attribute name="text:database-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-field-database-name" combine="choice">
-    <ref name="form-connection-resource"/>
-</define>
-<define name="common-field-database-table-attlist" combine="interleave">
-    <attribute name="text:table-name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="common-field-database-table-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:table-type">
-            <choice>
-                <value>table</value>
-                <value>query</value>
-                <value>command</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:database-display">
-        <ref name="text-database-display-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="text-database-display-attlist" combine="interleave">
-    <ref name="common-field-database-table"/>
-</define>
-<define name="text-database-display-attlist" combine="interleave">
-    <ref name="common-field-data-style-name-attlist"/>
-</define>
-<define name="text-database-display-attlist" combine="interleave">
-    <attribute name="text:column-name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:database-next">
-        <ref name="text-database-next-attlist"/>
-    </element>
-</define>
-<define name="text-database-next-attlist" combine="interleave">
-    <ref name="common-field-database-table"/>
-</define>
-<define name="text-database-next-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:condition">
-            <ref name="formula"/>
-        </attribute>
-    </optional>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:database-row-select">
-        <ref name="text-database-row-select-attlist"/>
-    </element>
-</define>
-<define name="text-database-row-select-attlist" combine="interleave">
-    <ref name="common-field-database-table"/>
-</define>
-<define name="text-database-row-select-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:condition">
-            <ref name="formula"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-database-row-select-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:row-number">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:database-row-number">
-        <interleave>
-            <ref name="common-field-database-table"/>
-            <ref name="common-field-num-format-attlist"/>
-            <optional>
-                <attribute name="text:value">
-                    <ref name="nonNegativeInteger"/>
-                </attribute>
-            </optional>
-        </interleave>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:database-name">
-        <ref name="common-field-database-table"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:page-variable-set">
-        <ref name="text-set-page-variable-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="text-set-page-variable-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:active">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-set-page-variable-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:page-adjust">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:page-variable-get">
-        <ref name="text-get-page-variable-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="text-get-page-variable-attlist" combine="interleave">
-    <ref name="common-field-num-format-attlist"/>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:placeholder">
-        <ref name="text-placeholder-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="text-placeholder-attlist" combine="interleave">
-    <attribute name="text:placeholder-type">
-        <choice>
-            <value>text</value>
-            <value>table</value>
-            <value>text-box</value>
-            <value>image</value>
-            <value>object</value>
-        </choice>
-    </attribute>
-</define>
-<define name="text-placeholder-attlist" combine="interleave">
-    <ref name="common-field-description-attlist"/>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:conditional-text">
-        <ref name="text-conditional-text-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="text-conditional-text-attlist" combine="interleave">
-    <attribute name="text:condition">
-        <ref name="formula"/>
-    </attribute>
-</define>
-<define name="text-conditional-text-attlist" combine="interleave">
-    <attribute name="text:string-value-if-true">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="text-conditional-text-attlist" combine="interleave">
-    <attribute name="text:string-value-if-false">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="text-conditional-text-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:current-value">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:hidden-text">
-        <ref name="text-hidden-text-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="text-hidden-text-attlist" combine="interleave">
-    <attribute name="text:condition">
-        <ref name="formula"/>
-    </attribute>
-</define>
-<define name="text-hidden-text-attlist" combine="interleave">
-    <attribute name="text:string-value">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="text-hidden-text-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:is-hidden">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element>
-        <choice>
-            <name>text:reference-ref</name>
-            <name>text:bookmark-ref</name>
-        </choice>
-        <interleave>
-            <ref name="text-common-ref-content"/>
-            <ref name="text-ref-content"/>
-        </interleave>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:note-ref">
-        <interleave>
-            <ref name="text-common-ref-content"/>
-            <ref name="text-note-ref-content"/>
-            <ref name="text-ref-content"/>
-        </interleave>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:sequence-ref">
-        <interleave>
-            <ref name="text-common-ref-content"/>
-            <ref name="text-sequence-ref-content"/>
-        </interleave>
-    </element>
-</define>
-<define name="text-common-ref-content" combine="interleave">
-    <text/>
-</define>
-<define name="text-common-ref-content" combine="interleave">
-    <optional>
-        <attribute name="text:ref-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-note-ref-content" combine="interleave">
-    <ref name="text-note-class"/>
-</define>
-<define name="text-ref-content" combine="interleave">
-    <optional>
-        <attribute name="text:reference-format">
-            <choice>
-                <value>page</value>
-                <value>chapter</value>
-                <value>direction</value>
-                <value>text</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="text-sequence-ref-content" combine="interleave">
-    <optional>
-        <attribute name="text:reference-format">
-            <choice>
-                <value>page</value>
-                <value>chapter</value>
-                <value>direction</value>
-                <value>text</value>
-                <value>category-and-value</value>
-                <value>caption</value>
-                <value>value</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:script">
-        <interleave>
-            <choice>
-                <group>
-                    <attribute name="xlink:href">
-                        <ref name="anyURI"/>
-                    </attribute>
-                    <optional>
-                        <attribute name="xlink:type" a:defaultValue="simple">
-                            <value>simple</value>
-                        </attribute>
-                    </optional>
-                </group>    
-                <text/>
-            </choice>
-            <optional>
-                <attribute name="script:language">
-                    <ref name="string"/>
-                </attribute>
-            </optional>
-        </interleave>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:execute-macro">
-        <optional>
-            <attribute name="text:name">
-                <ref name="string"/>
-            </attribute>
-        </optional>
-        <optional>
-            <ref name="office-event-listeners"/>
-        </optional>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:hidden-paragraph">
-        <ref name="text-hidden-paragraph-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="text-hidden-paragraph-attlist" combine="interleave">
-    <attribute name="text:condition">
-        <ref name="formula"/>
-    </attribute>
-</define>
-<define name="text-hidden-paragraph-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:is-hidden">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:dde-connection">
-        <attribute name="text:connection-name">
-            <ref name="string"/>
-        </attribute>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:measure">
-        <attribute name="text:kind">
-            <choice>
-                <value>value</value>
-                <value>unit</value>
-                <value>gap</value>
-            </choice>
-        </attribute>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:table-formula">
-        <interleave>
-            <ref name="common-field-formula-attlist"/>
-            <ref name="common-field-display-value-formula-attlist"/>
-            <ref name="common-field-data-style-name-attlist"/>
-        </interleave>
-        <text/>
-    </element>
-</define>
-<define name="common-value-type-attlist">
-    <attribute name="office:value-type">
-        <ref name="valueType"/>
-    </attribute>
-</define>
-<define name="common-value-and-type-attlist">
-    <choice>
-        <group>
-            <attribute name="office:value-type">
-                <value>float</value>
-            </attribute>
-            <attribute name="office:value">
-                <ref name="double"/>
-            </attribute>
-        </group>
-        <group>
-            <attribute name="office:value-type">
-                <value>percentage</value>
-            </attribute>
-            <attribute name="office:value">
-                <ref name="double"/>
-            </attribute>
-        </group>
-        <group>
-            <attribute name="office:value-type">
-                <value>currency</value>
-            </attribute>
-            <attribute name="office:value">
-                <ref name="double"/>
-            </attribute>
-            <optional>
-                <attribute name="office:currency">
-                    <ref name="string"/>
-                </attribute>
-            </optional>
-        </group>
-        <group>
-            <attribute name="office:value-type">
-                <value>date</value>
-            </attribute>
-            <attribute name="office:date-value">
-                <ref name="dateOrDateTime"/>
-            </attribute>
-        </group>
-        <group>
-            <attribute name="office:value-type">
-                <value>time</value>
-            </attribute>
-            <attribute name="office:time-value">
-                <ref name="duration"/>
-            </attribute>
-        </group>
-        <group>
-            <attribute name="office:value-type">
-                <value>boolean</value>
-            </attribute>
-            <attribute name="office:boolean-value">
-                <ref name="boolean"/>
-            </attribute>
-        </group>
-        <group>
-            <attribute name="office:value-type">
-                <value>string</value>
-            </attribute>
-            <optional>
-                <attribute name="office:string-value">
-                    <ref name="string"/>
-                </attribute>
-            </optional>
-        </group>
-    </choice>
-</define>
-<define name="common-field-fixed-attlist">
-    <optional>
-        <attribute name="text:fixed">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-field-name-attlist">
-    <attribute name="text:name">
-        <ref name="variableName"/>
-    </attribute>
-</define>
-<define name="common-field-description-attlist">
-    <optional>
-        <attribute name="text:description">
-            <text/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-field-display-value-none-attlist">
-    <optional>
-        <attribute name="text:display">
-            <choice>
-                <value>value</value>
-                <value>none</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="common-field-display-value-formula-none-attlist">
-    <optional>
-        <attribute name="text:display">
-            <choice>
-                <value>value</value>
-                <value>formula</value>
-                <value>none</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="common-field-display-value-formula-attlist">
-    <optional>
-        <attribute name="text:display">
-            <choice>
-                <value>value</value>
-                <value>formula</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="common-field-formula-attlist">
-    <optional>
-        <attribute name="text:formula">
-            <ref name="formula"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-field-data-style-name-attlist">
-    <optional>
-        <attribute name="style:data-style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-field-num-format-attlist">
-    <optional>
-        <ref name="common-num-format-attlist"/>
-    </optional>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:toc-mark-start">
-        <ref name="text-toc-mark-start-attrs"/>
-    </element>
-</define>
-<define name="text-toc-mark-start-attrs">
-    <ref name="text-id"/>
-    <ref name="text-outline-level"/>
-</define>
-<define name="text-outline-level">
-    <optional>
-        <attribute name="text:outline-level">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-id">
-    <attribute name="text:id">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:toc-mark-end">
-        <ref name="text-id"/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:toc-mark">
-        <attribute name="text:string-value">
-            <ref name="string"/>
-        </attribute>
-        <ref name="text-outline-level"/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:user-index-mark-start">
-        <ref name="text-id"/>
-        <ref name="text-outline-level"/>
-        <ref name="text-index-name"/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:user-index-mark-end">
-        <ref name="text-id"/>
-        <ref name="text-outline-level"/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:user-index-mark">
-        <attribute name="text:string-value">
-            <ref name="string"/>
-        </attribute>
-        <ref name="text-outline-level"/>
-        <ref name="text-index-name"/>
-    </element>
-</define>
-<define name="text-index-name">
-    <attribute name="text:index-name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:alphabetical-index-mark-start">
-        <ref name="text-id"/>
-        <ref name="text-alphabetical-index-mark-attrs"/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:alphabetical-index-mark-end">
-        <ref name="text-id"/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:alphabetical-index-mark">
-        <attribute name="text:string-value">
-            <ref name="string"/>
-        </attribute>
-        <ref name="text-alphabetical-index-mark-attrs"/>
-    </element>
-</define>
-<define name="text-alphabetical-index-mark-attrs" combine="interleave">
-    <optional>
-        <attribute name="text:key1">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="text:key2">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-alphabetical-index-mark-attrs" combine="interleave">
-    <optional>
-        <attribute name="text:string-value-phonetic">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="text:key1-phonetic">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="text:key2-phonetic">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-alphabetical-index-mark-attrs" combine="interleave">
-    <optional>
-        <attribute name="text:main-entry" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:bibliography-mark">
-        <attribute name="text:bibliography-type">
-            <ref name="text-bibliography-types"/>
-        </attribute>
-        <zeroOrMore>
-            <attribute>
-                <choice>
-                    <name>text:identifier</name>
-                    <name>text:address</name>
-                    <name>text:annote</name>
-                    <name>text:author</name>
-                    <name>text:booktitle</name>
-                    <name>text:chapter</name>
-                    <name>text:edition</name>
-                    <name>text:editor</name>
-                    <name>text:howpublished</name>
-                    <name>text:institution</name>
-                    <name>text:journal</name>
-                    <name>text:month</name>
-                    <name>text:note</name>
-                    <name>text:number</name>
-                    <name>text:organizations</name>
-                    <name>text:pages</name>
-                    <name>text:publisher</name>
-                    <name>text:school</name>
-                    <name>text:series</name>
-                    <name>text:title</name>
-                    <name>text:report-type</name>
-                    <name>text:volume</name>
-                    <name>text:year</name>
-                    <name>text:url</name>
-                    <name>text:custom1</name>
-                    <name>text:custom2</name>
-                    <name>text:custom3</name>
-                    <name>text:custom4</name>
-                    <name>text:custom5</name>
-                    <name>text:isbn</name>
-                    <name>text:issn</name>
-                </choice>
-                <ref name="string"/>
-            </attribute>
-        </zeroOrMore>
-        <text/>
-    </element>
-</define>
-<define name="text-bibliography-types">
-    <choice>
-        <value>article</value>
-        <value>book</value>
-        <value>booklet</value>
-        <value>conference</value>
-        <value>custom1</value>
-        <value>custom2</value>
-        <value>custom3</value>
-        <value>custom4</value>
-        <value>custom5</value>
-        <value>email</value>
-        <value>inbook</value>
-        <value>incollection</value>
-        <value>inproceedings</value>
-        <value>journal</value>
-        <value>manual</value>
-        <value>mastersthesis</value>
-        <value>misc</value>
-        <value>phdthesis</value>
-        <value>proceedings</value>
-        <value>techreport</value>
-        <value>unpublished</value>
-        <value>www</value>
-    </choice>
-</define>
-<define name="text-index-body">
-    <element name="text:index-body">
-        <zeroOrMore>
-            <ref name="index-content-main"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="index-content-main">
-    <choice>
-        <ref name="text-content"/>
-        <ref name="text-index-title"/>
-    </choice>
-</define>
-<define name="text-index-title">
-    <element name="text:index-title">
-        <ref name="sectionAttr"/>
-        <zeroOrMore>
-            <ref name="index-content-main"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="text-table-of-content">
-    <element name="text:table-of-content">
-        <ref name="sectionAttr"/>
-        <ref name="text-table-of-content-source"/>
-        <ref name="text-index-body"/>
-    </element>
-</define>
-<define name="text-table-of-content-source">
-    <element name="text:table-of-content-source">
-        <ref name="text-table-of-content-source-attlist"/>
-        <optional>
-            <ref name="text-index-title-template"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="text-table-of-content-entry-template"/>
-        </zeroOrMore>
-        <zeroOrMore>
-            <ref name="text-index-source-styles"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="text-table-of-content-source-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:outline-level">
-            <choice>
-                <ref name="positiveInteger"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="text-table-of-content-source-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:use-outline-level" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-table-of-content-source-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:use-index-marks">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-table-of-content-source-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:use-index-source-styles">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-table-of-content-source-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:index-scope">
-            <choice>
-                <value>document</value>
-                <value>chapter</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="text-table-of-content-source-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:relative-tab-stop-position">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-table-of-content-entry-template">
-    <element name="text:table-of-content-entry-template">
-        <ref name="text-table-of-content-entry-template-attlist"/>
-        <zeroOrMore>
-            <ref name="text-table-of-content-children"/>
-
-        </zeroOrMore>
-    </element>
-</define>
-<define name="text-table-of-content-children">
-    <choice>
-        <ref name="text-index-entry-chapter"/>
-        <ref name="text-index-entry-page-number"/>
-        <ref name="text-index-entry-text"/>
-        <ref name="text-index-entry-span"/>
-        <ref name="text-index-entry-tab-stop"/>
-        <ref name="text-index-entry-link-start"/>
-        <ref name="text-index-entry-link-end"/>
-    </choice>
-</define>
-<define name="text-table-of-content-entry-template-attlist"
-        combine="interleave">
-    <attribute name="text:outline-level">
-        <ref name="positiveInteger"/>
-    </attribute>
-</define>
-<define name="text-table-of-content-entry-template-attlist"
-        combine="interleave">
-    <attribute name="text:style-name">
-        <ref name="styleNameRef"/>
-    </attribute>
-</define>
-<define name="text-illustration-index">
-    <element name="text:illustration-index">
-        <ref name="sectionAttr"/>
-        <ref name="text-illustration-index-source"/>
-        <ref name="text-index-body"/>
-    </element>
-</define>
-<define name="text-illustration-index-source">
-    <element name="text:illustration-index-source">
-        <ref name="text-illustration-index-source-attrs"/>
-        <optional>
-            <ref name="text-index-title-template"/>
-        </optional>
-        <optional>
-            <ref name="text-illustration-index-entry-template"/>
-        </optional>
-    </element>
-</define>
-<define name="text-illustration-index-source-attrs" combine="interleave">
-    <ref name="text-index-scope-attr"/>
-</define>
-<define name="text-index-scope-attr">
-    <optional>
-        <attribute name="text:index-scope" a:defaultValue="document">
-            <choice>
-                <value>document</value>
-                <value>chapter</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="text-illustration-index-source-attrs" combine="interleave">
-    <ref name="text-relative-tab-stop-position-attr"/>
-</define>
-<define name="text-relative-tab-stop-position-attr">
-    <optional>
-        <attribute name="text:relative-tab-stop-position"
-                   a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-illustration-index-source-attrs" combine="interleave">
-    <optional>
-        <attribute name="text:use-caption" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-illustration-index-source-attrs" combine="interleave">
-    <optional>
-        <attribute name="text:caption-sequence-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-illustration-index-source-attrs" combine="interleave">
-    <optional>
-        <attribute name="text:caption-sequence-format">
-            <choice>
-                <value>text</value>
-                <value>category-and-value</value>
-                <value>caption</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="text-illustration-index-entry-template">
-    <element name="text:illustration-index-entry-template">
-        <ref name="text-illustration-index-entry-content"/>
-    </element>
-</define>
-<define name="text-illustration-index-entry-content">
-    <ref name="text-illustration-index-entry-template-attrs"/>
-    <zeroOrMore>
-        <choice>
-            <ref name="text-index-entry-page-number"/>
-            <ref name="text-index-entry-text"/>
-            <ref name="text-index-entry-span"/>
-            <ref name="text-index-entry-tab-stop"/>
-        </choice>
-    </zeroOrMore>
-</define>
-<define name="text-illustration-index-entry-template-attrs">
-    <attribute name="text:style-name">
-        <ref name="styleNameRef"/>
-    </attribute>
-</define>
-<define name="text-table-index">
-    <element name="text:table-index">
-        <ref name="sectionAttr"/>
-        <ref name="text-table-index-source"/>
-        <ref name="text-index-body"/>
-    </element>
-</define>
-<define name="text-table-index-source">
-    <element name="text:table-index-source">
-        <ref name="text-illustration-index-source-attrs"/>
-        <optional>
-            <ref name="text-index-title-template"/>
-        </optional>
-        <optional>
-            <ref name="text-table-index-entry-template"/>
-        </optional>
-    </element>
-</define>
-<define name="text-table-index-entry-template">
-    <element name="text:table-index-entry-template">
-        <ref name="text-illustration-index-entry-content"/>
-    </element>
-</define>
-<define name="text-object-index">
-    <element name="text:object-index">
-        <ref name="sectionAttr"/>
-        <ref name="text-object-index-source"/>
-        <ref name="text-index-body"/>
-    </element>
-</define>
-<define name="text-object-index-source">
-    <element name="text:object-index-source">
-        <ref name="text-object-index-source-attrs"/>
-        <optional>
-            <ref name="text-index-title-template"/>
-        </optional>
-        <optional>
-            <ref name="text-object-index-entry-template"/>
-        </optional>
-    </element>
-</define>
-<define name="text-object-index-source-attrs" combine="interleave">
-    <ref name="text-index-scope-attr"/>
-</define>
-<define name="text-object-index-source-attrs" combine="interleave">
-    <ref name="text-relative-tab-stop-position-attr"/>
-</define>
-<define name="text-object-index-source-attrs" combine="interleave">
-    <optional>
-        <attribute name="text:use-spreadsheet-objects" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-object-index-source-attrs" combine="interleave">
-    <optional>
-        <attribute name="text:use-math-objects" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-object-index-source-attrs" combine="interleave">
-    <optional>
-        <attribute name="text:use-draw-objects" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-object-index-source-attrs" combine="interleave">
-    <optional>
-        <attribute name="text:use-chart-objects" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-object-index-source-attrs" combine="interleave">
-    <optional>
-        <attribute name="text:use-other-objects" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-object-index-entry-template">
-    <element name="text:object-index-entry-template">
-        <ref name="text-illustration-index-entry-content"/>
-    </element>
-</define>
-<define name="text-user-index">
-    <element name="text:user-index">
-        <ref name="sectionAttr"/>
-        <ref name="text-user-index-source"/>
-        <ref name="text-index-body"/>
-    </element>
-</define>
-<define name="text-user-index-source">
-    <element name="text:user-index-source">
-        <ref name="text-user-index-source-attr"/>
-        <optional>
-            <ref name="text-index-title-template"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="text-user-index-entry-template"/>
-        </zeroOrMore>
-        <zeroOrMore>
-            <ref name="text-index-source-styles"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="text-user-index-source-attr" combine="interleave">
-    <ref name="text-index-scope-attr"/>
-    <ref name="text-relative-tab-stop-position-attr"/>
-    <attribute name="text:index-name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="text-user-index-source-attr" combine="interleave">
-    <optional>
-        <attribute name="text:use-index-marks" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="text:use-graphics" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="text:use-tables" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="text:use-floating-frames"
-                     a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="text:use-objects" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-user-index-source-attr" combine="interleave">
-    <optional>
-        <attribute name="text:copy-outline-levels"
-                     a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-user-index-entry-template">
-    <element name="text:user-index-entry-template">
-        <ref name="text-user-index-entry-template-attrs"/>
-        <zeroOrMore>
-            <choice>
-                <ref name="text-index-entry-chapter"/>
-                <ref name="text-index-entry-page-number"/>
-                <ref name="text-index-entry-text"/>
-                <ref name="text-index-entry-span"/>
-                <ref name="text-index-entry-tab-stop"/>
-            </choice>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="text-user-index-entry-template-attrs" combine="interleave">
-    <attribute name="text:outline-level">
-        <ref name="positiveInteger"/>
-    </attribute>
-</define>
-<define name="text-user-index-entry-template-attrs" combine="interleave">
-    <attribute name="text:style-name">
-        <ref name="styleNameRef"/>
-    </attribute>
-</define>
-<define name="text-alphabetical-index">
-    <element name="text:alphabetical-index">
-        <ref name="sectionAttr"/>
-        <ref name="text-alphabetical-index-source"/>
-        <ref name="text-index-body"/>
-    </element>
-</define>
-<define name="text-alphabetical-index-source">
-    <element name="text:alphabetical-index-source">
-        <ref name="text-alphabetical-index-source-attrs"/>
-        <optional>
-            <ref name="text-index-title-template"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="text-alphabetical-index-entry-template"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="text-alphabetical-index-source-attrs" combine="interleave">
-    <ref name="text-index-scope-attr"/>
-    <ref name="text-relative-tab-stop-position-attr"/>
-</define>
-<define name="text-alphabetical-index-source-attrs" combine="interleave">
-    <optional>
-        <attribute name="text:ignore-case" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-alphabetical-index-source-attrs" combine="interleave">
-    <optional>
-        <attribute name="text:main-entry-style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-alphabetical-index-source-attrs" combine="interleave">
-    <optional>
-        <attribute name="text:alphabetical-separators" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-alphabetical-index-source-attrs" combine="interleave">
-    <optional>
-        <attribute name="text:combine-entries" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="text:combine-entries-with-dash"
-                   a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="text:combine-entries-with-pp" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-alphabetical-index-source-attrs" combine="interleave">
-    <optional>
-        <attribute name="text:use-keys-as-entries" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-alphabetical-index-source-attrs" combine="interleave">
-    <optional>
-        <attribute name="text:capitalize-entries" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-alphabetical-index-source-attrs" combine="interleave">
-    <optional>
-        <attribute name="text:comma-separated" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-alphabetical-index-source-attrs" combine="interleave">
-    <optional>
-        <attribute name="fo:language">
-            <ref name="languageCode"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-alphabetical-index-source-attrs" combine="interleave">
-    <optional>
-        <attribute name="fo:country">
-            <ref name="countryCode"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-alphabetical-index-source-attrs" combine="interleave">
-    <optional>
-        <attribute name="text:sort-algorithm">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-alphabetical-index-auto-mark-file">
-    <element name="text:alphabetical-index-auto-mark-file">
-        <attribute name="xlink:href">
-            <ref name="anyURI"/>
-        </attribute>
-        <optional>
-            <attribute name="xlink:type" a:defaultValue="simple">
-                <value>simple</value>
-            </attribute>
-        </optional>
-    </element>
-</define>
-<define name="text-alphabetical-index-entry-template">
-    <element name="text:alphabetical-index-entry-template">
-        <ref name="text-alphabetical-index-entry-template-attrs"/>
-        <zeroOrMore>
-            <choice>
-                <ref name="text-index-entry-chapter"/>
-                <ref name="text-index-entry-page-number"/>
-                <ref name="text-index-entry-text"/>
-                <ref name="text-index-entry-span"/>
-                <ref name="text-index-entry-tab-stop"/>
-            </choice>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="text-alphabetical-index-entry-template-attrs"
-        combine="interleave">
-    <attribute name="text:outline-level">
-        <choice>
-            <value>1</value>
-            <value>2</value>
-            <value>3</value>
-            <value>separator</value>
-        </choice>
-    </attribute>
-</define>
-<define name="text-alphabetical-index-entry-template-attrs"
-        combine="interleave">
-    <attribute name="text:style-name">
-        <ref name="styleNameRef"/>
-    </attribute>
-</define>
-<define name="text-bibliography">
-    <element name="text:bibliography">
-        <ref name="sectionAttr"/>
-        <ref name="text-bibliography-source"/>
-        <ref name="text-index-body"/>
-    </element>
-</define>
-<define name="text-bibliography-source">
-    <element name="text:bibliography-source">
-        <optional>
-            <ref name="text-index-title-template"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="text-bibliography-entry-template"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="text-bibliography-entry-template">
-    <element name="text:bibliography-entry-template">
-        <ref name="text-bibliography-entry-template-attrs"/>
-        <zeroOrMore>
-            <choice>
-                <ref name="text-index-entry-span"/>
-                <ref name="text-index-entry-tab-stop"/>
-                <ref name="text-index-entry-bibliography"/>
-            </choice>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="text-bibliography-entry-template-attrs" combine="interleave">
-    <attribute name="text:bibliography-type">
-        <ref name="text-bibliography-types"/>
-    </attribute>
-</define>
-<define name="text-bibliography-entry-template-attrs" combine="interleave">
-    <attribute name="text:style-name">
-        <ref name="styleNameRef"/>
-    </attribute>
-</define>
-<define name="text-index-source-styles">
-    <element name="text:index-source-styles">
-        <attribute name="text:outline-level">
-            <ref name="positiveInteger"/>
-        </attribute>
-        <zeroOrMore>
-            <ref name="text-index-source-style"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="text-index-source-style">
-    <element name="text:index-source-style">
-        <attribute name="text:style-name">
-            <ref name="styleName"/>
-        </attribute>
-        <empty/>
-    </element>
-</define>
-<define name="text-index-title-template">
-    <element name="text:index-title-template">
-        <optional>
-            <attribute name="text:style-name">
-                <ref name="styleNameRef"/>
-            </attribute>
-        </optional>
-        <text/>
-    </element>
-</define>
-<define name="text-index-entry-chapter">
-    <element name="text:index-entry-chapter">
-        <optional>
-            <attribute name="text:style-name">
-                <ref name="styleNameRef"/>
-            </attribute>
-        </optional>
-        <ref name="text-index-entry-chapter-attrs"/>
-    </element>
-</define>
-<define name="text-index-entry-chapter-attrs">
-    <optional>
-        <attribute name="text:display" a:defaultValue="number">
-            <choice>
-                <value>name</value>
-                <value>number</value>
-                <value>number-and-name</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="text-index-entry-text">
-    <element name="text:index-entry-text">
-        <optional>
-            <attribute name="text:style-name">
-                <ref name="styleNameRef"/>
-            </attribute>
-        </optional>
-    </element>
-</define>
-<define name="text-index-entry-page-number">
-    <element name="text:index-entry-page-number">
-        <optional>
-            <attribute name="text:style-name">
-                <ref name="styleNameRef"/>
-            </attribute>
-        </optional>
-    </element>
-</define>
-<define name="text-index-entry-span">
-    <element name="text:index-entry-span">
-        <optional>
-            <attribute name="text:style-name">
-                <ref name="styleNameRef"/>
-            </attribute>
-        </optional>
-        <text/>
-    </element>
-</define>
-<define name="text-index-entry-bibliography">
-    <element name="text:index-entry-bibliography">
-        <ref name="text-index-entry-bibliography-attrs"/>
-    </element>
-</define>
-<define name="text-index-entry-bibliography-attrs" combine="interleave">
-    <optional>
-        <attribute name="text:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-index-entry-bibliography-attrs" combine="interleave">
-    <attribute name="text:bibliography-data-field">
-        <choice>
-            <value>address</value>
-            <value>annote</value>
-            <value>author</value>
-            <value>bibliography-type</value>
-            <value>booktitle</value>
-            <value>chapter</value>
-            <value>custom1</value>
-            <value>custom2</value>
-            <value>custom3</value>
-            <value>custom4</value>
-            <value>custom5</value>
-            <value>edition</value>
-            <value>editor</value>
-            <value>howpublished</value>
-            <value>identifier</value>
-            <value>institution</value>
-            <value>isbn</value>
-            <value>issn</value>
-            <value>journal</value>
-            <value>month</value>
-            <value>note</value>
-            <value>number</value>
-            <value>organizations</value>
-            <value>pages</value>
-            <value>publisher</value>
-            <value>report-type</value>
-            <value>school</value>
-            <value>series</value>
-            <value>title</value>
-            <value>url</value>
-            <value>volume</value>
-            <value>year</value>
-        </choice>
-    </attribute>
-</define>
-<define name="text-index-entry-tab-stop">
-    <element name="text:index-entry-tab-stop">
-        <optional>
-            <attribute name="text:style-name">
-                <ref name="styleNameRef"/>
-            </attribute>
-        </optional>
-        <ref name="text-index-entry-tab-stop-attrs"/>
-    </element>
-</define>
-<define name="text-index-entry-tab-stop-attrs" combine="interleave">
-    <optional>
-        <attribute name="style:leader-char">
-            <ref name="character"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-index-entry-tab-stop-attrs" combine="interleave">
-    <choice>
-        <attribute name="style:type">
-            <value>right</value>
-        </attribute>
-        <group>
-            <attribute name="style:type">
-                <value>left</value>
-            </attribute>
-            <attribute name="style:position">
-                <ref name="length"/>
-            </attribute>
-        </group>
-    </choice>
-</define>
-<define name="text-index-entry-link-start">
-    <element name="text:index-entry-link-start">
-        <optional>
-            <attribute name="text:style-name">
-                <ref name="styleNameRef"/>
-            </attribute>
-        </optional>
-    </element>
-</define>
-<define name="text-index-entry-link-end">
-    <element name="text:index-entry-link-end">
-        <optional>
-            <attribute name="text:style-name">
-                <ref name="styleNameRef"/>
-            </attribute>
-        </optional>
-    </element>
-</define>
-<define name="table-table">
-    <element name="table:table">
-        <ref name="table-table-attlist"/>
-        <optional>
-            <ref name="table-table-source"/>
-        </optional>
-        <optional>
-            <ref name="office-dde-source"/>
-        </optional>
-        <optional>
-            <ref name="table-scenario"/>
-        </optional>
-        <optional>
-            <ref name="office-forms"/>
-        </optional>
-        <optional>
-            <ref name="table-shapes"/>
-        </optional>
-        <ref name="table-columns-and-groups"/>
-        <ref name="table-rows-and-groups"/>
-    </element>
-</define>
-<define name="table-columns-and-groups">
-    <oneOrMore>
-        <choice>
-            <ref name="table-table-column-group"/>
-            <ref name="table-columns-no-group"/>
-        </choice>
-    </oneOrMore>
-</define>
-
-<define name="table-columns-no-group">
-    <choice>
-        <group>
-            <ref name="table-columns"/>
-            <optional>
-                <ref name="table-table-header-columns"/>
-                <optional>
-                    <ref name="table-columns"/>
-                </optional>
-            </optional>
-        </group>
-        <group>
-            <ref name="table-table-header-columns"/>
-            <optional>
-                <ref name="table-columns"/>
-            </optional>
-        </group>
-    </choice>
-</define>
-
-<define name="table-columns">
-    <choice>
-        <ref name="table-table-columns"/>
-        <oneOrMore>
-                <ref name="table-table-column"/>
-        </oneOrMore>
-    </choice>
-</define>
-
-<define name="table-rows-and-groups">
-    <oneOrMore>
-        <choice>
-            <ref name="table-table-row-group"/>
-            <ref name="table-rows-no-group"/>
-        </choice>
-    </oneOrMore>
-</define>
-
-<define name="table-rows-no-group">
-    <choice>
-        <group>
-            <ref name="table-rows"/>
-            <optional>
-                <ref name="table-table-header-rows"/>
-                <optional>
-                    <ref name="table-rows"/>
-                </optional>
-            </optional>
-        </group>
-        <group>
-            <ref name="table-table-header-rows"/>
-            <optional>
-                <ref name="table-rows"/>
-            </optional>
-        </group>
-    </choice>
-</define>
-
-<define name="table-rows">
-    <choice>
-        <ref name="table-table-rows"/>
-        <oneOrMore>
-            <optional>
-                <ref name="text-soft-page-break"/>
-            </optional>
-            <ref name="table-table-row"/>
-        </oneOrMore>
-    </choice>
-</define>
-<define name="table-table-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-table-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-table-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:protected" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="table:protection-key">
-            <text/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-table-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:print" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-table-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:print-ranges">
-            <ref name="cellRangeAddressList"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-table-row">
-    <element name="table:table-row">
-        <ref name="table-table-row-attlist"/>
-        <oneOrMore>
-            <choice>
-                <ref name="table-table-cell"/>
-                <ref name="table-covered-table-cell"/>
-            </choice>
-        </oneOrMore>
-    </element>
-</define>
-<define name="table-table-row-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:number-rows-repeated" a:defaultValue="1">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-table-row-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-table-row-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:default-cell-style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-table-row-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:visibility" a:defaultValue="visible">
-            <ref name="table-visibility-value"/>
-        </attribute>
-    </optional>
-</define>
-
-<define name="table-visibility-value">
-    <choice>
-        <value>visible</value>
-        <value>collapse</value>
-        <value>filter</value>
-    </choice>
-</define>
-<define name="table-table-cell">
-    <element name="table:table-cell">
-        <ref name="table-table-cell-attlist"/>
-        <ref name="table-table-cell-attlist-extra"/>
-        <ref name="table-table-cell-content"/>
-    </element>
-</define>
-
-<define name="table-covered-table-cell">
-    <element name="table:covered-table-cell">
-        <ref name="table-table-cell-attlist"/>
-        <ref name="table-table-cell-content"/>
-    </element>
-</define>
-
-<define name="table-table-cell-content">
-    <optional>
-        <ref name="table-cell-range-source"/>
-    </optional>
-    <optional>
-        <ref name="office-annotation"/>
-    </optional>
-    <optional>
-        <ref name="table-detective"/>
-    </optional>
-    <zeroOrMore>
-        <ref name="text-content"/>
-    </zeroOrMore>
-</define>
-<define name="table-table-cell-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:number-columns-repeated" a:defaultValue="1">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-table-cell-attlist-extra" combine="interleave">
-    <optional>
-        <attribute name="table:number-columns-spanned" a:defaultValue="1">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="table:number-rows-spanned" a:defaultValue="1">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-table-cell-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-table-cell-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:content-validation-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-table-cell-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:formula">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-table-cell-attlist-extra" combine="interleave">
-    <optional>
-        <attribute name="table:number-matrix-columns-spanned">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="table:number-matrix-rows-spanned">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-table-cell-attlist" combine="interleave">
-    <optional>
-        <ref name="common-value-and-type-attlist"/>
-    </optional>
-</define>
-<define name="table-table-cell-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:protect" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-table-column">
-    <element name="table:table-column">
-        <ref name="table-table-column-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="table-table-column-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:number-columns-repeated" a:defaultValue="1">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-table-column-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-table-column-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:visibility" a:defaultValue="visible">
-            <ref name="table-visibility-value"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-table-column-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:default-cell-style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-table-header-columns">
-    <element name="table:table-header-columns">
-        <oneOrMore>
-            <ref name="table-table-column"/>
-        </oneOrMore>
-    </element>
-</define>
-
-<define name="table-table-columns">
-    <element name="table:table-columns">
-        <oneOrMore>
-            <ref name="table-table-column"/>
-        </oneOrMore>
-    </element>
-</define>
-<define name="table-table-column-group">
-    <element name="table:table-column-group">
-        <ref name="table-table-column-group-attlist"/>
-        <ref name="table-columns-and-groups"/>
-    </element>
-</define>
-<define name="table-table-column-group-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:display" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-table-header-rows">
-    <element name="table:table-header-rows">
-        <oneOrMore>
-            <optional>
-                <ref name="text-soft-page-break"/>
-            </optional>
-            <ref name="table-table-row"/>
-        </oneOrMore>
-    </element>
-</define>
-
-<define name="table-table-rows">
-    <element name="table:table-rows">
-        <oneOrMore>
-            <optional>
-                <ref name="text-soft-page-break"/>
-            </optional>
-            <ref name="table-table-row"/>
-        </oneOrMore>
-    </element>
-</define>
-<define name="table-table-row-group">
-    <element name="table:table-row-group">
-        <ref name="table-table-row-group-attlist"/>
-        <ref name="table-rows-and-groups"/>
-    </element>
-</define>
-<define name="table-table-row-group-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:display" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-table-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:is-sub-table" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="cellAddress">
-    <data type="string">
-        <param name="pattern">($?([^\. ']+|'([^']|'')+'))?\.$?[A-Z]+$?[0-9]+</param>
-
-    </data>
-</define>
-<define name="cellRangeAddress">
-    <data type="string">
-        <param name="pattern">($?([^\. ']+|'([^']|'')+'))?\.$?[A-Z]+$?[0-9]+(:($?([^\. ']+|'([^']|'')+'))?\.$?[A-Z]+$?[0-9]+)?</param>
-
-    </data>
-</define>
-<define name="cellRangeAddressList">
-    <!-- Value is a space separated list of "cellRangeAddress" patterns -->
-    <data type="string"/> 
-</define>
-<define name="table-table-source">
-    <element name="table:table-source">
-        <ref name="table-table-source-attlist"/>
-        <ref name="table-linked-source-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="table-table-source-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:mode" a:defaultValue="copy-all">
-            <choice>
-                <value>copy-all</value>
-                <value>copy-results-only</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="table-table-source-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:table-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-linked-source-attlist" combine="interleave">
-    <optional>
-        <attribute name="xlink:type" a:defaultValue="simple">
-            <value>simple</value>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="xlink:actuate" a:defaultValue="onRequest">
-            <value>onRequest</value>
-        </attribute>
-    </optional>
-    <attribute name="xlink:href">
-        <ref name="anyURI"/>
-    </attribute>
-</define>
-<define name="table-linked-source-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:filter-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-linked-source-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:filter-options">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-linked-source-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:refresh-delay">
-            <ref name="duration"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-scenario">
-    <element name="table:scenario">
-        <ref name="table-scenario-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="table-scenario-attlist" combine="interleave">
-    <attribute name="table:scenario-ranges">
-        <ref name="cellRangeAddressList"/>
-    </attribute>
-</define>
-<define name="table-scenario-attlist" combine="interleave">
-    <attribute name="table:is-active">
-        <ref name="boolean"/>
-    </attribute>
-</define>
-<define name="table-scenario-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:display-border" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-scenario-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:border-color">
-            <ref name="color"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-scenario-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:copy-back" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-scenario-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:copy-styles" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-scenario-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:copy-formulas" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-scenario-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:comment">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-scenario-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:protected">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-shapes">
-    <element name="table:shapes">
-        <oneOrMore>
-            <ref name="shape"/>
-        </oneOrMore>
-    </element>
-</define>
-<define name="table-cell-range-source">
-    <element name="table:cell-range-source">
-        <ref name="table-table-cell-range-source-attlist"/>
-        <ref name="table-linked-source-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="table-table-cell-range-source-attlist" combine="interleave">
-    <attribute name="table:name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="table-table-cell-range-source-attlist" combine="interleave">
-    <attribute name="table:last-column-spanned">
-        <ref name="positiveInteger"/>
-    </attribute>
-    <attribute name="table:last-row-spanned">
-        <ref name="positiveInteger"/>
-    </attribute>
-</define>
-<define name="table-detective">
-    <element name="table:detective">
-        <zeroOrMore>
-            <ref name="table-highlighted-range"/>
-        </zeroOrMore>
-        <zeroOrMore>
-            <ref name="table-operation"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="table-operation">
-    <element name="table:operation">
-        <ref name="table-operation-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="table-operation-attlist" combine="interleave">
-    <attribute name="table:name">
-        <choice>
-            <value>trace-dependents</value>
-            <value>remove-dependents</value>
-            <value>trace-precedents</value>
-            <value>remove-precedents</value>
-            <value>trace-errors</value>
-        </choice>
-    </attribute>
-</define>
-<define name="table-operation-attlist" combine="interleave">
-    <attribute name="table:index">
-        <ref name="nonNegativeInteger"/>
-    </attribute>
-</define>
-<define name="table-highlighted-range">
-    <element name="table:highlighted-range">
-        <choice>
-            <group>
-                <ref name="table-highlighted-range-attlist"/>
-            </group>
-            <group>
-                <ref name="table-highlighted-range-attlist-invalid"/>
-            </group>
-        </choice>
-        <empty/>
-    </element>
-</define>
-<define name="table-highlighted-range-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:cell-range-address">
-            <ref name="cellRangeAddress"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-highlighted-range-attlist" combine="interleave">
-    <attribute name="table:direction">
-        <choice>
-            <value>from-another-table</value>
-            <value>to-another-table</value>
-            <value>from-same-table</value>
-        </choice>
-    </attribute>
-</define>
-<define name="table-highlighted-range-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:contains-error" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-highlighted-range-attlist-invalid" combine="interleave">
-    <attribute name="table:marked-invalid">
-        <ref name="boolean"/>
-    </attribute>
-</define>
-<define name="office-spreadsheet-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:structure-protected" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="table:protection-key">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-calculation-settings">
-    <element name="table:calculation-settings">
-        <ref name="table-calculation-setting-attlist"/>
-        <optional>
-            <ref name="table-null-date"/>
-        </optional>
-        <optional>
-            <ref name="table-iteration"/>
-        </optional>
-    </element>
-</define>
-<define name="table-calculation-setting-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:case-sensitive" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-calculation-setting-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:precision-as-shown" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-calculation-setting-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:search-criteria-must-apply-to-whole-cell"
-                     a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-calculation-setting-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:automatic-find-labels" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-calculation-setting-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:use-regular-expressions"
-                     a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-calculation-setting-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:null-year" a:defaultValue="1930">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-null-date">
-    <element name="table:null-date">
-        <optional>
-            <attribute name="table:value-type" a:defaultValue="date">
-                <ref name="valueType"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="table:date-value"
-                         a:defaultValue="1899-12-30">
-                <ref name="date"/>
-            </attribute>
-        </optional>
-        <empty/>
-    </element>
-</define>
-<define name="table-iteration">
-    <element name="table:iteration">
-        <optional>
-            <attribute name="table:status" a:defaultValue="disable">
-                <choice>
-                    <value>enable</value>
-                    <value>disable</value>
-                </choice>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="table:steps" a:defaultValue="100">
-                <ref name="positiveInteger"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="table:maximum-difference"
-                         a:defaultValue="0.001">
-                <ref name="double"/>
-            </attribute>
-        </optional>
-        <empty/>
-    </element>
-</define>
-<define name="table-content-validations">
-    <element name="table:content-validations">
-        <oneOrMore>
-            <ref name="table-content-validation"/>
-        </oneOrMore>
-    </element>
-</define>
-
-<define name="table-content-validation">
-    <element name="table:content-validation">
-        <ref name="table-validation-attlist"/>
-        <optional>
-            <ref name="table-help-message"/>
-        </optional>
-        <optional>
-            <choice>
-                <ref name="table-error-message"/>
-                <group>
-                    <ref name="table-error-macro"/>
-                    <optional>
-                        <ref name="office-event-listeners"/>
-                    </optional>
-                </group>
-            </choice>
-        </optional>
-    </element>
-</define>
-<define name="table-validation-attlist" combine="interleave">
-    <attribute name="table:name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="table-validation-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:condition">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-validation-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:base-cell-address">
-            <ref name="cellAddress"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-validation-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:allow-empty-cell" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-validation-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:display-list" a:defaultValue="unsorted">
-            <choice>
-                <value>none</value>
-                <value>unsorted</value>
-                <value>sort-ascending</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="table-help-message">
-    <element name="table:help-message">
-        <optional>
-            <attribute name="table:title">
-                <ref name="string"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="table:display" a:defaultValue="false">
-                <ref name="boolean"/>
-            </attribute>
-        </optional>
-        <zeroOrMore>
-            <ref name="text-p"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="table-error-message">
-    <element name="table:error-message">
-        <optional>
-            <attribute name="table:title">
-                <ref name="string"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="table:display" a:defaultValue="false">
-                <ref name="boolean"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="table:message-type" a:defaultValue="stop">
-                <choice>
-                    <value>stop</value>
-                    <value>warning</value>
-                    <value>information</value>
-                </choice>
-            </attribute>
-        </optional>
-        <zeroOrMore>
-            <ref name="text-p"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="table-error-macro">
-    <element name="table:error-macro">
-        <optional>
-            <attribute name="table:execute" a:defaultValue="true">
-                <ref name="boolean"/>
-            </attribute>
-        </optional>
-    </element>
-</define>
-<define name="table-label-ranges">
-    <element name="table:label-ranges">
-        <zeroOrMore>
-            <ref name="table-label-range"/>
-        </zeroOrMore>
-    </element>
-</define>
-
-<define name="table-label-range">
-    <element name="table:label-range">
-        <ref name="table-label-range-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="table-label-range-attlist" combine="interleave">
-    <attribute name="table:label-cell-range-address">
-        <ref name="cellRangeAddress"/>
-    </attribute>
-</define>
-<define name="table-label-range-attlist" combine="interleave">
-    <attribute name="table:data-cell-range-address">
-        <ref name="cellRangeAddress"/>
-    </attribute>
-</define>
-<define name="table-label-range-attlist" combine="interleave">
-    <attribute name="table:orientation">
-        <choice>
-            <value>column</value>
-            <value>row</value>
-        </choice>
-    </attribute>
-</define>
-<define name="table-named-expressions">
-    <element name="table:named-expressions">
-        <zeroOrMore>
-            <choice>
-                <ref name="table-named-range"/>
-                <ref name="table-named-expression"/>
-            </choice>
-        </zeroOrMore>
-    </element>
-</define>
-
-<define name="table-named-range">
-    <element name="table:named-range">
-        <ref name="table-named-range-attlist"/>
-        <empty/>
-    </element>
-</define>
-
-<define name="table-named-range-attlist" combine="interleave">
-    <attribute name="table:name">
-        <ref name="string"/>
-    </attribute>
-    <attribute name="table:cell-range-address">
-        <ref name="cellRangeAddress"/>
-    </attribute>
-    <optional>
-        <attribute name="table:base-cell-address">
-            <ref name="cellAddress"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="table:range-usable-as" a:defaultValue="none">
-            <choice>
-                <value>none</value>
-                <list>
-                    <oneOrMore>
-                        <choice>
-                            <value>print-range</value>
-                            <value>filter</value>
-                            <value>repeat-row</value>
-                            <value>repeat-column</value>
-                        </choice>
-                    </oneOrMore>
-                </list>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="table-named-expression">
-    <element name="table:named-expression">
-        <ref name="table-named-expression-attlist"/>
-        <empty/>
-    </element>
-</define>
-
-<define name="table-named-expression-attlist" combine="interleave">
-    <attribute name="table:name">
-        <ref name="string"/>
-    </attribute>
-    <attribute name="table:expression">
-        <ref name="string"/>
-    </attribute>
-    <optional>
-        <attribute name="table:base-cell-address">
-            <ref name="cellAddress"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-database-ranges">
-    <element name="table:database-ranges">
-        <zeroOrMore>
-            <ref name="table-database-range"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="table-database-range">
-    <element name="table:database-range">
-        <ref name="table-database-range-attlist"/>
-        <optional>
-            <choice>
-                <ref name="table-database-source-sql"/>
-                <ref name="table-database-source-table"/>
-                <ref name="table-database-source-query"/>
-            </choice>
-        </optional>
-        <optional>
-            <ref name="table-filter"/>
-        </optional>
-        <optional>
-            <ref name="table-sort"/>
-        </optional>
-        <optional>
-            <ref name="table-subtotal-rules"/>
-        </optional>
-    </element>
-</define>
-<define name="table-database-range-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-database-range-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:is-selection" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-database-range-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:on-update-keep-styles" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-database-range-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:on-update-keep-size" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-database-range-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:has-persistent-data" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-database-range-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:orientation" a:defaultValue="row">
-            <choice>
-                <value>column</value>
-                <value>row</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="table-database-range-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:contains-header" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-database-range-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:display-filter-buttons"
-                   a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-database-range-attlist" combine="interleave">
-    <attribute name="table:target-range-address">
-        <ref name="cellRangeAddress"/>
-    </attribute>
-</define>
-<define name="table-database-range-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:refresh-delay">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-database-source-sql">
-    <element name="table:database-source-sql">
-        <ref name="table-database-source-sql-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="table-database-source-sql-attlist" combine="interleave">
-    <attribute name="table:database-name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="table-database-source-sql-attlist" combine="interleave">
-    <attribute name="table:sql-statement">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="table-database-source-sql-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:parse-sql-statement" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-database-source-query">
-    <element name="table:database-source-table">
-        <ref name="table-database-source-table-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="table-database-source-table-attlist" combine="interleave">
-    <attribute name="table:database-name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="table-database-source-table-attlist" combine="interleave">
-    <attribute name="table:database-table-name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="table-database-source-table">
-    <element name="table:database-source-query">
-        <ref name="table-database-source-query-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="table-database-source-query-attlist" combine="interleave">
-    <attribute name="table:database-name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="table-database-source-query-attlist" combine="interleave">
-    <attribute name="table:query-name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="table-sort">
-    <element name="table:sort">
-        <ref name="table-sort-attlist"/>
-        <oneOrMore>
-            <ref name="table-sort-by"/>
-        </oneOrMore>
-    </element>
-</define>
-<define name="table-sort-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:bind-styles-to-content" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-sort-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:target-range-address">
-            <ref name="cellRangeAddress"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-sort-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:case-sensitive" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-sort-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:language">
-            <ref name="languageCode"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-sort-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:country">
-            <ref name="countryCode"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-sort-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:algorithm">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-sort-by">
-    <element name="table:sort-by">
-        <ref name="table-sort-by-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="table-sort-by-attlist" combine="interleave">
-    <attribute name="table:field-number">
-        <ref name="nonNegativeInteger"/>
-    </attribute>
-</define>
-<define name="table-sort-by-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:data-type" a:defaultValue="automatic">
-            <choice>
-                <value>text</value>
-                <value>number</value>
-                <value>automatic</value>
-                <ref name="string"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="table-sort-by-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:order" a:defaultValue="ascending">
-            <choice>
-                <value>ascending</value>
-                <value>descending</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="table-subtotal-rules">
-    <element name="table:subtotal-rules">
-        <ref name="table-subtotal-rules-attlist"/>
-        <optional>
-            <ref name="table-sort-groups"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="table-subtotal-rule"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="table-subtotal-rules-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:bind-styles-to-content" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-subtotal-rules-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:case-sensitive" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-subtotal-rules-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:page-breaks-on-group-change"
-                   a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-sort-groups">
-    <element name="table:sort-groups">
-        <ref name="table-sort-groups-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="table-sort-groups-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:data-type" a:defaultValue="automatic">
-            <choice>
-                <value>text</value>
-                <value>number</value>
-                <value>automatic</value>
-                <ref name="string"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="table-sort-groups-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:order" a:defaultValue="ascending">
-            <choice>
-                <value>ascending</value>
-                <value>descending</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="table-subtotal-rule">
-    <element name="table:subtotal-rule">
-        <ref name="table-subtotal-rule-attlist"/>
-        <zeroOrMore>
-            <ref name="table-subtotal-field"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="table-subtotal-rule-attlist" combine="interleave">
-    <attribute name="table:group-by-field-number">
-        <ref name="nonNegativeInteger"/>
-    </attribute>
-</define>
-<define name="table-subtotal-field">
-    <element name="table:subtotal-field">
-        <ref name="table-subtotal-field-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="table-subtotal-field-attlist" combine="interleave">
-    <attribute name="table:field-number">
-        <ref name="nonNegativeInteger"/>
-    </attribute>
-</define>
-<define name="table-subtotal-field-attlist" combine="interleave">
-    <attribute name="table:function">
-        <choice>
-            <value>auto</value>
-            <value>average</value>
-            <value>count</value>
-            <value>countnums</value>
-            <value>max</value>
-            <value>min</value>
-            <value>product</value>
-            <value>stdev</value>
-            <value>stdevp</value>
-            <value>sum</value>
-            <value>var</value>
-            <value>varp</value>
-            <ref name="string"/>
-        </choice>
-    </attribute>
-</define>
-<define name="table-filter">
-    <element name="table:filter">
-        <ref name="table-filter-attlist"/>
-        <choice>
-            <ref name="table-filter-condition"/>
-            <ref name="table-filter-and"/>
-            <ref name="table-filter-or"/>
-        </choice>
-    </element>
-</define>
-<define name="table-filter-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:target-range-address">
-            <ref name="cellRangeAddress"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-filter-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:condition-source" a:defaultValue="self">
-            <choice>
-                <value>self</value>
-                <value>cell-range</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="table-filter-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:condition-source-range-address">
-            <ref name="cellRangeAddress"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-filter-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:display-duplicates" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-filter-and">
-    <element name="table:filter-and">
-        <oneOrMore>
-            <choice>
-                <ref name="table-filter-or"/>
-                <ref name="table-filter-condition"/>
-            </choice>
-        </oneOrMore>
-    </element>
-</define>
-<define name="table-filter-or">
-    <element name="table:filter-or">
-        <oneOrMore>
-            <choice>
-                <ref name="table-filter-and"/>
-                <ref name="table-filter-condition"/>
-            </choice>
-        </oneOrMore>
-    </element>
-</define>
-<define name="table-filter-condition">
-    <element name="table:filter-condition">
-        <ref name="table-filter-condition-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="table-filter-condition-attlist" combine="interleave">
-    <attribute name="table:field-number">    
-        <ref name="nonNegativeInteger"/>
-    </attribute>
-</define>
-<define name="table-filter-condition-attlist" combine="interleave">
-    <attribute name="table:value">    
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="table-filter-condition-attlist" combine="interleave">
-    <attribute name="table:operator">    
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="table-filter-condition-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:case-sensitive" a:defaultValue="false">    
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-filter-condition-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:data-type" a:defaultValue="text">
-            <choice>
-                <value>text</value>
-                <value>number</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="table-data-pilot-tables">
-    <element name="table:data-pilot-tables">
-        <zeroOrMore>
-            <ref name="table-data-pilot-table"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="table-data-pilot-table">
-    <element name="table:data-pilot-table">
-        <ref name="table-data-pilot-table-attlist"/>
-        <optional>
-            <choice>
-                <ref name="table-database-source-sql"/>
-                <ref name="table-database-source-table"/>
-                <ref name="table-database-source-query"/>
-                <ref name="table-source-service"/>
-                <ref name="table-source-cell-range"/>
-            </choice>
-        </optional>
-        <oneOrMore>
-            <ref name="table-data-pilot-field"/>
-        </oneOrMore>
-    </element>
-</define>
-<define name="table-data-pilot-table-attlist" combine="interleave">
-    <attribute name="table:name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="table-data-pilot-table-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:application-data">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-data-pilot-table-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:grand-total" a:defaultValue="both">
-            <choice>
-                <value>none</value>
-                <value>row</value>
-                <value>column</value>
-                <value>both</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="table-data-pilot-table-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:ignore-empty-rows" a:defaultValue="false">    
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-data-pilot-table-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:identify-categories" a:defaultValue="false">    
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-data-pilot-table-attlist" combine="interleave">
-    <attribute name="table:target-range-address">    
-        <ref name="cellRangeAddress"/>
-    </attribute>
-</define>
-<define name="table-data-pilot-table-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:buttons">    
-            <ref name="cellRangeAddressList"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-data-pilot-table-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:show-filter-button" a:defaultValue="true">    
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-data-pilot-table-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:drill-down-on-double-click"
-                   a:defaultValue="true">    
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-source-cell-range">
-    <element name="table:source-cell-range">
-        <ref name="table-source-cell-range-attlist"/>
-        <optional>
-            <ref name="table-filter"/>
-        </optional>
-    </element>
-</define>
-<define name="table-source-cell-range-attlist" combine="interleave">
-    <attribute name="table:cell-range-address">    
-        <ref name="cellRangeAddress"/>
-    </attribute>
-</define>
-<define name="table-source-service">
-    <element name="table:source-service">
-        <ref name="table-source-service-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="table-source-service-attlist" combine="interleave">
-    <attribute name="table:name">    
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="table-source-service-attlist" combine="interleave">
-    <attribute name="table:source-name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="table-source-service-attlist" combine="interleave">
-    <attribute name="table:object-name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="table-source-service-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:user-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-source-service-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:password">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-data-pilot-field">
-    <element name="table:data-pilot-field">
-        <ref name="table-data-pilot-field-attlist"/>
-        <optional>
-            <ref name="table-data-pilot-level"/>
-        </optional>
-        <optional>
-            <ref name="table-data-pilot-field-reference"/>
-        </optional>
-        <optional>
-            <ref name="table-data-pilot-groups"/>
-        </optional>
-    </element>
-</define>
-<define name="table-data-pilot-field-attlist" combine="interleave">
-    <attribute name="table:source-field-name">    
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="table-data-pilot-field-attlist" combine="interleave">
-    <choice>
-        <attribute name="table:orientation">    
-            <choice>
-                <value>row</value>
-                <value>column</value>
-                <value>data</value>
-                <value>hidden</value>
-            </choice>
-        </attribute>
-        <group>
-            <attribute name="table:orientation">
-                <value>page</value>
-            </attribute>
-            <attribute name="table:selected-page">
-                <ref name="string"/>
-            </attribute>
-        </group>
-    </choice>
-</define>
-<define name="table-data-pilot-field-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:is-data-layout-field" a:defaultValue="false">    
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-data-pilot-field-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:function">
-            <choice>
-                <value>auto</value>
-                <value>average</value>
-                <value>count</value>
-                <value>countnums</value>
-                <value>max</value>
-                <value>min</value>
-                <value>product</value>
-                <value>stdev</value>
-                <value>stdevp</value>
-                <value>sum</value>
-                <value>var</value>
-                <value>varp</value>
-                <ref name="string"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="table-data-pilot-field-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:used-hierarchy" a:defaultValue="-1">    
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-data-pilot-level">
-    <element name="table:data-pilot-level">
-        <ref name="table-data-pilot-level-attlist"/>
-        <optional>
-            <ref name="table-data-pilot-subtotals"/>
-        </optional>
-        <optional>
-            <ref name="table-data-pilot-members"/>
-        </optional>
-        <optional>
-            <ref name="table-data-pilot-display-info"/>
-        </optional>
-        <optional>
-            <ref name="table-data-pilot-sort-info"/>
-        </optional>
-        <optional>
-            <ref name="table-data-pilot-layout-info"/>
-        </optional>
-    </element>
-</define>
-<define name="table-data-pilot-level-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:show-empty">    
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-data-pilot-subtotals">
-    <element name="table:data-pilot-subtotals">
-        <zeroOrMore>
-            <ref name="table-data-pilot-subtotal"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="table-data-pilot-subtotal">
-    <element name="table:data-pilot-subtotal">
-        <ref name="table-data-pilot-subtotal-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="table-data-pilot-subtotal-attlist" combine="interleave">
-    <attribute name="table:function">
-        <choice>
-            <value>auto</value>
-            <value>average</value>
-            <value>count</value>
-            <value>countnums</value>
-            <value>max</value>
-            <value>min</value>
-            <value>product</value>
-            <value>stdev</value>
-            <value>stdevp</value>
-            <value>sum</value>
-            <value>var</value>
-            <value>varp</value>
-            <ref name="string"/>
-        </choice>
-    </attribute>
-</define>
-<define name="table-data-pilot-members">
-    <element name="table:data-pilot-members">
-        <zeroOrMore>
-            <ref name="table-data-pilot-member"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="table-data-pilot-member">
-    <element name="table:data-pilot-member">
-        <ref name="table-data-pilot-member-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="table-data-pilot-member-attlist" combine="interleave">
-    <attribute name="table:name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="table-data-pilot-member-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:display">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-data-pilot-member-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:show-details">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-data-pilot-display-info">
-    <element name="table:data-pilot-display-info">
-        <ref name="table-data-pilot-display-info-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="table-data-pilot-display-info-attlist" combine="interleave">
-    <attribute name="table:enabled">
-        <ref name="boolean"/>
-    </attribute>
-</define>
-<define name="table-data-pilot-display-info-attlist" combine="interleave">
-    <attribute name="table:data-field">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="table-data-pilot-display-info-attlist" combine="interleave">
-    <attribute name="table:member-count">
-        <ref name="nonNegativeInteger"/>
-    </attribute>
-</define>
-<define name="table-data-pilot-display-info-attlist" combine="interleave">
-    <attribute name="table:display-member-mode">
-        <choice>
-            <value>from-top</value>
-            <value>from-bottom</value>
-        </choice>
-    </attribute>
-</define>
-<define name="table-data-pilot-sort-info">
-    <element name="table:data-pilot-sort-info">
-        <ref name="table-data-pilot-sort-info-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="table-data-pilot-sort-info-attlist" combine="interleave">
-    <choice>
-        <group>
-            <attribute name="table:sort-mode">
-                <value>data</value>
-            </attribute>
-            <attribute name="table:data-field">
-                <ref name="string"/>
-            </attribute>
-        </group>
-        <attribute name="table:sort-mode">
-            <choice>
-                <value>none</value>
-                <value>manual</value>
-                <value>name</value>
-            </choice>
-        </attribute>
-    </choice>
-</define>
-<define name="table-data-pilot-sort-info-attlist" combine="interleave">
-    <attribute name="table:order">
-        <choice>
-            <value>ascending</value>
-            <value>descending</value>
-        </choice>
-    </attribute>
-</define>
-<define name="table-data-pilot-layout-info">
-    <element name="table:data-pilot-layout-info">
-        <ref name="table-data-pilot-layout-info-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="table-data-pilot-layout-info-attlist" combine="interleave">
-    <attribute name="table:layout-mode">
-        <choice>
-            <value>tabular-layout</value>
-            <value>outline-subtotals-top</value>
-            <value>outline-subtotals-bottom</value>
-        </choice>
-    </attribute>
-</define>
-<define name="table-data-pilot-layout-info-attlist" combine="interleave">
-    <attribute name="table:add-empty-lines">
-        <ref name="boolean"/>
-    </attribute>
-</define>
-<define name="table-data-pilot-field-reference">
-    <element name="table:data-pilot-field-reference">
-        <ref name="table-data-pilot-field-reference-attlist"/>
-    </element>
-</define>
-<define name="table-data-pilot-field-reference-attlist" combine="interleave">
-    <attribute name="table:field-name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="table-data-pilot-field-reference-attlist" combine="interleave">
-    <choice>
-        <group>
-            <attribute name="table:member-type">
-                <value>named</value>
-            </attribute>
-            <attribute name="table:member-name">
-                <ref name="string"/>
-            </attribute>
-        </group>
-        <attribute name="table:member-type">
-            <choice>
-                <value>previous</value>
-                <value>next</value>
-            </choice>
-        </attribute>
-    </choice>
-</define>
-<define name="table-data-pilot-field-reference-attlist" combine="interleave">
-    <attribute name="table:type">
-        <choice>
-            <value>none</value>
-            <value>member-difference</value>
-            <value>member-percentage</value>
-            <value>member-percentage-difference</value>
-            <value>running-total</value>
-            <value>row-percentage</value>
-            <value>column-percentage</value>
-            <value>total-percentage</value>
-            <value>index</value>
-        </choice>
-    </attribute>
-</define>
-<define name="table-data-pilot-groups">
-    <element name="table:data-pilot-groups">
-        <ref name="table-data-pilot-groups-attlist"/>
-        <oneOrMore>
-            <ref name="table-data-pilot-group"/>
-        </oneOrMore>
-    </element>
-</define>
-<define name="table-data-pilot-groups-attlist" combine="interleave">
-    <attribute name="table:source-field-name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="table-data-pilot-groups-attlist" combine="interleave">
-    <choice>
-        <attribute name="table:date-start">
-            <choice>
-                <ref name="dateOrDateTime"/>
-                <value>auto</value>
-            </choice>
-        </attribute>
-        <attribute name="table:start">
-            <choice>
-                <ref name="double"/>
-                <value>auto</value>
-            </choice>
-        </attribute>
-    </choice>
-</define>
-<define name="table-data-pilot-groups-attlist" combine="interleave">
-    <choice>
-        <attribute name="table:date-end">
-            <choice>
-                <ref name="dateOrDateTime"/>
-                <value>auto</value>
-            </choice>
-        </attribute>
-        <attribute name="table:end">
-            <choice>
-                <ref name="double"/>
-                <value>auto</value>
-            </choice>
-        </attribute>
-    </choice>
-</define>
-<define name="table-data-pilot-groups-attlist" combine="interleave">
-    <attribute name="table:step">
-        <ref name="double"/>
-    </attribute>
-</define>
-<define name="table-data-pilot-groups-attlist" combine="interleave">
-    <attribute name="table:grouped-by">
-        <choice>
-            <value>seconds</value>
-            <value>minutes</value>
-            <value>hours</value>
-            <value>days</value>
-            <value>months</value>
-            <value>quarters</value>
-            <value>years</value>
-        </choice>
-    </attribute>
-</define>
-<define name="table-data-pilot-group">
-    <element name="table:data-pilot-group">
-        <ref name="table-data-pilot-group-attlist"/>
-        <oneOrMore>
-            <ref name="table-data-pilot-group-member"/>
-        </oneOrMore>
-    </element>
-</define>
-<define name="table-data-pilot-group-attlist" combine="interleave">
-    <attribute name="table:name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="table-data-pilot-group-member">
-    <element name="table:data-pilot-group-member">
-        <ref name="table-data-pilot-group-member-attlist"/>
-    </element>
-</define>
-<define name="table-data-pilot-group-member-attlist" combine="interleave">
-    <attribute name="table:name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="table-consolidation">
-    <element name="table:consolidation">
-        <ref name="table-consolidation-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="table-consolidation-attlist" combine="interleave">
-    <attribute name="table:function">    
-        <choice>
-            <value>auto</value>
-            <value>average</value>
-            <value>count</value>
-            <value>countnums</value>
-            <value>max</value>
-            <value>min</value>
-            <value>product</value>
-            <value>stdev</value>
-            <value>stdevp</value>
-            <value>sum</value>
-            <value>var</value>
-            <value>varp</value>
-            <ref name="string"/>
-        </choice>
-    </attribute>
-</define>
-<define name="table-consolidation-attlist" combine="interleave">
-    <attribute name="table:source-cell-range-addresses">    
-        <ref name="cellRangeAddressList"/>
-    </attribute>
-</define>
-<define name="table-consolidation-attlist" combine="interleave">
-    <attribute name="table:target-cell-address">    
-        <ref name="cellAddress"/>
-    </attribute>
-</define>
-<define name="table-consolidation-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:use-labels" a:defaultValue="none">
-            <choice>
-                <value>none</value>
-                <value>row</value>
-                <value>column</value>
-                <value>both</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="table-consolidation-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:link-to-source-data" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-dde-links">
-    <element name="table:dde-links">
-        <oneOrMore>
-            <ref name="table-dde-link"/>
-        </oneOrMore>
-    </element>
-</define>
-<define name="table-tracked-changes">
-    <element name="table:tracked-changes">
-        <ref name="table-tracked-changes-attlist"/>
-        <zeroOrMore>
-            <choice>
-                <ref name="table-cell-content-change"/>
-                <ref name="table-insertion"/>
-                <ref name="table-deletion"/>
-                <ref name="table-movement"/>
-            </choice>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="table-tracked-changes-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:track-changes" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-insertion">
-    <element name="table:insertion">
-        <ref name="table-insertion-attlist"/>
-        <ref name="common-table-change-attlist"/>
-        <ref name="office-change-info"/>
-        <optional>
-            <ref name="table-dependencies"/>
-        </optional>
-        <optional>
-            <ref name="table-deletions"/>
-        </optional>
-    </element>
-</define>
-<define name="table-insertion-attlist" combine="interleave">
-    <attribute name="table:type">
-        <choice>
-            <value>row</value>
-            <value>column</value>
-            <value>table</value>
-        </choice>
-    </attribute>
-</define>
-<define name="table-insertion-attlist" combine="interleave">
-    <attribute name="table:position">
-        <ref name="integer"/>
-    </attribute>
-</define>
-<define name="table-insertion-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:count" a:defaultValue="1">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-insertion-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:table">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-dependencies">
-    <element name="table:dependencies">
-        <oneOrMore>
-            <ref name="table-dependency"/>
-        </oneOrMore>
-    </element>
-</define>
-<define name="table-dependency">
-    <element name="table:dependency">
-        <attribute name="table:id">
-            <ref name="string"/>
-        </attribute>
-        <empty/>
-    </element>
-</define>
-<define name="table-deletions">
-    <element name="table:deletions">
-        <oneOrMore>
-            <choice>
-                <ref name="table-cell-content-deletion"/>
-                <ref name="table-change-deletion"/>
-            </choice>
-        </oneOrMore>
-    </element>
-</define>
-<define name="table-cell-content-deletion">
-    <element name="table:cell-content-deletion">
-        <optional>
-            <attribute name="table:id">
-                <ref name="string"/>
-            </attribute>
-        </optional>
-        <optional>
-            <ref name="table-cell-address"/>
-        </optional>
-        <optional>
-            <ref name="table-change-track-table-cell"/>
-        </optional>
-    </element>
-</define>
-<define name="table-change-deletion">
-    <element name="table:change-deletion">
-        <optional>
-            <attribute name="table:id">
-                <ref name="string"/>
-            </attribute>
-        </optional>
-        <empty/>
-    </element>
-</define>
-<define name="table-deletion">
-    <element name="table:deletion">
-        <ref name="table-deletion-attlist"/>
-        <ref name="common-table-change-attlist"/>
-        <ref name="office-change-info"/>
-        <optional>
-            <ref name="table-dependencies"/>
-        </optional>
-        <optional>
-            <ref name="table-deletions"/>
-        </optional>
-        <optional>
-            <ref name="table-cut-offs"/>
-        </optional>
-    </element>
-</define>
-<define name="table-deletion-attlist" combine="interleave">
-    <attribute name="table:type">
-        <choice>
-            <value>row</value>
-            <value>column</value>
-            <value>table</value>
-        </choice>
-    </attribute>
-</define>
-<define name="table-deletion-attlist" combine="interleave">
-    <attribute name="table:position">
-        <ref name="integer"/>
-    </attribute>
-</define>
-<define name="table-deletion-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:table">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-deletion-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:multi-deletion-spanned">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-cut-offs">
-    <element name="table:cut-offs">
-        <choice>
-            <oneOrMore>
-                <ref name="table-movement-cut-off"/>
-            </oneOrMore>
-            <group>
-                <ref name="table-insertion-cut-off"/>
-                <zeroOrMore>
-                    <ref name="table-movement-cut-off"/>
-                </zeroOrMore>
-            </group>
-        </choice>
-    </element>
-</define>
-<define name="table-insertion-cut-off">
-    <element name="table:insertion-cut-off">
-        <ref name="table-insertion-cut-off-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="table-insertion-cut-off-attlist" combine="interleave">
-    <attribute name="table:id">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="table-insertion-cut-off-attlist" combine="interleave">
-    <attribute name="table:position">
-        <ref name="integer"/>
-    </attribute>
-</define>
-<define name="table-movement-cut-off">
-    <element name="table:movement-cut-off">
-        <ref name="table-movement-cut-off-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="table-movement-cut-off-attlist" combine="interleave">
-    <choice>
-        <attribute name="table:position">
-            <ref name="integer"/>
-        </attribute>
-        <group>
-            <attribute name="table:start-position">
-                <ref name="integer"/>
-            </attribute>
-            <attribute name="table:end-position">
-                <ref name="integer"/>
-            </attribute>
-        </group>
-    </choice>
-</define>
-<define name="table-movement">
-    <element name="table:movement">
-        <ref name="common-table-change-attlist"/>
-        <ref name="table-source-range-address"/>
-        <ref name="table-target-range-address"/>
-        <ref name="office-change-info"/>
-        <optional>
-            <ref name="table-dependencies"/>
-        </optional>
-        <optional>
-            <ref name="table-deletions"/>
-        </optional>
-    </element>
-</define>
-<define name="table-source-range-address">
-    <element name="table:source-range-address">
-        <ref name="common-table-range-attlist"/>
-        <empty/>
-    </element>
-</define>
-
-<define name="table-target-range-address">
-    <element name="table:target-range-address">
-        <ref name="common-table-range-attlist"/>
-        <empty/>
-    </element>
-</define>
-
-
-<define name="common-table-range-attlist" combine="interleave">
-    <choice>
-        <group>
-            <ref name="common-table-cell-address-attlist"/>
-        </group>
-        <group>
-            <ref name="common-table-cell-range-address-attlist"/>
-        </group>
-    </choice>
-</define>
-<define name="common-table-cell-address-attlist" combine="interleave">
-    <attribute name="table:column">
-        <ref name="integer"/>
-    </attribute>
-    <attribute name="table:row">
-        <ref name="integer"/>
-    </attribute>
-    <attribute name="table:table">
-        <ref name="integer"/>
-    </attribute>
-</define>
-<define name="common-table-cell-range-address-attlist" combine="interleave">
-    <attribute name="table:start-column">
-        <ref name="integer"/>
-    </attribute>
-    <attribute name="table:start-row">
-        <ref name="integer"/>
-    </attribute>
-    <attribute name="table:start-table">
-        <ref name="integer"/>
-    </attribute>
-    <attribute name="table:end-column">
-        <ref name="integer"/>
-    </attribute>
-    <attribute name="table:end-row">
-        <ref name="integer"/>
-    </attribute>
-    <attribute name="table:end-table">
-        <ref name="integer"/>
-    </attribute>
-</define>
-<define name="table-change-track-table-cell" combine="interleave">
-    <element name="table:change-track-table-cell">
-        <ref name="table-change-track-table-cell-attlist"/>
-        <zeroOrMore>
-            <ref name="text-p"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="table-change-track-table-cell-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:cell-address">
-            <ref name="cellAddress"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-change-track-table-cell-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:matrix-covered" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-change-track-table-cell-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:formula">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="table:number-matrix-columns-spanned">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="table:number-matrix-rows-spanned">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-    <optional>
-        <ref name="common-value-and-type-attlist"/>
-    </optional>
-</define>
-<define name="table-cell-content-change">
-    <element name="table:cell-content-change">
-        <ref name="common-table-change-attlist"/>
-        <ref name="table-cell-address"/>
-        <ref name="office-change-info"/>
-        <optional>
-            <ref name="table-dependencies"/>
-        </optional>
-        <optional>
-            <ref name="table-deletions"/>
-        </optional>
-        <ref name="table-previous"/>
-    </element>
-</define>
-<define name="table-cell-address">
-    <element name="table:cell-address">
-        <ref name="common-table-cell-address-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="table-previous">
-    <element name="table:previous">
-        <optional>
-            <attribute name="table:id">
-                <ref name="string"/>
-            </attribute>
-        </optional>
-        <ref name="table-change-track-table-cell"/>
-    </element>
-</define>
-<define name="common-table-change-attlist" combine="interleave">
-    <attribute name="table:id">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="common-table-change-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:acceptance-state" a:defaultValue="pending">
-            <choice>
-                <value>accepted</value>
-                <value>rejected</value>
-                <value>pending</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="common-table-change-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:rejecting-change-id">
-            <ref name="string"/> 
-        </attribute>
-    </optional>
-</define>
-<define name="style-handout-master">
-    <element name="style:handout-master">
-        <ref name="common-presentation-header-footer-attlist"/>
-        <ref name="style-handout-master-attlist"/>
-        <zeroOrMore>
-            <ref name="shape"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="style-handout-master-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:presentation-page-layout-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-handout-master-attlist" combine="interleave">
-    <attribute name="style:page-layout-name">
-        <ref name="styleNameRef"/>
-    </attribute>
-</define>
-<define name="style-handout-master-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-layer-set">
-    <element name="draw:layer-set">
-        <zeroOrMore>
-            <ref name="draw-layer"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="draw-layer">
-    <element name="draw:layer">
-        <ref name="draw-layer-attlist"/>
-        <optional>
-            <ref name="svg-title"/>
-        </optional>
-        <optional>
-            <ref name="svg-desc"/>
-        </optional>
-    </element>
-</define>
-<define name="draw-layer-attlist" combine="interleave">
-    <attribute name="draw:name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="draw-layer-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:protected" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-layer-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:display" a:defaultValue="always">
-            <choice>
-                <value>always</value>
-                <value>screen</value>
-                <value>printer</value>
-                <value>none</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-page">
-    <element name="draw:page">
-        <ref name="common-presentation-header-footer-attlist"/>
-        <ref name="draw-page-attlist"/>
-        <optional>
-            <ref name="office-forms"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="shape"/>
-        </zeroOrMore>
-        <optional>
-            <choice>
-                <ref name="presentation-animations"/>
-                <ref name="animation-element"/>
-            </choice>
-        </optional>
-        <optional>
-            <ref name="presentation-notes"/>
-        </optional>
-    </element>
-</define>
-<define name="draw-page-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-page-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-page-attlist" combine="interleave">
-    <attribute name="draw:master-page-name">
-        <ref name="styleNameRef"/>
-    </attribute>
-</define>
-<define name="draw-page-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:presentation-page-layout-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-presentation-header-footer-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:use-header-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-presentation-header-footer-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:use-footer-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-presentation-header-footer-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:use-date-time-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-page-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:id">
-            <ref name="ID"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-page-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:nav-order">
-            <ref name="IDREFS"/>
-        </attribute>
-    </optional>
-</define>
-<define name="shape">
-    <choice>
-        <ref name="draw-rect"/>
-        <ref name="draw-line"/>
-        <ref name="draw-polyline"/>
-        <ref name="draw-polygon"/>
-        <ref name="draw-regular-polygon"/>
-        <ref name="draw-path"/>
-        <ref name="draw-circle"/>
-        <ref name="draw-ellipse"/>
-        <ref name="draw-g"/>
-        <ref name="draw-page-thumbnail"/>
-        <ref name="draw-frame"/>
-        <ref name="draw-measure"/>
-        <ref name="draw-caption"/>
-        <ref name="draw-connector"/>
-        <ref name="draw-control"/>
-        <ref name="dr3d-scene"/>
-        <ref name="draw-custom-shape"/>
-    </choice>
-</define>
-<define name="draw-rect">
-    <element name="draw:rect">
-        <ref name="draw-rect-attlist"/>
-        <ref name="common-draw-position-attlist"/>
-        <ref name="common-draw-size-attlist"/>
-        <ref name="common-draw-shape-with-text-and-styles-attlist"/>
-        <ref name="common-draw-caption-id-attlist"/>
-        <optional>
-            <ref name="svg-title"/>
-        </optional>
-        <optional>
-            <ref name="svg-desc"/>
-        </optional>
-        <optional>
-            <ref name="office-event-listeners"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="draw-glue-point"/>
-        </zeroOrMore>
-        <ref name="draw-text"/>
-    </element>
-</define>
-<define name="draw-rect-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:corner-radius">
-            <ref name="nonNegativeLength"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-line">
-    <element name="draw:line">
-        <ref name="draw-line-attlist"/>
-        <ref name="common-draw-shape-with-text-and-styles-attlist"/>
-        <ref name="common-draw-caption-id-attlist"/>
-        <optional>
-            <ref name="svg-title"/>
-        </optional>
-        <optional>
-            <ref name="svg-desc"/>
-        </optional>
-        <optional>
-            <ref name="office-event-listeners"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="draw-glue-point"/>
-        </zeroOrMore>
-        <ref name="draw-text"/>
-    </element>
-</define>
-<define name="draw-line-attlist" combine="interleave">
-    <attribute name="svg:x1">
-        <ref name="coordinate"/>
-    </attribute>
-    <attribute name="svg:y1">
-        <ref name="coordinate"/>
-    </attribute>
-</define>
-<define name="draw-line-attlist" combine="interleave">
-    <attribute name="svg:x2">
-        <ref name="coordinate"/>
-    </attribute>
-    <attribute name="svg:y2">
-        <ref name="coordinate"/>
-    </attribute>
-</define>
-<define name="draw-polyline">
-    <element name="draw:polyline">
-        <ref name="common-draw-points-attlist"/>
-        <ref name="common-draw-position-attlist"/>
-        <ref name="common-draw-size-attlist"/>
-        <ref name="common-draw-viewbox-attlist"/>
-        <ref name="common-draw-shape-with-text-and-styles-attlist"/>
-        <ref name="common-draw-caption-id-attlist"/>
-        <optional>
-            <ref name="svg-title"/>
-        </optional>
-        <optional>
-            <ref name="svg-desc"/>
-        </optional>
-        <optional>
-            <ref name="office-event-listeners"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="draw-glue-point"/>
-        </zeroOrMore>
-        <ref name="draw-text"/>
-    </element>
-</define>
-<define name="common-draw-points-attlist">
-    <attribute name="draw:points">
-        <ref name="points"/>
-    </attribute>
-</define>
-<define name="draw-polygon">
-    <element name="draw:polygon">
-        <ref name="common-draw-points-attlist"/>
-        <ref name="common-draw-position-attlist"/>
-        <ref name="common-draw-size-attlist"/>
-        <ref name="common-draw-viewbox-attlist"/>
-        <ref name="common-draw-shape-with-text-and-styles-attlist"/>
-        <ref name="common-draw-caption-id-attlist"/>
-        <optional>
-            <ref name="svg-title"/>
-        </optional>
-        <optional>
-            <ref name="svg-desc"/>
-        </optional>
-        <optional>
-            <ref name="office-event-listeners"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="draw-glue-point"/>
-        </zeroOrMore>
-        <ref name="draw-text"/>
-    </element>
-</define>
-<define name="draw-regular-polygon">
-    <element name="draw:regular-polygon">
-        <ref name="draw-regular-polygon-attlist"/>
-        <ref name="common-draw-position-attlist"/>
-        <ref name="common-draw-size-attlist"/>
-        <ref name="common-draw-shape-with-text-and-styles-attlist"/>
-        <ref name="common-draw-caption-id-attlist"/>
-        <optional>
-            <ref name="svg-title"/>
-        </optional>
-        <optional>
-            <ref name="svg-desc"/>
-        </optional>
-        <optional>
-            <ref name="office-event-listeners"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="draw-glue-point"/>
-        </zeroOrMore>
-        <ref name="draw-text"/>
-    </element>
-</define>
-<define name="draw-regular-polygon-attlist" combine="interleave">
-    <choice>
-        <attribute name="draw:concave">
-            <value>false</value>
-        </attribute>
-        <group>
-            <attribute name="draw:concave">
-                <value>true</value>
-            </attribute>
-            <ref name="draw-regular-polygon-sharpness-attlist"/>
-        </group>
-    </choice>
-</define>
-<define name="draw-regular-polygon-attlist" combine="interleave">
-    <attribute name="draw:corners">
-        <ref name="positiveInteger"/>
-    </attribute>
-</define>
-<define name="draw-regular-polygon-sharpness-attlist">
-    <attribute name="draw:sharpness">
-        <ref name="percent"/>
-    </attribute>
-</define>
-<define name="draw-path">
-    <element name="draw:path">
-        <ref name="common-draw-path-data-attlist"/>
-        <ref name="common-draw-position-attlist"/>
-        <ref name="common-draw-size-attlist"/>
-        <ref name="common-draw-viewbox-attlist"/>
-        <ref name="common-draw-shape-with-text-and-styles-attlist"/>
-        <ref name="common-draw-caption-id-attlist"/>
-        <optional>
-            <ref name="svg-title"/>
-        </optional>
-        <optional>
-            <ref name="svg-desc"/>
-        </optional>
-        <optional>
-            <ref name="office-event-listeners"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="draw-glue-point"/>
-        </zeroOrMore>
-        <ref name="draw-text"/>
-    </element>
-</define>
-<define name="common-draw-path-data-attlist">
-    <attribute name="svg:d">
-        <ref name="pathData"/>
-    </attribute>
-</define>
-<define name="draw-circle">
-    <element name="draw:circle">
-        <ref name="draw-circle-attlist"/>
-        <ref name="common-draw-circle-ellipse-attlist"/>
-        <ref name="common-draw-position-attlist"/>
-        <ref name="common-draw-size-attlist"/>
-        <ref name="common-draw-shape-with-text-and-styles-attlist"/>
-        <ref name="common-draw-caption-id-attlist"/>
-        <optional>
-            <ref name="svg-title"/>
-        </optional>
-        <optional>
-            <ref name="svg-desc"/>
-        </optional>
-        <optional>
-            <ref name="office-event-listeners"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="draw-glue-point"/>
-        </zeroOrMore>
-        <ref name="draw-text"/>
-    </element>
-</define>
-<define name="common-draw-circle-ellipse-attlist" combine="interleave">
-    <optional>
-        <attribute name="svg:cx">
-            <ref name="coordinate"/>
-        </attribute>
-        <attribute name="svg:cy">
-            <ref name="coordinate"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-circle-attlist" combine="interleave">
-    <optional>
-        <attribute name="svg:r">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-draw-circle-ellipse-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:kind" a:defaultValue="full">
-            <choice>
-                <value>full</value>
-                <value>section</value>
-                <value>cut</value>
-                <value>arc</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="common-draw-circle-ellipse-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:start-angle">
-            <ref name="double"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-draw-circle-ellipse-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:end-angle">
-            <ref name="double"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-ellipse">
-    <element name="draw:ellipse">
-        <ref name="common-draw-circle-ellipse-attlist"/>
-        <ref name="draw-ellipse-attlist"/>
-        <ref name="common-draw-position-attlist"/>
-        <ref name="common-draw-size-attlist"/>
-        <ref name="common-draw-shape-with-text-and-styles-attlist"/>
-        <ref name="common-draw-caption-id-attlist"/>
-        <optional>
-            <ref name="svg-title"/>
-        </optional>
-        <optional>
-            <ref name="svg-desc"/>
-        </optional>
-        <optional>
-            <ref name="office-event-listeners"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="draw-glue-point"/>
-        </zeroOrMore>
-        <ref name="draw-text"/>
-    </element>
-</define>
-<define name="draw-ellipse-attlist" combine="interleave">
-    <optional>
-        <attribute name="svg:rx">
-            <ref name="length"/>
-        </attribute>
-        <attribute name="svg:ry">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-connector">
-    <element name="draw:connector">
-        <ref name="draw-connector-attlist"/>
-        <ref name="common-draw-shape-with-text-and-styles-attlist"/>
-        <ref name="common-draw-caption-id-attlist"/>
-        <optional>
-            <ref name="svg-title"/>
-        </optional>
-        <optional>
-            <ref name="svg-desc"/>
-        </optional>
-        <optional>
-            <ref name="office-event-listeners"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="draw-glue-point"/>
-        </zeroOrMore>
-        <ref name="draw-text"/>
-    </element>
-</define>
-<define name="draw-connector-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:type" a:defaultValue="standard">
-            <choice>
-                <value>standard</value>
-                <value>lines</value>
-                <value>line</value>
-                <value>curve</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-connector-attlist" combine="interleave">
-    <optional>
-        <attribute name="svg:x1">
-            <ref name="coordinate"/>
-        </attribute>
-        <attribute name="svg:y1">
-            <ref name="coordinate"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-connector-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:start-shape">
-            <ref name="IDREF"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-connector-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:start-glue-point">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-connector-attlist" combine="interleave">
-    <optional>
-        <attribute name="svg:x2">
-            <ref name="coordinate"/>
-        </attribute>
-        <attribute name="svg:y2">
-            <ref name="coordinate"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-connector-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:end-shape">
-            <ref name="IDREF"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-connector-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:end-glue-point">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-connector-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:line-skew">
-            <list>
-                <ref name="length"/>
-                <optional>
-                    <ref name="length"/>
-                    <optional>
-                        <ref name="length"/>
-                    </optional>
-                </optional>
-            </list>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-caption">
-    <element name="draw:caption">
-        <ref name="draw-caption-attlist"/>
-        <ref name="common-draw-position-attlist"/>
-        <ref name="common-draw-size-attlist"/>
-        <ref name="common-draw-shape-with-text-and-styles-attlist"/>
-        <ref name="common-draw-caption-id-attlist"/>
-        <optional>
-            <ref name="svg-title"/>
-        </optional>
-        <optional>
-            <ref name="svg-desc"/>
-        </optional>
-        <optional>
-            <ref name="office-event-listeners"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="draw-glue-point"/>
-        </zeroOrMore>
-        <ref name="draw-text"/>
-    </element>
-</define>
-<define name="draw-caption-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:caption-point-x">
-            <ref name="coordinate"/>
-        </attribute>
-        <attribute name="draw:caption-point-y">
-            <ref name="coordinate"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-caption-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:corner-radius">
-            <ref name="nonNegativeLength"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-measure">
-    <element name="draw:measure">
-        <ref name="draw-measure-attlist"/>
-        <ref name="common-draw-shape-with-text-and-styles-attlist"/>
-        <ref name="common-draw-caption-id-attlist"/>
-        <optional>
-            <ref name="svg-title"/>
-        </optional>
-        <optional>
-            <ref name="svg-desc"/>
-        </optional>
-        <optional>
-            <ref name="office-event-listeners"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="draw-glue-point"/>
-        </zeroOrMore>
-        <ref name="draw-text"/>
-    </element>
-</define>
-<define name="draw-measure-attlist" combine="interleave">
-    <attribute name="svg:x1">
-        <ref name="coordinate"/>
-    </attribute>
-    <attribute name="svg:y1">
-        <ref name="coordinate"/>
-    </attribute>
-</define>
-<define name="draw-measure-attlist" combine="interleave">
-    <attribute name="svg:x2">
-        <ref name="coordinate"/>
-    </attribute>
-    <attribute name="svg:y2">
-        <ref name="coordinate"/>
-    </attribute>
-</define>
-<define name="draw-control">
-    <element name="draw:control">
-        <ref name="draw-control-attlist"/>
-        <ref name="common-draw-position-attlist"/>
-        <ref name="common-draw-size-attlist"/>
-        <ref name="common-draw-shape-with-text-and-styles-attlist"/>    
-        <ref name="common-draw-caption-id-attlist"/>
-        <optional>
-            <ref name="svg-title"/>
-        </optional>
-        <optional>
-            <ref name="svg-desc"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="draw-glue-point"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="draw-control-attlist" combine="interleave">
-    <attribute name="draw:control">
-        <ref name="IDREF"/>
-    </attribute>
-</define>
-<define name="draw-page-thumbnail">
-    <element name="draw:page-thumbnail">
-        <ref name="draw-page-thumbnail-attlist"/>
-        <ref name="common-draw-position-attlist"/>
-        <ref name="common-draw-size-attlist"/>
-        <ref name="presentation-shape-attlist"/>
-        <ref name="common-draw-shape-with-styles-attlist"/>
-        <ref name="common-draw-caption-id-attlist"/>
-        <optional>
-            <ref name="svg-title"/>
-        </optional>
-        <optional>
-            <ref name="svg-desc"/>
-        </optional>
-    </element>
-</define>
-<define name="draw-page-thumbnail-attlist">
-    <optional>
-        <attribute name="draw:page-number">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-g">
-    <element name="draw:g">
-        <ref name="draw-g-attlist"/>
-        <ref name="common-draw-z-index-attlist"/>
-        <ref name="common-draw-name-attlist"/>
-        <ref name="common-draw-id-attlist"/>
-        <ref name="common-draw-style-name-attlist"/>
-        <ref name="common-text-spreadsheet-shape-attlist"/>
-        <ref name="common-draw-caption-id-attlist"/>
-        <optional>
-            <ref name="svg-title"/>
-        </optional>
-        <optional>
-            <ref name="svg-desc"/>
-        </optional>
-        <optional>
-            <ref name="office-event-listeners"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="draw-glue-point"/>
-        </zeroOrMore>
-        <zeroOrMore>
-            <ref name="shape"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="draw-g-attlist" combine="interleave">
-    <optional>
-        <attribute name="svg:y">
-            <ref name="coordinate"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-draw-name-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-draw-caption-id-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:caption-id">
-            <ref name="IDREF"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-draw-position-attlist">
-    <optional>
-        <attribute name="svg:x">
-            <ref name="coordinate"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:y">
-            <ref name="coordinate"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-draw-size-attlist">
-    <optional>
-        <attribute name="svg:width">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:height">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-draw-transform-attlist">
-    <optional>
-        <attribute name="draw:transform">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-draw-viewbox-attlist">
-    <attribute name="svg:viewBox">
-        <list>
-            <ref name="integer"/>
-            <ref name="integer"/>
-            <ref name="integer"/>
-            <ref name="integer"/>
-        </list>
-    </attribute>
-</define>
-<define name="common-draw-style-name-attlist">
-    <choice>
-        <group>
-            <optional>
-                <attribute name="draw:style-name">
-                    <ref name="styleNameRef"/>
-                </attribute>
-            </optional>
-            <optional>
-                <attribute name="draw:class-names">
-                    <ref name="styleNameRefs"/>
-                </attribute>
-            </optional>
-        </group>
-        <group>
-            <optional>
-                <attribute name="presentation:style-name">
-                    <ref name="styleNameRef"/>
-                </attribute>
-            </optional>
-            <optional>
-                <attribute name="presentation:class-names">
-                    <ref name="styleNameRefs"/>
-                </attribute>
-            </optional>
-        </group>
-    </choice>
-</define>
-<define name="common-draw-text-style-name-attlist">
-    <optional>
-        <attribute name="draw:text-style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-draw-layer-name-attlist">
-    <optional>
-        <attribute name="draw:layer">
-            <data type="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-draw-id-attlist">
-    <optional>
-        <attribute name="draw:id">
-            <ref name="ID"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-draw-z-index-attlist">
-    <optional>
-        <attribute name="draw:z-index">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-text-spreadsheet-shape-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:end-cell-address">
-            <ref name="cellAddress"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="table:end-x">
-            <ref name="coordinate"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="table:end-y">
-            <ref name="coordinate"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-text-spreadsheet-shape-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:table-background">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-text-spreadsheet-shape-attlist" combine="interleave">
-    <ref name="common-text-anchor-attlist"/>
-</define>
-
-<define name="common-text-anchor-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:anchor-type">
-            <choice>
-                <value>page</value>
-                <value>frame</value>
-                <value>paragraph</value>
-                <value>char</value>
-                <value>as-char</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="common-text-anchor-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:anchor-page-number">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-text">
-    <zeroOrMore>
-        <choice>
-            <ref name="text-p"/>
-            <ref name="text-list"/>
-        </choice>
-    </zeroOrMore>
-</define>
-<define name="common-draw-shape-with-styles-attlist">
-    <ref name="common-draw-z-index-attlist"/>
-    <ref name="common-draw-id-attlist"/>
-    <ref name="common-draw-layer-name-attlist"/>
-    <ref name="common-draw-style-name-attlist"/>
-    <ref name="common-draw-transform-attlist"/>
-    <ref name="common-draw-name-attlist"/>
-    <ref name="common-text-spreadsheet-shape-attlist"/>
-</define>
-<define name="common-draw-shape-with-text-and-styles-attlist">
-    <ref name="common-draw-shape-with-styles-attlist"/>
-    <ref name="common-draw-text-style-name-attlist"/>
-</define>
-<define name="draw-glue-point">
-    <element name="draw:glue-point">
-        <ref name="draw-glue-point-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="draw-glue-point-attlist" combine="interleave">
-    <attribute name="draw:id">
-        <ref name="nonNegativeInteger"/>
-    </attribute>
-</define>
-<define name="draw-glue-point-attlist" combine="interleave">
-    <attribute name="svg:x">
-        <choice>
-            <ref name="distance"/> 
-            <ref name="percent"/>
-        </choice>
-    </attribute>
-    <attribute name="svg:y">
-        <choice>
-            <ref name="distance"/> 
-            <ref name="percent"/>
-        </choice>
-    </attribute>
-</define>
-<define name="draw-glue-point-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:align">
-            <choice>
-                <value>top-left</value>
-                <value>top</value>
-                <value>top-right</value>
-                <value>left</value>
-                <value>center</value>
-                <value>right</value>
-                <value>bottom-left</value>
-                <value>bottom-right</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-glue-points-attlist" combine="interleave">
-    <attribute name="draw:escape-direction">
-        <choice>
-            <value>auto</value>
-            <value>left</value>
-            <value>right</value>
-            <value>up</value>
-            <value>down</value>
-            <value>horizontal</value>
-            <value>vertical</value>
-        </choice>
-    </attribute>
-</define>
-<define name="svg-title">
-    <element name="svg:title">
-        <text/>
-    </element>
-</define>
-<define name="svg-desc">
-    <element name="svg:desc">
-        <text/>
-    </element>
-</define>
-<define name="draw-frame">
-    <element name="draw:frame">
-        <ref name="common-draw-shape-with-text-and-styles-attlist"/>
-        <ref name="common-draw-position-attlist"/>
-        <ref name="common-draw-rel-size-attlist"/>
-        <ref name="common-draw-caption-id-attlist"/>
-        <ref name="presentation-shape-attlist"/>
-        <ref name="draw-frame-attlist"/>
-        <zeroOrMore>
-            <choice>
-                <ref name="draw-text-box"/>
-                <ref name="draw-image"/>
-                <ref name="draw-object"/>
-                <ref name="draw-object-ole"/>
-                <ref name="draw-applet"/>
-                <ref name="draw-floating-frame"/>
-                <ref name="draw-plugin"/>
-            </choice>
-        </zeroOrMore>
-        <optional>
-            <ref name="office-event-listeners"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="draw-glue-point"/>
-        </zeroOrMore>
-        <optional>
-            <ref name="draw-image-map"/>
-        </optional>
-        <optional>
-            <ref name="svg-title"/>
-        </optional>
-        <optional>
-            <ref name="svg-desc"/>
-        </optional>
-        <optional>
-            <choice>
-                <ref name="draw-contour-polygon"/>
-                <ref name="draw-contour-path"/>
-            </choice>
-        </optional>
-    </element>
-</define>
-<define name="common-draw-rel-size-attlist">
-    <ref name="common-draw-size-attlist"/>
-    <optional>
-        <attribute name="style:rel-width">
-            <choice>
-                <ref name="percent"/>
-                <value>scale</value>
-                <value>scale-min</value>
-            </choice>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:rel-height">
-            <choice>
-                <ref name="percent"/>
-                <value>scale</value>
-                <value>scale-min</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-frame-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:copy-of">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-text-box">
-    <element name="draw:text-box">
-        <ref name="draw-text-box-attlist"/>
-        <zeroOrMore>
-            <ref name="text-content"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="draw-text-box-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:chain-next-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-text-box-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:corner-radius">
-            <ref name="nonNegativeLength"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-text-box-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:min-height">
-            <choice>
-                <ref name="length"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="fo:min-width">
-            <choice>
-                <ref name="length"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-text-box-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:max-height">
-            <choice>
-                <ref name="length"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="fo:max-width">
-            <choice>
-                <ref name="length"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-text-box-attlist" combine="interleave">
-    <optional>
-        <ref name="text-id"/>
-    </optional>
-</define>
-<define name="draw-image">
-    <element name="draw:image">
-        <ref name="draw-image-attlist"/>
-        <choice>
-            <ref name="common-draw-data-attlist"/>
-            <ref name="office-binary-data"/>
-        </choice>
-        <ref name="draw-text"/>
-    </element>
-</define>
-<define name="common-draw-data-attlist" combine="interleave">
-    <group>
-        <attribute name="xlink:href">
-            <ref name="anyURI"/>
-        </attribute>
-        <optional>
-            <attribute name="xlink:type" a:defaultValue="simple">
-                <choice>
-                    <value>simple</value>
-                </choice>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="xlink:show" a:defaultValue="embed">
-                <choice>
-                    <value>embed</value>
-                </choice>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="xlink:actuate" a:defaultValue="onLoad">
-                <choice>
-                    <value>onLoad</value>
-                </choice>
-            </attribute>
-        </optional>
-    </group>
-</define>
-
-<define name="office-binary-data">
-    <element name="office:binary-data">
-        <ref name="base64Binary"/>
-    </element>
-</define>
-<define name="draw-image-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:filter-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-object">
-    <element name="draw:object">
-        <ref name="draw-object-attlist"/>
-        <choice>
-            <ref name="common-draw-data-attlist"/>
-            <ref name="office-document"/>
-            <ref name="math-math"/>
-        </choice>
-    </element>
-</define>
-
-<define name="draw-object-ole">
-    <element name="draw:object-ole">
-        <ref name="draw-object-ole-attlist"/>
-        <choice>
-            <ref name="common-draw-data-attlist"/>
-            <ref name="office-binary-data"/>
-        </choice>
-    </element>
-</define>
-<define name="draw-object-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:notify-on-update-of-ranges">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-object-ole-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:class-id"/>
-    </optional>
-</define>
-<define name="draw-applet">
-    <element name="draw:applet">
-        <ref name="draw-applet-attlist"/>
-        <optional>
-            <ref name="common-draw-data-attlist"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="draw-param"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="draw-applet-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:code"/>
-    </optional>
-</define>
-<define name="draw-applet-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:object"/>
-    </optional>
-</define>
-<define name="draw-applet-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:archive"/>
-    </optional>
-</define>
-<define name="draw-applet-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:may-script" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-plugin">
-    <element name="draw:plugin">
-        <ref name="draw-plugin-attlist"/>
-        <ref name="common-draw-data-attlist"/>
-        <zeroOrMore>
-            <ref name="draw-param"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="draw-plugin-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:mime-type"/>
-    </optional>
-</define>
-<define name="draw-param">
-    <element name="draw:param">
-        <ref name="draw-param-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="draw-param-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:name"/>
-    </optional>
-</define>
-<define name="draw-param-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:value"/>
-    </optional>
-</define>
-<define name="draw-floating-frame">
-    <element name="draw:floating-frame">
-        <ref name="draw-floating-frame-attlist"/>
-        <ref name="common-draw-data-attlist"/>
-    </element>
-</define>
-<define name="draw-floating-frame-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:frame-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-contour-polygon">
-    <element name="draw:contour-polygon">
-        <ref name="common-contour-attlist"/>
-        <ref name="common-draw-size-attlist"/>
-        <ref name="common-draw-viewbox-attlist"/>
-        <ref name="common-draw-points-attlist"/>
-        <empty/>
-    </element>
-</define>
-
-<define name="draw-contour-path">
-    <element name="draw:contour-path">
-        <ref name="common-contour-attlist"/>
-        <ref name="common-draw-size-attlist"/>
-        <ref name="common-draw-viewbox-attlist"/>
-        <ref name="common-draw-path-data-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="common-contour-attlist" combine="interleave">
-    <attribute name="draw:recreate-on-edit">
-        <ref name="boolean"/>
-    </attribute>
-</define>
-<define name="draw-a">
-    <element name="draw:a">
-        <ref name="draw-a-attlist"/>
-        <ref name="draw-frame"/>
-    </element>
-</define>
-<define name="draw-a-attlist" combine="interleave">
-    <attribute name="xlink:href">
-        <ref name="anyURI"/>
-    </attribute>
-    <optional>
-        <attribute name="xlink:type" a:defaultValue="simple">
-            <value>simple</value>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="xlink:actuate" a:defaultValue="onRequest">
-            <choice>
-                <value>onRequest</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-a-attlist" combine="interleave">
-    <optional>
-        <attribute name="office:target-frame-name">
-            <ref name="targetFrameName"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="xlink:show">
-            <choice>
-                <value>new</value>
-                <value>replace</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-a-attlist" combine="interleave">
-    <optional>
-        <attribute name="office:name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-a-attlist" combine="interleave">
-    <optional>
-        <attribute name="office:title">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-a-attlist" combine="interleave">
-    <optional>
-        <attribute name="office:server-map" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-image-map">
-    <element name="draw:image-map">
-        <zeroOrMore>
-            <choice>
-                <ref name="draw-area-rectangle"/>
-                <ref name="draw-area-circle"/>
-                <ref name="draw-area-polygon"/>
-            </choice>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="draw-area-rectangle">
-    <element name="draw:area-rectangle">
-        <ref name="common-draw-area-attlist"/>
-        <attribute name="svg:x">
-            <ref name="coordinate"/>
-        </attribute>
-        <attribute name="svg:y">
-            <ref name="coordinate"/>
-        </attribute>
-        <attribute name="svg:width">
-            <ref name="length"/>
-        </attribute>
-        <attribute name="svg:height">
-            <ref name="length"/>
-        </attribute>
-        <optional>
-            <ref name="svg-title"/>
-        </optional>
-        <optional>
-            <ref name="svg-desc"/>
-        </optional>
-        <optional>
-            <ref name="office-event-listeners"/>
-        </optional>
-    </element>
-</define>
-<define name="draw-area-circle">
-    <element name="draw:area-circle">
-        <ref name="common-draw-area-attlist"/>
-        <attribute name="svg:cx">
-            <ref name="coordinate"/>
-        </attribute>
-        <attribute name="svg:cy">
-            <ref name="coordinate"/>
-        </attribute>
-        <attribute name="svg:r">
-            <ref name="length"/>
-        </attribute>
-        <optional>
-            <ref name="svg-title"/>
-        </optional>
-        <optional>
-            <ref name="svg-desc"/>
-        </optional>
-        <optional>
-            <ref name="office-event-listeners"/>
-        </optional>
-    </element>
-</define>
-<define name="draw-area-polygon">
-    <element name="draw:area-polygon">
-        <ref name="common-draw-area-attlist"/>
-        <attribute name="svg:x">
-            <ref name="coordinate"/>
-        </attribute>
-        <attribute name="svg:y">
-            <ref name="coordinate"/>
-        </attribute>
-        <attribute name="svg:width">
-            <ref name="length"/>
-        </attribute>
-        <attribute name="svg:height">
-            <ref name="length"/>
-        </attribute>
-        <ref name="common-draw-viewbox-attlist"/>
-        <ref name="common-draw-points-attlist"/>
-        <optional>
-            <ref name="svg-title"/>
-        </optional>
-        <optional>
-            <ref name="svg-desc"/>
-        </optional>
-        <optional>
-            <ref name="office-event-listeners"/>
-        </optional>
-    </element>
-</define>
-<define name="common-draw-area-attlist" combine="interleave">
-    <optional>
-        <attribute name="xlink:href">
-            <ref name="anyURI"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="xlink:type" a:defaultValue="simple">
-            <choice>
-                <value>simple</value>
-            </choice>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="office:target-frame-name">
-            <ref name="targetFrameName"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="xlink:show">
-            <choice>
-                <value>new</value>
-                <value>replace</value>
-            </choice>
-            </attribute>
-    </optional>
-</define>
-<define name="common-draw-area-attlist" combine="interleave">
-    <optional>
-        <attribute name="office:name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-draw-area-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:nohref">
-            <choice>
-                <value>nohref</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="dr3d-scene">
-    <element name="dr3d:scene">
-        <ref name="dr3d-scene-attlist"/>
-        <ref name="common-draw-position-attlist"/>
-        <ref name="common-draw-size-attlist"/>
-        <ref name="common-draw-style-name-attlist"/>
-        <ref name="common-draw-z-index-attlist"/>
-        <ref name="common-draw-id-attlist"/>
-        <ref name="common-draw-layer-name-attlist"/>
-        <ref name="common-text-spreadsheet-shape-attlist"/>
-        <ref name="common-dr3d-transform-attlist"/>
-        <ref name="common-draw-caption-id-attlist"/>
-        <optional>
-            <ref name="svg-title"/>
-        </optional>
-        <optional>
-            <ref name="svg-desc"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="dr3d-light"/>
-        </zeroOrMore>
-        <zeroOrMore>
-            <ref name="shapes3d"/>
-        </zeroOrMore>
-    </element>
-</define>
-
-<define name="shapes3d">
-    <choice>
-        <ref name="dr3d-scene"/>
-        <ref name="dr3d-extrude"/>
-        <ref name="dr3d-sphere"/>
-        <ref name="dr3d-rotate"/>
-        <ref name="dr3d-cube"/>
-    </choice>
-</define>
-<define name="dr3d-scene-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:vrp">
-            <ref name="vector3D"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="dr3d:vpn">
-            <ref name="vector3D"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="dr3d:vup">
-            <ref name="vector3D"/>
-        </attribute>
-    </optional>
-</define>
-<define name="dr3d-scene-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:projection">
-            <choice>
-                <value>parallel</value>
-                <value>perspective</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="dr3d-scene-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:distance">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="dr3d-scene-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:focal-length">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="dr3d-scene-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:shadow-slant">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="dr3d-scene-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:shade-mode">
-            <choice>
-                <value>flat</value>
-                <value>phong</value>
-                <value>gouraud</value>
-                <value>draft</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="dr3d-scene-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:ambient-color">
-            <ref name="color"/>
-        </attribute>
-    </optional>
-</define>
-<define name="dr3d-scene-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:lighting-mode">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-dr3d-transform-attlist">
-    <optional>
-        <attribute name="dr3d:transform"/>
-    </optional>
-</define>
-<define name="dr3d-light">
-    <element name="dr3d:light">
-        <ref name="dr3d-light-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="dr3d-light-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:diffuse-color">
-            <ref name="color"/>
-        </attribute>
-    </optional>
-</define>
-<define name="dr3d-light-attlist" combine="interleave">
-    <attribute name="dr3d:direction">
-        <ref name="vector3D"/>
-    </attribute>
-</define>
-<define name="dr3d-light-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:enabled">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="dr3d-light-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:specular">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="dr3d-cube">
-    <element name="dr3d:cube">
-        <ref name="dr3d-cube-attlist"/>
-        <ref name="common-draw-z-index-attlist"/>
-        <ref name="common-draw-id-attlist"/>
-        <ref name="common-draw-layer-name-attlist"/>
-        <ref name="common-draw-style-name-attlist"/>
-        <ref name="common-dr3d-transform-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="dr3d-cube-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:min-edge">
-            <ref name="vector3D"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="dr3d:max-edge">
-            <ref name="vector3D"/>
-        </attribute>
-    </optional>
-</define>
-<define name="dr3d-sphere">
-    <element name="dr3d:sphere">
-        <ref name="dr3d-sphere-attlist"/>
-        <ref name="common-draw-z-index-attlist"/>
-        <ref name="common-draw-id-attlist"/>
-        <ref name="common-draw-layer-name-attlist"/>
-        <ref name="common-draw-style-name-attlist"/>
-        <ref name="common-dr3d-transform-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="dr3d-sphere-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:center">
-            <ref name="vector3D"/>
-        </attribute>
-    </optional>
-</define>
-<define name="dr3d-sphere-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:size">
-            <ref name="vector3D"/>
-        </attribute>
-    </optional>
-</define>
-<define name="dr3d-extrude">
-    <element name="dr3d:extrude">
-        <ref name="common-draw-path-data-attlist"/>
-        <ref name="common-draw-viewbox-attlist"/>
-        <ref name="common-draw-id-attlist"/>
-        <ref name="common-draw-z-index-attlist"/>
-        <ref name="common-draw-layer-name-attlist"/>
-        <ref name="common-draw-style-name-attlist"/>
-        <ref name="common-dr3d-transform-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="dr3d-rotate">
-    <element name="dr3d:rotate">
-        <ref name="common-draw-viewbox-attlist"/>
-        <ref name="common-draw-path-data-attlist"/>
-        <ref name="common-draw-z-index-attlist"/>
-        <ref name="common-draw-id-attlist"/>
-        <ref name="common-draw-layer-name-attlist"/>
-        <ref name="common-draw-style-name-attlist"/>
-        <ref name="common-dr3d-transform-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="draw-custom-shape">
-    <element name="draw:custom-shape">
-        <ref name="draw-custom-shape-attlist"/>
-        <ref name="common-draw-position-attlist"/>
-        <ref name="common-draw-size-attlist"/>
-        <ref name="common-draw-shape-with-text-and-styles-attlist"/>
-        <ref name="common-draw-caption-id-attlist"/>
-        <optional>
-            <ref name="svg-title"/>
-        </optional>
-        <optional>
-            <ref name="svg-desc"/>
-        </optional>
-        <optional>
-            <ref name="office-event-listeners"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="draw-glue-point"/>
-        </zeroOrMore>
-        <ref name="draw-text"/>
-        <optional>
-            <ref name="draw-enhanced-geometry"/>
-        </optional>
-    </element>
-</define>
-<define name="draw-custom-shape-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:engine">
-            <ref name="namespacedToken"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-custom-shape-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:data">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry">
-    <element name="draw:enhanced-geometry">
-        <ref name="draw-enhanced-geometry-attlist"/>
-        <zeroOrMore>
-            <ref name="draw-equation"/>
-        </zeroOrMore>
-        <zeroOrMore>
-            <ref name="draw-handle"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:type" a:defaultValue="non-primitive">
-            <ref name="custom-shape-type"/>
-        </attribute>
-    </optional>
-</define>
-
-<define name="custom-shape-type">
-    <choice>
-        <value>non-primitive</value>
-        <ref name="string"/>
-    </choice>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="svg:viewBox">
-            <list>
-                <ref name="integer"/>
-                <ref name="integer"/>
-                <ref name="integer"/>
-                <ref name="integer"/>
-            </list>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:mirror-vertical" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="draw:mirror-horizontal" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:text-rotate-angle" a:defaultValue="0">
-            <ref name="double"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:extrusion-allowed" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:text-path-allowed" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:concentric-gradient-fill-allowed"
-                    a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:extrusion" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:extrusion-brightness" a:defaultValue="33%">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:extrusion-depth" a:defaultValue="36pt 0">
-            <list>
-                <ref name="length"/>
-                <ref name="double"/>
-            </list>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:extrusion-diffusion" a:defaultValue="0%">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:extrusion-number-of-line-segments"
-                   a:defaultValue="30">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:extrusion-light-face" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:extrusion-first-light-harsh"
-                   a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:extrusion-second-light-harsh"
-                   a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:extrusion-first-light-level"
-                   a:defaultValue="66%">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:extrusion-second-light-level"
-                   a:defaultValue="66%">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:extrusion-first-light-direction"
-                   a:defaultValue="(5 0 1)">
-            <ref name="vector3D"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:extrusion-second-light-direction"
-                   a:defaultValue="(-5 0 1)">
-            <ref name="vector3D"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:extrusion-metal" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:shade-mode" a:defaultValue="flat">
-            <choice>
-                <value>flat</value>
-                <value>phong</value>
-                <value>gouraud</value>
-                <value>draft</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:extrusion-rotation-angle" a:defaultValue="0 0">
-            <list>
-                <ref name="double"/>
-                <ref name="double"/>
-            </list>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:extrusion-rotation-center">
-            <ref name="vector3D"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:extrusion-shininess" a:defaultValue="50%">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:extrusion-skew" a:defaultValue="50 45">
-            <list>
-                <ref name="double"/>
-                <ref name="double"/>
-            </list>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:extrusion-specularity" a:defaultValue="0%">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:projection" a:defaultValue="parallel">
-            <choice>
-                <value>parallel</value>
-                <value>perspective</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:extrusion-viewpoint" 
-                   a:defaultValue="3.5cm -3.5cm 25cm">
-            <ref name="point3D"/>
-        </attribute>
-    </optional>
-</define>
-
-<define name="point3D">
-    <data type="string"/>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:extrusion-origin" a:defaultValue="0.5 -0.5">
-            <list>
-                <ref name="double"/>
-                <ref name="double"/>
-            </list>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:extrusion-color" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:enhanced-path">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:path-stretchpoint-x" a:defaultValue="0">
-            <ref name="double"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="draw:path-stretchpoint-y" a:defaultValue="0">
-            <ref name="double"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:text-areas">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:glue-points">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:glue-point-type" a:defaultValue="none">
-            <choice>
-                <value>none</value>
-                <value>segments</value>
-                <value>rectangle</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:glue-point-leaving-directions"/>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:text-path" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:text-path-mode" a:defaultValue="normal">
-            <choice>
-                <value>normal</value>
-                <value>path</value>
-                <value>shape</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:text-path-scale" a:defaultValue="path">
-            <choice>
-                <value>path</value>
-                <value>shape</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:text-path-same-letter-heights"
-                   a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:modifiers">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-equation">
-    <element name="draw:equation">
-        <ref name="draw-equation-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="draw-equation-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-equation-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:formula">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-handle">
-    <element name="draw:handle">
-        <ref name="draw-handle-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="draw-handle-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:handle-mirror-vertical" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-handle-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:handle-mirror-horizontal" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-handle-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:handle-switched" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-handle-attlist" combine="interleave">
-    <attribute name="draw:handle-position">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="draw-handle-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:handle-range-x-minimum">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-handle-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:handle-range-x-maximum">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-handle-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:handle-range-y-minimum">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-handle-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:handle-range-y-maximum">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-handle-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:handle-polar">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-handle-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:handle-radius-range-minimum">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-handle-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:handle-radius-range-maximum">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-shape-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:class">
-            <ref name="presentation-classes"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-classes">
-    <choice>
-        <value>title</value>
-        <value>outline</value>
-        <value>subtitle</value>
-        <value>text</value>
-        <value>graphic</value>
-        <value>object</value>
-        <value>chart</value>
-        <value>table</value>
-        <value>orgchart</value>
-        <value>page</value>
-        <value>notes</value>
-        <value>handout</value>
-        <value>header</value>
-        <value>footer</value>
-        <value>date-time</value>
-        <value>page-number</value>
-    </choice>
-</define>
-<define name="presentation-shape-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:placeholder">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-shape-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:user-transformed">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-animations">
-    <element name="presentation:animations">
-        <zeroOrMore>
-            <choice>
-                <ref name="presentation-animation-elements"/>
-                <ref name="presentation-animation-group"/>
-            </choice>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="presentation-animation-elements">
-    <choice>
-        <ref name="presentation-show-shape"/>
-        <ref name="presentation-show-text"/>
-        <ref name="presentation-hide-shape"/>
-        <ref name="presentation-hide-text"/>
-        <ref name="presentation-dim"/>
-        <ref name="presentation-play"/>
-    </choice>
-</define>
-<define name="presentation-sound">
-    <element name="presentation:sound">
-        <ref name="presentation-sound-attlist"/>
-        <attribute name="xlink:href">
-            <ref name="anyURI"/>
-        </attribute>
-        <optional>
-            <attribute name="xlink:type" a:defaultValue="simple">
-                <choice>
-                    <value>simple</value>
-                </choice>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="xlink:actuate" a:defaultValue="onRequest">
-                <choice>
-                    <value>onRequest</value>
-                </choice>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="xlink:show">
-                <choice>
-                    <value>new</value>
-                    <value>replace</value>
-                </choice>
-            </attribute>
-        </optional>
-        <empty/>
-    </element>
-</define>
-<define name="presentation-sound-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:play-full">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-show-shape">
-    <element name="presentation:show-shape">
-        <ref name="common-presentation-effect-attlist"/>
-        <optional>
-            <ref name="presentation-sound"/>
-        </optional>
-    </element>
-</define>
-<define name="common-presentation-effect-attlist" combine="interleave">
-    <attribute name="draw:shape-id">
-        <ref name="IDREF"/>
-    </attribute>
-</define>
-<define name="common-presentation-effect-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:effect" a:defaultValue="none">
-            <ref name="presentationEffects"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentationEffects">
-    <choice>
-        <value>none</value>
-        <value>fade</value>
-        <value>move</value>
-        <value>stripes</value>
-        <value>open</value>
-        <value>close</value>
-        <value>dissolve</value>
-        <value>wavyline</value>
-        <value>random</value>
-        <value>lines</value>
-        <value>laser</value>
-        <value>appear</value>
-        <value>hide</value>
-        <value>move-short</value>
-        <value>checkerboard</value>
-        <value>rotate</value>
-        <value>stretch</value>
-    </choice>
-</define>
-<define name="common-presentation-effect-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:direction" a:defaultValue="none">
-            <ref name="presentationEffectDirections"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentationEffectDirections">
-    <choice>
-        <value>none</value>
-        <value>from-left</value>
-        <value>from-top</value>
-        <value>from-right</value>
-        <value>from-bottom</value>
-        <value>from-center</value>
-        <value>from-upper-left</value>
-        <value>from-upper-right</value>
-        <value>from-lower-left</value>
-        <value>from-lower-right</value>
-        <value>to-left</value>
-        <value>to-top</value>
-        <value>to-right</value>
-        <value>to-bottom</value>
-        <value>to-upper-left</value>
-        <value>to-upper-right</value>
-        <value>to-lower-right</value>
-        <value>to-lower-left</value>
-        <value>path</value>
-        <value>spiral-inward-left</value>
-        <value>spiral-inward-right</value>
-        <value>spiral-outward-left</value>
-        <value>spiral-outward-right</value>
-        <value>vertical</value>
-        <value>horizontal</value>
-        <value>to-center</value>
-        <value>clockwise</value>
-        <value>counter-clockwise</value>
-    </choice>
-</define>
-<define name="common-presentation-effect-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:speed" a:defaultValue="medium">
-            <ref name="presentationSpeeds"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentationSpeeds">
-    <choice>
-        <value>slow</value>
-        <value>medium</value>
-        <value>fast</value>
-    </choice>
-</define>
-<define name="common-presentation-effect-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:delay">
-            <ref name="duration"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-presentation-effect-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:start-scale" a:defaultValue="100%">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-presentation-effect-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:path-id"/>
-    </optional>
-</define>
-<define name="presentation-show-text">
-    <element name="presentation:show-text">
-        <ref name="common-presentation-effect-attlist"/>
-        <optional>
-            <ref name="presentation-sound"/>
-        </optional>
-    </element>
-</define>
-<define name="presentation-hide-shape">
-    <element name="presentation:hide-shape">
-        <ref name="common-presentation-effect-attlist"/>
-        <optional>
-            <ref name="presentation-sound"/>
-        </optional>
-    </element>
-</define>
-<define name="presentation-hide-text">
-    <element name="presentation:hide-text">
-        <ref name="common-presentation-effect-attlist"/>
-        <optional>
-            <ref name="presentation-sound"/>
-        </optional>
-    </element>
-</define>
-<define name="presentation-dim">
-    <element name="presentation:dim">
-        <ref name="presentation-dim-attlist"/>
-        <optional>
-            <ref name="presentation-sound"/>
-        </optional>
-    </element>
-</define>
-<define name="presentation-dim-attlist" combine="interleave">
-    <attribute name="draw:shape-id">
-        <ref name="IDREF"/>
-    </attribute>
-</define>
-<define name="presentation-dim-attlist" combine="interleave">
-    <attribute name="draw:color">
-        <ref name="color"/>
-    </attribute>
-</define>
-<define name="presentation-play">
-    <element name="presentation:play">
-        <ref name="presentation-play-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="presentation-play-attlist" combine="interleave">
-    <attribute name="draw:shape-id">
-        <ref name="IDREF"/>
-    </attribute>
-    <optional>
-        <attribute name="presentation:speed" a:defaultValue="medium">
-            <ref name="presentationSpeeds"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-animation-group">
-    <element name="presentation:animation-group">
-        <zeroOrMore>
-            <ref name="presentation-animation-elements"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="common-anim-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:node-type" a:defaultValue="default">
-            <choice>
-                <value>default</value>
-                <value>on-click</value>
-                <value>with-previous</value>
-                <value>after-previous</value>
-                <value>timing-root</value>
-                <value>main-sequence</value>
-                <value>interactive-sequence</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="common-anim-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:preset-id">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-anim-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:preset-sub-type">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-anim-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:preset-class" a:defaultValue="custom">
-            <choice>
-                <value>custom</value>
-                <value>entrance</value>
-                <value>exit</value>
-                <value>emphasis</value>
-                <value>motion-path</value>
-                <value>ole-action</value>
-                <value>media-call</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="common-anim-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:master-element">
-            <ref name="IDREF"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-anim-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:group-id">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-event-listener">
-    <element name="presentation:event-listener">
-        <ref name="presentation-event-listener-attlist"/>
-        <optional>
-            <ref name="presentation-sound"/>
-        </optional>
-    </element>
-</define>
-<define name="presentation-event-listener-attlist" combine="interleave">
-    <attribute name="script:event-name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="presentation-event-listener-attlist" combine="interleave">
-    <attribute name="presentation:action">
-        <choice>
-            <value>none</value>
-            <value>previous-page</value>
-            <value>next-page</value>
-            <value>first-page</value>
-            <value>last-page</value>
-            <value>hide</value>
-            <value>stop</value>
-            <value>execute</value>
-            <value>show</value>
-            <value>verb</value>
-            <value>fade-out</value>
-            <value>sound</value>
-        </choice>
-    </attribute>
-</define>
-<define name="presentation-event-listener-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:effect" a:defaultValue="none">
-            <ref name="presentationEffects"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-event-listener-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:direction" a:defaultValue="none">
-            <ref name="presentationEffectDirections"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-event-listener-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:speed" a:defaultValue="medium">
-            <ref name="presentationSpeeds"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-event-listener-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:start-scale" a:defaultValue="100%">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-event-listener-attlist" combine="interleave">
-    <optional>
-        <attribute name="xlink:href">
-            <ref name="anyURI"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="xlink:type" a:defaultValue="simple">
-            <choice>
-                <value>simple</value>
-            </choice>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="xlink:show" a:defaultValue="embed">
-            <choice>
-                <value>embed</value>
-            </choice>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="xlink:actuate" a:defaultValue="onRequest">
-            <choice>
-                <value>onRequest</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-event-listener-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:verb">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="presentation:header">
-        <empty/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="presentation:footer">
-        <empty/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="presentation:date-time">
-        <empty/>
-    </element>
-</define>
-<define name="presentation-decls">
-    <zeroOrMore>
-        <ref name="presentation-decl"/>
-    </zeroOrMore>
-</define>
-<define name="presentation-decl" combine="choice">
-    <element name="presentation:header-decl">
-        <ref name="presentation-header-decl-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="presentation-header-decl-attlist" combine="interleave">
-    <attribute name="presentation:name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="presentation-decl" combine="choice">
-    <element name="presentation:footer-decl">
-        <ref name="presentation-footer-decl-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="presentation-footer-decl-attlist" combine="interleave">
-    <attribute name="presentation:name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="presentation-decl" combine="choice">
-    <element name="presentation:date-time-decl">
-        <ref name="presentation-date-time-decl-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="presentation-date-time-decl-attlist" combine="interleave">
-    <attribute name="presentation:name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="presentation-date-time-decl-attlist" combine="interleave">
-    <attribute name="presentation:source">
-        <choice>
-            <value>fixed</value>
-            <value>current-date</value>
-        </choice>
-    </attribute>
-</define>
-<define name="presentation-date-time-decl-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:data-style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-settings">
-    <optional>
-        <element name="presentation:settings">
-            <ref name="presentation-settings-attlist"/>
-            <zeroOrMore>
-                <ref name="presentation-show"/>
-            </zeroOrMore>
-        </element>
-    </optional>
-</define>
-<define name="presentation-settings-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:start-page">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-settings-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:show">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-settings-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:full-screen" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-settings-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:endless" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-settings-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:pause">
-            <ref name="duration"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-settings-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:show-logo" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-settings-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:force-manual" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-settings-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:mouse-visible" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-settings-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:mouse-as-pen" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-settings-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:start-with-navigator"
-                   a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-settings-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:animations" a:defaultValue="enabled">
-            <choice>
-                <value>enabled</value>
-                <value>disabled</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-settings-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:transition-on-click"
-                   a:defaultValue="enabled">
-            <choice>
-                <value>enabled</value>
-                <value>disabled</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-settings-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:stay-on-top" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-settings-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:show-end-of-presentation-slide"
-                   a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-show">
-    <element name="presentation:show">
-        <ref name="presentation-show-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="presentation-show-attlist" combine="interleave">
-    <attribute name="presentation:name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="presentation-show-attlist" combine="interleave">
-    <attribute name="presentation:pages"/>
-</define>
-<define name="chart-chart">
-    <element name="chart:chart">
-        <ref name="chart-chart-attlist"/>
-        <optional>
-            <ref name="chart-title"/>
-        </optional>
-        <optional>
-            <ref name="chart-subtitle"/>
-        </optional>
-        <optional>
-            <ref name="chart-footer"/>
-        </optional>
-        <optional>
-            <ref name="chart-legend"/>
-        </optional>
-        <ref name="chart-plot-area"/>
-        <optional>
-            <ref name="table-table"/>
-        </optional>
-    </element>
-</define>
-<define name="chart-chart-attlist" combine="interleave">
-    <attribute name="chart:class">
-        <ref name="namespacedToken"/>
-    </attribute>
-</define>
-<define name="chart-chart-attlist" combine="interleave">
-    <ref name="common-draw-size-attlist"/>
-</define>
-<define name="chart-chart-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:column-mapping">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-chart-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:row-mapping">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-chart-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-title">
-    <element name="chart:title">
-        <ref name="chart-title-attlist"/>
-        <optional>
-            <ref name="text-p"/>
-        </optional>
-    </element>
-</define>
-<define name="chart-title-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:cell-range">
-            <ref name="cellAddress"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-title-attlist" combine="interleave">
-    <ref name="common-draw-position-attlist"/>
-</define>
-<define name="chart-title-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-subtitle">
-    <element name="chart:subtitle">
-        <ref name="chart-title-attlist"/>
-        <optional>
-            <ref name="text-p"/>
-        </optional>
-    </element>
-</define>
-<define name="chart-footer">
-    <element name="chart:footer">
-        <ref name="chart-title-attlist"/>
-        <optional>
-            <ref name="text-p"/>
-        </optional>
-    </element>
-</define>
-<define name="chart-legend">
-    <element name="chart:legend">
-        <ref name="chart-legend-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="chart-legend-attlist" combine="interleave">
-    <choice>
-        <group>
-            <attribute name="chart:legend-position">
-                <choice>
-                    <value>start</value>
-                    <value>end</value>
-                    <value>top</value>
-                    <value>bottom</value>
-                </choice>
-            </attribute>
-            <optional>
-                <attribute name="chart:legend-align">
-                    <choice>
-                        <value>start</value>
-                        <value>center</value>
-                        <value>end</value>
-                    </choice>
-                </attribute>
-            </optional>
-        </group>
-        <attribute name="chart:legend-position">
-            <choice>
-                <value>top-start</value>
-                <value>bottom-start</value>
-                <value>top-end</value>
-                <value>bottom-end</value>
-            </choice>
-        </attribute>
-        <empty/>
-    </choice>
-</define>
-<define name="chart-legend-attlist" combine="interleave">
-    <ref name="common-draw-position-attlist"/>
-</define>
-<define name="chart-legend-attlist" combine="interleave">
-    <choice>
-        <attribute name="style:legend-expansion">
-            <choice>
-                <value>wide</value>
-                <value>high</value>
-                <value>balanced</value>
-            </choice>
-        </attribute>
-        <group>
-            <attribute name="style:legend-expansion">
-                <value>custom</value>
-            </attribute>
-            <attribute name="style:legend-expansion-aspect-ratio">
-                <ref name="double"/>
-            </attribute>
-        </group>
-        <empty/>
-    </choice>
-</define>
-<define name="chart-legend-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-plot-area">
-    <element name="chart:plot-area">
-        <ref name="chart-plot-area-attlist"/>
-        <zeroOrMore>
-            <ref name="dr3d-light"/>
-        </zeroOrMore>
-        <zeroOrMore>
-            <ref name="chart-axis"/>
-        </zeroOrMore>
-        <zeroOrMore>
-            <ref name="chart-series"/>
-        </zeroOrMore>
-        <optional>
-            <ref name="chart-stock-gain-marker"/>
-        </optional>
-        <optional>
-            <ref name="chart-stock-loss-marker"/>
-        </optional>
-        <optional>
-            <ref name="chart-stock-range-line"/>
-        </optional>
-        <optional>
-            <ref name="chart-wall"/>
-        </optional>
-        <optional>
-            <ref name="chart-floor"/>
-        </optional>
-    </element>
-</define>
-<define name="chart-plot-area-attlist" combine="interleave">
-    <ref name="common-draw-position-attlist"/>
-    <ref name="common-draw-size-attlist"/>
-</define>
-<define name="chart-plot-area-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-plot-area-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:cell-range-address">
-            <ref name="cellRangeAddress"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-plot-area-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:data-source-has-labels" a:defaultValue="none">
-            <choice>
-                <value>none</value>
-                <value>row</value>
-                <value>column</value>
-                <value>both</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-plot-area-attlist" combine="interleave">
-    <ref name="dr3d-scene-attlist"/>
-    <ref name="common-dr3d-transform-attlist"/>
-</define>
-<define name="chart-wall">
-    <element name="chart:wall">
-        <ref name="chart-wall-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="chart-wall-attlist" combine="interleave">
-    <optional>
-        <attribute name="svg:width">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-wall-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-floor">
-    <element name="chart:floor">
-        <ref name="chart-floor-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="chart-floor-attlist" combine="interleave">
-    <optional>
-        <attribute name="svg:width">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-floor-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-axis">
-    <element name="chart:axis">
-        <ref name="chart-axis-attlist"/>
-        <optional>
-            <ref name="chart-title"/>
-        </optional>
-        <optional>
-            <ref name="chart-categories"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="chart-grid"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="chart-axis-attlist" combine="interleave">
-    <attribute name="chart:dimension">
-        <choice>
-            <value>x</value>
-            <value>y</value>
-            <value>z</value>
-        </choice>
-    </attribute>
-</define>
-<define name="chart-axis-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-axis-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-grid">
-    <element name="chart:grid">
-        <ref name="chart-grid-attlist"/>
-    </element>
-</define>
-<define name="chart-grid-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:class" a:defaultValue="major">
-            <choice>
-                <value>major</value>
-                <value>minor</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-grid-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-series">
-    <element name="chart:series">
-        <ref name="chart-series-attlist"/>
-        <zeroOrMore>
-            <ref name="chart-domain"/>
-        </zeroOrMore>
-        <optional>
-            <ref name="chart-mean-value"/>
-        </optional>
-        <optional>
-            <ref name="chart-regression-curve"/>
-        </optional>
-        <optional>
-            <ref name="chart-error-indicator"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="chart-data-point"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="chart-series-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:values-cell-range-address">
-            <ref name="cellRangeAddress"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-series-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:label-cell-address">
-            <ref name="cellAddress"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-series-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:class">
-            <ref name="namespacedToken"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-series-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:attached-axis">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-series-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-domain">
-    <element name="chart:domain">
-    <optional>
-        <attribute name="table:cell-range-address">
-            <ref name="cellRangeAddress"/>
-        </attribute>
-    </optional>
-    </element>
-</define>
-<define name="chart-categories">
-    <element name="chart:categories">
-    <optional>
-        <attribute name="table:cell-range-address">
-            <ref name="cellRangeAddress"/>
-        </attribute>
-    </optional>
-    </element>
-</define>
-<define name="chart-data-point">
-    <element name="chart:data-point">
-        <ref name="chart-data-point-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="chart-data-point-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:repeated">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-data-point-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-
-<define name="chart-mean-value">
-    <element name="chart:mean-value">
-        <ref name="chart-mean-value-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="chart-mean-value-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-error-indicator">
-    <element name="chart:error-indicator">
-        <ref name="chart-error-indicator-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="chart-error-indicator-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-regression-curve">
-    <element name="chart:regression-curve">
-        <ref name="chart-regression-curve-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="chart-regression-curve-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-stock-gain-marker">
-    <element name="chart:stock-gain-marker">
-        <ref name="common-stock-marker-attlist"/>
-    </element>
-</define>
-<define name="chart-stock-loss-marker">
-    <element name="chart:stock-loss-marker">
-        <ref name="common-stock-marker-attlist"/>
-    </element>
-</define>
-<define name="chart-stock-range-line">
-    <element name="chart:stock-range-line">
-        <ref name="common-stock-marker-attlist"/>
-    </element>
-</define>
-<define name="common-stock-marker-attlist">
-    <optional>
-        <attribute name="chart:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="office-forms">
-    <optional>
-        <element name="office:forms">
-            <ref name="office-forms-attlist"/>
-            <zeroOrMore>
-                <choice>
-                    <ref name="form-form"/>
-                    <ref name="xforms-model"/>
-                </choice>
-            </zeroOrMore>
-        </element>
-    </optional>
-</define>
-<define name="office-forms-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:automatic-focus" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="office-forms-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:apply-design-mode" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-form">
-    <element name="form:form">
-        <ref name="common-form-control-attlist"/>
-        <ref name="form-form-attlist"/>
-        <optional>
-            <ref name="form-properties"/>
-        </optional>
-        <optional>
-            <ref name="office-event-listeners"/>
-        </optional>
-        <zeroOrMore>
-            <choice>
-                <ref name="controls"/>
-                <ref name="form-form"/>
-            </choice>
-        </zeroOrMore>
-        <optional>
-            <ref name="form-connection-resource"/>
-        </optional>
-    </element>
-</define>
-<define name="form-form-attlist" combine="interleave">
-    <optional>
-        <attribute name="xlink:href">
-            <ref name="anyURI"/>
-        </attribute>
-        <optional>
-            <attribute name="xlink:type" a:defaultValue="simple">
-                <value>simple</value>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="xlink:actuate" a:defaultValue="onRequest">
-                <value>onRequest</value>
-            </attribute>
-        </optional>
-    </optional>
-</define>
-<define name="form-form-attlist" combine="interleave">
-    <optional>
-        <attribute name="office:target-frame" a:defaultValue="_blank">
-            <ref name="targetFrameName"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-form-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:method" a:defaultValue="get">
-            <choice>
-                <value>get</value>
-                <value>post</value>
-                <ref name="string"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="form-form-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:enctype" 
-                    a:defaultValue="application/x-www-form-urlencoded">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-form-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:allow-deletes" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-form-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:allow-inserts" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-form-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:allow-updates" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-form-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:apply-filter" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-form-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:command-type" a:defaultValue="command">
-            <choice>
-                <value>table</value>
-                <value>query</value>
-                <value>command</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="form-form-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:command"/>
-    </optional>
-</define>
-<define name="form-form-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:datasource">
-            <choice>
-                <ref name="anyURI"/>
-                <ref name="string"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="form-form-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:master-fields">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-form-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:detail-fields">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-form-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:escape-processing" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-form-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:filter">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-form-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:ignore-result" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-form-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:navigation-mode">
-            <ref name="navigation"/>
-        </attribute>
-    </optional>
-</define>
-
-<define name="navigation">
-    <choice>
-        <value>none</value>
-        <value>current</value>
-        <value>parent</value>
-    </choice>
-</define>
-<define name="form-form-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:order">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-form-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:tab-cycle">
-            <ref name="tab-cycles"/>
-        </attribute>
-    </optional>
-</define>
-<define name="tab-cycles">
-    <choice>
-        <value>records</value>
-        <value>current</value>
-        <value>page</value>
-    </choice>
-</define>
-<define name="form-connection-resource">
-    <element name="form:connection-resource">
-        <attribute name="xlink:href">
-            <ref name="anyURI"/>
-        </attribute>
-        <empty/>
-    </element>
-</define>
-<define name="xforms-model">
-    <element name="xforms:model">
-        <ref name="anyAttListOrElements"/>
-    </element>
-</define>
-<define name="column-controls" combine="choice">
-    <element name="form:text">
-        <ref name="form-text-attlist"/>
-        <ref name="common-form-control-content"/>
-    </element>
-</define>
-<define name="controls" combine="choice">
-    <ref name="column-controls"/>
-</define>
-<define name="form-text-attlist">
-    <ref name="form-control-attlist"/>
-    <ref name="common-current-value-attlist"/>
-    <ref name="common-disabled-attlist"/>
-    <ref name="common-maxlength-attlist"/>
-    <ref name="common-printable-attlist"/>
-    <ref name="common-readonly-attlist"/>
-    <ref name="common-tab-attlist"/>
-    <ref name="common-title-attlist"/>
-    <ref name="common-value-attlist"/>
-    <ref name="common-convert-empty-attlist"/>
-    <ref name="common-data-field-attlist"/>
-</define>
-<define name="form-control-attlist">
-    <ref name="common-form-control-attlist"/>
-    <ref name="common-control-id-attlist"/>
-    <ref name="xforms-bind-attlist"/>
-</define>
-<define name="common-form-control-content">
-    <optional>
-        <ref name="form-properties"/>
-    </optional>
-    <optional>
-        <ref name="office-event-listeners"/>
-    </optional>
-</define>
-<define name="column-controls" combine="choice">
-    <element name="form:textarea">
-        <ref name="form-textarea-attlist"/>
-        <ref name="common-form-control-content"/>
-        <zeroOrMore>
-            <ref name="text-p"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="form-textarea-attlist">
-    <ref name="form-control-attlist"/>
-    <ref name="common-current-value-attlist"/>
-    <ref name="common-disabled-attlist"/>
-    <ref name="common-maxlength-attlist"/>
-    <ref name="common-printable-attlist"/>
-    <ref name="common-readonly-attlist"/>
-    <ref name="common-tab-attlist"/>
-    <ref name="common-title-attlist"/>
-    <ref name="common-value-attlist"/>
-    <ref name="common-convert-empty-attlist"/>
-    <ref name="common-data-field-attlist"/>
-</define>
-<define name="controls" combine="choice">
-    <element name="form:password">
-        <ref name="form-password-attlist"/>
-        <ref name="common-form-control-content"/>
-    </element>
-</define>
-<define name="form-password-attlist" combine="interleave">
-    <ref name="form-control-attlist"/>
-    <ref name="common-disabled-attlist"/>
-    <ref name="common-maxlength-attlist"/>
-    <ref name="common-printable-attlist"/>
-    <ref name="common-tab-attlist"/>
-    <ref name="common-title-attlist"/>
-    <ref name="common-value-attlist"/>
-    <ref name="common-convert-empty-attlist"/>
-</define>
-<define name="form-password-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:echo-char" a:defaultValue="*">
-            <ref name="character"/>
-        </attribute>
-    </optional>
-</define>
-<define name="controls" combine="choice">
-    <element name="form:file">
-        <ref name="form-file-attlist"/>
-        <ref name="common-form-control-content"/>
-    </element>
-</define>
-<define name="form-file-attlist" combine="interleave">
-    <ref name="form-control-attlist"/>
-    <ref name="common-current-value-attlist"/>
-    <ref name="common-disabled-attlist"/>
-    <ref name="common-maxlength-attlist"/>
-    <ref name="common-printable-attlist"/>
-    <ref name="common-readonly-attlist"/>
-    <ref name="common-tab-attlist"/>
-    <ref name="common-title-attlist"/>
-    <ref name="common-value-attlist"/>
-</define>
-<define name="column-controls" combine="choice">
-    <element name="form:formatted-text">
-        <ref name="form-formatted-text-attlist"/>
-        <ref name="common-form-control-content"/>
-    </element>
-</define>
-<define name="form-formatted-text-attlist" combine="interleave">
-    <ref name="form-control-attlist"/>
-    <ref name="common-current-value-attlist"/>
-    <ref name="common-disabled-attlist"/>
-    <ref name="common-maxlength-attlist"/>
-    <ref name="common-printable-attlist"/>
-    <ref name="common-readonly-attlist"/>
-    <ref name="common-tab-attlist"/>
-    <ref name="common-title-attlist"/>
-    <ref name="common-value-attlist"/>
-    <ref name="common-convert-empty-attlist"/>
-    <ref name="common-data-field-attlist"/>
-</define>
-<define name="form-formatted-text-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:max-value">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-formatted-text-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:min-value">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-formatted-text-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:validation" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="column-controls" combine="choice">
-    <element name="form:number">
-        <ref name="form-number-attlist"/>
-        <ref name="common-numeric-control-attlist"/>
-        <ref name="common-form-control-content"/>
-    </element>
-</define>
-<define name="common-numeric-control-attlist">
-    <ref name="form-control-attlist"/>
-    <ref name="common-disabled-attlist"/>
-    <ref name="common-maxlength-attlist"/>
-    <ref name="common-printable-attlist"/>
-    <ref name="common-readonly-attlist"/>
-    <ref name="common-tab-attlist"/>
-    <ref name="common-title-attlist"/>
-    <ref name="common-convert-empty-attlist"/>
-    <ref name="common-data-field-attlist"/>
-</define>
-<define name="form-number-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:value">
-            <ref name="double"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-number-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:current-value">
-            <ref name="double"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-number-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:min-value">
-            <ref name="double"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-number-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:max-value">
-            <ref name="double"/>
-        </attribute>
-    </optional>
-</define>
-<define name="column-controls" combine="choice">
-    <element name="form:date">
-        <ref name="form-date-attlist"/>
-        <ref name="common-numeric-control-attlist"/>
-        <ref name="common-form-control-content"/>
-    </element>
-</define>
-<define name="controls" combine="choice">
-    <element name="form:time">
-        <ref name="form-time-attlist"/>
-        <ref name="common-numeric-control-attlist"/>
-        <ref name="common-form-control-content"/>
-    </element>
-</define>
-<define name="form-date-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:value">
-            <ref name="date"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-time-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:value">
-            <ref name="time"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-date-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:current-value">
-            <ref name="date"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-time-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:current-value">
-            <ref name="time"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-date-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:min-value">
-            <ref name="date"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-time-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:min-value">
-            <ref name="time"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-date-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:max-value">
-            <ref name="date"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-time-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:max-value">
-            <ref name="time"/>
-        </attribute>
-    </optional>
-</define>
-<define name="controls" combine="choice">
-    <element name="form:fixed-text">
-        <ref name="form-fixed-text-attlist"/>
-        <ref name="common-form-control-content"/>
-    </element>
-</define>
-<define name="form-fixed-text-attlist" combine="interleave">
-    <ref name="form-control-attlist"/>
-    <ref name="for"/>
-    <ref name="common-disabled-attlist"/>
-    <ref name="label"/>
-    <ref name="common-printable-attlist"/>
-    <ref name="common-title-attlist"/>
-</define>
-<define name="form-fixed-text-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:multi-line" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="column-controls" combine="choice">
-    <element name="form:combobox">
-        <ref name="form-combobox-attlist"/>
-        <ref name="common-form-control-content"/>
-        <zeroOrMore>
-            <ref name="form-item"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="form-combobox-attlist" combine="interleave">
-    <ref name="form-control-attlist"/>
-    <ref name="common-current-value-attlist"/>
-    <ref name="common-disabled-attlist"/>
-    <ref name="dropdown"/>
-    <ref name="common-maxlength-attlist"/>
-    <ref name="common-printable-attlist"/>
-    <ref name="common-readonly-attlist"/>
-    <ref name="size"/>
-    <ref name="common-tab-attlist"/>
-    <ref name="common-title-attlist"/>
-    <ref name="common-value-attlist"/>
-    <ref name="common-convert-empty-attlist"/>
-    <ref name="common-data-field-attlist"/>
-    <ref name="list-source"/>
-    <ref name="list-source-type"/>
-</define>
-<define name="form-combobox-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:auto-complete">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-item">
-    <element name="form:item">
-        <ref name="form-item-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="form-item-attlist" combine="interleave">
-    <ref name="label"/>
-</define>
-<define name="column-controls" combine="choice">
-    <element name="form:listbox">
-        <ref name="form-listbox-attlist"/>
-        <ref name="common-form-control-content"/>
-        <zeroOrMore>
-            <ref name="form-option"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="form-listbox-attlist" combine="interleave">
-    <ref name="form-control-attlist"/>
-    <ref name="common-disabled-attlist"/>
-    <ref name="dropdown"/>
-    <ref name="common-printable-attlist"/>
-    <ref name="size"/>
-    <ref name="common-tab-attlist"/>
-    <ref name="common-title-attlist"/>
-    <ref name="bound-column"/>
-    <ref name="common-data-field-attlist"/>
-    <ref name="list-source"/>
-    <ref name="list-source-type"/>
-</define>
-<define name="form-listbox-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:multiple" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-listbox-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:xforms-list-source">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-option">
-    <element name="form:option">
-        <ref name="form-option-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="form-option-attlist" combine="interleave">
-    <ref name="current-selected"/>
-    <ref name="selected"/>
-    <ref name="label"/>
-    <ref name="common-value-attlist"/>
-</define>
-<define name="controls" combine="choice">
-    <element name="form:button">
-        <ref name="form-button-attlist"/>
-        <ref name="common-form-control-content"/>
-    </element>
-</define>
-<define name="form-button-attlist" combine="interleave">
-    <ref name="form-control-attlist"/>
-    <ref name="button-type"/>
-    <ref name="common-disabled-attlist"/>
-    <ref name="label"/>
-    <ref name="image-data"/>
-    <ref name="common-printable-attlist"/>
-    <ref name="common-tab-attlist"/>
-    <ref name="target-frame"/>
-    <ref name="target-location"/>
-    <ref name="common-title-attlist"/>
-    <ref name="common-value-attlist"/>
-    <ref name="common-form-relative-image-position-attlist"/>
-</define>
-<define name="form-button-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:default-button" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-button-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:toggle" a:default-value="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-button-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:focus-on-click">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-button-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:xforms-submission">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="controls" combine="choice">
-    <element name="form:image">
-        <ref name="form-image-attlist"/>
-        <ref name="common-form-control-content"/>
-    </element>
-</define>
-<define name="form-image-attlist" combine="interleave">
-    <ref name="form-control-attlist"/>
-    <ref name="button-type"/>
-    <ref name="common-disabled-attlist"/>
-    <ref name="image-data"/>
-    <ref name="common-printable-attlist"/>
-    <ref name="common-tab-attlist"/>
-    <ref name="target-frame"/>
-    <ref name="target-location"/>
-    <ref name="common-title-attlist"/>
-    <ref name="common-value-attlist"/>
-</define>
-<define name="column-controls" combine="choice">
-    <element name="form:checkbox">
-        <ref name="form-checkbox-attlist"/>
-        <ref name="common-form-control-content"/>
-    </element>
-</define>
-<define name="form-checkbox-attlist" combine="interleave">
-    <ref name="form-control-attlist"/>
-    <ref name="common-disabled-attlist"/>
-    <ref name="label"/>
-    <ref name="common-printable-attlist"/>
-    <ref name="common-tab-attlist"/>
-    <ref name="common-title-attlist"/>
-    <ref name="common-value-attlist"/>
-    <ref name="common-data-field-attlist"/>
-    <ref name="common-form-visual-effect-attlist"/>
-    <ref name="common-form-relative-image-position-attlist"/>
-</define>
-<define name="states">
-    <choice>
-        <value>unchecked</value>
-        <value>checked</value>
-        <value>unknown</value>
-    </choice>
-</define>
-<define name="form-checkbox-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:current-state">
-            <ref name="states"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-checkbox-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:is-tristate" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-checkbox-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:state" a:defaultValue="unchecked">
-            <ref name="states"/>
-        </attribute>
-    </optional>
-</define>
-<define name="controls" combine="choice">
-    <element name="form:radio">
-        <ref name="form-radio-attlist"/>
-        <ref name="common-form-control-content"/>
-    </element>
-</define>
-<define name="form-radio-attlist" combine="interleave">
-    <ref name="form-control-attlist"/>
-    <ref name="current-selected"/>
-    <ref name="common-disabled-attlist"/>
-    <ref name="label"/>
-    <ref name="common-printable-attlist"/>
-    <ref name="selected"/>
-    <ref name="common-tab-attlist"/>
-    <ref name="common-title-attlist"/>
-    <ref name="common-value-attlist"/>
-    <ref name="common-data-field-attlist"/>
-    <ref name="common-form-visual-effect-attlist"/>
-    <ref name="common-form-relative-image-position-attlist"/>
-</define>
-<define name="controls" combine="choice">
-    <element name="form:frame">
-        <ref name="form-frame-attlist"/>
-        <ref name="common-form-control-content"/>
-    </element>
-</define>
-<define name="form-frame-attlist" combine="interleave">
-    <ref name="form-control-attlist"/>
-    <ref name="common-disabled-attlist"/>
-    <ref name="for"/>
-    <ref name="label"/>
-    <ref name="common-printable-attlist"/>
-    <ref name="common-title-attlist"/>
-</define>
-<define name="controls" combine="choice">
-    <element name="form:image-frame">
-        <ref name="form-image-frame-attlist"/>
-        <ref name="common-form-control-content"/>
-    </element>
-</define>
-<define name="form-image-frame-attlist" combine="interleave">
-    <ref name="form-control-attlist"/>
-    <ref name="common-disabled-attlist"/>
-    <ref name="image-data"/>
-    <ref name="common-printable-attlist"/>
-    <ref name="common-readonly-attlist"/>
-    <ref name="common-title-attlist"/>
-    <ref name="common-data-field-attlist"/>
-</define>
-<define name="controls" combine="choice">
-    <element name="form:hidden">
-        <ref name="form-hidden-attlist"/>
-        <ref name="common-form-control-content"/>
-    </element>
-</define>
-<define name="form-hidden-attlist" combine="interleave">
-    <ref name="form-control-attlist"/>
-    <ref name="common-value-attlist"/>
-</define>
-<define name="controls" combine="choice">
-    <element name="form:grid">
-        <ref name="form-grid-attlist"/>
-        <ref name="common-form-control-content"/>
-        <zeroOrMore>
-            <ref name="form-column"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="form-grid-attlist" combine="interleave">
-    <ref name="form-control-attlist"/>
-    <ref name="common-disabled-attlist"/>
-    <ref name="common-printable-attlist"/>
-    <ref name="common-tab-attlist"/>
-    <ref name="common-title-attlist"/>
-</define>
-<define name="form-column">
-    <element name="form:column">
-        <ref name="form-column-attlist"/>
-        <oneOrMore>
-            <ref name="column-controls"/>
-        </oneOrMore>
-    </element>
-</define>
-<define name="form-column-attlist" combine="interleave">
-    <ref name="common-form-control-attlist"/>
-    <ref name="label"/>
-    <ref name="text-style-name"/>
-</define>
-<define name="text-style-name">
-    <optional>
-        <attribute name="form:text-style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="controls" combine="choice">
-    <element name="form:value-range">
-        <ref name="form-value-range-attlist"/>
-        <ref name="common-form-control-content"/>
-    </element>
-</define>
-<define name="form-value-range-attlist" combine="interleave">
-    <ref name="form-control-attlist"/>
-    <ref name="common-disabled-attlist"/>
-    <ref name="common-printable-attlist"/>
-    <ref name="common-tab-attlist"/>
-    <ref name="common-title-attlist"/>
-    <ref name="common-value-attlist"/>
-</define>
-<define name="form-value-range-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:max-value">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-value-range-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:min-value">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-value-range-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:step-size" a:defaultName="1">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-value-range-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:page-step-size">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-value-range-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:delay-for-repeat">
-            <ref name="duration"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-value-range-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:orientation">
-            <choice>
-                <value>horizontal</value>
-                <value>vertical</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="controls" combine="choice">
-    <element name="form:generic-control">
-        <ref name="form-generic-control-attlist"/>
-        <ref name="common-form-control-content"/>
-    </element>
-</define>
-<define name="form-generic-control-attlist" combine="interleave">
-    <ref name="form-control-attlist"/>
-</define>
-<define name="common-form-control-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-form-control-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:control-implementation">
-            <ref name="namespacedToken"/>
-        </attribute>
-    </optional>
-</define>
-<define name="xforms-bind-attlist">
-    <optional>
-        <attribute name="xforms:bind">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="types">
-    <choice>
-        <value>submit</value>
-        <value>reset</value>
-        <value>push</value>
-        <value>url</value>
-    </choice>
-</define>
-<define name="button-type">
-    <optional>
-        <attribute name="form:button-type" a:defaultValue="push">
-            <ref name="types"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-control-id-attlist">
-    <attribute name="form:id">
-        <ref name="ID"/>
-    </attribute>
-</define>
-<define name="current-selected">
-    <optional>
-        <attribute name="form:current-selected" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-value-attlist">
-    <optional>
-        <attribute name="form:value">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-current-value-attlist">
-    <optional>
-        <attribute name="form:current-value">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-disabled-attlist">
-    <optional>
-        <attribute name="form:disabled" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="dropdown">
-    <optional>
-        <attribute name="form:dropdown" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="for">
-    <optional>
-        <attribute name="form:for">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="image-data">
-    <optional>
-        <attribute name="form:image-data">
-            <ref name="anyURI"/>
-        </attribute>
-    </optional>
-</define>
-<define name="label">
-    <optional>
-        <attribute name="form:label">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-maxlength-attlist">
-    <optional>
-        <attribute name="form:max-length">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-printable-attlist">
-    <optional>
-        <attribute name="form:printable" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-readonly-attlist">
-    <optional>
-        <attribute name="form:readonly" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="selected">
-    <optional>
-        <attribute name="form:selected" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="size">
-    <optional>
-        <attribute name="form:size">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-tab-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:tab-index" a:defaultValue="0">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-tab-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:tab-stop" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="target-frame">
-    <optional>
-        <attribute name="office:target-frame" a:defaultValue="_blank">
-            <ref name="targetFrameName"/>
-        </attribute>
-    </optional>
-</define>
-<define name="target-location">
-    <optional>
-        <attribute name="xlink:href">
-            <ref name="anyURI"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-title-attlist">
-    <optional>
-        <attribute name="form:title"/>
-    </optional>
-</define>
-<define name="common-form-visual-effect-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:visual-effect">
-            <choice>
-                <value>flat</value>
-                <value>3d</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="common-form-relative-image-position-attlist"
-        combine="interleave">
-    <choice>
-        <optional>
-            <attribute name="form:image-position" a:defaultValue="center">
-                <value>center</value>
-            </attribute>
-        </optional>
-        <group>
-            <attribute name="form:image-position">
-                <choice>
-                    <value>start</value>
-                    <value>end</value>
-                    <value>top</value>
-                    <value>bottom</value>
-                </choice>
-            </attribute>
-            <optional>
-                <attribute name="form:image-align" a:defaultValue="center">
-                    <choice>
-                        <value>start</value>
-                        <value>center</value>
-                        <value>end</value>
-                    </choice>
-                </attribute>
-            </optional>
-        </group>
-    </choice>
-</define>
-<define name="bound-column">
-    <optional>
-        <attribute name="form:bound-column">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-convert-empty-attlist">
-    <optional>
-        <attribute name="form:convert-empty-to-null" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-data-field-attlist">
-    <optional>
-        <attribute name="form:data-field">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="list-source">
-    <optional>
-        <attribute name="form:list-source">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="list-source-type">
-    <optional>
-        <attribute name="form:list-source-type">
-            <choice>
-                <value>table</value>
-                <value>query</value>
-                <value>sql</value>
-                <value>sql-pass-through</value>
-                <value>value-list</value>
-                <value>table-fields</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="form-properties">
-    <element name="form:properties">
-        <oneOrMore>
-            <ref name="form-property"/>
-        </oneOrMore>
-    </element>
-</define>
-<define name="form-property" combine="choice">
-    <element name="form:property">
-        <ref name="form-property-name"/>
-        <ref name="form-property-value-and-type-attlist"/>
-    </element>
-</define>
-<define name="form-property-name" combine="interleave">
-    <attribute name="form:property-name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="form-property-value-and-type-attlist" combine="interleave">
-    <choice>
-        <ref name="common-value-and-type-attlist"/>
-        <attribute name="office:value-type">
-            <value>void</value>
-        </attribute>
-    </choice>
-</define>
-<define name="form-property" combine="choice">
-    <element name="form:list-property">
-        <ref name="form-property-name"/>
-        <ref name="form-property-type-and-value-list"/>
-    </element>
-</define>
-<define name="form-property-type-and-value-list">
-    <choice>
-        <group>
-            <attribute name="office:value-type">
-                <value>float</value>
-            </attribute>
-            <zeroOrMore>
-                <element name="form:list-value">
-                    <attribute name="office:value">
-                        <ref name="double"/>
-                    </attribute>
-                </element>
-            </zeroOrMore>
-        </group>
-        <group>
-            <attribute name="office:value-type">
-                <value>percentage</value>
-            </attribute>
-            <zeroOrMore>
-                <element name="form:list-value">
-                    <attribute name="office:value">
-                        <ref name="double"/>
-                    </attribute>
-                </element>
-            </zeroOrMore>
-        </group>
-        <group>
-            <attribute name="office:value-type">
-                <value>currency</value>
-            </attribute>
-            <zeroOrMore>
-                <element name="form:list-value">
-                    <attribute name="office:value">
-                        <ref name="double"/>
-                    </attribute>
-                    <optional>
-                        <attribute name="office:currency">
-                            <ref name="string"/>
-                        </attribute>
-                    </optional>
-                </element>
-            </zeroOrMore>
-        </group>
-        <group>
-            <attribute name="office:value-type">
-                <value>date</value>
-            </attribute>
-            <zeroOrMore>
-                <element name="form:list-value">
-                    <attribute name="office:date-value">
-                        <ref name="dateOrDateTime"/>
-                    </attribute>
-                </element>
-            </zeroOrMore>
-        </group>
-        <group>
-            <attribute name="office:value-type">
-                <value>time</value>
-            </attribute>
-            <zeroOrMore>
-                <element name="form:list-value">
-                    <attribute name="office:time-value">
-                        <ref name="duration"/>
-                    </attribute>
-                </element>
-            </zeroOrMore>
-        </group>
-        <group>
-            <attribute name="office:value-type">
-                <value>boolean</value>
-            </attribute>
-            <zeroOrMore>
-                <element name="form:list-value">
-                    <attribute name="office:boolean-value">
-                        <ref name="boolean"/>
-                    </attribute>
-                </element>
-            </zeroOrMore>
-        </group>
-        <group>
-            <attribute name="office:value-type">
-                <value>string</value>
-            </attribute>
-            <zeroOrMore>
-                <element name="form:list-value">
-                    <attribute name="office:string-value">
-                        <ref name="string"/>
-                    </attribute>
-                </element>
-            </zeroOrMore>
-        </group>
-        <attribute name="office:value-type">
-            <value>void</value>
-        </attribute>
-    </choice>
-</define>
-<define name="office-annotation">
-    <element name="office:annotation">
-        <ref name="office-annotation-attlist"/>
-        <ref name="draw-caption-attlist"/>
-        <ref name="common-draw-position-attlist"/>
-        <ref name="common-draw-size-attlist"/>
-        <ref name="common-draw-shape-with-text-and-styles-attlist"/>
-        <optional>
-            <ref name="dc-creator"/>
-        </optional>
-        <optional>
-            <ref name="dc-date"/>
-        </optional>
-        <optional>
-            <ref name="meta-date-string"/>
-        </optional>
-        <zeroOrMore>
-            <choice>
-                <ref name="text-p"/>
-                <ref name="text-list"/>
-            </choice>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="office-annotation-attlist" combine="interleave">
-    <optional>
-        <attribute name="office:display">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="meta-date-string">
-    <element name="meta:date-string">
-        <ref name="string"/>
-    </element>
-</define>
-<define name="common-num-format-prefix-suffix-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:num-prefix">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:num-suffix">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-num-format-attlist" combine="interleave">
-    <choice>
-        <attribute name="style:num-format">
-            <choice>
-                <value>1</value>
-                <value>i</value>
-                <value>I</value>
-                <ref name="string"/>
-                <empty/>
-            </choice>
-        </attribute>
-        <group>
-            <attribute name="style:num-format">
-                <choice>
-                    <value>a</value>
-                    <value>A</value>
-                </choice>
-            </attribute>
-            <ref name="style-num-letter-sync-attlist"/>
-        </group>
-        <empty/>
-    </choice>
-</define>
-<define name="style-num-letter-sync-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:num-letter-sync">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="office-change-info">
-    <element name="office:change-info">
-        <ref name="dc-creator"/>
-        <ref name="dc-date"/>
-        <zeroOrMore>
-            <ref name="text-p"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="office-event-listeners">
-    <element name="office:event-listeners">
-        <zeroOrMore>
-            <choice>
-                <ref name="script-event-listener"/>
-                <ref name="presentation-event-listener"/>
-            </choice>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="script-event-listener" combine="interleave">
-    <element name="script:event-listener">
-        <ref name="script-event-listener-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="script-event-listener-attlist" combine="interleave">
-    <attribute name="script:event-name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="script-event-listener-attlist" combine="interleave">
-    <attribute name="script:language">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="script-event-listener-attlist" combine="interleave">
-    <choice>
-        <attribute name="script:macro-name">
-            <ref name="string"/>
-        </attribute>
-        <group>
-            <attribute name="xlink:href">
-                <ref name="anyURI"/>
-            </attribute>
-            <optional>
-                <attribute name="xlink:type" a:defaultValue="simple">
-                    <value>simple</value>
-                </attribute>
-            </optional>
-            <optional>
-                <attribute name="xlink:actuate" a:defaultValue="onRequest">
-                    <value>onRequest</value>
-                </attribute>
-            </optional>
-        </group>
-    </choice>
-</define>
-<define name="math-math">
-    <element name="math:math">
-        <ref name="mathMarkup"/>
-    </element>
-</define>
-
-<!-- To avoid inclusion of the complete MathML schema, anything -->
-<!-- is allowed within a math:math top-level element            -->
-<define name="mathMarkup">
-    <zeroOrMore>
-        <choice>
-            <attribute>
-                <anyName/>
-            </attribute>
-            <text/>
-            <element>
-                <anyName/>
-                <ref name="mathMarkup"/>
-            </element>
-        </choice>
-    </zeroOrMore>
-</define>
-<define name="text-dde-connection-decl">
-    <element name="text:dde-connection-decl">
-        <ref name="text-dde-connection-decl-attlist"/>
-        <ref name="common-dde-connection-decl-attlist"/>
-    </element>
-</define>
-<define name="text-dde-connection-decl-attlist" combine="interleave">
-    <attribute name="office:name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="common-dde-connection-decl-attlist" combine="interleave">
-    <attribute name="office:dde-application">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="common-dde-connection-decl-attlist" combine="interleave">
-    <attribute name="office:dde-topic">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="common-dde-connection-decl-attlist" combine="interleave">
-    <attribute name="office:dde-item">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="common-dde-connection-decl-attlist" combine="interleave">
-    <optional>
-        <attribute name="office:automatic-update" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-dde-link">
-    <element name="table:dde-link">
-        <ref name="office-dde-source"/>
-        <ref name="table-table"/>
-    </element>
-</define>
-<define name="office-dde-source">
-    <element name="office:dde-source">
-        <ref name="office-dde-source-attlist"/>
-        <ref name="common-dde-connection-decl-attlist"/>
-    </element>
-</define>
-<define name="office-dde-source-attlist" combine="interleave">
-    <optional>
-        <attribute name="office:name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="office-dde-source-attlist" combine="interleave">
-    <optional>
-        <attribute name="office:conversion-mode" 
-                    a:defaultValue="into-default-style-data-style">
-            <choice>
-                <value>into-default-style-data-style</value>
-                <value>into-english-number</value>
-                <value>keep-text</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="animation-element" combine="choice">
-    <element name="anim:animate">
-        <ref name="common-anim-target-attlist"/>
-        <ref name="common-anim-named-target-attlist"/>
-        <ref name="common-anim-values-attlist"/>
-        <ref name="common-anim-spline-mode-attlist"/>
-        <ref name="common-spline-anim-value-attlist"/>
-        <ref name="common-timing-attlist"/>
-        <ref name="common-anim-add-accum-attlist"/>
-    </element>
-</define>
-<define name="animation-element" combine="choice">
-    <element name="anim:set">
-        <ref name="common-anim-target-attlist"/>
-        <ref name="common-anim-named-target-attlist"/>
-        <ref name="common-anim-set-values-attlist"/>
-        <ref name="common-timing-attlist"/>
-        <ref name="common-anim-add-accum-attlist"/>
-    </element>
-</define>
-<define name="animation-element" combine="choice">
-    <element name="anim:animateMotion">
-        <ref name="anim-animate-motion-attlist"/>
-        <ref name="common-anim-target-attlist"/>
-        <ref name="common-anim-named-target-attlist"/>
-        <ref name="common-anim-add-accum-attlist"/>
-        <ref name="common-anim-values-attlist"/>
-        <ref name="common-timing-attlist"/>
-        <ref name="common-spline-anim-value-attlist"/>
-    </element>
-</define>
-<define name="anim-animate-motion-attlist" combine="interleave">
-    <optional>
-        <attribute name="svg:path">
-            <ref name="pathData"/>
-        </attribute>
-    </optional>
-</define>
-<define name="anim-animate-motion-attlist" combine="interleave">
-    <optional>
-        <attribute name="svg:origin">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="anim-animate-motion-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:calcMode" a:defaultValue="paced">   
-            <choice>
-                <value>discrete</value>
-                <value>linear</value>
-                <value>paced</value>
-                <value>spline</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="animation-element" combine="choice">
-    <element name="anim:animateColor">
-        <ref name="common-anim-target-attlist"/>
-        <ref name="common-anim-named-target-attlist"/>
-        <ref name="common-anim-add-accum-attlist"/>
-        <ref name="common-anim-values-attlist"/>
-        <ref name="common-anim-spline-mode-attlist"/>
-        <ref name="common-spline-anim-value-attlist"/>
-        <ref name="anim-animate-color-attlist"/>
-        <ref name="common-timing-attlist"/>
-    </element>
-</define>
-<define name="anim-animate-color-attlist" combine="interleave">
-    <optional>
-        <attribute name="anim:color-interpolation" a:defaultValue="rgb">
-            <choice>
-                <value>rgb</value>
-                <value>hsl</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="anim-animate-color-attlist" combine="interleave">
-    <optional>
-        <attribute name="anim:color-interpolation-direction"     
-                                   a:defaultValue="clockwise">
-            <choice>
-                <value>clockwise</value>
-                <value>counter-clockwise</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="animation-element" combine="choice">
-    <element name="anim:animateTransform">
-        <ref name="common-anim-target-attlist"/>
-        <ref name="common-anim-named-target-attlist"/>
-        <ref name="common-anim-add-accum-attlist"/>
-        <ref name="common-anim-values-attlist"/>
-        <ref name="anim-animate-transform-attlist"/>
-        <ref name="common-timing-attlist"/>
-    </element>
-</define>
-<define name="anim-animate-transform-attlist" combine="interleave">
-    <attribute name="svg:type">
-        <choice>
-            <value>translate</value>
-            <value>scale</value>
-            <value>rotate</value>
-            <value>skewX</value>
-            <value>skewY</value> 
-        </choice>
-    </attribute>
-</define>
-<define name="animation-element" combine="choice">
-    <element name="anim:transitionFilter">
-        <ref name="common-anim-target-attlist"/>
-        <ref name="common-anim-add-accum-attlist"/>
-        <ref name="common-anim-values-attlist"/>
-        <ref name="common-anim-spline-mode-attlist "/>
-        <ref name="anim-transition-filter-attlist"/>
-        <ref name="common-timing-attlist"/>
-    </element>
-</define>
-<define name="anim-transition-filter-attlist" combine="interleave">
-    <attribute name="smil:type">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="anim-transition-filter-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:subtype">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="anim-transition-filter-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:direction" a:defaultValue="forward">
-            <choice>
-                <value>forward</value>
-                <value>reverse</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="anim-transition-filter-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:fadeColor">
-            <choice>
-                <value>forward</value>
-                <value>reverse</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="anim-transition-filter-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:mode" a:defaultValue="in">
-            <choice>
-                <value>in</value>
-                <value>out</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="common-anim-attlist" combine="interleave">
-    <optional>
-        <attribute name="anim:id">
-            <ref name="ID"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-anim-target-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:targetElement">
-            <ref name="IDREF"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-anim-named-target-attlist" combine="interleave">
-    <attribute name="smil:attributeName">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="common-anim-target-attlist" combine="interleave">
-    <optional>
-        <attribute name="anim:sub-item">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-anim-values-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:values">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-anim-spline-mode-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:calcMode" a:defaultValue="discrete">   
-            <choice>
-                <value>discrete</value>
-                <value>linear</value>
-                <value>paced</value>
-                <value>spline</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="common-spline-anim-value-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:keyTimes">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-spline-anim-value-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:keySplines">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-anim-add-accum-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:accumulate">
-            <choice>
-                <value>none</value>
-                <value>sum</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="common-anim-add-accum-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:additive">
-            <choice>
-                <value>replace</value>
-                <value>sum</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="common-anim-values-attlist" combine="interleave">
-    <optional>
-        <attribute name="anim:formula">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-anim-set-values-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:to">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-
-<define name="common-anim-values-attlist" combine="interleave">
-    <ref name="common-anim-set-values-attlist"/>
-    <optional>
-        <attribute name="smil:from">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="smil:by">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-begin-end-timing-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:begin">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-begin-end-timing-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:end">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-dur-timing-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:dur">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-endsync-timing-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:endsync">
-            <choice>
-                <value>first</value>
-                <value>last</value>
-                <value>all</value>
-                <value>media</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="common-repeat-timing-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:repeatDur">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="smil:repeatCount">
-            <choice>
-                <ref name="nonNegativeInteger"/>
-                <value>indefinite</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="common-fill-timing-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:fill">
-            <choice>
-                <value>remove</value>
-                <value>freeze</value>
-                <value>hold</value>
-                <value>auto</value>
-                <value>default</value>
-                <value>transition</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="common-fill-default-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:fillDefault">
-            <choice>
-                <value>remove</value>
-                <value>freeze</value>
-                <value>hold</value>
-                <value>transition</value>
-                <value>auto</value>
-                <value>inherit</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="common-restart-timing-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:restart" a:defaultValue="default">
-            <choice>
-                <value>never</value>
-                <value>always</value>
-                <value>whenNotActive</value>
-                <value>default</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="common-restart-default-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:restartDefault" a:defaultValue="inherit">
-            <choice>
-                <value>never</value>
-                <value>always</value>
-                <value>whenNotActive</value>
-                <value>inherit</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="common-time-manip-attlist" combine="interleave">
-    <optional>    
-        <attribute name="smil:accelerate" a:defaultValue="0.0">
-            <ref name="double"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-time-manip-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:decelerate" a:defaultValue="0.0">
-            <ref name="double"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-time-manip-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:autoReverse" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="animation-element" combine="choice">
-    <element name="anim:par">
-        <ref name="common-anim-attlist"/>
-        <ref name="common-timing-attlist"/>
-        <ref name="common-endsync-timing-attlist"/>
-        <zeroOrMore>
-            <ref name="animation-element"/>
-        </zeroOrMore>
-    </element>
-</define>
-
-<define name="common-basic-timing-attlist" combine="interleave">
-   <ref name="common-begin-end-timing-attlist"/>
-   <ref name="common-dur-timing-attlist"/>
-   <ref name="common-repeat-timing-attlist"/>
-</define>
-
-<define name="common-timing-attlist" combine="interleave">
-   <ref name="common-basic-timing-attlist"/>
-   <ref name="common-restart-timing-attlist"/>
-   <ref name="common-restart-default-attlist"/>
-   <ref name="common-fill-timing-attlist"/>
-   <ref name="common-fill-default-attlist"/>
-   <ref name="common-time-manip-attlist"/>
-</define>
-<define name="animation-element" combine="choice">
-    <element name="anim:seq">
-        <ref name="common-anim-attlist"/>
-        <ref name="common-endsync-timing-attlist"/>
-        <ref name="common-timing-attlist"/>
-        <zeroOrMore>
-            <ref name="animation-element"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="animation-element" combine="choice">
-    <element name="anim:iterate">
-        <ref name="common-anim-attlist"/>
-        <ref name="anim-iterate-attlist"/>
-        <ref name="common-timing-attlist"/>
-        <ref name="common-endsync-timing-attlist"/>
-        <zeroOrMore>
-            <ref name="animation-element"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="anim-iterate-attlist" combine="interleave">
-    <ref name="common-anim-target-attlist"/>
-</define>
-<define name="anim-iterate-attlist" combine="interleave">
-    <optional>
-        <attribute name="anim:iterate-type">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="anim-iterate-attlist" combine="interleave">
-    <optional>
-        <attribute name="anim:iterate-interval">
-            <ref name="duration"/>
-        </attribute>
-    </optional>
-</define>
-<define name="animation-element" combine="choice">
-    <element name="anim:audio">
-        <ref name="common-anim-attlist"/>
-        <ref name="anim-audio-attlist"/>
-        <ref name="common-basic-timing-attlist"/>
-    </element>
-</define>
-<define name="anim-audio-attlist" combine="interleave">
-    <optional>
-        <attribute name="xlink:href">
-            <ref name="anyURI"/>
-        </attribute>
-    </optional>
-</define>
-<define name="anim-audio-attlist" combine="interleave">
-    <optional>
-        <attribute name="anim:audio-level">
-            <ref name="double"/>
-        </attribute>
-    </optional>
-</define>
-<define name="animation-element" combine="choice">
-    <element name="anim:command">
-        <ref name="common-anim-attlist"/>
-        <ref name="anim-command-attlist"/>
-        <ref name="common-begin-end-timing-attlist"/>
-        <ref name="common-anim-target-attlist"/>
-        <zeroOrMore>
-            <element name="anim:param">
-                <attribute name="anim:name"/>
-                <attribute name="anim:value"/>
-            </element>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="anim-command-attlist" combine="interleave">
-    <attribute name="anim:command">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="style-style">
-    <element name="style:style">
-        <ref name="style-style-attlist"/>
-        <ref name="style-style-content"/>
-        <zeroOrMore>
-            <ref name="style-map"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="style-style-attlist" combine="interleave">
-    <attribute name="style:name">
-        <ref name="styleName"/>
-    </attribute>
-</define>
-<define name="style-style-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:display-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-style-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:parent-style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-style-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:next-style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-style-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:list-style-name">
-            <choice>
-                <ref name="styleName"/>
-                <empty/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-style-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:master-page-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-style-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:auto-update" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-style-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:data-style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-style-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:class">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-style-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:default-outline-level">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-map">
-    <element name="style:map">
-        <ref name="style-map-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="style-map-attlist" combine="interleave">
-    <attribute name="style:condition">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="style-map-attlist" combine="interleave">
-    <attribute name="style:apply-style-name">
-        <ref name="styleNameRef"/>
-    </attribute>
-</define>
-<define name="style-map-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:base-cell-address">
-            <ref name="cellAddress"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-default-style">
-    <element name="style:default-style">
-        <ref name="style-style-content"/>
-    </element>
-</define>
-<define name="style-page-layout">
-    <element name="style:page-layout">
-        <ref name="style-page-layout-attlist"/>
-        <optional>
-            <ref name="style-page-layout-properties"/>
-        </optional>
-        <optional>
-            <ref name="style-header-style"/>
-        </optional>
-        <optional>
-            <ref name="style-footer-style"/>
-        </optional>
-    </element>
-</define>
-<define name="style-page-layout-attlist" combine="interleave">
-    <attribute name="style:name">
-        <ref name="styleName"/>
-    </attribute>
-</define>
-<define name="style-page-layout-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:page-usage" a:defaultValue="all">
-            <choice>
-                <value>all</value>
-                <value>left</value>
-                <value>right</value>
-                <value>mirrored</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-header-style">
-    <element name="style:header-style">
-        <optional>
-            <ref name="style-header-footer-properties"/>
-        </optional>
-    </element>
-</define>
-<define name="style-footer-style">
-    <element name="style:footer-style">
-        <optional>
-            <ref name="style-header-footer-properties"/>
-        </optional>
-    </element>
-</define>
-<define name="style-master-page">
-    <element name="style:master-page">
-        <ref name="style-master-page-attlist"/>
-        <optional>
-            <ref name="style-header"/>
-            <optional>
-                <ref name="style-header-left"/>
-            </optional>
-        </optional>
-        <optional>
-            <ref name="style-footer"/>
-            <optional>
-                <ref name="style-footer-left"/>
-            </optional>
-        </optional>
-        <optional>
-            <ref name="office-forms"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="style-style"/>
-        </zeroOrMore>
-        <zeroOrMore>
-            <ref name="shape"/>
-        </zeroOrMore>
-        <optional>
-            <ref name="presentation-notes"/>
-        </optional>
-    </element>
-</define>
-<define name="style-master-page-attlist" combine="interleave">
-    <attribute name="style:name">
-        <ref name="styleName"/>
-    </attribute>
-</define>
-<define name="style-master-page-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:display-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-master-page-attlist" combine="interleave">
-    <attribute name="style:page-layout-name">
-        <ref name="styleNameRef"/>
-    </attribute>
-</define>
-<define name="style-master-page-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-master-page-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:next-style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-header">
-    <element name="style:header">
-        <ref name="common-style-header-footer-attlist"/>
-        <ref name="header-footer-content"/>
-    </element>
-</define>
-<define name="style-footer">
-    <element name="style:footer">
-        <ref name="common-style-header-footer-attlist"/>
-        <ref name="header-footer-content"/>
-    </element>
-</define>
-<define name="style-header-left">
-    <element name="style:header-left">
-        <ref name="common-style-header-footer-attlist"/>
-        <ref name="header-footer-content"/>
-    </element>
-</define>
-<define name="style-footer-left">
-    <element name="style:footer-left">
-        <ref name="common-style-header-footer-attlist"/>
-        <ref name="header-footer-content"/>
-    </element>
-</define>
-<define name="header-footer-content">
-    <choice>
-        <group>
-            <ref name="text-tracked-changes"/>
-            <ref name="text-decls"/>
-            <zeroOrMore>
-                <choice>
-                    <ref name="text-h"/>
-                    <ref name="text-p"/>
-                    <ref name="text-list"/>
-                    <ref name="table-table"/>
-                    <ref name="text-section"/>
-                    <ref name="text-table-of-content"/>
-                    <ref name="text-illustration-index"/>
-                    <ref name="text-table-index"/>
-                    <ref name="text-object-index"/>
-                    <ref name="text-user-index"/>
-                    <ref name="text-alphabetical-index"/>
-                    <ref name="text-bibliography"/>
-                    <ref name="text-index-title"/>
-                    <ref name="change-marks"/>
-                </choice>
-            </zeroOrMore>
-        </group>
-        <group>
-            <optional>
-                <ref name="style-region-left"/>
-            </optional>
-            <optional>
-                <ref name="style-region-center"/>
-            </optional>
-            <optional>
-                <ref name="style-region-right"/>
-            </optional>
-        </group>
-    </choice>
-</define>
-<define name="common-style-header-footer-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:display" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-region-left">
-    <element name="style:region-left">
-        <ref name="region-content"/>
-    </element>
-</define>
-<define name="style-region-center">
-    <element name="style:region-center">
-        <ref name="region-content"/>
-    </element>
-</define>
-<define name="style-region-right">
-    <element name="style:region-right">
-        <ref name="region-content"/>
-    </element>
-</define>
-
-<define name="region-content">
-    <zeroOrMore>
-        <ref name="text-p"/>
-    </zeroOrMore>
-</define>
-<define name="presentation-notes">
-    <element name="presentation:notes">
-        <ref name="common-presentation-header-footer-attlist"/>
-        <ref name="presentation-notes-attlist"/>
-        <ref name="office-forms"/>
-        <zeroOrMore>
-            <ref name="shape"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="presentation-notes-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:page-layout-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-notes-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-table-template">
-    <element name="table:table-template">
-        <ref name="table-table-template-attlist"/>
-        <optional>
-            <ref name="table-first-row"/>
-        </optional>
-        <optional>
-            <ref name="table-last-row"/>
-        </optional>
-        <optional>
-            <ref name="table-first-column"/>
-        </optional>
-        <optional>
-            <ref name="table-last-column"/>
-        </optional>
-        <choice>
-            <ref name="table-body"/>
-            <group>
-                <ref name="table-even-rows"/>
-                <ref name="table-odd-rows"/>
-            </group>
-            <group>
-                <ref name="table-even-columns"/>
-                <ref name="table-odd-columns"/>
-            </group>
-        </choice>
-    </element>
-</define>
-<define name="table-table-template-attlist" combine="interleave">
-    <attribute name="text:name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="table-table-template-attlist" combine="interleave">
-    <attribute name="text:first-row-start-column">
-        <ref name="rowOrCol"/>
-    </attribute>
-</define>
-
-<define name="table-table-template-attlist" combine="interleave">
-    <attribute name="text:first-row-end-column">
-        <ref name="rowOrCol"/>
-    </attribute>
-</define>
-
-<define name="table-table-template-attlist" combine="interleave">
-    <attribute name="text:last-row-start-column">
-        <ref name="rowOrCol"/>
-    </attribute>
-</define>
-
-<define name="table-table-template-attlist" combine="interleave">
-    <attribute name="text:last-row-end-column">
-        <ref name="rowOrCol"/>
-    </attribute>
-</define>
-
-<define name="rowOrCol">
-    <choice>
-        <value>row</value>
-        <value>column</value>
-    </choice>
-</define>
-<define name="table-first-row">
-    <element name="table:first-row">
-        <ref name="common-table-template-attlist"/>
-        <empty/>
-    </element>
-</define>
-
-<define name="table-last-row">
-    <element name="table:last-row">
-        <ref name="common-table-template-attlist"/>
-        <empty/>
-    </element>
-</define>
-
-<define name="table-first-column">
-    <element name="table:first-column">
-        <ref name="common-table-template-attlist"/>
-        <empty/>
-    </element>
-</define>
-
-<define name="table-last-column">
-    <element name="table:last-column">
-        <ref name="common-table-template-attlist"/>
-        <empty/>
-    </element>
-</define>
-
-<define name="table-body">
-    <element name="table:body">
-        <ref name="common-table-template-attlist"/>
-        <empty/>
-    </element>
-</define>
-
-<define name="table-even-rows">
-    <element name="table:even-rows">
-        <ref name="common-table-template-attlist"/>
-        <empty/>
-    </element>
-</define>
-
-<define name="table-odd-rows">
-    <element name="table:odd-rows">
-        <ref name="common-table-template-attlist"/>
-        <empty/>
-    </element>
-</define>
-
-<define name="table-even-columns">
-    <element name="table:even-columns">
-        <ref name="common-table-template-attlist"/>
-        <empty/>
-    </element>
-</define>
-
-<define name="table-odd-columns">
-    <element name="table:odd-columns">
-        <ref name="common-table-template-attlist"/>
-        <empty/>
-    </element>
-</define>
-
-<define name="common-table-template-attlist" combine="interleave">
-    <attribute name="text:style-name">
-        <ref name="styleNameRef"/>
-    </attribute>
-    <attribute name="text:paragraph-style-name">
-        <optional>
-            <ref name="styleNameRef"/>
-        </optional>
-    </attribute>
-</define>
-<define name="style-font-face">
-    <element name="style:font-face">
-        <ref name="style-font-face-attlist"/>
-        <optional>
-            <ref name="svg-font-face-src"/>
-        </optional>
-        <optional>
-            <ref name="svg-definition-src"/>
-        </optional>
-    </element>
-</define>
-<define name="style-font-face-attlist" combine="interleave">
-    <optional>
-        <attribute name="svg:font-family">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:font-style">
-            <ref name="fontStyle"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:font-variant">
-            <ref name="fontVariant"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:font-weight">
-            <ref name="fontWeight"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:font-stretch">
-            <choice>
-                <value>normal</value>
-                <value>ultra-condensed</value>
-                <value>extra-condensed</value>
-                <value>condensed</value>
-                <value>semi-condensed</value>
-                <value>semi-expanded</value>
-                <value>expanded</value>
-                <value>extra-expanded</value>
-                <value>ultra-expanded</value>
-            </choice>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:font-size">
-            <ref name="positiveLength"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:unicode-range"/>
-    </optional>
-    <optional>
-        <attribute name="svg:units-per-em">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:panose-1"/>
-    </optional>
-    <optional>
-        <attribute name="svg:stemv">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:stemh">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:slope">
-            <ref name="integer"/>
-        </attribute>
-        </optional>
-    <optional>
-        <attribute name="svg:cap-height">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:x-height">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:accent-height">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:ascent">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:descent">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:widths"/>
-    </optional>
-    <optional>
-        <attribute name="svg:bbox"/>
-    </optional>
-    <optional>
-        <attribute name="svg:ideographic">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:alphabetic">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:mathematical">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:hanging">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:v-ideographic">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:v-alphabetic">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:v-mathematical">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:v-hanging">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:underline-position">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:underline-thickness">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:strikethrough-position">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:strikethrough-thickness">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:overline-position">
-            <ref name="integer"/>
-        </attribute>
-        </optional>
-    <optional>
-        <attribute name="svg:overline-thickness">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-</define>
-
-<define name="svg-font-face-src">
-    <element name="svg:font-face-src">
-        <oneOrMore>
-            <choice>
-                <ref name="svg-font-face-uri"/>
-                <ref name="svg-font-face-name"/>
-            </choice>
-        </oneOrMore>
-    </element>
-</define>
-
-<define name="svg-font-face-uri">
-    <element name="svg:font-face-uri">
-        <ref name="common-svg-font-face-xlink-attlist"/>
-        <zeroOrMore>
-            <ref name="svg-font-face-format"/>
-        </zeroOrMore>
-    </element>
-</define>
-
-<define name="svg-font-face-format">
-    <element name="svg:font-face-format">
-        <optional>
-            <attribute name="svg:string"/>
-        </optional>
-        <empty/>
-    </element>
-</define>
-<define name="svg-font-face-name">
-    <element name="svg:font-face-name">
-        <optional>
-            <attribute name="svg:name"/>
-        </optional>
-        <empty/>
-    </element>
-</define>
-
-<define name="svg-definition-src">
-    <element name="svg:definition-src">
-        <ref name="common-svg-font-face-xlink-attlist"/>
-    <empty/>
-    </element>
-</define>
-
-<define name="common-svg-font-face-xlink-attlist" combine="interleave">
-    <attribute name="xlink:href">
-        <ref name="anyURI"/>
-    </attribute>
-    <optional>
-        <attribute name="xlink:type" a:defaultValue="simple">
-            <value>simple</value>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="xlink:actuate" a:defaultValue="onRequest">
-            <value>onRequest</value>
-        </attribute>
-    </optional>
-</define>
-<define name="style-font-face-attlist" combine="interleave">
-    <attribute name="style:name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="style-font-face-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:font-adornments">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-font-face-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:font-family-generic">
-            <ref name="fontFamilyGeneric"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-font-face-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:font-pitch">
-            <ref name="fontPitch"/>
-        </attribute>
-    </optional>
-</define>
-
-<define name="style-font-face-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:font-charset">
-            <ref name="textEncoding"/>
-        </attribute>
-    </optional>
-</define>
-<define name="number-number-style">
-    <element name="number:number-style">
-        <ref name="common-data-style-attlist"/>
-        <optional>
-            <ref name="style-text-properties"/>
-        </optional>
-        <optional>
-            <ref name="number-text"/>
-        </optional>
-        <optional>
-            <ref name="any-number"/>
-            <optional>
-                <ref name="number-text"/>
-            </optional>
-        </optional>
-        <zeroOrMore>
-            <ref name="style-map"/>
-        </zeroOrMore>
-    </element>
-</define>
-
-<define name="any-number">
-    <choice>
-        <ref name="number-number"/>
-        <ref name="number-scientific-number"/>
-        <ref name="number-fraction"/>
-    </choice>
-</define>
-<define name="number-number">
-    <element name="number:number">
-        <ref name="number-number-attlist"/>
-        <ref name="common-decimal-places-attlist"/>
-        <ref name="common-number-attlist"/>
-        <zeroOrMore>
-            <ref name="number-embedded-text"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="number-number-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:decimal-replacement"/>
-    </optional>
-</define>
-<define name="number-number-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:display-factor" a:defaultValue="1">
-            <ref name="double"/>
-        </attribute>
-    </optional>
-</define>
-<define name="number-embedded-text">
-    <element name="number:embedded-text">
-        <ref name="number-embedded-text-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="number-embedded-text-attlist" combine="interleave">
-    <attribute name="number:position">
-        <ref name="integer"/>
-    </attribute>
-</define>
-<define name="number-scientific-number">
-    <element name="number:scientific-number">
-        <ref name="number-scientific-number-attlist"/>
-        <ref name="common-decimal-places-attlist"/>
-        <ref name="common-number-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="number-scientific-number-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:min-exponent-digits">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-</define>
-<define name="number-fraction">
-    <element name="number:fraction">
-        <ref name="number-fraction-attlist"/>
-        <ref name="common-number-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="number-fraction-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:min-numerator-digits">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-</define>
-<define name="number-fraction-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:min-denominator-digits">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-</define>
-<define name="number-fraction-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:denominator-value">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-</define>
-<define name="number-currency-style">
-    <element name="number:currency-style">
-        <ref name="common-data-style-attlist"/>
-        <ref name="common-auto-reorder-attlist"/>
-        <optional>
-            <ref name="style-text-properties"/>
-        </optional>
-        <optional>
-            <ref name="number-text"/>
-        </optional>
-        <optional>
-            <choice>
-                <group>
-                    <ref name="number-and-text"/>
-                    <optional>
-                        <ref name="currency-symbol-and-text"/>
-                    </optional>
-                </group>
-                <group>
-                    <ref name="currency-symbol-and-text"/>
-                    <optional>
-                        <ref name="number-and-text"/>
-                    </optional>
-                </group>
-            </choice>
-        </optional>
-        <zeroOrMore>
-            <ref name="style-map"/>
-        </zeroOrMore>
-    </element>
-</define>
-
-<define name="currency-symbol-and-text">
-    <ref name="number-currency-symbol"/>
-    <optional>
-        <ref name="number-text"/>
-    </optional>
-</define>
-<define name="number-and-text">
-    <ref name="number-number"/>
-    <optional>
-        <ref name="number-text"/>
-    </optional>
-</define>
-<define name="number-currency-symbol">
-    <element name="number:currency-symbol">
-        <ref name="number-currency-symbol-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="number-currency-symbol-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:language">
-            <ref name="languageCode"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="number:country">
-            <ref name="countryCode"/>
-        </attribute>
-    </optional>
-</define>
-<define name="number-percentage-style">
-    <element name="number:percentage-style">
-        <ref name="common-data-style-attlist"/>
-        <optional>
-            <ref name="style-text-properties"/>
-        </optional>
-        <optional>
-            <ref name="number-text"/>
-        </optional>
-        <optional>
-            <ref name="number-and-text"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="style-map"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="number-date-style">
-    <element name="number:date-style">
-        <ref name="common-data-style-attlist"/>
-        <ref name="common-auto-reorder-attlist"/>
-        <ref name="common-format-source-attlist"/>
-        <optional>
-            <ref name="style-text-properties"/>
-        </optional>
-        <!-- This DTD does not reflect the fact that some elements must not -->
-        <!-- occur more than once. -->
-        <optional>
-            <ref name="number-text"/>
-        </optional>
-        <oneOrMore>
-            <ref name="any-date"/>
-            <optional>
-                <ref name="number-text"/>
-            </optional>
-        </oneOrMore>
-        <zeroOrMore>
-            <ref name="style-map"/>
-        </zeroOrMore>
-    </element>
-</define>
-
-<define name="any-date">
-    <choice>
-        <ref name="number-day"/>
-        <ref name="number-month"/>
-        <ref name="number-year"/>
-        <ref name="number-era"/>
-        <ref name="number-day-of-week"/>
-        <ref name="number-week-of-year"/>
-        <ref name="number-quarter"/>
-        <ref name="number-hours"/>
-        <ref name="number-am-pm"/>
-        <ref name="number-minutes"/>
-        <ref name="number-seconds"/>
-    </choice>
-</define>
-<define name="number-day">
-    <element name="number:day">
-        <ref name="number-day-attlist"/>
-        <ref name="common-calendar-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="number-day-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:style" a:defaultValue="short">
-            <choice>
-                <value>short</value>
-                <value>long</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="number-month">
-    <element name="number:month">
-        <ref name="number-month-attlist"/>
-        <ref name="common-calendar-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="number-month-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:textual" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="number-month-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:possessive-form" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="number-month-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:style" a:defaultValue="short">
-            <choice>
-                <value>short</value>
-                <value>long</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="number-year">
-    <element name="number:year">
-        <ref name="number-year-attlist"/>
-        <ref name="common-calendar-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="number-year-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:style" a:defaultValue="short">
-            <choice>
-                <value>short</value>
-                <value>long</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="number-era">
-    <element name="number:era">
-        <ref name="number-era-attlist"/>
-        <ref name="common-calendar-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="number-era-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:style" a:defaultValue="short">
-            <choice>
-                <value>short</value>
-                <value>long</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="number-day-of-week">
-    <element name="number:day-of-week">
-        <ref name="number-day-of-week-attlist"/>
-        <ref name="common-calendar-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="number-day-of-week-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:style" a:defaultValue="short">
-            <choice>
-                <value>short</value>
-                <value>long</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="number-week-of-year">
-    <element name="number:week-of-year">
-        <ref name="common-calendar-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="number-quarter">
-    <element name="number:quarter">
-        <ref name="number-quarter-attlist"/>
-        <ref name="common-calendar-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="number-quarter-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:style" a:defaultValue="short">
-            <choice>
-                <value>short</value>
-                <value>long</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="number-time-style">
-    <element name="number:time-style">
-        <ref name="number-time-style-attlist"/>
-        <ref name="common-data-style-attlist"/>
-        <ref name="common-format-source-attlist"/>
-        <optional>
-            <ref name="style-text-properties"/>
-        </optional>
-        <!-- This DTD does not reflect the fact that some elements must not -->
-        <!-- occur more than once. -->
-        <optional>
-            <ref name="number-text"/>
-        </optional>
-        <oneOrMore>
-            <ref name="any-time"/>
-            <optional>
-                <ref name="number-text"/>
-            </optional>
-        </oneOrMore>
-        <zeroOrMore>
-            <ref name="style-map"/>
-        </zeroOrMore>
-    </element>
-</define>
-
-<define name="any-time">
-    <choice>
-        <ref name="number-hours"/>
-        <ref name="number-am-pm"/>
-        <ref name="number-minutes"/>
-        <ref name="number-seconds"/>
-    </choice>
-</define>
-<define name="number-time-style-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:truncate-on-overflow" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="number-hours">
-    <element name="number:hours">
-        <ref name="number-hours-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="number-hours-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:style" a:defaultValue="short">
-            <choice>
-                <value>short</value>
-                <value>long</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="number-minutes">
-    <element name="number:minutes">
-        <ref name="number-minutes-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="number-minutes-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:style" a:defaultValue="short">
-            <choice>
-                <value>short</value>
-                <value>long</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="number-seconds">
-    <element name="number:seconds">
-        <ref name="number-seconds-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="number-seconds-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:style" a:defaultValue="short">
-            <choice>
-                <value>short</value>
-                <value>long</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="number-seconds-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:decimal-places" a:defaultValue="0">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-</define>
-<define name="number-am-pm">
-    <element name="number:am-pm">
-        <empty/>
-    </element>
-</define>
-<define name="number-boolean-style">
-    <element name="number:boolean-style">
-        <ref name="common-data-style-attlist"/>
-        <optional>
-            <ref name="style-text-properties"/>
-        </optional>
-        <optional>
-            <ref name="number-text"/>
-        </optional>
-        <optional>
-            <ref name="number-boolean"/>
-            <optional>
-                <ref name="number-text"/>
-            </optional>
-        </optional>
-        <zeroOrMore>
-            <ref name="style-map"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="number-boolean">
-    <element name="number:boolean">
-        <empty/>
-    </element>
-</define>
-<define name="number-text-style">
-    <element name="number:text-style">
-        <ref name="common-data-style-attlist"/>
-        <optional>
-            <ref name="style-text-properties"/>
-        </optional>
-        <optional>
-            <ref name="number-text"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="number-text-content"/>
-            <optional>
-                <ref name="number-text"/>
-            </optional>
-        </zeroOrMore>
-        <zeroOrMore>
-            <ref name="style-map"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="number-text">
-    <element name="number:text">
-        <text/>
-    </element>
-</define>
-<define name="number-text-content">
-    <element name="number:text-content">
-        <empty/>
-    </element>
-</define>
-<define name="common-data-style-attlist" combine="interleave">
-    <attribute name="style:name">
-        <ref name="styleName"/>
-    </attribute>
-</define>
-<define name="style-data-style-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:display-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-data-style-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:language">
-            <ref name="languageCode"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-data-style-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:country">
-            <ref name="countryCode"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-data-style-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:title"/>
-    </optional>
-</define>
-<define name="common-data-style-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:volatile">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-auto-reorder-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:automatic-order" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-format-source-attlist">
-    <optional>
-        <attribute name="number:format-source" a:defaultValue="fixed">
-            <choice>
-                <value>fixed</value>
-                <value>language</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="common-data-style-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:transliteration-format" a:defaultValue="1">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-data-style-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:transliteration-language">
-            <ref name="countryCode"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-data-style-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:transliteration-country">
-            <ref name="countryCode"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-data-style-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:transliteration-style" a:defaultValue="short">
-            <choice>
-                <value>short</value>
-                <value>medium</value>
-                <value>long</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="common-decimal-places-attlist">
-    <optional>
-        <attribute name="number:decimal-places">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-number-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:min-integer-digits">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-number-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:grouping" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-calendar-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:calendar">
-            <choice>
-                <value>gregorian</value>
-                <value>gengou</value>
-                <value>ROC</value>
-                <value>hanja_yoil</value>
-                <value>hanja</value>
-                <value>hijri</value>
-                <value>jewish</value>
-                <value>buddhist</value>
-                <ref name="string"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-style-content" combine="choice">
-    <group>
-        <attribute name="style:family">
-            <value>text</value>
-        </attribute>
-        <optional>
-            <ref name="style-text-properties"/>
-        </optional>
-    </group>
-</define>
-<define name="style-style-content" combine="choice">
-    <group>
-        <attribute name="style:family">
-            <value>paragraph</value>
-        </attribute>
-        <optional>
-            <ref name="style-paragraph-properties"/>
-        </optional>
-        <optional>
-            <ref name="style-text-properties"/>
-        </optional>
-    </group>
-</define>
-<define name="style-style-content" combine="choice">
-    <group>
-        <attribute name="style:family">
-            <value>section</value>
-        </attribute>
-        <optional>
-            <ref name="style-section-properties"/>
-        </optional>
-    </group>
-</define>
-<define name="style-style-content" combine="choice">
-    <group>
-        <attribute name="style:family">
-            <value>ruby</value>
-        </attribute>
-        <optional>
-            <ref name="style-ruby-properties"/>
-        </optional>
-    </group>
-</define>
-<define name="text-linenumbering-configuration">
-    <element name="text:linenumbering-configuration">
-        <ref name="text-linenumbering-configuration-attlist"/>
-        <optional>
-            <ref name="text-linenumbering-separator"/>
-        </optional>
-    </element>
-</define>
-<define name="text-linenumbering-configuration-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:number-lines" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-linenumbering-configuration-attlist" combine="interleave">
-    <optional>
-        <ref name="common-num-format-attlist"/>
-    </optional>
-</define>
-<define name="text-linenumbering-configuration-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-linenumbering-configuration-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:increment">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-linenumbering-configuration-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:number-position" a:defaultValue="left">
-            <choice>
-                <value>left</value>
-                <value>right</value>
-                <value>inner</value>
-                <value>outer</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="text-linenumbering-configuration-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:offset">
-            <ref name="nonNegativeLength"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-linenumbering-configuration-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:count-empty-lines" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-linenumbering-configuration-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:count-in-text-boxes" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-linenumbering-configuration-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:restart-on-page" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-linenumbering-separator">
-    <element name="text:linenumbering-separator">
-        <optional>
-            <attribute name="text:increment">
-                <ref name="nonNegativeInteger"/>
-            </attribute>
-        </optional>
-        <text/>
-    </element>
-</define>
-<define name="text-notes-configuration">
-    <element name="text:notes-configuration">
-        <ref name="text-notes-configuration-content"/>
-    </element>
-</define>
-<define name="text-notes-configuration-content" combine="interleave">
-    <ref name="text-note-class"/>
-</define>
-<define name="text-notes-configuration-content" combine="interleave">
-    <optional>
-        <attribute name="text:citation-style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-notes-configuration-content" combine="interleave">
-    <optional>
-        <attribute name="text:citation-body-style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-notes-configuration-content" combine="interleave">
-    <optional>
-        <attribute name="text:default-style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-notes-configuration-content" combine="interleave">
-    <optional>
-        <attribute name="text:master-page-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-notes-configuration-content" combine="interleave">
-    <optional>
-        <attribute name="text:start-value">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-notes-configuration-content" combine="interleave">
-    <ref name="common-num-format-prefix-suffix-attlist"/>
-    <optional>
-        <ref name="common-num-format-attlist"/>
-    </optional>
-</define>
-<define name="text-notes-configuration-content" combine="interleave">
-    <optional>
-        <attribute name="text:start-numbering-at">
-            <choice>
-                <value>document</value>
-                <value>chapter</value>
-                <value>page</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="text-notes-configuration-content" combine="interleave">
-    <optional>
-        <attribute name="text:footnotes-position">
-            <choice>
-                <value>text</value>
-                <value>page</value>
-                <value>section</value>
-                <value>document</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="text-notes-configuration-content" combine="interleave">
-    <optional>
-        <element name="text:note-continuation-notice-forward">
-            <text/>
-        </element>
-    </optional>
-</define>
-<define name="text-notes-configuration-content" combine="interleave">
-    <optional>
-        <element name="text:note-continuation-notice-backward">
-            <text/>
-        </element>
-    </optional>
-</define>
-<define name="text-bibliography-configuration">
-    <element name="text:bibliography-configuration">
-        <ref name="text-bibliography-configuration-attlist"/>
-        <zeroOrMore>
-            <ref name="text-sort-key"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="text-bibliography-configuration-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:prefix">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="text:suffix">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-bibliography-configuration-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:numbered-entries" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-bibliography-configuration-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:sort-by-position" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="fo:language">
-            <ref name="languageCode"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="fo:country">
-            <ref name="countryCode"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="text:sort-algorithm">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-sort-key">
-    <element name="text:sort-key">
-        <ref name="text-sort-key-attlist"/>
-        <empty/>
-    </element>
-</define>
-
-<define name="text-sort-key-attlist" combine="interleave">
-    <attribute name="text:key">
-        <choice>
-            <value>address</value>
-            <value>annote</value>
-            <value>author</value>
-            <value>bibliography-type</value>
-            <value>booktitle</value>
-            <value>chapter</value>
-            <value>custom1</value>
-            <value>custom2</value>
-            <value>custom3</value>
-            <value>custom4</value>
-            <value>custom5</value>
-            <value>edition</value>
-            <value>editor</value>
-            <value>howpublished</value>
-            <value>identifier</value>
-            <value>institution</value>
-            <value>isbn</value>
-            <value>issn</value>
-            <value>journal</value>
-            <value>month</value>
-            <value>note</value>
-            <value>number</value>
-            <value>organizations</value>
-            <value>pages</value>
-            <value>publisher</value>
-            <value>report-type</value>
-            <value>school</value>
-            <value>series</value>
-            <value>title</value>
-            <value>url</value>
-            <value>volume</value>
-            <value>year</value>
-        </choice>
-    </attribute>
-    <optional>
-        <attribute name="text:sort-ascending" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-list-style">
-    <element name="text:list-style">
-        <ref name="text-list-style-attr"/>
-        <zeroOrMore>
-            <ref name="text-list-style-content"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="text-list-style-attr" combine="interleave">
-    <attribute name="style:name">
-        <ref name="styleName"/>
-    </attribute>
-</define>
-<define name="text-list-style-attr" combine="interleave">
-    <optional>
-        <attribute name="style:display-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-list-style-attr" combine="interleave">
-    <optional>
-        <attribute name="text:consecutive-numbering" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-list-level-style-attr">
-    <attribute name="text:level">
-        <ref name="positiveInteger"/>
-    </attribute>
-</define>
-<define name="text-list-style-content" combine="choice">
-    <element name="text:list-level-style-number">
-        <ref name="text-list-level-style-attr"/>
-        <ref name="text-list-level-style-number-attr"/>
-        <optional>
-            <ref name="style-list-level-properties"/>
-        </optional>
-        <optional>
-            <ref name="style-text-properties"/>
-        </optional>
-    </element>
-</define>
-<define name="text-list-level-style-number-attr" combine="interleave">
-    <optional>
-        <attribute name="text:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-list-level-style-number-attr" combine="interleave">
-    <ref name="common-num-format-attlist"/>
-    <ref name="common-num-format-prefix-suffix-attlist"/>
-</define>
-<define name="text-list-level-style-number-attr" combine="interleave">
-    <optional>
-        <attribute name="text:display-levels" a:defaultValue="1">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-list-level-style-number-attr" combine="interleave">
-    <optional>
-        <attribute name="text:start-value" a:defaultValue="1">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-list-style-content" combine="choice">
-    <element name="text:list-level-style-bullet">
-        <ref name="text-list-level-style-attr"/>
-        <ref name="text-list-level-style-bullet-attr"/>
-        <optional>
-            <ref name="style-list-level-properties"/>
-        </optional>
-        <optional>
-            <ref name="style-text-properties"/>
-        </optional>
-    </element>
-</define>
-<define name="text-list-level-style-bullet-attr" combine="interleave">
-    <optional>
-        <attribute name="text:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-list-level-style-bullet-attr" combine="interleave">
-    <attribute name="text:bullet-char">
-        <ref name="character"/>
-    </attribute>
-</define>
-<define name="text-list-level-style-bullet-attr" combine="interleave">
-    <ref name="common-num-format-prefix-suffix-attlist"/>
-</define>
-<define name="text-list-level-style-bullet-attr" combine="interleave">
-    <optional>
-        <attribute name="text:bullet-relative-size">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-list-style-content" combine="choice">
-    <element name="text:list-level-style-image">
-        <ref name="text-list-level-style-attr"/>
-        <ref name="text-list-level-style-image-attr"/>
-        <optional>
-            <ref name="style-list-level-properties"/>
-        </optional>
-    </element>
-</define>
-<define name="text-list-level-style-image-attr" combine="interleave">
-    <choice>
-        <ref name="common-draw-data-attlist"/>
-        <ref name="office-binary-data"/>
-    </choice>
-</define>
-<define name="text-outline-style">
-    <element name="text:outline-style">
-        <oneOrMore>
-            <ref name="text-outline-level-style"/>
-        </oneOrMore>
-    </element>
-</define>
-<define name="text-outline-level-style">
-    <element name="text:outline-level-style">
-        <ref name="text-outline-level-style-attlist"/>
-        <optional>
-            <ref name="style-list-level-properties"/>
-        </optional>
-        <optional>
-            <ref name="style-text-properties"/>
-        </optional>
-    </element>
-</define>
-<define name="text-outline-level-style-attlist" combine="interleave">
-    <attribute name="text:level">
-        <ref name="positiveInteger"/>
-    </attribute>
-</define>
-<define name="text-outline-level-style-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-outline-level-style-attlist" combine="interleave">
-    <ref name="common-num-format-attlist"/>
-    <ref name="common-num-format-prefix-suffix-attlist"/>
-</define>
-<define name="text-outline-level-style-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:display-levels" a:defaultValue="1">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-outline-level-style-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:start-value" a:defaultValue="1">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-style-content" combine="choice">
-    <group>
-        <attribute name="style:family">
-            <value>table</value>
-        </attribute>
-        <optional>
-            <ref name="style-table-properties"/>
-        </optional>
-    </group>
-</define>
-<define name="style-style-content" combine="choice">
-    <group>
-        <attribute name="style:family">
-            <value>table-column</value>
-        </attribute>
-        <optional>
-            <ref name="style-table-column-properties"/>
-        </optional>
-    </group>
-</define>
-<define name="style-style-content" combine="choice">
-    <group>
-        <attribute name="style:family">
-            <value>table-row</value>
-        </attribute>
-        <optional>
-            <ref name="style-table-row-properties"/>
-        </optional>
-    </group>
-</define>
-<define name="style-style-content" combine="choice">
-    <group>
-        <attribute name="style:family">
-            <value>table-cell</value>
-        </attribute>
-        <optional>
-            <ref name="style-table-cell-properties"/>
-        </optional>
-        <optional>
-            <ref name="style-paragraph-properties"/>
-        </optional>
-        <optional>
-            <ref name="style-text-properties"/>
-        </optional>
-    </group>
-</define>
-<define name="style-style-content" combine="choice">
-    <group>
-        <attribute name="style:family">
-            <choice>
-                <value>graphic</value>
-                <value>presentation</value>
-            </choice>
-        </attribute>
-        <optional>
-            <ref name="style-graphic-properties"/>
-        </optional>
-        <optional>
-            <ref name="style-paragraph-properties"/>
-        </optional>
-        <optional>
-            <ref name="style-text-properties"/>
-        </optional>
-    </group>
-</define>
-
-<define name="style-graphic-properties">
-    <element name="style:graphic-properties">
-        <ref name="style-graphic-properties-content"/>
-    </element>
-</define>
-
-<define name="style-graphic-properties-content">
-    <ref name="style-properties-content"/>
-</define>
-
-<define name="style-graphic-properties-content-strict">
-    <ref name="style-graphic-properties-attlist"/>
-    <ref name="style-graphic-fill-properties-attlist"/>
-    <ref name="style-graphic-properties-elements"/>
-</define>
-
-<define name=" style-graphic-properties-elements">
-    <empty/>
-</define>
-<define name="style-style-content" combine="choice">
-    <group>
-        <attribute name="style:family">
-            <value>drawing-page</value>
-        </attribute>
-        <optional>
-            <ref name="style-drawing-page-properties"/>
-        </optional>
-    </group>
-</define>
-
-<define name="style-drawing-page-properties">
-    <element name="style:drawing-page-properties">
-        <ref name="style-drawing-page-properties-content"/>
-    </element>
-</define>
-
-<define name="style-drawing-page-properties-content">
-    <ref name="style-properties-content"/>
-</define>
-
-<define name="style-drawing-page-properties-content-strict">
-    <ref name="style-graphic-fill-properties-attlist"/>
-    <ref name="style-drawing-page-properties-attlist"/>
-    <ref name="style-drawing-page-properties-elements"/>
-</define>
-<define name="draw-gradient">
-    <element name="draw:gradient">
-        <ref name="common-draw-gradient-attlist"/>
-        <ref name="draw-gradient-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="common-draw-gradient-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:name">
-            <ref name="styleName"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-draw-gradient-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:display-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-draw-gradient-attlist" combine="interleave">
-    <attribute name="draw:style">
-        <ref name="gradient-style"/>
-    </attribute>
-</define>
-<define name="gradient-style">
-    <choice>
-        <value>linear</value>
-        <value>axial</value>
-        <value>radial</value>
-        <value>ellipsoid</value>
-        <value>square</value>
-        <value>rectangular</value>
-    </choice>
-</define>
-<define name="common-draw-gradient-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:cx">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="draw:cy">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-gradient-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:start-color">
-            <ref name="color"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="draw:end-color">
-            <ref name="color"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-gradient-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:start-intensity">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="draw:end-intensity">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-draw-gradient-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:angle">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-draw-gradient-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:border">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="svg-linearGradient">
-    <element name="svg:linearGradient">
-        <ref name="common-svg-gradient-attlist"/>
-        <optional>
-            <attribute name="svg:x1" a:defaultValue="0%">
-                <choice>
-                    <ref name="coordinate"/>
-                    <ref name="percent"/>
-                </choice>                
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="svg:y1" a:defaultValue="0%">
-                <choice>
-                    <ref name="coordinate"/>
-                    <ref name="percent"/>
-                </choice>                
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="svg:x2" a:defaultValue="100%">
-                <choice>
-                    <ref name="coordinate"/>
-                    <ref name="percent"/>
-                </choice>                
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="svg:y2" a:defaultValue="100%">
-                <choice>
-                    <ref name="coordinate"/>
-                    <ref name="percent"/>
-                </choice>                
-            </attribute>
-        </optional>
-        <zeroOrMore>
-            <ref name="svg-stop"/>
-        </zeroOrMore>
-    </element>
-</define>
-
-<define name="svg-radialGradient">
-    <element name="svg:radialGradient">
-        <ref name="common-svg-gradient-attlist"/>
-        <optional>
-            <attribute name="svg:cx" a:defaultValue="50%">
-                <choice>
-                    <ref name="coordinate"/>
-                    <ref name="percent"/>
-                </choice>                
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="svg:cy" a:defaultValue="50%">
-                <choice>
-                    <ref name="coordinate"/>
-                    <ref name="percent"/>
-                </choice>                
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="svg:r" a:defaultValue="50%">
-                <choice>
-                    <ref name="coordinate"/>
-                    <ref name="percent"/>
-                </choice>                
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="svg:fx">
-                <choice>
-                    <ref name="coordinate"/>
-                    <ref name="percent"/>
-                </choice>                
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="svg:fy">
-                <choice>
-                    <ref name="coordinate"/>
-                    <ref name="percent"/>
-                </choice>                
-            </attribute>
-        </optional>
-        <zeroOrMore>
-            <ref name="svg-stop"/>
-        </zeroOrMore>
-    </element>
-</define>
-
-<define name="svg-stop">
-    <element name="svg:stop">
-        <attribute name="svg:offset">
-            <choice>
-                <ref name="double"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-        <optional>
-            <attribute name="svg:stop-color">
-                <ref name="color"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="svg:stop-opacity">
-                <ref name="double"/>
-            </attribute>
-        </optional>
-    </element>
-</define>
-
-<define name="common-svg-gradient-attlist" combine="interleave">
-    <optional>
-        <attribute name="svg:gradientUnits" a:defaultValue="objectBoundingBox">
-            <value>objectBoundingBox</value>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:gradientTransform">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:spreadMethod" a:defaultValue="pad">
-            <choice>
-                <value>pad</value>
-                <value>reflect</value>
-                <value>repeat</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="common-svg-gradient-attlist" combine="interleave">
-    <attribute name="draw:name">
-        <ref name="styleName"/>
-    </attribute>
-</define>
-<define name="common-svg-gradient-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:display-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-hatch">
-    <element name="draw:hatch">
-        <ref name="draw-hatch-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="draw-hatch-attlist" combine="interleave">
-    <attribute name="draw:name">
-        <ref name="styleName"/>
-    </attribute>
-</define>
-<define name="draw-hatch-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:display-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-hatch-attlist" combine="interleave">
-    <attribute name="draw:style">
-        <choice>
-            <value>single</value>
-            <value>double</value>
-            <value>triple</value>
-        </choice>
-    </attribute>
-</define>
-<define name="draw-hatch-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:color">
-            <ref name="color"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-hatch-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:distance">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-hatch-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:rotation">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-fill-image">
-    <element name="draw:fill-image">
-        <ref name="draw-fill-image-attlist"/>
-        <attribute name="xlink:href">
-            <ref name="anyURI"/>
-        </attribute>
-        <optional>
-            <attribute name="xlink:type" a:defaultValue="simple">
-                <choice>
-                    <value>simple</value>
-                </choice>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="xlink:show" a:defaultValue="embed">
-                <choice>
-                    <value>embed</value>
-                </choice>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="xlink:actuate" a:defaultValue="onLoad">
-                <choice>
-                    <value>onLoad</value>
-                </choice>
-            </attribute>
-        </optional>
-        <empty/>
-    </element>
-</define>
-<define name="draw-fill-image-attlist" combine="interleave">
-    <attribute name="draw:name">
-        <ref name="styleName"/>
-    </attribute>
-</define>
-<define name="draw-fill-image-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:display-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-fill-image-attlist" combine="interleave">
-    <optional>
-        <attribute name="svg:width">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:height">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-opacity">
-    <element name="draw:opacity">
-        <ref name="common-draw-gradient-attlist"/>
-        <ref name="draw-opacity-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="draw-opacity-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:start">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="draw:end">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-marker">
-    <element name="draw:marker">
-        <ref name="draw-marker-attlist"/>
-        <ref name="common-draw-viewbox-attlist"/>
-        <ref name="common-draw-path-data-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="draw-marker-attlist" combine="interleave">
-    <attribute name="draw:name">
-        <ref name="styleName"/>
-    </attribute>
-</define>
-<define name="draw-marker-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:display-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-stroke-dash">
-    <element name="draw:stroke-dash">
-        <ref name="draw-stroke-dash-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="draw-stroke-dash-attlist" combine="interleave">
-    <attribute name="draw:name">
-        <ref name="styleName"/>
-    </attribute>
-</define>
-<define name="draw-stroke-dash-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:display-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-stroke-dash-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:style">
-            <choice>
-                <value>rect</value>
-                <value>round</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-stroke-dash-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:dots1">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="draw:dots1-length">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="draw:dots2">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="draw:dots2-length">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-stroke-dash-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:distance">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-presentation-page-layout">
-    <element name="style:presentation-page-layout">
-        <attribute name="style:name">
-            <ref name="styleName"/>
-        </attribute>
-        <optional>
-            <attribute name="style:display-name">
-                <ref name="string"/>
-            </attribute>
-        </optional>
-        <zeroOrMore>
-            <ref name="presentation-placeholder"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="presentation-placeholder">
-    <element name="presentation:placeholder">
-        <attribute name="presentation:object">
-            <ref name="presentation-classes"/>
-        </attribute>
-        <attribute name="svg:x">
-            <choice>
-                <ref name="coordinate"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-        <attribute name="svg:y">
-            <choice>
-                <ref name="coordinate"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-        <attribute name="svg:width">
-            <choice>
-                <ref name="length"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-        <attribute name="svg:height">
-            <choice>
-                <ref name="length"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-        <empty/>
-    </element>
-</define>
-<define name="style-style-content" combine="choice">
-    <group>
-        <attribute name="style:family">
-            <value>chart</value>
-        </attribute>
-        <optional>
-            <ref name="style-chart-properties"/>
-        </optional>
-        <optional>
-            <ref name="style-graphic-properties"/>
-        </optional>
-        <optional>
-            <ref name="style-paragraph-properties"/>
-        </optional>
-        <optional>
-            <ref name="style-text-properties"/>
-        </optional>
-    </group>
-</define>
-<define name="style-properties-content">
-    <ref name="anyAttListOrElements"/>
-</define>
-<define name="style-page-layout-properties">
-    <element name="style:page-layout-properties">
-        <ref name="style-page-layout-properties-content"/>
-    </element>
-</define>
-
-<define name="style-page-layout-properties-content">
-    <ref name="style-properties-content"/>
-</define>
-
-<define name="style-page-layout-properties-content-strict">
-    <ref name="style-page-layout-properties-attlist"/>
-    <ref name="style-page-layout-properties-elements"/>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:page-width">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="fo:page-height">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <optional>
-        <ref name="common-num-format-attlist"/>
-    </optional>
-    <ref name="common-num-format-prefix-suffix-attlist"/>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:paper-tray-name">
-            <choice>
-                <value>default</value>
-                <ref name="string"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:print-orientation">
-            <choice>
-                <value>portrait</value>
-                <value>landscape</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <ref name="common-horizontal-margin-attlist"/>
-    <ref name="common-vertical-margin-attlist"/>
-    <ref name="common-margin-attlist"/>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <ref name="common-border-attlist"/>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <ref name="common-border-line-width-attlist"/>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <ref name="common-padding-attlist"/>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <ref name="common-shadow-attlist"/>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <ref name="common-background-color-attlist"/>
-</define>
-<define name="style-page-layout-properties-elements" combine="interleave">
-    <ref name="style-background-image"/>
-</define>
-<define name="style-page-layout-properties-elements" combine="interleave">
-    <ref name="style-columns"/>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:register-truth-ref-style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:print">
-            <list>
-                <zeroOrMore>
-                    <choice>
-                        <value>headers</value>
-                        <value>grid</value>
-                        <value>annotations</value>
-                        <value>objects</value>
-                        <value>charts</value>
-                        <value>drawings</value>
-                        <value>formulas</value>
-                        <value>zero-values</value>
-                    </choice>
-                </zeroOrMore>
-            </list>
-        </attribute>
-    </optional>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:print-page-order">
-            <choice>
-                <value>ttb</value>
-                <value>ltr</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:first-page-number">
-            <choice>
-                <ref name="positiveInteger"/>
-                <value>continue</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:scale-to">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:scale-to-pages">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:table-centering">
-            <choice>
-                <value>horizontal</value>
-                <value>vertical</value>
-                <value>both</value>
-                <value>none</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:footnote-max-height">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <ref name="common-writing-mode-attlist"/>
-</define>
-<define name="style-page-layout-properties-elements" combine="interleave">
-    <ref name="style-footnote-sep"/>
-</define>
-
-<define name="style-footnote-sep">
-    <optional>
-        <element name="style:footnote-sep">
-            <ref name="style-footnote-sep-attlist"/>
-            <empty/>
-        </element>
-    </optional>
-</define>
-<define name="style-footnote-sep-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:width">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:rel-width">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:color">
-            <ref name="color"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:line-style">
-            <ref name="lineStyle"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:adjustment" a:defaultValue="left">
-            <choice>
-                <value>left</value>
-                <value>center</value>
-                <value>right</value>
-            </choice>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:distance-before-sep">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:distance-after-sep">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:layout-grid-mode">
-            <choice>
-                <value>none</value>
-                <value>line</value>
-                <value>both</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:layout-grid-base-height">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:layout-grid-ruby-height">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:layout-grid-lines">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:layout-grid-color">
-            <ref name="color"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:layout-grid-ruby-below">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:layout-grid-print">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:layout-grid-display">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-header-footer-properties">
-    <element name="style:header-footer-properties">
-        <ref name="style-header-footer-properties-content"/>
-    </element>
-</define>
-
-<define name="style-header-footer-properties-content">
-    <ref name="style-properties-content"/>
-</define>
-
-<define name="style-header-footer-properties-content-strict">
-        <ref name="style-header-footer-properties-attlist"/>
-        <ref name="style-header-footer-properties-elements"/>
-</define>
-<define name="style-header-footer-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="svg:height">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="fo:min-height">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-header-footer-properties-attlist" combine="interleave">
-    <ref name="common-horizontal-margin-attlist"/>
-    <ref name="common-vertical-margin-attlist"/>
-    <ref name="common-margin-attlist"/>
-</define>
-<define name="style-header-footer-properties-attlist" combine="interleave">
-    <ref name="common-border-attlist"/>
-</define>
-<define name="style-header-footer-properties-attlist" combine="interleave">
-    <ref name="common-border-line-width-attlist"/>
-</define>
-<define name="style-header-footer-properties-attlist" combine="interleave">
-    <ref name="common-padding-attlist"/>
-</define>
-<define name="style-header-footer-properties-attlist" combine="interleave">
-    <ref name="common-background-color-attlist"/>
-</define>
-<define name="style-header-footer-properties-elements" combine="interleave">
-    <ref name="style-background-image"/>
-</define>
-<define name="style-header-footer-properties-attlist" combine="interleave">
-    <ref name="common-shadow-attlist"/>
-</define>
-<define name="style-header-footer-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:dynamic-spacing">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties">
-    <element name="style:text-properties">
-        <ref name="style-text-properties-content"/>
-    </element>
-</define>
-
-<define name="style-text-properties-content">
-    <ref name="style-properties-content"/>
-</define>
-
-<define name="style-text-properties-content-strict">
-    <ref name="style-text-properties-attlist"/>
-    <ref name="style-text-properties-elements"/>
-</define>
-
-<define name="style-text-properties-elements">
-    <empty/>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:font-variant">
-            <ref name="fontVariant"/>
-        </attribute>
-    </optional>
-</define>
-
-<define name="fontVariant">
-    <choice>
-        <value>normal</value>
-        <value>small-caps</value>
-    </choice>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:text-transform">
-            <choice>
-                <value>none</value>
-                <value>lowercase</value>
-                <value>uppercase</value>
-                <value>capitalize</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-            <attribute name="fo:color">
-            <ref name="color"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:use-window-font-color">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:text-outline">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:text-line-through-type">
-            <ref name="lineType"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:text-line-through-style">
-            <ref name="lineStyle"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:text-line-through-width">
-            <ref name="lineWidth"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:text-line-through-color">
-            <choice>
-                <value>font-color</value>
-                <ref name="color"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:text-line-through-text">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:text-line-through-text-style">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:text-position">
-            <list>
-                <choice>
-                    <ref name="percent"/>
-                    <value>super</value>
-                    <value>sub</value>
-                </choice>
-                <optional>
-                    <ref name="percent"/>
-                </optional>
-            </list>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:font-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:font-name-asian">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:font-name-complex">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:font-family">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:font-family-asian">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:font-family-complex">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:font-family-generic">
-            <ref name="fontFamilyGeneric"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:font-family-generic-asian">
-            <ref name="fontFamilyGeneric"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:font-family-generic-complex">
-            <ref name="fontFamilyGeneric"/>
-        </attribute>
-    </optional>
-</define>
-
-<define name="fontFamilyGeneric">
-    <choice>
-        <value>roman</value>
-        <value>swiss</value>
-        <value>modern</value>
-        <value>decorative</value>
-        <value>script</value>
-        <value>system</value>
-    </choice>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:font-style-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:font-style-name-asian">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:font-style-name-complex">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:font-pitch">
-            <ref name="fontPitch"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:font-pitch-asian">
-            <ref name="fontPitch"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:font-pitch-complex">
-            <ref name="fontPitch"/>
-        </attribute>
-    </optional>
-</define>
-
-<define name="fontPitch">
-    <choice>
-        <value>fixed</value>
-        <value>variable</value>
-    </choice>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:font-charset">
-            <ref name="textEncoding"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:font-charset-asian">
-            <ref name="textEncoding"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:font-charset-complex">
-            <ref name="textEncoding"/>
-        </attribute>
-    </optional>
-</define>
-
-<define name="textEncoding">
-    <data type="string">
-        <param name="pattern">[A-Za-z][A-Za-z0-9._\-]*</param>
-    </data>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:font-size">
-            <choice>
-                <ref name="positiveLength"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:font-size-asian">
-            <choice>
-                <ref name="positiveLength"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:font-size-complex">
-            <choice>
-                <ref name="positiveLength"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:font-size-rel">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:font-size-rel-asian">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:font-size-rel-complex">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:script-type">
-            <choice>
-                <value>latin</value>
-                <value>asian</value>
-                <value>complex</value>
-                <value>ignore</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:letter-spacing">
-            <choice>
-                <ref name="length"/>
-                <value>normal</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:language">
-            <ref name="languageCode"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:language-asian">
-            <ref name="languageCode"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:language-complex">
-            <ref name="languageCode"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:country">
-            <ref name="countryCode"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:country-asian">
-            <ref name="countryCode"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:country-complex">
-            <ref name="countryCode"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:font-style">
-            <ref name="fontStyle"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:font-style-asian">
-            <ref name="fontStyle"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:font-style-complex">
-            <ref name="fontStyle"/>
-        </attribute>
-    </optional>
-</define>
-
-<define name="fontStyle">
-    <choice>
-        <value>normal</value>
-        <value>italic</value>
-        <value>oblique</value>
-    </choice>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:font-relief">
-            <choice>
-            <value>none</value>
-                <value>embossed</value>
-                <value>engraved</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:text-shadow">
-            <ref name="shadowType"/>
-        </attribute>
-    </optional>
-</define>
-
-<define name="shadowType">
-    <choice>
-        <value>none</value>
-        <!-- The following string must match an XSL shadow decl -->
-        <ref name="string"/>
-    </choice>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:text-underline-type">
-            <ref name="lineType"/>
-        </attribute>
-    </optional>
-</define>
-
-<define name="lineType">
-    <choice>
-        <value>none</value>
-        <value>single</value>
-        <value>double</value>
-    </choice>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:text-underline-style">
-            <ref name="lineStyle"/>
-        </attribute>
-    </optional>
-</define>
-
-<define name="lineStyle">
-    <choice>
-        <value>none</value>
-        <value>solid</value>
-        <value>dotted</value>
-        <value>dash</value>
-        <value>long-dash</value>
-        <value>dot-dash</value>
-        <value>dot-dot-dash</value>
-        <value>wave</value>
-    </choice>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:text-underline-width">
-            <ref name="lineWidth"/>
-        </attribute>
-    </optional>
-</define>
-
-<define name="lineWidth">
-    <choice>
-        <value>auto</value>
-        <value>normal</value>
-        <value>bold</value>
-        <value>thin</value>
-        <value>dash</value>
-        <value>medium</value>
-        <value>thick</value>
-        <ref name="positiveInteger"/>
-        <ref name="percent"/>
-        <ref name="positiveLength"/>
-    </choice>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:text-underline-color">
-            <choice>
-                <value>font-color</value>
-                <ref name="color"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:font-weight">
-            <ref name="fontWeight"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:font-weight-asian">
-            <ref name="fontWeight"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:font-weight-complex">
-            <ref name="fontWeight"/>
-        </attribute>
-    </optional>
-</define>
-
-<define name="fontWeight">
-    <choice>
-        <value>normal</value>
-        <value>bold</value>
-        <value>100</value>
-        <value>200</value>
-        <value>300</value>
-        <value>400</value>
-        <value>500</value>
-        <value>600</value>
-        <value>700</value>
-        <value>800</value>
-        <value>900</value>
-    </choice>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:text-underline-mode">
-            <ref name="lineMode"/>
-        </attribute>
-    </optional>
-</define>
-
-<define name="lineMode">
-    <choice>
-        <value>continuous</value>
-        <value>skip-white-space</value>
-    </choice>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:text-line-through-mode">
-            <ref name="lineMode"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:letter-kerning">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:text-blinking">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <ref name="common-background-color-attlist"/>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:text-combine">
-            <choice>
-                <value>none</value>
-                <value>letters</value>
-                <value>lines</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:text-combine-start-char">
-            <ref name="character"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:text-combine-end-char">
-            <ref name="character"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:text-emphasize">
-            <choice>
-                <value>none</value>
-                <list>
-                    <choice>
-                        <value>none</value>
-                        <value>accent</value>
-                        <value>dot</value>
-                        <value>circle</value>
-                        <value>disc</value>
-                    </choice>
-                    <choice>
-                        <value>above</value>
-                        <value>below</value>
-                    </choice>
-                </list>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:text-scale">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:text-rotation-angle">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:text-rotation-scale">
-            <choice>
-                <value>fixed</value>
-                <value>line-height</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:hyphenate">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:hyphenation-remain-char-count">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:hyphenation-push-char-count">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <choice>
-        <attribute name="text:display">
-            <value>true</value>
-        </attribute>
-        <attribute name="text:display">
-            <value>none</value>
-        </attribute>
-        <group>
-            <attribute name="text:display">
-                <value>condition</value>
-            </attribute>
-            <attribute name="text:condition">
-                <value>none</value>
-            </attribute>
-        </group>
-        <empty/>
-    </choice>
-</define>
-<define name="style-paragraph-properties">
-    <element name="style:paragraph-properties">
-        <ref name="style-paragraph-properties-content"/>
-    </element>
-</define>
-
-<define name="style-paragraph-properties-content">
-    <ref name="style-properties-content"/>
-</define>
-
-<define name="style-paragraph-properties-content-strict">
-    <ref name="style-paragraph-properties-attlist"/>
-    <ref name="style-paragraph-properties-elements"/>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:line-height">
-            <choice>
-                <value>normal</value>
-                <ref name="nonNegativeLength"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:line-height-at-least">
-            <ref name="nonNegativeLength"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:line-spacing">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:font-independent-line-spacing">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <ref name="common-text-align"/>
-</define>
-
-<define name="common-text-align">
-    <optional>
-        <attribute name="fo:text-align">
-            <choice>
-                <value>start</value>
-                <value>end</value>
-                <value>left</value>
-                <value>right</value>
-                <value>center</value>
-                <value>justify</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:text-align-last">
-            <choice>
-                <value>start</value>
-                <value>center</value>
-                <value>justify</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:justify-single-word">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:keep-together">
-            <choice>
-                <value>auto</value>
-                <value>always</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:widows">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:orphans">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-elements" combine="interleave">
-    <ref name="style-tab-stops"/>
-</define>
-
-<define name="style-tab-stops">
-    <optional>
-        <element name="style:tab-stops">
-            <zeroOrMore>
-                <ref name="style-tab-stop"/>
-            </zeroOrMore>
-        </element>
-    </optional>
-</define>
-
-<define name="style-tab-stop">
-    <element name="style:tab-stop">
-        <ref name="style-tab-stop-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="style-tab-stop-attlist" combine="interleave">
-    <attribute name="style:position">
-        <ref name="nonNegativeLength"/>
-    </attribute>
-</define>
-<define name="style-tab-stop-attlist" combine="interleave">
-    <choice>
-        <optional>
-            <attribute name="style:type" a:defaultValue="left">
-                <choice>
-                    <value>left</value>
-                    <value>center</value>
-                    <value>right</value>
-                </choice>
-            </attribute>
-        </optional>
-        <group>
-            <attribute name="style:type">
-                <value>char</value>
-            </attribute>
-            <ref name="style-tab-stop-char-attlist"/>
-        </group>
-    </choice>
-</define>
-<define name="style-tab-stop-char-attlist" combine="interleave">
-    <attribute name="style:char">
-        <ref name="character"/>
-    </attribute>
-</define>
-<define name="style-tab-stop-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:leader-type">
-            <ref name="lineType"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-tab-stop-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:leader-style">
-            <ref name="lineStyle"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-tab-stop-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:leader-width">
-            <ref name="lineWidth"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-tab-stop-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:leader-color">
-            <choice>
-                <value>font-color</value>
-                <ref name="color"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-tab-stop-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:leader-text" a:defaultValue=" ">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-tab-stop-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:leader-text-style">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:tab-stop-distance">
-            <ref name="nonNegativeLength"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:hyphenation-keep">
-            <choice>
-                <value>auto</value>
-                <value>page</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:hyphenation-ladder-count">
-            <choice>
-                <value>no-limit</value>
-                <ref name="positiveInteger"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-elements" combine="interleave">
-    <ref name="style-drop-cap"/>
-</define>
-
-<define name="style-drop-cap">
-    <optional>
-        <element name="style:drop-cap">
-            <ref name="style-drop-cap-attlist"/>
-            <empty/>
-        </element>
-    </optional>
-</define>
-<define name="style-drop-cap-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:length" a:defaultValue="1">
-            <choice>
-                <value>word</value>
-                <ref name="positiveInteger"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-drop-cap-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:lines" a:defaultValue="1">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-drop-cap-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:distance" a:defaultValue="0cm">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-drop-cap-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-        <optional>
-            <attribute name="style:register-true">
-                <ref name="boolean"/>
-            </attribute>
-        </optional>
-    </define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <ref name="common-horizontal-margin-attlist"/>
-</define>
-
-<define name="common-horizontal-margin-attlist">
-    <optional>
-        <attribute name="fo:margin-left">
-            <choice>
-                <ref name="length"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="fo:margin-right">
-            <choice>
-                <ref name="length"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:text-indent">
-            <choice>
-                <ref name="length"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:auto-text-indent">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <ref name="common-vertical-margin-attlist"/>
-</define>
-
-<define name="common-vertical-margin-attlist">
-    <optional>
-        <attribute name="fo:margin-top">
-            <choice>
-                <ref name="nonNegativeLength"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="fo:margin-bottom">
-            <choice>
-                <ref name="nonNegativeLength"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <ref name="common-margin-attlist"/>
-</define>
-
-<define name="common-margin-attlist">
-    <optional>
-        <attribute name="fo:margin">
-            <choice>
-                <ref name="nonNegativeLength"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <ref name="common-break-attlist"/>
-</define>
-
-<define name="common-break-attlist">
-    <optional>
-        <attribute name="fo:break-before">
-            <choice>
-                <value>auto</value>
-                <value>column</value>
-                <value>page</value>
-            </choice>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="fo:break-after">
-            <choice>
-                <value>auto</value>
-                <value>column</value>
-                <value>page</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <ref name="common-background-color-attlist"/>
-</define>
-
-<define name="common-background-color-attlist">
-    <optional>
-        <attribute name="fo:background-color">
-            <choice>
-                <value>transparent</value>
-                <ref name="color"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-elements" combine="interleave">
-    <ref name="style-background-image"/>
-</define>
-
-<define name="style-background-image">
-    <optional>
-        <element name="style:background-image">
-            <ref name="style-background-image-attlist"/>
-            <choice>
-                <ref name="common-draw-data-attlist"/>
-                <ref name="office-binary-data"/>
-                <empty/>
-            </choice>
-        </element>
-    </optional>
-</define>
-<define name="style-background-image-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:repeat" a:defaultValue="repeat">
-            <choice>
-                <value>no-repeat</value>
-                <value>repeat</value>
-                <value>stretch</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-background-image-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:position" a:defaultValue="center">
-            <choice>
-                <value>left</value>
-                <value>center</value>
-                <value>right</value>
-                <value>top</value>
-                <value>bottom</value>
-                <list>
-                    <ref name="horiBackPos"/>
-                    <ref name="vertBackPos"/>
-                </list>
-                <list>
-                    <ref name="vertBackPos"/>
-                    <ref name="horiBackPos"/>
-                </list>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-
-<define name="horiBackPos">
-    <choice>
-        <value>left</value>
-        <value>center</value>
-        <value>right</value>
-    </choice>
-</define>
-<define name="vertBackPos">
-    <choice>
-        <value>top</value>
-        <value>center</value>
-        <value>bottom</value>
-    </choice>
-</define>
-<define name="style-background-image-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:filter-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-background-image-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:opacity">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <ref name="common-border-attlist"/>
-</define>
-
-<define name="common-border-attlist">
-    <optional>
-        <attribute name="fo:border">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="fo:border-top">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="fo:border-bottom">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="fo:border-left">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="fo:border-right">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <ref name="common-border-line-width-attlist"/>
-</define>
-
-<define name="common-border-line-width-attlist">
-    <optional>
-        <attribute name="style:border-line-width">
-            <ref name="borderWidths"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:border-line-width-top">
-            <ref name="borderWidths"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:border-line-width-bottom">
-            <ref name="borderWidths"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:border-line-width-left">
-            <ref name="borderWidths"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:border-line-width-right">
-            <ref name="borderWidths"/>
-        </attribute>
-    </optional>
-</define>
-
-<define name="borderWidths">
-    <list>
-        <ref name="positiveLength"/>
-        <ref name="positiveLength"/>
-        <ref name="positiveLength"/>
-    </list>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <ref name="common-padding-attlist"/>
-</define>
-
-<define name="common-padding-attlist">
-    <optional>
-        <attribute name="fo:padding">
-            <ref name="nonNegativeLength"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="fo:padding-top">
-            <ref name="nonNegativeLength"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="fo:padding-bottom">
-            <ref name="nonNegativeLength"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="fo:padding-left">
-            <ref name="nonNegativeLength"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="fo:padding-right">
-            <ref name="nonNegativeLength"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <ref name="common-shadow-attlist"/>
-</define>
-
-<define name="common-shadow-attlist">
-    <optional>
-        <attribute name="style:shadow">
-            <ref name="shadowType"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <ref name="common-keep-with-next-attlist"/>
-</define>
-
-<define name="common-keep-with-next-attlist">
-    <optional>
-        <attribute name="fo:keep-with-next">
-            <choice>
-                <value>auto</value>
-                <value>always</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:number-lines" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:line-number">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:text-autospace">
-            <choice>
-                <value>none</value>
-                <value>ideograph-alpha</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:punctuation-wrap">
-            <choice>
-                <value>simple</value>
-                <value>hanging</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:line-break">
-            <choice>
-                <value>normal</value>
-                <value>strict</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:vertical-align" a:defaultValue="auto">
-            <choice>
-                <value>top</value>
-                <value>middle</value>
-                <value>bottom</value>
-                <value>auto</value>
-                <value>baseline</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <ref name="common-writing-mode-attlist"/>
-</define>
-
-<define name="common-writing-mode-attlist">
-    <optional>
-        <attribute name="style:writing-mode">
-            <choice>
-                <value>lr-tb</value>
-                <value>rl-tb</value>
-                <value>tb-rl</value>
-                <value>tb-lr</value>
-                <value>lr</value>
-                <value>rl</value>
-                <value>tb</value>
-                <value>page</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:writing-mode-automatic">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:snap-to-layout-grid">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <ref name="common-page-number-attlist"/>
-</define>
-
-<define name="common-page-number-attlist">
-    <optional>
-        <attribute name="style:page-number">
-            <choice>                <ref name="positiveInteger"/>                <value>auto</value>            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:background-transparency">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-ruby-properties">
-    <element name="style:ruby-properties">
-        <ref name="style-ruby-properties-content"/>
-    </element>
-</define>
-
-<define name="style-ruby-properties-content">
-    <ref name="style-properties-content"/>
-</define>
-
-<define name="style-ruby-properties-content-strict">
-    <ref name="style-ruby-properties-attlist"/>
-    <ref name="style-ruby-properties-elements"/>
-</define>
-
-<define name="style-ruby-properties-elements">
-    <empty/>
-</define>
-<define name="style-ruby-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:ruby-position">
-            <choice>
-                <value>above</value>
-                <value>below</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-ruby-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:ruby-align">
-            <choice>
-                <value>left</value>
-                <value>center</value>
-                <value>right</value>
-                <value>distribute-letter</value>
-                <value>distribute-space</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-section-properties">
-    <element name="style:section-properties">
-        <ref name="style-section-properties-content"/>
-    </element>
-</define>
-
-<define name="style-section-properties-content">
-    <ref name="style-properties-content"/>
-</define>
-
-<define name="style-section-properties-content-strict">
-    <ref name="style-section-properties-attlist"/>
-    <ref name="style-section-properties-elements"/>
-</define>
-<define name="style-section-properties-attlist" combine="interleave">
-    <ref name="common-background-color-attlist"/>
-</define>
-<define name="style-section-properties-elements" combine="interleave">
-    <ref name="style-background-image"/>
-</define>
-<define name="style-section-properties-attlist" combine="interleave">
-    <ref name="common-horizontal-margin-attlist"/>
-</define>
-<define name="style-section-properties-elements" combine="interleave">
-    <ref name="style-columns"/>
-</define>
-
-<define name="style-columns">
-    <optional>
-        <element name="style:columns">
-            <ref name="style-columns-attlist"/>
-            <optional>
-                <ref name="style-column-sep"/>
-            </optional>
-            <zeroOrMore>
-                <ref name="style-column"/>
-            </zeroOrMore>
-        </element>
-    </optional>
-</define>
-<define name="style-columns-attlist" combine="interleave">
-    <attribute name="fo:column-count">
-        <ref name="positiveInteger"/>
-    </attribute>
-</define>
-<define name="style-columns-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:column-gap">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-column">
-    <element name="style:column">
-        <ref name="style-column-attlist"/>
-    </element>
-</define>
-<define name="style-column-attlist" combine="interleave">
-    <attribute name="style:rel-width">
-        <ref name="relativeLength"/>
-    </attribute>
-</define>
-<define name="style-column-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:start-indent" a:defaultValue="0cm">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-column-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:end-indent" a:defaultValue="0cm">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-column-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:space-before" a:defaultValue="0cm">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-column-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:space-after" a:defaultValue="0cm">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-column-sep">
-    <element name="style:column-sep">
-        <ref name="style-column-sep-attlist"/>
-    </element>
-</define>
-<define name="style-column-sep-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:style" a:defaultValue="solid">
-            <choice>
-                <value>none</value>
-                <value>solid</value>
-                <value>dotted</value>
-                <value>dashed</value>
-                <value>dot-dashed</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-column-sep-attlist" combine="interleave">
-    <attribute name="style:width">
-        <ref name="length"/>
-    </attribute>
-</define>
-<define name="style-column-sep-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:height" a:defaultValue="100%">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-column-sep-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:vertical-align" a:defaultValue="top">
-            <choice>
-                <value>top</value>
-                <value>middle</value>
-                <value>bottom</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-column-sep-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:color" a:defaultValue="#000000">
-            <ref name="color"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-section-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:protect" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-section-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:dont-balance-text-columns">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-section-properties-attlist" combine="interleave">
-    <ref name="common-writing-mode-attlist"/>
-</define>
-<define name="style-section-properties-elements" combine="interleave">
-    <zeroOrMore>
-        <ref name="text-notes-configuration"/>
-    </zeroOrMore>
-</define>
-<define name="style-table-properties">
-    <element name="style:table-properties">
-        <ref name="style-table-properties-content"/>
-    </element>
-</define>
-
-<define name="style-table-properties-content">
-    <ref name="style-properties-content"/>
-</define>
-
-<define name="style-table-properties-content-strict">
-    <ref name="style-table-properties-attlist"/>
-    <ref name="style-table-properties-elements"/>
-</define>
-<define name="style-table-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:width">
-            <ref name="positiveLength"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:rel-width">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-table-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:align">
-            <choice>
-                <value>left</value>
-                <value>center</value>
-                <value>right</value>
-                <value>margins</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-table-properties-attlist" combine="interleave">
-    <ref name="common-horizontal-margin-attlist"/>
-</define>
-<define name="style-table-properties-attlist" combine="interleave">
-    <ref name="common-vertical-margin-attlist"/>
-</define>
-<define name="style-table-properties-attlist" combine="interleave">
-    <ref name="common-margin-attlist"/>
-</define>
-<define name="style-table-properties-attlist" combine="interleave">
-    <ref name="common-page-number-attlist"/>
-</define>
-<define name="style-table-properties-attlist" combine="interleave">
-    <ref name="common-break-attlist"/>
-</define>
-<define name="style-table-properties-attlist" combine="interleave">
-    <ref name="common-background-color-attlist"/>
-</define>
-<define name="style-table-properties-elements" combine="interleave">
-    <ref name="style-background-image"/>
-</define>
-<define name="style-table-properties-attlist" combine="interleave">
-    <ref name="common-shadow-attlist"/>
-</define>
-<define name="style-table-properties-attlist" combine="interleave">
-    <ref name="common-keep-with-next-attlist"/>
-</define>
-<define name="style-table-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:may-break-between-rows">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-table-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:border-model">
-            <choice>
-                <value>collapsing</value>
-                <value>separating</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-table-properties-attlist" combine="interleave">
-    <ref name="common-writing-mode-attlist"/>
-</define>
-<define name="style-table-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:display">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-table-column-properties">
-    <element name="style:table-column-properties">
-        <ref name="style-table-column-properties-content"/>
-    </element>
-</define>
-
-<define name="style-table-column-properties-content">
-    <ref name="style-properties-content"/>
-</define>
-
-<define name="style-table-column-properties-content-strict">
-    <ref name="style-table-column-properties-attlist"/>
-    <ref name="style-table-column-properties-elements"/>
-</define>
-
-<define name="style-table-column-properties-elements">
-    <empty/>
-</define>
-<define name="style-table-column-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:column-width">
-            <ref name="positiveLength"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:rel-column-width">
-            <ref name="relativeLength"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-table-column-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:use-optimal-column-width">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-table-column-properties-attlist" combine="interleave">
-    <ref name="common-break-attlist"/>
-</define>
-<define name="style-table-row-properties">
-    <element name="style:table-row-properties">
-        <ref name="style-table-row-properties-content"/>
-    </element>
-</define>
-
-<define name="style-table-row-properties-content">
-    <ref name="style-properties-content"/>
-</define>
-
-<define name="style-table-row-properties-content-strict">
-    <ref name="style-table-row-properties-attlist"/>
-    <ref name="style-table-row-properties-elements"/>
-</define>
-<define name="style-table-row-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:row-height">
-            <ref name="positiveLength"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:min-row-height">
-            <ref name="nonNegativeLength"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-table-row-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:use-optimal-row-height">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-table-row-properties-attlist" combine="interleave">
-    <ref name="common-background-color-attlist"/>
-</define>
-<define name="style-table-row-properties-elements" combine="interleave">
-    <ref name="style-background-image"/>
-</define>
-<define name="style-table-row-properties-attlist" combine="interleave">
-    <ref name="common-break-attlist"/>
-</define>
-<define name="style-table-row-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:keep-together">
-            <choice>
-                <value>auto</value>
-                <value>always</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-table-cell-properties">
-    <element name="style:table-cell-properties">
-        <ref name="style-table-cell-properties-content"/>
-    </element>
-</define>
-
-<define name="style-table-cell-properties-content">
-    <ref name="style-properties-content"/>
-</define>
-
-<define name="style-table-cell-properties-content-strict">
-    <ref name="style-table-cell-properties-attlist"/>
-    <ref name="style-table-cell-properties-elements"/>
-</define>
-<define name="style-table-cell-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:vertical-align">
-            <choice>
-                <value>top</value>
-                <value>middle</value>
-                <value>bottom</value>
-                <value>automatic</value>
-            </choice>
-            </attribute>
-    </optional>
-</define>
-<define name="style-table-cell-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:text-align-source">
-            <choice>
-                <value>fix</value>
-                <value>value-type</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-table-cell-properties-attlist" combine="interleave">
-    <ref name="common-style-direction-attlist"/>
-</define>
-
-<define name="common-style-direction-attlist">
-    <optional>
-        <attribute name="style:direction">
-            <choice>
-                <value>ltr</value>
-                <value>ttb</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-table-cell-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:glyph-orientation-vertical">
-            <choice>
-                <value>auto</value>
-                <value>0</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-table-cell-properties-attlist" combine="interleave">
-    <ref name="common-shadow-attlist"/>
-</define>
-<define name="style-table-cell-properties-attlist" combine="interleave">
-    <ref name="common-background-color-attlist"/>
-</define>
-<define name="style-table-cell-properties-elements" combine="interleave">
-    <ref name="style-background-image"/>
-</define>
-<define name="style-table-cell-properties-attlist" combine="interleave">
-    <ref name="common-border-attlist"/>
-</define>
-<define name="style-table-cell-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:diagonal-tl-br">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:diagonal-tl-br-widths">
-            <ref name="borderWidths"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:diagonal-bl-tr">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:diagonal-bl-tr-widths">
-            <ref name="borderWidths"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-table-cell-properties-attlist" combine="interleave">
-    <ref name="common-border-line-width-attlist"/>
-</define>
-<define name="style-table-cell-properties-attlist" combine="interleave">
-    <ref name="common-padding-attlist"/>
-</define>
-<define name="style-table-cell-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:wrap-option">
-            <choice>
-                <value>no-wrap</value>
-                <value>wrap</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-table-cell-properties-attlist" combine="interleave">
-    <ref name="common-rotation-angle-attlist"/>
-</define>
-
-<define name="common-rotation-angle-attlist">
-    <optional>
-        <attribute name="style:rotation-angle">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-table-cell-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:rotation-align">
-            <choice>
-                <value>none</value>
-                <value>bottom</value>
-                <value>top</value>
-                <value>center</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-table-cell-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:cell-protect">
-            <choice>
-                <value>none</value>
-                <value>hidden-and-protected</value>
-                <list>
-                    <oneOrMore>
-                        <choice>
-                            <value>protected</value>
-                            <value>formula-hidden</value>
-                        </choice>
-                    </oneOrMore>
-                </list>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-table-cell-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:print-content">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-table-cell-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:decimal-places">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-table-cell-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:repeat-content">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-table-cell-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:shrink-to-fit">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-list-level-properties">
-    <element name="style:list-level-properties">
-        <ref name="style-list-level-properties-content"/>
-    </element>
-</define>
-
-<define name="style-list-level-properties-content">
-    <ref name="style-properties-content"/>
-</define>
-
-<define name="style-list-level-properties-content-strict">
-    <ref name="style-list-level-properties-attlist"/>
-    <ref name="style-list-level-properties-elements"/>
-</define>
-
-<define name="style-list-level-properties-elements">
-    <empty/>
-</define>
-<define name="style-list-level-properties-attlist" combine="interleave">
-    <ref name="common-text-align"/>
-</define>
-<define name="style-list-level-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:space-before">
-            <ref name="nonNegativeLength"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-list-level-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:min-label-width">
-            <ref name="nonNegativeLength"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-list-level-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:min-label-distance">
-            <ref name="nonNegativeLength"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-list-level-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:font-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-list-level-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:width">
-            <ref name="positiveLength"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="fo:height">
-            <ref name="positiveLength"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-list-level-properties-attlist" combine="interleave">
-    <ref name="common-vertical-rel-attlist"/>
-    <ref name="common-vertical-pos-attlist"/>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:stroke">
-            <choice>
-                <value>none</value>
-                <value>dash</value>
-                <value>solid</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:stroke-dash">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:stroke-dash-names">
-            <ref name="styleNameRefs"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="svg:stroke-width">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="svg:stroke-color">
-            <ref name="color"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:marker-start">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:marker-end">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:marker-start-width">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:marker-end-width">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:marker-start-center">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:marker-end-center">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="svg:stroke-opacity">
-            <choice>
-                <data type="double">
-                    <param name="minInclusive">0</param>
-                    <param name="maxInclusive">1</param>
-                </data>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:stroke-linejoin">
-            <choice>
-                <value>miter</value>
-                <value>round</value>
-                <value>bevel</value>
-                <value>middle</value>
-                <value>none</value>
-                <value>inherit</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-fill-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:fill">
-            <choice>
-                <value>none</value>
-                <value>solid</value>
-                <value>bitmap</value>
-                <value>gradient</value>
-                <value>hatch</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-fill-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:fill-color">
-            <ref name="color"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-fill-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:secondary-fill-color">
-            <ref name="color"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-fill-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:fill-gradient-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-fill-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:gradient-step-count">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-fill-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:fill-hatch-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-fill-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:fill-hatch-solid">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-fill-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:fill-image-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-fill-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:repeat">
-            <choice>
-                <value>no-repeat</value>
-                <value>repeat</value>
-                <value>stretch</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-fill-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:fill-image-width">
-            <choice>
-                <ref name="length"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="draw:fill-image-height">
-            <choice>
-                <ref name="length"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-fill-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:fill-image-ref-point-x">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="draw:fill-image-ref-point-y">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="draw:fill-image-ref-point">
-            <choice>
-                <value>top-left</value>
-                <value>top</value>
-                <value>top-right</value>
-                <value>left</value>
-                <value>center</value>
-                <value>right</value>
-                <value>bottom-left</value>
-                <value>bottom</value>
-                <value>bottom-right</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-fill-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:tile-repeat-offset"/>
-    </optional>
-</define>
-<define name="style-graphic-fill-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:opacity">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-fill-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:opacity-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-fill-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="svg:fill-rule">
-            <choice>
-                <value>nonzero</value>
-                <value>evenodd</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:symbol-color">
-            <ref name="color"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:animation">
-            <choice>
-                <value>none</value>
-                <value>scroll</value>
-                <value>alternate</value>
-                <value>slide</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:animation-direction">
-            <choice>
-                <value>left</value>
-                <value>right</value>
-                <value>up</value>
-                <value>down</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:animation-start-inside">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:animation-stop-inside">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:animation-repeat">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:animation-delay">
-            <ref name="duration"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:animation-steps">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:auto-grow-width">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="draw:auto-grow-height">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:fit-to-size">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:fit-to-contour">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:textarea-vertical-align">
-            <choice>
-                <value>top</value>
-                <value>middle</value>
-                <value>bottom</value>
-                <value>justify</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:textarea-horizontal-align">
-            <choice>
-                <value>left</value>
-                <value>center</value>
-                <value>right</value>
-                <value>justify</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:wrap-option">
-            <choice>
-                <value>no-wrap</value>
-                <value>wrap</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-elements" combine="interleave">
-    <optional>
-        <ref name="text-list-style"/>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:color-mode">
-            <choice>
-                <value>greyscale</value>
-                <value>mono</value>
-                <value>watermark</value>
-                <value>standard</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:color-inversion">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:luminance">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:contrast">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:gamma">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:red">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:green">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:blue">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:image-opacity">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:shadow">
-            <choice>
-                <value>visible</value>
-                <value>hidden</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:shadow-offset-x">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="draw:shadow-offset-y">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:shadow-color">
-            <ref name="color"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:shadow-opacity">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:start-line-spacing-horizontal">
-            <ref name="distance"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="draw:start-line-spacing-vertical">
-            <ref name="distance"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:end-line-spacing-horizontal">
-            <ref name="distance"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="draw:end-line-spacing-vertical">
-            <ref name="distance"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:line-distance">
-            <ref name="distance"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:guide-overhang">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:guide-distance">
-            <ref name="distance"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:start-guide">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:end-guide">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:placing">
-            <choice>
-                <value>below</value>
-                <value>above</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:parallel">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:measure-align">
-            <choice>
-                <value>automatic</value>
-                <value>left-outside</value>
-                <value>inside</value>
-                <value>right-outside</value>
-            </choice>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="draw:measure-vertical-align">
-            <choice>
-                <value>automatic</value>
-                <value>above</value>
-                <value>below</value>
-                <value>center</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:unit">
-            <choice>
-                <value>automatic</value>
-                <value>mm</value>
-                <value>cm</value>
-                <value>m</value>
-                <value>km</value>
-                <value>pt</value>
-                <value>pc</value>
-                <value>inch</value>
-                <value>ft</value>
-                <value>mi</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:show-unit">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:decimal-places">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:caption-type">
-            <choice>
-                <value>straight-line</value>
-                <value>angled-line</value>
-                <value>angled-connector-line</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:caption-angle-type">
-            <choice>
-                <value>fixed</value>
-                <value>free</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:caption-angle">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:caption-gap">
-            <ref name="distance"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:caption-escape-direction">
-            <choice>
-                <value>horizontal</value>
-                <value>vertical</value>
-                <value>auto</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:caption-escape">
-            <choice>
-                <ref name="length"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:caption-line-length">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:caption-fit-line-length">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:horizontal-segments">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:vertical-segments">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:edge-rounding">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:edge-rounding-mode">
-            <choice>
-                <value>correct</value>
-                <value>attractive</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:back-scale">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:depth">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:backface-culling">
-            <choice>
-                <value>enabled</value>
-                <value>disabled</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:end-angle">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:close-front">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:close-back">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:lighting-mode">
-            <choice>
-                <value>standard</value>
-                <value>double-sided</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:normals-kind">
-            <choice>
-                <value>object</value>
-                <value>flat</value>
-                <value>sphere</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:normals-direction">
-            <choice>
-                <value>normal</value>
-                <value>inverse</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:texture-generation-mode-x">
-            <choice>
-                <value>object</value>
-                <value>parallel</value>
-                <value>sphere</value>
-            </choice>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="dr3d:texture-generation-mode-y">
-            <choice>
-                <value>object</value>
-                <value>parallel</value>
-                <value>sphere</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:texture-kind">
-            <choice>
-                <value>luminance</value>
-                <value>intensity</value>
-                <value>color</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:texture-filter">
-            <choice>
-                <value>enabled</value>
-                <value>disabled</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:texture-mode">
-            <choice>
-                <value>replace</value>
-                <value>modulate</value>
-                <value>blend</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:ambient-color">
-            <ref name="color"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="dr3d:emissive-color">
-            <ref name="color"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="dr3d:specular-color">
-            <ref name="color"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="dr3d:diffuse-color">
-            <ref name="color"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:shininess">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:shadow">
-            <choice>
-                <value>visible</value>
-                <value>hidden</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <ref name="common-draw-rel-size-attlist"/>
-    <optional>
-        <attribute name="fo:min-width">
-            <choice>
-                <ref name="length"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:min-height">
-            <choice>
-                <ref name="length"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:max-height">
-            <choice>
-                <ref name="length"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="fo:max-width">
-            <choice>
-                <ref name="length"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <ref name="common-horizontal-margin-attlist"/>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <ref name="common-vertical-margin-attlist"/>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <ref name="common-margin-attlist"/>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:print-content">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:protect">
-            <choice>
-                <value>none</value>
-                <list>
-                    <oneOrMore>
-                        <choice>
-                            <value>content</value>
-                            <value>position</value>
-                            <value>size</value>
-                        </choice>
-                    </oneOrMore>
-                </list>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:horizontal-pos">
-            <choice>
-                <value>left</value>
-                <value>center</value>
-                <value>right</value>
-                <value>from-left</value>
-                <value>inside</value>
-                <value>outside</value>
-                <value>from-inside</value>
-            </choice>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:x">
-            <ref name="coordinate"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:horizontal-rel">
-            <choice>
-                    <value>page</value>
-                <value>page-content</value>
-                <value>page-start-margin</value>
-                <value>page-end-margin</value>
-                <value>frame</value>
-                <value>frame-content</value>
-                <value>frame-start-margin</value>
-                <value>frame-end-margin</value>
-                <value>paragraph</value>
-                <value>paragraph-content</value>
-                <value>paragraph-start-margin</value>
-                <value>paragraph-end-margin</value>
-                <value>char</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <ref name="common-vertical-pos-attlist"/>
-</define>
-
-<define name="common-vertical-pos-attlist">
-    <optional>
-        <attribute name="style:vertical-pos">
-            <choice>
-                <value>top</value>
-                <value>middle</value>
-                <value>bottom</value>
-                <value>from-top</value>
-                <value>below</value>
-            </choice>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:y">
-            <ref name="coordinate"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <ref name="common-vertical-rel-attlist"/>
-</define>
-
-<define name="common-vertical-rel-attlist">
-    <optional>
-        <attribute name="style:vertical-rel">
-            <choice>
-                <value>page</value>
-                <value>page-content</value>
-                <value>frame</value>
-                <value>frame-content</value>
-                <value>paragraph</value>
-                <value>paragraph-content</value>
-                <value>char</value>
-                <value>line</value>
-                <value>baseline</value>
-                <value>text</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <ref name="common-text-anchor-attlist"/>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <ref name="common-border-attlist"/>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <ref name="common-border-line-width-attlist"/>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <ref name="common-padding-attlist"/>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <ref name="common-shadow-attlist"/>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <ref name="common-background-color-attlist"/>
-</define>
-<define name="style-graphic-properties-elements" combine="interleave">
-    <ref name="style-background-image"/>
-</define>
-<define name="style-graphic-properties-elements" combine="interleave">
-    <ref name="style-columns"/>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:editable">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:wrap">
-            <choice>
-                <value>none</value>
-                <value>left</value>
-                <value>right</value>
-                <value>parallel</value>
-                <value>dynamic</value>
-                <value>run-through</value>
-                <value>biggest</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:wrap-dynamic-threshold">
-            <ref name="nonNegativeLength"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:number-wrapped-paragraphs">
-            <choice>
-                <value>no-limit</value>
-                <ref name="positiveInteger"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:wrap-contour">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:wrap-contour-mode">
-            <choice>
-                <value>full</value>
-                <value>outside</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:run-through">
-            <choice>
-                <value>foreground</value>
-                <value>background</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:flow-with-text">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:overflow-behavior">
-            <choice>
-                <value>clip</value>
-                <value>auto-create-new-frame</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:mirror">
-            <choice>
-                <value>none</value>
-                <value>vertical</value>
-                <ref name="horizontal-mirror"/>
-                <list>
-                    <value>vertical</value>
-                    <ref name="horizontal-mirror"/>
-                </list>
-                <list>
-                    <ref name="horizontal-mirror"/>
-                    <value>vertical</value>
-                </list>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-
-<define name="horizontal-mirror">
-    <choice>
-        <value>horizontal</value>
-        <value>horizontal-on-odd</value>
-        <value>horizontal-on-even</value>
-    </choice>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:clip">
-            <!-- The attribute value must match the one XSL's clip -->
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:wrap-influence-on-position"
-                    a:defaultValue="iterative">
-            <choice>
-                <value>iterative</value>
-                <value>once-concurrent</value>
-                <value>once-successive</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <ref name="common-writing-mode-attlist"/>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:frame-display-scrollbar">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:frame-display-border">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:frame-margin-horizontal">
-            <ref name="nonNegativePixelLength"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="draw:frame-margin-vertical">
-            <ref name="nonNegativePixelLength"/>
-        </attribute>
-    </optional>
-</define>
-
-<define name="nonNegativePixelLength">
-    <data type="string">
-        <param name="pattern">([0-9]+(\.[0-9]*)?|\.[0-9]+)(px)</param>
-    </data>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:visible-area-left">
-            <ref name="nonNegativeLength"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="draw:visible-area-top">
-            <ref name="nonNegativeLength"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="draw:visible-area-width">
-            <ref name="positiveLength"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="draw:visible-area-height">
-            <ref name="positiveLength"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:ole-draw-aspect">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties">
-    <element name="style:chart-properties">
-        <ref name="style-chart-properties-content"/>
-    </element>
-</define>
-
-<define name="style-chart-properties-content">
-    <ref name="style-properties-content"/>
-</define>
-
-<define name="style-chart-properties-content-strict">
-    <ref name="style-chart-properties-attlist"/>
-    <ref name="style-chart-properties-elements"/>
-</define>
-
-<define name="style-chart-properties-elements">
-    <empty/>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:scale-text" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:three-dimensional">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:deep">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <choice>
-        <attribute name="chart:symbol-type">
-            <value>none</value>
-        </attribute>
-        <attribute name="chart:symbol-type">
-            <value>automatic</value>
-        </attribute>
-        <group>
-            <attribute name="chart:symbol-type">
-                <value>named-symbol</value>
-            </attribute>
-            <attribute name="chart:symbol-name">
-                <choice>
-                    <value>square</value>
-                    <value>diamond</value>
-                    <value>arrow-down</value>
-                    <value>arrow-up</value>
-                    <value>arrow-right</value>
-                    <value>arrow-left</value>
-                    <value>bow-tie</value>
-                    <value>hourglass</value>
-                    <value>circle</value>
-                    <value>star</value>
-                    <value>x</value>
-                    <value>plus</value>
-                    <value>asterisk</value>
-                    <value>horizontal-bar</value>
-                    <value>vertical-bar</value>
-                </choice>
-            </attribute>
-        </group>
-        <group>
-            <attribute name="chart:symbol-type">
-                <value>image</value>
-            </attribute>
-            <element name="chart:symbol-image">
-                <attribute name="xlink:href">
-                    <ref name="anyURI"/>
-                </attribute>
-            </element>
-        </group>
-        <empty/>
-    </choice>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:symbol-width">
-            <ref name="nonNegativeLength"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="chart:symbol-height">
-            <ref name="nonNegativeLength"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:vertical" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:connect-bars" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:gap-width">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="chart:overlap">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:japanese-candle-stick"
-                    a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:interpolation" a:defaultValue="none">
-            <choice>
-                <value>none</value>
-                <value>cubic-spline</value>
-                <value>b-spline</value>
-            </choice>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="chart:spline-order" a:defaultValue="2">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="chart:spline-resolution" a:defaultValue="20">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:pie-offset" a:defaultValue="0">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:lines" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:solid-type" a:defaultValue="cuboid">
-            <choice>
-                <value>cuboid</value>
-                <value>cylinder</value>
-                <value>cone</value>
-                <value>pyramid</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:stacked" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="chart:percentage" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:link-data-style-to-source">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:visible">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:logarithmic">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:maximum">
-            <ref name="double"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="chart:minimum">
-            <ref name="double"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="chart:origin">
-            <ref name="double"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="chart:interval-major">
-            <ref name="double"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="chart:interval-minor-divisor">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:tick-marks-major-inner">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="chart:tick-marks-major-outer">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="chart:tick-marks-minor-inner">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="chart:tick-marks-minor-outer">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:display-label">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="chart:text-overlap">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="text:line-break">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="chart:label-arrangement"
-                   a:defaultValue="side-by-side">
-            <choice>
-                <value>side-by-side</value>
-                <value>stagger-even</value>
-                <value>stagger-odd</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <ref name="common-style-direction-attlist"/>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <ref name="common-rotation-angle-attlist"/>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:data-label-number">
-            <choice>
-                <value>none</value>
-                <value>value</value>
-                <value>percentage</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:data-label-text">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:data-label-symbol">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:mean-value">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:error-category" a:defaultValue="none">
-            <choice>
-                <value>none</value>
-                <value>variance</value>
-                <value>standard-deviation</value>
-                <value>percentage</value>
-                <value>error-margin</value>
-                <value>constant</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:error-percentage">
-            <ref name="double"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:error-margin">
-            <ref name="double"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:error-lower-limit">
-            <ref name="double"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="chart:error-upper-limit">
-            <ref name="double"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:error-upper-indicator">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="chart:error-lower-indicator">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:series-source" a:defaultValue="columns">
-            <choice>
-                <value>columns</value>
-                <value>rows</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:regression-type" a:defaultValue="none">
-            <choice>
-                <value>none</value>
-                <value>linear</value>
-                <value>logarithmic</value>
-                <value>exponential</value>
-                <value>power</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-drawing-page-properties-attlist"
-        combine="interleave">
-    <optional>
-        <attribute name="presentation:transition-type">
-            <choice>
-                <value>manual</value>
-                <value>automatic</value>
-                <value>semi-automatic</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-drawing-page-properties-attlist"
-         combine="interleave">
-    <optional>
-        <attribute name="presentation:transition-style">
-            <choice>
-                <value>none</value>
-                <value>fade-from-left</value>
-                <value>fade-from-top</value>
-                <value>fade-from-right</value>
-                <value>fade-from-bottom</value>
-                <value>fade-from-upperleft</value>
-                <value>fade-from-upperright</value>
-                <value>fade-from-lowerleft</value>
-                <value>fade-from-lowerright</value>
-                <value>move-from-left</value>
-                <value>move-from-top</value>
-                <value>move-from-right</value>
-                <value>move-from-bottom</value>
-                <value>move-from-upperleft</value>
-                <value>move-from-upperright</value>
-                <value>move-from-lowerleft</value>
-                <value>move-from-lowerright</value>
-                <value>uncover-to-left</value>
-                <value>uncover-to-top</value>
-                <value>uncover-to-right</value>    
-                <value>uncover-to-bottom</value>
-                <value>uncover-to-upperleft</value>
-                <value>uncover-to-upperright</value>
-                <value>uncover-to-lowerleft</value>
-                <value>uncover-to-lowerright</value>
-                <value>fade-to-center</value>
-                <value>fade-from-center</value>
-                <value>vertical-stripes</value>
-                <value>horizontal-stripes</value>
-                <value>clockwise</value>
-                <value>counterclockwise</value>
-                <value>open-vertical</value>
-                <value>open-horizontal</value>
-                <value>close-vertical</value>
-                <value>close-horizontal</value>
-                <value>wavyline-from-left</value>
-                <value>wavyline-from-top</value>
-                <value>wavyline-from-right</value>
-                <value>wavyline-from-bottom</value>
-                <value>spiralin-left</value>
-                <value>spiralin-right</value>
-                <value>spiralout-left</value>
-                <value>spiralout-right</value>
-                <value>roll-from-top</value>
-                <value>roll-from-left</value>
-                <value>roll-from-right</value>
-                <value>roll-from-bottom</value>
-                <value>stretch-from-left</value>
-                <value>stretch-from-top</value>
-                <value>stretch-from-right</value>
-                <value>stretch-from-bottom</value>
-
-                <value>vertical-lines</value>
-                <value>horizontal-lines</value>
-                <value>dissolve</value>
-                <value>random</value>
-                <value>vertical-checkerboard</value>
-                <value>horizontal-checkerboard</value>
-                <value>interlocking-horizontal-left</value>
-                <value>interlocking-horizontal-right</value>
-                <value>interlocking-vertical-top</value>
-                <value>interlocking-vertical-bottom</value>
-                <value>fly-away</value>
-                <value>open</value>
-                <value>close</value>
-                <value>melt</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-drawing-page-properties-attlist"
-        combine="interleave">
-    <optional>
-        <attribute name="presentation:transition-speed">
-            <ref name="presentationSpeeds"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-drawing-page-properties-attlist " combine="interleave">
-    <optional>
-        <attribute name="smil:type">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-drawing-page-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:subtype">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-drawing-page-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:direction" a:defaultValue="forward">
-            <choice>
-                <value>forward</value>
-                <value>reverse</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-drawing-page-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:fadeColor">
-            <ref name="color"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-drawing-page-properties-attlist"
-        combine="interleave">
-    <optional>
-        <attribute name="presentation:duration">
-            <ref name="duration"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-drawing-page-properties-attlist"
-         combine="interleave">
-    <optional>
-        <attribute name="presentation:visibility">
-            <choice>
-                <value>visible</value>
-                <value>hidden</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-drawing-page-properties-elements"
-         combine="interleave">
-    <optional>
-        <ref name="presentation-sound"/>
-    </optional>
-</define>
-<define name="style-drawing-page-properties-attlist"
-         combine="interleave">
-    <optional>
-        <attribute name="draw:background-size">
-            <choice>
-                <value>full</value>
-                <value>border</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-drawing-page-properties-attlist"
-         combine="interleave">
-    <optional>
-        <attribute name="presentation:background-objects-visible">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-drawing-page-properties-attlist"
-         combine="interleave">
-    <optional>
-        <attribute name="presentation:background-visible">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-drawing-page-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:display-header">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-drawing-page-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:display-footer">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-drawing-page-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:display-page-number">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-drawing-page-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:display-date-time">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="string">
-    <data type="string"/>
-</define>
-<define name="date">
-    <data type="date"/>
-</define>
-<define name="time">
-    <data type="time"/>
-</define>
-<define name="dateTime">
-    <data type="dateTime"/>
-</define>
-<define name="duration">
-    <data type="duration"/>
-</define>
-<define name="integer">
-    <data type="integer"/>
-</define>
-<define name="nonNegativeInteger">
-    <data type="nonNegativeInteger"/>
-</define>
-<define name="positiveInteger">
-    <data type="positiveInteger"/>
-</define>
-<define name="double">
-    <data type="double"/>
-</define>
-<define name="anyURI">
-    <data type="anyURI"/>
-</define>
-<define name="base64Binary">
-    <data type="base64Binary"/>
-</define>
-<define name="ID">
-    <data type="ID"/>
-</define>
-<define name="IDREF">
-    <data type="IDREF"/>
-</define>
-<define name="IDREFS">
-    <data type="IDREFS"/>
-</define>
-<define name="boolean">
-    <choice>
-        <value>true</value>
-        <value>false</value>
-    </choice>
-</define>
-<define name="dateOrDateTime">
-    <choice>
-        <data type="date"/>
-        <data type="dateTime"/>
-    </choice>
-</define>
-<define name="timeOrDateTime">
-    <choice>
-        <data type="time"/>
-        <data type="dateTime"/>
-    </choice>
-</define>
-<define name="language">
-    <data type="language"/>
-</define>
-<define name="countryCode">
-    <data type="token">
-        <param name="pattern">[A-Za-z0-9]{1,8}</param>
-    </data>
-</define>
-<define name="languageCode">
-    <data type="token">
-        <param name="pattern">[A-Za-z]{1,8}</param>
-    </data>
-</define>
-<define name="character">
-    <data type="string">
-        <param name="length">1</param>
-    </data>
-</define>
-<define name="length">
-    <data type="string">
-        <param name="pattern">-?([0-9]+(\.[0-9]*)?|\.[0-9]+)((cm)|(mm)|(in)|(pt)|(pc)|(px))</param>
-
-    </data>
-</define>
-<define name="nonNegativeLength">
-    <data type="string">
-        <param name="pattern">([0-9]+(\.[0-9]*)?|\.[0-9]+)((cm)|(mm)|(in)|(pt)|(pc)|(px))</param>
-
-    </data>
-</define>
-<define name="positiveLength">
-    <data type="string">
-        <param name="pattern">([0-9]*[1-9][0-9]*(\.[0-9]*)?|0+\.[0-9]*[1-9][0-9]*|\.[0-9]*[1-9][0-9]*)((cm)|(mm)|(in)|(pt)|(pc)|(px))</param>
-
-    </data>
-</define>
-<define name="percent">
-    <data type="string">
-        <param name="pattern">-?([0-9]+(\.[0-9]*)?|\.[0-9]+)%</param>
-    </data>
-</define>
-<define name="relativeLength">
-    <data type="string">
-        <param name="pattern">[0-9]+\*</param>
-    </data>
-</define>
-<define name="coordinate">
-    <ref name="length"/>
-</define>
-<define name="distance">
-    <ref name="length"/>
-</define>
-<define name="color">
-    <data type="string">
-        <param name="pattern">#[0-9a-fA-F]{6}</param>
-    </data>
-</define>
-<define name="styleName">
-    <data type="NCName"/>
-</define>
-<define name="styleNameRef">
-    <choice>
-        <data type="NCName"/>
-        <empty/>
-    </choice>
-</define>
-<define name="styleNameRefs">
-    <list>
-        <zeroOrMore>
-            <data type="NCName"/>
-        </zeroOrMore>
-    </list>
-</define>
-<define name="variableName">
-    <data type="string"/>
-</define>
-<define name="formula">
-    <!-- A formula should start with a namespace prefix, -->
-    <!-- but has no restrictions-->
-    <data type="string"/>
-</define>
-
-<define name="targetFrameName">
-    <choice>
-        <value>_self</value>
-        <value>_blank</value>
-        <value>_parent</value>
-        <value>_top</value>
-        <ref name="string"/>
-    </choice>
-</define>
-
-<define name="valueType">
-    <choice>
-        <value>float</value>
-        <value>time</value>
-        <value>date</value>
-        <value>percentage</value>
-        <value>currency</value>
-        <value>boolean</value>
-        <value>string</value>
-    </choice>
-</define>
-
-<define name="points">
-    <data type="string">
-        <param name="pattern">-?[0-9]+,-?[0-9]+([ ]+-?[0-9]+,-?[0-9]+)*</param>
-    </data>
-</define>
-<define name="pathData">
-    <data type="string"/>
-</define>
-
-<define name="vector3D">
-    <data type="string">
-        <param name="pattern">\([ ]*-?([0-9]+(\.[0-9]*)?|\.[0-9]+)([ ]+-?([0-9]+(\.[0-9]*)?|\.[0-9]+)){2}[ ]*\)</param>
-
-    </data>
-</define>
-
-<define name="namespacedToken">
-    <data type="string">
-        <param name="pattern">[0-9a-zA-Z_]+:[0-9a-zA-Z._\-]+</param>
-    </data>
-</define>
-<define name="anyAttListOrElements">
-    <zeroOrMore>
-        <attribute>
-            <anyName/>
-            <text/>
-        </attribute>
-    </zeroOrMore>
-    <ref name="anyElements"/>
-</define>
-<define name="anyElements">
-    <zeroOrMore>
-        <element>
-            <anyName/>
-            <mixed>
-                <ref name="anyAttListOrElements"/>
-            </mixed>
-        </element>
-    </zeroOrMore>
-</define>
-</grammar>
diff --git a/apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-strict-schema-v1.0-os.rng b/apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-strict-schema-v1.0-os.rng
deleted file mode 100644
index aa761dc880..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-strict-schema-v1.0-os.rng
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    OASIS OpenDocument v1.0
-    OASIS Standard, 1 May 2005
-    Strict Relax-NG Schema
-
-    $Id$
-
-    © 2002-2005 OASIS Open
-    © 1999-2005 Sun Microsystems, Inc.
--->
-
-<grammar xmlns="http://relaxng.org/ns/structure/1.0">
-    <include href="OpenDocument-schema-v1.0-os.rng">
-        <define name="office-meta-content">
-            <ref name="office-meta-content-strict"/>
-        </define>
-        <define name="style-page-layout-properties-content">
-            <ref name="style-page-layout-properties-content-strict"/>
-        </define>
-        <define name="style-header-footer-properties-content">
-            <ref name="style-header-footer-properties-content-strict"/>
-        </define>
-        <define name="style-drawing-page-properties-content">
-            <ref name="style-drawing-page-properties-content-strict"/>
-        </define>
-        <define name="style-text-properties-content">
-            <ref name="style-text-properties-content-strict"/>
-        </define>
-        <define name="style-paragraph-properties-content">
-            <ref name="style-paragraph-properties-content-strict"/>
-        </define>
-        <define name="style-ruby-properties-content">
-            <ref name="style-ruby-properties-content-strict"/>
-        </define>
-        <define name="style-section-properties-content">
-            <ref name="style-section-properties-content-strict"/>
-        </define>
-        <define name="style-list-level-properties-content">
-            <ref name="style-list-level-properties-content-strict"/>
-        </define>
-        <define name="style-table-properties-content">
-            <ref name="style-table-properties-content-strict"/>
-        </define>
-        <define name="style-table-column-properties-content">
-            <ref name="style-table-column-properties-content-strict"/>
-        </define>
-        <define name="style-table-row-properties-content">
-            <ref name="style-table-row-properties-content-strict"/>
-        </define>
-        <define name="style-table-cell-properties-content">
-            <ref name="style-table-cell-properties-content-strict"/>
-        </define>
-        <define name="style-graphic-properties-content">
-            <ref name="style-graphic-properties-content-strict"/>
-        </define>
-        <define name="style-chart-properties-content">
-            <ref name="style-properties-content"/>
-        </define>
-    </include>
-</grammar>
diff --git a/apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-strict-schema-v1.1.rng b/apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-strict-schema-v1.1.rng
deleted file mode 100644
index e77fe4ba6e..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-strict-schema-v1.1.rng
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    OASIS OpenDocument v1.1
-    OASIS Standard, 1 Feb 2007
-    Strict Relax-NG Schema
-
-    $Id$
-
-    © 2002-2007 OASIS Open
-    © 1999-2007 Sun Microsystems, Inc.
--->
-
-<grammar xmlns="http://relaxng.org/ns/structure/1.0">
-    <include href="OpenDocument-schema-v1.1.rng">
-        <define name="office-meta-content">
-            <ref name="office-meta-content-strict"/>
-        </define>
-        <define name="style-page-layout-properties-content">
-            <ref name="style-page-layout-properties-content-strict"/>
-        </define>
-        <define name="style-header-footer-properties-content">
-            <ref name="style-header-footer-properties-content-strict"/>
-        </define>
-        <define name="style-drawing-page-properties-content">
-            <ref name="style-drawing-page-properties-content-strict"/>
-        </define>
-        <define name="style-text-properties-content">
-            <ref name="style-text-properties-content-strict"/>
-        </define>
-        <define name="style-paragraph-properties-content">
-            <ref name="style-paragraph-properties-content-strict"/>
-        </define>
-        <define name="style-ruby-properties-content">
-            <ref name="style-ruby-properties-content-strict"/>
-        </define>
-        <define name="style-section-properties-content">
-            <ref name="style-section-properties-content-strict"/>
-        </define>
-        <define name="style-list-level-properties-content">
-            <ref name="style-list-level-properties-content-strict"/>
-        </define>
-        <define name="style-table-properties-content">
-            <ref name="style-table-properties-content-strict"/>
-        </define>
-        <define name="style-table-column-properties-content">
-            <ref name="style-table-column-properties-content-strict"/>
-        </define>
-        <define name="style-table-row-properties-content">
-            <ref name="style-table-row-properties-content-strict"/>
-        </define>
-        <define name="style-table-cell-properties-content">
-            <ref name="style-table-cell-properties-content-strict"/>
-        </define>
-        <define name="style-graphic-properties-content">
-            <ref name="style-graphic-properties-content-strict"/>
-        </define>
-        <define name="style-chart-properties-content">
-            <ref name="style-chart-properties-content-strict"/>
-        </define>
-    </include>
-</grammar>
diff --git a/apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-v1.2-cos01-dsig-schema.rng b/apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-v1.2-cos01-dsig-schema.rng
deleted file mode 100644
index bb2e591d86..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-v1.2-cos01-dsig-schema.rng
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-        Open Document Format for Office Applications (OpenDocument) Version 1.2
-        Candidate OASIS Standard (COS) 01, 10 May 2011
-	Digital Signatures Relax-NG Schema
-        Source: http://docs.oasis-open.org/office/v1.2/cos01/
-        Copyright (c) OASIS Open 2002-2011. All Rights Reserved.
-
-	All capitalized terms in the following text have the meanings assigned to them
-   	in the OASIS Intellectual Property Rights Policy (the "OASIS IPR Policy"). The
-	full Policy may be found at the OASIS website.
-
-	This document and translations of it may be copied and furnished to others, and
-	derivative works that comment on or otherwise explain it or assist in its
-	implementation may be prepared, copied, published, and distributed, in whole or
-	in part, without restriction of any kind, provided that the above copyright
-	notice and this section are included on all such copies and derivative works.
-	However, this document itself may not be modified in any way, including by
-	removing the copyright notice or references to OASIS, except as needed for the
-	purpose of developing any document or deliverable produced by an OASIS
-	Technical Committee (in which case the rules applicable to copyrights, as set
-	forth in the OASIS IPR Policy, must be followed) or as required to translate it
-	into languages other than English.
-
-	The limited permissions granted above are perpetual and will not be revoked by
-	OASIS or its successors or assigns.
-
-	This document and the information contained herein is provided on an "AS IS"
-	basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT
-	LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT
-	INFRINGE ANY OWNERSHIP RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR
-	FITNESS FOR A PARTICULAR PURPOSE. 
--->
-
-<grammar
-	xmlns="http://relaxng.org/ns/structure/1.0"
-
-	datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
-
-	xmlns:dsig="urn:oasis:names:tc:opendocument:xmlns:digitalsignature:1.0"
-	xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
->
-<start>
-	<choice>
-		<ref name="dsig-document-signatures"/>
-	</choice>
-</start>
-<define name="dsig-document-signatures">
-	<element name="dsig:document-signatures">
-		<ref name="dsig-document-signatures-attlist"/>
-		<oneOrMore>
-			<ref name="ds-signature"/>
-		</oneOrMore>
-	</element>
-</define>
-<define name="dsig-document-signatures-attlist">
-	<attribute name="dsig:version">
-		<value>1.2</value>
-	</attribute>
-</define>
-<define name="ds-signature">
-	<element name="ds:Signature">
-		<!-- The permitted content of this element is the permitted -->
-		<!-- content of the Signature element defined by W3C XML    -->
-		<!-- Signature Syntax and Processing (Second Edition).      -->
-		<!-- See OpenDocument v1.2 part 3, section 4.3.             -->
-		<ref name="dsMarkup"/>
-	</element>
-</define>
-<define name="dsMarkup">
-	<zeroOrMore>
-		<choice>
-			<attribute>
-				<anyName/>
-			</attribute>
-			<text/>
-			<element>
-				<anyName/>
-				<ref name="dsMarkup"/>
-			</element>
-		</choice>
-	</zeroOrMore>
-</define>
-</grammar>
diff --git a/apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-v1.2-cos01-manifest-schema.rng b/apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-v1.2-cos01-manifest-schema.rng
deleted file mode 100644
index 8902970eec..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-v1.2-cos01-manifest-schema.rng
+++ /dev/null
@@ -1,224 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-        Open Document Format for Office Applications (OpenDocument) Version 1.2
-        Candidate OASIS Standard (COS) 01, 10 May 2011
-	Manifest Relax-NG Schema
-        Source: http://docs.oasis-open.org/office/v1.2/cos01/
-        Copyright (c) OASIS Open 2002-2011. All Rights Reserved.
-
-	All capitalized terms in the following text have the meanings assigned to them
-   	in the OASIS Intellectual Property Rights Policy (the "OASIS IPR Policy"). The
-	full Policy may be found at the OASIS website.
-
-	This document and translations of it may be copied and furnished to others, and
-	derivative works that comment on or otherwise explain it or assist in its
-	implementation may be prepared, copied, published, and distributed, in whole or
-	in part, without restriction of any kind, provided that the above copyright
-	notice and this section are included on all such copies and derivative works.
-	However, this document itself may not be modified in any way, including by
-	removing the copyright notice or references to OASIS, except as needed for the
-	purpose of developing any document or deliverable produced by an OASIS
-	Technical Committee (in which case the rules applicable to copyrights, as set
-	forth in the OASIS IPR Policy, must be followed) or as required to translate it
-	into languages other than English.
-
-	The limited permissions granted above are perpetual and will not be revoked by
-	OASIS or its successors or assigns.
-
-	This document and the information contained herein is provided on an "AS IS"
-	basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT
-	LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT
-	INFRINGE ANY OWNERSHIP RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR
-	FITNESS FOR A PARTICULAR PURPOSE. 
--->
-<grammar 
-	xmlns="http://relaxng.org/ns/structure/1.0"
-
-	datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
-
-	xmlns:manifest="urn:oasis:names:tc:opendocument:xmlns:manifest:1.0"
->
-<start>
-	<choice>
-		<ref name="manifest"/>
-	</choice>
-</start>
-<define name="manifest">
-	<element name="manifest:manifest">
-		<ref name="manifest-attlist"/>
-		<oneOrMore>
-			<ref name="file-entry"/>
-		</oneOrMore>
-	</element>
-</define>
-<define name="manifest-attlist">
-	<attribute name="manifest:version">
-		<value>1.2</value>
-	</attribute>
-</define>
-<define name="file-entry">
-	<element name="manifest:file-entry">
-		<ref name="file-entry-attlist"/>
-		<optional>
-			<ref name="encryption-data"/>
-		</optional>
-	</element>
-</define>
-<define name="file-entry-attlist">
-  <interleave>
-	<attribute name="manifest:full-path">
-		<ref name="string"/>
-	</attribute>
-	<optional>
-		<attribute name="manifest:size">
-			<ref name="nonNegativeInteger"/>
-		</attribute>
-	</optional>
-	<attribute name="manifest:media-type">
-		<ref name="string"/>
-	</attribute>
-	<optional>
-		<attribute name="manifest:preferred-view-mode">
-			<choice>
-				<value>edit</value>
-				<value>presentation-slide-show</value>
-				<value>read-only</value>
-				<ref name="namespacedToken"/> 
-			</choice> 
-		</attribute> 
-	</optional> 
-	<optional>
-		<attribute name="manifest:version">
-			<ref name="string"/>
-		</attribute>
-	</optional>
-  </interleave>
-</define>
-
-<define name="encryption-data">
-	<element name="manifest:encryption-data">
-		<ref name="encryption-data-attlist"/>
-		<ref name="algorithm"/>
-		<optional>
-			<ref name="start-key-generation"/>
-		</optional>
-		<ref name="key-derivation"/>
-	</element>
-</define>
-<define name="encryption-data-attlist">
-  <interleave>
-	<attribute name="manifest:checksum-type">
-		<choice>
-			<value>SHA1/1K</value>
-			<ref name="anyURI"/>
-		</choice>
-	</attribute>
-	<attribute name="manifest:checksum">
-		<ref name="base64Binary"/>
-	</attribute>
-  </interleave>
-</define>
-<define name="algorithm">
-	<element name="manifest:algorithm">
-		<ref name="algorithm-attlist"/>
-		<ref name="anyElements"/>
-	</element>
-</define>
-<define name="algorithm-attlist">
-  <interleave>
-	<attribute name="manifest:algorithm-name">
-		<choice>
-			<value>Blowfish CFB</value>
-			<ref name="anyURI"/>
-		</choice>
-	</attribute>
-	<attribute name="manifest:initialisation-vector">
-		<ref name="base64Binary"/>
-	</attribute>
-  </interleave>
-</define>
-<define name="anyAttListOrElements">
-	<zeroOrMore>
-		<attribute>
-			<anyName/>
-			<text/>
-		</attribute>
-	</zeroOrMore>
-	<ref name="anyElements"/>
-</define>
-<define name="anyElements">
-	<zeroOrMore>
-		<element>
-			<anyName/>
-			<mixed>
-				<ref name="anyAttListOrElements"/>
-			</mixed>
-		</element>
-	</zeroOrMore>
-</define>
-<define name="key-derivation">
-	<element name="manifest:key-derivation">
-		<ref name="key-derivation-attlist"/>
-		<empty/>
-	</element>
-</define>
-<define name="key-derivation-attlist">
-  <interleave>
-	<attribute name="manifest:key-derivation-name">
-		<choice>
-			<value>PBKDF2</value>
-			<ref name="anyURI"/>
-		</choice>
-	</attribute>
-	<attribute name="manifest:salt">
-		<ref name="base64Binary"/>
-	</attribute>
-	<attribute name="manifest:iteration-count">
-			<ref name="nonNegativeInteger"/>
-		</attribute>
-	<optional>
-		<attribute name="manifest:key-size">
-			<ref name="nonNegativeInteger"/>
-		</attribute>
-	</optional>
-  </interleave>
-</define>
-<define name="start-key-generation">
-	<element name="manifest:start-key-generation">
-		<ref name="start-key-generation-attlist"/>
-		<empty/>
-	</element>
-</define>
-<define name="start-key-generation-attlist">
-  <interleave>
-	<attribute name="manifest:start-key-generation-name">
-		<choice>
-			<value>SHA1</value>
-			<ref name="anyURI"/>
-		</choice>
-	</attribute>
-	<optional>
-		<attribute name="manifest:key-size">
-			<ref name="nonNegativeInteger"/>
-		</attribute>
-	</optional>
-  </interleave>
-</define>
-<define name="base64Binary">
-	<data type="base64Binary"/>
-</define>
-<define name="namespacedToken">
-	<data type="QName">
-		<param name="pattern">[^:]+:[^:]+</param>
-	</data>
-</define>
-<define name="nonNegativeInteger">
-	<data type="nonNegativeInteger"/>
-</define>
-<define name="string">
-	<data type="string"/>
-</define>
-<define name="anyURI">
-	<data type="anyURI"/>
-</define>
-</grammar>
diff --git a/apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-v1.2-cos01-schema.rng b/apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-v1.2-cos01-schema.rng
deleted file mode 100644
index bd57af13f7..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-v1.2-cos01-schema.rng
+++ /dev/null
@@ -1,18127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-        Open Document Format for Office Applications (OpenDocument) Version 1.2
-        Candidate OASIS Standard (COS) 01, 10 May 2011
-	Relax-NG Schema
-        Source: http://docs.oasis-open.org/office/v1.2/cos01/
-        Copyright (c) OASIS Open 2002-2011. All Rights Reserved.
-
-	All capitalized terms in the following text have the meanings assigned to them
-	in the OASIS Intellectual Property Rights Policy (the "OASIS IPR Policy"). The
-	full Policy may be found at the OASIS website.
-
-	This document and translations of it may be copied and furnished to others, and
-	derivative works that comment on or otherwise explain it or assist in its
-	implementation may be prepared, copied, published, and distributed, in whole or
-	in part, without restriction of any kind, provided that the above copyright
-	notice and this section are included on all such copies and derivative works.
-	However, this document itself may not be modified in any way, including by
-	removing the copyright notice or references to OASIS, except as needed for the
-	purpose of developing any document or deliverable produced by an OASIS
-	Technical Committee (in which case the rules applicable to copyrights, as set
-	forth in the OASIS IPR Policy, must be followed) or as required to translate it
-	into languages other than English.
-
-	The limited permissions granted above are perpetual and will not be revoked by
-	OASIS or its successors or assigns.
-
-	This document and the information contained herein is provided on an "AS IS"
-	basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT
-	LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT
-	INFRINGE ANY OWNERSHIP RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR
-	FITNESS FOR A PARTICULAR PURPOSE. 
--->
-<grammar
-	xmlns="http://relaxng.org/ns/structure/1.0"
-
-	datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
-
-	xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-	xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0"
-	xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0"
-	xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
-	xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
-	xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
-	xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"
-	xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0"
-	xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
-	xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
-	xmlns:db="urn:oasis:names:tc:opendocument:xmlns:database:1.0"
-	xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0"
-	xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
-	xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
-	xmlns:anim="urn:oasis:names:tc:opendocument:xmlns:animation:1.0"
-
-	xmlns:dc="http://purl.org/dc/elements/1.1/"
-	xmlns:xlink="http://www.w3.org/1999/xlink"
-	xmlns:math="http://www.w3.org/1998/Math/MathML"
-	xmlns:xforms="http://www.w3.org/2002/xforms"
-	xmlns:grddl="http://www.w3.org/2003/g/data-view#"
-	xmlns:xhtml="http://www.w3.org/1999/xhtml"
-
-	xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0"
-	xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"
-	xmlns:smil="urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0"
->
-	<define name="office-process-content">
-		<optional>
-			<attribute name="office:process-content">
-				<ref name="boolean"/>
-			</attribute>
-		</optional>
-	</define>
-	<start>
-		<choice>
-			<ref name="office-document"/>
-			<ref name="office-document-content"/>
-			<ref name="office-document-styles"/>
-			<ref name="office-document-meta"/>
-			<ref name="office-document-settings"/>
-		</choice>
-	</start>
-	<define name="office-document">
-		<element name="office:document">
-			<ref name="office-document-attrs"/>
-			<ref name="office-document-common-attrs"/>
-			<ref name="office-meta"/>
-			<ref name="office-settings"/>
-			<ref name="office-scripts"/>
-			<ref name="office-font-face-decls"/>
-			<ref name="office-styles"/>
-			<ref name="office-automatic-styles"/>
-			<ref name="office-master-styles"/>
-			<ref name="office-body"/>
-		</element>
-	</define>
-	<define name="office-document-content">
-		<element name="office:document-content">
-			<ref name="office-document-common-attrs"/>
-			<ref name="office-scripts"/>
-			<ref name="office-font-face-decls"/>
-			<ref name="office-automatic-styles"/>
-			<ref name="office-body"/>
-		</element>
-	</define>
-	<define name="office-document-styles">
-		<element name="office:document-styles">
-			<ref name="office-document-common-attrs"/>
-			<ref name="office-font-face-decls"/>
-			<ref name="office-styles"/>
-			<ref name="office-automatic-styles"/>
-			<ref name="office-master-styles"/>
-		</element>
-	</define>
-	<define name="office-document-meta">
-		<element name="office:document-meta">
-			<ref name="office-document-common-attrs"/>
-			<ref name="office-meta"/>
-		</element>
-	</define>
-	<define name="office-document-settings">
-		<element name="office:document-settings">
-			<ref name="office-document-common-attrs"/>
-			<ref name="office-settings"/>
-		</element>
-	</define>
-	<define name="office-document-common-attrs">
-		<interleave>
-			<attribute name="office:version">
-				<value>1.2</value>
-			</attribute>
-			<optional>
-				<attribute name="grddl:transformation">
-					<list>
-						<zeroOrMore>
-							<ref name="anyIRI"/>
-						</zeroOrMore>
-					</list>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="office-document-attrs">
-		<attribute name="office:mimetype">
-			<ref name="string"/>
-		</attribute>
-	</define>
-	<define name="office-meta">
-		<optional>
-			<element name="office:meta">
-				<ref name="office-meta-content-strict"/>
-			</element>
-		</optional>
-	</define>
-	<define name="office-meta-content-strict">
-		<zeroOrMore>
-			<ref name="office-meta-data"/>
-		</zeroOrMore>
-	</define>
-	<define name="office-body">
-		<element name="office:body">
-			<ref name="office-body-content"/>
-		</element>
-	</define>
-	<define name="office-body-content">
-		<choice>
-			<element name="office:text">
-				<ref name="office-text-attlist"/>
-				<ref name="office-text-content-prelude"/>
-				<ref name="office-text-content-main"/>
-				<ref name="office-text-content-epilogue"/>
-			</element>
-			<element name="office:drawing">
-				<ref name="office-drawing-attlist"/>
-				<ref name="office-drawing-content-prelude"/>
-				<ref name="office-drawing-content-main"/>
-				<ref name="office-drawing-content-epilogue"/>
-			</element>
-			<element name="office:presentation">
-				<ref name="office-presentation-attlist"/>
-				<ref name="office-presentation-content-prelude"/>
-				<ref name="office-presentation-content-main"/>
-				<ref name="office-presentation-content-epilogue"/>
-			</element>
-			<element name="office:spreadsheet">
-				<ref name="office-spreadsheet-attlist"/>
-				<ref name="office-spreadsheet-content-prelude"/>
-				<ref name="office-spreadsheet-content-main"/>
-				<ref name="office-spreadsheet-content-epilogue"/>
-			</element>
-			<element name="office:chart">
-				<ref name="office-chart-attlist"/>
-				<ref name="office-chart-content-prelude"/>
-				<ref name="office-chart-content-main"/>
-				<ref name="office-chart-content-epilogue"/>
-			</element>
-			<element name="office:image">
-				<ref name="office-image-attlist"/>
-				<ref name="office-image-content-prelude"/>
-				<ref name="office-image-content-main"/>
-				<ref name="office-image-content-epilogue"/>
-			</element>
-			<ref name="office-database"/>
-		</choice>
-	</define>
-	<define name="office-text-content-prelude">
-		<ref name="office-forms"/>
-		<ref name="text-tracked-changes"/>
-		<ref name="text-decls"/>
-		<ref name="table-decls"/>
-	</define>
-	<define name="office-text-content-main">
-		<choice>
-			<zeroOrMore>
-				<ref name="text-content"/>
-			</zeroOrMore>
-			<group>
-				<ref name="text-page-sequence"/>
-				<zeroOrMore>
-					<choice>
-						<ref name="shape"/>
-					</choice>
-				</zeroOrMore>
-			</group>
-		</choice>
-	</define>
-	<define name="text-content">
-		<choice>
-			<ref name="text-h"/>
-			<ref name="text-p"/>
-			<ref name="text-list"/>
-			<ref name="text-numbered-paragraph"/>
-			<ref name="table-table"/>
-			<ref name="text-section"/>
-			<ref name="text-soft-page-break"/>
-			<ref name="text-table-of-content"/>
-			<ref name="text-illustration-index"/>
-			<ref name="text-table-index"/>
-			<ref name="text-object-index"/>
-			<ref name="text-user-index"/>
-			<ref name="text-alphabetical-index"/>
-			<ref name="text-bibliography"/>
-			<ref name="shape"/>
-			<ref name="change-marks"/>
-		</choice>
-	</define>
-	<define name="office-text-content-epilogue">
-		<ref name="table-functions"/>
-	</define>
-	<define name="office-text-attlist">
-		<interleave>
-			<optional>
-				<attribute name="text:global">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:use-soft-page-breaks">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="office-drawing-attlist">
-		<empty/>
-	</define>
-	<define name="office-drawing-content-prelude">
-		<ref name="text-decls"/>
-		<ref name="table-decls"/>
-	</define>
-	<define name="office-drawing-content-main">
-		<zeroOrMore>
-			<ref name="draw-page"/>
-		</zeroOrMore>
-	</define>
-	<define name="office-drawing-content-epilogue">
-		<ref name="table-functions"/>
-	</define>
-	<define name="office-presentation-attlist">
-		<empty/>
-	</define>
-	<define name="office-presentation-content-prelude">
-		<ref name="text-decls"/>
-		<ref name="table-decls"/>
-		<ref name="presentation-decls"/>
-	</define>
-	<define name="office-presentation-content-main">
-		<zeroOrMore>
-			<ref name="draw-page"/>
-		</zeroOrMore>
-	</define>
-	<define name="office-presentation-content-epilogue">
-		<ref name="presentation-settings"/>
-		<ref name="table-functions"/>
-	</define>
-	<define name="office-spreadsheet-content-prelude">
-		<optional>
-			<ref name="table-tracked-changes"/>
-		</optional>
-		<ref name="text-decls"/>
-		<ref name="table-decls"/>
-	</define>
-	<define name="table-decls">
-		<optional>
-			<ref name="table-calculation-settings"/>
-		</optional>
-		<optional>
-			<ref name="table-content-validations"/>
-		</optional>
-		<optional>
-			<ref name="table-label-ranges"/>
-		</optional>
-	</define>
-	<define name="office-spreadsheet-content-main">
-		<zeroOrMore>
-			<ref name="table-table"/>
-		</zeroOrMore>
-	</define>
-	<define name="office-spreadsheet-content-epilogue">
-		<ref name="table-functions"/>
-	</define>
-	<define name="table-functions">
-		<optional>
-			<ref name="table-named-expressions"/>
-		</optional>
-		<optional>
-			<ref name="table-database-ranges"/>
-		</optional>
-		<optional>
-			<ref name="table-data-pilot-tables"/>
-		</optional>
-		<optional>
-			<ref name="table-consolidation"/>
-		</optional>
-		<optional>
-			<ref name="table-dde-links"/>
-		</optional>
-	</define>
-	<define name="office-chart-attlist">
-		<empty/>
-	</define>
-	<define name="office-chart-content-prelude">
-		<ref name="text-decls"/>
-		<ref name="table-decls"/>
-	</define>
-	<define name="office-chart-content-main">
-		<ref name="chart-chart"/>
-	</define>
-	<define name="office-chart-content-epilogue">
-		<ref name="table-functions"/>
-	</define>
-	<define name="office-image-attlist">
-		<empty/>
-	</define>
-	<define name="office-image-content-prelude">
-		<empty/>
-	</define>
-	<define name="office-image-content-main">
-		<ref name="draw-frame"/>
-	</define>
-	<define name="office-image-content-epilogue">
-		<empty/>
-	</define>
-	<define name="office-settings">
-		<optional>
-			<element name="office:settings">
-				<oneOrMore>
-					<ref name="config-config-item-set"/>
-				</oneOrMore>
-			</element>
-		</optional>
-	</define>
-	<define name="config-config-item-set">
-		<element name="config:config-item-set">
-			<ref name="config-config-item-set-attlist"/>
-			<ref name="config-items"/>
-		</element>
-	</define>
-	<define name="config-items">
-		<oneOrMore>
-			<choice>
-				<ref name="config-config-item"/>
-				<ref name="config-config-item-set"/>
-				<ref name="config-config-item-map-named"/>
-				<ref name="config-config-item-map-indexed"/>
-			</choice>
-		</oneOrMore>
-	</define>
-	<define name="config-config-item-set-attlist">
-		<attribute name="config:name">
-			<ref name="string"/>
-		</attribute>
-	</define>
-	<define name="config-config-item">
-		<element name="config:config-item">
-			<ref name="config-config-item-attlist"/>
-			<text/>
-		</element>
-	</define>
-	<define name="config-config-item-attlist">
-		<interleave>
-			<attribute name="config:name">
-				<ref name="string"/>
-			</attribute>
-			<attribute name="config:type">
-				<choice>
-					<value>boolean</value>
-					<value>short</value>
-					<value>int</value>
-					<value>long</value>
-					<value>double</value>
-					<value>string</value>
-					<value>datetime</value>
-					<value>base64Binary</value>
-				</choice>
-			</attribute>
-		</interleave>
-	</define>
-	<define name="config-config-item-map-indexed">
-		<element name="config:config-item-map-indexed">
-			<ref name="config-config-item-map-indexed-attlist"/>
-			<oneOrMore>
-				<ref name="config-config-item-map-entry"/>
-			</oneOrMore>
-		</element>
-	</define>
-	<define name="config-config-item-map-indexed-attlist">
-		<attribute name="config:name">
-			<ref name="string"/>
-		</attribute>
-	</define>
-	<define name="config-config-item-map-entry">
-		<element name="config:config-item-map-entry">
-			<ref name="config-config-item-map-entry-attlist"/>
-			<ref name="config-items"/>
-		</element>
-	</define>
-	<define name="config-config-item-map-entry-attlist">
-		<optional>
-			<attribute name="config:name">
-				<ref name="string"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="config-config-item-map-named">
-		<element name="config:config-item-map-named">
-			<ref name="config-config-item-map-named-attlist"/>
-			<oneOrMore>
-				<ref name="config-config-item-map-entry"/>
-			</oneOrMore>
-		</element>
-	</define>
-	<define name="config-config-item-map-named-attlist">
-		<attribute name="config:name">
-			<ref name="string"/>
-		</attribute>
-	</define>
-	<define name="office-scripts">
-		<optional>
-			<element name="office:scripts">
-				<zeroOrMore>
-					<ref name="office-script"/>
-				</zeroOrMore>
-				<optional>
-					<ref name="office-event-listeners"/>
-				</optional>
-			</element>
-		</optional>
-	</define>
-	<define name="office-script">
-		<element name="office:script">
-			<ref name="office-script-attlist"/>
-			<mixed>
-				<ref name="anyElements"/>
-			</mixed>
-		</element>
-	</define>
-	<define name="office-script-attlist">
-		<attribute name="script:language">
-			<ref name="string"/>
-		</attribute>
-	</define>
-	<define name="office-font-face-decls">
-		<optional>
-			<element name="office:font-face-decls">
-				<zeroOrMore>
-					<ref name="style-font-face"/>
-				</zeroOrMore>
-			</element>
-		</optional>
-	</define>
-	<define name="office-styles">
-		<optional>
-			<element name="office:styles">
-				<interleave>
-					<ref name="styles"/>
-					<zeroOrMore>
-						<ref name="style-default-style"/>
-					</zeroOrMore>
-					<optional>
-						<ref name="style-default-page-layout"/>
-					</optional>
-					<optional>
-						<ref name="text-outline-style"/>
-					</optional>
-					<zeroOrMore>
-						<ref name="text-notes-configuration"/>
-					</zeroOrMore>
-					<optional>
-						<ref name="text-bibliography-configuration"/>
-					</optional>
-					<optional>
-						<ref name="text-linenumbering-configuration"/>
-					</optional>
-					<zeroOrMore>
-						<ref name="draw-gradient"/>
-					</zeroOrMore>
-					<zeroOrMore>
-						<ref name="svg-linearGradient"/>
-					</zeroOrMore>
-					<zeroOrMore>
-						<ref name="svg-radialGradient"/>
-					</zeroOrMore>
-					<zeroOrMore>
-						<ref name="draw-hatch"/>
-					</zeroOrMore>
-					<zeroOrMore>
-						<ref name="draw-fill-image"/>
-					</zeroOrMore>
-					<zeroOrMore>
-						<ref name="draw-marker"/>
-					</zeroOrMore>
-					<zeroOrMore>
-						<ref name="draw-stroke-dash"/>
-					</zeroOrMore>
-					<zeroOrMore>
-						<ref name="draw-opacity"/>
-					</zeroOrMore>
-					<zeroOrMore>
-						<ref name="style-presentation-page-layout"/>
-					</zeroOrMore>
-					<zeroOrMore>
-						<ref name="table-table-template"/>
-					</zeroOrMore>
-				</interleave>
-			</element>
-		</optional>
-	</define>
-	<define name="office-automatic-styles">
-		<optional>
-			<element name="office:automatic-styles">
-				<interleave>
-					<ref name="styles"/>
-					<zeroOrMore>
-						<ref name="style-page-layout"/>
-					</zeroOrMore>
-				</interleave>
-			</element>
-		</optional>
-	</define>
-	<define name="office-master-styles">
-		<optional>
-			<element name="office:master-styles">
-				<interleave>
-					<zeroOrMore>
-						<ref name="style-master-page"/>
-					</zeroOrMore>
-					<optional>
-						<ref name="style-handout-master"/>
-					</optional>
-					<optional>
-						<ref name="draw-layer-set"/>
-					</optional>
-				</interleave>
-			</element>
-		</optional>
-	</define>
-	<define name="styles">
-		<interleave>
-			<zeroOrMore>
-				<ref name="style-style"/>
-			</zeroOrMore>
-			<zeroOrMore>
-				<ref name="text-list-style"/>
-			</zeroOrMore>
-			<zeroOrMore>
-				<ref name="number-number-style"/>
-			</zeroOrMore>
-			<zeroOrMore>
-				<ref name="number-currency-style"/>
-			</zeroOrMore>
-			<zeroOrMore>
-				<ref name="number-percentage-style"/>
-			</zeroOrMore>
-			<zeroOrMore>
-				<ref name="number-date-style"/>
-			</zeroOrMore>
-			<zeroOrMore>
-				<ref name="number-time-style"/>
-			</zeroOrMore>
-			<zeroOrMore>
-				<ref name="number-boolean-style"/>
-			</zeroOrMore>
-			<zeroOrMore>
-				<ref name="number-text-style"/>
-			</zeroOrMore>
-		</interleave>
-	</define>
-	<define name="office-meta-data">
-		<choice>
-			<element name="meta:generator">
-				<ref name="string"/>
-			</element>
-			<element name="dc:title">
-				<ref name="string"/>
-			</element>
-			<element name="dc:description">
-				<ref name="string"/>
-			</element>
-			<element name="dc:subject">
-				<ref name="string"/>
-			</element>
-			<element name="meta:keyword">
-				<ref name="string"/>
-			</element>
-			<element name="meta:initial-creator">
-				<ref name="string"/>
-			</element>
-			<ref name="dc-creator"/>
-			<element name="meta:printed-by">
-				<ref name="string"/>
-			</element>
-			<element name="meta:creation-date">
-				<ref name="dateTime"/>
-			</element>
-			<ref name="dc-date"/>
-			<element name="meta:print-date">
-				<ref name="dateTime"/>
-			</element>
-			<element name="meta:template">
-				<attribute name="xlink:type">
-					<value>simple</value>
-				</attribute>
-				<attribute name="xlink:href">
-					<ref name="anyIRI"/>
-				</attribute>
-				<optional>
-					<attribute name="xlink:actuate">
-						<value>onRequest</value>
-					</attribute>
-				</optional>
-				<optional>
-					<attribute name="xlink:title">
-						<ref name="string"/>
-					</attribute>
-				</optional>
-				<optional>
-					<attribute name="meta:date">
-						<ref name="dateTime"/>
-					</attribute>
-				</optional>
-			</element>
-			<element name="meta:auto-reload">
-				<optional>
-					<attribute name="xlink:type">
-						<value>simple</value>
-					</attribute>
-					<attribute name="xlink:href">
-						<ref name="anyIRI"/>
-					</attribute>
-					<optional>
-						<attribute name="xlink:show">
-							<value>replace</value>
-						</attribute>
-					</optional>
-					<optional>
-						<attribute name="xlink:actuate">
-							<value>onLoad</value>
-						</attribute>
-					</optional>
-				</optional>
-				<optional>
-					<attribute name="meta:delay">
-						<ref name="duration"/>
-					</attribute>
-				</optional>
-			</element>
-			<element name="meta:hyperlink-behaviour">
-				<optional>
-					<attribute name="office:target-frame-name">
-						<ref name="targetFrameName"/>
-					</attribute>
-				</optional>
-				<optional>
-					<attribute name="xlink:show">
-						<choice>
-							<value>new</value>
-							<value>replace</value>
-						</choice>
-					</attribute>
-				</optional>
-			</element>
-			<element name="dc:language">
-				<ref name="language"/>
-			</element>
-			<element name="meta:editing-cycles">
-				<ref name="nonNegativeInteger"/>
-			</element>
-			<element name="meta:editing-duration">
-				<ref name="duration"/>
-			</element>
-			<element name="meta:document-statistic">
-				<optional>
-					<attribute name="meta:page-count">
-						<ref name="nonNegativeInteger"/>
-					</attribute>
-				</optional>
-				<optional>
-					<attribute name="meta:table-count">
-						<ref name="nonNegativeInteger"/>
-					</attribute>
-				</optional>
-				<optional>
-					<attribute name="meta:draw-count">
-						<ref name="nonNegativeInteger"/>
-					</attribute>
-				</optional>
-				<optional>
-					<attribute name="meta:image-count">
-						<ref name="nonNegativeInteger"/>
-					</attribute>
-				</optional>
-				<optional>
-					<attribute name="meta:ole-object-count">
-						<ref name="nonNegativeInteger"/>
-					</attribute>
-				</optional>
-				<optional>
-					<attribute name="meta:object-count">
-						<ref name="nonNegativeInteger"/>
-					</attribute>
-				</optional>
-				<optional>
-					<attribute name="meta:paragraph-count">
-						<ref name="nonNegativeInteger"/>
-					</attribute>
-				</optional>
-				<optional>
-					<attribute name="meta:word-count">
-						<ref name="nonNegativeInteger"/>
-					</attribute>
-				</optional>
-				<optional>
-					<attribute name="meta:character-count">
-						<ref name="nonNegativeInteger"/>
-					</attribute>
-				</optional>
-				<optional>
-					<attribute name="meta:frame-count">
-						<ref name="nonNegativeInteger"/>
-					</attribute>
-				</optional>
-				<optional>
-					<attribute name="meta:sentence-count">
-						<ref name="nonNegativeInteger"/>
-					</attribute>
-				</optional>
-				<optional>
-					<attribute name="meta:syllable-count">
-						<ref name="nonNegativeInteger"/>
-					</attribute>
-				</optional>
-				<optional>
-					<attribute name="meta:non-whitespace-character-count">
-						<ref name="nonNegativeInteger"/>
-					</attribute>
-				</optional>
-				<optional>
-					<attribute name="meta:row-count">
-						<ref name="nonNegativeInteger"/>
-					</attribute>
-				</optional>
-				<optional>
-					<attribute name="meta:cell-count">
-						<ref name="nonNegativeInteger"/>
-					</attribute>
-				</optional>
-			</element>
-			<element name="meta:user-defined">
-				<attribute name="meta:name">
-					<ref name="string"/>
-				</attribute>
-				<choice>
-					<group>
-						<attribute name="meta:value-type">
-							<value>float</value>
-						</attribute>
-						<ref name="double"/>
-					</group>
-					<group>
-						<attribute name="meta:value-type">
-							<value>date</value>
-						</attribute>
-						<ref name="dateOrDateTime"/>
-					</group>
-					<group>
-						<attribute name="meta:value-type">
-							<value>time</value>
-						</attribute>
-						<ref name="duration"/>
-					</group>
-					<group>
-						<attribute name="meta:value-type">
-							<value>boolean</value>
-						</attribute>
-						<ref name="boolean"/>
-					</group>
-					<group>
-						<attribute name="meta:value-type">
-							<value>string</value>
-						</attribute>
-						<ref name="string"/>
-					</group>
-					<text/>
-				</choice>
-			</element>
-		</choice>
-	</define>
-	<define name="dc-creator">
-		<element name="dc:creator">
-			<ref name="string"/>
-		</element>
-	</define>
-	<define name="dc-date">
-		<element name="dc:date">
-			<ref name="dateTime"/>
-		</element>
-	</define>
-	<define name="text-h">
-		<element name="text:h">
-			<ref name="heading-attrs"/>
-			<ref name="paragraph-attrs"/>
-			<optional>
-				<ref name="text-number"/>
-			</optional>
-			<zeroOrMore>
-				<ref name="paragraph-content-or-hyperlink"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="heading-attrs">
-		<interleave>
-			<attribute name="text:outline-level">
-				<ref name="positiveInteger"/>
-			</attribute>
-			<optional>
-				<attribute name="text:restart-numbering">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:start-value">
-					<ref name="nonNegativeInteger"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:is-list-header">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="text-number">
-		<element name="text:number">
-			<ref name="string"/>
-		</element>
-	</define>
-	<define name="text-p">
-		<element name="text:p">
-			<ref name="paragraph-attrs"/>
-			<zeroOrMore>
-				<ref name="paragraph-content-or-hyperlink"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="paragraph-attrs">
-		<interleave>
-			<optional>
-				<attribute name="text:style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:class-names">
-					<ref name="styleNameRefs"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:cond-style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<optional>
-				<group>
-					<ref name="xml-id"/>
-					<optional>
-						<attribute name="text:id">
-							<ref name="NCName"/>
-						</attribute>
-					</optional>
-				</group>
-			</optional>
-			<optional>
-				<ref name="common-in-content-meta-attlist"/>
-			</optional>
-		</interleave>
-	</define>
-	<define name="text-page-sequence">
-		<element name="text:page-sequence">
-			<oneOrMore>
-				<ref name="text-page"/>
-			</oneOrMore>
-		</element>
-	</define>
-	<define name="text-page">
-		<element name="text:page">
-			<ref name="text-page-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="text-page-attlist">
-		<attribute name="text:master-page-name">
-			<ref name="styleNameRef"/>
-		</attribute>
-	</define>
-	<define name="text-list">
-		<element name="text:list">
-			<ref name="text-list-attr"/>
-			<optional>
-				<ref name="text-list-header"/>
-			</optional>
-			<zeroOrMore>
-				<ref name="text-list-item"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="text-list-attr">
-		<interleave>
-			<optional>
-				<attribute name="text:style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:continue-numbering">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:continue-list">
-					<ref name="IDREF"/>
-				</attribute>
-			</optional>
-			<optional>
-				<ref name="xml-id"/>
-			</optional>
-		</interleave>
-	</define>
-	<define name="text-list-item">
-		<element name="text:list-item">
-			<ref name="text-list-item-attr"/>
-			<ref name="text-list-item-content"/>
-		</element>
-	</define>
-	<define name="text-list-item-content">
-		<optional>
-			<ref name="text-number"/>
-		</optional>
-		<zeroOrMore>
-			<choice>
-				<ref name="text-p"/>
-				<ref name="text-h"/>
-				<ref name="text-list"/>
-				<ref name="text-soft-page-break"/>
-			</choice>
-		</zeroOrMore>
-	</define>
-	<define name="text-list-item-attr">
-		<interleave>
-			<optional>
-				<attribute name="text:start-value">
-					<ref name="nonNegativeInteger"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:style-override">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<optional>
-				<ref name="xml-id"/>
-			</optional>
-		</interleave>
-	</define>
-	<define name="text-list-header">
-		<element name="text:list-header">
-			<ref name="text-list-header-attr"/>
-			<ref name="text-list-item-content"/>
-		</element>
-	</define>
-	<define name="text-list-header-attr">
-		<optional>
-			<ref name="xml-id"/>
-		</optional>
-	</define>
-	<define name="text-numbered-paragraph">
-		<element name="text:numbered-paragraph">
-			<ref name="text-numbered-paragraph-attr"/>
-			<optional>
-				<ref name="text-number"/>
-			</optional>
-			<choice>
-				<ref name="text-p"/>
-				<ref name="text-h"/>
-			</choice>
-		</element>
-	</define>
-	<define name="text-numbered-paragraph-attr">
-		<interleave>
-			<attribute name="text:list-id">
-				<ref name="NCName"/>
-			</attribute>
-			<optional>
-				<attribute name="text:level">
-					<ref name="positiveInteger"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-				<attribute name="text:continue-numbering">
-					<ref name="boolean"/>
-				</attribute>
-				<attribute name="text:start-value">
-					<ref name="nonNegativeInteger"/>
-				</attribute>
-			</optional>
-			<optional>
-				<ref name="xml-id"/>
-			</optional>
-		</interleave>
-	</define>
-	<define name="text-section">
-		<element name="text:section">
-			<ref name="text-section-attlist"/>
-			<choice>
-				<ref name="text-section-source"/>
-				<ref name="text-section-source-dde"/>
-				<empty/>
-			</choice>
-			<zeroOrMore>
-				<ref name="text-content"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="text-section-attlist">
-		<interleave>
-			<ref name="common-section-attlist"/>
-			<choice>
-				<attribute name="text:display">
-					<choice>
-						<value>true</value>
-						<value>none</value>
-					</choice>
-				</attribute>
-				<group>
-					<attribute name="text:display">
-						<value>condition</value>
-					</attribute>
-					<attribute name="text:condition">
-						<ref name="string"/>
-					</attribute>
-				</group>
-				<empty/>
-			</choice>
-		</interleave>
-	</define>
-	<define name="common-section-attlist">
-		<interleave>
-			<optional>
-				<attribute name="text:style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<attribute name="text:name">
-				<ref name="string"/>
-			</attribute>
-			<optional>
-				<attribute name="text:protected">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:protection-key">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:protection-key-digest-algorithm">
-					<ref name="anyIRI"/>
-				</attribute>
-			</optional>
-			<optional>
-				<ref name="xml-id"/>
-			</optional>
-		</interleave>
-	</define>
-	<define name="text-section-source">
-		<element name="text:section-source">
-			<ref name="text-section-source-attr"/>
-		</element>
-	</define>
-	<define name="text-section-source-attr">
-		<interleave>
-			<optional>
-				<attribute name="xlink:type">
-					<value>simple</value>
-				</attribute>
-				<attribute name="xlink:href">
-					<ref name="anyIRI"/>
-				</attribute>
-				<optional>
-					<attribute name="xlink:show">
-						<value>embed</value>
-					</attribute>
-				</optional>
-			</optional>
-			<optional>
-				<attribute name="text:section-name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:filter-name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="text-section-source-dde">
-		<ref name="office-dde-source"/>
-	</define>
-	<define name="text-tracked-changes">
-		<optional>
-			<element name="text:tracked-changes">
-				<ref name="text-tracked-changes-attr"/>
-				<zeroOrMore>
-					<ref name="text-changed-region"/>
-				</zeroOrMore>
-			</element>
-		</optional>
-	</define>
-	<define name="text-tracked-changes-attr">
-		<optional>
-			<attribute name="text:track-changes">
-				<ref name="boolean"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="text-changed-region">
-		<element name="text:changed-region">
-			<ref name="text-changed-region-attr"/>
-			<ref name="text-changed-region-content"/>
-		</element>
-	</define>
-	<define name="text-changed-region-attr">
-		<group>
-			<ref name="xml-id"/>
-			<optional>
-				<attribute name="text:id">
-					<ref name="NCName"/>
-				</attribute>
-			</optional>
-		</group>
-	</define>
-	<define name="text-changed-region-content">
-		<choice>
-			<element name="text:insertion">
-				<ref name="office-change-info"/>
-			</element>
-			<element name="text:deletion">
-				<ref name="office-change-info"/>
-				<zeroOrMore>
-					<ref name="text-content"/>
-				</zeroOrMore>
-			</element>
-			<element name="text:format-change">
-				<ref name="office-change-info"/>
-			</element>
-		</choice>
-	</define>
-	<define name="change-marks">
-		<choice>
-			<element name="text:change">
-				<ref name="change-mark-attr"/>
-			</element>
-			<element name="text:change-start">
-				<ref name="change-mark-attr"/>
-			</element>
-			<element name="text:change-end">
-				<ref name="change-mark-attr"/>
-			</element>
-		</choice>
-	</define>
-	<define name="change-mark-attr">
-		<attribute name="text:change-id">
-			<ref name="IDREF"/>
-		</attribute>
-	</define>
-	<define name="text-soft-page-break">
-		<element name="text:soft-page-break">
-			<empty/>
-		</element>
-	</define>
-	<define name="text-decls">
-		<optional>
-			<element name="text:variable-decls">
-				<zeroOrMore>
-					<ref name="text-variable-decl"/>
-				</zeroOrMore>
-			</element>
-		</optional>
-		<optional>
-			<element name="text:sequence-decls">
-				<zeroOrMore>
-					<ref name="text-sequence-decl"/>
-				</zeroOrMore>
-			</element>
-		</optional>
-		<optional>
-			<element name="text:user-field-decls">
-				<zeroOrMore>
-					<ref name="text-user-field-decl"/>
-				</zeroOrMore>
-			</element>
-		</optional>
-		<optional>
-			<element name="text:dde-connection-decls">
-				<zeroOrMore>
-					<ref name="text-dde-connection-decl"/>
-				</zeroOrMore>
-			</element>
-		</optional>
-		<optional>
-			<ref name="text-alphabetical-index-auto-mark-file"/>
-		</optional>
-	</define>
-	<define name="paragraph-content-or-hyperlink">
-		<choice>
-			<ref name="paragraph-content"/>
-			<ref name="text-a"/>
-		</choice>
-	</define>
-	<define name="paragraph-content">
-		<choice>
-			<text/>
-			<element name="text:s">
-				<optional>
-					<attribute name="text:c">
-						<ref name="nonNegativeInteger"/>
-					</attribute>
-				</optional>
-			</element>
-			<element name="text:tab">
-				<ref name="text-tab-attr"/>
-			</element>
-			<element name="text:line-break">
-				<empty/>
-			</element>
-			<ref name="text-soft-page-break"/>
-			<element name="text:span">
-				<optional>
-					<attribute name="text:style-name">
-						<ref name="styleNameRef"/>
-					</attribute>
-				</optional>
-				<optional>
-					<attribute name="text:class-names">
-						<ref name="styleNameRefs"/>
-					</attribute>
-				</optional>
-				<zeroOrMore>
-					<ref name="paragraph-content-or-hyperlink"/>
-				</zeroOrMore>
-			</element>
-			<element name="text:meta">
-				<ref name="text-meta-attlist"/>
-				<zeroOrMore>
-					<ref name="paragraph-content-or-hyperlink"/>
-				</zeroOrMore>
-			</element>
-			<choice>
-				<ref name="text-bookmark"/>
-				<ref name="text-bookmark-start"/>
-				<ref name="text-bookmark-end"/>
-			</choice>
-			<element name="text:reference-mark">
-				<attribute name="text:name">
-					<ref name="string"/>
-				</attribute>
-			</element>
-			<choice>
-				<element name="text:reference-mark-start">
-					<attribute name="text:name">
-						<ref name="string"/>
-					</attribute>
-				</element>
-				<element name="text:reference-mark-end">
-					<attribute name="text:name">
-						<ref name="string"/>
-					</attribute>
-				</element>
-			</choice>
-			<element name="text:note">
-				<ref name="text-note-class"/>
-				<optional>
-					<attribute name="text:id">
-						<ref name="string"/>
-					</attribute>
-				</optional>
-				<element name="text:note-citation">
-					<optional>
-						<attribute name="text:label">
-							<ref name="string"/>
-						</attribute>
-					</optional>
-					<text/>
-				</element>
-				<element name="text:note-body">
-					<zeroOrMore>
-						<ref name="text-content"/>
-					</zeroOrMore>
-				</element>
-			</element>
-			<element name="text:ruby">
-				<optional>
-					<attribute name="text:style-name">
-						<ref name="styleNameRef"/>
-					</attribute>
-				</optional>
-				<element name="text:ruby-base">
-					<zeroOrMore>
-						<ref name="paragraph-content-or-hyperlink"/>
-					</zeroOrMore>
-				</element>
-				<element name="text:ruby-text">
-					<optional>
-						<attribute name="text:style-name">
-							<ref name="styleNameRef"/>
-						</attribute>
-					</optional>
-					<text/>
-				</element>
-			</element>
-			<choice>
-				<ref name="office-annotation"/>
-				<ref name="office-annotation-end"/>
-			</choice>
-			<ref name="change-marks"/>
-			<ref name="shape"/>
-			<element name="text:date">
-				<ref name="text-date-attlist"/>
-				<text/>
-			</element>
-			<element name="text:time">
-				<ref name="text-time-attlist"/>
-				<text/>
-			</element>
-			<element name="text:page-number">
-				<ref name="text-page-number-attlist"/>
-				<text/>
-			</element>
-			<element name="text:page-continuation">
-				<ref name="text-page-continuation-attlist"/>
-				<text/>
-			</element>
-			<element name="text:sender-firstname">
-				<ref name="common-field-fixed-attlist"/>
-				<text/>
-			</element>
-			<element name="text:sender-lastname">
-				<ref name="common-field-fixed-attlist"/>
-				<text/>
-			</element>
-			<element name="text:sender-initials">
-				<ref name="common-field-fixed-attlist"/>
-				<text/>
-			</element>
-			<element name="text:sender-title">
-				<ref name="common-field-fixed-attlist"/>
-				<text/>
-			</element>
-			<element name="text:sender-position">
-				<ref name="common-field-fixed-attlist"/>
-				<text/>
-			</element>
-			<element name="text:sender-email">
-				<ref name="common-field-fixed-attlist"/>
-				<text/>
-			</element>
-			<element name="text:sender-phone-private">
-				<ref name="common-field-fixed-attlist"/>
-				<text/>
-			</element>
-			<element name="text:sender-fax">
-				<ref name="common-field-fixed-attlist"/>
-				<text/>
-			</element>
-			<element name="text:sender-company">
-				<ref name="common-field-fixed-attlist"/>
-				<text/>
-			</element>
-			<element name="text:sender-phone-work">
-				<ref name="common-field-fixed-attlist"/>
-				<text/>
-			</element>
-			<element name="text:sender-street">
-				<ref name="common-field-fixed-attlist"/>
-				<text/>
-			</element>
-			<element name="text:sender-city">
-				<ref name="common-field-fixed-attlist"/>
-				<text/>
-			</element>
-			<element name="text:sender-postal-code">
-				<ref name="common-field-fixed-attlist"/>
-				<text/>
-			</element>
-			<element name="text:sender-country">
-				<ref name="common-field-fixed-attlist"/>
-				<text/>
-			</element>
-			<element name="text:sender-state-or-province">
-				<ref name="common-field-fixed-attlist"/>
-				<text/>
-			</element>
-			<element name="text:author-name">
-				<ref name="common-field-fixed-attlist"/>
-				<text/>
-			</element>
-			<element name="text:author-initials">
-				<ref name="common-field-fixed-attlist"/>
-				<text/>
-			</element>
-			<element name="text:chapter">
-				<ref name="text-chapter-attlist"/>
-				<text/>
-			</element>
-			<element name="text:file-name">
-				<ref name="text-file-name-attlist"/>
-				<text/>
-			</element>
-			<element name="text:template-name">
-				<ref name="text-template-name-attlist"/>
-				<text/>
-			</element>
-			<element name="text:sheet-name">
-				<text/>
-			</element>
-			<element name="text:variable-set">
-				<interleave>
-					<ref name="common-field-name-attlist"/>
-					<ref name="common-field-formula-attlist"/>
-					<ref name="common-value-and-type-attlist"/>
-					<ref name="common-field-display-value-none-attlist"/>
-					<ref name="common-field-data-style-name-attlist"/>
-				</interleave>
-				<text/>
-			</element>
-			<element name="text:variable-get">
-				<interleave>
-					<ref name="common-field-name-attlist"/>
-					<ref name="common-field-display-value-formula-attlist"/>
-					<ref name="common-field-data-style-name-attlist"/>
-				</interleave>
-				<text/>
-			</element>
-			<element name="text:variable-input">
-				<interleave>
-					<ref name="common-field-name-attlist"/>
-					<ref name="common-field-description-attlist"/>
-					<ref name="common-value-type-attlist"/>
-					<ref name="common-field-display-value-none-attlist"/>
-					<ref name="common-field-data-style-name-attlist"/>
-				</interleave>
-				<text/>
-			</element>
-			<element name="text:user-field-get">
-				<interleave>
-					<ref name="common-field-name-attlist"/>
-					<ref name="common-field-display-value-formula-none-attlist"/>
-					<ref name="common-field-data-style-name-attlist"/>
-				</interleave>
-				<text/>
-			</element>
-			<element name="text:user-field-input">
-				<interleave>
-					<ref name="common-field-name-attlist"/>
-					<ref name="common-field-description-attlist"/>
-					<ref name="common-field-data-style-name-attlist"/>
-				</interleave>
-				<text/>
-			</element>
-			<element name="text:sequence">
-				<interleave>
-					<ref name="common-field-name-attlist"/>
-					<ref name="common-field-formula-attlist"/>
-					<ref name="common-field-num-format-attlist"/>
-					<ref name="text-sequence-ref-name"/>
-				</interleave>
-				<text/>
-			</element>
-			<element name="text:expression">
-				<interleave>
-					<ref name="common-field-formula-attlist"/>
-					<optional>
-						<ref name="common-value-and-type-attlist"/>
-					</optional>
-					<ref name="common-field-display-value-formula-attlist"/>
-					<ref name="common-field-data-style-name-attlist"/>
-				</interleave>
-				<text/>
-			</element>
-			<element name="text:text-input">
-				<ref name="common-field-description-attlist"/>
-				<text/>
-			</element>
-			<element name="text:initial-creator">
-				<ref name="common-field-fixed-attlist"/>
-				<text/>
-			</element>
-			<element name="text:creation-date">
-				<interleave>
-					<ref name="common-field-fixed-attlist"/>
-					<ref name="common-field-data-style-name-attlist"/>
-					<optional>
-						<attribute name="text:date-value">
-							<ref name="dateOrDateTime"/>
-						</attribute>
-					</optional>
-				</interleave>
-				<text/>
-			</element>
-			<element name="text:creation-time">
-				<interleave>
-					<ref name="common-field-fixed-attlist"/>
-					<ref name="common-field-data-style-name-attlist"/>
-					<optional>
-						<attribute name="text:time-value">
-							<ref name="timeOrDateTime"/>
-						</attribute>
-					</optional>
-				</interleave>
-				<text/>
-			</element>
-			<element name="text:description">
-				<ref name="common-field-fixed-attlist"/>
-				<text/>
-			</element>
-			<element name="text:user-defined">
-				<interleave>
-					<ref name="common-field-fixed-attlist"/>
-					<attribute name="text:name">
-						<ref name="string"/>
-					</attribute>
-					<ref name="common-field-data-style-name-attlist"/>
-					<optional>
-						<attribute name="office:value">
-							<ref name="double"/>
-						</attribute>
-					</optional>
-					<optional>
-						<attribute name="office:date-value">
-							<ref name="dateOrDateTime"/>
-						</attribute>
-					</optional>
-					<optional>
-						<attribute name="office:time-value">
-							<ref name="duration"/>
-						</attribute>
-					</optional>
-					<optional>
-						<attribute name="office:boolean-value">
-							<ref name="boolean"/>
-						</attribute>
-					</optional>
-					<optional>
-						<attribute name="office:string-value">
-							<ref name="string"/>
-						</attribute>
-					</optional>
-				</interleave>
-				<text/>
-			</element>
-			<element name="text:print-time">
-				<interleave>
-					<ref name="common-field-fixed-attlist"/>
-					<ref name="common-field-data-style-name-attlist"/>
-					<optional>
-						<attribute name="text:time-value">
-							<ref name="time"/>
-						</attribute>
-					</optional>
-				</interleave>
-				<text/>
-			</element>
-			<element name="text:print-date">
-				<interleave>
-					<ref name="common-field-fixed-attlist"/>
-					<ref name="common-field-data-style-name-attlist"/>
-					<optional>
-						<attribute name="text:date-value">
-							<ref name="date"/>
-						</attribute>
-					</optional>
-				</interleave>
-				<text/>
-			</element>
-			<element name="text:printed-by">
-				<ref name="common-field-fixed-attlist"/>
-				<text/>
-			</element>
-			<element name="text:title">
-				<ref name="common-field-fixed-attlist"/>
-				<text/>
-			</element>
-			<element name="text:subject">
-				<ref name="common-field-fixed-attlist"/>
-				<text/>
-			</element>
-			<element name="text:keywords">
-				<ref name="common-field-fixed-attlist"/>
-				<text/>
-			</element>
-			<element name="text:editing-cycles">
-				<ref name="common-field-fixed-attlist"/>
-				<text/>
-			</element>
-			<element name="text:editing-duration">
-				<interleave>
-					<ref name="common-field-fixed-attlist"/>
-					<ref name="common-field-data-style-name-attlist"/>
-					<optional>
-						<attribute name="text:duration">
-							<ref name="duration"/>
-						</attribute>
-					</optional>
-				</interleave>
-				<text/>
-			</element>
-			<element name="text:modification-time">
-				<interleave>
-					<ref name="common-field-fixed-attlist"/>
-					<ref name="common-field-data-style-name-attlist"/>
-					<optional>
-						<attribute name="text:time-value">
-							<ref name="time"/>
-						</attribute>
-					</optional>
-				</interleave>
-				<text/>
-			</element>
-			<element name="text:modification-date">
-				<interleave>
-					<ref name="common-field-fixed-attlist"/>
-					<ref name="common-field-data-style-name-attlist"/>
-					<optional>
-						<attribute name="text:date-value">
-							<ref name="date"/>
-						</attribute>
-					</optional>
-				</interleave>
-				<text/>
-			</element>
-			<element name="text:creator">
-				<ref name="common-field-fixed-attlist"/>
-				<text/>
-			</element>
-			<element>
-				<choice>
-					<name>text:page-count</name>
-					<name>text:paragraph-count</name>
-					<name>text:word-count</name>
-					<name>text:character-count</name>
-					<name>text:table-count</name>
-					<name>text:image-count</name>
-					<name>text:object-count</name>
-				</choice>
-				<ref name="common-field-num-format-attlist"/>
-				<text/>
-			</element>
-			<element name="text:database-display">
-				<ref name="text-database-display-attlist"/>
-				<text/>
-			</element>
-			<element name="text:database-next">
-				<ref name="text-database-next-attlist"/>
-			</element>
-			<element name="text:database-row-select">
-				<ref name="text-database-row-select-attlist"/>
-			</element>
-			<element name="text:database-row-number">
-				<interleave>
-					<ref name="common-field-database-table"/>
-					<ref name="common-field-num-format-attlist"/>
-					<optional>
-						<attribute name="text:value">
-							<ref name="nonNegativeInteger"/>
-						</attribute>
-					</optional>
-				</interleave>
-				<text/>
-			</element>
-			<element name="text:database-name">
-				<ref name="common-field-database-table"/>
-				<text/>
-			</element>
-			<element name="text:page-variable-set">
-				<ref name="text-set-page-variable-attlist"/>
-				<text/>
-			</element>
-			<element name="text:page-variable-get">
-				<ref name="text-get-page-variable-attlist"/>
-				<text/>
-			</element>
-			<element name="text:placeholder">
-				<ref name="text-placeholder-attlist"/>
-				<text/>
-			</element>
-			<element name="text:conditional-text">
-				<ref name="text-conditional-text-attlist"/>
-				<text/>
-			</element>
-			<element name="text:hidden-text">
-				<ref name="text-hidden-text-attlist"/>
-				<text/>
-			</element>
-			<element>
-				<choice>
-					<name>text:reference-ref</name>
-					<name>text:bookmark-ref</name>
-				</choice>
-				<interleave>
-					<ref name="text-common-ref-content"/>
-					<ref name="text-bookmark-ref-content"/>
-				</interleave>
-			</element>
-			<element name="text:note-ref">
-				<interleave>
-					<ref name="text-common-ref-content"/>
-					<ref name="text-note-ref-content"/>
-				</interleave>
-			</element>
-			<element name="text:sequence-ref">
-				<interleave>
-					<ref name="text-common-ref-content"/>
-					<ref name="text-sequence-ref-content"/>
-				</interleave>
-			</element>
-			<element name="text:script">
-				<interleave>
-					<choice>
-						<group>
-							<attribute name="xlink:type">
-								<value>simple</value>
-							</attribute>
-							<attribute name="xlink:href">
-								<ref name="anyIRI"/>
-							</attribute>
-						</group>
-						<text/>
-					</choice>
-					<optional>
-						<attribute name="script:language">
-							<ref name="string"/>
-						</attribute>
-					</optional>
-				</interleave>
-			</element>
-			<element name="text:execute-macro">
-				<optional>
-					<attribute name="text:name">
-						<ref name="string"/>
-					</attribute>
-				</optional>
-				<optional>
-					<ref name="office-event-listeners"/>
-				</optional>
-				<text/>
-			</element>
-			<element name="text:hidden-paragraph">
-				<ref name="text-hidden-paragraph-attlist"/>
-				<text/>
-			</element>
-			<element name="text:dde-connection">
-				<attribute name="text:connection-name">
-					<ref name="string"/>
-				</attribute>
-				<text/>
-			</element>
-			<element name="text:measure">
-				<attribute name="text:kind">
-					<choice>
-						<value>value</value>
-						<value>unit</value>
-						<value>gap</value>
-					</choice>
-				</attribute>
-				<text/>
-			</element>
-			<element name="text:table-formula">
-				<interleave>
-					<ref name="common-field-formula-attlist"/>
-					<ref name="common-field-display-value-formula-attlist"/>
-					<ref name="common-field-data-style-name-attlist"/>
-				</interleave>
-				<text/>
-			</element>
-			<element name="text:meta-field">
-				<ref name="text-meta-field-attlist"/>
-				<zeroOrMore>
-					<ref name="paragraph-content-or-hyperlink"/>
-				</zeroOrMore>
-			</element>
-			<element name="text:toc-mark-start">
-				<ref name="text-toc-mark-start-attrs"/>
-			</element>
-			<element name="text:toc-mark-end">
-				<ref name="text-id"/>
-			</element>
-			<element name="text:toc-mark">
-				<attribute name="text:string-value">
-					<ref name="string"/>
-				</attribute>
-				<ref name="text-outline-level"/>
-			</element>
-			<element name="text:user-index-mark-start">
-				<ref name="text-id"/>
-				<ref name="text-outline-level"/>
-				<ref name="text-index-name"/>
-			</element>
-			<element name="text:user-index-mark-end">
-				<ref name="text-id"/>
-			</element>
-			<element name="text:user-index-mark">
-				<attribute name="text:string-value">
-					<ref name="string"/>
-				</attribute>
-				<ref name="text-outline-level"/>
-				<ref name="text-index-name"/>
-			</element>
-			<element name="text:alphabetical-index-mark-start">
-				<ref name="text-id"/>
-				<ref name="text-alphabetical-index-mark-attrs"/>
-			</element>
-			<element name="text:alphabetical-index-mark-end">
-				<ref name="text-id"/>
-			</element>
-			<element name="text:alphabetical-index-mark">
-				<attribute name="text:string-value">
-					<ref name="string"/>
-				</attribute>
-				<ref name="text-alphabetical-index-mark-attrs"/>
-			</element>
-			<element name="text:bibliography-mark">
-				<attribute name="text:bibliography-type">
-					<ref name="text-bibliography-types"/>
-				</attribute>
-				<zeroOrMore>
-					<attribute>
-						<choice>
-							<name>text:identifier</name>
-							<name>text:address</name>
-							<name>text:annote</name>
-							<name>text:author</name>
-							<name>text:booktitle</name>
-							<name>text:chapter</name>
-							<name>text:edition</name>
-							<name>text:editor</name>
-							<name>text:howpublished</name>
-							<name>text:institution</name>
-							<name>text:journal</name>
-							<name>text:month</name>
-							<name>text:note</name>
-							<name>text:number</name>
-							<name>text:organizations</name>
-							<name>text:pages</name>
-							<name>text:publisher</name>
-							<name>text:school</name>
-							<name>text:series</name>
-							<name>text:title</name>
-							<name>text:report-type</name>
-							<name>text:volume</name>
-							<name>text:year</name>
-							<name>text:url</name>
-							<name>text:custom1</name>
-							<name>text:custom2</name>
-							<name>text:custom3</name>
-							<name>text:custom4</name>
-							<name>text:custom5</name>
-							<name>text:isbn</name>
-							<name>text:issn</name>
-						</choice>
-						<ref name="string"/>
-					</attribute>
-				</zeroOrMore>
-				<text/>
-			</element>
-			<element name="presentation:header">
-				<empty/>
-			</element>
-			<element name="presentation:footer">
-				<empty/>
-			</element>
-			<element name="presentation:date-time">
-				<empty/>
-			</element>
-		</choice>
-	</define>
-	<define name="text-tab-attr">
-		<optional>
-			<attribute name="text:tab-ref">
-				<ref name="nonNegativeInteger"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="text-a">
-		<element name="text:a">
-			<ref name="text-a-attlist"/>
-			<optional>
-				<ref name="office-event-listeners"/>
-			</optional>
-			<zeroOrMore>
-				<ref name="paragraph-content"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="text-a-attlist">
-		<interleave>
-			<optional>
-				<attribute name="office:name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="office:title">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<attribute name="xlink:type">
-				<value>simple</value>
-			</attribute>
-			<attribute name="xlink:href">
-				<ref name="anyIRI"/>
-			</attribute>
-			<optional>
-				<attribute name="xlink:actuate">
-					<value>onRequest</value>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="office:target-frame-name">
-					<ref name="targetFrameName"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="xlink:show">
-					<choice>
-						<value>new</value>
-						<value>replace</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:visited-style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="text-meta-attlist">
-		<interleave>
-			<optional>
-				<ref name="common-in-content-meta-attlist"/>
-			</optional>
-			<optional>
-				<ref name="xml-id"/>
-			</optional>
-		</interleave>
-	</define>
-	<define name="text-bookmark">
-		<element name="text:bookmark">
-			<ref name="text-bookmark-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="text-bookmark-start">
-		<element name="text:bookmark-start">
-			<ref name="text-bookmark-start-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="text-bookmark-end">
-		<element name="text:bookmark-end">
-			<ref name="text-bookmark-end-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="text-bookmark-attlist">
-		<interleave>
-			<attribute name="text:name">
-				<ref name="string"/>
-			</attribute>
-			<optional>
-				<ref name="xml-id"/>
-			</optional>
-		</interleave>
-	</define>
-	<define name="text-bookmark-start-attlist">
-		<interleave>
-			<attribute name="text:name">
-				<ref name="string"/>
-			</attribute>
-			<optional>
-				<ref name="xml-id"/>
-			</optional>
-			<optional>
-				<ref name="common-in-content-meta-attlist"/>
-			</optional>
-		</interleave>
-	</define>
-	<define name="text-bookmark-end-attlist">
-		<attribute name="text:name">
-			<ref name="string"/>
-		</attribute>
-	</define>
-	<define name="text-note-class">
-		<attribute name="text:note-class">
-			<choice>
-				<value>footnote</value>
-				<value>endnote</value>
-			</choice>
-		</attribute>
-	</define>
-	<define name="text-date-attlist">
-		<interleave>
-			<interleave>
-				<ref name="common-field-fixed-attlist"/>
-				<ref name="common-field-data-style-name-attlist"/>
-			</interleave>
-			<optional>
-				<attribute name="text:date-value">
-					<ref name="dateOrDateTime"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:date-adjust">
-					<ref name="duration"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="text-time-attlist">
-		<interleave>
-			<interleave>
-				<ref name="common-field-fixed-attlist"/>
-				<ref name="common-field-data-style-name-attlist"/>
-			</interleave>
-			<optional>
-				<attribute name="text:time-value">
-					<ref name="timeOrDateTime"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:time-adjust">
-					<ref name="duration"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="text-page-number-attlist">
-		<interleave>
-			<interleave>
-				<ref name="common-field-num-format-attlist"/>
-				<ref name="common-field-fixed-attlist"/>
-			</interleave>
-			<optional>
-				<attribute name="text:page-adjust">
-					<ref name="integer"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:select-page">
-					<choice>
-						<value>previous</value>
-						<value>current</value>
-						<value>next</value>
-					</choice>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="text-page-continuation-attlist">
-		<interleave>
-			<attribute name="text:select-page">
-				<choice>
-					<value>previous</value>
-					<value>next</value>
-				</choice>
-			</attribute>
-			<optional>
-				<attribute name="text:string-value">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="text-chapter-attlist">
-		<interleave>
-			<attribute name="text:display">
-				<choice>
-					<value>name</value>
-					<value>number</value>
-					<value>number-and-name</value>
-					<value>plain-number-and-name</value>
-					<value>plain-number</value>
-				</choice>
-			</attribute>
-			<attribute name="text:outline-level">
-				<ref name="nonNegativeInteger"/>
-			</attribute>
-		</interleave>
-	</define>
-	<define name="text-file-name-attlist">
-		<interleave>
-			<optional>
-				<attribute name="text:display">
-					<choice>
-						<value>full</value>
-						<value>path</value>
-						<value>name</value>
-						<value>name-and-extension</value>
-					</choice>
-				</attribute>
-			</optional>
-			<ref name="common-field-fixed-attlist"/>
-		</interleave>
-	</define>
-	<define name="text-template-name-attlist">
-		<optional>
-			<attribute name="text:display">
-				<choice>
-					<value>full</value>
-					<value>path</value>
-					<value>name</value>
-					<value>name-and-extension</value>
-					<value>area</value>
-					<value>title</value>
-				</choice>
-			</attribute>
-		</optional>
-	</define>
-	<define name="text-variable-decl">
-		<element name="text:variable-decl">
-			<ref name="common-field-name-attlist"/>
-			<ref name="common-value-type-attlist"/>
-		</element>
-	</define>
-	<define name="text-user-field-decl">
-		<element name="text:user-field-decl">
-			<ref name="common-field-name-attlist"/>
-			<optional>
-				<ref name="common-field-formula-attlist"/>
-			</optional>
-			<ref name="common-value-and-type-attlist"/>
-		</element>
-	</define>
-	<define name="text-sequence-decl">
-		<element name="text:sequence-decl">
-			<ref name="text-sequence-decl-attlist"/>
-		</element>
-	</define>
-	<define name="text-sequence-decl-attlist">
-		<interleave>
-			<ref name="common-field-name-attlist"/>
-			<attribute name="text:display-outline-level">
-				<ref name="nonNegativeInteger"/>
-			</attribute>
-			<optional>
-				<attribute name="text:separation-character">
-					<ref name="character"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="text-sequence-ref-name">
-		<optional>
-			<attribute name="text:ref-name">
-				<ref name="string"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-field-database-table">
-		<ref name="common-field-database-table-attlist"/>
-		<ref name="common-field-database-name"/>
-	</define>
-	<define name="common-field-database-name">
-		<choice>
-			<optional>
-				<attribute name="text:database-name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<ref name="form-connection-resource"/>
-		</choice>
-	</define>
-	<define name="common-field-database-table-attlist">
-		<interleave>
-			<attribute name="text:table-name">
-				<ref name="string"/>
-			</attribute>
-			<optional>
-				<attribute name="text:table-type">
-					<choice>
-						<value>table</value>
-						<value>query</value>
-						<value>command</value>
-					</choice>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="text-database-display-attlist">
-		<interleave>
-			<ref name="common-field-database-table"/>
-			<ref name="common-field-data-style-name-attlist"/>
-			<attribute name="text:column-name">
-				<ref name="string"/>
-			</attribute>
-		</interleave>
-	</define>
-	<define name="text-database-next-attlist">
-		<interleave>
-			<ref name="common-field-database-table"/>
-			<optional>
-				<attribute name="text:condition">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="text-database-row-select-attlist">
-		<interleave>
-			<ref name="common-field-database-table"/>
-			<optional>
-				<attribute name="text:condition">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:row-number">
-					<ref name="nonNegativeInteger"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="text-set-page-variable-attlist">
-		<interleave>
-			<optional>
-				<attribute name="text:active">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:page-adjust">
-					<ref name="integer"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="text-get-page-variable-attlist">
-		<ref name="common-field-num-format-attlist"/>
-	</define>
-	<define name="text-placeholder-attlist">
-		<interleave>
-			<attribute name="text:placeholder-type">
-				<choice>
-					<value>text</value>
-					<value>table</value>
-					<value>text-box</value>
-					<value>image</value>
-					<value>object</value>
-				</choice>
-			</attribute>
-			<ref name="common-field-description-attlist"/>
-		</interleave>
-	</define>
-	<define name="text-conditional-text-attlist">
-		<interleave>
-			<attribute name="text:condition">
-				<ref name="string"/>
-			</attribute>
-			<attribute name="text:string-value-if-true">
-				<ref name="string"/>
-			</attribute>
-			<attribute name="text:string-value-if-false">
-				<ref name="string"/>
-			</attribute>
-			<optional>
-				<attribute name="text:current-value">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="text-hidden-text-attlist">
-		<interleave>
-			<attribute name="text:condition">
-				<ref name="string"/>
-			</attribute>
-			<attribute name="text:string-value">
-				<ref name="string"/>
-			</attribute>
-			<optional>
-				<attribute name="text:is-hidden">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="text-common-ref-content">
-		<interleave>
-			<text/>
-			<optional>
-				<attribute name="text:ref-name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="text-bookmark-ref-content">
-		<optional>
-			<attribute name="text:reference-format">
-				<choice>
-					<ref name="common-ref-format-values"/>
-					<value>number-no-superior</value>
-					<value>number-all-superior</value>
-					<value>number</value>
-				</choice>
-			</attribute>
-		</optional>
-	</define>
-	<define name="text-note-ref-content">
-		<interleave>
-			<optional>
-				<attribute name="text:reference-format">
-					<choice>
-						<ref name="common-ref-format-values"/>
-					</choice>
-				</attribute>
-			</optional>
-			<ref name="text-note-class"/>
-		</interleave>
-	</define>
-	<define name="text-sequence-ref-content">
-		<optional>
-			<attribute name="text:reference-format">
-				<choice>
-					<ref name="common-ref-format-values"/>
-					<value>category-and-value</value>
-					<value>caption</value>
-					<value>value</value>
-				</choice>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-ref-format-values">
-		<choice>
-			<value>page</value>
-			<value>chapter</value>
-			<value>direction</value>
-			<value>text</value>
-		</choice>
-	</define>
-	<define name="text-hidden-paragraph-attlist">
-		<interleave>
-			<attribute name="text:condition">
-				<ref name="string"/>
-			</attribute>
-			<optional>
-				<attribute name="text:is-hidden">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="text-meta-field-attlist">
-		<interleave>
-			<ref name="xml-id"/>
-			<ref name="common-field-data-style-name-attlist"/>
-		</interleave>
-	</define>
-	<define name="common-value-type-attlist">
-		<attribute name="office:value-type">
-			<ref name="valueType"/>
-		</attribute>
-	</define>
-	<define name="common-value-and-type-attlist">
-		<choice>
-			<group>
-				<attribute name="office:value-type">
-					<value>float</value>
-				</attribute>
-				<attribute name="office:value">
-					<ref name="double"/>
-				</attribute>
-			</group>
-			<group>
-				<attribute name="office:value-type">
-					<value>percentage</value>
-				</attribute>
-				<attribute name="office:value">
-					<ref name="double"/>
-				</attribute>
-			</group>
-			<group>
-				<attribute name="office:value-type">
-					<value>currency</value>
-				</attribute>
-				<attribute name="office:value">
-					<ref name="double"/>
-				</attribute>
-				<optional>
-					<attribute name="office:currency">
-						<ref name="string"/>
-					</attribute>
-				</optional>
-			</group>
-			<group>
-				<attribute name="office:value-type">
-					<value>date</value>
-				</attribute>
-				<attribute name="office:date-value">
-					<ref name="dateOrDateTime"/>
-				</attribute>
-			</group>
-			<group>
-				<attribute name="office:value-type">
-					<value>time</value>
-				</attribute>
-				<attribute name="office:time-value">
-					<ref name="duration"/>
-				</attribute>
-			</group>
-			<group>
-				<attribute name="office:value-type">
-					<value>boolean</value>
-				</attribute>
-				<attribute name="office:boolean-value">
-					<ref name="boolean"/>
-				</attribute>
-			</group>
-			<group>
-				<attribute name="office:value-type">
-					<value>string</value>
-				</attribute>
-				<optional>
-					<attribute name="office:string-value">
-						<ref name="string"/>
-					</attribute>
-				</optional>
-			</group>
-		</choice>
-	</define>
-	<define name="common-field-fixed-attlist">
-		<optional>
-			<attribute name="text:fixed">
-				<ref name="boolean"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-field-name-attlist">
-		<attribute name="text:name">
-			<ref name="variableName"/>
-		</attribute>
-	</define>
-	<define name="common-field-description-attlist">
-		<optional>
-			<attribute name="text:description">
-				<ref name="string"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-field-display-value-none-attlist">
-		<optional>
-			<attribute name="text:display">
-				<choice>
-					<value>value</value>
-					<value>none</value>
-				</choice>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-field-display-value-formula-none-attlist">
-		<optional>
-			<attribute name="text:display">
-				<choice>
-					<value>value</value>
-					<value>formula</value>
-					<value>none</value>
-				</choice>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-field-display-value-formula-attlist">
-		<optional>
-			<attribute name="text:display">
-				<choice>
-					<value>value</value>
-					<value>formula</value>
-				</choice>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-field-formula-attlist">
-		<optional>
-			<attribute name="text:formula">
-				<ref name="string"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-field-data-style-name-attlist">
-		<optional>
-			<attribute name="style:data-style-name">
-				<ref name="styleNameRef"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-field-num-format-attlist">
-		<optional>
-			<ref name="common-num-format-attlist"/>
-		</optional>
-	</define>
-	<define name="text-toc-mark-start-attrs">
-		<ref name="text-id"/>
-		<ref name="text-outline-level"/>
-	</define>
-	<define name="text-outline-level">
-		<optional>
-			<attribute name="text:outline-level">
-				<ref name="positiveInteger"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="text-id">
-		<attribute name="text:id">
-			<ref name="string"/>
-		</attribute>
-	</define>
-	<define name="text-index-name">
-		<attribute name="text:index-name">
-			<ref name="string"/>
-		</attribute>
-	</define>
-	<define name="text-alphabetical-index-mark-attrs">
-		<interleave>
-			<optional>
-				<attribute name="text:key1">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:key2">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:string-value-phonetic">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:key1-phonetic">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:key2-phonetic">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:main-entry">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="text-bibliography-types">
-		<choice>
-			<value>article</value>
-			<value>book</value>
-			<value>booklet</value>
-			<value>conference</value>
-			<value>custom1</value>
-			<value>custom2</value>
-			<value>custom3</value>
-			<value>custom4</value>
-			<value>custom5</value>
-			<value>email</value>
-			<value>inbook</value>
-			<value>incollection</value>
-			<value>inproceedings</value>
-			<value>journal</value>
-			<value>manual</value>
-			<value>mastersthesis</value>
-			<value>misc</value>
-			<value>phdthesis</value>
-			<value>proceedings</value>
-			<value>techreport</value>
-			<value>unpublished</value>
-			<value>www</value>
-		</choice>
-	</define>
-	<define name="text-index-body">
-		<element name="text:index-body">
-			<zeroOrMore>
-				<ref name="index-content-main"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="index-content-main">
-		<choice>
-			<ref name="text-content"/>
-			<ref name="text-index-title"/>
-		</choice>
-	</define>
-	<define name="text-index-title">
-		<element name="text:index-title">
-			<ref name="common-section-attlist"/>
-			<zeroOrMore>
-				<ref name="index-content-main"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="text-table-of-content">
-		<element name="text:table-of-content">
-			<ref name="common-section-attlist"/>
-			<ref name="text-table-of-content-source"/>
-			<ref name="text-index-body"/>
-		</element>
-	</define>
-	<define name="text-table-of-content-source">
-		<element name="text:table-of-content-source">
-			<ref name="text-table-of-content-source-attlist"/>
-			<optional>
-				<ref name="text-index-title-template"/>
-			</optional>
-			<zeroOrMore>
-				<ref name="text-table-of-content-entry-template"/>
-			</zeroOrMore>
-			<zeroOrMore>
-				<ref name="text-index-source-styles"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="text-table-of-content-source-attlist">
-		<interleave>
-			<optional>
-				<attribute name="text:outline-level">
-					<ref name="positiveInteger"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:use-outline-level">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:use-index-marks">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:use-index-source-styles">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:index-scope">
-					<choice>
-						<value>document</value>
-						<value>chapter</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:relative-tab-stop-position">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="text-table-of-content-entry-template">
-		<element name="text:table-of-content-entry-template">
-			<ref name="text-table-of-content-entry-template-attlist"/>
-			<zeroOrMore>
-				<ref name="text-table-of-content-children"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="text-table-of-content-children">
-		<choice>
-			<ref name="text-index-entry-chapter"/>
-			<ref name="text-index-entry-page-number"/>
-			<ref name="text-index-entry-text"/>
-			<ref name="text-index-entry-span"/>
-			<ref name="text-index-entry-tab-stop"/>
-			<ref name="text-index-entry-link-start"/>
-			<ref name="text-index-entry-link-end"/>
-		</choice>
-	</define>
-	<define name="text-table-of-content-entry-template-attlist">
-		<interleave>
-			<attribute name="text:outline-level">
-				<ref name="positiveInteger"/>
-			</attribute>
-			<attribute name="text:style-name">
-				<ref name="styleNameRef"/>
-			</attribute>
-		</interleave>
-	</define>
-	<define name="text-illustration-index">
-		<element name="text:illustration-index">
-			<ref name="common-section-attlist"/>
-			<ref name="text-illustration-index-source"/>
-			<ref name="text-index-body"/>
-		</element>
-	</define>
-	<define name="text-illustration-index-source">
-		<element name="text:illustration-index-source">
-			<ref name="text-illustration-index-source-attrs"/>
-			<optional>
-				<ref name="text-index-title-template"/>
-			</optional>
-			<optional>
-				<ref name="text-illustration-index-entry-template"/>
-			</optional>
-		</element>
-	</define>
-	<define name="text-illustration-index-source-attrs">
-		<interleave>
-			<ref name="text-index-scope-attr"/>
-			<ref name="text-relative-tab-stop-position-attr"/>
-			<optional>
-				<attribute name="text:use-caption">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:caption-sequence-name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:caption-sequence-format">
-					<choice>
-						<value>text</value>
-						<value>category-and-value</value>
-						<value>caption</value>
-					</choice>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="text-index-scope-attr">
-		<optional>
-			<attribute name="text:index-scope">
-				<choice>
-					<value>document</value>
-					<value>chapter</value>
-				</choice>
-			</attribute>
-		</optional>
-	</define>
-	<define name="text-relative-tab-stop-position-attr">
-		<optional>
-			<attribute name="text:relative-tab-stop-position">
-				<ref name="boolean"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="text-illustration-index-entry-template">
-		<element name="text:illustration-index-entry-template">
-			<ref name="text-illustration-index-entry-content"/>
-		</element>
-	</define>
-	<define name="text-illustration-index-entry-content">
-		<ref name="text-illustration-index-entry-template-attrs"/>
-		<zeroOrMore>
-			<choice>
-				<ref name="text-index-entry-chapter"/>
-				<ref name="text-index-entry-page-number"/>
-				<ref name="text-index-entry-text"/>
-				<ref name="text-index-entry-span"/>
-				<ref name="text-index-entry-tab-stop"/>
-			</choice>
-		</zeroOrMore>
-	</define>
-	<define name="text-illustration-index-entry-template-attrs">
-		<attribute name="text:style-name">
-			<ref name="styleNameRef"/>
-		</attribute>
-	</define>
-	<define name="text-table-index">
-		<element name="text:table-index">
-			<ref name="common-section-attlist"/>
-			<ref name="text-table-index-source"/>
-			<ref name="text-index-body"/>
-		</element>
-	</define>
-	<define name="text-table-index-source">
-		<element name="text:table-index-source">
-			<ref name="text-illustration-index-source-attrs"/>
-			<optional>
-				<ref name="text-index-title-template"/>
-			</optional>
-			<optional>
-				<ref name="text-table-index-entry-template"/>
-			</optional>
-		</element>
-	</define>
-	<define name="text-table-index-entry-template">
-		<element name="text:table-index-entry-template">
-			<ref name="text-illustration-index-entry-content"/>
-		</element>
-	</define>
-	<define name="text-object-index">
-		<element name="text:object-index">
-			<ref name="common-section-attlist"/>
-			<ref name="text-object-index-source"/>
-			<ref name="text-index-body"/>
-		</element>
-	</define>
-	<define name="text-object-index-source">
-		<element name="text:object-index-source">
-			<ref name="text-object-index-source-attrs"/>
-			<optional>
-				<ref name="text-index-title-template"/>
-			</optional>
-			<optional>
-				<ref name="text-object-index-entry-template"/>
-			</optional>
-		</element>
-	</define>
-	<define name="text-object-index-source-attrs">
-		<interleave>
-			<ref name="text-index-scope-attr"/>
-			<ref name="text-relative-tab-stop-position-attr"/>
-			<optional>
-				<attribute name="text:use-spreadsheet-objects">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:use-math-objects">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:use-draw-objects">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:use-chart-objects">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:use-other-objects">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="text-object-index-entry-template">
-		<element name="text:object-index-entry-template">
-			<ref name="text-illustration-index-entry-content"/>
-		</element>
-	</define>
-	<define name="text-user-index">
-		<element name="text:user-index">
-			<ref name="common-section-attlist"/>
-			<ref name="text-user-index-source"/>
-			<ref name="text-index-body"/>
-		</element>
-	</define>
-	<define name="text-user-index-source">
-		<element name="text:user-index-source">
-			<ref name="text-user-index-source-attr"/>
-			<optional>
-				<ref name="text-index-title-template"/>
-			</optional>
-			<zeroOrMore>
-				<ref name="text-user-index-entry-template"/>
-			</zeroOrMore>
-			<zeroOrMore>
-				<ref name="text-index-source-styles"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="text-user-index-source-attr">
-		<interleave>
-			<ref name="text-index-scope-attr"/>
-			<ref name="text-relative-tab-stop-position-attr"/>
-			<optional>
-				<attribute name="text:use-index-marks">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:use-index-source-styles">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:use-graphics">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:use-tables">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:use-floating-frames">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:use-objects">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:copy-outline-levels">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<attribute name="text:index-name">
-				<ref name="string"/>
-			</attribute>
-		</interleave>
-	</define>
-	<define name="text-user-index-entry-template">
-		<element name="text:user-index-entry-template">
-			<ref name="text-user-index-entry-template-attrs"/>
-			<zeroOrMore>
-				<choice>
-					<ref name="text-index-entry-chapter"/>
-					<ref name="text-index-entry-page-number"/>
-					<ref name="text-index-entry-text"/>
-					<ref name="text-index-entry-span"/>
-					<ref name="text-index-entry-tab-stop"/>
-				</choice>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="text-user-index-entry-template-attrs">
-		<interleave>
-			<attribute name="text:outline-level">
-				<ref name="positiveInteger"/>
-			</attribute>
-			<attribute name="text:style-name">
-				<ref name="styleNameRef"/>
-			</attribute>
-		</interleave>
-	</define>
-	<define name="text-alphabetical-index">
-		<element name="text:alphabetical-index">
-			<ref name="common-section-attlist"/>
-			<ref name="text-alphabetical-index-source"/>
-			<ref name="text-index-body"/>
-		</element>
-	</define>
-	<define name="text-alphabetical-index-source">
-		<element name="text:alphabetical-index-source">
-			<ref name="text-alphabetical-index-source-attrs"/>
-			<optional>
-				<ref name="text-index-title-template"/>
-			</optional>
-			<zeroOrMore>
-				<ref name="text-alphabetical-index-entry-template"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="text-alphabetical-index-source-attrs">
-		<interleave>
-			<ref name="text-index-scope-attr"/>
-			<ref name="text-relative-tab-stop-position-attr"/>
-			<optional>
-				<attribute name="text:ignore-case">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:main-entry-style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:alphabetical-separators">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:combine-entries">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:combine-entries-with-dash">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:combine-entries-with-pp">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:use-keys-as-entries">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:capitalize-entries">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:comma-separated">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="fo:language">
-					<ref name="languageCode"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="fo:country">
-					<ref name="countryCode"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="fo:script">
-					<ref name="scriptCode"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:rfc-language-tag">
-					<ref name="language"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:sort-algorithm">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="text-alphabetical-index-auto-mark-file">
-		<element name="text:alphabetical-index-auto-mark-file">
-			<attribute name="xlink:type">
-				<value>simple</value>
-			</attribute>
-			<attribute name="xlink:href">
-				<ref name="anyIRI"/>
-			</attribute>
-		</element>
-	</define>
-	<define name="text-alphabetical-index-entry-template">
-		<element name="text:alphabetical-index-entry-template">
-			<ref name="text-alphabetical-index-entry-template-attrs"/>
-			<zeroOrMore>
-				<choice>
-					<ref name="text-index-entry-chapter"/>
-					<ref name="text-index-entry-page-number"/>
-					<ref name="text-index-entry-text"/>
-					<ref name="text-index-entry-span"/>
-					<ref name="text-index-entry-tab-stop"/>
-				</choice>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="text-alphabetical-index-entry-template-attrs">
-		<interleave>
-			<attribute name="text:outline-level">
-				<choice>
-					<value>1</value>
-					<value>2</value>
-					<value>3</value>
-					<value>separator</value>
-				</choice>
-			</attribute>
-			<attribute name="text:style-name">
-				<ref name="styleNameRef"/>
-			</attribute>
-		</interleave>
-	</define>
-	<define name="text-bibliography">
-		<element name="text:bibliography">
-			<ref name="common-section-attlist"/>
-			<ref name="text-bibliography-source"/>
-			<ref name="text-index-body"/>
-		</element>
-	</define>
-	<define name="text-bibliography-source">
-		<element name="text:bibliography-source">
-			<optional>
-				<ref name="text-index-title-template"/>
-			</optional>
-			<zeroOrMore>
-				<ref name="text-bibliography-entry-template"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="text-bibliography-entry-template">
-		<element name="text:bibliography-entry-template">
-			<ref name="text-bibliography-entry-template-attrs"/>
-			<zeroOrMore>
-				<choice>
-					<ref name="text-index-entry-span"/>
-					<ref name="text-index-entry-tab-stop"/>
-					<ref name="text-index-entry-bibliography"/>
-				</choice>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="text-bibliography-entry-template-attrs">
-		<interleave>
-			<attribute name="text:bibliography-type">
-				<ref name="text-bibliography-types"/>
-			</attribute>
-			<attribute name="text:style-name">
-				<ref name="styleNameRef"/>
-			</attribute>
-		</interleave>
-	</define>
-	<define name="text-index-source-styles">
-		<element name="text:index-source-styles">
-			<attribute name="text:outline-level">
-				<ref name="positiveInteger"/>
-			</attribute>
-			<zeroOrMore>
-				<ref name="text-index-source-style"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="text-index-source-style">
-		<element name="text:index-source-style">
-			<attribute name="text:style-name">
-				<ref name="styleName"/>
-			</attribute>
-			<empty/>
-		</element>
-	</define>
-	<define name="text-index-title-template">
-		<element name="text:index-title-template">
-			<optional>
-				<attribute name="text:style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<text/>
-		</element>
-	</define>
-	<define name="text-index-entry-chapter">
-		<element name="text:index-entry-chapter">
-			<optional>
-				<attribute name="text:style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<ref name="text-index-entry-chapter-attrs"/>
-		</element>
-	</define>
-	<define name="text-index-entry-chapter-attrs">
-		<interleave>
-			<optional>
-				<attribute name="text:display">
-					<choice>
-						<value>name</value>
-						<value>number</value>
-						<value>number-and-name</value>
-						<value>plain-number</value>
-						<value>plain-number-and-name</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:outline-level">
-					<ref name="positiveInteger"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="text-index-entry-text">
-		<element name="text:index-entry-text">
-			<optional>
-				<attribute name="text:style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-		</element>
-	</define>
-	<define name="text-index-entry-page-number">
-		<element name="text:index-entry-page-number">
-			<optional>
-				<attribute name="text:style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-		</element>
-	</define>
-	<define name="text-index-entry-span">
-		<element name="text:index-entry-span">
-			<optional>
-				<attribute name="text:style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<text/>
-		</element>
-	</define>
-	<define name="text-index-entry-bibliography">
-		<element name="text:index-entry-bibliography">
-			<ref name="text-index-entry-bibliography-attrs"/>
-		</element>
-	</define>
-	<define name="text-index-entry-bibliography-attrs">
-		<interleave>
-			<optional>
-				<attribute name="text:style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<attribute name="text:bibliography-data-field">
-				<choice>
-					<value>address</value>
-					<value>annote</value>
-					<value>author</value>
-					<value>bibliography-type</value>
-					<value>booktitle</value>
-					<value>chapter</value>
-					<value>custom1</value>
-					<value>custom2</value>
-					<value>custom3</value>
-					<value>custom4</value>
-					<value>custom5</value>
-					<value>edition</value>
-					<value>editor</value>
-					<value>howpublished</value>
-					<value>identifier</value>
-					<value>institution</value>
-					<value>isbn</value>
-					<value>issn</value>
-					<value>journal</value>
-					<value>month</value>
-					<value>note</value>
-					<value>number</value>
-					<value>organizations</value>
-					<value>pages</value>
-					<value>publisher</value>
-					<value>report-type</value>
-					<value>school</value>
-					<value>series</value>
-					<value>title</value>
-					<value>url</value>
-					<value>volume</value>
-					<value>year</value>
-				</choice>
-			</attribute>
-		</interleave>
-	</define>
-	<define name="text-index-entry-tab-stop">
-		<element name="text:index-entry-tab-stop">
-			<optional>
-				<attribute name="text:style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<ref name="text-index-entry-tab-stop-attrs"/>
-		</element>
-	</define>
-	<define name="text-index-entry-tab-stop-attrs">
-		<interleave>
-			<optional>
-				<attribute name="style:leader-char">
-					<ref name="character"/>
-				</attribute>
-			</optional>
-			<choice>
-				<attribute name="style:type">
-					<value>right</value>
-				</attribute>
-				<group>
-					<attribute name="style:type">
-						<value>left</value>
-					</attribute>
-					<attribute name="style:position">
-						<ref name="length"/>
-					</attribute>
-				</group>
-			</choice>
-		</interleave>
-	</define>
-	<define name="text-index-entry-link-start">
-		<element name="text:index-entry-link-start">
-			<optional>
-				<attribute name="text:style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-		</element>
-	</define>
-	<define name="text-index-entry-link-end">
-		<element name="text:index-entry-link-end">
-			<optional>
-				<attribute name="text:style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-		</element>
-	</define>
-	<define name="table-table">
-		<element name="table:table">
-			<ref name="table-table-attlist"/>
-			<optional>
-				<ref name="table-title"/>
-			</optional>
-			<optional>
-				<ref name="table-desc"/>
-			</optional>
-			<optional>
-				<ref name="table-table-source"/>
-			</optional>
-			<optional>
-				<ref name="office-dde-source"/>
-			</optional>
-			<optional>
-				<ref name="table-scenario"/>
-			</optional>
-			<optional>
-				<ref name="office-forms"/>
-			</optional>
-			<optional>
-				<ref name="table-shapes"/>
-			</optional>
-			<ref name="table-columns-and-groups"/>
-			<ref name="table-rows-and-groups"/>
-			<optional>
-				<ref name="table-named-expressions"/>
-			</optional>
-		</element>
-	</define>
-	<define name="table-columns-and-groups">
-		<oneOrMore>
-			<choice>
-				<ref name="table-table-column-group"/>
-				<ref name="table-columns-no-group"/>
-			</choice>
-		</oneOrMore>
-	</define>
-	<define name="table-columns-no-group">
-		<choice>
-			<group>
-				<ref name="table-columns"/>
-				<optional>
-					<ref name="table-table-header-columns"/>
-					<optional>
-						<ref name="table-columns"/>
-					</optional>
-				</optional>
-			</group>
-			<group>
-				<ref name="table-table-header-columns"/>
-				<optional>
-					<ref name="table-columns"/>
-				</optional>
-			</group>
-		</choice>
-	</define>
-	<define name="table-columns">
-		<choice>
-			<ref name="table-table-columns"/>
-			<oneOrMore>
-				<ref name="table-table-column"/>
-			</oneOrMore>
-		</choice>
-	</define>
-	<define name="table-rows-and-groups">
-		<oneOrMore>
-			<choice>
-				<ref name="table-table-row-group"/>
-				<ref name="table-rows-no-group"/>
-			</choice>
-		</oneOrMore>
-	</define>
-	<define name="table-rows-no-group">
-		<choice>
-			<group>
-				<ref name="table-rows"/>
-				<optional>
-					<ref name="table-table-header-rows"/>
-					<optional>
-						<ref name="table-rows"/>
-					</optional>
-				</optional>
-			</group>
-			<group>
-				<ref name="table-table-header-rows"/>
-				<optional>
-					<ref name="table-rows"/>
-				</optional>
-			</group>
-		</choice>
-	</define>
-	<define name="table-rows">
-		<choice>
-			<ref name="table-table-rows"/>
-			<oneOrMore>
-				<optional>
-					<ref name="text-soft-page-break"/>
-				</optional>
-				<ref name="table-table-row"/>
-			</oneOrMore>
-		</choice>
-	</define>
-	<define name="table-table-attlist">
-		<interleave>
-			<optional>
-				<attribute name="table:name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:template-name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:use-first-row-styles">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:use-last-row-styles">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:use-first-column-styles">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:use-last-column-styles">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:use-banding-rows-styles">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:use-banding-columns-styles">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:protected">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:protection-key">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:protection-key-digest-algorithm">
-					<ref name="anyIRI"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:print">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:print-ranges">
-					<ref name="cellRangeAddressList"/>
-				</attribute>
-			</optional>
-			<optional>
-				<ref name="xml-id"/>
-			</optional>
-			<optional>
-				<attribute name="table:is-sub-table">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="table-title">
-		<element name="table:title">
-			<text/>
-		</element>
-	</define>
-	<define name="table-desc">
-		<element name="table:desc">
-			<text/>
-		</element>
-	</define>
-	<define name="table-table-row">
-		<element name="table:table-row">
-			<ref name="table-table-row-attlist"/>
-			<oneOrMore>
-				<choice>
-					<ref name="table-table-cell"/>
-					<ref name="table-covered-table-cell"/>
-				</choice>
-			</oneOrMore>
-		</element>
-	</define>
-	<define name="table-table-row-attlist">
-		<interleave>
-			<optional>
-				<attribute name="table:number-rows-repeated">
-					<ref name="positiveInteger"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:default-cell-style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:visibility">
-					<ref name="table-visibility-value"/>
-				</attribute>
-			</optional>
-			<optional>
-				<ref name="xml-id"/>
-			</optional>
-		</interleave>
-	</define>
-	<define name="table-visibility-value">
-		<choice>
-			<value>visible</value>
-			<value>collapse</value>
-			<value>filter</value>
-		</choice>
-	</define>
-	<define name="table-table-cell">
-		<element name="table:table-cell">
-			<ref name="table-table-cell-attlist"/>
-			<ref name="table-table-cell-attlist-extra"/>
-			<ref name="table-table-cell-content"/>
-		</element>
-	</define>
-	<define name="table-covered-table-cell">
-		<element name="table:covered-table-cell">
-			<ref name="table-table-cell-attlist"/>
-			<ref name="table-table-cell-content"/>
-		</element>
-	</define>
-	<define name="table-table-cell-content">
-		<optional>
-			<ref name="table-cell-range-source"/>
-		</optional>
-		<optional>
-			<ref name="office-annotation"/>
-		</optional>
-		<optional>
-			<ref name="table-detective"/>
-		</optional>
-		<zeroOrMore>
-			<ref name="text-content"/>
-		</zeroOrMore>
-	</define>
-	<define name="table-table-cell-attlist">
-		<interleave>
-			<optional>
-				<attribute name="table:number-columns-repeated">
-					<ref name="positiveInteger"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:content-validation-name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:formula">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<ref name="common-value-and-type-attlist"/>
-			</optional>
-			<optional>
-				<attribute name="table:protect">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:protected">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<ref name="xml-id"/>
-			</optional>
-			<optional>
-				<ref name="common-in-content-meta-attlist"/>
-			</optional>
-		</interleave>
-	</define>
-	<define name="table-table-cell-attlist-extra">
-		<interleave>
-			<optional>
-				<attribute name="table:number-columns-spanned">
-					<ref name="positiveInteger"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:number-rows-spanned">
-					<ref name="positiveInteger"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:number-matrix-columns-spanned">
-					<ref name="positiveInteger"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:number-matrix-rows-spanned">
-					<ref name="positiveInteger"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="table-table-column">
-		<element name="table:table-column">
-			<ref name="table-table-column-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="table-table-column-attlist">
-		<interleave>
-			<optional>
-				<attribute name="table:number-columns-repeated">
-					<ref name="positiveInteger"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:visibility">
-					<ref name="table-visibility-value"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:default-cell-style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<optional>
-				<ref name="xml-id"/>
-			</optional>
-		</interleave>
-	</define>
-	<define name="table-table-header-columns">
-		<element name="table:table-header-columns">
-			<oneOrMore>
-				<ref name="table-table-column"/>
-			</oneOrMore>
-		</element>
-	</define>
-	<define name="table-table-columns">
-		<element name="table:table-columns">
-			<oneOrMore>
-				<ref name="table-table-column"/>
-			</oneOrMore>
-		</element>
-	</define>
-	<define name="table-table-column-group">
-		<element name="table:table-column-group">
-			<ref name="table-table-column-group-attlist"/>
-			<ref name="table-columns-and-groups"/>
-		</element>
-	</define>
-	<define name="table-table-column-group-attlist">
-		<optional>
-			<attribute name="table:display">
-				<ref name="boolean"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="table-table-header-rows">
-		<element name="table:table-header-rows">
-			<oneOrMore>
-				<optional>
-					<ref name="text-soft-page-break"/>
-				</optional>
-				<ref name="table-table-row"/>
-			</oneOrMore>
-		</element>
-	</define>
-	<define name="table-table-rows">
-		<element name="table:table-rows">
-			<oneOrMore>
-				<optional>
-					<ref name="text-soft-page-break"/>
-				</optional>
-				<ref name="table-table-row"/>
-			</oneOrMore>
-		</element>
-	</define>
-	<define name="table-table-row-group">
-		<element name="table:table-row-group">
-			<ref name="table-table-row-group-attlist"/>
-			<ref name="table-rows-and-groups"/>
-		</element>
-	</define>
-	<define name="table-table-row-group-attlist">
-		<optional>
-			<attribute name="table:display">
-				<ref name="boolean"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="cellAddress">
-		<data type="string">
-			<param name="pattern">($?([^\. ']+|'([^']|'')+'))?\.$?[A-Z]+$?[0-9]+</param>
-		</data>
-	</define>
-	<define name="cellRangeAddress">
-		<choice>
-			<data type="string">
-				<param name="pattern">($?([^\. ']+|'([^']|'')+'))?\.$?[A-Z]+$?[0-9]+(:($?([^\. ']+|'([^']|'')+'))?\.$?[A-Z]+$?[0-9]+)?</param>
-			</data>
-			<data type="string">
-				<param name="pattern">($?([^\. ']+|'([^']|'')+'))?\.$?[0-9]+:($?([^\. ']+|'([^']|'')+'))?\.$?[0-9]+</param>
-			</data>
-			<data type="string">
-				<param name="pattern">($?([^\. ']+|'([^']|'')+'))?\.$?[A-Z]+:($?([^\. ']+|'([^']|'')+'))?\.$?[A-Z]+</param>
-			</data>
-		</choice>
-	</define>
-	<define name="cellRangeAddressList">
-		<data type="string"/>
-		<dc:description>Value is a space separated list of "cellRangeAddress" patterns</dc:description>
-	</define>
-	<define name="table-table-source">
-		<element name="table:table-source">
-			<ref name="table-table-source-attlist"/>
-			<ref name="table-linked-source-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="table-table-source-attlist">
-		<interleave>
-			<optional>
-				<attribute name="table:mode">
-					<choice>
-						<value>copy-all</value>
-						<value>copy-results-only</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:table-name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="table-linked-source-attlist">
-		<interleave>
-			<attribute name="xlink:type">
-				<value>simple</value>
-			</attribute>
-			<attribute name="xlink:href">
-				<ref name="anyIRI"/>
-			</attribute>
-			<optional>
-				<attribute name="xlink:actuate">
-					<value>onRequest</value>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:filter-name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:filter-options">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:refresh-delay">
-					<ref name="duration"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="table-scenario">
-		<element name="table:scenario">
-			<ref name="table-scenario-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="table-scenario-attlist">
-		<interleave>
-			<attribute name="table:scenario-ranges">
-				<ref name="cellRangeAddressList"/>
-			</attribute>
-			<attribute name="table:is-active">
-				<ref name="boolean"/>
-			</attribute>
-			<optional>
-				<attribute name="table:display-border">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:border-color">
-					<ref name="color"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:copy-back">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:copy-styles">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:copy-formulas">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:comment">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:protected">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="table-shapes">
-		<element name="table:shapes">
-			<oneOrMore>
-				<ref name="shape"/>
-			</oneOrMore>
-		</element>
-	</define>
-	<define name="table-cell-range-source">
-		<element name="table:cell-range-source">
-			<ref name="table-table-cell-range-source-attlist"/>
-			<ref name="table-linked-source-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="table-table-cell-range-source-attlist">
-		<interleave>
-			<attribute name="table:name">
-				<ref name="string"/>
-			</attribute>
-			<attribute name="table:last-column-spanned">
-				<ref name="positiveInteger"/>
-			</attribute>
-			<attribute name="table:last-row-spanned">
-				<ref name="positiveInteger"/>
-			</attribute>
-		</interleave>
-	</define>
-	<define name="table-detective">
-		<element name="table:detective">
-			<zeroOrMore>
-				<ref name="table-highlighted-range"/>
-			</zeroOrMore>
-			<zeroOrMore>
-				<ref name="table-operation"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="table-operation">
-		<element name="table:operation">
-			<ref name="table-operation-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="table-operation-attlist">
-		<interleave>
-			<attribute name="table:name">
-				<choice>
-					<value>trace-dependents</value>
-					<value>remove-dependents</value>
-					<value>trace-precedents</value>
-					<value>remove-precedents</value>
-					<value>trace-errors</value>
-				</choice>
-			</attribute>
-			<attribute name="table:index">
-				<ref name="nonNegativeInteger"/>
-			</attribute>
-		</interleave>
-	</define>
-	<define name="table-highlighted-range">
-		<element name="table:highlighted-range">
-			<choice>
-				<group>
-					<ref name="table-highlighted-range-attlist"/>
-				</group>
-				<group>
-					<ref name="table-highlighted-range-attlist-invalid"/>
-				</group>
-			</choice>
-			<empty/>
-		</element>
-	</define>
-	<define name="table-highlighted-range-attlist">
-		<interleave>
-			<optional>
-				<attribute name="table:cell-range-address">
-					<ref name="cellRangeAddress"/>
-				</attribute>
-			</optional>
-			<attribute name="table:direction">
-				<choice>
-					<value>from-another-table</value>
-					<value>to-another-table</value>
-					<value>from-same-table</value>
-				</choice>
-			</attribute>
-			<optional>
-				<attribute name="table:contains-error">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="table-highlighted-range-attlist-invalid">
-		<attribute name="table:marked-invalid">
-			<ref name="boolean"/>
-		</attribute>
-	</define>
-	<define name="office-spreadsheet-attlist">
-		<optional>
-			<attribute name="table:structure-protected">
-				<ref name="boolean"/>
-			</attribute>
-		</optional>
-		<optional>
-			<attribute name="table:protection-key">
-				<ref name="string"/>
-			</attribute>
-		</optional>
-		<optional>
-			<attribute name="table:protection-key-digest-algorithm">
-				<ref name="anyIRI"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="table-calculation-settings">
-		<element name="table:calculation-settings">
-			<ref name="table-calculation-setting-attlist"/>
-			<optional>
-				<ref name="table-null-date"/>
-			</optional>
-			<optional>
-				<ref name="table-iteration"/>
-			</optional>
-		</element>
-	</define>
-	<define name="table-calculation-setting-attlist">
-		<interleave>
-			<optional>
-				<attribute name="table:case-sensitive">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:precision-as-shown">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:search-criteria-must-apply-to-whole-cell">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:automatic-find-labels">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:use-regular-expressions">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:use-wildcards">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:null-year">
-					<ref name="positiveInteger"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="table-null-date">
-		<element name="table:null-date">
-			<optional>
-				<attribute name="table:value-type">
-					<value>date</value>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:date-value">
-					<ref name="date"/>
-				</attribute>
-			</optional>
-			<empty/>
-		</element>
-	</define>
-	<define name="table-iteration">
-		<element name="table:iteration">
-			<optional>
-				<attribute name="table:status">
-					<choice>
-						<value>enable</value>
-						<value>disable</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:steps">
-					<ref name="positiveInteger"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:maximum-difference">
-					<ref name="double"/>
-				</attribute>
-			</optional>
-			<empty/>
-		</element>
-	</define>
-	<define name="table-content-validations">
-		<element name="table:content-validations">
-			<oneOrMore>
-				<ref name="table-content-validation"/>
-			</oneOrMore>
-		</element>
-	</define>
-	<define name="table-content-validation">
-		<element name="table:content-validation">
-			<ref name="table-validation-attlist"/>
-			<optional>
-				<ref name="table-help-message"/>
-			</optional>
-			<optional>
-				<choice>
-					<ref name="table-error-message"/>
-					<group>
-						<ref name="table-error-macro"/>
-						<ref name="office-event-listeners"/>
-					</group>
-				</choice>
-			</optional>
-		</element>
-	</define>
-	<define name="table-validation-attlist">
-		<interleave>
-			<attribute name="table:name">
-				<ref name="string"/>
-			</attribute>
-			<optional>
-				<attribute name="table:condition">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:base-cell-address">
-					<ref name="cellAddress"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:allow-empty-cell">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:display-list">
-					<choice>
-						<value>none</value>
-						<value>unsorted</value>
-						<value>sort-ascending</value>
-					</choice>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="table-help-message">
-		<element name="table:help-message">
-			<optional>
-				<attribute name="table:title">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:display">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<zeroOrMore>
-				<ref name="text-p"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="table-error-message">
-		<element name="table:error-message">
-			<optional>
-				<attribute name="table:title">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:display">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:message-type">
-					<choice>
-						<value>stop</value>
-						<value>warning</value>
-						<value>information</value>
-					</choice>
-				</attribute>
-			</optional>
-			<zeroOrMore>
-				<ref name="text-p"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="table-error-macro">
-		<element name="table:error-macro">
-			<optional>
-				<attribute name="table:execute">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-		</element>
-	</define>
-	<define name="table-label-ranges">
-		<element name="table:label-ranges">
-			<zeroOrMore>
-				<ref name="table-label-range"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="table-label-range">
-		<element name="table:label-range">
-			<ref name="table-label-range-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="table-label-range-attlist">
-		<interleave>
-			<attribute name="table:label-cell-range-address">
-				<ref name="cellRangeAddress"/>
-			</attribute>
-			<attribute name="table:data-cell-range-address">
-				<ref name="cellRangeAddress"/>
-			</attribute>
-			<attribute name="table:orientation">
-				<choice>
-					<value>column</value>
-					<value>row</value>
-				</choice>
-			</attribute>
-		</interleave>
-	</define>
-	<define name="table-named-expressions">
-		<element name="table:named-expressions">
-			<zeroOrMore>
-				<choice>
-					<ref name="table-named-range"/>
-					<ref name="table-named-expression"/>
-				</choice>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="table-named-range">
-		<element name="table:named-range">
-			<ref name="table-named-range-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="table-named-range-attlist">
-		<attribute name="table:name">
-			<ref name="string"/>
-		</attribute>
-		<attribute name="table:cell-range-address">
-			<ref name="cellRangeAddress"/>
-		</attribute>
-		<optional>
-			<attribute name="table:base-cell-address">
-				<ref name="cellAddress"/>
-			</attribute>
-		</optional>
-		<optional>
-			<attribute name="table:range-usable-as">
-				<choice>
-					<value>none</value>
-					<list>
-						<oneOrMore>
-							<choice>
-								<value>print-range</value>
-								<value>filter</value>
-								<value>repeat-row</value>
-								<value>repeat-column</value>
-							</choice>
-						</oneOrMore>
-					</list>
-				</choice>
-			</attribute>
-		</optional>
-	</define>
-	<define name="table-named-expression">
-		<element name="table:named-expression">
-			<ref name="table-named-expression-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="table-named-expression-attlist">
-		<attribute name="table:name">
-			<ref name="string"/>
-		</attribute>
-		<attribute name="table:expression">
-			<ref name="string"/>
-		</attribute>
-		<optional>
-			<attribute name="table:base-cell-address">
-				<ref name="cellAddress"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="table-database-ranges">
-		<element name="table:database-ranges">
-			<zeroOrMore>
-				<ref name="table-database-range"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="table-database-range">
-		<element name="table:database-range">
-			<ref name="table-database-range-attlist"/>
-			<optional>
-				<choice>
-					<ref name="table-database-source-sql"/>
-					<ref name="table-database-source-table"/>
-					<ref name="table-database-source-query"/>
-				</choice>
-			</optional>
-			<optional>
-				<ref name="table-filter"/>
-			</optional>
-			<optional>
-				<ref name="table-sort"/>
-			</optional>
-			<optional>
-				<ref name="table-subtotal-rules"/>
-			</optional>
-		</element>
-	</define>
-	<define name="table-database-range-attlist">
-		<interleave>
-			<optional>
-				<attribute name="table:name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:is-selection">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:on-update-keep-styles">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:on-update-keep-size">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:has-persistent-data">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:orientation">
-					<choice>
-						<value>column</value>
-						<value>row</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:contains-header">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:display-filter-buttons">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<attribute name="table:target-range-address">
-				<ref name="cellRangeAddress"/>
-			</attribute>
-			<optional>
-				<attribute name="table:refresh-delay">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="table-database-source-sql">
-		<element name="table:database-source-sql">
-			<ref name="table-database-source-sql-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="table-database-source-sql-attlist">
-		<interleave>
-			<attribute name="table:database-name">
-				<ref name="string"/>
-			</attribute>
-			<attribute name="table:sql-statement">
-				<ref name="string"/>
-			</attribute>
-			<optional>
-				<attribute name="table:parse-sql-statement">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="table-database-source-query">
-		<element name="table:database-source-table">
-			<ref name="table-database-source-table-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="table-database-source-table-attlist">
-		<interleave>
-			<attribute name="table:database-name">
-				<ref name="string"/>
-			</attribute>
-			<attribute name="table:database-table-name">
-				<ref name="string"/>
-			</attribute>
-		</interleave>
-	</define>
-	<define name="table-database-source-table">
-		<element name="table:database-source-query">
-			<ref name="table-database-source-query-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="table-database-source-query-attlist">
-		<interleave>
-			<attribute name="table:database-name">
-				<ref name="string"/>
-			</attribute>
-			<attribute name="table:query-name">
-				<ref name="string"/>
-			</attribute>
-		</interleave>
-	</define>
-	<define name="table-sort">
-		<element name="table:sort">
-			<ref name="table-sort-attlist"/>
-			<oneOrMore>
-				<ref name="table-sort-by"/>
-			</oneOrMore>
-		</element>
-	</define>
-	<define name="table-sort-attlist">
-		<interleave>
-			<optional>
-				<attribute name="table:bind-styles-to-content">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:target-range-address">
-					<ref name="cellRangeAddress"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:case-sensitive">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:language">
-					<ref name="languageCode"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:country">
-					<ref name="countryCode"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:script">
-					<ref name="scriptCode"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:rfc-language-tag">
-					<ref name="language"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:algorithm">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:embedded-number-behavior">
-					<choice>
-						<value>alpha-numeric</value>
-						<value>integer</value>
-						<value>double</value>
-					</choice>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="table-sort-by">
-		<element name="table:sort-by">
-			<ref name="table-sort-by-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="table-sort-by-attlist">
-		<interleave>
-			<attribute name="table:field-number">
-				<ref name="nonNegativeInteger"/>
-			</attribute>
-			<optional>
-				<attribute name="table:data-type">
-					<choice>
-						<value>text</value>
-						<value>number</value>
-						<value>automatic</value>
-						<ref name="string"/>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:order">
-					<choice>
-						<value>ascending</value>
-						<value>descending</value>
-					</choice>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="table-subtotal-rules">
-		<element name="table:subtotal-rules">
-			<ref name="table-subtotal-rules-attlist"/>
-			<optional>
-				<ref name="table-sort-groups"/>
-			</optional>
-			<zeroOrMore>
-				<ref name="table-subtotal-rule"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="table-subtotal-rules-attlist">
-		<interleave>
-			<optional>
-				<attribute name="table:bind-styles-to-content">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:case-sensitive">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:page-breaks-on-group-change">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="table-sort-groups">
-		<element name="table:sort-groups">
-			<ref name="table-sort-groups-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="table-sort-groups-attlist">
-		<interleave>
-			<optional>
-				<attribute name="table:data-type">
-					<choice>
-						<value>text</value>
-						<value>number</value>
-						<value>automatic</value>
-						<ref name="string"/>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:order">
-					<choice>
-						<value>ascending</value>
-						<value>descending</value>
-					</choice>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="table-subtotal-rule">
-		<element name="table:subtotal-rule">
-			<ref name="table-subtotal-rule-attlist"/>
-			<zeroOrMore>
-				<ref name="table-subtotal-field"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="table-subtotal-rule-attlist">
-		<attribute name="table:group-by-field-number">
-			<ref name="nonNegativeInteger"/>
-		</attribute>
-	</define>
-	<define name="table-subtotal-field">
-		<element name="table:subtotal-field">
-			<ref name="table-subtotal-field-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="table-subtotal-field-attlist">
-		<interleave>
-			<attribute name="table:field-number">
-				<ref name="nonNegativeInteger"/>
-			</attribute>
-			<attribute name="table:function">
-				<choice>
-					<value>average</value>
-					<value>count</value>
-					<value>countnums</value>
-					<value>max</value>
-					<value>min</value>
-					<value>product</value>
-					<value>stdev</value>
-					<value>stdevp</value>
-					<value>sum</value>
-					<value>var</value>
-					<value>varp</value>
-					<ref name="string"/>
-				</choice>
-			</attribute>
-		</interleave>
-	</define>
-	<define name="table-filter">
-		<element name="table:filter">
-			<ref name="table-filter-attlist"/>
-			<choice>
-				<ref name="table-filter-condition"/>
-				<ref name="table-filter-and"/>
-				<ref name="table-filter-or"/>
-			</choice>
-		</element>
-	</define>
-	<define name="table-filter-attlist">
-		<interleave>
-			<optional>
-				<attribute name="table:target-range-address">
-					<ref name="cellRangeAddress"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:condition-source">
-					<choice>
-						<value>self</value>
-						<value>cell-range</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:condition-source-range-address">
-					<ref name="cellRangeAddress"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:display-duplicates">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="table-filter-and">
-		<element name="table:filter-and">
-			<oneOrMore>
-				<choice>
-					<ref name="table-filter-or"/>
-					<ref name="table-filter-condition"/>
-				</choice>
-			</oneOrMore>
-		</element>
-	</define>
-	<define name="table-filter-or">
-		<element name="table:filter-or">
-			<oneOrMore>
-				<choice>
-					<ref name="table-filter-and"/>
-					<ref name="table-filter-condition"/>
-				</choice>
-			</oneOrMore>
-		</element>
-	</define>
-	<define name="table-filter-condition">
-		<element name="table:filter-condition">
-			<ref name="table-filter-condition-attlist"/>
-			<zeroOrMore>
-				<ref name="table-filter-set-item"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="table-filter-condition-attlist">
-		<interleave>
-			<attribute name="table:field-number">
-				<ref name="nonNegativeInteger"/>
-			</attribute>
-			<attribute name="table:value">
-				<choice>
-					<ref name="string"/>
-					<ref name="double"/>
-				</choice>
-			</attribute>
-			<attribute name="table:operator">
-				<ref name="string"/>
-			</attribute>
-			<optional>
-				<attribute name="table:case-sensitive">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:data-type">
-					<choice>
-						<value>text</value>
-						<value>number</value>
-					</choice>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="table-filter-set-item">
-		<element name="table:filter-set-item">
-			<attribute name="table:value">
-				<ref name="string"/>
-			</attribute>
-			<empty/>
-		</element>
-	</define>
-	<define name="table-data-pilot-tables">
-		<element name="table:data-pilot-tables">
-			<zeroOrMore>
-				<ref name="table-data-pilot-table"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="table-data-pilot-table">
-		<element name="table:data-pilot-table">
-			<ref name="table-data-pilot-table-attlist"/>
-			<optional>
-				<choice>
-					<ref name="table-database-source-sql"/>
-					<ref name="table-database-source-table"/>
-					<ref name="table-database-source-query"/>
-					<ref name="table-source-service"/>
-					<ref name="table-source-cell-range"/>
-				</choice>
-			</optional>
-			<oneOrMore>
-				<ref name="table-data-pilot-field"/>
-			</oneOrMore>
-		</element>
-	</define>
-	<define name="table-data-pilot-table-attlist">
-		<interleave>
-			<attribute name="table:name">
-				<ref name="string"/>
-			</attribute>
-			<optional>
-				<attribute name="table:application-data">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:grand-total">
-					<choice>
-						<value>none</value>
-						<value>row</value>
-						<value>column</value>
-						<value>both</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:ignore-empty-rows">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:identify-categories">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<attribute name="table:target-range-address">
-				<ref name="cellRangeAddress"/>
-			</attribute>
-			<optional>
-				<attribute name="table:buttons">
-					<ref name="cellRangeAddressList"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:show-filter-button">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:drill-down-on-double-click">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="table-source-cell-range">
-		<element name="table:source-cell-range">
-			<ref name="table-source-cell-range-attlist"/>
-			<optional>
-				<ref name="table-filter"/>
-			</optional>
-		</element>
-	</define>
-	<define name="table-source-cell-range-attlist">
-		<attribute name="table:cell-range-address">
-			<ref name="cellRangeAddress"/>
-		</attribute>
-	</define>
-	<define name="table-source-service">
-		<element name="table:source-service">
-			<ref name="table-source-service-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="table-source-service-attlist">
-		<interleave>
-			<attribute name="table:name">
-				<ref name="string"/>
-			</attribute>
-			<attribute name="table:source-name">
-				<ref name="string"/>
-			</attribute>
-			<attribute name="table:object-name">
-				<ref name="string"/>
-			</attribute>
-			<optional>
-				<attribute name="table:user-name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:password">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="table-data-pilot-field">
-		<element name="table:data-pilot-field">
-			<ref name="table-data-pilot-field-attlist"/>
-			<optional>
-				<ref name="table-data-pilot-level"/>
-			</optional>
-			<optional>
-				<ref name="table-data-pilot-field-reference"/>
-			</optional>
-			<optional>
-				<ref name="table-data-pilot-groups"/>
-			</optional>
-		</element>
-	</define>
-	<define name="table-data-pilot-field-attlist">
-		<interleave>
-			<attribute name="table:source-field-name">
-				<ref name="string"/>
-			</attribute>
-			<choice>
-				<attribute name="table:orientation">
-					<choice>
-						<value>row</value>
-						<value>column</value>
-						<value>data</value>
-						<value>hidden</value>
-					</choice>
-				</attribute>
-				<group>
-					<attribute name="table:orientation">
-						<value>page</value>
-					</attribute>
-					<attribute name="table:selected-page">
-						<ref name="string"/>
-					</attribute>
-				</group>
-			</choice>
-			<optional>
-				<attribute name="table:is-data-layout-field">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:function">
-					<choice>
-						<value>auto</value>
-						<value>average</value>
-						<value>count</value>
-						<value>countnums</value>
-						<value>max</value>
-						<value>min</value>
-						<value>product</value>
-						<value>stdev</value>
-						<value>stdevp</value>
-						<value>sum</value>
-						<value>var</value>
-						<value>varp</value>
-						<ref name="string"/>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:used-hierarchy">
-					<ref name="integer"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="table-data-pilot-level">
-		<element name="table:data-pilot-level">
-			<ref name="table-data-pilot-level-attlist"/>
-			<optional>
-				<ref name="table-data-pilot-subtotals"/>
-			</optional>
-			<optional>
-				<ref name="table-data-pilot-members"/>
-			</optional>
-			<optional>
-				<ref name="table-data-pilot-display-info"/>
-			</optional>
-			<optional>
-				<ref name="table-data-pilot-sort-info"/>
-			</optional>
-			<optional>
-				<ref name="table-data-pilot-layout-info"/>
-			</optional>
-		</element>
-	</define>
-	<define name="table-data-pilot-level-attlist">
-		<optional>
-			<attribute name="table:show-empty">
-				<ref name="boolean"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="table-data-pilot-subtotals">
-		<element name="table:data-pilot-subtotals">
-			<zeroOrMore>
-				<ref name="table-data-pilot-subtotal"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="table-data-pilot-subtotal">
-		<element name="table:data-pilot-subtotal">
-			<ref name="table-data-pilot-subtotal-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="table-data-pilot-subtotal-attlist">
-		<attribute name="table:function">
-			<choice>
-				<value>auto</value>
-				<value>average</value>
-				<value>count</value>
-				<value>countnums</value>
-				<value>max</value>
-				<value>min</value>
-				<value>product</value>
-				<value>stdev</value>
-				<value>stdevp</value>
-				<value>sum</value>
-				<value>var</value>
-				<value>varp</value>
-				<ref name="string"/>
-			</choice>
-		</attribute>
-	</define>
-	<define name="table-data-pilot-members">
-		<element name="table:data-pilot-members">
-			<zeroOrMore>
-				<ref name="table-data-pilot-member"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="table-data-pilot-member">
-		<element name="table:data-pilot-member">
-			<ref name="table-data-pilot-member-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="table-data-pilot-member-attlist">
-		<interleave>
-			<attribute name="table:name">
-				<ref name="string"/>
-			</attribute>
-			<optional>
-				<attribute name="table:display">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:show-details">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="table-data-pilot-display-info">
-		<element name="table:data-pilot-display-info">
-			<ref name="table-data-pilot-display-info-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="table-data-pilot-display-info-attlist">
-		<interleave>
-			<attribute name="table:enabled">
-				<ref name="boolean"/>
-			</attribute>
-			<attribute name="table:data-field">
-				<ref name="string"/>
-			</attribute>
-			<attribute name="table:member-count">
-				<ref name="nonNegativeInteger"/>
-			</attribute>
-			<attribute name="table:display-member-mode">
-				<choice>
-					<value>from-top</value>
-					<value>from-bottom</value>
-				</choice>
-			</attribute>
-		</interleave>
-	</define>
-	<define name="table-data-pilot-sort-info">
-		<element name="table:data-pilot-sort-info">
-			<ref name="table-data-pilot-sort-info-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="table-data-pilot-sort-info-attlist">
-		<interleave>
-			<choice>
-				<group>
-					<attribute name="table:sort-mode">
-						<value>data</value>
-					</attribute>
-					<attribute name="table:data-field">
-						<ref name="string"/>
-					</attribute>
-				</group>
-				<attribute name="table:sort-mode">
-					<choice>
-						<value>none</value>
-						<value>manual</value>
-						<value>name</value>
-					</choice>
-				</attribute>
-			</choice>
-			<attribute name="table:order">
-				<choice>
-					<value>ascending</value>
-					<value>descending</value>
-				</choice>
-			</attribute>
-		</interleave>
-	</define>
-	<define name="table-data-pilot-layout-info">
-		<element name="table:data-pilot-layout-info">
-			<ref name="table-data-pilot-layout-info-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="table-data-pilot-layout-info-attlist">
-		<interleave>
-			<attribute name="table:layout-mode">
-				<choice>
-					<value>tabular-layout</value>
-					<value>outline-subtotals-top</value>
-					<value>outline-subtotals-bottom</value>
-				</choice>
-			</attribute>
-			<attribute name="table:add-empty-lines">
-				<ref name="boolean"/>
-			</attribute>
-		</interleave>
-	</define>
-	<define name="table-data-pilot-field-reference">
-		<element name="table:data-pilot-field-reference">
-			<ref name="table-data-pilot-field-reference-attlist"/>
-		</element>
-	</define>
-	<define name="table-data-pilot-field-reference-attlist">
-		<interleave>
-			<attribute name="table:field-name">
-				<ref name="string"/>
-			</attribute>
-			<choice>
-				<group>
-					<attribute name="table:member-type">
-						<value>named</value>
-					</attribute>
-					<attribute name="table:member-name">
-						<ref name="string"/>
-					</attribute>
-				</group>
-				<attribute name="table:member-type">
-					<choice>
-						<value>previous</value>
-						<value>next</value>
-					</choice>
-				</attribute>
-			</choice>
-			<attribute name="table:type">
-				<choice>
-					<value>none</value>
-					<value>member-difference</value>
-					<value>member-percentage</value>
-					<value>member-percentage-difference</value>
-					<value>running-total</value>
-					<value>row-percentage</value>
-					<value>column-percentage</value>
-					<value>total-percentage</value>
-					<value>index</value>
-				</choice>
-			</attribute>
-		</interleave>
-	</define>
-	<define name="table-data-pilot-groups">
-		<element name="table:data-pilot-groups">
-			<ref name="table-data-pilot-groups-attlist"/>
-			<oneOrMore>
-				<ref name="table-data-pilot-group"/>
-			</oneOrMore>
-		</element>
-	</define>
-	<define name="table-data-pilot-groups-attlist">
-		<interleave>
-			<attribute name="table:source-field-name">
-				<ref name="string"/>
-			</attribute>
-			<choice>
-				<attribute name="table:date-start">
-					<choice>
-						<ref name="dateOrDateTime"/>
-						<value>auto</value>
-					</choice>
-				</attribute>
-				<attribute name="table:start">
-					<choice>
-						<ref name="double"/>
-						<value>auto</value>
-					</choice>
-				</attribute>
-			</choice>
-			<choice>
-				<attribute name="table:date-end">
-					<choice>
-						<ref name="dateOrDateTime"/>
-						<value>auto</value>
-					</choice>
-				</attribute>
-				<attribute name="table:end">
-					<choice>
-						<ref name="double"/>
-						<value>auto</value>
-					</choice>
-				</attribute>
-			</choice>
-			<attribute name="table:step">
-				<ref name="double"/>
-			</attribute>
-			<attribute name="table:grouped-by">
-				<choice>
-					<value>seconds</value>
-					<value>minutes</value>
-					<value>hours</value>
-					<value>days</value>
-					<value>months</value>
-					<value>quarters</value>
-					<value>years</value>
-				</choice>
-			</attribute>
-		</interleave>
-	</define>
-	<define name="table-data-pilot-group">
-		<element name="table:data-pilot-group">
-			<ref name="table-data-pilot-group-attlist"/>
-			<oneOrMore>
-				<ref name="table-data-pilot-group-member"/>
-			</oneOrMore>
-		</element>
-	</define>
-	<define name="table-data-pilot-group-attlist">
-		<attribute name="table:name">
-			<ref name="string"/>
-		</attribute>
-	</define>
-	<define name="table-data-pilot-group-member">
-		<element name="table:data-pilot-group-member">
-			<ref name="table-data-pilot-group-member-attlist"/>
-		</element>
-	</define>
-	<define name="table-data-pilot-group-member-attlist">
-		<attribute name="table:name">
-			<ref name="string"/>
-		</attribute>
-	</define>
-	<define name="table-consolidation">
-		<element name="table:consolidation">
-			<ref name="table-consolidation-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="table-consolidation-attlist">
-		<interleave>
-			<attribute name="table:function">
-				<choice>
-					<value>average</value>
-					<value>count</value>
-					<value>countnums</value>
-					<value>max</value>
-					<value>min</value>
-					<value>product</value>
-					<value>stdev</value>
-					<value>stdevp</value>
-					<value>sum</value>
-					<value>var</value>
-					<value>varp</value>
-					<ref name="string"/>
-				</choice>
-			</attribute>
-			<attribute name="table:source-cell-range-addresses">
-				<ref name="cellRangeAddressList"/>
-			</attribute>
-			<attribute name="table:target-cell-address">
-				<ref name="cellAddress"/>
-			</attribute>
-			<optional>
-				<attribute name="table:use-labels">
-					<choice>
-						<value>none</value>
-						<value>row</value>
-						<value>column</value>
-						<value>both</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:link-to-source-data">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="table-dde-links">
-		<element name="table:dde-links">
-			<oneOrMore>
-				<ref name="table-dde-link"/>
-			</oneOrMore>
-		</element>
-	</define>
-	<define name="table-tracked-changes">
-		<element name="table:tracked-changes">
-			<ref name="table-tracked-changes-attlist"/>
-			<zeroOrMore>
-				<choice>
-					<ref name="table-cell-content-change"/>
-					<ref name="table-insertion"/>
-					<ref name="table-deletion"/>
-					<ref name="table-movement"/>
-				</choice>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="table-tracked-changes-attlist">
-		<optional>
-			<attribute name="table:track-changes">
-				<ref name="boolean"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="table-insertion">
-		<element name="table:insertion">
-			<ref name="table-insertion-attlist"/>
-			<ref name="common-table-change-attlist"/>
-			<ref name="office-change-info"/>
-			<optional>
-				<ref name="table-dependencies"/>
-			</optional>
-			<optional>
-				<ref name="table-deletions"/>
-			</optional>
-		</element>
-	</define>
-	<define name="table-insertion-attlist">
-		<interleave>
-			<attribute name="table:type">
-				<choice>
-					<value>row</value>
-					<value>column</value>
-					<value>table</value>
-				</choice>
-			</attribute>
-			<attribute name="table:position">
-				<ref name="integer"/>
-			</attribute>
-			<optional>
-				<attribute name="table:count">
-					<ref name="positiveInteger"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:table">
-					<ref name="integer"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="table-dependencies">
-		<element name="table:dependencies">
-			<oneOrMore>
-				<ref name="table-dependency"/>
-			</oneOrMore>
-		</element>
-	</define>
-	<define name="table-dependency">
-		<element name="table:dependency">
-			<attribute name="table:id">
-				<ref name="string"/>
-			</attribute>
-			<empty/>
-		</element>
-	</define>
-	<define name="table-deletions">
-		<element name="table:deletions">
-			<oneOrMore>
-				<choice>
-					<ref name="table-cell-content-deletion"/>
-					<ref name="table-change-deletion"/>
-				</choice>
-			</oneOrMore>
-		</element>
-	</define>
-	<define name="table-cell-content-deletion">
-		<element name="table:cell-content-deletion">
-			<optional>
-				<attribute name="table:id">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<ref name="table-cell-address"/>
-			</optional>
-			<optional>
-				<ref name="table-change-track-table-cell"/>
-			</optional>
-		</element>
-	</define>
-	<define name="table-change-deletion">
-		<element name="table:change-deletion">
-			<optional>
-				<attribute name="table:id">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<empty/>
-		</element>
-	</define>
-	<define name="table-deletion">
-		<element name="table:deletion">
-			<ref name="table-deletion-attlist"/>
-			<ref name="common-table-change-attlist"/>
-			<ref name="office-change-info"/>
-			<optional>
-				<ref name="table-dependencies"/>
-			</optional>
-			<optional>
-				<ref name="table-deletions"/>
-			</optional>
-			<optional>
-				<ref name="table-cut-offs"/>
-			</optional>
-		</element>
-	</define>
-	<define name="table-deletion-attlist">
-		<interleave>
-			<attribute name="table:type">
-				<choice>
-					<value>row</value>
-					<value>column</value>
-					<value>table</value>
-				</choice>
-			</attribute>
-			<attribute name="table:position">
-				<ref name="integer"/>
-			</attribute>
-			<optional>
-				<attribute name="table:table">
-					<ref name="integer"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:multi-deletion-spanned">
-					<ref name="integer"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="table-cut-offs">
-		<element name="table:cut-offs">
-			<choice>
-				<oneOrMore>
-					<ref name="table-movement-cut-off"/>
-				</oneOrMore>
-				<group>
-					<ref name="table-insertion-cut-off"/>
-					<zeroOrMore>
-						<ref name="table-movement-cut-off"/>
-					</zeroOrMore>
-				</group>
-			</choice>
-		</element>
-	</define>
-	<define name="table-insertion-cut-off">
-		<element name="table:insertion-cut-off">
-			<ref name="table-insertion-cut-off-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="table-insertion-cut-off-attlist">
-		<interleave>
-			<attribute name="table:id">
-				<ref name="string"/>
-			</attribute>
-			<attribute name="table:position">
-				<ref name="integer"/>
-			</attribute>
-		</interleave>
-	</define>
-	<define name="table-movement-cut-off">
-		<element name="table:movement-cut-off">
-			<ref name="table-movement-cut-off-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="table-movement-cut-off-attlist">
-		<choice>
-			<attribute name="table:position">
-				<ref name="integer"/>
-			</attribute>
-			<group>
-				<attribute name="table:start-position">
-					<ref name="integer"/>
-				</attribute>
-				<attribute name="table:end-position">
-					<ref name="integer"/>
-				</attribute>
-			</group>
-		</choice>
-	</define>
-	<define name="table-movement">
-		<element name="table:movement">
-			<ref name="common-table-change-attlist"/>
-			<ref name="table-source-range-address"/>
-			<ref name="table-target-range-address"/>
-			<ref name="office-change-info"/>
-			<optional>
-				<ref name="table-dependencies"/>
-			</optional>
-			<optional>
-				<ref name="table-deletions"/>
-			</optional>
-		</element>
-	</define>
-	<define name="table-source-range-address">
-		<element name="table:source-range-address">
-			<ref name="common-table-range-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="table-target-range-address">
-		<element name="table:target-range-address">
-			<ref name="common-table-range-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="common-table-range-attlist">
-		<choice>
-			<group>
-				<ref name="common-table-cell-address-attlist"/>
-			</group>
-			<group>
-				<ref name="common-table-cell-range-address-attlist"/>
-			</group>
-		</choice>
-	</define>
-	<define name="common-table-cell-address-attlist">
-		<attribute name="table:column">
-			<ref name="integer"/>
-		</attribute>
-		<attribute name="table:row">
-			<ref name="integer"/>
-		</attribute>
-		<attribute name="table:table">
-			<ref name="integer"/>
-		</attribute>
-	</define>
-	<define name="common-table-cell-range-address-attlist">
-		<attribute name="table:start-column">
-			<ref name="integer"/>
-		</attribute>
-		<attribute name="table:start-row">
-			<ref name="integer"/>
-		</attribute>
-		<attribute name="table:start-table">
-			<ref name="integer"/>
-		</attribute>
-		<attribute name="table:end-column">
-			<ref name="integer"/>
-		</attribute>
-		<attribute name="table:end-row">
-			<ref name="integer"/>
-		</attribute>
-		<attribute name="table:end-table">
-			<ref name="integer"/>
-		</attribute>
-	</define>
-	<define name="table-change-track-table-cell">
-		<element name="table:change-track-table-cell">
-			<ref name="table-change-track-table-cell-attlist"/>
-			<zeroOrMore>
-				<ref name="text-p"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="table-change-track-table-cell-attlist">
-		<interleave>
-			<optional>
-				<attribute name="table:cell-address">
-					<ref name="cellAddress"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:matrix-covered">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:formula">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:number-matrix-columns-spanned">
-					<ref name="positiveInteger"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:number-matrix-rows-spanned">
-					<ref name="positiveInteger"/>
-				</attribute>
-			</optional>
-			<optional>
-				<ref name="common-value-and-type-attlist"/>
-			</optional>
-		</interleave>
-	</define>
-	<define name="table-cell-content-change">
-		<element name="table:cell-content-change">
-			<ref name="common-table-change-attlist"/>
-			<ref name="table-cell-address"/>
-			<ref name="office-change-info"/>
-			<optional>
-				<ref name="table-dependencies"/>
-			</optional>
-			<optional>
-				<ref name="table-deletions"/>
-			</optional>
-			<ref name="table-previous"/>
-		</element>
-	</define>
-	<define name="table-cell-address">
-		<element name="table:cell-address">
-			<ref name="common-table-cell-address-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="table-previous">
-		<element name="table:previous">
-			<optional>
-				<attribute name="table:id">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<ref name="table-change-track-table-cell"/>
-		</element>
-	</define>
-	<define name="common-table-change-attlist">
-		<interleave>
-			<attribute name="table:id">
-				<ref name="string"/>
-			</attribute>
-			<optional>
-				<attribute name="table:acceptance-state">
-					<choice>
-						<value>accepted</value>
-						<value>rejected</value>
-						<value>pending</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:rejecting-change-id">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="style-handout-master">
-		<element name="style:handout-master">
-			<ref name="common-presentation-header-footer-attlist"/>
-			<ref name="style-handout-master-attlist"/>
-			<zeroOrMore>
-				<ref name="shape"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="style-handout-master-attlist">
-		<interleave>
-			<optional>
-				<attribute name="presentation:presentation-page-layout-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<attribute name="style:page-layout-name">
-				<ref name="styleNameRef"/>
-			</attribute>
-			<optional>
-				<attribute name="draw:style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="draw-layer-set">
-		<element name="draw:layer-set">
-			<zeroOrMore>
-				<ref name="draw-layer"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="draw-layer">
-		<element name="draw:layer">
-			<ref name="draw-layer-attlist"/>
-			<optional>
-				<ref name="svg-title"/>
-			</optional>
-			<optional>
-				<ref name="svg-desc"/>
-			</optional>
-		</element>
-	</define>
-	<define name="draw-layer-attlist">
-		<interleave>
-			<attribute name="draw:name">
-				<ref name="string"/>
-			</attribute>
-			<optional>
-				<attribute name="draw:protected">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:display">
-					<choice>
-						<value>always</value>
-						<value>screen</value>
-						<value>printer</value>
-						<value>none</value>
-					</choice>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="draw-page">
-		<element name="draw:page">
-			<ref name="common-presentation-header-footer-attlist"/>
-			<ref name="draw-page-attlist"/>
-			<optional>
-				<ref name="svg-title"/>
-			</optional>
-			<optional>
-				<ref name="svg-desc"/>
-			</optional>
-			<optional>
-				<ref name="draw-layer-set"/>
-			</optional>
-			<optional>
-				<ref name="office-forms"/>
-			</optional>
-			<zeroOrMore>
-				<ref name="shape"/>
-			</zeroOrMore>
-			<optional>
-				<choice>
-					<ref name="presentation-animations"/>
-					<ref name="animation-element"/>
-				</choice>
-			</optional>
-			<optional>
-				<ref name="presentation-notes"/>
-			</optional>
-		</element>
-	</define>
-	<define name="draw-page-attlist">
-		<interleave>
-			<optional>
-				<attribute name="draw:name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<attribute name="draw:master-page-name">
-				<ref name="styleNameRef"/>
-			</attribute>
-			<optional>
-				<attribute name="presentation:presentation-page-layout-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<optional>
-				<group>
-					<ref name="xml-id"/>
-					<optional>
-						<attribute name="draw:id">
-							<ref name="NCName"/>
-						</attribute>
-					</optional>
-				</group>
-			</optional>
-			<optional>
-				<attribute name="draw:nav-order">
-					<ref name="IDREFS"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="common-presentation-header-footer-attlist">
-		<interleave>
-			<optional>
-				<attribute name="presentation:use-header-name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="presentation:use-footer-name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="presentation:use-date-time-name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="shape">
-		<choice>
-			<ref name="shape-instance"/>
-			<ref name="draw-a"/>
-		</choice>
-	</define>
-	<define name="shape-instance">
-		<choice>
-			<ref name="draw-rect"/>
-			<ref name="draw-line"/>
-			<ref name="draw-polyline"/>
-			<ref name="draw-polygon"/>
-			<ref name="draw-regular-polygon"/>
-			<ref name="draw-path"/>
-			<ref name="draw-circle"/>
-			<ref name="draw-ellipse"/>
-			<ref name="draw-g"/>
-			<ref name="draw-page-thumbnail"/>
-			<ref name="draw-frame"/>
-			<ref name="draw-measure"/>
-			<ref name="draw-caption"/>
-			<ref name="draw-connector"/>
-			<ref name="draw-control"/>
-			<ref name="dr3d-scene"/>
-			<ref name="draw-custom-shape"/>
-		</choice>
-	</define>
-	<define name="draw-rect">
-		<element name="draw:rect">
-			<ref name="draw-rect-attlist"/>
-			<ref name="common-draw-position-attlist"/>
-			<ref name="common-draw-size-attlist"/>
-			<ref name="common-draw-shape-with-text-and-styles-attlist"/>
-			<ref name="common-draw-caption-id-attlist"/>
-			<optional>
-				<ref name="svg-title"/>
-			</optional>
-			<optional>
-				<ref name="svg-desc"/>
-			</optional>
-			<optional>
-				<ref name="office-event-listeners"/>
-			</optional>
-			<zeroOrMore>
-				<ref name="draw-glue-point"/>
-			</zeroOrMore>
-			<ref name="draw-text"/>
-		</element>
-	</define>
-	<define name="draw-rect-attlist">
-		<choice>
-			<optional>
-				<attribute name="draw:corner-radius">
-					<ref name="nonNegativeLength"/>
-				</attribute>
-			</optional>
-			<group>
-				<optional>
-					<attribute name="svg:rx">
-						<ref name="nonNegativeLength"/>
-					</attribute>
-				</optional>
-				<optional>
-					<attribute name="svg:ry">
-						<ref name="nonNegativeLength"/>
-					</attribute>
-				</optional>
-			</group>
-		</choice>
-	</define>
-	<define name="draw-line">
-		<element name="draw:line">
-			<ref name="draw-line-attlist"/>
-			<ref name="common-draw-shape-with-text-and-styles-attlist"/>
-			<ref name="common-draw-caption-id-attlist"/>
-			<optional>
-				<ref name="svg-title"/>
-			</optional>
-			<optional>
-				<ref name="svg-desc"/>
-			</optional>
-			<optional>
-				<ref name="office-event-listeners"/>
-			</optional>
-			<zeroOrMore>
-				<ref name="draw-glue-point"/>
-			</zeroOrMore>
-			<ref name="draw-text"/>
-		</element>
-	</define>
-	<define name="draw-line-attlist">
-		<interleave>
-			<attribute name="svg:x1">
-				<ref name="coordinate"/>
-			</attribute>
-			<attribute name="svg:y1">
-				<ref name="coordinate"/>
-			</attribute>
-			<attribute name="svg:x2">
-				<ref name="coordinate"/>
-			</attribute>
-			<attribute name="svg:y2">
-				<ref name="coordinate"/>
-			</attribute>
-		</interleave>
-	</define>
-	<define name="draw-polyline">
-		<element name="draw:polyline">
-			<ref name="common-draw-points-attlist"/>
-			<ref name="common-draw-position-attlist"/>
-			<ref name="common-draw-size-attlist"/>
-			<ref name="common-draw-viewbox-attlist"/>
-			<ref name="common-draw-shape-with-text-and-styles-attlist"/>
-			<ref name="common-draw-caption-id-attlist"/>
-			<optional>
-				<ref name="svg-title"/>
-			</optional>
-			<optional>
-				<ref name="svg-desc"/>
-			</optional>
-			<optional>
-				<ref name="office-event-listeners"/>
-			</optional>
-			<zeroOrMore>
-				<ref name="draw-glue-point"/>
-			</zeroOrMore>
-			<ref name="draw-text"/>
-		</element>
-	</define>
-	<define name="common-draw-points-attlist">
-		<attribute name="draw:points">
-			<ref name="points"/>
-		</attribute>
-	</define>
-	<define name="draw-polygon">
-		<element name="draw:polygon">
-			<ref name="common-draw-points-attlist"/>
-			<ref name="common-draw-position-attlist"/>
-			<ref name="common-draw-size-attlist"/>
-			<ref name="common-draw-viewbox-attlist"/>
-			<ref name="common-draw-shape-with-text-and-styles-attlist"/>
-			<ref name="common-draw-caption-id-attlist"/>
-			<optional>
-				<ref name="svg-title"/>
-			</optional>
-			<optional>
-				<ref name="svg-desc"/>
-			</optional>
-			<optional>
-				<ref name="office-event-listeners"/>
-			</optional>
-			<zeroOrMore>
-				<ref name="draw-glue-point"/>
-			</zeroOrMore>
-			<ref name="draw-text"/>
-		</element>
-	</define>
-	<define name="draw-regular-polygon">
-		<element name="draw:regular-polygon">
-			<ref name="draw-regular-polygon-attlist"/>
-			<ref name="common-draw-position-attlist"/>
-			<ref name="common-draw-size-attlist"/>
-			<ref name="common-draw-shape-with-text-and-styles-attlist"/>
-			<ref name="common-draw-caption-id-attlist"/>
-			<optional>
-				<ref name="svg-title"/>
-			</optional>
-			<optional>
-				<ref name="svg-desc"/>
-			</optional>
-			<optional>
-				<ref name="office-event-listeners"/>
-			</optional>
-			<zeroOrMore>
-				<ref name="draw-glue-point"/>
-			</zeroOrMore>
-			<ref name="draw-text"/>
-		</element>
-	</define>
-	<define name="draw-regular-polygon-attlist">
-		<interleave>
-			<choice>
-				<attribute name="draw:concave">
-					<value>false</value>
-				</attribute>
-				<group>
-					<attribute name="draw:concave">
-						<value>true</value>
-					</attribute>
-					<ref name="draw-regular-polygon-sharpness-attlist"/>
-				</group>
-			</choice>
-			<attribute name="draw:corners">
-				<ref name="positiveInteger"/>
-			</attribute>
-		</interleave>
-	</define>
-	<define name="draw-regular-polygon-sharpness-attlist">
-		<attribute name="draw:sharpness">
-			<ref name="percent"/>
-		</attribute>
-	</define>
-	<define name="draw-path">
-		<element name="draw:path">
-			<ref name="common-draw-path-data-attlist"/>
-			<ref name="common-draw-position-attlist"/>
-			<ref name="common-draw-size-attlist"/>
-			<ref name="common-draw-viewbox-attlist"/>
-			<ref name="common-draw-shape-with-text-and-styles-attlist"/>
-			<ref name="common-draw-caption-id-attlist"/>
-			<optional>
-				<ref name="svg-title"/>
-			</optional>
-			<optional>
-				<ref name="svg-desc"/>
-			</optional>
-			<optional>
-				<ref name="office-event-listeners"/>
-			</optional>
-			<zeroOrMore>
-				<ref name="draw-glue-point"/>
-			</zeroOrMore>
-			<ref name="draw-text"/>
-		</element>
-	</define>
-	<define name="common-draw-path-data-attlist">
-		<attribute name="svg:d">
-			<ref name="pathData"/>
-		</attribute>
-	</define>
-	<define name="draw-circle">
-		<element name="draw:circle">
-			<choice>
-				<group>
-					<ref name="draw-circle-attlist"/>
-					<ref name="common-draw-circle-ellipse-pos-attlist"/>
-				</group>
-				<group>
-					<ref name="common-draw-position-attlist"/>
-					<ref name="common-draw-size-attlist"/>
-				</group>
-			</choice>
-			<ref name="common-draw-circle-ellipse-attlist"/>
-			<ref name="common-draw-shape-with-text-and-styles-attlist"/>
-			<ref name="common-draw-caption-id-attlist"/>
-			<optional>
-				<ref name="svg-title"/>
-			</optional>
-			<optional>
-				<ref name="svg-desc"/>
-			</optional>
-			<optional>
-				<ref name="office-event-listeners"/>
-			</optional>
-			<zeroOrMore>
-				<ref name="draw-glue-point"/>
-			</zeroOrMore>
-			<ref name="draw-text"/>
-		</element>
-	</define>
-	<define name="common-draw-circle-ellipse-pos-attlist">
-		<attribute name="svg:cx">
-			<ref name="coordinate"/>
-		</attribute>
-		<attribute name="svg:cy">
-			<ref name="coordinate"/>
-		</attribute>
-	</define>
-	<define name="draw-circle-attlist">
-		<attribute name="svg:r">
-			<ref name="length"/>
-		</attribute>
-	</define>
-	<define name="common-draw-circle-ellipse-attlist">
-		<interleave>
-			<optional>
-				<attribute name="draw:kind">
-					<choice>
-						<value>full</value>
-						<value>section</value>
-						<value>cut</value>
-						<value>arc</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:start-angle">
-					<ref name="angle"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:end-angle">
-					<ref name="angle"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="draw-ellipse">
-		<element name="draw:ellipse">
-			<choice>
-				<group>
-					<ref name="draw-ellipse-attlist"/>
-					<ref name="common-draw-circle-ellipse-pos-attlist"/>
-				</group>
-				<group>
-					<ref name="common-draw-position-attlist"/>
-					<ref name="common-draw-size-attlist"/>
-				</group>
-			</choice>
-			<ref name="common-draw-circle-ellipse-attlist"/>
-			<ref name="common-draw-shape-with-text-and-styles-attlist"/>
-			<ref name="common-draw-caption-id-attlist"/>
-			<optional>
-				<ref name="svg-title"/>
-			</optional>
-			<optional>
-				<ref name="svg-desc"/>
-			</optional>
-			<optional>
-				<ref name="office-event-listeners"/>
-			</optional>
-			<zeroOrMore>
-				<ref name="draw-glue-point"/>
-			</zeroOrMore>
-			<ref name="draw-text"/>
-		</element>
-	</define>
-	<define name="draw-ellipse-attlist">
-		<attribute name="svg:rx">
-			<ref name="length"/>
-		</attribute>
-		<attribute name="svg:ry">
-			<ref name="length"/>
-		</attribute>
-	</define>
-	<define name="draw-connector">
-		<element name="draw:connector">
-			<ref name="draw-connector-attlist"/>
-			<ref name="common-draw-shape-with-text-and-styles-attlist"/>
-			<ref name="common-draw-caption-id-attlist"/>
-			<ref name="common-draw-viewbox-attlist"/>
-			<optional>
-				<ref name="svg-title"/>
-			</optional>
-			<optional>
-				<ref name="svg-desc"/>
-			</optional>
-			<optional>
-				<ref name="office-event-listeners"/>
-			</optional>
-			<zeroOrMore>
-				<ref name="draw-glue-point"/>
-			</zeroOrMore>
-			<ref name="draw-text"/>
-		</element>
-	</define>
-	<define name="draw-connector-attlist">
-		<interleave>
-			<optional>
-				<attribute name="draw:type">
-					<choice>
-						<value>standard</value>
-						<value>lines</value>
-						<value>line</value>
-						<value>curve</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:x1">
-					<ref name="coordinate"/>
-				</attribute>
-				<attribute name="svg:y1">
-					<ref name="coordinate"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:start-shape">
-					<ref name="IDREF"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:start-glue-point">
-					<ref name="nonNegativeInteger"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:x2">
-					<ref name="coordinate"/>
-				</attribute>
-				<attribute name="svg:y2">
-					<ref name="coordinate"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:end-shape">
-					<ref name="IDREF"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:end-glue-point">
-					<ref name="nonNegativeInteger"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:line-skew">
-					<list>
-						<ref name="length"/>
-						<optional>
-							<ref name="length"/>
-							<optional>
-								<ref name="length"/>
-							</optional>
-						</optional>
-					</list>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:d">
-					<ref name="pathData"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="draw-caption">
-		<element name="draw:caption">
-			<ref name="draw-caption-attlist"/>
-			<ref name="common-draw-position-attlist"/>
-			<ref name="common-draw-size-attlist"/>
-			<ref name="common-draw-shape-with-text-and-styles-attlist"/>
-			<ref name="common-draw-caption-id-attlist"/>
-			<optional>
-				<ref name="svg-title"/>
-			</optional>
-			<optional>
-				<ref name="svg-desc"/>
-			</optional>
-			<optional>
-				<ref name="office-event-listeners"/>
-			</optional>
-			<zeroOrMore>
-				<ref name="draw-glue-point"/>
-			</zeroOrMore>
-			<ref name="draw-text"/>
-		</element>
-	</define>
-	<define name="draw-caption-attlist">
-		<interleave>
-			<optional>
-				<attribute name="draw:caption-point-x">
-					<ref name="coordinate"/>
-				</attribute>
-				<attribute name="draw:caption-point-y">
-					<ref name="coordinate"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:corner-radius">
-					<ref name="nonNegativeLength"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="draw-measure">
-		<element name="draw:measure">
-			<ref name="draw-measure-attlist"/>
-			<ref name="common-draw-shape-with-text-and-styles-attlist"/>
-			<ref name="common-draw-caption-id-attlist"/>
-			<optional>
-				<ref name="svg-title"/>
-			</optional>
-			<optional>
-				<ref name="svg-desc"/>
-			</optional>
-			<optional>
-				<ref name="office-event-listeners"/>
-			</optional>
-			<zeroOrMore>
-				<ref name="draw-glue-point"/>
-			</zeroOrMore>
-			<ref name="draw-text"/>
-		</element>
-	</define>
-	<define name="draw-measure-attlist">
-		<interleave>
-			<attribute name="svg:x1">
-				<ref name="coordinate"/>
-			</attribute>
-			<attribute name="svg:y1">
-				<ref name="coordinate"/>
-			</attribute>
-			<attribute name="svg:x2">
-				<ref name="coordinate"/>
-			</attribute>
-			<attribute name="svg:y2">
-				<ref name="coordinate"/>
-			</attribute>
-		</interleave>
-	</define>
-	<define name="draw-control">
-		<element name="draw:control">
-			<ref name="draw-control-attlist"/>
-			<ref name="common-draw-position-attlist"/>
-			<ref name="common-draw-size-attlist"/>
-			<ref name="common-draw-shape-with-text-and-styles-attlist"/>
-			<ref name="common-draw-caption-id-attlist"/>
-			<optional>
-				<ref name="svg-title"/>
-			</optional>
-			<optional>
-				<ref name="svg-desc"/>
-			</optional>
-			<zeroOrMore>
-				<ref name="draw-glue-point"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="draw-control-attlist">
-		<attribute name="draw:control">
-			<ref name="IDREF"/>
-		</attribute>
-	</define>
-	<define name="draw-page-thumbnail">
-		<element name="draw:page-thumbnail">
-			<ref name="draw-page-thumbnail-attlist"/>
-			<ref name="common-draw-position-attlist"/>
-			<ref name="common-draw-size-attlist"/>
-			<ref name="presentation-shape-attlist"/>
-			<ref name="common-draw-shape-with-styles-attlist"/>
-			<ref name="common-draw-caption-id-attlist"/>
-			<optional>
-				<ref name="svg-title"/>
-			</optional>
-			<optional>
-				<ref name="svg-desc"/>
-			</optional>
-		</element>
-	</define>
-	<define name="draw-page-thumbnail-attlist">
-		<optional>
-			<attribute name="draw:page-number">
-				<ref name="positiveInteger"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="draw-g">
-		<element name="draw:g">
-			<ref name="draw-g-attlist"/>
-			<ref name="common-draw-z-index-attlist"/>
-			<ref name="common-draw-name-attlist"/>
-			<ref name="common-draw-id-attlist"/>
-			<ref name="common-draw-style-name-attlist"/>
-			<ref name="common-text-spreadsheet-shape-attlist"/>
-			<ref name="common-draw-caption-id-attlist"/>
-			<optional>
-				<ref name="svg-title"/>
-			</optional>
-			<optional>
-				<ref name="svg-desc"/>
-			</optional>
-			<optional>
-				<ref name="office-event-listeners"/>
-			</optional>
-			<zeroOrMore>
-				<ref name="draw-glue-point"/>
-			</zeroOrMore>
-			<zeroOrMore>
-				<ref name="shape"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="draw-g-attlist">
-		<optional>
-			<attribute name="svg:y">
-				<ref name="coordinate"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-draw-name-attlist">
-		<optional>
-			<attribute name="draw:name">
-				<ref name="string"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-draw-caption-id-attlist">
-		<optional>
-			<attribute name="draw:caption-id">
-				<ref name="IDREF"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-draw-position-attlist">
-		<optional>
-			<attribute name="svg:x">
-				<ref name="coordinate"/>
-			</attribute>
-		</optional>
-		<optional>
-			<attribute name="svg:y">
-				<ref name="coordinate"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-draw-size-attlist">
-		<optional>
-			<attribute name="svg:width">
-				<ref name="length"/>
-			</attribute>
-		</optional>
-		<optional>
-			<attribute name="svg:height">
-				<ref name="length"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-draw-transform-attlist">
-		<optional>
-			<attribute name="draw:transform">
-				<ref name="string"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-draw-viewbox-attlist">
-		<attribute name="svg:viewBox">
-			<list>
-				<ref name="integer"/>
-				<ref name="integer"/>
-				<ref name="integer"/>
-				<ref name="integer"/>
-			</list>
-		</attribute>
-	</define>
-	<define name="common-draw-style-name-attlist">
-		<choice>
-			<group>
-				<optional>
-					<attribute name="draw:style-name">
-						<ref name="styleNameRef"/>
-					</attribute>
-				</optional>
-				<optional>
-					<attribute name="draw:class-names">
-						<ref name="styleNameRefs"/>
-					</attribute>
-				</optional>
-			</group>
-			<group>
-				<optional>
-					<attribute name="presentation:style-name">
-						<ref name="styleNameRef"/>
-					</attribute>
-				</optional>
-				<optional>
-					<attribute name="presentation:class-names">
-						<ref name="styleNameRefs"/>
-					</attribute>
-				</optional>
-			</group>
-		</choice>
-	</define>
-	<define name="common-draw-text-style-name-attlist">
-		<optional>
-			<attribute name="draw:text-style-name">
-				<ref name="styleNameRef"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-draw-layer-name-attlist">
-		<optional>
-			<attribute name="draw:layer">
-				<ref name="string"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-draw-id-attlist">
-		<optional>
-			<group>
-				<ref name="xml-id"/>
-				<optional>
-					<attribute name="draw:id">
-						<ref name="NCName"/>
-					</attribute>
-				</optional>
-			</group>
-		</optional>
-	</define>
-	<define name="common-draw-z-index-attlist">
-		<optional>
-			<attribute name="draw:z-index">
-				<ref name="nonNegativeInteger"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-text-spreadsheet-shape-attlist">
-		<interleave>
-			<optional>
-				<attribute name="table:end-cell-address">
-					<ref name="cellAddress"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:end-x">
-					<ref name="coordinate"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:end-y">
-					<ref name="coordinate"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:table-background">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<ref name="common-text-anchor-attlist"/>
-		</interleave>
-	</define>
-	<define name="common-text-anchor-attlist">
-		<interleave>
-			<optional>
-				<attribute name="text:anchor-type">
-					<choice>
-						<value>page</value>
-						<value>frame</value>
-						<value>paragraph</value>
-						<value>char</value>
-						<value>as-char</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:anchor-page-number">
-					<ref name="positiveInteger"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="draw-text">
-		<zeroOrMore>
-			<choice>
-				<ref name="text-p"/>
-				<ref name="text-list"/>
-			</choice>
-		</zeroOrMore>
-	</define>
-	<define name="common-draw-shape-with-styles-attlist">
-		<ref name="common-draw-z-index-attlist"/>
-		<ref name="common-draw-id-attlist"/>
-		<ref name="common-draw-layer-name-attlist"/>
-		<ref name="common-draw-style-name-attlist"/>
-		<ref name="common-draw-transform-attlist"/>
-		<ref name="common-draw-name-attlist"/>
-		<ref name="common-text-spreadsheet-shape-attlist"/>
-	</define>
-	<define name="common-draw-shape-with-text-and-styles-attlist">
-		<ref name="common-draw-shape-with-styles-attlist"/>
-		<ref name="common-draw-text-style-name-attlist"/>
-	</define>
-	<define name="draw-glue-point">
-		<element name="draw:glue-point">
-			<ref name="draw-glue-point-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="draw-glue-point-attlist">
-		<interleave>
-			<attribute name="draw:id">
-				<ref name="nonNegativeInteger"/>
-			</attribute>
-			<attribute name="svg:x">
-				<choice>
-					<ref name="distance"/>
-					<ref name="percent"/>
-				</choice>
-			</attribute>
-			<attribute name="svg:y">
-				<choice>
-					<ref name="distance"/>
-					<ref name="percent"/>
-				</choice>
-			</attribute>
-			<optional>
-				<attribute name="draw:align">
-					<choice>
-						<value>top-left</value>
-						<value>top</value>
-						<value>top-right</value>
-						<value>left</value>
-						<value>center</value>
-						<value>right</value>
-						<value>bottom-left</value>
-						<value>bottom-right</value>
-					</choice>
-				</attribute>
-			</optional>
-			<attribute name="draw:escape-direction">
-				<choice>
-					<value>auto</value>
-					<value>left</value>
-					<value>right</value>
-					<value>up</value>
-					<value>down</value>
-					<value>horizontal</value>
-					<value>vertical</value>
-				</choice>
-			</attribute>
-		</interleave>
-	</define>
-	<define name="svg-title">
-		<element name="svg:title">
-			<text/>
-		</element>
-	</define>
-	<define name="svg-desc">
-		<element name="svg:desc">
-			<text/>
-		</element>
-	</define>
-	<define name="draw-frame">
-		<element name="draw:frame">
-			<ref name="common-draw-shape-with-text-and-styles-attlist"/>
-			<ref name="common-draw-position-attlist"/>
-			<ref name="common-draw-rel-size-attlist"/>
-			<ref name="common-draw-caption-id-attlist"/>
-			<ref name="presentation-shape-attlist"/>
-			<ref name="draw-frame-attlist"/>
-			<zeroOrMore>
-				<choice>
-					<ref name="draw-text-box"/>
-					<ref name="draw-image"/>
-					<ref name="draw-object"/>
-					<ref name="draw-object-ole"/>
-					<ref name="draw-applet"/>
-					<ref name="draw-floating-frame"/>
-					<ref name="draw-plugin"/>
-					<ref name="table-table"/>
-				</choice>
-			</zeroOrMore>
-			<optional>
-				<ref name="office-event-listeners"/>
-			</optional>
-			<zeroOrMore>
-				<ref name="draw-glue-point"/>
-			</zeroOrMore>
-			<optional>
-				<ref name="draw-image-map"/>
-			</optional>
-			<optional>
-				<ref name="svg-title"/>
-			</optional>
-			<optional>
-				<ref name="svg-desc"/>
-			</optional>
-			<optional>
-				<choice>
-					<ref name="draw-contour-polygon"/>
-					<ref name="draw-contour-path"/>
-				</choice>
-			</optional>
-		</element>
-	</define>
-	<define name="common-draw-rel-size-attlist">
-		<ref name="common-draw-size-attlist"/>
-		<optional>
-			<attribute name="style:rel-width">
-				<choice>
-					<ref name="percent"/>
-					<value>scale</value>
-					<value>scale-min</value>
-				</choice>
-			</attribute>
-		</optional>
-		<optional>
-			<attribute name="style:rel-height">
-				<choice>
-					<ref name="percent"/>
-					<value>scale</value>
-					<value>scale-min</value>
-				</choice>
-			</attribute>
-		</optional>
-	</define>
-	<define name="draw-frame-attlist">
-		<optional>
-			<attribute name="draw:copy-of">
-				<ref name="string"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="draw-text-box">
-		<element name="draw:text-box">
-			<ref name="draw-text-box-attlist"/>
-			<zeroOrMore>
-				<ref name="text-content"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="draw-text-box-attlist">
-		<interleave>
-			<optional>
-				<attribute name="draw:chain-next-name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:corner-radius">
-					<ref name="nonNegativeLength"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="fo:min-height">
-					<choice>
-						<ref name="length"/>
-						<ref name="percent"/>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="fo:min-width">
-					<choice>
-						<ref name="length"/>
-						<ref name="percent"/>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="fo:max-height">
-					<choice>
-						<ref name="length"/>
-						<ref name="percent"/>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="fo:max-width">
-					<choice>
-						<ref name="length"/>
-						<ref name="percent"/>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<group>
-					<ref name="xml-id"/>
-					<optional>
-						<attribute name="text:id">
-							<ref name="NCName"/>
-						</attribute>
-					</optional>
-				</group>
-			</optional>
-		</interleave>
-	</define>
-	<define name="draw-image">
-		<element name="draw:image">
-			<ref name="draw-image-attlist"/>
-			<choice>
-				<ref name="common-draw-data-attlist"/>
-				<ref name="office-binary-data"/>
-			</choice>
-			<ref name="draw-text"/>
-		</element>
-	</define>
-	<define name="common-draw-data-attlist">
-		<group>
-			<attribute name="xlink:type">
-				<value>simple</value>
-			</attribute>
-			<attribute name="xlink:href">
-				<ref name="anyIRI"/>
-			</attribute>
-			<optional>
-				<attribute name="xlink:show">
-					<value>embed</value>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="xlink:actuate">
-					<value>onLoad</value>
-				</attribute>
-			</optional>
-		</group>
-	</define>
-	<define name="office-binary-data">
-		<element name="office:binary-data">
-			<ref name="base64Binary"/>
-		</element>
-	</define>
-	<define name="draw-image-attlist">
-		<interleave>
-			<optional>
-				<attribute name="draw:filter-name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<ref name="xml-id"/>
-			</optional>
-		</interleave>
-	</define>
-	<define name="draw-object">
-		<element name="draw:object">
-			<ref name="draw-object-attlist"/>
-			<choice>
-				<ref name="common-draw-data-attlist"/>
-				<ref name="office-document"/>
-				<ref name="math-math"/>
-			</choice>
-		</element>
-	</define>
-	<define name="draw-object-ole">
-		<element name="draw:object-ole">
-			<ref name="draw-object-ole-attlist"/>
-			<choice>
-				<ref name="common-draw-data-attlist"/>
-				<ref name="office-binary-data"/>
-			</choice>
-		</element>
-	</define>
-	<define name="draw-object-attlist">
-		<interleave>
-			<optional>
-				<attribute name="draw:notify-on-update-of-ranges">
-					<choice>
-						<ref name="cellRangeAddressList"/>
-						<ref name="string"/>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<ref name="xml-id"/>
-			</optional>
-		</interleave>
-	</define>
-	<define name="draw-object-ole-attlist">
-		<interleave>
-			<optional>
-				<attribute name="draw:class-id">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<ref name="xml-id"/>
-			</optional>
-		</interleave>
-	</define>
-	<define name="draw-applet">
-		<element name="draw:applet">
-			<ref name="draw-applet-attlist"/>
-			<optional>
-				<ref name="common-draw-data-attlist"/>
-			</optional>
-			<zeroOrMore>
-				<ref name="draw-param"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="draw-applet-attlist">
-		<interleave>
-			<optional>
-				<attribute name="draw:code">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:object">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:archive">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:may-script">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<ref name="xml-id"/>
-			</optional>
-		</interleave>
-	</define>
-	<define name="draw-plugin">
-		<element name="draw:plugin">
-			<ref name="draw-plugin-attlist"/>
-			<ref name="common-draw-data-attlist"/>
-			<zeroOrMore>
-				<ref name="draw-param"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="draw-plugin-attlist">
-		<interleave>
-			<optional>
-				<attribute name="draw:mime-type">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<ref name="xml-id"/>
-			</optional>
-		</interleave>
-	</define>
-	<define name="draw-param">
-		<element name="draw:param">
-			<ref name="draw-param-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="draw-param-attlist">
-		<interleave>
-			<optional>
-				<attribute name="draw:name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:value">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="draw-floating-frame">
-		<element name="draw:floating-frame">
-			<ref name="draw-floating-frame-attlist"/>
-			<ref name="common-draw-data-attlist"/>
-		</element>
-	</define>
-	<define name="draw-floating-frame-attlist">
-		<interleave>
-			<optional>
-				<attribute name="draw:frame-name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<ref name="xml-id"/>
-			</optional>
-		</interleave>
-	</define>
-	<define name="draw-contour-polygon">
-		<element name="draw:contour-polygon">
-			<ref name="common-contour-attlist"/>
-			<ref name="common-draw-size-attlist"/>
-			<ref name="common-draw-viewbox-attlist"/>
-			<ref name="common-draw-points-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="draw-contour-path">
-		<element name="draw:contour-path">
-			<ref name="common-contour-attlist"/>
-			<ref name="common-draw-size-attlist"/>
-			<ref name="common-draw-viewbox-attlist"/>
-			<ref name="common-draw-path-data-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="common-contour-attlist">
-		<attribute name="draw:recreate-on-edit">
-			<ref name="boolean"/>
-		</attribute>
-	</define>
-	<define name="draw-a">
-		<element name="draw:a">
-			<ref name="draw-a-attlist"/>
-			<ref name="shape-instance"/>
-		</element>
-	</define>
-	<define name="draw-a-attlist">
-		<interleave>
-			<attribute name="xlink:type">
-				<value>simple</value>
-			</attribute>
-			<attribute name="xlink:href">
-				<ref name="anyIRI"/>
-			</attribute>
-			<optional>
-				<attribute name="xlink:actuate">
-					<value>onRequest</value>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="office:target-frame-name">
-					<ref name="targetFrameName"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="xlink:show">
-					<choice>
-						<value>new</value>
-						<value>replace</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="office:name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="office:title">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="office:server-map">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<ref name="xml-id"/>
-			</optional>
-		</interleave>
-	</define>
-	<define name="draw-image-map">
-		<element name="draw:image-map">
-			<zeroOrMore>
-				<choice>
-					<ref name="draw-area-rectangle"/>
-					<ref name="draw-area-circle"/>
-					<ref name="draw-area-polygon"/>
-				</choice>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="draw-area-rectangle">
-		<element name="draw:area-rectangle">
-			<ref name="common-draw-area-attlist"/>
-			<attribute name="svg:x">
-				<ref name="coordinate"/>
-			</attribute>
-			<attribute name="svg:y">
-				<ref name="coordinate"/>
-			</attribute>
-			<attribute name="svg:width">
-				<ref name="length"/>
-			</attribute>
-			<attribute name="svg:height">
-				<ref name="length"/>
-			</attribute>
-			<optional>
-				<ref name="svg-title"/>
-			</optional>
-			<optional>
-				<ref name="svg-desc"/>
-			</optional>
-			<optional>
-				<ref name="office-event-listeners"/>
-			</optional>
-		</element>
-	</define>
-	<define name="draw-area-circle">
-		<element name="draw:area-circle">
-			<ref name="common-draw-area-attlist"/>
-			<attribute name="svg:cx">
-				<ref name="coordinate"/>
-			</attribute>
-			<attribute name="svg:cy">
-				<ref name="coordinate"/>
-			</attribute>
-			<attribute name="svg:r">
-				<ref name="length"/>
-			</attribute>
-			<optional>
-				<ref name="svg-title"/>
-			</optional>
-			<optional>
-				<ref name="svg-desc"/>
-			</optional>
-			<optional>
-				<ref name="office-event-listeners"/>
-			</optional>
-		</element>
-	</define>
-	<define name="draw-area-polygon">
-		<element name="draw:area-polygon">
-			<ref name="common-draw-area-attlist"/>
-			<attribute name="svg:x">
-				<ref name="coordinate"/>
-			</attribute>
-			<attribute name="svg:y">
-				<ref name="coordinate"/>
-			</attribute>
-			<attribute name="svg:width">
-				<ref name="length"/>
-			</attribute>
-			<attribute name="svg:height">
-				<ref name="length"/>
-			</attribute>
-			<ref name="common-draw-viewbox-attlist"/>
-			<ref name="common-draw-points-attlist"/>
-			<optional>
-				<ref name="svg-title"/>
-			</optional>
-			<optional>
-				<ref name="svg-desc"/>
-			</optional>
-			<optional>
-				<ref name="office-event-listeners"/>
-			</optional>
-		</element>
-	</define>
-	<define name="common-draw-area-attlist">
-		<interleave>
-			<optional>
-				<attribute name="xlink:type">
-					<value>simple</value>
-				</attribute>
-				<attribute name="xlink:href">
-					<ref name="anyIRI"/>
-				</attribute>
-				<optional>
-					<attribute name="office:target-frame-name">
-						<ref name="targetFrameName"/>
-					</attribute>
-				</optional>
-				<optional>
-					<attribute name="xlink:show">
-						<choice>
-							<value>new</value>
-							<value>replace</value>
-						</choice>
-					</attribute>
-				</optional>
-			</optional>
-			<optional>
-				<attribute name="office:name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:nohref">
-					<value>nohref</value>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="dr3d-scene">
-		<element name="dr3d:scene">
-			<ref name="dr3d-scene-attlist"/>
-			<ref name="common-draw-position-attlist"/>
-			<ref name="common-draw-size-attlist"/>
-			<ref name="common-draw-style-name-attlist"/>
-			<ref name="common-draw-z-index-attlist"/>
-			<ref name="common-draw-id-attlist"/>
-			<ref name="common-draw-layer-name-attlist"/>
-			<ref name="common-text-spreadsheet-shape-attlist"/>
-			<ref name="common-dr3d-transform-attlist"/>
-			<ref name="common-draw-caption-id-attlist"/>
-			<optional>
-				<ref name="svg-title"/>
-			</optional>
-			<optional>
-				<ref name="svg-desc"/>
-			</optional>
-			<zeroOrMore>
-				<ref name="dr3d-light"/>
-			</zeroOrMore>
-			<zeroOrMore>
-				<ref name="shapes3d"/>
-			</zeroOrMore>
-			<zeroOrMore>
-				<ref name="draw-glue-point"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="shapes3d">
-		<choice>
-			<ref name="dr3d-scene"/>
-			<ref name="dr3d-extrude"/>
-			<ref name="dr3d-sphere"/>
-			<ref name="dr3d-rotate"/>
-			<ref name="dr3d-cube"/>
-		</choice>
-	</define>
-	<define name="dr3d-scene-attlist">
-		<interleave>
-			<optional>
-				<attribute name="dr3d:vrp">
-					<ref name="vector3D"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="dr3d:vpn">
-					<ref name="vector3D"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="dr3d:vup">
-					<ref name="vector3D"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="dr3d:projection">
-					<choice>
-						<value>parallel</value>
-						<value>perspective</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="dr3d:distance">
-					<ref name="length"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="dr3d:focal-length">
-					<ref name="length"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="dr3d:shadow-slant">
-					<ref name="angle"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="dr3d:shade-mode">
-					<choice>
-						<value>flat</value>
-						<value>phong</value>
-						<value>gouraud</value>
-						<value>draft</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="dr3d:ambient-color">
-					<ref name="color"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="dr3d:lighting-mode">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="common-dr3d-transform-attlist">
-		<optional>
-			<attribute name="dr3d:transform">
-				<ref name="string"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="dr3d-light">
-		<element name="dr3d:light">
-			<ref name="dr3d-light-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="dr3d-light-attlist">
-		<interleave>
-			<optional>
-				<attribute name="dr3d:diffuse-color">
-					<ref name="color"/>
-				</attribute>
-			</optional>
-			<attribute name="dr3d:direction">
-				<ref name="vector3D"/>
-			</attribute>
-			<optional>
-				<attribute name="dr3d:enabled">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="dr3d:specular">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="dr3d-cube">
-		<element name="dr3d:cube">
-			<ref name="dr3d-cube-attlist"/>
-			<ref name="common-draw-z-index-attlist"/>
-			<ref name="common-draw-id-attlist"/>
-			<ref name="common-draw-layer-name-attlist"/>
-			<ref name="common-draw-style-name-attlist"/>
-			<ref name="common-dr3d-transform-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="dr3d-cube-attlist">
-		<optional>
-			<attribute name="dr3d:min-edge">
-				<ref name="vector3D"/>
-			</attribute>
-		</optional>
-		<optional>
-			<attribute name="dr3d:max-edge">
-				<ref name="vector3D"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="dr3d-sphere">
-		<element name="dr3d:sphere">
-			<ref name="dr3d-sphere-attlist"/>
-			<ref name="common-draw-z-index-attlist"/>
-			<ref name="common-draw-id-attlist"/>
-			<ref name="common-draw-layer-name-attlist"/>
-			<ref name="common-draw-style-name-attlist"/>
-			<ref name="common-dr3d-transform-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="dr3d-sphere-attlist">
-		<interleave>
-			<optional>
-				<attribute name="dr3d:center">
-					<ref name="vector3D"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="dr3d:size">
-					<ref name="vector3D"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="dr3d-extrude">
-		<element name="dr3d:extrude">
-			<ref name="common-draw-path-data-attlist"/>
-			<ref name="common-draw-viewbox-attlist"/>
-			<ref name="common-draw-id-attlist"/>
-			<ref name="common-draw-z-index-attlist"/>
-			<ref name="common-draw-layer-name-attlist"/>
-			<ref name="common-draw-style-name-attlist"/>
-			<ref name="common-dr3d-transform-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="dr3d-rotate">
-		<element name="dr3d:rotate">
-			<ref name="common-draw-viewbox-attlist"/>
-			<ref name="common-draw-path-data-attlist"/>
-			<ref name="common-draw-z-index-attlist"/>
-			<ref name="common-draw-id-attlist"/>
-			<ref name="common-draw-layer-name-attlist"/>
-			<ref name="common-draw-style-name-attlist"/>
-			<ref name="common-dr3d-transform-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="draw-custom-shape">
-		<element name="draw:custom-shape">
-			<ref name="draw-custom-shape-attlist"/>
-			<ref name="common-draw-position-attlist"/>
-			<ref name="common-draw-size-attlist"/>
-			<ref name="common-draw-shape-with-text-and-styles-attlist"/>
-			<ref name="common-draw-caption-id-attlist"/>
-			<optional>
-				<ref name="svg-title"/>
-			</optional>
-			<optional>
-				<ref name="svg-desc"/>
-			</optional>
-			<optional>
-				<ref name="office-event-listeners"/>
-			</optional>
-			<zeroOrMore>
-				<ref name="draw-glue-point"/>
-			</zeroOrMore>
-			<ref name="draw-text"/>
-			<optional>
-				<ref name="draw-enhanced-geometry"/>
-			</optional>
-		</element>
-	</define>
-	<define name="draw-custom-shape-attlist">
-		<interleave>
-			<optional>
-				<attribute name="draw:engine">
-					<ref name="namespacedToken"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:data">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="draw-enhanced-geometry">
-		<element name="draw:enhanced-geometry">
-			<ref name="draw-enhanced-geometry-attlist"/>
-			<zeroOrMore>
-				<ref name="draw-equation"/>
-			</zeroOrMore>
-			<zeroOrMore>
-				<ref name="draw-handle"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="draw-enhanced-geometry-attlist">
-		<interleave>
-			<optional>
-				<attribute name="draw:type">
-					<ref name="custom-shape-type"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:viewBox">
-					<list>
-						<ref name="integer"/>
-						<ref name="integer"/>
-						<ref name="integer"/>
-						<ref name="integer"/>
-					</list>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:mirror-vertical">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:mirror-horizontal">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:text-rotate-angle">
-					<ref name="angle"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:extrusion-allowed">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:text-path-allowed">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:concentric-gradient-fill-allowed">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:extrusion">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:extrusion-brightness">
-					<ref name="zeroToHundredPercent"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:extrusion-depth">
-					<list>
-						<ref name="length"/>
-						<ref name="double"/>
-					</list>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:extrusion-diffusion">
-					<ref name="percent"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:extrusion-number-of-line-segments">
-					<ref name="integer"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:extrusion-light-face">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:extrusion-first-light-harsh">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:extrusion-second-light-harsh">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:extrusion-first-light-level">
-					<ref name="zeroToHundredPercent"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:extrusion-second-light-level">
-					<ref name="zeroToHundredPercent"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:extrusion-first-light-direction">
-					<ref name="vector3D"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:extrusion-second-light-direction">
-					<ref name="vector3D"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:extrusion-metal">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="dr3d:shade-mode">
-					<choice>
-						<value>flat</value>
-						<value>phong</value>
-						<value>gouraud</value>
-						<value>draft</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:extrusion-rotation-angle">
-					<list>
-						<ref name="angle"/>
-						<ref name="angle"/>
-					</list>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:extrusion-rotation-center">
-					<ref name="vector3D"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:extrusion-shininess">
-					<ref name="zeroToHundredPercent"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:extrusion-skew">
-					<list>
-						<ref name="double"/>
-						<ref name="angle"/>
-					</list>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:extrusion-specularity">
-					<ref name="zeroToHundredPercent"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="dr3d:projection">
-					<choice>
-						<value>parallel</value>
-						<value>perspective</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:extrusion-viewpoint">
-					<ref name="point3D"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:extrusion-origin">
-					<list>
-						<ref name="extrusionOrigin"/>
-						<ref name="extrusionOrigin"/>
-					</list>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:extrusion-color">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:enhanced-path">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:path-stretchpoint-x">
-					<ref name="double"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:path-stretchpoint-y">
-					<ref name="double"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:text-areas">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:glue-points">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:glue-point-type">
-					<choice>
-						<value>none</value>
-						<value>segments</value>
-						<value>rectangle</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:glue-point-leaving-directions">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:text-path">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:text-path-mode">
-					<choice>
-						<value>normal</value>
-						<value>path</value>
-						<value>shape</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:text-path-scale">
-					<choice>
-						<value>path</value>
-						<value>shape</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:text-path-same-letter-heights">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:modifiers">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="custom-shape-type">
-		<choice>
-			<value>non-primitive</value>
-			<ref name="string"/>
-		</choice>
-	</define>
-	<define name="point3D">
-		<data type="string">
-			<param name="pattern">\([ ]*-?([0-9]+(\.[0-9]*)?|\.[0-9]+)((cm)|(mm)|(in)|(pt)|(pc))([ ]+-?([0-9]+(\.[0-9]*)?|\.[0-9]+)((cm)|(mm)|(in)|(pt)|(pc))){2}[ ]*\)</param>
-		</data>
-	</define>
-	<define name="extrusionOrigin">
-		<data type="double">
-			<param name="minInclusive">-0.5</param>
-			<param name="maxInclusive">0.5</param>
-		</data>
-	</define>
-	<define name="draw-equation">
-		<element name="draw:equation">
-			<ref name="draw-equation-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="draw-equation-attlist">
-		<interleave>
-			<optional>
-				<attribute name="draw:name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:formula">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="draw-handle">
-		<element name="draw:handle">
-			<ref name="draw-handle-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="draw-handle-attlist">
-		<interleave>
-			<optional>
-				<attribute name="draw:handle-mirror-vertical">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:handle-mirror-horizontal">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:handle-switched">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<attribute name="draw:handle-position">
-				<ref name="string"/>
-			</attribute>
-			<optional>
-				<attribute name="draw:handle-range-x-minimum">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:handle-range-x-maximum">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:handle-range-y-minimum">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:handle-range-y-maximum">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:handle-polar">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:handle-radius-range-minimum">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:handle-radius-range-maximum">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="presentation-shape-attlist">
-		<interleave>
-			<optional>
-				<attribute name="presentation:class">
-					<ref name="presentation-classes"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="presentation:placeholder">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="presentation:user-transformed">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="presentation-classes">
-		<choice>
-			<value>title</value>
-			<value>outline</value>
-			<value>subtitle</value>
-			<value>text</value>
-			<value>graphic</value>
-			<value>object</value>
-			<value>chart</value>
-			<value>table</value>
-			<value>orgchart</value>
-			<value>page</value>
-			<value>notes</value>
-			<value>handout</value>
-			<value>header</value>
-			<value>footer</value>
-			<value>date-time</value>
-			<value>page-number</value>
-		</choice>
-	</define>
-	<define name="presentation-animations">
-		<element name="presentation:animations">
-			<zeroOrMore>
-				<choice>
-					<ref name="presentation-animation-elements"/>
-					<ref name="presentation-animation-group"/>
-				</choice>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="presentation-animation-elements">
-		<choice>
-			<ref name="presentation-show-shape"/>
-			<ref name="presentation-show-text"/>
-			<ref name="presentation-hide-shape"/>
-			<ref name="presentation-hide-text"/>
-			<ref name="presentation-dim"/>
-			<ref name="presentation-play"/>
-		</choice>
-	</define>
-	<define name="presentation-sound">
-		<element name="presentation:sound">
-			<ref name="presentation-sound-attlist"/>
-			<attribute name="xlink:type">
-				<value>simple</value>
-			</attribute>
-			<attribute name="xlink:href">
-				<ref name="anyIRI"/>
-			</attribute>
-			<optional>
-				<attribute name="xlink:actuate">
-					<value>onRequest</value>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="xlink:show">
-					<choice>
-						<value>new</value>
-						<value>replace</value>
-					</choice>
-				</attribute>
-			</optional>
-			<empty/>
-		</element>
-	</define>
-	<define name="presentation-sound-attlist">
-		<interleave>
-			<optional>
-				<attribute name="presentation:play-full">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<ref name="xml-id"/>
-			</optional>
-		</interleave>
-	</define>
-	<define name="presentation-show-shape">
-		<element name="presentation:show-shape">
-			<ref name="common-presentation-effect-attlist"/>
-			<optional>
-				<ref name="presentation-sound"/>
-			</optional>
-		</element>
-	</define>
-	<define name="common-presentation-effect-attlist">
-		<interleave>
-			<attribute name="draw:shape-id">
-				<ref name="IDREF"/>
-			</attribute>
-			<optional>
-				<attribute name="presentation:effect">
-					<ref name="presentationEffects"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="presentation:direction">
-					<ref name="presentationEffectDirections"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="presentation:speed">
-					<ref name="presentationSpeeds"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="presentation:delay">
-					<ref name="duration"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="presentation:start-scale">
-					<ref name="percent"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="presentation:path-id">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="presentationEffects">
-		<choice>
-			<value>none</value>
-			<value>fade</value>
-			<value>move</value>
-			<value>stripes</value>
-			<value>open</value>
-			<value>close</value>
-			<value>dissolve</value>
-			<value>wavyline</value>
-			<value>random</value>
-			<value>lines</value>
-			<value>laser</value>
-			<value>appear</value>
-			<value>hide</value>
-			<value>move-short</value>
-			<value>checkerboard</value>
-			<value>rotate</value>
-			<value>stretch</value>
-		</choice>
-	</define>
-	<define name="presentationEffectDirections">
-		<choice>
-			<value>none</value>
-			<value>from-left</value>
-			<value>from-top</value>
-			<value>from-right</value>
-			<value>from-bottom</value>
-			<value>from-center</value>
-			<value>from-upper-left</value>
-			<value>from-upper-right</value>
-			<value>from-lower-left</value>
-			<value>from-lower-right</value>
-			<value>to-left</value>
-			<value>to-top</value>
-			<value>to-right</value>
-			<value>to-bottom</value>
-			<value>to-upper-left</value>
-			<value>to-upper-right</value>
-			<value>to-lower-right</value>
-			<value>to-lower-left</value>
-			<value>path</value>
-			<value>spiral-inward-left</value>
-			<value>spiral-inward-right</value>
-			<value>spiral-outward-left</value>
-			<value>spiral-outward-right</value>
-			<value>vertical</value>
-			<value>horizontal</value>
-			<value>to-center</value>
-			<value>clockwise</value>
-			<value>counter-clockwise</value>
-		</choice>
-	</define>
-	<define name="presentationSpeeds">
-		<choice>
-			<value>slow</value>
-			<value>medium</value>
-			<value>fast</value>
-		</choice>
-	</define>
-	<define name="presentation-show-text">
-		<element name="presentation:show-text">
-			<ref name="common-presentation-effect-attlist"/>
-			<optional>
-				<ref name="presentation-sound"/>
-			</optional>
-		</element>
-	</define>
-	<define name="presentation-hide-shape">
-		<element name="presentation:hide-shape">
-			<ref name="common-presentation-effect-attlist"/>
-			<optional>
-				<ref name="presentation-sound"/>
-			</optional>
-		</element>
-	</define>
-	<define name="presentation-hide-text">
-		<element name="presentation:hide-text">
-			<ref name="common-presentation-effect-attlist"/>
-			<optional>
-				<ref name="presentation-sound"/>
-			</optional>
-		</element>
-	</define>
-	<define name="presentation-dim">
-		<element name="presentation:dim">
-			<ref name="presentation-dim-attlist"/>
-			<optional>
-				<ref name="presentation-sound"/>
-			</optional>
-		</element>
-	</define>
-	<define name="presentation-dim-attlist">
-		<interleave>
-			<attribute name="draw:shape-id">
-				<ref name="IDREF"/>
-			</attribute>
-			<attribute name="draw:color">
-				<ref name="color"/>
-			</attribute>
-		</interleave>
-	</define>
-	<define name="presentation-play">
-		<element name="presentation:play">
-			<ref name="presentation-play-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="presentation-play-attlist">
-		<attribute name="draw:shape-id">
-			<ref name="IDREF"/>
-		</attribute>
-		<optional>
-			<attribute name="presentation:speed">
-				<ref name="presentationSpeeds"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="presentation-animation-group">
-		<element name="presentation:animation-group">
-			<zeroOrMore>
-				<ref name="presentation-animation-elements"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="common-anim-attlist">
-		<interleave>
-			<optional>
-				<attribute name="presentation:node-type">
-					<choice>
-						<value>default</value>
-						<value>on-click</value>
-						<value>with-previous</value>
-						<value>after-previous</value>
-						<value>timing-root</value>
-						<value>main-sequence</value>
-						<value>interactive-sequence</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="presentation:preset-id">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="presentation:preset-sub-type">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="presentation:preset-class">
-					<choice>
-						<value>custom</value>
-						<value>entrance</value>
-						<value>exit</value>
-						<value>emphasis</value>
-						<value>motion-path</value>
-						<value>ole-action</value>
-						<value>media-call</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="presentation:master-element">
-					<ref name="IDREF"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="presentation:group-id">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<group>
-					<ref name="xml-id"/>
-					<optional>
-						<attribute name="anim:id">
-							<ref name="NCName"/>
-						</attribute>
-					</optional>
-				</group>
-			</optional>
-		</interleave>
-	</define>
-	<define name="presentation-event-listener">
-		<element name="presentation:event-listener">
-			<ref name="presentation-event-listener-attlist"/>
-			<optional>
-				<ref name="presentation-sound"/>
-			</optional>
-		</element>
-	</define>
-	<define name="presentation-event-listener-attlist">
-		<interleave>
-			<attribute name="script:event-name">
-				<ref name="string"/>
-			</attribute>
-			<attribute name="presentation:action">
-				<choice>
-					<value>none</value>
-					<value>previous-page</value>
-					<value>next-page</value>
-					<value>first-page</value>
-					<value>last-page</value>
-					<value>hide</value>
-					<value>stop</value>
-					<value>execute</value>
-					<value>show</value>
-					<value>verb</value>
-					<value>fade-out</value>
-					<value>sound</value>
-					<value>last-visited-page</value>
-				</choice>
-			</attribute>
-			<optional>
-				<attribute name="presentation:effect">
-					<ref name="presentationEffects"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="presentation:direction">
-					<ref name="presentationEffectDirections"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="presentation:speed">
-					<ref name="presentationSpeeds"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="presentation:start-scale">
-					<ref name="percent"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="xlink:type">
-					<value>simple</value>
-				</attribute>
-				<attribute name="xlink:href">
-					<ref name="anyIRI"/>
-				</attribute>
-				<optional>
-					<attribute name="xlink:show">
-						<value>embed</value>
-					</attribute>
-				</optional>
-				<optional>
-					<attribute name="xlink:actuate">
-						<value>onRequest</value>
-					</attribute>
-				</optional>
-			</optional>
-			<optional>
-				<attribute name="presentation:verb">
-					<ref name="nonNegativeInteger"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="presentation-decls">
-		<zeroOrMore>
-			<ref name="presentation-decl"/>
-		</zeroOrMore>
-	</define>
-	<define name="presentation-decl">
-		<choice>
-			<element name="presentation:header-decl">
-				<ref name="presentation-header-decl-attlist"/>
-				<text/>
-			</element>
-			<element name="presentation:footer-decl">
-				<ref name="presentation-footer-decl-attlist"/>
-				<text/>
-			</element>
-			<element name="presentation:date-time-decl">
-				<ref name="presentation-date-time-decl-attlist"/>
-				<text/>
-			</element>
-		</choice>
-	</define>
-	<define name="presentation-header-decl-attlist">
-		<attribute name="presentation:name">
-			<ref name="string"/>
-		</attribute>
-	</define>
-	<define name="presentation-footer-decl-attlist">
-		<attribute name="presentation:name">
-			<ref name="string"/>
-		</attribute>
-	</define>
-	<define name="presentation-date-time-decl-attlist">
-		<interleave>
-			<attribute name="presentation:name">
-				<ref name="string"/>
-			</attribute>
-			<attribute name="presentation:source">
-				<choice>
-					<value>fixed</value>
-					<value>current-date</value>
-				</choice>
-			</attribute>
-			<optional>
-				<attribute name="style:data-style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="presentation-settings">
-		<optional>
-			<element name="presentation:settings">
-				<ref name="presentation-settings-attlist"/>
-				<zeroOrMore>
-					<ref name="presentation-show"/>
-				</zeroOrMore>
-			</element>
-		</optional>
-	</define>
-	<define name="presentation-settings-attlist">
-		<interleave>
-			<optional>
-				<attribute name="presentation:start-page">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="presentation:show">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="presentation:full-screen">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="presentation:endless">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="presentation:pause">
-					<ref name="duration"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="presentation:show-logo">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="presentation:force-manual">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="presentation:mouse-visible">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="presentation:mouse-as-pen">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="presentation:start-with-navigator">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="presentation:animations">
-					<choice>
-						<value>enabled</value>
-						<value>disabled</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="presentation:transition-on-click">
-					<choice>
-						<value>enabled</value>
-						<value>disabled</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="presentation:stay-on-top">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="presentation:show-end-of-presentation-slide">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="presentation-show">
-		<element name="presentation:show">
-			<ref name="presentation-show-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="presentation-show-attlist">
-		<interleave>
-			<attribute name="presentation:name">
-				<ref name="string"/>
-			</attribute>
-			<attribute name="presentation:pages">
-				<ref name="string"/>
-			</attribute>
-		</interleave>
-	</define>
-	<define name="chart-chart">
-		<element name="chart:chart">
-			<ref name="chart-chart-attlist"/>
-			<optional>
-				<ref name="chart-title"/>
-			</optional>
-			<optional>
-				<ref name="chart-subtitle"/>
-			</optional>
-			<optional>
-				<ref name="chart-footer"/>
-			</optional>
-			<optional>
-				<ref name="chart-legend"/>
-			</optional>
-			<ref name="chart-plot-area"/>
-			<optional>
-				<ref name="table-table"/>
-			</optional>
-		</element>
-	</define>
-	<define name="chart-chart-attlist">
-		<interleave>
-			<attribute name="chart:class">
-				<ref name="namespacedToken"/>
-			</attribute>
-			<ref name="common-draw-size-attlist"/>
-			<optional>
-				<attribute name="chart:column-mapping">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:row-mapping">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<optional>
-				<group>
-					<attribute name="xlink:type">
-						<value>simple</value>
-					</attribute>
-					<attribute name="xlink:href">
-						<ref name="anyIRI"/>
-					</attribute>
-				</group>
-			</optional>
-			<optional>
-				<ref name="xml-id"/>
-			</optional>
-		</interleave>
-	</define>
-	<define name="chart-title">
-		<element name="chart:title">
-			<ref name="chart-title-attlist"/>
-			<optional>
-				<ref name="text-p"/>
-			</optional>
-		</element>
-	</define>
-	<define name="chart-title-attlist">
-		<interleave>
-			<optional>
-				<attribute name="table:cell-range">
-					<ref name="cellRangeAddressList"/>
-				</attribute>
-			</optional>
-			<ref name="common-draw-position-attlist"/>
-			<optional>
-				<attribute name="chart:style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="chart-subtitle">
-		<element name="chart:subtitle">
-			<ref name="chart-title-attlist"/>
-			<optional>
-				<ref name="text-p"/>
-			</optional>
-		</element>
-	</define>
-	<define name="chart-footer">
-		<element name="chart:footer">
-			<ref name="chart-title-attlist"/>
-			<optional>
-				<ref name="text-p"/>
-			</optional>
-		</element>
-	</define>
-	<define name="chart-legend">
-		<element name="chart:legend">
-			<ref name="chart-legend-attlist"/>
-			<optional>
-				<ref name="text-p"/>
-			</optional>
-		</element>
-	</define>
-	<define name="chart-legend-attlist">
-		<interleave>
-			<choice>
-				<group>
-					<attribute name="chart:legend-position">
-						<choice>
-							<value>start</value>
-							<value>end</value>
-							<value>top</value>
-							<value>bottom</value>
-						</choice>
-					</attribute>
-					<optional>
-						<attribute name="chart:legend-align">
-							<choice>
-								<value>start</value>
-								<value>center</value>
-								<value>end</value>
-							</choice>
-						</attribute>
-					</optional>
-				</group>
-				<attribute name="chart:legend-position">
-					<choice>
-						<value>top-start</value>
-						<value>bottom-start</value>
-						<value>top-end</value>
-						<value>bottom-end</value>
-					</choice>
-				</attribute>
-				<empty/>
-			</choice>
-			<ref name="common-draw-position-attlist"/>
-			<choice>
-				<attribute name="style:legend-expansion">
-					<choice>
-						<value>wide</value>
-						<value>high</value>
-						<value>balanced</value>
-					</choice>
-				</attribute>
-				<group>
-					<attribute name="style:legend-expansion">
-						<value>custom</value>
-					</attribute>
-					<attribute name="style:legend-expansion-aspect-ratio">
-						<ref name="double"/>
-					</attribute>
-				</group>
-				<empty/>
-			</choice>
-			<optional>
-				<attribute name="chart:style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="chart-plot-area">
-		<element name="chart:plot-area">
-			<ref name="chart-plot-area-attlist"/>
-			<zeroOrMore>
-				<ref name="dr3d-light"/>
-			</zeroOrMore>
-			<zeroOrMore>
-				<ref name="chart-axis"/>
-			</zeroOrMore>
-			<zeroOrMore>
-				<ref name="chart-series"/>
-			</zeroOrMore>
-			<optional>
-				<ref name="chart-stock-gain-marker"/>
-			</optional>
-			<optional>
-				<ref name="chart-stock-loss-marker"/>
-			</optional>
-			<optional>
-				<ref name="chart-stock-range-line"/>
-			</optional>
-			<optional>
-				<ref name="chart-wall"/>
-			</optional>
-			<optional>
-				<ref name="chart-floor"/>
-			</optional>
-		</element>
-	</define>
-	<define name="chart-plot-area-attlist">
-		<interleave>
-			<ref name="common-draw-position-attlist"/>
-			<ref name="common-draw-size-attlist"/>
-			<optional>
-				<attribute name="chart:style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:cell-range-address">
-					<ref name="cellRangeAddressList"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:data-source-has-labels">
-					<choice>
-						<value>none</value>
-						<value>row</value>
-						<value>column</value>
-						<value>both</value>
-					</choice>
-				</attribute>
-			</optional>
-			<ref name="dr3d-scene-attlist"/>
-			<ref name="common-dr3d-transform-attlist"/>
-			<optional>
-				<ref name="xml-id"/>
-			</optional>
-		</interleave>
-	</define>
-	<define name="chart-wall">
-		<element name="chart:wall">
-			<ref name="chart-wall-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="chart-wall-attlist">
-		<interleave>
-			<optional>
-				<attribute name="svg:width">
-					<ref name="length"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="chart-floor">
-		<element name="chart:floor">
-			<ref name="chart-floor-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="chart-floor-attlist">
-		<interleave>
-			<optional>
-				<attribute name="svg:width">
-					<ref name="length"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="chart-axis">
-		<element name="chart:axis">
-			<ref name="chart-axis-attlist"/>
-			<optional>
-				<ref name="chart-title"/>
-			</optional>
-			<optional>
-				<ref name="chart-categories"/>
-			</optional>
-			<zeroOrMore>
-				<ref name="chart-grid"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="chart-axis-attlist">
-		<interleave>
-			<attribute name="chart:dimension">
-				<ref name="chart-dimension"/>
-			</attribute>
-			<optional>
-				<attribute name="chart:name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="chart-dimension">
-		<choice>
-			<value>x</value>
-			<value>y</value>
-			<value>z</value>
-		</choice>
-	</define>
-	<define name="chart-categories">
-		<element name="chart:categories">
-			<optional>
-				<attribute name="table:cell-range-address">
-					<ref name="cellRangeAddressList"/>
-				</attribute>
-			</optional>
-		</element>
-	</define>
-	<define name="chart-grid">
-		<element name="chart:grid">
-			<ref name="chart-grid-attlist"/>
-		</element>
-	</define>
-	<define name="chart-grid-attlist">
-		<interleave>
-			<optional>
-				<attribute name="chart:class">
-					<choice>
-						<value>major</value>
-						<value>minor</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="chart-series">
-		<element name="chart:series">
-			<ref name="chart-series-attlist"/>
-			<zeroOrMore>
-				<ref name="chart-domain"/>
-			</zeroOrMore>
-			<optional>
-				<ref name="chart-mean-value"/>
-			</optional>
-			<zeroOrMore>
-				<ref name="chart-regression-curve"/>
-			</zeroOrMore>
-			<zeroOrMore>
-				<ref name="chart-error-indicator"/>
-			</zeroOrMore>
-			<zeroOrMore>
-				<ref name="chart-data-point"/>
-			</zeroOrMore>
-			<optional>
-				<ref name="chart-data-label"/>
-			</optional>
-		</element>
-	</define>
-	<define name="chart-series-attlist">
-		<interleave>
-			<optional>
-				<attribute name="chart:values-cell-range-address">
-					<ref name="cellRangeAddressList"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:label-cell-address">
-					<ref name="cellRangeAddressList"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:class">
-					<ref name="namespacedToken"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:attached-axis">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<optional>
-				<ref name="xml-id"/>
-			</optional>
-		</interleave>
-	</define>
-	<define name="chart-domain">
-		<element name="chart:domain">
-			<optional>
-				<attribute name="table:cell-range-address">
-					<ref name="cellRangeAddressList"/>
-				</attribute>
-			</optional>
-		</element>
-	</define>
-	<define name="chart-data-point">
-		<element name="chart:data-point">
-			<ref name="chart-data-point-attlist"/>
-			<optional>
-				<ref name="chart-data-label"/>
-			</optional>
-		</element>
-	</define>
-	<define name="chart-data-point-attlist">
-		<interleave>
-			<optional>
-				<attribute name="chart:repeated">
-					<ref name="positiveInteger"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<optional>
-				<ref name="xml-id"/>
-			</optional>
-		</interleave>
-	</define>
-	<define name="chart-data-label">
-		<element name="chart:data-label">
-			<ref name="chart-data-label-attlist"/>
-			<optional>
-				<ref name="text-p"/>
-			</optional>
-		</element>
-	</define>
-	<define name="chart-data-label-attlist">
-		<interleave>
-			<ref name="common-draw-position-attlist"/>
-			<optional>
-				<attribute name="chart:style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="chart-mean-value">
-		<element name="chart:mean-value">
-			<ref name="chart-mean-value-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="chart-mean-value-attlist">
-		<optional>
-			<attribute name="chart:style-name">
-				<ref name="styleNameRef"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="chart-error-indicator">
-		<element name="chart:error-indicator">
-			<ref name="chart-error-indicator-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="chart-error-indicator-attlist">
-		<interleave>
-			<optional>
-				<attribute name="chart:style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<attribute name="chart:dimension">
-				<ref name="chart-dimension"/>
-			</attribute>
-		</interleave>
-	</define>
-	<define name="chart-regression-curve">
-		<element name="chart:regression-curve">
-			<ref name="chart-regression-curve-attlist"/>
-			<optional>
-				<ref name="chart-equation"/>
-			</optional>
-		</element>
-	</define>
-	<define name="chart-regression-curve-attlist">
-		<optional>
-			<attribute name="chart:style-name">
-				<ref name="styleNameRef"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="chart-equation">
-		<element name="chart:equation">
-			<ref name="chart-equation-attlist"/>
-			<optional>
-				<ref name="text-p"/>
-			</optional>
-		</element>
-	</define>
-	<define name="chart-equation-attlist">
-		<interleave>
-			<optional>
-				<attribute name="chart:automatic-content">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:display-r-square">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:display-equation">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<ref name="common-draw-position-attlist"/>
-			<optional>
-				<attribute name="chart:style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="chart-stock-gain-marker">
-		<element name="chart:stock-gain-marker">
-			<ref name="common-stock-marker-attlist"/>
-		</element>
-	</define>
-	<define name="chart-stock-loss-marker">
-		<element name="chart:stock-loss-marker">
-			<ref name="common-stock-marker-attlist"/>
-		</element>
-	</define>
-	<define name="chart-stock-range-line">
-		<element name="chart:stock-range-line">
-			<ref name="common-stock-marker-attlist"/>
-		</element>
-	</define>
-	<define name="common-stock-marker-attlist">
-		<optional>
-			<attribute name="chart:style-name">
-				<ref name="styleNameRef"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="office-database">
-		<element name="office:database">
-			<ref name="db-data-source"/>
-			<optional>
-				<ref name="db-forms"/>
-			</optional>
-			<optional>
-				<ref name="db-reports"/>
-			</optional>
-			<optional>
-				<ref name="db-queries"/>
-			</optional>
-			<optional>
-				<ref name="db-table-presentations"/>
-			</optional>
-			<optional>
-				<ref name="db-schema-definition"/>
-			</optional>
-		</element>
-	</define>
-	<define name="db-data-source">
-		<element name="db:data-source">
-			<ref name="db-data-source-attlist"/>
-			<ref name="db-connection-data"/>
-			<optional>
-				<ref name="db-driver-settings"/>
-			</optional>
-			<optional>
-				<ref name="db-application-connection-settings"/>
-			</optional>
-		</element>
-	</define>
-	<define name="db-data-source-attlist">
-		<empty/>
-	</define>
-	<define name="db-connection-data">
-		<element name="db:connection-data">
-			<ref name="db-connection-data-attlist"/>
-			<choice>
-				<ref name="db-database-description"/>
-				<ref name="db-connection-resource"/>
-			</choice>
-			<optional>
-				<ref name="db-login"/>
-			</optional>
-		</element>
-	</define>
-	<define name="db-connection-data-attlist">
-		<empty/>
-	</define>
-	<define name="db-database-description">
-		<element name="db:database-description">
-			<ref name="db-database-description-attlist"/>
-			<choice>
-				<ref name="db-file-based-database"/>
-				<ref name="db-server-database"/>
-			</choice>
-		</element>
-	</define>
-	<define name="db-database-description-attlist">
-		<empty/>
-	</define>
-	<define name="db-file-based-database">
-		<element name="db:file-based-database">
-			<ref name="db-file-based-database-attlist"/>
-		</element>
-	</define>
-	<define name="db-file-based-database-attlist">
-		<interleave>
-			<attribute name="xlink:type">
-				<value>simple</value>
-			</attribute>
-			<attribute name="xlink:href">
-				<ref name="anyIRI"/>
-			</attribute>
-			<attribute name="db:media-type">
-				<ref name="string"/>
-			</attribute>
-			<optional>
-				<attribute name="db:extension">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="db-server-database">
-		<element name="db:server-database">
-			<ref name="db-server-database-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="db-server-database-attlist">
-		<interleave>
-			<attribute name="db:type">
-				<ref name="namespacedToken"/>
-			</attribute>
-			<choice>
-				<ref name="db-host-and-port"/>
-				<ref name="db-local-socket-name"/>
-			</choice>
-			<optional>
-				<attribute name="db:database-name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="db-host-and-port">
-		<attribute name="db:hostname">
-			<ref name="string"/>
-		</attribute>
-		<optional>
-			<attribute name="db:port">
-				<ref name="positiveInteger"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="db-local-socket-name">
-		<optional>
-			<attribute name="db:local-socket">
-				<ref name="string"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="db-connection-resource">
-		<element name="db:connection-resource">
-			<ref name="db-connection-resource-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="db-connection-resource-attlist">
-		<attribute name="xlink:type">
-			<value>simple</value>
-		</attribute>
-		<attribute name="xlink:href">
-			<ref name="anyIRI"/>
-		</attribute>
-		<optional>
-			<attribute name="xlink:show">
-				<value>none</value>
-			</attribute>
-		</optional>
-		<optional>
-			<attribute name="xlink:actuate">
-				<value>onRequest</value>
-			</attribute>
-		</optional>
-	</define>
-	<define name="db-login">
-		<element name="db:login">
-			<ref name="db-login-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="db-login-attlist">
-		<interleave>
-			<optional>
-				<choice>
-					<attribute name="db:user-name">
-						<ref name="string"/>
-					</attribute>
-					<attribute name="db:use-system-user">
-						<ref name="boolean"/>
-					</attribute>
-				</choice>
-			</optional>
-			<optional>
-				<attribute name="db:is-password-required">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="db:login-timeout">
-					<ref name="positiveInteger"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="db-driver-settings">
-		<element name="db:driver-settings">
-			<ref name="db-driver-settings-attlist"/>
-			<optional>
-				<ref name="db-auto-increment"/>
-			</optional>
-			<optional>
-				<ref name="db-delimiter"/>
-			</optional>
-			<optional>
-				<ref name="db-character-set"/>
-			</optional>
-			<optional>
-				<ref name="db-table-settings"/>
-			</optional>
-		</element>
-	</define>
-	<define name="db-driver-settings-attlist">
-		<interleave>
-			<ref name="db-show-deleted"/>
-			<optional>
-				<attribute name="db:system-driver-settings">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="db:base-dn">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<ref name="db-is-first-row-header-line"/>
-			<optional>
-				<attribute name="db:parameter-name-substitution">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="db-show-deleted">
-		<optional>
-			<attribute name="db:show-deleted">
-				<ref name="boolean"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="db-is-first-row-header-line">
-		<optional>
-			<attribute name="db:is-first-row-header-line">
-				<ref name="boolean"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="db-auto-increment">
-		<element name="db:auto-increment">
-			<ref name="db-auto-increment-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="db-auto-increment-attlist">
-		<interleave>
-			<optional>
-				<attribute name="db:additional-column-statement">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="db:row-retrieving-statement">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="db-delimiter">
-		<element name="db:delimiter">
-			<ref name="db-delimiter-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="db-delimiter-attlist">
-		<interleave>
-			<optional>
-				<attribute name="db:field">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="db:string">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="db:decimal">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="db:thousand">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="db-character-set">
-		<element name="db:character-set">
-			<ref name="db-character-set-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="db-character-set-attlist">
-		<optional>
-			<attribute name="db:encoding">
-				<ref name="textEncoding"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="db-table-settings">
-		<element name="db:table-settings">
-			<zeroOrMore>
-				<ref name="db-table-setting"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="db-table-setting">
-		<element name="db:table-setting">
-			<ref name="db-table-setting-attlist"/>
-			<optional>
-				<ref name="db-delimiter"/>
-			</optional>
-			<optional>
-				<ref name="db-character-set"/>
-			</optional>
-			<empty/>
-		</element>
-	</define>
-	<define name="db-table-setting-attlist">
-		<ref name="db-is-first-row-header-line"/>
-		<ref name="db-show-deleted"/>
-	</define>
-	<define name="db-application-connection-settings">
-		<element name="db:application-connection-settings">
-			<ref name="db-application-connection-settings-attlist"/>
-			<optional>
-				<ref name="db-table-filter"/>
-			</optional>
-			<optional>
-				<ref name="db-table-type-filter"/>
-			</optional>
-			<optional>
-				<ref name="db-data-source-settings"/>
-			</optional>
-		</element>
-	</define>
-	<define name="db-application-connection-settings-attlist">
-		<interleave>
-			<optional>
-				<attribute name="db:is-table-name-length-limited">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="db:enable-sql92-check">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="db:append-table-alias-name">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="db:ignore-driver-privileges">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="db:boolean-comparison-mode">
-					<choice>
-						<value>equal-integer</value>
-						<value>is-boolean</value>
-						<value>equal-boolean</value>
-						<value>equal-use-only-zero</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="db:use-catalog">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="db:max-row-count">
-					<ref name="integer"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="db:suppress-version-columns">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="db-table-filter">
-		<element name="db:table-filter">
-			<ref name="db-table-filter-attlist"/>
-			<optional>
-				<ref name="db-table-include-filter"/>
-			</optional>
-			<optional>
-				<ref name="db-table-exclude-filter"/>
-			</optional>
-		</element>
-	</define>
-	<define name="db-table-filter-attlist">
-		<empty/>
-	</define>
-	<define name="db-table-include-filter">
-		<element name="db:table-include-filter">
-			<ref name="db-table-include-filter-attlist"/>
-			<oneOrMore>
-				<ref name="db-table-filter-pattern"/>
-			</oneOrMore>
-		</element>
-	</define>
-	<define name="db-table-include-filter-attlist">
-		<empty/>
-	</define>
-	<define name="db-table-exclude-filter">
-		<element name="db:table-exclude-filter">
-			<ref name="db-table-exclude-filter-attlist"/>
-			<oneOrMore>
-				<ref name="db-table-filter-pattern"/>
-			</oneOrMore>
-		</element>
-	</define>
-	<define name="db-table-exclude-filter-attlist">
-		<empty/>
-	</define>
-	<define name="db-table-filter-pattern">
-		<element name="db:table-filter-pattern">
-			<ref name="db-table-filter-pattern-attlist"/>
-			<ref name="string"/>
-		</element>
-	</define>
-	<define name="db-table-filter-pattern-attlist">
-		<empty/>
-	</define>
-	<define name="db-table-type-filter">
-		<element name="db:table-type-filter">
-			<ref name="db-table-type-filter-attlist"/>
-			<zeroOrMore>
-				<ref name="db-table-type"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="db-table-type-filter-attlist">
-		<empty/>
-	</define>
-	<define name="db-table-type">
-		<element name="db:table-type">
-			<ref name="db-table-type-attlist"/>
-			<ref name="string"/>
-		</element>
-	</define>
-	<define name="db-table-type-attlist">
-		<empty/>
-	</define>
-	<define name="db-data-source-settings">
-		<element name="db:data-source-settings">
-			<ref name="db-data-source-settings-attlist"/>
-			<oneOrMore>
-				<ref name="db-data-source-setting"/>
-			</oneOrMore>
-		</element>
-	</define>
-	<define name="db-data-source-settings-attlist">
-		<empty/>
-	</define>
-	<define name="db-data-source-setting">
-		<element name="db:data-source-setting">
-			<ref name="db-data-source-setting-attlist"/>
-			<oneOrMore>
-				<ref name="db-data-source-setting-value"/>
-			</oneOrMore>
-		</element>
-	</define>
-	<define name="db-data-source-setting-attlist">
-		<interleave>
-			<optional>
-				<attribute name="db:data-source-setting-is-list">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<attribute name="db:data-source-setting-name">
-				<ref name="string"/>
-			</attribute>
-			<attribute name="db:data-source-setting-type">
-				<ref name="db-data-source-setting-types"/>
-			</attribute>
-		</interleave>
-	</define>
-	<define name="db-data-source-setting-types">
-		<choice>
-			<value>boolean</value>
-			<value>short</value>
-			<value>int</value>
-			<value>long</value>
-			<value>double</value>
-			<value>string</value>
-		</choice>
-	</define>
-	<define name="db-data-source-setting-value">
-		<element name="db:data-source-setting-value">
-			<ref name="db-data-source-setting-value-attlist"/>
-			<ref name="string"/>
-		</element>
-	</define>
-	<define name="db-data-source-setting-value-attlist">
-		<empty/>
-	</define>
-	<define name="db-forms">
-		<element name="db:forms">
-			<ref name="db-forms-attlist"/>
-			<zeroOrMore>
-				<choice>
-					<ref name="db-component"/>
-					<ref name="db-component-collection"/>
-				</choice>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="db-forms-attlist">
-		<empty/>
-	</define>
-	<define name="db-reports">
-		<element name="db:reports">
-			<ref name="db-reports-attlist"/>
-			<zeroOrMore>
-				<choice>
-					<ref name="db-component"/>
-					<ref name="db-component-collection"/>
-				</choice>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="db-reports-attlist">
-		<empty/>
-	</define>
-	<define name="db-component-collection">
-		<element name="db:component-collection">
-			<ref name="db-component-collection-attlist"/>
-			<ref name="common-db-object-name"/>
-			<ref name="common-db-object-title"/>
-			<ref name="common-db-object-description"/>
-			<zeroOrMore>
-				<choice>
-					<ref name="db-component"/>
-					<ref name="db-component-collection"/>
-				</choice>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="db-component-collection-attlist">
-		<empty/>
-	</define>
-	<define name="db-component">
-		<element name="db:component">
-			<ref name="db-component-attlist"/>
-			<ref name="common-db-object-name"/>
-			<ref name="common-db-object-title"/>
-			<ref name="common-db-object-description"/>
-			<optional>
-				<choice>
-					<ref name="office-document"/>
-					<ref name="math-math"/>
-				</choice>
-			</optional>
-		</element>
-	</define>
-	<define name="db-component-attlist">
-		<interleave>
-			<optional>
-				<attribute name="xlink:type">
-					<value>simple</value>
-				</attribute>
-				<attribute name="xlink:href">
-					<ref name="anyIRI"/>
-				</attribute>
-				<optional>
-					<attribute name="xlink:show">
-						<value>none</value>
-					</attribute>
-				</optional>
-				<optional>
-					<attribute name="xlink:actuate">
-						<value>onRequest</value>
-					</attribute>
-				</optional>
-			</optional>
-			<optional>
-				<attribute name="db:as-template">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="db-queries">
-		<element name="db:queries">
-			<ref name="db-queries-attlist"/>
-			<zeroOrMore>
-				<choice>
-					<ref name="db-query"/>
-					<ref name="db-query-collection"/>
-				</choice>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="db-queries-attlist">
-		<empty/>
-	</define>
-	<define name="db-query-collection">
-		<element name="db:query-collection">
-			<ref name="db-query-collection-attlist"/>
-			<ref name="common-db-object-name"/>
-			<ref name="common-db-object-title"/>
-			<ref name="common-db-object-description"/>
-			<zeroOrMore>
-				<choice>
-					<ref name="db-query"/>
-					<ref name="db-query-collection"/>
-				</choice>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="db-query-collection-attlist">
-		<empty/>
-	</define>
-	<define name="db-query">
-		<element name="db:query">
-			<ref name="db-query-attlist"/>
-			<ref name="common-db-object-name"/>
-			<ref name="common-db-object-title"/>
-			<ref name="common-db-object-description"/>
-			<ref name="common-db-table-style-name"/>
-			<optional>
-				<ref name="db-order-statement"/>
-			</optional>
-			<optional>
-				<ref name="db-filter-statement"/>
-			</optional>
-			<optional>
-				<ref name="db-columns"/>
-			</optional>
-			<optional>
-				<ref name="db-update-table"/>
-			</optional>
-		</element>
-	</define>
-	<define name="db-query-attlist">
-		<interleave>
-			<attribute name="db:command">
-				<ref name="string"/>
-			</attribute>
-			<optional>
-				<attribute name="db:escape-processing">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="db-order-statement">
-		<element name="db:order-statement">
-			<ref name="db-command"/>
-			<ref name="db-apply-command"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="db-filter-statement">
-		<element name="db:filter-statement">
-			<ref name="db-command"/>
-			<ref name="db-apply-command"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="db-update-table">
-		<element name="db:update-table">
-			<ref name="common-db-table-name-attlist"/>
-		</element>
-	</define>
-	<define name="db-table-presentations">
-		<element name="db:table-representations">
-			<ref name="db-table-presentations-attlist"/>
-			<zeroOrMore>
-				<ref name="db-table-presentation"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="db-table-presentations-attlist">
-		<empty/>
-	</define>
-	<define name="db-table-presentation">
-		<element name="db:table-representation">
-			<ref name="db-table-presentation-attlist"/>
-			<ref name="common-db-table-name-attlist"/>
-			<ref name="common-db-object-title"/>
-			<ref name="common-db-object-description"/>
-			<ref name="common-db-table-style-name"/>
-			<optional>
-				<ref name="db-order-statement"/>
-			</optional>
-			<optional>
-				<ref name="db-filter-statement"/>
-			</optional>
-			<optional>
-				<ref name="db-columns"/>
-			</optional>
-		</element>
-	</define>
-	<define name="db-table-presentation-attlist">
-		<empty/>
-	</define>
-	<define name="db-columns">
-		<element name="db:columns">
-			<ref name="db-columns-attlist"/>
-			<oneOrMore>
-				<ref name="db-column"/>
-			</oneOrMore>
-		</element>
-	</define>
-	<define name="db-columns-attlist">
-		<empty/>
-	</define>
-	<define name="db-column">
-		<element name="db:column">
-			<ref name="db-column-attlist"/>
-			<ref name="common-db-object-name"/>
-			<ref name="common-db-object-title"/>
-			<ref name="common-db-object-description"/>
-			<ref name="common-db-default-value"/>
-		</element>
-	</define>
-	<define name="db-column-attlist">
-		<interleave>
-			<optional>
-				<attribute name="db:visible">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-	
-			<optional>
-				<attribute name="db:style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="db:default-cell-style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="db-command">
-		<attribute name="db:command">
-			<ref name="string"/>
-		</attribute>
-	</define>
-	<define name="db-apply-command">
-		<optional>
-			<attribute name="db:apply-command">
-				<ref name="boolean"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-db-table-name-attlist">
-		<interleave>
-			<attribute name="db:name">
-				<ref name="string"/>
-			</attribute>
-			<optional>
-				<attribute name="db:catalog-name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="db:schema-name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="common-db-object-name">
-		<attribute name="db:name">
-			<ref name="string"/>
-		</attribute>
-	</define>
-	<define name="common-db-object-title">
-		<optional>
-			<attribute name="db:title">
-				<ref name="string"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-db-object-description">
-		<optional>
-			<attribute name="db:description">
-				<ref name="string"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-db-table-style-name">
-		<interleave>
-			<optional>
-				<attribute name="db:style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="db:default-row-style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="common-db-default-value">
-		<optional>
-			<ref name="common-value-and-type-attlist"/>
-		</optional>
-	</define>
-	<define name="db-schema-definition">
-		<element name="db:schema-definition">
-			<ref name="db-schema-definition-attlist"/>
-			<ref name="db-table-definitions"/>
-		</element>
-	</define>
-	<define name="db-schema-definition-attlist">
-		<empty/>
-	</define>
-	<define name="db-table-definitions">
-		<element name="db:table-definitions">
-			<ref name="db-table-definitions-attlist"/>
-			<zeroOrMore>
-				<ref name="db-table-definition"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="db-table-definitions-attlist">
-		<empty/>
-	</define>
-	<define name="db-table-definition">
-		<element name="db:table-definition">
-			<ref name="common-db-table-name-attlist"/>
-			<ref name="db-table-definition-attlist"/>
-			<ref name="db-column-definitions"/>
-			<optional>
-				<ref name="db-keys"/>
-			</optional>
-			<optional>
-				<ref name="db-indices"/>
-			</optional>
-		</element>
-	</define>
-	<define name="db-table-definition-attlist">
-		<optional>
-			<attribute name="db:type">
-				<ref name="string"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="db-column-definitions">
-		<element name="db:column-definitions">
-			<ref name="db-column-definitions-attlist"/>
-			<oneOrMore>
-				<ref name="db-column-definition"/>
-			</oneOrMore>
-		</element>
-	</define>
-	<define name="db-column-definitions-attlist">
-		<empty/>
-	</define>
-	<define name="db-column-definition">
-		<element name="db:column-definition">
-			<ref name="db-column-definition-attlist"/>
-			<ref name="common-db-default-value"/>
-		</element>
-	</define>
-	<define name="db-column-definition-attlist">
-		<interleave>
-			<attribute name="db:name">
-				<ref name="string"/>
-			</attribute>
-	
-			<optional>
-				<attribute name="db:data-type">
-					<ref name="db-data-types"/>
-				</attribute>
-			</optional>
-	
-			<optional>
-				<attribute name="db:type-name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-	
-			<optional>
-				<attribute name="db:precision">
-					<ref name="positiveInteger"/>
-				</attribute>
-			</optional>
-	
-			<optional>
-				<attribute name="db:scale">
-					<ref name="positiveInteger"/>
-				</attribute>
-			</optional>
-	
-			<optional>
-				<attribute name="db:is-nullable">
-					<choice>
-						<value>no-nulls</value>
-						<value>nullable</value>
-					</choice>
-				</attribute>
-			</optional>
-	
-			<optional>
-				<attribute name="db:is-empty-allowed">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-	
-			<optional>
-				<attribute name="db:is-autoincrement">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="db-data-types">
-		<choice>
-			<value>bit</value>
-			<value>boolean</value>
-			<value>tinyint</value>
-			<value>smallint</value>
-			<value>integer</value>
-			<value>bigint</value>
-			<value>float</value>
-			<value>real</value>
-			<value>double</value>
-			<value>numeric</value>
-			<value>decimal</value>
-			<value>char</value>
-			<value>varchar</value>
-			<value>longvarchar</value>
-			<value>date</value>
-			<value>time</value>
-			<value>timestmp</value>
-			<value>binary</value>
-			<value>varbinary</value>
-			<value>longvarbinary</value>
-			<value>sqlnull</value>
-			<value>other</value>
-			<value>object</value>
-			<value>distinct</value>
-			<value>struct</value>
-			<value>array</value>
-			<value>blob</value>
-			<value>clob</value>
-			<value>ref</value>
-		</choice>
-	</define>
-	<define name="db-keys">
-		<element name="db:keys">
-			<ref name="db-keys-attlist"/>
-			<oneOrMore>
-				<ref name="db-key"/>
-			</oneOrMore>
-		</element>
-	</define>
-	<define name="db-keys-attlist">
-		<empty/>
-	</define>
-	<define name="db-key">
-		<element name="db:key">
-			<ref name="db-key-attlist"/>
-			<oneOrMore>
-				<ref name="db-key-columns"/>
-			</oneOrMore>
-		</element>
-	</define>
-	<define name="db-key-attlist">
-		<interleave>
-			<optional>
-				<attribute name="db:name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-	
-			<attribute name="db:type">
-				<choice>
-					<value>primary</value>
-					<value>unique</value>
-					<value>foreign</value>
-				</choice>
-			</attribute>
-	
-			<optional>
-				<attribute name="db:referenced-table-name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-	
-			<optional>
-				<attribute name="db:update-rule">
-					<choice>
-						<value>cascade</value>
-						<value>restrict</value>
-						<value>set-null</value>
-						<value>no-action</value>
-						<value>set-default</value>
-					</choice>
-				</attribute>
-			</optional>
-	
-			<optional>
-				<attribute name="db:delete-rule">
-					<choice>
-						<value>cascade</value>
-						<value>restrict</value>
-						<value>set-null</value>
-						<value>no-action</value>
-						<value>set-default</value>
-					</choice>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="db-key-columns">
-		<element name="db:key-columns">
-			<ref name="db-key-columns-attlist"/>
-			<oneOrMore>
-				<ref name="db-key-column"/>
-			</oneOrMore>
-		</element>
-	</define>
-	<define name="db-key-columns-attlist">
-		<empty/>
-	</define>
-	<define name="db-key-column">
-		<element name="db:key-column">
-			<ref name="db-key-column-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="db-key-column-attlist">
-		<interleave>
-			<optional>
-				<attribute name="db:name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-	
-			<optional>
-				<attribute name="db:related-column-name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="db-indices">
-		<element name="db:indices">
-			<ref name="db-indices-attlist"/>
-			<oneOrMore>
-				<ref name="db-index"/>
-			</oneOrMore>
-		</element>
-	</define>
-	<define name="db-indices-attlist">
-		<empty/>
-	</define>
-	<define name="db-index">
-		<element name="db:index">
-			<ref name="db-index-attlist"/>
-			<oneOrMore>
-				<ref name="db-index-columns"/>
-			</oneOrMore>
-		</element>
-	</define>
-	<define name="db-index-attlist">
-		<interleave>
-			<attribute name="db:name">
-				<ref name="string"/>
-			</attribute>
-	
-			<optional>
-				<attribute name="db:catalog-name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-	
-			<optional>
-				<attribute name="db:is-unique">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-	
-			<optional>
-				<attribute name="db:is-clustered">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="db-index-columns">
-		<element name="db:index-columns">
-			<oneOrMore>
-				<ref name="db-index-column"/>
-			</oneOrMore>
-		</element>
-	</define>
-	<define name="db-index-column">
-		<element name="db:index-column">
-			<ref name="db-index-column-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="db-index-column-attlist">
-		<interleave>
-			<attribute name="db:name">
-				<ref name="string"/>
-			</attribute>
-	
-			<optional>
-				<attribute name="db:is-ascending">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="office-forms">
-		<optional>
-			<element name="office:forms">
-				<ref name="office-forms-attlist"/>
-				<zeroOrMore>
-					<choice>
-						<ref name="form-form"/>
-						<ref name="xforms-model"/>
-					</choice>
-				</zeroOrMore>
-			</element>
-		</optional>
-	</define>
-	<define name="office-forms-attlist">
-		<interleave>
-			<optional>
-				<attribute name="form:automatic-focus">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="form:apply-design-mode">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="form-form">
-		<element name="form:form">
-			<ref name="common-form-control-attlist"/>
-			<ref name="form-form-attlist"/>
-			<optional>
-				<ref name="form-properties"/>
-			</optional>
-			<optional>
-				<ref name="office-event-listeners"/>
-			</optional>
-			<zeroOrMore>
-				<choice>
-					<ref name="controls"/>
-					<ref name="form-form"/>
-				</choice>
-			</zeroOrMore>
-			<optional>
-				<ref name="form-connection-resource"/>
-			</optional>
-		</element>
-	</define>
-	<define name="form-form-attlist">
-		<interleave>
-			<optional>
-				<attribute name="xlink:type">
-					<value>simple</value>
-				</attribute>
-				<attribute name="xlink:href">
-					<ref name="anyIRI"/>
-				</attribute>
-				<optional>
-					<attribute name="xlink:actuate">
-						<value>onRequest</value>
-					</attribute>
-				</optional>
-			</optional>
-			<optional>
-				<attribute name="office:target-frame">
-					<ref name="targetFrameName"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="form:method">
-					<choice>
-						<value>get</value>
-						<value>post</value>
-						<ref name="string"/>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="form:enctype">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="form:allow-deletes">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="form:allow-inserts">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="form:allow-updates">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="form:apply-filter">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="form:command-type">
-					<choice>
-						<value>table</value>
-						<value>query</value>
-						<value>command</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="form:command">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="form:datasource">
-					<choice>
-						<ref name="anyIRI"/>
-						<ref name="string"/>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="form:master-fields">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="form:detail-fields">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="form:escape-processing">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="form:filter">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="form:ignore-result">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="form:navigation-mode">
-					<ref name="navigation"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="form:order">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="form:tab-cycle">
-					<ref name="tab-cycles"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="navigation">
-		<choice>
-			<value>none</value>
-			<value>current</value>
-			<value>parent</value>
-		</choice>
-	</define>
-	<define name="tab-cycles">
-		<choice>
-			<value>records</value>
-			<value>current</value>
-			<value>page</value>
-		</choice>
-	</define>
-	<define name="form-connection-resource">
-		<element name="form:connection-resource">
-			<attribute name="xlink:href">
-				<ref name="anyIRI"/>
-			</attribute>
-			<empty/>
-		</element>
-	</define>
-	<define name="xforms-model">
-		<element name="xforms:model">
-			<ref name="anyAttListOrElements"/>
-		</element>
-	</define>
-	<define name="column-controls">
-		<choice>
-			<element name="form:text">
-				<ref name="form-text-attlist"/>
-				<ref name="common-form-control-content"/>
-			</element>
-			<element name="form:textarea">
-				<ref name="form-textarea-attlist"/>
-				<ref name="common-form-control-content"/>
-				<zeroOrMore>
-					<ref name="text-p"/>
-				</zeroOrMore>
-			</element>
-			<element name="form:formatted-text">
-				<ref name="form-formatted-text-attlist"/>
-				<ref name="common-form-control-content"/>
-			</element>
-			<element name="form:number">
-				<ref name="form-number-attlist"/>
-				<ref name="common-numeric-control-attlist"/>
-				<ref name="common-form-control-content"/>
-				<ref name="common-linked-cell"/>
-				<ref name="common-spin-button"/>
-				<ref name="common-repeat"/>
-				<ref name="common-delay-for-repeat"/>
-			</element>
-			<element name="form:date">
-				<ref name="form-date-attlist"/>
-				<ref name="common-numeric-control-attlist"/>
-				<ref name="common-form-control-content"/>
-				<ref name="common-linked-cell"/>
-				<ref name="common-spin-button"/>
-				<ref name="common-repeat"/>
-				<ref name="common-delay-for-repeat"/>
-			</element>
-			<element name="form:time">
-				<ref name="form-time-attlist"/>
-				<ref name="common-numeric-control-attlist"/>
-				<ref name="common-form-control-content"/>
-				<ref name="common-linked-cell"/>
-				<ref name="common-spin-button"/>
-				<ref name="common-repeat"/>
-				<ref name="common-delay-for-repeat"/>
-			</element>
-			<element name="form:combobox">
-				<ref name="form-combobox-attlist"/>
-				<ref name="common-form-control-content"/>
-				<zeroOrMore>
-					<ref name="form-item"/>
-				</zeroOrMore>
-			</element>
-			<element name="form:listbox">
-				<ref name="form-listbox-attlist"/>
-				<ref name="common-form-control-content"/>
-				<zeroOrMore>
-					<ref name="form-option"/>
-				</zeroOrMore>
-			</element>
-			<element name="form:checkbox">
-				<ref name="form-checkbox-attlist"/>
-				<ref name="common-form-control-content"/>
-			</element>
-		</choice>
-	</define>
-	<define name="controls">
-		<choice>
-			<ref name="column-controls"/>
-			<element name="form:password">
-				<ref name="form-password-attlist"/>
-				<ref name="common-form-control-content"/>
-			</element>
-			<element name="form:file">
-				<ref name="form-file-attlist"/>
-				<ref name="common-form-control-content"/>
-			</element>
-			<element name="form:fixed-text">
-				<ref name="form-fixed-text-attlist"/>
-				<ref name="common-form-control-content"/>
-			</element>
-			<element name="form:button">
-				<ref name="form-button-attlist"/>
-				<ref name="common-form-control-content"/>
-			</element>
-			<element name="form:image">
-				<ref name="form-image-attlist"/>
-				<ref name="common-form-control-content"/>
-			</element>
-			<element name="form:radio">
-				<ref name="form-radio-attlist"/>
-				<ref name="common-form-control-content"/>
-			</element>
-			<element name="form:frame">
-				<ref name="form-frame-attlist"/>
-				<ref name="common-form-control-content"/>
-			</element>
-			<element name="form:image-frame">
-				<ref name="form-image-frame-attlist"/>
-				<ref name="common-form-control-content"/>
-			</element>
-			<element name="form:hidden">
-				<ref name="form-hidden-attlist"/>
-				<ref name="common-form-control-content"/>
-			</element>
-			<element name="form:grid">
-				<ref name="form-grid-attlist"/>
-				<ref name="common-form-control-content"/>
-				<zeroOrMore>
-					<ref name="form-column"/>
-				</zeroOrMore>
-			</element>
-			<element name="form:value-range">
-				<ref name="form-value-range-attlist"/>
-				<ref name="common-form-control-content"/>
-			</element>
-			<element name="form:generic-control">
-				<ref name="form-generic-control-attlist"/>
-				<ref name="common-form-control-content"/>
-			</element>
-		</choice>
-	</define>
-	<define name="form-text-attlist">
-		<ref name="form-control-attlist"/>
-		<ref name="common-current-value-attlist"/>
-		<ref name="common-disabled-attlist"/>
-		<ref name="common-maxlength-attlist"/>
-		<ref name="common-printable-attlist"/>
-		<ref name="common-readonly-attlist"/>
-		<ref name="common-tab-attlist"/>
-		<ref name="common-title-attlist"/>
-		<ref name="common-value-attlist"/>
-		<ref name="common-convert-empty-attlist"/>
-		<ref name="common-data-field-attlist"/>
-		<ref name="common-linked-cell"/>
-	</define>
-	<define name="form-control-attlist">
-		<ref name="common-form-control-attlist"/>
-		<ref name="common-control-id-attlist"/>
-		<ref name="xforms-bind-attlist"/>
-	</define>
-	<define name="common-form-control-content">
-		<optional>
-			<ref name="form-properties"/>
-		</optional>
-		<optional>
-			<ref name="office-event-listeners"/>
-		</optional>
-	</define>
-	<define name="form-textarea-attlist">
-		<ref name="form-control-attlist"/>
-		<ref name="common-current-value-attlist"/>
-		<ref name="common-disabled-attlist"/>
-		<ref name="common-maxlength-attlist"/>
-		<ref name="common-printable-attlist"/>
-		<ref name="common-readonly-attlist"/>
-		<ref name="common-tab-attlist"/>
-		<ref name="common-title-attlist"/>
-		<ref name="common-value-attlist"/>
-		<ref name="common-convert-empty-attlist"/>
-		<ref name="common-data-field-attlist"/>
-		<ref name="common-linked-cell"/>
-	</define>
-	<define name="form-password-attlist">
-		<interleave>
-			<ref name="form-control-attlist"/>
-			<ref name="common-disabled-attlist"/>
-			<ref name="common-maxlength-attlist"/>
-			<ref name="common-printable-attlist"/>
-			<ref name="common-tab-attlist"/>
-			<ref name="common-title-attlist"/>
-			<ref name="common-value-attlist"/>
-			<ref name="common-convert-empty-attlist"/>
-			<ref name="common-linked-cell"/>
-			<optional>
-				<attribute name="form:echo-char">
-					<ref name="character"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="form-file-attlist">
-		<ref name="form-control-attlist"/>
-		<ref name="common-current-value-attlist"/>
-		<ref name="common-disabled-attlist"/>
-		<ref name="common-maxlength-attlist"/>
-		<ref name="common-printable-attlist"/>
-		<ref name="common-readonly-attlist"/>
-		<ref name="common-tab-attlist"/>
-		<ref name="common-title-attlist"/>
-		<ref name="common-value-attlist"/>
-		<ref name="common-linked-cell"/>
-	</define>
-	<define name="form-formatted-text-attlist">
-		<interleave>
-			<ref name="form-control-attlist"/>
-			<ref name="common-current-value-attlist"/>
-			<ref name="common-disabled-attlist"/>
-			<ref name="common-maxlength-attlist"/>
-			<ref name="common-printable-attlist"/>
-			<ref name="common-readonly-attlist"/>
-			<ref name="common-tab-attlist"/>
-			<ref name="common-title-attlist"/>
-			<ref name="common-value-attlist"/>
-			<ref name="common-convert-empty-attlist"/>
-			<ref name="common-data-field-attlist"/>
-			<ref name="common-linked-cell"/>
-			<ref name="common-spin-button"/>
-			<ref name="common-repeat"/>
-			<ref name="common-delay-for-repeat"/>
-			<optional>
-				<attribute name="form:max-value">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="form:min-value">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="form:validation">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="common-numeric-control-attlist">
-		<ref name="form-control-attlist"/>
-		<ref name="common-disabled-attlist"/>
-		<ref name="common-maxlength-attlist"/>
-		<ref name="common-printable-attlist"/>
-		<ref name="common-readonly-attlist"/>
-		<ref name="common-tab-attlist"/>
-		<ref name="common-title-attlist"/>
-		<ref name="common-convert-empty-attlist"/>
-		<ref name="common-data-field-attlist"/>
-	</define>
-	<define name="form-number-attlist">
-		<interleave>
-			<optional>
-				<attribute name="form:value">
-					<ref name="double"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="form:current-value">
-					<ref name="double"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="form:min-value">
-					<ref name="double"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="form:max-value">
-					<ref name="double"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="form-date-attlist">
-		<interleave>
-			<optional>
-				<attribute name="form:value">
-					<ref name="date"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="form:current-value">
-					<ref name="date"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="form:min-value">
-					<ref name="date"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="form:max-value">
-					<ref name="date"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="form-time-attlist">
-		<interleave>
-			<optional>
-				<attribute name="form:value">
-					<ref name="time"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="form:current-value">
-					<ref name="time"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="form:min-value">
-					<ref name="time"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="form:max-value">
-					<ref name="time"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="form-fixed-text-attlist">
-		<interleave>
-			<ref name="form-control-attlist"/>
-			<ref name="for"/>
-			<ref name="common-disabled-attlist"/>
-			<ref name="label"/>
-			<ref name="common-printable-attlist"/>
-			<ref name="common-title-attlist"/>
-			<optional>
-				<attribute name="form:multi-line">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="form-combobox-attlist">
-		<interleave>
-			<ref name="form-control-attlist"/>
-			<ref name="common-current-value-attlist"/>
-			<ref name="common-disabled-attlist"/>
-			<ref name="dropdown"/>
-			<ref name="common-maxlength-attlist"/>
-			<ref name="common-printable-attlist"/>
-			<ref name="common-readonly-attlist"/>
-			<ref name="size"/>
-			<ref name="common-tab-attlist"/>
-			<ref name="common-title-attlist"/>
-			<ref name="common-value-attlist"/>
-			<ref name="common-convert-empty-attlist"/>
-			<ref name="common-data-field-attlist"/>
-			<ref name="list-source"/>
-			<ref name="list-source-type"/>
-			<ref name="common-linked-cell"/>
-			<ref name="common-source-cell-range"/>
-			<optional>
-				<attribute name="form:auto-complete">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="form-item">
-		<element name="form:item">
-			<ref name="form-item-attlist"/>
-			<text/>
-		</element>
-	</define>
-	<define name="form-item-attlist">
-		<ref name="label"/>
-	</define>
-	<define name="form-listbox-attlist">
-		<interleave>
-			<ref name="form-control-attlist"/>
-			<ref name="common-disabled-attlist"/>
-			<ref name="dropdown"/>
-			<ref name="common-printable-attlist"/>
-			<ref name="size"/>
-			<ref name="common-tab-attlist"/>
-			<ref name="common-title-attlist"/>
-			<ref name="bound-column"/>
-			<ref name="common-data-field-attlist"/>
-			<ref name="list-source"/>
-			<ref name="list-source-type"/>
-			<ref name="common-linked-cell"/>
-			<ref name="list-linkage-type"/>
-			<ref name="common-source-cell-range"/>
-			<optional>
-				<attribute name="form:multiple">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="form:xforms-list-source">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="list-linkage-type">
-		<optional>
-			<attribute name="form:list-linkage-type">
-				<choice>
-					<value>selection</value>
-					<value>selection-indices</value>
-				</choice>
-			</attribute>
-		</optional>
-	</define>
-	<define name="form-option">
-		<element name="form:option">
-			<ref name="form-option-attlist"/>
-			<text/>
-		</element>
-	</define>
-	<define name="form-option-attlist">
-		<ref name="current-selected"/>
-		<ref name="selected"/>
-		<ref name="label"/>
-		<ref name="common-value-attlist"/>
-	</define>
-	<define name="form-button-attlist">
-		<interleave>
-			<ref name="form-control-attlist"/>
-			<ref name="button-type"/>
-			<ref name="common-disabled-attlist"/>
-			<ref name="label"/>
-			<ref name="image-data"/>
-			<ref name="common-printable-attlist"/>
-			<ref name="common-tab-attlist"/>
-			<ref name="target-frame"/>
-			<ref name="target-location"/>
-			<ref name="common-title-attlist"/>
-			<ref name="common-value-attlist"/>
-			<ref name="common-form-relative-image-position-attlist"/>
-			<ref name="common-repeat"/>
-			<ref name="common-delay-for-repeat"/>
-			<optional>
-				<attribute name="form:default-button">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="form:toggle">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="form:focus-on-click">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="form:xforms-submission">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="form-image-attlist">
-		<ref name="form-control-attlist"/>
-		<ref name="button-type"/>
-		<ref name="common-disabled-attlist"/>
-		<ref name="image-data"/>
-		<ref name="common-printable-attlist"/>
-		<ref name="common-tab-attlist"/>
-		<ref name="target-frame"/>
-		<ref name="target-location"/>
-		<ref name="common-title-attlist"/>
-		<ref name="common-value-attlist"/>
-	</define>
-	<define name="form-checkbox-attlist">
-		<interleave>
-			<ref name="form-control-attlist"/>
-			<ref name="common-disabled-attlist"/>
-			<ref name="label"/>
-			<ref name="common-printable-attlist"/>
-			<ref name="common-tab-attlist"/>
-			<ref name="common-title-attlist"/>
-			<ref name="common-value-attlist"/>
-			<ref name="common-data-field-attlist"/>
-			<ref name="common-form-visual-effect-attlist"/>
-			<ref name="common-form-relative-image-position-attlist"/>
-			<ref name="common-linked-cell"/>
-			<optional>
-				<attribute name="form:current-state">
-					<ref name="states"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="form:is-tristate">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="form:state">
-					<ref name="states"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="states">
-		<choice>
-			<value>unchecked</value>
-			<value>checked</value>
-			<value>unknown</value>
-		</choice>
-	</define>
-	<define name="form-radio-attlist">
-		<ref name="form-control-attlist"/>
-		<ref name="current-selected"/>
-		<ref name="common-disabled-attlist"/>
-		<ref name="label"/>
-		<ref name="common-printable-attlist"/>
-		<ref name="selected"/>
-		<ref name="common-tab-attlist"/>
-		<ref name="common-title-attlist"/>
-		<ref name="common-value-attlist"/>
-		<ref name="common-data-field-attlist"/>
-		<ref name="common-form-visual-effect-attlist"/>
-		<ref name="common-form-relative-image-position-attlist"/>
-		<ref name="common-linked-cell"/>
-	</define>
-	<define name="form-frame-attlist">
-		<ref name="form-control-attlist"/>
-		<ref name="common-disabled-attlist"/>
-		<ref name="for"/>
-		<ref name="label"/>
-		<ref name="common-printable-attlist"/>
-		<ref name="common-title-attlist"/>
-	</define>
-	<define name="form-image-frame-attlist">
-		<ref name="form-control-attlist"/>
-		<ref name="common-disabled-attlist"/>
-		<ref name="image-data"/>
-		<ref name="common-printable-attlist"/>
-		<ref name="common-readonly-attlist"/>
-		<ref name="common-title-attlist"/>
-		<ref name="common-data-field-attlist"/>
-	</define>
-	<define name="form-hidden-attlist">
-		<ref name="form-control-attlist"/>
-		<ref name="common-value-attlist"/>
-	</define>
-	<define name="form-grid-attlist">
-		<ref name="form-control-attlist"/>
-		<ref name="common-disabled-attlist"/>
-		<ref name="common-printable-attlist"/>
-		<ref name="common-tab-attlist"/>
-		<ref name="common-title-attlist"/>
-	</define>
-	<define name="form-column">
-		<element name="form:column">
-			<ref name="form-column-attlist"/>
-			<oneOrMore>
-				<ref name="column-controls"/>
-			</oneOrMore>
-		</element>
-	</define>
-	<define name="form-column-attlist">
-		<ref name="common-form-control-attlist"/>
-		<ref name="label"/>
-		<ref name="text-style-name"/>
-	</define>
-	<define name="text-style-name">
-		<optional>
-			<attribute name="form:text-style-name">
-				<ref name="styleNameRef"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="form-value-range-attlist">
-		<interleave>
-			<ref name="form-control-attlist"/>
-			<ref name="common-disabled-attlist"/>
-			<ref name="common-printable-attlist"/>
-			<ref name="common-tab-attlist"/>
-			<ref name="common-title-attlist"/>
-			<ref name="common-value-attlist"/>
-			<ref name="common-linked-cell"/>
-			<ref name="common-repeat"/>
-			<ref name="common-delay-for-repeat"/>
-			<optional>
-				<attribute name="form:max-value">
-					<ref name="integer"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="form:min-value">
-					<ref name="integer"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="form:step-size">
-					<ref name="positiveInteger"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="form:page-step-size">
-					<ref name="positiveInteger"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="form:orientation">
-					<choice>
-						<value>horizontal</value>
-						<value>vertical</value>
-					</choice>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="form-generic-control-attlist">
-		<ref name="form-control-attlist"/>
-	</define>
-	<define name="common-form-control-attlist">
-		<interleave>
-			<optional>
-				<attribute name="form:name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="form:control-implementation">
-					<ref name="namespacedToken"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="xforms-bind-attlist">
-		<optional>
-			<attribute name="xforms:bind">
-				<ref name="string"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="types">
-		<choice>
-			<value>submit</value>
-			<value>reset</value>
-			<value>push</value>
-			<value>url</value>
-		</choice>
-	</define>
-	<define name="button-type">
-		<optional>
-			<attribute name="form:button-type">
-				<ref name="types"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-control-id-attlist">
-		<group>
-			<ref name="xml-id"/>
-			<optional>
-				<attribute name="form:id">
-					<ref name="NCName"/>
-				</attribute>
-			</optional>
-		</group>
-	</define>
-	<define name="current-selected">
-		<optional>
-			<attribute name="form:current-selected">
-				<ref name="boolean"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-value-attlist">
-		<optional>
-			<attribute name="form:value">
-				<ref name="string"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-current-value-attlist">
-		<optional>
-			<attribute name="form:current-value">
-				<ref name="string"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-disabled-attlist">
-		<optional>
-			<attribute name="form:disabled">
-				<ref name="boolean"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="dropdown">
-		<optional>
-			<attribute name="form:dropdown">
-				<ref name="boolean"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="for">
-		<optional>
-			<attribute name="form:for">
-				<ref name="string"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="image-data">
-		<optional>
-			<attribute name="form:image-data">
-				<ref name="anyIRI"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="label">
-		<optional>
-			<attribute name="form:label">
-				<ref name="string"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-maxlength-attlist">
-		<optional>
-			<attribute name="form:max-length">
-				<ref name="nonNegativeInteger"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-printable-attlist">
-		<optional>
-			<attribute name="form:printable">
-				<ref name="boolean"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-readonly-attlist">
-		<optional>
-			<attribute name="form:readonly">
-				<ref name="boolean"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="selected">
-		<optional>
-			<attribute name="form:selected">
-				<ref name="boolean"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="size">
-		<optional>
-			<attribute name="form:size">
-				<ref name="nonNegativeInteger"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-tab-attlist">
-		<interleave>
-			<optional>
-				<attribute name="form:tab-index">
-					<ref name="nonNegativeInteger"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="form:tab-stop">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="target-frame">
-		<optional>
-			<attribute name="office:target-frame">
-				<ref name="targetFrameName"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="target-location">
-		<optional>
-			<attribute name="xlink:href">
-				<ref name="anyIRI"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-title-attlist">
-		<optional>
-			<attribute name="form:title">
-				<ref name="string"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-form-visual-effect-attlist">
-		<optional>
-			<attribute name="form:visual-effect">
-				<choice>
-					<value>flat</value>
-					<value>3d</value>
-				</choice>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-form-relative-image-position-attlist">
-		<choice>
-			<optional>
-				<attribute name="form:image-position">
-					<value>center</value>
-				</attribute>
-			</optional>
-			<group>
-				<attribute name="form:image-position">
-					<choice>
-						<value>start</value>
-						<value>end</value>
-						<value>top</value>
-						<value>bottom</value>
-					</choice>
-				</attribute>
-				<optional>
-					<attribute name="form:image-align">
-						<choice>
-							<value>start</value>
-							<value>center</value>
-							<value>end</value>
-						</choice>
-					</attribute>
-				</optional>
-			</group>
-		</choice>
-	</define>
-	<define name="bound-column">
-		<optional>
-			<attribute name="form:bound-column">
-				<ref name="string"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-convert-empty-attlist">
-		<optional>
-			<attribute name="form:convert-empty-to-null">
-				<ref name="boolean"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-data-field-attlist">
-		<optional>
-			<attribute name="form:data-field">
-				<ref name="string"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="list-source">
-		<optional>
-			<attribute name="form:list-source">
-				<ref name="string"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="list-source-type">
-		<optional>
-			<attribute name="form:list-source-type">
-				<choice>
-					<value>table</value>
-					<value>query</value>
-					<value>sql</value>
-					<value>sql-pass-through</value>
-					<value>value-list</value>
-					<value>table-fields</value>
-				</choice>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-linked-cell">
-		<optional>
-			<attribute name="form:linked-cell">
-				<choice>
-					<ref name="cellAddress"/>
-					<ref name="string"/>
-				</choice>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-source-cell-range">
-		<optional>
-			<attribute name="form:source-cell-range">
-				<choice>
-					<ref name="cellRangeAddress"/>
-					<ref name="string"/>
-				</choice>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-spin-button">
-		<optional>
-			<attribute name="form:spin-button">
-				<ref name="boolean"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-repeat">
-		<optional>
-			<attribute name="form:repeat">
-				<ref name="boolean"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-delay-for-repeat">
-		<optional>
-			<attribute name="form:delay-for-repeat">
-				<ref name="duration"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="form-properties">
-		<element name="form:properties">
-			<oneOrMore>
-				<ref name="form-property"/>
-			</oneOrMore>
-		</element>
-	</define>
-	<define name="form-property">
-		<choice>
-			<element name="form:property">
-				<ref name="form-property-name"/>
-				<ref name="form-property-value-and-type-attlist"/>
-			</element>
-			<element name="form:list-property">
-				<ref name="form-property-name"/>
-				<ref name="form-property-type-and-value-list"/>
-			</element>
-		</choice>
-	</define>
-	<define name="form-property-name">
-		<attribute name="form:property-name">
-			<ref name="string"/>
-		</attribute>
-	</define>
-	<define name="form-property-value-and-type-attlist">
-		<choice>
-			<ref name="common-value-and-type-attlist"/>
-			<attribute name="office:value-type">
-				<value>void</value>
-			</attribute>
-		</choice>
-	</define>
-	<define name="form-property-type-and-value-list">
-		<choice>
-			<group>
-				<attribute name="office:value-type">
-					<value>float</value>
-				</attribute>
-				<zeroOrMore>
-					<element name="form:list-value">
-						<attribute name="office:value">
-							<ref name="double"/>
-						</attribute>
-					</element>
-				</zeroOrMore>
-			</group>
-			<group>
-				<attribute name="office:value-type">
-					<value>percentage</value>
-				</attribute>
-				<zeroOrMore>
-					<element name="form:list-value">
-						<attribute name="office:value">
-							<ref name="double"/>
-						</attribute>
-					</element>
-				</zeroOrMore>
-			</group>
-			<group>
-				<attribute name="office:value-type">
-					<value>currency</value>
-				</attribute>
-				<zeroOrMore>
-					<element name="form:list-value">
-						<attribute name="office:value">
-							<ref name="double"/>
-						</attribute>
-						<optional>
-							<attribute name="office:currency">
-								<ref name="string"/>
-							</attribute>
-						</optional>
-					</element>
-				</zeroOrMore>
-			</group>
-			<group>
-				<attribute name="office:value-type">
-					<value>date</value>
-				</attribute>
-				<zeroOrMore>
-					<element name="form:list-value">
-						<attribute name="office:date-value">
-							<ref name="dateOrDateTime"/>
-						</attribute>
-					</element>
-				</zeroOrMore>
-			</group>
-			<group>
-				<attribute name="office:value-type">
-					<value>time</value>
-				</attribute>
-				<zeroOrMore>
-					<element name="form:list-value">
-						<attribute name="office:time-value">
-							<ref name="duration"/>
-						</attribute>
-					</element>
-				</zeroOrMore>
-			</group>
-			<group>
-				<attribute name="office:value-type">
-					<value>boolean</value>
-				</attribute>
-				<zeroOrMore>
-					<element name="form:list-value">
-						<attribute name="office:boolean-value">
-							<ref name="boolean"/>
-						</attribute>
-					</element>
-				</zeroOrMore>
-			</group>
-			<group>
-				<attribute name="office:value-type">
-					<value>string</value>
-				</attribute>
-				<zeroOrMore>
-					<element name="form:list-value">
-						<attribute name="office:string-value">
-							<ref name="string"/>
-						</attribute>
-					</element>
-				</zeroOrMore>
-			</group>
-			<attribute name="office:value-type">
-				<value>void</value>
-			</attribute>
-		</choice>
-	</define>
-	<define name="office-annotation">
-		<element name="office:annotation">
-			<ref name="office-annotation-attlist"/>
-			<ref name="draw-caption-attlist"/>
-			<ref name="common-draw-position-attlist"/>
-			<ref name="common-draw-size-attlist"/>
-			<ref name="common-draw-shape-with-text-and-styles-attlist"/>
-			<optional>
-				<ref name="dc-creator"/>
-			</optional>
-			<optional>
-				<ref name="dc-date"/>
-			</optional>
-			<optional>
-				<ref name="meta-date-string"/>
-			</optional>
-			<zeroOrMore>
-				<choice>
-					<ref name="text-p"/>
-					<ref name="text-list"/>
-				</choice>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="office-annotation-end">
-		<element name="office:annotation-end">
-			<ref name="office-annotation-end-attlist"/>
-		</element>
-	</define>
-	<define name="office-annotation-attlist">
-		<interleave>
-			<optional>
-				<attribute name="office:display">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<ref name="common-office-annotation-name-attlist"/>
-			</optional>
-		</interleave>
-	</define>
-	<define name="office-annotation-end-attlist">
-		<ref name="common-office-annotation-name-attlist"/>
-	</define>
-	<define name="common-office-annotation-name-attlist">
-		<attribute name="office:name">
-			<ref name="string"/>
-		</attribute>
-	</define>
-	<define name="meta-date-string">
-		<element name="meta:date-string">
-			<ref name="string"/>
-		</element>
-	</define>
-	<define name="common-num-format-prefix-suffix-attlist">
-		<optional>
-			<attribute name="style:num-prefix">
-				<ref name="string"/>
-			</attribute>
-		</optional>
-		<optional>
-			<attribute name="style:num-suffix">
-				<ref name="string"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-num-format-attlist">
-		<choice>
-			<attribute name="style:num-format">
-				<choice>
-					<value>1</value>
-					<value>i</value>
-					<value>I</value>
-					<ref name="string"/>
-					<empty/>
-				</choice>
-			</attribute>
-			<group>
-				<attribute name="style:num-format">
-					<choice>
-						<value>a</value>
-						<value>A</value>
-					</choice>
-				</attribute>
-				<ref name="style-num-letter-sync-attlist"/>
-			</group>
-			<empty/>
-		</choice>
-	</define>
-	<define name="style-num-letter-sync-attlist">
-		<optional>
-			<attribute name="style:num-letter-sync">
-				<ref name="boolean"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="office-change-info">
-		<element name="office:change-info">
-			<ref name="dc-creator"/>
-			<ref name="dc-date"/>
-			<zeroOrMore>
-				<ref name="text-p"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="office-event-listeners">
-		<element name="office:event-listeners">
-			<zeroOrMore>
-				<choice>
-					<ref name="script-event-listener"/>
-					<ref name="presentation-event-listener"/>
-				</choice>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="script-event-listener">
-		<element name="script:event-listener">
-			<ref name="script-event-listener-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="script-event-listener-attlist">
-		<interleave>
-			<attribute name="script:event-name">
-				<ref name="string"/>
-			</attribute>
-			<attribute name="script:language">
-				<ref name="string"/>
-			</attribute>
-			<choice>
-				<attribute name="script:macro-name">
-					<ref name="string"/>
-				</attribute>
-				<group>
-					<attribute name="xlink:type">
-						<value>simple</value>
-					</attribute>
-					<attribute name="xlink:href">
-						<ref name="anyIRI"/>
-					</attribute>
-					<optional>
-						<attribute name="xlink:actuate">
-							<value>onRequest</value>
-						</attribute>
-					</optional>
-				</group>
-			</choice>
-		</interleave>
-	</define>
-	<define name="math-math">
-		<element name="math:math">
-			<ref name="mathMarkup"/>
-		</element>
-	</define>
-	<define name="mathMarkup">
-		<dc:description>To avoid inclusion of the complete MathML schema, anything is allowed within a math:math top-level element</dc:description>
-		<zeroOrMore>
-			<choice>
-				<attribute>
-					<anyName/>
-				</attribute>
-				<text/>
-				<element>
-					<anyName/>
-					<ref name="mathMarkup"/>
-				</element>
-			</choice>
-		</zeroOrMore>
-	</define>
-	<define name="text-dde-connection-decl">
-		<element name="text:dde-connection-decl">
-			<ref name="text-dde-connection-decl-attlist"/>
-			<ref name="common-dde-connection-decl-attlist"/>
-		</element>
-	</define>
-	<define name="text-dde-connection-decl-attlist">
-		<attribute name="office:name">
-			<ref name="string"/>
-		</attribute>
-	</define>
-	<define name="common-dde-connection-decl-attlist">
-		<interleave>
-			<attribute name="office:dde-application">
-				<ref name="string"/>
-			</attribute>
-			<attribute name="office:dde-topic">
-				<ref name="string"/>
-			</attribute>
-			<attribute name="office:dde-item">
-				<ref name="string"/>
-			</attribute>
-			<optional>
-				<attribute name="office:automatic-update">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="table-dde-link">
-		<element name="table:dde-link">
-			<ref name="office-dde-source"/>
-			<ref name="table-table"/>
-		</element>
-	</define>
-	<define name="office-dde-source">
-		<element name="office:dde-source">
-			<ref name="office-dde-source-attlist"/>
-			<ref name="common-dde-connection-decl-attlist"/>
-		</element>
-	</define>
-	<define name="office-dde-source-attlist">
-		<interleave>
-			<optional>
-				<attribute name="office:name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="office:conversion-mode">
-					<choice>
-						<value>into-default-style-data-style</value>
-						<value>into-english-number</value>
-						<value>keep-text</value>
-					</choice>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="animation-element">
-		<choice>
-			<element name="anim:animate">
-				<ref name="common-anim-target-attlist"/>
-				<ref name="common-anim-named-target-attlist"/>
-				<ref name="common-anim-values-attlist"/>
-				<ref name="common-anim-spline-mode-attlist"/>
-				<ref name="common-spline-anim-value-attlist"/>
-				<ref name="common-timing-attlist"/>
-				<ref name="common-anim-add-accum-attlist"/>
-			</element>
-			<element name="anim:set">
-				<ref name="common-anim-target-attlist"/>
-				<ref name="common-anim-named-target-attlist"/>
-				<ref name="common-anim-set-values-attlist"/>
-				<ref name="common-timing-attlist"/>
-				<ref name="common-anim-add-accum-attlist"/>
-			</element>
-			<element name="anim:animateMotion">
-				<ref name="anim-animate-motion-attlist"/>
-				<ref name="common-anim-target-attlist"/>
-				<ref name="common-anim-named-target-attlist"/>
-				<ref name="common-anim-add-accum-attlist"/>
-				<ref name="common-anim-values-attlist"/>
-				<ref name="common-timing-attlist"/>
-				<ref name="common-spline-anim-value-attlist"/>
-			</element>
-			<element name="anim:animateColor">
-				<ref name="common-anim-target-attlist"/>
-				<ref name="common-anim-named-target-attlist"/>
-				<ref name="common-anim-add-accum-attlist"/>
-				<ref name="common-anim-values-attlist"/>
-				<ref name="common-anim-spline-mode-attlist"/>
-				<ref name="common-spline-anim-value-attlist"/>
-				<ref name="anim-animate-color-attlist"/>
-				<ref name="common-timing-attlist"/>
-			</element>
-			<element name="anim:animateTransform">
-				<ref name="common-anim-target-attlist"/>
-				<ref name="common-anim-named-target-attlist"/>
-				<ref name="common-anim-add-accum-attlist"/>
-				<ref name="common-anim-values-attlist"/>
-				<ref name="anim-animate-transform-attlist"/>
-				<ref name="common-timing-attlist"/>
-			</element>
-			<element name="anim:transitionFilter">
-				<ref name="common-anim-target-attlist"/>
-				<ref name="common-anim-add-accum-attlist"/>
-				<ref name="common-anim-values-attlist"/>
-				<ref name="common-anim-spline-mode-attlist"/>
-				<ref name="anim-transition-filter-attlist"/>
-				<ref name="common-timing-attlist"/>
-			</element>
-			<element name="anim:par">
-				<ref name="common-anim-attlist"/>
-				<ref name="common-timing-attlist"/>
-				<ref name="common-endsync-timing-attlist"/>
-				<zeroOrMore>
-					<ref name="animation-element"/>
-				</zeroOrMore>
-			</element>
-			<element name="anim:seq">
-				<ref name="common-anim-attlist"/>
-				<ref name="common-endsync-timing-attlist"/>
-				<ref name="common-timing-attlist"/>
-				<zeroOrMore>
-					<ref name="animation-element"/>
-				</zeroOrMore>
-			</element>
-			<element name="anim:iterate">
-				<ref name="common-anim-attlist"/>
-				<ref name="anim-iterate-attlist"/>
-				<ref name="common-timing-attlist"/>
-				<ref name="common-endsync-timing-attlist"/>
-				<zeroOrMore>
-					<ref name="animation-element"/>
-				</zeroOrMore>
-			</element>
-			<element name="anim:audio">
-				<ref name="common-anim-attlist"/>
-				<ref name="anim-audio-attlist"/>
-				<ref name="common-basic-timing-attlist"/>
-			</element>
-			<element name="anim:command">
-				<ref name="common-anim-attlist"/>
-				<ref name="anim-command-attlist"/>
-				<ref name="common-begin-end-timing-attlist"/>
-				<ref name="common-anim-target-attlist"/>
-				<zeroOrMore>
-					<element name="anim:param">
-						<attribute name="anim:name">
-							<ref name="string"/>
-						</attribute>
-						<attribute name="anim:value">
-							<ref name="string"/>
-						</attribute>
-					</element>
-				</zeroOrMore>
-			</element>
-		</choice>
-	</define>
-	<define name="anim-animate-motion-attlist">
-		<interleave>
-			<optional>
-				<attribute name="svg:path">
-					<ref name="pathData"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:origin">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="smil:calcMode">
-					<choice>
-						<value>discrete</value>
-						<value>linear</value>
-						<value>paced</value>
-						<value>spline</value>
-					</choice>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="anim-animate-color-attlist">
-		<interleave>
-			<optional>
-				<attribute name="anim:color-interpolation">
-					<choice>
-						<value>rgb</value>
-						<value>hsl</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="anim:color-interpolation-direction">
-					<choice>
-						<value>clockwise</value>
-						<value>counter-clockwise</value>
-					</choice>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="anim-animate-transform-attlist">
-		<attribute name="svg:type">
-			<choice>
-				<value>translate</value>
-				<value>scale</value>
-				<value>rotate</value>
-				<value>skewX</value>
-				<value>skewY</value>
-			</choice>
-		</attribute>
-	</define>
-	<define name="anim-transition-filter-attlist">
-		<interleave>
-			<attribute name="smil:type">
-				<ref name="string"/>
-			</attribute>
-			<optional>
-				<attribute name="smil:subtype">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="smil:direction">
-					<choice>
-						<value>forward</value>
-						<value>reverse</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="smil:fadeColor">
-					<ref name="color"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="smil:mode">
-					<choice>
-						<value>in</value>
-						<value>out</value>
-					</choice>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="common-anim-target-attlist">
-		<interleave>
-			<optional>
-				<attribute name="smil:targetElement">
-					<ref name="IDREF"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="anim:sub-item">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="common-anim-named-target-attlist">
-		<attribute name="smil:attributeName">
-			<ref name="string"/>
-		</attribute>
-	</define>
-	<define name="common-anim-values-attlist">
-		<interleave>
-			<optional>
-				<attribute name="smil:values">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="anim:formula">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<ref name="common-anim-set-values-attlist"/>
-			<optional>
-				<attribute name="smil:from">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="smil:by">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="common-anim-spline-mode-attlist">
-		<optional>
-			<attribute name="smil:calcMode">
-				<choice>
-					<value>discrete</value>
-					<value>linear</value>
-					<value>paced</value>
-					<value>spline</value>
-				</choice>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-spline-anim-value-attlist">
-		<interleave>
-			<optional>
-				<attribute name="smil:keyTimes">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="smil:keySplines">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="common-anim-add-accum-attlist">
-		<interleave>
-			<optional>
-				<attribute name="smil:accumulate">
-					<choice>
-						<value>none</value>
-						<value>sum</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="smil:additive">
-					<choice>
-						<value>replace</value>
-						<value>sum</value>
-					</choice>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="common-anim-set-values-attlist">
-		<optional>
-			<attribute name="smil:to">
-				<ref name="string"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-begin-end-timing-attlist">
-		<interleave>
-			<optional>
-				<attribute name="smil:begin">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="smil:end">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="common-dur-timing-attlist">
-		<optional>
-			<attribute name="smil:dur">
-				<ref name="string"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-endsync-timing-attlist">
-		<optional>
-			<attribute name="smil:endsync">
-				<choice>
-					<value>first</value>
-					<value>last</value>
-					<value>all</value>
-					<value>media</value>
-					<ref name="IDREF"/>
-				</choice>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-repeat-timing-attlist">
-		<optional>
-			<attribute name="smil:repeatDur">
-				<ref name="string"/>
-			</attribute>
-		</optional>
-		<optional>
-			<attribute name="smil:repeatCount">
-				<choice>
-					<ref name="nonNegativeDecimal"/>
-					<value>indefinite</value>
-				</choice>
-			</attribute>
-		</optional>
-	</define>
-	<define name="nonNegativeDecimal">
-		<data type="decimal">
-			<param name="minInclusive">0.0</param>
-		</data>
-	</define>
-	<define name="common-fill-timing-attlist">
-		<optional>
-			<attribute name="smil:fill">
-				<choice>
-					<value>remove</value>
-					<value>freeze</value>
-					<value>hold</value>
-					<value>auto</value>
-					<value>default</value>
-					<value>transition</value>
-				</choice>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-fill-default-attlist">
-		<optional>
-			<attribute name="smil:fillDefault">
-				<choice>
-					<value>remove</value>
-					<value>freeze</value>
-					<value>hold</value>
-					<value>transition</value>
-					<value>auto</value>
-					<value>inherit</value>
-				</choice>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-restart-timing-attlist">
-		<optional>
-			<attribute name="smil:restart">
-				<choice>
-					<value>never</value>
-					<value>always</value>
-					<value>whenNotActive</value>
-					<value>default</value>
-				</choice>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-restart-default-attlist">
-		<optional>
-			<attribute name="smil:restartDefault">
-				<choice>
-					<value>never</value>
-					<value>always</value>
-					<value>whenNotActive</value>
-					<value>inherit</value>
-				</choice>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-time-manip-attlist">
-		<interleave>
-			<optional>
-				<attribute name="smil:accelerate">
-					<ref name="zeroToOneDecimal"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="smil:decelerate">
-					<ref name="zeroToOneDecimal"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="smil:autoReverse">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="zeroToOneDecimal">
-		<data type="decimal">
-			<param name="minInclusive">0</param>
-			<param name="maxInclusive">1</param>
-		</data>
-	</define>
-	<define name="common-basic-timing-attlist">
-		<ref name="common-begin-end-timing-attlist"/>
-		<ref name="common-dur-timing-attlist"/>
-		<ref name="common-repeat-timing-attlist"/>
-		<ref name="common-restart-timing-attlist"/>
-		<ref name="common-restart-default-attlist"/>
-		<ref name="common-fill-timing-attlist"/>
-		<ref name="common-fill-default-attlist"/>
-	</define>
-	<define name="common-timing-attlist">
-		<ref name="common-basic-timing-attlist"/>
-		<ref name="common-time-manip-attlist"/>
-	</define>
-	<define name="anim-iterate-attlist">
-		<interleave>
-			<ref name="common-anim-target-attlist"/>
-			<optional>
-				<attribute name="anim:iterate-type">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="anim:iterate-interval">
-					<ref name="duration"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="anim-audio-attlist">
-		<interleave>
-			<optional>
-				<attribute name="xlink:href">
-					<ref name="anyIRI"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="anim:audio-level">
-					<ref name="double"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="anim-command-attlist">
-		<attribute name="anim:command">
-			<ref name="string"/>
-		</attribute>
-	</define>
-	<define name="style-style">
-		<element name="style:style">
-			<ref name="style-style-attlist"/>
-			<ref name="style-style-content"/>
-			<zeroOrMore>
-				<ref name="style-map"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="common-in-content-meta-attlist">
-		<attribute name="xhtml:about">
-			<ref name="URIorSafeCURIE"/>
-		</attribute>
-		<attribute name="xhtml:property">
-			<ref name="CURIEs"/>
-		</attribute>
-		<ref name="common-meta-literal-attlist"/>
-	</define>
-	<define name="common-meta-literal-attlist">
-		<optional>
-			<attribute name="xhtml:datatype">
-				<ref name="CURIE"/>
-			</attribute>
-		</optional>
-		<optional>
-			<attribute name="xhtml:content">
-				<ref name="string"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="xml-id">
-		<attribute name="xml:id">
-			<ref name="ID"/>
-		</attribute>
-	</define>
-	<define name="style-style-attlist">
-		<interleave>
-			<attribute name="style:name">
-				<ref name="styleName"/>
-			</attribute>
-			<optional>
-				<attribute name="style:display-name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:parent-style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:next-style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:list-level">
-					<choice>
-						<ref name="positiveInteger"/>
-						<empty/>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:list-style-name">
-					<choice>
-						<ref name="styleName"/>
-						<empty/>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:master-page-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:auto-update">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:data-style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:percentage-data-style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:class">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:default-outline-level">
-					<choice>
-						<ref name="positiveInteger"/>
-						<empty/>
-					</choice>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="style-map">
-		<element name="style:map">
-			<ref name="style-map-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="style-map-attlist">
-		<interleave>
-			<attribute name="style:condition">
-				<ref name="string"/>
-			</attribute>
-			<attribute name="style:apply-style-name">
-				<ref name="styleNameRef"/>
-			</attribute>
-			<optional>
-				<attribute name="style:base-cell-address">
-					<ref name="cellAddress"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="style-default-style">
-		<element name="style:default-style">
-			<ref name="style-style-content"/>
-		</element>
-	</define>
-	<define name="style-page-layout">
-		<element name="style:page-layout">
-			<ref name="style-page-layout-attlist"/>
-			<ref name="style-page-layout-content"/>
-		</element>
-	</define>
-	<define name="style-page-layout-content">
-		<optional>
-			<ref name="style-page-layout-properties"/>
-		</optional>
-		<optional>
-			<ref name="style-header-style"/>
-		</optional>
-		<optional>
-			<ref name="style-footer-style"/>
-		</optional>
-	</define>
-	<define name="style-page-layout-attlist">
-		<interleave>
-			<attribute name="style:name">
-				<ref name="styleName"/>
-			</attribute>
-			<optional>
-				<attribute name="style:page-usage">
-					<choice>
-						<value>all</value>
-						<value>left</value>
-						<value>right</value>
-						<value>mirrored</value>
-					</choice>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="style-header-style">
-		<element name="style:header-style">
-			<optional>
-				<ref name="style-header-footer-properties"/>
-			</optional>
-		</element>
-	</define>
-	<define name="style-footer-style">
-		<element name="style:footer-style">
-			<optional>
-				<ref name="style-header-footer-properties"/>
-			</optional>
-		</element>
-	</define>
-	<define name="style-default-page-layout">
-		<element name="style:default-page-layout">
-			<ref name="style-page-layout-content"/>
-		</element>
-	</define>
-	<define name="style-master-page">
-		<element name="style:master-page">
-			<ref name="style-master-page-attlist"/>
-			<optional>
-				<ref name="style-header"/>
-				<optional>
-					<ref name="style-header-left"/>
-				</optional>
-			</optional>
-			<optional>
-				<ref name="style-footer"/>
-				<optional>
-					<ref name="style-footer-left"/>
-				</optional>
-			</optional>
-			<optional>
-				<ref name="draw-layer-set"/>
-			</optional>
-			<optional>
-				<ref name="office-forms"/>
-			</optional>
-			<zeroOrMore>
-				<ref name="shape"/>
-			</zeroOrMore>
-			<optional>
-				<ref name="animation-element"/>
-			</optional>
-			<optional>
-				<ref name="presentation-notes"/>
-			</optional>
-		</element>
-	</define>
-	<define name="style-master-page-attlist">
-		<interleave>
-			<attribute name="style:name">
-				<ref name="styleName"/>
-			</attribute>
-			<optional>
-				<attribute name="style:display-name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<attribute name="style:page-layout-name">
-				<ref name="styleNameRef"/>
-			</attribute>
-			<optional>
-				<attribute name="draw:style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:next-style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="style-header">
-		<element name="style:header">
-			<ref name="common-style-header-footer-attlist"/>
-			<ref name="header-footer-content"/>
-		</element>
-	</define>
-	<define name="style-footer">
-		<element name="style:footer">
-			<ref name="common-style-header-footer-attlist"/>
-			<ref name="header-footer-content"/>
-		</element>
-	</define>
-	<define name="style-header-left">
-		<element name="style:header-left">
-			<ref name="common-style-header-footer-attlist"/>
-			<ref name="header-footer-content"/>
-		</element>
-	</define>
-	<define name="style-footer-left">
-		<element name="style:footer-left">
-			<ref name="common-style-header-footer-attlist"/>
-			<ref name="header-footer-content"/>
-		</element>
-	</define>
-	<define name="header-footer-content">
-		<choice>
-			<group>
-				<ref name="text-tracked-changes"/>
-				<ref name="text-decls"/>
-				<zeroOrMore>
-					<choice>
-						<ref name="text-h"/>
-						<ref name="text-p"/>
-						<ref name="text-list"/>
-						<ref name="table-table"/>
-						<ref name="text-section"/>
-						<ref name="text-table-of-content"/>
-						<ref name="text-illustration-index"/>
-						<ref name="text-table-index"/>
-						<ref name="text-object-index"/>
-						<ref name="text-user-index"/>
-						<ref name="text-alphabetical-index"/>
-						<ref name="text-bibliography"/>
-						<ref name="text-index-title"/>
-						<ref name="change-marks"/>
-					</choice>
-				</zeroOrMore>
-			</group>
-			<group>
-				<optional>
-					<ref name="style-region-left"/>
-				</optional>
-				<optional>
-					<ref name="style-region-center"/>
-				</optional>
-				<optional>
-					<ref name="style-region-right"/>
-				</optional>
-			</group>
-		</choice>
-	</define>
-	<define name="common-style-header-footer-attlist">
-		<optional>
-			<attribute name="style:display">
-				<ref name="boolean"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="style-region-left">
-		<element name="style:region-left">
-			<ref name="region-content"/>
-		</element>
-	</define>
-	<define name="style-region-center">
-		<element name="style:region-center">
-			<ref name="region-content"/>
-		</element>
-	</define>
-	<define name="style-region-right">
-		<element name="style:region-right">
-			<ref name="region-content"/>
-		</element>
-	</define>
-	<define name="region-content">
-		<zeroOrMore>
-			<ref name="text-p"/>
-		</zeroOrMore>
-	</define>
-	<define name="presentation-notes">
-		<element name="presentation:notes">
-			<ref name="common-presentation-header-footer-attlist"/>
-			<ref name="presentation-notes-attlist"/>
-			<ref name="office-forms"/>
-			<zeroOrMore>
-				<ref name="shape"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="presentation-notes-attlist">
-		<interleave>
-			<optional>
-				<attribute name="style:page-layout-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="table-table-template">
-		<element name="table:table-template">
-			<ref name="table-table-template-attlist"/>
-			<optional>
-				<ref name="table-first-row"/>
-			</optional>
-			<optional>
-				<ref name="table-last-row"/>
-			</optional>
-			<optional>
-				<ref name="table-first-column"/>
-			</optional>
-			<optional>
-				<ref name="table-last-column"/>
-			</optional>
-			<ref name="table-body"/>
-			<optional>
-				<ref name="table-even-rows"/>
-			</optional>
-			<optional>
-				<ref name="table-odd-rows"/>
-			</optional>
-			<optional>
-				<ref name="table-even-columns"/>
-			</optional>
-			<optional>
-				<ref name="table-odd-columns"/>
-			</optional>
-			<optional>
-				<ref name="table-background"/>
-			</optional>
-		</element>
-	</define>
-	<define name="table-table-template-attlist">
-		<interleave>
-			<attribute name="table:name">
-				<ref name="string"/>
-			</attribute>
-			<attribute name="table:first-row-start-column">
-				<ref name="rowOrCol"/>
-			</attribute>
-			<attribute name="table:first-row-end-column">
-				<ref name="rowOrCol"/>
-			</attribute>
-			<attribute name="table:last-row-start-column">
-				<ref name="rowOrCol"/>
-			</attribute>
-			<attribute name="table:last-row-end-column">
-				<ref name="rowOrCol"/>
-			</attribute>
-		</interleave>
-	</define>
-	<define name="rowOrCol">
-		<choice>
-			<value>row</value>
-			<value>column</value>
-		</choice>
-	</define>
-	<define name="table-first-row">
-		<element name="table:first-row">
-			<ref name="common-table-template-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="table-last-row">
-		<element name="table:last-row">
-			<ref name="common-table-template-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="table-first-column">
-		<element name="table:first-column">
-			<ref name="common-table-template-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="table-last-column">
-		<element name="table:last-column">
-			<ref name="common-table-template-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="table-body">
-		<element name="table:body">
-			<ref name="common-table-template-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="table-even-rows">
-		<element name="table:even-rows">
-			<ref name="common-table-template-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="table-odd-rows">
-		<element name="table:odd-rows">
-			<ref name="common-table-template-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="table-even-columns">
-		<element name="table:even-columns">
-			<ref name="common-table-template-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="table-odd-columns">
-		<element name="table:odd-columns">
-			<ref name="common-table-template-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="common-table-template-attlist">
-		<attribute name="table:style-name">
-			<ref name="styleNameRef"/>
-		</attribute>
-		<optional>
-			<attribute name="table:paragraph-style-name">
-				<ref name="styleNameRef"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="table-background">
-		<element name="table:background">
-			<ref name="table-background-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="table-background-attlist">
-		<attribute name="table:style-name">
-			<ref name="styleNameRef"/>
-		</attribute>
-	</define>
-	<define name="style-font-face">
-		<element name="style:font-face">
-			<ref name="style-font-face-attlist"/>
-			<optional>
-				<ref name="svg-font-face-src"/>
-			</optional>
-			<optional>
-				<ref name="svg-definition-src"/>
-			</optional>
-		</element>
-	</define>
-	<define name="style-font-face-attlist">
-		<interleave>
-			<optional>
-				<attribute name="svg:font-family">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:font-style">
-					<ref name="fontStyle"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:font-variant">
-					<ref name="fontVariant"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:font-weight">
-					<ref name="fontWeight"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:font-stretch">
-					<choice>
-						<value>normal</value>
-						<value>ultra-condensed</value>
-						<value>extra-condensed</value>
-						<value>condensed</value>
-						<value>semi-condensed</value>
-						<value>semi-expanded</value>
-						<value>expanded</value>
-						<value>extra-expanded</value>
-						<value>ultra-expanded</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:font-size">
-					<ref name="positiveLength"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:unicode-range">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:units-per-em">
-					<ref name="integer"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:panose-1">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:stemv">
-					<ref name="integer"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:stemh">
-					<ref name="integer"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:slope">
-					<ref name="integer"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:cap-height">
-					<ref name="integer"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:x-height">
-					<ref name="integer"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:accent-height">
-					<ref name="integer"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:ascent">
-					<ref name="integer"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:descent">
-					<ref name="integer"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:widths">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:bbox">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:ideographic">
-					<ref name="integer"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:alphabetic">
-					<ref name="integer"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:mathematical">
-					<ref name="integer"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:hanging">
-					<ref name="integer"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:v-ideographic">
-					<ref name="integer"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:v-alphabetic">
-					<ref name="integer"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:v-mathematical">
-					<ref name="integer"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:v-hanging">
-					<ref name="integer"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:underline-position">
-					<ref name="integer"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:underline-thickness">
-					<ref name="integer"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:strikethrough-position">
-					<ref name="integer"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:strikethrough-thickness">
-					<ref name="integer"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:overline-position">
-					<ref name="integer"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:overline-thickness">
-					<ref name="integer"/>
-				</attribute>
-			</optional>
-			<attribute name="style:name">
-				<ref name="string"/>
-			</attribute>
-			<optional>
-				<attribute name="style:font-adornments">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:font-family-generic">
-					<ref name="fontFamilyGeneric"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:font-pitch">
-					<ref name="fontPitch"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:font-charset">
-					<ref name="textEncoding"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="svg-font-face-src">
-		<element name="svg:font-face-src">
-			<oneOrMore>
-				<choice>
-					<ref name="svg-font-face-uri"/>
-					<ref name="svg-font-face-name"/>
-				</choice>
-			</oneOrMore>
-		</element>
-	</define>
-	<define name="svg-font-face-uri">
-		<element name="svg:font-face-uri">
-			<ref name="common-svg-font-face-xlink-attlist"/>
-			<zeroOrMore>
-				<ref name="svg-font-face-format"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="svg-font-face-format">
-		<element name="svg:font-face-format">
-			<optional>
-				<attribute name="svg:string">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<empty/>
-		</element>
-	</define>
-	<define name="svg-font-face-name">
-		<element name="svg:font-face-name">
-			<optional>
-				<attribute name="svg:name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<empty/>
-		</element>
-	</define>
-	<define name="svg-definition-src">
-		<element name="svg:definition-src">
-			<ref name="common-svg-font-face-xlink-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="common-svg-font-face-xlink-attlist">
-		<attribute name="xlink:type">
-			<value>simple</value>
-		</attribute>
-		<attribute name="xlink:href">
-			<ref name="anyIRI"/>
-		</attribute>
-		<optional>
-			<attribute name="xlink:actuate">
-				<value>onRequest</value>
-			</attribute>
-		</optional>
-	</define>
-	<define name="number-number-style">
-		<element name="number:number-style">
-			<ref name="common-data-style-attlist"/>
-			<optional>
-				<ref name="style-text-properties"/>
-			</optional>
-			<optional>
-				<ref name="number-text"/>
-			</optional>
-			<optional>
-				<ref name="any-number"/>
-				<optional>
-					<ref name="number-text"/>
-				</optional>
-			</optional>
-			<zeroOrMore>
-				<ref name="style-map"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="any-number">
-		<choice>
-			<ref name="number-number"/>
-			<ref name="number-scientific-number"/>
-			<ref name="number-fraction"/>
-		</choice>
-	</define>
-	<define name="number-number">
-		<element name="number:number">
-			<ref name="number-number-attlist"/>
-			<ref name="common-decimal-places-attlist"/>
-			<ref name="common-number-attlist"/>
-			<zeroOrMore>
-				<ref name="number-embedded-text"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="number-number-attlist">
-		<interleave>
-			<optional>
-				<attribute name="number:decimal-replacement">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="number:display-factor">
-					<ref name="double"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="number-embedded-text">
-		<element name="number:embedded-text">
-			<ref name="number-embedded-text-attlist"/>
-			<text/>
-		</element>
-	</define>
-	<define name="number-embedded-text-attlist">
-		<attribute name="number:position">
-			<ref name="integer"/>
-		</attribute>
-	</define>
-	<define name="number-scientific-number">
-		<element name="number:scientific-number">
-			<ref name="number-scientific-number-attlist"/>
-			<ref name="common-decimal-places-attlist"/>
-			<ref name="common-number-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="number-scientific-number-attlist">
-		<optional>
-			<attribute name="number:min-exponent-digits">
-				<ref name="integer"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="number-fraction">
-		<element name="number:fraction">
-			<ref name="number-fraction-attlist"/>
-			<ref name="common-number-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="number-fraction-attlist">
-		<interleave>
-			<optional>
-				<attribute name="number:min-numerator-digits">
-					<ref name="integer"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="number:min-denominator-digits">
-					<ref name="integer"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="number:denominator-value">
-					<ref name="integer"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="number-currency-style">
-		<element name="number:currency-style">
-			<ref name="common-data-style-attlist"/>
-			<ref name="common-auto-reorder-attlist"/>
-			<optional>
-				<ref name="style-text-properties"/>
-			</optional>
-			<optional>
-				<ref name="number-text"/>
-			</optional>
-			<optional>
-				<choice>
-					<group>
-						<ref name="number-and-text"/>
-						<optional>
-							<ref name="currency-symbol-and-text"/>
-						</optional>
-					</group>
-					<group>
-						<ref name="currency-symbol-and-text"/>
-						<optional>
-							<ref name="number-and-text"/>
-						</optional>
-					</group>
-				</choice>
-			</optional>
-			<zeroOrMore>
-				<ref name="style-map"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="currency-symbol-and-text">
-		<ref name="number-currency-symbol"/>
-		<optional>
-			<ref name="number-text"/>
-		</optional>
-	</define>
-	<define name="number-and-text">
-		<ref name="number-number"/>
-		<optional>
-			<ref name="number-text"/>
-		</optional>
-	</define>
-	<define name="number-currency-symbol">
-		<element name="number:currency-symbol">
-			<ref name="number-currency-symbol-attlist"/>
-			<text/>
-		</element>
-	</define>
-	<define name="number-currency-symbol-attlist">
-		<optional>
-			<attribute name="number:language">
-				<ref name="languageCode"/>
-			</attribute>
-		</optional>
-		<optional>
-			<attribute name="number:country">
-				<ref name="countryCode"/>
-			</attribute>
-		</optional>
-		<optional>
-			<attribute name="number:script">
-				<ref name="scriptCode"/>
-			</attribute>
-		</optional>
-		<optional>
-			<attribute name="number:rfc-language-tag">
-				<ref name="language"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="number-percentage-style">
-		<element name="number:percentage-style">
-			<ref name="common-data-style-attlist"/>
-			<optional>
-				<ref name="style-text-properties"/>
-			</optional>
-			<optional>
-				<ref name="number-text"/>
-			</optional>
-			<optional>
-				<ref name="number-and-text"/>
-			</optional>
-			<zeroOrMore>
-				<ref name="style-map"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="number-date-style">
-		<element name="number:date-style">
-			<ref name="common-data-style-attlist"/>
-			<ref name="common-auto-reorder-attlist"/>
-			<ref name="common-format-source-attlist"/>
-			<optional>
-				<ref name="style-text-properties"/>
-			</optional>
-			<optional>
-				<ref name="number-text"/>
-			</optional>
-			<oneOrMore>
-				<ref name="any-date"/>
-				<optional>
-					<ref name="number-text"/>
-				</optional>
-			</oneOrMore>
-			<zeroOrMore>
-				<ref name="style-map"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="any-date">
-		<choice>
-			<ref name="number-day"/>
-			<ref name="number-month"/>
-			<ref name="number-year"/>
-			<ref name="number-era"/>
-			<ref name="number-day-of-week"/>
-			<ref name="number-week-of-year"/>
-			<ref name="number-quarter"/>
-			<ref name="number-hours"/>
-			<ref name="number-am-pm"/>
-			<ref name="number-minutes"/>
-			<ref name="number-seconds"/>
-		</choice>
-	</define>
-	<define name="number-day">
-		<element name="number:day">
-			<ref name="number-day-attlist"/>
-			<ref name="common-calendar-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="number-day-attlist">
-		<optional>
-			<attribute name="number:style">
-				<choice>
-					<value>short</value>
-					<value>long</value>
-				</choice>
-			</attribute>
-		</optional>
-	</define>
-	<define name="number-month">
-		<element name="number:month">
-			<ref name="number-month-attlist"/>
-			<ref name="common-calendar-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="number-month-attlist">
-		<interleave>
-			<optional>
-				<attribute name="number:textual">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="number:possessive-form">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="number:style">
-					<choice>
-						<value>short</value>
-						<value>long</value>
-					</choice>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="number-year">
-		<element name="number:year">
-			<ref name="number-year-attlist"/>
-			<ref name="common-calendar-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="number-year-attlist">
-		<optional>
-			<attribute name="number:style">
-				<choice>
-					<value>short</value>
-					<value>long</value>
-				</choice>
-			</attribute>
-		</optional>
-	</define>
-	<define name="number-era">
-		<element name="number:era">
-			<ref name="number-era-attlist"/>
-			<ref name="common-calendar-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="number-era-attlist">
-		<optional>
-			<attribute name="number:style">
-				<choice>
-					<value>short</value>
-					<value>long</value>
-				</choice>
-			</attribute>
-		</optional>
-	</define>
-	<define name="number-day-of-week">
-		<element name="number:day-of-week">
-			<ref name="number-day-of-week-attlist"/>
-			<ref name="common-calendar-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="number-day-of-week-attlist">
-		<optional>
-			<attribute name="number:style">
-				<choice>
-					<value>short</value>
-					<value>long</value>
-				</choice>
-			</attribute>
-		</optional>
-	</define>
-	<define name="number-week-of-year">
-		<element name="number:week-of-year">
-			<ref name="common-calendar-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="number-quarter">
-		<element name="number:quarter">
-			<ref name="number-quarter-attlist"/>
-			<ref name="common-calendar-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="number-quarter-attlist">
-		<optional>
-			<attribute name="number:style">
-				<choice>
-					<value>short</value>
-					<value>long</value>
-				</choice>
-			</attribute>
-		</optional>
-	</define>
-	<define name="number-time-style">
-		<element name="number:time-style">
-			<ref name="number-time-style-attlist"/>
-			<ref name="common-data-style-attlist"/>
-			<ref name="common-format-source-attlist"/>
-			<optional>
-				<ref name="style-text-properties"/>
-			</optional>
-			<optional>
-				<ref name="number-text"/>
-			</optional>
-			<oneOrMore>
-				<ref name="any-time"/>
-				<optional>
-					<ref name="number-text"/>
-				</optional>
-			</oneOrMore>
-			<zeroOrMore>
-				<ref name="style-map"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="any-time">
-		<choice>
-			<ref name="number-hours"/>
-			<ref name="number-am-pm"/>
-			<ref name="number-minutes"/>
-			<ref name="number-seconds"/>
-		</choice>
-	</define>
-	<define name="number-time-style-attlist">
-		<optional>
-			<attribute name="number:truncate-on-overflow">
-				<ref name="boolean"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="number-hours">
-		<element name="number:hours">
-			<ref name="number-hours-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="number-hours-attlist">
-		<optional>
-			<attribute name="number:style">
-				<choice>
-					<value>short</value>
-					<value>long</value>
-				</choice>
-			</attribute>
-		</optional>
-	</define>
-	<define name="number-minutes">
-		<element name="number:minutes">
-			<ref name="number-minutes-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="number-minutes-attlist">
-		<optional>
-			<attribute name="number:style">
-				<choice>
-					<value>short</value>
-					<value>long</value>
-				</choice>
-			</attribute>
-		</optional>
-	</define>
-	<define name="number-seconds">
-		<element name="number:seconds">
-			<ref name="number-seconds-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="number-seconds-attlist">
-		<interleave>
-			<optional>
-				<attribute name="number:style">
-					<choice>
-						<value>short</value>
-						<value>long</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="number:decimal-places">
-					<ref name="integer"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="number-am-pm">
-		<element name="number:am-pm">
-			<empty/>
-		</element>
-	</define>
-	<define name="number-boolean-style">
-		<element name="number:boolean-style">
-			<ref name="common-data-style-attlist"/>
-			<optional>
-				<ref name="style-text-properties"/>
-			</optional>
-			<optional>
-				<ref name="number-text"/>
-			</optional>
-			<optional>
-				<ref name="number-boolean"/>
-				<optional>
-					<ref name="number-text"/>
-				</optional>
-			</optional>
-			<zeroOrMore>
-				<ref name="style-map"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="number-boolean">
-		<element name="number:boolean">
-			<empty/>
-		</element>
-	</define>
-	<define name="number-text-style">
-		<element name="number:text-style">
-			<ref name="common-data-style-attlist"/>
-			<optional>
-				<ref name="style-text-properties"/>
-			</optional>
-			<optional>
-				<ref name="number-text"/>
-			</optional>
-			<zeroOrMore>
-				<ref name="number-text-content"/>
-				<optional>
-					<ref name="number-text"/>
-				</optional>
-			</zeroOrMore>
-			<zeroOrMore>
-				<ref name="style-map"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="number-text">
-		<element name="number:text">
-			<text/>
-		</element>
-	</define>
-	<define name="number-text-content">
-		<element name="number:text-content">
-			<empty/>
-		</element>
-	</define>
-	<define name="common-data-style-attlist">
-		<interleave>
-			<attribute name="style:name">
-				<ref name="styleName"/>
-			</attribute>
-			<optional>
-				<attribute name="style:display-name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="number:language">
-					<ref name="languageCode"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="number:country">
-					<ref name="countryCode"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="number:script">
-					<ref name="scriptCode"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="number:rfc-language-tag">
-					<ref name="language"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="number:title">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:volatile">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="number:transliteration-format">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="number:transliteration-language">
-					<ref name="countryCode"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="number:transliteration-country">
-					<ref name="countryCode"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="number:transliteration-style">
-					<choice>
-						<value>short</value>
-						<value>medium</value>
-						<value>long</value>
-					</choice>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="common-auto-reorder-attlist">
-		<optional>
-			<attribute name="number:automatic-order">
-				<ref name="boolean"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-format-source-attlist">
-		<optional>
-			<attribute name="number:format-source">
-				<choice>
-					<value>fixed</value>
-					<value>language</value>
-				</choice>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-decimal-places-attlist">
-		<optional>
-			<attribute name="number:decimal-places">
-				<ref name="integer"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-number-attlist">
-		<interleave>
-			<optional>
-				<attribute name="number:min-integer-digits">
-					<ref name="integer"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="number:grouping">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="common-calendar-attlist">
-		<optional>
-			<attribute name="number:calendar">
-				<choice>
-					<value>gregorian</value>
-					<value>gengou</value>
-					<value>ROC</value>
-					<value>hanja_yoil</value>
-					<value>hanja</value>
-					<value>hijri</value>
-					<value>jewish</value>
-					<value>buddhist</value>
-					<ref name="string"/>
-				</choice>
-			</attribute>
-		</optional>
-	</define>
-	<define name="style-style-content">
-		<choice>
-			<group>
-				<attribute name="style:family">
-					<value>text</value>
-				</attribute>
-				<optional>
-					<ref name="style-text-properties"/>
-				</optional>
-			</group>
-			<group>
-				<attribute name="style:family">
-					<value>paragraph</value>
-				</attribute>
-				<optional>
-					<ref name="style-paragraph-properties"/>
-				</optional>
-				<optional>
-					<ref name="style-text-properties"/>
-				</optional>
-			</group>
-			<group>
-				<attribute name="style:family">
-					<value>section</value>
-				</attribute>
-				<optional>
-					<ref name="style-section-properties"/>
-				</optional>
-			</group>
-			<group>
-				<attribute name="style:family">
-					<value>ruby</value>
-				</attribute>
-				<optional>
-					<ref name="style-ruby-properties"/>
-				</optional>
-			</group>
-			<group>
-				<attribute name="style:family">
-					<value>table</value>
-				</attribute>
-				<optional>
-					<ref name="style-table-properties"/>
-				</optional>
-			</group>
-			<group>
-				<attribute name="style:family">
-					<value>table-column</value>
-				</attribute>
-				<optional>
-					<ref name="style-table-column-properties"/>
-				</optional>
-			</group>
-			<group>
-				<attribute name="style:family">
-					<value>table-row</value>
-				</attribute>
-				<optional>
-					<ref name="style-table-row-properties"/>
-				</optional>
-			</group>
-			<group>
-				<attribute name="style:family">
-					<value>table-cell</value>
-				</attribute>
-				<optional>
-					<ref name="style-table-cell-properties"/>
-				</optional>
-				<optional>
-					<ref name="style-paragraph-properties"/>
-				</optional>
-				<optional>
-					<ref name="style-text-properties"/>
-				</optional>
-			</group>
-			<group>
-				<attribute name="style:family">
-					<choice>
-						<value>graphic</value>
-						<value>presentation</value>
-					</choice>
-				</attribute>
-				<optional>
-					<ref name="style-graphic-properties"/>
-				</optional>
-				<optional>
-					<ref name="style-paragraph-properties"/>
-				</optional>
-				<optional>
-					<ref name="style-text-properties"/>
-				</optional>
-			</group>
-			<group>
-				<attribute name="style:family">
-					<value>drawing-page</value>
-				</attribute>
-				<optional>
-					<ref name="style-drawing-page-properties"/>
-				</optional>
-			</group>
-			<group>
-				<attribute name="style:family">
-					<value>chart</value>
-				</attribute>
-				<optional>
-					<ref name="style-chart-properties"/>
-				</optional>
-				<optional>
-					<ref name="style-graphic-properties"/>
-				</optional>
-				<optional>
-					<ref name="style-paragraph-properties"/>
-				</optional>
-				<optional>
-					<ref name="style-text-properties"/>
-				</optional>
-			</group>
-		</choice>
-	</define>
-	<define name="text-linenumbering-configuration">
-		<element name="text:linenumbering-configuration">
-			<ref name="text-linenumbering-configuration-attlist"/>
-			<optional>
-				<ref name="text-linenumbering-separator"/>
-			</optional>
-		</element>
-	</define>
-	<define name="text-linenumbering-configuration-attlist">
-		<interleave>
-			<optional>
-				<attribute name="text:number-lines">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<ref name="common-num-format-attlist"/>
-			</optional>
-			<optional>
-				<attribute name="text:style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:increment">
-					<ref name="nonNegativeInteger"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:number-position">
-					<choice>
-						<value>left</value>
-						<value>right</value>
-						<value>inner</value>
-						<value>outer</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:offset">
-					<ref name="nonNegativeLength"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:count-empty-lines">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:count-in-text-boxes">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:restart-on-page">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="text-linenumbering-separator">
-		<element name="text:linenumbering-separator">
-			<optional>
-				<attribute name="text:increment">
-					<ref name="nonNegativeInteger"/>
-				</attribute>
-			</optional>
-			<text/>
-		</element>
-	</define>
-	<define name="text-notes-configuration">
-		<element name="text:notes-configuration">
-			<ref name="text-notes-configuration-content"/>
-		</element>
-	</define>
-	<define name="text-notes-configuration-content">
-		<interleave>
-			<ref name="text-note-class"/>
-			<optional>
-				<attribute name="text:citation-style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:citation-body-style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:default-style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:master-page-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:start-value">
-					<ref name="nonNegativeInteger"/>
-				</attribute>
-			</optional>
-			<ref name="common-num-format-prefix-suffix-attlist"/>
-			<optional>
-				<ref name="common-num-format-attlist"/>
-			</optional>
-			<optional>
-				<attribute name="text:start-numbering-at">
-					<choice>
-						<value>document</value>
-						<value>chapter</value>
-						<value>page</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:footnotes-position">
-					<choice>
-						<value>text</value>
-						<value>page</value>
-						<value>section</value>
-						<value>document</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<element name="text:note-continuation-notice-forward">
-					<text/>
-				</element>
-			</optional>
-			<optional>
-				<element name="text:note-continuation-notice-backward">
-					<text/>
-				</element>
-			</optional>
-		</interleave>
-	</define>
-	<define name="text-bibliography-configuration">
-		<element name="text:bibliography-configuration">
-			<ref name="text-bibliography-configuration-attlist"/>
-			<zeroOrMore>
-				<ref name="text-sort-key"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="text-bibliography-configuration-attlist">
-		<interleave>
-			<optional>
-				<attribute name="text:prefix">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:suffix">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:numbered-entries">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:sort-by-position">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="fo:language">
-					<ref name="languageCode"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="fo:country">
-					<ref name="countryCode"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="fo:script">
-					<ref name="scriptCode"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:rfc-language-tag">
-					<ref name="language"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:sort-algorithm">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="text-sort-key">
-		<element name="text:sort-key">
-			<ref name="text-sort-key-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="text-sort-key-attlist">
-		<attribute name="text:key">
-			<choice>
-				<value>address</value>
-				<value>annote</value>
-				<value>author</value>
-				<value>bibliography-type</value>
-				<value>booktitle</value>
-				<value>chapter</value>
-				<value>custom1</value>
-				<value>custom2</value>
-				<value>custom3</value>
-				<value>custom4</value>
-				<value>custom5</value>
-				<value>edition</value>
-				<value>editor</value>
-				<value>howpublished</value>
-				<value>identifier</value>
-				<value>institution</value>
-				<value>isbn</value>
-				<value>issn</value>
-				<value>journal</value>
-				<value>month</value>
-				<value>note</value>
-				<value>number</value>
-				<value>organizations</value>
-				<value>pages</value>
-				<value>publisher</value>
-				<value>report-type</value>
-				<value>school</value>
-				<value>series</value>
-				<value>title</value>
-				<value>url</value>
-				<value>volume</value>
-				<value>year</value>
-			</choice>
-		</attribute>
-		<optional>
-			<attribute name="text:sort-ascending">
-				<ref name="boolean"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="text-list-style">
-		<element name="text:list-style">
-			<ref name="text-list-style-attr"/>
-			<zeroOrMore>
-				<ref name="text-list-style-content"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="text-list-style-attr">
-		<interleave>
-			<attribute name="style:name">
-				<ref name="styleName"/>
-			</attribute>
-			<optional>
-				<attribute name="style:display-name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:consecutive-numbering">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="text-list-style-content">
-		<choice>
-			<element name="text:list-level-style-number">
-				<ref name="text-list-level-style-attr"/>
-				<ref name="text-list-level-style-number-attr"/>
-				<optional>
-					<ref name="style-list-level-properties"/>
-				</optional>
-				<optional>
-					<ref name="style-text-properties"/>
-				</optional>
-			</element>
-			<element name="text:list-level-style-bullet">
-				<ref name="text-list-level-style-attr"/>
-				<ref name="text-list-level-style-bullet-attr"/>
-				<optional>
-					<ref name="style-list-level-properties"/>
-				</optional>
-				<optional>
-					<ref name="style-text-properties"/>
-				</optional>
-			</element>
-			<element name="text:list-level-style-image">
-				<ref name="text-list-level-style-attr"/>
-				<ref name="text-list-level-style-image-attr"/>
-				<optional>
-					<ref name="style-list-level-properties"/>
-				</optional>
-			</element>
-		</choice>
-	</define>
-	<define name="text-list-level-style-number-attr">
-		<interleave>
-			<optional>
-				<attribute name="text:style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<ref name="common-num-format-attlist"/>
-			<ref name="common-num-format-prefix-suffix-attlist"/>
-			<optional>
-				<attribute name="text:display-levels">
-					<ref name="positiveInteger"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:start-value">
-					<ref name="positiveInteger"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="text-list-level-style-bullet-attr">
-		<interleave>
-			<optional>
-				<attribute name="text:style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<attribute name="text:bullet-char">
-				<ref name="character"/>
-			</attribute>
-			<ref name="common-num-format-prefix-suffix-attlist"/>
-			<optional>
-				<attribute name="text:bullet-relative-size">
-					<ref name="percent"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="text-list-level-style-image-attr">
-		<choice>
-			<ref name="common-draw-data-attlist"/>
-			<ref name="office-binary-data"/>
-		</choice>
-	</define>
-	<define name="text-list-level-style-attr">
-		<attribute name="text:level">
-			<ref name="positiveInteger"/>
-		</attribute>
-	</define>
-	<define name="text-outline-style">
-		<element name="text:outline-style">
-			<ref name="text-outline-style-attr"/>
-			<oneOrMore>
-				<ref name="text-outline-level-style"/>
-			</oneOrMore>
-		</element>
-	</define>
-	<define name="text-outline-style-attr">
-		<attribute name="style:name">
-			<ref name="styleName"/>
-		</attribute>
-	</define>
-	<define name="text-outline-level-style">
-		<element name="text:outline-level-style">
-			<ref name="text-outline-level-style-attlist"/>
-			<optional>
-				<ref name="style-list-level-properties"/>
-			</optional>
-			<optional>
-				<ref name="style-text-properties"/>
-			</optional>
-		</element>
-	</define>
-	<define name="text-outline-level-style-attlist">
-		<interleave>
-			<attribute name="text:level">
-				<ref name="positiveInteger"/>
-			</attribute>
-			<optional>
-				<attribute name="text:style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<ref name="common-num-format-attlist"/>
-			<ref name="common-num-format-prefix-suffix-attlist"/>
-			<optional>
-				<attribute name="text:display-levels">
-					<ref name="positiveInteger"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:start-value">
-					<ref name="positiveInteger"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="style-graphic-properties">
-		<element name="style:graphic-properties">
-			<ref name="style-graphic-properties-content-strict"/>
-		</element>
-	</define>
-	<define name="style-graphic-properties-content-strict">
-		<ref name="style-graphic-properties-attlist"/>
-		<ref name="style-graphic-fill-properties-attlist"/>
-		<ref name="style-graphic-properties-elements"/>
-	</define>
-	<define name="style-drawing-page-properties">
-		<element name="style:drawing-page-properties">
-			<ref name="style-drawing-page-properties-content-strict"/>
-		</element>
-	</define>
-	<define name="style-drawing-page-properties-content-strict">
-		<ref name="style-graphic-fill-properties-attlist"/>
-		<ref name="style-drawing-page-properties-attlist"/>
-		<ref name="style-drawing-page-properties-elements"/>
-	</define>
-	<define name="draw-gradient">
-		<element name="draw:gradient">
-			<ref name="common-draw-gradient-attlist"/>
-			<ref name="draw-gradient-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="common-draw-gradient-attlist">
-		<interleave>
-			<optional>
-				<attribute name="draw:name">
-					<ref name="styleName"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:display-name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<attribute name="draw:style">
-				<ref name="gradient-style"/>
-			</attribute>
-			<optional>
-				<attribute name="draw:cx">
-					<ref name="percent"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:cy">
-					<ref name="percent"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:angle">
-					<ref name="angle"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:border">
-					<ref name="percent"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="gradient-style">
-		<choice>
-			<value>linear</value>
-			<value>axial</value>
-			<value>radial</value>
-			<value>ellipsoid</value>
-			<value>square</value>
-			<value>rectangular</value>
-		</choice>
-	</define>
-	<define name="draw-gradient-attlist">
-		<interleave>
-			<optional>
-				<attribute name="draw:start-color">
-					<ref name="color"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:end-color">
-					<ref name="color"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:start-intensity">
-					<ref name="zeroToHundredPercent"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:end-intensity">
-					<ref name="zeroToHundredPercent"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="svg-linearGradient">
-		<element name="svg:linearGradient">
-			<ref name="common-svg-gradient-attlist"/>
-			<optional>
-				<attribute name="svg:x1">
-					<choice>
-						<ref name="coordinate"/>
-						<ref name="percent"/>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:y1">
-					<choice>
-						<ref name="coordinate"/>
-						<ref name="percent"/>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:x2">
-					<choice>
-						<ref name="coordinate"/>
-						<ref name="percent"/>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:y2">
-					<choice>
-						<ref name="coordinate"/>
-						<ref name="percent"/>
-					</choice>
-				</attribute>
-			</optional>
-			<zeroOrMore>
-				<ref name="svg-stop"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="svg-radialGradient">
-		<element name="svg:radialGradient">
-			<ref name="common-svg-gradient-attlist"/>
-			<optional>
-				<attribute name="svg:cx">
-					<choice>
-						<ref name="coordinate"/>
-						<ref name="percent"/>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:cy">
-					<choice>
-						<ref name="coordinate"/>
-						<ref name="percent"/>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:r">
-					<choice>
-						<ref name="coordinate"/>
-						<ref name="percent"/>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:fx">
-					<choice>
-						<ref name="coordinate"/>
-						<ref name="percent"/>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:fy">
-					<choice>
-						<ref name="coordinate"/>
-						<ref name="percent"/>
-					</choice>
-				</attribute>
-			</optional>
-			<zeroOrMore>
-				<ref name="svg-stop"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="svg-stop">
-		<element name="svg:stop">
-			<attribute name="svg:offset">
-				<choice>
-					<ref name="double"/>
-					<ref name="percent"/>
-				</choice>
-			</attribute>
-			<optional>
-				<attribute name="svg:stop-color">
-					<ref name="color"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:stop-opacity">
-					<ref name="double"/>
-				</attribute>
-			</optional>
-		</element>
-	</define>
-	<define name="common-svg-gradient-attlist">
-		<interleave>
-			<optional>
-				<attribute name="svg:gradientUnits">
-					<value>objectBoundingBox</value>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:gradientTransform">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:spreadMethod">
-					<choice>
-						<value>pad</value>
-						<value>reflect</value>
-						<value>repeat</value>
-					</choice>
-				</attribute>
-			</optional>
-			<attribute name="draw:name">
-				<ref name="styleName"/>
-			</attribute>
-			<optional>
-				<attribute name="draw:display-name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="draw-hatch">
-		<element name="draw:hatch">
-			<ref name="draw-hatch-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="draw-hatch-attlist">
-		<interleave>
-			<attribute name="draw:name">
-				<ref name="styleName"/>
-			</attribute>
-			<optional>
-				<attribute name="draw:display-name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<attribute name="draw:style">
-				<choice>
-					<value>single</value>
-					<value>double</value>
-					<value>triple</value>
-				</choice>
-			</attribute>
-			<optional>
-				<attribute name="draw:color">
-					<ref name="color"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:distance">
-					<ref name="length"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:rotation">
-					<ref name="angle"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="draw-fill-image">
-		<element name="draw:fill-image">
-			<ref name="draw-fill-image-attlist"/>
-			<attribute name="xlink:type">
-				<value>simple</value>
-			</attribute>
-			<attribute name="xlink:href">
-				<ref name="anyIRI"/>
-			</attribute>
-			<optional>
-				<attribute name="xlink:show">
-					<value>embed</value>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="xlink:actuate">
-					<value>onLoad</value>
-				</attribute>
-			</optional>
-			<empty/>
-		</element>
-	</define>
-	<define name="draw-fill-image-attlist">
-		<interleave>
-			<attribute name="draw:name">
-				<ref name="styleName"/>
-			</attribute>
-			<optional>
-				<attribute name="draw:display-name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:width">
-					<ref name="length"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:height">
-					<ref name="length"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="draw-opacity">
-		<element name="draw:opacity">
-			<ref name="common-draw-gradient-attlist"/>
-			<ref name="draw-opacity-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="draw-opacity-attlist">
-		<optional>
-			<attribute name="draw:start">
-				<ref name="zeroToHundredPercent"/>
-			</attribute>
-		</optional>
-		<optional>
-			<attribute name="draw:end">
-				<ref name="zeroToHundredPercent"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="draw-marker">
-		<element name="draw:marker">
-			<ref name="draw-marker-attlist"/>
-			<ref name="common-draw-viewbox-attlist"/>
-			<ref name="common-draw-path-data-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="draw-marker-attlist">
-		<interleave>
-			<attribute name="draw:name">
-				<ref name="styleName"/>
-			</attribute>
-			<optional>
-				<attribute name="draw:display-name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="draw-stroke-dash">
-		<element name="draw:stroke-dash">
-			<ref name="draw-stroke-dash-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="draw-stroke-dash-attlist">
-		<interleave>
-			<attribute name="draw:name">
-				<ref name="styleName"/>
-			</attribute>
-			<optional>
-				<attribute name="draw:display-name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:style">
-					<choice>
-						<value>rect</value>
-						<value>round</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:dots1">
-					<ref name="integer"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:dots1-length">
-					<choice>
-						<ref name="length"/>
-						<ref name="percent"/>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:dots2">
-					<ref name="integer"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:dots2-length">
-					<choice>
-						<ref name="length"/>
-						<ref name="percent"/>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:distance">
-					<choice>
-						<ref name="length"/>
-						<ref name="percent"/>
-					</choice>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="style-presentation-page-layout">
-		<element name="style:presentation-page-layout">
-			<attribute name="style:name">
-				<ref name="styleName"/>
-			</attribute>
-			<optional>
-				<attribute name="style:display-name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<zeroOrMore>
-				<ref name="presentation-placeholder"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="presentation-placeholder">
-		<element name="presentation:placeholder">
-			<attribute name="presentation:object">
-				<ref name="presentation-classes"/>
-			</attribute>
-			<attribute name="svg:x">
-				<choice>
-					<ref name="coordinate"/>
-					<ref name="percent"/>
-				</choice>
-			</attribute>
-			<attribute name="svg:y">
-				<choice>
-					<ref name="coordinate"/>
-					<ref name="percent"/>
-				</choice>
-			</attribute>
-			<attribute name="svg:width">
-				<choice>
-					<ref name="length"/>
-					<ref name="percent"/>
-				</choice>
-			</attribute>
-			<attribute name="svg:height">
-				<choice>
-					<ref name="length"/>
-					<ref name="percent"/>
-				</choice>
-			</attribute>
-			<empty/>
-		</element>
-	</define>
-	<define name="style-page-layout-properties">
-		<element name="style:page-layout-properties">
-			<ref name="style-page-layout-properties-content-strict"/>
-		</element>
-	</define>
-	<define name="style-page-layout-properties-content-strict">
-		<ref name="style-page-layout-properties-attlist"/>
-		<ref name="style-page-layout-properties-elements"/>
-	</define>
-	<define name="style-page-layout-properties-attlist">
-		<interleave>
-			<optional>
-				<attribute name="fo:page-width">
-					<ref name="length"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="fo:page-height">
-					<ref name="length"/>
-				</attribute>
-			</optional>
-			<optional>
-				<ref name="common-num-format-attlist"/>
-			</optional>
-			<ref name="common-num-format-prefix-suffix-attlist"/>
-			<optional>
-				<attribute name="style:paper-tray-name">
-					<choice>
-						<value>default</value>
-						<ref name="string"/>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:print-orientation">
-					<choice>
-						<value>portrait</value>
-						<value>landscape</value>
-					</choice>
-				</attribute>
-			</optional>
-			<ref name="common-horizontal-margin-attlist"/>
-			<ref name="common-vertical-margin-attlist"/>
-			<ref name="common-margin-attlist"/>
-			<ref name="common-border-attlist"/>
-			<ref name="common-border-line-width-attlist"/>
-			<ref name="common-padding-attlist"/>
-			<ref name="common-shadow-attlist"/>
-			<ref name="common-background-color-attlist"/>
-			<optional>
-				<attribute name="style:register-truth-ref-style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:print">
-					<list>
-						<zeroOrMore>
-							<choice>
-								<value>headers</value>
-								<value>grid</value>
-								<value>annotations</value>
-								<value>objects</value>
-								<value>charts</value>
-								<value>drawings</value>
-								<value>formulas</value>
-								<value>zero-values</value>
-							</choice>
-						</zeroOrMore>
-					</list>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:print-page-order">
-					<choice>
-						<value>ttb</value>
-						<value>ltr</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:first-page-number">
-					<choice>
-						<ref name="positiveInteger"/>
-						<value>continue</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:scale-to">
-					<ref name="percent"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:scale-to-pages">
-					<ref name="positiveInteger"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:table-centering">
-					<choice>
-						<value>horizontal</value>
-						<value>vertical</value>
-						<value>both</value>
-						<value>none</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:footnote-max-height">
-					<ref name="length"/>
-				</attribute>
-			</optional>
-			<ref name="common-writing-mode-attlist"/>
-			<optional>
-				<attribute name="style:layout-grid-mode">
-					<choice>
-						<value>none</value>
-						<value>line</value>
-						<value>both</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:layout-grid-standard-mode">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:layout-grid-base-height">
-					<ref name="length"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:layout-grid-ruby-height">
-					<ref name="length"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:layout-grid-lines">
-					<ref name="positiveInteger"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:layout-grid-base-width">
-					<ref name="length"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:layout-grid-color">
-					<ref name="color"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:layout-grid-ruby-below">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:layout-grid-print">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:layout-grid-display">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:layout-grid-snap-to">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="style-page-layout-properties-elements">
-		<interleave>
-			<ref name="style-background-image"/>
-			<ref name="style-columns"/>
-			<ref name="style-footnote-sep"/>
-		</interleave>
-	</define>
-	<define name="style-footnote-sep">
-		<optional>
-			<element name="style:footnote-sep">
-				<ref name="style-footnote-sep-attlist"/>
-				<empty/>
-			</element>
-		</optional>
-	</define>
-	<define name="style-footnote-sep-attlist">
-		<optional>
-			<attribute name="style:width">
-				<ref name="length"/>
-			</attribute>
-		</optional>
-		<optional>
-			<attribute name="style:rel-width">
-				<ref name="percent"/>
-			</attribute>
-		</optional>
-		<optional>
-			<attribute name="style:color">
-				<ref name="color"/>
-			</attribute>
-		</optional>
-		<optional>
-			<attribute name="style:line-style">
-				<ref name="lineStyle"/>
-			</attribute>
-		</optional>
-		<optional>
-			<attribute name="style:adjustment">
-				<choice>
-					<value>left</value>
-					<value>center</value>
-					<value>right</value>
-				</choice>
-			</attribute>
-		</optional>
-		<optional>
-			<attribute name="style:distance-before-sep">
-				<ref name="length"/>
-			</attribute>
-		</optional>
-		<optional>
-			<attribute name="style:distance-after-sep">
-				<ref name="length"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="style-header-footer-properties">
-		<element name="style:header-footer-properties">
-			<ref name="style-header-footer-properties-content-strict"/>
-		</element>
-	</define>
-	<define name="style-header-footer-properties-content-strict">
-		<ref name="style-header-footer-properties-attlist"/>
-		<ref name="style-header-footer-properties-elements"/>
-	</define>
-	<define name="style-header-footer-properties-attlist">
-		<interleave>
-			<optional>
-				<attribute name="svg:height">
-					<ref name="length"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="fo:min-height">
-					<ref name="length"/>
-				</attribute>
-			</optional>
-			<ref name="common-horizontal-margin-attlist"/>
-			<ref name="common-vertical-margin-attlist"/>
-			<ref name="common-margin-attlist"/>
-			<ref name="common-border-attlist"/>
-			<ref name="common-border-line-width-attlist"/>
-			<ref name="common-padding-attlist"/>
-			<ref name="common-background-color-attlist"/>
-			<ref name="common-shadow-attlist"/>
-			<optional>
-				<attribute name="style:dynamic-spacing">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="style-header-footer-properties-elements">
-		<ref name="style-background-image"/>
-	</define>
-	<define name="style-text-properties">
-		<element name="style:text-properties">
-			<ref name="style-text-properties-content-strict"/>
-		</element>
-	</define>
-	<define name="style-text-properties-content-strict">
-		<ref name="style-text-properties-attlist"/>
-		<ref name="style-text-properties-elements"/>
-	</define>
-	<define name="style-text-properties-elements">
-		<empty/>
-	</define>
-	<define name="style-text-properties-attlist">
-		<interleave>
-			<optional>
-				<attribute name="fo:font-variant">
-					<ref name="fontVariant"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="fo:text-transform">
-					<choice>
-						<value>none</value>
-						<value>lowercase</value>
-						<value>uppercase</value>
-						<value>capitalize</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="fo:color">
-					<ref name="color"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:use-window-font-color">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:text-outline">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:text-line-through-type">
-					<ref name="lineType"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:text-line-through-style">
-					<ref name="lineStyle"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:text-line-through-width">
-					<ref name="lineWidth"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:text-line-through-color">
-					<choice>
-						<value>font-color</value>
-						<ref name="color"/>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:text-line-through-text">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:text-line-through-text-style">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:text-position">
-					<list>
-						<choice>
-							<ref name="percent"/>
-							<value>super</value>
-							<value>sub</value>
-						</choice>
-						<optional>
-							<ref name="percent"/>
-						</optional>
-					</list>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:font-name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:font-name-asian">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:font-name-complex">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="fo:font-family">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:font-family-asian">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:font-family-complex">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:font-family-generic">
-					<ref name="fontFamilyGeneric"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:font-family-generic-asian">
-					<ref name="fontFamilyGeneric"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:font-family-generic-complex">
-					<ref name="fontFamilyGeneric"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:font-style-name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:font-style-name-asian">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:font-style-name-complex">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:font-pitch">
-					<ref name="fontPitch"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:font-pitch-asian">
-					<ref name="fontPitch"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:font-pitch-complex">
-					<ref name="fontPitch"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:font-charset">
-					<ref name="textEncoding"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:font-charset-asian">
-					<ref name="textEncoding"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:font-charset-complex">
-					<ref name="textEncoding"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="fo:font-size">
-					<choice>
-						<ref name="positiveLength"/>
-						<ref name="percent"/>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:font-size-asian">
-					<choice>
-						<ref name="positiveLength"/>
-						<ref name="percent"/>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:font-size-complex">
-					<choice>
-						<ref name="positiveLength"/>
-						<ref name="percent"/>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:font-size-rel">
-					<ref name="length"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:font-size-rel-asian">
-					<ref name="length"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:font-size-rel-complex">
-					<ref name="length"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:script-type">
-					<choice>
-						<value>latin</value>
-						<value>asian</value>
-						<value>complex</value>
-						<value>ignore</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="fo:letter-spacing">
-					<choice>
-						<ref name="length"/>
-						<value>normal</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="fo:language">
-					<ref name="languageCode"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:language-asian">
-					<ref name="languageCode"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:language-complex">
-					<ref name="languageCode"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="fo:country">
-					<ref name="countryCode"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:country-asian">
-					<ref name="countryCode"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:country-complex">
-					<ref name="countryCode"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="fo:script">
-					<ref name="scriptCode"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:script-asian">
-					<ref name="scriptCode"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:script-complex">
-					<ref name="scriptCode"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:rfc-language-tag">
-					<ref name="language"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:rfc-language-tag-asian">
-					<ref name="language"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:rfc-language-tag-complex">
-					<ref name="language"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="fo:font-style">
-					<ref name="fontStyle"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:font-style-asian">
-					<ref name="fontStyle"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:font-style-complex">
-					<ref name="fontStyle"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:font-relief">
-					<choice>
-						<value>none</value>
-						<value>embossed</value>
-						<value>engraved</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="fo:text-shadow">
-					<ref name="shadowType"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:text-underline-type">
-					<ref name="lineType"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:text-underline-style">
-					<ref name="lineStyle"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:text-underline-width">
-					<ref name="lineWidth"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:text-underline-color">
-					<choice>
-						<value>font-color</value>
-						<ref name="color"/>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:text-overline-type">
-					<ref name="lineType"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:text-overline-style">
-					<ref name="lineStyle"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:text-overline-width">
-					<ref name="lineWidth"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:text-overline-color">
-					<choice>
-						<value>font-color</value>
-						<ref name="color"/>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:text-overline-mode">
-					<ref name="lineMode"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="fo:font-weight">
-					<ref name="fontWeight"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:font-weight-asian">
-					<ref name="fontWeight"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:font-weight-complex">
-					<ref name="fontWeight"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:text-underline-mode">
-					<ref name="lineMode"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:text-line-through-mode">
-					<ref name="lineMode"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:letter-kerning">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:text-blinking">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<ref name="common-background-color-attlist"/>
-			<optional>
-				<attribute name="style:text-combine">
-					<choice>
-						<value>none</value>
-						<value>letters</value>
-						<value>lines</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:text-combine-start-char">
-					<ref name="character"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:text-combine-end-char">
-					<ref name="character"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:text-emphasize">
-					<choice>
-						<value>none</value>
-						<list>
-							<choice>
-								<value>none</value>
-								<value>accent</value>
-								<value>dot</value>
-								<value>circle</value>
-								<value>disc</value>
-							</choice>
-							<choice>
-								<value>above</value>
-								<value>below</value>
-							</choice>
-						</list>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:text-scale">
-					<ref name="percent"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:text-rotation-angle">
-					<ref name="angle"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:text-rotation-scale">
-					<choice>
-						<value>fixed</value>
-						<value>line-height</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="fo:hyphenate">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="fo:hyphenation-remain-char-count">
-					<ref name="positiveInteger"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="fo:hyphenation-push-char-count">
-					<ref name="positiveInteger"/>
-				</attribute>
-			</optional>
-			<choice>
-				<attribute name="text:display">
-					<value>true</value>
-				</attribute>
-				<attribute name="text:display">
-					<value>none</value>
-				</attribute>
-				<group>
-					<attribute name="text:display">
-						<value>condition</value>
-					</attribute>
-					<attribute name="text:condition">
-						<value>none</value>
-					</attribute>
-				</group>
-				<empty/>
-			</choice>
-		</interleave>
-	</define>
-	<define name="fontVariant">
-		<choice>
-			<value>normal</value>
-			<value>small-caps</value>
-		</choice>
-	</define>
-	<define name="fontFamilyGeneric">
-		<choice>
-			<value>roman</value>
-			<value>swiss</value>
-			<value>modern</value>
-			<value>decorative</value>
-			<value>script</value>
-			<value>system</value>
-		</choice>
-	</define>
-	<define name="fontPitch">
-		<choice>
-			<value>fixed</value>
-			<value>variable</value>
-		</choice>
-	</define>
-	<define name="textEncoding">
-		<data type="string">
-			<param name="pattern">[A-Za-z][A-Za-z0-9._\-]*</param>
-		</data>
-	</define>
-	<define name="fontStyle">
-		<choice>
-			<value>normal</value>
-			<value>italic</value>
-			<value>oblique</value>
-		</choice>
-	</define>
-	<define name="shadowType">
-		<choice>
-			<value>none</value>
-			<ref name="string"/>
-		</choice>
-	</define>
-	<define name="lineType">
-		<choice>
-			<value>none</value>
-			<value>single</value>
-			<value>double</value>
-		</choice>
-	</define>
-	<define name="lineStyle">
-		<choice>
-			<value>none</value>
-			<value>solid</value>
-			<value>dotted</value>
-			<value>dash</value>
-			<value>long-dash</value>
-			<value>dot-dash</value>
-			<value>dot-dot-dash</value>
-			<value>wave</value>
-		</choice>
-	</define>
-	<define name="lineWidth">
-		<choice>
-			<value>auto</value>
-			<value>normal</value>
-			<value>bold</value>
-			<value>thin</value>
-			<value>medium</value>
-			<value>thick</value>
-			<ref name="positiveInteger"/>
-			<ref name="percent"/>
-			<ref name="positiveLength"/>
-		</choice>
-	</define>
-	<define name="fontWeight">
-		<choice>
-			<value>normal</value>
-			<value>bold</value>
-			<value>100</value>
-			<value>200</value>
-			<value>300</value>
-			<value>400</value>
-			<value>500</value>
-			<value>600</value>
-			<value>700</value>
-			<value>800</value>
-			<value>900</value>
-		</choice>
-	</define>
-	<define name="lineMode">
-		<choice>
-			<value>continuous</value>
-			<value>skip-white-space</value>
-		</choice>
-	</define>
-	<define name="style-paragraph-properties">
-		<element name="style:paragraph-properties">
-			<ref name="style-paragraph-properties-content-strict"/>
-		</element>
-	</define>
-	<define name="style-paragraph-properties-content-strict">
-		<ref name="style-paragraph-properties-attlist"/>
-		<ref name="style-paragraph-properties-elements"/>
-	</define>
-	<define name="style-paragraph-properties-attlist">
-		<interleave>
-			<optional>
-				<attribute name="fo:line-height">
-					<choice>
-						<value>normal</value>
-						<ref name="nonNegativeLength"/>
-						<ref name="percent"/>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:line-height-at-least">
-					<ref name="nonNegativeLength"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:line-spacing">
-					<ref name="length"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:font-independent-line-spacing">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<ref name="common-text-align"/>
-			<optional>
-				<attribute name="fo:text-align-last">
-					<choice>
-						<value>start</value>
-						<value>center</value>
-						<value>justify</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:justify-single-word">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="fo:keep-together">
-					<choice>
-						<value>auto</value>
-						<value>always</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="fo:widows">
-					<ref name="nonNegativeInteger"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="fo:orphans">
-					<ref name="nonNegativeInteger"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:tab-stop-distance">
-					<ref name="nonNegativeLength"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="fo:hyphenation-keep">
-					<choice>
-						<value>auto</value>
-						<value>page</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="fo:hyphenation-ladder-count">
-					<choice>
-						<value>no-limit</value>
-						<ref name="positiveInteger"/>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:register-true">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-	
-			<ref name="common-horizontal-margin-attlist"/>
-			<optional>
-				<attribute name="fo:text-indent">
-					<choice>
-						<ref name="length"/>
-						<ref name="percent"/>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:auto-text-indent">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<ref name="common-vertical-margin-attlist"/>
-			<ref name="common-margin-attlist"/>
-			<ref name="common-break-attlist"/>
-			<ref name="common-background-color-attlist"/>
-			<ref name="common-border-attlist"/>
-			<ref name="common-border-line-width-attlist"/>
-			<optional>
-				<attribute name="style:join-border">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<ref name="common-padding-attlist"/>
-			<ref name="common-shadow-attlist"/>
-			<ref name="common-keep-with-next-attlist"/>
-			<optional>
-				<attribute name="text:number-lines">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:line-number">
-					<ref name="nonNegativeInteger"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:text-autospace">
-					<choice>
-						<value>none</value>
-						<value>ideograph-alpha</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:punctuation-wrap">
-					<choice>
-						<value>simple</value>
-						<value>hanging</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:line-break">
-					<choice>
-						<value>normal</value>
-						<value>strict</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:vertical-align">
-					<choice>
-						<value>top</value>
-						<value>middle</value>
-						<value>bottom</value>
-						<value>auto</value>
-						<value>baseline</value>
-					</choice>
-				</attribute>
-			</optional>
-			<ref name="common-writing-mode-attlist"/>
-			<optional>
-				<attribute name="style:writing-mode-automatic">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:snap-to-layout-grid">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<ref name="common-page-number-attlist"/>
-			<ref name="common-background-transparency-attlist"/>
-		</interleave>
-	</define>
-	<define name="common-text-align">
-		<optional>
-			<attribute name="fo:text-align">
-				<choice>
-					<value>start</value>
-					<value>end</value>
-					<value>left</value>
-					<value>right</value>
-					<value>center</value>
-					<value>justify</value>
-				</choice>
-			</attribute>
-		</optional>
-	</define>
-	<define name="style-paragraph-properties-elements">
-		<interleave>
-			<ref name="style-tab-stops"/>
-			<ref name="style-drop-cap"/>
-			<ref name="style-background-image"/>
-		</interleave>
-	</define>
-	<define name="style-tab-stops">
-		<optional>
-			<element name="style:tab-stops">
-				<zeroOrMore>
-					<ref name="style-tab-stop"/>
-				</zeroOrMore>
-			</element>
-		</optional>
-	</define>
-	<define name="style-tab-stop">
-		<element name="style:tab-stop">
-			<ref name="style-tab-stop-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="style-tab-stop-attlist">
-		<interleave>
-			<attribute name="style:position">
-				<ref name="length"/>
-			</attribute>
-			<choice>
-				<optional>
-					<attribute name="style:type">
-						<choice>
-							<value>left</value>
-							<value>center</value>
-							<value>right</value>
-						</choice>
-					</attribute>
-				</optional>
-				<group>
-					<attribute name="style:type">
-						<value>char</value>
-					</attribute>
-					<ref name="style-tab-stop-char-attlist"/>
-				</group>
-			</choice>
-			<optional>
-				<attribute name="style:leader-type">
-					<ref name="lineType"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:leader-style">
-					<ref name="lineStyle"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:leader-width">
-					<ref name="lineWidth"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:leader-color">
-					<choice>
-						<value>font-color</value>
-						<ref name="color"/>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:leader-text">
-					<ref name="character"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:leader-text-style">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="style-tab-stop-char-attlist">
-		<attribute name="style:char">
-			<ref name="character"/>
-		</attribute>
-	</define>
-	<define name="style-drop-cap">
-		<optional>
-			<element name="style:drop-cap">
-				<ref name="style-drop-cap-attlist"/>
-				<empty/>
-			</element>
-		</optional>
-	</define>
-	<define name="style-drop-cap-attlist">
-		<interleave>
-			<optional>
-				<attribute name="style:length">
-					<choice>
-						<value>word</value>
-						<ref name="positiveInteger"/>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:lines">
-					<ref name="positiveInteger"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:distance">
-					<ref name="length"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="common-horizontal-margin-attlist">
-		<optional>
-			<attribute name="fo:margin-left">
-				<choice>
-					<ref name="length"/>
-					<ref name="percent"/>
-				</choice>
-			</attribute>
-		</optional>
-		<optional>
-			<attribute name="fo:margin-right">
-				<choice>
-					<ref name="length"/>
-					<ref name="percent"/>
-				</choice>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-vertical-margin-attlist">
-		<optional>
-			<attribute name="fo:margin-top">
-				<choice>
-					<ref name="nonNegativeLength"/>
-					<ref name="percent"/>
-				</choice>
-			</attribute>
-		</optional>
-		<optional>
-			<attribute name="fo:margin-bottom">
-				<choice>
-					<ref name="nonNegativeLength"/>
-					<ref name="percent"/>
-				</choice>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-margin-attlist">
-		<optional>
-			<attribute name="fo:margin">
-				<choice>
-					<ref name="nonNegativeLength"/>
-					<ref name="percent"/>
-				</choice>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-break-attlist">
-		<optional>
-			<attribute name="fo:break-before">
-				<choice>
-					<value>auto</value>
-					<value>column</value>
-					<value>page</value>
-				</choice>
-			</attribute>
-		</optional>
-		<optional>
-			<attribute name="fo:break-after">
-				<choice>
-					<value>auto</value>
-					<value>column</value>
-					<value>page</value>
-				</choice>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-background-color-attlist">
-		<optional>
-			<attribute name="fo:background-color">
-				<choice>
-					<value>transparent</value>
-					<ref name="color"/>
-				</choice>
-			</attribute>
-		</optional>
-	</define>
-	<define name="style-background-image">
-		<optional>
-			<element name="style:background-image">
-				<ref name="style-background-image-attlist"/>
-				<choice>
-					<ref name="common-draw-data-attlist"/>
-					<ref name="office-binary-data"/>
-					<empty/>
-				</choice>
-			</element>
-		</optional>
-	</define>
-	<define name="style-background-image-attlist">
-		<interleave>
-			<optional>
-				<attribute name="style:repeat">
-					<choice>
-						<value>no-repeat</value>
-						<value>repeat</value>
-						<value>stretch</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:position">
-					<choice>
-						<value>left</value>
-						<value>center</value>
-						<value>right</value>
-						<value>top</value>
-						<value>bottom</value>
-						<list>
-							<ref name="horiBackPos"/>
-							<ref name="vertBackPos"/>
-						</list>
-						<list>
-							<ref name="vertBackPos"/>
-							<ref name="horiBackPos"/>
-						</list>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:filter-name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:opacity">
-					<ref name="zeroToHundredPercent"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="horiBackPos">
-		<choice>
-			<value>left</value>
-			<value>center</value>
-			<value>right</value>
-		</choice>
-	</define>
-	<define name="vertBackPos">
-		<choice>
-			<value>top</value>
-			<value>center</value>
-			<value>bottom</value>
-		</choice>
-	</define>
-	<define name="common-border-attlist">
-		<optional>
-			<attribute name="fo:border">
-				<ref name="string"/>
-			</attribute>
-		</optional>
-		<optional>
-			<attribute name="fo:border-top">
-				<ref name="string"/>
-			</attribute>
-		</optional>
-		<optional>
-			<attribute name="fo:border-bottom">
-				<ref name="string"/>
-			</attribute>
-		</optional>
-		<optional>
-			<attribute name="fo:border-left">
-				<ref name="string"/>
-			</attribute>
-		</optional>
-		<optional>
-			<attribute name="fo:border-right">
-				<ref name="string"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-border-line-width-attlist">
-		<optional>
-			<attribute name="style:border-line-width">
-				<ref name="borderWidths"/>
-			</attribute>
-		</optional>
-		<optional>
-			<attribute name="style:border-line-width-top">
-				<ref name="borderWidths"/>
-			</attribute>
-		</optional>
-		<optional>
-			<attribute name="style:border-line-width-bottom">
-				<ref name="borderWidths"/>
-			</attribute>
-		</optional>
-		<optional>
-			<attribute name="style:border-line-width-left">
-				<ref name="borderWidths"/>
-			</attribute>
-		</optional>
-		<optional>
-			<attribute name="style:border-line-width-right">
-				<ref name="borderWidths"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="borderWidths">
-		<list>
-			<ref name="positiveLength"/>
-			<ref name="positiveLength"/>
-			<ref name="positiveLength"/>
-		</list>
-	</define>
-	<define name="common-padding-attlist">
-		<optional>
-			<attribute name="fo:padding">
-				<ref name="nonNegativeLength"/>
-			</attribute>
-		</optional>
-		<optional>
-			<attribute name="fo:padding-top">
-				<ref name="nonNegativeLength"/>
-			</attribute>
-		</optional>
-		<optional>
-			<attribute name="fo:padding-bottom">
-				<ref name="nonNegativeLength"/>
-			</attribute>
-		</optional>
-		<optional>
-			<attribute name="fo:padding-left">
-				<ref name="nonNegativeLength"/>
-			</attribute>
-		</optional>
-		<optional>
-			<attribute name="fo:padding-right">
-				<ref name="nonNegativeLength"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-shadow-attlist">
-		<optional>
-			<attribute name="style:shadow">
-				<ref name="shadowType"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-keep-with-next-attlist">
-		<optional>
-			<attribute name="fo:keep-with-next">
-				<choice>
-					<value>auto</value>
-					<value>always</value>
-				</choice>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-writing-mode-attlist">
-		<optional>
-			<attribute name="style:writing-mode">
-				<choice>
-					<value>lr-tb</value>
-					<value>rl-tb</value>
-					<value>tb-rl</value>
-					<value>tb-lr</value>
-					<value>lr</value>
-					<value>rl</value>
-					<value>tb</value>
-					<value>page</value>
-				</choice>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-page-number-attlist">
-		<optional>
-			<attribute name="style:page-number">
-				<choice>
-					<ref name="positiveInteger"/>
-					<value>auto</value>
-				</choice>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-background-transparency-attlist">
-		<optional>
-			<attribute name="style:background-transparency">
-				<ref name="zeroToHundredPercent"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="style-ruby-properties">
-		<element name="style:ruby-properties">
-			<ref name="style-ruby-properties-content-strict"/>
-		</element>
-	</define>
-	<define name="style-ruby-properties-content-strict">
-		<ref name="style-ruby-properties-attlist"/>
-		<ref name="style-ruby-properties-elements"/>
-	</define>
-	<define name="style-ruby-properties-elements">
-		<empty/>
-	</define>
-	<define name="style-ruby-properties-attlist">
-		<interleave>
-			<optional>
-				<attribute name="style:ruby-position">
-					<choice>
-						<value>above</value>
-						<value>below</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:ruby-align">
-					<choice>
-						<value>left</value>
-						<value>center</value>
-						<value>right</value>
-						<value>distribute-letter</value>
-						<value>distribute-space</value>
-					</choice>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="style-section-properties">
-		<element name="style:section-properties">
-			<ref name="style-section-properties-content-strict"/>
-		</element>
-	</define>
-	<define name="style-section-properties-content-strict">
-		<ref name="style-section-properties-attlist"/>
-		<ref name="style-section-properties-elements"/>
-	</define>
-	<define name="style-section-properties-attlist">
-		<interleave>
-			<ref name="common-background-color-attlist"/>
-			<ref name="common-horizontal-margin-attlist"/>
-			<optional>
-				<attribute name="style:protect">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<ref name="common-editable-attlist"/>
-			<optional>
-				<attribute name="text:dont-balance-text-columns">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<ref name="common-writing-mode-attlist"/>
-		</interleave>
-	</define>
-	<define name="style-section-properties-elements">
-		<interleave>
-			<ref name="style-background-image"/>
-			<ref name="style-columns"/>
-			<zeroOrMore>
-				<ref name="text-notes-configuration"/>
-			</zeroOrMore>
-		</interleave>
-	</define>
-	<define name="style-columns">
-		<optional>
-			<element name="style:columns">
-				<ref name="style-columns-attlist"/>
-				<optional>
-					<ref name="style-column-sep"/>
-				</optional>
-				<zeroOrMore>
-					<ref name="style-column"/>
-				</zeroOrMore>
-			</element>
-		</optional>
-	</define>
-	<define name="style-columns-attlist">
-		<interleave>
-			<attribute name="fo:column-count">
-				<ref name="positiveInteger"/>
-			</attribute>
-			<optional>
-				<attribute name="fo:column-gap">
-					<ref name="length"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="style-column">
-		<element name="style:column">
-			<ref name="style-column-attlist"/>
-		</element>
-	</define>
-	<define name="style-column-attlist">
-		<interleave>
-			<attribute name="style:rel-width">
-				<ref name="relativeLength"/>
-			</attribute>
-			<optional>
-				<attribute name="fo:start-indent">
-					<ref name="length"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="fo:end-indent">
-					<ref name="length"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="fo:space-before">
-					<ref name="length"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="fo:space-after">
-					<ref name="length"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="style-column-sep">
-		<element name="style:column-sep">
-			<ref name="style-column-sep-attlist"/>
-		</element>
-	</define>
-	<define name="style-column-sep-attlist">
-		<interleave>
-			<optional>
-				<attribute name="style:style">
-					<choice>
-						<value>none</value>
-						<value>solid</value>
-						<value>dotted</value>
-						<value>dashed</value>
-						<value>dot-dashed</value>
-					</choice>
-				</attribute>
-			</optional>
-			<attribute name="style:width">
-				<ref name="length"/>
-			</attribute>
-			<optional>
-				<attribute name="style:height">
-					<ref name="zeroToHundredPercent"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:vertical-align">
-					<choice>
-						<value>top</value>
-						<value>middle</value>
-						<value>bottom</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:color">
-					<ref name="color"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="style-table-properties">
-		<element name="style:table-properties">
-			<ref name="style-table-properties-content-strict"/>
-		</element>
-	</define>
-	<define name="style-table-properties-content-strict">
-		<ref name="style-table-properties-attlist"/>
-		<ref name="style-table-properties-elements"/>
-	</define>
-	<define name="style-table-properties-attlist">
-		<interleave>
-			<optional>
-				<attribute name="style:width">
-					<ref name="positiveLength"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:rel-width">
-					<ref name="percent"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:align">
-					<choice>
-						<value>left</value>
-						<value>center</value>
-						<value>right</value>
-						<value>margins</value>
-					</choice>
-				</attribute>
-			</optional>
-			<ref name="common-horizontal-margin-attlist"/>
-			<ref name="common-vertical-margin-attlist"/>
-			<ref name="common-margin-attlist"/>
-			<ref name="common-page-number-attlist"/>
-			<ref name="common-break-attlist"/>
-			<ref name="common-background-color-attlist"/>
-			<ref name="common-shadow-attlist"/>
-			<ref name="common-keep-with-next-attlist"/>
-			<optional>
-				<attribute name="style:may-break-between-rows">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:border-model">
-					<choice>
-						<value>collapsing</value>
-						<value>separating</value>
-					</choice>
-				</attribute>
-			</optional>
-			<ref name="common-writing-mode-attlist"/>
-			<optional>
-				<attribute name="table:display">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="style-table-properties-elements">
-		<ref name="style-background-image"/>
-	</define>
-	<define name="style-table-column-properties">
-		<element name="style:table-column-properties">
-			<ref name="style-table-column-properties-content-strict"/>
-		</element>
-	</define>
-	<define name="style-table-column-properties-content-strict">
-		<ref name="style-table-column-properties-attlist"/>
-		<ref name="style-table-column-properties-elements"/>
-	</define>
-	<define name="style-table-column-properties-elements">
-		<empty/>
-	</define>
-	<define name="style-table-column-properties-attlist">
-		<interleave>
-			<optional>
-				<attribute name="style:column-width">
-					<ref name="positiveLength"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:rel-column-width">
-					<ref name="relativeLength"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:use-optimal-column-width">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<ref name="common-break-attlist"/>
-		</interleave>
-	</define>
-	<define name="style-table-row-properties">
-		<element name="style:table-row-properties">
-			<ref name="style-table-row-properties-content-strict"/>
-		</element>
-	</define>
-	<define name="style-table-row-properties-content-strict">
-		<ref name="style-table-row-properties-attlist"/>
-		<ref name="style-table-row-properties-elements"/>
-	</define>
-	<define name="style-table-row-properties-attlist">
-		<interleave>
-			<optional>
-				<attribute name="style:row-height">
-					<ref name="positiveLength"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:min-row-height">
-					<ref name="nonNegativeLength"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:use-optimal-row-height">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<ref name="common-background-color-attlist"/>
-			<ref name="common-break-attlist"/>
-			<optional>
-				<attribute name="fo:keep-together">
-					<choice>
-						<value>auto</value>
-						<value>always</value>
-					</choice>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="style-table-row-properties-elements">
-		<ref name="style-background-image"/>
-	</define>
-	<define name="style-table-cell-properties">
-		<element name="style:table-cell-properties">
-			<ref name="style-table-cell-properties-content-strict"/>
-		</element>
-	</define>
-	<define name="style-table-cell-properties-content-strict">
-		<ref name="style-table-cell-properties-attlist"/>
-		<ref name="style-table-cell-properties-elements"/>
-	</define>
-	<define name="style-table-cell-properties-attlist">
-		<interleave>
-			<optional>
-				<attribute name="style:vertical-align">
-					<choice>
-						<value>top</value>
-						<value>middle</value>
-						<value>bottom</value>
-						<value>automatic</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:text-align-source">
-					<choice>
-						<value>fix</value>
-						<value>value-type</value>
-					</choice>
-				</attribute>
-			</optional>
-			<ref name="common-style-direction-attlist"/>
-			<optional>
-				<attribute name="style:glyph-orientation-vertical">
-					<choice>
-						<value>auto</value>
-						<value>0</value>
-						<value>0deg</value>
-						<value>0rad</value>
-						<value>0grad</value>
-					</choice>
-				</attribute>
-			</optional>
-			<ref name="common-writing-mode-attlist"/>
-			<ref name="common-shadow-attlist"/>
-			<ref name="common-background-color-attlist"/>
-			<ref name="common-border-attlist"/>
-			<optional>
-				<attribute name="style:diagonal-tl-br">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:diagonal-tl-br-widths">
-					<ref name="borderWidths"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:diagonal-bl-tr">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:diagonal-bl-tr-widths">
-					<ref name="borderWidths"/>
-				</attribute>
-			</optional>
-			<ref name="common-border-line-width-attlist"/>
-			<ref name="common-padding-attlist"/>
-			<optional>
-				<attribute name="fo:wrap-option">
-					<choice>
-						<value>no-wrap</value>
-						<value>wrap</value>
-					</choice>
-				</attribute>
-			</optional>
-			<ref name="common-rotation-angle-attlist"/>
-			<optional>
-				<attribute name="style:rotation-align">
-					<choice>
-						<value>none</value>
-						<value>bottom</value>
-						<value>top</value>
-						<value>center</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:cell-protect">
-					<choice>
-						<value>none</value>
-						<value>hidden-and-protected</value>
-						<list>
-							<oneOrMore>
-								<choice>
-									<value>protected</value>
-									<value>formula-hidden</value>
-								</choice>
-							</oneOrMore>
-						</list>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:print-content">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:decimal-places">
-					<ref name="nonNegativeInteger"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:repeat-content">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:shrink-to-fit">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="common-style-direction-attlist">
-		<optional>
-			<attribute name="style:direction">
-				<choice>
-					<value>ltr</value>
-					<value>ttb</value>
-				</choice>
-			</attribute>
-		</optional>
-	</define>
-	<define name="style-table-cell-properties-elements">
-		<ref name="style-background-image"/>
-	</define>
-	<define name="common-rotation-angle-attlist">
-		<optional>
-			<attribute name="style:rotation-angle">
-				<ref name="angle"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="style-list-level-properties">
-		<element name="style:list-level-properties">
-			<ref name="style-list-level-properties-content-strict"/>
-		</element>
-	</define>
-	<define name="style-list-level-properties-content-strict">
-		<ref name="style-list-level-properties-attlist"/>
-		<ref name="style-list-level-properties-elements"/>
-	</define>
-	<define name="style-list-level-properties-attlist">
-		<interleave>
-			<ref name="common-text-align"/>
-			<optional>
-				<attribute name="text:space-before">
-					<ref name="length"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:min-label-width">
-					<ref name="nonNegativeLength"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:min-label-distance">
-					<ref name="nonNegativeLength"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:font-name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="fo:width">
-					<ref name="positiveLength"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="fo:height">
-					<ref name="positiveLength"/>
-				</attribute>
-			</optional>
-			<ref name="common-vertical-rel-attlist"/>
-			<ref name="common-vertical-pos-attlist"/>
-			<optional>
-				<attribute name="text:list-level-position-and-space-mode">
-					<choice>
-						<value>label-width-and-position</value>
-						<value>label-alignment</value>
-					</choice>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="style-list-level-properties-elements">
-		<ref name="style-list-level-label-alignment"/>
-	</define>
-	<define name="style-list-level-label-alignment">
-		<optional>
-			<element name="style:list-level-label-alignment">
-				<ref name="style-list-level-label-alignment-attlist"/>
-				<empty/>
-			</element>
-		</optional>
-	</define>
-	<define name="style-list-level-label-alignment-attlist">
-		<interleave>
-			<attribute name="text:label-followed-by">
-				<choice>
-					<value>listtab</value>
-					<value>space</value>
-					<value>nothing</value>
-				</choice>
-			</attribute>
-			<optional>
-				<attribute name="text:list-tab-stop-position">
-					<ref name="length"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="fo:text-indent">
-					<ref name="length"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="fo:margin-left">
-					<ref name="length"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="style-graphic-properties-attlist">
-		<interleave>
-			<optional>
-				<attribute name="draw:stroke">
-					<choice>
-						<value>none</value>
-						<value>dash</value>
-						<value>solid</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:stroke-dash">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:stroke-dash-names">
-					<ref name="styleNameRefs"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:stroke-width">
-					<ref name="length"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:stroke-color">
-					<ref name="color"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:marker-start">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:marker-end">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:marker-start-width">
-					<ref name="length"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:marker-end-width">
-					<ref name="length"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:marker-start-center">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:marker-end-center">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:stroke-opacity">
-					<choice>
-						<data type="double">
-							<param name="minInclusive">0</param>
-							<param name="maxInclusive">1</param>
-						</data>
-						<ref name="zeroToHundredPercent"/>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:stroke-linejoin">
-					<choice>
-						<value>miter</value>
-						<value>round</value>
-						<value>bevel</value>
-						<value>middle</value>
-						<value>none</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:stroke-linecap">
-					<choice>
-						<value>butt</value>
-						<value>square</value>
-						<value>round</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:symbol-color">
-					<ref name="color"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:animation">
-					<choice>
-						<value>none</value>
-						<value>scroll</value>
-						<value>alternate</value>
-						<value>slide</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:animation-direction">
-					<choice>
-						<value>left</value>
-						<value>right</value>
-						<value>up</value>
-						<value>down</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:animation-start-inside">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:animation-stop-inside">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:animation-repeat">
-					<ref name="nonNegativeInteger"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:animation-delay">
-					<ref name="duration"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:animation-steps">
-					<ref name="length"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:auto-grow-width">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:auto-grow-height">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:fit-to-size">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:fit-to-contour">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:textarea-vertical-align">
-					<choice>
-						<value>top</value>
-						<value>middle</value>
-						<value>bottom</value>
-						<value>justify</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:textarea-horizontal-align">
-					<choice>
-						<value>left</value>
-						<value>center</value>
-						<value>right</value>
-						<value>justify</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="fo:wrap-option">
-					<choice>
-						<value>no-wrap</value>
-						<value>wrap</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:shrink-to-fit">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:color-mode">
-					<choice>
-						<value>greyscale</value>
-						<value>mono</value>
-						<value>watermark</value>
-						<value>standard</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:color-inversion">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:luminance">
-					<ref name="zeroToHundredPercent"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:contrast">
-					<ref name="percent"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:gamma">
-					<ref name="percent"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:red">
-					<ref name="signedZeroToHundredPercent"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:green">
-					<ref name="signedZeroToHundredPercent"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:blue">
-					<ref name="signedZeroToHundredPercent"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:image-opacity">
-					<ref name="zeroToHundredPercent"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:shadow">
-					<choice>
-						<value>visible</value>
-						<value>hidden</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:shadow-offset-x">
-					<ref name="length"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:shadow-offset-y">
-					<ref name="length"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:shadow-color">
-					<ref name="color"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:shadow-opacity">
-					<ref name="zeroToHundredPercent"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:start-line-spacing-horizontal">
-					<ref name="distance"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:start-line-spacing-vertical">
-					<ref name="distance"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:end-line-spacing-horizontal">
-					<ref name="distance"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:end-line-spacing-vertical">
-					<ref name="distance"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:line-distance">
-					<ref name="distance"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:guide-overhang">
-					<ref name="length"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:guide-distance">
-					<ref name="distance"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:start-guide">
-					<ref name="length"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:end-guide">
-					<ref name="length"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:placing">
-					<choice>
-						<value>below</value>
-						<value>above</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:parallel">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:measure-align">
-					<choice>
-						<value>automatic</value>
-						<value>left-outside</value>
-						<value>inside</value>
-						<value>right-outside</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:measure-vertical-align">
-					<choice>
-						<value>automatic</value>
-						<value>above</value>
-						<value>below</value>
-						<value>center</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:unit">
-					<choice>
-						<value>automatic</value>
-						<value>mm</value>
-						<value>cm</value>
-						<value>m</value>
-						<value>km</value>
-						<value>pt</value>
-						<value>pc</value>
-						<value>inch</value>
-						<value>ft</value>
-						<value>mi</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:show-unit">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:decimal-places">
-					<ref name="nonNegativeInteger"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:caption-type">
-					<choice>
-						<value>straight-line</value>
-						<value>angled-line</value>
-						<value>angled-connector-line</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:caption-angle-type">
-					<choice>
-						<value>fixed</value>
-						<value>free</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:caption-angle">
-					<ref name="angle"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:caption-gap">
-					<ref name="distance"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:caption-escape-direction">
-					<choice>
-						<value>horizontal</value>
-						<value>vertical</value>
-						<value>auto</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:caption-escape">
-					<choice>
-						<ref name="length"/>
-						<ref name="percent"/>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:caption-line-length">
-					<ref name="length"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:caption-fit-line-length">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="dr3d:horizontal-segments">
-					<ref name="nonNegativeInteger"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="dr3d:vertical-segments">
-					<ref name="nonNegativeInteger"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="dr3d:edge-rounding">
-					<ref name="percent"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="dr3d:edge-rounding-mode">
-					<choice>
-						<value>correct</value>
-						<value>attractive</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="dr3d:back-scale">
-					<ref name="percent"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="dr3d:depth">
-					<ref name="length"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="dr3d:backface-culling">
-					<choice>
-						<value>enabled</value>
-						<value>disabled</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="dr3d:end-angle">
-					<ref name="angle"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="dr3d:close-front">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="dr3d:close-back">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="dr3d:lighting-mode">
-					<choice>
-						<value>standard</value>
-						<value>double-sided</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="dr3d:normals-kind">
-					<choice>
-						<value>object</value>
-						<value>flat</value>
-						<value>sphere</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="dr3d:normals-direction">
-					<choice>
-						<value>normal</value>
-						<value>inverse</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="dr3d:texture-generation-mode-x">
-					<choice>
-						<value>object</value>
-						<value>parallel</value>
-						<value>sphere</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="dr3d:texture-generation-mode-y">
-					<choice>
-						<value>object</value>
-						<value>parallel</value>
-						<value>sphere</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="dr3d:texture-kind">
-					<choice>
-						<value>luminance</value>
-						<value>intensity</value>
-						<value>color</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="dr3d:texture-filter">
-					<choice>
-						<value>enabled</value>
-						<value>disabled</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="dr3d:texture-mode">
-					<choice>
-						<value>replace</value>
-						<value>modulate</value>
-						<value>blend</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="dr3d:ambient-color">
-					<ref name="color"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="dr3d:emissive-color">
-					<ref name="color"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="dr3d:specular-color">
-					<ref name="color"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="dr3d:diffuse-color">
-					<ref name="color"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="dr3d:shininess">
-					<ref name="percent"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="dr3d:shadow">
-					<choice>
-						<value>visible</value>
-						<value>hidden</value>
-					</choice>
-				</attribute>
-			</optional>
-			<ref name="common-draw-rel-size-attlist"/>
-			<optional>
-				<attribute name="fo:min-width">
-					<choice>
-						<ref name="length"/>
-						<ref name="percent"/>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="fo:min-height">
-					<choice>
-						<ref name="length"/>
-						<ref name="percent"/>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="fo:max-height">
-					<choice>
-						<ref name="length"/>
-						<ref name="percent"/>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="fo:max-width">
-					<choice>
-						<ref name="length"/>
-						<ref name="percent"/>
-					</choice>
-				</attribute>
-			</optional>
-			<ref name="common-horizontal-margin-attlist"/>
-			<ref name="common-vertical-margin-attlist"/>
-			<ref name="common-margin-attlist"/>
-			<optional>
-				<attribute name="style:print-content">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:protect">
-					<choice>
-						<value>none</value>
-						<list>
-							<oneOrMore>
-								<choice>
-									<value>content</value>
-									<value>position</value>
-									<value>size</value>
-								</choice>
-							</oneOrMore>
-						</list>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:horizontal-pos">
-					<choice>
-						<value>left</value>
-						<value>center</value>
-						<value>right</value>
-						<value>from-left</value>
-						<value>inside</value>
-						<value>outside</value>
-						<value>from-inside</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:x">
-					<ref name="coordinate"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:horizontal-rel">
-					<choice>
-						<value>page</value>
-						<value>page-content</value>
-						<value>page-start-margin</value>
-						<value>page-end-margin</value>
-						<value>frame</value>
-						<value>frame-content</value>
-						<value>frame-start-margin</value>
-						<value>frame-end-margin</value>
-						<value>paragraph</value>
-						<value>paragraph-content</value>
-						<value>paragraph-start-margin</value>
-						<value>paragraph-end-margin</value>
-						<value>char</value>
-					</choice>
-				</attribute>
-			</optional>
-			<ref name="common-vertical-pos-attlist"/>
-			<ref name="common-vertical-rel-attlist"/>
-			<ref name="common-text-anchor-attlist"/>
-			<ref name="common-border-attlist"/>
-			<ref name="common-border-line-width-attlist"/>
-			<ref name="common-padding-attlist"/>
-			<ref name="common-shadow-attlist"/>
-			<ref name="common-background-color-attlist"/>
-			<ref name="common-background-transparency-attlist"/>
-			<ref name="common-editable-attlist"/>
-			<optional>
-				<attribute name="style:wrap">
-					<choice>
-						<value>none</value>
-						<value>left</value>
-						<value>right</value>
-						<value>parallel</value>
-						<value>dynamic</value>
-						<value>run-through</value>
-						<value>biggest</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:wrap-dynamic-threshold">
-					<ref name="nonNegativeLength"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:number-wrapped-paragraphs">
-					<choice>
-						<value>no-limit</value>
-						<ref name="positiveInteger"/>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:wrap-contour">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:wrap-contour-mode">
-					<choice>
-						<value>full</value>
-						<value>outside</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:run-through">
-					<choice>
-						<value>foreground</value>
-						<value>background</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:flow-with-text">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:overflow-behavior">
-					<choice>
-						<value>clip</value>
-						<value>auto-create-new-frame</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:mirror">
-					<choice>
-						<value>none</value>
-						<value>vertical</value>
-						<ref name="horizontal-mirror"/>
-						<list>
-							<value>vertical</value>
-							<ref name="horizontal-mirror"/>
-						</list>
-						<list>
-							<ref name="horizontal-mirror"/>
-							<value>vertical</value>
-						</list>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="fo:clip">
-					<choice>
-						<value>auto</value>
-						<ref name="clipShape"/>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:wrap-influence-on-position">
-					<choice>
-						<value>iterative</value>
-						<value>once-concurrent</value>
-						<value>once-successive</value>
-					</choice>
-				</attribute>
-			</optional>
-			<ref name="common-writing-mode-attlist"/>
-			<optional>
-				<attribute name="draw:frame-display-scrollbar">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:frame-display-border">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:frame-margin-horizontal">
-					<ref name="nonNegativePixelLength"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:frame-margin-vertical">
-					<ref name="nonNegativePixelLength"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:visible-area-left">
-					<ref name="nonNegativeLength"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:visible-area-top">
-					<ref name="nonNegativeLength"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:visible-area-width">
-					<ref name="positiveLength"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:visible-area-height">
-					<ref name="positiveLength"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:draw-aspect">
-					<choice>
-						<value>content</value>
-						<value>thumbnail</value>
-						<value>icon</value>
-						<value>print-view</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:ole-draw-aspect">
-					<ref name="nonNegativeInteger"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="style-graphic-fill-properties-attlist">
-		<interleave>
-			<optional>
-				<attribute name="draw:fill">
-					<choice>
-						<value>none</value>
-						<value>solid</value>
-						<value>bitmap</value>
-						<value>gradient</value>
-						<value>hatch</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:fill-color">
-					<ref name="color"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:secondary-fill-color">
-					<ref name="color"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:fill-gradient-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:gradient-step-count">
-					<ref name="nonNegativeInteger"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:fill-hatch-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:fill-hatch-solid">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:fill-image-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:repeat">
-					<choice>
-						<value>no-repeat</value>
-						<value>repeat</value>
-						<value>stretch</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:fill-image-width">
-					<choice>
-						<ref name="length"/>
-						<ref name="percent"/>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:fill-image-height">
-					<choice>
-						<ref name="length"/>
-						<ref name="percent"/>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:fill-image-ref-point-x">
-					<ref name="percent"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:fill-image-ref-point-y">
-					<ref name="percent"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:fill-image-ref-point">
-					<choice>
-						<value>top-left</value>
-						<value>top</value>
-						<value>top-right</value>
-						<value>left</value>
-						<value>center</value>
-						<value>right</value>
-						<value>bottom-left</value>
-						<value>bottom</value>
-						<value>bottom-right</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:tile-repeat-offset">
-					<list>
-						<ref name="zeroToHundredPercent"/>
-						<choice>
-							<value>horizontal</value>
-							<value>vertical</value>
-						</choice>
-					</list>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:opacity">
-					<ref name="zeroToHundredPercent"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:opacity-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:fill-rule">
-					<choice>
-						<value>nonzero</value>
-						<value>evenodd</value>
-					</choice>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="style-graphic-properties-elements">
-		<interleave>
-			<optional>
-				<ref name="text-list-style"/>
-			</optional>
-			<ref name="style-background-image"/>
-			<ref name="style-columns"/>
-		</interleave>
-	</define>
-	<define name="common-vertical-pos-attlist">
-		<optional>
-			<attribute name="style:vertical-pos">
-				<choice>
-					<value>top</value>
-					<value>middle</value>
-					<value>bottom</value>
-					<value>from-top</value>
-					<value>below</value>
-				</choice>
-			</attribute>
-		</optional>
-		<optional>
-			<attribute name="svg:y">
-				<ref name="coordinate"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-vertical-rel-attlist">
-		<optional>
-			<attribute name="style:vertical-rel">
-				<choice>
-					<value>page</value>
-					<value>page-content</value>
-					<value>frame</value>
-					<value>frame-content</value>
-					<value>paragraph</value>
-					<value>paragraph-content</value>
-					<value>char</value>
-					<value>line</value>
-					<value>baseline</value>
-					<value>text</value>
-				</choice>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-editable-attlist">
-		<optional>
-			<attribute name="style:editable">
-				<ref name="boolean"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="horizontal-mirror">
-		<choice>
-			<value>horizontal</value>
-			<value>horizontal-on-odd</value>
-			<value>horizontal-on-even</value>
-		</choice>
-	</define>
-	<define name="clipShape">
-		<data type="string">
-			<param name="pattern">rect\([ ]*((-?([0-9]+(\.[0-9]*)?|\.[0-9]+)((cm)|(mm)|(in)|(pt)|(pc)))|(auto))([ ]*,[ ]*((-?([0-9]+(\.[0-9]*)?|\.[0-9]+)((cm)|(mm)|(in)|(pt)|(pc))))|(auto)){3}[ ]*\)</param>
-		</data>
-	</define>
-	<define name="nonNegativePixelLength">
-		<data type="string">
-			<param name="pattern">([0-9]+(\.[0-9]*)?|\.[0-9]+)(px)</param>
-		</data>
-	</define>
-	<define name="style-chart-properties">
-		<element name="style:chart-properties">
-			<ref name="style-chart-properties-content-strict"/>
-		</element>
-	</define>
-	<define name="style-chart-properties-content-strict">
-		<ref name="style-chart-properties-attlist"/>
-		<ref name="style-chart-properties-elements"/>
-	</define>
-	<define name="style-chart-properties-elements">
-		<empty/>
-	</define>
-	<define name="style-chart-properties-attlist">
-		<interleave>
-			<optional>
-				<attribute name="chart:scale-text">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:three-dimensional">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:deep">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:right-angled-axes">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<choice>
-				<attribute name="chart:symbol-type">
-					<value>none</value>
-				</attribute>
-				<attribute name="chart:symbol-type">
-					<value>automatic</value>
-				</attribute>
-				<group>
-					<attribute name="chart:symbol-type">
-						<value>named-symbol</value>
-					</attribute>
-					<attribute name="chart:symbol-name">
-						<choice>
-							<value>square</value>
-							<value>diamond</value>
-							<value>arrow-down</value>
-							<value>arrow-up</value>
-							<value>arrow-right</value>
-							<value>arrow-left</value>
-							<value>bow-tie</value>
-							<value>hourglass</value>
-							<value>circle</value>
-							<value>star</value>
-							<value>x</value>
-							<value>plus</value>
-							<value>asterisk</value>
-							<value>horizontal-bar</value>
-							<value>vertical-bar</value>
-						</choice>
-					</attribute>
-				</group>
-				<group>
-					<attribute name="chart:symbol-type">
-						<value>image</value>
-					</attribute>
-					<element name="chart:symbol-image">
-						<attribute name="xlink:href">
-							<ref name="anyIRI"/>
-						</attribute>
-					</element>
-				</group>
-				<empty/>
-			</choice>
-			<optional>
-				<attribute name="chart:symbol-width">
-					<ref name="nonNegativeLength"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:symbol-height">
-					<ref name="nonNegativeLength"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:sort-by-x-values">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:vertical">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:connect-bars">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:gap-width">
-					<ref name="integer"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:overlap">
-					<ref name="integer"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:group-bars-per-axis">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:japanese-candle-stick">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:interpolation">
-					<choice>
-						<value>none</value>
-						<value>cubic-spline</value>
-						<value>b-spline</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:spline-order">
-					<ref name="positiveInteger"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:spline-resolution">
-					<ref name="positiveInteger"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:pie-offset">
-					<ref name="nonNegativeInteger"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:angle-offset">
-					<ref name="angle"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:hole-size">
-					<ref name="percent"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:lines">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:solid-type">
-					<choice>
-						<value>cuboid</value>
-						<value>cylinder</value>
-						<value>cone</value>
-						<value>pyramid</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:stacked">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:percentage">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:treat-empty-cells">
-					<choice>
-						<value>use-zero</value>
-						<value>leave-gap</value>
-						<value>ignore</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:link-data-style-to-source">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:logarithmic">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:maximum">
-					<ref name="double"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:minimum">
-					<ref name="double"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:origin">
-					<ref name="double"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:interval-major">
-					<ref name="double"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:interval-minor-divisor">
-					<ref name="positiveInteger"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:tick-marks-major-inner">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:tick-marks-major-outer">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:tick-marks-minor-inner">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:tick-marks-minor-outer">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:reverse-direction">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:display-label">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:text-overlap">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:line-break">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:label-arrangement">
-					<choice>
-						<value>side-by-side</value>
-						<value>stagger-even</value>
-						<value>stagger-odd</value>
-					</choice>
-				</attribute>
-			</optional>
-			<ref name="common-style-direction-attlist"/>
-			<ref name="common-rotation-angle-attlist"/>
-			<optional>
-				<attribute name="chart:data-label-number">
-					<choice>
-						<value>none</value>
-						<value>value</value>
-						<value>percentage</value>
-						<value>value-and-percentage</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:data-label-text">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:data-label-symbol">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<element name="chart:label-separator">
-					<ref name="text-p"/>
-				</element>
-			</optional>
-			<optional>
-				<attribute name="chart:label-position">
-					<ref name="labelPositions"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:label-position-negative">
-					<ref name="labelPositions"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:visible">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:auto-position">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:auto-size">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:mean-value">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:error-category">
-					<choice>
-						<value>none</value>
-						<value>variance</value>
-						<value>standard-deviation</value>
-						<value>percentage</value>
-						<value>error-margin</value>
-						<value>constant</value>
-						<value>standard-error</value>
-						<value>cell-range</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:error-percentage">
-					<ref name="double"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:error-margin">
-					<ref name="double"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:error-lower-limit">
-					<ref name="double"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:error-upper-limit">
-					<ref name="double"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:error-upper-indicator">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:error-lower-indicator">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:error-lower-range">
-					<ref name="cellRangeAddressList"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:error-upper-range">
-					<ref name="cellRangeAddressList"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:series-source">
-					<choice>
-						<value>columns</value>
-						<value>rows</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:regression-type">
-					<choice>
-						<value>none</value>
-						<value>linear</value>
-						<value>logarithmic</value>
-						<value>exponential</value>
-						<value>power</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:axis-position">
-					<choice>
-						<value>start</value>
-						<value>end</value>
-						<ref name="double"/>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:axis-label-position">
-					<choice>
-						<value>near-axis</value>
-						<value>near-axis-other-side</value>
-						<value>outside-start</value>
-						<value>outside-end</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:tick-mark-position">
-					<choice>
-						<value>at-labels</value>
-						<value>at-axis</value>
-						<value>at-labels-and-axis</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:include-hidden-cells">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="labelPositions">
-		<choice>
-			<value>avoid-overlap</value>
-			<value>center</value>
-			<value>top</value>
-			<value>top-right</value>
-			<value>right</value>
-			<value>bottom-right</value>
-			<value>bottom</value>
-			<value>bottom-left</value>
-			<value>left</value>
-			<value>top-left</value>
-			<value>inside</value>
-			<value>outside</value>
-			<value>near-origin</value>
-		</choice>
-	</define>
-	<define name="style-drawing-page-properties-attlist">
-		<interleave>
-			<optional>
-				<attribute name="presentation:transition-type">
-					<choice>
-						<value>manual</value>
-						<value>automatic</value>
-						<value>semi-automatic</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="presentation:transition-style">
-					<choice>
-						<value>none</value>
-						<value>fade-from-left</value>
-						<value>fade-from-top</value>
-						<value>fade-from-right</value>
-						<value>fade-from-bottom</value>
-						<value>fade-from-upperleft</value>
-						<value>fade-from-upperright</value>
-						<value>fade-from-lowerleft</value>
-						<value>fade-from-lowerright</value>
-						<value>move-from-left</value>
-						<value>move-from-top</value>
-						<value>move-from-right</value>
-						<value>move-from-bottom</value>
-						<value>move-from-upperleft</value>
-						<value>move-from-upperright</value>
-						<value>move-from-lowerleft</value>
-						<value>move-from-lowerright</value>
-						<value>uncover-to-left</value>
-						<value>uncover-to-top</value>
-						<value>uncover-to-right</value>
-						<value>uncover-to-bottom</value>
-						<value>uncover-to-upperleft</value>
-						<value>uncover-to-upperright</value>
-						<value>uncover-to-lowerleft</value>
-						<value>uncover-to-lowerright</value>
-						<value>fade-to-center</value>
-						<value>fade-from-center</value>
-						<value>vertical-stripes</value>
-						<value>horizontal-stripes</value>
-						<value>clockwise</value>
-						<value>counterclockwise</value>
-						<value>open-vertical</value>
-						<value>open-horizontal</value>
-						<value>close-vertical</value>
-						<value>close-horizontal</value>
-						<value>wavyline-from-left</value>
-						<value>wavyline-from-top</value>
-						<value>wavyline-from-right</value>
-						<value>wavyline-from-bottom</value>
-						<value>spiralin-left</value>
-						<value>spiralin-right</value>
-						<value>spiralout-left</value>
-						<value>spiralout-right</value>
-						<value>roll-from-top</value>
-						<value>roll-from-left</value>
-						<value>roll-from-right</value>
-						<value>roll-from-bottom</value>
-						<value>stretch-from-left</value>
-						<value>stretch-from-top</value>
-						<value>stretch-from-right</value>
-						<value>stretch-from-bottom</value>
-						<value>vertical-lines</value>
-						<value>horizontal-lines</value>
-						<value>dissolve</value>
-						<value>random</value>
-						<value>vertical-checkerboard</value>
-						<value>horizontal-checkerboard</value>
-						<value>interlocking-horizontal-left</value>
-						<value>interlocking-horizontal-right</value>
-						<value>interlocking-vertical-top</value>
-						<value>interlocking-vertical-bottom</value>
-						<value>fly-away</value>
-						<value>open</value>
-						<value>close</value>
-						<value>melt</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="presentation:transition-speed">
-					<ref name="presentationSpeeds"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="smil:type">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="smil:subtype">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="smil:direction">
-					<choice>
-						<value>forward</value>
-						<value>reverse</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="smil:fadeColor">
-					<ref name="color"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="presentation:duration">
-					<ref name="duration"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="presentation:visibility">
-					<choice>
-						<value>visible</value>
-						<value>hidden</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:background-size">
-					<choice>
-						<value>full</value>
-						<value>border</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="presentation:background-objects-visible">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="presentation:background-visible">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="presentation:display-header">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="presentation:display-footer">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="presentation:display-page-number">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="presentation:display-date-time">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="style-drawing-page-properties-elements">
-		<optional>
-			<ref name="presentation-sound"/>
-		</optional>
-	</define>
-	<define name="string">
-		<data type="string"/>
-	</define>
-	<define name="date">
-		<data type="date"/>
-	</define>
-	<define name="time">
-		<data type="time"/>
-	</define>
-	<define name="dateTime">
-		<data type="dateTime"/>
-	</define>
-	<define name="duration">
-		<data type="duration"/>
-	</define>
-	<define name="integer">
-		<data type="integer"/>
-	</define>
-	<define name="nonNegativeInteger">
-		<data type="nonNegativeInteger"/>
-	</define>
-	<define name="positiveInteger">
-		<data type="positiveInteger"/>
-	</define>
-	<define name="double">
-		<data type="double"/>
-	</define>
-	<define name="anyURI">
-		<data type="anyURI"/>
-	</define>
-	<define name="base64Binary">
-		<data type="base64Binary"/>
-	</define>
-	<define name="ID">
-		<data type="ID"/>
-	</define>
-	<define name="IDREF">
-		<data type="IDREF"/>
-	</define>
-	<define name="IDREFS">
-		<data type="IDREFS"/>
-	</define>
-	<define name="NCName">
-		<data type="NCName"/>
-	</define>
-	<define name="boolean">
-		<choice>
-			<value>true</value>
-			<value>false</value>
-		</choice>
-	</define>
-	<define name="dateOrDateTime">
-		<choice>
-			<data type="date"/>
-			<data type="dateTime"/>
-		</choice>
-	</define>
-	<define name="timeOrDateTime">
-		<choice>
-			<data type="time"/>
-			<data type="dateTime"/>
-		</choice>
-	</define>
-	<define name="language">
-		<data type="language"/>
-	</define>
-	<define name="countryCode">
-		<data type="token">
-			<param name="pattern">[A-Za-z0-9]{1,8}</param>
-		</data>
-	</define>
-	<define name="languageCode">
-		<data type="token">
-			<param name="pattern">[A-Za-z]{1,8}</param>
-		</data>
-	</define>
-	<define name="scriptCode">
-		<data type="token">
-			<param name="pattern">[A-Za-z0-9]{1,8}</param>
-		</data>
-	</define>
-	<define name="character">
-		<data type="string">
-			<param name="length">1</param>
-		</data>
-	</define>
-	<define name="length">
-		<data type="string">
-			<param name="pattern">-?([0-9]+(\.[0-9]*)?|\.[0-9]+)((cm)|(mm)|(in)|(pt)|(pc)|(px))</param>
-		</data>
-	</define>
-	<define name="nonNegativeLength">
-		<data type="string">
-			<param name="pattern">([0-9]+(\.[0-9]*)?|\.[0-9]+)((cm)|(mm)|(in)|(pt)|(pc)|(px))</param>
-		</data>
-	</define>
-	<define name="positiveLength">
-		<data type="string">
-			<param name="pattern">([0-9]*[1-9][0-9]*(\.[0-9]*)?|0+\.[0-9]*[1-9][0-9]*|\.[0-9]*[1-9][0-9]*)((cm)|(mm)|(in)|(pt)|(pc)|(px))</param>
-		</data>
-	</define>
-	<define name="percent">
-		<data type="string">
-			<param name="pattern">-?([0-9]+(\.[0-9]*)?|\.[0-9]+)%</param>
-		</data>
-	</define>
-	<define name="zeroToHundredPercent">
-		<data type="string">
-			<param name="pattern">([0-9]?[0-9](\.[0-9]*)?|100(\.0*)?|\.[0-9]+)%</param>
-		</data>
-	</define>
-	<define name="signedZeroToHundredPercent">
-		<data type="string">
-			<param name="pattern">-?([0-9]?[0-9](\.[0-9]*)?|100(\.0*)?|\.[0-9]+)%</param>
-		</data>
-	</define>
-	<define name="relativeLength">
-		<data type="string">
-			<param name="pattern">[0-9]+\*</param>
-		</data>
-	</define>
-	<define name="coordinate">
-		<ref name="length"/>
-	</define>
-	<define name="distance">
-		<ref name="length"/>
-	</define>
-	<define name="color">
-		<data type="string">
-			<param name="pattern">#[0-9a-fA-F]{6}</param>
-		</data>
-	</define>
-	<define name="angle">
-		<data type="string"/>
-	</define>
-	<define name="CURIE">
-		<data type="string">
-			<param name="pattern">(([\i-[:]][\c-[:]]*)?:)?.+</param>
-			<param name="minLength">1</param>
-		</data>
-	</define>
-	<define name="CURIEs">
-		<list>
-			<oneOrMore>
-				<ref name="CURIE"/>
-			</oneOrMore>
-		</list>
-	</define>
-	<define name="SafeCURIE">
-		<data type="string">
-			<param name="pattern">\[(([\i-[:]][\c-[:]]*)?:)?.+\]</param>
-			<param name="minLength">3</param>
-		</data>
-	</define>
-	<define name="URIorSafeCURIE">
-		<choice>
-			<ref name="anyURI"/>
-			<ref name="SafeCURIE"/>
-		</choice>
-	</define>
-	<define name="styleName">
-		<data type="NCName"/>
-	</define>
-	<define name="styleNameRef">
-		<choice>
-			<data type="NCName"/>
-			<empty/>
-		</choice>
-	</define>
-	<define name="styleNameRefs">
-		<list>
-			<zeroOrMore>
-				<data type="NCName"/>
-			</zeroOrMore>
-		</list>
-	</define>
-	<define name="variableName">
-		<data type="string"/>
-	</define>
-	<define name="targetFrameName">
-		<choice>
-			<value>_self</value>
-			<value>_blank</value>
-			<value>_parent</value>
-			<value>_top</value>
-			<ref name="string"/>
-		</choice>
-	</define>
-	<define name="valueType">
-		<choice>
-			<value>float</value>
-			<value>time</value>
-			<value>date</value>
-			<value>percentage</value>
-			<value>currency</value>
-			<value>boolean</value>
-			<value>string</value>
-		</choice>
-	</define>
-	<define name="points">
-		<data type="string">
-			<param name="pattern">-?[0-9]+,-?[0-9]+([ ]+-?[0-9]+,-?[0-9]+)*</param>
-		</data>
-	</define>
-	<define name="pathData">
-		<data type="string"/>
-	</define>
-	<define name="vector3D">
-		<data type="string">
-			<param name="pattern">\([ ]*-?([0-9]+(\.[0-9]*)?|\.[0-9]+)([ ]+-?([0-9]+(\.[0-9]*)?|\.[0-9]+)){2}[ ]*\)</param>
-		</data>
-	</define>
-	<define name="namespacedToken">
-		<data type="QName">
-			<param name="pattern">[^:]+:[^:]+</param>
-		</data>
-	</define>
-	<define name="anyIRI">
-		<data type="anyURI"/>
-		<dc:description>An IRI-reference as defined in [RFC3987]. See ODF 1.2 Part 1 section 18.3.</dc:description> 
-	</define>
-	<define name="anyAttListOrElements">
-		<zeroOrMore>
-			<attribute>
-				<anyName/>
-				<text/>
-			</attribute>
-		</zeroOrMore>
-		<ref name="anyElements"/>
-	</define>
-	<define name="anyElements">
-		<zeroOrMore>
-			<element>
-				<anyName/>
-				<mixed>
-					<ref name="anyAttListOrElements"/>
-				</mixed>
-			</element>
-		</zeroOrMore>
-	</define>
-</grammar>
diff --git a/apps/files_odfviewer/src/webodf/programs/docnosis/application-vnd.oasis.opendocument.presentation.png b/apps/files_odfviewer/src/webodf/programs/docnosis/application-vnd.oasis.opendocument.presentation.png
deleted file mode 100644
index 1d0fdc08af..0000000000
Binary files a/apps/files_odfviewer/src/webodf/programs/docnosis/application-vnd.oasis.opendocument.presentation.png and /dev/null differ
diff --git a/apps/files_odfviewer/src/webodf/programs/docnosis/application-vnd.oasis.opendocument.spreadsheet.png b/apps/files_odfviewer/src/webodf/programs/docnosis/application-vnd.oasis.opendocument.spreadsheet.png
deleted file mode 100644
index 9614ca81d6..0000000000
Binary files a/apps/files_odfviewer/src/webodf/programs/docnosis/application-vnd.oasis.opendocument.spreadsheet.png and /dev/null differ
diff --git a/apps/files_odfviewer/src/webodf/programs/docnosis/application-vnd.oasis.opendocument.text.png b/apps/files_odfviewer/src/webodf/programs/docnosis/application-vnd.oasis.opendocument.text.png
deleted file mode 100644
index 3fa71f4dc1..0000000000
Binary files a/apps/files_odfviewer/src/webodf/programs/docnosis/application-vnd.oasis.opendocument.text.png and /dev/null differ
diff --git a/apps/files_odfviewer/src/webodf/programs/docnosis/docnosis.js b/apps/files_odfviewer/src/webodf/programs/docnosis/docnosis.js
deleted file mode 100644
index 4bddc12cc2..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/docnosis/docnosis.js
+++ /dev/null
@@ -1,779 +0,0 @@
-/*global runtime, Node, window, DOMParser, core, xmldom, NodeFilter, alert,
-   FileReader*/
-runtime.loadClass("core.Zip");
-runtime.loadClass("core.Base64");
-runtime.loadClass("xmldom.RelaxNG");
-
-/** This code runs a number of tests on an ODF document.
- * Ideally, it would use ODFContainer, but for now, it uses a custome container
- * for loaded odf files.
- */
-
-function conformsToPattern(object, pattern, name) {
-    "use strict";
-    var i;
-    if (object === undefined || object === null) {
-        return pattern === null || (typeof pattern) !== "object";
-    }
-    for (i in pattern) {
-        if (pattern.hasOwnProperty(i)) {
-            if (!(object.hasOwnProperty(i) ||
-                        (i === "length" && object.length)) ||
-                    !conformsToPattern(object[i], pattern[i], i)) {
-                return false;
-            }
-        }
-    }
-    return true;
-}
-
-function getConformingObjects(object, pattern, name) {
-    "use strict";
-    var c = [], i, j;
-    name = name || "??";
-    // we do not look inside long arrays and strings atm,
-    // detection of these types could be better
-    function accept(object) {
-        return object !== null && object !== undefined &&
-            (typeof object) === "object" &&
-            (object.length === undefined || object.length < 1000) &&
-            !(object instanceof Node) &&
-            !(object.constructor && object.constructor === window.Uint8Array);
-    }
-    for (i in object) {
-        if (object.hasOwnProperty(i) && accept(object[i])) {
-            c = c.concat(getConformingObjects(object[i], pattern, i));
-        }
-    }
-    if (conformsToPattern(object, pattern, "?")) {
-        c.push(object);
-    }
-    return c;
-}
-function parseXml(data, errorlog, name) {
-    "use strict";
-    function getText(e) {
-        var str = "", c = e.firstChild;
-        while (c) {
-            if (c.nodeType === 3) {
-                str += c.nodeValue;
-            } else {
-                str += getText(c);
-            }
-            c = c.nextSibling;
-        }
-        return str;
-    }
-    var str, parser, errorelements;
-    try {
-        str = runtime.byteArrayToString(data, "utf8");
-        parser = new DOMParser();
-        str = parser.parseFromString(str, "text/xml");
-        if (str.documentElement.localName === "parsererror"
-                || str.documentElement.localName === "html") {
-            errorelements = str.getElementsByTagName("parsererror");
-            if (errorelements.length > 0) {
-                errorlog.push("invalid XML in " + name + ": " +
-                    getText(errorelements[0]));
-                str = null;
-            }
-        }
-    } catch (err) {
-        errorlog.push(err);
-    }
-    return str;
-}
-
-/*** the jobs / tests ***/
-
-function ParseXMLJob() {
-    "use strict";
-    this.inputpattern = { file: { entries: [] } };
-    this.outputpattern  = {
-        file: { entries: [] },
-        errors: { parseXmlErrors: [] },
-        content_xml: null,
-        manifest_xml: null,
-        settings_xml: null,
-        meta_xml: null,
-        styles_xml: null
-    };
-    function parseXmlFiles(input, position, callback) {
-        var e = input.file.entries,
-            filename,
-            ext,
-            dom;
-        if (position >= e.length) {
-            return callback();
-        }
-        filename = e[position].filename;
-        ext = filename.substring(filename.length - 4);
-        if (ext === ".xml" || ext === ".rdf") {
-            dom = parseXml(e[position].data, input.errors.parseXmlErrors,
-                    filename);
-            if (filename === "content.xml") {
-                input.content_xml = dom;
-            } else if (filename === "META-INF/manifest.xml") {
-                input.manifest_xml = dom;
-            } else if (filename === "styles.xml") {
-                input.styles_xml = dom;
-            } else if (filename === "meta.xml") {
-                input.meta_xml = dom;
-            } else if (filename === "settings.xml") {
-                input.settings_xml = dom;
-            }
-            e[position].dom = dom;
-        }
-        window.setTimeout(function () {
-            parseXmlFiles(input, position + 1, callback);
-        }, 0);
-    }
-    this.run = function (input, callback) {
-        input.errors = input.errors || {};
-        input.errors.parseXmlErrors = [];
-        input.content_xml = null;
-        input.manifest_xml = null;
-        input.styles_xml = null;
-        input.meta_xml = null;
-        input.settings_xml = null;
-        parseXmlFiles(input, 0, callback);
-    };
-}
-function UnpackJob() {
-    "use strict";
-    this.inputpattern = { file: { path: "", data: { length: 0 } } };
-    this.outputpattern  = {
-        file: { entries: [], dom: null }, errors: { unpackErrors: [] }
-    };
-    function getText(e) {
-        var str = "", c = e.firstChild;
-        while (c) {
-            if (c.nodeType === 3) {
-                str += c.nodeValue;
-            } else {
-                str += getText(c);
-            }
-            c = c.nextSibling;
-        }
-        return str;
-    }
-    function loadZipEntries(input, position, callback) {
-        if (position >= input.file.entries.length) {
-            return callback();
-        }
-        var e = input.file.entries[position];
-        e.load(function (err, data) {
-            if (err) {
-                input.errors.unpackErrors.push(err);
-            }
-            e.error = err;
-            e.data = data;
-            window.setTimeout(function () {
-                loadZipEntries(input, position + 1, callback);
-            }, 0);
-        });
-    }
-    function loadZip(input, callback) {
-        var zip = new core.Zip(input.file.path, function (err, zip) {
-            var i;
-            if (err) {
-                input.errors.unpackErrors.push(err);
-                callback();
-            } else {
-                input.file.entries = zip.getEntries();
-                loadZipEntries(input, 0, callback);
-            }
-        });
-    }
-    function loadXml(input, callback) {
-        input.file.dom = parseXml(input.file.data, input.errors.unpackErrors,
-                input.file.name);
-        callback();
-    }
-    this.run = function (input, callback) {
-        input.errors = input.errors || {};
-        input.errors.unpackErrors = [];
-        input.file.dom = null;
-        input.file.entries = [];
-
-        if (input.file.data.length < 1) {
-            input.errors.unpackErrors.push("Input data is empty.");
-            return;
-        }
-        if (input.file.data[0] === 80) { // a ZIP file starts with 'P'
-            loadZip(input, callback);
-        } else {
-            loadXml(input, callback);
-        }
-    };
-}
-function MimetypeTestJob(odffile) {
-    "use strict";
-    this.inputpattern = {
-        file: { entries: [], dom: null },
-        manifest_xml: null
-    };
-    this.outputpattern = { mimetype: "", errors: { mimetypeErrors: [] } };
-    var manifestns = "urn:oasis:names:tc:opendocument:xmlns:manifest:1.0";
-    function getManifestMimetype(manifest) {
-        if (!manifest) {
-            return null;
-        }
-        var path, mimetype, node;
-        node = manifest.documentElement.firstChild;
-        while (node) {
-            if (node.nodeType === 1 && node.localName === "file-entry" &&
-                    node.namespaceURI === manifestns) {
-                path = node.getAttributeNS(manifestns, "full-path");
-                if (path === "/") {
-                    mimetype = node.getAttributeNS(manifestns, "media-type");
-                    break;
-                }
-            }
-            node = node.nextSibling;
-        }
-        return mimetype;
-    }
-    this.run = function (input, callback) {
-        input.mimetype = null;
-        input.errors.mimetypeErrors = [];
-        var mime = null,
-            altmime,
-            e = input.file.entries,
-            i;
-        if (input.file.dom) {
-            mime = input.file.dom.documentElement.getAttributeNS(
-                "urn:oasis:names:tc:opendocument:xmlns:office:1.0", "mimetype");
-        } else {
-            if (e.length < 1 || e[0].filename !== "mimetype") {
-                input.errors.mimetypeErrors.push(
-                        "First file in zip is not 'mimetype'");
-            }
-            for (i = 0; i < e.length; i += 1) {
-                if (e[i].filename === "mimetype") {
-                    mime = runtime.byteArrayToString(e[i].data, "binary");
-                    break;
-                }
-            }
-            if (mime) {
-                altmime = input.file.data.slice(38, 38 + mime.length);
-                altmime = runtime.byteArrayToString(altmime, "binary");
-                if (mime !== altmime) {
-                    input.errors.mimetypeErrors.push(
-                           "mimetype should start at byte 38 in the zip file.");
-                }
-            }
-            // compare with mimetype from manifest_xml
-            altmime = getManifestMimetype(input.manifest_xml);
-            if (altmime !== mime) {
-                input.errors.mimetypeErrors.push(
-                    "manifest.xml has a different mimetype.");
-            }
-        }
-        if (!mime) {
-            input.errors.mimetypeErrors.push("No mimetype was found.");
-        }
-        input.mimetype = mime;
-        callback();
-    };
-}
-function VersionTestJob() {
-    "use strict";
-    this.inputpattern = {
-        file: { dom: null },
-        content_xml: null,
-        styles_xml: null,
-        meta_xml: null,
-        settings_xml: null,
-        manifest_xml: null
-    };
-    this.outputpattern = { version: "", errors: { versionErrors: [] } };
-    var officens = "urn:oasis:names:tc:opendocument:xmlns:office:1.0";
-    function getVersion(dom, filename, log, vinfo, filerequired) {
-        var v, ns = officens;
-        if (!dom) {
-            if (filerequired) {
-                log.push(filename + " is missing, so version cannot be found.");
-            }
-            return;
-        }
-        if (filename === "META-INF/manifest.xml") {
-            ns = "urn:oasis:names:tc:opendocument:xmlns:manifest:1.0";
-        }
-        if (!dom.documentElement.hasAttributeNS(ns, "version")) {
-            if (vinfo.versionrequired) {
-                log.push(filename + " has no version number.");
-            }
-            return;
-        }
-        v = dom.documentElement.getAttributeNS(ns, "version");
-        if (vinfo.version === undefined) {
-            vinfo.version = v;
-            // version number is required since ODF 1.2
-            vinfo.needversion = vinfo.version === "1.2";
-            vinfo.versionSource = filename;
-        } else if (v !== vinfo.version) {
-            log.push(vinfo.versionSource + " and " + filename + " " +
-                    " have  different version number.");
-        }
-    }
-    this.run = function (input, callback) {
-        input.errors.versionErrors = [];
-        var v,
-            e = input.file.entries,
-            log = input.errors.versionErrors,
-            vinfo = {
-                version: undefined,
-                needversion: null,
-                versionSource: null
-            },
-            contentxmlhasnoversionnumber;
-        if (input.file.dom) {
-            getVersion(input.file.dom, input.file.name, log, vinfo, true);
-        } else {
-            // until we know the version number, we cannot claim that
-            // content.xml needs a version number
-            getVersion(input.content_xml, "content.xml", log, vinfo, true);
-            contentxmlhasnoversionnumber = vinfo.version === undefined;
-            getVersion(input.manifest_xml, "META-INF/manifest.xml", log,
-                    vinfo, true);
-            getVersion(input.styles_xml, "styles.xml", log, vinfo);
-            getVersion(input.meta_xml, "meta.xml", log, vinfo);
-            getVersion(input.settings_xml, "settings.xml", log, vinfo);
-            if (vinfo.needversion && contentxmlhasnoversionnumber) {
-                log.push("content.xml has no version number.");
-            }
-        }
-        input.version = vinfo.version;
-        callback();
-    };
-}
-function GetThumbnailJob() {
-    "use strict";
-    var base64 = new core.Base64();
-    this.inputpattern = { file: { entries: [] }, errors: {}, mimetype: "" };
-    this.outputpattern = { thumbnail: "", errors: { thumbnailErrors: [] } };
-    this.run = function (input, callback) {
-        input.thumbnail = null;
-        input.errors.thumbnailErrors = [];
-        var i, e = input.file.entries, mime = input.mimetype, thumb = null;
-        if (mime === "application/vnd.oasis.opendocument.text") {
-            thumb = "application-vnd.oasis.opendocument.text.png";
-        } else if (mime === "application/vnd.oasis.opendocument.spreadsheet") {
-            thumb = "application-vnd.oasis.opendocument.spreadsheet.png";
-        } else if (mime === "application/vnd.oasis.opendocument.presentation") {
-            thumb = "application-vnd.oasis.opendocument.presentation.png";
-        }
-        for (i = 0; i < e.length; i += 1) {
-            if (e[i].filename === "Thumbnails/thumbnail.png") {
-                thumb = "data:image/png;base64," +
-                        base64.convertUTF8ArrayToBase64(e[i].data);
-                break;
-            }
-        }
-        input.thumbnail = thumb;
-        callback();
-    };
-}
-function RelaxNGJob() {
-    "use strict";
-    var parser = new xmldom.RelaxNGParser(),
-        validators = {};
-    this.inputpattern = { file: {dom: null}, version: null };
-    this.outputpattern = { errors: { relaxngErrors: [] } };
-    function loadValidator(ns, version, callback) {
-        var rng;
-        if (ns === "urn:oasis:names:tc:opendocument:xmlns:manifest:1.0") {
-            if (version === "1.2") {
-                rng = "OpenDocument-v1.2-cos01-manifest-schema.rng";
-            } else if (version === "1.1") {
-                rng = "OpenDocument-manifest-schema-v1.1.rng";
-            } else if (version === "1.0") {
-                rng = "OpenDocument-manifest-schema-v1.0-os.rng";
-            }
-        } else if (ns === "urn:oasis:names:tc:opendocument:xmlns:office:1.0") {
-            if (version === "1.2") {
-                rng = "OpenDocument-v1.2-cos01-schema.rng";
-            } else if (version === "1.1") {
-                rng = "OpenDocument-schema-v1.1.rng";
-            } else if (version === "1.0") {
-                rng = "OpenDocument-schema-v1.0-os.rng";
-            }
-        }
-        if (rng) {
-            runtime.loadXML(rng, function (err, dom) {
-                var relaxng;
-                if (err) {
-                    runtime.log(err);
-                } else {
-                    relaxng = new xmldom.RelaxNG();
-                    err = parser.parseRelaxNGDOM(dom, relaxng.makePattern);
-                    if (err) {
-                        runtime.log(err);
-                    } else {
-                        relaxng.init(parser.rootPattern);
-                    }
-                }
-                validators[ns] = validators[ns] || {};
-                validators[ns][version] = relaxng;
-                callback(relaxng);
-            });
-        } else {
-            callback(null);
-        }
-    }
-    function getValidator(ns, version, callback) {
-        if (ns === "urn:oasis:names:tc:opendocument:xmlns:office:1.0" ||
-                ns === "urn:oasis:names:tc:opendocument:xmlns:manifest:1.0") {
-            if (!version) {
-                version = "1.1";
-            }
-        }
-        if (validators[ns] && validators[ns][version]) {
-            return callback(validators[ns][version]);
-        }
-        loadValidator(ns, version, callback);
-    }
-    function validate(log, dom, filename, version, callback) {
-        var ns = dom.documentElement.namespaceURI;
-        getValidator(ns, version, function (relaxng) {
-            if (!relaxng) {
-                return callback();
-            }
-            var walker = dom.createTreeWalker(dom.firstChild, 0xFFFFFFFF,
-                    { acceptNode: function(node) {
-                        return NodeFilter.FILTER_ACCEPT; }
-                    }, false),
-                err;
-runtime.log("START VALIDATING");
-            err = relaxng.validate(walker, function (err) {
-runtime.log("FINISHED VALIDATING");
-                var i;
-                if (err) {
-                    for (i = 0; i < err.length; i += 1) {
-                        log.push(filename + ": " + err[i]);
-                    }
-                }
-                callback();
-            });
-        });
-    }
-    function validateEntries(log, entries, position, version, callback) {
-        if (position >= entries.length) {
-            return callback();
-        }
-        var e = entries[position];
-        if (e.dom) {
-            validate(log, e.dom, e.filename, version, function () {
-                window.setTimeout(function () {
-                    validateEntries(log, entries, position + 1, version,
-                            callback);
-                }, 0);
-            });
-        } else {
-            validateEntries(log, entries, position + 1, version, callback);
-        }
-    }
-    this.run = function (input, callback) {
-        input.errors = input.errors || {};
-        input.errors.relaxngErrors = [];
-        runtime.log(input.version);
-        if (input.file.dom) {
-            validate(input.errors.relaxngErrors, input.file.dom,
-                input.file.path, input.version, callback);
-            return;
-        }
-        var i, e = input.file.entries;
-        validateEntries(input.errors.relaxngErrors, input.file.entries, 0,
-            input.version, callback);
-    };
-}
-
-function DataRenderer(parentelement) {
-    "use strict";
-    var doc = parentelement.ownerDocument,
-        element = doc.createElement("div"),
-        lastrendertime,
-        delayedRenderComing,
-        renderinterval = 300; // minimal milliseconds between renders
-    function clear(element) {
-        while (element.firstChild) {
-            element.removeChild(element.firstChild);
-        }
-    }
-    function addParagraph(div, text) {
-        var p = doc.createElement("p");
-        p.appendChild(doc.createTextNode(text));
-        div.appendChild(p);
-    }
-    function addSpan(parent, nodename, text) {
-        var e = doc.createElement(nodename);
-        e.appendChild(doc.createTextNode(text));
-        parent.appendChild(e);
-    }
-    function addErrors(div, e, active) {
-        var i, o;
-        for (i in e) {
-            if (e.hasOwnProperty(i)) {
-                o = e[i];
-                if (active && ((typeof o) === "string"
-                        || o instanceof String)) {
-                    addParagraph(div, o);
-                } else if (o && (typeof o) === "object" &&
-                        !(o instanceof Node) &&
-                        !(o.constructor &&
-                          o.constructor === window.Uint8Array)) {
-                    addErrors(div, o, active || i === "errors");
-                }
-            }
-        }
-    }
-    function renderFile(data) {
-        var div = doc.createElement("div"),
-            h1 = doc.createElement("h1"),
-            icon = doc.createElement("img");
-        div.style.clear = "both";
-        div.appendChild(h1);
-        div.appendChild(icon);
-        h1.appendChild(doc.createTextNode(data.file.path));
-        element.appendChild(div);
-        if (data.thumbnail) {
-            icon.src = data.thumbnail;
-        }
-        icon.style.width = "128px";
-        icon.style.float = "left";
-        icon.style.mozBoxShadow = icon.style.webkitBoxShadow =
-                icon.style.boxShadow = "3px 3px 4px #000";
-        icon.style.marginRight = icon.style.marginBottom = "10px";
-        addParagraph(div, "mimetype: " + data.mimetype);
-        addParagraph(div, "version: " + data.version);
-        addParagraph(div, "document representation: " +
-                ((data.file.dom) ? "single XML document" :"package"));
-        addErrors(div, data, false);
-    }
-    function dorender(data) {
-        clear(element);
-        var i;
-        for (i = 0; i < data.length; i += 1) {
-            renderFile(data[i]);
-        }
-    }
-    this.render = function render(data) {
-        var now = Date.now();
-        if (!lastrendertime || now - lastrendertime > renderinterval) {
-            lastrendertime = now;
-            dorender(data);
-        } else if (!delayedRenderComing) {
-            delayedRenderComing = true;
-            window.setTimeout(function () {
-                delayedRenderComing = false;
-                lastrendertime = now + renderinterval;
-                dorender(data);
-            }, renderinterval);
-        }
-    };
-    parentelement.appendChild(element);
-}
-
-function JobRunner(datarenderer) {
-    "use strict";
-    var jobrunner = this,
-        jobtypes = [],
-        data,
-        busy = false,
-        todo = [];
-        
-    jobtypes.push(new UnpackJob());
-    jobtypes.push(new MimetypeTestJob());
-    jobtypes.push(new GetThumbnailJob());
-    jobtypes.push(new VersionTestJob());
-    jobtypes.push(new ParseXMLJob());
-    jobtypes.push(new RelaxNGJob());
-
-    function run() {
-        if (busy) {
-           return;
-        }
-        var job = todo.shift();
-        if (job) {
-            busy = true;
-            job.job.run(job.object, function () {
-                busy = false;
-                if (!conformsToPattern(job.object, job.job.outputpattern)) {
-                    throw "Job does not give correct output.";
-                }
-                datarenderer.render(data);
-                window.setTimeout(run, 0);
-            });
-        }
-    }
-
-    function update(ignore, callback) {
-        var i, jobtype, j, inobjects, outobjects;
-        todo = [];
-        for (i = 0; i < jobtypes.length; i += 1) {
-            jobtype = jobtypes[i];
-            inobjects = getConformingObjects(data, jobtype.inputpattern);
-            outobjects = getConformingObjects(data, jobtype.outputpattern);
-            for (j = 0; j < inobjects.length; j += 1) {
-                if (outobjects.indexOf(inobjects[j]) === -1) {
-                    todo.push({job: jobtype, object: inobjects[j]});
-                }
-            }
-        }
-        if (todo.length > 0) {
-            // run update again after all todos are done
-            todo.push({job: jobrunner, object: null});
-        }
-        if (callback) {
-            callback();
-        } else {
-            run();
-        }
-    }
-
-    this.run = update;
-
-    this.setData = function setData(newdata) {
-        data = newdata;
-        if (busy) {
-            todo = [];
-            todo.push({job: jobrunner, object: null});
-        } else {
-            update();
-        }
-    };
-}
-function LoadingFile(file) {
-    "use strict";
-    var data,
-        error,
-        readRequests = [];
-    function load(callback) {
-        var reader = new FileReader();
-        reader.onloadend = function(evt) {
-            data = runtime.byteArrayFromString(evt.target.result, "binary");
-            error = evt.target.error && String(evt.target.error);
-            var i = 0;
-            for (i = 0; i < readRequests.length; i += 1) {
-                readRequests[i]();
-            }
-            readRequests = undefined;
-            reader = undefined;
-            callback(error, data);
-        };
-        reader.readAsBinaryString(file);
-    }
-    this.file = file;
-    this.read = function (offset, length, callback) {
-        function read() {
-            if (error) {
-                return callback(error);
-            }
-            if (data) {
-                return callback(error, data.slice(offset, offset + length));
-            }
-            readRequests.push(read);
-        }
-        read();
-    };
-    this.load = load;
-}
-function Docnosis(element) {
-    "use strict";
-    var doc = element.ownerDocument,
-        form,
-        diagnoses = doc.createElement("div"),
-        openedFiles = {},
-        datarenderer = new DataRenderer(diagnoses),
-        jobrunner = new JobRunner(datarenderer),
-        jobrunnerdata = [];
-
-    function dragHandler(evt) {
-        var over = evt.type === "dragover" && evt.target.nodeName !== "INPUT";
-        if (over || evt.type === "drop") {
-            evt.stopPropagation();
-            evt.preventDefault();
-        }
-        if (evt.target.style) {
-            evt.target.style.background = (over ? "#CCCCCC" : "inherit");
-        }
-    }
-
-    function fileSelectHandler(evt) {
-        // cancel event and hover styling
-        dragHandler(evt);
-
-        function diagnoseFile(file) {
-            var loadingfile, path;
-            path = file.name;
-            loadingfile = new LoadingFile(file);
-            openedFiles[path] = loadingfile;
-            loadingfile.load(function (error, data) {
-                jobrunnerdata.push({file:{
-                    path: path,
-                    data: data
-                }});
-                jobrunner.setData(jobrunnerdata);
-            });
-        }
-        // process all File objects
-        var i, files, div;
-        files = (evt.target && evt.target.files) ||
-                (evt.dataTransfer && evt.dataTransfer.files);
-        if (files) {
-            for (i = 0; files && i < files.length; i += 1) {
-                div = doc.createElement("div");
-                diagnoses.appendChild(div);
-                diagnoseFile(files[i]);
-            }
-        } else {
-            alert("File(s) could not be opened in this browser.");
-        }
-    }
-
-    function createForm() {
-        var form = doc.createElement("form"),
-            fieldset = doc.createElement("fieldset"),
-            legend = doc.createElement("legend"),
-            input = doc.createElement("input");
-        form = doc.createElement("form");
-        form.appendChild(fieldset);
-        fieldset.appendChild(legend);
-        input.setAttribute("type", "file");
-        input.setAttribute("name", "fileselect[]");
-        input.setAttribute("multiple", "multiple");
-        input.addEventListener("change", fileSelectHandler, false);
-        fieldset.appendChild(input);
-        fieldset.appendChild(doc.createTextNode("or drop files here"));
-        legend.appendChild(doc.createTextNode("docnosis"));
-        form.addEventListener("dragover", dragHandler, false);
-        form.addEventListener("dragleave", dragHandler, false);
-        form.addEventListener("drop", fileSelectHandler, false);
-        return form;
-    }
-
-    function enhanceRuntime() {
-        var read = runtime.read,
-            getFileSize = runtime.getFileSize;
-        runtime.read = function (path, offset, length, callback) {
-            if (openedFiles.hasOwnProperty(path)) {
-                return openedFiles[path].read(offset, length, callback);
-            } else {
-                return read(path, offset, length, callback);
-            }
-        };
-        runtime.getFileSize = function (path, callback) {
-            if (openedFiles.hasOwnProperty(path)) {
-                return callback(openedFiles[path].file.size);
-            } else {
-                return getFileSize(path, callback);
-            }
-        };
-    }
-
-    form = createForm();
-    element.appendChild(form);
-    element.appendChild(diagnoses);
-    enhanceRuntime();
-}
diff --git a/apps/files_odfviewer/src/webodf/programs/docnosis/index.html b/apps/files_odfviewer/src/webodf/programs/docnosis/index.html
deleted file mode 100644
index cd56d4f746..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/docnosis/index.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html xml:lang="en" lang="en">
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8"></meta>
-  <title>docnosis</title>
-  <!-- <script src="../../webodf/webodf.js" type="text/javascript" charset="utf-8"></script> -->
-  <script src="../../webodf/lib/runtime.js" type="text/javascript" charset="utf-8"></script>
-  <script type="text/javascript">//<![CDATA[
-runtime.libraryPaths = function () {
-    return ["../../webodf/lib/"];
-};
-  //]]></script>
-  <script src="docnosis.js" type="text/javascript" charset="utf-8"></script>
-  <script type="text/javascript">//<![CDATA[
-runtime.libraryPaths = function () {
-    return ["../../webodf/lib/"];
-};
-window.addEventListener("load", function () {
-   var docnosis = document.getElementById("docnosis");
-   new Docnosis(docnosis);
-}, false);
-  //]]></script>
- </head>
- <body>
-  <div id="docnosis"></div>
- </body>
-</html>
diff --git a/apps/files_odfviewer/src/webodf/programs/firefoxextension/CMakeLists.txt b/apps/files_odfviewer/src/webodf/programs/firefoxextension/CMakeLists.txt
deleted file mode 100644
index 92d1e19f7c..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/firefoxextension/CMakeLists.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-# the files that go into the extension
-set(FIREFOXEXTENSIONFILES
-    bootstrap.js
-    chrome.manifest
-    skin/default/icon.png
-    content/odf.html
-    components/odfContentHandler.js
-)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/install.rdf.in
-    ${CMAKE_CURRENT_SOURCE_DIR}/install.rdf)
-set(WEBODFXPI ${CMAKE_CURRENT_BINARY_DIR}/webodf-${WEBODF_VERSION}.xpi)
-add_custom_command(
-    OUTPUT ${WEBODFXPI}
-    # copy the common webodf.css and webodf.js
-    COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different
-        ${CMAKE_SOURCE_DIR}/webodf/webodf.css
-        ${CMAKE_CURRENT_SOURCE_DIR}/content/webodf.css
-    COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different
-        ${CMAKE_BINARY_DIR}/webodf/webodf.js
-        ${CMAKE_CURRENT_SOURCE_DIR}/content/webodf.js
-    # zip using javascript code running in node.js
-    COMMAND ${NODE} ARGS ../../webodf/lib/runtime.js packextension.js
-        ${WEBODFXPI}
-        ${FIREFOXEXTENSIONFILES}
-        content/webodf.js
-        content/webodf.css
-        install.rdf
-    DEPENDS NodeJS
-        packextension.js ${FIREFOXEXTENSIONFILES}
-        install.rdf.in
-        ${CMAKE_SOURCE_DIR}/webodf/webodf.css
-        ${CMAKE_BINARY_DIR}/webodf/webodf.js
-    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-)
-add_custom_target(firefoxextension ALL DEPENDS ${WEBODFXPI})
diff --git a/apps/files_odfviewer/src/webodf/programs/firefoxextension/bootstrap.js b/apps/files_odfviewer/src/webodf/programs/firefoxextension/bootstrap.js
deleted file mode 100644
index c95dbd4a90..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/firefoxextension/bootstrap.js
+++ /dev/null
@@ -1,36 +0,0 @@
-/*global Components: true, dump: true, Services: true*/
-
-var Cc = Components.classes;
-var Ci = Components.interfaces;
-var Cm = Components.manager;
-var Cu = Components.utils;
-
-Cu["import"]('resource://gre/modules/Services.jsm');
-
-function log(str) {
-    "use strict";
-    dump(str + '\n');
-}
-
-function startup(aData, aReason) {
-    "use strict";
-    var manifestPath = 'chrome.manifest',
-        file = Cc['@mozilla.org/file/local;1'].createInstance(Ci.nsILocalFile);
-    try {
-        file.initWithPath(aData.installPath.path);
-        file.append(manifestPath);
-        Cm.QueryInterface(Ci.nsIComponentRegistrar).autoRegister(file);
-    } catch (e) {
-        log(e);
-    }
-}
-
-function shutdown(aData, aReason) {
-    "use strict";
-}
-
-function install(aData, aReason) {
-    "use strict";
-    var url = 'chrome://webodf.js/content/odf.html?file=%s';
-    Services.prefs.setCharPref('extensions.webodf.js.url', url);
-}
diff --git a/apps/files_odfviewer/src/webodf/programs/firefoxextension/chrome.manifest b/apps/files_odfviewer/src/webodf/programs/firefoxextension/chrome.manifest
deleted file mode 100644
index b6f6e75cfb..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/firefoxextension/chrome.manifest
+++ /dev/null
@@ -1,13 +0,0 @@
-content webodf.js content/
-skin webodf.js default skin/default/
-
-component {afe5fa21-709d-4916-b51c-56f60d574a0a} components/odfContentHandler.js
-contract @mozilla.org/uriloader/content-handler;1?type=application/vnd.oasis.opendocument.text {afe5fa21-709d-4916-b51c-56f60d574a0a}
-contract @mozilla.org/uriloader/content-handler;1?type=application/vnd.oasis.opendocument.spreadsheet {afe5fa21-709d-4916-b51c-56f60d574a0a}
-contract @mozilla.org/uriloader/content-handler;1?type=application/vnd.oasis.opendocument.presentation {afe5fa21-709d-4916-b51c-56f60d574a0a}
-category ext-to-type-mapping odt application/vnd.oasis.opendocument.text
-category ext-to-type-mapping fodt application/vnd.oasis.opendocument.text
-category ext-to-type-mapping ods application/vnd.oasis.opendocument.spreadsheet
-category ext-to-type-mapping fods application/vnd.oasis.opendocument.spreadsheet
-category ext-to-type-mapping odp application/vnd.oasis.opendocument.presentation
-category ext-to-type-mapping fodp application/vnd.oasis.opendocument.presentation
diff --git a/apps/files_odfviewer/src/webodf/programs/firefoxextension/components/odfContentHandler.js b/apps/files_odfviewer/src/webodf/programs/firefoxextension/components/odfContentHandler.js
deleted file mode 100644
index 47a3d349ac..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/firefoxextension/components/odfContentHandler.js
+++ /dev/null
@@ -1,196 +0,0 @@
-/*jslint bitwise: true*/
-/*global Components: true, dump: true, Uint8Array: true, Services: true,
-   XPCOMUtils: true*/
-var Cc = Components.classes;
-var Ci = Components.interfaces;
-var Cr = Components.results;
-var Cu = Components.utils;
-
-var ODF_CONTENT_TYPE_PREFIX = 'application/vnd.oasis.opendocument.';
-var NS_ERROR_WONT_HANDLE_CONTENT = 0x805d0001;
-
-Cu["import"]('resource://gre/modules/XPCOMUtils.jsm');
-Cu["import"]('resource://gre/modules/Services.jsm');
-
-function log(aMsg) {
-    "use strict";
-    var msg = 'odfContentHandler.js: ' + (aMsg.join ? aMsg.join('') : aMsg);
-    Cc['@mozilla.org/consoleservice;1'].getService(Ci.nsIConsoleService)
-                                       .logStringMessage(msg);
-    dump(msg + '\n');
-}
-
-function fireEventTo(aName, aData, aWindow) {
-    "use strict";
-    var mywindow = aWindow.wrappedJSObject,
-        evt = mywindow.document.createEvent('CustomEvent');
-    evt.initCustomEvent('odf' + aName, false, false, aData);
-    mywindow.document.dispatchEvent(evt);
-}
-
-function loadDocument(aWindow, aDocumentUrl) {
-    "use strict";
-    var xhr = Cc['@mozilla.org/xmlextras/xmlhttprequest;1']
-              .createInstance(Ci.nsIXMLHttpRequest);
-    xhr.onprogress = function updateProgress(evt) {
-        if (evt.lengthComputable) {
-            fireEventTo(evt.type, evt.loaded / evt.total, aWindow);
-        }
-    };
-
-    xhr.onerror = function error(evt) {
-        fireEventTo(evt.type, false, aWindow);
-    };
-
-    xhr.onload = function load(evt) {
-        var data = (xhr.mozResponseArrayBuffer || xhr.mozResponse ||
-                xhr.responseArrayBuffer || xhr.response),
-            view,
-            mywindow,
-            arrayBuffer,
-            view2,
-            array,
-            i;
-        try {
-            view = new Uint8Array(data);
-            mywindow = aWindow.wrappedJSObject;
-            arrayBuffer = new mywindow.ArrayBuffer(data.byteLength);
-            view2 = new mywindow.Uint8Array(arrayBuffer);
-            view2.set(view);
-            array = [];
-            array.length = view2.byteLength;
-            for (i = 0; i < view2.byteLength; i += 1) {
-                array[i] = view2[i];
-            }
-            fireEventTo(evt.type, array, aWindow);
-        } catch (e) {
-            log('Error - ' + e);
-        }
-    };
-
-    xhr.open('GET', aDocumentUrl);
-    xhr.responseType = 'arraybuffer';
-    xhr.send(null);
-}
-
-var WebProgressListener = {
-    init: function WebProgressListenerInit(aWindow, aUrl) {
-        "use strict";
-        this.locationHasChanged = false;
-        this.documentUrl = aUrl;
-
-        var flags = Ci.nsIWebProgress.NOTIFY_LOCATION |
-                Ci.nsIWebProgress.NOTIFY_STATE_NETWORK |
-                Ci.nsIWebProgress.NOTIFY_STATE_DOCUMENT,
-            docShell = aWindow.QueryInterface(Ci.nsIInterfaceRequestor)
-                          .getInterface(Ci.nsIWebNavigation)
-                          .QueryInterface(Ci.nsIDocShell),
-            webProgress = docShell.QueryInterface(Ci.nsIInterfaceRequestor)
-                              .getInterface(Ci.nsIWebProgress);
-        try {
-            webProgress.removeProgressListener(this);
-        } catch (e) {
-        }
-        webProgress.addProgressListener(this, flags);
-    },
-
-    onStateChange: function onStateChange(aWebProgress, aRequest, aStateFlags,
-                                        aStatus) {
-        "use strict";
-        var complete = Ci.nsIWebProgressListener.STATE_IS_WINDOW +
-                     Ci.nsIWebProgressListener.STATE_STOP;
-        if ((aStateFlags & complete) === complete && this.locationHasChanged) {
-            aWebProgress.removeProgressListener(this);
-            loadDocument(aWebProgress.DOMWindow, this.documentUrl);
-        }
-    },
-
-    onProgressChange: function onProgressChange(aWebProgress, aRequest,
-                                                aCurSelf, aMaxSelf, aCurTotal,
-                                                aMaxTotal) {
-        "use strict";
-    },
-
-    onLocationChange: function onLocationChange(aWebProgress, aRequest,
-                                              aLocationURI) {
-        "use strict";
-        this.locationHasChanged = true;
-    },
-
-    onStatusChange: function onStatusChange(aWebProgress, aRequest, aStatus,
-                                          aMessage) {
-        "use strict";
-    },
-
-    onSecurityChange: function onSecurityChange(aWebProgress, aRequest, aState) {
-        "use strict";
-    },
-
-    QueryInterface: function QueryInterface(aIID) {
-        "use strict";
-        if (aIID.equals(Ci.nsIWebProgressListener) ||
-                aIID.equals(Ci.nsISupportsWeakReference) ||
-                aIID.equals(Ci.nsISupports)) {
-            return this;
-        }
-        throw Components.results.NS_ERROR_NO_INTERFACE;
-    }
-};
-
-function odfContentHandler() {
-    "use strict";
-}
-
-odfContentHandler.prototype = {
-    handleContent: function handleContent(aMimetype, aContext, aRequest) {
-        "use strict";
-
-        if (!(aMimetype.indexOf(ODF_CONTENT_TYPE_PREFIX) === 0 ||
-                aMimetype === "application/octet-stream")) {
-            throw NS_ERROR_WONT_HANDLE_CONTENT;
-        }
-
-        if (!(aRequest instanceof Ci.nsIChannel)) {
-            throw NS_ERROR_WONT_HANDLE_CONTENT;
-        }
-
-        var mywindow = null,
-            callbacks,
-            uri = aRequest.URI,
-            targetUrl = uri.spec,
-            tail = targetUrl.substring(targetUrl.length-9),
-            url;
-
-        // if the url ends with a download parameter, then do not handle it
-        if (tail === "#download") {
-            throw NS_ERROR_WONT_HANDLE_CONTENT;
-        }
-
-        callbacks = aRequest.notificationCallbacks ||
-                    aRequest.loadGroup.notificationCallbacks;
-        if (!callbacks) {
-            return;
-        }
-
-        mywindow = callbacks.getInterface(Ci.nsIDOMWindow);
-
-        WebProgressListener.init(mywindow, uri.spec);
-
-        try {
-            url = Services.prefs.getCharPref('extensions.webodf.js.url');
-            //url = url.replace('%s', encodeURIComponent(targetUrl));
-            url = url.replace('%s', targetUrl);
-        } catch (e) {
-            log('Error retrieving the webodf base url - ' + e);
-            throw NS_ERROR_WONT_HANDLE_CONTENT;
-        }
-
-        aRequest.cancel(Cr.NS_BINDING_ABORTED);
-        mywindow.location = url;
-    },
-
-    classID: Components.ID('{afe5fa21-709d-4916-b51c-56f60d574a0a}'),
-    QueryInterface: XPCOMUtils.generateQI([Ci.nsIContentHandler])
-};
-
-var NSGetFactory = XPCOMUtils.generateNSGetFactory([odfContentHandler]);
diff --git a/apps/files_odfviewer/src/webodf/programs/firefoxextension/content/odf.html b/apps/files_odfviewer/src/webodf/programs/firefoxextension/content/odf.html
deleted file mode 100644
index 0dc023aed8..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/firefoxextension/content/odf.html
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8"></meta>
-  <style type="text/css" media="screen">
-    body, html, div {
-      padding: 0px;
-      margin: 0px;
-      border: 0px;
-    }
-    body, html {
-      height: 100%;
-      text-align: center;
-    }
-    html > body {
-      background: black;
-    }
-    div#toolbar {
-      background: white;
-      padding: 7px;
-      border-bottom: 1px solid black;
-    }
-    div#toolbar > span {
-      border: 1px solid black;
-      padding: 2px;
-    }
-    div#toolbar > span:hover {
-      background: #CCCCCC;
-    }
-  </style>
-  <link rel="stylesheet" type="text/css" href="webodf.css"/>
-  <script src="webodf.js" type="text/javascript" charset="utf-8"></script>
-  <script type="text/javascript" charset="utf-8">//<![CDATA[
-var webodffirefox = {
-    url: undefined,
-    data: undefined,
-    odfcanvas: undefined
-};
-window.addEventListener('odfload', function webViewerLoad(evt) {
-    runtime.loadClass("odf.OdfCanvas");
-    var wf = webodffirefox,
-        params = document.location.search.substring(1).split('&'),
-        param,
-        odfelement = document.getElementById("odf"),
-        data = evt.detail;
-    for (i = 0; i < params.length; i += 1) {
-        param = params[i].split('=');
-        params[unescape(param[0])] = unescape(param[1]);
-    }
-    wf.url = params.file;
-    wf.data = data;
-    wf.odfcanvas = new odf.OdfCanvas(odfelement);
-
-    runtime.read = function (path, offset, length, callback) {
-        var d = data.slice(offset, offset + length);
-        callback(null, d);
-    }
-    runtime.getFileSize = function (path, callback) {
-        callback(data.length);
-    }
-    wf.odfcanvas.load(params.file);
-}, true);
-function addButton(parent, label, onclick) {
-    var doc = parent.ownerDocument,
-        button = doc.createElement("span");
-    button.appendChild(doc.createTextNode(label));
-    button.onclick = onclick;
-    parent.appendChild(button);
-}
-function init() {
-    runtime.loadClass("core.Base64");
-    var toolbar = document.getElementById("toolbar");
-    addButton(toolbar, "download", function onclick() {
-        window.location.href = webodffirefox.url + "#download";
-    });
-}
-window.setTimeout(function () {
-    init();
-}, 1);
-//--></script>
-  <title></title>
-</head>
-<body>
-  <div id="toolbar">
-  </div>
-  <div id="odf"/>
-</body>
-</html>
diff --git a/apps/files_odfviewer/src/webodf/programs/firefoxextension/install.rdf.in b/apps/files_odfviewer/src/webodf/programs/firefoxextension/install.rdf.in
deleted file mode 100644
index caf59198a2..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/firefoxextension/install.rdf.in
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-     xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
-  <Description about="urn:mozilla:install-manifest">
-    <em:id>uriloader@webodf.js</em:id>
-    <em:name>WebODF</em:name>
-    <em:type>2</em:type>
-    <em:version>@WEBODF_VERSION@</em:version>
-    <em:iconURL>chrome://webodf.js/skin/icon.png</em:iconURL>
-    <em:targetApplication>
-      <!-- Firefox -->
-      <Description>
-       <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
-       <em:minVersion>3.6</em:minVersion>
-       <em:maxVersion>9.*</em:maxVersion>
-     </Description>
-    </em:targetApplication>
-    <em:targetApplication>
-      <!-- Fennec -->
-      <Description>
-       <em:id>{a23983c0-fd0e-11dc-95ff-0800200c9a66}</em:id>
-       <em:minVersion>4.0</em:minVersion>
-       <em:maxVersion>9.*</em:maxVersion>
-      </Description>
-    </em:targetApplication>
-    <em:bootstrap>true</em:bootstrap>
-    <em:unpack>true</em:unpack>
-    <em:creator>Jos van den Oever</em:creator>
-    <em:description>OpenDocument Viewer</em:description>
-    <em:homepageURL>http://webodf.org/</em:homepageURL>
-  </Description>
-</RDF>
diff --git a/apps/files_odfviewer/src/webodf/programs/firefoxextension/packextension.js b/apps/files_odfviewer/src/webodf/programs/firefoxextension/packextension.js
deleted file mode 100644
index ce606817ea..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/firefoxextension/packextension.js
+++ /dev/null
@@ -1,77 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global runtime: true, core: true*/
-runtime.loadClass("core.Zip");
-runtime.loadClass("core.Base64");
-
-function addFiles(zip, pos, files, callback) {
-    "use strict";
-    if (pos >= files.length) {
-        zip.write(function (err) {
-            return callback(err);
-        });
-        return;
-    }
-    var path = files[pos];
-    runtime.readFile(path, "binary", function (err, data) {
-        var base64;
-        if (err) {
-            return callback(err);
-        }
-        if (path === "content/webodf.js") {
-            // replace eval() with evil(), since Firefox does not approve of it
-            base64 = new core.Base64();
-            data = base64.convertUTF8ArrayToUTF16String(data);
-            data = data.replace(new RegExp('eval\\(', 'g'), 'evil(');
-            data = runtime.byteArrayFromString(data);
-        }
-        zip.save(path, data, false, new Date());
-        addFiles(zip, pos + 1, files, callback);
-    });
-}
-
-var args = arguments,
-    filename = args[1],
-    zipmembers = [],
-    i,
-    zip = new core.Zip(filename, null);
-for (i = 2; i < arguments.length; i += 1) {
-    zipmembers.push(arguments[i]);
-}
-
-addFiles(zip, 0, zipmembers, function (err) {
-    "use strict";
-    if (err) {
-        runtime.log(err);
-    }
-});
diff --git a/apps/files_odfviewer/src/webodf/programs/firefoxextension/skin/default/icon.png b/apps/files_odfviewer/src/webodf/programs/firefoxextension/skin/default/icon.png
deleted file mode 100644
index 94d7d8da5d..0000000000
Binary files a/apps/files_odfviewer/src/webodf/programs/firefoxextension/skin/default/icon.png and /dev/null differ
diff --git a/apps/files_odfviewer/src/webodf/programs/ios/Default-Landscape~ipad.png b/apps/files_odfviewer/src/webodf/programs/ios/Default-Landscape~ipad.png
deleted file mode 100644
index 06bb96b394..0000000000
Binary files a/apps/files_odfviewer/src/webodf/programs/ios/Default-Landscape~ipad.png and /dev/null differ
diff --git a/apps/files_odfviewer/src/webodf/programs/ios/Default-Portrait~ipad.png b/apps/files_odfviewer/src/webodf/programs/ios/Default-Portrait~ipad.png
deleted file mode 100644
index dbfed967af..0000000000
Binary files a/apps/files_odfviewer/src/webodf/programs/ios/Default-Portrait~ipad.png and /dev/null differ
diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF.xcodeproj/project.pbxproj b/apps/files_odfviewer/src/webodf/programs/ios/WebODF.xcodeproj/project.pbxproj
deleted file mode 100644
index d4a76518f3..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/ios/WebODF.xcodeproj/project.pbxproj
+++ /dev/null
@@ -1,512 +0,0 @@
-// !$*UTF8*$!
-{
-	archiveVersion = 1;
-	classes = {
-	};
-	objectVersion = 46;
-	objects = {
-
-/* Begin PBXBuildFile section */
-		CB099EC714DAC535000D7B99 /* Default-Portrait~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = CB099EC614DAC535000D7B99 /* Default-Portrait~ipad.png */; };
-		CB099EC914DAC53D000D7B99 /* Default-Landscape~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = CB099EC814DAC53D000D7B99 /* Default-Landscape~ipad.png */; };
-		CB29ECBD14FFBBBB00CEAEE3 /* unzip.c in Sources */ = {isa = PBXBuildFile; fileRef = CB29ECBC14FFBBBB00CEAEE3 /* unzip.c */; };
-		CB29ECBF14FFBC0500CEAEE3 /* ioapi.c in Sources */ = {isa = PBXBuildFile; fileRef = CB29ECBE14FFBC0500CEAEE3 /* ioapi.c */; };
-		CB29ECC114FFBC1B00CEAEE3 /* mztools.c in Sources */ = {isa = PBXBuildFile; fileRef = CB29ECC014FFBC1B00CEAEE3 /* mztools.c */; };
-		CB29ECC314FFBC5500CEAEE3 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = CB29ECC214FFBC5500CEAEE3 /* libz.dylib */; };
-		CB36D11814F68F7F0084BECB /* www in Resources */ = {isa = PBXBuildFile; fileRef = CB36D11714F68F7F0084BECB /* www */; };
-		CB533D9114DABDA600C733F6 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CB533D9014DABDA600C733F6 /* Foundation.framework */; };
-		CB533D9314DABDA600C733F6 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CB533D9214DABDA600C733F6 /* UIKit.framework */; };
-		CB533D9514DABDA600C733F6 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CB533D9414DABDA600C733F6 /* CoreGraphics.framework */; };
-		CB533D9714DABDA600C733F6 /* AddressBook.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CB533D9614DABDA600C733F6 /* AddressBook.framework */; };
-		CB533D9914DABDA600C733F6 /* AddressBookUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CB533D9814DABDA600C733F6 /* AddressBookUI.framework */; };
-		CB533D9B14DABDA600C733F6 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CB533D9A14DABDA600C733F6 /* AudioToolbox.framework */; };
-		CB533D9D14DABDA600C733F6 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CB533D9C14DABDA600C733F6 /* AVFoundation.framework */; };
-		CB533D9F14DABDA600C733F6 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CB533D9E14DABDA600C733F6 /* CoreLocation.framework */; };
-		CB533DA114DABDA600C733F6 /* MediaPlayer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CB533DA014DABDA600C733F6 /* MediaPlayer.framework */; };
-		CB533DA314DABDA600C733F6 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CB533DA214DABDA600C733F6 /* QuartzCore.framework */; };
-		CB533DA514DABDA600C733F6 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CB533DA414DABDA600C733F6 /* SystemConfiguration.framework */; };
-		CB533DA714DABDA600C733F6 /* MobileCoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CB533DA614DABDA600C733F6 /* MobileCoreServices.framework */; };
-		CB533DA914DABDA600C733F6 /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CB533DA814DABDA600C733F6 /* CoreMedia.framework */; };
-		CB533DAF14DABDA600C733F6 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = CB533DAD14DABDA600C733F6 /* InfoPlist.strings */; };
-		CB533DB114DABDA600C733F6 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = CB533DB014DABDA600C733F6 /* main.m */; };
-		CB533DB414DABDA600C733F6 /* PhoneGap.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CB533DB314DABDA600C733F6 /* PhoneGap.framework */; };
-		CB533DB914DABDA600C733F6 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = CB533DB714DABDA600C733F6 /* Localizable.strings */; };
-		CB533DC014DABDA600C733F6 /* icon.png in Resources */ = {isa = PBXBuildFile; fileRef = CB533DBF14DABDA600C733F6 /* icon.png */; };
-		CB533DC214DABDA600C733F6 /* icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = CB533DC114DABDA600C733F6 /* icon@2x.png */; };
-		CB533DC414DABDA600C733F6 /* icon-72.png in Resources */ = {isa = PBXBuildFile; fileRef = CB533DC314DABDA600C733F6 /* icon-72.png */; };
-		CB533DC714DABDA600C733F6 /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = CB533DC614DABDA600C733F6 /* Default.png */; };
-		CB533DC914DABDA600C733F6 /* Default@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = CB533DC814DABDA600C733F6 /* Default@2x.png */; };
-		CB533DCD14DABDA600C733F6 /* PhoneGap.plist in Resources */ = {isa = PBXBuildFile; fileRef = CB533DCC14DABDA600C733F6 /* PhoneGap.plist */; };
-		CB533DD114DABDA600C733F6 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = CB533DD014DABDA600C733F6 /* AppDelegate.m */; };
-		CB533DD414DABDA600C733F6 /* MainViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CB533DD314DABDA600C733F6 /* MainViewController.m */; };
-		CB533DD614DABDA600C733F6 /* MainViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = CB533DD514DABDA600C733F6 /* MainViewController.xib */; };
-		CBD2B77314FF8E9700FC3A44 /* NativeZip.m in Sources */ = {isa = PBXBuildFile; fileRef = CBD2B77214FF8E9700FC3A44 /* NativeZip.m */; };
-		CBDCA69D1504EAEB00C706C7 /* WebViewCache.m in Sources */ = {isa = PBXBuildFile; fileRef = CBDCA69C1504EAEB00C706C7 /* WebViewCache.m */; };
-/* End PBXBuildFile section */
-
-/* Begin PBXFileReference section */
-		CB099EC614DAC535000D7B99 /* Default-Portrait~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default-Portrait~ipad.png"; path = "../Default-Portrait~ipad.png"; sourceTree = "<group>"; };
-		CB099EC814DAC53D000D7B99 /* Default-Landscape~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default-Landscape~ipad.png"; path = "../Default-Landscape~ipad.png"; sourceTree = "<group>"; };
-		CB29ECBC14FFBBBB00CEAEE3 /* unzip.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = unzip.c; path = WebODF/Classes/minizip/unzip.c; sourceTree = "<group>"; };
-		CB29ECBE14FFBC0500CEAEE3 /* ioapi.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ioapi.c; path = WebODF/Classes/minizip/ioapi.c; sourceTree = "<group>"; };
-		CB29ECC014FFBC1B00CEAEE3 /* mztools.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = mztools.c; path = WebODF/Classes/minizip/mztools.c; sourceTree = "<group>"; };
-		CB29ECC214FFBC5500CEAEE3 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
-		CB36D11714F68F7F0084BECB /* www */ = {isa = PBXFileReference; lastKnownFileType = folder; path = www; sourceTree = "<group>"; };
-		CB533D8C14DABDA500C733F6 /* KO Viewer.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "KO Viewer.app"; sourceTree = BUILT_PRODUCTS_DIR; };
-		CB533D9014DABDA600C733F6 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
-		CB533D9214DABDA600C733F6 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
-		CB533D9414DABDA600C733F6 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
-		CB533D9614DABDA600C733F6 /* AddressBook.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AddressBook.framework; path = System/Library/Frameworks/AddressBook.framework; sourceTree = SDKROOT; };
-		CB533D9814DABDA600C733F6 /* AddressBookUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AddressBookUI.framework; path = System/Library/Frameworks/AddressBookUI.framework; sourceTree = SDKROOT; };
-		CB533D9A14DABDA600C733F6 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
-		CB533D9C14DABDA600C733F6 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; };
-		CB533D9E14DABDA600C733F6 /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; };
-		CB533DA014DABDA600C733F6 /* MediaPlayer.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MediaPlayer.framework; path = System/Library/Frameworks/MediaPlayer.framework; sourceTree = SDKROOT; };
-		CB533DA214DABDA600C733F6 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
-		CB533DA414DABDA600C733F6 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
-		CB533DA614DABDA600C733F6 /* MobileCoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MobileCoreServices.framework; path = System/Library/Frameworks/MobileCoreServices.framework; sourceTree = SDKROOT; };
-		CB533DA814DABDA600C733F6 /* CoreMedia.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMedia.framework; path = System/Library/Frameworks/CoreMedia.framework; sourceTree = SDKROOT; };
-		CB533DAC14DABDA600C733F6 /* WebODF-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "WebODF-Info.plist"; sourceTree = "<group>"; };
-		CB533DAE14DABDA600C733F6 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		CB533DB014DABDA600C733F6 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
-		CB533DB214DABDA600C733F6 /* WebODF-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "WebODF-Prefix.pch"; sourceTree = "<group>"; };
-		CB533DB314DABDA600C733F6 /* PhoneGap.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = PhoneGap.framework; path = /Users/Shared/PhoneGap/Frameworks/PhoneGap.framework; sourceTree = "<absolute>"; };
-		CB533DB814DABDA600C733F6 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = Resources/en.lproj/Localizable.strings; sourceTree = "<group>"; };
-		CB533DBF14DABDA600C733F6 /* icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = icon.png; path = Resources/icons/icon.png; sourceTree = "<group>"; };
-		CB533DC114DABDA600C733F6 /* icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "icon@2x.png"; path = "Resources/icons/icon@2x.png"; sourceTree = "<group>"; };
-		CB533DC314DABDA600C733F6 /* icon-72.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "icon-72.png"; path = "Resources/icons/icon-72.png"; sourceTree = "<group>"; };
-		CB533DC614DABDA600C733F6 /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Default.png; path = Resources/splash/Default.png; sourceTree = "<group>"; };
-		CB533DC814DABDA600C733F6 /* Default@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default@2x.png"; path = "Resources/splash/Default@2x.png"; sourceTree = "<group>"; };
-		CB533DCC14DABDA600C733F6 /* PhoneGap.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = PhoneGap.plist; sourceTree = "<group>"; };
-		CB533DCF14DABDA600C733F6 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = Classes/AppDelegate.h; sourceTree = "<group>"; };
-		CB533DD014DABDA600C733F6 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = Classes/AppDelegate.m; sourceTree = "<group>"; };
-		CB533DD214DABDA600C733F6 /* MainViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = MainViewController.h; path = Classes/MainViewController.h; sourceTree = "<group>"; };
-		CB533DD314DABDA600C733F6 /* MainViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = MainViewController.m; path = Classes/MainViewController.m; sourceTree = "<group>"; };
-		CB533DD514DABDA600C733F6 /* MainViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = MainViewController.xib; path = Classes/MainViewController.xib; sourceTree = "<group>"; };
-		CBD2B77114FF8E9700FC3A44 /* NativeZip.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NativeZip.h; path = Classes/NativeZip.h; sourceTree = "<group>"; };
-		CBD2B77214FF8E9700FC3A44 /* NativeZip.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NativeZip.m; path = Classes/NativeZip.m; sourceTree = "<group>"; };
-		CBDCA69B1504EAEB00C706C7 /* WebViewCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebViewCache.h; path = Classes/WebViewCache.h; sourceTree = "<group>"; };
-		CBDCA69C1504EAEB00C706C7 /* WebViewCache.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = WebViewCache.m; path = Classes/WebViewCache.m; sourceTree = "<group>"; };
-/* End PBXFileReference section */
-
-/* Begin PBXFrameworksBuildPhase section */
-		CB533D8614DABDA500C733F6 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				CB29ECC314FFBC5500CEAEE3 /* libz.dylib in Frameworks */,
-				CB533D9114DABDA600C733F6 /* Foundation.framework in Frameworks */,
-				CB533D9314DABDA600C733F6 /* UIKit.framework in Frameworks */,
-				CB533D9514DABDA600C733F6 /* CoreGraphics.framework in Frameworks */,
-				CB533D9714DABDA600C733F6 /* AddressBook.framework in Frameworks */,
-				CB533D9914DABDA600C733F6 /* AddressBookUI.framework in Frameworks */,
-				CB533D9B14DABDA600C733F6 /* AudioToolbox.framework in Frameworks */,
-				CB533D9D14DABDA600C733F6 /* AVFoundation.framework in Frameworks */,
-				CB533D9F14DABDA600C733F6 /* CoreLocation.framework in Frameworks */,
-				CB533DA114DABDA600C733F6 /* MediaPlayer.framework in Frameworks */,
-				CB533DA314DABDA600C733F6 /* QuartzCore.framework in Frameworks */,
-				CB533DA514DABDA600C733F6 /* SystemConfiguration.framework in Frameworks */,
-				CB533DA714DABDA600C733F6 /* MobileCoreServices.framework in Frameworks */,
-				CB533DA914DABDA600C733F6 /* CoreMedia.framework in Frameworks */,
-				CB533DB414DABDA600C733F6 /* PhoneGap.framework in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		CB533D8914DABDA500C733F6 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXFrameworksBuildPhase section */
-
-/* Begin PBXGroup section */
-		CB533D7E14DABDA500C733F6 = {
-			isa = PBXGroup;
-			children = (
-				CB29ECC214FFBC5500CEAEE3 /* libz.dylib */,
-				CB29ECC014FFBC1B00CEAEE3 /* mztools.c */,
-				CB29ECBE14FFBC0500CEAEE3 /* ioapi.c */,
-				CB29ECBC14FFBBBB00CEAEE3 /* unzip.c */,
-				CB36D11714F68F7F0084BECB /* www */,
-				CB533DAA14DABDA600C733F6 /* WebODF */,
-				CB533D8F14DABDA500C733F6 /* Frameworks */,
-				CB533D8D14DABDA500C733F6 /* Products */,
-			);
-			sourceTree = "<group>";
-		};
-		CB533D8D14DABDA500C733F6 /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				CB533D8C14DABDA500C733F6 /* KO Viewer.app */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-		CB533D8F14DABDA500C733F6 /* Frameworks */ = {
-			isa = PBXGroup;
-			children = (
-				CB533D9014DABDA600C733F6 /* Foundation.framework */,
-				CB533D9214DABDA600C733F6 /* UIKit.framework */,
-				CB533D9414DABDA600C733F6 /* CoreGraphics.framework */,
-				CB533D9614DABDA600C733F6 /* AddressBook.framework */,
-				CB533D9814DABDA600C733F6 /* AddressBookUI.framework */,
-				CB533D9A14DABDA600C733F6 /* AudioToolbox.framework */,
-				CB533D9C14DABDA600C733F6 /* AVFoundation.framework */,
-				CB533D9E14DABDA600C733F6 /* CoreLocation.framework */,
-				CB533DA014DABDA600C733F6 /* MediaPlayer.framework */,
-				CB533DA214DABDA600C733F6 /* QuartzCore.framework */,
-				CB533DA414DABDA600C733F6 /* SystemConfiguration.framework */,
-				CB533DA614DABDA600C733F6 /* MobileCoreServices.framework */,
-				CB533DA814DABDA600C733F6 /* CoreMedia.framework */,
-			);
-			name = Frameworks;
-			sourceTree = "<group>";
-		};
-		CB533DAA14DABDA600C733F6 /* WebODF */ = {
-			isa = PBXGroup;
-			children = (
-				CB533DB314DABDA600C733F6 /* PhoneGap.framework */,
-				CB533DB514DABDA600C733F6 /* Resources */,
-				CB533DCE14DABDA600C733F6 /* Classes */,
-				CB533DAB14DABDA600C733F6 /* Supporting Files */,
-			);
-			path = WebODF;
-			sourceTree = "<group>";
-		};
-		CB533DAB14DABDA600C733F6 /* Supporting Files */ = {
-			isa = PBXGroup;
-			children = (
-				CB533DAC14DABDA600C733F6 /* WebODF-Info.plist */,
-				CB533DAD14DABDA600C733F6 /* InfoPlist.strings */,
-				CB533DB014DABDA600C733F6 /* main.m */,
-				CB533DB214DABDA600C733F6 /* WebODF-Prefix.pch */,
-				CB533DCC14DABDA600C733F6 /* PhoneGap.plist */,
-				CB533DD514DABDA600C733F6 /* MainViewController.xib */,
-			);
-			name = "Supporting Files";
-			sourceTree = "<group>";
-		};
-		CB533DB514DABDA600C733F6 /* Resources */ = {
-			isa = PBXGroup;
-			children = (
-				CB533DB614DABDA600C733F6 /* en.lproj */,
-				CB533DBE14DABDA600C733F6 /* icons */,
-				CB533DC514DABDA600C733F6 /* splash */,
-			);
-			name = Resources;
-			sourceTree = "<group>";
-		};
-		CB533DB614DABDA600C733F6 /* en.lproj */ = {
-			isa = PBXGroup;
-			children = (
-				CB533DB714DABDA600C733F6 /* Localizable.strings */,
-			);
-			name = en.lproj;
-			sourceTree = "<group>";
-		};
-		CB533DBE14DABDA600C733F6 /* icons */ = {
-			isa = PBXGroup;
-			children = (
-				CB533DBF14DABDA600C733F6 /* icon.png */,
-				CB533DC114DABDA600C733F6 /* icon@2x.png */,
-				CB533DC314DABDA600C733F6 /* icon-72.png */,
-			);
-			name = icons;
-			sourceTree = "<group>";
-		};
-		CB533DC514DABDA600C733F6 /* splash */ = {
-			isa = PBXGroup;
-			children = (
-				CB099EC814DAC53D000D7B99 /* Default-Landscape~ipad.png */,
-				CB099EC614DAC535000D7B99 /* Default-Portrait~ipad.png */,
-				CB533DC614DABDA600C733F6 /* Default.png */,
-				CB533DC814DABDA600C733F6 /* Default@2x.png */,
-			);
-			name = splash;
-			sourceTree = "<group>";
-		};
-		CB533DCE14DABDA600C733F6 /* Classes */ = {
-			isa = PBXGroup;
-			children = (
-				CBDCA69B1504EAEB00C706C7 /* WebViewCache.h */,
-				CBDCA69C1504EAEB00C706C7 /* WebViewCache.m */,
-				CB533DCF14DABDA600C733F6 /* AppDelegate.h */,
-				CB533DD014DABDA600C733F6 /* AppDelegate.m */,
-				CB533DD214DABDA600C733F6 /* MainViewController.h */,
-				CB533DD314DABDA600C733F6 /* MainViewController.m */,
-				CBD2B77114FF8E9700FC3A44 /* NativeZip.h */,
-				CBD2B77214FF8E9700FC3A44 /* NativeZip.m */,
-			);
-			name = Classes;
-			sourceTree = "<group>";
-		};
-/* End PBXGroup section */
-
-/* Begin PBXNativeTarget section */
-		CB533D8B14DABDA500C733F6 /* KO Viewer */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = CB533DDB14DABDA600C733F6 /* Build configuration list for PBXNativeTarget "KO Viewer" */;
-			buildPhases = (
-				CB533D8514DABDA500C733F6 /* Sources */,
-				CB533D8614DABDA500C733F6 /* Frameworks */,
-				CB533D8714DABDA500C733F6 /* Resources */,
-				CB533D8814DABDA500C733F6 /* Sources */,
-				CB533D8914DABDA500C733F6 /* Frameworks */,
-				CB533D8A14DABDA500C733F6 /* ShellScript */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = "KO Viewer";
-			productName = WebODF;
-			productReference = CB533D8C14DABDA500C733F6 /* KO Viewer.app */;
-			productType = "com.apple.product-type.application";
-		};
-/* End PBXNativeTarget section */
-
-/* Begin PBXProject section */
-		CB533D8014DABDA500C733F6 /* Project object */ = {
-			isa = PBXProject;
-			attributes = {
-				LastUpgradeCheck = 0420;
-			};
-			buildConfigurationList = CB533D8314DABDA500C733F6 /* Build configuration list for PBXProject "WebODF" */;
-			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
-			hasScannedForEncodings = 0;
-			knownRegions = (
-				en,
-				es,
-			);
-			mainGroup = CB533D7E14DABDA500C733F6;
-			productRefGroup = CB533D8D14DABDA500C733F6 /* Products */;
-			projectDirPath = "";
-			projectRoot = "";
-			targets = (
-				CB533D8B14DABDA500C733F6 /* KO Viewer */,
-			);
-		};
-/* End PBXProject section */
-
-/* Begin PBXResourcesBuildPhase section */
-		CB533D8714DABDA500C733F6 /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				CB533DAF14DABDA600C733F6 /* InfoPlist.strings in Resources */,
-				CB533DB914DABDA600C733F6 /* Localizable.strings in Resources */,
-				CB533DC014DABDA600C733F6 /* icon.png in Resources */,
-				CB533DC214DABDA600C733F6 /* icon@2x.png in Resources */,
-				CB533DC414DABDA600C733F6 /* icon-72.png in Resources */,
-				CB533DC714DABDA600C733F6 /* Default.png in Resources */,
-				CB533DC914DABDA600C733F6 /* Default@2x.png in Resources */,
-				CB533DCD14DABDA600C733F6 /* PhoneGap.plist in Resources */,
-				CB533DD614DABDA600C733F6 /* MainViewController.xib in Resources */,
-				CB099EC714DAC535000D7B99 /* Default-Portrait~ipad.png in Resources */,
-				CB099EC914DAC53D000D7B99 /* Default-Landscape~ipad.png in Resources */,
-				CB36D11814F68F7F0084BECB /* www in Resources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXResourcesBuildPhase section */
-
-/* Begin PBXShellScriptBuildPhase section */
-		CB533D8A14DABDA500C733F6 /* ShellScript */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/bash;
-			shellScript = "rsync -a ../touchui/app/ www/app/\ncp ../../webodf/webodf.css www/\ncp ../touchui/sencha-touch.* www/\ncp ../touchui/Zoom*.png www/\nif [ ! -e www/webodf.js ]; then\n    # webodf.js should be built\n    if [ ! -e build ]; then mkdir build; fi\n    cd build\n    cmake -G Xcode ../../.. && make && cp webodf/webodf.js ..\n    if [ ! -e webodf.js ]; then\n        echo \"put webodf.js in the ios/www directory\"\n        exit 1;\n    fi\nfi\n";
-		};
-/* End PBXShellScriptBuildPhase section */
-
-/* Begin PBXSourcesBuildPhase section */
-		CB533D8514DABDA500C733F6 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				CB533DB114DABDA600C733F6 /* main.m in Sources */,
-				CB533DD114DABDA600C733F6 /* AppDelegate.m in Sources */,
-				CB533DD414DABDA600C733F6 /* MainViewController.m in Sources */,
-				CBD2B77314FF8E9700FC3A44 /* NativeZip.m in Sources */,
-				CB29ECBD14FFBBBB00CEAEE3 /* unzip.c in Sources */,
-				CB29ECBF14FFBC0500CEAEE3 /* ioapi.c in Sources */,
-				CB29ECC114FFBC1B00CEAEE3 /* mztools.c in Sources */,
-				CBDCA69D1504EAEB00C706C7 /* WebViewCache.m in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		CB533D8814DABDA500C733F6 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXSourcesBuildPhase section */
-
-/* Begin PBXVariantGroup section */
-		CB533DAD14DABDA600C733F6 /* InfoPlist.strings */ = {
-			isa = PBXVariantGroup;
-			children = (
-				CB533DAE14DABDA600C733F6 /* en */,
-			);
-			name = InfoPlist.strings;
-			sourceTree = "<group>";
-		};
-		CB533DB714DABDA600C733F6 /* Localizable.strings */ = {
-			isa = PBXVariantGroup;
-			children = (
-				CB533DB814DABDA600C733F6 /* en */,
-			);
-			name = Localizable.strings;
-			sourceTree = "<group>";
-		};
-/* End PBXVariantGroup section */
-
-/* Begin XCBuildConfiguration section */
-		CB533DD914DABDA600C733F6 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
-				CLANG_ENABLE_OBJC_ARC = YES;
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				COPY_PHASE_STRIP = NO;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"DEBUG=1",
-					"$(inherited)",
-				);
-				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
-				GCC_VERSION = com.apple.compilers.llvmgcc42;
-				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 3.0;
-				SDKROOT = iphoneos;
-			};
-			name = Debug;
-		};
-		CB533DDA14DABDA600C733F6 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
-				CLANG_ENABLE_OBJC_ARC = YES;
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				COPY_PHASE_STRIP = YES;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_VERSION = com.apple.compilers.llvmgcc42;
-				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 3.0;
-				SDKROOT = iphoneos;
-				VALIDATE_PRODUCT = YES;
-			};
-			name = Release;
-		};
-		CB533DDC14DABDA600C733F6 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = YES;
-				CODE_SIGN_IDENTITY = "iPhone Developer: Jos van den Oever (GJ9RDPR233)";
-				COPY_PHASE_STRIP = NO;
-				FRAMEWORK_SEARCH_PATHS = /Users/Shared/PhoneGap/Frameworks;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = "WebODF/WebODF-Prefix.pch";
-				GCC_PREPROCESSOR_DEFINITIONS = "PHONEGAP_FRAMEWORK=YES";
-				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
-				INFOPLIST_FILE = "WebODF/WebODF-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 5.0;
-				OTHER_LDFLAGS = (
-					"-weak_framework",
-					UIKit,
-					"-weak_framework",
-					AVFoundation,
-					"-weak_framework",
-					CoreMedia,
-					"-weak_library",
-					/usr/lib/libSystem.B.dylib,
-				);
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE = "8A253628-DC77-4EEA-8543-53315AA93987";
-				TARGETED_DEVICE_FAMILY = "1,2";
-				WRAPPER_EXTENSION = app;
-			};
-			name = Debug;
-		};
-		CB533DDD14DABDA600C733F6 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = YES;
-				ARCHS = (
-					armv6,
-					"$(ARCHS_STANDARD_32_BIT)",
-				);
-				CODE_SIGN_IDENTITY = "iPhone Developer: Jos van den Oever (GJ9RDPR233)";
-				COPY_PHASE_STRIP = YES;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				FRAMEWORK_SEARCH_PATHS = /Users/Shared/PhoneGap/Frameworks;
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = "WebODF/WebODF-Prefix.pch";
-				GCC_PREPROCESSOR_DEFINITIONS = "PHONEGAP_FRAMEWORK=YES";
-				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
-				INFOPLIST_FILE = "WebODF/WebODF-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 5.0;
-				OTHER_LDFLAGS = (
-					"-weak_framework",
-					UIKit,
-					"-weak_framework",
-					AVFoundation,
-					"-weak_framework",
-					CoreMedia,
-					"-weak_library",
-					/usr/lib/libSystem.B.dylib,
-				);
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE = "8A253628-DC77-4EEA-8543-53315AA93987";
-				TARGETED_DEVICE_FAMILY = "1,2";
-				VALIDATE_PRODUCT = YES;
-				WRAPPER_EXTENSION = app;
-			};
-			name = Release;
-		};
-/* End XCBuildConfiguration section */
-
-/* Begin XCConfigurationList section */
-		CB533D8314DABDA500C733F6 /* Build configuration list for PBXProject "WebODF" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				CB533DD914DABDA600C733F6 /* Debug */,
-				CB533DDA14DABDA600C733F6 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		CB533DDB14DABDA600C733F6 /* Build configuration list for PBXNativeTarget "KO Viewer" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				CB533DDC14DABDA600C733F6 /* Debug */,
-				CB533DDD14DABDA600C733F6 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-/* End XCConfigurationList section */
-	};
-	rootObject = CB533D8014DABDA500C733F6 /* Project object */;
-}
diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/AppDelegate.h b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/AppDelegate.h
deleted file mode 100644
index e2e93b0d9e..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/AppDelegate.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
- 
- http://www.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-//
-//  AppDelegate.h
-//  WebODF
-//
-//  Created by KO GmbH on 2/2/12.
-//  Copyright __MyCompanyName__ 2012. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-#ifdef PHONEGAP_FRAMEWORK
-    #import <PhoneGap/PGViewController.h>
-#else
-    #import "PGViewController.h"
-#endif
-
-
-@interface AppDelegate : NSObject < UIApplicationDelegate, UIWebViewDelegate, PGCommandDelegate > {
-
-	NSString* invokeString;
-}
-
-// invoke string is passed to your app on launch, this is only valid if you 
-// edit FooBar.plist to add a protocol
-// a simple tutorial can be found here : 
-// http://iphonedevelopertips.com/cocoa/launching-your-own-application-via-a-custom-url-scheme.html
-
-@property (nonatomic, copy)  NSString* invokeString;
-@property (nonatomic, retain) IBOutlet UIWindow* window;
-@property (nonatomic, retain) IBOutlet PGViewController* viewController;
-
-@end
-
diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/AppDelegate.m b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/AppDelegate.m
deleted file mode 100644
index 6845e95349..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/AppDelegate.m
+++ /dev/null
@@ -1,202 +0,0 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
- 
- http://www.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-//
-//  AppDelegate.m
-//  WebODF
-//
-//  Created by KO GmbH on 2/2/12.
-//  Copyright __MyCompanyName__ 2012. All rights reserved.
-//
-
-#import "AppDelegate.h"
-#import "MainViewController.h"
-
-#ifdef PHONEGAP_FRAMEWORK
-    #import <PhoneGap/PGPlugin.h>
-    #import <PhoneGap/PGURLProtocol.h>
-#else
-    #import "PGPlugin.h"
-    #import "PGURLProtocol.h"
-#endif
-#import "WebViewCache.h"
-
-
-@implementation AppDelegate
-
-@synthesize invokeString, window, viewController;
-
-- (id) init
-{	
-	/** If you need to do any extra app-specific initialization, you can do it here
-	 *  -jm
-	 **/
-    NSHTTPCookieStorage *cookieStorage = [NSHTTPCookieStorage sharedHTTPCookieStorage]; 
-    [cookieStorage setCookieAcceptPolicy:NSHTTPCookieAcceptPolicyAlways];
-    
-    [PGURLProtocol registerPGHttpURLProtocol];
-    
-    return [super init];
-}
-
-#pragma UIApplicationDelegate implementation
-
-/**
- * This is main kick off after the app inits, the views and Settings are setup here. (preferred - iOS4 and up)
- */
-- (BOOL) application:(UIApplication*)application didFinishLaunchingWithOptions:(NSDictionary*)launchOptions
-{    
-    NSURL* url = [launchOptions objectForKey:UIApplicationLaunchOptionsURLKey];
-    if (url && [url isKindOfClass:[NSURL class]]) {
-        self.invokeString = [url absoluteString];
-		NSLog(@"WebODF launchOptions = %@", url);
-    }    
-    
-    CGRect screenBounds = [[UIScreen mainScreen] bounds];
-    self.window = [[UIWindow alloc] initWithFrame:screenBounds];
-    self.window.autoresizesSubviews = YES;
-    
-    CGRect viewBounds = [[UIScreen mainScreen] applicationFrame];
-    
-    self.viewController = [[MainViewController alloc] init];
-    self.viewController.useSplashScreen = YES;
-    self.viewController.wwwFolderName = @"www";
-    self.viewController.startPage = @"index.html";
-    self.viewController.view.frame = viewBounds;
-    
-    // over-ride delegates
-    self.viewController.webView.delegate = self;
-    self.viewController.commandDelegate = self;
-
-    // check whether the current orientation is supported: if it is, keep it, rather than forcing a rotation
-    BOOL forceStartupRotation = YES;
-    UIDeviceOrientation curDevOrientation = [[UIDevice currentDevice] orientation];
-    
-    if (UIDeviceOrientationUnknown == curDevOrientation) {
-        // UIDevice isn't firing orientation notifications yet… go look at the status bar
-        curDevOrientation = (UIDeviceOrientation)[[UIApplication sharedApplication] statusBarOrientation];
-    }
-    
-    if (UIDeviceOrientationIsValidInterfaceOrientation(curDevOrientation)) {
-        for (NSNumber *orient in self.viewController.supportedOrientations) {
-            if ([orient intValue] == curDevOrientation) {
-                forceStartupRotation = NO;
-                break;
-            }
-        }
-    }
-    
-    if (forceStartupRotation) {
-        NSLog(@"supportedOrientations: %@", self.viewController.supportedOrientations);
-        // The first item in the supportedOrientations array is the start orientation (guaranteed to be at least Portrait)
-        UIInterfaceOrientation newOrient = [[self.viewController.supportedOrientations objectAtIndex:0] intValue];
-        NSLog(@"AppDelegate forcing status bar to: %d from: %d", newOrient, curDevOrientation);
-        [[UIApplication sharedApplication] setStatusBarOrientation:newOrient];
-    }
-    
-    [self.window addSubview:self.viewController.view];
-    [self.window makeKeyAndVisible];
-    
-    
-    NSString *path = @"./cache";
-    NSUInteger discCapacity = 1*1024*1024;
-    NSUInteger memoryCapacity = 0*1024*1024;
-    
-    WebViewCache *cache =
-    [[WebViewCache alloc] initWithMemoryCapacity: memoryCapacity
-                                        diskCapacity: discCapacity diskPath:path];
-    [NSURLCache setSharedURLCache:cache];
-
-    
-    return YES;
-}
-
-// this happens while we are running ( in the background, or from within our own app )
-// only valid if FooBar.plist specifies a protocol to handle
-- (BOOL) application:(UIApplication*)application handleOpenURL:(NSURL*)url 
-{
-    if (!url) { 
-        return NO; 
-    }
-    
-	// calls into javascript global function 'handleOpenURL'
-    NSString* jsString = [NSString stringWithFormat:@"handleOpenURL(\"%@\");", url];
-    [self.viewController.webView stringByEvaluatingJavaScriptFromString:jsString];
-    
-    // all plugins will get the notification, and their handlers will be called 
-    [[NSNotificationCenter defaultCenter] postNotification:[NSNotification notificationWithName:PGPluginHandleOpenURLNotification object:url]];
-    
-    return YES;    
-}
-
-#pragma PGCommandDelegate implementation
-
-- (id) getCommandInstance:(NSString*)className
-{
-	return [self.viewController getCommandInstance:className];
-}
-
-- (BOOL) execute:(InvokedUrlCommand*)command
-{
-	return [self.viewController execute:command];
-}
-
-- (NSString*) pathForResource:(NSString*)resourcepath;
-{
-	return [self.viewController pathForResource:resourcepath];
-}
-
-#pragma UIWebDelegate implementation
-
-- (void) webViewDidFinishLoad:(UIWebView*) theWebView 
-{
-	// only valid if FooBar.plist specifies a protocol to handle
-	if (self.invokeString)
-	{
-		// this is passed before the deviceready event is fired, so you can access it in js when you receive deviceready
-		NSString* jsString = [NSString stringWithFormat:@"var invokeString = \"%@\";", self.invokeString];
-		[theWebView stringByEvaluatingJavaScriptFromString:jsString];
-	}
-	
-	 // Black base color for background matches the native apps
-   	theWebView.backgroundColor = [UIColor blackColor];
-    
-	return [self.viewController webViewDidFinishLoad:theWebView];
-}
-
-- (void) webViewDidStartLoad:(UIWebView*)theWebView 
-{
-	return [self.viewController webViewDidStartLoad:theWebView];
-}
-
-- (void) webView:(UIWebView*)theWebView didFailLoadWithError:(NSError*)error 
-{
-	return [self.viewController webView:theWebView didFailLoadWithError:error];
-}
-
-- (BOOL) webView:(UIWebView*)theWebView shouldStartLoadWithRequest:(NSURLRequest*)request navigationType:(UIWebViewNavigationType)navigationType
-{
-	return [self.viewController webView:theWebView shouldStartLoadWithRequest:request navigationType:navigationType];
-}
-
-- (void) dealloc
-{
-}
-
-@end
diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/MainViewController.h b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/MainViewController.h
deleted file mode 100644
index 33ddbc2103..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/MainViewController.h
+++ /dev/null
@@ -1,17 +0,0 @@
-//
-//  MainViewController.h
-//  FooBar
-//
-//  Created by Shazron Abdullah on 12-01-26.
-//  Copyright (c) 2012 __MyCompanyName__. All rights reserved.
-//
-
-#ifdef PHONEGAP_FRAMEWORK
-    #import <PhoneGap/PGViewController.h>
-#else
-    #import "PGViewController.h"
-#endif
-
-@interface MainViewController : PGViewController
-
-@end
diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/MainViewController.m b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/MainViewController.m
deleted file mode 100644
index 550e4b25c2..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/MainViewController.m
+++ /dev/null
@@ -1,47 +0,0 @@
-//
-//  MainViewController.m
-//  WebODF
-//
-#import "MainViewController.h"
-
-@implementation MainViewController
-
-- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
-{
-    self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
-    if (self) {
-        // Custom initialization
-    }
-    return self;
-}
-
-- (void)didReceiveMemoryWarning
-{
-    // Releases the view if it doesn't have a superview.
-    [super didReceiveMemoryWarning];
-    
-    // Release any cached data, images, etc that aren't in use.
-}
-
-#pragma mark - View lifecycle
-
-- (void)viewDidLoad
-{
-    [super viewDidLoad];
-    // Do any additional setup after loading the view from its nib.
-}
-
-- (void)viewDidUnload
-{
-    [super viewDidUnload];
-    // Release any retained subviews of the main view.
-    // e.g. self.myOutlet = nil;
-}
-
-- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation
-{
-    // Return YES for supported orientations
-    return (interfaceOrientation == UIInterfaceOrientationPortrait);
-}
-
-@end
diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/MainViewController.xib b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/MainViewController.xib
deleted file mode 100644
index 9837f578ca..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/MainViewController.xib
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
-	<data>
-		<int key="IBDocument.SystemTarget">1280</int>
-		<string key="IBDocument.SystemVersion">11C25</string>
-		<string key="IBDocument.InterfaceBuilderVersion">1919</string>
-		<string key="IBDocument.AppKitVersion">1138.11</string>
-		<string key="IBDocument.HIToolboxVersion">566.00</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-			<string key="NS.object.0">916</string>
-		</object>
-		<array key="IBDocument.IntegratedClassDependencies">
-			<string>IBProxyObject</string>
-			<string>IBUIView</string>
-		</array>
-		<array key="IBDocument.PluginDependencies">
-			<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-		</array>
-		<object class="NSMutableDictionary" key="IBDocument.Metadata">
-			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
-			<integer value="1" key="NS.object.0"/>
-		</object>
-		<array class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
-			<object class="IBProxyObject" id="372490531">
-				<string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
-				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-			</object>
-			<object class="IBProxyObject" id="975951072">
-				<string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
-				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-			</object>
-			<object class="IBUIView" id="191373211">
-				<reference key="NSNextResponder"/>
-				<int key="NSvFlags">274</int>
-				<string key="NSFrame">{{0, 20}, {320, 460}}</string>
-				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
-				<object class="NSColor" key="IBUIBackgroundColor">
-					<int key="NSColorSpace">3</int>
-					<bytes key="NSWhite">MQA</bytes>
-					<object class="NSColorSpace" key="NSCustomColorSpace">
-						<int key="NSID">2</int>
-					</object>
-				</object>
-				<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
-				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-			</object>
-		</array>
-		<object class="IBObjectContainer" key="IBDocument.Objects">
-			<array class="NSMutableArray" key="connectionRecords">
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">view</string>
-						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="191373211"/>
-					</object>
-					<int key="connectionID">3</int>
-				</object>
-			</array>
-			<object class="IBMutableOrderedSet" key="objectRecords">
-				<array key="orderedObjects">
-					<object class="IBObjectRecord">
-						<int key="objectID">0</int>
-						<array key="object" id="0"/>
-						<reference key="children" ref="1000"/>
-						<nil key="parent"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1</int>
-						<reference key="object" ref="191373211"/>
-						<reference key="parent" ref="0"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-1</int>
-						<reference key="object" ref="372490531"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">File's Owner</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-2</int>
-						<reference key="object" ref="975951072"/>
-						<reference key="parent" ref="0"/>
-					</object>
-				</array>
-			</object>
-			<dictionary class="NSMutableDictionary" key="flattenedProperties">
-				<string key="-1.CustomClassName">MainViewController</string>
-				<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="-2.CustomClassName">UIResponder</string>
-				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-			</dictionary>
-			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
-			<nil key="activeLocalization"/>
-			<dictionary class="NSMutableDictionary" key="localizations"/>
-			<nil key="sourceID"/>
-			<int key="maxID">3</int>
-		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<object class="IBPartialClassDescription">
-					<string key="className">MainViewController</string>
-					<string key="superclassName">UIViewController</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/MainViewController.h</string>
-					</object>
-				</object>
-			</array>
-		</object>
-		<int key="IBDocument.localizationMode">0</int>
-		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
-		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
-		<int key="IBDocument.defaultPropertyAccessControl">3</int>
-		<string key="IBCocoaTouchPluginVersion">916</string>
-	</data>
-</archive>
diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/NSData+Base64.h b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/NSData+Base64.h
deleted file mode 100644
index eb1ff485a7..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/NSData+Base64.h
+++ /dev/null
@@ -1,33 +0,0 @@
-//
-//  NSData+Base64.h
-//  base64
-//
-//  Created by Matt Gallagher on 2009/06/03.
-//  Copyright 2009 Matt Gallagher. All rights reserved.
-//
-//  Permission is given to use this source code file, free of charge, in any
-//  project, commercial or otherwise, entirely at your risk, with the condition
-//  that any redistribution (in part or whole) of source code must retain
-//  this copyright and permission notice. Attribution in compiled projects is
-//  appreciated but not required.
-//
-
-#import <Foundation/Foundation.h>
-
-void *NewBase64Decode(
-	const char *inputBuffer,
-	size_t length,
-	size_t *outputLength);
-
-char *NewBase64Encode(
-	const void *inputBuffer,
-	size_t length,
-	bool separateLines,
-	size_t *outputLength);
-
-@interface NSData (Base64)
-
-+ (NSData *)dataFromBase64String:(NSString *)aString;
-- (NSString *)base64EncodedString;
-
-@end
diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/NSData+Base64.m b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/NSData+Base64.m
deleted file mode 100644
index 13f828d09c..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/NSData+Base64.m
+++ /dev/null
@@ -1,299 +0,0 @@
-//
-//  NSData+Base64.m
-//  base64
-//
-//  Created by Matt Gallagher on 2009/06/03.
-//  Copyright 2009 Matt Gallagher. All rights reserved.
-//
-//  Permission is given to use this source code file, free of charge, in any
-//  project, commercial or otherwise, entirely at your risk, with the condition
-//  that any redistribution (in part or whole) of source code must retain
-//  this copyright and permission notice. Attribution in compiled projects is
-//  appreciated but not required.
-//
-
-#import "NSData+Base64.h"
-
-//
-// Mapping from 6 bit pattern to ASCII character.
-//
-static unsigned char base64EncodeLookup[65] =
-	"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-
-//
-// Definition for "masked-out" areas of the base64DecodeLookup mapping
-//
-#define xx 65
-
-//
-// Mapping from ASCII character to 6 bit pattern.
-//
-static unsigned char base64DecodeLookup[256] =
-{
-    xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, 
-    xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, 
-    xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, 62, xx, xx, xx, 63, 
-    52, 53, 54, 55, 56, 57, 58, 59, 60, 61, xx, xx, xx, xx, xx, xx, 
-    xx,  0,  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, xx, xx, xx, xx, xx, 
-    xx, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 
-    41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, xx, xx, xx, xx, xx, 
-    xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, 
-    xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, 
-    xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, 
-    xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, 
-    xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, 
-    xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, 
-    xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, 
-    xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, 
-};
-
-//
-// Fundamental sizes of the binary and base64 encode/decode units in bytes
-//
-#define BINARY_UNIT_SIZE 3
-#define BASE64_UNIT_SIZE 4
-
-//
-// NewBase64Decode
-//
-// Decodes the base64 ASCII string in the inputBuffer to a newly malloced
-// output buffer.
-//
-//  inputBuffer - the source ASCII string for the decode
-//	length - the length of the string or -1 (to specify strlen should be used)
-//	outputLength - if not-NULL, on output will contain the decoded length
-//
-// returns the decoded buffer. Must be free'd by caller. Length is given by
-//	outputLength.
-//
-void *NewBase64Decode(
-	const char *inputBuffer,
-	size_t length,
-	size_t *outputLength)
-{
-	if (length == -1)
-	{
-		length = strlen(inputBuffer);
-	}
-	
-	size_t outputBufferSize = (length / BASE64_UNIT_SIZE) * BINARY_UNIT_SIZE;
-	unsigned char *outputBuffer = (unsigned char *)malloc(outputBufferSize);
-	
-	size_t i = 0;
-	size_t j = 0;
-	while (i < length)
-	{
-		//
-		// Accumulate 4 valid characters (ignore everything else)
-		//
-		unsigned char accumulated[BASE64_UNIT_SIZE];
-		bzero(accumulated, sizeof(unsigned char) * BASE64_UNIT_SIZE);
-		size_t accumulateIndex = 0;
-		while (i < length)
-		{
-			unsigned char decode = base64DecodeLookup[inputBuffer[i++]];
-			if (decode != xx)
-			{
-				accumulated[accumulateIndex] = decode;
-				accumulateIndex++;
-				
-				if (accumulateIndex == BASE64_UNIT_SIZE)
-				{
-					break;
-				}
-			}
-		}
-		
-		//
-		// Store the 6 bits from each of the 4 characters as 3 bytes
-		//
-		outputBuffer[j] = (accumulated[0] << 2) | (accumulated[1] >> 4);
-		outputBuffer[j + 1] = (accumulated[1] << 4) | (accumulated[2] >> 2);
-		outputBuffer[j + 2] = (accumulated[2] << 6) | accumulated[3];
-		j += accumulateIndex - 1;
-	}
-	
-	if (outputLength)
-	{
-		*outputLength = j;
-	}
-	return outputBuffer;
-}
-
-//
-// NewBase64Decode
-//
-// Encodes the arbitrary data in the inputBuffer as base64 into a newly malloced
-// output buffer.
-//
-//  inputBuffer - the source data for the encode
-//	length - the length of the input in bytes
-//  separateLines - if zero, no CR/LF characters will be added. Otherwise
-//		a CR/LF pair will be added every 64 encoded chars.
-//	outputLength - if not-NULL, on output will contain the encoded length
-//		(not including terminating 0 char)
-//
-// returns the encoded buffer. Must be free'd by caller. Length is given by
-//	outputLength.
-//
-char *NewBase64Encode(
-	const void *buffer,
-	size_t length,
-	bool separateLines,
-	size_t *outputLength)
-{
-	const unsigned char *inputBuffer = (const unsigned char *)buffer;
-	
-	#define MAX_NUM_PADDING_CHARS 2
-	#define OUTPUT_LINE_LENGTH 64
-	#define INPUT_LINE_LENGTH ((OUTPUT_LINE_LENGTH / BASE64_UNIT_SIZE) * BINARY_UNIT_SIZE)
-	#define CR_LF_SIZE 0
-	
-	//
-	// Byte accurate calculation of final buffer size
-	//
-	size_t outputBufferSize =
-			((length / BINARY_UNIT_SIZE)
-				+ ((length % BINARY_UNIT_SIZE) ? 1 : 0))
-					* BASE64_UNIT_SIZE;
-	if (separateLines)
-	{
-		outputBufferSize +=
-			(outputBufferSize / OUTPUT_LINE_LENGTH) * CR_LF_SIZE;
-	}
-	
-	//
-	// Include space for a terminating zero
-	//
-	outputBufferSize += 1;
-
-	//
-	// Allocate the output buffer
-	//
-	char *outputBuffer = (char *)malloc(outputBufferSize);
-	if (!outputBuffer)
-	{
-		return NULL;
-	}
-
-	size_t i = 0;
-	size_t j = 0;
-	const size_t lineLength = separateLines ? INPUT_LINE_LENGTH : length;
-	size_t lineEnd = lineLength;
-	
-	while (true)
-	{
-		if (lineEnd > length)
-		{
-			lineEnd = length;
-		}
-
-		for (; i + BINARY_UNIT_SIZE - 1 < lineEnd; i += BINARY_UNIT_SIZE)
-		{
-			//
-			// Inner loop: turn 48 bytes into 64 base64 characters
-			//
-			outputBuffer[j++] = base64EncodeLookup[(inputBuffer[i] & 0xFC) >> 2];
-			outputBuffer[j++] = base64EncodeLookup[((inputBuffer[i] & 0x03) << 4)
-				| ((inputBuffer[i + 1] & 0xF0) >> 4)];
-			outputBuffer[j++] = base64EncodeLookup[((inputBuffer[i + 1] & 0x0F) << 2)
-				| ((inputBuffer[i + 2] & 0xC0) >> 6)];
-			outputBuffer[j++] = base64EncodeLookup[inputBuffer[i + 2] & 0x3F];
-		}
-		
-		if (lineEnd == length)
-		{
-			break;
-		}
-		
-		//
-		// Add the newline
-		//
-		//outputBuffer[j++] = '\r';
-		//outputBuffer[j++] = '\n';
-		lineEnd += lineLength;
-	}
-	
-	if (i + 1 < length)
-	{
-		//
-		// Handle the single '=' case
-		//
-		outputBuffer[j++] = base64EncodeLookup[(inputBuffer[i] & 0xFC) >> 2];
-		outputBuffer[j++] = base64EncodeLookup[((inputBuffer[i] & 0x03) << 4)
-			| ((inputBuffer[i + 1] & 0xF0) >> 4)];
-		outputBuffer[j++] = base64EncodeLookup[(inputBuffer[i + 1] & 0x0F) << 2];
-		outputBuffer[j++] =	'=';
-	}
-	else if (i < length)
-	{
-		//
-		// Handle the double '=' case
-		//
-		outputBuffer[j++] = base64EncodeLookup[(inputBuffer[i] & 0xFC) >> 2];
-		outputBuffer[j++] = base64EncodeLookup[(inputBuffer[i] & 0x03) << 4];
-		outputBuffer[j++] = '=';
-		outputBuffer[j++] = '=';
-	}
-	outputBuffer[j] = 0;
-	
-	//
-	// Set the output length and return the buffer
-	//
-	if (outputLength)
-	{
-		*outputLength = j;
-	}
-	return outputBuffer;
-}
-
-@implementation NSData (Base64)
-
-//
-// dataFromBase64String:
-//
-// Creates an NSData object containing the base64 decoded representation of
-// the base64 string 'aString'
-//
-// Parameters:
-//    aString - the base64 string to decode
-//
-// returns the autoreleased NSData representation of the base64 string
-//
-+ (NSData *)dataFromBase64String:(NSString *)aString
-{
-	NSData *data = [aString dataUsingEncoding:NSASCIIStringEncoding];
-	size_t outputLength;
-	void *outputBuffer = NewBase64Decode([data bytes], [data length], &outputLength);
-	NSData *result = [NSData dataWithBytes:outputBuffer length:outputLength];
-	free(outputBuffer);
-	return result;
-}
-
-//
-// base64EncodedString
-//
-// Creates an NSString object that contains the base 64 encoding of the
-// receiver's data. Lines are broken at 64 characters long.
-//
-// returns an autoreleased NSString being the base 64 representation of the
-//	receiver.
-//
-- (NSString *)base64EncodedString
-{
-	size_t outputLength;
-	char *outputBuffer =
-		NewBase64Encode([self bytes], [self length], true, &outputLength);
-	
-	NSString *result =
-		[[[NSString alloc]
-			initWithBytes:outputBuffer
-			length:outputLength
-			encoding:NSASCIIStringEncoding]
-		autorelease];
-	free(outputBuffer);
-	return result;
-}
-
-@end
diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/NativeZip.h b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/NativeZip.h
deleted file mode 100644
index 44e296b8cf..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/NativeZip.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#import <PhoneGap/PGPlugin.h>
-
-@interface NativeZip : PGPlugin {
-     NSString* callbackID;
-}
-
-@property (nonatomic, copy) NSString* callbackID;
-
-- (void) load:(BOOL)base64 arguments:(NSMutableArray*)arguments withDict:(NSMutableDictionary*)options;
-- (void) loadAsString:(NSMutableArray*)arguments withDict:(NSMutableDictionary*)options;
-- (void) loadAsDataURL:(NSMutableArray*)arguments withDict:(NSMutableDictionary*)options;
-
-@end
\ No newline at end of file
diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/NativeZip.m b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/NativeZip.m
deleted file mode 100644
index d8c241cf0b..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/NativeZip.m
+++ /dev/null
@@ -1,79 +0,0 @@
-#import "NativeZip.h"
-#import "minizip/unzip.h"
-#import "NSData+Base64.h"
-
-@implementation NativeZip
-@synthesize callbackID;
-
--(void) load:(BOOL)base64 arguments:(NSMutableArray*)arguments withDict:(NSMutableDictionary*)options
-{
-    self.callbackID = [arguments objectAtIndex:0];
-    NSString *zipPath = [arguments objectAtIndex:1];
-    NSString *entryPath = [arguments objectAtIndex:2];
-    NSString *mimetype = nil;
-    if (base64 == TRUE) {
-        mimetype = [arguments objectAtIndex:3];
-    }
-    
-    const char* path = [ zipPath cStringUsingEncoding:NSUTF8StringEncoding ];
-    unzFile unzipFile = unzOpen(path);
-    NSString* jsString = nil;
-    BOOL error = TRUE;
-    if (!unzipFile) {
-		jsString = [[NSString alloc] initWithString: @"cannot open file"];
-    } else {
-        path = [ entryPath cStringUsingEncoding:NSUTF8StringEncoding ];
-        int r = unzLocateFile(unzipFile, path, 2);
-        if (r != UNZ_OK) {
-		    jsString = [[NSString alloc] initWithString: @"cannot find entry"];
-        } else {
-            unz_file_info info;
-            r = unzGetCurrentFileInfo(unzipFile, &info, 0, 0, 0, 0, 0, 0);
-            if (r != UNZ_OK) {
-		        jsString = [[NSString alloc] initWithString: @"cannot determine size"];
-            } else {
-                r = unzOpenCurrentFile(unzipFile);
-                if (r != UNZ_OK) {
-		            jsString = [[NSString alloc] initWithString: @"cannot open entry"];
-                } else {
-                    char* contents = malloc(info.uncompressed_size);
-                    r = unzReadCurrentFile(unzipFile, contents, info.uncompressed_size);
-                    if (r != info.uncompressed_size) {
-                        jsString = [[NSString alloc] initWithString: @"cannot uncompress file"];
-                    } else {
-                        if (base64) {
-                            NSData* readData = [NSData dataWithBytes:(const void *)contents length:sizeof(unsigned char)*info.uncompressed_size];
-                            jsString = [NSString stringWithFormat:@"data:%@;base64,%@", mimetype, [readData base64EncodedString]];
-                        } else {                    
-                            jsString = [[NSString alloc] initWithUTF8String: contents];
-                        }
-                    }
-                    unzCloseCurrentFile(unzipFile);
-                    free(contents);
-                    error = FALSE;
-                }
-            }
-        }
-        unzClose(unzipFile);
-    }
-    PluginResult* pluginResult = [PluginResult
-                                  resultWithStatus:PGCommandStatus_OK
-                                  messageAsString: jsString
-                                  ];
-    if (!error) {
-        [self writeJavascript: [pluginResult toSuccessCallbackString:self.callbackID]];
-    } else {
-        [self writeJavascript: [pluginResult toErrorCallbackString:self.callbackID]];
-    }
-}
-
--(void)loadAsString:(NSMutableArray*)arguments withDict:(NSMutableDictionary*)options  
-{
-    [self load:FALSE arguments:arguments withDict:options];
-}
--(void)loadAsDataURL:(NSMutableArray*)arguments withDict:(NSMutableDictionary*)options  
-{
-    [self load:TRUE arguments:arguments withDict:options];
-}
-
-@end
diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/WebViewCache.h b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/WebViewCache.h
deleted file mode 100644
index 216a0bf2bb..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/WebViewCache.h
+++ /dev/null
@@ -1,15 +0,0 @@
-//
-//  WebCache.h
-//  KO Viewer
-//
-//  Created by Tobias Hintze on 3/5/12.
-//  Copyright (c) 2012 KO GmbH. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-@interface WebViewCache : NSURLCache
-
-- (NSData*)getSomeData:(NSString*)zip entry:(NSString*)entry;
-
-@end
diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/WebViewCache.m b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/WebViewCache.m
deleted file mode 100644
index 4de0bb3a0c..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/WebViewCache.m
+++ /dev/null
@@ -1,72 +0,0 @@
-//
-//  WebCache.m
-//  KO Viewer
-//
-//  Created by Tobias Hintze on 3/5/12.
-//  Copyright (c) 2012 KO GmbH. All rights reserved.
-//
-
-#import "WebViewCache.h"
-#import "minizip/unzip.h"
-
-@implementation WebViewCache
-
-- (NSCachedURLResponse*)cachedResponseForRequest:(NSURLRequest*)request
-{
-    [super removeAllCachedResponses];
-    NSURL *url = [request URL];
-        if ([url query]) {
-        NSData *somedata = [self getSomeData:[url path] entry:[url query]];
-        NSHTTPURLResponse *response = [[NSHTTPURLResponse alloc] initWithURL:url
-                              MIMEType:@"text/xml"
-                 expectedContentLength:[somedata length]
-                      textEncodingName:nil];
-        NSCachedURLResponse *cachedResponse = [[NSCachedURLResponse alloc] 
-            initWithResponse:response data:somedata];
-        return cachedResponse;
-    }
-    return [super cachedResponseForRequest:request];
-}
-
-- (NSData*)getSomeData:(NSString*)zip entry:(NSString*)entry
-{
-    NSLog(@"get some data: %@ %@", zip, entry);
-    const char* path = [ zip cStringUsingEncoding:NSUTF8StringEncoding ];
-    unzFile unzipFile = unzOpen(path);
-    NSData *data = nil;
-    if (!unzipFile) {
-		NSLog(@"cannot open file %@", zip);
-    } else {
-        path = [ entry cStringUsingEncoding:NSUTF8StringEncoding ];
-        int r = unzLocateFile(unzipFile, path, 2);
-        if (r != UNZ_OK) {
-		    NSLog(@"cannot find entry %@", entry);
-        } else {
-            unz_file_info info;
-            r = unzGetCurrentFileInfo(unzipFile, &info, 0, 0, 0, 0, 0, 0);
-            if (r != UNZ_OK) {
-		        NSLog(@"cannot determine size of %@", entry);
-            } else {
-                r = unzOpenCurrentFile(unzipFile);
-                if (r != UNZ_OK) {
-		            NSLog(@"cannot open entry %@", entry);
-                } else {
-                    char* contents = malloc(info.uncompressed_size);
-                    r = unzReadCurrentFile(unzipFile, contents, info.uncompressed_size);
-                    if (r != info.uncompressed_size) {
-                        NSLog(@"cannot uncompress file %@", entry);
-                    } else {
-                        data = [NSData dataWithBytes:(const void *)contents length:sizeof(unsigned char)*info.uncompressed_size];
-                        NSLog(@"read file entry %li %@", info.uncompressed_size, entry);
-                    }
-                    unzCloseCurrentFile(unzipFile);
-                    free(contents);
-                }
-            }
-        }
-        unzClose(unzipFile);
-    }
-    return data;
-}
-
-@end
diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/minizip/crypt.h b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/minizip/crypt.h
deleted file mode 100644
index 622f4bc2ec..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/minizip/crypt.h
+++ /dev/null
@@ -1,132 +0,0 @@
-/* crypt.h -- base code for crypt/uncrypt ZIPfile
-
-
-   Version 1.01e, February 12th, 2005
-
-   Copyright (C) 1998-2005 Gilles Vollant
-
-   This code is a modified version of crypting code in Infozip distribution
-
-   The encryption/decryption parts of this source code (as opposed to the
-   non-echoing password parts) were originally written in Europe.  The
-   whole source package can be freely distributed, including from the USA.
-   (Prior to January 2000, re-export from the US was a violation of US law.)
-
-   This encryption code is a direct transcription of the algorithm from
-   Roger Schlafly, described by Phil Katz in the file appnote.txt.  This
-   file (appnote.txt) is distributed with the PKZIP program (even in the
-   version without encryption capabilities).
-
-   If you don't need crypting in your application, just define symbols
-   NOCRYPT and NOUNCRYPT.
-
-   This code support the "Traditional PKWARE Encryption".
-
-   The new AES encryption added on Zip format by Winzip (see the page
-   http://www.winzip.com/aes_info.htm ) and PKWare PKZip 5.x Strong
-   Encryption is not supported.
-*/
-
-#define CRC32(c, b) ((*(pcrc_32_tab+(((int)(c) ^ (b)) & 0xff))) ^ ((c) >> 8))
-
-/***********************************************************************
- * Return the next byte in the pseudo-random sequence
- */
-static int decrypt_byte(unsigned long* pkeys, const unsigned long* pcrc_32_tab)
-{
-    unsigned temp;  /* POTENTIAL BUG:  temp*(temp^1) may overflow in an
-                     * unpredictable manner on 16-bit systems; not a problem
-                     * with any known compiler so far, though */
-
-    temp = ((unsigned)(*(pkeys+2)) & 0xffff) | 2;
-    return (int)(((temp * (temp ^ 1)) >> 8) & 0xff);
-}
-
-/***********************************************************************
- * Update the encryption keys with the next byte of plain text
- */
-static int update_keys(unsigned long* pkeys,const unsigned long* pcrc_32_tab,int c)
-{
-    (*(pkeys+0)) = CRC32((*(pkeys+0)), c);
-    (*(pkeys+1)) += (*(pkeys+0)) & 0xff;
-    (*(pkeys+1)) = (*(pkeys+1)) * 134775813L + 1;
-    {
-      register int keyshift = (int)((*(pkeys+1)) >> 24);
-      (*(pkeys+2)) = CRC32((*(pkeys+2)), keyshift);
-    }
-    return c;
-}
-
-
-/***********************************************************************
- * Initialize the encryption keys and the random header according to
- * the given password.
- */
-static void init_keys(const char* passwd,unsigned long* pkeys,const unsigned long* pcrc_32_tab)
-{
-    *(pkeys+0) = 305419896L;
-    *(pkeys+1) = 591751049L;
-    *(pkeys+2) = 878082192L;
-    while (*passwd != '\0') {
-        update_keys(pkeys,pcrc_32_tab,(int)*passwd);
-        passwd++;
-    }
-}
-
-#define zdecode(pkeys,pcrc_32_tab,c) \
-    (update_keys(pkeys,pcrc_32_tab,c ^= decrypt_byte(pkeys,pcrc_32_tab)))
-
-#define zencode(pkeys,pcrc_32_tab,c,t) \
-    (t=decrypt_byte(pkeys,pcrc_32_tab), update_keys(pkeys,pcrc_32_tab,c), t^(c))
-
-#ifdef INCLUDECRYPTINGCODE_IFCRYPTALLOWED
-
-#define RAND_HEAD_LEN  12
-   /* "last resort" source for second part of crypt seed pattern */
-#  ifndef ZCR_SEED2
-#    define ZCR_SEED2 3141592654UL     /* use PI as default pattern */
-#  endif
-
-static int crypthead(passwd, buf, bufSize, pkeys, pcrc_32_tab, crcForCrypting)
-    const char *passwd;         /* password string */
-    unsigned char *buf;         /* where to write header */
-    int bufSize;
-    unsigned long* pkeys;
-    const unsigned long* pcrc_32_tab;
-    unsigned long crcForCrypting;
-{
-    int n;                       /* index in random header */
-    int t;                       /* temporary */
-    int c;                       /* random byte */
-    unsigned char header[RAND_HEAD_LEN-2]; /* random header */
-    static unsigned calls = 0;   /* ensure different random header each time */
-
-    if (bufSize<RAND_HEAD_LEN)
-      return 0;
-
-    /* First generate RAND_HEAD_LEN-2 random bytes. We encrypt the
-     * output of rand() to get less predictability, since rand() is
-     * often poorly implemented.
-     */
-    if (++calls == 1)
-    {
-        srand((unsigned)(time(NULL) ^ ZCR_SEED2));
-    }
-    init_keys(passwd, pkeys, pcrc_32_tab);
-    for (n = 0; n < RAND_HEAD_LEN-2; n++)
-    {
-        c = (rand() >> 7) & 0xff;
-        header[n] = (unsigned char)zencode(pkeys, pcrc_32_tab, c, t);
-    }
-    /* Encrypt random header (last two bytes is high word of crc) */
-    init_keys(passwd, pkeys, pcrc_32_tab);
-    for (n = 0; n < RAND_HEAD_LEN-2; n++)
-    {
-        buf[n] = (unsigned char)zencode(pkeys, pcrc_32_tab, header[n], t);
-    }
-    buf[n++] = zencode(pkeys, pcrc_32_tab, (int)(crcForCrypting >> 16) & 0xff, t);
-    buf[n++] = zencode(pkeys, pcrc_32_tab, (int)(crcForCrypting >> 24) & 0xff, t);
-    return n;
-}
-
-#endif
diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/minizip/ioapi.c b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/minizip/ioapi.c
deleted file mode 100644
index 7f20c182f9..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/minizip/ioapi.c
+++ /dev/null
@@ -1,177 +0,0 @@
-/* ioapi.c -- IO base function header for compress/uncompress .zip
-   files using zlib + zip or unzip API
-
-   Version 1.01e, February 12th, 2005
-
-   Copyright (C) 1998-2005 Gilles Vollant
-*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "zlib.h"
-#include "ioapi.h"
-
-
-
-/* I've found an old Unix (a SunOS 4.1.3_U1) without all SEEK_* defined.... */
-
-#ifndef SEEK_CUR
-#define SEEK_CUR    1
-#endif
-
-#ifndef SEEK_END
-#define SEEK_END    2
-#endif
-
-#ifndef SEEK_SET
-#define SEEK_SET    0
-#endif
-
-voidpf ZCALLBACK fopen_file_func OF((
-   voidpf opaque,
-   const char* filename,
-   int mode));
-
-uLong ZCALLBACK fread_file_func OF((
-   voidpf opaque,
-   voidpf stream,
-   void* buf,
-   uLong size));
-
-uLong ZCALLBACK fwrite_file_func OF((
-   voidpf opaque,
-   voidpf stream,
-   const void* buf,
-   uLong size));
-
-long ZCALLBACK ftell_file_func OF((
-   voidpf opaque,
-   voidpf stream));
-
-long ZCALLBACK fseek_file_func OF((
-   voidpf opaque,
-   voidpf stream,
-   uLong offset,
-   int origin));
-
-int ZCALLBACK fclose_file_func OF((
-   voidpf opaque,
-   voidpf stream));
-
-int ZCALLBACK ferror_file_func OF((
-   voidpf opaque,
-   voidpf stream));
-
-
-voidpf ZCALLBACK fopen_file_func (opaque, filename, mode)
-   voidpf opaque;
-   const char* filename;
-   int mode;
-{
-    FILE* file = NULL;
-    const char* mode_fopen = NULL;
-    if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER)==ZLIB_FILEFUNC_MODE_READ)
-        mode_fopen = "rb";
-    else
-    if (mode & ZLIB_FILEFUNC_MODE_EXISTING)
-        mode_fopen = "r+b";
-    else
-    if (mode & ZLIB_FILEFUNC_MODE_CREATE)
-        mode_fopen = "wb";
-
-    if ((filename!=NULL) && (mode_fopen != NULL))
-        file = fopen(filename, mode_fopen);
-    return file;
-}
-
-
-uLong ZCALLBACK fread_file_func (opaque, stream, buf, size)
-   voidpf opaque;
-   voidpf stream;
-   void* buf;
-   uLong size;
-{
-    uLong ret;
-    ret = (uLong)fread(buf, 1, (size_t)size, (FILE *)stream);
-    return ret;
-}
-
-
-uLong ZCALLBACK fwrite_file_func (opaque, stream, buf, size)
-   voidpf opaque;
-   voidpf stream;
-   const void* buf;
-   uLong size;
-{
-    uLong ret;
-    ret = (uLong)fwrite(buf, 1, (size_t)size, (FILE *)stream);
-    return ret;
-}
-
-long ZCALLBACK ftell_file_func (opaque, stream)
-   voidpf opaque;
-   voidpf stream;
-{
-    long ret;
-    ret = ftell((FILE *)stream);
-    return ret;
-}
-
-long ZCALLBACK fseek_file_func (opaque, stream, offset, origin)
-   voidpf opaque;
-   voidpf stream;
-   uLong offset;
-   int origin;
-{
-    int fseek_origin=0;
-    long ret;
-    switch (origin)
-    {
-    case ZLIB_FILEFUNC_SEEK_CUR :
-        fseek_origin = SEEK_CUR;
-        break;
-    case ZLIB_FILEFUNC_SEEK_END :
-        fseek_origin = SEEK_END;
-        break;
-    case ZLIB_FILEFUNC_SEEK_SET :
-        fseek_origin = SEEK_SET;
-        break;
-    default: return -1;
-    }
-    ret = 0;
-    fseek((FILE *)stream, offset, fseek_origin);
-    return ret;
-}
-
-int ZCALLBACK fclose_file_func (opaque, stream)
-   voidpf opaque;
-   voidpf stream;
-{
-    int ret;
-    ret = fclose((FILE *)stream);
-    return ret;
-}
-
-int ZCALLBACK ferror_file_func (opaque, stream)
-   voidpf opaque;
-   voidpf stream;
-{
-    int ret;
-    ret = ferror((FILE *)stream);
-    return ret;
-}
-
-void fill_fopen_filefunc (pzlib_filefunc_def)
-  zlib_filefunc_def* pzlib_filefunc_def;
-{
-    pzlib_filefunc_def->zopen_file = fopen_file_func;
-    pzlib_filefunc_def->zread_file = fread_file_func;
-    pzlib_filefunc_def->zwrite_file = fwrite_file_func;
-    pzlib_filefunc_def->ztell_file = ftell_file_func;
-    pzlib_filefunc_def->zseek_file = fseek_file_func;
-    pzlib_filefunc_def->zclose_file = fclose_file_func;
-    pzlib_filefunc_def->zerror_file = ferror_file_func;
-    pzlib_filefunc_def->opaque = NULL;
-}
diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/minizip/ioapi.h b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/minizip/ioapi.h
deleted file mode 100644
index e73a3b2bd8..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/minizip/ioapi.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* ioapi.h -- IO base function header for compress/uncompress .zip
-   files using zlib + zip or unzip API
-
-   Version 1.01e, February 12th, 2005
-
-   Copyright (C) 1998-2005 Gilles Vollant
-*/
-
-#ifndef _ZLIBIOAPI_H
-#define _ZLIBIOAPI_H
-
-
-#define ZLIB_FILEFUNC_SEEK_CUR (1)
-#define ZLIB_FILEFUNC_SEEK_END (2)
-#define ZLIB_FILEFUNC_SEEK_SET (0)
-
-#define ZLIB_FILEFUNC_MODE_READ      (1)
-#define ZLIB_FILEFUNC_MODE_WRITE     (2)
-#define ZLIB_FILEFUNC_MODE_READWRITEFILTER (3)
-
-#define ZLIB_FILEFUNC_MODE_EXISTING (4)
-#define ZLIB_FILEFUNC_MODE_CREATE   (8)
-
-
-#ifndef ZCALLBACK
-
-#if (defined(WIN32) || defined (WINDOWS) || defined (_WINDOWS)) && defined(CALLBACK) && defined (USEWINDOWS_CALLBACK)
-#define ZCALLBACK CALLBACK
-#else
-#define ZCALLBACK
-#endif
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef voidpf (ZCALLBACK *open_file_func) OF((voidpf opaque, const char* filename, int mode));
-typedef uLong  (ZCALLBACK *read_file_func) OF((voidpf opaque, voidpf stream, void* buf, uLong size));
-typedef uLong  (ZCALLBACK *write_file_func) OF((voidpf opaque, voidpf stream, const void* buf, uLong size));
-typedef long   (ZCALLBACK *tell_file_func) OF((voidpf opaque, voidpf stream));
-typedef long   (ZCALLBACK *seek_file_func) OF((voidpf opaque, voidpf stream, uLong offset, int origin));
-typedef int    (ZCALLBACK *close_file_func) OF((voidpf opaque, voidpf stream));
-typedef int    (ZCALLBACK *testerror_file_func) OF((voidpf opaque, voidpf stream));
-
-typedef struct zlib_filefunc_def_s
-{
-    open_file_func      zopen_file;
-    read_file_func      zread_file;
-    write_file_func     zwrite_file;
-    tell_file_func      ztell_file;
-    seek_file_func      zseek_file;
-    close_file_func     zclose_file;
-    testerror_file_func zerror_file;
-    voidpf              opaque;
-} zlib_filefunc_def;
-
-
-
-void fill_fopen_filefunc OF((zlib_filefunc_def* pzlib_filefunc_def));
-
-#define ZREAD(filefunc,filestream,buf,size) ((*((filefunc).zread_file))((filefunc).opaque,filestream,buf,size))
-#define ZWRITE(filefunc,filestream,buf,size) ((*((filefunc).zwrite_file))((filefunc).opaque,filestream,buf,size))
-#define ZTELL(filefunc,filestream) ((*((filefunc).ztell_file))((filefunc).opaque,filestream))
-#define ZSEEK(filefunc,filestream,pos,mode) ((*((filefunc).zseek_file))((filefunc).opaque,filestream,pos,mode))
-#define ZCLOSE(filefunc,filestream) ((*((filefunc).zclose_file))((filefunc).opaque,filestream))
-#define ZERROR(filefunc,filestream) ((*((filefunc).zerror_file))((filefunc).opaque,filestream))
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-
diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/minizip/mztools.c b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/minizip/mztools.c
deleted file mode 100644
index 74e6c75778..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/minizip/mztools.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-  Additional tools for Minizip
-  Code: Xavier Roche '2004
-  License: Same as ZLIB (www.gzip.org)
-*/
-
-/* Code */
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "zlib.h"
-#include "unzip.h"
-
-#define READ_8(adr)  ((unsigned char)*(adr))
-#define READ_16(adr) ( READ_8(adr) | (READ_8(adr+1) << 8) )
-#define READ_32(adr) ( READ_16(adr) | (READ_16((adr)+2) << 16) )
-
-#define WRITE_8(buff, n) do { \
-  *((unsigned char*)(buff)) = (unsigned char) ((n) & 0xff); \
-} while(0)
-#define WRITE_16(buff, n) do { \
-  WRITE_8((unsigned char*)(buff), n); \
-  WRITE_8(((unsigned char*)(buff)) + 1, (n) >> 8); \
-} while(0)
-#define WRITE_32(buff, n) do { \
-  WRITE_16((unsigned char*)(buff), (n) & 0xffff); \
-  WRITE_16((unsigned char*)(buff) + 2, (n) >> 16); \
-} while(0)
diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/minizip/mztools.h b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/minizip/mztools.h
deleted file mode 100644
index 82d1597ad7..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/minizip/mztools.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
-  Additional tools for Minizip
-  Code: Xavier Roche '2004
-  License: Same as ZLIB (www.gzip.org)
-*/
-
-#ifndef _zip_tools_H
-#define _zip_tools_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef _ZLIB_H
-#include "zlib.h"
-#endif
-
-#include "unzip.h"
-
-/* Repair a ZIP file (missing central directory) 
-   file: file to recover
-   fileOut: output file after recovery
-   fileOutTmp: temporary file name used for recovery
-*/
-extern int ZEXPORT unzRepair(const char* file, 
-                             const char* fileOut, 
-                             const char* fileOutTmp, 
-                             uLong* nRecovered,
-                             uLong* bytesRecovered);
-
-#endif
diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/minizip/unzip.c b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/minizip/unzip.c
deleted file mode 100644
index 81aee6a149..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/minizip/unzip.c
+++ /dev/null
@@ -1,1597 +0,0 @@
-/* unzip.c -- IO for uncompress .zip files using zlib
-   Version 1.01e, February 12th, 2005
-
-   Copyright (C) 1998-2005 Gilles Vollant
-
-   Read unzip.h for more info
-*/
-
-/* Decryption code comes from crypt.c by Info-ZIP but has been greatly reduced in terms of
-compatibility with older software. The following is from the original crypt.c. Code
-woven in by Terry Thorsen 1/2003.
-*/
-/*
-  Copyright (c) 1990-2000 Info-ZIP.  All rights reserved.
-
-  See the accompanying file LICENSE, version 2000-Apr-09 or later
-  (the contents of which are also included in zip.h) for terms of use.
-  If, for some reason, all these files are missing, the Info-ZIP license
-  also may be found at:  ftp://ftp.info-zip.org/pub/infozip/license.html
-*/
-/*
-  crypt.c (full version) by Info-ZIP.      Last revised:  [see crypt.h]
-
-  The encryption/decryption parts of this source code (as opposed to the
-  non-echoing password parts) were originally written in Europe.  The
-  whole source package can be freely distributed, including from the USA.
-  (Prior to January 2000, re-export from the US was a violation of US law.)
- */
-
-/*
-  This encryption code is a direct transcription of the algorithm from
-  Roger Schlafly, described by Phil Katz in the file appnote.txt.  This
-  file (appnote.txt) is distributed with the PKZIP program (even in the
-  version without encryption capabilities).
- */
-
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "zlib.h"
-#include "unzip.h"
-
-#ifdef STDC
-#  include <stddef.h>
-#  include <string.h>
-#  include <stdlib.h>
-#endif
-#ifdef NO_ERRNO_H
-    extern int errno;
-#else
-#   include <errno.h>
-#endif
-
-
-#ifndef local
-#  define local static
-#endif
-/* compile with -Dlocal if your debugger can't find static symbols */
-
-
-#ifndef CASESENSITIVITYDEFAULT_NO
-#  if !defined(unix) && !defined(CASESENSITIVITYDEFAULT_YES)
-#    define CASESENSITIVITYDEFAULT_NO
-#  endif
-#endif
-
-
-#ifndef UNZ_BUFSIZE
-#define UNZ_BUFSIZE (16384)
-#endif
-
-#ifndef UNZ_MAXFILENAMEINZIP
-#define UNZ_MAXFILENAMEINZIP (256)
-#endif
-
-#ifndef ALLOC
-# define ALLOC(size) (malloc(size))
-#endif
-#ifndef TRYFREE
-# define TRYFREE(p) {if (p) free(p);}
-#endif
-
-#define SIZECENTRALDIRITEM (0x2e)
-#define SIZEZIPLOCALHEADER (0x1e)
-
-
-
-
-const char unz_copyright[] =
-   " unzip 1.01 Copyright 1998-2004 Gilles Vollant - http://www.winimage.com/zLibDll";
-
-/* unz_file_info_interntal contain internal info about a file in zipfile*/
-typedef struct unz_file_info_internal_s
-{
-    uLong offset_curfile;/* relative offset of local header 4 bytes */
-} unz_file_info_internal;
-
-
-/* file_in_zip_read_info_s contain internal information about a file in zipfile,
-    when reading and decompress it */
-typedef struct
-{
-    char  *read_buffer;         /* internal buffer for compressed data */
-    z_stream stream;            /* zLib stream structure for inflate */
-
-    uLong pos_in_zipfile;       /* position in byte on the zipfile, for fseek*/
-    uLong stream_initialised;   /* flag set if stream structure is initialised*/
-
-    uLong offset_local_extrafield;/* offset of the local extra field */
-    uInt  size_local_extrafield;/* size of the local extra field */
-    uLong pos_local_extrafield;   /* position in the local extra field in read*/
-
-    uLong crc32;                /* crc32 of all data uncompressed */
-    uLong crc32_wait;           /* crc32 we must obtain after decompress all */
-    uLong rest_read_compressed; /* number of byte to be decompressed */
-    uLong rest_read_uncompressed;/*number of byte to be obtained after decomp*/
-    zlib_filefunc_def z_filefunc;
-    voidpf filestream;        /* io structore of the zipfile */
-    uLong compression_method;   /* compression method (0==store) */
-    uLong byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/
-    int   raw;
-} file_in_zip_read_info_s;
-
-
-/* unz_s contain internal information about the zipfile
-*/
-typedef struct
-{
-    zlib_filefunc_def z_filefunc;
-    voidpf filestream;        /* io structore of the zipfile */
-    unz_global_info gi;       /* public global information */
-    uLong byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/
-    uLong num_file;             /* number of the current file in the zipfile*/
-    uLong pos_in_central_dir;   /* pos of the current file in the central dir*/
-    uLong current_file_ok;      /* flag about the usability of the current file*/
-    uLong central_pos;          /* position of the beginning of the central dir*/
-
-    uLong size_central_dir;     /* size of the central directory  */
-    uLong offset_central_dir;   /* offset of start of central directory with
-                                   respect to the starting disk number */
-
-    unz_file_info cur_file_info; /* public info about the current file in zip*/
-    unz_file_info_internal cur_file_info_internal; /* private info about it*/
-    file_in_zip_read_info_s* pfile_in_zip_read; /* structure about the current
-                                        file if we are decompressing it */
-    int encrypted;
-#    ifndef NOUNCRYPT
-    unsigned long keys[3];     /* keys defining the pseudo-random sequence */
-    const unsigned long* pcrc_32_tab;
-#    endif
-} unz_s;
-
-
-#ifndef NOUNCRYPT
-#include "crypt.h"
-#endif
-
-/* ===========================================================================
-     Read a byte from a gz_stream; update next_in and avail_in. Return EOF
-   for end of file.
-   IN assertion: the stream s has been sucessfully opened for reading.
-*/
-
-
-local int unzlocal_getByte OF((
-    const zlib_filefunc_def* pzlib_filefunc_def,
-    voidpf filestream,
-    int *pi));
-
-local int unzlocal_getByte(pzlib_filefunc_def,filestream,pi)
-    const zlib_filefunc_def* pzlib_filefunc_def;
-    voidpf filestream;
-    int *pi;
-{
-    unsigned char c;
-    int err = (int)ZREAD(*pzlib_filefunc_def,filestream,&c,1);
-    if (err==1)
-    {
-        *pi = (int)c;
-        return UNZ_OK;
-    }
-    else
-    {
-        if (ZERROR(*pzlib_filefunc_def,filestream))
-            return UNZ_ERRNO;
-        else
-            return UNZ_EOF;
-    }
-}
-
-
-/* ===========================================================================
-   Reads a long in LSB order from the given gz_stream. Sets
-*/
-local int unzlocal_getShort OF((
-    const zlib_filefunc_def* pzlib_filefunc_def,
-    voidpf filestream,
-    uLong *pX));
-
-local int unzlocal_getShort (pzlib_filefunc_def,filestream,pX)
-    const zlib_filefunc_def* pzlib_filefunc_def;
-    voidpf filestream;
-    uLong *pX;
-{
-    uLong x ;
-    int i;
-    int err;
-
-    err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);
-    x = (uLong)i;
-
-    if (err==UNZ_OK)
-        err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);
-    x += ((uLong)i)<<8;
-
-    if (err==UNZ_OK)
-        *pX = x;
-    else
-        *pX = 0;
-    return err;
-}
-
-local int unzlocal_getLong OF((
-    const zlib_filefunc_def* pzlib_filefunc_def,
-    voidpf filestream,
-    uLong *pX));
-
-local int unzlocal_getLong (pzlib_filefunc_def,filestream,pX)
-    const zlib_filefunc_def* pzlib_filefunc_def;
-    voidpf filestream;
-    uLong *pX;
-{
-    uLong x ;
-    int i;
-    int err;
-
-    err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);
-    x = (uLong)i;
-
-    if (err==UNZ_OK)
-        err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);
-    x += ((uLong)i)<<8;
-
-    if (err==UNZ_OK)
-        err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);
-    x += ((uLong)i)<<16;
-
-    if (err==UNZ_OK)
-        err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);
-    x += ((uLong)i)<<24;
-
-    if (err==UNZ_OK)
-        *pX = x;
-    else
-        *pX = 0;
-    return err;
-}
-
-
-/* My own strcmpi / strcasecmp */
-local int strcmpcasenosensitive_internal (fileName1,fileName2)
-    const char* fileName1;
-    const char* fileName2;
-{
-    for (;;)
-    {
-        char c1=*(fileName1++);
-        char c2=*(fileName2++);
-        if ((c1>='a') && (c1<='z'))
-            c1 -= 0x20;
-        if ((c2>='a') && (c2<='z'))
-            c2 -= 0x20;
-        if (c1=='\0')
-            return ((c2=='\0') ? 0 : -1);
-        if (c2=='\0')
-            return 1;
-        if (c1<c2)
-            return -1;
-        if (c1>c2)
-            return 1;
-    }
-}
-
-
-#ifdef  CASESENSITIVITYDEFAULT_NO
-#define CASESENSITIVITYDEFAULTVALUE 2
-#else
-#define CASESENSITIVITYDEFAULTVALUE 1
-#endif
-
-#ifndef STRCMPCASENOSENTIVEFUNCTION
-#define STRCMPCASENOSENTIVEFUNCTION strcmpcasenosensitive_internal
-#endif
-
-/*
-   Compare two filename (fileName1,fileName2).
-   If iCaseSenisivity = 1, comparision is case sensitivity (like strcmp)
-   If iCaseSenisivity = 2, comparision is not case sensitivity (like strcmpi
-                                                                or strcasecmp)
-   If iCaseSenisivity = 0, case sensitivity is defaut of your operating system
-        (like 1 on Unix, 2 on Windows)
-
-*/
-extern int ZEXPORT unzStringFileNameCompare (fileName1,fileName2,iCaseSensitivity)
-    const char* fileName1;
-    const char* fileName2;
-    int iCaseSensitivity;
-{
-    if (iCaseSensitivity==0)
-        iCaseSensitivity=CASESENSITIVITYDEFAULTVALUE;
-
-    if (iCaseSensitivity==1)
-        return strcmp(fileName1,fileName2);
-
-    return STRCMPCASENOSENTIVEFUNCTION(fileName1,fileName2);
-}
-
-#ifndef BUFREADCOMMENT
-#define BUFREADCOMMENT (0x400)
-#endif
-
-/*
-  Locate the Central directory of a zipfile (at the end, just before
-    the global comment)
-*/
-local uLong unzlocal_SearchCentralDir OF((
-    const zlib_filefunc_def* pzlib_filefunc_def,
-    voidpf filestream));
-
-local uLong unzlocal_SearchCentralDir(pzlib_filefunc_def,filestream)
-    const zlib_filefunc_def* pzlib_filefunc_def;
-    voidpf filestream;
-{
-    unsigned char* buf;
-    uLong uSizeFile;
-    uLong uBackRead;
-    uLong uMaxBack=0xffff; /* maximum size of global comment */
-    uLong uPosFound=0;
-
-    if (ZSEEK(*pzlib_filefunc_def,filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0)
-        return 0;
-
-
-    uSizeFile = ZTELL(*pzlib_filefunc_def,filestream);
-
-    if (uMaxBack>uSizeFile)
-        uMaxBack = uSizeFile;
-
-    buf = (unsigned char*)ALLOC(BUFREADCOMMENT+4);
-    if (buf==NULL)
-        return 0;
-
-    uBackRead = 4;
-    while (uBackRead<uMaxBack)
-    {
-        uLong uReadSize,uReadPos ;
-        int i;
-        if (uBackRead+BUFREADCOMMENT>uMaxBack)
-            uBackRead = uMaxBack;
-        else
-            uBackRead+=BUFREADCOMMENT;
-        uReadPos = uSizeFile-uBackRead ;
-
-        uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ?
-                     (BUFREADCOMMENT+4) : (uSizeFile-uReadPos);
-        if (ZSEEK(*pzlib_filefunc_def,filestream,uReadPos,ZLIB_FILEFUNC_SEEK_SET)!=0)
-            break;
-
-        if (ZREAD(*pzlib_filefunc_def,filestream,buf,uReadSize)!=uReadSize)
-            break;
-
-        for (i=(int)uReadSize-3; (i--)>0;)
-            if (((*(buf+i))==0x50) && ((*(buf+i+1))==0x4b) &&
-                ((*(buf+i+2))==0x05) && ((*(buf+i+3))==0x06))
-            {
-                uPosFound = uReadPos+i;
-                break;
-            }
-
-        if (uPosFound!=0)
-            break;
-    }
-    TRYFREE(buf);
-    return uPosFound;
-}
-
-/*
-  Open a Zip file. path contain the full pathname (by example,
-     on a Windows NT computer "c:\\test\\zlib114.zip" or on an Unix computer
-     "zlib/zlib114.zip".
-     If the zipfile cannot be opened (file doesn't exist or in not valid), the
-       return value is NULL.
-     Else, the return value is a unzFile Handle, usable with other function
-       of this unzip package.
-*/
-extern unzFile ZEXPORT unzOpen2 (path, pzlib_filefunc_def)
-    const char *path;
-    zlib_filefunc_def* pzlib_filefunc_def;
-{
-    unz_s us;
-    unz_s *s;
-    uLong central_pos,uL;
-
-    uLong number_disk;          /* number of the current dist, used for
-                                   spaning ZIP, unsupported, always 0*/
-    uLong number_disk_with_CD;  /* number the the disk with central dir, used
-                                   for spaning ZIP, unsupported, always 0*/
-    uLong number_entry_CD;      /* total number of entries in
-                                   the central dir
-                                   (same than number_entry on nospan) */
-
-    int err=UNZ_OK;
-
-    if (unz_copyright[0]!=' ')
-        return NULL;
-
-    if (pzlib_filefunc_def==NULL)
-        fill_fopen_filefunc(&us.z_filefunc);
-    else
-        us.z_filefunc = *pzlib_filefunc_def;
-
-    us.filestream= (*(us.z_filefunc.zopen_file))(us.z_filefunc.opaque,
-                                                 path,
-                                                 ZLIB_FILEFUNC_MODE_READ |
-                                                 ZLIB_FILEFUNC_MODE_EXISTING);
-    if (us.filestream==NULL)
-        return NULL;
-
-    central_pos = unzlocal_SearchCentralDir(&us.z_filefunc,us.filestream);
-    if (central_pos==0)
-        err=UNZ_ERRNO;
-
-    if (ZSEEK(us.z_filefunc, us.filestream,
-                                      central_pos,ZLIB_FILEFUNC_SEEK_SET)!=0)
-        err=UNZ_ERRNO;
-
-    /* the signature, already checked */
-    if (unzlocal_getLong(&us.z_filefunc, us.filestream,&uL)!=UNZ_OK)
-        err=UNZ_ERRNO;
-
-    /* number of this disk */
-    if (unzlocal_getShort(&us.z_filefunc, us.filestream,&number_disk)!=UNZ_OK)
-        err=UNZ_ERRNO;
-
-    /* number of the disk with the start of the central directory */
-    if (unzlocal_getShort(&us.z_filefunc, us.filestream,&number_disk_with_CD)!=UNZ_OK)
-        err=UNZ_ERRNO;
-
-    /* total number of entries in the central dir on this disk */
-    if (unzlocal_getShort(&us.z_filefunc, us.filestream,&us.gi.number_entry)!=UNZ_OK)
-        err=UNZ_ERRNO;
-
-    /* total number of entries in the central dir */
-    if (unzlocal_getShort(&us.z_filefunc, us.filestream,&number_entry_CD)!=UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if ((number_entry_CD!=us.gi.number_entry) ||
-        (number_disk_with_CD!=0) ||
-        (number_disk!=0))
-        err=UNZ_BADZIPFILE;
-
-    /* size of the central directory */
-    if (unzlocal_getLong(&us.z_filefunc, us.filestream,&us.size_central_dir)!=UNZ_OK)
-        err=UNZ_ERRNO;
-
-    /* offset of start of central directory with respect to the
-          starting disk number */
-    if (unzlocal_getLong(&us.z_filefunc, us.filestream,&us.offset_central_dir)!=UNZ_OK)
-        err=UNZ_ERRNO;
-
-    /* zipfile comment length */
-    if (unzlocal_getShort(&us.z_filefunc, us.filestream,&us.gi.size_comment)!=UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if ((central_pos<us.offset_central_dir+us.size_central_dir) &&
-        (err==UNZ_OK))
-        err=UNZ_BADZIPFILE;
-
-    if (err!=UNZ_OK)
-    {
-        ZCLOSE(us.z_filefunc, us.filestream);
-        return NULL;
-    }
-
-    us.byte_before_the_zipfile = central_pos -
-                            (us.offset_central_dir+us.size_central_dir);
-    us.central_pos = central_pos;
-    us.pfile_in_zip_read = NULL;
-    us.encrypted = 0;
-
-
-    s=(unz_s*)ALLOC(sizeof(unz_s));
-    *s=us;
-    unzGoToFirstFile((unzFile)s);
-    return (unzFile)s;
-}
-
-
-extern unzFile ZEXPORT unzOpen (path)
-    const char *path;
-{
-    return unzOpen2(path, NULL);
-}
-
-/*
-  Close a ZipFile opened with unzipOpen.
-  If there is files inside the .Zip opened with unzipOpenCurrentFile (see later),
-    these files MUST be closed with unzipCloseCurrentFile before call unzipClose.
-  return UNZ_OK if there is no problem. */
-extern int ZEXPORT unzClose (file)
-    unzFile file;
-{
-    unz_s* s;
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz_s*)file;
-
-    if (s->pfile_in_zip_read!=NULL)
-        unzCloseCurrentFile(file);
-
-    ZCLOSE(s->z_filefunc, s->filestream);
-    TRYFREE(s);
-    return UNZ_OK;
-}
-
-
-/*
-  Write info about the ZipFile in the *pglobal_info structure.
-  No preparation of the structure is needed
-  return UNZ_OK if there is no problem. */
-extern int ZEXPORT unzGetGlobalInfo (file,pglobal_info)
-    unzFile file;
-    unz_global_info *pglobal_info;
-{
-    unz_s* s;
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz_s*)file;
-    *pglobal_info=s->gi;
-    return UNZ_OK;
-}
-
-
-/*
-   Translate date/time from Dos format to tm_unz (readable more easilty)
-*/
-local void unzlocal_DosDateToTmuDate (ulDosDate, ptm)
-    uLong ulDosDate;
-    tm_unz* ptm;
-{
-    uLong uDate;
-    uDate = (uLong)(ulDosDate>>16);
-    ptm->tm_mday = (uInt)(uDate&0x1f) ;
-    ptm->tm_mon =  (uInt)((((uDate)&0x1E0)/0x20)-1) ;
-    ptm->tm_year = (uInt)(((uDate&0x0FE00)/0x0200)+1980) ;
-
-    ptm->tm_hour = (uInt) ((ulDosDate &0xF800)/0x800);
-    ptm->tm_min =  (uInt) ((ulDosDate&0x7E0)/0x20) ;
-    ptm->tm_sec =  (uInt) (2*(ulDosDate&0x1f)) ;
-}
-
-/*
-  Get Info about the current file in the zipfile, with internal only info
-*/
-local int unzlocal_GetCurrentFileInfoInternal OF((unzFile file,
-                                                  unz_file_info *pfile_info,
-                                                  unz_file_info_internal
-                                                  *pfile_info_internal,
-                                                  char *szFileName,
-                                                  uLong fileNameBufferSize,
-                                                  void *extraField,
-                                                  uLong extraFieldBufferSize,
-                                                  char *szComment,
-                                                  uLong commentBufferSize));
-
-local int unzlocal_GetCurrentFileInfoInternal (file,
-                                              pfile_info,
-                                              pfile_info_internal,
-                                              szFileName, fileNameBufferSize,
-                                              extraField, extraFieldBufferSize,
-                                              szComment,  commentBufferSize)
-    unzFile file;
-    unz_file_info *pfile_info;
-    unz_file_info_internal *pfile_info_internal;
-    char *szFileName;
-    uLong fileNameBufferSize;
-    void *extraField;
-    uLong extraFieldBufferSize;
-    char *szComment;
-    uLong commentBufferSize;
-{
-    unz_s* s;
-    unz_file_info file_info;
-    unz_file_info_internal file_info_internal;
-    int err=UNZ_OK;
-    uLong uMagic;
-    long lSeek=0;
-
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz_s*)file;
-    if (ZSEEK(s->z_filefunc, s->filestream,
-              s->pos_in_central_dir+s->byte_before_the_zipfile,
-              ZLIB_FILEFUNC_SEEK_SET)!=0)
-        err=UNZ_ERRNO;
-
-
-    /* we check the magic */
-    if (err==UNZ_OK)
-        if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uMagic) != UNZ_OK)
-            err=UNZ_ERRNO;
-        else if (uMagic!=0x02014b50)
-            err=UNZ_BADZIPFILE;
-
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.version) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.version_needed) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.flag) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.compression_method) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.dosDate) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    unzlocal_DosDateToTmuDate(file_info.dosDate,&file_info.tmu_date);
-
-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.crc) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.compressed_size) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.uncompressed_size) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.size_filename) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.size_file_extra) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.size_file_comment) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.disk_num_start) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.internal_fa) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.external_fa) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info_internal.offset_curfile) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    lSeek+=file_info.size_filename;
-    if ((err==UNZ_OK) && (szFileName!=NULL))
-    {
-        uLong uSizeRead ;
-        if (file_info.size_filename<fileNameBufferSize)
-        {
-            *(szFileName+file_info.size_filename)='\0';
-            uSizeRead = file_info.size_filename;
-        }
-        else
-            uSizeRead = fileNameBufferSize;
-
-        if ((file_info.size_filename>0) && (fileNameBufferSize>0))
-            if (ZREAD(s->z_filefunc, s->filestream,szFileName,uSizeRead)!=uSizeRead)
-                err=UNZ_ERRNO;
-        lSeek -= uSizeRead;
-    }
-
-
-    if ((err==UNZ_OK) && (extraField!=NULL))
-    {
-        uLong uSizeRead ;
-        if (file_info.size_file_extra<extraFieldBufferSize)
-            uSizeRead = file_info.size_file_extra;
-        else
-            uSizeRead = extraFieldBufferSize;
-
-        if (lSeek!=0)
-            if (ZSEEK(s->z_filefunc, s->filestream,lSeek,ZLIB_FILEFUNC_SEEK_CUR)==0)
-                lSeek=0;
-            else
-                err=UNZ_ERRNO;
-        if ((file_info.size_file_extra>0) && (extraFieldBufferSize>0))
-            if (ZREAD(s->z_filefunc, s->filestream,extraField,uSizeRead)!=uSizeRead)
-                err=UNZ_ERRNO;
-        lSeek += file_info.size_file_extra - uSizeRead;
-    }
-    else
-        lSeek+=file_info.size_file_extra;
-
-
-    if ((err==UNZ_OK) && (szComment!=NULL))
-    {
-        uLong uSizeRead ;
-        if (file_info.size_file_comment<commentBufferSize)
-        {
-            *(szComment+file_info.size_file_comment)='\0';
-            uSizeRead = file_info.size_file_comment;
-        }
-        else
-            uSizeRead = commentBufferSize;
-
-        if (lSeek!=0)
-            if (ZSEEK(s->z_filefunc, s->filestream,lSeek,ZLIB_FILEFUNC_SEEK_CUR)==0)
-                lSeek=0;
-            else
-                err=UNZ_ERRNO;
-        if ((file_info.size_file_comment>0) && (commentBufferSize>0))
-            if (ZREAD(s->z_filefunc, s->filestream,szComment,uSizeRead)!=uSizeRead)
-                err=UNZ_ERRNO;
-        lSeek+=file_info.size_file_comment - uSizeRead;
-    }
-    else
-        lSeek+=file_info.size_file_comment;
-
-    if ((err==UNZ_OK) && (pfile_info!=NULL))
-        *pfile_info=file_info;
-
-    if ((err==UNZ_OK) && (pfile_info_internal!=NULL))
-        *pfile_info_internal=file_info_internal;
-
-    return err;
-}
-
-
-
-/*
-  Write info about the ZipFile in the *pglobal_info structure.
-  No preparation of the structure is needed
-  return UNZ_OK if there is no problem.
-*/
-extern int ZEXPORT unzGetCurrentFileInfo (file,
-                                          pfile_info,
-                                          szFileName, fileNameBufferSize,
-                                          extraField, extraFieldBufferSize,
-                                          szComment,  commentBufferSize)
-    unzFile file;
-    unz_file_info *pfile_info;
-    char *szFileName;
-    uLong fileNameBufferSize;
-    void *extraField;
-    uLong extraFieldBufferSize;
-    char *szComment;
-    uLong commentBufferSize;
-{
-    return unzlocal_GetCurrentFileInfoInternal(file,pfile_info,NULL,
-                                                szFileName,fileNameBufferSize,
-                                                extraField,extraFieldBufferSize,
-                                                szComment,commentBufferSize);
-}
-
-/*
-  Set the current file of the zipfile to the first file.
-  return UNZ_OK if there is no problem
-*/
-extern int ZEXPORT unzGoToFirstFile (file)
-    unzFile file;
-{
-    int err=UNZ_OK;
-    unz_s* s;
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz_s*)file;
-    s->pos_in_central_dir=s->offset_central_dir;
-    s->num_file=0;
-    err=unzlocal_GetCurrentFileInfoInternal(file,&s->cur_file_info,
-                                             &s->cur_file_info_internal,
-                                             NULL,0,NULL,0,NULL,0);
-    s->current_file_ok = (err == UNZ_OK);
-    return err;
-}
-
-/*
-  Set the current file of the zipfile to the next file.
-  return UNZ_OK if there is no problem
-  return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest.
-*/
-extern int ZEXPORT unzGoToNextFile (file)
-    unzFile file;
-{
-    unz_s* s;
-    int err;
-
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz_s*)file;
-    if (!s->current_file_ok)
-        return UNZ_END_OF_LIST_OF_FILE;
-    if (s->gi.number_entry != 0xffff)    /* 2^16 files overflow hack */
-      if (s->num_file+1==s->gi.number_entry)
-        return UNZ_END_OF_LIST_OF_FILE;
-
-    s->pos_in_central_dir += SIZECENTRALDIRITEM + s->cur_file_info.size_filename +
-            s->cur_file_info.size_file_extra + s->cur_file_info.size_file_comment ;
-    s->num_file++;
-    err = unzlocal_GetCurrentFileInfoInternal(file,&s->cur_file_info,
-                                               &s->cur_file_info_internal,
-                                               NULL,0,NULL,0,NULL,0);
-    s->current_file_ok = (err == UNZ_OK);
-    return err;
-}
-
-
-/*
-  Try locate the file szFileName in the zipfile.
-  For the iCaseSensitivity signification, see unzipStringFileNameCompare
-
-  return value :
-  UNZ_OK if the file is found. It becomes the current file.
-  UNZ_END_OF_LIST_OF_FILE if the file is not found
-*/
-extern int ZEXPORT unzLocateFile (file, szFileName, iCaseSensitivity)
-    unzFile file;
-    const char *szFileName;
-    int iCaseSensitivity;
-{
-    unz_s* s;
-    int err;
-
-    /* We remember the 'current' position in the file so that we can jump
-     * back there if we fail.
-     */
-    unz_file_info cur_file_infoSaved;
-    unz_file_info_internal cur_file_info_internalSaved;
-    uLong num_fileSaved;
-    uLong pos_in_central_dirSaved;
-
-
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-
-    if (strlen(szFileName)>=UNZ_MAXFILENAMEINZIP)
-        return UNZ_PARAMERROR;
-
-    s=(unz_s*)file;
-    if (!s->current_file_ok)
-        return UNZ_END_OF_LIST_OF_FILE;
-
-    /* Save the current state */
-    num_fileSaved = s->num_file;
-    pos_in_central_dirSaved = s->pos_in_central_dir;
-    cur_file_infoSaved = s->cur_file_info;
-    cur_file_info_internalSaved = s->cur_file_info_internal;
-
-    err = unzGoToFirstFile(file);
-
-    while (err == UNZ_OK)
-    {
-        char szCurrentFileName[UNZ_MAXFILENAMEINZIP+1];
-        err = unzGetCurrentFileInfo(file,NULL,
-                                    szCurrentFileName,sizeof(szCurrentFileName)-1,
-                                    NULL,0,NULL,0);
-        if (err == UNZ_OK)
-        {
-            if (unzStringFileNameCompare(szCurrentFileName,
-                                            szFileName,iCaseSensitivity)==0)
-                return UNZ_OK;
-            err = unzGoToNextFile(file);
-        }
-    }
-
-    /* We failed, so restore the state of the 'current file' to where we
-     * were.
-     */
-    s->num_file = num_fileSaved ;
-    s->pos_in_central_dir = pos_in_central_dirSaved ;
-    s->cur_file_info = cur_file_infoSaved;
-    s->cur_file_info_internal = cur_file_info_internalSaved;
-    return err;
-}
-
-
-/*
-///////////////////////////////////////////
-// Contributed by Ryan Haksi (mailto://cryogen@infoserve.net)
-// I need random access
-//
-// Further optimization could be realized by adding an ability
-// to cache the directory in memory. The goal being a single
-// comprehensive file read to put the file I need in a memory.
-*/
-
-/*
-typedef struct unz_file_pos_s
-{
-    uLong pos_in_zip_directory;   // offset in file
-    uLong num_of_file;            // # of file
-} unz_file_pos;
-*/
-
-extern int ZEXPORT unzGetFilePos(file, file_pos)
-    unzFile file;
-    unz_file_pos* file_pos;
-{
-    unz_s* s;
-
-    if (file==NULL || file_pos==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz_s*)file;
-    if (!s->current_file_ok)
-        return UNZ_END_OF_LIST_OF_FILE;
-
-    file_pos->pos_in_zip_directory  = s->pos_in_central_dir;
-    file_pos->num_of_file           = s->num_file;
-
-    return UNZ_OK;
-}
-
-extern int ZEXPORT unzGoToFilePos(file, file_pos)
-    unzFile file;
-    unz_file_pos* file_pos;
-{
-    unz_s* s;
-    int err;
-
-    if (file==NULL || file_pos==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz_s*)file;
-
-    /* jump to the right spot */
-    s->pos_in_central_dir = file_pos->pos_in_zip_directory;
-    s->num_file           = file_pos->num_of_file;
-
-    /* set the current file */
-    err = unzlocal_GetCurrentFileInfoInternal(file,&s->cur_file_info,
-                                               &s->cur_file_info_internal,
-                                               NULL,0,NULL,0,NULL,0);
-    /* return results */
-    s->current_file_ok = (err == UNZ_OK);
-    return err;
-}
-
-/*
-// Unzip Helper Functions - should be here?
-///////////////////////////////////////////
-*/
-
-/*
-  Read the local header of the current zipfile
-  Check the coherency of the local header and info in the end of central
-        directory about this file
-  store in *piSizeVar the size of extra info in local header
-        (filename and size of extra field data)
-*/
-local int unzlocal_CheckCurrentFileCoherencyHeader (s,piSizeVar,
-                                                    poffset_local_extrafield,
-                                                    psize_local_extrafield)
-    unz_s* s;
-    uInt* piSizeVar;
-    uLong *poffset_local_extrafield;
-    uInt  *psize_local_extrafield;
-{
-    uLong uMagic,uData,uFlags;
-    uLong size_filename;
-    uLong size_extra_field;
-    int err=UNZ_OK;
-
-    *piSizeVar = 0;
-    *poffset_local_extrafield = 0;
-    *psize_local_extrafield = 0;
-
-    if (ZSEEK(s->z_filefunc, s->filestream,s->cur_file_info_internal.offset_curfile +
-                                s->byte_before_the_zipfile,ZLIB_FILEFUNC_SEEK_SET)!=0)
-        return UNZ_ERRNO;
-
-
-    if (err==UNZ_OK)
-        if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uMagic) != UNZ_OK)
-            err=UNZ_ERRNO;
-        else if (uMagic!=0x04034b50)
-            err=UNZ_BADZIPFILE;
-
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&uData) != UNZ_OK)
-        err=UNZ_ERRNO;
-/*
-    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.wVersion))
-        err=UNZ_BADZIPFILE;
-*/
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&uFlags) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&uData) != UNZ_OK)
-        err=UNZ_ERRNO;
-    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.compression_method))
-        err=UNZ_BADZIPFILE;
-
-    if ((err==UNZ_OK) && (s->cur_file_info.compression_method!=0) &&
-                         (s->cur_file_info.compression_method!=Z_DEFLATED))
-        err=UNZ_BADZIPFILE;
-
-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* date/time */
-        err=UNZ_ERRNO;
-
-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* crc */
-        err=UNZ_ERRNO;
-    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.crc) &&
-                              ((uFlags & 8)==0))
-        err=UNZ_BADZIPFILE;
-
-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* size compr */
-        err=UNZ_ERRNO;
-    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.compressed_size) &&
-                              ((uFlags & 8)==0))
-        err=UNZ_BADZIPFILE;
-
-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* size uncompr */
-        err=UNZ_ERRNO;
-    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.uncompressed_size) &&
-                              ((uFlags & 8)==0))
-        err=UNZ_BADZIPFILE;
-
-
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&size_filename) != UNZ_OK)
-        err=UNZ_ERRNO;
-    else if ((err==UNZ_OK) && (size_filename!=s->cur_file_info.size_filename))
-        err=UNZ_BADZIPFILE;
-
-    *piSizeVar += (uInt)size_filename;
-
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&size_extra_field) != UNZ_OK)
-        err=UNZ_ERRNO;
-    *poffset_local_extrafield= s->cur_file_info_internal.offset_curfile +
-                                    SIZEZIPLOCALHEADER + size_filename;
-    *psize_local_extrafield = (uInt)size_extra_field;
-
-    *piSizeVar += (uInt)size_extra_field;
-
-    return err;
-}
-
-/*
-  Open for reading data the current file in the zipfile.
-  If there is no error and the file is opened, the return value is UNZ_OK.
-*/
-extern int ZEXPORT unzOpenCurrentFile3 (file, method, level, raw, password)
-    unzFile file;
-    int* method;
-    int* level;
-    int raw;
-    const char* password;
-{
-    int err=UNZ_OK;
-    uInt iSizeVar;
-    unz_s* s;
-    file_in_zip_read_info_s* pfile_in_zip_read_info;
-    uLong offset_local_extrafield;  /* offset of the local extra field */
-    uInt  size_local_extrafield;    /* size of the local extra field */
-#    ifndef NOUNCRYPT
-    char source[12];
-#    else
-    if (password != NULL)
-        return UNZ_PARAMERROR;
-#    endif
-
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz_s*)file;
-    if (!s->current_file_ok)
-        return UNZ_PARAMERROR;
-
-    if (s->pfile_in_zip_read != NULL)
-        unzCloseCurrentFile(file);
-
-    if (unzlocal_CheckCurrentFileCoherencyHeader(s,&iSizeVar,
-                &offset_local_extrafield,&size_local_extrafield)!=UNZ_OK)
-        return UNZ_BADZIPFILE;
-
-    pfile_in_zip_read_info = (file_in_zip_read_info_s*)
-                                        ALLOC(sizeof(file_in_zip_read_info_s));
-    if (pfile_in_zip_read_info==NULL)
-        return UNZ_INTERNALERROR;
-
-    pfile_in_zip_read_info->read_buffer=(char*)ALLOC(UNZ_BUFSIZE);
-    pfile_in_zip_read_info->offset_local_extrafield = offset_local_extrafield;
-    pfile_in_zip_read_info->size_local_extrafield = size_local_extrafield;
-    pfile_in_zip_read_info->pos_local_extrafield=0;
-    pfile_in_zip_read_info->raw=raw;
-
-    if (pfile_in_zip_read_info->read_buffer==NULL)
-    {
-        TRYFREE(pfile_in_zip_read_info);
-        return UNZ_INTERNALERROR;
-    }
-
-    pfile_in_zip_read_info->stream_initialised=0;
-
-    if (method!=NULL)
-        *method = (int)s->cur_file_info.compression_method;
-
-    if (level!=NULL)
-    {
-        *level = 6;
-        switch (s->cur_file_info.flag & 0x06)
-        {
-          case 6 : *level = 1; break;
-          case 4 : *level = 2; break;
-          case 2 : *level = 9; break;
-        }
-    }
-
-    if ((s->cur_file_info.compression_method!=0) &&
-        (s->cur_file_info.compression_method!=Z_DEFLATED))
-        err=UNZ_BADZIPFILE;
-
-    pfile_in_zip_read_info->crc32_wait=s->cur_file_info.crc;
-    pfile_in_zip_read_info->crc32=0;
-    pfile_in_zip_read_info->compression_method =
-            s->cur_file_info.compression_method;
-    pfile_in_zip_read_info->filestream=s->filestream;
-    pfile_in_zip_read_info->z_filefunc=s->z_filefunc;
-    pfile_in_zip_read_info->byte_before_the_zipfile=s->byte_before_the_zipfile;
-
-    pfile_in_zip_read_info->stream.total_out = 0;
-
-    if ((s->cur_file_info.compression_method==Z_DEFLATED) &&
-        (!raw))
-    {
-      pfile_in_zip_read_info->stream.zalloc = (alloc_func)0;
-      pfile_in_zip_read_info->stream.zfree = (free_func)0;
-      pfile_in_zip_read_info->stream.opaque = (voidpf)0;
-      pfile_in_zip_read_info->stream.next_in = (voidpf)0;
-      pfile_in_zip_read_info->stream.avail_in = 0;
-
-      err=inflateInit2(&pfile_in_zip_read_info->stream, -MAX_WBITS);
-      if (err == Z_OK)
-        pfile_in_zip_read_info->stream_initialised=1;
-      else
-      {
-        TRYFREE(pfile_in_zip_read_info);
-        return err;
-      }
-        /* windowBits is passed < 0 to tell that there is no zlib header.
-         * Note that in this case inflate *requires* an extra "dummy" byte
-         * after the compressed stream in order to complete decompression and
-         * return Z_STREAM_END.
-         * In unzip, i don't wait absolutely Z_STREAM_END because I known the
-         * size of both compressed and uncompressed data
-         */
-    }
-    pfile_in_zip_read_info->rest_read_compressed =
-            s->cur_file_info.compressed_size ;
-    pfile_in_zip_read_info->rest_read_uncompressed =
-            s->cur_file_info.uncompressed_size ;
-
-
-    pfile_in_zip_read_info->pos_in_zipfile =
-            s->cur_file_info_internal.offset_curfile + SIZEZIPLOCALHEADER +
-              iSizeVar;
-
-    pfile_in_zip_read_info->stream.avail_in = (uInt)0;
-
-    s->pfile_in_zip_read = pfile_in_zip_read_info;
-
-#    ifndef NOUNCRYPT
-    if (password != NULL)
-    {
-        int i;
-        s->pcrc_32_tab = get_crc_table();
-        init_keys(password,s->keys,s->pcrc_32_tab);
-        if (ZSEEK(s->z_filefunc, s->filestream,
-                  s->pfile_in_zip_read->pos_in_zipfile +
-                     s->pfile_in_zip_read->byte_before_the_zipfile,
-                  SEEK_SET)!=0)
-            return UNZ_INTERNALERROR;
-        if(ZREAD(s->z_filefunc, s->filestream,source, 12)<12)
-            return UNZ_INTERNALERROR;
-
-        for (i = 0; i<12; i++)
-            zdecode(s->keys,s->pcrc_32_tab,source[i]);
-
-        s->pfile_in_zip_read->pos_in_zipfile+=12;
-        s->encrypted=1;
-    }
-#    endif
-
-
-    return UNZ_OK;
-}
-
-extern int ZEXPORT unzOpenCurrentFile (file)
-    unzFile file;
-{
-    return unzOpenCurrentFile3(file, NULL, NULL, 0, NULL);
-}
-
-extern int ZEXPORT unzOpenCurrentFilePassword (file, password)
-    unzFile file;
-    const char* password;
-{
-    return unzOpenCurrentFile3(file, NULL, NULL, 0, password);
-}
-
-extern int ZEXPORT unzOpenCurrentFile2 (file,method,level,raw)
-    unzFile file;
-    int* method;
-    int* level;
-    int raw;
-{
-    return unzOpenCurrentFile3(file, method, level, raw, NULL);
-}
-
-/*
-  Read bytes from the current file.
-  buf contain buffer where data must be copied
-  len the size of buf.
-
-  return the number of byte copied if somes bytes are copied
-  return 0 if the end of file was reached
-  return <0 with error code if there is an error
-    (UNZ_ERRNO for IO error, or zLib error for uncompress error)
-*/
-extern int ZEXPORT unzReadCurrentFile  (file, buf, len)
-    unzFile file;
-    voidp buf;
-    unsigned len;
-{
-    int err=UNZ_OK;
-    uInt iRead = 0;
-    unz_s* s;
-    file_in_zip_read_info_s* pfile_in_zip_read_info;
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz_s*)file;
-    pfile_in_zip_read_info=s->pfile_in_zip_read;
-
-    if (pfile_in_zip_read_info==NULL)
-        return UNZ_PARAMERROR;
-
-
-    if (pfile_in_zip_read_info->read_buffer == NULL)
-        return UNZ_END_OF_LIST_OF_FILE;
-    if (len==0)
-        return 0;
-
-    pfile_in_zip_read_info->stream.next_out = (Bytef*)buf;
-
-    pfile_in_zip_read_info->stream.avail_out = (uInt)len;
-
-    if ((len>pfile_in_zip_read_info->rest_read_uncompressed) &&
-        (!(pfile_in_zip_read_info->raw)))
-        pfile_in_zip_read_info->stream.avail_out =
-            (uInt)pfile_in_zip_read_info->rest_read_uncompressed;
-
-    if ((len>pfile_in_zip_read_info->rest_read_compressed+
-           pfile_in_zip_read_info->stream.avail_in) &&
-         (pfile_in_zip_read_info->raw))
-        pfile_in_zip_read_info->stream.avail_out =
-            (uInt)pfile_in_zip_read_info->rest_read_compressed+
-            pfile_in_zip_read_info->stream.avail_in;
-
-    while (pfile_in_zip_read_info->stream.avail_out>0)
-    {
-        if ((pfile_in_zip_read_info->stream.avail_in==0) &&
-            (pfile_in_zip_read_info->rest_read_compressed>0))
-        {
-            uInt uReadThis = UNZ_BUFSIZE;
-            if (pfile_in_zip_read_info->rest_read_compressed<uReadThis)
-                uReadThis = (uInt)pfile_in_zip_read_info->rest_read_compressed;
-            if (uReadThis == 0)
-                return UNZ_EOF;
-            if (ZSEEK(pfile_in_zip_read_info->z_filefunc,
-                      pfile_in_zip_read_info->filestream,
-                      pfile_in_zip_read_info->pos_in_zipfile +
-                         pfile_in_zip_read_info->byte_before_the_zipfile,
-                         ZLIB_FILEFUNC_SEEK_SET)!=0)
-                return UNZ_ERRNO;
-            if (ZREAD(pfile_in_zip_read_info->z_filefunc,
-                      pfile_in_zip_read_info->filestream,
-                      pfile_in_zip_read_info->read_buffer,
-                      uReadThis)!=uReadThis)
-                return UNZ_ERRNO;
-
-
-#            ifndef NOUNCRYPT
-            if(s->encrypted)
-            {
-                uInt i;
-                for(i=0;i<uReadThis;i++)
-                  pfile_in_zip_read_info->read_buffer[i] =
-                      zdecode(s->keys,s->pcrc_32_tab,
-                              pfile_in_zip_read_info->read_buffer[i]);
-            }
-#            endif
-
-
-            pfile_in_zip_read_info->pos_in_zipfile += uReadThis;
-
-            pfile_in_zip_read_info->rest_read_compressed-=uReadThis;
-
-            pfile_in_zip_read_info->stream.next_in =
-                (Bytef*)pfile_in_zip_read_info->read_buffer;
-            pfile_in_zip_read_info->stream.avail_in = (uInt)uReadThis;
-        }
-
-        if ((pfile_in_zip_read_info->compression_method==0) || (pfile_in_zip_read_info->raw))
-        {
-            uInt uDoCopy,i ;
-
-            if ((pfile_in_zip_read_info->stream.avail_in == 0) &&
-                (pfile_in_zip_read_info->rest_read_compressed == 0))
-                return (iRead==0) ? UNZ_EOF : iRead;
-
-            if (pfile_in_zip_read_info->stream.avail_out <
-                            pfile_in_zip_read_info->stream.avail_in)
-                uDoCopy = pfile_in_zip_read_info->stream.avail_out ;
-            else
-                uDoCopy = pfile_in_zip_read_info->stream.avail_in ;
-
-            for (i=0;i<uDoCopy;i++)
-                *(pfile_in_zip_read_info->stream.next_out+i) =
-                        *(pfile_in_zip_read_info->stream.next_in+i);
-
-            pfile_in_zip_read_info->crc32 = crc32(pfile_in_zip_read_info->crc32,
-                                pfile_in_zip_read_info->stream.next_out,
-                                uDoCopy);
-            pfile_in_zip_read_info->rest_read_uncompressed-=uDoCopy;
-            pfile_in_zip_read_info->stream.avail_in -= uDoCopy;
-            pfile_in_zip_read_info->stream.avail_out -= uDoCopy;
-            pfile_in_zip_read_info->stream.next_out += uDoCopy;
-            pfile_in_zip_read_info->stream.next_in += uDoCopy;
-            pfile_in_zip_read_info->stream.total_out += uDoCopy;
-            iRead += uDoCopy;
-        }
-        else
-        {
-            uLong uTotalOutBefore,uTotalOutAfter;
-            const Bytef *bufBefore;
-            uLong uOutThis;
-            int flush=Z_SYNC_FLUSH;
-
-            uTotalOutBefore = pfile_in_zip_read_info->stream.total_out;
-            bufBefore = pfile_in_zip_read_info->stream.next_out;
-
-            /*
-            if ((pfile_in_zip_read_info->rest_read_uncompressed ==
-                     pfile_in_zip_read_info->stream.avail_out) &&
-                (pfile_in_zip_read_info->rest_read_compressed == 0))
-                flush = Z_FINISH;
-            */
-            err=inflate(&pfile_in_zip_read_info->stream,flush);
-
-            if ((err>=0) && (pfile_in_zip_read_info->stream.msg!=NULL))
-              err = Z_DATA_ERROR;
-
-            uTotalOutAfter = pfile_in_zip_read_info->stream.total_out;
-            uOutThis = uTotalOutAfter-uTotalOutBefore;
-
-            pfile_in_zip_read_info->crc32 =
-                crc32(pfile_in_zip_read_info->crc32,bufBefore,
-                        (uInt)(uOutThis));
-
-            pfile_in_zip_read_info->rest_read_uncompressed -=
-                uOutThis;
-
-            iRead += (uInt)(uTotalOutAfter - uTotalOutBefore);
-
-            if (err==Z_STREAM_END)
-                return (iRead==0) ? UNZ_EOF : iRead;
-            if (err!=Z_OK)
-                break;
-        }
-    }
-
-    if (err==Z_OK)
-        return iRead;
-    return err;
-}
-
-
-/*
-  Give the current position in uncompressed data
-*/
-extern z_off_t ZEXPORT unztell (file)
-    unzFile file;
-{
-    unz_s* s;
-    file_in_zip_read_info_s* pfile_in_zip_read_info;
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz_s*)file;
-    pfile_in_zip_read_info=s->pfile_in_zip_read;
-
-    if (pfile_in_zip_read_info==NULL)
-        return UNZ_PARAMERROR;
-
-    return (z_off_t)pfile_in_zip_read_info->stream.total_out;
-}
-
-
-/*
-  return 1 if the end of file was reached, 0 elsewhere
-*/
-extern int ZEXPORT unzeof (file)
-    unzFile file;
-{
-    unz_s* s;
-    file_in_zip_read_info_s* pfile_in_zip_read_info;
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz_s*)file;
-    pfile_in_zip_read_info=s->pfile_in_zip_read;
-
-    if (pfile_in_zip_read_info==NULL)
-        return UNZ_PARAMERROR;
-
-    if (pfile_in_zip_read_info->rest_read_uncompressed == 0)
-        return 1;
-    else
-        return 0;
-}
-
-
-
-/*
-  Read extra field from the current file (opened by unzOpenCurrentFile)
-  This is the local-header version of the extra field (sometimes, there is
-    more info in the local-header version than in the central-header)
-
-  if buf==NULL, it return the size of the local extra field that can be read
-
-  if buf!=NULL, len is the size of the buffer, the extra header is copied in
-    buf.
-  the return value is the number of bytes copied in buf, or (if <0)
-    the error code
-*/
-extern int ZEXPORT unzGetLocalExtrafield (file,buf,len)
-    unzFile file;
-    voidp buf;
-    unsigned len;
-{
-    unz_s* s;
-    file_in_zip_read_info_s* pfile_in_zip_read_info;
-    uInt read_now;
-    uLong size_to_read;
-
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz_s*)file;
-    pfile_in_zip_read_info=s->pfile_in_zip_read;
-
-    if (pfile_in_zip_read_info==NULL)
-        return UNZ_PARAMERROR;
-
-    size_to_read = (pfile_in_zip_read_info->size_local_extrafield -
-                pfile_in_zip_read_info->pos_local_extrafield);
-
-    if (buf==NULL)
-        return (int)size_to_read;
-
-    if (len>size_to_read)
-        read_now = (uInt)size_to_read;
-    else
-        read_now = (uInt)len ;
-
-    if (read_now==0)
-        return 0;
-
-    if (ZSEEK(pfile_in_zip_read_info->z_filefunc,
-              pfile_in_zip_read_info->filestream,
-              pfile_in_zip_read_info->offset_local_extrafield +
-              pfile_in_zip_read_info->pos_local_extrafield,
-              ZLIB_FILEFUNC_SEEK_SET)!=0)
-        return UNZ_ERRNO;
-
-    if (ZREAD(pfile_in_zip_read_info->z_filefunc,
-              pfile_in_zip_read_info->filestream,
-              buf,read_now)!=read_now)
-        return UNZ_ERRNO;
-
-    return (int)read_now;
-}
-
-/*
-  Close the file in zip opened with unzipOpenCurrentFile
-  Return UNZ_CRCERROR if all the file was read but the CRC is not good
-*/
-extern int ZEXPORT unzCloseCurrentFile (file)
-    unzFile file;
-{
-    int err=UNZ_OK;
-
-    unz_s* s;
-    file_in_zip_read_info_s* pfile_in_zip_read_info;
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz_s*)file;
-    pfile_in_zip_read_info=s->pfile_in_zip_read;
-
-    if (pfile_in_zip_read_info==NULL)
-        return UNZ_PARAMERROR;
-
-
-    if ((pfile_in_zip_read_info->rest_read_uncompressed == 0) &&
-        (!pfile_in_zip_read_info->raw))
-    {
-        if (pfile_in_zip_read_info->crc32 != pfile_in_zip_read_info->crc32_wait)
-            err=UNZ_CRCERROR;
-    }
-
-
-    TRYFREE(pfile_in_zip_read_info->read_buffer);
-    pfile_in_zip_read_info->read_buffer = NULL;
-    if (pfile_in_zip_read_info->stream_initialised)
-        inflateEnd(&pfile_in_zip_read_info->stream);
-
-    pfile_in_zip_read_info->stream_initialised = 0;
-    TRYFREE(pfile_in_zip_read_info);
-
-    s->pfile_in_zip_read=NULL;
-
-    return err;
-}
-
-
-/*
-  Get the global comment string of the ZipFile, in the szComment buffer.
-  uSizeBuf is the size of the szComment buffer.
-  return the number of byte copied or an error code <0
-*/
-extern int ZEXPORT unzGetGlobalComment (file, szComment, uSizeBuf)
-    unzFile file;
-    char *szComment;
-    uLong uSizeBuf;
-{
-    unz_s* s;
-    uLong uReadThis ;
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz_s*)file;
-
-    uReadThis = uSizeBuf;
-    if (uReadThis>s->gi.size_comment)
-        uReadThis = s->gi.size_comment;
-
-    if (ZSEEK(s->z_filefunc,s->filestream,s->central_pos+22,ZLIB_FILEFUNC_SEEK_SET)!=0)
-        return UNZ_ERRNO;
-
-    if (uReadThis>0)
-    {
-      *szComment='\0';
-      if (ZREAD(s->z_filefunc,s->filestream,szComment,uReadThis)!=uReadThis)
-        return UNZ_ERRNO;
-    }
-
-    if ((szComment != NULL) && (uSizeBuf > s->gi.size_comment))
-        *(szComment+s->gi.size_comment)='\0';
-    return (int)uReadThis;
-}
-
-/* Additions by RX '2004 */
-extern uLong ZEXPORT unzGetOffset (file)
-    unzFile file;
-{
-    unz_s* s;
-
-    if (file==NULL)
-          return UNZ_PARAMERROR;
-    s=(unz_s*)file;
-    if (!s->current_file_ok)
-      return 0;
-    if (s->gi.number_entry != 0 && s->gi.number_entry != 0xffff)
-      if (s->num_file==s->gi.number_entry)
-         return 0;
-    return s->pos_in_central_dir;
-}
-
-extern int ZEXPORT unzSetOffset (file, pos)
-        unzFile file;
-        uLong pos;
-{
-    unz_s* s;
-    int err;
-
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz_s*)file;
-
-    s->pos_in_central_dir = pos;
-    s->num_file = s->gi.number_entry;      /* hack */
-    err = unzlocal_GetCurrentFileInfoInternal(file,&s->cur_file_info,
-                                              &s->cur_file_info_internal,
-                                              NULL,0,NULL,0,NULL,0);
-    s->current_file_ok = (err == UNZ_OK);
-    return err;
-}
diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/minizip/unzip.h b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/minizip/unzip.h
deleted file mode 100644
index c3206a0589..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/minizip/unzip.h
+++ /dev/null
@@ -1,354 +0,0 @@
-/* unzip.h -- IO for uncompress .zip files using zlib
-   Version 1.01e, February 12th, 2005
-
-   Copyright (C) 1998-2005 Gilles Vollant
-
-   This unzip package allow extract file from .ZIP file, compatible with PKZip 2.04g
-     WinZip, InfoZip tools and compatible.
-
-   Multi volume ZipFile (span) are not supported.
-   Encryption compatible with pkzip 2.04g only supported
-   Old compressions used by old PKZip 1.x are not supported
-
-
-   I WAIT FEEDBACK at mail info@winimage.com
-   Visit also http://www.winimage.com/zLibDll/unzip.htm for evolution
-
-   Condition of use and distribution are the same than zlib :
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-
-*/
-
-/* for more info about .ZIP format, see
-      http://www.info-zip.org/pub/infozip/doc/appnote-981119-iz.zip
-      http://www.info-zip.org/pub/infozip/doc/
-   PkWare has also a specification at :
-      ftp://ftp.pkware.com/probdesc.zip
-*/
-
-#ifndef _unz_H
-#define _unz_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef _ZLIB_H
-#include "zlib.h"
-#endif
-
-#ifndef _ZLIBIOAPI_H
-#include "ioapi.h"
-#endif
-
-#if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP)
-/* like the STRICT of WIN32, we define a pointer that cannot be converted
-    from (void*) without cast */
-typedef struct TagunzFile__ { int unused; } unzFile__;
-typedef unzFile__ *unzFile;
-#else
-typedef voidp unzFile;
-#endif
-
-
-#define UNZ_OK                          (0)
-#define UNZ_END_OF_LIST_OF_FILE         (-100)
-#define UNZ_ERRNO                       (Z_ERRNO)
-#define UNZ_EOF                         (0)
-#define UNZ_PARAMERROR                  (-102)
-#define UNZ_BADZIPFILE                  (-103)
-#define UNZ_INTERNALERROR               (-104)
-#define UNZ_CRCERROR                    (-105)
-
-/* tm_unz contain date/time info */
-typedef struct tm_unz_s
-{
-    uInt tm_sec;            /* seconds after the minute - [0,59] */
-    uInt tm_min;            /* minutes after the hour - [0,59] */
-    uInt tm_hour;           /* hours since midnight - [0,23] */
-    uInt tm_mday;           /* day of the month - [1,31] */
-    uInt tm_mon;            /* months since January - [0,11] */
-    uInt tm_year;           /* years - [1980..2044] */
-} tm_unz;
-
-/* unz_global_info structure contain global data about the ZIPfile
-   These data comes from the end of central dir */
-typedef struct unz_global_info_s
-{
-    uLong number_entry;         /* total number of entries in
-                       the central dir on this disk */
-    uLong size_comment;         /* size of the global comment of the zipfile */
-} unz_global_info;
-
-
-/* unz_file_info contain information about a file in the zipfile */
-typedef struct unz_file_info_s
-{
-    uLong version;              /* version made by                 2 bytes */
-    uLong version_needed;       /* version needed to extract       2 bytes */
-    uLong flag;                 /* general purpose bit flag        2 bytes */
-    uLong compression_method;   /* compression method              2 bytes */
-    uLong dosDate;              /* last mod file date in Dos fmt   4 bytes */
-    uLong crc;                  /* crc-32                          4 bytes */
-    uLong compressed_size;      /* compressed size                 4 bytes */
-    uLong uncompressed_size;    /* uncompressed size               4 bytes */
-    uLong size_filename;        /* filename length                 2 bytes */
-    uLong size_file_extra;      /* extra field length              2 bytes */
-    uLong size_file_comment;    /* file comment length             2 bytes */
-
-    uLong disk_num_start;       /* disk number start               2 bytes */
-    uLong internal_fa;          /* internal file attributes        2 bytes */
-    uLong external_fa;          /* external file attributes        4 bytes */
-
-    tm_unz tmu_date;
-} unz_file_info;
-
-extern int ZEXPORT unzStringFileNameCompare OF ((const char* fileName1,
-                                                 const char* fileName2,
-                                                 int iCaseSensitivity));
-/*
-   Compare two filename (fileName1,fileName2).
-   If iCaseSenisivity = 1, comparision is case sensitivity (like strcmp)
-   If iCaseSenisivity = 2, comparision is not case sensitivity (like strcmpi
-                                or strcasecmp)
-   If iCaseSenisivity = 0, case sensitivity is defaut of your operating system
-    (like 1 on Unix, 2 on Windows)
-*/
-
-
-extern unzFile ZEXPORT unzOpen OF((const char *path));
-/*
-  Open a Zip file. path contain the full pathname (by example,
-     on a Windows XP computer "c:\\zlib\\zlib113.zip" or on an Unix computer
-     "zlib/zlib113.zip".
-     If the zipfile cannot be opened (file don't exist or in not valid), the
-       return value is NULL.
-     Else, the return value is a unzFile Handle, usable with other function
-       of this unzip package.
-*/
-
-extern unzFile ZEXPORT unzOpen2 OF((const char *path,
-                                    zlib_filefunc_def* pzlib_filefunc_def));
-/*
-   Open a Zip file, like unzOpen, but provide a set of file low level API
-      for read/write the zip file (see ioapi.h)
-*/
-
-extern int ZEXPORT unzClose OF((unzFile file));
-/*
-  Close a ZipFile opened with unzipOpen.
-  If there is files inside the .Zip opened with unzOpenCurrentFile (see later),
-    these files MUST be closed with unzipCloseCurrentFile before call unzipClose.
-  return UNZ_OK if there is no problem. */
-
-extern int ZEXPORT unzGetGlobalInfo OF((unzFile file,
-                                        unz_global_info *pglobal_info));
-/*
-  Write info about the ZipFile in the *pglobal_info structure.
-  No preparation of the structure is needed
-  return UNZ_OK if there is no problem. */
-
-
-extern int ZEXPORT unzGetGlobalComment OF((unzFile file,
-                                           char *szComment,
-                                           uLong uSizeBuf));
-/*
-  Get the global comment string of the ZipFile, in the szComment buffer.
-  uSizeBuf is the size of the szComment buffer.
-  return the number of byte copied or an error code <0
-*/
-
-
-/***************************************************************************/
-/* Unzip package allow you browse the directory of the zipfile */
-
-extern int ZEXPORT unzGoToFirstFile OF((unzFile file));
-/*
-  Set the current file of the zipfile to the first file.
-  return UNZ_OK if there is no problem
-*/
-
-extern int ZEXPORT unzGoToNextFile OF((unzFile file));
-/*
-  Set the current file of the zipfile to the next file.
-  return UNZ_OK if there is no problem
-  return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest.
-*/
-
-extern int ZEXPORT unzLocateFile OF((unzFile file,
-                     const char *szFileName,
-                     int iCaseSensitivity));
-/*
-  Try locate the file szFileName in the zipfile.
-  For the iCaseSensitivity signification, see unzStringFileNameCompare
-
-  return value :
-  UNZ_OK if the file is found. It becomes the current file.
-  UNZ_END_OF_LIST_OF_FILE if the file is not found
-*/
-
-
-/* ****************************************** */
-/* Ryan supplied functions */
-/* unz_file_info contain information about a file in the zipfile */
-typedef struct unz_file_pos_s
-{
-    uLong pos_in_zip_directory;   /* offset in zip file directory */
-    uLong num_of_file;            /* # of file */
-} unz_file_pos;
-
-extern int ZEXPORT unzGetFilePos(
-    unzFile file,
-    unz_file_pos* file_pos);
-
-extern int ZEXPORT unzGoToFilePos(
-    unzFile file,
-    unz_file_pos* file_pos);
-
-/* ****************************************** */
-
-extern int ZEXPORT unzGetCurrentFileInfo OF((unzFile file,
-                         unz_file_info *pfile_info,
-                         char *szFileName,
-                         uLong fileNameBufferSize,
-                         void *extraField,
-                         uLong extraFieldBufferSize,
-                         char *szComment,
-                         uLong commentBufferSize));
-/*
-  Get Info about the current file
-  if pfile_info!=NULL, the *pfile_info structure will contain somes info about
-        the current file
-  if szFileName!=NULL, the filemane string will be copied in szFileName
-            (fileNameBufferSize is the size of the buffer)
-  if extraField!=NULL, the extra field information will be copied in extraField
-            (extraFieldBufferSize is the size of the buffer).
-            This is the Central-header version of the extra field
-  if szComment!=NULL, the comment string of the file will be copied in szComment
-            (commentBufferSize is the size of the buffer)
-*/
-
-/***************************************************************************/
-/* for reading the content of the current zipfile, you can open it, read data
-   from it, and close it (you can close it before reading all the file)
-   */
-
-extern int ZEXPORT unzOpenCurrentFile OF((unzFile file));
-/*
-  Open for reading data the current file in the zipfile.
-  If there is no error, the return value is UNZ_OK.
-*/
-
-extern int ZEXPORT unzOpenCurrentFilePassword OF((unzFile file,
-                                                  const char* password));
-/*
-  Open for reading data the current file in the zipfile.
-  password is a crypting password
-  If there is no error, the return value is UNZ_OK.
-*/
-
-extern int ZEXPORT unzOpenCurrentFile2 OF((unzFile file,
-                                           int* method,
-                                           int* level,
-                                           int raw));
-/*
-  Same than unzOpenCurrentFile, but open for read raw the file (not uncompress)
-    if raw==1
-  *method will receive method of compression, *level will receive level of
-     compression
-  note : you can set level parameter as NULL (if you did not want known level,
-         but you CANNOT set method parameter as NULL
-*/
-
-extern int ZEXPORT unzOpenCurrentFile3 OF((unzFile file,
-                                           int* method,
-                                           int* level,
-                                           int raw,
-                                           const char* password));
-/*
-  Same than unzOpenCurrentFile, but open for read raw the file (not uncompress)
-    if raw==1
-  *method will receive method of compression, *level will receive level of
-     compression
-  note : you can set level parameter as NULL (if you did not want known level,
-         but you CANNOT set method parameter as NULL
-*/
-
-
-extern int ZEXPORT unzCloseCurrentFile OF((unzFile file));
-/*
-  Close the file in zip opened with unzOpenCurrentFile
-  Return UNZ_CRCERROR if all the file was read but the CRC is not good
-*/
-
-extern int ZEXPORT unzReadCurrentFile OF((unzFile file,
-                      voidp buf,
-                      unsigned len));
-/*
-  Read bytes from the current file (opened by unzOpenCurrentFile)
-  buf contain buffer where data must be copied
-  len the size of buf.
-
-  return the number of byte copied if somes bytes are copied
-  return 0 if the end of file was reached
-  return <0 with error code if there is an error
-    (UNZ_ERRNO for IO error, or zLib error for uncompress error)
-*/
-
-extern z_off_t ZEXPORT unztell OF((unzFile file));
-/*
-  Give the current position in uncompressed data
-*/
-
-extern int ZEXPORT unzeof OF((unzFile file));
-/*
-  return 1 if the end of file was reached, 0 elsewhere
-*/
-
-extern int ZEXPORT unzGetLocalExtrafield OF((unzFile file,
-                                             voidp buf,
-                                             unsigned len));
-/*
-  Read extra field from the current file (opened by unzOpenCurrentFile)
-  This is the local-header version of the extra field (sometimes, there is
-    more info in the local-header version than in the central-header)
-
-  if buf==NULL, it return the size of the local extra field
-
-  if buf!=NULL, len is the size of the buffer, the extra header is copied in
-    buf.
-  the return value is the number of bytes copied in buf, or (if <0)
-    the error code
-*/
-
-/***************************************************************************/
-
-/* Get the current file offset */
-extern uLong ZEXPORT unzGetOffset (unzFile file);
-
-/* Set the current file offset */
-extern int ZEXPORT unzSetOffset (unzFile file, uLong pos);
-
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _unz_H */
diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/zip.h b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/zip.h
deleted file mode 100644
index a4f0716054..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/zip.h
+++ /dev/null
@@ -1,15 +0,0 @@
-//
-//  Header.h
-//  WebODF
-//
-//  Created by KO GmbH on 3/1/12.
-//  Copyright (c) 2012 __MyCompanyName__. All rights reserved.
-//
-
-#ifndef WebODF_Header_h
-#define WebODF_Header_h
-
-void readZipEntry(const char* zippath, const char* entrypath) {}
-
-
-#endif
diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/PhoneGap.plist b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/PhoneGap.plist
deleted file mode 100644
index 29011e6d11..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/PhoneGap.plist
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>TopActivityIndicator</key>
-	<string>gray</string>
-	<key>EnableLocation</key>
-	<false/>
-	<key>EnableViewportScale</key>
-	<false/>
-	<key>AutoHideSplashScreen</key>
-	<true/>
-	<key>ShowSplashScreenSpinner</key>
-	<true/>
-	<key>MediaPlaybackRequiresUserAction</key>
-	<false/>
-	<key>AllowInlineMediaPlayback</key>
-	<false/>
-	<key>OpenAllWhitelistURLsInWebView</key>
-	<false/>
-	<key>ExternalHosts</key>
-	<array>
-		<string>zipserver</string>
-	</array>
-	<key>Plugins</key>
-	<dict>
-		<key>ZipClass</key>
-		<string>NativeZip</string>
-		<key>com.phonegap.accelerometer</key>
-		<string>PGAccelerometer</string>
-		<key>com.phonegap.camera</key>
-		<string>PGCamera</string>
-		<key>com.phonegap.connection</key>
-		<string>PGConnection</string>
-		<key>com.phonegap.contacts</key>
-		<string>PGContacts</string>
-		<key>com.phonegap.debugconsole</key>
-		<string>PGDebugConsole</string>
-		<key>com.phonegap.file</key>
-		<string>PGFile</string>
-		<key>com.phonegap.filetransfer</key>
-		<string>PGFileTransfer</string>
-		<key>com.phonegap.geolocation</key>
-		<string>PGLocation</string>
-		<key>com.phonegap.notification</key>
-		<string>PGNotification</string>
-		<key>com.phonegap.media</key>
-		<string>PGSound</string>
-		<key>com.phonegap.mediacapture</key>
-		<string>PGCapture</string>
-		<key>com.phonegap.splashscreen</key>
-		<string>PGSplashScreen</string>
-		<key>com.phonegap.battery</key>
-		<string>PGBattery</string>
-	</dict>
-</dict>
-</plist>
diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Resources/en.lproj/Localizable.strings b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Resources/en.lproj/Localizable.strings
deleted file mode 100644
index 8972684435..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Resources/en.lproj/Localizable.strings
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
- 
- http://www.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-// accessibility label for recording button
-"toggle audio recording" = "toggle audio recording";
-// notification spoken by VoiceOver when timed recording finishes
-"timed recording complete" = "timed recording complete";
-// accessibility hint for display of recorded elapsed time
-"recorded time in minutes and seconds" = "recorded time in minutes and seconds";
\ No newline at end of file
diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Resources/icons/icon-72.png b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Resources/icons/icon-72.png
deleted file mode 100644
index 1aebf5d34b..0000000000
Binary files a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Resources/icons/icon-72.png and /dev/null differ
diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Resources/icons/icon.png b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Resources/icons/icon.png
deleted file mode 100644
index 9e654236c0..0000000000
Binary files a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Resources/icons/icon.png and /dev/null differ
diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Resources/icons/icon@2x.png b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Resources/icons/icon@2x.png
deleted file mode 100644
index b7ccb848e3..0000000000
Binary files a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Resources/icons/icon@2x.png and /dev/null differ
diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Resources/splash/Default-Landscape~ipad.png b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Resources/splash/Default-Landscape~ipad.png
deleted file mode 100644
index 06bb96b394..0000000000
Binary files a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Resources/splash/Default-Landscape~ipad.png and /dev/null differ
diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Resources/splash/Default-Portrait~ipad.png b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Resources/splash/Default-Portrait~ipad.png
deleted file mode 100644
index dbfed967af..0000000000
Binary files a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Resources/splash/Default-Portrait~ipad.png and /dev/null differ
diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Resources/splash/Default.png b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Resources/splash/Default.png
deleted file mode 100755
index fbf06e22d2..0000000000
Binary files a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Resources/splash/Default.png and /dev/null differ
diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Resources/splash/Default@2x.png b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Resources/splash/Default@2x.png
deleted file mode 100755
index e845a3f0b0..0000000000
Binary files a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Resources/splash/Default@2x.png and /dev/null differ
diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/WebODF-Info.plist b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/WebODF-Info.plist
deleted file mode 100644
index 18518ec4c1..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/WebODF-Info.plist
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundleDisplayName</key>
-	<string>${PRODUCT_NAME}</string>
-	<key>CFBundleDocumentTypes</key>
-	<array>
-		<dict>
-			<key>CFBundleTypeIconFiles</key>
-			<array>
-				<string>icon.png</string>
-			</array>
-			<key>CFBundleTypeName</key>
-			<string>OpenDocument Text</string>
-			<key>CFBundleTypeRole</key>
-			<string>Viewer</string>
-			<key>LSHandlerRank</key>
-			<string>Owner</string>
-			<key>LSItemContentTypes</key>
-			<array>
-				<string>org.oasis.opendocument.text</string>
-			</array>
-		</dict>
-		<dict>
-			<key>CFBundleTypeIconFiles</key>
-			<array>
-				<string>icon.png</string>
-			</array>
-			<key>CFBundleTypeName</key>
-			<string>OpenDocument Presentation</string>
-			<key>CFBundleTypeRole</key>
-			<string>Viewer</string>
-			<key>LSHandlerRank</key>
-			<string>Owner</string>
-			<key>LSItemContentTypes</key>
-			<array>
-				<string>org.oasis.opendocument.presentation</string>
-			</array>
-		</dict>
-	</array>
-	<key>CFBundleExecutable</key>
-	<string>${EXECUTABLE_NAME}</string>
-	<key>CFBundleIconFile</key>
-	<string>icon.png</string>
-	<key>CFBundleIconFiles</key>
-	<array>
-		<string>icon.png</string>
-		<string>icon@2x.png</string>
-		<string>icon-72.png</string>
-	</array>
-	<key>CFBundleIdentifier</key>
-	<string>WebODF-03</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>${PRODUCT_NAME}</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>1.0</string>
-	<key>LSRequiresIPhoneOS</key>
-	<true/>
-	<key>UISupportedInterfaceOrientations</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationPortraitUpsideDown</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>UISupportedInterfaceOrientations~ipad</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationPortraitUpsideDown</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>UTExportedTypeDeclarations</key>
-	<array>
-		<dict>
-			<key>UTTypeConformsTo</key>
-			<array>
-				<string>org.gnu.gnu-zip-archive</string>
-			</array>
-			<key>UTTypeDescription</key>
-			<string>OpenDocument Text</string>
-			<key>UTTypeIdentifier</key>
-			<string>org.oasis.opendocument.text</string>
-			<key>UTTypeTagSpecification</key>
-			<dict>
-				<key>public.filename-extension</key>
-				<string>odt</string>
-				<key>public.mime-type</key>
-				<string>application/vnd.oasis.opendocument.text</string>
-			</dict>
-		</dict>
-		<dict>
-			<key>UTTypeConformsTo</key>
-			<array>
-				<string>org.gnu.gnu-zip-archive</string>
-			</array>
-			<key>UTTypeDescription</key>
-			<string>OpenDocument Presentation</string>
-			<key>UTTypeIdentifier</key>
-			<string>org.oasis.opendocument.presentation</string>
-			<key>UTTypeTagSpecification</key>
-			<dict>
-				<key>public.filename-extension</key>
-				<string>odp</string>
-				<key>public.mime-type</key>
-				<string>application/vnd.oasis.opendocument.presentation</string>
-			</dict>
-		</dict>
-	</array>
-</dict>
-</plist>
diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/WebODF-Prefix.pch b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/WebODF-Prefix.pch
deleted file mode 100644
index da48b6a1fd..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/WebODF-Prefix.pch
+++ /dev/null
@@ -1,7 +0,0 @@
-//
-// Prefix header for all source files of the 'WebODF' target in the 'WebODF' project
-//
-
-#ifdef __OBJC__
-    #import <UIKit/UIKit.h>
-#endif
diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/en.lproj/InfoPlist.strings b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/en.lproj/InfoPlist.strings
deleted file mode 100644
index 477b28ff8f..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/en.lproj/InfoPlist.strings
+++ /dev/null
@@ -1,2 +0,0 @@
-/* Localized versions of Info.plist keys */
-
diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/main.m b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/main.m
deleted file mode 100644
index bda2f99ea3..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/main.m
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
- 
- http://www.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-//
-//  main.m
-//  WebODF
-//
-//  Created by KO GmbH on 2/2/12.
-//  Copyright __MyCompanyName__ 2012. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-int main(int argc, char *argv[]) {
-    int retVal = UIApplicationMain(argc, argv, nil, @"AppDelegate");
-    return retVal;
-}
diff --git a/apps/files_odfviewer/src/webodf/programs/ios/www/index.html b/apps/files_odfviewer/src/webodf/programs/ios/www/index.html
deleted file mode 100644
index ec998a1005..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/ios/www/index.html
+++ /dev/null
@@ -1,52 +0,0 @@
-<!DOCTYPE html>
-<html>
- <head>
-  <title>WebODF</title>
-  <link href="sencha-touch.css" rel="stylesheet" type="text/css" />
-  <link href="webodf.css" rel="stylesheet" type="text/css" />
-  <script type="text/javascript" src="phonegap-1.4.1.js"></script>
-  <script type="text/javascript" src="sencha-touch.js"></script>
-  <script type="text/javascript" src="webodf.js"></script>
-  <script type="text/javascript" src="nativezip.js"></script>
-  <script type="text/javascript" src="app/app.js"></script>
-  <script type="text/javascript" src="app/controller/Files.js"></script>
-  <script type="text/javascript" src="app/model/FileSystem.js"></script>
-  <script type="text/javascript" src="app/store/FileStore.js"></script>
-  <script type="text/javascript" src="app/views/FileDetail.js"></script>
-  <script type="text/javascript" src="app/views/FilesList.js"></script>
-  <script type="text/javascript" src="app/views/OdfView.js"></script>
-  <script type="text/javascript" src="app/views/Viewport.js"></script>
-  <script type="text/javascript">
-var applicationReady = false,
-    deviceReady = false,
-    startScanningDirectories,
-    application;
-document.addEventListener("deviceready", function () {
-    deviceReady = true;
-    if (applicationReady) {
-        startScanningDirectories();
-    }
-}, false);
-/**
- * Override this function so it waits until the device is ready.
- */
-onApplicationLaunch = function (app) {
-    "use strict";
-    application = app;
-    applicationReady = true;
-    startScanningDirectories = function () {
-        if (typeof invokeString !== "undefined" && invokeString) {
-            app.openUrl(invokeString);
-        }
-        app.startScanningDirectories();
-    };
-    if (deviceReady) {
-        startScanningDirectories();
-    }
-};
-function handleOpenURL(url) {
-    application.openUrl(url);
-}
-  </script>
- </head><body></body>
-</html>
diff --git a/apps/files_odfviewer/src/webodf/programs/ios/www/nativezip.js b/apps/files_odfviewer/src/webodf/programs/ios/www/nativezip.js
deleted file mode 100644
index 04a8ff13c7..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/ios/www/nativezip.js
+++ /dev/null
@@ -1,84 +0,0 @@
-/*global PhoneGap, core*/
-
-var ZipPlugin = {
-    loadAsString: function (zippath, entrypath, success, fail) {
-        "use strict";
-        return PhoneGap.exec(success, fail, "ZipClass", "loadAsString", [zippath, entrypath]);
-    },
-    loadAsDataURL: function (zippath, entrypath, mimetype, success, fail) {
-        "use strict";
-        return PhoneGap.exec(success, fail, "ZipClass", "loadAsDataURL", [zippath, entrypath, mimetype]);
-    }
-};
-core.Zip = function (url, entriesReadCallback) {
-    "use strict";
-    // remove 'odf:' prefix
-    url = url.substr(4);
-    var zip = this;
-    this.load = function (filename, callback) {
-        //alert(filename);
-        callback(null, "");
-    };
-    this.loadAsString = function (filename, callback) {
-        alert("loadAsString");
-    };
-    this.loadAsDOM = function (filename, callback) {
-        var xhr = new XMLHttpRequest();
-        function handleResult() {
-            var xml;
-            console.log("loading " + filename + " status " + xhr.status + " readyState " + xhr.readyState);
-            if (xhr.readyState === 4) {
-                xml = xhr.responseXML;
-                console.log("done accessing responseXML " + xml + " " + (xhr.responseText && xhr.responseText.length)
-                    + " " + xhr.statusText);
-                console.log("statusText " + xhr.statusText);
-                if (xhr.status === 0 && !xml) {
-                    // empty files are considered as errors
-                    callback("File " + path + " is not valid XML.");
-                } else if (xhr.status === 200 || xhr.status === 0) {
-                    try {
-                        callback(null, xml);
-                    } catch (e) {
-                        console.log(e);
-                    }
-                } else {
-                    // report error
-                    callback(xhr.responseText || xhr.statusText);
-                }
-            }
-        }
-        xhr.open('GET', "http://zipserver" + url + "?" + filename, true);
-        xhr.onreadystatechange = handleResult;
-        xhr.send(null);
-    };
-    this.loadAsDataURL = function (filename, mimetype, callback) {
-        callback(null, "http://zipserver" + url + "?" + filename);
-        /*
-        ZipPlugin.loadAsDataURL(url, filename, mimetype,
-            function (content) {
-                callback(null, content);
-            },
-            function (err) { callback(err, null); }
-            );
-            */
-    };
-    this.getEntries = function () {
-        alert("getEntries");
-    };
-    this.loadContentXmlAsFragments = function (filename, handler) {
-        // the javascript implementation simply reads the file
-        zip.loadAsString(filename, function (err, data) {
-            if (err) {
-                return handler.rootElementReady(err);
-            }
-            handler.rootElementReady(null, data, true);
-        });
-    };
-    this.save = function () {
-        alert("save");
-    };
-    this.write = function () {
-        alert("write");
-    };
-    entriesReadCallback(null, this);
-};
diff --git a/apps/files_odfviewer/src/webodf/programs/ios/www/phonegap-1.4.1.js b/apps/files_odfviewer/src/webodf/programs/ios/www/phonegap-1.4.1.js
deleted file mode 100644
index 680e180209..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/ios/www/phonegap-1.4.1.js
+++ /dev/null
@@ -1,4123 +0,0 @@
-/*     PhoneGap v1.4.1 */
-/*
-       Licensed to the Apache Software Foundation (ASF) under one
-       or more contributor license agreements.  See the NOTICE file
-       distributed with this work for additional information
-       regarding copyright ownership.  The ASF licenses this file
-       to you under the Apache License, Version 2.0 (the
-       "License"); you may not use this file except in compliance
-       with the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-       Unless required by applicable law or agreed to in writing,
-       software distributed under the License is distributed on an
-       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-       KIND, either express or implied.  See the License for the
-       specific language governing permissions and limitations
-       under the License.
-*/
-
-
-/*
- * Some base contributions
- * Copyright (c) 2011, Proyectos Equis Ka, S.L.
- */
-
-if (typeof PhoneGap === "undefined") {
-
-if (typeof(DeviceInfo) !== 'object'){
-    DeviceInfo = {};
-}
-/**
- * This represents the PhoneGap API itself, and provides a global namespace for accessing
- * information about the state of PhoneGap.
- * @class
- */
-PhoneGap = {
-    // This queue holds the currently executing command and all pending
-    // commands executed with PhoneGap.exec().
-    commandQueue: [],
-    // Indicates if we're currently in the middle of flushing the command
-    // queue on the native side.
-    commandQueueFlushing: false,
-    _constructors: [],
-    documentEventHandler: {},   // Collection of custom document event handlers
-    windowEventHandler: {} 
-};
-
-/**
- * List of resource files loaded by PhoneGap.
- * This is used to ensure JS and other files are loaded only once.
- */
-PhoneGap.resources = {base: true};
-
-/**
- * Determine if resource has been loaded by PhoneGap
- *
- * @param name
- * @return
- */
-PhoneGap.hasResource = function(name) {
-    return PhoneGap.resources[name];
-};
-
-/**
- * Add a resource to list of loaded resources by PhoneGap
- *
- * @param name
- */
-PhoneGap.addResource = function(name) {
-    PhoneGap.resources[name] = true;
-};
-
-/**
- * Boolean flag indicating if the PhoneGap API is available and initialized.
- */ // TODO: Remove this, it is unused here ... -jm
-PhoneGap.available = DeviceInfo.uuid != undefined;
-
-/**
- * Add an initialization function to a queue that ensures it will run and initialize
- * application constructors only once PhoneGap has been initialized.
- * @param {Function} func The function callback you want run once PhoneGap is initialized
- */
-PhoneGap.addConstructor = function(func) {
-    var state = document.readyState;
-    if ( ( state == 'loaded' || state == 'complete' ) && DeviceInfo.uuid != null )
-    {
-        func();
-    }
-    else
-    {
-        PhoneGap._constructors.push(func);
-    }
-};
-
-(function() 
- {
-    var timer = setInterval(function()
-    {
-                            
-        var state = document.readyState;
-                            
-        if ( ( state == 'loaded' || state == 'complete' ) && DeviceInfo.uuid != null )
-        {
-            clearInterval(timer); // stop looking
-            // run our constructors list
-            while (PhoneGap._constructors.length > 0) 
-            {
-                var constructor = PhoneGap._constructors.shift();
-                try 
-                {
-                    constructor();
-                } 
-                catch(e) 
-                {
-                    if (typeof(console['log']) == 'function')
-                    {
-                        console.log("Failed to run constructor: " + console.processMessage(e));
-                    }
-                    else
-                    {
-                        alert("Failed to run constructor: " + e.message);
-                    }
-                }
-            }
-            // all constructors run, now fire the deviceready event
-            var e = document.createEvent('Events'); 
-            e.initEvent('deviceready');
-            document.dispatchEvent(e);
-        }
-    }, 1);
-})();
-
-// session id for calls
-PhoneGap.sessionKey = 0;
-
-// centralized callbacks
-PhoneGap.callbackId = 0;
-PhoneGap.callbacks = {};
-PhoneGap.callbackStatus = {
-    NO_RESULT: 0,
-    OK: 1,
-    CLASS_NOT_FOUND_EXCEPTION: 2,
-    ILLEGAL_ACCESS_EXCEPTION: 3,
-    INSTANTIATION_EXCEPTION: 4,
-    MALFORMED_URL_EXCEPTION: 5,
-    IO_EXCEPTION: 6,
-    INVALID_ACTION: 7,
-    JSON_EXCEPTION: 8,
-    ERROR: 9
-    };
-
-/**
- * Creates a gap bridge iframe used to notify the native code about queued
- * commands.
- *
- * @private
- */
-PhoneGap.createGapBridge = function() {
-    gapBridge = document.createElement("iframe");
-    gapBridge.setAttribute("style", "display:none;");
-    gapBridge.setAttribute("height","0px");
-    gapBridge.setAttribute("width","0px");
-    gapBridge.setAttribute("frameborder","0");
-    document.documentElement.appendChild(gapBridge);
-    return gapBridge;
-}
-
-/** 
- * Execute a PhoneGap command by queuing it and letting the native side know
- * there are queued commands. The native side will then request all of the
- * queued commands and execute them.
- *
- * Arguments may be in one of two formats:
- *
- * FORMAT ONE (preferable)
- * The native side will call PhoneGap.callbackSuccess or
- * PhoneGap.callbackError, depending upon the result of the action.
- *
- * @param {Function} success    The success callback
- * @param {Function} fail       The fail callback
- * @param {String} service      The name of the service to use
- * @param {String} action       The name of the action to use
- * @param {String[]} [args]     Zero or more arguments to pass to the method
- *      
- * FORMAT TWO
- * @param {String} command    Command to be run in PhoneGap, e.g.
- *                            "ClassName.method"
- * @param {String[]} [args]   Zero or more arguments to pass to the method
- *                            object parameters are passed as an array object
- *                            [object1, object2] each object will be passed as
- *                            JSON strings 
- */
-PhoneGap.exec = function() { 
-    if (!PhoneGap.available) {
-        alert("ERROR: Attempting to call PhoneGap.exec()"
-              +" before 'deviceready'. Ignoring.");
-        return;
-    }
-
-    var successCallback, failCallback, service, action, actionArgs;
-    var callbackId = null;
-    if (typeof arguments[0] !== "string") {
-        // FORMAT ONE
-        successCallback = arguments[0];
-        failCallback = arguments[1];
-        service = arguments[2];
-        action = arguments[3];
-        actionArgs = arguments[4];
-
-        // Since we need to maintain backwards compatibility, we have to pass
-        // an invalid callbackId even if no callback was provided since plugins
-        // will be expecting it. The PhoneGap.exec() implementation allocates
-        // an invalid callbackId and passes it even if no callbacks were given.
-        callbackId = 'INVALID';
-    } else {
-        // FORMAT TWO
-        splitCommand = arguments[0].split(".");
-        action = splitCommand.pop();
-        service = splitCommand.join(".");
-        actionArgs = Array.prototype.splice.call(arguments, 1);
-    }
-    
-    // Start building the command object.
-    var command = {
-        className: service,
-        methodName: action,
-        arguments: []
-    };
-
-    // Register the callbacks and add the callbackId to the positional
-    // arguments if given.
-    if (successCallback || failCallback) {
-        callbackId = service + PhoneGap.callbackId++;
-        PhoneGap.callbacks[callbackId] = 
-            {success:successCallback, fail:failCallback};
-    }
-    if (callbackId != null) {
-        command.arguments.push(callbackId);
-    }
-
-    for (var i = 0; i < actionArgs.length; ++i) {
-        var arg = actionArgs[i];
-        if (arg == undefined || arg == null) {
-            continue;
-        } else if (typeof(arg) == 'object') {
-            command.options = arg;
-        } else {
-            command.arguments.push(arg);
-        }
-    }
-
-    // Stringify and queue the command. We stringify to command now to
-    // effectively clone the command arguments in case they are mutated before
-    // the command is executed.
-    PhoneGap.commandQueue.push(JSON.stringify(command));
-
-    // If the queue length is 1, then that means it was empty before we queued
-    // the given command, so let the native side know that we have some
-    // commands to execute, unless the queue is currently being flushed, in
-    // which case the command will be picked up without notification.
-    if (PhoneGap.commandQueue.length == 1 && !PhoneGap.commandQueueFlushing) {
-        if (!PhoneGap.gapBridge) {
-            PhoneGap.gapBridge = PhoneGap.createGapBridge();
-        }
-
-        PhoneGap.gapBridge.src = "gap://ready";
-    }
-}
-
-/**
- * Called by native code to retrieve all queued commands and clear the queue.
- */
-PhoneGap.getAndClearQueuedCommands = function() {
-  json = JSON.stringify(PhoneGap.commandQueue);
-  PhoneGap.commandQueue = [];
-  return json;
-}
-
-/**
- * Called by native code when returning successful result from an action.
- *
- * @param callbackId
- * @param args
- *        args.status - PhoneGap.callbackStatus
- *        args.message - return value
- *        args.keepCallback - 0 to remove callback, 1 to keep callback in PhoneGap.callbacks[]
- */
-PhoneGap.callbackSuccess = function(callbackId, args) {
-    if (PhoneGap.callbacks[callbackId]) {
-
-        // If result is to be sent to callback
-        if (args.status == PhoneGap.callbackStatus.OK) {
-            try {
-                if (PhoneGap.callbacks[callbackId].success) {
-                       PhoneGap.callbacks[callbackId].success(args.message);
-                }
-            }
-            catch (e) {
-                console.log("Error in success callback: "+callbackId+" = "+e);
-            }
-        }
-    
-        // Clear callback if not expecting any more results
-        if (!args.keepCallback) {
-            delete PhoneGap.callbacks[callbackId];
-        }
-    }
-};
-
-/**
- * Called by native code when returning error result from an action.
- *
- * @param callbackId
- * @param args
- */
-PhoneGap.callbackError = function(callbackId, args) {
-    if (PhoneGap.callbacks[callbackId]) {
-        try {
-            if (PhoneGap.callbacks[callbackId].fail) {
-                PhoneGap.callbacks[callbackId].fail(args.message);
-            }
-        }
-        catch (e) {
-            console.log("Error in error callback: "+callbackId+" = "+e);
-        }
-        
-        // Clear callback if not expecting any more results
-        if (!args.keepCallback) {
-            delete PhoneGap.callbacks[callbackId];
-        }
-    }
-};
-
-
-/**
- * Does a deep clone of the object.
- *
- * @param obj
- * @return
- */
-PhoneGap.clone = function(obj) {
-    if(!obj) { 
-        return obj;
-    }
-
-    if(obj instanceof Array){
-        var retVal = new Array();
-        for(var i = 0; i < obj.length; ++i){
-            retVal.push(PhoneGap.clone(obj[i]));
-        }
-        return retVal;
-    }
-
-    if (obj instanceof Function) {
-        return obj;
-    }
-
-    if(!(obj instanceof Object)){
-        return obj;
-    }
-    
-    if (obj instanceof Date) {
-        return obj;
-    }
-
-    retVal = new Object();
-    for(i in obj){
-        if(!(i in retVal) || retVal[i] != obj[i]) {
-            retVal[i] = PhoneGap.clone(obj[i]);
-        }
-    }
-    return retVal;
-};
-
-// Intercept calls to document.addEventListener 
-PhoneGap.m_document_addEventListener = document.addEventListener;
-
-// Intercept calls to window.addEventListener
-PhoneGap.m_window_addEventListener = window.addEventListener;
-
-/**
- * Add a custom window event handler.
- *
- * @param {String} event            The event name that callback handles
- * @param {Function} callback       The event handler
- */
-PhoneGap.addWindowEventHandler = function(event, callback) {
-    PhoneGap.windowEventHandler[event] = callback;
-}
-
-/**
- * Add a custom document event handler.
- *
- * @param {String} event            The event name that callback handles
- * @param {Function} callback       The event handler
- */
-PhoneGap.addDocumentEventHandler = function(event, callback) {
-    PhoneGap.documentEventHandler[event] = callback;
-}
-
-/**
- * Intercept adding document event listeners and handle our own
- *
- * @param {Object} evt
- * @param {Function} handler
- * @param capture
- */
-document.addEventListener = function(evt, handler, capture) {
-    var e = evt.toLowerCase();
-           
-    // If subscribing to an event that is handled by a plugin
-    if (typeof PhoneGap.documentEventHandler[e] !== "undefined") {
-        if (PhoneGap.documentEventHandler[e](e, handler, true)) {
-            return; // Stop default behavior
-        }
-    }
-    
-    PhoneGap.m_document_addEventListener.call(document, evt, handler, capture); 
-};
-
-/**
- * Intercept adding window event listeners and handle our own
- *
- * @param {Object} evt
- * @param {Function} handler
- * @param capture
- */
-window.addEventListener = function(evt, handler, capture) {
-    var e = evt.toLowerCase();
-        
-    // If subscribing to an event that is handled by a plugin
-    if (typeof PhoneGap.windowEventHandler[e] !== "undefined") {
-        if (PhoneGap.windowEventHandler[e](e, handler, true)) {
-            return; // Stop default behavior
-        }
-    }
-        
-    PhoneGap.m_window_addEventListener.call(window, evt, handler, capture);
-};
-
-// Intercept calls to document.removeEventListener and watch for events that
-// are generated by PhoneGap native code
-PhoneGap.m_document_removeEventListener = document.removeEventListener;
-
-// Intercept calls to window.removeEventListener
-PhoneGap.m_window_removeEventListener = window.removeEventListener;
-
-/**
- * Intercept removing document event listeners and handle our own
- *
- * @param {Object} evt
- * @param {Function} handler
- * @param capture
- */
-document.removeEventListener = function(evt, handler, capture) {
-    var e = evt.toLowerCase();
-
-    // If unsubcribing from an event that is handled by a plugin
-    if (typeof PhoneGap.documentEventHandler[e] !== "undefined") {
-        if (PhoneGap.documentEventHandler[e](e, handler, false)) {
-            return; // Stop default behavior
-        }
-    }
-
-    PhoneGap.m_document_removeEventListener.call(document, evt, handler, capture);
-};
-
-/**
- * Intercept removing window event listeners and handle our own
- *
- * @param {Object} evt
- * @param {Function} handler
- * @param capture
- */
-window.removeEventListener = function(evt, handler, capture) {
-    var e = evt.toLowerCase();
-
-    // If unsubcribing from an event that is handled by a plugin
-    if (typeof PhoneGap.windowEventHandler[e] !== "undefined") {
-        if (PhoneGap.windowEventHandler[e](e, handler, false)) {
-            return; // Stop default behavior
-        }
-    }
-
-    PhoneGap.m_window_removeEventListener.call(window, evt, handler, capture);
-};
-
-/**
- * Method to fire document event
- *
- * @param {String} type             The event type to fire
- * @param {Object} data             Data to send with event
- */
-PhoneGap.fireDocumentEvent = function(type, data) {
-    var e = document.createEvent('Events');
-    e.initEvent(type);
-    if (data) {
-        for (var i in data) {
-            e[i] = data[i];
-        }
-    }
-    document.dispatchEvent(e);
-};
-
-/**
- * Method to fire window event
- *
- * @param {String} type             The event type to fire
- * @param {Object} data             Data to send with event
- */
-PhoneGap.fireWindowEvent = function(type, data) {
-    var e = document.createEvent('Events');
-    e.initEvent(type);
-    if (data) {
-        for (var i in data) {
-            e[i] = data[i];
-        }
-    }
-    window.dispatchEvent(e);
-};
-
-/**
- * Method to fire event from native code
- * Leaving this generic version to handle problems with iOS 3.x. Is currently used by orientation and battery events
- * Remove when iOS 3.x no longer supported and call fireWindowEvent or fireDocumentEvent directly
- */
-PhoneGap.fireEvent = function(type, target, data) {
-    var e = document.createEvent('Events');
-    e.initEvent(type);
-    if (data) {
-        for (var i in data) {
-            e[i] = data[i];
-        }
-    }
-    target = target || document;
-    if (target.dispatchEvent === undefined) { // ie window.dispatchEvent is undefined in iOS 3.x
-        target = document;
-    } 
-
-    target.dispatchEvent(e);
-};
-/**
- * Create a UUID
- *
- * @return
- */
-PhoneGap.createUUID = function() {
-    return PhoneGap.UUIDcreatePart(4) + '-' +
-        PhoneGap.UUIDcreatePart(2) + '-' +
-        PhoneGap.UUIDcreatePart(2) + '-' +
-        PhoneGap.UUIDcreatePart(2) + '-' +
-        PhoneGap.UUIDcreatePart(6);
-};
-
-PhoneGap.UUIDcreatePart = function(length) {
-    var uuidpart = "";
-    for (var i=0; i<length; i++) {
-        var uuidchar = parseInt((Math.random() * 256)).toString(16);
-        if (uuidchar.length == 1) {
-            uuidchar = "0" + uuidchar;
-        }
-        uuidpart += uuidchar;
-    }
-    return uuidpart;
-};
-};
-
-
-if (!PhoneGap.hasResource("debugconsole")) {
-	PhoneGap.addResource("debugconsole");
-	
-/**
- * This class provides access to the debugging console.
- * @constructor
- */
-var DebugConsole = function() {
-    this.winConsole = window.console;
-    this.logLevel = DebugConsole.INFO_LEVEL;
-}
-
-// from most verbose, to least verbose
-DebugConsole.ALL_LEVEL    = 1; // same as first level
-DebugConsole.INFO_LEVEL   = 1;
-DebugConsole.WARN_LEVEL   = 2;
-DebugConsole.ERROR_LEVEL  = 4;
-DebugConsole.NONE_LEVEL   = 8;
-													
-DebugConsole.prototype.setLevel = function(level) {
-    this.logLevel = level;
-};
-
-/**
- * Utility function for rendering and indenting strings, or serializing
- * objects to a string capable of being printed to the console.
- * @param {Object|String} message The string or object to convert to an indented string
- * @private
- */
-DebugConsole.prototype.processMessage = function(message, maxDepth) {
-	if (maxDepth === undefined) maxDepth = 0;
-    if (typeof(message) != 'object') {
-        return (this.isDeprecated ? "WARNING: debug object is deprecated, please use console object \n" + message : message);
-    } else {
-        /**
-         * @function
-         * @ignore
-         */
-        function indent(str) {
-            return str.replace(/^/mg, "    ");
-        }
-        /**
-         * @function
-         * @ignore
-         */
-        function makeStructured(obj, depth) {
-            var str = "";
-            for (var i in obj) {
-                try {
-                    if (typeof(obj[i]) == 'object' && depth < maxDepth) {
-                        str += i + ":\n" + indent(makeStructured(obj[i])) + "\n";
-                    } else {
-                        str += i + " = " + indent(String(obj[i])).replace(/^    /, "") + "\n";
-                    }
-                } catch(e) {
-                    str += i + " = EXCEPTION: " + e.message + "\n";
-                }
-            }
-            return str;
-        }
-        
-        return ("Object:\n" + makeStructured(message, maxDepth));
-    }
-};
-
-/**
- * Print a normal log message to the console
- * @param {Object|String} message Message or object to print to the console
- */
-DebugConsole.prototype.log = function(message, maxDepth) {
-    if (PhoneGap.available && this.logLevel <= DebugConsole.INFO_LEVEL)
-        PhoneGap.exec(null, null, 'com.phonegap.debugconsole', 'log',
-            [ this.processMessage(message, maxDepth), { logLevel: 'INFO' } ]
-        );
-    else
-        this.winConsole.log(message);
-};
-
-/**
- * Print a warning message to the console
- * @param {Object|String} message Message or object to print to the console
- */
-DebugConsole.prototype.warn = function(message, maxDepth) {
-    if (PhoneGap.available && this.logLevel <= DebugConsole.WARN_LEVEL)
-    	PhoneGap.exec(null, null, 'com.phonegap.debugconsole', 'log',
-            [ this.processMessage(message, maxDepth), { logLevel: 'WARN' } ]
-        );
-    else
-        this.winConsole.error(message);
-};
-
-/**
- * Print an error message to the console
- * @param {Object|String} message Message or object to print to the console
- */
-DebugConsole.prototype.error = function(message, maxDepth) {
-    if (PhoneGap.available && this.logLevel <= DebugConsole.ERROR_LEVEL)
-		PhoneGap.exec(null, null, 'com.phonegap.debugconsole', 'log',
-            [ this.processMessage(message, maxDepth), { logLevel: 'ERROR' } ]
-        );
-    else
-        this.winConsole.error(message);
-};
-
-PhoneGap.addConstructor(function() {
-    window.console = new DebugConsole();
-});
-};
-if (!PhoneGap.hasResource("position")) {
-	PhoneGap.addResource("position");
-
-/**
- * This class contains position information.
- * @param {Object} lat
- * @param {Object} lng
- * @param {Object} acc
- * @param {Object} alt
- * @param {Object} altAcc
- * @param {Object} head
- * @param {Object} vel
- * @constructor
- */
-Position = function(coords, timestamp) {
-	this.coords = Coordinates.cloneFrom(coords);
-    this.timestamp = timestamp || new Date().getTime();
-};
-
-Position.prototype.equals = function(other) {
-    return (this.coords && other && other.coords &&
-            this.coords.latitude == other.coords.latitude &&
-            this.coords.longitude == other.coords.longitude);
-};
-
-Position.prototype.clone = function()
-{
-    return new Position(
-        this.coords? this.coords.clone() : null,
-        this.timestamp? this.timestamp : new Date().getTime()
-    );
-}
-
-Coordinates = function(lat, lng, alt, acc, head, vel, altAcc) {
-	/**
-	 * The latitude of the position.
-	 */
-	this.latitude = lat;
-	/**
-	 * The longitude of the position,
-	 */
-	this.longitude = lng;
-	/**
-	 * The altitude of the position.
-	 */
-	this.altitude = alt;
-	/**
-	 * The accuracy of the position.
-	 */
-	this.accuracy = acc;
-	/**
-	 * The direction the device is moving at the position.
-	 */
-	this.heading = head;
-	/**
-	 * The velocity with which the device is moving at the position.
-	 */
-	this.speed = vel;
-	/**
-	 * The altitude accuracy of the position.
-	 */
-	this.altitudeAccuracy = (altAcc != 'undefined') ? altAcc : null; 
-};
-
-Coordinates.prototype.clone = function()
-{
-    return new Coordinates(
-        this.latitude,
-        this.longitude,
-        this.altitude,
-        this.accuracy,
-        this.heading,
-        this.speed,
-        this.altitudeAccuracy
-    );
-};
-
-Coordinates.cloneFrom = function(obj)
-{
-    return new Coordinates(
-        obj.latitude,
-        obj.longitude,
-        obj.altitude,
-        obj.accuracy,
-        obj.heading,
-        obj.speed,
-        obj.altitudeAccuracy
-    );
-};
-
-/**
- * This class specifies the options for requesting position data.
- * @constructor
- */
-PositionOptions = function(enableHighAccuracy, timeout, maximumAge) {
-	/**
-	 * Specifies the desired position accuracy.
-	 */
-	this.enableHighAccuracy = enableHighAccuracy || false;
-	/**
-	 * The timeout after which if position data cannot be obtained the errorCallback
-	 * is called.
-	 */
-	this.timeout = timeout || 10000;
-	/**
-     * The age of a cached position whose age is no greater than the specified time 
-     * in milliseconds. 
-     */
-	this.maximumAge = maximumAge || 0;
-	
-	if (this.maximumAge < 0) {
-		this.maximumAge = 0;
-	}
-};
-
-/**
- * This class contains information about any GPS errors.
- * @constructor
- */
-PositionError = function(code, message) {
-	this.code = code || 0;
-	this.message = message || "";
-};
-
-PositionError.UNKNOWN_ERROR = 0;
-PositionError.PERMISSION_DENIED = 1;
-PositionError.POSITION_UNAVAILABLE = 2;
-PositionError.TIMEOUT = 3;
-
-};if (!PhoneGap.hasResource("acceleration")) {
-	PhoneGap.addResource("acceleration");
- 	
-
-/**
- * This class contains acceleration information
- * @constructor
- * @param {Number} x The force applied by the device in the x-axis.
- * @param {Number} y The force applied by the device in the y-axis.
- * @param {Number} z The force applied by the device in the z-axis.
- */
-Acceleration = function(x, y, z) {
-	/**
-	 * The force applied by the device in the x-axis.
-	 */
-	this.x = x;
-	/**
-	 * The force applied by the device in the y-axis.
-	 */
-	this.y = y;
-	/**
-	 * The force applied by the device in the z-axis.
-	 */
-	this.z = z;
-	/**
-	 * The time that the acceleration was obtained.
-	 */
-	this.timestamp = new Date().getTime();
-}
-
-/**
- * This class specifies the options for requesting acceleration data.
- * @constructor
- */
-AccelerationOptions = function() {
-	/**
-	 * The timeout after which if acceleration data cannot be obtained the errorCallback
-	 * is called.
-	 */
-	this.timeout = 10000;
-}
-};if (!PhoneGap.hasResource("accelerometer")) {
-	PhoneGap.addResource("accelerometer");
-
-/**
- * This class provides access to device accelerometer data.
- * @constructor
- */
-Accelerometer = function() 
-{
-	/**
-	 * The last known acceleration.
-	 */
-	this.lastAcceleration = new Acceleration(0,0,0);
-}
-
-/**
- * Asynchronously aquires the current acceleration.
- * @param {Function} successCallback The function to call when the acceleration
- * data is available
- * @param {Function} errorCallback The function to call when there is an error 
- * getting the acceleration data.
- * @param {AccelerationOptions} options The options for getting the accelerometer data
- * such as timeout.
- */
-Accelerometer.prototype.getCurrentAcceleration = function(successCallback, errorCallback, options) {
-	// If the acceleration is available then call success
-	// If the acceleration is not available then call error
-	
-	// Created for iPhone, Iphone passes back _accel obj litteral
-	if (typeof successCallback == "function") {
-		successCallback(this.lastAcceleration);
-	}
-};
-
-// private callback called from Obj-C by name
-Accelerometer.prototype._onAccelUpdate = function(x,y,z)
-{
-   this.lastAcceleration = new Acceleration(x,y,z);
-};
-
-/**
- * Asynchronously aquires the acceleration repeatedly at a given interval.
- * @param {Function} successCallback The function to call each time the acceleration
- * data is available
- * @param {Function} errorCallback The function to call when there is an error 
- * getting the acceleration data.
- * @param {AccelerationOptions} options The options for getting the accelerometer data
- * such as timeout.
- */
-
-Accelerometer.prototype.watchAcceleration = function(successCallback, errorCallback, options) {
-	//this.getCurrentAcceleration(successCallback, errorCallback, options);
-	// TODO: add the interval id to a list so we can clear all watches
- 	var frequency = (options != undefined && options.frequency != undefined) ? options.frequency : 10000;
-	var updatedOptions = {
-		desiredFrequency:frequency 
-	}
-	PhoneGap.exec(null, null, "com.phonegap.accelerometer", "start", [options]);
-
-	return setInterval(function() {
-		navigator.accelerometer.getCurrentAcceleration(successCallback, errorCallback, options);
-	}, frequency);
-};
-
-/**
- * Clears the specified accelerometer watch.
- * @param {String} watchId The ID of the watch returned from #watchAcceleration.
- */
-Accelerometer.prototype.clearWatch = function(watchId) {
-	PhoneGap.exec(null, null, "com.phonegap.accelerometer", "stop", []);
-	clearInterval(watchId);
-};
-
-Accelerometer.install = function()
-{
-    if (typeof navigator.accelerometer == "undefined") {
-		navigator.accelerometer = new Accelerometer();
-	}
-};
-
-Accelerometer.installDeviceMotionHandler = function()
-{
-	if (!(window.DeviceMotionEvent == undefined)) {
-		// supported natively, so we don't have to add support
-		return;
-	}	
-	
-	var self = this;
-	var devicemotionEvent = 'devicemotion';
-	self.deviceMotionWatchId = null;
-	self.deviceMotionListenerCount = 0;
-	self.deviceMotionLastEventTimestamp = 0;
-	
-	// backup original `window.addEventListener`, `window.removeEventListener`
-    var _addEventListener = window.addEventListener;
-    var _removeEventListener = window.removeEventListener;
-													
-	var windowDispatchAvailable = !(window.dispatchEvent === undefined); // undefined in iOS 3.x
-													
-	var accelWin = function(acceleration) {
-		var evt = document.createEvent('Events');
-	    evt.initEvent(devicemotionEvent);
-	
-		evt.acceleration = null; // not all devices have gyroscope, don't care for now if we actually have it.
-		evt.rotationRate = null; // not all devices have gyroscope, don't care for now if we actually have it:
-		evt.accelerationIncludingGravity = acceleration; // accelerometer, all iOS devices have it
-		
-		var currentTime = new Date().getTime();
-		evt.interval =  (self.deviceMotionLastEventTimestamp == 0) ? 0 : (currentTime - self.deviceMotionLastEventTimestamp);
-		self.deviceMotionLastEventTimestamp = currentTime;
-		
-		if (windowDispatchAvailable) {
-			window.dispatchEvent(evt);
-		} else {
-			document.dispatchEvent(evt);
-		}
-	};
-	
-	var accelFail = function() {
-		
-	};
-													
-    // override `window.addEventListener`
-    window.addEventListener = function() {
-        if (arguments[0] === devicemotionEvent) {
-            ++(self.deviceMotionListenerCount);
-			if (self.deviceMotionListenerCount == 1) { // start
-				self.deviceMotionWatchId = navigator.accelerometer.watchAcceleration(accelWin, accelFail, { frequency:500});
-			}
-		} 
-													
-		if (!windowDispatchAvailable) {
-			return document.addEventListener.apply(this, arguments);
-		} else {
-			return _addEventListener.apply(this, arguments);
-		}
-    };	
-
-    // override `window.removeEventListener'
-    window.removeEventListener = function() {
-        if (arguments[0] === devicemotionEvent) {
-            --(self.deviceMotionListenerCount);
-			if (self.deviceMotionListenerCount == 0) { // stop
-				navigator.accelerometer.clearWatch(self.deviceMotionWatchId);
-			}
-		} 
-		
-		if (!windowDispatchAvailable) {
-			return document.removeEventListener.apply(this, arguments);
-		} else {
-			return _removeEventListener.apply(this, arguments);
-		}
-    };	
-};
-
-
-PhoneGap.addConstructor(Accelerometer.install);
-PhoneGap.addConstructor(Accelerometer.installDeviceMotionHandler);
-
-};
-if (!PhoneGap.hasResource("battery")) {
-PhoneGap.addResource("battery");
-
-/**
- * This class contains information about the current battery status.
- * @constructor
- */
-var Battery = function() {
-    this._level = null;
-    this._isPlugged = null;
-    this._batteryListener = [];
-    this._lowListener = [];
-    this._criticalListener = [];
-};
-
-/**
- * Registers as an event producer for battery events.
- * 
- * @param {Object} eventType
- * @param {Object} handler
- * @param {Object} add
- */
-Battery.prototype.eventHandler = function(eventType, handler, add) {
-    var me = navigator.battery;
-    if (add) {
-        // If there are no current registered event listeners start the battery listener on native side.
-        if (me._batteryListener.length === 0 && me._lowListener.length === 0 && me._criticalListener.length === 0) {
-            PhoneGap.exec(me._status, me._error, "com.phonegap.battery", "start", []);
-        }
-        
-        // Register the event listener in the proper array
-        if (eventType === "batterystatus") {
-            var pos = me._batteryListener.indexOf(handler);
-            if (pos === -1) {
-            	me._batteryListener.push(handler);
-            }
-        } else if (eventType === "batterylow") {
-            var pos = me._lowListener.indexOf(handler);
-            if (pos === -1) {
-            	me._lowListener.push(handler);
-            }
-        } else if (eventType === "batterycritical") {
-            var pos = me._criticalListener.indexOf(handler);
-            if (pos === -1) {
-            	me._criticalListener.push(handler);
-            }
-        }
-    } else {
-        // Remove the event listener from the proper array
-        if (eventType === "batterystatus") {
-            var pos = me._batteryListener.indexOf(handler);
-            if (pos > -1) {
-                me._batteryListener.splice(pos, 1);        
-            }
-        } else if (eventType === "batterylow") {
-            var pos = me._lowListener.indexOf(handler);
-            if (pos > -1) {
-                me._lowListener.splice(pos, 1);        
-            }
-        } else if (eventType === "batterycritical") {
-            var pos = me._criticalListener.indexOf(handler);
-            if (pos > -1) {
-                me._criticalListener.splice(pos, 1);        
-            }
-        }
-        
-        // If there are no more registered event listeners stop the battery listener on native side.
-        if (me._batteryListener.length === 0 && me._lowListener.length === 0 && me._criticalListener.length === 0) {
-            PhoneGap.exec(null, null, "com.phonegap.battery", "stop", []);
-        }
-    }
-};
-
-/**
- * Callback for battery status
- * 
- * @param {Object} info			keys: level, isPlugged
- */
-Battery.prototype._status = function(info) {
-	if (info) {
-		var me = this;
-		if (me._level != info.level || me._isPlugged != info.isPlugged) {
-			// Fire batterystatus event
-			//PhoneGap.fireWindowEvent("batterystatus", info);
-			// use this workaround since iOS 3.x does have window.dispatchEvent
-			PhoneGap.fireEvent("batterystatus", window, info);	
-
-			// Fire low battery event
-			if (info.level == 20 || info.level == 5) {
-				if (info.level == 20) {
-					//PhoneGap.fireWindowEvent("batterylow", info);
-					// use this workaround since iOS 3.x does not have window.dispatchEvent
-					PhoneGap.fireEvent("batterylow", window, info);
-				}
-				else {
-					//PhoneGap.fireWindowEvent("batterycritical", info);
-					// use this workaround since iOS 3.x does not have window.dispatchEvent
-					PhoneGap.fireEvent("batterycritical", window, info);
-				}
-			}
-		}
-		me._level = info.level;
-		me._isPlugged = info.isPlugged;	
-	}
-};
-
-/**
- * Error callback for battery start
- */
-Battery.prototype._error = function(e) {
-    console.log("Error initializing Battery: " + e);
-};
-
-PhoneGap.addConstructor(function() {
-    if (typeof navigator.battery === "undefined") {
-        navigator.battery = new Battery();
-        PhoneGap.addWindowEventHandler("batterystatus", navigator.battery.eventHandler);
-        PhoneGap.addWindowEventHandler("batterylow", navigator.battery.eventHandler);
-        PhoneGap.addWindowEventHandler("batterycritical", navigator.battery.eventHandler);
-    }
-});
-}if (!PhoneGap.hasResource("camera")) {
-	PhoneGap.addResource("camera");
-	
-
-/**
- * This class provides access to the device camera.
- * @constructor
- */
-Camera = function() {
-	
-}
-/**
- *  Available Camera Options
- *  {boolean} allowEdit - true to allow editing image, default = false
- *	{number} quality 0-100 (low to high) default =  100
- *  {Camera.DestinationType} destinationType default = DATA_URL
- *	{Camera.PictureSourceType} sourceType default = CAMERA
- *	{number} targetWidth - width in pixels to scale image default = 0 (no scaling)
- *  {number} targetHeight - height in pixels to scale image default = 0 (no scaling)
- *  {Camera.EncodingType} - encodingType default = JPEG
- *  {boolean} correctOrientation - Rotate the image to correct for the orientation of the device during capture (iOS only)
- *  {boolean} saveToPhotoAlbum - Save the image to the photo album on the device after capture (iOS only)
- */
-/**
- * Format of image that is returned from getPicture.
- *
- * Example: navigator.camera.getPicture(success, fail,
- *              { quality: 80,
- *                destinationType: Camera.DestinationType.DATA_URL,
- *                sourceType: Camera.PictureSourceType.PHOTOLIBRARY})
- */
-Camera.DestinationType = {
-    DATA_URL: 0,                // Return base64 encoded string
-    FILE_URI: 1                 // Return file uri 
-};
-Camera.prototype.DestinationType = Camera.DestinationType;
-
-/**
- * Source to getPicture from.
- *
- * Example: navigator.camera.getPicture(success, fail,
- *              { quality: 80,
- *                destinationType: Camera.DestinationType.DATA_URL,
- *                sourceType: Camera.PictureSourceType.PHOTOLIBRARY})
- */
-Camera.PictureSourceType = {
-    PHOTOLIBRARY : 0,           // Choose image from picture library 
-    CAMERA : 1,                 // Take picture from camera
-    SAVEDPHOTOALBUM : 2         // Choose image from picture library 
-};
-Camera.prototype.PictureSourceType = Camera.PictureSourceType;
-
-/** 
- * Encoding of image returned from getPicture. 
- * 
- * Example: navigator.camera.getPicture(success, fail, 
- *              { quality: 80, 
- *                destinationType: Camera.DestinationType.DATA_URL, 
- *                sourceType: Camera.PictureSourceType.CAMERA, 
- *                encodingType: Camera.EncodingType.PNG}) 
- */ 
-Camera.EncodingType = { 
-	JPEG: 0,                    // Return JPEG encoded image 
-	PNG: 1                      // Return PNG encoded image 
-};
-Camera.prototype.EncodingType = Camera.EncodingType;
-
-/** 
- * Type of pictures to select from.  Only applicable when
- *	PictureSourceType is PHOTOLIBRARY or SAVEDPHOTOALBUM 
- * 
- * Example: navigator.camera.getPicture(success, fail, 
- *              { quality: 80, 
- *                destinationType: Camera.DestinationType.DATA_URL, 
- *                sourceType: Camera.PictureSourceType.PHOTOLIBRARY, 
- *                mediaType: Camera.MediaType.PICTURE}) 
- */ 
-Camera.MediaType = { 
-	PICTURE: 0,             // allow selection of still pictures only. DEFAULT. Will return format specified via DestinationType
-	VIDEO: 1,                // allow selection of video only, ONLY RETURNS URL
-	ALLMEDIA : 2			// allow selection from all media types
-};
-Camera.prototype.MediaType = Camera.MediaType;
-
-/**
- * Gets a picture from source defined by "options.sourceType", and returns the
- * image as defined by the "options.destinationType" option.
-
- * The defaults are sourceType=CAMERA and destinationType=DATA_URL.
- *
- * @param {Function} successCallback
- * @param {Function} errorCallback
- * @param {Object} options
- */
-Camera.prototype.getPicture = function(successCallback, errorCallback, options) {
-	// successCallback required
-	if (typeof successCallback != "function") {
-        console.log("Camera Error: successCallback is not a function");
-        return;
-    }
-
-    // errorCallback optional
-    if (errorCallback && (typeof errorCallback != "function")) {
-        console.log("Camera Error: errorCallback is not a function");
-        return;
-    }
-	
-	PhoneGap.exec(successCallback, errorCallback, "com.phonegap.camera","getPicture",[options]);
-};
-
-
-
-PhoneGap.addConstructor(function() {
-    if (typeof navigator.camera == "undefined") navigator.camera = new Camera();
-});
-};
-
-if (!PhoneGap.hasResource("device")) {
-	PhoneGap.addResource("device");
-
-/**
- * this represents the mobile device, and provides properties for inspecting the model, version, UUID of the
- * phone, etc.
- * @constructor
- */
-Device = function() 
-{
-    this.platform = null;
-    this.version  = null;
-    this.name     = null;
-    this.phonegap      = null;
-    this.uuid     = null;
-    try 
-	{      
-		this.platform = DeviceInfo.platform;
-		this.version  = DeviceInfo.version;
-		this.name     = DeviceInfo.name;
-		this.phonegap = DeviceInfo.gap;
-		this.uuid     = DeviceInfo.uuid;
-
-    } 
-	catch(e) 
-	{
-        // TODO: 
-    }
-	this.available = PhoneGap.available = this.uuid != null;
-}
-
-PhoneGap.addConstructor(function() {
-	if (typeof navigator.device === "undefined") {
-    	navigator.device = window.device = new Device();
-	}
-});
-};
-if (!PhoneGap.hasResource("capture")) {
-	PhoneGap.addResource("capture");
-/**
- * The CaptureError interface encapsulates all errors in the Capture API.
- */
-function CaptureError() {
-   this.code = null;
-};
-
-// Capture error codes
-CaptureError.CAPTURE_INTERNAL_ERR = 0;
-CaptureError.CAPTURE_APPLICATION_BUSY = 1;
-CaptureError.CAPTURE_INVALID_ARGUMENT = 2;
-CaptureError.CAPTURE_NO_MEDIA_FILES = 3;
-CaptureError.CAPTURE_NOT_SUPPORTED = 20;
-
-/**
- * The Capture interface exposes an interface to the camera and microphone of the hosting device.
- */
-function Capture() {
-	this.supportedAudioModes = [];
-	this.supportedImageModes = [];
-	this.supportedVideoModes = [];
-};
-
-/**
- * Launch audio recorder application for recording audio clip(s).
- * 
- * @param {Function} successCB
- * @param {Function} errorCB
- * @param {CaptureAudioOptions} options
- *
- * No audio recorder to launch for iOS - return CAPTURE_NOT_SUPPORTED
- */
-Capture.prototype.captureAudio = function(successCallback, errorCallback, options) {
-	/*if (errorCallback && typeof errorCallback === "function") {
-		errorCallback({
-				"code": CaptureError.CAPTURE_NOT_SUPPORTED
-			});
-	}*/
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.mediacapture", "captureAudio", [options]);
-};
-
-/**
- * Launch camera application for taking image(s).
- * 
- * @param {Function} successCB
- * @param {Function} errorCB
- * @param {CaptureImageOptions} options
- */
-Capture.prototype.captureImage = function(successCallback, errorCallback, options) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.mediacapture", "captureImage", [options]);
-};
-
-/**
- * Casts a PluginResult message property  (array of objects) to an array of MediaFile objects
- * (used in Objective-C)
- *
- * @param {PluginResult} pluginResult
- */
-Capture.prototype._castMediaFile = function(pluginResult) {
-    var mediaFiles = [];
-    var i;
-    for (i=0; i<pluginResult.message.length; i++) {
-        var mediaFile = new MediaFile();
-	    mediaFile.name = pluginResult.message[i].name;
-	    mediaFile.fullPath = pluginResult.message[i].fullPath;
-	    mediaFile.type = pluginResult.message[i].type;
-	    mediaFile.lastModifiedDate = pluginResult.message[i].lastModifiedDate;
-	    mediaFile.size = pluginResult.message[i].size;
-        mediaFiles.push(mediaFile);
-    }
-    pluginResult.message = mediaFiles;
-    return pluginResult;
-};
-
-/**
- * Launch device camera application for recording video(s).
- * 
- * @param {Function} successCB
- * @param {Function} errorCB
- * @param {CaptureVideoOptions} options
- */
-Capture.prototype.captureVideo = function(successCallback, errorCallback, options) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.mediacapture", "captureVideo", [options]);
-};
-
-/**
- * Encapsulates a set of parameters that the capture device supports.
- */
-function ConfigurationData() {
-    // The ASCII-encoded string in lower case representing the media type. 
-    this.type; 
-    // The height attribute represents height of the image or video in pixels. 
-    // In the case of a sound clip this attribute has value 0. 
-    this.height = 0;
-    // The width attribute represents width of the image or video in pixels. 
-    // In the case of a sound clip this attribute has value 0
-    this.width = 0;
-};
-
-/**
- * Encapsulates all image capture operation configuration options.
- */
-var CaptureImageOptions = function() {
-    // Upper limit of images user can take. Value must be equal or greater than 1.
-    this.limit = 1; 
-    // The selected image mode. Must match with one of the elements in supportedImageModes array.
-    this.mode = null; 
-};
-
-/**
- * Encapsulates all video capture operation configuration options.
- */
-var CaptureVideoOptions = function() {
-    // Upper limit of videos user can record. Value must be equal or greater than 1.
-    this.limit = 1;
-    // Maximum duration of a single video clip in seconds.
-    this.duration = 0;
-    // The selected video mode. Must match with one of the elements in supportedVideoModes array.
-    this.mode = null;
-};
-
-/**
- * Encapsulates all audio capture operation configuration options.
- */
-var CaptureAudioOptions = function() {
-    // Upper limit of sound clips user can record. Value must be equal or greater than 1.
-    this.limit = 1;
-    // Maximum duration of a single sound clip in seconds.
-    this.duration = 0;
-    // The selected audio mode. Must match with one of the elements in supportedAudioModes array.
-    this.mode = null;
-};
-
-/**
- * Represents a single file.
- * 
- * name {DOMString} name of the file, without path information
- * fullPath {DOMString} the full path of the file, including the name
- * type {DOMString} mime type
- * lastModifiedDate {Date} last modified date
- * size {Number} size of the file in bytes
- */
-function MediaFile(name, fullPath, type, lastModifiedDate, size) {
-    this.name = name || null;
-    this.fullPath = fullPath || null;
-    this.type = type || null;
-    this.lastModifiedDate = lastModifiedDate || null;
-    this.size = size || 0;
-}
-
-/**
- * Request capture format data for a specific file and type
- * 
- * @param {Function} successCB
- * @param {Function} errorCB
- */
-MediaFile.prototype.getFormatData = function(successCallback, errorCallback) {
-	if (typeof this.fullPath === "undefined" || this.fullPath === null) {
-		errorCallback({
-				"code": CaptureError.CAPTURE_INVALID_ARGUMENT
-			});
-	} else {
-    	PhoneGap.exec(successCallback, errorCallback, "com.phonegap.mediacapture", "getFormatData", [this.fullPath, this.type]);
-	}	
-};
-
-/**
- * MediaFileData encapsulates format information of a media file.
- * 
- * @param {DOMString} codecs
- * @param {long} bitrate
- * @param {long} height
- * @param {long} width
- * @param {float} duration
- */
-function MediaFileData(codecs, bitrate, height, width, duration) {
-    this.codecs = codecs || null;
-    this.bitrate = bitrate || 0;
-    this.height = height || 0;
-    this.width = width || 0;
-    this.duration = duration || 0;
-}
-
-PhoneGap.addConstructor(function() {
-    if (typeof navigator.device === "undefined") {
-        navigator.device = window.device = new Device();
-    }
-    if (typeof navigator.device.capture === "undefined") {
-        navigator.device.capture = window.device.capture = new Capture();
-    }
-});
-};
-if (!PhoneGap.hasResource("contact")) {
-	PhoneGap.addResource("contact");
-
-
-/**
-* Contains information about a single contact.
-* @param {DOMString} id unique identifier
-* @param {DOMString} displayName
-* @param {ContactName} name
-* @param {DOMString} nickname
-* @param {ContactField[]} phoneNumbers array of phone numbers
-* @param {ContactField[]} emails array of email addresses
-* @param {ContactAddress[]} addresses array of addresses
-* @param {ContactField[]} ims instant messaging user ids
-* @param {ContactOrganization[]} organizations
-* @param {DOMString} birthday contact's birthday
-* @param {DOMString} note user notes about contact
-* @param {ContactField[]} photos
-* @param {Array.<ContactField>} categories
-* @param {ContactField[]} urls contact's web sites
-*/
-var Contact = function(id, displayName, name, nickname, phoneNumbers, emails, addresses,
-    ims, organizations, birthday, note, photos, categories, urls) {
-    this.id = id || null;
-    this.displayName = displayName || null;
-    this.name = name || null; // ContactName
-    this.nickname = nickname || null;
-    this.phoneNumbers = phoneNumbers || null; // ContactField[]
-    this.emails = emails || null; // ContactField[]
-    this.addresses = addresses || null; // ContactAddress[]
-    this.ims = ims || null; // ContactField[]
-    this.organizations = organizations || null; // ContactOrganization[]
-    this.birthday = birthday || null; // JS Date
-    this.note = note || null;
-    this.photos = photos || null; // ContactField[]
-    this.categories = categories || null; 
-    this.urls = urls || null; // ContactField[]
-};
-
-/**
-* Converts Dates to milliseconds before sending to iOS
-*/
-Contact.prototype.convertDatesOut = function()
-{
-	var dates = new Array("birthday");
-	for (var i=0; i<dates.length; i++){
-		var value = this[dates[i]];
-		if (value){
-			if (!value instanceof Date){
-				try {
-					value = new Date(value);
-				} catch(exception){
-					value = null;
-				}
-			}
-			if (value instanceof Date){
-				value = value.valueOf();
-			}
-			this[dates[i]] = value;
-		}
-	}
-	
-};
-/**
-* Converts milliseconds to JS Date when returning from iOS
-*/
-Contact.prototype.convertDatesIn = function()
-{
-	var dates = new Array("birthday");
-	for (var i=0; i<dates.length; i++){
-		var value = this[dates[i]];
-		if (value){
-			try {
-				this[dates[i]] = new Date(parseFloat(value));
-			} catch (exception){
-				console.log("exception creating date");
-			}
-		}
-	}
-};
-/**
-* Removes contact from device storage.
-* @param successCB success callback
-* @param errorCB error callback (optional)
-*/
-Contact.prototype.remove = function(successCB, errorCB) {
-	if (this.id == null) {
-        var errorObj = new ContactError();
-        errorObj.code = ContactError.UNKNOWN_ERROR;
-        errorCB(errorObj);
-    }
-    else {
-        PhoneGap.exec(successCB, errorCB, "com.phonegap.contacts", "remove", [{ "contact": this}]);
-    }
-};
-/**
-* iOS ONLY
-* displays contact via iOS UI
-*	NOT part of W3C spec so no official documentation
-*
-* @param errorCB error callback
-* @param options object
-*	allowsEditing: boolean AS STRING
-*		"true" to allow editing the contact
-*		"false" (default) display contact
-*/
-Contact.prototype.display = function(errorCB, options) { 
-	if (this.id == null) {
-        if (typeof errorCB == "function") {
-        	var errorObj = new ContactError();
-        	errorObj.code = ContactError.UNKNOWN_ERROR;
-        	errorCB(errorObj);
-		}
-    }
-    else {
-        PhoneGap.exec(null, errorCB, "com.phonegap.contacts","displayContact", [this.id, options]);
-    }
-};
-
-/**
-* Creates a deep copy of this Contact.
-* With the contact ID set to null.
-* @return copy of this Contact
-*/
-Contact.prototype.clone = function() {
-    var clonedContact = PhoneGap.clone(this);
-    clonedContact.id = null;
-    // Loop through and clear out any id's in phones, emails, etc.
-    if (clonedContact.phoneNumbers) {
-    	for (i=0; i<clonedContact.phoneNumbers.length; i++) {
-    		clonedContact.phoneNumbers[i].id = null;
-    	}
-    }
-    if (clonedContact.emails) {
-    	for (i=0; i<clonedContact.emails.length; i++) {
-    		clonedContact.emails[i].id = null;
-    	}
-    }
-    if (clonedContact.addresses) {
-    	for (i=0; i<clonedContact.addresses.length; i++) {
-    		clonedContact.addresses[i].id = null;
-    	}
-    }
-    if (clonedContact.ims) {
-    	for (i=0; i<clonedContact.ims.length; i++) {
-    		clonedContact.ims[i].id = null;
-    	}
-    }
-    if (clonedContact.organizations) {
-    	for (i=0; i<clonedContact.organizations.length; i++) {
-    		clonedContact.organizations[i].id = null;
-    	}
-    }
-    if (clonedContact.photos) {
-    	for (i=0; i<clonedContact.photos.length; i++) {
-    		clonedContact.photos[i].id = null;
-    	}
-    }
-    if (clonedContact.urls) {
-    	for (i=0; i<clonedContact.urls.length; i++) {
-    		clonedContact.urls[i].id = null;
-    	}
-    }
-    return clonedContact;
-};
-
-/**
-* Persists contact to device storage.
-* @param successCB success callback
-* @param errorCB error callback - optional
-*/
-Contact.prototype.save = function(successCB, errorCB) {
-	// don't modify the original contact
-	var cloned = PhoneGap.clone(this);
-	cloned.convertDatesOut(); 
-	PhoneGap.exec(successCB, errorCB, "com.phonegap.contacts","save", [{"contact": cloned}]);
-};
-
-/**
-* Contact name.
-* @param formatted
-* @param familyName
-* @param givenName
-* @param middle
-* @param prefix
-* @param suffix
-*/
-var ContactName = function(formatted, familyName, givenName, middle, prefix, suffix) {
-    this.formatted = formatted != "undefined" ? formatted : null;
-    this.familyName = familyName != "undefined" ? familyName : null;
-    this.givenName = givenName != "undefined" ? givenName : null;
-    this.middleName = middle != "undefined" ? middle : null;
-    this.honorificPrefix = prefix != "undefined" ? prefix : null;
-    this.honorificSuffix = suffix != "undefined" ? suffix : null;
-};
-
-/**
-* Generic contact field.
-* @param type
-* @param value
-* @param pref
-* @param id
-*/
-var ContactField = function(type, value, pref, id) {
-    this.type = type != "undefined" ? type : null;
-    this.value = value != "undefined" ? value : null;
-    this.pref = pref != "undefined" ? pref : null;
-    this.id = id != "undefined" ? id : null;
-};
-
-/**
-* Contact address.
-* @param pref - boolean is primary / preferred address
-* @param type - string - work, home…..
-* @param formatted
-* @param streetAddress
-* @param locality
-* @param region
-* @param postalCode
-* @param country
-*/
-var ContactAddress = function(pref, type, formatted, streetAddress, locality, region, postalCode, country, id) {
-	this.pref = pref != "undefined" ? pref : null;
-	this.type = type != "undefined" ? type : null;
-    this.formatted = formatted != "undefined" ? formatted : null;
-    this.streetAddress = streetAddress != "undefined" ? streetAddress : null;
-    this.locality = locality != "undefined" ? locality : null;
-    this.region = region != "undefined" ? region : null;
-    this.postalCode = postalCode != "undefined" ? postalCode : null;
-    this.country = country != "undefined" ? country : null;
-    this.id = id != "undefined" ? id : null;
-};
-
-/**
-* Contact organization.
-* @param pref - boolean is primary / preferred address
-* @param type - string - work, home…..
-* @param name
-* @param dept
-* @param title
-*/
-var ContactOrganization = function(pref, type, name, dept, title) {
-	this.pref = pref != "undefined" ? pref : null;
-	this.type = type != "undefined" ? type : null;
-    this.name = name != "undefined" ? name : null;
-    this.department = dept != "undefined" ? dept : null;
-    this.title = title != "undefined" ? title : null;
-};
-
-/**
-* Contact account.
-* @param domain
-* @param username
-* @param userid
-*/
-/*var ContactAccount = function(domain, username, userid) {
-    this.domain = domain != "undefined" ? domain : null;
-    this.username = username != "undefined" ? username : null;
-    this.userid = userid != "undefined" ? userid : null;
-}*/
-
-/**
-* Represents a group of Contacts.
-*/
-var Contacts = function() {
-    this.inProgress = false;
-    this.records = new Array();
-};
-/**
-* Returns an array of Contacts matching the search criteria.
-* @param fields that should be searched
-* @param successCB success callback
-* @param errorCB error callback (optional)
-* @param {ContactFindOptions} options that can be applied to contact searching
-* @return array of Contacts matching search criteria
-*/
-Contacts.prototype.find = function(fields, successCB, errorCB, options) {
-	if (successCB === null) {
-        throw new TypeError("You must specify a success callback for the find command.");
-    }
-    if (fields === null || fields === "undefined" || fields.length === "undefined" || fields.length <= 0) {
-    	if (typeof errorCB === "function") {
-			errorCB({"code": ContactError.INVALID_ARGUMENT_ERROR});
-    	}
-    } else {
-		PhoneGap.exec(successCB, errorCB, "com.phonegap.contacts","search", [{"fields":fields, "findOptions":options}]);
-    }
-};
-/**
-* need to turn the array of JSON strings representing contact objects into actual objects
-* @param array of JSON strings with contact data
-* @return call results callback with array of Contact objects
-*  This function is called from objective C Contacts.search() method.
-*/
-Contacts.prototype._findCallback = function(pluginResult) {
-	var contacts = new Array();
-	try {
-		for (var i=0; i<pluginResult.message.length; i++) {
-			var newContact = navigator.contacts.create(pluginResult.message[i]); 
-			newContact.convertDatesIn();
-			contacts.push(newContact);
-		}
-		pluginResult.message = contacts;
-	} catch(e){
-			console.log("Error parsing contacts: " +e);
-	}
-	return pluginResult;
-}
-
-/**
-* need to turn the JSON string representing contact object into actual object
-* @param JSON string with contact data
-* Call stored results function with  Contact object
-*  This function is called from objective C Contacts remove and save methods
-*/
-Contacts.prototype._contactCallback = function(pluginResult)
-{
-	var newContact = null;
-	if (pluginResult.message){
-		try {
-			newContact = navigator.contacts.create(pluginResult.message);
-			newContact.convertDatesIn();
-		} catch(e){
-			console.log("Error parsing contact");
-		}
-	}
-	pluginResult.message = newContact;
-	return pluginResult;
-	
-};
-/** 
-* Need to return an error object rather than just a single error code
-* @param error code
-* Call optional error callback if found.
-* Called from objective c find, remove, and save methods on error.
-*/
-Contacts.prototype._errCallback = function(pluginResult)
-{
-	var errorObj = new ContactError();
-   	errorObj.code = pluginResult.message;
-	pluginResult.message = errorObj;
-	return pluginResult;
-};
-// iPhone only api to create a new contact via the GUI
-Contacts.prototype.newContactUI = function(successCallback) { 
-    PhoneGap.exec(successCallback, null, "com.phonegap.contacts","newContact", []);
-};
-// iPhone only api to select a contact via the GUI
-Contacts.prototype.chooseContact = function(successCallback, options) {
-    PhoneGap.exec(successCallback, null, "com.phonegap.contacts","chooseContact", options);
-};
-
-
-/**
-* This function creates a new contact, but it does not persist the contact
-* to device storage. To persist the contact to device storage, invoke
-* contact.save().
-* @param properties an object who's properties will be examined to create a new Contact
-* @returns new Contact object
-*/
-Contacts.prototype.create = function(properties) {
-    var i;
-    var contact = new Contact();
-    for (i in properties) {
-        if (contact[i] !== 'undefined') {
-            contact[i] = properties[i];
-        }
-    }
-    return contact;
-};
-
-/**
- * ContactFindOptions.
- * @param filter used to match contacts against
- * @param multiple boolean used to determine if more than one contact should be returned
- */
-var ContactFindOptions = function(filter, multiple, updatedSince) {
-    this.filter = filter || '';
-    this.multiple = multiple || false;
-};
-
-/**
- *  ContactError.
- *  An error code assigned by an implementation when an error has occurred
- */
-var ContactError = function() {
-    this.code=null;
-};
-
-/**
- * Error codes
- */
-ContactError.UNKNOWN_ERROR = 0;
-ContactError.INVALID_ARGUMENT_ERROR = 1;
-ContactError.TIMEOUT_ERROR = 2;
-ContactError.PENDING_OPERATION_ERROR = 3;
-ContactError.IO_ERROR = 4;
-ContactError.NOT_SUPPORTED_ERROR = 5;
-ContactError.PERMISSION_DENIED_ERROR = 20;
-
-/**
- * Add the contact interface into the browser.
- */
-PhoneGap.addConstructor(function() { 
-    if(typeof navigator.contacts == "undefined") {
-    	navigator.contacts = new Contacts();
-    }
-});
-};
-if (!PhoneGap.hasResource("file")) {
-	PhoneGap.addResource("file");
-
-/**
- * This class provides generic read and write access to the mobile device file system.
- * They are not used to read files from a server.
- */
-
-/**
- * This class provides some useful information about a file.
- * This is the fields returned when navigator.fileMgr.getFileProperties() 
- * is called.
- */
-FileProperties = function(filePath) {
-    this.filePath = filePath;
-    this.size = 0;
-    this.lastModifiedDate = null;
-}
-/**
- * Represents a single file.
- * 
- * name {DOMString} name of the file, without path information
- * fullPath {DOMString} the full path of the file, including the name
- * type {DOMString} mime type
- * lastModifiedDate {Date} last modified date
- * size {Number} size of the file in bytes
- */
-File = function(name, fullPath, type, lastModifiedDate, size) {
-	this.name = name || null;
-    this.fullPath = fullPath || null;
-	this.type = type || null;
-    this.lastModifiedDate = lastModifiedDate || null;
-    this.size = size || 0;
-}
-/**
- * Create an event object since we can't set target on DOM event.
- *
- * @param type
- * @param target
- *
- */
-File._createEvent = function(type, target) {
-    // Can't create event object, since we can't set target (its readonly)
-    //var evt = document.createEvent('Events');
-    //evt.initEvent("onload", false, false);
-    var evt = {"type": type};
-    evt.target = target;
-    return evt;
-};
-
-FileError = function() {
-   this.code = null;
-}
-
-// File error codes
-// Found in DOMException
-FileError.NOT_FOUND_ERR = 1;
-FileError.SECURITY_ERR = 2;
-FileError.ABORT_ERR = 3;
-
-// Added by this specification
-FileError.NOT_READABLE_ERR = 4;
-FileError.ENCODING_ERR = 5;
-FileError.NO_MODIFICATION_ALLOWED_ERR = 6;
-FileError.INVALID_STATE_ERR = 7;
-FileError.SYNTAX_ERR = 8;
-FileError.INVALID_MODIFICATION_ERR = 9;
-FileError.QUOTA_EXCEEDED_ERR = 10;
-FileError.TYPE_MISMATCH_ERR = 11;
-FileError.PATH_EXISTS_ERR = 12;
-
-//-----------------------------------------------------------------------------
-// File manager
-//-----------------------------------------------------------------------------
-
-FileMgr = function() {
-}
-
-FileMgr.prototype.testFileExists = function(fileName, successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "testFileExists", [fileName]);
-};
-
-FileMgr.prototype.testDirectoryExists = function(dirName, successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "testDirectoryExists", [dirName]);
-};
-
-FileMgr.prototype.getFreeDiskSpace = function(successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "getFreeDiskSpace", []);
-};
-
-FileMgr.prototype.write = function(fileName, data, position, successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "write", [fileName, data, position]);
-};
-
-FileMgr.prototype.truncate = function(fileName, size, successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "truncateFile", [fileName, size]);
-};
-
-FileMgr.prototype.readAsText = function(fileName, encoding, successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "readFile", [fileName, encoding]);
-};
-
-FileMgr.prototype.readAsDataURL = function(fileName, successCallback, errorCallback) {
-	PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "readAsDataURL", [fileName]);
-};
-
-PhoneGap.addConstructor(function() {
-    if (typeof navigator.fileMgr === "undefined") {
-        navigator.fileMgr = new FileMgr();
-    }
-});
-
-
-//-----------------------------------------------------------------------------
-// File Reader
-//-----------------------------------------------------------------------------
-
-/**
- * This class reads the mobile device file system.
- *
- */
-FileReader = function() {
-    this.fileName = "";
-
-    this.readyState = 0;
-
-    // File data
-    this.result = null;
-
-    // Error
-    this.error = null;
-
-    // Event handlers
-    this.onloadstart = null;    // When the read starts.
-    this.onprogress = null;     // While reading (and decoding) file or fileBlob data, and reporting partial file data (progess.loaded/progress.total)
-    this.onload = null;         // When the read has successfully completed.
-    this.onerror = null;        // When the read has failed (see errors).
-    this.onloadend = null;      // When the request has completed (either in success or failure).
-    this.onabort = null;        // When the read has been aborted. For instance, by invoking the abort() method.
-}
-
-// States
-FileReader.EMPTY = 0;
-FileReader.LOADING = 1;
-FileReader.DONE = 2;
-
-/**
- * Abort reading file.
- */
-FileReader.prototype.abort = function() {
-    var evt;
-    this.readyState = FileReader.DONE;
-    this.result = null;
-
-    // set error
-    var error = new FileError();
-    error.code = error.ABORT_ERR;
-    this.error = error;
-   
-    // If error callback
-    if (typeof this.onerror === "function") {
-        evt = File._createEvent("error", this);
-        this.onerror(evt);
-    }
-    // If abort callback
-    if (typeof this.onabort === "function") {
-        evt = File._createEvent("abort", this);
-        this.onabort(evt);
-    }
-    // If load end callback
-    if (typeof this.onloadend === "function") {
-        evt = File._createEvent("loadend", this);
-        this.onloadend(evt);
-    }
-};
-
-/**
- * Read text file.
- *
- * @param file          The name of the file
- * @param encoding      [Optional] (see http://www.iana.org/assignments/character-sets)
- */
-FileReader.prototype.readAsText = function(file, encoding) {
-    this.fileName = "";
-	if (typeof file.fullPath === "undefined") {
-		this.fileName = file;
-	} else {
-		this.fileName = file.fullPath;
-	}
-
-    // LOADING state
-    this.readyState = FileReader.LOADING;
-
-    // If loadstart callback
-    if (typeof this.onloadstart === "function") {
-        var evt = File._createEvent("loadstart", this);
-        this.onloadstart(evt);
-    }
-
-    // Default encoding is UTF-8
-    var enc = encoding ? encoding : "UTF-8";
-
-    var me = this;
-
-    // Read file
-    navigator.fileMgr.readAsText(this.fileName, enc,
-
-        // Success callback
-        function(r) {
-            var evt;
-
-            // If DONE (cancelled), then don't do anything
-            if (me.readyState === FileReader.DONE) {
-                return;
-            }
-
-            // Save result
-            me.result = decodeURIComponent(r);
-
-            // If onload callback
-            if (typeof me.onload === "function") {
-                evt = File._createEvent("load", me);
-                me.onload(evt);
-            }
-
-            // DONE state
-            me.readyState = FileReader.DONE;
-
-            // If onloadend callback
-            if (typeof me.onloadend === "function") {
-                evt = File._createEvent("loadend", me);
-                me.onloadend(evt);
-            }
-        },
-
-        // Error callback
-        function(e) {
-            var evt;
-            // If DONE (cancelled), then don't do anything
-            if (me.readyState === FileReader.DONE) {
-                return;
-            }
-
-            // Save error
-            me.error = e;
-
-            // If onerror callback
-            if (typeof me.onerror === "function") {
-                evt = File._createEvent("error", me);
-                me.onerror(evt);
-            }
-
-            // DONE state
-            me.readyState = FileReader.DONE;
-
-            // If onloadend callback
-            if (typeof me.onloadend === "function") {
-                evt = File._createEvent("loadend", me);
-                me.onloadend(evt);
-            }
-        }
-        );
-};
-
-
-/**
- * Read file and return data as a base64 encoded data url.
- * A data url is of the form:
- *      data:[<mediatype>][;base64],<data>
- *
- * @param file          {File} File object containing file properties
- */
-FileReader.prototype.readAsDataURL = function(file) {
-    this.fileName = "";
-    
-    if (typeof file.fullPath === "undefined") {
-        this.fileName = file;
-    } else {
-        this.fileName = file.fullPath;
-    }
-
-    // LOADING state
-    this.readyState = FileReader.LOADING;
-
-    // If loadstart callback
-    if (typeof this.onloadstart === "function") {
-        var evt = File._createEvent("loadstart", this);
-        this.onloadstart(evt);
-    }
-
-    var me = this;
-
-    // Read file
-    navigator.fileMgr.readAsDataURL(this.fileName,
-
-        // Success callback
-        function(r) {
-            var evt;
-
-            // If DONE (cancelled), then don't do anything
-            if (me.readyState === FileReader.DONE) {
-                return;
-            }
-
-            // Save result
-            me.result = r;
-
-            // If onload callback
-            if (typeof me.onload === "function") {
-                evt = File._createEvent("load", me);
-                me.onload(evt);
-            }
-
-            // DONE state
-            me.readyState = FileReader.DONE;
-
-            // If onloadend callback
-            if (typeof me.onloadend === "function") {
-                evt = File._createEvent("loadend", me);
-                me.onloadend(evt);
-            }
-        },
-
-        // Error callback
-        function(e) {
-            var evt;
-            // If DONE (cancelled), then don't do anything
-            if (me.readyState === FileReader.DONE) {
-                return;
-            }
-
-            // Save error
-            me.error = e;
-
-            // If onerror callback
-            if (typeof me.onerror === "function") {
-                evt = File._createEvent("error", me);
-                me.onerror(evt);
-            }
-
-            // DONE state
-            me.readyState = FileReader.DONE;
-
-            // If onloadend callback
-            if (typeof me.onloadend === "function") {
-                evt = File._createEvent("loadend", me);
-                me.onloadend(evt);
-            }
-        }
-        );
-};
-
-/**
- * Read file and return data as a binary data.
- *
- * @param file          The name of the file
- */
-FileReader.prototype.readAsBinaryString = function(file) {
-    // TODO - Can't return binary data to browser.
-    this.fileName = file;
-};
-
-/**
- * Read file and return data as a binary data.
- *
- * @param file          The name of the file
- */
-FileReader.prototype.readAsArrayBuffer = function(file) {
-    // TODO - Can't return binary data to browser.
-    this.fileName = file;
-};
-
-//-----------------------------------------------------------------------------
-// File Writer
-//-----------------------------------------------------------------------------
-
-/**
- * This class writes to the mobile device file system.
- *
-  @param file {File} a File object representing a file on the file system
-*/
-FileWriter = function(file) {
-    this.fileName = "";
-    this.length = 0;
-	if (file) {
-	    this.fileName = file.fullPath || file;
-	    this.length = file.size || 0;
-	}
-	
-	// default is to write at the beginning of the file
-    this.position = 0;
-    
-    this.readyState = 0; // EMPTY
-
-    this.result = null;
-
-    // Error
-    this.error = null;
-
-    // Event handlers
-    this.onwritestart = null;	// When writing starts
-    this.onprogress = null;		// While writing the file, and reporting partial file data
-    this.onwrite = null;		// When the write has successfully completed.
-    this.onwriteend = null;		// When the request has completed (either in success or failure).
-    this.onabort = null;		// When the write has been aborted. For instance, by invoking the abort() method.
-    this.onerror = null;		// When the write has failed (see errors).
-}
-
-// States
-FileWriter.INIT = 0;
-FileWriter.WRITING = 1;
-FileWriter.DONE = 2;
-
-/**
- * Abort writing file.
- */
-FileWriter.prototype.abort = function() {
-    // check for invalid state
-	if (this.readyState === FileWriter.DONE || this.readyState === FileWriter.INIT) {
-		throw FileError.INVALID_STATE_ERR;
-	} 
-
-    // set error
-    var error = new FileError(), evt;
-    error.code = error.ABORT_ERR;
-    this.error = error;
-    
-    // If error callback
-    if (typeof this.onerror === "function") {
-        evt = File._createEvent("error", this);
-        this.onerror(evt);
-    }
-    // If abort callback
-    if (typeof this.onabort === "function") {
-        evt = File._createEvent("abort", this);
-        this.onabort(evt);
-    }
-    
-    this.readyState = FileWriter.DONE;
-
-    // If write end callback
-    if (typeof this.onwriteend == "function") {
-        evt = File._createEvent("writeend", this);
-        this.onwriteend(evt);
-    }
-};
-
-/**
- * @Deprecated: use write instead
- * 
- * @param file to write the data to
- * @param text to be written
- * @param bAppend if true write to end of file, otherwise overwrite the file
- */
-FileWriter.prototype.writeAsText = function(file, text, bAppend) {
-	// Throw an exception if we are already writing a file
-	if (this.readyState === FileWriter.WRITING) {
-		throw FileError.INVALID_STATE_ERR;
-	}
-
-	if (bAppend !== true) {
-        bAppend = false; // for null values
-    }
-
-    this.fileName = file;
-
-    // WRITING state
-    this.readyState = FileWriter.WRITING;
-
-    var me = this;
-
-    // If onwritestart callback
-    if (typeof me.onwritestart === "function") {
-        var evt = File._createEvent("writestart", me);
-        me.onwritestart(evt);
-    }
-	
-	
-    // Write file 
-	navigator.fileMgr.writeAsText(file, text, bAppend,
-        // Success callback
-        function(r) {
-            var evt;
-
-            // If DONE (cancelled), then don't do anything
-            if (me.readyState === FileWriter.DONE) {
-                return;
-            }
-
-            // Save result
-            me.result = r;
-
-            // If onwrite callback
-            if (typeof me.onwrite === "function") {
-                evt = File._createEvent("write", me);
-                me.onwrite(evt);
-            }
-
-            // DONE state
-            me.readyState = FileWriter.DONE;
-
-            // If onwriteend callback
-            if (typeof me.onwriteend === "function") {
-                evt = File._createEvent("writeend", me);
-                me.onwriteend(evt);
-            }
-        },
-
-        // Error callback
-        function(e) {
-            var evt;
-
-            // If DONE (cancelled), then don't do anything
-            if (me.readyState === FileWriter.DONE) {
-                return;
-            }
-
-            // Save error
-            me.error = e;
-
-            // If onerror callback
-            if (typeof me.onerror === "function") {
-                evt = File._createEvent("error", me);
-                me.onerror(evt);
-            }
-
-            // DONE state
-            me.readyState = FileWriter.DONE;
-
-            // If onwriteend callback
-            if (typeof me.onwriteend === "function") {
-                evt = File._createEvent("writeend", me);
-                me.onwriteend(evt);
-            }
-        }
-    );
-};
-
-/**
- * Writes data to the file
- *  
- * @param text to be written
- */
-FileWriter.prototype.write = function(text) {
-	// Throw an exception if we are already writing a file
-	if (this.readyState === FileWriter.WRITING) {
-		throw FileError.INVALID_STATE_ERR;
-	}
-
-    // WRITING state
-    this.readyState = FileWriter.WRITING;
-
-    var me = this;
-
-    // If onwritestart callback
-    if (typeof me.onwritestart === "function") {
-        var evt = File._createEvent("writestart", me);
-        me.onwritestart(evt);
-    }
-
-    // Write file
-    navigator.fileMgr.write(this.fileName, text, this.position,
-
-        // Success callback
-        function(r) {
-            var evt;
-            // If DONE (cancelled), then don't do anything
-            if (me.readyState === FileWriter.DONE) {
-                return;
-            }
-
-            
-            // position always increases by bytes written because file would be extended
-            me.position += r;
-			// The length of the file is now where we are done writing.
-			me.length = me.position;
-            
-            // If onwrite callback
-            if (typeof me.onwrite === "function") {
-                evt = File._createEvent("write", me);
-                me.onwrite(evt);
-            }
-
-            // DONE state
-            me.readyState = FileWriter.DONE;
-
-            // If onwriteend callback
-            if (typeof me.onwriteend === "function") {
-                evt = File._createEvent("writeend", me);
-                me.onwriteend(evt);
-            }
-        },
-
-        // Error callback
-        function(e) {
-            var evt;
-
-            // If DONE (cancelled), then don't do anything
-            if (me.readyState === FileWriter.DONE) {
-                return;
-            }
-
-            // Save error
-            me.error = e;
-
-            // If onerror callback
-            if (typeof me.onerror === "function") {
-                evt = File._createEvent("error", me);
-                me.onerror(evt);
-            }
-
-            // DONE state
-            me.readyState = FileWriter.DONE;
-
-            // If onwriteend callback
-            if (typeof me.onwriteend === "function") {
-                evt = File._createEvent("writeend", me);
-                me.onwriteend(evt);
-            }
-        }
-        );
-
-};
-
-/** 
- * Moves the file pointer to the location specified.
- * 
- * If the offset is a negative number the position of the file 
- * pointer is rewound.  If the offset is greater than the file 
- * size the position is set to the end of the file.  
- * 
- * @param offset is the location to move the file pointer to.
- */
-FileWriter.prototype.seek = function(offset) {
-    // Throw an exception if we are already writing a file
-    if (this.readyState === FileWriter.WRITING) {
-        throw FileError.INVALID_STATE_ERR;
-    }
-
-    if (!offset) {
-        return;
-    }
-    
-    // See back from end of file.
-    if (offset < 0) {
-		this.position = Math.max(offset + this.length, 0);
-	}
-    // Offset is bigger then file size so set position 
-    // to the end of the file.
-	else if (offset > this.length) {
-		this.position = this.length;
-	}
-    // Offset is between 0 and file size so set the position
-    // to start writing.
-	else {
-		this.position = offset;
-	}	
-};
-
-/** 
- * Truncates the file to the size specified.
- * 
- * @param size to chop the file at.
- */
-FileWriter.prototype.truncate = function(size) {
-	// Throw an exception if we are already writing a file
-	if (this.readyState === FileWriter.WRITING) {
-		throw FileError.INVALID_STATE_ERR;
-	}
-	// what if no size specified? 
-
-    // WRITING state
-    this.readyState = FileWriter.WRITING;
-
-    var me = this;
-
-    // If onwritestart callback
-    if (typeof me.onwritestart === "function") {
-        var evt = File._createEvent("writestart", me);
-        me.onwritestart(evt);
-    }
-
-    // Write file
-    navigator.fileMgr.truncate(this.fileName, size,
-
-        // Success callback
-        function(r) {
-            var evt;
-            // If DONE (cancelled), then don't do anything
-            if (me.readyState === FileWriter.DONE) {
-                return;
-            }
-
-            // Update the length of the file
-            me.length = r;
-            me.position = Math.min(me.position, r);
-
-            // If onwrite callback
-            if (typeof me.onwrite === "function") {
-                evt = File._createEvent("write", me);
-                me.onwrite(evt);
-            }
-
-            // DONE state
-            me.readyState = FileWriter.DONE;
-
-            // If onwriteend callback
-            if (typeof me.onwriteend === "function") {
-                evt = File._createEvent("writeend", me);
-                me.onwriteend(evt);
-            }
-        },
-
-        // Error callback
-        function(e) {
-            var evt;
-            // If DONE (cancelled), then don't do anything
-            if (me.readyState === FileWriter.DONE) {
-                return;
-            }
-
-            // Save error
-            me.error = e;
-
-            // If onerror callback
-            if (typeof me.onerror === "function") {
-                evt = File._createEvent("error", me);
-                me.onerror(evt);
-            }
-
-            // DONE state
-            me.readyState = FileWriter.DONE;
-
-            // If onwriteend callback
-            if (typeof me.onwriteend === "function") {
-                evt = File._createEvent("writeend", me);
-                me.onwriteend(evt);
-            }
-        }
-    );
-};
-
-LocalFileSystem = function() {
-};
-
-// File error codes
-LocalFileSystem.TEMPORARY = 0;
-LocalFileSystem.PERSISTENT = 1;
-LocalFileSystem.RESOURCE = 2;
-LocalFileSystem.APPLICATION = 3;
-
-/**
- * Requests a filesystem in which to store application data.
- * 
- * @param {int} type of file system being requested
- * @param {Function} successCallback is called with the new FileSystem
- * @param {Function} errorCallback is called with a FileError
- */
-LocalFileSystem.prototype.requestFileSystem = function(type, size, successCallback, errorCallback) {
-	if (type < 0 || type > 3) {
-		if (typeof errorCallback == "function") {
-			errorCallback({
-				"code": FileError.SYNTAX_ERR
-			});
-		}
-	}
-	else {
-		PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "requestFileSystem", [type, size]);
-	}
-};
-
-/**
- * 
- * @param {DOMString} uri referring to a local file in a filesystem
- * @param {Function} successCallback is called with the new entry
- * @param {Function} errorCallback is called with a FileError
- */
-LocalFileSystem.prototype.resolveLocalFileSystemURI = function(uri, successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "resolveLocalFileSystemURI", [uri]);
-};
-
-/**
-* This function  is required as we need to convert raw 
-* JSON objects into concrete File and Directory objects.  
-* 
-* @param a JSON Objects that need to be converted to DirectoryEntry or FileEntry objects.
-* @returns an entry 
-*/
-LocalFileSystem.prototype._castFS = function(pluginResult) {
-    var entry = null;
-    entry = new DirectoryEntry();
-    entry.isDirectory = pluginResult.message.root.isDirectory;
-    entry.isFile = pluginResult.message.root.isFile;
-    entry.name = pluginResult.message.root.name;
-    entry.fullPath = pluginResult.message.root.fullPath;
-    pluginResult.message.root = entry;
-    return pluginResult;    
-}
-
-LocalFileSystem.prototype._castEntry = function(pluginResult) {
-    var entry = null;
-    if (pluginResult.message.isDirectory) {
-        entry = new DirectoryEntry();
-    }
-    else if (pluginResult.message.isFile) {
-		entry = new FileEntry();
-    }
-    entry.isDirectory = pluginResult.message.isDirectory;
-    entry.isFile = pluginResult.message.isFile;
-    entry.name = pluginResult.message.name;
-    entry.fullPath = pluginResult.message.fullPath;
-    pluginResult.message = entry;
-    return pluginResult;    
-}
-
-LocalFileSystem.prototype._castEntries = function(pluginResult) {
-    var entries = pluginResult.message;
-	var retVal = []; 
-	for (i=0; i<entries.length; i++) {
-		retVal.push(window.localFileSystem._createEntry(entries[i]));
-	}
-    pluginResult.message = retVal;
-    return pluginResult;    
-}
-
-LocalFileSystem.prototype._createEntry = function(castMe) {
-	var entry = null;
-    if (castMe.isDirectory) {
-        entry = new DirectoryEntry();
-    }
-    else if (castMe.isFile) {
-        entry = new FileEntry();
-    }
-    entry.isDirectory = castMe.isDirectory;
-    entry.isFile = castMe.isFile;
-    entry.name = castMe.name;
-    entry.fullPath = castMe.fullPath;
-    return entry;    
-
-}
-
-LocalFileSystem.prototype._castDate = function(pluginResult) {
-	if (pluginResult.message.modificationTime) {
-		var metadataObj = new Metadata();
-		
-	    metadataObj.modificationTime = new Date(pluginResult.message.modificationTime);
-	    pluginResult.message = metadataObj;
-	}
-	else if (pluginResult.message.lastModifiedDate) {
-		var file = new File();
-        file.size = pluginResult.message.size;
-        file.type = pluginResult.message.type;
-        file.name = pluginResult.message.name;
-        file.fullPath = pluginResult.message.fullPath;
-		file.lastModifiedDate = new Date(pluginResult.message.lastModifiedDate);
-	    pluginResult.message = file;		
-	}
-
-    return pluginResult;	
-}
-LocalFileSystem.prototype._castError = function(pluginResult) {
-	var fileError = new FileError();
-	fileError.code = pluginResult.message;
-	pluginResult.message = fileError;
-	return pluginResult;
-}
-
-/**
- * Information about the state of the file or directory
- * 
- * {Date} modificationTime (readonly)
- */
-Metadata = function() {
-    this.modificationTime=null;
-};
-
-/**
- * Supplies arguments to methods that lookup or create files and directories
- * 
- * @param {boolean} create file or directory if it doesn't exist 
- * @param {boolean} exclusive if true the command will fail if the file or directory exists
- */
-Flags = function(create, exclusive) {
-    this.create = create || false;
-    this.exclusive = exclusive || false;
-};
-
-/**
- * An interface representing a file system
- * 
- * {DOMString} name the unique name of the file system (readonly)
- * {DirectoryEntry} root directory of the file system (readonly)
- */
-FileSystem = function() {
-    this.name = null;
-    this.root = null;
-};
-
-/**
- * An interface representing a directory on the file system.
- * 
- * {boolean} isFile always false (readonly)
- * {boolean} isDirectory always true (readonly)
- * {DOMString} name of the directory, excluding the path leading to it (readonly)
- * {DOMString} fullPath the absolute full path to the directory (readonly)
- * {FileSystem} filesystem on which the directory resides (readonly)
- */
-DirectoryEntry = function() {
-    this.isFile = false;
-    this.isDirectory = true;
-    this.name = null;
-    this.fullPath = null;
-    this.filesystem = null;
-};
-
-/**
- * Copies a directory to a new location
- * 
- * @param {DirectoryEntry} parent the directory to which to copy the entry
- * @param {DOMString} newName the new name of the entry, defaults to the current name
- * @param {Function} successCallback is called with the new entry
- * @param {Function} errorCallback is called with a FileError
- */
-DirectoryEntry.prototype.copyTo = function(parent, newName, successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "copyTo", [this.fullPath, parent, newName]);
-};
-
-/**
- * Looks up the metadata of the entry
- * 
- * @param {Function} successCallback is called with a Metadata object
- * @param {Function} errorCallback is called with a FileError
- */
-DirectoryEntry.prototype.getMetadata = function(successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "getMetadata", [this.fullPath]);
-};
-
-/**
- * Gets the parent of the entry
- * 
- * @param {Function} successCallback is called with a parent entry
- * @param {Function} errorCallback is called with a FileError
- */
-DirectoryEntry.prototype.getParent = function(successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "getParent", [this.fullPath]);
-};
-
-/**
- * Moves a directory to a new location
- * 
- * @param {DirectoryEntry} parent the directory to which to move the entry
- * @param {DOMString} newName the new name of the entry, defaults to the current name
- * @param {Function} successCallback is called with the new entry
- * @param {Function} errorCallback is called with a FileError
- */
-DirectoryEntry.prototype.moveTo = function(parent, newName, successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "moveTo", [this.fullPath, parent, newName]);
-};
-
-/**
- * Removes the entry
- * 
- * @param {Function} successCallback is called with no parameters
- * @param {Function} errorCallback is called with a FileError
- */
-DirectoryEntry.prototype.remove = function(successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "remove", [this.fullPath]);
-};
-
-/**
- * Returns a URI that can be used to identify this entry.
- * 
- * @param {DOMString} mimeType for a FileEntry, the mime type to be used to interpret the file, when loaded through this URI.
- * @param {Function} successCallback is called with the new entry
- * @param {Function} errorCallback is called with a FileError
- */
-DirectoryEntry.prototype.toURI = function(mimeType, successCallback, errorCallback) {
-    return "file://localhost" + this.fullPath;
-    //PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "toURI", [this.fullPath, mimeType]);
-};
-
-/**
- * Creates a new DirectoryReader to read entries from this directory
- */
-DirectoryEntry.prototype.createReader = function(successCallback, errorCallback) {
-    return new DirectoryReader(this.fullPath);
-};
-
-/**
- * Creates or looks up a directory
- * 
- * @param {DOMString} path either a relative or absolute path from this directory in which to look up or create a directory
- * @param {Flags} options to create or excluively create the directory
- * @param {Function} successCallback is called with the new entry
- * @param {Function} errorCallback is called with a FileError
- */
-DirectoryEntry.prototype.getDirectory = function(path, options, successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "getDirectory", [this.fullPath, path, options]);
-};
-
-/**
- * Creates or looks up a file
- * 
- * @param {DOMString} path either a relative or absolute path from this directory in which to look up or create a file
- * @param {Flags} options to create or excluively create the file
- * @param {Function} successCallback is called with the new entry
- * @param {Function} errorCallback is called with a FileError
- */
-DirectoryEntry.prototype.getFile = function(path, options, successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "getFile", [this.fullPath, path, options]);
-};
-
-/**
- * Deletes a directory and all of it's contents
- * 
- * @param {Function} successCallback is called with no parameters
- * @param {Function} errorCallback is called with a FileError
- */
-DirectoryEntry.prototype.removeRecursively = function(successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "removeRecursively", [this.fullPath]);
-};
-
-/**
- * An interface that lists the files and directories in a directory.
- */
-DirectoryReader = function(fullPath){
-	this.fullPath = fullPath || null;    
-};
-
-/**
- * Returns a list of entries from a directory.
- * 
- * @param {Function} successCallback is called with a list of entries
- * @param {Function} errorCallback is called with a FileError
- */
-DirectoryReader.prototype.readEntries = function(successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "readEntries", [this.fullPath]);
-}
- 
-/**
- * An interface representing a directory on the file system.
- * 
- * {boolean} isFile always true (readonly)
- * {boolean} isDirectory always false (readonly)
- * {DOMString} name of the file, excluding the path leading to it (readonly)
- * {DOMString} fullPath the absolute full path to the file (readonly)
- * {FileSystem} filesystem on which the directory resides (readonly)
- */
-FileEntry = function() {
-    this.isFile = true;
-    this.isDirectory = false;
-    this.name = null;
-    this.fullPath = null;
-    this.filesystem = null;
-};
-
-/**
- * Copies a file to a new location
- * 
- * @param {DirectoryEntry} parent the directory to which to copy the entry
- * @param {DOMString} newName the new name of the entry, defaults to the current name
- * @param {Function} successCallback is called with the new entry
- * @param {Function} errorCallback is called with a FileError
- */
-FileEntry.prototype.copyTo = function(parent, newName, successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "copyTo", [this.fullPath, parent, newName]);
-};
-
-/**
- * Looks up the metadata of the entry
- * 
- * @param {Function} successCallback is called with a Metadata object
- * @param {Function} errorCallback is called with a FileError
- */
-FileEntry.prototype.getMetadata = function(successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "getMetadata", [this.fullPath]);
-};
-
-/**
- * Gets the parent of the entry
- * 
- * @param {Function} successCallback is called with a parent entry
- * @param {Function} errorCallback is called with a FileError
- */
-FileEntry.prototype.getParent = function(successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "getParent", [this.fullPath]);
-};
-
-/**
- * Moves a directory to a new location
- * 
- * @param {DirectoryEntry} parent the directory to which to move the entry
- * @param {DOMString} newName the new name of the entry, defaults to the current name
- * @param {Function} successCallback is called with the new entry
- * @param {Function} errorCallback is called with a FileError
- */
-FileEntry.prototype.moveTo = function(parent, newName, successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "moveTo", [this.fullPath, parent, newName]);
-};
-
-/**
- * Removes the entry
- * 
- * @param {Function} successCallback is called with no parameters
- * @param {Function} errorCallback is called with a FileError
- */
-FileEntry.prototype.remove = function(successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "remove", [this.fullPath]);
-};
-
-/**
- * Returns a URI that can be used to identify this entry.
- * 
- * @param {DOMString} mimeType for a FileEntry, the mime type to be used to interpret the file, when loaded through this URI.
- * @param {Function} successCallback is called with the new entry
- * @param {Function} errorCallback is called with a FileError
- */
-FileEntry.prototype.toURI = function(mimeType, successCallback, errorCallback) {
-    return "file://localhost" + this.fullPath;
-    //PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "toURI", [this.fullPath, mimeType]);
-};
-
-/**
- * Creates a new FileWriter associated with the file that this FileEntry represents.
- * 
- * @param {Function} successCallback is called with the new FileWriter
- * @param {Function} errorCallback is called with a FileError
- */
-FileEntry.prototype.createWriter = function(successCallback, errorCallback) {
-	this.file(function(filePointer) {	
-		var writer = new FileWriter(filePointer);
-		if (writer.fileName == null || writer.fileName == "") {
-			if (typeof errorCallback == "function") {
-				errorCallback({
-					"code": FileError.INVALID_STATE_ERR
-				});
-		}
-		}
-		if (typeof successCallback == "function") {
-			successCallback(writer);
-		}       
-	}, errorCallback);
-};
-
-/**
- * Returns a File that represents the current state of the file that this FileEntry represents.
- * 
- * @param {Function} successCallback is called with the new File object
- * @param {Function} errorCallback is called with a FileError
- */
-FileEntry.prototype.file = function(successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "getFileMetadata", [this.fullPath]);
-};
-
-/**
- * Add the FileSystem interface into the browser.
- */
-PhoneGap.addConstructor(function() {
-	var pgLocalFileSystem = new LocalFileSystem();
-	// Needed for cast methods
-    if(typeof window.localFileSystem == "undefined") window.localFileSystem  = pgLocalFileSystem;
-    if(typeof window.requestFileSystem == "undefined") window.requestFileSystem  = pgLocalFileSystem.requestFileSystem;
-    if(typeof window.resolveLocalFileSystemURI == "undefined") window.resolveLocalFileSystemURI = pgLocalFileSystem.resolveLocalFileSystemURI;
-});
-};
-
-
-
-
-/*
- * Copyright (c) 2011, Matt Kane
- */
-
-if (!PhoneGap.hasResource("filetransfer")) {
-	PhoneGap.addResource("filetransfer");
-
-/**
- * FileTransfer uploads a file to a remote server.
- */
-FileTransfer = function() {}
-
-/**
- * FileUploadResult
- */
-FileUploadResult = function() {
-    this.bytesSent = 0;
-    this.responseCode = null;
-    this.response = null;
-}
-
-/**
- * FileTransferError
- */
-FileTransferError = function(errorCode) {
-    this.code = errorCode || null;
-}
-
-FileTransferError.FILE_NOT_FOUND_ERR = 1;
-FileTransferError.INVALID_URL_ERR = 2;
-FileTransferError.CONNECTION_ERR = 3;
-
-/**
-* Given an absolute file path, uploads a file on the device to a remote server 
-* using a multipart HTTP request.
-* @param filePath {String}           Full path of the file on the device
-* @param server {String}             URL of the server to receive the file
-* @param successCallback (Function}  Callback to be invoked when upload has completed
-* @param errorCallback {Function}    Callback to be invoked upon error
-* @param options {FileUploadOptions} Optional parameters such as file name and mimetype           
-*/
-FileTransfer.prototype.upload = function(filePath, server, successCallback, errorCallback, options) {
-	if(!options.params) {
-		options.params = {};
-	}
-	options.filePath = filePath;
-	options.server = server;
-	if(!options.fileKey) {
-		options.fileKey = 'file';
-	}
-	if(!options.fileName) {
-		options.fileName = 'image.jpg';
-	}
-	if(!options.mimeType) {
-		options.mimeType = 'image/jpeg';
-	}
-	
-	// successCallback required
-	if (typeof successCallback != "function") {
-        console.log("FileTransfer Error: successCallback is not a function");
-        return;
-    }
-
-
-    // errorCallback optional
-    if (errorCallback && (typeof errorCallback != "function")) {
-        console.log("FileTransfer Error: errorCallback is not a function");
-        return;
-    }
-	
-    PhoneGap.exec(successCallback, errorCallback, 'com.phonegap.filetransfer', 'upload', [options]);
-};
-
-FileTransfer.prototype._castTransferError = function(pluginResult) {
-	var fileError = new FileTransferError(pluginResult.message);
-	//fileError.code = pluginResult.message;
-	pluginResult.message = fileError;
-	return pluginResult;
-}
-
-FileTransfer.prototype._castUploadResult = function(pluginResult) {
-	var result = new FileUploadResult();
-	result.bytesSent = pluginResult.message.bytesSent;
-	result.responseCode = pluginResult.message.responseCode;
-	result.response = decodeURIComponent(pluginResult.message.response);
-	pluginResult.message = result;
-	return pluginResult;
-}
-
-/**
- * Downloads a file form a given URL and saves it to the specified directory.
- * @param source {String}          URL of the server to receive the file
- * @param target {String}         Full path of the file on the device
- * @param successCallback (Function}  Callback to be invoked when upload has completed
- * @param errorCallback {Function}    Callback to be invoked upon error
- */
-FileTransfer.prototype.download = function(source, target, successCallback, errorCallback) {
-	PhoneGap.exec(successCallback, errorCallback, 'com.phonegap.filetransfer', 'download', [source, target]);
-};
-
-/**
- * Options to customize the HTTP request used to upload files.
- * @param fileKey {String}   Name of file request parameter.
- * @param fileName {String}  Filename to be used by the server. Defaults to image.jpg.
- * @param mimeType {String}  Mimetype of the uploaded file. Defaults to image/jpeg.
- * @param params {Object}    Object with key: value params to send to the server.
- */
-FileUploadOptions = function(fileKey, fileName, mimeType, params) {
-    this.fileKey = fileKey || null;
-    this.fileName = fileName || null;
-    this.mimeType = mimeType || null;
-    this.params = params || null;
-}
-
-
-PhoneGap.addConstructor(function() {
-    if (typeof navigator.fileTransfer == "undefined") navigator.fileTransfer = new FileTransfer();
-});
-};
-if (!PhoneGap.hasResource("geolocation")) {
-	PhoneGap.addResource("geolocation");
-
-/**
- * This class provides access to device GPS data.
- * @constructor
- */
-Geolocation = function() {
-    // The last known GPS position.
-    this.lastPosition = null;
-    this.listener = null;
-    this.timeoutTimerId = 0;
-
-};
-
-
-/**
- * Asynchronously aquires the current position.
- * @param {Function} successCallback The function to call when the position
- * data is available
- * @param {Function} errorCallback The function to call when there is an error 
- * getting the position data.
- * @param {PositionOptions} options The options for getting the position data
- * such as timeout.
- * PositionOptions.forcePrompt:Bool default false, 
- * - tells iPhone to prompt the user to turn on location services.
- * - may cause your app to exit while the user is sent to the Settings app
- * PositionOptions.distanceFilter:double aka Number
- * - used to represent a distance in meters.
-PositionOptions
-{
-   desiredAccuracy:Number
-   - a distance in meters 
-		< 10   = best accuracy  ( Default value )
-		< 100  = Nearest Ten Meters
-		< 1000 = Nearest Hundred Meters
-		< 3000 = Accuracy Kilometers
-		3000+  = Accuracy 3 Kilometers
-		
-	forcePrompt:Boolean default false ( iPhone Only! )
-    - tells iPhone to prompt the user to turn on location services.
-	- may cause your app to exit while the user is sent to the Settings app
-	
-	distanceFilter:Number
-	- The minimum distance (measured in meters) a device must move laterally before an update event is generated.
-	- measured relative to the previously delivered location
-	- default value: null ( all movements will be reported )
-	
-}
-
- */
- 
-Geolocation.prototype.getCurrentPosition = function(successCallback, errorCallback, options) 
-{
-    // create an always valid local success callback
-    var win = successCallback;
-    if (!win || typeof(win) != 'function')
-    {
-        win = function(position) {};
-    }
-    
-    // create an always valid local error callback
-    var fail = errorCallback;
-    if (!fail || typeof(fail) != 'function')
-    {
-        fail = function(positionError) {};
-    }	
-
-    var self = this;
-    var totalTime = 0;
-	var timeoutTimerId;
-	
-	// set params to our default values
-	var params = new PositionOptions();
-	
-    if (options) 
-    {
-        if (options.maximumAge) 
-        {
-            // special case here if we have a cached value that is younger than maximumAge
-            if(this.lastPosition)
-            {
-                var now = new Date().getTime();
-                if((now - this.lastPosition.timestamp) < options.maximumAge)
-                {
-                    win(this.lastPosition); // send cached position immediately 
-                    return;                 // Note, execution stops here -jm
-                }
-            }
-            params.maximumAge = options.maximumAge;
-        }
-        if (options.enableHighAccuracy) 
-        {
-            params.enableHighAccuracy = (options.enableHighAccuracy == true); // make sure it's truthy
-        }
-        if (options.timeout) 
-        {
-            params.timeout = options.timeout;
-        }
-    }
-
-    var successListener = win;
-    var failListener = fail;
-    if (!this.locationRunning)
-    {
-        successListener = function(position)
-        { 
-            win(position);
-            self.stop();
-        };
-        errorListener = function(positionError)
-        { 
-            fail(positionError);
-            self.stop();
-        };
-    }
-    
-    this.listener = {"success":successListener,"fail":failListener};
-    this.start(params);
-	
-	var onTimeout = function()
-	{
-	    self.setError(new PositionError(PositionError.TIMEOUT,"Geolocation Error: Timeout."));
-	};
-
-    clearTimeout(this.timeoutTimerId);
-    this.timeoutTimerId = setTimeout(onTimeout, params.timeout); 
-};
-
-/**
- * Asynchronously aquires the position repeatedly at a given interval.
- * @param {Function} successCallback The function to call each time the position
- * data is available
- * @param {Function} errorCallback The function to call when there is an error 
- * getting the position data.
- * @param {PositionOptions} options The options for getting the position data
- * such as timeout and the frequency of the watch.
- */
-Geolocation.prototype.watchPosition = function(successCallback, errorCallback, options) {
-	// Invoke the appropriate callback with a new Position object every time the implementation 
-	// determines that the position of the hosting device has changed. 
-
-	var self = this; // those == this & that
-	
-	var params = new PositionOptions();
-
-    if(options)
-    {
-        if (options.maximumAge) {
-            params.maximumAge = options.maximumAge;
-        }
-        if (options.enableHighAccuracy) {
-            params.enableHighAccuracy = options.enableHighAccuracy;
-        }
-        if (options.timeout) {
-            params.timeout = options.timeout;
-        }
-    }
-
-	var that = this;
-    var lastPos = that.lastPosition? that.lastPosition.clone() : null;
-    
-	var intervalFunction = function() {
-        
-		var filterFun = function(position) {
-            if (lastPos == null || !position.equals(lastPos)) {
-                // only call the success callback when there is a change in position, per W3C
-                successCallback(position);
-            }
-            
-            // clone the new position, save it as our last position (internal var)
-            lastPos = position.clone();
-        };
-		
-		that.getCurrentPosition(filterFun, errorCallback, params);
-	};
-	
-    // Retrieve location immediately and schedule next retrieval afterwards
-	intervalFunction();
-	
-	return setInterval(intervalFunction, params.timeout);
-};
-
-
-/**
- * Clears the specified position watch.
- * @param {String} watchId The ID of the watch returned from #watchPosition.
- */
-Geolocation.prototype.clearWatch = function(watchId) {
-	clearInterval(watchId);
-};
-
-/**
- * Called by the geolocation framework when the current location is found.
- * @param {PositionOptions} position The current position.
- */
-Geolocation.prototype.setLocation = function(position) 
-{
-    var _position = new Position(position.coords, position.timestamp);
-
-    if(this.timeoutTimerId)
-    {
-        clearTimeout(this.timeoutTimerId);
-        this.timeoutTimerId = 0;
-    }
-    
-	this.lastError = null;
-    this.lastPosition = _position;
-    
-    if(this.listener && typeof(this.listener.success) == 'function')
-    {
-        this.listener.success(_position);
-    }
-    
-    this.listener = null;
-};
-
-/**
- * Called by the geolocation framework when an error occurs while looking up the current position.
- * @param {String} message The text of the error message.
- */
-Geolocation.prototype.setError = function(error) 
-{
-	var _error = new PositionError(error.code, error.message);
-
-    this.locationRunning = false
-	
-    if(this.timeoutTimerId)
-    {
-        clearTimeout(this.timeoutTimerId);
-        this.timeoutTimerId = 0;
-    }
-    
-    this.lastError = _error;
-    // call error handlers directly
-    if(this.listener && typeof(this.listener.fail) == 'function')
-    {
-        this.listener.fail(_error);
-    }
-    this.listener = null;
-
-};
-
-Geolocation.prototype.start = function(positionOptions) 
-{
-    PhoneGap.exec(null, null, "com.phonegap.geolocation", "startLocation", [positionOptions]);
-    this.locationRunning = true
-
-};
-
-Geolocation.prototype.stop = function() 
-{
-    PhoneGap.exec(null, null, "com.phonegap.geolocation", "stopLocation", []);
-    this.locationRunning = false
-};
-
-
-PhoneGap.addConstructor(function() 
-{
-    if (typeof navigator._geo == "undefined") 
-    {
-        // replace origObj's functions ( listed in funkList ) with the same method name on proxyObj
-        // this is a workaround to prevent UIWebView/MobileSafari default implementation of GeoLocation
-        // because it includes the full page path as the title of the alert prompt
-        var __proxyObj = function (origObj,proxyObj,funkList)
-        {
-            var replaceFunk = function(org,proxy,fName)
-            { 
-                org[fName] = function()
-                { 
-                   return proxy[fName].apply(proxy,arguments); 
-                }; 
-            };
-
-            for(var v in funkList) { replaceFunk(origObj,proxyObj,funkList[v]);}
-        }
-        navigator._geo = new Geolocation();
-        __proxyObj(navigator.geolocation, navigator._geo,
-                 ["setLocation","getCurrentPosition","watchPosition",
-                  "clearWatch","setError","start","stop"]);
-
-    }
-
-});
-};
-if (!PhoneGap.hasResource("compass")) {
-	PhoneGap.addResource("compass");
-
-CompassError = function(){
-   this.code = null;
-};
-
-// Capture error codes
-CompassError.COMPASS_INTERNAL_ERR = 0;
-CompassError.COMPASS_NOT_SUPPORTED = 20;
-
-CompassHeading = function() {
-	this.magneticHeading = null;
-	this.trueHeading = null;
-	this.headingAccuracy = null;
-	this.timestamp = null;
-}	
-/**
- * This class provides access to device Compass data.
- * @constructor
- */
-Compass = function() {
-    /**
-     * List of compass watch timers
-     */
-    this.timers = {};
-};
-
-/**
- * Asynchronously acquires the current heading.
- * @param {Function} successCallback The function to call when the heading
- * data is available
- * @param {Function} errorCallback The function to call when there is an error 
- * getting the heading data.
- * @param {PositionOptions} options The options for getting the heading data (not used).
- */
-Compass.prototype.getCurrentHeading = function(successCallback, errorCallback, options) {
- 	// successCallback required
-    if (typeof successCallback !== "function") {
-        console.log("Compass Error: successCallback is not a function");
-        return;
-    }
-
-    // errorCallback optional
-    if (errorCallback && (typeof errorCallback !== "function")) {
-        console.log("Compass Error: errorCallback is not a function");
-        return;
-    }
-
-    // Get heading
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.geolocation", "getCurrentHeading", []);
-};
-
-/**
- * Asynchronously acquires the heading repeatedly at a given interval.
- * @param {Function} successCallback The function to call each time the heading
- * data is available
- * @param {Function} errorCallback The function to call when there is an error 
- * getting the heading data.
- * @param {HeadingOptions} options The options for getting the heading data
- * such as timeout and the frequency of the watch.
- */
-Compass.prototype.watchHeading= function(successCallback, errorCallback, options) 
-{
-	// Default interval (100 msec)
-    var frequency = (options !== undefined) ? options.frequency : 100;
-
-    // successCallback required
-    if (typeof successCallback !== "function") {
-        console.log("Compass Error: successCallback is not a function");
-        return;
-    }
-
-    // errorCallback optional
-    if (errorCallback && (typeof errorCallback !== "function")) {
-        console.log("Compass Error: errorCallback is not a function");
-        return;
-    }
-
-    // Start watch timer to get headings
-    var id = PhoneGap.createUUID();
-    navigator.compass.timers[id] = setInterval(
-        function() {
-            PhoneGap.exec(successCallback, errorCallback, "com.phonegap.geolocation", "getCurrentHeading", [{repeats: 1}]);
-        }, frequency);
-
-    return id;
-};
-
-
-/**
- * Clears the specified heading watch.
- * @param {String} watchId The ID of the watch returned from #watchHeading.
- */
-Compass.prototype.clearWatch = function(id) 
-{
-	// Stop javascript timer & remove from timer list
-    if (id && navigator.compass.timers[id]) {
-        clearInterval(navigator.compass.timers[id]);
-        delete navigator.compass.timers[id];
-    }
-    if (navigator.compass.timers.length == 0) {
-    	// stop the 
-    	PhoneGap.exec(null, null, "com.phonegap.geolocation", "stopHeading", []);
-    }
-};
-
-/** iOS only
- * Asynchronously fires when the heading changes from the last reading.  The amount of distance 
- * required to trigger the event is specified in the filter paramter.
- * @param {Function} successCallback The function to call each time the heading
- * data is available
- * @param {Function} errorCallback The function to call when there is an error 
- * getting the heading data.
- * @param {HeadingOptions} options The options for getting the heading data
- * 			@param {filter} number of degrees change to trigger a callback with heading data (float)
- *
- * In iOS this function is more efficient than calling watchHeading  with a frequency for updates.
- * Only one watchHeadingFilter can be in effect at one time.  If a watchHeadingFilter is in effect, calling
- * getCurrentHeading or watchHeading will use the existing filter value for specifying heading change. 
-  */
-Compass.prototype.watchHeadingFilter = function(successCallback, errorCallback, options) 
-{
- 
- 	if (options === undefined || options.filter === undefined) {
- 		console.log("Compass Error:  options.filter not specified");
- 		return;
- 	}
-
-    // successCallback required
-    if (typeof successCallback !== "function") {
-        console.log("Compass Error: successCallback is not a function");
-        return;
-    }
-
-    // errorCallback optional
-    if (errorCallback && (typeof errorCallback !== "function")) {
-        console.log("Compass Error: errorCallback is not a function");
-        return;
-    }
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.geolocation", "watchHeadingFilter", [options]);
-}
-Compass.prototype.clearWatchFilter = function() 
-{
-    	PhoneGap.exec(null, null, "com.phonegap.geolocation", "stopHeading", []);
-};
-
-PhoneGap.addConstructor(function() 
-{
-    if (typeof navigator.compass == "undefined") 
-    {
-        navigator.compass = new Compass();
-    }
-});
-};
-
-if (!PhoneGap.hasResource("media")) {
-	PhoneGap.addResource("media");
-
-/**
- * List of media objects.
- * PRIVATE
- */
-PhoneGap.mediaObjects = {};
-
-/**
- * Object that receives native callbacks.
- * PRIVATE
- */
-PhoneGap.Media = function() {};
-
-
-/**
- * Get the media object.
- * PRIVATE
- *
- * @param id            The media object id (string)
- */
-PhoneGap.Media.getMediaObject = function(id) {
-    return PhoneGap.mediaObjects[id];
-};
-
-/**
- * Audio has status update.
- * PRIVATE
- *
- * @param id            The media object id (string)
- * @param msg           The status message (int)
- * @param value        The status code (int)
- */
-PhoneGap.Media.onStatus = function(id, msg, value) {
-    var media = PhoneGap.mediaObjects[id];
-
-    // If state update
-    if (msg == Media.MEDIA_STATE) {
-        if (value == Media.MEDIA_STOPPED) {
-            if (media.successCallback) {
-                media.successCallback();
-            }
-        }
-        if (media.statusCallback) {
-            media.statusCallback(value);
-        }
-    }
-    else if (msg == Media.MEDIA_DURATION) {
-        media._duration = value;
-    }
-    else if (msg == Media.MEDIA_ERROR) {
-        if (media.errorCallback) {
-            media.errorCallback(value);
-        }
-    }
-    else if (msg == Media.MEDIA_POSITION) {
-    	media._position = value;
-    }
-};
-
-/**
- * This class provides access to the device media, interfaces to both sound and video
- *
- * @param src                   The file name or url to play
- * @param successCallback       The callback to be called when the file is done playing or recording.
- *                                  successCallback() - OPTIONAL
- * @param errorCallback         The callback to be called if there is an error.
- *                                  errorCallback(int errorCode) - OPTIONAL
- * @param statusCallback        The callback to be called when media status has changed.
- *                                  statusCallback(int statusCode) - OPTIONAL
- * @param positionCallback      The callback to be called when media position has changed.
- *                                  positionCallback(long position) - OPTIONAL
- */
-Media = function(src, successCallback, errorCallback, statusCallback, positionCallback) {
-
-    // successCallback optional
-    if (successCallback && (typeof successCallback != "function")) {
-        console.log("Media Error: successCallback is not a function");
-        return;
-    }
-
-    // errorCallback optional
-    if (errorCallback && (typeof errorCallback != "function")) {
-        console.log("Media Error: errorCallback is not a function");
-        return;
-    }
-
-    // statusCallback optional
-    if (statusCallback && (typeof statusCallback != "function")) {
-        console.log("Media Error: statusCallback is not a function");
-        return;
-    }
-
-    // positionCallback optional -- NOT SUPPORTED
-    if (positionCallback && (typeof positionCallback != "function")) {
-        console.log("Media Error: positionCallback is not a function");
-        return;
-    }
-
-    this.id = PhoneGap.createUUID();
-    PhoneGap.mediaObjects[this.id] = this;
-    this.src = src;
-    this.successCallback = successCallback;
-    this.errorCallback = errorCallback;
-    this.statusCallback = statusCallback;
-    this.positionCallback = positionCallback;
-    this._duration = -1;
-    this._position = -1;
-};
-
-// Media messages
-Media.MEDIA_STATE = 1;
-Media.MEDIA_DURATION = 2;
-Media.MEDIA_POSITION = 3;
-Media.MEDIA_ERROR = 9;
-
-// Media states
-Media.MEDIA_NONE = 0;
-Media.MEDIA_STARTING = 1;
-Media.MEDIA_RUNNING = 2;
-Media.MEDIA_PAUSED = 3;
-Media.MEDIA_STOPPED = 4;
-Media.MEDIA_MSG = ["None", "Starting", "Running", "Paused", "Stopped"];
-
-// TODO: Will MediaError be used?
-/**
- * This class contains information about any Media errors.
- * @constructor
- */
-
-MediaError = function() {
-	this.code = null,
-	this.message = "";
-}
-
-MediaError.MEDIA_ERR_ABORTED        = 1;
-MediaError.MEDIA_ERR_NETWORK        = 2;
-MediaError.MEDIA_ERR_DECODE         = 3;
-MediaError.MEDIA_ERR_NONE_SUPPORTED = 4;
-
-/**
- * Start or resume playing audio file.
- */
-Media.prototype.play = function(options) {
-    PhoneGap.exec(null, null, "com.phonegap.media", "play", [this.id, this.src, options]);
-};
-
-/**
- * Stop playing audio file.
- */
-Media.prototype.stop = function() {
-    PhoneGap.exec(null, null, "com.phonegap.media","stop", [this.id, this.src]);
-};
-
-/**
- * Pause playing audio file.
- */
-Media.prototype.pause = function() {
-    PhoneGap.exec(null, null, "com.phonegap.media","pause", [this.id, this.src]);
-};
-
-/**
- * Seek or jump to a new time in the track..
- */
-Media.prototype.seekTo = function(milliseconds) {
-    PhoneGap.exec(null, null, "com.phonegap.media", "seekTo", [this.id, this.src, milliseconds]);
-};
-
-/**
- * Get duration of an audio file.
- * The duration is only set for audio that is playing, paused or stopped.
- *
- * @return      duration or -1 if not known.
- */
-Media.prototype.getDuration = function() {
-    return this._duration;
-};
-
-/**
- * Get position of audio.
- *
- * @return
- */
-Media.prototype.getCurrentPosition = function(successCB, errorCB) {
-	var errCallback = (errorCB == undefined || errorCB == null) ? null : errorCB;
-    PhoneGap.exec(successCB, errorCB, "com.phonegap.media", "getCurrentPosition", [this.id, this.src]);
-};
-
-// iOS only.  prepare/load the audio in preparation for playing
-Media.prototype.prepare = function(successCB, errorCB) {
-	PhoneGap.exec(successCB, errorCB, "com.phonegap.media", "prepare", [this.id, this.src]);
-}
-
-/**
- * Start recording audio file.
- */
-Media.prototype.startRecord = function() {
-    PhoneGap.exec(null, null, "com.phonegap.media","startAudioRecord", [this.id, this.src]);
-};
-
-/**
- * Stop recording audio file.
- */
-Media.prototype.stopRecord = function() {
-    PhoneGap.exec(null, null, "com.phonegap.media","stopAudioRecord", [this.id, this.src]);
-};
-
-/**
- * Release the resources.
- */
-Media.prototype.release = function() {
-    PhoneGap.exec(null, null, "com.phonegap.media","release", [this.id, this.src]);
-};
-
-};
-if (!PhoneGap.hasResource("notification")) {
-	PhoneGap.addResource("notification");
-
-/**
- * This class provides access to notifications on the device.
- */
-Notification = function() {
-};
-
-/**
- * Open a native alert dialog, with a customizable title and button text.
- *
- * @param {String} message              Message to print in the body of the alert
- * @param {Function} completeCallback   The callback that is called when user clicks on a button.
- * @param {String} title                Title of the alert dialog (default: Alert)
- * @param {String} buttonLabel          Label of the close button (default: OK)
- */
-Notification.prototype.alert = function(message, completeCallback, title, buttonLabel) {
-    var _title = title;
-    if (title == null || typeof title === 'undefined') {
-        _title = "Alert";
-    }
-    var _buttonLabel = (buttonLabel || "OK");
-    PhoneGap.exec(completeCallback, null, "com.phonegap.notification", "alert", [message,{ "title": _title, "buttonLabel": _buttonLabel}]);
-};
-
-/**
- * Open a native confirm dialog, with a customizable title and button text.
- * The result that the user selects is returned to the result callback.
- *
- * @param {String} message              Message to print in the body of the alert
- * @param {Function} resultCallback     The callback that is called when user clicks on a button.
- * @param {String} title                Title of the alert dialog (default: Confirm)
- * @param {String} buttonLabels         Comma separated list of the labels of the buttons (default: 'OK,Cancel')
- */
-Notification.prototype.confirm = function(message, resultCallback, title, buttonLabels) {
-    var _title = (title || "Confirm");
-    var _buttonLabels = (buttonLabels || "OK,Cancel");
-    this.alert(message, resultCallback, _title, _buttonLabels);
-};
-
-/**
- * Causes the device to blink a status LED.
- * @param {Integer} count The number of blinks.
- * @param {String} colour The colour of the light.
- */
-Notification.prototype.blink = function(count, colour) {
-// NOT IMPLEMENTED	
-};
-
-Notification.prototype.vibrate = function(mills) {
-	PhoneGap.exec(null, null, "com.phonegap.notification", "vibrate", []);
-};
-
-Notification.prototype.beep = function(count, volume) {
-	// No Volume yet for the iphone interface
-	// We can use a canned beep sound and call that
-	new Media('beep.wav').play();
-};
-
-PhoneGap.addConstructor(function() {
-    if (typeof navigator.notification == "undefined") navigator.notification = new Notification();
-});
-};
-if (!PhoneGap.hasResource("orientation")) {
-	PhoneGap.addResource("orientation");
-
-/**
- * This class provides access to the device orientation.
- * @constructor
- */
-Orientation  = function() {
-	/**
-	 * The current orientation, or null if the orientation hasn't changed yet.
-	 */
-	this.currentOrientation = null;
-}
-
-/**
- * Set the current orientation of the phone.  This is called from the device automatically.
- * 
- * When the orientation is changed, the DOMEvent \c orientationChanged is dispatched against
- * the document element.  The event has the property \c orientation which can be used to retrieve
- * the device's current orientation, in addition to the \c Orientation.currentOrientation class property.
- *
- * @param {Number} orientation The orientation to be set
- */
-Orientation.prototype.setOrientation = function(orientation) {
-    Orientation.currentOrientation = orientation;
-    var e = document.createEvent('Events');
-    e.initEvent('orientationChanged', 'false', 'false');
-    e.orientation = orientation;
-    document.dispatchEvent(e);
-};
-
-/**
- * Asynchronously aquires the current orientation.
- * @param {Function} successCallback The function to call when the orientation
- * is known.
- * @param {Function} errorCallback The function to call when there is an error 
- * getting the orientation.
- */
-Orientation.prototype.getCurrentOrientation = function(successCallback, errorCallback) {
-	// If the position is available then call success
-	// If the position is not available then call error
-};
-
-/**
- * Asynchronously aquires the orientation repeatedly at a given interval.
- * @param {Function} successCallback The function to call each time the orientation
- * data is available.
- * @param {Function} errorCallback The function to call when there is an error 
- * getting the orientation data.
- */
-Orientation.prototype.watchOrientation = function(successCallback, errorCallback) {
-	// Invoke the appropriate callback with a new Position object every time the implementation 
-	// determines that the position of the hosting device has changed. 
-	this.getCurrentPosition(successCallback, errorCallback);
-	return setInterval(function() {
-		navigator.orientation.getCurrentOrientation(successCallback, errorCallback);
-	}, 10000);
-};
-
-/**
- * Clears the specified orientation watch.
- * @param {String} watchId The ID of the watch returned from #watchOrientation.
- */
-Orientation.prototype.clearWatch = function(watchId) {
-	clearInterval(watchId);
-};
-
-Orientation.install = function()
-{
-    if (typeof navigator.orientation == "undefined") { 
-		navigator.orientation = new Orientation();
-	}
-	
-	var windowDispatchAvailable = !(window.dispatchEvent === undefined); // undefined in iOS 3.x
-	if (windowDispatchAvailable) {
-		return;
-	} 
-	
-	// the code below is to capture window.add/remove eventListener calls on window
-	// this is for iOS 3.x where listening on 'orientationchange' events don't work on document/window (don't know why)
-	// however, window.onorientationchange DOES handle the 'orientationchange' event (sent through document), so...
-	// then we multiplex the window.onorientationchange event (consequently - people shouldn't overwrite this)
-	
-	var self = this;
-	var orientationchangeEvent = 'orientationchange';
-	var newOrientationchangeEvent = 'orientationchange_pg';
-	
-	// backup original `window.addEventListener`, `window.removeEventListener`
-    var _addEventListener = window.addEventListener;
-    var _removeEventListener = window.removeEventListener;
-
-	window.onorientationchange = function() {
-		PhoneGap.fireEvent(newOrientationchangeEvent, window);
-	}
-	
-    // override `window.addEventListener`
-    window.addEventListener = function() {
-        if (arguments[0] === orientationchangeEvent) {
-			arguments[0] = newOrientationchangeEvent; 
-		} 
-													
-		if (!windowDispatchAvailable) {
-			return document.addEventListener.apply(this, arguments);
-		} else {
-			return _addEventListener.apply(this, arguments);
-		}
-    };	
-
-    // override `window.removeEventListener'
-    window.removeEventListener = function() {
-        if (arguments[0] === orientationchangeEvent) {
-			arguments[0] = newOrientationchangeEvent; 
-		} 
-		
-		if (!windowDispatchAvailable) {
-			return document.removeEventListener.apply(this, arguments);
-		} else {
-			return _removeEventListener.apply(this, arguments);
-		}
-    };	
-};
-
-PhoneGap.addConstructor(Orientation.install);
-
-};
-if (!PhoneGap.hasResource("sms")) {
-	PhoneGap.addResource("sms");
-
-/**
- * This class provides access to the device SMS functionality.
- * @constructor
- */
-Sms = function() {
-
-}
-
-/**
- * Sends an SMS message.
- * @param {Integer} number The phone number to send the message to.
- * @param {String} message The contents of the SMS message to send.
- * @param {Function} successCallback The function to call when the SMS message is sent.
- * @param {Function} errorCallback The function to call when there is an error sending the SMS message.
- * @param {PositionOptions} options The options for accessing the GPS location such as timeout and accuracy.
- */
-Sms.prototype.send = function(number, message, successCallback, errorCallback, options) {
-	// not sure why this is here when it does nothing????
-};
-
-PhoneGap.addConstructor(function() {
-    if (typeof navigator.sms == "undefined") navigator.sms = new Sms();
-});
-};
-if (!PhoneGap.hasResource("telephony")) {
-	PhoneGap.addResource("telephony");
-
-/**
- * This class provides access to the telephony features of the device.
- * @constructor
- */
-Telephony = function() {
-	
-}
-
-/**
- * Calls the specifed number.
- * @param {Integer} number The number to be called.
- */
-Telephony.prototype.call = function(number) {
-	// not sure why this is here when it does nothing????
-};
-
-PhoneGap.addConstructor(function() {
-    if (typeof navigator.telephony == "undefined") navigator.telephony = new Telephony();
-});
-};if (!PhoneGap.hasResource("network")) {
-	PhoneGap.addResource("network");
-
-// //////////////////////////////////////////////////////////////////
-
-Connection = function() {
-	/*
-	 * One of the connection constants below.
-	 */
-	this.type = Connection.UNKNOWN;
-
-	/* initialize from the extended DeviceInfo properties */
-    try {      
-		this.type	= DeviceInfo.connection.type;
-    } 
-	catch(e) {
-    }
-};
-
-Connection.UNKNOWN = "unknown"; // Unknown connection type
-Connection.ETHERNET = "ethernet";
-Connection.WIFI = "wifi";
-Connection.CELL_2G = "2g"; // the default for iOS, for any cellular connection
-Connection.CELL_3G = "3g";
-Connection.CELL_4G = "4g";
-Connection.NONE = "none"; // NO connectivity
-
-
-PhoneGap.addConstructor(function() {
-    if (typeof navigator.network == "undefined") navigator.network = {};
-    if (typeof navigator.network.connection == "undefined") navigator.network.connection = new Connection();
-});
-
-};if (!PhoneGap.hasResource("splashscreen")) {
-	PhoneGap.addResource("splashscreen");
-
-/**
- * This class provides access to the splashscreen
- */
-SplashScreen = function() {
-};
-
-SplashScreen.prototype.show = function() {
-    PhoneGap.exec(null, null, "com.phonegap.splashscreen", "show", []);
-};
-
-SplashScreen.prototype.hide = function() {
-    PhoneGap.exec(null, null, "com.phonegap.splashscreen", "hide", []);
-};
-
-PhoneGap.addConstructor(function() {
-    if (typeof navigator.splashscreen == "undefined") navigator.splashscreen = new SplashScreen();
-});
-
-};
diff --git a/apps/files_odfviewer/src/webodf/programs/nativeQtClient/CMakeLists.txt b/apps/files_odfviewer/src/webodf/programs/nativeQtClient/CMakeLists.txt
deleted file mode 100644
index f317693e3d..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/nativeQtClient/CMakeLists.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-include(${QT_USE_FILE})
-include_directories(${CMAKE_CURRENT_BINARY_DIR} ${QT_QTCORE_INCLUDE_DIR})
-QT4_WRAP_CPP(NATIVEQTCLIENT_MOC
-    odfview.h
-    ../qtjsruntime/nativeio.h
-    ../qtjsruntime/nam.h
-)
-file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/application.qrc
-        "<RCC><qresource prefix='/'>")
-foreach(FILE ${HTML5UIFILES} ${LIBJSFILES} index.html scripts.js webodf.css)
-    file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/application.qrc
-        "<file>www/${FILE}</file>\n")
-endforeach(FILE ${HTML5UIFILES})
-file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/application.qrc
-        "</qresource></RCC>")
-COPY_FILES(NATIVEDEPS ${CMAKE_SOURCE_DIR}/programs/touchui
-    ${CMAKE_CURRENT_BINARY_DIR}/www ${HTML5UIFILES})
-COPY_FILES(NATIVEDEPS ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_BINARY_DIR}/www scripts.js)
-COPY_FILES(NATIVEDEPS ${CMAKE_SOURCE_DIR}/programs/touchui
-    ${CMAKE_CURRENT_BINARY_DIR}/www index.html)
-COPY_FILES(NATIVEDEPS ${CMAKE_SOURCE_DIR}/webodf
-    ${CMAKE_CURRENT_BINARY_DIR}/www webodf.css)
-COPY_FILES(NATIVEDEPS ${CMAKE_SOURCE_DIR}/webodf
-    ${CMAKE_CURRENT_BINARY_DIR}/www ${LIBJSFILES})
-QT4_ADD_RESOURCES(NATIVEQTCLIENT_RES
-    ${CMAKE_CURRENT_BINARY_DIR}/application.qrc)
-
-add_custom_target(nativeQtClientDepencencies ALL DEPENDS ${NATIVEDEPS})
-
-add_executable(nativeQtClient
-    main.cpp
-    odfview.cpp
-    ../qtjsruntime/nativeio.cpp
-    odfpage.cpp ${NATIVEQTCLIENT_MOC} ${NATIVEQTCLIENT_UI}
-    ${NATIVEQTCLIENT_RES})
-
-target_link_libraries(nativeQtClient ${QT_LIBRARIES})
-add_dependencies(nativeQtClient nativeQtClientDepencencies)
diff --git a/apps/files_odfviewer/src/webodf/programs/nativeQtClient/README b/apps/files_odfviewer/src/webodf/programs/nativeQtClient/README
deleted file mode 100644
index 4860fa1b00..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/nativeQtClient/README
+++ /dev/null
@@ -1 +0,0 @@
-This is a small app that can show ODF documents using mainly javascript. Some functions that are not fast in browers are provided in C++ and it gives the ability to open files on the file system.
diff --git a/apps/files_odfviewer/src/webodf/programs/nativeQtClient/application.qrc b/apps/files_odfviewer/src/webodf/programs/nativeQtClient/application.qrc
deleted file mode 100644
index 5010cdb8a8..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/nativeQtClient/application.qrc
+++ /dev/null
@@ -1,18 +0,0 @@
-<RCC>
-    <qresource prefix="/">
-        <file>www/app/app.js</file>
-        <file>www/app/controller/Files.js</file>
-        <file>www/app/model/FileSystem.js</file>
-        <file>www/app/store/FileStore.js</file>
-        <file>www/app/views/FileDetail.js</file>
-        <file>www/app/views/FilesList.js</file>
-        <file>www/app/views/OdfView.js</file>
-        <file>www/app/views/Viewport.js</file>
-        <file>www/index.html</file>
-        <file>www/scripts.js</file>
-        <file>www/sencha-touch.css</file>
-        <file>www/sencha-touch.js</file>
-        <file>www/webodf.css</file>
-        <file>www/webodf.js</file>
-    </qresource>
-</RCC>
diff --git a/apps/files_odfviewer/src/webodf/programs/nativeQtClient/main.cpp b/apps/files_odfviewer/src/webodf/programs/nativeQtClient/main.cpp
deleted file mode 100644
index 62e5fa18be..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/nativeQtClient/main.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "odfview.h"
-#include <QtGui/QApplication>
-#include <QtCore/QTimer>
-
-int main(int argc, char *argv[]) {
-    QApplication a(argc, argv);
-    OdfView view;
-    view.show();
-    return a.exec();
-}
diff --git a/apps/files_odfviewer/src/webodf/programs/nativeQtClient/mainwindow.cpp b/apps/files_odfviewer/src/webodf/programs/nativeQtClient/mainwindow.cpp
deleted file mode 100644
index 861014399e..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/nativeQtClient/mainwindow.cpp
+++ /dev/null
@@ -1,173 +0,0 @@
-#include "mainwindow.h"
-#include "ui_mainwindow.h"
-#include "odfview.h"
-#include <QtGui/QDockWidget>
-#include <QtGui/QFileDialog>
-#include <QtGui/QFileSystemModel>
-#include <QtGui/QLineEdit>
-#include <QtGui/QMdiArea>
-#include <QtGui/QTreeView>
-#include <QtGui/QVBoxLayout>
-#include <QtCore/QDir>
-#include <QtCore/QSettings>
-
-MainWindow::MainWindow(QWidget *parent) :
-    QMainWindow(parent),
-    ui(new Ui::MainWindow)
-{
-    ui->setupUi(this);
-
-    createActions();
-    createToolBars();
-
-    QCoreApplication::setOrganizationName("KO");
-    //QCoreApplication::setOrganizationDomain("example.com");
-    QCoreApplication::setApplicationName("Odf Viewer");
-
-    QSettings settings;
-
-    setWindowTitle(tr("Odf Viewer"));
-    setUnifiedTitleAndToolBarOnMac(true);
-
-    QStringList odfNameFilter;
-    odfNameFilter << "*.odt" << "*.ods" << "*.odp";
-    dirmodel = new QFileSystemModel(this);
-    dirmodel->setNameFilters(odfNameFilter);
-    dirmodel->setFilter(QDir::AllDirs|QDir::AllEntries|QDir::NoDotAndDotDot);
-    dirview = new QTreeView(this);
-    dirview->setModel(dirmodel);
-    dirview->setHeaderHidden(true);
-    dirview->setAnimated(true);
-    for (int i = 1; i < dirmodel->columnCount(); i++) {
-        dirview->setColumnHidden(i, true);
-    }
-    QString rootpath = settings.value("rootpath", QDir::homePath()).toString();
-    dirmodel->setRootPath(rootpath);
-    const QModelIndex rootindex = dirmodel->index(rootpath);
-    dirview->setRootIndex(rootindex);
-    QLineEdit *dirPath = new QLineEdit(rootpath, this);
-    dirdock = new QDockWidget(this);
-    QWidget *w = new QWidget(dirdock);
-    QVBoxLayout *layout = new QVBoxLayout(w);
-    dirdock->setWidget(w);
-    layout->addWidget(dirPath);
-    layout->addWidget(dirview);
-    addDockWidget(Qt::LeftDockWidgetArea, dirdock);
-
-    connect(dirview, SIGNAL(clicked(QModelIndex)), this, SLOT(loadOdf(QModelIndex)));
-    connect(dirPath, SIGNAL(textChanged(QString)), this, SLOT(setPath(QString)));
-}
-
-MainWindow::~MainWindow()
-{
-    delete ui;
-}
-
-void
-MainWindow::openFile(const QString& path)
-{
-    QMdiSubWindow* w = findMdiChild(path);
-    OdfView* v = (w) ?dynamic_cast<OdfView*>(w->widget()) :0;
-    if (v == 0) {
-        w = ui->mdiArea->activeSubWindow();
-        v = (w) ?dynamic_cast<OdfView*>(w->widget()) :0;
-    }
-    if (v == 0) {
-        v = new OdfView(this);
-        v->showMaximized();
-        w = ui->mdiArea->addSubWindow(v);
-        w->showMaximized();
-    }
-    ui->mdiArea->setActiveSubWindow(w);
-    v->loadFile(path);
-}
-
-void MainWindow::changeEvent(QEvent *e)
-{
-    QMainWindow::changeEvent(e);
-    switch (e->type()) {
-    case QEvent::LanguageChange:
-        ui->retranslateUi(this);
-        break;
-    default:
-        break;
-    }
-}
-void MainWindow::open()
-{
-    QString fileName = QFileDialog::getOpenFileName(this, QString(), QString(),
-        tr("Office Files (*.odt *.odp *.ods)"));
-    if (!fileName.isEmpty()) {
-        QMdiSubWindow *existing = findMdiChild(fileName);
-        if (existing) {
-            ui->mdiArea->setActiveSubWindow(existing);
-            return;
-        }
-
-        OdfView *child = createOdfView();
-        if (child->loadFile(fileName)) {
-            statusBar()->showMessage(tr("File loaded"), 2000);
-            child->showMaximized();
-        } else {
-            child->close();
-        }
-    }
-}
-void MainWindow::createActions()
-{
-    //openAct = new QAction(QIcon(":/images/open.png"), tr("&Open..."), this);
-    openAct = new QAction(tr("&Open..."), this);
-    openAct->setShortcuts(QKeySequence::Open);
-    openAct->setStatusTip(tr("Open an existing file"));
-    connect(openAct, SIGNAL(triggered()), this, SLOT(open()));
-}
-void MainWindow::createToolBars()
-{
-    fileToolBar = addToolBar(tr("File"));
-    fileToolBar->addAction(openAct);
-}
-QMdiSubWindow *MainWindow::findMdiChild(const QString &fileName)
-{
-    QString canonicalFilePath = QFileInfo(fileName).canonicalFilePath();
-
-    foreach (QMdiSubWindow *window, ui->mdiArea->subWindowList()) {
-        OdfView *odfView = qobject_cast<OdfView *>(window->widget());
-        if (odfView->currentFile() == canonicalFilePath)
-            return window;
-    }
-    return 0;
-}
-
-OdfView *MainWindow::createOdfView()
-{
-    OdfView *view = new OdfView(this);
-    ui->mdiArea->addSubWindow(view);
-    return view;
-}
-
-void
-MainWindow::loadOdf(const QModelIndex& index) {
-    if (dirmodel->isDir(index)) {
-        if (dirview->isExpanded(index)) {
-            dirview->collapse(index);
-        } else {
-            dirview->expand(index);
-        }
-        return;
-    }
-    QString path = dirmodel->filePath(index);
-    path = QFileInfo(path).canonicalFilePath();
-    openFile(path);
-}
-
-void MainWindow::setPath(const QString &path)
-{
-    dirmodel->setRootPath(path);
-    const QModelIndex rootindex = dirmodel->index(path);
-    dirview->setRootIndex(rootindex);
-    QSettings settings;
-    settings.setValue("rootpath", path);
-}
-
-
-
diff --git a/apps/files_odfviewer/src/webodf/programs/nativeQtClient/mainwindow.h b/apps/files_odfviewer/src/webodf/programs/nativeQtClient/mainwindow.h
deleted file mode 100644
index d0bc822d03..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/nativeQtClient/mainwindow.h
+++ /dev/null
@@ -1,46 +0,0 @@
-#ifndef MAINWINDOW_H
-#define MAINWINDOW_H
-
-#include <QtGui/QMainWindow>
-#include <QtGui/QMdiSubWindow>
-
-namespace Ui {
-    class MainWindow;
-}
-
-class OdfView;
-class QFileSystemModel;
-class QTreeView;
-class QDockWidget;
-class QModelIndex;
-
-class MainWindow : public QMainWindow {
-    Q_OBJECT
-public:
-    MainWindow(QWidget *parent = 0);
-    ~MainWindow();
-    void openFile(const QString& path);
-
-private slots:
-    void open();
-    OdfView *createOdfView();
-    void loadOdf(const QModelIndex& index);
-    void setPath(const QString &path);
-
-private:
-    QMdiSubWindow *findMdiChild(const QString &fileName);
-    void createActions();
-    void createToolBars();
-    QToolBar *fileToolBar;
-    QAction *openAct;
-protected:
-    void changeEvent(QEvent *e);
-
-private:
-    Ui::MainWindow *ui;
-    QFileSystemModel* dirmodel;
-    QTreeView* dirview;
-    QDockWidget* dirdock;
-};
-
-#endif // MAINWINDOW_H
diff --git a/apps/files_odfviewer/src/webodf/programs/nativeQtClient/mainwindow.ui b/apps/files_odfviewer/src/webodf/programs/nativeQtClient/mainwindow.ui
deleted file mode 100644
index 38682c7010..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/nativeQtClient/mainwindow.ui
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>MainWindow</class>
- <widget class="QMainWindow" name="MainWindow">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>800</width>
-    <height>600</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>MainWindow</string>
-  </property>
-  <widget class="QWidget" name="centralWidget">
-   <layout class="QGridLayout" name="gridLayout">
-    <item row="0" column="0">
-     <widget class="QMdiArea" name="mdiArea"/>
-    </item>
-   </layout>
-  </widget>
-  <widget class="QMenuBar" name="menuBar">
-   <property name="geometry">
-    <rect>
-     <x>0</x>
-     <y>0</y>
-     <width>800</width>
-     <height>23</height>
-    </rect>
-   </property>
-  </widget>
-  <widget class="QToolBar" name="mainToolBar">
-   <attribute name="toolBarArea">
-    <enum>TopToolBarArea</enum>
-   </attribute>
-   <attribute name="toolBarBreak">
-    <bool>false</bool>
-   </attribute>
-  </widget>
-  <widget class="QStatusBar" name="statusBar"/>
- </widget>
- <layoutdefault spacing="6" margin="11"/>
- <resources/>
- <connections/>
-</ui>
diff --git a/apps/files_odfviewer/src/webodf/programs/nativeQtClient/odfpage.cpp b/apps/files_odfviewer/src/webodf/programs/nativeQtClient/odfpage.cpp
deleted file mode 100644
index d87a8baa2b..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/nativeQtClient/odfpage.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include "odfpage.h"
diff --git a/apps/files_odfviewer/src/webodf/programs/nativeQtClient/odfpage.h b/apps/files_odfviewer/src/webodf/programs/nativeQtClient/odfpage.h
deleted file mode 100644
index 487d169917..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/nativeQtClient/odfpage.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef ODFPAGE_H
-#define ODFPAGE_H
-
-#include <QtWebKit/QWebPage>
-#include <QtCore/QDebug>
-
-class OdfPage : public QWebPage {
-public:
-    OdfPage(QObject* parent) :QWebPage(parent) {}
-    void javaScriptConsoleMessage(const QString& message, int lineNumber, const QString & sourceID) {
-        qDebug() << sourceID << ":" << lineNumber << ":" << message;
-    }
-};
-
-#endif // ODFPAGE_H
diff --git a/apps/files_odfviewer/src/webodf/programs/nativeQtClient/odfview.cpp b/apps/files_odfviewer/src/webodf/programs/nativeQtClient/odfview.cpp
deleted file mode 100644
index 97125a5537..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/nativeQtClient/odfview.cpp
+++ /dev/null
@@ -1,83 +0,0 @@
-#include "odfview.h"
-
-#include "../qtjsruntime/nativeio.h"
-#include "../qtjsruntime/nam.h"
-
-#include "odfpage.h"
-
-#include <QtCore/QByteArray>
-#include <QtWebKit/QWebFrame>
-#include <QtNetwork/QNetworkAccessManager>
-#include <QtNetwork/QNetworkRequest>
-#include <QtNetwork/QNetworkReply>
-#include <QtCore/QFileInfo>
-#include <QtCore/QDir>
-
-OdfView::OdfView(QWidget* parent) :QWebView(parent)
-{
-    QString prefix = "../android/assets/"; // set this to the right value when debugging
-    QString htmlfile = QDir(prefix).absoluteFilePath("www/index.html");
-    if (!QFileInfo(htmlfile).exists()) {
-        prefix = "qrc:/";
-        htmlfile = "qrc:/www/index.html";
-    }
-    setPage(new OdfPage(this));
-    nativeio = new NativeIO(this, QDir(prefix), QDir::current());
-    connect(page(), SIGNAL(loadFinished(bool)), this, SLOT(slotLoadFinished(bool)));
-    page()->settings()->setAttribute(QWebSettings::DeveloperExtrasEnabled, true);
-
-    connect(page()->mainFrame(), SIGNAL(javaScriptWindowObjectCleared()),
-            this, SLOT(slotInitWindowObjects()));
-
-    // use our own networkaccessmanager that gives limited access to the local
-    // file system
-    networkaccessmanager = new NAM(this);
-    page()->setNetworkAccessManager(networkaccessmanager);
-    setUrl(QUrl(htmlfile));
-    loaded = false;
-}
-
-OdfView::~OdfView() {
-}
-
-void
-OdfView::slotInitWindowObjects()
-{
-    QWebFrame *frame = page()->mainFrame();
-    frame->addToJavaScriptWindowObject("nativeio", nativeio);
-}
-
-bool
-OdfView::loadFile(const QString &fileName) {
-    curFile = fileName;
-    //    odf->addFile(identifier, fileName);
-    //    networkaccessmanager->setCurrentFile(odf->getOpenContainer(identifier));
-    if (loaded) {
-        slotLoadFinished(true);
-    }
-    return true;
-}
-void
-OdfView::slotLoadFinished(bool ok) {
-    if (!ok) return;
-    loaded = true;
-    QWebFrame *frame = page()->mainFrame();
-    QString js =
-            "var originalReadFileSync = runtime.readFileSync;"
-            "runtime.readFileSync = function (path, encoding) {"
-            "    if (path.substr(path.length - 3) === '.js') {"
-            "        return originalReadFileSync.apply(runtime,"
-            "           [path, encoding]);"
-            "    }"
-            "    return nativeio.readFileSync(path, encoding);"
-            "};"
-            "runtime.read = function (path, offset, length, callback) {"
-            "    var data = nativeio.read(path, offset, length);"
-            "    data = runtime.byteArrayFromString(data, 'binary');"
-            "    callback(nativeio.error()||null, data);"
-            "};"
-            "runtime.getFileSize = function (path, callback) {"
-            "    callback(nativeio.getFileSize(path));"
-            "};";
-    frame->evaluateJavaScript(js);
-}
diff --git a/apps/files_odfviewer/src/webodf/programs/nativeQtClient/odfview.h b/apps/files_odfviewer/src/webodf/programs/nativeQtClient/odfview.h
deleted file mode 100644
index f61ba3c926..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/nativeQtClient/odfview.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifndef ODFVIEW_H
-#define ODFVIEW_H
-
-#include <QtWebKit/QWebView>
-#include <QtNetwork/QNetworkAccessManager>
-class NativeIO;
-
-class OdfView : public QWebView {
-Q_OBJECT
-public:
-    OdfView(QWidget* parent = 0);
-    ~OdfView();
-    QString currentFile() { return curFile; }
-
-public slots:
-    bool loadFile(const QString &fileName);
-
-private slots:
-    void slotLoadFinished(bool ok);
-    void slotInitWindowObjects();
-
-private:
-    bool loaded;
-    QString curFile;
-    QNetworkAccessManager* networkaccessmanager;
-    NativeIO* nativeio;
-};
-
-#endif // ODFVIEW_H
diff --git a/apps/files_odfviewer/src/webodf/programs/nativeQtClient/scripts.js b/apps/files_odfviewer/src/webodf/programs/nativeQtClient/scripts.js
deleted file mode 100644
index ce2086bc7a..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/nativeQtClient/scripts.js
+++ /dev/null
@@ -1,93 +0,0 @@
-/*global alert, app, window, runtime*/
-var LocalFileSystem = {
-    PERSISTENT: 0,
-    TEMPORARY: 1
-};
-function FileEntry(name, fullPath) {
-    "use strict";
-    this.isFile = true;
-    this.isDirectory = false;
-    this.name = name;
-    this.fullPath = fullPath;
-    this.file = function (onsuccess, onerror) {
-        function File(fullPath) {
-            this.name = name;
-            this.fullPath = fullPath;
-            this.type = "";
-            this.size = -1;
-            this.lastModifiedDate = -1;
-        }
-        var file = new File(fullPath);
-        try {
-            onsuccess(file);
-        } catch (e) {
-            alert("Error on determining file properties: " + e);
-            onerror(e);
-        }
-    };
-}
-function FileReader() {
-    "use strict";
-    var fr = this;
-    this.readAsArrayBuffer = function (file) {
-        var path = file.fullPath.substr(7),
-            data = runtime.readFileSync(path, 'binary');
-        data = runtime.byteArrayFromString(data, "binary");
-        window.setTimeout(function () {
-            fr.onloadend({target: {result: data}});
-        }, 1);
-    };
-}
-var DirectoryReader;
-function DirectoryEntry(name, fullPath) {
-    "use strict";
-    this.isFile = false;
-    this.isDirectory = true;
-    this.name = name;
-    this.fullPath = fullPath;
-    this.createReader = function () {
-        var reader = new DirectoryReader(fullPath);
-        return reader;
-    };
-}
-function DirectoryReader(fullPath) {
-    "use strict";
-    this.readEntries = function (onsuccess, onerror) {
-        window.setTimeout(function () {
-            var entries = [];
-            entries[entries.length] = new FileEntry("welcome.odt",
-                    "welcome.odt");
-            entries[entries.length] = new FileEntry("Traktatenblad.odt",
-                    "Traktatenblad.odt");
-            try {
-                onsuccess(entries);
-            } catch (e) {
-                onerror(e);
-            }
-        }, 1);
-    };
-}
-window.resolveLocalFileSystemURI = function (path, onsuccess, onerror) {
-    "use strict";
-    var p = path.lastIndexOf("/"),
-        name = (p === -1) ? path : path.substr(p + 1);
-    onsuccess(new FileEntry(name, path));
-};
-window.requestFileSystem = function (filesystem, id, onsuccess, onerror) {
-    "use strict";
-    var dirs = [], shared, subfolder, path;
-    try {
-        if (filesystem === LocalFileSystem.PERSISTENT) {
-            path = "";
-            onsuccess({
-                name: "root",
-                root: new DirectoryEntry("root", path)
-            });
-        } else {
-            onerror("not defined");
-        }
-    } catch (e) {
-        onerror(e);
-    }
-};
-var device = {};
diff --git a/apps/files_odfviewer/src/webodf/programs/playbook/CMakeLists.txt b/apps/files_odfviewer/src/webodf/programs/playbook/CMakeLists.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/apps/files_odfviewer/src/webodf/programs/playbook/build_sign.bat b/apps/files_odfviewer/src/webodf/programs/playbook/build_sign.bat
deleted file mode 100644
index 34e8deeab3..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/playbook/build_sign.bat
+++ /dev/null
@@ -1,23 +0,0 @@
-@echo on
-set WWSDK=M:\blackberrysdk\webworkssdk
-set BBWP=%WWSDK%\bbwp\bbwp
-set DEPLOY=%WWSDK%\bbwp\blackberry-tablet-sdk\bin\blackberry-deploy
-set JAVA_HOME=%WWSDK%\jre
-set PATH=%PATH%;%JAVA_HOME%\bin
-
-mkdir bin
-mkdir signed
-
-zip -r webodf.zip config.xml index.html icon.png scripts.js app sencha-touch.js sencha-touch.css webodf.js webodf.css ZoomIn.png ZoomOut.png
-
-rem MAKE A DEBUG VERSION
-del bin\webodf.bar
-%BBWP% webodf.zip -d -o bin
-if %errorlevel% neq 0 exit /b %errorlevel% 
-
-%DEPLOY% -installApp -password ko -device 192.168.1.111 -package bin\webodf.bar
-if %errorlevel% neq 0 exit /b %errorlevel% 
-
-rem MAKE A SIGNED VERSION, (can be done only once for each buildId!)
-rem %BBWP% webodf.zip -g U9gXpJXbGC -buildId 2 -o signed
-
diff --git a/apps/files_odfviewer/src/webodf/programs/playbook/config.xml b/apps/files_odfviewer/src/webodf/programs/playbook/config.xml
deleted file mode 100644
index cab7788317..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/playbook/config.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<widget xmlns="http://www.w3.org/ns/widgets"
-        xmlns:rim="http://www.blackberry.com/ns/widgets"
-        version="2.0.0.0">
-  <author href="http://www.kogmbh.com/" rim:copyright="Copyright 2010-2012 KO GmbH">KO GmbH</author>
-  <name>WebODF</name>
-  <description>
-    Viewer for OpenDocument files.
-  </description>
-  <rim:orientation mode="auto"/>
-  <rim:loadingScreen onLocalPageLoad="true" onRemotePageLoad="true">
-    <rim:transitionEffect type="zoomIn"/>
-  </rim:loadingScreen>
-  <rim:category name="productivity"/>
-
-  <rim:permissions>
-    <rim:permit>access_shared</rim:permit>
-  </rim:permissions>
-  <icon src="icon.png"/>
-  <content src="index.html" rim:allowInvokeParams="true"/>
-  <feature id="blackberry.ui.dialog"/>
-  <feature id="blackberry.io.dir" />
-  <feature id="blackberry.io.file" />
-  <feature id="blackberry.utils" />
-  <feature id="blackberry.custom.filereader"/>
-</widget>
diff --git a/apps/files_odfviewer/src/webodf/programs/playbook/ext/blackberry.custom.filereader/js/common/custom_filereader_dispatcher.js b/apps/files_odfviewer/src/webodf/programs/playbook/ext/blackberry.custom.filereader/js/common/custom_filereader_dispatcher.js
deleted file mode 100644
index 8c4d91c46e..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/playbook/ext/blackberry.custom.filereader/js/common/custom_filereader_dispatcher.js
+++ /dev/null
@@ -1,17 +0,0 @@
-(function () {
-	var CUSTOM_FILEREADER_API_URL = "blackberry/custom/filereader";
-
-	var ARGS_PATH = "path";
-	var ARGS_DATA = "data";
-
-	function CustomFileReader() {
-	};
-
-	CustomFileReader.prototype.readAsDataURL = function(path) {
-		var remoteCall = new blackberry.transport.RemoteFunctionCall(CUSTOM_FILEREADER_API_URL + "/readAsDataURL");
-		remoteCall.addParam(ARGS_PATH, path);
-		return remoteCall.makeSyncCall();
-	};
-
-	blackberry.Loader.javascriptLoaded("blackberry.custom.filereader", CustomFileReader);
-})();
diff --git a/apps/files_odfviewer/src/webodf/programs/playbook/ext/blackberry.custom.filereader/js/common/custom_filereader_ns.js b/apps/files_odfviewer/src/webodf/programs/playbook/ext/blackberry.custom.filereader/js/common/custom_filereader_ns.js
deleted file mode 100644
index 2ae1ede11e..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/playbook/ext/blackberry.custom.filereader/js/common/custom_filereader_ns.js
+++ /dev/null
@@ -1,8 +0,0 @@
-(function () {
-
-	function CustomFileReader(disp) {
-		this.constructor.prototype.readAsDataURL = function(path) { return disp.readAsDataURL(path); };
-	};
-
-	blackberry.Loader.javascriptLoaded("blackberry.custom.filereader", CustomFileReader);
-})();
diff --git a/apps/files_odfviewer/src/webodf/programs/playbook/ext/blackberry.custom.filereader/library.xml b/apps/files_odfviewer/src/webodf/programs/playbook/ext/blackberry.custom.filereader/library.xml
deleted file mode 100644
index 1f3aa52d36..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/playbook/ext/blackberry.custom.filereader/library.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<library>
-	<extension id="blackberry.custom.filereader">
-		<entryClass>blackberry.custom.filereader.CustomFileReader</entryClass>
-	</extension>
-	<platforms>
-		<platform value="AIR">
-			<target version="default" config="AIR_XHR" />
-		</platform>
-	</platforms>
-	
-	<configurations>
-		<configuration name="AIR_XHR" version="1.0" comment="For XHR architecture for implementation">
-			<src type="text/javascript" path="js/common/custom_filereader_dispatcher.js" comment="Application JS interface" />
-			<src type="text/javascript" path="js/common/custom_filereader_ns.js" comment="Application JS interface" />
-			<src type="text/actionscript" path="src/Air/CustomFileReader/src" comment="ActionScript implementation" />
-		</configuration>
-	</configurations>
-	<features>
-		<feature id="blackberry.custom.filereader" version="1.0.0" />
-	</features>
-</library>
\ No newline at end of file
diff --git a/apps/files_odfviewer/src/webodf/programs/playbook/ext/blackberry.custom.filereader/src/AIR/CustomFileReader/src/blackberry/custom/filereader/CustomFileReader.as b/apps/files_odfviewer/src/webodf/programs/playbook/ext/blackberry.custom.filereader/src/AIR/CustomFileReader/src/blackberry/custom/filereader/CustomFileReader.as
deleted file mode 100644
index 3261fbcf45..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/playbook/ext/blackberry.custom.filereader/src/AIR/CustomFileReader/src/blackberry/custom/filereader/CustomFileReader.as
+++ /dev/null
@@ -1,34 +0,0 @@
-package blackberry.custom.filereader {
-	import flash.filesystem.File;
-	import flash.filesystem.FileMode;
-	import flash.filesystem.FileStream;
-	import flash.utils.ByteArray;
-	import mx.utils.Base64Encoder;
-	import webworks.extension.DefaultExtension;
-	
-	public class CustomFileReader extends DefaultExtension {
-
-		public function CustomFileReader() {
-			super();
-		}
-
-		override public function getFeatureList():Array {
-			return new Array ("blackberry.custom.filereader");
-		}
-
-		public function readAsDataURL(path:String):String {
-			var file:File = new File(path);
-			if (!file.exists) {
-				return "";
-			}
-			var bytes:ByteArray = new ByteArray();
-			var stream:FileStream = new FileStream();
-			stream.open(file, FileMode.READ);
-			stream.readBytes(bytes);
-			var btoa:Base64Encoder = new Base64Encoder();
-			btoa.encodeBytes(bytes);
-			stream.close();			
-			return "data:;base64," + btoa.toString();
-		}
-	}
-}
\ No newline at end of file
diff --git a/apps/files_odfviewer/src/webodf/programs/playbook/icon.png b/apps/files_odfviewer/src/webodf/programs/playbook/icon.png
deleted file mode 100644
index b7ccb848e3..0000000000
Binary files a/apps/files_odfviewer/src/webodf/programs/playbook/icon.png and /dev/null differ
diff --git a/apps/files_odfviewer/src/webodf/programs/playbook/index.html b/apps/files_odfviewer/src/webodf/programs/playbook/index.html
deleted file mode 100644
index 77d331c12e..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/playbook/index.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-        <meta name="viewport" content="width=device-width,user-scalable=no,initial-scale=1.0">
-        <link href="sencha-touch.css" rel="stylesheet" type="text/css" />
-        <link href="webodf.css" rel="stylesheet" type="text/css" />
-        <script type="text/javascript" src="sencha-touch.js"></script>
-        <script type="text/javascript" src="webodf.js"></script>
-        <script type="text/javascript" src="scripts.js"></script>
-        <script type="text/javascript" src="app/app.js"></script>
-        <script type="text/javascript" src="app/controller/Files.js"></script>
-        <script type="text/javascript" src="app/model/FileSystem.js"></script>
-        <script type="text/javascript" src="app/store/FileStore.js"></script>
-        <script type="text/javascript" src="app/views/FileDetail.js"></script>
-        <script type="text/javascript" src="app/views/FilesList.js"></script>
-        <script type="text/javascript" src="app/views/OdfView.js"></script>
-        <script type="text/javascript" src="app/views/Viewport.js"></script>
-        <title>WebODF</title>
-        <style>
-body {
-    background: url(icon.png);
-}
-</style>
-    </head>
-    <body onload="go()">
-    </body>
-</html>
diff --git a/apps/files_odfviewer/src/webodf/programs/playbook/scripts.js b/apps/files_odfviewer/src/webodf/programs/playbook/scripts.js
deleted file mode 100644
index e7913527d6..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/playbook/scripts.js
+++ /dev/null
@@ -1,146 +0,0 @@
-/*global blackberry, alert, document, window, app*/
-var LocalFileSystem = {
-    PERSISTENT: 0,
-    TEMPORARY: 1
-};
-function FileWriter(fullPath) {
-    "use strict";
-    this.write = function (data) {
-        var blob;
-        try {
-            blob = blackberry.utils.stringToBlob(data, "UTF-8");
-            blackberry.io.file.saveFile(fullPath, blob);
-        } catch (e) {
-        }
-    };
-}
-function FileEntry(name, fullPath) {
-    "use strict";
-    this.isFile = true;
-    this.isDirectory = false;
-    this.name = name;
-    this.fullPath = fullPath;
-    this.file = function (onsuccess, onerror) {
-        function File(fullPath) {
-            this.name = name;
-            this.fullPath = fullPath;
-            this.type = "";
-            this.size = -1;
-            this.lastModifiedDate = -1;
-        }
-        var file = new File(fullPath),
-            properties;
-        try {
-            properties = blackberry.io.file.getFileProperties(fullPath);
-            file.type = properties.mimeType;
-            file.size = properties.size;
-            file.lastModifiedDate = properties.dateModified;
-            onsuccess(file);
-        } catch (e) {
-            alert("Error on determining file properties: " + e);
-            onerror(e);
-        }
-    };
-    this.createWriter = function (onsuccess, onerror) {
-        onsuccess(new FileWriter(fullPath));
-    };
-}
-function FileReader() {
-    "use strict";
-    var fr = this;
-    this.readAsDataURL = function (file) {
-        var path = file.fullPath.substr(7);
-        window.setTimeout(function () {
-            try {
-                var data = blackberry.custom.filereader.readAsDataURL(path);
-                fr.onloadend({target: {result: data}});
-            } catch (e) {
-                alert("Error on reading file: " + e + " " + file.fullPath);
-            }
-        }, 1);
-    };
-    this.readAsText = function (file) {
-        var path = file.fullPath.substr(7);
-        try {
-            blackberry.io.file.readFile(path, function (fullPath, blob) {
-                var str = blackberry.utils.blobToString(blob, "UTF-8");
-                fr.onloadend({target: {result: str}});
-            }, true);
-        } catch (e) {
-            fr.onloadend({target: {result: "[]"}});
-        }
-    };
-}
-var DirectoryReader;
-function DirectoryEntry(name, fullPath) {
-    "use strict";
-    this.isFile = false;
-    this.isDirectory = true;
-    this.name = name;
-    this.fullPath = fullPath;
-    this.createReader = function () {
-        var reader = new DirectoryReader(fullPath);
-        return reader;
-    };
-}
-function DirectoryReader(fullPath) {
-    "use strict";
-    this.readEntries = function (onsuccess, onerror) {
-        window.setTimeout(function () {
-            var entries = [],
-                dirs = blackberry.io.dir.listDirectories(fullPath),
-                files = blackberry.io.dir.listFiles(fullPath),
-                i;
-            try {
-                for (i = 0; i < dirs.length; i += 1) {
-                    entries[entries.length] = new DirectoryEntry(dirs[i],
-                                             fullPath + "/" + dirs[i]);
-                }
-                for (i = 0; i < files.length; i += 1) {
-                    entries[entries.length] = new FileEntry(files[i],
-                                             fullPath + "/" + files[i]);
-                }
-                onsuccess(entries);
-            } catch (e) {
-                onerror(e);
-            }
-        }, 1);
-    };
-}
-window.resolveLocalFileSystemURI = function (path, onsuccess, onerror) {
-    "use strict";
-    var p = path.lastIndexOf("/"),
-        name;
-    if (p === -1) {
-        name = path;
-        path = blackberry.io.dir.appDirs.shared.documents.path + "/" + path;
-    } else {
-        name = path.substr(p + 1);
-    }
-    onsuccess(new FileEntry(name, path));
-};
-window.requestFileSystem = function (filesystem, id, onsuccess, onerror) {
-    "use strict";
-    var dirs = [], shared, subfolder;
-    try {
-        if (filesystem === LocalFileSystem.PERSISTENT) {
-            shared = blackberry.io.dir.appDirs.shared;
-            for (subfolder in shared) {
-                if (shared.hasOwnProperty(subfolder)) {
-                    dirs[dirs.length] = subfolder;
-                }
-            }
-            onsuccess({
-                name: "root",
-                root: new DirectoryEntry("root", shared.documents.path
-                    //+ "/kofficetests/odf/odt"
-                      )
-            });
-        } else {
-            onerror("not defined");
-        }
-    } catch (e) {
-        onerror(e);
-    }
-};
-var device = {};
diff --git a/apps/files_odfviewer/src/webodf/programs/qtjsruntime/CMakeLists.txt b/apps/files_odfviewer/src/webodf/programs/qtjsruntime/CMakeLists.txt
deleted file mode 100644
index ec8026741c..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/qtjsruntime/CMakeLists.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-include(${QT_USE_FILE})
-QT4_WRAP_CPP(QTJSRUNTIME_MOC nam.h pagerunner.h nativeio.h)
-add_executable(qtjsruntime qtjsruntime.cpp pagerunner.cpp nativeio.cpp ${QTJSRUNTIME_MOC})
-target_link_libraries(qtjsruntime ${QT_LIBRARIES})
diff --git a/apps/files_odfviewer/src/webodf/programs/qtjsruntime/nam.h b/apps/files_odfviewer/src/webodf/programs/qtjsruntime/nam.h
deleted file mode 100644
index ebb62f261a..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/qtjsruntime/nam.h
+++ /dev/null
@@ -1,48 +0,0 @@
-#ifndef NAM_H
-#define NAM_H
-
-#include <QtNetwork/QNetworkAccessManager>
-#include <QtNetwork/QNetworkRequest>
-
-class NAM : public QNetworkAccessManager {
-Q_OBJECT
-private:
-    const QString host;
-    const int port;
-    int outstandingRequests;
-public:
-    NAM(QObject* parent, const QString& host_ = QString(), int port_ = -1)
-            :QNetworkAccessManager(parent), host(host_), port(port_) {
-        outstandingRequests = 0;
-        connect(this, SIGNAL(finished(QNetworkReply*)),
-                this, SLOT(requestFinished()));
-    }
-    QNetworkReply* createRequest(QNetworkAccessManager::Operation o,
-            QNetworkRequest const& r, QIODevice* d) {
-        outstandingRequests += 1;
-        bool samehost = false;
-        if (port > 0) {
-            samehost = r.url().host() == host
-                    || r.url().host().endsWith("." + host)
-                    || host.endsWith("." + r.url().host());
-            samehost &= r.url().port() != port;
-        } else {
-            // use host string as a prefix
-            samehost = r.url().toString().startsWith(host);
-        }
-        if (!samehost) {
-            // if not same host or domain and port, block
-            return QNetworkAccessManager::createRequest(o, QNetworkRequest(),
-                    d);
-        }
-        return QNetworkAccessManager::createRequest(o, r, d);
-    }
-    bool hasOutstandingRequests() {
-        return outstandingRequests > 0;
-    }
-public slots:
-    void requestFinished() {
-        outstandingRequests -= 1;
-    }
-};
-#endif
diff --git a/apps/files_odfviewer/src/webodf/programs/qtjsruntime/nativeio.cpp b/apps/files_odfviewer/src/webodf/programs/qtjsruntime/nativeio.cpp
deleted file mode 100644
index 0657a0c711..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/qtjsruntime/nativeio.cpp
+++ /dev/null
@@ -1,106 +0,0 @@
-#include "nativeio.h"
-#include <QtWebKit/QWebPage>
-#include <QtCore/QCoreApplication>
-#include <QtCore/QTextCodec>
-
-NativeIO::NativeIO(QObject* parent, const QDir& runtimedir_,
-         const QDir& cwd_,
-         const QMap<QString, QFile::Permissions>& pathPermissions_)
-    :QObject(parent), runtimedir(runtimedir_), cwd(cwd_),
-      pathPermissions(pathPermissions_) {
-}
-QString
-NativeIO::readFileSync(const QString& path, const QString& encoding) {
-    errstr = QString();
-    QFile file(cwd.absoluteFilePath(path));
-    QByteArray data;
-    if (file.open(QIODevice::ReadOnly)) {
-        data = file.readAll();
-    }
-    QString out;
-    if (encoding != "binary") {
-        QTextCodec *codec = QTextCodec::codecForName(encoding.toAscii());
-        if (codec) {
-            out = codec->toUnicode(data);
-        }
-    }
-    if (out.length() == 0 && data.length() > 0) {
-        out = QString(data.length(), 0);
-        for (int i = 0; i < data.length(); ++i) {
-            out[i] = data[i];
-        }
-    }
-    return out;
-}
-QString
-NativeIO::read(const QString& path, int offset, int length) {
-    errstr = QString();
-    QFile file(cwd.absoluteFilePath(path));
-    QByteArray data;
-    if (file.open(QIODevice::ReadOnly) && (offset == 0 || file.seek(offset))) {
-        int lastLength = 0;
-        do {
-            lastLength = data.length();
-            data += file.read(length - data.length());
-        } while (data.length() < length && data.length() != lastLength);
-    }
-    if (length != data.length()) {
-        errstr = "Not enough data: " + QString::number(length) +
-                " instead of " + QString::number(data.length());
-        return QString();
-    }
-    QString out(length, 0);
-    for (int i = 0; i < length; ++i) {
-        out[i] = data[i];
-    }
-    return out;
-}
-void
-NativeIO::writeFile(const QString& path, const QString& data) {
-    QFile file(cwd.absoluteFilePath(path));
-    errstr = QString();
-    if (!file.open(QIODevice::WriteOnly)) {
-        errstr = "Could not open file for writing.";
-        return;
-    }
-    int length = data.length();
-    QByteArray out(length, 0);
-    for (int i = 0; i < length; ++i) {
-        out[i] = data[i].unicode();
-    }
-    if (file.write(out) != out.length()) {
-        errstr = "Could not write to file.";
-    }
-    return;
-}
-void
-NativeIO::unlink(const QString& path) {
-    errstr = QString();
-    QFile file(cwd.absoluteFilePath(path));
-    if (!file.remove()) {
-        errstr = "Could not delete file";
-    }
-}
-int
-NativeIO::getFileSize(const QString& path) {
-    errstr = QString();
-    QFile file(cwd.absoluteFilePath(path));
-    if (!file.exists()) {
-        errstr = "Could not determine file size.";
-    }
-    return file.size();
-}
-void
-NativeIO::exit(int exitcode) {
-    qApp->exit(exitcode);
-}
-QString
-NativeIO::currentDirectory() const {
-    return QDir::currentPath();
-}
-QStringList
-NativeIO::libraryPaths() const {
-    QStringList paths;
-    paths << runtimedir.absolutePath() << cwd.absolutePath();
-    return paths;
-}
diff --git a/apps/files_odfviewer/src/webodf/programs/qtjsruntime/nativeio.h b/apps/files_odfviewer/src/webodf/programs/qtjsruntime/nativeio.h
deleted file mode 100644
index b699744226..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/qtjsruntime/nativeio.h
+++ /dev/null
@@ -1,41 +0,0 @@
-#ifndef NATIVEIO_H
-#define NATIVEIO_H
-
-#include <QtCore/QFile>
-#include <QtCore/QDir>
-#include <QtCore/QMap>
-
-class QWebPage;
-
-// class that exposes filesystem to web environment
-class NativeIO : public QObject {
-Q_OBJECT
-private:
-    QWebPage* webpage;
-    QString errstr;
-    const QDir runtimedir;
-    const QDir cwd;
-    const QMap<QString, QFile::Permissions> pathPermissions;
-public:
-    typedef QMap<QString, QFile::Permissions> PathMap;
-    PathMap v;
-    NativeIO(QObject* parent, const QDir& runtimedir, const QDir& cwd,
-             const PathMap& pathPermissions = PathMap());
-public slots:
-    /**
-     * Return the last error.
-     */
-    QString error() {
-        return errstr;
-    }
-    QString readFileSync(const QString& path, const QString& encoding);
-    QString read(const QString& path, int offset, int length);
-    void writeFile(const QString& path, const QString& data);
-    void unlink(const QString& path);
-    int getFileSize(const QString& path);
-    void exit(int exitcode);
-    QString currentDirectory() const;
-    QStringList libraryPaths() const;
-};
-
-#endif
diff --git a/apps/files_odfviewer/src/webodf/programs/qtjsruntime/pagerunner.cpp b/apps/files_odfviewer/src/webodf/programs/qtjsruntime/pagerunner.cpp
deleted file mode 100644
index a91794d9a2..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/qtjsruntime/pagerunner.cpp
+++ /dev/null
@@ -1,191 +0,0 @@
-#include "pagerunner.h"
-
-#include "nam.h"
-#include "nativeio.h"
-#include <QtCore/QFileInfo>
-#include <QtCore/QTemporaryFile>
-#include <QtCore/QTimer>
-#include <QtCore/QCoreApplication>
-#include <QtGui/QPainter>
-#include <QtGui/QPrinter>
-#include <QtWebKit/QWebFrame>
-#include <QtCore/QDebug>
-
-QByteArray getRuntimeBindings() {
-    return
-    "if (typeof(runtime) !== 'undefined') {"
-    "    runtime.readFileSync = function (path, encoding) {"
-    "        return nativeio.readFileSync(path, encoding);"
-    "    };"
-    "    runtime.read = function (path, offset, length, callback) {"
-    "        var data = nativeio.read(path, offset, length);"
-    "        data = runtime.byteArrayFromString(data, 'binary');"
-    "        callback(nativeio.error()||null, data);"
-    "    };"
-    "    runtime.writeFile = function (path, data, callback) {"
-    "        data = runtime.byteArrayToString(data, 'binary');"
-    "        nativeio.writeFile(path, data);"
-    "        callback(nativeio.error()||null);"
-    "    };"
-    "    runtime.deleteFile = function (path, callback) {"
-    "        nativeio.unlink(path);"
-    "        callback(nativeio.error()||null);"
-    "    };"
-    "    runtime.getFileSize = function (path, callback) {"
-    "        callback(nativeio.getFileSize(path));"
-    "    };"
-    "    runtime.exit = function (exitCode) {"
-    "        nativeio.exit(exitCode);"
-    "    };"
-    "    runtime.currentDirectory = function () {"
-    "        return nativeio.currentDirectory();"
-    "    };"
-    "}";
-}
-
-PageRunner::PageRunner(const QStringList& args)
-    : QWebPage(0),
-      out(stdout),
-      err(stderr),
-      view(new QWidget()) {
-
-    QMap<QString, QString> settings = parseArguments(args);
-    QStringList arguments = args.mid(settings.size() * 2);
-    exportpdf = settings.value("export-pdf");
-    exportpng = settings.value("export-png");
-    url = QUrl(arguments[0]);
-    nativeio = new NativeIO(this, QFileInfo(arguments[0]).dir(),
-                            QDir::current());
-    if (url.scheme() == "file" || url.isRelative()) {
-        QFileInfo info(url.toLocalFile());
-        if (!info.isReadable() || !info.isFile()) {
-            QTextStream err(stderr);
-            err << "Cannot read file '" + url.toString() + "'.\n";
-            qApp->exit(1);
-        }
-    }
-    nam = new NAM(this, QUrl(url).host(), QUrl(url).port());
-
-    setNetworkAccessManager(nam);
-    connect(this, SIGNAL(loadFinished(bool)), this, SLOT(finished(bool)));
-    connect(mainFrame(), SIGNAL(javaScriptWindowObjectCleared()),
-            this, SLOT(slotInitWindowObjects()));
-    sawJSError = false;
-
-    setView(view);
-    scriptMode = arguments[0].endsWith(".js");
-    if (scriptMode) {
-        QByteArray html = "'" + arguments[0].toUtf8().replace('\'', "\\'")
-                + "'";
-        for (int i = 1; i < arguments.length(); ++i) {
-            html += ",'" + arguments[i].toUtf8().replace('\'', "\\'") + "'";
-        }
-        html = "<html>"
-                "<head><base href=\".\"></base><title></title>"
-                "<script>var arguments=[" + html + "];</script>"
-                "<script src=\"" + arguments[0].toUtf8() + "\"></script>";
-        if (arguments[0].endsWith("runtime.js")) {
-            // add runtime modification
-            html += "<script>" + getRuntimeBindings() +
-                        "    runtime.libraryPaths = function () {"
-                        "        /* convert to javascript array */"
-                        "        var p = nativeio.libraryPaths(),"
-                        "            a = [], i;"
-                        "        for (i in p) { a[i] = p[i]; }"
-                        "        return a;"
-                        "    };</script>";
-        }
-        html += "</head><body></body></html>\n";
-        QTemporaryFile tmp("XXXXXX.html");
-        tmp.setAutoRemove(true);
-        tmp.open();
-        tmp.write(html);
-        tmp.close();
-        mainFrame()->load(tmp.fileName());
-    } else {
-        // Make the url absolute. If it is not done here, QWebFrame will do
-        // it, and it will lose the query and fragment part.
-        QUrl absurl;
-        if (url.isRelative()) {
-            absurl = QUrl::fromLocalFile(QFileInfo(url.toLocalFile()).absoluteFilePath());
-            absurl.setQueryItems(url.queryItems());
-            absurl.setFragment(url.fragment());
-        } else {
-            absurl = url;
-        }
-        mainFrame()->load(absurl);
-    }
-}
-PageRunner::~PageRunner() {
-    delete view;
-}
-void PageRunner::finished(bool ok) {
-    // bind nativeio
-    if (!ok) {
-        qApp->exit(1);
-    }
-    if (!scriptMode) {
-        mainFrame()->evaluateJavaScript(getRuntimeBindings());
-    }
-
-    // connect signals
-    connect(this, SIGNAL(contentsChanged()), this, SLOT(noteChange()));
-    connect(this, SIGNAL(downloadRequested(QNetworkRequest)),
-            this, SLOT(noteChange()));
-    connect(this, SIGNAL(repaintRequested(QRect)),
-            this, SLOT(noteChange()));
-    connect(mainFrame(), SIGNAL(pageChanged()), this, SLOT(noteChange()));
-    connect(this, SIGNAL(geometryChangeRequested(QRect)),
-            this, SLOT(noteChange()));
-    QTimer::singleShot(150, this, SLOT(reallyFinished()));
-    changed = false;
-    time.start();
-}
-void PageRunner::reallyFinished() {
-    int latency = time.restart();
-    // err << latency << " " << changed << " " << nam->hasOutstandingRequests() << endl;
-    if (changed || latency >= 152 || nam->hasOutstandingRequests()) {
-        QTimer::singleShot(150, this, SLOT(reallyFinished()));
-        changed = false;
-        return;
-    }
-    if (!exportpdf.isEmpty() || !exportpng.isEmpty()) {
-        setViewportSize(mainFrame()->contentsSize());
-    }
-    if (!exportpng.isEmpty()) {
-        renderToFile(exportpng);
-    }
-    if (!exportpdf.isEmpty()) {
-        printToFile(exportpdf);
-    }
-    qApp->exit(sawJSError);
-}
-QMap<QString, QString> PageRunner::parseArguments(const QStringList& args) {
-    int i = 0;
-    QMap<QString, QString> settings;
-    while (i + 2 < args.length()) {
-        if (args[i].startsWith("--")) {
-            settings[args[i].mid(2)] = args[i+1];
-        }
-        i += 2;
-    }
-    return settings;
-}
-void PageRunner::slotInitWindowObjects() {
-    mainFrame()->addToJavaScriptWindowObject("nativeio", nativeio);
-}
-void PageRunner::renderToFile(const QString& filename) {
-    QImage pixmap(mainFrame()->contentsSize().boundedTo(QSize(10000,10000)),
-                  QImage::Format_ARGB32_Premultiplied);
-    QPainter painter(&pixmap);
-    mainFrame()->render(&painter, QWebFrame::ContentsLayer);
-    painter.end();
-    pixmap.save(filename);
-}
-void PageRunner::printToFile(const QString& filename) {
-    QPrinter printer(QPrinter::HighResolution);
-    printer.setFontEmbeddingEnabled(true);
-    printer.setOutputFormat(QPrinter::PdfFormat);
-    printer.setOutputFileName(filename);
-    mainFrame()->print(&printer);
-}
diff --git a/apps/files_odfviewer/src/webodf/programs/qtjsruntime/pagerunner.h b/apps/files_odfviewer/src/webodf/programs/qtjsruntime/pagerunner.h
deleted file mode 100644
index 9c848acc10..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/qtjsruntime/pagerunner.h
+++ /dev/null
@@ -1,68 +0,0 @@
-#ifndef PAGERUNNER_H
-#define PAGERUNNER_H
-
-#include <QtCore/QTextStream>
-#include <QtCore/QTime>
-#include <QtWebKit/QWebPage>
-
-class NAM;
-class NativeIO;
-
-class PageRunner : public QWebPage {
-Q_OBJECT
-private:
-    QUrl url;
-    NAM* nam;
-    QTextStream out;
-    QTextStream err;
-    bool changed;
-    QWidget* const view;
-    QTime time;
-    bool scriptMode;
-    NativeIO* nativeio;
-    QString exportpdf;
-    QString exportpng;
-    bool sawJSError;
-public:
-    PageRunner(const QStringList& args);
-    ~PageRunner();
-private slots:
-    void finished(bool ok);
-    void noteChange() {
-        changed = true;
-    }
-    void reallyFinished();
-    void slotInitWindowObjects();
-    bool shouldInterruptJavaScript() {
-        changed = true;
-        return false;
-    }
-private:
-    void javaScriptConsoleMessage(const QString& message, int lineNumber,
-            const QString& sourceID) {
-        changed = true;
-        if (scriptMode) {
-            err << message << endl;
-        } else {
-            err << sourceID << ":" << lineNumber << " " << message << endl;
-        }
-        sawJSError = true;
-    }
-    void javaScriptAlert(QWebFrame* /*frame*/, const QString& msg) {
-        changed = true;
-        err << "ALERT: " << msg << endl;
-    }
-    bool javaScriptPrompt(QWebFrame*, const QString&, const QString&, QString*){
-        changed = true;
-        return false;
-    }
-    void renderToFile(const QString& filename);
-    void printToFile(const QString& filename);
-    // overload because default impl was causing a crash
-    QString userAgentForUrl(const QUrl&) const {
-        return QString();
-    }
-    QMap<QString, QString> parseArguments(const QStringList& args);
-};
-
-#endif
diff --git a/apps/files_odfviewer/src/webodf/programs/qtjsruntime/qtjsruntime.cpp b/apps/files_odfviewer/src/webodf/programs/qtjsruntime/qtjsruntime.cpp
deleted file mode 100644
index 35d04da146..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/qtjsruntime/qtjsruntime.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * Small executable that loads a javascript or html page from local a URI.
- * If the URI ends in .js it will be run in QtScript engine, otherwise, it will
- * be assumed to be a webpage that will be opened in
- */
-#include "pagerunner.h"
-#include <QtGui/QApplication>
-int
-main(int argc, char** argv) {
-    if (argc < 2) {
-        QTextStream err(stderr);
-        err << "Usage: " << argv[0] << " [--export-pdf pdffile] "
-               "[--export-png pngfile] html/javascripfile [arguments]\n";
-        return 1;
-    }
-    QApplication app(argc, argv);
-    app.setApplicationName(argv[0]);
-    PageRunner p(QCoreApplication::arguments().mid(1));
-    return app.exec();
-}
diff --git a/apps/files_odfviewer/src/webodf/programs/touchui/CMakeLists.txt b/apps/files_odfviewer/src/webodf/programs/touchui/CMakeLists.txt
deleted file mode 100644
index 0a18076273..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/touchui/CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-COPY_FILES(TOUCHUIDEPS ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_BINARY_DIR} ${HTML5UIFILES})
-COPY_FILES(TOUCHUIDEPS ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_BINARY_DIR} index.html scripts.js welcome.odt)
-COPY_FILES(TOUCHUIDEPS ${CMAKE_SOURCE_DIR}/webodf
-    ${CMAKE_CURRENT_BINARY_DIR} webodf.css ${LIBJSFILES})
-add_custom_target(touchuiDepencencies ALL DEPENDS ${TOUCHUIDEPS})
diff --git a/apps/files_odfviewer/src/webodf/programs/touchui/ZoomIn.png b/apps/files_odfviewer/src/webodf/programs/touchui/ZoomIn.png
deleted file mode 100644
index 6041c6ff93..0000000000
Binary files a/apps/files_odfviewer/src/webodf/programs/touchui/ZoomIn.png and /dev/null differ
diff --git a/apps/files_odfviewer/src/webodf/programs/touchui/ZoomOut.png b/apps/files_odfviewer/src/webodf/programs/touchui/ZoomOut.png
deleted file mode 100644
index 733a4e1ada..0000000000
Binary files a/apps/files_odfviewer/src/webodf/programs/touchui/ZoomOut.png and /dev/null differ
diff --git a/apps/files_odfviewer/src/webodf/programs/touchui/app/app.js b/apps/files_odfviewer/src/webodf/programs/touchui/app/app.js
deleted file mode 100644
index 60da480a5f..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/touchui/app/app.js
+++ /dev/null
@@ -1,40 +0,0 @@
-/*global Ext, invokeString, document*/
-/**
- * When the application has been initialized, this function is called, if
- * it has been set. By default, it will start scanning the files in the
- * files sytem. It can be overridden by e.g. PhoneGap to wait until the device
- * is ready.
- */
-var onApplicationLaunch = function (app) {
-    "use strict";
-    app.startScanningDirectories();
-};
-Ext.application({
-    name : 'WebODFApp',
-    models: ['FileSystem'],
-    views: ['Viewport', 'FilesList', 'FileDetail', 'OdfView'],
-    controllers: ['Files'],
-    stores: ['FileStore'],
-    launch: function () {
-        'use strict';
-        var app = this;
-        Ext.create('WebODFApp.view.Viewport');
-        app.openUrl = function (url) {
-            var proxy = Ext.getStore("FileStore").getProxy();
-            proxy.getRecord(url, function (record) {
-                var controller;
-                if (!record) {
-                    alert("Cannot open " + url);
-                } else {
-                    controller = app.getController('Files');
-                    controller.show(null, null, null, record);
-                }
-            });
-        };
-        this.startScanningDirectories = function () {
-            var proxy = Ext.getStore("FileStore").getProxy();
-            proxy.startScanningDirectories();
-        };
-        onApplicationLaunch(this);
-    }
-});
diff --git a/apps/files_odfviewer/src/webodf/programs/touchui/app/controller/Files.js b/apps/files_odfviewer/src/webodf/programs/touchui/app/controller/Files.js
deleted file mode 100644
index 22e06f85b6..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/touchui/app/controller/Files.js
+++ /dev/null
@@ -1,82 +0,0 @@
-/*global Ext, runtime*/
-Ext.define('WebODFApp.controller.Files', {
-    extend: 'Ext.app.Controller',
-
-    config: {
-        refs: {
-            mainView: 'mainview',
-            filesList: 'fileslist list',
-            fileDetail: 'filedetail',
-            openButton: '#openButton',
-            odfView: 'odfview',
-            title: 'titlebar'
-        },
-        control: {
-            mainView: {
-                pop: 'pop',
-                push: 'push',
-                back: 'back'
-            },
-            filesList: {
-                itemtap: 'show'
-            },
-            openButton: {
-                tap: 'open'
-            }
-        }
-    },
-    back: function () {
-        "use strict";
-        this.odfView.hideCanvas();
-    },
-    push: function (view, item) {
-        "use strict";
-        if (item.xtype === "filedetail") {
-            this.getOpenButton().show();
-        } else {
-            this.getOpenButton().hide();
-        }
-    },
-    pop: function (view, item) {
-        "use strict";
-        if (item.xtype === "odfview") { // going to filedetail
-            this.getOpenButton().show();
-        } else {
-            this.getOpenButton().hide();
-        }
-        this.getFilesList().deselectAll();
-    },
-    show: function (list, index, target, record, e) {
-        "use strict";
-        // set the record in the details view and the file view
-        // this way, document starts loading in the background
-        var c = this;
-        if (!this.fileDetail) {
-            this.fileDetail = Ext.create('WebODFApp.view.FileDetail');
-        }
-        if (!this.odfView) {
-            this.odfView = Ext.create('WebODFApp.view.OdfView');
-            this.odfView.addCanvasListener(this.fileDetail.canvasListener);
-        }
-        this.odfView.hideCanvas();
-        this.fileDetail.odfView = this.odfView;
-        this.fileDetail.setRecord(record);
-        this.getMainView().push(this.fileDetail);
-        runtime.setTimeout(function () {
-            c.odfView.setRecord(record);
-        }, 300);
-    },
-    open: function (options) {
-        "use strict";
-        var c = this;
-        if (!this.odfView) {
-            this.odfView = Ext.create('WebODFApp.view.OdfView');
-        }
-        this.odfView.hideCanvas();
-        this.odfView.setRecord(this.fileDetail.getRecord());
-        this.getMainView().push(this.odfView);
-        runtime.setTimeout(function () {
-            c.odfView.showCanvas();
-        }, 300);
-    }
-});
diff --git a/apps/files_odfviewer/src/webodf/programs/touchui/app/model/FileSystem.js b/apps/files_odfviewer/src/webodf/programs/touchui/app/model/FileSystem.js
deleted file mode 100644
index 3346008f1a..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/touchui/app/model/FileSystem.js
+++ /dev/null
@@ -1,265 +0,0 @@
-/*global Ext, console, app, window, LocalFileSystem, JSON, FileReader, runtime*/
-Ext.define("WebODFApp.model.FileSystemProxy", (function () {
-    "use strict";
-    var self = this,
-        scanner;
-    function Scanner(proxy) {
-        var todo = [],
-            done = false,
-            fileSystems,
-            files,
-            cachedList = [],
-            dirs = {},
-            lastUpdate = 0,
-            lastUpdateTime = new Date();
-
-        function getFileId(fullPath) {
-            var i;
-            if (!files) {
-                return -1;
-            }
-            for (i = 0; i < files.length; i += 1) {
-                if (files[i].get('fullPath') === fullPath) {
-                    return i;
-                }
-            }
-            return -1;
-        }
-        this.getFileId = getFileId;
-        function addFileEntry(entry, callback) {
-            function fail() {
-                callback(-1);
-            }
-            var id = getFileId(entry.fullPath);
-            if (id !== -1) {
-                return callback(id);
-            }
-            entry.file(function (file) {
-                var id = files.length;
-                files.push(Ext.create('WebODFApp.model.FileSystem', {
-                    id: id,
-                    fileName: entry.name,
-                    fullPath: entry.fullPath,
-                    size: file.size
-                }));
-                callback(id);
-            }, fail);
-        }
-        function parseCachedFileList(pos, callback) {
-            if (pos === cachedList.length) {
-                return callback();
-            }
-            window.resolveLocalFileSystemURI(cachedList[pos], function (entry) {
-                addFileEntry(entry, function () {
-                    parseCachedFileList(pos + 1, callback);
-                });
-            }, function () {
-                parseCachedFileList(pos + 1, callback);
-            });
-        }
-        function readCachedFileList(callback) {
-            window.resolveLocalFileSystemURI("cachedODFList.json",
-                function (fileentry) {
-                    var reader = new FileReader();
-                    reader.onloadend = function (evt) {
-                        cachedList = [];
-                        try {
-                            cachedList = JSON.parse(evt.target.result);
-                        } catch (e) {
-                            alert(e);
-                        }
-                        parseCachedFileList(0, callback);
-                    };
-                    reader.readAsText(fileentry);
-                }, function () {
-                    callback();
-                });
-        }
-        function writeCachedFileList() {
-            var i,
-                l = files.length;
-            cachedList.length = files.length;
-            for (i = 0; i < l; i += 1) {
-                cachedList[i] = files[i].get('fullPath');
-            }
-            window.resolveLocalFileSystemURI("cachedODFList.json",
-                function (fileentry) {
-                    fileentry.createWriter(function (writer) {
-                        writer.write(JSON.stringify(cachedList));
-                    }, function (e) {
-                        runtime.log(JSON.stringify(e));
-                    });
-                }, function (e) {
-                    runtime.log(JSON.stringify(e));
-                });
-        }
-        function filter(name) {
-            var suffix = name.substr(name.length - 4);
-            return suffix === ".odt" || suffix === ".odp" || suffix === ".ods";
-        }
-        function errorCallback(err) {
-            console.log("FILE READ ERROR " + err + " " + todo.length);
-            done = true;
-        }
-        function load(entry, callback) {
-            function fail() {
-                callback(-1);
-            }
-            if (entry.isDirectory) {
-                entry.createReader().readEntries(function (entries) {
-                    var i = 0;
-                    for (i = 0; i < entries.length; i += 1) {
-                        entry = entries[i];
-                        if (entry.isDirectory
-                                && !dirs.hasOwnProperty(entry.fullPath)) {
-                            todo.push(entry);
-                            dirs[entry.fullPath] = entry;
-                        } else if (filter(entry.name)) {
-                            todo.push(entry);
-                        }
-                    }
-                    callback(-1);
-                }, fail);
-            } else if (entry.isFile) {
-                addFileEntry(entry, callback);
-            } else {
-                fail();
-            }
-        }
-        function addFileSystem(fileSystem) {
-            var dir = fileSystems[fileSystem.name] = {};
-            todo.push(fileSystem.root);
-            function callback() {
-                var now = new Date(),
-                    // a limit is needed, otherwise the # of files too large to
-                    // be handled by sencha touch
-                    done = todo.length === 0 || files.length > 2000,
-                    store = Ext.getStore('FileStore');
-                if (done || lastUpdate === 0 || (files.length - lastUpdate > 0
-                        && now - lastUpdateTime > files.length * 100)) {
-                    store.load();
-                    lastUpdate = files.length;
-                    lastUpdateTime = now;
-                }
-                if (done) {
-                    writeCachedFileList();
-                } else {
-                    load(todo.shift(), callback);
-                }
-            }
-            load(todo.shift(), callback);
-        }
-        function addFileSystems() {
-            window.requestFileSystem(LocalFileSystem.PERSISTENT, 0,
-                    addFileSystem, errorCallback);
-            window.requestFileSystem(LocalFileSystem.TEMPORARY, 0,
-                    addFileSystem, function () {});
-        }
-        this.scan = function () {
-            if (fileSystems !== undefined) {
-                return;
-            }
-            fileSystems = {};
-            readCachedFileList(function () {
-                addFileSystems();
-            });
-        };
-        this.load = load;
-        this.files = files = [];
-    }
-    function finishOperation(proxy, operation, callback, scope) {
-        if (operation) {
-            var i = 0,
-                recs = operation.getRecords(),
-                len = recs.length;
-
-            for (i; i < len; i += 1) {
-                recs[i].commit();
-            }
-            operation.setSuccessful();
-
-            Ext.callback(callback, scope || proxy, [operation]);
-        }
-    }
-    return {
-        extend: "Ext.data.proxy.Proxy",
-        xtype: 'filesystemproxy',
-        constructor: function (config) {
-            this.initConfig(config);
-            scanner = new Scanner(this);
-            this.startScanningDirectories = function () {
-                scanner.scan();
-            };
-            this.getRecord = function (url, callback) {
-                var id = scanner.getFileId(url);
-                if (id !== -1) {
-                    return callback(scanner.files[id]);
-                }
-                window.resolveLocalFileSystemURI(url,
-                    function (fileentry) {
-                        scanner.load(fileentry, function (id) {
-                            Ext.getStore('FileStore').load();
-                            callback(scanner.files[id]);
-                        });
-                    },
-                    function (evt) {
-                        callback(null);
-                    });
-            };
-        },
-    
-        create: function (operation, callback, scope) {
-            finishOperation(this, operation, callback, scope);
-        },
-    
-        read: function (operation, callback, scope) {
-            var me = this,
-                records = scanner.files;
-            if (!records) {
-                return;
-            }
-            // return model instances in a resultset
-            operation.setResultSet(new Ext.data.ResultSet({
-                //total: records.length,
-                count: records.length,
-                records: records,
-                success: true
-            }));
-
-            // announce success
-            operation.setSuccessful();
-            operation.setCompleted();
-    
-            // finish with callback
-            Ext.callback(callback, scope || me, [operation]);
-        },
-    
-        update: function (operation, callback, scope) {
-            finishOperation(this, operation, callback, scope);
-        },
-    
-        destroy: function (operation, callback, scope) {
-            finishOperation(this, operation, callback, scope);
-        }
-    };
-}()));
-
-Ext.define("WebODFApp.model.FileSystem", {
-    extend: 'Ext.data.Model',
-    config: {
-        idProperty: 'id',
-        fields: [ {
-            name: "id",
-            type: "auto"
-        }, {
-            name: "fullPath",
-            type: "string"
-        }, {
-            name: "fileName",
-            type: "string"
-        }, {
-            name: "size",
-            type: "int"
-        } ]
-    }
-});
diff --git a/apps/files_odfviewer/src/webodf/programs/touchui/app/store/FileStore.js b/apps/files_odfviewer/src/webodf/programs/touchui/app/store/FileStore.js
deleted file mode 100644
index d2932c8989..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/touchui/app/store/FileStore.js
+++ /dev/null
@@ -1,30 +0,0 @@
-/*global Ext*/
-Ext.define('WebODFApp.store.FileStore', {
-    extend: 'Ext.data.Store',
-    config: {
-        storeId: 'FileStore',
-        model: 'WebODFApp.model.FileSystem',
-        autoLoad: true,
-        grouper: {
-            groupFn: function (record) {
-                "use strict";
-                return record.get('fileName')[0].toUpperCase();
-            }
-        },
-        proxy: {
-            xtype: 'filesystemproxy'
-        },
-        sorters: function (a, b) {
-            "use strict";
-            a = a.get('fileName').toUpperCase();
-            b = b.get('fileName').toUpperCase();
-            if (a > b) {
-                return 1;
-            }
-            if (a < b) {
-                return -1;
-            }
-            return 0;
-        }
-    }
-});
diff --git a/apps/files_odfviewer/src/webodf/programs/touchui/app/views/FileDetail.js b/apps/files_odfviewer/src/webodf/programs/touchui/app/views/FileDetail.js
deleted file mode 100644
index b79876c6de..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/touchui/app/views/FileDetail.js
+++ /dev/null
@@ -1,122 +0,0 @@
-/*global Ext, app, runtime, xmldom, odf*/
-runtime.loadClass("xmldom.XPath");
-runtime.loadClass("odf.Style2CSS");
-Ext.define('WebODFApp.view.FileDetail', (function () {
-    "use strict";
-    var panel,
-        style2CSS = new odf.Style2CSS(),
-        xpath = new xmldom.XPath(),
-        fileDetail,
-        title,
-        image,
-        list,
-        emptyImageUrl = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAAXNSR0IArs4c6QAAAAtJREFUCB1jYGAAAAADAAFPSAqvAAAAAElFTkSuQmCC";
-    function getTitle(body) {
-        var ps,
-            title;
-        ps = xpath.getODFElementsWithXPath(body,
-                ".//text:h", style2CSS.namespaceResolver);
-        title = "";
-        if (ps && ps.length) {
-            title = ps[0].nodeValue;
-        } else {
-            ps = xpath.getODFElementsWithXPath(body,
-                ".//text:p", style2CSS.namespaceResolver);
-            if (ps && ps.length) {
-                title = ps[0].nodeValue;
-            }
-        }
-        return title;
-    }
-    function metaToJSON(body, meta) {
-        var json = [],
-            title = body && getTitle(body),
-            e = meta && meta.firstChild,
-            name;
-        if (title) {
-            json.push({name: "title", value: title});
-        }
-        while (e) {
-            if (e.nodeType === 1 && e.textContent) {
-                if (e.localName === "user-defined") {
-                    name = e.getAttributeNS(
-                        "urn:oasis:names:tc:opendocument:xmlns:meta:1.0",
-                        "name"
-                    );
-                } else {
-                    name = e.localName;
-                }
-                json.push({
-                    name: name,
-                    value: e.textContent
-                });
-            }
-            e = e.nextSibling;
-        }
-        return json;
-    }
-    return {
-        extend: 'Ext.Panel',
-        xtype: 'filedetail',
-        config: {
-            title: 'File details',
-            layout: 'vbox',
-            items: [{
-                id: "title",
-                dock: 'top',
-                xtype: 'toolbar'
-            }, {
-                id: 'details',
-                xtype: 'container',
-                layout: 'hbox',
-                flex: 1,
-                items: [{
-                    id: 'thumbnail',
-                    xtype: 'image',
-                    width: 256,
-                    maxWidth: "50%"
-                }, {
-                    id: 'metalist',
-                    xtype: 'list',
-                    store: {
-                        fields: ["name", "value"],
-                        data: []
-                    },
-                    itemTpl: "{name}: {value}",
-                    flex: 1
-                }]
-            }],
-            listeners: {
-                initialize: function () {
-                    fileDetail = this.query("#details")[0];
-                    title = this.query("#title")[0];
-                    image = fileDetail.query('#thumbnail')[0];
-                    list = fileDetail.query('#metalist')[0];
-                }
-            }
-        },
-        updateRecord: function (record) {
-            if (record) {
-                fileDetail.setMasked({
-                    xtype: 'loadmask',
-                    message: 'Loading...'
-                });
-                title.setTitle(record.get('fileName'));
-            }
-        },
-        canvasListener: function (odfcanvas) {
-            var view = this,
-                odfcontainer = odfcanvas.odfContainer(),
-                part = odfcontainer.getPart("Thumbnails/thumbnail.png"),
-                metajson = [];
-            metajson = metaToJSON(odfcontainer.rootElement.body,
-                    odfcontainer.rootElement.meta);
-            part.onstatereadychange = function (part) {
-                image.setSrc(part.url || emptyImageUrl);
-            };
-            part.load();
-            list.getStore().setData(metajson);
-            fileDetail.unmask();
-        }
-    };
-}()));
diff --git a/apps/files_odfviewer/src/webodf/programs/touchui/app/views/FilesList.js b/apps/files_odfviewer/src/webodf/programs/touchui/app/views/FilesList.js
deleted file mode 100644
index 1a82a2e8b6..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/touchui/app/views/FilesList.js
+++ /dev/null
@@ -1,47 +0,0 @@
-/*global Ext, app, filestore */
-Ext.define("WebODFApp.view.FilesList", {
-    extend: "Ext.Panel",
-    xtype: 'fileslist',
-    config: {
-        layout: 'fit',
-        items: [{
-            xtype: 'list',
-            store: 'FileStore',
-/*
-            store: {
-                fields: ['fileName', 'fullPath'],
-                grouper: {
-                    groupFn: function (record) {
-                        "use strict";
-                        return record.get('fileName')[0].toUpperCase();
-                    }
-                },
-                data: [
-                    {fileName: 'Cowper', fullPath: '-'},
-                    {fileName: 'Everett', fullPath: '-'},
-                    {fileName: 'University', fullPath: '-'},
-                    {fileName: 'Forest', fullPath: '-'}
-                ]
-            },
-*/
-/*
-            listeners: {
-                'itemtap': function (view, number, item) {
-                    "use strict";
-                    var record = view.getStore().getAt(number);
-                    if (record) {
-                        Ext.app.dispatch({
-                            controller: 'Files', //app.controllers.files,
-                            action: 'show',
-                            id: record.getId()
-                        });
-                    }
-                }
-            },
-*/
-            itemTpl: '{fileName}<br/><span style="font-size:x-small">{fullPath}</span>',
-            grouped: true,
-            indexBar: true
-        }]
-    }
-});
diff --git a/apps/files_odfviewer/src/webodf/programs/touchui/app/views/OdfView.js b/apps/files_odfviewer/src/webodf/programs/touchui/app/views/OdfView.js
deleted file mode 100644
index 2098304d32..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/touchui/app/views/OdfView.js
+++ /dev/null
@@ -1,170 +0,0 @@
-/*global Ext, runtime, core, odf, window, FileReader, PhoneGap, gui*/
-runtime.loadClass('odf.OdfCanvas');
-
-Ext.define('WebODFApp.view.OdfView', (function () {
-    "use strict";
-    var currentPath,
-        overridePath,
-        overridePathPrefix = "odf:",
-        data,
-        globalreadfunction,
-        globalfilesizefunction,
-        odfcanvas,
-        zoom = 1,
-        dom,
-        canvasListeners = [],
-        view;
-    function signalCanvasChange() {
-        var i;
-        for (i = 0; i < canvasListeners.length; i += 1) {
-            canvasListeners[i](odfcanvas);
-        }
-    }
-    function initCanvas() {
-        var cmp;
-        if (globalreadfunction === undefined) {
-            // overload the global read function with one that only reads
-            // the data from this canvas
-            globalreadfunction = runtime.read;
-            globalfilesizefunction = runtime.getFileSize;
-            runtime.read = function (path, offset, length, callback) {
-                if (path !== overridePath) {
-                    globalreadfunction.apply(runtime,
-                        [path, offset, length, callback]);
-                } else {
-                    callback(null, data.slice(offset, offset + length));
-                }
-            };
-            runtime.getFileSize = function (path, callback) {
-                if (path !== overridePath) {
-                    globalfilesizefunction.apply(runtime, [path, callback]);
-                } else {
-                    callback(data.length);
-                }
-            };
-            dom = Ext.getCmp('webodf').element.dom;
-            odfcanvas = new odf.OdfCanvas(dom);
-            odfcanvas.addListener("statereadychange", signalCanvasChange);
-        }
-    }
-    function load(path) {
-        if (path === currentPath) {
-            return;
-        }
-        currentPath = path;
-        overridePath = overridePathPrefix + path;
-        data = null;
-        window.resolveLocalFileSystemURI("file://" + path, function (file) {
-            var reader = new FileReader();
-            // so far phonegap is very limited, ideally it would implement
-            // readAsArrayBuffer and slice() on the File object
-            // right now, it has a dummy function, hence breaking simple
-            // detection of which features are implemented
-            if (reader.readAsArrayBuffer
-                    && (typeof PhoneGap === "undefined")) {
-                reader.onloadend = function (evt) {
-                    data = evt.target.result;
-                    odfcanvas.load(overridePath);
-                };
-                reader.readAsArrayBuffer(file);
-            } else {
-                reader.onloadend = function (evt) {
-                    var b = new core.Base64();
-                    data = evt.target.result;
-                    data = data.substr(data.indexOf(",") + 1);
-                    data = b.convertBase64ToUTF8Array(data);
-                    odfcanvas.load(overridePath);
-                };
-                reader.readAsDataURL(file);
-            }
-        }, function () {
-            runtime.log("COULD NOT RESOLVE " + path);
-        });
-    }
-    function tapHandler(button) {
-        var id = button.getId(),
-            dom = Ext.getCmp('odfcontainer').element.dom,
-            width = dom.offsetWidth,
-            height = dom.offsetHeight;
-        if (id === 'zoomin') {
-            odfcanvas.setZoomLevel(odfcanvas.getZoomLevel() * 1.25);
-        } else if (id === 'zoomout') {
-            odfcanvas.setZoomLevel(odfcanvas.getZoomLevel() * 0.8);
-        } else if (id === 'fit-best') {
-            odfcanvas.fitToContainingElement(width, height);
-        } else if (id === 'fit-width') {
-            odfcanvas.fitToWidth(width);
-        } else if (id === 'fit-height') {
-            odfcanvas.fitToHeight(height);
-        } else if (id === 'next') {
-            odfcanvas.showNextPage();
-        } else if (id === 'previous') {
-            odfcanvas.showPreviousPage();
-        }
-    }
-    return {
-        extend: 'Ext.Container',
-        xtype: 'odfview',
-        id: 'odfcontainer',
-        config: {
-            scrollable: 'both',
-            items: [{
-                id: 'webodf'
-            }, {
-                xtype : 'toolbar',
-                docked: 'bottom',
-                scrollable: false,
-                defaults: {
-                    iconMask: false,
-                    ui      : 'plain',
-                    handler: tapHandler
-                },
-                items: [
-                    { id: 'previous', icon: 'go-previous.png'},
-                    { id: 'next', icon: 'go-next.png' },
-                    { id: 'zoomin', icon: 'ZoomIn.png'},
-                    { id: 'zoomout', icon: 'ZoomOut.png' },
-                    { id: 'fit-best', icon: 'zoom-fit-best.png' },
-                    { id: 'fit-height', icon: 'zoom-fit-height.png' },
-                    { id: 'fit-width', icon: 'zoom-fit-width.png' }
-                ],
-                layout: {
-                    pack : 'center',
-                    align: 'center'
-                }
-            }],
-            listeners: {
-                painted: function () {
-                    // make sure the viewport is the right size
-                    odfcanvas.setZoomLevel(odfcanvas.getZoomLevel());
-                }
-            }
-        },
-        updateRecord: function (record) {
-            view = this;
-            initCanvas();
-            load(record.get('fullPath'));
-        },
-        addCanvasListener: function (listener) {
-            canvasListeners.push(listener);
-        },
-        hideCanvas: function () {
-            if (dom) {
-                dom.style.display = "none";
-            }
-            if (view) {
-                view.setMasked({
-                    xtype: 'loadmask',
-                    message: 'Loading...'
-                });
-            }
-        },
-        showCanvas: function () {
-            if (view) {
-                view.unmask();
-            }
-            dom.style.display = "inline-block";
-            odfcanvas.setZoomLevel(odfcanvas.getZoomLevel());
-        }
-    };
-}()));
diff --git a/apps/files_odfviewer/src/webodf/programs/touchui/app/views/Viewport.js b/apps/files_odfviewer/src/webodf/programs/touchui/app/views/Viewport.js
deleted file mode 100644
index 3023ddc017..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/touchui/app/views/Viewport.js
+++ /dev/null
@@ -1,54 +0,0 @@
-/*global Ext, app*/
-Ext.define("WebODFApp.view.Viewport", {
-    extend: "Ext.navigation.View",
-    xtype: "mainview",
-    requires: [
-        "WebODFApp.view.FilesList",
-        "WebODFApp.view.FileDetail"
-    ],
-    config: {
-        fullscreen: true,
-        autoDestroy: false,
-        navigationBar: {
-            items: [{
-                xtype: 'button',
-                id: 'openButton',
-                text: 'Open',
-                align: 'right',
-                hidden: true
-            }]
-        },
-        items: [
-            { title: 'Files', xtype: 'fileslist' }
-        ]
-    }
-/*
-    initComponent: function () {
-
-        //put instances of cards into app.views namespace
-        Ext.apply(app.views, {
-            filesList: new app.views.FilesList(),
-            fileDetail: new app.views.FileDetail(),
-            odfView: new app.views.OdfView()
-        });
-        //put instances of cards into viewport
-        Ext.apply(this, {
-            items: [
-                app.views.filesList,
-                app.views.fileDetail,
-                app.views.odfView
-            ]
-        });
-        app.views.Viewport.superclass.initComponent.apply(this, arguments);
-    },
-    listeners: {
-        afterlayout: function () {
-            if (app.stores.filesystem.initialUrl) {
-                app.openUrl(app.stores.filesystem.initialUrl);
-                app.stores.filesystem.initialUrl = undefined;
-            }
-        }
-    }
-    };
-*/
-});
diff --git a/apps/files_odfviewer/src/webodf/programs/touchui/go-next.png b/apps/files_odfviewer/src/webodf/programs/touchui/go-next.png
deleted file mode 100644
index c4da8a9a3d..0000000000
Binary files a/apps/files_odfviewer/src/webodf/programs/touchui/go-next.png and /dev/null differ
diff --git a/apps/files_odfviewer/src/webodf/programs/touchui/go-previous.png b/apps/files_odfviewer/src/webodf/programs/touchui/go-previous.png
deleted file mode 100644
index 68ed8a13eb..0000000000
Binary files a/apps/files_odfviewer/src/webodf/programs/touchui/go-previous.png and /dev/null differ
diff --git a/apps/files_odfviewer/src/webodf/programs/touchui/index.html b/apps/files_odfviewer/src/webodf/programs/touchui/index.html
deleted file mode 100644
index 49b8a31f44..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/touchui/index.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-        <title>WebODF</title>
-        <link href="sencha-touch.css" rel="stylesheet" type="text/css" />
-        <link href="webodf.css" rel="stylesheet" type="text/css" />
-        <script type="text/javascript" src="sencha-touch.js"></script>
-        <script type="text/javascript" src="lib/runtime.js"></script>
-        <script type="text/javascript" src="app/app.js"></script>
-        <script type="text/javascript" src="scripts.js"></script>
-        <script type="text/javascript" src="app/controller/Files.js"></script>
-        <script type="text/javascript" src="app/model/FileSystem.js"></script>
-        <script type="text/javascript" src="app/store/FileStore.js"></script>
-        <script type="text/javascript" src="app/views/FileDetail.js"></script>
-        <script type="text/javascript" src="app/views/FilesList.js"></script>
-        <script type="text/javascript" src="app/views/OdfView.js"></script>
-        <script type="text/javascript" src="app/views/Viewport.js"></script>
-    </head>
-    <body>
-    </body>
-</html>
diff --git a/apps/files_odfviewer/src/webodf/programs/touchui/scripts.js b/apps/files_odfviewer/src/webodf/programs/touchui/scripts.js
deleted file mode 100644
index 2683bc83b4..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/touchui/scripts.js
+++ /dev/null
@@ -1,130 +0,0 @@
-/*global alert, app, window, runtime*/
-var LocalFileSystem = {
-    PERSISTENT: 0,
-    TEMPORARY: 1
-};
-function FileWriter(fullPath) {
-    "use strict";
-    this.write = function (data) {
-        data = runtime.byteArrayFromString(data, "utf8");
-        runtime.writeFile(fullPath, data, function () {});
-    };
-}
-function FileEntry(name, fullPath) {
-    "use strict";
-    this.isFile = true;
-    this.isDirectory = false;
-    this.name = name;
-    this.fullPath = fullPath;
-    this.file = function (onsuccess, onerror) {
-        function File(fullPath) {
-            this.name = name;
-            this.fullPath = fullPath;
-            this.type = "";
-            this.size = -1;
-            this.lastModifiedDate = -1;
-        }
-        var file = new File(fullPath);
-        try {
-            onsuccess(file);
-        } catch (e) {
-            alert("Error on determining file properties: " + e);
-            onerror(e);
-        }
-    };
-    this.createWriter = function (onsuccess, onerror) {
-        onsuccess(new FileWriter(fullPath));
-    };
-}
-function FileReader() {
-    "use strict";
-    var fr = this;
-    this.readAsArrayBuffer = function (file) {
-        var path = file.fullPath;
-        if (path.substr(0, 7) === "file://") {
-            path = path.substr(7);
-        }
-        runtime.readFile(path, 'binary', function (error, data) {
-            fr.onloadend({target: {result: data}});
-        });
-    };
-    this.readAsText = function (file) {
-        var path = file.fullPath;
-        if (path.substr(0, 7) === "file://") {
-            path = path.substr(7);
-        }
-        runtime.readFile(path, 'utf8', function (error, data) {
-            fr.onloadend({target: {result: data}});
-        });
-    };
-}
-var DirectoryReader;
-function DirectoryEntry(name, fullPath) {
-    "use strict";
-    this.isFile = false;
-    this.isDirectory = true;
-    this.name = name;
-    this.fullPath = fullPath;
-    this.createReader = function () {
-        var reader = new DirectoryReader(fullPath);
-        return reader;
-    };
-}
-function DirectoryReader(fullPath) {
-    "use strict";
-    this.readEntries = function (onsuccess, onerror) {
-        window.setTimeout(function () {
-            var entries = [];
-            entries[entries.length] = new FileEntry("welcome.odt",
-                    "welcome.odt");
-            entries[entries.length] = new FileEntry("Traktatenblad.odt",
-                    "Traktatenblad.odt");
-            entries[entries.length] = new FileEntry("DanskTest01.odt",
-                    "DanskTest01.odt");
-            entries[entries.length] = new FileEntry("plugfest-gouda.odp",
-                    "plugfest-gouda.odp");
-            entries[entries.length] = new FileEntry("OpenDocument-v1.2.odt",
-                    "OpenDocument-v1.2.odt");
-            entries[entries.length] = new FileEntry("OpenDocument-v1.2-part1.odt",
-                    "OpenDocument-v1.2-part1.odt");
-            entries[entries.length] = new FileEntry("OpenDocument-v1.2-part2.odt",
-                    "OpenDocument-v1.2-part2.odt");
-            try {
-                onsuccess(entries);
-            } catch (e) {
-                onerror(e);
-            }
-        }, 1);
-    };
-}
-window.resolveLocalFileSystemURI = function (path, onsuccess, onerror) {
-    "use strict";
-    var p = path.lastIndexOf("/"),
-        name = (p === -1) ? path : path.substr(p + 1);
-    onsuccess(new FileEntry(name, path));
-};
-window.requestFileSystem = function (filesystem, id, onsuccess, onerror) {
-    "use strict";
-    var dirs = [], shared, subfolder, path;
-    try {
-        if (filesystem === LocalFileSystem.PERSISTENT) {
-            path = "";
-            onsuccess({
-                name: "root",
-                root: new DirectoryEntry("root", path)
-            });
-        } else {
-            onerror("not defined");
-        }
-    } catch (e) {
-        onerror(e);
-    }
-};
-var device = {};
-/*
- * override launch function to quickly open a file for testing
-onApplicationLaunch = function (app) {
-    "use strict";
-    app.openUrl("plugfest-gouda.odp");
-};
-*/
diff --git a/apps/files_odfviewer/src/webodf/programs/touchui/sencha-touch.css b/apps/files_odfviewer/src/webodf/programs/touchui/sencha-touch.css
deleted file mode 100644
index 7227e268be..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/touchui/sencha-touch.css
+++ /dev/null
@@ -1 +0,0 @@
-body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,textarea,p,blockquote,th,td{margin:0;padding:0}table{border-collapse:collapse;border-spacing:0}fieldset,img{border:0}address,caption,cite,code,dfn,em,strong,th,var{font-style:normal;font-weight:normal}li{list-style:none}caption,th{text-align:left}h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:normal}q:before,q:after{content:""}abbr,acronym{border:0;font-variant:normal}sup{vertical-align:text-top}sub{vertical-align:text-bottom}input,textarea,select{font-family:inherit;font-size:inherit;font-weight:inherit}*:focus{outline:none}html,body{font-family:"Helvetica Neue", HelveticaNeue, "Helvetica-Neue", Helvetica, "BBAlpha Sans", sans-serif;font-weight:normal;position:relative;-webkit-text-size-adjust:none}body.x-desktop{overflow:hidden}*,*:after,*:before{-webkit-box-sizing:border-box;box-sizing:border-box;-webkit-tap-highlight-color:rgba(0, 0, 0, 0);-webkit-user-select:none;-webkit-touch-callout:none;-webkit-user-drag:none}.x-ios.x-tablet .x-landscape *{-webkit-text-stroke:1px transparent}body{font-size:104%}body.x-ios{-webkit-backface-visibility:hidden}body.x-android.x-phone{font-size:116%}body.x-android.x-phone.x-silk{font-size:130%}body.x-ios.x-phone{font-size:114%}body.x-desktop{font-size:114%}input,textarea{-webkit-user-select:text}.x-hidden-visibility{visibility:hidden !important}.x-hidden-display,.x-field-hidden{display:none !important}.x-hidden-offsets{position:absolute !important;left:-10000em;top:-10000em;visibility:hidden}.x-fullscreen{position:absolute !important}.x-desktop .x-body-stretcher{margin-bottom:0px}.x-mask{position:absolute;top:0;left:0;bottom:0;right:0;height:100%;z-index:10;display:-webkit-box;display:box;-webkit-box-align:center;box-align:center;-webkit-box-pack:center;box-pack:center;background:rgba(0, 0, 0, 0.3) center center no-repeat}.x-mask.x-mask-gray{background-color:rgba(0, 0, 0, 0.5)}.x-mask.x-mask-transparent{background-color:transparent}.x-mask .x-mask-inner{background:rgba(0, 0, 0, 0.25);color:#fff;text-align:center;padding:.4em;font-size:.95em;font-weight:bold;-webkit-border-radius:0.5em;border-radius:0.5em}.x-mask .x-loading-spinner-outer{display:-webkit-box;display:box;-webkit-box-orient:vertical;box-orient:vertical;-webkit-box-align:center;box-align:center;-webkit-box-pack:center;box-pack:center;width:100%;min-width:8.5em;height:8.5em}.x-mask.x-indicator-hidden .x-loading-spinner-outer{display:none}.x-mask .x-mask-message{text-shadow:rgba(0, 0, 0, 0.5) 0 -0.08em 0;-webkit-box-flex:0 !important;max-width:13em;min-width:8.5em}.x-draggable{z-index:1}.x-dragging{opacity:0.7}.x-panel-list{background-color:#bacfe8}.x-html{-webkit-user-select:auto;-webkit-touch-callout:inherit;line-height:1.5;color:#333;font-size:.8em;padding:1.2em}.x-html body{line-height:1.5;font-family:"Helvetica Neue", Arial, Helvetica, sans-serif;color:#333333;font-size:75%}.x-html h1,.x-html h2,.x-html h3,.x-html h4,.x-html h5,.x-html h6{font-weight:normal;color:#222222}.x-html h1 img,.x-html h2 img,.x-html h3 img,.x-html h4 img,.x-html h5 img,.x-html h6 img{margin:0}.x-html h1{font-size:3em;line-height:1;margin-bottom:0.50em}.x-html h2{font-size:2em;margin-bottom:0.75em}.x-html h3{font-size:1.5em;line-height:1;margin-bottom:1.00em}.x-html h4{font-size:1.2em;line-height:1.25;margin-bottom:1.25em}.x-html h5{font-size:1em;font-weight:bold;margin-bottom:1.50em}.x-html h6{font-size:1em;font-weight:bold}.x-html p{margin:0 0 1.5em}.x-html p .left{display:inline;float:left;margin:1.5em 1.5em 1.5em 0;padding:0}.x-html p .right{display:inline;float:right;margin:1.5em 0 1.5em 1.5em;padding:0}.x-html a{text-decoration:underline;color:#0066cc}.x-html a:visited{color:#004c99}.x-html a:focus{color:#0099ff}.x-html a:hover{color:#0099ff}.x-html a:active{color:#bf00ff}.x-html blockquote{margin:1.5em;color:#666666;font-style:italic}.x-html strong,.x-html dfn{font-weight:bold}.x-html em,.x-html dfn{font-style:italic}.x-html sup,.x-html sub{line-height:0}.x-html abbr,.x-html acronym{border-bottom:1px dotted #666666}.x-html address{margin:0 0 1.5em;font-style:italic}.x-html del{color:#666666}.x-html pre{margin:1.5em 0;white-space:pre}.x-html pre,.x-html code,.x-html tt{font:1em "andale mono", "lucida console", monospace;line-height:1.5}.x-html li ul,.x-html li ol{margin:0}.x-html ul,.x-html ol{margin:0 1.5em 1.5em 0;padding-left:1.5em}.x-html ul{list-style-type:disc}.x-html ol{list-style-type:decimal}.x-html dl{margin:0 0 1.5em 0}.x-html dl dt{font-weight:bold}.x-html dd{margin-left:1.5em}.x-html table{margin-bottom:1.4em;width:100%}.x-html th{font-weight:bold}.x-html thead th{background:#c3d9ff}.x-html th,.x-html td,.x-html caption{padding:4px 10px 4px 5px}.x-html table.striped tr:nth-child(even) td,.x-html table tr.even td{background:#e5ecf9}.x-html tfoot{font-style:italic}.x-html caption{background:#eeeeee}.x-html .quiet{color:#666666}.x-html .loud{color:#111111}.x-html ul li{list-style-type:circle}.x-html ol li{list-style-type:decimal}.x-video{background-color:#000}.x-sortable .x-dragging{opacity:1;z-index:5}.x-layout-card-item{background:#eeeeee}.x-map{background-color:#edeae2}.x-map *{-webkit-box-sizing:content-box;box-sizing:content-box}.x-mask-map{background:transparent !important}.x-img{background-repeat:no-repeat}.x-video{height:100%;width:100%}.x-video > *{height:100%;width:100%;position:absolute}.x-video-ghost{-webkit-background-size:100% auto;background:black url() center center no-repeat}audio{width:100%}.x-panel,.x-msgbox,.x-panel-body{position:relative}.x-panel.x-floating,.x-msgbox.x-floating,.x-form.x-floating{padding:6px;-webkit-border-radius:0.3em;border-radius:0.3em;-webkit-box-shadow:rgba(0, 0, 0, 0.8) 0 0.2em 0.6em;background-color:black;background-image:none}.x-panel.x-floating.x-floating-light,.x-msgbox.x-floating.x-floating-light,.x-form.x-floating.x-floating-light{background-color:#354f6e;background-image:none}.x-panel.x-floating > .x-panel-inner,.x-panel.x-floating .x-scroll-view,.x-panel.x-floating .x-body,.x-msgbox.x-floating > .x-panel-inner,.x-msgbox.x-floating .x-scroll-view,.x-msgbox.x-floating .x-body,.x-form.x-floating > .x-panel-inner,.x-form.x-floating .x-scroll-view,.x-form.x-floating .x-body{background-color:#fff;-webkit-border-radius:0.3em;border-radius:0.3em}.x-anchor{width:1.631em;height:0.7em;position:absolute;left:0;top:0;z-index:1;-webkit-mask:0 0 url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACMAAAAPCAYAAABut3YUAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAPZJREFUeNpi/PX7LwOFwAyIG6HseiA+Ra5BjBQ6xg+IVwAxJ5T/HYgjgHgTOYYxUeCQUiBeh+QQBih7HVSOLiHDDMSTgTiTgLrpQJwLxH9p5RhOaLT4EakeFF3RQPyF2o6RhkaBGYkheRmIPYH4KbXSjC4QnyTDIch6danhGCcgPgwNGXKBNNQMb0ocEwXE24GYn4FyADJjI76Ej88x7UC8FIjZGKgHQDlxGtRsZmISMMjy+dBQoSXYBC0gv+NyDD80xzgx0AeAqg4fIH6NHk0qQHyMjg6B1WvHYDkNFjIgwS1ALMowMOAjEAeBHINe2Q0U+AUQYACQ10C2QNhRogAAAABJRU5ErkJggg==') no-repeat;-webkit-mask-size:1.631em 0.7em;overflow:hidden;background-color:black;-webkit-transform-origin:0% 0%}.x-anchor.x-anchor-top{margin-left:-0.816em;margin-top:-0.7em}.x-anchor.x-anchor-bottom{-webkit-transform:rotate(180deg);margin-left:0.816em;margin-top:0.6em}.x-anchor.x-anchor-left{-webkit-transform:rotate(270deg);margin-left:-0.7em;margin-top:-0.1em}.x-anchor.x-anchor-right{-webkit-transform:rotate(90deg);margin-left:0.7em;margin-top:0}.x-floating.x-panel-light:after{background-color:#354f6e}.x-button{-webkit-background-clip:padding;background-clip:padding-box;-webkit-border-radius:0.4em;border-radius:0.4em;display:-webkit-box;display:box;-webkit-box-align:center;box-align:center;min-height:1.8em !important;padding:.3em .6em;position:relative;overflow:hidden;-webkit-user-select:none}.x-button,.x-toolbar .x-button{border:1px solid #999999;border-top-color:#a6a6a6;color:black}.x-button.x-button-back:before,.x-button.x-button-forward:before,.x-toolbar .x-button.x-button-back:before,.x-toolbar .x-button.x-button-forward:before{background:#999999}.x-button,.x-button.x-button-back:after,.x-button.x-button-forward:after,.x-toolbar .x-button,.x-toolbar .x-button.x-button-back:after,.x-toolbar .x-button.x-button-forward:after{background-color:#ccc;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(2%, #dedede), color-stop(100%, #bababa));background-image:-webkit-linear-gradient(#ffffff,#dedede 2%,#bababa);background-image:linear-gradient(#ffffff,#dedede 2%,#bababa)}.x-button .x-button-icon.x-icon-mask,.x-toolbar .x-button .x-button-icon.x-icon-mask{background-color:black;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #4d4d4d), color-stop(2%, #121212), color-stop(100%, #000000));background-image:-webkit-linear-gradient(#4d4d4d,#121212 2%,#000000);background-image:linear-gradient(#4d4d4d,#121212 2%,#000000)}.x-button.x-button-pressing,.x-button.x-button-pressing:after,.x-button.x-button-pressed,.x-button.x-button-pressed:after,.x-button.x-button-active,.x-button.x-button-active:after,.x-toolbar .x-button.x-button-pressing,.x-toolbar .x-button.x-button-pressing:after,.x-toolbar .x-button.x-button-pressed,.x-toolbar .x-button.x-button-pressed:after,.x-toolbar .x-button.x-button-active,.x-toolbar .x-button.x-button-active:after{background-color:#c4c4c4;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ababab), color-stop(10%, #b8b8b8), color-stop(65%, #c4c4c4), color-stop(100%, #c6c6c6));background-image:-webkit-linear-gradient(#ababab,#b8b8b8 10%,#c4c4c4 65%,#c6c6c6);background-image:linear-gradient(#ababab,#b8b8b8 10%,#c4c4c4 65%,#c6c6c6)}.x-button .x-button-icon{width:2.1em;height:2.1em;background-repeat:no-repeat;background-position:center;display:block}.x-button .x-button-icon.x-icon-mask{width:1.3em;height:1.3em;-webkit-mask-size:1.3em}.x-button.x-item-disabled .x-button-label,.x-button.x-item-disabled .x-hasbadge .x-badge,.x-hasbadge .x-button.x-item-disabled .x-badge,.x-button.x-item-disabled .x-button-icon{opacity:.5}.x-button-round,.x-button.x-button-action-round,.x-button.x-button-confirm-round,.x-button.x-button-decline-round{-webkit-border-radius:0.9em;border-radius:0.9em;padding:0.1em 0.9em}.x-iconalign-left,.x-icon-align-right{-webkit-box-orient:horizontal;box-orient:horizontal}.x-iconalign-top,.x-iconalign-bottom{-webkit-box-orient:vertical;box-orient:vertical}.x-iconalign-bottom,.x-iconalign-right{-webkit-box-direction:reverse;box-direction:reverse}.x-iconalign-center{-webkit-box-pack:center;box-pack:center}.x-iconalign-left .x-button-label,.x-iconalign-left .x-hasbadge .x-badge,.x-hasbadge .x-iconalign-left .x-badge{margin-left:0.3em}.x-iconalign-right .x-button-label,.x-iconalign-right .x-hasbadge .x-badge,.x-hasbadge .x-iconalign-right .x-badge{margin-right:0.3em}.x-iconalign-top .x-button-label,.x-iconalign-top .x-hasbadge .x-badge,.x-hasbadge .x-iconalign-top .x-badge{margin-top:0.3em}.x-iconalign-bottom .x-button-label,.x-iconalign-bottom .x-hasbadge .x-badge,.x-hasbadge .x-iconalign-bottom .x-badge{margin-bottom:0.3em}.x-button-label,.x-hasbadge .x-badge{-webkit-box-flex:1;box-flex:1;-webkit-box-align:center;box-align:center;white-space:nowrap;text-overflow:ellipsis;text-align:center;font-weight:bold;line-height:1.2em;display:block;overflow:hidden}.x-toolbar .x-button{margin:0 .2em;padding:.3em .6em}.x-toolbar .x-button .x-button-label,.x-toolbar .x-button .x-hasbadge .x-badge,.x-hasbadge .x-toolbar .x-button .x-badge{font-size:.7em}.x-button-small,.x-button.x-button-action-small,.x-button.x-button-confirm-small,.x-button.x-button-decline-small,.x-toolbar .x-button-small,.x-toolbar .x-button.x-button-action-small,.x-toolbar .x-button.x-button-confirm-small,.x-toolbar .x-button.x-button-decline-small{-webkit-border-radius:0.3em;border-radius:0.3em;padding:.2em .4em;min-height:0}.x-button-small .x-button-label,.x-button.x-button-action-small .x-button-label,.x-button.x-button-confirm-small .x-button-label,.x-button.x-button-decline-small .x-button-label,.x-button-small .x-hasbadge .x-badge,.x-hasbadge .x-button-small .x-badge,.x-button.x-button-action-small .x-hasbadge .x-badge,.x-hasbadge .x-button.x-button-action-small .x-badge,.x-button.x-button-confirm-small .x-hasbadge .x-badge,.x-hasbadge .x-button.x-button-confirm-small .x-badge,.x-button.x-button-decline-small .x-hasbadge .x-badge,.x-hasbadge .x-button.x-button-decline-small .x-badge,.x-toolbar .x-button-small .x-button-label,.x-toolbar .x-button.x-button-action-small .x-button-label,.x-toolbar .x-button.x-button-confirm-small .x-button-label,.x-toolbar .x-button.x-button-decline-small .x-button-label,.x-toolbar .x-button-small .x-hasbadge .x-badge,.x-hasbadge .x-toolbar .x-button-small .x-badge,.x-toolbar .x-button.x-button-action-small .x-hasbadge .x-badge,.x-hasbadge .x-toolbar .x-button.x-button-action-small .x-badge,.x-toolbar .x-button.x-button-confirm-small .x-hasbadge .x-badge,.x-hasbadge .x-toolbar .x-button.x-button-confirm-small .x-badge,.x-toolbar .x-button.x-button-decline-small .x-hasbadge .x-badge,.x-hasbadge .x-toolbar .x-button.x-button-decline-small .x-badge{font-size:.6em}.x-button-small .x-button-icon,.x-button.x-button-action-small .x-button-icon,.x-button.x-button-confirm-small .x-button-icon,.x-button.x-button-decline-small .x-button-icon,.x-toolbar .x-button-small .x-button-icon,.x-toolbar .x-button.x-button-action-small .x-button-icon,.x-toolbar .x-button.x-button-confirm-small .x-button-icon,.x-toolbar .x-button.x-button-decline-small .x-button-icon{width:.75em;height:.75em}.x-button-forward,.x-button-back{position:relative;overflow:visible;height:1.8em;z-index:1}.x-button-forward:before,.x-button-forward:after,.x-button-back:before,.x-button-back:after{content:"";position:absolute;width:0.773em;height:1.8em;top:-0.1em;left:auto;z-index:2;-webkit-mask:0.145em 0 url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB4AAABGCAYAAADb7SQ4AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAiNJREFUeNrEWb9LQlEUvj5BcHoQvMnVKXD1D3CLwqBJbHJsazQaWoSCxgbHJiMIAiNok6AhCDdXVycnJ8EQOgeOYaG+d39998KH+HyP753zzjnfd325xfdSgVeV8B6BScuEV0IRSbxHeCMk/AVFXCA8ScQKSXxPqK0fQBBfE5r/D+Y8VzUT9jb94DPimqRYIYkrhGcpKhhxIqTxrpNcExdlQJTTTnRJnCc8ykhUSOIOoZ71ZFfEZ4S2zgUu+rguxZRHEnPbfKRVsOtUl0RtYpOLTYljIS2Z3nVk2DY9SbNCEt8RDm0rUpe4La1jvXSqmtum72raZI24KuNQIYl/nSGSOJb0Jq61M0pxhjwK9304hUjHGSKILzc5Q5drUzttdYY+I97pDH1FzG0zNFUb04gTG4kzJS5kdYauiZtZnaFr4ooKsCIVaDHxKAQxt1NBnGIVHfGCcEQYh3jGU8KBfMKLiyM+lgzAq/qT0ArVTg+Ei1B9fEPoovV4fcfQd2HedScX39GprwGTNjJn0maTELN6IuSzECLB6T5x2eM66jQgnIeSxa60GnS3uL56tr7b1Ai0JPVwYi6yho2U2lgfKym19VxjMRHzEGbvS9K+RBPzetGVUpf29lZHSl2/DMnLvwh1ZMQrKW3Ic4fvJOZS6ZMQW5hpmpT63DvtlFLfm7bBNruM2C2yXb7y3U6ZpRS5P/4jpUjihRTbCJ3q1eL3GMMfAQYAJmB6SBO619IAAAAASUVORK5CYII=') no-repeat;-webkit-mask-size:0.773em 1.8em;overflow:hidden}.x-button-back,.x-toolbar .x-button-back{margin-left:0.828em;padding-left:.4em}.x-button-back:before,.x-toolbar .x-button-back:before{left:-0.693em}.x-button-back:after,.x-toolbar .x-button-back:after{left:-0.628em}.x-button-forward,.x-toolbar .x-button-forward{margin-right:0.828em;padding-right:.4em}.x-button-forward:before,.x-button-forward:after,.x-toolbar .x-button-forward:before,.x-toolbar .x-button-forward:after{-webkit-mask:-0.145em 0 url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB4AAABGCAYAAADb7SQ4AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAXlJREFUaN7lmTFqAlEQhh8EhFSCYJXW1law9QAewMrWAwQWAmmtbPcGHiCQ1gPYCla2QsDKSsgmQecvFqImu2/fzry/2OLb9mt23vwz47Kvn5MwEFxM8DkLB6HHEIOd0GGIwUpoMcRgyRKDOUsMJizxpzBiiMFR6DPEeZl1GWKwFh4ZYvAmPDDEqmVWVQxmLPG3MGaIVcosVAz2whNDDDZCmyEG7yFlpiEGKUsMEpb4XKXMtMXeiVVb7J1YLcRgW1ZmVuLSxGopLkys1mLwwhL/mVhjie8Sayxx3kp7DPFVYo0tzhNriyEGU5Z40TjxtDE/F6WcDowHBE/msDFNImG0xZQRBAonDCvxhhH2vKZIZ9Ds+7EDfaWFnKZ4xhja5owxdcnYCAQv1p1Gi4sprn08cZbDt6ZYZasXIn5mLFHTjLCvVt1V+4rVt/M+4r3FPaJMbHaBKRKb3pyKxKZXtv/Er4yjZpRL6q042u34tzh4xV9H/FHnqBHKBQeEd6aqqwD6AAAAAElFTkSuQmCC') no-repeat}.x-button-forward:before,.x-toolbar .x-button-forward:before{right:-0.693em}.x-button-forward:after,.x-toolbar .x-button-forward:after{right:-0.628em}.x-button.x-button-plain,.x-toolbar .x-button.x-button-plain{background:none;border:0 none;-webkit-border-radius:none;border-radius:none;min-height:0;text-shadow:none;line-height:auto;height:auto;padding:0.5em}.x-button.x-button-plain > *,.x-toolbar .x-button.x-button-plain > *{overflow:visible}.x-button.x-button-plain .x-button-icon,.x-toolbar .x-button.x-button-plain .x-button-icon{-webkit-mask-size:1.4em;width:1.4em;height:1.4em}.x-button.x-button-plain.x-button-pressing,.x-button.x-button-plain.x-button-pressed,.x-toolbar .x-button.x-button-plain.x-button-pressing,.x-toolbar .x-button.x-button-plain.x-button-pressed{background:none;background-image:-webkit-gradient(radial, 50% 50%, 0, 50% 50%, 24, color-stop(0%, rgba(119,178,248,0.7)), color-stop(100%, rgba(119,178,248,0)));background-image:-webkit-radial-gradient(rgba(119,178,248,0.7),rgba(119,178,248,0) 24px);background-image:radial-gradient(rgba(119,178,248,0.7),rgba(119,178,248,0) 24px)}.x-button.x-button-plain.x-button-pressing .x-button-icon.x-button-mask,.x-button.x-button-plain.x-button-pressed .x-button-icon.x-button-mask,.x-toolbar .x-button.x-button-plain.x-button-pressing .x-button-icon.x-button-mask,.x-toolbar .x-button.x-button-plain.x-button-pressed .x-button-icon.x-button-mask{background-color:#fff;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #e6e6e6), color-stop(10%, #f2f2f2), color-stop(65%, #ffffff), color-stop(100%, #ffffff));background-image:-webkit-linear-gradient(#e6e6e6,#f2f2f2 10%,#ffffff 65%,#ffffff);background-image:linear-gradient(#e6e6e6,#f2f2f2 10%,#ffffff 65%,#ffffff)}.x-segmentedbutton .x-button{margin:0;-webkit-border-radius:0;border-radius:0}.x-segmentedbutton .x-button.x-first{-webkit-border-top-left-radius:0.4em;border-top-left-radius:0.4em;-webkit-border-bottom-left-radius:0.4em;border-bottom-left-radius:0.4em}.x-segmentedbutton .x-button.x-last{-webkit-border-top-right-radius:0.4em;border-top-right-radius:0.4em;-webkit-border-bottom-right-radius:0.4em;border-bottom-right-radius:0.4em}.x-segmentedbutton .x-button:not(:first-child){border-left:0}.x-hasbadge{overflow:visible}.x-hasbadge .x-badge{-webkit-border-radius:1em;border-radius:1em;-webkit-background-clip:padding;background-clip:padding-box;padding:.15em .25em;z-index:2;text-shadow:rgba(0, 0, 0, 0.5) 0 -0.08em 0;-webkit-box-shadow:#000 0 .1em .2em;overflow:hidden;color:#fff;border:2px solid #fff;position:absolute;width:auto;min-width:2em;height:2em;line-height:1.2em;font-size:.6em;top:-0.15em;right:0px;max-width:100%;background-color:#990000;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #e60000), color-stop(50%, #b30000), color-stop(51%, #990000), color-stop(100%, #800000));background-image:-webkit-linear-gradient(#e60000,#b30000 50%,#990000 51%,#800000);background-image:linear-gradient(#e60000,#b30000 50%,#990000 51%,#800000);display:inline-block}.x-tab .x-button-icon.action,.x-button .x-button-icon.x-icon-mask.action{-webkit-mask-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAFI0lEQVRoBe2YW4hVVRjHZ0yzq6lFEaMlE0PShYRAJIl6iEqKHnqI6WJB0IvdICkfEk0aIyo0KFCph8giCitI7CkoohQL7SoZDaQmXSgKo4uWNf1+zt7DOXvOOXuvvc85bc+cD36ssy/r+77/Xmt9e+3TOzIy0jORbNJEEqvWruBOH/HuCHdHuMOeQOmmdO+ozaA5oxXPunSC2Re4MbgCNiB6vvqbKbx0giNxp9BeBU/BIJqnRecLN2UVrLDj4GIYgscRfSltYSuzYMUdA/0wCI8ieglM5XduK7vgWJhTegGshucRfQHkyj1XpziLNrfmOh2ug1dhMaJn0gbZZDpNpsexQb2y3azfKXCAwns4W5dMd7m2B2ANLCT/x/A/nKknN5mUhWFp1g4Z7vM14jrbBZvgEwi1tAdkDEf3ZrgI0S/RrkP4IdqGpuA+cJo0yw7iyNfJmzAcMrokfjp93HC4XrPYCdzkgPXDPPqvJN7eRh0VrBWqfKMuev6k3Qzr4SP4HWqOFIkZ73iYA/NhLpwPZ4LLS+FZzUp+GtwAA/heS/sGwv+irWnXc9bdTRF20/8eOBWmEKwnCectOrPhSlgF2+Bb+Bl+AxP8B/6FvLn8Td8fYQXMSubgsVZU8Cv4mAeNhC7k+jLYCopzrRURlvZA9P8WLIJJlcI5zi1Ypw+Dr4oqp3EAzlsbLCjfg1PeEUxLtlnXXU4/wQboq8gpl2BHx2l5UuyosuW8I6rQb8Bp1iwRefy4VN6FReaopU3pX7jnhwSO7MmVIiNnJ3L+DtgHCm3ltA0RH4/26rhKk1tdu4kr7yeuHkKgU3rMqI5ncfAQDIKbg14oi1nJv4OvTShthC9LjmTyGB8XwhZw+oQ8+Xbc68C8AOboK6+YYPpfDV+B06YdAkJiuMtzhvrOP1JYafMLpu/Z8CmEJNGOe60fz0J/cjZmWcP0G2+sWZ/aUnCqhFosOq7gyf6uOT888th+Ot0HmxF7MOkgt2AcXQNLkg5rHPv+dffjVvPX6PdeWtf7MJhUssD578ZtEGL6sY4MIfTjeh1zCWZ0Z+DwQXAkapkjtzviPdoPYB+JuJVMNfy7QQkR7MbGPfRaYhi7ruUSjLcbwe1k0tw2vgivwy6C70/ekPE4JK+N+HySWDuz+A5xXOnvlsqD6Lf/QjwBnxNc4a02YwzBeuIdyBosWDDT7RKcn1MRYA+/V8ImAv9Rcb5VP53ufoQ8AB8S0+PMFiwYz5fDzCjCF7SLCbojOm514zZ3HViYLIZVxmD4h8B0rtWtFXkEn4tTv22thPe2SawVeDs8TTz/NqoyhLqDGoC7wervt3lNCxKMY/fIc+BLuJXgn9G20pyuVuA1sJF4vt7GjHx8nZnT7XAXzIXnoK4FCcbLVHAqLW+DWF8v78Aq2EY8v7zGDK2+EmfBI3AtTAPNTU1dCxXs/a6ht+t6bM4FNykvw/0IdYSrDLHu8iyeQ7Cg6mLKQahgd0pbSOJwit/cl6Np6p+BrxGn6hNUp1z3m/tOWAH+DrIgwSTQcBcTFLnOzcRwSjZ6j/vdvQyCxRrSanu0mWvZqp3LjkbBuYTGnSac4CxreCQqJPFD+r/bhq+dtOSyCO7DyWzIcm9avKLXXb+FcskiYjlBfB0lP9KLJp+nv6N7ZL+cp7N9sgg+L6/zMvabcEWrK7iM07CZOXVHuJlPs4y+rNJ74JkyJpczp62N+vWOfpw0uqWzrnXXcGeN53g13REe/0w660x3hDtrPMer+Q9LNCcV91c+jgAAAABJRU5ErkJggg==')}.x-tab .x-button-icon.add,.x-button .x-button-icon.x-icon-mask.add{-webkit-mask-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAABqUlEQVRoBe2awWnDUBBE843B4NxcQSAFOC4lJeTkoxtJDykgvRhcgCFNJCFgIs+ChEHSJX93YT6ZD4ssmR3NztNFH5Wu6+6iVynlEZpbp+4J3s5OjWm7DRxZuMMCdUB9oyzNmrJe01hEejMtM5exIh6bCI3JbFkDT27EckEDs5DI8iHCWcmy6IowC4ksHyKclSyLrgizkMjyIcJZybLoijALiSwfIpyVLItuOGFso/xiuEvAgJdeK0DqJrHEhtsTTh9ul9y/ChR2KE+Y1ruDt2ccI7d6PszcK+oFFblWELt3Cn6i/8epMW5/W+LKGrUZ/0NwboF5QxuPsfY8dmOxJs41cBOYHCZF2BFeE60i3AQmh0kRdoTXRKsIN4HJYVKEHeE10frvCNvr4RH1HojH3rGHr3hqA7VdkxPKvuKJ3AA4hn7BM3xxA5N71Fdv1gz/tax3P+hFHmsJwM/8wraMadqOh5GuXda76rVqNWb7wgeevQvRRQ1MBCPFiginxEokKsJEMFKsiHBKrESiIkwEI8WKCKfESiQqwkQwUqyIcEqsRKIiTAQjxcoVrP83/9czD9EAAAAASUVORK5CYII=')}.x-tab .x-button-icon.arrow_down,.x-button .x-button-icon.x-icon-mask.arrow_down{-webkit-mask-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA2ZpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYwIDYxLjEzNDc3NywgMjAxMC8wMi8xMi0xNzozMjowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDpGRTdGMTE3NDA3MjA2ODExOTJDQUMyNUQwRUE4NjdEQiIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDoxQTFBMDFDQ0I5NEYxMURGQUU1RjlGMEFERUNDQTVEMCIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDoyMkRCMDIxMkI5NEUxMURGQUU1RjlGMEFERUNDQTVEMCIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ1M1IE1hY2ludG9zaCI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOjMwRTE0QzVBNDIyMjY4MTFCQ0ZCOTAzOTcwNzcyRkVCIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOkZFN0YxMTc0MDcyMDY4MTE5MkNBQzI1RDBFQTg2N0RCIi8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+HfrH/AAAAeVJREFUeNrs2cFHBGEUAPA3zYqIiIhOnTpFRHSKrp26RqeuEV077R/QqWtE166dOkVERHRa9hQRnZalFcv0Hk/W1Mx+38z3vvlm5j3eZW+/9+abne+9KEkSaFPMQMtCwQpWsIIVrGAFK1jBClawgo2ik/4hiqJGwLKuvfpIc5xSkWqYr5hzU1s/mRNxXTPsJ+ZqluvXlwOmSj3XBDvG3M1rpAmYYoUrFzr4ZNqTawqm2MH8Dhh7ZXJUbcAUx4FinzBnJcAUl4FhP/jIgRSYKvkYCJaO2LbNv08RMMUy5nsA4COTLy0XYIqtil9iF6aflq7AwBWuAvuQ9ZKSBgNX2ieWjtKSzeXBNZgqfe8J+4W5aXtbcg0GrvibB/BhkeuhBJhigzsghT0veh+WAlMcCGHvMOMQwcCdcIntYy6WmXhIg2PuiAvsEHO97IhHGgzckb4D8L6LmZYPMHBnhiWwXVdDPF9g4A4Vwd66nFr6BAN3ygbbw1yoMzjmjplgB5hrrufSvsHAHesZDOD2JAbxVYCBOzfIAZ9JbR6qAgN3cPwP9kZy1VIlGLiTdluCmoOBO/pnS9Bk8DzmS3pL4BMcpZEe1qX0GI/atC4dQYXRMa1MU0IX4gpWsIIVrGAFK1jBCnYUPwIMAPUPAyFL+nRdAAAAAElFTkSuQmCC')}.x-tab .x-button-icon.arrow_left,.x-button .x-button-icon.x-icon-mask.arrow_left{-webkit-mask-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA2ZpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYwIDYxLjEzNDc3NywgMjAxMC8wMi8xMi0xNzozMjowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDpGRTdGMTE3NDA3MjA2ODExOTJDQUMyNUQwRUE4NjdEQiIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDpGMDZEQTFBREFDOTMxMURGOEQ2MUVDMjM0MzY2NTBDQSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDpGMDZEQTFBQ0FDOTMxMURGOEQ2MUVDMjM0MzY2NTBDQSIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ1M1IE1hY2ludG9zaCI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOkFGQzJEMjQxRjIyMDY4MTE4QTZEQzUxMDg5Q0Y0RTRFIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOkZFN0YxMTc0MDcyMDY4MTE5MkNBQzI1RDBFQTg2N0RCIi8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+FXGmxAAAAghJREFUeNrsm09ERFEUxt+rxBAxqyFm1SqiRYpMSpFapUVaRGpTRIpIbWLaFJEoRZtilChRWiRKsyklilYRERERERGZvsN57Wfmvnnnznkfv+WM+bn3e/ePN24mk3E0pcRRllC42FOWy4dc1w30R+fz3LFthEs1TelZ0KlBuAIcgmRgHS5gqlm2RsNTmqbvrUlZycLT4BhUiliWfEwEbII+UeuwT4nzqNZq2Gm1gTu/ZaUIj4NTEBW7tTTY1zUwKH4vbaive6BBw2kpAa6DkA1CeBicgZhVx8McUg5WWNi+83CWiXFfE9ZeAGQR6ukBqJKyu/Gzw7TcXEiS9UuYbiWWeU8ckXYqMT2lozyFW6SeOU0K1/FhPS75RsHUlKbj3KV0WRPC1Nd5sCuxr6anNPV12zFwk2jLCCdtk81XeAIsahL+BVOgH3xrEPayA5rAixZhyj2oB2ktwpR30A5WtQh7vR4DQ+BHg7CXLdAMXrUIU26411dahClvoBVsaBF2uMsjYFRCrwt5a7kOOnjUVQg7vE43cr9VCDu8I6Nep7QIO7z3HgCTvHYXvbCXJe71hxZhyjmv1w9ahCnP/DDb1yLs9boXzGgR9rIAusCnFmHKCff6UYsw5Ymlj7QIU75AN5gz9YVuLu8eB/S+dA+v1+l83pe2Sfg/BRe2OeGfPELhUDgUtip/AgwAw4tbozZtKFwAAAAASUVORK5CYII=')}.x-tab .x-button-icon.arrow_right,.x-button .x-button-icon.x-icon-mask.arrow_right{-webkit-mask-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA2ZpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYwIDYxLjEzNDc3NywgMjAxMC8wMi8xMi0xNzozMjowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDpGRTdGMTE3NDA3MjA2ODExOTJDQUMyNUQwRUE4NjdEQiIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDpGMDZEQTFCMUFDOTMxMURGOEQ2MUVDMjM0MzY2NTBDQSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDpGMDZEQTFCMEFDOTMxMURGOEQ2MUVDMjM0MzY2NTBDQSIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ1M1IE1hY2ludG9zaCI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOkFGQzJEMjQxRjIyMDY4MTE4QTZEQzUxMDg5Q0Y0RTRFIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOkZFN0YxMTc0MDcyMDY4MTE5MkNBQzI1RDBFQTg2N0RCIi8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+xvZexwAAAhhJREFUeNrsm8FHRFEUxu9rxhARsxqiVauYXWoTpTYtUkRqlWkz0WaiTW2iNi3atGhTm4k2E5GYSJRaZcZQtIqIISIiYhgyfZdv/oF59913X+cdfst5733u+c495743XqvVUpKiSwmLWPB/j2QnP/I8L9SH9lN3/KxwQlpKT4FtaR7eAhegR1LRmgEVMCCpSg+CGtNczLbUC8pgQ9I+rCv3LiiBbkmNxwJ93S+p08qCRzAhqbVMg2tQkNRLa1/vg6ILvrY5POTAXdi+tj0tDbOYjUoaDzPgBuQlzcMpcEhSkg4A8lztjBTBin6u0d8iBOvoYwXPSRGsuEcXuWcnJAhuR4G+TksRrGOMfXhWimDFjqzCyUuE4LavS5yxExIEt0OfopRN+DpKbx6MHAtHSfAeWPN7kWQEhDbAMjg1cTHXBdfBLHiSUKXvwZBJsS4LPgCT4NP0hV1L6SZYAcdB3cAlwe9gDlQlTEsP9Gs16Bu5IPgIjIOP/34AoP26Ss82bd00LA/r1Vzk1mM1whCsfTrPpsJ62E7pE/q1HpaPbAn+Betgib1xaGEjpb+Ywrcu7H9BC35m8//mSncTZEqfgRGXxAYpeJNp3FCOhemU/ub+euXqzGlS8AuYBq8unyiYSulLNv9OizUleIcr+6MiEF4n3x7ze2n9OkSfE5/bfmg/30v7ERxaWBcc5Yj/5BELjgXHgiMVfwIMAGPkXbHq6ClAAAAAAElFTkSuQmCC')}.x-tab .x-button-icon.arrow_up,.x-button .x-button-icon.x-icon-mask.arrow_up{-webkit-mask-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA2ZpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYwIDYxLjEzNDc3NywgMjAxMC8wMi8xMi0xNzozMjowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDpGRTdGMTE3NDA3MjA2ODExOTJDQUMyNUQwRUE4NjdEQiIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDpDQUZBQUM3NEFDOTMxMURGOEQ2MUVDMjM0MzY2NTBDQSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDpDQUZBQUM3M0FDOTMxMURGOEQ2MUVDMjM0MzY2NTBDQSIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ1M1IE1hY2ludG9zaCI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOkFGQzJEMjQxRjIyMDY4MTE4QTZEQzUxMDg5Q0Y0RTRFIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOkZFN0YxMTc0MDcyMDY4MTE5MkNBQzI1RDBFQTg2N0RCIi8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+ar3jxgAAAbFJREFUeNrs2j9ExGEcx/H71YmmpoiIaIq4KSKi6dabbo1oiqamm1qboimiNZpuuikiIqLppiPipqYjIuLp+/D95vy6X/frfr/n730e3sst53XP9x7u+V2ilKpM05qpTNkCGGCAAQYYYIABBhhggAEGeNSqpl9IkiQKWNbvfBc7PDdNIz1PPVK7Trd+OMPrRr8l9Uat2nT9+CyCW4yVnnnHowTXqa8UWHcdI3iNGozASscxgReo7h9YxTtfjwXcHoOVBjwJQYNPcmKlLk9EkODGP7FSO0TwOvU+IVjxZAQD1iPZK4CVGiGAZ6lOCVjFE7LhO/i0JKzUK3KImQY3S8ZKHZ4cr8A16sMQWPHkeANepF4MYqWmD2A9arcWsIonqOYafGYJK73yRDkB71nGSnd5r4jKBG9Sn47AunOb4CWq7xAr7dsA61G69wCreMK2TIMvPMFKfZ44I+ADz7DSQ9YhVgS87fiQGtdlmeBlvkNWnndYBljfGT8FgJVDbKco+CoQrBp6mrEyKfgoMOyvpxlZ4CT9vcXj0shWNe8nE8vCfzwABhhggAEGGGCATa1vAQYAZekAmr8OukgAAAAASUVORK5CYII=')}.x-tab .x-button-icon.compose,.x-button .x-button-icon.x-icon-mask.compose{-webkit-mask-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAF/0lEQVRoBe2aW4hVVRjH54xa6nSzm92sHiZNorJowMpxrDEoyECiUUpztIkeeumpoCB6rAwi6FHwIXqKXkqiEE0no0QNLWwyspmGsruWlVqp0+9/2t9hz3Lty+mcfTnpB/9Za397Xf7//a219lr7TGVsbKztZLL2k0mstJ4S/H+P+ESfwEqlMhn/VNAJpoOjoGibAIFfwDbWnT/DZOCrex34D4b9vvw4wVScRKEu0AcWgQtBmYb9DvgsA6OganCWhgFwL/lHEf35v3ci/mqVFrAO8AT4FugJHge6URZsg0s3aDfOAe+H8f0INAo3gavD9928iT2bgqvBYVAWgWEeG+E1G0wwAeQ18hTZ/cDKSvROECnaBD9Iod9DFa2BMqSDEgAqjtiH8H3v4XwM32ZwlZUPp/jbLgHDoAziXA7r4aXIhsVqgZLYA8Atb9eK9BbQGRarvOwxEDdfdU9D/UiOUH9bwTixAWGJ/QmYuKhUojU6xomu4HgL3AV89ipO3ZdYlc3LJOJTsAeR1bAEr56V+J4H00Aa0/D+BNxPM0NW4Wcyvqe0G7+Gu5b9IhAexnrYq8A+4OMa55PoDaA6p0kjG1jHvVqnetBFQBxAP9CrJ27qxYm2OX25IhdlxxGoRgqzYFOxHAIvgHMbIKKF7iIwVe+yMtsA5F4CjYiVPu2+lhG/z3QRNRTeKGIIB4NKgXgEHIrhF8Xb9WuxmmVayhphLVDPgimgEdtL5VWI3RNuxH0idp17hCGlAOg924zISmyXRdbSskVYYjVnmxFZvXt14DjBLKJummuEYXU3iNsuuvyirnXam2cRddNSRJjXj1bjteAc0Ih9QeU+RG6JayTqSeUSYYhpu/griOKR1j9MGze7EXWvKRPZUaaC6VebAYltxrFUYue64nzXRQ7pfki+CDpAI6bVWJuKD9M0Ere1TFO/7jLMV+2NbTXWh8JGTDuoxYjVySqVFRFhfV15DjQqdoQ2BuoRS/mqRS0KTZ3D9KTISuxvIKrPtP5R2rjFnaP4Ek93lInsvGmC6eM00A+asRp/RTu3esRej3+G63evKZOL4HvoJ/x1MW0k3XI/0E6PR0Q3/o/AHPeee53XHO6DzDRgw5ls3fYlNZYgYHO4JmvgfVy/DjqBPhDEWuaCIXQpDOYELNaQPg4SiQXlLfmazErEvmsOpbQ9j+RlcAH4G6Qyd9jYdVPmMAx6wDEgkXOBHrK+lIqg9RWXSmy3OzTxzQcjwOrq29x1bjn3mjK1ClbR0oYF07Z2U08FfewiPV8EMK3YOu8midYCNd9DWpHVSm1clZZC8HkQ2R4Qe4Z0kpEnr5Vb36oU+TBxy2uB6rXyluK7AehAb+UsTSU46zl8BcRuBBrSg5CuzTPyf+HTfPbNaUVvKWU2kLq2BMdM15n2OmvBd0BEw3cHGPaQ0r1XwNuhe/r2vAKxG0O+cNbWg7AvdT6zvTQrqH5rXhowWYeAqmD8Z+DTqroA9IKFYDqQSewDlN2kiywsM8GQnR3gCOkQQmeRanhL4J1Av2qY6SP7XvBklmLVWZaCV9D+6eAQ0DxVVK8EZiNkPgDvAS1sQ4jV2ThTy0Qw0ZwM69sD5joVdQV5iV8P9DOOxO5DpL5j5WaZCIb9AqAV+ij4A+hw/maA/XlEkr68lpXga+ltKxgE2sDs9vZegDMrwWsQuboAPYldtieW+A8F8p6X9VDMRHA9BPIuGyd4LG8yKfuL46WdW6xJcFQDU3i96LRTGoOPBGmnligsirQWre/AxZ4C1+DrpY/3PfeKcl1Gxz3AJ1inrsR3uiquBf3AZ9/g1FFMjZXBZkBCW1Sf7WSx1NEx0bSv1QZBQ7tVoYA8jeDEf7yhXNuZ4B2gSq0qeBjuM1MJViGsB6hSK4rW598BMO6/bKPE14YAFXQ2HQWtMrwVnINAYmufjqKEmr8mOIj0bVTWSUYb/qQPbBoaRUABOQz03znLwUQTkyat/hZDpZrxGjqLi4VgMbgJ6L1XFlNUPwYKymvgACL10FPbCYJT12zRgnFbyxaVFE/7lOD459P6d/8Bhs9x6sTqrJgAAAAASUVORK5CYII=')}.x-tab .x-button-icon.delete,.x-button .x-button-icon.x-icon-mask.delete{-webkit-mask-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAGcElEQVRoBdWbzYscRRjGexY1EPK9u9mVoJH4cVBPCYR8mB0IbkISyB/gOYIeFSUQQaIX8eBBDKuCsBFFxJuieFCMEb9RiZrcxKOgB7+i0RjN+vwm9Q41Nd0z1d3Vk9mGh6rufut93l93dc9katNaWlrKymytVmuD4mek7zX2YpmxqWJVwwrl2iL9qBp+LpN3okywjNYo/qh0Sjqi/ZVlxqeIdZ5HXA1HXU3xqbnDMVJGYJ+UzktMi1+le6VrY8aniMHLeeJNDdRCTWti88fCTirpSemChJHpT/Uflq6LNawah4fzwtP8aanppDQZk3sosBJNS4tSCGumf+jcMWlFjGGVGHI7D7zM12+pjRqnh+UfCKwE66SXpL8k3yDsc/4+KfmdJqfLHVMDta4bBF0IrIFrpaeloqsaQvM83S8lgyaXy2nvjdAz3KdWal5bBJ0LrAGz0rPS31KYdNA+8Y9Jtac3OVyuKjVQ+2wedB+wAqekE9Iv0iC4onNMvUelytCMdTmGTeOiGqgdhqkQugdYAdzZBakqrBXAXXlCWhkaDttnjBtb9s6at7UwwNJzp7vAOsE3KKaCfcbZwKrtP8r1oBR9p4l1Yxhb1dcfBwtMG+xCd4A5IHFHfpL8AXX7fFw8YGbDWmIlxtT19cfDBFsHWm22UVqUfpP8wFR97tbxCNjjikt1Z8PaYYMR1uwRidd5GJRyn39k8PaeCME55s4Rk9IzzAUjrNmcdEb6VwqDUu5fUv6npGsMmr47xrmUXmEu2GCcs2d4v3Y+kZqaUlbAf/J4SOKuIvocs/NNtDDBtp8L7b+lt+vgaWkU0M/IB40CFqbt3VllnQ59lu3Tyc+kpqfYZXmgJu6o5YQBln09jD07WdZSwF6JKdA0tBXWREvtMMDS6mH0d6yvoLb0sdT0lGsClpqpvW08ftt9hv2D9LVxdb6Vmn57p4SmVmreG/LYfiGwg96hwd8sE2hgqXWHweW1A4Ed9AElOTfm0MBS44E8SP/YUGAHzfQ+O6bQwFJb4TQuDexBj9v0tmkcBdvh8OmH9XUVt0nvSE1/7415kVEDtWwbVrd/PmpK9wzIsq0y+VLi6sYU1kQM3tSw1a8tpl8amKTa2s7wakAbbDsGMIypBOygdwr6C6npr4j+DMELz50hSOx+ZWAHvVvmX0mj+EaGB167Y+Hy4iaUoM7GW/sHiSvf9IYHXnhW3/KuQswxOa6SFqSqP6X6UzW2jxeeq2JqzIupNKVlyEri81K4sBVbeJ04PPGOXjH0wUsDy2i19IJ0QapTeJ2xeFPDah8mpl8KWAbc2cel36U6BacYSw3UUupORwMr8aS0KF3NOxteKGqhpqi1YWZAFLASrpdelMYJ1uCpidrWJ5nSSjQtvSyNI6wPTY1JFsRJNMqPHoMo21IjtVZeEJ9xCZYDrF0cg54pmt65z7BAp6QT0nKC9aGpvW9tOPel5WAX1KZaNrVCRtlSOwx90D13WAEsiD8nLWdYu7AwwDJwQZypUHf13wwHtWfkgwbFpDhnf/rQtyC+SeZ8Px3FnX1LPpud6KcAG5QDJtg2dZ5hdTZKi1JTC+J+MZ/K5yZ7g9KXOObHNNHvWRA/JsPzIzB9Xx53GKy1HJM41wSonxNGWLN56Wupyd+nTiv/rQYZtpyTiPELTNmHDcb5zltanTnplHRRSmlErjek60PIcJ8YF5vaHybY5vDsfizpwB4p9TLp68p5SwhXtE+sxJhU0JeUC6Y95tkF7tBn2SGd/FxK8VcAHyjPzVLP+qwZ57XEujGMrQsNAyyHfK8eYAfNM82bsw40KwJ3Sn1/teOb5/UZ48aSoyo0tcMwH3r0ATvogwrmzwWq/Pz6nsbdLpWGteIY63KQqyw0NVP7Qcvnt7nADpq1YZYzeA5iTV9T7I1S9DT2i/H75HC5yBnrT63UXLhGXAjsoNsafFaKudOvKG6zVBvWwMnlcpJ7GDQ1Umvbxue1A4EZoO2wSzToc/ptxdwgJYO1YsnpcuNRBE1twB62cUXtUGAHzTN9TsqDflPHb5OSw1rR5HYeeIXQ1ERtuc+s5bA2CthB80yHn9P8pDIrNQbbLfQKNF54GjTPLDUVPrM23tpoYAe9S8k/kjB6VdoiNQ7bLfYKNJ54UwO17LLzMW2nWA2K3vQ/we5S8N0SL5LvZHI5enCCQPnzkcU3snukd+X/YZm0/wPdHqnTTpY+CgAAAABJRU5ErkJggg==')}.x-tab .x-button-icon.organize,.x-button .x-button-icon.x-icon-mask.organize{-webkit-mask-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAEdUlEQVRoBe2aS2xMURjHjbbqUaLoI7RChQUiGo9YaEqkoolIkCASSki68dixsLIVYmHbkJA03UgkFRI2QgRBKl4RgtJFK0jUI+o5fv/p68ztmUlHzpzO9PZLfjP3fOfcO9//fOeee+69E4lGo6PCZKPDJFZaQyc4N1mGI5FIMfUVkAfZMPaVwE54yqn6i+8BllQwravgAEyEv5DppsQ8gYPw3hqsJi0bNJ4El0GZzSa6iHcbjLbpsp7DDGX5V8ByyDbLJ+CdUGQLPNGQnkzj3TDFspN68BNkwhDPIY5poG/T1lBYR+LOkuW4uSeR4KXssN48grF9h20NdeukYLRL96Y6vAD2wCwwbQyFvXARPpoVA85fKnXiN4HtvP2Gf0tPG3XWUKNYT4E6PxjvD3x1EDHPZZvgxTTSDBc8gMrKbql5gKHeJh7NM6/AFu91/EVmjHGTFmN+HA3qYSoE7SuO8+zcEawY4vJdfr8Z/ljiqMS3AV2RvjpTPc7V0A623rqJv8RsnynbxDUXXieJuy/LfRmmEzSd7wKtroL2Hcc5BL4LVmRCmbheEIfmHduVQ1muQV/3BN2bJZyqaANbdm/jL+xtm4nfxKcsP08Q/zX8MxV3TDXqx+PYBGUQNHVAI9AsYrsuB9sPVflDT5xH+O7OZn8kK9msJf6G3ooFOOr66+O2NOVL6A7oP/njmmREQcN5LGhy1cLJtBwK++FSLqrVSGvPcrCZGu8DZTqTBSs+zUkarTZTUrerYh50gHYY7rSpRxZCCYTByvouS2FQK42hE9w7S/tKsOaIt/AGfoMWO3OgFLyYb8FaGByHl6C1r27jlsAh8HaN14LD1+x8jN/KNVdqlAvhgq8YfJ/DLYjVUDatk8J905HObd+Cf1rEaHTp5sSL+RacaKWWyO+8E3wLdi4g1QOOCE61x7Kt/UiGsy1jqcY7kuFUeyzF9ok6WA8ZvJjLtbQWEI/hXpLIW4N1rLyiPHV5hP9MsM4or2V7hlH+702XghWE3gAcTRKN3mjY7AZOdZbNCnAug4wTrNXSItCrmmYSZ3tGTNVAo+1nvCLOyLyeT9WC7WlqXNtUCq7vlpTlGkQMeG+Vio9j6NbxMOjtn8u7udjzaJcH1H3uLViVikCzLftqEtsKbeAyNh3LuWAdVM+yr8JsU8hgt9mvGh6ATousEKwgdcvXCMWDFap2mOYBTWK6b3YtNvYDrs9hM0i9BTgB+YMRTbvp0AS6bzaP43I7LUPaDFBvHPVmIy+ZaOp1+TkJX8Dc3/V22gUrYF1jN4L1r0T4NSPXg+sZ2dZZXgRr5m6BymCW8en6rc54BrYAXfu8CFbQmoQ0c1eYoilXw0NQp7gWZzueN8H68S44DbG/IPA9H66AL7FR12tpYk9qetOwGfSaVjcMNVAFie6iqHJv6bws2YaUfLpctYP+S5WoTVr8vjOMvphN4FN4N69Dybs6yw+OCLZ0yrByhS7DmrRaoQE0Kw5707JOf/UvH/ZKewTG/kscFrHSGbpzOHSC/wHSRhVOrpN3ggAAAABJRU5ErkJggg==')}.x-tab .x-button-icon.refresh,.x-button .x-button-icon.x-icon-mask.refresh{-webkit-mask-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAG1ElEQVRoBc2aa6hVRRiGO17yrmloWpqhllH2wyKSEIsIo8QorLSbqVRgJd3DyFAQIyIiKQz61cUgpB+B0EWii4VkGFRUJpWKphZaaVZeutjz6FmwOnuvNbPWXvvs88HD2nvNzDfzrpn55tvrnLYjR44c1wpra2vrRr8jYC9j+KOzxmCnrTL7ng2LEN+rswbRSsH/ItL+Fwqij+8M0a0UrD5Fa0vg2c4Q3WrBik3sVj480WzRXUlwG4Lnw9OI7p08haqvXUmw2tzH8+AhRPf1RtXW1QSrz4i9CJYjepA3qrSuKFh9PeEWcE9XOtMtE0yyYYROojQfa0zRc8GZ7l9TWvJGj5LtCjdj0AYll6uD90HLQMizZKZ70vzOKjKypgpmkONQMxpGwWlwAvg9STLG8jlkip4FO/H3GKJ/DzXIK2/DQV554TIGdQaNpsNkmAAjoYpj5i/8rIIFjPlXruVMwY1Czy7X8+Al+B4OgU+yag7i0wjereyYqxDrDD4Ku6FqgfX87aGfR6BPGdENCabTqfAh/A31Btesez/T32LoXVR0KcF0NByeBPdSs0SF/Nr33VBIdOEoTVDyKFkCN0OlSQH+Ys2HsReMF66ueCuyJPDqzD4HvqEIzUCzyk1WtsAcKBy8opc0zgfBU+A52CwxIb+K3Qw3FJmodN0owXTgseNxsA9Cg2pm+S76vyktoOjn2D3sfjVAhFJBqmSax8km+BZ2gBnUlXAmhMyH+B3cj8DVocq55aEnROOJsB7MdIrOnnt9DVwD48G3lAPAB21evRRCPl3G22FaaKwx5blLmk4c2DNQdN+aaa2DKdAvayCULYQ8wYnYhpZxuv+QYGf3a/gnMLD0oH+h7mIYnO6o42fK/bX0MKTbpj8nYmd1bNvI98w9zHnbh8FcDSPBwcWYe/ReWMOgfEhlTbH6ugs/75Z1Urdd1tOi8qnwGcTO7j7qXgU9snym71Mva4bt70uYmq5f1ee6M8zsOphJoOiY2XVGlsEbDKxY5kOjlLmkt4Iz+z7Xyi1LjD/QJ4PLOsbWUmklGMkbsc00fqBZYh1Y3RnmvjnyWeDREbL9VHgVdjNQZ6is/URDxb5e1kFMuyzBij0ZzLBC5n5bzUAbmV2Titvx8V6os0bLs5b0aBz3j3CuyA/A36dlzK2zFTpFrAPMmuFRlPWzQsDMpN6BMoGqO+2+h9tiZ7Y9mBpXQivPIHoYvzXjyhKsUwcUsoNU2IRjj5JCRhtXx8rYRohV5Bh4EExP8+KFK24VfAT/syzBLmeT+5Ap9LdQpYrKFTwMrgcF55k/Tj6FGsFZe/gUKhupu5q5VGOCo7Nv3RrLEryLmgdqarf2hjPsyssac9ToshobjGKepO1jzuqowQQqGVNOj+zvMPVMdWssS/Cf1IwJRAa3CcSTmABX03nBG451DMTEFleniUyNZQneQk0zqJC5xHw3HTOIkK9QuYHqQsgKtOn2Ct6ZvpF8zhK8jQou65DZ+UXQ1ADHCrKfyTAWQubK/AH8XV5jWYI3UtOzLMZMQ2cyqGbOshnZDPBYCpn79xuouyWzBLskPodDEDJf394IXiu39vgwEccXQyjDsn/H/gkovMayBCt0Hdg4xi6g0rVNmuUT8b0AzA1C5vnryjT7q3sOZ77TopH7ZQOYj+oohH89NAuKeuPBgDL7Tsrw5SmwHEJ9J+W+bLR+/8RHx2tmpzRy3yyCfZA4DF23UfcK6Nmxo6Lf8WFUfhzM10P9JuUeRZfl9ZUp2EaYeycJAInT0NU/ct0HQ/M6ziqjnft0PLwCsavLMbkNV8OQLN9HNeUWHjtfn8eJiUhIaLrcCPkaTIHo2aau+3UmbIS0v5jPnrtz8vQEBR+tcOxVz3qcmWrGdJyu42y/BXfAJKjZW9w7CaaBy/djKDKrSV/mDCsg+HCj/qmF6DsPZ8tgOJQxV8geMBnwszPobCp2IAyFYVDGXE1fwAwmaEvQQWgJtM+ySYWC90PyVLvC1aPHQHl5jI6jWqIrHpuFl3F+oAuJ/pGxzIXoP4znRumODwPHI+BFcFm2eoZ907IEBnQcZ973QoJ1hLnnXoBWiXYZ74D50CtPXL2ywoLbRRtwloKBqDNnWrEGvOugVEZXSnC76O506o8GX8QbKZst3KPnTTi33szF3istOOmAAZgVrYBm/SeeD/MruAf6Jv2WvUadw3QUNM5q30ZcCrNhDMT8lKNapil0LayCtxG4JbNmgYLKBNsnortxccbPh+lgBuUvnlhzW3iumpaaofkzbzvXyqxSwelRIb4f3w1u58AlMA6GwNkwGEwhN4PZl0vWWLABDEr7EVr3BzxlDdl/zhnCj3tOo0oAAAAASUVORK5CYII=')}.x-tab .x-button-icon.reply,.x-button .x-button-icon.x-icon-mask.reply{-webkit-mask-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAES0lEQVRoBe2ZSWgUQRSGM24YTdSo4AYRTcxBEZJDJCoigrtGg6CIgihqogfRgEERguhB40UP6kHw4kEET4J4E9wPAdeg4ALigjuKcSMuMX7/mAmdSU/SXdM9PTPpBx/T3al67/31urq6K5G2trac3mR9epNYaQ0FZ3vFwwqHFc6yEQhv6SwraBc5YYW7DEmWXUhZhSORSC7UwKIgxzAlghE5CZFHoAEKgxTcz8/gCI3gfzHsh6l+xnLq2zfBaC0miXpYDvmgu+kXBGqeC0aohK2D7TAF+kPamKeCETseZdugGgZDSp4RxHFsnghGqKo4H/aB5uoASEtLWjBiZ6KsFlaAHlJpbUkJRmwl6rTcFKW1SktyRoIROhofdbARhlr8OTkMdBPNlWCE6iG0AA5AqRN1Nm1cxbTpn9Qlx8ERO4pIG0Br6yDDqH3pV4kvPdRewCd4C+/ZPdWx7xZxsk1LgqvIZDeUeZzRT/xJ8Dt4BQ/gGjSSVzO/3psEJ4JoY+A4fATNvVTwhjh34RSshMGJ8jO5biuWIJqrc6AJ/kIqhNrF+EFs3fqHYRoMMxFp7dNFME5Hwi5QMLskgrqmgb8M+hgZYRXh5riTYBxpFM9CUKKcxlWOSyHPjVi1jQqmYy7shQ/gNGjQ7f6Q6yWY7UY07XNK4CK0QtAiTOK/J29tLOQ7EU67nIGgtfU1mARMhz6a3zegtCfRHXOYxhXtndJBgGkOT9FQ1Z3oDsFqhBXAFngJpkGD7veN3NclEt1JcKwRHaaD3niCTt40vh6+q2N6rL+2gtUA03p8FL6AaeAg++ntsNwqNqor/kL8OZ2WgF71vEpeq8FvC36uDveJM8qqyenHwzg67oE1MAxMTeLOQyNod0SDqO2hCaDVIma6u3R9OAxq/9WxW9PT+wRsQ7RiE7Gbj4f4v9F8Fujxb1ptfR2tj/cbf04bfbbqZWgsFEM5LITNcBLc3HF6iM2IxXAlWJ0wJXEQfoFb4RJcEwtu8kv/PCiEGdAAevFQJbvL5Rh/j351uRbcLloVmA83ewgUn0TSgq2DRGzloVt9E9yDFoiPqfOvUBHN3erA7TFOtG6fBqdfVp4KtuZLDqr8DrgDdqIPcb2/UYXjAmmu1cLDBIGswX0THMuJHIrgDGglsMZu4nxI0oItgcbjUHP7MyRaanwXrHywvlAFj8E6v+dqZ8MTI9BzHO2DtaC9KY1wIEYurXCO4JrbjyA6CvzO80wwznS3tMAFDpfBKdArnkY4ECOXqwTWUqZvA1mJp4L/+4wKf8ZxDeyE26AlLBBD9HUC14GWr8mezWEc2/oiiNZM/TumGbRLkdQ6nChOT9eJWw3ffakwjjuMRF5wUg9b4QnE5hOHKTVNsSuO3qW9SosN/Yn4KmAQbnnl040f4pelVLCb5Pxq6/st7Vfipn5DwaYjlyn9wgpnSqVM8wwrbDpymdIvrHCmVMo0z15X4X9rh8wHLEjawQAAAABJRU5ErkJggg==')}.x-tab .x-button-icon.search,.x-button .x-button-icon.x-icon-mask.search{-webkit-mask-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAGdElEQVRoBdWaa4ycUxjHd9rpbm2bqKhiUavbVZdo0LCyLl3iHhGEkkZsKBYJX4RISHwQIYIPNJoQlUjTuCakUZ9oVGRF0GywslvqbgkpDarqsn7/6XsmM5n38pzzvtudeZL/nplznvM8z//cz5ktTU5OtuWRUqk0i/qdoAN0gcXgP+CkzIcx8APYBXbi82/SaZFSKGGILiTibnA+GADHgbkgSXZT8CF4GwyDEXxvI92r4k0Yoj1EeAG4CvSDEggRkX8VbID4lhADQXXUwxZgfAF4CGwFmgdFYQJb68HJljjy6mSSJZAZ4CLwESiKZJydb7A/CGblJZVWP5UwzueBB8AfIC7IovO0mK0B89KCzlOWSBinWoBeAkWTstiT3948xJLqxhLG2Xzw4jSRdQ0yiv/upMBD8xsI40Rzdu00k3WknyeO+aHk4urFEb4TJ/80CWEdYB4BhS1kdfswe+zpGNf80RYUIr9QSdgOdNCYCfaLcABpqFxBbymu3FIlDFkdD18B5wRYHaHOJvAeGCU4fa8IdnXUPAaoMZeDk4CvfEKFM7CrhswnbpxjZQX4C7j5Y0m1d64EXc5OWoqeFsPLwTvAYt/p/Iv+6jTb1rLKHMbYgWCjZxCb0T/e6qhWj3o6hz8HRMSRykp17l5WayfksyN8oafzTegfHOLQ1aG+blc6ZGQRdeVawB4GlWno7Pim1G9rB08AZzgrfRfdw3wdxelHvl/38K01Itc2Rf22Q8BPIIuoynXQL/SQj71DwcfA4n8nev1xjWfN0yGjD2gxsYh6432LolWHQL9F91Gj/j7oacUPFhE+11hbLxbrCFBzqWh5A4PDRqN90RZqVK9XE+ET67MSv41D9s3E0nwFX1Ndu4RFjkZpjkUxTkeEdTDIEvXqW1lKoeU0pOavXj10OsuSI1CYnaWUVC7COvpliR7f9CQzlaK5/LPBQRc6mstBIsIW0WXiO4tiDh35mIr1oS4kK2ENOctwqzPu+SX0MdDLjZWw9Pb1suyv7EPYR7cuEithLRLL6moW/0VriaVRtT1qTQkSER411Cyjc4pBL4/KEirPNRj4FZ3gXy5EWM+vWaIhtJQNf2GWYkg5dtWzui9bhuqn6OkVNUhE+ANjTZG91Kjrq6bDxHnGStqvcxHWsU5bQpZ0orCK3rDs21m2quXY6+DLTWBBNTP9wxbOKZZ4E63omLYZWG4r0nkQtOtwVASwdYeH723o9uTxS/3Ks+ytHk5/R3cI5LqIK2hEDw86XVkb+wV0Z+YiHDnWCjnu4Vj3Ug3DzhDn1NPacTX4HljJ6gFPr5e5RpZ74tFz6l0ezhWk5tFTYJFPEOjrLKxhrEazktWR8zVQ9vEVp1ttLYyplyeANQinN0ydIXBUnAOXR7nsrwAbgatrTbX3nu1s5Ul1oKgIRsZYMR/jy72gY0+u6a8OJMJX1P+C9MsaqDcPAseCHtANQkRTwHIoybZd21qR0Q2k1pZP0tNJSIubLhxJOr75egO/sjbekM/VIe0qY1RDb6p//PYl6/QniO0sF2tI2kBYRpBTgVrUOWqm9DPiGgghW+GWVBGj/UCvEM1E1sWinr4sKfa0/NgedhUwqsVITzvOUTOl6gxv0qmERRw5HOi/bHz2zb3VMHp28hremYQj0rq23QhGwFSQ0ZVPu8NvAfa3Use8kJkI1wzxxRhfDcYDAotrKF0GngYnRA17D599f7KVXcVzmoszLfUi7AxhfBG4GKwFPudhBacnmpfBStDwnzrkrQIhpDW8L3ExJqXV/wBA2Vs4WelquT9Qzy8FvdHnDlKR01RQ8OrJMaAp8TnYQUA7SBsEm6pzPXgcyI6PaCG7Hdu6VcVLUkuE5ONBR8ByDGb42sPGteBPEDcV0vK0ZZ2Z5C9oSCcZKzqfwO8OJK2FbCAunqYmrICRQaA3rLRejSvTWtGwTzc94Yj0DQS/O4C05nQd6VYhrIVMpEN6Wqv3crBngY4b582aR9DXgJCFTPt05T+AtKq2jNARzxLs/UBbnY/0onwLO97sXPuwj8cidQn8OuytAe0edjUyuluqh2vIPcNnPS1rIbOKfkRf0pKEGdqSJyFwM/AZ3j+2JGHXpZDWWf4+sMvlpaTal7e3xLYEsdQ4ITIIsras29AppxrKctRM5ZDRLUvv13GnLl1p5yjellylCb5BolvWkRQMgT6g6apXmnVgPWQrc/1/boJCaHVWyukAAAAASUVORK5CYII=')}.x-tab .x-button-icon.settings,.x-button .x-button-icon.x-icon-mask.settings{-webkit-mask-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAIkklEQVRoBdWZd6yeUxjAe2lLUbVKrFaLUhUVo1pbQtqqESOECGLGH2IkCP8YQewYtUoTKmkJ/2hVEDFixN5FadXWBjFaq0b9fl/vuc5973nf9xtvez9P8rtnPeec5zn7/W7HsmXL+vzfpKOjYxVs3hR2hlXhT/gcX94iLBYd/r+BR2vB+eBsyVJ4FPqX+eJItbUwm8rmMEZDTRAMhG1Nd4p+bABbmUZlAGwLI0D9Lmlrh7HV5boHOHuPkL6LcCisDztCEJ1aBxwYwyvgMbgfToD/pGwJ9FY5FjoZ42AuhKX7N/HX4Er4Psq33PQ0eBz+APP+gbfhAOjQl7bdvxjYH86F4Gwc/pWT74DEesYXwWWwtg6385L25J0FH0JWXOopyfrjDC+AmTj7sxWyCua1hWCgs6Ox58GPTRr1FfVmwBuhfts6rIH47NJ9Eu6BWBwM9+xU8HqaDA5OLL+ReAmm044zXZPlGzmk2iDklHUSvF4mwU4wHEbCuqDo7OdwKXgK/w4DwEfIdVC7vgjVcxnPg/fhHZjVdocWRmn8faDBKRaTf4srPoa81eFocABS9cy7ra2XNAam5BcyvZqy4vL/Er7OFsTpdnW4yK5+OBCWd+yLjw9neY04Mxsvajiru7LS3qXut2/Aq8mZ6zp0iPuOnsBeH0wYi1thL8jmW99l7ux/1G0fxHui2TiNOojdaLQt6vcF38tbwyHg0zLel57AD8Io2Ay2h+sh3r++tl6AI2AbWBv62XAlwogPoyFPVhvuJpRpyCwc/7hbQU4CPWdlMfWWEFrX2YvFpXskTIRFsD4Mgqy4Qr6gPZ+ny6XR0c/Tp7Up4GdaPBNx/KG8unn5tOV+vLOgzbj9VNwD7gHYMPRRyR5mJpyBIVDU3lD0/ISrS9B19U2A4+uqkFZywMbCYbTnqig00PJ6xYNCPCnzZD0KRuQVJvJty089PyJicdY+hfggs7y2fAl/MBGJk+DJ7grgb+YCz6ZRceY8OHaEftly08ho+AQ0IrW0zPsWjkrV72zDg+VwGB50iHse3AbhpJ5P/AzYBz6E0Jf9egqfDieBZ4Vl38E1MKirzRBJhSh6ED0D7k0bvAA2gVVifdITwQd+MCAVOgMXx/WMIx42J8M88Ep6E7YJesSd5SthBuwOzvxweBhCPw6IV5nL1y+pPWEqXAJd+7fWX2g4G6K4HTwHGhoaNnwZDoLVQh3iZ4NXRayXinuV1N7vtc779NmN9NOZejr9FowL7WdDyjyVb4TQhzY+A7Vv3qBPuquvrrwQiUMUR8JMyDobOlhI2dXgIbQaXAvhV4agkwqfQs+DxH11PrhqUnou0TkwNrYrxMn3ADoMXgUnwIm5Ano4GOqEsMceppJ76REomzGX0bNwCrgMnZmU8XGeA3UizIK8wQz6Ou0+HROMjUPyXboOngyArhUX62XjKYcvp7IHTOi4N0MH5eGs0a2kXVpZ8fBYnM3spbSrxqVdnWRHi5Y9Ne+Gn6E3Z1dnn4fBWRtbSfdY0jaGjAYf3u6j3nLabbVfK86l6qaWNP3UllGYZdMrWzzxJ8OLVXdcO8ZTjfL29CP7VvD4r71DU3qJvPnkfQ1hZWxGfMuEXl7WXxQ8AacwQ9/kKTWdn5r2kEejO8DbUM+V8yR6x8II8CM9XBdbEffJ6FVXtkUsXwC7BhuqDpN7OHRCx951flgvgTBj2XApZX7CDYHci5+ywXAOFD1QbGsq9A02VB32pXH/26Zj/cEL3JkZCs6MT7+DwfyU6PwUuBDDCq8yyr+ln5vQ3RB8ZaXOD+2xv2XovkK4AD4CB9yB+o12XG1Niw/xLeBA2Alcji5jr6Z6xJfWQRihQXULzsxG2T7rER8fbqu54J08m/7eIWxarqJm0TLLLuGQ1pCjYFUMKNwa2XLq7Au/Q2ir3tDZfQoa7jPY4LLym9Pl3Kg42q/TUDNLzDv+tUY7RF973RJNS2of1duYDv9Sr3JGz9P4jUxePUlXgnWbllYcdmY1oFnxvl3p0orDrdTV0VbrNzVYrXS6NT3mXVdlxng7bF+mlCi3Xkuiw57QzRw8Xl9DuGKaGbSNqbsrNCpuIX+YaFq86KfDuuA97AnorPl2Lju51TkTXoe6Dy8GyFm6CLwdysSJ0EH5CfwFZEqTNwNVO5+CtcjymRpKfDsY1UlI+6NZaiZ19CyYhhHey6WCv0egdDf4a2RKfiDzPVgI78OczvAD+mjphKYdjtmSRwMqPh1/VTWHz8g/AZK/Wcfto7MfzIO8thy0B+M6VccLHaZzD6aXQEPyjDTfc8CtcQD0eAWRtwdMBWevqB1n0FkdVbWjob2i7+GBdHwpnAZrQj3yPUoLQKMXwXowEhy4wVCPOLjT4AKMtL1qJXieDellEvgzS9GMrKgyz4ZTszZVkU4uaTobBrPB19CKcqqoXZf2fBhdhZNxGz0cphOvm5uhbL8VGVxFmYP9BAyMDW41nrpqDqGT8ZB3bVC0UsQfJfYGr73KJOXwLrS+QQM9NHo3NqLvw2hcA7aUqqYcdu/6ovG0LJM5KNwBX4LLuEz8Geh28OebMrE9T/p7yhQbKk/tCRrw55eXwaddaj/6a8VMGAP+93AyeBendOO85zr1hxNOA5+McXmIuwr8ifaklH2t5PU4tEJjdDYWfCdnHx1zyTsG1lAX6YAzIc/44ITh/epHffhQ8feqWEdnXWGTgl6VYa7Dnc7sQ8fvgiems3ov+M7u9poifSh4d8aGp+JXZ42nzibgP7eXgM5+CuOzelWlCx3udNqZvgGOg+QVQb467mMNTjlqnl87J6cMJ9+zZH+4BfZN6VSVV+pwPR1hpA+VNyFvz+vwJ7B3Pe2tSJ3UKY1dDctX1PBzTsfyxGeq26NXpRKHmZGleOEV4pLOk4Xo+XrrVfFir0r8bh4EG0E8057i3r8eTL0u/wJCZSL2DoplLgAAAABJRU5ErkJggg==')}.x-tab .x-button-icon.star,.x-button .x-button-icon.x-icon-mask.star{-webkit-mask-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAFfUlEQVRoBd2aXahVRRTHz/Ujv+2mZRGZB7W6mtpFikC7+UWUZiqBD0JPFdRL1EMFPfjoU4baS0FUD/UWZBEVShA+BCpmWApRSkgllNpDmZWZt9//eOay72afvWfWOTPn3rvgz8yeWbPW+s/XmT379AwODtZSSQ+CryVgA/gVfIx/pelEhFMBVlvBOaBeFo6Cean8y09KsnMg932TqCOs9M2UhMfhMJVsxtHcAmcbmekLCsqjFKUkvAYG1xSwmEHZqoLyKEVJCDOCNxH9HUCbVl6mULAuXxjrOQlhgl8Bbi0h0Uen3FBS37GqVIQHiHh2SdR16jTlo0t0woycpuxiUDSdHcFeMv3uIWYanTDB3wIWVZBQHP10zuQKvbarUxDWT1HRz1E++Ds99fLtgp6jEmbExhPNcs+IbkZPiCpRCRP5TPCQJ4MJ6A3QSUqjSWzC2ozuC4j+fnSnB+gHq8YmvJKIJgVEpRPX9QH6waqxCa8PjEhHT981H2j6qno0wqzF63BhOUxsom3Zb7aJqGsUjTAONFJlpysXQz7VuXpavrBTzzEJaz1adlzNjHs6RTBvJyZhjZTF/kTaWZZCnlvhsyWgQkPZQpagzsX1bFlAXjGtDdAPUu1p3PPQhCCXkdwG/mta0PWLds060AuAnqtEOjpdbQR3VymX1P9F3UfgGJA9X9F92c/ADaQ2P8V0DJ4/kDbeYKaSvgI2AN0+OGJK1VAbSIhTOXEOybYll2kte77yD4rqrHyb85S9Cl4HtReAyI11/A7HpRq5PSD6oR0f3Rad+H7S1DvV7UgS+tc1cU3n3V/AWJ/SX8BxVuMinow2rNNjlPQVeH0GFg378kDBfLAPXARjZbTPwmUXmOG+bgz71EKFfqKeAUWfREZbJxyCxyOOqEuHER4qrNUWovwy0CFktBHV4eNZMNvxyaaFhKWAaBt/HJwEo4W0luSKLMF8viVhp4iBeeBd8CcYqcQ1qi+CKS7uVmklYdcQY0+C42Ckkf6EmO51cVal3oRlCFkCdKgfCWtbo7obDO3AVWQbHHyUsjo40E6uq9cvQbdG+wN892fj8s0HjXDWKA51/t4JUo72H/jTDtybjSUkbyYsJ0gdfAtSjfTn+JoWQjCv2+57a4M1QaQSvZvrMsIs7RJejGcdUlLJUhzpZsYsZsJcCen6ZwCE3IaYA2021OfUdU3fJltmwni7Fvh+KDMF16KR3ux0lWuSdgjPxeNdJq/tNdKNqJaSSUyEmVK6JNPomtqbIh3eSKNsEmvAarfJ5LEzjbbR59MtpqyEb8eZjpndkhtxvNri3Er4YZxpx+yW6Jdhi8V5MOHm+n0QZ9afo0u0fQO8A5S3iPaQ1cTSG9w4f/SqesZBH/gRWI6T+gyyxfkgvw2cMdrS+/lTzpZvGnyWxsnTwHLRd4R2a/OBqQyoztKBe/P2qp6DCBOUptKHhuA+pU1fq2Co0/F0L9CVaghxXTbWW9ktKg8lrFfCrwODeh/9wgu1bEDo6OT2Fvgb+JLWq+nQEsnaa5UPJbwKBxc8A9KXPG1O3u+u6E4F24GvD3XMDjCxFcF8uTdhjGpHfwn49L42lCeAdyDZwGi3HpwAPr6+Q29htn1ZPoSwfuz3ewShXVcBNz62lzkvq6O9DjZHgQ9p72kdQljvob9VBPAN9Q+UEQmpw5b+Sf8e0FotI/4a9ZN8bIcQXlnh9AD1y3ychuhgU0tpJyhb14epn+ljN+Sk9S9G1ct50d8SdgF9x9EO3lHB5hXwPEYfA8dbGD9LuWZBtfj0inSQWUDTKzu1dAB5Dkz2tdOOHn70LvwVyMag/FYwzse295Rukq5j+G1wEOib66PAy5FPMD46+NPmqTV7CpwGGvkJPm2l8z8GWDNDloqpGQAAAABJRU5ErkJggg==')}.x-tab .x-button-icon.trash,.x-button .x-button-icon.x-icon-mask.trash{-webkit-mask-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAFBElEQVRoBe2aS4gdRRRA8+L/m0QIJkYNLlQUNOAvigpRcCEIcSsiCLoLLoILcaM7QVBX4koRshDxt9CFKCoiuvGDCP5QkxCiJhInRo2Ovzie80gPNWX1dL3uesM09IUz3V1169a9daur+031aG5ubkUpGY1GK7G1Dq4Cz9vKiIY74Sv8+72tkWQ7Ay4Bxo+Hu2E3/AuOZBf+ov2TsL6Ef5WNUsGazXvgEHQJMm77N/aeg3Mrh7seOweMM2bWYH+B2OES1/9g9w0oEnSngHHCYO+FGSgRXJ0NM/0idA565BRpKyxSt9J2B5xWY+Mw5Udq6uqKT6XimESlmX4d7sTnA4n6rKJjs7QSSgTrSno7nJyodtFyGr4AP4G6TeLIHweb4A44C0LR1xtgCzwP7aTtIkBvLlSfQjwNZyl7FNa0sU077V4DX0Js25X7cRjPzDb2Nd5FnK7xPbGXskdwxsxOLLRzdnwIj8GvkQFnypqobKLLrgGnOjMzP6cqJijzfn0NXPljmXRNWNC+dcBHM7HA2NELp10nwbaz5iC4OsdidTyrYp3a68ZFi7XJFfNsOBGcUmFnPpbiBWkVZefT7g+OXcTF0EUsFPtaje0Lw0LOzfoM49B4Gy36WMKwK+WDcC2cAmGwXK7YAAYdym9c+NiIdUOdnHODc6DjpPioix9LBvwtPE3QOzjWi7MjBS0M8CGY1huUA1ISg/4cNqXiqcqSwVqJ3AQ/QEmnpm3LR+IzsLYKMD4mA6bBOfAKuFpO28nS9v0Bcxckn9V1Ad9Pg2m/H5cONLT3Mf5fFGfX63hBQG8s7/LXxcdV0nvjMtgKp0MojuaroM60xYB8Z78ZTog6c515B1ylXey+ARe3/0tqFNCy0RjrkdvgOwhH0TeiB2A1uMBNGx9Ta+FZiP34mrIrQR39cECSUzqZYYIcR0mjJtmFwmHUvdenLjwmnUl7Eh05+LP40fjvoGTACYN1Rc6CecGhM7lw2lt+AA7Fg4fOespXgYO0j3pvnXmh3rY+/52+vrXtRSd841rQJ/WV1JVX9eNj14DnjeHnJVw8DBeAnX8A2ynfXwXN+cWUPQUOjNl6i7Jt1I9nCOe+1V0NT4AB/wkvw31QRIoFjDfnwRXgfVbJGZzsry44boTNUGVjlvOToPpV5FvbjXApKE7VLZ6UkpWlDGHH+96pV93/4TSsujGA8MeF51Xw6njuO3soKTth/UTnJQOeqONFlKsBW0SlfdVyDLh9NBkth4AzBqnXKkOGe52+DOeHDGcMUq9Vhgz3On0Zzg8ZzhikXqsMGe51+jKcHzKcMUi9Vhky3Ov0ZTg/ZDhjkHqtMmS41+nLcH7IcMYg9VplOWY4/Md88cEtHbDOVg5Xx9jpsM9Yx52JeAcw1ontTXRdcm9pFz3vBveHdNJN6YPVRhrnivtMlruZ5g7DFxBuXLut8j7sA/d43Yr5CIpJsYAJ7DN2/27Bsw1gwAb3I8wLOp+g4w6+nw/6HddOyszqWDg/Qv2bXFwH4+1SyhyUYtI1YLc85wXn/ORAagWdPVRKUqh3AJwtdTLeWq2rbCoP76cm3bjeLG6ELjZim03XJujyJqXF6rtmeDvGNzMN/ajEAZi2rKOD67t00jVgN7+3dnFgqdsu5XRc6tiS/eUGvBTTNengBIVZPuYG7LcYPjdluYk++bTw++pGyQ34bSy9B35Vs5zEYGfgJfg+x7H/ADoy2VfnrtXoAAAAAElFTkSuQmCC')}.x-tab .x-button-icon.maps,.x-button .x-button-icon.x-icon-mask.maps{-webkit-mask-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAADl0lEQVRoBe2b24tNURzHjfutXEPycDAltwhJbuMSJUqSB/HiES/+AK9ePc6T8uCFkImQW5KGkdwSxYyMGkZu45bbDOPzyZyTrJnjnDkGrVm/+szas2bv397f33ftPS+/Vdba2toj5igj0NcfRkG/3qWIJdcIrs/AO6gDq7cKPkOjUNAmxr8ePJsix8NUWAvLoapowSQawIUzYCZUwAqohF3QAjtgGTyCy5x/nfEu1MNDCmAxuiS4Vy8ST4DZMB9WwiTIRUGC26q1gKtWwyyYBsPB5aLIL5CNTxzotDeWTeA5DUKuO4xXoQbxHpcUbSIzJFkDi0EzdLYnBNGuYJJ4ch+YAhvB5TAORsKvib4x97vwPpk2FjJuhibu85zxAlyCangBLRQib06u68t5vk4uVYVqgO+oqy9v5ASTRLd0LQNLYB24bAfBnw5zikX0HtuhGW5ANY9ylvEBvIY3FOArcz7rWHCpboBFMAxyGjguKIZy1jzYCqfAD5BLslB8J3dCP/AdOgo+fKHXd3Sebh+EctCMieBK6Oj8QuYrXZ7roQr88PiSD4b/IVyyfhB9jQy/uppTUijYhANLytJ1F/sxzL7POpg97vQdFfwVTNYtQsHdKpLg2O1ODieHI6tAWtKRGRrISQ4HJYlsIjkcmaGBnORwUJLIJpLDkRkayEkOByWJbCI5HJmhgZzkcFCSyCaSw5EZGshJDgcliWwiORyZoYGc5HBQksgmksORGRrISQ4HJYlsIjkcmaGBnORwUJLIJpLDkRkayEkOByWJbKLbOVx0r3E7httIbttwNvzddt//JWxIfQynYX8pgu2TbgBbjw9Ds53sNHJv49gOehu5bUe2DfjXojDVpWG/9iu4CEegBp7xfO+LFfyGC5+AiQ7BFXj/c8s+xw+Z24PwvYwKnQxLoQLccGEB7Hsu9t5ckjcU2QjuozgA5+Apz9PCmItCbvqWs2vhJpwBl8ZrEuVtOebPtiWLbf2ymyL0ZVT8XJgDbgHIgFsPOhPmr4d7oAnHue9txg6jI8EfueIaHIOrcAuafieSc/IG19vw7TYD6UEBbE4vhwxMB7cizIYhYPT6MeR+WjBFPoCToEgF1hb6bD8LNpHLwT0L56EOGkhUchc6edoNcruvQWoQ7/6GMTAa3E2zACxGNjRhH9wHV4zP9oGxqCjj7C0wA06Ay/YliRT/T4MCuGnEfQ4feJ5mfvdfaG+OXSWdju+VpAoIK3D9tAAAAABJRU5ErkJggg==')}.x-tab .x-button-icon.locate,.x-button .x-button-icon.x-icon-mask.locate{-webkit-mask-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAIDklEQVRoBe2aaaxeQxiA3eqCltpLkWotLUUtsUuJrbUFtSSaiIjljz8kQhOJiAQRQYREYvmFSPrDFiSExFpL49JSS6u0Re1bLUVRz3N7ph1z53zfud8956sf3uS5s7/zvjNzZuac7/asXr16g25IT0/PKPrZAfaFXWAMvAEL4GNYgS1/EjYqPU07jKNb4sGZcBocB0MhlYVkPAgPYM+itLDWtA43BYY6m7PBZVSFXuqd2ZQ96m3S2ZkY/0lFR+PBcFlf3ZTTjTiMwQfCR4WzfxO+D8/BTxA7Vxb/nXqzmnC6docxdDg8WTj2F+EtMBrMPxiqzvqn1N2nbqebcHg6hoaZfJn4sNho0hdB2cym+bOoOzRuP9j4EBTWJuzII1F2OngEuZQfwcBVhLG8FifaxM+jfHybOgMqrtVhet4OfH6VHsjpn9xXWu3PRKrtXK1qtVo5g6q1zNfyzJ1UFOnwCcz6ZqEq8bHErwzpCqE6JtHOsBap2+FNsGrjyLIjid+PvYfBDOJPwJSovEp0wyqVqtbJ3Xqqts3Vy83EKVSUTiWns1Nd2WesY2U0XAHfDkZBpu3vbHzu3rVI3Uv6G6z6oBbL1il5b1108LG6Hf4ak+YO3qy1Gl4ltnhtqoZIrQ6z8lZi06PwWw22qUJdn9Wkq09NrQ4Xhs0hfLgGI99Fx30MotfT+sT9oG6wbhzMAzebTviRdufUbZf6anc2GInBh8A7HTj8A23Ogw2DrjrDxhzuG80118KHMP7XCo57934Ljq/TwVRX4594cGADblmXEEyDqeCrYiy+XPhC8RzcioHfETYmXXE4WI/jXi1PDOkiXE44CUd9pWxcmtilWxnt0k5lVbecteNuO+xsplLrOZsqT9PddviL1ADSn2fyGsvqtsO5N59c3v8O1zUC3Z7hDzHcm1cs5nVNuu2wr4+pNHrupp3V/cUj1d+X5vwdTsS+RmYqjKDcT0N/cjz9kSmvNav2iwfGj8HCfcDflXaGbcGPezpsuBfEsoTEMvAnFmf7K1gCXjPnMwhfEtYmg3YYB30s9oeT4TDYCbYocGY7EWf6+wJ/qZgDj0MvA+Cdu2PpyOFiifrJ9SS4AHYDv1bW+oURfUF8J/bjgj+l3gteUZd38ggMyGEc1aHJcDb4k4nLtZW4RMMy/YW4LwonQHz29hZ1NiV0yW9VhASl4rK/G2bDAhyv/JGgssM4668K58OFMB5io0muFZ+518CPb34EWAga9VuxMvxlMIhH1FGUvUCZb1G7wu4wBfaAg8E9ISe2/RjugbvQUe1rKRXbvhOj8Ax4AxxJO0pxw3kEnHk3pezLO/mbgV81Q3v17ZmzgXxXk7rU+TSENmlo3y/C9JyeNK+lsyix08vAWUs7Mq3BL8GxMDpVnqapMwqc/aDL9lum9dI0ddwETwX7ctMK7UNonndybc0OdtBZ6jANh8GV4DMYFMfhj+TfCBsFZe1C6urwXAh6Kjkc9NLO5/wW+DXSEXQZausVUPoTa9ZhGvh8OqI+F7HCEP+I/JnBkKohbXS4N9HZdoZT/bR3JssmwpmelrYJ6aEU5mRPMp09l1JOlpI5lo1mFmHYvDyPXfqzUb6CMCc+b4thv6LQgTMvK8VGdhaFblwu2yD2uQRy9m1L/s20XYYd7xH/twTPQ0ipl4XrwY/pYUbT0DKPmBgNnwc7BV1pSJm674Sg73Xio9J6IW0Z+MyrO+7Li0nZsla39unD8KArhLkZ9iw8F0ZAmbQq+6asEfnO0nx4rIgvIiydYYz8mZnSATfPVNxjysSB9X/DboWv40o5h4+igod/Tj4j02XoaOdkHkauzBWYR5nOOcNSVeZQ0UtLTrR/AuyYFLrkvQn66HikrZMw1SGk5BooW84ukxGh7voOsWUjuBnCIxKHDvylqY1uNKnEm0Na5kiOTjPXR5ql7ixuD3uU9G/55mlZzuGfqeRI5cQb11T6yj0KufpN5vlcHwRHl3TixH2YluUMf5NKXghysgmZHuzzcXoRy6VsYHJt/QXCAZ4A6gkyoMu/jQo9vm9fBWUbqD4shH9LusYp9WxbBo5Q/EzE8Qcom5i2bZemjTelBYnerdq1S8tpvzf4Y3lsUxzXdk+ALfq17ZexZiO4g8q+1cRK0vjblM9I27dKawD8EOl1FgZ006L+TNCZ1J44re03Qb8Ntt/Vkko+7FOh7OoWK/bMdefeoZWjoYx6nvFx+8oO2wdcB98nOmJ9Ie6V+PDQbxz2c9hCZGNwhNrNspU1+hO4FiZDq5uTDls/GGZ869igOK4uUKe67SNuG3SkoUeq9fvdsvp8izuI4zTYBeZClU5Cp559D8GFcCCMh82DXuJukrE+nzV/OewbeOuCbQ4FdahLnUF/u9CLzfMwLuhMw5ZfPNgNp9H4NtgdXOoDkRVUfh/cKX3mloM76u0QdOmA1793wSW7G0yEKTAcBiIOnndzLxvev/OSjkCappVL6hlw9NqN8PoqX4Vt3s/Hp/an6ewz3K/SmhvNDSj86T/otDZp25jU7ly6ksM2RIbADHgFBvJcNTXrOvpCYdOQnHO5vMoOh8Z0sA1cDi9Cq3fSphy1z2fhYsjuxMHWXNhy00JhqbCheWtyJ54Ox8D+0KT0ovwp0NmXcMYjc8DSscOhJxwfRnxHGAfHwQFwBIyEwcgvNNY5HyHxHF6Kox5rHcugHY57xnnPWS8t4lHmIHjEeNyMBXf67WACeJNbDH+Ag+ax5fE1D5YWcd/cVuKkR04t8g94XuILUVeybgAAAABJRU5ErkJggg==')}.x-tab .x-button-icon.home,.x-button .x-button-icon.x-icon-mask.home{-webkit-mask-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAEK0lEQVRoBe2Zy28NURzHe/vwqEepYkFIQzxWaCOC2HhELEgQImhXIrqyIEXikVQi+gdIwx9AItg1NiJELMSGhKQbobY2VY9Srfp8m5lmTO/cOXN7Zu656f0ln8zMnTNnft/z+505j5sbGxurmk5WPZ3ESuu0E1xbigjncrka3jsbftClIvsU5RZ65aLK5Lj/C75SzSjHWCuJYLxqhPXwBgYhylq4sRaixChDP8EzGIJ4UwNnCR6tgFswANegKer93LsLim4herm/JKqO8O+ZRdhL42acOwunYAacg2Hu3ePYj3Ph1A1fU2ySmZSZeCiTjxaC1LAboRs6QGJl8+AKXIU1kLqlHmHEqlFboQv2gD40QdPHqx3qKdtJkD8Hb9o+TzXCXmT1cboB+cT6evTVPgIXeWYl6DoVSy3COF2Hx0rjTthp4L0a/4xXrofn33OeqH8avKMqFcE4O4uXb4ULsNfEEa+M0v00LIIuCKc/P03NrAtGrD5Iiuh10Dia1JTOR0EZsjjpw3HlrQpGbD0v3AzFig36e4CLkeAPNs6tCUbsHBxS+mpsLSayYT2KtLBqVgQjdgFe7QP1u9VWPbRc2ZQFe2LV5zSBWG7ZP+vVTUkwYhvx6DicB+fFqvWKFuyJ1QxJ00It48rCNNgnNi+N23hQaVw2YiU0cYQRq9Q9CJdBKV1q02zMeEaWSDBil1L5JTgBDeCCzcUJ8cXImfACOeqayjbBffgDfqu6cPyJP3dgVZTvwd9jdzuoSFmgicRDGAYXRIZ9+I5fPbA6KC7feUHBVKD5rJZ1EutaZMOiv+HjbWjJJ9T/LVIwDyqyh+ApuC7WFy/RCk4r5HyRwWNewRSW2N3wGv6CX2E5HBWcB9AaFOqfTxJMQa1lNewosqNQDiLDPmqv+hFsgzpfrI7/CeamVjwnQZEtV7G+eEX6MeyHGl/0hGB+1MJdYt+B/1C5H9UdX8J2qJ6IMBfz4Ri8hXIXGfZfmdoLWr5W1zJ7ktg2aId18BuiTHNvDVUumQSNxDikLSdtBzdok0yCD8MyiLNmCqhxXBL9An+egNI3yqRT9z+O92FO/O2UuOMuymoqF06bUl53489MQw21Gm8lWmkRa6R/oVaMfT6lAmrsUVMNRa2HU3I8k2orgjNp5hK+ZLwPp/x+fR+0ONfMp9BfJ+qLmulpyze1zMtC8AACbkI/xAneQZkO0JiZimUheAjPn0MfxAnWVo3RiEG5oiwLwXJsmGFDK5iCxrCnGZNSOzVLra+EPDZ9T6EMCFVZ3KWpI8XV7uBTFcEOBsWqS5UIW21OByurRNjBoFh1qRJhq83pYGWVCDsYFKsuVSJstTkdrGz8L0VTv1i+NVF2CyTJDC0LX7E8HIx7D/Vrb3wDaLvY1D5QsI/6jXZUEwk29cDlckki5bIOY9+mneB/GfbU3e4Ey5kAAAAASUVORK5CYII=')}.x-button.x-button-action,.x-toolbar .x-button.x-button-action,.x-button.x-button-action-round,.x-toolbar .x-button.x-button-action-round,.x-button.x-button-action-small,.x-toolbar .x-button.x-button-action-small{border:1px solid #010509;border-top-color:#021022;color:white}.x-button.x-button-action.x-button-back:before,.x-button.x-button-action.x-button-forward:before,.x-toolbar .x-button.x-button-action.x-button-back:before,.x-toolbar .x-button.x-button-action.x-button-forward:before,.x-button.x-button-action-round.x-button-back:before,.x-button.x-button-action-round.x-button-forward:before,.x-toolbar .x-button.x-button-action-round.x-button-back:before,.x-toolbar .x-button.x-button-action-round.x-button-forward:before,.x-button.x-button-action-small.x-button-back:before,.x-button.x-button-action-small.x-button-forward:before,.x-toolbar .x-button.x-button-action-small.x-button-back:before,.x-toolbar .x-button.x-button-action-small.x-button-forward:before{background:#010509}.x-button.x-button-action,.x-button.x-button-action.x-button-back:after,.x-button.x-button-action.x-button-forward:after,.x-toolbar .x-button.x-button-action,.x-toolbar .x-button.x-button-action.x-button-back:after,.x-toolbar .x-button.x-button-action.x-button-forward:after,.x-button.x-button-action-round,.x-button.x-button-action-round.x-button-back:after,.x-button.x-button-action-round.x-button-forward:after,.x-toolbar .x-button.x-button-action-round,.x-toolbar .x-button.x-button-action-round.x-button-back:after,.x-toolbar .x-button.x-button-action-round.x-button-forward:after,.x-button.x-button-action-small,.x-button.x-button-action-small.x-button-back:after,.x-button.x-button-action-small.x-button-forward:after,.x-toolbar .x-button.x-button-action-small,.x-toolbar .x-button.x-button-action-small.x-button-back:after,.x-toolbar .x-button.x-button-action-small.x-button-forward:after{background-color:#06346a;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #167bf3), color-stop(2%, #07448c), color-stop(100%, #042348));background-image:-webkit-linear-gradient(#167bf3,#07448c 2%,#042348);background-image:linear-gradient(#167bf3,#07448c 2%,#042348)}.x-button.x-button-action .x-button-icon.x-icon-mask,.x-toolbar .x-button.x-button-action .x-button-icon.x-icon-mask,.x-button.x-button-action-round .x-button-icon.x-icon-mask,.x-toolbar .x-button.x-button-action-round .x-button-icon.x-icon-mask,.x-button.x-button-action-small .x-button-icon.x-icon-mask,.x-toolbar .x-button.x-button-action-small .x-button-icon.x-icon-mask{background-color:white;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(2%, #ffffff), color-stop(100%, #ddecfd));background-image:-webkit-linear-gradient(#ffffff,#ffffff 2%,#ddecfd);background-image:linear-gradient(#ffffff,#ffffff 2%,#ddecfd)}.x-button.x-button-action.x-button-pressing,.x-button.x-button-action.x-button-pressing:after,.x-button.x-button-action.x-button-pressed,.x-button.x-button-action.x-button-pressed:after,.x-button.x-button-action.x-button-active,.x-button.x-button-action.x-button-active:after,.x-toolbar .x-button.x-button-action.x-button-pressing,.x-toolbar .x-button.x-button-action.x-button-pressing:after,.x-toolbar .x-button.x-button-action.x-button-pressed,.x-toolbar .x-button.x-button-action.x-button-pressed:after,.x-toolbar .x-button.x-button-action.x-button-active,.x-toolbar .x-button.x-button-action.x-button-active:after,.x-button.x-button-action-round.x-button-pressing,.x-button.x-button-action-round.x-button-pressing:after,.x-button.x-button-action-round.x-button-pressed,.x-button.x-button-action-round.x-button-pressed:after,.x-button.x-button-action-round.x-button-active,.x-button.x-button-action-round.x-button-active:after,.x-toolbar .x-button.x-button-action-round.x-button-pressing,.x-toolbar .x-button.x-button-action-round.x-button-pressing:after,.x-toolbar .x-button.x-button-action-round.x-button-pressed,.x-toolbar .x-button.x-button-action-round.x-button-pressed:after,.x-toolbar .x-button.x-button-action-round.x-button-active,.x-toolbar .x-button.x-button-action-round.x-button-active:after,.x-button.x-button-action-small.x-button-pressing,.x-button.x-button-action-small.x-button-pressing:after,.x-button.x-button-action-small.x-button-pressed,.x-button.x-button-action-small.x-button-pressed:after,.x-button.x-button-action-small.x-button-active,.x-button.x-button-action-small.x-button-active:after,.x-toolbar .x-button.x-button-action-small.x-button-pressing,.x-toolbar .x-button.x-button-action-small.x-button-pressing:after,.x-toolbar .x-button.x-button-action-small.x-button-pressed,.x-toolbar .x-button.x-button-action-small.x-button-pressed:after,.x-toolbar .x-button.x-button-action-small.x-button-active,.x-toolbar .x-button.x-button-action-small.x-button-active:after{background-color:#052d5c;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #02152b), color-stop(10%, #042144), color-stop(65%, #052d5c), color-stop(100%, #052e5e));background-image:-webkit-linear-gradient(#02152b,#042144 10%,#052d5c 65%,#052e5e);background-image:linear-gradient(#02152b,#042144 10%,#052d5c 65%,#052e5e)}.x-button.x-button-confirm,.x-toolbar .x-button.x-button-confirm,.x-button.x-button-confirm-round,.x-toolbar .x-button.x-button-confirm-round,.x-button.x-button-confirm-small,.x-toolbar .x-button.x-button-confirm-small{border:1px solid #263501;border-top-color:#374e02;color:white}.x-button.x-button-confirm.x-button-back:before,.x-button.x-button-confirm.x-button-forward:before,.x-toolbar .x-button.x-button-confirm.x-button-back:before,.x-toolbar .x-button.x-button-confirm.x-button-forward:before,.x-button.x-button-confirm-round.x-button-back:before,.x-button.x-button-confirm-round.x-button-forward:before,.x-toolbar .x-button.x-button-confirm-round.x-button-back:before,.x-toolbar .x-button.x-button-confirm-round.x-button-forward:before,.x-button.x-button-confirm-small.x-button-back:before,.x-button.x-button-confirm-small.x-button-forward:before,.x-toolbar .x-button.x-button-confirm-small.x-button-back:before,.x-toolbar .x-button.x-button-confirm-small.x-button-forward:before{background:#263501}.x-button.x-button-confirm,.x-button.x-button-confirm.x-button-back:after,.x-button.x-button-confirm.x-button-forward:after,.x-toolbar .x-button.x-button-confirm,.x-toolbar .x-button.x-button-confirm.x-button-back:after,.x-toolbar .x-button.x-button-confirm.x-button-forward:after,.x-button.x-button-confirm-round,.x-button.x-button-confirm-round.x-button-back:after,.x-button.x-button-confirm-round.x-button-forward:after,.x-toolbar .x-button.x-button-confirm-round,.x-toolbar .x-button.x-button-confirm-round.x-button-back:after,.x-toolbar .x-button.x-button-confirm-round.x-button-forward:after,.x-button.x-button-confirm-small,.x-button.x-button-confirm-small.x-button-back:after,.x-button.x-button-confirm-small.x-button-forward:after,.x-toolbar .x-button.x-button-confirm-small,.x-toolbar .x-button.x-button-confirm-small.x-button-back:after,.x-toolbar .x-button.x-button-confirm-small.x-button-forward:after{background-color:#6c9804;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #c2fa3b), color-stop(2%, #85bb05), color-stop(100%, #547503));background-image:-webkit-linear-gradient(#c2fa3b,#85bb05 2%,#547503);background-image:linear-gradient(#c2fa3b,#85bb05 2%,#547503)}.x-button.x-button-confirm .x-button-icon.x-icon-mask,.x-toolbar .x-button.x-button-confirm .x-button-icon.x-icon-mask,.x-button.x-button-confirm-round .x-button-icon.x-icon-mask,.x-toolbar .x-button.x-button-confirm-round .x-button-icon.x-icon-mask,.x-button.x-button-confirm-small .x-button-icon.x-icon-mask,.x-toolbar .x-button.x-button-confirm-small .x-button-icon.x-icon-mask{background-color:white;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(2%, #ffffff), color-stop(100%, #f4fedc));background-image:-webkit-linear-gradient(#ffffff,#ffffff 2%,#f4fedc);background-image:linear-gradient(#ffffff,#ffffff 2%,#f4fedc)}.x-button.x-button-confirm.x-button-pressing,.x-button.x-button-confirm.x-button-pressing:after,.x-button.x-button-confirm.x-button-pressed,.x-button.x-button-confirm.x-button-pressed:after,.x-button.x-button-confirm.x-button-active,.x-button.x-button-confirm.x-button-active:after,.x-toolbar .x-button.x-button-confirm.x-button-pressing,.x-toolbar .x-button.x-button-confirm.x-button-pressing:after,.x-toolbar .x-button.x-button-confirm.x-button-pressed,.x-toolbar .x-button.x-button-confirm.x-button-pressed:after,.x-toolbar .x-button.x-button-confirm.x-button-active,.x-toolbar .x-button.x-button-confirm.x-button-active:after,.x-button.x-button-confirm-round.x-button-pressing,.x-button.x-button-confirm-round.x-button-pressing:after,.x-button.x-button-confirm-round.x-button-pressed,.x-button.x-button-confirm-round.x-button-pressed:after,.x-button.x-button-confirm-round.x-button-active,.x-button.x-button-confirm-round.x-button-active:after,.x-toolbar .x-button.x-button-confirm-round.x-button-pressing,.x-toolbar .x-button.x-button-confirm-round.x-button-pressing:after,.x-toolbar .x-button.x-button-confirm-round.x-button-pressed,.x-toolbar .x-button.x-button-confirm-round.x-button-pressed:after,.x-toolbar .x-button.x-button-confirm-round.x-button-active,.x-toolbar .x-button.x-button-confirm-round.x-button-active:after,.x-button.x-button-confirm-small.x-button-pressing,.x-button.x-button-confirm-small.x-button-pressing:after,.x-button.x-button-confirm-small.x-button-pressed,.x-button.x-button-confirm-small.x-button-pressed:after,.x-button.x-button-confirm-small.x-button-active,.x-button.x-button-confirm-small.x-button-active:after,.x-toolbar .x-button.x-button-confirm-small.x-button-pressing,.x-toolbar .x-button.x-button-confirm-small.x-button-pressing:after,.x-toolbar .x-button.x-button-confirm-small.x-button-pressed,.x-toolbar .x-button.x-button-confirm-small.x-button-pressed:after,.x-toolbar .x-button.x-button-confirm-small.x-button-active,.x-toolbar .x-button.x-button-confirm-small.x-button-active:after{background-color:#628904;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #3e5702), color-stop(10%, #507003), color-stop(65%, #628904), color-stop(100%, #648c04));background-image:-webkit-linear-gradient(#3e5702,#507003 10%,#628904 65%,#648c04);background-image:linear-gradient(#3e5702,#507003 10%,#628904 65%,#648c04)}.x-button.x-button-decline,.x-toolbar .x-button.x-button-decline,.x-button.x-button-decline-round,.x-toolbar .x-button.x-button-decline-round,.x-button.x-button-decline-small,.x-toolbar .x-button.x-button-decline-small{border:1px solid #630303;border-top-color:#7c0303;color:white}.x-button.x-button-decline.x-button-back:before,.x-button.x-button-decline.x-button-forward:before,.x-toolbar .x-button.x-button-decline.x-button-back:before,.x-toolbar .x-button.x-button-decline.x-button-forward:before,.x-button.x-button-decline-round.x-button-back:before,.x-button.x-button-decline-round.x-button-forward:before,.x-toolbar .x-button.x-button-decline-round.x-button-back:before,.x-toolbar .x-button.x-button-decline-round.x-button-forward:before,.x-button.x-button-decline-small.x-button-back:before,.x-button.x-button-decline-small.x-button-forward:before,.x-toolbar .x-button.x-button-decline-small.x-button-back:before,.x-toolbar .x-button.x-button-decline-small.x-button-forward:before{background:#630303}.x-button.x-button-decline,.x-button.x-button-decline.x-button-back:after,.x-button.x-button-decline.x-button-forward:after,.x-toolbar .x-button.x-button-decline,.x-toolbar .x-button.x-button-decline.x-button-back:after,.x-toolbar .x-button.x-button-decline.x-button-forward:after,.x-button.x-button-decline-round,.x-button.x-button-decline-round.x-button-back:after,.x-button.x-button-decline-round.x-button-forward:after,.x-toolbar .x-button.x-button-decline-round,.x-toolbar .x-button.x-button-decline-round.x-button-back:after,.x-toolbar .x-button.x-button-decline-round.x-button-forward:after,.x-button.x-button-decline-small,.x-button.x-button-decline-small.x-button-back:after,.x-button.x-button-decline-small.x-button-forward:after,.x-toolbar .x-button.x-button-decline-small,.x-toolbar .x-button.x-button-decline-small.x-button-back:after,.x-toolbar .x-button.x-button-decline-small.x-button-forward:after{background-color:#c70505;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #fb6a6a), color-stop(2%, #ea0606), color-stop(100%, #a40404));background-image:-webkit-linear-gradient(#fb6a6a,#ea0606 2%,#a40404);background-image:linear-gradient(#fb6a6a,#ea0606 2%,#a40404)}.x-button.x-button-decline .x-button-icon.x-icon-mask,.x-toolbar .x-button.x-button-decline .x-button-icon.x-icon-mask,.x-button.x-button-decline-round .x-button-icon.x-icon-mask,.x-toolbar .x-button.x-button-decline-round .x-button-icon.x-icon-mask,.x-button.x-button-decline-small .x-button-icon.x-icon-mask,.x-toolbar .x-button.x-button-decline-small .x-button-icon.x-icon-mask{background-color:white;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(2%, #ffffff), color-stop(100%, #fedcdc));background-image:-webkit-linear-gradient(#ffffff,#ffffff 2%,#fedcdc);background-image:linear-gradient(#ffffff,#ffffff 2%,#fedcdc)}.x-button.x-button-decline.x-button-pressing,.x-button.x-button-decline.x-button-pressing:after,.x-button.x-button-decline.x-button-pressed,.x-button.x-button-decline.x-button-pressed:after,.x-button.x-button-decline.x-button-active,.x-button.x-button-decline.x-button-active:after,.x-toolbar .x-button.x-button-decline.x-button-pressing,.x-toolbar .x-button.x-button-decline.x-button-pressing:after,.x-toolbar .x-button.x-button-decline.x-button-pressed,.x-toolbar .x-button.x-button-decline.x-button-pressed:after,.x-toolbar .x-button.x-button-decline.x-button-active,.x-toolbar .x-button.x-button-decline.x-button-active:after,.x-button.x-button-decline-round.x-button-pressing,.x-button.x-button-decline-round.x-button-pressing:after,.x-button.x-button-decline-round.x-button-pressed,.x-button.x-button-decline-round.x-button-pressed:after,.x-button.x-button-decline-round.x-button-active,.x-button.x-button-decline-round.x-button-active:after,.x-toolbar .x-button.x-button-decline-round.x-button-pressing,.x-toolbar .x-button.x-button-decline-round.x-button-pressing:after,.x-toolbar .x-button.x-button-decline-round.x-button-pressed,.x-toolbar .x-button.x-button-decline-round.x-button-pressed:after,.x-toolbar .x-button.x-button-decline-round.x-button-active,.x-toolbar .x-button.x-button-decline-round.x-button-active:after,.x-button.x-button-decline-small.x-button-pressing,.x-button.x-button-decline-small.x-button-pressing:after,.x-button.x-button-decline-small.x-button-pressed,.x-button.x-button-decline-small.x-button-pressed:after,.x-button.x-button-decline-small.x-button-active,.x-button.x-button-decline-small.x-button-active:after,.x-toolbar .x-button.x-button-decline-small.x-button-pressing,.x-toolbar .x-button.x-button-decline-small.x-button-pressing:after,.x-toolbar .x-button.x-button-decline-small.x-button-pressed,.x-toolbar .x-button.x-button-decline-small.x-button-pressed:after,.x-toolbar .x-button.x-button-decline-small.x-button-active,.x-toolbar .x-button.x-button-decline-small.x-button-active:after{background-color:#b80505;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #860303), color-stop(10%, #9f0404), color-stop(65%, #b80505), color-stop(100%, #ba0505));background-image:-webkit-linear-gradient(#860303,#9f0404 10%,#b80505 65%,#ba0505);background-image:linear-gradient(#860303,#9f0404 10%,#b80505 65%,#ba0505)}.x-sheet,.x-sheet-action{padding:0.7em;border-top:1px solid #030507;height:auto;background-color:rgba(0, 0, 0, 0.9);background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, rgba(50,74,103,0.9)), color-stop(2%, rgba(12,17,24,0.9)), color-stop(100%, rgba(0,0,0,0.9)));background-image:-webkit-linear-gradient(rgba(50,74,103,0.9),rgba(12,17,24,0.9) 2%,rgba(0,0,0,0.9));background-image:linear-gradient(rgba(50,74,103,0.9),rgba(12,17,24,0.9) 2%,rgba(0,0,0,0.9));-webkit-border-radius:0;border-radius:0}.x-sheet-inner > .x-button,.x-sheet-action-inner > .x-button{margin-bottom:0.5em}.x-sheet-inner > .x-button:last-child,.x-sheet-action-inner > .x-button:last-child{margin-bottom:0}.x-sheet.x-picker{padding:0}.x-sheet.x-picker .x-sheet-inner{position:relative;background-color:#fff;-webkit-border-radius:0.4em;border-radius:0.4em;-webkit-background-clip:padding;background-clip:padding-box;overflow:hidden;margin:0.7em}.x-sheet.x-picker .x-sheet-inner:before,.x-sheet.x-picker .x-sheet-inner:after{z-index:1;content:"";position:absolute;width:100%;height:30%;top:0;left:0}.x-sheet.x-picker .x-sheet-inner:before{top:auto;-webkit-border-bottom-left-radius:0.4em;border-bottom-left-radius:0.4em;-webkit-border-bottom-right-radius:0.4em;border-bottom-right-radius:0.4em;bottom:0;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(100%, #bbbbbb));background-image:-webkit-linear-gradient(#ffffff,#bbbbbb);background-image:linear-gradient(#ffffff,#bbbbbb)}.x-sheet.x-picker .x-sheet-inner:after{-webkit-border-top-left-radius:0.4em;border-top-left-radius:0.4em;-webkit-border-top-right-radius:0.4em;border-top-right-radius:0.4em;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #bbbbbb), color-stop(100%, #ffffff));background-image:-webkit-linear-gradient(#bbbbbb,#ffffff);background-image:linear-gradient(#bbbbbb,#ffffff)}.x-sheet.x-picker .x-sheet-inner .x-picker-slot .x-body{border-left:1px solid #999999;border-right:1px solid #ACACAC}.x-sheet.x-picker .x-sheet-inner .x-picker-slot:first-child .x-body{border-left:0}.x-sheet.x-picker .x-sheet-inner .x-picker-slot:last-child .x-body{border-left:0;border-right:0}.x-picker-slot .x-scroll-view{z-index:2;position:relative;-webkit-box-shadow:rgba(0, 0, 0, 0.4) -1px 0 1px}.x-picker-slot .x-scroll-view:first-child{-webkit-box-shadow:none}.x-picker-mask{position:absolute;top:0;left:0;right:0;bottom:0;z-index:3;display:-webkit-box;display:box;-webkit-box-align:stretch;box-align:stretch;-webkit-box-orient:vertical;box-orient:vertical;-webkit-box-pack:center;box-pack:center;pointer-events:none}.x-picker-bar{border-top:0.12em solid #06346a;border-bottom:0.12em solid #06346a;height:2.5em;background-color:rgba(13, 117, 242, 0.3);background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, rgba(158,200,250,0.3)), color-stop(2%, rgba(47,137,244,0.3)), color-stop(100%, rgba(11,101,208,0.3)));background-image:-webkit-linear-gradient(rgba(158,200,250,0.3),rgba(47,137,244,0.3) 2%,rgba(11,101,208,0.3));background-image:linear-gradient(rgba(158,200,250,0.3),rgba(47,137,244,0.3) 2%,rgba(11,101,208,0.3));-webkit-box-shadow:rgba(0, 0, 0, 0.2) 0 0.2em 0.2em}.x-use-titles .x-picker-bar{margin-top:1.5em}.x-picker-slot-title{height:1.5em;position:relative;z-index:2;background-color:#345b89;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #85a7d1), color-stop(2%, #3e6ca3), color-stop(100%, #2a496f));background-image:-webkit-linear-gradient(#85a7d1,#3e6ca3 2%,#2a496f);background-image:linear-gradient(#85a7d1,#3e6ca3 2%,#2a496f);border-top:1px solid #345b89;border-bottom:1px solid #182a3f;-webkit-box-shadow:0px 0.1em 0.3em rgba(0, 0, 0, 0.3);padding:0.2em 1.02em}.x-picker-slot-title > div{font-weight:bold;font-size:0.8em;color:#0d1116;text-shadow:rgba(255, 255, 255, 0.25) 0 0.08em 0}.x-picker-slot .x-dataview-inner{width:100%}.x-picker-slot .x-dataview-item{vertical-align:middle;height:2.5em;line-height:2.5em;font-weight:bold;padding:0 10px}.x-picker-slot .x-picker-item{white-space:nowrap;overflow:hidden;text-overflow:ellipsis}.x-picker-right{text-align:right}.x-picker-center{text-align:center}.x-picker-left{text-align:left}.x-tabbar.x-docked-top{border-bottom:.1em solid;height:2.6em;padding:0 .8em}.x-tabbar.x-docked-top .x-tab{padding:0.4em 0.8em;height:1.8em;-webkit-border-radius:0.9em;border-radius:0.9em}.x-tabbar.x-docked-top .x-button-label,.x-tabbar.x-docked-top .x-hasbadge .x-badge,.x-hasbadge .x-tabbar.x-docked-top .x-badge{font-size:.8em;line-height:1.2em;text-rendering:optimizeLegibility;-webkit-font-smoothing:antialiased}.x-tabbar.x-docked-bottom{border-top:.1em solid;height:3em;padding:0}.x-tabbar.x-docked-bottom .x-tab{-webkit-border-radius:0.25em;border-radius:0.25em;min-width:3.3em;position:relative;padding-top:.2em}.x-tabbar.x-docked-bottom .x-tab .x-button-icon{-webkit-mask-size:1.65em;width:1.65em;height:1.65em;display:block;margin:0 auto;position:relative}.x-tabbar.x-docked-bottom .x-tab .x-button-label,.x-tabbar.x-docked-bottom .x-tab .x-hasbadge .x-badge,.x-hasbadge .x-tabbar.x-docked-bottom .x-tab .x-badge{margin:0;padding:.1em 0 .2em 0;font-size:9px;line-height:12px;text-rendering:optimizeLegibility;-webkit-font-smoothing:antialiased}.x-tab .x-button-icon.bookmarks,.x-button .x-button-icon.x-icon-mask.bookmarks{-webkit-mask-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAHC0lEQVRoBe2aW4hVVRiAx8t4qXFMvGZGeLcblUVWdJEoiTIhI9KoHiIyKyh6SOvBh166vPTQQ2IXkKyIktIyLQzLUoMkSbKoVEwtK2+VZWrl9H3bs4Y1e/a5eDxzDsycHz7X2muv9f/r//+11p6zt91aWloaupJ070rO6mvd4c6e8XqGO3uGe5biYDck188y1LOGeuS3Hvs8AVrrWZ0LtUU27VbIbrCRlMVsluQwBptgHEyHS+BcGAxBDlLZCOvhY/gQ/oD/oFxxuw2Fy2AKTIIJ0AuUf2EbrIF18A7shcOQX0xCPhh1KsyEVWAES+U7+j4Co/PpLtTOOB2bA7uhVJu/0fdZmFRQd9ZNBvWB6+AjKNVgVr+vGX8fNEO3LFuhzftgRu+HrZClr5S2fYydC8Ohe9AfynbZpdPJ8CTsgSwDLiWXjcs4cIj6P3AUssYsoH0kZDptO4yHFZA13rYjoJ1g8+9cWz6bn3D/UmjjdDIBGhPhoOhL5WmYBY1J47F/gkGNfAEb4Ptjt5J9ehp19/XF4N7uDToRxL28Gu4m0mavVXKH02ganoGprTeOVXTG4Bp8HdgEv4L7WxsT4WoYlLvuQRmLc50Nn2NXHwhnbg9T9QDTWTMYR9nM7YTH4WzoDy55HQp4kPQDHX8AvgEzEuuxvhD6BZu5OZxO23JIZ8rxHkj3wDBoApMQbOq0q3E43AKr4U9I61lP25hgM3GYBpVMASMZT/IvrpdCwYMgKAsl/UfAc+CKiPUZPAPXI+esWZqf6mP//eD4gUFnsZK+JuEx2AGxTesvQHNiM2fYCfooiTsaYU+9IcWMZd1nnBl4Anw8xXpdkpPB+zMgvaJ09mHI3O9ZtuI2xt0EuyC2adZd2tpM9oKHVNzBTLwKJ8XKyqmjw1PXgybWv5LrK+CrVPsBrm8rx048Bh3T4KeUbgM9CZI9kI7Il7SPjZWUW0ePS+098OAKTptF92ccCIP8FPQs11YYhw4zOQ888IJNy9eh4cZUo0tsdhhciRJ90+GXlJ14ItYN8qhK2FMH0gye7LGdI0aiF8RipN+IGypQfxcdnxXQo81lTHRrgT7HdQtdnh2LUoMadTgJR3TDa5daxQTjHoBvgqd+lvjYW5Z14wTb2vmRnFoZSn1MVVqWoNBHRloMsEtvXfpGBa7b+ZHP4QrYaqsit8QWt21Nrn7n35e576Ojw6VqDuc8WUuZdsy95oldFam2w+7ltBwlu/5FVhWptsPt9lRVvIyMVNvhyHRtqnWHaxP36lmtZ7h6sa6NpXqGaxP36lmtZ7h6sa6NpXqGaxP36lntchn25XtJkvtC0JfOvhLyxVz8Q8Af8f4SksP8+vGVTUUk9zVEm841/TrKn5q+qNNmSb+4ijqMwQEoHA5nwjlwBoyHeHX4RnI7+PbzW8b4iWMHk/iZ8riF8QZUm+PgPBgDg8EvELEc4sL3YNsYs4FyC+zCrm9FMyWfw4dQ0MSIa+F6uAb6gxH2c0c60jQl35XMrFl2Ip+iYznlKibgpIoK/Z3PRXADTIFRoPPa9F4PiMWV5Qcz7WrTd2YfoOctSl8ZOZd24itUBwZcGnfB27AbVOLSCfdLLZ3APlgLD0JvmAzx+2l1bSEgFMmHsYWUm8G3IOkvEqXadb6+dPcD+SuQHpe8M44bde5HcMJxe1y3T0AHCgXE6DsBjT8EaUd20nYnuA0MdiFd3tNeMZvO1b3tx7V43i0ePGY4/XLNTvGhxGWDX9j3ghnbAlvBfhofASPB5egydN93h1gMoJkbEjdSNwDqHQTpJWsAfMm3AQyIifDaubmtxsBYuBAc3wwFxX2RJbGzLmv3w4uwHpy4WZMg6hH323i4AybDaAjiPUmL44amGn2fvBH8ILAEDJQZMzhmWXGOjTk8b66EaXA5DIO8YobbpD26XkHdyRu9Xu61YtBPB8ywE1gE+yGf/qz2TfR/FAxWUzF74T59DeZAmAFrIEu3be32sI1Ocg64RMr6uMU4l7TP7anwA+SbQGg3c/NhApQU3OBsXDLWgJvhueAqDPpD2c5h9+pM6BMrKreOHidwFbgHg9F0qbMvgSuprO/C6fmhx6fCLNgDsb02Duvs7dCYVnAi1+jzMDofXK6x8VB/nvZTTsRG1lh0erDNBvd/sNXqsI33QkWdDRNBr0vc88KgBuOWK2Fw6FfpEt06vQB8mmiv4eZc5X3KAZU2GOtDv8t7HriENe7z+YK4T0fUsXEW+GhLHL6VymaY2BHG0jqx0w9eA4273Nr8P6p0/0pcawOmwEEj7jNvPoo9VDpcsHOAv3VdYp7gS7k22x0qORv+jb3Yh/co2E+jj6KqCIZ93PnM3I5d91ZVBLtjdVj8gyJZ39WwjOHEZi3stvmvh9VwttY23MxdSuoOd/Z01zPc2TP8PxKYOEKWmL1pAAAAAElFTkSuQmCC')}.x-tab .x-button-icon.download,.x-button .x-button-icon.x-icon-mask.download{-webkit-mask-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAGb0lEQVRoBd2aX4gVVRzH3V1dU5JMk9Q2wVxCo0QNTYRYS4l6CBFBomA1qjcjSOgPPUgR0VNBFBT0Bx96qAiSXipCH4rKIhGNUqE2SK3MqKwsLbXPZ7rnMo73jnPnzF6v9wefPefMnPP7/b7z58yZudtz6tSpMaNlPT09E/DdDxPhMpgNJyBtfTRG4AAchePk9BflqFhP1YIRqbCZsACWwjWwGIrYZ3TaDZ/ATjhIfh6IyqwywQhdRlaLYBVcB5Mgxn5n8HbYAjsQ/lGMs/pYz3AMOFLgG/AzeH+MBvo2xqqYXB1bSiyBe2EJvAaH4SSMhtC0T2MYy5jG7i0jvmXBBJoMj4D3VjuEpkVbN6axzWFyq6JbEkyAhfAqOJtmE2l32xzMZWErogsLxvE62As+Vtotrlk8czGndUVFFxKMw41wEM7FJdxMbNhuTua2sYjoXME4cVHwEDhZhACdWpqjufblCW8qmIHOxHfCT9CpIrN5mas5N53B8wS7kPgKOumezQrMts3VnJc1O8sNV1qsmq5k0LNwI3hZx9ovONgEPk4amcvRR+HiRjtb3KborbAB0fvOGJs9EnRwwf88HIHsESzbVuisbKzQdh/Yp6z/7DhzV8OEECOU3qd148z20FgDK+DC+o74in59Y2pm7rNPVWbualhT01T3e5pgts6D9eARrzIB3LXVzF0N60FNdasL5kj0sXUtzIf+eo/zt6IGtaytaUuU1AXTugKuhyomjsR5B/xRi5rUllgimCMwltYQzAHr3WJqUdNQTWOyuFDcpbASptnoMlOT2tQ4phfl3uBzwes9byZl93lpalLbXLV6SXtzr4BuPLvISkxtauxX8DjwW5Qv9t1qalPjOAX7vJoB3TRZIec0U5saZyl4ELr57CIvMTUOKngAqlxGJt478I8aBxQ8Hbpxds4eczVOV/BUuCC7twvbapyq4Ha8JPQVOIBF+hRwk9slWVLm9miy8xjbj0PRA/YHfU828eVm99mnyFziu6/9XT+Mh5as7KPIoE/BB/BPgYgeoP05/dx3OxQR4LrBF4IHoWUrK9j7wZeNzXxJGGk5amYAPvyovj2zuWGT1eEcdjwOpeYdL8mytpyBr5BAW5akroOxy4n5MiyFUqZg78W8+yvPsZfWEyQy3WzyOsbsq/n2Q9+TYMwypsbjCj4EXlJlzPHDcD/48W+0TN8PgF9kyh5YNR4y4e/AGbKsOVveC8OcCSeUSg2fir0H7oayc445qVGtY5bBHnDmjeFXxt8GY8Mn0dhSX+Ds/RvE5OZYNao1eQ/+kNJrPNapoocg9/edIgdCH3AL6DM2L7WpcZqXtKd6L/wJsXYRDl6ABVyK+i5ltbGLGfw06DPW1KbG5NY1MS+bbyD2SIbxO/G1HFo+046BG+ALCP5iS7WpsTf5MY3KPPgYTkCs8zD+XXzNLHL5hj70dwb2WbsNgp/YUk1qm2ecINh/MXoMfoTYAGG8gV6ES4Kgs5X2hZegivkk5KEmtU2qC04q/082u9gROlZRmvgmSH6lzBNMHx9pJlZF3LQPNQ2F2PXfh9noEvF18AGdHhBb/xd/d4SAzUr63AX2jY2XHq8WNU0LceuC3YCtBiecqgP7HF0XgmZL9m2AI5BONrauBrWsTsfLCnbV9AxU8ezLJnwAv2vSwa27DX6AbP/YthrU0p+OeZrgWgLO2FvB99zYoNnx+/B5dUiA+kL4FrL9YtvmroZkZg7xEn3pRqjTcRhGIDZwo/E+rpyNZ4D1Rn1it43gdzjoSZdnnGF3Yq5h74Oq76sg5D18b4PQrrI0Z3NvuKZvKLgmegqDNkPVs3aV4rK+zNWcp6TParreVHBN9ACDt8DfkHXeaW1zNNeBtMBsPVdwTfQgTt6CThZtbuY4mBWYbZ9VcEr0mx0qWrHmdlaxiZbsEWjWxuFkeBhcm7pkPNeXtDmYizkV/r/pQmc4HAQc+934ZtgBVa/GWjmAxjYHcxkf8itStiQ4OCTIbHgO9kM7z7axjGns2SGfVspSgkMAgq4EZ0b/i3U0hevbGMZaGeKXKRv+cylOCxufY/xCcS3cCl5ii6AXqjCFeum+A2/D54j0Pbu0RQsOkRHu+6zP7avgJvDsz4VWxStyD7wPrsi+hP0ILfIbFl3zrTLB6TCId3KbCK6X58MSmAOuocW69jUcrmH9U9gF38NRRB6jrNT+AwkLDdxcvfCRAAAAAElFTkSuQmCC')}.x-tab .x-button-icon.favorites,.x-button .x-button-icon.x-icon-mask.favorites{-webkit-mask-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAFfUlEQVRoBd2aXahVRRTHz/Ujv+2mZRGZB7W6mtpFikC7+UWUZiqBD0JPFdRL1EMFPfjoU4baS0FUD/UWZBEVShA+BCpmWApRSkgllNpDmZWZt9//eOay72afvWfWOTPn3rvgz8yeWbPW+s/XmT379AwODtZSSQ+CryVgA/gVfIx/pelEhFMBVlvBOaBeFo6Cean8y09KsnMg932TqCOs9M2UhMfhMJVsxtHcAmcbmekLCsqjFKUkvAYG1xSwmEHZqoLyKEVJCDOCNxH9HUCbVl6mULAuXxjrOQlhgl8Bbi0h0Uen3FBS37GqVIQHiHh2SdR16jTlo0t0woycpuxiUDSdHcFeMv3uIWYanTDB3wIWVZBQHP10zuQKvbarUxDWT1HRz1E++Ds99fLtgp6jEmbExhPNcs+IbkZPiCpRCRP5TPCQJ4MJ6A3QSUqjSWzC2ozuC4j+fnSnB+gHq8YmvJKIJgVEpRPX9QH6waqxCa8PjEhHT981H2j6qno0wqzF63BhOUxsom3Zb7aJqGsUjTAONFJlpysXQz7VuXpavrBTzzEJaz1adlzNjHs6RTBvJyZhjZTF/kTaWZZCnlvhsyWgQkPZQpagzsX1bFlAXjGtDdAPUu1p3PPQhCCXkdwG/mta0PWLds060AuAnqtEOjpdbQR3VymX1P9F3UfgGJA9X9F92c/ADaQ2P8V0DJ4/kDbeYKaSvgI2AN0+OGJK1VAbSIhTOXEOybYll2kte77yD4rqrHyb85S9Cl4HtReAyI11/A7HpRq5PSD6oR0f3Rad+H7S1DvV7UgS+tc1cU3n3V/AWJ/SX8BxVuMinow2rNNjlPQVeH0GFg378kDBfLAPXARjZbTPwmUXmOG+bgz71EKFfqKeAUWfREZbJxyCxyOOqEuHER4qrNUWovwy0CFktBHV4eNZMNvxyaaFhKWAaBt/HJwEo4W0luSKLMF8viVhp4iBeeBd8CcYqcQ1qi+CKS7uVmklYdcQY0+C42Ckkf6EmO51cVal3oRlCFkCdKgfCWtbo7obDO3AVWQbHHyUsjo40E6uq9cvQbdG+wN892fj8s0HjXDWKA51/t4JUo72H/jTDtybjSUkbyYsJ0gdfAtSjfTn+JoWQjCv2+57a4M1QaQSvZvrMsIs7RJejGcdUlLJUhzpZsYsZsJcCen6ZwCE3IaYA2021OfUdU3fJltmwni7Fvh+KDMF16KR3ux0lWuSdgjPxeNdJq/tNdKNqJaSSUyEmVK6JNPomtqbIh3eSKNsEmvAarfJ5LEzjbbR59MtpqyEb8eZjpndkhtxvNri3Er4YZxpx+yW6Jdhi8V5MOHm+n0QZ9afo0u0fQO8A5S3iPaQ1cTSG9w4f/SqesZBH/gRWI6T+gyyxfkgvw2cMdrS+/lTzpZvGnyWxsnTwHLRd4R2a/OBqQyoztKBe/P2qp6DCBOUptKHhuA+pU1fq2Co0/F0L9CVaghxXTbWW9ktKg8lrFfCrwODeh/9wgu1bEDo6OT2Fvgb+JLWq+nQEsnaa5UPJbwKBxc8A9KXPG1O3u+u6E4F24GvD3XMDjCxFcF8uTdhjGpHfwn49L42lCeAdyDZwGi3HpwAPr6+Q29htn1ZPoSwfuz3ewShXVcBNz62lzkvq6O9DjZHgQ9p72kdQljvob9VBPAN9Q+UEQmpw5b+Sf8e0FotI/4a9ZN8bIcQXlnh9AD1y3ychuhgU0tpJyhb14epn+ljN+Sk9S9G1ct50d8SdgF9x9EO3lHB5hXwPEYfA8dbGD9LuWZBtfj0inSQWUDTKzu1dAB5Dkz2tdOOHn70LvwVyMag/FYwzse295Rukq5j+G1wEOib66PAy5FPMD46+NPmqTV7CpwGGvkJPm2l8z8GWDNDloqpGQAAAABJRU5ErkJggg==')}.x-tab .x-button-icon.info,.x-button .x-button-icon.x-icon-mask.info{-webkit-mask-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAHOElEQVRoBdWbXYgVZRjHXdf8ysjUQl011lbRIFEjM6Uu0iyiEDG86EItKoIuuhDJCgoioouugqKbgi4CKwulILG0mxLTUtMyTWQNPzLTPszU1cx+v+OZw9nZM3POmZl3zQd+zMz7zvs8z//MvF+z2nLhwoU+oaylpWUQvvvDYGiDdjgP1dbKRSccglNwlpxOcwxiLUULRqTCRsNUmAk3wS3QiG3hpp2wCbbDYfLzhyjMChOM0FlkNR3mw61wFeSxv2j8FayBrQjfmMdZpa1POA84UuD7cBzsHyHQtzHm58nVtpnEErgvzIB34Rj8CyGEVvs0hrGMaey+WcQ3LZhAQ+FZsG/1htBq0Z4b09jmMLRZ0U0JJsA0eAccTeOJ9Pa1OZjLtGZENywYx0tgDzit9La4pHjmYk5LGhXdkGAcLoPDcCle4SSxUbk5mduyRkSnCsaJi4IV4GARBSj6eALfR8sxunLEMUdzbU0TniiYho7ED8GvULRI/UV9cDbnrsauheXQCVnjmas5J47gaYJdSPwAIfqsPlfEnwRl/eBBOAlZROvXnGfFfUfXNQXTYCKsg38gS+B6bT6MEogfiTcKNuaIa87mPjHu2+segrnRBf8bYN+ql3jW+ntrJVNK6OJGw+VkVt+2M3c1DIrHsZ9WjPVwCxcLYQ4MqVQUf/Jjikt3VnnX4eauhoVlTZVw3QRTOhmWwjhQfCi7ppZjkjOf62FCrfomysxdDUtBTRWrCCZYK6WLYAo4aoa0JxKcu2x9CsYk1DdTrAa1LCpru9g2ese58lddD+cgT/9ppK2j8ONR7HLf9Um8B0XOCmpR04QoVmnQosDp4BHYD40kXMQ9zsPfgSI/hyNQhN+4j/34VVu/0g9b/nXbKFgJf0O8weV+rSa1tam1b3kUm0SB77sj5KUw18OhTE1qm6RWBy07t0O4S7veto8J6FLwbng+YHC1qbE0GDtnrYXeGKzsHj7NT2AejKgMJn36DODaASZEF1KbGof4hJ2vXM45cIW2nwjwKDyA0HXgDicyl4RpC5LovixHtalxnCcd4PwX0hTjcvEFRO5ICBRyoWNINXYo2Ek+5DJyP/6fgZWI9XVNs3r1aW3r1alxjIJHQqjR+Vt8L0fnpxzrmU+45pKzXsMG69U4UsHDYWCDjRq9zYFpCzwGLi5K5qyA+KQpSMHt5VtDHNQ4XMEh+s5R/L4CuxSIUKeDO8BX1pG4lrlDmlqrosCy0jxcoL+KK5PvgFbEOka8CKsgbRd0u/dDUPMJh7ArcXon/A4PwwxwyvkKkuwuKi5bwYqaDbdBNAP8wvn3kGQ+4RDdq1u8UE/YINUjv313L/35bLfo5Qte+xs5va5WXdFlrrRMImnkLCreaRxtSnE2i7q8n3VS3Jeq1HhWwY6o7k1Dmn/r3ZgSYCZ1g1Lqi6hS41EFHwC/QIQ0P5D7vbiH8Tq7DnD7Frr/qvGAgvfBnxDSNqcsOJx7Xe2FNjXuU/BeOAah1rHn8f0FJJkDlk85pKlNjXsV7KPeA34KCWUuM5OsN760qE2NJxXcBevBfhbCOnFqsB5G/72aQj8vVVuIN01tauyKFvPbuHBhEGJ6+hK/SSLaqBsPmrFfhZe9KND0q7ZtjiM+Ye0guIXzPS/atuPQflzLxlI4Go6AOys/wq+Gn6EoU5Pa1Fj6G7Dfpp0nfeT+EkXaOZx9jf+kJ+xqbAPcxy1vwhnOd8MuKMrUtB7fauz2HcsgBuuAQVCEHcLJ8RRHrr42kExpWqRPu3mYDTektGmmyhVe9x+QYJU/mVK5AHwF/QblU8nLWnyMrY6Rds69T4Kvd964tleDWhZUx6yItRBzo+7A8QcUEXQVfkZVB6x1zj3GfQ587YqIqw81qKV/dcxugsuiJ3OT/cr+lzf4S/gYXB0wfk69HwX8YRxN88aL2pu7Gib3iBcv8BpbDJ0QOch6fB0fNf+1HOVXwD2wE7L6T2rXic/FNbXVLLw4mNmfTuRMZi/tx8djUDYHPgAHlaSks5abs7mX/lrYI3a8ILqmwTB4G9xWZQ1uu7egHQbC/aBQR+88PpPamqs5D4t0xI89+nD1DTT0A9waOANJQeqVu+j4Ddx3u26vd3/WenM01zHVGuLnqYK9GXNeXg15RGcV0Wg7czPHjrjA+HVdwVWifRX/j6LNydzqii1pif8CSdc4HApPg0u1IqeQRp9i/D5zMBdzqjkT1NLS0BOOGuLYv+E6lWyFolZjcSGNXBvbHMxlQJRfI8emBEcOCeKo+xq4A+nNp20sYxq7PcqnmWMmwVEAgs4FR0Y32CGF69sYxpobxc9yzP3feMo7nJtJxDnWV2w6RPtsTnOZQn1118JH8A0ik/bWVNe33IKjEAh3qei87Ue5eeDTnwTNilfkbvgM1oHb1oMIdX2c2woTXJ0J4h3c3NyPgikwA9zjjigT7Xf3ce0XCfF8M+wAv3icQmQXx0LtP/qKurS9uZqyAAAAAElFTkSuQmCC')}.x-tab .x-button-icon.more,.x-button .x-button-icon.x-icon-mask.more{-webkit-mask-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAADJ0lEQVRoBe2YS2sUQRSFp5MgvmLU+CAMiBJFDBHcCeoPEFciuHMjroMK4lZBcONG0JW60U1UEgRx59IXuNMoKEElKL7GRwyIqNHxO0N66FT3UNU9IHRNFXz0VNW5t+vW6RcT1ev1Sie1rk4qVrWGgn13PDgcHPZsB8Il7ZmhqXKCw6kt8WwgOOyZoalygsOpLfFsIDjsmaGpcoLDqS3xbCA47JmhqXKCw6kt8Wyg6XAURV2wEy7BM5iFtzAKu2BB0dqJ7YEtcBYmQblfwzjshUVt5O4mfhjOwwQodw3GYA8snpd77n9pFXMYvoP+qDaZZewcVKXPAzE64Qn4CmZe9f/AFSiSu4e4IzANrXJfZ24gXjO/KxEcg9+QFZQcU/CSONh2RKsraMQhr85xE/psOeN5tCr2APyA5Bqzfl9D06tYtX3wC7KE5pg2ZX98UtsR7XZo5ayZW/1DENnyzi18CO1nyMqTNXYcrTapcitHkBLJiZW2RaGRuxcg6+Stxu6i73fI3Y3uZM7cU+hXQeVvzsBP6Dc5LupxztzaiEGH3AvR3S+Qe4dc0D2cp/Uj1oPI1pR7g030n+erWlTe9pMA3cu2Jre+2ERtzBdZe01BL3Ke9Al6vQZsTbfKQ5vImH9PXxtqa3qVPbWJjHk94J6r4DPGhK17A8EHm4j7UAWP2nTG/GX6NWMs1SW3rrCroLeLaxtDqDdG4368zbHVkzM5Polus+2hEs+j7YNxx9zv0FkfhoncvegvOuZ+iW6rYhtfTXTWgV7OyeLM3w+Y3xaf0PVIzAqwFf0IzW7XnLGOmLUg58y1JvsTzA83Y5o/eLcyMQISJAN0z56G9bE275HYNXAU7kAy9xv6p2Bj3pyxntjVcBDuQTL3FH19Dg/FWh0bXzUMNhsf23JkOQzCK9B1P4NY39OFG3kjgpeB8g/AR/gG0+3mJkeF9Lp9lkIVZkDfC1r3vPs8VTAir1uRd1mpNyQUXGr7HBYfHHbYpFJLgsOlts9h8cFhh00qtSQ4XGr7HBYfHHbYpFJLgsOlts9h8cFhh00qtSQ4XGr7HBYfHHbYpFJLOs7hf5j4Vg3iLoGkAAAAAElFTkSuQmCC')}.x-tab .x-button-icon.time,.x-button .x-button-icon.x-icon-mask.time{-webkit-mask-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAIPElEQVRoBdWae4gVVRzH97qr66vyhWbmurY+MA111dRMkLIXRuhG/pMVSUKGBGYPMTLDR0iaJBFUlIp/FJJlpWJS6vrAlCwTe1iaippSZipmPjL7fC/3XGbnzjkzc3fudTvwYWbO73d+jzlnzjkz96YuX75cUqiSSqWaYVs0hvZQBY3AW/7gYg/8A+fgPDFd5FiQkko6YZJUYj2hNwyDAXADlIOrHEO4A3bDVvgZ9hLfBY6JlUQSJkn14CAYAiNgFPh7kqpY5SDay2EjbCfxo7Fa25TVw/UBuw/BWvgT9HwUgl3YnQXX1ydWtc0rWRyr9zRcV8FpKESSfpuX8LMXnoDm+SYeO2GcXQfz4Cz4gyrGtSa3TaDHp1HcxGMljIN+sAGKkViYj+PEMRkax0k6csIYfgoOQVggxZa/R0ydoiYdaZZmFp6C0ZmgNTVu0YSzBQ6A1tuTYEqKk5ugA/SFkdAU4pbVNHiYpLWmu4vrztBSy83TcAai9pyeba2lz0E1tIFysD5vyMrgKugIY0GToW5MVJ/SWwltXPlIZh3SNNbdV9B/QRTH59GrhQehSZhjl5z2pucXc/4rRPEvHfV0B6dtm5CGI+B3iOLse/SehVgTiM23tx6bGuafwb8QJRY909ZlK7CHadATtOZFcfAmel28QSZ9jn0914/AYQiLScvW45Cen/yx5CSMYhNYA2GGtdGfDS38Rm3X6GpO0PNsKLPpBtXTbij8BGGxaWQODrThr0RxEuguuYzqeZ0Opf72tmt09TKxHU57+JLz7rY2QfXo3wpRkt6MXs7QrtPDKHSDfeBKVpPYjKBgXHW0mQVBz+HzrnZBMuwo6b3gilNb0Yn+9v6E30UpKCiv4WnoBD4ffuPea9q8YrE91asX9Rxb2loeBG9s/nO9YlZ6bWZf4dhc9EB4B2hJsBXtYd/AgAzHLfm0cfnYhvBlUE/aSlcE473CdMIkqyTvhU5eoe9cE8E8cvXulHwqxbvM3PRFeFzn8FqKbDTpdTQ6pof1BlQDtt5V7yzDySemYUM4Eo8mz4WgFwlb0RJbbYQm4e5U6JmwFe125tiEV7KepLWlFJp7goqW2WH0spbEkkacqOJ+UPfbylIMK+mGWl4lsLOO4DR69Tynv1y04DhSF5aiDcY7FllDqdbLSq0jmB7IKiXXkNYDrXFuK+sRHLMJG0I9o09zzEeOWDQ3DWI0lyphPbuqsJU1CFzDxdau2PVfhMSpiaupEh7uiEyJfsUNtE0IjqZFF2mmdi1R+j6eTriLI7T9yLT+/h/KBYLUHttWtPSWqYevtWlQfxjOOORJiJIaPRcJ5pAjIC1LnZVwL4fSEWSFTvhqh//IoszEtSekQYUSdpUTCLUsFbI8wOw5HvRNq75Fb3LOEpawa/Z2Gg4Q2mxpjdQ6v4KkBwa0i1Nl85G1EZZwVjGBE/Mx0GbqNgQfkvQECA3cZiSkPqWEtQG3lQoEiTxj2FkCW8E1SXVG/josJecqjnGLNlGuck4Jf+PQaIcsn4/vOSaZVLTE3Q0LwLVz095en3rXknQNlHMeWtBTLl1DFHdIri2ZtmZBaFnqo51bkmBT79660UE+vXV6DOZCVZh/dJrDUvC2956fRtYeSmaAV+A/vy/MWT5yfGr4PQNa9vw+/df6VDMRrB8NkWk0/gL+tuZ6G7JroOQeh5KU50Csz6lRbwB2NQyHwhYI+1Kqbe770D7IPvXaOmp+MAn6j5pDmkH6hywZ8yuY653I2gY5SaoO+y1hKujHMOPXdnwJnZwOoG52SNsJildFzlaCzYHqRyWVnMsOfsaAetsVyzTkdX674lrP7z5HO80F/U3CGlb6G4HLSS3ynLvqCj5fGX5ag37o/g38MX1HXc6Qzui7HolPTbv07MtFPzgKfgfm+m9kY/JNIp92+BsCmmhMDJrcJvltUaeXn689ekbfe3wSefrnWpOw9rHa3nmV/OebkLf2OyzkNf606XkNDsLbkPPrJHUa4hfAH6+51kipNnFm11cqtTa6Gko20zRsCEfiuREOgEku6LgKeXY58yasRTlsaGgjkr1bVzJp4tDHx8UQlKSp0+ozzhtnNmFVUh6DsI3At+hUeo0U+xz/KVgIJjHbcTU6dR4Df8Lat34cwdAGdDoWO9FMp5Tiezq4Hj/dAHVceinyxlkn4YxB7ViibADWo1fUnsafOmQW6KOErVdN/Yvo5PzKmZNwJmmtg6ah66gXgAHeO1ioc/y0g7kR49qIXqugWGwJl9EgyjOim6GJbCaE/mUoKIAoddgeDdvBdfONTDuuXja7gQlLmdIKwrZ5xol2ObqrYyC7BNicRq3HVm9YBPpUbHy5jifQe9Rl35pwJunBGNgV0ZkC0Z5V29BR0AHKXc79MvS1zdVmoy/Mg+PgStAr0yQ1BZw3PP1Qo2QtfEnQJLYY+liVggVHqF4O60DDXjsezax6ETf7Xo0iTUQ6toZb4Ha4E+IUbX1f4AbOD2sUmrAMkLR6egHo3TWfcopGO0G9oG2ieR2t4lw92g0qIZ+iz0XzSVYjIrz4h5XtGkvqgagTmXeoFfJcb0+B/8ey5mETBNVjvClMhjjPViES1s8qy6AiKE5XnXPSCmqIE23rBsIK0PNYiIRcNn/E53jI6/08dsLem4DTcbADdMddQSYh0we6t6BeW9pIkxZOrIUJrS3Cm6EG7gJ9TE+qaFbXLP8BbOZm76mv4XonbAIg8ZacV0B/GAvDQRNdPkVfOvQe+znsJ1HXh/tY9hNL2OuV5PWu2hyqQZsIra/6FCO6gClapn6AU7AbtDfXxuUknCHRSxwTLf8Bgi31NJnvpzwAAAAASUVORK5CYII=')}.x-tab .x-button-icon.user,.x-button .x-button-icon.x-icon-mask.user{-webkit-mask-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAEWElEQVRoBe2aS0gVYRiGO1lmF8nQQlETutGFokAiqEV0ISKwgmrdMtzUpnW7drWKbFGbQAKpJIhuUGIUFUkW0T1Jq4V2U4ui7GLPexpDD+ecuX1jHqcPHseZ+f9vvnf++e8n0d/fPyZONjZOYqU1doLHRV3CiURCz5gMxTANJsJg+8XJJ+iBt9BHNdO1SCwRZR1GbAFRl8F8WAFLoRwGLME/ffAM7kETvIYPxPWDo7lFIhiheURaCVtgBywHXXOzbhJcggZoRvR7twy+76uELSEAtQsqySPwGdQN+KWDPHuh2DI2+TIVm3T455M9G0Bk6ktRvd4NBZaiTQUT3AQnSNW/VAFBzl/iZw0kq56FcOtuaQHB7QIv9ZVkrqZ2YA9Mck3pMYGZYKeh2sBz1SJb2mqcmfk0E0xQ6l9rwNoKcWjm11JwEYFVW6t1/K218mspeB5B5VsFluKnIuU88Kml4PGBo3DPqBGZiVkKNgvKRFkGJ5aCv2Z4xoi6bCm4DWUaXERhZhMJS8FfolDq+DSbRFgKjrIOa8poYpaCTQKK2sl/wSHfcFSNlll1sSzhn7ys3pAvLFP275lu+L1uKVhBPfYbgMf0zz2mc01mKfgbT7vi+kT/CeT3sv9s6XNYCtbg4CJ0pX9U4Kv3yXk3cO6UjGaCWX5Rg/UArqY8I8yp1qdPQ08YJ4Pzmgl2nCqwc2DVyKjunuddqkE0MVPBBKYSuQ7tJtEhFj9apDczU8FOVB0ctZiuHYUw9obMjbxErW2bmblgApTQengVIkq1B83QEsJH2qzmgp2n3ObYCEGndZ3krbcuXcUWiWACldCjoA0yv6a8J6HJb0Yv6SMRrAcj+gmHA+B3aneDPHXk/8jR3LR3a2rOfnAlTmfDVPDb6Khrq8bPDI5PoRPxZpMSk+1SgtOKpTa8l8BC0JaLmAkloA1xr/aOhJqEtINGWeqW7jjHXrQHbRdw4WxSJf8L8Aeh2m1QaWoBfiUsA61PTwGtUYeZ1qlP1zhan3YraBSnz/0mdAUVHqiEESoxKs0a2AxloJIMI5DsWU0vQH2z2oZToAnFI7+fu2/BiF3PgzbCKqgC1bXhNH3S6rba4BocR7TquifzLBih5XjcCSrROaAGKbJWHt9uJuGq67fgAki4zrNaVsGIzCP3dNgE20B1VJ+uro8UUz3Xr39UvxugCeEZl3UzCkZsBZn1+W6HRaB6qtZ4pJp2PtTna+58DFoR3sVxqHFxyM8euFsIW6EeXoDeoPrBXEEbAlpqqoN1kD9YY6rYxSQ4DGoE9KOSXBGZLk4NYB7CfigZEP1XMBfVEJ0BJUznIFevaSBzEEolOimYkyo4AfocclVYtrjViB0C9SzJEdE+jrn+CWcTrHvdUKuRUSm0gPrZ0W7tGjjMhTiIVWFWSbAGEnGxhAT/y+HhsL9oiVWFjo3FqnRVqrETrG5pFmiSEAuTYC3TFMVCLSIzTg9H6wuIXR2OneDfMJq1NmzzbS8AAAAASUVORK5CYII=')}.x-tab .x-button-icon.team,.x-button .x-button-icon.x-icon-mask.team{-webkit-mask-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAFI0lEQVRoBe2ZSYgdVRSG+yUmnagRQYU4NbZKNLYKWTgg4gQOaDYqJIIGl4LixhBwoy50LSIiulEjCkpAUBBRURpdGceFMQ7YtgkOJE4xTjGa9vuedUl1Vd2qevSrFqvrwJ97695zzj3/PXd6nd7MzMzIQpJFC4msXDvCbc94l+Euwy2bgW5JtyyhOTpdhnNT0rKGLsMtS2iOTpfh3JS0rOGQ+eLT6/VWMNYJ4NjUmN9T/xLs4WfqvPxO7TU9DkTdNmvBbeAskJ7kv/n+AjwKXiSW7yibFQk3BSIPZHdTl5xZzML238DDYFlTsQS/jZF1AGQ1mAZZkkXfe9FbGwJrqmz6lL4cEmOgjhyO0jq2gGVj0hhhAl9M1FeB3gDRn4Pu/5NwQnJ0ALKqrgKHDmgzkHpjGR4oioPKP1H96+Dn8GvpKyLqneV5Lp0XgnHggTMFJjlYPqAcpnyLsz/LHBLL0fRfCzwbvNN3gLeI5WXKaik7DbF2/20A28HPYF+CPZQfg9tj9vS5h18DRSdyrO0j9FeW+PQenwTe138AJ+d34OPFa215zDa0l15LOLgamM0DIBukbQ60JjhLl7RL+HWQtSv7jhLGz1FgM3DJZ30Yy69gYzqGonrVHr4eJ+OgB7Ji2xi4lGUW8+PsD0vOwNGNwInMirF42K0nlmXZzvR3LNARDN3fx6WVI3VJF50Fzvr7EZtY8zQdLtUiOYXGIrJpXUmvTDdk61HCKEqiagD9SSwnLCeX3RYwSJafRd/zoUj2FzVm2hyzMJ6gV0Y46Myl/BzjeqfnyMg36G5NJqpoTPvnLGWEnS0f9lVStL/7NgT/C5XNoHTW6XesV4En/1wlGo+Oo4QJ1ivoxxqju+fKCG2lf1uFH7P3eEl2K8xndRt3VKKEE4sPKWOHiCreg28TaPR1RN/X6GwEO0GReJ3cg95kUWeqzT8W6KtMpujcVaZQRfgFjL8qcbCDvndi/Zz0h4Hr6L8JHBHRW0L7DejdAU6K6Nj8CfBQi4mH4xYmrmy1sXlK/gCAAyfkQaAT91kWj9HW/6tJ8MO3NmeC+4CHlqdu1q7o25Xk5Hqynw+WBp+hpO1K4JItsnfr5GyCbSirCHstnQpcKulBXMK+o1frCPGgWAomwL2gLsm0z3S9ny38XARWgEXJOI7xNMiS9ns9MN5ZCQhEQ1lIGCOXmZf4ZeAW8C4IAblv3wBXAIn6sjkZ3Arc80FvGKW/nu4H/nhZDiR0IngI+LYPY3i43gWuAeNgFBQSn0UYJZejRH3CPQ8cMDi19Jp6AviuVfd48ADwRZXWG3Z9J/6fApeAJUm2TYRE02OZjPfA3WAM9HVDdvt2iXHI1HkoPQd2g7SjUHef+NyU7AXgFRD65qOcZrybQXgFmtUDIDu2xE3CBuCWWBxIU+8vk9MozdQukDUO3x4qm5IJOp36ZyW6waaJci/jrkviWEV9qiQOdd8Ebr/+T0fKkYvBp6AqOB2fnQz0SA39Kn9z6Z9mfPeze/UlUOXrB3Q2AW36a77KwP7tYCwh7Mupjk1TOmZuNInlyZqxuN8n3ItrQF1xryvRl9W/3Y3/60QGCTGF71h5JB0Tbn7vsDqyP6Vkva5dymxoVQ+lIE6+3+lJCH3Zcp+E78y2Fny7Evw7kstC8YA7BtQZRP1hiwTDKnuGun8aSiekaDxXwrbG/zOtaOT/ss3MLSjpCLc93V2Guwy3bAa6Jd2yhObodBnOTUnLGroMtyyhOTpdhnNT0rKGfwD3f6JVZi/xSQAAAABJRU5ErkJggg==')}.x-tabbar-light{background-color:#475c76;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #96a9c0), color-stop(2%, #546e8c), color-stop(100%, #394b5f));background-image:-webkit-linear-gradient(#96a9c0,#546e8c 2%,#394b5f);background-image:linear-gradient(#96a9c0,#546e8c 2%,#394b5f);border-color:#3d5066}.x-tabbar-light .x-tab{color:#b6c3d3}.x-tabbar-light .x-tab-active{color:white}.x-tabbar-light .x-tab-pressed{color:white}.x-tabbar-light.x-docked-bottom .x-tab{text-shadow:rgba(0, 0, 0, 0.5) 0 -0.08em 0}.x-tabbar-light.x-docked-bottom .x-tab .x-button-icon{background-color:#768fad;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #d5dde6), color-stop(2%, #8ca1ba), color-stop(100%, #607d9f));background-image:-webkit-linear-gradient(#d5dde6,#8ca1ba 2%,#607d9f);background-image:linear-gradient(#d5dde6,#8ca1ba 2%,#607d9f)}.x-tabbar-light.x-docked-bottom .x-tab-active{background-color:#506986;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #a6b6c9), color-stop(2%, #5e7a9c), color-stop(100%, #43576f));background-image:-webkit-linear-gradient(#a6b6c9,#5e7a9c 2%,#43576f);background-image:linear-gradient(#a6b6c9,#5e7a9c 2%,#43576f);text-shadow:rgba(0, 0, 0, 0.5) 0 -0.08em 0}.x-tabbar-light.x-docked-bottom .x-tab-active .x-button-icon{background-color:#003370;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #0056bd), color-stop(50%, #003f8a), color-stop(51%, #003370), color-stop(100%, #002757));background-image:-webkit-linear-gradient(#0056bd,#003f8a 50%,#003370 51%,#002757);background-image:linear-gradient(#0056bd,#003f8a 50%,#003370 51%,#002757)}.x-tabbar-light.x-docked-top .x-tab-active{background-color:#3d5066;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #2a3746), color-stop(10%, #344356), color-stop(65%, #3d5066), color-stop(100%, #3e5167));background-image:-webkit-linear-gradient(#2a3746,#344356 10%,#3d5066 65%,#3e5167);background-image:linear-gradient(#2a3746,#344356 10%,#3d5066 65%,#3e5167);color:white}.x-tabbar-dark{background-color:#141e29;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #466890), color-stop(2%, #1f2f41), color-stop(100%, #080c11));background-image:-webkit-linear-gradient(#466890,#1f2f41 2%,#080c11);background-image:linear-gradient(#466890,#1f2f41 2%,#080c11);border-color:#0c1118}.x-tabbar-dark .x-tab{color:#5a81af}.x-tabbar-dark .x-tab-active{color:white}.x-tabbar-dark .x-tab-pressed{color:white}.x-tabbar-dark.x-docked-bottom .x-tab{text-shadow:rgba(0, 0, 0, 0.5) 0 -0.08em 0}.x-tabbar-dark.x-docked-bottom .x-tab .x-button-icon{background-color:#354f6e;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #7c9bc0), color-stop(2%, #416086), color-stop(100%, #293e56));background-image:-webkit-linear-gradient(#7c9bc0,#416086 2%,#293e56);background-image:linear-gradient(#7c9bc0,#416086 2%,#293e56)}.x-tabbar-dark.x-docked-bottom .x-tab-active{background-color:#1c2a3a;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #4e74a2), color-stop(2%, #283b52), color-stop(100%, #111922));background-image:-webkit-linear-gradient(#4e74a2,#283b52 2%,#111922);background-image:linear-gradient(#4e74a2,#283b52 2%,#111922);text-shadow:rgba(0, 0, 0, 0.5) 0 -0.08em 0}.x-tabbar-dark.x-docked-bottom .x-tab-active .x-button-icon{background-color:#0a7aff;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #57a3ff), color-stop(50%, #2488ff), color-stop(51%, #0a7aff), color-stop(100%, #006df0));background-image:-webkit-linear-gradient(#57a3ff,#2488ff 50%,#0a7aff 51%,#006df0);background-image:linear-gradient(#57a3ff,#2488ff 50%,#0a7aff 51%,#006df0)}.x-tabbar-dark.x-docked-top .x-tab-active{background-color:#0c1118;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #000000), color-stop(10%, #030507), color-stop(65%, #0c1118), color-stop(100%, #0c121a));background-image:-webkit-linear-gradient(#000000,#030507 10%,#0c1118 65%,#0c121a);background-image:linear-gradient(#000000,#030507 10%,#0c1118 65%,#0c121a);color:white}.x-tab.x-item-disabled span.x-button-label,.x-tab.x-item-disabled .x-hasbadge span.x-badge,.x-hasbadge .x-tab.x-item-disabled span.x-badge,.x-tab.x-item-disabled .x-button-icon{opacity:.5}.x-tab.x-draggable{opacity:.7}.x-tab{-webkit-user-select:none;overflow:visible !important}.x-toolbar{padding:0 0.2em;overflow:hidden;position:relative;height:2.6em}.x-toolbar > *{z-index:1}.x-toolbar.x-docked-top{border-bottom:.1em solid}.x-toolbar.x-docked-bottom{border-top:.1em solid}.x-toolbar.x-docked-left{width:7em;height:auto;padding:0.2em;border-right:.1em solid}.x-toolbar.x-docked-right{width:7em;height:auto;padding:0.2em;border-left:.1em solid}.x-title{line-height:2.1em;font-size:1.2em;text-align:center;font-weight:bold;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;margin:0 0.3em;max-width:100%}.x-title .x-innerhtml{white-space:nowrap;overflow:hidden;text-overflow:ellipsis;padding:0 .3em}.x-toolbar-dark{background-color:#24364c;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #5a81af), color-stop(2%, #304864), color-stop(100%, #192533));background-image:-webkit-linear-gradient(#5a81af,#304864 2%,#192533);background-image:linear-gradient(#5a81af,#304864 2%,#192533);border-color:black}.x-toolbar-dark .x-title{color:white;text-shadow:rgba(0, 0, 0, 0.5) 0 -0.08em 0}.x-toolbar-dark.x-docked-top{border-bottom-color:black}.x-toolbar-dark.x-docked-bottom{border-top-color:black}.x-toolbar-dark.x-docked-left{border-right-color:black}.x-toolbar-dark.x-docked-right{border-left-color:black}.x-toolbar-dark .x-button,.x-toolbar .x-toolbar-dark .x-button,.x-toolbar-dark .x-field-select .x-component-outer,.x-toolbar .x-toolbar-dark .x-field-select .x-component-outer,.x-toolbar-dark .x-field-select .x-component-outer:before,.x-toolbar .x-toolbar-dark .x-field-select .x-component-outer:before{border:1px solid black;border-top-color:black;color:white}.x-toolbar-dark .x-button.x-button-back:before,.x-toolbar-dark .x-button.x-button-forward:before,.x-toolbar .x-toolbar-dark .x-button.x-button-back:before,.x-toolbar .x-toolbar-dark .x-button.x-button-forward:before,.x-toolbar-dark .x-field-select .x-component-outer.x-button-back:before,.x-toolbar-dark .x-field-select .x-component-outer.x-button-forward:before,.x-toolbar .x-toolbar-dark .x-field-select .x-component-outer.x-button-back:before,.x-toolbar .x-toolbar-dark .x-field-select .x-component-outer.x-button-forward:before,.x-toolbar-dark .x-field-select .x-component-outer:before.x-button-back:before,.x-toolbar-dark .x-field-select .x-component-outer:before.x-button-forward:before,.x-toolbar .x-toolbar-dark .x-field-select .x-component-outer:before.x-button-back:before,.x-toolbar .x-toolbar-dark .x-field-select .x-component-outer:before.x-button-forward:before{background:black}.x-toolbar-dark .x-button,.x-toolbar-dark .x-button.x-button-back:after,.x-toolbar-dark .x-button.x-button-forward:after,.x-toolbar .x-toolbar-dark .x-button,.x-toolbar .x-toolbar-dark .x-button.x-button-back:after,.x-toolbar .x-toolbar-dark .x-button.x-button-forward:after,.x-toolbar-dark .x-field-select .x-component-outer,.x-toolbar-dark .x-field-select .x-component-outer.x-button-back:after,.x-toolbar-dark .x-field-select .x-component-outer.x-button-forward:after,.x-toolbar .x-toolbar-dark .x-field-select .x-component-outer,.x-toolbar .x-toolbar-dark .x-field-select .x-component-outer.x-button-back:after,.x-toolbar .x-toolbar-dark .x-field-select .x-component-outer.x-button-forward:after,.x-toolbar-dark .x-field-select .x-component-outer:before,.x-toolbar-dark .x-field-select .x-component-outer:before.x-button-back:after,.x-toolbar-dark .x-field-select .x-component-outer:before.x-button-forward:after,.x-toolbar .x-toolbar-dark .x-field-select .x-component-outer:before,.x-toolbar .x-toolbar-dark .x-field-select .x-component-outer:before.x-button-back:after,.x-toolbar .x-toolbar-dark .x-field-select .x-component-outer:before.x-button-forward:after{background-color:#141e29;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #466890), color-stop(2%, #1f2f41), color-stop(100%, #080c11));background-image:-webkit-linear-gradient(#466890,#1f2f41 2%,#080c11);background-image:linear-gradient(#466890,#1f2f41 2%,#080c11)}.x-toolbar-dark .x-button .x-button-icon.x-icon-mask,.x-toolbar .x-toolbar-dark .x-button .x-button-icon.x-icon-mask,.x-toolbar-dark .x-field-select .x-component-outer .x-button-icon.x-icon-mask,.x-toolbar .x-toolbar-dark .x-field-select .x-component-outer .x-button-icon.x-icon-mask,.x-toolbar-dark .x-field-select .x-component-outer:before .x-button-icon.x-icon-mask,.x-toolbar .x-toolbar-dark .x-field-select .x-component-outer:before .x-button-icon.x-icon-mask{background-color:white;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(2%, #ffffff), color-stop(100%, #e7edf3));background-image:-webkit-linear-gradient(#ffffff,#ffffff 2%,#e7edf3);background-image:linear-gradient(#ffffff,#ffffff 2%,#e7edf3)}.x-toolbar-dark .x-button.x-button-pressing,.x-toolbar-dark .x-button.x-button-pressing:after,.x-toolbar-dark .x-button.x-button-pressed,.x-toolbar-dark .x-button.x-button-pressed:after,.x-toolbar-dark .x-button.x-button-active,.x-toolbar-dark .x-button.x-button-active:after,.x-toolbar .x-toolbar-dark .x-button.x-button-pressing,.x-toolbar .x-toolbar-dark .x-button.x-button-pressing:after,.x-toolbar .x-toolbar-dark .x-button.x-button-pressed,.x-toolbar .x-toolbar-dark .x-button.x-button-pressed:after,.x-toolbar .x-toolbar-dark .x-button.x-button-active,.x-toolbar .x-toolbar-dark .x-button.x-button-active:after,.x-toolbar-dark .x-field-select .x-component-outer.x-button-pressing,.x-toolbar-dark .x-field-select .x-component-outer.x-button-pressing:after,.x-toolbar-dark .x-field-select .x-component-outer.x-button-pressed,.x-toolbar-dark .x-field-select .x-component-outer.x-button-pressed:after,.x-toolbar-dark .x-field-select .x-component-outer.x-button-active,.x-toolbar-dark .x-field-select .x-component-outer.x-button-active:after,.x-toolbar .x-toolbar-dark .x-field-select .x-component-outer.x-button-pressing,.x-toolbar .x-toolbar-dark .x-field-select .x-component-outer.x-button-pressing:after,.x-toolbar .x-toolbar-dark .x-field-select .x-component-outer.x-button-pressed,.x-toolbar .x-toolbar-dark .x-field-select .x-component-outer.x-button-pressed:after,.x-toolbar .x-toolbar-dark .x-field-select .x-component-outer.x-button-active,.x-toolbar .x-toolbar-dark .x-field-select .x-component-outer.x-button-active:after,.x-toolbar-dark .x-field-select .x-component-outer:before.x-button-pressing,.x-toolbar-dark .x-field-select .x-component-outer:before.x-button-pressing:after,.x-toolbar-dark .x-field-select .x-component-outer:before.x-button-pressed,.x-toolbar-dark .x-field-select .x-component-outer:before.x-button-pressed:after,.x-toolbar-dark .x-field-select .x-component-outer:before.x-button-active,.x-toolbar-dark .x-field-select .x-component-outer:before.x-button-active:after,.x-toolbar .x-toolbar-dark .x-field-select .x-component-outer:before.x-button-pressing,.x-toolbar .x-toolbar-dark .x-field-select .x-component-outer:before.x-button-pressing:after,.x-toolbar .x-toolbar-dark .x-field-select .x-component-outer:before.x-button-pressed,.x-toolbar .x-toolbar-dark .x-field-select .x-component-outer:before.x-button-pressed:after,.x-toolbar .x-toolbar-dark .x-field-select .x-component-outer:before.x-button-active,.x-toolbar .x-toolbar-dark .x-field-select .x-component-outer:before.x-button-active:after{background-color:#0f161f;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #000000), color-stop(10%, #070a0e), color-stop(65%, #0f161f), color-stop(100%, #101721));background-image:-webkit-linear-gradient(#000000,#070a0e 10%,#0f161f 65%,#101721);background-image:linear-gradient(#000000,#070a0e 10%,#0f161f 65%,#101721)}.x-toolbar-dark .x-form-label{color:white;text-shadow:rgba(0, 0, 0, 0.5) 0 -0.08em 0}.x-toolbar-light{background-color:#354f6e;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #7c9bc0), color-stop(2%, #416086), color-stop(100%, #293e56));background-image:-webkit-linear-gradient(#7c9bc0,#416086 2%,#293e56);background-image:linear-gradient(#7c9bc0,#416086 2%,#293e56);border-color:black}.x-toolbar-light .x-title{color:white;text-shadow:rgba(0, 0, 0, 0.5) 0 -0.08em 0}.x-toolbar-light.x-docked-top{border-bottom-color:black}.x-toolbar-light.x-docked-bottom{border-top-color:black}.x-toolbar-light.x-docked-left{border-right-color:black}.x-toolbar-light.x-docked-right{border-left-color:black}.x-toolbar-light .x-button,.x-toolbar .x-toolbar-light .x-button,.x-toolbar-light .x-field-select .x-component-outer,.x-toolbar .x-toolbar-light .x-field-select .x-component-outer,.x-toolbar-light .x-field-select .x-component-outer:before,.x-toolbar .x-toolbar-light .x-field-select .x-component-outer:before{border:1px solid #030507;border-top-color:#0c1118;color:white}.x-toolbar-light .x-button.x-button-back:before,.x-toolbar-light .x-button.x-button-forward:before,.x-toolbar .x-toolbar-light .x-button.x-button-back:before,.x-toolbar .x-toolbar-light .x-button.x-button-forward:before,.x-toolbar-light .x-field-select .x-component-outer.x-button-back:before,.x-toolbar-light .x-field-select .x-component-outer.x-button-forward:before,.x-toolbar .x-toolbar-light .x-field-select .x-component-outer.x-button-back:before,.x-toolbar .x-toolbar-light .x-field-select .x-component-outer.x-button-forward:before,.x-toolbar-light .x-field-select .x-component-outer:before.x-button-back:before,.x-toolbar-light .x-field-select .x-component-outer:before.x-button-forward:before,.x-toolbar .x-toolbar-light .x-field-select .x-component-outer:before.x-button-back:before,.x-toolbar .x-toolbar-light .x-field-select .x-component-outer:before.x-button-forward:before{background:#030507}.x-toolbar-light .x-button,.x-toolbar-light .x-button.x-button-back:after,.x-toolbar-light .x-button.x-button-forward:after,.x-toolbar .x-toolbar-light .x-button,.x-toolbar .x-toolbar-light .x-button.x-button-back:after,.x-toolbar .x-toolbar-light .x-button.x-button-forward:after,.x-toolbar-light .x-field-select .x-component-outer,.x-toolbar-light .x-field-select .x-component-outer.x-button-back:after,.x-toolbar-light .x-field-select .x-component-outer.x-button-forward:after,.x-toolbar .x-toolbar-light .x-field-select .x-component-outer,.x-toolbar .x-toolbar-light .x-field-select .x-component-outer.x-button-back:after,.x-toolbar .x-toolbar-light .x-field-select .x-component-outer.x-button-forward:after,.x-toolbar-light .x-field-select .x-component-outer:before,.x-toolbar-light .x-field-select .x-component-outer:before.x-button-back:after,.x-toolbar-light .x-field-select .x-component-outer:before.x-button-forward:after,.x-toolbar .x-toolbar-light .x-field-select .x-component-outer:before,.x-toolbar .x-toolbar-light .x-field-select .x-component-outer:before.x-button-back:after,.x-toolbar .x-toolbar-light .x-field-select .x-component-outer:before.x-button-forward:after{background-color:#24364c;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #5a81af), color-stop(2%, #304864), color-stop(100%, #192533));background-image:-webkit-linear-gradient(#5a81af,#304864 2%,#192533);background-image:linear-gradient(#5a81af,#304864 2%,#192533)}.x-toolbar-light .x-button .x-button-icon.x-icon-mask,.x-toolbar .x-toolbar-light .x-button .x-button-icon.x-icon-mask,.x-toolbar-light .x-field-select .x-component-outer .x-button-icon.x-icon-mask,.x-toolbar .x-toolbar-light .x-field-select .x-component-outer .x-button-icon.x-icon-mask,.x-toolbar-light .x-field-select .x-component-outer:before .x-button-icon.x-icon-mask,.x-toolbar .x-toolbar-light .x-field-select .x-component-outer:before .x-button-icon.x-icon-mask{background-color:white;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(2%, #ffffff), color-stop(100%, #e7edf3));background-image:-webkit-linear-gradient(#ffffff,#ffffff 2%,#e7edf3);background-image:linear-gradient(#ffffff,#ffffff 2%,#e7edf3)}.x-toolbar-light .x-button.x-button-pressing,.x-toolbar-light .x-button.x-button-pressing:after,.x-toolbar-light .x-button.x-button-pressed,.x-toolbar-light .x-button.x-button-pressed:after,.x-toolbar-light .x-button.x-button-active,.x-toolbar-light .x-button.x-button-active:after,.x-toolbar .x-toolbar-light .x-button.x-button-pressing,.x-toolbar .x-toolbar-light .x-button.x-button-pressing:after,.x-toolbar .x-toolbar-light .x-button.x-button-pressed,.x-toolbar .x-toolbar-light .x-button.x-button-pressed:after,.x-toolbar .x-toolbar-light .x-button.x-button-active,.x-toolbar .x-toolbar-light .x-button.x-button-active:after,.x-toolbar-light .x-field-select .x-component-outer.x-button-pressing,.x-toolbar-light .x-field-select .x-component-outer.x-button-pressing:after,.x-toolbar-light .x-field-select .x-component-outer.x-button-pressed,.x-toolbar-light .x-field-select .x-component-outer.x-button-pressed:after,.x-toolbar-light .x-field-select .x-component-outer.x-button-active,.x-toolbar-light .x-field-select .x-component-outer.x-button-active:after,.x-toolbar .x-toolbar-light .x-field-select .x-component-outer.x-button-pressing,.x-toolbar .x-toolbar-light .x-field-select .x-component-outer.x-button-pressing:after,.x-toolbar .x-toolbar-light .x-field-select .x-component-outer.x-button-pressed,.x-toolbar .x-toolbar-light .x-field-select .x-component-outer.x-button-pressed:after,.x-toolbar .x-toolbar-light .x-field-select .x-component-outer.x-button-active,.x-toolbar .x-toolbar-light .x-field-select .x-component-outer.x-button-active:after,.x-toolbar-light .x-field-select .x-component-outer:before.x-button-pressing,.x-toolbar-light .x-field-select .x-component-outer:before.x-button-pressing:after,.x-toolbar-light .x-field-select .x-component-outer:before.x-button-pressed,.x-toolbar-light .x-field-select .x-component-outer:before.x-button-pressed:after,.x-toolbar-light .x-field-select .x-component-outer:before.x-button-active,.x-toolbar-light .x-field-select .x-component-outer:before.x-button-active:after,.x-toolbar .x-toolbar-light .x-field-select .x-component-outer:before.x-button-pressing,.x-toolbar .x-toolbar-light .x-field-select .x-component-outer:before.x-button-pressing:after,.x-toolbar .x-toolbar-light .x-field-select .x-component-outer:before.x-button-pressed,.x-toolbar .x-toolbar-light .x-field-select .x-component-outer:before.x-button-pressed:after,.x-toolbar .x-toolbar-light .x-field-select .x-component-outer:before.x-button-active,.x-toolbar .x-toolbar-light .x-field-select .x-component-outer:before.x-button-active:after{background-color:#1f2f41;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #0f161f), color-stop(10%, #172330), color-stop(65%, #1f2f41), color-stop(100%, #203043));background-image:-webkit-linear-gradient(#0f161f,#172330 10%,#1f2f41 65%,#203043);background-image:linear-gradient(#0f161f,#172330 10%,#1f2f41 65%,#203043)}.x-toolbar-light .x-form-label{color:white;text-shadow:rgba(0, 0, 0, 0.5) 0 -0.08em 0}.x-navigation-bar .x-container{overflow:visible}.x-desktop .x-toolbar .x-field-search{padding-left:1.06em}.x-spinner .x-input-el,.x-field-select .x-input-el{-webkit-text-fill-color:#000;-webkit-opacity:1}.x-spinner.x-item-disabled .x-input-el,.x-field-select.x-item-disabled .x-input-el{-webkit-text-fill-color:currentcolor}.x-toolbar .x-field-select .x-input-el{-webkit-text-fill-color:#fff}.x-toolbar .x-field-select.x-item-disabled .x-input-el{-webkit-text-fill-color:rgba(255, 255, 255, 0.6)}.x-toolbar .x-form-field-container{padding:0 .3em}.x-toolbar .x-field{width:13em;margin:.5em;min-height:0;border-bottom:0}.x-toolbar .x-field .x-clear-icon{background-size:50% 50%;right:-0.8em;margin-top:-1.06em}.x-toolbar .x-field-input{padding-right:1.6em !important}.x-toolbar .x-field-textarea .x-component-outer,.x-toolbar .x-field-text .x-component-outer,.x-toolbar .x-field-number .x-component-outer,.x-toolbar .x-field-search .x-component-outer{-webkit-border-radius:0.3em;border-radius:0.3em;background-color:white;-webkit-box-shadow:inset rgba(0, 0, 0, 0.5) 0 0.1em 0, inset rgba(0, 0, 0, 0.5) 0 -0.1em 0, inset rgba(0, 0, 0, 0.5) 0.1em 0 0, inset rgba(0, 0, 0, 0.5) -0.1em 0 0, inset rgba(0, 0, 0, 0.5) 0 0.15em 0.4em}.x-toolbar .x-form-label{background:transparent;border:0;padding:0;line-height:1.4em}.x-toolbar .x-form-field{height:1.6em;color:#6e6e6e;background:transparent;min-height:0;-webkit-appearance:none;padding:0em .3em;margin:0}.x-toolbar .x-form-field:focus{color:black}.x-toolbar .x-field-select .x-component-outer,.x-toolbar .x-field-search .x-component-outer{-webkit-border-radius:0.8em;border-radius:0.8em}.x-toolbar .x-field-search .x-field-input{background-position:.5em 50%}.x-toolbar .x-field-select{-webkit-box-shadow:none}.x-toolbar .x-field-select .x-form-field{height:1.4em}.x-toolbar .x-field-select{background:transparent}.x-toolbar .x-field-select .x-component-outer:after{right:.4em}.x-toolbar .x-field-select.x-item-disabled .x-component-outer:after{opacity:.6}.x-toolbar .x-field-select .x-component-outer:before{width:3em;border-left:none;-webkit-border-top-right-radius:0.8em;border-top-right-radius:0.8em;-webkit-border-bottom-right-radius:0.8em;border-bottom-right-radius:0.8em;-webkit-mask:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADIAAAABCAYAAACc0f2yAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAADJJREFUeNpi/P//PwMjIyMbAwMDOxRzAjEXFHMDMQ8a5kXC6HLcSHo5kcwEmU9TABBgAOcTBAFcRiSpAAAAAElFTkSuQmCC');-webkit-mask-position:right top;-webkit-mask-repeat:repeat-y;-webkit-mask-size:3em 0.05em}.x-toolbar .x-field-select .x-input-text{color:#fff}.x-android .x-field-search .x-field-input{padding-left:.2em !important;padding-right:2.2em !important}.x-indexbar-wrapper{-webkit-box-pack:end !important;box-pack:end !important;pointer-events:none}.x-indexbar-vertical{width:1.1em;-webkit-box-orient:vertical;box-orient:vertical;margin-right:8px}.x-indexbar-horizontal{height:1.1em;-webkit-box-orient:horizontal;box-orient:horizontal;margin-bottom:8px}.x-indexbar{pointer-events:auto;z-index:2;padding:.3em 0;min-height:0 !important;height:auto !important;-webkit-box-flex:0 !important}.x-indexbar > div{color:#1e2a38;font-size:0.6em;text-align:center;line-height:1.1em;font-weight:bold;display:block}.x-phone.x-landscape .x-indexbar > div{font-size:0.38em;line-height:1em}.x-indexbar-pressed{-webkit-border-radius:0.55em;border-radius:0.55em;background-color:rgba(143, 152, 163, 0.8)}.x-list{position:relative;background-color:#f7f7f7}.x-list .x-list-inner{width:100%}.x-list .x-list-disclosure{position:absolute;bottom:0.44em;right:0.44em}.x-list .x-list-disclosure{overflow:visible;-webkit-mask:0 0 url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA2ZpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYwIDYxLjEzNDc3NywgMjAxMC8wMi8xMi0xNzozMjowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDpFNkNCM0JGNTZFMjI2ODExQkNGQjkwMzk3MDc3MkZFQiIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDo3M0MzQUU1QUFDQkQxMURGOEQ2MUVDMjM0MzY2NTBDQSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDo3M0MzQUU1OUFDQkQxMURGOEQ2MUVDMjM0MzY2NTBDQSIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ1M1IE1hY2ludG9zaCI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOkU3Q0IzQkY1NkUyMjY4MTFCQ0ZCOTAzOTcwNzcyRkVCIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOkU2Q0IzQkY1NkUyMjY4MTFCQ0ZCOTAzOTcwNzcyRkVCIi8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+uoWjuwAACh9JREFUeNrUm2toVdkVx7eJRqPRaHzFGBOjidGYaLQaX9GREXXAkloYQVpT+qFYBkcqLS0zTKFQWpwv86F0KLRfHFqnWDq0UCsMFYqlqHSwGo2v4Du+X9FoNL5P12/N3rLn9Cb33HNvrnHDujfnnHvO2f+91l57/dfaGWBe8xYEQUq/H5ilftWIVIoU2+Ov2e/jIt0inSKnRVpEnvdlR/oK8CKRt0QaRd4QyU3hXkDvFvmXyOeZHoABGXzWWJF3RL4rUuFfKC4uNmPHjjUjRozQ44kTJ+r3jRs3zNOnT013d7e5deuWuXTpknnx4oV/602RP4n8TqQ1EyadCcBlIh9YoHmcqKioMFOnTjXl5eVm1KhR5smTJwrs+fPnCohvOjpw4ECTk5Ojwt/5+fnmzp075vr16+bkyZPm1KlT/nv+KvJLkf++KsCAe89KPidmz55t5s6dawoLC839+/fNo0ePFCwgHjx4oMe0u3fv6vfw4cNNbm6uGTRokCkoKNDBycvLU+DDhg3TQTp27Jg5fPiwuXfvnnvvJyI/EunIJmCczqci1RzMmzfPLFiwQF9Ox65cuWKuXr2qZoqk0ikGa/z48WbcuHFm0qRJOihDhw41LS0tZu/evToI1sl9W2RXNgC/K/IRGp42bZpZsmSJasSZ4fnz51WbmWiDBw9W0NXV1TrvOd6zZ49pbX05nd8XwB/2FWA87a+tYzKLFi0yixcvVoCY3NmzZ8MOJ6OttLRUpwy+4dy5c2bnzp3u0h9FvifAuzMJmPm6Q+SbHGzYsEHn3P79+83Ro0fVCWWrVVZWmqVLl+rfO3bsUA8v7QuRbwjoa5l6z2/xD7KsBJs3bw7WrVsXiINh8rwSGTJkSLBmzRrtS1lZmTv/H5wnc7o3iTpnA1k69AXLli0LZAmJ1VGeQWfFEek3x3FBc684ymDLli0+6E/TBfymyDMeJmasL4jbSe4bPXp0MGvWLJX6+vpAApJAlqTYoAcMGBDU1NQEmzZtCsRxuvPvxQVM7Hubh4gnDsRJxdYsInM+kOUrkHVXj/lmAGVOBuJ909K0rBZBc3OzO4eCmuIA/jcPkEAiWLVqVVqdQjA7WWLc8TZ3ns7W1tYGstaqxuI8m8GbM2dOIKuGO3dDpCAVwCw9QUlJSbB+/XrfXGLLzJkzffMtFNko8pjjyZMnq4njFONOGRSyevVqNXF77hdRARc4U167dm0wZsyYjHhW5m0IsLFMCm0EEl0FDQ0NgZCMl2afqjBgTU1N7vg+PCUK4B9yw/Tp0wNZ6NOatxEAO/JxxC03mCWmH8eZMVBVVVVBXV2dO/ebMOCcEFhIwI/5g1j2woUL5tmzZ30dS7SLLBb5DHKxb98+jaVhXDIAKT2IAIgYnnjcto3iF6r934QBr4G+Tpkyxdy+fdt0dXVlK4DiRetEfs7BgQMHtPPE6rAm6XTkBz18+FDJC2GoDYc39ga4mQ9ZL5UMZEG74fYzC7zrzJkzSitlaqnG4MxRGvH8zZs3daBs+5YMWG6iFE+R1bA+HD6bNBCXkcfsioqKNJsBl+1JGwT9J06ciNLnz0TaRP5+8eLFMvohnlfJCVQzihLQMoMF05JnFNsAanf4dxCDoLy8XIOBKGsiyxXLjUyBQEY0FQdTGDFltMdFVAQ+MmiR4wGiONZme7w1kdNayYcsQ0rio8SdaBa2wuhnigOH8lmryGfRF5gZaSDYEvw7qVMQ/4PF+djCc7iBD9ItUTtPNoK5blu5pZtRpDMi6Cci3xfZjBNua2tTc8WZ8e7e5jWK8GhrvVhJng841+aOdY643FPSjEBubrac2cciK8hjQf6vXbumzowcWE99ACyKGzlypMNX6QNmYueTO3r8+HFWCX0KjTz1AtK1WNXx48c19TNhwgS1ykQNLFiCR4ZeAsZBqMe1SbL+2k7bIGUX2iNIIectsbjmu8INLN7yNNEHXKBrlDiFfqrdcJDydZEPXZDinG0is/YcV6EPWA+42JeJuAy390XW49hI2JNjC8cAYEGJvlJzzOvb8mztStPFeOUkS2muH2l1OxOIGsK94kZU+BdLL1W7xM/hBhYvMuv0NdzhvFoWl5q4rY6pC1iWnIULFxI+6vocbpizt8R2+IDb/egkFXaS5Ub4u496HYU64b2GYARml8j3hIKo9rCGOyh84d69id6f2gfWjAsIOgAMGaEwlwisIzaucGe+LL5/hS1RiH4Tk+5n6zGB8+9F3uaAWhZ9O3ToUK+MDqURSFkNd4lDaw976f18YPPeYp00w9DHrcxWFN6GMKxYsUKJzZEjR5LSV8B6DviLROThn3wQtuEMonhrXko6xrYLGaaHb1iwdSUlJapZ4mjMOEqsT0jZ2fmSo+xOBBgNd7icUBQK1tHRob8jJeTFrJlopGX+QYxP4qCqqkqLdlQqoyQAMGeXtbFtV6KMR7fNNmzExZPBSEYTGWm4MLy4trZWHV4iD8854t3t27frjoAkwcRHtp6lmQ46jgnjfKIWw1iXWW3IeuCb5L7WRIBpnwAY+kUBmpRKb86LDhDhXL58WcH3Ng0izPevBBPLly/XKXPw4MGUkgs4XTKunnb/kOweFnWtBGQqCZ8kL+2CibNcE2sJVq5cGQj1i1XeIRlPzcpLxhf1lpemsVNGQzWSYB7byEowIQOtjglCQOSXSmPuwo897X4sIDt6S9PS2B7Uwh4qzBAvnIn4uof593/BBPOVKRKHteE48T04N0sjfxX13kY/W0gBO12TnjFjhl+UI8PyZ3eNcix1pXTeQ5mGSqfMX3fuB6mWS3Wbg5iI1pjSLZeWlpZqldAen3JpXgkmtBZEh+M+G99ATQmx5w7hv1IFDGE+aWwNFw2lA5r6L46LEqyx9WKcU0VFRVoFOwposqKohdhz0KaauFse6o2t4eI1SYTH7RzTg2Q9SXuhdLobAPOLWwQ3tvpPebWxsdE/35zuphaCdt3nQSmTykQ6+zLoJLXgdIvsaNaB9erJWzOxi4f2jnvR/Pnz1cTTmXNxC95OZKnUGnII7LZkYFPdpviueyHOAUeGV01n61GcaYFlUKzHI3vXtvXkpNIB7Mz7ofPemDhOJ50NKalolXcSReEHvGtbowB1EieXgyNjG6JW1mEylDwIFoi9U42OkjXSNLA3oj6Ykle4g/t9R0D8LZXnxU1esWRttXM7lwwJNA6qCL2EpMO44iYIXNaFyMlFeu3t7Zq78ugeBbZz2d4RX2mBa/oFTRPLQs+ggfBlGA/gYV09hYvQR5eScRvF+Zt7iOm92JjMxU9snam3kLXPALvWYHlsoztBmgjtIGiazkMhw6ABC4+GpADa/QuA5bJ+Temn5sv/f4gSo/c5YNfYKd9kGVBdOCmO5hI1pkAC3t1uExKfmwTbFfoL4HACDlN/y5p+RZLfU/Fvs+BgbK1psLBXAjhR+qauh2unTfRdAa8N4D5pqQL+nwADAKGFDQ//Deb9AAAAAElFTkSuQmCC') no-repeat;-webkit-mask-size:1.7em;background-color:#003370;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #0a7aff), color-stop(2%, #004394), color-stop(100%, #00234c));background-image:-webkit-linear-gradient(#0a7aff,#004394 2%,#00234c);background-image:linear-gradient(#0a7aff,#004394 2%,#00234c);width:1.7em;height:1.7em}.x-list.x-list-indexed .x-list-disclosure{margin-right:1em}.x-list .x-item-selected .x-list-disclosure{background:#fff none}.x-list .x-list-item{position:relative;color:black}.x-list .x-list-item .x-list-item-label{min-height:2.6em;padding:0.7em 0.8em}.x-list .x-list-item.x-item-pressed .x-list-item-label{background:#77b2f8 none}.x-list .x-list-item.x-item-selected .x-list-item-label{background-color:#06346a;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #167bf3), color-stop(2%, #07448c), color-stop(100%, #042348));background-image:-webkit-linear-gradient(#167bf3,#07448c 2%,#042348);background-image:linear-gradient(#167bf3,#07448c 2%,#042348);color:white;text-shadow:rgba(0, 0, 0, 0.5) 0 -0.08em 0}.x-list-header{position:relative}.x-list-header-swap{position:absolute;left:0;width:100%;z-index:1}.x-ios .x-list-header-swap{-webkit-transform:translate3d(0, 0, 0)}.x-list-normal .x-list-header{background-color:#4d80bc;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #bccfe6), color-stop(2%, #6792c5), color-stop(100%, #3f6ea6));background-image:-webkit-linear-gradient(#bccfe6,#6792c5 2%,#3f6ea6);background-image:linear-gradient(#bccfe6,#6792c5 2%,#3f6ea6);color:#1f3651;text-shadow:rgba(255, 255, 255, 0.25) 0 0.08em 0;border-top:1px solid #4d80bc;border-bottom:1px solid #2d4e76;font-weight:bold;font-size:0.8em;padding:0.2em 1.02em;text-shadow:rgba(255, 255, 255, 0.25) 0 0.08em 0}.x-list-normal .x-list-item .x-list-item-label{border-top:1px solid #d1d1d1}.x-list-normal .x-list-item:first-child{border-top:none}.x-list-normal .x-list-item:last-child .x-list-item-label{border-bottom:1px solid #d1d1d1}.x-list-normal .x-list-item.x-item-pressed .x-list-item-label{border-top-color:#77b2f8}.x-list-normal .x-list-item.x-item-selected .x-list-item-label{border-top-color:#084b9b;border-bottom-color:#021022}.x-list-round .x-scroll-view{background-color:#EEEEEE !important}.x-list-round .x-list-disclosure{-webkit-mask:0 0 url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAACXBIWXMAAAsTAAALEwEAmpwYAAAKT2lDQ1BQaG90b3Nob3AgSUNDIHByb2ZpbGUAAHjanVNnVFPpFj333vRCS4iAlEtvUhUIIFJCi4AUkSYqIQkQSoghodkVUcERRUUEG8igiAOOjoCMFVEsDIoK2AfkIaKOg6OIisr74Xuja9a89+bN/rXXPues852zzwfACAyWSDNRNYAMqUIeEeCDx8TG4eQuQIEKJHAAEAizZCFz/SMBAPh+PDwrIsAHvgABeNMLCADATZvAMByH/w/qQplcAYCEAcB0kThLCIAUAEB6jkKmAEBGAYCdmCZTAKAEAGDLY2LjAFAtAGAnf+bTAICd+Jl7AQBblCEVAaCRACATZYhEAGg7AKzPVopFAFgwABRmS8Q5ANgtADBJV2ZIALC3AMDOEAuyAAgMADBRiIUpAAR7AGDIIyN4AISZABRG8lc88SuuEOcqAAB4mbI8uSQ5RYFbCC1xB1dXLh4ozkkXKxQ2YQJhmkAuwnmZGTKBNA/g88wAAKCRFRHgg/P9eM4Ors7ONo62Dl8t6r8G/yJiYuP+5c+rcEAAAOF0ftH+LC+zGoA7BoBt/qIl7gRoXgugdfeLZrIPQLUAoOnaV/Nw+H48PEWhkLnZ2eXk5NhKxEJbYcpXff5nwl/AV/1s+X48/Pf14L7iJIEyXYFHBPjgwsz0TKUcz5IJhGLc5o9H/LcL//wd0yLESWK5WCoU41EScY5EmozzMqUiiUKSKcUl0v9k4t8s+wM+3zUAsGo+AXuRLahdYwP2SycQWHTA4vcAAPK7b8HUKAgDgGiD4c93/+8//UegJQCAZkmScQAAXkQkLlTKsz/HCAAARKCBKrBBG/TBGCzABhzBBdzBC/xgNoRCJMTCQhBCCmSAHHJgKayCQiiGzbAdKmAv1EAdNMBRaIaTcA4uwlW4Dj1wD/phCJ7BKLyBCQRByAgTYSHaiAFiilgjjggXmYX4IcFIBBKLJCDJiBRRIkuRNUgxUopUIFVIHfI9cgI5h1xGupE7yAAygvyGvEcxlIGyUT3UDLVDuag3GoRGogvQZHQxmo8WoJvQcrQaPYw2oefQq2gP2o8+Q8cwwOgYBzPEbDAuxsNCsTgsCZNjy7EirAyrxhqwVqwDu4n1Y8+xdwQSgUXACTYEd0IgYR5BSFhMWE7YSKggHCQ0EdoJNwkDhFHCJyKTqEu0JroR+cQYYjIxh1hILCPWEo8TLxB7iEPENyQSiUMyJ7mQAkmxpFTSEtJG0m5SI+ksqZs0SBojk8naZGuyBzmULCAryIXkneTD5DPkG+Qh8lsKnWJAcaT4U+IoUspqShnlEOU05QZlmDJBVaOaUt2ooVQRNY9aQq2htlKvUYeoEzR1mjnNgxZJS6WtopXTGmgXaPdpr+h0uhHdlR5Ol9BX0svpR+iX6AP0dwwNhhWDx4hnKBmbGAcYZxl3GK+YTKYZ04sZx1QwNzHrmOeZD5lvVVgqtip8FZHKCpVKlSaVGyovVKmqpqreqgtV81XLVI+pXlN9rkZVM1PjqQnUlqtVqp1Q61MbU2epO6iHqmeob1Q/pH5Z/YkGWcNMw09DpFGgsV/jvMYgC2MZs3gsIWsNq4Z1gTXEJrHN2Xx2KruY/R27iz2qqaE5QzNKM1ezUvOUZj8H45hx+Jx0TgnnKKeX836K3hTvKeIpG6Y0TLkxZVxrqpaXllirSKtRq0frvTau7aedpr1Fu1n7gQ5Bx0onXCdHZ4/OBZ3nU9lT3acKpxZNPTr1ri6qa6UbobtEd79up+6Ynr5egJ5Mb6feeb3n+hx9L/1U/W36p/VHDFgGswwkBtsMzhg8xTVxbzwdL8fb8VFDXcNAQ6VhlWGX4YSRudE8o9VGjUYPjGnGXOMk423GbcajJgYmISZLTepN7ppSTbmmKaY7TDtMx83MzaLN1pk1mz0x1zLnm+eb15vft2BaeFostqi2uGVJsuRaplnutrxuhVo5WaVYVVpds0atna0l1rutu6cRp7lOk06rntZnw7Dxtsm2qbcZsOXYBtuutm22fWFnYhdnt8Wuw+6TvZN9un2N/T0HDYfZDqsdWh1+c7RyFDpWOt6azpzuP33F9JbpL2dYzxDP2DPjthPLKcRpnVOb00dnF2e5c4PziIuJS4LLLpc+Lpsbxt3IveRKdPVxXeF60vWdm7Obwu2o26/uNu5p7ofcn8w0nymeWTNz0MPIQ+BR5dE/C5+VMGvfrH5PQ0+BZ7XnIy9jL5FXrdewt6V3qvdh7xc+9j5yn+M+4zw33jLeWV/MN8C3yLfLT8Nvnl+F30N/I/9k/3r/0QCngCUBZwOJgUGBWwL7+Hp8Ib+OPzrbZfay2e1BjKC5QRVBj4KtguXBrSFoyOyQrSH355jOkc5pDoVQfujW0Adh5mGLw34MJ4WHhVeGP45wiFga0TGXNXfR3ENz30T6RJZE3ptnMU85ry1KNSo+qi5qPNo3ujS6P8YuZlnM1VidWElsSxw5LiquNm5svt/87fOH4p3iC+N7F5gvyF1weaHOwvSFpxapLhIsOpZATIhOOJTwQRAqqBaMJfITdyWOCnnCHcJnIi/RNtGI2ENcKh5O8kgqTXqS7JG8NXkkxTOlLOW5hCepkLxMDUzdmzqeFpp2IG0yPTq9MYOSkZBxQqohTZO2Z+pn5mZ2y6xlhbL+xW6Lty8elQfJa7OQrAVZLQq2QqboVFoo1yoHsmdlV2a/zYnKOZarnivN7cyzytuQN5zvn//tEsIS4ZK2pYZLVy0dWOa9rGo5sjxxedsK4xUFK4ZWBqw8uIq2Km3VT6vtV5eufr0mek1rgV7ByoLBtQFr6wtVCuWFfevc1+1dT1gvWd+1YfqGnRs+FYmKrhTbF5cVf9go3HjlG4dvyr+Z3JS0qavEuWTPZtJm6ebeLZ5bDpaql+aXDm4N2dq0Dd9WtO319kXbL5fNKNu7g7ZDuaO/PLi8ZafJzs07P1SkVPRU+lQ27tLdtWHX+G7R7ht7vPY07NXbW7z3/T7JvttVAVVN1WbVZftJ+7P3P66Jqun4lvttXa1ObXHtxwPSA/0HIw6217nU1R3SPVRSj9Yr60cOxx++/p3vdy0NNg1VjZzG4iNwRHnk6fcJ3/ceDTradox7rOEH0x92HWcdL2pCmvKaRptTmvtbYlu6T8w+0dbq3nr8R9sfD5w0PFl5SvNUyWna6YLTk2fyz4ydlZ19fi753GDborZ752PO32oPb++6EHTh0kX/i+c7vDvOXPK4dPKy2+UTV7hXmq86X23qdOo8/pPTT8e7nLuarrlca7nuer21e2b36RueN87d9L158Rb/1tWeOT3dvfN6b/fF9/XfFt1+cif9zsu72Xcn7q28T7xf9EDtQdlD3YfVP1v+3Njv3H9qwHeg89HcR/cGhYPP/pH1jw9DBY+Zj8uGDYbrnjg+OTniP3L96fynQ89kzyaeF/6i/suuFxYvfvjV69fO0ZjRoZfyl5O/bXyl/erA6xmv28bCxh6+yXgzMV70VvvtwXfcdx3vo98PT+R8IH8o/2j5sfVT0Kf7kxmTk/8EA5jz/GMzLdsAAAAgY0hSTQAAeiUAAICDAAD5/wAAgOkAAHUwAADqYAAAOpgAABdvkl/FRgAAAtpJREFUeNrs2k2IVlUYAODndZyaUfMnakxsERU5JChUCBIG0s8iaNGPBa0sSkUQJdq0CGnRzypyJS0SddPCsFr0QxtxlURmbcW0NlqgZg6CyuRp4RmYxUz3Bvf7Zo6eF87qu3zffXjPPe97zv0ipeRmijlusqjgCq7gCq7gCq7gCq7gCi4BHBHLIuKpiFh0Q4PjeoziLXyAjRExPBvAc3uAHcCj2IRnMQ+LcTYivkopXZhJcHS5H46I2/AMXsVjGJz08S84gD0ppTPFZzgi7szQjRid4pLVWIahiNidUjpd+jM8H89Pg52IEbyOrRExUjr4LD7FiYbrlmb0loi4p+/ilFJnA4vwCn5EahhnsBururyHxnvs/Au5BS/iaAv0JezHymLBGT2MF/ATxhvQY9iDhyaqRnHgjB7MdfhrXGlAX8QXeKRYcEbPyU3Il/inAT2Og3i4WPAk9Nqc6csN6Kv4HOuKBWd05Ezva4Eex7d4EgNd38vcPpW+FBFHcB7X8FJe2KaKATyOBbmDO5RSGp+VdbhltkfxSV6d/yvT13AYT2OoqCk9BXpFLlmpxfgGS7v67b6feETErbgvNyhN8Rd+zWWtvCmdkRtwpEVtHsNHuL+4VTpjh3L3dazFNB7DXtxbalmayGyb5/ZcbjVXltp4LMmHAm2wp/AuHiy1tVyIHTjeAvsn3sRIqZuHhdiO31pg/8B7uKPU7eFibGuJPY13sLzUA4Db8UZL7Em8jbuKPADAcuzE7y2wP2Nzr5/ZnoHzNH4/l5Um7Am8jOF+t7Vd7pYCd+cGY9rGLmM/xMGU0uViTy0zeA0+xoVpMns0T+MFM7Fp6TTD6br6h4g4n/e9z+GBSZccxi58l1K6NGMvl3pUlkbwGr7PmT2GJ3pxgvF/R/Tqz6URMR/r88u1Q/is05OL2fD2cAr0YK7Lf8/IAtVvcP2PRwVXcAVXcAVXcAVXcAVX8I0T/w4ADBKP+GttJ+EAAAAASUVORK5CYII=') no-repeat;background-color:#777777;background-image:none}.x-list-round .x-list-header{color:#777;font-size:1em;font-weight:bold;padding-left:26px;line-height:1.7em;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #eeeeee), color-stop(30%, rgba(238,238,238,0.9)), color-stop(100%, rgba(238,238,238,0.4)));background-image:-webkit-linear-gradient(top, #eeeeee,rgba(238,238,238,0.9) 30%,rgba(238,238,238,0.4));background-image:linear-gradient(top, #eeeeee,rgba(238,238,238,0.9) 30%,rgba(238,238,238,0.4))}.x-list-round .x-list-container{padding:13px 13px 0 13px}.x-list-round .x-list-container .x-list-header{padding-left:13px;background-image:none}.x-list-round.x-list-ungrouped .x-list-item-label,.x-list-round.x-list-grouped .x-list-item-label{border:solid #DDDDDD;border-width:1px 1px 0 1px;background:#fff}.x-list-round.x-list-ungrouped .x-list-item:first-child .x-list-item-label{-webkit-border-top-left-radius:0.4em;border-top-left-radius:0.4em;-webkit-border-top-right-radius:0.4em;border-top-right-radius:0.4em}.x-list-round.x-list-ungrouped .x-list-item:last-child{margin-bottom:13px}.x-list-round.x-list-ungrouped .x-list-item:last-child .x-list-item-label{-webkit-border-bottom-left-radius:0.4em;border-bottom-left-radius:0.4em;-webkit-border-bottom-right-radius:0.4em;border-bottom-right-radius:0.4em;border-width:1px}.x-list-round.x-list-grouped .x-list-header-item .x-list-item-label{-webkit-border-top-left-radius:0.4em;border-top-left-radius:0.4em;-webkit-border-top-right-radius:0.4em;border-top-right-radius:0.4em}.x-list-round.x-list-grouped .x-list-footer-item{margin-bottom:13px}.x-list-round.x-list-grouped .x-list-footer-item .x-list-item-label{border-width:1px;-webkit-border-bottom-left-radius:0.4em;border-bottom-left-radius:0.4em;-webkit-border-bottom-right-radius:0.4em;border-bottom-right-radius:0.4em}.x-dataview-inlineblock .x-dataview-item{display:inline-block !important}.x-dataview-nowrap .x-dataview-container{white-space:nowrap !important}.x-list-inlineblock .x-list-item{display:inline-block !important}.x-list-nowrap .x-list-inner{width:auto}.x-list-nowrap .x-list-container{white-space:nowrap !important}.x-list-paging{height:50px}.x-list-paging .x-loading-spinner{display:none;margin:auto}.x-list-paging .x-list-paging-msg{text-align:center;color:#06346a;padding-top:10px;-webkit-border-radius:6px;border-radius:6px}.x-list-paging.x-loading .x-loading-spinner{display:block}.x-list-paging.x-loading .x-list-paging-msg{display:none}.x-list-pullrefresh{display:-webkit-box;display:box;-webkit-box-orient:horizontal;box-orient:horizontal;-webkit-box-align:center;box-align:center;-webkit-box-pack:center;box-pack:center;position:absolute;top:-5em;left:0;width:100%;height:4.5em}.x-list-pullrefresh .x-loading-spinner{display:none}.x-list-pullrefresh-arrow{width:2.5em;height:4.5em;background:center center url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAA8CAYAAAAUufjgAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAjFJREFUeNrsmU8oREEYwOexdtNuKBfFwdVhCyfuysnFiXISS+1BLopyUpKLXETkRLaUi1LK3Q2lpPbiQLnIn03a/Hm+z86Ttv0zM++bfbOar36Hbad5v535Zp7v47iuy0wOpyoEHccRHV9L9NxPkUE/bhKCOKiOSPAdn69DsJ5I8E2HYA0QJRJ8Bb50CDYRCT7pEMQD0kwk+CByUFQEW4gE73UIhoA2IsFb4ENEMCQ5MdU1IxwygpT3oKNLMGyyYFVscdhusc8tDpu+xRG7xf95BW0O2kNiV1AgIvaQ2BzUJNgJNJYZGyUU7OG1cal4Bi68oqkDPszy2teEwJp5Cdyu/lZ1g8CwIYJ7wEF+2YmrNw90Byx3BizgKhaqizEP1wg7CLLxCEzy/CtauMeBlQDyEfNuGrgU6SyM8F9SyVgHdmRaH6tAb4XkToEp2d4M5mOK0TWMigU2koa8vJMRZPxEb2ss2LEVPMpPLlMRxBgDZjQJLgNbxb6Uab9tAn3EcifAeKkBMoLY+j0GWonk7oB+lmsFkwhidAGHBPmIeTcAnJcbKCuIMQEs+hScAzZEBqoIYuzyFVCJI36lMJ2CDfxibZeUu+EX/4uMIFP8ZyLejxkgK0hG5a8kP4IYSZbr1IuQVHmAX0HGX4VuGfZVJ6cQxPd1uoRcWqDW0SroFVzZAnJZ/h0LWhAjUUAw4XdSSsH8fExRTEgtGAOuOTETBb16Jk412e+bxOSwglYw6PgWYABvLk8P7zGJFwAAAABJRU5ErkJggg==') no-repeat;background-size:2em 3em;-webkit-transform:rotate(0deg)}.x-list-pullrefresh-release .x-list-pullrefresh-arrow{-webkit-transform:rotate(-180deg)}.x-list-pullrefresh-wrap{width:20em;font-size:0.7em}.x-list-pullrefresh-message{font-weight:bold;font-size:1.3em;margin-bottom:0.1em;text-align:center}.x-list-pullrefresh-updated{text-align:center}html,body{width:100%;height:100%}.x-translatable{position:absolute;top:100%;left:100%;z-index:1}.x-translatable-container{position:relative}.x-translatable-wrapper{width:100%;height:100%;position:absolute;overflow:hidden}.x-translatable-stretcher{width:300%;height:300%;position:absolute;visibility:hidden;z-index:-1}.x-translatable-nested-stretcher{width:100%;height:100%;left:100%;top:100%;position:absolute;visibility:hidden;z-index:-1}.x-layout-fit,.x-layout-card{position:relative;overflow:hidden}.x-layout-fit-item,.x-layout-card-item{position:absolute !important;width:100%;height:100%}.x-layout-hbox,.x-layout-vbox{display:-webkit-box}.x-layout-hbox > *,.x-layout-vbox > *{-webkit-box-flex:0}.x-layout-hbox{-webkit-box-orient:horizontal}.x-layout-vbox{-webkit-box-orient:vertical}.x-layout-hbox > .x-layout-box-item{width:0 !important}.x-layout-vbox > .x-layout-box-item{height:0 !important}.x-table-inner{display:table !important;width:100%;height:100%}.x-table-inner.x-table-fixed{table-layout:fixed !important}.x-table-row{display:table-row !important}.x-table-row > *{display:table-cell !important;vertical-align:middle}.x-container,.x-body{display:-webkit-box}.x-body{overflow:hidden;-webkit-box-flex:1;min-width:100%;min-height:100%}.x-body > .x-inner,.x-container > .x-inner{-webkit-box-flex:1;min-width:100%;min-height:100%;position:relative}.x-docking-horizontal{display:-webkit-box;-webkit-box-flex:1;-webkit-box-orient:horizontal;min-width:100%;min-height:100%}.x-docking-vertical{display:-webkit-box;-webkit-box-flex:1;-webkit-box-orient:vertical;min-width:100%;min-height:100%}.x-centered{position:absolute !important;width:100%;height:100%;display:-webkit-box;-webkit-box-align:center;-webkit-box-pack:center}.x-floating{position:absolute !important}.x-centered > *{position:relative !important;-webkit-box-flex:0 !important}.x-size-change-detector{visibility:hidden;position:absolute;left:0;top:0;z-index:-1;width:100%;height:100%;overflow:hidden}.x-size-change-detector > *{visibility:hidden}.x-size-change-detector-shrink > *{width:200%;height:200%}.x-size-change-detector-expand > *{width:100000px;height:100000px}.x-scroll-view{position:relative;display:block}.x-scroll-container{position:absolute;overflow:hidden;width:100%;height:100%}.x-scroll-scroller{position:absolute;min-width:100%;min-height:100%}.x-ios .x-scroll-scroller{-webkit-transform:translate3d(0, 0, 0)}.x-scroll-stretcher{position:absolute;visibility:hidden}.x-scroll-bar-grid-wrapper{position:absolute;width:100%;height:100%}.x-scroll-bar-grid{display:table;width:100%;height:100%}.x-scroll-bar-grid > *{display:table-row}.x-scroll-bar-grid > * > *{display:table-cell}.x-scroll-bar-grid > :first-child > :first-child{width:100%;height:100%}.x-scroll-bar-grid > :first-child > :nth-child(2){padding:3px 3px 0 0}.x-scroll-bar-grid > :nth-child(2) > :first-child{padding:0 0 3px 3px}.x-scroll-bar{position:relative;overflow:hidden}.x-scroll-bar-stretcher{position:absolute;visibility:hidden;width:100%;height:100%}.x-scroll-bar-x{width:100%}.x-scroll-bar-x > .x-scroll-bar-stretcher{width:300%}.x-scroll-bar-x.active{height:6px}.x-scroll-bar-y{height:100%}.x-scroll-bar-y > .x-scroll-bar-stretcher{height:300%}.x-scroll-bar-y.active{width:6px}.x-scroll-indicator{background:#333;position:absolute;z-index:2;opacity:0.5}.x-scroll-indicator.default{-webkit-border-top-left-radius:3px;border-top-left-radius:3px;-webkit-border-top-right-radius:3px;border-top-right-radius:3px;-webkit-border-bottom-left-radius:3px;border-bottom-left-radius:3px;-webkit-border-bottom-right-radius:3px;border-bottom-right-radius:3px}.x-list-light .x-scroll-indicator,.x-dataview-light .x-scroll-indicator{background:#fff;opacity:1}.x-scroll-indicator-x{height:100%}.x-scroll-indicator-y{width:100%}.x-scroll-indicator.csstransform{background:none}.x-scroll-indicator.csstransform > *{position:absolute;background-color:#333}.x-scroll-indicator.csstransform > :nth-child(2){-webkit-transform-origin:0% 0%;background:none;content:url(data:image/bmp;base64,Qk08AAAAAAAAADYAAAAoAAAAAQAAAAEAAAABABAAAAAAAAYAAAASCwAAEgsAAAAAAAAAAAAAxhgAAAAA)}.x-scroll-indicator.csstransform.x-scroll-indicator-light > *{background-color:#eee}.x-scroll-indicator.csstransform.x-scroll-indicator-light > :nth-child(2){content:url(data:image/bmp;base64,Qk08AAAAAAAAADYAAAAoAAAAAQAAAAEAAAABABAAAAAAAAYAAAASCwAAEgsAAAAAAAAAAAAAvXcAAAAA)}.x-scroll-indicator.csstransform.x-scroll-indicator-y > *{width:100%}.x-scroll-indicator.csstransform.x-scroll-indicator-y > :first-child{height:3px;-webkit-border-top-left-radius:3px;border-top-left-radius:3px;-webkit-border-top-right-radius:3px;border-top-right-radius:3px}.x-scroll-indicator.csstransform.x-scroll-indicator-y > :nth-child(2){height:1px}.x-scroll-indicator.csstransform.x-scroll-indicator-y > :last-child{height:3px;-webkit-border-bottom-left-radius:3px;border-bottom-left-radius:3px;-webkit-border-bottom-right-radius:3px;border-bottom-right-radius:3px}.x-scroll-indicator.csstransform.x-scroll-indicator-x > *{height:100%}.x-scroll-indicator.csstransform.x-scroll-indicator-x > :first-child{width:3px;-webkit-border-top-left-radius:3px;border-top-left-radius:3px;-webkit-border-bottom-left-radius:3px;border-bottom-left-radius:3px}.x-scroll-indicator.csstransform.x-scroll-indicator-x > :nth-child(2){width:1px}.x-scroll-indicator.csstransform.x-scroll-indicator-x > :last-child{width:3px;-webkit-border-top-right-radius:3px;border-top-right-radius:3px;-webkit-border-bottom-right-radius:3px;border-bottom-right-radius:3px}.x-carousel{position:relative;overflow:hidden}.x-carousel-item{position:absolute;width:100%;height:100%}.x-carousel-item > *{position:absolute;width:100%;height:100%}.x-carousel-indicator{padding:0;-webkit-border-radius:0;border-radius:0;-webkit-box-shadow:none;background-color:transparent;background-image:none}.x-carousel-indicator{-webkit-box-flex:1;display:-webkit-box;display:box;-webkit-box-pack:center;box-pack:center;-webkit-box-align:center;box-align:center}.x-carousel-indicator span{display:block;width:0.5em;height:0.5em;-webkit-border-radius:0.25em;border-radius:0.25em;margin:0.2em}.x-carousel-indicator-horizontal{height:1.5em;width:100%}.x-carousel-indicator-vertical{-webkit-box-orient:vertical;box-orient:vertical;width:1.5em;height:100%}.x-carousel-indicator-light span{background-color:rgba(255, 255, 255, 0.1);background-image:none}.x-carousel-indicator-light span.x-carousel-indicator-active{background-color:rgba(255, 255, 255, 0.3);background-image:none}.x-carousel-indicator-dark span{background-color:rgba(0, 0, 0, 0.1);background-image:none}.x-carousel-indicator-dark span.x-carousel-indicator-active{background-color:rgba(0, 0, 0, 0.3);background-image:none}.x-form .x-scroll-container{background-color:#eeeeee}.x-form .x-scroll-container > .x-inner{padding:1em}.x-form-label{text-shadow:#fff 0 1px 1px;color:#333333;text-shadow:rgba(255, 255, 255, 0.25) 0 0.08em 0;padding:0.6em;display:none !important;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}.x-form-label span{font-size:.8em;font-weight:bold}.x-field{min-height:2.5em}.x-field .x-field-input{position:relative}.x-field .x-field-input,.x-field .x-input-el{width:100%}.x-field.x-field-labeled .x-form-label{display:block !important}.x-field:last-child{border-bottom:0}.x-label-align-left .x-component-outer,.x-label-align-right .x-component-outer{-webkit-box-flex:1;box-flex:1}.x-label-align-left:first-child .x-form-label{-webkit-border-top-left-radius:0.4em;border-top-left-radius:0.4em}.x-label-align-left:last-child .x-form-label{-webkit-border-bottom-left-radius:0.4em;border-bottom-left-radius:0.4em}.x-label-align-right{-webkit-box-direction:reverse;box-direction:reverse}.x-label-align-right:first-child .x-form-label{-webkit-border-top-right-radius:0.4em;border-top-right-radius:0.4em}.x-label-align-right:last-child{border-bottom:0}.x-label-align-right:last-child .x-form-label{-webkit-border-bottom-right-radius:0.4em;border-bottom-right-radius:0.4em}.x-label-align-top,.x-label-align-bottom{-webkit-box-orient:vertical;box-orient:vertical}.x-label-align-top:first-child .x-form-label{-webkit-border-top-left-radius:0.4em;border-top-left-radius:0.4em;-webkit-border-top-right-radius:0.4em;border-top-right-radius:0.4em}.x-label-align-bottom:last-child .x-form-label{-webkit-border-bottom-left-radius:0.4em;border-bottom-left-radius:0.4em;-webkit-border-bottom-right-radius:0.4em;border-bottom-right-radius:0.4em}.x-input-el{padding:.4em;min-height:2.5em;display:block;border-width:0;background:transparent;-webkit-appearance:none}.x-field-mask{position:absolute;top:0;right:0;bottom:0;left:0}.x-field-required label:after,.x-field-required .x-form-label:after{content:"*";display:inline}.x-item-disabled label:after,.x-item-disabled .x-form-label:after{color:#666 !important}.x-field-textarea textarea{min-height:6em;padding-top:.5em}.x-checkmark-base,.x-field .x-input-radio:after,.x-field .x-input-checkbox:after,.x-field .x-input-radio:checked:after,.x-field .x-input-checkbox:checked:after,.x-field.x-item-disabled .x-input-radio:checked:after,.x-field.x-item-disabled .x-input-checkbox:checked:after,.x-select-overlay .x-item-selected .x-list-item-label:before,.x-select-overlay .x-item-selected .x-list-item-label:after{content:"";position:absolute;width:1.4em;height:1.4em;top:50%;left:auto;right:1.1em;-webkit-mask-size:1.4em;-webkit-mask-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAE+klEQVRoBe2aS28URxRGsY0h2FmwCQuEWLHjvUNgZAQ4PMwrEkIRIGEgySKwB8QvYIvEP+ANO0CwsJAA88wGBEKBZJUVQkJCQrwJ5nxN31Z5pnpc7e4ZT9vT0peqqanquqfurVvlIW3Dw8NTJtPTPplgxdoCnugeb3m45eEJtgJTJwJPGw8cP8V6TfmC4/Z/H9uEAAZsIdqHZiMBn2UNbvigSw8M2AIAD6PtqBPpmYe+8t1NoL9GLfYf3bTKKhiWo9PoA9KV0dUgn/tRh8tXWg/Hnj0KUB8yz1JNnjXUuhFd264A/f0O7dKXpQ7EIiTPfkKuVyvrSlx3US+KPF26cMbwxeg8Gg3W4LWHFd6rUUepQprQnI/Rh9A25AtjmqseHVkK7w59UxpgYFdg7wH0CwqFpWvyrKI23GZ7OWluwgqwOnqOobVoWh4Tm97DwCpBHUFp2TiUX3v5QVMnLQzMmqAsUVWWyta3UX/TAmOcwjjk6KmE830W7GbU0ZTAGKYEJdj3yAcQ2qYw1jmsG9e0KF8122UDw/SHwFX0EYWC+fpZGG/hPcn1sqk8jGHas+dQ6KXCB6o2g91IPfKsObZpgDGsqAT1hXdpz25A7QZqZU1gBsxFSh5zbEA9yniOU5R5PSvvCnYTSsLYtdkLTGf9uKdD/gS6gI6jPndgUXXe24OKSFAK4zsoSVA+G6uAGaC758/oBrIs+Zb6rbg9up35Xpa1jffpUqEEldezysbJ0VPLjhHADOpEfUiw2gtuUtAKDiGtYNXeqDWJ7zveYQnqM3V3nqx1s2s97xmRoLzzWqMgkLLaTVQJa0ZoJe+hXjRmaMYKVlslr2dlp5wgu4PsiTyszmg5qgVr0CqvoZW2WFlKxhV5gxJsdIMKtYH+Eew6yksoNLy0soJeFzqR+vEI9gx6h9wFzFoPSlA+25g3SlChnnUNU3grkWmxRg0n+ihBnUR5w9j2bCbPGjzzR3sgbc+6gL66TV4zkTHHEqSfZSzr+94V0mbzKUF1GkSWknG5QktGyoj7qBdVeZo2S1Ch2yUNXOMVUcEJyrcQjOeP4vzQCu9BpBtOck5T70HybN4w1iJcR7ouem9QPjhfG+On7EBPUNrKhrYLWp7+FS1FCjtdKvJ6VvM/Q9o2uWC1AHq60QB6hELh0voJ+im6iHReF+FZwe5HP/g8lrXNzuEfeeFu9C9Kg8nSrr9lBZ9ljK/v37xjL5qRFSytf3K15KXy9EH0D/JN3ui2Qj1rC5AAq4FnJvoDPUSNBnTnUy4YQF1maFHlCOAYuouJFN6PkWtEo+ryrH5sL2TPVi5UFXAMrfDegxrtae3ZfWh6paFFffYCx9BKZLtQo/a0YLXIhSUo3yKlAsfQ8vSBBkALtrCjxwdqbTWBY2glst9REee0Lw/ULUEZpFuOChxD1yuRybNbUV0SlAtq9SDgGFp7ushEJlhdKuqWoAzSLYOBHeidGPkc+cIztE2wA6iuCcoFtXom4Bha4f0nGmv2FqyOnoaFscFG9rsfQusYq0T2G8qayASrbdEdOlfR/TJ72AzAaHla5/QD9BnVCucvfK/fjZXtx8WzZneu/+WBf53XOb0G6XetHjQXyfv2vKLyH7qLLqMhJn5DOW5PLmBZDfRUilloGUoD/ovvXgIrT4/rkxt4XK0fw+TtYxhT6iEt4FK7L8D4locDFqnUXSadh78Bx5bEl2CLG+8AAAAASUVORK5CYII=');margin-top:-0.7em}.x-field .x-input-radio,.x-field .x-input-checkbox{position:relative}.x-field .x-input-radio:after,.x-field .x-input-checkbox:after{background-color:#dddddd}.x-field .x-input-radio:checked:after,.x-field .x-input-checkbox:checked:after{background-color:#06346a}.x-field.x-item-disabled .x-input-radio:checked:after,.x-field.x-item-disabled .x-input-checkbox:checked:after{background-color:#9caaba}.x-spinner .x-component-outer{display:-webkit-box;display:box}.x-spinner .x-component-outer > *{width:auto}.x-spinner .x-field-input{-webkit-box-flex:1}.x-spinner .x-field-input .x-input-el{-webkit-text-fill-color:#000;padding:0;width:100%;text-align:center}.x-spinner .x-field-input input::-webkit-outer-spin-button,.x-spinner .x-field-input input::-webkit-inner-spin-button{-webkit-appearance:none;margin:0}.x-spinner.x-item-disabled .x-input-el{-webkit-text-fill-color:#B3B3B3}.x-spinner.x-item-disabled .x-spinner-button{color:#aaa !important}.x-spinner.x-item-disabled .x-spinner-button,.x-toolbar .x-spinner.x-item-disabled .x-spinner-button{border:1px solid #c4c4c4;border-top-color:#d0d0d0;color:black}.x-spinner.x-item-disabled .x-spinner-button.x-button-back:before,.x-spinner.x-item-disabled .x-spinner-button.x-button-forward:before,.x-toolbar .x-spinner.x-item-disabled .x-spinner-button.x-button-back:before,.x-toolbar .x-spinner.x-item-disabled .x-spinner-button.x-button-forward:before{background:#c4c4c4}.x-spinner.x-item-disabled .x-spinner-button,.x-spinner.x-item-disabled .x-spinner-button.x-button-back:after,.x-spinner.x-item-disabled .x-spinner-button.x-button-forward:after,.x-toolbar .x-spinner.x-item-disabled .x-spinner-button,.x-toolbar .x-spinner.x-item-disabled .x-spinner-button.x-button-back:after,.x-toolbar .x-spinner.x-item-disabled .x-spinner-button.x-button-forward:after{background-color:#f7f7f7;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(2%, #ffffff), color-stop(100%, #e5e5e5));background-image:-webkit-linear-gradient(#ffffff,#ffffff 2%,#e5e5e5);background-image:linear-gradient(#ffffff,#ffffff 2%,#e5e5e5)}.x-spinner.x-item-disabled .x-spinner-button .x-button-icon.x-icon-mask,.x-toolbar .x-spinner.x-item-disabled .x-spinner-button .x-button-icon.x-icon-mask{background-color:black;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #4d4d4d), color-stop(2%, #121212), color-stop(100%, #000000));background-image:-webkit-linear-gradient(#4d4d4d,#121212 2%,#000000);background-image:linear-gradient(#4d4d4d,#121212 2%,#000000)}.x-spinner.x-item-disabled .x-spinner-button.x-button-pressing,.x-spinner.x-item-disabled .x-spinner-button.x-button-pressing:after,.x-spinner.x-item-disabled .x-spinner-button.x-button-pressed,.x-spinner.x-item-disabled .x-spinner-button.x-button-pressed:after,.x-spinner.x-item-disabled .x-spinner-button.x-button-active,.x-spinner.x-item-disabled .x-spinner-button.x-button-active:after,.x-toolbar .x-spinner.x-item-disabled .x-spinner-button.x-button-pressing,.x-toolbar .x-spinner.x-item-disabled .x-spinner-button.x-button-pressing:after,.x-toolbar .x-spinner.x-item-disabled .x-spinner-button.x-button-pressed,.x-toolbar .x-spinner.x-item-disabled .x-spinner-button.x-button-pressed:after,.x-toolbar .x-spinner.x-item-disabled .x-spinner-button.x-button-active,.x-toolbar .x-spinner.x-item-disabled .x-spinner-button.x-button-active:after{background-color:#efefef;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #d5d5d5), color-stop(10%, #e2e2e2), color-stop(65%, #efefef), color-stop(100%, #f0f0f0));background-image:-webkit-linear-gradient(#d5d5d5,#e2e2e2 10%,#efefef 65%,#f0f0f0);background-image:linear-gradient(#d5d5d5,#e2e2e2 10%,#efefef 65%,#f0f0f0)}.x-spinner .x-spinner-button{width:3em;padding:.65em 0;font-weight:bold;text-align:center}.x-spinner .x-spinner-button,.x-toolbar .x-spinner .x-spinner-button{border:1px solid #aaaaaa;border-top-color:#b7b7b7;color:black}.x-spinner .x-spinner-button.x-button-back:before,.x-spinner .x-spinner-button.x-button-forward:before,.x-toolbar .x-spinner .x-spinner-button.x-button-back:before,.x-toolbar .x-spinner .x-spinner-button.x-button-forward:before{background:#aaaaaa}.x-spinner .x-spinner-button,.x-spinner .x-spinner-button.x-button-back:after,.x-spinner .x-spinner-button.x-button-forward:after,.x-toolbar .x-spinner .x-spinner-button,.x-toolbar .x-spinner .x-spinner-button.x-button-back:after,.x-toolbar .x-spinner .x-spinner-button.x-button-forward:after{background-color:#dddddd;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(2%, #efefef), color-stop(100%, #cbcbcb));background-image:-webkit-linear-gradient(#ffffff,#efefef 2%,#cbcbcb);background-image:linear-gradient(#ffffff,#efefef 2%,#cbcbcb)}.x-spinner .x-spinner-button .x-button-icon.x-icon-mask,.x-toolbar .x-spinner .x-spinner-button .x-button-icon.x-icon-mask{background-color:black;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #4d4d4d), color-stop(2%, #121212), color-stop(100%, #000000));background-image:-webkit-linear-gradient(#4d4d4d,#121212 2%,#000000);background-image:linear-gradient(#4d4d4d,#121212 2%,#000000)}.x-spinner .x-spinner-button.x-button-pressing,.x-spinner .x-spinner-button.x-button-pressing:after,.x-spinner .x-spinner-button.x-button-pressed,.x-spinner .x-spinner-button.x-button-pressed:after,.x-spinner .x-spinner-button.x-button-active,.x-spinner .x-spinner-button.x-button-active:after,.x-toolbar .x-spinner .x-spinner-button.x-button-pressing,.x-toolbar .x-spinner .x-spinner-button.x-button-pressing:after,.x-toolbar .x-spinner .x-spinner-button.x-button-pressed,.x-toolbar .x-spinner .x-spinner-button.x-button-pressed:after,.x-toolbar .x-spinner .x-spinner-button.x-button-active,.x-toolbar .x-spinner .x-spinner-button.x-button-active:after{background-color:#d5d5d5;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #bcbcbc), color-stop(10%, #c9c9c9), color-stop(65%, #d5d5d5), color-stop(100%, #d7d7d7));background-image:-webkit-linear-gradient(#bcbcbc,#c9c9c9 10%,#d5d5d5 65%,#d7d7d7);background-image:linear-gradient(#bcbcbc,#c9c9c9 10%,#d5d5d5 65%,#d7d7d7)}.x-spinner .x-spinner-button-down{border:0 !important;border-right:1px solid #dddddd !important}.x-spinner .x-spinner-button-up{border:0 !important;border-left:1px solid #dddddd !important}.x-phone .x-select-overlay{min-width:14em;min-height:12.5em}.x-select-overlay{min-width:18em;min-height:22em}.x-select-overlay .x-list-item-label{height:2.6em}.x-select-overlay .x-list-label{white-space:nowrap;overflow:hidden;text-overflow:ellipsis;display:block}.x-select-overlay .x-item-selected .x-list-label{margin-right:2.6em}.x-select-overlay .x-item-selected .x-list-item-label:before{background-color:rgba(0, 0, 0, 0.3);margin-top:-0.8em}.x-select-overlay .x-item-selected .x-list-item-label:after{background-color:#dddddd}.x-slider-field .x-component-outer,.x-toggle-field .x-component-outer{padding:0.6em}.x-slider,.x-toggle{position:relative;height:2.2em;min-height:0;min-width:0}.x-slider > *,.x-toggle > *{position:absolute;width:100%;height:100%}.x-slider.x-item-disabled{opacity:.6}.x-thumb{position:absolute;height:2.2em;width:2.2em}.x-thumb:before{content:"";position:absolute;width:1.85em;height:1.85em;top:0.175em;left:0.175em;border:1px solid #919191;-webkit-border-radius:0.925em;border-radius:0.925em;background-color:#dddddd;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(2%, #efefef), color-stop(100%, #cbcbcb));background-image:-webkit-linear-gradient(#ffffff,#efefef 2%,#cbcbcb);background-image:linear-gradient(#ffffff,#efefef 2%,#cbcbcb);-webkit-background-clip:padding;background-clip:padding-box}.x-thumb.x-dragging{opacity:1}.x-thumb.x-dragging:before{background-color:#d0d0d0;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(2%, #e2e2e2), color-stop(100%, #bebebe));background-image:-webkit-linear-gradient(#ffffff,#e2e2e2 2%,#bebebe);background-image:linear-gradient(#ffffff,#e2e2e2 2%,#bebebe)}.x-slider:after{content:"";position:absolute;width:auto;height:0.8em;top:0.737em;left:0;right:0;margin:0 0.925em;background-color:#dddddd;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #c4c4c4), color-stop(10%, #d0d0d0), color-stop(65%, #dddddd), color-stop(100%, #dedede));background-image:-webkit-linear-gradient(#c4c4c4,#d0d0d0 10%,#dddddd 65%,#dedede);background-image:linear-gradient(#c4c4c4,#d0d0d0 10%,#dddddd 65%,#dedede);border:0.1em solid rgba(0, 0, 0, 0.1);border-bottom:0;-webkit-box-shadow:rgba(255, 255, 255, 0.7) 0 0.1em 0;-webkit-border-radius:0.4em;border-radius:0.4em}.x-toggle{width:4.4em;-webkit-border-radius:1.1em;border-radius:1.1em;overflow:hidden;border:1px solid #b7b7b7;background-color:#ddd;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #c4c4c4), color-stop(10%, #d0d0d0), color-stop(65%, #dddddd), color-stop(100%, #dedede));background-image:-webkit-linear-gradient(#c4c4c4,#d0d0d0 10%,#dddddd 65%,#dedede);background-image:linear-gradient(#c4c4c4,#d0d0d0 10%,#dddddd 65%,#dedede);-webkit-box-flex:0}.x-toggle .x-thumb.x-dragging{opacity:1}.x-toggle .x-thumb:before{top:0.175em}.x-toggle-on{background-color:#92cf00;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #6e9c00), color-stop(10%, #80b500), color-stop(65%, #92cf00), color-stop(100%, #94d200));background-image:-webkit-linear-gradient(#6e9c00,#80b500 10%,#92cf00 65%,#94d200);background-image:linear-gradient(#6e9c00,#80b500 10%,#92cf00 65%,#94d200)}input[type="search"]::-webkit-search-cancel-button{-webkit-appearance:none}.x-field-number input::-webkit-outer-spin-button,.x-field-number input::-webkit-inner-spin-button{-webkit-appearance:none;margin:0}.x-field-search .x-field-input{position:relative}.x-field-search .x-field-input:before{content:"";position:absolute;width:0.86em;height:0.86em;top:50%;left:0.5em;-webkit-mask-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAGdElEQVRoBdWaa4ycUxjHd9rpbm2bqKhiUavbVZdo0LCyLl3iHhGEkkZsKBYJX4RISHwQIYIPNJoQlUjTuCakUZ9oVGRF0GywslvqbgkpDarqsn7/6XsmM5n38pzzvtudeZL/nplznvM8z//cz5ktTU5OtuWRUqk0i/qdoAN0gcXgP+CkzIcx8APYBXbi82/SaZFSKGGILiTibnA+GADHgbkgSXZT8CF4GwyDEXxvI92r4k0Yoj1EeAG4CvSDEggRkX8VbID4lhADQXXUwxZgfAF4CGwFmgdFYQJb68HJljjy6mSSJZAZ4CLwESiKZJydb7A/CGblJZVWP5UwzueBB8AfIC7IovO0mK0B89KCzlOWSBinWoBeAkWTstiT3948xJLqxhLG2Xzw4jSRdQ0yiv/upMBD8xsI40Rzdu00k3WknyeO+aHk4urFEb4TJ/80CWEdYB4BhS1kdfswe+zpGNf80RYUIr9QSdgOdNCYCfaLcABpqFxBbymu3FIlDFkdD18B5wRYHaHOJvAeGCU4fa8IdnXUPAaoMZeDk4CvfEKFM7CrhswnbpxjZQX4C7j5Y0m1d64EXc5OWoqeFsPLwTvAYt/p/Iv+6jTb1rLKHMbYgWCjZxCb0T/e6qhWj3o6hz8HRMSRykp17l5WayfksyN8oafzTegfHOLQ1aG+blc6ZGQRdeVawB4GlWno7Pim1G9rB08AZzgrfRfdw3wdxelHvl/38K01Itc2Rf22Q8BPIIuoynXQL/SQj71DwcfA4n8nev1xjWfN0yGjD2gxsYh6432LolWHQL9F91Gj/j7oacUPFhE+11hbLxbrCFBzqWh5A4PDRqN90RZqVK9XE+ET67MSv41D9s3E0nwFX1Ndu4RFjkZpjkUxTkeEdTDIEvXqW1lKoeU0pOavXj10OsuSI1CYnaWUVC7COvpliR7f9CQzlaK5/LPBQRc6mstBIsIW0WXiO4tiDh35mIr1oS4kK2ENOctwqzPu+SX0MdDLjZWw9Pb1suyv7EPYR7cuEithLRLL6moW/0VriaVRtT1qTQkSER411Cyjc4pBL4/KEirPNRj4FZ3gXy5EWM+vWaIhtJQNf2GWYkg5dtWzui9bhuqn6OkVNUhE+ANjTZG91Kjrq6bDxHnGStqvcxHWsU5bQpZ0orCK3rDs21m2quXY6+DLTWBBNTP9wxbOKZZ4E63omLYZWG4r0nkQtOtwVASwdYeH723o9uTxS/3Ks+ytHk5/R3cI5LqIK2hEDw86XVkb+wV0Z+YiHDnWCjnu4Vj3Ug3DzhDn1NPacTX4HljJ6gFPr5e5RpZ74tFz6l0ezhWk5tFTYJFPEOjrLKxhrEazktWR8zVQ9vEVp1ttLYyplyeANQinN0ydIXBUnAOXR7nsrwAbgatrTbX3nu1s5Ul1oKgIRsZYMR/jy72gY0+u6a8OJMJX1P+C9MsaqDcPAseCHtANQkRTwHIoybZd21qR0Q2k1pZP0tNJSIubLhxJOr75egO/sjbekM/VIe0qY1RDb6p//PYl6/QniO0sF2tI2kBYRpBTgVrUOWqm9DPiGgghW+GWVBGj/UCvEM1E1sWinr4sKfa0/NgedhUwqsVITzvOUTOl6gxv0qmERRw5HOi/bHz2zb3VMHp28hremYQj0rq23QhGwFSQ0ZVPu8NvAfa3Use8kJkI1wzxxRhfDcYDAotrKF0GngYnRA17D599f7KVXcVzmoszLfUi7AxhfBG4GKwFPudhBacnmpfBStDwnzrkrQIhpDW8L3ExJqXV/wBA2Vs4WelquT9Qzy8FvdHnDlKR01RQ8OrJMaAp8TnYQUA7SBsEm6pzPXgcyI6PaCG7Hdu6VcVLUkuE5ONBR8ByDGb42sPGteBPEDcV0vK0ZZ2Z5C9oSCcZKzqfwO8OJK2FbCAunqYmrICRQaA3rLRejSvTWtGwTzc94Yj0DQS/O4C05nQd6VYhrIVMpEN6Wqv3crBngY4b582aR9DXgJCFTPt05T+AtKq2jNARzxLs/UBbnY/0onwLO97sXPuwj8cidQn8OuytAe0edjUyuluqh2vIPcNnPS1rIbOKfkRf0pKEGdqSJyFwM/AZ3j+2JGHXpZDWWf4+sMvlpaTal7e3xLYEsdQ4ITIIsras29AppxrKctRM5ZDRLUvv13GnLl1p5yjellylCb5BolvWkRQMgT6g6apXmnVgPWQrc/1/boJCaHVWyukAAAAASUVORK5CYII=');-webkit-mask-size:.86em;background-color:#ccc;-webkit-mask-repeat:no-repeat;margin-top:-0.43em}.x-field-search .x-field-input .x-form-field{margin-left:1.0em}.x-field-input .x-clear-icon{display:none;background:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAADHmlDQ1BJQ0MgUHJvZmlsZQAAeAGFVN9r01AU/tplnbDhizpnEQk+aJFuZFN0Q5y2a1e6zVrqNrchSJumbVyaxiTtfrAH2YtvOsV38Qc++QcM2YNve5INxhRh+KyIIkz2IrOemzRNJ1MDufe73/nuOSfn5F6g+XFa0xQvDxRVU0/FwvzE5BTf8gFeHEMr/GhNi4YWSiZHQA/Tsnnvs/MOHsZsdO5v36v+Y9WalQwR8BwgvpQ1xCLhWaBpXNR0E+DWie+dMTXCzUxzWKcECR9nOG9jgeGMjSOWZjQ1QJoJwgfFQjpLuEA4mGng8w3YzoEU5CcmqZIuizyrRVIv5WRFsgz28B9zg/JfsKiU6Zut5xCNbZoZTtF8it4fOX1wjOYA1cE/Xxi9QbidcFg246M1fkLNJK4RJr3n7nRpmO1lmpdZKRIlHCS8YlSuM2xp5gsDiZrm0+30UJKwnzS/NDNZ8+PtUJUE6zHF9fZLRvS6vdfbkZMH4zU+pynWf0D+vff1corleZLw67QejdX0W5I6Vtvb5M2mI8PEd1E/A0hCgo4cZCjgkUIMYZpjxKr4TBYZIkqk0ml0VHmyONY7KJOW7RxHeMlfDrheFvVbsrj24Pue3SXXjrwVhcW3o9hR7bWB6bqyE5obf3VhpaNu4Te55ZsbbasLCFH+iuWxSF5lyk+CUdd1NuaQU5f8dQvPMpTuJXYSWAy6rPBe+CpsCk+FF8KXv9TIzt6tEcuAcSw+q55TzcbsJdJM0utkuL+K9ULGGPmQMUNanb4kTZyKOfLaUAsnBneC6+biXC/XB567zF3h+rkIrS5yI47CF/VFfCHwvjO+Pl+3b4hhp9u+02TrozFa67vTkbqisXqUj9sn9j2OqhMZsrG+sX5WCCu0omNqSrN0TwADJW1Ol/MFk+8RhAt8iK4tiY+rYleQTysKb5kMXpcMSa9I2S6wO4/tA7ZT1l3maV9zOfMqcOkb/cPrLjdVBl4ZwNFzLhegM3XkCbB8XizrFdsfPJ63gJE722OtPW1huos+VqvbdC5bHgG7D6vVn8+q1d3n5H8LeKP8BqkjCtbCoV8yAAAACXBIWXMAAAsTAAALEwEAmpwYAAABbmlUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iWE1QIENvcmUgNC40LjAiPgogICA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPgogICAgICA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIgogICAgICAgICAgICB4bWxuczpkYz0iaHR0cDovL3B1cmwub3JnL2RjL2VsZW1lbnRzLzEuMS8iPgogICAgICAgICA8ZGM6c3ViamVjdD4KICAgICAgICAgICAgPHJkZjpCYWcvPgogICAgICAgICA8L2RjOnN1YmplY3Q+CiAgICAgIDwvcmRmOkRlc2NyaXB0aW9uPgogICA8L3JkZjpSREY+CjwveDp4bXBtZXRhPgrlPw1BAAAIWklEQVRoBdVbS2hVRxiee83LmJeaRBOTCKWgtIiJoQYNFAnSRSF205AqKEJ3urDQlq7aECuuCqUUzK5gS20XBUMLlQYaH3TRoGJsaTURN0mMryQGE40mJun3He65zL2ZmTPnZZOBm3POzPz//N/MN/88k1hcXBRxh2vXrlUsLCxsWbVq1WaUV5JIJIpRZi5+0/iewvc40gdvI7S1tc3GaU8iDsBXr17dlpOTsxeGt+C3G791NiBgyzzA30De83jvffLkye/Nzc1TNrK2eSIDDJBVAHkIhh6E0a/bGmDKB10zSO9G659ubGzswXdoOoYGfOXKlVcA9BOAPAzj8kwAwqQB67+QP3nr1q0fQfv5oLoCA+7r6yvJz88/joKPAmxOUAMCyN2cn58/umPHjt4AsiIQ4P7+/ndQWBeAVgUpNAoZtPgP0HOkvr5+0o8+X4ABMAGP+xkeHSgk4aegmPIOQO++7du3D9rqtwYMp1SIYeU0wL5rq/xl5ENLT8KmdoDusSkvaZPp8uXLtXBMfyw3sLQdNpUB9K/oZsdssHi2MMHm5ub2QfH/1l9tgDAPhq8TDQ0Nn5ryGwGTxmxZKGgwKVlOaQB9AKDp0JRBS2m0aIJ9FlIrBiwRJpPJb0DvN5Roma5LSHnjZeWgdLZmxRfguxv2V2fFO59KwBxn0cAcelZkgO3V+J29cOHCkgnRkojUDKoLSI3jbF1dnVi7dq22QsbGxsSdO3e06aaE2tpasW6dfr0xMjIixsfHTSrovXeWlZV9gExfyBmXtDCni8js6ZEJZm5uTtaV8b5+/XpRVFSUEWfzQRlTRT5+/FhMTEzYqCLoDjRgjZw5AzAXAkg8KmfQvWM+K4aGhnTJLEzU1NTQiWjzZCe4MnyqwosXLwRbF+OuKlkVV1RQUNApJ2RYk1r1LKG5LCC/Y70qHj58KEdlvIMtoqrKkyxpmY0bNwrK6ALBmlilkkPlHMTwWuempQFzPYuaPewm2DxZ0/fv3xfPnj3TZmdftKF2YWGhKC8v1+ohjUlnvwGYctGQH7lyacCIPIRI3+tZUnt4eNjVt+RJSm/atMmh+JJEKYJ5dPSfnZ0Vd+/e9UNlSbOg3MFz58451EkDZmRGLh8fMzMzjkE6EdK0ulo5LDoiGzZsEKtXr9aJO/2W/TdoQCuXobu0Ut4BDDpvQ2TgbRlSm8ME+7QqQLfjeVXUhlNxqMw8qvDgwQMxPT2tSvIVB/bsp4ADGHTe60takZnU5lCFuawiVQhMU51WzqYtWx7lK2XIHDpFVmjYAB0tnZ2d6TGjJaxCytN5sa/pAluTntgNprGaIFmBYajslsMnad3a2trg9uFmOTHoO4189OiR1pvK1M7LyxOVlZVaZ3bv3j3x9OnToKYo5VD+7hxukoNm+jmiUlQfSWqzlTnMqKjKOI7N9LwErQpTU1PObCoKKsv6AXhrEkq3ypFRvHtRmx65pKREWRQpzNaNispyIQC8JcnjDzkyqvfJyUmH3ip9pHa283LzcSITNZVd3WjczUl4VZ7zRB7orTmkPH/+3Fq3qZKslRgyoqJLkvgTC2CWS2qzxWz6IiuGeekD4gqwo5hemqd4sQWOpXRQXoEOzDTb8pK3TM8l4PDTGE1pnGxw2mhaAbmi7NfMy7E6xjBNLx3pcaRsLBfy2HWQo4zvrBiOzayoOAIqdYp92LxXErBkjsNsMVWgQ9P1a1ZSaWmpSix0HMocp5ceDK0pSwEnF5xCqiYezMp1Lfu2LnBiElN/HkzymgGQR+Ya2Re56C8uVjt/d23L2ZhucuFWWNTUhm0DSd6pwMsNXW37jSeV5QWCLE8ac2wmaC75OO/WUZszMdKbFRhVAJuvu4uH81EoZcuYdjcIUt5e5RTStD1EakfotRcB+KIDGLUc6DRdriS2REVFhbbvkb6jo6OyiLN2ZpxussHpJyswCmoD41+4JzLmAOZtGUTovUiGmeoP7mZwSFEF0pYLeVVrelF7zZo1guvmsNSGDb/QNgdw6mpQt8pYmzhSmXvQukCPzL6rC2xl05w7Cq8NtnzH8t0+THp9qzPIFM+ap0G6tS30eh65kAGm7SGWz+OXENT+070WkQYMfv+Ggnk1yFegNzWdA/GMyWa5R2qbjlDovDiRCUjtL11QacAAy52yk26CzRM3A4xUJk3piW0Dx2YTtekU2ad9hoHu7u6fXJk0YEbw0hceN91E05M1zX6rm02x/nyeAzle20uGp5Z+qA07jnd0dKS3UjMA84YbgtVhGmms26ZhRXFSQZr6DdljdbY8WcWhyiYA7CXc4zoj51Xe8cCB+Bm0oLNxLWdeSe8AOwcMDXBW/8h2Z7SwlHAE7wPS94p7BeBj2WAJQgk4dZ1vH4R8XetbLrUCu0/hJk+Xyh4lYGbkuAVKtEM4spWUyoAY4nqxGai9pKYFnALdg+eHMRgVi0o0zm2M+W179uzRHjUaAdMq0PsrzJZOxGJhhEoJFox8e9euXcYLIJ6AaROv8wH0Abzqj/ojNN6vKoA9j/n6TnZDL1krwFTC63xQ/CZ+mWs8rxJiToc9p9Bn3/JqWdcM5TjsJqqevOEG6pzFb6cq/WXFAegcfsd03lhnh3ULuwpQwChqtBmFfYw4/1MpV1GIJ8q+hAqHKeqhx6TadwvLynjpC6uYThjA/2SJ9QQjVe4AyvocjvR72Q4/775bWFbe1NQ0AkfxPubfryL+axgT10SlD/rbsep5LQxY2h6qhalADrwahM2AfWjt9wC+BU/7YwdZkXPTaPFv6PiZOxU23jdTXP8VKWC5GF4g4Z0KgG7Gbwt+WwFgM57FeHLTml1gGt/8d7wxvHNmN4Dh7zp+F7nhJuuL6v0/Vc+vwPfknLsAAAAASUVORK5CYII=') no-repeat;background-position:center center;background-size:55% 55%;width:2.2em;height:2.2em;margin:.5em;margin-top:-1.1em;position:absolute;top:50%;right:-0.5em}.x-field-clearable .x-clear-icon{display:block}.x-field-clearable .x-field-input{padding-right:2.2em}.x-android .x-input-el{-webkit-text-fill-color:#000}.x-android .x-empty .x-input-el{-webkit-text-fill-color:#A9A9A9}.x-item-disabled .x-form-label span,.x-item-disabled input,.x-item-disabled .x-input-el,.x-item-disabled .x-spinner-body,.x-item-disabled select,.x-item-disabled textarea,.x-item-disabled .x-field-clear-container{color:#b3b3b3;-webkit-text-fill-color:#b3b3b3;pointer-events:none}.x-form-fieldset{margin:0 0 1.5em}.x-form-fieldset .x-form-label{background-color:#f7f7f7;border-top:1px solid white}.x-form-fieldset .x-form-fieldset-inner{border:1px solid #dddddd;background:#fff;padding:0;-webkit-border-radius:0.4em;border-radius:0.4em;overflow:hidden}.x-form-fieldset .x-field{border-bottom:1px solid #dddddd}.x-form-fieldset .x-field:first-child{-webkit-border-top-left-radius:0.4em;border-top-left-radius:0.4em;-webkit-border-top-right-radius:0.4em;border-top-right-radius:0.4em}.x-form-fieldset .x-field:last-child{border-bottom:0;-webkit-border-bottom-left-radius:0.4em;border-bottom-left-radius:0.4em;-webkit-border-bottom-right-radius:0.4em;border-bottom-right-radius:0.4em}.x-form-fieldset-title{text-shadow:#fff 0 1px 1px;color:#333333;margin:1em 0.7em 0.3em;color:#333333;font-weight:bold;white-space:nowrap}.x-form-fieldset-instructions{text-shadow:#fff 0 1px 1px;color:#333333;color:gray;margin:1em 0.7em 0.3em;font-size:.8em;text-align:center}.x-selectmark-base,.x-field-select .x-component-outer:after{content:"";position:absolute;width:1em;height:1em;top:50%;left:auto;right:0.7em;-webkit-mask-size:1em;-webkit-mask-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA2ZpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYwIDYxLjEzNDc3NywgMjAxMC8wMi8xMi0xNzozMjowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDpGRTdGMTE3NDA3MjA2ODExOTJDQUMyNUQwRUE4NjdEQiIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDoxQTFBMDFDQ0I5NEYxMURGQUU1RjlGMEFERUNDQTVEMCIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDoyMkRCMDIxMkI5NEUxMURGQUU1RjlGMEFERUNDQTVEMCIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ1M1IE1hY2ludG9zaCI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOjMwRTE0QzVBNDIyMjY4MTFCQ0ZCOTAzOTcwNzcyRkVCIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOkZFN0YxMTc0MDcyMDY4MTE5MkNBQzI1RDBFQTg2N0RCIi8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+HfrH/AAAAeVJREFUeNrs2cFHBGEUAPA3zYqIiIhOnTpFRHSKrp26RqeuEV077R/QqWtE166dOkVERHRa9hQRnZalFcv0Hk/W1Mx+38z3vvlm5j3eZW+/9+abne+9KEkSaFPMQMtCwQpWsIIVrGAFK1jBClawgo2ik/4hiqJGwLKuvfpIc5xSkWqYr5hzU1s/mRNxXTPsJ+ZqluvXlwOmSj3XBDvG3M1rpAmYYoUrFzr4ZNqTawqm2MH8Dhh7ZXJUbcAUx4FinzBnJcAUl4FhP/jIgRSYKvkYCJaO2LbNv08RMMUy5nsA4COTLy0XYIqtil9iF6aflq7AwBWuAvuQ9ZKSBgNX2ieWjtKSzeXBNZgqfe8J+4W5aXtbcg0GrvibB/BhkeuhBJhigzsghT0veh+WAlMcCGHvMOMQwcCdcIntYy6WmXhIg2PuiAvsEHO97IhHGgzckb4D8L6LmZYPMHBnhiWwXVdDPF9g4A4Vwd66nFr6BAN3ygbbw1yoMzjmjplgB5hrrufSvsHAHesZDOD2JAbxVYCBOzfIAZ9JbR6qAgN3cPwP9kZy1VIlGLiTdluCmoOBO/pnS9Bk8DzmS3pL4BMcpZEe1qX0GI/atC4dQYXRMa1MU0IX4gpWsIIVrGAFK1jBCnYUPwIMAPUPAyFL+nRdAAAAAElFTkSuQmCC');margin-top:-0.5em}.x-field-select{position:relative}.x-field-select .x-component-outer:after{background-color:#dddddd;z-index:2}.x-field-select .x-component-outer:before,.x-field-select .x-component-outer:after{pointer-events:none;position:absolute;display:block}.x-field-select .x-component-outer:before{content:"";position:absolute;width:4em;height:auto;top:0;left:auto;right:0;bottom:0;-webkit-border-top-right-radius:0.4em;border-top-right-radius:0.4em;-webkit-border-bottom-right-radius:0.4em;border-bottom-right-radius:0.4em;background:-webkit-gradient(linear, 0% 0%, 100% 0%, from(rgba(255, 255, 255, 0)), color-stop(0.5, white));z-index:1}.x-msgbox{min-width:15em;max-width:20em;padding:0.8em;-webkit-box-shadow:rgba(0, 0, 0, 0.4) 0 0.1em 0.5em;-webkit-border-radius:0.3em;border-radius:0.3em;border:0.15em solid #354f6e}.x-msgbox .x-icon{margin-left:1.3em}.x-msgbox .x-title{font-size:.9em;line-height:1.4em}.x-msgbox .x-body{background:transparent !important}.x-msgbox .x-toolbar{background:transparent none;-webkit-box-shadow:none}.x-msgbox .x-toolbar.x-docked-top{border-bottom:0;height:1.3em}.x-msgbox .x-toolbar.x-docked-bottom{border-top:0}.x-msgbox .x-field{min-height:2em;background:#fff;-webkit-border-radius:0.2em;border-radius:0.2em}.x-msgbox .x-form-field{min-height:1.5em;padding-right:0 !important;-webkit-appearance:none}.x-msgbox .x-field-input{padding-right:2.2em}.x-msgbox-text{text-align:center;padding:6px 0;line-height:1.4em}.x-msgbox-buttons{padding:0.4em 0;height:auto}.x-msgbox-buttons .x-button{min-width:4.5em}.x-msgbox-buttons .x-button-normal span{opacity:.7}.x-msgbox-dark .x-msgbox-text{color:rgba(186, 202, 222, 0.9);text-shadow:rgba(0, 0, 0, 0.5) 0 -0.08em 0}.x-msgbox-dark .x-msgbox-input{background-color:rgba(186, 202, 222, 0.9);background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, rgba(152,176,205,0.9)), color-stop(10%, rgba(169,189,214,0.9)), color-stop(65%, rgba(186,202,222,0.9)), color-stop(100%, rgba(188,204,223,0.9)));background-image:-webkit-linear-gradient(rgba(152,176,205,0.9),rgba(169,189,214,0.9) 10%,rgba(186,202,222,0.9) 65%,rgba(188,204,223,0.9));background-image:linear-gradient(rgba(152,176,205,0.9),rgba(169,189,214,0.9) 10%,rgba(186,202,222,0.9) 65%,rgba(188,204,223,0.9));border:0.1em solid rgba(66, 99, 138, 0.9)}.x-loading-spinner{font-size:250%;height:1em;width:1em;position:relative;-webkit-transform-origin:0.5em 0.5em}.x-loading-spinner > span,.x-loading-spinner > span:before,.x-loading-spinner > span:after{display:block;position:absolute;width:0.1em;height:0.25em;top:0;-webkit-transform-origin:0.05em 0.5em;-webkit-border-radius:0.05em;border-radius:0.05em;content:" "}.x-loading-spinner > span.x-loading-top{background-color:rgba(170, 170, 170, 0.99)}.x-loading-spinner > span.x-loading-top::after{background-color:rgba(170, 170, 170, 0.9)}.x-loading-spinner > span.x-loading-left::before{background-color:rgba(170, 170, 170, 0.8)}.x-loading-spinner > span.x-loading-left{background-color:rgba(170, 170, 170, 0.7)}.x-loading-spinner > span.x-loading-left::after{background-color:rgba(170, 170, 170, 0.6)}.x-loading-spinner > span.x-loading-bottom::before{background-color:rgba(170, 170, 170, 0.5)}.x-loading-spinner > span.x-loading-bottom{background-color:rgba(170, 170, 170, 0.4)}.x-loading-spinner > span.x-loading-bottom::after{background-color:rgba(170, 170, 170, 0.35)}.x-loading-spinner > span.x-loading-right::before{background-color:rgba(170, 170, 170, 0.3)}.x-loading-spinner > span.x-loading-right{background-color:rgba(170, 170, 170, 0.25)}.x-loading-spinner > span.x-loading-right::after{background-color:rgba(170, 170, 170, 0.2)}.x-loading-spinner > span.x-loading-top::before{background-color:rgba(170, 170, 170, 0.15)}.x-loading-spinner > span{left:50%;margin-left:-0.05em}.x-loading-spinner > span.x-loading-top{-webkit-transform:rotate(0deg);-moz-transform:rotate(0deg)}.x-loading-spinner > span.x-loading-right{-webkit-transform:rotate(90deg);-moz-transform:rotate(90deg)}.x-loading-spinner > span.x-loading-bottom{-webkit-transform:rotate(180deg);-moz-transform:rotate(180deg)}.x-loading-spinner > span.x-loading-left{-webkit-transform:rotate(270deg);-moz-transform:rotate(270deg)}.x-loading-spinner > span::before{-webkit-transform:rotate(30deg);-moz-transform:rotate(30deg)}.x-loading-spinner > span::after{-webkit-transform:rotate(-30deg);-moz-transform:rotate(-30deg)}.x-loading-spinner{-webkit-animation-name:x-loading-spinner-rotate;-webkit-animation-duration:.5s;-webkit-animation-iteration-count:infinite;-webkit-animation-timing-function:linear}@-webkit-keyframes x-loading-spinner-rotate{0%{-webkit-transform:rotate(0deg)}8.32%{-webkit-transform:rotate(0deg)}8.33%{-webkit-transform:rotate(30deg)}16.65%{-webkit-transform:rotate(30deg)}16.66%{-webkit-transform:rotate(60deg)}24.99%{-webkit-transform:rotate(60deg)}25%{-webkit-transform:rotate(90deg)}33.32%{-webkit-transform:rotate(90deg)}33.33%{-webkit-transform:rotate(120deg)}41.65%{-webkit-transform:rotate(120deg)}41.66%{-webkit-transform:rotate(150deg)}49.99%{-webkit-transform:rotate(150deg)}50%{-webkit-transform:rotate(180deg)}58.32%{-webkit-transform:rotate(180deg)}58.33%{-webkit-transform:rotate(210deg)}66.65%{-webkit-transform:rotate(210deg)}66.66%{-webkit-transform:rotate(240deg)}74.99%{-webkit-transform:rotate(240deg)}75%{-webkit-transform:rotate(270deg)}83.32%{-webkit-transform:rotate(270deg)}83.33%{-webkit-transform:rotate(300deg)}91.65%{-webkit-transform:rotate(300deg)}91.66%{-webkit-transform:rotate(330deg)}100%{-webkit-transform:rotate(330deg)}}
diff --git a/apps/files_odfviewer/src/webodf/programs/touchui/sencha-touch.js b/apps/files_odfviewer/src/webodf/programs/touchui/sencha-touch.js
deleted file mode 100644
index caf8e4541d..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/touchui/sencha-touch.js
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
-
-This file is part of Sencha Touch 2
-
-Copyright (c) 2012 Sencha Inc
-
-Contact:  http://www.sencha.com/contact
-
-Commercial Usage
-Licensees holding valid commercial licenses may use this file in accordance with the Commercial Software License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Sencha.
-
-If you are unsure which license is appropriate for your use, please contact the sales department at http://www.sencha.com/contact.
-
-*/
-(function(){var global=this,objectPrototype=Object.prototype,toString=objectPrototype.toString,enumerables=true,enumerablesTest={toString:1},emptyFn=function(){},i;if(typeof Ext==="undefined"){global.Ext={}}Ext.global=global;for(i in enumerablesTest){enumerables=null}if(enumerables){enumerables=["hasOwnProperty","valueOf","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","constructor"]}Ext.enumerables=enumerables;Ext.apply=function(object,config,defaults){if(defaults){Ext.apply(object,defaults)}if(object&&config&&typeof config==="object"){var i,j,k;for(i in config){object[i]=config[i]}if(enumerables){for(j=enumerables.length;j--;){k=enumerables[j];if(config.hasOwnProperty(k)){object[k]=config[k]}}}}return object};Ext.buildSettings=Ext.apply({baseCSSPrefix:"x-",scopeResetCSS:false},Ext.buildSettings||{});Ext.apply(Ext,{emptyFn:emptyFn,baseCSSPrefix:Ext.buildSettings.baseCSSPrefix,applyIf:function(object,config){var property;if(object){for(property in config){if(object[property]===undefined){object[property]=config[property]}}}return object},iterate:function(object,fn,scope){if(Ext.isEmpty(object)){return}if(scope===undefined){scope=object}if(Ext.isIterable(object)){Ext.Array.each.call(Ext.Array,object,fn,scope)}else{Ext.Object.each.call(Ext.Object,object,fn,scope)}}});Ext.apply(Ext,{extend:function(){var objectConstructor=objectPrototype.constructor,inlineOverrides=function(o){for(var m in o){if(!o.hasOwnProperty(m)){continue}this[m]=o[m]}};return function(subclass,superclass,overrides){if(Ext.isObject(superclass)){overrides=superclass;superclass=subclass;subclass=overrides.constructor!==objectConstructor?overrides.constructor:function(){superclass.apply(this,arguments)}}var F=function(){},subclassProto,superclassProto=superclass.prototype;F.prototype=superclassProto;subclassProto=subclass.prototype=new F();subclassProto.constructor=subclass;subclass.superclass=superclassProto;if(superclassProto.constructor===objectConstructor){superclassProto.constructor=superclass}subclass.override=function(overrides){Ext.override(subclass,overrides)};subclassProto.override=inlineOverrides;subclassProto.proto=subclassProto;subclass.override(overrides);subclass.extend=function(o){return Ext.extend(subclass,o)};return subclass}}(),override:function(cls,overrides){if(cls.$isClass){return cls.override(overrides)}else{Ext.apply(cls.prototype,overrides)}}});Ext.apply(Ext,{valueFrom:function(value,defaultValue,allowBlank){return Ext.isEmpty(value,allowBlank)?defaultValue:value},typeOf:function(value){if(value===null){return"null"}var type=typeof value;if(type==="undefined"||type==="string"||type==="number"||type==="boolean"){return type}var typeToString=toString.call(value);switch(typeToString){case"[object Array]":return"array";case"[object Date]":return"date";case"[object Boolean]":return"boolean";case"[object Number]":return"number";case"[object RegExp]":return"regexp"}if(type==="function"){return"function"}if(type==="object"){if(value.nodeType!==undefined){if(value.nodeType===3){return(/\S/).test(value.nodeValue)?"textnode":"whitespace"}else{return"element"}}return"object"}},isEmpty:function(value,allowEmptyString){return(value===null)||(value===undefined)||(!allowEmptyString?value==="":false)||(Ext.isArray(value)&&value.length===0)},isArray:("isArray" in Array)?Array.isArray:function(value){return toString.call(value)==="[object Array]"},isDate:function(value){return toString.call(value)==="[object Date]"},isObject:(toString.call(null)==="[object Object]")?function(value){return value!==null&&value!==undefined&&toString.call(value)==="[object Object]"&&value.ownerDocument===undefined}:function(value){return toString.call(value)==="[object Object]"},isSimpleObject:function(value){return value instanceof Object&&value.constructor===Object},isPrimitive:function(value){var type=typeof value;return type==="string"||type==="number"||type==="boolean"},isFunction:(typeof document!=="undefined"&&typeof document.getElementsByTagName("body")==="function")?function(value){return toString.call(value)==="[object Function]"}:function(value){return typeof value==="function"},isNumber:function(value){return typeof value==="number"&&isFinite(value)},isNumeric:function(value){return !isNaN(parseFloat(value))&&isFinite(value)},isString:function(value){return typeof value==="string"},isBoolean:function(value){return typeof value==="boolean"},isElement:function(value){return value?value.nodeType===1:false},isTextNode:function(value){return value?value.nodeName==="#text":false},isDefined:function(value){return typeof value!=="undefined"},isIterable:function(value){return(value&&typeof value!=="string")?value.length!==undefined:false}});Ext.apply(Ext,{clone:function(item){if(item===null||item===undefined){return item}if(item.nodeType&&item.cloneNode){return item.cloneNode(true)}var type=toString.call(item);if(type==="[object Date]"){return new Date(item.getTime())}var i,j,k,clone,key;if(type==="[object Array]"){i=item.length;clone=[];while(i--){clone[i]=Ext.clone(item[i])}}else{if(type==="[object Object]"&&item.constructor===Object){clone={};for(key in item){clone[key]=Ext.clone(item[key])}if(enumerables){for(j=enumerables.length;j--;){k=enumerables[j];clone[k]=item[k]}}}}return clone||item},getUniqueGlobalNamespace:function(){var uniqueGlobalNamespace=this.uniqueGlobalNamespace;if(uniqueGlobalNamespace===undefined){var i=0;do{uniqueGlobalNamespace="ExtBox"+(++i)}while(Ext.global[uniqueGlobalNamespace]!==undefined);Ext.global[uniqueGlobalNamespace]=Ext;this.uniqueGlobalNamespace=uniqueGlobalNamespace}return uniqueGlobalNamespace},functionFactory:function(){var args=Array.prototype.slice.call(arguments),ln=args.length;if(ln>0){args[ln-1]="var Ext=window."+this.getUniqueGlobalNamespace()+";"+args[ln-1]}return Function.prototype.constructor.apply(Function.prototype,args)},globalEval:("execScript" in global)?function(code){global.execScript(code)}:function(code){(function(){eval(code)})()},});Ext.type=Ext.typeOf})();(function(){var a="4.1.0",b;Ext.Version=b=Ext.extend(Object,{constructor:function(d){var c=this.toNumber,f,e;if(d instanceof b){return d}this.version=this.shortVersion=String(d).toLowerCase().replace(/_/g,".").replace(/[\-+]/g,"");e=this.version.search(/([^\d\.])/);if(e!==-1){this.release=this.version.substr(e,d.length);this.shortVersion=this.version.substr(0,e)}this.shortVersion=this.shortVersion.replace(/[^\d]/g,"");f=this.version.split(".");this.major=c(f.shift());this.minor=c(f.shift());this.patch=c(f.shift());this.build=c(f.shift());return this},toNumber:function(c){c=parseInt(c||0,10);if(isNaN(c)){c=0}return c},toString:function(){return this.version},valueOf:function(){return this.version},getMajor:function(){return this.major||0},getMinor:function(){return this.minor||0},getPatch:function(){return this.patch||0},getBuild:function(){return this.build||0},getRelease:function(){return this.release||""},isGreaterThan:function(c){return b.compare(this.version,c)===1},isGreaterThanOrEqual:function(c){return b.compare(this.version,c)>=0},isLessThan:function(c){return b.compare(this.version,c)===-1},isLessThanOrEqual:function(c){return b.compare(this.version,c)<=0},equals:function(c){return b.compare(this.version,c)===0},match:function(c){c=String(c);return this.version.substr(0,c.length)===c},toArray:function(){return[this.getMajor(),this.getMinor(),this.getPatch(),this.getBuild(),this.getRelease()]},getShortVersion:function(){return this.shortVersion},gt:function(){return this.isGreaterThan.apply(this,arguments)},lt:function(){return this.isLessThan.apply(this,arguments)},gtEq:function(){return this.isGreaterThanOrEqual.apply(this,arguments)},ltEq:function(){return this.isLessThanOrEqual.apply(this,arguments)}});Ext.apply(b,{releaseValueMap:{dev:-6,alpha:-5,a:-5,beta:-4,b:-4,rc:-3,"#":-2,p:-1,pl:-1},getComponentValue:function(c){return !c?0:(isNaN(c)?this.releaseValueMap[c]||c:parseInt(c,10))},compare:function(g,f){var d,e,c;g=new b(g).toArray();f=new b(f).toArray();for(c=0;c<Math.max(g.length,f.length);c++){d=this.getComponentValue(g[c]);e=this.getComponentValue(f[c]);if(d<e){return -1}else{if(d>e){return 1}}}return 0}});Ext.apply(Ext,{versions:{},lastRegisteredVersion:null,setVersion:function(d,c){Ext.versions[d]=new b(c);Ext.lastRegisteredVersion=Ext.versions[d];return this},getVersion:function(c){if(c===undefined){return Ext.lastRegisteredVersion}return Ext.versions[c]},deprecate:function(c,e,f,d){if(b.compare(Ext.getVersion(c),e)<1){f.call(d)}}});Ext.setVersion("core",a)})();Ext.String={trimRegex:/^[\x09\x0a\x0b\x0c\x0d\x20\xa0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u2028\u2029\u202f\u205f\u3000]+|[\x09\x0a\x0b\x0c\x0d\x20\xa0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u2028\u2029\u202f\u205f\u3000]+$/g,escapeRe:/('|\\)/g,formatRe:/\{(\d+)\}/g,escapeRegexRe:/([-.*+?^${}()|[\]\/\\])/g,htmlEncode:(function(){var d={"&":"&amp;",">":"&gt;","<":"&lt;",'"':"&quot;"},b=[],c,a;for(c in d){b.push(c)}a=new RegExp("("+b.join("|")+")","g");return function(e){return(!e)?e:String(e).replace(a,function(g,f){return d[f]})}})(),htmlDecode:(function(){var d={"&amp;":"&","&gt;":">","&lt;":"<","&quot;":'"'},b=[],c,a;for(c in d){b.push(c)}a=new RegExp("("+b.join("|")+"|&#[0-9]{1,5};)","g");return function(e){return(!e)?e:String(e).replace(a,function(g,f){if(f in d){return d[f]}else{return String.fromCharCode(parseInt(f.substr(2),10))}})}})(),urlAppend:function(b,a){if(!Ext.isEmpty(a)){return b+(b.indexOf("?")===-1?"?":"&")+a}return b},trim:function(a){return a.replace(Ext.String.trimRegex,"")},capitalize:function(a){return a.charAt(0).toUpperCase()+a.substr(1)},ellipsis:function(c,a,d){if(c&&c.length>a){if(d){var e=c.substr(0,a-2),b=Math.max(e.lastIndexOf(" "),e.lastIndexOf("."),e.lastIndexOf("!"),e.lastIndexOf("?"));if(b!==-1&&b>=(a-15)){return e.substr(0,b)+"..."}}return c.substr(0,a-3)+"..."}return c},escapeRegex:function(a){return a.replace(Ext.String.escapeRegexRe,"\\$1")},escape:function(a){return a.replace(Ext.String.escapeRe,"\\$1")},toggle:function(b,c,a){return b===c?a:c},leftPad:function(b,c,d){var a=String(b);d=d||" ";while(a.length<c){a=d+a}return a},format:function(b){var a=Ext.Array.toArray(arguments,1);return b.replace(Ext.String.formatRe,function(c,d){return a[d]})},repeat:function(e,d,b){for(var a=[],c=d;c--;){a.push(e)}return a.join(b||"")}};Ext.htmlEncode=Ext.String.htmlEncode;Ext.htmlDecode=Ext.String.htmlDecode;Ext.urlAppend=Ext.String.urlAppend;(function(){var f=Array.prototype,n=f.slice,p=function(){var z=[],e,y=20;if(!z.splice){return false}while(y--){z.push("A")}z.splice(15,0,"F","F","F","F","F","F","F","F","F","F","F","F","F","F","F","F","F","F","F","F","F");e=z.length;z.splice(13,0,"XXX");if(e+1!=z.length){return false}return true}(),i="forEach" in f,t="map" in f,o="indexOf" in f,x="every" in f,c="some" in f,d="filter" in f,m=function(){var e=[1,2,3,4,5].sort(function(){return 0});return e[0]===1&&e[1]===2&&e[2]===3&&e[3]===4&&e[4]===5}(),j=true,a;try{if(typeof document!=="undefined"){n.call(document.getElementsByTagName("body"))}}catch(r){j=false}function l(y,e){return(e<0)?Math.max(0,y.length+e):Math.min(y.length,e)}function w(F,E,y,I){var J=I?I.length:0,A=F.length,G=l(F,E);if(G===A){if(J){F.push.apply(F,I)}}else{var D=Math.min(y,A-G),H=G+D,z=H+J-D,e=A-H,B=A-D,C;if(z<H){for(C=0;C<e;++C){F[z+C]=F[H+C]}}else{if(z>H){for(C=e;C--;){F[z+C]=F[H+C]}}}if(J&&G===B){F.length=B;F.push.apply(F,I)}else{F.length=B+J;for(C=0;C<J;++C){F[G+C]=I[C]}}}return F}function h(A,e,z,y){if(y&&y.length){if(e<A.length){A.splice.apply(A,[e,z].concat(y))}else{A.push.apply(A,y)}}else{A.splice(e,z)}return A}function b(z,e,y){return w(z,e,y)}function q(z,e,y){z.splice(e,y);return z}function k(B,e,z){var A=l(B,e),y=B.slice(e,l(B,A+z));if(arguments.length<4){w(B,A,z)}else{w(B,A,z,n.call(arguments,3))}return y}function g(e){return e.splice.apply(e,n.call(arguments,1))}var v=p?q:b,s=p?h:w,u=p?g:k;a=Ext.Array={each:function(C,A,z,e){C=a.from(C);var y,B=C.length;if(e!==true){for(y=0;y<B;y++){if(A.call(z||C[y],C[y],y,C)===false){return y}}}else{for(y=B-1;y>-1;y--){if(A.call(z||C[y],C[y],y,C)===false){return y}}}return true},forEach:i?function(z,y,e){return z.forEach(y,e)}:function(B,z,y){var e=0,A=B.length;for(;e<A;e++){z.call(y,B[e],e,B)}},indexOf:(o)?function(z,e,y){return z.indexOf(e,y)}:function(B,z,A){var e,y=B.length;for(e=(A<0)?Math.max(0,y+A):A||0;e<y;e++){if(B[e]===z){return e}}return -1},contains:o?function(y,e){return y.indexOf(e)!==-1}:function(A,z){var e,y;for(e=0,y=A.length;e<y;e++){if(A[e]===z){return true}}return false},toArray:function(z,B,e){if(!z||!z.length){return[]}if(typeof z==="string"){z=z.split("")}if(j){return n.call(z,B||0,e||z.length)}var A=[],y;B=B||0;e=e?((e<0)?z.length+e:e):z.length;for(y=B;y<e;y++){A.push(z[y])}return A},pluck:function(C,e){var y=[],z,B,A;for(z=0,B=C.length;z<B;z++){A=C[z];y.push(A[e])}return y},map:t?function(z,y,e){return z.map(y,e)}:function(C,B,A){var z=[],y=0,e=C.length;for(;y<e;y++){z[y]=B.call(A,C[y],y,C)}return z},every:function(B,z,y){if(x){return B.every(z,y)}var e=0,A=B.length;for(;e<A;++e){if(!z.call(y,B[e],e,B)){return false}}return true},some:function(B,z,y){if(c){return B.some(z,y)}var e=0,A=B.length;for(;e<A;++e){if(z.call(y,B[e],e,B)){return true}}return false},clean:function(B){var y=[],e=0,A=B.length,z;for(;e<A;e++){z=B[e];if(!Ext.isEmpty(z)){y.push(z)}}return y},unique:function(B){var A=[],e=0,z=B.length,y;for(;e<z;e++){y=B[e];if(a.indexOf(A,y)===-1){A.push(y)}}return A},filter:function(C,A,z){if(d){return C.filter(A,z)}var y=[],e=0,B=C.length;for(;e<B;e++){if(A.call(z,C[e],e,C)){y.push(C[e])}}return y},from:function(y,e){if(y===undefined||y===null){return[]}if(Ext.isArray(y)){return(e)?n.call(y):y}if(y&&y.length!==undefined&&typeof y!=="string"){return a.toArray(y)}return[y]},remove:function(z,y){var e=a.indexOf(z,y);if(e!==-1){v(z,e,1)}return z},include:function(y,e){if(!a.contains(y,e)){y.push(e)}},clone:function(e){return n.call(e)},merge:function(){var e=n.call(arguments),A=[],y,z;for(y=0,z=e.length;y<z;y++){A=A.concat(e[y])}return a.unique(A)},intersect:function(){var A=[],e=n.call(arguments),E,C,B,G,H,K,J,I,z,D;if(!e.length){return A}for(E=K=0,I=e.length;E<I,H=e[E];E++){if(!G||H.length<G.length){G=H;K=E}}G=a.unique(G);v(e,K,1);for(E=0,I=G.length;E<I,K=G[E];E++){var F=0;for(C=0,z=e.length;C<z,H=e[C];C++){for(B=0,D=H.length;B<D,J=H[B];B++){if(K===J){F++;break}}}if(F===z){A.push(K)}}return A},difference:function(y,e){var D=n.call(y),B=D.length,A,z,C;for(A=0,C=e.length;A<C;A++){for(z=0;z<B;z++){if(D[z]===e[A]){v(D,z,1);z--;B--}}}return D},slice:function(z,y,e){return n.call(z,y,e)},sort:function(E,D){if(m){if(D){return E.sort(D)}else{return E.sort()}}var B=E.length,A=0,C,e,z,y;for(;A<B;A++){z=A;for(e=A+1;e<B;e++){if(D){C=D(E[e],E[z]);if(C<0){z=e}}else{if(E[e]<E[z]){z=e}}}if(z!==A){y=E[A];E[A]=E[z];E[z]=y}}return E},flatten:function(z){var y=[];function e(A){var C,D,B;for(C=0,D=A.length;C<D;C++){B=A[C];if(Ext.isArray(B)){e(B)}else{y.push(B)}}return y}return e(z)},min:function(C,B){var y=C[0],e,A,z;for(e=0,A=C.length;e<A;e++){z=C[e];if(B){if(B(y,z)===1){y=z}}else{if(z<y){y=z}}}return y},max:function(C,B){var e=C[0],y,A,z;for(y=0,A=C.length;y<A;y++){z=C[y];if(B){if(B(e,z)===-1){e=z}}else{if(z>e){e=z}}}return e},mean:function(e){return e.length>0?a.sum(e)/e.length:undefined},sum:function(B){var y=0,e,A,z;for(e=0,A=B.length;e<A;e++){z=B[e];y+=z}return y},erase:v,insert:function(z,y,e){return s(z,y,0,e)},replace:s,splice:u};Ext.each=a.each;a.union=a.merge;Ext.min=a.min;Ext.max=a.max;Ext.sum=a.sum;Ext.mean=a.mean;Ext.flatten=a.flatten;Ext.clean=a.clean;Ext.unique=a.unique;Ext.pluck=a.pluck;Ext.toArray=function(){return a.toArray.apply(a,arguments)}})();(function(){var a=(0.9).toFixed()!=="1";Ext.Number={constrain:function(d,c,b){d=parseFloat(d);if(!isNaN(c)){d=Math.max(d,c)}if(!isNaN(b)){d=Math.min(d,b)}return d},snap:function(e,c,d,g){var f=e,b;if(!(c&&e)){return e}b=e%c;if(b!==0){f-=b;if(b*2>=c){f+=c}else{if(b*2<-c){f-=c}}}return Ext.Number.constrain(f,d,g)},toFixed:function(d,b){if(a){b=b||0;var c=Math.pow(10,b);return(Math.round(d*c)/c).toFixed(b)}return d.toFixed(b)},from:function(c,b){if(isFinite(c)){c=parseFloat(c)}return !isNaN(c)?c:b}}})();Ext.num=function(){return Ext.Number.from.apply(this,arguments)};(function(){var a=function(){};var b=Ext.Object={chain:function(d){a.prototype=d;var c=new a();a.prototype=null;return c},toQueryObjects:function(e,j,d){var c=b.toQueryObjects,h=[],f,g;if(Ext.isArray(j)){for(f=0,g=j.length;f<g;f++){if(d){h=h.concat(c(e+"["+f+"]",j[f],true))}else{h.push({name:e,value:j[f]})}}}else{if(Ext.isObject(j)){for(f in j){if(j.hasOwnProperty(f)){if(d){h=h.concat(c(e+"["+f+"]",j[f],true))}else{h.push({name:e,value:j[f]})}}}}else{h.push({name:e,value:j})}}return h},toQueryString:function(f,d){var g=[],e=[],k,h,l,c,m;for(k in f){if(f.hasOwnProperty(k)){g=g.concat(b.toQueryObjects(k,f[k],d))}}for(h=0,l=g.length;h<l;h++){c=g[h];m=c.value;if(Ext.isEmpty(m)){m=""}else{if(Ext.isDate(m)){m=Ext.Date.toString(m)}}e.push(encodeURIComponent(c.name)+"="+encodeURIComponent(String(m)))}return e.join("&")},fromQueryString:function(d,q){var l=d.replace(/^\?/,"").split("&"),t={},r,h,v,m,p,f,n,o,c,g,s,k,u,e;for(p=0,f=l.length;p<f;p++){n=l[p];if(n.length>0){h=n.split("=");v=decodeURIComponent(h[0]);m=(h[1]!==undefined)?decodeURIComponent(h[1]):"";if(!q){if(t.hasOwnProperty(v)){if(!Ext.isArray(t[v])){t[v]=[t[v]]}t[v].push(m)}else{t[v]=m}}else{g=v.match(/(\[):?([^\]]*)\]/g);s=v.match(/^([^\[]+)/);v=s[0];k=[];if(g===null){t[v]=m;continue}for(o=0,c=g.length;o<c;o++){u=g[o];u=(u.length===2)?"":u.substring(1,u.length-1);k.push(u)}k.unshift(v);r=t;for(o=0,c=k.length;o<c;o++){u=k[o];if(o===c-1){if(Ext.isArray(r)&&u===""){r.push(m)}else{r[u]=m}}else{if(r[u]===undefined||typeof r[u]==="string"){e=k[o+1];r[u]=(Ext.isNumeric(e)||e==="")?[]:{}}r=r[u]}}}}}return t},each:function(c,e,d){for(var f in c){if(c.hasOwnProperty(f)){if(e.call(d||c,f,c[f],c)===false){return}}}},merge:function(c){var h=1,j=arguments.length,d=b.merge,f=Ext.clone,g,l,k,e;for(;h<j;h++){g=arguments[h];for(l in g){k=g[l];if(k&&k.constructor===Object){e=c[l];if(e&&e.constructor===Object){d(e,k)}else{c[l]=f(k)}}else{c[l]=k}}}return c},mergeIf:function(j){var f=1,g=arguments.length,d=Ext.clone,c,e,h;for(;f<g;f++){c=arguments[f];for(e in c){if(!(e in j)){h=c[e];if(h&&h.constructor===Object){j[e]=d(h)}else{j[e]=h}}}}return j},getKey:function(c,e){for(var d in c){if(c.hasOwnProperty(d)&&c[d]===e){return d}}return null},getValues:function(d){var c=[],e;for(e in d){if(d.hasOwnProperty(e)){c.push(d[e])}}return c},getKeys:("keys" in Object)?Object.keys:function(c){var d=[],e;for(e in c){if(c.hasOwnProperty(e)){d.push(e)}}return d},getSize:function(c){var d=0,e;for(e in c){if(c.hasOwnProperty(e)){d++}}return d},classify:function(f){var e=f,h=[],d={},c=function(){var j=0,k=h.length,l;for(;j<k;j++){l=h[j];this[l]=new d[l]}},g,i;for(g in f){if(f.hasOwnProperty(g)){i=f[g];if(i&&i.constructor===Object){h.push(g);d[g]=b.classify(i)}}}c.prototype=e;return c},defineProperty:("defineProperty" in Object)?Object.defineProperty:function(d,c,e){if(e.get){d.__defineGetter__(c,e.get)}if(e.set){d.__defineSetter__(c,e.set)}}};Ext.merge=Ext.Object.merge;Ext.mergeIf=Ext.Object.mergeIf;Ext.urlEncode=function(){var c=Ext.Array.from(arguments),d="";if((typeof c[1]==="string")){d=c[1]+"&";c[1]=false}return d+b.toQueryString.apply(b,c)};Ext.urlDecode=function(){return b.fromQueryString.apply(b,arguments)}})();Ext.Function={flexSetter:function(a){return function(d,c){var e,f;if(d===null){return this}if(typeof d!=="string"){for(e in d){if(d.hasOwnProperty(e)){a.call(this,e,d[e])}}if(Ext.enumerables){for(f=Ext.enumerables.length;f--;){e=Ext.enumerables[f];if(d.hasOwnProperty(e)){a.call(this,e,d[e])}}}}else{a.call(this,d,c)}return this}},bind:function(d,c,b,a){if(arguments.length===2){return function(){return d.apply(c,arguments)}}var f=d,e=Array.prototype.slice;return function(){var g=b||arguments;if(a===true){g=e.call(arguments,0);g=g.concat(b)}else{if(typeof a=="number"){g=e.call(arguments,0);Ext.Array.insert(g,a,b)}}return f.apply(c||window,g)}},pass:function(c,a,b){if(!Ext.isArray(a)){a=Ext.Array.clone(a)}return function(){a.push.apply(a,arguments);return c.apply(b||this,a)}},alias:function(b,a){return function(){return b[a].apply(b,arguments)}},clone:function(a){return function(){return a.apply(this,arguments)}},createInterceptor:function(d,c,b,a){var e=d;if(!Ext.isFunction(c)){return d}else{return function(){var g=this,f=arguments;c.target=g;c.method=d;return(c.apply(b||g||window,f)!==false)?d.apply(g||window,f):a||null}}},createDelayed:function(e,c,d,b,a){if(d||b){e=Ext.Function.bind(e,d,b,a)}return function(){var g=this,f=Array.prototype.slice.call(arguments);setTimeout(function(){e.apply(g,f)},c)}},defer:function(e,c,d,b,a){e=Ext.Function.bind(e,d,b,a);if(c>0){return setTimeout(e,c)}e();return 0},createSequence:function(b,c,a){if(!c){return b}else{return function(){var d=b.apply(this,arguments);c.apply(a||this,arguments);return d}}},createBuffered:function(e,b,d,c){var a;return function(){if(!d){d=this}if(!c){c=Array.prototype.slice.call(arguments)}if(a){clearTimeout(a);a=null}a=setTimeout(function(){e.apply(d,c)},b)}},createThrottled:function(e,b,d){var f,a,c,h,g=function(){e.apply(d||this,c);f=new Date().getTime()};return function(){a=new Date().getTime()-f;c=arguments;clearTimeout(h);if(!f||(a>=b)){g()}else{h=setTimeout(g,b-a)}}},interceptBefore:function(b,a,c){var d=b[a]||Ext.emptyFn;return b[a]=function(){var e=c.apply(this,arguments);d.apply(this,arguments);return e}},interceptAfter:function(b,a,c){var d=b[a]||Ext.emptyFn;return b[a]=function(){d.apply(this,arguments);return c.apply(this,arguments)}}};Ext.defer=Ext.Function.alias(Ext.Function,"defer");Ext.pass=Ext.Function.alias(Ext.Function,"pass");Ext.bind=Ext.Function.alias(Ext.Function,"bind");Ext.JSON=new (function(){var useHasOwn=!!{}.hasOwnProperty,isNative=function(){var useNative=null;return function(){if(useNative===null){useNative=Ext.USE_NATIVE_JSON&&window.JSON&&JSON.toString()=="[object JSON]"}return useNative}}(),pad=function(n){return n<10?"0"+n:n},doDecode=function(json){return eval("("+json+")")},doEncode=function(o){if(!Ext.isDefined(o)||o===null){return"null"}else{if(Ext.isArray(o)){return encodeArray(o)}else{if(Ext.isDate(o)){return Ext.JSON.encodeDate(o)}else{if(Ext.isString(o)){return encodeString(o)}else{if(typeof o=="number"){return isFinite(o)?String(o):"null"}else{if(Ext.isBoolean(o)){return String(o)}else{if(Ext.isObject(o)){return encodeObject(o)}else{if(typeof o==="function"){return"null"}}}}}}}}return"undefined"},m={"\b":"\\b","\t":"\\t","\n":"\\n","\f":"\\f","\r":"\\r",'"':'\\"',"\\":"\\\\","\x0b":"\\u000b"},charToReplace=/[\\\"\x00-\x1f\x7f-\uffff]/g,encodeString=function(s){return'"'+s.replace(charToReplace,function(a){var c=m[a];return typeof c==="string"?c:"\\u"+("0000"+a.charCodeAt(0).toString(16)).slice(-4)})+'"'},encodeArray=function(o){var a=["[",""],len=o.length,i;for(i=0;i<len;i+=1){a.push(doEncode(o[i]),",")}a[a.length-1]="]";return a.join("")},encodeObject=function(o){var a=["{",""],i;for(i in o){if(!useHasOwn||o.hasOwnProperty(i)){a.push(doEncode(i),":",doEncode(o[i]),",")}}a[a.length-1]="}";return a.join("")};this.encodeDate=function(o){return'"'+o.getFullYear()+"-"+pad(o.getMonth()+1)+"-"+pad(o.getDate())+"T"+pad(o.getHours())+":"+pad(o.getMinutes())+":"+pad(o.getSeconds())+'"'};this.encode=function(){var ec;return function(o){if(!ec){ec=isNative()?JSON.stringify:doEncode}return ec(o)}}();this.decode=function(){var dc;return function(json,safe){if(!dc){dc=isNative()?JSON.parse:doDecode}try{return dc(json)}catch(e){if(safe===true){return null}Ext.Error.raise({sourceClass:"Ext.JSON",sourceMethod:"decode",msg:"You're trying to decode an invalid JSON String: "+json})}}}()})();Ext.encode=Ext.JSON.encode;Ext.decode=Ext.JSON.decode;Ext.Error={raise:function(a){throw new Error(a.msg)}};Ext.Date={now:Date.now,toString:function(a){if(!a){a=new Date()}var b=Ext.String.leftPad;return a.getFullYear()+"-"+b(a.getMonth()+1,2,"0")+"-"+b(a.getDate(),2,"0")+"T"+b(a.getHours(),2,"0")+":"+b(a.getMinutes(),2,"0")+":"+b(a.getSeconds(),2,"0")}};(function(a){var c=[],b=function(){};Ext.apply(b,{$className:"Ext.Base",$isClass:true,create:function(){return Ext.create.apply(Ext,[this].concat(Array.prototype.slice.call(arguments,0)))},extend:function(h){var d=h.prototype,l,f,g,j,e,k;f=this.prototype=Ext.Object.chain(d);f.self=this;this.superclass=f.superclass=d;if(!h.$isClass){l=Ext.Base.prototype;for(g in l){if(g in f){f[g]=l[g]}}}k=d.$inheritableStatics;if(k){for(g=0,j=k.length;g<j;g++){e=k[g];if(!this.hasOwnProperty(e)){this[e]=h[e]}}}if(h.$onExtended){this.$onExtended=h.$onExtended.slice()}f.config=f.defaultConfig=new f.configClass;f.initConfigList=f.initConfigList.slice();f.initConfigMap=Ext.Object.chain(f.initConfigMap)},"$onExtended":[],triggerExtended:function(){var f=this.$onExtended,e=f.length,d,g;if(e>0){for(d=0;d<e;d++){g=f[d];g.fn.apply(g.scope||this,arguments)}}},onExtended:function(e,d){this.$onExtended.push({fn:e,scope:d});return this},addConfig:function(f,i){var j=this.prototype,g=j.initConfigList,e=j.initConfigMap,h=j.defaultConfig,l,d,k;i=Boolean(i);for(d in f){if(f.hasOwnProperty(d)&&(i||!(d in h))){k=f[d];l=e[d];if(k!==null){if(!l){e[d]=true;g.push(d)}}else{if(l){e[d]=false;Ext.Array.remove(g,d)}}}}if(i){Ext.merge(h,f)}else{Ext.mergeIf(h,f)}j.configClass=Ext.Object.classify(h)},addStatics:function(d){var f,e;for(e in d){if(d.hasOwnProperty(e)){f=d[e];this[e]=f}}return this},addInheritableStatics:function(e){var h,d,g=this.prototype,f,i;h=g.$inheritableStatics;d=g.$hasInheritableStatics;if(!h){h=g.$inheritableStatics=[];d=g.$hasInheritableStatics={}}for(f in e){if(e.hasOwnProperty(f)){i=e[f];this[f]=i;if(!d[f]){d[f]=true;h.push(f)}}}return this},addMembers:function(e){var g=this.prototype,d=Ext.enumerables,k=[],h,j,f,l;for(f in e){k.push(f)}if(d){k.push.apply(k,d)}for(h=0,j=k.length;h<j;h++){f=k[h];if(e.hasOwnProperty(f)){l=e[f];if(typeof l=="function"&&!l.$isClass&&l!==Ext.emptyFn){l.$owner=this;l.$name=f}g[f]=l}}return this},addMember:function(d,e){if(typeof e=="function"&&!e.$isClass&&e!==Ext.emptyFn){e.$owner=this;e.$name=d}this.prototype[d]=e;return this},implement:function(){this.addMembers.apply(this,arguments)},borrow:function(h,f){var m=this.prototype,l=h.prototype,g,j,e,k,d;f=Ext.Array.from(f);for(g=0,j=f.length;g<j;g++){e=f[g];d=l[e];if(typeof d=="function"){k=function(){return d.apply(this,arguments)};k.$owner=this;k.$name=e;m[e]=k}else{m[e]=d}}return this},override:function(e){var l=this,n=Ext.enumerables,j=l.prototype,g=Ext.Function.clone,d,i,f,m,k,h;if(arguments.length===2){d=e;e={};e[d]=arguments[1];n=null}do{k=[];m=null;for(d in e){if(d=="statics"){m=e[d]}else{k.push(d)}}if(n){k.push.apply(k,n)}for(i=k.length;i--;){d=k[i];if(e.hasOwnProperty(d)){f=e[d];if(typeof f=="function"&&!f.$className&&f!==Ext.emptyFn){if(typeof f.$owner!="undefined"){f=g(f)}f.$owner=l;f.$name=d;h=j[d];if(h){f.$previous=h}}j[d]=f}}j=l;e=m}while(e);return this},callParent:function(d){var e;return(e=this.callParent.caller)&&(e.$previous||((e=e.$owner?e:e.caller)&&e.$owner.superclass.$class[e.$name])).apply(this,d||c)},mixin:function(f,h){var d=h.prototype,e=this.prototype,g;if(typeof d.onClassMixedIn!="undefined"){d.onClassMixedIn.call(h,this)}if(!e.hasOwnProperty("mixins")){if("mixins" in e){e.mixins=Ext.Object.chain(e.mixins)}else{e.mixins={}}}for(g in d){if(g==="mixins"){Ext.merge(e.mixins,d[g])}else{if(typeof e[g]=="undefined"&&g!="mixinId"&&g!="config"){e[g]=d[g]}}}if("config" in d){this.addConfig(d.config,false)}e.mixins[f]=d},getName:function(){return Ext.getClassName(this)},createAlias:a(function(e,d){this.override(e,function(){return this[d].apply(this,arguments)})}),addXtype:function(h){var e=this.prototype,g=e.xtypesMap,f=e.xtypes,d=e.xtypesChain;if(!e.hasOwnProperty("xtypesMap")){g=e.xtypesMap=Ext.merge({},e.xtypesMap||{});f=e.xtypes=e.xtypes?[].concat(e.xtypes):[];d=e.xtypesChain=e.xtypesChain?[].concat(e.xtypesChain):[];e.xtype=h}if(!g[h]){g[h]=true;f.push(h);d.push(h);Ext.ClassManager.setAlias(this,"widget."+h)}return this}});b.implement({isInstance:true,$className:"Ext.Base",configClass:Ext.emptyFn,initConfigList:[],initConfigMap:{},statics:function(){var e=this.statics.caller,d=this.self;if(!e){return d}return e.$owner},callParent:function(e){var f,d=(f=this.callParent.caller)&&(f.$previous||((f=f.$owner?f:f.caller)&&f.$owner.superclass[f.$name]));return d.apply(this,e||c)},self:b,constructor:function(){return this},wasInstantiated:false,initConfig:function(m){var l=Ext.Class.configNameCache,p=this.self.prototype,h=this.initConfigList,f=this.initConfigMap,g=new this.configClass,j=this.defaultConfig,k,o,e,q,n,d;this.initConfig=Ext.emptyFn;this.initialConfig=m||{};if(m){Ext.merge(g,m)}this.config=g;if(!p.hasOwnProperty("wasInstantiated")){p.wasInstantiated=true;for(k=0,o=h.length;k<o;k++){e=h[k];n=l[e];q=j[e];if(!(n.apply in p)&&!(n.update in p)&&p[n.set].$isDefault&&typeof q!="object"){p[n.internal]=j[e];f[e]=false;Ext.Array.remove(h,e);k--;o--}}}if(m){h=h.slice();for(e in m){if(e in j&&!f[e]){h.push(e)}}}for(k=0,o=h.length;k<o;k++){e=h[k];n=l[e];this[n.get]=this[n.initGet]}this.beforeInitConfig(g);for(k=0,o=h.length;k<o;k++){e=h[k];n=l[e];d=n.get;if(this.hasOwnProperty(d)){this[n.set].call(this,g[e]);delete this[d]}}return this},beforeInitConfig:Ext.emptyFn,getCurrentConfig:function(){var d=this.defaultConfig,g=Ext.Class.configNameCache,f={},e,h;for(e in d){h=g[e];f[e]=this[h.get].call(this)}return f},setConfig:function(e,l){if(!e){return this}var h=Ext.Class.configNameCache,j=this.config,f=this.defaultConfig,o=this.initialConfig,k=[],d,g,n,m;l=Boolean(l);for(d in e){if((l&&(d in o))){continue}j[d]=e[d];if(d in f){k.push(d);m=h[d];this[m.get]=this[m.initGet]}}for(g=0,n=k.length;g<n;g++){d=k[g];m=h[d];this[m.set].call(this,e[d]);delete this[m.get]}return this},getConfig:function(d){return this[Ext.Class.configNameCache[d].get].call(this)},hasConfig:function(d){return(d in this.defaultConfig)},getInitialConfig:function(e){var d=this.config;if(!e){return d}else{return d[e]}},onConfigUpdate:function(j,l,m){var n=this.self,f,h,d,g,k,e;j=Ext.Array.from(j);m=m||this;for(f=0,h=j.length;f<h;f++){d=j[f];g="update"+Ext.String.capitalize(d);k=this[g]||Ext.emptyFn;e=function(){k.apply(this,arguments);m[l].apply(m,arguments)};e.$name=g;e.$owner=n;this[g]=e}},destroy:function(){this.destroy=Ext.emptyFn;this.isDestroyed=true}});b.prototype.callOverridden=b.prototype.callParent;Ext.Base=b})(Ext.Function.flexSetter);(function(){var b,a=Ext.Base,e=[],d,c;for(d in a){if(a.hasOwnProperty(d)){e.push(d)}}c=e.length;Ext.Class=b=function(g,h,f){if(typeof g!="function"){f=h;h=g;g=null}if(!h){h={}}g=b.create(g);b.process(g,h,f);return g};Ext.apply(b,{onBeforeCreated:function(g,h,f){g.addMembers(h);f.onCreated.call(g,g)},create:function(f){var g,h;if(!f){f=function(){return this.constructor.apply(this,arguments)}}for(h=0;h<c;h++){g=e[h];f[g]=a[g]}return f},process:function(g,m,k){var j=m.preprocessors||b.defaultPreprocessors,q=this.preprocessors,t={onBeforeCreated:this.onBeforeCreated,onCreated:k||Ext.emptyFn},n=0,f,u,p,l,o,r,s,h;delete m.preprocessors;h=function(v,w,i){r=null;while(r===null){f=j[n++];if(f){u=q[f];p=u.properties;if(p===true){r=u.fn}else{for(l=0,o=p.length;l<o;l++){s=p[l];if(w.hasOwnProperty(s)){r=u.fn;break}}}}else{i.onBeforeCreated.apply(this,arguments);return}}if(r.call(this,v,w,i,h)!==false){h.apply(this,arguments)}};h.call(this,g,m,t)},preprocessors:{},registerPreprocessor:function(g,j,h,f,i){if(!f){f="last"}if(!h){h=[g]}this.preprocessors[g]={name:g,properties:h||false,fn:j};this.setDefaultPreprocessorPosition(g,f,i);return this},getPreprocessor:function(f){return this.preprocessors[f]},getPreprocessors:function(){return this.preprocessors},defaultPreprocessors:[],getDefaultPreprocessors:function(){return this.defaultPreprocessors},setDefaultPreprocessors:function(f){this.defaultPreprocessors=Ext.Array.from(f);return this},setDefaultPreprocessorPosition:function(h,j,i){var f=this.defaultPreprocessors,g;if(typeof j=="string"){if(j==="first"){f.unshift(h);return this}else{if(j==="last"){f.push(h);return this}}j=(j==="after")?1:-1}g=Ext.Array.indexOf(f,i);if(g!==-1){Ext.Array.splice(f,Math.max(0,g+j),0,h)}return this},configNameCache:{},getConfigNameMap:function(h){var g=this.configNameCache,i=g[h],f;if(!i){f=h.charAt(0).toUpperCase()+h.substr(1);i=g[h]={name:h,internal:"_"+h,initializing:"is"+f+"Initializing",apply:"apply"+f,update:"update"+f,set:"set"+f,get:"get"+f,initGet:"initGet"+f,doSet:"doSet"+f,changeEvent:h.toLowerCase()+"change"}}return i},generateSetter:function(i){var g=i.internal,h=i.get,f=i.apply,k=i.update,j;j=function(n){var m=this[g],l=this[f],o=this[k];delete this[h];if(l){n=l.call(this,n,m)}if(typeof n!="undefined"){this[g]=n;if(o&&n!==m){o.call(this,n,m)}}return this};j.$isDefault=true;return j},generateInitGetter:function(j){var f=j.name,i=j.set,g=j.get,h=j.initializing;return function(){this[h]=true;delete this[g];this[i].call(this,this.config[f]);delete this[h];return this[g].apply(this,arguments)}},generateGetter:function(g){var f=g.internal;return function(){return this[f]}}});b.registerPreprocessor("extend",function(g,k){var j=Ext.Base,l=j.prototype,m=k.extend,i,f,h;delete k.extend;if(m&&m!==Object){i=m}else{i=j}f=i.prototype;if(!i.$isClass){for(h in l){if(!f[h]){f[h]=l[h]}}}g.extend(i);g.triggerExtended.apply(g,arguments);if(k.onClassExtended){g.onExtended(k.onClassExtended,g);delete k.onClassExtended}},true);b.registerPreprocessor("statics",function(f,g){f.addStatics(g.statics);delete g.statics});b.registerPreprocessor("inheritableStatics",function(f,g){f.addInheritableStatics(g.inheritableStatics);delete g.inheritableStatics});b.registerPreprocessor("config",function(h,m){var j=m.config,p=h.prototype,l=p.config,o,g,n,f,i,k,q;delete m.config;for(g in j){if(j.hasOwnProperty(g)&&!(g in l)){q=j[g];o=this.getConfigNameMap(g);n=o.set;f=o.get;i=o.initGet;k=o.internal;m[i]=this.generateInitGetter(o);if(q===null&&!m.hasOwnProperty(k)){m[k]=null}if(!m.hasOwnProperty(f)){m[f]=this.generateGetter(o)}if(!m.hasOwnProperty(n)){m[n]=this.generateSetter(o)}}}h.addConfig(j,true)});b.registerPreprocessor("mixins",function(j,n,f){var g=n.mixins,k,h,l,m;delete n.mixins;Ext.Function.interceptBefore(f,"onCreated",function(){if(g instanceof Array){for(l=0,m=g.length;l<m;l++){h=g[l];k=h.prototype.mixinId||h.$className;j.mixin(k,h)}}else{for(k in g){if(g.hasOwnProperty(k)){j.mixin(k,g[k])}}}})});Ext.extend=function(h,i,g){if(arguments.length===2&&Ext.isObject(i)){g=i;i=h;h=null}var f;if(!i){throw new Error("[Ext.extend] Attempting to extend from a class which has not been loaded on the page.")}g.extend=i;g.preprocessors=["extend","statics","inheritableStatics","mixins","config"];if(h){f=new b(h,g)}else{f=new b(g)}f.prototype.override=function(k){for(var j in k){if(k.hasOwnProperty(j)){this[j]=k[j]}}};return f}})();(function(b,d,f,c,e){var a=Ext.ClassManager={classes:{},existCache:{},namespaceRewrites:[{from:"Ext.",to:Ext}],maps:{alternateToName:{},aliasToName:{},nameToAliases:{},nameToAlternates:{},overridesByName:{}},enableNamespaceParseCache:true,namespaceParseCache:{},instantiators:[],isCreated:function(l){var k=this.existCache,j,m,h,g,n;if(this.classes[l]||k[l]){return true}g=e;n=this.parseNamespace(l);for(j=0,m=n.length;j<m;j++){h=n[j];if(typeof h!="string"){g=h}else{if(!g||!g[h]){return false}g=g[h]}}k[l]=true;this.triggerCreated(l);return true},createdListeners:[],nameCreatedListeners:{},triggerCreated:function(k){var j=this.createdListeners,h=this.nameCreatedListeners,g,l,m;for(g=0,l=j.length;g<l;g++){m=j[g];m.fn.call(m.scope,k)}j=h[k];if(j){for(g=0,l=j.length;g<l;g++){m=j[g];m.fn.call(m.scope,k)}delete h[k]}},onCreated:function(k,j,i){var h=this.createdListeners,g=this.nameCreatedListeners,l={fn:k,scope:j};if(i){if(this.isCreated(i)){k.call(j,i);return}if(!g[i]){g[i]=[]}g[i].push(l)}else{h.push(l)}},parseNamespace:function(j){var g=this.namespaceParseCache;if(this.enableNamespaceParseCache){if(g.hasOwnProperty(j)){return g[j]}}var k=[],m=this.namespaceRewrites,o=e,h=j,r,q,p,l,n;for(l=0,n=m.length;l<n;l++){r=m[l];q=r.from;p=r.to;if(h===q||h.substring(0,q.length)===q){h=h.substring(q.length);if(typeof p!="string"){o=p}else{k=k.concat(p.split("."))}break}}k.push(o);k=k.concat(h.split("."));if(this.enableNamespaceParseCache){g[j]=k}return k},setNamespace:function(k,n){var h=e,o=this.parseNamespace(k),m=o.length-1,g=o[m],l,j;for(l=0;l<m;l++){j=o[l];if(typeof j!="string"){h=j}else{if(!h[j]){h[j]={}}h=h[j]}}h[g]=n;return h[g]},createNamespaces:function(){var g=e,n,k,l,h,m,o;for(l=0,m=arguments.length;l<m;l++){n=this.parseNamespace(arguments[l]);for(h=0,o=n.length;h<o;h++){k=n[h];if(typeof k!="string"){g=k}else{if(!g[k]){g[k]={}}g=g[k]}}}return g},set:function(g,k){var j=this,m=j.maps,l=m.nameToAlternates,i=j.getName(k),h;j.classes[g]=j.setNamespace(g,k);if(i&&i!==g){m.alternateToName[g]=i;h=l[i]||(l[i]=[]);h.push(g)}return this},get:function(j){var l=this.classes;if(l[j]){return l[j]}var g=e,n=this.parseNamespace(j),h,k,m;for(k=0,m=n.length;k<m;k++){h=n[k];if(typeof h!="string"){g=h}else{if(!g||!g[h]){return null}g=g[h]}}return g},setAlias:function(g,h){var j=this.maps.aliasToName,k=this.maps.nameToAliases,i;if(typeof g=="string"){i=g}else{i=this.getName(g)}if(h&&j[h]!==i){j[h]=i}if(!k[i]){k[i]=[]}if(h){Ext.Array.include(k[i],h)}return this},getByAlias:function(g){return this.get(this.getNameByAlias(g))},getNameByAlias:function(g){return this.maps.aliasToName[g]||""},getNameByAlternate:function(g){return this.maps.alternateToName[g]||""},getAliasesByName:function(g){return this.maps.nameToAliases[g]||[]},getName:function(g){return g&&g.$className||""},getClass:function(g){return g&&g.self||null},applyOverrides:function(g){var m=this,k=m.maps.overridesByName,n=k[g],l=n&&n.length||0,j=m.createOverride,h;delete k[g];for(h=0;h<l;++h){j.apply(m,n[h])}},create:function(h,i,g){i.$className=h;return new b(i,function(){var n=i.postprocessors||a.defaultPostprocessors,u=a.postprocessors,r=0,v=[],t,k,o,s,m,q,p,w,l;delete i.postprocessors;for(o=0,s=n.length;o<s;o++){t=n[o];if(typeof t=="string"){t=u[t];p=t.properties;if(p===true){v.push(t.fn)}else{if(p){for(m=0,q=p.length;m<q;m++){w=p[m];if(i.hasOwnProperty(w)){v.push(t.fn);break}}}}}else{v.push(t)}}k=function(x,j,y){t=v[r++];if(!t){a.set(h,j);if(g){g.call(j,j)}a.triggerCreated(h);return}if(t.call(this,x,j,y,k)!==false){k.apply(this,arguments)}};k.call(a,h,this,i);a.applyOverrides(h);l=a.maps.nameToAlternates[h];for(o=0,s=l&&l.length||0;o<s;++o){a.applyOverrides(l[o])}})},createOverride:function(h,j,g){var m=this,l=j.override,o=m.get(l),k,i,n;if(o){k=Ext.apply({},j);delete k.requires;delete k.uses;delete k.override;m.create(h,{requires:j.requires,uses:j.uses,override:l},function(){this.active=true;if(o.override){o.override(k)}else{o.self.override(k)}if(g){g.call(o)}})}else{i=m.maps.overridesByName;n=i[l]||(i[l]=[]);n.push(Array.prototype.slice.call(arguments,0));m.setNamespace(h,{override:l})}},instantiateByAlias:function(){var h=arguments[0],g=f.call(arguments),i=this.getNameByAlias(h);if(!i){i=this.maps.aliasToName[h];Ext.syncRequire(i)}g[0]=i;return this.instantiate.apply(this,g)},instantiate:function(){var i=arguments[0],h=f.call(arguments,1),j=i,k,g;if(typeof i!="function"){g=this.get(i)}else{g=i}if(!g){k=this.getNameByAlias(i);if(k){i=k;g=this.get(i)}}if(!g){k=this.getNameByAlternate(i);if(k){i=k;g=this.get(i)}}if(!g){Ext.syncRequire(i);g=this.get(i)}return this.getInstantiator(h.length)(g,h)},dynInstantiate:function(h,g){g=c(g,true);g.unshift(h);return this.instantiate.apply(this,g)},getInstantiator:function(k){var j=this.instantiators,l;l=j[k];if(!l){var h=k,g=[];for(h=0;h<k;h++){g.push("a["+h+"]")}l=j[k]=new Function("c","a","return new c("+g.join(",")+")")}return l},postprocessors:{},defaultPostprocessors:[],registerPostprocessor:function(h,k,i,g,j){if(!g){g="last"}if(!i){i=[h]}this.postprocessors[h]={name:h,properties:i||false,fn:k};this.setDefaultPostprocessorPosition(h,g,j);return this},setDefaultPostprocessors:function(g){this.defaultPostprocessors=c(g);return this},setDefaultPostprocessorPosition:function(h,k,j){var i=this.defaultPostprocessors,g;if(typeof k=="string"){if(k==="first"){i.unshift(h);return this}else{if(k==="last"){i.push(h);return this}}k=(k==="after")?1:-1}g=Ext.Array.indexOf(i,j);if(g!==-1){Ext.Array.splice(i,Math.max(0,g+k),0,h)}return this},getNamesByExpression:function(o){var m=this.maps.nameToAliases,p=[],g,l,j,h,q,k,n;if(o.indexOf("*")!==-1){o=o.replace(/\*/g,"(.*?)");q=new RegExp("^"+o+"$");for(g in m){if(m.hasOwnProperty(g)){j=m[g];if(g.search(q)!==-1){p.push(g)}else{for(k=0,n=j.length;k<n;k++){l=j[k];if(l.search(q)!==-1){p.push(g);break}}}}}}else{h=this.getNameByAlias(o);if(h){p.push(h)}else{h=this.getNameByAlternate(o);if(h){p.push(h)}else{p.push(o)}}}return p}};a.registerPostprocessor("alias",function(j,h,m){var g=m.alias,k,l;for(k=0,l=g.length;k<l;k++){d=g[k];this.setAlias(h,d)}},["xtype","alias"]);a.registerPostprocessor("singleton",function(h,g,j,i){i.call(this,h,new g(),j);return false});a.registerPostprocessor("alternateClassName",function(h,g,m){var k=m.alternateClassName,j,l,n;if(!(k instanceof Array)){k=[k]}for(j=0,l=k.length;j<l;j++){n=k[j];this.set(n,g)}});Ext.apply(Ext,{create:d(a,"instantiate"),widget:function(h){var g=f.call(arguments);g[0]="widget."+h;return a.instantiateByAlias.apply(a,g)},createByAlias:d(a,"instantiateByAlias"),define:function(h,i,g){if(i.override){return a.createOverride.apply(a,arguments)}return a.create.apply(a,arguments)},getClassName:d(a,"getName"),getDisplayName:function(g){if(g){if(g.displayName){return g.displayName}if(g.$name&&g.$class){return Ext.getClassName(g.$class)+"#"+g.$name}if(g.$className){return g.$className}}return"Anonymous"},getClass:d(a,"getClass"),namespace:d(a,"createNamespaces")});Ext.createWidget=Ext.widget;Ext.ns=Ext.namespace;b.registerPreprocessor("className",function(g,h){if(h.$className){g.$className=h.$className}},true,"first");b.registerPreprocessor("alias",function(s,m){var q=s.prototype,j=c(m.xtype),g=c(m.alias),t="widget.",r=t.length,n=Array.prototype.slice.call(q.xtypesChain||[]),k=Ext.merge({},q.xtypesMap||{}),l,p,o,h;for(l=0,p=g.length;l<p;l++){o=g[l];if(o.substring(0,r)===t){h=o.substring(r);Ext.Array.include(j,h)}}s.xtype=m.xtype=j[0];m.xtypes=j;for(l=0,p=j.length;l<p;l++){h=j[l];if(!k[h]){k[h]=true;n.push(h)}}m.xtypesChain=n;m.xtypesMap=k;Ext.Function.interceptAfter(m,"onClassCreated",function(){var i=q.mixins,v,u;for(v in i){if(i.hasOwnProperty(v)){u=i[v];j=u.xtypes;if(j){for(l=0,p=j.length;l<p;l++){h=j[l];if(!k[h]){k[h]=true;n.push(h)}}}}}});for(l=0,p=j.length;l<p;l++){h=j[l];Ext.Array.include(g,t+h)}m.alias=g},["xtype","alias"])})(Ext.Class,Ext.Function.alias,Array.prototype.slice,Ext.Array.from,Ext.global);(function(a,c,d,g,i,h,f,j){var e=["extend","mixins","requires"],b;b=Ext.Loader={isInHistory:{},history:[],config:{enabled:false,disableCaching:true,disableCachingParam:"_dc",paths:{Ext:"."}},setConfig:function(k,l){if(Ext.isObject(k)&&arguments.length===1){Ext.merge(this.config,k)}else{this.config[k]=(Ext.isObject(l))?Ext.merge(this.config[k],l):l}return this},getConfig:function(k){if(k){return this.config[k]}return this.config},setPath:d(function(k,l){this.config.paths[k]=l;return this}),getPath:function(k){var m="",n=this.config.paths,l=this.getPrefix(k);if(l.length>0){if(l===k){return n[l]}m=n[l];k=k.substring(l.length+1)}if(m.length>0){m+="/"}return m.replace(/\/\.\//g,"/")+k.replace(/\./g,"/")+".js"},getPrefix:function(l){var n=this.config.paths,m,k="";if(n.hasOwnProperty(l)){return l}for(m in n){if(n.hasOwnProperty(m)&&m+"."===l.substring(0,m.length+1)){if(m.length>k.length){k=m}}}return k},require:function(m,l,k,n){if(l){l.call(k)}},syncRequire:function(){},exclude:function(l){var k=this;return{require:function(o,n,m){return k.require(o,n,m,l)},syncRequire:function(o,n,m){return k.syncRequire(o,n,m,l)}}},onReady:function(n,m,o,k){var l;if(o!==false&&Ext.onDocumentReady){l=n;n=function(){Ext.onDocumentReady(l,m,k)}}n.call(m)}};Ext.apply(b,{documentHead:typeof document!="undefined"&&(document.head||document.getElementsByTagName("head")[0]),isLoading:false,queue:[],isClassFileLoaded:{},isFileLoaded:{},readyListeners:[],optionalRequires:[],requiresMap:{},numPendingFiles:0,numLoadedFiles:0,hasFileLoadError:false,classNameToFilePathMap:{},syncModeEnabled:false,scriptElements:{},refreshQueue:function(){var k=this.queue,q=k.length,n,p,l,o,m;if(q===0){this.triggerReady();return}for(n=0;n<q;n++){p=k[n];if(p){o=p.requires;m=p.references;if(o.length>this.numLoadedFiles){continue}l=0;do{if(a.isCreated(o[l])){f(o,l,1)}else{l++}}while(l<o.length);if(p.requires.length===0){f(k,n,1);p.callback.call(p.scope);this.refreshQueue();break}}}return this},injectScriptElement:function(m,o,q,n){var l=document.createElement("script"),p=this,k=function(){p.cleanupScriptElement(l);o.call(n)},r=function(){p.cleanupScriptElement(l);q.call(n)};l.type="text/javascript";l.src=m;l.onload=k;l.onerror=r;l.onreadystatechange=function(){if(this.readyState==="loaded"||this.readyState==="complete"){k()}};this.documentHead.appendChild(l);return l},removeScriptElement:function(l){var k=this.scriptElements;if(k[l]){this.cleanupScriptElement(k[l],true);delete k[l]}return this},cleanupScriptElement:function(l,k){l.onload=null;l.onreadystatechange=null;l.onerror=null;if(k){this.documentHead.removeChild(l)}return this},loadScriptFile:function(l,s,p,w,k){var r=this,x=this.isFileLoaded,n=this.scriptElements,v=l+(this.getConfig("disableCaching")?("?"+this.getConfig("disableCachingParam")+"="+Ext.Date.now()):""),m=false,u,o,t;if(x[l]){return this}w=w||this;this.isLoading=true;if(!k){t=function(){};if(!Ext.isReady&&Ext.onDocumentReady){Ext.onDocumentReady(function(){if(!x[l]){n[l]=r.injectScriptElement(v,s,t,w)}})}else{n[l]=this.injectScriptElement(v,s,t,w)}}else{if(typeof XMLHttpRequest!="undefined"){u=new XMLHttpRequest()}else{u=new ActiveXObject("Microsoft.XMLHTTP")}try{u.open("GET",v,false);u.send(null)}catch(q){m=true}o=(u.status===1223)?204:u.status;if(!m){m=(o===0)}if(m){}else{if(o>=200&&o<300){Ext.globalEval(u.responseText+"\n//@ sourceURL="+l);s.call(w)}else{}}u=null}},syncRequire:function(){var k=this.syncModeEnabled;if(!k){this.syncModeEnabled=true}this.require.apply(this,arguments);if(!k){this.syncModeEnabled=false}this.refreshQueue()},require:function(F,t,n,q){var v={},m={},y=this.queue,C=this.classNameToFilePathMap,A=this.isClassFileLoaded,s=[],H=[],E=[],l=[],r,G,x,w,k,p,D,B,z,u,o;if(q){q=h(q);for(B=0,u=q.length;B<u;B++){k=q[B];if(typeof k=="string"&&k.length>0){s=a.getNamesByExpression(k);for(z=0,o=s.length;z<o;z++){v[s[z]]=true}}}}F=h(F);if(t){if(t.length>0){r=function(){var K=[],J,L,I;for(J=0,L=l.length;J<L;J++){I=l[J];K.push(a.get(I))}return t.apply(this,K)}}else{r=t}}else{r=Ext.emptyFn}n=n||Ext.global;for(B=0,u=F.length;B<u;B++){w=F[B];if(typeof w=="string"&&w.length>0){H=a.getNamesByExpression(w);o=H.length;for(z=0;z<o;z++){D=H[z];if(v[D]!==true){l.push(D);if(!a.isCreated(D)&&!m[D]){m[D]=true;E.push(D)}}}}}if(E.length>0){if(!this.config.enabled){throw new Error("Ext.Loader is not enabled, so dependencies cannot be resolved dynamically. Missing required class"+((E.length>1)?"es":"")+": "+E.join(", "))}}else{r.call(n);return this}G=this.syncModeEnabled;if(!G){y.push({requires:E.slice(),callback:r,scope:n})}u=E.length;for(B=0;B<u;B++){p=E[B];x=this.getPath(p);if(G&&A.hasOwnProperty(p)){this.numPendingFiles--;this.removeScriptElement(x);delete A[p]}if(!A.hasOwnProperty(p)){A[p]=false;C[p]=x;this.numPendingFiles++;this.loadScriptFile(x,i(this.onFileLoaded,[p,x],this),i(this.onFileLoadError,[p,x]),this,G)}}if(G){r.call(n);if(u===1){return a.get(p)}}return this},onFileLoaded:function(l,k){this.numLoadedFiles++;this.isClassFileLoaded[l]=true;this.isFileLoaded[k]=true;this.numPendingFiles--;if(this.numPendingFiles===0){this.refreshQueue()}},onFileLoadError:function(m,l,k,n){this.numPendingFiles--;this.hasFileLoadError=true},addOptionalRequires:function(m){var o=this.optionalRequires,l,n,k;m=h(m);for(l=0,n=m.length;l<n;l++){k=m[l];j(o,k)}return this},triggerReady:function(l){var n=this.readyListeners,m=this.optionalRequires,k;if(this.isLoading||l){this.isLoading=false;if(m.length!==0){m=m.slice();this.optionalRequires.length=0;this.require(m,i(this.triggerReady,[true],this),this);return this}while(n.length){k=n.shift();k.fn.call(k.scope);if(this.isLoading){return this}}}return this},onReady:function(n,m,o,k){var l;if(o!==false&&Ext.onDocumentReady){l=n;n=function(){Ext.onDocumentReady(l,m,k)}}if(!this.isLoading){n.call(m)}else{this.readyListeners.push({fn:n,scope:m})}},historyPush:function(l){var k=this.isInHistory;if(l&&this.isClassFileLoaded.hasOwnProperty(l)&&!k[l]){k[l]=true;this.history.push(l)}return this}});Ext.require=g(b,"require");Ext.syncRequire=g(b,"syncRequire");Ext.exclude=g(b,"exclude");Ext.onReady=function(m,l,k){b.onReady(m,l,true,k)};c.registerPreprocessor("loader",function(x,m,w,v){var t=this,r=[],s=a.getName(x),n,l,q,p,u,o,k;for(n=0,q=e.length;n<q;n++){o=e[n];if(m.hasOwnProperty(o)){k=m[o];if(typeof k=="string"){r.push(k)}else{if(k instanceof Array){for(l=0,p=k.length;l<p;l++){u=k[l];if(typeof u=="string"){r.push(u)}}}else{if(typeof k!="function"){for(l in k){if(k.hasOwnProperty(l)){u=k[l];if(typeof u=="string"){r.push(u)}}}}}}}}if(r.length===0){return}b.require(r,function(){for(n=0,q=e.length;n<q;n++){o=e[n];if(m.hasOwnProperty(o)){k=m[o];if(typeof k=="string"){m[o]=a.get(k)}else{if(k instanceof Array){for(l=0,p=k.length;l<p;l++){u=k[l];if(typeof u=="string"){m[o][l]=a.get(u)}}}else{if(typeof k!="function"){for(var y in k){if(k.hasOwnProperty(y)){u=k[y];if(typeof u=="string"){m[o][y]=a.get(u)}}}}}}}}v.call(t,x,m,w)});return false},true,"after","className");a.registerPostprocessor("uses",function(n,l,r){var k=h(r.uses),m=[],o,q,p;for(o=0,q=k.length;o<q;o++){p=k[o];if(typeof p=="string"){m.push(p)}}b.addOptionalRequires(m)});a.onCreated(function(k){this.historyPush(k)},b)})(Ext.ClassManager,Ext.Class,Ext.Function.flexSetter,Ext.Function.alias,Ext.Function.pass,Ext.Array.from,Ext.Array.erase,Ext.Array.include);Ext.setVersion("touch","2.0.0.rc");Ext.apply(Ext,{version:Ext.getVersion("touch"),idSeed:0,repaint:function(){var a=Ext.getBody().createChild({cls:Ext.baseCSSPrefix+"mask "+Ext.baseCSSPrefix+"mask-transparent"});setTimeout(function(){a.destroy()},0)},id:function(a,b){if(a&&a.id){return a.id}a=Ext.getDom(a)||{};if(a===document||a===document.documentElement){a.id="ext-application"}else{if(a===document.body){a.id="ext-viewport"}else{if(a===window){a.id="ext-window"}}}a.id=a.id||((b||"ext-element-")+(++Ext.idSeed));return a.id},getBody:function(){if(!Ext.documentBodyElement){if(!document.body){throw new Error("[Ext.getBody] document.body does not exist at this point")}Ext.documentBodyElement=Ext.get(document.body)}return Ext.documentBodyElement},getHead:function(){if(!Ext.documentHeadElement){Ext.documentHeadElement=Ext.get(document.head||document.getElementsByTagName("head")[0])}return Ext.documentHeadElement},getDoc:function(){if(!Ext.documentElement){Ext.documentElement=Ext.get(document)}return Ext.documentElement},getCmp:function(a){return Ext.ComponentMgr.get(a)},copyTo:function(a,b,d,c){if(typeof d=="string"){d=d.split(/[,;\s]/)}Ext.each(d,function(e){if(c||b.hasOwnProperty(e)){a[e]=b[e]}},this);return a},destroy:function(){var a=arguments,d=a.length,b,c;for(b=0;b<d;b++){c=a[b];if(c){if(Ext.isArray(c)){this.destroy.apply(this,c)}else{if(Ext.isFunction(c.destroy)){c.destroy()}}}}},getDom:function(a){if(!a||!document){return null}return a.dom?a.dom:(typeof a=="string"?document.getElementById(a):a)},removeNode:function(a){if(a&&a.parentNode&&a.tagName!="BODY"){Ext.get(a).clearListeners();a.parentNode.removeChild(a);delete Ext.cache[a.id]}},defaultSetupConfig:{eventPublishers:{dom:{xclass:"Ext.event.publisher.Dom"},touchGesture:{xclass:"Ext.event.publisher.TouchGesture",recognizers:{drag:{xclass:"Ext.event.recognizer.Drag"},tap:{xclass:"Ext.event.recognizer.Tap"},doubleTap:{xclass:"Ext.event.recognizer.DoubleTap"},longPress:{xclass:"Ext.event.recognizer.LongPress"},swipe:{xclass:"Ext.event.recognizer.HorizontalSwipe"},pinch:{xclass:"Ext.event.recognizer.Pinch"},rotate:{xclass:"Ext.event.recognizer.Rotate"}}},componentDelegation:{xclass:"Ext.event.publisher.ComponentDelegation"},componentPaint:{xclass:"Ext.event.publisher.ComponentPaint"},componentSize:{xclass:"Ext.event.publisher.ComponentSize"}},animator:{xclass:"Ext.fx.Runner"},viewport:{xclass:"Ext.viewport.Viewport"}},isSetup:false,setupListeners:[],onSetup:function(b,a){if(Ext.isSetup){b.call(a)}else{Ext.setupListeners.push({fn:b,scope:a})}},setup:function(s){var i=Ext.defaultSetupConfig,b=s.onReady||Ext.emptyFn,a=s.scope,c=Ext.Array.from(s.requires),n=Ext.onReady,o=s.icon,f,p,g;Ext.setup=function(){throw new Error("Ext.setup has already been called before")};delete s.requires;delete s.onReady;delete s.scope;Ext.require(["Ext.event.Dispatcher","Ext.MessageBox"]);f=function(){var v=Ext.setupListeners,w=v.length,u,x;delete Ext.setupListeners;Ext.isSetup=true;for(u=0;u<w;u++){x=v[u];x.fn.call(x.scope)}Ext.onReady=n;Ext.onReady(b,a)};Ext.onReady=function(w,v){var u=b;b=function(){u();Ext.onReady(w,v)}};s=Ext.merge({},i,s);Ext.onDocumentReady(function(){Ext.factoryConfig(s,function(u){Ext.event.Dispatcher.getInstance().setPublishers(u.eventPublishers);if(u.logger){Ext.Logger=u.logger}if(u.animator){Ext.Animator=u.animator}if(u.viewport){Ext.Viewport=p=u.viewport;if(!a){a=p}Ext.require(c,function(){Ext.Viewport.on("ready",f,null,{single:true})})}else{Ext.require(c,f)}})});if(!document.body){var k=s.phoneIcon,m=s.tabletIcon,l=s.tabletStartupScreen,d=s.statusBarStyle,q=s.phoneStartupScreen,j=Ext.os.is.iPad;document.write('<meta id="extViewportMeta" name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no">');document.write('<meta name="apple-mobile-web-app-capable" content="yes">');document.write('<meta name="apple-touch-fullscreen" content="yes">');if(Ext.isString(d)){document.write('<meta name="apple-mobile-web-app-status-bar-style" content="'+d+'">')}if(l&&j){document.write('<link rel="apple-touch-startup-image" href="'+l+'">')}if(q&&!j){document.write('<link rel="apple-touch-startup-image" href="'+q+'">')}if(Ext.isString(o)||Ext.isString(k)||Ext.isString(m)){o={"57":k||m||o,"72":m||k||o,"114":k||m||o}}g=(s.glossOnIcon===false)?"-precomposed":"";if(o){var t=o["72"],e=o["57"],h=o["114"],r='<link rel="apple-touch-icon';if(j&&t){document.write(r+g+'" sizes="72x72" href="'+t+'">')}else{if(!j){if(e){document.write(r+g+'" href="'+e+'">')}if(h){document.write(r+g+'" sizes="114x114" href="'+h+'">')}}}}}},application:function(a){var c,b;if(!a){a={}}Ext.Loader.setPath(a.name,a.appFolder||"app");a.requires=Ext.Array.from(a.requires);a.requires.push("Ext.app.Application");c=a.onReady;b=a.scope;a.onReady=function(){new Ext.app.Application(a);if(c){c.call(b)}};Ext.setup(a)},factoryConfig:function(a,l){var g=Ext.isSimpleObject(a);if(g&&a.xclass){var f=a.xclass;delete a.xclass;Ext.require(f,function(){Ext.factoryConfig(a,function(i){l(Ext.create(f,i))})});return}var d=Ext.isArray(a),m=[],k,j,c,e;if(g||d){if(g){for(k in a){if(a.hasOwnProperty(k)){j=a[k];if(Ext.isSimpleObject(j)||Ext.isArray(j)){m.push(k)}}}}else{for(c=0,e=a.length;c<e;c++){j=a[c];if(Ext.isSimpleObject(j)||Ext.isArray(j)){m.push(c)}}}c=0;e=m.length;if(e===0){l(a);return}function h(i){a[k]=i;c++;b()}function b(){if(c>=e){l(a);return}k=m[c];j=a[k];Ext.factoryConfig(j,h)}b();return}l(a)},factory:function(b,e,a,f){var d=Ext.ClassManager,c;if(!b||b.isInstance){if(a&&a!==b){a.destroy()}return b}if(f){if(typeof b=="string"){return d.instantiateByAlias(f+"."+b)}else{if(Ext.isObject(b)&&"type" in b){return d.instantiateByAlias(f+"."+b.type,b)}}}else{if(typeof b=="string"){return Ext.getCmp(b)}}if(b===true){if(a){return a}else{return d.instantiate(e)}}if("xtype" in b){c=d.instantiateByAlias("widget."+b.xtype,b)}if("xclass" in b){c=d.instantiate(b.xclass,b)}if(c){if(a){a.destroy()}return c}if(a){return a.setConfig(b)}return d.instantiate(e,b)},deprecateClassMember:function(b,c,a,d){return this.deprecateProperty(b.prototype,c,a,d)},deprecateClassMembers:function(b,c){var d=b.prototype,e,a;for(e in c){if(c.hasOwnProperty(e)){a=c[e];this.deprecateProperty(d,e,a)}}},deprecateProperty:function(b,c,a,d){if(!d){d="'"+c+"' is deprecated"}if(a){d+=", please use '"+a+"' instead"}if(a){Ext.Object.defineProperty(b,c,{get:function(){return this[a]},set:function(e){this[a]=e},configurable:true})}},deprecatePropertyValue:function(b,a,d,c){Ext.Object.defineProperty(b,a,{get:function(){return d},configurable:true})},deprecateMethod:function(b,a,d,c){b[a]=function(){if(d){return d.apply(this,arguments)}}},deprecateClassMethod:function(a,b,h,d){if(typeof b!="string"){var g,f;for(g in b){if(b.hasOwnProperty(g)){f=b[g];Ext.deprecateClassMethod(a,g,f)}}return}var c=typeof h=="string",e;if(!d){d="'"+b+"()' is deprecated, please use '"+(c?h:h.name)+"()' instead"}if(c){e=function(){return this[h].apply(this,arguments)}}else{e=function(){return h.apply(this,arguments)}}if(b in a.prototype){Ext.Object.defineProperty(a.prototype,b,{value:null,writable:true,configurable:true})}a.addMember(b,e)},isReady:false,readyListeners:[],triggerReady:function(){var b=Ext.readyListeners,a,c,d;if(!Ext.isReady){Ext.isReady=true;for(a=0,c=b.length;a<c;a++){d=b[a];d.fn.call(d.scope)}delete Ext.readyListeners}},onDocumentReady:function(c,b){if(Ext.isReady){c.call(b)}else{var a=Ext.triggerReady;Ext.readyListeners.push({fn:c,scope:b});if(Ext.browser.is.PhoneGap&&!Ext.os.is.Desktop){if(!Ext.readyListenerAttached){Ext.readyListenerAttached=true;document.addEventListener("deviceready",a,false)}}else{if(document.readyState.match(/interactive|complete|loaded/)!==null){a()}else{if(!Ext.readyListenerAttached){Ext.readyListenerAttached=true;window.addEventListener("DOMContentLoaded",a,false)}}}}},callback:function(d,c,b,a){if(Ext.isFunction(d)){b=b||[];c=c||window;if(a){Ext.defer(d,a,c,b)}else{d.apply(c,b)}}}});Ext.define("Ext.env.Browser",{requires:["Ext.Version"],statics:{browserNames:{ie:"IE",firefox:"Firefox",safari:"Safari",chrome:"Chrome",opera:"Opera",dolfin:"Dolfin",webosbrowser:"webOSBrowser",chromeMobile:"ChromeMobile",silk:"Silk",other:"Other"},engineNames:{webkit:"WebKit",gecko:"Gecko",presto:"Presto",trident:"Trident",other:"Other"},enginePrefixes:{webkit:"AppleWebKit/",gecko:"Gecko/",presto:"Presto/",trident:"Trident/"},browserPrefixes:{ie:"MSIE ",firefox:"Firefox/",chrome:"Chrome/",safari:"Version/",opera:"Opera/",dolfin:"Dolfin/",webosbrowser:"wOSBrowser/",chromeMobile:"CrMo/",silk:"Silk/"}},styleDashPrefixes:{WebKit:"-webkit-",Gecko:"-moz-",Trident:"-ms-",Presto:"-o-",Other:""},stylePrefixes:{WebKit:"Webkit",Gecko:"Moz",Trident:"ms",Presto:"O",Other:""},propertyPrefixes:{WebKit:"webkit",Gecko:"moz",Trident:"ms",Presto:"o",Other:""},is:Ext.emptyFn,name:null,version:null,engineName:null,engineVersion:null,setFlag:function(a,b){if(typeof b=="undefined"){b=true}this.is[a]=b;this.is[a.toLowerCase()]=b;return this},constructor:function(o){this.userAgent=o;e=this.is=function(i){return e[i]===true};var k=this.statics(),c=o.match(new RegExp("((?:"+Ext.Object.getValues(k.browserPrefixes).join(")|(?:")+"))([\\w\\._]+)")),b=o.match(new RegExp("((?:"+Ext.Object.getValues(k.enginePrefixes).join(")|(?:")+"))([\\w\\._]+)")),g=k.browserNames,j=g.other,f=k.engineNames,n=f.other,m="",l="",h=false,e,d,a;if(c){j=g[Ext.Object.getKey(k.browserPrefixes,c[1])];m=new Ext.Version(c[2])}if(b){n=f[Ext.Object.getKey(k.enginePrefixes,b[1])];l=new Ext.Version(b[2])}Ext.apply(this,{engineName:n,engineVersion:l,name:j,version:m});this.setFlag(j);if(m){this.setFlag(j+(m.getMajor()||""));this.setFlag(j+m.getShortVersion())}for(d in g){if(g.hasOwnProperty(d)){a=g[d];this.setFlag(a,j===a)}}this.setFlag(a);if(l){this.setFlag(n+(l.getMajor()||""));this.setFlag(n+l.getShortVersion())}for(d in f){if(f.hasOwnProperty(d)){a=f[d];this.setFlag(a,n===a)}}this.setFlag("Standalone",!!navigator.standalone);if(typeof window.PhoneGap!="undefined"){h=true;this.setFlag("PhoneGap")}else{if(!!window.isNK){h=true;this.setFlag("Sencha")}}this.setFlag("WebView",h);this.isStrict=document.compatMode=="CSS1Compat";this.isSecure=/^https/i.test(window.location.protocol);return this},getStyleDashPrefix:function(){return this.styleDashPrefixes[this.engineName]},getStylePrefix:function(){return this.stylePrefixes[this.engineName]},getVendorProperyName:function(a){var b=this.propertyPrefixes[this.engineName];if(b.length>0){return b+Ext.String.capitalize(a)}return a}},function(){var a=Ext.browser=new this(Ext.global.navigator.userAgent)});Ext.define("Ext.env.OS",{requires:["Ext.Version"],statics:{names:{ios:"iOS",android:"Android",webos:"webOS",blackberry:"BlackBerry",rimTablet:"RIMTablet",mac:"MacOS",win:"Windows",linux:"Linux",bada:"Bada",other:"Other"},prefixes:{ios:"i(?:Pad|Phone|Pod)(?:.*)CPU(?: iPhone)? OS ",android:"(Android |HTC_|Silk/)",blackberry:"BlackBerry(?:.*)Version/",rimTablet:"RIM Tablet OS ",webos:"(?:webOS|hpwOS)/",bada:"Bada/"}},is:Ext.emptyFn,name:null,version:null,setFlag:function(a,b){if(typeof b=="undefined"){b=true}this.is[a]=b;this.is[a.toLowerCase()]=b;return this},constructor:function(m,b){var k=this.statics(),j=k.names,c=k.prefixes,a,h="",d,g,f,l,e;e=this.is=function(i){return this.is[i]===true};for(d in c){if(c.hasOwnProperty(d)){g=c[d];f=m.match(new RegExp("(?:"+g+")([^\\s;]+)"));if(f){a=j[d];if(f[1]&&(f[1]=="HTC_"||f[1]=="Silk/")){h=new Ext.Version("2.3")}else{h=new Ext.Version(f[f.length-1])}break}}}if(!a){a=j[(m.toLowerCase().match(/mac|win|linux/)||["other"])[0]];h=new Ext.Version("")}this.name=a;this.version=h;if(b){this.setFlag(b)}this.setFlag(a);if(h){this.setFlag(a+(h.getMajor()||""));this.setFlag(a+h.getShortVersion())}for(d in j){if(j.hasOwnProperty(d)){l=j[d];if(!e.hasOwnProperty(a)){this.setFlag(l,(a===l))}}}return this}},function(){var a=Ext.global.navigator,e=a.userAgent,b,g,d;Ext.os=b=new this(e,a.platform);g=b.name;var c=window.location.search.match(/deviceType=(Tablet|Phone)/),f=window.deviceType;if(c&&c[1]){d=c[1]}else{if(f==="iPhone"){d="Phone"}else{if(f==="iPad"){d="Tablet"}else{if(!b.is.Android&&!b.is.iOS&&/Windows|Linux|MacOS/.test(g)){d="Desktop"}else{if(b.is.iPad||b.is.Android3||(b.is.Android4&&e.search(/mobile/i)==-1)){d="Tablet"}else{d="Phone"}}}}}b.setFlag(d,true);b.deviceType=d});Ext.define("Ext.env.Feature",{requires:["Ext.env.Browser","Ext.env.OS"],constructor:function(){this.testElements={};this.has=function(a){return !!this.has[a]};return this},getTestElement:function(a,b){if(a===undefined){a="div"}else{if(typeof a!=="string"){return a}}if(b){return document.createElement(a)}if(!this.testElements[a]){this.testElements[a]=document.createElement(a)}return this.testElements[a]},isStyleSupported:function(c,b){var d=this.getTestElement(b).style,a=Ext.String.capitalize(c);if(typeof d[c]!=="undefined"||typeof d[Ext.browser.getStylePrefix(c)+a]!=="undefined"){return true}return false},isEventSupported:function(c,a){if(a===undefined){a=window}var e=this.getTestElement(a),b="on"+c.toLowerCase(),d=(b in e);if(!d){if(e.setAttribute&&e.removeAttribute){e.setAttribute(b,"");d=typeof e[b]==="function";if(typeof e[b]!=="undefined"){e[b]=undefined}e.removeAttribute(b)}}return d},getSupportedPropertyName:function(b,a){var c=Ext.browser.getVendorProperyName(a);if(c in b){return c}else{if(a in b){return a}}return null},registerTest:Ext.Function.flexSetter(function(a,b){this.has[a]=b.call(this);return this})},function(){Ext.feature=new this;var a=Ext.feature.has;Ext.feature.registerTest({Canvas:function(){var b=this.getTestElement("canvas");return !!(b&&b.getContext&&b.getContext("2d"))},Svg:function(){var b=document;return !!(b.createElementNS&&!!b.createElementNS("http://www.w3.org/2000/svg","svg").createSVGRect)},Vml:function(){var c=this.getTestElement(),b=false;c.innerHTML="<!--[if vml]><br><![endif]-->";b=(c.childNodes.length===1);c.innerHTML="";return b},Touch:function(){return this.isEventSupported("touchstart")&&!(Ext.os&&Ext.os.name.match(/Windows|MacOSX|Linux/))},Orientation:function(){return("orientation" in window)&&this.isEventSupported("orientationchange")},OrientationChange:function(){return this.isEventSupported("orientationchange")},DeviceMotion:function(){return this.isEventSupported("devicemotion")},Geolocation:function(){return"geolocation" in window.navigator},SqlDatabase:function(){return"openDatabase" in window},WebSockets:function(){return"WebSocket" in window},Range:function(){return !!document.createRange},CreateContextualFragment:function(){var b=!!document.createRange?document.createRange():false;return b&&!!b.createContextualFragment},History:function(){return("history" in window&&"pushState" in window.history)},CssTransforms:function(){return this.isStyleSupported("transform")},Css3dTransforms:function(){return this.has("CssTransforms")&&this.isStyleSupported("perspective")&&!Ext.os.is.Android2},CssAnimations:function(){return this.isStyleSupported("animationName")},CssTransitions:function(){return this.isStyleSupported("transitionProperty")},Audio:function(){return !!this.getTestElement("audio").canPlayType},Video:function(){return !!this.getTestElement("video").canPlayType},ClassList:function(){return"classList" in this.getTestElement()}})});Ext.define("Ext.dom.Query",{select:function(h,b){var g=[],d,f,e,c,a;b=b||document;if(typeof b=="string"){b=document.getElementById(b)}h=h.split(",");for(f=0,c=h.length;f<c;f++){if(typeof h[f]=="string"){if(h[f][0]=="@"){d=b.getAttributeNode(h[f].substring(1));g.push(d)}else{d=b.querySelectorAll(h[f]);for(e=0,a=d.length;e<a;e++){g.push(d[e])}}}}return g},selectNode:function(b,a){return this.select(b,a)[0]},is:function(a,b){if(typeof a=="string"){a=document.getElementById(a)}return this.select(b).indexOf(a)!==-1},isXml:function(a){var b=(a?a.ownerDocument||a:0).documentElement;return b?b.nodeName!=="HTML":false}},function(){Ext.ns("Ext.core");Ext.core.DomQuery=Ext.DomQuery=new this();Ext.query=Ext.Function.alias(Ext.DomQuery,"select")});Ext.define("Ext.dom.Helper",{emptyTags:/^(?:br|frame|hr|img|input|link|meta|range|spacer|wbr|area|param|col)$/i,confRe:/tag|children|cn|html|tpl|tplData$/i,endRe:/end/i,attribXlat:{cls:"class",htmlFor:"for"},closeTags:{},decamelizeName:function(){var c=/([a-z])([A-Z])/g,b={};function a(d,f,e){return f+"-"+e.toLowerCase()}return function(d){return b[d]||(b[d]=d.replace(c,a))}}(),generateMarkup:function(d,c){var g=this,b,h,a,e,f;if(typeof d=="string"){c.push(d)}else{if(Ext.isArray(d)){for(e=0;e<d.length;e++){if(d[e]){g.generateMarkup(d[e],c)}}}else{a=d.tag||"div";c.push("<",a);for(b in d){if(d.hasOwnProperty(b)){h=d[b];if(!g.confRe.test(b)){if(typeof h=="object"){c.push(" ",b,'="');g.generateStyles(h,c).push('"')}else{c.push(" ",g.attribXlat[b]||b,'="',h,'"')}}}}if(g.emptyTags.test(a)){c.push("/>")}else{c.push(">");if((h=d.tpl)){h.applyOut(d.tplData,c)}if((h=d.html)){c.push(h)}if((h=d.cn||d.children)){g.generateMarkup(h,c)}f=g.closeTags;c.push(f[a]||(f[a]="</"+a+">"))}}}return c},generateStyles:function(e,c){var b=c||[],d;for(d in e){if(e.hasOwnProperty(d)){b.push(this.decamelizeName(d),":",e[d],";")}}return c||b.join("")},markup:function(a){if(typeof a=="string"){return a}var b=this.generateMarkup(a,[]);return b.join("")},applyStyles:function(a,b){Ext.fly(a).applyStyles(b)},createContextualFragment:function(c){var f=document.createElement("div"),a=document.createDocumentFragment(),b=0,d,e;f.innerHTML=c;e=f.childNodes;d=e.length;for(;b<d;b++){a.appendChild(e[b].cloneNode(true))}return a},insertHtml:function(d,a,e){var h,f,i,c,b,g;d=d.toLowerCase();if(Ext.isTextNode(a)){if(d=="afterbegin"){d="beforebegin"}else{if(d=="beforeend"){d="afterend"}}}b=d=="beforebegin";g=d=="afterbegin";f=Ext.feature.has.CreateContextualFragment?a.ownerDocument.createRange():undefined;h="setStart"+(this.endRe.test(d)?"After":"Before");if(b||d=="afterend"){if(f){f[h](a);i=f.createContextualFragment(e)}else{i=this.createContextualFragment(e)}a.parentNode.insertBefore(i,b?a:a.nextSibling);return a[(b?"previous":"next")+"Sibling"]}else{c=(g?"first":"last")+"Child";if(a.firstChild){if(f){f[h](a[c]);i=f.createContextualFragment(e)}else{i=this.createContextualFragment(e)}if(g){a.insertBefore(i,a.firstChild)}else{a.appendChild(i)}}else{a.innerHTML=e}return a[c]}},insertBefore:function(a,c,b){return this.doInsert(a,c,b,"beforebegin")},insertAfter:function(a,c,b){return this.doInsert(a,c,b,"afterend")},insertFirst:function(a,c,b){return this.doInsert(a,c,b,"afterbegin")},append:function(a,c,b){return this.doInsert(a,c,b,"beforeend")},overwrite:function(a,c,b){a=Ext.getDom(a);a.innerHTML=this.markup(c);return b?Ext.get(a.firstChild):a.firstChild},doInsert:function(b,d,c,e){var a=this.insertHtml(e,Ext.getDom(b),this.markup(d));return c?Ext.get(a,true):a},createTemplate:function(b){var a=this.markup(b);return new Ext.Template(a)}},function(){Ext.ns("Ext.core");Ext.core.DomHelper=Ext.DomHelper=new this});Ext.define("Ext.mixin.Identifiable",{statics:{uniqueIds:{}},isIdentifiable:true,mixinId:"identifiable",idCleanRegex:/\.|[^\w\-]/g,defaultIdPrefix:"ext-",defaultIdSeparator:"-",getOptimizedId:function(){return this.id},getUniqueId:function(){var f=this.id,b,d,e,a,c;if(!f){b=this.self.prototype;d=this.defaultIdSeparator;a=Ext.mixin.Identifiable.uniqueIds;if(!b.hasOwnProperty("identifiablePrefix")){e=this.xtype;if(e){c=this.defaultIdPrefix+e+d}else{c=b.$className.replace(this.idCleanRegex,d).toLowerCase()+d}b.identifiablePrefix=c}c=this.identifiablePrefix;if(!a.hasOwnProperty(c)){a[c]=0}f=this.id=c+(++a[c])}this.getUniqueId=this.getOptimizedId;return f},setId:function(a){this.id=a},getId:function(){var a=this.id;if(!a){a=this.getUniqueId()}this.getId=this.getOptimizedId;return a}});Ext.define("Ext.dom.Element",{alternateClassName:"Ext.Element",mixins:["Ext.mixin.Identifiable"],requires:["Ext.dom.Query","Ext.dom.Helper"],observableType:"element",xtype:"element",statics:{CREATE_ATTRIBUTES:{style:"style",className:"className",cls:"cls",classList:"classList",text:"text",hidden:"hidden",html:"html",children:"children"},create:function(c,b){var f=this.CREATE_ATTRIBUTES,e,h,k,j,a,d,g;if(!c){c={}}if(c.isElement){return c.dom}else{if("nodeType" in c){return c}}if(typeof c=="string"){return document.createTextNode(c)}k=c.tag;if(!k){k="div"}e=document.createElement(k);h=e.style;for(a in c){if(a!="tag"&&c.hasOwnProperty(a)){j=c[a];switch(a){case f.style:if(typeof j=="string"){e.setAttribute(a,j)}else{for(d in j){if(j.hasOwnProperty(d)){h[d]=j[d]}}}break;case f.className:case f.cls:e.className=j;break;case f.classList:e.className=j.join(" ");break;case f.text:e.textContent=j;break;case f.hidden:if(j){e.style.display="none"}break;case f.html:e.innerHTML=j;break;case f.children:for(d=0,g=j.length;d<g;d++){e.appendChild(this.create(j[d],true))}break;default:e.setAttribute(a,j)}}}if(b){return e}else{return this.get(e)}},documentElement:null,cache:{},get:function(c){var b=this.cache,a,d,e;if(!c){return null}if(typeof c=="string"){if(b.hasOwnProperty(c)){return b[c]}if(!(d=document.getElementById(c))){return null}b[c]=a=new this(d);return a}if("tagName" in c){e=c.id;if(b.hasOwnProperty(e)){return b[e]}a=new this(c);b[a.getId()]=a;return a}if(c.isElement){return c}if(c.isComposite){return c}if(Ext.isArray(c)){return this.select(c)}if(c===document){if(!this.documentElement){this.documentElement=new this(document.documentElement);this.documentElement.setId("ext-application")}return this.documentElement}return null},data:function(c,b,e){var a=Ext.cache,f,d;c=this.get(c);if(!c){return null}f=c.id;d=a[f].data;if(!d){a[f].data=d={}}if(arguments.length==2){return d[b]}else{return(d[b]=e)}}},isElement:true,constructor:function(a){if(typeof a=="string"){a=document.getElementById(a)}if(!a){throw new Error("Invalid domNode reference or an id of an existing domNode: "+a)}this.dom=a;this.getUniqueId()},attach:function(a){this.dom=a;this.id=a.id;return this},getUniqueId:function(){var b=this.id,a;if(!b){a=this.dom;if(a.id.length>0){this.id=b=a.id}else{a.id=b=this.mixins.identifiable.getUniqueId.call(this)}this.self.cache[b]=this}return b},setId:function(c){var a=this.id,b=this.self.cache;if(a){delete b[a]}this.dom.id=c;this.id=c;b[c]=this;return this},setHtml:function(a){this.dom.innerHTML=a},getHtml:function(){return this.dom.innerHTML},setText:function(a){this.dom.textContent=a},redraw:function(){var b=this.dom,a=b.style;a.display="none";b.offsetHeight;a.display=""},isPainted:function(){return Boolean(this.dom.offsetParent)},set:function(a,b){var e=this.dom,c,d;for(c in a){if(a.hasOwnProperty(c)){d=a[c];if(c=="style"){this.applyStyles(d)}else{if(c=="cls"){e.className=d}else{if(b!==false){if(d===undefined){e.removeAttribute(c)}else{e.setAttribute(c,d)}}else{e[c]=d}}}}}return this},is:function(a){return Ext.DomQuery.is(this.dom,a)},getValue:function(b){var a=this.dom.value;return b?parseInt(a,10):a},getAttribute:function(a,b){var c=this.dom;return c.getAttributeNS(b,a)||c.getAttribute(b+":"+a)||c.getAttribute(a)||c[a]},destroy:function(){this.isDestroyed=true;var a=Ext.Element.cache,b=this.dom;if(b&&b.parentNode&&b.tagName!="BODY"){b.parentNode.removeChild(b)}delete a[this.id];delete this.dom}},function(a){Ext.elements=Ext.cache=a.cache;this.addStatics({Fly:new Ext.Class({extend:a,constructor:function(b){this.dom=b}}),_flyweights:{},fly:function(d,b){var e=null,c=a._flyweights;b=b||"_global";d=Ext.getDom(d);if(d){e=c[b]||(c[b]=new a.Fly());e.dom=d;e.isSynchronized=false}return e}});Ext.get=function(b){return a.get.call(a,b)};Ext.fly=function(){return a.fly.apply(a,arguments)};Ext.ClassManager.onCreated(function(){a.mixin("observable",Ext.mixin.Observable)},null,"Ext.mixin.Observable")});Ext.dom.Element.addStatics({unitRe:/\d+(px|em|%|en|ex|pt|in|cm|mm|pc)$/i,camelRe:/(-[a-z])/gi,cssRe:/([a-z0-9-]+)\s*:\s*([^;\s]+(?:\s*[^;\s]+)*);?/gi,opacityRe:/alpha\(opacity=(.*)\)/i,propertyCache:{},defaultUnit:"px",borders:{l:"border-left-width",r:"border-right-width",t:"border-top-width",b:"border-bottom-width"},paddings:{l:"padding-left",r:"padding-right",t:"padding-top",b:"padding-bottom"},margins:{l:"margin-left",r:"margin-right",t:"margin-top",b:"margin-bottom"},addUnits:function(b,a){if(Ext.isNumber(b)){return b+(a||this.defaultUnit||"px")}if(b===""||b=="auto"||b===undefined||b===null){return b||""}if(!this.unitRe.test(b)){return b||""}return b},isAncestor:function(b,d){var a=false;b=Ext.getDom(b);d=Ext.getDom(d);if(b&&d){if(b.contains){return b.contains(d)}else{if(b.compareDocumentPosition){return !!(b.compareDocumentPosition(d)&16)}else{while((d=d.parentNode)){a=d==b||a}}}}return a},parseBox:function(b){if(typeof b!="string"){b=b.toString()}var c=b.split(" "),a=c.length;if(a==1){c[1]=c[2]=c[3]=c[0]}else{if(a==2){c[2]=c[0];c[3]=c[1]}else{if(a==3){c[3]=c[1]}}}return{top:parseFloat(c[0])||0,right:parseFloat(c[1])||0,bottom:parseFloat(c[2])||0,left:parseFloat(c[3])||0}},unitizeBox:function(f,e){var d=this.addUnits,c=this.parseBox(f);return d(c.top,e)+" "+d(c.right,e)+" "+d(c.bottom,e)+" "+d(c.left,e)},camelReplaceFn:function(b,c){return c.charAt(1).toUpperCase()},normalize:function(a){return this.propertyCache[a]||(this.propertyCache[a]=a.replace(this.camelRe,this.camelReplaceFn))},fromPoint:function(a,b){return Ext.get(document.elementFromPoint(a,b))},parseStyles:function(c){var a={},b=this.cssRe,d;if(c){b.lastIndex=0;while((d=b.exec(c))){a[d[1]]=d[2]}}return a}});Ext.dom.Element.addMembers({appendChild:function(a){this.dom.appendChild(Ext.getDom(a));return this},removeChild:function(a){this.dom.removeChild(Ext.getDom(a));return this},append:function(){this.appendChild.apply(this,arguments)},appendTo:function(a){Ext.getDom(a).appendChild(this.dom);return this},insertBefore:function(a){a=Ext.getDom(a);a.parentNode.insertBefore(this.dom,a);return this},insertAfter:function(a){a=Ext.getDom(a);a.parentNode.insertBefore(this.dom,a.nextSibling);return this},insertFirst:function(b){var a=Ext.getDom(b),d=this.dom,c=d.firstChild;if(!c){d.appendChild(a)}else{d.insertBefore(a,c)}return this},insertSibling:function(e,c,d){var f=this,b,a=(c||"before").toLowerCase()=="after",g;if(Ext.isArray(e)){g=f;Ext.each(e,function(h){b=Ext.fly(g,"_internal").insertSibling(h,c,d);if(a){g=b}});return b}e=e||{};if(e.nodeType||e.dom){b=f.dom.parentNode.insertBefore(Ext.getDom(e),a?f.dom.nextSibling:f.dom);if(!d){b=Ext.get(b)}}else{if(a&&!f.dom.nextSibling){b=Ext.core.DomHelper.append(f.dom.parentNode,e,!d)}else{b=Ext.core.DomHelper[a?"insertAfter":"insertBefore"](f.dom,e,!d)}}return b},replace:function(a){a=Ext.get(a);this.insertBefore(a);a.remove();return this},replaceWith:function(a){var b=this;if(a.nodeType||a.dom||typeof a=="string"){a=Ext.get(a);b.dom.parentNode.insertBefore(a,b.dom)}else{a=Ext.core.DomHelper.insertBefore(b.dom,a)}delete Ext.cache[b.id];Ext.removeNode(b.dom);b.id=Ext.id(b.dom=a);Ext.dom.Element.addToCache(b.isFlyweight?new Ext.dom.Element(b.dom):b);return b},createChild:function(b,a,c){b=b||{tag:"div"};if(a){return Ext.core.DomHelper.insertBefore(a,b,c!==true)}else{return Ext.core.DomHelper[!this.dom.firstChild?"insertFirst":"append"](this.dom,b,c!==true)}},wrap:function(b,c){var e=this.dom,f=this.self.create(b,c),d=(c)?f:f.dom,a=e.parentNode;if(a){a.insertBefore(d,e)}d.appendChild(e);return f},wrapAllChildren:function(a){var d=this.dom,b=d.childNodes,e=this.self.create(a),c=e.dom;while(b.length>0){c.appendChild(d.firstChild)}d.appendChild(c);return e},unwrapAllChildren:function(){var c=this.dom,b=c.childNodes,a=c.parentNode;if(a){while(b.length>0){a.insertBefore(c,c.firstChild)}this.destroy()}},unwrap:function(){var c=this.dom,a=c.parentNode,b;if(a){b=a.parentNode;b.insertBefore(c,a);b.removeChild(a)}else{b=document.createDocumentFragment();b.appendChild(c)}return this},insertHtml:function(b,c,a){var d=Ext.core.DomHelper.insertHtml(b,this.dom,c);return a?Ext.get(d):d}});Ext.dom.Element.override({getX:function(a){return this.getXY(a)[0]},getY:function(a){return this.getXY(a)[1]},getXY:function(){var a=window.webkitConvertPointFromNodeToPage;if(a){return function(){var b=a(this.dom,new WebKitPoint(0,0));return[b.x,b.y]}}else{return function(){var c=this.dom.getBoundingClientRect(),b=Math.round;return[b(c.left+window.pageXOffset),b(c.top+window.pageYOffset)]}}}(),getOffsetsTo:function(a){var c=this.getXY(),b=Ext.fly(a,"_internal").getXY();return[c[0]-b[0],c[1]-b[1]]},setX:function(a){return this.setXY([a,this.getY()])},setY:function(a){return this.setXY([this.getX(),a])},setXY:function(d){var b=this;if(arguments.length>1){d=[d,arguments[1]]}var c=b.translatePoints(d),a=b.dom.style;for(d in c){if(!c.hasOwnProperty(d)){continue}if(!isNaN(c[d])){a[d]=c[d]+"px"}}return b},getLeft:function(){return parseInt(this.getStyle("left"),10)||0},getRight:function(){return parseInt(this.getStyle("right"),10)||0},getTop:function(){return parseInt(this.getStyle("top"),10)||0},getBottom:function(){return parseInt(this.getStyle("bottom"),10)||0},translatePoints:function(a,g){g=isNaN(a[1])?g:a[1];a=isNaN(a[0])?a:a[0];var d=this,e=d.isStyle("position","relative"),f=d.getXY(),b=parseInt(d.getStyle("left"),10),c=parseInt(d.getStyle("top"),10);b=!isNaN(b)?b:(e?0:d.dom.offsetLeft);c=!isNaN(c)?c:(e?0:d.dom.offsetTop);return{left:(a-f[0]+b),top:(g-f[1]+c)}},setBox:function(d){var c=this,b=d.width,a=d.height,f=d.top,e=d.left;if(e!==undefined){c.setLeft(e)}if(f!==undefined){c.setTop(f)}if(b!==undefined){c.setWidth(b)}if(a!==undefined){c.setHeight(a)}return this},getBox:function(g,j){var h=this,e=h.dom,c=e.offsetWidth,k=e.offsetHeight,n,f,d,a,m,i;if(!j){n=h.getXY()}else{if(g){n=[0,0]}else{n=[parseInt(h.getStyle("left"),10)||0,parseInt(h.getStyle("top"),10)||0]}}if(!g){f={x:n[0],y:n[1],0:n[0],1:n[1],width:c,height:k}}else{d=h.getBorderWidth.call(h,"l")+h.getPadding.call(h,"l");a=h.getBorderWidth.call(h,"r")+h.getPadding.call(h,"r");m=h.getBorderWidth.call(h,"t")+h.getPadding.call(h,"t");i=h.getBorderWidth.call(h,"b")+h.getPadding.call(h,"b");f={x:n[0]+d,y:n[1]+m,0:n[0]+d,1:n[1]+m,width:c-(d+a),height:k-(m+i)}}f.left=f.x;f.top=f.y;f.right=f.x+f.width;f.bottom=f.y+f.height;return f},getPageBox:function(e){var g=this,c=g.dom,j=c.offsetWidth,f=c.offsetHeight,m=g.getXY(),k=m[1],a=m[0]+j,i=m[1]+f,d=m[0];if(!c){return new Ext.util.Region()}if(e){return new Ext.util.Region(k,a,i,d)}else{return{left:d,top:k,width:j,height:f,right:a,bottom:i}}}});Ext.dom.Element.addMembers({WIDTH:"width",HEIGHT:"height",MIN_WIDTH:"min-width",MIN_HEIGHT:"min-height",MAX_WIDTH:"max-width",MAX_HEIGHT:"max-height",TOP:"top",RIGHT:"right",BOTTOM:"bottom",LEFT:"left",VISIBILITY:1,DISPLAY:2,OFFSETS:3,SEPARATOR:"-",trimRe:/^\s+|\s+$/g,wordsRe:/\w/g,spacesRe:/\s+/,styleSplitRe:/\s*(?::|;)\s*/,transparentRe:/^(?:transparent|(?:rgba[(](?:\s*\d+\s*[,]){3}\s*0\s*[)]))$/i,classNameSplitRegex:/[\s]+/,borders:{t:"border-top-width",r:"border-right-width",b:"border-bottom-width",l:"border-left-width"},paddings:{t:"padding-top",r:"padding-right",b:"padding-bottom",l:"padding-left"},margins:{t:"margin-top",r:"margin-right",b:"margin-bottom",l:"margin-left"},defaultUnit:"px",isSynchronized:false,synchronize:function(){var g=this.dom,a={},d=g.className,f,c,e,b;if(d.length>0){f=g.className.split(this.classNameSplitRegex);for(c=0,e=f.length;c<e;c++){b=f[c];a[b]=true}}else{f=[]}this.classList=f;this.hasClassMap=a;this.isSynchronized=true;return this},addCls:function(j,g,k){if(!j){return this}if(!this.isSynchronized){this.synchronize()}var e=this.dom,c=this.hasClassMap,d=this.classList,a=this.SEPARATOR,f,h,b;g=g?g+a:"";k=k?a+k:"";if(typeof j=="string"){j=j.split(this.spacesRe)}for(f=0,h=j.length;f<h;f++){b=g+j[f]+k;if(!c[b]){c[b]=true;d.push(b)}}e.className=d.join(" ");return this},removeCls:function(j,g,k){if(!j){return this}if(!this.isSynchronized){this.synchronize()}if(!k){k=""}var e=this.dom,c=this.hasClassMap,d=this.classList,a=this.SEPARATOR,f,h,b;g=g?g+a:"";k=k?a+k:"";if(typeof j=="string"){j=j.split(this.spacesRe)}for(f=0,h=j.length;f<h;f++){b=g+j[f]+k;if(c[b]){delete c[b];Ext.Array.remove(d,b)}}e.className=d.join(" ");return this},replaceCls:function(b,a,c,d){return this.removeCls(b,c,d).addCls(a,c,d)},hasCls:function(a){if(!this.isSynchronized){this.synchronize()}return this.hasClassMap.hasOwnProperty(a)},toggleCls:function(a){return this.hasCls(a)?this.removeCls(a):this.addCls(a)},setWidth:function(a){return this.setLengthValue(this.WIDTH,a)},setHeight:function(a){return this.setLengthValue(this.HEIGHT,a)},setSize:function(b,a){if(Ext.isObject(b)){a=b.height;b=b.width}this.setWidth(b);this.setHeight(a);return this},setMinWidth:function(a){return this.setLengthValue(this.MIN_WIDTH,a)},setMinHeight:function(a){return this.setLengthValue(this.MIN_HEIGHT,a)},setMaxWidth:function(a){return this.setLengthValue(this.MAX_WIDTH,a)},setMaxHeight:function(a){return this.setLengthValue(this.MAX_HEIGHT,a)},setTop:function(a){return this.setLengthValue(this.TOP,a)},setRight:function(a){return this.setLengthValue(this.RIGHT,a)},setBottom:function(a){return this.setLengthValue(this.BOTTOM,a)},setLeft:function(a){return this.setLengthValue(this.LEFT,a)},setMargin:function(b){var a=this.dom.style;if(b||b===0){b=this.self.unitizeBox((b===true)?5:b);a.setProperty("margin",b,"important")}else{a.removeProperty("margin-top");a.removeProperty("margin-right");a.removeProperty("margin-bottom");a.removeProperty("margin-left")}},setPadding:function(b){var a=this.dom.style;if(b||b===0){b=this.self.unitizeBox((b===true)?5:b);a.setProperty("padding",b,"important")}else{a.removeProperty("padding-top");a.removeProperty("padding-right");a.removeProperty("padding-bottom");a.removeProperty("padding-left")}},setBorder:function(a){var b=this.dom.style;if(a||a===0){a=this.self.unitizeBox((a===true)?1:a);b.setProperty("border-width",a,"important")}else{b.removeProperty("border-top-width");b.removeProperty("border-right-width");b.removeProperty("border-bottom-width");b.removeProperty("border-left-width")}},setLengthValue:function(a,c){var b=this.dom.style;if(c===null){b.removeProperty(a);return this}if(typeof c=="number"){c=c+"px"}b.setProperty(a,c,"important");return this},setVisible:function(b){var a=this.getVisibilityMode(),c=b?"removeCls":"addCls";switch(a){case this.VISIBILITY:this.removeCls(["x-hidden-display","x-hidden-offsets"]);this[c]("x-hidden-visibility");break;case this.DISPLAY:this.removeCls(["x-hidden-visibility","x-hidden-offsets"]);this[c]("x-hidden-display");break;case this.OFFSETS:this.removeCls(["x-hidden-visibility","x-hidden-display"]);this[c]("x-hidden-offsets");break}return this},getVisibilityMode:function(){var b=this.dom,a=Ext.dom.Element.data(b,"visibilityMode");if(a===undefined){Ext.dom.Element.data(b,"visibilityMode",a=this.DISPLAY)}return a},setVisibilityMode:function(a){this.self.data(this.dom,"visibilityMode",a);return this},show:function(){var a=this.dom;if(a){a.style.removeProperty("display")}},hide:function(){var c=this.dom,b=c.style,a=Ext.os.is.iOS5;if(b.getPropertyValue("display")!=="none"){if(a){b.setProperty("display","none","important");c.offsetHeight;b.removeProperty("display");c.offsetHeight}b.setProperty("display","none","important")}},setVisibility:function(a){var b=this.dom.style;if(a){b.removeProperty("visibility")}else{b.setProperty("visibility","hidden","important")}},styleHooks:{},addStyles:function(h,g){var b=0,f=h.match(this.wordsRe),e=0,a=f.length,d,c;for(;e<a;e++){d=f[e];c=d&&parseInt(this.getStyle(g[d]),10);if(c){b+=Math.abs(c)}}return b},isStyle:function(a,b){return this.getStyle(a)==b},getStyle:function(f){var c=this,e=c.dom,d=c.styleHooks[f],b,a;if(e==document){return null}if(!d){c.styleHooks[f]=d={name:this.self.normalize(f)}}if(d.get){return d.get(e,c)}b=window.getComputedStyle(e,"");a=(b&&b[d.name]);return a},setStyle:function(a,h){var f=this,d=f.dom,i=f.styleHooks,b=d.style,e=Ext.valueFrom,c,g;if(typeof a=="string"){g=i[a];if(!g){i[a]=g={name:Ext.dom.Element.normalize(a)}}h=e(h,"");if(g.set){g.set(d,h,f)}else{b[g.name]=h}}else{for(c in a){if(a.hasOwnProperty(c)){g=i[c];if(!g){i[c]=g={name:Ext.dom.Element.normalize(c)}}h=e(a[c],"");if(g.set){g.set(d,h,f)}else{b[g.name]=h}}}}return f},getHeight:function(b){var c=this.dom,a=b?(c.clientHeight-this.getPadding("tb")):c.offsetHeight;return a>0?a:0},getWidth:function(a){var c=this.dom,b=a?(c.clientWidth-this.getPadding("lr")):c.offsetWidth;return b>0?b:0},getBorderWidth:function(a){return this.addStyles(a,this.borders)},getPadding:function(a){return this.addStyles(a,this.paddings)},applyStyles:function(d){if(d){var e=this.dom,c,b,a;if(typeof d=="function"){d=d.call()}c=typeof d;if(c=="string"){d=Ext.util.Format.trim(d).split(this.styleSplitRe);for(b=0,a=d.length;b<a;){e.style[Ext.dom.Element.normalize(d[b++])]=d[b++]}}else{if(c=="object"){this.setStyle(d)}}}},getSize:function(b){var a=this.dom;return{width:Math.max(0,b?(a.clientWidth-this.getPadding("lr")):a.offsetWidth),height:Math.max(0,b?(a.clientHeight-this.getPadding("tb")):a.offsetHeight)}},repaint:function(){var a=this.dom;this.addCls(Ext.baseCSSPrefix+"repaint");setTimeout(function(){Ext.fly(a).removeCls(Ext.baseCSSPrefix+"repaint")},1);return this},getMargin:function(b){var c=this,d={t:"top",l:"left",r:"right",b:"bottom"},e={},a;if(!b){for(a in c.margins){e[d[a]]=parseFloat(c.getStyle(c.margins[a]))||0}return e}else{return c.addStyles.call(c,b,c.margins)}}});Ext.dom.Element.addMembers({getParent:function(){return Ext.get(this.dom.parentNode)},getFirstChild:function(){return Ext.get(this.dom.firstElementChild)},contains:function(a){if(!a){return false}var b=Ext.getDom(a);return(b===this.dom)||this.self.isAncestor(this.dom,b)},findParent:function(h,g,c){var e=this.dom,a=document.body,f=0,d;g=g||50;if(isNaN(g)){d=Ext.getDom(g);g=Number.MAX_VALUE}while(e&&e.nodeType==1&&f<g&&e!=a&&e!=d){if(Ext.DomQuery.is(e,h)){return c?Ext.get(e):e}f++;e=e.parentNode}return null},findParentNode:function(d,c,a){var b=Ext.fly(this.dom.parentNode,"_internal");return b?b.findParent(d,c,a):null},up:function(b,a){return this.findParentNode(b,a,true)},select:function(a,b){return Ext.dom.Element.select(a,this.dom,b)},query:function(a){return Ext.DomQuery.select(a,this.dom)},down:function(a,b){var c=Ext.DomQuery.selectNode(a,this.dom);return b?c:Ext.get(c)},child:function(a,b){var d,c=this,e;e=Ext.get(c).id;e=e.replace(/[\.:]/g,"\\$0");d=Ext.DomQuery.selectNode("#"+e+" > "+a,c.dom);return b?d:Ext.get(d)},parent:function(a,b){return this.matchNode("parentNode","parentNode",a,b)},next:function(a,b){return this.matchNode("nextSibling","nextSibling",a,b)},prev:function(a,b){return this.matchNode("previousSibling","previousSibling",a,b)},first:function(a,b){return this.matchNode("nextSibling","firstChild",a,b)},last:function(a,b){return this.matchNode("previousSibling","lastChild",a,b)},matchNode:function(b,e,a,c){if(!this.dom){return null}var d=this.dom[e];while(d){if(d.nodeType==1&&(!a||Ext.DomQuery.is(d,a))){return !c?Ext.get(d):d}d=d[b]}return null},isAncestor:function(a){return this.self.isAncestor.call(this.self,this.dom,a)}});Ext.define("Ext.dom.CompositeElementLite",{alternateClassName:["Ext.CompositeElementLite","Ext.CompositeElement"],requires:["Ext.dom.Element"],statics:{importElementMethods:function(){}},constructor:function(b,a){this.elements=[];this.add(b,a);this.el=new Ext.dom.Element.Fly()},isComposite:true,getElement:function(a){return this.el.attach(a)},transformElement:function(a){return Ext.getDom(a)},getCount:function(){return this.elements.length},add:function(c,a){var e=this.elements,b,d;if(!c){return this}if(typeof c=="string"){c=Ext.dom.Element.selectorFunction(c,a)}else{if(c.isComposite){c=c.elements}else{if(!Ext.isIterable(c)){c=[c]}}}for(b=0,d=c.length;b<d;++b){e.push(this.transformElement(c[b]))}return this},invoke:function(d,a){var f=this.elements,e=f.length,c,b;for(b=0;b<e;b++){c=f[b];if(c){Ext.dom.Element.prototype[d].apply(this.getElement(c),a)}}return this},item:function(b){var c=this.elements[b],a=null;if(c){a=this.getElement(c)}return a},addListener:function(b,h,g,f){var d=this.elements,a=d.length,c,j;for(c=0;c<a;c++){j=d[c];if(j){Ext.EventManager.on(j,b,h,g||j,f)}}return this},each:function(f,d){var g=this,c=g.elements,a=c.length,b,h;for(b=0;b<a;b++){h=c[b];if(h){h=this.getElement(h);if(f.call(d||h,h,g,b)===false){break}}}return g},fill:function(a){var b=this;b.elements=[];b.add(a);return b},filter:function(a){var b=[],d=this,c=Ext.isFunction(a)?a:function(e){return e.is(a)};d.each(function(g,e,f){if(c(g,f)!==false){b[b.length]=d.transformElement(g)}});d.elements=b;return d},indexOf:function(a){return Ext.Array.indexOf(this.elements,this.transformElement(a))},replaceElement:function(e,c,a){var b=!isNaN(e)?e:this.indexOf(e),f;if(b>-1){c=Ext.getDom(c);if(a){f=this.elements[b];f.parentNode.insertBefore(c,f);Ext.removeNode(f)}Ext.Array.splice(this.elements,b,1,c)}return this},clear:function(){this.elements=[]},addElements:function(c,a){if(!c){return this}if(typeof c=="string"){c=Ext.dom.Element.selectorFunction(c,a)}var b=this.elements;Ext.each(c,function(d){b.push(Ext.get(d))});return this},first:function(){return this.item(0)},last:function(){return this.item(this.getCount()-1)},contains:function(a){return this.indexOf(a)!=-1},removeElement:function(c,e){var b=this,d=this.elements,a;Ext.each(c,function(f){if((a=(d[f]||d[f=b.indexOf(f)]))){if(e){if(a.dom){a.remove()}else{Ext.removeNode(a)}}Ext.Array.erase(d,f,1)}});return this}},function(){var a=Ext.dom.Element,d=a.prototype,c=this.prototype,b;for(b in d){if(typeof d[b]=="function"){(function(e){c[e]=c[e]||function(){return this.invoke(e,arguments)}}).call(c,b)}}c.on=c.addListener;if(Ext.DomQuery){a.selectorFunction=Ext.DomQuery.select}a.select=function(e,f){var g;if(typeof e=="string"){g=a.selectorFunction(e,f)}else{if(e.length!==undefined){g=e}else{}}return new Ext.CompositeElementLite(g)};Ext.select=function(){return a.select.apply(a,arguments)}});Ext.define("Ext.ComponentManager",{alternateClassName:"Ext.ComponentMgr",singleton:true,constructor:function(){var a={};this.all={map:a,getArray:function(){var b=[],c;for(c in a){b.push(a[c])}return b}};this.map=a},register:function(a){this.map[a.getId()]=a},unregister:function(a){delete this.map[a.getId()]},isRegistered:function(a){return this.map[a]!==undefined},get:function(a){return this.map[a]},create:function(a,c){if(a.isComponent){return a}else{if(Ext.isString(a)){return Ext.createByAlias("widget."+a)}else{var b=a.xtype||c;return Ext.createByAlias("widget."+b,a)}}},registerType:Ext.emptyFn});Ext.define("Ext.ComponentQuery",{singleton:true,uses:["Ext.ComponentManager"]},function(){var g=this,j=["var r = [],","i = 0,","it = items,","l = it.length,","c;","for (; i < l; i++) {","c = it[i];","if (c.{0}) {","r.push(c);","}","}","return r;"].join(""),e=function(o,n){return n.method.apply(this,[o].concat(n.args))},a=function(p,t){var n=[],q=0,s=p.length,r,o=t!==">";for(;q<s;q++){r=p[q];if(r.getRefItems){n=n.concat(r.getRefItems(o))}}return n},f=function(o){var n=[],p=0,r=o.length,q;for(;p<r;p++){q=o[p];while(!!(q=(q.ownerCt||q.floatParent))){n.push(q)}}return n},l=function(o,t,s){if(t==="*"){return o.slice()}else{var n=[],p=0,r=o.length,q;for(;p<r;p++){q=o[p];if(q.isXType(t,s)){n.push(q)}}return n}},i=function(o,r){var t=Ext.Array,n=[],p=0,s=o.length,q;for(;p<s;p++){q=o[p];if(q.el?q.el.hasCls(r):t.contains(q.initCls(),r)){n.push(q)}}return n},m=function(r,u,o,t){var w=[],q=0,n=r.length,v,s,p;for(;q<n;q++){v=r[q];s=Ext.Class.getConfigNameMap(u).get;if(v[s]){p=v[s]();if(!t?!!p:(String(p)===t)){w.push(v)}}else{if(v.config&&v.config[u]){if(!t?!!v.config[u]:(String(v.config[u])===t)){w.push(v)}}else{if(!t?!!v[u]:(String(v[u])===t)){w.push(v)}}}}return w},d=function(o,s){var n=[],p=0,r=o.length,q;for(;p<r;p++){q=o[p];if(q.getId()===s||q.getItemId()===s){n.push(q)}}return n},k=function(n,o,p){return g.pseudos[o](n,p)},h=/^(\s?([>\^])\s?|\s|$)/,c=/^(#)?([\w\-]+|\*)(?:\((true|false)\))?/,b=[{re:/^\.([\w\-]+)(?:\((true|false)\))?/,method:l},{re:/^(?:[\[](?:@)?([\w\-]+)\s?(?:(=|.=)\s?['"]?(.*?)["']?)?[\]])/,method:m},{re:/^#([\w\-]+)/,method:d},{re:/^\:([\w\-]+)(?:\(((?:\{[^\}]+\})|(?:(?!\{)[^\s>\/]*?(?!\})))\))?/,method:k},{re:/^(?:\{([^\}]+)\})/,method:j}];g.Query=Ext.extend(Object,{constructor:function(n){n=n||{};Ext.apply(this,n)},execute:function(o){var q=this.operations,r=0,s=q.length,p,n;if(!o){n=Ext.ComponentManager.all.getArray()}else{if(Ext.isArray(o)){n=o}}for(;r<s;r++){p=q[r];if(p.mode==="^"){n=f(n||[o])}else{if(p.mode){n=a(n||[o],p.mode)}else{n=e(n||a([o]),p)}}if(r===s-1){return n}}return[]},is:function(p){var o=this.operations,s=Ext.isArray(p)?p:[p],n=s.length,t=o[o.length-1],r,q;s=e(s,t);if(s.length===n){if(o.length>1){for(q=0,r=s.length;q<r;q++){if(Ext.Array.indexOf(this.execute(),s[q])===-1){return false}}}return true}return false}});Ext.apply(this,{cache:{},pseudos:{not:function(t,n){var u=Ext.ComponentQuery,r=0,s=t.length,q=[],p=-1,o;for(;r<s;++r){o=t[r];if(!u.is(o,n)){q[++p]=o}}return q}},query:function(o,v){var w=o.split(","),n=w.length,p=0,q=[],x=[],u={},s,r,t;for(;p<n;p++){o=Ext.String.trim(w[p]);s=this.parse(o);q=q.concat(s.execute(v))}if(n>1){r=q.length;for(p=0;p<r;p++){t=q[p];if(!u[t.id]){x.push(t);u[t.id]=true}}q=x}return q},is:function(o,n){if(!n){return true}var p=this.cache[n];if(!p){this.cache[n]=p=this.parse(n)}return p.is(o)},parse:function(q){var o=[],p=b.length,u,r,v,w,x,s,t,n;while(q&&u!==q){u=q;r=q.match(c);if(r){v=r[1];if(v==="#"){o.push({method:d,args:[Ext.String.trim(r[2])]})}else{if(v==="."){o.push({method:i,args:[Ext.String.trim(r[2])]})}else{o.push({method:l,args:[Ext.String.trim(r[2]),Boolean(r[3])]})}}q=q.replace(r[0],"")}while(!(w=q.match(h))){for(s=0;q&&s<p;s++){t=b[s];x=q.match(t.re);n=t.method;if(x){o.push({method:Ext.isString(t.method)?Ext.functionFactory("items",Ext.String.format.apply(Ext.String,[n].concat(x.slice(1)))):t.method,args:x.slice(1)});q=q.replace(x[0],"");break}}}if(w[1]){o.push({mode:w[2]||w[1]});q=q.replace(w[0],"")}}return new g.Query({operations:o})}})});Ext.define("Ext.XTemplateParser",{constructor:function(a){Ext.apply(this,a)},doTpl:Ext.emptyFn,parse:function(n){var o=this,l=n.length,c={elseif:"elif"},j=o.topRe,b=o.actionsRe,k,p,r,f,q,g,a,e,d,h,i;o.level=0;o.stack=p=[];for(k=0;k<l;k=h){j.lastIndex=k;f=j.exec(n);if(!f){o.doText(n.substring(k,l));break}d=f.index;h=j.lastIndex;if(k<d){o.doText(n.substring(k,d))}if(f[1]){h=n.indexOf("%}",d+2);o.doEval(n.substring(d+2,h));h+=2}else{if(f[2]){h=n.indexOf("]}",d+2);o.doExpr(n.substring(d+2,h));h+=2}else{if(f[3]){o.doTag(f[3])}else{if(f[4]){i=null;while((e=b.exec(f[4]))!==null){r=e[2]||e[3];if(r){r=Ext.String.htmlDecode(r);q=e[1];q=c[q]||q;i=i||{};g=i[q];if(typeof g=="string"){i[q]=[g,r]}else{if(g){i[q].push(r)}else{i[q]=r}}}}if(!i){if(o.elseRe.test(f[4])){o.doElse()}else{if(o.defaultRe.test(f[4])){o.doDefault()}else{o.doTpl();p.push({type:"tpl"})}}}else{if(i["if"]){o.doIf(i["if"],i);p.push({type:"if"})}else{if(i["switch"]){o.doSwitch(i["switch"],i);p.push({type:"switch"})}else{if(i["case"]){o.doCase(i["case"],i)}else{if(i.elif){o.doElseIf(i.elif,i)}else{if(i["for"]){++o.level;o.doFor(i["for"],i);p.push({type:"for",actions:i})}else{if(i.exec){o.doExec(i.exec,i);p.push({type:"exec",actions:i})}}}}}}}}else{a=p.pop();o.doEnd(a.type,a.actions);if(a.type=="for"){--o.level}}}}}}},topRe:/(?:(\{\%)|(\{\[)|\{([^{}]*)\})|(?:<tpl([^>]*)\>)|(?:<\/tpl>)/g,actionsRe:/\s*(elif|elseif|if|for|exec|switch|case|eval)\s*\=\s*(?:(?:["]([^"]*)["])|(?:[']([^']*)[']))\s*/g,defaultRe:/^\s*default\s*$/,elseRe:/^\s*else\s*$/});Ext.define("Ext.app.Action",{config:{scope:null,application:null,controller:null,action:null,args:[],url:undefined,data:{},title:null,beforeFilters:[],currentFilterIndex:-1},constructor:function(a){this.initConfig(a);this.getUrl()},execute:function(){this.resume()},resume:function(){var b=this.getCurrentFilterIndex()+1,c=this.getBeforeFilters(),a=this.getController(),d=c[b];if(d){this.setCurrentFilterIndex(b);d.call(a,this)}else{a[this.getAction()].apply(a,this.getArgs())}},applyUrl:function(a){if(a===null||a===undefined){a=this.urlEncode()}return a},applyController:function(a){var c=this.getApplication(),b=c.getCurrentProfile();if(Ext.isString(a)){a=c.getController(a,b?b.getNamespace():null)}return a},urlEncode:function(){var a=this.getController(),b;if(a instanceof Ext.app.Controller){b=a.$className.split(".");a=b[b.length-1]}return a+"/"+this.getAction()}});Ext.define("Ext.app.Route",{config:{conditions:{},url:null,controller:null,action:null,initialized:false},constructor:function(a){this.initConfig(a)},recognize:function(b){if(!this.getInitialized()){this.initialize()}if(this.recognizes(b)){var c=this.matchesFor(b),a=b.match(this.matcherRegex);a.shift();return Ext.applyIf(c,{controller:this.getController(),action:this.getAction(),historyUrl:b,args:a})}},initialize:function(){this.paramMatchingRegex=new RegExp(/:([0-9A-Za-z\_]*)/g);this.paramsInMatchString=this.getUrl().match(this.paramMatchingRegex)||[];this.matcherRegex=this.createMatcherRegex(this.getUrl());this.setInitialized(true)},recognizes:function(a){return this.matcherRegex.test(a)},matchesFor:function(b){var f={},e=this.paramsInMatchString,a=b.match(this.matcherRegex),d=e.length,c;a.shift();for(c=0;c<d;c++){f[e[c].replace(":","")]=a[c]}return f},argsFor:function(c){var b=[],f=this.paramsInMatchString,a=c.match(this.matcherRegex),e=f.length,d;a.shift();for(d=0;d<e;d++){b.push(f[d].replace(":",""));params[f[d].replace(":","")]=a[d]}return params},urlFor:function(b){var a=this.getUrl();for(var c in b){a=a.replace(":"+c,b[c])}return a},createMatcherRegex:function(a){var e=this.paramsInMatchString,d=e.length,b,c,f;for(b=0;b<d;b++){c=this.getConditions()[e[b]];f=Ext.util.Format.format("({0})",c||"[%a-zA-Z0-9-\\_\\s,]+");a=a.replace(new RegExp(e[b]),f)}return new RegExp("^"+a+"$")}});Ext.define("Ext.app.Router",{requires:["Ext.app.Route"],config:{routes:[],defaults:{action:"index"}},constructor:function(a){this.initConfig(a)},connect:function(b,c){c=Ext.apply({url:b},c||{},this.getDefaults());var a=Ext.create("Ext.app.Route",c);this.getRoutes().push(a);return a},recognize:function(c){var b=this.getRoutes(),e=b.length,d,a;for(d=0;d<e;d++){a=b[d].recognize(c);if(a!==undefined){return a}}return undefined},draw:function(a){a.call(this,this)},clear:function(){this.setRoutes([])}},function(){});Ext.define("Ext.behavior.Behavior",{constructor:function(a){this.component=a;a.on("destroy","onComponentDestroy",this)},onComponentDestroy:Ext.emptyFn});Ext.define("Ext.data.JsonP",{alternateClassName:"Ext.util.JSONP",singleton:true,statics:{requestCount:0,requests:{}},timeout:30000,disableCaching:true,disableCachingParam:"_dc",callbackKey:"callback",request:function(m){m=Ext.apply({},m);var i=this,d=Ext.isDefined(m.disableCaching)?m.disableCaching:i.disableCaching,g=m.disableCachingParam||i.disableCachingParam,c=++i.statics().requestCount,k=m.callbackName||"callback"+c,h=m.callbackKey||i.callbackKey,l=Ext.isDefined(m.timeout)?m.timeout:i.timeout,e=Ext.apply({},m.params),b=m.url,a=Ext.isSandboxed?Ext.getUniqueGlobalNamespace():"Ext",f,j;e[h]=a+".data.JsonP."+k;if(d){e[g]=new Date().getTime()}j=i.createScript(b,e,m);i.statics().requests[c]=f={url:b,params:e,script:j,id:c,scope:m.scope,success:m.success,failure:m.failure,callback:m.callback,callbackKey:h,callbackName:k};if(l>0){f.timeout=setTimeout(Ext.bind(i.handleTimeout,i,[f]),l)}i.setupErrorHandling(f);i[k]=Ext.bind(i.handleResponse,i,[f],true);i.loadScript(f);return f},abort:function(b){var c=this.statics().requests,a;if(b){if(!b.id){b=c[b]}this.abort(b)}else{for(a in c){if(c.hasOwnProperty(a)){this.abort(c[a])}}}},setupErrorHandling:function(a){a.script.onerror=Ext.bind(this.handleError,this,[a])},handleAbort:function(a){a.errorType="abort";this.handleResponse(null,a)},handleError:function(a){a.errorType="error";this.handleResponse(null,a)},cleanupErrorHandling:function(a){a.script.onerror=null},handleTimeout:function(a){a.errorType="timeout";this.handleResponse(null,a)},handleResponse:function(a,b){var c=true;if(b.timeout){clearTimeout(b.timeout)}delete this[b.callbackName];delete this.statics()[b.id];this.cleanupErrorHandling(b);Ext.fly(b.script).destroy();if(b.errorType){c=false;Ext.callback(b.failure,b.scope,[b.errorType])}else{Ext.callback(b.success,b.scope,[a])}Ext.callback(b.callback,b.scope,[c,a,b.errorType])},createScript:function(c,d,b){var a=document.createElement("script");a.setAttribute("src",Ext.urlAppend(c,Ext.Object.toQueryString(d)));a.setAttribute("async",true);a.setAttribute("type","text/javascript");return a},loadScript:function(a){Ext.getHead().appendChild(a.script)}});Ext.define("Ext.data.Operation",{config:{synchronous:true,action:null,filters:null,sorters:null,grouper:null,start:null,limit:null,batch:null,callback:null,scope:null,resultSet:null,records:null,request:null,response:null,withCredentials:null,params:null,url:null,page:null,node:null,model:undefined,addRecords:false},started:false,running:false,complete:false,success:undefined,exception:false,error:undefined,constructor:function(a){this.initConfig(a)},applyModel:function(a){if(typeof a=="string"){a=Ext.data.ModelManager.getModel(a);if(!a){Ext.Logger.error("Model with name "+arguments[0]+" doesnt exist.")}}if(a&&!a.prototype.isModel&&Ext.isObject(a)){a=Ext.data.ModelManager.registerType(a.storeId||a.id||Ext.id(),a)}return a},getRecords:function(){var a=this.getResultSet();return this._records||(a?a.getRecords():[])},setStarted:function(){this.started=true;this.running=true},setCompleted:function(){this.complete=true;this.running=false},setSuccessful:function(){this.success=true},setException:function(a){this.exception=true;this.success=false;this.running=false;this.error=a},hasException:function(){return this.exception===true},getError:function(){return this.error},isStarted:function(){return this.started===true},isRunning:function(){return this.running===true},isComplete:function(){return this.complete===true},wasSuccessful:function(){return this.isComplete()&&this.success===true},allowWrite:function(){return this.getAction()!="read"},process:function(d,b,c,a){if(b.getSuccess()!==false){this.setResponse(a);this.setResultSet(b);this.setCompleted();this.setSuccessful()}else{return false}return this["process"+Ext.String.capitalize(d)].call(this,b,c,a)},processRead:function(d){var b=d.getRecords(),g=[],f=this.getModel(),e=b.length,c,a;for(c=0;c<e;c++){a=b[c];g.push(new f(a.data,a.id,a.node))}this.setRecords(g);return true},processCreate:function(d){var b=d.getRecords(),e=b.length,c,a,f;for(c=0;c<e;c++){f=b[c];a=this.findCurrentRecord(f.clientId);if(a){this.updateRecord(a,f)}}return true},processUpdate:function(e){var c=e.getRecords(),b=this.getRecords(),f=c.length,d,a,g;for(d=0;d<f;d++){g=c[d];a=b[d];if(a){this.updateRecord(a,g)}}return true},processDestroy:function(d){var b=d.getRecords(),e=b.length,c,a,f;for(c=0;c<e;c++){f=b[c];a=this.findCurrentRecord(f.id);if(a){a.setIsErased(true);a.notifyStores("afterErase",a)}}},findCurrentRecord:function(a){var c=this.getRecords(),e=c.length,d,b;for(d=0;d<e;d++){b=c[d];if(b.getId()===a){return b}}},updateRecord:function(b,d){var a=d.data,c=d.id;b.beginEdit();b.set(a);if(c!==null){b.setId(c)}b.endEdit(true);b.commit()}});Ext.define("Ext.data.Request",{config:{action:null,params:null,method:"GET",url:null,operation:null,proxy:null,disableCaching:false,headers:{},callbackKey:null,jsonP:null,jsonData:null,xmlData:null,withCredentials:null,callback:null,scope:null,timeout:30000,records:null,directFn:null,args:null},constructor:function(a){this.initConfig(a)}});Ext.define("Ext.data.ResultSet",{config:{loaded:true,count:null,total:null,success:false,records:null},constructor:function(a){this.initConfig(a)},applyCount:function(a){if(!a&&a!==0){return this.getRecords().length}return a},updateRecords:function(a){this.setCount(a.length)}});Ext.define("Ext.data.SortTypes",{singleton:true,stripTagsRE:/<\/?[^>]+>/gi,none:function(a){return a},asText:function(a){return String(a).replace(this.stripTagsRE,"")},asUCText:function(a){return String(a).toUpperCase().replace(this.stripTagsRE,"")},asUCString:function(a){return String(a).toUpperCase()},asDate:function(a){if(!a){return 0}if(Ext.isDate(a)){return a.getTime()}return Date.parse(String(a))},asFloat:function(a){a=parseFloat(String(a).replace(/,/g,""));return isNaN(a)?0:a},asInt:function(a){a=parseInt(String(a).replace(/,/g,""),10);return isNaN(a)?0:a}});Ext.define("Ext.data.Types",{singleton:true,requires:["Ext.data.SortTypes"],stripRe:/[\$,%]/g,dashesRe:/-/g,iso8601TestRe:/\d\dT\d\d/,iso8601SplitRe:/[- :T\.Z\+]/},function(){var b=this,a=Ext.data.SortTypes;Ext.apply(b,{AUTO:{convert:function(c){return c},sortType:a.none,type:"auto"},STRING:{convert:function(c){return(c===undefined||c===null)?(this.getAllowNull()?null:""):String(c)},sortType:a.asUCString,type:"string"},INT:{convert:function(c){return(c!==undefined&&c!==null&&c!=="")?((typeof c==="number")?parseInt(c,10):parseInt(String(c).replace(b.stripRe,""),10)):(this.getAllowNull()?null:0)},sortType:a.none,type:"int"},FLOAT:{convert:function(c){return(c!==undefined&&c!==null&&c!=="")?((typeof c==="number")?c:parseFloat(String(c).replace(b.stripRe,""),10)):(this.getAllowNull()?null:0)},sortType:a.none,type:"float"},BOOL:{convert:function(c){if((c===undefined||c===null||c==="")&&this.getAllowNull()){return null}return c===true||c==="true"||c==1},sortType:a.none,type:"bool"},DATE:{convert:function(e){var c=this.getDateFormat(),d;if(!e){return null}if(Ext.isDate(e)){return e}if(c){if(c=="timestamp"){return new Date(e*1000)}if(c=="time"){return new Date(parseInt(e,10))}return Ext.Date.parse(e,c)}d=new Date(Date.parse(e));if(isNaN(d)){if(b.iso8601TestRe.test(e)){d=e.split(b.iso8601SplitRe);d=new Date(d[0],d[1]-1,d[2],d[3],d[4],d[5])}if(isNaN(d)){d=new Date(Date.parse(e.replace(this.dashesRe,"/")))}}return isNaN(d)?null:d},sortType:a.asDate,type:"date"}});Ext.apply(b,{BOOLEAN:this.BOOL,INTEGER:this.INT,NUMBER:this.FLOAT})});Ext.define("Ext.data.Validations",{alternateClassName:"Ext.data.validations",singleton:true,config:{presenceMessage:"must be present",lengthMessage:"is the wrong length",formatMessage:"is the wrong format",inclusionMessage:"is not included in the list of acceptable values",exclusionMessage:"is not an acceptable value",emailMessage:"is not a valid email address"},constructor:function(a){this.initConfig(a)},getMessage:function(a){var b=this["get"+a[0].toUpperCase()+a.slice(1)+"Message"];if(b){return b.call(this)}return""},emailRe:/^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$/,presence:function(a,b){if(b===undefined){b=a}return !!b||b===0},length:function(b,e){if(e===undefined||e===null){return false}var d=e.length,c=b.min,a=b.max;if((c&&d<c)||(a&&d>a)){return false}else{return true}},email:function(b,a){return Ext.data.validations.emailRe.test(a)},format:function(a,b){return !!(a.matcher&&a.matcher.test(b))},inclusion:function(a,b){return a.list&&Ext.Array.indexOf(a.list,b)!=-1},exclusion:function(a,b){return a.list&&Ext.Array.indexOf(a.list,b)==-1}});Ext.define("Ext.data.identifier.Simple",{alias:"data.identifier.simple",statics:{AUTO_ID:1},config:{prefix:"ext-record-"},constructor:function(a){this.initConfig(a)},generate:function(a){return this._prefix+this.self.AUTO_ID++}});Ext.define("Ext.data.identifier.Uuid",{extend:"Ext.data.identifier.Simple",alias:"data.identifier.uuid",config:{id:undefined,salt:null,timestamp:null,version:4},applyId:function(a){if(a===undefined){return Ext.data.identifier.Uuid.Global}return a},constructor:function(){var a=this;a.callParent(arguments);a.parts=[];a.init()},reconfigure:function(a){this.setConfig(a);this.init()},generate:function(){var c=this,e=c.parts,a=c.getVersion(),b=c.getSalt(),d=c.getTimestamp();e[0]=c.toHex(d.lo,8);e[1]=c.toHex(d.hi&65535,4);e[2]=c.toHex(((d.hi>>>16)&4095)|(a<<12),4);e[3]=c.toHex(128|((c.clockSeq>>>8)&63),2)+c.toHex(c.clockSeq&255,2);e[4]=c.toHex(b.hi,4)+c.toHex(b.lo,8);if(a==4){c.init()}else{++d.lo;if(d.lo>=c.twoPow32){d.lo=0;++d.hi}}return e.join("-").toLowerCase()},init:function(){var b=this,a=b.getSalt(),c=b.getTimestamp();if(b.getVersion()==4){b.clockSeq=b.rand(0,b.twoPow14-1);if(!a){a={};b.setSalt(a)}if(!c){c={};b.setTimestamp(c)}a.lo=b.rand(0,b.twoPow32-1);a.hi=b.rand(0,b.twoPow16-1);c.lo=b.rand(0,b.twoPow32-1);c.hi=b.rand(0,b.twoPow28-1)}else{b.setSalt(b.split(b.getSalt()));b.setTimestamp(b.split(b.getTimestamp()));b.getSalt().hi|=256}},twoPow14:Math.pow(2,14),twoPow16:Math.pow(2,16),twoPow28:Math.pow(2,28),twoPow32:Math.pow(2,32),toHex:function(c,b){var a=c.toString(16);if(a.length>b){a=a.substring(a.length-b)}else{if(a.length<b){a=Ext.String.leftPad(a,b,"0")}}return a},rand:function(c,b){var a=Math.random()*(b-c+1);return Math.floor(a)+c},split:function(b){if(typeof(b)=="number"){var a=Math.floor(b/this.twoPow32);return{lo:Math.floor(b-a*this.twoPow32),hi:a}}return b}},function(){this.Global=new this({id:"uuid"})});Ext.define("Ext.data.writer.Writer",{alias:"writer.base",alternateClassName:["Ext.data.DataWriter","Ext.data.Writer"],config:{writeAllFields:true,nameProperty:"name"},constructor:function(a){this.initConfig(a)},write:function(e){var c=e.getOperation(),b=c.getRecords()||[],a=b.length,d=0,f=[];for(;d<a;d++){f.push(this.getRecordData(b[d]))}return this.writeRecords(e,f)},writeDate:function(c,b){var a=c.dateFormat||"timestamp";switch(a){case"timestamp":return b.getTime()/1000;case"time":return b.getTime();default:return Ext.Date.format(b,a)}},getRecordData:function(f){var k=f.phantom===true,c=this.getWriteAllFields()||k,d=this.getNameProperty(),g=f.getFields(),e={},i,a,h,l,j,b;if(c){g.each(function(m){b=m.config;if(b.persist){a=b[d]||b.name;j=f.get(b.name);if(b.type.type=="date"){j=this.writeDate(b,j)}e[a]=j}},this)}else{i=f.getChanges();for(l in i){if(i.hasOwnProperty(l)){h=g.get(l);b=h.config;if(b.persist){a=b[d]||h.name;j=i[l];if(b.type.type=="date"){j=this.writeDate(b,j)}e[a]=j}}}if(!k){e[f.idProperty]=f.getId()}}return e}});Ext.define("Ext.data.writer.Xml",{extend:"Ext.data.writer.Writer",alternateClassName:"Ext.data.XmlWriter",alias:"writer.xml",config:{documentRoot:"xmlData",defaultDocumentRoot:"xmlData",header:"",record:"record"},writeRecords:function(a,b){var g=this,d=[],c=0,f=b.length,h=g.getDocumentRoot(),e=g.getRecord(),l=b.length!==1,k,j;d.push(g.getHeader()||"");if(!h&&l){h=g.getDefaultDocumentRoot()}if(h){d.push("<",h,">")}for(;c<f;++c){k=b[c];d.push("<",e,">");for(j in k){if(k.hasOwnProperty(j)){d.push("<",j,">",k[j],"</",j,">")}}d.push("</",e,">")}if(h){d.push("</",h,">")}a.setXmlData(d.join(""));return a}});Ext.define("Ext.direct.RemotingMethod",{config:{name:null,params:null,formHandler:null,len:null,ordered:true},constructor:function(a){this.initConfig(a)},applyParams:function(f){if(Ext.isNumber(f)){this.setLen(f)}else{if(Ext.isArray(f)){this.setOrdered(false);var d=f.length,b=[],c,e,a;for(c=0;c<d;c++){e=f[c];a=Ext.isObject(e)?e.name:e;b.push(a)}return b}}},getArgs:function(e,a,f){var b=[],c,d;if(this.getOrdered()){if(this.getLen()>0){if(a){for(c=0,d=a.length;c<d;c++){b.push(e[a[c]])}}else{if(f){b.push(e)}}}}else{b.push(e)}return b},getCallData:function(c){var e=this,f=null,a=e.getLen(),g=e.getParams(),h,d,b;if(e.getOrdered()){h=c[a];d=c[a+1];if(a!==0){f=c.slice(0,a)}}else{f=Ext.apply({},c[0]);h=c[1];d=c[2];for(b in f){if(f.hasOwnProperty(b)){if(!Ext.Array.contains(g,b)){delete f[b]}}}}return{data:f,callback:h,scope:d}}});Ext.define("Ext.direct.Transaction",{alias:"direct.transaction",alternateClassName:"Ext.Direct.Transaction",statics:{TRANSACTION_ID:0},config:{id:undefined,provider:null,retryCount:0,args:null,action:null,method:null,data:null,callback:null,form:null},constructor:function(a){this.initConfig(a)},applyId:function(a){if(a===undefined){a=++this.self.TRANSACTION_ID}return a},updateId:function(a){this.id=this.tid=a},getTid:function(){return this.tid},send:function(){this.getProvider().queueTransaction(this)},retry:function(){this.setRetryCount(this.getRetryCount()+1);this.send()}});Ext.define("Ext.dom.CompositeElement",{alternateClassName:"Ext.CompositeElement",extend:"Ext.dom.CompositeElementLite",getElement:function(a){return a},transformElement:function(a){return Ext.get(a)}},function(){Ext.dom.Element.select=function(a,d,b){var c;if(typeof a=="string"){c=Ext.dom.Element.selectorFunction(a,b)}else{if(a.length!==undefined){c=a}else{}}return(d===true)?new Ext.CompositeElement(c):new Ext.CompositeElementLite(c)}});Ext.define("Ext.event.Controller",{isFiring:false,listenerStack:null,constructor:function(a){this.firingListeners=[];this.firingArguments=[];this.setInfo(a);return this},setInfo:function(a){this.info=a},getInfo:function(){return this.info},setListenerStacks:function(a){this.listenerStacks=a},fire:function(h,e){var n=this.listenerStacks,m=this.firingListeners,d=this.firingArguments,k=m.push,g=n.length,j,l,c,o,a=false,b=false,f;m.length=0;if(e){if(e.order!=="after"){a=true}else{b=true}}if(g===1){j=n[0].listeners;l=j.before;c=j.current;o=j.after;if(l.length>0){k.apply(m,l)}if(a){k.call(m,e)}if(c.length>0){k.apply(m,c)}if(b){k.call(m,e)}if(o.length>0){k.apply(m,o)}}else{for(f=0;f<g;f++){l=n[f].listeners.before;if(l.length>0){k.apply(m,l)}}if(a){k.call(m,e)}for(f=0;f<g;f++){c=n[f].listeners.current;if(c.length>0){k.apply(m,c)}}if(b){k.call(m,e)}for(f=0;f<g;f++){o=n[f].listeners.after;if(o.length>0){k.apply(m,o)}}}if(m.length===0){return this}if(!h){h=[]}d.length=0;d.push.apply(d,h);d.push(null,this);this.doFire();return this},doFire:function(){var k=this.firingListeners,c=this.firingArguments,g=c.length-2,d,f,b,o,h,n,a,j,l,e,m;this.isPausing=false;this.isPaused=false;this.isStopped=false;this.isFiring=true;for(d=0,f=k.length;d<f;d++){b=k[d];o=b.options;h=b.fn;n=b.firingFn;a=b.boundFn;j=b.isLateBinding;l=b.scope;if(j&&a&&a!==l[h]){a=false;n=false}if(!a){if(j){a=l[h];if(!a){continue}}else{a=h}b.boundFn=a}if(!n){n=a;if(o.buffer){n=Ext.Function.createBuffered(n,o.buffer,l)}if(o.delay){n=Ext.Function.createDelayed(n,o.delay,l)}b.firingFn=n}c[g]=o;e=c;if(o.args){e=o.args.concat(e)}if(o.single===true){b.stack.remove(h,l,b.order)}m=n.apply(l,e);if(m===false){this.stop()}if(this.isStopped){break}if(this.isPausing){this.isPaused=true;k.splice(0,d+1);return}}this.isFiring=false;this.listenerStacks=null;k.length=0;c.length=0;this.connectingController=null},connect:function(a){this.connectingController=a},resume:function(){var a=this.connectingController;this.isPausing=false;if(this.isPaused&&this.firingListeners.length>0){this.isPaused=false;this.doFire()}if(a){a.resume()}return this},isInterrupted:function(){return this.isStopped||this.isPaused},stop:function(){var a=this.connectingController;this.isStopped=true;if(a){this.connectingController=null;a.stop()}this.isFiring=false;this.listenerStacks=null;return this},pause:function(){var a=this.connectingController;this.isPausing=true;if(a){a.pause()}return this}});Ext.define("Ext.event.Event",{alternateClassName:"Ext.EventObject",isStopped:false,set:function(a,b){if(arguments.length===1&&typeof a!="string"){var c=a;for(a in c){if(c.hasOwnProperty(a)){this[a]=c[a]}}}else{this[a]=c[a]}},stopEvent:function(){return this.stopPropagation()},stopPropagation:function(){this.isStopped=true;return this}});Ext.define("Ext.event.ListenerStack",{currentOrder:"current",length:0,constructor:function(){this.listeners={before:[],current:[],after:[]};this.lateBindingMap={};return this},add:function(h,j,k,e){var a=this.lateBindingMap,g=this.getAll(e),f=g.length,b,d,c;if(typeof h=="string"&&j.isIdentifiable){c=j.getId();b=a[c];if(b){if(b[h]){return false}else{b[h]=true}}else{a[c]=b={};b[h]=true}}else{if(f>0){while(f--){d=g[f];if(d.fn===h&&d.scope===j){d.options=k;return false}}}}d=this.create(h,j,k,e);if(k&&k.prepend){delete k.prepend;g.unshift(d)}else{g.push(d)}this.length++;return true},getAt:function(b,a){return this.getAll(a)[b]},getAll:function(a){if(!a){a=this.currentOrder}return this.listeners[a]},count:function(a){return this.getAll(a).length},create:function(d,c,b,a){return{stack:this,fn:d,firingFn:false,boundFn:false,isLateBinding:typeof d=="string",scope:c,options:b||{},order:a}},remove:function(h,j,e){var g=this.getAll(e),f=g.length,b=false,a=this.lateBindingMap,d,c;if(f>0){while(f--){d=g[f];if(d.fn===h&&d.scope===j){g.splice(f,1);b=true;this.length--;if(typeof h=="string"&&j.isIdentifiable){c=j.getId();if(a[c]&&a[c][h]){delete a[c][h]}}break}}}return b}});Ext.define("Ext.event.publisher.Publisher",{targetType:"",idSelectorRegex:/^#([\w\-]+)$/i,constructor:function(){var b=this.handledEvents,a,c,e,d;a=this.handledEventsMap={};for(c=0,e=b.length;c<e;c++){d=b[c];a[d]=true}this.subscribers={};return this},handles:function(a){var b=this.handledEventsMap;return !!b[a]||!!b["*"]||a==="*"},getHandledEvents:function(){return this.handledEvents},setDispatcher:function(a){this.dispatcher=a},subscribe:function(){return false},unsubscribe:function(){return false},unsubscribeAll:function(){delete this.subscribers;this.subscribers={};return this},notify:function(){return false},getTargetType:function(){return this.targetType},dispatch:function(c,a,b){this.dispatcher.doDispatchEvent(this.targetType,c,a,b)}});Ext.define("Ext.event.recognizer.Recognizer",{mixins:["Ext.mixin.Identifiable"],handledEvents:[],config:{onRecognized:Ext.emptyFn,onFailed:Ext.emptyFn,callbackScope:null},constructor:function(a){this.initConfig(a);return this},getHandledEvents:function(){return this.handledEvents},onStart:Ext.emptyFn,onEnd:Ext.emptyFn,fail:function(){this.getOnFailed().apply(this.getCallbackScope(),arguments);return false},fire:function(){this.getOnRecognized().apply(this.getCallbackScope(),arguments)}});Ext.define("Ext.event.recognizer.Touch",{extend:"Ext.event.recognizer.Recognizer",onTouchStart:Ext.emptyFn,onTouchMove:Ext.emptyFn,onTouchEnd:Ext.emptyFn});Ext.define("Ext.fx.State",{isAnimatable:{"background-color":true,"background-image":true,"background-position":true,"border-bottom-color":true,"border-bottom-width":true,"border-color":true,"border-left-color":true,"border-left-width":true,"border-right-color":true,"border-right-width":true,"border-spacing":true,"border-top-color":true,"border-top-width":true,"border-width":true,bottom:true,color:true,crop:true,"font-size":true,"font-weight":true,height:true,left:true,"letter-spacing":true,"line-height":true,"margin-bottom":true,"margin-left":true,"margin-right":true,"margin-top":true,"max-height":true,"max-width":true,"min-height":true,"min-width":true,opacity:true,"outline-color":true,"outline-offset":true,"outline-width":true,"padding-bottom":true,"padding-left":true,"padding-right":true,"padding-top":true,right:true,"text-indent":true,"text-shadow":true,top:true,"vertical-align":true,visibility:true,width:true,"word-spacing":true,"z-index":true,zoom:true,transform:true},constructor:function(a){this.data={};this.set(a)},setConfig:function(a){this.set(a);return this},setRaw:function(a){this.data=a;return this},clear:function(){return this.setRaw({})},setTransform:function(c,g){var f=this.data,a=Ext.isArray(g),b=f.transform,e,d;if(!b){b=f.transform={translateX:0,translateY:0,translateZ:0,scaleX:1,scaleY:1,scaleZ:1,rotate:0,rotateX:0,rotateY:0,rotateZ:0,skewX:0,skewY:0}}if(typeof c=="string"){switch(c){case"translate":if(a){e=g.length;if(e==0){break}b.translateX=g[0];if(e==1){break}b.translateY=g[1];if(e==2){break}b.translateZ=g[2]}else{b.translateX=g}break;case"rotate":if(a){e=g.length;if(e==0){break}b.rotateX=g[0];if(e==1){break}b.rotateY=g[1];if(e==2){break}b.rotateZ=g[2]}else{b.rotate=g}break;case"scale":if(a){e=g.length;if(e==0){break}b.scaleX=g[0];if(e==1){break}b.scaleY=g[1];if(e==2){break}b.scaleZ=g[2]}else{b.scaleX=g;b.scaleY=g}break;case"skew":if(a){e=g.length;if(e==0){break}b.skewX=g[0];if(e==1){break}b.skewY=g[1]}else{b.skewX=g}break;default:b[c]=g}}else{for(d in c){if(c.hasOwnProperty(d)){g=c[d];this.setTransform(d,g)}}}},set:function(a,d){var c=this.data,b;if(typeof a!="string"){for(b in a){d=a[b];if(b==="transform"){this.setTransform(d)}else{c[b]=d}}}else{if(a==="transform"){this.setTransform(d)}else{c[a]=d}}return this},unset:function(a){var b=this.data;if(b.hasOwnProperty(a)){delete b[a]}return this},getData:function(){return this.data}});Ext.define("Ext.fx.easing.Abstract",{config:{startTime:0,startValue:0},isEasing:true,isEnded:false,constructor:function(a){this.initConfig(a);return this},applyStartTime:function(a){if(!a){a=Ext.Date.now()}return a},updateStartTime:function(a){this.reset()},reset:function(){this.isEnded=false},getValue:Ext.emptyFn});Ext.define("Ext.fx.easing.Bounce",{extend:"Ext.fx.easing.Abstract",config:{springTension:0.3,acceleration:30,startVelocity:0},getValue:function(){var b=Ext.Date.now()-this.getStartTime(),c=(b/this.getAcceleration()),a=c*Math.pow(Math.E,-this.getSpringTension()*c);return this.getStartValue()+(this.getStartVelocity()*a)}});Ext.define("Ext.fx.easing.Linear",{extend:"Ext.fx.easing.Abstract",alias:"easing.linear",config:{duration:0,endValue:0},updateStartValue:function(a){this.distance=this.getEndValue()-a},updateEndValue:function(a){this.distance=a-this.getStartValue()},getValue:function(){var a=Ext.Date.now()-this.getStartTime(),b=this.getDuration();if(a>b){this.isEnded=true;return this.getEndValue()}else{return this.getStartValue()+((a/b)*this.distance)}}});Ext.define("Ext.fx.easing.Momentum",{extend:"Ext.fx.easing.Abstract",config:{acceleration:30,friction:0,startVelocity:0},alpha:0,updateFriction:function(b){var a=Math.log(1-(b/10));this.theta=a;this.alpha=a/this.getAcceleration()},updateStartVelocity:function(a){this.velocity=a*this.getAcceleration()},updateAcceleration:function(a){this.velocity=this.getStartVelocity()*a;this.alpha=this.theta/a},getValue:function(){return this.getStartValue()-this.velocity*(1-this.getFrictionFactor())/this.theta},getFrictionFactor:function(){var a=Ext.Date.now()-this.getStartTime();return Math.exp(a*this.alpha)},getVelocity:function(){return this.getFrictionFactor()*this.velocity}});Ext.define("Ext.mixin.Mixin",{onClassExtended:function(b,e){var a=e.mixinConfig,d,f,c;if(a){d=b.superclass.mixinConfig;if(d){a=e.mixinConfig=Ext.merge({},d,a)}e.mixinId=a.id;f=a.beforeHooks;c=a.hooks||a.afterHooks;if(f||c){Ext.Function.interceptBefore(e,"onClassMixedIn",function(h){var g=this.prototype;if(f){Ext.Object.each(f,function(j,i){h.override(i,function(){if(g[j].apply(this,arguments)!==false){return this.callOverridden(arguments)}})})}if(c){Ext.Object.each(c,function(j,i){h.override(i,function(){var k=this.callOverridden(arguments);g[j].apply(this,arguments);return k})})}})}}}});Ext.define("Ext.mixin.Selectable",{extend:"Ext.mixin.Mixin",mixinConfig:{id:"selectable",hooks:{updateStore:"updateStore"}},config:{disableSelection:null,mode:"SINGLE",allowDeselect:false,lastSelected:null,lastFocused:null,deselectOnContainerClick:true},modes:{SINGLE:true,SIMPLE:true,MULTI:true},selectableEventHooks:{addrecords:"onSelectionStoreAdd",removerecords:"onSelectionStoreRemove",updaterecord:"onSelectionStoreUpdate",load:"refreshSelection",refresh:"refreshSelection"},constructor:function(){this.selected=new Ext.util.MixedCollection();this.callParent(arguments)},applyMode:function(a){a=a?a.toUpperCase():"SINGLE";return this.modes[a]?a:"SINGLE"},updateStore:function(a,c){var b=this,d=Ext.apply({},b.selectableEventHooks,{scope:b});if(c&&Ext.isObject(c)&&c.isStore){if(c.autoDestroy){c.destroy()}else{c.un(d)}}if(a){a.on(d);b.refreshSelection()}},selectAll:function(a){var e=this,c=e.getStore().getRange(),d=c.length,b=0;for(;b<d;b++){e.select(c[b],true,a)}},deselectAll:function(e){var d=this,b=d.getStore().getRange(),c=b.length,a=0;for(;a<c;a++){d.deselect(b,e)}d.selected.clear();d.setLastSelected(null);d.setLastFocused(null)},selectWithEvent:function(a){var c=this,b=c.isSelected(a);switch(c.getMode()){case"MULTI":case"SIMPLE":if(b){c.deselect(a)}else{c.select(a,true)}break;case"SINGLE":if(c.getAllowDeselect()&&b){c.deselect(a)}else{c.select(a,false)}break}},selectRange:function(h,j,m,b){var g=this,k=g.getStore(),l=k.indexOf(h),d=k.indexOf(j),c=0,f,a,e;if(g.getDisableSelection()){return}if(l>d){f=d;d=l;l=f}for(e=l;e<=d;e++){if(g.isSelected(k.getAt(e))){c++}}if(!b){a=-1}else{a=(b=="up")?l:d}for(e=l;e<=d;e++){if(c==(d-l+1)){if(e!=a){g.deselect(e,true)}}else{g.select(e,true)}}},select:function(c,e,b){var d=this,a;if(d.getDisableSelection()){return}if(typeof c==="number"){c=[d.getStore().getAt(c)]}if(!c){return}if(d.getMode()=="SINGLE"&&c){a=c.length?c[0]:c;d.doSingleSelect(a,b)}else{d.doMultiSelect(c,e,b)}},doSingleSelect:function(a,b){var d=this,c=d.selected;if(d.getDisableSelection()){return}if(d.isSelected(a)){return}if(c.getCount()>0){d.deselect(d.getLastSelected(),b)}c.add(a);d.setLastSelected(a);d.onItemSelect(a,b);d.setLastFocused(a);d.fireSelectionChange(!b)},doMultiSelect:function(a,j,h){if(a===null||this.getDisableSelection()){return}a=!Ext.isArray(a)?[a]:a;var f=this,b=f.selected,e=a.length,g=false,c=0,d;if(!j&&b.getCount()>0){g=true;f.deselect(f.getSelection(),true)}for(;c<e;c++){d=a[c];if(j&&f.isSelected(d)){continue}g=true;f.setLastSelected(d);b.add(d);if(!h){f.setLastFocused(d)}f.onItemSelect(d,h)}this.fireSelectionChange(g&&!h)},deselect:function(a,j){var f=this;if(f.getDisableSelection()){return}a=Ext.isArray(a)?a:[a];var b=f.selected,g=false,c=0,h=f.getStore(),e=a.length,d;for(;c<e;c++){d=a[c];if(typeof d==="number"){d=h.getAt(d)}if(b.remove(d)){if(f.getLastSelected()==d){f.setLastSelected(b.last())}g=true}if(d){f.onItemDeselect(d,j)}}f.fireSelectionChange(g&&!j)},updateLastFocused:function(b,a){this.onLastFocusChanged(a,b)},fireSelectionChange:function(a){var b=this;if(a){b.fireEvent("selectionchange",b,b.getSelection())}},getSelection:function(){return this.selected.getRange()},isSelected:function(a){a=Ext.isNumber(a)?this.getStore().getAt(a):a;return this.selected.indexOf(a)!==-1},hasSelection:function(){return this.selected.getCount()>0},refreshSelection:function(){var b=this,a=b.getSelection();b.deselectAll(true);if(a.length){b.select(a,false,true)}},onSelectionStoreClear:function(){var b=this,a=b.selected;if(a.getCount()>0){a.clear();b.setLastSelected(null);b.setLastFocused(null);b.fireSelectionChange(true)}},onSelectionStoreRemove:function(b,a){var d=this,c=d.selected;if(d.getDisableSelection()){return}if(c.remove(a)){if(d.getLastSelected()==a){d.setLastSelected(null)}if(d.getLastFocused()==a){d.setLastFocused(null)}d.fireSelectionChange(true)}},getSelectionCount:function(){return this.selected.getCount()},onSelectionStoreAdd:Ext.emptyFn,onSelectionStoreUpdate:Ext.emptyFn,onItemSelect:Ext.emptyFn,onItemDeselect:Ext.emptyFn,onLastFocusChanged:Ext.emptyFn,onEditorKey:Ext.emptyFn},function(){});Ext.define("Ext.mixin.Traversable",{extend:"Ext.mixin.Mixin",mixinConfig:{id:"traversable"},setParent:function(a){this.parent=a;return this},hasParent:function(){return Boolean(this.parent)},getParent:function(){return this.parent},getAncestors:function(){var b=[],a=this.getParent();while(a){b.push(a);a=a.getParent()}return b},getAncestorIds:function(){var b=[],a=this.getParent();while(a){b.push(a.getId());a=a.getParent()}return b}});Ext.define("Ext.util.DelayedTask",{config:{interval:null,delay:null,fn:null,scope:null,args:null},constructor:function(d,c,b){var a={fn:d,scope:c,args:b};this.initConfig(a)},delay:function(b,f,e,a){var d=this;d.cancel();d.setConfig({delay:b,fn:f,scope:e,args:a});var c=function(){d.getFn().apply(d.getScope(),d.getArgs()||[]);d.cancel()};d.setInterval(setInterval(c,d.getDelay()))},cancel:function(){this.setInterval(null)},updateInterval:function(a,b){if(b){clearInterval(b)}},applyArgs:function(a){if(!Ext.isArray(a)){a=[a]}return a}});Ext.define("Ext.util.Filter",{isFilter:true,config:{property:null,value:null,filterFn:Ext.emptyFn,anyMatch:false,exactMatch:false,caseSensitive:false,root:null,id:undefined,scope:null},applyId:function(a){if(!a){if(this.getProperty()){a=this.getProperty()+"-"+String(this.getValue())}if(!a){a=Ext.id(null,"ext-filter-")}}return a},constructor:function(a){this.initConfig(a)},applyFilterFn:function(b){if(b===Ext.emptyFn){b=this.getInitialConfig("filter");if(b){return b}var a=this.getValue();if(!this.getProperty()&&!a&&a!==0){return Ext.emptyFn}else{return this.createFilterFn()}}return b},createFilterFn:function(){var a=this,b=a.createValueMatcher();return function(d){var c=a.getRoot(),e=a.getProperty();if(c){d=d[c]}return b.test(d[e])}},createValueMatcher:function(){var d=this,e=d.getValue(),f=d.getAnyMatch(),c=d.getExactMatch(),a=d.getCaseSensitive(),b=Ext.String.escapeRegex;if(e===null||e===undefined||!e.exec){e=String(e);if(f===true){e=b(e)}else{e="^"+b(e);if(c===true){e+="$"}}e=new RegExp(e,a?"":"i")}return e}});Ext.define("Ext.util.Point",{radianToDegreeConstant:180/Math.PI,statics:{fromEvent:function(b){var a=b.changedTouches,c=(a&&a.length>0)?a[0]:b;return this.fromTouch(c)},fromTouch:function(a){return new this(a.pageX,a.pageY)},from:function(a){if(!a){return new this(0,0)}if(!(a instanceof this)){return new this(a.x,a.y)}return a}},constructor:function(a,b){if(typeof a=="undefined"){a=0}if(typeof b=="undefined"){b=0}this.x=a;this.y=b;return this},clone:function(){return new this.self(this.x,this.y)},copy:function(){return this.clone.apply(this,arguments)},copyFrom:function(a){this.x=a.x;this.y=a.y;return this},toString:function(){return"Point["+this.x+","+this.y+"]"},equals:function(a){return(this.x===a.x&&this.y===a.y)},isCloseTo:function(c,b){if(typeof b=="number"){b={x:b};b.y=b.x}var a=c.x,f=c.y,e=b.x,d=b.y;return(this.x<=a+e&&this.x>=a-e&&this.y<=f+d&&this.y>=f-d)},isWithin:function(){return this.isCloseTo.apply(this,arguments)},translate:function(a,b){this.x+=a;this.y+=b;return this},roundedEquals:function(a){return(Math.round(this.x)===Math.round(a.x)&&Math.round(this.y)===Math.round(a.y))},getDistanceTo:function(b){var c=this.x-b.x,a=this.y-b.y;return Math.sqrt(c*c+a*a)},getAngleTo:function(b){var c=this.x-b.x,a=this.y-b.y;return Math.atan2(a,c)*this.radianToDegreeConstant}});Ext.define("Ext.util.Region",{statics:{getRegion:function(a){return Ext.fly(a).getPageBox(true)},from:function(a){return new this(a.top,a.right,a.bottom,a.left)}},constructor:function(d,f,a,c){var e=this;e.top=d;e[1]=d;e.right=f;e.bottom=a;e.left=c;e[0]=c},contains:function(b){var a=this;return(b.left>=a.left&&b.right<=a.right&&b.top>=a.top&&b.bottom<=a.bottom)},intersect:function(g){var f=this,d=Math.max(f.top,g.top),e=Math.min(f.right,g.right),a=Math.min(f.bottom,g.bottom),c=Math.max(f.left,g.left);if(a>d&&e>c){return new Ext.util.Region(d,e,a,c)}else{return false}},union:function(g){var f=this,d=Math.min(f.top,g.top),e=Math.max(f.right,g.right),a=Math.max(f.bottom,g.bottom),c=Math.min(f.left,g.left);return new Ext.util.Region(d,e,a,c)},constrainTo:function(b){var a=this,c=Ext.util.Numbers.constrain;a.top=c(a.top,b.top,b.bottom);a.bottom=c(a.bottom,b.top,b.bottom);a.left=c(a.left,b.left,b.right);a.right=c(a.right,b.left,b.right);return a},adjust:function(d,f,a,c){var e=this;e.top+=d;e.left+=c;e.right+=f;e.bottom+=a;return e},getOutOfBoundOffset:function(a,b){if(!Ext.isObject(a)){if(a=="x"){return this.getOutOfBoundOffsetX(b)}else{return this.getOutOfBoundOffsetY(b)}}else{b=a;var c=new Ext.util.Offset();c.x=this.getOutOfBoundOffsetX(b.x);c.y=this.getOutOfBoundOffsetY(b.y);return c}},getOutOfBoundOffsetX:function(a){if(a<=this.left){return this.left-a}else{if(a>=this.right){return this.right-a}}return 0},getOutOfBoundOffsetY:function(a){if(a<=this.top){return this.top-a}else{if(a>=this.bottom){return this.bottom-a}}return 0},isOutOfBound:function(a,b){if(!Ext.isObject(a)){if(a=="x"){return this.isOutOfBoundX(b)}else{return this.isOutOfBoundY(b)}}else{b=a;return(this.isOutOfBoundX(b.x)||this.isOutOfBoundY(b.y))}},isOutOfBoundX:function(a){return(a<this.left||a>this.right)},isOutOfBoundY:function(a){return(a<this.top||a>this.bottom)},restrict:function(b,d,a){if(Ext.isObject(b)){var c;a=d;d=b;if(d.copy){c=d.copy()}else{c={x:d.x,y:d.y}}c.x=this.restrictX(d.x,a);c.y=this.restrictY(d.y,a);return c}else{if(b=="x"){return this.restrictX(d,a)}else{return this.restrictY(d,a)}}},restrictX:function(b,a){if(!a){a=1}if(b<=this.left){b-=(b-this.left)*a}else{if(b>=this.right){b-=(b-this.right)*a}}return b},restrictY:function(b,a){if(!a){a=1}if(b<=this.top){b-=(b-this.top)*a}else{if(b>=this.bottom){b-=(b-this.bottom)*a}}return b},getSize:function(){return{width:this.right-this.left,height:this.bottom-this.top}},copy:function(){return new Ext.util.Region(this.top,this.right,this.bottom,this.left)},toString:function(){return"Region["+this.top+","+this.right+","+this.bottom+","+this.left+"]"},translateBy:function(a){this.left+=a.x;this.right+=a.x;this.top+=a.y;this.bottom+=a.y;return this},round:function(){this.top=Math.round(this.top);this.right=Math.round(this.right);this.bottom=Math.round(this.bottom);this.left=Math.round(this.left);return this},equals:function(a){return(this.top==a.top&&this.right==a.right&&this.bottom==a.bottom&&this.left==a.left)}});Ext.define("Ext.util.Sorter",{isSorter:true,config:{property:null,sorterFn:null,root:null,transform:null,direction:"ASC",id:undefined},constructor:function(a){this.initConfig(a)},applyId:function(a){if(!a){a=this.getProperty();if(!a){a=Ext.id(null,"ext-sorter-")}}return a},createSortFunction:function(b){var c=this,a=c.getDirection().toUpperCase()=="DESC"?-1:1;return function(e,d){return a*b.call(c,e,d)}},defaultSortFn:function(e,c){var g=this,f=g._transform,b=g._root,d,a,h=g._property;if(b!==null){e=e[b];c=c[b]}d=e[h];a=c[h];if(f){d=f(d);a=f(a)}return d>a?1:(d<a?-1:0)},updateDirection:function(){this.updateSortFn()},updateSortFn:function(){this.sort=this.createSortFunction(this.getSorterFn()||this.defaultSortFn)},toggle:function(){this.setDirection(Ext.String.toggle(this.getDirection(),"ASC","DESC"))}});Ext.define("Ext.util.Inflector",{singleton:true,plurals:[[(/(quiz)$/i),"$1zes"],[(/^(ox)$/i),"$1en"],[(/([m|l])ouse$/i),"$1ice"],[(/(matr|vert|ind)ix|ex$/i),"$1ices"],[(/(x|ch|ss|sh)$/i),"$1es"],[(/([^aeiouy]|qu)y$/i),"$1ies"],[(/(hive)$/i),"$1s"],[(/(?:([^f])fe|([lr])f)$/i),"$1$2ves"],[(/sis$/i),"ses"],[(/([ti])um$/i),"$1a"],[(/(buffal|tomat|potat)o$/i),"$1oes"],[(/(bu)s$/i),"$1ses"],[(/(alias|status|sex)$/i),"$1es"],[(/(octop|vir)us$/i),"$1i"],[(/(ax|test)is$/i),"$1es"],[(/^person$/),"people"],[(/^man$/),"men"],[(/^(child)$/),"$1ren"],[(/s$/i),"s"],[(/$/),"s"]],singulars:[[(/(quiz)zes$/i),"$1"],[(/(matr)ices$/i),"$1ix"],[(/(vert|ind)ices$/i),"$1ex"],[(/^(ox)en/i),"$1"],[(/(alias|status)es$/i),"$1"],[(/(octop|vir)i$/i),"$1us"],[(/(cris|ax|test)es$/i),"$1is"],[(/(shoe)s$/i),"$1"],[(/(o)es$/i),"$1"],[(/(bus)es$/i),"$1"],[(/([m|l])ice$/i),"$1ouse"],[(/(x|ch|ss|sh)es$/i),"$1"],[(/(m)ovies$/i),"$1ovie"],[(/(s)eries$/i),"$1eries"],[(/([^aeiouy]|qu)ies$/i),"$1y"],[(/([lr])ves$/i),"$1f"],[(/(tive)s$/i),"$1"],[(/(hive)s$/i),"$1"],[(/([^f])ves$/i),"$1fe"],[(/(^analy)ses$/i),"$1sis"],[(/((a)naly|(b)a|(d)iagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses$/i),"$1$2sis"],[(/([ti])a$/i),"$1um"],[(/(n)ews$/i),"$1ews"],[(/people$/i),"person"],[(/s$/i),""]],uncountable:["sheep","fish","series","species","money","rice","information","equipment","grass","mud","offspring","deer","means"],singular:function(b,a){this.singulars.unshift([b,a])},plural:function(b,a){this.plurals.unshift([b,a])},clearSingulars:function(){this.singulars=[]},clearPlurals:function(){this.plurals=[]},isTransnumeral:function(a){return Ext.Array.indexOf(this.uncountable,a)!=-1},pluralize:function(f){if(this.isTransnumeral(f)){return f}var e=this.plurals,d=e.length,a,c,b;for(b=0;b<d;b++){a=e[b];c=a[0];if(c==f||(c.test&&c.test(f))){return f.replace(c,a[1])}}return f},singularize:function(f){if(this.isTransnumeral(f)){return f}var e=this.singulars,d=e.length,a,c,b;for(b=0;b<d;b++){a=e[b];c=a[0];if(c==f||(c.test&&c.test(f))){return f.replace(c,a[1])}}return f},classify:function(a){return Ext.String.capitalize(this.singularize(a))},ordinalize:function(d){var b=parseInt(d,10),c=b%10,a=b%100;if(11<=a&&a<=13){return d+"th"}else{switch(c){case 1:return d+"st";case 2:return d+"nd";case 3:return d+"rd";default:return d+"th"}}}},function(){var b={alumnus:"alumni",cactus:"cacti",focus:"foci",nucleus:"nuclei",radius:"radii",stimulus:"stimuli",ellipsis:"ellipses",paralysis:"paralyses",oasis:"oases",appendix:"appendices",index:"indexes",beau:"beaux",bureau:"bureaux",tableau:"tableaux",woman:"women",child:"children",man:"men",corpus:"corpora",criterion:"criteria",curriculum:"curricula",genus:"genera",memorandum:"memoranda",phenomenon:"phenomena",foot:"feet",goose:"geese",tooth:"teeth",antenna:"antennae",formula:"formulae",nebula:"nebulae",vertebra:"vertebrae",vita:"vitae"},a;for(a in b){this.plural(a,b[a]);this.singular(b[a],a)}});Ext.Anim=Ext.extend(Object,{isAnim:true,disableAnimations:false,defaultConfig:{from:{},to:{},duration:250,delay:0,easing:"ease-in-out",autoClear:true,out:true,direction:null,reverse:false},opposites:{left:"right",right:"left",up:"down",down:"up"},constructor:function(a){a=Ext.apply({},a||{},this.defaultConfig);this.config=a;Ext.Anim.superclass.constructor.call(this);this.running=[]},initConfig:function(c,b){var d=this,a=Ext.apply({},b||{},d.config);a.el=c=Ext.get(c);if(a.reverse&&d.opposites[a.direction]){a.direction=d.opposites[a.direction]}if(d.config.before){d.config.before.call(a,c,a)}if(b.before){b.before.call(a.scope||a,c,a)}return a},run:function(c,a){c=Ext.get(c);a=a||{};var d=this,b=c.dom.style,e,f=a.after;if(d.running[c.id]){d.onTransitionEnd(null,c,{config:a,after:f})}a=this.initConfig(c,a);if(this.disableAnimations){for(e in a.to){if(!a.to.hasOwnProperty(e)){continue}b[e]=a.to[e]}this.onTransitionEnd(null,c,{config:a,after:f});return d}c.un("transitionend",d.onTransitionEnd,d);b.webkitTransitionDuration="0ms";for(e in a.from){if(!a.from.hasOwnProperty(e)){continue}b[e]=a.from[e]}setTimeout(function(){if(!c.dom){return}if(a.is3d===true){c.parent().setStyle({"-webkit-perspective":"1200","-webkit-transform-style":"preserve-3d"})}b.webkitTransitionDuration=a.duration+"ms";b.webkitTransitionProperty="all";b.webkitTransitionTimingFunction=a.easing;c.on("transitionend",d.onTransitionEnd,d,{single:true,config:a,after:f});for(e in a.to){if(!a.to.hasOwnProperty(e)){continue}b[e]=a.to[e]}},a.delay||5);d.running[c.id]=a;return d},onTransitionEnd:function(e,c,g){c=Ext.get(c);if(this.running[c.id]===undefined){return}var b=c.dom.style,a=g.config,d=this,f;if(a.autoClear){for(f in a.to){if(!a.to.hasOwnProperty(f)||a[f]===false){continue}b[f]=""}}b.webkitTransitionDuration=null;b.webkitTransitionProperty=null;b.webkitTransitionTimingFunction=null;if(a.is3d){c.parent().setStyle({"-webkit-perspective":"","-webkit-transform-style":""})}if(d.config.after){d.config.after.call(a,c,a)}if(g.after){g.after.call(a.scope||d,c,a)}delete d.running[c.id]}});Ext.Anim.seed=1000;Ext.Anim.run=function(b,c,a){if(b.isComponent){b=b.element}a=a||{};if(c.isAnim){c.run(b,a)}else{if(Ext.isObject(c)){if(a.before&&c.before){a.before=Ext.createInterceptor(a.before,c.before,c.scope)}if(a.after&&c.after){a.after=Ext.createInterceptor(a.after,c.after,c.scope)}a=Ext.apply({},a,c);c=c.type}if(!Ext.anims[c]){throw c+" is not a valid animation type."}else{if(b&&b.dom){Ext.anims[c].run(b,a)}}}};Ext.anims={fade:new Ext.Anim({type:"fade",before:function(b){var c=1,a=1,e=b.getStyle("z-index")=="auto"?0:b.getStyle("z-index"),d=e;if(this.out){a=0}else{d=Math.abs(e)+1;c=0}this.from={opacity:c,"z-index":d};this.to={opacity:a,"z-index":d}}}),slide:new Ext.Anim({direction:"left",cover:false,reveal:false,opacity:false,"z-index":false,before:function(a){var c=a.getStyle("z-index")=="auto"?0:a.getStyle("z-index"),f=a.getStyle("opacity"),h=c+1,d=this.out,l=this.direction,k=0,i=0,j=0,g=0,b=a.getHeight(),e=a.getWidth();if(l=="left"||l=="right"){if(d){k=-e}else{j=e}}else{if(l=="up"||l=="down"){if(d){i=-b}else{g=b}}}if(l=="right"||l=="down"){i*=-1;k*=-1;g*=-1;j*=-1}if(this.cover&&d){k=0;i=0;h=c}else{if(this.reveal&&!d){j=0;g=0;h=c}}this.from={"-webkit-transform":"translate3d("+j+"px, "+g+"px, 0)","z-index":h,opacity:f-0.01};this.to={"-webkit-transform":"translate3d("+k+"px, "+i+"px, 0)","z-index":h,opacity:f}}}),pop:new Ext.Anim({scaleOnExit:true,before:function(d){var b=1,c=1,g=1,a=1,h=d.getStyle("z-index")=="auto"?0:d.getStyle("z-index"),f=h,e=h;if(!this.out){b=0.01;f=h+1;e=h+1;g=0}else{if(this.scaleOnExit){c=0.01;a=0}else{a=0.8}}this.from={"-webkit-transform":"scale("+b+")","-webkit-transform-origin":"50% 50%",opacity:g,"z-index":f};this.to={"-webkit-transform":"scale("+c+")","-webkit-transform-origin":"50% 50%",opacity:a,"z-index":e}}}),flip:new Ext.Anim({is3d:true,direction:"left",before:function(c){var f="Y",a=1,b=1,e=0,d=0;if(this.out){d=-180;b=0.8}else{e=180;a=0.8}if(this.direction=="up"||this.direction=="down"){f="X"}if(this.direction=="right"||this.direction=="left"){d*=-1;e*=-1}this.from={"-webkit-transform":"rotate"+f+"("+e+"deg) scale("+a+")","-webkit-backface-visibility":"hidden"};this.to={"-webkit-transform":"rotate"+f+"("+d+"deg) scale("+b+")","-webkit-backface-visibility":"hidden"}}}),cube:new Ext.Anim({is3d:true,direction:"left",style:"outer",before:function(b){var k="0% 0%",l=0,a=0,i="Y",f=0,g=0,e=b.getWidth(),d=b.getHeight(),j=true,c=" translateX(0)",h="";if(this.direction=="left"||this.direction=="right"){if(this.out){k="100% 100%";g=e;a=-90}else{k="0% 0%";f=e;l=90}}else{if(this.direction=="up"||this.direction=="down"){i="X";if(this.out){k="100% 100%";g=d;a=90}else{k="0% 0%";f=d;l=-90}}}if(this.direction=="down"||this.direction=="right"){l*=-1;a*=-1;k=(k=="0% 0%")?"100% 100%":"0% 0%"}if(this.style=="inner"){f*=-1;g*=-1;l*=-1;a*=-1;if(!this.out){h=" translateX(0px)";k="0% 50%"}else{h=c;k="100% 50%"}}this.from={"-webkit-transform":"rotate"+i+"("+l+"deg)"+(j?" translateZ("+f+"px)":"")+c,"-webkit-transform-origin":k};this.to={"-webkit-transform":"rotate"+i+"("+a+"deg) translateZ("+g+"px)"+h,"-webkit-transform-origin":k}},duration:250}),wipe:new Ext.Anim({before:function(b){var d=b.getStyle("z-index"),c,a="";if(!this.out){c=d+1;a="-webkit-gradient(linear, left bottom, right bottom, from(transparent), to(#000), color-stop(66%, #000), color-stop(33%, transparent))";this.from={"-webkit-mask-image":a,"-webkit-mask-size":b.getWidth()*3+"px "+b.getHeight()+"px","z-index":c,"-webkit-mask-position-x":0};this.to={"-webkit-mask-image":a,"-webkit-mask-size":b.getWidth()*3+"px "+b.getHeight()+"px","z-index":c,"-webkit-mask-position-x":-b.getWidth()*2+"px"}}},duration:500})};Ext.define("Ext.XTemplateCompiler",{extend:"Ext.XTemplateParser",useEval:Ext.isGecko,useFormat:true,propNameRe:/^[\w\d\$]*$/,compile:function(a){var c=this,b=c.generate(a);return c.useEval?c.evalTpl(b):(new Function("Ext",b))(Ext)},generate:function(a){var c=this;c.body=["var c0=values, p0=parent, n0=xcount, i0=xindex;\n"];c.funcs=["var fm=Ext.util.Format;"];c.switches=[];c.parse(a);c.funcs.push((c.useEval?"$=":"return")+" function ("+c.fnArgs+") {",c.body.join(""),"}");var b=c.funcs.join("\n");return b},doText:function(a){a=a.replace(this.aposRe,"\\'");a=a.replace(this.newLineRe,"\\n");this.body.push("out.push('",a,"')\n")},doExpr:function(a){this.body.push("out.push(String(",a,"))\n")},doTag:function(a){this.doExpr(this.parseTag(a))},doElse:function(){this.body.push("} else {\n")},doEval:function(a){this.body.push(a,"\n")},doIf:function(b,c){var a=this;if(a.propNameRe.test(b)){a.body.push("if (",a.parseTag(b),") {\n")}else{a.body.push("if (",a.addFn(b),a.callFn,") {\n")}if(c.exec){a.doExec(c.exec)}},doElseIf:function(b,c){var a=this;if(a.propNameRe.test(b)){a.body.push("} else if (",a.parseTag(b),") {\n")}else{a.body.push("} else if (",a.addFn(b),a.callFn,") {\n")}if(c.exec){a.doExec(c.exec)}},doSwitch:function(b){var a=this;if(a.propNameRe.test(b)){a.body.push("switch (",a.parseTag(b),") {\n")}else{a.body.push("switch (",a.addFn(b),a.callFn,") {\n")}a.switches.push(0)},doCase:function(e){var d=this,c=Ext.isArray(e)?e:[e],f=d.switches.length-1,a,b;if(d.switches[f]){d.body.push("break;\n")}else{d.switches[f]++}for(b=0,f=c.length;b<f;++b){a=d.intRe.exec(c[b]);c[b]=a?a[1]:("'"+c[b].replace(d.aposRe,"\\'")+"'")}d.body.push("case ",c.join(": case "),":\n")},doDefault:function(){var a=this,b=a.switches.length-1;if(a.switches[b]){a.body.push("break;\n")}else{a.switches[b]++}a.body.push("default:\n")},doEnd:function(b,d){var c=this,a=c.level-1;if(b=="for"){if(d.exec){c.doExec(d.exec)}c.body.push("}\n");c.body.push("parent=p",a,";values=r",a+1,";xcount=n",a,";xindex=i",a,"\n")}else{if(b=="if"||b=="switch"){c.body.push("}\n")}}},doFor:function(e,f){var d=this,c=d.addFn(e),b=d.level,a=b-1;d.body.push("var c",b,"=",c,d.callFn,", a",b,"=Ext.isArray(c",b,"),p",b,"=(parent=c",a,"),r",b,"=values\n","for (var i",b,"=0,n",b,"=a",b,"?c",b,".length:(c",b,"?1:0), xcount=n",b,";i",b,"<n"+b+";++i",b,"){\n","values=a",b,"?c",b,"[i",b,"]:c",b,"\n","xindex=i",b,"+1\n")},doExec:function(c,d){var b=this,a="f"+b.funcs.length;b.funcs.push("function "+a+"("+b.fnArgs+") {"," try { with(values) {","  "+c," }} catch(e) {}","}");b.body.push(a+b.callFn+"\n")},addFn:function(a){var c=this,b="f"+c.funcs.length;if(a==="."){c.funcs.push("function "+b+"("+c.fnArgs+") {"," return values","}")}else{if(a===".."){c.funcs.push("function "+b+"("+c.fnArgs+") {"," return parent","}")}else{c.funcs.push("function "+b+"("+c.fnArgs+") {"," try { with(values) {","  return("+a+")"," }} catch(e) {}","}")}}return b},parseTag:function(b){var a=this.tagRe.exec(b),e=a[1],g=a[2],d=a[3],f=a[4],c;if(e=="."){c='Ext.Array.indexOf(["string", "number", "boolean"], typeof values) > -1 || Ext.isDate(values) ? values : ""'}else{if(e=="#"){c="xindex"}else{if(e.substr(0,7)=="parent."){c=e}else{if((e.indexOf(".")!==-1)&&(e.indexOf("-")===-1)){c="values."+e}else{c="values['"+e+"']"}}}}if(f){c="("+c+f+")"}if(g&&this.useFormat){d=d?","+d:"";if(g.substr(0,5)!="this."){g="fm."+g+"("}else{g+="("}}else{d="";g="("+c+" === undefined ? '' : "}return g+c+d+")"},evalTpl:function($){eval($);return $},newLineRe:/\r\n|\r|\n/g,aposRe:/[']/g,intRe:/^\s*(\d+)\s*$/,tagRe:/([\w-\.\#]+)(?:\:([\w\.]*)(?:\((.*?)?\))?)?(\s?[\+\-\*\/]\s?[\d\.\+\-\*\/\(\)]+)?/},function(){var a=this.prototype;a.fnArgs="out,values,parent,xindex,xcount";a.callFn=".call(this,"+a.fnArgs+")"});Ext.define("Ext.data.Field",{requires:["Ext.data.Types","Ext.data.SortTypes"],alias:"data.field",isField:true,config:{name:null,type:"auto",convert:undefined,dateFormat:null,allowNull:true,defaultValue:undefined,mapping:null,sortType:undefined,sortDir:"ASC",allowBlank:true,persist:true,encode:null,decode:null},constructor:function(a){if(Ext.isString(a)){a={name:a}}this.initConfig(a)},applyType:function(c){var b=Ext.data.Types,a=b.AUTO;if(c){if(Ext.isString(c)){return b[c.toUpperCase()]||a}else{return c}}return a},updateType:function(a,b){var c=this.getConvert();if(b&&c===b.convert){this.setConvert(a.convert)}},applySortType:function(d){var c=Ext.data.SortTypes,a=this.getType(),b=a.sortType;if(d){if(Ext.isString(d)){return c[d]||b}else{return d}}return b},applyConvert:function(b){var a=this.getType().convert;if(b&&b!==a){this._hasCustomConvert=true;return b}else{this._hasCustomConvert=false;return a}},hasCustomConvert:function(){return this._hasCustomConvert}});Ext.define("Ext.data.identifier.Sequential",{extend:"Ext.data.identifier.Simple",alias:"data.identifier.sequential",config:{prefix:"",seed:1},constructor:function(){var a=this;a.callParent(arguments);a.parts=[a.getPrefix(),""]},generate:function(b){var c=this,d=c.parts,a=c.getSeed()+1;c.setSeed(a);d[1]=a;return d.join("")}});Ext.define("Ext.data.writer.Json",{extend:"Ext.data.writer.Writer",alternateClassName:"Ext.data.JsonWriter",alias:"writer.json",config:{root:undefined,encode:false,allowSingle:true,encodeRequest:false},applyRoot:function(a){if(!a&&(this.getEncode()||this.getEncodeRequest())){a="data"}return a},writeRecords:function(d,e){var a=this.getRoot(),f=d.getParams(),b=this.getAllowSingle(),c;if(this.getAllowSingle()&&e&&e.length==1){e=e[0]}if(this.getEncodeRequest()){c=d.getJsonData()||{};if(e&&(e.length||(b&&Ext.isObject(e)))){c[a]=e}d.setJsonData(Ext.apply(c,f||{}));d.setParams(null);d.setMethod("POST");return d}if(!e||!(e.length||(b&&Ext.isObject(e)))){return d}if(this.getEncode()){if(a){f[a]=Ext.encode(e)}else{}}else{c=d.getJsonData()||{};if(a){c[a]=e}else{c=e}d.setJsonData(c)}return d}});Ext.define("Ext.event.Dispatcher",{requires:["Ext.event.ListenerStack","Ext.event.Controller"],statics:{getInstance:function(){if(!this.instance){this.instance=new this()}return this.instance},setInstance:function(a){this.instance=a;return this}},config:{publishers:{}},wildcard:"*",constructor:function(a){this.listenerStacks={};this.activePublishers={};this.publishersCache={};this.noActivePublishers=[];this.controller=null;this.initConfig(a);return this},getListenerStack:function(e,g,c,b){var d=this.listenerStacks,f=d[e],a;b=Boolean(b);if(!f){if(b){d[e]=f={}}else{return null}}f=f[g];if(!f){if(b){d[e][g]=f={}}else{return null}}a=f[c];if(!a){if(b){f[c]=a=new Ext.event.ListenerStack()}else{return null}}return a},getController:function(d,f,c,b){var a=this.controller,e={targetType:d,target:f,eventName:c};if(!a){this.controller=a=new Ext.event.Controller()}if(a.isFiring){a=new Ext.event.Controller()}a.setInfo(e);if(b&&a!==b){a.connect(b)}return a},applyPublishers:function(c){var a,b;this.publishersCache={};for(a in c){if(c.hasOwnProperty(a)){b=c[a];this.registerPublisher(b)}}return c},registerPublisher:function(b){var a=this.activePublishers,c=b.getTargetType(),d=a[c];if(!d){a[c]=d=[]}d.push(b);b.setDispatcher(this);return this},getCachedActivePublishers:function(c,b){var a=this.publishersCache,d;if((d=a[c])&&(d=d[b])){return d}return null},cacheActivePublishers:function(c,b,d){var a=this.publishersCache;if(!a[c]){a[c]={}}a[c][b]=d;return d},getActivePublishers:function(f,b){var g,a,c,e,d;if((g=this.getCachedActivePublishers(f,b))){return g}a=this.activePublishers[f];if(a){g=[];for(c=0,e=a.length;c<e;c++){d=a[c];if(d.handles(b)){g.push(d)}}}else{g=this.noActivePublishers}return this.cacheActivePublishers(f,b,g)},hasListener:function(c,d,b){var a=this.getListenerStack(c,d,b);if(a){return a.count()>0}return false},addListener:function(d,e,a){var f=this.getActivePublishers(d,a),c=f.length,b;if(c>0){for(b=0;b<c;b++){f[b].subscribe(e,a)}}return this.doAddListener.apply(this,arguments)},doAddListener:function(g,h,c,f,e,d,a){var b=this.getListenerStack(g,h,c,true);return b.add(f,e,d,a)},removeListener:function(d,e,a){var f=this.getActivePublishers(d,a),c=f.length,b;if(c>0){for(b=0;b<c;b++){f[b].unsubscribe(e,a)}}return this.doRemoveListener.apply(this,arguments)},doRemoveListener:function(f,g,c,e,d,a){var b=this.getListenerStack(f,g,c);if(b===null){return false}return b.remove(e,d,a)},clearListeners:function(a,e,d){var j=this.listenerStacks,f=arguments.length,b,h,c,g;if(f===3){if(j[a]&&j[a][e]){this.removeListener(a,e,d);delete j[a][e][d]}}else{if(f===2){if(j[a]){b=j[a][e];if(b){for(d in b){if(b.hasOwnProperty(d)){h=this.getActivePublishers(a,d);for(c=0,f=h.length;c<f;c++){h[c].unsubscribe(e,d,true)}}}delete j[a][e]}}}else{if(f===1){h=this.activePublishers[a];for(c=0,f=h.length;c<f;c++){h[c].unsubscribeAll()}delete j[a]}else{h=this.activePublishers;for(a in h){if(h.hasOwnProperty(a)){g=h[a];for(c=0,f=g.length;c<f;c++){g[c].unsubscribeAll()}}}delete this.listenerStacks;this.listenerStacks={}}}}return this},dispatchEvent:function(d,e,a){var f=this.getActivePublishers(d,a),c=f.length,b;if(c>0){for(b=0;b<c;b++){f[b].notify(e,a)}}return this.doDispatchEvent.apply(this,arguments)},doDispatchEvent:function(a,g,f,i,c,b){var h=this.getListenerStack(a,g,f),d=this.getWildcardListenerStacks(a,g,f),e;if((h===null||h.length==0)){if(d.length==0&&!c){return}}else{d.push(h)}e=this.getController(a,g,f,b);e.setListenerStacks(d);e.fire(i,c);return !e.isInterrupted()},getWildcardListenerStacks:function(g,h,d){var f=[],b=this.wildcard,c=d!==b,e=h!==b,a;if(c&&(a=this.getListenerStack(g,h,b))){f.push(a)}if(e&&(a=this.getListenerStack(g,b,d))){f.push(a)}return f}});Ext.define("Ext.event.Dom",{extend:"Ext.event.Event",constructor:function(a){var c=a.target,b;if(c&&c.nodeType!==1){c=c.parentNode}b=a.changedTouches;if(b){b=b[0];this.pageX=b.pageX;this.pageY=b.pageY}else{this.pageX=a.pageX;this.pageY=a.pageY}this.browserEvent=this.event=a;this.target=this.delegatedTarget=c;this.type=a.type;this.timeStamp=this.time=a.timeStamp;if(typeof this.time!="number"){this.time=new Date(this.time).getTime()}return this},stopEvent:function(){this.preventDefault();return this.callParent()},preventDefault:function(){this.browserEvent.preventDefault()},getPageX:function(){return this.browserEvent.pageX},getPageY:function(){return this.browserEvent.pageY},getXY:function(){if(!this.xy){this.xy=[this.getPageX(),this.getPageY()]}return this.xy},getTarget:function(b,c,a){if(arguments.length===0){return this.delegatedTarget}return b?Ext.fly(this.target).findParent(b,c,a):(a?Ext.get(this.target):this.target)},getTime:function(){return this.time},setDelegatedTarget:function(a){this.delegatedTarget=a},makeUnpreventable:function(){this.browserEvent.preventDefault=Ext.emptyFn}});Ext.define("Ext.event.Touch",{extend:"Ext.event.Dom",requires:["Ext.util.Point"],constructor:function(a,b){if(b){this.set(b)}this.touchesMap={};this.changedTouches=this.cloneTouches(a.changedTouches);this.touches=this.cloneTouches(a.touches);this.targetTouches=this.cloneTouches(a.targetTouches);return this.callParent([a])},clone:function(){return new this.self(this)},setTargets:function(a){this.doSetTargets(this.changedTouches,a);this.doSetTargets(this.touches,a);this.doSetTargets(this.targetTouches,a)},doSetTargets:function(f,d){var c,e,g,b,a;for(c=0,e=f.length;c<e;c++){g=f[c];b=g.identifier;a=d[b];if(a){g.targets=a}}},cloneTouches:function(f){var e=this.touchesMap,h=[],d=null,b,c,g,a;for(b=0,c=f.length;b<c;b++){g=f[b];a=g.identifier;if(d!==null&&a===d){a++}d=a;if(!e[a]){e[a]={pageX:g.pageX,pageY:g.pageY,identifier:a,target:g.target,timeStamp:g.timeStamp,point:Ext.util.Point.fromTouch(g),targets:g.targets}}h[b]=e[a]}return h}});Ext.define("Ext.event.publisher.ComponentPaint",{extend:"Ext.event.publisher.Publisher",targetType:"component",handledEvents:["painted","erased"],eventNames:{painted:"painted",erased:"erased"},constructor:function(){this.callParent(arguments);this.hiddenQueue={};this.renderedQueue={}},getSubscribers:function(b,a){var c=this.subscribers;if(!c.hasOwnProperty(b)){if(!a){return null}c[b]={$length:0}}return c[b]},setDispatcher:function(a){var b=this.targetType;a.doAddListener(b,"*","renderedchange","onBeforeComponentRenderedChange",this,null,"before");a.doAddListener(b,"*","hiddenchange","onBeforeComponentHiddenChange",this,null,"before");a.doAddListener(b,"*","renderedchange","onComponentRenderedChange",this,null,"after");a.doAddListener(b,"*","hiddenchange","onComponentHiddenChange",this,null,"after");return this.callParent(arguments)},subscribe:function(d,a){var b=d.match(this.idSelectorRegex),c,e;if(!b){return false}e=b[1];c=this.getSubscribers(a,true);if(c.hasOwnProperty(e)){c[e]++;return true}c[e]=1;c.$length++;return true},unsubscribe:function(e,a,c){var b=e.match(this.idSelectorRegex),d,f;if(!b||!(d=this.getSubscribers(a))){return false}f=b[1];if(!d.hasOwnProperty(f)||(!c&&--d[f]>0)){return true}delete d[f];if(--d.$length===0){delete this.subscribers[a]}return true},onBeforeComponentRenderedChange:function(b,d,g){var f=this.eventNames,c=g?f.painted:f.erased,e=this.getSubscribers(c),a;if(e&&e.$length>0){this.renderedQueue[d.getId()]=a=[];this.publish(e,d,c,a)}},onBeforeComponentHiddenChange:function(c,d){var f=this.eventNames,b=d?f.erased:f.painted,e=this.getSubscribers(b),a;if(e&&e.$length>0){this.hiddenQueue[c.getId()]=a=[];this.publish(e,c,b,a)}},onComponentRenderedChange:function(b,c){var d=this.renderedQueue,e=c.getId(),a;if(!d.hasOwnProperty(e)){return}a=d[e];delete d[e];if(a.length>0){this.dispatchQueue(a)}},onComponentHiddenChange:function(c){var b=this.hiddenQueue,d=c.getId(),a;if(!b.hasOwnProperty(d)){return}a=b[d];delete b[d];if(a.length>0){this.dispatchQueue(a)}},dispatchQueue:function(g){var l=this.dispatcher,a=this.targetType,b=this.eventNames,e=g.slice(),f=e.length,c,k,h,d,j;g.length=0;if(f>0){for(c=0;c<f;c++){k=e[c];h=k.component;d=k.eventName;j=h.isPainted();if((d===b.painted&&j)||d===b.erased&&!j){l.doDispatchEvent(a,"#"+k.id,d,[h])}}e.length=0}},publish:function(a,k,f,j){var c=k.getId(),b=false,d,h,e,g,l;if(a[c]){d=this.eventNames;l=k.isPainted();if((f===d.painted&&!l)||f===d.erased&&l){b=true}else{return this}}if(k.isContainer){h=k.getItems().items;for(e=0,g=h.length;e<g;e++){this.publish(a,h[e],f,j)}}else{if(k.isDecorator){this.publish(a,k.getComponent(),f,j)}}if(b){j.push({id:c,eventName:f,component:k})}}});Ext.define("Ext.event.publisher.Dom",{extend:"Ext.event.publisher.Publisher",requires:["Ext.env.Browser","Ext.Element","Ext.event.Dom"],targetType:"element",idOrClassSelectorRegex:/^([#|\.])([\w\-]+)$/,handledEvents:["click","focus","blur","mousemove","mousedown","mouseup","mouseover","mouseout","keyup","keydown","keypress","submit","transitionend","animationstart","animationend"],classNameSplitRegex:/\s+/,SELECTOR_ALL:"*",constructor:function(){var f=this.getHandledEvents(),e={},b,c,a,d;this.doBubbleEventsMap={click:true,submit:true,mousedown:true,mousemove:true,mouseup:true,mouseover:true,mouseout:true,transitionend:true};this.onEvent=Ext.Function.bind(this.onEvent,this);for(b=0,c=f.length;b<c;b++){a=f[b];d=this.getVendorEventName(a);e[d]=a;this.attachListener(d)}this.eventNameMap=e;return this.callParent()},getSubscribers:function(a){var c=this.subscribers,b=c[a];if(!b){b=c[a]={id:{$length:0},className:{$length:0},selector:[],all:0,$length:0}}return b},getVendorEventName:function(a){if(a==="transitionend"){a=Ext.browser.getVendorProperyName("transitionEnd")}else{if(a==="animationstart"){a=Ext.browser.getVendorProperyName("animationStart")}else{if(a==="animationend"){a=Ext.browser.getVendorProperyName("animationEnd")}}}return a},attachListener:function(a){document.addEventListener(a,this.onEvent,!this.doesEventBubble(a));return this},removeListener:function(a){document.removeEventListener(a,this.onEvent,!this.doesEventBubble(a));return this},doesEventBubble:function(a){return !!this.doBubbleEventsMap[a]},subscribe:function(g,f){if(!this.handles(f)){return false}var e=g.match(this.idOrClassSelectorRegex),a=this.getSubscribers(f),c=a.id,d=a.className,b=a.selector,h,i;if(e!==null){h=e[1];i=e[2];if(h==="#"){if(c.hasOwnProperty(i)){c[i]++;return true}c[i]=1;c.$length++}else{if(d.hasOwnProperty(i)){d[i]++;return true}d[i]=1;d.$length++}}else{if(g===this.SELECTOR_ALL){a.all++}else{if(b.hasOwnProperty(g)){b[g]++;return true}b[g]=1;b.push(g)}}a.$length++;return true},unsubscribe:function(g,f,j){if(!this.handles(f)){return false}var e=g.match(this.idOrClassSelectorRegex),a=this.getSubscribers(f),c=a.id,d=a.className,b=a.selector,h,i;j=Boolean(j);if(e!==null){h=e[1];i=e[2];if(h==="#"){if(!c.hasOwnProperty(i)||(!j&&--c[i]>0)){return true}delete c[i];c.$length--}else{if(!d.hasOwnProperty(i)||(!j&&--d[i]>0)){return true}delete d[i];d.$length--}}else{if(g===this.SELECTOR_ALL){if(j){a.all=0}else{a.all--}}else{if(!b.hasOwnProperty(g)||(!j&&--b[g]>0)){return true}delete b[g];Ext.Array.remove(b,g)}}a.$length--;return true},getElementTarget:function(a){if(a.nodeType!==1){a=a.parentNode;if(!a||a.nodeType!==1){return null}}return a},getBubblingTargets:function(b){var a=[];if(!b){return a}do{a[a.length]=b;b=b.parentNode}while(b&&b.nodeType===1);return a},dispatch:function(c,a,b){b.push(b[0].target);this.callParent(arguments)},publish:function(b,a,c){var d=this.getSubscribers(b),e;if(d.$length===0||!this.doPublish(d,b,a,c)){e=this.getSubscribers("*");if(e.$length>0){this.doPublish(e,b,a,c)}}return this},doPublish:function(f,h,x,u){var r=f.id,g=f.className,b=f.selector,p=r.$length>0,a=g.$length>0,l=b.length>0,o=f.all>0,y={},e=[u],q=false,m=this.classNameSplitRegex,v,k,t,d,z,n,c,w,s;for(v=0,k=x.length;v<k;v++){z=x[v];u.setDelegatedTarget(z);if(p){n=z.id;if(n){if(r.hasOwnProperty(n)){q=true;this.dispatch("#"+n,h,e)}}}if(a){c=z.className;if(c){w=c.split(m);for(t=0,d=w.length;t<d;t++){c=w[t];if(!y[c]){y[c]=true;if(g.hasOwnProperty(c)){q=true;this.dispatch("."+c,h,e)}}}}}if(u.isStopped){return q}}if(o&&!q){u.setDelegatedTarget(u.browserEvent.target);q=true;this.dispatch(this.ALL_SELECTOR,h,e);if(u.isStopped){return q}}if(l){for(t=0,d=x.length;t<d;t++){z=x[t];for(v=0,k=b.length;v<k;v++){s=b[v];if(this.matchesSelector(z,s)){u.setDelegatedTarget(z);q=true;this.dispatch(s,h,e)}if(u.isStopped){return q}}}}return q},matchesSelector:function(b,a){if("webkitMatchesSelector" in b){return b.webkitMatchesSelector(a)}return Ext.DomQuery.is(b,a)},onEvent:function(d){var b=this.eventNameMap[d.type];if(!b||this.getSubscribersCount(b)===0){return}var c=this.getElementTarget(d.target),a;if(!c){return}if(this.doesEventBubble(b)){a=this.getBubblingTargets(c)}else{a=[c]}this.publish(b,a,new Ext.event.Dom(d))},getSubscribersCount:function(a){if(!this.handles(a)){return 0}return this.getSubscribers(a).$length+this.getSubscribers("*").$length}});Ext.define("Ext.event.publisher.TouchGesture",{extend:"Ext.event.publisher.Dom",requires:["Ext.util.Point","Ext.event.Touch"],handledEvents:["touchstart","touchmove","touchend","touchcancel"],moveEventName:"touchmove",config:{moveThrottle:1,buffering:{enabled:false,interval:10},recognizers:{}},currentTouchesCount:0,constructor:function(a){this.processEvents=Ext.Function.bind(this.processEvents,this);this.eventProcessors={touchstart:this.onTouchStart,touchmove:this.onTouchMove,touchend:this.onTouchEnd,touchcancel:this.onTouchEnd};this.eventToRecognizerMap={};this.activeRecognizers=[];this.currentRecognizers=[];this.currentTargets={};this.currentTouches={};this.buffer=[];this.initConfig(a);return this.callParent()},applyBuffering:function(a){if(a.enabled===true){this.bufferTimer=setInterval(this.processEvents,a.interval)}else{clearInterval(this.bufferTimer)}return a},applyRecognizers:function(b){var c,a;for(c in b){if(b.hasOwnProperty(c)){a=b[c];this.registerRecognizer(a)}}return b},handles:function(a){return this.callParent(arguments)||this.eventToRecognizerMap.hasOwnProperty(a)},doesEventBubble:function(){return true},eventLogs:[],onEvent:function(b){var a=this.getBuffering();b=new Ext.event.Touch(b);if(a.enabled){this.buffer.push(b)}else{this.processEvent(b)}},processEvents:function(){var a=this.buffer,f=a.length,d=[],c,e,b;if(f>0){c=a.slice(0);a.length=0;for(b=0;b<f;b++){e=c[b];if(e.type===this.moveEventName){d.push(e)}else{if(d.length>0){this.processEvent(this.mergeEvents(d));d.length=0}this.processEvent(e)}}if(d.length>0){this.processEvent(this.mergeEvents(d));d.length=0}}},mergeEvents:function(c){var b=[],f=c.length,a,e,d;d=c[f-1];if(f===1){return d}for(a=0;a<f;a++){e=c[a];b.push(e.changedTouches)}d.changedTouches=this.mergeTouchLists(b);return d},mergeTouchLists:function(l){var e={},h=[],d,k,a,b,f,c,g;for(d=0,k=l.length;d<k;d++){a=l[d];for(b=0,f=a.length;b<f;b++){c=a[b];g=c.identifier;e[g]=c}}for(g in e){if(e.hasOwnProperty(g)){h.push(e[g])}}return h},registerRecognizer:function(a){var g=this.eventToRecognizerMap,e=this.activeRecognizers,c=a.getHandledEvents(),d,f,b;a.setOnRecognized(this.onRecognized);a.setCallbackScope(this);for(d=0,f=c.length;d<f;d++){b=c[d];g[b]=a}e.push(a);return this},onRecognized:function(f,h,d,a){var k=[],j=d.length,g,c,b;if(j===1){return this.publish(f,d[0].targets,h,a)}for(c=0;c<j;c++){b=d[c];k.push(b.targets)}g=this.getCommonTargets(k);this.publish(f,g,h,a)},publish:function(b,a,c,d){c.set(d);return this.callParent([b,a,c])},getCommonTargets:function(a){var h=a[0],f=a.length;if(f===1){return h}var d=[],e=1,g,b,c;while(true){g=h[h.length-e];if(!g){return d}for(c=1;c<f;c++){b=a[c];if(b[b.length-e]!==g){return d}}d.unshift(g);e++}return d},invokeRecognizers:function(c,g){var b=this.activeRecognizers,f=b.length,d,a;if(c==="onStart"){for(d=0;d<f;d++){b[d].isActive=true}}for(d=0;d<f;d++){a=b[d];if(a.isActive&&a[c].call(a,g)===false){a.isActive=false}}},getActiveRecognizers:function(){return this.activeRecognizers},processEvent:function(a){this.eventProcessors[a.type].call(this,a)},onTouchStart:function(k){var m=this.currentTargets,g=this.currentTouches,o=this.currentTouchesCount,n=k.changedTouches,f=k.touches,h=f.length,a={},l=n.length,d,c,j,b;o+=l;if(o>h){for(d=0;d<h;d++){c=f[d];j=c.identifier;a[j]=true}for(j in g){if(g.hasOwnProperty(j)){if(!a[j]){o--;b=k.clone();c=g[j];c.targets=this.getBubblingTargets(this.getElementTarget(c.target));b.changedTouches=[c];this.onTouchEnd(b)}}}if(o>h){return}}for(d=0;d<l;d++){c=n[d];j=c.identifier;if(!g.hasOwnProperty(j)){this.currentTouchesCount++}g[j]=c;m[j]=this.getBubblingTargets(this.getElementTarget(c.target))}k.setTargets(m);for(d=0;d<l;d++){c=n[d];this.publish("touchstart",c.targets,k,{touch:c})}if(!this.isStarted){this.isStarted=true;this.invokeRecognizers("onStart",k)}this.invokeRecognizers("onTouchStart",k)},onTouchMove:function(j){if(!this.isStarted){return}var l=this.currentTargets,g=this.currentTouches,c=this.getMoveThrottle(),m=j.changedTouches,b=0,f,k,d,n,a,h;j.setTargets(l);for(f=0,k=m.length;f<k;f++){d=m[f];h=d.identifier;n=d.point;a=g[h].point;if(c&&n.isCloseTo(a,c)){b++;continue}g[h]=d;this.publish("touchmove",d.targets,j,{touch:d})}if(b<k){this.invokeRecognizers("onTouchMove",j)}},onTouchEnd:function(d){if(!this.isStarted){return}var h=this.currentTargets,c=this.currentTouches,k=d.changedTouches,g=k.length,j,f,b,a;d.setTargets(h);this.currentTouchesCount-=g;j=(this.currentTouchesCount===0);if(j){this.isStarted=false}for(b=0;b<g;b++){a=k[b];f=a.identifier;delete c[f];delete h[f];this.publish("touchend",a.targets,d,{touch:a})}this.invokeRecognizers("onTouchEnd",d);if(j){this.invokeRecognizers("onEnd",d)}}},function(){if(!Ext.feature.has.Touch){this.override({moveEventName:"mousemove",map:{mouseToTouch:{mousedown:"touchstart",mousemove:"touchmove",mouseup:"touchend"},touchToMouse:{touchstart:"mousedown",touchmove:"mousemove",touchend:"mouseup"}},attachListener:function(a){a=this.map.touchToMouse[a];if(!a){return}return this.callOverridden([a])},lastEventType:null,onEvent:function(d){if("button" in d&&d.button!==0){return}var c=d.type,b=[d];if(c==="mousedown"&&this.lastEventType&&this.lastEventType!=="mouseup"){var a=document.createEvent("MouseEvent");a.initMouseEvent("mouseup",d.bubbles,d.cancelable,document.defaultView,d.detail,d.screenX,d.screenY,d.clientX,d.clientY,d.ctrlKey,d.altKey,d.shiftKey,d.metaKey,d.metaKey,d.button,d.relatedTarget);this.onEvent(a)}if(c!=="mousemove"){this.lastEventType=c}d.identifier=1;d.touches=(c!=="mouseup")?b:[];d.targetTouches=(c!=="mouseup")?b:[];d.changedTouches=b;return this.callOverridden([d])},processEvent:function(a){this.eventProcessors[this.map.mouseToTouch[a.type]].call(this,a)}})}});Ext.define("Ext.event.recognizer.MultiTouch",{extend:"Ext.event.recognizer.Touch",requiredTouchesCount:2,isTracking:false,isStarted:false,onTouchStart:function(d){var a=this.requiredTouchesCount,c=d.touches,b=c.length;if(b===a){this.start(d)}else{if(b>a){this.end(d)}}},onTouchEnd:function(a){this.end(a)},start:function(){if(!this.isTracking){this.isTracking=true;this.isStarted=false}},end:function(a){if(this.isTracking){this.isTracking=false;if(this.isStarted){this.isStarted=false;this.fireEnd(a)}}}});Ext.define("Ext.event.recognizer.Pinch",{extend:"Ext.event.recognizer.MultiTouch",requiredTouchesCount:2,handledEvents:["pinchstart","pinch","pinchend"],startDistance:0,lastTouches:null,onTouchMove:function(c){if(!this.isTracking){return}var b=Array.prototype.slice.call(c.touches),d,a,f;d=b[0].point;a=b[1].point;f=d.getDistanceTo(a);if(f===0){return}if(!this.isStarted){this.isStarted=true;this.startDistance=f;this.fire("pinchstart",c,b,{touches:b,distance:f,scale:1})}else{this.fire("pinch",c,b,{touches:b,distance:f,scale:f/this.startDistance})}this.lastTouches=b},fireEnd:function(a){this.fire("pinchend",a,this.lastTouches)},fail:function(){return this.callParent(arguments)}});Ext.define("Ext.event.recognizer.Rotate",{extend:"Ext.event.recognizer.MultiTouch",requiredTouchesCount:2,handledEvents:["rotatestart","rotate","rotateend"],startAngle:0,lastTouches:null,lastAngle:null,onTouchMove:function(h){if(!this.isTracking){return}var g=Array.prototype.slice.call(h.touches),b=this.lastAngle,d,f,c,a,i,j;d=g[0].point;f=g[1].point;c=d.getAngleTo(f);if(b!==null){j=Math.abs(b-c);a=c+360;i=c-360;if(Math.abs(a-b)<j){c=a}else{if(Math.abs(i-b)<j){c=i}}}this.lastAngle=c;if(!this.isStarted){this.isStarted=true;this.startAngle=c;this.fire("rotatestart",h,g,{touches:g,angle:c,rotation:0})}else{this.fire("rotate",h,g,{touches:g,angle:c,rotation:c-this.startAngle})}this.lastTouches=g},fireEnd:function(a){this.lastAngle=null;this.fire("rotateend",a,this.lastTouches)}});Ext.define("Ext.event.recognizer.SingleTouch",{extend:"Ext.event.recognizer.Touch",inheritableStatics:{NOT_SINGLE_TOUCH:1,TOUCH_MOVED:2},onTouchStart:function(a){if(a.touches.length>1){return this.fail(this.self.NOT_SINGLE_TOUCH)}}});Ext.define("Ext.event.recognizer.DoubleTap",{extend:"Ext.event.recognizer.SingleTouch",config:{maxDuration:300},handledEvents:["singletap","doubletap"],singleTapTimer:null,onTouchStart:function(a){if(this.callParent(arguments)===false){return false}this.startTime=a.time;clearTimeout(this.singleTapTimer)},onTouchMove:function(){return this.fail(this.self.TOUCH_MOVED)},onEnd:function(g){var c=this,b=this.getMaxDuration(),h=g.changedTouches[0],f=g.time,a=this.lastTapTime,d;this.lastTapTime=f;if(a){d=f-a;if(d<=b){this.lastTapTime=0;this.fire("doubletap",g,[h],{touch:h,duration:d});return}}if(f-this.startTime>b){this.fireSingleTap(g,h)}else{this.singleTapTimer=setTimeout(function(){c.fireSingleTap(g,h)},b)}},fireSingleTap:function(a,b){this.fire("singletap",a,[b],{touch:b})}});Ext.define("Ext.event.recognizer.Drag",{extend:"Ext.event.recognizer.SingleTouch",isStarted:false,startPoint:null,previousPoint:null,lastPoint:null,handledEvents:["dragstart","drag","dragend"],onTouchStart:function(b){var c,a;if(this.callParent(arguments)===false){if(this.isStarted&&this.lastMoveEvent!==null){this.onTouchEnd(this.lastMoveEvent)}return false}this.startTouches=c=b.changedTouches;this.startTouch=a=c[0];this.startPoint=a.point},onTouchMove:function(d){var c=d.changedTouches,f=c[0],a=f.point,b=d.time;if(this.lastPoint){this.previousPoint=this.lastPoint}if(this.lastTime){this.previousTime=this.lastTime}this.lastTime=b;this.lastPoint=a;this.lastMoveEvent=d;if(!this.isStarted){this.isStarted=true;this.startTime=b;this.previousTime=b;this.previousPoint=this.startPoint;this.fire("dragstart",d,this.startTouches,this.getInfo(d,this.startTouch))}else{this.fire("drag",d,c,this.getInfo(d,f))}},onTouchEnd:function(c){if(this.isStarted){var b=c.changedTouches,d=b[0],a=d.point;this.isStarted=false;this.lastPoint=a;this.fire("dragend",c,b,this.getInfo(c,d));this.startTime=0;this.previousTime=0;this.lastTime=0;this.startPoint=null;this.previousPoint=null;this.lastPoint=null;this.lastMoveEvent=null}},getInfo:function(j,i){var d=j.time,a=this.startPoint,f=this.previousPoint,b=this.startTime,k=this.previousTime,l=this.lastPoint,h=l.x-a.x,g=l.y-a.y,c={touch:i,startX:a.x,startY:a.y,previousX:f.x,previousY:f.y,pageX:l.x,pageY:l.y,deltaX:h,deltaY:g,absDeltaX:Math.abs(h),absDeltaY:Math.abs(g),previousDeltaX:l.x-f.x,previousDeltaY:l.y-f.y,time:d,startTime:b,previousTime:k,deltaTime:d-b,previousDeltaTime:d-k};return c}});Ext.define("Ext.event.recognizer.LongPress",{extend:"Ext.event.recognizer.SingleTouch",inheritableStatics:{DURATION_NOT_ENOUGH:32},config:{minDuration:1000},handledEvents:["longpress"],fireLongPress:function(a){var b=a.changedTouches[0];this.fire("longpress",a,[b],{touch:b,duration:this.getMinDuration()});this.isLongPress=true},onTouchStart:function(b){var a=this;if(this.callParent(arguments)===false){return false}this.isLongPress=false;this.timer=setTimeout(function(){a.fireLongPress(b)},this.getMinDuration())},onTouchMove:function(){return this.fail(this.self.TOUCH_MOVED)},onTouchEnd:function(){if(!this.isLongPress){return this.fail(this.self.DURATION_NOT_ENOUGH)}},fail:function(){clearTimeout(this.timer);return this.callParent(arguments)}},function(){});Ext.define("Ext.event.recognizer.Tap",{handledEvents:["tap"],extend:"Ext.event.recognizer.SingleTouch",onTouchMove:function(){return this.fail(this.self.TOUCH_MOVED)},onTouchEnd:function(a){var b=a.changedTouches[0];this.fire("tap",a,[b])}},function(){});(function(){function b(d){var c=Array.prototype.slice.call(arguments,1);return d.replace(/\{(\d+)\}/g,function(e,f){return c[f]})}Ext.DateExtras={now:Date.now||function(){return +new Date()},getElapsed:function(d,c){return Math.abs(d-(c||new Date()))},useStrict:false,formatCodeToRegex:function(d,c){var e=a.parseCodes[d];if(e){e=typeof e=="function"?e():e;a.parseCodes[d]=e}return e?Ext.applyIf({c:e.c?b(e.c,c||"{0}"):e.c},e):{g:0,c:null,s:Ext.String.escapeRegex(d)}},parseFunctions:{MS:function(d,c){var e=new RegExp("\\/Date\\(([-+])?(\\d+)(?:[+-]\\d{4})?\\)\\/");var f=(d||"").match(e);return f?new Date(((f[1]||"")+f[2])*1):null}},parseRegexes:[],formatFunctions:{MS:function(){return"\\/Date("+this.getTime()+")\\/"}},y2kYear:50,MILLI:"ms",SECOND:"s",MINUTE:"mi",HOUR:"h",DAY:"d",MONTH:"mo",YEAR:"y",defaults:{},dayNames:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],monthNames:["January","February","March","April","May","June","July","August","September","October","November","December"],monthNumbers:{Jan:0,Feb:1,Mar:2,Apr:3,May:4,Jun:5,Jul:6,Aug:7,Sep:8,Oct:9,Nov:10,Dec:11},defaultFormat:"m/d/Y",getShortMonthName:function(c){return a.monthNames[c].substring(0,3)},getShortDayName:function(c){return a.dayNames[c].substring(0,3)},getMonthNumber:function(c){return a.monthNumbers[c.substring(0,1).toUpperCase()+c.substring(1,3).toLowerCase()]},formatCodes:{d:"Ext.String.leftPad(this.getDate(), 2, '0')",D:"Ext.Date.getShortDayName(this.getDay())",j:"this.getDate()",l:"Ext.Date.dayNames[this.getDay()]",N:"(this.getDay() ? this.getDay() : 7)",S:"Ext.Date.getSuffix(this)",w:"this.getDay()",z:"Ext.Date.getDayOfYear(this)",W:"Ext.String.leftPad(Ext.Date.getWeekOfYear(this), 2, '0')",F:"Ext.Date.monthNames[this.getMonth()]",m:"Ext.String.leftPad(this.getMonth() + 1, 2, '0')",M:"Ext.Date.getShortMonthName(this.getMonth())",n:"(this.getMonth() + 1)",t:"Ext.Date.getDaysInMonth(this)",L:"(Ext.Date.isLeapYear(this) ? 1 : 0)",o:"(this.getFullYear() + (Ext.Date.getWeekOfYear(this) == 1 && this.getMonth() > 0 ? +1 : (Ext.Date.getWeekOfYear(this) >= 52 && this.getMonth() < 11 ? -1 : 0)))",Y:"Ext.String.leftPad(this.getFullYear(), 4, '0')",y:"('' + this.getFullYear()).substring(2, 4)",a:"(this.getHours() < 12 ? 'am' : 'pm')",A:"(this.getHours() < 12 ? 'AM' : 'PM')",g:"((this.getHours() % 12) ? this.getHours() % 12 : 12)",G:"this.getHours()",h:"Ext.String.leftPad((this.getHours() % 12) ? this.getHours() % 12 : 12, 2, '0')",H:"Ext.String.leftPad(this.getHours(), 2, '0')",i:"Ext.String.leftPad(this.getMinutes(), 2, '0')",s:"Ext.String.leftPad(this.getSeconds(), 2, '0')",u:"Ext.String.leftPad(this.getMilliseconds(), 3, '0')",O:"Ext.Date.getGMTOffset(this)",P:"Ext.Date.getGMTOffset(this, true)",T:"Ext.Date.getTimezone(this)",Z:"(this.getTimezoneOffset() * -60)",c:function(){for(var j="Y-m-dTH:i:sP",g=[],f=0,d=j.length;f<d;++f){var h=j.charAt(f);g.push(h=="T"?"'T'":a.getFormatCode(h))}return g.join(" + ")},U:"Math.round(this.getTime() / 1000)"},isValid:function(n,c,l,j,f,g,e){j=j||0;f=f||0;g=g||0;e=e||0;var k=a.add(new Date(n<100?100:n,c-1,l,j,f,g,e),a.YEAR,n<100?n-100:0);return n==k.getFullYear()&&c==k.getMonth()+1&&l==k.getDate()&&j==k.getHours()&&f==k.getMinutes()&&g==k.getSeconds()&&e==k.getMilliseconds()},parse:function(d,f,c){var e=a.parseFunctions;if(e[f]==null){a.createParser(f)}return e[f](d,Ext.isDefined(c)?c:a.useStrict)},parseDate:function(d,e,c){return a.parse(d,e,c)},getFormatCode:function(d){var c=a.formatCodes[d];if(c){c=typeof c=="function"?c():c;a.formatCodes[d]=c}return c||("'"+Ext.String.escape(d)+"'")},createFormat:function(g){var f=[],c=false,e="";for(var d=0;d<g.length;++d){e=g.charAt(d);if(!c&&e=="\\"){c=true}else{if(c){c=false;f.push("'"+Ext.String.escape(e)+"'")}else{f.push(a.getFormatCode(e))}}}a.formatFunctions[g]=Ext.functionFactory("return "+f.join("+"))},createParser:(function(){var c=["var dt, y, m, d, h, i, s, ms, o, z, zz, u, v,","def = Ext.Date.defaults,","results = String(input).match(Ext.Date.parseRegexes[{0}]);","if(results){","{1}","if(u != null){","v = new Date(u * 1000);","}else{","dt = Ext.Date.clearTime(new Date);","y = Ext.Number.from(y, Ext.Number.from(def.y, dt.getFullYear()));","m = Ext.Number.from(m, Ext.Number.from(def.m - 1, dt.getMonth()));","d = Ext.Number.from(d, Ext.Number.from(def.d, dt.getDate()));","h  = Ext.Number.from(h, Ext.Number.from(def.h, dt.getHours()));","i  = Ext.Number.from(i, Ext.Number.from(def.i, dt.getMinutes()));","s  = Ext.Number.from(s, Ext.Number.from(def.s, dt.getSeconds()));","ms = Ext.Number.from(ms, Ext.Number.from(def.ms, dt.getMilliseconds()));","if(z >= 0 && y >= 0){","v = Ext.Date.add(new Date(y < 100 ? 100 : y, 0, 1, h, i, s, ms), Ext.Date.YEAR, y < 100 ? y - 100 : 0);","v = !strict? v : (strict === true && (z <= 364 || (Ext.Date.isLeapYear(v) && z <= 365))? Ext.Date.add(v, Ext.Date.DAY, z) : null);","}else if(strict === true && !Ext.Date.isValid(y, m + 1, d, h, i, s, ms)){","v = null;","}else{","v = Ext.Date.add(new Date(y < 100 ? 100 : y, m, d, h, i, s, ms), Ext.Date.YEAR, y < 100 ? y - 100 : 0);","}","}","}","if(v){","if(zz != null){","v = Ext.Date.add(v, Ext.Date.SECOND, -v.getTimezoneOffset() * 60 - zz);","}else if(o){","v = Ext.Date.add(v, Ext.Date.MINUTE, -v.getTimezoneOffset() + (sn == '+'? -1 : 1) * (hr * 60 + mn));","}","}","return v;"].join("\n");return function(l){var e=a.parseRegexes.length,m=1,f=[],k=[],j=false,d="";for(var h=0;h<l.length;++h){d=l.charAt(h);if(!j&&d=="\\"){j=true}else{if(j){j=false;k.push(Ext.String.escape(d))}else{var g=a.formatCodeToRegex(d,m);m+=g.g;k.push(g.s);if(g.g&&g.c){f.push(g.c)}}}}a.parseRegexes[e]=new RegExp("^"+k.join("")+"$","i");a.parseFunctions[l]=Ext.functionFactory("input","strict",b(c,e,f.join("")))}})(),parseCodes:{d:{g:1,c:"d = parseInt(results[{0}], 10);\n",s:"(\\d{2})"},j:{g:1,c:"d = parseInt(results[{0}], 10);\n",s:"(\\d{1,2})"},D:function(){for(var c=[],d=0;d<7;c.push(a.getShortDayName(d)),++d){}return{g:0,c:null,s:"(?:"+c.join("|")+")"}},l:function(){return{g:0,c:null,s:"(?:"+a.dayNames.join("|")+")"}},N:{g:0,c:null,s:"[1-7]"},S:{g:0,c:null,s:"(?:st|nd|rd|th)"},w:{g:0,c:null,s:"[0-6]"},z:{g:1,c:"z = parseInt(results[{0}], 10);\n",s:"(\\d{1,3})"},W:{g:0,c:null,s:"(?:\\d{2})"},F:function(){return{g:1,c:"m = parseInt(Ext.Date.getMonthNumber(results[{0}]), 10);\n",s:"("+a.monthNames.join("|")+")"}},M:function(){for(var c=[],d=0;d<12;c.push(a.getShortMonthName(d)),++d){}return Ext.applyIf({s:"("+c.join("|")+")"},a.formatCodeToRegex("F"))},m:{g:1,c:"m = parseInt(results[{0}], 10) - 1;\n",s:"(\\d{2})"},n:{g:1,c:"m = parseInt(results[{0}], 10) - 1;\n",s:"(\\d{1,2})"},t:{g:0,c:null,s:"(?:\\d{2})"},L:{g:0,c:null,s:"(?:1|0)"},o:function(){return a.formatCodeToRegex("Y")},Y:{g:1,c:"y = parseInt(results[{0}], 10);\n",s:"(\\d{4})"},y:{g:1,c:"var ty = parseInt(results[{0}], 10);\ny = ty > Ext.Date.y2kYear ? 1900 + ty : 2000 + ty;\n",s:"(\\d{1,2})"},a:{g:1,c:"if (/(am)/i.test(results[{0}])) {\nif (!h || h == 12) { h = 0; }\n} else { if (!h || h < 12) { h = (h || 0) + 12; }}",s:"(am|pm|AM|PM)"},A:{g:1,c:"if (/(am)/i.test(results[{0}])) {\nif (!h || h == 12) { h = 0; }\n} else { if (!h || h < 12) { h = (h || 0) + 12; }}",s:"(AM|PM|am|pm)"},g:function(){return a.formatCodeToRegex("G")},G:{g:1,c:"h = parseInt(results[{0}], 10);\n",s:"(\\d{1,2})"},h:function(){return a.formatCodeToRegex("H")},H:{g:1,c:"h = parseInt(results[{0}], 10);\n",s:"(\\d{2})"},i:{g:1,c:"i = parseInt(results[{0}], 10);\n",s:"(\\d{2})"},s:{g:1,c:"s = parseInt(results[{0}], 10);\n",s:"(\\d{2})"},u:{g:1,c:"ms = results[{0}]; ms = parseInt(ms, 10)/Math.pow(10, ms.length - 3);\n",s:"(\\d+)"},O:{g:1,c:["o = results[{0}];","var sn = o.substring(0,1),","hr = o.substring(1,3)*1 + Math.floor(o.substring(3,5) / 60),","mn = o.substring(3,5) % 60;","o = ((-12 <= (hr*60 + mn)/60) && ((hr*60 + mn)/60 <= 14))? (sn + Ext.String.leftPad(hr, 2, '0') + Ext.String.leftPad(mn, 2, '0')) : null;\n"].join("\n"),s:"([+-]\\d{4})"},P:{g:1,c:["o = results[{0}];","var sn = o.substring(0,1),","hr = o.substring(1,3)*1 + Math.floor(o.substring(4,6) / 60),","mn = o.substring(4,6) % 60;","o = ((-12 <= (hr*60 + mn)/60) && ((hr*60 + mn)/60 <= 14))? (sn + Ext.String.leftPad(hr, 2, '0') + Ext.String.leftPad(mn, 2, '0')) : null;\n"].join("\n"),s:"([+-]\\d{2}:\\d{2})"},T:{g:0,c:null,s:"[A-Z]{1,4}"},Z:{g:1,c:"zz = results[{0}] * 1;\nzz = (-43200 <= zz && zz <= 50400)? zz : null;\n",s:"([+-]?\\d{1,5})"},c:function(){var e=[],c=[a.formatCodeToRegex("Y",1),a.formatCodeToRegex("m",2),a.formatCodeToRegex("d",3),a.formatCodeToRegex("h",4),a.formatCodeToRegex("i",5),a.formatCodeToRegex("s",6),{c:"ms = results[7] || '0'; ms = parseInt(ms, 10)/Math.pow(10, ms.length - 3);\n"},{c:["if(results[8]) {","if(results[8] == 'Z'){","zz = 0;","}else if (results[8].indexOf(':') > -1){",a.formatCodeToRegex("P",8).c,"}else{",a.formatCodeToRegex("O",8).c,"}","}"].join("\n")}];for(var f=0,d=c.length;f<d;++f){e.push(c[f].c)}return{g:1,c:e.join(""),s:[c[0].s,"(?:","-",c[1].s,"(?:","-",c[2].s,"(?:","(?:T| )?",c[3].s,":",c[4].s,"(?::",c[5].s,")?","(?:(?:\\.|,)(\\d+))?","(Z|(?:[-+]\\d{2}(?::)?\\d{2}))?",")?",")?",")?"].join("")}},U:{g:1,c:"u = parseInt(results[{0}], 10);\n",s:"(-?\\d+)"}},dateFormat:function(c,d){return a.format(c,d)},format:function(d,e){if(a.formatFunctions[e]==null){a.createFormat(e)}var c=a.formatFunctions[e].call(d);return c+""},getTimezone:function(c){return c.toString().replace(/^.* (?:\((.*)\)|([A-Z]{1,4})(?:[\-+][0-9]{4})?(?: -?\d+)?)$/,"$1$2").replace(/[^A-Z]/g,"")},getGMTOffset:function(c,d){var e=c.getTimezoneOffset();return(e>0?"-":"+")+Ext.String.leftPad(Math.floor(Math.abs(e)/60),2,"0")+(d?":":"")+Ext.String.leftPad(Math.abs(e%60),2,"0")},getDayOfYear:function(f){var e=0,h=Ext.Date.clone(f),c=f.getMonth(),g;for(g=0,h.setDate(1),h.setMonth(0);g<c;h.setMonth(++g)){e+=a.getDaysInMonth(h)}return e+f.getDate()-1},getWeekOfYear:(function(){var c=86400000,d=7*c;return function(f){var g=Date.UTC(f.getFullYear(),f.getMonth(),f.getDate()+3)/c,e=Math.floor(g/7),h=new Date(e*d).getUTCFullYear();return e-Math.floor(Date.UTC(h,0,7)/d)+1}})(),isLeapYear:function(c){var d=c.getFullYear();return !!((d&3)==0&&(d%100||(d%400==0&&d)))},getFirstDayOfMonth:function(d){var c=(d.getDay()-(d.getDate()-1))%7;return(c<0)?(c+7):c},getLastDayOfMonth:function(c){return a.getLastDateOfMonth(c).getDay()},getFirstDateOfMonth:function(c){return new Date(c.getFullYear(),c.getMonth(),1)},getLastDateOfMonth:function(c){return new Date(c.getFullYear(),c.getMonth(),a.getDaysInMonth(c))},getDaysInMonth:(function(){var c=[31,28,31,30,31,30,31,31,30,31,30,31];return function(e){var d=e.getMonth();return d==1&&a.isLeapYear(e)?29:c[d]}})(),getSuffix:function(c){switch(c.getDate()){case 1:case 21:case 31:return"st";case 2:case 22:return"nd";case 3:case 23:return"rd";default:return"th"}},clone:function(c){return new Date(c.getTime())},isDST:function(c){return new Date(c.getFullYear(),0,1).getTimezoneOffset()!=c.getTimezoneOffset()},clearTime:function(e,i){if(i){return Ext.Date.clearTime(Ext.Date.clone(e))}var g=e.getDate();e.setHours(0);e.setMinutes(0);e.setSeconds(0);e.setMilliseconds(0);if(e.getDate()!=g){for(var f=1,h=a.add(e,Ext.Date.HOUR,f);h.getDate()!=g;f++,h=a.add(e,Ext.Date.HOUR,f)){}e.setDate(g);e.setHours(h.getHours())}return e},add:function(g,f,h){var i=Ext.Date.clone(g),c=Ext.Date;if(!f||h===0){return i}switch(f.toLowerCase()){case Ext.Date.MILLI:i.setMilliseconds(i.getMilliseconds()+h);break;case Ext.Date.SECOND:i.setSeconds(i.getSeconds()+h);break;case Ext.Date.MINUTE:i.setMinutes(i.getMinutes()+h);break;case Ext.Date.HOUR:i.setHours(i.getHours()+h);break;case Ext.Date.DAY:i.setDate(i.getDate()+h);break;case Ext.Date.MONTH:var e=g.getDate();if(e>28){e=Math.min(e,Ext.Date.getLastDateOfMonth(Ext.Date.add(Ext.Date.getFirstDateOfMonth(g),"mo",h)).getDate())}i.setDate(e);i.setMonth(g.getMonth()+h);break;case Ext.Date.YEAR:i.setFullYear(g.getFullYear()+h);break}return i},between:function(d,f,c){var e=d.getTime();return f.getTime()<=e&&e<=c.getTime()}};var a=Ext.DateExtras;Ext.apply(Ext.Date,a)})();Ext.define("Ext.fx.Easing",{requires:["Ext.fx.easing.Linear"],constructor:function(a){return Ext.factory(a,Ext.fx.easing.Linear,null,"easing")}});Ext.define("Ext.fx.easing.BoundMomentum",{extend:"Ext.fx.easing.Abstract",requires:["Ext.fx.easing.Momentum","Ext.fx.easing.Bounce"],config:{momentum:null,bounce:null,minMomentumValue:0,maxMomentumValue:0,minVelocity:0.01,startVelocity:0},applyMomentum:function(a,b){return Ext.factory(a,Ext.fx.easing.Momentum,b)},applyBounce:function(a,b){return Ext.factory(a,Ext.fx.easing.Bounce,b)},updateStartTime:function(a){this.getMomentum().setStartTime(a);this.callParent(arguments)},updateStartVelocity:function(a){this.getMomentum().setStartVelocity(a)},updateStartValue:function(a){this.getMomentum().setStartValue(a)},reset:function(){this.lastValue=null;this.isBouncingBack=false;this.isOutOfBound=false;return this.callParent(arguments)},getValue:function(){var a=this.getMomentum(),j=this.getBounce(),e=a.getStartVelocity(),f=e>0?1:-1,g=this.getMinMomentumValue(),d=this.getMaxMomentumValue(),c=(f==1)?d:g,h=this.lastValue,i,b;if(e===0){return this.getStartValue()}if(!this.isOutOfBound){i=a.getValue();b=a.getVelocity();if(Math.abs(b)<this.getMinVelocity()){this.isEnded=true}if(i>=g&&i<=d){return i}this.isOutOfBound=true;j.setStartTime(Ext.Date.now()).setStartVelocity(b).setStartValue(c)}i=j.getValue();if(!this.isEnded){if(!this.isBouncingBack){if(h!==null){if((f==1&&i<h)||(f==-1&&i>h)){this.isBouncingBack=true}}}else{if(Math.round(i)==c){this.isEnded=true}}}this.lastValue=i;return i}});Ext.define("Ext.fx.easing.EaseIn",{extend:"Ext.fx.easing.Linear",alias:"easing.ease-in",config:{exponent:4,duration:1500},getValue:function(){var c=Ext.Date.now()-this.getStartTime(),g=this.getDuration(),b=this.getStartValue(),a=this.getEndValue(),h=this.distance,e=c/g,d=Math.pow(e,this.getExponent()),f=b+(d*h);if(c>=g){this.isEnded=true;return a}return f}});Ext.define("Ext.fx.easing.EaseOut",{extend:"Ext.fx.easing.Linear",alias:"easing.ease-out",config:{exponent:4,duration:1500},getValue:function(){var f=Ext.Date.now()-this.getStartTime(),d=this.getDuration(),b=this.getStartValue(),h=this.getEndValue(),a=this.distance,c=f/d,g=1-c,e=1-Math.pow(g,this.getExponent()),i=b+(e*a);if(f>=d){this.isEnded=true;return h}return i}});Ext.define("Ext.mixin.Filterable",{extend:"Ext.mixin.Mixin",requires:["Ext.util.Filter"],mixinConfig:{id:"filterable"},config:{filters:null,filterRoot:null},dirtyFilterFn:false,filterFn:null,filtered:false,applyFilters:function(a,b){if(!b){b=this.createFiltersCollection()}b.clear();this.filtered=false;this.dirtyFilterFn=true;if(a){this.addFilters(a)}return b},createFiltersCollection:function(){this._filters=Ext.create("Ext.util.Collection",function(a){return a.getId()});return this._filters},addFilter:function(a){this.addFilters([a])},addFilters:function(b){var a=this.getFilters();return this.insertFilters(a?a.length:0,b)},insertFilter:function(a,b){return this.insertFilters(a,[b])},insertFilters:function(h,c){if(!Ext.isArray(c)){c=[c]}var j=c.length,a=this.getFilterRoot(),d=this.getFilters(),e=[],f,g,b;if(!d){d=this.createFiltersCollection()}for(g=0;g<j;g++){b=c[g];f={root:a};if(Ext.isFunction(b)){f.filterFn=b}else{if(Ext.isObject(b)){if(!b.isFilter){if(b.fn){b.filterFn=b.fn;delete b.fn}f=Ext.apply(f,b)}else{e.push(b);if(!b.getRoot()){b.setRoot(a)}continue}}}b=Ext.create("Ext.util.Filter",f);e.push(b)}for(g=0,j=e.length;g<j;g++){d.insert(h+g,e[g])}this.dirtyFilterFn=true;if(d.length){this.filtered=true}return d},removeFilters:function(e){if(!Ext.isArray(e)){e=[e]}var d=e.length,c=this.getFilters(),a,b;for(a=0;a<d;a++){b=e[a];if(typeof b==="string"){c.each(function(f){if(f.getProperty()===b){c.remove(f)}})}else{if(typeof b==="function"){c.each(function(f){if(f.getFilterFn()===b){c.remove(f)}})}else{if(b.isFilter){c.remove(b)}else{if(b.property!==undefined&&b.value!==undefined){c.each(function(f){if(f.getProperty()===b.property&&f.getValue()===b.value){c.remove(f)}})}}}}}if(!c.length){this.filtered=false}},updateFilterFn:function(){var a=this.getFilters().items;this.filterFn=function(h){var f=true,g=a.length,b;for(b=0;b<g;b++){var e=a[b],d=e.getFilterFn(),c=e.getScope()||this;f=f&&d.call(c,h)}return f};this.dirtyFilterFn=false;return this.filterFn},filter:function(a){return this.getFilters().length?Ext.Array.filter(a,this.getFilterFn()):a},isFiltered:function(a){return this.getFilters().length?!this.getFilterFn()(a):false},getFilterFn:function(){if(this.dirtyFilterFn){return this.updateFilterFn()}return this.filterFn}});Ext.define("Ext.mixin.Observable",{requires:["Ext.event.Dispatcher"],extend:"Ext.mixin.Mixin",mixins:["Ext.mixin.Identifiable"],mixinConfig:{id:"observable",hooks:{destroy:"destroy"}},alternateClassName:"Ext.util.Observable",isObservable:true,observableType:"observable",validIdRegex:/^([\w\-]+)$/,observableIdPrefix:"#",listenerOptionsRegex:/^(?:delegate|single|delay|buffer|args|prepend)$/,config:{listeners:null,bubbleEvents:null},constructor:function(a){this.initConfig(a)},applyListeners:function(a){if(a){this.addListener(a)}},applyBubbleEvents:function(a){if(a){this.enableBubble(a)}},getOptimizedObservableId:function(){return this.observableId},getObservableId:function(){if(!this.observableId){var a=this.getUniqueId();this.observableId=this.observableIdPrefix+a;this.getObservableId=this.getOptimizedObservableId}return this.observableId},getOptimizedEventDispatcher:function(){return this.eventDispatcher},getEventDispatcher:function(){if(!this.eventDispatcher){this.eventDispatcher=Ext.event.Dispatcher.getInstance();this.getEventDispatcher=this.getOptimizedEventDispatcher;this.getListeners();this.getBubbleEvents()}return this.eventDispatcher},getManagedListeners:function(c,b){var d=c.getUniqueId(),a=this.managedListeners;if(!a){this.managedListeners=a={}}if(!a[d]){a[d]={};c.doAddListener("destroy","clearManagedListeners",this,{single:true,args:[c]})}if(!a[d][b]){a[d][b]=[]}return a[d][b]},getUsedSelectors:function(){var a=this.usedSelectors;if(!a){a=this.usedSelectors=[];a.$map={}}return a},fireEvent:function(a){var b=Array.prototype.slice.call(arguments,1);return this.doFireEvent(a,b)},fireAction:function(c,e,g,f,d,a){var b=typeof g,h;if(e===undefined){e=[]}if(b!="undefined"){h={fn:g,isLateBinding:b=="string",scope:f||this,options:d||{},order:a}}return this.doFireEvent(c,e,h)},doFireEvent:function(b,c,e,a){if(this.eventFiringSuspended){return}var f=this.getObservableId(),d=this.getEventDispatcher();return d.dispatchEvent(this.observableType,f,b,c,e,a)},doAddListener:function(a,i,k,l,c){var e=(k&&k!==this&&k.isIdentifiable),b=this.getUsedSelectors(),f=b.$map,d=this.getObservableId(),g,j,h;if(!l){l={}}if(!k){k=this}if(l.delegate){h=l.delegate;d+=" "+h}if(!(d in f)){f[d]=true;b.push(d)}g=this.addDispatcherListener(d,a,i,k,l,c);if(g&&e){j=this.getManagedListeners(k,a);j.push({delegate:h,scope:k,fn:i,order:c})}return g},addDispatcherListener:function(b,d,f,e,c,a){return this.getEventDispatcher().addListener(this.observableType,b,d,f,e,c,a)},doRemoveListener:function(b,k,m,n,d){var g=(m&&m!==this&&m.isIdentifiable),e=this.getObservableId(),a,l,f,h,c,j;if(n&&n.delegate){j=n.delegate;e+=" "+j}if(!m){m=this}a=this.removeDispatcherListener(e,b,k,m,d);if(a&&g){l=this.getManagedListeners(m,b);for(f=0,h=l.length;f<h;f++){c=l[f];if(c.fn===k&&c.scope===m&&c.delegate===j&&c.order===d){l.splice(f,1);break}}}return a},removeDispatcherListener:function(b,c,e,d,a){return this.getEventDispatcher().removeListener(this.observableType,b,c,e,d,a)},clearManagedListeners:function(d){var j=this.managedListeners,a,c,h,f,e,g,b,k;if(!j){return this}if(d){if(typeof d!="string"){a=d.getUniqueId()}else{a=d}c=j[a];for(f in c){if(c.hasOwnProperty(f)){h=c[f];for(e=0,g=h.length;e<g;e++){b=h[e];k={};if(b.delegate){k.delegate=b.delegate}if(this.doRemoveListener(f,b.fn,b.scope,k,b.order)){e--;g--}}}}delete j[a];return this}for(a in j){if(j.hasOwnProperty(a)){this.clearManagedListeners(a)}}},changeListener:function(l,h,n,p,q,d){var b,m,g,j,a,o,f,k,c,e;if(typeof n!="undefined"){if(typeof h!="string"){for(f=0,k=h.length;f<k;f++){a=h[f];l.call(this,a,n,p,q,d)}return this}l.call(this,h,n,p,q,d)}else{if(Ext.isArray(h)){m=h;for(f=0,k=m.length;f<k;f++){c=m[f];l.call(this,c.event,c.fn,c.scope,c,c.order)}}else{g=this.listenerOptionsRegex;q=h;b=[];m=[];j={};for(a in q){o=q[a];if(a==="scope"){p=o;continue}else{if(a==="order"){d=o;continue}}if(!g.test(a)){e=typeof o;if(e!="string"&&e!="function"){l.call(this,a,o.fn,o.scope||p,o,o.order||d);continue}b.push(a);m.push(o)}else{j[a]=o}}for(f=0,k=b.length;f<k;f++){l.call(this,b[f],m[f],p,j,d)}}}},addListener:function(b,e,d,c,a){return this.changeListener(this.doAddListener,b,e,d,c,a)},addBeforeListener:function(a,d,c,b){return this.addListener(a,d,c,b,"before")},addAfterListener:function(a,d,c,b){return this.addListener(a,d,c,b,"after")},removeListener:function(b,e,d,c,a){return this.changeListener(this.doRemoveListener,b,e,d,c,a)},removeBeforeListener:function(a,d,c,b){return this.removeListener(a,d,c,b,"before")},removeAfterListener:function(a,d,c,b){return this.removeListener(a,d,c,b,"after")},clearListeners:function(){var e=this.getUsedSelectors(),c=this.getEventDispatcher(),b,d,a;for(b=0,d=e.length;b<d;b++){a=e[b];c.clearListeners(this.observableType,a)}},hasListener:function(a){return this.getEventDispatcher().hasListener(this.observableType,this.getObservableId(),a)},suspendEvents:function(a){this.eventFiringSuspended=true},resumeEvents:function(){this.eventFiringSuspended=false},relayEvents:function(b,d,g){var c,f,e,a;if(typeof g=="undefined"){g=""}if(typeof d=="string"){d=[d]}if(Ext.isArray(d)){for(c=0,f=d.length;c<f;c++){e=d[c];a=g+e;b.addListener(e,this.createEventRelayer(a),this)}}else{for(e in d){if(d.hasOwnProperty(e)){a=g+d[e];b.addListener(e,this.createEventRelayer(a),this)}}}return this},relayEvent:function(e,f,h,i,a){var g=typeof f,c=e[e.length-1],d=c.getInfo().eventName,b;e=Array.prototype.slice.call(e,0,-2);e[0]=this;if(g!="undefined"){b={fn:f,scope:h||this,options:i||{},order:a,isLateBinding:g=="string"}}return this.doFireEvent(d,e,b,c)},createEventRelayer:function(a){return function(){return this.doFireEvent(a,Array.prototype.slice.call(arguments,0,-2))}},enableBubble:function(d){var a=this.isBubblingEnabled,c,e,b;if(!a){a=this.isBubblingEnabled={}}if(typeof d=="string"){d=Ext.Array.clone(arguments)}for(c=0,e=d.length;c<e;c++){b=d[c];if(!a[b]){a[b]=true;this.addListener(b,this.createEventBubbler(b),this)}}},createEventBubbler:function(a){return function b(){var c=("getBubbleTarget" in this)?this.getBubbleTarget():null;if(c&&c!==this&&c.isObservable){c.fireAction(a,Array.prototype.slice.call(arguments,0,-2),b,c,null,"after")}}},getBubbleTarget:function(){return false},destroy:function(){if(this.observableId){this.fireEvent("destroy",this);this.clearListeners();this.clearManagedListeners()}},addEvents:Ext.emptyFn},function(){this.createAlias({on:"addListener",un:"removeListener",onBefore:"addBeforeListener",onAfter:"addAfterListener",unBefore:"removeBeforeListener",unAfter:"removeAfterListener"})});Ext.define("Ext.Evented",{alternateClassName:"Ext.EventedBase",mixins:["Ext.mixin.Observable"],statics:{generateSetter:function(e){var c=e.internal,b=e.apply,a=e.changeEvent,d=e.doSet;return function(h){var i=this.initialized,g=this[c],f=this[b];if(f){h=f.call(this,h,g);if(typeof h=="undefined"){return this}}if(h!==g){if(i){this.fireAction(a,[this,h,g],this.doSet,this,{nameMap:e})}else{this[c]=h;this[d].call(this,h,g)}}return this}}},initialized:false,constructor:function(a){this.initialConfig=a;this.initialize()},initialize:function(){this.initConfig(this.initialConfig);this.initialized=true},doSet:function(c,d,b,a){var e=a.nameMap;c[e.internal]=d;c[e.doSet].call(this,d,b)},onClassExtended:function(a,e){if(!e.hasOwnProperty("eventedConfig")){return}var d=Ext.Class,c=e.config,g=e.eventedConfig,b,f;e.config=(c)?Ext.applyIf(c,g):g;for(b in g){if(g.hasOwnProperty(b)){f=d.getConfigNameMap(b);e[f.set]=this.generateSetter(f)}}}});Ext.define("Ext.AbstractComponent",{extend:"Ext.Evented",onClassExtended:function(b,f){if(!f.hasOwnProperty("cachedConfig")){return}var g=b.prototype,c=f.config,e=f.cachedConfig,d=g.cachedConfigList,i=g.hasCachedConfig,a,h;delete f.cachedConfig;g.cachedConfigList=d=(d)?d.slice():[];g.hasCachedConfig=i=(i)?Ext.Object.chain(i):{};if(!c){f.config=c={}}for(a in e){if(e.hasOwnProperty(a)){h=e[a];if(!i[a]){i[a]=true;d.push(a)}c[a]=h}}},getElementConfig:Ext.emptyFn,referenceAttributeName:"reference",referenceSelector:"[reference]",addReferenceNode:function(a,b){Ext.Object.defineProperty(this,a,{get:function(){var c;delete this[a];this[a]=c=new Ext.Element(b);return c},configurable:true})},initElement:function(){var k=this.self.prototype,n=this.getId(),s=[],g=true,x=this.referenceAttributeName,p=false,e,v,b,o,t,d,l,c,f,j,w,m,a,q,h,y,u,r;if(k.hasOwnProperty("renderTemplate")){e=this.renderTemplate.cloneNode(true);v=e.firstChild}else{g=false;p=true;e=document.createDocumentFragment();v=Ext.Element.create(this.getElementConfig(),true);e.appendChild(v)}o=e.querySelectorAll(this.referenceSelector);for(t=0,d=o.length;t<d;t++){l=o[t];c=l.getAttribute(x);if(g){l.removeAttribute(x)}if(c=="element"){l.id=n;this.element=b=new Ext.Element(l)}else{this.addReferenceNode(c,l)}s.push(c)}this.referenceList=s;if(!this.innerElement){this.innerElement=b}if(v===b.dom){this.renderElement=b}else{this.addReferenceNode("renderElement",v)}if(p){f=Ext.Class.configNameCache;j=this.config;w=this.cachedConfigList;m=this.initConfigList;a=this.initConfigMap;q=[];for(t=0,d=w.length;t<d;t++){y=w[t];u=f[y];if(a[y]){a[y]=false;Ext.Array.remove(m,y)}if(j[y]!==null){q.push(y);this[u.get]=this[u.initGet]}}for(t=0,d=q.length;t<d;t++){y=q[t];u=f[y];r=u.internal;this[r]=null;this[u.set].call(this,j[y]);delete this[u.get];k[r]=this[r]}v=this.renderElement.dom;k.renderTemplate=e=document.createDocumentFragment();e.appendChild(v.cloneNode(true));h=e.querySelectorAll("[id]");for(t=0,d=h.length;t<d;t++){b=h[t];b.removeAttribute("id")}for(t=0,d=s.length;t<d;t++){c=s[t];this[c].dom.removeAttribute("reference")}}return this}});Ext.define("Ext.app.Controller",{mixins:{observable:"Ext.mixin.Observable"},config:{refs:{},routes:{},control:{},before:{},application:{},stores:[],models:[],views:[]},constructor:function(a){this.initConfig(a);this.mixins.observable.constructor.call(this,a)},init:Ext.emptyFn,launch:Ext.emptyFn,redirectTo:function(a){return this.getApplication().redirectTo(a)},execute:function(b,a){b.setBeforeFilters(this.getBefore()[b.getAction()]);b.execute()},applyBefore:function(e){var d,a,c,b;for(a in e){d=Ext.Array.from(e[a]);c=d.length;for(b=0;b<c;b++){d[b]=this[d[b]]}e[a]=d}return e},applyControl:function(a){this.control(a,this);return a},applyRefs:function(a){this.ref(a);return a},applyRoutes:function(a){var f=this instanceof Ext.app.Application?this:this.getApplication(),c=f.getRouter(),b,e,d;for(e in a){b=a[e];d={controller:this.$className};if(Ext.isString(b)){d.action=b}else{Ext.apply(d,b)}c.connect(e,d)}return a},applyStores:function(a){return this.getFullyQualified(a,"store")},applyModels:function(a){return this.getFullyQualified(a,"model")},applyViews:function(a){return this.getFullyQualified(a,"view")},getFullyQualified:function(b,e){var f=b.length,a=this.getApplication().getName(),c,d;for(d=0;d<f;d++){c=b[d];if(Ext.isString(c)&&(Ext.Loader.getPrefix(c)===""||c===a)){b[d]=a+"."+e+"."+c}}return b},control:function(a){this.getApplication().control(a,this)},ref:function(b){var e,c,a,d;for(e in b){a=b[e];c="get"+Ext.String.capitalize(e);if(!this[c]){if(Ext.isString(b[e])){d={ref:e,selector:a}}else{d=b[e]}this[c]=Ext.Function.pass(this.getRef,[e,d],this)}this.references=this.references||[];this.references.push(e.toLowerCase())}},getRef:function(d,e,a){this.refCache=this.refCache||{};e=e||{};a=a||{};Ext.apply(e,a);if(e.forceCreate){return Ext.ComponentManager.create(e,"component")}var c=this,b=c.refCache[d];if(!b){c.refCache[d]=b=Ext.ComponentQuery.query(e.selector)[0];if(!b&&e.autoCreate){c.refCache[d]=b=Ext.ComponentManager.create(e,"component")}if(b){b.on("destroy",function(){c.refCache[d]=null})}}return b},hasRef:function(a){return this.references&&this.references.indexOf(a.toLowerCase())!==-1},},function(){});Ext.define("Ext.app.History",{mixins:["Ext.mixin.Observable"],config:{actions:[],updateUrl:true,token:""},constructor:function(a){if(Ext.feature.has.History){window.addEventListener("hashchange",Ext.bind(this.detectStateChange,this))}else{setInterval(Ext.bind(this.detectStateChange,this),50)}this.initConfig(a)},add:function(c,a){this.getActions().push(Ext.factory(c,Ext.app.Action));var b=c.getUrl();if(this.getUpdateUrl()){this.setToken(b);window.location.hash=b}if(a!==true){this.fireEvent("change",b)}this.setToken(b)},back:function(){this.getActions().pop().run()},applyToken:function(a){return a[0]=="#"?a.substr(1):a},detectStateChange:function(){var b=this.applyToken(window.location.hash),a=this.getToken();if(b!=a){this.onStateChange();this.setToken(b)}},onStateChange:function(){this.fireEvent("change",window.location.hash.substr(1))}});Ext.define("Ext.app.Profile",{mixins:{observable:"Ext.mixin.Observable"},config:{namespace:"auto",name:"auto",controllers:[],models:[],views:[],stores:[],application:null},constructor:function(a){this.initConfig(a);this.mixins.observable.constructor.apply(this,arguments)},isActive:function(){return false},launch:Ext.emptyFn,applyNamespace:function(a){if(a=="auto"){a=this.getName()}return a.toLowerCase()},applyName:function(a){if(a=="auto"){var b=this.$className.split(".");a=b[b.length-1]}return a},getDependencies:function(){var c=[],g=Ext.String.format,b=this.getApplication().getName(),d=this.getNamespace(),f={model:this.getModels(),view:this.getViews(),controller:this.getControllers(),store:this.getStores()},e,h,a;for(e in f){h=[];Ext.each(f[e],function(i){if(Ext.isString(i)){if(i.match("\\.")){a=i}else{a=g("{0}.{1}.{2}.{3}",b,e,d,i)}h.push(a);c.push(a)}});f[e]=h}f.all=c;return f}});Ext.define("Ext.app.Application",{extend:"Ext.app.Controller",requires:["Ext.app.History","Ext.app.Profile","Ext.app.Router","Ext.app.Action"],config:{profiles:[],controllers:[],history:{},name:null,appFolder:"app",router:{},controllerInstances:[],profileInstances:[],currentProfile:null,launch:Ext.emptyFn,enableLoader:true},constructor:function(a){a=a||{};Ext.applyIf(a,{application:this});this.initConfig(a);for(var b in a){this[b]=a[b]}if(this.getEnableLoader()!==false){Ext.require(this.getProfiles(),this.onProfilesLoaded,this)}},dispatch:function(e,d){e=e||{};Ext.applyIf(e,{application:this});e=Ext.factory(e,Ext.app.Action);if(e){var c=this.getCurrentProfile(),b=c?c.getNamespace():undefined,a=this.getController(e.getController(),b);if(a){if(d!==false){this.getHistory().add(e,true)}a.execute(e)}}},redirectTo:function(c){if(Ext.data&&Ext.data.Model&&c instanceof Ext.data.Model){var a=c;c=a.toUrl()}var b=this.getRouter().recognize(c);if(b){b.url=c;if(a){b.data={};b.data.record=a}return this.dispatch(b)}},control:function(h,d){d=d||this;var i=this.getEventDispatcher(),g=(d)?d.getRefs():{},c,e,b,f,a;for(c in h){if(h.hasOwnProperty(c)){f=h[c];a=g[c];if(a){c=a.selector||a}for(e in f){b=f[e];if(Ext.isString(b)){b=d[b]}i.addListener("component",c,e,b,d)}}}},getController:function(b,d){var f=this.getControllerInstances(),a=this.getName(),e=Ext.String.format,c;if(b instanceof Ext.app.Controller){return b}if(f[b]){return f[b]}else{c=e("{0}.controller.{1}",a,b);d=e("{0}.controller.{1}.{2}",a,d,b);return f[d]||f[c]}},onProfilesLoaded:function(){var b=this.getProfiles(),e=b.length,g=[],d=this.gatherDependencies(),f,c,a;for(c=0;c<e;c++){g[c]=Ext.create(b[c],{application:this});a=g[c].getDependencies();d=d.concat(a.all);if(g[c].isActive()&&!f){f=g[c];this.setCurrentProfile(f);this.setControllers(this.getControllers().concat(a.controller));this.setModels(this.getModels().concat(a.model));this.setViews(this.getViews().concat(a.view));this.setStores(this.getStores().concat(a.store))}}this.setProfileInstances(g);Ext.require(d,this.loadControllerDependencies,this)},loadControllerDependencies:function(){this.instantiateStores();this.instantiateControllers();var e=this.getControllerInstances(),d=[],c,a,b;for(b in e){a=e[b];d=d.concat(a.getModels().concat(a.getViews()).concat(a.getStores()))}Ext.require(d,this.onDependenciesLoaded,this)},onDependenciesLoaded:function(){var c=this,b=this.getCurrentProfile(),e=this.getLaunch(),d,a;d=this.getControllerInstances();for(a in d){d[a].init(this)}if(b){b.launch()}e.call(c);for(a in d){d[a].launch(this)}c.redirectTo(window.location.hash.substr(1))},gatherDependencies:function(){var a=this.getModels().concat(this.getViews()).concat(this.getControllers());Ext.each(this.getStores(),function(b){if(Ext.isString(b)){a.push(b)}},this);return a},instantiateStores:function(){var b=this.getStores(),f=b.length,c,a,d,g,e;for(e=0;e<f;e++){c=b[e];if(Ext.data&&Ext.data.Store&&!(c instanceof Ext.data.Store)){if(Ext.isString(c)){d=c;a=Ext.ClassManager.classes[c];c={xclass:c};if(a.prototype.defaultConfig.storeId===undefined){g=d.split(".");c.id=g[g.length-1]}}b[e]=Ext.factory(c,Ext.data.Store)}}this.setStores(b)},instantiateControllers:function(){var e=this.getControllers(),d={},c=e.length,a,b;for(b=0;b<c;b++){a=e[b];d[a]=Ext.create(a,{application:this})}return this.setControllerInstances(d)},applyControllers:function(a){return this.getFullyQualified(a,"controller")},applyProfiles:function(a){return this.getFullyQualified(a,"profile")},applyName:function(a){var b;if(a&&a.match(/ /g)){b=a;a=a.replace(/ /g,"")}return a},updateName:function(a){Ext.ClassManager.setNamespace(a+".app",this);if(!Ext.Loader.config.paths[a]){Ext.Loader.setPath(a,this.getAppFolder())}},applyRouter:function(a){return Ext.factory(a,Ext.app.Router,this.getRouter())},applyHistory:function(a){var b=Ext.factory(a,Ext.app.History,this.getHistory());b.on("change",this.onHistoryChange,this);return b},onHistoryChange:function(a){this.dispatch(this.getRouter().recognize(a),false)}},function(){});Ext.define("Ext.data.Batch",{mixins:{observable:"Ext.mixin.Observable"},config:{autoStart:false,pauseOnException:true,proxy:null},current:-1,total:0,isRunning:false,isComplete:false,hasException:false,constructor:function(a){var b=this;b.initConfig(a);b.operations=[]},add:function(a){this.total++;a.setBatch(this);this.operations.push(a)},start:function(){this.hasException=false;this.isRunning=true;this.runNextOperation()},runNextOperation:function(){this.runOperation(this.current+1)},pause:function(){this.isRunning=false},runOperation:function(d){var e=this,c=e.operations,b=c[d],a;if(b===undefined){e.isRunning=false;e.isComplete=true;e.fireEvent("complete",e,c[c.length-1])}else{e.current=d;a=function(f){var g=f.hasException();if(g){e.hasException=true;e.fireEvent("exception",e,f)}else{e.fireEvent("operationcomplete",e,f)}if(g&&e.getPauseOnException()){e.pause()}else{f.setCompleted();e.runNextOperation()}};b.setStarted();e.getProxy()[b.getAction()](b,a,e)}}});Ext.define("Ext.data.Connection",{mixins:{observable:"Ext.util.Observable"},statics:{requestId:0},config:{url:null,async:true,method:null,username:"",password:"",disableCaching:true,disableCachingParam:"_dc",timeout:30000,extraParams:null,defaultHeaders:null,useDefaultHeader:true,defaultPostHeader:"application/x-www-form-urlencoded; charset=UTF-8",useDefaultXhrHeader:true,defaultXhrHeader:"XMLHttpRequest",autoAbort:false},textAreaRe:/textarea/i,multiPartRe:/multipart\/form-data/i,lineBreakRe:/\r\n/g,constructor:function(a){this.initConfig(a);this.requests={}},request:function(j){j=j||{};var f=this,i=j.scope||window,e=j.username||f.getUsername(),g=j.password||f.getPassword()||"",b,c,d,a,h;if(f.fireEvent("beforerequest",f,j)!==false){c=f.setOptions(j,i);if(this.isFormUpload(j)===true){this.upload(j.form,c.url,c.data,j);return null}if(j.autoAbort===true||f.getAutoAbort()){f.abort()}h=this.getXhrInstance();b=j.async!==false?(j.async||f.getAsync()):false;if(e){h.open(c.method,c.url,b,e,g)}else{h.open(c.method,c.url,b)}a=f.setupHeaders(h,j,c.data,c.params);d={id:++this.self.requestId,xhr:h,headers:a,options:j,async:b,timeout:setTimeout(function(){d.timedout=true;f.abort(d)},j.timeout||f.getTimeout())};f.requests[d.id]=d;if(b){h.onreadystatechange=Ext.Function.bind(f.onStateChange,f,[d])}h.send(c.data);if(!b){return this.onComplete(d)}return d}else{Ext.callback(j.callback,j.scope,[j,undefined,undefined]);return null}},upload:function(e,c,i,k){e=Ext.getDom(e);k=k||{};var d=Ext.id(),g=document.createElement("iframe"),j=[],h="multipart/form-data",f={target:e.target,method:e.method,encoding:e.encoding,enctype:e.enctype,action:e.action},b=function(l,m){a=document.createElement("input");Ext.fly(a).set({type:"hidden",value:m,name:l});e.appendChild(a);j.push(a)},a;Ext.fly(g).set({id:d,name:d,cls:Ext.baseCSSPrefix+"hide-display",src:Ext.SSL_SECURE_URL});document.body.appendChild(g);if(document.frames){document.frames[d].name=d}Ext.fly(e).set({target:d,method:"POST",enctype:h,encoding:h,action:c||f.action});if(i){Ext.iterate(Ext.Object.fromQueryString(i),function(l,m){if(Ext.isArray(m)){Ext.each(m,function(n){b(l,n)})}else{b(l,m)}})}Ext.fly(g).on("load",Ext.Function.bind(this.onUploadComplete,this,[g,k]),null,{single:true});e.submit();Ext.fly(e).set(f);Ext.each(j,function(l){Ext.removeNode(l)})},onUploadComplete:function(h,b){var c=this,a={responseText:"",responseXML:null},g,f;try{g=h.contentWindow.document||h.contentDocument||window.frames[id].document;if(g){if(g.body){if(this.textAreaRe.test((f=g.body.firstChild||{}).tagName)){a.responseText=f.value}else{a.responseText=g.body.innerHTML}}a.responseXML=g.XMLDocument||g}}catch(d){}c.fireEvent("requestcomplete",c,a,b);Ext.callback(b.success,b.scope,[a,b]);Ext.callback(b.callback,b.scope,[b,true,a]);setTimeout(function(){Ext.removeNode(h)},100)},isFormUpload:function(a){var b=this.getForm(a);if(b){return(a.isUpload||(this.multiPartRe).test(b.getAttribute("enctype")))}return false},getForm:function(a){return Ext.getDom(a.form)||null},setOptions:function(k,j){var h=this,e=k.params||{},g=h.getExtraParams(),d=k.urlParams,c=k.url||h.getUrl(),i=k.jsonData,b,a,f;if(Ext.isFunction(e)){e=e.call(j,k)}if(Ext.isFunction(c)){c=c.call(j,k)}c=this.setupUrl(k,c);f=k.rawData||k.xmlData||i||null;if(i&&!Ext.isPrimitive(i)){f=Ext.encode(f)}if(Ext.isObject(e)){e=Ext.Object.toQueryString(e)}if(Ext.isObject(g)){g=Ext.Object.toQueryString(g)}e=e+((g)?((e)?"&":"")+g:"");d=Ext.isObject(d)?Ext.Object.toQueryString(d):d;e=this.setupParams(k,e);b=(k.method||h.getMethod()||((e||f)?"POST":"GET")).toUpperCase();this.setupMethod(k,b);a=k.disableCaching!==false?(k.disableCaching||h.getDisableCaching()):false;if(b==="GET"&&a){c=Ext.urlAppend(c,(k.disableCachingParam||h.getDisableCachingParam())+"="+(new Date().getTime()))}if((b=="GET"||f)&&e){c=Ext.urlAppend(c,e);e=null}if(d){c=Ext.urlAppend(c,d)}return{url:c,method:b,data:f||e||null}},setupUrl:function(b,a){var c=this.getForm(b);if(c){a=a||c.action}return a},setupParams:function(a,d){var c=this.getForm(a),b;if(c&&!this.isFormUpload(a)){b=Ext.Element.serializeForm(c);d=d?(d+"&"+b):b}return d},setupMethod:function(a,b){if(this.isFormUpload(a)){return"POST"}return b},setupHeaders:function(l,m,d,c){var h=this,b=Ext.apply({},m.headers||{},h.getDefaultHeaders()||{}),k=h.getDefaultPostHeader(),i=m.jsonData,a=m.xmlData,j,f;if(!b["Content-Type"]&&(d||c)){if(d){if(m.rawData){k="text/plain"}else{if(a&&Ext.isDefined(a)){k="text/xml"}else{if(i&&Ext.isDefined(i)){k="application/json"}}}}b["Content-Type"]=k}if(h.getUseDefaultXhrHeader()&&!b["X-Requested-With"]){b["X-Requested-With"]=h.getDefaultXhrHeader()}try{for(j in b){if(b.hasOwnProperty(j)){f=b[j];l.setRequestHeader(j,f)}}}catch(g){h.fireEvent("exception",j,f)}if(m.withCredentials){l.withCredentials=m.withCredentials}return b},getXhrInstance:(function(){var b=[function(){return new XMLHttpRequest()},function(){return new ActiveXObject("MSXML2.XMLHTTP.3.0")},function(){return new ActiveXObject("MSXML2.XMLHTTP")},function(){return new ActiveXObject("Microsoft.XMLHTTP")}],c=0,a=b.length,f;for(;c<a;++c){try{f=b[c];f();break}catch(d){}}return f})(),isLoading:function(a){if(!(a&&a.xhr)){return false}var b=a.xhr.readyState;return !(b===0||b==4)},abort:function(b){var a=this,d=a.requests,c;if(b&&a.isLoading(b)){b.xhr.onreadystatechange=null;b.xhr.abort();a.clearTimeout(b);if(!b.timedout){b.aborted=true}a.onComplete(b);a.cleanup(b)}else{if(!b){for(c in d){if(d.hasOwnProperty(c)){a.abort(d[c])}}}}},abortAll:function(){this.abort()},onStateChange:function(a){if(a.xhr.readyState==4){this.clearTimeout(a);this.onComplete(a);this.cleanup(a)}},clearTimeout:function(a){clearTimeout(a.timeout);delete a.timeout},cleanup:function(a){a.xhr=null;delete a.xhr},onComplete:function(f){var d=this,c=f.options,a,h,b;try{a=d.parseStatus(f.xhr.status);if(f.timedout){a.success=false}}catch(g){a={success:false,isException:false}}h=a.success;if(h){b=d.createResponse(f);d.fireEvent("requestcomplete",d,b,c);Ext.callback(c.success,c.scope,[b,c])}else{if(a.isException||f.aborted||f.timedout){b=d.createException(f)}else{b=d.createResponse(f)}d.fireEvent("requestexception",d,b,c);Ext.callback(c.failure,c.scope,[b,c])}Ext.callback(c.callback,c.scope,[c,h,b]);delete d.requests[f.id];return b},parseStatus:function(a){a=a==1223?204:a;var c=(a>=200&&a<300)||a==304||a==0,b=false;if(!c){switch(a){case 12002:case 12029:case 12030:case 12031:case 12152:case 13030:b=true;break}}return{success:c,isException:b}},createResponse:function(c){var g=c.xhr,a={},h,d,i,e,f,b;if(c.timedout||c.aborted){c.success=false;h=[]}else{h=g.getAllResponseHeaders().replace(this.lineBreakRe,"\n").split("\n")}d=h.length;while(d--){i=h[d];e=i.indexOf(":");if(e>=0){f=i.substr(0,e).toLowerCase();if(i.charAt(e+1)==" "){++e}a[f]=i.substr(e+1)}}c.xhr=null;delete c.xhr;b={request:c,requestId:c.id,status:g.status,statusText:g.statusText,getResponseHeader:function(j){return a[j.toLowerCase()]},getAllResponseHeaders:function(){return a},responseText:g.responseText,responseXML:g.responseXML};g=null;return b},createException:function(a){return{request:a,requestId:a.id,status:a.aborted?-1:0,statusText:a.aborted?"transaction aborted":"communication failure",aborted:a.aborted,timedout:a.timedout}}});Ext.define("Ext.Ajax",{extend:"Ext.data.Connection",singleton:true,autoAbort:false});Ext.define("Ext.data.reader.Reader",{requires:["Ext.data.ResultSet"],alternateClassName:["Ext.data.Reader","Ext.data.DataReader"],mixins:["Ext.mixin.Observable"],isReader:true,config:{idProperty:undefined,clientIdProperty:"clientId",totalProperty:"total",successProperty:"success",messageProperty:null,rootProperty:"",implicitIncludes:true,model:undefined},constructor:function(a){this.initConfig(a)},fieldCount:0,applyModel:function(a){if(typeof a=="string"){a=Ext.data.ModelManager.getModel(a);if(!a){Ext.Logger.error("Model with name "+arguments[0]+" doesnt exist.")}}if(a&&!a.prototype.isModel&&Ext.isObject(a)){a=Ext.data.ModelManager.registerType(a.storeId||a.id||Ext.id(),a)}return a},applyIdProperty:function(a){if(!a&&this.getModel()){a=this.getModel().getIdProperty()}return a},updateModel:function(a){if(a){if(!this.getIdProperty()){this.setIdProperty(a.getIdProperty())}this.buildExtractors()}},createAccessor:Ext.emptyFn,createFieldAccessExpression:function(){return"undefined"},buildExtractors:function(){if(!this.getModel()){return}var b=this,c=b.getTotalProperty(),a=b.getSuccessProperty(),d=b.getMessageProperty();if(c){b.getTotal=b.createAccessor(c)}if(a){b.getSuccess=b.createAccessor(a)}if(d){b.getMessage=b.createAccessor(d)}b.extractRecordData=b.buildRecordDataExtractor()},buildRecordDataExtractor:function(){var k=this,e=k.getModel(),g=e.getFields(),j=g.length,a=[],h=k.getModel().getClientIdProperty(),f="__field",b=["var me = this,\n","    fields = me.getModel().getFields(),\n","    idProperty = me.getIdProperty(),\n",'    idPropertyIsFn = (typeof idProperty == "function"),',"    value,\n","    internalId"],d,l,c,m;g=g.items;for(d=0;d<j;d++){l=g[d];m=l.getName();if(m===e.getIdProperty()){a[d]="idField"}else{a[d]=f+d}b.push(",\n    ",a[d],' = fields.get("',l.getName(),'")')}b.push(";\n\n    return function(source) {\n        var dest = {};\n");b.push("        if (idPropertyIsFn) {\n");b.push("            idField.setMapping(idProperty);\n");b.push("        }\n");for(d=0;d<j;d++){l=g[d];c=a[d];m=l.getName();if(m===e.getIdProperty()&&l.getMapping()===null){l.setMapping(this.getIdProperty())}b.push('        dest["'+l.getName()+'"]'," = ",k.createFieldAccessExpression(l,c,"source"),";\n")}if(h){b.push("        internalId = "+k.createFieldAccessExpression(Ext.create("Ext.data.Field",{name:h}),null,"source")+";\n");b.push("        if (internalId !== undefined) {\n");b.push('            dest["_clientId"] = internalId;\n        }\n')}b.push("        return dest;\n");b.push("    };");return Ext.functionFactory(b.join("")).call(k)},getFields:function(){return this.getModel().getFields().items},getData:function(a){return a},getResponseData:function(a){return a},getRoot:function(a){return a},read:function(c){var g=c,h=this.getModel(),e,b,d,f,a;if(c){g=this.getResponseData(c)}if(g){e=this.readRecords(g);b=e.getRecords();for(d=0,f=b.length;d<f;d++){a=b[d];b[d]=new h(a.data,a.id,a.node)}return e}else{return this.nullResultSet}},process:function(a){var b=a;if(a){b=this.getResponseData(a)}if(b){return this.readRecords(b)}else{return this.nullResultSet}},readRecords:function(c){var d=this;d.rawData=c;c=d.getData(c);if(c.metaData){d.onMetaChange(c.metaData)}var f=Ext.isArray(c)?c:d.getRoot(c),h=true,b=0,e,g,a,i;if(d.getTotalProperty()){g=parseInt(d.getTotal(c),10);if(!isNaN(g)){e=g}}if(d.getSuccessProperty()){g=d.getSuccess(c);if(g===false||g==="false"){h=false}}if(d.getMessageProperty()){i=d.getMessage(c)}if(f){a=d.extractData(f);b=a.length}else{b=0;a=[]}return new Ext.data.ResultSet({total:e,count:b,records:a,success:h,message:i})},extractData:function(l){var j=this,e=[],c=l.length,h=j.getModel(),m=h.getIdProperty(),k=h.getFields(),d,g,f,b,a;if(k.isDirty){j.buildExtractors(true);delete k.isDirty}if(!l.length&&Ext.isObject(l)){l=[l];c=1}for(g=0;g<c;g++){a=null;b=null;d=l[g];f=j.extractRecordData(d);if(f._clientId!==undefined){a=f._clientId;delete f._clientId}if(f[m]!==undefined){b=f[m]}if(j.getImplicitIncludes()){j.readAssociated(f,d)}e.push({clientId:a,id:b,data:f,node:d})}return e},readAssociated:function(h,g){var e=this.getModel().associations.items,d=0,f=e.length,a,c,b;for(;d<f;d++){a=e[d];b=a.getAssociationKey();c=this.getAssociatedDataRoot(g,b);if(c){h[b]=c}}},getAssociatedDataRoot:function(b,a){return b[a]},onMetaChange:function(f){var a=f.fields,e=this,d,c,b;e.metaData=f;if(f.rootProperty!==undefined){e.setRootProperty(f.rootProperty)}else{if(f.root!==undefined){e.setRootProperty(f.root)}}if(f.idProperty!==undefined){e.setIdProperty(f.idProperty)}if(f.totalProperty!==undefined){e.setTotalProperty(f.totalProperty)}if(f.successProperty!==undefined){e.setSuccessProperty(f.successProperty)}if(f.messageProperty!==undefined){e.setMessageProperty(f.messageProperty)}if(a){if(e.getModel()){e.getModel().setFields(a);e.buildExtractors()}else{b=e.getIdProperty();c={fields:a};if(b){c.idProperty=b}d=Ext.define("Ext.data.reader.MetaModel"+Ext.id(),{extend:"Ext.data.Model",config:c});e.setModel(d)}}else{e.buildExtractors()}}},function(){Ext.apply(this.prototype,{nullResultSet:new Ext.data.ResultSet({total:0,count:0,records:[],success:true})})});Ext.define("Ext.data.reader.Json",{extend:"Ext.data.reader.Reader",alternateClassName:"Ext.data.JsonReader",alias:"reader.json",config:{record:null,useSimpleAccessors:false},objectRe:/[\[\.]/,getResponseData:function(a){var d=a;if(a&&a.responseText){d=a.responseText}if(typeof d!=="string"){return d}var c;try{c=Ext.decode(d)}catch(b){this.fireEvent("exception",this,a,"Unable to parse the JSON returned by the server: "+b.toString());Ext.Logger.warn("Unable to parse the JSON returned by the server: "+b.toString())}return c},buildExtractors:function(){var b=this,a=b.getRootProperty();b.callParent(arguments);if(a){b.rootAccessor=b.createAccessor(a)}else{delete b.rootAccessor}},getRoot:function(b){var a=this.getModel().getFields();if(a.isDirty){this.buildExtractors(true);delete a.isDirty}if(this.rootAccessor){return this.rootAccessor.call(this,b)}else{return b}},extractData:function(a){var e=this.getRecord(),d=[],c,b;if(e){c=a.length;if(!c&&Ext.isObject(a)){c=1;a=[a]}for(b=0;b<c;b++){d[b]=a[b][e]}}else{d=a}return this.callParent([d])},createAccessor:function(){var a=/[\[\.]/;return function(c){if(Ext.isEmpty(c)){return Ext.emptyFn}if(Ext.isFunction(c)){return c}if(this.getUseSimpleAccessors()!==true){var b=String(c).search(a);if(b>=0){return Ext.functionFactory("obj","var value; try {value = obj"+(b>0?".":"")+c+"} catch(e) {}; return value;")}}return function(d){return d[c]}}}(),createFieldAccessExpression:function(g,b,c){var f=this,h=f.objectRe,e=(g.getMapping()!==null),a=e?g.getMapping():g.getName(),i,d;if(typeof a==="function"){i=b+".getMapping()("+c+", this)"}else{if(f.getUseSimpleAccessors()===true||((d=String(a).search(h))<0)){if(!e||isNaN(a)){a='"'+a+'"'}i=c+"["+a+"]"}else{i=c+(d>0?".":"")+a}}return i}});Ext.define("Ext.data.proxy.Proxy",{extend:"Ext.Evented",alias:"proxy.proxy",alternateClassName:["Ext.data.DataProxy","Ext.data.Proxy"],requires:["Ext.data.reader.Json","Ext.data.writer.Json"],uses:["Ext.data.Batch","Ext.data.Operation","Ext.data.Model"],config:{batchOrder:"create,update,destroy",batchActions:true,model:null,reader:{type:"json"},writer:{type:"json"}},isProxy:true,applyModel:function(a){if(typeof a=="string"){a=Ext.data.ModelManager.getModel(a);if(!a){Ext.Logger.error("Model with name "+arguments[0]+" doesnt exist.")}}if(a&&!a.prototype.isModel&&Ext.isObject(a)){a=Ext.data.ModelManager.registerType(a.storeId||a.id||Ext.id(),a)}return a},updateModel:function(b){if(b){var a=this.getReader();if(a&&!a.getModel()){a.setModel(b)}}},applyReader:function(b,a){return Ext.factory(b,Ext.data.Reader,a,"reader")},updateReader:function(a){if(a){var b=this.getModel();if(!b){b=a.getModel();if(b){this.setModel(b)}}else{a.setModel(b)}if(a.onMetaChange){a.onMetaChange=Ext.Function.createSequence(a.onMetaChange,this.onMetaChange,this)}}},onMetaChange:function(b){var a=this.getReader().getModel();if(!this.getModel()&&a){this.setModel(a)}this.fireEvent("metachange",this,b)},applyWriter:function(b,a){return Ext.factory(b,Ext.data.Writer,a,"writer")},create:Ext.emptyFn,read:Ext.emptyFn,update:Ext.emptyFn,destroy:Ext.emptyFn,onDestroy:function(){Ext.destroy(this.getReader(),this.getWriter())},batch:function(e,f){var g=this,d=g.getBatchActions(),c=this.getModel(),b,a;if(e.operations===undefined){e={operations:e,batch:{listeners:f}}}if(e.batch){if(e.batch.isBatch){e.batch.setProxy(g)}else{e.batch.proxy=g}}else{e.batch={proxy:g,listeners:e.listeners||{}}}if(!b){b=new Ext.data.Batch(e.batch)}b.on("complete",Ext.bind(g.onBatchComplete,g,[e],0));Ext.each(g.getBatchOrder().split(","),function(h){a=e.operations[h];if(a){if(d){b.add(new Ext.data.Operation({action:h,records:a,model:c}))}else{Ext.each(a,function(i){b.add(new Ext.data.Operation({action:h,records:[i],model:c}))})}}},g);b.start();return b},onBatchComplete:function(a,b){var c=a.scope||this;if(b.hasException){if(Ext.isFunction(a.failure)){Ext.callback(a.failure,c,[b,a])}}else{if(Ext.isFunction(a.success)){Ext.callback(a.success,c,[b,a])}}if(Ext.isFunction(a.callback)){Ext.callback(a.callback,c,[b,a])}}},function(){});Ext.define("Ext.data.proxy.Client",{extend:"Ext.data.proxy.Proxy",alternateClassName:"Ext.proxy.ClientProxy",clear:function(){}});Ext.define("Ext.data.proxy.Memory",{extend:"Ext.data.proxy.Client",alias:"proxy.memory",alternateClassName:"Ext.data.MemoryProxy",isMemoryProxy:true,config:{data:[]},finishOperation:function(b,f,d){if(b){var c=0,e=b.getRecords(),a=e.length;for(c;c<a;c++){e[c].commit()}b.setSuccessful();Ext.callback(f,d||this,[b])}},create:function(){this.finishOperation.apply(this,arguments)},update:function(){this.finishOperation.apply(this,arguments)},destroy:function(){this.finishOperation.apply(this,arguments)},read:function(b,e,c){var d=this,a=d.getReader();if(b.process("read",a.process(d.getData()))===false){this.fireEvent("exception",this,null,b)}Ext.callback(e,c||d,[b])},clear:Ext.emptyFn});Ext.define("Ext.data.proxy.Server",{extend:"Ext.data.proxy.Proxy",alias:"proxy.server",alternateClassName:"Ext.data.ServerProxy",requires:["Ext.data.Request"],config:{url:null,pageParam:"page",startParam:"start",limitParam:"limit",groupParam:"group",sortParam:"sort",filterParam:"filter",directionParam:"dir",enablePagingParams:true,simpleSortMode:false,noCache:true,cacheString:"_dc",timeout:30000,api:{create:undefined,read:undefined,update:undefined,destroy:undefined},extraParams:{}},constructor:function(a){a=a||{};if(a.nocache!==undefined){a.noCache=a.nocache}this.callParent([a])},create:function(){return this.doRequest.apply(this,arguments)},read:function(){return this.doRequest.apply(this,arguments)},update:function(){return this.doRequest.apply(this,arguments)},destroy:function(){return this.doRequest.apply(this,arguments)},setExtraParam:function(a,b){this.getExtraParams()[a]=b},buildRequest:function(a){var c=this,d=Ext.applyIf(a.getParams()||{},c.getExtraParams()||{}),b;d=Ext.applyIf(d,c.getParams(a));b=Ext.create("Ext.data.Request",{params:d,action:a.getAction(),records:a.getRecords(),url:a.getUrl(),operation:a,proxy:c});b.setUrl(c.buildUrl(b));a.setRequest(b);return b},processResponse:function(k,b,d,c,j,l){var h=this,a=b.getAction(),f,i;if(k===true){f=h.getReader();try{i=f.process(c)}catch(g){b.setException(g.message);h.fireEvent("exception",this,c,b);return}if(!b.getModel()){b.setModel(this.getModel())}if(b.process(a,i,d,c)===false){this.fireEvent("exception",this,c,b)}}else{h.setException(b,c);h.fireEvent("exception",this,c,b)}if(typeof j=="function"){j.call(l||h,b)}h.afterRequest(d,k)},setException:function(b,a){b.setException({status:a.status,statusText:a.statusText})},applyEncoding:function(a){return Ext.encode(a)},encodeSorters:function(d){var b=[],c=d.length,a=0;for(;a<c;a++){b[a]={property:d[a].getProperty(),direction:d[a].getDirection()}}return this.applyEncoding(b)},encodeFilters:function(d){var b=[],c=d.length,a=0;for(;a<c;a++){b[a]={property:d[a].getProperty(),value:d[a].getValue()}}return this.applyEncoding(b)},getParams:function(i){var n=this,h={},a=i.getGrouper(),m=i.getSorters(),f=i.getFilters(),l=i.getPage(),d=i.getStart(),g=i.getLimit(),o=n.getSimpleSortMode(),q=n.getPageParam(),k=n.getStartParam(),p=n.getLimitParam(),j=n.getGroupParam(),e=n.getSortParam(),c=n.getFilterParam(),b=n.getDirectionParam();if(n.getEnablePagingParams()){if(q&&l!==null){h[q]=l}if(k&&d!==null){h[k]=d}if(p&&g!==null){h[p]=g}}if(j&&a){h[j]=n.encodeSorters([a])}if(e&&m&&m.length>0){if(o){h[e]=m[0].getProperty();h[b]=m[0].getDirection()}else{h[e]=n.encodeSorters(m)}}if(c&&f&&f.length>0){h[c]=n.encodeFilters(f)}return h},buildUrl:function(c){var b=this,a=b.getUrl(c);if(b.getNoCache()){a=Ext.urlAppend(a,Ext.String.format("{0}={1}",b.getCacheString(),Ext.Date.now()))}return a},getUrl:function(a){return a?a.getUrl()||this.getApi()[a.getAction()]||this._url:this._url},doRequest:function(a,c,b){},afterRequest:Ext.emptyFn});Ext.define("Ext.data.proxy.JsonP",{extend:"Ext.data.proxy.Server",alternateClassName:"Ext.data.ScriptTagProxy",alias:["proxy.jsonp","proxy.scripttag"],requires:["Ext.data.JsonP"],config:{defaultWriterType:"base",callbackKey:"callback",recordParam:"records",autoAppendParams:true},doRequest:function(a,g,b){var d=this,e=d.getWriter(),c=d.buildRequest(a),f=c.getParams();if(a.allowWrite()){c=e.write(c)}c.setConfig({callbackKey:d.getCallbackKey(),timeout:d.getTimeout(),scope:d,callback:d.createRequestCallback(c,a,g,b)});if(d.getAutoAppendParams()){c.setParams({})}c.setJsonP(Ext.data.JsonP.request(c.getCurrentConfig()));c.setParams(f);a.setStarted();d.lastRequest=c;return c},createRequestCallback:function(d,a,e,b){var c=this;return function(h,f,g){delete c.lastRequest;c.processResponse(h,a,d,f,e,b)}},setException:function(b,a){b.setException(b.getRequest().getJsonP().errorType)},buildUrl:function(f){var h=this,a=h.callParent(arguments),e=Ext.apply({},f.getParams()),c=e.filters,d,b,g,j;delete e.filters;if(h.getAutoAppendParams()){a=Ext.urlAppend(a,Ext.Object.toQueryString(e))}if(c&&c.length){for(g=0;g<c.length;g++){b=c[g];j=b.getValue();if(j){a=Ext.urlAppend(a,b.getProperty()+"="+j)}}}d=f.getRecords();if(Ext.isArray(d)&&d.length>0){a=Ext.urlAppend(a,Ext.String.format("{0}={1}",h.getRecordParam(),h.encodeRecords(d)))}return a},destroy:function(){this.abort();this.callParent(arguments)},abort:function(){var a=this.lastRequest;if(a){Ext.data.JsonP.abort(a.getJsonP())}},encodeRecords:function(b){var d="",c=0,a=b.length;for(;c<a;c++){d+=Ext.Object.toQueryString(b[c].getData())}return d}});Ext.define("Ext.data.proxy.WebStorage",{extend:"Ext.data.proxy.Client",alternateClassName:"Ext.data.WebStorageProxy",requires:"Ext.Date",config:{id:undefined,reader:null,writer:null},constructor:function(a){this.callParent(arguments);this.cache={}},updateModel:function(a){if(!this.getId()){this.setId(a.modelName)}},create:function(e,h,j){var d=e.getRecords(),c=d.length,a=this.getIds(),b,g,f;e.setStarted();for(f=0;f<c;f++){g=d[f];if(g.phantom){g.phantom=false;b=this.getNextId()}else{b=g.getId()}this.setRecord(g,b);a.push(b)}this.setIds(a);e.setCompleted();e.setSuccessful();if(typeof h=="function"){h.call(j||this,e)}},read:function(e,j,k){var c=[],a=this.getIds(),h=this.getModel(),l=h.getIdProperty(),d=e.getParams()||{},b=a.length,f,g;if(d[l]!==undefined){g=this.getRecord(d[l]);if(g){c.push(g);e.setSuccessful()}}else{for(f=0;f<b;f++){c.push(this.getRecord(a[f]))}e.setSuccessful()}e.setCompleted();e.setResultSet(Ext.create("Ext.data.ResultSet",{records:c,total:c.length,loaded:true}));e.setRecords(c);if(typeof j=="function"){j.call(k||this,e)}},update:function(e,h,j){var d=e.getRecords(),c=d.length,a=this.getIds(),g,b,f;e.setStarted();for(f=0;f<c;f++){g=d[f];this.setRecord(g);b=g.getId();if(b!==undefined&&Ext.Array.indexOf(a,b)==-1){a.push(b)}}this.setIds(a);e.setCompleted();e.setSuccessful();if(typeof h=="function"){h.call(j||this,e)}},destroy:function(b,h,e){var a=b.getRecords(),f=a.length,d=this.getIds(),g=[].concat(d),c;for(c=0;c<f;c++){Ext.Array.remove(g,a[c].getId());this.removeRecord(a[c],false)}this.setIds(g);b.setCompleted();b.setSuccessful();if(typeof h=="function"){h.call(e||this,b)}},getRecord:function(d){if(this.cache[d]===undefined){var m=this.getRecordKey(d),n=this.getStorageObject().getItem(m),g={},f=this.getModel(),k=f.getFields().items,e=k.length,h,l,c,j,a,b;if(!n){return}a=Ext.decode(n);for(h=0;h<e;h++){l=k[h];c=l.getName();if(typeof l.getDecode()=="function"){g[c]=l.getDecode()(a[c])}else{if(l.getType().type=="date"){b=l.getDateFormat();if(b){g[c]=Ext.Date.parse(a[c],b)}else{g[c]=new Date(a[c])}}else{g[c]=a[c]}}}j=new f(g,d);this.cache[d]=j}return this.cache[d]},setRecord:function(k,d){if(d){k.setId(d)}else{d=k.getId()}var m=this,a=k.getData(),j={},f=m.getModel(),l=f.getFields().items,e=l.length,h=0,n,c,g,o,b;for(;h<e;h++){n=l[h];c=n.getName();if(typeof n.getEncode()=="function"){j[c]=n.getEncode()(a[c],k)}else{if(n.getType().type=="date"&&Ext.isDate(a[c])){b=n.getDateFormat();if(b){j[c]=Ext.Date.format(a[c],b)}else{j[c]=a[c].getTime()}}else{j[c]=a[c]}}}g=m.getStorageObject();o=m.getRecordKey(d);m.cache[d]=k;g.removeItem(o);g.setItem(o,Ext.encode(j))},removeRecord:function(d,c){var b=this,a;if(d.isModel){d=d.getId()}if(c!==false){a=b.getIds();Ext.Array.remove(a,d);b.setIds(a)}b.getStorageObject().removeItem(b.getRecordKey(d))},getRecordKey:function(a){if(a.isModel){a=a.getId()}return Ext.String.format("{0}-{1}",this.getId(),a)},getRecordCounterKey:function(){return Ext.String.format("{0}-counter",this.getId())},getIds:function(){var b=(this.getStorageObject().getItem(this.getId())||"").split(","),c=b.length,a;if(c==1&&b[0]===""){b=[]}else{for(a=0;a<c;a++){b[a]=parseInt(b[a],10)}}return b},setIds:function(b){var c=this.getStorageObject(),d=b.join(","),e=this.getId(),a=this.getRecordCounterKey();c.removeItem(e);if(Ext.isEmpty(d)){c.removeItem(a)}else{c.setItem(e,d)}},getNextId:function(){var d=this.getStorageObject(),a=this.getRecordCounterKey(),c=d.getItem(a),b,e;if(c===null){b=this.getIds();c=b[b.length-1]||0}e=parseInt(c,10)+1;d.setItem(a,e);return e},initialize:function(){this.callParent(arguments);var a=this.getStorageObject();a.setItem(this.getId(),a.getItem(this.getId())||"")},clear:function(){var d=this.getStorageObject(),c=this.getIds(),a=c.length,b;for(b=0;b<a;b++){this.removeRecord(c[b])}d.removeItem(this.getRecordCounterKey());d.removeItem(this.getId())},getStorageObject:function(){}});Ext.define("Ext.data.proxy.LocalStorage",{extend:"Ext.data.proxy.WebStorage",alias:"proxy.localstorage",alternateClassName:"Ext.data.LocalStorageProxy",getStorageObject:function(){return window.localStorage}});Ext.define("Ext.data.proxy.SessionStorage",{extend:"Ext.data.proxy.WebStorage",alias:"proxy.sessionstorage",alternateClassName:"Ext.data.SessionStorageProxy",getStorageObject:function(){return window.sessionStorage}});Ext.define("Ext.data.reader.Array",{extend:"Ext.data.reader.Json",alternateClassName:"Ext.data.ArrayReader",alias:"reader.array",config:{totalProperty:undefined,successProperty:undefined},getResponseData:function(a){return a},createFieldAccessExpression:function(g,c,b){var f=this,e=g.getMapping(),d=(e==null)?f.getModel().getFields().indexOf(g):e,a;if(typeof d==="function"){a=c+".getMapping()("+b+", this)"}else{if(isNaN(d)){d='"'+d+'"'}a=b+"["+d+"]"}return a}});Ext.define("Ext.data.reader.Xml",{extend:"Ext.data.reader.Reader",alternateClassName:"Ext.data.XmlReader",alias:"reader.xml",config:{record:null},createAccessor:function(b){var a=this;if(Ext.isEmpty(b)){return Ext.emptyFn}if(Ext.isFunction(b)){return b}return function(c){return a.getNodeValue(Ext.DomQuery.selectNode(b,c))}},getNodeValue:function(a){if(a&&a.firstChild){return a.firstChild.nodeValue}return undefined},getResponseData:function(a){if(a.nodeType===1){return a}var b=a.responseXML;return b},getData:function(a){return a.documentElement||a},getRoot:function(b){var c=b.nodeName,a=this.getRootProperty();if(!a||(c&&c==a)){return b}else{if(Ext.DomQuery.isXml(b)){return Ext.DomQuery.selectNode(a,b)}}},extractData:function(a){var b=this.getRecord();if(b!=a.nodeName){a=Ext.DomQuery.select(b,a)}else{a=[a]}return this.callParent([a])},getAssociatedDataRoot:function(b,a){return Ext.DomQuery.select(a,b)[0]},readRecords:function(a){if(Ext.isArray(a)){a=a[0]}return this.callParent([a])},createFieldAccessExpression:function(e,d,c){var b=e.getMapping()||e.getName(),a;if(typeof b==="function"){a=d+".getMapping()("+c+", this)"}else{a='me.getNodeValue(Ext.DomQuery.selectNode("'+b+'", '+c+"))"}return a}});Ext.define("Ext.direct.Provider",{alias:"direct.provider",mixins:{observable:"Ext.util.Observable"},config:{id:undefined},constructor:function(a){this.initConfig(a)},applyId:function(a){if(a===undefined){a=this.getUniqueId()}return a},isConnected:function(){return false},connect:Ext.emptyFn,disconnect:Ext.emptyFn});Ext.define("Ext.direct.JsonProvider",{extend:"Ext.direct.Provider",alias:"direct.jsonprovider",uses:["Ext.direct.ExceptionEvent"],parseResponse:function(a){if(!Ext.isEmpty(a.responseText)){if(Ext.isObject(a.responseText)){return a.responseText}return Ext.decode(a.responseText)}return null},createEvents:function(a){var g=null,c=[],b=0,f,d;try{g=this.parseResponse(a)}catch(h){d=Ext.create("Ext.direct.ExceptionEvent",{data:h,xhr:a,code:Ext.direct.Manager.exceptions.PARSE,message:"Error parsing json response: \n\n "+g});return[d]}if(Ext.isArray(g)){for(f=g.length;b<f;++b){c.push(this.createEvent(g[b]))}}else{c.push(this.createEvent(g))}return c},createEvent:function(a){return Ext.create("direct."+a.type,a)}});Ext.define("Ext.direct.PollingProvider",{extend:"Ext.direct.JsonProvider",alias:"direct.pollingprovider",uses:["Ext.direct.ExceptionEvent"],requires:["Ext.Ajax","Ext.util.DelayedTask"],config:{interval:3000,baseParams:null,url:null},isConnected:function(){return !!this.pollTask},connect:function(){var b=this,a=b.getUrl(),c=b.getBaseParams();if(a&&!b.pollTask){b.pollTask=setInterval(function(){if(b.fireEvent("beforepoll",b)!==false){if(Ext.isFunction(a)){a(c)}else{Ext.Ajax.request({url:a,callback:b.onData,scope:b,params:c})}}},b.getInterval());b.fireEvent("connect",b)}else{if(!a){}}},disconnect:function(){var a=this;if(a.pollTask){clearInterval(a.pollTask);delete a.pollTask;a.fireEvent("disconnect",a)}},onData:function(e,g,b){var f=this,d=0,a,c;if(g){c=f.createEvents(b);for(a=c.length;d<a;++d){f.fireEvent("data",f,c[d])}}else{f.fireEvent("data",f,Ext.create("Ext.direct.ExceptionEvent",{data:null,code:Ext.direct.Manager.exceptions.TRANSPORT,message:"Unable to connect to the server.",xhr:b}))}}});Ext.define("Ext.fx.animation.Abstract",{extend:"Ext.Evented",isAnimation:true,requires:["Ext.fx.State"],config:{name:"",element:null,before:null,from:{},to:{},after:null,states:{},duration:300,easing:"linear",iteration:1,direction:"normal",delay:0,onBeforeStart:null,onEnd:null,onBeforeEnd:null,scope:null,reverse:null,preserveEndState:false,replacePrevious:true},STATE_FROM:"0%",STATE_TO:"100%",DIRECTION_UP:"up",DIRECTION_DOWN:"down",DIRECTION_LEFT:"left",DIRECTION_RIGHT:"right",stateNameRegex:/^(?:[\d\.]+)%$/,constructor:function(){this.states={};this.callParent(arguments);return this},applyElement:function(a){return Ext.get(a)},applyBefore:function(a,b){if(a){return Ext.factory(a,Ext.fx.State,b)}},applyAfter:function(b,a){if(b){return Ext.factory(b,Ext.fx.State,a)}},setFrom:function(a){return this.setState(this.STATE_FROM,a)},setTo:function(a){return this.setState(this.STATE_TO,a)},getFrom:function(){return this.getState(this.STATE_FROM)},getTo:function(){return this.getState(this.STATE_TO)},setStates:function(a){var c=this.stateNameRegex,b;for(b in a){if(c.test(b)){this.setState(b,a[b])}}return this},getStates:function(){return this.states},setState:function(b,d){var a=this.getStates(),c;c=Ext.factory(d,Ext.fx.State,a[b]);if(c){a[b]=c}return this},getState:function(a){return this.getStates()[a]},getData:function(){var k=this.getStates(),e={},g=this.getBefore(),c=this.getAfter(),h=k[this.STATE_FROM],i=k[this.STATE_TO],j=h.getData(),f=i.getData(),d,b,a;for(b in k){if(k.hasOwnProperty(b)){a=k[b];d=a.getData();e[b]=d}}if(Ext.os.is.Android2){e["0.0001%"]=j}return{before:g?g.getData():{},after:c?c.getData():{},states:e,from:j,to:f,duration:this.getDuration(),iteration:this.getIteration(),direction:this.getDirection(),easing:this.getEasing(),delay:this.getDelay(),onEnd:this.getOnEnd(),onBeforeEnd:this.getOnBeforeEnd(),onBeforeStart:this.getOnBeforeStart(),scope:this.getScope(),preserveEndState:this.getPreserveEndState(),replacePrevious:this.getReplacePrevious()}}});Ext.define("Ext.fx.animation.Cube",{extend:"Ext.fx.animation.Abstract",alias:"animation.cube",config:{before:{},after:{},direction:"right",out:false},getData:function(){var m=this.getTo(),n=this.getFrom(),k=this.getBefore(),a=this.getAfter(),e=this.getOut(),j=this.getDirection(),b=this.getElement(),g=b.getWidth(),c=b.getHeight(),l=e?"100% 100%":"0% 0%",i=1,d=1,f={rotateY:0,translateZ:0,},h={rotateY:0,translateZ:0};if(j=="left"||j=="right"){if(e){d=0.5;h.translateZ=g;h.rotateY=-90}else{i=0.5;f.translateZ=g;f.rotateY=90}}k["transform-origin"]=l;a["transform-origin"]=null;m.set("transform",h);n.set("transform",f);n.set("opacity",i);m.set("opacity",d);return this.callParent(arguments)}});Ext.define("Ext.fx.animation.Fade",{extend:"Ext.fx.animation.Abstract",alternateClassName:"Ext.fx.animation.FadeIn",alias:["animation.fade","animation.fadeIn"],config:{out:false,before:{display:null,opacity:0},after:{opacity:null},reverse:null},updateOut:function(a){var c=this.getTo(),b=this.getFrom();if(a){b.set("opacity",1);c.set("opacity",0)}else{b.set("opacity",0);c.set("opacity",1)}}});Ext.define("Ext.fx.animation.FadeOut",{extend:"Ext.fx.animation.Fade",alias:"animation.fadeOut",config:{out:true,before:{}}});Ext.define("Ext.fx.animation.Flip",{extend:"Ext.fx.animation.Abstract",alias:"animation.flip",config:{easing:"ease-in",direction:"right",half:false,out:null},getData:function(){var h=this.getFrom(),i=this.getTo(),g=this.getDirection(),b=this.getOut(),l=this.getHalf(),c=(l)?90:180,e=1,a=1,k=0,j=0,f=0,d=0;if(b){a=0.8}else{e=0.8}switch(g){case this.DIRECTION_UP:if(b){f=c}else{k=-c}break;case this.DIRECTION_DOWN:if(b){f=-c}else{k=c}break;case this.DIRECTION_RIGHT:if(b){d=-c}else{j=c}break;case this.DIRECTION_LEFT:if(b){d=-c}else{j=c}break}h.setTransform({rotateX:k,rotateY:j,scale:e});i.setTransform({rotateX:f,rotateY:d,scale:a});return this.callParent(arguments)}});Ext.define("Ext.fx.animation.Pop",{extend:"Ext.fx.animation.Abstract",alias:["animation.pop","animation.popIn"],alternateClassName:"Ext.fx.animation.PopIn",config:{out:false,before:{display:null,opacity:0},after:{opacity:null}},getData:function(){var c=this.getTo(),b=this.getFrom(),a=this.getOut();if(a){b.set("opacity",1);b.setTransform({scale:1});c.set("opacity",0);c.setTransform({scale:0})}else{b.set("opacity",0);b.setTransform({scale:0});c.set("opacity",1);c.setTransform({scale:1})}return this.callParent(arguments)}});Ext.define("Ext.fx.animation.PopOut",{extend:"Ext.fx.animation.Pop",alias:"animation.popOut",config:{out:true,before:{}}});Ext.define("Ext.fx.animation.Slide",{extend:"Ext.fx.animation.Abstract",alternateClassName:"Ext.fx.animation.SlideIn",alias:["animation.slide","animation.slideIn"],config:{direction:"left",out:false,offset:0,easing:"auto",containerBox:"auto",elementBox:"auto",isElementBoxFit:true,useCssTransform:true},reverseDirectionMap:{up:"down",down:"up",left:"right",right:"left"},applyEasing:function(a){if(a==="auto"){return"ease-"+((this.getOut())?"in":"out")}return a},getContainerBox:function(){var a=this._containerBox;if(a==="auto"){a=this.getElement().getParent().getPageBox()}return a},getElementBox:function(){var a=this._elementBox;if(this.getIsElementBoxFit()){return this.getContainerBox()}if(a==="auto"){a=this.getElement().getPageBox()}return a},getData:function(){var p=this.getElementBox(),c=this.getContainerBox(),g=p?p:c,n=this.getFrom(),o=this.getTo(),f=this.getOut(),e=this.getOffset(),m=this.getDirection(),b=this.getUseCssTransform(),h=this.getReverse(),d=0,a=0,l,j,k,i;if(h){m=this.reverseDirectionMap[m]}switch(m){case this.DIRECTION_UP:if(f){a=c.top-g.top-g.height-e}else{a=c.bottom-g.bottom+g.height+e}break;case this.DIRECTION_DOWN:if(f){a=c.bottom-g.bottom+g.height+e}else{a=c.top-g.height-g.top-e}break;case this.DIRECTION_RIGHT:if(f){d=c.right-g.right+g.width+e}else{d=c.left-g.left-g.width-e}break;case this.DIRECTION_LEFT:if(f){d=c.left-g.left-g.width-e}else{d=c.right-g.right+g.width+e}break}l=(f)?0:d;j=(f)?0:a;if(b){n.setTransform({translateX:l,translateY:j})}else{n.set("left",l);n.set("top",j)}k=(f)?d:0;i=(f)?a:0;if(b){o.setTransform({translateX:k,translateY:i})}else{o.set("left",k);o.set("top",i)}return this.callParent(arguments)}});Ext.define("Ext.fx.animation.SlideOut",{extend:"Ext.fx.animation.Slide",alias:["animation.slideOut"],config:{out:true}});Ext.define("Ext.fx.Animation",{requires:["Ext.fx.animation.Slide","Ext.fx.animation.SlideOut","Ext.fx.animation.Fade","Ext.fx.animation.FadeOut","Ext.fx.animation.Flip","Ext.fx.animation.Pop","Ext.fx.animation.PopOut","Ext.fx.animation.Cube"],constructor:function(b){var a=Ext.fx.animation.Abstract,c;if(typeof b=="string"){c=b;b={}}else{if(b&&b.type){c=b.type}}if(c){if(Ext.os.is.Android2){if(c=="pop"){c="fade"}if(c=="popIn"){c="fadeIn"}if(c=="popOut"){c="fadeOut"}}a=Ext.ClassManager.getByAlias("animation."+c)}return Ext.factory(b,a)}});Ext.define("Ext.fx.layout.card.Abstract",{extend:"Ext.Evented",isAnimation:true,config:{direction:"left",duration:null,reverse:null,layout:null},updateLayout:function(){this.enable()},enable:function(){var a=this.getLayout();if(a){a.onBefore("activeitemchange","onActiveItemChange",this)}},disable:function(){var a=this.getLayout();if(this.isAnimating){this.stopAnimation()}if(a){a.unBefore("activeitemchange","onActiveItemChange",this)}},onActiveItemChange:Ext.emptyFn,destroy:function(){var a=this.getLayout();if(this.isAnimating){this.stopAnimation()}if(a){a.unBefore("activeitemchange","onActiveItemChange",this)}this.setLayout(null)}});Ext.define("Ext.fx.layout.card.Scroll",{extend:"Ext.fx.layout.card.Abstract",requires:["Ext.fx.easing.Linear"],alias:"fx.layout.card.scroll",config:{duration:150},constructor:function(a){this.initConfig(a);this.doAnimationFrame=Ext.Function.bind(this.doAnimationFrame,this)},getEasing:function(){var a=this.easing;if(!a){this.easing=a=new Ext.fx.easing.Linear()}return a},updateDuration:function(a){this.getEasing().setDuration(a)},onActiveItemChange:function(a,d,l,m,c){var i=this.getDirection(),g=this.getEasing(),k,e,b,h,j,f;if(d&&l){if(this.isAnimating){this.stopAnimation()}k=this.getLayout().container.innerElement;h=k.getWidth();j=k.getHeight();e=d.renderElement;b=l.renderElement;this.oldItem=l;this.newItem=d;this.currentEventController=c;this.containerElement=k;this.isReverse=f=this.getReverse();d.show();if(i=="right"){i="left";this.isReverse=f=!f}else{if(i=="down"){i="up";this.isReverse=f=!f}}if(i=="left"){if(f){g.setConfig({startValue:h,endValue:0});k.dom.scrollLeft=h;b.setLeft(h)}else{g.setConfig({startValue:0,endValue:h});e.setLeft(h)}}else{if(f){g.setConfig({startValue:j,endValue:0});k.dom.scrollTop=j;b.setTop(j)}else{g.setConfig({startValue:0,endValue:j});e.setTop(j)}}this.startAnimation();c.pause()}},startAnimation:function(){this.isAnimating=true;this.getEasing().setStartTime(Date.now());this.timer=setInterval(this.doAnimationFrame,20);this.doAnimationFrame()},doAnimationFrame:function(){var d=this.getEasing(),c=this.getDirection(),a="scrollTop",b;if(c=="left"||c=="right"){a="scrollLeft"}if(d.isEnded){this.stopAnimation()}else{b=d.getValue();this.containerElement.dom[a]=b}},stopAnimation:function(){var b=this.getDirection(),a="setTop";if(b=="left"||b=="right"){a="setLeft"}this.currentEventController.resume();if(this.isReverse){this.oldItem.renderElement[a](null)}else{this.newItem.renderElement[a](null)}clearInterval(this.timer);this.isAnimating=false;this.fireEvent("animationend",this)}});Ext.define("Ext.fx.layout.card.Style",{extend:"Ext.fx.layout.card.Abstract",requires:["Ext.fx.Animation"],config:{inAnimation:{before:{visibility:null},preserveEndState:false,replacePrevious:true},outAnimation:{preserveEndState:false,replacePrevious:true}},constructor:function(b){var c,a;this.initConfig(b);this.endAnimationCounter=0;c=this.getInAnimation();a=this.getOutAnimation();c.on("animationend","incrementEnd",this);a.on("animationend","incrementEnd",this);c.setConfig(b);a.setConfig(b)},incrementEnd:function(){this.endAnimationCounter++;if(this.endAnimationCounter>1){this.endAnimationCounter=0;this.fireEvent("animationend",this)}},applyInAnimation:function(b,a){return Ext.factory(b,Ext.fx.Animation,a)},applyOutAnimation:function(b,a){return Ext.factory(b,Ext.fx.Animation,a)},updateInAnimation:function(a){a.setScope(this)},updateOutAnimation:function(a){a.setScope(this)},onActiveItemChange:function(a,e,h,i,d){var b=this.getInAnimation(),g=this.getOutAnimation(),f,c;if(e&&h&&h.isPainted()){f=e.renderElement;c=h.renderElement;b.setElement(f);g.setElement(c);g.setOnBeforeEnd(function(j,k){if(k||Ext.Animator.hasRunningAnimations(j)){d.firingArguments[1]=null;d.firingArguments[2]=null}});g.setOnEnd(function(){d.resume()});f.dom.style.setProperty("visibility","hidden","!important");e.show();Ext.Animator.run([g,b]);d.pause()}}});Ext.define("Ext.fx.layout.card.Cover",{extend:"Ext.fx.layout.card.Style",alias:"fx.layout.card.cover",config:{reverse:null,inAnimation:{before:{"z-index":100},after:{"z-index":0},type:"slide",easing:"ease-out"},outAnimation:{easing:"ease-out",from:{opacity:0.99},to:{opacity:1},out:true}},updateReverse:function(a){this.getInAnimation().setReverse(a);this.getOutAnimation().setReverse(a)}});Ext.define("Ext.fx.layout.card.Cube",{extend:"Ext.fx.layout.card.Style",alias:"fx.layout.card.cube",config:{reverse:null,inAnimation:{type:"cube"},outAnimation:{type:"cube",out:true}}});Ext.define("Ext.fx.layout.card.Fade",{extend:"Ext.fx.layout.card.Style",alias:"fx.layout.card.fade",config:{reverse:null,inAnimation:{type:"fade",easing:"ease-out"},outAnimation:{type:"fade",easing:"ease-out",out:true}}});Ext.define("Ext.fx.layout.card.Flip",{extend:"Ext.fx.layout.card.Style",alias:"fx.layout.card.flip",config:{duration:500,inAnimation:{type:"flip",half:true,easing:"ease-out",before:{"backface-visibility":"hidden"},after:{"backface-visibility":null}},outAnimation:{type:"flip",half:true,easing:"ease-in",before:{"backface-visibility":"hidden"},after:{"backface-visibility":null},out:true}},updateDuration:function(d){var c=d/2,b=this.getInAnimation(),a=this.getOutAnimation();b.setDelay(c);b.setDuration(c);a.setDuration(c)}});Ext.define("Ext.fx.layout.card.Pop",{extend:"Ext.fx.layout.card.Style",alias:"fx.layout.card.pop",config:{duration:500,inAnimation:{type:"pop",easing:"ease-out"},outAnimation:{type:"pop",easing:"ease-in",out:true}},updateDuration:function(d){var c=d/2,b=this.getInAnimation(),a=this.getOutAnimation();b.setDelay(c);b.setDuration(c);a.setDuration(c)}});Ext.define("Ext.fx.layout.card.Reveal",{extend:"Ext.fx.layout.card.Style",alias:"fx.layout.card.reveal",config:{inAnimation:{easing:"ease-out",from:{opacity:0.99},to:{opacity:1}},outAnimation:{before:{"z-index":100},after:{"z-index":0},type:"slide",easing:"ease-out",out:true}},updateReverse:function(a){this.getInAnimation().setReverse(a);this.getOutAnimation().setReverse(a)}});Ext.define("Ext.fx.layout.card.Slide",{extend:"Ext.fx.layout.card.Style",alias:"fx.layout.card.slide",config:{inAnimation:{type:"slide",easing:"ease-out"},outAnimation:{type:"slide",easing:"ease-out",out:true}},updateReverse:function(a){this.getInAnimation().setReverse(a);this.getOutAnimation().setReverse(a)}});Ext.define("Ext.fx.layout.Card",{requires:["Ext.fx.layout.card.Slide","Ext.fx.layout.card.Cover","Ext.fx.layout.card.Reveal","Ext.fx.layout.card.Fade","Ext.fx.layout.card.Flip","Ext.fx.layout.card.Pop","Ext.fx.layout.card.Cube","Ext.fx.layout.card.Scroll"],constructor:function(b){var a=Ext.fx.layout.card.Abstract,c;if(!b){return null}if(typeof b=="string"){c=b;b={}}else{if(b.type){c=b.type}}b.elementBox=false;if(c){if(Ext.os.is.Android2){if(c!="fade"){c="scroll"}}else{if(c==="slide"&&Ext.browser.is.ChromeMobile){c="scroll"}}a=Ext.ClassManager.getByAlias("fx.layout.card."+c)}return Ext.factory(b,a)}});Ext.define("Ext.fx.runner.Css",{extend:"Ext.Evented",requires:["Ext.fx.Animation"],prefixedProperties:{transform:true,"transform-origin":true,perspective:true,"transform-style":true,transition:true,"transition-property":true,"transition-duration":true,"transition-timing-function":true,"transition-delay":true,animation:true,"animation-name":true,"animation-duration":true,"animation-iteration-count":true,"animation-direction":true,"animation-timing-function":true,"animation-delay":true},lengthProperties:{top:true,right:true,bottom:true,left:true,width:true,height:true,"max-height":true,"max-width":true,"min-height":true,"min-width":true,"margin-bottom":true,"margin-left":true,"margin-right":true,"margin-top":true,"padding-bottom":true,"padding-left":true,"padding-right":true,"padding-top":true,"border-bottom-width":true,"border-left-width":true,"border-right-width":true,"border-spacing":true,"border-top-width":true,"border-width":true,"outline-width":true,"letter-spacing":true,"line-height":true,"text-indent":true,"word-spacing":true,"font-size":true,translate:true,translateX:true,translateY:true,translateZ:true,translate3d:true},durationProperties:{"transition-duration":true,"transition-delay":true,"animation-duration":true,"animation-delay":true},angleProperties:{rotate:true,rotateX:true,rotateY:true,rotateZ:true,skew:true,skewX:true,skewY:true},lengthUnitRegex:/([a-z%]*)$/,DEFAULT_UNIT_LENGTH:"px",DEFAULT_UNIT_ANGLE:"deg",DEFAULT_UNIT_DURATION:"ms",formattedNameCache:{},constructor:function(){var a=Ext.feature.has.Css3dTransforms;if(a){this.transformMethods=["translateX","translateY","translateZ","rotate","rotateX","rotateY","rotateZ","skewX","skewY","scaleX","scaleY","scaleZ"]}else{this.transformMethods=["translateX","translateY","rotate","skewX","skewY","scaleX","scaleY"]}this.vendorPrefix=Ext.browser.getStyleDashPrefix();this.ruleStylesCache={};return this},getStyleSheet:function(){var c=this.styleSheet,a,b;if(!c){a=document.createElement("style");a.type="text/css";(document.head||document.getElementsByTagName("head")[0]).appendChild(a);b=document.styleSheets;this.styleSheet=c=b[b.length-1]}return c},applyRules:function(i){var g=this.getStyleSheet(),k=this.ruleStylesCache,j=g.cssRules,c,e,h,b,d,a,f;for(c in i){e=i[c];h=k[c];if(h===undefined){d=j.length;g.insertRule(c+"{}",d);h=k[c]=j.item(d).style}b=h.$cache;if(!b){b=h.$cache={}}for(a in e){f=this.formatValue(e[a],a);a=this.formatName(a);if(b[a]!==f){b[a]=f;if(f===null){h.removeProperty(a)}else{h.setProperty(a,f,"important")}}}}return this},applyStyles:function(d){var g,c,f,b,a,e;for(g in d){c=document.getElementById(g);if(!c){return this}f=c.style;b=d[g];for(a in b){e=this.formatValue(b[a],a);a=this.formatName(a);if(e===null){f.removeProperty(a)}else{f.setProperty(a,e,"important")}}}return this},formatName:function(b){var a=this.formattedNameCache,c=a[b];if(!c){if(this.prefixedProperties[b]){c=this.vendorPrefix+b}else{c=b}a[b]=c}return c},formatValue:function(j,b){var g=typeof j,l=this.DEFAULT_UNIT_LENGTH,e,a,d,f,c,k,h;if(g=="string"){if(this.lengthProperties[b]){h=j.match(this.lengthUnitRegex)[1];if(h.length>0){}else{return j+l}}return j}else{if(g=="number"){if(j==0){return"0"}if(this.lengthProperties[b]){return j+l}if(this.angleProperties[b]){return j+this.DEFAULT_UNIT_ANGLE}if(this.durationProperties[b]){return j+this.DEFAULT_UNIT_DURATION}}else{if(b==="transform"){e=this.transformMethods;c=[];for(d=0,f=e.length;d<f;d++){a=e[d];c.push(a+"("+this.formatValue(j[a],a)+")")}return c.join(" ")}else{if(Ext.isArray(j)){k=[];for(d=0,f=j.length;d<f;d++){k.push(this.formatValue(j[d],b))}return(k.length>0)?k.join(", "):"none"}}}}return j}});Ext.define("Ext.fx.runner.CssTransition",{extend:"Ext.fx.runner.Css",listenersAttached:false,constructor:function(){this.runningAnimationsData={};return this.callParent(arguments)},attachListeners:function(){this.listenersAttached=true;this.getEventDispatcher().addListener("element","*","transitionend","onTransitionEnd",this)},onTransitionEnd:function(b){var a=b.target,c=a.id;if(c&&this.runningAnimationsData.hasOwnProperty(c)){this.refreshRunningAnimationsData(Ext.get(a),[b.browserEvent.propertyName])}},onAnimationEnd:function(g,f,d,j,n){var b=g.getId(),k=this.runningAnimationsData[b],c=k.nameMap,o={},m={},h,e,l,a;o[b]=m;if(f.onBeforeEnd){f.onBeforeEnd.call(f.scope||this,g,j)}d.fireEvent("animationbeforeend",d,g,j);this.fireEvent("animationbeforeend",this,d,g,j);if(n||(!j&&!f.preserveEndState)){h=f.toPropertyNames;for(e=0,l=h.length;e<l;e++){a=h[e];if(!c.hasOwnProperty(a)){m[a]=null}}}if(f.after){Ext.merge(m,f.after)}this.applyStyles(o);if(f.onEnd){f.onEnd.call(f.scope||this,g,j)}d.fireEvent("animationend",d,g,j);this.fireEvent("animationend",this,d,g,j)},onAllAnimationsEnd:function(b){var c=b.getId(),a={};delete this.runningAnimationsData[c];a[c]={"transition-property":null,"transition-duration":null,"transition-timing-function":null,"transition-delay":null};this.applyStyles(a);this.fireEvent("animationallend",this,b)},hasRunningAnimations:function(a){var c=a.getId(),b=this.runningAnimationsData;return b.hasOwnProperty(c)&&b[c].sessions.length>0},refreshRunningAnimationsData:function(d,k,t,p){var g=d.getId(),q=this.runningAnimationsData,a=q[g],m=a.nameMap,s=a.nameList,b=a.sessions,f,h,e,u,l,c,r,o,n=false;t=Boolean(t);p=Boolean(p);if(!b){return this}f=b.length;if(f===0){return this}if(p){a.nameMap={};s.length=0;for(l=0;l<f;l++){c=b[l];this.onAnimationEnd(d,c.data,c.animation,t,p)}b.length=0}else{for(l=0;l<f;l++){c=b[l];r=c.map;o=c.list;for(h=0,e=k.length;h<e;h++){u=k[h];if(r[u]){delete r[u];Ext.Array.remove(o,u);c.length--;if(--m[u]==0){delete m[u];Ext.Array.remove(s,u)}}}if(c.length==0){b.splice(l,1);l--;f--;n=true;this.onAnimationEnd(d,c.data,c.animation,t)}}}if(!p&&!t&&b.length==0&&n){this.onAllAnimationsEnd(d)}},getRunningData:function(b){var a=this.runningAnimationsData;if(!a.hasOwnProperty(b)){a[b]={nameMap:{},nameList:[],sessions:[]}}return a[b]},getTestElement:function(){var c=this.testElement,b,d,a;if(!c){b=document.createElement("iframe");a=b.style;a.setProperty("visibility","hidden","important");a.setProperty("width","0px","important");a.setProperty("height","0px","important");a.setProperty("position","absolute","important");a.setProperty("border","0px","important");a.setProperty("zIndex","-1000","important");document.body.appendChild(b);d=b.contentDocument;d.open();d.writeln("</body>");d.close();this.testElement=c=d.createElement("div");c.style.setProperty("position","absolute","!important");d.body.appendChild(c);this.testElementComputedStyle=window.getComputedStyle(c)}return c},getCssStyleValue:function(b,e){var d=this.getTestElement(),a=this.testElementComputedStyle,c=d.style;c.setProperty(b,e);e=a.getPropertyValue(b);c.removeProperty(b);return e},run:function(o){var E=this,h=this.lengthProperties,w={},D={},F={},d,r,x,e,t,H,u,p,q,a,z,y,n,A,l,s,g,B,G,k,f,v,m,c,C,b;if(!this.listenersAttached){this.attachListeners()}o=Ext.Array.from(o);for(z=0,n=o.length;z<n;z++){A=o[z];A=Ext.factory(A,Ext.fx.Animation);d=A.getElement();g=window.getComputedStyle(d.dom);r=d.getId();F=Ext.merge({},A.getData());if(A.onBeforeStart){A.onBeforeStart.call(A.scope||this,d);A.fireEvent("animationstart",A);this.fireEvent("animationstart",this,A)}F[r]=F;t=F.before;x=F.from;e=F.to;F.fromPropertyNames=H=[];F.toPropertyNames=u=[];for(G in e){if(e.hasOwnProperty(G)){e[G]=k=this.formatValue(e[G],G);B=this.formatName(G);m=h.hasOwnProperty(G);if(!m){k=this.getCssStyleValue(B,k)}if(x.hasOwnProperty(G)){x[G]=v=this.formatValue(x[G],G);if(!m){v=this.getCssStyleValue(B,v)}if(k!==v){H.push(B);u.push(B)}}else{f=g.getPropertyValue(B);if(k!==f){u.push(B)}}}}l=u.length;if(l===0){this.onAnimationEnd(d,F,A);continue}a=this.getRunningData(r);b=a.sessions;if(b.length>0){this.refreshRunningAnimationsData(d,Ext.Array.merge(H,u),true,F.replacePrevious)}c=a.nameMap;C=a.nameList;s={};for(y=0;y<l;y++){G=u[y];s[G]=true;if(!c.hasOwnProperty(G)){c[G]=1;C.push(G)}else{c[G]++}}b.push({element:d,map:s,list:u.slice(),length:l,data:F,animation:A});w[r]=x=Ext.apply(Ext.Object.chain(t),x);if(C.length>0){H=Ext.Array.difference(C,H);u=Ext.Array.merge(H,u);x["transition-property"]=H}D[r]=e=Ext.Object.chain(e);e["transition-property"]=u;e["transition-duration"]=F.duration;e["transition-timing-function"]=F.easing;e["transition-delay"]=F.delay;A.startTime=Date.now()}q=this.$className;this.applyStyles(w);p=function(i){if(i.data===q&&i.source===window){window.removeEventListener("message",p,false);E.applyStyles(D)}};window.addEventListener("message",p,false);window.postMessage(q,"*")}});Ext.define("Ext.fx.Runner",{requires:["Ext.fx.runner.CssTransition"],constructor:function(){return new Ext.fx.runner.CssTransition()}});(function(a){Ext.define("Ext.layout.Default",{extend:"Ext.Evented",alternateClassName:["Ext.layout.AutoContainerLayout","Ext.layout.ContainerLayout"],alias:["layout.auto","layout.default"],isLayout:true,hasDockedItemsCls:a+"hasdocked",centeredItemCls:a+"centered",floatingItemCls:a+"floating",dockingWrapperCls:a+"docking",dockingInnerCls:a+"docking-inner",maskCls:a+"mask",positionMap:{top:"start",left:"start",bottom:"end",right:"end"},positionDirectionMap:{top:"vertical",bottom:"vertical",left:"horizontal",right:"horizontal"},DIRECTION_VERTICAL:"vertical",DIRECTION_HORIZONTAL:"horizontal",POSITION_START:"start",POSITION_END:"end",config:{animation:null},constructor:function(b,c){this.container=b;this.innerItems=[];this.centeringWrappers={};this.initConfig(c)},reapply:Ext.emptyFn,unapply:Ext.emptyFn,onItemAdd:function(){this.doItemAdd.apply(this,arguments)},onItemRemove:function(){this.doItemRemove.apply(this,arguments)},onItemMove:function(){this.doItemMove.apply(this,arguments)},onItemCenteredChange:function(){this.doItemCenteredChange.apply(this,arguments)},onItemFloatingChange:function(){this.doItemFloatingChange.apply(this,arguments)},onItemDockedChange:function(){this.doItemDockedChange.apply(this,arguments)},doItemAdd:function(c,b){var d=c.getDocked();if(d!==null){this.dockItem(c,d)}else{if(c.isCentered()){this.centerItem(c,b)}else{this.insertItem(c,b)}}if(c.isFloating()){this.onItemFloatingChange(c,true)}},doItemRemove:function(b){if(b.isDocked()){this.undockItem(b)}else{if(b.isCentered()){this.uncenterItem(b)}}Ext.Array.remove(this.innerItems,b);this.container.innerElement.dom.removeChild(b.renderElement.dom)},doItemMove:function(c,d,b){if(c.isCentered()){c.setZIndex((d+1)*2)}else{if(c.isFloating()){c.setZIndex((d+1)*2)}this.insertItem(c,d)}},doItemCenteredChange:function(c,b){if(b){this.centerItem(c)}else{this.uncenterItem(c)}},doItemFloatingChange:function(d,e){var c=d.element,b=this.floatingItemCls;if(e){if(d.getZIndex()===null){d.setZIndex((this.container.indexOf(d)+1)*2)}c.addCls(b)}else{d.setZIndex(null);c.removeCls(b)}},doItemDockedChange:function(b,d,c){if(c){this.undockItem(b,c)}if(d){this.dockItem(b,d)}},centerItem:function(b){this.insertItem(b,0);if(b.getZIndex()===null){b.setZIndex((this.container.indexOf(b)+1)*2)}this.createCenteringWrapper(b);b.element.addCls(this.floatingItemCls)},uncenterItem:function(b){this.destroyCenteringWrapper(b);b.setZIndex(null);this.insertItem(b,this.container.indexOf(b));b.element.removeCls(this.floatingItemCls)},dockItem:function(f,b){var c=this.container,g=f.renderElement,e=f.element,d=this.dockingInnerElement;if(!d){c.setUseBodyElement(true);this.dockingInnerElement=d=c.bodyElement}this.getDockingWrapper(b);if(this.positionMap[b]===this.POSITION_START){g.insertBefore(d)}else{g.insertAfter(d)}e.addCls(a+"docked-"+b)},undockItem:function(b,c){this.insertItem(b,this.container.indexOf(b));b.element.removeCls(a+"docked-"+c)},getDockingWrapper:function(b){var e=this.currentDockingDirection,d=this.positionDirectionMap[b],c=this.dockingWrapper;if(e!==d){this.currentDockingDirection=d;this.dockingWrapper=c=this.createDockingWrapper(d)}return c},createDockingWrapper:function(b){return this.dockingInnerElement.wrap({classList:[this.dockingWrapperCls+"-"+b]},true)},createCenteringWrapper:function(c){var f=c.getId(),d=this.centeringWrappers,b=c.renderElement,e;d[f]=e=b.wrap({className:this.centeredItemCls});return e},destroyCenteringWrapper:function(c){var f=c.getId(),d=this.centeringWrappers,b=c.renderElement,e=d[f];b.unwrap();e.destroy();delete d[f];return this},insertItem:function(k,g){var d=this.container,j=d.getItems().items,e=this.innerItems,c=d.innerElement.dom,i=k.renderElement.dom,h,f,b;if(d.has(k)){Ext.Array.remove(e,k)}if(typeof g=="number"){h=j[g];if(h===k){h=j[++g]}while(h&&(h.isCentered()||h.isDocked())){h=j[++g]}if(h){b=e.indexOf(h);if(b!==-1){while(h&&(h.isCentered()||h.isDocked())){h=e[++b]}if(h){e.splice(b,0,k);f=h.renderElement.dom;c.insertBefore(i,f);return this}}}}e.push(k);c.appendChild(i);return this}})})(Ext.baseCSSPrefix);Ext.define("Ext.layout.AbstractBox",{extend:"Ext.layout.Default",config:{align:"stretch",pack:null},flexItemCls:Ext.baseCSSPrefix+"layout-box-item",positionMap:{middle:"center",left:"start",top:"start",right:"end",bottom:"end"},constructor:function(a){this.callParent(arguments);a.innerElement.addCls(this.cls);a.on(this.sizeChangeEventName,"onItemSizeChange",this,{delegate:"> component"})},reapply:function(){this.container.innerElement.addCls(this.cls);this.updatePack(this.getPack());this.updateAlign(this.getAlign())},unapply:function(){this.container.innerElement.removeCls(this.cls);this.updatePack(null);this.updateAlign(null)},doItemAdd:function(d,b){this.callParent(arguments);if(d.isInnerItem()){var c=d.getConfig(this.sizePropertyName),a=d.config;if(!c&&("flex" in a)){this.setItemFlex(d,a.flex)}}},doItemRemove:function(a){if(a.isInnerItem()){this.setItemFlex(a,null)}this.callParent(arguments)},onItemSizeChange:function(a){this.setItemFlex(a,null)},doItemCenteredChange:function(b,a){if(a){this.setItemFlex(b,null)}this.callParent(arguments)},doItemFloatingChange:function(a,b){if(b){this.setItemFlex(a,null)}this.callParent(arguments)},doItemDockedChange:function(a,b){if(b){this.setItemFlex(a,null)}this.callParent(arguments)},redrawContainer:function(){var a=this.container,b=a.renderElement.dom.parentNode;if(b&&b.nodeType!==11){a.innerElement.redraw()}},setItemFlex:function(c,a){var b=c.element,d=this.flexItemCls;if(a){b.addCls(d)}else{if(b.hasCls(d)){this.redrawContainer();b.removeCls(d)}}b.dom.style.webkitBoxFlex=a},convertPosition:function(a){if(this.positionMap.hasOwnProperty(a)){return this.positionMap[a]}return a},applyAlign:function(a){return this.convertPosition(a)},updateAlign:function(a){this.container.innerElement.dom.style.webkitBoxAlign=a},applyPack:function(a){return this.convertPosition(a)},updatePack:function(a){this.container.innerElement.dom.style.webkitBoxPack=a}});Ext.define("Ext.layout.Fit",{extend:"Ext.layout.Default",alternateClassName:"Ext.layout.FitLayout",alias:"layout.fit",cls:Ext.baseCSSPrefix+"layout-fit",itemCls:Ext.baseCSSPrefix+"layout-fit-item",constructor:function(a){this.callParent(arguments);this.apply()},apply:function(){this.container.innerElement.addCls(this.cls)},reapply:function(){this.apply()},unapply:function(){this.container.innerElement.removeCls(this.cls)},doItemAdd:function(b,a){if(b.isInnerItem()){b.addCls(this.itemCls)}this.callParent(arguments)},doItemRemove:function(a){if(a.isInnerItem()){a.removeCls(this.itemCls)}this.callParent(arguments)}});Ext.define("Ext.layout.Card",{extend:"Ext.layout.Fit",alternateClassName:"Ext.layout.CardLayout",isCard:true,requires:["Ext.fx.layout.Card"],alias:"layout.card",cls:Ext.baseCSSPrefix+"layout-card",itemCls:Ext.baseCSSPrefix+"layout-card-item",constructor:function(){this.callParent(arguments);this.container.onInitialized(this.onContainerInitialized,this)},applyAnimation:function(a){return new Ext.fx.layout.Card(a)},updateAnimation:function(b,a){if(b&&b.isAnimation){b.setLayout(this)}if(a){a.destroy()}},doItemAdd:function(b,a){if(b.isInnerItem()){b.hide()}this.callParent(arguments)},doItemRemove:function(c,a,b){this.callParent(arguments);if(!b&&c.isInnerItem()){c.show()}},onContainerInitialized:function(a){var b=a.getActiveItem();if(b){b.show()}a.on("activeitemchange","onContainerActiveItemChange",this)},onContainerActiveItemChange:function(a){this.relayEvent(arguments,"doActiveItemChange")},doActiveItemChange:function(b,c,a){if(a){a.hide()}if(c){c.show()}},doItemDockedChange:function(b,c){var a=b.element;if(c){a.removeCls(this.itemCls)}else{a.addCls(this.itemCls)}this.callParent(arguments)}});Ext.define("Ext.layout.HBox",{extend:"Ext.layout.AbstractBox",alternateClassName:"Ext.layout.HBoxLayout",alias:"layout.hbox",sizePropertyName:"width",sizeChangeEventName:"widthchange",cls:Ext.baseCSSPrefix+"layout-hbox"});Ext.define("Ext.layout.VBox",{extend:"Ext.layout.AbstractBox",alternateClassName:"Ext.layout.VBoxLayout",alias:"layout.vbox",sizePropertyName:"height",sizeChangeEventName:"heightchange",cls:Ext.baseCSSPrefix+"layout-vbox"});Ext.define("Ext.layout.Layout",{requires:["Ext.layout.Fit","Ext.layout.Card","Ext.layout.HBox","Ext.layout.VBox"],constructor:function(a,b){var c=Ext.layout.Default,d,e;if(typeof b=="string"){d=b;b={}}else{if("type" in b){d=b.type}}if(d){c=Ext.ClassManager.getByAlias("layout."+d)}return new c(a,b)}});Ext.define("Ext.mixin.Sortable",{extend:"Ext.mixin.Mixin",requires:["Ext.util.Sorter"],mixinConfig:{id:"sortable"},config:{sorters:null,defaultSortDirection:"ASC",sortRoot:null},dirtySortFn:false,sortFn:null,sorted:false,applySorters:function(a,b){if(!b){b=this.createSortersCollection()}b.clear();this.sorted=false;if(a){this.addSorters(a)}return b},createSortersCollection:function(){this._sorters=Ext.create("Ext.util.Collection",function(a){return a.getId()});return this._sorters},addSorter:function(b,a){this.addSorters([b],a)},addSorters:function(c,a){var b=this.getSorters();return this.insertSorters(b?b.length:0,c,a)},insertSorter:function(a,c,b){return this.insertSorters(a,[c],b)},insertSorters:function(e,h,a){if(!Ext.isArray(h)){h=[h]}var f=h.length,j=a||this.getDefaultSortDirection(),c=this.getSortRoot(),k=this.getSorters(),l=[],g,b,m,d;if(!k){k=this.createSortersCollection()}for(b=0;b<f;b++){m=h[b];g={direction:j,root:c};if(typeof m==="string"){d=k.get(m);if(!d){g.property=m}else{if(a!==undefined){d.setDirection(a)}else{d.toggle()}continue}}else{if(Ext.isFunction(m)){g.sorterFn=m}else{if(Ext.isObject(m)){if(!m.isSorter){if(m.fn){m.sorterFn=m.fn;delete m.fn}g=Ext.apply(g,m)}else{l.push(m);if(!m.getRoot()){m.setRoot(c)}continue}}}}m=Ext.create("Ext.util.Sorter",g);l.push(m)}for(b=0,f=l.length;b<f;b++){k.insert(e+b,l[b])}this.dirtySortFn=true;if(k.length){this.sorted=true}return k},removeSorter:function(a){return this.removeSorters([a])},removeSorters:function(d){if(!Ext.isArray(d)){d=[d]}var b=d.length,c=this.getSorters(),a,e;for(a=0;a<b;a++){e=d[a];if(typeof e==="string"){c.removeAtKey(e)}else{if(typeof e==="function"){c.each(function(f){if(f.getSorterFn()===e){c.remove(f)}})}else{if(e.isSorter){c.remove(e)}}}}if(!c.length){this.sorted=false}},updateSortFn:function(){var a=this.getSorters().items;this.sortFn=function(d,c){var f=a.length,b,e;for(e=0;e<f;e++){b=a[e].sort.call(this,d,c);if(b!==0){break}}return b};this.dirtySortFn=false;return this.sortFn},getSortFn:function(){if(this.dirtySortFn){return this.updateSortFn()}return this.sortFn},sort:function(a){Ext.Array.sort(a,this.getSortFn());return a},findInsertionIndex:function(b,e,g){var h=0,a=b.length-1,d=g||this.getSortFn(),c,f;while(h<=a){c=(h+a)>>1;f=d(e,b[c]);if(f>=0){h=c+1}else{if(f<0){a=c-1}}}return h}});Ext.define("Ext.util.AbstractMixedCollection",{requires:["Ext.util.Filter"],mixins:{observable:"Ext.util.Observable"},constructor:function(b,a){var c=this;c.items=[];c.map={};c.keys=[];c.length=0;c.allowFunctions=b===true;if(a){c.getKey=a}c.mixins.observable.constructor.call(c)},allowFunctions:false,add:function(b,e){var d=this,f=e,c=b,a;if(arguments.length==1){f=c;c=d.getKey(f)}if(typeof c!="undefined"&&c!==null){a=d.map[c];if(typeof a!="undefined"){return d.replace(c,f)}d.map[c]=f}d.length++;d.items.push(f);d.keys.push(c);d.fireEvent("add",d.length-1,f,c);return f},getKey:function(a){return a.id},replace:function(c,e){var d=this,a,b;if(arguments.length==1){e=arguments[0];c=d.getKey(e)}a=d.map[c];if(typeof c=="undefined"||c===null||typeof a=="undefined"){return d.add(c,e)}b=d.indexOfKey(c);d.items[b]=e;d.map[c]=e;d.fireEvent("replace",c,a,e);return e},addAll:function(f){var e=this,d=0,b,a,c;if(arguments.length>1||Ext.isArray(f)){b=arguments.length>1?arguments:f;for(a=b.length;d<a;d++){e.add(b[d])}}else{for(c in f){if(f.hasOwnProperty(c)){if(e.allowFunctions||typeof f[c]!="function"){e.add(c,f[c])}}}}},each:function(e,d){var b=[].concat(this.items),c=0,a=b.length,f;for(;c<a;c++){f=b[c];if(e.call(d||f,f,c,a)===false){break}}},eachKey:function(e,d){var f=this.keys,b=this.items,c=0,a=f.length;for(;c<a;c++){e.call(d||window,f[c],b[c],c,a)}},findBy:function(e,d){var f=this.keys,b=this.items,c=0,a=b.length;for(;c<a;c++){if(e.call(d||window,b[c],f[c])){return b[c]}}return null},insert:function(a,b,e){var d=this,c=b,f=e;if(arguments.length==2){f=c;c=d.getKey(f)}if(d.containsKey(c)){d.suspendEvents();d.removeAtKey(c);d.resumeEvents()}if(a>=d.length){return d.add(c,f)}d.length++;Ext.Array.splice(d.items,a,0,f);if(typeof c!="undefined"&&c!==null){d.map[c]=f}Ext.Array.splice(d.keys,a,0,c);d.fireEvent("add",a,f,c);return f},remove:function(a){return this.removeAt(this.indexOf(a))},removeAll:function(a){Ext.each(a||[],function(b){this.remove(b)},this);return this},removeAt:function(a){var c=this,d,b;if(a<c.length&&a>=0){c.length--;d=c.items[a];Ext.Array.erase(c.items,a,1);b=c.keys[a];if(typeof b!="undefined"){delete c.map[b]}Ext.Array.erase(c.keys,a,1);c.fireEvent("remove",d,b);return d}return false},removeAtKey:function(a){return this.removeAt(this.indexOfKey(a))},getCount:function(){return this.length},indexOf:function(a){return Ext.Array.indexOf(this.items,a)},indexOfKey:function(a){return Ext.Array.indexOf(this.keys,a)},get:function(b){var d=this,a=d.map[b],c=a!==undefined?a:(typeof b=="number")?d.items[b]:undefined;return typeof c!="function"||d.allowFunctions?c:null},getAt:function(a){return this.items[a]},getByKey:function(a){return this.map[a]},contains:function(a){return Ext.Array.contains(this.items,a)},containsKey:function(a){return typeof this.map[a]!="undefined"},clear:function(){var a=this;a.length=0;a.items=[];a.keys=[];a.map={};a.fireEvent("clear")},first:function(){return this.items[0]},last:function(){return this.items[this.length-1]},sum:function(g,b,h,a){var c=this.extractValues(g,b),f=c.length,e=0,d;h=h||0;a=(a||a===0)?a:f-1;for(d=h;d<=a;d++){e+=c[d]}return e},collect:function(j,e,g){var k=this.extractValues(j,e),a=k.length,b={},c=[],h,f,d;for(d=0;d<a;d++){h=k[d];f=String(h);if((g||!Ext.isEmpty(h))&&!b[f]){b[f]=true;c.push(h)}}return c},extractValues:function(c,a){var b=this.items;if(a){b=Ext.Array.pluck(b,a)}return Ext.Array.pluck(b,c)},getRange:function(f,a){var e=this,c=e.items,b=[],d;if(c.length<1){return b}f=f||0;a=Math.min(typeof a=="undefined"?e.length-1:a,e.length-1);if(f<=a){for(d=f;d<=a;d++){b[b.length]=c[d]}}else{for(d=f;d>=a;d--){b[b.length]=c[d]}}return b},filter:function(d,c,f,a){var b=[],e;if(Ext.isString(d)){b.push(Ext.create("Ext.util.Filter",{property:d,value:c,anyMatch:f,caseSensitive:a}))}else{if(Ext.isArray(d)||d instanceof Ext.util.Filter){b=b.concat(d)}}e=function(g){var m=true,n=b.length,h;for(h=0;h<n;h++){var l=b[h],k=l.getFilterFn(),j=l.getScope();m=m&&k.call(j,g)}return m};return this.filterBy(e)},filterBy:function(e,d){var h=this,a=new this.self(),g=h.keys,b=h.items,f=b.length,c;a.getKey=h.getKey;for(c=0;c<f;c++){if(e.call(d||h,b[c],g[c])){a.add(g[c],b[c])}}return a},findIndex:function(c,b,e,d,a){if(Ext.isEmpty(b,false)){return -1}b=this.createValueMatcher(b,d,a);return this.findIndexBy(function(f){return f&&b.test(f[c])},null,e)},findIndexBy:function(e,d,h){var g=this,f=g.keys,b=g.items,c=h||0,a=b.length;for(;c<a;c++){if(e.call(d||g,b[c],f[c])){return c}}return -1},createValueMatcher:function(c,e,a,b){if(!c.exec){var d=Ext.String.escapeRegex;c=String(c);if(e===true){c=d(c)}else{c="^"+d(c);if(b===true){c+="$"}}c=new RegExp(c,a?"":"i")}return c},clone:function(){var e=this,f=new this.self(),d=e.keys,b=e.items,c=0,a=b.length;for(;c<a;c++){f.add(d[c],b[c])}f.getKey=e.getKey;return f}});Ext.define("Ext.util.Collection",{config:{autoFilter:true,autoSort:true},mixins:{sortable:"Ext.mixin.Sortable",filterable:"Ext.mixin.Filterable"},constructor:function(b,a){var c=this;c.all=[];c.items=[];c.keys=[];c.indices={};c.map={};c.length=0;if(b){c.getKey=b}this.initConfig(a)},updateAutoSort:function(a,b){if(b===false&&a&&this.items.length){this.sort()}},updateAutoFilter:function(b,a){if(a===false&&b&&this.all.length){this.runFilters()}},insertSorters:function(){this.mixins.sortable.insertSorters.apply(this,arguments);if(this.getAutoSort()&&this.items.length){this.sort()}return this},removeSorters:function(a){this.mixins.sortable.removeSorters.call(this,a);if(this.sorted&&this.getAutoSort()&&this.items.length){this.sort()}return this},applyFilters:function(a){var b=this.mixins.filterable.applyFilters.call(this,a);if(!a&&this.all.length&&this.getAutoFilter()){this.filter()}return b},addFilters:function(a){this.mixins.filterable.addFilters.call(this,a);if(this.items.length&&this.getAutoFilter()){this.runFilters()}return this},removeFilters:function(a){this.mixins.filterable.removeFilters.call(this,a);if(this.filtered&&this.all.length&&this.getAutoFilter()){this.filter()}return this},filter:function(c,b,d,a){if(c){if(Ext.isString(c)){this.addFilters({property:c,value:b,anyMatch:d,caseSensitive:a});return this.items}else{this.addFilters(c);return this.items}}this.items=this.mixins.filterable.filter.call(this,this.all.slice());this.updateAfterFilter();if(this.sorted&&this.getAutoSort()){this.sort()}},runFilters:function(){this.items=this.mixins.filterable.filter.call(this,this.items);this.updateAfterFilter()},updateAfterFilter:function(){var a=this.items,f=this.keys,g=this.indices={},e=a.length,c,d,b;f.length=0;for(c=0;c<e;c++){d=a[c];b=this.getKey(d);g[b]=c;f[c]=b}this.length=a.length;this.dirtyIndices=false},sort:function(e,a){var d=this.items,h=this.keys,g=this.indices,c=d.length,b,j,f;if(e){this.addSorters(e,a);return this.items}for(b=0;b<c;b++){d[b]._current_key=h[b]}this.handleSort(d);for(b=0;b<c;b++){j=d[b];f=j._current_key;h[b]=f;g[f]=b;delete j._current_key}this.dirtyIndices=true},handleSort:function(a){this.mixins.sortable.sort.call(this,a)},add:function(i,k){var g=this,d=this.filtered,e=this.sorted,h=this.all,f=this.items,l=this.keys,j=this.indices,a=this.mixins.filterable,b=f.length,c=b;if(arguments.length==1){k=i;i=g.getKey(k)}if(typeof i!="undefined"&&i!==null){if(typeof g.map[i]!="undefined"){return g.replace(i,k)}g.map[i]=k}h.push(k);if(d&&this.getAutoFilter()&&a.isFiltered.call(g,k)){return null}g.length++;if(e&&this.getAutoSort()){c=this.findInsertionIndex(f,k)}if(c!==b){this.dirtyIndices=true;Ext.Array.splice(l,c,0,i);Ext.Array.splice(f,c,0,k)}else{j[i]=b;l.push(i);f.push(k)}return k},getKey:function(a){return a.id},replace:function(d,m){var i=this,g=i.sorted,f=i.filtered,b=i.mixins.filterable,h=i.items,n=i.keys,k=i.all,c=i.map,l=null,a=h.length,o,e,j;if(arguments.length==1){m=d;d=j=i.getKey(m)}else{j=i.getKey(m)}o=c[d];if(typeof d=="undefined"||d===null||typeof o=="undefined"){return i.add(j,m)}i.map[j]=m;if(j!==d){delete i.map[d]}if(g&&i.getAutoSort()){Ext.Array.remove(h,o);Ext.Array.remove(n,d);Ext.Array.remove(k,o);k.push(m);i.dirtyIndices=true;if(f&&i.getAutoFilter()){if(b.isFiltered.call(i,m)){if(a!==h.length){i.length--}return null}else{if(a===h.length){i.length++;l=m}}}e=this.findInsertionIndex(h,m);Ext.Array.splice(n,e,0,j);Ext.Array.splice(h,e,0,m)}else{if(f){if(i.getAutoFilter()&&b.isFiltered.call(i,m)){if(h.indexOf(o)!==-1){Ext.Array.remove(h,o);Ext.Array.remove(n,d);i.length--;i.dirtyIndices=true}return null}else{if(h.indexOf(o)===-1){h.push(m);n.push(j);i.indices[j]=i.length;i.length++;return m}}}e=i.items.indexOf(o);n[e]=j;h[e]=m;this.dirtyIndices=true}return l},addAll:function(h){var q=this,e=q.filtered,a=q.sorted,b=q.all,k=q.items,j=q.keys,p=q.map,l=q.getAutoFilter(),m=q.getAutoSort(),r=[],f=[],c=q.mixins.filterable,d=[],g,s,n,o;if(Ext.isObject(h)){for(s in h){if(h.hasOwnProperty(s)){f.push(k[s]);r.push(s)}}}else{f=h;g=h.length;for(n=0;n<g;n++){r.push(q.getKey(h[n]))}}for(n=0;n<g;n++){s=r[n];o=f[n];if(typeof s!="undefined"&&s!==null){if(typeof p[s]!="undefined"){q.replace(s,o);continue}p[s]=o}b.push(o);if(e&&l&&c.isFiltered.call(q,o)){continue}q.length++;j.push(s);k.push(o);d.push(o)}if(d.length){q.dirtyIndices=true;if(a&&m){q.sort()}return d}return null},each:function(e,d){var b=this.items.slice(),c=0,a=b.length,f;for(;c<a;c++){f=b[c];if(e.call(d||f,f,c,a)===false){break}}},eachKey:function(d,c){var f=this.keys,a=this.items,e=f.length,b;for(b=0;b<e;b++){d.call(c||window,f[b],a[b],b,e)}},findBy:function(e,d){var f=this.keys,b=this.items,c=0,a=b.length;for(;c<a;c++){if(e.call(d||window,b[c],f[c])){return b[c]}}return null},filterBy:function(e,d){var h=this,c=new this.self(),g=h.keys,a=h.all,f=a.length,b;c.getKey=h.getKey;for(b=0;b<f;b++){if(e.call(d||h,a[b],g[b])){c.add(g[b],a[b])}}return c},insert:function(c,d,f){var e=this,a=this.sorted,b=this.filtered;if(arguments.length==2){f=d;d=e.getKey(f)}if(e.containsKey(d)){e.removeAtKey(d)}if(c>=e.length||(a&&e.getAutoSort())){return e.add(d,f)}this.all.push(f);if(typeof d!="undefined"&&d!==null){e.map[d]=f}if(b&&this.getAutoFilter()&&filterable.isFiltered.call(e,f)){return null}e.length++;Ext.Array.splice(e.items,c,0,f);Ext.Array.splice(e.keys,c,0,d);e.dirtyIndices=true;return f},insertAll:function(g,d){if(g>=this.items.length||(this.sorted&&this.getAutoSort())){return this.addAll(d)}var s=this,h=this.filtered,a=this.sorted,b=this.all,m=this.items,l=this.keys,r=this.map,n=this.getAutoFilter(),o=this.getAutoSort(),t=[],j=[],f=[],c=this.mixins.filterable,e=false,k,u,p,q;if(a&&this.getAutoSort()){}if(Ext.isObject(d)){for(u in d){if(d.hasOwnProperty(u)){j.push(m[u]);t.push(u)}}}else{j=d;k=d.length;for(p=0;p<k;p++){t.push(s.getKey(d[p]))}}for(p=0;p<k;p++){u=t[p];q=j[p];if(typeof u!="undefined"&&u!==null){if(s.containsKey(u)){s.removeAtKey(u)}r[u]=q}b.push(q);if(h&&n&&c.isFiltered.call(s,q)){continue}s.length++;Ext.Array.splice(m,g+p,0,q);Ext.Array.splice(l,g+p,0,u);e=true;f.push(q)}if(e){this.dirtyIndices=true;if(a&&o){this.sort()}return f}return null},remove:function(b){var a=this.items.indexOf(b);if(a===-1){Ext.Array.remove(this.all,b);return b}return this.removeAt(this.items.indexOf(b))},removeAll:function(a){if(a){var c=a.length,b;for(b=0;b<c;b++){this.remove(a[b])}}return this},removeAt:function(b){var g=this,a=g.items,f=g.keys,d=this.all,e,c;if(b<g.length&&b>=0){e=a[b];c=f[b];if(typeof c!="undefined"){delete g.map[c]}Ext.Array.erase(a,b,1);Ext.Array.erase(f,b,1);Ext.Array.remove(d,e);g.length--;this.dirtyIndices=true;return e}return false},removeAtKey:function(a){return this.removeAt(this.indexOfKey(a))},getCount:function(){return this.length},indexOf:function(b){if(this.dirtyIndices){this.updateIndices()}var a=this.indices[this.getKey(b)];return(a===undefined)?-1:a},indexOfKey:function(b){if(this.dirtyIndices){this.updateIndices()}var a=this.indices[b];return(a===undefined)?-1:a},updateIndices:function(){var a=this.items,e=a.length,f=this.indices={},c,d,b;for(c=0;c<e;c++){d=a[c];b=this.getKey(d);f[b]=c}this.dirtyIndices=false},get:function(b){var d=this,a=d.map[b],c;if(a!==undefined){c=a}else{if(typeof b=="number"){c=d.items[b]}}return typeof c!="function"||d.getAllowFunctions()?c:null},getAt:function(a){return this.items[a]},getByKey:function(a){return this.map[a]},contains:function(b){var a=this.getKey(b);if(a){return this.containsKey(a)}else{return Ext.Array.contains(this.items,b)}},containsKey:function(a){return typeof this.map[a]!="undefined"},clear:function(){var a=this;a.length=0;a.items.length=0;a.keys.length=0;a.all.length=0;a.map={}},first:function(){return this.items[0]},last:function(){return this.items[this.length-1]},getRange:function(f,a){var e=this,c=e.items,b=[],d;if(c.length<1){return b}f=f||0;a=Math.min(typeof a=="undefined"?e.length-1:a,e.length-1);if(f<=a){for(d=f;d<=a;d++){b[b.length]=c[d]}}else{for(d=f;d>=a;d--){b[b.length]=c[d]}}return b},findIndexBy:function(d,c,h){var g=this,f=g.keys,a=g.items,b=h||0,e=a.length;for(;b<e;b++){if(d.call(c||g,a[b],f[b])){return b}}return -1},clone:function(){var e=this,f=new this.self(),d=e.keys,a=e.items,b=0,c=a.length;for(;b<c;b++){f.add(d[b],a[b])}f.getKey=e.getKey;return f}});Ext.define("Ext.data.StoreManager",{extend:"Ext.util.Collection",alternateClassName:["Ext.StoreMgr","Ext.data.StoreMgr","Ext.StoreManager"],singleton:true,uses:["Ext.data.ArrayStore"],register:function(){for(var a=0,b;(b=arguments[a]);a++){this.add(b)}},unregister:function(){for(var a=0,b;(b=arguments[a]);a++){this.remove(this.lookup(b))}},lookup:function(c){if(Ext.isArray(c)){var b=["field1"],e=!Ext.isArray(c[0]),f=c,d,a;if(e){f=[];for(d=0,a=c.length;d<a;++d){f.push([c[d]])}}else{for(d=2,a=c[0].length;d<=a;++d){b.push("field"+d)}}return Ext.create("Ext.data.ArrayStore",{data:f,fields:b,autoDestroy:true,autoCreated:true,expanded:e})}if(Ext.isString(c)){return this.get(c)}else{if(c instanceof Ext.data.Store){return c}else{return Ext.factory(c,Ext.data.Store,null,"store")}}},getKey:function(a){return a.getStoreId()}},function(){Ext.regStore=function(c,b){var a;if(Ext.isObject(c)){b=c}else{if(b instanceof Ext.data.Store){b.setStoreId(c)}else{b.storeId=c}}if(b instanceof Ext.data.Store){a=b}else{a=Ext.create("Ext.data.Store",b)}return Ext.data.StoreManager.register(a)};Ext.getStore=function(a){return Ext.data.StoreManager.lookup(a)}});Ext.define("Ext.direct.Manager",{singleton:true,mixins:{observable:"Ext.util.Observable"},requires:["Ext.util.Collection"],alternateClassName:"Ext.Direct",statics:{exceptions:{TRANSPORT:"xhr",PARSE:"parse",LOGIN:"login",SERVER:"exception"}},constructor:function(){var a=this;a.transactions=Ext.create("Ext.util.Collection",this.getKey);a.providers=Ext.create("Ext.util.Collection",this.getKey)},getKey:function(a){return a.getId()},addProvider:function(e){var d=this,a=Ext.toArray(arguments),b=0,c;if(a.length>1){for(c=a.length;b<c;++b){d.addProvider(a[b])}return}if(!e.isProvider){e=Ext.create("direct."+e.type+"provider",e)}d.providers.add(e);e.on("data",d.onProviderData,d);if(!e.isConnected()){e.connect()}return e},getProvider:function(a){return a.isProvider?a:this.providers.get(a)},removeProvider:function(c){var b=this,a=b.providers;c=c.isProvider?c:a.get(c);if(c){c.un("data",b.onProviderData,b);a.remove(c);return c}return null},addTransaction:function(a){this.transactions.add(a);return a},removeTransaction:function(a){a=this.getTransaction(a);this.transactions.remove(a);return a},getTransaction:function(a){return Ext.isObject(a)?a:this.transactions.get(a)},onProviderData:function(f,e){var d=this,b=0,c,a;if(Ext.isArray(e)){for(c=e.length;b<c;++b){d.onProviderData(f,e[b])}return}a=e.getName();if(a&&a!="event"&&a!="exception"){d.fireEvent(a,e)}else{if(e.getStatus()===false){d.fireEvent("exception",e)}}d.fireEvent("event",e,f)},parseMethod:function(b){if(Ext.isString(b)){var e=b.split("."),a=0,c=e.length,d=window;while(d&&a<c){d=d[e[a]];++a}b=Ext.isFunction(d)?d:null}return b||null}});Ext.define("Ext.data.proxy.Direct",{extend:"Ext.data.proxy.Server",alternateClassName:"Ext.data.DirectProxy",alias:"proxy.direct",requires:["Ext.direct.Manager"],config:{paramOrder:undefined,paramsAsHash:true,directFn:undefined,api:null,extraParams:null},paramOrderRe:/[\s,|]/,applyParamOrder:function(a){if(Ext.isString(a)){a=a.split(this.paramOrderRe)}return a},applyDirectFn:function(a){return Ext.direct.Manager.parseMethod(fn)},applyApi:function(b){var a;if(b&&Ext.isObject(b)){for(a in b){if(b.hasOwnProperty(a)){b[a]=Ext.direct.Manager.parseMethod(b[a])}}}return b},doRequest:function(d,j,k){var h=this,b=h.getWriter(),e=h.buildRequest(d,j,k),f=h.getApi(),i=f&&f[e.getAction()]||h.getDirectFn(),c=e.getParams(),g=[],a;e=b.write(e);if(d.getAction()=="read"){a=i.directCfg.method;g=a.getArgs(c,h.getParamOrder(),h.getParamsAsHash())}else{g.push(e.getJsonData())}g.push(h.createRequestCallback(e,d,j,k),h);e.setConfig({args:g,directFn:i});i.apply(window,g)},applyEncoding:function(a){return a},createRequestCallback:function(d,a,e,b){var c=this;return function(g,f){c.processResponse(f.getStatus(),a,d,f,e,b)}},extractResponseData:function(b){var a=b.getResult();return Ext.isDefined(a)?a:b.getData()},setException:function(b,a){b.setException(a.getMessage())},buildUrl:function(){return""}});Ext.define("Ext.direct.Event",{alias:"direct.event",requires:["Ext.direct.Manager"],config:{status:true,data:null,name:"event",xhr:null,code:null,message:"",result:null,transaction:null},constructor:function(a){this.initConfig(a)}});Ext.define("Ext.direct.RemotingEvent",{extend:"Ext.direct.Event",alias:"direct.rpc",config:{name:"remoting",tid:null,transaction:null},getTransaction:function(){return this._transaction||Ext.direct.Manager.getTransaction(this.getTid())}});Ext.define("Ext.direct.ExceptionEvent",{extend:"Ext.direct.RemotingEvent",alias:"direct.exception",config:{status:false,name:"exception",error:null}});Ext.define("Ext.util.Format",{requires:["Ext.DateExtras"],singleton:true,defaultDateFormat:"m/d/Y",escapeRe:/('|\\)/g,trimRe:/^[\x09\x0a\x0b\x0c\x0d\x20\xa0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u2028\u2029\u202f\u205f\u3000]+|[\x09\x0a\x0b\x0c\x0d\x20\xa0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u2028\u2029\u202f\u205f\u3000]+$/g,formatRe:/\{(\d+)\}/g,escapeRegexRe:/([-.*+?^${}()|[\]\/\\])/g,dashesRe:/-/g,iso8601TestRe:/\d\dT\d\d/,iso8601SplitRe:/[- :T\.Z\+]/,ellipsis:function(c,a,d){if(c&&c.length>a){if(d){var e=c.substr(0,a-2),b=Math.max(e.lastIndexOf(" "),e.lastIndexOf("."),e.lastIndexOf("!"),e.lastIndexOf("?"));if(b!=-1&&b>=(a-15)){return e.substr(0,b)+"..."}}return c.substr(0,a-3)+"..."}return c},escapeRegex:function(a){return a.replace(Ext.util.Format.escapeRegexRe,"\\$1")},escape:function(a){return a.replace(Ext.util.Format.escapeRe,"\\$1")},toggle:function(b,c,a){return b==c?a:c},trim:function(a){return a.replace(Ext.util.Format.trimRe,"")},leftPad:function(d,b,c){var a=String(d);c=c||" ";while(a.length<b){a=c+a}return a},format:function(b){var a=Ext.toArray(arguments,1);return b.replace(Ext.util.Format.formatRe,function(c,d){return a[d]})},htmlEncode:function(a){return !a?a:String(a).replace(/&/g,"&amp;").replace(/>/g,"&gt;").replace(/</g,"&lt;").replace(/"/g,"&quot;")},htmlDecode:function(a){return !a?a:String(a).replace(/&gt;/g,">").replace(/&lt;/g,"<").replace(/&quot;/g,'"').replace(/&amp;/g,"&")},date:function(b,c){var a=b;if(!b){return""}if(!Ext.isDate(b)){a=new Date(Date.parse(b));if(isNaN(a)){if(this.iso8601TestRe.test(b)){a=b.split(this.iso8601SplitRe);a=new Date(a[0],a[1]-1,a[2],a[3],a[4],a[5])}if(isNaN(a)){a=new Date(Date.parse(b.replace(this.dashesRe,"/")))}}b=a}return Ext.Date.format(b,c||Ext.util.Format.defaultDateFormat)}});Ext.define("Ext.Template",{requires:["Ext.dom.Helper","Ext.util.Format"],inheritableStatics:{from:function(b,a){b=Ext.getDom(b);return new this(b.value||b.innerHTML,a||"")}},constructor:function(d){var f=this,b=arguments,a=[],c=0,e=b.length,g;f.initialConfig={};if(e>1){for(;c<e;c++){g=b[c];if(typeof g=="object"){Ext.apply(f.initialConfig,g);Ext.apply(f,g)}else{a.push(g)}}d=a.join("")}else{if(Ext.isArray(d)){a.push(d.join(""))}else{a.push(d)}}f.html=a.join("");if(f.compiled){f.compile()}},isTemplate:true,disableFormats:false,re:/\{([\w\-]+)(?:\:([\w\.]*)(?:\((.*?)?\))?)?\}/g,apply:function(a){var g=this,d=g.disableFormats!==true,f=Ext.util.Format,c=g,b;if(g.compiled){return g.compiled(a).join("")}function e(h,j,k,i){if(k&&d){if(i){i=[a[j]].concat(Ext.functionFactory("return ["+i+"];")())}else{i=[a[j]]}if(k.substr(0,5)=="this."){return c[k.substr(5)].apply(c,i)}else{return f[k].apply(f,i)}}else{return a[j]!==undefined?a[j]:""}}b=g.html.replace(g.re,e);return b},applyOut:function(a,b){var c=this;if(c.compiled){b.push.apply(b,c.compiled(a))}else{b.push(c.apply(a))}return b},applyTemplate:function(){return this.apply.apply(this,arguments)},set:function(a,c){var b=this;b.html=a;b.compiled=null;return c?b.compile():b},compileARe:/\\/g,compileBRe:/(\r\n|\n)/g,compileCRe:/'/g,compile:function(){var me=this,fm=Ext.util.Format,useFormat=me.disableFormats!==true,body,bodyReturn;function fn(m,name,format,args){if(format&&useFormat){args=args?","+args:"";if(format.substr(0,5)!="this."){format="fm."+format+"("}else{format="this."+format.substr(5)+"("}}else{args="";format="(values['"+name+"'] == undefined ? '' : "}return"',"+format+"values['"+name+"']"+args+") ,'"}bodyReturn=me.html.replace(me.compileARe,"\\\\").replace(me.compileBRe,"\\n").replace(me.compileCRe,"\\'").replace(me.re,fn);body="this.compiled = function(values){ return ['"+bodyReturn+"'];};";eval(body);return me},insertFirst:function(b,a,c){return this.doInsert("afterBegin",b,a,c)},insertBefore:function(b,a,c){return this.doInsert("beforeBegin",b,a,c)},insertAfter:function(b,a,c){return this.doInsert("afterEnd",b,a,c)},append:function(b,a,c){return this.doInsert("beforeEnd",b,a,c)},doInsert:function(c,e,b,a){e=Ext.getDom(e);var d=Ext.DomHelper.insertHtml(c,e,this.apply(b));return a?Ext.get(d,true):d},overwrite:function(b,a,c){b=Ext.getDom(b);b.innerHTML=this.apply(a);return c?Ext.get(b.firstChild,true):b.firstChild}});Ext.define("Ext.XTemplate",{extend:"Ext.Template",requires:"Ext.XTemplateCompiler",apply:function(a){return this.applyOut(a,[]).join("")},applyOut:function(a,b){var d=this,c;if(!d.fn){c=new Ext.XTemplateCompiler({useFormat:d.disableFormats!==true});d.fn=c.compile(d.html)}try{d.fn.call(d,b,a,{},1,1)}catch(f){}return b},compile:function(){return this},statics:{getTpl:function(a,c){var b=a[c],d;if(b&&!b.isTemplate){b=Ext.ClassManager.dynInstantiate("Ext.XTemplate",b);if(a.hasOwnProperty(c)){a[c]=b}else{for(d=a.self.prototype;d;d=d.superclass){if(d.hasOwnProperty(c)){d[c]=b;break}}}}return b||null}}});Ext.define("Ext.util.GeoLocation",{extend:"Ext.Evented",config:{autoUpdate:true,latitude:null,longitude:null,accuracy:null,altitude:null,altitudeAccuracy:null,heading:null,speed:null,timestamp:null,allowHighAccuracy:false,timeout:Infinity,maximumAge:0,provider:undefined},updateMaximumAge:function(){if(this.watchOperation){this.updateWatchOperation()}},updateTimeout:function(){if(this.watchOperation){this.updateWatchOperation()}},updateAllowHighAccuracy:function(){if(this.watchOperation){this.updateWatchOperation()}},applyProvider:function(a){if(Ext.feature.has.Geolocation){if(!a){if(navigator&&navigator.geolocation){a=navigator.geolocation}else{if(window.google){a=google.gears.factory.create("beta.geolocation")}}}}else{this.fireEvent("locationerror",this,false,false,true,"This device does not support Geolocation.")}return a},updateAutoUpdate:function(a,b){var c=this,f=c.getProvider();if(b&&f){clearInterval(c.watchOperationId);c.watchOperationId=null}if(a){if(!f){c.fireEvent("locationerror",c,false,false,true,null);return}try{c.updateWatchOperation()}catch(d){c.fireEvent("locationerror",c,false,false,true,d.message)}}},updateWatchOperation:function(){var a=this,b=a.getProvider();if(a.watchOperationId){clearInterval(a.watchOperationId)}function c(){b.getCurrentPosition(Ext.bind(a.fireUpdate,a),Ext.bind(a.fireError,a),a.parseOptions())}c();a.watchOperationId=setInterval(c,10000)},updateLocation:function(h,a,c){var b=this,g=b.getProvider();var f=function(i,e){if(e){b.fireError(e)}else{b.fireEvent("locationerror",b,false,false,true,i)}if(h){h.call(a||b,null,b)}};if(!g){f(null);return}try{g.getCurrentPosition(function(e){b.fireUpdate(e);if(h){h.call(a||b,b,b)}},function(e){f(null,e)},c||b.parseOptions())}catch(d){f(d.message)}},fireUpdate:function(a){var b=this,c=a.coords;b.setConfig({timestamp:a.timestamp,latitude:c.latitude,longitude:c.longitude,accuracy:c.accuracy,altitude:c.altitude,altitudeAccuracy:c.altitudeAccuracy,heading:c.heading,speed:c.speed});b.fireEvent("locationupdate",b)},fireError:function(a){var b=a.code;this.fireEvent("locationerror",this,b==a.TIMEOUT,b==a.PERMISSION_DENIED,b==a.POSITION_UNAVAILABLE,a.message==undefined?null:a.message)},parseOptions:function(){var b=this.getTimeout(),a={maximumAge:this.getMaximumAge(),allowHighAccuracy:this.getAllowHighAccuracy()};if(b!==Infinity){a.timeout=b}return a},destroy:function(){this.updateAutoUpdate(null)}});Ext.define("Ext.util.Grouper",{extend:"Ext.util.Sorter",isGrouper:true,config:{groupFn:null,sortProperty:null,sorterFn:function(d,c){var e=this.getSortProperty(),g,b,f,a;g=this.getGroupFn();b=g.call(this,d);f=g.call(this,c);if(e){if(b!==f){return this.defaultSortFn.call(this,d,c)}else{return 0}}return(b>f)?1:((b<f)?-1:0)}},defaultSortFn:function(e,c){var g=this,f=g._transform,b=g._root,d,a,h=g._sortProperty;if(b!==null){e=e[b];c=c[b]}d=e[h];a=c[h];if(f){d=f(d);a=f(a)}return d>a?1:(d<a?-1:0)},updateProperty:function(a){this.setGroupFn(this.standardGroupFn)},standardGroupFn:function(b){var a=this.getRoot(),d=this.getProperty(),c=b;if(a){c=b[a]}return c[d]},getGroupString:function(a){var b=this.getGroupFn().call(this,a);return typeof b!="undefined"?b.toString():""}});Ext.define("Ext.util.HashMap",{mixins:{observable:"Ext.util.Observable"},constructor:function(a){this.callParent();this.mixins.observable.constructor.call(this);this.clear(true)},getCount:function(){return this.length},getData:function(a,b){if(b===undefined){b=a;a=this.getKey(b)}return[a,b]},getKey:function(a){return a.id},add:function(a,d){var b=this,c;if(b.containsKey(a)){throw new Error("This key already exists in the HashMap")}c=this.getData(a,d);a=c[0];d=c[1];b.map[a]=d;++b.length;b.fireEvent("add",b,a,d);return d},replace:function(b,d){var c=this,e=c.map,a;if(!c.containsKey(b)){c.add(b,d)}a=e[b];e[b]=d;c.fireEvent("replace",c,b,d,a);return d},remove:function(b){var a=this.findKey(b);if(a!==undefined){return this.removeByKey(a)}return false},removeByKey:function(a){var b=this,c;if(b.containsKey(a)){c=b.map[a];delete b.map[a];--b.length;b.fireEvent("remove",b,a,c);return true}return false},get:function(a){return this.map[a]},clear:function(a){var b=this;b.map={};b.length=0;if(a!==true){b.fireEvent("clear",b)}return b},containsKey:function(a){return this.map[a]!==undefined},contains:function(a){return this.containsKey(this.findKey(a))},getKeys:function(){return this.getArray(true)},getValues:function(){return this.getArray(false)},getArray:function(d){var a=[],b,c=this.map;for(b in c){if(c.hasOwnProperty(b)){a.push(d?b:c[b])}}return a},each:function(d,c){var a=Ext.apply({},this.map),b,e=this.length;c=c||this;for(b in a){if(a.hasOwnProperty(b)){if(d.call(c,b,a[b],e)===false){break}}}return this},clone:function(){var c=new Ext.util.HashMap(),b=this.map,a;c.suspendEvents();for(a in b){if(b.hasOwnProperty(a)){c.add(a,b[a])}}c.resumeEvents();return c},findKey:function(b){var a,c=this.map;for(a in c){if(c.hasOwnProperty(a)&&c[a]===b){return a}}return undefined}});Ext.define("Ext.AbstractManager",{requires:["Ext.util.HashMap"],typeName:"type",constructor:function(a){Ext.apply(this,a||{});this.all=Ext.create("Ext.util.HashMap");this.types={}},get:function(a){return this.all.get(a)},register:function(a){this.all.add(a)},unregister:function(a){this.all.remove(a)},registerType:function(b,a){this.types[b]=a;a[this.typeName]=b},isRegistered:function(a){return this.types[a]!==undefined},create:function(a,d){var b=a[this.typeName]||a.type||d,c=this.types[b];return new c(a)},onAvailable:function(e,c,b){var a=this.all,d;if(a.containsKey(e)){d=a.get(e);c.call(b||d,d)}else{a.on("add",function(h,f,g){if(f==e){c.call(b||g,g);a.un("add",c,b)}})}},each:function(b,a){this.all.each(b,a||this)},getCount:function(){return this.all.getCount()}});Ext.define("Ext.data.ModelManager",{extend:"Ext.AbstractManager",alternateClassName:["Ext.ModelMgr","Ext.ModelManager"],singleton:true,modelNamespace:null,registerType:function(c,b){var d=b.prototype,a;if(d&&d.isModel){a=b}else{b={extend:b.extend||"Ext.data.Model",config:b};a=Ext.define(c,b)}this.types[c]=a;return a},onModelDefined:Ext.emptyFn,getModel:function(b){var a=b;if(typeof a=="string"){a=this.types[a];if(!a&&this.modelNamespace){a=this.types[this.modelNamespace+"."+a]}}return a},create:function(c,b,d){var a=typeof b=="function"?b:this.types[b||c.name];return new a(c,d)}},function(){Ext.regModel=function(){return this.ModelManager.registerType.apply(this.ModelManager,arguments)}});Ext.define("Ext.data.NodeInterface",{requires:["Ext.data.Field","Ext.data.ModelManager"],alternateClassName:"Ext.data.Node",statics:{decorate:function(d){if(!d.isNode){var g=Ext.data.ModelManager,c=d.modelName,e=g.getModel(c),b=[],f,h,a;e.override(this.getPrototypeBody());b=this.applyFields(e,[{name:"parentId",type:"string",defaultValue:null},{name:"index",type:"int",defaultValue:0},{name:"depth",type:"int",defaultValue:0},{name:"expanded",type:"bool",defaultValue:false,persist:false},{name:"expandable",type:"bool",defaultValue:true,persist:false},{name:"checked",type:"auto",defaultValue:null},{name:"leaf",type:"bool",defaultValue:false,persist:false},{name:"cls",type:"string",defaultValue:null,persist:false},{name:"iconCls",type:"string",defaultValue:null,persist:false},{name:"root",type:"boolean",defaultValue:false,persist:false},{name:"isLast",type:"boolean",defaultValue:false,persist:false},{name:"isFirst",type:"boolean",defaultValue:false,persist:false},{name:"allowDrop",type:"boolean",defaultValue:true,persist:false},{name:"allowDrag",type:"boolean",defaultValue:true,persist:false},{name:"loaded",type:"boolean",defaultValue:false,persist:false},{name:"loading",type:"boolean",defaultValue:false,persist:false},{name:"href",type:"string",defaultValue:null,persist:false},{name:"hrefTarget",type:"string",defaultValue:null,persist:false},{name:"qtip",type:"string",defaultValue:null,persist:false},{name:"qtitle",type:"string",defaultValue:null,persist:false}]);a=b.length;e.getFields().isDirty=true;for(f=0;f<a;++f){h=b[f];if(d.get(h.getName())===undefined){d.data[h.getName()]=h.getDefaultValue()}}}if(!d.isDecorated){d.isDecorated=true;Ext.applyIf(d,{firstChild:null,lastChild:null,parentNode:null,previousSibling:null,nextSibling:null,childNodes:[]});d.enableBubble(["append","remove","move","insert","beforeappend","beforeremove","beforemove","beforeinsert","expand","collapse","beforeexpand","beforecollapse","sort","load"])}return d},applyFields:function(g,h){var b=g.prototype,d=b.fields,j=d.keys,f=h.length,a,c,e=[];for(c=0;c<f;c++){a=h[c];if(!Ext.Array.contains(j,a.name)){a=Ext.create("Ext.data.Field",a);e.push(a);d.add(a)}}return e},getPrototypeBody:function(){return{isNode:true,createNode:function(a){if(Ext.isObject(a)&&!a.isModel){a=Ext.data.ModelManager.create(a,this.modelName)}return Ext.data.NodeInterface.decorate(a)},isLeaf:function(){return this.get("leaf")===true},setFirstChild:function(a){this.firstChild=a},setLastChild:function(a){this.lastChild=a},updateInfo:function(g){var j=this,f=j.parentNode,b=(!f?true:f.firstChild==j),e=(!f?true:f.lastChild==j),d=0,k=j,a=j.childNodes,h=a.length,c;while(k.parentNode){++d;k=k.parentNode}j.beginEdit();j.set({isFirst:b,isLast:e,depth:d,index:f?f.indexOf(j):0,parentId:f?f.getId():null});j.endEdit(g);if(g){j.commit(g)}for(c=0;c<h;c++){a[c].updateInfo(g)}},isLast:function(){return this.get("isLast")},isFirst:function(){return this.get("isFirst")},hasChildNodes:function(){return !this.isLeaf()&&this.childNodes.length>0},isExpandable:function(){var a=this;if(a.get("expandable")){return !(a.isLeaf()||(a.isLoaded()&&!a.hasChildNodes()))}return false},appendChild:function(b,j,h){var f=this,c,e,d,g,a;if(Ext.isArray(b)){for(c=0,e=b.length;c<e;c++){f.appendChild(b[c])}}else{b=f.createNode(b);if(j!==true&&f.fireEvent("beforeappend",f,b)===false){return false}d=f.childNodes.length;g=b.parentNode;if(g){if(j!==true&&b.fireEvent("beforemove",b,g,f,d)===false){return false}g.removeChild(b,null,false,true)}d=f.childNodes.length;if(d===0){f.setFirstChild(b)}f.childNodes.push(b);b.parentNode=f;b.nextSibling=null;f.setLastChild(b);a=f.childNodes[d-1];if(a){b.previousSibling=a;a.nextSibling=b;a.updateInfo(h)}else{b.previousSibling=null}b.updateInfo(h);if(!f.isLoaded()){f.set("loaded",true)}else{if(f.childNodes.length===1){f.set("loaded",f.isLoaded())}}if(j!==true){f.fireEvent("append",f,b,d);if(g){b.fireEvent("move",b,g,f,d)}}return b}},getBubbleTarget:function(){return this.parentNode},removeChild:function(e,b,c,f){var d=this,a=d.indexOf(e);if(a==-1||(c!==true&&d.fireEvent("beforeremove",d,e)===false)){return false}Ext.Array.erase(d.childNodes,a,1);if(d.firstChild==e){d.setFirstChild(e.nextSibling)}if(d.lastChild==e){d.setLastChild(e.previousSibling)}if(c!==true){d.fireEvent("remove",d,e)}if(e.previousSibling){e.previousSibling.nextSibling=e.nextSibling;e.previousSibling.updateInfo(f)}if(e.nextSibling){e.nextSibling.previousSibling=e.previousSibling;e.nextSibling.updateInfo(f)}if(!d.childNodes.length){d.set("loaded",d.isLoaded())}if(b){e.destroy(true)}else{e.clear()}return e},copy:function(d,c){var f=this,b=f.callOverridden(arguments),a=f.childNodes?f.childNodes.length:0,e;if(c){for(e=0;e<a;e++){b.appendChild(f.childNodes[e].copy(true))}}return b},clear:function(a){var b=this;b.parentNode=b.previousSibling=b.nextSibling=null;if(a){b.firstChild=b.lastChild=null}},destroy:function(a){var c=this,b=c.destroyOptions;if(a===true){c.clear(true);Ext.each(c.childNodes,function(d){d.destroy(true)});c.childNodes=null;delete c.destroyOptions;c.callOverridden([b])}else{c.destroyOptions=a;c.remove(true)}},insertBefore:function(f,a,d){var e=this,b=e.indexOf(a),c=f.parentNode,g=b,h;if(!a){return e.appendChild(f)}if(f==a){return false}f=e.createNode(f);if(d!==true&&e.fireEvent("beforeinsert",e,f,a)===false){return false}if(c==e&&e.indexOf(f)<b){g--}if(c){if(d!==true&&f.fireEvent("beforemove",f,c,e,b,a)===false){return false}c.removeChild(f)}if(g===0){e.setFirstChild(f)}Ext.Array.splice(e.childNodes,g,0,f);f.parentNode=e;f.nextSibling=a;a.previousSibling=f;h=e.childNodes[g-1];if(h){f.previousSibling=h;h.nextSibling=f;h.updateInfo()}else{f.previousSibling=null}f.updateInfo();if(!e.isLoaded()){e.set("loaded",true)}else{if(e.childNodes.length===1){e.set("loaded",e.isLoaded())}}if(d!==true){e.fireEvent("insert",e,f,a);if(c){f.fireEvent("move",f,c,e,g,a)}}return f},insertChild:function(a,c){var b=this.childNodes[a];if(b){return this.insertBefore(c,b)}else{return this.appendChild(c)}},remove:function(b,c){var a=this.parentNode;if(a){a.removeChild(this,b,c,true)}return this},removeAll:function(a,b){var d=this.childNodes,c;while((c=d[0])){this.removeChild(c,a,b)}return this},getChildAt:function(a){return this.childNodes[a]},replaceChild:function(a,d,c){var b=d?d.nextSibling:null;this.removeChild(d,c);this.insertBefore(a,b,c);return d},indexOf:function(a){return Ext.Array.indexOf(this.childNodes,a)},getPath:function(d,c){d=d||this.idProperty;c=c||"/";var b=[this.get(d)],a=this.parentNode;while(a){b.unshift(a.get(d));a=a.parentNode}return c+b.join(c)},getDepth:function(){return this.get("depth")},bubble:function(c,b,a){var d=this;while(d){if(c.apply(b||d,a||[d])===false){break}d=d.parentNode}},cascadeBy:function(d,c,a){if(d.apply(c||this,a||[this])!==false){var f=this.childNodes,e=f.length,b;for(b=0;b<e;b++){f[b].cascadeBy(d,c,a)}}},eachChild:function(d,c,a){var f=this.childNodes,e=f.length,b;for(b=0;b<e;b++){if(d.apply(c||this,a||[f[b]])===false){break}}},findChild:function(b,c,a){return this.findChildBy(function(){return this.get(b)==c},null,a)},findChildBy:function(g,f,b){var e=this.childNodes,a=e.length,d=0,h,c;for(;d<a;d++){h=e[d];if(g.call(f||h,h)===true){return h}else{if(b){c=h.findChildBy(g,f,b);if(c!==null){return c}}}}return null},contains:function(a){return a.isAncestor(this)},isAncestor:function(a){var b=this.parentNode;while(b){if(b==a){return true}b=b.parentNode}return false},sort:function(f,b,a){var d=this.childNodes,e=d.length,c,g;if(e>0){Ext.Array.sort(d,f);for(c=0;c<e;c++){g=d[c];g.previousSibling=d[c-1];g.nextSibling=d[c+1];if(c===0){this.setFirstChild(g)}if(c==e-1){this.setLastChild(g)}g.updateInfo(a);if(b&&!g.isLeaf()){g.sort(f,true,true)}}this.notifyStores("afterEdit",["sorted"],{sorted:"sorted"});if(a!==true){this.fireEvent("sort",this,d)}}},isExpanded:function(){return this.get("expanded")},isLoaded:function(){return this.get("loaded")},isLoading:function(){return this.get("loading")},isRoot:function(){return !this.parentNode},isVisible:function(){var a=this.parentNode;while(a){if(!a.isExpanded()){return false}a=a.parentNode}return true},expand:function(a,d,b){var c=this;if(!c.isLeaf()){if(c.isLoading()){c.on("expand",function(){c.expand(a,d,b)},c,{single:true})}else{if(!c.isExpanded()){c.fireAction("expand",[this],function(){c.set("expanded",true);Ext.callback(d,b||c,[c.childNodes])})}else{Ext.callback(d,b||c,[c.childNodes])}}}else{Ext.callback(d,b||c)}},collapse:function(a,d,b){var c=this;if(!c.isLeaf()&&c.isExpanded()){this.fireAction("collapse",[c],function(){c.set("expanded",false);Ext.callback(d,b||c,[c.childNodes])})}else{Ext.callback(d,b||c,[c.childNodes])}}}}}});Ext.define("Ext.data.association.Association",{alternateClassName:"Ext.data.Association",requires:["Ext.data.ModelManager"],config:{ownerModel:null,ownerName:undefined,associatedModel:null,associatedName:undefined,associationKey:undefined,primaryKey:"id",reader:null,type:null,name:undefined},statics:{create:function(a){if(!a.isAssociation){if(Ext.isString(a)){a={type:a}}a.type=a.type.toLowerCase();return Ext.factory(a,Ext.data.association.Association,null,"association")}return a}},constructor:function(a){this.initConfig(a)},applyName:function(a){if(!a){a=this.getAssociatedName()}return a},applyOwnerModel:function(a){var b=Ext.data.ModelManager.getModel(a);if(b===undefined){Ext.Logger.error("The configured ownerModel was not valid (you tried "+a+")")}return b},applyOwnerName:function(a){if(!a){a=this.getOwnerModel().modelName}a=a.slice(a.lastIndexOf(".")+1);return a},updateOwnerModel:function(a){this.setOwnerName(a.modelName)},applyAssociatedModel:function(a){var b=Ext.data.ModelManager.types[a];if(b===undefined){Ext.Logger.error("The configured associatedModel was not valid (you tried "+a+")")}return b},applyAssociatedName:function(a){if(!a){a=this.getAssociatedModel().modelName}a=a.slice(a.lastIndexOf(".")+1);return a},updateAssociatedModel:function(a){this.setAssociatedName(a.modelName)},applyReader:function(a){if(a){if(Ext.isString(a)){a={type:a}}if(!a.isReader){Ext.applyIf(a,{type:"json"})}}return Ext.factory(a,Ext.data.Reader,this.getReader(),"reader")},updateReader:function(a){a.setModel(this.getAssociatedModel())}});Ext.define("Ext.data.association.BelongsTo",{extend:"Ext.data.association.Association",alternateClassName:"Ext.data.BelongsToAssociation",alias:"association.belongsto",config:{foreignKey:undefined,getterName:undefined,setterName:undefined,instanceName:undefined},applyForeignKey:function(a){if(!a){a=this.getAssociatedName().toLowerCase()+"_id"}return a},updateForeignKey:function(b,d){var a=this.getOwnerModel().getFields(),c=a.get(b);if(!c){c=new Ext.data.Field({name:b});a.add(c);a.isDirty=true}if(d){c=a.get(d);if(c){a.isDirty=true;a.remove(c)}}},applyInstanceName:function(a){if(!a){a=this.getAssociatedName()+"BelongsToInstance"}return a},applyAssociationKey:function(a){if(!a){var b=this.getAssociatedName();a=b[0].toLowerCase()+b.slice(1)}return a},applyGetterName:function(a){if(!a){a="get"+this.getAssociatedName()}return a},applySetterName:function(a){if(!a){a="set"+this.getAssociatedName()}return a},updateGetterName:function(b,c){var a=this.getOwnerModel().prototype;if(c){delete a[c]}if(b){a[b]=this.createGetter()}},updateSetterName:function(b,c){var a=this.getOwnerModel().prototype;if(c){delete a[c]}if(b){a[b]=this.createSetter()}},createSetter:function(){var b=this,a=b.getForeignKey();return function(e,c,d){if(e&&e.isModel){e=e.getId()}this.set(a,e);if(Ext.isFunction(c)){c={callback:c,scope:d||this}}if(Ext.isObject(c)){return this.save(c)}}},createGetter:function(){var c=this,d=c.getAssociatedModel(),b=c.getForeignKey(),a=c.getInstanceName();return function(h,i){h=h||{};var g=this,j=g.get(b),k,e,f;if(h.reload===true||g[a]===undefined){if(typeof h=="function"){h={callback:h,scope:i||g}}k=h.success;h.success=function(l){g[a]=l;if(k){k.call(this,arguments)}};d.load(j,h)}else{e=g[a];f=[e];i=i||g;Ext.callback(h,i,f);Ext.callback(h.success,i,f);Ext.callback(h.failure,i,f);Ext.callback(h.callback,i,f);return e}}},read:function(b,a,c){b[this.getInstanceName()]=a.read([c]).getRecords()[0]}});Ext.define("Ext.data.association.HasMany",{extend:"Ext.data.association.Association",alternateClassName:"Ext.data.HasManyAssociation",requires:["Ext.util.Inflector"],alias:"association.hasmany",config:{foreignKey:undefined,store:undefined,storeName:undefined,filterProperty:null,autoLoad:false},constructor:function(a){a=a||{};if(a.storeConfig){a.store=a.storeConfig;delete a.storeConfig}this.callParent([a])},applyName:function(a){if(!a){a=Ext.util.Inflector.pluralize(this.getAssociatedName().toLowerCase())}return a},applyStoreName:function(a){if(!a){a=this.getName()+"Store"}return a},applyForeignKey:function(a){if(!a){a=this.getOwnerName().toLowerCase()+"_id"}return a},applyAssociationKey:function(a){if(!a){var b=this.getAssociatedName();a=Ext.util.Inflector.pluralize(b[0].toLowerCase()+b.slice(1))}return a},updateForeignKey:function(b,d){var a=this.getAssociatedModel().getFields(),c=a.get(b);if(!c){c=new Ext.data.Field({name:b});a.add(c);a.isDirty=true}if(d){c=a.get(d);if(c){a.remove(c);a.isDirty=true}}},applyStore:function(a){var e=this,c=e,i=e.getAssociatedModel(),f=e.getStoreName(),d=e.getForeignKey(),h=e.getPrimaryKey(),g=e.getFilterProperty(),b=e.getAutoLoad();return function(){var m=this,k,l,j={};if(m[f]===undefined){if(g){l={property:g,value:m.get(g),exactMatch:true}}else{l={property:d,value:m.get(h),exactMatch:true}}j[d]=m.get(h);k=Ext.apply({},a,{model:i,filters:[l],remoteFilter:true,modelDefaults:j});m[f]=Ext.create("Ext.data.Store",k);if(b){m[f].load(function(o,n){c.updateInverseInstances(m)})}}return m[f]}},updateStore:function(a){this.getOwnerModel().prototype[this.getName()]=a},read:function(c,a,f){var e=c[this.getName()](),d=a.read(f).getRecords(),b;e.add(d);this.updateInverseInstances(c)},updateInverseInstances:function(a){var b=a[this.getName()]();inverse=this.getAssociatedModel().associations.findBy(function(c){return c.getType()==="belongsTo"&&c.getAssociatedModel().$className===a.$className});if(inverse){b.each(function(c){c[inverse.getInstanceName()]=a})}}});Ext.define("Ext.data.association.HasOne",{extend:"Ext.data.association.Association",alternateClassName:"Ext.data.HasOneAssociation",alias:"association.hasone",config:{foreignKey:undefined,getterName:undefined,setterName:undefined,instanceName:undefined},applyForeignKey:function(a){if(!a){a=this.getAssociatedName().toLowerCase()+"_id"}return a},updateForeignKey:function(b,d){var a=this.getAssociatedModel().getFields(),c=a.get(b);if(!c){c=new Ext.data.Field({name:b});a.add(c);a.isDirty=true}if(d){c=a.get(d);if(c){a.remove(c);a.isDirty=true}}},applyInstanceName:function(a){if(!a){a=this.getAssociatedName()+"BelongsToInstance"}return a},applyAssociationKey:function(a){if(!a){var b=this.getAssociatedName();a=b[0].toLowerCase()+b.slice(1)}return a},applyGetterName:function(a){if(!a){a="get"+this.getAssociatedName()}return a},applySetterName:function(a){if(!a){a="set"+this.getAssociatedName()}return a},updateGetterName:function(b,c){var a=this.getOwnerModel().prototype;if(c){delete a[c]}if(b){a[b]=this.createGetter()}},updateSetterName:function(b,c){var a=this.getOwnerModel().prototype;if(c){delete a[c]}if(b){a[b]=this.createSetter()}},createSetter:function(){var c=this,b=c.getForeignKey(),a=c.getInstanceName(),d=c.getAssociatedModel();return function(h,f,g){var i=Ext.data.Model,e;if(h&&h.isModel){h=h.getId()}this.set(b,h);e=i.cache.get(i.generateCacheId(d.modelName,h));if(e){this[a]=e}if(Ext.isFunction(f)){f={callback:f,scope:g||this}}if(Ext.isObject(f)){return this.save(f)}}},createGetter:function(){var c=this,d=c.getAssociatedModel(),b=c.getForeignKey(),a=c.getInstanceName();return function(h,i){h=h||{};var g=this,j=g.get(b),k,e,f;if(h.reload===true||g[a]===undefined){if(typeof h=="function"){h={callback:h,scope:i||g}}k=h.success;h.success=function(l){g[a]=l;if(k){k.call(this,arguments)}};d.load(j,h)}else{e=g[a];f=[e];i=i||g;Ext.callback(h,i,f);Ext.callback(h.success,i,f);Ext.callback(h.failure,i,f);Ext.callback(h.callback,i,f);return e}}},read:function(c,a,e){var b=this.getAssociatedModel().associations.findBy(function(f){return f.getType()==="belongsTo"&&f.getAssociatedName()===c.$className}),d=a.read([e]).getRecords()[0];c[this.getInstanceName()]=d;if(b){d[b.getInstanceName()]=c}}});Ext.define("Ext.util.LineSegment",{requires:["Ext.util.Point"],constructor:function(b,a){var c=Ext.util.Point;this.point1=c.from(b);this.point2=c.from(a)},intersects:function(l){var o=this.point1,m=this.point2,i=l.point1,f=l.point2,c=o.x,b=m.x,a=i.x,q=f.x,p=o.y,n=m.y,k=i.y,h=f.y,g=(c-b)*(k-h)-(p-n)*(a-q),j,e;if(g==0){return null}j=((a-q)*(c*n-p*b)-(c-b)*(a*h-k*q))/g;e=((k-h)*(c*n-p*b)-(p-n)*(a*h-k*q))/g;if(j<Math.min(c,b)||j>Math.max(c,b)||j<Math.min(a,q)||j>Math.max(a,q)||e<Math.min(p,n)||e>Math.max(p,n)||e<Math.min(k,h)||e>Math.max(k,h)){return null}return new Ext.util.Point(j,e)},toString:function(){return this.point1.toString()+" "+this.point2.toString()}});Ext.define("Ext.util.SizeMonitor",{extend:"Ext.Evented",config:{element:null,detectorCls:Ext.baseCSSPrefix+"size-change-detector",callback:Ext.emptyFn,scope:null,args:[]},constructor:function(d){this.initConfig(d);this.doFireSizeChangeEvent=Ext.Function.bind(this.doFireSizeChangeEvent,this);var g=this,e=this.getElement().dom,b=this.getDetectorCls(),c=Ext.Element.create({classList:[b,b+"-expand"],children:[{}]},true),h=Ext.Element.create({classList:[b,b+"-shrink"],children:[{}]},true),a=function(i){g.onDetectorScroll("expand",i)},f=function(i){g.onDetectorScroll("shrink",i)};e.appendChild(c);e.appendChild(h);c.addEventListener("scroll",a,true);h.addEventListener("scroll",f,true);this.detectors={expand:c,shrink:h};this.position={expand:{left:0,top:0},shrink:{left:0,top:0}};this.listeners={expand:a,shrink:f};this.refresh()},applyElement:function(a){if(a){return Ext.get(a)}},refreshPosition:function(b){var e=this.detectors[b],a=this.position[b],d,c;a.left=d=e.scrollWidth-e.offsetWidth;a.top=c=e.scrollHeight-e.offsetHeight;e.scrollLeft=d;e.scrollTop=c},refresh:function(){this.refreshPosition("expand");this.refreshPosition("shrink")},onDetectorScroll:function(b){var c=this.detectors[b],a=this.position[b];if(c.scrollLeft!==a.left||c.scrollTop!==a.top){this.refresh();this.fireSizeChangeEvent()}},fireSizeChangeEvent:function(){clearTimeout(this.sizeChangeThrottleTimer);this.sizeChangeThrottleTimer=setTimeout(this.doFireSizeChangeEvent,1)},doFireSizeChangeEvent:function(){this.getCallback().apply(this.getScope(),this.getArgs())},destroyDetector:function(a){var c=this.detectors[a],b=this.listeners[a];c.removeEventListener("scroll",b,true);Ext.removeNode(c)},destroy:function(){this.callParent(arguments);this.destroyDetector("expand");this.destroyDetector("shrink");delete this.listeners;delete this.detectors}});Ext.define("Ext.event.publisher.ComponentSize",{extend:"Ext.event.publisher.Publisher",requires:["Ext.ComponentManager","Ext.util.SizeMonitor"],targetType:"component",handledEvents:["resize"],constructor:function(){this.callParent(arguments);this.sizeMonitors={}},subscribe:function(g){var c=g.match(this.idSelectorRegex),f=this.subscribers,a=this.sizeMonitors,d=this.dispatcher,e=this.targetType,b;if(!c){return false}if(!f.hasOwnProperty(g)){f[g]=0;d.addListener(e,g,"painted","onComponentPainted",this,null,"before");b=Ext.ComponentManager.get(c[1]);a[g]=new Ext.util.SizeMonitor({element:b.element,callback:this.onComponentSizeChange,scope:this,args:[this,g]})}f[g]++;return true},unsubscribe:function(h,b,e){var c=h.match(this.idSelectorRegex),g=this.subscribers,d=this.dispatcher,f=this.targetType,a=this.sizeMonitors;if(!c){return false}if(!g.hasOwnProperty(h)||(!e&&--g[h]>0)){return true}a[h].destroy();delete a[h];d.removeListener(f,h,"painted","onComponentPainted",this,"before");delete g[h];return true},onComponentPainted:function(b){var c=b.getObservableId(),a=this.sizeMonitors[c];a.refresh()},onComponentSizeChange:function(a,b){this.dispatcher.doDispatchEvent(this.targetType,b,"resize",[a])}});Ext.define("Ext.util.Sortable",{isSortable:true,defaultSortDirection:"ASC",requires:["Ext.util.Sorter"],initSortable:function(){var a=this,b=a.sorters;a.sorters=Ext.create("Ext.util.AbstractMixedCollection",false,function(c){return c.id||c.property});if(b){a.sorters.addAll(a.decodeSorters(b))}},sort:function(g,f,c,e){var d=this,h,b,a;if(Ext.isArray(g)){e=c;c=f;a=g}else{if(Ext.isObject(g)){e=c;c=f;a=[g]}else{if(Ext.isString(g)){h=d.sorters.get(g);if(!h){h={property:g,direction:f};a=[h]}else{if(f===undefined){h.toggle()}else{h.setDirection(f)}}}}}if(a&&a.length){a=d.decodeSorters(a);if(Ext.isString(c)){if(c==="prepend"){g=d.sorters.clone().items;d.sorters.clear();d.sorters.addAll(a);d.sorters.addAll(g)}else{d.sorters.addAll(a)}}else{d.sorters.clear();d.sorters.addAll(a)}if(e!==false){d.onBeforeSort(a)}}if(e!==false){g=d.sorters.items;if(g.length){b=function(l,k){var j=g[0].sort(l,k),n=g.length,m;for(m=1;m<n;m++){j=j||g[m].sort.call(this,l,k)}return j};d.doSort(b)}}return g},onBeforeSort:Ext.emptyFn,decodeSorters:function(f){if(!Ext.isArray(f)){if(f===undefined){f=[]}else{f=[f]}}var d=f.length,g=Ext.util.Sorter,a=this.model?this.model.prototype.fields:null,e,b,c;for(c=0;c<d;c++){b=f[c];if(!(b instanceof g)){if(Ext.isString(b)){b={property:b}}Ext.applyIf(b,{root:this.sortRoot,direction:"ASC"});if(b.fn){b.sorterFn=b.fn}if(typeof b=="function"){b={sorterFn:b}}if(a&&!b.transform){e=a.get(b.property);b.transform=e?e.sortType:undefined}f[c]=Ext.create("Ext.util.Sorter",b)}}return f},getSorters:function(){return this.sorters.items}});Ext.define("Ext.util.MixedCollection",{extend:"Ext.util.AbstractMixedCollection",mixins:{sortable:"Ext.util.Sortable"},constructor:function(){var a=this;a.callParent(arguments);a.mixins.sortable.initSortable.call(a)},doSort:function(a){this.sortBy(a)},_sort:function(k,a,j){var h=this,d,e,b=String(a).toUpperCase()=="DESC"?-1:1,g=[],l=h.keys,f=h.items;j=j||function(i,c){return i-c};for(d=0,e=f.length;d<e;d++){g[g.length]={key:l[d],value:f[d],index:d}}Ext.Array.sort(g,function(i,c){var m=j(i[k],c[k])*b;if(m===0){m=(i.index<c.index?-1:1)}return m});for(d=0,e=g.length;d<e;d++){f[d]=g[d].value;l[d]=g[d].key}h.fireEvent("sort",h)},sortBy:function(c){var g=this,b=g.items,f=g.keys,e=b.length,a=[],d;for(d=0;d<e;d++){a[d]={key:f[d],value:b[d],index:d}}Ext.Array.sort(a,function(i,h){var j=c(i.value,h.value);if(j===0){j=(i.index<h.index?-1:1)}return j});for(d=0;d<e;d++){b[d]=a[d].value;f[d]=a[d].key}g.fireEvent("sort",g,b,f)},reorder:function(d){var g=this,b=g.items,c=0,f=b.length,a=[],e=[],h;g.suspendEvents();for(h in d){a[d[h]]=b[h]}for(c=0;c<f;c++){if(d[c]==undefined){e.push(b[c])}}for(c=0;c<f;c++){if(a[c]==undefined){a[c]=e.shift()}}g.clear();g.addAll(a);g.resumeEvents();g.fireEvent("sort",g)},sortByKey:function(a,b){this._sort("key",a,b||function(d,c){var f=String(d).toUpperCase(),e=String(c).toUpperCase();return f>e?1:(f<e?-1:0)})}});Ext.define("Ext.ItemCollection",{extend:"Ext.util.MixedCollection",getKey:function(a){return a.getItemId()},has:function(a){return this.map.hasOwnProperty(a.getId())}});Ext.define("Ext.data.Error",{extend:"Ext.util.MixedCollection",config:{field:null,message:""},constructor:function(a){this.initConfig(a)}});Ext.define("Ext.data.Errors",{extend:"Ext.util.Collection",requires:"Ext.data.Error",isValid:function(){return this.length===0},getByField:function(d){var c=[],a,b;for(b=0;b<this.length;b++){a=this.items[b];if(a.getField()==d){c.push(a)}}return c},add:function(){var a=arguments.length==1?arguments[0]:arguments[1];if(!(a instanceof Ext.data.Error)){a=Ext.create("Ext.data.Error",{field:a.field||a.name,message:a.error||a.message})}return this.callParent([a])}});Ext.define("Ext.data.proxy.Ajax",{extend:"Ext.data.proxy.Server",requires:["Ext.util.MixedCollection","Ext.Ajax"],alias:"proxy.ajax",alternateClassName:["Ext.data.HttpProxy","Ext.data.AjaxProxy"],config:{actionMethods:{create:"POST",read:"GET",update:"POST",destroy:"POST"},headers:{},withCredentials:false},doRequest:function(a,e,b){var d=this.getWriter(),c=this.buildRequest(a);c.setConfig({headers:this.getHeaders(),timeout:this.getTimeout(),method:this.getMethod(c),callback:this.createRequestCallback(c,a,e,b),scope:this});if(a.getWithCredentials()||this.getWithCredentials()){c.setWithCredentials(true)}c=d.write(c);Ext.Ajax.request(c.getCurrentConfig());return c},getMethod:function(a){return this.getActionMethods()[a.getAction()]},createRequestCallback:function(d,a,e,b){var c=this;return function(g,h,f){c.processResponse(h,a,d,f,e,b)}}});Ext.define("Ext.data.Model",{alternateClassName:"Ext.data.Record",mixins:{observable:"Ext.mixin.Observable"},isModel:true,requires:["Ext.util.Collection","Ext.data.Field","Ext.data.identifier.Simple","Ext.data.ModelManager","Ext.data.proxy.Ajax","Ext.data.association.HasMany","Ext.data.association.BelongsTo","Ext.data.association.HasOne","Ext.data.Errors"],config:{idProperty:"id",data:null,fields:undefined,validations:null,associations:null,hasMany:null,hasOne:null,belongsTo:null,proxy:null,identifier:{type:"simple"},clientIdProperty:"clientId",isErased:false},staticConfigs:["idProperty","fields","validations","associations","hasMany","hasOne","belongsTo","clientIdProperty","identifier","proxy"],statics:{EDIT:"edit",REJECT:"reject",COMMIT:"commit",generateProxyMethod:function(a){return function(){var b=this.prototype;return b[a].apply(b,arguments)}},generateCacheId:function(b,c){var a;if(b&&b.isModel){a=b.modelName;if(c===undefined){c=b.getId()}}else{a=b}return a.replace(/\./g,"-").toLowerCase()+"-"+c}},inheritableStatics:{load:function(a,b,h){var f=this.getProxy(),i=this.getIdProperty(),e=null,d={},g,c;h=h||(b&&b.scope)||this;if(Ext.isFunction(b)){b={callback:b,scope:h}}d[i]=a;b=Ext.apply({},b);b=Ext.applyIf(b,{action:"read",params:d,model:this});c=Ext.create("Ext.data.Operation",b);if(!f){Ext.Logger.error("You are trying to load a model that doesn't have a Proxy specified")}g=function(j){if(j.wasSuccessful()){e=j.getRecords()[0];Ext.callback(b.success,h,[e,j])}else{Ext.callback(b.failure,h,[e,j])}Ext.callback(b.callback,h,[e,j])};f.read(c,g,this)}},editing:false,dirty:false,phantom:false,constructor:function(e,g,b,f){var d=this,c=null,a=this.getIdProperty();d.modified={};d.raw=b||e||{};d.stores=[];e=e||f||{};if(g||g===0){e[a]=d.internalId=g}g=d.data[a];if(g||g===0){c=Ext.data.Model.cache.get(Ext.data.Model.generateCacheId(this,g));if(c){return c.mergeData(f||e||{})}}if(f){d.setConvertedData(e)}else{d.setData(e)}g=d.data[a];if(!g&&g!==0){d.data[a]=d.internalId=d.id=d.getIdentifier().generate(d);d.phantom=true;if(this.associations.length){this.handleInlineAssociationData(e)}}else{d.id=d.getIdentifier().generate(d)}Ext.data.Model.cache.add(d);if(this.init&&typeof this.init=="function"){this.init()}},mergeData:function(a){var g=this,d=g.getFields().items,e=d.length,b=g.data,c,h,k,j,f;for(c=0;c<e;c++){h=d[c];k=h.getName();f=h.getConvert();j=a[k];if(j!==undefined&&!g.isModified(k)){if(f){j=f.call(h,j,g)}b[k]=j}}return this},setData:function(a){var g=this.fields.items,h=g.length,f=Ext.isArray(a),d=this._data=this.data={},e,k,b,l,j,c;if(!a){return this}for(e=0;e<h;e++){k=g[e];b=k.getName();j=k.getConvert();if(f){l=a[e]}else{l=a[b];if(typeof l=="undefined"){l=k.getDefaultValue()}}if(j){l=j.call(k,l,this)}d[b]=l}c=this.getId();if(this.associations.length&&(c||c===0)){this.handleInlineAssociationData(a)}return this},handleInlineAssociationData:function(f){var e=this.associations.items,k=e.length,a=this.raw,g,d,c,h,j,b;for(g=0;g<k;g++){d=e[g];b=d.getAssociationKey();c=f[b];if(!c){c=a[b]}if(c){h=d.getReader();if(!h){j=d.getAssociatedModel().getProxy();if(j){h=j.getReader()}else{h=new Ext.data.JsonReader({model:d.getAssociatedModel()})}}d.read(this,h,c)}}},setId:function(b){var a=this.getId();this.set(this.getIdProperty(),b);this.internalId=b;Ext.data.Model.cache.replace(a,this)},getId:function(){return this.get(this.getIdProperty())},setConvertedData:function(a){this._data=this.data=a;return this},get:function(a){return this.data[a]},set:function(p,l){var j=this,b=j.fields.map,o=j.modified,a=!j.editing,c=j.associations.items,f=0,d=[],k,n,e,m,g,h;if(arguments.length==1){for(n in p){if(p.hasOwnProperty(n)){k=b[n];if(k&&k.hasCustomConvert()){d.push(n);continue}if(!f&&a){j.beginEdit()}++f;j.set(n,p[n])}}g=d.length;if(g){if(!f&&a){j.beginEdit()}f+=g;for(e=0;e<g;e++){k=d[e];j.set(k,p[k])}}if(a&&f){j.endEdit(false,d)}}else{k=b[p];h=k&&k.getConvert();if(h){l=h.call(k,l,j)}m=j.data[p];j.data[p]=l;if(k&&!j.isEqual(m,l)){if(o.hasOwnProperty(p)){if(j.isEqual(o[p],l)){delete o[p];j.dirty=false;for(n in o){if(o.hasOwnProperty(n)){j.dirty=true;break}}}}else{j.dirty=true;o[p]=m}}if(a){j.afterEdit([p],o)}}},isEqual:function(d,c){if(Ext.isDate(d)&&Ext.isDate(c)){return d.getTime()===c.getTime()}return d===c},beginEdit:function(){var a=this;if(!a.editing){a.editing=true;a.dirtySave=a.dirty;a.dataSave=Ext.apply({},a.data);a.modifiedSave=Ext.apply({},a.modified)}},cancelEdit:function(){var a=this;if(a.editing){a.editing=false;a.modified=a.modifiedSave;a.data=a.dataSave;a.dirty=a.dirtySave;delete a.modifiedSave;delete a.dataSave;delete a.dirtySave}},endEdit:function(a,c){var b=this;if(b.editing){b.editing=false;if(a!==true&&(b.changedWhileEditing())){b.afterEdit(c||Ext.Object.getKeys(this.modified),this.modified)}delete b.modifiedSave;delete b.dataSave;delete b.dirtySave}},changedWhileEditing:function(){var c=this,b=c.dataSave,d=c.data,a;for(a in d){if(d.hasOwnProperty(a)){if(!c.isEqual(d[a],b[a])){return true}}}return false},getChanges:function(){var a=this.modified,b={},c;for(c in a){if(a.hasOwnProperty(c)){b[c]=this.get(c)}}return b},isModified:function(a){return this.modified.hasOwnProperty(a)},save:function(b,d){var e=this,f=e.phantom?"create":"update",c=e.getProxy(),a,g;if(!c){Ext.Logger.error("You are trying to save a model instance that doesn't have a Proxy specified")}b=b||{};d=d||e;if(Ext.isFunction(b)){b={callback:b,scope:d}}Ext.applyIf(b,{records:[e],action:f,model:e.self});a=Ext.create("Ext.data.Operation",b);g=function(h){if(h.wasSuccessful()){Ext.callback(b.success,d,[e,h])}else{Ext.callback(b.failure,d,[e,h])}Ext.callback(b.callback,d,[e,h])};c[f](a,g,e);return e},erase:function(b,d){var e=this,c=this.getProxy(),a,f;if(!c){Ext.Logger.error("You are trying to erase a model instance that doesn't have a Proxy specified")}b=b||{};d=d||e;if(Ext.isFunction(b)){b={callback:b,scope:d}}Ext.applyIf(b,{records:[e],action:"destroy",model:this.self});a=Ext.create("Ext.data.Operation",b);f=function(g){if(g.wasSuccessful()){Ext.callback(b.success,d,[e,g])}else{Ext.callback(b.failure,d,[e,g])}Ext.callback(b.callback,d,[e,g])};c.destroy(a,f,e);return e},reject:function(a){var c=this,b=c.modified,d;for(d in b){if(b.hasOwnProperty(d)){if(typeof b[d]!="function"){c.data[d]=b[d]}}}c.dirty=false;c.editing=false;c.modified={};if(a!==true){c.afterReject()}},commit:function(a){var c=this,b=this.modified;c.phantom=c.dirty=c.editing=false;c.modified={};if(a!==true){c.afterCommit(b)}},afterEdit:function(b,a){this.notifyStores("afterEdit",b,a)},afterReject:function(){this.notifyStores("afterReject")},afterCommit:function(a){this.notifyStores("afterCommit",Ext.Object.getKeys(a||{}),a)},notifyStores:function(e){var c=Ext.Array.clone(arguments),a=this.stores,f=a.length,d,b;c[0]=this;for(d=0;d<f;++d){b=a[d];if(b!==undefined&&typeof b[e]=="function"){b[e].apply(b,c)}}},copy:function(c){var d=this,b=d.getIdProperty(),a=Ext.apply({},d.raw),e=Ext.apply({},d.data);delete a[b];delete e[b];return new d.self(null,c,a,e)},getData:function(a){var b=this.data;if(a===true){Ext.apply(b,this.getAssociatedData())}return b},getAssociatedData:function(){return this.prepareAssociatedData(this,[],null)},prepareAssociatedData:function(o,a,n){var h=o.associations.items,l=h.length,e={},f,s,g,q,r,d,c,m,k,p,b;for(m=0;m<l;m++){d=h[m];s=d.getName();p=d.getType();b=true;if(n){b=p==n}if(b&&p.toLowerCase()=="hasmany"){f=o[d.getStoreName()];e[s]=[];if(f&&f.getCount()>0){g=f.data.items;r=g.length;for(k=0;k<r;k++){q=g[k];c=q.id;if(Ext.Array.indexOf(a,c)==-1){a.push(c);e[s][k]=q.getData();Ext.apply(e[s][k],this.prepareAssociatedData(q,a,p))}}}}else{if(b&&(p.toLowerCase()=="belongsto"||p.toLowerCase()=="hasone")){q=o[d.getInstanceName()];if(q!==undefined){c=q.id;if(Ext.Array.indexOf(a,c)===-1){a.push(c);e[s]=q.getData();Ext.apply(e[s],this.prepareAssociatedData(q,a,p))}}}}}return e},join:function(a){Ext.Array.include(this.stores,a)},unjoin:function(a){Ext.Array.remove(this.stores,a)},setDirty:function(){var b=this,a;b.dirty=true;b.fields.each(function(c){if(c.getPersist()){a=c.getName();b.modified[a]=b.get(a)}})},validate:function(){var j=Ext.create("Ext.data.Errors"),c=this.getValidations().items,e=Ext.data.Validations,b,d,h,a,g,f;if(c){b=c.length;for(f=0;f<b;f++){d=c[f];h=d.field||d.name;g=d.type;a=e[g](d,this.get(h));if(!a){j.add(Ext.create("Ext.data.Error",{field:h,message:d.message||e.getMessage(g)}))}}}return j},isValid:function(){return this.validate().isValid()},toUrl:function(){var b=this.$className.split("."),a=b[b.length-1].toLowerCase();return a+"/"+this.getId()},destroy:function(){var a=this;a.notifyStores("afterErase",a);Ext.data.Model.cache.remove(a);a.data=a._data=a.raw=a.stores=a.modified=null;a.callParent(arguments)},applyProxy:function(b,a){return Ext.factory(b,Ext.data.Proxy,a,"proxy")},updateProxy:function(a){if(a){a.setModel(this.self)}},applyAssociations:function(a){if(a){this.addAssociations(a,"hasMany")}},applyBelongsTo:function(a){if(a){this.addAssociations(a,"belongsTo")}},applyHasMany:function(a){if(a){this.addAssociations(a,"hasMany")}},applyHasOne:function(a){if(a){this.addAssociations(a,"hasOne")}},addAssociations:function(e,h){var f,d,b,c=this.self.modelName,g=this.self.associations,a;e=Ext.Array.from(e);for(d=0,f=e.length;d<f;d++){b=e[d];if(!Ext.isObject(b)){b={model:b}}Ext.applyIf(b,{type:h,ownerModel:c,associatedModel:b.model});delete b.model;a=Ext.Function.bind(function(i){g.add(Ext.data.association.Association.create(this))},b);Ext.ClassManager.onCreated(a,this,(typeof b.associatedModel==="string")?b.associatedModel:Ext.getClassName(b.associatedModel))}},applyValidations:function(a){if(a){if(!Ext.isArray(a)){a=[a]}this.addValidations(a)}},addValidations:function(a){this.self.validations.addAll(a)},applyFields:function(a){var b=this.superclass.fields;if(b){a=b.items.concat(a||[])}return a||[]},updateFields:function(c){var d=c.length,e=this,h=e.self.prototype,j=this.getIdProperty(),a,f,g,b;f=e._fields=e.fields=new Ext.util.Collection(h.getFieldName);for(b=0;b<d;b++){g=c[b];if(!g.isField){g=new Ext.data.Field(c[b])}f.add(g)}a=f.get(j);if(!a){f.add(new Ext.data.Field(j))}else{a.setType("auto")}f.addSorter(h.sortConvertFields)},applyIdentifier:function(a){if(typeof a==="string"){a={type:a}}return Ext.factory(a,Ext.data.identifier.Simple,this.getIdentifier(),"data.identifier")},getFieldName:function(a){return a.getName()},sortConvertFields:function(a,d){var c=a.hasCustomConvert(),b=d.hasCustomConvert();if(c&&!b){return 1}if(!c&&b){return -1}return 0},onClassExtended:function(k,d,j){var f=j.onBeforeCreated,b=this,h=b.prototype,e=Ext.Class.configNameCache,g=h.staticConfigs.concat(d.staticConfigs||[]),c=h.config,a=d.config||{},i;d.config=a;j.onBeforeCreated=function(A,t){var v=[],x=A.prototype,w={},m=x.config,n=g.length,q=["set","get"],s=q.length,o=m.associations||[],l=Ext.getClassName(A),z,y,r,p,u;for(r=0;r<n;r++){z=g[r];for(p=0;p<s;p++){y=e[z][q[p]];if(y in x){w[y]=b.generateProxyMethod(y)}}}A.addStatics(w);A.modelName=l;x.modelName=l;if(m.belongsTo){v.push("association.belongsto")}if(m.hasMany){v.push("association.hasmany")}if(m.hasOne){v.push("association.hasone")}for(r=0,u=o.length;r<u;++r){v.push("association."+o[r].type.toLowerCase())}if(m.proxy){if(typeof m.proxy==="string"){v.push("proxy."+m.proxy)}else{if(typeof m.proxy.type==="string"){v.push("proxy."+m.proxy.type)}}}if(m.validations){v.push("Ext.data.Validations")}Ext.require(v,function(){Ext.Function.interceptBefore(j,"onCreated",function(){Ext.data.ModelManager.registerType(l,A);var B=A.prototype.superclass;A.prototype.associations=A.associations=A.prototype._associations=(B&&B.associations)?B.associations.clone():new Ext.util.Collection(function(C){return C.getName()});A.prototype.validations=A.validations=A.prototype._validations=(B&&B.validations)?B.validations.clone():new Ext.util.Collection(function(C){return C.field||C.name});A.prototype=Ext.Object.chain(A.prototype);A.prototype.initConfig.call(A.prototype,m);delete A.prototype.initConfig});f.call(b,A,t,j)})}}},function(){this.cache=new Ext.util.Collection(this.generateCacheId)});Ext.define("Ext.data.Store",{alias:"store.store",extend:"Ext.Evented",requires:["Ext.util.Collection","Ext.data.Operation","Ext.data.proxy.Memory","Ext.data.Model","Ext.data.StoreManager","Ext.util.Grouper"],statics:{create:function(a){if(!a.isStore){if(!a.type){a.type="store"}a=Ext.createByAlias("store."+a.type,a)}return a}},isStore:true,config:{storeId:undefined,data:null,autoLoad:null,autoSync:false,model:undefined,proxy:undefined,fields:null,remoteSort:false,remoteFilter:false,remoteGroup:false,filters:null,sorters:null,grouper:null,groupField:null,groupDir:null,getGroupString:null,pageSize:25,totalCount:null,clearOnPageLoad:true,modelDefaults:{},autoDestroy:false,syncRemovedRecords:true},currentPage:1,constructor:function(a){a=a||{};this.data=this._data=this.createDataCollection();this.data.setSortRoot("data");this.data.setFilterRoot("data");this.removed=[];if(a.id&&!a.storeId){a.storeId=a.id;delete a.id}this.initConfig(a)},createDataCollection:function(){return new Ext.util.Collection(function(a){return a.getId()})},applyStoreId:function(a){if(a===undefined||a===null){a=this.getUniqueId()}return a},updateStoreId:function(a,b){if(b){Ext.data.StoreManager.unregister(this)}if(a){Ext.data.StoreManager.register(this)}},applyModel:function(b){if(typeof b=="string"){var d=Ext.data.ModelManager.getModel(b);if(!d){Ext.Logger.error('Model with name "'+b+'" does not exist.')}b=d}if(b&&!b.prototype.isModel&&Ext.isObject(b)){b=Ext.data.ModelManager.registerType(b.storeId||b.id||Ext.id(),b)}if(!b){var a=this.getFields(),c=this.config.data;if(!a&&c&&c.length){a=Ext.Object.getKeys(c[0])}if(a){b=Ext.define("Ext.data.Store.ImplicitModel-"+(this.getStoreId()||Ext.id()),{extend:"Ext.data.Model",config:{fields:a,proxy:this.getProxy()}});this.implicitModel=true}}if(!b&&this.getProxy()){b=this.getProxy().getModel()}return b},updateModel:function(a){var b=this.getProxy();if(b&&!b.getModel()){b.setModel(a)}},applyProxy:function(b,a){b=Ext.factory(b,Ext.data.Proxy,a,"proxy");if(!b&&this.getModel()){b=this.getModel().getProxy();if(!b){b=new Ext.data.proxy.Memory({model:this.getModel()})}}return b},updateProxy:function(a){if(a){if(!a.getModel()){a.setModel(this.getModel())}a.on("metachange",this.onMetaChange,this)}},applyData:function(c){var b=this,a;if(c){a=b.getProxy();if(a instanceof Ext.data.proxy.Memory){a.setData(c);b.load()}else{b.removeAll(true);b.fireEvent("clear",b);b.suspendEvents();b.add(c);b.resumeEvents();b.dataLoaded=true}}else{b.removeAll(true);b.fireEvent("clear",b)}b.fireEvent("refresh",b,b.data)},clearData:function(){this.setData(null)},addData:function(d){var a=this.getProxy().getReader(),c=a.read(d),b=c.getRecords();this.add(b)},updateAutoLoad:function(a){var b=this.getProxy();if(a&&(b&&!b.isMemoryProxy)){this.load(Ext.isObject(a)?a:null)}},isAutoLoading:function(){var a=this.getProxy();return(this.getAutoLoad()||(a&&a.isMemoryProxy)||this.dataLoaded)},updateGroupField:function(a){var b=this.getGrouper();if(a){if(!b){this.setGrouper({property:a,direction:this.getGroupDir()||"ASC"})}else{b.setProperty(a)}}else{if(b){this.setGrouper(null)}}},updateGroupDir:function(a){var b=this.getGrouper();if(b){b.setDirection(a)}},applyGetGroupString:function(b){var a=this.getGrouper();if(b){if(a){a.setGroupFn(b)}else{this.setGrouper({groupFn:b})}}else{if(a){this.setGrouper(null)}}},applyGrouper:function(a){if(typeof a=="string"){a={property:a}}else{if(typeof a=="function"){a={groupFn:a}}}a=Ext.factory(a,Ext.util.Grouper,this.getGrouper());return a},updateGrouper:function(b,a){var c=this.data;if(a){c.removeSorter(a);if(!b){c.getSorters().removeSorter("isGrouper")}}if(b){c.insertSorter(0,b);if(!a){c.getSorters().addSorter({direction:"DESC",property:"isGrouper",transform:function(d){return(d===true)?1:-1}})}}},isGrouped:function(){return !!this.getGrouped()},updateSorters:function(d){var b=this.getGrouper(),c=this.data,a=c.getAutoSort();c.setAutoSort(false);c.setSorters(d);if(b){c.insertSorter(0,b)}this.updateSortTypes();c.setAutoSort(a)},updateSortTypes:function(){var b=this.getModel(),a=b&&b.getFields(),c=this.data;if(a){c.getSorters().each(function(f){var d=f.getProperty(),e;if(!f.isGrouper&&d&&!f.getTransform()){e=a.get(d);if(e){f.setTransform(e.getSortType())}}})}},updateFilters:function(a){this.data.setFilters(a)},add:function(a){if(!Ext.isArray(a)){a=Array.prototype.slice.apply(arguments)}return this.insert(this.data.length,a)},insert:function(e,b){if(!Ext.isArray(b)){b=Array.prototype.slice.call(arguments,1)}var h=this,k=false,f=b.length,a=this.getModel(),g=h.getModelDefaults(),c,d,j=false;b=b.slice();for(c=0;c<f;c++){d=b[c];if(!d.isModel){d=new a(d)}else{if(this.removed.indexOf(d)!=-1){Ext.Array.remove(this.removed,d)}}d.set(g);b[c]=d;d.join(h);k=k||(d.phantom===true)}if(f===1){j=this.data.insert(e,b[0]);if(j){j=[j]}}else{j=this.data.insertAll(e,b)}if(j){h.fireEvent("addrecords",h,j)}if(h.getAutoSync()&&k){h.sync()}return b},remove:function(b){if(b.isModel){b=[b]}var l=this,m=false,d=0,a=this.getAutoSync(),k=b.length,o=[],g=[],n,h=l.data.items,e,f,c;for(;d<k;d++){e=b[d];if(l.data.contains(e)){n=(e.phantom===true);f=h.indexOf(e);if(f!==-1){g.push(e);o.push(f)}if(!n&&l.getSyncRemovedRecords()){l.removed.push(e)}e.unjoin(l);l.data.remove(e);m=m||!n}}l.fireEvent("removerecords",l,g,o);if(a&&m){l.sync()}},removeAt:function(b){var a=this.getAt(b);if(a){this.remove(a)}},removeAll:function(a){if(a!==true){this.fireAction("clear",[this],"doRemoveAll")}else{this.doRemoveAll.call(this,true)}},doRemoveAll:function(a){var b=this;b.data.each(function(c){c.unjoin(b)});if(b.getSyncRemovedRecords()){b.removed=b.removed.concat(b.data.items)}b.data.clear();if(a!==true){b.fireEvent("refresh",b,b.data)}if(b.getAutoSync()){this.sync()}},each:function(b,a){this.data.each(b,a)},getCount:function(){return this.data.length||0},getAt:function(a){return this.data.getAt(a)},getRange:function(b,a){return this.data.getRange(b,a)},getById:function(a){return this.data.findBy(function(b){return b.getId()==a})},indexOf:function(a){return this.data.indexOf(a)},indexOfId:function(a){return this.data.indexOfKey(a)},afterEdit:function(c,g,d){var f=this,h=f.data,a=d[c.getIdProperty()]||c.getId(),b=h.keys.indexOf(a),e;if(b===-1&&h.map[a]===undefined){return}if(f.getAutoSync()){f.sync()}if(a!==c.getId()){h.replace(a,c)}else{h.replace(c)}e=h.indexOf(c);if(b===-1&&e!==-1){f.fireEvent("addrecords",f,[c])}else{if(b!==-1&&e===-1){f.fireEvent("removerecords",f,[c],[b])}else{if(e!==-1){f.fireEvent("updaterecord",f,c,e,b,g,d)}}}},afterReject:function(a){var b=this.data.indexOf(a);this.fireEvent("updaterecord",this,a,b,b,[],{})},afterCommit:function(c,g,d){var f=this,h=f.data,a=d[c.getIdProperty()]||c.getId(),b=h.keys.indexOf(a),e;if(b===-1&&h.map[a]===undefined){return}if(a!==c.getId()){h.replace(a,c)}else{h.replace(c)}e=h.indexOf(c);if(b===-1&&e!==-1){f.fireEvent("addrecords",f,[c])}else{if(b!==-1&&e===-1){f.fireEvent("removerecords",f,[c],[b])}else{if(e!==-1){f.fireEvent("updaterecord",f,c,e,b,g,d)}}}},afterErase:function(a){var c=this,d=c.data,b=d.indexOf(a);if(b!==-1){d.remove(a);c.fireEvent("removerecords",c,[a],[b])}},updateRemoteFilter:function(a){this.data.setAutoFilter(!a)},updateRemoteSort:function(a){this.data.setAutoSort(!a)},sort:function(f,d,c){var e=this.data,b=this.getGrouper(),a=e.getAutoSort();if(f){e.setAutoSort(false);if(typeof c==="string"){if(c=="prepend"){e.insertSorters(b?1:0,f,d)}else{e.addSorters(f,d)}}else{e.setSorters(null);if(b){e.addSorters(b)}e.addSorters(f,d)}this.updateSortTypes();e.setAutoSort(a)}if(!this.getRemoteSort()){if(!f){this.data.sort()}this.fireEvent("sort",this,this.data,this.data.getSorters());if(e.length){this.fireEvent("refresh",this,this.data)}}},filter:function(e,d,f,a){var c=this.data,b=c.length;if(this.getRemoteFilter()){if(e){if(Ext.isString(e)){c.addFilters({property:e,value:d,anyMatch:f,caseSensitive:a})}else{if(Ext.isArray(e)||e.isFilter){c.addFilters(e)}}}}else{c.filter(e,d);this.fireEvent("filter",this,c,c.getFilters());if(c.length!==b){this.fireEvent("refresh",this,c)}}},filterBy:function(b,a){var d=this,e=d.data,c=e.length;e.filter({filterFn:b,scope:a});this.fireEvent("filter",this,e,e.getFilters());if(e.length!==c){this.fireEvent("refresh",this,e)}},queryBy:function(b,a){return this.data.filterBy(b,a||this)},clearFilter:function(a){var b=this.data.length;if(a){this.suspendEvents()}this.data.setFilters(null);if(a){this.resumeEvents()}else{if(b!==this.data.length){this.fireEvent("refresh",this,this.data)}}},isFiltered:function(){return this.data.filtered},getSorters:function(){var a=this.data.getSorters();return(a)?a.items:[]},getFilters:function(){var a=this.data.getFilters();return(a)?a.items:[]},getGroups:function(c){var e=this.data.items,b=e.length,a=this.getGrouper(),d=[],k={},g,h,j,f;for(f=0;f<b;f++){g=e[f];h=a.getGroupString(g);j=k[h];if(j===undefined){j={name:h,children:[]};d.push(j);k[h]=j}j.children.push(g)}return c?k[c]:d},getGroupString:function(a){var b=this.getGrouper();if(b){return b.getGroupString(a)}return null},find:function(g,d,e,f,a,c){var b=Ext.create("Ext.util.Filter",{property:g,value:d,anyMatch:f,caseSensitive:a,exactMatch:c,root:"data"});return this.data.findIndexBy(b.getFilterFn(),null,e)},findRecord:function(){var b=this,a=b.find.apply(b,arguments);return a!==-1?b.getAt(a):null},findExact:function(c,a,b){return this.data.findIndexBy(function(d){return d.get(c)===a},this,b)},findBy:function(b,a,c){return this.data.findIndexBy(b,a,c)},load:function(c,e){var f=this,b,d=f.currentPage,a=f.getPageSize();c=c||{};if(Ext.isFunction(c)){c={callback:c,scope:e||this}}if(f.getRemoteSort()){c.sorters=c.sorters||this.getSorters()}if(f.getRemoteFilter()){c.filters=c.filters||this.getFilters()}if(f.getRemoteGroup()){c.grouper=c.grouper||this.getGrouper()}Ext.applyIf(c,{page:d,start:(d-1)*a,limit:a,addRecords:false,action:"read",model:this.getModel()});b=Ext.create("Ext.data.Operation",c);if(f.fireEvent("beforeload",f,b)!==false){f.loading=true;f.getProxy().read(b,f.onProxyLoad,f)}return f},isLoading:function(){return Boolean(this.loading)},isLoaded:function(){return Boolean(this.loaded)},sync:function(){var d=this,b={},e=d.getNewRecords(),c=d.getUpdatedRecords(),a=d.getRemovedRecords(),f=false;if(e.length>0){b.create=e;f=true}if(c.length>0){b.update=c;f=true}if(a.length>0){b.destroy=a;f=true}if(f&&d.fireEvent("beforesync",this,b)!==false){d.getProxy().batch({operations:b,listeners:d.getBatchListeners()})}return{added:e,updated:c,removed:a}},first:function(){return this.data.first()},last:function(){return this.data.last()},sum:function(e){var d=0,c=0,b=this.data.items,a=b.length;for(;c<a;++c){d+=b[c].get(e)}return d},min:function(f){var d=1,b=this.data.items,a=b.length,e,c;if(a>0){c=b[0].get(f)}for(;d<a;++d){e=b[d].get(f);if(e<c){c=e}}return c},max:function(f){var d=1,c=this.data.items,b=c.length,e,a;if(b>0){a=c[0].get(f)}for(;d<b;++d){e=c[d].get(f);if(e>a){a=e}}return a},average:function(e){var c=0,b=this.data.items,a=b.length,d=0;if(b.length>0){for(;c<a;++c){d+=b[c].get(e)}return d/a}return 0},getBatchListeners:function(){return{scope:this,exception:this.onBatchException,complete:this.onBatchComplete}},onBatchComplete:function(b){var e=this,a=b.operations,d=a.length,c;for(c=0;c<d;c++){e.onProxyWrite(a[c])}},onBatchException:function(b,a){},onProxyLoad:function(b){var d=this,a=b.getRecords(),c=b.getResultSet(),e=b.wasSuccessful();if(c){d.setTotalCount(c.getTotal())}if(e){if(b.getAddRecords()!==true){d.data.each(function(f){f.unjoin(d)});d.data.clear();d.fireEvent("clear",this)}if(a&&a.length){d.suspendEvents();d.add(a);d.resumeEvents()}d.fireEvent("refresh",this,this.data)}d.loaded=true;d.loading=false;d.fireEvent("load",this,a,e);Ext.callback(b.getCallback(),b.getScope()||d,[a,b,e])},onProxyWrite:function(b){var c=this,d=b.wasSuccessful(),a=b.getRecords();switch(b.getAction()){case"create":c.onCreateRecords(a,b,d);break;case"update":c.onUpdateRecords(a,b,d);break;case"destroy":c.onDestroyRecords(a,b,d);break}if(d){c.fireEvent("write",c,b)}Ext.callback(b.getCallback(),b.getScope()||c,[a,b,d])},onCreateRecords:function(b,a,c){},onUpdateRecords:function(b,a,c){},onDestroyRecords:function(b,a,c){this.removed=[]},onMetaChange:function(b){var a=this.getProxy().getModel();if(!this.getModel()&&a){this.setModel(a)}this.fireEvent("metachange",this,b)},getNewRecords:function(){return this.data.filterBy(function(a){return a.phantom===true&&a.isValid()}).items},getUpdatedRecords:function(){return this.data.filterBy(function(a){return a.dirty===true&&a.phantom!==true&&a.isValid()}).items},getRemovedRecords:function(){return this.removed},loadPage:function(f,c,d){if(typeof c==="function"){c={callback:c,scope:d||this}}var e=this,b=e.getPageSize(),a=e.getClearOnPageLoad();c=Ext.apply({},c);e.currentPage=f;e.load(Ext.applyIf(c,{page:f,start:(f-1)*b,limit:b,addRecords:!a}))},nextPage:function(a){this.loadPage(this.currentPage+1,a)},previousPage:function(a){this.loadPage(this.currentPage-1,a)}});Ext.define("Ext.data.ArrayStore",{extend:"Ext.data.Store",alias:"store.array",uses:["Ext.data.reader.Array"],config:{proxy:{type:"memory",reader:"array"}},loadData:function(b,a){this.callParent([b,a])}},function(){Ext.data.SimpleStore=Ext.data.ArrayStore});Ext.define("Ext.data.DirectStore",{extend:"Ext.data.Store",alias:"store.direct",requires:["Ext.data.proxy.Direct"],config:{proxy:{type:"direct",reader:{type:"json"}}}});Ext.define("Ext.data.JsonStore",{extend:"Ext.data.Store",alias:"store.json",config:{proxy:{type:"ajax",reader:"json",writer:"json"}}});Ext.define("Ext.data.NodeStore",{extend:"Ext.data.Store",alias:"store.node",requires:["Ext.data.NodeInterface"],config:{node:null,recursive:false,rootVisible:false,sorters:undefined,filters:undefined,folderSort:false},afterEdit:function(a,b){if(b){if(b.indexOf("loaded")!==-1){return this.add(this.retrieveChildNodes(a))}if(b.indexOf("expanded")!==-1){return this.filter()}if(b.indexOf("sorted")!==-1){return this.sort()}}this.callParent(arguments)},onNodeAppend:function(a,b){this.add([b].concat(this.retrieveChildNodes(b)))},onNodeInsert:function(a,b){this.add([b].concat(this.retrieveChildNodes(b)))},onNodeRemove:function(a,b){this.remove([b].concat(this.retrieveChildNodes(b)))},onNodeSort:function(){this.sort()},updateFolderSort:function(a){if(a){this.setGrouper(function(b){if(b.isLeaf()){return 1}return 0})}else{this.setGrouper(null)}},createDataCollection:function(){var a=this.callParent();a.handleSort=Ext.Function.bind(this.handleTreeSort,this,[a],true);a.findInsertionIndex=Ext.Function.bind(this.handleTreeInsertionIndex,this,[a,a.findInsertionIndex],true);return a},handleTreeInsertionIndex:function(a,b,d,c){return c.call(d,a,b,this.treeSortFn)},handleTreeSort:function(a){Ext.Array.sort(a,this.treeSortFn);return a},treeSortFn:function(c,a){if(c.parentNode===a.parentNode){return(c.data.index<a.data.index)?-1:1}var f=0,e=0,d=c,b=a;while(d){f+=(Math.pow(10,(d.data.depth+1)*-4)*(d.data.index+1));d=d.parentNode}while(b){e+=(Math.pow(10,(b.data.depth+1)*-4)*(b.data.index+1));b=b.parentNode}if(f>e){return 1}else{if(f<e){return -1}}return(c.data.index>a.data.index)?1:-1},applyFilters:function(b){var a=this;return function(c){return a.isVisible(c)}},applyProxy:function(a){},applyNode:function(a){if(a){a=Ext.data.NodeInterface.decorate(a)}return a},updateNode:function(a,c){if(c){c.un({append:"onNodeAppend",insert:"onNodeInsert",remove:"onNodeRemove",load:"onNodeLoad",scope:this});c.unjoin(this)}if(a){a.on({scope:this,append:"onNodeAppend",insert:"onNodeInsert",remove:"onNodeRemove",load:"onNodeLoad"});a.join(this);var b=[];if(a.childNodes.length){b=b.concat(this.retrieveChildNodes(a))}if(this.getRootVisible()){b.push(a)}else{if(a.isLoaded()||a.isLoading()){a.set("expanded",true)}}this.data.clear();this.fireEvent("clear",this);this.suspendEvents();this.add(b);this.resumeEvents();this.fireEvent("refresh",this,this.data)}},retrieveChildNodes:function(a){var d=this.getNode(),b=this.getRecursive(),c=[],e=a;if(!a.childNodes.length||(!b&&a!==d)){return c}if(!b){return a.childNodes}while(e){if(e._added){delete e._added;if(e===a){break}else{e=e.nextSibling||e.parentNode}}else{if(e!==a){c.push(e)}if(e.firstChild){e._added=true;e=e.firstChild}else{e=e.nextSibling||e.parentNode}}}return c},isVisible:function(b){var a=b.parentNode;while(a){if(!a.isExpanded()){return false}if(a===this.getNode()){break}a=a.parentNode}return true}});Ext.define("Ext.data.TreeStore",{extend:"Ext.data.NodeStore",alias:"store.tree",config:{root:undefined,clearOnLoad:true,nodeParam:"node",defaultRootId:"root",defaultRootProperty:"children",recursive:true},applyProxy:function(){return Ext.data.Store.prototype.applyProxy.apply(this,arguments)},applyRoot:function(a){var b=this;a=a||{};a=Ext.apply({},a);if(!a.isModel){Ext.applyIf(a,{id:b.getDefaultRootId(),text:"Root",allowDrag:false});a=Ext.data.ModelManager.create(a,b.getModel())}Ext.data.NodeInterface.decorate(a);a.set(a.raw);return a},handleTreeInsertionIndex:function(a,b,d,c){if(b.parentNode){b.parentNode.sort(d.getSortFn(),true,true)}return this.callParent(arguments)},handleTreeSort:function(a,b){if(this._sorting){return a}this._sorting=true;this.getNode().sort(b.getSortFn(),true,true);delete this._sorting;return this.callParent(arguments)},updateRoot:function(a,b){if(b){b.unBefore({expand:"onNodeBeforeExpand",scope:this});b.unjoin(this)}a.onBefore({expand:"onNodeBeforeExpand",scope:this});this.onNodeAppend(null,a);this.setNode(a);if(!a.isLoaded()&&!a.isLoading()&&a.isExpanded()){this.load({node:a})}this.fireEvent("rootchange",this,a,b)},getNodeById:function(a){return this.data.getByKey(a)},onNodeBeforeExpand:function(b,a,c){if(b.isLoading()){c.pause();this.on("load",function(){c.resume()},this,{single:true})}else{if(!b.isLoaded()){c.pause();this.load({node:b,callback:function(){c.resume()}})}}},onNodeAppend:function(l,b){var j=this.getProxy(),g=j.getReader(),e=b.raw,c=[],a=g.getRootProperty(),k,f,d,h;if(!b.isLeaf()){k=g.getRoot(e);if(k){f=g.extractData(k);for(d=0,h=f.length;d<h;d++){if(f[d].node[a]){f[d].data[a]=f[d].node[a]}c.push(f[d].data)}if(c.length){this.fillNode(b,c)}delete e[a]}}},updateAutoLoad:function(b){if(b){var a=this.getRoot();if(!a.isLoaded()&&!a.isLoading()){this.load({node:a})}}},load:function(a){a=a||{};a.params=a.params||{};var c=this,b=a.node=a.node||c.getRoot();a.params[c.getNodeParam()]=b.getId();if(c.getClearOnLoad()){b.removeAll(true)}b.set("loading",true);return c.callParent([a])},updateProxy:function(b){this.callParent(arguments);var a=b.getReader();if(!a.getRootProperty()){a.setRootProperty(this.getDefaultRootProperty());a.buildExtractors()}},removeAll:function(){this.getRootNode().removeAll(true);this.callParent(arguments)},onProxyLoad:function(b){var d=this,a=b.getRecords(),e=b.wasSuccessful(),c=b.getNode();c.beginEdit();c.set("loading",false);if(e){a=d.fillNode(c,a)}c.endEdit();c.fireEvent("load",c,a,e);d.loading=false;d.fireEvent("load",this,a,e);Ext.callback(b.getCallback(),b.getScope()||d,[a,b,e])},fillNode:function(d,a){var c=a?a.length:0,b,e;for(b=0;b<c;b++){e=d.appendChild(a[b],true,true);this.onNodeAppend(d,e)}d.set("loaded",true);return a}});Ext.define("Ext.data.proxy.Rest",{extend:"Ext.data.proxy.Ajax",alternateClassName:"Ext.data.RestProxy",alias:"proxy.rest",config:{appendId:true,format:null,batchActions:false,actionMethods:{create:"POST",read:"GET",update:"PUT",destroy:"DELETE"}},buildUrl:function(f){var i=this,e=f.getOperation(),c=e.getRecords()||[],h=c[0],g=i.getModel(),k=g.getIdProperty(),j=i.getFormat(),a=i.getUrl(f),d=f.getParams()||{},b=(h&&!h.phantom)?h.getId():d[k];if(i.getAppendId()&&b){if(!a.match(/\/$/)){a+="/"}a+=b;delete d[k]}if(j){if(!a.match(/\.$/)){a+="."}a+=j}f.setUrl(a);return i.callParent([f])}});Ext.define("Ext.direct.RemotingProvider",{alias:"direct.remotingprovider",extend:"Ext.direct.JsonProvider",requires:["Ext.util.MixedCollection","Ext.util.DelayedTask","Ext.direct.Transaction","Ext.direct.RemotingMethod"],config:{namespace:undefined,url:null,enableUrlEncode:null,enableBuffer:10,maxRetries:1,timeout:undefined,actions:{}},constructor:function(a){var b=this;b.callParent(arguments);b.transactions=Ext.create("Ext.util.Collection",function(c){return c.getId()});b.callBuffer=[]},applyNamespace:function(a){if(Ext.isString(a)){return Ext.ns(a)}return a||window},initAPI:function(){var g=this.getActions(),d=this.getNamespace(),f,a,b,c,e,h;for(f in g){if(g.hasOwnProperty(f)){a=d[f];if(!a){a=d[f]={}}b=g[f];for(c=0,e=b.length;c<e;++c){h=Ext.create("Ext.direct.RemotingMethod",b[c]);a[h.getName()]=this.createHandler(f,h)}}}},createHandler:function(c,d){var b=this,a;if(!d.getFormHandler()){a=function(){b.configureRequest(c,d,Array.prototype.slice.call(arguments,0))}}else{a=function(f,g,e){b.configureFormRequest(c,d,f,g,e)}}a.directCfg={action:c,method:d};return a},isConnected:function(){return !!this.connected},connect:function(){var a=this;if(a.getUrl()){a.initAPI();a.connected=true;a.fireEvent("connect",a)}else{}},disconnect:function(){var a=this;if(a.connected){a.connected=false;a.fireEvent("disconnect",a)}},runCallback:function(e,b){var d=!!b.getStatus(),c=d?"success":"failure",f=e&&e.getCallback(),a;if(f){a=b.getResult();if(Ext.isFunction(f)){f(a,b,d)}else{Ext.callback(f[c],f.scope,[a,b,d]);Ext.callback(f.callback,f.scope,[a,b,d])}}},onData:function(k,h,c){var f=this,d=0,e,j,a,b,g;if(h){j=f.createEvents(c);for(e=j.length;d<e;++d){a=j[d];b=f.getTransaction(a);f.fireEvent("data",f,a);if(b){f.runCallback(b,a,true);Ext.direct.Manager.removeTransaction(b)}}}else{g=[].concat(k.transaction);for(e=g.length;d<e;++d){b=f.getTransaction(g[d]);if(b&&b.getRetryCount()<f.getMaxRetries()){b.retry()}else{a=Ext.create("Ext.direct.ExceptionEvent",{data:null,transaction:b,code:Ext.direct.Manager.exceptions.TRANSPORT,message:"Unable to connect to the server.",xhr:c});f.fireEvent("data",f,a);if(b){f.runCallback(b,a,false);Ext.direct.Manager.removeTransaction(b)}}}}},getTransaction:function(a){return a&&a.getTid()?Ext.direct.Manager.getTransaction(a.getTid()):null},configureRequest:function(d,a,f){var g=this,c=a.getCallData(f),e=c.data,h=c.callback,i=c.scope,b;b=Ext.create("Ext.direct.Transaction",{provider:g,args:f,action:d,method:a.getName(),data:e,callback:i&&Ext.isFunction(h)?Ext.Function.bind(h,i):h});if(g.fireEvent("beforecall",g,b,a)!==false){Ext.direct.Manager.addTransaction(b);g.queueTransaction(b);g.fireEvent("call",g,b,a)}},getCallData:function(a){return{action:a.getAction(),method:a.getMethod(),data:a.getData(),type:"rpc",tid:a.getId()}},sendRequest:function(g){var f=this,e={url:f.getUrl(),callback:f.onData,scope:f,transaction:g,timeout:f.getTimeout()},a,c=f.getEnableUrlEncode(),b=0,d,h;if(Ext.isArray(g)){a=[];for(d=g.length;b<d;++b){a.push(f.getCallData(g[b]))}}else{a=f.getCallData(g)}if(c){h={};h[Ext.isString(c)?c:"data"]=Ext.encode(a);e.params=h}else{e.jsonData=a}Ext.Ajax.request(e)},queueTransaction:function(c){var b=this,a=b.getEnableBuffer();if(c.getForm()){b.sendFormRequest(c);return}b.callBuffer.push(c);if(a){if(!b.callTask){b.callTask=Ext.create("Ext.util.DelayedTask",b.combineAndSend,b)}b.callTask.delay(Ext.isNumber(a)?a:10)}else{b.combineAndSend()}},combineAndSend:function(){var a=this.callBuffer,b=a.length;if(b>0){this.sendRequest(b==1?a[0]:a);this.callBuffer=[]}}});Ext.define("Ext.util.TapRepeater",{requires:["Ext.DateExtras"],mixins:{observable:"Ext.mixin.Observable"},config:{el:null,accelerate:true,interval:10,delay:250,preventDefault:true,stopDefault:false,timer:0,pressCls:null},constructor:function(a){var b=this;b.initConfig(a)},updateEl:function(c,b){var a={touchstart:"onTouchStart",touchend:"onTouchEnd",tap:"eventOptions",scope:this};if(b){b.un(a)}c.on(a)},eventOptions:function(a){if(this.getPreventDefault()){a.preventDefault()}if(this.getStopDefault()){a.stopEvent()}},destroy:function(){this.clearListeners();Ext.destroy(this.el)},onTouchStart:function(c){var b=this,a=b.getPressCls();clearTimeout(b.getTimer());if(a){b.getEl().addCls(a)}b.tapStartTime=new Date();b.fireEvent("touchstart",b,c);b.fireEvent("tap",b,c);if(b.getAccelerate()){b.delay=400}b.setTimer(Ext.defer(b.tap,b.getDelay()||b.getInterval(),b,[c]))},tap:function(b){var a=this;a.fireEvent("tap",a,b);a.setTimer(Ext.defer(a.tap,a.getAccelerate()?a.easeOutExpo(Ext.Date.getElapsed(a.tapStartTime),400,-390,12000):a.getInterval(),a,[b]))},easeOutExpo:function(e,a,g,f){return(e==f)?a+g:g*(-Math.pow(2,-10*e/f)+1)+a},onTouchEnd:function(b){var a=this;clearTimeout(a.getTimer());a.getEl().removeCls(a.getPressCls());a.fireEvent("touchend",a,b)}});Ext.define("Ext.util.translatable.Abstract",{extend:"Ext.Evented",requires:["Ext.fx.easing.Linear"],config:{element:null,easing:null,easingX:null,easingY:null,fps:60},constructor:function(a){var b;this.doAnimationFrame=Ext.Function.bind(this.doAnimationFrame,this);this.x=0;this.y=0;this.activeEasingX=null;this.activeEasingY=null;this.initialConfig=a;if(a&&a.element){b=a.element;this.setElement(b)}},applyElement:function(a){if(!a){return}return Ext.get(a)},updateElement:function(a){this.initConfig(this.initialConfig);this.refresh()},factoryEasing:function(a){return Ext.factory(a,Ext.fx.easing.Linear,null,"easing")},applyEasing:function(a){if(!this.getEasingX()){this.setEasingX(this.factoryEasing(a))}if(!this.getEasingY()){this.setEasingY(this.factoryEasing(a))}},applyEasingX:function(a){return this.factoryEasing(a)},applyEasingY:function(a){return this.factoryEasing(a)},updateFps:function(a){this.animationInterval=1000/a},doTranslate:function(a,b){if(typeof a=="number"){this.x=a}if(typeof b=="number"){this.y=b}return this},translate:function(a,c,b){if(Ext.isObject(a)){throw new Error()}this.stopAnimation();if(b!==undefined){return this.translateAnimated(a,c,b)}return this.doTranslate(a,c)},animate:function(b,a){this.activeEasingX=b;this.activeEasingY=a;this.isAnimating=true;this.animationTimer=setInterval(this.doAnimationFrame,this.animationInterval);this.fireEvent("animationstart",this,this.x,this.y);return this},translateAnimated:function(b,g,e){if(Ext.isObject(b)){throw new Error()}if(!Ext.isObject(e)){e={}}var d=Ext.Date.now(),f=e.easing,c=(typeof b=="number")?(e.easingX||this.getEasingX()||f||true):null,a=(typeof g=="number")?(e.easingY||this.getEasingY()||f||true):null;if(c){c=this.factoryEasing(c);c.setStartTime(d);c.setStartValue(this.x);c.setEndValue(b);if("duration" in e){c.setDuration(e.duration)}}if(a){a=this.factoryEasing(a);a.setStartTime(d);a.setStartValue(this.y);a.setEndValue(g);if("duration" in e){a.setDuration(e.duration)}}return this.animate(c,a)},doAnimationFrame:function(){if(!this.isAnimating){return}var c=this.activeEasingX,b=this.activeEasingY,a,d;if(c===null&&b===null){this.stopAnimation();return}if(c!==null){this.x=a=Math.round(c.getValue());if(c.isEnded){this.activeEasingX=null;this.fireEvent("axisanimationend",this,"x",a)}}else{a=this.x}if(b!==null){this.y=d=Math.round(b.getValue());if(b.isEnded){this.activeEasingY=null;this.fireEvent("axisanimationend",this,"y",d)}}else{d=this.y}this.doTranslate(a,d);this.fireEvent("animationframe",this,a,d)},stopAnimation:function(){if(!this.isAnimating){return}this.activeEasingX=null;this.activeEasingY=null;this.isAnimating=false;clearInterval(this.animationTimer);this.fireEvent("animationend",this,this.x,this.y)},refresh:function(){this.translate(this.x,this.y)}});Ext.define("Ext.util.translatable.CssTransform",{extend:"Ext.util.translatable.Abstract",doTranslate:function(a,c){var b=this.getElement().dom.style;if(typeof a!="number"){a=this.x}if(typeof c!="number"){c=this.y}b.webkitTransform="translate3d("+a+"px, "+c+"px, 0px)";return this.callParent(arguments)},destroy:function(){var a=this.getElement();if(a&&!a.isDestroyed){a.dom.style.webkitTransform=null}this.callParent(arguments)}});Ext.define("Ext.util.translatable.ScrollPosition",{extend:"Ext.util.translatable.Abstract",wrapperWidth:0,wrapperHeight:0,baseCls:"x-translatable",config:{useWrapper:true},getWrapper:function(){var e=this.wrapper,c=this.baseCls,b=this.getElement(),d,a;if(!e){a=b.getParent();if(!a){return null}if(this.getUseWrapper()){e=b.wrap({className:c+"-wrapper"},true)}else{e=a.dom}e.appendChild(Ext.Element.create({className:c+"-stretcher"},true));this.nestedStretcher=d=Ext.Element.create({className:c+"-nested-stretcher"},true);b.appendChild(d);b.addCls(c);a.addCls(c+"-container");this.container=a;this.wrapper=e;this.refresh()}return e},doTranslate:function(a,c){var b=this.getWrapper();if(b){if(typeof a=="number"){b.scrollLeft=this.wrapperWidth-a}if(typeof c=="number"){b.scrollTop=this.wrapperHeight-c}}return this.callParent(arguments)},refresh:function(){var a=this.getWrapper();if(a){this.wrapperWidth=a.offsetWidth;this.wrapperHeight=a.offsetHeight;this.callParent(arguments)}},destroy:function(){var b=this.getElement(),a=this.baseCls;if(this.wrapper){if(this.getUseWrapper()){b.unwrap()}this.container.removeCls(a+"-container");b.removeCls(a);b.removeChild(this.nestedStretcher)}this.callParent(arguments)}});Ext.define("Ext.util.Translatable",{requires:["Ext.util.translatable.CssTransform","Ext.util.translatable.ScrollPosition"],constructor:function(a){var c=Ext.util.translatable,e=c.CssTransform,d=c.ScrollPosition,b;if(typeof a=="object"&&"translationMethod" in a){if(a.translationMethod==="scrollposition"){b=d}else{if(a.translationMethod==="csstransform"){b=e}}}if(!b){if(Ext.os.is.Android2||Ext.browser.is.ChromeMobile){b=d}else{b=e}}return new b(a)}});Ext.define("Ext.behavior.Translatable",{extend:"Ext.behavior.Behavior",requires:["Ext.util.Translatable"],constructor:function(){this.listeners={painted:"onComponentPainted",scope:this};this.callParent(arguments)},onComponentPainted:function(){this.translatable.refresh()},setConfig:function(c){var a=this.translatable,b=this.component;if(c){if(!a){this.translatable=a=new Ext.util.Translatable(c);a.setElement(b.renderElement);a.on("destroy","onTranslatableDestroy",this);if(b.isPainted()){this.onComponentPainted(b)}b.on(this.listeners)}else{if(Ext.isObject(c)){a.setConfig(c)}}}else{if(a){a.destroy()}}return this},getTranslatable:function(){return this.translatable},onTranslatableDestroy:function(){var a=this.component;delete this.translatable;a.un(this.listeners)},onComponentDestroy:function(){var a=this.translatable;if(a){a.destroy()}}});Ext.define("Ext.scroll.Scroller",{extend:"Ext.Evented",requires:["Ext.fx.easing.BoundMomentum","Ext.fx.easing.EaseOut","Ext.util.SizeMonitor","Ext.util.Translatable"],config:{element:null,direction:"auto",translationMethod:"auto",fps:"auto",disabled:null,directionLock:false,momentumEasing:{momentum:{acceleration:30,friction:0.5},bounce:{acceleration:30,springTension:0.3},minVelocity:1},bounceEasing:{duration:400},outOfBoundRestrictFactor:0.5,startMomentumResetTime:300,maxAbsoluteVelocity:6,containerSize:"auto",containerScrollSize:"auto",size:"auto",autoRefresh:true,initialOffset:{x:0,y:0},slotSnapSize:{x:0,y:0},slotSnapOffset:{x:0,y:0},slotSnapEasing:{duration:150}},cls:Ext.baseCSSPrefix+"scroll-scroller",containerCls:Ext.baseCSSPrefix+"scroll-container",dragStartTime:0,dragEndTime:0,isDragging:false,isAnimating:false,constructor:function(a){var b=a&&a.element;this.doAnimationFrame=Ext.Function.bind(this.doAnimationFrame,this);this.stopAnimation=Ext.Function.bind(this.stopAnimation,this);this.listeners={scope:this,touchstart:"onTouchStart",touchend:"onTouchEnd",dragstart:"onDragStart",drag:"onDrag",dragend:"onDragEnd"};this.minPosition={x:0,y:0};this.startPosition={x:0,y:0};this.size={x:0,y:0};this.position={x:0,y:0};this.velocity={x:0,y:0};this.isAxisEnabledFlags={x:false,y:false};this.flickStartPosition={x:0,y:0};this.flickStartTime={x:0,y:0};this.lastDragPosition={x:0,y:0};this.dragDirection={x:0,y:0};this.initialConfig=a;if(b){this.setElement(b)}return this},applyElement:function(a){if(!a){return}return Ext.get(a)},updateElement:function(a){this.initialize();a.addCls(this.cls);if(!this.getDisabled()){this.attachListeneners()}this.onConfigUpdate(["containerSize","size"],"refreshMaxPosition");this.on("maxpositionchange","snapToBoundary");this.on("minpositionchange","snapToBoundary");return this},getTranslatable:function(){if(!this.hasOwnProperty("translatable")){var a=this.getBounceEasing();this.translatable=new Ext.util.Translatable({translationMethod:this.getTranslationMethod(),element:this.getElement(),easingX:a.x,easingY:a.y,useWrapper:false,listeners:{animationframe:"onAnimationFrame",animationend:"onAnimationEnd",axisanimationend:"onAxisAnimationEnd",scope:this}})}return this.translatable},updateFps:function(a){if(a!=="auto"){this.getTranslatable().setFps(a)}},attachListeneners:function(){this.getContainer().on(this.listeners)},detachListeners:function(){this.getContainer().un(this.listeners)},updateDisabled:function(a){if(a){this.detachListeners()}else{this.attachListeneners()}},updateInitialOffset:function(c){if(typeof c=="number"){c={x:c,y:c}}var b=this.position,a,d;b.x=a=c.x;b.y=d=c.y;this.getTranslatable().doTranslate(-a,-d)},applyDirection:function(a){var e=this.getMinPosition(),d=this.getMaxPosition(),c,b;this.givenDirection=a;if(a==="auto"){c=d.x>e.x;b=d.y>e.y;if(c&&b){a="both"}else{if(c){a="horizontal"}else{a="vertical"}}}return a},updateDirection:function(b){var a=this.isAxisEnabledFlags;a.x=(b==="both"||b==="horizontal");a.y=(b==="both"||b==="vertical")},isAxisEnabled:function(a){this.getDirection();return this.isAxisEnabledFlags[a]},applyMomentumEasing:function(b){var a=Ext.fx.easing.BoundMomentum;return{x:Ext.factory(b,a),y:Ext.factory(b,a)}},applyBounceEasing:function(b){var a=Ext.fx.easing.EaseOut;return{x:Ext.factory(b,a),y:Ext.factory(b,a)}},applySlotSnapEasing:function(b){var a=Ext.fx.easing.EaseOut;return{x:Ext.factory(b,a),y:Ext.factory(b,a)}},getMinPosition:function(){var a=this.minPosition;if(!a){this.minPosition=a={x:0,y:0};this.fireEvent("minpositionchange",this,a)}return a},getMaxPosition:function(){var c=this.maxPosition,a,b;if(!c){a=this.getSize();b=this.getContainerSize();this.maxPosition=c={x:Math.max(0,a.x-b.x),y:Math.max(0,a.y-b.y)};this.fireEvent("maxpositionchange",this,c)}return c},refreshMaxPosition:function(){this.maxPosition=null;this.getMaxPosition()},applyContainerSize:function(b){var c,a,d;this.givenContainerSize=b;if(b==="auto"){c=this.getContainer().dom;a=c.offsetWidth;d=c.offsetHeight}else{a=b.x;d=b.y}return{x:a,y:d}},applySize:function(b){var c,a,d;this.givenSize=b;if(b==="auto"){c=this.getElement().dom;a=c.offsetWidth;d=c.offsetHeight}else{a=b.x;d=b.y}return{x:a,y:d}},applyContainerScrollSize:function(b){var c,a,d;this.givenContainerScrollSize=b;if(b==="auto"){c=this.getContainer().dom;a=c.scrollWidth;d=c.scrollHeight}else{a=b.x;d=b.y}return{x:a,y:d}},updateAutoRefresh:function(b){var c=Ext.util.SizeMonitor,a;if(b){this.sizeMonitors={element:new c({element:this.getElement(),callback:this.doRefresh,scope:this}),container:new c({element:this.getContainer(),callback:this.doRefresh,scope:this})}}else{a=this.sizeMonitors;if(a){a.element.destroy();a.container.destroy()}}},applySlotSnapSize:function(a){if(typeof a=="number"){return{x:a,y:a}}return a},applySlotSnapOffset:function(a){if(typeof a=="number"){return{x:a,y:a}}return a},getContainer:function(){var a=this.container;if(!a){this.container=a=this.getElement().getParent();a.addCls(this.containerCls)}return a},doRefresh:function(){this.stopAnimation();this.getTranslatable().refresh();this.setSize(this.givenSize);this.setContainerSize(this.givenContainerSize);this.setContainerScrollSize(this.givenContainerScrollSize);this.setDirection(this.givenDirection);this.fireEvent("refresh",this)},refresh:function(){var a=this.sizeMonitors;if(a){a.element.refresh();a.container.refresh()}this.doRefresh();return this},scrollTo:function(c,h,g){var b=this.getTranslatable(),a=this.position,d=false,f,e;if(this.isAxisEnabled("x")){if(typeof c!="number"){c=a.x}else{if(a.x!==c){a.x=c;d=true}}f=-c}if(this.isAxisEnabled("y")){if(typeof h!="number"){h=a.y}else{if(a.y!==h){a.y=h;d=true}}e=-h}if(d){if(g!==undefined){b.translateAnimated(f,e,g)}else{this.fireEvent("scroll",this,a.x,a.y);b.doTranslate(f,e)}}return this},scrollToTop:function(b){var a=this.getInitialOffset();return this.scrollTo(a.x,a.y,b)},scrollToEnd:function(a){return this.scrollTo(0,this.getSize().y-this.getContainerSize().y,a)},scrollBy:function(b,d,c){var a=this.position;b=(typeof b=="number")?b+a.x:null;d=(typeof d=="number")?d+a.y:null;return this.scrollTo(b,d,c)},onTouchStart:function(){this.isTouching=true;this.stopAnimation()},onTouchEnd:function(){var a=this.position;this.isTouching=false;if(!this.isDragging&&this.snapToSlot()){this.fireEvent("scrollstart",this,a.x,a.y)}},onDragStart:function(l){var o=this.getDirection(),g=l.absDeltaX,f=l.absDeltaY,j=this.getDirectionLock(),i=this.startPosition,d=this.flickStartPosition,k=this.flickStartTime,h=this.lastDragPosition,c=this.position,b=this.dragDirection,n=c.x,m=c.y,a=Ext.Date.now();this.isDragging=true;if(j&&o!=="both"){if((o==="horizontal"&&g>f)||(o==="vertical"&&f>g)){l.stopPropagation()}else{this.isDragging=false;return}}h.x=n;h.y=m;d.x=n;d.y=m;i.x=n;i.y=m;k.x=a;k.y=a;b.x=0;b.y=0;this.dragStartTime=a;this.isDragging=true;this.fireEvent("scrollstart",this,n,m)},onAxisDrag:function(i,q){if(!this.isAxisEnabled(i)){return}var h=this.flickStartPosition,l=this.flickStartTime,j=this.lastDragPosition,e=this.dragDirection,g=this.position[i],k=this.getMinPosition()[i],o=this.getMaxPosition()[i],d=this.startPosition[i],p=j[i],n=d-q,c=e[i],m=this.getOutOfBoundRestrictFactor(),f=this.getStartMomentumResetTime(),b=Ext.Date.now(),a;if(n<k){n*=m}else{if(n>o){a=n-o;n=o+a*m}}if(n>p){e[i]=1}else{if(n<p){e[i]=-1}}if((c!==0&&(e[i]!==c))||(b-l[i])>f){h[i]=g;l[i]=b}j[i]=n},onDrag:function(b){if(!this.isDragging){return}var a=this.lastDragPosition;this.onAxisDrag("x",b.deltaX);this.onAxisDrag("y",b.deltaY);this.scrollTo(a.x,a.y)},onDragEnd:function(c){var b,a;if(!this.isDragging){return}this.dragEndTime=Ext.Date.now();this.onDrag(c);this.isDragging=false;b=this.getAnimationEasing("x");a=this.getAnimationEasing("y");if(b||a){this.getTranslatable().animate(b,a)}else{this.onScrollEnd()}},getAnimationEasing:function(g){if(!this.isAxisEnabled(g)){return null}var e=this.position[g],f=this.flickStartPosition[g],k=this.flickStartTime[g],c=this.getMinPosition()[g],j=this.getMaxPosition()[g],a=this.getMaxAbsoluteVelocity(),d=null,b=this.dragEndTime,l,i,h;if(e<c){d=c}else{if(e>j){d=j}}if(d!==null){l=this.getBounceEasing()[g];l.setConfig({startTime:b,startValue:-e,endValue:-d});return l}h=b-k;if(h===0){return null}i=(e-f)/(b-k);if(i===0){return null}if(i<-a){i=-a}else{if(i>a){i=a}}l=this.getMomentumEasing()[g];l.setConfig({startTime:b,startValue:-e,startVelocity:-i,minMomentumValue:-j,maxMomentumValue:0});return l},onAnimationFrame:function(c,b,d){var a=this.position;a.x=-b;a.y=-d;this.fireEvent("scroll",this,a.x,a.y)},onAxisAnimationEnd:function(a){},onAnimationEnd:function(){this.snapToBoundary();this.onScrollEnd()},stopAnimation:function(){this.getTranslatable().stopAnimation()},onScrollEnd:function(){var a=this.position;if(this.isTouching||!this.snapToSlot()){this.fireEvent("scrollend",this,a.x,a.y)}},snapToSlot:function(){var b=this.getSnapPosition("x"),a=this.getSnapPosition("y"),c=this.getSlotSnapEasing();if(b!==null||a!==null){this.scrollTo(b,a,{easingX:c.x,easingY:c.y});return true}return false},getSnapPosition:function(c){var g=this.getSlotSnapSize()[c],d=null,a,f,e,b;if(g!==0&&this.isAxisEnabled(c)){a=this.position[c];f=this.getSlotSnapOffset()[c];e=this.getMaxPosition()[c];b=(a-f)%g;if(b!==0){if(Math.abs(b)>g/2){d=a+((b>0)?g-b:b-g);if(d>e){d=a-b}}else{d=a-b}}}return d},snapToBoundary:function(){var g=this.position,c=this.getMinPosition(),f=this.getMaxPosition(),e=c.x,d=c.y,b=f.x,a=f.y,i=Math.round(g.x),h=Math.round(g.y);if(i<e){i=e}else{if(i>b){i=b}}if(h<d){h=d}else{if(h>a){h=a}}this.scrollTo(i,h)},destroy:function(){var b=this.getElement(),a=this.sizeMonitors;if(a){a.element.destroy();a.container.destroy()}if(b&&!b.isDestroyed){b.removeCls(this.cls);this.getContainer().removeCls(this.containerCls)}Ext.destroy(this.translatable);this.callParent(arguments)}},function(){});Ext.define("Ext.util.Draggable",{isDraggable:true,mixins:["Ext.mixin.Observable"],requires:["Ext.util.SizeMonitor","Ext.util.Translatable"],config:{cls:Ext.baseCSSPrefix+"draggable",draggingCls:Ext.baseCSSPrefix+"dragging",element:null,constraint:"container",disabled:null,direction:"both",translatable:{}},DIRECTION_BOTH:"both",DIRECTION_VERTICAL:"vertical",DIRECTION_HORIZONTAL:"horizontal",constructor:function(a){var b;this.sizeMonitors={};this.extraConstraint={};this.initialConfig=a;this.offset={x:0,y:0};this.listeners={dragstart:"onDragStart",drag:"onDrag",dragend:"onDragEnd",scope:this};if(a&&a.element){b=a.element;delete a.element;this.setElement(b)}return this},applyElement:function(a){if(!a){return}return Ext.get(a)},updateElement:function(a){a.on(this.listeners);this.sizeMonitors.element=new Ext.util.SizeMonitor({element:a,callback:this.doRefresh,scope:this});this.initConfig(this.initialConfig)},updateCls:function(a){this.getElement().addCls(a)},applyTranslatable:function(a,b){a=Ext.factory(a,Ext.util.Translatable,b);a.setElement(this.getElement());return a},setExtraConstraint:function(a){this.extraConstraint=a||{};this.refreshConstraint();return this},addExtraConstraint:function(a){Ext.merge(this.extraConstraint,a);this.refreshConstraint();return this},applyConstraint:function(b,a){this.currentConstraint=b;if(b==="container"){return Ext.merge(this.getContainerConstraint(),this.extraConstraint)}return Ext.merge({},this.extraConstraint,b)},updateConstraint:function(){this.refreshOffset()},getContainerConstraint:function(){var b=this.getContainer();if(!b){return{min:{x:-Infinity,y:-Infinity},max:{x:Infinity,y:Infinity}}}var g=this.getElement().dom,f=b.dom,c=g.offsetWidth,a=g.offsetHeight,e=f.offsetWidth,d=f.offsetHeight;return{min:{x:0,y:0},max:{x:e-c,y:d-a}}},getContainer:function(){var a=this.container;if(!a){a=this.getElement().getParent();if(a){this.sizeMonitors.container=new Ext.util.SizeMonitor({element:a,callback:this.doRefresh,scope:this});this.container=a}}return a},detachListeners:function(){this.getElement().un(this.listeners)},isAxisEnabled:function(a){var b=this.getDirection();if(a==="x"){return(b===this.DIRECTION_BOTH||b===this.DIRECTION_HORIZONTAL)}return(b===this.DIRECTION_BOTH||b===this.DIRECTION_VERTICAL)},onDragStart:function(a){if(this.getDisabled()){return false}var b=this.offset;this.fireAction("dragstart",[this,a,b.x,b.y],this.initDragStart)},initDragStart:function(b,c,a,d){this.dragStartOffset={x:a,y:d};this.isDragging=true;this.getElement().addCls(this.getDraggingCls())},onDrag:function(b){if(!this.isDragging){return}var a=this.dragStartOffset;this.fireAction("drag",[this,b,a.x+b.deltaX,a.y+b.deltaY],this.doDrag)},doDrag:function(b,c,a,d){b.setOffset(a,d)},onDragEnd:function(a){if(!this.isDragging){return}this.onDrag(a);this.isDragging=false;this.getElement().removeCls(this.getDraggingCls());this.fireEvent("dragend",this,a,this.offset.x,this.offset.y)},setOffset:function(i,h,b){var f=this.offset,a=this.getConstraint(),e=a.min,c=a.max,d=Math.min,g=Math.max;if(this.isAxisEnabled("x")&&typeof i=="number"){i=d(g(i,e.x),c.x)}else{i=f.x}if(this.isAxisEnabled("y")&&typeof h=="number"){h=d(g(h,e.y),c.y)}else{h=f.y}f.x=i;f.y=h;this.getTranslatable().translate(i,h,b)},getOffset:function(){return this.offset},refreshConstraint:function(){this.setConstraint(this.currentConstraint)},refreshOffset:function(){var a=this.offset;this.setOffset(a.x,a.y)},doRefresh:function(){this.refreshConstraint();this.getTranslatable().refresh();this.refreshOffset()},refresh:function(){var a=this.sizeMonitors;if(a.element){a.element.refresh()}if(a.container){a.container.refresh()}this.doRefresh()},enable:function(){return this.setDisabled(false)},disable:function(){return this.setDisabled(true)},destroy:function(){var b=this.sizeMonitors,a=this.getTranslatable();if(b.element){b.element.destroy()}if(b.container){b.container.destroy()}var c=this.getElement();if(c&&!c.isDestroyed){c.removeCls(this.getCls())}this.detachListeners();if(a){a.destroy()}}},function(){});Ext.define("Ext.behavior.Draggable",{extend:"Ext.behavior.Behavior",requires:["Ext.util.Draggable"],constructor:function(){this.listeners={painted:"onComponentPainted",scope:this};this.callParent(arguments)},onComponentPainted:function(){this.draggable.refresh()},setConfig:function(c){var a=this.draggable,b=this.component;if(c){if(!a){b.setTranslatable(true);this.draggable=a=new Ext.util.Draggable(c);a.setTranslatable(b.getTranslatable());a.setElement(b.renderElement);a.on("destroy","onDraggableDestroy",this);if(b.isPainted()){this.onComponentPainted(b)}b.on(this.listeners)}else{if(Ext.isObject(c)){a.setConfig(c)}}}else{if(a){a.destroy()}}return this},getDraggable:function(){return this.draggable},onDraggableDestroy:function(){var a=this.component;delete this.draggable;a.un(this.listeners)},onComponentDestroy:function(){var a=this.draggable;if(a){a.destroy()}}});(function(a){Ext.define("Ext.Component",{extend:"Ext.AbstractComponent",alternateClassName:"Ext.lib.Component",mixins:["Ext.mixin.Traversable"],requires:["Ext.ComponentManager","Ext.XTemplate","Ext.dom.Element","Ext.behavior.Translatable","Ext.behavior.Draggable"],xtype:"component",observableType:"component",cachedConfig:{baseCls:null,cls:null,floatingCls:null,hiddenCls:a+"item-hidden",ui:null,margin:null,padding:null,border:null,styleHtmlCls:a+"html",styleHtmlContent:null},eventedConfig:{left:null,top:null,right:null,bottom:null,width:null,height:null,minWidth:null,minHeight:null,maxWidth:null,maxHeight:null,docked:null,centered:null,hidden:null,disabled:null},config:{style:null,html:null,draggable:null,translatable:null,renderTo:null,zIndex:null,tpl:null,enterAnimation:null,exitAnimation:null,showAnimation:null,hideAnimation:null,tplWriteMode:"overwrite",data:null,disabledCls:a+"item-disabled",contentEl:null,itemId:undefined,record:null,plugins:null},listenerOptionsRegex:/^(?:delegate|single|delay|buffer|args|prepend|element)$/,alignmentRegex:/^([a-z]+)-([a-z]+)(\?)?$/,isComponent:true,floating:false,rendered:false,dockPositions:{top:true,right:true,bottom:true,left:true},innerElement:null,element:null,template:[],constructor:function(c){var d=this,b=d.config,e;d.onInitializedListeners=[];d.initialConfig=c;if(c!==undefined&&"id" in c){e=c.id}else{if("id" in b){e=b.id}else{e=d.getId()}}d.id=e;d.setId(e);Ext.ComponentManager.register(d);d.initElement();d.initConfig(d.initialConfig);d.initialize();d.triggerInitialized();if("fullscreen" in d.config){d.fireEvent("fullscreen",d)}d.fireEvent("initialize",d)},beforeInitConfig:function(b){this.beforeInitialize.apply(this,arguments)},beforeInitialize:Ext.emptyFn,initialize:Ext.emptyFn,getTemplate:function(){return this.template},getElementConfig:function(){return{reference:"element",children:this.getTemplate()}},triggerInitialized:function(){var c=this.onInitializedListeners,d=c.length,e,b;if(!this.initialized){this.initialized=true;if(d>0){for(b=0;b<d;b++){e=c[b];e.fn.call(e.scope,this)}c.length=0}}},onInitialized:function(d,c){var b=this.onInitializedListeners;if(!c){c=this}if(this.initialized){d.call(c,this)}else{b.push({fn:d,scope:c})}},renderTo:function(b,d){var f=this.renderElement.dom,e=Ext.getDom(b),c=Ext.getDom(d);if(e){if(c){e.insertBefore(f,c)}else{e.appendChild(f)}this.setRendered(Boolean(f.offsetParent))}},setParent:function(c){var b=this.parent;if(c&&b&&b!==c){b.remove(this,false)}this.parent=c;return this},applyPlugins:function(b){var d,c,e;if(!b){return b}b=[].concat(b);for(c=0,d=b.length;c<d;c++){e=b[c];b[c]=Ext.factory(e,"Ext.plugin.Plugin",null,"plugin")}return b},updatePlugins:function(e,b){var d,c;if(e){for(c=0,d=e.length;c<d;c++){e[c].init(this)}}if(b){for(c=0,d=b.length;c<d;c++){Ext.destroy(b[c])}}},updateRenderTo:function(b){this.renderTo(b)},updateStyle:function(b){this.element.dom.style.cssText+=b},updateBorder:function(b){this.element.setBorder(b)},updatePadding:function(b){this.innerElement.setPadding(b)},updateMargin:function(b){this.element.setMargin(b)},updateUi:function(b,d){var c=this.getBaseCls();if(c){if(d){this.element.removeCls(d,c)}if(b){this.element.addCls(b,c)}}},applyBaseCls:function(b){return b||a+this.xtype},updateBaseCls:function(b,c){var d=this,e=d.getUi();if(b){this.element.addCls(b);if(e){this.element.addCls(b,null,e)}}if(c){this.element.removeCls(c);if(e){this.element.removeCls(c,null,e)}}},addCls:function(b,h,j){var e=this.getCls(),g=(e)?e.slice():[],f,d,c;h=h||"";j=j||"";if(typeof b=="string"){b=[b]}f=b.length;if(!g.length&&h===""&&j===""){g=b}else{for(d=0;d<f;d++){c=h+b[d]+j;if(g.indexOf(c)==-1){g.push(c)}}}this.setCls(g)},removeCls:function(b,g,h){var d=this.getCls(),f=(d)?d.slice():[],e,c;g=g||"";h=h||"";if(typeof b=="string"){f=Ext.Array.remove(f,g+b+h)}else{e=b.length;for(c=0;c<e;c++){f=Ext.Array.remove(f,g+b[c]+h)}}this.setCls(f)},replaceCls:function(e,j,d,h){var k=this.getCls(),f=(k)?k.slice():[],g,c,b;d=d||"";h=h||"";if(typeof e=="string"){f=Ext.Array.remove(f,d+e+h)}else{if(e){g=e.length;for(c=0;c<g;c++){f=Ext.Array.remove(f,d+e[c]+h)}}}if(typeof j=="string"){f.push(d+j+h)}else{if(j){g=j.length;if(!f.length&&d===""&&h===""){f=j}else{for(c=0;c<g;c++){b=d+j[c]+h;if(f.indexOf(b)==-1){f.push(b)}}}}}this.setCls(f)},applyCls:function(b){if(typeof b=="string"){b=[b]}if(!b||!b.length){b=null}return b},updateCls:function(c,b){this.element.replaceCls(b,c)},updateStyleHtmlCls:function(d,b){var e=this.innerHtmlElement,c=this.innerElement;if(this.getStyleHtmlContent()&&b){if(e){e.replaceCls(b,d)}else{c.replaceCls(b,d)}}},applyStyleHtmlContent:function(b){return Boolean(b)},updateStyleHtmlContent:function(d){var b=this.getStyleHtmlCls(),c=this.innerElement,e=this.innerHtmlElement;if(d){if(e){e.addCls(b)}else{c.addCls(b)}}else{if(e){e.removeCls(b)}else{c.addCls(b)}}},applyContentEl:function(b){if(b){return Ext.get(b)}},updateContentEl:function(b,c){if(c){c.hide();Ext.getBody().append(c)}if(b){this.setHtml(b.dom);b.show()}},getSize:function(){return{width:this.getWidth(),height:this.getHeight()}},isCentered:function(){return Boolean(this.getCentered())},isFloating:function(){return this.floating},isDocked:function(){return Boolean(this.getDocked())},isInnerItem:function(){var b=this;return !b.isCentered()&&!b.isFloating()&&!b.isDocked()},filterPositionValue:function(b){if(b===""||b==="auto"){b=null}return b},applyTop:function(b){return this.filterPositionValue(b)},applyRight:function(b){return this.filterPositionValue(b)},applyBottom:function(b){return this.filterPositionValue(b)},applyLeft:function(b){return this.filterPositionValue(b)},doSetTop:function(b){this.updateFloating();this.element.setTop(b)},doSetRight:function(b){this.updateFloating();this.element.setRight(b)},doSetBottom:function(b){this.updateFloating();this.element.setBottom(b)},doSetLeft:function(b){this.updateFloating();this.element.setLeft(b)},doSetWidth:function(b){this.element.setWidth(b)},doSetHeight:function(b){this.element.setHeight(b)},doSetMinWidth:function(b){this.element.setMinWidth(b)},doSetMinHeight:function(b){this.element.setMinHeight(b)},doSetMaxWidth:function(b){this.element.setMaxWidth(b)},doSetMaxHeight:function(b){this.element.setMaxHeight(b)},applyCentered:function(b){b=Boolean(b);if(b){if(this.isFloating()){this.resetFloating()}if(this.isDocked()){this.setDocked(false)}}return b},doSetCentered:Ext.emptyFn,applyDocked:function(b){if(b){if(!this.dockPositions[b]){return}if(this.isFloating()){this.resetFloating()}if(this.isCentered()){this.setCentered(false)}}return b},doSetDocked:Ext.emptyFn,resetFloating:function(){this.setTop(null);this.setRight(null);this.setBottom(null);this.setLeft(null)},updateFloating:function(){var c=true,b=this.getFloatingCls();if(this.getTop()===null&&this.getBottom()===null&&this.getRight()===null&&this.getLeft()===null){c=false}if(c!==this.floating){if(c){if(this.isCentered()){this.setCentered(false)}if(this.isDocked()){this.setDocked(false)}if(b){this.addCls(b)}}else{if(b){this.removeCls(b)}}this.floating=c;this.fireEvent("floatingchange",this,c)}},updateFloatingCls:function(b,c){if(this.isFloating()){this.replaceCls(c,b)}},applyDisabled:function(b){return Boolean(b)},doSetDisabled:function(b){this.element[b?"addCls":"removeCls"](this.getDisabledCls())},updateDisabledCls:function(b,c){if(this.isDisabled()){this.element.replaceCls(c,b)}},disable:function(){this.setDisabled(true)},enable:function(){this.setDisabled(false)},isDisabled:function(){return this.getDisabled()},applyZIndex:function(b){if(b!==null){b=Number(b);if(isNaN(b)){b=null}}return b},updateZIndex:function(c){var b=this.element.dom.style;if(c!==null){b.setProperty("z-index",c,"important")}else{b.removeProperty("z-index")}},getInnerHtmlElement:function(){var b=this.innerHtmlElement,c=this.getStyleHtmlCls();if(!b||!b.dom||!b.dom.parentNode){this.innerHtmlElement=b=this.innerElement.createChild({cls:"x-innerhtml "});if(this.getStyleHtmlContent()){this.innerHtmlElement.addCls(c);this.innerElement.removeCls(c)}}return b},updateHtml:function(b){var c=this.getInnerHtmlElement();if(Ext.isElement(b)){c.setHtml("");c.append(b)}else{c.setHtml(b)}},applyHidden:function(b){return Boolean(b)},doSetHidden:function(c){var b=this.renderElement;if(c){b.hide()}else{b.show()}if(this.element){this.element[c?"addCls":"removeCls"](this.getHiddenCls())}this.fireEvent(c?"hide":"show",this)},updateHiddenCls:function(b,c){if(this.isHidden()){this.element.replaceCls(c,b)}},isHidden:function(){return this.getHidden()},hide:function(b){if(!this.getHidden()){if(b===undefined||(b&&b.isComponent)){b=this.getHideAnimation()}if(b){if(b===true){b="fadeOut"}this.onBefore({hiddenchange:"animateFn",scope:this,single:true,args:[b]})}this.setHidden(true)}return this},show:function(c){var b=this.getHidden();if(b||b===null){if(c===undefined||(c&&!c.isComponent)){c=this.getShowAnimation()}if(c){if(c===true){c="fadeIn"}this.onBefore({hiddenchange:"animateFn",scope:this,single:true,args:[c]})}this.setHidden(false)}return this},animateFn:function(g,e,h,d,c,b){if(g){var f=new Ext.fx.Animation(g);f.setElement(e.element);if(h){f.setOnEnd(function(){b.resume()});b.pause()}Ext.Animator.run(f)}},setVisibility:function(b){this.renderElement.setVisibility(b)},isRendered:function(){return this.rendered},isPainted:function(){return this.renderElement.isPainted()},applyTpl:function(b){return(Ext.isObject(b)&&b.isTemplate)?b:new Ext.XTemplate(b)},applyData:function(b){if(Ext.isObject(b)){return Ext.apply({},b)}return b},updateData:function(d){var e=this;if(d){var c=e.getTpl(),b=e.getTplWriteMode();if(c){c[b](e.getInnerHtmlElement(),d)}this.fireEvent("updatedata",e,d)}},applyRecord:function(b){if(b&&Ext.isObject(b)&&b.isModel){return b}return null},updateRecord:function(c,b){var d=this;if(b){b.unjoin(d)}if(!c){d.updateData("")}else{c.join(d);d.updateData(c.getData(true))}},afterEdit:function(){this.updateRecord(this.getRecord())},afterErase:function(){this.setRecord(null)},applyItemId:function(b){return b||this.getId()},isXType:function(c,b){if(b){return this.xtypes.indexOf(c)!=-1}return Boolean(this.xtypesMap[c])},getXTypes:function(){return this.xtypesChain.join("/")},getDraggableBehavior:function(){var b=this.draggableBehavior;if(!b){b=this.draggableBehavior=new Ext.behavior.Draggable(this)}return b},applyDraggable:function(b){this.getDraggableBehavior().setConfig(b)},getDraggable:function(){return this.getDraggableBehavior().getDraggable()},getTranslatableBehavior:function(){var b=this.translatableBehavior;if(!b){b=this.translatableBehavior=new Ext.behavior.Translatable(this)}return b},applyTranslatable:function(b){this.getTranslatableBehavior().setConfig(b)},getTranslatable:function(){return this.getTranslatableBehavior().getTranslatable()},translateAxis:function(c,e,d){var b,f;if(c==="x"){b=e}else{f=e}return this.translate(b,f,d)},translate:function(){var b=this.getTranslatable();if(!b){this.setTranslatable(true);b=this.getTranslatable()}b.translate.apply(b,arguments)},setRendered:function(c){var b=this.rendered;if(c!==b){this.rendered=c;return true}return false},setSize:function(c,b){if(c!=undefined){this.setWidth(c)}if(b!=undefined){this.setHeight(b)}},doAddListener:function(d,f,e,c,b){if(c&&"element" in c){this[c.element].doAddListener(d,f,e||this,c,b)}return this.callParent(arguments)},doRemoveListener:function(d,f,e,c,b){if(c&&"element" in c){this[c.element].doRemoveListener(d,f,e||this,c,b)}return this.callParent(arguments)},showBy:function(d,f){var c=Ext.Array.from(arguments);var b=Ext.Viewport,e=this.getParent();this.setVisibility(false);if(e!==b){b.add(this)}this.show();this.on("erased","onShowByErased",this,{single:true});b.on("resize","refreshShowBy",this,{args:[d,f]});this.currentShowByArgs=c;this.alignTo(d,f);this.setVisibility(true)},refreshShowBy:function(b,c){this.alignTo(b,c)},onShowByErased:function(){Ext.Viewport.un("resize","refreshShowBy",this)},alignTo:function(o,j){var f=o.isComponent?o.renderElement:o,c=this.renderElement,q=f.getPageBox(),B=this.getParent().element.getPageBox(),n=c.getPageBox(),y=q.height,p=q.width,t=n.height,v=n.width;B.bottom-=5;B.height-=10;B.left+=5;B.right-=5;B.top+=5;B.width-=10;if(!j||j==="auto"){if(B.bottom-q.bottom<t){if(q.top-B.top<t){if(q.left-B.left<v){j="cl-cr?"}else{j="cr-cl?"}}else{j="bc-tc?"}}else{j="tc-bc?"}}var b=j.match(this.alignmentRegex);var w=b[1].split(""),d=b[2].split(""),z=(b[3]==="?"),i=w[0],u=w[1]||i,m=d[0],l=d[1]||m,r=q.top,e=q.left,k=y/2,g=p/2,h=v/2,s=t/2,x,A;switch(i){case"t":switch(m){case"c":r+=k;break;case"b":r+=y}break;case"b":switch(m){case"c":r-=(t-k);break;case"t":r-=t;break;case"b":r-=t-y}break;case"c":switch(m){case"t":r-=s;break;case"c":r-=(s-k);break;case"b":r-=(s-y)}break}switch(u){case"l":switch(l){case"c":e+=k;break;case"r":e+=p}break;case"r":switch(l){case"r":e-=(v-p);break;case"c":e-=(v-h);break;case"l":e-=v}break;case"c":switch(l){case"l":e-=h;break;case"c":e-=(h-g);break;case"r":e-=(h-p)}break}if(z){x=(B.left+B.width)-v;A=(B.top+B.height)-t;e=Math.max(B.left,Math.min(x,e));r=Math.max(B.top,Math.min(A,r))}this.setLeft(e);this.setTop(r)},up:function(c){var b=this.parent;if(c){for(;b;b=b.parent){if(Ext.ComponentQuery.is(b,c)){return b}}}return b},getBubbleTarget:function(){return this.getParent()},destroy:function(){this.destroy=Ext.emptyFn;var e=this.getParent(),c=this.referenceList,d,f,b;if(e){e.remove(this,false)}for(d=0,f=c.length;d<f;d++){b=c[d];this[b].destroy();delete this[b]}this.setRecord(null);Ext.destroy(this.innerHtmlElement,this.getTranslatable());Ext.ComponentManager.unregister(this);this.callParent()}},function(){})})(Ext.baseCSSPrefix);Ext.define("Ext.Button",{extend:"Ext.Component",xtype:"button",cachedConfig:{pressedCls:Ext.baseCSSPrefix+"button-pressing",badgeCls:Ext.baseCSSPrefix+"badge",hasBadgeCls:Ext.baseCSSPrefix+"hasbadge",labelCls:Ext.baseCSSPrefix+"button-label",iconMaskCls:Ext.baseCSSPrefix+"icon-mask"},config:{badgeText:null,text:null,iconCls:null,icon:null,iconAlign:"left",pressedDelay:0,iconMask:null,handler:null,scope:null,autoEvent:null,ui:"normal",baseCls:Ext.baseCSSPrefix+"button"},template:[{tag:"span",reference:"badgeElement",hidden:true},{tag:"span",className:Ext.baseCSSPrefix+"button-icon",reference:"iconElement",hidden:true},{tag:"span",reference:"textElement",hidden:true}],initialize:function(){this.callParent();this.element.on({scope:this,tap:"onTap",touchstart:"onPress",touchmove:"onTouchMove",touchend:"onRelease"})},updateBadgeText:function(c){var a=this.element,b=this.badgeElement;if(c){b.show();b.setText(c)}else{b.hide()}a[(c)?"addCls":"removeCls"](this.getHasBadgeCls())},updateText:function(b){var a=this.textElement;if(b){a.show();a.setHtml(b)}else{a.hide()}},updateHtml:function(b){var a=this.textElement;if(b){a.show();a.setHtml(b)}else{a.hide()}},updateBadgeCls:function(b,a){this.badgeElement.replaceCls(a,b)},updateHasBadgeCls:function(b,c){var a=this.element;if(a.hasCls(c)){a.replaceCls(c,b)}},updateLabelCls:function(b,a){this.textElement.replaceCls(a,b)},updatePressedCls:function(b,c){var a=this.element;if(a.hasCls(c)){a.replaceCls(c,b)}},updateIcon:function(b){var c=this,a=c.iconElement;if(b){c.showIconElement();a.setStyle("background-image",b?"url("+b+")":"");c.refreshIconAlign();c.refreshIconMask()}else{c.hideIconElement();c.setIconAlign(false)}},updateIconCls:function(c,a){var d=this,b=d.iconElement;if(c){d.showIconElement();b.replaceCls(a,c);d.refreshIconAlign();d.refreshIconMask()}else{d.hideIconElement();d.setIconAlign(false)}},updateIconAlign:function(d,c){var b=this.element,a=Ext.baseCSSPrefix+"iconalign-";if(!this.getText()){d="center"}b.removeCls(a+"center");b.removeCls(a+c);if(this.getIcon()||this.getIconCls()){b.addCls(a+d)}},refreshIconAlign:function(){this.updateIconAlign(this.getIconAlign())},updateIconMaskCls:function(c,b){var a=this.iconElement;if(this.getIconMask()){a.replaceCls(b,c)}},updateIconMask:function(a){this.iconElement[a?"addCls":"removeCls"](this.getIconMaskCls())},refreshIconMask:function(){this.updateIconMask(this.getIconMask())},applyAutoEvent:function(b){var a=this;if(typeof b=="string"){b={name:b,scope:a.scope||a}}return b},updateAutoEvent:function(c){var a=c.name,b=c.scope;this.setHandler(function(){b.fireEvent(a,b,this)});this.setScope(b)},hideIconElement:function(){this.iconElement.hide()},showIconElement:function(){this.iconElement.show()},applyUi:function(a){if(a&&Ext.isString(a)){var b=a.split("-");if(b&&(b[1]=="back"||b[1]=="forward")){return b}}return a},getUi:function(){var a=this._ui;if(Ext.isArray(a)){return a.join("-")}return a},applyPressedDelay:function(a){if(Ext.isNumber(a)){return a}return(a)?100:0},onPress:function(){var a=this.element,c=this.getPressedDelay(),b=this.getPressedCls();if(!this.getDisabled()){this.isPressed=true;if(this.hasOwnProperty("releasedTimeout")){clearTimeout(this.releasedTimeout);delete this.releasedTimeout}if(c>0){this.pressedTimeout=setTimeout(function(){if(a){a.addCls(b)}},c)}else{a.addCls(b)}}},onTouchMove:function(a){return},onRelease:function(a){this.fireAction("release",[this,a],"doRelease")},doRelease:function(a,b){if(!a.isPressed){return}a.isPressed=false;if(a.hasOwnProperty("pressedTimeout")){clearTimeout(a.pressedTimeout);delete a.pressedTimeout}a.releasedTimeout=setTimeout(function(){if(a&&a.element){a.element.removeCls(a.getPressedCls())}},10)},onTap:function(a){if(this.getDisabled()){return false}this.fireAction("tap",[this,a],"doTap")},doTap:function(c,d){var b=c.getHandler(),a=c.getScope()||c;if(!b){return}if(typeof b=="string"){b=a[b]}d.preventDefault();b.apply(a,arguments)}},function(){});Ext.define("Ext.Decorator",{extend:"Ext.Component",isDecorator:true,config:{component:{}},statics:{generateProxySetter:function(a){return function(c){var b=this.getComponent();b[a].call(b,c);return this}},generateProxyGetter:function(a){return function(){var b=this.getComponent();return b[a].call(b)}}},onClassExtended:function(c,e){if(!e.hasOwnProperty("proxyConfig")){return}var f=Ext.Class,i=e.proxyConfig,d=e.config;e.config=(d)?Ext.applyIf(d,i):i;var b,h,g,a;for(b in i){if(i.hasOwnProperty(b)){h=f.getConfigNameMap(b);g=h.set;a=h.get;e[g]=this.generateProxySetter(g);e[a]=this.generateProxyGetter(a)}}},applyComponent:function(a){return Ext.factory(a,Ext.Component)},updateComponent:function(a,b){if(b){if(this.isRendered()&&b.setRendered(false)){b.fireAction("renderedchange",[this,b,false],"doUnsetComponent",this,{args:[b]})}else{this.doUnsetComponent(b)}}if(a){if(this.isRendered()&&a.setRendered(true)){a.fireAction("renderedchange",[this,a,true],"doSetComponent",this,{args:[a]})}else{this.doSetComponent(a)}}},doUnsetComponent:function(a){if(a.renderElement.dom){this.innerElement.dom.removeChild(a.renderElement.dom)}},doSetComponent:function(a){if(a.renderElement.dom){this.innerElement.dom.appendChild(a.renderElement.dom)}},setRendered:function(b){var a;if(this.callParent(arguments)){a=this.getComponent();if(a){a.setRendered(b)}return true}return false},setDisabled:function(a){this.callParent(arguments);this.getComponent().setDisabled(a)},destroy:function(){Ext.destroy(this.getComponent());this.callParent()}});Ext.define("Ext.Img",{extend:"Ext.Component",xtype:["image","img"],config:{src:null,baseCls:Ext.baseCSSPrefix+"img",mode:"background"},beforeInitialize:function(){var a=this;a.onLoad=Ext.Function.bind(a.onLoad,a);a.onError=Ext.Function.bind(a.onError,a)},initialize:function(){var a=this;a.callParent();a.relayEvents(a.renderElement,"*");a.element.on({tap:"onTap",scope:a})},hide:function(){this.callParent();this.hiddenSrc=this.hiddenSrc||this.getSrc();this.setSrc(null)},show:function(){this.callParent();if(this.hiddenSrc){this.setSrc(this.hiddenSrc);delete this.hiddenSrc}},updateMode:function(a){if(a==="background"){if(this.imageElement){this.imageElement.destroy();delete this.imageElement;this.updateSrc(this.getSrc())}}else{this.imageElement=this.element.createChild({tag:"img"})}},onTap:function(a){this.fireEvent("tap",this,a)},onAfterRender:function(){this.updateSrc(this.getSrc())},updateSrc:function(a){var b=this,c;if(b.getMode()==="background"){c=this.imageObject||new Image()}else{c=b.imageElement.dom}this.imageObject=c;c.setAttribute("src",Ext.isString(a)?a:"");c.addEventListener("load",b.onLoad,false);c.addEventListener("error",b.onError,false)},detachListeners:function(){var a=this.imageObject;if(a){a.removeEventListener("load",this.onLoad,false);a.removeEventListener("error",this.onError,false)}},onLoad:function(a){this.detachListeners();if(this.getMode()==="background"){this.element.dom.style.backgroundImage='url("'+this.imageObject.src+'")'}this.fireEvent("load",this,a)},onError:function(a){this.detachListeners();this.fireEvent("error",this,a)},doSetWidth:function(b){var a=(this.getMode()==="background")?this.element:this.imageElement;a.setWidth(b);this.callParent(arguments)},doSetHeight:function(b){var a=(this.getMode()==="background")?this.element:this.imageElement;a.setHeight(b);this.callParent(arguments)},destroy:function(){this.detachListeners();Ext.destroy(this.imageObject);delete this.imageObject;this.callParent()}});Ext.define("Ext.Label",{extend:"Ext.Component",xtype:"label",config:{}});Ext.define("Ext.Map",{extend:"Ext.Component",xtype:"map",requires:["Ext.util.GeoLocation"],isMap:true,config:{baseCls:Ext.baseCSSPrefix+"map",useCurrentLocation:false,map:null,geo:null,mapOptions:{}},constructor:function(){this.callParent(arguments);this.options={};this.element.setVisibilityMode(Ext.Element.OFFSETS);if(!(window.google||{}).maps){this.setHtml("Google Maps API is required")}},initialize:function(){this.callParent();this.on({painted:"doResize",scope:this});this.element.on("touchstart","onTouchStart",this)},onTouchStart:function(a){a.makeUnpreventable()},applyMapOptions:function(a){return Ext.merge({},this.options,a)},updateMapOptions:function(c){var b=(window.google||{}).maps,a=this.getMap();if(b&&a){a.setOptions(c)}},getMapOptions:function(){return Ext.merge({},this.options)},updateUseCurrentLocation:function(a){this.setGeo(a);if(!a){this.renderMap()}},applyGeo:function(a){return Ext.factory(a,Ext.util.GeoLocation,this.getGeo())},updateGeo:function(b,a){var c={locationupdate:"onGeoUpdate",locationerror:"onGeoError",scope:this};if(a){a.un(c)}if(b){b.on(c);b.updateLocation()}},doResize:function(){var b=(window.google||{}).maps,a=this.getMap();if(b&&a){b.event.trigger(a,"resize")}},renderMap:function(){var d=this,f=(window.google||{}).maps,b=d.element,a=d.getMapOptions(),e=d.getMap(),c;if(f){if(Ext.os.is.iPad){Ext.merge({navigationControlOptions:{style:f.NavigationControlStyle.ZOOM_PAN}},a)}a=Ext.merge({zoom:12,mapTypeId:f.MapTypeId.ROADMAP},a);if(!a.hasOwnProperty("center")){a.center=new f.LatLng(37.381592,-122.135672)}if(b.dom.firstChild){Ext.fly(b.dom.firstChild).destroy()}if(e){f.event.clearInstanceListeners(e)}d.setMap(new f.Map(b.dom,a));e=d.getMap();c=f.event;c.addListener(e,"zoom_changed",Ext.bind(d.onZoomChange,d));c.addListener(e,"maptypeid_changed",Ext.bind(d.onTypeChange,d));c.addListener(e,"center_changed",Ext.bind(d.onCenterChange,d));d.fireEvent("maprender",d,e)}},onGeoUpdate:function(a){if(a){this.setMapCenter(new google.maps.LatLng(a.getLatitude(),a.getLongitude()))}},onGeoError:Ext.emptyFn,setMapCenter:function(d){var a=this,c=a.getMap(),b=(window.google||{}).maps;if(b){if(!a.isPainted()){a.un("painted","setMapCenter",this);a.on("painted","setMapCenter",this,{single:true,args:[d]});return}d=d||new b.LatLng(37.381592,-122.135672);if(d&&!(d instanceof b.LatLng)&&"longitude" in d){d=new b.LatLng(d.latitude,d.longitude)}if(!c){a.renderMap();c=a.getMap()}if(c&&d instanceof b.LatLng){c.panTo(d)}else{this.options=Ext.apply(this.getMapOptions(),{center:d})}}},onZoomChange:function(){var a=this.getMapOptions(),c=this.getMap(),b;b=(c&&c.getZoom)?c.getZoom():a.zoom||10;this.options=Ext.apply(a,{zoom:b});this.fireEvent("zoomchange",this,c,b)},onTypeChange:function(){var b=this.getMapOptions(),c=this.getMap(),a;a=(c&&c.getMapTypeId)?c.getMapTypeId():b.mapTypeId;this.options=Ext.apply(b,{mapTypeId:a});this.fireEvent("typechange",this,c,a)},onCenterChange:function(){var b=this.getMapOptions(),c=this.getMap(),a;a=(c&&c.getCenter)?c.getCenter():b.center;this.options=Ext.apply(b,{center:a});this.fireEvent("centerchange",this,c,a)},destroy:function(){Ext.destroy(this.getGeo());var a=this.getMap();if(a&&(window.google||{}).maps){google.maps.event.clearInstanceListeners(a)}this.callParent()}},function(){});Ext.define("Ext.Mask",{extend:"Ext.Component",xtype:"mask",config:{baseCls:Ext.baseCSSPrefix+"mask",transparent:false,top:0,left:0,right:0,bottom:0},initialize:function(){this.callParent();this.on({painted:"onPainted",erased:"onErased"})},onPainted:function(){this.element.on("*","onEvent",this)},onErased:function(){this.element.un("*","onEvent",this)},onEvent:function(b){var a=arguments[arguments.length-1];if(a.info.eventName==="tap"){this.fireEvent("tap",this,b);return false}if(b&&b.stopEvent){b.stopEvent()}return false},updateTransparent:function(a){this[a?"addCls":"removeCls"](this.getBaseCls()+"-transparent")}});Ext.define("Ext.LoadMask",{extend:"Ext.Mask",xtype:"loadmask",config:{message:"Loading...",messageCls:Ext.baseCSSPrefix+"mask-message",indicator:true,listeners:{painted:"onPainted",erased:"onErased"}},getTemplate:function(){var a=Ext.baseCSSPrefix;return[{reference:"innerElement",cls:a+"mask-inner",children:[{reference:"indicatorElement",cls:a+"loading-spinner-outer",children:[{cls:a+"loading-spinner",children:[{tag:"span",cls:a+"loading-top"},{tag:"span",cls:a+"loading-right"},{tag:"span",cls:a+"loading-bottom"},{tag:"span",cls:a+"loading-left"}]}]},{reference:"messageElement"}]}]},updateMessage:function(a){this.messageElement.setHtml(a)},updateMessageCls:function(b,a){this.messageElement.replaceCls(a,b)},updateIndicator:function(a){this[a?"removeCls":"addCls"](Ext.baseCSSPrefix+"indicator-hidden")},onPainted:function(){this.getParent().on({scope:this,resize:this.refreshPosition});this.refreshPosition()},onErased:function(){this.getParent().un({scope:this,resize:this.refreshPosition})},refreshPosition:function(){var c=this.getParent(),d=c.getScrollable(),a=(d)?d.getScroller():null,f=(a)?a.position:{x:0,y:0},e=c.element.getSize(),b=this.element.getSize();this.innerElement.setStyle({marginTop:Math.round(e.height-b.height+(f.y*2))+"px",marginLeft:Math.round(e.width-b.width+f.x)+"px"})}},function(){});Ext.define("Ext.Media",{extend:"Ext.Component",xtype:"media",config:{url:"",enableControls:Ext.os.is.Android?false:true,autoResume:false,autoPause:true,preload:true,loop:false,media:null,playing:false,volume:1,muted:false},initialize:function(){var a=this;a.callParent();a.on({scope:a,activate:a.onActivate,deactivate:a.onDeactivate});a.addMediaListener({play:"onPlay",pause:"onPause",ended:"onEnd",volumechange:"onVolumeChange",timeupdate:"onTimeUpdate"})},addMediaListener:function(d,b){var c=this,e=c.media.dom,f=Ext.Function.bind;if(!Ext.isObject(d)){var a=d;d={};d[a]=b}Ext.Object.each(d,function(h,g){if(typeof g!=="function"){g=c[g]}if(typeof g=="function"){g=f(g,c);e.addEventListener(h,g)}})},onPlay:function(){this.fireEvent("play",this)},onPause:function(){this.fireEvent("pause",this,this.getCurrentTime())},onEnd:function(){this.fireEvent("ended",this,this.getCurrentTime())},onVolumeChange:function(){this.fireEvent("volumechange",this,this.media.dom.volume)},onTimeUpdate:function(){this.fireEvent("timeupdate",this,this.getCurrentTime())},isPlaying:function(){return this.getPlaying()},onActivate:function(){var a=this;if(a.getAutoResume()&&!a.isPlaying()){a.play()}},onDeactivate:function(){var a=this;if(a.getAutoResume()&&a.isPlaying()){a.pause()}},updateUrl:function(a){var b=this.media.dom;b.src=a;b.load();if(this.getPlaying()){this.play()}},updateEnableControls:function(a){this.media.dom.controls=a?"controls":false},updateLoop:function(a){this.media.dom.loop=a?"loop":false},play:function(){this.media.dom.play();this.setPlaying(true)},pause:function(){this.media.dom.pause();this.setPlaying(false)},toggle:function(){if(this.isPlaying()){this.pause()}else{this.play()}},stop:function(){var a=this;a.setCurrentTime(0);a.fireEvent("stop",a);a.pause()},updateVolume:function(a){this.media.dom.volume=a},updateMuted:function(a){this.fireEvent("mutedchange",this,a);this.media.dom.muted=a},getCurrentTime:function(){return this.media.dom.currentTime},setCurrentTime:function(a){this.media.dom.currentTime=a;return a},getDuration:function(){return this.media.dom.duration},destroy:function(){var a=this;Ext.Object.each(event,function(c,b){if(typeof b!=="function"){b=a[b]}if(typeof b=="function"){b=bind(b,a);dom.removeEventListener(c,b)}})}});Ext.define("Ext.Audio",{extend:"Ext.Media",xtype:"audio",config:{cls:Ext.baseCSSPrefix+"audio"},onActivate:function(){var a=this;a.callParent();if(Ext.os.is.Phone){a.element.show()}},onDeactivate:function(){var a=this;a.callParent();if(Ext.os.is.Phone){a.element.hide()}},template:[{reference:"media",preload:"auto",tag:"audio",cls:Ext.baseCSSPrefix+"component"}]});Ext.define("Ext.Spacer",{extend:"Ext.Component",alias:"widget.spacer",config:{},constructor:function(a){a=a||{};if(!a.width){a.flex=1}this.callParent([a])}});Ext.define("Ext.Title",{extend:"Ext.Component",xtype:"title",config:{baseCls:"x-title",title:""},updateTitle:function(a){this.setHtml(a)}});Ext.define("Ext.Video",{extend:"Ext.Media",xtype:"video",config:{posterUrl:null,cls:Ext.baseCSSPrefix+"video"},template:[{reference:"ghost",classList:[Ext.baseCSSPrefix+"video-ghost"]},{tag:"video",reference:"media",classList:[Ext.baseCSSPrefix+"media"]}],initialize:function(){var a=this;a.callParent();a.media.hide();a.onBefore({erased:"onErased",scope:a});a.ghost.on({tap:"onGhostTap",scope:a});a.media.on({pause:"onPause",scope:a});if(Ext.os.is.Android4||Ext.os.is.iPad){this.isInlineVideo=true}},applyUrl:function(a){return[].concat(a)},updateUrl:function(f){var c=this,e=c.media,g=f.length,d=e.query("source"),b=d.length,a;for(a=0;a<b;a++){Ext.fly(d[a]).destroy()}for(a=0;a<g;a++){e.appendChild(Ext.Element.create({tag:"source",src:f[a]}))}if(c.getPlaying()){c.play()}},onErased:function(){this.pause();this.media.setTop(-2000);this.ghost.show()},onGhostTap:function(){var a=this,c=this.media,b=this.ghost;c.show();if(Ext.os.is.Android2){setTimeout(function(){a.play();setTimeout(function(){c.hide()},10)},10)}else{b.hide();a.play();setTimeout(function(){a.play()},10)}},onPause:function(){this.callParent(arguments);if(!this.isInlineVideo){this.media.setTop(-2000);this.ghost.show()}},onPlay:function(){this.callParent(arguments);this.media.setTop(0)},updatePosterUrl:function(b){var a=this.ghost;if(a){a.setStyle("background-image","url("+b+")")}}});Ext.define("Ext.carousel.Indicator",{extend:"Ext.Component",xtype:"carouselindicator",alternateClassName:"Ext.Carousel.Indicator",config:{baseCls:Ext.baseCSSPrefix+"carousel-indicator",direction:"horizontal"},initialize:function(){this.callParent();this.indicators=[];this.element.on({tap:"onTap",scope:this})},updateDirection:function(a,c){var b=this.getBaseCls();this.element.replaceCls(c,a,b);if(a==="horizontal"){this.setBottom(0);this.setRight(null)}else{this.setRight(0);this.setBottom(null)}},addIndicator:function(){this.indicators.push(this.element.createChild({tag:"span"}))},removeIndicator:function(){var a=this.indicators;if(a.length>0){a.pop().destroy()}},setActiveIndex:function(b){var e=this.indicators,d=this.activeIndex,a=e[d],f=e[b],c=this.getBaseCls();if(a){a.removeCls(c,null,"active")}if(f){f.addCls(c,null,"active")}this.activeIndex=b;return this},onTap:function(f){var g=f.touch,a=this.element.getPageBox(),d=a.left+(a.width/2),b=a.top+(a.height/2),c=this.getDirection();if((c==="horizontal"&&g.pageX>=d)||(c==="vertical"&&g.pageY>=b)){this.fireEvent("next",this)}else{this.fireEvent("previous",this)}},destroy:function(){var d=this.indicators,b,c,a;for(b=0,c=d.length;b<c;b++){a=d[b];a.destroy()}d.length=0;this.callParent()}});Ext.define("Ext.carousel.Item",{extend:"Ext.Decorator",config:{baseCls:"x-carousel-item",component:null,translatable:true}});Ext.define("Ext.dataview.IndexBar",{extend:"Ext.Component",alternateClassName:"Ext.IndexBar",config:{baseCls:Ext.baseCSSPrefix+"indexbar",direction:"vertical",letters:["A","B","C","D","E","F","G","H","I","J","K","L","M","N","O","P","Q","R","S","T","U","V","W","X","Y","Z"],ui:"alphabet",listPrefix:null},itemCls:Ext.baseCSSPrefix+"",updateDirection:function(a,c){var b=this.getBaseCls();this.element.replaceCls(b+"-"+c,b+"-"+a)},getElementConfig:function(){return{reference:"wrapper",classList:["x-centered","x-indexbar-wrapper"],children:[this.callParent()]}},updateLetters:function(c){this.innerElement.setHtml("");if(c){var b=c.length,a;for(a=0;a<b;a++){this.innerElement.createChild({html:c[a]})}}},updateListPrefix:function(a){if(a&&a.length){this.innerElement.createChild({html:a},0)}},initialize:function(){this.callParent();this.innerElement.on({touchstart:this.onTouchStart,touchend:this.onTouchEnd,touchmove:this.onTouchMove,scope:this})},onTouchStart:function(b,a){b.stopPropagation();this.innerElement.addCls(this.getBaseCls()+"-pressed");this.pageBox=this.innerElement.getPageBox();this.onTouchMove(b)},onTouchEnd:function(b,a){this.innerElement.removeCls(this.getBaseCls()+"-pressed")},onTouchMove:function(c){var a=Ext.util.Point.fromEvent(c),b,d=this.pageBox;if(!d){d=this.pageBox=this.el.getPageBox()}if(this.getDirection()==="vertical"){if(a.y>d.bottom||a.y<d.top){return}b=Ext.Element.fromPoint(d.left+(d.width/2),a.y)}else{if(a.x>d.right||a.x<d.left){return}b=Ext.Element.fromPoint(a.x,d.top+(d.height/2))}if(b){this.fireEvent("index",this,b.dom.innerHTML,b)}},destroy:function(){var c=this,d=Array.prototype.slice.call(c.innerElement.dom.childNodes),b=d.length,a=0;for(;a<b;a++){Ext.removeNode(d[a])}this.callParent()}},function(){});Ext.define("Ext.dataview.ListItemHeader",{extend:"Ext.Component",xtype:"listitemheader",config:{baseCls:Ext.baseCSSPrefix+"list-header",docked:"top"}});Ext.define("Ext.dataview.element.Container",{extend:"Ext.Component",doInitialize:function(){this.element.on({touchstart:"onItemTouchStart",touchend:"onItemTouchEnd",tap:"onItemTap",taphold:"onItemTapHold",touchmove:"onItemTouchMove",doubletap:"onItemDoubleTap",swipe:"onItemSwipe",delegate:"> div",scope:this})},initialize:function(){this.callParent();this.doInitialize()},updateBaseCls:function(a,b){var c=this;c.callParent([a+"-container",b])},onItemTouchStart:function(d){var b=this,c=d.getTarget(),a=b.getViewItems().indexOf(c);Ext.get(c).on({touchmove:"onItemTouchMove",scope:b,single:true});b.fireEvent("itemtouchstart",b,Ext.get(c),a,d)},onItemTouchEnd:function(d){var b=this,c=d.getTarget(),a=b.getViewItems().indexOf(c);Ext.get(c).un({touchmove:"onItemTouchMove",scope:b});b.fireEvent("itemtouchend",b,Ext.get(c),a,d)},onItemTouchMove:function(d){var b=this,c=d.getTarget(),a=b.getViewItems().indexOf(c);b.fireEvent("itemtouchmove",b,Ext.get(c),a,d)},onItemTap:function(d){var b=this,c=d.getTarget(),a=b.getViewItems().indexOf(c);b.fireEvent("itemtap",b,Ext.get(c),a,d)},onItemTapHold:function(d){var b=this,c=d.getTarget(),a=b.getViewItems().indexOf(c);b.fireEvent("itemtaphold",b,Ext.get(c),a,d)},onItemDoubleTap:function(d){var b=this,c=d.getTarget(),a=b.getViewItems().indexOf(c);b.fireEvent("itemdoubletap",b,Ext.get(c),a,d)},onItemSwipe:function(d){var b=this,c=d.getTarget(),a=b.getViewItems().indexOf(c);b.fireEvent("itemswipe",b,Ext.get(c),a,d)},updateListItem:function(b,d){var c=this,a=c.dataview,e=a.prepareData(b.getData(true),a.getStore().indexOf(b),b);d.innerHTML=c.dataview.getItemTpl().apply(e)},addListItem:function(e,c){var h=this,d=h.dataview,a=d.prepareData(c.getData(true),d.getStore().indexOf(c),c),b=h.element,i=b.dom.childNodes,g=i.length,f;f=Ext.Element.create(this.getItemElementConfig(e,a));if(!g||e==g){f.appendTo(b)}else{f.insertBefore(i[e])}},getItemElementConfig:function(c,e){var b=this.dataview,d=b.getItemCls(),a=b.getBaseCls()+"-item";if(d){a+=" "+d}return{cls:a,html:b.getItemTpl().apply(e)}},doRemoveItemCls:function(a){var d=this.getViewItems(),c=d.length,b=0;for(;b<c;b++){Ext.fly(d[b]).removeCls(a)}},doAddItemCls:function(a){var d=this.getViewItems(),c=d.length,b=0;for(;b<c;b++){Ext.fly(d[b]).addCls(a)}},moveItemsToCache:function(f,e){var d=this,a=d.getViewItems(),b=e-f,c;for(;b>=0;b--){c=a[f+b];c.parentNode.removeChild(c)}if(d.getViewItems().length==0){this.dataview.showEmptyText()}},moveItemsFromCache:function(d){var g=this,b=g.dataview,c=b.getStore(),f=d.length,e,a;if(f){b.hideEmptyText()}for(e=0;e<f;e++){d[e]._tmpIndex=c.indexOf(d[e])}Ext.Array.sort(d,function(i,h){return i._tmpIndex>h._tmpIndex?1:-1});for(e=0;e<f;e++){a=d[e];g.addListItem(a._tmpIndex,a);delete a._tmpIndex}},getViewItems:function(){return Array.prototype.slice.call(this.element.dom.childNodes)},destroy:function(){var c=this.getViewItems(),b=c.length,a=0;for(;a<b;a++){Ext.removeNode(c[a])}this.callParent()}});Ext.define("Ext.dataview.element.List",{extend:"Ext.dataview.element.Container",updateBaseCls:function(a){var b=this;b.itemClsShortCache=a+"-item";b.headerClsShortCache=a+"-header";b.headerClsCache="."+b.headerClsShortCache;b.headerItemClsShortCache=a+"-header-item";b.footerClsShortCache=a+"-footer-item";b.footerClsCache="."+b.footerClsShortCache;b.labelClsShortCache=a+"-item-label";b.labelClsCache="."+b.labelClsShortCache;b.disclosureClsShortCache=a+"-disclosure";b.disclosureClsCache="."+b.disclosureClsShortCache;b.iconClsShortCache=a+"-icon";b.iconClsCache="."+b.iconClsShortCache;this.callParent(arguments)},hiddenDisplayCache:Ext.baseCSSPrefix+"hidden-display",getItemElementConfig:function(e,h){var f=this,c=f.dataview,g=c.getItemCls(),b=f.itemClsShortCache,d,a;if(g){b+=" "+g}d={cls:b,children:[{cls:f.labelClsShortCache,html:c.getItemTpl().apply(h)}]};if(c.getIcon()){a=h.iconSrc;d.children.push({cls:f.iconClsShortCache,style:"background-image: "+a?'url("'+newSrc+'")':""})}if(c.getOnItemDisclosure()){d.children.push({cls:f.disclosureClsShortCache+((h.disclosure===false)?f.hiddenDisplayCache:"")})}return d},updateListItem:function(b,j){var g=this,c=g.dataview,i=Ext.fly(j),f=i.down(g.labelClsCache,true),a=b.data,d=a&&a.hasOwnProperty("disclosure"),k=a&&a.hasOwnProperty("iconSrc"),e,h;f.innerHTML=c.getItemTpl().apply(a);if(d&&c.getOnItemDisclosure()){e=i.down(g.disclosureClsCache);e[d?"removeCls":"addCls"](g.hiddenDisplayCache)}if(c.getIcon()){h=i.down(g.iconClsCache,true);h.style.backgroundImage=k?'url("'+k+'")':""}},doRemoveHeaders:function(){var e=this,a=e.headerItemClsShortCache,b=e.element.query(e.headerClsCache),f=b.length,c=0,d;for(;c<f;c++){d=b[c];Ext.fly(d.parentNode).removeCls(a);Ext.removeNode(d)}},doRemoveFooterCls:function(){var d=this,c=d.footerClsShortCache,a=d.element.query(d.footerClsCache),e=a.length,b=0;for(;b<e;b++){Ext.fly(a[b]).removeCls(c)}},doAddHeader:function(b,a){b=Ext.fly(b);b.insertFirst(Ext.Element.create({cls:this.headerClsShortCache,html:a}));b.addCls(this.headerItemClsShortCache)},destroy:function(){this.doRemoveHeaders();this.callParent()}});Ext.define("Ext.event.publisher.ComponentDelegation",{extend:"Ext.event.publisher.Publisher",requires:["Ext.Component","Ext.ComponentQuery"],targetType:"component",optimizedSelectorRegex:/^#([\w\-]+)((?:[\s]*)>(?:[\s]*)|(?:\s*))([\w\-]+)$/i,handledEvents:["*"],getSubscribers:function(b,a){var d=this.subscribers,c=d[b];if(!c&&a){c=d[b]={type:{$length:0},selector:[],$length:0}}return c},subscribe:function(g,f){if(this.idSelectorRegex.test(g)){return false}var e=g.match(this.optimizedSelectorRegex),a=this.getSubscribers(f,true),k=a.type,c=a.selector,d,i,j,b,h;if(e!==null){d=e[1];i=e[2].indexOf(">")===-1;j=e[3];b=k[j];if(!b){k[j]=b={descendents:{$length:0},children:{$length:0},$length:0}}h=i?b.descendents:b.children;if(h.hasOwnProperty(d)){h[d]++;return true}h[d]=1;h.$length++;b.$length++;k.$length++}else{if(c.hasOwnProperty(g)){c[g]++;return true}c[g]=1;c.push(g)}a.$length++;return true},unsubscribe:function(g,f,k){var a=this.getSubscribers(f);if(!a){return false}var e=g.match(this.optimizedSelectorRegex),l=a.type,c=a.selector,d,i,j,b,h;k=Boolean(k);if(e!==null){d=e[1];i=e[2].indexOf(">")===-1;j=e[3];b=l[j];if(!b){return true}h=i?b.descendents:b.children;if(!h.hasOwnProperty(d)||(!k&&--h[d]>0)){return true}delete h[d];h.$length--;b.$length--;l.$length--}else{if(!c.hasOwnProperty(g)||(!k&&--c[g]>0)){return true}delete c[g];Ext.Array.remove(c,g)}if(--a.$length===0){delete this.subscribers[f]}return true},notify:function(d,a){var c=this.getSubscribers(a),e,b;if(!c||c.$length===0){return false}e=d.substr(1);b=Ext.ComponentManager.get(e);if(b){this.dispatcher.doAddListener(this.targetType,d,a,"publish",this,{args:[a,b]},"before")}},matchesSelector:function(b,a){return Ext.ComponentQuery.is(b,a)},dispatch:function(d,b,c,a){this.dispatcher.doDispatchEvent(this.targetType,d,b,c,null,a)},publish:function(g,k){var e=this.getSubscribers(g);if(!e){return}var p=arguments[arguments.length-1],o=e.type,b=e.selector,d=Array.prototype.slice.call(arguments,2,-2),l=k.xtypesChain,s,n,t,a,m,v,r,u,h,f,q,c;for(u=0,h=l.length;u<h;u++){f=l[u];e=o[f];if(e&&e.$length>0){s=e.descendents;if(s.$length>0){if(!a){a=k.getAncestorIds()}for(q=0,c=a.length;q<c;q++){m=a[q];if(s.hasOwnProperty(m)){this.dispatch("#"+m+" "+f,g,d,p)}}}n=e.children;if(n.$length>0){if(!t){if(a){t=a[0]}else{v=k.getParent();if(v){t=v.getId()}}}if(t){if(n.hasOwnProperty(t)){this.dispatch("#"+t+" > "+f,g,d,p)}}}}}h=b.length;if(h>0){for(u=0;u<h;u++){r=b[u];if(this.matchesSelector(k,r)){this.dispatch(r,g,d,p)}}}}});Ext.define("Ext.field.Input",{extend:"Ext.Component",xtype:"input",tag:"input",cachedConfig:{cls:Ext.baseCSSPrefix+"form-field",focusCls:Ext.baseCSSPrefix+"field-focus",maskCls:Ext.baseCSSPrefix+"field-mask",useMask:"auto",type:"text",checked:false},config:{baseCls:Ext.baseCSSPrefix+"field-input",name:null,value:null,isFocused:false,tabIndex:null,placeHolder:null,minValue:null,maxValue:null,stepValue:null,maxLength:null,autoComplete:null,autoCapitalize:null,autoCorrect:null,readOnly:null,maxRows:null,startValue:false},getTemplate:function(){var a=[{reference:"input",tag:this.tag},{reference:"clearIcon",cls:"x-clear-icon"}];a.push({reference:"mask",classList:[this.config.maskCls]});return a},initElement:function(){var a=this;a.callParent();a.input.on({scope:a,keyup:"onKeyUp",focus:"onFocus",blur:"onBlur",paste:"onPaste"});a.mask.on({tap:"onMaskTap",scope:a});if(a.clearIcon){a.clearIcon.on({tap:"onClearIconTap",scope:a})}},applyUseMask:function(a){if(a==="auto"){a=Ext.os.is.iOS&&Ext.os.version.lt("5")}return Boolean(a)},updateUseMask:function(a){this.mask[a?"show":"hide"]()},updateFieldAttribute:function(b,c){var a=this.input;if(c){a.dom.setAttribute(b,c)}else{a.dom.removeAttribute(b)}},updateCls:function(b,a){this.input.addCls(Ext.baseCSSPrefix+"input-el");this.input.replaceCls(a,b)},updateType:function(a,c){var b=Ext.baseCSSPrefix+"input-";this.input.replaceCls(b+c,b+a);this.updateFieldAttribute("type",a)},updateName:function(a){this.updateFieldAttribute("name",a)},getValue:function(){var a=this.input;if(a){this._value=a.dom.value}return this._value},applyValue:function(a){return(Ext.isEmpty(a))?"":a},updateValue:function(b){var a=this.input;if(a){a.dom.value=b}},setValue:function(a){this.updateValue(this.applyValue(a));return this},updateTabIndex:function(a){this.updateFieldAttribute("tabIndex",a)},testAutoFn:function(a){return[true,"on"].indexOf(a)!==-1},updateMaxLength:function(a){this.updateFieldAttribute("maxlength",a)},updatePlaceHolder:function(a){this.updateFieldAttribute("placeholder",a)},applyAutoComplete:function(a){return this.testAutoFn(a)},updateAutoComplete:function(a){var b=a?"on":"off";this.updateFieldAttribute("autocomplete",b)},applyAutoCapitalize:function(a){return this.testAutoFn(a)},updateAutoCapitalize:function(b){var a=b?"on":"off";this.updateFieldAttribute("autocapitalize",a)},applyAutoCorrect:function(a){return this.testAutoFn(a)},updateAutoCorrect:function(a){var b=a?"on":"off";this.updateFieldAttribute("autocorrect",b)},updateMinValue:function(a){this.updateFieldAttribute("min",a)},updateMaxValue:function(a){this.updateFieldAttribute("max",a)},updateStepValue:function(a){this.updateFieldAttribute("step",a)},checkedRe:/^(true|1|on)/i,getChecked:function(){var a=this.input,b;if(a){b=a.dom.checked;this._checked=b}return b},applyChecked:function(a){return !!this.checkedRe.test(String(a))},setChecked:function(a){this.updateChecked(this.applyChecked(a));this._checked=a},updateChecked:function(a){this.input.dom.checked=a},updateReadOnly:function(a){this.updateFieldAttribute("readonly",a)},updateMaxRows:function(a){this.updateFieldAttribute("rows",a)},doSetDisabled:function(a){this.callParent(arguments);this.input.dom.disabled=a;if(!a){this.blur()}},isDirty:function(){if(this.getDisabled()){return false}return String(this.getValue())!==String(this.originalValue)},reset:function(){this.setValue(this.originalValue)},onMaskTap:function(a){this.fireAction("masktap",[this,a],"doMaskTap")},doMaskTap:function(a,b){if(a.getDisabled()){return false}a.maskCorrectionTimer=Ext.defer(a.showMask,1000,a);a.hideMask()},showMask:function(a){if(this.mask){this.mask.setStyle("display","block")}},hideMask:function(a){if(this.mask){this.mask.setStyle("display","none")}},focus:function(){var b=this,a=b.input;if(a&&a.dom.focus){a.dom.focus()}return b},blur:function(){var b=this,a=this.input;if(a&&a.dom.blur){a.dom.blur()}return b},select:function(){var b=this,a=b.input;if(a&&a.dom.setSelectionRange){a.dom.setSelectionRange(0,9999)}return b},onFocus:function(a){this.fireAction("focus",[a],"doFocus")},doFocus:function(b){var a=this;if(a.mask){if(a.maskCorrectionTimer){clearTimeout(a.maskCorrectionTimer)}a.hideMask()}if(!a.getIsFocused()){a.setIsFocused(true);a.setStartValue(a.getValue())}},onBlur:function(a){this.fireAction("blur",[a],"doBlur")},doBlur:function(d){var b=this,c=b.getValue(),a=b.getStartValue();b.setIsFocused(false);if(String(c)!=String(a)){b.onChange(b,c,a)}b.showMask()},onClearIconTap:function(c){var a=this.getValue(),b;this.fireEvent("clearicontap",this,c);b=this.getValue();if(String(b)!=String(a)){this.onChange(this,b,a)}if(Ext.os.is.Android){this.focus()}},onClick:function(a){this.fireEvent("click",a)},onChange:function(b,c,a){this.fireEvent("change",b,c,a)},onKeyUp:function(a){this.fireEvent("keyup",a)},onPaste:function(a){this.fireEvent("paste",a)},onMouseDown:function(a){this.fireEvent("mousedown",a)}});Ext.define("Ext.field.Field",{extend:"Ext.Decorator",alternateClassName:"Ext.form.Field",xtype:"field",requires:["Ext.field.Input"],isField:true,isFormField:true,config:{baseCls:Ext.baseCSSPrefix+"field",label:null,labelAlign:"left",labelWidth:"30%",clearIcon:null,required:false,inputType:null,name:null,value:null,tabIndex:null},cachedConfig:{labelCls:null,requiredCls:Ext.baseCSSPrefix+"field-required",inputCls:null},getElementConfig:function(){var a=Ext.baseCSSPrefix;return{reference:"element",className:"x-container",children:[{reference:"label",cls:a+"form-label",children:[{reference:"labelspan",tag:"span"}]},{reference:"innerElement",cls:a+"component-outer"}]}},updateLabel:function(b,d){var a=this.renderElement,c=Ext.baseCSSPrefix;if(b){this.labelspan.setHtml(b);a.addCls(c+"field-labeled")}else{a.removeCls(c+"field-labeled")}},updateLabelAlign:function(b,c){var a=this.renderElement,d=Ext.baseCSSPrefix;if(b){a.addCls(d+"label-align-"+b);if(b=="top"){this.label.setWidth("100%")}else{this.updateLabelWidth(this.getLabelWidth())}}if(c){a.removeCls(d+"label-align-"+c)}},updateLabelCls:function(a,b){if(a){this.label.addCls(a)}if(b){this.label.removeCls(b)}},updateLabelWidth:function(a){if(a){if(this.getLabelAlign()=="top"){this.label.setWidth("100%")}else{this.label.setWidth(a)}}},updateRequired:function(a){this.renderElement[a?"addCls":"removeCls"](this.getRequiredCls())},updateRequiredCls:function(a,b){if(this.getRequired()){this.renderElement.replaceCls(b,a)}},initialize:function(){var a=this;a.callParent();a.doInitValue()},doInitValue:function(){this.originalValue=this.getInitialConfig().value},reset:function(){this.setValue(this.originalValue);return this},isDirty:function(){return false}},function(){});Ext.define("Ext.field.Checkbox",{extend:"Ext.field.Field",alternateClassName:"Ext.form.Checkbox",xtype:"checkboxfield",qsaLeftRe:/[\[]/g,qsaRightRe:/[\]]/g,isCheckbox:true,config:{ui:"checkbox",value:"",checked:false,tabIndex:-1,component:{xtype:"input",type:"checkbox",useMask:true,cls:Ext.baseCSSPrefix+"input-checkbox"}},initialize:function(){var a=this;a.callParent();a.getComponent().on({scope:a,order:"before",masktap:"onMaskTap"})},doInitValue:function(){var a=this,b=a.getInitialConfig();if(b.hasOwnProperty("value")){a.originalState=b.value}if(b.hasOwnProperty("checked")){a.originalState=b.checked}a.callParent(arguments)},updateInputType:function(a){var b=this.getComponent();if(b){b.setType(a)}},updateName:function(a){var b=this.getComponent();if(b){b.setName(a)}},getChecked:function(){this._checked=this.getComponent().getChecked();return this._checked},getValue:function(){return this.getChecked()},setValue:function(a){return this.setChecked(a)},setChecked:function(a){this.updateChecked(a);this._checked=a},updateChecked:function(a){this.getComponent().setChecked(a)},onMaskTap:function(a,c){var b=this,d=a.input.dom;if(b.getDisabled()){return false}d.checked=!d.checked;if(b.getChecked()){b.fireEvent("check",b,c)}else{b.fireEvent("uncheck",b,c)}return false},doChecked:Ext.emptyFn,doUnChecked:Ext.emptyFn,isChecked:function(){return this.getChecked()},check:function(){return this.setChecked(true)},uncheck:function(){return this.setChecked(false)},getSameGroupFields:function(){var j=this.up("formpanel")||this.up("fieldset"),b=this.getName(),g=this.qsaLeftRe,c=this.qsaRightRe,f=[],a,d,e,h;if(!j){return null}b=b.replace(g,"\\[");b=b.replace(c,"\\]");a=Ext.query("[name="+b+"]",j.element.dom);h=a.length;for(e=0;e<h;e++){d=a[e];d=Ext.fly(d).up(".x-field-"+d.getAttribute("type"));if(d&&d.id){f.push(Ext.getCmp(d.id))}}return f},getGroupValues:function(){var a=[];this.getSameGroupFields().forEach(function(b){if(b.getChecked()){a.push(b.getValue())}});return a},setGroupValues:function(a){this.getSameGroupFields().forEach(function(b){b.setChecked((a.indexOf(b.getValue())!==-1))});return this},resetGroupValues:function(){this.getSameGroupFields().forEach(function(a){a.setChecked(a.originalState)});return this},reset:function(){this.setChecked(this.originalState);return this}});Ext.define("Ext.field.Hidden",{extend:"Ext.field.Field",alternateClassName:"Ext.form.Hidden",xtype:"hiddenfield",config:{component:{xtype:"input",type:"hidden"},ui:"hidden",hidden:true,tabIndex:-1}});Ext.define("Ext.field.Radio",{extend:"Ext.field.Checkbox",xtype:"radiofield",alternateClassName:"Ext.form.Radio",isRadio:true,config:{ui:"radio",component:{type:"radio",cls:Ext.baseCSSPrefix+"input-radio"}},getValue:function(){return this._value},setValue:function(a){this._value=a;return this},getGroupValue:function(){var a=this.getSameGroupFields(),c=a.length,b=0,d;for(;b<c;b++){d=a[b];if(d.getChecked()){return d.getValue()}}return null},setGroupValue:function(d){var a=this.getSameGroupFields(),c=a.length,b=0,e;for(;b<c;b++){e=a[b];if(e.getValue()===d){e.setChecked(true);return e}}}});Ext.define("Ext.field.Text",{extend:"Ext.field.Field",xtype:"textfield",alternateClassName:"Ext.form.Text",config:{ui:"text",clearIcon:true,placeHolder:null,maxLength:null,autoComplete:null,autoCapitalize:null,autoCorrect:null,readOnly:null,component:{xtype:"input",type:"text"}},initialize:function(){var a=this;a.callParent();a.getComponent().on({scope:this,keyup:"onKeyUp",change:"onChange",focus:"onFocus",blur:"onBlur",paste:"onPaste",mousedown:"onMouseDown",clearicontap:"onClearIconTap"});a.originalValue=a.originalValue||"";a.getComponent().originalValue=a.originalValue;a.syncEmptyCls()},syncEmptyCls:function(){var b=(this._value)?this._value.length:false,a=Ext.baseCSSPrefix+"empty";if(b){this.removeCls(a)}else{this.addCls(a)}},updateValue:function(b){var a=this.getComponent();if(a){a.setValue(b)}this[b?"showClearIcon":"hideClearIcon"]();this.syncEmptyCls()},getValue:function(){var a=this;a._value=a.getComponent().getValue();a.syncEmptyCls();return a._value},updatePlaceHolder:function(a){this.getComponent().setPlaceHolder(a)},updateMaxLength:function(a){this.getComponent().setMaxLength(a)},updateAutoComplete:function(a){this.getComponent().setAutoComplete(a)},updateAutoCapitalize:function(a){this.getComponent().setAutoCapitalize(a)},updateAutoCorrect:function(a){this.getComponent().setAutoCorrect(a)},updateReadOnly:function(a){if(a){this.hideClearIcon()}else{this.showClearIcon()}this.getComponent().setReadOnly(a)},updateInputType:function(a){var b=this.getComponent();if(b){b.setType(a)}},updateName:function(a){var b=this.getComponent();if(b){b.setName(a)}},updateTabIndex:function(b){var a=this.getComponent();if(a){a.setTabIndex(b)}},updateInputCls:function(a,b){var c=this.getComponent();if(c){c.replaceCls(b,a)}},doSetDisabled:function(b){var c=this;c.callParent(arguments);var a=c.getComponent();if(a){a.setDisabled(b)}if(b){c.hideClearIcon()}else{c.showClearIcon()}},showClearIcon:function(){var a=this;if(!a.getDisabled()&&!a.getReadOnly()&&a.getValue()&&a.getClearIcon()){a.element.addCls(Ext.baseCSSPrefix+"field-clearable")}return a},hideClearIcon:function(){if(this.getClearIcon()){this.element.removeCls(Ext.baseCSSPrefix+"field-clearable")}},onKeyUp:function(a){this.fireAction("keyup",[this,a],"doKeyUp")},doKeyUp:function(a,c){var b=a.getValue();a[b?"showClearIcon":"hideClearIcon"]();if(c.browserEvent.keyCode===13){a.fireAction("action",[a,c],"doAction")}},doAction:function(){this.blur()},onClearIconTap:function(a){this.fireAction("clearicontap",[this,a],"doClearIconTap")},doClearIconTap:function(a,b){a.setValue("");a.getValue()},onChange:function(b,c,a){b.fireEvent("change",this,c,a)},onFocus:function(a){this.isFocused=true;this.fireEvent("focus",this,a)},onBlur:function(b){var a=this;this.isFocused=false;a.fireEvent("blur",a,b);setTimeout(function(){a.isFocused=false},50)},onPaste:function(a){this.fireEvent("paste",this,a)},onMouseDown:function(a){this.fireEvent("mousedown",this,a)},focus:function(){this.getComponent().focus();return this},blur:function(){this.getComponent().blur();return this},select:function(){this.getComponent().select();return this},reset:function(){this.getComponent().reset();this.getValue();this[this._value?"showClearIcon":"hideClearIcon"]()},isDirty:function(){var a=this.getComponent();if(a){return a.isDirty()}return false}});Ext.define("Ext.field.Email",{extend:"Ext.field.Text",alternateClassName:"Ext.form.Email",xtype:"emailfield",config:{component:{type:"email"},autoCapitalize:false}});Ext.define("Ext.field.Number",{extend:"Ext.field.Text",xtype:"numberfield",alternateClassName:"Ext.form.Number",config:{component:{type:"number"},ui:"number"},proxyConfig:{minValue:null,maxValue:null,stepValue:null},applyValue:function(b){var a=this.getMinValue(),c=this.getMaxValue();if(Ext.isNumber(a)){b=Math.max(b,a)}if(Ext.isNumber(c)){b=Math.min(b,c)}return parseFloat(b)},getValue:function(){var a=this.callParent();return parseFloat(a||0)},doClearIconTap:function(a,b){a.setValue(0)}});Ext.define("Ext.field.Password",{extend:"Ext.field.Text",xtype:"passwordfield",alternateClassName:"Ext.form.Password",config:{autoCapitalize:false,component:{type:"password"}}});Ext.define("Ext.field.Search",{extend:"Ext.field.Text",xtype:"searchfield",alternateClassName:"Ext.form.Search",config:{component:{type:"search"},ui:"search"}});Ext.define("Ext.field.Spinner",{extend:"Ext.field.Number",xtype:"spinnerfield",alternateClassName:"Ext.form.Spinner",requires:["Ext.util.TapRepeater"],config:{cls:Ext.baseCSSPrefix+"spinner",minValue:Number.NEGATIVE_INFINITY,maxValue:Number.MAX_VALUE,increment:0.1,accelerateOnTapHold:true,cycle:false,clearIcon:false,defaultValue:0,tabIndex:-1,component:{disabled:true}},constructor:function(){this.callParent(arguments);if(!this.getValue()){this.setValue(this.getDefaultValue())}},syncEmptyCls:Ext.emptyFn,updateComponent:function(c){this.callParent(arguments);var b=this.innerElement,a=this.getCls();if(c){this.spinDownButton=Ext.Element.create({cls:a+"-button "+a+"-button-down",html:"-"});b.insertFirst(this.spinDownButton);this.spinUpButton=Ext.Element.create({cls:a+"-button "+a+"-button-up",html:"+"});b.appendChild(this.spinUpButton);this.downRepeater=this.createRepeater(this.spinDownButton,this.onSpinDown);this.upRepeater=this.createRepeater(this.spinUpButton,this.onSpinUp)}},applyValue:function(a){a=parseFloat(a);if(isNaN(a)||a===null){a=this.getDefaultValue()}a=Math.round(a*10)/10;return this.callParent([a])},createRepeater:function(c,b){var d=this,a=Ext.create("Ext.util.TapRepeater",{el:c,accelerate:d.getAccelerateOnTapHold()});a.on({tap:b,touchstart:"onTouchStart",touchend:"onTouchEnd",scope:d});return a},onSpinDown:function(){if(!this.getDisabled()){this.spin(true)}},onSpinUp:function(){if(!this.getDisabled()){this.spin(false)}},onTouchStart:function(a){if(!this.getDisabled()){a.getEl().addCls(Ext.baseCSSPrefix+"button-pressed")}},onTouchEnd:function(a){a.getEl().removeCls(Ext.baseCSSPrefix+"button-pressed")},spin:function(h){var c=this,b=c.getValue(),a=c.getIncrement(),g=h?"down":"up",e=c.getMinValue(),f=c.getMaxValue(),d;if(h){d=b-a}else{d=b+a}if(c.getCycle()){if(b==e&&d<e){d=f}if(b==f&&d>f){d=e}}c.setValue(d);d=c.getValue();c.fireEvent("spin",c,d,g);c.fireEvent("spin"+g,c,d)},doSetDisabled:function(a){Ext.Component.prototype.doSetDisabled.apply(this,arguments)},setDisabled:function(){Ext.Component.prototype.setDisabled.apply(this,arguments)},reset:function(){this.setValue(this.getDefaultValue())},destroy:function(){var a=this;Ext.destroy(a.downRepeater,a.upRepeater,a.spinDownButton,a.spinUpButton);a.callParent(arguments)}},function(){});Ext.define("Ext.field.TextAreaInput",{extend:"Ext.field.Input",xtype:"textareainput",tag:"textarea"});Ext.define("Ext.field.TextArea",{extend:"Ext.field.Text",xtype:"textareafield",requires:["Ext.field.TextAreaInput"],alternateClassName:"Ext.form.TextArea",config:{ui:"textarea",autoCapitalize:false,component:{xtype:"textareainput"},maxRows:null},updateMaxRows:function(a){this.getComponent().setMaxRows(a)},doSetHeight:function(a){this.callParent(arguments);var b=this.getComponent();b.input.setHeight(a)},doSetWidth:function(b){this.callParent(arguments);var a=this.getComponent();a.input.setWidth(b)},doKeyUp:function(a){var b=a.getValue();a[b?"showClearIcon":"hideClearIcon"]()}});Ext.define("Ext.field.Url",{extend:"Ext.field.Text",xtype:"urlfield",alternateClassName:"Ext.form.Url",config:{autoCapitalize:false,component:{type:"url"}}});Ext.define("Ext.plugin.ListPaging",{extend:"Ext.Component",alias:"plugin.listpaging",config:{autoPaging:false,loadMoreText:"Load More...",noMoreRecordsText:"No More Records",loadTpl:['<div class="{cssPrefix}loading-spinner" style="font-size: 180%; margin: 10px auto;">','<span class="{cssPrefix}loading-top"></span>','<span class="{cssPrefix}loading-right"></span>','<span class="{cssPrefix}loading-bottom"></span>','<span class="{cssPrefix}loading-left"></span>',"</div>",'<div class="{cssPrefix}list-paging-msg">{message}</div>'].join(""),loadMoreCmp:{xtype:"component",baseCls:Ext.baseCSSPrefix+"list-paging"},loadMoreCmpAdded:false,loadingCls:Ext.baseCSSPrefix+"loading",list:null,scroller:null,loading:false},init:function(c){var a=c.getScrollable().getScroller(),b=c.getStore();this.setList(c);this.setScroller(a);this.bindStore(c.getStore());if(b){this.disableDataViewMask(b)}c.updateStore=Ext.Function.createInterceptor(c.updateStore,this.bindStore,this);if(this.getAutoPaging()){a.on({scrollend:this.onScrollEnd,scope:this})}},bindStore:function(a,b){if(b){b.un({load:this.onStoreLoad,beforeload:this.onStoreBeforeLoad,scope:this})}if(a){a.on({load:this.onStoreLoad,beforeload:this.onStoreBeforeLoad,scope:this})}},disableDataViewMask:function(a){var b=this.getList();if(a.isAutoLoading()){b.setLoadingText(null)}else{a.on({load:{single:true,fn:function(){b.setLoadingText(null)}}})}},applyLoadTpl:function(a){return(Ext.isObject(a)&&a.isTemplate)?a:new Ext.XTemplate(a)},applyLoadMoreCmp:function(a){a=Ext.merge(a,{html:this.getLoadTpl().apply({cssPrefix:Ext.baseCSSPrefix,message:this.getLoadMoreText()}),listeners:{tap:{fn:this.loadNextPage,scope:this,element:"element"}}});return Ext.factory(a,Ext.Component,this.getLoadMoreCmp())},onScrollEnd:function(b,a,c){if(!this.getLoading()&&c>=b.maxPosition.y){if(!this.storeFullyLoaded()){this.loadNextPage()}}},updateLoading:function(a){var b=this.getLoadMoreCmp(),c=this.getLoadingCls();if(a){b.addCls(c)}else{b.removeCls(c)}},onStoreBeforeLoad:function(a){if(a.getCount()===0){this.getLoadMoreCmp().hide()}},onStoreLoad:function(a){var d=this.addLoadMoreCmp(),b=this.getLoadTpl(),c=this.storeFullyLoaded()?this.getNoMoreRecordsText():this.getLoadMoreText();this.getLoadMoreCmp().show();this.setLoading(false);if(this.scrollY){this.getScroller().scrollTo(null,this.scrollY);delete this.scrollY}d.setHtml(b.apply({cssPrefix:Ext.baseCSSPrefix,message:c}))},addLoadMoreCmp:function(){var b=this.getList(),a=this.getLoadMoreCmp();if(!this.getLoadMoreCmpAdded()){b.add(a);this.setLoadMoreCmpAdded(true)}return a},storeFullyLoaded:function(){var a=this.getList().getStore(),b=a.getTotalCount();return b!==null?a.getTotalCount()<=(a.currentPage*a.getPageSize()):false},loadNextPage:function(){var a=this.getList().getStore();this.setLoading(true);this.scrollY=this.getScroller().position.y;a.nextPage({addRecords:true})}});Ext.define("Ext.plugin.PullRefresh",{extend:"Ext.Component",alias:"plugin.pullrefresh",requires:["Ext.DateExtras"],config:{list:null,pullRefreshText:"Pull down to refresh...",releaseRefreshText:"Release to refresh...",loadingText:"Loading...",snappingAnimationDuration:150,refreshFn:null,pullTpl:['<div class="x-list-pullrefresh">','<div class="x-list-pullrefresh-arrow"></div>','<div class="x-loading-spinner">','<span class="x-loading-top"></span>','<span class="x-loading-right"></span>','<span class="x-loading-bottom"></span>','<span class="x-loading-left"></span>',"</div>",'<div class="x-list-pullrefresh-wrap">','<h3 class="x-list-pullrefresh-message">{message}</h3>','<div class="x-list-pullrefresh-updated">Last Updated: <span>{lastUpdated:date("m/d/Y h:iA")}</span></div>',"</div>","</div>"].join("")},isRefreshing:false,currentViewState:"",initialize:function(){this.callParent();this.on({painted:"onPainted",scope:this})},init:function(f){var d=this,b=f.getStore(),e=d.getPullTpl(),c=d.element,a=f.getScrollable().getScroller();d.setList(f);d.lastUpdated=new Date();f.insert(0,d);if(b){if(b.isAutoLoading()){f.setLoadingText(null)}else{b.on({load:{single:true,fn:function(){f.setLoadingText(null)}}})}}e.overwrite(c,{message:d.getPullRefreshText(),lastUpdated:d.lastUpdated},true);d.loadingElement=c.getFirstChild();d.messageEl=c.down(".x-list-pullrefresh-message");d.updatedEl=c.down(".x-list-pullrefresh-updated > span");d.maxScroller=a.getMaxPosition();a.on({maxpositionchange:d.setMaxScroller,scroll:d.onScrollChange,scope:d})},fetchLatest:function(){var b=this.getList().getStore(),c=b.getProxy(),a;a=Ext.create("Ext.data.Operation",{page:1,start:0,model:b.getModel(),limit:b.getPageSize(),action:"read",filters:b.getRemoteFilter()?b.getFilters():[]});c.read(a,this.onLatestFetched,this)},onLatestFetched:function(d){var j=this.getList().getStore(),b=j.getData(),c=d.getRecords(),a=c.length,g=[],h,f,e;for(e=0;e<a;e++){h=c[e];f=b.getByKey(h.getId());if(f){f.set(h.getData())}else{g.push(h)}f=undefined}j.insert(0,g)},onPainted:function(){this.pullHeight=this.loadingElement.getHeight()},setMaxScroller:function(b,a){this.maxScroller=a},onScrollChange:function(b,a,c){if(c<0){this.onBounceTop(c)}if(c>this.maxScroller.y){this.onBounceBottom(c)}},applyPullTpl:function(a){return(Ext.isObject(a)&&a.isTemplate)?a:new Ext.XTemplate(a)},onBounceTop:function(d){var b=this,c=b.getList(),a=c.getScrollable().getScroller();if(!b.isReleased){if(!b.isRefreshing&&-d>=b.pullHeight+10){b.isRefreshing=true;b.setViewState("release");a.getContainer().onBefore({dragend:"onScrollerDragEnd",single:true,scope:b})}else{if(b.isRefreshing&&-d<b.pullHeight+10){b.isRefreshing=false;b.setViewState("pull")}}}},onScrollerDragEnd:function(){var b=this;if(b.isRefreshing){var c=b.getList(),a=c.getScrollable().getScroller();a.minPosition.y=-b.pullHeight;a.on({scrollend:"loadStore",single:true,scope:b});b.isReleased=true}},loadStore:function(){var b=this,c=b.getList(),a=c.getScrollable().getScroller();b.setViewState("loading");b.isReleased=false;Ext.defer(function(){a.on({scrollend:function(){if(b.getRefreshFn()){b.getRefreshFn().call(b,b)}else{b.fetchLatest()}b.resetRefreshState()},delay:100,single:true,scope:b});a.minPosition.y=0;a.scrollTo(null,0,true)},500,b)},onBounceBottom:Ext.emptyFn,setViewState:function(d){var b=this,c=Ext.baseCSSPrefix,e=b.messageEl,a=b.loadingElement;if(d===b.currentViewState){return b}b.currentViewState=d;if(e&&a){switch(d){case"pull":e.setHtml(b.getPullRefreshText());a.removeCls([c+"list-pullrefresh-release",c+"list-pullrefresh-loading"]);break;case"release":e.setHtml(b.getReleaseRefreshText());a.addCls(c+"list-pullrefresh-release");break;case"loading":e.setHtml(b.getLoadingText());a.addCls(c+"list-pullrefresh-loading");break}}return b},resetRefreshState:function(){var a=this;a.isRefreshing=false;a.lastUpdated=new Date();a.setViewState("pull");a.updatedEl.setHtml(Ext.util.Format.date(a.lastUpdated,"m/d/Y h:iA"))}});Ext.define("Ext.scroll.indicator.Abstract",{extend:"Ext.Component",config:{baseCls:"x-scroll-indicator",axis:"x",value:0,length:null,hidden:true,ui:"dark"},cachedConfig:{ratio:1,barCls:"x-scroll-bar",active:true},barElement:null,barLength:0,gapLength:0,getElementConfig:function(){return{reference:"barElement",children:[this.callParent()]}},applyRatio:function(a){if(isNaN(a)){a=1}return a},refresh:function(){var f=this.barElement,e=f.dom,c=this.getRatio(),b=this.getAxis(),a=(b==="x")?e.offsetWidth:e.offsetHeight,d=a*c;this.barLength=a;this.gapLength=a-d;this.setLength(d);this.updateValue(this.getValue())},updateBarCls:function(a){this.barElement.addCls(a)},updateAxis:function(a){this.element.addCls(this.getBaseCls(),null,a);this.barElement.addCls(this.getBarCls(),null,a)},updateValue:function(a){this.setOffset(this.gapLength*a)},updateActive:function(a){this.barElement[a?"addCls":"removeCls"]("active")},doSetHidden:function(a){var b=this.element.dom.style;if(a){b.opacity="0"}else{b.opacity=""}},updateLength:function(c){var b=this.getAxis(),a=this.element;if(b==="x"){a.setWidth(c)}else{a.setHeight(c)}},setOffset:function(c){var b=this.getAxis(),a=this.element;if(b==="x"){a.setLeft(c)}else{a.setTop(c)}}});Ext.define("Ext.scroll.indicator.CssTransform",{extend:"Ext.scroll.indicator.Abstract",config:{cls:"csstransform"},getElementConfig:function(){var a=this.callParent();a.children[0].children=[{reference:"startElement"},{reference:"middleElement"},{reference:"endElement"}];return a},refresh:function(){var d=this.getAxis(),c=this.startElement.dom,a=this.endElement.dom,e=this.middleElement,b,f;if(d==="x"){b=c.offsetWidth;f=a.offsetWidth;e.setLeft(b)}else{b=c.offsetHeight;f=a.offsetHeight;e.setTop(b)}this.startElementLength=b;this.endElementLength=f;this.minLength=b+f;this.callParent()},applyLength:function(a){return Math.round(Math.max(this.minLength,a))},updateLength:function(c){var b=this.getAxis(),a=this.endElement.dom.style,e=this.middleElement.dom.style,d=this.endElementLength,g=c-d,f=g-this.startElementLength;if(b==="x"){a.webkitTransform="translate3d("+g+"px, 0, 0)";e.webkitTransform="translate3d(0, 0, 0) scaleX("+f+")"}else{a.webkitTransform="translate3d(0, "+g+"px, 0)";e.webkitTransform="translate3d(0, 0, 0) scaleY("+f+")"}},updateValue:function(f){var b=this.barLength,c=this.gapLength,d=this.getLength(),e,g,a;if(f<=0){g=0;this.updateLength(this.applyLength(d+f*b))}else{if(f>=1){a=Math.round((f-1)*b);e=this.applyLength(d-a);a=d-e;this.updateLength(e);g=c+a}else{g=c*f}}this.setOffset(g)},setOffset:function(c){var a=this.getAxis(),b=this.element.dom.style;c=Math.round(c);if(a==="x"){b.webkitTransform="translate3d("+c+"px, 0, 0)"}else{b.webkitTransform="translate3d(0, "+c+"px, 0)"}}});Ext.define("Ext.scroll.indicator.Default",{extend:"Ext.scroll.indicator.Abstract",config:{cls:"default"},setOffset:function(c){var b=this.getAxis(),a=this.element.dom.style;if(b==="x"){a.webkitTransform="translate3d("+c+"px, 0, 0)"}else{a.webkitTransform="translate3d(0, "+c+"px, 0)"}},applyLength:function(a){return Math.round(Math.max(0,a))},updateValue:function(f){var b=this.barLength,c=this.gapLength,d=this.getLength(),e,g,a;if(f<=0){g=0;this.updateLength(this.applyLength(d+f*b))}else{if(f>=1){a=Math.round((f-1)*b);e=this.applyLength(d-a);a=d-e;this.updateLength(e);g=c+a}else{g=c*f}}this.setOffset(g)}});Ext.define("Ext.scroll.indicator.ScrollPosition",{extend:"Ext.scroll.indicator.Abstract",config:{cls:"scrollposition"},getElementConfig:function(){var a=this.callParent(arguments);a.children.unshift({className:"x-scroll-bar-stretcher"});return a},updateValue:function(a){if(this.gapLength===0){if(a>1){a=a-1}this.setOffset(this.barLength*a)}else{this.setOffset(this.gapLength*a)}},setLength:function(e){var c=this.getAxis(),a=this.barLength,d=this.barElement.dom,b=this.element;this.callParent(arguments);if(c==="x"){d.scrollLeft=a;b.setLeft(a)}else{d.scrollTop=a;b.setTop(a)}},setOffset:function(d){var b=this.getAxis(),a=this.barLength,c=this.barElement.dom;d=a-d;if(b==="x"){c.scrollLeft=d}else{c.scrollTop=d}}});Ext.define("Ext.scroll.Indicator",{requires:["Ext.scroll.indicator.Default","Ext.scroll.indicator.ScrollPosition","Ext.scroll.indicator.CssTransform"],alternateClassName:"Ext.util.Indicator",constructor:function(a){if(Ext.os.is.Android2||Ext.browser.is.ChromeMobile){return new Ext.scroll.indicator.ScrollPosition(a)}else{if(Ext.os.is.iOS){return new Ext.scroll.indicator.CssTransform(a)}else{return new Ext.scroll.indicator.Default(a)}}}});Ext.define("Ext.scroll.View",{extend:"Ext.Evented",alternateClassName:"Ext.util.ScrollView",requires:["Ext.scroll.Scroller","Ext.scroll.Indicator"],config:{indicatorsUi:"dark",element:null,scroller:{},indicators:{x:{axis:"x"},y:{axis:"y"}},indicatorsHidingDelay:100,cls:Ext.baseCSSPrefix+"scroll-view"},processConfig:function(c){if(!c){return null}if(typeof c=="string"){c={direction:c}}c=Ext.merge({},c);var a=c.scroller,b;if(!a){c.scroller=a={}}for(b in c){if(c.hasOwnProperty(b)){if(!this.hasConfig(b)){a[b]=c[b];delete c[b]}}}return c},constructor:function(a){a=this.processConfig(a);this.useIndicators={x:true,y:true};this.doHideIndicators=Ext.Function.bind(this.doHideIndicators,this);this.initConfig(a)},setConfig:function(a){return this.callParent([this.processConfig(a)])},updateIndicatorsUi:function(a){var b=this.getIndicators();b.x.setUi(a);b.y.setUi(a)},applyScroller:function(a,b){return Ext.factory(a,Ext.scroll.Scroller,b)},applyIndicators:function(b,d){var a=Ext.scroll.Indicator,c=this.useIndicators;if(!b){b={}}if(!b.x){c.x=false;b.x={}}if(!b.y){c.y=false;b.y={}}return{x:Ext.factory(b.x,a,d&&d.x),y:Ext.factory(b.y,a,d&&d.y)}},updateIndicators:function(a){this.indicatorsGrid=Ext.Element.create({className:"x-scroll-bar-grid-wrapper",children:[{className:"x-scroll-bar-grid",children:[{children:[{},{children:[a.y.barElement]}]},{children:[{children:[a.x.barElement]},{}]}]}]})},updateScroller:function(a){a.on({scope:this,scrollstart:"onScrollStart",scroll:"onScroll",scrollend:"onScrollEnd",refresh:"refreshIndicators"})},isAxisEnabled:function(a){return this.getScroller().isAxisEnabled(a)&&this.useIndicators[a]},applyElement:function(a){if(a){return Ext.get(a)}},updateElement:function(c){var b=c.getFirstChild().getFirstChild(),a=this.getScroller();c.addCls(this.getCls());c.insertFirst(this.indicatorsGrid);a.setElement(b);this.refreshIndicators();return this},showIndicators:function(){var a=this.getIndicators();if(this.hasOwnProperty("indicatorsHidingTimer")){clearTimeout(this.indicatorsHidingTimer);delete this.indicatorsHidingTimer}if(this.isAxisEnabled("x")){a.x.show()}if(this.isAxisEnabled("y")){a.y.show()}},hideIndicators:function(){var a=this.getIndicatorsHidingDelay();if(a>0){this.indicatorsHidingTimer=setTimeout(this.doHideIndicators,a)}else{this.doHideIndicators()}},doHideIndicators:function(){var a=this.getIndicators();if(this.isAxisEnabled("x")){a.x.hide()}if(this.isAxisEnabled("y")){a.y.hide()}},onScrollStart:function(){this.onScroll.apply(this,arguments);this.showIndicators()},onScrollEnd:function(){this.hideIndicators()},onScroll:function(b,a,c){this.setIndicatorValue("x",a);this.setIndicatorValue("y",c)},setIndicatorValue:function(b,f){if(!this.isAxisEnabled(b)){return this}var a=this.getScroller(),c=a.getMaxPosition()[b],e=a.getContainerSize()[b],d;if(c===0){d=f/e;if(f>=0){d+=1}}else{if(f>c){d=1+((f-c)/e)}else{if(f<0){d=f/e}else{d=f/c}}}this.getIndicators()[b].setValue(d)},refreshIndicator:function(d){if(!this.isAxisEnabled(d)){return this}var a=this.getScroller(),b=this.getIndicators()[d],e=a.getContainerSize()[d],f=a.getSize()[d],c=e/f;b.setRatio(c);b.refresh()},refresh:function(){return this.getScroller().refresh()},refreshIndicators:function(){var a=this.getIndicators();a.x.setActive(this.isAxisEnabled("x"));a.y.setActive(this.isAxisEnabled("y"));this.refreshIndicator("x");this.refreshIndicator("y")},destroy:function(){var a=this.getElement(),b=this.getIndicators();if(a&&!a.isDestroyed){a.removeCls(this.getCls())}b.x.destroy();b.y.destroy();Ext.destroy(this.getScroller(),this.indicatorsGrid);delete this.indicatorsGrid;this.callParent(arguments)}});Ext.define("Ext.behavior.Scrollable",{extend:"Ext.behavior.Behavior",requires:["Ext.scroll.View"],constructor:function(){this.listeners={painted:"onComponentPainted",scope:this};this.callParent(arguments)},onComponentPainted:function(){this.scrollView.refresh()},setConfig:function(d){var b=this.scrollView,c=this.component,f,e,a;if(d){if(!b){this.scrollView=b=new Ext.scroll.View(d);b.on("destroy","onScrollViewDestroy",this);c.setUseBodyElement(true);this.scrollerElement=a=c.innerElement;this.scrollContainer=e=a.wrap();this.scrollViewElement=f=c.bodyElement;b.setElement(f);if(c.isPainted()){this.onComponentPainted(c)}c.on(this.listeners)}else{if(Ext.isObject(d)){b.setConfig(d)}}}else{if(b){b.destroy()}}return this},getScrollView:function(){return this.scrollView},onScrollViewDestroy:function(){var b=this.component,a=this.scrollerElement;if(!a.isDestroyed){this.scrollerElement.unwrap()}this.scrollContainer.destroy();b.un(this.listeners);delete this.scrollerElement;delete this.scrollView;delete this.scrollContainer},onComponentDestroy:function(){var a=this.scrollView;if(a){a.destroy()}}});Ext.define("Ext.Container",{extend:"Ext.Component",alternateClassName:"Ext.lib.Container",requires:["Ext.layout.Layout","Ext.ItemCollection","Ext.behavior.Scrollable","Ext.Mask"],xtype:"container",eventedConfig:{activeItem:0},config:{layout:null,control:{},defaults:null,items:null,autoDestroy:true,defaultType:null,scrollable:null,useBodyElement:null,masked:null,modal:null,hideOnMaskTap:null},isContainer:true,delegateListeners:{delegate:"> component",centeredchange:"onItemCenteredChange",dockedchange:"onItemDockedChange",floatingchange:"onItemFloatingChange"},constructor:function(a){var b=this;b._items=b.items=new Ext.ItemCollection();b.innerItems=[];b.onItemAdd=b.onFirstItemAdd;b.callParent(arguments)},getElementConfig:function(){return{reference:"element",className:"x-container",children:[{reference:"innerElement",className:"x-inner"}]}},applyMasked:function(a,b){b=Ext.factory(a,Ext.Mask,b);if(b){this.add(b)}return b},mask:function(a){this.setMasked(a||true)},unmask:function(){this.setMasked(false)},applyModal:function(a,b){if(!a&&!b){return}return Ext.factory(a,Ext.Mask,b)},updateModal:function(c,a){var b={painted:"refreshModalMask",erased:"destroyModalMask"};if(c){this.on(b);c.on("destroy","onModalDestroy",this);if(this.getTop()===null&&this.getBottom()===null&&this.getRight()===null&&this.getLeft()===null&&!this.getCentered()){this.setTop(0);this.setLeft(0)}if(this.isPainted()){this.refreshModalMask()}}else{if(a){a.un("destroy","onModalDestroy",this);this.un(b)}}},onModalDestroy:function(){this.setModal(null)},refreshModalMask:function(){var b=this.getModal(),a=this.getParent();if(!this.painted){this.painted=true;if(b){a.insertBefore(b,this);b.setZIndex(this.getZIndex()-1)}}},destroyModalMask:function(){var b=this.getModal(),a=this.getParent();if(this.painted){this.painted=false;if(b){a.remove(b,false)}}},updateZIndex:function(b){var a=this.getModal();this.callParent(arguments);if(a){a.setZIndex(b-1)}},updateHideOnMaskTap:function(b){var a=this.getModal();if(a){a[b?"on":"un"].call(a,"tap","hide",this)}},updateBaseCls:function(a,b){var c=this,d=c.getUi();if(a){this.element.addCls(a);this.innerElement.addCls(a,null,"inner");if(d){this.element.addCls(a,null,d)}}if(b){this.element.removeCls(b);this.innerElement.removeCls(a,null,"inner");if(d){this.element.removeCls(b,null,d)}}},updateUseBodyElement:function(a){if(a){this.bodyElement=this.innerElement.wrap({cls:"x-body"});this.referenceList.push("bodyElement")}},applyItems:function(a,b){if(a){this.getDefaultType();this.getDefaults();if(this.initialized&&b.length>0){this.removeAll()}this.add(a)}},applyControl:function(c){var a,b,e,d;for(a in c){d=c[a];for(b in d){e=d[b];if(Ext.isObject(e)){e.delegate=a}}d.delegate=a;this.addListener(d)}return c},onFirstItemAdd:function(){delete this.onItemAdd;this.setLayout(new Ext.layout.Layout(this,this.getLayout()||"default"));if(this.innerHtmlElement&&!this.getHtml()){this.innerHtmlElement.destroy();delete this.innerHtmlElement}this.on(this.delegateListeners);return this.onItemAdd.apply(this,arguments)},updateDefaultType:function(a){this.defaultItemClass=Ext.ClassManager.getByAlias("widget."+a)},applyDefaults:function(a){if(a){this.factoryItem=this.factoryItemWithDefaults;return a}},factoryItem:function(a){return Ext.factory(a,this.defaultItemClass)},factoryItemWithDefaults:function(c){var b=this,d=b.getDefaults(),a;if(!d){return Ext.factory(c,b.defaultItemClass)}if(c.isComponent){a=c;if(d&&c.isInnerItem()&&!b.has(a)){a.setConfig(d,true)}}else{if(d&&!c.ignoreDefaults){if(!(c.hasOwnProperty("left")&&c.hasOwnProperty("right")&&c.hasOwnProperty("top")&&c.hasOwnProperty("bottom")&&c.hasOwnProperty("docked")&&c.hasOwnProperty("centered"))){c=Ext.mergeIf({},c,d)}}a=Ext.factory(c,b.defaultItemClass)}return a},add:function(a){var e=this,b,d,c,f;a=Ext.Array.from(a);d=a.length;for(b=0;b<d;b++){c=e.factoryItem(a[b]);this.doAdd(c);if(!f&&!this.getActiveItem()&&this.innerItems.length>0&&c.isInnerItem()){f=c}}if(f){this.setActiveItem(f)}return c},doAdd:function(d){var c=this,a=c.getItems(),b;if(!a.has(d)){b=a.length;a.add(d);if(d.isInnerItem()){c.insertInner(d)}d.setParent(c);c.onItemAdd(d,b)}},remove:function(d,b){var c=this,a=c.indexOf(d),e=this.getInnerItems(),f;if(b===undefined){b=c.getAutoDestroy()}if(a!==-1){if(!this.removingAll&&e.length>1&&d===this.getActiveItem()){this.on({activeitemchange:"doRemove",scope:this,single:true,order:"after",args:[d,a,b]});f=e.indexOf(d);if(f===0){this.setActiveItem(1)}else{this.setActiveItem(0)}}else{this.doRemove(d,a,b)}}return c},doRemove:function(d,a,b){var c=this;c.items.remove(d);if(d.isInnerItem()){c.removeInner(d)}c.onItemRemove(d,a,b);d.setParent(null);if(b){d.destroy()}},removeAll:function(c,f){var a=this.items,e=a.length,b=0,d;if(c===undefined){c=this.getAutoDestroy()}f=Boolean(f);this.removingAll=true;for(;b<e;b++){d=a.getAt(b);if(d&&(f||d.isInnerItem())){this.doRemove(d,b,c);b--;e--}}this.removingAll=false;return this},getAt:function(a){return this.items.getAt(a)},removeAt:function(a){var b=this.getAt(a);if(b){this.remove(b)}return this},removeInnerAt:function(a){var b=this.getInnerItems()[a];if(b){this.remove(b)}return this},has:function(a){return this.getItems().indexOf(a)!=-1},hasInnerItem:function(a){return this.innerItems.indexOf(a)!=-1},indexOf:function(a){return this.getItems().indexOf(a)},insertInner:function(d,b){var a=this.getItems().items,f=this.innerItems,g=f.indexOf(d),c=-1,e;if(g!==-1){f.splice(g,1)}if(typeof b=="number"){do{e=a[++b]}while(e&&!e.isInnerItem());if(e){c=f.indexOf(e);f.splice(c,0,d)}}if(c===-1){f.push(d);c=f.length-1}if(g!==-1){this.onInnerItemMove(d,c,g)}return this},onInnerItemMove:Ext.emptyFn,removeInner:function(a){Ext.Array.remove(this.innerItems,a);return this},insert:function(a,d){var c=this,b;if(Ext.isArray(d)){for(b=d.length-1;b>=0;b--){c.insert(a,d[b])}return c}d=this.factoryItem(d);this.doInsert(a,d);return d},doInsert:function(d,f){var e=this,b=e.items,c=b.length,a,g;g=f.isInnerItem();if(d>c){d=c}if(b[d-1]===f){return e}a=e.indexOf(f);if(a!==-1){if(a<d){d-=1}b.removeAt(a)}else{f.setParent(e)}b.insert(d,f);if(g){e.insertInner(f,d)}if(a!==-1){e.onItemMove(f,d,a)}else{e.onItemAdd(f,d)}},insertFirst:function(a){return this.insert(0,a)},insertLast:function(a){return this.insert(this.getItems().length,a)},insertBefore:function(c,a){var b=this.indexOf(a);if(b!==-1){this.insert(b,c)}return this},insertAfter:function(c,a){var b=this.indexOf(a);if(b!==-1){this.insert(b+1,c)}return this},onItemAdd:function(b,a){this.doItemLayoutAdd(b,a);if(this.initialized){this.fireEvent("add",this,b,a)}},doItemLayoutAdd:function(c,a){var b=this.getLayout();if(this.isRendered()&&c.setRendered(true)){c.fireAction("renderedchange",[this,c,true],"onItemAdd",b,{args:[c,a]})}else{b.onItemAdd(c,a)}},onItemRemove:function(b,a){this.doItemLayoutRemove(b,a);this.fireEvent("remove",this,b,a)},doItemLayoutRemove:function(c,a){var b=this.getLayout();if(this.isRendered()&&c.setRendered(false)){c.fireAction("renderedchange",[this,c,false],"onItemRemove",b,{args:[c,a]})}else{b.onItemRemove(c,a)}},onItemMove:function(b,c,a){if(b.isDocked()){b.setDocked(null)}this.doItemLayoutMove(b,c,a);this.fireEvent("move",this,b,c,a)},doItemLayoutMove:function(b,c,a){this.getLayout().onItemMove(b,c,a)},onItemCenteredChange:function(b,a){if(!b.isFloating()&&!b.isDocked()){if(a){this.removeInner(b)}else{this.insertInner(b,this.indexOf(b))}}this.getLayout().onItemCenteredChange(b,a)},onItemFloatingChange:function(a,b){if(!a.isCentered()&&!a.isDocked()){if(b){this.removeInner(a)}else{this.insertInner(a,this.indexOf(a))}}this.getLayout().onItemFloatingChange(a,b)},onItemDockedChange:function(a,c,b){if(!a.isCentered()&&!a.isFloating()){if(c){this.removeInner(a)}else{this.insertInner(a,this.indexOf(a))}}this.getLayout().onItemDockedChange(a,c,b)},getInnerItems:function(){return this.innerItems},getDockedItems:function(){var a=this.getItems().items,c=[],e=a.length,d,b;for(b=0;b<e;b++){d=a[b];if(d.isDocked()){c.push(d)}}return c},applyActiveItem:function(c,a){var b=this.getInnerItems();this.getItems();if(typeof c=="number"){c=Math.max(0,Math.min(c,b.length-1));c=b[c];if(c){return c}else{if(a){return null}}}else{if(c){if(!c.isComponent){c=this.factoryItem(c)}if(!this.has(c)){this.add(c)}return c}}},animateActiveItem:function(d,c){var b=this.getLayout(),a;if(this.activeItemAnimation){this.activeItemAnimation.destroy()}this.activeItemAnimation=c=new Ext.fx.layout.Card(c);if(c&&b.isCard){c.setLayout(b);a=b.getAnimation();if(a){a.disable();c.on("animationend",function(){a.enable();c.destroy()},this)}}return this.setActiveItem(d)},doSetActiveItem:function(b,a){if(a){a.fireEvent("deactivate",a,this,b)}if(b){b.fireEvent("activate",b,this,a)}},setRendered:function(d){if(this.callParent(arguments)){var a=this.items.items,b,c;for(b=0,c=a.length;b<c;b++){a[b].setRendered(d)}return true}return false},getScrollableBehavior:function(){var a=this.scrollableBehavior;if(!a){a=this.scrollableBehavior=new Ext.behavior.Scrollable(this)}return a},applyScrollable:function(a){this.getScrollableBehavior().setConfig(a)},getScrollable:function(){return this.getScrollableBehavior().getScrollView()},getRefItems:function(a){var b=this.getItems().items.slice(),e=b.length,c,d;if(a){for(c=0;c<e;c++){d=b[c];if(d.getRefItems){b=b.concat(d.getRefItems(true))}}}return b},getComponent:function(a){if(Ext.isObject(a)){a=a.getItemId()}return this.getItems().get(a)},getDockedComponent:function(a){if(Ext.isObject(a)){a=a.getItemId()}var c=this.getDockedItems(),e=c.length,d,b;if(Ext.isNumber(a)){return c[a]}for(b=0;b<e;b++){d=c[b];if(d.id==a){return d}}return false},query:function(a){return Ext.ComponentQuery.query(a,this)},child:function(a){return this.query("> "+a)[0]||null},down:function(a){return this.query(a)[0]||null},destroy:function(){var a=this.getModal();if(a){a.destroy()}this.removeAll(true,true);Ext.destroy(this.getScrollable(),this.bodyElement);this.callParent()}},function(){this.addMember("defaultItemClass",this)});Ext.define("Ext.Panel",{extend:"Ext.Container",requires:["Ext.util.LineSegment"],alternateClassName:"Ext.lib.Panel",xtype:"panel",isPanel:true,config:{baseCls:Ext.baseCSSPrefix+"panel",bodyPadding:null,bodyMargin:null,bodyBorder:null},getElementConfig:function(){var a=this.callParent();a.children.push({reference:"tipElement",className:"x-anchor",hidden:true});return a},applyBodyPadding:function(a){if(a===true){a=5}a=Ext.dom.Element.unitizeBox(a);return a},updateBodyPadding:function(a){this.element.setStyle("padding",a)},applyBodyMargin:function(a){if(a===true){a=5}a=Ext.dom.Element.unitizeBox(a);return a},updateBodyMargin:function(a){this.element.setStyle("margin",a)},applyBodyBorder:function(a){if(a===true){a=1}a=Ext.dom.Element.unitizeBox(a);return a},updateBodyBorder:function(a){this.element.setStyle("border-width",a)},alignTo:function(m){var w=this.tipElement;w.hide();if(this.currentTipPosition){w.removeCls("x-anchor-"+this.currentTipPosition)}this.callParent(arguments);var f=Ext.util.LineSegment,d=m.isComponent?m.renderElement:m,a=this.renderElement,n=d.getPageBox(),k=a.getPageBox(),b=k.left,t=k.top,C=k.right,h=k.bottom,j=b+(k.width/2),i=t+(k.height/2),o={x:b,y:t},l={x:C,y:t},B={x:b,y:h},D={x:C,y:h},y={x:j,y:i},s=n.left+(n.width/2),q=n.top+(n.height/2),v={x:s,y:q},c=new f(y,v),g=0,A=0,e,z,r,p,x,u;w.setVisibility(false);w.show();e=w.getSize();z=e.width;r=e.height;if(c.intersects(new f(o,l))){x=Math.min(Math.max(s,b),C-(z/2));u=t;A=r+10;p="top"}else{if(c.intersects(new f(o,B))){x=b;u=Math.min(Math.max(q+(z/2),t),h);g=r+10;p="left"}else{if(c.intersects(new f(B,D))){x=Math.min(Math.max(s,b),C-(z/2));u=h;A=-r-10;p="bottom"}else{if(c.intersects(new f(l,D))){x=C;u=Math.min(Math.max(q-(z/2),t),h);g=-r-10;p="right"}}}}if(x||u){this.currentTipPosition=p;w.addCls("x-anchor-"+p);w.setLeft(x-b);w.setTop(u-t);w.setVisibility(true);this.setLeft(this.getLeft()+g);this.setTop(this.getTop()+A)}}});Ext.define("Ext.SegmentedButton",{extend:"Ext.Container",xtype:"segmentedbutton",requires:["Ext.Button"],config:{baseCls:Ext.baseCSSPrefix+"segmentedbutton",pressedCls:Ext.baseCSSPrefix+"button-pressed",allowMultiple:false,allowDepress:null,pressedButtons:null,layout:{type:"hbox",align:"stretch"},defaultType:"button"},initialize:function(){var a=this;a.callParent();a.on({delegate:"> button",scope:a,tap:"onButtonRelease"});a.onAfter({delegate:"> button",scope:a,hiddenchange:"onButtonHiddenChange"})},updateAllowMultiple:function(){if(!this.initialized&&!this.getInitialConfig().hasOwnProperty("allowDepress")){this.setAllowDepress(true)}},applyItems:function(){var e=this,f=[],d,b,c,a;e.callParent(arguments);a=this.getItems();d=a.length;for(b=0;b<d;b++){c=a.items[b];if(c.getInitialConfig("pressed")){f.push(a.items[b])}}e.updateFirstAndLastCls(a);e.setPressedButtons(f)},onButtonRelease:function(a){var d=this,e=d.getPressedButtons(),c=[],b;if(!d.getDisabled()&&!a.getDisabled()){if(d.getAllowMultiple()){c=e.concat(c)}b=(c.indexOf(a)!==-1)||(e.indexOf(a)!==-1);if(b&&d.getAllowDepress()){Ext.Array.remove(c,a)}else{if(!b||!d.getAllowDepress()){c.push(a)}}d.setPressedButtons(c);Ext.defer(function(){d.fireEvent("toggle",d,a,d.isPressed(a))},50)}},onButtonHiddenChange:function(){this.updateFirstAndLastCls(this.getItems())},updateFirstAndLastCls:function(a){var d=a.length,e=Ext.baseCSSPrefix,c,b;for(b=0;b<d;b++){c=a.items[b];if(!c.isHidden()){c.addCls(e+"first");break}}for(b=d-1;b>=0;b--){c=a.items[b];if(!c.isHidden()){c.addCls(e+"last");break}}},applyPressedButtons:function(a){var e=this,f=[],c,d,b;if(Ext.isArray(a)){d=a.length;for(b=0;b<d;b++){c=e.getComponent(a[b]);if(c&&f.indexOf(c)===-1){f.push(c)}}}else{c=e.getComponent(a);if(c&&f.indexOf(c)===-1){f.push(c)}}return f},updatePressedButtons:function(a){var h=this,b=h.getItems(),g=h.getPressedCls(),f,d,e,c;e=b.length;for(c=0;c<e;c++){f=b.items[c];f.removeCls([g,f.getPressedCls()])}e=a.length;for(c=0;c<e;c++){d=a[c];d.addCls(g)}},isPressed:function(a){var b=this.getPressedButtons();return b.indexOf(a)!=-1},doSetDisabled:function(a){var b=this;b.items.each(function(c){c.setDisabled(a)},b);b.callParent(arguments)}},function(){});Ext.define("Ext.Sheet",{extend:"Ext.Panel",xtype:"sheet",requires:["Ext.fx.Animation"],config:{baseCls:Ext.baseCSSPrefix+"sheet",hidden:true,modal:true,centered:true,stretchX:null,stretchY:null,enter:"bottom",exit:"bottom",showAnimation:!Ext.os.is.Android2?{type:"slideIn",duration:250,easing:"ease-out"}:null,hideAnimation:!Ext.os.is.Android2?{type:"slideOut",duration:250,easing:"ease-in"}:null},applyHideAnimation:function(b){var a=this.getExit(),d=a;if(a===null){return null}if(b===true){b={type:"slideOut"}}if(Ext.isString(b)){b={type:b}}var c=Ext.factory(b,Ext.fx.Animation);if(c){if(a=="bottom"){d="down"}if(a=="top"){d="up"}c.setDirection(d)}return c},applyShowAnimation:function(a){var d=this.getEnter(),c=d;if(d===null){return null}if(a===true){a={type:"slideIn"}}if(Ext.isString(a)){a={type:a}}var b=Ext.factory(a,Ext.fx.Animation);if(b){if(d=="bottom"){c="down"}if(d=="top"){c="up"}b.setBefore({display:null});b.setReverse(true);b.setDirection(c)}return b},updateStretchX:function(a){this.getLeft();this.getRight();if(a){this.setLeft(0);this.setRight(0)}},updateStretchY:function(a){this.getTop();this.getBottom();if(a){this.setTop(0);this.setBottom(0)}}});Ext.define("Ext.ActionSheet",{extend:"Ext.Sheet",alias:"widget.actionsheet",requires:["Ext.Button"],config:{baseCls:Ext.baseCSSPrefix+"sheet-action",left:0,right:0,bottom:0,centered:false,height:"auto",defaultType:"button"}});Ext.define("Ext.TitleBar",{extend:"Ext.Container",xtype:"titlebar",requires:["Ext.Button","Ext.Title","Ext.Spacer","Ext.util.SizeMonitor"],isToolbar:true,config:{baseCls:Ext.baseCSSPrefix+"toolbar",cls:Ext.baseCSSPrefix+"navigation-bar",ui:"dark",title:null,defaultType:"button",layout:{type:"hbox"},items:[]},maxButtonWidth:"40%",constructor:function(){this.refreshTitlePosition=Ext.Function.createThrottled(this.refreshTitlePosition,50,this);this.callParent(arguments)},beforeInitialize:function(){this.applyItems=this.applyInitialItems},initialize:function(){delete this.applyItems;this.doAdd=this.doBoxAdd;this.remove=this.doBoxRemove;this.doInsert=this.doBoxInsert;this.add(this.initialItems);delete this.initialItems;this.on({painted:"onPainted",erased:"onErased"})},applyInitialItems:function(c){var e=Ext.util.SizeMonitor,f=this.getDefaults()||{},a,b,d;this.initialItems=c;this.leftBox=a=this.add({xtype:"container",style:"position: relative",layout:{type:"hbox",align:"center"}});this.spacer=d=this.add({xtype:"component",style:"position: relative",flex:1});this.rightBox=b=this.add({xtype:"container",style:"position: relative",layout:{type:"hbox",align:"center"}});this.titleComponent=this.add({xtype:"title",hidden:f.hidden,centered:true});this.sizeMonitors={leftBox:new e({element:a.renderElement,callback:this.refreshTitlePosition,scope:this}),spacer:new e({element:d.renderElement,callback:this.refreshTitlePosition,scope:this}),rightBox:new e({element:b.renderElement,callback:this.refreshTitlePosition,scope:this})}},doBoxAdd:function(a){if(a.config.align=="right"){this.rightBox.add(a)}else{this.leftBox.add(a)}if(this.painted){this.refreshTitlePosition()}},doBoxRemove:function(a){if(a.config.align=="right"){this.rightBox.remove(a)}else{this.leftBox.remove(a)}if(this.painted){this.refreshTitlePosition()}},doBoxInsert:function(a,b){if(b.config.align=="right"){this.rightBox.add(b)}else{this.leftBox.add(b)}},onPainted:function(){var a=this.sizeMonitors;this.painted=true;this.refreshTitlePosition();a.leftBox.refresh();a.spacer.refresh();a.rightBox.refresh()},onErased:function(){this.painted=false},getMaxButtonWidth:function(){var a=this.maxButtonWidth;if(Ext.isString(this.maxButtonWidth)){a=parseInt(a.replace("%",""),10);a=Math.round((this.element.getWidth()/100)*a)}return a},refreshTitlePosition:function(){var f=this.titleComponent.renderElement;f.setWidth(null);f.setLeft(null);var a=this.leftBox,c=a.down("button"),h,m;if(c){c.renderElement.setWidth("auto");h=a.renderElement.getWidth();m=this.getMaxButtonWidth();if(h>m){c.renderElement.setWidth(m)}}var j=this.spacer.renderElement.getPageBox(),k=f.getPageBox(),g=k.width-j.width,d=k.left,i=k.right,b,l,e;if(g>0){f.setWidth(j.width);b=g/2;d+=b;i-=b}l=j.left-d;e=i-j.right;if(l>0){f.setLeft(l)}else{if(e>0){f.setLeft(-e)}}f.repaint()},updateTitle:function(a){this.titleComponent.setTitle(a);this.titleBox=null;if(this.painted){this.refreshTitlePosition()}},destroy:function(){this.callParent();var a=this.sizeMonitors;a.leftBox.destroy();a.spacer.destroy();a.rightBox.destroy()}});Ext.define("Ext.Toolbar",{extend:"Ext.Container",xtype:"toolbar",requires:["Ext.Button","Ext.Title","Ext.Spacer"],isToolbar:true,config:{baseCls:Ext.baseCSSPrefix+"toolbar",ui:"dark",title:null,defaultType:"button",layout:{type:"hbox",align:"center"}},constructor:function(a){a=a||{};if(a.docked=="left"||a.docked=="right"){a.layout={type:"vbox",align:"stretch"}}this.callParent([a])},applyTitle:function(a){if(typeof a=="string"){a={title:a,centered:true}}return Ext.factory(a,Ext.Title,this.getTitle())},updateTitle:function(b,a){if(b){this.add(b);this.getLayout().setItemFlex(b,1)}if(a){a.destroy()}},showTitle:function(){var a=this.getTitle();if(a){a.show()}},hideTitle:function(){var a=this.getTitle();if(a){a.hide()}}},function(){});Ext.define("Ext.MessageBox",{extend:"Ext.Sheet",requires:["Ext.Toolbar","Ext.field.Text","Ext.field.TextArea"],config:{ui:"dark",baseCls:Ext.baseCSSPrefix+"msgbox",iconCls:null,showAnimation:{type:"popIn",duration:250,easing:"ease-out"},hideAnimation:{type:"popOut",duration:250,easing:"ease-out"},zIndex:10,defaultTextHeight:75,title:null,buttons:null,message:null,prompt:null,layout:{type:"vbox",pack:"center"}},statics:{OK:{text:"OK",itemId:"ok",ui:"action"},YES:{text:"Yes",itemId:"yes",ui:"action"},NO:{text:"No",itemId:"no"},CANCEL:{text:"Cancel",itemId:"cancel"},INFO:Ext.baseCSSPrefix+"msgbox-info",WARNING:Ext.baseCSSPrefix+"msgbox-warning",QUESTION:Ext.baseCSSPrefix+"msgbox-question",ERROR:Ext.baseCSSPrefix+"msgbox-error",OKCANCEL:[{text:"Cancel",itemId:"cancel"},{text:"OK",itemId:"ok",ui:"action"}],YESNOCANCEL:[{text:"Cancel",itemId:"cancel"},{text:"No",itemId:"no"},{text:"Yes",itemId:"yes",ui:"action"}],YESNO:[{text:"No",itemId:"no"},{text:"Yes",itemId:"yes",ui:"action"}]},constructor:function(a){a=a||{};if(a.hasOwnProperty("promptConfig")){Ext.applyIf(a,{prompt:a.promptConfig});delete a.promptConfig}if(a.hasOwnProperty("multiline")||a.hasOwnProperty("multiLine")){a.prompt=a.prompt||{};Ext.applyIf(a.prompt,{multiLine:a.multiline||a.multiLine});delete a.multiline;delete a.multiLine}this.callParent([a])},applyTitle:function(a){if(typeof a=="string"){a={title:a}}Ext.applyIf(a,{docked:"top",cls:this.getBaseCls()+"-title"});return Ext.factory(a,Ext.Toolbar,this.getTitle())},updateTitle:function(a){if(a){this.add(a)}},updateButtons:function(a){var b=this;if(a){if(b.buttonsToolbar){b.buttonsToolbar.removeAll();b.buttonsToolbar.setItems(a)}else{b.buttonsToolbar=Ext.create("Ext.Toolbar",{docked:"bottom",defaultType:"button",layout:{type:"hbox",pack:"center"},ui:b.getUi(),cls:b.getBaseCls()+"-buttons",items:a});b.add(b.buttonsToolbar)}}},applyMessage:function(a){a={html:a,cls:this.getBaseCls()+"-text"};return Ext.factory(a,Ext.Component,this._message)},updateMessage:function(a){if(a){this.add(a)}},getMessage:function(){if(this._message){return this._message.getHtml()}return null},applyIconCls:function(a){a={xtype:"component",docked:"left",width:40,height:40,baseCls:Ext.baseCSSPrefix+"icon",hidden:(a)?false:true,cls:a};return Ext.factory(a,Ext.Component,this._iconCls)},updateIconCls:function(a,b){var c=this;this.getTitle();this.getButtons();if(a&&!b){this.add(a)}else{this.remove(b)}},getIconCls:function(){var b=this._iconCls,a;if(b){a=b.getCls();return(a)?a[0]:null}return null},applyPrompt:function(a){if(a){var b={label:false};if(Ext.isObject(a)){Ext.apply(b,a)}if(b.multiLine){b.height=Ext.isNumber(b.multiLine)?parseFloat(b.multiLine):this.getDefaultTextHeight();return Ext.factory(b,Ext.field.TextArea,this.getPrompt())}else{return Ext.factory(b,Ext.field.Text,this.getPrompt())}}return a},updatePrompt:function(a,b){if(a){this.add(a)}if(b){this.remove(b)}},onClick:function(c){if(c){var b=c.config.userConfig||{},d=c.getInitialConfig(),a=this.getPrompt();if(typeof b.fn=="function"){this.on({hiddenchange:function(){b.fn.call(b.scope||null,d.itemId||d.text,a?a.getValue():null,b)},single:true,scope:this})}if(b.cls){this.el.removeCls(b.cls)}if(b.input){b.input.dom.blur()}}this.hide()},show:function(f){if(!this.getParent()&&Ext.Viewport){Ext.Viewport.add(this)}if(!f){return this.callParent()}var b=Ext.Object.merge({},{value:""},f);var e=f.buttons||Ext.MessageBox.OK||[],d=[],c=f;Ext.each(e,function(g){if(!g){return}d.push(Ext.apply({userConfig:c,scope:this,handler:"onClick"},g))},this);b.buttons=d;if(b.promptConfig){}b.prompt=(b.promptConfig||b.prompt)||null;if(b.multiLine){b.prompt=b.prompt||{};b.prompt.multiLine=b.multiLine;delete b.multiLine}this.setConfig(b);var a=this.getPrompt();if(a){a.setValue(f.value||"")}this.callParent();return this},alert:function(d,c,b,a){return this.show({title:d,message:c,buttons:Ext.MessageBox.OK,promptConfig:false,fn:function(e){if(b){b.call(a,e)}},scope:a})},confirm:function(d,c,b,a){return this.show({title:d,message:c,buttons:Ext.MessageBox.YESNO,promptConfig:false,scope:a,fn:function(e){if(b){b.call(a,e)}}})},prompt:function(g,d,c,b,f,e,a){return this.show({title:g,message:d,buttons:Ext.MessageBox.OKCANCEL,scope:b,prompt:a||true,multiLine:f,value:e,fn:function(i,h){if(c){c.call(b,i,h)}}})}},function(a){Ext.onSetup(function(){Ext.Msg=new a})});Ext.define("Ext.carousel.Carousel",{extend:"Ext.Container",alternateClassName:"Ext.Carousel",xtype:"carousel",requires:["Ext.fx.easing.EaseOut","Ext.carousel.Item","Ext.carousel.Indicator"],config:{baseCls:"x-carousel",direction:"horizontal",directionLock:false,animation:{duration:250,easing:{type:"ease-out"}},indicator:true,ui:"dark",itemConfig:{},bufferSize:1,itemLength:null},itemLength:0,offset:0,flickStartOffset:0,flickStartTime:0,dragDirection:0,count:0,painted:false,activeIndex:-1,beforeInitialize:function(){this.animationListeners={animationframe:"onActiveItemAnimationFrame",animationend:"onActiveItemAnimationEnd",scope:this};this.element.on({dragstart:"onDragStart",drag:"onDrag",dragend:"onDragEnd",scope:this});this.on({painted:"onPainted",erased:"onErased",resize:"onSizeChange"});this.carouselItems=[];this.orderedCarouselItems=[];this.inactiveCarouselItems=[];this.hiddenTranslation=0},updateBufferSize:function(n){var l=Ext.carousel.Item,h=n*2+1,m=this.isRendered(),c=this.innerElement,g=this.carouselItems,f=g.length,e=this.getItemConfig(),d=this.getItemLength(),j=this.getDirection(),b=j==="horizontal"?"setWidth":"setHeight",a,k;for(a=f;a<h;a++){k=Ext.factory(e,l);if(d){k[b].call(k,d)}g.push(k);c.append(k.renderElement);if(m&&k.setRendered(true)){k.fireEvent("renderedchange",this,k,true)}}},getActiveCarouselItem:function(){return this.orderedCarouselItems[this.getBufferSize()]},setRendered:function(g){var a=this.rendered;if(g!==a){this.rendered=g;var b=this.items.items,d=this.carouselItems,c,f,e;for(c=0,f=b.length;c<f;c++){e=b[c];if(!e.isInnerItem()){e.setRendered(g)}}for(c=0,f=d.length;c<f;c++){d[c].setRendered(g)}return true}return false},onPainted:function(){this.painted=true;this.refresh();this.refreshCarouselItems()},onErased:function(){this.painted=false},onSizeChange:function(){this.refreshSizing();this.refreshCarouselItems();this.refreshOffset()},onItemAdd:function(c,b){this.callParent(arguments);var d=this.getInnerItems().indexOf(c),a=this.getIndicator();if(a&&c.isInnerItem()){a.addIndicator()}if(d<=this.getActiveIndex()){this.refreshActiveIndex()}if(this.painted&&this.isIndexDirty(d)){this.refreshActiveItem()}},doItemLayoutAdd:function(a){if(a.isInnerItem()){return}this.callParent(arguments)},onItemRemove:function(f,b){this.callParent(arguments);var h=this.getInnerItems().indexOf(f),a=this.getIndicator(),d=this.carouselItems,c,e,g;if(f.isInnerItem()&&a){a.removeIndicator()}if(h<=this.getActiveIndex()){this.refreshActiveIndex()}if(this.isIndexDirty(h)){for(c=0,e=d.length;c<e;c++){g=d[c];if(g.getComponent()===f){g.setComponent(null)}}if(this.painted){this.refreshActiveItem()}}},doItemLayoutRemove:function(a){if(a.isInnerItem()){return}this.callParent(arguments)},onInnerItemMove:function(b,c,a){if(this.painted&&(this.isIndexDirty(c)||this.isIndexDirty(a))){this.refreshActiveItem()}},doItemLayoutMove:function(a){if(a.isInnerItem()){return}this.callParent(arguments)},isIndexDirty:function(b){var a=this.getActiveIndex(),c=this.getBufferSize();return(b>=a-c&&b<=a+c)},onDragStart:function(f){var d=this.getDirection(),b=f.absDeltaX,a=f.absDeltaY,c=this.getDirectionLock();this.isDragging=true;if(c){if((d==="horizontal"&&b>a)||(d==="vertical"&&a>b)){f.stopPropagation()}else{this.isDragging=false;return}}if(this.isAnimating){this.getActiveCarouselItem().getTranslatable().stopAnimation()}this.dragStartOffset=this.offset;this.dragDirection=0},onDrag:function(j){if(!this.isDragging){return}var k=this.dragStartOffset,l=this.getDirection(),m=l==="horizontal"?j.deltaX:j.deltaY,a=this.offset,i=this.flickStartTime,c=this.dragDirection,b=Ext.Date.now(),h=this.getActiveIndex(),f=this.getMaxItemIndex(),d=c,g;if((h===0&&m>0)||(h===f&&m<0)){m*=0.5}g=k+m;if(g>a){c=1}else{if(g<a){c=-1}}if(c!==d||(b-i)>300){this.flickStartOffset=a;this.flickStartTime=b}this.dragDirection=c;this.setOffset(g)},onDragEnd:function(j){if(!this.isDragging){return}this.onDrag(j);this.isDragging=false;var a=Ext.Date.now(),i=this.itemLength,g=i/2,f=this.offset,m=this.getActiveIndex(),c=this.getMaxItemIndex(),h=0,l=f-this.flickStartOffset,b=a-this.flickStartTime,k=this.getIndicator(),d;if(b>0&&Math.abs(l)>=10){d=l/b;if(Math.abs(d)>=1){if(d<0&&m<c){h=-1}else{if(d>0&&m>0){h=1}}}}if(h===0){if(m<c&&f<-g){h=-1}else{if(m>0&&f>g){h=1}}}if(k){k.setActiveIndex(m-h)}this.animationDirection=h;this.setOffsetAnimated(h*i)},applyAnimation:function(a){a.easing=Ext.factory(a.easing,Ext.fx.easing.EaseOut);return a},updateDirection:function(b){var a=this.getIndicator();this.currentAxis=(b==="horizontal")?"x":"y";if(a){a.setDirection(b)}},setOffset:function(e){var k=this.orderedCarouselItems,c=this.getBufferSize(),g=k[c],j=this.itemLength,d=this.currentAxis,a,h,b,f;this.offset=e;e+=this.itemOffset;if(g){g.translateAxis(d,e);for(f=1,b=0;f<=c;f++){h=k[c-f];if(h){b+=j;h.translateAxis(d,e-b)}}for(f=1,b=0;f<=c;f++){a=k[c+f];if(a){b+=j;a.translateAxis(d,e+b)}}}return this},setOffsetAnimated:function(c){var b=this.orderedCarouselItems[this.getBufferSize()],a=this.getIndicator();if(a){a.setActiveIndex(this.getActiveIndex()-this.animationDirection)}this.offset=c;c+=this.itemOffset;if(b){this.isAnimating=true;b.getTranslatable().on(this.animationListeners);b.translateAxis(this.currentAxis,c,this.getAnimation())}return this},onActiveItemAnimationFrame:function(k){var j=this.orderedCarouselItems,c=this.getBufferSize(),h=this.itemLength,d=this.currentAxis,e=k[d],g,a,f,b;for(f=1,b=0;f<=c;f++){g=j[c-f];if(g){b+=h;g.translateAxis(d,e-b)}}for(f=1,b=0;f<=c;f++){a=j[c+f];if(a){b+=h;a.translateAxis(d,e+b)}}},onActiveItemAnimationEnd:function(b){var c=this.getActiveIndex(),a=this.animationDirection,e=this.currentAxis,f=b[e],d=this.itemLength,g;this.isAnimating=false;b.un(this.animationListeners);if(a===-1){g=d+f}else{if(a===1){g=f-d}else{g=f}}g-=this.itemOffset;this.offset=g;this.setActiveItem(c-a)},refresh:function(){this.refreshSizing();this.refreshActiveItem()},refreshSizing:function(){var a=this.element,b=this.getItemLength(),c,d;if(this.getDirection()==="horizontal"){d=a.getWidth()}else{d=a.getHeight()}this.hiddenTranslation=-d;if(b===null){b=d;c=0}else{c=(d-b)/2}this.itemLength=b;this.itemOffset=c},refreshOffset:function(){this.setOffset(this.offset)},refreshActiveItem:function(){this.doSetActiveItem(this.getActiveItem())},getActiveIndex:function(){return this.activeIndex},refreshActiveIndex:function(){this.activeIndex=this.getInnerItemIndex(this.getActiveItem())},refreshCarouselItems:function(){var a=this.carouselItems,b,d,c;for(b=0,d=a.length;b<d;b++){c=a[b];c.getTranslatable().refresh()}this.refreshInactiveCarouselItems()},refreshInactiveCarouselItems:function(){var a=this.inactiveCarouselItems,f=this.hiddenTranslation,c=this.currentAxis,b,e,d;for(b=0,e=a.length;b<e;b++){d=a[b];d.translateAxis(c,f)}},getMaxItemIndex:function(){return this.innerItems.length-1},getInnerItemIndex:function(a){return this.innerItems.indexOf(a)},getInnerItemAt:function(a){return this.innerItems[a]},applyActiveItem:function(){var b=this.callParent(arguments),a;if(b){a=this.getInnerItemIndex(b);if(a!==-1){this.activeIndex=a;return b}}},doSetActiveItem:function(g){var q=this.getActiveIndex(),e=this.getMaxItemIndex(),m=this.getIndicator(),c=this.getBufferSize(),k=this.carouselItems.slice(),n=this.orderedCarouselItems,p={},o={},a,l,b,f,h,j,d;if(k.length===0){return}this.callParent(arguments);n.length=0;if(g){b=g.getId();o[b]=g;p[b]=c;if(q>0){for(f=1;f<=c;f++){h=q-f;if(h>=0){a=this.getInnerItemAt(h);b=a.getId();o[b]=a;p[b]=c-f}else{break}}}if(q<e){for(f=1;f<=c;f++){h=q+f;if(h<=e){a=this.getInnerItemAt(h);b=a.getId();o[b]=a;p[b]=c+f}else{break}}}for(f=0,j=k.length;f<j;f++){d=k[f];l=d.getComponent();if(l){b=l.getId();if(p.hasOwnProperty(b)){k.splice(f,1);f--;j--;delete o[b];n[p[b]]=d}}}for(b in o){if(o.hasOwnProperty(b)){a=o[b];d=k.pop();d.setComponent(a);n[p[b]]=d}}}this.inactiveCarouselItems.length=0;this.inactiveCarouselItems=k;this.refreshOffset();this.refreshInactiveCarouselItems();if(m){m.setActiveIndex(q)}},next:function(){if(this.isAnimating){this.getActiveCarouselItem().getTranslatable().stopAnimation();this.setOffset(0)}if(this.activeIndex===this.getMaxItemIndex()){return this}this.animationDirection=-1;this.setOffsetAnimated(-this.itemLength);return this},previous:function(){if(this.isAnimating){this.getActiveCarouselItem().getTranslatable().stopAnimation();this.setOffset(0)}if(this.activeIndex===0){return this}this.animationDirection=1;this.setOffsetAnimated(this.itemLength);return this},applyIndicator:function(a,b){return Ext.factory(a,Ext.carousel.Indicator,b)},updateIndicator:function(a){if(a){this.insertFirst(a);a.setUi(this.getUi());a.on({next:"next",previous:"previous",scope:this})}},destroy:function(){var a=this.carouselItems.slice();this.carouselItems.length=0;Ext.destroy(a,this.getIndicator());this.callParent();delete this.carouselItems}},function(){});Ext.define("Ext.carousel.Infinite",{extend:"Ext.carousel.Carousel",config:{indicator:null,maxItemIndex:Infinity,innerItemConfig:{}},applyIndicator:function(a){return},updateBufferSize:function(b){this.callParent(arguments);var e=b*2+1,d=this.innerItems.length,c=this.getInnerItemConfig(),a;for(a=d;a<e;a++){this.doAdd(this.factoryItem(c))}this.rebuildInnerIndexes();this.refreshActiveItem()},updateMaxItemIndex:function(b,c){if(c!==undefined){var a=this.getActiveIndex();if(a>b){this.setActiveItem(b)}else{this.rebuildInnerIndexes(a);this.refreshActiveItem()}}},rebuildInnerIndexes:function(n){var c=this.innerIndexToItem,g=this.innerIdToIndex,j=this.innerItems.slice(),h=j.length,b=this.getBufferSize(),d=this.getMaxItemIndex(),l=[],e,k,f,a,m;if(n===undefined){this.innerIndexToItem=c={};this.innerIdToIndex=g={};for(e=0;e<h;e++){m=j[e];a=m.getId();g[a]=e;c[e]=m;this.fireEvent("itemindexchange",this,m,e,-1)}}else{for(e=n-b;e<=n+b;e++){if(e>=0&&e<=d){if(c.hasOwnProperty(e)){Ext.Array.remove(j,c[e]);continue}l.push(e)}}for(e=0,h=l.length;e<h;e++){m=j[e];a=m.getId();f=l[e];k=g[a];delete c[k];g[a]=f;c[f]=m;this.fireEvent("itemindexchange",this,m,f,k)}}},reset:function(){this.rebuildInnerIndexes();this.setActiveItem(0)},refreshItems:function(){var a=this.innerItems,f=this.innerIdToIndex,b,e,c,d;for(c=0,d=a.length;c<d;c++){e=a[c];b=f[e.getId()];this.fireEvent("itemindexchange",this,e,b,-1)}},getInnerItemIndex:function(b){var a=this.innerIdToIndex[b.getId()];return(typeof a=="number")?a:-1},getInnerItemAt:function(a){return this.innerIndexToItem[a]},applyActiveItem:function(c){this.getItems();this.getBufferSize();var b=this.getMaxItemIndex(),a=this.getActiveIndex();if(typeof c=="number"){c=Math.max(0,Math.min(c,b));if(c===a){return}this.activeIndex=c;this.rebuildInnerIndexes(c);c=this.getInnerItemAt(c)}if(c){return this.callParent([c])}}});Ext.define("Ext.dataview.component.DataItem",{extend:"Ext.Container",xtype:"dataitem",config:{baseCls:Ext.baseCSSPrefix+"data-item",defaultType:"component",record:null,itemCls:null,dataMap:{},items:[{xtype:"component"}]},updateBaseCls:function(a,b){var c=this;c.callParent(arguments)},updateItemCls:function(b,a){if(a){this.removeCls(a)}if(b){this.addCls(b)}},updateRecord:function(d){if(!d){return}var h=this,c=h.config.dataview,b=c.prepareData(d.getData(true),c.getStore().indexOf(d),d),e=h.getItems(),k=e.first(),i=h.getDataMap(),f,j,g,a;if(!k){return}for(f in i){g=i[f];j=h[f]();if(j){for(a in g){if(j[a]){j[a](b[g[a]])}}}}h.fireEvent("updatedata",h,b);k.updateData(b)}});Ext.define("Ext.dataview.component.Container",{extend:"Ext.Container",requires:["Ext.dataview.component.DataItem"],constructor:function(){this.itemCache=[];this.callParent(arguments)},doInitialize:function(){this.innerElement.on({touchstart:"onItemTouchStart",touchend:"onItemTouchEnd",tap:"onItemTap",touchmove:"onItemTouchMove",doubletap:"onItemDoubleTap",swipe:"onItemSwipe",delegate:"> ."+Ext.baseCSSPrefix+"data-item",scope:this})},initialize:function(){this.callParent();this.doInitialize()},onItemTouchStart:function(d){var b=this,c=d.getTarget(),a=Ext.getCmp(c.id);a.on({touchmove:"onItemTouchMove",scope:b,single:true});b.fireEvent("itemtouchstart",b,a,b.indexOf(a),d)},onItemTouchMove:function(d){var b=this,c=d.getTarget(),a=Ext.getCmp(c.id);b.fireEvent("itemtouchmove",b,a,b.indexOf(a),d)},onItemTouchEnd:function(d){var b=this,c=d.getTarget(),a=Ext.getCmp(c.id);a.un({touchmove:"onItemTouchMove",scope:b});b.fireEvent("itemtouchend",b,a,b.indexOf(a),d)},onItemTap:function(d){var b=this,c=d.getTarget(),a=Ext.getCmp(c.id);b.fireEvent("itemtap",b,a,b.indexOf(a),d)},onItemTapHold:function(d){var b=this,c=d.getTarget(),a=Ext.getCmp(c.id);b.fireEvent("itemtaphold",b,a,b.indexOf(a),d)},onItemDoubleTap:function(d){var b=this,c=d.getTarget(),a=Ext.getCmp(c.id);b.fireEvent("itemdoubletap",b,a,b.indexOf(a),d)},onItemSwipe:function(d){var b=this,c=d.getTarget(),a=Ext.getCmp(c.id);b.fireEvent("itemswipe",b,a,b.indexOf(a),d)},moveItemsToCache:function(j,k){var h=this,c=h.dataview,a=c.getMaxItemCache(),g=h.getViewItems(),f=h.itemCache,e=f.length,l=c.getPressedCls(),d=c.getSelectedCls(),b=k-j,m;for(;b>=0;b--){m=g[j+b];if(e!==a){h.remove(m,false);m.removeCls([l,d]);f.push(m);e++}else{m.destroy()}}if(h.getViewItems().length==0){this.dataview.showEmptyText()}},moveItemsFromCache:function(b){var l=this,e=l.dataview,m=e.getStore(),k=b.length,a=e.getDefaultType(),h=e.getItemConfig(),g=l.itemCache,f=g.length,j=[],c,n,d;if(k){e.hideEmptyText()}for(c=0;c<k;c++){b[c]._tmpIndex=m.indexOf(b[c])}Ext.Array.sort(b,function(o,i){return o._tmpIndex>i._tmpIndex?1:-1});for(c=0;c<k;c++){d=b[c];if(f){f--;n=g.pop();this.updateListItem(d,n)}else{n=l.getDataItemConfig(a,d,h)}this.insert(d._tmpIndex,n);delete d._tmpIndex}return j},getViewItems:function(){return this.getInnerItems()},updateListItem:function(a,b){if(b.updateRecord){b.updateRecord(a)}},getDataItemConfig:function(d,b,c){var a=this.dataview;return{xtype:d,record:b,dataview:a,itemCls:a.getItemCls(),defaults:c}},doRemoveItemCls:function(a){var b=this.getViewItems(),d=b.length,c=0;for(;c<d;c++){b[c].removeCls(a)}},doAddItemCls:function(a){var b=this.getViewItems(),d=b.length,c=0;for(;c<d;c++){b[c].addCls(a)}},destroy:function(){var d=this,b=d.itemCache,c=b.length,a=0;for(;a<c;a++){b[a].destroy()}this.callParent()}});Ext.define("Ext.dataview.DataView",{extend:"Ext.Container",alternateClassName:"Ext.DataView",mixins:["Ext.mixin.Selectable"],xtype:"dataview",requires:["Ext.LoadMask","Ext.data.StoreManager","Ext.dataview.component.Container","Ext.dataview.element.Container"],config:{store:null,baseCls:Ext.baseCSSPrefix+"dataview",emptyText:null,deferEmptyText:true,itemTpl:"<div>{text}</div>",pressedCls:"x-item-pressed",itemCls:null,selectedCls:"x-item-selected",triggerEvent:"itemtap",triggerCtEvent:"tap",deselectOnContainerClick:true,scrollable:true,inline:null,pressedDelay:100,loadingText:"Loading...",useComponents:null,itemConfig:{},maxItemCache:20,defaultType:"dataitem",scrollToTopOnRefresh:true},constructor:function(a){var b=this;b.hasLoadedStore=false;b.mixins.selectable.constructor.apply(b,arguments);b.callParent(arguments)},updateItemCls:function(c,b){var a=this.container;if(a){if(b){a.doRemoveItemCls(b)}if(c){a.doAddItemCls(c)}}},storeEventHooks:{beforeload:"onBeforeLoad",load:"onLoad",refresh:"refresh",addrecords:"onStoreAdd",removerecords:"onStoreRemove",updaterecord:"onStoreUpdate"},initialize:function(){this.callParent();var b=this,a;b.on(b.getTriggerCtEvent(),b.onContainerTrigger,b);a=b.container=this.add(new Ext.dataview[b.getUseComponents()?"component":"element"].Container({baseCls:this.getBaseCls()}));a.dataview=b;b.on(b.getTriggerEvent(),b.onItemTrigger,b);a.on({itemtouchstart:"onItemTouchStart",itemtouchend:"onItemTouchEnd",itemtap:"onItemTap",itemtaphold:"onItemTapHold",itemtouchmove:"onItemTouchMove",itemdoubletap:"onItemDoubleTap",itemswipe:"onItemSwipe",scope:b});if(this.getStore()){this.refresh()}},applyInline:function(a){if(Ext.isObject(a)){a=Ext.apply({},a)}return a},updateInline:function(c,b){var a=this.getBaseCls();if(b){this.removeCls([a+"-inlineblock",a+"-nowrap"])}if(c){this.addCls(a+"-inlineblock");if(Ext.isObject(c)&&c.wrap===false){this.addCls(a+"-nowrap")}else{this.removeCls(a+"-nowrap")}}},prepareData:function(c,b,a){return c},onContainerTrigger:function(b){var a=this;if(b.target!=a.element.dom){return}if(a.getDeselectOnContainerClick()&&a.getStore()){a.deselectAll()}},onItemTrigger:function(b,a){this.selectWithEvent(this.getStore().getAt(a))},doAddPressedCls:function(a){var c=this,b=c.container.getViewItems()[c.getStore().indexOf(a)];if(Ext.isElement(b)){b=Ext.get(b)}if(b){b.addCls(c.getPressedCls())}},onItemTouchStart:function(b,h,d,g){var f=this,c=f.getStore(),a=c&&c.getAt(d);f.fireAction("itemtouchstart",[f,d,h,a,g],"doItemTouchStart")},doItemTouchStart:function(c,b,e,a){var d=c.getPressedDelay();if(a){if(d>0){c.pressedTimeout=Ext.defer(c.doAddPressedCls,d,c,[a])}else{c.doAddPressedCls(a)}}},onItemTouchEnd:function(b,h,d,g){var f=this,c=f.getStore(),a=c&&c.getAt(d);if(this.hasOwnProperty("pressedTimeout")){clearTimeout(this.pressedTimeout);delete this.pressedTimeout}if(a&&h){h.removeCls(f.getPressedCls())}f.fireEvent("itemtouchend",f,d,h,a,g)},onItemTouchMove:function(b,h,d,g){var f=this,c=f.getStore(),a=c&&c.getAt(d);if(f.hasOwnProperty("pressedTimeout")){clearTimeout(f.pressedTimeout);delete f.pressedTimeout}if(a&&h){h.removeCls(f.getPressedCls())}f.fireEvent("itemtouchmove",f,d,h,a,g)},onItemTap:function(b,h,d,g){var f=this,c=f.getStore(),a=c&&c.getAt(d);f.fireEvent("itemtap",f,d,h,a,g)},onItemTapHold:function(b,h,d,g){var f=this,c=f.getStore(),a=c&&c.getAt(d);f.fireEvent("itemtaphold",f,d,h,a,g)},onItemDoubleTap:function(b,h,d,g){var f=this,c=f.getStore(),a=c&&c.getAt(d);f.fireEvent("itemdoubletap",f,d,h,a,g)},onItemSwipe:function(b,h,d,g){var f=this,c=f.getStore(),a=c&&c.getAt(d);f.fireEvent("itemswipe",f,d,h,a,g)},onItemSelect:function(a,b){var c=this;if(b){c.doItemSelect(c,a)}else{c.fireAction("select",[c,a],"doItemSelect")}},doItemSelect:function(c,a){if(c.container){var b=c.container.getViewItems()[c.getStore().indexOf(a)];if(Ext.isElement(b)){b=Ext.get(b)}if(b){b.removeCls(c.getPressedCls());b.addCls(c.getSelectedCls())}}},onItemDeselect:function(a,b){var c=this;if(c.container){if(b){c.doItemDeselect(c,a)}else{c.fireAction("deselect",[c,a,b],"doItemDeselect")}}},doItemDeselect:function(c,a){var b=c.container.getViewItems()[c.getStore().indexOf(a)];if(Ext.isElement(b)){b=Ext.get(b)}if(b){b.removeCls([c.getPressedCls(),c.getSelectedCls()])}},updateData:function(b){var a=this.getStore();if(!a){this.setStore(Ext.create("Ext.data.Store",{data:b}))}else{a.add(b)}},applyStore:function(b){var d=this,e=Ext.apply({},d.storeEventHooks,{scope:d}),c,a;if(b){b=Ext.data.StoreManager.lookup(b);if(b&&Ext.isObject(b)&&b.isStore){b.on(e);c=b.getProxy();if(c){a=c.getReader();if(a){a.on("exception","handleException",this)}}}}return b},handleException:function(){this.setMasked(false)},updateStore:function(b,e){var d=this,f=Ext.apply({},d.storeEventHooks,{scope:d}),c,a;if(e&&Ext.isObject(e)&&e.isStore){if(e.autoDestroy){e.destroy()}else{e.un(f);c=e.getProxy();if(c){a=c.getReader();if(a){a.un("exception","handleException",this)}}}}if(b){if(b.isLoaded()){this.hasLoadedStore=true}if(b.isLoading()){d.onBeforeLoad()}if(d.container){d.refresh()}}},onBeforeLoad:function(){var b=this.getScrollable();if(b){b.getScroller().stopAnimation()}var a=this.getLoadingText();if(a){this.setMasked({xtype:"loadmask",message:a});if(b){b.getScroller().setDisabled(true)}}this.hideEmptyText()},updateEmptyText:function(b){var a=this;if(b){a.emptyTextCmp=a.add({xtype:"component",cls:a.getBaseCls()+"-emptytext",html:b,hidden:true})}else{if(a.emptyTextCmp){a.remove(a.emptyTextCmp,true);delete a.emptyTextCmp}}},onLoad:function(a){var b=this.getScrollable();this.hasLoadedStore=true;this.setMasked(false);if(b){b.getScroller().setDisabled(false)}if(!a.getCount()){this.showEmptyText()}},refresh:function(){var b=this,a=b.container;if(!b.getStore()){if(!b.hasLoadedStore&&!b.getDeferEmptyText()){b.showEmptyText()}return}if(a){b.fireAction("refresh",[b],"doRefresh")}},applyItemTpl:function(a){return(Ext.isObject(a)&&a.isTemplate)?a:new Ext.XTemplate(a)},onAfterRender:function(){var a=this;a.callParent(arguments);a.updateStore(a.getStore())},getViewItems:function(){return this.container.getViewItems()},doRefresh:function(f){var a=f.container,j=f.getStore(),b=j.getRange(),e=a.getViewItems(),h=b.length,l=e.length,c=h-l,g=f.getScrollable(),d,k;if(this.getScrollToTopOnRefresh()&&g){g.getScroller().scrollToTop()}if(h<1){f.onStoreClear();return}if(c<0){a.moveItemsToCache(l+c,l-1);e=a.getViewItems();l=e.length}else{if(c>0){a.moveItemsFromCache(j.getRange(l))}}for(d=0;d<l;d++){k=e[d];a.updateListItem(b[d],k)}},showEmptyText:function(){if(this.hasLoadedStore&&this.getEmptyText()){this.emptyTextCmp.show()}},hideEmptyText:function(){if(this.getEmptyText()){this.emptyTextCmp.hide()}},onStoreClear:function(){var c=this,a=c.container,b=a.getViewItems();a.moveItemsToCache(0,b.length-1);this.showEmptyText()},onStoreAdd:function(b,a){if(a){this.container.moveItemsFromCache(a)}},onStoreRemove:function(c,b,f){var a=this.container,e=b.length,d;for(d=0;d<e;d++){a.moveItemsToCache(f[d],f[d])}},onStoreUpdate:function(c,b,d,f){var e=this,a=e.container;f=(typeof f==="undefined")?d:f;if(f!==d){a.moveItemsToCache(f,f);a.moveItemsFromCache([b])}else{a.updateListItem(b,a.getViewItems()[d])}}});Ext.define("Ext.dataview.List",{alternateClassName:"Ext.List",extend:"Ext.dataview.DataView",xtype:"list",requires:["Ext.dataview.element.List","Ext.dataview.IndexBar","Ext.dataview.ListItemHeader"],config:{indexBar:false,icon:null,preventSelectionOnDisclose:true,baseCls:Ext.baseCSSPrefix+"list",pinHeaders:true,grouped:false,onItemDisclosure:null,ui:"normal"},constructor:function(){this.translateHeader=(Ext.os.is.Android2)?this.translateHeaderCssPosition:this.translateHeaderTransform;this.callParent(arguments)},onItemTrigger:function(c,b,f,a,d){if(!(this.getPreventSelectionOnDisclose()&&Ext.fly(d.target).hasCls(this.getBaseCls()+"-disclosure"))){this.callParent(arguments)}},initialize:function(){var b=this,a;b.on(b.getTriggerCtEvent(),b.onContainerTrigger,b);a=b.container=this.add(new Ext.dataview.element.List({baseCls:this.getBaseCls()}));a.dataview=b;b.on(b.getTriggerEvent(),b.onItemTrigger,b);a.element.on({delegate:"."+this.getBaseCls()+"-disclosure",tap:"handleItemDisclosure",scope:b});a.on({itemtouchstart:"onItemTouchStart",itemtouchend:"onItemTouchEnd",itemtap:"onItemTap",itemtaphold:"onItemTapHold",itemtouchmove:"onItemTouchMove",itemdoubletap:"onItemDoubleTap",itemswipe:"onItemSwipe",scope:b});if(this.getStore()){this.refresh()}},updateInline:function(a){this.callParent(arguments);if(a){this.setOnItemDisclosure(false);this.setIndexBar(false);this.setGrouped(false)}},applyIndexBar:function(a){return Ext.factory(a,Ext.dataview.IndexBar,this.getIndexBar())},updateIndexBar:function(a){if(a&&this.getScrollable()){this.indexBarElement=this.getScrollableBehavior().getScrollView().getElement().appendChild(a.renderElement);a.on({index:"onIndex",scope:this});this.element.addCls(this.getBaseCls()+"-indexed")}},updateGrouped:function(c){var b=this.getBaseCls(),a=b+"-grouped",d=b+"-ungrouped";if(c){this.addCls(a);this.removeCls(d);this.doRefreshHeaders();this.updatePinHeaders(this.getPinHeaders())}else{this.addCls(d);this.removeCls(a);if(this.container){this.container.doRemoveHeaders()}this.updatePinHeaders(null)}},updatePinHeaders:function(b){var c=this.getScrollable(),a;if(c){a=c.getScroller()}if(!c){return}if(b&&this.getGrouped()){a.on({refresh:"doRefreshHeaders",scroll:"onScroll",scope:this});if(!this.header||!this.header.renderElement.dom){this.createHeader()}}else{a.un({refresh:"doRefreshHeaders",scroll:"onScroll",scope:this});if(this.header){this.header.destroy()}}},createHeader:function(){var e,d=this.getScrollable(),a,b,c;if(d){a=d.getScroller();b=this.getScrollableBehavior().getScrollView();c=b.getElement()}else{return}this.header=e=Ext.create("Ext.dataview.ListItemHeader",{html:" ",cls:"x-list-header-swap"});c.dom.insertBefore(e.element.dom,a.getContainer().dom.nextSibling);this.translateHeader(1000)},refresh:function(){this.callParent();this.doRefreshHeaders()},onStoreAdd:function(){this.callParent(arguments);this.doRefreshHeaders()},onStoreRemove:function(){this.callParent(arguments);this.doRefreshHeaders()},onStoreUpdate:function(){this.callParent(arguments);this.doRefreshHeaders()},onStoreClear:function(){this.callParent();if(this.header){this.header.destroy()}this.doRefreshHeaders()},getClosestGroups:function(){var a=this.pinHeaderInfo.offsets,e=this.getScrollable(),d=a.length,b=0,h,g,f,c;if(e){h=e.getScroller().position}else{return{current:0,next:0}}for(;b<d;b++){g=a[b];if(g.offset>h.y){c=g;break}f=g}return{current:f,next:c}},doRefreshHeaders:function(){if(!this.getGrouped()||!this.container){return false}var l=this.findGroupHeaderIndices(),f=l.length,g=this.container.getViewItems(),j=this.pinHeaderInfo={offsets:[]},a=j.offsets,h=this.getScrollable(),e,k,b,d,c;if(f){for(b=0;b<f;b++){d=g[l[b]];if(d){c=this.getItemHeader(d);a.push({header:c,offset:d.offsetTop})}}j.closest=this.getClosestGroups();this.setActiveGroup(j.closest.current);if(c){j.headerHeight=Ext.fly(c).getHeight()}if(h){e=h.getScroller();k=e.position;this.onScroll(e,k.x,k.y)}}},getItemHeader:function(a){return a.childNodes[0]},onScroll:function(e,j,h){var g=this,i=g.pinHeaderInfo,a=i.closest,b=g.activeGroup,c=i.headerHeight,d,f;if(!a){return}d=a.next;f=a.current;if(!this.header||!this.header.renderElement.dom){this.createHeader()}if(h<=0){if(b){g.setActiveGroup(false);a.next=f}this.translateHeader(1000);return}else{if((d&&h>d.offset)||(f&&h<f.offset)){a=i.closest=this.getClosestGroups();d=a.next;f=a.current;this.setActiveGroup(f)}}if(d&&h>0&&d.offset-h<=c){var k=c-(d.offset-h);this.translateHeader(k)}else{this.translateHeader(null)}},translateHeaderTransform:function(a){this.header.renderElement.dom.style.webkitTransform=(a===null)?null:"translate3d(0px, -"+a+"px, 0px)"},translateHeaderCssPosition:function(a){this.header.renderElement.dom.style.top=(a===null)?null:"-"+Math.round(a)+"px"},setActiveGroup:function(b){var a=this,c=a.header;if(c){if(b){if(!a.activeGroup||a.activeGroup.header!=b.header){c.show();if(c.element){c.setHtml(b.header.innerHTML)}}}else{if(c&&c.dom){c.hide()}}}this.activeGroup=b},onIndex:function(o,c){var r=this,s=c.toLowerCase(),b=r.getStore(),q=b.getGroups(),f=q.length,h=r.getScrollable(),n,e,m,g,k,p;if(h){n=r.getScrollable().getScroller()}else{return}for(m=0;m<f;m++){e=q[m];k=e.name.toLowerCase();if(k==s||k>s){g=e;break}else{g=e}}if(h&&g){p=r.container.getViewItems()[b.indexOf(g.children[0])];n.stopAnimation();var l=n.getContainerSize().y,j=n.getSize().y,d=j-l,a=(p.offsetTop>d)?d:p.offsetTop;n.scrollTo(0,a)}},applyOnItemDisclosure:function(a){if(Ext.isFunction(a)){return{scope:this,handler:a}}return a},handleItemDisclosure:function(f){var d=this,c=f.getTarget().parentNode,b=d.container.getViewItems().indexOf(c),a=d.getStore().getAt(b);d.fireAction("disclose",[d,a,c,b,f],"doDisclose")},doDisclose:function(f,a,d,c,g){var b=f.getOnItemDisclosure();if(b&&b.handler){b.handler.call(f,a,d,c,g)}},findGroupHeaderIndices:function(){if(!this.getGrouped()){return[]}var h=this,k=h.getStore();if(!k){return[]}var b=h.container,d=k.getGroups(),m=d.length,g=b.getViewItems(),c=[],l=b.footerClsShortCache,e,a,f,n,j;b.doRemoveHeaders();b.doRemoveFooterCls();if(g.length){for(e=0;e<m;e++){a=d[e].children[0];f=k.indexOf(a);n=g[f];b.doAddHeader(n,k.getGroupString(a));if(e){Ext.fly(n.previousSibling).addCls(l)}c.push(f)}j=d[--e].children;Ext.fly(g[k.indexOf(j[j.length-1])]).addCls(l)}return c},destroy:function(){Ext.destroy(this.getIndexBar(),this.indexBarElement,this.header);this.callParent()}});Ext.define("Ext.dataview.NestedList",{alternateClassName:"Ext.NestedList",extend:"Ext.Container",xtype:"nestedlist",requires:["Ext.List","Ext.Toolbar","Ext.Button","Ext.XTemplate","Ext.data.StoreManager","Ext.data.NodeStore","Ext.data.TreeStore"],config:{cls:Ext.baseCSSPrefix+"nested-list",backText:"Back",useTitleAsBackText:true,updateTitleText:true,displayField:"text",loadingText:"Loading...",emptyText:"No items available.",onItemDisclosure:false,allowDeselect:false,useToolbar:null,toolbar:{docked:"top",xtype:"titlebar",ui:"light",inline:true},title:"",layout:{type:"card",animation:{type:"slide",duration:250,direction:"left"}},store:null,detailContainer:undefined,detailCard:null,backButton:{ui:"back",hidden:true},listConfig:null,lastNode:null,lastActiveList:null},constructor:function(a){if(Ext.isObject(a)){if(a.getTitleTextTpl){this.getTitleTextTpl=a.getTitleTextTpl}if(a.getItemTextTpl){this.getItemTextTpl=a.getItemTextTpl}}this.callParent(arguments)},onItemInteraction:function(){if(this.isGoingTo){return false}},applyDetailContainer:function(a){if(!a){a=this}return a},updateDetailContainer:function(a,b){a.onBefore("activeitemchange","onBeforeDetailContainerChange",this);a.onAfter("activeitemchange","onDetailContainerChange",this)},onBeforeDetailContainerChange:function(){this.isGoingTo=true},onDetailContainerChange:function(){this.isGoingTo=false},onItemTap:function(g,c,i,a,h){var f=this,b=g.getStore(),d=b.getAt(c);f.fireEvent("itemtap",this,g,c,i,a,h);if(d.isLeaf()){f.fireEvent("leafitemtap",this,g,c,i,a,h);f.goToLeaf(d)}else{this.goToNode(d)}},onBeforeSelect:function(){this.fireEvent("beforeselect",[this,Array.prototype.slice.call(arguments)])},onContainerTap:function(){this.fireEvent("containertap",[this,Array.prototype.slice.call(arguments)])},onSelectionChange:function(){this.fireEvent("selectionchange",[this,Array.prototype.slice.call(arguments)])},onItemDoubleTap:function(){this.fireEvent("itemdoubletap",[this,Array.prototype.slice.call(arguments)])},onStoreBeforeLoad:function(){var a=this.getLoadingText(),b=this.getScrollable();if(a){this.setMasked({xtype:"loadmask",message:a});if(b){b.getScroller().setDisabled(true)}}this.fireEvent("beforeload",[this,Array.prototype.slice.call(arguments)])},onStoreLoad:function(){this.setMasked(false);this.fireEvent("load",[this,Array.prototype.slice.call(arguments)])},onBackTap:function(){var d=this,c=d.getLastNode(),e=d.getDetailCard(),a=e&&d.getActiveItem()==e,b=d.getLastActiveList();this.fireAction("back",[this,c,b,a],"doBack")},doBack:function(e,d,c,a){var b=e.getLayout(),f=(b)?b.getAnimation():null;if(a&&c){if(f){f.setReverse(true)}e.setActiveItem(c);e.setLastNode(d.parentNode);e.syncToolbar()}else{this.goToNode(d.parentNode)}},updateData:function(a){if(!this.getStore()){this.setStore(new Ext.data.TreeStore({root:a}))}},applyStore:function(a){if(a){a=Ext.data.StoreManager.lookup(a);if(a&&Ext.isObject(a)&&a.isStore){a.on({scope:this,load:"onStoreLoad",beforeload:"onStoreBeforeLoad"})}}return a},updateStore:function(a,c){var b=this;if(c&&Ext.isObject(c)&&c.isStore){if(c.autoDestroy){c.destroy()}c.un({rootchange:"onStoreRootChange",scope:this})}if(a){b.goToNode(a.getRoot());a.on({rootchange:"onStoreRootChange",scope:this})}},onStoreRootChange:function(a,b){this.goToNode(b)},applyBackButton:function(a){return Ext.factory(a,Ext.Button,this.getBackButton())},applyDetailCard:function(a){return this.factoryItem(a)},updateBackButton:function(b,a){if(b){var c=this;b.on("tap",c.onBackTap,c);b.setText(c.getBackText());c.getToolbar().insert(0,b)}else{if(a){a.destroy()}}},applyToolbar:function(a){return Ext.factory(a,Ext.TitleBar,this.getToolbar())},updateToolbar:function(a,b){var c=this;if(a){a.setTitle(c.getTitle());if(!a.getParent()){c.add(a)}}else{if(b){b.destroy()}}},updateUseToolbar:function(a,b){if(!a){this.setToolbar(false)}},updateTitle:function(c){var b=this,a=b.getToolbar();if(a){if(b.getUpdateTitleText()){a.setTitle(c)}}},getItemTextTpl:function(a){return"{"+this.getDisplayField()+"}"},getTitleTextTpl:function(a){return"{"+this.getDisplayField()+"}"},renderTitleText:function(b,c){if(!b.titleTpl){b.titleTpl=Ext.create("Ext.XTemplate",this.getTitleTextTpl(b))}if(b.isRoot()){var a=this.getInitialConfig("title");return(c&&a==="")?this.getInitialConfig("backText"):a}return b.titleTpl.applyTemplate(b.data)},goToNode:function(a){if(!a){return}var i=this,d=i.getActiveItem(),k=i.getDetailCard(),j=k&&i.getActiveItem()==k,h=i.goToNodeReverseAnimation(a),c=i.firstList,e=i.secondList,f=i.getLayout(),b=(f)?f.getAnimation():null,g;if(a.isLeaf()){throw new Error("goToNode: passed a node which is a leaf.")}if(a==i.getLastNode()&&!j){return}if(j){if(b){b.setReverse(true)}i.setActiveItem(i.getLastActiveList())}else{if(c&&e){d=i.getActiveItem();i.setLastActiveList(d);g=(d==c)?e:c;g.getStore().setNode(a);a.expand();if(b){b.setReverse(h)}i.setActiveItem(g);g.deselectAll()}else{if(c){i.setLastActiveList(i.getActiveItem());i.setActiveItem(i.getList(a));i.secondList=i.getActiveItem()}else{i.setActiveItem(i.getList(a));i.firstList=i.getActiveItem()}}}i.fireEvent("listchange",this,i.getActiveItem());i.setLastNode(a);i.syncToolbar()},goToLeaf:function(f){if(!f.isLeaf()){throw new Error("goToLeaf: passed a node which is not a leaf.")}var e=this,c=e.getDetailCard(f),b=e.getDetailContainer(),a=b==this,d=e.getLayout(),g=(d)?d.getAnimation():false;if(c){if(b.getItems().indexOf(c)===-1){b.add(c)}if(a){if(e.getActiveItem() instanceof Ext.dataview.List){e.setLastActiveList(e.getActiveItem())}e.setLastNode(f)}if(g){g.setReverse(false)}b.setActiveItem(c);e.syncToolbar()}},syncToolbar:function(g){var e=this,f=e.getDetailCard(),d=e.getLastNode(),b=g||(f&&(e.getActiveItem()==f)),a=(b)?d:d.parentNode,c=e.getBackButton();if(c){c[a?"show":"hide"]();if(a&&e.getUseTitleAsBackText()){c.setText(e.renderTitleText(d.parentNode,true))}}if(d){e.setTitle(e.renderTitleText(d))}},updateBackText:function(a){this.getBackButton().setText(a)},goToNodeReverseAnimation:function(c){var b=this,a=b.getLastNode();if(!a){return false}return(!a.contains(c)&&a.isAncestor(c))?true:false},getList:function(b){var a=this,c=Ext.create("Ext.data.NodeStore",{recursive:false,node:b,rootVisible:false,model:a.getStore().getModel()});b.expand();return Ext.Object.merge({xtype:"list",pressedDelay:250,autoDestroy:true,store:c,onItemDisclosure:a.getOnItemDisclosure(),allowDeselect:a.getAllowDeselect(),listeners:[{event:"itemdoubletap",fn:"onItemDoubleTap",scope:a},{event:"itemtap",fn:"onItemInteraction",scope:a,order:"before"},{event:"itemtouchstart",fn:"onItemInteraction",scope:a,order:"before"},{event:"itemtap",fn:"onItemTap",scope:a},{event:"beforeselect",fn:"onBeforeSelect",scope:a},{event:"containertap",fn:"onContainerTap",scope:a},{event:"selectionchange",fn:"onSelectionChange",scope:a}],itemTpl:'<span<tpl if="leaf == true"> class="x-list-item-leaf"</tpl>>'+a.getItemTextTpl(b)+"</span>"},this.getListConfig())}},function(){});Ext.define("Ext.form.FieldSet",{extend:"Ext.Container",alias:"widget.fieldset",requires:["Ext.Title"],config:{baseCls:Ext.baseCSSPrefix+"form-fieldset",title:null,instructions:null},applyTitle:function(a){if(typeof a=="string"){a={title:a}}Ext.applyIf(a,{docked:"top",baseCls:this.getBaseCls()+"-title"});return Ext.factory(a,Ext.Title,this.getTitle())},updateTitle:function(b,a){if(b){this.add(b)}if(a){this.remove(a)}},applyInstructions:function(a){if(typeof a=="string"){a={title:a}}Ext.applyIf(a,{docked:"bottom",baseCls:this.getBaseCls()+"-instructions"});return Ext.factory(a,Ext.Title,this.getInstructions())},updateInstructions:function(b,a){if(b){this.add(b)}if(a){this.remove(a)}}});Ext.define("Ext.form.Panel",{alternateClassName:"Ext.form.FormPanel",extend:"Ext.Panel",xtype:"formpanel",requires:["Ext.XTemplate","Ext.field.Checkbox","Ext.Ajax"],config:{baseCls:Ext.baseCSSPrefix+"form",standardSubmit:false,url:null,baseParams:null,submitOnAction:true,record:null,method:"post",scrollable:{translationMethod:"scrollposition"}},getElementConfig:function(){var a=this.callParent();a.tag="form";return a},initialize:function(){var a=this;a.callParent();a.on({action:"onFieldAction",scope:a});a.element.on({submit:"onSubmit",scope:a})},updateRecord:function(c){var a,b,d;if(c&&(a=c.fields)){b=this.getValues();for(d in b){if(b.hasOwnProperty(d)&&a.containsKey(d)){c.set(d,b[d])}}}return this},setRecord:function(a){var b=this;if(a&&a.data){b.setValues(a.data)}b._record=a;return this},onSubmit:function(b){var a=this;if(b&&!a.getStandardSubmit()){b.stopEvent()}a.fireAction("submit",[a,a.getValues(true),b],"doSubmit")},doSubmit:function(b,a,c){if(c){c.stopEvent()}},onFieldAction:function(a){if(this.getSubmitOnAction()){a.blur();this.submit()}},submit:function(a){var c=this,b=c.element.dom||{},d;a=Ext.apply({url:c.getUrl()||b.action,submit:false,method:c.getMethod()||b.method||"post",autoAbort:false,params:null,waitMsg:null,headers:null,success:null,failure:null},a||{});d=c.getValues(c.getStandardSubmit()||!a.submitDisabled);return c.fireAction("beforesubmit",[c,d,a],"doBeforeSubmit")},doBeforeSubmit:function(c,d,a){var b=c.element.dom||{};if(c.getStandardSubmit()){if(a.url&&Ext.isEmpty(b.action)){b.action=a.url}b.method=(a.method||b.method).toLowerCase();b.submit()}else{if(a.waitMsg){c.setMasked(a.waitMsg)}return Ext.Ajax.request({url:a.url,method:a.method,rawData:Ext.urlEncode(Ext.apply(Ext.apply({},c.getBaseParams()||{}),a.params||{},d)),autoAbort:a.autoAbort,headers:Ext.apply({"Content-Type":"application/x-www-form-urlencoded; charset=UTF-8"},a.headers||{}),scope:c,callback:function(e,j,f){var h=this,i=f.responseText,g;h.setMasked(false);g=function(){if(Ext.isFunction(a.failure)){a.failure.call(a.scope||h,h,f,i)}h.fireEvent("exception",h,f)};if(j){f=Ext.decode(i);j=!!f.success;if(j){if(Ext.isFunction(a.success)){a.success.call(a.scope||h,h,f,i)}h.fireEvent("submit",h,f)}else{g()}}else{g()}}})}},setValues:function(b){var a=this.getFields(),c,e,d;b=b||{};for(c in b){if(b.hasOwnProperty(c)){e=a[c];d=b[c];if(e){if(Ext.isArray(e)){e.forEach(function(g){if(g.isRadio){g.setGroupValue(d)}else{if(Ext.isArray(b[c])){g.setChecked((d.indexOf(g.getValue())!=-1))}else{g.setChecked((d==g.getValue()))}}})}else{if(e.setChecked){e.setChecked(d)}else{e.setValue(d)}}}}}return this},getValues:function(d){var a=this.getFields(),b={},g,c,f,e;for(c in a){if(a.hasOwnProperty(c)){if(Ext.isArray(a[c])){b[c]=[];f=a[c].length;for(e=0;e<f;e++){g=a[c][e];if(!g.getChecked){b[c]=g.getValue();break}if(!(d&&g.getDisabled())){if(g.isRadio){b[c]=g.getGroupValue()}else{b[c].push(g.getValue())}}}}else{g=a[c];if(!(d&&g.getDisabled())){if(g.isCheckbox){b[c]=(g.getChecked())?g.getValue():null}else{b[c]=g.getValue()}}}}}return b},reset:function(){this.getFieldsAsArray().forEach(function(a){a.reset()});return this},enable:function(){this.getFieldsAsArray().forEach(function(a){a.enable()});return this},disable:function(){this.getFieldsAsArray().forEach(function(a){a.disable()});return this},getFieldsAsArray:function(){var a=[],b=function(c){if(c.isField){a.push(c)}if(c.isContainer){c.getItems().each(b)}};this.getItems().each(b);return a},getFields:function(b){var a={},d;var c=function(e){if(e.isField){d=e.getName();if((b&&d==b)||typeof b=="undefined"){if(a.hasOwnProperty(d)){if(!Ext.isArray(a[d])){a[d]=[a[d]]}a[d].push(e)}else{a[d]=e}}}if(e.isContainer){e.items.each(c)}};this.getItems().each(c);return(b)?(a[b]||[]):a},getFieldsArray:function(){var a=[];var b=function(c){if(c.isField){a.push(c)}if(c.isContainer){c.items.each(b)}};this.items.each(b);return a},getFieldsFromItem:Ext.emptyFn,showMask:function(a,b){a=Ext.isObject(a)?a.message:a;if(a){this.setMasked({xtype:"loadmask",message:a})}else{this.setMasked(true)}return this},hideMask:function(){this.setMasked(false);return this},getFocusedField:function(){var a=this.getFieldsArray(),c=a.length,d,b;for(b=0;b<c;b++){d=a[b];if(d.isFocused){return d}}return null},getNextField:function(){var a=this.getFieldsArray(),c=this.getFocusedField(),d=a.length,b;if(c){b=a.indexOf(c);if(b!==a.length-1){b++;return a[b]}}return false},focusNextField:function(){var a=this.getNextField();if(a){a.focus();return a}return false},getPreviousField:function(){var a=this.getFieldsArray(),c=this.getFocusedField(),d=a.length,b;if(c){b=a.indexOf(c);if(b!==0){b--;return a[b]}}return false},focusPreviousField:function(){var a=this.getPreviousField();if(a){a.focus();return a}return false}},function(){});Ext.define("Ext.navigation.Bar",{extend:"Ext.Container",requires:["Ext.Button","Ext.TitleBar","Ext.Spacer","Ext.util.SizeMonitor"],isToolbar:true,config:{baseCls:Ext.baseCSSPrefix+"toolbar",cls:Ext.baseCSSPrefix+"navigation-bar",ui:"dark",title:null,defaultType:"button",layout:{type:"hbox"},defaultBackButtonText:"Back",animation:{duration:300},useTitleForBackButtonText:null,view:null,backButton:{align:"left",ui:"back",hidden:true}},minBackButtonWidth:80,constructor:function(a){a=a||{};if(!a.items){a.items=[]}this.callParent([a])},beforeInitialize:function(){this.backButtonStack=[];this.lastAnimationProperties={};this.animating=false;this.onSizeMonitorChange=Ext.Function.createThrottled(this.onSizeMonitorChange,50,this)},initialize:function(){var a=this;a.on({painted:"onPainted",erased:"onErased"});a.onSizeMonitorChange()},updateView:function(f,a){var c=this.getBackButton(),e,b,d;this.getItems();if(f){this.backButtonStack=[];e=f.getInnerItems();for(b=0;b<e.length;b++){this.backButtonStack.push(e[b].config.title||"&nbsp;")}this.titleComponent.setTitle(this.getTitleText());d=this.getBackButtonText();if(d){c.setText(this.getBackButtonText());c.show()}}},onViewAdd:function(a,c,b){var d=a.getLayout().getAnimation();this.endAnimation();this.backButtonStack.push(c.config.title||"&nbsp;");this.refreshNavigationBarProxy();if(d&&d.isAnimation&&a.isPainted()){if(this.backButtonStack.length>1){this.pushBackButtonAnimated(this.getBackButtonText())}this.pushTitleAnimated(this.getTitleText())}else{if(this.backButtonStack.length>1){this.pushBackButton(this.getBackButtonText())}this.pushTitle(this.getTitleText())}},onViewRemove:function(a,c,b){var d=a.getLayout().getAnimation();this.endAnimation();this.backButtonStack.pop();this.refreshNavigationBarProxy();if(d&&d.isAnimation&&a.isPainted()){this.popBackButtonAnimated(this.getBackButtonText());this.popTitleAnimated(this.getTitleText())}else{this.popBackButton(this.getBackButtonText());this.popTitle(this.getTitleText())}},endAnimation:function(){var c=this.lastAnimationProperties,d,b,a;if(c){for(d in c){b=Ext.get(d);for(a in c[d].to){b.setStyle(a,c[d][a])}if(c[d].onEnd){c[d].onEnd.call(this)}}}},applyBackButton:function(a){return Ext.factory(a,Ext.Button,this.getBackButton())},updateBackButton:function(a,b){if(b){this.remove(b)}if(a){this.add(a);a.on({scope:this,tap:this.onBackButtonTap})}},onBackButtonTap:function(){this.fireEvent("back",this)},updateUseTitleForBackButtonText:function(a){var b=this.getBackButton();if(b){b.setText(this.getBackButtonText())}this.onSizeMonitorChange()},onPainted:function(){this.painted=true;this.sizeMonitor.refresh();this.onSizeMonitorChange()},onErased:function(){this.painted=false},applyItems:function(c){var e=this;if(!e.initialized){var f=e.getDefaults()||{},a,b,d;e.leftBox=a=e.add({xtype:"container",style:"position: relative",layout:{type:"hbox",align:"center"}});e.spacer=d=e.add({xtype:"component",style:"position: relative",flex:1});e.rightBox=b=e.add({xtype:"container",style:"position: relative",layout:{type:"hbox",align:"center"}});e.titleComponent=e.add({xtype:"title",hidden:f.hidden,centered:true});e.sizeMonitor=new Ext.util.SizeMonitor({element:e.element,callback:e.onSizeMonitorChange,scope:e});e.doAdd=e.doBoxAdd;e.doInsert=e.doBoxInsert}e.callParent(arguments)},doBoxAdd:function(a){if(a.config.align=="right"){this.rightBox.add(a)}else{this.leftBox.add(a)}},doBoxInsert:function(a,b){if(b.config.align=="right"){this.rightBox.add(b)}else{this.leftBox.add(b)}},onSizeMonitorChange:function(){if(!this.rendered){return}var c=this.getBackButton(),a=this.titleComponent;if(c&&c.rendered){c.setWidth(null)}this.refreshNavigationBarProxy();var b=this.getNavigationBarProxyProperties();if(c&&c.rendered){c.setWidth(b.backButton.width)}a.setStyle("-webkit-transform",null);a.setWidth(b.title.width);a.element.setLeft(b.title.left)},getBackButtonAnimationProperties:function(){var c=this,b=c.element,h=c.getBackButton().element,e=c.titleComponent.element,g=Math.min(b.getWidth()/3,200),a=this.getNavigationBarProxyProperties(),d,f;d=e.getX()-b.getX();f=b.getX()-h.getX()-h.getWidth();d=Math.min(d,g);return{element:{from:{left:d,width:a.backButton.width,opacity:0},to:{left:0,width:a.backButton.width,opacity:1}},ghost:{from:null,to:{left:f,opacity:0}}}},getBackButtonAnimationReverseProperties:function(){var d=this,c=d.element,h=d.getBackButton().element,f=d.titleComponent.element,b=Math.min(c.getWidth()/3,200),a=this.getNavigationBarProxyProperties(),e,g;e=c.getX()-h.getX()-h.getWidth();g=f.getX()-h.getWidth();g=Math.min(g,b);return{element:{from:{left:e,width:a.backButton.width,opacity:0},to:{left:0,width:a.backButton.width,opacity:1}},ghost:{from:null,to:{left:g,opacity:0}}}},getTitleAnimationProperties:function(){var c=this,b=c.element,e=c.titleComponent.element,a=this.getNavigationBarProxyProperties(),d,f;d=b.getWidth()-e.getX();f=b.getX()-e.getX()+a.backButton.width;if((a.backButton.left+e.getWidth())>e.getX()){f=b.getX()-e.getX()-e.getWidth()}return{element:{from:{left:d,width:a.title.width,opacity:0},to:{left:a.title.left,width:a.title.width,opacity:1}},ghost:{from:e.getLeft(),to:{left:f,opacity:0}}}},getTitleAnimationReverseProperties:function(){var d=this,c=d.element,f=d.titleComponent.element,a=this.getNavigationBarProxyProperties(),b=0,e,g;b=f.getLeft();f.setLeft(0);e=c.getX()-f.getX()+a.backButton.width;g=c.getX()+c.getWidth();if((a.backButton.left+f.getWidth())>f.getX()){e=c.getX()-f.getX()-f.getWidth()}return{element:{from:{left:e,width:a.title.width,opacity:0},to:{left:a.title.left,width:a.title.width,opacity:1}},ghost:{from:b,to:{left:g,opacity:0}}}},animate:function(c,d,h,g,b){var e=this,a={element:d,easing:"ease-in-out",duration:this.getAnimation().duration,replacePrevious:true,preserveEndState:true},f;this.lastAnimationProperties[d.id]={to:g,onEnd:b};d.setLeft(0);if(Ext.os.is.Android){if(h){a.from={left:h.left,opacity:h.opacity};if(h.width){a.from.width=h.width}}if(g){a.to={left:g.left,opacity:g.opacity};if(g.width){a.to.width=g.width}}}else{if(h){a.from={transform:{translateX:h.left},opacity:h.opacity};if(h.width){a.from.width=h.width}}if(g){a.to={transform:{translateX:g.left},opacity:g.opacity};if(g.width){a.to.width=g.width}}}fn=function(){if(b){b.call(e)}if(c&&Ext.isNumber(g.width)){c.setWidth(g.width)}e.lastAnimationProperties={}};f=new Ext.fx.Animation(a);f.on("animationend",fn,this);Ext.Animator.run(f)},getBackButtonText:function(){var b=this.backButtonStack[this.backButtonStack.length-2],a=this.getUseTitleForBackButtonText();if(!a){if(b){b=this.getDefaultBackButtonText()}}return b},getTitleText:function(){return this.backButtonStack[this.backButtonStack.length-1]},pushBackButton:function(c){var b=this.getBackButton();b.setText(c);b.show();var a=this.getBackButtonAnimationProperties(),d=a.element.to;if(d.left){b.setLeft(d.left)}if(d.width){b.setWidth(d.width)}},pushBackButtonAnimated:function(f){var e=this;var d=e.getBackButton(),b=d.getText(),g=d.element,c=e.getBackButtonAnimationProperties(),a;if(b){a=e.createProxy(d)}d.setText(this.getBackButtonText());d.show();e.animate(d,g,c.element.from,c.element.to,function(){e.animating=false});if(a){e.animate(null,a,c.ghost.from,c.ghost.to,function(){a.destroy()})}},popBackButton:function(c){var b=this.getBackButton();b.setText(null);if(c){b.setText(this.getBackButtonText())}else{b.hide()}var a=this.getBackButtonAnimationReverseProperties(),d=a.element.to;if(d.left){b.setLeft(d.left)}if(d.width){b.setWidth(d.width)}},popBackButtonAnimated:function(f){var e=this;var d=e.getBackButton(),b=d.getText(),g=d.element,c=e.getBackButtonAnimationReverseProperties(),a;if(b){a=e.createProxy(d)}if(f&&e.backButtonStack.length){d.setText(this.getBackButtonText());d.show();e.animate(d,g,c.element.from,c.element.to)}else{d.hide()}if(a){e.animate(null,a,c.ghost.from,c.ghost.to,function(){a.destroy();if(!f){d.setText(null)}})}},pushTitle:function(e){var c=this.titleComponent,b=c.element,a=this.getTitleAnimationProperties(),d=a.element.to;c.setTitle(e);if(d.left){b.setLeft(d.left)}if(d.width){c.setWidth(d.width)}},pushTitleAnimated:function(h){var e=this;var d=e.getBackButton(),b=(d)?d.getText():null,g=e.titleComponent,f=g.element,c,a;if(b){a=e.createProxy(g,true)}g.setTitle(h);c=e.getTitleAnimationProperties();e.animate(g,f,c.element.from,c.element.to);if(a){e.animate(null,a,c.ghost.from,c.ghost.to,function(){a.destroy()})}},popTitle:function(e){var c=this.titleComponent,b=c.element,a=this.getTitleAnimationReverseProperties(),d=a.element.to;c.setTitle(e);if(d.left){b.setLeft(d.left)}if(d.width){c.setWidth(d.width)}},popTitleAnimated:function(h){var e=this;var d=e.getBackButton(),b=e.titleComponent.getTitle(),g=e.titleComponent,f=g.element,c=e.getTitleAnimationReverseProperties(),a;if(b){a=e.createProxy(g,true)}g.setTitle(h||"");e.animate(g,f,c.element.from,c.element.to,function(){e.animating=false});if(a){e.animate(null,a,c.ghost.from,c.ghost.to,function(){a.destroy()})}},createNavigationBarProxy:function(){var a=this.proxy;if(a){return}this.proxy=a=Ext.create("Ext.TitleBar",{items:[{xtype:"button",ui:"back",text:""}],title:this.backButtonStack[0]});a.backButton=a.down("button[ui=back]");Ext.getBody().appendChild(a.element);a.element.setStyle("position","absolute");a.element.setStyle("visibility","hidden");a.element.setX(0);a.element.setY(-1000)},getNavigationBarProxyProperties:function(){return{title:{left:this.proxy.titleComponent.element.getLeft(),width:this.proxy.titleComponent.element.getWidth()},backButton:{left:this.proxy.backButton.element.getLeft(),width:this.proxy.backButton.element.getWidth()}}},refreshNavigationBarProxy:function(){var c=this.proxy,b=this.element,a=this.backButtonStack,e=a[a.length-1],d=this.getBackButtonText();if(!c){this.createNavigationBarProxy();c=this.proxy}c.element.setWidth(b.getWidth());c.element.setHeight(b.getHeight());c.setTitle(e);if(d){c.backButton.setText(d);c.backButton.show()}else{c.backButton.hide()}c.refreshTitlePosition()},onBeforePop:function(b){b--;for(var a=0;a<b;a++){this.backButtonStack.pop()}},doSetHidden:function(a){if(!a){this.element.setStyle({position:"relative",top:"auto",left:"auto",width:"auto"})}else{this.element.setStyle({position:"absolute",top:"-1000px",left:"-1000px",width:this.element.getWidth()+"px"})}},createProxy:function(b,a){var c=(a)?b.element.getParent():b.element,d=Ext.get(c.id+"-proxy");if(!d){d=c.dom.cloneNode(true);d.id=c.id+"-proxy";c.getParent().dom.appendChild(d);d=Ext.get(d);d.setStyle("position","absolute");d.setY(c.getY());d.setX(c.getX())}return d}});Ext.define("Ext.navigation.View",{extend:"Ext.Container",alternateClassName:"Ext.NavigationView",xtype:"navigationview",requires:["Ext.navigation.Bar"],config:{baseCls:Ext.baseCSSPrefix+"navigationview",navigationBar:{docked:"top"},defaultBackButtonText:"Back",useTitleForBackButtonText:false,layout:{type:"card",animation:{duration:300,easing:"ease-out",type:"slide",direction:"left"}}},initialize:function(){this.getNavigationBar().on({scope:this,back:this.onBackButtonTap});this.relayEvents(this,{add:"push",remove:"pop"})},applyLayout:function(a){a=a||{};if(Ext.os.is.Android){a.animation=false}return a},onBackButtonTap:function(){this.pop();this.fireEvent("back",this)},push:function(a){return this.add(a)},pop:function(a){if(this.onBeforePop(a)){return this.doPop()}},onBeforePop:function(f){var e=this,g=this.getInnerItems(),d=g.length,b,c,a;if(!Ext.isNumber(f)||f<1){f=1}f=Math.min(f,d-1);if(f){e.getNavigationBar().onBeforePop(f);b=g.splice(-f,f-1);for(a=0;a<b.length;a++){this.remove(b[a])}return true}return false},doPop:function(a){var c=this,e=this.getInnerItems(),b=c.getLayout(),d=b.getAnimation();c.remove(e[e.length-1]);return this.getActiveItem()},getPreviousItem:function(){var a=this.getInnerItems();return a[a.length-2]},updateUseTitleForBackButtonText:function(b){var a=this.getNavigationBar();if(a){a.setUseTitleForBackButtonText(b)}},applyNavigationBar:function(a){if(!a){a={hidden:true,docked:"top"}}if(a.title){delete a.title}a.view=this;return Ext.factory(a,Ext.navigation.Bar,this.getNavigationBar())},updateNavigationBar:function(a,c){if(c){this.remove(c)}if(a){var b=this.getLayout(),d=(b&&b.isLayout)?b.getAnimation():false;if(d&&d.isAnimation){a.setAnimation(d.config)}this.add(a)}},applyActiveItem:function(c,a){var b=this.getInnerItems();this.getItems();if(!this.initialized){c=b.length-1}if(typeof c=="number"){c=Math.max(0,Math.min(c,b.length-1));c=b[c];if(c){return c}else{if(a){return null}}}else{if(c){if(!c.isComponent){c=this.factoryItem(c)}if(!this.has(c)){this.add(c)}return c}}},remove:function(d,b){var c=this,a=c.indexOf(d),f=this.getInnerItems(),e=this.getLayout().getAnimation(),g;if(b===undefined){b=c.getAutoDestroy()}if(a!==-1){if(!this.removingAll&&f.length>1&&d===this.getActiveItem()){this.on({activeitemchange:"doRemove",scope:this,single:true,order:"after",args:[d,a,b]});g=f.indexOf(d);if(g>0){if(e&&e.isAnimation){e.setReverse(true)}this.setActiveItem(g-1);this.getNavigationBar().onViewRemove(this,f[g],g)}}else{this.doRemove(d,a,b)}}return c},doRemove:function(){var a=this.getLayout().getAnimation();if(a&&a.isAnimation){a.setReverse(false)}this.callParent(arguments)},onItemAdd:function(b,a){this.doItemLayoutAdd(b,a);if(!this.isItemsInitializing&&b.isInnerItem()){this.setActiveItem(b);this.getNavigationBar().onViewAdd(this,b,a)}if(this.initialized){this.fireEvent("add",this,b,a)}},reset:function(){this.pop(this.getInnerItems().length)}});Ext.define("Ext.picker.Slot",{extend:"Ext.DataView",xtype:"pickerslot",alternateClassName:"Ext.Picker.Slot",requires:["Ext.XTemplate","Ext.data.Store","Ext.Component","Ext.data.StoreManager"],isSlot:true,config:{title:null,showTitle:true,cls:Ext.baseCSSPrefix+"picker-slot",name:null,value:null,flex:1,align:"left",displayField:"text",valueField:"value",scrollable:{direction:"vertical",indicators:false,momentumEasing:{minVelocity:2},slotSnapEasing:{duration:100}}},constructor:function(){this.selectedIndex=0;this.callParent(arguments)},applyTitle:function(a){if(a){a=Ext.create("Ext.Component",{cls:Ext.baseCSSPrefix+"picker-slot-title",docked:"top",html:a})}return a},updateTitle:function(b,a){if(b){this.add(b);this.setupBar()}if(a){this.remove(a)}},updateShowTitle:function(a){var b=this.getTitle();if(b){b[a?"show":"hide"]();this.setupBar()}},updateDisplayField:function(a){this.setItemTpl('<div class="'+Ext.baseCSSPrefix+'picker-item {cls} <tpl if="extra">'+Ext.baseCSSPrefix+'picker-invalid</tpl>">{'+a+"}</div>")},updateAlign:function(a,c){var b=this.element;b.addCls(Ext.baseCSSPrefix+"picker-"+a);b.removeCls(Ext.baseCSSPrefix+"picker-"+c)},applyData:function(d){var f=[],c=d&&d.length,a,b,e;if(d&&Ext.isArray(d)&&c){for(a=0;a<c;a++){b=d[a];e={};if(Ext.isArray(b)){e[this.valueField]=b[0];e[this.displayField]=b[1]}else{if(Ext.isString(b)){e[this.valueField]=b;e[this.displayField]=b}else{if(Ext.isObject(b)){e=b}}}f.push(e)}}return d},updateData:function(a){this.setStore(Ext.create("Ext.data.Store",{model:"x-textvalue",data:a}))},initialize:function(){this.callParent();var a=this.getScrollable().getScroller();this.on({scope:this,painted:"onPainted",itemtap:"doItemTap"});a.on({scope:this,scrollend:"onScrollEnd"})},onPainted:function(){this.setupBar()},getPicker:function(){if(!this.picker){this.picker=this.getParent()}return this.picker},setupBar:function(){if(!this.rendered){return}var b=this.element,g=this.innerElement,h=this.getPicker(),i=h.bar,m=this.getValue(),c=this.getShowTitle(),l=this.getTitle(),j=this.getScrollable(),f=j.getScroller(),e=0,o,d,n,k,a;o=i.getY();d=b.getY();if(c&&l){d+=l.element.getHeight()}n=i.getHeight();if(c&&l){e=l.element.getHeight()}k=Math.ceil((b.getHeight()-e-n)/2);this.slotPadding=k;g.setStyle({padding:k+"px 0 "+(k)+"px"});f.refresh();f.setSlotSnapSize(n);this.setValue(m)},doItemTap:function(d,a,c,f){var b=this;b.selectedIndex=a;b.selectedNode=c;b.scrollToItem(c,true);b.fireEvent("slotpick",b,b.getValue(),b.selectedNode)},scrollToItem:function(e,d){var h=e.getY(),c=e.parent(),f=c.getY(),b=this.getScrollable(),a=b.getScroller(),g;g=h-f;a.scrollTo(0,g,d)},onScrollEnd:function(b,a,g){var f=this,d=Math.round(g/f.picker.bar.getHeight()),c=f.getViewItems(),e=c[d];if(e){f.selectedIndex=d;f.selectedNode=e;f.fireEvent("slotpick",f,f.getValue(),f.selectedNode)}},getValue:function(){var b=this.getStore(),a,c;if(!b){return}if(this._value===false){return null}a=b.getAt(this.selectedIndex);c=a?a.get(this.getValueField()):null;this._value=c;return c},setValue:function(f){if(!Ext.isDefined(f)){return}if(!this.rendered||!f){this._value=f;return}var b=this.getStore(),a=this.getViewItems(),d=this.getValueField(),c,e;c=b.find(d,f);if(c!=-1){e=Ext.get(a[c]);this.selectedIndex=c;this.scrollToItem(e);this._value=f}},setValueAnimated:function(f){if(!f){return}if(!this.rendered){this._value=f;return}var b=this.getStore(),a=this.getViewItems(),d=this.getValueField(),c,e;c=b.find(d,f);if(c!=-1){e=Ext.get(a[c]);this.selectedIndex=c;this.scrollToItem(e,{duration:100});this._value=f}}});Ext.define("Ext.picker.Picker",{extend:"Ext.Sheet",alias:"widget.picker",alternateClassName:"Ext.Picker",requires:["Ext.picker.Slot","Ext.Toolbar","Ext.data.Model"],isPicker:true,config:{cls:Ext.baseCSSPrefix+"picker",doneButton:true,cancelButton:true,useTitles:false,slots:null,value:null,height:220,layout:{type:"hbox",align:"stretch"},centered:false,left:0,right:0,bottom:0,defaultType:"pickerslot",toolbar:true},initElement:function(){this.callParent(arguments);var b=this,a=Ext.baseCSSPrefix,c=this.innerElement;this.mask=c.createChild({cls:a+"picker-mask"});this.bar=this.mask.createChild({cls:a+"picker-bar"});b.on({scope:this,delegate:"pickerslot",slotpick:"onSlotPick"});b.on({scope:this,show:"onShow"})},applyToolbar:function(a){if(a===true){a={}}Ext.applyIf(a,{docked:"top"});return Ext.factory(a,"Ext.TitleBar",this.getToolbar())},updateToolbar:function(a,b){if(a){this.add(a)}if(b){this.remove(b)}},applyDoneButton:function(a){if(a){if(Ext.isBoolean(a)){a={}}if(typeof a=="string"){a={text:a}}Ext.applyIf(a,{ui:"action",align:"right",text:"Done"})}return Ext.factory(a,"Ext.Button",this.getDoneButton())},updateDoneButton:function(c,a){var b=this.getToolbar();if(c){b.add(c);c.on("tap",this.onDoneButtonTap,this)}else{if(a){b.remove(a)}}},applyCancelButton:function(a){if(a){if(Ext.isBoolean(a)){a={}}if(typeof a=="string"){a={text:a}}Ext.applyIf(a,{align:"left",text:"Cancel"})}return Ext.factory(a,"Ext.Button",this.getCancelButton())},updateCancelButton:function(b,a){var c=this.getToolbar();if(b){c.add(b);b.on("tap",this.onCancelButtonTap,this)}else{if(a){c.remove(a)}}},updateUseTitles:function(d){var f=this.getInnerItems(),e=f.length,a=Ext.baseCSSPrefix+"use-titles",c,b;if(d){this.addCls(a)}else{this.removeCls(a)}for(c=0;c<e;c++){b=f[c];if(b.isSlot){b.setShowTitle(d)}}},applySlots:function(b){if(b){var c=b.length,a;for(a=0;a<c;a++){b[a].picker=this}}return b},updateSlots:function(a){this.removeAll();if(a){this.add(a)}this.updateUseTitles(this.getUseTitles())},onDoneButtonTap:function(){this.fireEvent("change",this,this.getValue());this.hide()},onCancelButtonTap:function(){this.fireEvent("cancel",this);this.hide()},onSlotPick:function(c,b,a){this.fireEvent("pick",this,this.getValue(),c)},onShow:function(){if(!this.isHidden()){this.setValue(this._value)}},setValue:function(j,a){var f=this,d=f.getInnerItems(),e=d.length,h,g,c,b;if(!j){j={};for(b=0;b<e;b++){j[d[b].config.name]=false}}for(h in j){value=j[h];for(b=0;b<d.length;b++){c=d[b];if(c.config.name==h){g=c;break}}if(g){if(a){g.setValueAnimated(value)}else{g.setValue(value)}}}f._value=j;f._values=j;return f},setValueAnimated:function(a){this.setValue(a,true)},getValue:function(){var d=this.getParent(),b={},a=this.getItems().items,f=a.length,e,c;if(d){for(c=0;c<f;c++){e=a[c];if(e&&e.isSlot){b[e.getName()]=e.getValue()}}this._values=b}return this._values},getValues:function(){return this.getValue()},destroy:function(){this.callParent();Ext.destroy(this.mask,this.bar)}},function(){Ext.define("x-textvalue",{extend:"Ext.data.Model",config:{fields:["text","value"]}})});Ext.define("Ext.field.Select",{extend:"Ext.field.Text",xtype:"selectfield",alternateClassName:"Ext.form.Select",requires:["Ext.Panel","Ext.picker.Picker","Ext.data.Store","Ext.data.StoreManager","Ext.List"],config:{ui:"select",valueField:"value",displayField:"text",store:null,options:null,hiddenName:null,component:{useMask:true},clearIcon:false,usePicker:"auto",defaultPhonePickerConfig:null,defaultTabletPickerConfig:null},constructor:function(a){a=a||{};if(!a.store){a.store=true}this.callParent([a])},initialize:function(){var b=this,a=b.getComponent();b.callParent();a.on({scope:b,masktap:"onMaskTap"});a.input.dom.disabled=true},updateDefaultPhonePickerConfig:function(b){var a=this.picker;if(a){a.setConfig(b)}},updateDefaultTabletPickerConfig:function(a){var b=this.listPanel;if(b){b.setConfig(a)}},applyUsePicker:function(a){if(a=="auto"){a=(Ext.os.deviceType=="Phone")}return Boolean(a)},syncEmptyCls:Ext.emptyFn,applyValue:function(c){var a=c,b;this.getOptions();if(!(c instanceof Ext.data.Model)){b=this.getStore().find(this.getValueField(),c,null,null,null,true);if(b==-1){b=this.getStore().find(this.getDisplayField(),c,null,null,null,true)}a=this.getStore().getAt(b)}return a},updateValue:function(b,a){this.previousRecord=a;this.record=b;this.callParent([b?b.get(this.getDisplayField()):""]);if(a!==b){this.fireEvent("change",this,b,a)}},getValue:function(){var a=this.record;return(a)?a.get(this.getValueField()):null},getRecord:function(){return this.record},getPhonePicker:function(){var a=this.getDefaultPhonePickerConfig();if(!this.picker){this.picker=Ext.create("Ext.picker.Picker",Ext.apply({slots:[{align:"center",name:this.getName(),valueField:this.getValueField(),displayField:this.getDisplayField(),value:this.getValue(),store:this.getStore()}],listeners:{change:this.onPickerChange,scope:this}},a))}return this.picker},getTabletPicker:function(){var a=this.getDefaultTabletPickerConfig();if(!this.listPanel){this.listPanel=Ext.create("Ext.Panel",Ext.apply({centered:true,modal:true,cls:Ext.baseCSSPrefix+"select-overlay",layout:"fit",hideOnMaskTap:true,items:{xtype:"list",store:this.getStore(),itemTpl:'<span class="x-list-label">{'+this.getDisplayField()+"}</span>",listeners:{select:this.onListSelect,itemtap:this.onListTap,scope:this}}},a))}return this.listPanel},onMaskTap:function(){if(this.getDisabled()){return false}this.showPicker();return false},showPicker:function(){if(this.getStore().getCount()===0){return}if(this.getReadOnly()){return}this.isFocused=true;if(this.getUsePicker()){var e=this.getPhonePicker(),d=this.getName(),h={};h[d]=this.record.get(this.getValueField());e.setValue(h);if(!e.getParent()){Ext.Viewport.add(e)}e.show()}else{var f=this.getTabletPicker(),g=f.down("list"),b=g.getStore(),c=b.find(this.getValueField(),this.getValue(),null,null,null,true),a=b.getAt((c==-1)?0:c);if(!f.getParent()){Ext.Viewport.add(f)}f.showBy(this.getComponent());g.select(a,null,true)}},onListSelect:function(c,a){var b=this;if(a){b.setValue(a)}},onListTap:function(){this.listPanel.hide({type:"fade",out:true,scope:this})},onPickerChange:function(d,f){var e=this,g=f[e.getName()],b=e.getStore(),c=b.find(e.getValueField(),g,null,null,null,true),a=b.getAt(c);e.setValue(a)},updateOptions:function(b){var a=this.getStore();if(!b){a.clearData()}else{a.setData(b);this.onStoreDataChanged(a)}},applyStore:function(a){if(a===true){a=Ext.create("Ext.data.Store",{fields:[this.getValueField(),this.getDisplayField()]})}if(a){a=Ext.data.StoreManager.lookup(a);a.on({scope:this,addrecords:this.onStoreDataChanged,removerecords:this.onStoreDataChanged,updaterecord:this.onStoreDataChanged,refresh:this.onStoreDataChanged})}return a},updateStore:function(a){if(a){this.onStoreDataChanged(a)}},onStoreDataChanged:function(a){var c=this.getInitialConfig(),b=this.getValue();if(Ext.isDefined(b)){this.updateValue(this.applyValue(b))}if(this.getValue()===null){if(c.hasOwnProperty("value")){this.setValue(c.value)}if(this.getValue()===null){if(a.getCount()>0){this.setValue(a.getAt(0))}}}},doSetDisabled:function(a){Ext.Component.prototype.doSetDisabled.apply(this,arguments)},setDisabled:function(){Ext.Component.prototype.setDisabled.apply(this,arguments)},reset:function(){var b=this.getStore(),a=(this.originalValue)?this.originalValue:b.getAt(0);if(b&&a){this.setValue(a)}return this},onFocus:function(a){this.fireEvent("focus",this,a);this.isFocused=true;this.showPicker()},destroy:function(){this.callParent(arguments);Ext.destroy(this.listPanel,this.picker,this.hiddenField)}});Ext.define("Ext.picker.Date",{extend:"Ext.picker.Picker",xtype:"datepicker",alternateClassName:"Ext.DatePicker",requires:["Ext.DateExtras"],config:{yearFrom:1980,yearTo:new Date().getFullYear(),monthText:"Month",dayText:"Day",yearText:"Year",slotOrder:["month","day","year"]},initialize:function(){this.callParent();this.on({scope:this,delegate:"> slot",slotpick:this.onSlotPick})},setValue:function(b,a){if(Ext.isDate(b)){b={day:b.getDate(),month:b.getMonth()+1,year:b.getFullYear()}}this.callParent([b,a])},getValue:function(){var h={},a,g,c,f,e=this.getItems().items,d=e.length,j,b;for(b=0;b<d;b++){j=e[b];if(j instanceof Ext.picker.Slot){h[j.getName()]=j.getValue()}}if(h.year===null&&h.month===null&&h.day===null){return null}f=Ext.isNumber(h.year)?h.year:1;c=Ext.isNumber(h.month)?h.month:1;g=Ext.isNumber(h.day)?h.day:1;if(c&&f&&c&&g){a=this.getDaysInMonth(c,f)}g=(a)?Math.min(g,a):g;return new Date(f,c-1,g)},updateYearFrom:function(){if(this.initialized){this.createSlots()}},updateYearTo:function(){if(this.initialized){this.createSlots()}},updateMonthText:function(a,b){var f=this.getInnerItems,e=f.length,d,c;if(this.initialized){for(c=0;c<e;c++){d=f[c];if((typeof d.title=="string"&&d.title==b)||(d.title.html==b)){d.setTitle(a)}}}},updateDayText:function(a,c){var f=this.getInnerItems,e=f.length,d,b;if(this.initialized){for(b=0;b<e;b++){d=f[b];if((typeof d.title=="string"&&d.title==c)||(d.title.html==c)){d.setTitle(a)}}}},updateYearText:function(e){var d=this.getInnerItems,c=d.length,b,a;if(this.initialized){for(a=0;a<c;a++){b=d[a];if(b.title==this.yearText){b.setTitle(e)}}}},constructor:function(){this.callParent(arguments);this.createSlots()},createSlots:function(){var k=this,c=this.getSlotOrder(),m=k.getYearFrom(),f=k.getYearTo(),g=[],l=[],b=[],j,e,d,a;if(m>f){e=m;m=f;f=e}for(d=m;d<=f;d++){g.push({text:d,value:d})}a=this.getDaysInMonth(1,new Date().getFullYear());for(d=0;d<a;d++){l.push({text:d+1,value:d+1})}for(d=0,j=Ext.Date.monthNames.length;d<j;d++){b.push({text:Ext.Date.monthNames[d],value:d+1})}var h=[];c.forEach(function(i){h.push(this.createSlot(i,l,b,g))},this);k.setSlots(h)},createSlot:function(b,d,a,c){switch(b){case"year":return{name:"year",align:"center",data:c,title:this.getYearText(),flex:3};case"month":return{name:b,align:"right",data:a,title:this.getMonthText(),flex:4};case"day":return{name:"day",align:"center",data:d,title:this.getDayText(),flex:2}}},onSlotPick:function(){var j=this.getValue(),h=this.getDaySlot(),f=j.getFullYear(),e=j.getMonth(),k=[],b=h,a,c;if(!j||!Ext.isDate(j)||!h){return}a=this.getDaysInMonth(e+1,f);for(c=0;c<a;c++){k.push({text:c+1,value:c+1})}if(h.getData().length==k.length){return}var g=h.getStore(),n=h.getViewItems(),m=h.getValueField(),d,l;h.setData(k);d=g.find(m,j.getDate());if(d==-1){return}l=Ext.get(n[d]);h.selectedIndex=d;h.scrollToItem(l);h._value=j},getDaySlot:function(){var c=this.getInnerItems(),b=c.length,a,d;if(this.daySlot){return this.daySlot}for(a=0;a<b;a++){d=c[a];if(d.isSlot&&d.getName()=="day"){this.daySlot=d;return d}}return null},getDaysInMonth:function(c,b){var a=[31,28,31,30,31,30,31,31,30,31,30,31];return c==2&&this.isLeapYear(b)?29:a[c-1]},isLeapYear:function(a){return !!((a&3)===0&&(a%100||(a%400===0&&a)))}});Ext.define("Ext.field.DatePicker",{extend:"Ext.field.Text",alternateClassName:"Ext.form.DatePicker",xtype:"datepickerfield",requires:["Ext.picker.Date","Ext.DateExtras"],config:{ui:"select",picker:true,clearIcon:false,destroyPickerOnHide:false,dateFormat:null,component:{useMask:true}},initialize:function(){this.callParent();this.getComponent().on({scope:this,masktap:"onMaskTap"});this.getComponent().input.dom.disabled=true},syncEmptyCls:Ext.emptyFn,applyValue:function(a){if(!Ext.isDate(a)&&!Ext.isObject(a)){a=null}if(Ext.isObject(a)){a=new Date(a.year,a.month-1,a.day)}return a},updateValue:function(b){var a=this._picker;if(a&&a.isPicker){a.setValue(b)}if(b!==null){this.getComponent().setValue(Ext.Date.format(b,this.getDateFormat()||Ext.util.Format.defaultDateFormat))}else{this.getComponent().setValue("")}if(this._picker&&this._picker instanceof Ext.picker.Date){this._picker.setValue(b)}},updateDateFormat:function(c,a){var b=this.getValue();if(c!=a&&Ext.isDate(b)&&this._picker&&this._picker instanceof Ext.picker.Date){this.getComponent().setValue(Ext.Date.format(b,c||Ext.util.Format.defaultDateFormat))}},getValue:function(){if(this._picker&&this._picker instanceof Ext.picker.Date){return this._picker.getValue()}return this._value},getFormattedValue:function(b){var a=this.getValue();return(Ext.isDate(a))?Ext.Date.format(a,b||this.getDateFormat()||Ext.util.Format.defaultDateFormat):a},applyPicker:function(b,a){if(a&&a.isPicker){b=a.setConfig(b)}return b},getPicker:function(){var a=this._picker;if(a&&!a.isPicker){a=Ext.factory(a,Ext.picker.Date);a.on({scope:this,change:"onPickerChange",hide:"onPickerHide"});a.hide();a.setValue(this.getValue());Ext.Viewport.add(a);this._picker=a}return a},onMaskTap:function(){if(this.getDisabled()){return false}if(this.getReadOnly()){return false}this.getPicker().show();return false},onPickerChange:function(a,c){var b=this;b.setValue(c);b.fireEvent("change",b,b.getValue())},onPickerHide:function(){var a=this.getPicker();if(this.getDestroyPickerOnHide()&&a){a.destroy();this.setPicker(null)}},reset:function(){this.setValue(this.originalValue)},destroy:function(){var a=this.getPicker();if(a){a.destroy()}this.callParent(arguments)}});Ext.define("Ext.slider.Thumb",{extend:"Ext.Component",xtype:"thumb",config:{baseCls:Ext.baseCSSPrefix+"thumb",draggable:{direction:"horizontal"}},elementWidth:0,initialize:function(){this.callParent();this.getDraggable().onBefore({dragstart:"onDragStart",drag:"onDrag",dragend:"onDragEnd",scope:this});this.on("painted","onPainted")},onDragStart:function(){if(this.isDisabled()){return false}this.relayEvent(arguments)},onDrag:function(){if(this.isDisabled()){return false}this.relayEvent(arguments)},onDragEnd:function(){if(this.isDisabled()){return false}this.relayEvent(arguments)},onPainted:function(){this.elementWidth=this.element.dom.offsetWidth},getElementWidth:function(){return this.elementWidth}});Ext.define("Ext.slider.Slider",{extend:"Ext.Container",xtype:"slider",requires:["Ext.slider.Thumb","Ext.fx.easing.EaseOut"],config:{baseCls:"x-slider",thumbConfig:{draggable:{translatable:{easingX:{duration:300,type:"ease-out"}}}},value:0,minValue:0,maxValue:100,increment:1,allowThumbsOverlapping:false,animation:true},elementWidth:0,offsetValueRatio:0,activeThumb:null,constructor:function(a){a=a||{};if(a.hasOwnProperty("values")){a.value=a.values}this.callParent([a])},initialize:function(){var a=this.element;this.callParent();a.on({scope:this,tap:"onTap"});this.on({scope:this,delegate:"> thumb",dragstart:"onThumbDragStart",drag:"onThumbDrag",dragend:"onThumbDragEnd"});this.on({painted:"refresh",resize:"refresh"})},factoryThumb:function(){return Ext.factory(this.getThumbConfig(),Ext.slider.Thumb)},getThumbs:function(){return this.innerItems},getThumb:function(a){if(typeof a!="number"){a=0}return this.innerItems[a]},refreshOffsetValueRatio:function(){var b=this.getMaxValue()-this.getMinValue(),a=this.elementWidth-this.thumbWidth;this.offsetValueRatio=a/b},refreshElementWidth:function(){this.elementWidth=this.element.dom.offsetWidth;this.thumbWidth=this.getThumb(0).getElementWidth()},refresh:function(){this.refreshElementWidth();this.refreshValue()},setActiveThumb:function(b){var a=this.activeThumb;if(a&&a!==b){a.setZIndex(null)}this.activeThumb=b;b.setZIndex(2);return this},onThumbDragStart:function(a,b){if(b.absDeltaX<=b.absDeltaY){return false}else{b.stopPropagation()}if(this.getAllowThumbsOverlapping()){this.setActiveThumb(a)}this.dragStartValue=this.getValue()[this.getThumbIndex(a)];this.fireEvent("dragstart",this,a,this.dragStartValue,b)},onThumbDrag:function(c,g,a){var d=this.getThumbIndex(c),f=this.offsetValueRatio,b=this.constrainValue(a/f);g.stopPropagation();this.setIndexValue(d,b);this.fireEvent("drag",this,c,this.getValue(),g);return false},setIndexValue:function(d,g,f){var c=this.getThumb(d),b=this.getValue(),e=this.offsetValueRatio,a=c.getDraggable();a.setOffset(g*e,null,f);b[d]=this.constrainValue(a.getOffset().x/e)},onThumbDragEnd:function(a,f){this.refreshThumbConstraints(a);var c=this.getThumbIndex(a),d=this.getValue()[c],b=this.dragStartValue;this.fireEvent("dragend",this,a,this.getValue(),f);if(b!==d){this.fireEvent("change",this,a,d,b)}},getThumbIndex:function(a){return this.getThumbs().indexOf(a)},refreshThumbConstraints:function(d){var b=this.getAllowThumbsOverlapping(),a=d.getDraggable().getOffset().x,c=this.getThumbs(),e=this.getThumbIndex(d),g=c[e-1],h=c[e+1],f=this.thumbWidth;if(g){g.getDraggable().addExtraConstraint({max:{x:a-((b)?0:f)}})}if(h){h.getDraggable().addExtraConstraint({min:{x:a+((b)?0:f)}})}},onTap:function(j){if(this.isDisabled()){return}var k=Ext.get(j.target);if(!k||k.hasCls("x-thumb")){return}var n=j.touch.point.x,h=this.element,c=h.getX(),d=n-c-(this.thumbWidth/2),o=this.constrainValue(d/this.offsetValueRatio),r=this.getValue(),q=Infinity,m=r.length,g,f,l,p,b,a;if(m===1){p=0}else{for(g=0;g<m;g++){l=r[g];f=Math.abs(l-o);if(f<q){q=f;p=g}}}b=r[p];a=this.getThumb(p);this.setIndexValue(p,o,this.getAnimation());this.refreshThumbConstraints(a);if(b!==o){this.fireEvent("change",this,a,o,b)}},updateThumbs:function(a){this.add(a)},applyValue:function(g){var d=Ext.Array.from(g||0),b=[],c=this.getMinValue(),a,e,f;for(e=0,f=d.length;e<f;e++){a=this.constrainValue(d[e]);if(a<c){a=c}b.push(a);c=a}return b},updateValue:function(e,b){var a=this.getThumbs(),d=e.length,c;this.setThumbsCount(d);for(c=0;c<d;c++){a[c].getDraggable().setExtraConstraint(null).setOffset(e[c]*this.offsetValueRatio)}for(c=0;c<d;c++){this.refreshThumbConstraints(a[c])}},refreshValue:function(){this.refreshOffsetValueRatio();this.setValue(this.getValue())},constrainValue:function(e){var b=this,d=b.getMinValue(),f=b.getMaxValue(),a=b.getIncrement(),c;e=parseFloat(e);if(isNaN(e)){e=d}c=e%a;e-=c;if(Math.abs(c)>=(a/2)){e+=(c>0)?a:-a}e=Math.max(d,e);e=Math.min(f,e);return e},setThumbsCount:function(e){var a=this.getThumbs(),f=a.length,c,d,b;if(f>e){for(c=0,d=f-e;c<d;c++){b=a[a.length-1];b.destroy()}}else{if(f<e){for(c=0,d=e-f;c<d;c++){this.add(this.factoryThumb())}}}return this},setValues:function(a){this.setValue(a)},getValues:function(){return this.getValue()},applyIncrement:function(a){if(a===0){a=1}return Math.abs(a)},updateAllowThumbsOverlapping:function(b,a){if(typeof a!="undefined"){this.refreshValue()}},updateMinValue:function(b,a){if(typeof a!="undefined"){this.refreshValue()}},updateMaxValue:function(b,a){if(typeof a!="undefined"){this.refreshValue()}},updateIncrement:function(b,a){if(typeof a!="undefined"){this.refreshValue()}},doSetDisabled:function(c){this.callParent(arguments);var a=this.getItems().items,d=a.length,b;for(b=0;b<d;b++){a[b].setDisabled(c)}}},function(){});Ext.define("Ext.field.Slider",{extend:"Ext.field.Field",xtype:"sliderfield",requires:["Ext.slider.Slider"],alternateClassName:"Ext.form.Slider",config:{cls:Ext.baseCSSPrefix+"slider-field",tabIndex:-1},proxyConfig:{value:0,minValue:0,maxValue:100,increment:1},constructor:function(a){a=a||{};if(a.hasOwnProperty("values")){a.value=a.values}this.callParent([a])},initialize:function(){this.callParent();this.getComponent().on({scope:this,change:"onSliderChange"})},applyComponent:function(a){return Ext.factory(a,Ext.slider.Slider)},onSliderChange:function(c,a,d,b){this.fireEvent("change",this,a,d,b)},setValues:function(a){this.setValue(a)},getValues:function(){return this.getValue()},reset:function(){var b=this.config,a=(this.config.hasOwnProperty("values"))?b.values:b.value;this.setValue(a)},doSetDisabled:function(a){this.callParent(arguments);this.getComponent().setDisabled(a)}});Ext.define("Ext.slider.Toggle",{extend:"Ext.slider.Slider",config:{baseCls:"x-toggle",minValueCls:"x-toggle-off",maxValueCls:"x-toggle-on"},initialize:function(){this.callParent();this.on({change:"onChange"})},applyMinValue:function(){return 0},applyMaxValue:function(){return 1},applyIncrement:function(){return 1},setValue:function(b,a){this.callParent(arguments);this.onChange(this,this.getThumbs()[0],b,a)},onChange:function(d,a,f,c){var g=f>0,b=d.getMaxValueCls(),e=d.getMinValueCls();this.element.addCls(g?b:e);this.element.removeCls(g?e:b)}});Ext.define("Ext.field.Toggle",{extend:"Ext.field.Slider",xtype:"togglefield",alternateClassName:"Ext.form.Toggle",requires:["Ext.slider.Toggle"],config:{cls:"x-toggle-field"},proxyConfig:{minValueCls:"x-toggle-off",maxValueCls:"x-toggle-on"},applyComponent:function(a){return Ext.factory(a,Ext.slider.Toggle)},setValue:function(a){if(a===true){a=1}this.getComponent().setValue(a);return this},toggle:function(){var a=this.getValue();this.setValue((a==1)?0:1);return this}});Ext.define("Ext.tab.Tab",{extend:"Ext.Button",xtype:"tab",alternateClassName:"Ext.Tab",isTab:true,config:{baseCls:Ext.baseCSSPrefix+"tab",pressedCls:Ext.baseCSSPrefix+"tab-pressed",activeCls:Ext.baseCSSPrefix+"tab-active",active:false,title:"&nbsp;"},template:[{tag:"span",reference:"badgeElement",hidden:true},{tag:"span",className:Ext.baseCSSPrefix+"button-icon",reference:"iconElement",style:"visibility: hidden !important"},{tag:"span",reference:"textElement",hidden:true}],updateTitle:function(a){this.setText(a)},hideIconElement:function(){this.iconElement.dom.style.setProperty("visibility","hidden","!important")},showIconElement:function(){this.iconElement.dom.style.setProperty("visibility","visible","!important")},updateActive:function(c,b){var a=this.getActiveCls();if(c&&!b){this.element.addCls(a);this.fireEvent("activate",this)}else{if(b){this.element.removeCls(a);this.fireEvent("deactivate",this)}}}},function(){this.override({activate:function(){this.setActive(true)},deactivate:function(){this.setActive(false)}})});Ext.define("Ext.tab.Bar",{extend:"Ext.Toolbar",alternateClassName:"Ext.TabBar",xtype:"tabbar",requires:["Ext.tab.Tab"],config:{baseCls:Ext.baseCSSPrefix+"tabbar",defaultType:"tab",layout:{type:"hbox",align:"middle"}},eventedConfig:{activeTab:null},initialize:function(){var a=this;a.callParent();a.on({tap:"onTabTap",delegate:"> tab",scope:a})},onTabTap:function(a){this.setActiveTab(a)},applyActiveTab:function(a,c){if(!a&&a!==0){return}var b=this.parseActiveTab(a);if(!b){return}return b},doSetDocked:function(a){var c=this.getLayout(),b=a=="bottom"?"center":"left";if(c.isLayout){c.setPack(b)}else{c.pack=(c&&c.pack)?c.pack:b}},doSetActiveTab:function(b,a){if(b){b.setActive(true)}if(a){a.setActive(false)}},parseActiveTab:function(a){if(typeof a=="number"){return this.getInnerItems()[a]}else{if(typeof a=="string"){a=Ext.getCmp(a)}}return a}});Ext.define("Ext.tab.Panel",{extend:"Ext.Container",xtype:"tabpanel",alternateClassName:"Ext.TabPanel",requires:["Ext.tab.Bar"],config:{ui:"dark",tabBar:true,tabBarPosition:"top",layout:{type:"card",animation:{type:"slide",direction:"left"}},cls:Ext.baseCSSPrefix+"tabpanel"},delegateListeners:{delegate:"> component",centeredchange:"onItemCenteredChange",dockedchange:"onItemDockedChange",floatingchange:"onItemFloatingChange",disabledchange:"onItemDisabledChange"},initialize:function(){this.callParent();this.on({order:"before",activetabchange:"doTabChange",delegate:"> tabbar",scope:this})},applyScrollable:function(){return false},updateUi:function(a,b){this.callParent(arguments);if(this.initialized){this.getTabBar().setUi(a)}},doSetActiveItem:function(d,j){if(d){var f=this.getInnerItems(),g=f.indexOf(j),i=f.indexOf(d),e=g>i,c=this.getLayout().getAnimation(),b=this.getTabBar(),h=b.parseActiveTab(g),a=b.parseActiveTab(i);if(c&&c.setReverse){c.setReverse(e)}this.callParent(arguments);if(i!=-1){this.getTabBar().setActiveTab(i);if(h){h.setActive(false)}if(a){a.setActive(true)}}}},doTabChange:function(a,b){this.setActiveItem(a.indexOf(b))},applyTabBar:function(a){if(a===true){a={}}if(a){Ext.applyIf(a,{ui:this.getUi(),docked:this.getTabBarPosition()})}return Ext.factory(a,Ext.tab.Bar,this.getTabBar())},updateTabBar:function(a){if(a){this.add(a);this.setTabBarPosition(a.getDocked())}},updateTabBarPosition:function(b){var a=this.getTabBar();if(a){a.setDocked(b)}},onItemAdd:function(e){var k=this;if(!e.isInnerItem()){return k.callParent(arguments)}var c=k.getTabBar(),o=e.getInitialConfig(),d=o.tab||{},g=o.title,i=o.iconCls,j=o.hidden,n=o.disabled,p=o.badgeText,b=k.getInnerItems(),h=b.indexOf(e),l=c.getItems(),a=k.getInnerItems(),m=(l.length>=a.length)&&l.getAt(h),f;if(g&&!d.title){d.title=g}if(i&&!d.iconCls){d.iconCls=i}if(j&&!d.hidden){d.hidden=j}if(n&&!d.disabled){d.disabled=n}if(p&&!d.badgeText){d.badgeText=p}f=Ext.factory(d,Ext.tab.Tab,m);if(!m){c.insert(h,f)}e.tab=f;k.callParent(arguments)},onItemDisabledChange:function(a,b){if(a&&a.tab){a.tab.setDisabled(b)}},onItemRemove:function(b,a){this.getTabBar().remove(b.tab,this.getAutoDestroy());this.callParent(arguments)}},function(){});Ext.define("Ext.table.Cell",{extend:"Ext.Container",xtype:"tablecell",config:{baseCls:"x-table-cell"},getElementConfig:function(){var a=this.callParent();a.children.length=0;return a}});Ext.define("Ext.table.Row",{extend:"Ext.table.Cell",xtype:"tablerow",config:{baseCls:"x-table-row",defaultType:"tablecell"}});Ext.define("Ext.table.Table",{extend:"Ext.Container",requires:["Ext.table.Row"],xtype:"table",config:{baseCls:"x-table",defaultType:"tablerow"},cachedConfig:{fixedLayout:false},fixedLayoutCls:"x-table-fixed",updateFixedLayout:function(a){this.innerElement[a?"addCls":"removeCls"](this.fixedLayoutCls)}});Ext.define("Ext.viewport.Default",{extend:"Ext.Container",xtype:"viewport",PORTRAIT:"portrait",LANDSCAPE:"landscape",requires:["Ext.LoadMask"],config:{autoMaximize:false,autoBlurInput:true,preventPanning:true,preventZooming:true,autoRender:true,layout:"card",width:"100%",height:"100%"},isReady:false,isViewport:true,isMaximizing:false,id:"ext-viewport",isInputRegex:/^(input|textarea|select|a)$/i,focusedElement:null,fullscreenItemCls:Ext.baseCSSPrefix+"fullscreen",constructor:function(a){var b=Ext.Function.bind;this.doPreventPanning=b(this.doPreventPanning,this);this.doPreventZooming=b(this.doPreventZooming,this);this.doBlurInput=b(this.doBlurInput,this);this.maximizeOnEvents=["ready","orientationchange"];this.orientation=this.determineOrientation();this.windowWidth=this.getWindowWidth();this.windowHeight=this.getWindowHeight();this.windowOuterHeight=this.getWindowOuterHeight();if(!this.stretchHeights){this.stretchHeights={}}this.callParent([a]);if(this.supportsOrientation()){this.addWindowListener("orientationchange",b(this.onOrientationChange,this))}else{this.addWindowListener("resize",b(this.onResize,this))}document.addEventListener("focus",b(this.onElementFocus,this),true);document.addEventListener("blur",b(this.onElementBlur,this),true);Ext.onDocumentReady(this.onDomReady,this);this.on("ready",this.onReady,this,{single:true});this.getEventDispatcher().addListener("component","*","fullscreen","onItemFullscreenChange",this);return this},onDomReady:function(){this.isReady=true;this.updateSize();this.fireEvent("ready",this)},onReady:function(){if(this.getAutoRender()){this.render()}},onElementFocus:function(a){this.focusedElement=a.target},onElementBlur:function(){this.focusedElement=null},render:function(){if(!this.rendered){var a=Ext.getBody(),b=Ext.baseCSSPrefix,h=[],d=Ext.os,g=d.name.toLowerCase(),f=Ext.browser.name.toLowerCase(),e=d.version.getMajor(),c=this.getOrientation();this.renderTo(a);h.push(b+d.deviceType.toLowerCase());if(d.is.iPad){h.push(b+"ipad")}h.push(b+g);h.push(b+f);if(e){h.push(b+g+"-"+e)}if(d.is.BlackBerry){h.push(b+"bb")}if(Ext.browser.is.Standalone){h.push(b+"standalone")}h.push(b+c);a.addCls(h)}},applyAutoBlurInput:function(a){var b=(Ext.feature.has.Touch)?"touchstart":"mousedown";if(a){this.addWindowListener(b,this.doBlurInput,false)}else{this.removeWindowListener(b,this.doBlurInput,false)}return a},applyAutoMaximize:function(a){if(a){this.on("ready","doAutoMaximizeOnReady",this,{single:true});this.on("orientationchange","doAutoMaximizeOnOrientationChange",this)}else{this.un("ready","doAutoMaximizeOnReady",this);this.un("orientationchange","doAutoMaximizeOnOrientationChange",this)}return a},applyPreventPanning:function(a){if(a){this.addWindowListener("touchmove",this.doPreventPanning,false)}else{this.removeWindowListener("touchmove",this.doPreventPanning,false)}return a},applyPreventZooming:function(a){var b=(Ext.feature.has.Touch)?"touchstart":"mousedown";if(a){this.addWindowListener(b,this.doPreventZooming,false)}else{this.removeWindowListener(b,this.doPreventZooming,false)}return a},doAutoMaximizeOnReady:function(){var a=arguments[arguments.length-1];a.pause();this.isMaximizing=true;this.on("maximize",function(){this.isMaximizing=false;this.updateSize();a.resume();this.fireEvent("ready",this)},this,{single:true});this.maximize()},doAutoMaximizeOnOrientationChange:function(){var a=arguments[arguments.length-1],b=a.firingArguments;a.pause();this.isMaximizing=true;this.on("maximize",function(){this.isMaximizing=false;this.updateSize();b[1]=this.windowWidth;b[2]=this.windowHeight;a.resume()},this,{single:true});this.maximize()},doBlurInput:function(b){var a=b.target,c=this.focusedElement;if(c&&!this.isInputRegex.test(a.tagName)){delete this.focusedElement;c.blur()}},doPreventPanning:function(a){a.preventDefault()},doPreventZooming:function(b){if("button" in b&&b.button!==0){return}var a=b.target;if(a&&a.nodeType===1&&!this.isInputRegex.test(a.tagName)){b.preventDefault()}},addWindowListener:function(b,c,a){window.addEventListener(b,c,Boolean(a))},removeWindowListener:function(b,c,a){window.removeEventListener(b,c,Boolean(a))},doAddListener:function(a,d,c,b){if(a==="ready"&&this.isReady&&!this.isMaximizing){d.call(c);return this}this.mixins.observable.doAddListener.apply(this,arguments)},supportsOrientation:function(){return Ext.feature.has.Orientation},onResize:function(){var c=this.windowWidth,f=this.windowHeight,e=this.getWindowWidth(),a=this.getWindowHeight(),d=this.getOrientation(),b=this.determineOrientation();if((c!==e||f!==a)&&d!==b){this.fireOrientationChangeEvent(b,d)}},onOrientationChange:function(){var b=this.getOrientation(),a=this.determineOrientation();if(a!==b){this.fireOrientationChangeEvent(a,b)}},fireOrientationChangeEvent:function(b,c){var a=Ext.baseCSSPrefix;Ext.getBody().replaceCls(a+c,a+b);this.orientation=b;this.updateSize();this.fireEvent("orientationchange",this,b,this.windowWidth,this.windowHeight)},updateSize:function(b,a){this.windowWidth=b!==undefined?b:this.getWindowWidth();this.windowHeight=a!==undefined?a:this.getWindowHeight();return this},waitUntil:function(h,e,g,a,f){if(!a){a=50}if(!f){f=2000}var c=this,b=0;setTimeout(function d(){b+=a;if(h.call(c)===true){if(e){e.call(c)}}else{if(b>=f){if(g){g.call(c)}}else{setTimeout(d,a)}}},a)},maximize:function(){this.fireMaximizeEvent()},fireMaximizeEvent:function(){this.updateSize();this.fireEvent("maximize",this)},doSetHeight:function(a){Ext.getBody().setHeight(a);this.callParent(arguments)},doSetWidth:function(a){Ext.getBody().setWidth(a);this.callParent(arguments)},scrollToTop:function(){window.scrollTo(0,-1)},getWindowWidth:function(){return window.innerWidth},getWindowHeight:function(){return window.innerHeight},getWindowOuterHeight:function(){return window.outerHeight},getWindowOrientation:function(){return window.orientation},getOrientation:function(){return this.orientation},getSize:function(){return{width:this.windowWidth,height:this.windowHeight}},determineOrientation:function(){var b=this.PORTRAIT,a=this.LANDSCAPE;if(this.supportsOrientation()){if(this.getWindowOrientation()%180===0){return b}return a}else{if(this.getWindowHeight()>=this.getWindowWidth()){return b}return a}},onItemFullscreenChange:function(a){a.addCls(this.fullscreenItemCls);this.add(a)}});Ext.define("Ext.viewport.Android",{extend:"Ext.viewport.Default",constructor:function(){this.on("orientationchange","doFireOrientationChangeEvent",this,{prepend:true});this.on("orientationchange","hideKeyboardIfNeeded",this,{prepend:true});return this.callParent(arguments)},getDummyInput:function(){var a=this.dummyInput,c=this.focusedElement,b=Ext.fly(c).getPageBox();if(!a){this.dummyInput=a=document.createElement("input");a.style.position="absolute";a.style.opacity="0";document.body.appendChild(a)}a.style.left=b.left+"px";a.style.top=b.top+"px";a.style.display="";return a},doBlurInput:function(c){var b=c.target,d=this.focusedElement,a;if(d&&!this.isInputRegex.test(b.tagName)){a=this.getDummyInput();delete this.focusedElement;a.focus();setTimeout(function(){a.style.display="none"},100)}},hideKeyboardIfNeeded:function(){var a=arguments[arguments.length-1],b=this.focusedElement;if(b){delete this.focusedElement;a.pause();if(Ext.os.version.lt("4")){b.style.display="none"}else{b.blur()}setTimeout(function(){b.style.display="";a.resume()},1000)}},doFireOrientationChangeEvent:function(){var a=arguments[arguments.length-1];this.orientationChanging=true;a.pause();this.waitUntil(function(){return this.getWindowOuterHeight()!==this.windowOuterHeight},function(){this.windowOuterHeight=this.getWindowOuterHeight();this.updateSize();a.firingArguments[1]=this.windowWidth;a.firingArguments[2]=this.windowHeight;a.resume();this.orientationChanging=false},function(){});return this},applyAutoMaximize:function(a){this.callParent(arguments);this.on("add","fixSize",this,{single:true});if(!a){this.on("ready","fixSize",this,{single:true});this.onAfter("orientationchange","doFixSize",this)}else{this.un("ready","fixSize",this);this.unAfter("orientationchange","doFixSize",this)}},fixSize:function(){this.doFixSize()},doFixSize:function(){this.setHeight(this.getWindowHeight())},getActualWindowOuterHeight:function(){return Math.round(this.getWindowOuterHeight()/window.devicePixelRatio)},maximize:function(){var c=this.stretchHeights,b=this.orientation,a;a=c[b];if(!a){c[b]=a=this.getActualWindowOuterHeight()}if(!this.addressBarHeight){this.addressBarHeight=a-this.getWindowHeight()}this.setHeight(a);var d=Ext.Function.bind(this.isHeightMaximized,this,[a]);this.scrollToTop();this.waitUntil(d,this.fireMaximizeEvent,this.fireMaximizeEvent)},isHeightMaximized:function(a){this.scrollToTop();return this.getWindowHeight()===a}},function(){if(!Ext.os.is.Android){return}var a=Ext.os.version,b=Ext.browser.userAgent,c=/(htc|desire|incredible|ADR6300)/i.test(b)&&a.lt("2.3");if(c){this.override({constructor:function(d){if(!d){d={}}d.autoMaximize=false;this.watchDogTick=Ext.Function.bind(this.watchDogTick,this);setInterval(this.watchDogTick,1000);return this.callParent([d])},watchDogTick:function(){this.watchDogLastTick=Ext.Date.now()},doPreventPanning:function(){var e=Ext.Date.now(),f=this.watchDogLastTick,d=e-f;if(d>=2000){return}return this.callParent(arguments)},doPreventZooming:function(){var e=Ext.Date.now(),f=this.watchDogLastTick,d=e-f;if(d>=2000){return}return this.callParent(arguments)}})}if(a.match("2")){this.override({onReady:function(){this.addWindowListener("resize",Ext.Function.bind(this.onWindowResize,this));this.callParent(arguments)},scrollToTop:function(){document.body.scrollTop=100},onWindowResize:function(){var e=this.windowWidth,g=this.windowHeight,f=this.getWindowWidth(),d=this.getWindowHeight();if(this.getAutoMaximize()&&!this.isMaximizing&&!this.orientationChanging&&window.scrollY===0&&e===f&&d<g&&((d>=g-this.addressBarHeight)||!this.focusedElement)){this.scrollToTop()}},fixSize:function(){var d=this.getOrientation(),f=window.outerHeight,g=window.outerWidth,e;if(d==="landscape"&&(f<g)||d==="portrait"&&(f>=g)){e=this.getActualWindowOuterHeight()}else{e=this.getWindowHeight()}this.waitUntil(function(){return e>this.getWindowHeight()},this.doFixSize,this.doFixSize,50,1000)}})}else{if(a.gtEq("3.1")){this.override({isHeightMaximized:function(d){this.scrollToTop();return this.getWindowHeight()===d-1}})}else{if(a.match("3")){this.override({isHeightMaximized:function(){this.scrollToTop();return true}})}}}if(a.gtEq("4")){this.override({doBlurInput:Ext.emptyFn})}});Ext.define("Ext.viewport.Ios",{extend:"Ext.viewport.Default",isFullscreen:function(){return this.isHomeScreen()},isHomeScreen:function(){return window.navigator.standalone===true},constructor:function(){this.callParent(arguments);if(this.getAutoMaximize()&&!this.isFullscreen()){this.addWindowListener("touchstart",Ext.Function.bind(this.onTouchStart,this))}},maximize:function(){if(this.isFullscreen()){return this.callParent()}var c=this.stretchHeights,b=this.orientation,d=this.getWindowHeight(),a=c[b];if(window.scrollY>0){this.scrollToTop();if(!a){c[b]=a=this.getWindowHeight()}this.setHeight(a);this.fireMaximizeEvent()}else{if(!a){a=this.getScreenHeight()}this.setHeight(a);this.waitUntil(function(){this.scrollToTop();return d!==this.getWindowHeight()},function(){if(!c[b]){a=c[b]=this.getWindowHeight();this.setHeight(a)}this.fireMaximizeEvent()},function(){a=c[b]=this.getWindowHeight();this.setHeight(a);this.fireMaximizeEvent()},50,1000)}},getScreenHeight:function(){return window.screen[this.orientation===this.PORTRAIT?"height":"width"]},onElementFocus:function(){if(this.getAutoMaximize()&&!this.isFullscreen()){clearTimeout(this.scrollToTopTimer)}this.callParent(arguments)},onElementBlur:function(){if(this.getAutoMaximize()&&!this.isFullscreen()){this.scrollToTopTimer=setTimeout(this.scrollToTop,500)}this.callParent(arguments)},onTouchStart:function(){if(this.focusedElement===null){this.scrollToTop()}},scrollToTop:function(){window.scrollTo(0,0)}},function(){if(!Ext.os.is.iOS){return}if(Ext.os.version.lt("3.2")){this.override({constructor:function(){var a=this.stretchHeights={};a[this.PORTRAIT]=416;a[this.LANDSCAPE]=268;return this.callOverridden(arguments)}})}if(Ext.os.version.lt("5")){this.override({fieldMaskClsTest:"-field-mask",doPreventZooming:function(b){var a=b.target;if(a&&a.nodeType===1&&!this.isInputRegex.test(a.tagName)&&a.className.indexOf(this.fieldMaskClsTest)==-1){b.preventDefault()}}})}if(Ext.os.is.iPad){this.override({isFullscreen:function(){return true}})}});Ext.define("Ext.viewport.Viewport",{requires:["Ext.viewport.Ios","Ext.viewport.Android"],constructor:function(b){var c=Ext.os.name,d,a;switch(c){case"Android":d="Android";break;case"iOS":d="Ios";break;default:d="Default"}a=Ext.create("Ext.viewport."+d,b);return a}});Ext.define("Ext.event.recognizer.Swipe",{extend:"Ext.event.recognizer.SingleTouch",handledEvents:["swipe"],inheritableStatics:{MAX_OFFSET_EXCEEDED:16,MAX_DURATION_EXCEEDED:17,DISTANCE_NOT_ENOUGH:18},config:{minDistance:80,maxOffset:35,maxDuration:1000},onTouchStart:function(a){if(this.callParent(arguments)===false){return false}var b=a.changedTouches[0];this.startTime=a.time;this.isHorizontal=true;this.isVertical=true;this.startX=b.pageX;this.startY=b.pageY},onTouchMove:function(f){var h=f.changedTouches[0],b=h.pageX,g=h.pageY,c=Math.abs(b-this.startX),a=Math.abs(g-this.startY),d=f.time;if(d-this.startTime>this.getMaxDuration()){return this.fail(this.self.MAX_DURATION_EXCEEDED)}if(this.isVertical&&c>this.getMaxOffset()){this.isVertical=false}if(this.isHorizontal&&a>this.getMaxOffset()){this.isHorizontal=false}if(!this.isHorizontal&&!this.isVertical){return this.fail(this.self.MAX_OFFSET_EXCEEDED)}},onTouchEnd:function(i){if(this.onTouchMove(i)===false){return false}var h=i.changedTouches[0],l=h.pageX,j=h.pageY,g=l-this.startX,f=j-this.startY,c=Math.abs(g),b=Math.abs(f),m=this.getMinDistance(),d=i.time-this.startTime,k,a;if(this.isVertical&&b<m){this.isVertical=false}if(this.isHorizontal&&c<m){this.isHorizontal=false}if(this.isHorizontal){k=(g<0)?"left":"right";a=c}else{if(this.isVertical){k=(f<0)?"up":"down";a=b}else{return this.fail(this.self.DISTANCE_NOT_ENOUGH)}}this.fire("swipe",i,[h],{touch:h,direction:k,distance:a,duration:d})}});Ext.define("Ext.event.recognizer.HorizontalSwipe",{extend:"Ext.event.recognizer.Swipe",handledEvents:["swipe"],onTouchStart:function(a){if(this.callParent(arguments)===false){return false}var b=a.changedTouches[0];this.startTime=a.time;this.startX=b.pageX;this.startY=b.pageY},onTouchMove:function(f){var h=f.changedTouches[0],g=h.pageY,a=Math.abs(g-this.startY),d=f.time,c=this.getMaxDuration(),b=this.getMaxOffset();if(d-this.startTime>c){return this.fail(this.self.MAX_DURATION_EXCEEDED)}if(a>b){return this.fail(this.self.MAX_OFFSET_EXCEEDED)}},onTouchEnd:function(f){if(this.onTouchMove(f)!==false){var i=f.changedTouches[0],a=i.pageX,b=a-this.startX,h=Math.abs(b),d=f.time-this.startTime,g=this.getMinDistance(),c;if(h<g){return this.fail(this.self.DISTANCE_NOT_ENOUGH)}c=(b<0)?"left":"right";this.fire("swipe",f,[i],{touch:i,direction:c,distance:h,duration:d})}}});
diff --git a/apps/files_odfviewer/src/webodf/programs/touchui/welcome.odt b/apps/files_odfviewer/src/webodf/programs/touchui/welcome.odt
deleted file mode 100644
index 22e4d92824..0000000000
Binary files a/apps/files_odfviewer/src/webodf/programs/touchui/welcome.odt and /dev/null differ
diff --git a/apps/files_odfviewer/src/webodf/programs/touchui/zoom-fit-best.png b/apps/files_odfviewer/src/webodf/programs/touchui/zoom-fit-best.png
deleted file mode 100644
index 623885a022..0000000000
Binary files a/apps/files_odfviewer/src/webodf/programs/touchui/zoom-fit-best.png and /dev/null differ
diff --git a/apps/files_odfviewer/src/webodf/programs/touchui/zoom-fit-height.png b/apps/files_odfviewer/src/webodf/programs/touchui/zoom-fit-height.png
deleted file mode 100644
index 7f8d1935c6..0000000000
Binary files a/apps/files_odfviewer/src/webodf/programs/touchui/zoom-fit-height.png and /dev/null differ
diff --git a/apps/files_odfviewer/src/webodf/programs/touchui/zoom-fit-width.png b/apps/files_odfviewer/src/webodf/programs/touchui/zoom-fit-width.png
deleted file mode 100644
index 5bd06de697..0000000000
Binary files a/apps/files_odfviewer/src/webodf/programs/touchui/zoom-fit-width.png and /dev/null differ
diff --git a/apps/files_odfviewer/src/webodf/simplerevisionserver/webdavserver.py b/apps/files_odfviewer/src/webodf/simplerevisionserver/webdavserver.py
deleted file mode 100755
index d9125699c8..0000000000
--- a/apps/files_odfviewer/src/webodf/simplerevisionserver/webdavserver.py
+++ /dev/null
@@ -1,77 +0,0 @@
-#! /usr/bin/env python
-
-import BaseHTTPServer, SimpleHTTPServer, re, os, sys, xml.etree.ElementTree
-from xml.etree.ElementTree import Element
-from xml.etree.ElementTree import ElementTree
-from xml.etree.ElementTree import QName
-from xml.etree.ElementTree import SubElement
-
-class WebDAVRequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler):
-	def do_GET(self):
-		# handle headers like Range: bytes=0-1023
-		if 'Range' in self.headers:
-			m = re.match('\s*bytes\s*=\s*(\d+)\s*-\s*(\d+)\s*',
-					self.headers['Range'])
-			if m:
-				start = int(m.group(1))
-				end = int(m.group(2))
-				f = self.send_range_head(start, end)
-				if f:
-					self.copyfilerange(f, self.wfile, start,
-							end)
-					f.close()
-				return
-		return SimpleHTTPServer.SimpleHTTPRequestHandler.do_GET(self)
-
-	def do_PROPFIND(self):
-		print 'PROPFIND ' + self.path
-		for key in self.headers.keys():
-			print key + '\t' + self.headers[key]
-		req = self.parseinputxml()
-		req = ElementTree(req)
-		res = ElementTree(Element(QName("DAV:", 'multistatus')))
-		self.addresponse('/', res.getroot(), 0)
-
-		self.writeresponse(res)
-
-	def do_OPTIONS(self):
-		req = self.parseinputxml()
-		print req
-        	self.send_response(200)
-		self.send_header("DAV", "1");
-		self.end_headers()
-		self.wfile.close()
-
-	def parseinputxml(self):
-		try:
-			contentlength = int(self.headers['content-length'])
-		except:
-			return None
-		data = self.rfile.read(contentlength)
-		print data
-		return xml.etree.ElementTree.fromstring(data)
-		
-	def writeresponse(self, response):
-		self.send_response(200)
-		self.send_header("Content-Type", 'text/xml; charset="utf-8"')
-        	self.end_headers()
-		response.write(self.wfile, 'utf-8')
-#		response.write(sys.stdout, 'utf-8')
-#		sys.stdout.flush()
-		d = xml.etree.ElementTree.tostring(response.getroot(), 'utf-8')
-		print d
-		self.wfile.close()
-
-	def addresponse(self, path, root, depth):
-		e = SubElement(root, QName("DAV:", 'response'))
-		href = SubElement(e, QName("DAV:", 'href'))
-		href.text = path
-		propstat = SubElement(e, QName("DAV:", 'propstat'))
-		prop = SubElement(propstat, QName("DAV:", 'resourcetype'))
-		if os.path.isdir(path):
-			SubElement(prop, QName("DAV:", 'collection'))
-
-if __name__ == '__main__':
-	server_address = ('', 8080)
-	httpd = BaseHTTPServer.HTTPServer(server_address, WebDAVRequestHandler)
-	httpd.serve_forever()
diff --git a/apps/files_odfviewer/src/webodf/webodf/APPNOTE.txt b/apps/files_odfviewer/src/webodf/webodf/APPNOTE.txt
deleted file mode 100644
index 45ef5bcd07..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/APPNOTE.txt
+++ /dev/null
@@ -1,3218 +0,0 @@
-File:    APPNOTE.TXT - .ZIP File Format Specification
-Version: 6.3.2 
-Revised: September 28, 2007
-Copyright (c) 1989 - 2007 PKWARE Inc., All Rights Reserved.
-
-The use of certain technological aspects disclosed in the current
-APPNOTE is available pursuant to the below section entitled
-"Incorporating PKWARE Proprietary Technology into Your Product".
-
-I. Purpose
-----------
-
-This specification is intended to define a cross-platform,
-interoperable file storage and transfer format.  Since its 
-first publication in 1989, PKWARE has remained committed to 
-ensuring the interoperability of the .ZIP file format through 
-publication and maintenance of this specification.  We trust that 
-all .ZIP compatible vendors and application developers that have 
-adopted and benefited from this format will share and support 
-this commitment to interoperability.
-
-II. Contacting PKWARE
----------------------
-
-     PKWARE, Inc.
-     648 N. Plankinton Avenue, Suite 220
-     Milwaukee, WI 53203
-     +1-414-289-9788
-     +1-414-289-9789 FAX
-     zipformat@pkware.com
-
-III. Disclaimer
----------------
-
-Although PKWARE will attempt to supply current and accurate
-information relating to its file formats, algorithms, and the
-subject programs, the possibility of error or omission cannot 
-be eliminated. PKWARE therefore expressly disclaims any warranty 
-that the information contained in the associated materials relating 
-to the subject programs and/or the format of the files created or
-accessed by the subject programs and/or the algorithms used by
-the subject programs, or any other matter, is current, correct or
-accurate as delivered.  Any risk of damage due to any possible
-inaccurate information is assumed by the user of the information.
-Furthermore, the information relating to the subject programs
-and/or the file formats created or accessed by the subject
-programs and/or the algorithms used by the subject programs is
-subject to change without notice.
-
-If the version of this file is marked as a NOTIFICATION OF CHANGE,
-the content defines an Early Feature Specification (EFS) change 
-to the .ZIP file format that may be subject to modification prior 
-to publication of the Final Feature Specification (FFS).  This
-document may also contain information on Planned Feature 
-Specifications (PFS) defining recognized future extensions.
-
-IV. Change Log
---------------
-
-Version       Change Description                        Date
--------       ------------------                       ----------
-5.2           -Single Password Symmetric Encryption    06/02/2003
-               storage
-
-6.1.0         -Smartcard compatibility                 01/20/2004
-              -Documentation on certificate storage
-
-6.2.0         -Introduction of Central Directory       04/26/2004
-               Encryption for encrypting metadata
-              -Added OS/X to Version Made By values
-
-6.2.1         -Added Extra Field placeholder for       04/01/2005
-               POSZIP using ID 0x4690
-
-              -Clarified size field on 
-               "zip64 end of central directory record"
-
-6.2.2         -Documented Final Feature Specification  01/06/2006
-               for Strong Encryption
-
-              -Clarifications and typographical 
-               corrections
-
-6.3.0         -Added tape positioning storage          09/29/2006
-               parameters
-
-              -Expanded list of supported hash algorithms
-
-              -Expanded list of supported compression
-               algorithms
-
-              -Expanded list of supported encryption
-               algorithms
-
-              -Added option for Unicode filename 
-               storage
-
-              -Clarifications for consistent use
-               of Data Descriptor records
-
-              -Added additional "Extra Field" 
-               definitions
-
-6.3.1         -Corrected standard hash values for      04/11/2007
-               SHA-256/384/512
-
-6.3.2         -Added compression method 97             09/28/2007
-
-              -Documented InfoZIP "Extra Field"
-               values for UTF-8 file name and
-               file comment storage
-
-V. General Format of a .ZIP file
---------------------------------
-
-  Files stored in arbitrary order.  Large .ZIP files can span multiple
-  volumes or be split into user-defined segment sizes. All values
-  are stored in little-endian byte order unless otherwise specified. 
-
-  Overall .ZIP file format:
-
-    [local file header 1]
-    [file data 1]
-    [data descriptor 1]
-    . 
-    .
-    .
-    [local file header n]
-    [file data n]
-    [data descriptor n]
-    [archive decryption header] 
-    [archive extra data record] 
-    [central directory]
-    [zip64 end of central directory record]
-    [zip64 end of central directory locator] 
-    [end of central directory record]
-
-
-  A.  Local file header:
-
-        local file header signature     4 bytes  (0x04034b50)
-        version needed to extract       2 bytes
-        general purpose bit flag        2 bytes
-        compression method              2 bytes
-        last mod file time              2 bytes
-        last mod file date              2 bytes
-        crc-32                          4 bytes
-        compressed size                 4 bytes
-        uncompressed size               4 bytes
-        file name length                2 bytes
-        extra field length              2 bytes
-
-        file name (variable size)
-        extra field (variable size)
-
-  B.  File data
-
-      Immediately following the local header for a file
-      is the compressed or stored data for the file. 
-      The series of [local file header][file data][data
-      descriptor] repeats for each file in the .ZIP archive. 
-
-  C.  Data descriptor:
-
-        crc-32                          4 bytes
-        compressed size                 4 bytes
-        uncompressed size               4 bytes
-
-      This descriptor exists only if bit 3 of the general
-      purpose bit flag is set (see below).  It is byte aligned
-      and immediately follows the last byte of compressed data.
-      This descriptor is used only when it was not possible to
-      seek in the output .ZIP file, e.g., when the output .ZIP file
-      was standard output or a non-seekable device.  For ZIP64(tm) format
-      archives, the compressed and uncompressed sizes are 8 bytes each.
-
-      When compressing files, compressed and uncompressed sizes 
-      should be stored in ZIP64 format (as 8 byte values) when a 
-      files size exceeds 0xFFFFFFFF.   However ZIP64 format may be 
-      used regardless of the size of a file.  When extracting, if 
-      the zip64 extended information extra field is present for 
-      the file the compressed and uncompressed sizes will be 8
-      byte values.  
-
-      Although not originally assigned a signature, the value 
-      0x08074b50 has commonly been adopted as a signature value 
-      for the data descriptor record.  Implementers should be 
-      aware that ZIP files may be encountered with or without this 
-      signature marking data descriptors and should account for
-      either case when reading ZIP files to ensure compatibility.
-      When writing ZIP files, it is recommended to include the
-      signature value marking the data descriptor record.  When
-      the signature is used, the fields currently defined for
-      the data descriptor record will immediately follow the
-      signature.
-
-      An extensible data descriptor will be released in a future
-      version of this APPNOTE.  This new record is intended to
-      resolve conflicts with the use of this record going forward,
-      and to provide better support for streamed file processing.
-
-      When the Central Directory Encryption method is used, the data
-      descriptor record is not required, but may be used.  If present,
-      and bit 3 of the general purpose bit field is set to indicate
-      its presence, the values in fields of the data descriptor
-      record should be set to binary zeros.
-
-  D.  Archive decryption header:  
-
-      The Archive Decryption Header is introduced in version 6.2
-      of the ZIP format specification.  This record exists in support
-      of the Central Directory Encryption Feature implemented as part of 
-      the Strong Encryption Specification as described in this document.
-      When the Central Directory Structure is encrypted, this decryption
-      header will precede the encrypted data segment.  The encrypted
-      data segment will consist of the Archive extra data record (if
-      present) and the encrypted Central Directory Structure data.
-      The format of this data record is identical to the Decryption
-      header record preceding compressed file data.  If the central 
-      directory structure is encrypted, the location of the start of
-      this data record is determined using the Start of Central Directory
-      field in the Zip64 End of Central Directory record.  Refer to the 
-      section on the Strong Encryption Specification for information
-      on the fields used in the Archive Decryption Header record.
-
-
-  E.  Archive extra data record: 
-
-        archive extra data signature    4 bytes  (0x08064b50)
-        extra field length              4 bytes
-        extra field data                (variable size)
-
-      The Archive Extra Data Record is introduced in version 6.2
-      of the ZIP format specification.  This record exists in support
-      of the Central Directory Encryption Feature implemented as part of 
-      the Strong Encryption Specification as described in this document.
-      When present, this record immediately precedes the central 
-      directory data structure.  The size of this data record will be
-      included in the Size of the Central Directory field in the
-      End of Central Directory record.  If the central directory structure
-      is compressed, but not encrypted, the location of the start of
-      this data record is determined using the Start of Central Directory
-      field in the Zip64 End of Central Directory record.  
-
-
-  F.  Central directory structure:
-
-      [file header 1]
-      .
-      .
-      . 
-      [file header n]
-      [digital signature] 
-
-      File header:
-
-        central file header signature   4 bytes  (0x02014b50)
-        version made by                 2 bytes
-        version needed to extract       2 bytes
-        general purpose bit flag        2 bytes
-        compression method              2 bytes
-        last mod file time              2 bytes
-        last mod file date              2 bytes
-        crc-32                          4 bytes
-        compressed size                 4 bytes
-        uncompressed size               4 bytes
-        file name length                2 bytes
-        extra field length              2 bytes
-        file comment length             2 bytes
-        disk number start               2 bytes
-        internal file attributes        2 bytes
-        external file attributes        4 bytes
-        relative offset of local header 4 bytes
-
-        file name (variable size)
-        extra field (variable size)
-        file comment (variable size)
-
-      Digital signature:
-
-        header signature                4 bytes  (0x05054b50)
-        size of data                    2 bytes
-        signature data (variable size)
-
-      With the introduction of the Central Directory Encryption 
-      feature in version 6.2 of this specification, the Central 
-      Directory Structure may be stored both compressed and encrypted. 
-      Although not required, it is assumed when encrypting the
-      Central Directory Structure, that it will be compressed
-      for greater storage efficiency.  Information on the
-      Central Directory Encryption feature can be found in the section
-      describing the Strong Encryption Specification. The Digital 
-      Signature record will be neither compressed nor encrypted.
-
-  G.  Zip64 end of central directory record
-
-        zip64 end of central dir 
-        signature                       4 bytes  (0x06064b50)
-        size of zip64 end of central
-        directory record                8 bytes
-        version made by                 2 bytes
-        version needed to extract       2 bytes
-        number of this disk             4 bytes
-        number of the disk with the 
-        start of the central directory  4 bytes
-        total number of entries in the
-        central directory on this disk  8 bytes
-        total number of entries in the
-        central directory               8 bytes
-        size of the central directory   8 bytes
-        offset of start of central
-        directory with respect to
-        the starting disk number        8 bytes
-        zip64 extensible data sector    (variable size)
-
-        The value stored into the "size of zip64 end of central
-        directory record" should be the size of the remaining
-        record and should not include the leading 12 bytes.
-  
-        Size = SizeOfFixedFields + SizeOfVariableData - 12.
-
-        The above record structure defines Version 1 of the 
-        zip64 end of central directory record. Version 1 was 
-        implemented in versions of this specification preceding 
-        6.2 in support of the ZIP64 large file feature. The 
-        introduction of the Central Directory Encryption feature 
-        implemented in version 6.2 as part of the Strong Encryption 
-        Specification defines Version 2 of this record structure. 
-        Refer to the section describing the Strong Encryption 
-        Specification for details on the version 2 format for 
-        this record.
-
-        Special purpose data may reside in the zip64 extensible data
-        sector field following either a V1 or V2 version of this
-        record.  To ensure identification of this special purpose data
-        it must include an identifying header block consisting of the
-        following:
-
-           Header ID  -  2 bytes
-           Data Size  -  4 bytes
-
-        The Header ID field indicates the type of data that is in the 
-        data block that follows.
-
-        Data Size identifies the number of bytes that follow for this
-        data block type.
-
-        Multiple special purpose data blocks may be present, but each
-        must be preceded by a Header ID and Data Size field.  Current
-        mappings of Header ID values supported in this field are as
-        defined in APPENDIX C.
-
-  H.  Zip64 end of central directory locator
-
-        zip64 end of central dir locator 
-        signature                       4 bytes  (0x07064b50)
-        number of the disk with the
-        start of the zip64 end of 
-        central directory               4 bytes
-        relative offset of the zip64
-        end of central directory record 8 bytes
-        total number of disks           4 bytes
-        
-  I.  End of central directory record:
-
-        end of central dir signature    4 bytes  (0x06054b50)
-        number of this disk             2 bytes
-        number of the disk with the
-        start of the central directory  2 bytes
-        total number of entries in the
-        central directory on this disk  2 bytes
-        total number of entries in
-        the central directory           2 bytes
-        size of the central directory   4 bytes
-        offset of start of central
-        directory with respect to
-        the starting disk number        4 bytes
-        .ZIP file comment length        2 bytes
-        .ZIP file comment       (variable size)
-
-  J.  Explanation of fields:
-
-      version made by (2 bytes)
-
-          The upper byte indicates the compatibility of the file
-          attribute information.  If the external file attributes 
-          are compatible with MS-DOS and can be read by PKZIP for 
-          DOS version 2.04g then this value will be zero.  If these 
-          attributes are not compatible, then this value will 
-          identify the host system on which the attributes are 
-          compatible.  Software can use this information to determine
-          the line record format for text files etc.  The current
-          mappings are:
-
-          0 - MS-DOS and OS/2 (FAT / VFAT / FAT32 file systems)
-          1 - Amiga                     2 - OpenVMS
-          3 - UNIX                      4 - VM/CMS
-          5 - Atari ST                  6 - OS/2 H.P.F.S.
-          7 - Macintosh                 8 - Z-System
-          9 - CP/M                     10 - Windows NTFS
-         11 - MVS (OS/390 - Z/OS)      12 - VSE
-         13 - Acorn Risc               14 - VFAT
-         15 - alternate MVS            16 - BeOS
-         17 - Tandem                   18 - OS/400
-         19 - OS/X (Darwin)            20 thru 255 - unused
-
-          The lower byte indicates the ZIP specification version 
-          (the version of this document) supported by the software 
-          used to encode the file.  The value/10 indicates the major 
-          version number, and the value mod 10 is the minor version 
-          number.  
-
-      version needed to extract (2 bytes)
-
-          The minimum supported ZIP specification version needed to 
-          extract the file, mapped as above.  This value is based on 
-          the specific format features a ZIP program must support to 
-          be able to extract the file.  If multiple features are
-          applied to a file, the minimum version should be set to the 
-          feature having the highest value. New features or feature 
-          changes affecting the published format specification will be 
-          implemented using higher version numbers than the last 
-          published value to avoid conflict.
-
-          Current minimum feature versions are as defined below:
-
-          1.0 - Default value
-          1.1 - File is a volume label
-          2.0 - File is a folder (directory)
-          2.0 - File is compressed using Deflate compression
-          2.0 - File is encrypted using traditional PKWARE encryption
-          2.1 - File is compressed using Deflate64(tm)
-          2.5 - File is compressed using PKWARE DCL Implode 
-          2.7 - File is a patch data set 
-          4.5 - File uses ZIP64 format extensions
-          4.6 - File is compressed using BZIP2 compression*
-          5.0 - File is encrypted using DES
-          5.0 - File is encrypted using 3DES
-          5.0 - File is encrypted using original RC2 encryption
-          5.0 - File is encrypted using RC4 encryption
-          5.1 - File is encrypted using AES encryption
-          5.1 - File is encrypted using corrected RC2 encryption**
-          5.2 - File is encrypted using corrected RC2-64 encryption**
-          6.1 - File is encrypted using non-OAEP key wrapping***
-          6.2 - Central directory encryption
-          6.3 - File is compressed using LZMA
-          6.3 - File is compressed using PPMd+
-          6.3 - File is encrypted using Blowfish
-          6.3 - File is encrypted using Twofish
-
-
-          * Early 7.x (pre-7.2) versions of PKZIP incorrectly set the
-          version needed to extract for BZIP2 compression to be 50
-          when it should have been 46.
-
-          ** Refer to the section on Strong Encryption Specification
-          for additional information regarding RC2 corrections.
-
-          *** Certificate encryption using non-OAEP key wrapping is the
-          intended mode of operation for all versions beginning with 6.1.
-          Support for OAEP key wrapping should only be used for
-          backward compatibility when sending ZIP files to be opened by
-          versions of PKZIP older than 6.1 (5.0 or 6.0).
-
-          + Files compressed using PPMd should set the version
-          needed to extract field to 6.3, however, not all ZIP 
-          programs enforce this and may be unable to decompress 
-          data files compressed using PPMd if this value is set.
-
-          When using ZIP64 extensions, the corresponding value in the
-          zip64 end of central directory record should also be set.  
-          This field should be set appropriately to indicate whether 
-          Version 1 or Version 2 format is in use. 
-
-      general purpose bit flag: (2 bytes)
-
-          Bit 0: If set, indicates that the file is encrypted.
-
-          (For Method 6 - Imploding)
-          Bit 1: If the compression method used was type 6,
-                 Imploding, then this bit, if set, indicates
-                 an 8K sliding dictionary was used.  If clear,
-                 then a 4K sliding dictionary was used.
-          Bit 2: If the compression method used was type 6,
-                 Imploding, then this bit, if set, indicates
-                 3 Shannon-Fano trees were used to encode the
-                 sliding dictionary output.  If clear, then 2
-                 Shannon-Fano trees were used.
-
-          (For Methods 8 and 9 - Deflating)
-          Bit 2  Bit 1
-            0      0    Normal (-en) compression option was used.
-            0      1    Maximum (-exx/-ex) compression option was used.
-            1      0    Fast (-ef) compression option was used.
-            1      1    Super Fast (-es) compression option was used.
-
-          (For Method 14 - LZMA)
-          Bit 1: If the compression method used was type 14,
-                 LZMA, then this bit, if set, indicates
-                 an end-of-stream (EOS) marker is used to
-                 mark the end of the compressed data stream.
-                 If clear, then an EOS marker is not present
-                 and the compressed data size must be known
-                 to extract.
-
-          Note:  Bits 1 and 2 are undefined if the compression
-                 method is any other.
-
-          Bit 3: If this bit is set, the fields crc-32, compressed 
-                 size and uncompressed size are set to zero in the 
-                 local header.  The correct values are put in the 
-                 data descriptor immediately following the compressed
-                 data.  (Note: PKZIP version 2.04g for DOS only 
-                 recognizes this bit for method 8 compression, newer 
-                 versions of PKZIP recognize this bit for any 
-                 compression method.)
-
-          Bit 4: Reserved for use with method 8, for enhanced
-                 deflating. 
-
-          Bit 5: If this bit is set, this indicates that the file is 
-                 compressed patched data.  (Note: Requires PKZIP 
-                 version 2.70 or greater)
-
-          Bit 6: Strong encryption.  If this bit is set, you should
-                 set the version needed to extract value to at least
-                 50 and you must also set bit 0.  If AES encryption
-                 is used, the version needed to extract value must 
-                 be at least 51.
-
-          Bit 7: Currently unused.
-
-          Bit 8: Currently unused.
-
-          Bit 9: Currently unused.
-
-          Bit 10: Currently unused.
-
-          Bit 11: Language encoding flag (EFS).  If this bit is set,
-                  the filename and comment fields for this file
-                  must be encoded using UTF-8. (see APPENDIX D)
-
-          Bit 12: Reserved by PKWARE for enhanced compression.
-
-          Bit 13: Used when encrypting the Central Directory to indicate 
-                  selected data values in the Local Header are masked to
-                  hide their actual values.  See the section describing 
-                  the Strong Encryption Specification for details.
-
-          Bit 14: Reserved by PKWARE.
-
-          Bit 15: Reserved by PKWARE.
-
-      compression method: (2 bytes)
-
-          (see accompanying documentation for algorithm
-          descriptions)
-
-          0 - The file is stored (no compression)
-          1 - The file is Shrunk
-          2 - The file is Reduced with compression factor 1
-          3 - The file is Reduced with compression factor 2
-          4 - The file is Reduced with compression factor 3
-          5 - The file is Reduced with compression factor 4
-          6 - The file is Imploded
-          7 - Reserved for Tokenizing compression algorithm
-          8 - The file is Deflated
-          9 - Enhanced Deflating using Deflate64(tm)
-         10 - PKWARE Data Compression Library Imploding (old IBM TERSE)
-         11 - Reserved by PKWARE
-         12 - File is compressed using BZIP2 algorithm
-         13 - Reserved by PKWARE
-         14 - LZMA (EFS)
-         15 - Reserved by PKWARE
-         16 - Reserved by PKWARE
-         17 - Reserved by PKWARE
-         18 - File is compressed using IBM TERSE (new)
-         19 - IBM LZ77 z Architecture (PFS)
-         97 - WavPack compressed data
-         98 - PPMd version I, Rev 1
-
-      date and time fields: (2 bytes each)
-
-          The date and time are encoded in standard MS-DOS format.
-          If input came from standard input, the date and time are
-          those at which compression was started for this data. 
-          If encrypting the central directory and general purpose bit 
-          flag 13 is set indicating masking, the value stored in the 
-          Local Header will be zero. 
-
-      CRC-32: (4 bytes)
-
-          The CRC-32 algorithm was generously contributed by
-          David Schwaderer and can be found in his excellent
-          book "C Programmers Guide to NetBIOS" published by
-          Howard W. Sams & Co. Inc.  The 'magic number' for
-          the CRC is 0xdebb20e3.  The proper CRC pre and post
-          conditioning is used, meaning that the CRC register
-          is pre-conditioned with all ones (a starting value
-          of 0xffffffff) and the value is post-conditioned by
-          taking the one's complement of the CRC residual.
-          If bit 3 of the general purpose flag is set, this
-          field is set to zero in the local header and the correct
-          value is put in the data descriptor and in the central
-          directory. When encrypting the central directory, if the
-          local header is not in ZIP64 format and general purpose 
-          bit flag 13 is set indicating masking, the value stored 
-          in the Local Header will be zero. 
-
-      compressed size: (4 bytes)
-      uncompressed size: (4 bytes)
-
-          The size of the file compressed and uncompressed,
-          respectively.  When a decryption header is present it will
-          be placed in front of the file data and the value of the
-          compressed file size will include the bytes of the decryption
-          header.  If bit 3 of the general purpose bit flag is set, 
-          these fields are set to zero in the local header and the 
-          correct values are put in the data descriptor and
-          in the central directory.  If an archive is in ZIP64 format
-          and the value in this field is 0xFFFFFFFF, the size will be
-          in the corresponding 8 byte ZIP64 extended information 
-          extra field.  When encrypting the central directory, if the
-          local header is not in ZIP64 format and general purpose bit 
-          flag 13 is set indicating masking, the value stored for the 
-          uncompressed size in the Local Header will be zero. 
-
-      file name length: (2 bytes)
-      extra field length: (2 bytes)
-      file comment length: (2 bytes)
-
-          The length of the file name, extra field, and comment
-          fields respectively.  The combined length of any
-          directory record and these three fields should not
-          generally exceed 65,535 bytes.  If input came from standard
-          input, the file name length is set to zero.  
-
-      disk number start: (2 bytes)
-
-          The number of the disk on which this file begins.  If an 
-          archive is in ZIP64 format and the value in this field is 
-          0xFFFF, the size will be in the corresponding 4 byte zip64 
-          extended information extra field.
-
-      internal file attributes: (2 bytes)
-
-          Bits 1 and 2 are reserved for use by PKWARE.
-
-          The lowest bit of this field indicates, if set, that
-          the file is apparently an ASCII or text file.  If not
-          set, that the file apparently contains binary data.
-          The remaining bits are unused in version 1.0.
-
-          The 0x0002 bit of this field indicates, if set, that a 
-          4 byte variable record length control field precedes each 
-          logical record indicating the length of the record. The 
-          record length control field is stored in little-endian byte
-          order.  This flag is independent of text control characters, 
-          and if used in conjunction with text data, includes any 
-          control characters in the total length of the record. This 
-          value is provided for mainframe data transfer support.
-
-      external file attributes: (4 bytes)
-
-          The mapping of the external attributes is
-          host-system dependent (see 'version made by').  For
-          MS-DOS, the low order byte is the MS-DOS directory
-          attribute byte.  If input came from standard input, this
-          field is set to zero.
-
-      relative offset of local header: (4 bytes)
-
-          This is the offset from the start of the first disk on
-          which this file appears, to where the local header should
-          be found.  If an archive is in ZIP64 format and the value
-          in this field is 0xFFFFFFFF, the size will be in the 
-          corresponding 8 byte zip64 extended information extra field.
-
-      file name: (Variable)
-
-          The name of the file, with optional relative path.
-          The path stored should not contain a drive or
-          device letter, or a leading slash.  All slashes
-          should be forward slashes '/' as opposed to
-          backwards slashes '\' for compatibility with Amiga
-          and UNIX file systems etc.  If input came from standard
-          input, there is no file name field.  If encrypting
-          the central directory and general purpose bit flag 13 is set 
-          indicating masking, the file name stored in the Local Header 
-          will not be the actual file name.  A masking value consisting 
-          of a unique hexadecimal value will be stored.  This value will 
-          be sequentially incremented for each file in the archive. See
-          the section on the Strong Encryption Specification for details 
-          on retrieving the encrypted file name. 
-
-      extra field: (Variable)
-
-          This is for expansion.  If additional information
-          needs to be stored for special needs or for specific 
-          platforms, it should be stored here.  Earlier versions 
-          of the software can then safely skip this file, and 
-          find the next file or header.  This field will be 0 
-          length in version 1.0.
-
-          In order to allow different programs and different types
-          of information to be stored in the 'extra' field in .ZIP
-          files, the following structure should be used for all
-          programs storing data in this field:
-
-          header1+data1 + header2+data2 . . .
-
-          Each header should consist of:
-
-            Header ID - 2 bytes
-            Data Size - 2 bytes
-
-          Note: all fields stored in Intel low-byte/high-byte order.
-
-          The Header ID field indicates the type of data that is in
-          the following data block.
-
-          Header ID's of 0 thru 31 are reserved for use by PKWARE.
-          The remaining ID's can be used by third party vendors for
-          proprietary usage.
-
-          The current Header ID mappings defined by PKWARE are:
-
-          0x0001        Zip64 extended information extra field
-          0x0007        AV Info
-          0x0008        Reserved for extended language encoding data (PFS)
-                        (see APPENDIX D)
-          0x0009        OS/2
-          0x000a        NTFS 
-          0x000c        OpenVMS
-          0x000d        UNIX
-          0x000e        Reserved for file stream and fork descriptors
-          0x000f        Patch Descriptor
-          0x0014        PKCS#7 Store for X.509 Certificates
-          0x0015        X.509 Certificate ID and Signature for 
-                        individual file
-          0x0016        X.509 Certificate ID for Central Directory
-          0x0017        Strong Encryption Header
-          0x0018        Record Management Controls
-          0x0019        PKCS#7 Encryption Recipient Certificate List
-          0x0065        IBM S/390 (Z390), AS/400 (I400) attributes 
-                        - uncompressed
-          0x0066        Reserved for IBM S/390 (Z390), AS/400 (I400) 
-                        attributes - compressed
-          0x4690        POSZIP 4690 (reserved) 
-
-          Third party mappings commonly used are:
-
-
-          0x07c8        Macintosh
-          0x2605        ZipIt Macintosh
-          0x2705        ZipIt Macintosh 1.3.5+
-          0x2805        ZipIt Macintosh 1.3.5+
-          0x334d        Info-ZIP Macintosh
-          0x4341        Acorn/SparkFS 
-          0x4453        Windows NT security descriptor (binary ACL)
-          0x4704        VM/CMS
-          0x470f        MVS
-          0x4b46        FWKCS MD5 (see below)
-          0x4c41        OS/2 access control list (text ACL)
-          0x4d49        Info-ZIP OpenVMS
-          0x4f4c        Xceed original location extra field
-          0x5356        AOS/VS (ACL)
-          0x5455        extended timestamp
-          0x554e        Xceed unicode extra field
-          0x5855        Info-ZIP UNIX (original, also OS/2, NT, etc)
-          0x6375        Info-ZIP Unicode Comment Extra Field
-          0x6542        BeOS/BeBox
-          0x7075        Info-ZIP Unicode Path Extra Field
-          0x756e        ASi UNIX
-          0x7855        Info-ZIP UNIX (new)
-          0xa220        Microsoft Open Packaging Growth Hint
-          0xfd4a        SMS/QDOS
-
-          Detailed descriptions of Extra Fields defined by third 
-          party mappings will be documented as information on
-          these data structures is made available to PKWARE.  
-          PKWARE does not guarantee the accuracy of any published
-          third party data.
-
-          The Data Size field indicates the size of the following
-          data block. Programs can use this value to skip to the
-          next header block, passing over any data blocks that are
-          not of interest.
-
-          Note: As stated above, the size of the entire .ZIP file
-                header, including the file name, comment, and extra
-                field should not exceed 64K in size.
-
-          In case two different programs should appropriate the same
-          Header ID value, it is strongly recommended that each
-          program place a unique signature of at least two bytes in
-          size (and preferably 4 bytes or bigger) at the start of
-          each data area.  Every program should verify that its
-          unique signature is present, in addition to the Header ID
-          value being correct, before assuming that it is a block of
-          known type.
-
-         -Zip64 Extended Information Extra Field (0x0001):
-
-          The following is the layout of the zip64 extended 
-          information "extra" block. If one of the size or
-          offset fields in the Local or Central directory
-          record is too small to hold the required data,
-          a Zip64 extended information record is created.
-          The order of the fields in the zip64 extended 
-          information record is fixed, but the fields will
-          only appear if the corresponding Local or Central
-          directory record field is set to 0xFFFF or 0xFFFFFFFF.
-
-          Note: all fields stored in Intel low-byte/high-byte order.
-
-          Value      Size       Description
-          -----      ----       -----------
-  (ZIP64) 0x0001     2 bytes    Tag for this "extra" block type
-          Size       2 bytes    Size of this "extra" block
-          Original 
-          Size       8 bytes    Original uncompressed file size
-          Compressed
-          Size       8 bytes    Size of compressed data
-          Relative Header
-          Offset     8 bytes    Offset of local header record
-          Disk Start
-          Number     4 bytes    Number of the disk on which
-                                this file starts 
-
-          This entry in the Local header must include BOTH original
-          and compressed file size fields. If encrypting the 
-          central directory and bit 13 of the general purpose bit
-          flag is set indicating masking, the value stored in the
-          Local Header for the original file size will be zero.
-
-
-         -OS/2 Extra Field (0x0009):
-
-          The following is the layout of the OS/2 attributes "extra" 
-          block.  (Last Revision  09/05/95)
-
-          Note: all fields stored in Intel low-byte/high-byte order.
-
-          Value       Size          Description
-          -----       ----          -----------
-  (OS/2)  0x0009      2 bytes       Tag for this "extra" block type
-          TSize       2 bytes       Size for the following data block
-          BSize       4 bytes       Uncompressed Block Size
-          CType       2 bytes       Compression type
-          EACRC       4 bytes       CRC value for uncompress block
-          (var)       variable      Compressed block
-
-          The OS/2 extended attribute structure (FEA2LIST) is 
-          compressed and then stored in it's entirety within this 
-          structure.  There will only ever be one "block" of data in 
-          VarFields[].
-
-         -NTFS Extra Field (0x000a):
-
-          The following is the layout of the NTFS attributes 
-          "extra" block. (Note: At this time the Mtime, Atime
-          and Ctime values may be used on any WIN32 system.)  
-
-          Note: all fields stored in Intel low-byte/high-byte order.
-
-          Value      Size       Description
-          -----      ----       -----------
-  (NTFS)  0x000a     2 bytes    Tag for this "extra" block type
-          TSize      2 bytes    Size of the total "extra" block
-          Reserved   4 bytes    Reserved for future use
-          Tag1       2 bytes    NTFS attribute tag value #1
-          Size1      2 bytes    Size of attribute #1, in bytes
-          (var.)     Size1      Attribute #1 data
-          .
-          .
-          .
-          TagN       2 bytes    NTFS attribute tag value #N
-          SizeN      2 bytes    Size of attribute #N, in bytes
-          (var.)     SizeN      Attribute #N data
-
-          For NTFS, values for Tag1 through TagN are as follows:
-          (currently only one set of attributes is defined for NTFS)
-
-          Tag        Size       Description
-          -----      ----       -----------
-          0x0001     2 bytes    Tag for attribute #1 
-          Size1      2 bytes    Size of attribute #1, in bytes
-          Mtime      8 bytes    File last modification time
-          Atime      8 bytes    File last access time
-          Ctime      8 bytes    File creation time
-
-         -OpenVMS Extra Field (0x000c):
-
-          The following is the layout of the OpenVMS attributes 
-          "extra" block.
-
-          Note: all fields stored in Intel low-byte/high-byte order.
-
-          Value      Size       Description
-          -----      ----       -----------
-  (VMS)   0x000c     2 bytes    Tag for this "extra" block type
-          TSize      2 bytes    Size of the total "extra" block
-          CRC        4 bytes    32-bit CRC for remainder of the block
-          Tag1       2 bytes    OpenVMS attribute tag value #1
-          Size1      2 bytes    Size of attribute #1, in bytes
-          (var.)     Size1      Attribute #1 data
-          .
-          .
-          .
-          TagN       2 bytes    OpenVMS attribute tag value #N
-          SizeN      2 bytes    Size of attribute #N, in bytes
-          (var.)     SizeN      Attribute #N data
-
-          Rules:
-
-          1. There will be one or more of attributes present, which 
-             will each be preceded by the above TagX & SizeX values.  
-             These values are identical to the ATR$C_XXXX and 
-             ATR$S_XXXX constants which are defined in ATR.H under 
-             OpenVMS C.  Neither of these values will ever be zero.
-
-          2. No word alignment or padding is performed.
-
-          3. A well-behaved PKZIP/OpenVMS program should never produce
-             more than one sub-block with the same TagX value.  Also,
-             there will never be more than one "extra" block of type
-             0x000c in a particular directory record.
-
-         -UNIX Extra Field (0x000d):
-
-          The following is the layout of the UNIX "extra" block.
-          Note: all fields are stored in Intel low-byte/high-byte 
-          order.
-
-          Value       Size          Description
-          -----       ----          -----------
-  (UNIX)  0x000d      2 bytes       Tag for this "extra" block type
-          TSize       2 bytes       Size for the following data block
-          Atime       4 bytes       File last access time
-          Mtime       4 bytes       File last modification time
-          Uid         2 bytes       File user ID
-          Gid         2 bytes       File group ID
-          (var)       variable      Variable length data field
-
-          The variable length data field will contain file type 
-          specific data.  Currently the only values allowed are
-          the original "linked to" file names for hard or symbolic 
-          links, and the major and minor device node numbers for
-          character and block device nodes.  Since device nodes
-          cannot be either symbolic or hard links, only one set of
-          variable length data is stored.  Link files will have the
-          name of the original file stored.  This name is NOT NULL
-          terminated.  Its size can be determined by checking TSize -
-          12.  Device entries will have eight bytes stored as two 4
-          byte entries (in little endian format).  The first entry
-          will be the major device number, and the second the minor
-          device number.
-          
-         -PATCH Descriptor Extra Field (0x000f):
-
-          The following is the layout of the Patch Descriptor "extra"
-          block.
-
-          Note: all fields stored in Intel low-byte/high-byte order.
-
-          Value     Size     Description
-          -----     ----     -----------
-  (Patch) 0x000f    2 bytes  Tag for this "extra" block type
-          TSize     2 bytes  Size of the total "extra" block
-          Version   2 bytes  Version of the descriptor
-          Flags     4 bytes  Actions and reactions (see below) 
-          OldSize   4 bytes  Size of the file about to be patched 
-          OldCRC    4 bytes  32-bit CRC of the file to be patched 
-          NewSize   4 bytes  Size of the resulting file 
-          NewCRC    4 bytes  32-bit CRC of the resulting file 
-
-          Actions and reactions
-
-          Bits          Description
-          ----          ----------------
-          0             Use for auto detection
-          1             Treat as a self-patch
-          2-3           RESERVED
-          4-5           Action (see below)
-          6-7           RESERVED
-          8-9           Reaction (see below) to absent file 
-          10-11         Reaction (see below) to newer file
-          12-13         Reaction (see below) to unknown file
-          14-15         RESERVED
-          16-31         RESERVED
-
-          Actions
-
-          Action       Value
-          ------       ----- 
-          none         0
-          add          1
-          delete       2
-          patch        3
-
-          Reactions
- 
-          Reaction     Value
-          --------     -----
-          ask          0
-          skip         1
-          ignore       2
-          fail         3
-
-          Patch support is provided by PKPatchMaker(tm) technology and is 
-          covered under U.S. Patents and Patents Pending. The use or 
-          implementation in a product of certain technological aspects set
-          forth in the current APPNOTE, including those with regard to 
-          strong encryption, patching, or extended tape operations requires
-          a license from PKWARE.  Please contact PKWARE with regard to 
-          acquiring a license. 
-
-         -PKCS#7 Store for X.509 Certificates (0x0014):
-
-          This field contains information about each of the certificates 
-          files may be signed with. When the Central Directory Encryption 
-          feature is enabled for a ZIP file, this record will appear in 
-          the Archive Extra Data Record, otherwise it will appear in the 
-          first central directory record and will be ignored in any 
-          other record.
-          
-          Note: all fields stored in Intel low-byte/high-byte order.
-
-          Value     Size     Description
-          -----     ----     -----------
-  (Store) 0x0014    2 bytes  Tag for this "extra" block type
-          TSize     2 bytes  Size of the store data
-          TData     TSize    Data about the store
-
-
-         -X.509 Certificate ID and Signature for individual file (0x0015):
-
-          This field contains the information about which certificate in 
-          the PKCS#7 store was used to sign a particular file. It also 
-          contains the signature data. This field can appear multiple 
-          times, but can only appear once per certificate.
-
-          Note: all fields stored in Intel low-byte/high-byte order.
-
-          Value     Size     Description
-          -----     ----     -----------
-  (CID)   0x0015    2 bytes  Tag for this "extra" block type
-          TSize     2 bytes  Size of data that follows
-          TData     TSize    Signature Data
-
-         -X.509 Certificate ID and Signature for central directory (0x0016):
-
-          This field contains the information about which certificate in 
-          the PKCS#7 store was used to sign the central directory structure.
-          When the Central Directory Encryption feature is enabled for a 
-          ZIP file, this record will appear in the Archive Extra Data Record, 
-          otherwise it will appear in the first central directory record.
-
-          Note: all fields stored in Intel low-byte/high-byte order.
-
-          Value     Size     Description
-          -----     ----     -----------
-  (CDID)  0x0016    2 bytes  Tag for this "extra" block type
-          TSize     2 bytes  Size of data that follows
-          TData     TSize    Data
-
-         -Strong Encryption Header (0x0017):
-
-          Value     Size     Description
-          -----     ----     -----------
-          0x0017    2 bytes  Tag for this "extra" block type
-          TSize     2 bytes  Size of data that follows
-          Format    2 bytes  Format definition for this record
-          AlgID     2 bytes  Encryption algorithm identifier
-          Bitlen    2 bytes  Bit length of encryption key
-          Flags     2 bytes  Processing flags
-          CertData  TSize-8  Certificate decryption extra field data
-                             (refer to the explanation for CertData
-                              in the section describing the 
-                              Certificate Processing Method under 
-                              the Strong Encryption Specification)
-
-
-         -Record Management Controls (0x0018):
-
-          Value     Size     Description
-          -----     ----     -----------
-(Rec-CTL) 0x0018    2 bytes  Tag for this "extra" block type
-          CSize     2 bytes  Size of total extra block data
-          Tag1      2 bytes  Record control attribute 1
-          Size1     2 bytes  Size of attribute 1, in bytes
-          Data1     Size1    Attribute 1 data
-            .
-            .
-            .
-          TagN      2 bytes  Record control attribute N
-          SizeN     2 bytes  Size of attribute N, in bytes
-          DataN     SizeN    Attribute N data
-
-
-         -PKCS#7 Encryption Recipient Certificate List (0x0019): 
-
-          This field contains information about each of the certificates
-          used in encryption processing and it can be used to identify who is
-          allowed to decrypt encrypted files.  This field should only appear 
-          in the archive extra data record. This field is not required and 
-          serves only to aide archive modifications by preserving public 
-          encryption key data. Individual security requirements may dictate 
-          that this data be omitted to deter information exposure.
-
-          Note: all fields stored in Intel low-byte/high-byte order.
-
-          Value     Size     Description
-          -----     ----     -----------
- (CStore) 0x0019    2 bytes  Tag for this "extra" block type
-          TSize     2 bytes  Size of the store data
-          TData     TSize    Data about the store
-
-          TData:
-
-          Value     Size     Description
-          -----     ----     -----------
-          Version   2 bytes  Format version number - must 0x0001 at this time
-          CStore    (var)    PKCS#7 data blob
-
-
-         -MVS Extra Field (0x0065):
-
-          The following is the layout of the MVS "extra" block.
-          Note: Some fields are stored in Big Endian format.
-          All text is in EBCDIC format unless otherwise specified.
-
-          Value       Size          Description
-          -----       ----          -----------
-  (MVS)   0x0065      2 bytes       Tag for this "extra" block type
-          TSize       2 bytes       Size for the following data block
-          ID          4 bytes       EBCDIC "Z390" 0xE9F3F9F0 or
-                                    "T4MV" for TargetFour
-          (var)       TSize-4       Attribute data (see APPENDIX B)
-
-
-         -OS/400 Extra Field (0x0065):
-
-          The following is the layout of the OS/400 "extra" block.
-          Note: Some fields are stored in Big Endian format.
-          All text is in EBCDIC format unless otherwise specified.
-
-          Value       Size          Description
-          -----       ----          -----------
-  (OS400) 0x0065      2 bytes       Tag for this "extra" block type
-          TSize       2 bytes       Size for the following data block
-          ID          4 bytes       EBCDIC "I400" 0xC9F4F0F0 or
-                                    "T4MV" for TargetFour
-          (var)       TSize-4       Attribute data (see APPENDIX A)
-
-
-          Third-party Mappings:
-          
-         -ZipIt Macintosh Extra Field (long) (0x2605):
-
-          The following is the layout of the ZipIt extra block 
-          for Macintosh. The local-header and central-header versions 
-          are identical. This block must be present if the file is 
-          stored MacBinary-encoded and it should not be used if the file 
-          is not stored MacBinary-encoded.
-
-          Value         Size        Description
-          -----         ----        -----------
-  (Mac2)  0x2605        Short       tag for this extra block type
-          TSize         Short       total data size for this block
-          "ZPIT"        beLong      extra-field signature
-          FnLen         Byte        length of FileName
-          FileName      variable    full Macintosh filename
-          FileType      Byte[4]     four-byte Mac file type string
-          Creator       Byte[4]     four-byte Mac creator string
-
-
-         -ZipIt Macintosh Extra Field (short, for files) (0x2705):
-
-          The following is the layout of a shortened variant of the
-          ZipIt extra block for Macintosh (without "full name" entry).
-          This variant is used by ZipIt 1.3.5 and newer for entries of
-          files (not directories) that do not have a MacBinary encoded
-          file. The local-header and central-header versions are identical.
-
-          Value         Size        Description
-          -----         ----        -----------
-  (Mac2b) 0x2705        Short       tag for this extra block type
-          TSize         Short       total data size for this block (12)
-          "ZPIT"        beLong      extra-field signature
-          FileType      Byte[4]     four-byte Mac file type string
-          Creator       Byte[4]     four-byte Mac creator string
-          fdFlags       beShort     attributes from FInfo.frFlags,
-                                    may be omitted
-          0x0000        beShort     reserved, may be omitted
-
-
-         -ZipIt Macintosh Extra Field (short, for directories) (0x2805):
-
-          The following is the layout of a shortened variant of the
-          ZipIt extra block for Macintosh used only for directory
-          entries. This variant is used by ZipIt 1.3.5 and newer to 
-          save some optional Mac-specific information about directories.
-          The local-header and central-header versions are identical.
-
-          Value         Size        Description
-          -----         ----        -----------
-  (Mac2c) 0x2805        Short       tag for this extra block type
-          TSize         Short       total data size for this block (12)
-          "ZPIT"        beLong      extra-field signature
-          frFlags       beShort     attributes from DInfo.frFlags, may
-                                    be omitted
-          View          beShort     ZipIt view flag, may be omitted
-
-
-          The View field specifies ZipIt-internal settings as follows:
-
-          Bits of the Flags:
-              bit 0           if set, the folder is shown expanded (open)
-                              when the archive contents are viewed in ZipIt.
-              bits 1-15       reserved, zero;
-
-
-         -FWKCS MD5 Extra Field (0x4b46):
-
-          The FWKCS Contents_Signature System, used in
-          automatically identifying files independent of file name,
-          optionally adds and uses an extra field to support the
-          rapid creation of an enhanced contents_signature:
-
-              Header ID = 0x4b46
-              Data Size = 0x0013
-              Preface   = 'M','D','5'
-              followed by 16 bytes containing the uncompressed file's
-              128_bit MD5 hash(1), low byte first.
-
-          When FWKCS revises a .ZIP file central directory to add
-          this extra field for a file, it also replaces the
-          central directory entry for that file's uncompressed
-          file length with a measured value.
-
-          FWKCS provides an option to strip this extra field, if
-          present, from a .ZIP file central directory. In adding
-          this extra field, FWKCS preserves .ZIP file Authenticity
-          Verification; if stripping this extra field, FWKCS
-          preserves all versions of AV through PKZIP version 2.04g.
-
-          FWKCS, and FWKCS Contents_Signature System, are
-          trademarks of Frederick W. Kantor.
-
-          (1) R. Rivest, RFC1321.TXT, MIT Laboratory for Computer
-              Science and RSA Data Security, Inc., April 1992.
-              ll.76-77: "The MD5 algorithm is being placed in the
-              public domain for review and possible adoption as a
-              standard."
-
-
-         -Info-ZIP Unicode Comment Extra Field (0x6375):
-
-          Stores the UTF-8 version of the file comment as stored in the
-          central directory header. (Last Revision 20070912)
-
-          Value         Size        Description
-          -----         ----        -----------
-   (UCom) 0x6375        Short       tag for this extra block type ("uc")
-          TSize         Short       total data size for this block
-          Version       1 byte      version of this extra field, currently 1
-          ComCRC32      4 bytes     Comment Field CRC32 Checksum
-          UnicodeCom    Variable    UTF-8 version of the entry comment
-
-          Currently Version is set to the number 1.  If there is a need
-          to change this field, the version will be incremented.  Changes
-          may not be backward compatible so this extra field should not be
-          used if the version is not recognized.
-
-          The ComCRC32 is the standard zip CRC32 checksum of the File Comment
-          field in the central directory header.  This is used to verify that
-          the comment field has not changed since the Unicode Comment extra field
-          was created.  This can happen if a utility changes the File Comment 
-          field but does not update the UTF-8 Comment extra field.  If the CRC 
-          check fails, this Unicode Comment extra field should be ignored and 
-          the File Comment field in the header should be used instead.
-
-          The UnicodeCom field is the UTF-8 version of the File Comment field
-          in the header.  As UnicodeCom is defined to be UTF-8, no UTF-8 byte
-          order mark (BOM) is used.  The length of this field is determined by
-          subtracting the size of the previous fields from TSize.  If both the
-          File Name and Comment fields are UTF-8, the new General Purpose Bit
-          Flag, bit 11 (Language encoding flag (EFS)), can be used to indicate
-          both the header File Name and Comment fields are UTF-8 and, in this
-          case, the Unicode Path and Unicode Comment extra fields are not
-          needed and should not be created.  Note that, for backward
-          compatibility, bit 11 should only be used if the native character set
-          of the paths and comments being zipped up are already in UTF-8. It is
-          expected that the same file comment storage method, either general
-          purpose bit 11 or extra fields, be used in both the Local and Central
-          Directory Header for a file.
-
-
-         -Info-ZIP Unicode Path Extra Field (0x7075):
-
-          Stores the UTF-8 version of the file name field as stored in the
-          local header and central directory header. (Last Revision 20070912)
-
-          Value         Size        Description
-          -----         ----        -----------
-  (UPath) 0x7075        Short       tag for this extra block type ("up")
-          TSize         Short       total data size for this block
-          Version       1 byte      version of this extra field, currently 1
-          NameCRC32     4 bytes     File Name Field CRC32 Checksum
-          UnicodeName   Variable    UTF-8 version of the entry File Name
-
-          Currently Version is set to the number 1.  If there is a need
-          to change this field, the version will be incremented.  Changes
-          may not be backward compatible so this extra field should not be
-          used if the version is not recognized.
-
-          The NameCRC32 is the standard zip CRC32 checksum of the File Name
-          field in the header.  This is used to verify that the header
-          File Name field has not changed since the Unicode Path extra field
-          was created.  This can happen if a utility renames the File Name but
-          does not update the UTF-8 path extra field.  If the CRC check fails,
-          this UTF-8 Path Extra Field should be ignored and the File Name field
-          in the header should be used instead.
-
-          The UnicodeName is the UTF-8 version of the contents of the File Name
-          field in the header.  As UnicodeName is defined to be UTF-8, no UTF-8
-          byte order mark (BOM) is used.  The length of this field is determined
-          by subtracting the size of the previous fields from TSize.  If both
-          the File Name and Comment fields are UTF-8, the new General Purpose
-          Bit Flag, bit 11 (Language encoding flag (EFS)), can be used to
-          indicate that both the header File Name and Comment fields are UTF-8
-          and, in this case, the Unicode Path and Unicode Comment extra fields
-          are not needed and should not be created.  Note that, for backward
-          compatibility, bit 11 should only be used if the native character set
-          of the paths and comments being zipped up are already in UTF-8. It is
-          expected that the same file name storage method, either general
-          purpose bit 11 or extra fields, be used in both the Local and Central
-          Directory Header for a file.
- 
-
-        -Microsoft Open Packaging Growth Hint (0xa220):
-
-          Value         Size        Description
-          -----         ----        -----------
-          0xa220        Short       tag for this extra block type
-          TSize         Short       size of Sig + PadVal + Padding
-          Sig           Short       verification signature (A028)
-          PadVal        Short       Initial padding value
-          Padding       variable    filled with NULL characters
-
-
-      file comment: (Variable)
-
-          The comment for this file.
-
-      number of this disk: (2 bytes)
-
-          The number of this disk, which contains central
-          directory end record. If an archive is in ZIP64 format
-          and the value in this field is 0xFFFF, the size will 
-          be in the corresponding 4 byte zip64 end of central 
-          directory field.
-
-
-      number of the disk with the start of the central
-      directory: (2 bytes)
-
-          The number of the disk on which the central
-          directory starts. If an archive is in ZIP64 format
-          and the value in this field is 0xFFFF, the size will 
-          be in the corresponding 4 byte zip64 end of central 
-          directory field.
-
-      total number of entries in the central dir on 
-      this disk: (2 bytes)
-
-          The number of central directory entries on this disk.
-          If an archive is in ZIP64 format and the value in 
-          this field is 0xFFFF, the size will be in the 
-          corresponding 8 byte zip64 end of central 
-          directory field.
-
-      total number of entries in the central dir: (2 bytes)
-
-          The total number of files in the .ZIP file. If an 
-          archive is in ZIP64 format and the value in this field
-          is 0xFFFF, the size will be in the corresponding 8 byte 
-          zip64 end of central directory field.
-
-      size of the central directory: (4 bytes)
-
-          The size (in bytes) of the entire central directory.
-          If an archive is in ZIP64 format and the value in 
-          this field is 0xFFFFFFFF, the size will be in the 
-          corresponding 8 byte zip64 end of central 
-          directory field.
-
-      offset of start of central directory with respect to
-      the starting disk number:  (4 bytes)
-
-          Offset of the start of the central directory on the
-          disk on which the central directory starts. If an 
-          archive is in ZIP64 format and the value in this 
-          field is 0xFFFFFFFF, the size will be in the 
-          corresponding 8 byte zip64 end of central 
-          directory field.
-
-      .ZIP file comment length: (2 bytes)
-
-          The length of the comment for this .ZIP file.
-
-      .ZIP file comment: (Variable)
-
-          The comment for this .ZIP file.  ZIP file comment data
-          is stored unsecured.  No encryption or data authentication
-          is applied to this area at this time.  Confidential information
-          should not be stored in this section.
-
-      zip64 extensible data sector    (variable size)
-
-          (currently reserved for use by PKWARE)
-
-
-  K.  Splitting and Spanning ZIP files
-
-          Spanning is the process of segmenting a ZIP file across 
-          multiple removable media. This support has typically only 
-          been provided for DOS formatted floppy diskettes. 
-
-          File splitting is a newer derivative of spanning.  
-          Splitting follows the same segmentation process as
-          spanning, however, it does not require writing each
-          segment to a unique removable medium and instead supports
-          placing all pieces onto local or non-removable locations
-          such as file systems, local drives, folders, etc...
-
-          A key difference between spanned and split ZIP files is
-          that all pieces of a spanned ZIP file have the same name.  
-          Since each piece is written to a separate volume, no name 
-          collisions occur and each segment can reuse the original 
-          .ZIP file name given to the archive.
-
-          Sequence ordering for DOS spanned archives uses the DOS 
-          volume label to determine segment numbers.  Volume labels
-          for each segment are written using the form PKBACK#xxx, 
-          where xxx is the segment number written as a decimal 
-          value from 001 - nnn.
-
-          Split ZIP files are typically written to the same location
-          and are subject to name collisions if the spanned name
-          format is used since each segment will reside on the same 
-          drive. To avoid name collisions, split archives are named 
-          as follows.
-
-          Segment 1   = filename.z01
-          Segment n-1 = filename.z(n-1)
-          Segment n   = filename.zip
-
-          The .ZIP extension is used on the last segment to support
-          quickly reading the central directory.  The segment number
-          n should be a decimal value.
-
-          Spanned ZIP files may be PKSFX Self-extracting ZIP files.
-          PKSFX files may also be split, however, in this case
-          the first segment must be named filename.exe.  The first
-          segment of a split PKSFX archive must be large enough to
-          include the entire executable program.
-
-          Capacities for split archives are as follows.
-
-          Maximum number of segments = 4,294,967,295 - 1
-          Maximum .ZIP segment size = 4,294,967,295 bytes
-          Minimum segment size = 64K
-          Maximum PKSFX segment size = 2,147,483,647 bytes
-          
-          Segment sizes may be different however by convention, all 
-          segment sizes should be the same with the exception of the 
-          last, which may be smaller.  Local and central directory 
-          header records must never be split across a segment boundary. 
-          When writing a header record, if the number of bytes remaining 
-          within a segment is less than the size of the header record,
-          end the current segment and write the header at the start
-          of the next segment.  The central directory may span segment
-          boundaries, but no single record in the central directory
-          should be split across segments.
-
-          Spanned/Split archives created using PKZIP for Windows
-          (V2.50 or greater), PKZIP Command Line (V2.50 or greater),
-          or PKZIP Explorer will include a special spanning 
-          signature as the first 4 bytes of the first segment of
-          the archive.  This signature (0x08074b50) will be 
-          followed immediately by the local header signature for
-          the first file in the archive.  
-
-          A special spanning marker may also appear in spanned/split 
-          archives if the spanning or splitting process starts but 
-          only requires one segment.  In this case the 0x08074b50 
-          signature will be replaced with the temporary spanning 
-          marker signature of 0x30304b50.  Split archives can
-          only be uncompressed by other versions of PKZIP that
-          know how to create a split archive.
-
-          The signature value 0x08074b50 is also used by some
-          ZIP implementations as a marker for the Data Descriptor 
-          record.  Conflict in this alternate assignment can be
-          avoided by ensuring the position of the signature
-          within the ZIP file to determine the use for which it
-          is intended.  
-
-  L.  General notes:
-
-      1)  All fields unless otherwise noted are unsigned and stored
-          in Intel low-byte:high-byte, low-word:high-word order.
-
-      2)  String fields are not null terminated, since the
-          length is given explicitly.
-
-      3)  The entries in the central directory may not necessarily
-          be in the same order that files appear in the .ZIP file.
-
-      4)  If one of the fields in the end of central directory
-          record is too small to hold required data, the field
-          should be set to -1 (0xFFFF or 0xFFFFFFFF) and the
-          ZIP64 format record should be created.
-
-      5)  The end of central directory record and the
-          Zip64 end of central directory locator record must
-          reside on the same disk when splitting or spanning
-          an archive.
-
-VI. Explanation of compression methods
---------------------------------------
-
-UnShrinking - Method 1
-----------------------
-
-Shrinking is a Dynamic Ziv-Lempel-Welch compression algorithm
-with partial clearing.  The initial code size is 9 bits, and
-the maximum code size is 13 bits.  Shrinking differs from
-conventional Dynamic Ziv-Lempel-Welch implementations in several
-respects:
-
-1)  The code size is controlled by the compressor, and is not
-    automatically increased when codes larger than the current
-    code size are created (but not necessarily used).  When
-    the decompressor encounters the code sequence 256
-    (decimal) followed by 1, it should increase the code size
-    read from the input stream to the next bit size.  No
-    blocking of the codes is performed, so the next code at
-    the increased size should be read from the input stream
-    immediately after where the previous code at the smaller
-    bit size was read.  Again, the decompressor should not
-    increase the code size used until the sequence 256,1 is
-    encountered.
-
-2)  When the table becomes full, total clearing is not
-    performed.  Rather, when the compressor emits the code
-    sequence 256,2 (decimal), the decompressor should clear
-    all leaf nodes from the Ziv-Lempel tree, and continue to
-    use the current code size.  The nodes that are cleared
-    from the Ziv-Lempel tree are then re-used, with the lowest
-    code value re-used first, and the highest code value
-    re-used last.  The compressor can emit the sequence 256,2
-    at any time.
-
-Expanding - Methods 2-5
------------------------
-
-The Reducing algorithm is actually a combination of two
-distinct algorithms.  The first algorithm compresses repeated
-byte sequences, and the second algorithm takes the compressed
-stream from the first algorithm and applies a probabilistic
-compression method.
-
-The probabilistic compression stores an array of 'follower
-sets' S(j), for j=0 to 255, corresponding to each possible
-ASCII character.  Each set contains between 0 and 32
-characters, to be denoted as S(j)[0],...,S(j)[m], where m<32.
-The sets are stored at the beginning of the data area for a
-Reduced file, in reverse order, with S(255) first, and S(0)
-last.
-
-The sets are encoded as { N(j), S(j)[0],...,S(j)[N(j)-1] },
-where N(j) is the size of set S(j).  N(j) can be 0, in which
-case the follower set for S(j) is empty.  Each N(j) value is
-encoded in 6 bits, followed by N(j) eight bit character values
-corresponding to S(j)[0] to S(j)[N(j)-1] respectively.  If
-N(j) is 0, then no values for S(j) are stored, and the value
-for N(j-1) immediately follows.
-
-Immediately after the follower sets, is the compressed data
-stream.  The compressed data stream can be interpreted for the
-probabilistic decompression as follows:
-
-let Last-Character <- 0.
-loop until done
-    if the follower set S(Last-Character) is empty then
-        read 8 bits from the input stream, and copy this
-        value to the output stream.
-    otherwise if the follower set S(Last-Character) is non-empty then
-        read 1 bit from the input stream.
-        if this bit is not zero then
-            read 8 bits from the input stream, and copy this
-            value to the output stream.
-        otherwise if this bit is zero then
-            read B(N(Last-Character)) bits from the input
-            stream, and assign this value to I.
-            Copy the value of S(Last-Character)[I] to the
-            output stream.
-
-    assign the last value placed on the output stream to
-    Last-Character.
-end loop
-
-B(N(j)) is defined as the minimal number of bits required to
-encode the value N(j)-1.
-
-The decompressed stream from above can then be expanded to
-re-create the original file as follows:
-
-let State <- 0.
-
-loop until done
-    read 8 bits from the input stream into C.
-    case State of
-        0:  if C is not equal to DLE (144 decimal) then
-                copy C to the output stream.
-            otherwise if C is equal to DLE then
-                let State <- 1.
-
-        1:  if C is non-zero then
-                let V <- C.
-                let Len <- L(V)
-                let State <- F(Len).
-            otherwise if C is zero then
-                copy the value 144 (decimal) to the output stream.
-                let State <- 0
-
-        2:  let Len <- Len + C
-            let State <- 3.
-
-        3:  move backwards D(V,C) bytes in the output stream
-            (if this position is before the start of the output
-            stream, then assume that all the data before the
-            start of the output stream is filled with zeros).
-            copy Len+3 bytes from this position to the output stream.
-            let State <- 0.
-    end case
-end loop
-
-The functions F,L, and D are dependent on the 'compression
-factor', 1 through 4, and are defined as follows:
-
-For compression factor 1:
-    L(X) equals the lower 7 bits of X.
-    F(X) equals 2 if X equals 127 otherwise F(X) equals 3.
-    D(X,Y) equals the (upper 1 bit of X) * 256 + Y + 1.
-For compression factor 2:
-    L(X) equals the lower 6 bits of X.
-    F(X) equals 2 if X equals 63 otherwise F(X) equals 3.
-    D(X,Y) equals the (upper 2 bits of X) * 256 + Y + 1.
-For compression factor 3:
-    L(X) equals the lower 5 bits of X.
-    F(X) equals 2 if X equals 31 otherwise F(X) equals 3.
-    D(X,Y) equals the (upper 3 bits of X) * 256 + Y + 1.
-For compression factor 4:
-    L(X) equals the lower 4 bits of X.
-    F(X) equals 2 if X equals 15 otherwise F(X) equals 3.
-    D(X,Y) equals the (upper 4 bits of X) * 256 + Y + 1.
-
-Imploding - Method 6
---------------------
-
-The Imploding algorithm is actually a combination of two distinct
-algorithms.  The first algorithm compresses repeated byte
-sequences using a sliding dictionary.  The second algorithm is
-used to compress the encoding of the sliding dictionary output,
-using multiple Shannon-Fano trees.
-
-The Imploding algorithm can use a 4K or 8K sliding dictionary
-size. The dictionary size used can be determined by bit 1 in the
-general purpose flag word; a 0 bit indicates a 4K dictionary
-while a 1 bit indicates an 8K dictionary.
-
-The Shannon-Fano trees are stored at the start of the compressed
-file. The number of trees stored is defined by bit 2 in the
-general purpose flag word; a 0 bit indicates two trees stored, a
-1 bit indicates three trees are stored.  If 3 trees are stored,
-the first Shannon-Fano tree represents the encoding of the
-Literal characters, the second tree represents the encoding of
-the Length information, the third represents the encoding of the
-Distance information.  When 2 Shannon-Fano trees are stored, the
-Length tree is stored first, followed by the Distance tree.
-
-The Literal Shannon-Fano tree, if present is used to represent
-the entire ASCII character set, and contains 256 values.  This
-tree is used to compress any data not compressed by the sliding
-dictionary algorithm.  When this tree is present, the Minimum
-Match Length for the sliding dictionary is 3.  If this tree is
-not present, the Minimum Match Length is 2.
-
-The Length Shannon-Fano tree is used to compress the Length part
-of the (length,distance) pairs from the sliding dictionary
-output.  The Length tree contains 64 values, ranging from the
-Minimum Match Length, to 63 plus the Minimum Match Length.
-
-The Distance Shannon-Fano tree is used to compress the Distance
-part of the (length,distance) pairs from the sliding dictionary
-output. The Distance tree contains 64 values, ranging from 0 to
-63, representing the upper 6 bits of the distance value.  The
-distance values themselves will be between 0 and the sliding
-dictionary size, either 4K or 8K.
-
-The Shannon-Fano trees themselves are stored in a compressed
-format. The first byte of the tree data represents the number of
-bytes of data representing the (compressed) Shannon-Fano tree
-minus 1.  The remaining bytes represent the Shannon-Fano tree
-data encoded as:
-
-    High 4 bits: Number of values at this bit length + 1. (1 - 16)
-    Low  4 bits: Bit Length needed to represent value + 1. (1 - 16)
-
-The Shannon-Fano codes can be constructed from the bit lengths
-using the following algorithm:
-
-1)  Sort the Bit Lengths in ascending order, while retaining the
-    order of the original lengths stored in the file.
-
-2)  Generate the Shannon-Fano trees:
-
-    Code <- 0
-    CodeIncrement <- 0
-    LastBitLength <- 0
-    i <- number of Shannon-Fano codes - 1   (either 255 or 63)
-
-    loop while i >= 0
-        Code = Code + CodeIncrement
-        if BitLength(i) <> LastBitLength then
-            LastBitLength=BitLength(i)
-            CodeIncrement = 1 shifted left (16 - LastBitLength)
-        ShannonCode(i) = Code
-        i <- i - 1
-    end loop
-
-3)  Reverse the order of all the bits in the above ShannonCode()
-    vector, so that the most significant bit becomes the least
-    significant bit.  For example, the value 0x1234 (hex) would
-    become 0x2C48 (hex).
-
-4)  Restore the order of Shannon-Fano codes as originally stored
-    within the file.
-
-Example:
-
-    This example will show the encoding of a Shannon-Fano tree
-    of size 8.  Notice that the actual Shannon-Fano trees used
-    for Imploding are either 64 or 256 entries in size.
-
-Example:   0x02, 0x42, 0x01, 0x13
-
-    The first byte indicates 3 values in this table.  Decoding the
-    bytes:
-            0x42 = 5 codes of 3 bits long
-            0x01 = 1 code  of 2 bits long
-            0x13 = 2 codes of 4 bits long
-
-    This would generate the original bit length array of:
-    (3, 3, 3, 3, 3, 2, 4, 4)
-
-    There are 8 codes in this table for the values 0 thru 7.  Using 
-    the algorithm to obtain the Shannon-Fano codes produces:
-
-                                  Reversed     Order     Original
-Val  Sorted   Constructed Code      Value     Restored    Length
----  ------   -----------------   --------    --------    ------
-0:     2      1100000000000000        11       101          3
-1:     3      1010000000000000       101       001          3
-2:     3      1000000000000000       001       110          3
-3:     3      0110000000000000       110       010          3
-4:     3      0100000000000000       010       100          3
-5:     3      0010000000000000       100        11          2
-6:     4      0001000000000000      1000      1000          4
-7:     4      0000000000000000      0000      0000          4
-
-The values in the Val, Order Restored and Original Length columns
-now represent the Shannon-Fano encoding tree that can be used for
-decoding the Shannon-Fano encoded data.  How to parse the
-variable length Shannon-Fano values from the data stream is beyond
-the scope of this document.  (See the references listed at the end of
-this document for more information.)  However, traditional decoding
-schemes used for Huffman variable length decoding, such as the
-Greenlaw algorithm, can be successfully applied.
-
-The compressed data stream begins immediately after the
-compressed Shannon-Fano data.  The compressed data stream can be
-interpreted as follows:
-
-loop until done
-    read 1 bit from input stream.
-
-    if this bit is non-zero then       (encoded data is literal data)
-        if Literal Shannon-Fano tree is present
-            read and decode character using Literal Shannon-Fano tree.
-        otherwise
-            read 8 bits from input stream.
-        copy character to the output stream.
-    otherwise              (encoded data is sliding dictionary match)
-        if 8K dictionary size
-            read 7 bits for offset Distance (lower 7 bits of offset).
-        otherwise
-            read 6 bits for offset Distance (lower 6 bits of offset).
-
-        using the Distance Shannon-Fano tree, read and decode the
-          upper 6 bits of the Distance value.
-
-        using the Length Shannon-Fano tree, read and decode
-          the Length value.
-
-        Length <- Length + Minimum Match Length
-
-        if Length = 63 + Minimum Match Length
-            read 8 bits from the input stream,
-            add this value to Length.
-
-        move backwards Distance+1 bytes in the output stream, and
-        copy Length characters from this position to the output
-        stream.  (if this position is before the start of the output
-        stream, then assume that all the data before the start of
-        the output stream is filled with zeros).
-end loop
-
-Tokenizing - Method 7
----------------------
-
-This method is not used by PKZIP.
-
-Deflating - Method 8
---------------------
-
-The Deflate algorithm is similar to the Implode algorithm using
-a sliding dictionary of up to 32K with secondary compression
-from Huffman/Shannon-Fano codes.
-
-The compressed data is stored in blocks with a header describing
-the block and the Huffman codes used in the data block.  The header
-format is as follows:
-
-   Bit 0: Last Block bit     This bit is set to 1 if this is the last
-                             compressed block in the data.
-   Bits 1-2: Block type
-      00 (0) - Block is stored - All stored data is byte aligned.
-               Skip bits until next byte, then next word = block 
-               length, followed by the ones compliment of the block
-               length word. Remaining data in block is the stored 
-               data.
-
-      01 (1) - Use fixed Huffman codes for literal and distance codes.
-               Lit Code    Bits             Dist Code   Bits
-               ---------   ----             ---------   ----
-                 0 - 143    8                 0 - 31      5
-               144 - 255    9
-               256 - 279    7
-               280 - 287    8
-
-               Literal codes 286-287 and distance codes 30-31 are 
-               never used but participate in the huffman construction.
-
-      10 (2) - Dynamic Huffman codes.  (See expanding Huffman codes)
-
-      11 (3) - Reserved - Flag a "Error in compressed data" if seen.
-
-Expanding Huffman Codes
------------------------
-If the data block is stored with dynamic Huffman codes, the Huffman
-codes are sent in the following compressed format:
-
-   5 Bits: # of Literal codes sent - 256 (256 - 286)
-           All other codes are never sent.
-   5 Bits: # of Dist codes - 1           (1 - 32)
-   4 Bits: # of Bit Length codes - 3     (3 - 19)
-
-The Huffman codes are sent as bit lengths and the codes are built as
-described in the implode algorithm.  The bit lengths themselves are
-compressed with Huffman codes.  There are 19 bit length codes:
-
-   0 - 15: Represent bit lengths of 0 - 15
-       16: Copy the previous bit length 3 - 6 times.
-           The next 2 bits indicate repeat length (0 = 3, ... ,3 = 6)
-              Example:  Codes 8, 16 (+2 bits 11), 16 (+2 bits 10) will
-                        expand to 12 bit lengths of 8 (1 + 6 + 5)
-       17: Repeat a bit length of 0 for 3 - 10 times. (3 bits of length)
-       18: Repeat a bit length of 0 for 11 - 138 times (7 bits of length)
-
-The lengths of the bit length codes are sent packed 3 bits per value
-(0 - 7) in the following order:
-
-   16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15
-
-The Huffman codes should be built as described in the Implode algorithm
-except codes are assigned starting at the shortest bit length, i.e. the
-shortest code should be all 0's rather than all 1's.  Also, codes with
-a bit length of zero do not participate in the tree construction.  The
-codes are then used to decode the bit lengths for the literal and 
-distance tables.
-
-The bit lengths for the literal tables are sent first with the number
-of entries sent described by the 5 bits sent earlier.  There are up
-to 286 literal characters; the first 256 represent the respective 8
-bit character, code 256 represents the End-Of-Block code, the remaining
-29 codes represent copy lengths of 3 thru 258.  There are up to 30
-distance codes representing distances from 1 thru 32k as described
-below.
-
-                             Length Codes
-                             ------------
-      Extra             Extra              Extra              Extra
- Code Bits Length  Code Bits Lengths  Code Bits Lengths  Code Bits Length(s)
- ---- ---- ------  ---- ---- -------  ---- ---- -------  ---- ---- ---------
-  257   0     3     265   1   11,12    273   3   35-42    281   5  131-162
-  258   0     4     266   1   13,14    274   3   43-50    282   5  163-194
-  259   0     5     267   1   15,16    275   3   51-58    283   5  195-226
-  260   0     6     268   1   17,18    276   3   59-66    284   5  227-257
-  261   0     7     269   2   19-22    277   4   67-82    285   0    258
-  262   0     8     270   2   23-26    278   4   83-98
-  263   0     9     271   2   27-30    279   4   99-114
-  264   0    10     272   2   31-34    280   4  115-130
-
-                            Distance Codes
-                            --------------
-      Extra           Extra             Extra               Extra
- Code Bits Dist  Code Bits  Dist   Code Bits Distance  Code Bits Distance
- ---- ---- ----  ---- ---- ------  ---- ---- --------  ---- ---- --------
-   0   0    1      8   3   17-24    16    7  257-384    24   11  4097-6144
-   1   0    2      9   3   25-32    17    7  385-512    25   11  6145-8192
-   2   0    3     10   4   33-48    18    8  513-768    26   12  8193-12288
-   3   0    4     11   4   49-64    19    8  769-1024   27   12 12289-16384
-   4   1   5,6    12   5   65-96    20    9 1025-1536   28   13 16385-24576
-   5   1   7,8    13   5   97-128   21    9 1537-2048   29   13 24577-32768
-   6   2   9-12   14   6  129-192   22   10 2049-3072
-   7   2  13-16   15   6  193-256   23   10 3073-4096
-
-The compressed data stream begins immediately after the
-compressed header data.  The compressed data stream can be
-interpreted as follows:
-
-do
-   read header from input stream.
-
-   if stored block
-      skip bits until byte aligned
-      read count and 1's compliment of count
-      copy count bytes data block
-   otherwise
-      loop until end of block code sent
-         decode literal character from input stream
-         if literal < 256
-            copy character to the output stream
-         otherwise
-            if literal = end of block
-               break from loop
-            otherwise
-               decode distance from input stream
-
-               move backwards distance bytes in the output stream, and
-               copy length characters from this position to the output
-               stream.
-      end loop
-while not last block
-
-if data descriptor exists
-   skip bits until byte aligned
-   read crc and sizes
-endif
-
-Enhanced Deflating - Method 9
------------------------------
-
-The Enhanced Deflating algorithm is similar to Deflate but
-uses a sliding dictionary of up to 64K. Deflate64(tm) is supported
-by the Deflate extractor. 
-
-BZIP2 - Method 12
------------------
-
-BZIP2 is an open-source data compression algorithm developed by 
-Julian Seward.  Information and source code for this algorithm
-can be found on the internet.
-
-LZMA - Method 14 (EFS)
-----------------------
-
-LZMA is a block-oriented, general purpose data compression algorithm  
-developed and maintained by Igor Pavlov.  It is a derivative of LZ77
-that utilizes Markov chains and a range coder.  Information and 
-source code for this algorithm can be found on the internet.  Consult 
-with the author of this algorithm for information on terms or 
-restrictions on use.
-
-Support for LZMA within the ZIP format is defined as follows:   
-
-The Compression method field within the ZIP Local and Central 
-Header records will be set to the value 14 to indicate data was
-compressed using LZMA. 
-
-The Version needed to extract field within the ZIP Local and 
-Central Header records will be set to 6.3 to indicate the 
-minimum ZIP format version supporting this feature.
-
-File data compressed using the LZMA algorithm must be placed 
-immediately following the Local Header for the file.  If a 
-standard ZIP encryption header is required, it will follow 
-the Local Header and will precede the LZMA compressed file 
-data segment.  The location of LZMA compressed data segment 
-within the ZIP format will be as shown:
-
-    [local header file 1]
-    [encryption header file 1]
-    [LZMA compressed data segment for file 1]
-    [data descriptor 1]
-    [local header file 2]
-
-The encryption header and data descriptor records may
-be conditionally present.  The LZMA Compressed Data Segment 
-will consist of an LZMA Properties Header followed by the 
-LZMA Compressed Data as shown:
-
-    [LZMA properties header for file 1]
-    [LZMA compressed data for file 1]
-
-The LZMA Compressed Data will be stored as provided by the 
-LZMA compression library.  Compressed size, uncompressed 
-size and other file characteristics about the file being 
-compressed must be stored in standard ZIP storage format.
-
-The LZMA Properties Header will store specific data required to 
-decompress the LZMA compressed Data.  This data is set by the 
-LZMA compression engine using the function WriteCoderProperties() 
-as documented within the LZMA SDK. 
- 
-Storage fields for the property information within the LZMA 
-Properties Header are as follows:
-
-     LZMA Version Information 2 bytes
-     LZMA Properties Size 2 bytes
-     LZMA Properties Data variable, defined by "LZMA Properties Size"
-
-LZMA Version Information - this field identifies which version of 
-     the LZMA SDK was used to compress a file.  The first byte will 
-     store the major version number of the LZMA SDK and the second 
-     byte will store the minor number.  
-
-LZMA Properties Size - this field defines the size of the remaining 
-     property data.  Typically this size should be determined by the 
-     version of the SDK.  This size field is included as a convenience
-     and to help avoid any ambiguity should it arise in the future due
-     to changes in this compression algorithm. 
-
-LZMA Property Data - this variable sized field records the required 
-     values for the decompressor as defined by the LZMA SDK.  The 
-     data stored in this field should be obtained using the 
-     WriteCoderProperties() in the version of the SDK defined by 
-     the "LZMA Version Information" field.  
-
-The layout of the "LZMA Properties Data" field is a function of the
-LZMA compression algorithm.  It is possible that this layout may be
-changed by the author over time.  The data layout in version 4.32 
-of the LZMA SDK defines a 5 byte array that uses 4 bytes to store 
-the dictionary size in little-endian order. This is preceded by a 
-single packed byte as the first element of the array that contains
-the following fields:
-
-     PosStateBits
-     LiteralPosStateBits
-     LiteralContextBits
-
-Refer to the LZMA documentation for a more detailed explanation of 
-these fields.  
-
-Data compressed with method 14, LZMA, may include an end-of-stream
-(EOS) marker ending the compressed data stream.  This marker is not
-required, but its use is highly recommended to facilitate processing
-and implementers should include the EOS marker whenever possible.
-When the EOS marker is used, general purpose bit 1 must be set.  If
-general purpose bit 1 is not set, the EOS marker is not present.
-
-WavPack - Method 97
--------------------
-
-Information describing the use of compression method 97 is 
-provided by WinZIP International, LLC.  This method relies on the
-open source WavPack audio compression utility developed by David Bryant.  
-Information on WavPack is available at www.wavpack.com.  Please consult 
-with the author of this algorithm for information on terms and 
-restrictions on use.
-
-WavPack data for a file begins immediately after the end of the
-local header data.  This data is the output from WavPack compression
-routines.  Within the ZIP file, the use of WavPack compression is
-indicated by setting the compression method field to a value of 97 
-in both the local header and the central directory header.  The Version 
-needed to extract and version made by fields use the same values as are 
-used for data compressed using the Deflate algorithm.
-
-An implementation note for storing digital sample data when using 
-WavPack compression within ZIP files is that all of the bytes of
-the sample data should be compressed.  This includes any unused
-bits up to the byte boundary.  An example is a 2 byte sample that
-uses only 12 bits for the sample data with 4 unused bits.  If only
-12 bits are passed as the sample size to the WavPack routines, the 4 
-unused bits will be set to 0 on extraction regardless of their original 
-state.  To avoid this, the full 16 bits of the sample data size
-should be provided. 
-
-PPMd - Method 98
-----------------
-
-PPMd is a data compression algorithm developed by Dmitry Shkarin
-which includes a carryless rangecoder developed by Dmitry Subbotin.
-This algorithm is based on predictive phrase matching on multiple
-order contexts.  Information and source code for this algorithm
-can be found on the internet. Consult with the author of this
-algorithm for information on terms or restrictions on use.
-
-Support for PPMd within the ZIP format currently is provided only 
-for version I, revision 1 of the algorithm.  Storage requirements
-for using this algorithm are as follows:
-
-Parameters needed to control the algorithm are stored in the two
-bytes immediately preceding the compressed data.  These bytes are
-used to store the following fields:
-
-Model order - sets the maximum model order, default is 8, possible
-              values are from 2 to 16 inclusive
-
-Sub-allocator size - sets the size of sub-allocator in MB, default is 50,
-            possible values are from 1MB to 256MB inclusive
-
-Model restoration method - sets the method used to restart context
-            model at memory insufficiency, values are:
-
-            0 - restarts model from scratch - default
-            1 - cut off model - decreases performance by as much as 2x
-            2 - freeze context tree - not recommended
-
-An example for packing these fields into the 2 byte storage field is
-illustrated below.  These values are stored in Intel low-byte/high-byte
-order.
-
-wPPMd = (Model order - 1) + 
-        ((Sub-allocator size - 1) << 4) + 
-        (Model restoration method << 12)
-
-
-VII. Traditional PKWARE Encryption
-----------------------------------
-
-The following information discusses the decryption steps
-required to support traditional PKWARE encryption.  This
-form of encryption is considered weak by today's standards
-and its use is recommended only for situations with
-low security needs or for compatibility with older .ZIP 
-applications.
-
-Decryption
-----------
-
-PKWARE is grateful to Mr. Roger Schlafly for his expert contribution 
-towards the development of PKWARE's traditional encryption.
-
-PKZIP encrypts the compressed data stream.  Encrypted files must
-be decrypted before they can be extracted.
-
-Each encrypted file has an extra 12 bytes stored at the start of
-the data area defining the encryption header for that file.  The
-encryption header is originally set to random values, and then
-itself encrypted, using three, 32-bit keys.  The key values are
-initialized using the supplied encryption password.  After each byte
-is encrypted, the keys are then updated using pseudo-random number
-generation techniques in combination with the same CRC-32 algorithm
-used in PKZIP and described elsewhere in this document.
-
-The following is the basic steps required to decrypt a file:
-
-1) Initialize the three 32-bit keys with the password.
-2) Read and decrypt the 12-byte encryption header, further
-   initializing the encryption keys.
-3) Read and decrypt the compressed data stream using the
-   encryption keys.
-
-Step 1 - Initializing the encryption keys
------------------------------------------
-
-Key(0) <- 305419896
-Key(1) <- 591751049
-Key(2) <- 878082192
-
-loop for i <- 0 to length(password)-1
-    update_keys(password(i))
-end loop
-
-Where update_keys() is defined as:
-
-update_keys(char):
-  Key(0) <- crc32(key(0),char)
-  Key(1) <- Key(1) + (Key(0) & 000000ffH)
-  Key(1) <- Key(1) * 134775813 + 1
-  Key(2) <- crc32(key(2),key(1) >> 24)
-end update_keys
-
-Where crc32(old_crc,char) is a routine that given a CRC value and a
-character, returns an updated CRC value after applying the CRC-32
-algorithm described elsewhere in this document.
-
-Step 2 - Decrypting the encryption header
------------------------------------------
-
-The purpose of this step is to further initialize the encryption
-keys, based on random data, to render a plaintext attack on the
-data ineffective.
-
-Read the 12-byte encryption header into Buffer, in locations
-Buffer(0) thru Buffer(11).
-
-loop for i <- 0 to 11
-    C <- buffer(i) ^ decrypt_byte()
-    update_keys(C)
-    buffer(i) <- C
-end loop
-
-Where decrypt_byte() is defined as:
-
-unsigned char decrypt_byte()
-    local unsigned short temp
-    temp <- Key(2) | 2
-    decrypt_byte <- (temp * (temp ^ 1)) >> 8
-end decrypt_byte
-
-After the header is decrypted,  the last 1 or 2 bytes in Buffer
-should be the high-order word/byte of the CRC for the file being
-decrypted, stored in Intel low-byte/high-byte order.  Versions of
-PKZIP prior to 2.0 used a 2 byte CRC check; a 1 byte CRC check is
-used on versions after 2.0.  This can be used to test if the password
-supplied is correct or not.
-
-Step 3 - Decrypting the compressed data stream
-----------------------------------------------
-
-The compressed data stream can be decrypted as follows:
-
-loop until done
-    read a character into C
-    Temp <- C ^ decrypt_byte()
-    update_keys(temp)
-    output Temp
-end loop
-
-
-VIII. Strong Encryption Specification
--------------------------------------
-
-The Strong Encryption technology defined in this specification is 
-covered under a pending patent application. The use or implementation
-in a product of certain technological aspects set forth in the current
-APPNOTE, including those with regard to strong encryption, patching, 
-or extended tape operations requires a license from PKWARE. Portions
-of this Strong Encryption technology are available for use at no charge.
-Contact PKWARE for licensing terms and conditions. Refer to section II
-of this APPNOTE (Contacting PKWARE) for information on how to 
-contact PKWARE. 
-
-Version 5.x of this specification introduced support for strong 
-encryption algorithms.  These algorithms can be used with either 
-a password or an X.509v3 digital certificate to encrypt each file. 
-This format specification supports either password or certificate 
-based encryption to meet the security needs of today, to enable 
-interoperability between users within both PKI and non-PKI 
-environments, and to ensure interoperability between different 
-computing platforms that are running a ZIP program.  
-
-Password based encryption is the most common form of encryption 
-people are familiar with.  However, inherent weaknesses with 
-passwords (e.g. susceptibility to dictionary/brute force attack) 
-as well as password management and support issues make certificate 
-based encryption a more secure and scalable option.  Industry 
-efforts and support are defining and moving towards more advanced 
-security solutions built around X.509v3 digital certificates and 
-Public Key Infrastructures(PKI) because of the greater scalability, 
-administrative options, and more robust security over traditional 
-password based encryption. 
-
-Most standard encryption algorithms are supported with this
-specification. Reference implementations for many of these 
-algorithms are available from either commercial or open source 
-distributors.  Readily available cryptographic toolkits make
-implementation of the encryption features straight-forward.  
-This document is not intended to provide a treatise on data 
-encryption principles or theory.  Its purpose is to document the 
-data structures required for implementing interoperable data 
-encryption within the .ZIP format.  It is strongly recommended that 
-you have a good understanding of data encryption before reading 
-further.
-
-The algorithms introduced in Version 5.0 of this specification 
-include:
-
-    RC2 40 bit, 64 bit, and 128 bit
-    RC4 40 bit, 64 bit, and 128 bit
-    DES
-    3DES 112 bit and 168 bit
-  
-Version 5.1 adds support for the following:
-
-    AES 128 bit, 192 bit, and 256 bit
-
-
-Version 6.1 introduces encryption data changes to support 
-interoperability with Smartcard and USB Token certificate storage 
-methods which do not support the OAEP strengthening standard.
-
-Version 6.2 introduces support for encrypting metadata by compressing 
-and encrypting the central directory data structure to reduce information 
-leakage.   Information leakage can occur in legacy ZIP applications 
-through exposure of information about a file even though that file is 
-stored encrypted.  The information exposed consists of file 
-characteristics stored within the records and fields defined by this 
-specification.  This includes data such as a files name, its original 
-size, timestamp and CRC32 value. 
-
-Version 6.3 introduces support for encrypting data using the Blowfish
-and Twofish algorithms.  These are symmetric block ciphers developed 
-by Bruce Schneier.  Blowfish supports using a variable length key from 
-32 to 448 bits.  Block size is 64 bits.  Implementations should use 16
-rounds and the only mode supported within ZIP files is CBC. Twofish 
-supports key sizes 128, 192 and 256 bits.  Block size is 128 bits.  
-Implementations should use 16 rounds and the only mode supported within
-ZIP files is CBC.  Information and source code for both Blowfish and 
-Twofish algorithms can be found on the internet.  Consult with the author
-of these algorithms for information on terms or restrictions on use.
-
-Central Directory Encryption provides greater protection against 
-information leakage by encrypting the Central Directory structure and 
-by masking key values that are replicated in the unencrypted Local 
-Header.   ZIP compatible programs that cannot interpret an encrypted 
-Central Directory structure cannot rely on the data in the corresponding 
-Local Header for decompression information.  
-
-Extra Field records that may contain information about a file that should 
-not be exposed should not be stored in the Local Header and should only 
-be written to the Central Directory where they can be encrypted.  This 
-design currently does not support streaming.  Information in the End of 
-Central Directory record, the Zip64 End of Central Directory Locator, 
-and the Zip64 End of Central Directory records are not encrypted.  Access 
-to view data on files within a ZIP file with an encrypted Central Directory
-requires the appropriate password or private key for decryption prior to 
-viewing any files, or any information about the files, in the archive.  
-
-Older ZIP compatible programs not familiar with the Central Directory 
-Encryption feature will no longer be able to recognize the Central 
-Directory and may assume the ZIP file is corrupt.  Programs that 
-attempt streaming access using Local Headers will see invalid 
-information for each file.  Central Directory Encryption need not be 
-used for every ZIP file.  Its use is recommended for greater security.  
-ZIP files not using Central Directory Encryption should operate as 
-in the past. 
-
-This strong encryption feature specification is intended to provide for 
-scalable, cross-platform encryption needs ranging from simple password
-encryption to authenticated public/private key encryption.  
-
-Encryption provides data confidentiality and privacy.  It is 
-recommended that you combine X.509 digital signing with encryption 
-to add authentication and non-repudiation.
-
-
-Single Password Symmetric Encryption Method:
--------------------------------------------
-
-The Single Password Symmetric Encryption Method using strong 
-encryption algorithms operates similarly to the traditional 
-PKWARE encryption defined in this format.  Additional data 
-structures are added to support the processing needs of the 
-strong algorithms.
-
-The Strong Encryption data structures are:
-
-1. General Purpose Bits - Bits 0 and 6 of the General Purpose bit 
-flag in both local and central header records.  Both bits set 
-indicates strong encryption.  Bit 13, when set indicates the Central
-Directory is encrypted and that selected fields in the Local Header
-are masked to hide their actual value.
-
-
-2. Extra Field 0x0017 in central header only.
-
-     Fields to consider in this record are:
-
-     Format - the data format identifier for this record.  The only
-     value allowed at this time is the integer value 2.
-
-     AlgId - integer identifier of the encryption algorithm from the
-     following range
-
-         0x6601 - DES
-         0x6602 - RC2 (version needed to extract < 5.2)
-         0x6603 - 3DES 168
-         0x6609 - 3DES 112
-         0x660E - AES 128 
-         0x660F - AES 192 
-         0x6610 - AES 256 
-         0x6702 - RC2 (version needed to extract >= 5.2)
-         0x6720 - Blowfish
-         0x6721 - Twofish
-         0x6801 - RC4
-         0xFFFF - Unknown algorithm
-
-     Bitlen - Explicit bit length of key
-
-         32 - 448 bits
-   
-     Flags - Processing flags needed for decryption
-
-         0x0001 - Password is required to decrypt
-         0x0002 - Certificates only
-         0x0003 - Password or certificate required to decrypt
-
-         Values > 0x0003 reserved for certificate processing
-
-
-3. Decryption header record preceding compressed file data.
-
-         -Decryption Header:
-
-          Value     Size     Description
-          -----     ----     -----------
-          IVSize    2 bytes  Size of initialization vector (IV)
-          IVData    IVSize   Initialization vector for this file
-          Size      4 bytes  Size of remaining decryption header data
-          Format    2 bytes  Format definition for this record
-          AlgID     2 bytes  Encryption algorithm identifier
-          Bitlen    2 bytes  Bit length of encryption key
-          Flags     2 bytes  Processing flags
-          ErdSize   2 bytes  Size of Encrypted Random Data
-          ErdData   ErdSize  Encrypted Random Data
-          Reserved1 4 bytes  Reserved certificate processing data
-          Reserved2 (var)    Reserved for certificate processing data
-          VSize     2 bytes  Size of password validation data
-          VData     VSize-4  Password validation data
-          VCRC32    4 bytes  Standard ZIP CRC32 of password validation data
-
-     IVData - The size of the IV should match the algorithm block size.
-              The IVData can be completely random data.  If the size of
-              the randomly generated data does not match the block size
-              it should be complemented with zero's or truncated as
-              necessary.  If IVSize is 0,then IV = CRC32 + Uncompressed
-              File Size (as a 64 bit little-endian, unsigned integer value).
-
-     Format - the data format identifier for this record.  The only
-     value allowed at this time is the integer value 3.
-
-     AlgId - integer identifier of the encryption algorithm from the
-     following range
-
-         0x6601 - DES
-         0x6602 - RC2 (version needed to extract < 5.2)
-         0x6603 - 3DES 168
-         0x6609 - 3DES 112
-         0x660E - AES 128 
-         0x660F - AES 192 
-         0x6610 - AES 256 
-         0x6702 - RC2 (version needed to extract >= 5.2)
-         0x6720 - Blowfish
-         0x6721 - Twofish
-         0x6801 - RC4
-         0xFFFF - Unknown algorithm
-
-     Bitlen - Explicit bit length of key
-
-         32 - 448 bits
-   
-     Flags - Processing flags needed for decryption
-
-         0x0001 - Password is required to decrypt
-         0x0002 - Certificates only
-         0x0003 - Password or certificate required to decrypt
-
-         Values > 0x0003 reserved for certificate processing
-
-     ErdData - Encrypted random data is used to store random data that
-               is used to generate a file session key for encrypting 
-               each file.  SHA1 is used to calculate hash data used to 
-               derive keys.  File session keys are derived from a master 
-               session key generated from the user-supplied password.
-               If the Flags field in the decryption header contains 
-               the value 0x4000, then the ErdData field must be 
-               decrypted using 3DES. If the value 0x4000 is not set,
-               then the ErdData field must be decrypted using AlgId.
-
-
-     Reserved1 - Reserved for certificate processing, if value is
-               zero, then Reserved2 data is absent.  See the explanation
-               under the Certificate Processing Method for details on
-               this data structure.
-
-     Reserved2 - If present, the size of the Reserved2 data structure 
-               is located by skipping the first 4 bytes of this field 
-               and using the next 2 bytes as the remaining size.  See
-               the explanation under the Certificate Processing Method
-               for details on this data structure.
-
-     VSize - This size value will always include the 4 bytes of the
-             VCRC32 data and will be greater than 4 bytes.
-
-     VData - Random data for password validation.  This data is VSize
-             in length and VSize must be a multiple of the encryption
-             block size.  VCRC32 is a checksum value of VData.  
-             VData and VCRC32 are stored encrypted and start the
-             stream of encrypted data for a file.
-
-
-4. Useful Tips
-
-Strong Encryption is always applied to a file after compression. The
-block oriented algorithms all operate in Cypher Block Chaining (CBC) 
-mode.  The block size used for AES encryption is 16.  All other block
-algorithms use a block size of 8.  Two ID's are defined for RC2 to 
-account for a discrepancy found in the implementation of the RC2
-algorithm in the cryptographic library on Windows XP SP1 and all 
-earlier versions of Windows.  It is recommended that zero length files
-not be encrypted, however programs should be prepared to extract them
-if they are found within a ZIP file.
-
-A pseudo-code representation of the encryption process is as follows:
-
-Password = GetUserPassword()
-MasterSessionKey = DeriveKey(SHA1(Password)) 
-RD = CryptographicStrengthRandomData() 
-For Each File
-   IV = CryptographicStrengthRandomData() 
-   VData = CryptographicStrengthRandomData()
-   VCRC32 = CRC32(VData)
-   FileSessionKey = DeriveKey(SHA1(IV + RD) 
-   ErdData = Encrypt(RD,MasterSessionKey,IV) 
-   Encrypt(VData + VCRC32 + FileData, FileSessionKey,IV)
-Done
-
-The function names and parameter requirements will depend on
-the choice of the cryptographic toolkit selected.  Almost any
-toolkit supporting the reference implementations for each
-algorithm can be used.  The RSA BSAFE(r), OpenSSL, and Microsoft
-CryptoAPI libraries are all known to work well.  
-
-
-Single Password - Central Directory Encryption:
------------------------------------------------
-
-Central Directory Encryption is achieved within the .ZIP format by 
-encrypting the Central Directory structure.  This encapsulates the metadata 
-most often used for processing .ZIP files.  Additional metadata is stored for 
-redundancy in the Local Header for each file.  The process of concealing 
-metadata by encrypting the Central Directory does not protect the data within 
-the Local Header.  To avoid information leakage from the exposed metadata 
-in the Local Header, the fields containing information about a file are masked.  
-
-Local Header:
-
-Masking replaces the true content of the fields for a file in the Local 
-Header with false information.  When masked, the Local Header is not 
-suitable for streaming access and the options for data recovery of damaged
-archives is reduced.  Extra Data fields that may contain confidential
-data should not be stored within the Local Header.  The value set into
-the Version needed to extract field should be the correct value needed to
-extract the file without regard to Central Directory Encryption. The fields 
-within the Local Header targeted for masking when the Central Directory is 
-encrypted are:
-
-        Field Name                     Mask Value
-        ------------------             ---------------------------
-        compression method              0
-        last mod file time              0
-        last mod file date              0
-        crc-32                          0
-        compressed size                 0
-        uncompressed size               0
-        file name (variable size)       Base 16 value from the
-                                        range 1 - 0xFFFFFFFFFFFFFFFF
-                                        represented as a string whose
-                                        size will be set into the
-                                        file name length field
-
-The Base 16 value assigned as a masked file name is simply a sequentially
-incremented value for each file starting with 1 for the first file.  
-Modifications to a ZIP file may cause different values to be stored for 
-each file.  For compatibility, the file name field in the Local Header 
-should never be left blank.  As of Version 6.2 of this specification, 
-the Compression Method and Compressed Size fields are not yet masked.
-Fields having a value of 0xFFFF or 0xFFFFFFFF for the ZIP64 format
-should not be masked.  
-
-Encrypting the Central Directory:
-
-Encryption of the Central Directory does not include encryption of the 
-Central Directory Signature data, the Zip64 End of Central Directory
-record, the Zip64 End of Central Directory Locator, or the End
-of Central Directory record.  The ZIP file comment data is never
-encrypted.
-
-Before encrypting the Central Directory, it may optionally be compressed.
-Compression is not required, but for storage efficiency it is assumed
-this structure will be compressed before encrypting.  Similarly, this 
-specification supports compressing the Central Directory without
-requiring that it also be encrypted.  Early implementations of this
-feature will assume the encryption method applied to files matches the 
-encryption applied to the Central Directory.
-
-Encryption of the Central Directory is done in a manner similar to
-that of file encryption.  The encrypted data is preceded by a 
-decryption header.  The decryption header is known as the Archive
-Decryption Header.  The fields of this record are identical to
-the decryption header preceding each encrypted file.  The location
-of the Archive Decryption Header is determined by the value in the
-Start of the Central Directory field in the Zip64 End of Central
-Directory record.  When the Central Directory is encrypted, the
-Zip64 End of Central Directory record will always be present.
-
-The layout of the Zip64 End of Central Directory record for all
-versions starting with 6.2 of this specification will follow the
-Version 2 format.  The Version 2 format is as follows:
-
-The leading fixed size fields within the Version 1 format for this
-record remain unchanged.  The record signature for both Version 1 
-and Version 2 will be 0x06064b50.  Immediately following the last
-byte of the field known as the Offset of Start of Central 
-Directory With Respect to the Starting Disk Number will begin the 
-new fields defining Version 2 of this record.  
-
-New fields for Version 2:
-
-Note: all fields stored in Intel low-byte/high-byte order.
-
-          Value                 Size       Description
-          -----                 ----       -----------
-          Compression Method    2 bytes    Method used to compress the
-                                           Central Directory
-          Compressed Size       8 bytes    Size of the compressed data
-          Original   Size       8 bytes    Original uncompressed size
-          AlgId                 2 bytes    Encryption algorithm ID
-          BitLen                2 bytes    Encryption key length
-          Flags                 2 bytes    Encryption flags
-          HashID                2 bytes    Hash algorithm identifier
-          Hash Length           2 bytes    Length of hash data
-          Hash Data             (variable) Hash data
-
-The Compression Method accepts the same range of values as the 
-corresponding field in the Central Header.
-
-The Compressed Size and Original Size values will not include the
-data of the Central Directory Signature which is compressed or
-encrypted.
-
-The AlgId, BitLen, and Flags fields accept the same range of values
-the corresponding fields within the 0x0017 record. 
-
-Hash ID identifies the algorithm used to hash the Central Directory 
-data.  This data does not have to be hashed, in which case the
-values for both the HashID and Hash Length will be 0.  Possible 
-values for HashID are:
-
-      Value         Algorithm
-     ------         ---------
-     0x0000          none
-     0x0001          CRC32
-     0x8003          MD5
-     0x8004          SHA1
-     0x8007          RIPEMD160
-     0x800C          SHA256
-     0x800D          SHA384
-     0x800E          SHA512
-
-When the Central Directory data is signed, the same hash algorithm
-used to hash the Central Directory for signing should be used.
-This is recommended for processing efficiency, however, it is 
-permissible for any of the above algorithms to be used independent 
-of the signing process.
-
-The Hash Data will contain the hash data for the Central Directory.
-The length of this data will vary depending on the algorithm used.
-
-The Version Needed to Extract should be set to 62.
-
-The value for the Total Number of Entries on the Current Disk will
-be 0.  These records will no longer support random access when
-encrypting the Central Directory.
-
-When the Central Directory is compressed and/or encrypted, the
-End of Central Directory record will store the value 0xFFFFFFFF
-as the value for the Total Number of Entries in the Central
-Directory.  The value stored in the Total Number of Entries in
-the Central Directory on this Disk field will be 0.  The actual
-values will be stored in the equivalent fields of the Zip64
-End of Central Directory record.
-
-Decrypting and decompressing the Central Directory is accomplished
-in the same manner as decrypting and decompressing a file.
-
-Certificate Processing Method:
------------------------------
-
-The Certificate Processing Method of for ZIP file encryption 
-defines the following additional data fields:
-
-1. Certificate Flag Values
-
-Additional processing flags that can be present in the Flags field of both 
-the 0x0017 field of the central directory Extra Field and the Decryption 
-header record preceding compressed file data are:
-
-         0x0007 - reserved for future use
-         0x000F - reserved for future use
-         0x0100 - Indicates non-OAEP key wrapping was used.  If this
-                  this field is set, the version needed to extract must
-                  be at least 61.  This means OAEP key wrapping is not
-                  used when generating a Master Session Key using
-                  ErdData.
-         0x4000 - ErdData must be decrypted using 3DES-168, otherwise use the
-                  same algorithm used for encrypting the file contents.
-         0x8000 - reserved for future use
-
-
-2. CertData - Extra Field 0x0017 record certificate data structure
-
-The data structure used to store certificate data within the section
-of the Extra Field defined by the CertData field of the 0x0017
-record are as shown:
-
-          Value     Size     Description
-          -----     ----     -----------
-          RCount    4 bytes  Number of recipients.  
-          HashAlg   2 bytes  Hash algorithm identifier
-          HSize     2 bytes  Hash size
-          SRList    (var)    Simple list of recipients hashed public keys
-
-          
-     RCount    This defines the number intended recipients whose 
-               public keys were used for encryption.  This identifies
-               the number of elements in the SRList.
-
-     HashAlg   This defines the hash algorithm used to calculate
-               the public key hash of each public key used
-               for encryption. This field currently supports
-               only the following value for SHA-1
-
-               0x8004 - SHA1
-
-     HSize     This defines the size of a hashed public key.
-
-     SRList    This is a variable length list of the hashed 
-               public keys for each intended recipient.  Each 
-               element in this list is HSize.  The total size of 
-               SRList is determined using RCount * HSize.
-
-
-3. Reserved1 - Certificate Decryption Header Reserved1 Data:
-
-          Value     Size     Description
-          -----     ----     -----------
-          RCount    4 bytes  Number of recipients.  
-          
-     RCount    This defines the number intended recipients whose 
-               public keys were used for encryption.  This defines
-               the number of elements in the REList field defined below.
-
-
-4. Reserved2 - Certificate Decryption Header Reserved2 Data Structures:
-
-
-          Value     Size     Description
-          -----     ----     -----------
-          HashAlg   2 bytes  Hash algorithm identifier
-          HSize     2 bytes  Hash size
-          REList    (var)    List of recipient data elements
-
-
-     HashAlg   This defines the hash algorithm used to calculate
-               the public key hash of each public key used
-               for encryption. This field currently supports
-               only the following value for SHA-1
-
-               0x8004 - SHA1
-
-     HSize     This defines the size of a hashed public key
-               defined in REHData.
-
-     REList    This is a variable length of list of recipient data.  
-               Each element in this list consists of a Recipient
-               Element data structure as follows:
-
-
-    Recipient Element (REList) Data Structure:
-
-          Value     Size     Description
-          -----     ----     -----------
-          RESize    2 bytes  Size of REHData + REKData
-          REHData   HSize    Hash of recipients public key
-          REKData   (var)    Simple key blob
-
-
-     RESize    This defines the size of an individual REList 
-               element.  This value is the combined size of the
-               REHData field + REKData field.  REHData is defined by
-               HSize.  REKData is variable and can be calculated
-               for each REList element using RESize and HSize.
-
-     REHData   Hashed public key for this recipient.
-
-     REKData   Simple Key Blob.  The format of this data structure
-               is identical to that defined in the Microsoft
-               CryptoAPI and generated using the CryptExportKey()
-               function.  The version of the Simple Key Blob
-               supported at this time is 0x02 as defined by
-               Microsoft.
-
-Certificate Processing - Central Directory Encryption:
-------------------------------------------------------
-
-Central Directory Encryption using Digital Certificates will 
-operate in a manner similar to that of Single Password Central
-Directory Encryption.  This record will only be present when there 
-is data to place into it.  Currently, data is placed into this
-record when digital certificates are used for either encrypting 
-or signing the files within a ZIP file.  When only password 
-encryption is used with no certificate encryption or digital 
-signing, this record is not currently needed. When present, this 
-record will appear before the start of the actual Central Directory 
-data structure and will be located immediately after the Archive 
-Decryption Header if the Central Directory is encrypted.
-
-The Archive Extra Data record will be used to store the following
-information.  Additional data may be added in future versions.
-
-Extra Data Fields:
-
-0x0014 - PKCS#7 Store for X.509 Certificates
-0x0016 - X.509 Certificate ID and Signature for central directory
-0x0019 - PKCS#7 Encryption Recipient Certificate List
-
-The 0x0014 and 0x0016 Extra Data records that otherwise would be 
-located in the first record of the Central Directory for digital 
-certificate processing. When encrypting or compressing the Central 
-Directory, the 0x0014 and 0x0016 records must be located in the 
-Archive Extra Data record and they should not remain in the first 
-Central Directory record.  The Archive Extra Data record will also 
-be used to store the 0x0019 data. 
-
-When present, the size of the Archive Extra Data record will be
-included in the size of the Central Directory.  The data of the
-Archive Extra Data record will also be compressed and encrypted
-along with the Central Directory data structure.
-
-Certificate Processing Differences:
-
-The Certificate Processing Method of encryption differs from the
-Single Password Symmetric Encryption Method as follows.  Instead
-of using a user-defined password to generate a master session key,
-cryptographically random data is used.  The key material is then
-wrapped using standard key-wrapping techniques.  This key material
-is wrapped using the public key of each recipient that will need
-to decrypt the file using their corresponding private key.
-
-This specification currently assumes digital certificates will follow
-the X.509 V3 format for 1024 bit and higher RSA format digital
-certificates.  Implementation of this Certificate Processing Method
-requires supporting logic for key access and management.  This logic
-is outside the scope of this specification.
-
-OAEP Processing with Certificate-based Encryption:
-
-OAEP stands for Optimal Asymmetric Encryption Padding.  It is a
-strengthening technique used for small encoded items such as decryption
-keys.  This is commonly applied in cryptographic key-wrapping techniques
-and is supported by PKCS #1.  Versions 5.0 and 6.0 of this specification 
-were designed to support OAEP key-wrapping for certificate-based 
-decryption keys for additional security.  
-
-Support for private keys stored on Smartcards or Tokens introduced
-a conflict with this OAEP logic.  Most card and token products do 
-not support the additional strengthening applied to OAEP key-wrapped 
-data.  In order to resolve this conflict, versions 6.1 and above of this 
-specification will no longer support OAEP when encrypting using 
-digital certificates. 
-
-Versions of PKZIP available during initial development of the 
-certificate processing method set a value of 61 into the 
-version needed to extract field for a file.  This indicates that 
-non-OAEP key wrapping is used.  This affects certificate encryption 
-only, and password encryption functions should not be affected by 
-this value.  This means values of 61 may be found on files encrypted
-with certificates only, or on files encrypted with both password
-encryption and certificate encryption.  Files encrypted with both
-methods can safely be decrypted using the password methods documented.
-
-IX. Change Process
-------------------
-
-In order for the .ZIP file format to remain a viable definition, this
-specification should be considered as open for periodic review and
-revision.  Although this format was originally designed with a 
-certain level of extensibility, not all changes in technology
-(present or future) were or will be necessarily considered in its
-design.  If your application requires new definitions to the
-extensible sections in this format, or if you would like to 
-submit new data structures, please forward your request to
-zipformat@pkware.com.  All submissions will be reviewed by the
-ZIP File Specification Committee for possible inclusion into
-future versions of this specification.  Periodic revisions
-to this specification will be published to ensure interoperability. 
-We encourage comments and feedback that may help improve clarity 
-or content.
-
-X. Incorporating PKWARE Proprietary Technology into Your Product
-----------------------------------------------------------------
-
-PKWARE is committed to the interoperability and advancement of the
-.ZIP format.  PKWARE offers a free license for certain technological
-aspects described above under certain restrictions and conditions.
-However, the use or implementation in a product of certain technological
-aspects set forth in the current APPNOTE, including those with regard to
-strong encryption, patching, or extended tape operations requires a 
-license from PKWARE.  Please contact PKWARE with regard to acquiring
-a license.
-
-XI. Acknowledgements
----------------------
-
-In addition to the above mentioned contributors to PKZIP and PKUNZIP,
-I would like to extend special thanks to Robert Mahoney for suggesting
-the extension .ZIP for this software.
-
-XII. References
----------------
-
-    Fiala, Edward R., and Greene, Daniel H., "Data compression with
-       finite windows",  Communications of the ACM, Volume 32, Number 4,
-       April 1989, pages 490-505.
-
-    Held, Gilbert, "Data Compression, Techniques and Applications,
-       Hardware and Software Considerations", John Wiley & Sons, 1987.
-
-    Huffman, D.A., "A method for the construction of minimum-redundancy
-       codes", Proceedings of the IRE, Volume 40, Number 9, September 1952,
-       pages 1098-1101.
-
-    Nelson, Mark, "LZW Data Compression", Dr. Dobbs Journal, Volume 14,
-       Number 10, October 1989, pages 29-37.
-
-    Nelson, Mark, "The Data Compression Book",  M&T Books, 1991.
-
-    Storer, James A., "Data Compression, Methods and Theory",
-       Computer Science Press, 1988
-
-    Welch, Terry, "A Technique for High-Performance Data Compression",
-       IEEE Computer, Volume 17, Number 6, June 1984, pages 8-19.
-
-    Ziv, J. and Lempel, A., "A universal algorithm for sequential data
-       compression", Communications of the ACM, Volume 30, Number 6,
-       June 1987, pages 520-540.
-
-    Ziv, J. and Lempel, A., "Compression of individual sequences via
-       variable-rate coding", IEEE Transactions on Information Theory,
-       Volume 24, Number 5, September 1978, pages 530-536.
-
-
-APPENDIX A - AS/400 Extra Field (0x0065) Attribute Definitions
---------------------------------------------------------------
-
-Field Definition Structure:
-
-   a. field length including length             2 bytes
-   b. field code                                2 bytes
-   c. data                                      x bytes
-
-Field Code  Description
-   4001     Source type i.e. CLP etc
-   4002     The text description of the library 
-   4003     The text description of the file
-   4004     The text description of the member
-   4005     x'F0' or 0 is PF-DTA,  x'F1' or 1 is PF_SRC
-   4007     Database Type Code                  1 byte
-   4008     Database file and fields definition
-   4009     GZIP file type                      2 bytes
-   400B     IFS code page                       2 bytes
-   400C     IFS Creation Time                   4 bytes
-   400D     IFS Access Time                     4 bytes
-   400E     IFS Modification time               4 bytes
-   005C     Length of the records in the file   2 bytes
-   0068     GZIP two words                      8 bytes
-
-APPENDIX B - z/OS Extra Field (0x0065) Attribute Definitions
-------------------------------------------------------------
-
-Field Definition Structure:
-
-   a. field length including length             2 bytes
-   b. field code                                2 bytes
-   c. data                                      x bytes
-
-Field Code  Description
-   0001     File Type                           2 bytes 
-   0002     NonVSAM Record Format               1 byte
-   0003     Reserved		
-   0004     NonVSAM Block Size                  2 bytes Big Endian
-   0005     Primary Space Allocation            3 bytes Big Endian
-   0006     Secondary Space Allocation          3 bytes Big Endian
-   0007     Space Allocation Type1 byte flag		
-   0008     Modification Date                   Retired with PKZIP 5.0 +
-   0009     Expiration Date                     Retired with PKZIP 5.0 +
-   000A     PDS Directory Block Allocation      3 bytes Big Endian binary value
-   000B     NonVSAM Volume List                 variable		
-   000C     UNIT Reference                      Retired with PKZIP 5.0 +
-   000D     DF/SMS Management Class             8 bytes EBCDIC Text Value
-   000E     DF/SMS Storage Class                8 bytes EBCDIC Text Value
-   000F     DF/SMS Data Class                   8 bytes EBCDIC Text Value
-   0010     PDS/PDSE Member Info.               30 bytes	
-   0011     VSAM sub-filetype                   2 bytes		
-   0012     VSAM LRECL                          13 bytes EBCDIC "(num_avg num_max)"
-   0013     VSAM Cluster Name                   Retired with PKZIP 5.0 +
-   0014     VSAM KSDS Key Information           13 bytes EBCDIC "(num_length num_position)"
-   0015     VSAM Average LRECL                  5 bytes EBCDIC num_value padded with blanks
-   0016     VSAM Maximum LRECL                  5 bytes EBCDIC num_value padded with blanks
-   0017     VSAM KSDS Key Length                5 bytes EBCDIC num_value padded with blanks
-   0018     VSAM KSDS Key Position              5 bytes EBCDIC num_value padded with blanks
-   0019     VSAM Data Name                      1-44 bytes EBCDIC text string
-   001A     VSAM KSDS Index Name                1-44 bytes EBCDIC text string
-   001B     VSAM Catalog Name                   1-44 bytes EBCDIC text string
-   001C     VSAM Data Space Type                9 bytes EBCDIC text string
-   001D     VSAM Data Space Primary             9 bytes EBCDIC num_value left-justified
-   001E     VSAM Data Space Secondary           9 bytes EBCDIC num_value left-justified
-   001F     VSAM Data Volume List               variable EBCDIC text list of 6-character Volume IDs
-   0020     VSAM Data Buffer Space              8 bytes EBCDIC num_value left-justified
-   0021     VSAM Data CISIZE                    5 bytes EBCDIC num_value left-justified
-   0022     VSAM Erase Flag                     1 byte flag		
-   0023     VSAM Free CI %                      3 bytes EBCDIC num_value left-justified
-   0024     VSAM Free CA %                      3 bytes EBCDIC num_value left-justified
-   0025     VSAM Index Volume List              variable EBCDIC text list of 6-character Volume IDs
-   0026     VSAM Ordered Flag                   1 byte flag		
-   0027     VSAM REUSE Flag                     1 byte flag		
-   0028     VSAM SPANNED Flag                   1 byte flag		
-   0029     VSAM Recovery Flag                  1 byte flag		
-   002A     VSAM  WRITECHK  Flag                1 byte flag		
-   002B     VSAM Cluster/Data SHROPTS           3 bytes EBCDIC "n,y"	
-   002C     VSAM Index SHROPTS                  3 bytes EBCDIC "n,y"	
-   002D     VSAM Index Space Type               9 bytes EBCDIC text string
-   002E     VSAM Index Space Primary            9 bytes EBCDIC num_value left-justified
-   002F     VSAM Index Space Secondary          9 bytes EBCDIC num_value left-justified
-   0030     VSAM Index CISIZE                   5 bytes EBCDIC num_value left-justified
-   0031     VSAM Index IMBED                    1 byte flag		
-   0032     VSAM Index Ordered Flag             1 byte flag		
-   0033     VSAM REPLICATE Flag                 1 byte flag		
-   0034     VSAM Index REUSE Flag               1 byte flag		
-   0035     VSAM Index WRITECHK Flag            1 byte flag Retired with PKZIP 5.0 +
-   0036     VSAM Owner                          8 bytes EBCDIC text string
-   0037     VSAM Index Owner                    8 bytes EBCDIC text string
-   0038     Reserved
-   0039     Reserved
-   003A     Reserved
-   003B     Reserved
-   003C     Reserved
-   003D     Reserved
-   003E     Reserved
-   003F     Reserved
-   0040     Reserved
-   0041     Reserved
-   0042     Reserved
-   0043     Reserved
-   0044     Reserved
-   0045     Reserved
-   0046     Reserved
-   0047     Reserved
-   0048     Reserved
-   0049     Reserved
-   004A     Reserved
-   004B     Reserved
-   004C     Reserved
-   004D     Reserved
-   004E     Reserved
-   004F     Reserved
-   0050     Reserved
-   0051     Reserved
-   0052     Reserved
-   0053     Reserved
-   0054     Reserved
-   0055     Reserved
-   0056     Reserved
-   0057     Reserved
-   0058     PDS/PDSE Member TTR Info.           6 bytes  Big Endian
-   0059     PDS 1st LMOD Text TTR               3 bytes  Big Endian
-   005A     PDS LMOD EP Rec #                   4 bytes  Big Endian
-   005B     Reserved
-   005C     Max Length of records               2 bytes  Big Endian
-   005D     PDSE Flag                           1 byte flag
-   005E     Reserved
-   005F     Reserved
-   0060     Reserved
-   0061     Reserved
-   0062     Reserved
-   0063     Reserved
-   0064     Reserved
-   0065     Last Date Referenced                4 bytes  Packed Hex "yyyymmdd"
-   0066     Date Created                        4 bytes  Packed Hex "yyyymmdd"
-   0068     GZIP two words                      8 bytes
-   0071     Extended NOTE Location              12 bytes Big Endian
-   0072     Archive device UNIT                 6 bytes  EBCDIC
-   0073     Archive 1st Volume                  6 bytes  EBCDIC
-   0074     Archive 1st VOL File Seq#           2 bytes  Binary
-
-APPENDIX C - Zip64 Extensible Data Sector Mappings (EFS)
---------------------------------------------------------
-
-          -Z390   Extra Field:
-
-          The following is the general layout of the attributes for the 
-          ZIP 64 "extra" block for extended tape operations. Portions of 
-          this extended tape processing technology is covered under a 
-          pending patent application. The use or implementation in a 
-          product of certain technological aspects set forth in the 
-          current APPNOTE, including those with regard to strong encryption,
-          patching or extended tape operations, requires a license from
-          PKWARE.  Please contact PKWARE with regard to acquiring a license. 
- 
-
-          Note: some fields stored in Big Endian format.  All text is 
-	  in EBCDIC format unless otherwise specified.
-
-          Value       Size          Description
-          -----       ----          -----------
-  (Z390)  0x0065      2 bytes       Tag for this "extra" block type
-          Size        4 bytes       Size for the following data block
-          Tag         4 bytes       EBCDIC "Z390"
-          Length71    2 bytes       Big Endian
-          Subcode71   2 bytes       Enote type code
-          FMEPos      1 byte
-          Length72    2 bytes       Big Endian
-          Subcode72   2 bytes       Unit type code
-          Unit        1 byte        Unit
-          Length73    2 bytes       Big Endian
-          Subcode73   2 bytes       Volume1 type code
-          FirstVol    1 byte        Volume
-          Length74    2 bytes       Big Endian
-          Subcode74   2 bytes       FirstVol file sequence
-          FileSeq     2 bytes       Sequence 
-
-APPENDIX D - Language Encoding (EFS)
-------------------------------------
-
-The ZIP format has historically supported only the original IBM PC character 
-encoding set, commonly referred to as IBM Code Page 437.  This limits storing 
-file name characters to only those within the original MS-DOS range of values 
-and does not properly support file names in other character encodings, or 
-languages. To address this limitation, this specification will support the 
-following change. 
-
-If general purpose bit 11 is unset, the file name and comment should conform 
-to the original ZIP character encoding.  If general purpose bit 11 is set, the 
-filename and comment must support The Unicode Standard, Version 4.1.0 or 
-greater using the character encoding form defined by the UTF-8 storage 
-specification.  The Unicode Standard is published by the The Unicode
-Consortium (www.unicode.org).  UTF-8 encoded data stored within ZIP files 
-is expected to not include a byte order mark (BOM). 
-
-Applications may choose to supplement this file name storage through the use 
-of the 0x0008 Extra Field.  Storage for this optional field is currently 
-undefined, however it will be used to allow storing extended information 
-on source or target encoding that may further assist applications with file 
-name, or file content encoding tasks.  Please contact PKWARE with any
-requirements on how this field should be used.
-
-The 0x0008 Extra Field storage may be used with either setting for general 
-purpose bit 11.  Examples of the intended usage for this field is to store 
-whether "modified-UTF-8" (JAVA) is used, or UTF-8-MAC.  Similarly, other 
-commonly used character encoding (code page) designations can be indicated 
-through this field.  Formalized values for use of the 0x0008 record remain 
-undefined at this time.  The definition for the layout of the 0x0008 field
-will be published when available.  Use of the 0x0008 Extra Field provides
-for storing data within a ZIP file in an encoding other than IBM Code
-Page 437 or UTF-8.
-
-General purpose bit 11 will not imply any encoding of file content or
-password.  Values defining character encoding for file content or 
-password must be stored within the 0x0008 Extended Language Encoding 
-Extra Field.
-
-Ed Gordon of the Info-ZIP group has defined a pair of "extra field" records 
-that can be used to store UTF-8 file name and file comment fields.  These
-records can be used for cases when the general purpose bit 11 method
-for storing UTF-8 data in the standard file name and comment fields is
-not desirable.  A common case for this alternate method is if backward
-compatibility with older programs is required.
-
-Definitions for the record structure of these fields are included above 
-in the section on 3rd party mappings for "extra field" records.  These
-records are identified by Header ID's 0x6375 (Info-ZIP Unicode Comment 
-Extra Field) and 0x7075 (Info-ZIP Unicode Path Extra Field).
-
-The choice of which storage method to use when writing a ZIP file is left
-to the implementation.  Developers should expect that a ZIP file may 
-contain either method and should provide support for reading data in 
-either format. Use of general purpose bit 11 reduces storage requirements 
-for file name data by not requiring additional "extra field" data for
-each file, but can result in older ZIP programs not being able to extract 
-files.  Use of the 0x6375 and 0x7075 records will result in a ZIP file 
-that should always be readable by older ZIP programs, but requires more 
-storage per file to write file name and/or file comment fields.
-
- 
-
-
-
diff --git a/apps/files_odfviewer/src/webodf/webodf/CMakeLists.txt b/apps/files_odfviewer/src/webodf/webodf/CMakeLists.txt
deleted file mode 100644
index 247ff5c625..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/CMakeLists.txt
+++ /dev/null
@@ -1,201 +0,0 @@
-string(COMPARE EQUAL "${CMAKE_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}"
-    WRONGCMAKEDIR)
-if(WRONGCMAKEDIR)
-  message(FATAL_ERROR "You should point CMake to the parent directory.")
-endif(WRONGCMAKEDIR)
-
-set(TESTJSFILES tests/core/ZipTests.js
-    tests/core/Base64Tests.js
-    tests/core/CursorTests.js
-    tests/core/PointWalkerTests.js
-    tests/core/RuntimeTests.js
-    tests/gui/CaretTests.js
-    tests/gui/SelectionMoverTests.js
-    tests/gui/XMLEditTests.js
-    tests/xmldom/OperationalTransformDOMTests.js
-    tests/xmldom/XPathTests.js
-    tests/tests.js
-)
-
-add_custom_target(jslintcheck ALL
-    COMMAND ${NODE} lib/runtime.js tools/runjslint.js
-        ${LIBJSFILES} ${TESTJSFILES}
-    DEPENDS NodeJS
-    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-    SOURCES ${LIBJSFILES} ${TESTJSFILES}
-)
-
-if (Java_JAVA_EXECUTABLE)
-  # nonStandardJsDocs is not used because we use @licstart @licend and @source
-  set(SHARED_CLOSURE_ARGS --warning_level VERBOSE --jscomp_error accessControls --jscomp_error ambiguousFunctionDecl --jscomp_error checkRegExp --jscomp_error checkTypes --jscomp_error checkVars --jscomp_error constantProperty --jscomp_error deprecated --jscomp_error externsValidation --jscomp_error fileoverviewTags --jscomp_error globalThis --jscomp_error invalidCasts --jscomp_error missingProperties --jscomp_error strictModuleDepCheck --jscomp_error typeInvalidation --jscomp_error undefinedVars --jscomp_error unknownDefines --jscomp_error uselessCode --jscomp_error visibility --jscomp_off nonStandardJsDocs --summary_detail_level 3)
-
-  foreach(JSFILE ${LIBJSFILES})
-    set(LIB_CLOSURE_ARGS ${LIB_CLOSURE_ARGS}
-        --js ${CMAKE_CURRENT_SOURCE_DIR}/${JSFILE})
-  endforeach(JSFILE ${LIBJSFILES})
-
-  foreach(JSFILE ${TESTJSFILES})
-    set(TEST_CLOSURE_ARGS ${TEST_CLOSURE_ARGS}
-        --js ${CMAKE_CURRENT_SOURCE_DIR}/${JSFILE})
-  endforeach(JSFILE ${TESTJSFILES})
-
-  add_custom_command(
-      OUTPUT simplecompiled.js
-      COMMAND ${Java_JAVA_EXECUTABLE}
-      ARGS -jar ${CLOSURE_JAR}
-         ${SHARED_CLOSURE_ARGS} ${LIB_CLOSURE_ARGS} ${TEST_CLOSURE_ARGS}
-         --compilation_level WHITESPACE_ONLY
-         --formatting PRETTY_PRINT
-         --js_output_file simplecompiled.js
-      DEPENDS ClosureCompiler ${LIBJSFILES} ${TESTJSFILES}
-  )
-
-  add_custom_command(
-      OUTPUT compiled.js
-      COMMAND ${Java_JAVA_EXECUTABLE}
-      ARGS -jar ${CLOSURE_JAR}
-         --define IS_COMPILED_CODE=true
-         ${SHARED_CLOSURE_ARGS} ${LIB_CLOSURE_ARGS} ${TEST_CLOSURE_ARGS}
-         --compilation_level ADVANCED_OPTIMIZATIONS
-         --formatting PRETTY_PRINT
-         --externs ${CMAKE_CURRENT_SOURCE_DIR}/tools/externs.js
-         --js_output_file compiled.js
-      DEPENDS ClosureCompiler ${LIBJSFILES} ${TESTJSFILES} tools/externs.js
-  )
-
-  add_custom_command(
-      OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/webodf.js
-      COMMAND ${Java_JAVA_EXECUTABLE}
-      ARGS -jar ${CLOSURE_JAR}
-         --define IS_COMPILED_CODE=true
-         ${SHARED_CLOSURE_ARGS} ${LIB_CLOSURE_ARGS}
-         --compilation_level SIMPLE_OPTIMIZATIONS
-         --formatting PRINT_INPUT_DELIMITER
-         --externs ${CMAKE_CURRENT_SOURCE_DIR}/tools/externs.js
-         --js_output_file ${CMAKE_CURRENT_BINARY_DIR}/webodf.js
-      DEPENDS ClosureCompiler ${LIBJSFILES} tools/externs.js
-  )
-  add_custom_target(webodf.js
-      SOURCES ${CMAKE_CURRENT_BINARY_DIR}/webodf.js
-  )
-
-  # too hardcore for now...
-  # add_custom_command(
-  #     OUTPUT webodf-experimental.js
-  #     COMMAND ${Java_JAVA_EXECUTABLE}
-  #     ARGS -jar ${CLOSURE_JAR}
-  #        --define IS_COMPILED_CODE=true
-  #        ${SHARED_CLOSURE_ARGS} ${LIB_CLOSURE_ARGS}
-  #        --js ${CMAKE_CURRENT_SOURCE_DIR}/lib/export.js
-  #        --compilation_level ADVANCED_OPTIMIZATIONS
-  #        --formatting PRINT_INPUT_DELIMITER
-  #        --externs ${CMAKE_CURRENT_SOURCE_DIR}/tools/externs.js
-  #        --js_output_file webodf-experimental.js
-  #     DEPENDS ClosureCompiler ${LIBJSFILES} lib/export.js tools/externs.js
-  # )
-
-  add_custom_command(
-      OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/webodf-debug.js
-      COMMAND ${Java_JAVA_EXECUTABLE}
-      ARGS -jar ${CLOSURE_JAR}
-         --define IS_COMPILED_CODE=true
-         ${SHARED_CLOSURE_ARGS} ${LIB_CLOSURE_ARGS}
-         --compilation_level WHITESPACE_ONLY
-         --formatting PRETTY_PRINT
-         --externs ${CMAKE_CURRENT_SOURCE_DIR}/tools/externs.js
-         --js_output_file ${CMAKE_CURRENT_BINARY_DIR}/webodf-debug.js
-      DEPENDS ClosureCompiler ${LIBJSFILES} tools/externs.js
-  )
-  add_custom_target(webodf-debug.js
-     SOURCES ${CMAKE_CURRENT_BINARY_DIR}/webodf-debug.js
-  )
-
-  add_custom_command(
-      OUTPUT odfedit.js
-      COMMAND ${Java_JAVA_EXECUTABLE}
-      ARGS -jar ${CLOSURE_JAR}
-         --define IS_COMPILED_CODE=true
-         ${SHARED_CLOSURE_ARGS} ${LIB_CLOSURE_ARGS}
-         --js ${CMAKE_CURRENT_SOURCE_DIR}/odfedit.js
-         --compilation_level ADVANCED_OPTIMIZATIONS
-         --formatting PRETTY_PRINT
-         --externs ${CMAKE_CURRENT_SOURCE_DIR}/tools/externs.js
-         --externs ${CMAKE_CURRENT_SOURCE_DIR}/tools/extjsexterns.js
-         --js_output_file odfedit.js
-      DEPENDS ClosureCompiler ${LIBJSFILES} ${APPJSFILES} tools/externs.js tools/extjsexterns.js odfedit.js
-  )
-
-  add_custom_command(
-    OUTPUT gui.js
-    COMMAND ${Java_JAVA_EXECUTABLE}
-    ARGS -jar ${CLOSURE_JAR}
-         --define IS_COMPILED_CODE=true
-         ${SHARED_CLOSURE_ARGS} ${LIB_CLOSURE_ARGS}
-         --js ${CMAKE_CURRENT_SOURCE_DIR}/filelister.js
-         --js ${CMAKE_CURRENT_SOURCE_DIR}/gui.js
-         --compilation_level ADVANCED_OPTIMIZATIONS
-         --formatting PRETTY_PRINT
-         --externs ${CMAKE_CURRENT_SOURCE_DIR}/tools/externs.js
-         --externs ${CMAKE_CURRENT_SOURCE_DIR}/tools/extjsexterns.js
-         --js_output_file gui.js
-    DEPENDS ClosureCompiler ${LIBJSFILES} ${APPJSFILES} tools/externs.js tools/extjsexterns.js filelister.js gui.js
-  )
-
-  add_custom_target(syntaxcheck ALL
-      DEPENDS simplecompiled.js webodf.js webodf-debug.js compiled.js
-  )
-
-  add_custom_target(rhinotest
-      COMMAND ${Java_JAVA_EXECUTABLE} -jar ${RHINO}
-          -debug lib/runtime.js tests/tests.js
-      DEPENDS Rhino
-      WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-      SOURCES ${LIBJSFILES}
-  )
-  add_custom_target(simplerhinotest
-      COMMAND ${Java_JAVA_EXECUTABLE} -jar ${RHINO}
-          ${CMAKE_CURRENT_BINARY_DIR}/simplecompiled.js
-      DEPENDS Rhino simplecompiled.js
-      WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/tests
-  )
-  add_custom_command(
-      OUTPUT docs/index.html
-       COMMAND ${Java_JAVA_EXECUTABLE}
-        ARGS -jar ${JSDOCDIR}/jsrun.jar
-            ${JSDOCDIR}/app/run.js -d=${CMAKE_CURRENT_BINARY_DIR}/docs
-                -t=${JSDOCDIR}/templates/jsdoc ${LIBJSFILES}
-        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-        DEPENDS ${LIBJSFILES} JsDoc
-  )
-  add_custom_target(doc DEPENDS docs/index.html)
-  add_custom_target(simplenodetest ALL
-      COMMAND ${NODE} ${CMAKE_CURRENT_BINARY_DIR}/simplecompiled.js
-      DEPENDS NodeJS simplecompiled.js
-      WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/tests
-  )
-
-endif (Java_JAVA_EXECUTABLE)
-
-add_custom_target(nodetest ALL
-    COMMAND ${NODE} lib/runtime.js tests/tests.js
-    DEPENDS NodeJS
-    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-    SOURCES ${LIBJSFILES}
-)
-if (QT4_FOUND)
-  add_custom_target(qtjsruntimetest ALL
-      COMMAND ${CMAKE_BINARY_DIR}/programs/qtjsruntime/qtjsruntime ../lib/runtime.js tests.js
-      DEPENDS qtjsruntime jslintcheck
-      WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/tests
-      SOURCES ${LIBJSFILES}
-  )
-endif (QT4_FOUND)
-add_custom_command(
-    OUTPUT instrumented/index.html
-    COMMAND ${JSCOVERAGE}
-    ARGS --exclude=extjs --exclude=extjs/.git ${CMAKE_CURRENT_SOURCE_DIR}
-         ${CMAKE_CURRENT_BINARY_DIR}/instrumented
-    DEPENDS ${LIBJSFILES} jslintcheck JSCoverage
-)
-add_custom_target(instrumented ALL DEPENDS instrumented/index.html)
-# vim:expandtab
diff --git a/apps/files_odfviewer/src/webodf/webodf/README b/apps/files_odfviewer/src/webodf/webodf/README
deleted file mode 100644
index a4dde2fee7..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/README
+++ /dev/null
@@ -1,43 +0,0 @@
-This directory contains the javacript code to WebODF as well as applications that use it. The applications are browser applications, commandline applications and unit tests.
-
-lib/
-lib/core/    Parts of WebODF that also work on JavaScript runtimes without a
-             document window.
-lib/gui/     Parts of WebODF that require a domtree
-
-The library should be able to run in a number of different runtimes. Currently these are:
- - a webbrowser
- - node.js
- - rhino
-A common API is implemented for these three environments in the files lib/browser.js, lib/node.js and lib/rhino.js respectively.
-
-
-
-Requirements on the code
-
-There are several requirements that need to met before code can be considered for inclusion in WebODF. Most requirements can be checked automatically, a few have to be checked by hand. A contribution must:
- - be contributed under the appropriate license
- - be javascript
- - not give any warnings in a JSLint check
- - be unchanged when passed through jsbeautifier
- - compile with the closure compiler
- - must pass all the unit tests that were passed before
-   - as separate js files in the currenlty used Node.JS implementation
-   - as a single compiled file in the currenlty used Node.JS implementation
-   - as separate js files in the currenlty used Rhino implementation
-   - as a single compiled file Rhino implementation
- - must have equal or greater code coverage for the each of the test runs
-
-The automatic checks can be performed by running a dedicated command that reports in an xml file. This report is compared to the previous report.
-
-runtests.js is the command that creates a report.
-
-
-
-
-
-
-
-
-
-
diff --git a/apps/files_odfviewer/src/webodf/webodf/compare.html b/apps/files_odfviewer/src/webodf/webodf/compare.html
deleted file mode 100644
index 0cf1cc80af..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/compare.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8"></meta>
-  <style type="text/css" media="screen">
-    body, html, div {
-      padding: 0px;
-      margin: 0px;
-      border: 0px;
-    }
-    body, html {
-      height: 100%;
-      text-align: center;
-    }
-    html > body {
-      background: black;
-    }
-  </style>
-  <link rel="stylesheet" type="text/css" href="webodf.css"/>
-  <script src="lib/runtime.js" type="text/javascript" charset="utf-8"></script>
-  <script src="compare.js" type="text/javascript" charset="utf-8"></script>
-  <script type="text/javascript" charset="utf-8">
-window.setTimeout(function () {
-    init(window, document);
-}, 0);
-  </script>
-  <title></title>
-</head>
- 
-<body>
-  <div id="odf"/>
-</body>
-</html>
diff --git a/apps/files_odfviewer/src/webodf/webodf/compare.js b/apps/files_odfviewer/src/webodf/webodf/compare.js
deleted file mode 100644
index 16bf5e333f..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/compare.js
+++ /dev/null
@@ -1,45 +0,0 @@
-/*global runtime: true, odf: true*/
-/*jslint white: false*/
-function getURIParameters(window) {
-    "use strict";
-    var params = {},
-        query = window.location.search.substring(1),
-        parms = query.split('&'),
-        i,
-        pos,
-        key,
-        val;
-    for (i = 0; i < parms.length; i += 1) {
-        pos = parms[i].indexOf('=');
-        if (pos > 0) {
-            key = parms[i].substring(0, pos);
-            val = parms[i].substring(pos + 1);
-            params[key] = val;
-        }
-    }
-    return params;
-}
-function init(window, document) {
-    "use strict";
-    runtime.loadClass("odf.OdfCanvas");
-    var params = getURIParameters(window),
-        odfelement = document.getElementById("odf"),
-        odfcanvas = new odf.OdfCanvas(odfelement);
-    if (!params.odf) {
-        return;
-    }
-    odfcanvas.addListener("statereadychange", function () {
-        var s = odfelement.style,
-            bgzoom = "100% auto",
-            pos;
-        s.backgroundImage = "url(" + params.bg + ")";
-        s.backgroundRepeat = "no-repeat";
-        if (params.bgzoom) {
-            bgzoom = params.bgzoom + "% auto";
-        }
-        s.backgroundSize = bgzoom;
-        pos = (params.x || "0") + "px " + (params.y || "0") + "px";
-        s.backgroundPosition = pos;
-    });
-    odfcanvas.load(params.odf);
-}
diff --git a/apps/files_odfviewer/src/webodf/webodf/deflateinmozilla.txt b/apps/files_odfviewer/src/webodf/webodf/deflateinmozilla.txt
deleted file mode 100644
index 866b29de77..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/deflateinmozilla.txt
+++ /dev/null
@@ -1,69 +0,0 @@
-Found this in a mozilla forum.
-http://forums.mozillazine.org/viewtopic.php?f=27&t=313496&start=0#
-
-Another implementation under MIT license can be found here:
-http://www.codeproject.com/KB/scripting/Javascript_binaryenc.aspx
-
- //listener for the converted data
-      var listener =
-      {
-         onDataAvailable : function(request, context, inputStream, offset, count)
-         {
-            //write the data
-                 var output = Components.classes["@mozilla.org/network/file-output-stream;1"].createInstance(Components.interfaces.nsIFileOutputStream);
-
-                                //outputFile is a file which will contain the gunzipped data
-            if(!outputFile.exists())
-                     output.init(outputFile, 0x02 | 0x08, 0644, 0);
-
-            else
-                     output.init(outputFile, 0x02 | 0x10, 0644, 0);
-
-                  var scriptable = Components.classes["@mozilla.org/scriptableinputstream;1"].createInstance(Components.interfaces.nsIScriptableInputStream);
-               scriptable.init(inputStream);
-
-            var data = scriptable.read(inputStream.available());
-            output.write(data, data.length);
-
-            output.close();
-         },
-
-         onStartRequest : function(request, context)   
-         {
-         },
-
-         onStopRequest : function(request, context)
-         {
-         }
-      };
-
-      //fake uri needed to create a channel
-      var uri = Components.classes["@mozilla.org/network/simple-uri;1"].createInstance(Components.interfaces.nsIURI);
-      uri.scheme = "http://gunzip";
-
-      //fake channel needed to create a request
-      var chan = Components.classes["@mozilla.org/network/input-stream-channel;1"].createInstance(Components.interfaces.nsIInputStreamChannel);
-      chan.setURI(uri);
-      chan.contentLength = decrypted.length;
-      chan.contentType = "gzip";
-      chan.contentStream = null;
-
-      var request = chan.QueryInterface(Components.interfaces.nsIRequest);
-
-            // Attempt to gunzip
-      var conv = Components.classes["@mozilla.org/streamconv;1?from=gzip&to=uncompressed"].createInstance(Components.interfaces.nsIStreamConverter);
-
-      conv.asyncConvertData("gzip", "uncompressed", listener, null);
-
-      conv.onStartRequest(request, null);
-
-                //input is an inputstream which contains the gzipped data
-      var avail = input.available();
-
-      //really do the conversion
-      conv.onDataAvailable(request, null, input, 0, avail);
-
-      var status = {};
-      conv.onStopRequest(request, null, status);
-
-      input.close();
diff --git a/apps/files_odfviewer/src/webodf/webodf/embedodf.html b/apps/files_odfviewer/src/webodf/webodf/embedodf.html
deleted file mode 100644
index 96bb25cc2b..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/embedodf.html
+++ /dev/null
@@ -1,2 +0,0 @@
-<html><link rel='stylesheet' href='webodf.css'/><script src='webodf.js'/><div id='odf'>
-<!-- This html is used by applications that embed webodf such as nativeQtClient. You can replace webodf.js with lib/runtime.js when debugging. -->
diff --git a/apps/files_odfviewer/src/webodf/webodf/filelist.js b/apps/files_odfviewer/src/webodf/webodf/filelist.js
deleted file mode 100644
index 8f7b876b46..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/filelist.js
+++ /dev/null
@@ -1,66 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-var fileList = [
-    'kofficetests/odf/134010.ods',
-    '../../../odfkit/odfkit/odfkit/LayoutTests/fast/odf/script-tests/hello-odf-2.odt',
-    '../../../odfkit/odfkit/odfkit/LayoutTests/fast/odf/script-tests/hello-odf-1.odt',
-    '../../../odfkit/odfkit/odfkit/LayoutTests/platform/mac/fast/loader/resources/mimeTypeExamples/example-ods.ods',
-    '../../../odfkit/odfkit/lpod-python/test/samples/note.odt',
-    '../../../odfkit/odfkit/lpod-python/test/samples/list.odt',
-    '../../../odfkit/odfkit/lpod-python/test/samples/frame_image.odp',
-    '../../../odfkit/odfkit/lpod-python/test/samples/bookmark.odt',
-    '../../../odfkit/odfkit/lpod-python/test/samples/span_a.odt',
-    '../../../odfkit/odfkit/lpod-python/test/samples/toc.odt',
-    '../../../odfkit/odfkit/lpod-python/test/samples/meta.odt',
-    '../../../odfkit/odfkit/lpod-python/test/samples/base_text.odt',
-    '../../../odfkit/odfkit/lpod-python/test/samples/span_style.odt',
-    '../../../odfkit/odfkit/lpod-python/test/samples/variable.odt',
-    '../../../odfkit/odfkit/lpod-python/test/samples/example.odp',
-    '../../../odfkit/odfkit/lpod-python/test/samples/base_shapes.odg',
-    '../../../odfkit/odfkit/lpod-python/test/samples/simple_table.ods',
-    '../../../odfkit/odfkit/lpod-python/test/samples/example.odt',
-    '../../../odfkit/odfkit/lpod-python/test/samples/styled_table.ods',
-    '../../../odfkit/odfkit/lpod-python/test/samples/tracked_changes.odt',
-    '../../../odfkit/odfkit/lpod-python/templates/lpod_styles.odt',
-    '../../../ictu/ictu/xsl-odt/z2.odt',
-    '../../../ictu/ictu/xsl-odt/gerechtelijkeaankondigingen/input/stcrt-2010-8050.odt',
-    '../../../ictu/ictu/odfquality/stcrt-2010-6505/stcrt-2010-6505.odt',
-    '../../../ictu/ictu/odfquality/kst-31460-12/kst-31460-12.odt',
-    '../../../ictu/ictu/odfquality/ah-tk-20092010-2140/ah-tk-20092010-2140.odt',
-    '../../../ictu/ictu/odfquality/kv-tk-2010Z06142/kv-tk-2010Z06142.odt',
-    '../../../ictu/ictu/odfquality/stb-2010-161/stb-2010-161.odt',
-    'kofficetests/odf/charts/Areacharts.odp',
-    'kofficetests/odf/xenophon.odt',
-    'kofficetests/odf/134010.ods',
-    'kofficetests/interoperability/kword/oowriter/oow_pic_flip_vertical.odt'
-];
diff --git a/apps/files_odfviewer/src/webodf/webodf/filelister.html b/apps/files_odfviewer/src/webodf/webodf/filelister.html
deleted file mode 100644
index 0caf7b599d..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/filelister.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <title>FileLister demo</title>
-  <script src="filelister.js" type="text/javascript" charset="utf-8"></script>
-  <script src="base64.js" type="text/javascript" charset="utf-8"></script>
-  <script src="bytearray.js" type="text/javascript" charset="utf-8"></script>
-  <script src="rawinflate.js" type="text/javascript" charset="utf-8"></script>
-  <script src="zip.js" type="text/javascript" charset="utf-8"></script>
-  <script type="text/javascript" charset="utf-8">
-function listFilesCallback(directories, files) {
-  for (var i in files) {
-    var e = document.createElement('p');
-    var t = document.createTextNode(files[i]);
-    var img = document.createElement('img');
-    img.src = getThumbUrl(files[i]);
-    e.appendChild(img);
-    e.appendChild(t);
-    document.body.appendChild(e);
-  }
-}
-function getThumbUrl(url) {
-  var data;
-  try {
-    var zip = new Zip(url);
-    data = zip.load('Thumbnails/thumbnail.png');
-  } catch (e) {
-    return e;
-  }
-  if (data) {
-      return 'data:;base64,' + Base64.toBase64(data);
-  }
-  return null;
-}
-function init() {
-  listFiles('kofficetests/', /\.od[tps]$/i, listFilesCallback);
-}
-  </script>
-</head>
-<body onload="init()">
-</body>
-</html>
diff --git a/apps/files_odfviewer/src/webodf/webodf/filelister.js b/apps/files_odfviewer/src/webodf/webodf/filelister.js
deleted file mode 100644
index 08f6cd3cb0..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/filelister.js
+++ /dev/null
@@ -1,200 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global XMLHttpRequest*/
-/*jslint regexp: true*/
-/** asynchroneous function that lists all files **/
-function listFiles(startdir, filepattern, fileCallback, doneCallback) {
-    "use strict";
-
-    var todoList = [],
-        doneList = [],
-        dirpattern = /\/$/,
-        hasWEBDAV = false;
-
-    function getHref(responseElement) {
-        var n = responseElement.firstChild;
-        while (n && !(n.namespaceURI === 'DAV:' && n.localName === 'href')) {
-            n = n.nextSibling;
-        }
-        return n && n.firstChild && n.firstChild.nodeValue;
-    }
-
-    function isDirectory(responseElement) {
-        var n = responseElement.firstChild;
-        while (n &&
-                !(n.namespaceURI === 'DAV:' && n.localName === 'propstat')) {
-            n = n.nextSibling;
-        }
-        n = n && n.firstChild;
-        while (n &&
-                !(n.namespaceURI === 'DAV:' && n.localName === 'prop')) {
-            n = n.nextSibling;
-        }
-        n = n && n.firstChild;
-        while (n && !(n.namespaceURI === 'DAV:' &&
-                      n.localName === 'resourcetype')) {
-            n = n.nextSibling;
-        }
-        n = n && n.firstChild;
-        while (n &&
-                !(n.namespaceURI === 'DAV:' && n.localName === 'collection')) {
-            n = n.nextSibling;
-        }
-        return n;
-    }
-
-    function processWebDavResponse(xml) {
-        if (!xml) {
-            throw new Error('No proper XML response.');
-        }
-        
-        var refs = xml.getElementsByTagNameNS('DAV:', 'response'),
-            directories = [],
-            files = [],
-            i,
-            d,
-            href;
-        if (refs.length === 0) {
-            throw new Error('No proper XML response.');
-        }
-        for (i = 0; i < refs.length; i += 1) {
-            href = getHref(refs[i]);
-            if (isDirectory(refs[i])) {
-                directories.push(href);
-            } else if (filepattern.test(href)) {
-                files.push(href);
-            }
-        }
-        for (i = 0; i < directories.length; i += 1) {
-            d = directories[i];
-            if (doneList.indexOf(d) === -1 && todoList.indexOf(d) === -1) {
-                todoList.push(d);
-            }
-        }
-        fileCallback(directories, files);
-    }
-
-    function processIndexHtmlResponse(base, text) {
-        // use regex because index.html is usually not valid xml
-        var re = /href="([^\/\?"][^"]*)"/ig,
-            matches,
-            files = [],
-            directories = [],
-            name,
-            d,
-            i;
-        while ((matches = re.exec(text)) !== null) {
-            name = matches[1];
-            if (dirpattern.test(name)) {
-                directories.push(base + name);
-            } else if (filepattern.test(name)) {
-                files.push(base + name);
-            }
-        }
-        for (i = 0; i < directories.length; i += 1) {
-            d = directories[i];
-            if (doneList.indexOf(d) === -1 && todoList.indexOf(d) === -1) {
-                todoList.push(d);
-            }
-        }
-        fileCallback(directories, files);
-    }
-
-    function getNextFileListWithIndexHtml() {
-        var url = todoList.shift(),
-            req;
-        while (url && typeof url !== 'string') {
-            url = todoList.shift();
-        }
-        if (!url) {
-            if (doneCallback) {
-                doneCallback();
-            }
-            return;
-        }
-        req = new XMLHttpRequest();
-        req.open('GET', url, true);
-        req.onreadystatechange = function (evt) {
-            if (req.readyState !== 4) {
-                return;
-            }
-            if (req.status >= 200 && req.status < 300) {
-                processIndexHtmlResponse(url, req.responseText);
-            }
-            getNextFileListWithIndexHtml();
-        };
-        req.send(null);
-
-        doneList.push(url);
-    }
-
-    function getNextFileListWithWebDav() {
-        var url = todoList.shift(),
-            req;
-        if (!url) {
-            if (doneCallback) {
-                doneCallback();
-            }
-            return;
-        }
-
-        req = new XMLHttpRequest();
-        req.open('PROPFIND', url, true);
-        req.onreadystatechange = function (evt) {
-            if (req.readyState !== 4) {
-                return;
-            }
-            if (req.status >= 200 && req.status < 300) {
-                try {
-                    processWebDavResponse(req.responseXML);
-                    hasWEBDAV = true;
-                } catch (e) {
-                }
-            }
-            if (hasWEBDAV) {
-                getNextFileListWithWebDav();
-            } else {
-                todoList.push(url);
-                doneList = [];
-                getNextFileListWithIndexHtml();
-            }
-        };
-        req.setRequestHeader('Depth', '1');
-        req.send(null);
-
-        doneList.push(url);
-    }
-
-    todoList.push(startdir);
-    getNextFileListWithWebDav();
-}
diff --git a/apps/files_odfviewer/src/webodf/webodf/flashput/Makefile b/apps/files_odfviewer/src/webodf/webodf/flashput/Makefile
deleted file mode 100644
index 291eef04b6..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/flashput/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-all:
-	/tmp/flex/bin/mxmlc PUT.as
diff --git a/apps/files_odfviewer/src/webodf/webodf/flashput/PUT.as b/apps/files_odfviewer/src/webodf/webodf/flashput/PUT.as
deleted file mode 100644
index 451d8a0fd0..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/flashput/PUT.as
+++ /dev/null
@@ -1,18 +0,0 @@
-package {
-	import flash.display.Sprite;
-	import flash.display.LoaderInfo;
-	import flash.external.ExternalInterface;
-	public class PUT extends Sprite {
-		public function PUT() {
-			ExternalInterface.addCallback("put", this.put);
-			var callback:String = LoaderInfo(root.loaderInfo).parameters["readyCallback"];
-			ExternalInterface.call(callback);
-		}
-		public function put(host:String, port:uint, path:String,
-				data:String, callbackFunctionName:String,
-                                callbackId:String):void {
-			new Request(host, port, path, data,
-					callbackFunctionName, callbackId);
-		}
-	}
-}
diff --git a/apps/files_odfviewer/src/webodf/webodf/flashput/PUT.swf b/apps/files_odfviewer/src/webodf/webodf/flashput/PUT.swf
deleted file mode 100644
index 466d0a1316..0000000000
Binary files a/apps/files_odfviewer/src/webodf/webodf/flashput/PUT.swf and /dev/null differ
diff --git a/apps/files_odfviewer/src/webodf/webodf/flashput/Request.as b/apps/files_odfviewer/src/webodf/webodf/flashput/Request.as
deleted file mode 100644
index 3217dde25d..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/flashput/Request.as
+++ /dev/null
@@ -1,83 +0,0 @@
-package {
-	import flash.events.*;
-	import flash.external.ExternalInterface;
-	import flash.net.Socket;
-	import flash.utils.ByteArray;
-	import mx.utils.Base64Decoder;
-	import mx.utils.Base64Encoder;
-	internal class Request {
-		private var id:String;
-		private var header:String;
-		private var data:ByteArray;
-		private var callbackName:String;
-		private var socket:Socket;
-		public function Request(host:String, port:uint, path:String,
-                                data:String, callbackName:String,
-                                callbackId:String) {
-			var atob:Base64Decoder = new Base64Decoder();
-			atob.decode(data);
-			this.data = atob.toByteArray();
-			this.header = 
-				"PUT " + path + " HTTP/1.1\r\n" +
-				"Host: " + host + "\r\n" +
-				"Content-Length: " + this.data.length + "\r\n" +
-				"\r\n";
-			this.callbackName = callbackName;
-			this.id = callbackId;
-			this.socket = new Socket();
-			this.socket.timeout = 1000;
-			this.socket.addEventListener(Event.CONNECT,
-					connectHandler);
-			this.socket.addEventListener(IOErrorEvent.IO_ERROR,
-					ioErrorHandler);
-			this.socket.addEventListener(
-					SecurityErrorEvent.SECURITY_ERROR,
-					securityErrorHandler);
-			this.socket.addEventListener(Event.CLOSE, closeHandler);
-			this.socket.addEventListener(ProgressEvent.SOCKET_DATA,
-					dataHandler); 
-			this.socket.connect(host, port);
-		}
-		private function connectHandler(connect:Event):void {
-			this.socket.writeBytes(toByteArray(this.header));
-			this.socket.writeBytes(this.data);
-			this.socket.flush();
-			this.header = null;
-			this.data.length = 0;
-		}
-		private function ioErrorHandler(ioError:IOErrorEvent):void {
-			ExternalInterface.call(this.callbackName, this.id,
-					null);
-			this.socket.close();
-		}
-		private function securityErrorHandler(
-				securityError:SecurityErrorEvent):void {
-			ExternalInterface.call(this.callbackName, this.id,
-					null);
-			this.socket.close();
-		}
-		private function closeHandler(close:Event):void {
-			ExternalInterface.call(this.callbackName, this.id,
-					null);
-		}
-		private function dataHandler(data:ProgressEvent):void {
-			// assume it went well, TODO: parse reply, handle error
-			this.socket.readBytes(this.data);
-			var btoa:Base64Encoder = new Base64Encoder();
-			btoa.encodeBytes(this.data);
-			ExternalInterface.call(this.callbackName, this.id,
-					btoa.toString());
-			this.data.length = 0;
-			this.socket.close();
-		}
-		public function toByteArray(str:String):ByteArray {
-			var length:uint = str.length;
-			var i:uint = 0;
-			var data:ByteArray = new ByteArray();
-			for (i; i < length; i++) {
-				data.writeByte(str.charCodeAt(i) & 0xff);
-			}
-			return data;
-		}
-	}
-}
diff --git a/apps/files_odfviewer/src/webodf/webodf/flashput/test.html b/apps/files_odfviewer/src/webodf/webodf/flashput/test.html
deleted file mode 100644
index 349f7680ba..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/flashput/test.html
+++ /dev/null
@@ -1,96 +0,0 @@
-<html>
-	<head>
-		<title>hi</title>
-	</head>
-	<body onload="init()">
-		<script type="text/javascript">//<![CDATA[
-/**
- * @constuctor
- */
-function FlashPut(host, port, domelement) {
-    if (port <= 0) {
-        return;
-    }
-    var flashput = this,
-        ready = false,
-        id = "FlashPut" + String(Math.random()).substring(2),
-        jobnumber = 0,
-        queue = [],
-        runningCalls = {},
-        doc = domelement.ownerDocument,
-        flash = doc.createElement("object"),
-        param = doc.createElement("param");
-    flash.setAttribute("data", "PUT.swf");
-    flash.setAttribute("type", "application/x-shockwave-flash");
-    flash.setAttribute("width", "1");
-    flash.setAttribute("height", "1");
-    param.setAttribute("name", "allowNetworking");
-    param.setAttribute("value", "all");
-    flash.appendChild(param);
-    param = doc.createElement("param");
-    param.setAttribute("name", "allowScriptAccess");
-    param.setAttribute("value", "always");
-    flash.appendChild(param);
-    param.setAttribute("name", "FlashVars");
-    param.setAttribute("value", "readyCallback=" + id);
-    flash.appendChild(param);
-    domelement.appendChild(flash);
-
-    // function to be called when flash movie is ready
-    window[id] = function () {
-        window[id] = undefined;
-        ready = true;
-        var i, a;
-        for (i = 0; i < queue.length; i += 1) {
-            a = queue[i];
-            put(a[0], a[1], a[2]);
-        }
-        queue = undefined;
-    };
-    function put(path, data, callback) {
-        var id = Math.random();
-        runningCalls[id] = callback;
-        flash.put(host, port, path, data, "FlashPut.putCallback", id);
-    }
-    this.put = function (path, data, callback) {
-        if (!ready) {
-            queue.push([path, data, callback]);
-        } else {
-            put(path, data, callback);
-        }
-    }
-    FlashPut.putCallback = function (id, result) {
-        if (id in runningCalls) {
-            runningCalls[id](result);
-            runningCalls.remove(id);
-        } else {
-            console.log("running put call " + id + " was not found.");
-        }
-    }
-};
-
-function testFlash() {
-    var i, l = 1000000, str = "", now = new Date();
-    for (i = 0; i < l; i += 1) {
-        str += String.fromCharCode(i & 0xff);
-    }
-    now = new Date();
-    str = window.btoa(str);
-    flashput.put("/zz", str, function (result) {
-        alert("'" + result + "' " + now.toString() + " " + (new Date()).toString());
-	var z = "hmm";
-        try {
-            z = window.atob(result);
-        } catch (e) {
-        }
-        alert(z + " " + now.toString() + " " + (new Date()).toString());
-    });
-}
-var flashput;
-function init() {
-    flashput = new FlashPut("", 8123, document.body);
-    testFlash();
-}
-//]]>		</script>
-	</body>
-</html>
diff --git a/apps/files_odfviewer/src/webodf/webodf/gui.js b/apps/files_odfviewer/src/webodf/webodf/gui.js
deleted file mode 100644
index 5fce22f51e..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/gui.js
+++ /dev/null
@@ -1,263 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global Ext:true, runtime:true, core:true, listFiles:true*/
-runtime.loadClass("core.Zip");
-runtime.loadClass("core.Base64");
-
-/**
- * @param {Ext.data.Model} node
- * @return {undefined}
- */
-function addThumbnail(node) {
-    "use strict";
-    var url = node.get('id'), zip;
-/*
-    zip = new core.Zip(url, function (err, zipobject) {
-        zip = zipobject;
-        if (err) {
-            return;
-        }
-        zip.load('Thumbnails/thumbnail.png', function (err, data) {
-            if (data === null) {
-                return;
-            }
-            var url = 'data:;base64,' +
-                    (new core.Base64()).convertUTF8ArrayToBase64(data),
-                el, spans, i, s;
-            el = node.getUI().getEl();
-            if (el) {
-                spans = el.getElementsByTagName('span');
-                for (i = 0; i < spans.length; i += 1) {
-                    s = spans.item(i);
-                    if (s.getAttribute('qtip')) {
-                        s.setAttribute('qtip', node.attributes.qtip);
-                    }
-                }
-            } else {
-                node.attributes.qtip += '<br/><img src="' + url + '"/>';
-            }
-        });
-    });
-*/
-}
-
-/**
- * @param {!string} url
- * @param {!Ext.tab.Panel} panel
- * @param {!string} title
- * @return {undefined}
- */
-function loadODF(url, panel, title) {
-    "use strict";
-    var tab = panel.items.findBy(function (item) {
-            return item.url === url;
-        }),
-        newTab;
-    if (tab) {
-        panel.setActiveTab(tab);
-        return;
-    }
-    newTab = Ext.create('Ext.container.Container', {
-        title: title,
-        tabTip: url,
-        url: url,
-        closable: true,
-        autoEl: {
-            tag: 'iframe',
-            name: url,
-            src: 'odf.html#' + url,
-            frameBorder: 0,
-            style: {
-                border: '0 none'
-            }
-        },
-        region: 'center'
-    });
-    panel.add(newTab);
-    panel.setActiveTab(newTab);
-}
-
-Ext.onReady(function () {
-    "use strict";
-    var editButton, tabpanel, slider, tree, viewport;
-
-    Ext.QuickTips.init();
-
-    /**
-     * @param {!Ext.Button} button
-     * @param {!boolean} pressed
-     * @return {undefined}
-     */
-    function editToggle(button, pressed) {
-        var tab = tabpanel.getActiveTab(), o, odfcanvas = "odfcanvas";
-        if (!tab) {
-            return;
-        }
-        tab.el.dom.contentDocument[odfcanvas].setEditable(pressed);
-    }
-
-    /**
-     * @param {!Object} slider
-     * @param {!number} zoomlevel
-     * @param {!Object} thumb
-     * @return {undefined}
-     */
-    function setZoom(slider, zoomlevel, thumb) {
-        var tab = tabpanel.getActiveTab(),
-            body;
-        if (!tab) {
-            return;
-        }
-        body = tab.el.dom.contentDocument.body;
-        zoomlevel = Math.pow(10, zoomlevel / 10.0);
-        body.style.zoom = zoomlevel;
-        body.style.MozTransform = 'scale(' + zoomlevel + ')';
-    }
-
-    /**
-     * @param {!Ext.data.NodeInterface} root
-     * @param {!string} uri
-     * @return {!Ext.data.NodeInterface}
-     */
-    function getParentNode(root, uri) {
-        var parts = uri.split('/'),
-            node = root,
-            id = parts[0],
-            i,
-            n;
-        for (i = 1; i < parts.length - 1; i += 1) {
-            n = node.findChild('text', parts[i], false);
-            id += '/' + parts[i];
-            if (!n) {
-                n = {
-                    id: id,
-                    text: parts[i],
-                    qtip: uri,
-                    cls: 'folder'
-                };
-                n = node.appendChild(n);
-            }
-            node = n;
-        }
-        return node;
-    }
-
-    /**
-     * @param {!Array.<!string>} directories
-     * @param {!Array.<!string>} files
-     * @return {undefined}
-     */
-    function listFilesCallback(directories, files) {
-        var root = tree.getRootNode(),
-            i,
-            f,
-            parentNode,
-            qtip,
-            node;
-        for (i = 0; i < files.length; i += 1) {
-            f = files[i];
-            parentNode = getParentNode(root, f);
-            qtip = f;
-            node = parentNode.appendChild({
-                id: f,
-                qtip: qtip,
-                text: f.substr(f.lastIndexOf('/') + 1),
-                cls: 'file',
-                leaf: true,
-                editable: false
-            });
-            f = /**@type{!Ext.data.Model}*/(node);
-            addThumbnail(f);
-        }
-    }
-
-    /**
-     * @return {undefined}
-     */
-    function listFilesDoneCallback() {
-    }
-
-    editButton = new Ext.Button({
-        enableToggle: true,
-        text: 'Editable',
-        listeners: { toggle: { fn: editToggle } }
-    });
-
-    slider = new Ext.Slider({
-        width: 300,
-        minValue: -5,
-        maxValue: 5,
-        values: [0],
-        listeners: { changecomplete: { fn: setZoom } }
-    });
-
-    tabpanel = Ext.create('Ext.tab.Panel', {
-        tbar: [ 'Zoom: ', slider, editButton ],
-        region: 'center'
-    });
-
-    tree = Ext.create('Ext.tree.Panel', {
-        title: 'Documents',
-        region: 'west',
-        width: 200,
-        split: true,
-        autoScroll: true,
-        collapsible: true,
-        rootVisible: false,
-        enableTabScroll: true,
-        defaults: {autoScroll: true},
-        listeners: {
-            itemclick: function (view, rec) {
-                if (rec.get('cls') === 'file') {
-                    loadODF(rec.get('id'), tabpanel, rec.get('text'));
-                } else if (rec.get('cls') === 'folder') {
-                    if (rec.isExpanded()) {
-                        rec.collapse();
-                    } else {
-                        rec.expand();
-                    }
-                }
-            }
-        },
-        root: { nodeType: 'node' }
-    });
-
-    viewport = new Ext.Viewport({
-        layout: 'border',
-        items: [ tabpanel, tree ]
-    });
-
-    // put data in the tree
-    listFiles('./demodocs/', /\.od[tps]$/i, listFilesCallback,
-            listFilesDoneCallback);
-});
diff --git a/apps/files_odfviewer/src/webodf/webodf/httpserver.js b/apps/files_odfviewer/src/webodf/webodf/httpserver.js
deleted file mode 100644
index 245ce9f3f7..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/httpserver.js
+++ /dev/null
@@ -1,213 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global require: true, console: true, process: true, Buffer: true,
-   unescape: true */
-/* A Node.JS http server*/
-var http = require("http"),
-    url = require("url"),
-    path = require("path"),
-    fs = require("fs"),
-    lookForIndexHtml = true,
-    ipaddress = "127.0.0.1",
-    //ipaddress = "192.168.1.105",
-    port = 8124;
-
-function statFile(dir, filelist, position, callback) {
-    "use strict";
-    if (position >= filelist.length) {
-        return callback(null, filelist);
-    }
-    fs.stat(dir + "/" + filelist[position], function (err, stats) {
-        if (stats && stats.isDirectory()) {
-            filelist[position] = filelist[position] + "/";
-        }
-        statFile(dir, filelist, position + 1, callback);
-    });
-}
-
-function listFiles(dir, callback) {
-    "use strict";
-    fs.readdir(dir, function (err, files) {
-        if (err) {
-            return callback(err);
-        }
-        statFile(dir, files, 0, callback);
-    });
-}
-
-http.createServer(function (request, response) {
-    "use strict";
-    var uri = unescape(url.parse(request.url).pathname),
-        filename = path.join(process.cwd(), uri);
-    if (uri !== '/favicon.ico') {
-        console.log(request.method + " " + uri);
-    }
-    function put() {
-        var contentlength = parseInt(request.headers["content-length"], 10),
-            alldata = new Buffer(contentlength),
-            sum = 0;
-        request.on("data", function (data) {
-            data.copy(alldata, sum, 0);
-            sum += data.length;
-        });
-        request.on("end", function () {
-            fs.writeFile(filename, alldata, "binary", function (err) {
-                if (err) {
-                    response.writeHead(500);
-                    response.write(err);
-                } else {
-                    response.writeHead(200);
-                }
-                response.end();
-            });
-        });
-    }
-    if (request.method === "PUT") {
-        put(request, response);
-        return;
-    }
-    if (request.method === "DELETE") {
-        fs.unlink(filename, function (err) {
-            if (err) {
-                response.writeHead(500);
-            } else {
-                response.writeHead(200);
-            }
-            response.end();
-        });
-        return;
-    }
-    function handleStat(err, stats, lookForIndexHtml) {
-        if (!err && stats.isFile()) {
-            fs.readFile(filename, "binary", function (err, file) {
-                if (err) {
-                    response.writeHead(500, {"Content-Type": "text/plain"});
-                    if (request.method !== "HEAD") {
-                        response.write(err + "\n");
-                    }
-                    response.end();
-                    return;
-                }
-                var head = {"Content-Length": stats.size};
-                if (filename.substr(-3) === ".js") {
-                    head["Content-Type"] = "text/javascript";
-                } else if (filename.substr(-4) === ".css") {
-                    head["Content-Type"] = "text/css";
-                } else if (filename.substr(-4) === ".odt" ||
-                        filename.substr(-5) === ".fodt") {
-                    head["Content-Type"] = "application/vnd.oasis.opendocument.text";
-                } else if (filename.substr(-4) === ".ods" ||
-                        filename.substr(-5) === ".fods") {
-                    head["Content-Type"] = "application/vnd.oasis.opendocument.presentation";
-                } else if (filename.substr(-4) === ".odp" ||
-                        filename.substr(-5) === ".fodp") {
-                    head["Content-Type"] = "application/vnd.oasis.opendocument.spreadsheet";
-                }
-                response.writeHead(200, head);
-                if (request.method !== "HEAD") {
-                    response.write(file, "binary");
-                }
-                response.end();
-            });
-        } else if (!err && stats.isDirectory()) {
-            if (lookForIndexHtml) {
-                fs.stat(filename + "/index.html", function (err, stats) {
-                    if (err) {
-                        fs.stat(filename, handleStat);
-                    } else {
-                        filename = filename + "/index.html";
-                        handleStat(err, stats);
-                    }
-                });
-                return;
-            }
-            if (uri.length === 0 || uri[uri.length - 1] !== "/") {
-                response.writeHead(301, {"Content-Type": "text/plain",
-                        "Location": uri + "/"});
-                if (request.method !== "HEAD") {
-                    response.write("Moved permanently\n");
-                }
-                response.end();
-                return;
-            }
-            listFiles(filename, function (err, files) {
-                if (err) {
-                    response.writeHead(500, {"Content-Type": "text/plain"});
-                    if (request.method !== "HEAD") {
-                        response.write(err + "\n");
-                    }
-                    response.end();
-                    return;
-                }
-                response.writeHead(200);
-                if (request.method !== "HEAD") {
-                    files.sort();
-                    response.write("<html><head><title></title></head><body>");
-                    response.write("<table>");
-                    var i, l = files.length, file;
-                    for (i = 0; i < l; i += 1) {
-                        file = files[i];
-                        if (file.length > 0 && file[file.length - 1] === '/') {
-                            file = encodeURIComponent(file.slice(0, file.length - 1)) + "/";
-                        } else {
-                            file = encodeURIComponent(file);
-                        }
-                        response.write("<tr><td><a href=\"");
-                        response.write(file);
-                        response.write("\">");
-                        file = files[i].replace("&", "&amp;")
-                                .replace("<", "&gt;");
-                        response.write(file.replace("\"", "\\\""));
-                        response.write("</a></td></tr>\n");
-                    }
-                    response.write("</table></body></html>\n");
-                }
-                response.end();
-            });
-        } else {
-            if (uri !== '/favicon.ico') {
-                console.log("Not found: " + uri);
-            }
-            response.writeHead(404, {"Content-Type": "text/plain"});
-            if (request.method !== "HEAD") {
-                response.write("404 Not Found\n");
-            }
-            response.end();
-        }
-    }
-    fs.stat(filename, function (err, stats) {
-        handleStat(err, stats, lookForIndexHtml);
-    });
-}).listen(port, ipaddress);
-
-console.log('Server running at ' + ipaddress + ':' + port + '/');
diff --git a/apps/files_odfviewer/src/webodf/webodf/index.html b/apps/files_odfviewer/src/webodf/webodf/index.html
deleted file mode 100644
index 027a8a9b23..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/index.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html xml:lang="en" lang="en">
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8"></meta>
-  <link rel="stylesheet" type="text/css" href="extjs/resources/css/ext-all.css"/>
-  <!-- requirements -->
-  <script src="extjs/ext-all.js" type="text/javascript" charset="utf-8"></script>
-  <script src="lib/runtime.js" type="text/javascript" charset="utf-8"></script>
-  <script src="filelister.js" type="text/javascript" charset="utf-8"></script>
-  <!-- application -->
-  <script src="gui.js" type="text/javascript" charset="utf-8"></script>
- 
-  <title id="page-title">WebODF</title>
-</head>
-<body>
-</body>
-</html>
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/core/Async.js b/apps/files_odfviewer/src/webodf/webodf/lib/core/Async.js
deleted file mode 100644
index 358a8feee0..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/lib/core/Async.js
+++ /dev/null
@@ -1,65 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global core*/
-
-/**
- * @constructor
- */
-core.Async = function Async() {
-    "use strict";
-    /**
-     * @param {!Array.<*>} items
-     * @param {function(*, !function(!string):undefined):undefined} f
-     * @param {function(?string)} callback
-     * @return {undefined}
-     */
-    this.forEach = function (items, f, callback) {
-        var i, l = items.length, itemsDone = 0;
-        function end(err) {
-            if (itemsDone !== l) {
-                if (err) {
-                    itemsDone = l;
-                    callback(err);
-                } else {
-                    itemsDone += 1;
-                    if (itemsDone === l) {
-                        callback(null);
-                    }
-                }
-            }
-        }
-        for (i = 0; i < l; i += 1) {
-            f(items[i], end);
-        }
-    };
-};
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/core/Base64.js b/apps/files_odfviewer/src/webodf/webodf/lib/core/Base64.js
deleted file mode 100644
index 736f5bb531..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/lib/core/Base64.js
+++ /dev/null
@@ -1,362 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*jslint bitwise: true, regexp: true*/
-/*global core: true, runtime: true*/
-/*
- * $Id: base64.js,v 0.9 2009/03/01 20:51:18 dankogai Exp dankogai $
- */
-/**
- * @namespace
- */
-core.Base64 = (function () {
-    "use strict";
-    var b64chars
-        = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/',
-
-        b64charcodes = (function () {
-            var a = [], i,
-                codeA = 'A'.charCodeAt(0),
-                codea = 'a'.charCodeAt(0),
-                code0 = '0'.charCodeAt(0);
-            for (i = 0; i < 26; i += 1) {
-                a.push(codeA + i);
-            }
-            for (i = 0; i < 26; i += 1) {
-                a.push(codea + i);
-            }
-            for (i = 0; i < 10; i += 1) {
-                a.push(code0 + i);
-            }
-            a.push('+'.charCodeAt(0));
-            a.push('/'.charCodeAt(0));
-            return a;
-        }()),
-
-        b64tab = (function (bin) {
-            var t = {}, i, l;
-            for (i = 0, l = bin.length; i < l; i += 1) {
-                t[bin.charAt(i)] = i;
-            }
-            return t;
-        }(b64chars)),
-        convertUTF16StringToBase64,
-        convertBase64ToUTF16String,
-        btoa, atob;
-
-    /**
-     * @param {!string} s
-     * @return {!Array}
-     */
-    function stringToArray(s) {
-        var a = [], i, l = s.length;
-        for (i = 0; i < l; i += 1) {
-            a[i] = s.charCodeAt(i) & 0xff;
-        }
-        return a;
-    }
-
-    function convertUTF8ArrayToBase64(bin) {
-        var n,
-            b64 = "",
-            i,
-            l = bin.length - 2;
-        for (i = 0; i < l; i += 3) {
-            n = (bin[i] << 16) | (bin[i + 1] << 8) | bin[i + 2];
-            b64 += b64chars[n >>> 18];
-            b64 += b64chars[(n >>> 12) & 63];
-            b64 += b64chars[(n >>>  6) & 63];
-            b64 += b64chars[n          & 63];
-        }
-        if (i === l + 1) { // 1 byte left
-            n = bin[i] << 4;
-            b64 += b64chars[n >>> 6];
-            b64 += b64chars[n & 63];
-            b64 += "==";
-        } else if (i === l) { // 2 bytes left
-            n = (bin[i] << 10) | (bin[i + 1] << 2);
-            b64 += b64chars[n >>> 12];
-            b64 += b64chars[(n >>> 6) & 63];
-            b64 += b64chars[n & 63];
-            b64 += "=";
-        }
-        return b64;
-    }
-
-    function convertBase64ToUTF8Array(b64) {
-        b64 = b64.replace(/[^A-Za-z0-9+\/]+/g, '');
-        var bin = [],
-            padlen = b64.length % 4,
-            i,
-            l = b64.length,
-            n;
-        for (i = 0; i < l; i += 4) {
-            n = ((b64tab[b64.charAt(i)]     || 0) << 18) |
-                ((b64tab[b64.charAt(i + 1)] || 0) << 12) |
-                ((b64tab[b64.charAt(i + 2)] || 0) <<  6) |
-                ((b64tab[b64.charAt(i + 3)] || 0));
-            bin.push(
-                (n >> 16),
-                ((n >>  8) & 0xff),
-                (n         & 0xff)
-            );
-        }
-        bin.length -= [0, 0, 2, 1][padlen];
-        return bin;
-    }
-
-    function convertUTF16ArrayToUTF8Array(uni) {
-        var bin = [], i, l = uni.length, n;
-        for (i = 0; i < l; i += 1) {
-            n = uni[i];
-            if (n < 0x80) {
-                bin.push(n);
-            } else if (n < 0x800) {
-                bin.push(
-                    0xc0 | (n >>>  6),
-                    0x80 | (n & 0x3f)
-                );
-            } else {
-                bin.push(
-                    0xe0 | ((n >>> 12) & 0x0f),
-                    0x80 | ((n >>>  6) & 0x3f),
-                    0x80 |  (n         & 0x3f)
-                );
-            }
-        }
-        return bin;
-    }
-
-    function convertUTF8ArrayToUTF16Array(bin) {
-        var uni = [], i, l = bin.length,
-            c0, c1, c2;
-        for (i = 0; i < l; i += 1) {
-            c0 = bin[i];
-            if (c0 < 0x80) {
-                uni.push(c0);
-            } else {
-                i += 1;
-                c1 = bin[i];
-                if (c0 < 0xe0) {
-                    uni.push(((c0 & 0x1f) << 6) | (c1 & 0x3f));
-                } else {
-                    i += 1;
-                    c2 = bin[i];
-                    uni.push(((c0 & 0x0f) << 12) | ((c1 & 0x3f) << 6) |
-                            (c2 & 0x3f)
-                        );
-                }
-            }
-        }
-        return uni;
-    }
-
-    function convertUTF8StringToBase64(bin) {
-        return convertUTF8ArrayToBase64(stringToArray(bin));
-    }
-
-    function convertBase64ToUTF8String(b64) {
-        return String.fromCharCode.apply(String, convertBase64ToUTF8Array(b64));
-    }
-
-    function convertUTF8StringToUTF16Array(bin) {
-        return convertUTF8ArrayToUTF16Array(stringToArray(bin));
-    }
-
-    function convertUTF8ArrayToUTF16String(bin) {
-        // this conversion is done in chunks to avoid a stack overflow in
-        // apply()
-        var b = convertUTF8ArrayToUTF16Array(bin),
-            r = "",
-            i = 0,
-            chunksize = 45000;
-        while (i < b.length) {
-            r += String.fromCharCode.apply(String, b.slice(i, i + chunksize));
-            i += chunksize;
-        }
-        return r;
-    }
-    /**
-     * @param {!Array.<number>|!string} bin
-     * @param {!number} i
-     * @param {!number} end
-     * @return {!string}
-     */
-    function convertUTF8StringToUTF16String_internal(bin, i, end) {
-        var str = "", c0, c1, c2, j;
-        for (j = i; j < end; j += 1) {
-            c0 = bin.charCodeAt(j) & 0xff;
-            if (c0 < 0x80) {
-                str += String.fromCharCode(c0);
-            } else {
-                j += 1;
-                c1 = bin.charCodeAt(j) & 0xff;
-                if (c0 < 0xe0) {
-                    str += String.fromCharCode(((c0 & 0x1f) << 6) |
-                        (c1 & 0x3f));
-                } else {
-                    j += 1;
-                    c2 = bin.charCodeAt(j) & 0xff;
-                    str += String.fromCharCode(((c0 & 0x0f) << 12) |
-                            ((c1 & 0x3f) << 6) | (c2 & 0x3f));
-                }
-            }
-        }
-        return str;
-    }
-
-    /**
-     * Convert a utf-8 array into a utf-16 string.
-     * The input array is treated as a list of values between 0 and 255.
-     * This function works with a callback and splits the work up in parts
-     * between which it yields to the main thread.
-     * After each part the progress is reported with the callback function that
-     * also passes a booleant that indicates if the job has finished.
-     * If the conversion should stop, the callback should return false.
-     *
-     * @param {!Array.<number>|!string} bin
-     * @param {!function(!string, boolean):boolean} callback
-     * @return {undefined}
-     */
-    function convertUTF8StringToUTF16String(bin, callback) {
-        var partsize = 100000,
-            numparts = bin.length / partsize,
-            str = "",
-            pos = 0;
-        if (bin.length < partsize) {
-            callback(convertUTF8StringToUTF16String_internal(bin, 0,
-                    bin.length), true);
-            return;
-        }
-        // make a local copy if the input is a string, to avoid modification
-        if (typeof bin !== "string") {
-            bin = bin.slice();
-        }
-        function f() {
-            var end = pos + partsize;
-            if (end > bin.length) {
-                end = bin.length;
-            }
-            str += convertUTF8StringToUTF16String_internal(bin, pos, end);
-            pos = end;
-            end = pos === bin.length;
-            if (callback(str, end) && !end) {
-                runtime.setTimeout(f, 0);
-            }
-        }
-        f();
-    }
-
-    function convertUTF16StringToUTF8Array(uni) {
-        return convertUTF16ArrayToUTF8Array(stringToArray(uni));
-    }
-
-    function convertUTF16ArrayToUTF8String(uni) {
-        return String.fromCharCode.apply(String,
-                 convertUTF16ArrayToUTF8Array(uni));
-    }
-
-    function convertUTF16StringToUTF8String(uni) {
-        return String.fromCharCode.apply(String,
-                 convertUTF16ArrayToUTF8Array(stringToArray(uni)));
-    }
-
-    btoa = runtime.getWindow() && runtime.getWindow().btoa;
-    if (btoa) {
-        convertUTF16StringToBase64 = function (uni) {
-            return btoa(convertUTF16StringToUTF8String(uni));
-        };
-    } else {
-        btoa = convertUTF8StringToBase64;
-        convertUTF16StringToBase64 = function (uni) {
-            return convertUTF8ArrayToBase64(convertUTF16StringToUTF8Array(uni));
-        };
-    }
-    atob = runtime.getWindow() && runtime.getWindow().atob;
-    if (atob) {
-        convertBase64ToUTF16String = function (b64) {
-            var b = atob(b64);
-            return convertUTF8StringToUTF16String_internal(b, 0, b.length);
-        };
-    } else {
-        atob = convertBase64ToUTF8String;
-        convertBase64ToUTF16String = function (b64) {
-            return convertUTF8ArrayToUTF16String(convertBase64ToUTF8Array(b64));
-        };
-    }
-
-    /**
-     * @constructor
-     */
-    function Base64() {
-        this.convertUTF8ArrayToBase64 = convertUTF8ArrayToBase64;
-        this.convertByteArrayToBase64 = convertUTF8ArrayToBase64;
-        this.convertBase64ToUTF8Array = convertBase64ToUTF8Array;
-        this.convertBase64ToByteArray = convertBase64ToUTF8Array;
-        this.convertUTF16ArrayToUTF8Array = convertUTF16ArrayToUTF8Array;
-        this.convertUTF16ArrayToByteArray = convertUTF16ArrayToUTF8Array;
-        this.convertUTF8ArrayToUTF16Array = convertUTF8ArrayToUTF16Array;
-        this.convertByteArrayToUTF16Array = convertUTF8ArrayToUTF16Array;
-        this.convertUTF8StringToBase64 = convertUTF8StringToBase64;
-        this.convertBase64ToUTF8String = convertBase64ToUTF8String;
-        this.convertUTF8StringToUTF16Array = convertUTF8StringToUTF16Array;
-        this.convertUTF8ArrayToUTF16String = convertUTF8ArrayToUTF16String;
-        this.convertByteArrayToUTF16String = convertUTF8ArrayToUTF16String;
-        this.convertUTF8StringToUTF16String = convertUTF8StringToUTF16String;
-        this.convertUTF16StringToUTF8Array = convertUTF16StringToUTF8Array;
-        this.convertUTF16StringToByteArray = convertUTF16StringToUTF8Array;
-        this.convertUTF16ArrayToUTF8String = convertUTF16ArrayToUTF8String;
-        this.convertUTF16StringToUTF8String = convertUTF16StringToUTF8String;
-        this.convertUTF16StringToBase64 = convertUTF16StringToBase64;
-        this.convertBase64ToUTF16String = convertBase64ToUTF16String;
-        this.fromBase64 = convertBase64ToUTF8String;
-        this.toBase64 = convertUTF8StringToBase64;
-        this.atob = atob;
-        this.btoa = btoa;
-        this.utob = convertUTF16StringToUTF8String;
-        this.btou = convertUTF8StringToUTF16String;
-        this.encode = convertUTF16StringToBase64;
-        this.encodeURI = function (u) {
-            return convertUTF16StringToBase64(u).replace(/[+\/]/g,
-                    function (m0) {
-                    return m0 === '+' ? '-' : '_';
-                }).replace(/\\=+$/, '');
-        };
-        this.decode = function (a) {
-            return convertBase64ToUTF16String(a.replace(/[\-_]/g,
-                function (m0) {
-                    return m0 === '-' ? '+' : '/';
-                }));
-        };
-    }
-    return Base64;
-}());
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/core/ByteArray.js b/apps/files_odfviewer/src/webodf/webodf/lib/core/ByteArray.js
deleted file mode 100644
index d8a9ddd73d..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/lib/core/ByteArray.js
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global core*/
-/*jslint plusplus: true, bitwise: true */
-/**
- * @constructor
- * @param {!Runtime.ByteArray} data
- */
-core.ByteArray = function ByteArray(data) {
-    "use strict";
-    /**
-     * @type {!number}
-     */
-    this.pos = 0;
-    /**
-     * @type {!Runtime.ByteArray}
-     */
-    this.data = data;
-    /**
-     * @return {number}
-     */
-    this.readUInt32LE = function () {
-        var data = this.data,
-            pos = (this.pos += 4);
-        return (data[--pos] << 24) |
-            (data[--pos] << 16) |
-            (data[--pos] <<  8) |
-            data[--pos];
-    };
-    /**
-     * @return {number}
-     */
-    this.readUInt16LE = function () {
-        var data = this.data,
-            pos = (this.pos += 2);
-        return (data[--pos] << 8) | data[--pos];
-    };
-};
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/core/ByteArrayWriter.js b/apps/files_odfviewer/src/webodf/webodf/lib/core/ByteArrayWriter.js
deleted file mode 100644
index a7838be3dc..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/lib/core/ByteArrayWriter.js
+++ /dev/null
@@ -1,101 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global runtime: true, core: true*/
-/*jslint bitwise: true */
-/**
- * @constructor
- * @param {!string} encoding
- */
-core.ByteArrayWriter = function ByteArrayWriter(encoding) {
-    "use strict";
-    var self = this,
-        data = new runtime.ByteArray(0);
-
-    /**
-     * @param {!core.ByteArrayWriter} writer
-     * @return {undefined}
-     */
-    this.appendByteArrayWriter = function (writer) {
-        data = runtime.concatByteArrays(data, writer.getByteArray());
-    };
-    /**
-     * @param {!Runtime.ByteArray} array
-     * @return {undefined}
-     */
-    this.appendByteArray = function (array) {
-        data = runtime.concatByteArrays(data, array);
-    };
-    /**
-     * @param {!Array.<!number>} array
-     * @return {undefined}
-     */
-    this.appendArray = function (array) {
-        data = runtime.concatByteArrays(data,
-                runtime.byteArrayFromArray(array));
-    };
-    /**
-     * @param {!number} value
-     * @return {undefined}
-     */
-    this.appendUInt16LE = function (value) {
-        self.appendArray([value & 0xff, (value >> 8) & 0xff]);
-    };
-    /**
-     * @param {!number} value
-     * @return {undefined}
-     */
-    this.appendUInt32LE = function (value) {
-        self.appendArray([value & 0xff, (value >> 8) & 0xff,
-                (value >> 16) & 0xff, (value >> 24) & 0xff]);
-    };
-    /**
-     * @param {!string} string
-     * @return {undefined}
-     */
-    this.appendString = function (string) {
-        data = runtime.concatByteArrays(data,
-                runtime.byteArrayFromString(string, encoding));
-    };
-    /**
-     * @return {!number}
-     */
-    this.getLength = function () {
-        return data.length;
-    };
-    /**
-     * @return {!Runtime.ByteArray}
-     */
-    this.getByteArray = function () {
-        return data;
-    };
-};
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/core/Cursor.js b/apps/files_odfviewer/src/webodf/webodf/lib/core/Cursor.js
deleted file mode 100644
index d8f7965388..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/lib/core/Cursor.js
+++ /dev/null
@@ -1,213 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global core: true, Node: true*/
-/**
- * @class
- * A cursor is a dom node that visually represents a cursor in a DOM tree.
- * It should stay synchronized with the selection in the document. When
- * there is only one collapsed selection range, a cursor should be shown at
- * that point.
- *
- * Putting the cursor in the DOM tree modifies the DOM, so care should be taken
- * to keep the selection consistent. If e.g. a selection is drawn over the
- * cursor, and the cursor is updated to the selection, the cursor is removed
- * from the DOM because the selection is not collapsed. This means that the
- * offsets of the selection may have to be changed.
- *
- * When the selection is collapsed, the cursor is placed after the point of the
- * selection and the selection will stay valid. However, if the cursor was
- * placed in the DOM tree and was counted in the offset, the offset in the
- * selection should be decreased by one.
- *
- * Even when the selection allows for a cursor, it might be desireable to hide
- * the cursor by not letting it be part of the DOM.
- *
- * @constructor
- * @param {Selection} selection The selection to which the cursor corresponds
- * @param {Document} document The document in which the cursor is placed
- */
-core.Cursor = function Cursor(selection, document) {
-    "use strict";
-    var cursorns,
-        cursorNode;
-    cursorns = 'urn:webodf:names:cursor';
-    cursorNode = document.createElementNS(cursorns, 'cursor');
-
-    function putCursorIntoTextNode(container, offset) {
-        var len, ref, textnode, parent;
-        parent = container.parentNode;
-        if (offset === 0) {
-            parent.insertBefore(cursorNode, container);
-        } else if (offset === container.length) {
-            parent.appendChild(cursorNode);
-        } else {
-            len = container.length;
-            ref = container.nextSibling;
-            textnode = document.createTextNode(
-                container.substringData(offset, len)
-            );
-            container.deleteData(offset, len);
-            if (ref) {
-                parent.insertBefore(textnode, ref);
-            } else {
-                parent.appendChild(textnode);
-            }
-            parent.insertBefore(cursorNode, textnode);
-        }
-    }
-    function putCursorIntoContainer(container, offset) {
-        var node;
-        node = container.firstChild;
-        while (node && offset) {
-            node = node.nextSibling;
-            offset -= 1;
-        }
-        container.insertBefore(cursorNode, node);
-    }
-    function getPotentialParentOrNode(parent, node) {
-        var n = node;
-        while (n && n !== parent) {
-            n = n.parentNode;
-        }
-        return n || node;
-    }
-    function removeCursorFromSelectionRange(range, cursorpos) {
-        var cursorParent, start, end;
-        cursorParent = cursorNode.parentNode;
-        start = getPotentialParentOrNode(cursorNode, range.startContainer);
-        end = getPotentialParentOrNode(cursorNode, range.endContainer);
-        if (start === cursorNode) {
-            range.setStart(cursorParent, cursorpos);
-        } else if (start === cursorParent &&
-                range.startOffset > cursorpos) {
-            range.setStart(cursorParent, range.startOffset - 1);
-        }
-        if (range.endContainer === cursorNode) {
-            range.setEnd(cursorParent, cursorpos);
-        } else if (range.endContainer === cursorParent &&
-                range.endOffset > cursorpos) {
-            range.setEnd(cursorParent, range.endOffset - 1);
-        }
-    }
-    function adaptRangeToMergedText(range, prev, textnodetomerge, cursorpos) {
-        var diff = prev.length - textnodetomerge.length;
-        if (range.startContainer === textnodetomerge) {
-            range.setStart(prev, diff + range.startOffset);
-        } else if (range.startContainer === prev.parentNode &&
-                range.startOffset === cursorpos) {
-            range.setStart(prev, diff);
-        }
-        if (range.endContainer === textnodetomerge) {
-            range.setEnd(prev, diff + range.endOffset);
-        } else if (range.endContainer === prev.parentNode &&
-                range.endOffset === cursorpos) {
-            range.setEnd(prev, diff);
-        }
-    }
-    function removeCursor() {
-        // if the cursor is part of a selection, the selection must be adapted
-        var i, cursorpos, node, textnodetoremove, range;
-        // if the cursor has no parent, it is already not part of the document
-        // tree
-        if (!cursorNode.parentNode) {
-            return;
-        }
-        // find the position of the cursor in its parent
-        cursorpos = 0;
-        node = cursorNode.parentNode.firstChild;
-        while (node && node !== cursorNode) {
-            cursorpos += 1;
-            node = node.nextSibling;
-        }
-        // Check if removing the node will result in a merge of texts.
-        // This will happen if the cursor is between two text nodes.
-        // The text of the text node after the cursor is put in the text node
-        // before the cursor. The latter node is removed after the selection
-        // has been adapted.
-        if (cursorNode.previousSibling &&
-                cursorNode.previousSibling.nodeType === 3 && // TEXT_NODE
-                cursorNode.nextSibling &&
-                cursorNode.nextSibling.nodeType === 3) { // TEXT_NODE
-            textnodetoremove = cursorNode.nextSibling;
-            cursorNode.previousSibling.appendData(textnodetoremove.nodeValue);
-        }
-        // remove the node from the selections
-        for (i = 0; i < selection.rangeCount; i += 1) {
-            removeCursorFromSelectionRange(selection.getRangeAt(i), cursorpos);
-        }
-        // merge the texts that surround the cursor
-        if (textnodetoremove) {
-            for (i = 0; i < selection.rangeCount; i += 1) {
-                adaptRangeToMergedText(selection.getRangeAt(i),
-                       cursorNode.previousSibling, textnodetoremove, cursorpos);
-            }
-            textnodetoremove.parentNode.removeChild(textnodetoremove);
-        }
-        cursorNode.parentNode.removeChild(cursorNode);
-    }
-    // put the cursor at a particular position
-    function putCursor(container, offset) {
-        if (container.nodeType === 3) { // TEXT_NODE
-            putCursorIntoTextNode(container, offset);
-        } else if (container.nodeType !== 9) { // DOCUMENT_NODE
-            putCursorIntoContainer(container, offset);
-        }
-    }
-    /**
-     * Obtain the node representing the cursor.
-     * @return {Element}
-     */
-    this.getNode = function () {
-        return cursorNode;
-    };
-    /**
-     * Synchronize the cursor with the current selection.
-     * If there is a single collapsed selection range, the cursor will be placed
-     * there. If not, the cursor will be removed from the document tree.
-     * @return {undefined}
-     */
-    this.updateToSelection = function () {
-        var range;
-        removeCursor();
-        if (selection.focusNode) {
-            putCursor(selection.focusNode, selection.focusOffset);
-        }
-    };
-    /**
-     * Remove the cursor from the document tree.
-     * @return {undefined}
-     */
-    this.remove = function () {
-        removeCursor();
-    };
-};
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/core/JSLint.js b/apps/files_odfviewer/src/webodf/webodf/lib/core/JSLint.js
deleted file mode 100644
index b3e422ef59..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/lib/core/JSLint.js
+++ /dev/null
@@ -1,6403 +0,0 @@
-// jslint.js
-// 2012-04-15
-
-// Copyright (c) 2002 Douglas Crockford  (www.JSLint.com)
-
-// 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 shall be used for Good, not Evil.
-
-// 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.
-
-// WARNING: JSLint will hurt your feelings.
-
-// JSLINT is a global function. It takes two parameters.
-
-//     var myResult = JSLINT(source, option);
-
-// The first parameter is either a string or an array of strings. If it is a
-// string, it will be split on '\n' or '\r'. If it is an array of strings, it
-// is assumed that each string represents one line. The source can be a
-// JavaScript text, or HTML text, or a JSON text, or a CSS text.
-
-// The second parameter is an optional object of options that control the
-// operation of JSLINT. Most of the options are booleans: They are all
-// optional and have a default value of false. One of the options, predef,
-// can be an array of names, which will be used to declare global variables,
-// or an object whose keys are used as global names, with a boolean value
-// that determines if they are assignable.
-
-// If it checks out, JSLINT returns true. Otherwise, it returns false.
-
-// If false, you can inspect JSLINT.errors to find out the problems.
-// JSLINT.errors is an array of objects containing these properties:
-
-//  {
-//      line      : The line (relative to 0) at which the lint was found
-//      character : The character (relative to 0) at which the lint was found
-//      reason    : The problem
-//      evidence  : The text line in which the problem occurred
-//      raw       : The raw message before the details were inserted
-//      a         : The first detail
-//      b         : The second detail
-//      c         : The third detail
-//      d         : The fourth detail
-//  }
-
-// If a stopping error was found, a null will be the last element of the
-// JSLINT.errors array. A stopping error means that JSLint was not confident
-// enough to continue. It does not necessarily mean that the error was
-// especially heinous.
-
-// You can request a Function Report, which shows all of the functions
-// and the parameters and vars that they use. This can be used to find
-// implied global variables and other problems. The report is in HTML and
-// can be inserted in an HTML <body>.
-
-//     var myReport = JSLINT.report(errors_only);
-
-// If errors_only is true, then the report will be limited to only errors.
-
-// You can request a data structure that contains JSLint's results.
-
-//     var myData = JSLINT.data();
-
-// It returns a structure with this form:
-
-//     {
-//         errors: [
-//             {
-//                 line: NUMBER,
-//                 character: NUMBER,
-//                 reason: STRING,
-//                 evidence: STRING
-//             }
-//         ],
-//         functions: [
-//             {
-//                 name: STRING,
-//                 line: NUMBER,
-//                 last: NUMBER,
-//                 params: [
-//                     {
-//                         string: STRING
-//                     }
-//                 ],
-//                 closure: [
-//                     STRING
-//                 ],
-//                 var: [
-//                     STRING
-//                 ],
-//                 exception: [
-//                     STRING
-//                 ],
-//                 outer: [
-//                     STRING
-//                 ],
-//                 unused: [
-//                     STRING
-//                 ],
-//                 undef: [
-//                     STRING
-//                 ],
-//                 global: [
-//                     STRING
-//                 ],
-//                 label: [
-//                     STRING
-//                 ]
-//             }
-//         ],
-//         globals: [
-//             STRING
-//         ],
-//         member: {
-//             STRING: NUMBER
-//         },
-//         urls: [
-//             STRING
-//         ],
-//         json: BOOLEAN
-//     }
-
-// Empty arrays will not be included.
-
-// You can obtain the parse tree that JSLint constructed while parsing. The
-// latest tree is kept in JSLINT.tree. A nice stringication can be produced
-// with
-
-//     JSON.stringify(JSLINT.tree, [
-//         'string',  'arity', 'name',  'first',
-//         'second', 'third', 'block', 'else'
-//     ], 4));
-
-// JSLint provides three directives. They look like slashstar comments, and
-// allow for setting options, declaring global variables, and establishing a
-// set of allowed property names.
-
-// These directives respect function scope.
-
-// The jslint directive is a special comment that can set one or more options.
-// The current option set is
-
-//     anon       true, if the space may be omitted in anonymous function declarations
-//     bitwise    true, if bitwise operators should be allowed
-//     browser    true, if the standard browser globals should be predefined
-//     cap        true, if upper case HTML should be allowed
-//     'continue' true, if the continuation statement should be tolerated
-//     css        true, if CSS workarounds should be tolerated
-//     debug      true, if debugger statements should be allowed
-//     devel      true, if logging should be allowed (console, alert, etc.)
-//     eqeq       true, if == should be allowed
-//     es5        true, if ES5 syntax should be allowed
-//     evil       true, if eval should be allowed
-//     forin      true, if for in statements need not filter
-//     fragment   true, if HTML fragments should be allowed
-//     indent     the indentation factor
-//     maxerr     the maximum number of errors to allow
-//     maxlen     the maximum length of a source line
-//     newcap     true, if constructor names capitalization is ignored
-//     node       true, if Node.js globals should be predefined
-//     nomen      true, if names may have dangling _
-//     on         true, if HTML event handlers should be allowed
-//     passfail   true, if the scan should stop on first error
-//     plusplus   true, if increment/decrement should be allowed
-//     properties true, if all property names must be declared with /*properties*/
-//     regexp     true, if the . should be allowed in regexp literals
-//     rhino      true, if the Rhino environment globals should be predefined
-//     undef      true, if variables can be declared out of order
-//     unparam    true, if unused parameters should be tolerated
-//     sloppy     true, if the 'use strict'; pragma is optional
-//     stupid     true, if really stupid practices are tolerated
-//     sub        true, if all forms of subscript notation are tolerated
-//     vars       true, if multiple var statements per function should be allowed
-//     white      true, if sloppy whitespace is tolerated
-//     widget     true  if the Yahoo Widgets globals should be predefined
-//     windows    true, if MS Windows-specific globals should be predefined
-
-// For example:
-
-/*jslint
-    evil: true, nomen: true, regexp: true
-*/
-
-// The properties directive declares an exclusive list of property names.
-// Any properties named in the program that are not in the list will
-// produce a warning.
-
-// For example:
-
-/*properties
-    '\b', '\t', '\n', '\f', '\r', '!', '!=', '!==', '"', '%', '\'',
-    '(arguments)', '(begin)', '(breakage)', '(context)', '(error)',
-    '(identifier)', '(line)', '(loopage)', '(name)', '(params)', '(scope)',
-    '(token)', '(vars)', '(verb)', '*', '+', '-', '/', '<', '<=', '==',
-    '===', '>', '>=', ADSAFE, Array, Date, Function, Object, '\\', a,
-    a_label, a_not_allowed, a_not_defined, a_scope, abbr, acronym, address,
-    adsafe, adsafe_a, adsafe_autocomplete, adsafe_bad_id, adsafe_div,
-    adsafe_fragment, adsafe_go, adsafe_html, adsafe_id, adsafe_id_go, adsafe_lib,
-    adsafe_lib_second, adsafe_missing_id, adsafe_name_a, adsafe_placement,
-    adsafe_prefix_a, adsafe_script, adsafe_source, adsafe_subscript_a,
-    adsafe_tag, all, already_defined, and, anon, applet, apply, approved, area,
-    arity, article, aside, assign, assign_exception,
-    assignment_function_expression, at, attribute_case_a, audio, autocomplete,
-    avoid_a, b, background, 'background-attachment', 'background-color',
-    'background-image', 'background-position', 'background-repeat',
-    bad_assignment, bad_color_a, bad_constructor, bad_entity, bad_html, bad_id_a,
-    bad_in_a, bad_invocation, bad_name_a, bad_new, bad_number, bad_operand,
-    bad_style, bad_type, bad_url_a, bad_wrap, base, bdo, big, bitwise, block,
-    blockquote, body, border, 'border-bottom', 'border-bottom-color',
-    'border-bottom-left-radius', 'border-bottom-right-radius',
-    'border-bottom-style', 'border-bottom-width', 'border-collapse',
-    'border-color', 'border-left', 'border-left-color', 'border-left-style',
-    'border-left-width', 'border-radius', 'border-right', 'border-right-color',
-    'border-right-style', 'border-right-width', 'border-spacing', 'border-style',
-    'border-top', 'border-top-color', 'border-top-left-radius',
-    'border-top-right-radius', 'border-top-style', 'border-top-width',
-    'border-width', bottom, br, braille, browser, button, c, call, canvas, cap,
-    caption, 'caption-side', center, charAt, charCodeAt, character, cite, clear,
-    clip, closure, cm, code, col, colgroup, color, combine_var, command,
-    conditional_assignment, confusing_a, confusing_regexp, constructor_name_a,
-    content, continue, control_a, 'counter-increment', 'counter-reset', create,
-    css, cursor, d, dangerous_comment, dangling_a, data, datalist, dd, debug,
-    del, deleted, details, devel, dfn, dialog, dir, direction, display, disrupt,
-    div, dl, dt, duplicate_a, edge, edition, else, em, embed, embossed, empty,
-    'empty-cells', empty_block, empty_case, empty_class, entityify, eqeq, errors,
-    es5, eval, evidence, evil, ex, exception, exec, expected_a,
-    expected_a_at_b_c, expected_a_b, expected_a_b_from_c_d, expected_at_a,
-    expected_attribute_a, expected_attribute_value_a, expected_class_a,
-    expected_fraction_a, expected_id_a, expected_identifier_a,
-    expected_identifier_a_reserved, expected_lang_a, expected_linear_a,
-    expected_media_a, expected_name_a, expected_nonstandard_style_attribute,
-    expected_number_a, expected_operator_a, expected_percent_a,
-    expected_positive_a, expected_pseudo_a, expected_selector_a,
-    expected_small_a, expected_space_a_b, expected_string_a,
-    expected_style_attribute, expected_style_pattern, expected_tagname_a,
-    expected_type_a, f, fieldset, figure, filter, first, flag, float, floor,
-    font, 'font-family', 'font-size', 'font-size-adjust', 'font-stretch',
-    'font-style', 'font-variant', 'font-weight', footer, forEach, for_if, forin,
-    form, fragment, frame, frameset, from, fromCharCode, fud, funct, function,
-    function_block, function_eval, function_loop, function_statement,
-    function_strict, functions, global, globals, h1, h2, h3, h4, h5, h6,
-    handheld, hasOwnProperty, head, header, height, hgroup, hr,
-    'hta:application', html, html_confusion_a, html_handlers, i, id, identifier,
-    identifier_function, iframe, img, immed, implied_evil, in, indent, indexOf,
-    infix_in, init, input, ins, insecure_a, isAlpha, isArray, isDigit, isNaN,
-    join, jslint, json, kbd, keygen, keys, label, labeled, lang, lbp,
-    leading_decimal_a, led, left, legend, length, 'letter-spacing', li, lib,
-    line, 'line-height', link, 'list-style', 'list-style-image',
-    'list-style-position', 'list-style-type', map, margin, 'margin-bottom',
-    'margin-left', 'margin-right', 'margin-top', mark, 'marker-offset', match,
-    'max-height', 'max-width', maxerr, maxlen, member, menu, message, meta,
-    meter, 'min-height', 'min-width', missing_a, missing_a_after_b,
-    missing_option, missing_property, missing_space_a_b, missing_url,
-    missing_use_strict, mixed, mm, mode, move_invocation, move_var, n, name,
-    name_function, nav, nested_comment, newcap, node, noframes, nomen, noscript,
-    not, not_a_constructor, not_a_defined, not_a_function, not_a_label,
-    not_a_scope, not_greater, nud, number, object, octal_a, ol, on, opacity,
-    open, optgroup, option, outer, outline, 'outline-color', 'outline-style',
-    'outline-width', output, overflow, 'overflow-x', 'overflow-y', p, padding,
-    'padding-bottom', 'padding-left', 'padding-right', 'padding-top',
-    'page-break-after', 'page-break-before', param, parameter_a_get_b,
-    parameter_arguments_a, parameter_set_a, params, paren, parent, passfail, pc,
-    plusplus, pop, position, postscript, pre, predef, print, progress,
-    projection, properties, prototype, pt, push, px, q, quote, quotes, r, radix,
-    range, raw, read_only, reason, redefinition_a, regexp, replace, report,
-    reserved, reserved_a, rhino, right, rp, rt, ruby, safe, samp, scanned_a_b,
-    screen, script, search, second, section, select, shift, slash_equal, slice,
-    sloppy, small, sort, source, span, speech, split, src, statement_block,
-    stopping, strange_loop, strict, string, strong, stupid, style, styleproperty,
-    sub, subscript, substr, sup, supplant, sync_a, t, table, 'table-layout',
-    tag_a_in_b, tbody, td, test, 'text-align', 'text-decoration', 'text-indent',
-    'text-shadow', 'text-transform', textarea, tfoot, th, thead, third, thru,
-    time, title, toLowerCase, toString, toUpperCase, token, too_long, too_many,
-    top, tr, trailing_decimal_a, tree, tt, tty, tv, type, u, ul, unclosed,
-    unclosed_comment, unclosed_regexp, undef, undefined, unescaped_a,
-    unexpected_a, unexpected_char_a_b, unexpected_comment, unexpected_else,
-    unexpected_label_a, unexpected_property_a, unexpected_space_a_b,
-    'unicode-bidi', unnecessary_initialize, unnecessary_use, unparam,
-    unreachable_a_b, unrecognized_style_attribute_a, unrecognized_tag_a, unsafe,
-    unused, url, urls, use_array, use_braces, use_charAt, use_object, use_or,
-    use_param, used_before_a, var, var_a_not, vars, 'vertical-align', video,
-    visibility, was, weird_assignment, weird_condition, weird_new, weird_program,
-    weird_relation, weird_ternary, white, 'white-space', widget, width, windows,
-    'word-spacing', 'word-wrap', wrap, wrap_immediate, wrap_regexp,
-    write_is_wrong, writeable, 'z-index'
-*/
-
-// The global directive is used to declare global variables that can
-// be accessed by the program. If a declaration is true, then the variable
-// is writeable. Otherwise, it is read-only.
-
-// We build the application inside a function so that we produce only a single
-// global variable. That function will be invoked immediately, and its return
-// value is the JSLINT function itself. That function is also an object that
-// can contain data and other functions.
-
-var JSLINT = (function () {
-    'use strict';
-
-    function array_to_object(array, value) {
-
-// Make an object from an array of keys and a common value.
-
-        var i, length = array.length, object = {};
-        for (i = 0; i < length; i += 1) {
-            object[array[i]] = value;
-        }
-        return object;
-    }
-
-
-    var adsafe_id,      // The widget's ADsafe id.
-        adsafe_may,     // The widget may load approved scripts.
-        adsafe_top,     // At the top of the widget script.
-        adsafe_went,    // ADSAFE.go has been called.
-        allowed_option = {
-            anon      : true,
-            bitwise   : true,
-            browser   : true,
-            cap       : true,
-            'continue': true,
-            css       : true,
-            debug     : true,
-            devel     : true,
-            eqeq      : true,
-            es5       : true,
-            evil      : true,
-            forin     : true,
-            fragment  : true,
-            indent    :   10,
-            maxerr    : 1000,
-            maxlen    :  256,
-            newcap    : true,
-            node      : true,
-            nomen     : true,
-            on        : true,
-            passfail  : true,
-            plusplus  : true,
-            properties: true,
-            regexp    : true,
-            rhino     : true,
-            undef     : true,
-            unparam   : true,
-            sloppy    : true,
-            stupid    : true,
-            sub       : true,
-            vars      : true,
-            white     : true,
-            widget    : true,
-            windows   : true
-        },
-        anonname,       // The guessed name for anonymous functions.
-        approved,       // ADsafe approved urls.
-
-// These are operators that should not be used with the ! operator.
-
-        bang = {
-            '<'  : true,
-            '<=' : true,
-            '==' : true,
-            '===': true,
-            '!==': true,
-            '!=' : true,
-            '>'  : true,
-            '>=' : true,
-            '+'  : true,
-            '-'  : true,
-            '*'  : true,
-            '/'  : true,
-            '%'  : true
-        },
-
-// These are property names that should not be permitted in the safe subset.
-
-        banned = array_to_object([
-            'arguments', 'callee', 'caller', 'constructor', 'eval', 'prototype',
-            'stack', 'unwatch', 'valueOf', 'watch'
-        ], true),
-        begin,          // The root token
-
-// browser contains a set of global names that are commonly provided by a
-// web browser environment.
-
-        browser = array_to_object([
-            'clearInterval', 'clearTimeout', 'document', 'event', 'FormData',
-            'frames', 'history', 'Image', 'localStorage', 'location', 'name',
-            'navigator', 'Option', 'parent', 'screen', 'sessionStorage',
-            'setInterval', 'setTimeout', 'Storage', 'window', 'XMLHttpRequest'
-        ], false),
-
-// bundle contains the text messages.
-
-        bundle = {
-            a_label: "'{a}' is a statement label.",
-            a_not_allowed: "'{a}' is not allowed.",
-            a_not_defined: "'{a}' is not defined.",
-            a_scope: "'{a}' used out of scope.",
-            adsafe_a: "ADsafe violation: '{a}'.",
-            adsafe_autocomplete: "ADsafe autocomplete violation.",
-            adsafe_bad_id: "ADSAFE violation: bad id.",
-            adsafe_div: "ADsafe violation: Wrap the widget in a div.",
-            adsafe_fragment: "ADSAFE: Use the fragment option.",
-            adsafe_go: "ADsafe violation: Misformed ADSAFE.go.",
-            adsafe_html: "Currently, ADsafe does not operate on whole HTML " +
-                "documents. It operates on <div> fragments and .js files.",
-            adsafe_id: "ADsafe violation: id does not match.",
-            adsafe_id_go: "ADsafe violation: Missing ADSAFE.id or ADSAFE.go.",
-            adsafe_lib: "ADsafe lib violation.",
-            adsafe_lib_second: "ADsafe: The second argument to lib must be a function.",
-            adsafe_missing_id: "ADSAFE violation: missing ID_.",
-            adsafe_name_a: "ADsafe name violation: '{a}'.",
-            adsafe_placement: "ADsafe script placement violation.",
-            adsafe_prefix_a: "ADsafe violation: An id must have a '{a}' prefix",
-            adsafe_script: "ADsafe script violation.",
-            adsafe_source: "ADsafe unapproved script source.",
-            adsafe_subscript_a: "ADsafe subscript '{a}'.",
-            adsafe_tag: "ADsafe violation: Disallowed tag '{a}'.",
-            already_defined: "'{a}' is already defined.",
-            and: "The '&&' subexpression should be wrapped in parens.",
-            assign_exception: "Do not assign to the exception parameter.",
-            assignment_function_expression: "Expected an assignment or " +
-                "function call and instead saw an expression.",
-            attribute_case_a: "Attribute '{a}' not all lower case.",
-            avoid_a: "Avoid '{a}'.",
-            bad_assignment: "Bad assignment.",
-            bad_color_a: "Bad hex color '{a}'.",
-            bad_constructor: "Bad constructor.",
-            bad_entity: "Bad entity.",
-            bad_html: "Bad HTML string",
-            bad_id_a: "Bad id: '{a}'.",
-            bad_in_a: "Bad for in variable '{a}'.",
-            bad_invocation: "Bad invocation.",
-            bad_name_a: "Bad name: '{a}'.",
-            bad_new: "Do not use 'new' for side effects.",
-            bad_number: "Bad number '{a}'.",
-            bad_operand: "Bad operand.",
-            bad_style: "Bad style.",
-            bad_type: "Bad type.",
-            bad_url_a: "Bad url '{a}'.",
-            bad_wrap: "Do not wrap function literals in parens unless they " +
-                "are to be immediately invoked.",
-            combine_var: "Combine this with the previous 'var' statement.",
-            conditional_assignment: "Expected a conditional expression and " +
-                "instead saw an assignment.",
-            confusing_a: "Confusing use of '{a}'.",
-            confusing_regexp: "Confusing regular expression.",
-            constructor_name_a: "A constructor name '{a}' should start with " +
-                "an uppercase letter.",
-            control_a: "Unexpected control character '{a}'.",
-            css: "A css file should begin with @charset 'UTF-8';",
-            dangling_a: "Unexpected dangling '_' in '{a}'.",
-            dangerous_comment: "Dangerous comment.",
-            deleted: "Only properties should be deleted.",
-            duplicate_a: "Duplicate '{a}'.",
-            empty_block: "Empty block.",
-            empty_case: "Empty case.",
-            empty_class: "Empty class.",
-            es5: "This is an ES5 feature.",
-            evil: "eval is evil.",
-            expected_a: "Expected '{a}'.",
-            expected_a_b: "Expected '{a}' and instead saw '{b}'.",
-            expected_a_b_from_c_d: "Expected '{a}' to match '{b}' from line " +
-                "{c} and instead saw '{d}'.",
-            expected_at_a: "Expected an at-rule, and instead saw @{a}.",
-            expected_a_at_b_c: "Expected '{a}' at column {b}, not column {c}.",
-            expected_attribute_a: "Expected an attribute, and instead saw [{a}].",
-            expected_attribute_value_a: "Expected an attribute value and " +
-                "instead saw '{a}'.",
-            expected_class_a: "Expected a class, and instead saw .{a}.",
-            expected_fraction_a: "Expected a number between 0 and 1 and " +
-                "instead saw '{a}'",
-            expected_id_a: "Expected an id, and instead saw #{a}.",
-            expected_identifier_a: "Expected an identifier and instead saw '{a}'.",
-            expected_identifier_a_reserved: "Expected an identifier and " +
-                "instead saw '{a}' (a reserved word).",
-            expected_linear_a: "Expected a linear unit and instead saw '{a}'.",
-            expected_lang_a: "Expected a lang code, and instead saw :{a}.",
-            expected_media_a: "Expected a CSS media type, and instead saw '{a}'.",
-            expected_name_a: "Expected a name and instead saw '{a}'.",
-            expected_nonstandard_style_attribute: "Expected a non-standard " +
-                "style attribute and instead saw '{a}'.",
-            expected_number_a: "Expected a number and instead saw '{a}'.",
-            expected_operator_a: "Expected an operator and instead saw '{a}'.",
-            expected_percent_a: "Expected a percentage and instead saw '{a}'",
-            expected_positive_a: "Expected a positive number and instead saw '{a}'",
-            expected_pseudo_a: "Expected a pseudo, and instead saw :{a}.",
-            expected_selector_a: "Expected a CSS selector, and instead saw {a}.",
-            expected_small_a: "Expected a small positive integer and instead saw '{a}'",
-            expected_space_a_b: "Expected exactly one space between '{a}' and '{b}'.",
-            expected_string_a: "Expected a string and instead saw {a}.",
-            expected_style_attribute: "Excepted a style attribute, and instead saw '{a}'.",
-            expected_style_pattern: "Expected a style pattern, and instead saw '{a}'.",
-            expected_tagname_a: "Expected a tagName, and instead saw {a}.",
-            expected_type_a: "Expected a type, and instead saw {a}.",
-            for_if: "The body of a for in should be wrapped in an if " +
-                "statement to filter unwanted properties from the prototype.",
-            function_block: "Function statements should not be placed in blocks. " +
-                "Use a function expression or move the statement to the top of " +
-                "the outer function.",
-            function_eval: "The Function constructor is eval.",
-            function_loop: "Don't make functions within a loop.",
-            function_statement: "Function statements are not invocable. " +
-                "Wrap the whole function invocation in parens.",
-            function_strict: "Use the function form of 'use strict'.",
-            html_confusion_a: "HTML confusion in regular expression '<{a}'.",
-            html_handlers: "Avoid HTML event handlers.",
-            identifier_function: "Expected an identifier in an assignment " +
-                "and instead saw a function invocation.",
-            implied_evil: "Implied eval is evil. Pass a function instead of a string.",
-            infix_in: "Unexpected 'in'. Compare with undefined, or use the " +
-                "hasOwnProperty method instead.",
-            insecure_a: "Insecure '{a}'.",
-            isNaN: "Use the isNaN function to compare with NaN.",
-            lang: "lang is deprecated.",
-            leading_decimal_a: "A leading decimal point can be confused with a dot: '.{a}'.",
-            missing_a: "Missing '{a}'.",
-            missing_a_after_b: "Missing '{a}' after '{b}'.",
-            missing_option: "Missing option value.",
-            missing_property: "Missing property name.",
-            missing_space_a_b: "Missing space between '{a}' and '{b}'.",
-            missing_url: "Missing url.",
-            missing_use_strict: "Missing 'use strict' statement.",
-            mixed: "Mixed spaces and tabs.",
-            move_invocation: "Move the invocation into the parens that " +
-                "contain the function.",
-            move_var: "Move 'var' declarations to the top of the function.",
-            name_function: "Missing name in function statement.",
-            nested_comment: "Nested comment.",
-            not: "Nested not.",
-            not_a_constructor: "Do not use {a} as a constructor.",
-            not_a_defined: "'{a}' has not been fully defined yet.",
-            not_a_function: "'{a}' is not a function.",
-            not_a_label: "'{a}' is not a label.",
-            not_a_scope: "'{a}' is out of scope.",
-            not_greater: "'{a}' should not be greater than '{b}'.",
-            octal_a: "Don't use octal: '{a}'. Use '\\u....' instead.",
-            parameter_arguments_a: "Do not mutate parameter '{a}' when using 'arguments'.",
-            parameter_a_get_b: "Unexpected parameter '{a}' in get {b} function.",
-            parameter_set_a: "Expected parameter (value) in set {a} function.",
-            radix: "Missing radix parameter.",
-            read_only: "Read only.",
-            redefinition_a: "Redefinition of '{a}'.",
-            reserved_a: "Reserved name '{a}'.",
-            scanned_a_b: "{a} ({b}% scanned).",
-            slash_equal: "A regular expression literal can be confused with '/='.",
-            statement_block: "Expected to see a statement and instead saw a block.",
-            stopping: "Stopping. ",
-            strange_loop: "Strange loop.",
-            strict: "Strict violation.",
-            subscript: "['{a}'] is better written in dot notation.",
-            sync_a: "Unexpected sync method: '{a}'.",
-            tag_a_in_b: "A '<{a}>' must be within '<{b}>'.",
-            too_long: "Line too long.",
-            too_many: "Too many errors.",
-            trailing_decimal_a: "A trailing decimal point can be confused " +
-                "with a dot: '.{a}'.",
-            type: "type is unnecessary.",
-            unclosed: "Unclosed string.",
-            unclosed_comment: "Unclosed comment.",
-            unclosed_regexp: "Unclosed regular expression.",
-            unescaped_a: "Unescaped '{a}'.",
-            unexpected_a: "Unexpected '{a}'.",
-            unexpected_char_a_b: "Unexpected character '{a}' in {b}.",
-            unexpected_comment: "Unexpected comment.",
-            unexpected_else: "Unexpected 'else' after 'return'.",
-            unexpected_label_a: "Unexpected label '{a}'.",
-            unexpected_property_a: "Unexpected /*property*/ '{a}'.",
-            unexpected_space_a_b: "Unexpected space between '{a}' and '{b}'.",
-            unnecessary_initialize: "It is not necessary to initialize '{a}' " +
-                "to 'undefined'.",
-            unnecessary_use: "Unnecessary 'use strict'.",
-            unreachable_a_b: "Unreachable '{a}' after '{b}'.",
-            unrecognized_style_attribute_a: "Unrecognized style attribute '{a}'.",
-            unrecognized_tag_a: "Unrecognized tag '<{a}>'.",
-            unsafe: "Unsafe character.",
-            url: "JavaScript URL.",
-            use_array: "Use the array literal notation [].",
-            use_braces: "Spaces are hard to count. Use {{a}}.",
-            use_charAt: "Use the charAt method.",
-            use_object: "Use the object literal notation {}.",
-            use_or: "Use the || operator.",
-            use_param: "Use a named parameter.",
-            used_before_a: "'{a}' was used before it was defined.",
-            var_a_not: "Variable {a} was not declared correctly.",
-            weird_assignment: "Weird assignment.",
-            weird_condition: "Weird condition.",
-            weird_new: "Weird construction. Delete 'new'.",
-            weird_program: "Weird program.",
-            weird_relation: "Weird relation.",
-            weird_ternary: "Weird ternary.",
-            wrap_immediate: "Wrap an immediate function invocation in parentheses " +
-                "to assist the reader in understanding that the expression " +
-                "is the result of a function, and not the function itself.",
-            wrap_regexp: "Wrap the /regexp/ literal in parens to " +
-                "disambiguate the slash operator.",
-            write_is_wrong: "document.write can be a form of eval."
-        },
-        comments_off,
-        css_attribute_data,
-        css_any,
-
-        css_colorData = array_to_object([
-            "aliceblue", "antiquewhite", "aqua", "aquamarine", "azure", "beige",
-            "bisque", "black", "blanchedalmond", "blue", "blueviolet", "brown",
-            "burlywood", "cadetblue", "chartreuse", "chocolate", "coral",
-            "cornflowerblue", "cornsilk", "crimson", "cyan", "darkblue",
-            "darkcyan", "darkgoldenrod", "darkgray", "darkgreen", "darkkhaki",
-            "darkmagenta", "darkolivegreen", "darkorange", "darkorchid",
-            "darkred", "darksalmon", "darkseagreen", "darkslateblue",
-            "darkslategray", "darkturquoise", "darkviolet", "deeppink",
-            "deepskyblue", "dimgray", "dodgerblue", "firebrick", "floralwhite",
-            "forestgreen", "fuchsia", "gainsboro", "ghostwhite", "gold",
-            "goldenrod", "gray", "green", "greenyellow", "honeydew", "hotpink",
-            "indianred", "indigo", "ivory", "khaki", "lavender",
-            "lavenderblush", "lawngreen", "lemonchiffon", "lightblue",
-            "lightcoral", "lightcyan", "lightgoldenrodyellow", "lightgreen",
-            "lightpink", "lightsalmon", "lightseagreen", "lightskyblue",
-            "lightslategray", "lightsteelblue", "lightyellow", "lime",
-            "limegreen", "linen", "magenta", "maroon", "mediumaquamarine",
-            "mediumblue", "mediumorchid", "mediumpurple", "mediumseagreen",
-            "mediumslateblue", "mediumspringgreen", "mediumturquoise",
-            "mediumvioletred", "midnightblue", "mintcream", "mistyrose",
-            "moccasin", "navajowhite", "navy", "oldlace", "olive", "olivedrab",
-            "orange", "orangered", "orchid", "palegoldenrod", "palegreen",
-            "paleturquoise", "palevioletred", "papayawhip", "peachpuff",
-            "peru", "pink", "plum", "powderblue", "purple", "red", "rosybrown",
-            "royalblue", "saddlebrown", "salmon", "sandybrown", "seagreen",
-            "seashell", "sienna", "silver", "skyblue", "slateblue", "slategray",
-            "snow", "springgreen", "steelblue", "tan", "teal", "thistle",
-            "tomato", "turquoise", "violet", "wheat", "white", "whitesmoke",
-            "yellow", "yellowgreen",
-
-            "activeborder", "activecaption", "appworkspace", "background",
-            "buttonface", "buttonhighlight", "buttonshadow", "buttontext",
-            "captiontext", "graytext", "highlight", "highlighttext",
-            "inactiveborder", "inactivecaption", "inactivecaptiontext",
-            "infobackground", "infotext", "menu", "menutext", "scrollbar",
-            "threeddarkshadow", "threedface", "threedhighlight",
-            "threedlightshadow", "threedshadow", "window", "windowframe",
-            "windowtext"
-        ], true),
-
-        css_border_style,
-        css_break,
-
-        css_lengthData = {
-            '%': true,
-            'cm': true,
-            'em': true,
-            'ex': true,
-            'in': true,
-            'mm': true,
-            'pc': true,
-            'pt': true,
-            'px': true
-        },
-
-        css_media,
-        css_overflow,
-
-        descapes = {
-            'b': '\b',
-            't': '\t',
-            'n': '\n',
-            'f': '\f',
-            'r': '\r',
-            '"': '"',
-            '/': '/',
-            '\\': '\\',
-            '!': '!'
-        },
-
-        devel = array_to_object([
-            'alert', 'confirm', 'console', 'Debug', 'opera', 'prompt', 'WSH'
-        ], false),
-        directive,
-        escapes = {
-            '\b': '\\b',
-            '\t': '\\t',
-            '\n': '\\n',
-            '\f': '\\f',
-            '\r': '\\r',
-            '\'': '\\\'',
-            '"' : '\\"',
-            '/' : '\\/',
-            '\\': '\\\\'
-        },
-
-        funct,          // The current function, including the labels used in
-                        // the function, as well as (breakage),
-                        // (context), (loopage), (name), (params), (token),
-                        // (vars), (verb)
-
-        functionicity = [
-            'closure', 'exception', 'global', 'label', 'outer', 'undef',
-            'unused', 'var'
-        ],
-
-        functions,      // All of the functions
-        global_funct,   // The global body
-        global_scope,   // The global scope
-        html_tag = {
-            a:        {},
-            abbr:     {},
-            acronym:  {},
-            address:  {},
-            applet:   {},
-            area:     {empty: true, parent: ' map '},
-            article:  {},
-            aside:    {},
-            audio:    {},
-            b:        {},
-            base:     {empty: true, parent: ' head '},
-            bdo:      {},
-            big:      {},
-            blockquote: {},
-            body:     {parent: ' html noframes '},
-            br:       {empty: true},
-            button:   {},
-            canvas:   {parent: ' body p div th td '},
-            caption:  {parent: ' table '},
-            center:   {},
-            cite:     {},
-            code:     {},
-            col:      {empty: true, parent: ' table colgroup '},
-            colgroup: {parent: ' table '},
-            command:  {parent: ' menu '},
-            datalist: {},
-            dd:       {parent: ' dl '},
-            del:      {},
-            details:  {},
-            dialog:   {},
-            dfn:      {},
-            dir:      {},
-            div:      {},
-            dl:       {},
-            dt:       {parent: ' dl '},
-            em:       {},
-            embed:    {},
-            fieldset: {},
-            figure:   {},
-            font:     {},
-            footer:   {},
-            form:     {},
-            frame:    {empty: true, parent: ' frameset '},
-            frameset: {parent: ' html frameset '},
-            h1:       {},
-            h2:       {},
-            h3:       {},
-            h4:       {},
-            h5:       {},
-            h6:       {},
-            head:     {parent: ' html '},
-            header:   {},
-            hgroup:   {},
-            hr:       {empty: true},
-            'hta:application':
-                      {empty: true, parent: ' head '},
-            html:     {parent: '*'},
-            i:        {},
-            iframe:   {},
-            img:      {empty: true},
-            input:    {empty: true},
-            ins:      {},
-            kbd:      {},
-            keygen:   {},
-            label:    {},
-            legend:   {parent: ' details fieldset figure '},
-            li:       {parent: ' dir menu ol ul '},
-            link:     {empty: true, parent: ' head '},
-            map:      {},
-            mark:     {},
-            menu:     {},
-            meta:     {empty: true, parent: ' head noframes noscript '},
-            meter:    {},
-            nav:      {},
-            noframes: {parent: ' html body '},
-            noscript: {parent: ' body head noframes '},
-            object:   {},
-            ol:       {},
-            optgroup: {parent: ' select '},
-            option:   {parent: ' optgroup select '},
-            output:   {},
-            p:        {},
-            param:    {empty: true, parent: ' applet object '},
-            pre:      {},
-            progress: {},
-            q:        {},
-            rp:       {},
-            rt:       {},
-            ruby:     {},
-            samp:     {},
-            script:   {empty: true, parent: ' body div frame head iframe p pre span '},
-            section:  {},
-            select:   {},
-            small:    {},
-            span:     {},
-            source:   {},
-            strong:   {},
-            style:    {parent: ' head ', empty: true},
-            sub:      {},
-            sup:      {},
-            table:    {},
-            tbody:    {parent: ' table '},
-            td:       {parent: ' tr '},
-            textarea: {},
-            tfoot:    {parent: ' table '},
-            th:       {parent: ' tr '},
-            thead:    {parent: ' table '},
-            time:     {},
-            title:    {parent: ' head '},
-            tr:       {parent: ' table tbody thead tfoot '},
-            tt:       {},
-            u:        {},
-            ul:       {},
-            'var':    {},
-            video:    {}
-        },
-
-        ids,            // HTML ids
-        in_block,
-        indent,
-        itself,         // JSLint itself
-        json_mode,
-        lex,            // the tokenizer
-        lines,
-        lookahead,
-        node = array_to_object([
-            'Buffer', 'clearInterval', 'clearTimeout', 'console', 'exports',
-            'global', 'module', 'process', 'querystring', 'require',
-            'setInterval', 'setTimeout', '__dirname', '__filename'
-        ], false),
-        node_js,
-        numbery = array_to_object(['indexOf', 'lastIndexOf', 'search'], true),
-        next_token,
-        option,
-        predefined,     // Global variables defined by option
-        prereg,
-        prev_token,
-        property,
-        regexp_flag = array_to_object(['g', 'i', 'm'], true),
-        return_this = function return_this() {
-            return this;
-        },
-        rhino = array_to_object([
-            'defineClass', 'deserialize', 'gc', 'help', 'load', 'loadClass',
-            'print', 'quit', 'readFile', 'readUrl', 'runCommand', 'seal',
-            'serialize', 'spawn', 'sync', 'toint32', 'version'
-        ], false),
-
-        scope,      // An object containing an object for each variable in scope
-        semicolon_coda = array_to_object([';', '"', '\'', ')'], true),
-        src,
-        stack,
-
-// standard contains the global names that are provided by the
-// ECMAScript standard.
-
-        standard = array_to_object([
-            'Array', 'Boolean', 'Date', 'decodeURI', 'decodeURIComponent',
-            'encodeURI', 'encodeURIComponent', 'Error', 'eval', 'EvalError',
-            'Function', 'isFinite', 'isNaN', 'JSON', 'Math', 'Number',
-            'Object', 'parseInt', 'parseFloat', 'RangeError', 'ReferenceError',
-            'RegExp', 'String', 'SyntaxError', 'TypeError', 'URIError'
-        ], false),
-
-        strict_mode,
-        syntax = {},
-        tab,
-        token,
-        urls,
-        var_mode,
-        warnings,
-
-// widget contains the global names which are provided to a Yahoo
-// (fna Konfabulator) widget.
-
-        widget = array_to_object([
-            'alert', 'animator', 'appleScript', 'beep', 'bytesToUIString',
-            'Canvas', 'chooseColor', 'chooseFile', 'chooseFolder',
-            'closeWidget', 'COM', 'convertPathToHFS', 'convertPathToPlatform',
-            'CustomAnimation', 'escape', 'FadeAnimation', 'filesystem', 'Flash',
-            'focusWidget', 'form', 'FormField', 'Frame', 'HotKey', 'Image',
-            'include', 'isApplicationRunning', 'iTunes', 'konfabulatorVersion',
-            'log', 'md5', 'MenuItem', 'MoveAnimation', 'openURL', 'play',
-            'Point', 'popupMenu', 'preferenceGroups', 'preferences', 'print',
-            'prompt', 'random', 'Rectangle', 'reloadWidget', 'ResizeAnimation',
-            'resolvePath', 'resumeUpdates', 'RotateAnimation', 'runCommand',
-            'runCommandInBg', 'saveAs', 'savePreferences', 'screen',
-            'ScrollBar', 'showWidgetPreferences', 'sleep', 'speak', 'Style',
-            'suppressUpdates', 'system', 'tellWidget', 'Text', 'TextArea',
-            'Timer', 'unescape', 'updateNow', 'URL', 'Web', 'widget', 'Window',
-            'XMLDOM', 'XMLHttpRequest', 'yahooCheckLogin', 'yahooLogin',
-            'yahooLogout'
-        ], true),
-
-        windows = array_to_object([
-            'ActiveXObject', 'CScript', 'Debug', 'Enumerator', 'System',
-            'VBArray', 'WScript', 'WSH'
-        ], false),
-
-//  xmode is used to adapt to the exceptions in html parsing.
-//  It can have these states:
-//      ''      .js script file
-//      'html'
-//      'outer'
-//      'script'
-//      'style'
-//      'scriptstring'
-//      'styleproperty'
-
-        xmode,
-        xquote,
-
-// Regular expressions. Some of these are stupidly long.
-
-// unsafe comment or string
-        ax = /@cc|<\/?|script|\]\s*\]|<\s*!|&lt/i,
-// carriage return, carriage return linefeed, or linefeed
-        crlfx = /\r\n?|\n/,
-// unsafe characters that are silently deleted by one or more browsers
-        cx = /[\u0000-\u001f\u007f-\u009f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/,
-// query characters for ids
-        dx = /[\[\]\/\\"'*<>.&:(){}+=#]/,
-// html token
-        hx = /^\s*(['"=>\/&#]|<(?:\/|\!(?:--)?)?|[a-zA-Z][a-zA-Z0-9_\-:]*|[0-9]+|--)/,
-// identifier
-        ix = /^([a-zA-Z_$][a-zA-Z0-9_$]*)$/,
-// javascript url
-        jx = /^(?:javascript|jscript|ecmascript|vbscript|mocha|livescript)\s*:/i,
-// star slash
-        lx = /\*\/|\/\*/,
-// characters in strings that need escapement
-        nx = /[\u0000-\u001f'\\\u007f-\u009f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,
-// outer html token
-        ox = /[>&]|<[\/!]?|--/,
-// attributes characters
-        qx = /[^a-zA-Z0-9+\-_\/. ]/,
-// style
-        sx = /^\s*([{}:#%.=,>+\[\]@()"';]|[*$\^~]=|[a-zA-Z_][a-zA-Z0-9_\-]*|[0-9]+|<\/|\/\*)/,
-        ssx = /^\s*([@#!"'};:\-%.=,+\[\]()*_]|[a-zA-Z][a-zA-Z0-9._\-]*|\/\*?|\d+(?:\.\d+)?|<\/)/,
-// token
-        tx = /^\s*([(){}\[\]\?.,:;'"~#@`]|={1,3}|\/(\*(jslint|properties|property|members?|globals?)?|=|\/)?|\*[\/=]?|\+(?:=|\++)?|-(?:=|-+)?|[\^%]=?|&[&=]?|\|[|=]?|>{1,3}=?|<(?:[\/=!]|\!(\[|--)?|<=?)?|\!={0,2}|[a-zA-Z_$][a-zA-Z0-9_$]*|[0-9]+(?:[xX][0-9a-fA-F]+|\.[0-9]*)?(?:[eE][+\-]?[0-9]+)?)/,
-// url badness
-        ux = /&|\+|\u00AD|\.\.|\/\*|%[^;]|base64|url|expression|data|mailto|script/i,
-
-        rx = {
-            outer: hx,
-            html: hx,
-            style: sx,
-            styleproperty: ssx
-        };
-
-
-    function F() {}     // Used by Object.create
-
-// Provide critical ES5 functions to ES3.
-
-    if (typeof Array.prototype.filter !== 'function') {
-        Array.prototype.filter = function (f) {
-            var i, length = this.length, result = [], value;
-            for (i = 0; i < length; i += 1) {
-                try {
-                    value = this[i];
-                    if (f(value)) {
-                        result.push(value);
-                    }
-                } catch (ignore) {
-                }
-            }
-            return result;
-        };
-    }
-
-    if (typeof Array.prototype.forEach !== 'function') {
-        Array.prototype.forEach = function (f) {
-            var i, length = this.length;
-            for (i = 0; i < length; i += 1) {
-                try {
-                    f(this[i]);
-                } catch (ignore) {
-                }
-            }
-        };
-    }
-
-    if (typeof Array.isArray !== 'function') {
-        Array.isArray = function (o) {
-            return Object.prototype.toString.apply(o) === '[object Array]';
-        };
-    }
-
-    if (!Object.prototype.hasOwnProperty.call(Object, 'create')) {
-        Object.create = function (o) {
-            F.prototype = o;
-            return new F();
-        };
-    }
-
-    if (typeof Object.keys !== 'function') {
-        Object.keys = function (o) {
-            var array = [], key;
-            for (key in o) {
-                if (Object.prototype.hasOwnProperty.call(o, key)) {
-                    array.push(key);
-                }
-            }
-            return array;
-        };
-    }
-
-    if (typeof String.prototype.entityify !== 'function') {
-        String.prototype.entityify = function () {
-            return this
-                .replace(/&/g, '&amp;')
-                .replace(/</g, '&lt;')
-                .replace(/>/g, '&gt;');
-        };
-    }
-
-    if (typeof String.prototype.isAlpha !== 'function') {
-        String.prototype.isAlpha = function () {
-            return (this >= 'a' && this <= 'z\uffff') ||
-                (this >= 'A' && this <= 'Z\uffff');
-        };
-    }
-
-    if (typeof String.prototype.isDigit !== 'function') {
-        String.prototype.isDigit = function () {
-            return (this >= '0' && this <= '9');
-        };
-    }
-
-    if (typeof String.prototype.supplant !== 'function') {
-        String.prototype.supplant = function (o) {
-            return this.replace(/\{([^{}]*)\}/g, function (a, b) {
-                var replacement = o[b];
-                return typeof replacement === 'string' ||
-                    typeof replacement === 'number' ? replacement : a;
-            });
-        };
-    }
-
-
-    function sanitize(a) {
-
-//  Escapify a troublesome character.
-
-        return escapes[a] ||
-            '\\u' + ('0000' + a.charCodeAt().toString(16)).slice(-4);
-    }
-
-
-    function add_to_predefined(group) {
-        Object.keys(group).forEach(function (name) {
-            predefined[name] = group[name];
-        });
-    }
-
-
-    function assume() {
-        if (!option.safe) {
-            if (option.rhino) {
-                add_to_predefined(rhino);
-                option.rhino = false;
-            }
-            if (option.devel) {
-                add_to_predefined(devel);
-                option.devel = false;
-            }
-            if (option.browser) {
-                add_to_predefined(browser);
-                option.browser = false;
-            }
-            if (option.windows) {
-                add_to_predefined(windows);
-                option.windows = false;
-            }
-            if (option.node) {
-                add_to_predefined(node);
-                option.node = false;
-                node_js = true;
-            }
-            if (option.widget) {
-                add_to_predefined(widget);
-                option.widget = false;
-            }
-        }
-    }
-
-
-// Produce an error warning.
-
-    function artifact(tok) {
-        if (!tok) {
-            tok = next_token;
-        }
-        return tok.number || tok.string;
-    }
-
-    function quit(message, line, character) {
-        throw {
-            name: 'JSLintError',
-            line: line,
-            character: character,
-            message: bundle.scanned_a_b.supplant({
-                a: message,
-                b: Math.floor((line / lines.length) * 100)
-            })
-        };
-    }
-
-    function warn(message, offender, a, b, c, d) {
-        var character, line, warning;
-        offender = offender || next_token;  // ~~
-        line = offender.line || 0;
-        character = offender.from || 0;
-        warning = {
-            id: '(error)',
-            raw: bundle[message] || message,
-            evidence: lines[line - 1] || '',
-            line: line,
-            character: character,
-            a: a || (offender.id === '(number)'
-                ? String(offender.number)
-                : offender.string),
-            b: b,
-            c: c,
-            d: d
-        };
-        warning.reason = warning.raw.supplant(warning);
-        JSLINT.errors.push(warning);
-        if (option.passfail) {
-            quit(bundle.stopping, line, character);
-        }
-        warnings += 1;
-        if (warnings >= option.maxerr) {
-            quit(bundle.too_many, line, character);
-        }
-        return warning;
-    }
-
-    function warn_at(message, line, character, a, b, c, d) {
-        return warn(message, {
-            line: line,
-            from: character
-        }, a, b, c, d);
-    }
-
-    function stop(message, offender, a, b, c, d) {
-        var warning = warn(message, offender, a, b, c, d);
-        quit(bundle.stopping, warning.line, warning.character);
-    }
-
-    function stop_at(message, line, character, a, b, c, d) {
-        return stop(message, {
-            line: line,
-            from: character
-        }, a, b, c, d);
-    }
-
-    function expected_at(at) {
-        if (!option.white && next_token.from !== at) {
-            warn('expected_a_at_b_c', next_token, '', at,
-                next_token.from);
-        }
-    }
-
-    function aint(it, name, expected) {
-        if (it[name] !== expected) {
-            warn('expected_a_b', it, expected, it[name]);
-            return true;
-        }
-        return false;
-    }
-
-
-// lexical analysis and token construction
-
-    lex = (function lex() {
-        var character, c, from, length, line, pos, source_row;
-
-// Private lex methods
-
-        function next_line() {
-            var at;
-            if (line >= lines.length) {
-                return false;
-            }
-            character = 1;
-            source_row = lines[line];
-            line += 1;
-            at = source_row.search(/ \t/);
-            if (at >= 0) {
-                warn_at('mixed', line, at + 1);
-            }
-            source_row = source_row.replace(/\t/g, tab);
-            at = source_row.search(cx);
-            if (at >= 0) {
-                warn_at('unsafe', line, at);
-            }
-            if (option.maxlen && option.maxlen < source_row.length) {
-                warn_at('too_long', line, source_row.length);
-            }
-            return true;
-        }
-
-// Produce a token object.  The token inherits from a syntax symbol.
-
-        function it(type, value) {
-            var id, the_token;
-            if (type === '(string)' || type === '(range)') {
-                if (jx.test(value)) {
-                    warn_at('url', line, from);
-                }
-            }
-            the_token = Object.create(syntax[(
-                type === '(punctuator)' || (type === '(identifier)' &&
-                        Object.prototype.hasOwnProperty.call(syntax, value))
-                    ? value
-                    : type
-            )] || syntax['(error)']);
-            if (type === '(identifier)') {
-                the_token.identifier = true;
-                if (value === '__iterator__' || value === '__proto__') {
-                    stop_at('reserved_a', line, from, value);
-                } else if (!option.nomen &&
-                        (value.charAt(0) === '_' ||
-                        value.charAt(value.length - 1) === '_')) {
-                    warn_at('dangling_a', line, from, value);
-                }
-            }
-            if (type === '(number)') {
-                the_token.number = +value;
-            } else if (value !== undefined) {
-                the_token.string = String(value);
-            }
-            the_token.line = line;
-            the_token.from = from;
-            the_token.thru = character;
-            id = the_token.id;
-            prereg = id && (
-                ('(,=:[!&|?{};'.indexOf(id.charAt(id.length - 1)) >= 0) ||
-                id === 'return' || id === 'case'
-            );
-            return the_token;
-        }
-
-        function match(x) {
-            var exec = x.exec(source_row), first;
-            if (exec) {
-                length = exec[0].length;
-                first = exec[1];
-                c = first.charAt(0);
-                source_row = source_row.slice(length);
-                from = character + length - first.length;
-                character += length;
-                return first;
-            }
-        }
-
-        function string(x) {
-            var c, pos = 0, r = '', result;
-
-            function hex(n) {
-                var i = parseInt(source_row.substr(pos + 1, n), 16);
-                pos += n;
-                if (i >= 32 && i <= 126 &&
-                        i !== 34 && i !== 92 && i !== 39) {
-                    warn_at('unexpected_a', line, character, '\\');
-                }
-                character += n;
-                c = String.fromCharCode(i);
-            }
-
-            if (json_mode && x !== '"') {
-                warn_at('expected_a', line, character, '"');
-            }
-
-            if (xquote === x || (xmode === 'scriptstring' && !xquote)) {
-                return it('(punctuator)', x);
-            }
-
-            for (;;) {
-                while (pos >= source_row.length) {
-                    pos = 0;
-                    if (xmode !== 'html' || !next_line()) {
-                        stop_at('unclosed', line, from);
-                    }
-                }
-                c = source_row.charAt(pos);
-                if (c === x) {
-                    character += 1;
-                    source_row = source_row.slice(pos + 1);
-                    result = it('(string)', r);
-                    result.quote = x;
-                    return result;
-                }
-                if (c < ' ') {
-                    if (c === '\n' || c === '\r') {
-                        break;
-                    }
-                    warn_at('control_a', line, character + pos,
-                        source_row.slice(0, pos));
-                } else if (c === xquote) {
-                    warn_at('bad_html', line, character + pos);
-                } else if (c === '<') {
-                    if (option.safe && xmode === 'html') {
-                        warn_at('adsafe_a', line, character + pos, c);
-                    } else if (source_row.charAt(pos + 1) === '/' && (xmode || option.safe)) {
-                        warn_at('expected_a_b', line, character,
-                            '<\\/', '</');
-                    } else if (source_row.charAt(pos + 1) === '!' && (xmode || option.safe)) {
-                        warn_at('unexpected_a', line, character, '<!');
-                    }
-                } else if (c === '\\') {
-                    if (xmode === 'html') {
-                        if (option.safe) {
-                            warn_at('adsafe_a', line, character + pos, c);
-                        }
-                    } else if (xmode === 'styleproperty') {
-                        pos += 1;
-                        character += 1;
-                        c = source_row.charAt(pos);
-                        if (c !== x) {
-                            warn_at('unexpected_a', line, character, '\\');
-                        }
-                    } else {
-                        pos += 1;
-                        character += 1;
-                        c = source_row.charAt(pos);
-                        switch (c) {
-                        case '':
-                            if (!option.es5) {
-                                warn_at('es5', line, character);
-                            }
-                            next_line();
-                            pos = -1;
-                            break;
-                        case xquote:
-                            warn_at('bad_html', line, character + pos);
-                            break;
-                        case '\'':
-                            if (json_mode) {
-                                warn_at('unexpected_a', line, character, '\\\'');
-                            }
-                            break;
-                        case 'u':
-                            hex(4);
-                            break;
-                        case 'v':
-                            if (json_mode) {
-                                warn_at('unexpected_a', line, character, '\\v');
-                            }
-                            c = '\v';
-                            break;
-                        case 'x':
-                            if (json_mode) {
-                                warn_at('unexpected_a', line, character, '\\x');
-                            }
-                            hex(2);
-                            break;
-                        default:
-                            if (typeof descapes[c] !== 'string') {
-                                warn_at(c >= '0' && c <= '7' ? 'octal_a' : 'unexpected_a',
-                                    line, character, '\\' + c);
-                            } else {
-                                c = descapes[c];
-                            }
-                        }
-                    }
-                }
-                r += c;
-                character += 1;
-                pos += 1;
-            }
-        }
-
-        function number(snippet) {
-            var digit;
-            if (xmode !== 'style' && xmode !== 'styleproperty' &&
-                    source_row.charAt(0).isAlpha()) {
-                warn_at('expected_space_a_b',
-                    line, character, c, source_row.charAt(0));
-            }
-            if (c === '0') {
-                digit = snippet.charAt(1);
-                if (digit.isDigit()) {
-                    if (token.id !== '.' && xmode !== 'styleproperty') {
-                        warn_at('unexpected_a', line, character, snippet);
-                    }
-                } else if (json_mode && (digit === 'x' || digit === 'X')) {
-                    warn_at('unexpected_a', line, character, '0x');
-                }
-            }
-            if (snippet.slice(snippet.length - 1) === '.') {
-                warn_at('trailing_decimal_a', line, character, snippet);
-            }
-            if (xmode !== 'style') {
-                digit = +snippet;
-                if (!isFinite(digit)) {
-                    warn_at('bad_number', line, character, snippet);
-                }
-                snippet = digit;
-            }
-            return it('(number)', snippet);
-        }
-
-        function comment(snippet) {
-            if (comments_off || src || (xmode && xmode !== 'script' &&
-                    xmode !== 'style' && xmode !== 'styleproperty')) {
-                warn_at('unexpected_comment', line, character);
-            } else if (xmode === 'script' && /<\//i.test(source_row)) {
-                warn_at('unexpected_a', line, character, '<\/');
-            } else if (option.safe && ax.test(snippet)) {
-                warn_at('dangerous_comment', line, character);
-            }
-        }
-
-        function regexp() {
-            var b,
-                bit,
-                captures = 0,
-                depth = 0,
-                flag = '',
-                high,
-                letter,
-                length = 0,
-                low,
-                potential,
-                quote,
-                result;
-            for (;;) {
-                b = true;
-                c = source_row.charAt(length);
-                length += 1;
-                switch (c) {
-                case '':
-                    stop_at('unclosed_regexp', line, from);
-                    return;
-                case '/':
-                    if (depth > 0) {
-                        warn_at('unescaped_a', line, from + length, '/');
-                    }
-                    c = source_row.slice(0, length - 1);
-                    potential = Object.create(regexp_flag);
-                    for (;;) {
-                        letter = source_row.charAt(length);
-                        if (potential[letter] !== true) {
-                            break;
-                        }
-                        potential[letter] = false;
-                        length += 1;
-                        flag += letter;
-                    }
-                    if (source_row.charAt(length).isAlpha()) {
-                        stop_at('unexpected_a', line, from, source_row.charAt(length));
-                    }
-                    character += length;
-                    source_row = source_row.slice(length);
-                    quote = source_row.charAt(0);
-                    if (quote === '/' || quote === '*') {
-                        stop_at('confusing_regexp', line, from);
-                    }
-                    result = it('(regexp)', c);
-                    result.flag = flag;
-                    return result;
-                case '\\':
-                    c = source_row.charAt(length);
-                    if (c < ' ') {
-                        warn_at('control_a', line, from + length, String(c));
-                    } else if (c === '<') {
-                        warn_at(bundle.unexpected_a, line, from + length, '\\');
-                    }
-                    length += 1;
-                    break;
-                case '(':
-                    depth += 1;
-                    b = false;
-                    if (source_row.charAt(length) === '?') {
-                        length += 1;
-                        switch (source_row.charAt(length)) {
-                        case ':':
-                        case '=':
-                        case '!':
-                            length += 1;
-                            break;
-                        default:
-                            warn_at(bundle.expected_a_b, line, from + length,
-                                ':', source_row.charAt(length));
-                        }
-                    } else {
-                        captures += 1;
-                    }
-                    break;
-                case '|':
-                    b = false;
-                    break;
-                case ')':
-                    if (depth === 0) {
-                        warn_at('unescaped_a', line, from + length, ')');
-                    } else {
-                        depth -= 1;
-                    }
-                    break;
-                case ' ':
-                    pos = 1;
-                    while (source_row.charAt(length) === ' ') {
-                        length += 1;
-                        pos += 1;
-                    }
-                    if (pos > 1) {
-                        warn_at('use_braces', line, from + length, pos);
-                    }
-                    break;
-                case '[':
-                    c = source_row.charAt(length);
-                    if (c === '^') {
-                        length += 1;
-                        if (!option.regexp) {
-                            warn_at('insecure_a', line, from + length, c);
-                        } else if (source_row.charAt(length) === ']') {
-                            stop_at('unescaped_a', line, from + length, '^');
-                        }
-                    }
-                    bit = false;
-                    if (c === ']') {
-                        warn_at('empty_class', line, from + length - 1);
-                        bit = true;
-                    }
-klass:              do {
-                        c = source_row.charAt(length);
-                        length += 1;
-                        switch (c) {
-                        case '[':
-                        case '^':
-                            warn_at('unescaped_a', line, from + length, c);
-                            bit = true;
-                            break;
-                        case '-':
-                            if (bit) {
-                                bit = false;
-                            } else {
-                                warn_at('unescaped_a', line, from + length, '-');
-                                bit = true;
-                            }
-                            break;
-                        case ']':
-                            if (!bit) {
-                                warn_at('unescaped_a', line, from + length - 1, '-');
-                            }
-                            break klass;
-                        case '\\':
-                            c = source_row.charAt(length);
-                            if (c < ' ') {
-                                warn_at(bundle.control_a, line, from + length, String(c));
-                            } else if (c === '<') {
-                                warn_at(bundle.unexpected_a, line, from + length, '\\');
-                            }
-                            length += 1;
-                            bit = true;
-                            break;
-                        case '/':
-                            warn_at('unescaped_a', line, from + length - 1, '/');
-                            bit = true;
-                            break;
-                        case '<':
-                            if (xmode === 'script') {
-                                c = source_row.charAt(length);
-                                if (c === '!' || c === '/') {
-                                    warn_at(bundle.html_confusion_a, line,
-                                        from + length, c);
-                                }
-                            }
-                            bit = true;
-                            break;
-                        default:
-                            bit = true;
-                        }
-                    } while (c);
-                    break;
-                case '.':
-                    if (!option.regexp) {
-                        warn_at('insecure_a', line, from + length, c);
-                    }
-                    break;
-                case ']':
-                case '?':
-                case '{':
-                case '}':
-                case '+':
-                case '*':
-                    warn_at('unescaped_a', line, from + length, c);
-                    break;
-                case '<':
-                    if (xmode === 'script') {
-                        c = source_row.charAt(length);
-                        if (c === '!' || c === '/') {
-                            warn_at(bundle.html_confusion_a, line, from + length, c);
-                        }
-                    }
-                    break;
-                }
-                if (b) {
-                    switch (source_row.charAt(length)) {
-                    case '?':
-                    case '+':
-                    case '*':
-                        length += 1;
-                        if (source_row.charAt(length) === '?') {
-                            length += 1;
-                        }
-                        break;
-                    case '{':
-                        length += 1;
-                        c = source_row.charAt(length);
-                        if (c < '0' || c > '9') {
-                            warn_at(bundle.expected_number_a, line,
-                                from + length, c);
-                        }
-                        length += 1;
-                        low = +c;
-                        for (;;) {
-                            c = source_row.charAt(length);
-                            if (c < '0' || c > '9') {
-                                break;
-                            }
-                            length += 1;
-                            low = +c + (low * 10);
-                        }
-                        high = low;
-                        if (c === ',') {
-                            length += 1;
-                            high = Infinity;
-                            c = source_row.charAt(length);
-                            if (c >= '0' && c <= '9') {
-                                length += 1;
-                                high = +c;
-                                for (;;) {
-                                    c = source_row.charAt(length);
-                                    if (c < '0' || c > '9') {
-                                        break;
-                                    }
-                                    length += 1;
-                                    high = +c + (high * 10);
-                                }
-                            }
-                        }
-                        if (source_row.charAt(length) !== '}') {
-                            warn_at(bundle.expected_a_b, line, from + length,
-                                '}', c);
-                        } else {
-                            length += 1;
-                        }
-                        if (source_row.charAt(length) === '?') {
-                            length += 1;
-                        }
-                        if (low > high) {
-                            warn_at(bundle.not_greater, line, from + length,
-                                low, high);
-                        }
-                        break;
-                    }
-                }
-            }
-            c = source_row.slice(0, length - 1);
-            character += length;
-            source_row = source_row.slice(length);
-            return it('(regexp)', c);
-        }
-
-// Public lex methods
-
-        return {
-            init: function (source) {
-                if (typeof source === 'string') {
-                    lines = source.split(crlfx);
-                } else {
-                    lines = source;
-                }
-                line = 0;
-                next_line();
-                from = 1;
-            },
-
-            range: function (begin, end) {
-                var c, value = '';
-                from = character;
-                if (source_row.charAt(0) !== begin) {
-                    stop_at('expected_a_b', line, character, begin,
-                        source_row.charAt(0));
-                }
-                for (;;) {
-                    source_row = source_row.slice(1);
-                    character += 1;
-                    c = source_row.charAt(0);
-                    switch (c) {
-                    case '':
-                        stop_at('missing_a', line, character, c);
-                        break;
-                    case end:
-                        source_row = source_row.slice(1);
-                        character += 1;
-                        return it('(range)', value);
-                    case xquote:
-                    case '\\':
-                        warn_at('unexpected_a', line, character, c);
-                        break;
-                    }
-                    value += c;
-                }
-            },
-
-// token -- this is called by advance to get the next token.
-
-            token: function () {
-                var c, i, snippet;
-
-                for (;;) {
-                    while (!source_row) {
-                        if (!next_line()) {
-                            return it('(end)');
-                        }
-                    }
-                    while (xmode === 'outer') {
-                        i = source_row.search(ox);
-                        if (i === 0) {
-                            break;
-                        } else if (i > 0) {
-                            character += 1;
-                            source_row = source_row.slice(i);
-                            break;
-                        } else {
-                            if (!next_line()) {
-                                return it('(end)', '');
-                            }
-                        }
-                    }
-                    snippet = match(rx[xmode] || tx);
-                    if (!snippet) {
-                        if (source_row) {
-                            if (source_row.charAt(0) === ' ') {
-                                if (!option.white) {
-                                    warn_at('unexpected_a', line, character,
-                                        '(space)');
-                                }
-                                character += 1;
-                                source_row = '';
-                            } else {
-                                stop_at('unexpected_a', line, character,
-                                    source_row.charAt(0));
-                            }
-                        }
-                    } else {
-
-//      identifier
-
-                        c = snippet.charAt(0);
-                        if (c.isAlpha() || c === '_' || c === '$') {
-                            return it('(identifier)', snippet);
-                        }
-
-//      number
-
-                        if (c.isDigit()) {
-                            return number(snippet);
-                        }
-                        switch (snippet) {
-
-//      string
-
-                        case '"':
-                        case "'":
-                            return string(snippet);
-
-//      // comment
-
-                        case '//':
-                            comment(source_row);
-                            source_row = '';
-                            break;
-
-//      /* comment
-
-                        case '/*':
-                            for (;;) {
-                                i = source_row.search(lx);
-                                if (i >= 0) {
-                                    break;
-                                }
-                                comment(source_row);
-                                if (!next_line()) {
-                                    stop_at('unclosed_comment', line, character);
-                                }
-                            }
-                            comment(source_row.slice(0, i));
-                            character += i + 2;
-                            if (source_row.charAt(i) === '/') {
-                                stop_at('nested_comment', line, character);
-                            }
-                            source_row = source_row.slice(i + 2);
-                            break;
-
-                        case '':
-                            break;
-//      /
-                        case '/':
-                            if (token.id === '/=') {
-                                stop_at(
-                                    bundle.slash_equal,
-                                    line,
-                                    from
-                                );
-                            }
-                            return prereg
-                                ? regexp()
-                                : it('(punctuator)', snippet);
-
-//      punctuator
-
-                        case '<!--':
-                            length = line;
-//                            c = character;
-                            for (;;) {
-                                i = source_row.indexOf('--');
-                                if (i >= 0) {
-                                    break;
-                                }
-                                i = source_row.indexOf('<!');
-                                if (i >= 0) {
-                                    stop_at('nested_comment',
-                                        line, character + i);
-                                }
-                                if (!next_line()) {
-                                    stop_at('unclosed_comment', length, c);
-                                }
-                            }
-                            length = source_row.indexOf('<!');
-                            if (length >= 0 && length < i) {
-                                stop_at('nested_comment',
-                                    line, character + length);
-                            }
-                            character += i;
-                            if (source_row.charAt(i + 2) !== '>') {
-                                stop_at('expected_a', line, character, '-->');
-                            }
-                            character += 3;
-                            source_row = source_row.slice(i + 3);
-                            break;
-                        case '#':
-                            if (xmode === 'html' || xmode === 'styleproperty') {
-                                for (;;) {
-                                    c = source_row.charAt(0);
-                                    if ((c < '0' || c > '9') &&
-                                            (c < 'a' || c > 'f') &&
-                                            (c < 'A' || c > 'F')) {
-                                        break;
-                                    }
-                                    character += 1;
-                                    source_row = source_row.slice(1);
-                                    snippet += c;
-                                }
-                                if (snippet.length !== 4 && snippet.length !== 7) {
-                                    warn_at('bad_color_a', line,
-                                        from + length, snippet);
-                                }
-                                return it('(color)', snippet);
-                            }
-                            return it('(punctuator)', snippet);
-
-                        default:
-                            if (xmode === 'outer' && c === '&') {
-                                character += 1;
-                                source_row = source_row.slice(1);
-                                for (;;) {
-                                    c = source_row.charAt(0);
-                                    character += 1;
-                                    source_row = source_row.slice(1);
-                                    if (c === ';') {
-                                        break;
-                                    }
-                                    if (!((c >= '0' && c <= '9') ||
-                                            (c >= 'a' && c <= 'z') ||
-                                            c === '#')) {
-                                        stop_at('bad_entity', line, from + length,
-                                            character);
-                                    }
-                                }
-                                break;
-                            }
-                            return it('(punctuator)', snippet);
-                        }
-                    }
-                }
-            }
-        };
-    }());
-
-
-    function add_label(token, kind, name) {
-
-// Define the symbol in the current function in the current scope.
-
-        name = name || token.string;
-
-// Global variables cannot be created in the safe subset. If a global variable
-// already exists, do nothing. If it is predefined, define it.
-
-        if (funct === global_funct) {
-            if (option.safe) {
-                warn('adsafe_a', token, name);
-            }
-            if (typeof global_funct[name] !== 'string') {
-                token.writeable = typeof predefined[name] === 'boolean'
-                    ? predefined[name]
-                    : true;
-                token.funct = funct;
-                global_scope[name] = token;
-            }
-            if (kind === 'becoming') {
-                kind = 'var';
-            }
-
-// Ordinary variables.
-
-        } else {
-
-// Warn if the variable already exists.
-
-            if (typeof funct[name] === 'string') {
-                if (funct[name] === 'undef') {
-                    if (!option.undef) {
-                        warn('used_before_a', token, name);
-                    }
-                    kind = 'var';
-                } else {
-                    warn('already_defined', token, name);
-                }
-            } else {
-
-// Add the symbol to the current function.
-
-                token.funct = funct;
-                token.writeable = true;
-                scope[name] = token;
-            }
-        }
-        funct[name] = kind;
-    }
-
-
-    function peek(distance) {
-
-// Peek ahead to a future token. The distance is how far ahead to look. The
-// default is the next token.
-
-        var found, slot = 0;
-
-        distance = distance || 0;
-        while (slot <= distance) {
-            found = lookahead[slot];
-            if (!found) {
-                found = lookahead[slot] = lex.token();
-            }
-            slot += 1;
-        }
-        return found;
-    }
-
-
-    function advance(id, match) {
-
-// Produce the next token, also looking for programming errors.
-
-        if (indent) {
-
-// If indentation checking was requested, then inspect all of the line breakings.
-// The var statement is tricky because the names might be aligned or not. We
-// look at the first line break after the var to determine the programmer's
-// intention.
-
-            if (var_mode && next_token.line !== token.line) {
-                if ((var_mode !== indent || !next_token.edge) &&
-                        next_token.from === indent.at -
-                        (next_token.edge ? option.indent : 0)) {
-                    var dent = indent;
-                    for (;;) {
-                        dent.at -= option.indent;
-                        if (dent === var_mode) {
-                            break;
-                        }
-                        dent = dent.was;
-                    }
-                    dent.open = false;
-                }
-                var_mode = null;
-            }
-            if (next_token.id === '?' && indent.mode === ':' &&
-                    token.line !== next_token.line) {
-                indent.at -= option.indent;
-            }
-            if (indent.open) {
-
-// If the token is an edge.
-
-                if (next_token.edge) {
-                    if (next_token.edge === 'label') {
-                        expected_at(1);
-                    } else if (next_token.edge === 'case' || indent.mode === 'statement') {
-                        expected_at(indent.at - option.indent);
-                    } else if (indent.mode !== 'array' || next_token.line !== token.line) {
-                        expected_at(indent.at);
-                    }
-
-// If the token is not an edge, but is the first token on the line.
-
-                } else if (next_token.line !== token.line) {
-                    if (next_token.from < indent.at + (indent.mode ===
-                            'expression' ? 0 : option.indent)) {
-                        expected_at(indent.at + option.indent);
-                    }
-                    indent.wrap = true;
-                }
-            } else if (next_token.line !== token.line) {
-                if (next_token.edge) {
-                    expected_at(indent.at);
-                } else {
-                    indent.wrap = true;
-                    if (indent.mode === 'statement' || indent.mode === 'var') {
-                        expected_at(indent.at + option.indent);
-                    } else if (next_token.from < indent.at + (indent.mode ===
-                            'expression' ? 0 : option.indent)) {
-                        expected_at(indent.at + option.indent);
-                    }
-                }
-            }
-        }
-
-        switch (token.id) {
-        case '(number)':
-            if (next_token.id === '.') {
-                warn('trailing_decimal_a');
-            }
-            break;
-        case '-':
-            if (next_token.id === '-' || next_token.id === '--') {
-                warn('confusing_a');
-            }
-            break;
-        case '+':
-            if (next_token.id === '+' || next_token.id === '++') {
-                warn('confusing_a');
-            }
-            break;
-        }
-        if (token.id === '(string)' || token.identifier) {
-            anonname = token.string;
-        }
-
-        if (id && next_token.id !== id) {
-            if (match) {
-                warn('expected_a_b_from_c_d', next_token, id,
-                    match.id, match.line, artifact());
-            } else if (!next_token.identifier || next_token.string !== id) {
-                warn('expected_a_b', next_token, id, artifact());
-            }
-        }
-        prev_token = token;
-        token = next_token;
-        next_token = lookahead.shift() || lex.token();
-    }
-
-
-    function advance_identifier(string) {
-        if (next_token.identifier && next_token.string === string) {
-            advance();
-        } else {
-            warn('expected_a_b', next_token, string, artifact());
-        }
-    }
-
-
-    function do_safe() {
-        if (option.adsafe) {
-            option.safe = true;
-        }
-        if (option.safe) {
-            option.browser     =
-                option['continue'] =
-                option.css     =
-                option.debug   =
-                option.devel   =
-                option.evil    =
-                option.forin   =
-                option.newcap  =
-                option.nomen   =
-                option.on      =
-                option.rhino   =
-                option.sloppy  =
-                option.sub     =
-                option.undef   =
-                option.widget  =
-                option.windows = false;
-
-
-            delete predefined.Array;
-            delete predefined.Date;
-            delete predefined.Function;
-            delete predefined.Object;
-            delete predefined['eval'];
-
-            add_to_predefined({
-                ADSAFE: false,
-                lib: false
-            });
-        }
-    }
-
-
-    function do_globals() {
-        var name, writeable;
-        for (;;) {
-            if (next_token.id !== '(string)' && !next_token.identifier) {
-                return;
-            }
-            name = next_token.string;
-            advance();
-            writeable = false;
-            if (next_token.id === ':') {
-                advance(':');
-                switch (next_token.id) {
-                case 'true':
-                    writeable = predefined[name] !== false;
-                    advance('true');
-                    break;
-                case 'false':
-                    advance('false');
-                    break;
-                default:
-                    stop('unexpected_a');
-                }
-            }
-            predefined[name] = writeable;
-            if (next_token.id !== ',') {
-                return;
-            }
-            advance(',');
-        }
-    }
-
-
-    function do_jslint() {
-        var name, value;
-        while (next_token.id === '(string)' || next_token.identifier) {
-            name = next_token.string;
-            if (!allowed_option[name]) {
-                stop('unexpected_a');
-            }
-            advance();
-            if (next_token.id !== ':') {
-                stop('expected_a_b', next_token, ':', artifact());
-            }
-            advance(':');
-            if (typeof allowed_option[name] === 'number') {
-                value = next_token.number;
-                if (value > allowed_option[name] || value <= 0 ||
-                        Math.floor(value) !== value) {
-                    stop('expected_small_a');
-                }
-                option[name] = value;
-            } else {
-                if (next_token.id === 'true') {
-                    option[name] = true;
-                } else if (next_token.id === 'false') {
-                    option[name] = false;
-                } else {
-                    stop('unexpected_a');
-                }
-            }
-            advance();
-            if (next_token.id === ',') {
-                advance(',');
-            }
-        }
-        assume();
-    }
-
-
-    function do_properties() {
-        var name;
-        option.properties = true;
-        for (;;) {
-            if (next_token.id !== '(string)' && !next_token.identifier) {
-                return;
-            }
-            name = next_token.string;
-            advance();
-            if (next_token.id === ':') {
-                for (;;) {
-                    advance();
-                    if (next_token.id !== '(string)' && !next_token.identifier) {
-                        break;
-                    }
-                }
-            }
-            property[name] = 0;
-            if (next_token.id !== ',') {
-                return;
-            }
-            advance(',');
-        }
-    }
-
-
-    directive = function directive() {
-        var command = this.id,
-            old_comments_off = comments_off,
-            old_indent = indent;
-        comments_off = true;
-        indent = null;
-        if (next_token.line === token.line && next_token.from === token.thru) {
-            warn('missing_space_a_b', next_token, artifact(token), artifact());
-        }
-        if (lookahead.length > 0) {
-            warn('unexpected_a', this);
-        }
-        switch (command) {
-        case '/*properties':
-        case '/*property':
-        case '/*members':
-        case '/*member':
-            do_properties();
-            break;
-        case '/*jslint':
-            if (option.safe) {
-                warn('adsafe_a', this);
-            }
-            do_jslint();
-            break;
-        case '/*globals':
-        case '/*global':
-            if (option.safe) {
-                warn('adsafe_a', this);
-            }
-            do_globals();
-            break;
-        default:
-            stop('unexpected_a', this);
-        }
-        comments_off = old_comments_off;
-        advance('*/');
-        indent = old_indent;
-    };
-
-
-// Indentation intention
-
-    function edge(mode) {
-        next_token.edge = indent ? indent.open && (mode || 'edge') : '';
-    }
-
-
-    function step_in(mode) {
-        var open;
-        if (typeof mode === 'number') {
-            indent = {
-                at: +mode,
-                open: true,
-                was: indent
-            };
-        } else if (!indent) {
-            indent = {
-                at: 1,
-                mode: 'statement',
-                open: true
-            };
-        } else if (mode === 'statement') {
-            indent = {
-                at: indent.at,
-                open: true,
-                was: indent
-            };
-        } else {
-            open = mode === 'var' || next_token.line !== token.line;
-            indent = {
-                at: (open || mode === 'control'
-                    ? indent.at + option.indent
-                    : indent.at) + (indent.wrap ? option.indent : 0),
-                mode: mode,
-                open: open,
-                was: indent
-            };
-            if (mode === 'var' && open) {
-                var_mode = indent;
-            }
-        }
-    }
-
-    function step_out(id, symbol) {
-        if (id) {
-            if (indent && indent.open) {
-                indent.at -= option.indent;
-                edge();
-            }
-            advance(id, symbol);
-        }
-        if (indent) {
-            indent = indent.was;
-        }
-    }
-
-// Functions for conformance of whitespace.
-
-    function one_space(left, right) {
-        left = left || token;
-        right = right || next_token;
-        if (right.id !== '(end)' && !option.white &&
-                (token.line !== right.line ||
-                token.thru + 1 !== right.from)) {
-            warn('expected_space_a_b', right, artifact(token), artifact(right));
-        }
-    }
-
-    function one_space_only(left, right) {
-        left = left || token;
-        right = right || next_token;
-        if (right.id !== '(end)' && (left.line !== right.line ||
-                (!option.white && left.thru + 1 !== right.from))) {
-            warn('expected_space_a_b', right, artifact(left), artifact(right));
-        }
-    }
-
-    function no_space(left, right) {
-        left = left || token;
-        right = right || next_token;
-        if ((!option.white || xmode === 'styleproperty' || xmode === 'style') &&
-                left.thru !== right.from && left.line === right.line) {
-            warn('unexpected_space_a_b', right, artifact(left), artifact(right));
-        }
-    }
-
-    function no_space_only(left, right) {
-        left = left || token;
-        right = right || next_token;
-        if (right.id !== '(end)' && (left.line !== right.line ||
-                (!option.white && left.thru !== right.from))) {
-            warn('unexpected_space_a_b', right, artifact(left), artifact(right));
-        }
-    }
-
-    function spaces(left, right) {
-        if (!option.white) {
-            left = left || token;
-            right = right || next_token;
-            if (left.thru === right.from && left.line === right.line) {
-                warn('missing_space_a_b', right, artifact(left), artifact(right));
-            }
-        }
-    }
-
-    function comma() {
-        if (next_token.id !== ',') {
-            warn_at('expected_a_b', token.line, token.thru, ',', artifact());
-        } else {
-            if (!option.white) {
-                no_space_only();
-            }
-            advance(',');
-            spaces();
-        }
-    }
-
-
-    function semicolon() {
-        if (next_token.id !== ';') {
-            warn_at('expected_a_b', token.line, token.thru, ';', artifact());
-        } else {
-            if (!option.white) {
-                no_space_only();
-            }
-            advance(';');
-            if (semicolon_coda[next_token.id] !== true) {
-                spaces();
-            }
-        }
-    }
-
-    function use_strict() {
-        if (next_token.string === 'use strict') {
-            if (strict_mode) {
-                warn('unnecessary_use');
-            }
-            edge();
-            advance();
-            semicolon();
-            strict_mode = true;
-            option.undef = false;
-            return true;
-        }
-        return false;
-    }
-
-
-    function are_similar(a, b) {
-        if (a === b) {
-            return true;
-        }
-        if (Array.isArray(a)) {
-            if (Array.isArray(b) && a.length === b.length) {
-                var i;
-                for (i = 0; i < a.length; i += 1) {
-                    if (!are_similar(a[i], b[i])) {
-                        return false;
-                    }
-                }
-                return true;
-            }
-            return false;
-        }
-        if (Array.isArray(b)) {
-            return false;
-        }
-        if (a.id === '(number)' && b.id === '(number)') {
-            return a.number === b.number;
-        }
-        if (a.arity === b.arity && a.string === b.string) {
-            switch (a.arity) {
-            case 'prefix':
-            case 'suffix':
-            case undefined:
-                return a.id === b.id && are_similar(a.first, b.first);
-            case 'infix':
-                return are_similar(a.first, b.first) &&
-                    are_similar(a.second, b.second);
-            case 'ternary':
-                return are_similar(a.first, b.first) &&
-                    are_similar(a.second, b.second) &&
-                    are_similar(a.third, b.third);
-            case 'function':
-            case 'regexp':
-                return false;
-            default:
-                return true;
-            }
-        } else {
-            if (a.id === '.' && b.id === '[' && b.arity === 'infix') {
-                return a.second.string === b.second.string && b.second.id === '(string)';
-            }
-            if (a.id === '[' && a.arity === 'infix' && b.id === '.') {
-                return a.second.string === b.second.string && a.second.id === '(string)';
-            }
-        }
-        return false;
-    }
-
-
-// This is the heart of JSLINT, the Pratt parser. In addition to parsing, it
-// is looking for ad hoc lint patterns. We add .fud to Pratt's model, which is
-// like .nud except that it is only used on the first token of a statement.
-// Having .fud makes it much easier to define statement-oriented languages like
-// JavaScript. I retained Pratt's nomenclature.
-
-// .nud     Null denotation
-// .fud     First null denotation
-// .led     Left denotation
-//  lbp     Left binding power
-//  rbp     Right binding power
-
-// They are elements of the parsing method called Top Down Operator Precedence.
-
-    function expression(rbp, initial) {
-
-// rbp is the right binding power.
-// initial indicates that this is the first expression of a statement.
-
-        var left;
-        if (next_token.id === '(end)') {
-            stop('unexpected_a', token, next_token.id);
-        }
-        advance();
-        if (option.safe && scope[token.string] &&
-                scope[token.string] === global_scope[token.string] &&
-                (next_token.id !== '(' && next_token.id !== '.')) {
-            warn('adsafe_a', token);
-        }
-        if (initial) {
-            anonname = 'anonymous';
-            funct['(verb)'] = token.string;
-        }
-        if (initial === true && token.fud) {
-            left = token.fud();
-        } else {
-            if (token.nud) {
-                left = token.nud();
-            } else {
-                if (next_token.id === '(number)' && token.id === '.') {
-                    warn('leading_decimal_a', token, artifact());
-                    advance();
-                    return token;
-                }
-                stop('expected_identifier_a', token, token.id);
-            }
-            while (rbp < next_token.lbp) {
-                advance();
-                if (token.led) {
-                    left = token.led(left);
-                } else {
-                    stop('expected_operator_a', token, token.id);
-                }
-            }
-        }
-        return left;
-    }
-
-
-// Functional constructors for making the symbols that will be inherited by
-// tokens.
-
-    function symbol(s, p) {
-        var x = syntax[s];
-        if (!x || typeof x !== 'object') {
-            syntax[s] = x = {
-                id: s,
-                lbp: p || 0,
-                string: s
-            };
-        }
-        return x;
-    }
-
-    function postscript(x) {
-        x.postscript = true;
-        return x;
-    }
-
-    function ultimate(s) {
-        var x = symbol(s, 0);
-        x.from = 1;
-        x.thru = 1;
-        x.line = 0;
-        x.edge = 'edge';
-        s.string = s;
-        return postscript(x);
-    }
-
-
-    function stmt(s, f) {
-        var x = symbol(s);
-        x.identifier = x.reserved = true;
-        x.fud = f;
-        return x;
-    }
-
-    function labeled_stmt(s, f) {
-        var x = stmt(s, f);
-        x.labeled = true;
-    }
-
-    function disrupt_stmt(s, f) {
-        var x = stmt(s, f);
-        x.disrupt = true;
-    }
-
-
-    function reserve_name(x) {
-        var c = x.id.charAt(0);
-        if ((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z')) {
-            x.identifier = x.reserved = true;
-        }
-        return x;
-    }
-
-
-    function prefix(s, f) {
-        var x = symbol(s, 150);
-        reserve_name(x);
-        x.nud = typeof f === 'function'
-            ? f
-            : function () {
-                if (s === 'typeof') {
-                    one_space();
-                } else {
-                    no_space_only();
-                }
-                this.first = expression(150);
-                this.arity = 'prefix';
-                if (this.id === '++' || this.id === '--') {
-                    if (!option.plusplus) {
-                        warn('unexpected_a', this);
-                    } else if ((!this.first.identifier || this.first.reserved) &&
-                            this.first.id !== '.' && this.first.id !== '[') {
-                        warn('bad_operand', this);
-                    }
-                }
-                return this;
-            };
-        return x;
-    }
-
-
-    function type(s, t, nud) {
-        var x = symbol(s);
-        x.arity = t;
-        if (nud) {
-            x.nud = nud;
-        }
-        return x;
-    }
-
-
-    function reserve(s, f) {
-        var x = symbol(s);
-        x.identifier = x.reserved = true;
-        if (typeof f === 'function') {
-            x.nud = f;
-        }
-        return x;
-    }
-
-
-    function constant(name) {
-        var x = reserve(name);
-        x.string = name;
-        x.nud = return_this;
-        return x;
-    }
-
-
-    function reservevar(s, v) {
-        return reserve(s, function () {
-            if (typeof v === 'function') {
-                v(this);
-            }
-            return this;
-        });
-    }
-
-
-    function infix(s, p, f, w) {
-        var x = symbol(s, p);
-        reserve_name(x);
-        x.led = function (left) {
-            this.arity = 'infix';
-            if (!w) {
-                spaces(prev_token, token);
-                spaces();
-            }
-            if (!option.bitwise && this.bitwise) {
-                warn('unexpected_a', this);
-            }
-            if (typeof f === 'function') {
-                return f(left, this);
-            }
-            this.first = left;
-            this.second = expression(p);
-            return this;
-        };
-        return x;
-    }
-
-    function expected_relation(node, message) {
-        if (node.assign) {
-            warn(message || bundle.conditional_assignment, node);
-        }
-        return node;
-    }
-
-    function expected_condition(node, message) {
-        switch (node.id) {
-        case '[':
-        case '-':
-            if (node.arity !== 'infix') {
-                warn(message || bundle.weird_condition, node);
-            }
-            break;
-        case 'false':
-        case 'function':
-        case 'Infinity':
-        case 'NaN':
-        case 'null':
-        case 'true':
-        case 'undefined':
-        case 'void':
-        case '(number)':
-        case '(regexp)':
-        case '(string)':
-        case '{':
-            warn(message || bundle.weird_condition, node);
-            break;
-        case '(':
-            if (node.first.id === '.' && numbery[node.first.second.string] === true) {
-                warn(message || bundle.weird_condition, node);
-            }
-            break;
-        }
-        return node;
-    }
-
-    function check_relation(node) {
-        switch (node.arity) {
-        case 'prefix':
-            switch (node.id) {
-            case '{':
-            case '[':
-                warn('unexpected_a', node);
-                break;
-            case '!':
-                warn('confusing_a', node);
-                break;
-            }
-            break;
-        case 'function':
-        case 'regexp':
-            warn('unexpected_a', node);
-            break;
-        default:
-            if (node.id  === 'NaN') {
-                warn('isNaN', node);
-            }
-        }
-        return node;
-    }
-
-
-    function relation(s, eqeq) {
-        return infix(s, 100, function (left, that) {
-            check_relation(left);
-            if (eqeq && !option.eqeq) {
-                warn('expected_a_b', that, eqeq, that.id);
-            }
-            var right = expression(100);
-            if (are_similar(left, right) ||
-                    ((left.id === '(string)' || left.id === '(number)') &&
-                    (right.id === '(string)' || right.id === '(number)'))) {
-                warn('weird_relation', that);
-            }
-            that.first = left;
-            that.second = check_relation(right);
-            return that;
-        });
-    }
-
-
-    function assignop(s, op) {
-        var x = infix(s, 20, function (left, that) {
-            var l;
-            that.first = left;
-            if (left.identifier) {
-                if (scope[left.string]) {
-                    if (scope[left.string].writeable === false) {
-                        warn('read_only', left);
-                    }
-                } else {
-                    stop('read_only');
-                }
-                if (funct['(params)']) {
-                    funct['(params)'].forEach(function (value) {
-                        if (value.string === left.string) {
-                            value.assign = true;
-                        }
-                    });
-                }
-            } else if (option.safe) {
-                l = left;
-                do {
-                    if (typeof predefined[l.string] === 'boolean') {
-                        warn('adsafe_a', l);
-                    }
-                    l = l.first;
-                } while (l);
-            }
-            if (left === syntax['function']) {
-                warn('identifier_function', token);
-            }
-            if (left.id === '.' || left.id === '[') {
-                if (!left.first || left.first.string === 'arguments') {
-                    warn('bad_assignment', that);
-                }
-            } else if (left.identifier) {
-                if (!left.reserved && funct[left.string] === 'exception') {
-                    warn('assign_exception', left);
-                }
-            } else {
-                warn('bad_assignment', that);
-            }
-            that.second = expression(19);
-            if (that.id === '=' && are_similar(that.first, that.second)) {
-                warn('weird_assignment', that);
-            }
-            return that;
-        });
-        x.assign = true;
-        if (op) {
-            if (syntax[op].bitwise) {
-                x.bitwise = true;
-            }
-        }
-        return x;
-    }
-
-
-    function bitwise(s, p) {
-        var x = infix(s, p, 'number');
-        x.bitwise = true;
-        return x;
-    }
-
-
-    function suffix(s) {
-        var x = symbol(s, 150);
-        x.led = function (left) {
-            no_space_only(prev_token, token);
-            if (!option.plusplus) {
-                warn('unexpected_a', this);
-            } else if ((!left.identifier || left.reserved) &&
-                    left.id !== '.' && left.id !== '[') {
-                warn('bad_operand', this);
-            }
-            this.first = left;
-            this.arity = 'suffix';
-            return this;
-        };
-        return x;
-    }
-
-
-    function optional_identifier() {
-        if (next_token.identifier) {
-            advance();
-            if (option.safe && banned[token.string]) {
-                warn('adsafe_a', token);
-            } else if (token.reserved && !option.es5) {
-                warn('expected_identifier_a_reserved', token);
-            }
-            return token.string;
-        }
-    }
-
-
-    function identifier() {
-        var i = optional_identifier();
-        if (!i) {
-            stop(token.id === 'function' && next_token.id === '('
-                ? 'name_function'
-                : 'expected_identifier_a');
-        }
-        return i;
-    }
-
-
-    function statement() {
-
-        var label, old_scope = scope, the_statement;
-
-// We don't like the empty statement.
-
-        if (next_token.id === ';') {
-            warn('unexpected_a');
-            semicolon();
-            return;
-        }
-
-// Is this a labeled statement?
-
-        if (next_token.identifier && !next_token.reserved && peek().id === ':') {
-            edge('label');
-            label = next_token;
-            advance();
-            advance(':');
-            scope = Object.create(old_scope);
-            add_label(label, 'label');
-            if (next_token.labeled !== true || funct === global_funct) {
-                stop('unexpected_label_a', label);
-            } else if (jx.test(label.string + ':')) {
-                warn('url', label);
-            }
-            next_token.label = label;
-        }
-
-// Parse the statement.
-
-        if (token.id !== 'else') {
-            edge();
-        }
-        step_in('statement');
-        the_statement = expression(0, true);
-        if (the_statement) {
-
-// Look for the final semicolon.
-
-            if (the_statement.arity === 'statement') {
-                if (the_statement.id === 'switch' ||
-                        (the_statement.block && the_statement.id !== 'do')) {
-                    spaces();
-                } else {
-                    semicolon();
-                }
-            } else {
-
-// If this is an expression statement, determine if it is acceptable.
-// We do not like
-//      new Blah();
-// statments. If it is to be used at all, new should only be used to make
-// objects, not side effects. The expression statements we do like do
-// assignment or invocation or delete.
-
-                if (the_statement.id === '(') {
-                    if (the_statement.first.id === 'new') {
-                        warn('bad_new');
-                    }
-                } else if (!the_statement.assign &&
-                        the_statement.id !== 'delete' &&
-                        the_statement.id !== '++' &&
-                        the_statement.id !== '--') {
-                    warn('assignment_function_expression', token);
-                }
-                semicolon();
-            }
-        }
-        step_out();
-        scope = old_scope;
-        return the_statement;
-    }
-
-
-    function statements() {
-        var array = [], disruptor, the_statement;
-
-// A disrupt statement may not be followed by any other statement.
-// If the last statement is disrupt, then the sequence is disrupt.
-
-        while (next_token.postscript !== true) {
-            if (next_token.id === ';') {
-                warn('unexpected_a', next_token);
-                semicolon();
-            } else {
-                if (next_token.string === 'use strict') {
-                    if ((!node_js && xmode !== 'script') || funct !== global_funct || array.length > 0) {
-                        warn('function_strict');
-                    }
-                    use_strict();
-                }
-                if (disruptor) {
-                    warn('unreachable_a_b', next_token, next_token.string,
-                        disruptor.string);
-                    disruptor = null;
-                }
-                the_statement = statement();
-                if (the_statement) {
-                    array.push(the_statement);
-                    if (the_statement.disrupt) {
-                        disruptor = the_statement;
-                        array.disrupt = true;
-                    }
-                }
-            }
-        }
-        return array;
-    }
-
-
-    function block(ordinary) {
-
-// array block is array sequence of statements wrapped in braces.
-// ordinary is false for function bodies and try blocks.
-// ordinary is true for if statements, while, etc.
-
-        var array,
-            curly = next_token,
-            old_in_block = in_block,
-            old_scope = scope,
-            old_strict_mode = strict_mode;
-
-        in_block = ordinary;
-        scope = Object.create(scope);
-        spaces();
-        if (next_token.id === '{') {
-            advance('{');
-            step_in();
-            if (!ordinary && !use_strict() && !old_strict_mode &&
-                    !option.sloppy && funct['(context)'] === global_funct) {
-                warn('missing_use_strict');
-            }
-            array = statements();
-            strict_mode = old_strict_mode;
-            step_out('}', curly);
-        } else if (!ordinary) {
-            stop('expected_a_b', next_token, '{', artifact());
-        } else {
-            warn('expected_a_b', next_token, '{', artifact());
-            array = [statement()];
-            array.disrupt = array[0].disrupt;
-        }
-        funct['(verb)'] = null;
-        scope = old_scope;
-        in_block = old_in_block;
-        if (ordinary && array.length === 0) {
-            warn('empty_block');
-        }
-        return array;
-    }
-
-
-    function tally_property(name) {
-        if (option.properties && typeof property[name] !== 'number') {
-            warn('unexpected_property_a', token, name);
-        }
-        if (typeof property[name] === 'number') {
-            property[name] += 1;
-        } else {
-            property[name] = 1;
-        }
-    }
-
-
-// ECMAScript parser
-
-    syntax['(identifier)'] = {
-        id: '(identifier)',
-        lbp: 0,
-        identifier: true,
-        nud: function () {
-            var name = this.string,
-                variable = scope[name],
-                site,
-                writeable;
-
-// If the variable is not in scope, then we may have an undeclared variable.
-// Check the predefined list. If it was predefined, create the global
-// variable.
-
-            if (typeof variable !== 'object') {
-                writeable = predefined[name];
-                if (typeof writeable === 'boolean') {
-                    global_scope[name] = variable = {
-                        string:    name,
-                        writeable: writeable,
-                        funct:     global_funct
-                    };
-                    global_funct[name] = 'var';
-
-// But if the variable is not in scope, and is not predefined, and if we are not
-// in the global scope, then we have an undefined variable error.
-
-                } else {
-                    if (!option.undef) {
-                        warn('used_before_a', token);
-                    }
-                    scope[name] = variable = {
-                        string: name,
-                        writeable: true,
-                        funct: funct
-                    };
-                    funct[name] = 'undef';
-                }
-
-            }
-            site = variable.funct;
-
-// The name is in scope and defined in the current function.
-
-            if (funct === site) {
-
-//      Change 'unused' to 'var', and reject labels.
-
-                switch (funct[name]) {
-                case 'becoming':
-                    warn('unexpected_a', token);
-                    funct[name] = 'var';
-                    break;
-                case 'unused':
-                    funct[name] = 'var';
-                    break;
-                case 'unparam':
-                    funct[name] = 'parameter';
-                    break;
-                case 'unction':
-                    funct[name] = 'function';
-                    break;
-                case 'label':
-                    warn('a_label', token, name);
-                    break;
-                }
-
-// If the name is already defined in the current
-// function, but not as outer, then there is a scope error.
-
-            } else {
-                switch (funct[name]) {
-                case 'closure':
-                case 'function':
-                case 'var':
-                case 'unused':
-                    warn('a_scope', token, name);
-                    break;
-                case 'label':
-                    warn('a_label', token, name);
-                    break;
-                case 'outer':
-                case 'global':
-                    break;
-                default:
-
-// If the name is defined in an outer function, make an outer entry, and if
-// it was unused, make it var.
-
-                    switch (site[name]) {
-                    case 'becoming':
-                    case 'closure':
-                    case 'function':
-                    case 'parameter':
-                    case 'unction':
-                    case 'unused':
-                    case 'var':
-                        site[name] = 'closure';
-                        funct[name] = site === global_funct
-                            ? 'global'
-                            : 'outer';
-                        break;
-                    case 'unparam':
-                        site[name] = 'parameter';
-                        funct[name] = 'outer';
-                        break;
-                    case 'undef':
-                        funct[name] = 'undef';
-                        break;
-                    case 'label':
-                        warn('a_label', token, name);
-                        break;
-                    }
-                }
-            }
-            return this;
-        },
-        led: function () {
-            stop('expected_operator_a');
-        }
-    };
-
-// Build the syntax table by declaring the syntactic elements.
-
-    type('(array)', 'array');
-    type('(color)', 'color');
-    type('(function)', 'function');
-    type('(number)', 'number', return_this);
-    type('(object)', 'object');
-    type('(string)', 'string', return_this);
-    type('(boolean)', 'boolean', return_this);
-    type('(range)', 'range');
-    type('(regexp)', 'regexp', return_this);
-
-    ultimate('(begin)');
-    ultimate('(end)');
-    ultimate('(error)');
-    postscript(symbol('</'));
-    symbol('<!');
-    symbol('<!--');
-    symbol('-->');
-    postscript(symbol('}'));
-    symbol(')');
-    symbol(']');
-    postscript(symbol('"'));
-    postscript(symbol('\''));
-    symbol(';');
-    symbol(':');
-    symbol(',');
-    symbol('#');
-    symbol('@');
-    symbol('*/');
-    postscript(reserve('case'));
-    reserve('catch');
-    postscript(reserve('default'));
-    reserve('else');
-    reserve('finally');
-
-    reservevar('arguments', function (x) {
-        if (strict_mode && funct === global_funct) {
-            warn('strict', x);
-        } else if (option.safe) {
-            warn('adsafe_a', x);
-        }
-        funct['(arguments)'] = true;
-    });
-    reservevar('eval', function (x) {
-        if (option.safe) {
-            warn('adsafe_a', x);
-        }
-    });
-    constant('false', 'boolean');
-    constant('Infinity', 'number');
-    constant('NaN', 'number');
-    constant('null', '');
-    reservevar('this', function (x) {
-        if (option.safe) {
-            warn('adsafe_a', x);
-        } else if (strict_mode && funct['(token)'].arity === 'statement' &&
-                funct['(name)'].charAt(0) > 'Z') {
-            warn('strict', x);
-        }
-    });
-    constant('true', 'boolean');
-    constant('undefined', '');
-
-    infix('?', 30, function (left, that) {
-        step_in('?');
-        that.first = expected_condition(expected_relation(left));
-        that.second = expression(0);
-        spaces();
-        step_out();
-        var colon = next_token;
-        advance(':');
-        step_in(':');
-        spaces();
-        that.third = expression(10);
-        that.arity = 'ternary';
-        if (are_similar(that.second, that.third)) {
-            warn('weird_ternary', colon);
-        } else if (are_similar(that.first, that.second)) {
-            warn('use_or', that);
-        }
-        step_out();
-        return that;
-    });
-
-    infix('||', 40, function (left, that) {
-        function paren_check(that) {
-            if (that.id === '&&' && !that.paren) {
-                warn('and', that);
-            }
-            return that;
-        }
-
-        that.first = paren_check(expected_condition(expected_relation(left)));
-        that.second = paren_check(expected_relation(expression(40)));
-        if (are_similar(that.first, that.second)) {
-            warn('weird_condition', that);
-        }
-        return that;
-    });
-
-    infix('&&', 50, function (left, that) {
-        that.first = expected_condition(expected_relation(left));
-        that.second = expected_relation(expression(50));
-        if (are_similar(that.first, that.second)) {
-            warn('weird_condition', that);
-        }
-        return that;
-    });
-
-    prefix('void', function () {
-        this.first = expression(0);
-        this.arity = 'prefix';
-        if (option.es5) {
-            warn('expected_a_b', this, 'undefined', 'void');
-        } else if (this.first.number !== 0) {
-            warn('expected_a_b', this.first, '0', artifact(this.first));
-        }
-        return this;
-    });
-
-    bitwise('|', 70);
-    bitwise('^', 80);
-    bitwise('&', 90);
-
-    relation('==', '===');
-    relation('===');
-    relation('!=', '!==');
-    relation('!==');
-    relation('<');
-    relation('>');
-    relation('<=');
-    relation('>=');
-
-    bitwise('<<', 120);
-    bitwise('>>', 120);
-    bitwise('>>>', 120);
-
-    infix('in', 120, function (left, that) {
-        warn('infix_in', that);
-        that.left = left;
-        that.right = expression(130);
-        return that;
-    });
-    infix('instanceof', 120);
-    infix('+', 130, function (left, that) {
-        if (left.id === '(number)') {
-            if (left.number === 0) {
-                warn('unexpected_a', left, '0');
-            }
-        } else if (left.id === '(string)') {
-            if (left.string === '') {
-                warn('expected_a_b', left, 'String', '\'\'');
-            }
-        }
-        var right = expression(130);
-        if (right.id === '(number)') {
-            if (right.number === 0) {
-                warn('unexpected_a', right, '0');
-            }
-        } else if (right.id === '(string)') {
-            if (right.string === '') {
-                warn('expected_a_b', right, 'String', '\'\'');
-            }
-        }
-        if (left.id === right.id) {
-            if (left.id === '(string)' || left.id === '(number)') {
-                if (left.id === '(string)') {
-                    left.string += right.string;
-                    if (jx.test(left.string)) {
-                        warn('url', left);
-                    }
-                } else {
-                    left.number += right.number;
-                }
-                left.thru = right.thru;
-                return left;
-            }
-        }
-        that.first = left;
-        that.second = right;
-        return that;
-    });
-    prefix('+', 'num');
-    prefix('+++', function () {
-        warn('confusing_a', token);
-        this.first = expression(150);
-        this.arity = 'prefix';
-        return this;
-    });
-    infix('+++', 130, function (left) {
-        warn('confusing_a', token);
-        this.first = left;
-        this.second = expression(130);
-        return this;
-    });
-    infix('-', 130, function (left, that) {
-        if ((left.id === '(number)' && left.number === 0) || left.id === '(string)') {
-            warn('unexpected_a', left);
-        }
-        var right = expression(130);
-        if ((right.id === '(number)' && right.number === 0) || right.id === '(string)') {
-            warn('unexpected_a', right);
-        }
-        if (left.id === right.id && left.id === '(number)') {
-            left.number -= right.number;
-            left.thru = right.thru;
-            return left;
-        }
-        that.first = left;
-        that.second = right;
-        return that;
-    });
-    prefix('-');
-    prefix('---', function () {
-        warn('confusing_a', token);
-        this.first = expression(150);
-        this.arity = 'prefix';
-        return this;
-    });
-    infix('---', 130, function (left) {
-        warn('confusing_a', token);
-        this.first = left;
-        this.second = expression(130);
-        return this;
-    });
-    infix('*', 140, function (left, that) {
-        if ((left.id === '(number)' && (left.number === 0 || left.number === 1)) || left.id === '(string)') {
-            warn('unexpected_a', left);
-        }
-        var right = expression(140);
-        if ((right.id === '(number)' && (right.number === 0 || right.number === 1)) || right.id === '(string)') {
-            warn('unexpected_a', right);
-        }
-        if (left.id === right.id && left.id === '(number)') {
-            left.number *= right.number;
-            left.thru = right.thru;
-            return left;
-        }
-        that.first = left;
-        that.second = right;
-        return that;
-    });
-    infix('/', 140, function (left, that) {
-        if ((left.id === '(number)' && left.number === 0) || left.id === '(string)') {
-            warn('unexpected_a', left);
-        }
-        var right = expression(140);
-        if ((right.id === '(number)' && (right.number === 0 || right.number === 1)) || right.id === '(string)') {
-            warn('unexpected_a', right);
-        }
-        if (left.id === right.id && left.id === '(number)') {
-            left.number /= right.number;
-            left.thru = right.thru;
-            return left;
-        }
-        that.first = left;
-        that.second = right;
-        return that;
-    });
-    infix('%', 140, function (left, that) {
-        if ((left.id === '(number)' && (left.number === 0 || left.number === 1)) || left.id === '(string)') {
-            warn('unexpected_a', left);
-        }
-        var right = expression(140);
-        if ((right.id === '(number)' && right.number === 0) || right.id === '(string)') {
-            warn('unexpected_a', right);
-        }
-        if (left.id === right.id && left.id === '(number)') {
-            left.number %= right.number;
-            left.thru = right.thru;
-            return left;
-        }
-        that.first = left;
-        that.second = right;
-        return that;
-    });
-
-    suffix('++');
-    prefix('++');
-
-    suffix('--');
-    prefix('--');
-    prefix('delete', function () {
-        one_space();
-        var p = expression(0);
-        if (!p || (p.id !== '.' && p.id !== '[')) {
-            warn('deleted');
-        }
-        this.first = p;
-        return this;
-    });
-
-
-    prefix('~', function () {
-        no_space_only();
-        if (!option.bitwise) {
-            warn('unexpected_a', this);
-        }
-        expression(150);
-        return this;
-    });
-    prefix('!', function () {
-        no_space_only();
-        this.first = expected_condition(expression(150));
-        this.arity = 'prefix';
-        if (bang[this.first.id] === true || this.first.assign) {
-            warn('confusing_a', this);
-        }
-        return this;
-    });
-    prefix('typeof', null);
-    prefix('new', function () {
-        one_space();
-        var c = expression(160), n, p, v;
-        this.first = c;
-        if (c.id !== 'function') {
-            if (c.identifier) {
-                switch (c.string) {
-                case 'Object':
-                    warn('use_object', token);
-                    break;
-                case 'Array':
-                    if (next_token.id === '(') {
-                        p = next_token;
-                        p.first = this;
-                        advance('(');
-                        if (next_token.id !== ')') {
-                            n = expression(0);
-                            p.second = [n];
-                            if (n.id !== '(number)' || next_token.id === ',') {
-                                warn('use_array', p);
-                            }
-                            while (next_token.id === ',') {
-                                advance(',');
-                                p.second.push(expression(0));
-                            }
-                        } else {
-                            warn('use_array', token);
-                        }
-                        advance(')', p);
-                        return p;
-                    }
-                    warn('use_array', token);
-                    break;
-                case 'Number':
-                case 'String':
-                case 'Boolean':
-                case 'Math':
-                case 'JSON':
-                    warn('not_a_constructor', c);
-                    break;
-                case 'Function':
-                    if (!option.evil) {
-                        warn('function_eval');
-                    }
-                    break;
-                case 'Date':
-                case 'RegExp':
-                case 'this':
-                    break;
-                default:
-                    if (c.id !== 'function') {
-                        v = c.string.charAt(0);
-                        if (!option.newcap && (v < 'A' || v > 'Z')) {
-                            warn('constructor_name_a', token);
-                        }
-                    }
-                }
-            } else {
-                if (c.id !== '.' && c.id !== '[' && c.id !== '(') {
-                    warn('bad_constructor', token);
-                }
-            }
-        } else {
-            warn('weird_new', this);
-        }
-        if (next_token.id !== '(') {
-            warn('missing_a', next_token, '()');
-        }
-        return this;
-    });
-
-    infix('(', 160, function (left, that) {
-        var p;
-        if (indent && indent.mode === 'expression') {
-            no_space(prev_token, token);
-        } else {
-            no_space_only(prev_token, token);
-        }
-        if (!left.immed && left.id === 'function') {
-            warn('wrap_immediate');
-        }
-        p = [];
-        if (left.identifier) {
-            if (left.string.match(/^[A-Z]([A-Z0-9_$]*[a-z][A-Za-z0-9_$]*)?$/)) {
-                if (left.string !== 'Number' && left.string !== 'String' &&
-                        left.string !== 'Boolean' && left.string !== 'Date') {
-                    if (left.string === 'Math' || left.string === 'JSON') {
-                        warn('not_a_function', left);
-                    } else if (left.string === 'Object') {
-                        warn('use_object', token);
-                    } else if (left.string === 'Array' || !option.newcap) {
-                        warn('missing_a', left, 'new');
-                    }
-                }
-            }
-        } else if (left.id === '.') {
-            if (option.safe && left.first.string === 'Math' &&
-                    left.second === 'random') {
-                warn('adsafe_a', left);
-            } else if (left.second.string === 'split' &&
-                    left.first.id === '(string)') {
-                warn('use_array', left.second);
-            }
-        }
-        step_in();
-        if (next_token.id !== ')') {
-            no_space();
-            for (;;) {
-                edge();
-                p.push(expression(10));
-                if (next_token.id !== ',') {
-                    break;
-                }
-                comma();
-            }
-        }
-        no_space();
-        step_out(')', that);
-        if (typeof left === 'object') {
-            if (left.string === 'parseInt' && p.length === 1) {
-                warn('radix', left);
-            }
-            if (!option.evil) {
-                if (left.string === 'eval' || left.string === 'Function' ||
-                        left.string === 'execScript') {
-                    warn('evil', left);
-                } else if (p[0] && p[0].id === '(string)' &&
-                        (left.string === 'setTimeout' ||
-                        left.string === 'setInterval')) {
-                    warn('implied_evil', left);
-                }
-            }
-            if (!left.identifier && left.id !== '.' && left.id !== '[' &&
-                    left.id !== '(' && left.id !== '&&' && left.id !== '||' &&
-                    left.id !== '?') {
-                warn('bad_invocation', left);
-            }
-        }
-        that.first = left;
-        that.second = p;
-        return that;
-    }, true);
-
-    prefix('(', function () {
-        step_in('expression');
-        no_space();
-        edge();
-        if (next_token.id === 'function') {
-            next_token.immed = true;
-        }
-        var value = expression(0);
-        value.paren = true;
-        no_space();
-        step_out(')', this);
-        if (value.id === 'function') {
-            switch (next_token.id) {
-            case '(':
-                warn('move_invocation');
-                break;
-            case '.':
-            case '[':
-                warn('unexpected_a');
-                break;
-            default:
-                warn('bad_wrap', this);
-            }
-        }
-        return value;
-    });
-
-    infix('.', 170, function (left, that) {
-        no_space(prev_token, token);
-        no_space();
-        var name = identifier();
-        if (typeof name === 'string') {
-            tally_property(name);
-        }
-        that.first = left;
-        that.second = token;
-        if (left && left.string === 'arguments' &&
-                (name === 'callee' || name === 'caller')) {
-            warn('avoid_a', left, 'arguments.' + name);
-        } else if (!option.evil && left && left.string === 'document' &&
-                (name === 'write' || name === 'writeln')) {
-            warn('write_is_wrong', left);
-        } else if (!option.stupid && name.indexOf('Sync') > 0) {
-            warn('sync_a', token);
-        } else if (option.adsafe) {
-            if (!adsafe_top && left.string === 'ADSAFE') {
-                if (name === 'id' || name === 'lib') {
-                    warn('adsafe_a', that);
-                } else if (name === 'go') {
-                    if (xmode !== 'script') {
-                        warn('adsafe_a', that);
-                    } else if (adsafe_went || next_token.id !== '(' ||
-                            peek(0).id !== '(string)' ||
-                            peek(0).string !== adsafe_id ||
-                            peek(1).id !== ',') {
-                        stop('adsafe_a', that, 'go');
-                    }
-                    adsafe_went = true;
-                    adsafe_may = false;
-                }
-            }
-            adsafe_top = false;
-        }
-        if (!option.evil && (name === 'eval' || name === 'execScript')) {
-            warn('evil');
-        } else if (option.safe) {
-            for (;;) {
-                if (banned[name] === true) {
-                    warn('adsafe_a', token, name);
-                }
-                if (typeof predefined[left.string] !== 'boolean' ||    //// check for writeable
-                        next_token.id === '(') {
-                    break;
-                }
-                if (next_token.id !== '.') {
-                    warn('adsafe_a', that);
-                    break;
-                }
-                advance('.');
-                token.first = that;
-                token.second = name;
-                that = token;
-                name = identifier();
-                if (typeof name === 'string') {
-                    tally_property(name);
-                }
-            }
-        }
-        return that;
-    }, true);
-
-    infix('[', 170, function (left, that) {
-        var e, s;
-        no_space_only(prev_token, token);
-        no_space();
-        step_in();
-        edge();
-        e = expression(0);
-        switch (e.id) {
-        case '(number)':
-            if (e.id === '(number)' && left.id === 'arguments') {
-                warn('use_param', left);
-            }
-            break;
-        case '(string)':
-            if (option.safe && (banned[e.string] ||
-                    e.string.charAt(0) === '_' || e.string.slice(-1) === '_')) {
-                warn('adsafe_subscript_a', e);
-            } else if (!option.evil &&
-                    (e.string === 'eval' || e.string === 'execScript')) {
-                warn('evil', e);
-            } else if (!option.sub && ix.test(e.string)) {
-                s = syntax[e.string];
-                if (!s || !s.reserved) {
-                    warn('subscript', e);
-                }
-            }
-            tally_property(e.string);
-            break;
-        default:
-            if (option.safe) {
-                warn('adsafe_subscript_a', e);
-            }
-        }
-        step_out(']', that);
-        no_space(prev_token, token);
-        that.first = left;
-        that.second = e;
-        return that;
-    }, true);
-
-    prefix('[', function () {
-        this.arity = 'prefix';
-        this.first = [];
-        step_in('array');
-        while (next_token.id !== '(end)') {
-            while (next_token.id === ',') {
-                warn('unexpected_a', next_token);
-                advance(',');
-            }
-            if (next_token.id === ']') {
-                break;
-            }
-            indent.wrap = false;
-            edge();
-            this.first.push(expression(10));
-            if (next_token.id === ',') {
-                comma();
-                if (next_token.id === ']' && !option.es5) {
-                    warn('unexpected_a', token);
-                    break;
-                }
-            } else {
-                break;
-            }
-        }
-        step_out(']', this);
-        return this;
-    }, 170);
-
-
-    function property_name() {
-        var id = optional_identifier(true);
-        if (!id) {
-            if (next_token.id === '(string)') {
-                id = next_token.string;
-                if (option.safe) {
-                    if (banned[id]) {
-                        warn('adsafe_a');
-                    } else if (id.charAt(0) === '_' ||
-                            id.charAt(id.length - 1) === '_') {
-                        warn('dangling_a');
-                    }
-                }
-                advance();
-            } else if (next_token.id === '(number)') {
-                id = next_token.number.toString();
-                advance();
-            }
-        }
-        return id;
-    }
-
-
-    function function_params() {
-        var id, paren = next_token, params = [];
-        advance('(');
-        step_in();
-        no_space();
-        if (next_token.id === ')') {
-            no_space();
-            step_out(')', paren);
-            return params;
-        }
-        for (;;) {
-            edge();
-            id = identifier();
-            params.push(token);
-            add_label(token, option.unparam ? 'parameter' : 'unparam');
-            if (next_token.id === ',') {
-                comma();
-            } else {
-                no_space();
-                step_out(')', paren);
-                return params;
-            }
-        }
-    }
-
-
-
-    function do_function(func, name) {
-        var old_funct      = funct,
-            old_option     = option,
-            old_scope      = scope;
-        funct = {
-            '(name)'     : name || '\'' + (anonname || '').replace(nx, sanitize) + '\'',
-            '(line)'     : next_token.line,
-            '(context)'  : old_funct,
-            '(breakage)' : 0,
-            '(loopage)'  : 0,
-            '(scope)'    : scope,
-            '(token)'    : func
-        };
-        option = Object.create(old_option);
-        scope = Object.create(old_scope);
-        functions.push(funct);
-        func.name = name;
-        if (name) {
-            add_label(func, 'function', name);
-        }
-        func.writeable = false;
-        func.first = funct['(params)'] = function_params();
-        one_space();
-        func.block = block(false);
-        if (funct['(arguments)']) {
-            func.first.forEach(function (value) {
-                if (value.assign) {
-                    warn('parameter_arguments_a', value, value.string);
-                }
-            });
-        }
-        funct      = old_funct;
-        option     = old_option;
-        scope      = old_scope;
-    }
-
-
-    assignop('=');
-    assignop('+=', '+');
-    assignop('-=', '-');
-    assignop('*=', '*');
-    assignop('/=', '/').nud = function () {
-        stop('slash_equal');
-    };
-    assignop('%=', '%');
-    assignop('&=', '&');
-    assignop('|=', '|');
-    assignop('^=', '^');
-    assignop('<<=', '<<');
-    assignop('>>=', '>>');
-    assignop('>>>=', '>>>');
-
-
-    prefix('{', function () {
-        var get, i, j, name, p, set, seen = {};
-        this.arity = 'prefix';
-        this.first = [];
-        step_in();
-        while (next_token.id !== '}') {
-            indent.wrap = false;
-
-// JSLint recognizes the ES5 extension for get/set in object literals,
-// but requires that they be used in pairs.
-
-            edge();
-            if (next_token.string === 'get' && peek().id !== ':') {
-                if (!option.es5) {
-                    warn('es5');
-                }
-                get = next_token;
-                advance('get');
-                one_space_only();
-                name = next_token;
-                i = property_name();
-                if (!i) {
-                    stop('missing_property');
-                }
-                get.string = '';
-                do_function(get);
-                if (funct['(loopage)']) {
-                    warn('function_loop', get);
-                }
-                p = get.first;
-                if (p && p.length) {
-                    warn('parameter_a_get_b', p[0], p[0].string, i);
-                }
-                comma();
-                set = next_token;
-                spaces();
-                edge();
-                advance('set');
-                set.string = '';
-                one_space_only();
-                j = property_name();
-                if (i !== j) {
-                    stop('expected_a_b', token, i, j || next_token.string);
-                }
-                do_function(set);
-                if (set.block.length === 0) {
-                    warn('missing_a', token, 'throw');
-                }
-                p = set.first;
-                if (!p || p.length !== 1) {
-                    stop('parameter_set_a', set, 'value');
-                } else if (p[0].string !== 'value') {
-                    stop('expected_a_b', p[0], 'value', p[0].string);
-                }
-                name.first = [get, set];
-            } else {
-                name = next_token;
-                i = property_name();
-                if (typeof i !== 'string') {
-                    stop('missing_property');
-                }
-                advance(':');
-                spaces();
-                name.first = expression(10);
-            }
-            this.first.push(name);
-            if (seen[i] === true) {
-                warn('duplicate_a', next_token, i);
-            }
-            seen[i] = true;
-            tally_property(i);
-            if (next_token.id !== ',') {
-                break;
-            }
-            for (;;) {
-                comma();
-                if (next_token.id !== ',') {
-                    break;
-                }
-                warn('unexpected_a', next_token);
-            }
-            if (next_token.id === '}' && !option.es5) {
-                warn('unexpected_a', token);
-            }
-        }
-        step_out('}', this);
-        return this;
-    });
-
-    stmt('{', function () {
-        warn('statement_block');
-        this.arity = 'statement';
-        this.block = statements();
-        this.disrupt = this.block.disrupt;
-        advance('}', this);
-        return this;
-    });
-
-    stmt('/*global', directive);
-    stmt('/*globals', directive);
-    stmt('/*jslint', directive);
-    stmt('/*member', directive);
-    stmt('/*members', directive);
-    stmt('/*property', directive);
-    stmt('/*properties', directive);
-
-    stmt('var', function () {
-
-// JavaScript does not have block scope. It only has function scope. So,
-// declaring a variable in a block can have unexpected consequences.
-
-// var.first will contain an array, the array containing name tokens
-// and assignment tokens.
-
-        var assign, id, name;
-
-        if (funct['(vars)'] && !option.vars) {
-            warn('combine_var');
-        } else if (funct !== global_funct) {
-            funct['(vars)'] = true;
-        }
-        this.arity = 'statement';
-        this.first = [];
-        step_in('var');
-        for (;;) {
-            name = next_token;
-            id = identifier();
-            add_label(name, 'becoming');
-
-            if (next_token.id === '=') {
-                assign = next_token;
-                assign.first = name;
-                spaces();
-                advance('=');
-                spaces();
-                if (next_token.id === 'undefined') {
-                    warn('unnecessary_initialize', token, id);
-                }
-                if (peek(0).id === '=' && next_token.identifier) {
-                    stop('var_a_not');
-                }
-                assign.second = expression(0);
-                assign.arity = 'infix';
-                this.first.push(assign);
-            } else {
-                this.first.push(name);
-            }
-            if (funct[id] === 'becoming') {
-                funct[id] = 'unused';
-            }
-            if (next_token.id !== ',') {
-                break;
-            }
-            comma();
-            indent.wrap = false;
-            if (var_mode && next_token.line === token.line &&
-                    this.first.length === 1) {
-                var_mode = null;
-                indent.open = false;
-                indent.at -= option.indent;
-            }
-            spaces();
-            edge();
-        }
-        var_mode = null;
-        step_out();
-        return this;
-    });
-
-    stmt('function', function () {
-        one_space();
-        if (in_block) {
-            warn('function_block', token);
-        }
-        var name = next_token, id = identifier();
-        add_label(name, 'unction');
-        no_space();
-        this.arity = 'statement';
-        do_function(this, id);
-        if (next_token.id === '(' && next_token.line === token.line) {
-            stop('function_statement');
-        }
-        return this;
-    });
-
-    prefix('function', function () {
-        if (!option.anon) {
-            one_space();
-        }
-        var id = optional_identifier();
-        if (id) {
-            no_space();
-        } else {
-            id = '';
-        }
-        do_function(this, id);
-        if (funct['(loopage)']) {
-            warn('function_loop');
-        }
-        switch (next_token.id) {
-        case ';':
-        case '(':
-        case ')':
-        case ',':
-        case ']':
-        case '}':
-        case ':':
-            break;
-        case '.':
-            if (peek().string !== 'bind' || peek(1).id !== '(') {
-                warn('unexpected_a');
-            }
-            break;
-        default:
-            stop('unexpected_a');
-        }
-        this.arity = 'function';
-        return this;
-    });
-
-    stmt('if', function () {
-        var paren = next_token;
-        one_space();
-        advance('(');
-        step_in('control');
-        no_space();
-        edge();
-        this.arity = 'statement';
-        this.first = expected_condition(expected_relation(expression(0)));
-        no_space();
-        step_out(')', paren);
-        one_space();
-        this.block = block(true);
-        if (next_token.id === 'else') {
-            one_space();
-            advance('else');
-            one_space();
-            this['else'] = next_token.id === 'if' || next_token.id === 'switch'
-                ? statement(true)
-                : block(true);
-            if (this['else'].disrupt && this.block.disrupt) {
-                this.disrupt = true;
-            }
-        }
-        return this;
-    });
-
-    stmt('try', function () {
-
-// try.first    The catch variable
-// try.second   The catch clause
-// try.third    The finally clause
-// try.block    The try block
-
-        var exception_variable, old_scope, paren;
-        if (option.adsafe) {
-            warn('adsafe_a', this);
-        }
-        one_space();
-        this.arity = 'statement';
-        this.block = block(false);
-        if (next_token.id === 'catch') {
-            one_space();
-            advance('catch');
-            one_space();
-            paren = next_token;
-            advance('(');
-            step_in('control');
-            no_space();
-            edge();
-            old_scope = scope;
-            scope = Object.create(old_scope);
-            exception_variable = next_token.string;
-            this.first = exception_variable;
-            if (!next_token.identifier) {
-                warn('expected_identifier_a', next_token);
-            } else {
-                add_label(next_token, 'exception');
-            }
-            advance();
-            no_space();
-            step_out(')', paren);
-            one_space();
-            this.second = block(false);
-            scope = old_scope;
-        }
-        if (next_token.id === 'finally') {
-            one_space();
-            advance('finally');
-            one_space();
-            this.third = block(false);
-        } else if (!this.second) {
-            stop('expected_a_b', next_token, 'catch', artifact());
-        }
-        return this;
-    });
-
-    labeled_stmt('while', function () {
-        one_space();
-        var paren = next_token;
-        funct['(breakage)'] += 1;
-        funct['(loopage)'] += 1;
-        advance('(');
-        step_in('control');
-        no_space();
-        edge();
-        this.arity = 'statement';
-        this.first = expected_relation(expression(0));
-        if (this.first.id !== 'true') {
-            expected_condition(this.first, bundle.unexpected_a);
-        }
-        no_space();
-        step_out(')', paren);
-        one_space();
-        this.block = block(true);
-        if (this.block.disrupt) {
-            warn('strange_loop', prev_token);
-        }
-        funct['(breakage)'] -= 1;
-        funct['(loopage)'] -= 1;
-        return this;
-    });
-
-    reserve('with');
-
-    labeled_stmt('switch', function () {
-
-// switch.first         the switch expression
-// switch.second        the array of cases. A case is 'case' or 'default' token:
-//    case.first        the array of case expressions
-//    case.second       the array of statements
-// If all of the arrays of statements are disrupt, then the switch is disrupt.
-
-        var cases = [],
-            old_in_block = in_block,
-            particular,
-            the_case = next_token,
-            unbroken = true;
-
-        function find_duplicate_case(value) {
-            if (are_similar(particular, value)) {
-                warn('duplicate_a', value);
-            }
-        }
-
-        funct['(breakage)'] += 1;
-        one_space();
-        advance('(');
-        no_space();
-        step_in();
-        this.arity = 'statement';
-        this.first = expected_condition(expected_relation(expression(0)));
-        no_space();
-        step_out(')', the_case);
-        one_space();
-        advance('{');
-        step_in();
-        in_block = true;
-        this.second = [];
-        while (next_token.id === 'case') {
-            the_case = next_token;
-            cases.forEach(find_duplicate_case);
-            the_case.first = [];
-            the_case.arity = 'case';
-            spaces();
-            edge('case');
-            advance('case');
-            for (;;) {
-                one_space();
-                particular = expression(0);
-                cases.forEach(find_duplicate_case);
-                cases.push(particular);
-                the_case.first.push(particular);
-                if (particular.id === 'NaN') {
-                    warn('unexpected_a', particular);
-                }
-                no_space_only();
-                advance(':');
-                if (next_token.id !== 'case') {
-                    break;
-                }
-                spaces();
-                edge('case');
-                advance('case');
-            }
-            spaces();
-            the_case.second = statements();
-            if (the_case.second && the_case.second.length > 0) {
-                particular = the_case.second[the_case.second.length - 1];
-                if (particular.disrupt) {
-                    if (particular.id === 'break') {
-                        unbroken = false;
-                    }
-                } else {
-                    warn('missing_a_after_b', next_token, 'break', 'case');
-                }
-            } else {
-                warn('empty_case');
-            }
-            this.second.push(the_case);
-        }
-        if (this.second.length === 0) {
-            warn('missing_a', next_token, 'case');
-        }
-        if (next_token.id === 'default') {
-            spaces();
-            the_case = next_token;
-            the_case.arity = 'case';
-            edge('case');
-            advance('default');
-            no_space_only();
-            advance(':');
-            spaces();
-            the_case.second = statements();
-            if (the_case.second && the_case.second.length > 0) {
-                particular = the_case.second[the_case.second.length - 1];
-                if (unbroken && particular.disrupt && particular.id !== 'break') {
-                    this.disrupt = true;
-                }
-            }
-            this.second.push(the_case);
-        }
-        funct['(breakage)'] -= 1;
-        spaces();
-        step_out('}', this);
-        in_block = old_in_block;
-        return this;
-    });
-
-    stmt('debugger', function () {
-        if (!option.debug) {
-            warn('unexpected_a', this);
-        }
-        this.arity = 'statement';
-        return this;
-    });
-
-    labeled_stmt('do', function () {
-        funct['(breakage)'] += 1;
-        funct['(loopage)'] += 1;
-        one_space();
-        this.arity = 'statement';
-        this.block = block(true);
-        if (this.block.disrupt) {
-            warn('strange_loop', prev_token);
-        }
-        one_space();
-        advance('while');
-        var paren = next_token;
-        one_space();
-        advance('(');
-        step_in();
-        no_space();
-        edge();
-        this.first = expected_condition(expected_relation(expression(0)), bundle.unexpected_a);
-        no_space();
-        step_out(')', paren);
-        funct['(breakage)'] -= 1;
-        funct['(loopage)'] -= 1;
-        return this;
-    });
-
-    labeled_stmt('for', function () {
-
-        var blok, filter, ok = false, paren = next_token, value;
-        this.arity = 'statement';
-        funct['(breakage)'] += 1;
-        funct['(loopage)'] += 1;
-        advance('(');
-        if (next_token.id === ';') {
-            no_space();
-            advance(';');
-            no_space();
-            advance(';');
-            no_space();
-            advance(')');
-            blok = block(true);
-        } else {
-            step_in('control');
-            spaces(this, paren);
-            no_space();
-            if (next_token.id === 'var') {
-                stop('move_var');
-            }
-            edge();
-            if (peek(0).id === 'in') {
-                this.forin = true;
-                value = next_token;
-                switch (funct[value.string]) {
-                case 'unused':
-                    funct[value.string] = 'var';
-                    break;
-                case 'closure':
-                case 'var':
-                    break;
-                default:
-                    warn('bad_in_a', value);
-                }
-                advance();
-                advance('in');
-                this.first = value;
-                this.second = expression(20);
-                step_out(')', paren);
-                blok = block(true);
-                if (!option.forin) {
-                    if (blok.length === 1 && typeof blok[0] === 'object' &&
-                            blok[0].string === 'if' && !blok[0]['else']) {
-                        filter = blok[0].first;
-                        while (filter.id === '&&') {
-                            filter = filter.first;
-                        }
-                        switch (filter.id) {
-                        case '===':
-                        case '!==':
-                            ok = filter.first.id === '['
-                                ? filter.first.first.string === this.second.string &&
-                                    filter.first.second.string === this.first.string
-                                : filter.first.id === 'typeof' &&
-                                    filter.first.first.id === '[' &&
-                                    filter.first.first.first.string === this.second.string &&
-                                    filter.first.first.second.string === this.first.string;
-                            break;
-                        case '(':
-                            ok = filter.first.id === '.' && ((
-                                filter.first.first.string === this.second.string &&
-                                filter.first.second.string === 'hasOwnProperty' &&
-                                filter.second[0].string === this.first.string
-                            ) || (
-                                filter.first.first.string === 'ADSAFE' &&
-                                filter.first.second.string === 'has' &&
-                                filter.second[0].string === this.second.string &&
-                                filter.second[1].string === this.first.string
-                            ) || (
-                                filter.first.first.id === '.' &&
-                                filter.first.first.first.id === '.' &&
-                                filter.first.first.first.first.string === 'Object' &&
-                                filter.first.first.first.second.string === 'prototype' &&
-                                filter.first.first.second.string === 'hasOwnProperty' &&
-                                filter.first.second.string === 'call' &&
-                                filter.second[0].string === this.second.string &&
-                                filter.second[1].string === this.first.string
-                            ));
-                            break;
-                        }
-                    }
-                    if (!ok) {
-                        warn('for_if', this);
-                    }
-                }
-            } else {
-                edge();
-                this.first = [];
-                for (;;) {
-                    this.first.push(expression(0, 'for'));
-                    if (next_token.id !== ',') {
-                        break;
-                    }
-                    comma();
-                }
-                semicolon();
-                edge();
-                this.second = expected_relation(expression(0));
-                if (this.second.id !== 'true') {
-                    expected_condition(this.second, bundle.unexpected_a);
-                }
-                semicolon(token);
-                if (next_token.id === ';') {
-                    stop('expected_a_b', next_token, ')', ';');
-                }
-                this.third = [];
-                edge();
-                for (;;) {
-                    this.third.push(expression(0, 'for'));
-                    if (next_token.id !== ',') {
-                        break;
-                    }
-                    comma();
-                }
-                no_space();
-                step_out(')', paren);
-                one_space();
-                blok = block(true);
-            }
-        }
-        if (blok.disrupt) {
-            warn('strange_loop', prev_token);
-        }
-        this.block = blok;
-        funct['(breakage)'] -= 1;
-        funct['(loopage)'] -= 1;
-        return this;
-    });
-
-    disrupt_stmt('break', function () {
-        var label = next_token.string;
-        this.arity = 'statement';
-        if (funct['(breakage)'] === 0) {
-            warn('unexpected_a', this);
-        }
-        if (next_token.identifier && token.line === next_token.line) {
-            one_space_only();
-            if (funct[label] !== 'label') {
-                warn('not_a_label', next_token);
-            } else if (scope[label].funct !== funct) {
-                warn('not_a_scope', next_token);
-            }
-            this.first = next_token;
-            advance();
-        }
-        return this;
-    });
-
-    disrupt_stmt('continue', function () {
-        if (!option['continue']) {
-            warn('unexpected_a', this);
-        }
-        var label = next_token.string;
-        this.arity = 'statement';
-        if (funct['(breakage)'] === 0) {
-            warn('unexpected_a', this);
-        }
-        if (next_token.identifier && token.line === next_token.line) {
-            one_space_only();
-            if (funct[label] !== 'label') {
-                warn('not_a_label', next_token);
-            } else if (scope[label].funct !== funct) {
-                warn('not_a_scope', next_token);
-            }
-            this.first = next_token;
-            advance();
-        }
-        return this;
-    });
-
-    disrupt_stmt('return', function () {
-        if (funct === global_funct && xmode !== 'scriptstring') {
-            warn('unexpected_a', this);
-        }
-        this.arity = 'statement';
-        if (next_token.id !== ';' && next_token.line === token.line) {
-            one_space_only();
-            if (next_token.id === '/' || next_token.id === '(regexp)') {
-                warn('wrap_regexp');
-            }
-            this.first = expression(20);
-        }
-        if (peek(0).id === '}' && peek(1).id === 'else') {
-            warn('unexpected_else', this);
-        }
-        return this;
-    });
-
-    disrupt_stmt('throw', function () {
-        this.arity = 'statement';
-        one_space_only();
-        this.first = expression(20);
-        return this;
-    });
-
-
-//  Superfluous reserved words
-
-    reserve('class');
-    reserve('const');
-    reserve('enum');
-    reserve('export');
-    reserve('extends');
-    reserve('import');
-    reserve('super');
-
-// Harmony reserved words
-
-    reserve('implements');
-    reserve('interface');
-    reserve('let');
-    reserve('package');
-    reserve('private');
-    reserve('protected');
-    reserve('public');
-    reserve('static');
-    reserve('yield');
-
-
-// Parse JSON
-
-    function json_value() {
-
-        function json_object() {
-            var brace = next_token, object = {};
-            advance('{');
-            if (next_token.id !== '}') {
-                while (next_token.id !== '(end)') {
-                    while (next_token.id === ',') {
-                        warn('unexpected_a', next_token);
-                        advance(',');
-                    }
-                    if (next_token.id !== '(string)') {
-                        warn('expected_string_a');
-                    }
-                    if (object[next_token.string] === true) {
-                        warn('duplicate_a');
-                    } else if (next_token.string === '__proto__') {
-                        warn('dangling_a');
-                    } else {
-                        object[next_token.string] = true;
-                    }
-                    advance();
-                    advance(':');
-                    json_value();
-                    if (next_token.id !== ',') {
-                        break;
-                    }
-                    advance(',');
-                    if (next_token.id === '}') {
-                        warn('unexpected_a', token);
-                        break;
-                    }
-                }
-            }
-            advance('}', brace);
-        }
-
-        function json_array() {
-            var bracket = next_token;
-            advance('[');
-            if (next_token.id !== ']') {
-                while (next_token.id !== '(end)') {
-                    while (next_token.id === ',') {
-                        warn('unexpected_a', next_token);
-                        advance(',');
-                    }
-                    json_value();
-                    if (next_token.id !== ',') {
-                        break;
-                    }
-                    advance(',');
-                    if (next_token.id === ']') {
-                        warn('unexpected_a', token);
-                        break;
-                    }
-                }
-            }
-            advance(']', bracket);
-        }
-
-        switch (next_token.id) {
-        case '{':
-            json_object();
-            break;
-        case '[':
-            json_array();
-            break;
-        case 'true':
-        case 'false':
-        case 'null':
-        case '(number)':
-        case '(string)':
-            advance();
-            break;
-        case '-':
-            advance('-');
-            no_space_only();
-            advance('(number)');
-            break;
-        default:
-            stop('unexpected_a');
-        }
-    }
-
-
-// CSS parsing.
-
-    function css_name() {
-        if (next_token.identifier) {
-            advance();
-            return true;
-        }
-    }
-
-
-    function css_number() {
-        if (next_token.id === '-') {
-            advance('-');
-            no_space_only();
-        }
-        if (next_token.id === '(number)') {
-            advance('(number)');
-            return true;
-        }
-    }
-
-
-    function css_string() {
-        if (next_token.id === '(string)') {
-            advance();
-            return true;
-        }
-    }
-
-    function css_color() {
-        var i, number, paren, value;
-        if (next_token.identifier) {
-            value = next_token.string;
-            if (value === 'rgb' || value === 'rgba') {
-                advance();
-                paren = next_token;
-                advance('(');
-                for (i = 0; i < 3; i += 1) {
-                    if (i) {
-                        comma();
-                    }
-                    number = next_token.number;
-                    if (next_token.id !== '(number)' || number < 0) {
-                        warn('expected_positive_a', next_token);
-                        advance();
-                    } else {
-                        advance();
-                        if (next_token.id === '%') {
-                            advance('%');
-                            if (number > 100) {
-                                warn('expected_percent_a', token, number);
-                            }
-                        } else {
-                            if (number > 255) {
-                                warn('expected_small_a', token, number);
-                            }
-                        }
-                    }
-                }
-                if (value === 'rgba') {
-                    comma();
-                    number = next_token.number;
-                    if (next_token.id !== '(number)' || number < 0 || number > 1) {
-                        warn('expected_fraction_a', next_token);
-                    }
-                    advance();
-                    if (next_token.id === '%') {
-                        warn('unexpected_a');
-                        advance('%');
-                    }
-                }
-                advance(')', paren);
-                return true;
-            }
-            if (css_colorData[next_token.string] === true) {
-                advance();
-                return true;
-            }
-        } else if (next_token.id === '(color)') {
-            advance();
-            return true;
-        }
-        return false;
-    }
-
-
-    function css_length() {
-        if (next_token.id === '-') {
-            advance('-');
-            no_space_only();
-        }
-        if (next_token.id === '(number)') {
-            advance();
-            if (next_token.id !== '(string)' &&
-                    css_lengthData[next_token.string] === true) {
-                no_space_only();
-                advance();
-            } else if (+token.number !== 0) {
-                warn('expected_linear_a');
-            }
-            return true;
-        }
-        return false;
-    }
-
-
-    function css_line_height() {
-        if (next_token.id === '-') {
-            advance('-');
-            no_space_only();
-        }
-        if (next_token.id === '(number)') {
-            advance();
-            if (next_token.id !== '(string)' &&
-                    css_lengthData[next_token.string] === true) {
-                no_space_only();
-                advance();
-            }
-            return true;
-        }
-        return false;
-    }
-
-
-    function css_width() {
-        if (next_token.identifier) {
-            switch (next_token.string) {
-            case 'thin':
-            case 'medium':
-            case 'thick':
-                advance();
-                return true;
-            }
-        } else {
-            return css_length();
-        }
-    }
-
-
-    function css_margin() {
-        if (next_token.identifier) {
-            if (next_token.string === 'auto') {
-                advance();
-                return true;
-            }
-        } else {
-            return css_length();
-        }
-    }
-
-    function css_attr() {
-        if (next_token.identifier && next_token.string === 'attr') {
-            advance();
-            advance('(');
-            if (!next_token.identifier) {
-                warn('expected_name_a');
-            }
-            advance();
-            advance(')');
-            return true;
-        }
-        return false;
-    }
-
-
-    function css_comma_list() {
-        while (next_token.id !== ';') {
-            if (!css_name() && !css_string()) {
-                warn('expected_name_a');
-            }
-            if (next_token.id !== ',') {
-                return true;
-            }
-            comma();
-        }
-    }
-
-
-    function css_counter() {
-        if (next_token.identifier && next_token.string === 'counter') {
-            advance();
-            advance('(');
-            advance();
-            if (next_token.id === ',') {
-                comma();
-                if (next_token.id !== '(string)') {
-                    warn('expected_string_a');
-                }
-                advance();
-            }
-            advance(')');
-            return true;
-        }
-        if (next_token.identifier && next_token.string === 'counters') {
-            advance();
-            advance('(');
-            if (!next_token.identifier) {
-                warn('expected_name_a');
-            }
-            advance();
-            if (next_token.id === ',') {
-                comma();
-                if (next_token.id !== '(string)') {
-                    warn('expected_string_a');
-                }
-                advance();
-            }
-            if (next_token.id === ',') {
-                comma();
-                if (next_token.id !== '(string)') {
-                    warn('expected_string_a');
-                }
-                advance();
-            }
-            advance(')');
-            return true;
-        }
-        return false;
-    }
-
-
-    function css_radius() {
-        return css_length() && (next_token.id !== '(number)' || css_length());
-    }
-
-
-    function css_shape() {
-        var i;
-        if (next_token.identifier && next_token.string === 'rect') {
-            advance();
-            advance('(');
-            for (i = 0; i < 4; i += 1) {
-                if (!css_length()) {
-                    warn('expected_number_a');
-                    break;
-                }
-            }
-            advance(')');
-            return true;
-        }
-        return false;
-    }
-
-
-    function css_url() {
-        var c, url;
-        if (next_token.identifier && next_token.string === 'url') {
-            next_token = lex.range('(', ')');
-            url = next_token.string;
-            c = url.charAt(0);
-            if (c === '"' || c === '\'') {
-                if (url.slice(-1) !== c) {
-                    warn('bad_url_a');
-                } else {
-                    url = url.slice(1, -1);
-                    if (url.indexOf(c) >= 0) {
-                        warn('bad_url_a');
-                    }
-                }
-            }
-            if (!url) {
-                warn('missing_url');
-            }
-            if (ux.test(url)) {
-                stop('bad_url_a');
-            }
-            urls.push(url);
-            advance();
-            return true;
-        }
-        return false;
-    }
-
-
-    css_any = [css_url, function () {
-        for (;;) {
-            if (next_token.identifier) {
-                switch (next_token.string.toLowerCase()) {
-                case 'url':
-                    css_url();
-                    break;
-                case 'expression':
-                    warn('unexpected_a');
-                    advance();
-                    break;
-                default:
-                    advance();
-                }
-            } else {
-                if (next_token.id === ';' || next_token.id === '!'  ||
-                        next_token.id === '(end)' || next_token.id === '}') {
-                    return true;
-                }
-                advance();
-            }
-        }
-    }];
-
-
-    function font_face() {
-        advance_identifier('font-family');
-        advance(':');
-        if (!css_name() && !css_string()) {
-            stop('expected_name_a');
-        }
-        semicolon();
-        advance_identifier('src');
-        advance(':');
-        while (true) {
-            if (next_token.string === 'local') {
-                advance_identifier('local');
-                advance('(');
-                if (ux.test(next_token.string)) {
-                    stop('bad_url_a');
-                }
-
-                if (!css_name() && !css_string()) {
-                    stop('expected_name_a');
-                }
-                advance(')');
-            } else if (!css_url()) {
-                stop('expected_a_b', next_token, 'url', artifact());
-            }
-            if (next_token.id !== ',') {
-                break;
-            }
-            comma();
-        }
-        semicolon();
-    }
-
-
-    css_border_style = [
-        'none', 'dashed', 'dotted', 'double', 'groove',
-        'hidden', 'inset', 'outset', 'ridge', 'solid'
-    ];
-
-    css_break = [
-        'auto', 'always', 'avoid', 'left', 'right'
-    ];
-
-    css_media = {
-        'all': true,
-        'braille': true,
-        'embossed': true,
-        'handheld': true,
-        'print': true,
-        'projection': true,
-        'screen': true,
-        'speech': true,
-        'tty': true,
-        'tv': true
-    };
-
-    css_overflow = [
-        'auto', 'hidden', 'scroll', 'visible'
-    ];
-
-    css_attribute_data = {
-        background: [
-            true, 'background-attachment', 'background-color',
-            'background-image', 'background-position', 'background-repeat'
-        ],
-        'background-attachment': ['scroll', 'fixed'],
-        'background-color': ['transparent', css_color],
-        'background-image': ['none', css_url],
-        'background-position': [
-            2, [css_length, 'top', 'bottom', 'left', 'right', 'center']
-        ],
-        'background-repeat': [
-            'repeat', 'repeat-x', 'repeat-y', 'no-repeat'
-        ],
-        'border': [true, 'border-color', 'border-style', 'border-width'],
-        'border-bottom': [
-            true, 'border-bottom-color', 'border-bottom-style',
-            'border-bottom-width'
-        ],
-        'border-bottom-color': css_color,
-        'border-bottom-left-radius': css_radius,
-        'border-bottom-right-radius': css_radius,
-        'border-bottom-style': css_border_style,
-        'border-bottom-width': css_width,
-        'border-collapse': ['collapse', 'separate'],
-        'border-color': ['transparent', 4, css_color],
-        'border-left': [
-            true, 'border-left-color', 'border-left-style', 'border-left-width'
-        ],
-        'border-left-color': css_color,
-        'border-left-style': css_border_style,
-        'border-left-width': css_width,
-        'border-radius': function () {
-            function count(separator) {
-                var n = 1;
-                if (separator) {
-                    advance(separator);
-                }
-                if (!css_length()) {
-                    return false;
-                }
-                while (next_token.id === '(number)') {
-                    if (!css_length()) {
-                        return false;
-                    }
-                    n += 1;
-                }
-                if (n > 4) {
-                    warn('bad_style');
-                }
-                return true;
-            }
-
-            return count() && (next_token.id !== '/' || count('/'));
-        },
-        'border-right': [
-            true, 'border-right-color', 'border-right-style',
-            'border-right-width'
-        ],
-        'border-right-color': css_color,
-        'border-right-style': css_border_style,
-        'border-right-width': css_width,
-        'border-spacing': [2, css_length],
-        'border-style': [4, css_border_style],
-        'border-top': [
-            true, 'border-top-color', 'border-top-style', 'border-top-width'
-        ],
-        'border-top-color': css_color,
-        'border-top-left-radius': css_radius,
-        'border-top-right-radius': css_radius,
-        'border-top-style': css_border_style,
-        'border-top-width': css_width,
-        'border-width': [4, css_width],
-        bottom: [css_length, 'auto'],
-        'caption-side' : ['bottom', 'left', 'right', 'top'],
-        clear: ['both', 'left', 'none', 'right'],
-        clip: [css_shape, 'auto'],
-        color: css_color,
-        content: [
-            'open-quote', 'close-quote', 'no-open-quote', 'no-close-quote',
-            css_string, css_url, css_counter, css_attr
-        ],
-        'counter-increment': [
-            css_name, 'none'
-        ],
-        'counter-reset': [
-            css_name, 'none'
-        ],
-        cursor: [
-            css_url, 'auto', 'crosshair', 'default', 'e-resize', 'help', 'move',
-            'n-resize', 'ne-resize', 'nw-resize', 'pointer', 's-resize',
-            'se-resize', 'sw-resize', 'w-resize', 'text', 'wait'
-        ],
-        direction: ['ltr', 'rtl'],
-        display: [
-            'block', 'compact', 'inline', 'inline-block', 'inline-table',
-            'list-item', 'marker', 'none', 'run-in', 'table', 'table-caption',
-            'table-cell', 'table-column', 'table-column-group',
-            'table-footer-group', 'table-header-group', 'table-row',
-            'table-row-group'
-        ],
-        'empty-cells': ['show', 'hide'],
-        'float': ['left', 'none', 'right'],
-        font: [
-            'caption', 'icon', 'menu', 'message-box', 'small-caption',
-            'status-bar', true, 'font-size', 'font-style', 'font-weight',
-            'font-family'
-        ],
-        'font-family': css_comma_list,
-        'font-size': [
-            'xx-small', 'x-small', 'small', 'medium', 'large', 'x-large',
-            'xx-large', 'larger', 'smaller', css_length
-        ],
-        'font-size-adjust': ['none', css_number],
-        'font-stretch': [
-            'normal', 'wider', 'narrower', 'ultra-condensed',
-            'extra-condensed', 'condensed', 'semi-condensed',
-            'semi-expanded', 'expanded', 'extra-expanded'
-        ],
-        'font-style': [
-            'normal', 'italic', 'oblique'
-        ],
-        'font-variant': [
-            'normal', 'small-caps'
-        ],
-        'font-weight': [
-            'normal', 'bold', 'bolder', 'lighter', css_number
-        ],
-        height: [css_length, 'auto'],
-        left: [css_length, 'auto'],
-        'letter-spacing': ['normal', css_length],
-        'line-height': ['normal', css_line_height],
-        'list-style': [
-            true, 'list-style-image', 'list-style-position', 'list-style-type'
-        ],
-        'list-style-image': ['none', css_url],
-        'list-style-position': ['inside', 'outside'],
-        'list-style-type': [
-            'circle', 'disc', 'square', 'decimal', 'decimal-leading-zero',
-            'lower-roman', 'upper-roman', 'lower-greek', 'lower-alpha',
-            'lower-latin', 'upper-alpha', 'upper-latin', 'hebrew', 'katakana',
-            'hiragana-iroha', 'katakana-oroha', 'none'
-        ],
-        margin: [4, css_margin],
-        'margin-bottom': css_margin,
-        'margin-left': css_margin,
-        'margin-right': css_margin,
-        'margin-top': css_margin,
-        'marker-offset': [css_length, 'auto'],
-        'max-height': [css_length, 'none'],
-        'max-width': [css_length, 'none'],
-        'min-height': css_length,
-        'min-width': css_length,
-        opacity: css_number,
-        outline: [true, 'outline-color', 'outline-style', 'outline-width'],
-        'outline-color': ['invert', css_color],
-        'outline-style': [
-            'dashed', 'dotted', 'double', 'groove', 'inset', 'none',
-            'outset', 'ridge', 'solid'
-        ],
-        'outline-width': css_width,
-        overflow: css_overflow,
-        'overflow-x': css_overflow,
-        'overflow-y': css_overflow,
-        padding: [4, css_length],
-        'padding-bottom': css_length,
-        'padding-left': css_length,
-        'padding-right': css_length,
-        'padding-top': css_length,
-        'page-break-after': css_break,
-        'page-break-before': css_break,
-        position: ['absolute', 'fixed', 'relative', 'static'],
-        quotes: [8, css_string],
-        right: [css_length, 'auto'],
-        'table-layout': ['auto', 'fixed'],
-        'text-align': ['center', 'justify', 'left', 'right'],
-        'text-decoration': [
-            'none', 'underline', 'overline', 'line-through', 'blink'
-        ],
-        'text-indent': css_length,
-        'text-shadow': ['none', 4, [css_color, css_length]],
-        'text-transform': ['capitalize', 'uppercase', 'lowercase', 'none'],
-        top: [css_length, 'auto'],
-        'unicode-bidi': ['normal', 'embed', 'bidi-override'],
-        'vertical-align': [
-            'baseline', 'bottom', 'sub', 'super', 'top', 'text-top', 'middle',
-            'text-bottom', css_length
-        ],
-        visibility: ['visible', 'hidden', 'collapse'],
-        'white-space': [
-            'normal', 'nowrap', 'pre', 'pre-line', 'pre-wrap', 'inherit'
-        ],
-        width: [css_length, 'auto'],
-        'word-spacing': ['normal', css_length],
-        'word-wrap': ['break-word', 'normal'],
-        'z-index': ['auto', css_number]
-    };
-
-    function style_attribute() {
-        var v;
-        while (next_token.id === '*' || next_token.id === '#' ||
-                next_token.string === '_') {
-            if (!option.css) {
-                warn('unexpected_a');
-            }
-            advance();
-        }
-        if (next_token.id === '-') {
-            if (!option.css) {
-                warn('unexpected_a');
-            }
-            advance('-');
-            if (!next_token.identifier) {
-                warn('expected_nonstandard_style_attribute');
-            }
-            advance();
-            return css_any;
-        }
-        if (!next_token.identifier) {
-            warn('expected_style_attribute');
-        } else {
-            if (Object.prototype.hasOwnProperty.call(css_attribute_data,
-                    next_token.string)) {
-                v = css_attribute_data[next_token.string];
-            } else {
-                v = css_any;
-                if (!option.css) {
-                    warn('unrecognized_style_attribute_a');
-                }
-            }
-        }
-        advance();
-        return v;
-    }
-
-
-    function style_value(v) {
-        var i = 0,
-            n,
-            once,
-            match,
-            round,
-            start = 0,
-            vi;
-        switch (typeof v) {
-        case 'function':
-            return v();
-        case 'string':
-            if (next_token.identifier && next_token.string === v) {
-                advance();
-                return true;
-            }
-            return false;
-        }
-        for (;;) {
-            if (i >= v.length) {
-                return false;
-            }
-            vi = v[i];
-            i += 1;
-            if (typeof vi === 'boolean') {
-                break;
-            } else if (typeof vi === 'number') {
-                n = vi;
-                vi = v[i];
-                i += 1;
-            } else {
-                n = 1;
-            }
-            match = false;
-            while (n > 0) {
-                if (style_value(vi)) {
-                    match = true;
-                    n -= 1;
-                } else {
-                    break;
-                }
-            }
-            if (match) {
-                return true;
-            }
-        }
-        start = i;
-        once = [];
-        for (;;) {
-            round = false;
-            for (i = start; i < v.length; i += 1) {
-                if (!once[i]) {
-                    if (style_value(css_attribute_data[v[i]])) {
-                        match = true;
-                        round = true;
-                        once[i] = true;
-                        break;
-                    }
-                }
-            }
-            if (!round) {
-                return match;
-            }
-        }
-    }
-
-    function style_child() {
-        if (next_token.id === '(number)') {
-            advance();
-            if (next_token.string === 'n' && next_token.identifier) {
-                no_space_only();
-                advance();
-                if (next_token.id === '+') {
-                    no_space_only();
-                    advance('+');
-                    no_space_only();
-                    advance('(number)');
-                }
-            }
-            return;
-        }
-        if (next_token.identifier &&
-                (next_token.string === 'odd' || next_token.string === 'even')) {
-            advance();
-            return;
-        }
-        warn('unexpected_a');
-    }
-
-    function substyle() {
-        var v;
-        for (;;) {
-            if (next_token.id === '}' || next_token.id === '(end)' ||
-                    (xquote && next_token.id === xquote)) {
-                return;
-            }
-            v = style_attribute();
-            advance(':');
-            if (next_token.identifier && next_token.string === 'inherit') {
-                advance();
-            } else {
-                if (!style_value(v)) {
-                    warn('unexpected_a');
-                    advance();
-                }
-            }
-            if (next_token.id === '!') {
-                advance('!');
-                no_space_only();
-                if (next_token.identifier && next_token.string === 'important') {
-                    advance();
-                } else {
-                    warn('expected_a_b',
-                        next_token, 'important', artifact());
-                }
-            }
-            if (next_token.id === '}' || next_token.id === xquote) {
-                warn('expected_a_b', next_token, ';', artifact());
-            } else {
-                semicolon();
-            }
-        }
-    }
-
-    function style_selector() {
-        if (next_token.identifier) {
-            if (!Object.prototype.hasOwnProperty.call(html_tag, option.cap
-                    ? next_token.string.toLowerCase()
-                    : next_token.string)) {
-                warn('expected_tagname_a');
-            }
-            advance();
-        } else {
-            switch (next_token.id) {
-            case '>':
-            case '+':
-                advance();
-                style_selector();
-                break;
-            case ':':
-                advance(':');
-                switch (next_token.string) {
-                case 'active':
-                case 'after':
-                case 'before':
-                case 'checked':
-                case 'disabled':
-                case 'empty':
-                case 'enabled':
-                case 'first-child':
-                case 'first-letter':
-                case 'first-line':
-                case 'first-of-type':
-                case 'focus':
-                case 'hover':
-                case 'last-child':
-                case 'last-of-type':
-                case 'link':
-                case 'only-of-type':
-                case 'root':
-                case 'target':
-                case 'visited':
-                    advance_identifier(next_token.string);
-                    break;
-                case 'lang':
-                    advance_identifier('lang');
-                    advance('(');
-                    if (!next_token.identifier) {
-                        warn('expected_lang_a');
-                    }
-                    advance(')');
-                    break;
-                case 'nth-child':
-                case 'nth-last-child':
-                case 'nth-last-of-type':
-                case 'nth-of-type':
-                    advance_identifier(next_token.string);
-                    advance('(');
-                    style_child();
-                    advance(')');
-                    break;
-                case 'not':
-                    advance_identifier('not');
-                    advance('(');
-                    if (next_token.id === ':' && peek(0).string === 'not') {
-                        warn('not');
-                    }
-                    style_selector();
-                    advance(')');
-                    break;
-                default:
-                    warn('expected_pseudo_a');
-                }
-                break;
-            case '#':
-                advance('#');
-                if (!next_token.identifier) {
-                    warn('expected_id_a');
-                }
-                advance();
-                break;
-            case '*':
-                advance('*');
-                break;
-            case '.':
-                advance('.');
-                if (!next_token.identifier) {
-                    warn('expected_class_a');
-                }
-                advance();
-                break;
-            case '[':
-                advance('[');
-                if (!next_token.identifier) {
-                    warn('expected_attribute_a');
-                }
-                advance();
-                if (next_token.id === '=' || next_token.string === '~=' ||
-                        next_token.string === '$=' ||
-                        next_token.string === '|=' ||
-                        next_token.id === '*=' ||
-                        next_token.id === '^=') {
-                    advance();
-                    if (next_token.id !== '(string)') {
-                        warn('expected_string_a');
-                    }
-                    advance();
-                }
-                advance(']');
-                break;
-            default:
-                stop('expected_selector_a');
-            }
-        }
-    }
-
-    function style_pattern() {
-        if (next_token.id === '{') {
-            warn('expected_style_pattern');
-        }
-        for (;;) {
-            style_selector();
-            if (next_token.id === '</' || next_token.id === '{' ||
-                    next_token.id === '}' || next_token.id === '(end)') {
-                return '';
-            }
-            if (next_token.id === ',') {
-                comma();
-            }
-        }
-    }
-
-    function style_list() {
-        while (next_token.id !== '}' && next_token.id !== '</' &&
-                next_token.id !== '(end)') {
-            style_pattern();
-            xmode = 'styleproperty';
-            if (next_token.id === ';') {
-                semicolon();
-            } else {
-                advance('{');
-                substyle();
-                xmode = 'style';
-                advance('}');
-            }
-        }
-    }
-
-    function styles() {
-        var i;
-        while (next_token.id === '@') {
-            i = peek();
-            advance('@');
-            switch (next_token.string) {
-            case 'import':
-                advance_identifier('import');
-                if (!css_url()) {
-                    warn('expected_a_b',
-                        next_token, 'url', artifact());
-                    advance();
-                }
-                semicolon();
-                break;
-            case 'media':
-                advance_identifier('media');
-                for (;;) {
-                    if (!next_token.identifier || css_media[next_token.string] !== true) {
-                        stop('expected_media_a');
-                    }
-                    advance();
-                    if (next_token.id !== ',') {
-                        break;
-                    }
-                    comma();
-                }
-                advance('{');
-                style_list();
-                advance('}');
-                break;
-            case 'font-face':
-                advance_identifier('font-face');
-                advance('{');
-                font_face();
-                advance('}');
-                break;
-            default:
-                stop('expected_at_a');
-            }
-        }
-        style_list();
-    }
-
-
-// Parse HTML
-
-    function do_begin(n) {
-        if (n !== 'html' && !option.fragment) {
-            if (n === 'div' && option.adsafe) {
-                stop('adsafe_fragment');
-            } else {
-                stop('expected_a_b', token, 'html', n);
-            }
-        }
-        if (option.adsafe) {
-            if (n === 'html') {
-                stop('adsafe_html', token);
-            }
-            if (option.fragment) {
-                if (n !== 'div') {
-                    stop('adsafe_div', token);
-                }
-            } else {
-                stop('adsafe_fragment', token);
-            }
-        }
-        option.browser = true;
-    }
-
-    function do_attribute(a, v) {
-        var u, x;
-        if (a === 'id') {
-            u = typeof v === 'string' ? v.toUpperCase() : '';
-            if (ids[u] === true) {
-                warn('duplicate_a', next_token, v);
-            }
-            if (!/^[A-Za-z][A-Za-z0-9._:\-]*$/.test(v)) {
-                warn('bad_id_a', next_token, v);
-            } else if (option.adsafe) {
-                if (adsafe_id) {
-                    if (v.slice(0, adsafe_id.length) !== adsafe_id) {
-                        warn('adsafe_prefix_a', next_token, adsafe_id);
-                    } else if (!/^[A-Z]+_[A-Z]+$/.test(v)) {
-                        warn('adsafe_bad_id');
-                    }
-                } else {
-                    adsafe_id = v;
-                    if (!/^[A-Z]+_$/.test(v)) {
-                        warn('adsafe_bad_id');
-                    }
-                }
-            }
-            x = v.search(dx);
-            if (x >= 0) {
-                warn('unexpected_char_a_b', token, v.charAt(x), a);
-            }
-            ids[u] = true;
-        } else if (a === 'class' || a === 'type' || a === 'name') {
-            x = v.search(qx);
-            if (x >= 0) {
-                warn('unexpected_char_a_b', token, v.charAt(x), a);
-            }
-            ids[u] = true;
-        } else if (a === 'href' || a === 'background' ||
-                a === 'content' || a === 'data' ||
-                a.indexOf('src') >= 0 || a.indexOf('url') >= 0) {
-            if (option.safe && ux.test(v)) {
-                stop('bad_url_a', next_token, v);
-            }
-            urls.push(v);
-        } else if (a === 'for') {
-            if (option.adsafe) {
-                if (adsafe_id) {
-                    if (v.slice(0, adsafe_id.length) !== adsafe_id) {
-                        warn('adsafe_prefix_a', next_token, adsafe_id);
-                    } else if (!/^[A-Z]+_[A-Z]+$/.test(v)) {
-                        warn('adsafe_bad_id');
-                    }
-                } else {
-                    warn('adsafe_bad_id');
-                }
-            }
-        } else if (a === 'name') {
-            if (option.adsafe && v.indexOf('_') >= 0) {
-                warn('adsafe_name_a', next_token, v);
-            }
-        }
-    }
-
-    function do_tag(name, attribute) {
-        var i, tag = html_tag[name], script, x;
-        src = false;
-        if (!tag) {
-            stop(
-                bundle.unrecognized_tag_a,
-                next_token,
-                name === name.toLowerCase()
-                    ? name
-                    : name + ' (capitalization error)'
-            );
-        }
-        if (stack.length > 0) {
-            if (name === 'html') {
-                stop('unexpected_a', token, name);
-            }
-            x = tag.parent;
-            if (x) {
-                if (x.indexOf(' ' + stack[stack.length - 1].name + ' ') < 0) {
-                    stop('tag_a_in_b', token, name, x);
-                }
-            } else if (!option.adsafe && !option.fragment) {
-                i = stack.length;
-                do {
-                    if (i <= 0) {
-                        stop('tag_a_in_b', token, name, 'body');
-                    }
-                    i -= 1;
-                } while (stack[i].name !== 'body');
-            }
-        }
-        switch (name) {
-        case 'div':
-            if (option.adsafe && stack.length === 1 && !adsafe_id) {
-                warn('adsafe_missing_id');
-            }
-            break;
-        case 'script':
-            xmode = 'script';
-            advance('>');
-            if (attribute.lang) {
-                warn('lang', token);
-            }
-            if (option.adsafe && stack.length !== 1) {
-                warn('adsafe_placement', token);
-            }
-            if (attribute.src) {
-                if (option.adsafe && (!adsafe_may || !approved[attribute.src])) {
-                    warn('adsafe_source', token);
-                }
-            } else {
-                step_in(next_token.from);
-                edge();
-                use_strict();
-                adsafe_top = true;
-                script = statements();
-
-// JSLint is also the static analyzer for ADsafe. See www.ADsafe.org.
-
-                if (option.adsafe) {
-                    if (adsafe_went) {
-                        stop('adsafe_script', token);
-                    }
-                    if (script.length !== 1 ||
-                            aint(script[0],             'id',     '(') ||
-                            aint(script[0].first,       'id',     '.') ||
-                            aint(script[0].first.first, 'string', 'ADSAFE') ||
-                            aint(script[0].second[0],   'string', adsafe_id)) {
-                        stop('adsafe_id_go');
-                    }
-                    switch (script[0].first.second.string) {
-                    case 'id':
-                        if (adsafe_may || adsafe_went ||
-                                script[0].second.length !== 1) {
-                            stop('adsafe_id', next_token);
-                        }
-                        adsafe_may = true;
-                        break;
-                    case 'go':
-                        if (adsafe_went) {
-                            stop('adsafe_go');
-                        }
-                        if (script[0].second.length !== 2 ||
-                                aint(script[0].second[1], 'id', 'function') ||
-                                !script[0].second[1].first ||
-                                aint(script[0].second[1].first[0], 'string', 'dom') ||
-                                script[0].second[1].first.length > 2 ||
-                                (script[0].second[1].first.length === 2 &&
-                                aint(script[0].second[1].first[1], 'string', 'lib'))) {
-                            stop('adsafe_go', next_token);
-                        }
-                        adsafe_went = true;
-                        break;
-                    default:
-                        stop('adsafe_id_go');
-                    }
-                }
-                indent = null;
-            }
-            xmode = 'html';
-            advance('</');
-            advance_identifier('script');
-            xmode = 'outer';
-            break;
-        case 'style':
-            xmode = 'style';
-            advance('>');
-            styles();
-            xmode = 'html';
-            advance('</');
-            advance_identifier('style');
-            break;
-        case 'input':
-            switch (attribute.type) {
-            case 'button':
-            case 'checkbox':
-            case 'radio':
-            case 'reset':
-            case 'submit':
-                break;
-            case 'file':
-            case 'hidden':
-            case 'image':
-            case 'password':
-            case 'text':
-                if (option.adsafe && attribute.autocomplete !== 'off') {
-                    warn('adsafe_autocomplete');
-                }
-                break;
-            default:
-                warn('bad_type');
-            }
-            break;
-        case 'applet':
-        case 'body':
-        case 'embed':
-        case 'frame':
-        case 'frameset':
-        case 'head':
-        case 'iframe':
-        case 'noembed':
-        case 'noframes':
-        case 'object':
-        case 'param':
-            if (option.adsafe) {
-                warn('adsafe_tag', next_token, name);
-            }
-            break;
-        }
-    }
-
-
-    function closetag(name) {
-        return '</' + name + '>';
-    }
-
-    function html() {
-        var attribute, attributes, is_empty, name, old_white = option.white,
-            quote, tag_name, tag, wmode;
-        xmode = 'html';
-        xquote = '';
-        stack = null;
-        for (;;) {
-            switch (next_token.string) {
-            case '<':
-                xmode = 'html';
-                advance('<');
-                attributes = {};
-                tag_name = next_token;
-                name = tag_name.string;
-                advance_identifier(name);
-                if (option.cap) {
-                    name = name.toLowerCase();
-                }
-                tag_name.name = name;
-                if (!stack) {
-                    stack = [];
-                    do_begin(name);
-                }
-                tag = html_tag[name];
-                if (typeof tag !== 'object') {
-                    stop('unrecognized_tag_a', tag_name, name);
-                }
-                is_empty = tag.empty;
-                tag_name.type = name;
-                for (;;) {
-                    if (next_token.id === '/') {
-                        advance('/');
-                        if (next_token.id !== '>') {
-                            warn('expected_a_b', next_token, '>', artifact());
-                        }
-                        break;
-                    }
-                    if (next_token.id && next_token.id.charAt(0) === '>') {
-                        break;
-                    }
-                    if (!next_token.identifier) {
-                        if (next_token.id === '(end)' || next_token.id === '(error)') {
-                            warn('expected_a_b', next_token, '>', artifact());
-                        }
-                        warn('bad_name_a');
-                    }
-                    option.white = false;
-                    spaces();
-                    attribute = next_token.string;
-                    option.white = old_white;
-                    advance();
-                    if (!option.cap && attribute !== attribute.toLowerCase()) {
-                        warn('attribute_case_a', token);
-                    }
-                    attribute = attribute.toLowerCase();
-                    xquote = '';
-                    if (Object.prototype.hasOwnProperty.call(attributes, attribute)) {
-                        warn('duplicate_a', token, attribute);
-                    }
-                    if (attribute.slice(0, 2) === 'on') {
-                        if (!option.on) {
-                            warn('html_handlers');
-                        }
-                        xmode = 'scriptstring';
-                        advance('=');
-                        quote = next_token.id;
-                        if (quote !== '"' && quote !== '\'') {
-                            stop('expected_a_b', next_token, '"', artifact());
-                        }
-                        xquote = quote;
-                        wmode = option.white;
-                        option.white = true;
-                        advance(quote);
-                        use_strict();
-                        statements();
-                        option.white = wmode;
-                        if (next_token.id !== quote) {
-                            stop('expected_a_b', next_token, quote, artifact());
-                        }
-                        xmode = 'html';
-                        xquote = '';
-                        advance(quote);
-                        tag = false;
-                    } else if (attribute === 'style') {
-                        xmode = 'scriptstring';
-                        advance('=');
-                        quote = next_token.id;
-                        if (quote !== '"' && quote !== '\'') {
-                            stop('expected_a_b', next_token, '"', artifact());
-                        }
-                        xmode = 'styleproperty';
-                        xquote = quote;
-                        advance(quote);
-                        substyle();
-                        xmode = 'html';
-                        xquote = '';
-                        advance(quote);
-                        tag = false;
-                    } else {
-                        if (next_token.id === '=') {
-                            advance('=');
-                            tag = next_token.string;
-                            if (!next_token.identifier &&
-                                    next_token.id !== '"' &&
-                                    next_token.id !== '\'' &&
-                                    next_token.id !== '(string)' &&
-                                    next_token.id !== '(string)' &&
-                                    next_token.id !== '(color)') {
-                                warn('expected_attribute_value_a', token, attribute);
-                            }
-                            advance();
-                        } else {
-                            tag = true;
-                        }
-                    }
-                    attributes[attribute] = tag;
-                    do_attribute(attribute, tag);
-                }
-                do_tag(name, attributes);
-                if (!is_empty) {
-                    stack.push(tag_name);
-                }
-                xmode = 'outer';
-                advance('>');
-                break;
-            case '</':
-                xmode = 'html';
-                advance('</');
-                if (!next_token.identifier) {
-                    warn('bad_name_a');
-                }
-                name = next_token.string;
-                if (option.cap) {
-                    name = name.toLowerCase();
-                }
-                advance();
-                if (!stack) {
-                    stop('unexpected_a', next_token, closetag(name));
-                }
-                tag_name = stack.pop();
-                if (!tag_name) {
-                    stop('unexpected_a', next_token, closetag(name));
-                }
-                if (tag_name.name !== name) {
-                    stop('expected_a_b',
-                        next_token, closetag(tag_name.name), closetag(name));
-                }
-                if (next_token.id !== '>') {
-                    stop('expected_a_b', next_token, '>', artifact());
-                }
-                xmode = 'outer';
-                advance('>');
-                break;
-            case '<!':
-                if (option.safe) {
-                    warn('adsafe_a');
-                }
-                xmode = 'html';
-                for (;;) {
-                    advance();
-                    if (next_token.id === '>' || next_token.id === '(end)') {
-                        break;
-                    }
-                    if (next_token.string.indexOf('--') >= 0) {
-                        stop('unexpected_a', next_token, '--');
-                    }
-                    if (next_token.string.indexOf('<') >= 0) {
-                        stop('unexpected_a', next_token, '<');
-                    }
-                    if (next_token.string.indexOf('>') >= 0) {
-                        stop('unexpected_a', next_token, '>');
-                    }
-                }
-                xmode = 'outer';
-                advance('>');
-                break;
-            case '(end)':
-                if (stack.length !== 0) {
-                    warn('missing_a', next_token, '</' + stack.pop().string + '>');
-                }
-                return;
-            default:
-                if (next_token.id === '(end)') {
-                    stop('missing_a', next_token,
-                        '</' + stack[stack.length - 1].string + '>');
-                } else {
-                    advance();
-                }
-            }
-            if (stack && stack.length === 0 && (option.adsafe ||
-                    !option.fragment || next_token.id === '(end)')) {
-                break;
-            }
-        }
-        if (next_token.id !== '(end)') {
-            stop('unexpected_a');
-        }
-    }
-
-
-// The actual JSLINT function itself.
-
-    itself = function JSLint(the_source, the_option) {
-
-        var i, predef, tree;
-        JSLINT.errors = [];
-        JSLINT.tree = '';
-        begin = prev_token = token = next_token =
-            Object.create(syntax['(begin)']);
-        predefined = {};
-        add_to_predefined(standard);
-        property = {};
-        if (the_option) {
-            option = Object.create(the_option);
-            predef = option.predef;
-            if (predef) {
-                if (Array.isArray(predef)) {
-                    for (i = 0; i < predef.length; i += 1) {
-                        predefined[predef[i]] = true;
-                    }
-                } else if (typeof predef === 'object') {
-                    add_to_predefined(predef);
-                }
-            }
-            do_safe();
-        } else {
-            option = {};
-        }
-        option.indent = +option.indent || 4;
-        option.maxerr = +option.maxerr || 50;
-        adsafe_id = '';
-        adsafe_may = adsafe_top = adsafe_went = false;
-        approved = {};
-        if (option.approved) {
-            for (i = 0; i < option.approved.length; i += 1) {
-                approved[option.approved[i]] = option.approved[i];
-            }
-        } else {
-            approved.test = 'test';
-        }
-        tab = '';
-        for (i = 0; i < option.indent; i += 1) {
-            tab += ' ';
-        }
-        global_scope = scope = {};
-        global_funct = funct = {
-            '(scope)': scope,
-            '(breakage)': 0,
-            '(loopage)': 0
-        };
-        functions = [funct];
-
-        comments_off = false;
-        ids = {};
-        in_block = false;
-        indent = null;
-        json_mode = false;
-        lookahead = [];
-        node_js = false;
-        prereg = true;
-        src = false;
-        stack = null;
-        strict_mode = false;
-        urls = [];
-        var_mode = null;
-        warnings = 0;
-        xmode = '';
-        lex.init(the_source);
-
-        assume();
-
-        try {
-            advance();
-            if (next_token.id === '(number)') {
-                stop('unexpected_a');
-            } else if (next_token.string.charAt(0) === '<') {
-                html();
-                if (option.adsafe && !adsafe_went) {
-                    warn('adsafe_go', this);
-                }
-            } else {
-                switch (next_token.id) {
-                case '{':
-                case '[':
-                    json_mode = true;
-                    json_value();
-                    break;
-                case '@':
-                case '*':
-                case '#':
-                case '.':
-                case ':':
-                    xmode = 'style';
-                    advance();
-                    if (token.id !== '@' || !next_token.identifier ||
-                            next_token.string !== 'charset' || token.line !== 1 ||
-                            token.from !== 1) {
-                        stop('css');
-                    }
-                    advance();
-                    if (next_token.id !== '(string)' &&
-                            next_token.string !== 'UTF-8') {
-                        stop('css');
-                    }
-                    advance();
-                    semicolon();
-                    styles();
-                    break;
-
-                default:
-                    if (option.adsafe && option.fragment) {
-                        stop('expected_a_b',
-                            next_token, '<div>', artifact());
-                    }
-
-// If the first token is a semicolon, ignore it. This is sometimes used when
-// files are intended to be appended to files that may be sloppy. A sloppy
-// file may be depending on semicolon insertion on its last line.
-
-                    step_in(1);
-                    if (next_token.id === ';' && !node_js) {
-                        semicolon();
-                    }
-                    adsafe_top = true;
-                    tree = statements();
-                    begin.first = tree;
-                    JSLINT.tree = begin;
-                    // infer_types(tree);
-                    if (option.adsafe && (tree.length !== 1 ||
-                            aint(tree[0], 'id', '(') ||
-                            aint(tree[0].first, 'id', '.') ||
-                            aint(tree[0].first.first, 'string', 'ADSAFE') ||
-                            aint(tree[0].first.second, 'string', 'lib') ||
-                            tree[0].second.length !== 2 ||
-                            tree[0].second[0].id !== '(string)' ||
-                            aint(tree[0].second[1], 'id', 'function'))) {
-                        stop('adsafe_lib');
-                    }
-                    if (tree.disrupt) {
-                        warn('weird_program', prev_token);
-                    }
-                }
-            }
-            indent = null;
-            advance('(end)');
-        } catch (e) {
-            if (e) {        // ~~
-                JSLINT.errors.push({
-                    reason    : e.message,
-                    line      : e.line || next_token.line,
-                    character : e.character || next_token.from
-                }, null);
-            }
-        }
-        return JSLINT.errors.length === 0;
-    };
-
-
-// Data summary.
-
-    itself.data = function () {
-        var data = {functions: []},
-            function_data,
-            globals,
-            i,
-            j,
-            kind,
-            members = [],
-            name,
-            the_function,
-            undef = [],
-            unused = [];
-        if (itself.errors.length) {
-            data.errors = itself.errors;
-        }
-
-        if (json_mode) {
-            data.json = true;
-        }
-
-        if (urls.length > 0) {
-            data.urls = urls;
-        }
-
-        globals = Object.keys(global_scope).filter(function (value) {
-            return value.charAt(0) !== '(' && typeof standard[value] !== 'boolean';
-        });
-        if (globals.length > 0) {
-            data.globals = globals;
-        }
-
-        for (i = 1; i < functions.length; i += 1) {
-            the_function = functions[i];
-            function_data = {};
-            for (j = 0; j < functionicity.length; j += 1) {
-                function_data[functionicity[j]] = [];
-            }
-            for (name in the_function) {
-                if (Object.prototype.hasOwnProperty.call(the_function, name)) {
-                    if (name.charAt(0) !== '(') {
-                        kind = the_function[name];
-                        if (kind === 'unction' || kind === 'unparam') {
-                            kind = 'unused';
-                        }
-                        if (Array.isArray(function_data[kind])) {
-                            function_data[kind].push(name);
-                            if (kind === 'unused') {
-                                unused.push({
-                                    name: name,
-                                    line: the_function['(line)'],
-                                    'function': the_function['(name)']
-                                });
-                            } else if (kind === 'undef') {
-                                undef.push({
-                                    name: name,
-                                    line: the_function['(line)'],
-                                    'function': the_function['(name)']
-                                });
-                            }
-                        }
-                    }
-                }
-            }
-            for (j = 0; j < functionicity.length; j += 1) {
-                if (function_data[functionicity[j]].length === 0) {
-                    delete function_data[functionicity[j]];
-                }
-            }
-            function_data.name = the_function['(name)'];
-            function_data.params = the_function['(params)'];
-            function_data.line = the_function['(line)'];
-            data.functions.push(function_data);
-        }
-
-        if (unused.length > 0) {
-            data.unused = unused;
-        }
-        if (undef.length > 0) {
-            data['undefined'] = undef;
-        }
-
-        members = [];
-        for (name in property) {
-            if (typeof property[name] === 'number') {
-                data.member = property;
-                break;
-            }
-        }
-
-        return data;
-    };
-
-
-    itself.report = function (errors_only) {
-        var data = itself.data(), err, evidence, i, italics, j, key, keys,
-            length, mem = '', name, names, not_first, output = [], snippets,
-            the_function, warning;
-
-        function detail(h, value) {
-            var comma_needed, singularity;
-            if (Array.isArray(value)) {
-                output.push('<div><i>' + h + '</i> ');
-                value.sort().forEach(function (item) {
-                    if (item !== singularity) {
-                        singularity = item;
-                        output.push((comma_needed ? ', ' : '') + singularity);
-                        comma_needed = true;
-                    }
-                });
-                output.push('</div>');
-            } else if (value) {
-                output.push('<div><i>' + h + '</i> ' + value + '</div>');
-            }
-        }
-
-        if (data.errors || data.unused || data['undefined']) {
-            err = true;
-            output.push('<div id=errors><i>Error:</i>');
-            if (data.errors) {
-                for (i = 0; i < data.errors.length; i += 1) {
-                    warning = data.errors[i];
-                    if (warning) {
-                        evidence = warning.evidence || '';
-                        output.push('<p>Problem' + (isFinite(warning.line)
-                            ? ' at line ' + String(warning.line) +
-                                ' character ' + String(warning.character)
-                            : '') +
-                            ': ' + warning.reason.entityify() +
-                            '</p><p class=evidence>' +
-                            (evidence && (evidence.length > 80
-                                ? evidence.slice(0, 77) + '...'
-                                : evidence).entityify()) + '</p>');
-                    }
-                }
-            }
-
-            if (data['undefined']) {
-                snippets = [];
-                for (i = 0; i < data['undefined'].length; i += 1) {
-                    snippets[i] = '<code><u>' + data['undefined'][i].name + '</u></code>&nbsp;<i>' +
-                        String(data['undefined'][i].line) + ' </i> <small>' +
-                        data['undefined'][i]['function'] + '</small>';
-                }
-                output.push('<p><i>Undefined variable:</i> ' + snippets.join(', ') + '</p>');
-            }
-            if (data.unused) {
-                snippets = [];
-                for (i = 0; i < data.unused.length; i += 1) {
-                    snippets[i] = '<code><u>' + data.unused[i].name + '</u></code>&nbsp;<i>' +
-                        String(data.unused[i].line) + ' </i> <small>' +
-                        data.unused[i]['function'] + '</small>';
-                }
-                output.push('<p><i>Unused variable:</i> ' + snippets.join(', ') + '</p>');
-            }
-            if (data.json) {
-                output.push('<p>JSON: bad.</p>');
-            }
-            output.push('</div>');
-        }
-
-        if (!errors_only) {
-
-            output.push('<br><div id=functions>');
-
-            if (data.urls) {
-                detail("URLs<br>", data.urls, '<br>');
-            }
-
-            if (xmode === 'style') {
-                output.push('<p>CSS.</p>');
-            } else if (data.json && !err) {
-                output.push('<p>JSON: good.</p>');
-            } else if (data.globals) {
-                output.push('<div><i>Global</i> ' +
-                    data.globals.sort().join(', ') + '</div>');
-            } else {
-                output.push('<div><i>No new global variables introduced.</i></div>');
-            }
-
-            for (i = 0; i < data.functions.length; i += 1) {
-                the_function = data.functions[i];
-                names = [];
-                if (the_function.params) {
-                    for (j = 0; j < the_function.params.length; j += 1) {
-                        names[j] = the_function.params[j].string;
-                    }
-                }
-                output.push('<br><div class=function><i>' +
-                    String(the_function.line) + '</i> ' +
-                    the_function.name.entityify() +
-                    '(' + names.join(', ') + ')</div>');
-                detail('<big><b>Undefined</b></big>', the_function['undefined']);
-                detail('<big><b>Unused</b></big>', the_function.unused);
-                detail('Closure', the_function.closure);
-                detail('Variable', the_function['var']);
-                detail('Exception', the_function.exception);
-                detail('Outer', the_function.outer);
-                detail('Global', the_function.global);
-                detail('Label', the_function.label);
-            }
-
-            if (data.member) {
-                keys = Object.keys(data.member);
-                if (keys.length) {
-                    keys = keys.sort();
-                    output.push('<br><pre id=properties>/*properties<br>');
-                    mem = '    ';
-                    italics = 0;
-                    j = 0;
-                    not_first = false;
-                    for (i = 0; i < keys.length; i += 1) {
-                        key = keys[i];
-                        if (data.member[key] > 0) {
-                            if (not_first) {
-                                mem += ', ';
-                            }
-                            name = ix.test(key)
-                                ? key
-                                : '\'' + key.entityify().replace(nx, sanitize) + '\'';
-                            length += name.length + 2;
-                            if (data.member[key] === 1) {
-                                name = '<i>' + name + '</i>';
-                                italics += 1;
-                                j = 1;
-                            }
-                            if (mem.length + name.length - (italics * 7) > 80) {
-                                output.push(mem + '<br>');
-                                mem = '    ';
-                                italics = j;
-                            }
-                            mem += name;
-                            j = 0;
-                            not_first = true;
-                        }
-                    }
-                    output.push(mem + '<br>*/</pre>');
-                }
-                output.push('</div>');
-            }
-        }
-        return output.join('');
-    };
-    itself.jslint = itself;
-
-    itself.edition = '2012-04-15';
-
-    return itself;
-}());
-core.JSLint = function JSLint() {
-  this.JSLINT = JSLINT;
-};
-
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/core/PointWalker.js b/apps/files_odfviewer/src/webodf/webodf/lib/core/PointWalker.js
deleted file mode 100644
index f3f0008f78..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/lib/core/PointWalker.js
+++ /dev/null
@@ -1,197 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global core: true, Node: true*/
-/**
- * A simple walker that allows finegrained stepping through the DOM.
- * It does not support node filtering.
- * TODO: write a position walker that uses a treewalker
- * @constructor
- * @param {!Node} node
- */
-core.PointWalker = function PointWalker(node) {
-    "use strict";
-    var currentNode = node,
-        before = null, // node before the point
-        after = node && node.firstChild, // node after the point
-        root = node,
-        pos = 0;
-
-    /**
-     * @param {!Node} node
-     * @return {!number}
-     */
-    function getPosition(node) {
-        var /**@type{!number}*/ p = -1,
-            /**@type{Node}*/ n = node;
-        while (n) {
-            n = n.previousSibling;
-            p += 1;
-        }
-        return p;
-    }
-    /**
-     * Move the walker to the point given by @p node and @p position.
-     * @param {!Element} node must be the root of this walker or part of the
-     *                   tree of this walker.
-     * @param {!number} position must be a valid position in @node.
-     **/
-    this.setPoint = function (node, position) {
-        currentNode = node;
-        pos = position;
-        if (currentNode.nodeType === 3) { // Node.TEXT_NODE
-            after = null;
-            before = null;
-        } else {
-            after = currentNode.firstChild;
-            while (position) {
-                position -= 1;
-                after = after.nextSibling;
-            }
-            if (after) {
-                before = after.previousSibling;
-            } else {
-                before = currentNode.lastChild;
-            }
-        }
-    };
-    /**
-     * @return {!boolean}
-     */
-    this.stepForward = function () {
-        var len;
-        // if this is a text node, move to the next position in the text
-        if (currentNode.nodeType === 3) { // TEXT_NODE
-            if (typeof currentNode.nodeValue.length === "number") {
-                len = currentNode.nodeValue.length;
-            } else {
-                len = currentNode.nodeValue.length();
-            }
-            if (pos < len) {
-                pos += 1;
-                return true;
-            }
-        }
-        if (after) {
-            if (after.nodeType === 1) { // ELEMENT_NODE
-                currentNode = after;
-                before = null;
-                after = currentNode.firstChild;
-                pos = 0;
-            } else if (after.nodeType === 3) { // TEXT_NODE
-                currentNode = after;
-                before = null;
-                after = null;
-                pos = 0;
-            } else {
-                before = after;
-                after = after.nextSibling;
-                pos += 1;
-            }
-            return true;
-        }
-        if (currentNode !== root) {
-            before = currentNode;
-            after = before.nextSibling;
-            currentNode = currentNode.parentNode;
-            pos = getPosition(before) + 1;
-            return true;
-        }
-        return false;
-    };
-    /**
-     * @return {!boolean}
-     */
-    this.stepBackward = function () {
-        // if this is a text node, move to the next position in the text
-        if (currentNode.nodeType === 3) { // TEXT_NODE
-            if (pos > 0) {
-                pos -= 1;
-                return true;
-            }
-        }
-        if (before) {
-            if (before.nodeType === 1) { // ELEMENT_NODE
-                currentNode = before;
-                before = currentNode.lastChild;
-                after = null;
-                pos = getPosition(before) + 1;
-            } else if (before.nodeType === 3) { // TEXT_NODE
-                currentNode = before;
-                before = null;
-                after = null;
-                if (typeof currentNode.nodeValue.length === "number") {
-                    pos = currentNode.nodeValue.length;
-                } else {
-                    pos = currentNode.nodeValue.length();
-                }
-            } else {
-                after = before;
-                before = before.previousSibling;
-                pos -= 1;
-            }
-            return true;
-        }
-        if (currentNode !== root) {
-            after = currentNode;
-            before = after.previousSibling;
-            currentNode = currentNode.parentNode;
-            pos = getPosition(after);
-            return true;
-        }
-        return false;
-    };
-    /**
-     * @return {?Node}
-     */
-    this.node = function () {
-        return currentNode;
-    };
-    /**
-     * @return {!number}
-     */
-    this.position = function () {
-        return pos;
-    };
-    /**
-     * @return {?Node}
-     */
-    this.precedingSibling = function () {
-        return before;
-    };
-    /**
-     * @return {?Node}
-     */
-    this.followingSibling = function () {
-        return after;
-    };
-};
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/core/RawDeflate.js b/apps/files_odfviewer/src/webodf/webodf/lib/core/RawDeflate.js
deleted file mode 100644
index 5fdd2b02de..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/lib/core/RawDeflate.js
+++ /dev/null
@@ -1,1833 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global core, runtime*/
-/*jslint bitwise: true, white: false, plusplus: true, vars: true, continue: true*/
-/*
- * $Id: rawdeflate.js,v 0.3 2009/03/01 19:05:05 dankogai Exp dankogai $
- *
- * Original:
- *   http://www.onicos.com/staff/iz/amuse/javascript/expert/deflate.txt
- */
-/**
- * @constructor
- */
-core.RawDeflate = function () {
-    "use strict";
-    /* Copyright (C) 1999 Masanao Izumo <iz@onicos.co.jp>
-     * Version: 1.0.1
-     * LastModified: Dec 25 1999
-     */
-
-    /* Interface:
-     * data = zip_deflate(src);
-     */
-
-    /* constant parameters */
-    var zip_WSIZE = 32768,        // Sliding Window size
-        zip_STORED_BLOCK = 0,
-        zip_STATIC_TREES = 1,
-        zip_DYN_TREES    = 2,
-
-    /* for deflate */
-        zip_DEFAULT_LEVEL = 6,
-        zip_FULL_SEARCH = true,
-        zip_INBUFSIZ = 32768,    // Input buffer size
-        zip_INBUF_EXTRA = 64,    // Extra buffer
-        zip_OUTBUFSIZ = 1024 * 8,
-        zip_window_size = 2 * zip_WSIZE,
-        zip_MIN_MATCH = 3,
-        zip_MAX_MATCH = 258,
-        zip_BITS = 16,
-    // for SMALL_MEM
-        zip_LIT_BUFSIZE = 0x2000,
-        zip_HASH_BITS = 13,
-    // for MEDIUM_MEM
-    // var zip_LIT_BUFSIZE = 0x4000;
-    // var zip_HASH_BITS = 14;
-    // for BIG_MEM
-    // var zip_LIT_BUFSIZE = 0x8000;
-        zip_DIST_BUFSIZE = zip_LIT_BUFSIZE,
-        zip_HASH_SIZE = 1 << zip_HASH_BITS,
-        zip_HASH_MASK = zip_HASH_SIZE - 1,
-        zip_WMASK = zip_WSIZE - 1,
-        zip_NIL = 0, // Tail of hash chains
-        zip_TOO_FAR = 4096,
-        zip_MIN_LOOKAHEAD = zip_MAX_MATCH + zip_MIN_MATCH + 1,
-        zip_MAX_DIST = zip_WSIZE - zip_MIN_LOOKAHEAD,
-        zip_SMALLEST = 1,
-        zip_MAX_BITS = 15,
-        zip_MAX_BL_BITS = 7,
-        zip_LENGTH_CODES = 29,
-        zip_LITERALS = 256,
-        zip_END_BLOCK = 256,
-        zip_L_CODES = zip_LITERALS + 1 + zip_LENGTH_CODES,
-        zip_D_CODES = 30,
-        zip_BL_CODES = 19,
-        zip_REP_3_6 = 16,
-        zip_REPZ_3_10 = 17,
-        zip_REPZ_11_138 = 18,
-        zip_HEAP_SIZE = 2 * zip_L_CODES + 1,
-        zip_H_SHIFT = parseInt((zip_HASH_BITS + zip_MIN_MATCH - 1) /
-                zip_MIN_MATCH, 10),
-
-    /* variables */
-        zip_free_queue,
-        zip_qhead,
-        zip_qtail,
-        zip_initflag,
-        zip_outbuf = null,
-        zip_outcnt,
-        zip_outoff,
-        zip_complete,
-        zip_window,
-        zip_d_buf,
-        zip_l_buf,
-        zip_prev,
-        zip_bi_buf,
-        zip_bi_valid,
-        zip_block_start,
-        zip_ins_h,
-        zip_hash_head,
-        zip_prev_match,
-        zip_match_available,
-        zip_match_length,
-        zip_prev_length,
-        zip_strstart,
-        zip_match_start,
-        zip_eofile,
-        zip_lookahead,
-        zip_max_chain_length,
-        zip_max_lazy_match,
-        zip_compr_level,
-        zip_good_match,
-        zip_nice_match,
-        zip_dyn_ltree,
-        zip_dyn_dtree,
-        zip_static_ltree,
-        zip_static_dtree,
-        zip_bl_tree,
-        zip_l_desc,
-        zip_d_desc,
-        zip_bl_desc,
-        zip_bl_count,
-        zip_heap,
-        zip_heap_len,
-        zip_heap_max,
-        zip_depth,
-        zip_length_code,
-        zip_dist_code,
-        zip_base_length,
-        zip_base_dist,
-        zip_flag_buf,
-        zip_last_lit,
-        zip_last_dist,
-        zip_last_flags,
-        zip_flags,
-        zip_flag_bit,
-        zip_opt_len,
-        zip_static_len,
-        zip_deflate_data,
-        zip_deflate_pos,
-    // var zip_HASH_BITS = 15;
-    /* constant tables */
-        zip_extra_lbits = [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 0],
-        zip_extra_dbits = [0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13],
-        zip_extra_blbits = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 3, 7],
-        zip_bl_order = [16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15],
-        zip_configuration_table;
-    if (zip_LIT_BUFSIZE > zip_INBUFSIZ) {
-        runtime.log("error: zip_INBUFSIZ is too small");
-    }
-    if ((zip_WSIZE << 1) > (1 << zip_BITS)) {
-        runtime.log("error: zip_WSIZE is too large");
-    }
-    if (zip_HASH_BITS > zip_BITS - 1) {
-        runtime.log("error: zip_HASH_BITS is too large");
-    }
-    if (zip_HASH_BITS < 8 || zip_MAX_MATCH !== 258) {
-        runtime.log("error: Code too clever");
-    }
-
-    /* objects (deflate) */
-    /**
-     * @constructor
-     */
-    function Zip_DeflateCT() {
-        this.fc = 0; // frequency count or bit string
-        this.dl = 0; // father node in Huffman tree or length of bit string
-    }
-    /**
-     * @constructor
-     */
-    function Zip_DeflateTreeDesc() {
-        this.dyn_tree = null;    // the dynamic tree
-        this.static_tree = null;    // corresponding static tree or NULL
-        this.extra_bits = null;    // extra bits for each code or NULL
-        this.extra_base = 0;    // base index for extra_bits
-        this.elems = 0;        // max number of elements in the tree
-        this.max_length = 0;    // max bit length for the codes
-        this.max_code = 0;        // largest code with non zero frequency
-    }
-
-    /** Values for max_lazy_match, good_match and max_chain_length, depending on
-     * the desired pack level (0..9). The values given below have been tuned to
-     * exclude worst case performance for pathological files. Better values may be
-     * found for specific files.
-     * @constructor
-     */
-    function Zip_DeflateConfiguration(a, b, c, d) {
-        this.good_length = a; // reduce lazy search above this match length
-        this.max_lazy = b;    // do not perform lazy search above this match length
-        this.nice_length = c; // quit search above this match length
-        this.max_chain = d;
-    }
-
-    /**
-     * @constructor
-     */
-    function Zip_DeflateBuffer() {
-        this.next = null;
-        this.len = 0;
-        this.ptr = [];
-        this.ptr.length = zip_OUTBUFSIZ;
-        this.off = 0;
-    }
-
-    /* constant tables */
-    zip_configuration_table = [
-        new Zip_DeflateConfiguration(0,    0,   0,    0),
-        new Zip_DeflateConfiguration(4,    4,   8,    4),
-        new Zip_DeflateConfiguration(4,    5,  16,    8),
-        new Zip_DeflateConfiguration(4,    6,  32,   32),
-        new Zip_DeflateConfiguration(4,    4,  16,   16),
-        new Zip_DeflateConfiguration(8,   16,  32,   32),
-        new Zip_DeflateConfiguration(8,   16, 128,  128),
-        new Zip_DeflateConfiguration(8,   32, 128,  256),
-        new Zip_DeflateConfiguration(32, 128, 258, 1024),
-        new Zip_DeflateConfiguration(32, 258, 258, 4096)
-    ];
-
-
-    /* routines (deflate) */
-
-    function zip_deflate_start(level) {
-        var i;
-
-        if (!level) {
-            level = zip_DEFAULT_LEVEL;
-        } else if (level < 1) {
-            level = 1;
-        } else if (level > 9) {
-            level = 9;
-        }
-
-        zip_compr_level = level;
-        zip_initflag = false;
-        zip_eofile = false;
-        if (zip_outbuf !== null) {
-            return;
-        }
-
-        zip_free_queue = zip_qhead = zip_qtail = null;
-        zip_outbuf = [];
-        zip_outbuf.length = zip_OUTBUFSIZ;
-        zip_window = [];
-        zip_window.length = zip_window_size;
-        zip_d_buf = [];
-        zip_d_buf.length = zip_DIST_BUFSIZE;
-        zip_l_buf = [];
-        zip_l_buf.length = zip_INBUFSIZ + zip_INBUF_EXTRA;
-        zip_prev = [];
-        zip_prev.length = 1 << zip_BITS;
-        zip_dyn_ltree = [];
-        zip_dyn_ltree.length = zip_HEAP_SIZE;
-        for (i = 0; i < zip_HEAP_SIZE; i++) {
-            zip_dyn_ltree[i] = new Zip_DeflateCT();
-        }
-        zip_dyn_dtree = [];
-        zip_dyn_dtree.length = 2 * zip_D_CODES + 1;
-        for (i = 0; i < 2 * zip_D_CODES + 1; i++) {
-            zip_dyn_dtree[i] = new Zip_DeflateCT();
-        }
-        zip_static_ltree = [];
-        zip_static_ltree.length = zip_L_CODES + 2;
-        for (i = 0; i < zip_L_CODES + 2; i++) {
-            zip_static_ltree[i] = new Zip_DeflateCT();
-        }
-        zip_static_dtree = [];
-        zip_static_dtree.length = zip_D_CODES;
-        for (i = 0; i < zip_D_CODES; i++) {
-            zip_static_dtree[i] = new Zip_DeflateCT();
-        }
-        zip_bl_tree = [];
-        zip_bl_tree.length = 2 * zip_BL_CODES + 1;
-        for (i = 0; i < 2 * zip_BL_CODES + 1; i++) {
-            zip_bl_tree[i] = new Zip_DeflateCT();
-        }
-        zip_l_desc = new Zip_DeflateTreeDesc();
-        zip_d_desc = new Zip_DeflateTreeDesc();
-        zip_bl_desc = new Zip_DeflateTreeDesc();
-        zip_bl_count = [];
-        zip_bl_count.length = zip_MAX_BITS + 1;
-        zip_heap = [];
-        zip_heap.length = 2 * zip_L_CODES + 1;
-        zip_depth = [];
-        zip_depth.length = 2 * zip_L_CODES + 1;
-        zip_length_code = [];
-        zip_length_code.length = zip_MAX_MATCH - zip_MIN_MATCH + 1;
-        zip_dist_code = [];
-        zip_dist_code.length = 512;
-        zip_base_length = [];
-        zip_base_length.length = zip_LENGTH_CODES;
-        zip_base_dist = [];
-        zip_base_dist.length = zip_D_CODES;
-        zip_flag_buf = [];
-        zip_flag_buf.length = parseInt(zip_LIT_BUFSIZE / 8, 10);
-    }
-
-    var zip_deflate_end = function () {
-        zip_free_queue = zip_qhead = zip_qtail = null;
-        zip_outbuf = null;
-        zip_window = null;
-        zip_d_buf = null;
-        zip_l_buf = null;
-        zip_prev = null;
-        zip_dyn_ltree = null;
-        zip_dyn_dtree = null;
-        zip_static_ltree = null;
-        zip_static_dtree = null;
-        zip_bl_tree = null;
-        zip_l_desc = null;
-        zip_d_desc = null;
-        zip_bl_desc = null;
-        zip_bl_count = null;
-        zip_heap = null;
-        zip_depth = null;
-        zip_length_code = null;
-        zip_dist_code = null;
-        zip_base_length = null;
-        zip_base_dist = null;
-        zip_flag_buf = null;
-    };
-
-    var zip_reuse_queue = function (p) {
-        p.next = zip_free_queue;
-        zip_free_queue = p;
-    };
-
-    var zip_new_queue = function () {
-        var p;
-
-        if (zip_free_queue !== null) {
-            p = zip_free_queue;
-            zip_free_queue = zip_free_queue.next;
-        } else {
-            p = new Zip_DeflateBuffer();
-        }
-        p.next = null;
-        p.len = p.off = 0;
-
-        return p;
-    };
-
-    var zip_head1 = function (i) {
-        return zip_prev[zip_WSIZE + i];
-    };
-
-    var zip_head2 = function (i, val) {
-        zip_prev[zip_WSIZE + i] = val;
-        return val;
-    };
-
-    var zip_qoutbuf = function () {
-        var q, i;
-        if (zip_outcnt !== 0) {
-            q = zip_new_queue();
-            if (zip_qhead === null) {
-                zip_qhead = zip_qtail = q;
-            } else {
-                zip_qtail = zip_qtail.next = q;
-            }
-            q.len = zip_outcnt - zip_outoff;
-    //      System.arraycopy(zip_outbuf, zip_outoff, q.ptr, 0, q.len);
-            for (i = 0; i < q.len; i++) {
-                q.ptr[i] = zip_outbuf[zip_outoff + i];
-            }
-            zip_outcnt = zip_outoff = 0;
-        }
-    };
-
-    /* put_byte is used for the compressed output, put_ubyte for the
-     * uncompressed output. However unlzw() uses window for its
-     * suffix table instead of its output buffer, so it does not use put_ubyte
-     * (to be cleaned up).
-     */
-    var zip_put_byte = function (c) {
-        zip_outbuf[zip_outoff + zip_outcnt++] = c;
-        if (zip_outoff + zip_outcnt === zip_OUTBUFSIZ) {
-            zip_qoutbuf();
-        }
-    };
-
-    /* Output a 16 bit value, lsb first */
-    var zip_put_short = function (w) {
-        w &= 0xffff;
-        if (zip_outoff + zip_outcnt < zip_OUTBUFSIZ - 2) {
-            zip_outbuf[zip_outoff + zip_outcnt++] = (w & 0xff);
-            zip_outbuf[zip_outoff + zip_outcnt++] = (w >>> 8);
-        } else {
-            zip_put_byte(w & 0xff);
-            zip_put_byte(w >>> 8);
-        }
-    };
-
-    /* ==========================================================================
-     * Insert string s in the dictionary and set match_head to the previous head
-     * of the hash chain (the most recent string with same hash key). Return
-     * the previous length of the hash chain.
-     * IN  assertion: all calls to to INSERT_STRING are made with consecutive
-     *    input characters and the first MIN_MATCH bytes of s are valid
-     *    (except for the last MIN_MATCH-1 bytes of the input file).
-     */
-    var zip_INSERT_STRING = function () {
-        zip_ins_h = ((zip_ins_h << zip_H_SHIFT)
-             ^ (zip_window[zip_strstart + zip_MIN_MATCH - 1] & 0xff))
-            & zip_HASH_MASK;
-        zip_hash_head = zip_head1(zip_ins_h);
-        zip_prev[zip_strstart & zip_WMASK] = zip_hash_head;
-        zip_head2(zip_ins_h, zip_strstart);
-    };
-
-    /* ==========================================================================
-     * Send a value on a given number of bits.
-     * IN assertion: length <= 16 and value fits in length bits.
-     */
-    var zip_Buf_size = 16; // bit size of bi_buf
-    var zip_send_bits = function (
-        value,    // value to send
-        length
-    ) {    // number of bits
-        /* If not enough room in bi_buf, use (valid) bits from bi_buf and
-         * (16 - bi_valid) bits from value, leaving (width - (16-bi_valid))
-         * unused bits in value.
-         */
-        if (zip_bi_valid > zip_Buf_size - length) {
-            zip_bi_buf |= (value << zip_bi_valid);
-            zip_put_short(zip_bi_buf);
-            zip_bi_buf = (value >> (zip_Buf_size - zip_bi_valid));
-            zip_bi_valid += length - zip_Buf_size;
-        } else {
-            zip_bi_buf |= value << zip_bi_valid;
-            zip_bi_valid += length;
-        }
-    };
-
-    /* Send a code of the given tree. c and tree must not have side effects */
-    var zip_SEND_CODE = function (c, tree) {
-        zip_send_bits(tree[c].fc, tree[c].dl);
-    };
-
-    /* Mapping from a distance to a distance code. dist is the distance - 1 and
-     * must not have side effects. dist_code[256] and dist_code[257] are never
-     * used.
-     */
-    var zip_D_CODE = function (dist) {
-        return (dist < 256 ? zip_dist_code[dist]
-            : zip_dist_code[256 + (dist >> 7)]) & 0xff;
-    };
-
-    /* ==========================================================================
-     * Compares to subtrees, using the tree depth as tie breaker when
-     * the subtrees have equal frequency. This minimizes the worst case length.
-     */
-    var zip_SMALLER = function (tree, n, m) {
-        return tree[n].fc < tree[m].fc ||
-            (tree[n].fc === tree[m].fc && zip_depth[n] <= zip_depth[m]);
-    };
-
-    /* ==========================================================================
-     * read string data
-     */
-    var zip_read_buff = function (buff, offset, n) {
-        var i;
-        for (i = 0; i < n && zip_deflate_pos < zip_deflate_data.length; i++) {
-            buff[offset + i] =
-                zip_deflate_data.charCodeAt(zip_deflate_pos++) & 0xff;
-        }
-        return i;
-    };
-
-    /* ==========================================================================
-     * Fill the window when the lookahead becomes insufficient.
-     * Updates strstart and lookahead, and sets eofile if end of input file.
-     * IN assertion: lookahead < MIN_LOOKAHEAD && strstart + lookahead > 0
-     * OUT assertions: at least one byte has been read, or eofile is set;
-     *    file reads are performed for at least two bytes (required for the
-     *    translate_eol option).
-     */
-    var zip_fill_window = function () {
-        var n, m;
-
-        // Amount of free space at the end of the window.
-        var more = zip_window_size - zip_lookahead - zip_strstart;
-
-        /* If the window is almost full and there is insufficient lookahead,
-         * move the upper half to the lower one to make room in the upper half.
-         */
-        if (more === -1) {
-        /* Very unlikely, but possible on 16 bit machine if strstart == 0
-             * and lookahead == 1 (input done one byte at time)
-             */
-            more--;
-        } else if (zip_strstart >= zip_WSIZE + zip_MAX_DIST) {
-        /* By the IN assertion, the window is not empty so we can't confuse
-             * more == 0 with more == 64K on a 16 bit machine.
-             */
-    //    Assert(window_size == (ulg)2*WSIZE, "no sliding with BIG_MEM");
-
-    //    System.arraycopy(window, WSIZE, window, 0, WSIZE);
-            for (n = 0; n < zip_WSIZE; n++) {
-                zip_window[n] = zip_window[n + zip_WSIZE];
-            }
-
-            zip_match_start -= zip_WSIZE;
-            zip_strstart    -= zip_WSIZE; /* we now have strstart >= MAX_DIST: */
-            zip_block_start -= zip_WSIZE;
-
-            for (n = 0; n < zip_HASH_SIZE; n++) {
-                m = zip_head1(n);
-                zip_head2(n, m >= zip_WSIZE ? m - zip_WSIZE : zip_NIL);
-            }
-            for (n = 0; n < zip_WSIZE; n++) {
-            /* If n is not on any hash chain, prev[n] is garbage but
-             * its value will never be used.
-             */
-                m = zip_prev[n];
-                zip_prev[n] = (m >= zip_WSIZE ? m - zip_WSIZE : zip_NIL);
-            }
-            more += zip_WSIZE;
-        }
-        // At this point, more >= 2
-        if (!zip_eofile) {
-            n = zip_read_buff(zip_window, zip_strstart + zip_lookahead, more);
-            if (n <= 0) {
-                zip_eofile = true;
-            } else {
-                zip_lookahead += n;
-            }
-        }
-    };
-
-
-    /* ==========================================================================
-     * Initialize the "longest match" routines for a new file
-     */
-    var zip_lm_init = function () {
-        var j;
-
-        /* Initialize the hash table. */
-        for (j = 0; j < zip_HASH_SIZE; j++) {
-    //    zip_head2(j, zip_NIL);
-            zip_prev[zip_WSIZE + j] = 0;
-        }
-        /* prev will be initialized on the fly */
-
-        /* Set the default configuration parameters:
-         */
-        zip_max_lazy_match = zip_configuration_table[zip_compr_level].max_lazy;
-        zip_good_match     = zip_configuration_table[zip_compr_level].good_length;
-        if (!zip_FULL_SEARCH) {
-            zip_nice_match = zip_configuration_table[zip_compr_level].nice_length;
-        }
-        zip_max_chain_length = zip_configuration_table[zip_compr_level].max_chain;
-
-        zip_strstart = 0;
-        zip_block_start = 0;
-
-        zip_lookahead = zip_read_buff(zip_window, 0, 2 * zip_WSIZE);
-        if (zip_lookahead <= 0) {
-            zip_eofile = true;
-            zip_lookahead = 0;
-            return;
-        }
-        zip_eofile = false;
-        /* Make sure that we always have enough lookahead. This is important
-         * if input comes from a device such as a tty.
-         */
-        while (zip_lookahead < zip_MIN_LOOKAHEAD && !zip_eofile) {
-            zip_fill_window();
-        }
-
-        /* If lookahead < MIN_MATCH, ins_h is garbage, but this is
-         * not important since only literal bytes will be emitted.
-         */
-        zip_ins_h = 0;
-        for (j = 0; j < zip_MIN_MATCH - 1; j++) {
-    //      UPDATE_HASH(ins_h, window[j]);
-            zip_ins_h = ((zip_ins_h << zip_H_SHIFT) ^ (zip_window[j] & 0xff)) & zip_HASH_MASK;
-        }
-    };
-
-    /* ==========================================================================
-     * Set match_start to the longest match starting at the given string and
-     * return its length. Matches shorter or equal to prev_length are discarded,
-     * in which case the result is equal to prev_length and match_start is
-     * garbage.
-     * IN assertions: cur_match is the head of the hash chain for the current
-     *   string (strstart) and its distance is <= MAX_DIST, and prev_length >= 1
-     */
-    var zip_longest_match = function (cur_match) {
-        var chain_length = zip_max_chain_length; // max hash chain length
-        var scanp = zip_strstart; // current string
-        var matchp;        // matched string
-        var len;        // length of current match
-        var best_len = zip_prev_length;    // best match length so far
-
-        /* Stop when cur_match becomes <= limit. To simplify the code,
-         * we prevent matches with the string of window index 0.
-         */
-        var limit = (zip_strstart > zip_MAX_DIST ? zip_strstart - zip_MAX_DIST : zip_NIL);
-
-        var strendp = zip_strstart + zip_MAX_MATCH;
-        var scan_end1 = zip_window[scanp + best_len - 1];
-        var scan_end  = zip_window[scanp + best_len];
-
-        /* Do not waste too much time if we already have a good match: */
-        if (zip_prev_length >= zip_good_match) {
-            chain_length >>= 2;
-        }
-
-    //  Assert(encoder->strstart <= window_size-MIN_LOOKAHEAD, "insufficient lookahead");
-
-        do {
-    //    Assert(cur_match < encoder->strstart, "no future");
-            matchp = cur_match;
-
-        /* Skip to next match if the match length cannot increase
-            * or if the match length is less than 2:
-        */
-            if (zip_window[matchp + best_len]    !== scan_end  ||
-                    zip_window[matchp + best_len - 1]    !== scan_end1 ||
-                    zip_window[matchp]            !== zip_window[scanp] ||
-                    zip_window[++matchp]            !== zip_window[scanp + 1]) {
-                continue;
-            }
-
-        /* The check at best_len-1 can be removed because it will be made
-             * again later. (This heuristic is not always a win.)
-             * It is not necessary to compare scan[2] and match[2] since they
-             * are always equal when the other bytes match, given that
-             * the hash keys are equal and that HASH_BITS >= 8.
-             */
-            scanp += 2;
-            matchp++;
-
-        /* We check for insufficient lookahead only every 8th comparison;
-             * the 256th check will be made at strstart+258.
-             */
-            do {
-                ++scanp;
-            } while (zip_window[scanp] === zip_window[++matchp] &&
-                zip_window[++scanp] === zip_window[++matchp] &&
-                zip_window[++scanp] === zip_window[++matchp] &&
-                zip_window[++scanp] === zip_window[++matchp] &&
-                zip_window[++scanp] === zip_window[++matchp] &&
-                zip_window[++scanp] === zip_window[++matchp] &&
-                zip_window[++scanp] === zip_window[++matchp] &&
-                zip_window[++scanp] === zip_window[++matchp] &&
-                scanp < strendp);
-
-            len = zip_MAX_MATCH - (strendp - scanp);
-            scanp = strendp - zip_MAX_MATCH;
-
-            if (len > best_len) {
-                zip_match_start = cur_match;
-                best_len = len;
-                if (zip_FULL_SEARCH) {
-                    if (len >= zip_MAX_MATCH) {
-                        break;
-                    }
-                } else {
-                    if (len >= zip_nice_match) {
-                        break;
-                    }
-                }
-
-                scan_end1  = zip_window[scanp + best_len - 1];
-                scan_end   = zip_window[scanp + best_len];
-            }
-        } while ((cur_match = zip_prev[cur_match & zip_WMASK]) > limit
-            && --chain_length !== 0);
-
-        return best_len;
-    };
-
-    /* ==========================================================================
-     * Save the match info and tally the frequency counts. Return true if
-     * the current block must be flushed.
-     */
-    var zip_ct_tally = function (
-        dist, // distance of matched string
-        lc
-    ) { // match length-MIN_MATCH or unmatched char (if dist==0)
-        zip_l_buf[zip_last_lit++] = lc;
-        if (dist === 0) {
-        // lc is the unmatched char
-            zip_dyn_ltree[lc].fc++;
-        } else {
-        // Here, lc is the match length - MIN_MATCH
-            dist--;            // dist = match distance - 1
-    //      Assert((ush)dist < (ush)MAX_DIST &&
-    //         (ush)lc <= (ush)(MAX_MATCH-MIN_MATCH) &&
-    //         (ush)D_CODE(dist) < (ush)D_CODES,  "ct_tally: bad match");
-
-            zip_dyn_ltree[zip_length_code[lc] + zip_LITERALS + 1].fc++;
-            zip_dyn_dtree[zip_D_CODE(dist)].fc++;
-
-            zip_d_buf[zip_last_dist++] = dist;
-            zip_flags |= zip_flag_bit;
-        }
-        zip_flag_bit <<= 1;
-
-        // Output the flags if they fill a byte
-        if ((zip_last_lit & 7) === 0) {
-            zip_flag_buf[zip_last_flags++] = zip_flags;
-            zip_flags = 0;
-            zip_flag_bit = 1;
-        }
-        // Try to guess if it is profitable to stop the current block here
-        if (zip_compr_level > 2 && (zip_last_lit & 0xfff) === 0) {
-        // Compute an upper bound for the compressed length
-            var out_length = zip_last_lit * 8;
-            var in_length = zip_strstart - zip_block_start;
-            var dcode;
-
-            for (dcode = 0; dcode < zip_D_CODES; dcode++) {
-                out_length += zip_dyn_dtree[dcode].fc * (5 + zip_extra_dbits[dcode]);
-            }
-            out_length >>= 3;
-    //      Trace((stderr,"\nlast_lit %u, last_dist %u, in %ld, out ~%ld(%ld%%) ",
-    //         encoder->last_lit, encoder->last_dist, in_length, out_length,
-    //         100L - out_length*100L/in_length));
-            if (zip_last_dist < parseInt(zip_last_lit / 2, 10) &&
-                    out_length < parseInt(in_length / 2, 10)) {
-                return true;
-            }
-        }
-        return (zip_last_lit === zip_LIT_BUFSIZE - 1 ||
-            zip_last_dist === zip_DIST_BUFSIZE);
-        /* We avoid equality with LIT_BUFSIZE because of wraparound at 64K
-         * on 16 bit machines and because stored blocks are restricted to
-         * 64K-1 bytes.
-         */
-    };
-
-    /* ==========================================================================
-     * Restore the heap property by moving down the tree starting at node k,
-     * exchanging a node with the smallest of its two sons if necessary, stopping
-     * when the heap property is re-established (each father smaller than its
-     * two sons).
-     */
-    var zip_pqdownheap = function (
-        tree,    // the tree to restore
-        k
-    ) {    // node to move down
-        var v = zip_heap[k];
-        var j = k << 1;    // left son of k
-
-        while (j <= zip_heap_len) {
-        // Set j to the smallest of the two sons:
-            if (j < zip_heap_len &&
-                    zip_SMALLER(tree, zip_heap[j + 1], zip_heap[j])) {
-                j++;
-            }
-
-        // Exit if v is smaller than both sons
-            if (zip_SMALLER(tree, v, zip_heap[j])) {
-                break;
-            }
-
-        // Exchange v with the smallest son
-            zip_heap[k] = zip_heap[j];
-            k = j;
-
-        // And continue down the tree, setting j to the left son of k
-            j <<= 1;
-        }
-        zip_heap[k] = v;
-    };
-
-    /* ==========================================================================
-     * Compute the optimal bit lengths for a tree and update the total bit length
-     * for the current block.
-     * IN assertion: the fields freq and dad are set, heap[heap_max] and
-     *    above are the tree nodes sorted by increasing frequency.
-     * OUT assertions: the field len is set to the optimal bit length, the
-     *     array bl_count contains the frequencies for each bit length.
-     *     The length opt_len is updated; static_len is also updated if stree is
-     *     not null.
-     */
-    var zip_gen_bitlen = function (desc) { // the tree descriptor
-        var tree        = desc.dyn_tree;
-        var extra        = desc.extra_bits;
-        var base        = desc.extra_base;
-        var max_code    = desc.max_code;
-        var max_length    = desc.max_length;
-        var stree        = desc.static_tree;
-        var h;        // heap index
-        var n, m;        // iterate over the tree elements
-        var bits;        // bit length
-        var xbits;        // extra bits
-        var f;        // frequency
-        var overflow = 0;    // number of elements with bit length too large
-
-        for (bits = 0; bits <= zip_MAX_BITS; bits++) {
-            zip_bl_count[bits] = 0;
-        }
-
-        /* In a first pass, compute the optimal bit lengths (which may
-         * overflow in the case of the bit length tree).
-         */
-        tree[zip_heap[zip_heap_max]].dl = 0; // root of the heap
-
-        for (h = zip_heap_max + 1; h < zip_HEAP_SIZE; h++) {
-            n = zip_heap[h];
-            bits = tree[tree[n].dl].dl + 1;
-            if (bits > max_length) {
-                bits = max_length;
-                overflow++;
-            }
-            tree[n].dl = bits;
-        // We overwrite tree[n].dl which is no longer needed
-
-            if (n > max_code) {
-                continue; // not a leaf node
-            }
-
-            zip_bl_count[bits]++;
-            xbits = 0;
-            if (n >= base) {
-                xbits = extra[n - base];
-            }
-            f = tree[n].fc;
-            zip_opt_len += f * (bits + xbits);
-            if (stree !== null) {
-                zip_static_len += f * (stree[n].dl + xbits);
-            }
-        }
-        if (overflow === 0) {
-            return;
-        }
-
-        // This happens for example on obj2 and pic of the Calgary corpus
-
-        // Find the first bit length which could increase:
-        do {
-            bits = max_length - 1;
-            while (zip_bl_count[bits] === 0) {
-                bits--;
-            }
-            zip_bl_count[bits]--;        // move one leaf down the tree
-            zip_bl_count[bits + 1] += 2;    // move one overflow item as its brother
-            zip_bl_count[max_length]--;
-        /* The brother of the overflow item also moves one step up,
-         * but this does not affect bl_count[max_length]
-         */
-            overflow -= 2;
-        } while (overflow > 0);
-
-        /* Now recompute all bit lengths, scanning in increasing frequency.
-         * h is still equal to HEAP_SIZE. (It is simpler to reconstruct all
-         * lengths instead of fixing only the wrong ones. This idea is taken
-         * from 'ar' written by Haruhiko Okumura.)
-         */
-        for (bits = max_length; bits !== 0; bits--) {
-            n = zip_bl_count[bits];
-            while (n !== 0) {
-                m = zip_heap[--h];
-                if (m > max_code) {
-                    continue;
-                }
-                if (tree[m].dl !== bits) {
-                    zip_opt_len += (bits - tree[m].dl) * tree[m].fc;
-                    tree[m].fc = bits;
-                }
-                n--;
-            }
-        }
-    };
-
-    /* ==========================================================================
-     * Reverse the first len bits of a code, using straightforward code (a faster
-     * method would use a table)
-     * IN assertion: 1 <= len <= 15
-     */
-    var zip_bi_reverse = function (
-        code,    // the value to invert
-        len
-    ) {    // its bit length
-        var res = 0;
-        do {
-            res |= code & 1;
-            code >>= 1;
-            res <<= 1;
-        } while (--len > 0);
-        return res >> 1;
-    };
-
-      /* ==========================================================================
-       * Generate the codes for a given tree and bit counts (which need not be
-       * optimal).
-       * IN assertion: the array bl_count contains the bit length statistics for
-       * the given tree and the field len is set for all tree elements.
-       * OUT assertion: the field code is set for all tree elements of non
-       *     zero code length.
-       */
-    var zip_gen_codes = function (tree,    // the tree to decorate
-               max_code) {    // largest code with non zero frequency
-            var next_code = [];
-            next_code.length = zip_MAX_BITS + 1; // next code value for each bit length
-            var code = 0;        // running code value
-            var bits;            // bit index
-            var n;            // code index
-
-        /* The distribution counts are first used to generate the code values
-         * without bit reversal.
-         */
-            for (bits = 1; bits <= zip_MAX_BITS; bits++) {
-                code = ((code + zip_bl_count[bits - 1]) << 1);
-                next_code[bits] = code;
-            }
-
-        /* Check that the bit counts in bl_count are consistent. The last code
-         * must be all ones.
-         */
-    //    Assert (code + encoder->bl_count[MAX_BITS]-1 == (1<<MAX_BITS)-1,
-    //        "inconsistent bit counts");
-    //    Tracev((stderr,"\ngen_codes: max_code %d ", max_code));
-
-            for (n = 0; n <= max_code; n++) {
-                var len = tree[n].dl;
-                if (len === 0) {
-                    continue;
-                }
-        // Now reverse the bits
-                tree[n].fc = zip_bi_reverse(next_code[len]++, len);
-
-    //      Tracec(tree != static_ltree, (stderr,"\nn %3d %c l %2d c %4x (%x) ",
-    //      n, (isgraph(n) ? n : ' '), len, tree[n].fc, next_code[len]-1));
-            }
-        };
-
-
-    /* ==========================================================================
-     * Construct one Huffman tree and assigns the code bit strings and lengths.
-     * Update the total bit length for the current block.
-     * IN assertion: the field freq is set for all tree elements.
-     * OUT assertions: the fields len and code are set to the optimal bit length
-     *     and corresponding code. The length opt_len is updated; static_len is
-     *     also updated if stree is not null. The field max_code is set.
-     */
-    var zip_build_tree = function (desc) { // the tree descriptor
-        var tree    = desc.dyn_tree;
-        var stree    = desc.static_tree;
-        var elems    = desc.elems;
-        var n, m;        // iterate over heap elements
-        var max_code = -1;    // largest code with non zero frequency
-        var node = elems;    // next internal node of the tree
-
-        /* Construct the initial heap, with least frequent element in
-         * heap[SMALLEST]. The sons of heap[n] are heap[2*n] and heap[2*n+1].
-         * heap[0] is not used.
-         */
-        zip_heap_len = 0;
-        zip_heap_max = zip_HEAP_SIZE;
-
-        for (n = 0; n < elems; n++) {
-            if (tree[n].fc !== 0) {
-                zip_heap[++zip_heap_len] = max_code = n;
-                zip_depth[n] = 0;
-            } else {
-                tree[n].dl = 0;
-            }
-        }
-
-        /* The pkzip format requires that at least one distance code exists,
-         * and that at least one bit should be sent even if there is only one
-         * possible code. So to avoid special checks later on we force at least
-         * two codes of non zero frequency.
-         */
-        while (zip_heap_len < 2) {
-            var xnew = zip_heap[++zip_heap_len] = (max_code < 2 ? ++max_code : 0);
-            tree[xnew].fc = 1;
-            zip_depth[xnew] = 0;
-            zip_opt_len--;
-            if (stree !== null) {
-                zip_static_len -= stree[xnew].dl;
-            }
-        // new is 0 or 1 so it does not have extra bits
-        }
-        desc.max_code = max_code;
-
-        /* The elements heap[heap_len/2+1 .. heap_len] are leaves of the tree,
-         * establish sub-heaps of increasing lengths:
-         */
-        for (n = zip_heap_len >> 1; n >= 1; n--) {
-            zip_pqdownheap(tree, n);
-        }
-
-        /* Construct the Huffman tree by repeatedly combining the least two
-         * frequent nodes.
-         */
-        do {
-            n = zip_heap[zip_SMALLEST];
-            zip_heap[zip_SMALLEST] = zip_heap[zip_heap_len--];
-            zip_pqdownheap(tree, zip_SMALLEST);
-
-            m = zip_heap[zip_SMALLEST];  // m = node of next least frequency
-
-        // keep the nodes sorted by frequency
-            zip_heap[--zip_heap_max] = n;
-            zip_heap[--zip_heap_max] = m;
-
-        // Create a new node father of n and m
-            tree[node].fc = tree[n].fc + tree[m].fc;
-    //    depth[node] = (char)(MAX(depth[n], depth[m]) + 1);
-            if (zip_depth[n] > zip_depth[m] + 1) {
-                zip_depth[node] = zip_depth[n];
-            } else {
-                zip_depth[node] = zip_depth[m] + 1;
-            }
-            tree[n].dl = tree[m].dl = node;
-
-        // and insert the new node in the heap
-            zip_heap[zip_SMALLEST] = node++;
-            zip_pqdownheap(tree, zip_SMALLEST);
-
-        } while (zip_heap_len >= 2);
-
-        zip_heap[--zip_heap_max] = zip_heap[zip_SMALLEST];
-
-        /* At this point, the fields freq and dad are set. We can now
-         * generate the bit lengths.
-         */
-        zip_gen_bitlen(desc);
-
-        // The field len is now set, we can generate the bit codes
-        zip_gen_codes(tree, max_code);
-    };
-
-    /* ==========================================================================
-     * Scan a literal or distance tree to determine the frequencies of the codes
-     * in the bit length tree. Updates opt_len to take into account the repeat
-     * counts. (The contribution of the bit length codes will be added later
-     * during the construction of bl_tree.)
-     */
-    var zip_scan_tree = function (tree,// the tree to be scanned
-               max_code) {  // and its largest code of non zero frequency
-            var n;            // iterates over all tree elements
-            var prevlen = -1;        // last emitted length
-            var curlen;            // length of current code
-            var nextlen = tree[0].dl;    // length of next code
-            var count = 0;        // repeat count of the current code
-            var max_count = 7;        // max repeat count
-            var min_count = 4;        // min repeat count
-
-            if (nextlen === 0) {
-                max_count = 138;
-                min_count = 3;
-            }
-            tree[max_code + 1].dl = 0xffff; // guard
-
-            for (n = 0; n <= max_code; n++) {
-                curlen = nextlen;
-                nextlen = tree[n + 1].dl;
-                if (++count < max_count && curlen === nextlen) {
-                    continue;
-                } else if (count < min_count) {
-                    zip_bl_tree[curlen].fc += count;
-                } else if (curlen !== 0) {
-                    if (curlen !== prevlen) {
-                        zip_bl_tree[curlen].fc++;
-                    }
-                    zip_bl_tree[zip_REP_3_6].fc++;
-                } else if (count <= 10) {
-                    zip_bl_tree[zip_REPZ_3_10].fc++;
-                } else {
-                    zip_bl_tree[zip_REPZ_11_138].fc++;
-                }
-                count = 0;
-                prevlen = curlen;
-                if (nextlen === 0) {
-                    max_count = 138;
-                    min_count = 3;
-                } else if (curlen === nextlen) {
-                    max_count = 6;
-                    min_count = 3;
-                } else {
-                    max_count = 7;
-                    min_count = 4;
-                }
-            }
-        };
-
-
-    /* ==========================================================================
-     * Construct the Huffman tree for the bit lengths and return the index in
-     * bl_order of the last bit length code to send.
-     */
-    var zip_build_bl_tree = function () {
-        var max_blindex;  // index of last bit length code of non zero freq
-
-        // Determine the bit length frequencies for literal and distance trees
-        zip_scan_tree(zip_dyn_ltree, zip_l_desc.max_code);
-        zip_scan_tree(zip_dyn_dtree, zip_d_desc.max_code);
-
-        // Build the bit length tree:
-        zip_build_tree(zip_bl_desc);
-        /* opt_len now includes the length of the tree representations, except
-         * the lengths of the bit lengths codes and the 5+5+4 bits for the counts.
-         */
-
-        /* Determine the number of bit length codes to send. The pkzip format
-         * requires that at least 4 bit length codes be sent. (appnote.txt says
-         * 3 but the actual value used is 4.)
-         */
-        for (max_blindex = zip_BL_CODES - 1; max_blindex >= 3; max_blindex--) {
-            if (zip_bl_tree[zip_bl_order[max_blindex]].dl !== 0) {
-                break;
-            }
-        }
-        /* Update opt_len to include the bit length tree and counts */
-        zip_opt_len += 3 * (max_blindex + 1) + 5 + 5 + 4;
-    //    Tracev((stderr, "\ndyn trees: dyn %ld, stat %ld",
-    //        encoder->opt_len, encoder->static_len));
-
-        return max_blindex;
-    };
-
-    /* ==========================================================================
-     * Write out any remaining bits in an incomplete byte.
-     */
-    var zip_bi_windup = function () {
-        if (zip_bi_valid > 8) {
-            zip_put_short(zip_bi_buf);
-        } else if (zip_bi_valid > 0) {
-            zip_put_byte(zip_bi_buf);
-        }
-        zip_bi_buf = 0;
-        zip_bi_valid = 0;
-    };
-
-      /* ==========================================================================
-       * Send the block data compressed using the given Huffman trees
-       */
-    var zip_compress_block = function (
-        ltree,    // literal tree
-        dtree
-    ) {    // distance tree
-        var dist;        // distance of matched string
-        var lc;        // match length or unmatched char (if dist == 0)
-        var lx = 0;        // running index in l_buf
-        var dx = 0;        // running index in d_buf
-        var fx = 0;        // running index in flag_buf
-        var flag = 0;    // current flags
-        var code;        // the code to send
-        var extra;        // number of extra bits to send
-
-        if (zip_last_lit !== 0) {
-            do {
-                if ((lx & 7) === 0) {
-                    flag = zip_flag_buf[fx++];
-                }
-                lc = zip_l_buf[lx++] & 0xff;
-                if ((flag & 1) === 0) {
-                    zip_SEND_CODE(lc, ltree); /* send a literal byte */
-    //    Tracecv(isgraph(lc), (stderr," '%c' ", lc));
-                } else {
-            // Here, lc is the match length - MIN_MATCH
-                    code = zip_length_code[lc];
-                    zip_SEND_CODE(code + zip_LITERALS + 1, ltree); // send the length code
-                    extra = zip_extra_lbits[code];
-                    if (extra !== 0) {
-                        lc -= zip_base_length[code];
-                        zip_send_bits(lc, extra); // send the extra length bits
-                    }
-                    dist = zip_d_buf[dx++];
-            // Here, dist is the match distance - 1
-                    code = zip_D_CODE(dist);
-    //    Assert (code < D_CODES, "bad d_code");
-
-                    zip_SEND_CODE(code, dtree);      // send the distance code
-                    extra = zip_extra_dbits[code];
-                    if (extra !== 0) {
-                        dist -= zip_base_dist[code];
-                        zip_send_bits(dist, extra);   // send the extra distance bits
-                    }
-                } // literal or match pair ?
-                flag >>= 1;
-            } while (lx < zip_last_lit);
-        }
-
-        zip_SEND_CODE(zip_END_BLOCK, ltree);
-    };
-
-      /* ==========================================================================
-       * Send a literal or distance tree in compressed form, using the codes in
-       * bl_tree.
-       */
-    var zip_send_tree = function (tree, // the tree to be scanned
-               max_code) { // and its largest code of non zero frequency
-            var n;            // iterates over all tree elements
-            var prevlen = -1;        // last emitted length
-            var curlen;            // length of current code
-            var nextlen = tree[0].dl;    // length of next code
-            var count = 0;        // repeat count of the current code
-            var max_count = 7;        // max repeat count
-            var min_count = 4;        // min repeat count
-
-            /* tree[max_code+1].dl = -1; */  /* guard already set */
-            if (nextlen === 0) {
-                max_count = 138;
-                min_count = 3;
-            }
-
-            for (n = 0; n <= max_code; n++) {
-                curlen = nextlen;
-                nextlen = tree[n + 1].dl;
-                if (++count < max_count && curlen === nextlen) {
-                    continue;
-                } else if (count < min_count) {
-                    do {
-                        zip_SEND_CODE(curlen, zip_bl_tree);
-                    } while (--count !== 0);
-                } else if (curlen !== 0) {
-                    if (curlen !== prevlen) {
-                        zip_SEND_CODE(curlen, zip_bl_tree);
-                        count--;
-                    }
-                    // Assert(count >= 3 && count <= 6, " 3_6?");
-                    zip_SEND_CODE(zip_REP_3_6, zip_bl_tree);
-                    zip_send_bits(count - 3, 2);
-                } else if (count <= 10) {
-                    zip_SEND_CODE(zip_REPZ_3_10, zip_bl_tree);
-                    zip_send_bits(count - 3, 3);
-                } else {
-                    zip_SEND_CODE(zip_REPZ_11_138, zip_bl_tree);
-                    zip_send_bits(count - 11, 7);
-                }
-                count = 0;
-                prevlen = curlen;
-                if (nextlen === 0) {
-                    max_count = 138;
-                    min_count = 3;
-                } else if (curlen === nextlen) {
-                    max_count = 6;
-                    min_count = 3;
-                } else {
-                    max_count = 7;
-                    min_count = 4;
-                }
-            }
-        };
-
-    /* ==========================================================================
-     * Send the header for a block using dynamic Huffman trees: the counts, the
-     * lengths of the bit length codes, the literal tree and the distance tree.
-     * IN assertion: lcodes >= 257, dcodes >= 1, blcodes >= 4.
-     */
-    var zip_send_all_trees = function (lcodes, dcodes, blcodes) { // number of codes for each tree
-        var rank; // index in bl_order
-
-    //    Assert (lcodes >= 257 && dcodes >= 1 && blcodes >= 4, "not enough codes");
-    //    Assert (lcodes <= L_CODES && dcodes <= D_CODES && blcodes <= BL_CODES,
-    //        "too many codes");
-    //    Tracev((stderr, "\nbl counts: "));
-        zip_send_bits(lcodes - 257, 5); // not +255 as stated in appnote.txt
-        zip_send_bits(dcodes - 1,   5);
-        zip_send_bits(blcodes - 4,  4); // not -3 as stated in appnote.txt
-        for (rank = 0; rank < blcodes; rank++) {
-    //      Tracev((stderr, "\nbl code %2d ", bl_order[rank]));
-            zip_send_bits(zip_bl_tree[zip_bl_order[rank]].dl, 3);
-        }
-
-        // send the literal tree
-        zip_send_tree(zip_dyn_ltree, lcodes - 1);
-
-        // send the distance tree
-        zip_send_tree(zip_dyn_dtree, dcodes - 1);
-    };
-
-    /* ==========================================================================
-     * Initialize a new block.
-     */
-    var zip_init_block = function () {
-        var n; // iterates over tree elements
-
-        // Initialize the trees.
-        for (n = 0; n < zip_L_CODES;  n++) {
-            zip_dyn_ltree[n].fc = 0;
-        }
-        for (n = 0; n < zip_D_CODES;  n++) {
-            zip_dyn_dtree[n].fc = 0;
-        }
-        for (n = 0; n < zip_BL_CODES; n++) {
-            zip_bl_tree[n].fc = 0;
-        }
-
-        zip_dyn_ltree[zip_END_BLOCK].fc = 1;
-        zip_opt_len = zip_static_len = 0;
-        zip_last_lit = zip_last_dist = zip_last_flags = 0;
-        zip_flags = 0;
-        zip_flag_bit = 1;
-    };
-
-    /* ==========================================================================
-     * Determine the best encoding for the current block: dynamic trees, static
-     * trees or store, and output the encoded block to the zip file.
-     */
-    var zip_flush_block = function (eof) { // true if this is the last block for a file
-        var opt_lenb, static_lenb; // opt_len and static_len in bytes
-        var max_blindex;    // index of last bit length code of non zero freq
-        var stored_len;    // length of input block
-
-        stored_len = zip_strstart - zip_block_start;
-        zip_flag_buf[zip_last_flags] = zip_flags; // Save the flags for the last 8 items
-
-        // Construct the literal and distance trees
-        zip_build_tree(zip_l_desc);
-    //    Tracev((stderr, "\nlit data: dyn %ld, stat %ld",
-    //        encoder->opt_len, encoder->static_len));
-
-        zip_build_tree(zip_d_desc);
-    //    Tracev((stderr, "\ndist data: dyn %ld, stat %ld",
-    //        encoder->opt_len, encoder->static_len));
-        /* At this point, opt_len and static_len are the total bit lengths of
-         * the compressed block data, excluding the tree representations.
-         */
-
-        /* Build the bit length tree for the above two trees, and get the index
-         * in bl_order of the last bit length code to send.
-         */
-        max_blindex = zip_build_bl_tree();
-
-        // Determine the best encoding. Compute first the block length in bytes
-        opt_lenb    = (zip_opt_len    + 3 + 7) >> 3;
-        static_lenb = (zip_static_len + 3 + 7) >> 3;
-
-    //    Trace((stderr, "\nopt %lu(%lu) stat %lu(%lu) stored %lu lit %u dist %u ",
-    //       opt_lenb, encoder->opt_len,
-    //       static_lenb, encoder->static_len, stored_len,
-    //       encoder->last_lit, encoder->last_dist));
-
-        if (static_lenb <= opt_lenb) {
-            opt_lenb = static_lenb;
-        }
-        if (stored_len + 4 <= opt_lenb // 4: two words for the lengths
-                && zip_block_start >= 0) {
-            var i;
-
-        /* The test buf != NULL is only necessary if LIT_BUFSIZE > WSIZE.
-         * Otherwise we can't have processed more than WSIZE input bytes since
-         * the last block flush, because compression would have been
-         * successful. If LIT_BUFSIZE <= WSIZE, it is never too late to
-         * transform a block into a stored block.
-         */
-            zip_send_bits((zip_STORED_BLOCK << 1) + eof, 3);  /* send block type */
-            zip_bi_windup();         /* align on byte boundary */
-            zip_put_short(stored_len);
-            zip_put_short(~stored_len);
-
-          // copy block
-    /*
-          p = &window[block_start];
-          for (i = 0; i < stored_len; i++)
-        put_byte(p[i]);
-    */
-            for (i = 0; i < stored_len; i++) {
-                zip_put_byte(zip_window[zip_block_start + i]);
-            }
-
-        } else if (static_lenb === opt_lenb) {
-            zip_send_bits((zip_STATIC_TREES << 1) + eof, 3);
-            zip_compress_block(zip_static_ltree, zip_static_dtree);
-        } else {
-            zip_send_bits((zip_DYN_TREES << 1) + eof, 3);
-            zip_send_all_trees(zip_l_desc.max_code + 1,
-                   zip_d_desc.max_code + 1,
-                   max_blindex + 1);
-            zip_compress_block(zip_dyn_ltree, zip_dyn_dtree);
-        }
-
-        zip_init_block();
-
-        if (eof !== 0) {
-            zip_bi_windup();
-        }
-    };
-
-    /* ==========================================================================
-     * Processes a new input file and return its compressed length. This
-     * function does not perform lazy evaluationof matches and inserts
-     * new strings in the dictionary only for unmatched strings or for short
-     * matches. It is used only for the fast compression options.
-     */
-    var zip_deflate_fast = function () {
-        while (zip_lookahead !== 0 && zip_qhead === null) {
-            var flush; // set if current block must be flushed
-
-        /* Insert the string window[strstart .. strstart+2] in the
-         * dictionary, and set hash_head to the head of the hash chain:
-         */
-            zip_INSERT_STRING();
-
-        /* Find the longest match, discarding those <= prev_length.
-         * At this point we have always match_length < MIN_MATCH
-         */
-            if (zip_hash_head !== zip_NIL &&
-                    zip_strstart - zip_hash_head <= zip_MAX_DIST) {
-            /* To simplify the code, we prevent matches with the string
-             * of window index 0 (in particular we have to avoid a match
-             * of the string with itself at the start of the input file).
-             */
-                zip_match_length = zip_longest_match(zip_hash_head);
-            /* longest_match() sets match_start */
-                if (zip_match_length > zip_lookahead) {
-                    zip_match_length = zip_lookahead;
-                }
-            }
-            if (zip_match_length >= zip_MIN_MATCH) {
-    //        check_match(strstart, match_start, match_length);
-
-                flush = zip_ct_tally(zip_strstart - zip_match_start,
-                     zip_match_length - zip_MIN_MATCH);
-                zip_lookahead -= zip_match_length;
-
-            /* Insert new strings in the hash table only if the match length
-             * is not too large. This saves time but degrades compression.
-             */
-                if (zip_match_length <= zip_max_lazy_match) {
-                    zip_match_length--; // string at strstart already in hash table
-                    do {
-                        zip_strstart++;
-                        zip_INSERT_STRING();
-                /* strstart never exceeds WSIZE-MAX_MATCH, so there are
-                 * always MIN_MATCH bytes ahead. If lookahead < MIN_MATCH
-                 * these bytes are garbage, but it does not matter since
-                 * the next lookahead bytes will be emitted as literals.
-                 */
-                    } while (--zip_match_length !== 0);
-                    zip_strstart++;
-                } else {
-                    zip_strstart += zip_match_length;
-                    zip_match_length = 0;
-                    zip_ins_h = zip_window[zip_strstart] & 0xff;
-    //        UPDATE_HASH(ins_h, window[strstart + 1]);
-                    zip_ins_h = ((zip_ins_h << zip_H_SHIFT) ^ (zip_window[zip_strstart + 1] & 0xff)) & zip_HASH_MASK;
-
-    //#if MIN_MATCH != 3
-    //        Call UPDATE_HASH() MIN_MATCH-3 more times
-    //#endif
-
-                }
-            } else {
-            /* No match, output a literal byte */
-                flush = zip_ct_tally(0, zip_window[zip_strstart] & 0xff);
-                zip_lookahead--;
-                zip_strstart++;
-            }
-            if (flush) {
-                zip_flush_block(0);
-                zip_block_start = zip_strstart;
-            }
-
-        /* Make sure that we always have enough lookahead, except
-         * at the end of the input file. We need MAX_MATCH bytes
-         * for the next match, plus MIN_MATCH bytes to insert the
-         * string following the next match.
-         */
-            while (zip_lookahead < zip_MIN_LOOKAHEAD && !zip_eofile) {
-                zip_fill_window();
-            }
-        }
-    };
-
-    var zip_deflate_better = function () {
-        /* Process the input block. */
-        while (zip_lookahead !== 0 && zip_qhead === null) {
-        /* Insert the string window[strstart .. strstart+2] in the
-         * dictionary, and set hash_head to the head of the hash chain:
-         */
-            zip_INSERT_STRING();
-
-        /* Find the longest match, discarding those <= prev_length.
-         */
-            zip_prev_length = zip_match_length;
-            zip_prev_match = zip_match_start;
-            zip_match_length = zip_MIN_MATCH - 1;
-
-            if (zip_hash_head !== zip_NIL &&
-                    zip_prev_length < zip_max_lazy_match &&
-                    zip_strstart - zip_hash_head <= zip_MAX_DIST) {
-            /* To simplify the code, we prevent matches with the string
-             * of window index 0 (in particular we have to avoid a match
-             * of the string with itself at the start of the input file).
-             */
-                zip_match_length = zip_longest_match(zip_hash_head);
-            /* longest_match() sets match_start */
-                if (zip_match_length > zip_lookahead) {
-                    zip_match_length = zip_lookahead;
-                }
-
-            /* Ignore a length 3 match if it is too distant: */
-                if (zip_match_length === zip_MIN_MATCH &&
-                        zip_strstart - zip_match_start > zip_TOO_FAR) {
-            /* If prev_match is also MIN_MATCH, match_start is garbage
-             * but we will ignore the current match anyway.
-             */
-                    zip_match_length--;
-                }
-            }
-        /* If there was a match at the previous step and the current
-         * match is not better, output the previous match:
-         */
-            if (zip_prev_length >= zip_MIN_MATCH &&
-                     zip_match_length <= zip_prev_length) {
-                var flush; // set if current block must be flushed
-
-    //        check_match(strstart - 1, prev_match, prev_length);
-                flush = zip_ct_tally(zip_strstart - 1 - zip_prev_match,
-                     zip_prev_length - zip_MIN_MATCH);
-
-            /* Insert in hash table all strings up to the end of the match.
-             * strstart-1 and strstart are already inserted.
-             */
-                zip_lookahead -= zip_prev_length - 1;
-                zip_prev_length -= 2;
-                do {
-                    zip_strstart++;
-                    zip_INSERT_STRING();
-            /* strstart never exceeds WSIZE-MAX_MATCH, so there are
-             * always MIN_MATCH bytes ahead. If lookahead < MIN_MATCH
-             * these bytes are garbage, but it does not matter since the
-             * next lookahead bytes will always be emitted as literals.
-             */
-                } while (--zip_prev_length !== 0);
-                zip_match_available = 0;
-                zip_match_length = zip_MIN_MATCH - 1;
-                zip_strstart++;
-                if (flush) {
-                    zip_flush_block(0);
-                    zip_block_start = zip_strstart;
-                }
-            } else if (zip_match_available !== 0) {
-            /* If there was no match at the previous position, output a
-             * single literal. If there was a match but the current match
-             * is longer, truncate the previous match to a single literal.
-             */
-                if (zip_ct_tally(0, zip_window[zip_strstart - 1] & 0xff)) {
-                    zip_flush_block(0);
-                    zip_block_start = zip_strstart;
-                }
-                zip_strstart++;
-                zip_lookahead--;
-            } else {
-            /* There is no previous match to compare with, wait for
-             * the next step to decide.
-             */
-                zip_match_available = 1;
-                zip_strstart++;
-                zip_lookahead--;
-            }
-
-        /* Make sure that we always have enough lookahead, except
-         * at the end of the input file. We need MAX_MATCH bytes
-         * for the next match, plus MIN_MATCH bytes to insert the
-         * string following the next match.
-         */
-            while (zip_lookahead < zip_MIN_LOOKAHEAD && !zip_eofile) {
-                zip_fill_window();
-            }
-        }
-    };
-
-    /* ==========================================================================
-     * Allocate the match buffer, initialize the various tables and save the
-     * location of the internal file attribute (ascii/binary) and method
-     * (DEFLATE/STORE).
-     */
-    var zip_ct_init = function () {
-        var n;    // iterates over tree elements
-        var bits;    // bit counter
-        var length;    // length value
-        var code;    // code value
-        var dist;    // distance index
-
-        if (zip_static_dtree[0].dl !== 0) {
-            return; // ct_init already called
-        }
-
-        zip_l_desc.dyn_tree        = zip_dyn_ltree;
-        zip_l_desc.static_tree    = zip_static_ltree;
-        zip_l_desc.extra_bits    = zip_extra_lbits;
-        zip_l_desc.extra_base    = zip_LITERALS + 1;
-        zip_l_desc.elems        = zip_L_CODES;
-        zip_l_desc.max_length    = zip_MAX_BITS;
-        zip_l_desc.max_code        = 0;
-
-        zip_d_desc.dyn_tree        = zip_dyn_dtree;
-        zip_d_desc.static_tree    = zip_static_dtree;
-        zip_d_desc.extra_bits    = zip_extra_dbits;
-        zip_d_desc.extra_base    = 0;
-        zip_d_desc.elems        = zip_D_CODES;
-        zip_d_desc.max_length    = zip_MAX_BITS;
-        zip_d_desc.max_code        = 0;
-
-        zip_bl_desc.dyn_tree    = zip_bl_tree;
-        zip_bl_desc.static_tree    = null;
-        zip_bl_desc.extra_bits    = zip_extra_blbits;
-        zip_bl_desc.extra_base    = 0;
-        zip_bl_desc.elems        = zip_BL_CODES;
-        zip_bl_desc.max_length    = zip_MAX_BL_BITS;
-        zip_bl_desc.max_code    = 0;
-
-        // Initialize the mapping length (0..255) -> length code (0..28)
-        length = 0;
-        for (code = 0; code < zip_LENGTH_CODES - 1; code++) {
-            zip_base_length[code] = length;
-            for (n = 0; n < (1 << zip_extra_lbits[code]); n++) {
-                zip_length_code[length++] = code;
-            }
-        }
-        // Assert (length == 256, "ct_init: length != 256");
-
-        /* Note that the length 255 (match length 258) can be represented
-         * in two different ways: code 284 + 5 bits or code 285, so we
-         * overwrite length_code[255] to use the best encoding:
-         */
-        zip_length_code[length - 1] = code;
-
-        /* Initialize the mapping dist (0..32K) -> dist code (0..29) */
-        dist = 0;
-        for (code = 0; code < 16; code++) {
-            zip_base_dist[code] = dist;
-            for (n = 0; n < (1 << zip_extra_dbits[code]); n++) {
-                zip_dist_code[dist++] = code;
-            }
-        }
-        // Assert (dist == 256, "ct_init: dist != 256");
-        dist >>= 7; // from now on, all distances are divided by 128
-        n = code;
-        for (code = n; code < zip_D_CODES; code++) {
-            zip_base_dist[code] = dist << 7;
-            for (n = 0; n < (1 << (zip_extra_dbits[code] - 7)); n++) {
-                zip_dist_code[256 + dist++] = code;
-            }
-        }
-        // Assert (dist == 256, "ct_init: 256+dist != 512");
-
-        // Construct the codes of the static literal tree
-        for (bits = 0; bits <= zip_MAX_BITS; bits++) {
-            zip_bl_count[bits] = 0;
-        }
-        n = 0;
-        while (n <= 143) {
-            zip_static_ltree[n++].dl = 8;
-            zip_bl_count[8]++;
-        }
-        while (n <= 255) {
-            zip_static_ltree[n++].dl = 9;
-            zip_bl_count[9]++;
-        }
-        while (n <= 279) {
-            zip_static_ltree[n++].dl = 7;
-            zip_bl_count[7]++;
-        }
-        while (n <= 287) {
-            zip_static_ltree[n++].dl = 8;
-            zip_bl_count[8]++;
-        }
-        /* Codes 286 and 287 do not exist, but we must include them in the
-         * tree construction to get a canonical Huffman tree (longest code
-         * all ones)
-         */
-        zip_gen_codes(zip_static_ltree, zip_L_CODES + 1);
-
-        /* The static distance tree is trivial: */
-        for (n = 0; n < zip_D_CODES; n++) {
-            zip_static_dtree[n].dl = 5;
-            zip_static_dtree[n].fc = zip_bi_reverse(n, 5);
-        }
-
-        // Initialize the first block of the first file:
-        zip_init_block();
-    };
-
-
-    var zip_init_deflate = function () {
-        if (zip_eofile) {
-            return;
-        }
-        zip_bi_buf = 0;
-        zip_bi_valid = 0;
-        zip_ct_init();
-        zip_lm_init();
-
-        zip_qhead = null;
-        zip_outcnt = 0;
-        zip_outoff = 0;
-
-        if (zip_compr_level <= 3) {
-            zip_prev_length = zip_MIN_MATCH - 1;
-            zip_match_length = 0;
-        } else {
-            zip_match_length = zip_MIN_MATCH - 1;
-            zip_match_available = 0;
-        }
-
-        zip_complete = false;
-    };
-
-    var zip_qcopy = function (buff, off, buff_size) {
-        var n, i, j;
-
-        n = 0;
-        while (zip_qhead !== null && n < buff_size) {
-            i = buff_size - n;
-            if (i > zip_qhead.len) {
-                i = zip_qhead.len;
-            }
-    //      System.arraycopy(qhead.ptr, qhead.off, buff, off + n, i);
-            for (j = 0; j < i; j++) {
-                buff[off + n + j] = zip_qhead.ptr[zip_qhead.off + j];
-            }
-
-            zip_qhead.off += i;
-            zip_qhead.len -= i;
-            n += i;
-            if (zip_qhead.len === 0) {
-                var p;
-                p = zip_qhead;
-                zip_qhead = zip_qhead.next;
-                zip_reuse_queue(p);
-            }
-        }
-
-        if (n === buff_size) {
-            return n;
-        }
-
-        if (zip_outoff < zip_outcnt) {
-            i = buff_size - n;
-            if (i > zip_outcnt - zip_outoff) {
-                i = zip_outcnt - zip_outoff;
-            }
-        // System.arraycopy(outbuf, outoff, buff, off + n, i);
-            for (j = 0; j < i; j++) {
-                buff[off + n + j] = zip_outbuf[zip_outoff + j];
-            }
-            zip_outoff += i;
-            n += i;
-            if (zip_outcnt === zip_outoff) {
-                zip_outcnt = zip_outoff = 0;
-            }
-        }
-        return n;
-    };
-
-    /* ==========================================================================
-     * Same as above, but achieves better compression. We use a lazy
-     * evaluation for matches: a match is finally adopted only if there is
-     * no better match at the next window position.
-     */
-    var zip_deflate_internal = function (buff, off, buff_size) {
-        var n;
-
-        if (!zip_initflag) {
-            zip_init_deflate();
-            zip_initflag = true;
-            if (zip_lookahead === 0) { // empty
-                zip_complete = true;
-                return 0;
-            }
-        }
-
-        if ((n = zip_qcopy(buff, off, buff_size)) === buff_size) {
-            return buff_size;
-        }
-
-        if (zip_complete) {
-            return n;
-        }
-
-        if (zip_compr_level <= 3) { // optimized for speed
-            zip_deflate_fast();
-        } else {
-            zip_deflate_better();
-        }
-        if (zip_lookahead === 0) {
-            if (zip_match_available !== 0) {
-                zip_ct_tally(0, zip_window[zip_strstart - 1] & 0xff);
-            }
-            zip_flush_block(1);
-            zip_complete = true;
-        }
-        return n + zip_qcopy(buff, n + off, buff_size - n);
-    };
-
-    var zip_deflate = function (str, level) {
-        var i, j;
-
-        zip_deflate_data = str;
-        zip_deflate_pos = 0;
-        if (typeof level === "undefined") {
-            level = zip_DEFAULT_LEVEL;
-        }
-        zip_deflate_start(level);
-
-        var buff = new Array(1024);
-        var aout = [];
-        while ((i = zip_deflate_internal(buff, 0, buff.length)) > 0) {
-            var cbuf = [];
-            cbuf.length = i;
-            for (j = 0; j < i; j++) {
-                cbuf[j] = String.fromCharCode(buff[j]);
-            }
-            aout[aout.length] = cbuf.join("");
-        }
-        zip_deflate_data = null; // G.C.
-        return aout.join("");
-    };
-
-    this.deflate = zip_deflate;
-};
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/core/RawInflate.js b/apps/files_odfviewer/src/webodf/webodf/lib/core/RawInflate.js
deleted file mode 100644
index 0005ea56ea..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/lib/core/RawInflate.js
+++ /dev/null
@@ -1,790 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global core*/
-/*
- * $Id: rawinflate.js,v 0.2 2009/03/01 18:32:24 dankogai Exp $
- *
- * original:
- * http://www.onicos.com/staff/iz/amuse/javascript/expert/inflate.txt
- */
-
-/**
- * @constructor
- */
-core.RawInflate = function RawInflate() {
-
-/* Copyright (C) 1999 Masanao Izumo <iz@onicos.co.jp>
- * Version: 1.0.0.1
- * LastModified: Dec 25 1999
- */
-
-/* Interface:
- * data = zip_inflate(src);
- */
-
-/* constant parameters */
-var zip_WSIZE = 32768;		// Sliding Window size
-var zip_STORED_BLOCK = 0;
-var zip_STATIC_TREES = 1;
-var zip_DYN_TREES    = 2;
-
-/* for inflate */
-var zip_lbits = 9; 		// bits in base literal/length lookup table
-var zip_dbits = 6; 		// bits in base distance lookup table
-var zip_INBUFSIZ = 32768;	// Input buffer size
-var zip_INBUF_EXTRA = 64;	// Extra buffer
-
-/* variables (inflate) */
-var zip_slide;
-var zip_wp;			// current position in slide
-var zip_fixed_tl = null;	// inflate static
-var zip_fixed_td;		// inflate static
-var zip_fixed_bl, fixed_bd;	// inflate static
-var zip_bit_buf;		// bit buffer
-var zip_bit_len;		// bits in bit buffer
-var zip_method;
-var zip_eof;
-var zip_copy_leng;
-var zip_copy_dist;
-var zip_tl, zip_td;	// literal/length and distance decoder tables
-var zip_bl, zip_bd;	// number of bits decoded by tl and td
-
-var zip_inflate_data;
-var zip_inflate_pos;
-
-
-/* constant tables (inflate) */
-var zip_MASK_BITS = new Array(
-    0x0000,
-    0x0001, 0x0003, 0x0007, 0x000f, 0x001f, 0x003f, 0x007f, 0x00ff,
-    0x01ff, 0x03ff, 0x07ff, 0x0fff, 0x1fff, 0x3fff, 0x7fff, 0xffff);
-// Tables for deflate from PKZIP's appnote.txt.
-var zip_cplens = new Array( // Copy lengths for literal codes 257..285
-    3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31,
-    35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0);
-/* note: see note #13 above about the 258 in this list. */
-var zip_cplext = new Array( // Extra bits for literal codes 257..285
-    0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2,
-    3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 0, 99, 99); // 99==invalid
-var zip_cpdist = new Array( // Copy offsets for distance codes 0..29
-    1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
-    257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
-    8193, 12289, 16385, 24577);
-var zip_cpdext = new Array( // Extra bits for distance codes
-    0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6,
-    7, 7, 8, 8, 9, 9, 10, 10, 11, 11,
-    12, 12, 13, 13);
-var zip_border = new Array(  // Order of the bit length code lengths
-    16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15);
-/* objects (inflate) */
-
-/**
- * @constructor
- */
-var zip_HuftList = function() {
-    this.next = null;
-    this.list = null;
-}
-
-/**
- * @constructor
- */
-var zip_HuftNode = function() {
-    this.e = 0; // number of extra bits or operation
-    this.b = 0; // number of bits in this code or subcode
-
-    // union
-    this.n = 0; // literal, length base, or distance base
-    this.t = null; // (zip_HuftNode) pointer to next level of table
-}
-
-/**
- * @constructor
- */
-var zip_HuftBuild = function(b,	// code lengths in bits (all assumed <= BMAX)
-		       n,	// number of codes (assumed <= N_MAX)
-		       s,	// number of simple-valued codes (0..s-1)
-		       d,	// list of base values for non-simple codes
-		       e,	// list of extra bits for non-simple codes
-		       mm	// maximum lookup bits
-		   ) {
-    this.BMAX = 16;   // maximum bit length of any code
-    this.N_MAX = 288; // maximum number of codes in any set
-    this.status = 0;	// 0: success, 1: incomplete table, 2: bad input
-    this.root = null;	// (zip_HuftList) starting table
-    this.m = 0;		// maximum lookup bits, returns actual
-
-/* Given a list of code lengths and a maximum table size, make a set of
-   tables to decode that set of codes.	Return zero on success, one if
-   the given code set is incomplete (the tables are still built in this
-   case), two if the input is invalid (all zero length codes or an
-   oversubscribed set of lengths), and three if not enough memory.
-   The code with value 256 is special, and the tables are constructed
-   so that no bits beyond that code are fetched when that code is
-   decoded. */
-    {
-	var a;			// counter for codes of length k
-	var c = new Array(this.BMAX+1);	// bit length count table
-	var el;			// length of EOB code (value 256)
-	var f;			// i repeats in table every f entries
-	var g;			// maximum code length
-	var h;			// table level
-	var i;			// counter, current code
-	var j;			// counter
-	var k;			// number of bits in current code
-	var lx = new Array(this.BMAX+1);	// stack of bits per table
-	var p;			// pointer into c[], b[], or v[]
-	var pidx;		// index of p
-	var q;			// (zip_HuftNode) points to current table
-	var r = new zip_HuftNode(); // table entry for structure assignment
-	var u = new Array(this.BMAX); // zip_HuftNode[BMAX][]  table stack
-	var v = new Array(this.N_MAX); // values in order of bit length
-	var w;
-	var x = new Array(this.BMAX+1);// bit offsets, then code stack
-	var xp;			// pointer into x or c
-	var y;			// number of dummy codes added
-	var z;			// number of entries in current table
-	var o;
-	var tail;		// (zip_HuftList)
-
-	tail = this.root = null;
-	for(i = 0; i < c.length; i++)
-	    c[i] = 0;
-	for(i = 0; i < lx.length; i++)
-	    lx[i] = 0;
-	for(i = 0; i < u.length; i++)
-	    u[i] = null;
-	for(i = 0; i < v.length; i++)
-	    v[i] = 0;
-	for(i = 0; i < x.length; i++)
-	    x[i] = 0;
-
-	// Generate counts for each bit length
-	el = n > 256 ? b[256] : this.BMAX; // set length of EOB code, if any
-	p = b; pidx = 0;
-	i = n;
-	do {
-	    c[p[pidx]]++;	// assume all entries <= BMAX
-	    pidx++;
-	} while(--i > 0);
-	if(c[0] == n) {	// null input--all zero length codes
-	    this.root = null;
-	    this.m = 0;
-	    this.status = 0;
-	    return;
-	}
-
-	// Find minimum and maximum length, bound *m by those
-	for(j = 1; j <= this.BMAX; j++)
-	    if(c[j] != 0)
-		break;
-	k = j;			// minimum code length
-	if(mm < j)
-	    mm = j;
-	for(i = this.BMAX; i != 0; i--)
-	    if(c[i] != 0)
-		break;
-	g = i;			// maximum code length
-	if(mm > i)
-	    mm = i;
-
-	// Adjust last length count to fill out codes, if needed
-	for(y = 1 << j; j < i; j++, y <<= 1)
-	    if((y -= c[j]) < 0) {
-		this.status = 2;	// bad input: more codes than bits
-		this.m = mm;
-		return;
-	    }
-	if((y -= c[i]) < 0) {
-	    this.status = 2;
-	    this.m = mm;
-	    return;
-	}
-	c[i] += y;
-
-	// Generate starting offsets into the value table for each length
-	x[1] = j = 0;
-	p = c;
-	pidx = 1;
-	xp = 2;
-	while(--i > 0)		// note that i == g from above
-	    x[xp++] = (j += p[pidx++]);
-
-	// Make a table of values in order of bit lengths
-	p = b; pidx = 0;
-	i = 0;
-	do {
-	    if((j = p[pidx++]) != 0)
-		v[x[j]++] = i;
-	} while(++i < n);
-	n = x[g];			// set n to length of v
-
-	// Generate the Huffman codes and for each, make the table entries
-	x[0] = i = 0;		// first Huffman code is zero
-	p = v; pidx = 0;		// grab values in bit order
-	h = -1;			// no tables yet--level -1
-	w = lx[0] = 0;		// no bits decoded yet
-	q = null;			// ditto
-	z = 0;			// ditto
-
-	// go through the bit lengths (k already is bits in shortest code)
-	for(; k <= g; k++) {
-	    a = c[k];
-	    while(a-- > 0) {
-		// here i is the Huffman code of length k bits for value p[pidx]
-		// make tables up to required level
-		while(k > w + lx[1 + h]) {
-		    w += lx[1 + h]; // add bits already decoded
-		    h++;
-
-		    // compute minimum size table less than or equal to *m bits
-		    z = (z = g - w) > mm ? mm : z; // upper limit
-		    if((f = 1 << (j = k - w)) > a + 1) { // try a k-w bit table
-			// too few codes for k-w bit table
-			f -= a + 1;	// deduct codes from patterns left
-			xp = k;
-			while(++j < z) { // try smaller tables up to z bits
-			    if((f <<= 1) <= c[++xp])
-				break;	// enough codes to use up j bits
-			    f -= c[xp];	// else deduct codes from patterns
-			}
-		    }
-		    if(w + j > el && w < el)
-			j = el - w;	// make EOB code end at table
-		    z = 1 << j;	// table entries for j-bit table
-		    lx[1 + h] = j; // set table size in stack
-
-		    // allocate and link in new table
-		    q = new Array(z);
-		    for(o = 0; o < z; o++) {
-			q[o] = new zip_HuftNode();
-		    }
-
-		    if(tail == null)
-			tail = this.root = new zip_HuftList();
-		    else
-			tail = tail.next = new zip_HuftList();
-		    tail.next = null;
-		    tail.list = q;
-		    u[h] = q;	// table starts after link
-
-		    /* connect to last table, if there is one */
-		    if(h > 0) {
-			x[h] = i;		// save pattern for backing up
-			r.b = lx[h];	// bits to dump before this table
-			r.e = 16 + j;	// bits in this table
-			r.t = q;		// pointer to this table
-			j = (i & ((1 << w) - 1)) >> (w - lx[h]);
-			u[h-1][j].e = r.e;
-			u[h-1][j].b = r.b;
-			u[h-1][j].n = r.n;
-			u[h-1][j].t = r.t;
-		    }
-		}
-
-		// set up table entry in r
-		r.b = k - w;
-		if(pidx >= n)
-		    r.e = 99;		// out of values--invalid code
-		else if(p[pidx] < s) {
-		    r.e = (p[pidx] < 256 ? 16 : 15); // 256 is end-of-block code
-		    r.n = p[pidx++];	// simple code is just the value
-		} else {
-		    r.e = e[p[pidx] - s];	// non-simple--look up in lists
-		    r.n = d[p[pidx++] - s];
-		}
-
-		// fill code-like entries with r //
-		f = 1 << (k - w);
-		for(j = i >> w; j < z; j += f) {
-		    q[j].e = r.e;
-		    q[j].b = r.b;
-		    q[j].n = r.n;
-		    q[j].t = r.t;
-		}
-
-		// backwards increment the k-bit code i
-		for(j = 1 << (k - 1); (i & j) != 0; j >>= 1)
-		    i ^= j;
-		i ^= j;
-
-		// backup over finished tables
-		while((i & ((1 << w) - 1)) != x[h]) {
-		    w -= lx[h];		// don't need to update q
-		    h--;
-		}
-	    }
-	}
-
-	/* return actual size of base table */
-	this.m = lx[1];
-
-	/* Return true (1) if we were given an incomplete table */
-	this.status = ((y != 0 && g != 1) ? 1 : 0);
-    } /* end of constructor */
-}
-
-
-/* routines (inflate) */
-
-var zip_GET_BYTE = function() {
-    if(zip_inflate_data.length == zip_inflate_pos)
-	return -1;
-    return zip_inflate_data[zip_inflate_pos++];
-}
-
-var zip_NEEDBITS = function(n) {
-    while(zip_bit_len < n) {
-	zip_bit_buf |= zip_GET_BYTE() << zip_bit_len;
-	zip_bit_len += 8;
-    }
-}
-
-var zip_GETBITS = function(n) {
-    return zip_bit_buf & zip_MASK_BITS[n];
-}
-
-var zip_DUMPBITS = function(n) {
-    zip_bit_buf >>= n;
-    zip_bit_len -= n;
-}
-
-var zip_inflate_codes = function(buff, off, size) {
-    /* inflate (decompress) the codes in a deflated (compressed) block.
-       Return an error code or zero if it all goes ok. */
-    var e;		// table entry flag/number of extra bits
-    var t;		// (zip_HuftNode) pointer to table entry
-    var n;
-
-    if(size == 0)
-      return 0;
-
-    // inflate the coded data
-    n = 0;
-    for(;;) {			// do until end of block
-	zip_NEEDBITS(zip_bl);
-	t = zip_tl.list[zip_GETBITS(zip_bl)];
-	e = t.e;
-	while(e > 16) {
-	    if(e == 99)
-		return -1;
-	    zip_DUMPBITS(t.b);
-	    e -= 16;
-	    zip_NEEDBITS(e);
-	    t = t.t[zip_GETBITS(e)];
-	    e = t.e;
-	}
-	zip_DUMPBITS(t.b);
-
-	if(e == 16) {		// then it's a literal
-	    zip_wp &= zip_WSIZE - 1;
-	    buff[off + n++] = zip_slide[zip_wp++] = t.n;
-	    if(n == size)
-		return size;
-	    continue;
-	}
-
-	// exit if end of block
-	if(e == 15)
-	    break;
-
-	// it's an EOB or a length
-
-	// get length of block to copy
-	zip_NEEDBITS(e);
-	zip_copy_leng = t.n + zip_GETBITS(e);
-	zip_DUMPBITS(e);
-
-	// decode distance of block to copy
-	zip_NEEDBITS(zip_bd);
-	t = zip_td.list[zip_GETBITS(zip_bd)];
-	e = t.e;
-
-	while(e > 16) {
-	    if(e == 99)
-		return -1;
-	    zip_DUMPBITS(t.b);
-	    e -= 16;
-	    zip_NEEDBITS(e);
-	    t = t.t[zip_GETBITS(e)];
-	    e = t.e;
-	}
-	zip_DUMPBITS(t.b);
-	zip_NEEDBITS(e);
-	zip_copy_dist = zip_wp - t.n - zip_GETBITS(e);
-	zip_DUMPBITS(e);
-
-	// do the copy
-	while(zip_copy_leng > 0 && n < size) {
-	    zip_copy_leng--;
-	    zip_copy_dist &= zip_WSIZE - 1;
-	    zip_wp &= zip_WSIZE - 1;
-	    buff[off + n++] = zip_slide[zip_wp++]
-		= zip_slide[zip_copy_dist++];
-	}
-
-	if(n == size)
-	    return size;
-    }
-
-    zip_method = -1; // done
-    return n;
-}
-
-var zip_inflate_stored = function(buff, off, size) {
-    /* "decompress" an inflated type 0 (stored) block. */
-    var n;
-
-    // go to byte boundary
-    n = zip_bit_len & 7;
-    zip_DUMPBITS(n);
-
-    // get the length and its complement
-    zip_NEEDBITS(16);
-    n = zip_GETBITS(16);
-    zip_DUMPBITS(16);
-    zip_NEEDBITS(16);
-    if(n != ((~zip_bit_buf) & 0xffff))
-	return -1;			// error in compressed data
-    zip_DUMPBITS(16);
-
-    // read and output the compressed data
-    zip_copy_leng = n;
-
-    n = 0;
-    while(zip_copy_leng > 0 && n < size) {
-	zip_copy_leng--;
-	zip_wp &= zip_WSIZE - 1;
-	zip_NEEDBITS(8);
-	buff[off + n++] = zip_slide[zip_wp++] =
-	    zip_GETBITS(8);
-	zip_DUMPBITS(8);
-    }
-
-    if(zip_copy_leng == 0)
-      zip_method = -1; // done
-    return n;
-}
-
-var zip_fixed_bd;
-var zip_inflate_fixed = function(buff, off, size) {
-    /* decompress an inflated type 1 (fixed Huffman codes) block.  We should
-       either replace this with a custom decoder, or at least precompute the
-       Huffman tables. */
-
-    // if first time, set up tables for fixed blocks
-    if(zip_fixed_tl == null) {
-	var i;			// temporary variable
-	var l = new Array(288);	// length list for huft_build
-	var h;	// zip_HuftBuild
-
-	// literal table
-	for(i = 0; i < 144; i++)
-	    l[i] = 8;
-	for(; i < 256; i++)
-	    l[i] = 9;
-	for(; i < 280; i++)
-	    l[i] = 7;
-	for(; i < 288; i++)	// make a complete, but wrong code set
-	    l[i] = 8;
-	zip_fixed_bl = 7;
-
-	h = new zip_HuftBuild(l, 288, 257, zip_cplens, zip_cplext,
-			      zip_fixed_bl);
-	if(h.status != 0) {
-	    alert("HufBuild error: "+h.status);
-	    return -1;
-	}
-	zip_fixed_tl = h.root;
-	zip_fixed_bl = h.m;
-
-	// distance table
-	for(i = 0; i < 30; i++)	// make an incomplete code set
-	    l[i] = 5;
-	zip_fixed_bd = 5;
-
-	h = new zip_HuftBuild(l, 30, 0, zip_cpdist, zip_cpdext, zip_fixed_bd);
-	if(h.status > 1) {
-	    zip_fixed_tl = null;
-	    alert("HufBuild error: "+h.status);
-	    return -1;
-	}
-	zip_fixed_td = h.root;
-	zip_fixed_bd = h.m;
-    }
-
-    zip_tl = zip_fixed_tl;
-    zip_td = zip_fixed_td;
-    zip_bl = zip_fixed_bl;
-    zip_bd = zip_fixed_bd;
-    return zip_inflate_codes(buff, off, size);
-}
-
-var zip_inflate_dynamic = function(buff, off, size) {
-    // decompress an inflated type 2 (dynamic Huffman codes) block.
-    var i;		// temporary variables
-    var j;
-    var l;		// last length
-    var n;		// number of lengths to get
-    var t;		// (zip_HuftNode) literal/length code table
-    var nb;		// number of bit length codes
-    var nl;		// number of literal/length codes
-    var nd;		// number of distance codes
-    var ll = new Array(286+30); // literal/length and distance code lengths
-    var h;		// (zip_HuftBuild)
-
-    for(i = 0; i < ll.length; i++)
-	ll[i] = 0;
-
-    // read in table lengths
-    zip_NEEDBITS(5);
-    nl = 257 + zip_GETBITS(5);	// number of literal/length codes
-    zip_DUMPBITS(5);
-    zip_NEEDBITS(5);
-    nd = 1 + zip_GETBITS(5);	// number of distance codes
-    zip_DUMPBITS(5);
-    zip_NEEDBITS(4);
-    nb = 4 + zip_GETBITS(4);	// number of bit length codes
-    zip_DUMPBITS(4);
-    if(nl > 286 || nd > 30)
-      return -1;		// bad lengths
-
-    // read in bit-length-code lengths
-    for(j = 0; j < nb; j++)
-    {
-	zip_NEEDBITS(3);
-	ll[zip_border[j]] = zip_GETBITS(3);
-	zip_DUMPBITS(3);
-    }
-    for(; j < 19; j++)
-	ll[zip_border[j]] = 0;
-
-    // build decoding table for trees--single level, 7 bit lookup
-    zip_bl = 7;
-    h = new zip_HuftBuild(ll, 19, 19, null, null, zip_bl);
-    if(h.status != 0)
-	return -1;	// incomplete code set
-
-    zip_tl = h.root;
-    zip_bl = h.m;
-
-    // read in literal and distance code lengths
-    n = nl + nd;
-    i = l = 0;
-    while(i < n) {
-	zip_NEEDBITS(zip_bl);
-	t = zip_tl.list[zip_GETBITS(zip_bl)];
-	j = t.b;
-	zip_DUMPBITS(j);
-	j = t.n;
-	if(j < 16)		// length of code in bits (0..15)
-	    ll[i++] = l = j;	// save last length in l
-	else if(j == 16) {	// repeat last length 3 to 6 times
-	    zip_NEEDBITS(2);
-	    j = 3 + zip_GETBITS(2);
-	    zip_DUMPBITS(2);
-	    if(i + j > n)
-		return -1;
-	    while(j-- > 0)
-		ll[i++] = l;
-	} else if(j == 17) {	// 3 to 10 zero length codes
-	    zip_NEEDBITS(3);
-	    j = 3 + zip_GETBITS(3);
-	    zip_DUMPBITS(3);
-	    if(i + j > n)
-		return -1;
-	    while(j-- > 0)
-		ll[i++] = 0;
-	    l = 0;
-	} else {		// j == 18: 11 to 138 zero length codes
-	    zip_NEEDBITS(7);
-	    j = 11 + zip_GETBITS(7);
-	    zip_DUMPBITS(7);
-	    if(i + j > n)
-		return -1;
-	    while(j-- > 0)
-		ll[i++] = 0;
-	    l = 0;
-	}
-    }
-
-    // build the decoding tables for literal/length and distance codes
-    zip_bl = zip_lbits;
-    h = new zip_HuftBuild(ll, nl, 257, zip_cplens, zip_cplext, zip_bl);
-    if(zip_bl == 0)	// no literals or lengths
-	h.status = 1;
-    if(h.status != 0) {
-	//if(h.status == 1)
-	//    ;// **incomplete literal tree**
-	return -1;		// incomplete code set
-    }
-    zip_tl = h.root;
-    zip_bl = h.m;
-
-    for(i = 0; i < nd; i++)
-	ll[i] = ll[i + nl];
-    zip_bd = zip_dbits;
-    h = new zip_HuftBuild(ll, nd, 0, zip_cpdist, zip_cpdext, zip_bd);
-    zip_td = h.root;
-    zip_bd = h.m;
-
-    if(zip_bd == 0 && nl > 257) {   // lengths but no distances
-	// **incomplete distance tree**
-	return -1;
-    }
-
-    //if(h.status == 1) {
-//	;// **incomplete distance tree**
-    //}
-    if(h.status != 0)
-	return -1;
-
-    // decompress until an end-of-block code
-    return zip_inflate_codes(buff, off, size);
-}
-
-var zip_inflate_start = function() {
-    var i;
-
-    if(zip_slide == null)
-	zip_slide = new Array(2 * zip_WSIZE);
-    zip_wp = 0;
-    zip_bit_buf = 0;
-    zip_bit_len = 0;
-    zip_method = -1;
-    zip_eof = false;
-    zip_copy_leng = zip_copy_dist = 0;
-    zip_tl = null;
-}
-
-var zip_inflate_internal = function(buff, off, size) {
-    // decompress an inflated entry
-    var n, i;
-
-    n = 0;
-    while(n < size) {
-	if(zip_eof && zip_method == -1)
-	    return n;
-
-	if(zip_copy_leng > 0) {
-	    if(zip_method != zip_STORED_BLOCK) {
-		// STATIC_TREES or DYN_TREES
-		while(zip_copy_leng > 0 && n < size) {
-		    zip_copy_leng--;
-		    zip_copy_dist &= zip_WSIZE - 1;
-		    zip_wp &= zip_WSIZE - 1;
-		    buff[off + n++] = zip_slide[zip_wp++] =
-			zip_slide[zip_copy_dist++];
-		}
-	    } else {
-		while(zip_copy_leng > 0 && n < size) {
-		    zip_copy_leng--;
-		    zip_wp &= zip_WSIZE - 1;
-		    zip_NEEDBITS(8);
-		    buff[off + n++] = zip_slide[zip_wp++] = zip_GETBITS(8);
-		    zip_DUMPBITS(8);
-		}
-		if(zip_copy_leng == 0)
-		    zip_method = -1; // done
-	    }
-	    if(n == size)
-		return n;
-	}
-
-	if(zip_method == -1) {
-	    if(zip_eof)
-		break;
-
-	    // read in last block bit
-	    zip_NEEDBITS(1);
-	    if(zip_GETBITS(1) != 0)
-		zip_eof = true;
-	    zip_DUMPBITS(1);
-
-	    // read in block type
-	    zip_NEEDBITS(2);
-	    zip_method = zip_GETBITS(2);
-	    zip_DUMPBITS(2);
-	    zip_tl = null;
-	    zip_copy_leng = 0;
-	}
-
-	switch(zip_method) {
-	  case 0: // zip_STORED_BLOCK
-	    i = zip_inflate_stored(buff, off + n, size - n);
-	    break;
-
-	  case 1: // zip_STATIC_TREES
-	    if(zip_tl != null)
-		i = zip_inflate_codes(buff, off + n, size - n);
-	    else
-		i = zip_inflate_fixed(buff, off + n, size - n);
-	    break;
-
-	  case 2: // zip_DYN_TREES
-	    if(zip_tl != null)
-		i = zip_inflate_codes(buff, off + n, size - n);
-	    else
-		i = zip_inflate_dynamic(buff, off + n, size - n);
-	    break;
-
-	  default: // error
-	    i = -1;
-	    break;
-	}
-
-	if(i == -1) {
-	    if(zip_eof)
-		return 0;
-	    return -1;
-	}
-	n += i;
-    }
-    return n;
-}
-
-var zip_inflate = function(data, size) {
-    var i, j;
-
-    zip_inflate_start();
-    zip_inflate_data = data;
-    zip_inflate_pos = 0;
-
-    var buff = new runtime.ByteArray(size);
-    zip_inflate_internal(buff, 0, size);
-    zip_inflate_data = null; // G.C.
-    return buff;
-}
-
-this.inflate = zip_inflate;
-};
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/core/UnitTester.js b/apps/files_odfviewer/src/webodf/webodf/lib/core/UnitTester.js
deleted file mode 100644
index 4dbe1fa2c0..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/lib/core/UnitTester.js
+++ /dev/null
@@ -1,255 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global runtime: true, Runtime: true, core: true*/
-/*jslint evil: true*/
-/**
- * @interface
- */
-core.UnitTest = function UnitTest() {"use strict";};
-/**
- * @return {undefined}
- */
-core.UnitTest.prototype.setUp = function () {"use strict";};
-/**
- * @return {undefined}
- */
-core.UnitTest.prototype.tearDown = function () {"use strict";};
-/**
- * @return {!string}
- */
-core.UnitTest.prototype.description = function () {"use strict";};
-/**
- * @return {Array.<!function():undefined>}
- */
-core.UnitTest.prototype.tests = function () {"use strict";};
-/**
- * @return {Array.<!function(!function():undefined):undefined>}
- */
-core.UnitTest.prototype.asyncTests = function () {"use strict";};
-
-/**
- * @constructor
- */
-core.UnitTestRunner = function UnitTestRunner() {
-    "use strict";
-    var failedTests = 0;
-    function debug(msg) {
-        runtime.log(msg);
-    }
-    function testFailed(msg) {
-        failedTests += 1;
-        runtime.log("fail", msg);
-    }
-    function testPassed(msg) {
-        runtime.log("pass", msg);
-    }
-    function areArraysEqual(a, b) {
-        var i;
-        try {
-            if (a.length !== b.length) {
-                return false;
-            }
-            for (i = 0; i < a.length; i += 1) {
-                if (a[i] !== b[i]) {
-                    return false;
-                }
-            }
-        } catch (ex) {
-            return false;
-        }
-        return true;
-    }
-    function isResultCorrect(actual, expected) {
-        if (expected === 0) {
-            return actual === expected && (1 / actual) === (1 / expected);
-        }
-        if (actual === expected) {
-            return true;
-        }
-        if (typeof expected === "number" && isNaN(expected)) {
-            return typeof actual === "number" && isNaN(actual);
-        }
-        if (Object.prototype.toString.call(expected) ===
-                Object.prototype.toString.call([])) {
-            return areArraysEqual(actual, expected);
-        }
-        return false;
-    }
-    function stringify(v) {
-        if (v === 0 && 1 / v < 0) {
-            return "-0";
-        }
-        return String(v);
-    }
-    /**
-     * @param {!Object} t
-     * @param {!string} a
-     * @param {!string} b
-     * @return {undefined}
-     */
-    function shouldBe(t, a, b) {
-        if (typeof a !== "string" || typeof b !== "string") {
-            debug("WARN: shouldBe() expects string arguments");
-        }
-        var exception, av, bv;
-        try {
-            av = eval(a);
-        } catch (e) {
-            exception = e;
-        }
-        bv = eval(b);
-
-        if (exception) {
-            testFailed(a + " should be " + bv + ". Threw exception " +
-                    exception);
-        } else if (isResultCorrect(av, bv)) {
-            testPassed(a + " is " + b);
-        } else if (typeof av === typeof bv) {
-            testFailed(a + " should be " + bv + ". Was " + stringify(av) + ".");
-        } else {
-            testFailed(a + " should be " + bv + " (of type " + typeof bv +
-                    "). Was " + av + " (of type " + typeof av + ").");
-        }
-    }
-    /**
-     * @param {!Object} t context in which values to be tested are placed
-     * @param {!string} a the value to be checked
-     * @return {undefined}
-     */
-    function shouldBeNonNull(t, a) {
-        var exception, av;
-        try {
-            av = eval(a);
-        } catch (e) {
-            exception = e;
-        }
-
-        if (exception) {
-            testFailed(a + " should be non-null. Threw exception " + exception);
-        } else if (av !== null) {
-            testPassed(a + " is non-null.");
-        } else {
-            testFailed(a + " should be non-null. Was " + av);
-        }
-    }
-    /**
-     * @param {!Object} t context in which values to be tested are placed
-     * @param {!string} a the value to be checked
-     * @return {undefined}
-     */
-    function shouldBeNull(t, a) {
-        shouldBe(t, a, "null");
-    }
-    this.shouldBeNull = shouldBeNull;
-    this.shouldBeNonNull = shouldBeNonNull;
-    this.shouldBe = shouldBe;
-    this.countFailedTests = function () {
-        return failedTests;
-    };
-};
-
-/**
- * @constructor
- */
-core.UnitTester = function UnitTester() {
-    "use strict";
-    var failedTests = 0,
-        results = {};
-    /**
-     * @param {Function} TestClass the constructor for the test class
-     * @param {!function():undefined} callback
-     * @return {undefined}
-     */
-    this.runTests = function (TestClass, callback) {
-        var testName = Runtime.getFunctionName(TestClass),
-            tname,
-            runner = new core.UnitTestRunner(),
-            test = new TestClass(runner),
-            testResults = {},
-            i,
-            t,
-            tests,
-            lastFailCount;
-
-        // check that this test has not been run or started yet
-        if (testName.hasOwnProperty(results)) {
-            runtime.log("Test " + testName + " has already run.");
-            return;
-        }
-
-        runtime.log("Running " + testName + ": " + test.description());
-        tests = test.tests();
-        for (i = 0; i < tests.length; i += 1) {
-            t = tests[i];
-            tname = Runtime.getFunctionName(t);
-            runtime.log("Running " + tname);
-            lastFailCount = runner.countFailedTests();
-            test.setUp();
-            t();
-            test.tearDown();
-            testResults[tname] = lastFailCount === runner.countFailedTests();
-        }
-        function runAsyncTests(todo) {
-            if (todo.length === 0) {
-                results[testName] = testResults;
-                failedTests += runner.countFailedTests();
-                callback();
-                return;
-            }
-            t = todo[0];
-            var tname = Runtime.getFunctionName(t);
-            runtime.log("Running " + tname);
-            lastFailCount = runner.countFailedTests();
-            test.setUp();
-            t(function () {
-                test.tearDown();
-                testResults[tname] = lastFailCount ===
-                    runner.countFailedTests();
-                runAsyncTests(todo.slice(1));
-            });
-        }
-        runAsyncTests(test.asyncTests());
-    };
-    /**
-     * @return {!number}
-     **/
-    this.countFailedTests = function () {
-        return failedTests;
-    };
-    /**
-     * @return {!Object}
-     **/
-    this.results = function () {
-        return results;
-    };
-};
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/core/Zip.js b/apps/files_odfviewer/src/webodf/webodf/lib/core/Zip.js
deleted file mode 100644
index 66f508ee39..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/lib/core/Zip.js
+++ /dev/null
@@ -1,600 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global runtime, core, DOMParser*/
-/*jslint bitwise: true*/
-/*
-* @preserve
-* WebODF
-* Copyright (c) 2010 Jos van den Oever 
-* Licensed under the ... License:
-*
-* Project home: http://www.webodf.org/
-*/
-
-runtime.loadClass("core.RawInflate");
-runtime.loadClass("core.ByteArray");
-runtime.loadClass("core.ByteArrayWriter");
-runtime.loadClass("core.Base64");
-
-/**
- * @constructor
- * @param {!string} url path to zip file, should be readable by the runtime
- * @param {?function(?string, !core.Zip):undefined} entriesReadCallback callback
- *        indicating the zip
- *        has loaded this list of entries, the arguments are a string that
- *        indicates error if present and the created object
- */
-core.Zip = function Zip(url, entriesReadCallback) {
-    "use strict";
-    var /**@type{Array.<!ZipEntry>}*/ entries,
-        /**@type{number}*/ filesize,
-        /**@type{number}*/ nEntries,
-        /**@type{Function}*/ inflate = new core.RawInflate().inflate,
-        /**@type{!core.Zip}*/ zip = this,
-        base64 = new core.Base64();
-
-    /**
-     * @param {!Runtime.ByteArray} data
-     * @return {!number}
-     */
-    function crc32(data) {
-        // Calculate the crc32 polynomial of a string  
-        // 
-        // version: 1009.2513
-        // discuss at: http:\/\/phpjs.org\/functions\/crc32
-        // +   original by: Webtoolkit.info (http:\/\/www.webtoolkit.info\/)
-        // +   improved by: T0bsn
-        // -    depends on: utf8_encode
-        // *     example 1: crc32('Kevin van Zonneveld');
-        // *     returns 1: 1249991249
-        var /**@const@type{!Array.<!number>}*/table = [0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA, 0x076DC419, 0x706AF48F, 0xE963A535, 0x9E6495A3, 0x0EDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988, 0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, 0x90BF1D91, 0x1DB71064, 0x6AB020F2, 0xF3B97148, 0x84BE41DE, 0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7, 0x136C9856, 0x646BA8C0, 0xFD62F97A, 0x8A65C9EC, 0x14015C4F, 0x63066CD9, 0xFA0F3D63, 0x8D080DF5, 0x3B6E20C8, 0x4C69105E, 0xD56041E4, 0xA2677172, 0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B, 0x35B5A8FA, 0x42B2986C, 0xDBBBC9D6, 0xACBCF940, 0x32D86CE3, 0x45DF5C75, 0xDCD60DCF, 0xABD13D59, 0x26D930AC, 0x51DE003A, 0xC8D75180, 0xBFD06116, 0x21B4F4B5, 0x56B3C423, 0xCFBA9599, 0xB8BDA50F, 0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924, 0x2F6F7C87, 0x58684C11, 0xC1611DAB, 0xB6662D3D, 0x76DC4190, 0x01DB7106, 0x98D220BC, 0xEFD5102A, 0x71B18589, 0x06B6B51F, 0x9FBFE4A5, 0xE8B8D433, 0x7807C9A2, 0x0F00F934, 0x9609A88E, 0xE10E9818, 0x7F6A0DBB, 0x086D3D2D, 0x91646C97, 0xE6635C01, 0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E, 0x6C0695ED, 0x1B01A57B, 0x8208F4C1, 0xF50FC457, 0x65B0D9C6, 0x12B7E950, 0x8BBEB8EA, 0xFCB9887C, 0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, 0xFBD44C65, 0x4DB26158, 0x3AB551CE, 0xA3BC0074, 0xD4BB30E2, 0x4ADFA541, 0x3DD895D7, 0xA4D1C46D, 0xD3D6F4FB, 0x4369E96A, 0x346ED9FC, 0xAD678846, 0xDA60B8D0, 0x44042D73, 0x33031DE5, 0xAA0A4C5F, 0xDD0D7CC9, 0x5005713C, 0x270241AA, 0xBE0B1010, 0xC90C2086, 0x5768B525, 0x206F85B3, 0xB966D409, 0xCE61E49F, 0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4, 0x59B33D17, 0x2EB40D81, 0xB7BD5C3B, 0xC0BA6CAD, 0xEDB88320, 0x9ABFB3B6, 0x03B6E20C, 0x74B1D29A, 0xEAD54739, 0x9DD277AF, 0x04DB2615, 0x73DC1683, 0xE3630B12, 0x94643B84, 0x0D6D6A3E, 0x7A6A5AA8, 0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1, 0xF00F9344, 0x8708A3D2, 0x1E01F268, 0x6906C2FE, 0xF762575D, 0x806567CB, 0x196C3671, 0x6E6B06E7, 0xFED41B76, 0x89D32BE0, 0x10DA7A5A, 0x67DD4ACC, 0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5, 0xD6D6A3E8, 0xA1D1937E, 0x38D8C2C4, 0x4FDFF252, 0xD1BB67F1, 0xA6BC5767, 0x3FB506DD, 0x48B2364B, 0xD80D2BDA, 0xAF0A1B4C, 0x36034AF6, 0x41047A60, 0xDF60EFC3, 0xA867DF55, 0x316E8EEF, 0x4669BE79, 0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236, 0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F, 0xC5BA3BBE, 0xB2BD0B28, 0x2BB45A92, 0x5CB36A04, 0xC2D7FFA7, 0xB5D0CF31, 0x2CD99E8B, 0x5BDEAE1D, 0x9B64C2B0, 0xEC63F226, 0x756AA39C, 0x026D930A, 0x9C0906A9, 0xEB0E363F, 0x72076785, 0x05005713, 0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38, 0x92D28E9B, 0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21, 0x86D3D2D4, 0xF1D4E242, 0x68DDB3F8, 0x1FDA836E, 0x81BE16CD, 0xF6B9265B, 0x6FB077E1, 0x18B74777, 0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C, 0x8F659EFF, 0xF862AE69, 0x616BFFD3, 0x166CCF45, 0xA00AE278, 0xD70DD2EE, 0x4E048354, 0x3903B3C2, 0xA7672661, 0xD06016F7, 0x4969474D, 0x3E6E77DB, 0xAED16A4A, 0xD9D65ADC, 0x40DF0B66, 0x37D83BF0, 0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9, 0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6, 0xBAD03605, 0xCDD70693, 0x54DE5729, 0x23D967BF, 0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94, 0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D],
-            /**@type{!number}*/ crc = 0,
-            /**@type{!number}*/ i,
-            /**@const@type{!number}*/ iTop = data.length,
-            /**@type{!number}*/ x = 0,
-            /**@type{!number}*/ y = 0;
-        crc = crc ^ (-1);
-        for (i = 0; i < iTop; i += 1) {
-            y = (crc ^ data[i]) & 0xFF;
-            x = table[y];
-            crc = (crc >>> 8) ^ x;
-        }
-        return crc ^ (-1);
-    }
-
-    /**
-     * @param {!number} dostime
-     * @return {!Date}
-     */
-    function dosTime2Date(dostime) {
-        var /**@const@type{!number}*/ year = ((dostime >> 25) & 0x7f) + 1980,
-            /**@const@type{!number}*/ month = ((dostime >> 21) & 0x0f) - 1,
-            /**@const@type{!number}*/ mday = (dostime >> 16) & 0x1f,
-            /**@const@type{!number}*/ hour = (dostime >> 11) & 0x0f,
-            /**@const@type{!number}*/ min = (dostime >> 5) & 0x3f,
-            /**@const@type{!number}*/ sec = (dostime & 0x1f) << 1,
-            /**@const@type{!Date}*/ d
-                = new Date(year, month, mday, hour, min, sec);
-        return d;
-    }
-    /**
-     * @param {!Date} date
-     * @return {!number}
-     */
-    function date2DosTime(date) {
-        var /**@const@type{!number}*/ y = date.getFullYear();
-        return y < 1980 ? 0 :
-            ((y - 1980) << 25) | ((date.getMonth() + 1) << 21) |
-            (date.getDate() << 16) | (date.getHours() << 11) |
-            (date.getMinutes() << 5) | (date.getSeconds() >> 1);
-    }
-    /**
-     * Create a new ZipEntry.
-     * If the stream is not provided, the object should be initialized
-     * with ZipEntry.set()
-     * @constructor
-     * @param {!string} url
-     * @param {!core.ByteArray=} stream
-     */
-    function ZipEntry(url, stream) {
-        var /**@const@type{!number}*/ sig,
-            /**@const@type{!number}*/ namelen,
-            /**@const@type{!number}*/ extralen,
-            /**@const@type{!number}*/ commentlen,
-            /**@const@type{!number}*/ compressionMethod,
-            /**@const@type{!number}*/ compressedSize,
-            /**@const@type{!number}*/ uncompressedSize,
-            /**@const@type{!number}*/ offset,
-            /**@const@type{!number}*/ crc,
-            /**@const@type{!ZipEntry}*/ entry = this;
-
-        /**
-         * @param {!Runtime.ByteArray} data
-         * @param {!function(?string, ?Runtime.ByteArray)} callback
-         * @return {undefined}
-         */
-        function handleEntryData(data, callback) {
-            var /**@const@type{!core.ByteArray}*/ stream
-                        = new core.ByteArray(data),
-                /**@const@type{!number}*/ sig = stream.readUInt32LE(),
-                /**@const@type{!number}*/ filenamelen,
-                /**@const@type{!number}*/ extralen;
-            if (sig !== 0x04034b50) {
-                callback('File entry signature is wrong.' + sig.toString() +
-                        ' ' + data.length.toString(), null);
-                return;
-            }
-            stream.pos += 22;
-            filenamelen = stream.readUInt16LE();
-            extralen = stream.readUInt16LE();
-            stream.pos += filenamelen + extralen;
-            if (compressionMethod) {
-                data = data.slice(stream.pos, stream.pos + compressedSize);
-                if (compressedSize !== data.length) {
-                    callback("The amount of compressed bytes read was " +
-                        data.length.toString() + " instead of " +
-                        compressedSize.toString() + " for " + entry.filename +
-                        " in " + url + ".", null);
-                    return;
-                }
-                data = inflate(data, uncompressedSize);
-            } else {
-                data = data.slice(stream.pos, stream.pos + uncompressedSize);
-            }
-            if (uncompressedSize !== data.length) {
-                callback("The amount of bytes read was " +
-                        data.length.toString() +
-                        " instead of " + uncompressedSize.toString() + " for " +
-                        entry.filename + " in " + url + ".", null);
-                return;
-            }
-/*
- * This check is disabled for performance reasons
-            if (crc !== crc32(data)) {
-                runtime.log("Warning: CRC32 for " + entry.filename +
-                    " is wrong.");
-            }
-*/
-            entry.data = data;
-            callback(null, data);
-        }
-        /**
-         * @param {!function(?string, ?Runtime.ByteArray)} callback
-         * @return {undefined}
-         */
-        function load(callback) {
-            // if data has already been downloaded, use that
-            if (entry.data !== undefined) {
-                callback(null, entry.data);
-                return;
-            }
-            // the 256 at the end is security for when local extra field is
-            // larger
-            var /**@type{!number}*/ size
-                = compressedSize + 34 + namelen + extralen + 256;
-            if (size + offset > filesize) {
-                size = filesize - offset;
-            }
-            runtime.read(url, offset, size, function (err, data) {
-                if (err) {
-                    callback(err, data);
-                } else {
-                    handleEntryData(data, callback);
-                }
-            });
-        }
-        this.load = load;
-        /**
-         * @param {!string} filename
-         * @param {!Runtime.ByteArray} data
-         * @param {!boolean} compressed
-         * @param {!Date} date
-         * @return {undefined}
-         */
-        function set(filename, data, compressed, date) {
-            entry.filename = filename;
-            entry.data = data;
-            entry.compressed = compressed;
-            entry.date = date;
-        }
-        this.set = set;
-        /**
-         * @type {?string}
-         */
-        this.error = null;
-
-        if (!stream) {
-            return;
-        }
-        sig = stream.readUInt32LE();
-
-        if (sig !== 0x02014b50) {
-            this.error =
-                "Central directory entry has wrong signature at position " +
-                (stream.pos - 4).toString() + ' for file "' + url + '": ' +
-                stream.data.length.toString();
-            return;
-        }
-        // stream should be positioned at the start of the CDS entry for the
-        // file
-        stream.pos += 6;
-        compressionMethod = stream.readUInt16LE();
-        this.date = dosTime2Date(stream.readUInt32LE());
-        crc = stream.readUInt32LE();
-        compressedSize = stream.readUInt32LE();
-        uncompressedSize = stream.readUInt32LE();
-        namelen = stream.readUInt16LE();
-        extralen = stream.readUInt16LE();
-        commentlen = stream.readUInt16LE();
-        stream.pos += 8;
-        offset = stream.readUInt32LE();
-        this.filename = runtime.byteArrayToString(
-                stream.data.slice(stream.pos, stream.pos + namelen), "utf8");
-        stream.pos += namelen + extralen + commentlen;
-    }
-    /**
-     * @param {!Runtime.ByteArray} data
-     * @param {!function(?string, !core.Zip)} callback
-     * @return {undefined}
-     */
-    function handleCentralDirectory(data, callback) {
-        // parse the central directory
-        var stream = new core.ByteArray(data), i, e;
-        entries = [];
-        for (i = 0; i < nEntries; i += 1) {
-            e = new ZipEntry(url, stream);
-            if (e.error) {
-                callback(e.error, zip);
-                return;
-            }
-            entries[entries.length] = e;
-        }
-        // report that entries are listed and no error occured
-        callback(null, zip);
-    }
-    /**
-     * @param {!Runtime.ByteArray} data
-     * @param {!function(?string, !core.Zip)} callback
-     * @return {undefined}
-     */
-    function handleCentralDirectoryEnd(data, callback) {
-        if (data.length !== 22) {
-            callback("Central directory length should be 22.", zip);
-            return;
-        }
-        var stream = new core.ByteArray(data), sig, disk, cddisk, diskNEntries,
-            cdsSize, cdsOffset;
-        sig = stream.readUInt32LE();
-        if (sig !== 0x06054b50) {
-            callback('Central directory signature is wrong: ' + sig.toString(),
-                    zip);
-            return;
-        }
-        disk = stream.readUInt16LE();
-        if (disk !== 0) {
-            callback('Zip files with non-zero disk numbers are not supported.',
-                    zip);
-            return;
-        }
-        cddisk = stream.readUInt16LE();
-        if (cddisk !== 0) {
-            callback('Zip files with non-zero disk numbers are not supported.',
-                    zip);
-            return;
-        }
-        diskNEntries = stream.readUInt16LE();
-        nEntries = stream.readUInt16LE();
-        if (diskNEntries !== nEntries) {
-            callback('Number of entries is inconsistent.', zip);
-            return;
-        }
-        cdsSize = stream.readUInt32LE();
-        cdsOffset = stream.readUInt16LE();
-        cdsOffset = filesize - 22 - cdsSize;
-
-        // for some reason cdsOffset is not always equal to offset calculated
-        // from the central directory size. The latter is reliable.
-        runtime.read(url, cdsOffset, filesize - cdsOffset,
-                function (err, data) {
-                handleCentralDirectory(data, callback);
-            });
-    }
-    /**
-     * @param {!string} filename
-     * @param {!function(?string, ?Runtime.ByteArray)} callback receiving err and data
-     * @return {undefined}
-     */
-    function load(filename, callback) {
-        var entry = null,
-            end = filesize,
-            e,
-            i;
-        for (i = 0; i < entries.length; i += 1) {
-            e = entries[i];
-            if (e.filename === filename) {
-                entry = e;
-                break;
-            }
-        }
-        if (entry) {
-            if (entry.data) {
-                callback(null, entry.data);
-            } else {
-                entry.load(callback);
-            }
-        } else {
-            callback(filename + " not found.", null);
-        }
-    }
-    /**
-     * @param {!string} filename
-     * @param {!function(?string, ?string)} callback receiving err and data
-     * @return {undefined}
-     */
-    function loadAsString(filename, callback) {
-        // the javascript implementation simply reads the file and converts to
-        // string
-        load(filename, function (err, data) {
-            if (err) {
-                return callback(err, null);
-            }
-            data = runtime.byteArrayToString(data, "utf8");
-            callback(null, data);
-        });
-    }
-    /**
-     * @param {!string} filename
-     * @param {!Object} handler
-     * @return {undefined}
-     */
-    function loadContentXmlAsFragments(filename, handler) {
-        // the javascript implementation simply reads the file
-        loadAsString(filename, function (err, data) {
-            if (err) {
-                return handler.rootElementReady(err);
-            }
-            handler.rootElementReady(null, data, true);
-        });
-    }
-    function loadAsDataURL(filename, mimetype, callback) {
-        load(filename, function (err, data) {
-            if (err) {
-                return callback(err, null);
-            }
-            var /**@const@type{!Runtime.ByteArray}*/p = data,
-                chunksize = 45000, // must be multiple of 3 and less than 50000
-                i = 0,
-                url;
-            if (!mimetype) {
-                if (p[1] === 0x50 && p[2] === 0x4E && p[3] === 0x47) {
-                    mimetype = "image/png";
-                } else if (p[0] === 0xFF && p[1] === 0xD8 && p[2] === 0xFF) {
-                    mimetype = "image/jpeg";
-                } else if (p[0] === 0x47 && p[1] === 0x49 && p[2] === 0x46) {
-                    mimetype = "image/gif";
-                } else {
-                    mimetype = "";
-                }
-            }
-            url = 'data:' + mimetype + ';base64,';
-            // to avoid exceptions, base64 encoding is done in chunks
-            // it would make sense to move this to base64.toBase64
-            while (i < data.length) {
-                url += base64.convertUTF8ArrayToBase64(
-                    p.slice(i, Math.min(i + chunksize, p.length))
-                );
-                i += chunksize;
-            }
-            callback(null, url);
-        });
-    }
-    function loadAsDOM(filename, callback) {
-        loadAsString(filename, function (err, xmldata) {
-            if (err) {
-                callback(err, null);
-                return;
-            }
-            var parser = new DOMParser();
-            xmldata = parser.parseFromString(xmldata, "text/xml");
-            callback(null, xmldata);
-        });
-    }
-    /**
-     * Add or replace an entry to the zip file.
-     * This data is not stored to disk yet, and therefore, no callback is
-     * necessary.
-     * @param {!string} filename
-     * @param {!Runtime.ByteArray} data
-     * @param {!boolean} compressed
-     * @param {!Date} date
-     * @return {undefined}
-     */
-    function save(filename, data, compressed, date) {
-        var i,
-            entry;
-        for (i = 0; i < entries.length; i += 1) {
-            entry = entries[i];
-            if (entry.filename === filename) {
-                entry.set(filename, data, compressed, date);
-                return;
-            }
-        }
-        entry = new ZipEntry(url);
-        entry.set(filename, data, compressed, date);
-        entries.push(entry);
-    }
-    /**
-     * @param {!ZipEntry} entry
-     * @return {!core.ByteArrayWriter}
-     */
-    function writeEntry(entry) {
-        // each entry is currently stored uncompressed
-        var data = new core.ByteArrayWriter("utf8"),
-            length = 0;
-        data.appendArray([0x50, 0x4B, 0x03, 0x04, 0x14, 0, 0, 0, 0, 0]);
-        if (entry.data) {
-            length = entry.data.length;
-        }
-        data.appendUInt32LE(date2DosTime(entry.date));
-        data.appendUInt32LE(crc32(entry.data));
-        data.appendUInt32LE(length); // compressedSize
-        data.appendUInt32LE(length); // uncompressedSize
-        data.appendUInt16LE(entry.filename.length); // namelen
-        data.appendUInt16LE(0); // extralen
-        data.appendString(entry.filename);
-        if (entry.data) {
-            data.appendByteArray(entry.data);
-        }
-        return data;
-    }
-    /**
-     * @param {!ZipEntry} entry
-     * @param {!number} offset
-     * @return {!core.ByteArrayWriter}
-     */
-    function writeCODEntry(entry, offset) {
-        // each entry is currently stored uncompressed
-        var data = new core.ByteArrayWriter("utf8"),
-            length = 0;
-        data.appendArray([0x50, 0x4B, 0x01, 0x02, 0x14, 0x00, 0x14, 0x00,
-                0, 0, 0, 0]);
-        if (entry.data) {
-            length = entry.data.length;
-        }
-        data.appendUInt32LE(date2DosTime(entry.date));
-        data.appendUInt32LE(crc32(entry.data));
-        data.appendUInt32LE(length); // compressedSize
-        data.appendUInt32LE(length); // uncompressedSize
-        data.appendUInt16LE(entry.filename.length); // namelen
-        // extralen, commalen, diskno, file attributes
-        data.appendArray([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]);
-        data.appendUInt32LE(offset);
-        data.appendString(entry.filename);
-        return data;
-    }
-    /**
-     * @param {!number} position
-     * @param {!function(?string):undefined} callback
-     * @return {undefined}
-     */
-    function loadAllEntries(position, callback) {
-        if (position === entries.length) {
-            callback(null);
-            return;
-        }
-        var entry = entries[position];
-        if (entry.data !== undefined) {
-            loadAllEntries(position + 1, callback);
-            return;
-        }
-        entry.load(function (err) {
-            if (err) {
-                callback(err);
-                return;
-            }
-            loadAllEntries(position + 1, callback);
-        });
-    }
-    /**
-     * Write the zipfile to the given path.
-     * @param {!function(?string):undefined} callback receiving possible err
-     * @return {undefined}
-     */
-    function write(callback) {
-        // make sure all data is in memory, for each entry that has data
-        // undefined, try to load the entry
-        loadAllEntries(0, function (err) {
-            if (err) {
-                callback(err);
-                return;
-            }
-            var data = new core.ByteArrayWriter("utf8"),
-                i, e, codoffset, codsize,
-                offsets = [0];
-            // write entries
-            for (i = 0; i < entries.length; i += 1) {
-                data.appendByteArrayWriter(writeEntry(entries[i]));
-                offsets.push(data.getLength());
-            }
-            // write central directory
-            codoffset = data.getLength();
-            for (i = 0; i < entries.length; i += 1) {
-                e = entries[i];
-                data.appendByteArrayWriter(writeCODEntry(e, offsets[i]));
-            }
-            codsize = data.getLength() - codoffset;
-            data.appendArray([0x50, 0x4B, 0x05, 0x06, 0, 0, 0, 0]);
-            data.appendUInt16LE(entries.length);
-            data.appendUInt16LE(entries.length);
-            data.appendUInt32LE(codsize);
-            data.appendUInt32LE(codoffset);
-            data.appendArray([0, 0]);
-            runtime.writeFile(url, data.getByteArray(), callback);
-        });
-    }
-
-    this.load = load;
-    this.save = save;
-    this.write = write;
-    // a special function that makes faster odf loading possible
-    this.loadContentXmlAsFragments = loadContentXmlAsFragments;
-    this.loadAsString = loadAsString;
-    this.loadAsDOM = loadAsDOM;
-    this.loadAsDataURL = loadAsDataURL;
-    this.getEntries = function () {
-        return entries.slice();
-    };
-
-    // determine the file size
-    filesize = -1;
-    // if no callback is defined, this is a new file
-    if (entriesReadCallback === null) {
-        entries = [];
-        return;
-    }
-    runtime.getFileSize(url, function (size) {
-        filesize = size;
-        if (filesize < 0) {
-            entriesReadCallback("File '" + url + "' cannot be read.", zip);
-        } else {
-            runtime.read(url, filesize - 22, 22, function (err, data) {
-                // todo: refactor entire zip class
-                if (err || entriesReadCallback === null) {
-                    entriesReadCallback(err, zip);
-                } else {
-                    handleCentralDirectoryEnd(data, entriesReadCallback);
-                }
-            });
-        }
-    });
-};
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/core/dummyxmlmodel.js_ b/apps/files_odfviewer/src/webodf/webodf/lib/core/dummyxmlmodel.js_
deleted file mode 100644
index c14ec84411..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/lib/core/dummyxmlmodel.js_
+++ /dev/null
@@ -1,21 +0,0 @@
-/*global exports require*/
-function createDummyXMLModel() {
-    var that = {};
-
-    function preserveWhitespace(node) {
-        return true;
-    }
-
-    // return an array with child qnames or null for inserting text.
-    // the dummy implementation allows text everywhere, but no new elements
-    // "*" means all elements are allowed
-    // ["#PCDATA", "*"] means any element and text is allowed
-    function getAllowedChildren(node, position) {
-        return [null];
-    }
-
-    that.getAllowedChildren = getAllowedChildren;
-    that.preserveWhitespace = preserveWhitespace;
-    return that;
-}
-exports.createDummyXMLModel = createDummyXMLModel;
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/export.js b/apps/files_odfviewer/src/webodf/webodf/lib/export.js
deleted file mode 100644
index 08982cd424..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/lib/export.js
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global window runtime odf*/
-/*jslint sub: true*/
-
-window["runtime"] = runtime;
-runtime["loadClass"] = runtime.loadClass;
-window["odf"] = odf;
-window["odf"]["OdfCanvas"] = odf.OdfCanvas;
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/gui/Caret.js b/apps/files_odfviewer/src/webodf/webodf/lib/gui/Caret.js
deleted file mode 100644
index 744b8b022a..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/lib/gui/Caret.js
+++ /dev/null
@@ -1,65 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global gui*/
-/**
- * Class that represents a caret in a document. In text nodes, a native caret is
- * used via the HTML attribute contentEditable. Outside of text nodes, an empty
- * element representing the caret is used.
- * @constructor
- */
-gui.Caret = function Caret(selection, rootNode) {
-    "use strict";
-    var document = rootNode.ownerDocument,
-        cursorns,
-        cursorNode;
-    cursorns = 'urn:webodf:names:cursor';
-    cursorNode = document.createElementNS(cursorns, 'cursor');
-    /**
-     * Synchronize the cursor with the current selection.
-     * If there is a single collapsed selection range, the cursor will be placed
-     * there. If not, the cursor will be removed from the document tree.
-     * @return {undefined}
-     */
-    this.updateToSelection = function () {
-        var range;
-//        removeCursor();
-        if (selection.rangeCount === 1) {
-            range = selection.getRangeAt(0);
-/*
-            if (range.collapsed) {
-                putCursor(range.startContainer, range.startOffset);
-            }
-*/
-        }
-    };
-};
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/gui/PresenterUI.js b/apps/files_odfviewer/src/webodf/webodf/lib/gui/PresenterUI.js
deleted file mode 100644
index c6553cc3af..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/lib/gui/PresenterUI.js
+++ /dev/null
@@ -1,246 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH - Tobias Hintze
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-
-/*global runtime, gui, odf, core, xmldom, document, window*/
-runtime.loadClass("xmldom.XPath");
-runtime.loadClass("odf.Style2CSS");
-
-gui.PresenterUI = (function () {
-    "use strict";
-    var s2css = new odf.Style2CSS(),
-        xpath = new xmldom.XPath(),
-        nsResolver = s2css.namespaceResolver;
-
-    return function PresenterUI(odf_element) {
-        var self = this;
-
-        self.setInitialSlideMode = function () {
-            self.startSlideMode('single');
-        };
-
-        self.keyDownHandler = function (ev) {
-            if (ev.target.isContentEditable) { return; }
-            if (ev.target.nodeName === 'input') { return; }
-            switch (ev.keyCode) {
-            case 84: // t - hide/show toolbar
-                self.toggleToolbar();
-                break;
-            case 37: // left
-            case 8: // left
-                self.prevSlide();
-                break;
-            case 39:  // right
-            case 32:  // space
-                self.nextSlide();
-                break;
-            case 36: // pos1
-                self.firstSlide();
-                break;
-            case 35: // end
-                self.lastSlide();
-                break;
-            }
-        };
-
-        self.root = function () { return self.odf_canvas.odfContainer().rootElement; };
-
-        self.firstSlide = function () { self.slideChange(function (old, pc) { return 0; }); };
-        self.lastSlide = function () { self.slideChange(function (old, pc) { return pc - 1; }); };
-
-        self.nextSlide = function () {
-            self.slideChange(function (old, pc) { return old + 1 < pc ? old + 1 : -1; });
-        };
-        self.prevSlide = function () {
-            self.slideChange(function (old, pc) { return old < 1 ? -1 : old - 1; });
-        };
-        // indexChanger gets (idx,pagecount) as parameter and returns the new index
-        self.slideChange = function (indexChanger) {
-            var pages = self.getPages(self.odf_canvas.odfContainer().rootElement),
-                last = -1,
-                i = 0,
-                newidx,
-                pagelist;
-            pages.forEach(function (tuple) {
-                var name = tuple[0],
-                    node = tuple[1];
-                if (node.hasAttribute('slide_current')) {
-                    last = i;
-                    node.removeAttribute('slide_current');
-                }
-                i += 1;
-            });
-            newidx = indexChanger(last, pages.length);
-            if (newidx === -1) { newidx = last; }
-            pages[newidx][1].setAttribute('slide_current', '1');
-            pagelist = document.getElementById('pagelist');
-            pagelist.selectedIndex = newidx;
-            // FIXME this needs to become a sane callback/listener mechanism
-            // (and the mode probably a class/instance..)
-            if (self.slide_mode === 'cont') {
-                window.scrollBy(0, pages[newidx][1].getBoundingClientRect().top - 30);
-            }
-        };
-
-        self.selectSlide = function (idx) {
-            self.slideChange(function (old, pc) {
-                if (idx >= pc) { return -1; }
-                if (idx < 0) { return -1; }
-                return idx;
-            });
-        };
-
-        // make one specific slide visible in cont-mode
-        self.scrollIntoContView = function (idx) {
-            var pages = self.getPages(self.odf_canvas.odfContainer().rootElement);
-            if (pages.length === 0) { return; }
-            /*
-            if (false) {
-                // works in chrome
-                pages[idx][1].scrollIntoView();
-            } else {
-            */
-                // works in ff
-            window.scrollBy(0, pages[idx][1].getBoundingClientRect().top - 30);
-            /*}*/
-        };
-
-        // return a list of tuples (pagename, pagenode)
-        self.getPages = function (root) {
-            var pagenodes = root.getElementsByTagNameNS(nsResolver('draw'), 'page'),
-                pages  = [],
-                i;
-            for (i = 0; i < pagenodes.length; i += 1) {
-                pages.push([
-                    pagenodes[i].getAttribute('draw:name'),
-                    pagenodes[i]
-                ]);
-            }
-            return pages;
-        };
-
-        // fill a html-select with options, one option per page in odf (odp)
-        self.fillPageList = function (odfdom_root, html_select) {
-            var pages = self.getPages(odfdom_root),
-                i,
-                html_option,
-                res,
-                page_denom;
-
-            // empty the pagelist
-            while (html_select.firstChild) {
-                html_select.removeChild(html_select.firstChild);
-            }
-
-            // populate it
-            for (i = 0; i < pages.length; i += 1) {
-                html_option = document.createElement('option');
-                res = xpath.getODFElementsWithXPath(pages[i][1],
-                    './draw:frame[@presentation:class="title"]//draw:text-box/text:p',
-                    xmldom.XPath);
-                page_denom = (res.length > 0) ? res[0].textContent : pages[i][0];
-                html_option.textContent = (i + 1) + ": " + page_denom;
-                html_select.appendChild(html_option);
-            }
-        };
-
-        self.startSlideMode = function (mode) {
-            var pagelist = document.getElementById('pagelist'),
-                css = self.odf_canvas.slidevisibilitycss().sheet;
-            self.slide_mode = mode;
-            while (css.cssRules.length > 0) { css.deleteRule(0); }
-            // start on slide 0
-            self.selectSlide(0);
-            if (self.slide_mode === 'single') {
-                css.insertRule("draw|page { position:fixed; left:0px;top:30px; z-index:1; }", 0);
-                css.insertRule("draw|page[slide_current]  { z-index:2;}", 1);
-                css.insertRule("draw|page  { -webkit-transform: scale(1);}", 2);
-                self.fitToWindow();
-                window.addEventListener('resize', self.fitToWindow, false);
-
-            } else if (self.slide_mode === 'cont') {
-                window.removeEventListener('resize', self.fitToWindow, false);
-            }
-
-            self.fillPageList(self.odf_canvas.odfContainer().rootElement, pagelist);
-        };
-
-        // toggle (show/hide) toolbar
-        self.toggleToolbar = function () {
-            var css, found, i;
-            css = self.odf_canvas.slidevisibilitycss().sheet;
-            found = -1;
-            for (i = 0; i < css.cssRules.length; i += 1) {
-                if (css.cssRules[i].cssText.substring(0, 8) === ".toolbar") {
-                    found = i;
-                    break;
-                }
-            }
-            if (found > -1) {
-                css.deleteRule(found);
-            } else {
-                css.insertRule(".toolbar { position:fixed; left:0px;top:-200px; z-index:0; }", 0);
-            }
-        };
-
-        // adapt css-transform to window-size
-        self.fitToWindow = function () {
-            function ruleByFactor(f) {
-                return "draw|page { \n" +
-                    "-moz-transform: scale(" + f + "); \n" +
-                    "-moz-transform-origin: 0% 0%; " +
-                    "-webkit-transform-origin: 0% 0%; -webkit-transform: scale(" + f + "); " +
-                    "-o-transform-origin: 0% 0%; -o-transform: scale(" + f + "); " +
-                    "-ms-transform-origin: 0% 0%; -ms-transform: scale(" + f + "); " +
-                    "}";
-            }
-            var pages = self.getPages(self.root()),
-                factorVert = ((window.innerHeight - 40) / pages[0][1].clientHeight),
-                factorHoriz = ((window.innerWidth - 10) / pages[0][1].clientWidth),
-                factor = factorVert < factorHoriz ? factorVert : factorHoriz,
-                css = self.odf_canvas.slidevisibilitycss().sheet;
-            css.deleteRule(2);
-            css.insertRule(ruleByFactor(factor), 2);
-        };
-
-        self.load = function (url) {
-            self.odf_canvas.load(url);
-        };
-
-        self.odf_element = odf_element;
-        self.odf_canvas = new odf.OdfCanvas(self.odf_element);
-        self.odf_canvas.addListener("statereadychange", self.setInitialSlideMode);
-        self.slide_mode = 'undefined';
-        document.addEventListener('keydown', self.keyDownHandler, false);
-    };
-}());
-
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/gui/SelectionMover.js b/apps/files_odfviewer/src/webodf/webodf/lib/gui/SelectionMover.js
deleted file mode 100644
index 2356c2c8c0..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/lib/gui/SelectionMover.js
+++ /dev/null
@@ -1,217 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global runtime: true, core: true, gui: true*/
-runtime.loadClass("core.Cursor");
-/**
- * This class modifies the selection in different ways.
- * @constructor
- * @param {Selection} selection
- * @param {!core.PointWalker} pointWalker
- * @return {!gui.SelectionMover}
- */
-gui.SelectionMover = function SelectionMover(selection, pointWalker) {
-    "use strict";
-    var doc = pointWalker.node().ownerDocument,
-        cursor = new core.Cursor(selection, doc);
-    /**
-     * Return the last range in the selection. Create one if the selection is
-     * empty.
-     */
-    function getActiveRange(node) {
-        var range;
-        if (selection.rangeCount === 0) {
-            selection.addRange(node.ownerDocument.createRange());
-        }
-        return selection.getRangeAt(selection.rangeCount - 1);
-    }
-    function setStart(node, offset) {
-        // selection interface is cumbersome and in Chrome it is buggy
-        // as a workaround all ranges are removed. The last one is updated and
-        // all ranges are placed back
-        var ranges = [], i, range;
-        for (i = 0; i < selection.rangeCount; i += 1) {
-            ranges[i] = selection.getRangeAt(i);
-        }
-        selection.removeAllRanges();
-        if (ranges.length === 0) {
-            ranges[0] = node.ownerDocument.createRange();
-        }
-        ranges[ranges.length - 1].setStart(pointWalker.node(),
-                pointWalker.position());
-        for (i = 0; i < ranges.length; i += 1) {
-            selection.addRange(ranges[i]);
-        }
-    }
-    function doMove(extend, move) {
-        if (selection.rangeCount === 0) {
-            return;
-        }
-        var range = selection.getRangeAt(0),
-            /**@type{Element}*/ element;
-        if (!range.startContainer || range.startContainer.nodeType !== 1) {
-            return;
-        }
-        element = /**@type{!Element}*/(range.startContainer);
-        pointWalker.setPoint(element, range.startOffset);
-        move();
-        setStart(pointWalker.node(), pointWalker.position());
-    }
-    function doMoveForward(extend, move) {
-        if (selection.rangeCount === 0) {
-            return;
-        }
-        move();
-        var range = selection.getRangeAt(0),
-            /**@type{Element}*/ element;
-        if (!range.startContainer || range.startContainer.nodeType !== 1) {
-            return;
-        }
-        element = /**@type{!Element}*/(range.startContainer);
-        pointWalker.setPoint(element, range.startOffset);
-    }
-/*
-    function fallbackMoveLineUp() {
-        // put an element at the current position and call
-        // pointWalker.stepForward until the y position increases and x position
-        // is comparable to the previous one
-        cursor.updateToSelection();
-        // retrieve cursor x and y position, then move selection/cursor left
-        // until, y offset is less and x offset about equal
-        var rect = cursor.getNode().getBoundingClientRect(),
-            x = rect.left,
-            y = rect.top,
-            arrived = false,
-            allowedSteps = 200;
-        while (!arrived && allowedSteps) {
-            allowedSteps -= 1;
-            cursor.remove();
-            pointWalker.setPoint(selection.focusNode, selection.focusOffset);
-            pointWalker.stepForward();
-        moveCursor(walker.node(), walker.position());
-            moveCursorLeft();
-            rect = cursor.getNode().getBoundingClientRect();
-            arrived = rect.top !== y && rect.left < x;
-        }
-    }
-*/
-    function moveCursor(node, offset, selectMode) {
-        if (selectMode) {
-            selection.extend(node, offset);
-        } else {
-            selection.collapse(node, offset);
-        }
-        cursor.updateToSelection();
-    }
-    function moveCursorLeft() {
-        var /**@type{Element}*/ element;
-        if (!selection.focusNode || selection.focusNode.nodeType !== 1) {
-            return;
-        }
-        element = /**@type{!Element}*/(selection.focusNode);
-        pointWalker.setPoint(element, selection.focusOffset);
-        pointWalker.stepBackward();
-        moveCursor(pointWalker.node(), pointWalker.position(), false);
-    }
-    function moveCursorRight() {
-        cursor.remove();
-        var /**@type{Element}*/ element;
-        if (!selection.focusNode || selection.focusNode.nodeType !== 1) {
-            return;
-        }
-        element = /**@type{!Element}*/(selection.focusNode);
-        pointWalker.setPoint(element, selection.focusOffset);
-        pointWalker.stepForward();
-        moveCursor(pointWalker.node(), pointWalker.position(), false);
-    }
-    function moveCursorUp() {
-        // retrieve cursor x and y position, then move selection/cursor left
-        // until, y offset is less and x offset about equal
-        var rect = cursor.getNode().getBoundingClientRect(),
-            x = rect.left,
-            y = rect.top,
-            arrived = false,
-            left = 200;
-        while (!arrived && left) {
-            left -= 1;
-            moveCursorLeft();
-            rect = cursor.getNode().getBoundingClientRect();
-            arrived = rect.top !== y && rect.left < x;
-        }
-    }
-    function moveCursorDown() {
-        // retrieve cursor x and y position, then move selection/cursor right
-        // until, x offset is less
-        cursor.updateToSelection();
-        var rect = cursor.getNode().getBoundingClientRect(),
-            x = rect.left,
-            y = rect.top,
-            arrived = false,
-            left = 200;
-        while (!arrived) {
-            left -= 1;
-            moveCursorRight();
-            rect = cursor.getNode().getBoundingClientRect();
-            arrived = rect.top !== y && rect.left > x;
-        }
-//alert(left + " " + y + " " + x + " " + rect.top + " " + rect.left);
-    }
-    /**
-     * Move selection forward one point.
-     * @param {boolean} extend true if range is to be expanded from the current
-     *                         point
-     * @return {undefined}
-     **/
-    this.movePointForward = function (extend) {
-        doMove(extend, pointWalker.stepForward);
-    };
-    this.movePointBackward = function (extend) {
-        doMove(extend, pointWalker.stepBackward);
-    };
-    this.moveLineForward = function (extend) {
-        if (selection.modify) {
-            // TODO add a way to 
-            selection.modify(extend ? "extend" : "move", "forward", "line");
-        } else {
-            doMove(extend, moveCursorDown);
-        }
-    };
-    this.moveLineBackward = function (extend) {
-        if (selection.modify) {
-            selection.modify(extend ? "extend" : "move", "backward", "line");
-        } else {
-            doMove(extend, function () {
-            });
-        }
-    };
-    return this;
-};
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/gui/XMLEdit.js b/apps/files_odfviewer/src/webodf/webodf/lib/gui/XMLEdit.js
deleted file mode 100644
index aee0bd5e7d..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/lib/gui/XMLEdit.js
+++ /dev/null
@@ -1,330 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global runtime: true, core: true, gui: true*/
-runtime.loadClass("core.PointWalker");
-runtime.loadClass("core.Cursor");
-//runtime.loadClass("gui.Caret");
-/**
- * @constructor
- */
-gui.XMLEdit = function XMLEdit(element, stylesheet) {
-    "use strict";
-    var simplecss,
-        cssprefix,
-        documentElement,
-        customNS = "customns",
-        walker = null;
-
-    if (!element.id) {
-        element.id = "xml" + String(Math.random()).substring(2);
-    }
-//    element.contentEditable = true;
-    cssprefix = "#" + element.id + " ";
-
-    function installHandlers() {
-    }
-
-    // generic css for doing xml formatting: color tags and do indentation
-    simplecss = cssprefix + "*," + cssprefix + ":visited, " + cssprefix + ":link {display:block; margin: 0px; margin-left: 10px; font-size: medium; color: black; background: white; font-variant: normal; font-weight: normal; font-style: normal; font-family: sans-serif; text-decoration: none; white-space: pre-wrap; height: auto; width: auto}\n" +
-        cssprefix + ":before {color: blue; content: '<' attr(customns_name) attr(customns_atts) '>';}\n" +
-        cssprefix + ":after {color: blue; content: '</' attr(customns_name) '>';}\n" +
-        cssprefix + "{overflow: auto;}\n";
-
-    function listenEvent(eventTarget, eventType, eventHandler) {
-        if (eventTarget.addEventListener) {
-            eventTarget.addEventListener(eventType, eventHandler, false);
-        } else if (eventTarget.attachEvent) {
-            eventType = "on" + eventType;
-            eventTarget.attachEvent(eventType, eventHandler);
-        } else {
-            eventTarget["on" + eventType] = eventHandler;
-        }
-    }
-    function cancelEvent(event) {
-        if (event.preventDefault) {
-            event.preventDefault();
-        } else {
-            event.returnValue = false;
-        }
-    }
-
-    function isCaretMoveCommand(charCode) {
-        if (charCode >= 16 && charCode <= 20) {
-            return true;
-        }
-        if (charCode >= 33 && charCode <= 40) { //arrows,home,end,pgup,pgdown
-            return true;
-        }
-        return false;
-    }
-
-    function syncSelectionWithWalker() {
-        var sel = element.ownerDocument.defaultView.getSelection(),
-            r;
-        if (!sel || sel.rangeCount <= 0 || !walker) {
-            return;
-        }
-        r = sel.getRangeAt(0);
-        walker.setPoint(r.startContainer, r.startOffset);
-    }
-
-    function syncWalkerWithSelection() {
-        var sel = element.ownerDocument.defaultView.getSelection(),
-            n, r;
-        sel.removeAllRanges();
-        if (!walker || !walker.node()) {
-            return;
-        }
-        n = walker.node();
-        r = n.ownerDocument.createRange();
-        r.setStart(n, walker.position());
-        r.collapse(true);
-        sel.addRange(r);
-    }
-
-    function handleKeyDown(event) {
-        var charCode = event.charCode || event.keyCode;
-        // cursor movement
-        walker = null;
-        if (walker && charCode === 39) { // right arrow
-            syncSelectionWithWalker();
-            walker.stepForward();
-            syncWalkerWithSelection();
-        } else if (walker && charCode === 37) { //left arrow
-            syncSelectionWithWalker();
-            walker.stepBackward();
-            syncWalkerWithSelection();
-        } else if (isCaretMoveCommand(charCode)) {
-            return;
-        }
-        cancelEvent(event);
-    }
-
-    function handleKeyPress(event) {
-//        handleKeyDown(event);
-    }
-
-    function handleClick(event) {
-//        alert(event.target.nodeName);
-        var sel = element.ownerDocument.defaultView.getSelection(),
-            r = sel.getRangeAt(0),
-            n = r.startContainer;
-        // if cursor is in customns node, move up to the top one
-        /*
-        if (n.parentNode.namespaceURI === customNS) {
-            while (n.parentNode.namespaceURI === customNS) {
-                n = n.parentNode;
-            }
-            r = n.ownerDocument.createRange();
-            r.setStart(n.nextSibling, 0);
-            r.collapse(true);
-            sel.removeAllRanges();
-            sel.addRange(r);
-        }
-*/
-/*
-            r = element.ownerDocument.createRange();
-            r.setStart(event.target.nodeName, 0);
-            r.collapse(true);
-            sel.removeAllRanges();
-            sel.addRange(r);
-*/
-//alert(sel.getRangeAt(0).startContainer.nodeName + " " + sel.getRangeAt(0).startOffset);
-
-        cancelEvent(event);
-    }
-
-    function initElement(element) {
-        listenEvent(element, "click", handleClick);
-        listenEvent(element, "keydown", handleKeyDown);
-        listenEvent(element, "keypress", handleKeyPress);
-        //listenEvent(element, "mouseup", handleMouseUp);
-        // ignore drop events, dragstart, drag, dragenter, dragover are ok for now
-        listenEvent(element, "drop", cancelEvent);
-        listenEvent(element, "dragend", cancelEvent);
-        // pasting is also disallowed for now
-        listenEvent(element, "beforepaste", cancelEvent);
-        listenEvent(element, "paste", cancelEvent);
-    }
-
-    // remove all textnodes that contain only whitespace
-    function cleanWhitespace(node) {
-        var n = node.firstChild, p,
-            re = /^\s*$/;
-        while (n && n !== node) {
-            p = n;
-            n = n.nextSibling || n.parentNode;
-            if (p.nodeType === 3 && re.test(p.nodeValue)) {
-                p.parentNode.removeChild(p);
-            }
-        }
-    }
-    /**
-     * @param {!Node} node
-     * @return {undefined}
-     */
-    function setCssHelperAttributes(node) {
-        var atts, attsv, a, i;
-        // write all attributes in a string that is shown via the css
-        atts = node.attributes;
-        attsv = "";
-        for (i = atts.length - 1; i >= 0; i -= 1) {
-            a = atts.item(i);
-            attsv = attsv + " " + a.nodeName + "=\"" + a.nodeValue + "\"";
-        }
-        node.setAttribute("customns_name", node.nodeName);
-        node.setAttribute("customns_atts", attsv);
-    }
-    /**
-     * @param {!Node} node
-     * @return {undefined}
-     */
-    function addExplicitAttributes(node) {
-        var n = node.firstChild;
-        // recurse over the dom
-        while (n && n !== node) {
-            if (n.nodeType === 1) {
-                addExplicitAttributes(n);
-            }
-            n = n.nextSibling || n.parentNode;
-        }
-        setCssHelperAttributes(node);
-        cleanWhitespace(node);
-    }
-
-    function getNamespacePrefixes(node, prefixes) {
-        var n = node.firstChild, atts, att, i;
-        while (n && n !== node) {
-            if (n.nodeType === 1) {
-                getNamespacePrefixes(n, prefixes);
-                atts = n.attributes;
-                for (i = atts.length - 1; i >= 0; i -= 1) {
-                    att = atts.item(i);
-                    // record the prefix that the document uses for namespaces
-                    if (att.namespaceURI === "http://www.w3.org/2000/xmlns/") {
-                        if (!prefixes[att.nodeValue]) {
-                            prefixes[att.nodeValue] = att.localName;
-                        }
-                    }
-                }
-            }
-            n = n.nextSibling || n.parentNode;
-        }
-    }
-
-    /**
-     * Give each namespace a unique prefix.
-     * @param {Object.<?string,?string>} prefixes Map with namespace as key and
-     *                                          prefix as value
-     * @return {undefined}
-     */
-    function generateUniquePrefixes(prefixes) {
-        var taken = {},
-            ns, p, n = 0;
-        for (ns in prefixes) {
-            if (prefixes.hasOwnProperty(ns) && ns) {
-                p = prefixes[ns];
-                if (!p || taken.hasOwnProperty(p) || p === "xmlns") {
-                    do {
-                        p = "ns" + n;
-                        n += 1;
-                    } while (taken.hasOwnProperty(p));
-                    prefixes[ns] = p;
-                }
-                taken[p] = true;
-            }
-        }
-    }
-
-    // the CSS neededed for the XML edit view depends on the prefixes
-    function createCssFromXmlInstance(node) {
-        // collect all prefixes and elements
-        var prefixes = {},    // namespace prefixes as they occur in the XML
-            css = "@namespace customns url(customns);\n",
-            name, pre, ns, names, csssel;
-        getNamespacePrefixes(node, prefixes);
-        generateUniquePrefixes(prefixes);
-/*
-        for (ns in prefixes) {
-            if (ns) {
-                css = css + "@namepace " + prefixes[ns] + " url(" + ns + ");\n";
-            }
-        }
-        for (ns in prefixes) {
-            if (ns) {
-                pre = cssprefix + prefixes[ns] + "|";
-                css = css + pre + ":before { content: '<" + prefixes[ns] +
-                        ":' attr(customns_name); }\n" +
-                        pre + ":after { content: '</" + prefixes[ns] +
-                        ":' attr(customns_name) '>'; }\n";
-            }
-        }
-*/
-        return css;
-    }
-
-    // Adapt the CSS to the current settings.
-    function updateCSS() {
-        var css = element.ownerDocument.createElement("style"),
-            text = createCssFromXmlInstance(element);
-        css.type = "text/css";
-        text = text + simplecss;
-        css.appendChild(element.ownerDocument.createTextNode(text));
-        stylesheet = stylesheet.parentNode.replaceChild(css, stylesheet);
-    }
-    function getXML() {
-        return documentElement;
-    }
-    function setXML(xml) {
-        var node = xml.documentElement || xml;
-        node = element.ownerDocument.importNode(node, true);
-        documentElement = node;
-
-        addExplicitAttributes(node);
-
-        while (element.lastChild) {
-            element.removeChild(element.lastChild);
-        }
-        element.appendChild(node);
-
-        updateCSS();
-
-        walker = new core.PointWalker(node);
-    }
-
-    initElement(element);
-
-    this.updateCSS = updateCSS;
-    this.setXML = setXML;
-    this.getXML = getXML;
-};
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/manifest.js b/apps/files_odfviewer/src/webodf/webodf/lib/manifest.js
deleted file mode 100644
index 1a185b85b9..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/lib/manifest.js
+++ /dev/null
@@ -1,34 +0,0 @@
-(function () {
-    "use strict";
-    return [
-        "core/Async.js",
-        "core/Base64.js",
-        "core/ByteArray.js",
-        "core/ByteArrayWriter.js",
-        "core/Cursor.js",
-        "core/JSLint.js",
-        "core/PointWalker.js",
-        "core/RawDeflate.js",
-        "core/RawInflate.js",
-        "core/UnitTester.js",
-        "core/Zip.js",
-        "gui/Caret.js",
-        "gui/SelectionMover.js",
-        "gui/XMLEdit.js",
-        "gui/PresenterUI.js",
-        "odf/FontLoader.js",
-        "odf/Formatting.js",
-        "odf/OdfCanvas.js",
-        "odf/OdfContainer.js",
-        "odf/Style2CSS.js",
-        "odf/StyleInfo.js",
-        "xmldom/LSSerializer.js",
-        "xmldom/LSSerializerFilter.js",
-        "xmldom/OperationalTransformDOM.js",
-        "xmldom/OperationalTransformInterface.js",
-        "xmldom/RelaxNG.js",
-        "xmldom/RelaxNG2.js",
-        "xmldom/RelaxNGParser.js",
-        "xmldom/XPath.js"
-    ];
-}());
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/odf/FontLoader.js b/apps/files_odfviewer/src/webodf/webodf/lib/odf/FontLoader.js
deleted file mode 100644
index f6d51f666a..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/lib/odf/FontLoader.js
+++ /dev/null
@@ -1,135 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*jslint sub: true*/
-/*global runtime, odf, core, document, xmldom*/
-runtime.loadClass("core.Base64");
-runtime.loadClass("xmldom.XPath");
-runtime.loadClass("odf.Style2CSS");
-/**
- * This class loads embedded fonts into the CSS 
- * @constructor
- **/
-odf.FontLoader = (function () {
-    "use strict";
-    var style2CSS = new odf.Style2CSS(),
-        xpath = new xmldom.XPath(),
-        base64 = new core.Base64();
-    /**
-     * @param {!Element} fontFaceDecls
-     * @return {!Object.<string,Object>}
-     */
-    function getEmbeddedFontDeclarations(fontFaceDecls) {
-        var decls = {},
-            fonts,
-            i, font, name, uris, href;
-        if (!fontFaceDecls) {
-            return decls;
-        }
-        fonts = xpath.getODFElementsWithXPath(fontFaceDecls,
-                    "style:font-face[svg:font-face-src]",
-                    style2CSS.namespaceResolver);
-        for (i = 0; i < fonts.length; i += 1) {
-            font = fonts[i];
-            name = font.getAttributeNS(style2CSS.namespaces["style"], "name");
-            uris = xpath.getODFElementsWithXPath(font,
-                "svg:font-face-src/svg:font-face-uri",
-                style2CSS.namespaceResolver);
-            if (uris.length > 0) {
-                href = uris[0].getAttributeNS(style2CSS.namespaces["xlink"],
-                        "href");
-                decls[name] = {href: href};
-            }
-        }
-        return decls;
-    }
-    function addFontToCSS(name, font, fontdata, stylesheet) {
-        // hack: get the first stylesheet
-        stylesheet = document.styleSheets[0];
-        var rule = "@font-face { font-family: \"" + name + "\"; src: " +
-            "url(data:application/x-font-ttf;charset=binary;base64," +
-            base64.convertUTF8ArrayToBase64(fontdata) +
-            ") format(\"truetype\"); }";
-        try {
-            stylesheet.insertRule(rule, stylesheet.cssRules.length);
-        } catch (e) {
-            runtime.log("Problem inserting rule in CSS: " + rule);
-        }
-    }
-    function loadFontIntoCSS(embeddedFontDeclarations, zip, pos, stylesheet,
-            callback) {
-        var name, i = 0, n;
-        for (n in embeddedFontDeclarations) {
-            if (embeddedFontDeclarations.hasOwnProperty(n)) {
-                if (i === pos) {
-                    name = n;
-                }
-                i += 1;
-            }
-        }
-        if (!name) {
-            return callback();
-        }
-        zip.load(embeddedFontDeclarations[name].href, function (err, fontdata) {
-            if (err) {
-                runtime.log(err);
-            } else {
-                addFontToCSS(name, embeddedFontDeclarations[name], fontdata,
-                    stylesheet);
-            }
-            return loadFontIntoCSS(embeddedFontDeclarations, zip, pos + 1,
-                    stylesheet, callback);
-        });
-    }
-    function loadFontsIntoCSS(embeddedFontDeclarations, zip, stylesheet) {
-        loadFontIntoCSS(embeddedFontDeclarations, zip, 0, stylesheet,
-            function () {});
-    }
-    /**
-     * @constructor
-     */
-    odf.FontLoader = function FontLoader() {
-        var self = this;
-        /**
-         * @param {!Element} fontFaceDecls
-         * @param {!core.Zip} zip
-         * @param {!StyleSheet} stylesheet
-         * @return {undefined}
-         */
-        this.loadFonts = function (fontFaceDecls, zip, stylesheet) {
-            var embeddedFontDeclarations = getEmbeddedFontDeclarations(
-                    fontFaceDecls);
-            loadFontsIntoCSS(embeddedFontDeclarations, zip, stylesheet);
-        };
-    };
-    return odf.FontLoader;
-}());
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/odf/Formatting.js b/apps/files_odfviewer/src/webodf/webodf/lib/odf/Formatting.js
deleted file mode 100644
index cf42fcc50a..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/lib/odf/Formatting.js
+++ /dev/null
@@ -1,153 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global odf: true, runtime: true*/
-/**
- * @constructor
- */
-odf.Formatting = function Formatting() {
-    "use strict";
-    var /**@type{odf.OdfContainer}*/ odfContainer,
-        /**@type{odf.StyleInfo}*/ styleInfo = new odf.StyleInfo();
-
-    /**
-     * Class that iterates over all elements that are part of the range.
-     * @constructor
-     * @param {!Range} range
-     * @return {undefined}
-     */
-    function RangeElementIterator(range) {
-        /**
-         * @param {Node} parent
-         * @param {!number} n
-         * @return {Node}
-         */
-        function getNthChild(parent, n) {
-            var c = parent && parent.firstChild;
-            while (c && n) {
-                c = c.nextSibling;
-                n -= 1;
-            }
-            return c;
-        }
-        var start = getNthChild(range.startContainer, range.startOffset),
-            end = getNthChild(range.endContainer, range.endOffset),
-            current = start;
-        /**
-         * @return {Element|null}
-         */
-        this.next = function () {
-            var c = current;
-            if (c === null) {
-                return c;
-            }
-            return null;
-        };
-    }
-
-    /**
-     * @param {!Element} element
-     * @return {Element}
-     */
-    function getParentStyle(element) {
-        var n = element.firstChild, e;
-        if (n.nodeType === 1) { // Element
-            e = /**@type{Element}*/(n);
-            return e;
-        }
-        return null;
-    }
-    /**
-     * @param {!Range} range
-     * @return {!Array.<!Element>}
-     */
-    function getParagraphStyles(range) {
-        var iter = new RangeElementIterator(range), e, styles = [];
-        e = iter.next();
-        while (e) {
-            if (styleInfo.canElementHaveStyle("paragraph", e)) {
-                styles.push(e);
-            }
-        }
-        return styles;
-    }
-
-    /**
-     * @param {!odf.OdfContainer} odfcontainer
-     * @return {undefined}
-     */
-    this.setOdfContainer = function (odfcontainer) {
-        odfContainer = odfcontainer;
-    };
-    /**
-     * Return true if all parts of the selection are bold.
-     * @param {!Array.<!Range>} selection
-     * @return {!boolean}
-     */
-    this.isCompletelyBold = function (selection) {
-        return false;
-    };
-    /**
-     * Get the alignment or undefined if no uniform alignment is found
-     * @param {!Array.<!Range>} selection
-     * @return {!string|undefined}
-     */
-    this.getAlignment = function (selection) {
-        var styles = this.getParagraphStyles(selection), i, l = styles.length;
-        return undefined;
-    };
-    /**
-     * Get the list of paragraph styles that covered by the current selection.
-     * @param {!Array.<!Range>} selection
-     * @return {!Array.<Element>}
-     */
-    this.getParagraphStyles = function (selection) {
-        var i, j, s, styles = [];
-        for (i = 0; i < selection.length; i += 0) {
-            s = getParagraphStyles(selection[i]);
-            for (j = 0; j < s.length; j += 1) {
-                if (styles.indexOf(s[j]) === -1) {
-                    styles.push(s[j]);
-                }
-            }
-        }
-        return styles;
-    };
-    /**
-     * Get the list of text styles that are covered by the current selection.
-     * @param {!Array.<!Range>} selection
-     * @return {!Array.<Element>}
-     */
-    this.getTextStyles = function (selection) {
-        return [];
-    };
-};
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/odf/OdfCanvas.js b/apps/files_odfviewer/src/webodf/webodf/lib/odf/OdfCanvas.js
deleted file mode 100644
index b8077f8093..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/lib/odf/OdfCanvas.js
+++ /dev/null
@@ -1,912 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*jslint sub: true*/
-/*global runtime, odf, xmldom */
-runtime.loadClass("odf.OdfContainer");
-runtime.loadClass("odf.Formatting");
-runtime.loadClass("xmldom.XPath");
-/**
- * This class manages a loaded ODF document that is shown in an element.
- * It takes care of giving visual feedback on loading, ensures that the
- * stylesheets are loaded.
- * @constructor
- * @param {!Element} element Put and ODF Canvas inside this element.
- **/
-odf.OdfCanvas = (function () {
-    "use strict";
-    /**
-     * A loading queue where various tasks related to loading can be placed
-     * and will be run with 10 ms between them. This gives the ui a change to
-     * to update.
-     * @constructor
-     */
-    function LoadingQueue() {
-        var queue = [],
-            taskRunning = false;
-        /**
-         * @param {Function} task
-         * @return {undefined}
-         */
-        function run(task) {
-            taskRunning = true;
-            runtime.setTimeout(function () {
-                try {
-                    task();
-                } catch (e) {
-                    runtime.log(e);
-                }
-                taskRunning = false;
-                if (queue.length > 0) {
-                    run(queue.pop());
-                }
-            }, 10);
-        }
-        /**
-         * @return {undefined}
-         */
-        this.clearQueue = function () {
-            queue.length = 0;
-        };
-        /**
-         * @param {Function} loadingTask
-         * @return {undefined}
-         */
-        this.addToQueue = function (loadingTask) {
-            if (queue.length === 0 && !taskRunning) {
-                return run(loadingTask);
-            }
-            queue.push(loadingTask);
-        };
-    }
-    /**
-     * @constructor
-     * @param css
-     */
-    function PageSwitcher(css) {
-        var sheet = css.sheet,
-            position = 1;
-        function updateCSS() {
-            while (sheet.cssRules.length > 0) {
-                sheet.deleteRule(0);
-            }
-            sheet.insertRule('office|presentation draw|page {display:none;}', 0);
-            sheet.insertRule("office|presentation draw|page:nth-child(" +
-                position + ") {display:block;}", 1);
-        }
-        /**
-         * @return {undefined}
-         */
-        this.showNextPage = function () {
-            position += 1;
-            updateCSS();
-        };
-        /**
-         * @return {undefined}
-         */
-        this.showPreviousPage = function () {
-            if (position > 1) {
-                position -= 1;
-                updateCSS();
-            }
-        };
-        this.css = css;
-    }
-    /**
-     * Register event listener on DOM element.
-     * @param {!Element} eventTarget
-     * @param {!string} eventType
-     * @param {!Function} eventHandler
-     * @return {undefined}
-     */
-    function listenEvent(eventTarget, eventType, eventHandler) {
-        if (eventTarget.addEventListener) {
-            eventTarget.addEventListener(eventType, eventHandler, false);
-        } else if (eventTarget.attachEvent) {
-            eventType = "on" + eventType;
-            eventTarget.attachEvent(eventType, eventHandler);
-        } else {
-            eventTarget["on" + eventType] = eventHandler;
-        }
-    }
-    /**
-     * Class that listens to events and sends a signal if the selection changes.
-     * @constructor
-     * @param {!Element} element
-     */
-    function SelectionWatcher(element) {
-        var selection = [], count = 0, listeners = [];
-        /**
-         * @param {!Element} ancestor
-         * @param {Node} descendant
-         * @return {!boolean}
-         */
-        function isAncestorOf(ancestor, descendant) {
-            while (descendant) {
-                if (descendant === ancestor) {
-                    return true;
-                }
-                descendant = descendant.parentNode;
-            }
-            return false;
-        }
-        /**
-         * @param {!Element} element
-         * @param {!Range} range
-         * @return {!boolean}
-         */
-        function fallsWithin(element, range) {
-            return isAncestorOf(element, range.startContainer) &&
-                isAncestorOf(element, range.endContainer);
-        }
-        /**
-         * @return {!Array.<!Range>}
-         */
-        function getCurrentSelection() {
-            var s = [], selection = runtime.getWindow().getSelection(), i, r;
-            for (i = 0; i < selection.rangeCount; i += 1) {
-                r = selection.getRangeAt(i);
-                // check if the nodes in the range fall completely within the
-                // element
-                if (r !== null && fallsWithin(element, r)) {
-                    s.push(r);
-                }
-            }
-            return s;
-        }
-        /**
-         * @param {Range} rangeA
-         * @param {Range} rangeB
-         * @return {!boolean}
-         */
-        function rangesNotEqual(rangeA, rangeB) {
-            if (rangeA === rangeB) {
-                return false;
-            }
-            if (rangeA === null || rangeB === null) {
-                return true;
-            }
-            return rangeA.startContainer !== rangeB.startContainer ||
-                   rangeA.startOffset !== rangeB.startOffset ||
-                   rangeA.endContainer !== rangeB.endContainer ||
-                   rangeA.endOffset !== rangeB.endOffset;
-        }
-        /**
-         * @return {undefined}
-         */
-        function emitNewSelection() {
-            var i, l = listeners.length;
-            for (i = 0; i < l; i += 1) {
-                listeners[i](element, selection);
-            }
-        }
-        /**
-         * @param {!Array.<!Range>} selection
-         * @return {!Array.<!Range>}
-         */
-        function copySelection(selection) {
-            var s = [selection.length], i, oldr, r,
-                doc = element.ownerDocument;
-            for (i = 0; i < selection.length; i += 1) {
-                oldr = selection[i];
-                r = doc.createRange();
-                r.setStart(oldr.startContainer, oldr.startOffset);
-                r.setEnd(oldr.endContainer, oldr.endOffset);
-                s[i] = r;
-            }
-            return s;
-        }
-        /**
-         * @return {undefined}
-         */
-        function checkSelection() {
-            var s = getCurrentSelection(), i;
-            if (s.length === selection.length) {
-                for (i = 0; i < s.length; i += 1) {
-                    if (rangesNotEqual(s[i], selection[i])) {
-                        break;
-                    }
-                }
-                if (i === s.length) {
-                    return; // no change
-                }
-            }
-            selection = s;
-            selection = copySelection(s);
-            emitNewSelection();
-        }
-        /**
-         * @param {!string} eventName
-         * @param {!function(!Element, !Array.<!Range>)} handler
-         * @return {undefined}
-         */
-        this.addListener = function (eventName, handler) {
-            var i, l = listeners.length;
-            for (i = 0; i < l; i += 1) {
-                if (listeners[i] === handler) {
-                    return;
-                }
-            }
-            listeners.push(handler);
-        };
-        listenEvent(element, "mouseup", checkSelection);
-        listenEvent(element, "keyup", checkSelection);
-        listenEvent(element, "keydown", checkSelection);
-    }
-    var style2CSS = new odf.Style2CSS(),
-        namespaces = style2CSS.namespaces,
-        drawns  = namespaces.draw,
-        fons    = namespaces.fo,
-        officens = namespaces.office,
-        svgns   = namespaces.svg,
-        textns  = namespaces.text,
-        xlinkns = namespaces.xlink,
-        window = runtime.getWindow(),
-        xpath = new xmldom.XPath(),
-        /**@const@type{!Object.<!string,!Array.<!Function>>}*/
-        eventHandlers = {},
-        editparagraph,
-        loadingQueue = new LoadingQueue();
-
-    /**
-     * Register an event handler
-     * @param {!string} eventType
-     * @param {!Function} eventHandler
-     * @return {undefined}
-     */
-    function addEventListener(eventType, eventHandler) {
-        var handlers = eventHandlers[eventType];
-        if (handlers === undefined) {
-            handlers = eventHandlers[eventType] = [];
-        }
-        if (eventHandler && handlers.indexOf(eventHandler) === -1) {
-            handlers.push(eventHandler);
-        }
-    }
-    /**
-     * Fire an event
-     * @param {!string} eventType
-     * @param {Array.<Object>=} args
-     * @return {undefined}
-     */
-    function fireEvent(eventType, args) {
-        if (!eventHandlers.hasOwnProperty(eventType)) {
-            return;
-        }
-        var handlers = eventHandlers[eventType], i;
-        for (i = 0; i < handlers.length; i += 1) {
-            handlers[i](args);
-        }
-    }
-    /**
-     * @param {!Element} element
-     * @return {undefined}
-     */
-    function clear(element) {
-        while (element.firstChild) {
-            element.removeChild(element.firstChild);
-        }
-    }
-    /**
-     * A new styles.xml has been loaded. Update the live document with it.
-     * @param {!Element} odfelement
-     * @param {!HTMLStyleElement} stylesxmlcss
-     * @return {undefined}
-     **/
-    function handleStyles(odfelement, stylesxmlcss) {
-        // update the css translation of the styles
-        var style2css = new odf.Style2CSS();
-        style2css.style2css(stylesxmlcss.sheet, odfelement.styles,
-                    odfelement.automaticStyles);
-    }
-    /**
-     * @param {!string} id
-     * @param {!Element} frame
-     * @param {!StyleSheet} stylesheet
-     * @return {undefined}
-     **/
-    function setFramePosition(id, frame, stylesheet) {
-        frame.setAttribute('styleid', id);
-        var rule,
-            anchor = frame.getAttributeNS(textns, 'anchor-type'),
-            x = frame.getAttributeNS(svgns, 'x'),
-            y = frame.getAttributeNS(svgns, 'y'),
-            width = frame.getAttributeNS(svgns, 'width'),
-            height = frame.getAttributeNS(svgns, 'height'),
-            minheight = frame.getAttributeNS(fons, 'min-height'),
-            minwidth = frame.getAttributeNS(fons, 'min-width');
-        if (anchor === "as-char") {
-            rule = 'display: inline-block;';
-        } else if (anchor || x || y) {
-            rule = 'position: absolute;';
-        } else if (width || height || minheight || minwidth) {
-            rule = 'display: block;';
-        }
-        if (x) {
-            rule += 'left: ' + x + ';';
-        }
-        if (y) {
-            rule += 'top: ' + y + ';';
-        }
-        if (width) {
-            rule += 'width: ' + width + ';';
-        }
-        if (height) {
-            rule += 'height: ' + height + ';';
-        }
-        if (minheight) {
-            rule += 'min-height: ' + minheight + ';';
-        }
-        if (minwidth) {
-            rule += 'min-width: ' + minwidth + ';';
-        }
-        if (rule) {
-            rule = 'draw|' + frame.localName + '[styleid="' + id + '"] {' +
-                rule + '}';
-            stylesheet.insertRule(rule, stylesheet.cssRules.length);
-        }
-    }
-    /**
-     * @param {!Element} image
-     * @return {string}
-     **/
-    function getUrlFromBinaryDataElement(image) {
-        var node = image.firstChild;
-        while (node) {
-            if (node.namespaceURI === officens &&
-                    node.localName === "binary-data") {
-                // TODO: detect mime-type, assuming png for now
-                return "data:image/png;base64," + node.textContent;
-            }
-            node = node.nextSibling;
-        }
-        return "";
-    }
-    /**
-     * @param {!string} id
-     * @param {!Object} container
-     * @param {!Element} image
-     * @param {!StyleSheet} stylesheet
-     * @return {undefined}
-     **/
-    function setImage(id, container, image, stylesheet) {
-        image.setAttribute('styleid', id);
-        var url = image.getAttributeNS(xlinkns, 'href'),
-            part,
-            node;
-        function callback(url) {
-            var rule = "background-image: url(" + url + ");";
-            rule = 'draw|image[styleid="' + id + '"] {' + rule + '}';
-            stylesheet.insertRule(rule, stylesheet.cssRules.length);
-        }
-        // look for a office:binary-data
-        if (url) {
-            try {
-                if (container.getPartUrl) {
-                    url = container.getPartUrl(url);
-                    callback(url);
-                } else {
-                    part = container.getPart(url);
-                    part.onchange = function (part) {
-                        callback(part.url);
-                    };
-                    part.load();
-                }
-            } catch (e) {
-                runtime.log('slight problem: ' + e);
-            }
-        } else {
-            url = getUrlFromBinaryDataElement(image);
-            callback(url);
-        }
-    }
-    function formatParagraphAnchors(odfbody) {
-        var runtimens = "urn:webodf",
-            n,
-            i,
-            nodes = xpath.getODFElementsWithXPath(odfbody,
-                ".//*[*[@text:anchor-type='paragraph']]",
-                style2CSS.namespaceResolver);
-        for (i = 0; i < nodes.length; i += 1) {
-            n = nodes[i];
-            if (n.setAttributeNS) {
-                n.setAttributeNS(runtimens, "containsparagraphanchor", true);
-            }
-        }
-    }
-    /**
-     * @param {!Object} container
-     * @param {!Element} odfbody
-     * @param {!StyleSheet} stylesheet
-     * @return {undefined}
-     **/
-    function modifyImages(container, odfbody, stylesheet) {
-        var node,
-            frames,
-            i,
-            images;
-        function namespaceResolver(prefix) {
-            return namespaces[prefix];
-        }
-        // find all the frame elements
-        frames = [];
-        node = odfbody.firstChild;
-        while (node && node !== odfbody) {
-            if (node.namespaceURI === drawns) {
-                frames[frames.length] = node;
-            }
-            if (node.firstChild) {
-                node = node.firstChild;
-            } else {
-                while (node && node !== odfbody && !node.nextSibling) {
-                    node = node.parentNode;
-                }
-                if (node && node.nextSibling) {
-                    node = node.nextSibling;
-                }
-            }
-        }
-        // adjust all the frame positions
-        for (i = 0; i < frames.length; i += 1) {
-            node = frames[i];
-            setFramePosition('frame' + String(i), node, stylesheet);
-        }
-        formatParagraphAnchors(odfbody);
-    }
-    /**
-     * Load all the images that are inside an odf element.
-     * @param {!Object} container
-     * @param {!Element} odffragment
-     * @param {!StyleSheet} stylesheet
-     * @return {undefined}
-     */
-    function loadImages(container, odffragment, stylesheet) {
-        var i,
-            images,
-            node;
-        // do delayed loading for all the images
-        function loadImage(name, container, node, stylesheet) {
-            // load image with a small delay to give the html ui a chance to
-            // update
-            loadingQueue.addToQueue(function () {
-                setImage(name, container, node, stylesheet);
-            });
-        }
-        images = odffragment.getElementsByTagNameNS(drawns, 'image');
-        for (i = 0; i < images.length; i += 1) {
-            node = /**@type{!Element}*/(images.item(i));
-            loadImage('image' + String(i), container, node, stylesheet);
-        }
-    }
-	/**
-     * @param {!string} id
-     * @param {!Object} container
-     * @param {!Element} plugin
-     * @param {!StyleSheet} stylesheet
-     * @return {undefined}
-     **/
-    function setVideo(id, container, plugin, stylesheet) {
-        var video, source, url, videoType, doc = plugin.ownerDocument, part, node;
-
-        url = plugin.getAttributeNS(xlinkns, 'href');
-
-        function callback(url, mimetype) {
-            // test for video mimetypes
-            if (mimetype.substr(0, 6) === 'video/') {
-                video = doc.createElementNS(doc.documentElement.namespaceURI, "video");
-                video.setAttribute('controls', 'controls');
-
-                source = doc.createElement('source');
-                source.setAttribute('src', url);
-                source.setAttribute('type', mimetype);
-
-                video.appendChild(source);
-                plugin.parentNode.appendChild(video);
-            } else {
-                plugin.innerHtml = 'Unrecognised Plugin';
-            }
-        }
-        // look for a office:binary-data
-        if (url) {
-            try {
-                if (container.getPartUrl) {
-                    url = container.getPartUrl(url);
-                    callback(url, 'video/mp4');
-                } else {
-                    part = container.getPart(url);
-                    part.onchange = function (part) {
-                        callback(part.url, part.mimetype);
-                    };
-                    part.load();
-                }
-            } catch (e) {
-                runtime.log('slight problem: ' + e);
-            }
-        } else {
-        // this will fail  atm - following function assumes PNG data]
-            runtime.log('using MP4 data fallback');
-            url = getUrlFromBinaryDataElement(plugin);
-            callback(url, 'video/mp4');
-        }
-    }
-    /**
-     * Load all the video that are inside an odf element.
-     * @param {!Object} container
-     * @param {!Element} odffragment
-     * @param {!StyleSheet} stylesheet
-     * @return {undefined}
-     */
-    function loadVideos(container, odffragment, stylesheet) {
-        var i,
-            plugins,
-            node;
-        // do delayed loading for all the videos
-        function loadVideo(name, container, node, stylesheet) {
-            // load video with a small delay to give the html ui a chance to
-            // update
-            loadingQueue.addToQueue(function () {
-                setVideo(name, container, node, stylesheet);
-            });
-        }
-        // embedded video is stored in a draw:plugin element
-        plugins = odffragment.getElementsByTagNameNS(drawns, 'plugin');
-        runtime.log('Loading Videos:');
-        
-        for (i = 0; i < plugins.length; i += 1) {
-            runtime.log('...Found a video.');
-            node = /**@type{!Element}*/(plugins.item(i));
-            loadVideo('video' + String(i), container, node, stylesheet);
-        }
-    }
-    /**
-     * @param {Document} document Put and ODF Canvas inside this element.
-     */
-    function addStyleSheet(document) {
-        var styles = document.getElementsByTagName("style"),
-            head = document.getElementsByTagName('head')[0],
-            text = '',
-            prefix,
-            a = "",
-            b;
-        // use cloneNode on an exisiting HTMLStyleElement, because in
-        // Chromium 12, document.createElement('style') does not give a
-        // HTMLStyleElement
-        if (styles && styles.length > 0) {
-            styles = styles[0].cloneNode(false);
-        } else {
-            styles = document.createElement('style');
-        }
-        for (prefix in namespaces) {
-            if (namespaces.hasOwnProperty(prefix) && prefix) {
-                text += "@namespace " + prefix + " url(" + namespaces[prefix] +
-                        ");\n";
-            }
-        }
-        styles.appendChild(document.createTextNode(text));
-        head.appendChild(styles);
-        return styles;
-    }
-    /**
-     * @constructor
-     * @param {!Element} element Put and ODF Canvas inside this element.
-     */
-    odf.OdfCanvas = function OdfCanvas(element) {
-        var self = this,
-            document = element.ownerDocument,
-            /**@type{odf.OdfContainer}*/ odfcontainer,
-            /**@type{!odf.Formatting}*/ formatting = new odf.Formatting(),
-            selectionWatcher = new SelectionWatcher(element),
-            slidecssindex = 0,
-            pageSwitcher = new PageSwitcher(addStyleSheet(document)),
-            stylesxmlcss = addStyleSheet(document),
-            positioncss = addStyleSheet(document),
-            editable = false,
-            zoomLevel = 1;
-
-        function fixContainerSize() {
-            var sizer = element.firstChild,
-                odfdoc = sizer.firstChild;
-            if (!odfdoc) {
-                return;
-            }
-            element.style.WebkitTransform = 'scale(' + zoomLevel + ')';
-            element.style.WebkitTransformOrigin = 'left top';
-            element.style.width = Math.round(zoomLevel * odfdoc.offsetWidth)
-                + "px";
-            element.style.height = Math.round(zoomLevel * odfdoc.offsetHeight)
-                + "px";
-        }
-        /**
-         * A new content.xml has been loaded. Update the live document with it.
-         * @param {!Object} container
-         * @param {!Element} odfnode
-         * @return {undefined}
-         **/
-        function handleContent(container, odfnode) {
-            var css = positioncss.sheet, sizer;
-            modifyImages(container, odfnode.body, css);
-/*
-            slidecssindex = css.insertRule(
-                'office|presentation draw|page:nth-child(1n) {display:block;}',
-                css.cssRules.length
-            );
-*/
-            // FIXME: this is a hack to have a defined background now
-            // should be removed as soon as we have sane background
-            // handling for pages
-            css.insertRule('draw|page { background-color:#fff; }',
-                css.cssRules.length);
-
-            // only append the content at the end
-            clear(element);
-            sizer = document.createElement('div');
-            sizer.style.display = "inline-block";
-            sizer.style.background = "white";
-            sizer.appendChild(odfnode);
-            element.appendChild(sizer);
-            loadImages(container, odfnode.body, css);
-            loadVideos(container, odfnode.body, css);
-            fixContainerSize();
-        }
-        /**
-         * @param {!odf.OdfContainer} container
-         * @return {undefined}
-         **/
-        function refreshOdf(container) {
-            if (odfcontainer !== container) {
-                return;
-            }
-
-            // synchronize the object a window.odfcontainer with the view
-            function callback() {
-                clear(element);
-                element.style.display = "inline-block";
-                var odfnode = container.rootElement;
-                element.ownerDocument.importNode(odfnode, true);
-
-                formatting.setOdfContainer(container);
-                handleStyles(odfnode, stylesxmlcss);
-                // do content last, because otherwise the document is constantly
-                // updated whenever the css changes
-                handleContent(container, odfnode);
-                fireEvent("statereadychange");
-            }
-
-            if (odfcontainer.state === odf.OdfContainer.DONE) {
-                callback();
-            } else {
-                odfcontainer.onchange = callback;
-            }
-        }
-
-        this.odfContainer = function () {
-            return odfcontainer;
-        };
-        this.slidevisibilitycss = function () {
-            return pageSwitcher.css;
-        };
-        /**
-         * @param {!string} url
-         * @return {undefined}
-         */
-        this["load"] = this.load = function (url) {
-            loadingQueue.clearQueue();
-            element.innerHTML = 'loading ' + url;
-            // open the odf container
-            odfcontainer = new odf.OdfContainer(url, function (container) {
-                odfcontainer = container;
-                refreshOdf(container);
-            });
-            odfcontainer.onstatereadychange = refreshOdf;
-        };
-
-        function stopEditing() {
-            if (!editparagraph) {
-                return;
-            }
-            var fragment = editparagraph.ownerDocument.createDocumentFragment();
-            while (editparagraph.firstChild) {
-                fragment.insertBefore(editparagraph.firstChild, null);
-            }
-            editparagraph.parentNode.replaceChild(fragment, editparagraph);
-        }
-
-        this.save = function (callback) {
-            stopEditing();
-            odfcontainer.save(callback);
-        };
-
-        function cancelPropagation(event) {
-            if (event.stopPropagation) {
-                event.stopPropagation();
-            } else {
-                event.cancelBubble = true;
-            }
-        }
-
-        function cancelEvent(event) {
-            if (event.preventDefault) {
-                event.preventDefault();
-                event.stopPropagation();
-            } else {
-                event.returnValue = false;
-                event.cancelBubble = true;
-            }
-        }
-
-        this.setEditable = function (iseditable) {
-            editable = iseditable;
-            if (!editable) {
-                stopEditing();
-            }
-        };
-
-        function processClick(evt) {
-            evt = evt || window.event;
-            // go up until we find a text:p, if we find it, wrap it in <p> and
-            // make that editable
-            var e = evt.target, selection = window.getSelection(),
-                range = ((selection.rangeCount > 0)
-                     ? selection.getRangeAt(0) : null),
-                startContainer = range && range.startContainer,
-                startOffset = range && range.startOffset,
-                endContainer = range && range.endContainer,
-                endOffset = range && range.endOffset;
-
-            while (e && !((e.localName === "p" || e.localName === "h") &&
-                    e.namespaceURI === textns)) {
-                e = e.parentNode;
-            }
-            if (!editable) {
-                return;
-            }
-            // test code for enabling editing
-            if (!e || e.parentNode === editparagraph) {
-                return;
-            }
-
-            if (!editparagraph) {
-                editparagraph = e.ownerDocument.createElement("p");
-                if (!editparagraph.style) {
-                    editparagraph = e.ownerDocument.createElementNS(
-                        "http://www.w3.org/1999/xhtml",
-                        "p"
-                    );
-                }
-                editparagraph.style.margin = "0px";
-                editparagraph.style.padding = "0px";
-                editparagraph.style.border = "0px";
-                editparagraph.setAttribute("contenteditable", true);
-            } else if (editparagraph.parentNode) {
-                stopEditing();
-            }
-            e.parentNode.replaceChild(editparagraph, e);
-            editparagraph.appendChild(e);
-
-            // set the cursor or selection at the right position
-            editparagraph.focus(); // needed in FF to show cursor in the paragraph
-            if (range) {
-                selection.removeAllRanges();
-                range = e.ownerDocument.createRange();
-                range.setStart(startContainer, startOffset);
-                range.setEnd(endContainer, endOffset);
-                selection.addRange(range);
-            }
-            cancelEvent(evt);
-        }
-
-        /**
-         * @param {!string} eventName
-         * @param {!function(*)} handler
-         * @return {undefined}
-         */
-        this.addListener = function (eventName, handler) {
-            if (eventName === "selectionchange") {
-                selectionWatcher.addListener(eventName, handler);
-            } else {
-                addEventListener(eventName, handler);
-            }
-        };
-        /**
-         * @return {!odf.Formatting}
-         */
-        this.getFormatting = function () {
-            return formatting;
-        };
-        /**
-         * @param {!number} zoom
-         * @return {undefined}
-         */
-        this.setZoomLevel = function (zoom) {
-            zoomLevel = zoom;
-            fixContainerSize();
-        };
-        /**
-         * @return {!number}
-         */
-        this.getZoomLevel = function () {
-            return zoomLevel;
-        };
-        /**
-         * @param {!number} width
-         * @param {!number} height
-         * @return {undefined}
-         */
-        this.fitToContainingElement = function (width, height) {
-            var realWidth = element.offsetWidth / zoomLevel,
-                realHeight = element.offsetHeight / zoomLevel;
-            zoomLevel = width / realWidth;
-            if (height / realHeight < zoomLevel) {
-                zoomLevel = height / realHeight;
-            }
-            fixContainerSize();
-        };
-        /**
-         * @param {!number} width
-         * @return {undefined}
-         */
-        this.fitToWidth = function (width) {
-            var realWidth = element.offsetWidth / zoomLevel;
-            zoomLevel = width / realWidth;
-            fixContainerSize();
-        };
-        /**
-         * @param {!number} height
-         * @return {undefined}
-         */
-        this.fitToHeight = function (height) {
-            var realHeight = element.offsetHeight / zoomLevel;
-            zoomLevel = height / realHeight;
-            fixContainerSize();
-        };
-        /**
-         * @return {undefined}
-         */
-        this.showNextPage = function () {
-            pageSwitcher.showNextPage();
-        };
-        /**
-         * @return {undefined}
-         */
-        this.showPreviousPage = function () {
-            pageSwitcher.showPreviousPage();
-        };
-        /**
-         * @return {undefined}
-         */
-        this.showAllPages = function () {
-        };
-
-        listenEvent(element, "click", processClick);
-    };
-    return odf.OdfCanvas;
-}());
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/odf/OdfContainer.js b/apps/files_odfviewer/src/webodf/webodf/lib/odf/OdfContainer.js
deleted file mode 100644
index 709addbecd..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/lib/odf/OdfContainer.js
+++ /dev/null
@@ -1,672 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global runtime: true, core: true, xmldom: true, odf: true, DOMParser: true,
-  document: true */
-runtime.loadClass("core.Base64");
-runtime.loadClass("core.Zip");
-runtime.loadClass("xmldom.LSSerializer");
-runtime.loadClass("odf.StyleInfo");
-runtime.loadClass("odf.Style2CSS");
-runtime.loadClass("odf.FontLoader");
-/**
- * The OdfContainer class manages the various parts that constitues an ODF
- * document.
- * @constructor
- * @param {!string} url
- * @param {!Function|null} onstatereadychange
- **/
-odf.OdfContainer = (function () {
-    "use strict";
-    var styleInfo = new odf.StyleInfo(),
-        style2CSS = new odf.Style2CSS(),
-        namespaces = style2CSS.namespaces,
-        officens = "urn:oasis:names:tc:opendocument:xmlns:office:1.0",
-        manifestns = "urn:oasis:names:tc:opendocument:xmlns:manifest:1.0",
-        nodeorder = ['meta', 'settings', 'scripts', 'font-face-decls', 'styles',
-            'automatic-styles', 'master-styles', 'body'],
-        base64 = new core.Base64(),
-        fontLoader = new odf.FontLoader(),
-        partMimetypes = {};
-    /**
-     * @param {?Node} node
-     * @param {!string} ns
-     * @param {!string} name
-     * @return {?Node}
-     */
-    function getDirectChild(node, ns, name) {
-        node = (node) ? node.firstChild : null;
-        while (node) {
-            if (node.localName === name && node.namespaceURI === ns) {
-                return node;
-            }
-            node = node.nextSibling;
-        }
-        return null;
-    }
-    /**
-     * Return the position the node should get according to the ODF flat format.
-     * @param {!Node} child
-     * @return {!number}
-     */
-    function getNodePosition(child) {
-        var childpos = 0, i, l = nodeorder.length;
-        for (i = 0; i < l; i += 1) {
-            if (child.namespaceURI === officens &&
-                    child.localName === nodeorder[i]) {
-                return i;
-            }
-        }
-        return -1;
-    }
-    /**
-     * Class that filters runtime specific nodes from the DOM.
-     * @constructor
-     * @implements {xmldom.LSSerializerFilter}
-     * @param {!Element} odfroot
-     * @param {!Element=} usedStylesElement
-     */
-    function OdfNodeFilter(odfroot, usedStylesElement) {
-        var automaticStyles = odfroot.automaticStyles,
-            usedKeysList;
-        if (usedStylesElement) {
-            usedKeysList = new styleInfo.UsedKeysList(usedStylesElement);
-        }
-        /**
-         * @param {!Node} node
-         * @return {!number}
-         */
-        this.acceptNode = function (node) {
-            var styleName, styleFamily, result;
-            if (node.namespaceURI === "http://www.w3.org/1999/xhtml") {
-                result = 3; // FILTER_SKIP
-            } else if (usedKeysList && node.parentNode === automaticStyles &&
-                    node.nodeType === 1) {
-                if (usedKeysList.uses(node)) {
-                    result = 1; // FILTER_ACCEPT
-                } else {
-                    result = 2; // FILTER_REJECT
-                }
-            } else {
-                result = 1; // FILTER_ACCEPT
-            }
-            return result;
-        };
-    }
-    /**
-     * Put the element at the right position in the parent.
-     * The right order is given by the value returned from getNodePosition.
-     * @param {!Node} node
-     * @param {?Node} child
-     * @return {undefined}
-     */
-    function setChild(node, child) {
-        if (!child) {
-            return;
-        }
-        var childpos = getNodePosition(child),
-            pos,
-            c = node.firstChild;
-        if (childpos === -1) {
-            return;
-        }
-        while (c) {
-            pos = getNodePosition(c);
-            if (pos !== -1 && pos > childpos) {
-                break;
-            }
-            c = c.nextSibling;
-        }
-        node.insertBefore(child, c);
-    }
-    /**
-     * A DOM element that is part of and ODF part of a DOM.
-     * @constructor
-     * @extends {Element}
-     */
-    function ODFElement() {
-    }
-    /**
-     * The root element of an ODF document.
-     * @constructor
-     * @extends {ODFElement}
-     */
-    function ODFDocumentElement(odfcontainer) {
-        this.OdfContainer = odfcontainer;
-    }
-    ODFDocumentElement.prototype = new ODFElement();
-    ODFDocumentElement.prototype.constructor = ODFDocumentElement;
-    ODFDocumentElement.namespaceURI = officens;
-    ODFDocumentElement.localName = 'document';
-    // private constructor
-    /**
-     * @constructor
-     * @param {!string} name
-     * @param {!odf.OdfContainer} container
-     * @param {!core.Zip} zip
-     */
-    function OdfPart(name, container, zip) {
-        var self = this,
-            privatedata;
-
-        // declare public variables
-        this.size = 0;
-        this.type = null;
-        this.name = name;
-        this.container = container;
-        this.url = null;
-        this.mimetype = null;
-        this.document = null;
-        this.onreadystatechange = null;
-        this.onchange = null;
-        this.EMPTY = 0;
-        this.LOADING = 1;
-        this.DONE = 2;
-        this.state = this.EMPTY;
-
-        // private functions
-        // public functions
-        this.load = function () {
-            var mimetype = partMimetypes[name];
-            this.mimetype = mimetype;
-            zip.loadAsDataURL(name, mimetype, function (err, url) {
-                self.url = url;
-                if (self.onchange) {
-                    self.onchange(self);
-                }
-                if (self.onstatereadychange) {
-                    self.onstatereadychange(self);
-                }
-            });
-        };
-        this.abort = function () {
-            // TODO
-        };
-    }
-    OdfPart.prototype.load = function () {
-    };
-    OdfPart.prototype.getUrl = function () {
-        if (this.data) {
-            return 'data:;base64,' + base64.toBase64(this.data);
-        }
-        return null;
-    };
-    /**
-     * @constructor
-     * @param {!odf.OdfContainer} odfcontainer
-     */
-    function OdfPartList(odfcontainer) {
-        var self = this;
-        // declare public variables
-        this.length = 0;
-        this.item = function (index) {
-        };
-    }
-    /**
-     * @constructor
-     * @param {!string} url
-     * @param {!Function|null} onstatereadychange
-     */
-    odf.OdfContainer = function OdfContainer(url, onstatereadychange) {
-        var self = this,
-            zip = null,
-            contentXmlCompletelyLoaded = false;
-
-        // NOTE each instance of OdfContainer has a copy of the private functions
-        // it would be better to have a class OdfContainerPrivate where the
-        // private functions can be defined via OdfContainerPrivate.prototype
-        // without exposing them
-
-        // declare public variables
-        this.onstatereadychange = onstatereadychange;
-        this.onchange = null;
-        this.state = null;
-        this.rootElement = null;
-        this.parts = null;
-
-        /**
-         * @param {!Element} element
-         * @return {undefined}
-         */
-        function removeProcessingInstructions(element) {
-            var n = element.firstChild, next, e;
-            while (n) {
-                next = n.nextSibling;
-                if (n.nodeType === 1) { // ELEMENT
-                    e = /**@type{!Element}*/(n);
-                    removeProcessingInstructions(e);
-                } else if (n.nodeType === 7) { // PROCESSING_INSTRUCTION_NODE
-                    element.removeChild(n);
-                }
-                n = next;
-            }
-        }
-
-        // private functions
-        /**
-         * Import the document elementnode into the DOM of OdfContainer.
-         * Any processing instructions are removed, since importing them
-         * gives an exception.
-         * @param {!Document} xmldoc
-         * @return {!Node}
-         */
-        function importRootNode(xmldoc) {
-            var doc = self.rootElement.ownerDocument,
-                node;
-            // remove all processing instructions
-            // TODO: replace cursor processing instruction with an element
-            if (xmldoc) {
-                removeProcessingInstructions(xmldoc.documentElement);
-                try {
-                    node = doc.importNode(xmldoc.documentElement, true);
-                } catch (e) {
-                }
-            }
-            return node;
-        }
-        function setState(state) {
-            self.state = state;
-            if (self.onchange) {
-                self.onchange(self);
-            }
-            if (self.onstatereadychange) {
-                self.onstatereadychange(self);
-            }
-        }
-        /**
-         * @param {!Document} xmldoc
-         * @return {undefined}
-         */
-        function handleFlatXml(xmldoc) {
-            var root = importRootNode(xmldoc);
-            if (!root || root.localName !== 'document' ||
-                    root.namespaceURI !== officens) {
-                setState(OdfContainer.INVALID);
-                return;
-            }
-            self.rootElement = root;
-            root.fontFaceDecls = getDirectChild(root, officens, 'font-face-decls');
-            root.styles = getDirectChild(root, officens, 'styles');
-            root.automaticStyles = getDirectChild(root, officens,
-                    'automatic-styles');
-            root.masterStyles = getDirectChild(root, officens, 'master-styles');
-            root.body = getDirectChild(root, officens, 'body');
-            root.meta = getDirectChild(root, officens, 'meta');
-            setState(OdfContainer.DONE);
-        }
-        /**
-         * @param {!Document} xmldoc
-         * @return {undefined}
-         */
-        function handleStylesXml(xmldoc) {
-            var node = importRootNode(xmldoc),
-                root = self.rootElement;
-            if (!node || node.localName !== 'document-styles' ||
-                    node.namespaceURI !== officens) {
-                setState(OdfContainer.INVALID);
-                return;
-            }
-            root.fontFaceDecls = getDirectChild(node, officens, 'font-face-decls');
-            setChild(root, root.fontFaceDecls);
-            root.styles = getDirectChild(node, officens, 'styles');
-            setChild(root, root.styles);
-            root.automaticStyles = getDirectChild(node, officens,
-                    'automatic-styles');
-            setChild(root, root.automaticStyles);
-            root.masterStyles = getDirectChild(node, officens, 'master-styles');
-            setChild(root, root.masterStyles);
-            //removeUnusedAutomaticStyles(root.automaticStyles,
-            //        root.masterStyles);
-            fontLoader.loadFonts(root.fontFaceDecls, zip, null);
-        }
-        /**
-         * @param {!Document} xmldoc
-         * @return {undefined}
-         */
-        function handleContentXml(xmldoc) {
-            var node = importRootNode(xmldoc),
-                root,
-                automaticStyles,
-                fontFaceDecls,
-                c;
-            if (!node || node.localName !== 'document-content' ||
-                    node.namespaceURI !== officens) {
-                setState(OdfContainer.INVALID);
-                return;
-            }
-            root = self.rootElement;
-            fontFaceDecls = getDirectChild(node, officens, 'font-face-decls');
-            if (root.fontFaceDecls && fontFaceDecls) {
-                c = fontFaceDecls.firstChild;
-                while (c) {
-                    root.fontFaceDecls.appendChild(c);
-                    c = fontFaceDecls.firstChild;
-                }
-            } else if (fontFaceDecls) {
-                root.fontFaceDecls = fontFaceDecls;
-                setChild(root, fontFaceDecls);
-            }
-            automaticStyles = getDirectChild(node, officens, 'automatic-styles');
-            if (root.automaticStyles && automaticStyles) {
-                c = automaticStyles.firstChild;
-                while (c) {
-                    root.automaticStyles.appendChild(c);
-                    c = automaticStyles.firstChild; // works because node c moved
-                }
-            } else if (automaticStyles) {
-                root.automaticStyles = automaticStyles;
-                setChild(root, automaticStyles);
-            }
-            root.body = getDirectChild(node, officens, 'body');
-            setChild(root, root.body);
-        }
-        /**
-         * @param {!Document} xmldoc
-         * @return {undefined}
-         */
-        function handleMetaXml(xmldoc) {
-            var node = importRootNode(xmldoc),
-                root;
-            if (!node || node.localName !== 'document-meta' ||
-                    node.namespaceURI !== officens) {
-                return;
-            }
-            root = self.rootElement;
-            root.meta = getDirectChild(node, officens, 'meta');
-            setChild(root, root.meta);
-        }
-        /**
-         * @param {!Document} xmldoc
-         * @return {undefined}
-         */
-        function handleSettingsXml(xmldoc) {
-            var node = importRootNode(xmldoc),
-                root;
-            if (!node || node.localName !== 'document-settings' ||
-                    node.namespaceURI !== officens) {
-                return;
-            }
-            root = self.rootElement;
-            root.settings = getDirectChild(node, officens, 'settings');
-            setChild(root, root.settings);
-        }
-        /**
-         * @param {!Document} xmldoc
-         * @return {undefined}
-         */
-        function handleManifestXml(xmldoc) {
-            var node = importRootNode(xmldoc),
-                root,
-                n;
-            if (!node || node.localName !== 'manifest' ||
-                    node.namespaceURI !== manifestns) {
-                return;
-            }
-            root = self.rootElement;
-            root.manifest = node;
-            n = root.manifest.firstChild;
-            while (n) {
-                if (n.nodeType === 1 && n.localName === "file-entry" &&
-                        n.namespaceURI === manifestns) {
-                    partMimetypes[n.getAttributeNS(manifestns, "full-path")] =
-                            n.getAttributeNS(manifestns, "media-type");
-                }
-                n = n.nextSibling;
-            }
-        }
-        /**
-         * @param {!function(?string,?Document)} callback
-         * @return {undefined}
-         */
-        function getContentXmlNode(callback) {
-            var handler = {
-                rootElementReady: function (err, rootxml, done) {
-                    contentXmlCompletelyLoaded = err || done;
-                    if (err) {
-                        return callback(err, null);
-                    }
-                    var parser = new DOMParser();
-                    rootxml = parser.parseFromString(rootxml, "text/xml");
-                    callback(null, rootxml);
-                },
-                bodyChildElementsReady: function (err, nodes, done) {
-                    // TODO
-                }
-            };
-            zip.loadContentXmlAsFragments("content.xml", handler);
-        }
-        /**
-         * @param {!string} filepath
-         * @param {!function(?string,?Document)} callback
-         * @return {undefined}
-         */
-        function getXmlNode(filepath, callback) {
-            zip.loadAsDOM(filepath, callback);
-        }
-        /**
-         * @return {undefined}
-         */
-        function loadComponents() {
-            // always load content.xml, meta.xml, styles.xml and settings.xml
-            getXmlNode('styles.xml', function (err, xmldoc) {
-                handleStylesXml(xmldoc);
-                if (self.state === OdfContainer.INVALID) {
-                    return;
-                }
-                getXmlNode('content.xml', function (err, xmldoc) {
-                    handleContentXml(xmldoc);
-                    if (self.state === OdfContainer.INVALID) {
-                        return;
-                    }
-                    getXmlNode('meta.xml', function (err, xmldoc) {
-                        handleMetaXml(xmldoc);
-                        if (self.state === OdfContainer.INVALID) {
-                            return;
-                        }
-                        getXmlNode('settings.xml', function (err, xmldoc) {
-                            if (xmldoc) {
-                                handleSettingsXml(xmldoc);
-                            }
-                            getXmlNode('META-INF/manifest.xml', function (err,
-                                    xmldoc) {
-                                if (xmldoc) {
-                                    handleManifestXml(xmldoc);
-                                }
-                                if (self.state !== OdfContainer.INVALID) {
-                                    setState(OdfContainer.DONE);
-                                }
-                            });
-                        });
-                    });
-                });
-            });
-        }
-        function documentElement(name, map) {
-            var s = "", i;
-            for (i in map) {
-                if (map.hasOwnProperty(i)) {
-                    s += " xmlns:" + i + "=\"" + map[i] + "\"";
-                }
-            }
-            return "<?xml version=\"1.0\" encoding=\"UTF-8\"?><office:" + name +
-                    " " + s + " office:version=\"1.2\">";
-        }
-        /**
-         * @return {!string}
-         */
-        function serializeMetaXml() {
-            var nsmap = style2CSS.namespaces,
-                serializer = new xmldom.LSSerializer(),
-                /**@type{!string}*/ s = documentElement("document-meta", nsmap);
-            serializer.filter = new OdfNodeFilter(self.rootElement);
-            s += serializer.writeToString(self.rootElement.meta, nsmap);
-            s += "</office:document-meta>";
-            return s;
-        }
-        /**
-         * @return {!string}
-         */
-        function serializeSettingsXml() {
-            var nsmap = style2CSS.namespaces,
-                serializer = new xmldom.LSSerializer(),
-                /**@type{!string}*/ s = documentElement("document-settings", nsmap);
-            serializer.filter = new OdfNodeFilter(self.rootElement);
-            s += serializer.writeToString(self.rootElement.settings, nsmap);
-            s += "</office:document-settings>";
-            return s;
-        }
-        /**
-         * @return {!string}
-         */
-        function serializeStylesXml() {
-            var nsmap = style2CSS.namespaces,
-                serializer = new xmldom.LSSerializer(),
-                /**@type{!string}*/ s = documentElement("document-styles", nsmap);
-            serializer.filter = new OdfNodeFilter(self.rootElement,
-                    self.rootElement.masterStyles);
-            s += serializer.writeToString(self.rootElement.fontFaceDecls, nsmap);
-            s += serializer.writeToString(self.rootElement.styles, nsmap);
-            s += serializer.writeToString(self.rootElement.automaticStyles, nsmap);
-            s += serializer.writeToString(self.rootElement.masterStyles, nsmap);
-            s += "</office:document-styles>";
-            return s;
-        }
-        /**
-         * @return {!string}
-         */
-        function serializeContentXml() {
-            var nsmap = style2CSS.namespaces,
-                serializer = new xmldom.LSSerializer(),
-                /**@type{!string}*/ s = documentElement("document-content", nsmap);
-            serializer.filter = new OdfNodeFilter(self.rootElement,
-                    self.rootElement.body);
-            // Until there is code to  determine if a font is referenced only
-            // from all font declaratios will be stored in styles.xml
-            s += serializer.writeToString(self.rootElement.automaticStyles, nsmap);
-            s += serializer.writeToString(self.rootElement.body, nsmap);
-            s += "</office:document-content>";
-            return s;
-        }
-        function createElement(Type) {
-            var original = document.createElementNS(
-                    Type.namespaceURI,
-                    Type.localName
-                ),
-                method,
-                iface = new Type();
-            for (method in iface) {
-                if (iface.hasOwnProperty(method)) {
-                    original[method] = iface[method];
-                }
-            }
-            return original;
-        }
-        function loadFromXML(url, callback) {
-            runtime.loadXML(url, function (err, dom) {
-                if (err) {
-                    callback(err);
-                } else {
-                    handleFlatXml(dom);
-                }
-            });
-        }
-        // public functions
-        /**
-         * Open file and parse it. Return the XML Node. Return the root node of
-         * the file or null if this is not possible.
-         * For 'content.xml', 'styles.xml', 'meta.xml', and 'settings.xml', the
-         * elements 'document-content', 'document-styles', 'document-meta', or
-         * 'document-settings' will be returned respectively.
-         * @param {!string} partname
-         * @return {!OdfPart}
-         **/
-        this.getPart = function (partname) {
-            return new OdfPart(partname, self, zip);
-        };
-        /**
-         * @param {function(?string):undefined} callback
-         * @return {undefined}
-         */
-        this.save = function (callback) {
-            // the assumption so far is that all ODF parts are serialized
-            // already, but meta, settings, styles and content should be
-            // refreshed
-            // update the zip entries with the data from the live ODF DOM
-            var data;
-            data = runtime.byteArrayFromString(serializeSettingsXml(), "utf8");
-            zip.save("settings.xml", data, true, new Date());
-            data = runtime.byteArrayFromString(serializeMetaXml(), "utf8");
-            zip.save("meta.xml", data, true, new Date());
-            data = runtime.byteArrayFromString(serializeStylesXml(), "utf8");
-            zip.save("styles.xml", data, true, new Date());
-            data = runtime.byteArrayFromString(serializeContentXml(), "utf8");
-            zip.save("content.xml", data, true, new Date());
-            zip.write(function (err) {
-                callback(err);
-            });
-        };
-
-        // initialize public variables
-        this.state = OdfContainer.LOADING;
-        this.rootElement = createElement(ODFDocumentElement);
-        this.parts = new OdfPartList(this);
-
-        // initialize private variables
-        zip = new core.Zip(url, function (err, zipobject) {
-            zip = zipobject;
-            if (err) {
-                loadFromXML(url, function (xmlerr) {
-                    if (err) {
-                        zip.error = err + "\n" + xmlerr;
-                        setState(OdfContainer.INVALID);
-                    }
-                });
-            } else {
-                loadComponents();
-            }
-        });
-    };
-    odf.OdfContainer.EMPTY = 0;
-    odf.OdfContainer.LOADING = 1;
-    odf.OdfContainer.DONE = 2;
-    odf.OdfContainer.INVALID = 3;
-    odf.OdfContainer.SAVING = 4;
-    odf.OdfContainer.MODIFIED = 5;
-    /**
-     * @param {!string} url
-     * @return {!odf.OdfContainer}
-     */
-    odf.OdfContainer.getContainer = function (url) {
-        return new odf.OdfContainer(url, null);
-    };
-    return odf.OdfContainer;
-}());
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/odf/Style2CSS.js b/apps/files_odfviewer/src/webodf/webodf/lib/odf/Style2CSS.js
deleted file mode 100644
index f33e3faef4..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/lib/odf/Style2CSS.js
+++ /dev/null
@@ -1,632 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global odf: true, runtime: true*/
-/**
- * @constructor
- */
-odf.Style2CSS = function Style2CSS() {
-    "use strict";
-    // helper constants
-    var xlinkns = 'http://www.w3.org/1999/xlink',
-        drawns = "urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",
-        fons = "urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0",
-        officens = "urn:oasis:names:tc:opendocument:xmlns:office:1.0",
-        presentationns = "urn:oasis:names:tc:opendocument:xmlns:presentation:1.0",
-        stylens = "urn:oasis:names:tc:opendocument:xmlns:style:1.0",
-        svgns = "urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0",
-        tablens = "urn:oasis:names:tc:opendocument:xmlns:table:1.0",
-        textns = "urn:oasis:names:tc:opendocument:xmlns:text:1.0",
-        namespaces = {
-            "draw": drawns,
-            "fo": fons,
-            "office": officens,
-            "presentation": presentationns,
-            "style": stylens,
-            "svg": svgns,
-            "table": tablens,
-            "text": textns,
-            "xlink": xlinkns
-        },
-
-        familynamespaceprefixes = {
-            'graphic': 'draw',
-            'paragraph': 'text',
-            'presentation': 'presentation',
-            'ruby': 'text',
-            'section': 'text',
-            'table': 'table',
-            'table-cell': 'table',
-            'table-column': 'table',
-            'table-row': 'table',
-            'text': 'text',
-            'list': 'text'
-        },
-
-        familytagnames = {
-            'graphic': ['circle', 'connected', 'control', 'custom-shape',
-                'ellipse', 'frame', 'g', 'line', 'measure', 'page',
-                'page-thumbnail', 'path', 'polygon', 'polyline', 'rect',
-                'regular-polygon' ],
-            'paragraph': ['alphabetical-index-entry-template', 'h',
-                'illustration-index-entry-template', 'index-source-style',
-                'object-index-entry-template', 'p',
-                'table-index-entry-template', 'table-of-content-entry-template',
-                'user-index-entry-template'],
-            'presentation': ['caption', 'circle', 'connector', 'control',
-                'custom-shape', 'ellipse', 'frame', 'g', 'line', 'measure',
-                'page-thumbnail', 'path', 'polygon', 'polyline', 'rect',
-                'regular-polygon'],
-            'ruby': ['ruby', 'ruby-text'],
-            'section': ['alphabetical-index', 'bibliography',
-                'illustration-index', 'index-title', 'object-index', 'section',
-                'table-of-content', 'table-index', 'user-index'],
-            'table': ['background', 'table'],
-            'table-cell': ['body', 'covered-table-cell', 'even-columns',
-                'even-rows', 'first-column', 'first-row', 'last-column',
-                'last-row', 'odd-columns', 'odd-rows', 'table-cell'],
-            'table-column': ['table-column'],
-            'table-row': ['table-row'],
-            'text': ['a', 'index-entry-chapter', 'index-entry-link-end',
-                'index-entry-link-start', 'index-entry-page-number',
-                'index-entry-span', 'index-entry-tab-stop', 'index-entry-text',
-                'index-title-template', 'linenumbering-configuration',
-                'list-level-style-number', 'list-level-style-bullet',
-                'outline-level-style', 'span'],
-            'list': ['list-item']
-        },
-
-        textPropertySimpleMapping = [
-            [ fons, 'color', 'color' ],
-            // this sets the element background, not just the text background
-            [ fons, 'background-color', 'background-color' ],
-            [ fons, 'font-weight', 'font-weight' ],
-            [ fons, 'font-style', 'font-style' ],
-            [ fons, 'font-size', 'font-size' ]
-        ],
-
-        bgImageSimpleMapping = [
-            [ stylens, 'repeat', 'background-repeat' ]
-        ],
-
-        paragraphPropertySimpleMapping = [
-            [ fons, 'background-color', 'background-color' ],
-            [ fons, 'text-align', 'text-align' ],
-            [ fons, 'padding-left', 'padding-left' ],
-            [ fons, 'padding-right', 'padding-right' ],
-            [ fons, 'padding-top', 'padding-top' ],
-            [ fons, 'padding-bottom', 'padding-bottom' ],
-            [ fons, 'border-left', 'border-left' ],
-            [ fons, 'border-right', 'border-right' ],
-            [ fons, 'border-top', 'border-top' ],
-            [ fons, 'border-bottom', 'border-bottom' ],
-            [ fons, 'margin-left', 'margin-left' ],
-            [ fons, 'margin-right', 'margin-right' ],
-            [ fons, 'margin-top', 'margin-top' ],
-            [ fons, 'margin-bottom', 'margin-bottom' ],
-            [ fons, 'border', 'border' ]
-        ],
-
-        graphicPropertySimpleMapping = [
-            [ drawns, 'fill-color', 'background-color' ],
-            [ drawns, 'fill', 'background' ],
-            [ fons, 'min-height', 'min-height' ],
-            [ drawns, 'stroke', 'border' ],
-            [ svgns, 'stroke-color', 'border-color' ]
-        ],
-
-        tablecellPropertySimpleMapping = [
-            [ fons, 'background-color', 'background-color' ],
-            [ fons, 'border-left', 'border-left' ],
-            [ fons, 'border-right', 'border-right' ],
-            [ fons, 'border-top', 'border-top' ],
-            [ fons, 'border-bottom', 'border-bottom' ]
-        ];
-
-    // helper functions
-    /**
-     * @param {string} prefix
-     * @return {string}
-     */
-    function namespaceResolver(prefix) {
-        return namespaces[prefix] || null;
-    }
-    /**
-     * @param {!Document} doc
-     * @param {!Element} stylesnode
-     * @return {!Object}
-     */
-    function getStyleMap(doc, stylesnode) {
-        // put all style elements in a hash map by family and name
-        var stylemap = {}, node, name, family, map;
-        if (!stylesnode) {
-            return stylemap;
-        }
-        node = stylesnode.firstChild;
-        while (node) {
-            if (node.namespaceURI === stylens && node.localName === 'style') {
-                family = node.getAttributeNS(stylens, 'family');
-            } else if (node.namespaceURI === textns &&
-                    node.localName === 'list-style') {
-                family = "list";
-            }
-            name = family && node.getAttributeNS &&
-                    node.getAttributeNS(stylens, 'name');
-            if (name) {
-               if (!stylemap[family]) {
-                   stylemap[family] = {};
-               }
-               stylemap[family][name] = node;
-            }
-            node = node.nextSibling;
-        }
-        return stylemap;
-    }
-    /**
-     * @param {?Object} stylestree
-     * @param {?string} name
-     * @return {?string}
-     */
-    function findStyle(stylestree, name) {
-        if (!name || !stylestree) {
-            return null;
-        }
-        if (stylestree[name]) {
-            return stylestree[name];
-        }
-        var derivedStyles = stylestree.derivedStyles,
-            n, style;
-        for (n in stylestree) {
-            if (stylestree.hasOwnProperty(n)) {
-                style = findStyle(stylestree[n].derivedStyles, name);
-                if (style) {
-                    return style;
-                }
-            }
-        }
-        return null;
-    }
-    /**
-     * @param {!string} stylename
-     * @param {!Object} stylesmap
-     * @param {!Object} stylestree
-     * @return {undefined}
-     */
-    function addStyleToStyleTree(stylename, stylesmap, stylestree) {
-        var style = stylesmap[stylename], parentname, parentstyle;
-        if (!style) {
-            return;
-        }
-        parentname = style.getAttributeNS(stylens, 'parent-style-name');
-        parentstyle = null;
-        if (parentname) {
-            parentstyle = findStyle(stylestree, parentname);
-            if (!parentstyle && stylesmap[parentname]) {
-                // parent style has not been handled yet, do that now
-                addStyleToStyleTree(parentname, stylesmap, stylestree);
-                parentstyle = stylesmap[parentname];
-                stylesmap[parentname] = null;
-            }
-        }
-        if (parentstyle) {
-            if (!parentstyle.derivedStyles) {
-                parentstyle.derivedStyles = {};
-            }
-            parentstyle.derivedStyles[stylename] = style;
-        } else {
-            // no parent so add the root
-            stylestree[stylename] = style;
-        }
-    }
-    /**
-     * @param {!Object} stylesmap
-     * @param {!Object} stylestree
-     * @return {undefined}
-     */
-    function addStyleMapToStyleTree(stylesmap, stylestree) {
-        var name;
-        for (name in stylesmap) {
-            if (stylesmap.hasOwnProperty(name)) {
-                addStyleToStyleTree(name, stylesmap, stylestree);
-                stylesmap[name] = null;
-            }
-        }
-    }
-    /**
-     * @param {!string} family
-     * @param {!string} name
-     * @return {?string}
-     */
-    function createSelector(family, name) {
-        var prefix = familynamespaceprefixes[family],
-            namepart,
-            selector = "",
-            first = true;
-        if (prefix === null) {
-            return null;
-        }
-        namepart = '[' + prefix + '|style-name="' + name + '"]';
-        if (prefix === 'presentation') {
-            prefix = 'draw';
-            namepart = '[presentation|style-name="' + name + '"]';
-        }
-        return prefix + '|' + familytagnames[family].join(
-                namepart + ',' + prefix + '|') + namepart;
-    }
-    /**
-     * @param {!string} family
-     * @param {!string} name
-     * @param {!Element} node
-     * @return {!Array}
-     */
-    function getSelectors(family, name, node) {
-        var selectors = [], n, ss, s;
-        selectors.push(createSelector(family, name));
-        for (n in node.derivedStyles) {
-            if (node.derivedStyles.hasOwnProperty(n)) {
-                ss = getSelectors(family, n, node.derivedStyles[n]);
-                for (s in ss) {
-                    if (ss.hasOwnProperty(s)) {
-                        selectors.push(ss[s]);
-                    }
-                }
-            }
-        }
-        return selectors;
-    }
-    /**
-     * @param {?Element} node
-     * @param {!string} ns
-     * @param {!string} name
-     * @return {?Element}
-     */
-    function getDirectChild(node, ns, name) {
-        if (!node) {
-            return null;
-        }
-        var c = node.firstChild, e;
-        while (c) {
-            if (c.namespaceURI === ns && c.localName === name) {
-                e = /**@type{Element}*/(c);
-                return e;
-            }
-            c = c.nextSibling;
-        }
-        return null;
-    }
-    /**
-     * @param {!Element} props
-     * @param {!Object} mapping
-     * @return {!string}
-     */
-    function applySimpleMapping(props, mapping) {
-        var rule = '', r, value;
-        for (r in mapping) {
-            if (mapping.hasOwnProperty(r)) {
-                r = mapping[r];
-                value = props.getAttributeNS(r[0], r[1]);
-                if (value) {
-                    rule += r[2] + ':' + value + ';';
-                }
-            }
-        }
-        return rule;
-    }
-    /**
-     * @param {!string} name
-     * @return {!string}
-     */
-    function getFontDeclaration(name) {
-        return '"' + name + '"';
-    }
-    /**
-     * @param {!Element} props
-     * @return {!string}
-     */
-    function getTextProperties(props) {
-        var rule = '', value;
-        rule += applySimpleMapping(props, textPropertySimpleMapping);
-        value = props.getAttributeNS(stylens, 'text-underline-style');
-        if (value === 'solid') {
-            rule += 'text-decoration: underline;';
-        }
-        value = props.getAttributeNS(stylens, 'font-name');
-        if (value) {
-            value = getFontDeclaration(value);
-            if (value) {
-                rule += 'font-family: ' + value + ';';
-            }
-        }
-        return rule;
-    }
-    /**
-     * @param {!Element} props
-     * @return {!string}
-     */
-    function getParagraphProperties(props) {
-        var rule = '', imageProps, url, element;
-        rule += applySimpleMapping(props, paragraphPropertySimpleMapping);
-        imageProps = props.getElementsByTagNameNS(stylens, 'background-image');
-        if (imageProps.length > 0) {
-            url = imageProps.item(0).getAttributeNS(xlinkns, 'href');
-            if (url) {
-                rule += "background-image: url('odfkit:" + url + "');";
-                //rule += "background-repeat: repeat;"; //FIXME test
-                element = /**@type{!Element}*/(imageProps.item(0));
-                rule += applySimpleMapping(element, bgImageSimpleMapping);
-            }
-        }
-        return rule;
-    }
-    /**
-     * @param {!Element} props
-     * @return {!string}
-     */
-    function getGraphicProperties(props) {
-        var rule = '';
-        rule += applySimpleMapping(props, graphicPropertySimpleMapping);
-        return rule;
-    }
-    /**
-     * @param {!Element} props
-     * @return {!string}
-     */
-    function getTableCellProperties(props) {
-        var rule = '';
-        rule += applySimpleMapping(props, tablecellPropertySimpleMapping);
-        return rule;
-    }
-    /**
-     * @param {!StyleSheet} sheet
-     * @param {!string} family
-     * @param {!string} name
-     * @param {!Element} node
-     * @return {undefined}
-     */
-    function addStyleRule(sheet, family, name, node) {
-        var selectors = getSelectors(family, name, node),
-            selector = selectors.join(','),
-            rule = '',
-            properties = getDirectChild(node, stylens, 'text-properties');
-        if (properties) {
-            rule += getTextProperties(properties);
-        }
-        properties = getDirectChild(node, stylens, 'paragraph-properties');
-        if (properties) {
-            rule += getParagraphProperties(properties);
-        }
-        properties = getDirectChild(node, stylens, 'graphic-properties');
-        if (properties) {
-            rule += getGraphicProperties(properties);
-        }
-        properties = getDirectChild(node, stylens, 'table-cell-properties');
-        if (properties) {
-            rule += getTableCellProperties(properties);
-        }
-        if (rule.length === 0) {
-            return;
-        }
-        rule = selector + '{' + rule + '}';
-        try {
-            sheet.insertRule(rule, sheet.cssRules.length);
-        } catch (e) {
-            throw e;
-        }
-    }
-    /**
-     * @param {!Element} node
-     * @return {!string}
-     */
-    function getNumberRule(node) {
-        var style = node.getAttributeNS(stylens, "num-format"),
-            suffix = node.getAttributeNS(stylens, "num-suffix"),
-            prefix = node.getAttributeNS(stylens, "num-prefix"),
-            rule = "",
-            stylemap = {'1': 'decimal', 'a': 'lower-latin', 'A': 'upper-latin',
-                'i': 'lower-roman', 'I': 'upper-roman'},
-            content = "";
-        content = prefix || "";
-        if (stylemap.hasOwnProperty(style)) {
-            content += " counter(list, " + stylemap[style] + ")";
-        } else if (style) {
-            content += "'" + style + "';";
-        } else {
-            content += " ''";
-        }
-        if (suffix) {
-            content += " '" + suffix + "'";
-        }
-        rule = "content: " + content + ";";
-        return rule;
-    }
-    /**
-     * @param {!Element} node
-     * @return {!string}
-     */
-    function getImageRule(node) {
-        var rule = "content: none;";
-        return rule;
-    }
-    /**
-     * @param {!Element} node
-     * @return {!string}
-     */
-    function getBulletRule(node) {
-        var rule = "",
-            bulletChar = node.getAttributeNS(textns, "bullet-char");
-        return "content: '" + bulletChar + "';";
-    }
-    /**
-     * @param {!StyleSheet} sheet
-     * @param {!string} name
-     * @param {!Element} node
-     * @return {undefined}
-     */
-    function addListStyleRule(sheet, name, node, itemrule) {
-        var selector = 'text|list[text|style-name="' + name +
-                '"]',
-            level = node.getAttributeNS(textns, "level"),
-            rule = "";
-        level = level && parseInt(level, 10);
-        while (level > 1) {
-            selector += " > text|list-item > text|list";
-            level -= 1;
-        }
-        selector += " > list-item:before";
-        rule = itemrule;
-        rule = selector + '{' + rule + '}';
-        try {
-            sheet.insertRule(rule, sheet.cssRules.length);
-        } catch (e) {
-            throw e;
-        }
-    }
-    /**
-     * @param {!StyleSheet} sheet
-     * @param {!string} name
-     * @param {!Element} node
-     * @return {undefined}
-     */
-    function addListStyleRules(sheet, name, node) {
-        var n = node.firstChild, e, itemrule;
-        while (n) {
-            if (n.namespaceURI === textns) {
-                e = /**@type{!Element}*/(n);
-                if (n.localName === "list-level-style-number") {
-                    itemrule = getNumberRule(e);
-                    addListStyleRule(sheet, name, e, itemrule);
-                } else if (n.localName === "list-level-style-image") {
-                    itemrule = getImageRule(e);
-                    addListStyleRule(sheet, name, e, itemrule);
-                } else if (n.localName === "list-level-style-bullet") {
-                    itemrule = getBulletRule(e);
-                    addListStyleRule(sheet, name, e, itemrule);
-                }
-            }
-            n = n.nextSibling;
-        }
-    }
-    /**
-     * @param {!StyleSheet} sheet
-     * @param {!string} family
-     * @param {!string} name
-     * @param {!Element} node
-     * @return {undefined}
-     */
-    function addRule(sheet, family, name, node) {
-        if (family === "list") {
-            addListStyleRules(sheet, name, node);
-        } else {
-            addStyleRule(sheet, family, name, node);
-        }
-    }
-    /**
-     * @param {!StyleSheet} sheet
-     * @param {!string} family
-     * @param {!string} name
-     * @param {!Element} node
-     * @return {undefined}
-     */
-    function addRules(sheet, family, name, node) {
-        addRule(sheet, family, name, node);
-        var n;
-        for (n in node.derivedStyles) {
-            if (node.derivedStyles.hasOwnProperty(n)) {
-                addRules(sheet, family, n, node.derivedStyles[n]);
-            }
-        }
-    }
-
-    // css vs odf styles
-    // ODF styles occur in families. A family is a group of odf elements to
-    // which an element applies. ODF families can be mapped to a group of css
-    // elements
-
-    this.namespaces = namespaces;
-    this.namespaceResolver = namespaceResolver;
-    this.namespaceResolver.lookupNamespaceURI = this.namespaceResolver;
-
-    /**
-     * @param {!StyleSheet} stylesheet
-     * @param {!Element} styles
-     * @param {!Element} autostyles
-     * @return {undefined}
-     */
-    this.style2css = function (stylesheet, styles, autostyles) {
-        var doc, prefix, styletree, tree, name, rule, family,
-            stylenodes, styleautonodes;
-        // make stylesheet empty
-        while (stylesheet.cssRules.length) {
-            stylesheet.deleteRule(stylesheet.cssRules.length - 1);
-        }
-        doc = null;
-        if (styles) {
-            doc = styles.ownerDocument;
-        }
-        if (autostyles) {
-            doc = autostyles.ownerDocument;
-        }
-        if (!doc) {
-            return;
-        }
-        // add @namespace rules
-        for (prefix in namespaces) {
-            if (namespaces.hasOwnProperty(prefix)) {
-                rule = '@namespace ' + prefix + ' url(' + namespaces[prefix] + ');';
-                try {
-                    stylesheet.insertRule(rule, stylesheet.cssRules.length);
-                } catch (e) {
-                    // WebKit can throw an exception here, but it will have
-                    // retained the namespace declarations anyway.
-                }
-            }
-        }
-
-        // add the various styles
-        stylenodes = getStyleMap(doc, styles);
-        styleautonodes = getStyleMap(doc, autostyles);
-        styletree = {};
-        for (family in familynamespaceprefixes) {
-            if (familynamespaceprefixes.hasOwnProperty(family)) {
-                tree = styletree[family] = {};
-                addStyleMapToStyleTree(stylenodes[family], tree);
-                addStyleMapToStyleTree(styleautonodes[family], tree);
-
-                for (name in tree) {
-                    if (tree.hasOwnProperty(name)) {
-                        addRules(stylesheet, family, name, tree[name]);
-                    }
-                }
-            }
-        }
-    };
-};
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/odf/StyleInfo.js b/apps/files_odfviewer/src/webodf/webodf/lib/odf/StyleInfo.js
deleted file mode 100644
index 9b76d13bed..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/lib/odf/StyleInfo.js
+++ /dev/null
@@ -1,424 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global odf*/
-/**
- * @constructor
- */
-odf.StyleInfo = function StyleInfo() {
-    "use strict";
-    // helper constants
-    var chartns = "urn:oasis:names:tc:opendocument:xmlns:chart:1.0",
-        dbns = "urn:oasis:names:tc:opendocument:xmlns:database:1.0",
-        dr3dns = "urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0",
-        drawns = "urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",
-        fons = "urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0",
-        formns = "urn:oasis:names:tc:opendocument:xmlns:form:1.0",
-        numberns = "urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0",
-        officens = "urn:oasis:names:tc:opendocument:xmlns:office:1.0",
-        presentationns = "urn:oasis:names:tc:opendocument:xmlns:presentation:1.0",
-        stylens = "urn:oasis:names:tc:opendocument:xmlns:style:1.0",
-        svgns = "urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0",
-        tablens = "urn:oasis:names:tc:opendocument:xmlns:table:1.0",
-        textns = "urn:oasis:names:tc:opendocument:xmlns:text:1.0",
-        elementstyles = {
-            "text": [
-                { ens: stylens, en: 'tab-stop', ans: stylens, a: 'leader-text-style'},
-                { ens: stylens, en: 'drop-cap', ans: stylens, a: 'style-name'},
-                { ens: textns, en: 'notes-configuration', ans: textns, a: 'citation-body-style-name'},
-                { ens: textns, en: 'notes-configuration', ans: textns, a: 'citation-style-name'},
-                { ens: textns, en: 'a', ans: textns, a: 'style-name'},
-                { ens: textns, en: 'alphabetical-index', ans: textns, a: 'style-name'},
-                { ens: textns, en: 'linenumbering-configuration', ans: textns, a: 'style-name'},
-                { ens: textns, en: 'list-level-style-number', ans: textns, a: 'style-name'},
-                { ens: textns, en: 'ruby-text', ans: textns, a: 'style-name'},
-                { ens: textns, en: 'span', ans: textns, a: 'style-name'},
-                { ens: textns, en: 'a', ans: textns, a: 'visited-style-name'},
-                { ens: stylens, en: 'text-properties', ans: stylens, a: 'text-line-through-text-style'},
-                { ens: textns, en: 'alphabetical-index-source', ans: textns, a: 'main-entry-style-name'},
-                { ens: textns, en: 'index-entry-bibliography', ans: textns, a: 'style-name'},
-                { ens: textns, en: 'index-entry-chapter', ans: textns, a: 'style-name'},
-                { ens: textns, en: 'index-entry-link-end', ans: textns, a: 'style-name'},
-                { ens: textns, en: 'index-entry-link-start', ans: textns, a: 'style-name'},
-                { ens: textns, en: 'index-entry-page-number', ans: textns, a: 'style-name'},
-                { ens: textns, en: 'index-entry-span', ans: textns, a: 'style-name'},
-                { ens: textns, en: 'index-entry-tab-stop', ans: textns, a: 'style-name'},
-                { ens: textns, en: 'index-entry-text', ans: textns, a: 'style-name'},
-                { ens: textns, en: 'index-title-template', ans: textns, a: 'style-name'},
-                { ens: textns, en: 'list-level-style-bullet', ans: textns, a: 'style-name'},
-                { ens: textns, en: 'outline-level-style', ans: textns, a: 'style-name'}
-            ],
-            "paragraph": [
-                { ens: drawns, en: 'caption', ans: drawns, a: 'text-style-name'},
-                { ens: drawns, en: 'circle', ans: drawns, a: 'text-style-name'},
-                { ens: drawns, en: 'connector', ans: drawns, a: 'text-style-name'},
-                { ens: drawns, en: 'control', ans: drawns, a: 'text-style-name'},
-                { ens: drawns, en: 'custom-shape', ans: drawns, a: 'text-style-name'},
-                { ens: drawns, en: 'ellipse', ans: drawns, a: 'text-style-name'},
-                { ens: drawns, en: 'frame', ans: drawns, a: 'text-style-name'},
-                { ens: drawns, en: 'line', ans: drawns, a: 'text-style-name'},
-                { ens: drawns, en: 'measure', ans: drawns, a: 'text-style-name'},
-                { ens: drawns, en: 'path', ans: drawns, a: 'text-style-name'},
-                { ens: drawns, en: 'polygon', ans: drawns, a: 'text-style-name'},
-                { ens: drawns, en: 'polyline', ans: drawns, a: 'text-style-name'},
-                { ens: drawns, en: 'rect', ans: drawns, a: 'text-style-name'},
-                { ens: drawns, en: 'regular-polygon', ans: drawns, a: 'text-style-name'},
-                { ens: officens, en: 'annotation', ans: drawns, a: 'text-style-name'},
-                { ens: formns, en: 'column', ans: formns, a: 'text-style-name'},
-                { ens: stylens, en: 'style', ans: stylens, a: 'next-style-name'},
-                { ens: tablens, en: 'body', ans: tablens, a: 'paragraph-style-name'},
-                { ens: tablens, en: 'even-columns', ans: tablens, a: 'paragraph-style-name'},
-                { ens: tablens, en: 'even-rows', ans: tablens, a: 'paragraph-style-name'},
-                { ens: tablens, en: 'first-column', ans: tablens, a: 'paragraph-style-name'},
-                { ens: tablens, en: 'first-row', ans: tablens, a: 'paragraph-style-name'},
-                { ens: tablens, en: 'last-column', ans: tablens, a: 'paragraph-style-name'},
-                { ens: tablens, en: 'last-row', ans: tablens, a: 'paragraph-style-name'},
-                { ens: tablens, en: 'odd-columns', ans: tablens, a: 'paragraph-style-name'},
-                { ens: tablens, en: 'odd-rows', ans: tablens, a: 'paragraph-style-name'},
-                { ens: textns, en: 'notes-configuration', ans: textns, a: 'default-style-name'},
-                { ens: textns, en: 'alphabetical-index-entry-template', ans: textns, a: 'style-name'},
-                { ens: textns, en: 'bibliography-entry-template', ans: textns, a: 'style-name'},
-                { ens: textns, en: 'h', ans: textns, a: 'style-name'},
-                { ens: textns, en: 'illustration-index-entry-template', ans: textns, a: 'style-name'},
-                { ens: textns, en: 'index-source-style', ans: textns, a: 'style-name'},
-                { ens: textns, en: 'object-index-entry-template', ans: textns, a: 'style-name'},
-                { ens: textns, en: 'p', ans: textns, a: 'style-name'},
-                { ens: textns, en: 'table-index-entry-template', ans: textns, a: 'style-name'},
-                { ens: textns, en: 'table-of-content-entry-template', ans: textns, a: 'style-name'},
-                { ens: textns, en: 'table-index-entry-template', ans: textns, a: 'style-name'},
-                { ens: textns, en: 'user-index-entry-template', ans: textns, a: 'style-name'},
-                { ens: stylens, en: 'page-layout-properties', ans: stylens, a: 'register-truth-ref-style-name'}
-            ],
-            "chart": [
-                { ens: chartns, en: 'axis', ans: chartns, a: 'style-name'},
-                { ens: chartns, en: 'chart', ans: chartns, a: 'style-name'},
-                { ens: chartns, en: 'data-label', ans: chartns, a: 'style-name'},
-                { ens: chartns, en: 'data-point', ans: chartns, a: 'style-name'},
-                { ens: chartns, en: 'equation', ans: chartns, a: 'style-name'},
-                { ens: chartns, en: 'error-indicator', ans: chartns, a: 'style-name'},
-                { ens: chartns, en: 'floor', ans: chartns, a: 'style-name'},
-                { ens: chartns, en: 'footer', ans: chartns, a: 'style-name'},
-                { ens: chartns, en: 'grid', ans: chartns, a: 'style-name'},
-                { ens: chartns, en: 'legend', ans: chartns, a: 'style-name'},
-                { ens: chartns, en: 'mean-value', ans: chartns, a: 'style-name'},
-                { ens: chartns, en: 'plot-area', ans: chartns, a: 'style-name'},
-                { ens: chartns, en: 'regression-curve', ans: chartns, a: 'style-name'},
-                { ens: chartns, en: 'series', ans: chartns, a: 'style-name'},
-                { ens: chartns, en: 'stock-gain-marker', ans: chartns, a: 'style-name'},
-                { ens: chartns, en: 'stock-loss-marker', ans: chartns, a: 'style-name'},
-                { ens: chartns, en: 'stock-range-line', ans: chartns, a: 'style-name'},
-                { ens: chartns, en: 'subtitle', ans: chartns, a: 'style-name'},
-                { ens: chartns, en: 'title', ans: chartns, a: 'style-name'},
-                { ens: chartns, en: 'wall', ans: chartns, a: 'style-name'}
-            ],
-            "section": [
-                { ens: textns, en: 'alphabetical-index', ans: textns, a: 'style-name'},
-                { ens: textns, en: 'bibliography', ans: textns, a: 'style-name'},
-                { ens: textns, en: 'illustration-index', ans: textns, a: 'style-name'},
-                { ens: textns, en: 'index-title', ans: textns, a: 'style-name'},
-                { ens: textns, en: 'object-index', ans: textns, a: 'style-name'},
-                { ens: textns, en: 'section', ans: textns, a: 'style-name'},
-                { ens: textns, en: 'table-of-content', ans: textns, a: 'style-name'},
-                { ens: textns, en: 'table-index', ans: textns, a: 'style-name'},
-                { ens: textns, en: 'user-index', ans: textns, a: 'style-name'}
-            ],
-            "ruby": [
-                { ens: textns, en: 'ruby', ans: textns, a: 'style-name'}
-            ],
-            "table": [
-                { ens: dbns, en: 'query', ans: dbns, a: 'style-name'},
-                { ens: dbns, en: 'table-representation', ans: dbns, a: 'style-name'},
-                { ens: tablens, en: 'background', ans: tablens, a: 'style-name'},
-                { ens: tablens, en: 'table', ans: tablens, a: 'style-name'}
-            ],
-            "table-column": [
-                { ens: dbns, en: 'column', ans: dbns, a: 'style-name'},
-                { ens: tablens, en: 'table-column', ans: tablens, a: 'style-name'}
-            ],
-            "table-row": [
-                { ens: dbns, en: 'query', ans: dbns, a: 'default-row-style-name'},
-                { ens: dbns, en: 'table-representation', ans: dbns, a: 'default-row-style-name'},
-                { ens: tablens, en: 'table-row', ans: tablens, a: 'style-name'}
-            ],
-            "table-cell": [
-                { ens: dbns, en: 'column', ans: dbns, a: 'default-cell-style-name'},
-                { ens: tablens, en: 'table-column', ans: tablens, a: 'default-cell-style-name'},
-                { ens: tablens, en: 'table-row', ans: tablens, a: 'default-cell-style-name'},
-                { ens: tablens, en: 'body', ans: tablens, a: 'style-name'},
-                { ens: tablens, en: 'covered-table-cell', ans: tablens, a: 'style-name'},
-                { ens: tablens, en: 'even-columns', ans: tablens, a: 'style-name'},
-                { ens: tablens, en: 'covered-table-cell', ans: tablens, a: 'style-name'},
-                { ens: tablens, en: 'even-columns', ans: tablens, a: 'style-name'},
-                { ens: tablens, en: 'even-rows', ans: tablens, a: 'style-name'},
-                { ens: tablens, en: 'first-column', ans: tablens, a: 'style-name'},
-                { ens: tablens, en: 'first-row', ans: tablens, a: 'style-name'},
-                { ens: tablens, en: 'last-column', ans: tablens, a: 'style-name'},
-                { ens: tablens, en: 'last-row', ans: tablens, a: 'style-name'},
-                { ens: tablens, en: 'odd-columns', ans: tablens, a: 'style-name'},
-                { ens: tablens, en: 'odd-rows', ans: tablens, a: 'style-name'},
-                { ens: tablens, en: 'table-cell', ans: tablens, a: 'style-name'}
-            ],
-            "graphic": [
-                { ens: dr3dns, en: 'cube', ans: drawns, a: 'style-name'},
-                { ens: dr3dns, en: 'extrude', ans: drawns, a: 'style-name'},
-                { ens: dr3dns, en: 'rotate', ans: drawns, a: 'style-name'},
-                { ens: dr3dns, en: 'scene', ans: drawns, a: 'style-name'},
-                { ens: dr3dns, en: 'sphere', ans: drawns, a: 'style-name'},
-                { ens: drawns, en: 'caption', ans: drawns, a: 'style-name'},
-                { ens: drawns, en: 'circle', ans: drawns, a: 'style-name'},
-                { ens: drawns, en: 'connector', ans: drawns, a: 'style-name'},
-                { ens: drawns, en: 'control', ans: drawns, a: 'style-name'},
-                { ens: drawns, en: 'custom-shape', ans: drawns, a: 'style-name'},
-                { ens: drawns, en: 'ellipse', ans: drawns, a: 'style-name'},
-                { ens: drawns, en: 'frame', ans: drawns, a: 'style-name'},
-                { ens: drawns, en: 'g', ans: drawns, a: 'style-name'},
-                { ens: drawns, en: 'line', ans: drawns, a: 'style-name'},
-                { ens: drawns, en: 'measure', ans: drawns, a: 'style-name'},
-                { ens: drawns, en: 'page-thumbnail', ans: drawns, a: 'style-name'},
-                { ens: drawns, en: 'path', ans: drawns, a: 'style-name'},
-                { ens: drawns, en: 'polygon', ans: drawns, a: 'style-name'},
-                { ens: drawns, en: 'polyline', ans: drawns, a: 'style-name'},
-                { ens: drawns, en: 'rect', ans: drawns, a: 'style-name'},
-                { ens: drawns, en: 'regular-polygon', ans: drawns, a: 'style-name'},
-                { ens: officens, en: 'annotation', ans: drawns, a: 'style-name'}
-            ],
-            "presentation": [
-                { ens: dr3dns, en: 'cube', ans: presentationns, a: 'style-name'},
-                { ens: dr3dns, en: 'extrude', ans: presentationns, a: 'style-name'},
-                { ens: dr3dns, en: 'rotate', ans: presentationns, a: 'style-name'},
-                { ens: dr3dns, en: 'scene', ans: presentationns, a: 'style-name'},
-                { ens: dr3dns, en: 'sphere', ans: presentationns, a: 'style-name'},
-                { ens: drawns, en: 'caption', ans: presentationns, a: 'style-name'},
-                { ens: drawns, en: 'circle', ans: presentationns, a: 'style-name'},
-                { ens: drawns, en: 'connector', ans: presentationns, a: 'style-name'},
-                { ens: drawns, en: 'control', ans: presentationns, a: 'style-name'},
-                { ens: drawns, en: 'custom-shape', ans: presentationns, a: 'style-name'},
-                { ens: drawns, en: 'ellipse', ans: presentationns, a: 'style-name'},
-                { ens: drawns, en: 'frame', ans: presentationns, a: 'style-name'},
-                { ens: drawns, en: 'g', ans: presentationns, a: 'style-name'},
-                { ens: drawns, en: 'line', ans: presentationns, a: 'style-name'},
-                { ens: drawns, en: 'measure', ans: presentationns, a: 'style-name'},
-                { ens: drawns, en: 'page-thumbnail', ans: presentationns, a: 'style-name'},
-                { ens: drawns, en: 'path', ans: presentationns, a: 'style-name'},
-                { ens: drawns, en: 'polygon', ans: presentationns, a: 'style-name'},
-                { ens: drawns, en: 'polyline', ans: presentationns, a: 'style-name'},
-                { ens: drawns, en: 'rect', ans: presentationns, a: 'style-name'},
-                { ens: drawns, en: 'regular-polygon', ans: presentationns, a: 'style-name'},
-                { ens: officens, en: 'annotation', ans: presentationns, a: 'style-name'}
-            ],
-            "drawing-page": [
-                { ens: drawns, en: 'page', ans: drawns, a: 'style-name'},
-                { ens: presentationns, en: 'notes', ans: drawns, a: 'style-name'},
-                { ens: stylens, en: 'handout-master', ans: drawns, a: 'style-name'},
-                { ens: stylens, en: 'master-page', ans: drawns, a: 'style-name'}
-            ],
-            "list-style": [
-                { ens: textns, en: 'list', ans: textns, a: 'style-name'},
-                { ens: textns, en: 'numbered-paragraph', ans: textns, a: 'style-name'},
-                { ens: textns, en: 'list-item', ans: textns, a: 'style-override'},
-                { ens: stylens, en: 'style', ans: stylens, a: 'list-style-name'},
-                { ens: stylens, en: 'style', ans: stylens, a: 'data-style-name'},
-                { ens: stylens, en: 'style', ans: stylens, a: 'percentage-data-style-name'},
-                { ens: presentationns, en: 'date-time-decl', ans: stylens, a: 'data-style-name'},
-                { ens: textns, en: 'creation-date', ans: stylens, a: 'data-style-name'},
-                { ens: textns, en: 'creation-time', ans: stylens, a: 'data-style-name'},
-                { ens: textns, en: 'database-display', ans: stylens, a: 'data-style-name'},
-                { ens: textns, en: 'date', ans: stylens, a: 'data-style-name'},
-                { ens: textns, en: 'editing-duration', ans: stylens, a: 'data-style-name'},
-                { ens: textns, en: 'expression', ans: stylens, a: 'data-style-name'},
-                { ens: textns, en: 'meta-field', ans: stylens, a: 'data-style-name'},
-                { ens: textns, en: 'modification-date', ans: stylens, a: 'data-style-name'},
-                { ens: textns, en: 'modification-time', ans: stylens, a: 'data-style-name'},
-                { ens: textns, en: 'print-date', ans: stylens, a: 'data-style-name'},
-                { ens: textns, en: 'print-time', ans: stylens, a: 'data-style-name'},
-                { ens: textns, en: 'table-formula', ans: stylens, a: 'data-style-name'},
-                { ens: textns, en: 'time', ans: stylens, a: 'data-style-name'},
-                { ens: textns, en: 'user-defined', ans: stylens, a: 'data-style-name'},
-                { ens: textns, en: 'user-field-get', ans: stylens, a: 'data-style-name'},
-                { ens: textns, en: 'user-field-input', ans: stylens, a: 'data-style-name'},
-                { ens: textns, en: 'variable-get', ans: stylens, a: 'data-style-name'},
-                { ens: textns, en: 'variable-input', ans: stylens, a: 'data-style-name'},
-                { ens: textns, en: 'variable-set', ans: stylens, a: 'data-style-name'}
-            ],
-            "data": [
-                { ens: stylens, en: 'style', ans: stylens, a: 'data-style-name'},
-                { ens: stylens, en: 'style', ans: stylens, a: 'percentage-data-style-name'},
-                { ens: presentationns, en: 'date-time-decl', ans: stylens, a: 'data-style-name'},
-                { ens: textns, en: 'creation-date', ans: stylens, a: 'data-style-name'},
-                { ens: textns, en: 'creation-time', ans: stylens, a: 'data-style-name'},
-                { ens: textns, en: 'database-display', ans: stylens, a: 'data-style-name'},
-                { ens: textns, en: 'date', ans: stylens, a: 'data-style-name'},
-                { ens: textns, en: 'editing-duration', ans: stylens, a: 'data-style-name'},
-                { ens: textns, en: 'expression', ans: stylens, a: 'data-style-name'},
-                { ens: textns, en: 'meta-field', ans: stylens, a: 'data-style-name'},
-                { ens: textns, en: 'modification-date', ans: stylens, a: 'data-style-name'},
-                { ens: textns, en: 'modification-time', ans: stylens, a: 'data-style-name'},
-                { ens: textns, en: 'print-date', ans: stylens, a: 'data-style-name'},
-                { ens: textns, en: 'print-time', ans: stylens, a: 'data-style-name'},
-                { ens: textns, en: 'table-formula', ans: stylens, a: 'data-style-name'},
-                { ens: textns, en: 'time', ans: stylens, a: 'data-style-name'},
-                { ens: textns, en: 'user-defined', ans: stylens, a: 'data-style-name'},
-                { ens: textns, en: 'user-field-get', ans: stylens, a: 'data-style-name'},
-                { ens: textns, en: 'user-field-input', ans: stylens, a: 'data-style-name'},
-                { ens: textns, en: 'variable-get', ans: stylens, a: 'data-style-name'},
-                { ens: textns, en: 'variable-input', ans: stylens, a: 'data-style-name'},
-                { ens: textns, en: 'variable-set', ans: stylens, a: 'data-style-name'}
-            ],
-            "page-layout": [
-                { ens: presentationns, en: 'notes', ans: stylens, a: 'page-layout-name'},
-                { ens: stylens, en: 'handout-master', ans: stylens, a: 'page-layout-name'},
-                { ens: stylens, en: 'master-page', ans: stylens, a: 'page-layout-name'}
-            ]
-        },
-        elements;
-
-    /**
-     * Return if a particular element can have a style for a particular family.
-     * @param {!string} family
-     * @param {!Element} element
-     * @return {!boolean}
-     */
-    function canElementHaveStyle(family, element) {
-        var elname = elements[element.localName],
-            elns = elname && elname[element.namespaceURI],
-            length = elns ? elns.length : 0,
-            i;
-        return elns && elns.length > 0;
-    }
-
-    /**
-     * @param {!string} family
-     * @param {!Element} element
-     * @return {{name:string,family:string}|null}
-     */
-    function getStyleRef(family, element) {
-        var elname = elements[element.localName],
-            elns = elname && elname[element.namespaceURI],
-            length = elns ? elns.length : 0,
-            i, attr;
-        for (i = 0; i < length; i += 1) {
-            attr = element.getAttributeNS(elns[i].ns, elns[i].localname);
-/*
-            if (attr) { // a style has been found!
-                return attr;
-            }
-*/
-        }
-        return null;
-    }
-
-    /**
-     * @param {!Element} element
-     * @param {!Object.<string,Object.<string,number>>} keys
-     * @return {undefined}
-     */
-    function getUsedStylesForAutomatic(element, keys) {
-        var elname = elements[element.localName],
-            elns = elname && elname[element.namespaceURI],
-            length = elns ? elns.length : 0,
-            i, attr, group, map, e;
-        for (i = 0; i < length; i += 1) {
-            attr = element.getAttributeNS(elns[i].ns, elns[i].localname);
-            if (attr) { // a style has been found!
-                group = elns[i].keygroup;
-                map = keys[group];
-                if (!map) {
-                    map = keys[group] = {};
-                }
-                map[attr] = 1;
-            }
-        }
-        i = element.firstChild;
-        while (i) {
-            if (i.nodeType === 1) {
-                e = /**@type{!Element}*/(i);
-                getUsedStylesForAutomatic(e, keys);
-            }
-            i = i.nextSibling;
-        }
-    }
-
-    /**
-     * @param {!Object.<Array.<Object.<string,string>>>} elementstyles
-     */
-    function inverse(elementstyles) {
-        var keyname, i, list, item, l, elements = {}, map, array;
-        for (keyname in elementstyles) {
-            if (elementstyles.hasOwnProperty(keyname)) {
-                list = elementstyles[keyname];
-                l = list.length;
-                for (i = 0; i < l; i += 1) {
-                    item = list[i];
-                    map = elements[item.en] = elements[item.en] || {};
-                    array = map[item.ens] = map[item.ens] || [];
-                    array.push(
-                        {ns: item.ans, localname: item.a, keygroup: keyname});
-                }
-            }
-        }
-        return elements;
-    }
-
-    /**
-     * @constructor
-     * @param {!Element} element
-     */
-    this.UsedKeysList = function (element) {
-        var usedKeys = {};
-
-        /**
-         * @param {!Element} element
-         * @return {!boolean}
-         */
-        this.uses = function (element) {
-            var localName = element.localName,
-                name = element.getAttributeNS(drawns, "name") ||
-                        element.getAttributeNS(stylens, "name"),
-                keyName, map;
-            if (localName === "style") {
-                keyName = element.getAttributeNS(stylens, "family");
-            } else if (element.namespaceURI === numberns) {
-                keyName = "data";
-            } else {
-                keyName = localName; // list-style or page-layout
-            }
-            map = usedKeys[keyName];
-            return map ? (map[name] > 0) : false;
-        };
-
-        getUsedStylesForAutomatic(element, usedKeys);
-    };
-
-    this.canElementHaveStyle = canElementHaveStyle;
-
-    elements = inverse(elementstyles);
-};
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/packages.js b/apps/files_odfviewer/src/webodf/webodf/lib/packages.js
deleted file mode 100644
index 7277a833f9..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/lib/packages.js
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
- * @license
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/**
- * @namespace The core package.
- */
-var core = {};
-/**
- * @namespace The gui package.
- */
-var gui = {};
-/**
- * @namespace The xmldom package.
- */
-var xmldom = {};
-/**
- * @namespace The ODF package.
- */
-var odf = {};
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/runtime.js b/apps/files_odfviewer/src/webodf/webodf/lib/runtime.js
deleted file mode 100644
index 99ded6f1d3..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/lib/runtime.js
+++ /dev/null
@@ -1,1117 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*jslint nomen: true, evil: true, bitwise: true */
-/*global window: true, XMLHttpRequest: true, require: true, console: true,
-  process: true, __dirname: true, setTimeout: true, Packages: true, print: true,
-  readFile: true, quit: true, Buffer: true, ArrayBuffer: true, Uint8Array: true,
-  navigator: true, VBArray: true */
-/**
- * Three implementations of a runtime for browser, node.js and rhino.
- */
-
-/**
- * Abstraction of the runtime environment.
- * @class
- * @interface
- */
-function Runtime() {"use strict"; }
-/**
- * Abstraction of byte arrays.
- * @constructor
- * @extends {Array}
- * @param {!number} size
- */
-Runtime.ByteArray = function (size) {"use strict"; };
-/**
- * @param {!number} start
- * @param {!number} end
- * @return {!Runtime.ByteArray}
- */
-Runtime.ByteArray.prototype.slice = function (start, end) {"use strict"; };
-/**
- * @param {!Array.<number>} array
- * @return {!Runtime.ByteArray}
- */
-Runtime.prototype.byteArrayFromArray = function (array) {"use strict"; };
-/**
- * @param {!string} string
- * @param {!string} encoding
- * @return {!Runtime.ByteArray}
- */
-Runtime.prototype.byteArrayFromString = function (string, encoding) {"use strict"; };
-/**
- * @param {!Runtime.ByteArray} bytearray
- * @param {!string} encoding
- * @return {!string}
- */
-Runtime.prototype.byteArrayToString = function (bytearray, encoding) {"use strict"; };
-/**
- * @param {!Runtime.ByteArray} bytearray1
- * @param {!Runtime.ByteArray} bytearray2
- * @return {!Runtime.ByteArray}
- */
-Runtime.prototype.concatByteArrays = function (bytearray1, bytearray2) {"use strict"; };
-/**
- * @param {!string} path
- * @param {!number} offset
- * @param {!number} length
- * @param {!function(string,Runtime.ByteArray):undefined} callback
- * @return {undefined}
- */
-Runtime.prototype.read = function (path, offset, length, callback) {"use strict"; };
-/**
- * Read the contents of a file. Returns the result via a callback. If the
- * encoding is 'binary', the result is returned as a Runtime.ByteArray,
- * otherwise, it is returned as a string.
- * @param {!string} path
- * @param {!string} encoding text encoding or 'binary'
- * @param {!function(string,(string|Runtime.ByteArray)):undefined} callback
- * @return {undefined}
- */
-Runtime.prototype.readFile = function (path, encoding, callback) {"use strict"; };
-/**
- * @param {!string} path
- * @param {!string} encoding text encoding or 'binary'
- * @return {!string}
- */
-Runtime.prototype.readFileSync = function (path, encoding) {"use strict"; };
-/**
- * @param {!string} path
- * @param {!function((string|Document)):undefined} callback
- * @return {undefined}
- */
-Runtime.prototype.loadXML = function (path, callback) {"use strict"; };
-/**
- * @param {!string} path
- * @param {!Runtime.ByteArray} data
- * @param {!function(?string):undefined} callback
- * @return {undefined}
- */
-Runtime.prototype.writeFile = function (path, data, callback) {"use strict"; };
-/**
- * @param {!string} path
- * @param {!function(boolean):undefined} callback
- * @return {undefined}
- */
-Runtime.prototype.isFile = function (path, callback) {"use strict"; };
-/**
- * @param {!string} path
- * @param {!function(number):undefined} callback
- * @return {undefined}
- */
-Runtime.prototype.getFileSize = function (path, callback) {"use strict"; };
-/**
- * @param {!string} path
- * @param {!function(?string):undefined} callback
- * @return {undefined}
- */
-Runtime.prototype.deleteFile = function (path, callback) {"use strict"; };
-/**
- * @param {!string} msgOrCategory
- * @param {!string=} msg
- * @return {undefined}
- */
-Runtime.prototype.log = function (msgOrCategory, msg) {"use strict"; };
-/**
- * @param {!function():undefined} callback
- * @param {!number} milliseconds
- * @return {undefined}
- */
-Runtime.prototype.setTimeout = function (callback, milliseconds) {"use strict"; };
-/**
- * @return {!Array.<string>}
- */
-Runtime.prototype.libraryPaths = function () {"use strict"; };
-/**
- * @return {string}
- */
-Runtime.prototype.type = function () {"use strict"; };
-/**
- * @return {?DOMImplementation}
- */
-Runtime.prototype.getDOMImplementation = function () {"use strict"; };
-/**
- * @return {?Window}
- */
-Runtime.prototype.getWindow = function () {"use strict"; };
-
-/** @define {boolean} */
-var IS_COMPILED_CODE = false;
-
-/**
- * @this {Runtime}
- * @param {!Runtime.ByteArray} bytearray
- * @param {!string} encoding
- * @return {!string}
- */
-Runtime.byteArrayToString = function (bytearray, encoding) {
-    "use strict";
-    function byteArrayToString(bytearray) {
-        var s = "", i, l = bytearray.length;
-        for (i = 0; i < l; i += 1) {
-            s += String.fromCharCode(bytearray[i] & 0xff);
-        }
-        return s;
-    }
-    function utf8ByteArrayToString(bytearray) {
-        var s = "", i, l = bytearray.length,
-            c0, c1, c2;
-        for (i = 0; i < l; i += 1) {
-            c0 = bytearray[i];
-            if (c0 < 0x80) {
-                s += String.fromCharCode(c0);
-            } else {
-                i += 1;
-                c1 = bytearray[i];
-                if (c0 < 0xe0) {
-                    s += String.fromCharCode(((c0 & 0x1f) << 6) | (c1 & 0x3f));
-                } else {
-                    i += 1;
-                    c2 = bytearray[i];
-                    s += String.fromCharCode(((c0 & 0x0f) << 12) |
-                            ((c1 & 0x3f) << 6) | (c2 & 0x3f));
-                }
-            }
-        }
-        return s;
-    }
-    var result;
-    if (encoding === "utf8") {
-        result = utf8ByteArrayToString(bytearray);
-    } else {
-        if (encoding !== "binary") {
-            this.log("Unsupported encoding: " + encoding);
-        }
-        result = byteArrayToString(bytearray);
-    }
-    return result;
-};
-Runtime.getFunctionName = function getFunctionName(f) {
-    "use strict";
-    var m;
-    if (f.name === undefined) {
-        m = new RegExp("function\\s+(\\w+)").exec(f);
-        return m && m[1];
-    }
-    return f.name;
-};
-/**
- * @class
- * @constructor
- * @augments Runtime
- * @implements {Runtime}
- * @param {Element} logoutput
- */
-function BrowserRuntime(logoutput) {
-    "use strict";
-    var self = this,
-        cache = {},
-        useNativeArray = window.ArrayBuffer && window.Uint8Array;
-    /**
-     * @constructor
-     * @augments Runtime.ByteArray
-     * @inner
-     * @extends {Runtime.ByteArray}
-     * @param {!number} size
-     */
-    this.ByteArray = (useNativeArray)
-        // if Uint8Array is available, use that
-        ? function ByteArray(size) {
-            Uint8Array.prototype.slice = function (begin, end) {
-                if (end === undefined) {
-                    if (begin === undefined) {
-                        begin = 0;
-                    }
-                    end = this.length;
-                }
-                var view = this.subarray(begin, end), array, i;
-                end -= begin;
-                array = new Uint8Array(new ArrayBuffer(end));
-                for (i = 0; i < end; i += 1) {
-                    array[i] = view[i];
-                }
-                return array;
-            };
-            return new Uint8Array(new ArrayBuffer(size));
-        }
-        : function ByteArray(size) {
-            var a = [];
-            a.length = size;
-            return a;
-        };
-    this.concatByteArrays = (useNativeArray)
-        ? function (bytearray1, bytearray2) {
-            var i, l1 = bytearray1.length, l2 = bytearray2.length,
-                a = new this.ByteArray(l1 + l2);
-            for (i = 0; i < l1; i += 1) {
-                a[i] = bytearray1[i];
-            }
-            for (i = 0; i < l2; i += 1) {
-                a[i + l1] = bytearray2[i];
-            }
-            return a;
-        }
-        : function (bytearray1, bytearray2) {
-            return bytearray1.concat(bytearray2);
-        };
-    function utf8ByteArrayFromString(string) {
-        var l = string.length, bytearray, i, n, j = 0;
-        // first determine the length in bytes
-        for (i = 0; i < l; i += 1) {
-            n = string.charCodeAt(i);
-            j += 1 + (n > 0x80) + (n > 0x800);
-        }
-        // allocate a buffer and convert to a utf8 array
-        bytearray = new self.ByteArray(j);
-        j = 0;
-        for (i = 0; i < l; i += 1) {
-            n = string.charCodeAt(i);
-            if (n < 0x80) {
-                bytearray[j] = n;
-                j += 1;
-            } else if (n < 0x800) {
-                bytearray[j] = 0xc0 | (n >>>  6);
-                bytearray[j + 1] = 0x80 | (n & 0x3f);
-                j += 2;
-            } else {
-                bytearray[j] = 0xe0 | ((n >>> 12) & 0x0f);
-                bytearray[j + 1] = 0x80 | ((n >>>  6) & 0x3f);
-                bytearray[j + 2] = 0x80 |  (n         & 0x3f);
-                j += 3;
-            }
-        }
-        return bytearray;
-    }
-    function byteArrayFromString(string) {
-        // ignore encoding for now
-        var l = string.length,
-            a = new self.ByteArray(l),
-            i;
-        for (i = 0; i < l; i += 1) {
-            a[i] = string.charCodeAt(i) & 0xff;
-        }
-        return a;
-    }
-    this.byteArrayFromArray = function (array) {
-        return array.slice();
-    };
-    this.byteArrayFromString = function (string, encoding) {
-        var result;
-        if (encoding === "utf8") {
-            result = utf8ByteArrayFromString(string);
-        } else {
-            if (encoding !== "binary") {
-                self.log("unknown encoding: " + encoding);
-            }
-            result = byteArrayFromString(string);
-        }
-        return result;
-    };
-    this.byteArrayToString = Runtime.byteArrayToString;
-
-    /**
-     * @param {!string} msgOrCategory
-     * @param {string=} msg
-     * @return {undefined}
-     */
-    function log(msgOrCategory, msg) {
-        var node, doc, category;
-        if (msg) {
-            category = msgOrCategory;
-        } else {
-            msg = msgOrCategory;
-        }
-        if (logoutput) {
-            doc = logoutput.ownerDocument;
-            if (category) {
-                node = doc.createElement("span");
-                node.className = category;
-                node.appendChild(doc.createTextNode(category));
-                logoutput.appendChild(node);
-                logoutput.appendChild(doc.createTextNode(" "));
-            }
-            node = doc.createElement("span");
-            node.appendChild(doc.createTextNode(msg));
-            logoutput.appendChild(node);
-            logoutput.appendChild(doc.createElement("br"));
-        } else if (console) {
-            console.log(msg);
-        }
-    }
-    function readFile(path, encoding, callback) {
-        if (cache.hasOwnProperty(path)) {
-            callback(null, cache[path]);
-            return;
-        }
-        var xhr = new XMLHttpRequest();
-        function handleResult() {
-            var data;
-            if (xhr.readyState === 4) {
-                if (xhr.status === 0 && !xhr.responseText) {
-                    // for local files there is no difference between missing
-                    // and empty files, so empty files are considered as errors
-                    callback("File " + path + " is empty.");
-                } else if (xhr.status === 200 || xhr.status === 0) {
-                    // report file
-                    if (encoding === "binary") {
-                        if (typeof VBArray !== "undefined") { // IE9
-                            data = new VBArray(xhr.responseBody).toArray();
-                        } else {
-                            data = self.byteArrayFromString(xhr.responseText,
-                                "binary");
-                        }
-                    } else {
-                        data = xhr.responseText;
-                    }
-                    cache[path] = data;
-                    callback(null, data);
-                } else {
-                    // report error
-                    callback(xhr.responseText || xhr.statusText);
-                }
-            }
-        }
-        xhr.open('GET', path, true);
-        xhr.onreadystatechange = handleResult;
-        if (xhr.overrideMimeType) {
-            if (encoding !== "binary") {
-                xhr.overrideMimeType("text/plain; charset=" + encoding);
-            } else {
-                xhr.overrideMimeType("text/plain; charset=x-user-defined");
-            }
-        }
-        try {
-            xhr.send(null);
-        } catch (e) {
-            callback(e.message);
-        }
-    }
-    function read(path, offset, length, callback) {
-        if (cache.hasOwnProperty(path)) {
-            callback(null, cache[path].slice(offset, offset + length));
-            return;
-        }
-        var xhr = new XMLHttpRequest();
-        function handleResult() {
-            var data;
-            if (xhr.readyState === 4) {
-                if (xhr.status === 0 && !xhr.responseText) {
-                    // for local files there is no difference between missing
-                    // and empty files, so empty files are considered as errors
-                    callback("File " + path + " is empty.");
-                } else if (xhr.status === 200 || xhr.status === 0) {
-                    // report file
-                    if (typeof VBArray !== "undefined") {
-                        data = new VBArray(xhr.responseBody).toArray();
-                    } else {
-                        data = self.byteArrayFromString(xhr.responseText, "binary");
-                    }
-                    cache[path] = data;
-                    callback(null, data.slice(offset, offset + length));
-                } else {
-                    // report error
-                    callback(xhr.responseText || xhr.statusText);
-                }
-            }
-        }
-        xhr.open('GET', path, true);
-        xhr.onreadystatechange = handleResult;
-        if (xhr.overrideMimeType) {
-            xhr.overrideMimeType("text/plain; charset=x-user-defined");
-        }
-        //xhr.setRequestHeader('Range', 'bytes=' + offset + '-' +
-        //       (offset + length - 1));
-        try {
-            xhr.send(null);
-        } catch (e) {
-            callback(e.message);
-        }
-    }
-    function readFileSync(path, encoding) {
-        var xhr = new XMLHttpRequest(),
-            result;
-        xhr.open('GET', path, false);
-        if (xhr.overrideMimeType) {
-            if (encoding !== "binary") {
-                xhr.overrideMimeType("text/plain; charset=" + encoding);
-            } else {
-                xhr.overrideMimeType("text/plain; charset=x-user-defined");
-            }
-        }
-        try {
-            xhr.send(null);
-            if (xhr.status === 200 || xhr.status === 0) {
-                result = xhr.responseText;
-            }
-        } catch (e) {
-        }
-        return result;
-    }
-    function writeFile(path, data, callback) {
-        cache[path] = data;
-        var xhr = new XMLHttpRequest();
-        function handleResult() {
-            if (xhr.readyState === 4) {
-                if (xhr.status === 0 && !xhr.responseText) {
-                    // for local files there is no difference between missing
-                    // and empty files, so empty files are considered as errors
-                    callback("File " + path + " is empty.");
-                } else if ((xhr.status >= 200 && xhr.status < 300) ||
-                           xhr.status === 0) {
-                    // report success
-                    callback(null);
-                } else {
-                    // report error
-                    callback("Status " + String(xhr.status) + ": " +
-                            xhr.responseText || xhr.statusText);
-                }
-            }
-        }
-        xhr.open('PUT', path, true);
-        xhr.onreadystatechange = handleResult;
-        // ArrayBufferView will have an ArrayBuffer property, in WebKit, XHR can send()
-        // an ArrayBuffer, In Firefox, one must use sendAsBinary with a string
-        if (data.buffer && !xhr.sendAsBinary) {
-            data = data.buffer; // webkit supports sending an ArrayBuffer
-        } else {
-            // encode into a string, this works in FireFox >= 3
-            data = self.byteArrayToString(data, "binary");
-        }
-        try {
-            if (xhr.sendAsBinary) {
-                xhr.sendAsBinary(data);
-            } else {
-                xhr.send(data);
-            }
-        } catch (e) {
-            self.log("HUH? " + e + " " + data);
-            callback(e.message);
-        }
-    }
-    function deleteFile(path, callback) {
-        var xhr = new XMLHttpRequest();
-        xhr.open('DELETE', path, true);
-        xhr.onreadystatechange = function () {
-            if (xhr.readyState === 4) {
-                if (xhr.status < 200 && xhr.status >= 300) {
-                    callback(xhr.responseText);
-                } else {
-                    callback(null);
-                }
-            }
-        };
-        xhr.send(null);
-    }
-    function loadXML(path, callback) {
-        var xhr = new XMLHttpRequest();
-        function handleResult() {
-            if (xhr.readyState === 4) {
-                if (xhr.status === 0 && !xhr.responseText) {
-                    callback("File " + path + " is empty.");
-                } else if (xhr.status === 200 || xhr.status === 0) {
-                    // report file
-                    callback(null, xhr.responseXML);
-                } else {
-                    // report error
-                    callback(xhr.responseText);
-                }
-            }
-        }
-        xhr.open("GET", path, true);
-        if (xhr.overrideMimeType) {
-            xhr.overrideMimeType("text/xml");
-        }
-        xhr.onreadystatechange = handleResult;
-        try {
-            xhr.send(null);
-        } catch (e) {
-            callback(e.message);
-        }
-    }
-    function isFile(path, callback) {
-        self.getFileSize(path, function (size) {
-            callback(size !== -1);
-        });
-    }
-    function getFileSize(path, callback) {
-        var xhr = new XMLHttpRequest();
-        xhr.open("HEAD", path, true);
-        xhr.onreadystatechange = function () {
-            if (xhr.readyState !== 4) {
-                return;
-            }
-            var cl = xhr.getResponseHeader("Content-Length");
-            if (cl) {
-                callback(parseInt(cl, 10));
-            } else {
-                callback(-1);
-            }
-        };
-        xhr.send(null);
-    }
-    function wrap(nativeFunction, nargs) {
-        if (!nativeFunction) {
-            return null;
-        }
-        return function () {
-            // clear cache
-            cache = {};
-            // assume the last argument is a callback function
-            var callback = arguments[nargs],
-                args = Array.prototype.slice.call(arguments, 0, nargs),
-                callbackname = "callback" + String(Math.random()).substring(2);
-            window[callbackname] = function () {
-                delete window[callbackname];
-                callback.apply(this, arguments);
-            };
-            args.push(callbackname);
-            nativeFunction.apply(this, args);
-        };
-    }
-    this.readFile = readFile;
-    this.read = read;
-    this.readFileSync = readFileSync;
-    this.writeFile = writeFile;
-    this.deleteFile = deleteFile;
-    this.loadXML = loadXML;
-    this.isFile = isFile;
-    this.getFileSize = getFileSize;
-    this.log = log;
-    this.setTimeout = function (f, msec) {
-        setTimeout(function () {
-            f();
-        }, msec);
-    };
-    this.libraryPaths = function () {
-        return ["lib"]; // TODO: find a good solution
-                                       // probably let html app specify it
-    };
-    this.setCurrentDirectory = function (dir) {
-    };
-    this.type = function () {
-        return "BrowserRuntime";
-    };
-    this.getDOMImplementation = function () {
-        return window.document.implementation;
-    };
-    this.exit = function (exitCode) {
-        log("Calling exit with code " + String(exitCode) +
-                ", but exit() is not implemented.");
-    };
-    this.getWindow = function () {
-        return window;
-    };
-}
-
-/**
- * @constructor
- * @implements {Runtime}
- */
-function NodeJSRuntime() {
-    "use strict";
-    var self = this,
-        fs = require('fs'),
-        currentDirectory = "";
-
-    /**
-     * @constructor
-     * @extends {Runtime.ByteArray}
-     * @param {!number} size
-     */
-    this.ByteArray = function (size) {
-        return new Buffer(size);
-    };
-
-    this.byteArrayFromArray = function (array) {
-        var ba = new Buffer(array.length),
-            i,
-            l = array.length;
-        for (i = 0; i < l; i += 1) {
-            ba[i] = array[i];
-        }
-        return ba;
-    };
-
-    this.concatByteArrays = function (a, b) {
-        var ba = new Buffer(a.length + b.length);
-        a.copy(ba, 0, 0);
-        b.copy(ba, a.length, 0);
-        return ba;
-    };
-
-    this.byteArrayFromString = function (string, encoding) {
-        return new Buffer(string, encoding);
-    };
-
-    this.byteArrayToString = function (bytearray, encoding) {
-        return bytearray.toString(encoding);
-    };
-
-    function isFile(path, callback) {
-        if (currentDirectory) {
-            path = currentDirectory + "/" + path;
-        }
-        fs.stat(path, function (err, stats) {
-            callback(!err && stats.isFile());
-        });
-    }
-    function loadXML(path, callback) {
-        throw "Not implemented.";
-    }
-    this.readFile = function (path, encoding, callback) {
-        if (encoding !== "binary") {
-            fs.readFile(path, encoding, callback);
-        } else {
-            fs.readFile(path, null, callback);
-/*
-            // we have to encode the returned buffer to a string
-            // it would be nice if we would have a blob or buffer object
-            fs.readFile(path, null, function (err, data) {
-                if (err) {
-                    callback(err);
-                    return;
-                }
-                callback(null, data.toString("binary"));
-            });
-*/
-        }
-    };
-    this.writeFile = function (path, data, callback) {
-        fs.writeFile(path, data, "binary", function (err) {
-            callback(err || null);
-        });
-    };
-    this.deleteFile = fs.unlink;
-    this.read = function (path, offset, length, callback) {
-        if (currentDirectory) {
-            path = currentDirectory + "/" + path;
-        }
-        fs.open(path, "r+", 666, function (err, fd) {
-            if (err) {
-                callback(err);
-                return;
-            }
-            var buffer = new Buffer(length);
-            fs.read(fd, buffer, 0, length, offset, function (err, bytesRead) {
-                fs.close(fd);
-                callback(err, buffer);
-            });
-        });
-    };
-    this.readFileSync = function (path, encoding) {
-        if (!encoding) {
-            return "";
-        }
-        return fs.readFileSync(path, encoding);
-    };
-    this.loadXML = loadXML;
-    this.isFile = isFile;
-    this.getFileSize = function (path, callback) {
-        if (currentDirectory) {
-            path = currentDirectory + "/" + path;
-        }
-        fs.stat(path, function (err, stats) {
-            if (err) {
-                callback(-1);
-            } else {
-                callback(stats.size);
-            }
-        });
-    };
-    this.log = function (msg) {
-        process.stderr.write(msg + '\n');
-    };
-    this.setTimeout = function (f, msec) {
-        setTimeout(function () {
-            f();
-        }, msec);
-    };
-    this.libraryPaths = function () {
-        return [__dirname];
-    };
-    this.setCurrentDirectory = function (dir) {
-        currentDirectory = dir;
-    };
-    this.currentDirectory = function () {
-        return currentDirectory;
-    };
-    this.type = function () {
-        return "NodeJSRuntime";
-    };
-    this.getDOMImplementation = function () {
-        return null;
-    };
-    this.exit = process.exit;
-    this.getWindow = function () {
-        return null;
-    };
-}
-
-/**
- * @constructor
- * @implements {Runtime}
- */
-function RhinoRuntime() {
-    "use strict";
-    var self = this,
-        dom = Packages.javax.xml.parsers.DocumentBuilderFactory.newInstance(),
-        builder,
-        entityresolver,
-        currentDirectory = "";
-    dom.setValidating(false);
-    dom.setNamespaceAware(true);
-    dom.setExpandEntityReferences(false);
-    dom.setSchema(null);
-    entityresolver = Packages.org.xml.sax.EntityResolver({
-        resolveEntity: function (publicId, systemId) {
-            var file, open = function (path) {
-                var reader = new Packages.java.io.FileReader(path),
-                    source = new Packages.org.xml.sax.InputSource(reader);
-                return source;
-            };
-            file = systemId;
-            //file = /[^\/]*$/.exec(systemId); // what should this do?
-            return open(file);
-        }
-    });
-    //dom.setEntityResolver(entityresolver);
-    builder = dom.newDocumentBuilder();
-    builder.setEntityResolver(entityresolver);
-
-    /**
-     * @constructor
-     * @param {!number} size
-     */
-    this.ByteArray = function ByteArray(size) {
-        return [size];
-    };
-    this.byteArrayFromArray = function (array) {
-        return array;
-    };
-    this.byteArrayFromString = function (string, encoding) {
-        // ignore encoding for now
-        var a = [], i, l = string.length;
-        for (i = 0; i < l; i += 1) {
-            a[i] = string.charCodeAt(i) & 0xff;
-        }
-        return a;
-    };
-    this.byteArrayToString = Runtime.byteArrayToString;
-    this.concatByteArrays = function (bytearray1, bytearray2) {
-        return bytearray1.concat(bytearray2);
-    };
-
-    function loadXML(path, callback) {
-        var file = new Packages.java.io.File(path),
-            document;
-        try {
-            document = builder.parse(file);
-        } catch (err) {
-            print(err);
-            callback(err);
-            return;
-        }
-        callback(null, document);
-    }
-    function runtimeReadFile(path, encoding, callback) {
-        var file = new Packages.java.io.File(path),
-            data,
-            // read binary, seems hacky but works
-            rhinoencoding = (encoding === "binary") ? "latin1" : encoding;
-        if (!file.isFile()) {
-            callback(path + " is not a file.");
-        } else {
-            data = readFile(path, rhinoencoding);
-            if (encoding === "binary") {
-                data = self.byteArrayFromString(data, "binary");
-            }
-            callback(null, data);
-        }
-    }
-    /**
-     * @param {!string} path
-     * @param {!string} encoding
-     * @return {?string}
-     */
-    function runtimeReadFileSync(path, encoding) {
-        var file = new Packages.java.io.File(path), data, i;
-        if (!file.isFile()) {
-            return null;
-        }
-        if (encoding === "binary") {
-            encoding = "latin1"; // read binary, seems hacky but works
-        }
-        return readFile(path, encoding);
-    }
-    function isFile(path, callback) {
-        if (currentDirectory) {
-            path = currentDirectory + "/" + path;
-        }
-        var file = new Packages.java.io.File(path);
-        callback(file.isFile());
-    }
-    this.loadXML = loadXML;
-    this.readFile = runtimeReadFile;
-    this.writeFile = function (path, data, callback) {
-        var out = new Packages.java.io.FileOutputStream(path),
-            i,
-            l = data.length;
-        for (i = 0; i < l; i += 1) {
-            out.write(data[i]);
-        }
-        out.close();
-        callback(null);
-    };
-    this.deleteFile = function (path, callback) {
-        var file = new Packages.java.io.File(path);
-        if (file['delete']()) {
-            callback(null);
-        } else {
-            callback("Could not delete " + path);
-        }
-    };
-    this.read = function (path, offset, length, callback) {
-        // TODO: adapt to read only a part instead of the whole file
-        if (currentDirectory) {
-            path = currentDirectory + "/" + path;
-        }
-        var data = runtimeReadFileSync(path, "binary");
-        if (data) {
-            callback(null, this.byteArrayFromString(
-                data.substring(offset, offset + length),
-                "binary"
-            ));
-        } else {
-            callback("Cannot read " + path);
-        }
-    };
-    this.readFileSync = function (path, encoding) {
-        if (!encoding) {
-            return "";
-        }
-        return readFile(path, encoding);
-    };
-    this.isFile = isFile;
-    this.getFileSize = function (path, callback) {
-        if (currentDirectory) {
-            path = currentDirectory + "/" + path;
-        }
-        var file = new Packages.java.io.File(path);
-        callback(file.length());
-    };
-    this.log = print;
-    this.setTimeout = function (f, msec) {
-        f();
-    };
-    this.libraryPaths = function () {
-        return ["lib"];
-    };
-    this.setCurrentDirectory = function (dir) {
-        currentDirectory = dir;
-    };
-    this.currentDirectory = function () {
-        return currentDirectory;
-    };
-    this.type = function () {
-        return "RhinoRuntime";
-    };
-    this.getDOMImplementation = function () {
-        return builder.getDOMImplementation();
-    };
-    this.exit = quit;
-    this.getWindow = function () {
-        return null;
-    };
-}
-
-/**
- * @const
- * @type {Runtime}
- */
-var runtime = (function () {
-    "use strict";
-    var result;
-    if (typeof window !== "undefined") {
-        result = new BrowserRuntime(window.document.getElementById("logoutput"));
-    } else if (typeof require !== "undefined") {
-        result = new NodeJSRuntime();
-    } else {
-        result = new RhinoRuntime();
-    }
-    return result;
-}());
-/*jslint sloppy: true*/
-(function () {
-    var cache = {},
-        dircontents = {};
-    function getOrDefinePackage(packageNameComponents) {
-        var topname = packageNameComponents[0],
-            i,
-            pkg;
-        // ensure top level package exists
-        pkg = eval("if (typeof " + topname + " === 'undefined') {" +
-                "eval('" + topname + " = {};');}" + topname);
-        for (i = 1; i < packageNameComponents.length - 1; i += 1) {
-            if (!pkg.hasOwnProperty(packageNameComponents[i])) {
-                pkg = pkg[packageNameComponents[i]] = {};
-            }
-        }
-        return pkg[packageNameComponents[packageNameComponents.length - 1]];
-    }
-    /**
-     * @param {string} classpath
-     * @returns {undefined}
-     */
-    runtime.loadClass = function (classpath) {
-        if (IS_COMPILED_CODE) {
-            return;
-        }
-        if (cache.hasOwnProperty(classpath)) {
-            return;
-        }
-        var names = classpath.split("."),
-            impl;
-        impl = getOrDefinePackage(names);
-        if (impl) {
-            cache[classpath] = true;
-            return;
-        }
-        function getPathFromManifests(classpath) {
-            var path = classpath.replace(".", "/") + ".js",
-                dirs = runtime.libraryPaths(),
-                i,
-                dir,
-                code;
-            if (runtime.currentDirectory) {
-                dirs.push(runtime.currentDirectory());
-            }
-            for (i = 0; i < dirs.length; i += 1) {
-                dir = dirs[i];
-                if (!dircontents.hasOwnProperty(dir)) {
-                    code = runtime.readFileSync(dirs[i] + "/manifest.js",
-                            "utf8");
-                    if (code && code.length) {
-                        try {
-                            dircontents[dir] = eval(code);
-                        } catch (e1) {
-                            dircontents[dir] = null;
-                            runtime.log("Cannot load manifest for " + dir +
-                                    ".");
-                        }
-                    } else {
-                        dircontents[dir] = null;
-                    }
-                }
-                code = null;
-                dir = dircontents[dir];
-                if (dir && dir.indexOf && dir.indexOf(path) !== -1) {
-                    return dirs[i] + "/" + path;
-                }
-            }
-            return null;
-        }
-        function load(classpath) {
-            var code, path;
-            path = getPathFromManifests(classpath);
-            if (!path) {
-                throw classpath + " is not listed in any manifest.js.";
-            }
-            try {
-                code = runtime.readFileSync(path, "utf8");
-            } catch (e2) {
-                runtime.log("Error loading " + classpath + " " + e2);
-                throw e2;
-            }
-            if (code === undefined) {
-                throw "Cannot load class " + classpath;
-            }
-            try {
-                code = eval(classpath + " = eval(code);");
-            } catch (e4) {
-                runtime.log("Error loading " + classpath + " " + e4);
-                throw e4;
-            }
-            return code;
-        }
-        // check if the class in context already
-        impl = load(classpath);
-        if (!impl || Runtime.getFunctionName(impl) !==
-                names[names.length - 1]) {
-            runtime.log("Loaded code is not for " + names[names.length - 1]);
-            throw "Loaded code is not for " + names[names.length - 1];
-        }
-        cache[classpath] = true;
-    };
-}());
-(function (args) {
-    args = Array.prototype.slice.call(args);
-    function run(argv) {
-        if (!argv.length) {
-            return;
-        }
-        var script = argv[0];
-        runtime.readFile(script, "utf8", function (err, code) {
-            var path = "",
-                paths = runtime.libraryPaths();
-            if (script.indexOf("/") !== -1) {
-                path = script.substring(0, script.indexOf("/"));
-            }
-            runtime.setCurrentDirectory(path);
-            function run() {
-                var script, path, paths, args, argv, result; // hide variables
-                // execute script and make arguments available via argv
-                result = eval(code);
-                if (result) {
-                    runtime.exit(result);
-                }
-                return;
-            }
-            if (err) {
-                runtime.log(err);
-                runtime.exit(1);
-            } else {
-                // run the script with arguments bound to arguments parameter
-                run.apply(null, argv);
-            }
-        });
-    }
-    // if rhino or node.js, run the scripts provided as arguments
-    if (runtime.type() === "NodeJSRuntime") {
-        run(process.argv.slice(2));
-    } else if (runtime.type() === "RhinoRuntime") {
-        run(args);
-    } else {
-        run(args.slice(1));
-    }
-}(typeof arguments !== "undefined" && arguments));
-
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/xmldom/LSSerializer.js b/apps/files_odfviewer/src/webodf/webodf/lib/xmldom/LSSerializer.js
deleted file mode 100644
index 12b3219f81..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/lib/xmldom/LSSerializer.js
+++ /dev/null
@@ -1,197 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global xmldom*/
-/*jslint sub: true*/
-if (typeof Object.create !== 'function') {
-    Object['create'] = function (o) {
-        "use strict";
-        /**
-         * @constructor
-         */
-        var F = function () {};
-        F.prototype = o;
-        return new F();
-    };
-}
-
-/**
- * Partial implementation of LSSerializer
- * @constructor
- */
-xmldom.LSSerializer = function LSSerializer() {
-    "use strict";
-    var /**@const@type{!LSSerializer}*/ self = this;
-
-    /**
-     * @param {!string} prefix
-     * @param {!Attr} attr
-     * @return {!string}
-     */
-    function serializeAttribute(prefix, attr) {
-        var /**@type{!string}*/ s = prefix + attr.localName + "=\"" +
-            attr.nodeValue + "\"";
-        return s;
-    }
-    /**
-     * @param {!Object.<string,string>} nsmap
-     * @param {string} prefix
-     * @param {string} ns
-     * @return {!string}
-     */
-    function attributePrefix(nsmap, prefix, ns) {
-        // TODO: check for double prefix definitions, this needs a special class
-        if (nsmap.hasOwnProperty(ns)) {
-            return nsmap[ns] + ":";
-        }
-        if (nsmap[ns] !== prefix) {
-            nsmap[ns] = prefix;
-        }
-        return prefix + ":";
-    }
-    /**
-     * @param {!Object.<string,string>} nsmap
-     * @param {!Node} node
-     * @return {!string}
-     */
-    function startNode(nsmap, node) {
-        var /**@type{!string}*/ s = "",
-            /**@const@type{!NamedNodeMap}*/ atts = node.attributes,
-            /**@const@type{!number}*/ length,
-            /**@type{!number}*/ i,
-            /**@type{!Attr}*/ attr,
-            /**@type{!string}*/ attstr = "",
-            /**@type{!number}*/ accept,
-            /**@type{!string}*/ prefix;
-        if (atts) { // ELEMENT
-            if (nsmap[node.namespaceURI] !== node.prefix) {
-                nsmap[node.namespaceURI] = node.prefix;
-            }
-            s += "<" + node.nodeName;
-            length = atts.length;
-            for (i = 0; i < length; i += 1) {
-                attr = /**@type{!Attr}*/(atts.item(i));
-                if (attr.namespaceURI !== "http://www.w3.org/2000/xmlns/") {
-                    accept = (self.filter) ? self.filter.acceptNode(attr) : 1;
-                    if (accept === 1) {
-                        // xml attributes always need a prefix for a namespace
-                        if (attr.namespaceURI) {
-                           prefix = attributePrefix(nsmap, attr.prefix,
-                                   attr.namespaceURI);
-                        } else {
-                           prefix = "";
-                        }
-                        attstr += " " + serializeAttribute(prefix, attr);
-                    }
-                }
-            }
-            for (i in nsmap) {
-                if (nsmap.hasOwnProperty(i)) {
-                    prefix = nsmap[i];
-                    if (!prefix) {
-                        s += " xmlns=\"" + i + "\"";
-                    } else if (prefix !== "xmlns") {
-                        s += " xmlns:" + nsmap[i] + "=\"" + i + "\"";
-                    }
-                }
-            }
-            s += attstr + ">";
-        }
-        return s;
-    }
-    /**
-     * @param {!Node} node
-     * @return {!string}
-     */
-    function endNode(node) {
-        var /**@type{!string}*/ s = "";
-        if (node.nodeType === 1) { // ELEMENT
-            s += "</" + node.nodeName + ">";
-        }
-        return s;
-    }
-    /**
-     * @param {!Object.<string,string>} parentnsmap
-     * @param {!Node} node
-     * @return {!string}
-     */
-    function serializeNode(parentnsmap, node) {
-        var /**@type{!string}*/ s = "",
-            /**@const@type{!Object.<string,string>}*/ nsmap
-                = Object.create(parentnsmap),
-            /**@const@type{!number}*/ accept
-                = (self.filter) ? self.filter.acceptNode(node) : 1,
-            /**@type{Node}*/child;
-        if (accept === 1) {
-            s += startNode(nsmap, node);
-        }
-        if (accept === 1 || accept === 3) {
-            child = node.firstChild;
-            while (child) {
-                s += serializeNode(nsmap, child);
-                child = child.nextSibling;
-            }
-            if (node.nodeValue) {
-                s += node.nodeValue;
-            }
-        }
-        if (accept === 1) {
-            s += endNode(node);
-        }
-        return s;
-    }
-    function invertMap(map) {
-        var m = {}, i;
-        for (i in map) {
-            if (map.hasOwnProperty(i)) {
-                m[map[i]] = i;
-            }
-        }
-        return m;
-    }
-    /**
-     * @type {xmldom.LSSerializerFilter}
-     */
-    this.filter = null;
-    /**
-     * @param {!Node} node
-     * @param {!Object.<string,string>} nsmap
-     * @return {!string}
-     */
-    this.writeToString = function (node, nsmap) {
-        if (!node) {
-            return "";
-        }
-        nsmap = nsmap ? invertMap(nsmap) : {};
-        return serializeNode(nsmap, node);
-    };
-};
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/xmldom/LSSerializerFilter.js b/apps/files_odfviewer/src/webodf/webodf/lib/xmldom/LSSerializerFilter.js
deleted file mode 100644
index 889428b831..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/lib/xmldom/LSSerializerFilter.js
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global xmldom*/
-/**
- * Partial implementation of LSSerializerFilter
- * @interface
- */
-xmldom.LSSerializerFilter = function LSSerializerFilter() {
-    "use strict";
-};
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/xmldom/OperationalTransformDOM.js b/apps/files_odfviewer/src/webodf/webodf/lib/xmldom/OperationalTransformDOM.js
deleted file mode 100644
index 5e9f3abacf..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/lib/xmldom/OperationalTransformDOM.js
+++ /dev/null
@@ -1,115 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global xmldom*/
-/**
- * @class
- * @constructor
- * @augments xmldom.OperationalTransformInterface
- * @implements {xmldom.OperationalTransformInterface}
- * @param {Element} root
- * @param {xmldom.LSSerializer} serializer
- */
-xmldom.OperationalTransformDOM = function OperationalTransformDOM(root, serializer) {
-    "use strict";
-    var pos, length;
-    /**
-     * Skip in the document
-     * @param {!number} amount
-     * @return {undefined}
-     */
-    function retain(amount) {}
-    /**
-     * Insert characters
-     * Can throw an exception if the current position does not allow insertion
-     * of characters.
-     * @param {!string} chars
-     * @return {undefined}
-     */
-    function insertCharacters(chars) {}
-    /**
-     * Insert element start
-     * @param {!string} tagname
-     * @param {!Object} attributes
-     * @return {undefined}
-     */
-    function insertElementStart(tagname, attributes) {}
-    /**
-     * Insert element end
-     * @return {undefined}
-     */
-    function insertElementEnd() {}
-    /**
-     * Delete characters
-     * @param {!number} amount
-     * @return {undefined}
-     */
-    function deleteCharacters(amount) {}
-    /**
-     * Delete element start
-     * @return {undefined}
-     */
-    function deleteElementStart() {}
-    /**
-     * Delete element end
-     * @return {undefined}
-     */
-    function deleteElementEnd() {}
-    /**
-     * Replace attributes
-     * @param {!Object} atts
-     * @return {undefined}
-     */
-    function replaceAttributes(atts) {}
-    /**
-     * Update attributes
-     * @param {!Object} atts
-     * @return {undefined}
-     */
-    function updateAttributes(atts) {}
-    /**
-     * @return {!boolean}
-     */
-    function atEnd() {
-        return pos === length;
-    }
-    this.retain = retain;
-    this.insertCharacters = insertCharacters;
-    this.insertElementStart = insertElementStart;
-    this.insertElementEnd = insertElementEnd;
-    this.deleteCharacters = deleteCharacters;
-    this.deleteElementStart = deleteElementStart;
-    this.deleteElementEnd = deleteElementEnd;
-    this.replaceAttributes = replaceAttributes;
-    this.updateAttributes = updateAttributes;
-    this.atEnd = atEnd;
-};
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/xmldom/OperationalTransformInterface.js b/apps/files_odfviewer/src/webodf/webodf/lib/xmldom/OperationalTransformInterface.js
deleted file mode 100644
index 03aab1232b..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/lib/xmldom/OperationalTransformInterface.js
+++ /dev/null
@@ -1,97 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global xmldom*/
-/**
- * This interface allows a document to be modified by operational
- * transformations. The interface is modelled after Google Wave.
- * Manual editing of XML documents will also be done via this interface.
- *
- * 
- * @class
- * @interface
- */
-xmldom.OperationalTransformInterface = function () {"use strict"; };
-/**
- * Skip in the document
- * @param {!number} amount
- * @return {undefined}
- */
-xmldom.OperationalTransformInterface.prototype.retain = function (amount) {"use strict"; };
-/**
- * Insert characters
- * Can throw an exception if the current position does not allow insertion of
- * characters.
- * @param {!string} chars
- * @return {undefined}
- */
-xmldom.OperationalTransformInterface.prototype.insertCharacters = function (chars) {"use strict"; };
-/**
- * Insert element start
- * @param {!string} tagname
- * @param {!Object} attributes
- * @return {undefined}
- */
-xmldom.OperationalTransformInterface.prototype.insertElementStart = function (tagname, attributes) {"use strict"; };
-/**
- * Insert element end
- * @return {undefined}
- */
-xmldom.OperationalTransformInterface.prototype.insertElementEnd = function () {"use strict"; };
-/**
- * Delete characters
- * @param {!number} amount
- * @return {undefined}
- */
-xmldom.OperationalTransformInterface.prototype.deleteCharacters = function (amount) {"use strict"; };
-/**
- * Delete element start
- * @return {undefined}
- */
-xmldom.OperationalTransformInterface.prototype.deleteElementStart = function () {"use strict"; };
-/**
- * Delete element end
- * @return {undefined}
- */
-xmldom.OperationalTransformInterface.prototype.deleteElementEnd = function () {"use strict"; };
-/**
- * Replace attributes
- * @param {!Object} atts
- * @return {undefined}
- */
-xmldom.OperationalTransformInterface.prototype.replaceAttributes = function (atts) {"use strict"; };
-/**
- * Update attributes
- * @param {!Object} atts
- * @return {undefined}
- */
-xmldom.OperationalTransformInterface.prototype.updateAttributes = function (atts) {"use strict"; };
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/xmldom/RelaxNG.js b/apps/files_odfviewer/src/webodf/webodf/lib/xmldom/RelaxNG.js
deleted file mode 100644
index e04c3c7611..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/lib/xmldom/RelaxNG.js
+++ /dev/null
@@ -1,691 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global runtime: true, xmldom: true*/
-
-/**
- * RelaxNG can check a DOM tree against a Relax NG schema
- * The RelaxNG implementation is currently not complete. Relax NG should not
- * report errors on valid DOM trees, but it will not check all constraints that
- * a Relax NG file can define. The current implementation does not load external
- * parts of a Relax NG file.
- * The main purpose of this Relax NG engine is to validate runtime ODF
- * documents. The DOM tree is traversed via a TreeWalker. A custom TreeWalker
- * implementation can hide parts of a DOM tree. This is useful in WebODF, where
- * special elements and attributes in the runtime DOM tree.
- *
- * implementation according to
- * http://www.thaiopensource.com/relaxng/derivative.html
- */
-runtime.loadClass("xmldom.RelaxNGParser");
-/**
- * @constructor
- */
-xmldom.RelaxNG = function RelaxNG() {
-    "use strict";
-    var xmlnsns = "http://www.w3.org/2000/xmlns/",
-        createChoice,
-        createInterleave,
-        createGroup,
-        createAfter,
-        createOneOrMore,
-        createValue,
-        createAttribute,
-        createNameClass,
-        createData,
-        makePattern,
-        notAllowed = {
-            type: "notAllowed",
-            nullable: false,
-            hash: "notAllowed",
-            textDeriv: function () { return notAllowed; },
-            startTagOpenDeriv: function () { return notAllowed; },
-            attDeriv: function () { return notAllowed; },
-            startTagCloseDeriv: function () { return notAllowed; },
-            endTagDeriv: function () { return notAllowed; }
-        },
-        empty = {
-            type: "empty",
-            nullable: true,
-            hash: "empty",
-            textDeriv: function () { return notAllowed; },
-            startTagOpenDeriv: function () { return notAllowed; },
-            attDeriv: function (context, attribute) { return notAllowed; },
-            startTagCloseDeriv: function () { return empty; },
-            endTagDeriv: function () { return notAllowed; }
-        },
-        text = {
-            type: "text",
-            nullable: true,
-            hash: "text",
-            textDeriv: function () { return text; },
-            startTagOpenDeriv: function () { return notAllowed; },
-            attDeriv: function () { return notAllowed; },
-            startTagCloseDeriv: function () { return text; },
-            endTagDeriv: function () { return notAllowed; }
-        },
-        applyAfter,
-        childDeriv,
-        rootPattern;
-
-    function memoize0arg(func) {
-        return (function () {
-            var cache;
-            return function () {
-                if (cache === undefined) {
-                    cache = func();
-                }
-                return cache;
-            };
-        }());
-    }
-    function memoize1arg(type, func) {
-        return (function () {
-            var cache = {}, cachecount = 0;
-            return function (a) {
-                var ahash = a.hash || a.toString(),
-                    v;
-                v = cache[ahash];
-                if (v !== undefined) {
-                    return v;
-                }
-                cache[ahash] = v = func(a);
-                v.hash = type + cachecount.toString();
-                cachecount += 1;
-                return v;
-            };
-        }());
-    }
-    function memoizeNode(func) {
-        return (function () {
-            var cache = {};
-            return function (node) {
-                var v, m;
-                m = cache[node.localName];
-                if (m === undefined) {
-                    cache[node.localName] = m = {};
-                } else {
-                    v = m[node.namespaceURI];
-                    if (v !== undefined) {
-                        return v;
-                    }
-                }
-                m[node.namespaceURI] = v = func(node);
-                return v;
-            };
-        }());
-    }
-    function memoize2arg(type, fastfunc, func) {
-        return (function () {
-            var cache = {}, cachecount = 0;
-            return function (a, b) {
-                var v = fastfunc && fastfunc(a, b),
-                    ahash, bhash, m;
-                if (v !== undefined) { return v; }
-                ahash = a.hash || a.toString();
-                bhash = b.hash || b.toString();
-                m = cache[ahash];
-                if (m === undefined) {
-                    cache[ahash] = m = {};
-                } else {
-                    v = m[bhash];
-                    if (v !== undefined) {
-                        return v;
-                    }
-                }
-                m[bhash] = v = func(a, b);
-                v.hash = type + cachecount.toString();
-                cachecount += 1;
-                return v;
-            };
-        }());
-    }
-    // this memoize function can be used for functions where the order of two
-    // arguments is not important
-    function unorderedMemoize2arg(type, fastfunc, func) {
-        return (function () {
-            var cache = {}, cachecount = 0;
-            return function (a, b) {
-                var v = fastfunc && fastfunc(a, b),
-                    ahash, bhash, m;
-                if (v !== undefined) { return v; }
-                ahash = a.hash || a.toString();
-                bhash = b.hash || b.toString();
-                if (ahash < bhash) {
-                    m = ahash; ahash = bhash; bhash = m;
-                    m = a; a = b; b = m;
-                }
-                m = cache[ahash];
-                if (m === undefined) {
-                    cache[ahash] = m = {};
-                } else {
-                    v = m[bhash];
-                    if (v !== undefined) {
-                        return v;
-                    }
-                }
-                m[bhash] = v = func(a, b);
-                v.hash = type + cachecount.toString();
-                cachecount += 1;
-                return v;
-            };
-        }());
-    }
-    function getUniqueLeaves(leaves, pattern) {
-        if (pattern.p1.type === "choice") {
-            getUniqueLeaves(leaves, pattern.p1);
-        } else {
-            leaves[pattern.p1.hash] = pattern.p1;
-        }
-        if (pattern.p2.type === "choice") {
-            getUniqueLeaves(leaves, pattern.p2);
-        } else {
-            leaves[pattern.p2.hash] = pattern.p2;
-        }
-    }
-    createChoice = memoize2arg("choice", function (p1, p2) {
-        if (p1 === notAllowed) { return p2; }
-        if (p2 === notAllowed) { return p1; }
-        if (p1 === p2) { return p1; }
-    }, function (p1, p2) {
-        function makeChoice(p1, p2) {
-            return {
-                type: "choice",
-                p1: p1,
-                p2: p2,
-                nullable: p1.nullable || p2.nullable,
-                textDeriv: function (context, text) {
-                    return createChoice(p1.textDeriv(context, text),
-                        p2.textDeriv(context, text));
-                },
-                startTagOpenDeriv: memoizeNode(function (node) {
-                    return createChoice(p1.startTagOpenDeriv(node),
-                        p2.startTagOpenDeriv(node));
-                }),
-                attDeriv: function (context, attribute) {
-                    return createChoice(p1.attDeriv(context, attribute),
-                        p2.attDeriv(context, attribute));
-                },
-                startTagCloseDeriv: memoize0arg(function () {
-                    return createChoice(p1.startTagCloseDeriv(),
-                        p2.startTagCloseDeriv());
-                }),
-                endTagDeriv: memoize0arg(function () {
-                    return createChoice(p1.endTagDeriv(), p2.endTagDeriv());
-                })
-            };
-        }
-        var leaves = {}, i;
-        getUniqueLeaves(leaves, {p1: p1, p2: p2});
-        p1 = undefined;
-        p2 = undefined;
-        for (i in leaves) {
-            if (leaves.hasOwnProperty(i)) {
-                if (p1 === undefined) {
-                    p1 = leaves[i];
-                } else if (p2 === undefined) {
-                    p2 = leaves[i];
-                } else {
-                    p2 = createChoice(p2, leaves[i]);
-                }
-            }
-        }
-        return makeChoice(p1, p2);
-    });
-    createInterleave = unorderedMemoize2arg("interleave", function (p1, p2) {
-        if (p1 === notAllowed || p2 === notAllowed) { return notAllowed; }
-        if (p1 === empty) { return p2; }
-        if (p2 === empty) { return p1; }
-    }, function (p1, p2) {
-        return {
-            type: "interleave",
-            p1: p1,
-            p2: p2,
-            nullable: p1.nullable && p2.nullable,
-            textDeriv: function (context, text) {
-                return createChoice(
-                    createInterleave(p1.textDeriv(context, text), p2),
-                    createInterleave(p1, p2.textDeriv(context, text))
-                );
-            },
-            startTagOpenDeriv: memoizeNode(function (node) {
-                return createChoice(
-                    applyAfter(function (p) { return createInterleave(p, p2); },
-                               p1.startTagOpenDeriv(node)),
-                    applyAfter(function (p) { return createInterleave(p1, p); },
-                               p2.startTagOpenDeriv(node)));
-            }),
-            attDeriv: function (context, attribute) {
-                return createChoice(
-                    createInterleave(p1.attDeriv(context, attribute), p2),
-                    createInterleave(p1, p2.attDeriv(context, attribute)));
-            },
-            startTagCloseDeriv: memoize0arg(function () {
-                return createInterleave(p1.startTagCloseDeriv(),
-                    p2.startTagCloseDeriv());
-            })
-        };
-    });
-    createGroup = memoize2arg("group", function (p1, p2) {
-        if (p1 === notAllowed || p2 === notAllowed) { return notAllowed; }
-        if (p1 === empty) { return p2; }
-        if (p2 === empty) { return p1; }
-    }, function (p1, p2) {
-        return {
-            type: "group",
-            p1: p1,
-            p2: p2,
-            nullable: p1.nullable && p2.nullable,
-            textDeriv: function (context, text) {
-                var p = createGroup(p1.textDeriv(context, text), p2);
-                if (p1.nullable) {
-                    return createChoice(p, p2.textDeriv(context, text));
-                }
-                return p;
-            },
-            startTagOpenDeriv: function (node) {
-                var x = applyAfter(function (p) { return createGroup(p, p2); },
-                        p1.startTagOpenDeriv(node));
-                if (p1.nullable) {
-                    return createChoice(x, p2.startTagOpenDeriv(node));
-                }
-                return x;
-            },
-            attDeriv: function (context, attribute) {
-                return createChoice(
-                    createGroup(p1.attDeriv(context, attribute), p2),
-                    createGroup(p1, p2.attDeriv(context, attribute)));
-            },
-            startTagCloseDeriv: memoize0arg(function () {
-                return createGroup(p1.startTagCloseDeriv(),
-                    p2.startTagCloseDeriv());
-            })
-        };
-    });
-    createAfter = memoize2arg("after", function (p1, p2) {
-        if (p1 === notAllowed || p2 === notAllowed) { return notAllowed; }
-    }, function (p1, p2) {
-        return {
-            type: "after",
-            p1: p1,
-            p2: p2,
-            nullable: false,
-            textDeriv: function (context, text) {
-                return createAfter(p1.textDeriv(context, text), p2);
-            },
-            startTagOpenDeriv: memoizeNode(function (node) {
-                return applyAfter(function (p) { return createAfter(p, p2); },
-                    p1.startTagOpenDeriv(node));
-            }),
-            attDeriv: function (context, attribute) {
-                return createAfter(p1.attDeriv(context, attribute), p2);
-            },
-            startTagCloseDeriv: memoize0arg(function () {
-                return createAfter(p1.startTagCloseDeriv(), p2);
-            }),
-            endTagDeriv: memoize0arg(function () {
-                return (p1.nullable) ? p2 : notAllowed;
-            })
-        };
-    });
-    createOneOrMore = memoize1arg("oneormore", function (p) {
-        if (p === notAllowed) { return notAllowed; }
-        return {
-            type: "oneOrMore",
-            p: p,
-            nullable: p.nullable,
-            textDeriv: function (context, text) {
-                return createGroup(p.textDeriv(context, text),
-                            createChoice(this, empty));
-            },
-            startTagOpenDeriv: function (node) {
-                var oneOrMore = this;
-                return applyAfter(function (pf) {
-                    return createGroup(pf, createChoice(oneOrMore, empty));
-                }, p.startTagOpenDeriv(node));
-            },
-            attDeriv: function (context, attribute) {
-                var oneOrMore = this;
-                return createGroup(p.attDeriv(context, attribute),
-                    createChoice(oneOrMore, empty));
-            },
-            startTagCloseDeriv: memoize0arg(function () {
-                return createOneOrMore(p.startTagCloseDeriv());
-            })
-        };
-    });
-    function createElement(nc, p) {
-        return {
-            type: "element",
-            nc: nc,
-            nullable: false,
-            textDeriv: function () { return notAllowed; },
-            startTagOpenDeriv: function (node) {
-                if (nc.contains(node)) {
-                    return createAfter(p, empty);
-                }
-                return notAllowed;
-            },
-            attDeriv: function (context, attribute) { return notAllowed; },
-            startTagCloseDeriv: function () { return this; }
-        };
-    }
-    function valueMatch(context, pattern, text) {
-        return (pattern.nullable && /^\s+$/.test(text)) ||
-                pattern.textDeriv(context, text).nullable;
-    }
-    createAttribute = memoize2arg("attribute", undefined, function (nc, p) {
-        return {
-            type: "attribute",
-            nullable: false,
-            nc: nc,
-            p: p,
-            attDeriv: function (context, attribute) {
-                if (nc.contains(attribute) && valueMatch(context, p,
-                        attribute.nodeValue)) {
-                    return empty;
-                }
-                return notAllowed;
-            },
-            startTagCloseDeriv: function () { return notAllowed; }
-        };
-    });
-    function createList() {
-        return {
-            type: "list",
-            nullable: false,
-            hash: "list",
-            textDeriv: function (context, text) {
-                return empty;
-            }
-        };
-    }
-    createValue = memoize1arg("value", function (value) {
-        return {
-            type: "value",
-            nullable: false,
-            value: value,
-            textDeriv: function (context, text) {
-                return (text === value) ? empty : notAllowed;
-            },
-            attDeriv: function () { return notAllowed; },
-            startTagCloseDeriv: function () { return this; }
-        };
-    });
-    createData = memoize1arg("data", function (type) {
-        return {
-            type: "data",
-            nullable: false,
-            dataType: type,
-            textDeriv: function () { return empty; },
-            attDeriv: function () { return notAllowed; },
-            startTagCloseDeriv: function () { return this; }
-        };
-    });
-    function createDataExcept() {
-        return {
-            type: "dataExcept",
-            nullable: false,
-            hash: "dataExcept"
-        };
-    }
-    applyAfter = function applyAfter(f, p) {
-        var result;
-        if (p.type === "after") {
-            result = createAfter(p.p1, f(p.p2));
-        } else if (p.type === "choice") {
-            result = createChoice(applyAfter(f, p.p1), applyAfter(f, p.p2));
-        } else {
-            result = p;
-        }
-        return result;
-    };
-    function attsDeriv(context, pattern, attributes, position) {
-        if (pattern === notAllowed) {
-            return notAllowed;
-        }
-        if (position >= attributes.length) {
-            return pattern;
-        }
-        if (position === 0) {
-            // TODO: loop over attributes to update namespace mapping
-            position = 0;
-        }
-        var a = attributes.item(position);
-        while (a.namespaceURI === xmlnsns) { // always ok
-            position += 1;
-            if (position >= attributes.length) {
-                return pattern;
-            }
-            a = attributes.item(position);
-        }
-        a = attsDeriv(context, pattern.attDeriv(context,
-                attributes.item(position)), attributes, position + 1);
-        return a;
-    }
-    function childrenDeriv(context, pattern, walker) {
-        var element = walker.currentNode,
-            childNode = walker.firstChild(),
-            numberOfTextNodes = 0,
-            childNodes = [], i, p;
-        // simple incomplete implementation: only use non-empty text nodes
-        while (childNode) {
-            if (childNode.nodeType === 1) {
-                childNodes.push(childNode);
-            } else if (childNode.nodeType === 3 &&
-                    !/^\s*$/.test(childNode.nodeValue)) {
-                childNodes.push(childNode.nodeValue);
-                numberOfTextNodes += 1;
-            }
-            childNode = walker.nextSibling();
-        }
-        // if there is no nodes at all, add an empty text node
-        if (childNodes.length === 0) {
-            childNodes = [""];
-        }
-        p = pattern;
-        for (i = 0; p !== notAllowed && i < childNodes.length; i += 1) {
-            childNode = childNodes[i];
-            if (typeof childNode === "string") {
-                if (/^\s*$/.test(childNode)) {
-                    p = createChoice(p, p.textDeriv(context, childNode));
-                } else {
-                    p = p.textDeriv(context, childNode);
-                }
-            } else {
-                walker.currentNode = childNode;
-                p = childDeriv(context, p, walker);
-            }
-        }
-        walker.currentNode = element;
-        return p;
-    }
-    childDeriv = function childDeriv(context, pattern, walker) {
-        var childNode = walker.currentNode, p;
-        p = pattern.startTagOpenDeriv(childNode);
-        p = attsDeriv(context, p, childNode.attributes, 0);
-        p = p.startTagCloseDeriv();
-        p = childrenDeriv(context, p, walker);
-        p = p.endTagDeriv();
-        return p;
-    };
-    function addNames(name, ns, pattern) {
-        if (pattern.e[0].a) {
-            name.push(pattern.e[0].text);
-            ns.push(pattern.e[0].a.ns);
-        } else {
-            addNames(name, ns, pattern.e[0]);
-        }
-        if (pattern.e[1].a) {
-            name.push(pattern.e[1].text);
-            ns.push(pattern.e[1].a.ns);
-        } else {
-            addNames(name, ns, pattern.e[1]);
-        }
-    }
-    createNameClass = function createNameClass(pattern) {
-        var name, ns, hash, i, result;
-        if (pattern.name === "name") {
-            name = pattern.text;
-            ns = pattern.a.ns;
-            result = {
-                name: name,
-                ns: ns,
-                hash: "{" + ns + "}" + name,
-                contains: function (node) {
-                    return node.namespaceURI === ns && node.localName === name;
-                }
-            };
-        } else if (pattern.name === "choice") {
-            name = [];
-            ns = [];
-            addNames(name, ns, pattern);
-            hash = "";
-            for (i = 0; i < name.length; i += 1) {
-                 hash += "{" + ns[i] + "}" + name[i] + ",";
-            }
-            result = {
-                hash: hash,
-                contains: function (node) {
-                    var i;
-                    for (i = 0; i < name.length; i += 1) {
-                        if (name[i] === node.localName &&
-                                ns[i] === node.namespaceURI) {
-                            return true;
-                        }
-                    }
-                    return false;
-                }
-            };
-        } else {
-            result = {
-                hash: "anyName",
-                contains: function () { return true; }
-            };
-        }
-        return result;
-    };
-    function resolveElement(pattern, elements) {
-        var element, p, i, hash;
-        // create an empty object in the store to enable circular
-        // dependencies
-        hash = "element" + pattern.id.toString();
-        p = elements[pattern.id] = { hash: hash };
-        element = createElement(createNameClass(pattern.e[0]),
-            makePattern(pattern.e[1], elements));
-        // copy the properties of the new object into the predefined one
-        for (i in element) {
-            if (element.hasOwnProperty(i)) {
-                p[i] = element[i];
-            }
-        }
-        return p;
-    }
-    makePattern = function makePattern(pattern, elements) {
-        var p, i;
-        if (pattern.name === "elementref") {
-            p = pattern.id || 0;
-            pattern = elements[p];
-            if (pattern.name !== undefined) {
-                return resolveElement(pattern, elements);
-            }
-            return pattern;
-        }
-        switch (pattern.name) {
-            case 'empty':
-                return empty;
-            case 'notAllowed':
-                return notAllowed;
-            case 'text':
-                return text;
-            case 'choice':
-                return createChoice(makePattern(pattern.e[0], elements),
-                    makePattern(pattern.e[1], elements));
-            case 'interleave':
-                p = makePattern(pattern.e[0], elements);
-                for (i = 1; i < pattern.e.length; i += 1) {
-                    p = createInterleave(p, makePattern(pattern.e[i],
-                            elements));
-                }
-                return p;
-            case 'group':
-                return createGroup(makePattern(pattern.e[0], elements),
-                    makePattern(pattern.e[1], elements));
-            case 'oneOrMore':
-                return createOneOrMore(makePattern(pattern.e[0], elements));
-            case 'attribute':
-                return createAttribute(createNameClass(pattern.e[0]),
-                    makePattern(pattern.e[1], elements));
-            case 'value':
-                return createValue(pattern.text);
-            case 'data':
-                p = pattern.a && pattern.a.type;
-                if (p === undefined) {
-                    p = "";
-                }
-                return createData(p);
-            case 'list':
-                return createList();
-        }
-        throw "No support for " + pattern.name;
-    };
-    this.makePattern = function (pattern, elements) {
-        var copy = {}, i;
-        for (i in elements) {
-            if (elements.hasOwnProperty(i)) {
-                copy[i] = elements[i];
-            }
-        }
-        i = makePattern(pattern, copy);
-        return i;
-    };
-    /**
-     * Validate the elements pointed to by the TreeWalker
-     * @param {!TreeWalker} walker
-     * @param {!function(Array.<string>):undefined} callback
-     * @return {undefined}
-     */
-    this.validate = function validate(walker, callback) {
-        var errors;
-        walker.currentNode = walker.root;
-        errors = childDeriv(null, rootPattern, walker);
-        if (!errors.nullable) {
-            runtime.log("Error in Relax NG validation: " + errors);
-            callback(["Error in Relax NG validation: " + errors]);
-        } else {
-            callback(null);
-        }
-    };
-    this.init = function init(rootPattern1) {
-        rootPattern = rootPattern1;
-    };
-};
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/xmldom/RelaxNG2.js b/apps/files_odfviewer/src/webodf/webodf/lib/xmldom/RelaxNG2.js
deleted file mode 100644
index 185ef5236e..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/lib/xmldom/RelaxNG2.js
+++ /dev/null
@@ -1,416 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global runtime: true, xmldom: true*/
-
-/**
- * RelaxNG can check a DOM tree against a Relax NG schema
- * The RelaxNG implementation is currently not complete. Relax NG should not
- * report errors on valid DOM trees, but it will not check all constraints that
- * a Relax NG file can define. The current implementation does not load external
- * parts of a Relax NG file.
- * The main purpose of this Relax NG engine is to validate runtime ODF
- * documents. The DOM tree is traversed via a TreeWalker. A custom TreeWalker
- * implementation can hide parts of a DOM tree. This is useful in WebODF, where
- * special elements and attributes in the runtime DOM tree.
- */
-runtime.loadClass("xmldom.RelaxNGParser");
-/**
- * @constructor
- */
-xmldom.RelaxNG2 = function RelaxNG2() {
-    "use strict";
-    var start,
-        validateNonEmptyPattern,
-        nsmap,
-        depth = 0,
-        p = "                                                                ";
-
-    /**
-     * @constructor
-     * @param {!string} error
-     * @param {Node=} context
-     */
-    function RelaxNGParseError(error, context) {
-        this.message = function () {
-            if (context) {
-                error += (context.nodeType === 1) ? " Element " : " Node ";
-                error += context.nodeName;
-                if (context.nodeValue) {
-                    error += " with value '" + context.nodeValue + "'";
-                }
-                error += ".";
-            }
-            return error;
-        };
-//        runtime.log("[" + p.slice(0, depth) + this.message() + "]");
-    }
-    /**
-     * @param elementdef
-     * @param walker
-     * @param {Element} element
-     * @return {Array.<RelaxNGParseError>}
-     */
-    function validateOneOrMore(elementdef, walker, element) {
-        // The list of definitions in the elements list should be completely
-        // traversed at least once. If a second or later round fails, the walker
-        // should go back to the start of the last successful traversal
-        var node, i = 0, err;
-        do {
-            node = walker.currentNode;
-            err = validateNonEmptyPattern(elementdef.e[0], walker, element);
-            i += 1;
-        } while (!err && node !== walker.currentNode);
-        if (i > 1) { // at least one round was without error
-            // set position back to position of before last failed round
-            walker.currentNode = node;
-            return null;
-        }
-        return err;
-    }
-    /**
-     * @param {!Node} node
-     * @return {!string}
-     */
-    function qName(node) {
-        return nsmap[node.namespaceURI] + ":" + node.localName;
-    }
-    /**
-     * @param {!Node} node
-     * @return {!boolean}
-     */
-    function isWhitespace(node) {
-        return node && node.nodeType === 3 && /^\s+$/.test(node.nodeValue);
-    }
-    /**
-     * @param elementdef
-     * @param walker
-     * @param {Element} element
-     * @param {string=} data
-     * @return {Array.<RelaxNGParseError>}
-     */
-    function validatePattern(elementdef, walker, element, data) {
-        if (elementdef.name === "empty") {
-            return null;
-        }
-        return validateNonEmptyPattern(elementdef, walker, element, data);
-    }
-    /**
-     * @param elementdef
-     * @param walker
-     * @param {Element} element
-     * @return {Array.<RelaxNGParseError>}
-     */
-    function validateAttribute(elementdef, walker, element) {
-        if (elementdef.e.length !== 2) {
-            throw "Attribute with wrong # of elements: " + elementdef.e.length;
-        }
-        var att, a, l = elementdef.localnames.length, i;
-        for (i = 0; i < l; i += 1) {
-            a = element.getAttributeNS(elementdef.namespaces[i],
-                    elementdef.localnames[i]);
-            // if an element is not present, getAttributeNS will return an empty
-            // string but an empty string is possible attribute value, so an
-            // extra check is needed
-            if (a === "" && !element.hasAttributeNS(elementdef.namespaces[i],
-                    elementdef.localnames[i])) {
-                a = undefined;
-            }
-            if (att !== undefined && a !== undefined) {
-                return [new RelaxNGParseError("Attribute defined too often.",
-                        element)];
-            }
-            att = a;
-        }
-        if (att === undefined) {
-            return [new RelaxNGParseError("Attribute not found: " +
-                    elementdef.names, element)];
-        }
-        return validatePattern(elementdef.e[1], walker, element, att);
-    }
-    /**
-     * @param elementdef
-     * @param walker
-     * @param {Element} element
-     * @return {Array.<RelaxNGParseError>}
-     */
-    function validateTop(elementdef, walker, element) {
-        // notAllowed not implemented atm
-        return validatePattern(elementdef, walker, element);
-    }
-    /**
-     * Validate an element.
-     * Function forwards the walker until an element is met.
-     * If element if of the right type, it is entered and the validation
-     * continues inside the element. After validation, regardless of whether an
-     * error occurred, the walker is at the same depth in the dom tree.
-     * @param elementdef
-     * @param walker
-     * @param {Element} element
-     * @return {Array.<RelaxNGParseError>}
-     */
-    function validateElement(elementdef, walker, element) {
-        if (elementdef.e.length !== 2) {
-            throw "Element with wrong # of elements: " + elementdef.e.length;
-        }
-        depth += 1;
-        // forward until an element is seen, then check the name
-        var /**@type{Node}*/ node = walker.currentNode,
-            /**@type{number}*/ type = node ? node.nodeType : 0,
-            error = null;
-        // find the next element, skip text nodes with only whitespace
-        while (type > 1) {
-            if (type !== 8 &&
-                    (type !== 3 ||
-                     !/^\s+$/.test(walker.currentNode.nodeValue))) {// TEXT_NODE
-                depth -= 1;
-                return [new RelaxNGParseError("Not allowed node of type " +
-                        type + ".")];
-            }
-            node = walker.nextSibling();
-            type = node ? node.nodeType : 0;
-        }
-        if (!node) {
-            depth -= 1;
-            return [new RelaxNGParseError("Missing element " +
-                    elementdef.names)];
-        }
-        if (elementdef.names && elementdef.names.indexOf(qName(node)) === -1) {
-            depth -= 1;
-            return [new RelaxNGParseError("Found " + node.nodeName +
-                    " instead of " + elementdef.names + ".", node)];
-        }
-        // the right element was found, now parse the contents
-        if (walker.firstChild()) {
-            // currentNode now points to the first child node of this element
-            error = validateTop(elementdef.e[1], walker, node);
-            // there should be no content left
-            while (walker.nextSibling()) {
-                type = walker.currentNode.nodeType;
-                if (!isWhitespace(walker.currentNode) && type !== 8) {
-                    depth -= 1;
-                    return [new RelaxNGParseError("Spurious content.",
-                            walker.currentNode)];
-                }
-            }
-            if (walker.parentNode() !== node) {
-                depth -= 1;
-                return [new RelaxNGParseError("Implementation error.")];
-            }
-        } else {
-            error = validateTop(elementdef.e[1], walker, node);
-        }
-        depth -= 1;
-        // move to the next node
-        node = walker.nextSibling();
-        return error;
-    }
-    /**
-     * @param elementdef
-     * @param walker
-     * @param {Element} element
-     * @param {string=} data
-     * @return {Array.<RelaxNGParseError>}
-     */
-    function validateChoice(elementdef, walker, element, data) {
-        // loop through child definitions and return if a match is found
-        if (elementdef.e.length !== 2) {
-            throw "Choice with wrong # of options: " + elementdef.e.length;
-        }
-        var node = walker.currentNode, err;
-        // if the first option is empty, just check the second one for debugging
-        // but the total choice is alwasy ok
-        if (elementdef.e[0].name === "empty") {
-            err = validateNonEmptyPattern(elementdef.e[1], walker, element,
-                    data);
-            if (err) {
-                walker.currentNode = node;
-            }
-            return null;
-        }
-        err = validatePattern(elementdef.e[0], walker, element, data);
-        if (err) {
-            walker.currentNode = node;
-            err = validateNonEmptyPattern(elementdef.e[1], walker, element,
-                    data);
-        }
-        return err;
-    }
-    /**
-     * @param elementdef
-     * @param walker
-     * @param {Element} element
-     * @return {Array.<RelaxNGParseError>}
-     */
-    function validateInterleave(elementdef, walker, element) {
-        var l = elementdef.e.length, n = [l], err, i, todo = l,
-            donethisround, node, subnode, e;
-        // the interleave is done when all items are 'true' and no 
-        while (todo > 0) {
-            donethisround = 0;
-            node = walker.currentNode;
-            for (i = 0; i < l; i += 1) {
-                subnode = walker.currentNode;
-                if (n[i] !== true && n[i] !== subnode) {
-                    e = elementdef.e[i];
-                    err = validateNonEmptyPattern(e, walker, element);
-                    if (err) {
-                        walker.currentNode = subnode;
-                        if (n[i] === undefined) {
-                            n[i] = false;
-                        }
-                    } else if (subnode === walker.currentNode ||
-                            // this is a bit dodgy, there should be a rule to
-                            // see if multiple elements are allowed
-                            e.name === "oneOrMore" ||
-                            (e.name === "choice" &&
-                            (e.e[0].name === "oneOrMore" ||
-                             e.e[1].name === "oneOrMore"))) {
-                        donethisround += 1;
-                        n[i] = subnode; // no error and try this one again later
-                    } else {
-                        donethisround += 1;
-                        n[i] = true; // no error and progress
-                    }
-                }
-            }
-            if (node === walker.currentNode && donethisround === todo) {
-                return null;
-            }
-            if (donethisround === 0) {
-                for (i = 0; i < l; i += 1) {
-                    if (n[i] === false) {
-                        return [new RelaxNGParseError(
-                                "Interleave does not match.", element)];
-                    }
-                }
-                return null;
-            }
-            todo = 0;
-            for (i = 0; i < l; i += 1) {
-                if (n[i] !== true) {
-                    todo += 1;
-                }
-            }
-        }
-        return null;
-    }
-    /**
-     * @param elementdef
-     * @param walker
-     * @param {Element} element
-     * @return {Array.<RelaxNGParseError>}
-     */
-    function validateGroup(elementdef, walker, element) {
-        if (elementdef.e.length !== 2) {
-            throw "Group with wrong # of members: " + elementdef.e.length;
-        }
-        //runtime.log(elementdef.e[0].name + " " + elementdef.e[1].name);
-        return validateNonEmptyPattern(elementdef.e[0], walker, element) ||
-                validateNonEmptyPattern(elementdef.e[1], walker, element);
-    }
-    /**
-     * @param elementdef
-     * @param walker
-     * @param {Element} element
-     * @return {Array.<RelaxNGParseError>}
-     */
-    function validateText(elementdef, walker, element) {
-        var /**@type{Node}*/ node = walker.currentNode,
-            /**@type{number}*/ type = node ? node.nodeType : 0,
-            error = null;
-        // find the next element, skip text nodes with only whitespace
-        while (node !== element && type !== 3) {
-            if (type === 1) {
-                return [new RelaxNGParseError(
-                        "Element not allowed here.", node)];
-            }
-            node = walker.nextSibling();
-            type = node ? node.nodeType : 0;
-        }
-        walker.nextSibling();
-        return null;
-    }
-    /**
-     * @param elementdef
-     * @param walker
-     * @param {Element} element
-     * @param {string=} data
-     * @return {Array.<RelaxNGParseError>}
-     */
-    validateNonEmptyPattern = function validateNonEmptyPattern(elementdef,
-                walker, element, data) {
-        var name = elementdef.name, err = null;
-        if (name === "text") {
-            err = validateText(elementdef, walker, element);
-        } else if (name === "data") {
-            err = null; // data not implemented
-        } else if (name === "value") {
-            if (data !== elementdef.text) {
-                err = [new RelaxNGParseError("Wrong value, should be '" +
-                        elementdef.text + "', not '" + data + "'", element)];
-            }
-        } else if (name === "list") {
-            err = null; // list not implemented
-        } else if (name === "attribute") {
-            err = validateAttribute(elementdef, walker, element);
-        } else if (name === "element") {
-            err = validateElement(elementdef, walker, element);
-        } else if (name === "oneOrMore") {
-            err = validateOneOrMore(elementdef, walker, element);
-        } else if (name === "choice") {
-            err = validateChoice(elementdef, walker, element, data);
-        } else if (name === "group") {
-            err = validateGroup(elementdef, walker, element);
-        } else if (name === "interleave") {
-            err = validateInterleave(elementdef, walker, element);
-        } else {
-            throw name + " not allowed in nonEmptyPattern.";
-        }
-        return err;
-    };
-    /**
-     * Validate the elements pointed to by the TreeWalker
-     * @param {!TreeWalker} walker
-     * @param {!function(Array.<RelaxNGParseError>):undefined} callback
-     * @return {undefined}
-     */
-    this.validate = function validate(walker, callback) {
-        walker.currentNode = walker.root;
-        var errors = validatePattern(start.e[0], walker, walker.root);
-        callback(errors);
-    };
-    this.init = function init(start1, nsmap1) {
-        start = start1;
-        nsmap = nsmap1;
-    };
-};
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/xmldom/RelaxNGParser.js b/apps/files_odfviewer/src/webodf/webodf/lib/xmldom/RelaxNGParser.js
deleted file mode 100644
index 12e37278a0..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/lib/xmldom/RelaxNGParser.js
+++ /dev/null
@@ -1,452 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global runtime: true, xmldom: true*/
-
-/**
- * RelaxNG can check a DOM tree against a Relax NG schema
- * The RelaxNG implementation is currently not complete. Relax NG should not
- * report errors on valid DOM trees, but it will not check all constraints that
- * a Relax NG file can define. The current implementation does not load external
- * parts of a Relax NG file.
- * The main purpose of this Relax NG engine is to validate runtime ODF
- * documents. The DOM tree is traversed via a TreeWalker. A custom TreeWalker
- * implementation can hide parts of a DOM tree. This is useful in WebODF, where
- * special elements and attributes in the runtime DOM tree.
- * @constructor
- */
-xmldom.RelaxNGParser = function RelaxNGParser() {
-    "use strict";
-    var self = this,
-        rngns = "http://relaxng.org/ns/structure/1.0",
-        xmlnsns = "http://www.w3.org/2000/xmlns/",
-        start,
-        nsmap = { "http://www.w3.org/XML/1998/namespace": "xml" },
-        parse;
-
-    /**
-     * @constructor
-     * @param {!string} error
-     * @param {Node=} context
-     */
-    function RelaxNGParseError(error, context) {
-        /**
-         * return {!string}
-         */
-        this.message = function () {
-            if (context) {
-                error += (context.nodeType === 1) ? " Element " : " Node ";
-                error += context.nodeName;
-                if (context.nodeValue) {
-                    error += " with value '" + context.nodeValue + "'";
-                }
-                error += ".";
-            }
-            return error;
-        };
-    }
-    function splitToDuos(e) {
-        if (e.e.length <= 2) {
-            return e;
-        }
-        var o = { name: e.name, e: e.e.slice(0, 2) };
-        return splitToDuos({
-            name: e.name,
-            e: [ o ].concat(e.e.slice(2))
-        });
-    }
-    /**
-     * @param {!string} name
-     * @return {!Array.<string>}
-     */
-    function splitQName(name) {
-        var r = name.split(":", 2),
-            prefix = "", i;
-        if (r.length === 1) {
-            r = ["", r[0]];
-        } else {
-            prefix = r[0];
-        }
-        for (i in nsmap) {
-            if (nsmap[i] === prefix) {
-                r[0] = i;
-            }
-        }
-        return r;
-    }
-
-    function splitQNames(def) {
-        var i, l = (def.names) ? def.names.length : 0, name,
-            localnames = def.localnames = [l],
-            namespaces = def.namespaces = [l];
-        for (i = 0; i < l; i += 1) {
-            name = splitQName(def.names[i]);
-            namespaces[i] = name[0];
-            localnames[i] = name[1];
-        }
-    }
-
-    /**
-     * @param {!string} str
-     * @return {!string}
-     */
-    function trim(str) {
-        str = str.replace(/^\s\s*/, '');
-		var ws = /\s/,
-            i = str.length - 1;
-        while (ws.test(str.charAt(i))) {
-            i -= 1;
-        }
-        return str.slice(0, i + 1);
-    }
-
-    /**
-     * @param {!Object.<string,string>} atts
-     * @param {!string} name
-     * @param {!Array.<string>} names
-     * @return {!Object}
-     */
-    function copyAttributes(atts, name, names) {
-        var a = {}, i, att;
-        for (i = 0; i < atts.length; i += 1) {
-            att = atts.item(i);
-            if (!att.namespaceURI) {
-                if (att.localName === "name" &&
-                        (name === "element" || name === "attribute")) {
-                    names.push(att.value);
-                }
-                if (att.localName === "name" || att.localName === "combine" ||
-                        att.localName === "type") {
-                    att.value = trim(att.value);
-                }
-                a[att.localName] = att.value;
-            } else if (att.namespaceURI === xmlnsns) {
-                nsmap[att.value] = att.localName;
-            }
-        }
-        return a;
-    }
-
-    function parseChildren(c, e, elements, names) {
-        var text = "", ce;
-        while (c) {
-            if (c.nodeType === 1 && c.namespaceURI === rngns) {
-                ce = parse(c, elements, e);
-                if (ce) {
-                    if (ce.name === "name") {
-                        names.push(nsmap[ce.a.ns] + ":" + ce.text);
-                        e.push(ce);
-                    } else if (ce.name === "choice" && ce.names &&
-                            ce.names.length) {
-                        names = names.concat(ce.names);
-                        delete ce.names;
-                        e.push(ce);
-                    } else {
-                        e.push(ce);
-                    }
-                }
-            } else if (c.nodeType === 3) {
-                text += c.nodeValue;
-            }
-            c = c.nextSibling;
-        }
-        return text;
-    }
-
-    function combineDefines(combine, name, e, siblings) {
-        // combineDefines is called often enough that there can only be one
-        // other element with the same name
-        var i, ce;
-        for (i = 0; siblings && i < siblings.length; i += 1) {
-            ce = siblings[i];
-            if (ce.name === "define" && ce.a && ce.a.name === name) {
-                ce.e = [ { name: combine, e: ce.e.concat(e) } ];
-                return ce;
-            }
-        }
-        return null;
-    }
-
-    parse = function parse(element, elements, siblings) {
-        // parse all elements from the Relax NG namespace into JavaScript
-        // objects
-        var e = [],
-            /**@type{Object}*/a,
-            ce,
-            i, text, name = element.localName, names = [];
-        a = copyAttributes(element.attributes, name, names);
-        a.combine = a.combine || undefined;
-        text = parseChildren(element.firstChild, e, elements, names);
-
-        // 4.2 strip leading and trailing whitespace
-        if (name !== "value" && name !== "param") {
-            text = /^\s*([\s\S]*\S)?\s*$/.exec(text)[1];
-        }
-        // 4.3 datatypeLibrary attribute
-        // 4.4 type attribute of value element
-        if (name === "value" && a.type === undefined) {
-            a.type = "token";
-            a.datatypeLibrary = "";
-        }
-        // 4.5 href attribute
-        // 4.6 externalRef element
-        // 4.7 include element
-        // 4.8 name attribute of element and attribute elements
-        if ((name === "attribute" || name === "element") &&
-                a.name !== undefined) {
-           i = splitQName(a.name);
-           e = [{name: "name", text: i[1], a: {ns: i[0]}}].concat(e);
-           delete a.name;
-        }
-        // 4.9 ns attribute
-        if (name === "name" || name === "nsName" || name === "value") {
-            if (a.ns === undefined) {
-                a.ns = ""; // TODO
-            }
-        } else {
-            delete a.ns;
-        }
-        // 4.10 QNames
-        if (name === "name") {
-            i = splitQName(text);
-            a.ns = i[0];
-            text = i[1];
-        }
-        // 4.11 div element
-        // 4.12 Number of child elements
-        if (e.length > 1 && (name === "define" || name === "oneOrMore" ||
-                name === "zeroOrMore" || name === "optional" ||
-                name === "list" || name === "mixed")) {
-            e = [{name: "group", e: splitToDuos({name: "group", e: e}).e}];
-        }
-        if (e.length > 2 && name === "element") {
-            e = [e[0]].concat(
-                {name: "group", e: splitToDuos(
-                    {name: "group", e: e.slice(1)}).e});
-        }
-        if (e.length === 1 && name === "attribute") {
-            e.push({name: "text", text: text});
-        }
-        // if node has only one child, replace node with child
-        if (e.length === 1 && (name === "choice" || name === "group" ||
-                name === "interleave")) {
-            name = e[0].name;
-            names = e[0].names;
-            a = e[0].a;
-            text = e[0].text;
-            e = e[0].e;
-        } else if (e.length > 2 && (name === "choice" || name === "group" ||
-                name === "interleave")) {
-            e = splitToDuos({name: name, e: e}).e;
-        }
-        // 4.13 mixed element
-        if (name === "mixed") {
-            name = "interleave";
-            e = [ e[0], { name: "text" } ];
-        }
-        // 4.14 optional element
-        if (name === "optional") {
-            name = "choice";
-            e = [ e[0], { name: "empty" } ];
-        }
-        // 4.15 zeroOrMore element
-        if (name === "zeroOrMore") {
-            name = "choice";
-            e = [ {name: "oneOrMore", e: [ e[0] ] }, { name: "empty" } ];
-        }
-        // 4.17 combine attribute
-        if (name === "define" && a.combine) {
-            ce = combineDefines(a.combine, a.name, e, siblings);
-            if (ce) {
-                return;
-            }
-        }
-
-        // create the definition
-        ce = { name: name };
-        if (e && e.length > 0) { ce.e = e; }
-        for (i in a) {
-            if (a.hasOwnProperty(i)) {
-                ce.a = a;
-                break;
-            }
-        }
-        if (text !== undefined) { ce.text = text; }
-        if (names && names.length > 0) { ce.names = names; }
-
-        // part one of 4.19
-        if (name === "element") {
-            ce.id = elements.length;
-            elements.push(ce);
-            ce = { name: "elementref", id: ce.id };
-        }
-        return ce;
-    };
-
-    function resolveDefines(def, defines) {
-        var i = 0, e, defs, end, name = def.name;
-        while (def.e && i < def.e.length) {
-            e = def.e[i];
-            if (e.name === "ref") {
-                defs = defines[e.a.name];
-                if (!defs) {
-                    throw e.a.name + " was not defined.";
-                }
-                end = def.e.slice(i + 1);
-                def.e = def.e.slice(0, i);
-                def.e = def.e.concat(defs.e);
-                def.e = def.e.concat(end);
-            } else {
-                i += 1;
-                resolveDefines(e, defines);
-            }
-        }
-        e = def.e;
-        // 4.20 notAllowed element
-        // 4.21 empty element
-        if (name === "choice") {
-            if (!e || !e[1] || e[1].name === "empty") {
-                if (!e || !e[0] || e[0].name === "empty") {
-                    delete def.e;
-                    def.name = "empty";
-                } else {
-                    e[1] = e[0];
-                    e[0] = { name: "empty" };
-                }
-            }
-        }
-        if (name === "group" || name === "interleave") {
-            if (e[0].name === "empty") {
-                if (e[1].name === "empty") {
-                    delete def.e;
-                    def.name = "empty";
-                } else {
-                    name = def.name = e[1].name;
-                    def.names = e[1].names;
-                    e = def.e = e[1].e;
-                }
-            } else if (e[1].name === "empty") {
-                name = def.name = e[0].name;
-                def.names = e[0].names;
-                e = def.e = e[0].e;
-            }
-        }
-        if (name === "oneOrMore" && e[0].name === "empty") {
-            delete def.e;
-            def.name = "empty";
-        }
-        // for attributes we need to have the list of namespaces and
-        // localnames readily available, so we split up the qnames
-        if (name === "attribute") {
-            splitQNames(def);
-        }
-        // for interleaving validation, it is convenient to join all
-        // interleave elements that touch into one element
-        if (name === "interleave") {
-            // at this point the interleave will have two child elements,
-            // but the child interleave elements may have a different number
-            if (e[0].name === "interleave") {
-                if (e[1].name === "interleave") {
-                    e = def.e = e[0].e.concat(e[1].e);
-                } else {
-                    e = def.e = [e[1]].concat(e[0].e);
-                }
-            } else if (e[1].name === "interleave") {
-                e = def.e = [e[0]].concat(e[1].e);
-            }
-        }
-    }
-
-    function resolveElements(def, elements) {
-        var i = 0, e, name;
-        while (def.e && i < def.e.length) {
-            e = def.e[i];
-            if (e.name === "elementref") {
-                e.id = e.id || 0;
-                def.e[i] = elements[e.id];
-            } else if (e.name !== "element") {
-                resolveElements(e, elements);
-            }
-            i += 1;
-        }
-    }
-
-    /**
-     * @param {!Document} dom
-     * @param {!Function} callback
-     * @return {?Array}
-     */
-    function main(dom, callback) {
-        var elements = [],
-            grammar = parse(dom && dom.documentElement, elements, undefined),
-            i, e, defines = {};
-
-        for (i = 0; i < grammar.e.length; i += 1) {
-            e = grammar.e[i];
-            if (e.name === "define") {
-                defines[e.a.name] = e;
-            } else if (e.name === "start") {
-                start = e;
-            }
-        }
-        if (!start) {
-            return [new RelaxNGParseError(
-                    "No Relax NG start element was found.")];
-        }
-        resolveDefines(start, defines);
-        for (i in defines) {
-            if (defines.hasOwnProperty(i)) {
-                resolveDefines(defines[i], defines);
-            }
-        }
-        for (i = 0; i < elements.length; i += 1) {
-            resolveDefines(elements[i], defines);
-        }
-        if (callback) {
-            self.rootPattern = callback(start.e[0], elements);
-        }
-        resolveElements(start, elements);
-        for (i = 0; i < elements.length; i += 1) {
-            resolveElements(elements[i], elements);
-        }
-        self.start = start;
-        self.elements = elements;
-        self.nsmap = nsmap;
-        return null;
-    }
-    /**
-     * @param {!Document} dom
-     * @param {!Function} callback
-     * @return {?Array}
-     */
-    this.parseRelaxNGDOM = main;
-};
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/xmldom/XPath.js b/apps/files_odfviewer/src/webodf/webodf/lib/xmldom/XPath.js
deleted file mode 100644
index 28466c2184..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/lib/xmldom/XPath.js
+++ /dev/null
@@ -1,383 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global xmldom, XPathResult, runtime*/
-/**
- * Wrapper for XPath functions
- * @constructor
- */
-xmldom.XPath = (function () {
-    "use strict";
-    var createXPathPathIterator,
-        parsePredicates;
-    /**
-     * @param {!number} a
-     * @param {!number} b
-     * @param {!number} c
-     * @return {!boolean}
-     */
-    function isSmallestPositive(a, b, c) {
-        return a !== -1 && (a < b || b === -1) && (a < c || c === -1);
-    }
-    /**
-     * Parse a subset of xpaths.
-     * The xpath predicates may contain xpaths. The location may be equated to
-     * a value. If a parsing error occurs, null is returned.
-     * @param {!string} xpath
-     * @param {!number} pos
-     * @param {!number} end
-     * @param {!Array} steps
-     * @return {!number}
-     */
-    function parseXPathStep(xpath, pos, end, steps) {
-        var location = "",
-            predicates = [],
-            value,
-            brapos = xpath.indexOf('[', pos),
-            slapos = xpath.indexOf('/', pos),
-            eqpos = xpath.indexOf('=', pos),
-            depth = 0,
-            start = 0;
-        // parse the location
-        if (isSmallestPositive(slapos, brapos, eqpos)) {
-            location = xpath.substring(pos, slapos);
-            pos = slapos + 1;
-        } else if (isSmallestPositive(brapos, slapos, eqpos)) {
-            location = xpath.substring(pos, brapos);
-            pos = parsePredicates(xpath, brapos, predicates);
-        } else if (isSmallestPositive(eqpos, slapos, brapos)) {
-            location = xpath.substring(pos, eqpos);
-            pos = eqpos;
-        } else {
-            location = xpath.substring(pos, end);
-            pos = end;
-        }
-        steps.push({location: location, predicates: predicates});
-        return pos;
-    }
-    function parseXPath(xpath) {
-        var steps = [],
-            p = 0,
-            end = xpath.length,
-            value;
-        while (p < end) {
-            p = parseXPathStep(xpath, p, end, steps);
-            if (p < end && xpath[p] === '=') {
-                value = xpath.substring(p + 1, end);
-                if (value.length > 2 &&
-                        (value[0] === '\'' || value[0] === '"')) {
-                    value = value.slice(1, value.length - 1);
-                } else {
-                    try {
-                        value = parseInt(value, 10);
-                    } catch (e) {
-                    }
-                }
-                p = end;
-            }
-        }
-        return {steps: steps, value: value};
-    }
-    parsePredicates = function parsePredicates(xpath, start, predicates) {
-        var pos = start,
-            l = xpath.length,
-            selector,
-            depth = 0;
-        while (pos < l) {
-            if (xpath[pos] === ']') {
-                depth -= 1;
-                if (depth <= 0) {
-                    predicates.push(parseXPath(xpath.substring(start, pos)));
-                }
-            } else if (xpath[pos] === '[') {
-                if (depth <= 0) {
-                    start = pos + 1;
-                }
-                depth += 1;
-            }
-            pos += 1;
-        }
-        return pos;
-    };
-    /**
-     * Iterator over nodes uses in the xpath implementation
-     * @class
-     * @interface
-     */
-    function XPathIterator() {}
-    /**
-     * @return {Node}
-     */
-    XPathIterator.prototype.next = function () {};
-    /**
-     * @return {undefined}
-     */
-    XPathIterator.prototype.reset = function () {};
-    /**
-     * @class
-     * @constructor
-     * @augments XPathIterator
-     * @implements {XPathIterator}
-     */
-    function NodeIterator() {
-        var node, done = false;
-        this.setNode = function setNode(n) {
-            node = n;
-        };
-        this.reset = function () {
-            done = false;
-        };
-        this.next = function next() {
-            var val = (done) ? null : node;
-            done = true;
-            return val;
-        };
-    }
-    /**
-     * @class
-     * @constructor
-     * @augments XPathIterator
-     * @implements {XPathIterator}
-     * @param {XPathIterator} it
-     * @param {!string} namespace
-     * @param {!string} localName
-     */
-    function AttributeIterator(it, namespace, localName) {
-        this.reset = function reset() {
-            it.reset();
-        };
-        this.next = function next() {
-            var node = it.next(), attr;
-            while (node) {
-                node = node.getAttributeNodeNS(namespace, localName);
-                if (node) {
-                    return node;
-                }
-                node = it.next();
-            }
-            return node;
-        };
-    }
-    /**
-     * @class
-     * @constructor
-     * @augments XPathIterator
-     * @implements {XPathIterator}
-     * @param {XPathIterator} it
-     * @param {boolean} recurse
-     */
-    function AllChildElementIterator(it, recurse) {
-        var root = it.next(),
-            node = null;
-        this.reset = function reset() {
-            it.reset();
-            root = it.next();
-            node = null;
-        };
-        this.next = function next() {
-            while (root) {
-                if (node) {
-                    if (recurse && node.firstChild) {
-                        node = node.firstChild;
-                    } else {
-                        while (!node.nextSibling && node !== root) {
-                            node = node.parentNode;
-                        }
-                        if (node === root) {
-                            root = it.next();
-                        } else {
-                            node = node.nextSibling;
-                        }
-                    }
-                } else {
-                    do {
-//                        node = (recurse) ?root :root.firstChild;
-                        node = root.firstChild;
-                        if (!node) {
-                            root = it.next();
-                        }
-                    } while (root && !node);
-                }
-                if (node && node.nodeType === 1) {
-                    return node;
-                }
-            }
-            return null;
-        };
-    }
-    /**
-     * @class
-     * @constructor
-     * @augments XPathIterator
-     * @implements {XPathIterator}
-     * @param {XPathIterator} it
-     * @param {function(Node):boolean} condition
-     */
-    function ConditionIterator(it, condition) {
-        this.reset = function reset() {
-            it.reset();
-        };
-        this.next = function next() {
-            var n = it.next();
-            while (n && !condition(n)) {
-                n = it.next();
-            }
-            return n;
-        };
-    }
-    /**
-     * @param {XPathIterator} it
-     * @param {string} name
-     * @param {function(string):string} namespaceResolver
-     * @return {!ConditionIterator}
-     */
-    function createNodenameFilter(it, name, namespaceResolver) {
-        var s = name.split(':', 2),
-            namespace = namespaceResolver(s[0]),
-            localName = s[1];
-        return new ConditionIterator(it, function (node) {
-            return node.localName === localName &&
-                node.namespaceURI === namespace;
-        });
-    }
-    /**
-     * @param {XPathIterator} it
-     * @param {!Object} p
-     * @param {function(string):string} namespaceResolver
-     * @return {!ConditionIterator}
-     */
-    function createPredicateFilteredIterator(it, p, namespaceResolver) {
-        var nit = new NodeIterator(),
-            pit = createXPathPathIterator(nit, p, namespaceResolver),
-            value = p.value;
-        if (value === undefined) {
-            return new ConditionIterator(it, function (node) {
-                nit.setNode(node);
-                pit.reset();
-                return pit.next();
-            });
-        }
-        return new ConditionIterator(it, function (node) {
-            nit.setNode(node);
-            pit.reset();
-            var n = pit.next();
-            // todo: distinuish between number and string
-            return n && n.nodeValue === value;
-        });
-    }
-    /**
-     * @param {!XPathIterator} it
-     * @param {!Object} xpath
-     * @param {!Function} namespaceResolver
-     * @return {!XPathIterator}
-     */
-    createXPathPathIterator = function createXPathPathIterator(it, xpath,
-                namespaceResolver) {
-        var i, j, step, location, namespace, localName, prefix, p;
-        for (i = 0; i < xpath.steps.length; i += 1) {
-            step = xpath.steps[i];
-            location = step.location;
-            if (location === "") {
-                it = new AllChildElementIterator(it, false);
-            } else if (location[0] === '@') {
-                p = location.slice(1).split(":", 2);
-                it = new AttributeIterator(it, namespaceResolver(p[0]), p[1]);
-            } else if (location !== ".") {
-                it = new AllChildElementIterator(it, false);
-                if (location.indexOf(":") !== -1) {
-                    it = createNodenameFilter(it, location, namespaceResolver);
-                }
-            }
-            for (j = 0; j < step.predicates.length; j += 1) {
-                p = step.predicates[j];
-                it = createPredicateFilteredIterator(it, p, namespaceResolver);
-            }
-        }
-        return it;
-    };
-    /**
-     * @param {!Element} node
-     * @param {!string} xpath
-     * @param {!Function} namespaceResolver
-     * @return {!Array.<Element>}
-     */
-    function fallback(node, xpath, namespaceResolver) {
-        var it = new NodeIterator(),
-            i,
-            nodelist,
-            parsedXPath,
-            pos;
-        it.setNode(node);
-        parsedXPath = parseXPath(xpath);
-        it = createXPathPathIterator(it, parsedXPath, namespaceResolver);
-        nodelist = [];
-        i = it.next();
-        while (i) {
-            nodelist.push(i);
-            i = it.next();
-        }
-        return nodelist;
-    }
-    /**
-     * @param {!Element} node
-     * @param {!string} xpath
-     * @param {!Function} namespaceResolver
-     * @return {!Array.<Element>}
-     */
-    function getODFElementsWithXPath(node, xpath, namespaceResolver) {
-        var doc = node.ownerDocument,
-            nodes,
-            elements = [],
-            n = null;
-        if (!doc || !doc.evaluate || !n) {
-            elements = fallback(node, xpath, namespaceResolver);
-        } else {
-            nodes = doc.evaluate(xpath, node, namespaceResolver,
-                XPathResult.UNORDERED_NODE_ITERATOR_TYPE, null);
-            n = nodes.iterateNext();
-            while (n !== null) {
-                if (n.nodeType === 1) {
-                    elements.push(n);
-                }
-                n = nodes.iterateNext();
-            }
-        }
-        return elements;
-    }
-    /**
-     * @constructor
-     */
-    xmldom.XPath = function XPath() {
-        this.getODFElementsWithXPath = getODFElementsWithXPath;
-    };
-    return xmldom.XPath;
-}());
diff --git a/apps/files_odfviewer/src/webodf/webodf/misctests/carettest.html b/apps/files_odfviewer/src/webodf/webodf/misctests/carettest.html
deleted file mode 100644
index fc7f84c926..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/misctests/carettest.html
+++ /dev/null
@@ -1,135 +0,0 @@
-<html>
- <head>
-  <title></title>
- </head>
- <body onload="test()">
-  <script>
-function init() {
-    var p = document.createElement("p");
-    p.appendChild(document.createTextNode("MMMMM MMMMM MMMMM MMMMM MMMMM"));
-    p.style.width = "5em";
-    p.style.border = "1px solid black";
-//    p.contentEditable = true;
-    document.body.insertBefore(p, null);
-    return p;
-}
-function listenEvent(eventTarget, eventType, eventHandler) {
-    if (eventTarget.addEventListener) {
-        eventTarget.addEventListener(eventType, eventHandler, false);
-    } else if (eventTarget.attachEvent) {
-        eventType = "on" + eventType;
-        eventTarget.attachEvent(eventType, eventHandler);
-    } else {
-        eventTarget["on" + eventType] = eventHandler;
-    }
-}
-function simulateKeyEvent(target, type, keyCode) {
-    var customEvent = null,
-        bubbles = true,
-        cancelable = true,
-        view = window,
-        ctrlKey = false,
-        altKey = false,
-        shiftKey = false,
-        metaKey = false,
-        charCode = keyCode;
-    if (document.createEvent) {
-        try {
-            customEvent = document.createEvent("KeyEvents");
-            customEvent.initKeyEvent(type, bubbles, cancelable, view, ctrlKey,
-                altKey, shiftKey, metaKey, keyCode, charCode);
-        } catch (ex) {
-            try {
-                customEvent = document.createEvent("Events");
-            } catch (uierror) {
-                customEvent = document.createEvent("UIEvents");
-            } finally {
-                customEvent.initEvent(type, bubbles, cancelable);
-                customEvent.view = view;
-                customEvent.altKey = altKey;
-                customEvent.ctrlKey = ctrlKey;
-                customEvent.shiftKey = shiftKey;
-                customEvent.metaKey = metaKey;
-                customEvent.keyCode = keyCode;
-                customEvent.charCode = charCode;
-            }
-        }
-        target.dispatchEvent(customEvent);
-    } else {
-        alert('ze problem');
-    }
-}
-function moveDown(target) {
-    var evt;// = document.createEvent("KeyboardEvent");
-//    evt.initKeyEvent("keypress", true, true, null, false, false, false, false, 40, 0);
-//    target.dispatchEvent(evt);
-/*
-    evt = document.createEvent("KeyboardEvent");
-    //evt = document.createEvent("KeyEvents");
-    evt.initKeyEvent("keypress", true, true, target.ownerDocument.defaultView, false, false, false, false, 9, 0);
-    target.dispatchEvent(evt);
-*/
-                evt = document.createEvent("KeyboardEvent");
-                evt.initKeyEvent("keypress", true, true, null, false, false, false, false, 0x23, 0);
-                target.dispatchEvent(evt);
-
-}
-function moveDownOpera(target) {
-    var evt = document.createEvent("UIEvents");
-    evt.initUIEvent("keypress", true, true, window, 1);
-    target.keyCode = 8;
-    target.charCode = 0;
-    target.dispatchEvent(evt);
-alert(evt);
-}
-
-function mouseclick() {
-    var selection = window.getSelection(),
-        r = selection.getRangeAt(0);
-    alert(r.startOffset);
-}
-
-function test() {
-    var p = init(),
-        selection = window.getSelection(),
-        range;
-
-    // put caret at the start of the document
-    selection.removeAllRanges();
-    range = p.ownerDocument.createRange();
-    range.setStart(p.firstChild, 8);
-    range.collapse(true);
-    selection.addRange(range);
-
-    listenEvent(document, "keydown", show);
-    listenEvent(document, "mouseup", mouseclick);
-
-    // move the caret down
-    if (selection.modify) {
-        selection.modify("move", "forward", "line");
-    } else {
-//        moveDown(p);
-        moveDownOpera(p);
-//        simulateKeyEvent(p, "keypress", 40);
-//        simulateKeyEvent(p, "keypress", 39);
-//        simulateKeyEvent(p, "keypress", 69);
-var t = "";
-for (var i in selection) {
- t += i + " ";
-}
-//alert(t);
-    }
-    alert("'" + selection.getRangeAt(0).startOffset + "' ");
-
-}
-function show(e) {
-var t = "";
-for (var i in e) {
- t += i + " ";
-}
-//alert(t);
-    alert("code: " + e.charCode + " key: " + e.keyCode + ' ');
-}
-  </script>
- </body>
-</html>
diff --git a/apps/files_odfviewer/src/webodf/webodf/misctests/selection.html b/apps/files_odfviewer/src/webodf/webodf/misctests/selection.html
deleted file mode 100644
index d758237f39..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/misctests/selection.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<html>
-  <head><title></title>
-<script>
-window.onload = function () {
-    var selection = window.getSelection(),
-        p = document.createElement("p"),
-        textnode = document.createTextNode("hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello "),
-        range;
-
-    document.body.appendChild(p);
-    p.appendChild(textnode);
-    selection.removeAllRanges();
-    range = document.createRange();
-    range.setStart(textnode, 1);
-    selection.removeAllRanges();
-    selection.addRange(range);
-
-selection.modify("move", "forward", "line");
-
-alert(selection.rangeCount + " " + selection.getRangeAt(0).startOffset);
-}
-</script>
-  </head>
-  <body>
-  </body>
-</html>
-
diff --git a/apps/files_odfviewer/src/webodf/webodf/misctests/testselection.html b/apps/files_odfviewer/src/webodf/webodf/misctests/testselection.html
deleted file mode 100644
index 28ff15889b..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/misctests/testselection.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-  <head><title></title>
-<script>
-function log(message) {
-    document.body.appendChild(document.createTextNode(message));
-}
-
-window.onload = function () {
-    if (!document.createElementNS) {
-        log("Error: there is no function 'document.createElementNS'.");
-        return;
-    }
-    if (!window.getSelection) {
-        log("Error: there is no function 'window.getSelection'.");
-        return;
-    }
-    var testarea = document.getElementById("testarea"),
-        selection = window.getSelection(),
-        p = document.createElementNS("http://www.w3.org/1999/xhtml", "p"),
-        text = document.createTextNode("hello");
-    testarea.appendChild(p);
-    p.appendChild(text);
-    selection.removeAllRanges();
-    if (selection.rangeCount !== 0) {
-        log("Error: not all ranges were removed.");
-        return;
-    }
-
-    var range = document.createRange();
-    range.setStart(p, 0);
-    range.setEnd(p, 0);
-    if (range.startContainer !== p) {
-        log("Error: the start of the range was not correct.");
-        return;
-    }
-    selection.addRange(range);
-
-    if (selection.rangeCount === 0) {
-        log("Error: no range was added to the selection.");
-        return;
-    }
-    if (selection.rangeCount > 1) {
-        log("Error: there are too many ranges in the selection.");
-        return;
-    }
-    if (selection.getRangeAt(0).startContainer !== p) {
-        log("Error: the start of the selection is not the right element." +
-            "It is " + selection.getRangeAt(0).startContainer.nodeName +
-            " instead of " + p.nodeName + ".");
-        return;
-    }
-    log("Success: selection test worked without error.");
-}
-</script>
-  </head>
-  <body>
-<div id="testarea"></div>
-  </body>
-</html>
-
diff --git a/apps/files_odfviewer/src/webodf/webodf/misctests/testzip.js b/apps/files_odfviewer/src/webodf/webodf/misctests/testzip.js
deleted file mode 100644
index bd57807bf5..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/misctests/testzip.js
+++ /dev/null
@@ -1,181 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global runtime core*/
-runtime.loadClass("core.Zip");
-runtime.loadClass("core.Async");
-
-var async = new core.Async();
-
-/**
- * @param {!core.Zip.ZipEntry} entry
- * @param {!core.Zip} zip
- * @param {function(?string):undefined} callback
- * @return {undefined}
- */
-function copyEntry(entry, zip, callback) {
-    entry.load(function (err, data) {
-        if (err) {
-            callback(err);
-        } else {
-            zip.save(entry.filename, data, false, entry.date);
-            callback(null);
-        }
-    });
-}
-
-/**
- * @param {!core.Zip} zipa
- * @param {!core.Zip} zipb
- * @param {function(?string):undefined} callback
- * @return {undefined}
- */
-function compareZips(zipa, zipb, callback) {
-    var entriesa = zipa.getEntries(),
-        l = entriesa.length,
-        entriesb = zipb.getEntries(),
-        i,
-        j,
-        entrya,
-        entryb;
-    // compare the number of entries
-    if (entriesb.length !== l) {
-        callback("Number of entries is not equal.");
-        return;
-    }
-    // compare the meta data of the entries
-    for (i = 0; i < l; i += 1) {
-        entrya = entriesa[i];
-        for (j = 0; j < l; j += 1) {
-            entryb = entriesb[j];
-            if (entrya.filename === entryb.filename) {
-                break;
-            }
-        }
-        if (j === l) {
-            callback("Entry " + entrya.filename + " is not present in the " +
-                    "second zip file.");
-            return;
-        }
-        if (entrya.date.valueOf() !== entryb.date.valueOf()) {
-            callback("Dates for entry " + entrya.filename + " is not equal: " +
-                entrya.date + " vs " + entryb.date);
-            return;
-        }
-    }
-    // compare the data in the entries
-    async.forEach(entriesa, function (entry, callback) {
-        entry.load(function (err, dataa) {
-            if (err) {
-                callback(err);
-                return;
-            }
-            zipb.load(entry.filename, function (err, datab) {
-                if (err) {
-                    callback(err);
-                    return;
-                }
-                var i = 0, l = dataa.length;
-                if (dataa !== datab) {
-                    for (i = 0; i < l && dataa[i] === datab[i];) {
-                        i += 1;
-                    }
-                    callback("Data is not equal for " + entry.filename +
-                            " at position " + i + ": " + dataa.charCodeAt(i) +
-                            " vs " + datab.charCodeAt(i) + ".");
-                } else {
-                    callback(null);
-                }
-            });
-        });
-    }, function (err) {
-        callback(err);
-    });
-}
-
-function testZip(filepatha, callback) {
-    var zipa = new core.Zip(filepatha, function (err, zipa) {
-        if (err) {
-            runtime.log(err);
-            runtime.exit(1);
-            return;
-        }
-        // open a new zip file and copy all entries from zipa to zipb
-        var filepathb = "tmp323.zip",
-            zipb = new core.Zip(filepathb, null),
-            entries = zipa.getEntries(),
-            i,
-            entriesDone = 0;
-        async.forEach(entries, function (entry, callback) {
-            copyEntry(entry, zipb, callback);
-        }, function (err) {
-            if (err) {
-                callback(err);
-                return;
-            }
-            zipb.write(function (err) {
-                if (err) {
-                    callback(err);
-                    return;
-                }
-                zipb = new core.Zip(filepathb, function (err, zipb) {
-                    if (err) {
-                        callback(err);
-                        return;
-                    }
-                    compareZips(zipa, zipb, callback);
-                });
-            });
-        });
-    });
-}
-
-var args = arguments;
-// open the arguments one by one, save them to a file, then open again and see
-// if the contents matches
-function doit(i) {
-    if (i >= args.length) {
-        return;
-    }
-    testZip(args[i], function (err) {
-        runtime.log(args[i]);
-        if (err) {
-            runtime.log(err);
-            return;
-        }
-        i += 1;
-        if (i < args.length) {
-            doit(i);
-        }
-    });
-}
-doit(1);
diff --git a/apps/files_odfviewer/src/webodf/webodf/misctests/writetest.zip b/apps/files_odfviewer/src/webodf/webodf/misctests/writetest.zip
deleted file mode 100644
index 69a14abc26..0000000000
Binary files a/apps/files_odfviewer/src/webodf/webodf/misctests/writetest.zip and /dev/null differ
diff --git a/apps/files_odfviewer/src/webodf/webodf/notes b/apps/files_odfviewer/src/webodf/webodf/notes
deleted file mode 100644
index f21a7c3fdd..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/notes
+++ /dev/null
@@ -1,137 +0,0 @@
-XMLModel:
- - list of all possible QNames
- - list of valid attributes for each QName  
- - node walker positions
- - knowledge about where whitespace is meaningfull
-
-
-
-
-xmledit
- - receives mouse and keyboard events
-     - simple editing
-     - inputs that might be interpreted higher up
-
-Tools:
-
-Features we want:
- - ability to run code from Rhine, Node.JS and browsers
- - type checking
- - sanity checking
- - javascript compilation
- - unit tests
- - unit test code coverage
-
-
-Closure seems a nice compiler. It should be optional.
-Unit testing should be as simple as doing a reload in a browser or calling a single command from the command-line.
-
-The only fundamental problem is the method of resolving dependencies. Closure does not understand require() commands that load modules. However, Node.JS needs this command to load modules.
-
-If require("mypackage.MyClass") would return just the class if it was already loaded, that would be perfect. Using eval() would solve this:
-    function require(module) {
-        var m;
-        try {
-            m = eval(module);
-        } catch (e) {
-        }
-        if (m === undefined) {
-            // load the module
-        }
-    }
-
-But then how to adapt the code in the modules themselves? Currenlty, no global objects are defined, but symbols are added to the exports variable. 
-Suppose that ideal javascript modules each define one class, then the code for class a.b.Class would be stored in the file a/b/Class.js and would look like this:
-====
-a.b.Class = function () {
-};
-====
-If this code should be loaded as a module, it should be executed with eval(). The environment in which the code is executed should already have 'package' a.b.
-
-function runModuleCode(modulename, code) {
-    var names = modulename.split("."),
-        evalcode;
-    if (!eval("typeof " + names[0] + " === 'undefined'")) {
-    }
-    evalcode = "if (typeof " + names[0] + " === 'undefined') {" +
-        
-    if 
-}
-
-function loadClass(modulename) {
-    // test if class already exists
-    var names = modulename.split("."),
-        evalcode, constructor;
-    evalcode = "(typeof " + names[0] + " !== 'undefined' ")
-    
-
-var code = "";
-if (typeof a === "undefined") {
-    code = code + "var a = {};";
-    if (!eval(
-
-
-Node does not have global context in eval() it seems.
-
-
-
-Running unit tests should be possible in a number of ways:
- - single tests in
-   * browser
-   * browser with code coverage
-   * browser from js compiled with Closure Compiler
-   * node.js
-   * rhino
- - 
-
-
----
-
-
-Caret should work like a cursor.
-It should use the contentEditable property to advance the cursor within one text node.
-
-Isn't the current cursor sufficient? All that is missing is to use the native display when it is a text node.
-
-Using the contentEditable means that the cursor code can be simplified quite a bit if you want to 
-
-
-If the caret is in a text node, moving should be done by passing a move signal to the system.
-After the move it should be checked if the move made sense, i.e. if the caret is in an allowed position. If it is not, the position should be corrected manually.
-
-Determining if a caret is in a legal position is done with a special class.
-
-The current players:
- - core.Cursor : insert a caret in the text if the selection calls for it
- - gui.XMLEdit : 
- - ...: moving of the cursor, taking into account skipping over/ignoring the cursor itself and also taking into account that the caret in an editable text must be moved by the browser
-
-move the cursor in a simple document with a wrapped text
-
-
-Contenteditable is perhaps not strictly necessary. It does not work well across browsers anyway. The only reason to use it would be to have a nice way to move the cursor up or down a line.
-
-To move the cursor or selection, a special class is needed for determining how to modify the selection upon different inputs. The visualization of the cursor is handled by the cursor class.
-
-stepForward
-stepBackward
-setPoint
-
-----
-
-Cursor and selection:
- - cursor is foreign element of height but with no width
- - handle mouse event to move or place the cursor at the right position
- - handle key events to move the cursor
-
-webkit has nice functions for manipulating the selection
-selection/cursor position is the 'real' thing, the cursor (visible or not) is just the visualization
-
-The cursor must appear invisible to the normal dom functions, this is tricky because a cursor may split a text. This is however a separate concern.
-
-So there should be an event handler that translates mouse and key events into api calls. There already is moving of the cursor/selection on mouse events in Firefox and WebKit so only keyboard events need to be handled. So core.Cursor.updateToSelection should work ok for mouse events.
-
-Should we re-evaluate the use of JQuery? NO! first add editing functions to WebODF.
-
-So current top priorities: moving the cursor and saving.
-And not in the general xml editor, but in the odf editor.
diff --git a/apps/files_odfviewer/src/webodf/webodf/odf.html b/apps/files_odfviewer/src/webodf/webodf/odf.html
deleted file mode 100644
index 3abbf96ff7..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/odf.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8"></meta>
-  <style type="text/css" media="screen">
-    body, html, div {
-      padding: 0px;
-      margin: 0px;
-      border: 0px;
-    }
-    body, html {
-      height: 100%;
-      text-align: center;
-    }
-    html > body {
-      background: black;
-    }
-  </style>
-  <link rel="stylesheet" type="text/css" href="webodf.css"/>
-  <script src="lib/runtime.js" type="text/javascript" charset="utf-8"></script>
-  <script type="text/javascript" charset="utf-8">
-function init() {
-    runtime.loadClass("odf.OdfCanvas");
-    // if the url has a fragment (#...), try to load the file it represents
-    var location = String(document.location),
-        pos = location.indexOf('#'),
-        odfelement = document.getElementById("odf");
-    document.odfcanvas = new odf.OdfCanvas(odfelement);
-    if (pos === -1 || !window) {
-        return;
-    }
-    location = location.substr(pos + 1);
-    document.odfcanvas.load(location);
-}
-window.setTimeout(init, 1);
-  </script>
-  <title></title>
-</head>
- 
-<body>
-  <div id="odf"/>
-</body>
-</html>
diff --git a/apps/files_odfviewer/src/webodf/webodf/odfedit.html b/apps/files_odfviewer/src/webodf/webodf/odfedit.html
deleted file mode 100644
index d4a5b53870..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/odfedit.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8"></meta>
-  <link rel="stylesheet" type="text/css" href="extjs/resources/css/ext-all.css"/>
-  <style type="text/css" media="screen">
-  body { background: #dddddd;}
-  div#odf { margin: 10px; padding; 10px; border: 1px solid black; }
-  span { border: 1px solid black; }
-  body > div > span { cursor: pointer; }
-  body > div > span:hover { background: white; }
-  body > div > span:active { background: #dddddd; }
-  </style>
-  <!-- requirements -->
-  <script src="extjs/adapter/ext/ext-base.js" type="text/javascript" charset="utf-8"></script>
-  <script src="extjs/ext-all-debug.js" type="text/javascript" charset="utf-8"></script>
-  <script src="lib/runtime.js" type="text/javascript" charset="utf-8"></script>
-  <!-- application -->
-  <script src="odfedit.js" type="text/javascript" charset="utf-8"></script>
- 
-  <title id="page-title">WebODF</title>
-  <link rel="stylesheet" type="text/css" href="webodf.css"/>
-</head>
-<body>
-</body>
-</html>
diff --git a/apps/files_odfviewer/src/webodf/webodf/odfedit.js b/apps/files_odfviewer/src/webodf/webodf/odfedit.js
deleted file mode 100644
index 6dfc1cddac..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/odfedit.js
+++ /dev/null
@@ -1,314 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global runtime: true, document: true, odf: true, window: true, Ext: true*/
-/**
- * @type {odf.OdfCanvas}
- */
-var odfcanvas;
-
-/**
- * @return {undefined}
- */
-function fixExtJSCSS() {
-    "use strict";
-    // look through all stylesheets to change the selector
-    // ".x-viewport, .x-viewport body"
-    // to
-    // ".x-viewport, .x-viewport > body"
-    // The normal selector os not specific enough, office|body is also affected
-    // by it. To avoid this, the selector is changed so that is only applies to
-    // a director parent child relationship with '>'
-    var i, cssRules, j, rule;
-    for (i = 0; i < document.styleSheets.length; i += 1) {
-        cssRules = document.styleSheets[i].cssRules;
-        for (j = 0; j < cssRules.length; j += 1) {
-            rule = cssRules[j];
-            if (rule.selectorText === ".x-viewport, .x-viewport body") {
-                rule = rule.cssText.replace(".x-viewport, .x-viewport body",
-                        ".x-viewport, .x-viewport > body");
-                document.styleSheets[i].deleteRule(j);
-                document.styleSheets[i].insertRule(rule, j);
-                return;
-            }
-        }
-    }
-}
-/**
- * @return {undefined}
- */
-function updateStyleComboBox() {
-    "use strict";
-    var paragraphStylesBox = document.getElementById("paragraphStyleBox");
-}
-/**
- * @param {!Element} odfelement
- * @return {undefined}
- */
-function initCanvas(odfelement) {
-    "use strict";
-    runtime.loadClass("odf.OdfCanvas");
-    // if the url has a fragment (#...), try to load the file it represents
-    var location = String(document.location),
-        pos = location.indexOf('#');
-//    odfelement.style.overflow = 'auto';
-    odfelement.style.height = '100%';
-    odfcanvas = new odf.OdfCanvas(odfelement);
-    if (pos === -1 || !window) {
-        return;
-    }
-    location = location.substr(pos + 1);
-    odfcanvas.onstatereadychange = function () {
-        /*
-        updateStyleComboBox();
-        odfcanvas.save(function (err) {
-            alert(err);
-        });
-        */
-    };
-    odfcanvas.load(location);
-    odfcanvas.addListener("selectionchange", function (element, selection) {
-        var formatting = odfcanvas.getFormatting(),
-            completelyBold = formatting.isCompletelyBold(selection),
-            alignment = formatting.getAlignment(selection);
-        runtime.log("selection changed " + completelyBold + " " + alignment);
-    });
-}
-/**
- * @return {undefined}
- */
-function save() {
-    "use strict";
-    odfcanvas.odfContainer().save(function (err) {
-        if (err) {
-            runtime.log(err);
-        }
-    });
-}
-Ext.ODFEditor = Ext.extend(Ext.component.Component, {
-    buttonTips : {
-        bold : {
-            title: 'Bold (Ctrl+B)',
-            text: 'Make the selected text bold.',
-            cls: 'x-html-editor-tip'
-        },
-        italic : {
-            title: 'Italic (Ctrl+I)',
-            text: 'Make the selected text italic.',
-            cls: 'x-html-editor-tip'
-        },
-        underline : {
-            title: 'Underline (Ctrl+U)',
-            text: 'Underline the selected text.',
-            cls: 'x-html-editor-tip'
-        },
-        increasefontsize : {
-            title: 'Grow Text',
-            text: 'Increase the font size.',
-            cls: 'x-html-editor-tip'
-        },
-        decreasefontsize : {
-            title: 'Shrink Text',
-            text: 'Decrease the font size.',
-            cls: 'x-html-editor-tip'
-        },
-        backcolor : {
-            title: 'Text Highlight Color',
-            text: 'Change the background color of the selected text.',
-            cls: 'x-html-editor-tip'
-        },
-        forecolor : {
-            title: 'Font Color',
-            text: 'Change the color of the selected text.',
-            cls: 'x-html-editor-tip'
-        },
-        justifyleft : {
-            title: 'Align Text Left',
-            text: 'Align text to the left.',
-            cls: 'x-html-editor-tip'
-        },
-        justifycenter : {
-            title: 'Center Text',
-            text: 'Center text in the editor.',
-            cls: 'x-html-editor-tip'
-        },
-        justifyright : {
-            title: 'Align Text Right',
-            text: 'Align text to the right.',
-            cls: 'x-html-editor-tip'
-        },
-        insertunorderedlist : {
-            title: 'Bullet List',
-            text: 'Start a bulleted list.',
-            cls: 'x-html-editor-tip'
-        },
-        insertorderedlist : {
-            title: 'Numbered List',
-            text: 'Start a numbered list.',
-            cls: 'x-html-editor-tip'
-        },
-        createlink : {
-            title: 'Hyperlink',
-            text: 'Make the selected text a hyperlink.',
-            cls: 'x-html-editor-tip'
-        },
-        sourceedit : {
-            title: 'Source Edit',
-            text: 'Switch to source editing mode.',
-            cls: 'x-html-editor-tip'
-        },
-        save : {
-            title: 'Save (Ctrl+S)',
-            text: 'Save the document.',
-            cls: 'x-html-editor-tip'
-        }
-    }
-});
-
-
-var ODFEditor = Ext.extend(Ext.Panel, {
-    initComponent: function () {
-        "use strict";
-        var me = this,
-            statusMessage = new Ext.Toolbar.TextItem('');
-        function buttonHandler(button, event) {
-        }
-        me.defaults = {
-        };
-        me.initialConfig = Ext.apply({
-        }, me.initialConfig);
-        me.items = [{
-            xtype: 'box',
-            id: 'canvas',
-            autoEl: {
-                tag: 'div',
-                frameBorder: 0,
-                style: {
-                    border: '0 none'
-                }
-            },
-            autoScroll: true,
-            scroll: true
-        }];
-        me.tbar = {
-            xtype: 'toolbar',
-            items: [{
-                xtype: 'button',
-                icon: 'extjs/examples/shared/icons/save.gif',
-                handler: buttonHandler,
-                cls: 'x-btn-icon'
-            }, {
-                xtype: 'tbseparator'
-            }, {
-                tag: 'select',
-                //html: this.createFontOptions()
-                cls: 'x-font-select'
-            }, {
-                xtype: 'buttongroup',
-                cls: 'x-html-editor-tb',
-                frame: false,
-                items: [{
-                    xtype: 'button',
-                    iconCls: 'x-edit-bold',
-                    cls: 'x-btn-icon'
-                }, {
-                    xtype: 'button',
-                    iconCls: 'x-edit-italic',
-                    cls: 'x-btn-icon'
-                }, {
-                    xtype: 'button',
-                    iconCls: 'x-edit-underline',
-                    cls: 'x-btn-icon'
-                }, {
-                    itemId: 'forecolor',
-                    cls: 'x-btn-icon',
-                    iconCls: 'x-edit-forecolor',
-                    menu: { xtype: 'colormenu' }
-                }, {
-                    itemId: 'backcolor',
-                    cls: 'x-btn-icon',
-                    iconCls: 'x-edit-backcolor',
-                    menu: { xtype: 'colormenu' }
-                }, {
-                    xtype: 'button',
-                    iconCls: 'x-edit-justifyleft',
-                    cls: 'x-btn-icon'
-                }, {
-                    xtype: 'button',
-                    iconCls: 'x-edit-justifycenter',
-                    cls: 'x-btn-icon'
-                }, {
-                    xtype: 'button',
-                    iconCls: 'x-edit-justifyright',
-                    cls: 'x-btn-icon'
-                }, {
-                    xtype: 'button',
-                    iconCls: 'x-edit-insertorderedlist',
-                    cls: 'x-btn-icon'
-                }, {
-                    xtype: 'button',
-                    iconCls: 'x-edit-insertunorderedlist',
-                    cls: 'x-btn-icon'
-                }]
-            }, {
-                xtype: 'tbfill'
-            },
-            statusMessage
-            ]
-        };
-/*
-        me.bbar = {
-            xtype: 'toolbar',
-            items: [ {xtype: "tbfill" }, statusMessage ]
-        };
-*/
-        ODFEditor.superclass.initComponent.call(this);
-    }
-});
-Ext.onReady(function () {
-    "use strict";
-    var canvas, viewport;
-
-    Ext.QuickTips.init();
-
-    canvas = new ODFEditor({
-        region: 'center'
-    });
-
-    viewport = new Ext.Viewport({
-        layout: 'border',
-        items: [ canvas ]
-    });
-
-    fixExtJSCSS();
-    initCanvas(Ext.getCmp('canvas').el.dom);
-});
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngToCPP.js b/apps/files_odfviewer/src/webodf/webodf/relaxngToCPP.js
deleted file mode 100644
index 064fe61b79..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/relaxngToCPP.js
+++ /dev/null
@@ -1,463 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global runtime: true, xmldom: true*/
-runtime.loadClass("xmldom.RelaxNGParser");
-
-var nsmap = {
-        "http://purl.org/dc/elements/1.1/": "purl",
-        "http://www.w3.org/1998/Math/MathML": "mathml",
-        "http://www.w3.org/1999/xhtml": "xhtml",
-        "http://www.w3.org/1999/xlink": "xlink",
-        "http://www.w3.org/2002/xforms": "xforms",
-        "http://www.w3.org/2003/g/data-view#": "dv",
-        "http://www.w3.org/XML/1998/namespace": "xmlns",
-        "urn:oasis:names:tc:opendocument:xmlns:animation:1.0": "animation",
-        "urn:oasis:names:tc:opendocument:xmlns:chart:1.0": "chart",
-        "urn:oasis:names:tc:opendocument:xmlns:config:1.0": "config",
-        "urn:oasis:names:tc:opendocument:xmlns:database:1.0": "database",
-        "urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0": "datastyle",
-        "urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0": "dr3d",
-        "urn:oasis:names:tc:opendocument:xmlns:drawing:1.0": "drawing",
-        "urn:oasis:names:tc:opendocument:xmlns:form:1.0": "form",
-        "urn:oasis:names:tc:opendocument:xmlns:meta:1.0": "meta",
-        "urn:oasis:names:tc:opendocument:xmlns:office:1.0": "office",
-        "urn:oasis:names:tc:opendocument:xmlns:presentation:1.0": "presentation",
-        "urn:oasis:names:tc:opendocument:xmlns:script:1.0": "script",
-        "urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0": "smilc",
-        "urn:oasis:names:tc:opendocument:xmlns:style:1.0": "style",
-        "urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0": "svgc",
-        "urn:oasis:names:tc:opendocument:xmlns:table:1.0": "table",
-        "urn:oasis:names:tc:opendocument:xmlns:text:1.0": "text",
-        "urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0": "xslfoc"
-    },
-    typemap = {
-        "string": "const QString&",
-        "NCName": "const QString&",
-        "date": "const QString&",
-        "time": "const QString&",
-        "dateTime": "const QString&",
-        "duration": "const QString&",
-        "anyURI": "const QString&",
-        "ID": "const QString&",
-        "IDREF": "const QString&",
-        "IDREFS": "const QString&",
-        "QName": "const QString&",
-        "token": "const QString&",
-        "language": "const QString&",
-        "positiveInteger": "quint32",
-        "nonNegativeInteger": "quint32",
-        "integer": "qint32",
-        "decimal": "double"
-    },
-    args = arguments,
-    relaxngurl = args[1],
-    parser = new xmldom.RelaxNGParser(relaxngurl);
-
-function out(string) {
-    "use strict";
-    runtime.log(string);
-}
-function toCamelCase(s) {
-    "use strict";
-    var str = "", i, up = true;
-    for (i = 0; i < s.length; i += 1) {
-        if (up) {
-            str += s.substr(i, 1).toUpperCase();
-        } else {
-            str += s.substr(i, 1);
-        }
-        up = false;
-        while (/\W/.test(s.substr(i + 1, 1))) {
-            up = true;
-            i += 1;
-        }
-    }
-    return str;
-}
-function getName(e) {
-    "use strict";
-    return toCamelCase(nsmap[e.a.ns]) + toCamelCase(e.text);
-}
-function getNames(e, names) {
-    "use strict";
-    if (e.name === "name") {
-        names.push(e);
-    } else if (e.name === "choice") {
-        getNames(e.e[0], names);
-        getNames(e.e[1], names);
-    }
-}
-function parseAttributes(e, att) {
-    "use strict";
-    var i, name;
-    if (e.name === "choice" || e.name === "interleave"
-            || e.name === "group") {
-        for (i = 0; i < e.e.length; i += 1) {
-            parseAttributes(e.e[i], att);
-        }
-    } else if (e.name === "value") {
-        att.values.push(e.text);
-    } else if (e.name === "data") {
-        att.types.push(e.a.type);
-    } else if (e.name === "list") {
-        name = null; // todo 
-    } else if (e.name === "empty") {
-        att.empty = true;
-    } else {
-        runtime.log("OOPS " + e.name);
-        throw null;
-    }
-}
-function writeAttributeSetter(name, type, a) {
-    "use strict";
-    var i, s = "";
-    out("    /**");
-    if (a.optional) {
-        out("     * Set optional attribute " + a.nsname + ".");
-    } else {
-        out("     * Set required attribute " + a.nsname + ".");
-    }
-    if (a.values.length > 0) {
-        s = "Choose one of these values: '" + a.values[0] + "'";
-        for (i = 1; i < a.values.length; i += 1) {
-            s += ", '" + a.values[i] + "'";
-        }
-        out("     * " + s + ".");
-    }
-    out("     */");
-    out("    inline void write" + name + "(" + type + " value) {");
-    out("        xml->addAttribute(\"" + a.nsname + "\", value);");
-    out("    }");
-}
-function writeAttribute(name, a) {
-    "use strict";
-    if (!a.optional) {
-        return;
-    }
-    var i, type, done = {}, needfallback = true;
-    for (i = 0; i < a.types.length; i += 1) {
-        needfallback = false;
-        type = typemap[a.types[i]] || a.types[i];
-        if (!done.hasOwnProperty(type)) {
-            done[type] = 1;
-            writeAttributeSetter(name, type, a);
-        }
-    }
-    if (a.values.indexOf("true") !== -1 && a.values.indexOf("false") !== -1 &&
-            done.hasOwnProperty("bool")) {
-        needfallback = false;
-        writeAttributeSetter(name, "bool", a);
-    }
-    if (needfallback) {
-        writeAttributeSetter(name, "const QString&", a);
-    }
-}
-function writeOptionalAttributes(atts) {
-    "use strict";
-    var name;
-    for (name in atts) {
-        if (atts.hasOwnProperty(name)) {
-            writeAttribute(name, atts[name]);
-        }
-    }
-}
-function writeFixedRequiredAttributes(atts) {
-    "use strict";
-    var name, a;
-    for (name in atts) {
-        if (atts.hasOwnProperty(name)) {
-            a = atts[name];
-            if (!a.optional && a.types.length === 0 && a.values.length === 1) {
-                 out("        xml->addAttribute(\"" + a.nsname + "\", \"" +
-                     a.values[0] + "\");");
-            }
-        }
-    }
-}
-function getRequiredAttributeArguments(atts) {
-    "use strict";
-    var name, a, s = "", type;
-    for (name in atts) {
-        if (atts.hasOwnProperty(name)) {
-            a = atts[name];
-            if (!a.optional && (a.types.length > 0 || a.values.length !== 1)) {
-                type = typemap[a.types[0]] || a.types[0] || "const QString&";
-                if (s) {
-                    s += ", ";
-                }
-                s += type + " " + name.toLowerCase();
-            }
-        }
-    }
-    return s;
-}
-function getRequiredAttributeCall(atts) {
-    "use strict";
-    var name, a, s = "";
-    for (name in atts) {
-        if (atts.hasOwnProperty(name)) {
-            a = atts[name];
-            if (!a.optional && (a.types.length > 0 || a.values.length !== 1)) {
-                if (s) {
-                    s += ", ";
-                }
-                s += name.toLowerCase();
-            }
-        }
-    }
-    return s;
-}
-function writeRequiredAttributesSetters(atts) {
-    "use strict";
-    var name, a;
-    for (name in atts) {
-        if (atts.hasOwnProperty(name)) {
-            a = atts[name];
-            if (!a.optional && (a.types.length > 0 || a.values.length !== 1)) {
-                out("        xml->addAttribute(\"" + a.nsname + "\", " +
-                    name.toLowerCase() + ");");
-            }
-        }
-    }
-}
-function writeMembers(e, atts, optional) {
-    "use strict";
-    var ne, nsname, i, name, names;
-    if (e.name === "element") {
-        name = null;
-    } else if (e.name === "attribute") {
-        names = [];
-        getNames(e.e[0], names);
-        for (i = 0; i < names.length; i += 1) {
-            ne = names[i];
-            name = getName(ne);
-            if (!atts.hasOwnProperty(name)) {
-                nsname = nsmap[ne.a.ns] + ":" + ne.text;
-                atts[name] = {
-                    nsname: nsname,
-                    values: [],
-                    types: [],
-                    optional: optional,
-                    empty: false
-                };
-            }
-            parseAttributes(e.e[1], atts[name]);
-        }
-    } else if (e.name === "choice") {
-        for (i = 0; i < e.e.length; i += 1) {
-            writeMembers(e.e[i], atts, true);
-        }
-    } else if (e.name === "interleave" || e.name === "group") {
-        for (i = 0; i < e.e.length; i += 1) {
-            writeMembers(e.e[i], atts, optional);
-        }
-    } else if (e.name === "oneOrMore") {
-        writeMembers(e.e[0], atts, optional);
-    } else if (e.name === "value") {
-        name = null; // todo 
-    } else if (e.name === "data") {
-        name = null; // todo 
-    } else if (e.name === "text") {
-        out("    void addTextNode(const QString& str) { xml->addTextNode(str); }");
-    } else if (e.name === "empty") {
-        name = null; // todo 
-    } else {
-        runtime.log("OOPS " + e.name);
-        throw null;
-    }
-}
-function defineClass(e, parents, children) {
-    "use strict";
-    var c, p, i,
-        ne = e.e[0],
-        nsname = nsmap[ne.a.ns] + ":" + ne.text,
-        name = ne.cppname, atts = {};
-    out("/**");
-    out(" * Serialize a <" + nsname + "> element.");
-    out(" */");
-    out("class " + name + "Writer {");
-    for (c in children) {
-        if (children.hasOwnProperty(c) && c !== name) {
-            out("friend class " + c + "Writer;");
-        }
-    }
-    out("public:");
-    writeMembers(e.e[1], atts, false);
-    writeOptionalAttributes(atts);
-    e.requiredAttributes = getRequiredAttributeArguments(atts);
-    e.requiredAttributeCall = getRequiredAttributeCall(atts);
-    out("private:");
-    out("    inline void start(" + e.requiredAttributes + ") {");
-    out("        xml->startElement(\"" + nsname + "\");");
-    if (e.requiredAttributes) {
-        e.requiredAttributes = ", " + e.requiredAttributes;
-    }
-    writeFixedRequiredAttributes(atts);
-    writeRequiredAttributesSetters(atts);
-    out("    }");
-    out("public:");
-    out("    KoXmlWriter* const xml;");
-    for (p in parents) {
-        if (parents.hasOwnProperty(p)) {
-            out("    inline explicit " + name + "Writer(const " + p +
-                    "Writer& p" + e.requiredAttributes + ");");
-        }
-    }
-    out("    inline explicit " + name + "Writer(KoXmlWriter* xml_" +
-            e.requiredAttributes +
-            ") :xml(xml_) { start(" + e.requiredAttributeCall + "); }");
-    out("    void end() { xml->endElement(); }");
-    out("    void operator=(const " + name + "Writer&) { }");
-    out("};");
-}
-function defineConstructors(e, parents) {
-    "use strict";
-    var p,
-        ne = e.e[0],
-        nsname = nsmap[ne.a.ns] + ":" + ne.text,
-        name = ne.cppname;
-    for (p in parents) {
-        if (parents.hasOwnProperty(p)) {
-            out(name + "Writer::" + name + "Writer(const " + p +
-                "Writer& p" + e.requiredAttributes +
-                ") :xml(p.xml) { start(" + e.requiredAttributeCall + "); }");
-        }
-    }
-}
-function getChildren(e, children) {
-    "use strict";
-    var name, i, names;
-    if (e.name === "element") {
-        names = [];
-        getNames(e.e[0], names);
-        for (i = 0; i < names.length; i += 1) {
-            children[names[i].cppname] = 1;
-        }
-    } else if (e.name === "choice" || e.name === "interleave"
-            || e.name === "group") {
-        for (i = 0; i < e.e.length; i += 1) {
-            getChildren(e.e[i], children);
-        }
-    } else if (e.name === "oneOrMore") {
-        getChildren(e.e[0], children);
-    } else if (e.name === "attribute" || e.name === "value" ||
-            e.name === "data" || e.name === "text" || e.name === "empty") {
-        name = null; // ignore
-    } else {
-        runtime.log("OOPS " + e.name);
-        throw null;
-    }
-}
-function childrenToParents(childrenmap) {
-    "use strict";
-    var p, children, c, parents = {};
-    for (p in childrenmap) {
-        if (childrenmap.hasOwnProperty(p)) {
-            children = childrenmap[p];
-            for (c in children) {
-                if (children.hasOwnProperty(c)) {
-                    if (!parents.hasOwnProperty(c)) {
-                        parents[c] = {};
-                    }
-                    parents[c][p] = 1;
-                }
-            }
-        }
-    }
-    return parents;
-}
-function toCPP(elements) {
-    "use strict";
-    out("#include <KoXmlWriter.h>");
-
-    // first get a mapping for all the parents
-    var children = {}, parents = {}, i, j, ce, ec, name, names, c,
-        elementMap = {}, sortedElementNames = [];
-    for (i = 0; i < elements.length; i += 1) {
-        ce = elements[i];
-        if (ce.name !== "element") {
-            runtime.log("Error in parsed data.");
-            return;
-        }
-        names = [];
-        getNames(ce.e[0], names);
-        for (j = 0; j < names.length; j += 1) {
-            name = getName(names[j]);
-            while (elementMap.hasOwnProperty(name)) {
-                name = name + "_";
-            }
-            names[j].cppname = name;
-            ec = {e: [names[j], ce.e[1]]};
-            elementMap[name] = ec;
-            sortedElementNames.push(name);
-        }
-    }
-    sortedElementNames.sort();
-
-    for (i = 0; i < sortedElementNames.length; i += 1) {
-        name = sortedElementNames[i];
-        c = {};
-        getChildren(elementMap[name].e[1], c);
-        children[name] = c;
-    }
-    parents = childrenToParents(children);
-
-    for (i = 0; i < sortedElementNames.length; i += 1) {
-        name = sortedElementNames[i];
-        out("class " + name + "Writer;");
-    }
-    for (i = 0; i < sortedElementNames.length; i += 1) {
-        name = sortedElementNames[i];
-        defineClass(elementMap[name], parents[name], children[name]);
-    }
-    for (i = 0; i < sortedElementNames.length; i += 1) {
-        name = sortedElementNames[i];
-        defineConstructors(elementMap[name], parents[name]);
-    }
-}
-
-// load and parse the Relax NG
-runtime.loadXML(relaxngurl, function (err, dom) {
-    "use strict";
-    var parser = new xmldom.RelaxNGParser();
-    if (err) {
-        runtime.log(err);
-    } else {
-        err = parser.parseRelaxNGDOM(dom);
-        if (err) {
-            runtime.log(err);
-        } else {
-            toCPP(parser.elements);
-        }
-    }
-});
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test01.rng b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test01.rng
deleted file mode 100644
index 0c4e4baa8d..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test01.rng
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<grammar
-	xmlns="http://relaxng.org/ns/structure/1.0"
-
-	xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
->
-	<start>
-		<ref name="office-document-content"/>
-	</start>
-	<define name="office-document-content">
-		<element name="office:document-content">
-			<ref name="office-document-common-attrs"/>
-			<ref name="office-scripts"/>
-			<ref name="office-body"/>
-		</element>
-	</define>
-	<define name="office-document-common-attrs">
-		<attribute name="office:version">
-			<value>1.2</value>
-		</attribute>
-	</define>
-	<define name="office-scripts">
-		<optional>
-			<element name="office:scripts">
-				<empty/>
-			</element>
-		</optional>
-	</define>
-	<define name="office-body">
-		<element name="office:body">
-			<element name="office:text">
-				<empty/>
-			</element>
-		</element>
-	</define>
-</grammar>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test01.xml b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test01.xml
deleted file mode 100644
index 71712e11e5..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test01.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<office:document-content xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" office:version="1.2">
- <office:scripts/>
- <!--comment-->
- <office:body>
-  <office:text/>
- </office:body>
-</office:document-content>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test02.rng b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test02.rng
deleted file mode 100644
index ed37e255fd..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test02.rng
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<grammar
-	xmlns="http://relaxng.org/ns/structure/1.0"
-
-	xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-	xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
->
-	<start>
-		<ref name="office-document-content"/>
-	</start>
-	<define name="office-document-content">
-		<element name="office:document-content">
-			<ref name="office-document-common-attrs"/>
-			<ref name="office-scripts"/>
-			<ref name="office-automatic-styles"/>
-			<ref name="office-body"/>
-		</element>
-	</define>
-	<define name="office-automatic-styles">
-		<optional>
-			<element name="office:automatic-styles">
-				<zeroOrMore>
-					<element name="style:style">
-						<attribute name="style:name"><value>NamespaceTable</value></attribute>
-						<ref name="style-style-content"/>
-					</element>
-				</zeroOrMore>
-			</element>
-		</optional>
-	</define>
-	<define name="office-document-common-attrs">
-		<attribute name="office:version">
-			<value>1.2</value>
-		</attribute>
-	</define>
-	<define name="office-scripts">
-		<optional>
-			<element name="office:scripts">
-				<empty/>
-			</element>
-		</optional>
-	</define>
-	<define name="office-body">
-		<element name="office:body">
-			<element name="office:text">
-				<empty/>
-			</element>
-		</element>
-	</define>
-	<define name="style-table-properties">
-		<element name="style:table-properties">
-			<empty/>
-		</element>
-	</define>
-	<define name="style-chart-properties">
-		<element name="style:chart-properties">
-			<empty/>
-		</element>
-	</define>
-	<define name="style-style-content">
-		<choice>
-			<group>
-				<attribute name="style:family">
-					<value>chart</value>
-				</attribute>
-				<optional>
-					<ref name="style-chart-properties"/>
-				</optional>
-			</group>
-			<group>
-				<attribute name="style:family">
-					<value>table</value>
-				</attribute>
-				<optional>
-					<ref name="style-table-properties"/>
-				</optional>
-			</group>
-		</choice>
-	</define>
-</grammar>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test02.xml b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test02.xml
deleted file mode 100644
index 7e70255ed4..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test02.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<office:document-content xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" office:version="1.2">
- <office:automatic-styles>
-  <style:style style:name="NamespaceTable" style:family="table">
-   <style:table-properties/>
-  </style:style>
- </office:automatic-styles>
- <office:body>
-  <office:text>
-  </office:text>
- </office:body>
-</office:document-content>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test03.rng b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test03.rng
deleted file mode 100644
index 8803f52898..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test03.rng
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<grammar
-	xmlns="http://relaxng.org/ns/structure/1.0"
-	xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
->
-	<start>
-		<element name="office:a">
-			<interleave>
-				<text/>
-				<element name="office:b">
-					<empty/>
-				</element>
-			</interleave>
-		</element>
-	</start>
-</grammar>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test03.xml b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test03.xml
deleted file mode 100644
index a6255e802e..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test03.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<office:a xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0">
-	hello
-	<office:b/>
-	hi
-</office:a>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test04.rng b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test04.rng
deleted file mode 100644
index 511b297efa..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test04.rng
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<grammar
-	xmlns="http://relaxng.org/ns/structure/1.0"
-	xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
->
-	<start>
-		<element name="office:document-content">
-			<interleave>
-				<attribute name="office:version">
-					<value>1.2</value>
-				</attribute>
-			</interleave>
-			<element name="office:body">
-				<empty/>
-			</element>
-		</element>
-	</start>
-</grammar>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test04.xml b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test04.xml
deleted file mode 100644
index 21ceee55b1..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test04.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<office:document-content xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"  office:version="1.2">
- <office:body>
- </office:body>
-</office:document-content>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test05.rng b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test05.rng
deleted file mode 100644
index c0c73052f2..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test05.rng
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<grammar
-	xmlns="http://relaxng.org/ns/structure/1.0"
-	xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-	xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
->
-	<start>
-		<ref name="office-document-content"/>
-	</start>
-	<define name="office-document-content">
-		<element name="office:document-content">
-			<attribute name="office:version">
-				<value>1.2</value>
-			</attribute>
-			<ref name="office-body"/>
-		</element>
-	</define>
-	<define name="office-body">
-		<element name="office:body">
-			<element name="office:text">
-				<zeroOrMore>
-					<ref name="text-p"/>
-				</zeroOrMore>
-			</element>
-		</element>
-	</define>
-	<define name="text-p">
-		<element name="text:p">
-			<zeroOrMore>
-				<ref name="paragraph-content"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="paragraph-content">
-		<choice>
-			<text/>
-			<element name="text:s">
-				<empty/>
-			</element>
-		</choice>
-	</define>
-</grammar>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test05.xml b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test05.xml
deleted file mode 100644
index 38cb418bde..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test05.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<office:document-content xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" office:version="1.2">
- <office:body>
-  <office:text>
-   <text:p>
-   </text:p>
-  </office:text>
- </office:body>
-</office:document-content>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test06.rng b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test06.rng
deleted file mode 100644
index c744850f98..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test06.rng
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<grammar
-	xmlns="http://relaxng.org/ns/structure/1.0"
-	xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
->
-	<start>
-		<element name="office:a">
-			<text/>
-		</element>
-	</start>
-</grammar>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test06.xml b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test06.xml
deleted file mode 100644
index a9c24656ea..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test06.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<office:a xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0">
-	hello
-</office:a>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test07.rng b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test07.rng
deleted file mode 100644
index fb37cf8275..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test07.rng
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<grammar
-	xmlns="http://relaxng.org/ns/structure/1.0"
-	xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-	xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0"
->
-	<start>
-		<element name="office:document">
-			<attribute name="office:version">
-				<value>1.2</value>
-			</attribute>
-			<attribute name="office:mimetype">
-				<ref name="string"/>
-			</attribute>
-			<ref name="office-settings"/>
-			<ref name="office-body"/>
-		</element>
-	</start>
-	<define name="office-body">
-		<element name="office:body">
-			<element name="office:text">
-				<empty/>
-			</element>
-		</element>
-	</define>
-	<define name="office-settings">
-		<element name="office:settings">
-			<element name="config:config-item-set">
-				<attribute name="config:name">
-					<ref name="string"/>
-				</attribute>
-				<element name="config:config-item">
-					<interleave>
-						<attribute name="config:name">
-							<ref name="string"/>
-						</attribute>
-						<attribute name="config:type">
-							<choice>
-								<value>boolean</value>
-								<value>short</value>
-							</choice>
-						</attribute>
-					</interleave>
-					<text/>
-				</element>
-			</element>
-		</element>
-	</define>
-	<define name="string">
-		<data type="string"/>
-	</define>
-</grammar>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test07.xml b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test07.xml
deleted file mode 100644
index a5361bf155..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test07.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-                 xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0"
-                 office:version="1.2"
-                 office:mimetype="application/vnd.oasis.opendocument.text">
-   <office:settings>
-      <config:config-item-set config:name="ooo:configuration-settings">
-         <config:config-item config:name="UpdateFromTemplate" config:type="boolean">true</config:config-item>
-      </config:config-item-set>
-   </office:settings>
-   <office:body>
-      <office:text/>
-   </office:body>
-</office:document>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test08.rng b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test08.rng
deleted file mode 100644
index 82c2de66c5..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test08.rng
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<grammar
-	xmlns="http://relaxng.org/ns/structure/1.0"
-	xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-	xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0"
->
-	<start>
-		<element name="office:document">
-			<attribute name="office:version">
-				<value>1.2</value>
-			</attribute>
-			<attribute name="office:mimetype">
-				<ref name="string"/>
-			</attribute>
-			<ref name="office-settings"/>
-			<ref name="office-body"/>
-		</element>
-	</start>
-	<define name="office-body">
-		<element name="office:body">
-			<element name="office:text">
-				<empty/>
-			</element>
-		</element>
-	</define>
-	<define name="office-settings">
-		<element name="office:settings">
-			<element name="config:config-item-set">
-				<attribute name="config:name">
-					<ref name="string"/>
-				</attribute>
-				<element name="config:config-item">
-					<interleave>
-						<attribute name="config:name">
-							<ref name="string"/>
-						</attribute>
-						<attribute name="config:type">
-							<choice>
-								<value>boolean</value>
-								<value>string</value>
-							</choice>
-						</attribute>
-					</interleave>
-					<text/>
-				</element>
-			</element>
-		</element>
-	</define>
-	<define name="string">
-		<data type="string"/>
-	</define>
-</grammar>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test08.xml b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test08.xml
deleted file mode 100644
index 71af08046c..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test08.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-                 xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0"
-                 office:version="1.2"
-                 office:mimetype="application/vnd.oasis.opendocument.text">
-   <office:settings>
-      <config:config-item-set config:name="ooo:configuration-settings">
-         <config:config-item config:name="PrintFaxName" config:type="string"/>
-      </config:config-item-set>
-   </office:settings>
-   <office:body>
-      <office:text/>
-   </office:body>
-</office:document>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test09.rng b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test09.rng
deleted file mode 100644
index 1726996897..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test09.rng
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<grammar
-	xmlns="http://relaxng.org/ns/structure/1.0"
-	xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-	xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
-	xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
->
-	<start>
-		<element name="office:document">
-			<attribute name="office:version">
-				<value>1.2</value>
-			</attribute>
-			<attribute name="office:mimetype">
-				<data type="string"/>
-			</attribute>
-			<element name="office:body">
-				<element name="office:text">
-					<element name="text:p">
-						<choice>
-							<text/>
-							<element name="draw:frame">
-								<empty/>
-							</element>
-						</choice>
-					</element>
-				</element>
-			</element>
-		</element>
-	</start>
-</grammar>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test09.xml b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test09.xml
deleted file mode 100644
index a54dd99e4b..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test09.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-                 xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
-                 xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
-                 office:version="1.2"
-                 office:mimetype="application/vnd.oasis.opendocument.text">
-   <office:body>
-      <office:text>
-         <text:p>
-            <draw:frame/>
-         </text:p>
-      </office:text>
-   </office:body>
-</office:document>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test10.rng b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test10.rng
deleted file mode 100644
index 5e271a4389..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test10.rng
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<grammar
-	xmlns="http://relaxng.org/ns/structure/1.0"
-	datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
-	xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-	xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
-	xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
->
-	<start>
-		<element name="office:document">
-			<attribute name="office:version">
-				<value>1.2</value>
-			</attribute>
-			<attribute name="office:mimetype">
-				<data type="string"/>
-			</attribute>
-			<element name="office:styles">
-				<interleave>
-					<choice>
-						<empty/>
-						<oneOrMore>
-							<ref name="style-style"/>
-						</oneOrMore>
-					</choice>
-					<element name="style:default-style">
-						<ref name="style-style-content"/>
-					</element>
-				</interleave>
-			</element>
-			<element name="office:body">
-				<element name="office:text">
-					<empty/>
-				</element>
-			</element>
-		</element>
-	</start>
-	<define name="style-style">
-		<element name="style:style">
-			<attribute name="style:name">
-				<data type="NCName"/>
-			</attribute>
-			<ref name="style-style-content"/>
-		</element>
-	</define>
-	<define name="style-style-content">
-		<attribute name="style:family">
-			<value>text</value>
-		</attribute>
-	</define>
-</grammar>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test10.xml b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test10.xml
deleted file mode 100644
index f4087a8976..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test10.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-                 xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
-                 office:version="1.2"
-                 office:mimetype="application/vnd.oasis.opendocument.text">
-   <office:styles>
-      <style:default-style style:family="text"/>
-      <style:style style:name="Standard" style:family="text"/>
-   </office:styles>
-   <office:body>
-      <office:text/>
-   </office:body>
-</office:document>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test11.rng b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test11.rng
deleted file mode 100644
index 2df604b5b8..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test11.rng
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<grammar
-	xmlns="http://relaxng.org/ns/structure/1.0"
-	datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
-	xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-	xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
-	xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"
->
-	<start>
-		<element name="office:document">
-			<attribute name="office:version">
-				<value>1.2</value>
-			</attribute>
-			<attribute name="office:mimetype">
-				<data type="string"/>
-			</attribute>
-			<element name="office:font-face-decls">
-				<choice>
-					<empty/>
-					<oneOrMore>
-						<ref name="style-font-face"/>
-					</oneOrMore>
-				</choice>
-			</element>
-			<element name="office:body">
-				<element name="office:text">
-					<empty/>
-				</element>
-			</element>
-		</element>
-	</start>
-	<define name="style-font-face">
-		<element name="style:font-face">
-			<ref name="style-font-face-attlist"/>
-		</element>
-	</define>
-	<define name="style-font-face-attlist">
-		<interleave>
-			<optional>
-				<attribute name="svg:ascent">
-					<ref name="integer"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:descent">
-					<ref name="integer"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:widths">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:bbox">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:ideographic">
-					<ref name="integer"/>
-				</attribute>
-			</optional>
-			<attribute name="style:name">
-				<ref name="string"/>
-			</attribute>
-		</interleave>
-	</define>
-	<define name="string">
-		<data type="string"/>
-	</define>
-	<define name="integer">
-		<data type="integer"/>
-	</define>
-</grammar>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test11.xml b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test11.xml
deleted file mode 100644
index d272fd4e3e..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test11.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-                 xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
-                 office:version="1.2"
-                 office:mimetype="application/vnd.oasis.opendocument.text">
-   <office:font-face-decls>
-      <style:font-face style:name="LucidaSans"/>
-   </office:font-face-decls>
-   <office:body>
-      <office:text/>
-   </office:body>
-</office:document>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test12.rng b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test12.rng
deleted file mode 100644
index a0e79a356e..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test12.rng
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<grammar
-	xmlns="http://relaxng.org/ns/structure/1.0"
-	xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-	xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
-	xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0"
->
-	<start>
-		<element name="office:document">
-			<attribute name="office:version">
-				<value>1.2</value>
-			</attribute>
-			<attribute name="office:mimetype">
-				<data type="string"/>
-			</attribute>
-			<element name="office:styles">
-				<interleave>
-					<element name="style:default-style">
-						<ref name="style-style-content"/>
-					</element>
-				</interleave>
-			</element>
-			<element name="office:body">
-				<element name="office:text">
-					<empty/>
-				</element>
-			</element>
-		</element>
-	</start>
-	<define name="style-style-content">
-		<group>
-			<attribute name="style:family">
-				<value>text</value>
-			</attribute>
-			<element name="style:text-properties">
-				<ref name="style-text-properties-attlist"/>
-			</element>
-		</group>
-	</define>
-	<define name="style-text-properties-attlist">
-		<interleave>
-			<optional>
-				<attribute name="style:text-line-through-text">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:font-name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:font-name-asian">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:font-name-complex">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="fo:font-family">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:font-family-asian">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:font-family-complex">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:font-style-name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:font-style-name-asian">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:font-style-name-complex">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="string">
-		<data type="string"/>
-	</define>
-</grammar>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test12.xml b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test12.xml
deleted file mode 100644
index a3f2a5d725..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test12.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-                 xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
-                 office:version="1.2"
-                 office:mimetype="application/vnd.oasis.opendocument.text">
-   <office:styles>
-      <style:default-style style:family="text">
-         <style:text-properties>
-         </style:text-properties>
-      </style:default-style>
-   </office:styles>
-   <office:body>
-      <office:text/>
-   </office:body>
-</office:document>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test13.rng b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test13.rng
deleted file mode 100644
index 47a2161ed9..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test13.rng
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<grammar
-	xmlns="http://relaxng.org/ns/structure/1.0"
-	datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
-	xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-	xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
-	xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
->
-	<start>
-		<element name="office:document">
-			<attribute name="office:version">
-				<value>1.2</value>
-			</attribute>
-			<attribute name="office:mimetype">
-				<data type="string"/>
-			</attribute>
-			<ref name="office-styles"/>
-			<element name="office:body">
-				<element name="office:text">
-					<empty/>
-				</element>
-			</element>
-		</element>
-	</start>
-	<define name="office-styles">
-		<element name="office:styles">
-			<interleave>
-				<interleave>
-					<ref name="style-style"/>
-					<ref name="text-list-style"/>
-				</interleave>
-				<ref name="text-outline-style"/>
-			</interleave>
-		</element>
-	</define>
-	<define name="style-style">
-		<element name="style:style">
-			<attribute name="style:name">
-				<ref name="styleName"/>
-			</attribute>
-			<attribute name="style:family">
-				<value>text</value>
-			</attribute>
-		</element>
-	</define>
-	<define name="text-list-style">
-		<element name="text:list-style">
-			<attribute name="style:name">
-				<ref name="styleName"/>
-			</attribute>
-		</element>
-	</define>
-	<define name="text-outline-style">
-		<element name="text:outline-style">
-			<attribute name="style:name">
-				<ref name="styleName"/>
-			</attribute>
-			<element name="text:outline-level-style">
-				<attribute name="text:level">
-					<data type="positiveInteger"/>
-				</attribute>
-			</element>
-		</element>
-	</define>
-	<define name="string">
-		<data type="string"/>
-	</define>
-	<define name="styleName">
-		<data type="NCName"/>
-	</define>
-</grammar>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test13.xml b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test13.xml
deleted file mode 100644
index 8f46daa4ce..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test13.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-                 xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
-                 xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
-                 office:version="1.2"
-                 office:mimetype="application/vnd.oasis.opendocument.text">
-   <office:styles>
-      <style:style style:name="Formula" style:family="text"/>
-      <text:outline-style style:name="Outline">
-         <text:outline-level-style text:level="1"/>
-      </text:outline-style>
-      <text:list-style style:name="Numbering_20_1"/>
-   </office:styles>
-   <office:body>
-      <office:text/>
-   </office:body>
-</office:document>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test14.rng b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test14.rng
deleted file mode 100644
index 61a8c9e2b4..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test14.rng
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<grammar
-	xmlns="http://relaxng.org/ns/structure/1.0"
-	datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
-	xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-	xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
-	xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
->
-	<start>
-		<element name="office:document">
-			<attribute name="office:version">
-				<value>1.2</value>
-			</attribute>
-			<attribute name="office:mimetype">
-				<data type="string"/>
-			</attribute>
-			<ref name="office-automatic-styles"/>
-			<element name="office:body">
-				<element name="office:text">
-					<empty/>
-				</element>
-			</element>
-		</element>
-	</start>
-	<define name="office-automatic-styles">
-		<element name="office:automatic-styles">
-			<interleave>
-				<element name="style:style">
-					<attribute name="style:name">
-						<data type="NCName"/>
-					</attribute>
-					<attribute name="style:family">
-						<value>table</value>
-					</attribute>
-				</element>
-				<choice>
-					<empty/>
-					<element name="text:list-style">
-						<empty/>
-					</element>
-				</choice>
-			</interleave>
-		</element>
-	</define>
-</grammar>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test14.xml b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test14.xml
deleted file mode 100644
index 6c16a1d614..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test14.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-                 xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
-                 office:version="1.2"
-                 office:mimetype="application/vnd.oasis.opendocument.text">
-   <office:automatic-styles>
-      <style:style style:name="NamespaceTable" style:family="table"/>
-   </office:automatic-styles>
-   <office:body>
-      <office:text/>
-   </office:body>
-</office:document>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test15.rng b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test15.rng
deleted file mode 100644
index 63557c6e2b..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test15.rng
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<grammar
-	xmlns="http://relaxng.org/ns/structure/1.0"
-	datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
-	xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-	xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
-	xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
-	xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
->
-	<start>
-		<element name="office:document">
-			<attribute name="office:version">
-				<value>1.2</value>
-			</attribute>
-			<attribute name="office:mimetype">
-				<data type="string"/>
-			</attribute>
-			<ref name="office-automatic-styles"/>
-			<element name="office:body">
-				<element name="office:text">
-					<empty/>
-				</element>
-			</element>
-		</element>
-	</start>
-	<define name="office-automatic-styles">
-		<element name="office:automatic-styles">
-			<interleave>
-				<oneOrMore>
-					<choice>
-						<empty/>
-						<element name="number:boolean-style">
-							<attribute name="style:name">
-								<data type="NCName"/>
-							</attribute>
-						</element>
-					</choice>
-				</oneOrMore>
-				<element name="number:text-style">
-					<attribute name="style:name">
-						<data type="NCName"/>
-					</attribute>
-				</element>
-			</interleave>
-		</element>
-	</define>
-</grammar>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test15.xml b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test15.xml
deleted file mode 100644
index 4d8361aaa6..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test15.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-                 xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
-                 xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
-                 office:version="1.2"
-                 office:mimetype="application/vnd.oasis.opendocument.text">
-   <office:automatic-styles>
-      <number:boolean-style style:name="N99">
-      </number:boolean-style>
-      <number:text-style style:name="N100">
-      </number:text-style>
-      <number:boolean-style style:name="N5099">
-      </number:boolean-style>
-   </office:automatic-styles>
-   <office:body>
-      <office:text/>
-   </office:body>
-</office:document>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test16.rng b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test16.rng
deleted file mode 100644
index 32c6cb8e2c..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test16.rng
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<grammar
-	xmlns="http://relaxng.org/ns/structure/1.0"
-	datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
-	xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-	xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
-	xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
->
-	<start>
-		<element name="office:document">
-			<attribute name="office:version">
-				<value>1.2</value>
-			</attribute>
-			<attribute name="office:mimetype">
-				<data type="string"/>
-			</attribute>
-			<element name="office:automatic-styles">
-				<ref name="styles"/>
-			</element>
-			<element name="office:body">
-				<element name="office:text">
-					<empty/>
-				</element>
-			</element>
-		</element>
-	</start>
-	<define name="styles">
-		<interleave>
-			<choice>
-				<empty/>
-				<oneOrMore>
-					<element name="number:boolean-style">
-						<attribute name="style:name">
-							<data type="NCName"/>
-						</attribute>
-					</element>
-				</oneOrMore>
-			</choice>
-			<element name="number:text-style">
-				<attribute name="style:name">
-					<data type="NCName"/>
-				</attribute>
-			</element>
-		</interleave>
-	</define>
-</grammar>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test16.xml b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test16.xml
deleted file mode 100644
index 4d8361aaa6..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test16.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-                 xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
-                 xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
-                 office:version="1.2"
-                 office:mimetype="application/vnd.oasis.opendocument.text">
-   <office:automatic-styles>
-      <number:boolean-style style:name="N99">
-      </number:boolean-style>
-      <number:text-style style:name="N100">
-      </number:text-style>
-      <number:boolean-style style:name="N5099">
-      </number:boolean-style>
-   </office:automatic-styles>
-   <office:body>
-      <office:text/>
-   </office:body>
-</office:document>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test17.rng b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test17.rng
deleted file mode 100644
index ffcd9bd4f9..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test17.rng
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<grammar
-	xmlns="http://relaxng.org/ns/structure/1.0"
-	xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-	xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
->
-	<start>
-		<element name="office:document">
-			<attribute name="office:version">
-				<value>1.2</value>
-			</attribute>
-			<attribute name="office:mimetype">
-				<data type="string"/>
-			</attribute>
-			<ref name="office-body"/>
-		</element>
-	</start>
-	<define name="office-body">
-		<element name="office:body">
-			<element name="office:text">
-				<element name="text:p">
-					<zeroOrMore>
-						<ref name="paragraph-content"/>
-					</zeroOrMore>
-				</element>
-			</element>
-		</element>
-	</define>
-	<define name="paragraph-content">
-		<choice>
-			<text/>
-			<element name="text:conditional-text">
-				<ref name="text-conditional-text-attlist"/>
-				<text/>
-			</element>
-		</choice>
-	</define>
-	<define name="text-conditional-text-attlist">
-		<interleave>
-			<attribute name="text:condition">
-				<data type="string"/>
-			</attribute>
-			<attribute name="text:string-value-if-true">
-				<data type="string"/>
-			</attribute>
-			<attribute name="text:string-value-if-false">
-				<data type="string"/>
-			</attribute>
-		</interleave>
-	</define>
-</grammar>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test17.xml b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test17.xml
deleted file mode 100644
index 0947bff2b1..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test17.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-                 xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
-                 xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
-                 office:version="1.2"
-                 office:mimetype="application/vnd.oasis.opendocument.text">
-   <office:body>
-      <office:text>
-         <text:p>
-            <text:conditional-text text:condition="test"
-                text:string-value-if-true="a"
-                text:string-value-if-false="" />
-            03
-         </text:p>
-      </office:text>
-   </office:body>
-</office:document>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test18.rng b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test18.rng
deleted file mode 100644
index 9ddbb9baaf..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test18.rng
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<grammar xmlns="http://relaxng.org/ns/structure/1.0"
-	datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
-	xmlns:manifest="urn:oasis:names:tc:opendocument:xmlns:manifest:1.0"
->
-	<start>
-		<element name="manifest:manifest">
-			<attribute name="manifest:version">
-				<value>1.2</value>
-			</attribute>
-			<oneOrMore>
-				<element name="manifest:file-entry">
-					<interleave>
-						<attribute name="manifest:full-path">
-							<data type="string"/>
-						</attribute>
-						<attribute name="manifest:media-type">
-							<data type="string"/>
-						</attribute>
-					</interleave>
-				</element>
-			</oneOrMore>
-		</element>
-	</start>
-</grammar>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test18.xml b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test18.xml
deleted file mode 100644
index cc6ab02761..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test18.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<manifest:manifest xmlns:manifest="urn:oasis:names:tc:opendocument:xmlns:manifest:1.0" manifest:version="1.2" >
- <manifest:file-entry manifest:media-type="a" manifest:full-path="a"/>
- <manifest:file-entry manifest:media-type="a" manifest:full-path="a"/>
- <manifest:file-entry manifest:media-type="a" manifest:full-path="a"/>
-</manifest:manifest>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test19.rng b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test19.rng
deleted file mode 100644
index ac676d982d..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test19.rng
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<grammar
-	xmlns="http://relaxng.org/ns/structure/1.0"
-	xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-	xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
->
-	<start>
-		<element name="office:document">
-			<attribute name="office:version">
-				<value>1.2</value>
-			</attribute>
-			<attribute name="office:mimetype">
-				<data type="string"/>
-			</attribute>
-			<ref name="office-body"/>
-		</element>
-	</start>
-	<define name="office-body">
-		<element name="office:body">
-			<element name="office:text">
-				<element name="text:p">
-					<oneOrMore>
-						<ref name="paragraph-content"/>
-					</oneOrMore>
-				</element>
-			</element>
-		</element>
-	</define>
-	<define name="paragraph-content">
-		<choice>
-			<element>
-				<choice>
-					<name>text:reference-ref</name>
-					<name>text:bookmark-ref</name>
-				</choice>
-				<empty/>
-			</element>
-			<element name="text:span">
-				<empty/>
-			</element>
-		</choice>
-	</define>
-</grammar>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test19.xml b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test19.xml
deleted file mode 100644
index c562015a37..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test19.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-                 xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
-                 office:version="1.2"
-                 office:mimetype="application/vnd.oasis.opendocument.text">
-	<office:body>
-		<office:text>
-			<text:p><text:reference-ref/><text:span/></text:p>
-		</office:text>
-	</office:body>
-</office:document>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test20.rng b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test20.rng
deleted file mode 100644
index bd6b4e0f05..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test20.rng
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<grammar
-	xmlns="http://relaxng.org/ns/structure/1.0"
-	xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-	xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
-	datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
->
-	<start>
-		<element name="office:document-content">
-			<attribute name="office:version">
-				<value>1.2</value>
-			</attribute>
-			<ref name="office-body"/>
-		</element>
-	</start>
-	<define name="office-body">
-		<element name="office:body">
-			<element name="office:text">
-				<element name="text:p">
-					<zeroOrMore>
-						<choice>
-							<text/>
-							<element name="text:s">
-								<empty/>
-							</element>
-						</choice>
-					</zeroOrMore>
-				</element>
-			</element>
-		</element>
-	</define>
-</grammar>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test20.xml b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test20.xml
deleted file mode 100644
index e28b855386..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test20.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<office:document-content
-  xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-  xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
-  office:version="1.2">
-  <office:body>
-    <office:text>
-      <text:p>,<text:s/>,</text:p>
-    </office:text>
-  </office:body>
-</office:document-content>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test21.rng b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test21.rng
deleted file mode 100644
index 032886009d..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test21.rng
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<grammar
-	xmlns="http://relaxng.org/ns/structure/1.0"
-	xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-	xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
->
-	<start>
-		<element name="office:document-content">
-			<attribute name="office:version">
-				<value>1.2</value>
-			</attribute>
-			<ref name="office-body"/>
-		</element>
-	</start>
-	<define name="office-body">
-		<element name="office:body">
-			<element name="office:text">
-				<element name="text:p">
-					<zeroOrMore>
-						<ref name="paragraph-content"/>
-					</zeroOrMore>
-				</element>
-			</element>
-		</element>
-	</define>
-	<define name="paragraph-content">
-		<choice>
-			<text/>
-			<element name="text:bibliography-mark">
-				<attribute name="text:bibliography-type">
-					<value>misc</value>
-				</attribute>
-				<zeroOrMore>
-					<attribute>
-						<choice>
-							<name>text:url</name>
-							<name>text:custom5</name>
-							<name>text:year</name>
-						</choice>
-						<data type="string"/>
-					</attribute>
-				</zeroOrMore>
-				<text/>
-			</element>
-		</choice>
-	</define>
-</grammar>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test21.xml b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test21.xml
deleted file mode 100644
index fec92948f9..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test21.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<office:document-content
-  xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-  xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
-  office:version="1.2">
-  <office:body>
-    <office:text>
-      <text:p><text:bibliography-mark text:bibliography-type="misc" text:year="F" text:url="h" text:custom5="i"/></text:p>
-    </office:text>
-  </office:body>
-</office:document-content>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test22.rng b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test22.rng
deleted file mode 100644
index 154c810975..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test22.rng
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<grammar
-	xmlns="http://relaxng.org/ns/structure/1.0"
-	xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-	xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
-	datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
->
-	<start>
-		<element name="office:document">
-			<attribute name="office:version">
-				<value>1.2</value>
-			</attribute>
-			<attribute name="office:mimetype">
-				<data type="string"/>
-			</attribute>
-			<ref name="office-body"/>
-		</element>
-	</start>
-	<define name="office-body">
-		<element name="office:body">
-			<element name="office:text">
-				<element name="text:list">
-					<optional>
-						<attribute name="xml:id">
-							<data type="ID"/>
-						</attribute>
-					</optional>
-				</element>
-			</element>
-		</element>
-	</define>
-</grammar>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test22.xml b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test22.xml
deleted file mode 100644
index dd84419d66..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test22.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-                 xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
-                 office:version="1.2"
-                 office:mimetype="application/vnd.oasis.opendocument.text">
-   <office:body>
-      <office:text>
-         <text:list xml:id="l"/>
-      </office:text>
-   </office:body>
-</office:document>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test23.rng b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test23.rng
deleted file mode 100644
index 1a02206d04..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test23.rng
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<grammar 
-    xmlns="http://relaxng.org/ns/structure/1.0"
-    datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
-    xmlns:manifest="urn:oasis:names:tc:opendocument:xmlns:manifest:1.0">
-<define name="manifest">
-    <element name="manifest:manifest">
-        <oneOrMore>
-            <ref name="file-entry"/>
-        </oneOrMore>
-    </element>
-</define>
-<start>
-    <choice>
-        <ref name="manifest"/>
-    </choice>
-</start>
-<define name="file-entry">
-    <element name="manifest:file-entry">
-        <ref name="file-entry-attlist"/>
-    </element>
-</define>
-<define name="file-entry-attlist" combine="interleave">
-    <attribute name="manifest:full-path">
-        <data type="string"/>
-    </attribute>
-</define>
-<define name="file-entry-attlist" combine="interleave">
-    <attribute name="manifest:media-type">
-        <data type="string"/>
-    </attribute>
-</define>
-</grammar>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test23.xml b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test23.xml
deleted file mode 100644
index b622196b05..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test23.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<manifest:manifest xmlns:manifest="urn:oasis:names:tc:opendocument:xmlns:manifest:1.0">
- <manifest:file-entry manifest:media-type="text/xml" manifest:full-path="settings.xml"/>
-</manifest:manifest>
diff --git a/apps/files_odfviewer/src/webodf/webodf/roundtripodf.js b/apps/files_odfviewer/src/webodf/webodf/roundtripodf.js
deleted file mode 100644
index 6d16d1b2a3..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/roundtripodf.js
+++ /dev/null
@@ -1,71 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global runtime: true, core: true, odf: true*/
-runtime.loadClass("odf.OdfContainer");
-
-/**
- * If the state of the OdfContainer is invalid, exit with an error message.
- */
-function exitOnInvalid(odffilepath, odfcontainer) {
-    "use strict";
-    if (odfcontainer.state === odf.OdfContainer.INVALID) {
-        runtime.log("Document " + odffilepath + " is invalid.");
-        runtime.exit(1);
-    }
-    if (odfcontainer.state === odf.OdfContainer.DONE) {
-        odfcontainer.save(function (err) {
-            if (err) {
-                runtime.log(err);
-                runtime.exit(1);
-            }
-        });
-    }
-}
-
-/**
- * Load an ODF document. Report an error if there is a problem.
- */
-function loadODF(odffilepath) {
-    "use strict";
-    var odfcontainer = new odf.OdfContainer(odffilepath);
-    odfcontainer.onstatereadychange = function () {
-        exitOnInvalid(odffilepath, odfcontainer);
-    };
-    exitOnInvalid(odffilepath, odfcontainer);
-}
-
-// loop over arguments to load ODF
-var i;
-for (i = 1; i < arguments.length; i += 1) {
-    loadODF(arguments[i]);
-}
diff --git a/apps/files_odfviewer/src/webodf/webodf/roundtripzip.js b/apps/files_odfviewer/src/webodf/webodf/roundtripzip.js
deleted file mode 100644
index d3fe17fc81..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/roundtripzip.js
+++ /dev/null
@@ -1,64 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global runtime: true, core: true*/
-runtime.loadClass("core.Zip");
-
-/**
- * Load an ODF document. Report an error if there is a problem.
- */
-function roundTripZip(zipfilepath) {
-    "use strict";
-    var zip = new core.Zip(zipfilepath, function (err, zip) {
-        if (err) {
-            runtime.log(err);
-            runtime.exit(1);
-        }
-        // the TOC of the zip is loaded at this point
-        // now we want to load all parts in memory so we can save them again
-        zip.write(function (err) {
-            if (err) {
-                runtime.log(err);
-                runtime.exit(1);
-            }
-            // at this point a zip file should have been written with the same
-            // contents as the one that was read
-            runtime.exit(0);
-        });
-    });
-}
-
-// loop over arguments to load ODF
-var i;
-for (i = 1; i < arguments.length; i += 1) {
-    roundTripZip(arguments[i]);
-}
diff --git a/apps/files_odfviewer/src/webodf/webodf/styleNameRef b/apps/files_odfviewer/src/webodf/webodf/styleNameRef
deleted file mode 100644
index 39b2914746..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/styleNameRef
+++ /dev/null
@@ -1,272 +0,0 @@
-# cat styles.xml|xmlstarlet sel -N style=urn:oasis:names:tc:opendocument:xmlns:style:1.0 -t -m "//*[@style:family='graphic']/@style:name" -v . -
-
-gradient
-	draw:fill-gradient-name	style:drawing-page-properties
-	draw:fill-gradient-name	style:graphic-properties
-
-hatch
-	draw:fill-hatch-name	style:drawing-page-properties
-	draw:fill-hatch-name	style:graphic-properties
-
-fill-image
-	draw:fill-image-name	style:drawing-page-properties
-	draw:fill-image-name	style:graphic-properties
-
-marker
-	draw:marker-end	style:graphic-properties
-	draw:marker-start	style:graphic-properties
-
-dash
-	draw:stroke-dash	style:graphic-properties
-
-opacity
-	draw:opacity-name	style:drawing-page-properties
-	draw:opacity-name	style:graphic-properties
-
-master page
-	draw:master-page-name	draw:page
-	style:master-page-name	style:style
-	style:next-style-name	style:master-page
-	text:master-page-name	text:notes-configuration
-	text:master-page-name	text:page
-
-presentation-page-layout
-	presentation:presentation-page-layout-name	draw:page
-	presentation:presentation-page-layout-name	draw:handout-master
-
-page-layout
-	style:page-layout-name	presentation:notes
-	style:page-layout-name	style:handout-master
-	style:page-layout-name	style:master-page
-
-list
-	text:style-name	text:list
-	text:style-name	text:numbered-paragraph
-	text:style-override	text:list-item
-	style:list-style-name	style:style
-
-data
-	style:data-style-name	style:style
-	style:percentage-data-style-name	style:style
-	style:data-style-name	presentation:date-time-decl
-	style:data-style-name	text:creation-date
-	style:data-style-name	text:creation-time
-	style:data-style-name	text:database-display
-	style:data-style-name	text:date
-	style:data-style-name	text:editing-duration
-	style:data-style-name	text:expression
-	style:data-style-name	text:meta-field
-	style:data-style-name	text:modification-date
-	style:data-style-name	text:modification-time
-	style:data-style-name	text:print-date
-	style:data-style-name	text:print-time
-	style:data-style-name	text:table-formula
-	style:data-style-name	text:time
-	style:data-style-name	text:user-defined
-	style:data-style-name	text:user-field-get
-	style:data-style-name	text:user-field-input
-	style:data-style-name	text:variable-get
-	style:data-style-name	text:variable-input
-	style:data-style-name	text:variable-set
-
-chart
-	chart:style-name	chart:axis
-	chart:style-name	chart:chart
-	chart:style-name	chart:data-label
-	chart:style-name	chart:data-point
-	chart:style-name	chart:equation
-	chart:style-name	chart:error-indicator
-	chart:style-name	chart:floor
-	chart:style-name	chart:footer
-	chart:style-name	chart:grid
-	chart:style-name	chart:legend
-	chart:style-name	chart:mean-value
-	chart:style-name	chart:plot-area
-	chart:style-name	chart:regression-curve
-	chart:style-name	chart:series
-	chart:style-name	chart:stock-gain-marker
-	chart:style-name	chart:stock-loss-marker
-	chart:style-name	chart:stock-range-line
-	chart:style-name	chart:subtitle
-	chart:style-name	chart:title
-	chart:style-name	chart:wall
-
-----
-
-drawing-page
-	draw:style-name	draw:page
-	draw:style-name	presentation:notes
-	draw:style-name	style:handout-master
-	draw:style-name	style:master-page
-
-graphic
-	draw:style-name	dr3d:cube
-	draw:style-name	dr3d:extrude
-	draw:style-name	dr3d:rotate
-	draw:style-name	dr3d:scene
-	draw:style-name	dr3d:sphere
-	draw:style-name	draw:caption
-	draw:style-name	draw:circle
-	draw:style-name	draw:connector
-	draw:style-name	draw:control
-	draw:style-name	draw:custom-shape
-	draw:style-name	draw:ellipse
-	draw:style-name	draw:frame
-	draw:style-name	draw:g
-	draw:style-name	draw:line
-	draw:style-name	draw:measure
-	draw:style-name	draw:page-thumbnail
-	draw:style-name	draw:path
-	draw:style-name	draw:polygon
-	draw:style-name	draw:polyline
-	draw:style-name	draw:rect
-	draw:style-name	draw:regular-polygon
-	draw:style-name	office:annotation
-
-paragraph
-	draw:text-style-name	draw:caption
-	draw:text-style-name	draw:circle
-	draw:text-style-name	draw:connector
-	draw:text-style-name	draw:control
-	draw:text-style-name	draw:custom-shape
-	draw:text-style-name	draw:ellipse
-	draw:text-style-name	draw:frame
-	draw:text-style-name	draw:line
-	draw:text-style-name	draw:measure
-	draw:text-style-name	draw:path
-	draw:text-style-name	draw:polygon
-	draw:text-style-name	draw:polyline
-	draw:text-style-name	draw:rect
-	draw:text-style-name	draw:regular-polygon
-	draw:text-style-name	office:annotation
-	form:text-style-name	form:column
-	style:next-style-name	style:style
-	table:paragraph-style-name	table:body
-	table:paragraph-style-name	table:even-columns
-	table:paragraph-style-name	table:even-rows
-	table:paragraph-style-name	table:first-column
-	table:paragraph-style-name	table:first-row
-	table:paragraph-style-name	table:last-column
-	table:paragraph-style-name	table:last-row
-	table:paragraph-style-name	table:odd-columns
-	table:paragraph-style-name	table:odd-rows
-	text:default-style-name	text:notes-configuration
-	text:style-name	text:alphabetical-index-entry-template
-	text:style-name	text:bibliography-entry-template
-	text:style-name	text:h
-	text:style-name	text:illustration-index-entry-template
-	text:style-name	text:index-source-style
-	text:style-name	text:object-index-entry-template
-	text:style-name	text:p
-	text:style-name	text:table-index-entry-template
-	text:style-name	text:table-of-content-entry-template
-	text:style-name	text:table-index-entry-template
-	text:style-name	text:user-index-entry-template
-	style:register-truth-ref-style-name	style:page-layout-properties
-
-presentation
-	presentation:style-name	dr3d:cube
-	presentation:style-name	dr3d:extrude
-	presentation:style-name	dr3d:rotate
-	presentation:style-name	dr3d:scene
-	presentation:style-name	dr3d:sphere
-	presentation:style-name	draw:caption
-	presentation:style-name	draw:circle
-	presentation:style-name	draw:connector
-	presentation:style-name	draw:control
-	presentation:style-name	draw:custom-shape
-	presentation:style-name	draw:ellipse
-	presentation:style-name	draw:frame
-	presentation:style-name	draw:g
-	presentation:style-name	draw:line
-	presentation:style-name	draw:measure
-	presentation:style-name	draw:page-thumbnail
-	presentation:style-name	draw:path
-	presentation:style-name	draw:polygon
-	presentation:style-name	draw:polyline
-	presentation:style-name	draw:rect
-	presentation:style-name	draw:regular-polygon
-	presentation:style-name	office:annotation
-
-ruby
-	text:style-name	text:ruby
-
-section
-	text:style-name	text:alphabetical-index
-	text:style-name	text:bibliography
-	text:style-name	text:illustration-index
-	text:style-name	text:index-title
-	text:style-name	text:object-index
-	text:style-name	text:section
-	text:style-name	text:table-of-content
-	text:style-name	text:table-index
-	text:style-name	text:user-index
-
-table-cell
-	db:default-cell-style-name	db:column
-	table:default-cell-style-name	table:table-column
-	table:default-cell-style-name	table:table-row
-	table:style-name	table:body
-	table:style-name	table:covered-table-cell
-	table:style-name	table:even-columns
-	table:style-name	table:covered-table-cell
-	table:style-name	table:even-columns
-	table:style-name	table:even-rows
-	table:style-name	table:first-column
-	table:style-name	table:first-row
-	table:style-name	table:last-column
-	table:style-name	table:last-row
-	table:style-name	table:odd-columns
-	table:style-name	table:odd-rows
-	table:style-name	table:table-cell
-
-table-row
-	db:default-row-style-name	db:query
-	db:default-row-style-name	db:table-representation
-	table:style-name	table:table-row
-
-table-column
-	db:style-name	db:column
-	table:style-name	table:table-column
-
-table
-	db:style-name	db:query
-	db:style-name	db:table-representation
-	table:style-name	table:background
-	table:style-name	table:table
-
-text
-	style:leader-text-style	style:tab-stop
-	style:style-name	style:drop-cap
-	text:citation-body-style-name	text:notes-configuration
-	text:citation-style-name	text:notes-configuration
-	text:style-name	text:a
-	text:style-name	text:alphabetical-index
-	text:style-name	text:linenumbering-configuration
-	text:style-name	text:list-level-style-number
-	text:style-name	text:ruby-text
-	text:style-name	text:span
-	text:visited-style-name	text:a
-	style:text-line-through-text-style	style:text-properties
-	text:main-entry-style-name	text:alphabetical-index-source
-	text:style-name	text:index-entry-bibliography
-	text:style-name	text:index-entry-chapter
-	text:style-name	text:index-entry-link-end
-	text:style-name	text:index-entry-link-start
-	text:style-name	text:index-entry-page-number
-	text:style-name	text:index-entry-span
-	text:style-name	text:index-entry-tab-stop
-	text:style-name	text:index-entry-text
-	text:style-name	text:index-title-template
-	text:style-name	text:list-level-style-bullet
-	text:style-name	text:outline-level-style
-
-
----
-
-conditional style
-	text:cond-style-name	text:h
-	text:cond-style-name	text:p
-
-style:apply-style-name # complicated!
-style:parent-style-name # complicated!
diff --git a/apps/files_odfviewer/src/webodf/webodf/styleNameRefs b/apps/files_odfviewer/src/webodf/webodf/styleNameRefs
deleted file mode 100644
index e63e3562df..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/styleNameRefs
+++ /dev/null
@@ -1,57 +0,0 @@
-dash
-	draw:stroke-dash-names	style:graphic-properties
-
-graphic
-	draw:class-names	dr3d:cube
-	draw:class-names	dr3d:extrude
-	draw:class-names	dr3d:rotate
-	draw:class-names	dr3d:scene
-	draw:class-names	dr3d:sphere
-	draw:class-names	draw:caption
-	draw:class-names	draw:circle
-	draw:class-names	draw:connector
-	draw:class-names	draw:control
-	draw:class-names	draw:custom-shape
-	draw:class-names	draw:ellipse
-	draw:class-names	draw:frame
-	draw:class-names	draw:g
-	draw:class-names	draw:line
-	draw:class-names	draw:measure
-	draw:class-names	draw:page-thumbnail
-	draw:class-names	draw:path
-	draw:class-names	draw:polygon
-	draw:class-names	draw:polyline
-	draw:class-names	draw:rect
-	draw:class-names	draw:regular-polygon
-	draw:class-names	office:annotation
-
-paragraph
-	text:class-names	text:h
-	text:class-names	text:p
-
-presentation
-	presentation:class-names	dr3d:cube
-	presentation:class-names	dr3d:extrude
-	presentation:class-names	dr3d:rotate
-	presentation:class-names	dr3d:scene
-	presentation:class-names	dr3d:sphere
-	presentation:class-names	draw:caption
-	presentation:class-names	draw:circle
-	presentation:class-names	draw:connector
-	presentation:class-names	draw:control
-	presentation:class-names	draw:custom-shape
-	presentation:class-names	draw:ellipse
-	presentation:class-names	draw:frame
-	presentation:class-names	draw:g
-	presentation:class-names	draw:line
-	presentation:class-names	draw:measure
-	presentation:class-names	draw:page-thumbnail
-	presentation:class-names	draw:path
-	presentation:class-names	draw:polygon
-	presentation:class-names	draw:polyline
-	presentation:class-names	draw:rect
-	presentation:class-names	draw:regular-polygon
-	presentation:class-names	office:annotation
-
-text
-	text:class-names	text:span
diff --git a/apps/files_odfviewer/src/webodf/webodf/testrelaxng.js b/apps/files_odfviewer/src/webodf/webodf/testrelaxng.js
deleted file mode 100644
index 875faa9de8..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/testrelaxng.js
+++ /dev/null
@@ -1,91 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global runtime: true, xmldom: true*/
-runtime.loadClass("xmldom.RelaxNG");
-runtime.loadClass("xmldom.RelaxNG2");
-
-function validate(relaxng, relaxng2, url) {
-    "use strict";
-    runtime.loadXML(url, function (err, dom) {
-        var walker;
-        if (err) {
-            runtime.log("Could not read " + url + ": " + err);
-        } else {
-            walker = dom.createTreeWalker(dom.firstChild, 0xFFFFFFFF);
-            relaxng.validate(walker, function (err) {
-                if (err) {
-                    var i;
-                    runtime.log("Found " + String(err.length) +
-                            " error validating " + url + ":");
-                    for (i = 0; i < err.length; i += 1) {
-                        runtime.log(err[i].message());
-                    }
-                }
-            });
-            relaxng2.validate(walker, function (err) {
-                if (err) {
-                    var i;
-                    runtime.log("Found " + String(err.length) +
-                            " error validating " + url + ":");
-                    for (i = 0; i < err.length; i += 1) {
-                        runtime.log(err[i].message());
-                    }
-                }
-            });
-        }
-    });
-}
-
-var args = arguments,
-    relaxngurl = args[1];
-
-// load and parse the Relax NG
-runtime.loadXML(relaxngurl, function (err, dom) {
-    "use strict";
-    var parser, i, relaxng, relaxng2;
-    if (err) {
-        return;
-    }
-    parser = new xmldom.RelaxNGParser();
-    relaxng = new xmldom.RelaxNG();
-    relaxng2 = new xmldom.RelaxNG2();
-    err = parser.parseRelaxNGDOM(dom, relaxng.makePattern);
-    relaxng.init(parser.rootPattern);
-    relaxng2.init(parser.start, parser.nsmap);
-
-    // loop over arguments to load ODF
-    for (i = 2; i < args.length; i += 1) {
-        runtime.log("Validating " + args[i] + " from " + relaxngurl);
-        validate(relaxng, relaxng2, args[i]);
-    }
-});
diff --git a/apps/files_odfviewer/src/webodf/webodf/tests/core/Base64Tests.js b/apps/files_odfviewer/src/webodf/webodf/tests/core/Base64Tests.js
deleted file mode 100644
index 10156a1dc4..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/tests/core/Base64Tests.js
+++ /dev/null
@@ -1,105 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global core: true, runtime: true*/
-runtime.loadClass("core.Base64");
-/**
- * @constructor
- * @param runner {UnitTestRunner}
- * @implements {core.UnitTest}
- */
-core.Base64Tests = function Base64Tests(runner) {
-    "use strict";
-    var t, r = runner, base64 = new core.Base64();
-
-    function testConvertByteArrayToBase64() {
-        t.encoded = base64.convertByteArrayToBase64([65]);
-        r.shouldBe(t, "t.encoded", "'QQ=='");
-        t.encoded = base64.convertByteArrayToBase64([65, 65]);
-        r.shouldBe(t, "t.encoded", "'QUE='");
-        t.encoded = base64.convertByteArrayToBase64([65, 65, 65]);
-        r.shouldBe(t, "t.encoded", "'QUFB'");
-    }
-
-    function testToBase64() {
-        t.encoded = base64.toBase64("A");
-        r.shouldBe(t, "t.encoded", "'QQ=='");
-        t.encoded = base64.toBase64("AA");
-        r.shouldBe(t, "t.encoded", "'QUE='");
-        t.encoded = base64.toBase64("AAA");
-        r.shouldBe(t, "t.encoded", "'QUFB'");
-    }
-
-    function testConvertUTF8StringToUTF16String(callback) {
-        var bin = "1234567890";
-        while (bin.length < 100000) {
-            bin += bin;
-        }
-        t.numcallbacks = 0;
-        base64.convertUTF8StringToUTF16String(bin, function (str, done) {
-            t.numcallbacks += 1;
-            t.done = done;
-            if (t.numcallbacks === 1) {
-                r.shouldBe(t, "t.done", "false");
-            } else {
-                r.shouldBe(t, "t.done", "true");
-            }
-            if (done) {
-                r.shouldBe(t, "t.numcallbacks", "2");
-                t.str = str;
-                t.bin = bin;
-                r.shouldBe(t, "t.str.length", "t.bin.length");
-                callback();
-            }
-            return true;
-        });
-    }
-
-    this.setUp = function () {
-        t = {};
-    };
-    this.tearDown = function () {
-        t = {};
-    };
-    this.tests = function () {
-        return [
-            testConvertByteArrayToBase64,
-            testToBase64
-        ];
-    };
-    this.asyncTests = function () {
-        return [ testConvertUTF8StringToUTF16String ];
-    };
-    this.description = function () {
-        return "Test the Base64 class.";
-    };
-};
diff --git a/apps/files_odfviewer/src/webodf/webodf/tests/core/CursorTests.js b/apps/files_odfviewer/src/webodf/webodf/tests/core/CursorTests.js
deleted file mode 100644
index c9f7be78a6..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/tests/core/CursorTests.js
+++ /dev/null
@@ -1,238 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global core: true, runtime: true*/
-runtime.loadClass("core.Cursor");
-
-/**
- * @constructor
- * @param {core.UnitTestRunner} runner
- * @implements {core.UnitTest}
- */
-core.CursorTests = function CursorTests(runner) {
-    "use strict";
-    var r = runner, tests, t = {},
-        maindoc = runtime.getWindow().document,
-        testarea = maindoc.getElementById("testarea");
-    /**
-     * @param {Selection} selection
-     * @param {Node} startnode
-     * @param {number} startoffset
-     * @param {Node=} endnode
-     * @param {number=} endoffset
-     * @return {undefined}
-     */
-    function setSelection(selection, startnode, startoffset, endnode,
-            endoffset) {
-        // call createRange() on the document, even if startnode is the document
-        var range = (startnode.ownerDocument || startnode).createRange();
-        selection.removeAllRanges();
-        range.setStart(startnode, startoffset);
-        if (endnode) {
-            range.setEnd(endnode, endoffset);
-        } else {
-            range.setEnd(startnode, startoffset);
-        }
-        selection.addRange(range);
-        if (range.startContainer !== startnode) {
-            runtime.log("EVIL");
-        }
-    }
-
-    function setupEmptyRootNode() {
-        var selection = runtime.getWindow().getSelection(),
-            root = maindoc.createElementNS("", "p"),
-            cursor = new core.Cursor(selection, maindoc);
-        testarea.appendChild(root);
-        t = { selection: selection, root: root, cursor: cursor };
-        runner.shouldBeNonNull(t, "t.selection");
-    }
-
-    function setupSimpleTextDoc() {
-        setupEmptyRootNode();
-        t.textnode = maindoc.createTextNode("abc");
-        t.root.appendChild(t.textnode);
-    }
-
-    tests = [
-        // create a document, add a cursor and check that the cursor is present
-        function testOnEmptyNode1() {
-            // if the document is the container of the selection, the cursor
-            // can not be in the DOM
-            setupEmptyRootNode();
-            setSelection(t.selection, t.root, 0);
-            t.cursor.updateToSelection();
-            //r.shouldBeNull(t, "t.cursor.getNode().parentNode");
-        },
-        function testOnEmptyNode2() {
-            setupEmptyRootNode();
-            setSelection(t.selection, t.root, 0);
-       //     t.selection.focusNode = r.root;
-            var range = t.selection.getRangeAt(0);
-            t.cursor.updateToSelection();
-            r.shouldBeNonNull(t, "t.cursor.getNode().parentNode");
-            r.shouldBeNull(t, "t.cursor.getNode().previousSibling");
-            r.shouldBeNull(t, "t.cursor.getNode().nextSibling");
-        },
-        function testOnSimpleText() {
-            setupSimpleTextDoc();
-            // put the cursor at the start of the text node 
-            setSelection(t.selection, t.textnode, 0);
-            t.cursor.updateToSelection();
-            r.shouldBeNonNull(t, "t.cursor.getNode().parentNode");
-            r.shouldBeNull(t, "t.cursor.getNode().previousSibling");
-            r.shouldBe(t, "t.cursor.getNode().nextSibling.nodeValue", "'abc'");
-        },
-        function testOnSimpleText2() {
-            setupSimpleTextDoc();
-            // put the cursor in the middle of the text node 
-            setSelection(t.selection, t.textnode, 1);
-            t.cursor.updateToSelection();
-            r.shouldBeNonNull(t, "t.cursor.getNode().parentNode");
-            r.shouldBe(t, "t.cursor.getNode().previousSibling.nodeValue", "'a'");
-            r.shouldBe(t, "t.cursor.getNode().nextSibling.nodeValue", "'bc'");
-        },
-        function testOnSimpleText3() {
-            setupSimpleTextDoc();
-            // put the cursor at the end of the text node
-            setSelection(t.selection, t.textnode, 3);
-            t.cursor.updateToSelection();
-            r.shouldBeNonNull("t.cursor.getNode().parentNode");
-            r.shouldBe(t, "t.cursor.getNode().previousSibling.nodeValue", "'abc'");
-            r.shouldBeNull(t, "t.cursor.getNode().nextSibling");
-        },
-        function testOnSimpleText4() {
-            var textnode2;
-            setupSimpleTextDoc();
-            // put the cursor between 'a' and 'b', then change the selection to
-            // be between 'b' and 'c' and update the cursor
-            setSelection(t.selection, t.textnode, 1);
-            t.cursor.updateToSelection();
-            textnode2 = t.cursor.getNode().nextSibling;
-            setSelection(t.selection, textnode2, 1);
-            t.cursor.updateToSelection();
-            r.shouldBeNonNull(t, "t.cursor.getNode().parentNode");
-            r.shouldBe(t, "t.cursor.getNode().previousSibling.nodeValue", "'ab'");
-            r.shouldBe(t, "t.cursor.getNode().nextSibling.nodeValue", "'c'");
-        },
-        function testOnSimpleText5() {
-            var textnode2;
-            setupSimpleTextDoc();
-            // put the cursor between 'a' and 'b', then change the selection to
-            // span the entire text and update the cursor
-            setSelection(t.selection, t.textnode, 1);
-            t.cursor.updateToSelection();
-            textnode2 = t.cursor.getNode().nextSibling;
-            setSelection(t.selection, t.textnode, 0, textnode2, 2);
-            t.cursor.updateToSelection();
-            r.shouldBe(t, "t.selection.rangeCount", "1");
-// only null if working on a separate document
-//            r.shouldBeNull(t, "t.cursor.getNode().parentNode");
-            t.range = t.selection.getRangeAt(0);
-            r.shouldBe(t, "t.range.startContainer", "t.textnode");
-            r.shouldBe(t, "t.range.startOffset", "0");
-            r.shouldBe(t, "t.range.endContainer", "t.textnode");
-            r.shouldBe(t, "t.range.endOffset", "3");
-        },
-        function testOnSimpleText5b() {
-            var textnode2;
-            setupSimpleTextDoc();
-            setSelection(t.selection, t.textnode, 1);
-            t.cursor.updateToSelection();
-            textnode2 = t.cursor.getNode().nextSibling;
-            setSelection(t.selection, t.textnode.parentNode, 1, textnode2, 2);
-            t.cursor.updateToSelection();
-            r.shouldBe(t, "t.selection.rangeCount", "1");
-// only null if working on a separate document
-//            r.shouldBeNull(t, "t.cursor.getNode().parentNode");
-            t.range = t.selection.getRangeAt(0);
-            r.shouldBe(t, "t.range.startContainer", "t.textnode");
-            r.shouldBe(t, "t.range.startOffset", "1");
-            r.shouldBe(t, "t.range.endContainer", "t.textnode");
-            r.shouldBe(t, "t.range.endOffset", "3");
-        },
-        function testOnSimpleText6() {
-            var somenode, textnode2;
-            setupSimpleTextDoc();
-            // add a child node to the cursor
-            somenode = maindoc.createElement("p");
-            t.cursor.getNode().appendChild(somenode);
-            // select a single position so the cursor is put in the document
-            setSelection(t.selection, t.textnode, 1);
-            t.cursor.updateToSelection();
-            r.shouldBeNonNull(t, "t.cursor.getNode().parentNode");
-            textnode2 = t.cursor.getNode().nextSibling;
-            // select a range starting at the node in the cursor, but extends
-            // out of the the cursor
-            // this should have the result that the cursor is removed from the
-            // document and that the text nodes around the cursor are
-            // merged
-            setSelection(t.selection, somenode, 0, textnode2, 2);
-            t.cursor.updateToSelection();
-// only null if working on a separate document
-//            r.shouldBeNull(t, "t.cursor.getNode().parentNode");
-            t.range = t.selection.getRangeAt(0);
-            r.shouldBe(t, "t.range.startContainer", "t.textnode");
-            r.shouldBe(t, "t.range.startOffset", "1");
-            r.shouldBe(t, "t.range.endContainer", "t.textnode");
-            r.shouldBe(t, "t.range.endOffset", "3");
-            r.shouldBe(t, "t.range.collapsed", "false");
-        }
-    ];
-    this.setUp = function () {
-        t = {};
-        while (testarea.firstChild) {
-            testarea.removeChild(testarea.firstChild);
-        }
-    };
-    this.tearDown = function () {
-        t = {};
-        while (testarea.firstChild) {
-            testarea.removeChild(testarea.firstChild);
-        }
-    };
-    this.tests = function () {
-        return tests;
-    };
-    this.asyncTests = function () {
-        return [];
-    };
-};
-core.CursorTests.name = "CursorTests";
-core.CursorTests.prototype.description = function () {
-    "use strict";
-    return "Test the Cursor class.";
-};
-(function () {
-    "use strict";
-    return core.CursorTests;
-}());
diff --git a/apps/files_odfviewer/src/webodf/webodf/tests/core/PointWalkerTests.js b/apps/files_odfviewer/src/webodf/webodf/tests/core/PointWalkerTests.js
deleted file mode 100644
index dbb690f77e..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/tests/core/PointWalkerTests.js
+++ /dev/null
@@ -1,135 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global core: true, runtime: true*/
-runtime.loadClass("core.PointWalker");
-
-/**
- * @constructor
- * @param runner {UnitTestRunner}
- * @implements {core.UnitTest}
- */
-core.PointWalkerTests = function PointWalkerTests(runner) {
-    "use strict";
-    var t, r = runner;
-
-    function checkWalker(node, count, endpos) {
-        t = {};
-        t.node = node;
-        t.walker = new core.PointWalker(node);
-        t.count = count;
-        t.countForward = 0;
-        t.countBackward = 0;
-        t.endpos = endpos;
-        t.walker.setPoint(t.node, 0);
-        while (t.walker.stepForward()) {
-            t.countForward += 1;
-        }
-        r.shouldBe(t, "t.countForward", "t.count");
-        r.shouldBe(t, "t.walker.precedingSibling()", "t.node.lastChild");
-        r.shouldBe(t, "t.walker.followingSibling()", "null");
-        if (endpos !== null) {
-            r.shouldBe(t, "t.walker.position()", "t.endpos");
-        }
-        t.walker.setPoint(t.node, endpos);
-        while (t.walker.stepBackward()) {
-            t.countBackward += 1;
-        }
-        r.shouldBe(t, "t.countBackward", "t.count");
-        r.shouldBe(t, "t.walker.precedingSibling()", "null");
-        r.shouldBe(t, "t.walker.followingSibling()", "t.node.firstChild");
-        r.shouldBe(t, "t.walker.position()", "0");
-    }
-
-    function testEmptyDocument() {
-        var doc = runtime.getDOMImplementation().createDocument("", "p", null),
-            p = doc.firstChild,
-            textnode1,
-            textnode2,
-            textnode3,
-            em;
-
-        checkWalker(doc, 2, 1);
-        checkWalker(p, 0, 0);
-
-        t = {};
-        t.doc = doc;
-        t.walker = new core.PointWalker(t.doc);
-        r.shouldBe(t, "t.walker.position()", "0");
-        r.shouldBe(t, "t.walker.stepForward()", "true");
-        r.shouldBe(t, "t.walker.position()", "0");
-        r.shouldBe(t, "t.walker.stepForward()", "true");
-        r.shouldBe(t, "t.walker.position()", "1");
-        r.shouldBe(t, "t.walker.stepForward()", "false");
-        r.shouldBe(t, "t.walker.position()", "1");
-        r.shouldBe(t, "t.walker.stepBackward()", "true");
-        r.shouldBe(t, "t.walker.position()", "0");
-        r.shouldBe(t, "t.walker.stepBackward()", "true");
-        r.shouldBe(t, "t.walker.position()", "0");
-        r.shouldBe(t, "t.walker.stepBackward()", "false");
-        r.shouldBe(t, "t.walker.position()", "0");
-
-        textnode1 = doc.createTextNode("hello, ");
-        textnode2 = doc.createTextNode("big ");
-        textnode3 = doc.createTextNode("world.");
-        em = doc.createElement('em');
-        p.appendChild(textnode1);
-        p.appendChild(em);
-        em.appendChild(textnode2);
-        p.appendChild(textnode3);
-
-        checkWalker(textnode1, 7, 7);
-        checkWalker(textnode2, 4, 4);
-        checkWalker(textnode3, 6, 6);
-        checkWalker(em, 6, 1);
-        checkWalker(p, 25, 3);
-        checkWalker(doc, 27, 1);
-    }
-
-    this.setUp = function () {
-        t = {};
-    };
-    this.tearDown = function () {
-        t = {};
-    };
-    this.tests = function () {
-        return [
-            testEmptyDocument
-        ];
-    };
-    this.asyncTests = function () {
-        return [];
-    };
-    this.description = function () {
-        return "Test the PointWalker class.";
-    };
-};
diff --git a/apps/files_odfviewer/src/webodf/webodf/tests/core/RuntimeTests.js b/apps/files_odfviewer/src/webodf/webodf/tests/core/RuntimeTests.js
deleted file mode 100644
index d3f7c2dfa2..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/tests/core/RuntimeTests.js
+++ /dev/null
@@ -1,119 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global core: true, runtime: true*/
-/*jslint bitwise: true*/
-
-/**
- * @constructor
- * @param runner {UnitTestRunner}
- * @implements {core.UnitTest}
- */
-core.RuntimeTests = function RuntimeTests(runner) {
-    "use strict";
-    var t, r = runner;
-
-    function testRead(callback) {
-        runtime.read("tests.js", 2, 6, function (err, data) {
-            t.err = err;
-            r.shouldBeNull(t, "t.err");
-            t.data = runtime.byteArrayToString(data, "utf8");
-            r.shouldBe(t, "t.data", "'global'");
-            callback();
-        });
-    }
-
-    /**
-     * Test writing a binary file and reading it back.
-     */
-    function testWrite(callback) {
-        var content = new core.ByteArrayWriter("utf8"),
-            i, max = 1024, filename, clean;
-        for (i = 0; i < max; i += 1) {
-            content.appendArray([i]);
-        }
-        content = content.getByteArray();
-        filename = "tmp" + Math.random();
-        clean = new core.ByteArrayWriter("utf8");
-        for (i = 0; i < max; i += 1) {
-            clean.appendArray([content[i] & 0xff]);
-        }
-        clean = clean.getByteArray();
-        // now content has content different from what is on the server
-        runtime.writeFile(filename, content, function (err) {
-            t.err = err;
-            r.shouldBeNull(t, "t.err");
-            runtime.readFile(filename, "binary", function (err, data) {
-                t.err = err;
-                r.shouldBeNull(t, "t.err");
-                t.data = data;
-                t.clean = clean;
-                r.shouldBe(t, "t.data.length", "t.clean.length");
-                i = 0;
-                while (i < max && data[i] === clean[i]) {
-                    i += 1;
-                }
-                if (i !== max) {
-                    runtime.log("at " + String(i) + " " + data[i] + " vs " +
-                            clean[i]);
-                }
-                t.i = i;
-                t.max = max;
-                r.shouldBe(t, "t.i", "t.max");
-                // cleanup
-                runtime.deleteFile(filename, function (err) {
-                    callback();
-                });
-            });
-        });
-    }
-
-    this.setUp = function () {
-        t = {};
-    };
-    this.tearDown = function () {
-        t = {};
-    };
-    this.tests = function () {
-        return [
-        ];
-    };
-    this.asyncTests = function () {
-        return [
-            testRead,
-            testWrite
-        ];
-    };
-    this.description = function () {
-        return "Test the runtime.";
-    };
-};
diff --git a/apps/files_odfviewer/src/webodf/webodf/tests/core/ZipTests.js b/apps/files_odfviewer/src/webodf/webodf/tests/core/ZipTests.js
deleted file mode 100644
index ad2ece55ad..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/tests/core/ZipTests.js
+++ /dev/null
@@ -1,141 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global core: true, runtime: true*/
-runtime.loadClass("core.Zip");
-
-/**
- * @constructor
- * @param {core.UnitTestRunner} runner
- * @implements {core.UnitTest}
- */
-core.ZipTests = function ZipTests(runner) {
-    "use strict";
-    var r = runner,
-        t;
-
-    function testNonExistingFile(callback) {
-        var zip = new core.Zip("whatever", function (err) {
-            t.err = err;
-            r.shouldBeNonNull(t, "t.err");
-            callback();
-        });
-    }
-
-    function testNonZipFile(callback) {
-        var path = "core/ZipTests.js";
-        // check that file exists
-        runtime.isFile(path, function (exists) {
-            t.exists = exists;
-            r.shouldBe(t, "t.exists", "true");
-            // check that zip file opening returns an error
-            var zip = new core.Zip("core/ZipTests.js", function (err) {
-                t.err = err;
-                r.shouldBeNonNull(t, "t.err");
-                callback();
-            });
-        });
-    }
-
-    function testHi(path, callback) {
-        var zip = new core.Zip(path, function (err, zip) {
-            t.err = err;
-            t.zip = zip;
-            r.shouldBeNull(t, "t.err");
-            zip.load("hello", function (err, data) {
-                t.err = err;
-                r.shouldBeNull(t, "t.err");
-                t.data = runtime.byteArrayToString(data, "utf8");
-                r.shouldBe(t, "t.data.length", "16");
-                r.shouldBe(t, "t.data", "'bonjour\\nbonjour\\n'");
-                callback();
-            });
-        });
-    }
-
-    function testHiUncompressed(callback) {
-        testHi("core/hi-uncompressed.zip", callback);
-    }
-
-    function testHiCompressed(callback) {
-        testHi("core/hi-compressed.zip", callback);
-    }
-
-    function testCreateZip(callback) {
-        var filename = "writetest.zip",
-            zip = new core.Zip(filename, null),
-            data = runtime.byteArrayFromString(
-                    "application/vnd.oasis.opendocument.text", "utf8");
-        zip.save("mimetype", data, false, new Date());
-        zip.load("mimetype", function (err, newdata) {
-            t.err = err;
-            r.shouldBeNull(t, "t.err");
-            t.data = data;
-            t.newdata = newdata;
-            r.shouldBe(t, "t.data", "t.newdata");
-            zip.write(function (err) {
-                t.err = err;
-                r.shouldBeNull(t, "t.err");
-                runtime.deleteFile(filename, function (err) {
-                    callback();
-                });
-            });
-        });
-    }
-
-    this.setUp = function () {
-        t = {};
-    };
-    this.tearDown = function () {
-        t = {};
-    };
-    this.tests = function () {
-        return [];
-    };
-    this.asyncTests = function () {
-        return [
-            testNonExistingFile,
-            testNonZipFile,
-            testHiUncompressed,
-            testHiCompressed,
-            testCreateZip
-        ];
-    };
-};
-core.ZipTests.prototype.description = function () {
-    "use strict";
-    return "Test the Zip class.";
-};
-(function () {
-    "use strict";
-    return core.ZipTests;
-}());
diff --git a/apps/files_odfviewer/src/webodf/webodf/tests/core/hi-compressed.zip b/apps/files_odfviewer/src/webodf/webodf/tests/core/hi-compressed.zip
deleted file mode 100644
index ff6d86c158..0000000000
Binary files a/apps/files_odfviewer/src/webodf/webodf/tests/core/hi-compressed.zip and /dev/null differ
diff --git a/apps/files_odfviewer/src/webodf/webodf/tests/core/hi-uncompressed.zip b/apps/files_odfviewer/src/webodf/webodf/tests/core/hi-uncompressed.zip
deleted file mode 100644
index 2eafff7ab9..0000000000
Binary files a/apps/files_odfviewer/src/webodf/webodf/tests/core/hi-uncompressed.zip and /dev/null differ
diff --git a/apps/files_odfviewer/src/webodf/webodf/tests/gui/CaretTests.js b/apps/files_odfviewer/src/webodf/webodf/tests/gui/CaretTests.js
deleted file mode 100644
index 05f1b9bcc5..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/tests/gui/CaretTests.js
+++ /dev/null
@@ -1,82 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global runtime: true, core: true, gui: true*/
-runtime.loadClass("gui.Caret");
-
-/**
- * @constructor
- * @param {core.UnitTestRunner} runner
- * @implements {core.UnitTest}
- */
-gui.CaretTests = function CaretTests(runner) {
-    "use strict";
-    var r = runner,
-        t;
-
-    function setupEmptyDoc() {
-        var selection = runtime.getWindow().getSelection(),
-            doc = runtime.getDOMImplementation().createDocument("", "p", null),
-            caret = new gui.Caret(selection, doc);
-        t = { selection: selection, doc: doc }; //, cursor: cursor };
-        runner.shouldBeNonNull(t, "t.selection");
-    }
-    function setupSimpleTextDoc() {
-        setupEmptyDoc();
-        t.textnode = t.doc.createTextNode("abc");
-        t.doc.documentElement.appendChild(t.textnode);
-    }
-    function testOnUpDownTraversal() {
-    }
-
-    this.setUp = function () {
-        t = {};
-    };
-    this.tearDown = function () {
-        t = {};
-    };
-    this.tests = function () {
-        return [];
-    };
-    this.asyncTests = function () {
-        return [
-        ];
-    };
-};
-gui.CaretTests.prototype.description = function () {
-    "use strict";
-    return "Test the Caret class.";
-};
-(function () {
-    "use strict";
-    return gui.CaretTests;
-}());
diff --git a/apps/files_odfviewer/src/webodf/webodf/tests/gui/SelectionMoverTests.js b/apps/files_odfviewer/src/webodf/webodf/tests/gui/SelectionMoverTests.js
deleted file mode 100644
index 8b8275bcb8..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/tests/gui/SelectionMoverTests.js
+++ /dev/null
@@ -1,109 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global runtime: true, core: true, gui: true*/
-runtime.loadClass("gui.SelectionMover");
-
-/**
- * @constructor
- * @param {core.UnitTestRunner} runner
- * @implements {core.UnitTest}
- */
-gui.SelectionMoverTests = function SelectionMoverTests(runner) {
-    "use strict";
-    var r = runner,
-        t, testarea = runtime.getWindow().document.getElementById("testarea");
-
-    function setupDoc() {
-        var doc = testarea.ownerDocument,
-            selection = runtime.getWindow().getSelection(),
-            p = doc.createElement("p"),
-            walker = new core.PointWalker(p),
-            mover = new gui.SelectionMover(selection, walker);
-        testarea.appendChild(p);
-        p.appendChild(doc.createTextNode("MMMMM MMMMM MMMMM MMMMM MMMMM"));
-        p.style.width = "5em";// break line after each 'MMMMM'
-        selection.removeAllRanges();
-        selection.addRange(doc.createRange());
-        t = { doc: doc, p: p, selection: selection, mover: mover };
-    }
-    function testUpDownTraversal() {
-        setupDoc();
-        r.shouldBe(t, "t.selection.rangeCount", "1");
-        t.r = t.selection.getRangeAt(0);
-        r.shouldBeNonNull(t, "t.r");
-        t.r.setStart(t.p.firstChild, 0);
-        r.shouldBe(t, "t.r.startContainer", "t.p.firstChild");
-        r.shouldBe(t, "t.r.startOffset", "0");
-        t.mover.movePointForward();
-        t.r = t.selection.getRangeAt(0);
-        r.shouldBe(t, "t.r.startContainer", "t.p.firstChild");
-        r.shouldBe(t, "t.r.startOffset", "1");
-        t.mover.movePointBackward();
-        t.r = t.selection.getRangeAt(0);
-        r.shouldBe(t, "t.r.startContainer", "t.p.firstChild");
-        r.shouldBe(t, "t.r.startOffset", "0");
-        t.mover.moveLineForward();
-//        t.selection.modify("move", "forward", "line");
-        t.r = t.selection.getRangeAt(0);
-        r.shouldBe(t, "t.r.startContainer", "t.p.firstChild");
-        r.shouldBe(t, "t.r.startOffset", "6");
-    }
-
-    this.setUp = function () {
-        t = {};
-        while (testarea.firstChild) {
-            testarea.removeChild(testarea.firstChild);
-        }
-    };
-    this.tearDown = function () {
-        t = {};
-        while (testarea.firstChild) {
-            testarea.removeChild(testarea.firstChild);
-        }
-    };
-    this.tests = function () {
-        return [ testUpDownTraversal ];
-    };
-    this.asyncTests = function () {
-        return [
-        ];
-    };
-};
-gui.SelectionMoverTests.prototype.description = function () {
-    "use strict";
-    return "Test the SelectionMover class.";
-};
-(function () {
-    "use strict";
-    return gui.SelectionMoverTests;
-}());
diff --git a/apps/files_odfviewer/src/webodf/webodf/tests/gui/XMLEditTests.js b/apps/files_odfviewer/src/webodf/webodf/tests/gui/XMLEditTests.js
deleted file mode 100644
index e253a72fea..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/tests/gui/XMLEditTests.js
+++ /dev/null
@@ -1,156 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global document: true, core: true, gui: true, runtime: true*/
-runtime.loadClass("core.PointWalker");
-runtime.loadClass("gui.XMLEdit");
-
-/**
- * @constructor
- * @param runner {core.UnitTestRunner}
- * @implements {core.UnitTest}
- */
-gui.XMLEditTests = function XMLEditTests(runner) {
-    "use strict";
-    var t, r = runner, tests;
-
-    function checkWalker(node, count, endpos) {
-        t = {};
-        t.node = node;
-        t.walker = new core.PointWalker(node);
-        t.count = count;
-        t.countForward = 0;
-        t.countBackward = 0;
-        t.endpos = endpos;
-        t.walker.setPoint(t.node, 0);
-        while (t.walker.stepForward()) {
-            t.countForward += 1;
-        }
-        r.shouldBe("t.countForward", "t.count");
-        r.shouldBe("t.walker.precedingSibling()", "t.node.lastChild");
-        r.shouldBe("t.walker.followingSibling()", "null");
-        if (endpos !== null) {
-            r.shouldBe("t.walker.position()", "t.endpos");
-        }
-        t.walker.setPoint(t.node, endpos);
-        while (t.walker.stepBackward()) {
-            t.countBackward += 1;
-        }
-        r.shouldBe("t.countBackward", "t.count");
-        r.shouldBe("t.walker.precedingSibling()", "null");
-        r.shouldBe("t.walker.followingSibling()", "t.node.firstChild");
-        r.shouldBe("t.walker.position()", "0");
-    }
-
-    function testSimpleDocument(xmledit) {
-        var maindoc = xmledit.ownerDocument,
-            doc = maindoc.implementation.createDocument(null, "p", null),
-            p = doc.firstChild,
-            textnode1,
-            textnode2,
-            textnode3,
-            em;
-
-        xmledit.setXML(doc);
-
-        checkWalker(doc, 2, 1);
-        checkWalker(p, 0, 0);
-
-        t = {};
-        t.doc = doc;
-        t.walker = new core.PointWalker(t.doc);
-        r.shouldBe("t.walker.position()", "0");
-        r.shouldBe("t.walker.stepForward()", "true");
-        r.shouldBe("t.walker.position()", "0");
-        r.shouldBe("t.walker.stepForward()", "true");
-        r.shouldBe("t.walker.position()", "1");
-        r.shouldBe("t.walker.stepForward()", "false");
-        r.shouldBe("t.walker.position()", "1");
-        r.shouldBe("t.walker.stepBackward()", "true");
-        r.shouldBe("t.walker.position()", "0");
-        r.shouldBe("t.walker.stepBackward()", "true");
-        r.shouldBe("t.walker.position()", "0");
-        r.shouldBe("t.walker.stepBackward()", "false");
-        r.shouldBe("t.walker.position()", "0");
-
-        textnode1 = doc.createTextNode("hello, ");
-        textnode2 = doc.createTextNode("big ");
-        textnode3 = doc.createTextNode("world.");
-        em = doc.createElement('em');
-        p.appendChild(textnode1);
-        p.appendChild(em);
-        em.appendChild(textnode2);
-        p.appendChild(textnode3);
-
-        checkWalker(textnode1, 7, 7);
-        checkWalker(textnode2, 4, 4);
-        checkWalker(textnode3, 6, 6);
-        checkWalker(em, 6, 1);
-        checkWalker(p, 25, 3);
-        checkWalker(doc, 27, 1);
-    }
-
-    function testXmlEdit(document) {
-        var head = document.getElementsByTagName("head")[0],
-            css = document.createElement("style"),
-            testarea = document.createElement("div"),
-            xmledit;
-
-        // the xml edit requires an element to put the content and a sheet to put
-        // the style
-        css.type = "text/css";
-        head.appendChild(css);
-        document.body.appendChild(testarea);
-        xmledit = new gui.XMLEdit(testarea, css);
-
-        testSimpleDocument(xmledit);
-
-        css.parentNode.removeChild(css);
-        testarea.parentNode.removeChild(testarea);
-    }
-
-    this.setUp = function () {
-        t = {};
-    };
-    this.tearDown = function () {
-        t = {};
-    };
-    this.tests = function () {
-        return [ testSimpleDocument ];
-    };
-    this.asyncTests = function () {
-        return [];
-    };
-    this.description = function () {
-        return "Test the XML editor class.";
-    };
-};
diff --git a/apps/files_odfviewer/src/webodf/webodf/tests/manifest.js b/apps/files_odfviewer/src/webodf/webodf/tests/manifest.js
deleted file mode 100644
index 6d4f151bc0..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/tests/manifest.js
+++ /dev/null
@@ -1,16 +0,0 @@
-(function () {
-    "use strict";
-return [
-        "core/Base64Tests.js",
-        "core/CursorTests.js",
-        "core/PointWalkerTests.js",
-        "core/RuntimeTests.js",
-        "core/ZipTests.js",
-        "gui/CaretTests.js",
-        "gui/SelectionMoverTests.js",
-        "gui/XMLEditTests.js",
-        "tests.js",
-        "xmldom/OperationalTransformDOMTests.js",
-        "xmldom/XPathTests.js"
-    ];
-}());
diff --git a/apps/files_odfviewer/src/webodf/webodf/tests/resources/js-test-style.css b/apps/files_odfviewer/src/webodf/webodf/tests/resources/js-test-style.css
deleted file mode 100644
index f12147ca43..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/tests/resources/js-test-style.css
+++ /dev/null
@@ -1,12 +0,0 @@
-.pass {
-    font-weight: bold;
-    color: green;
-}
-.fail {
-    font-weight: bold;
-    color: red;
-}
-#console {
-    white-space: pre-wrap;
-    font-family: monospace;
-}
diff --git a/apps/files_odfviewer/src/webodf/webodf/tests/tests.html b/apps/files_odfviewer/src/webodf/webodf/tests/tests.html
deleted file mode 100644
index 572db60554..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/tests/tests.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<html>
-  <head>
-    <title>WebODF unit tests</title>
-    <link rel="stylesheet" href="resources/js-test-style.css"></link>
-  </head>
-  <body>
-    <p id="description"></p>
-    <div id="console"></div>
-    <div id="testarea"></div>
-    <div id="logoutput"></div>
-    <script src="../lib/runtime.js"></script>
-<script type="text/javascript" charset="utf-8">
-runtime.libraryPaths = (function () {
-    return function () {
-        return ["../lib", "."];
-    }
-}());
-</script>
-    <script src="tests.js"></script>
-  </body>
-</html>
-
diff --git a/apps/files_odfviewer/src/webodf/webodf/tests/tests.js b/apps/files_odfviewer/src/webodf/webodf/tests/tests.js
deleted file mode 100644
index 5570733de5..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/tests/tests.js
+++ /dev/null
@@ -1,94 +0,0 @@
-/*global window: true, runtime: true, Runtime: true, core: true, gui: true,
-  xmldom: true, RuntimeTests: true*/
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-runtime.loadClass("core.RuntimeTests");
-runtime.loadClass("core.UnitTester");
-runtime.loadClass("core.PointWalkerTests");
-runtime.loadClass("core.CursorTests");
-runtime.loadClass("core.ZipTests");
-runtime.loadClass("core.Base64Tests");
-runtime.loadClass("xmldom.OperationalTransformDOMTests");
-runtime.loadClass("xmldom.XPathTests");
-runtime.loadClass("gui.CaretTests");
-runtime.loadClass("gui.XMLEditTests");
-
-var tests = [
-    core.RuntimeTests, // temporarily disabled, enable at next commit!
-    core.ZipTests,
-    core.Base64Tests
-];
-if (runtime.type() !== "NodeJSRuntime") {
-    tests.push(core.PointWalkerTests);
-}
-if (runtime.type() === "BrowserRuntime") {
-    tests.push(core.PointWalkerTests);
-//    tests.push(core.CursorTests);
-    tests.push(xmldom.OperationalTransformDOMTests);
-    tests.push(gui.CaretTests);
-    tests.push(xmldom.XPathTests);
-//    tests.push(gui.XMLEditTests);
-}
-var tester = new core.UnitTester();
-/**
- * @param {!Array.<Function>} tests
- * @return {undefined}
- */
-function runNextTest(tests) {
-    "use strict";
-    if (tests.length === 0) {
-        //runtime.log(JSON.stringify(tester.results()));
-        runtime.log("Number of failed tests: " +
-                String(tester.countFailedTests()));
-        runtime.exit(tester.countFailedTests());
-        return;
-    }
-    var test = tests[0];
-    if (typeof test !== "function") {
-        runtime.log("Tests contain a non-function object of type " +
-                typeof(test) + ".");
-        runtime.exit(1);
-        return;
-    }
-    runtime.log("Running test '" + Runtime.getFunctionName(test) + "'.");
-    try {
-        tester.runTests(test, function () {
-            runNextTest(tests.slice(1));
-        });
-    } catch (e) {
-        runtime.log(e);
-        runtime.exit(1);
-        throw e;
-    }
-}
-runNextTest(tests);
diff --git a/apps/files_odfviewer/src/webodf/webodf/tests/xmldom/OperationalTransformDOMTests.js b/apps/files_odfviewer/src/webodf/webodf/tests/xmldom/OperationalTransformDOMTests.js
deleted file mode 100644
index 3866a53708..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/tests/xmldom/OperationalTransformDOMTests.js
+++ /dev/null
@@ -1,79 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global runtime: true, core: true, xmldom: true*/
-runtime.loadClass("xmldom.OperationalTransformDOM");
-
-/**
- * @constructor
- * @param {core.UnitTestRunner} runner
- * @implements {core.UnitTest}
- */
-xmldom.OperationalTransformDOMTests = function OperationalTransformDOMTests(runner) {
-    "use strict";
-    var r = runner,
-        t;
-
-    function setupEmptyDoc() {
-        var doc = runtime.getDOMImplementation().createDocument("", "p", null);
-        t = { doc: doc };
-    }
-    function setupSimpleTextDoc() {
-        setupEmptyDoc();
-        t.textnode = t.doc.createTextNode("abc");
-        t.doc.documentElement.appendChild(t.textnode);
-    }
-    function testSkip() {
-        setupEmptyDoc();
-    }
-    this.setUp = function () {
-        t = {};
-    };
-    this.tearDown = function () {
-        t = {};
-    };
-    this.tests = function () {
-        return [ testSkip ];
-    };
-    this.asyncTests = function () {
-        return [
-        ];
-    };
-};
-xmldom.OperationalTransformDOMTests.prototype.description = function () {
-    "use strict";
-    return "Test the OperationalTransformDOM class.";
-};
-(function () {
-    "use strict";
-    return xmldom.OperationalTransformDOMTests;
-}());
diff --git a/apps/files_odfviewer/src/webodf/webodf/tests/xmldom/XPathTests.js b/apps/files_odfviewer/src/webodf/webodf/tests/xmldom/XPathTests.js
deleted file mode 100644
index 91ebba99c6..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/tests/xmldom/XPathTests.js
+++ /dev/null
@@ -1,112 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global runtime: true, core: true, xmldom: true, odf: true, XMLSerializer*/
-runtime.loadClass("xmldom.XPath");
-runtime.loadClass("odf.Style2CSS");
-
-/**
- * @constructor
- * @param {core.UnitTestRunner} runner
- * @implements {core.UnitTest}
- */
-xmldom.XPathTests = function XPathTests(runner) {
-    "use strict";
-    var r = runner,
-        style2CSS = new odf.Style2CSS(),
-        t;
-
-    function setupDoc() {
-        var stylens = style2CSS.namespaceResolver("style"),
-            svgns = style2CSS.namespaceResolver("svg"),
-            drawns = style2CSS.namespaceResolver("draw"),
-            presentationns = style2CSS.namespaceResolver("presentation"),
-            textns = style2CSS.namespaceResolver("text"),
-            doc = runtime.getDOMImplementation().createDocument("", "a", null),
-            r = doc.documentElement,
-            fontFace = doc.createElementNS(stylens, "font-face"),
-            fontFaceSrc = doc.createElementNS(svgns, "font-face-src"),
-            drawFrame = doc.createElementNS(drawns, "frame"),
-            p = doc.createElementNS(textns, "p");
-        r.appendChild(p);
-        r.appendChild(fontFace);
-        fontFace = doc.createElementNS(stylens, "font-face");
-        fontFace.appendChild(fontFaceSrc);
-        fontFaceSrc.setAttributeNS(textns, "anchor-type", "paragraph");
-        r.appendChild(fontFace);
-        r.appendChild(drawFrame);
-        drawFrame = doc.createElementNS(drawns, "frame");
-        drawFrame.setAttributeNS(presentationns, "class", "title");
-        r.appendChild(drawFrame);
-
-        t = { doc: doc, fontFace: fontFace, drawFrame: drawFrame };
-    }
-    function test1() {
-        setupDoc();
-        var xpath = new xmldom.XPath(),
-            xpaths = {
-                "style:font-face[svg:font-face-src]": "t.fontFace",
-                ".//*[*[@text:anchor-type='paragraph']]": "t.fontFace",
-                "./draw:frame[@presentation:class='title']": "t.drawFrame"
-            },
-            x;
-        for (x in xpaths) {
-            if (xpaths.hasOwnProperty(x)) {
-                t.result = xpath.getODFElementsWithXPath(t.doc.documentElement,
-                        x, style2CSS.namespaceResolver);
-                r.shouldBe(t, "t.result.length", "1");
-                r.shouldBe(t, "t.result[0]", xpaths[x]);
-            }
-        }
-    }
-    this.setUp = function () {
-        t = {};
-    };
-    this.tearDown = function () {
-        t = {};
-    };
-    this.tests = function () {
-        return [ test1 ];
-    };
-    this.asyncTests = function () {
-        return [
-        ];
-    };
-};
-xmldom.XPathTests.prototype.description = function () {
-    "use strict";
-    return "Test the XPath class.";
-};
-(function () {
-    "use strict";
-    return xmldom.XPathTests;
-}());
diff --git a/apps/files_odfviewer/src/webodf/webodf/tools/clippingTestImage.html b/apps/files_odfviewer/src/webodf/webodf/tools/clippingTestImage.html
deleted file mode 100644
index 67cc747737..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/tools/clippingTestImage.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<html>
- <head>
-  <script type="application/javascript">//<![CDATA[
-function draw() {
-  var canvas = document.getElementById("canvas"),
-      ctx = canvas.getContext("2d"),
-      size = canvas.width / 2,
-      link = document.createElement("a");
-  ctx.translate(size, size);
-  for (i = 0; i < 4; i += 1) {
-     ctx.save();
-     ctx.rotate(i * Math.PI / 2);
-     ctx.translate(0, -size);
-     drawPattern(ctx, size);
-     ctx.restore();
-  }
-  document.body.appendChild(document.createElement("br"));
-  link.appendChild(document.createTextNode("download image"));
-  link.setAttribute("href", canvas.toDataURL());
-  document.body.appendChild(link);
-}
-function drawPattern(ctx, size) {
-  var i = 0,
-      step = 2;
-  while (i < size) {
-    ctx.fillStyle = "rgb(0,0,0)";
-    ctx.fillRect (i, i, size - i, step);
-    ctx.fillRect (i, i, step, size - i);
-    i += 2 * step;
-  }
-}
-//]]></script>
-	 </head>
-	 <body onload="draw()">
-<p>This image can be used to find clipping problems. If the sides of the image are clipped asymetrically, it will obvious visually.</p>
-   <canvas id="canvas" width="136" height="136"></canvas>
-<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIgAAACIAQMAAAAGdDERAAAABlBMVEUAAAAAAAClZ7nPAAAAAXRSTlMAQObYZgAAAXFJREFUSMd91EGKwzAMhWFBtjmMIQfw1XUAgQ6TrUGzGD0TW8/NaviGv69N3Irl5ZGXnGUIrrPcpSriQ7eqit6+VVVi2FZVkdu2qojHMF2qKio37sdRIobZUlURuc2WqohHDMP8QVTkxgM6SUQMw/xBROS2nD+IZ6WzqqJZ+ayqRFY2qyqSlc2qiM9Ks6qis/KsqsSsLKsqMivLqoh/KhWhop/KI6jEpzIRKvKpLIKJL5UKE10qDyaxVCZMZKksiPhWKRHdKicSW2VEnrz6/LWp8qa0XLiIXFv1EomteojIVjGJd6kuJpjP6mUSsVQPE8xnRSVyvuU4E8z3HGcSOd9ynAnme44ziZxvOc4E8z3HmeTr/VcPF/zR8S8ieMGGCSKY73irRPABGz4yEcx33DoiuOENj4AI5jseJREcgIYjQQTzHUeLCA5kwxElgvmOo04EX5CGrwwRzPc4C76w7ToL5vt7FvyAtOcsuPoPQfWe5Q+etqGXQp0CUgAAAABJRU5ErkJggg==" alt="pregenerated"/>
- </body>
-</html>
diff --git a/apps/files_odfviewer/src/webodf/webodf/tools/externs.js b/apps/files_odfviewer/src/webodf/webodf/tools/externs.js
deleted file mode 100644
index 9862befe48..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/tools/externs.js
+++ /dev/null
@@ -1,348 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global Packages HTMLStyleElement window XMLHttpRequest HTMLStyleElement Document*/
-/*jslint nomen: false */
-/**
- * @constructor
- */
-function NodeJSObject() {}
-/**
- * @param {!string} path
- * @param {function(...)} callback
- * @return {undefined}
- */
-NodeJSObject.prototype.stat = function (path, callback) {};
-/**
- * @param {!string} path
- * @param {?string} encoding
- * @param {function(...)} callback
- * @return {?string}
- */
-NodeJSObject.prototype.readFile = function (path, encoding, callback) {};
-/**
- * @param {!string} path
- * @param {?string} encoding
- * @return {?string}
- */
-NodeJSObject.prototype.readFileSync = function (path, encoding) {};
-/**
- * @param {!string} path
- * @param {!string} flags
- * @param {!number} mode
- * @param {!function(string, !number):undefined} callback
- * @return {undefined}
- */
-NodeJSObject.prototype.open = function (path, flags, mode, callback) {};
-/**
- * @param {!number} fd
- * @param {!Buffer} buffer
- * @param {!number} offset
- * @param {!number} length
- * @param {!number} position
- * @param {function(string, !number)} callback
- * @return {undefined}
- */
-NodeJSObject.prototype.read = function (fd, buffer, offset, length, position,
-        callback) {};
-/**
- * @param {!string} path
- * @param {!string} data
- * @param {!string} encoding
- * @param {!function(?string):undefined} callback
- * @return {undefined}
- */
-NodeJSObject.prototype.writeFile = function (path, data, encoding, callback) {};
-/**
- * @param {!string} path
- * @param {!function(?string):undefined} callback
- * @return {undefined}
- */
-NodeJSObject.prototype.unlink = function (path, callback) {};
-/**
- * @param {!number} fd
- * @param {function(!string)} callback
- * @return {undefined}
- */
-NodeJSObject.prototype.close = function (fd, callback) {};
-/**
- * @param {!string} className
- * @return {!NodeJSObject}
- */
-function require(className) {}
-/**
- * @constructor
- */
-function NodeJSConsole() {}
-/**
- * @param {!string} msg
- * @return {undefined}
- */
-NodeJSConsole.prototype.log = function (msg) {};
-/**
- * @type {!NodeJSConsole}
- */
-var console;
-/**
- * @constructor
- */
-function NodeJSProcess() {}
-/**
- * @param {!number} exitCode
- * @return {undefined}
- */
-NodeJSProcess.prototype.exit = function (exitCode) {};
-/**
- * @type {!Array}
- */
-NodeJSProcess.prototype.argv = [];
-/**
- * @type {!Object}
- */
-NodeJSProcess.prototype.stderr = {};
-/**
- * @type {!NodeJSProcess}
- */
-var process;
-/**
- * @type {!string}
- */
-var __dirname;
-/**
- * @constructor
- * @param {!number|!Array.<!number>|!string} arg1
- * @param {!string=} encoding
- */
-function Buffer(arg1, encoding) {}
-/**
- * @param {!string} msg
- * @return {undefined}
- */
-function print(msg) {}
-/**
- * @param {!string} path
- * @param {!string=} encoding
- * @return {?string}
- */
-function readFile(path, encoding) {}
-/**
- * @param {!number} exitCode
- * @return {undefined}
- */
-function quit(exitCode) {}
-/**
- * @namespace
- */
-Packages.javax = {};
-/**
- * @namespace
- */
-Packages.javax.xml = {};
-/**
- * @namespace
- */
-Packages.javax.xml.validation = {};
-/**
- * @constructor
- */
-Packages.javax.xml.validation.Schema = function () {};
-/**
- * @namespace
- */
-Packages.javax.xml.parsers = {};
-/**
- * @constructor
- */
-Packages.javax.xml.parsers.DocumentBuilder = function () {};
-/**
- * @param {!Object} entityresolver
- * @return {undefined}
- */
-Packages.javax.xml.parsers.DocumentBuilder.prototype.setEntityResolver =
-    function (entityresolver) {};
-/**
- * @param {!Packages.org.xml.sax.InputSource} source 
- * @return {Document}
- */
-Packages.javax.xml.parsers.DocumentBuilder.prototype.parse =
-    function (source) {};
-/**
- * @return {DOMImplementation}
- */
-Packages.javax.xml.parsers.DocumentBuilder.prototype.getDOMImplementation =
-    function () {};
-/**
- * @constructor
- */
-Packages.javax.xml.parsers.DocumentBuilderFactory = function () {};
-/**
- * @return {!Packages.javax.xml.parsers.DocumentBuilderFactory}
- */
-Packages.javax.xml.parsers.DocumentBuilderFactory.newInstance = function () {};
-/**
- * @param {!boolean} value
- */
-Packages.javax.xml.parsers.DocumentBuilderFactory.prototype.setValidating =
-    function (value) {};
-/**
- * @param {!boolean} value
- */
-Packages.javax.xml.parsers.DocumentBuilderFactory.prototype.setNamespaceAware =
-    function (value) {};
-/**
- * @param {!boolean} value
- */
-Packages.javax.xml.parsers.DocumentBuilderFactory.prototype
-    .setExpandEntityReferences = function (value) {};
-/**
- * @param {?Packages.javax.xml.validation.Schema} schema
- */
-Packages.javax.xml.parsers.DocumentBuilderFactory.prototype.setSchema =
-    function (schema) {};
-/**
- * @return {!Packages.javax.xml.parsers.DocumentBuilder}
- */
-Packages.javax.xml.parsers.DocumentBuilderFactory.prototype.newDocumentBuilder =
-    function () {};
-/**
- * @namespace
- */
-Packages.org = {};
-/**
- * @namespace
- */
-Packages.org.xml.sax = {};
-/**
- * @param {!Object} definition
- * @return {!Object}
- */
-Packages.org.xml.sax.EntityResolver = function (definition) {};
-/**
- * @namespace
- */
-Packages.java.io = {};
-/**
- * @constructor
- * @param {!string} path
- */
-Packages.java.io.FileReader = function (path) {};
-/**
- * @constructor
- * @param {!string} path
- */
-Packages.java.io.FileOutputStream = function (path) {};
-/**
- * @param {!number} b
- * @return {undefined}
- */
-Packages.java.io.FileOutputStream.prototype.write = function (b) {};
-/**
- * @return {undefined}
- */
-Packages.java.io.FileOutputStream.prototype.close = function () {};
-/**
- * @constructor
- * @param {!Packages.java.io.FileReader} reader
- */
-Packages.org.xml.sax.InputSource = function (reader) {};
-/**
- * @type {!StyleSheet}
- */
-HTMLStyleElement.prototype.sheet;
-XMLHttpRequest.prototype.sendAsBinary = function (data) {};
-/**
- * @const@type{!string}
- */
-XMLHttpRequest.prototype.responseBody;
-window.nativeio = {};
-var VBArray = {};
-VBArray.prototype.toArray = function () {};
-/**
- * @interface
- */
-function TreeWalker() {}
-/**
- * @const@type{!Node}
- */
-TreeWalker.prototype.root;
-/**
- * @const@type{number}
- */
-TreeWalker.prototype.whatToShow;
-/**
- * @const@type{NodeFilter}
- */
-TreeWalker.prototype.filter;
-/**
- * @const@type{boolean}
- */
-TreeWalker.prototype.expandEntityReferences;
-/**
- * @type{Node}
- */
-TreeWalker.prototype.currentNode;
-/**
- * @return {Node}
- */
-TreeWalker.prototype.parentNode = function () {};
-/**
- * @return {Node}
- */
-TreeWalker.prototype.firstChild = function () {};
-/**
- * @return {Node}
- */
-TreeWalker.prototype.lastChild = function () {};
-/**
- * @return {Node}
- */
-TreeWalker.prototype.previousSibling = function () {};
-/**
- * @return {Node}
- */
-TreeWalker.prototype.nextSibling = function () {};
-/**
- * @return {Node}
- */
-TreeWalker.prototype.previousNode = function () {};
-/**
- * @return {Node}
- */
-TreeWalker.prototype.nextNode = function () {};
-/**
- * @param {!Node} root
- * @param {!number} whatToShow
- * @param {NodeFilter=} filter
- * @param {boolean=} entityReferenceExpansion
- * @return {!TreeWalker}
- */
-Document.prototype.createTreeWalker = function (root, whatToShow, filter, entityReferenceExpansion) {};
diff --git a/apps/files_odfviewer/src/webodf/webodf/tools/extjsexterns.js b/apps/files_odfviewer/src/webodf/webodf/tools/extjsexterns.js
deleted file mode 100644
index f65d0c5cdb..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/tools/extjsexterns.js
+++ /dev/null
@@ -1,171 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global Packages HTMLStyleElement window XMLHttpRequest HTMLStyleElement Document*/
-/*jslint nomen: false */
-var Ext = {};
-Ext.data = {};
-/**
- * @constructor
- */
-Ext.data.Model = function (settings) {};
-/**
- * @param {!string} fieldName
- * @return {!string}
- */
-Ext.data.Model.prototype.get = function (fieldName) {};
-/**
- * @return {!boolean}
- */
-Ext.data.Model.isExpanded = function () {};
-/**
- * @constructor
- */
-Ext.data.NodeInterface = function () {};
-/**
- * @param {!string} attribute
- * @param {*} value
- * @param {boolean=} deep
- * @return {Ext.data.NodeInterface}
- */
-Ext.data.NodeInterface.prototype.findChild = function (attribute, value, deep) {};
-/**
- * @param {!Ext.data.NodeInterface|!Object} node
- * @return {!Ext.data.NodeInterface}
- */
-Ext.data.NodeInterface.prototype.appendChild = function (node) {};
-/**
- * @param {!string} id
- * @return {Ext.Component}
- */
-Ext.getCmp = function (id) {};
-Ext.tree = {};
-/**
- * @constructor
- */
-Ext.tree.Panel = function (settings) {};
-/**
- * @return {!Ext.data.NodeInterface}
- */
-Ext.tree.Panel.prototype.getRootNode = function () {};
-Ext.component = {};
-/**
- * @constructor
- * @extends {Ext.Component}
- */
-Ext.component.Component = function (settings) {};
-/**
- * @return {!Ext.Element}
- */
-Ext.component.Component.prototype.getEl = function () {};
-/**
- * @constructor
- */
-Ext.Button = function (settings) {};
-/**
- * @constructor
- */
-Ext.Component = function (settings) {};
-/**
- * @type {Object}
- */
-Ext.Component.prototype.superclass = {};
-/**
- * @type {!Ext.Element}
- */
-Ext.Component.prototype.el;
-/**
- * @constructor
- */
-Ext.Element = function (settings) {};
-/**
- * @constructor
- */
-Ext.Panel = function (settings) {};
-/**
- * @type {!Element}
- */
-Ext.Element.prototype.dom;
-Ext.QuickTips = {};
-/**
- * @return {undefined}
- */
-Ext.QuickTips.init = function () {};
-/**
- * @constructor
- */
-Ext.Slider = function (settings) {};
-Ext.util = {};
-/**
- * @constructor
- */
-Ext.util.MixedCollection = function () {};
-/**
- * @param {!Function} f
- */
-Ext.util.MixedCollection.prototype.findBy = function (f) {};
-Ext.tab = {};
-/**
- * @constructor
- */
-Ext.tab.Panel = function (settings) {};
-/**
- * @param {!Object} component
- * @return {undefined}
- */
-Ext.tab.Panel.prototype.add = function (component) {};
-/**
- * @return {!Ext.Component}
- */
-Ext.tab.Panel.prototype.getActiveTab = function () {};
-/**
- * @param {!Ext.Component} tab
- * @return {undefined}
- */
-Ext.tab.Panel.prototype.setActiveTab = function (tab) {};
-/**
- * @type {!Ext.util.MixedCollection}
- */
-Ext.tab.Panel.prototype.items;
-/**
- * @constructor
- */
-Ext.Toolbar = function (settings) {};
-/**
- * @constructor
- */
-Ext.Toolbar.TextItem = function (text) {};
-/**
- * @constructor
- */
-Ext.Viewport = function (settings) {};
-Ext.onReady = function (callback) {};
diff --git a/apps/files_odfviewer/src/webodf/webodf/tools/fixLicenses.py b/apps/files_odfviewer/src/webodf/webodf/tools/fixLicenses.py
deleted file mode 100755
index a81c9b55c6..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/tools/fixLicenses.py
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/usr/bin/python -Qwarnall
-# -*- coding: utf-8 -*-
-#
-# This script checks if all files have licenses and fixes them if needed.
-# The script should be run from the root directory of the webodf project.
-import os, os.path
-
-# read the license text from the source file
-# the license starts at the line ' * @licstart' and ends at ' */'
-def readLicense(path):
-	file = open(path, "rU")
-	licensetext = []
-	started = False
-	for line in file:
-		if line.rstrip() == ' * @licstart':
-			started = True
-		if started:
-			licensetext.append(line)
-		if line.rstrip() == ' */':
-			break
-	return licensetext
-
-def writeLicense(file, license, defaultcopyright):
-	if defaultcopyright:
-		file.write(defaultcopyright)
-	file.writelines(license)
-
-def fixLicense(path, license, defaultcopyright):
-	# read the file
-	file = open(path, "rU")
-	lines = file.readlines()
-	file.close()
-	# does the file have any copyright statement already?
-	hasLicense = False
-	hasCopyright = False
-	for line in lines:
-		if line.rstrip() == ' * @licstart':
-			hasLicense = True
-		if line[:17] == ' * Copyright (C) ':
-			hasCopyright = True
-	if hasCopyright:
-		defaultcopyright = None
-	wroteLicense = False
-	skip = False
-	# write the file with the new slice
-	file = open(path, "w")
-	for line in lines:
-		if not wroteLicense:
-			if not hasLicense:
-				file.write("/**\n")
-				writeLicense(file, license, defaultcopyright)
-				wroteLicense = True
-			elif line.rstrip() == ' * @licstart':
-				writeLicense(file, license, defaultcopyright)
-				wroteLicense = True
-				skip = True
-		if skip:
-			if line.rstrip() == ' */':
-				skip = False
-		else:
-			file.write(line)
-	file.close()
-
-# get list of *.js files
-jsfiles = []
-for root, directories, files in os.walk("."):
-	while "extjs" in directories:
-		directories.remove("extjs")
-	for f in files:
-		if f[-3:] == ".js":
-			jsfiles.append(os.path.abspath(os.path.join(root, f)))
-
-# remove webodf/lib/packackages.js since it is the source for the licenses
-sourcefilepath = os.path.join(os.getcwd(), "webodf/lib/packages.js")
-jsfiles.remove(sourcefilepath)
-
-licensetext = readLicense(sourcefilepath)
-defaultcopyright = " * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>\n"
-
-for f in jsfiles:
-	fixLicense(f, licensetext, defaultcopyright)
diff --git a/apps/files_odfviewer/src/webodf/webodf/tools/refcheck/bootstrap.xsl b/apps/files_odfviewer/src/webodf/webodf/tools/refcheck/bootstrap.xsl
deleted file mode 100644
index 747e3e605b..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/tools/refcheck/bootstrap.xsl
+++ /dev/null
@@ -1,193 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
-  xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-  xmlns:o="urn:odfkeys" xmlns:x="dummy" exclude-result-prefixes="o">
- <xsl:output method="xml" indent="yes"/>
- <xsl:namespace-alias stylesheet-prefix="x" result-prefix="xsl"/>
-
- <xsl:template name="join" >
-  <xsl:param name="values"/>
-  <xsl:param name="separator"/>
-  <xsl:for-each select="$values">
-   <xsl:choose>
-    <xsl:when test="position() = 1">
-     <xsl:value-of select="."/>
-    </xsl:when>
-    <xsl:otherwise>
-     <xsl:value-of select="concat($separator, .) "/>
-    </xsl:otherwise>
-   </xsl:choose>
-  </xsl:for-each>
- </xsl:template>
-
- <xsl:template name="getdefs">
-  <xsl:param name="name"/>
-  <xsl:param name="separator"/>
-  <xsl:variable name="key" select="../o:key[@name=$name]"/>
-  <xsl:if test="$key/@extends">
-   <xsl:call-template name="getdefs">
-    <xsl:with-param name="name" select="$key/@extends"/>
-    <xsl:with-param name="separator" select="$separator"/>
-   </xsl:call-template>
-   <xsl:text>|</xsl:text>
-  </xsl:if>
-  <xsl:call-template name="join">
-   <xsl:with-param name="values" select="$key/o:def"/>
-   <xsl:with-param name="separator" select="$separator"/>
-  </xsl:call-template>
- </xsl:template>
-
- <xsl:template match="o:key" mode="define">
-  <xsl:variable name="def">
-   <xsl:call-template name="getdefs">
-    <xsl:with-param name="name" select="@name"/>
-    <xsl:with-param name="separator" select="'|'"/>
-   </xsl:call-template>
-  </xsl:variable>
-  <xsl:variable name="ref">
-   <xsl:call-template name="join">
-    <xsl:with-param name="values" select="o:ref"/>
-    <xsl:with-param name="separator" select="'|'"/>
-   </xsl:call-template>
-  </xsl:variable>
-  <x:template name="check{@name}">
-   <x:param name="stylesfontfaces" />
-   <x:param name="fontfaces" />
-   <x:param name="officestyles" />
-   <x:param name="stylesautostyles" />
-   <x:param name="contentautostyles" />
-   <x:param name="masterstyles" />
-   <x:param name="body" />
-   <x:call-template name="checkReferences">
-    <x:with-param name="name" select="'{@name}'"/>
-    <x:with-param name="definitions" select="{$def}"/>
-    <x:with-param name="references" select="{$ref}"/>
-   </x:call-template>
-  </x:template>
- </xsl:template>
-
- <xsl:template match="o:key" mode="call">
-  <x:call-template name="check{@name}">
-   <x:with-param name="stylesfontfaces" select="$stylesfontfaces"/>
-   <x:with-param name="fontfaces" select="$fontfaces"/>
-   <x:with-param name="officestyles" select="$officestyles"/>
-   <x:with-param name="stylesautostyles" select="$stylesautostyles"/>
-   <x:with-param name="contentautostyles" select="$contentautostyles"/>
-   <x:with-param name="masterstyles" select="$masterstyles"/>
-   <x:with-param name="body" select="$body"/>
-  </x:call-template>
- </xsl:template>
-
- <xsl:template match="/o:keys">
-  <x:stylesheet version="1.0">
-   <xsl:for-each select="namespace::*"><xsl:copy/></xsl:for-each>
-
-   <xsl:apply-templates select="o:key" mode="define"/>
-
-   <x:template name="check">
-    <x:param name="stylesfontfaces" />
-    <x:param name="fontfaces" />
-    <x:param name="officestyles" />
-    <x:param name="stylesautostyles" />
-    <x:param name="contentautostyles" />
-    <x:param name="masterstyles" />
-    <x:param name="body" />
-    <xsl:apply-templates select="o:key" mode="call"/>
-   </x:template>
-
-   <x:template name="checkuniqueitem">
-    <x:param name="listname"/>
-    <x:param name="list"/>
-    <x:param name="item"/>
-    <x:if test="count($list[.=$item])!=1">
-     <x:message>
-      <x:value-of select="concat('The key with value &quot;', $item, '&quot; is used more than once in ', $listname, '.')"/>
-     </x:message>
-    </x:if>
-   </x:template>
-   
-   <x:template name="checkunique">
-    <x:param name="listname"/>
-    <x:param name="list"/>
-    <x:variable name="count">
-    </x:variable>
-    <x:for-each select="$list">
-     <x:call-template name="checkuniqueitem">
-      <x:with-param name="listname" select="$listname"/>
-      <x:with-param name="list" select="$list"/>
-      <x:with-param name="item" select="."/>
-     </x:call-template>
-    </x:for-each>
-   </x:template>
-   
-   <x:template name="verifyOccurance">
-    <x:param name="name"/>
-    <x:param name="definitions"/>
-    <x:param name="reference"/>
-    <x:if test="count($definitions[.=$reference])=0">
-     <x:message>
-      <x:value-of select="concat('There is no key with value &quot;', $reference, '&quot; in the key list ', $name, '.')"/>
-     </x:message>
-    </x:if>
-   </x:template>
-
-   <x:template name="checkReferences">
-    <x:param name="name"/>
-    <x:param name="definitions"/>
-    <x:param name="references"/>
-   
-    <x:call-template name="checkunique">
-     <x:with-param name="listname" select="$name"/>
-     <x:with-param name="list" select="$definitions"/>
-    </x:call-template>
-   
-    <x:for-each select="$references">
-     <x:call-template name="verifyOccurance">
-      <x:with-param name="name" select="$name"/>
-      <x:with-param name="definitions" select="$definitions"/>
-      <x:with-param name="reference" select="."/>
-     </x:call-template>
-    </x:for-each>
-   </x:template>
-
-   <x:template match="/office:document">
-    <x:call-template name="check">
-     <x:with-param name="stylesfontfaces" select="office:font-face-decls"/>
-     <x:with-param name="fontfaces" select="office:font-face-decls"/>
-     <x:with-param name="officestyles" select="office:styles"/>
-     <x:with-param name="stylesautostyles" select="office:automatic-styles"/>
-     <x:with-param name="contentautostyles" select="office:automatic-styles"/>
-     <x:with-param name="masterstyles" select="office:master-styles"/>
-     <x:with-param name="body" select="office:body"/>
-    </x:call-template>
-   </x:template>
-
-   <x:template match="/office:document-styles">
-    <x:call-template name="check">
-     <x:with-param name="stylesfontfaces" select="office:font-face-decls"/>
-     <x:with-param name="fontfaces" select="office:font-face-decls"/>
-     <x:with-param name="officestyles" select="office:styles"/>
-     <x:with-param name="stylesautostyles" select="office:automatic-styles"/>
-     <x:with-param name="contentautostyles" select="not-available"/>
-     <x:with-param name="masterstyles" select="office:master-styles"/>
-     <x:with-param name="body" select="not-available"/>
-    </x:call-template>
-   </x:template>
-
-   <x:template match="/office:document-content">
-    <x:variable name="stylesxml" select="document('styles.xml', .)/office:document-styles" />
-    <x:variable name="stylesfontfaces" select="$stylesxml/office:font-face-decls" />
-    <x:call-template name="check">
-     <x:with-param name="stylesfontfaces" select="$stylesfontfaces"/>
-     <x:with-param name="fontfaces" select="$stylesfontfaces|office:font-face-decls"/>
-     <x:with-param name="officestyles" select="$stylesxml/office:styles"/>
-     <x:with-param name="stylesautostyles" select="$stylesxml/office:automatic-styles"/>
-     <x:with-param name="contentautostyles" select="office:automatic-styles"/>
-     <x:with-param name="masterstyles" select="$stylesxml/office:master-styles"/>
-     <x:with-param name="body" select="office:body"/>
-    </x:call-template>
-   </x:template>
-  </x:stylesheet>
- </xsl:template>
-
-</xsl:stylesheet>
diff --git a/apps/files_odfviewer/src/webodf/webodf/tools/refcheck/odfkeys.xml b/apps/files_odfviewer/src/webodf/webodf/tools/refcheck/odfkeys.xml
deleted file mode 100644
index e2ad06941c..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/tools/refcheck/odfkeys.xml
+++ /dev/null
@@ -1,455 +0,0 @@
-<keys xmlns="urn:odfkeys"
-  xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
-  xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
-  xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
-  xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"
-  xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
-  xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"
-  xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
-  xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
-  >
- <doc>
-  <h2>ODF reference checker</h2>
-  <p>ODF documents use string keys and references to link different parts of the document. There are quite a few different groups of keys. The description of how these keys work in the specification is not trivial to implement, because not keys behave differently depending on the context in which they are defined. E.g. a style has a family. If the family is 'text', then only certain attributes on certain elements in certain parts of the ODF document may refer to that style.</p>
-  <p>For a beginning and even intermediate ODF developer or document producer, this is quite complicated. Also, there is not currently an easy way to check if all the references are correct. This document aims to make it easier to figure out what groups of keys exist and from which elements they may be linked.</p>
-  <p>The document consists of one &lt;key> element for each group of keys. Each group has a name and is defined by one or more XPath expressions in &lt;def> elements. Any string that matches the XPath expression in a particular document is part of the set of keys of that group. Each key in a set must be unique.</p>
-  <p>In addition, each &lt;key> has a number of &lt;ref> elements that define the positions in the document where a key may be referenced. Each reference must exist in the set of keys that are found via the &lt;def> elements.</p>
-  <p>The format of this document is designed to be easy to read but also to make it easy to use in a reference checker. This document comes with checked implemented in XSL. The XSL is called bootstrap.xsl and is used in two transformation steps. Here is shown how to run the check with <tt>xsltproc</tt>:</p>
-  <pre>xsltproc bootstrap.xsl odfkeys.xml > checkkeys.xsl</pre>
-  <pre>xsltproc checkkeys.xsl content.xml</pre>
-  <p>The check can be run on content.xml files, on styles.xml files and on flat ODF files.</p>
-  <h2>Definitions</h2>
-  <dl>
-   <dt>$stylesfontfaces</dt>
-   <dd>This variable refers to the subset of font face definitions that are available to the style elements. Styles.xml may not refer to font faces defined in content.xml.</dd>
-   <dt>$fontfaces</dt>
-   <dd>This variable refers to all font face definitions.</dd>
-   <dt>$officestyles</dt>
-   <dd>This variable refers to the element office:styles.</dd>
-   <dt>$stylesautostyles</dt>
-   <dd>This variable refers to the element office:automatic-styles in styles.xml.</dd>
-   <dt>$contentautostyles</dt>
-   <dd>This variable refers to the element office:automatic-styles in content.xml. When evaluating a styles.xml document, it is an empty set.</dd>
-   <dt>$masterstyles</dt>
-   <dd>This variable refers to the office:master-styles element.</dd>
-   <dt>$body</dt>
-   <dd>This variable refers to the office:body element. When evaluating a styles.xml document, it is an empty set.</dd>
-  </dl>
-  <h2>TODO</h2> 
-  <ul>
-   <li>implement &lt;refs/> to check refs of type styleNameRefs</li>
-   <li>check for unused automatic styles</li>
-   <li>check that there are no circular dependencies in style inheritance</li>
-  </ul>
- </doc>
- <key name="gradient">
-  <def>$officestyles/draw:gradient/@draw:name</def>
-  <def>$officestyles/svg:linearGradient/@draw:name</def>
-  <def>$officestyles/svg:radialGradient/@draw:name</def>
-  <ref>$officestyles//@draw:fill-gradient-name</ref>
-  <ref>$stylesautostyles//@draw:fill-gradient-name</ref>
-  <ref>$contentautostyles//@draw:fill-gradient-name</ref>
- </key>
- <key name="hatch">
-  <def>$officestyles/draw:hatch/@draw:name</def>
-  <ref>$officestyles//@draw:fill-hatch-name</ref>
-  <ref>$stylesautostyles//@draw:fill-hatch-name</ref>
-  <ref>$contentautostyles//@draw:fill-hatch-name</ref>
- </key>
- <key name="fill-image">
-  <def>$officestyles/draw:fill-image/@draw:name</def>
-  <ref>$officestyles//@draw:fill-image-name</ref>
-  <ref>$stylesautostyles//@draw:fill-image-name</ref>
-  <ref>$contentautostyles//@draw:fill-image-name</ref>
- </key>
- <key name="marker">
-  <def>$officestyles/draw:marker/@draw:name</def>
-  <ref>$officestyles//@draw:marker-start</ref>
-  <ref>$officestyles//@draw:marker-end</ref>
-  <ref>$stylesautostyles//@draw:marker-start</ref>
-  <ref>$stylesautostyles//@draw:marker-end</ref>
-  <ref>$contentautostyles//@draw:marker-start</ref>
-  <ref>$contentautostyles//@draw:marker-end</ref>
- </key>
- <key name="stroke-dash">
-  <def>$officestyles/draw:stroke-dash/@draw:name</def>
-  <ref>$officestyles//@draw:stroke-dash</ref>
-  <ref>$stylesautostyles//@draw:stroke-dash</ref>
-  <ref>$contentautostyles//@draw:stroke-dash</ref>
-  <refs>$officestyles//@draw:stroke-dash-names</refs>
-  <refs>$stylesautostyles//@draw:stroke-dash-names</refs>
-  <refs>$contentautostyles//@draw:stroke-dash-names</refs>
- </key>
- <key name="opacity">
-  <def>$officestyles/draw:opacity/@draw:name</def>
-  <ref>$officestyles//@draw:opacity-name</ref>
-  <ref>$stylesautostyles//@draw:opacity-name</ref>
-  <ref>$contentautostyles//@draw:opacity-name</ref>
- </key>
- <key name="styles-font-face">
-  <def>$stylesfontfaces/style:font-face/@style:name</def>
-  <ref>$officestyles//style:text-properties/@style:font-name</ref>
-  <ref>$officestyles//style:text-properties/@style:font-name-asian</ref>
-  <ref>$officestyles//style:text-properties/@style:font-name-complex</ref>
-  <ref>$officestyles//style:list-level-properties/@style:font-name</ref>
-  <ref>$stylesautostyles//style:text-properties/@style:font-name</ref>
-  <ref>$stylesautostyles//style:text-properties/@style:font-name-asian</ref>
-  <ref>$stylesautostyles//style:text-properties/@style:font-name-complex</ref>
-  <ref>$stylesautostyles//style:list-level-properties/@style:font-name</ref>
- </key>
- <key name="font-face">
-  <def>$fontfaces/style:font-face/@style:name</def>
-  <ref>$contentautostyles//style:text-properties/@style:font-name</ref>
-  <ref>$contentautostyles//style:text-properties/@style:font-name-asian</ref>
-  <ref>$contentautostyles//style:text-properties/@style:font-name-complex</ref>
-  <ref>$contentautostyles//style:list-level-properties/@style:font-name</ref>
- </key>
- <key name="master-page">
-  <def>$masterstyles/style:master-page/@style:name</def>
-  <!--draw:master-page-name-->
-  <ref>$body/office:drawing/draw:page/@draw:master-page-name</ref>
-  <ref>$body/office:presentation/draw:page/@draw:master-page-name</ref>
-  <!--style:master-page-name-->
-  <ref>$officestyles/style:style[@style:family='paragraph']/@style:master-page-name</ref>
-  <ref>$officestyles/style:style[@style:family='table']/@style:master-page-name</ref>
-  <ref>$stylesautostyles/style:style[@style:family='paragraph']/@style:master-page-name</ref>
-  <ref>$stylesautostyles/style:style[@style:family='table']/@style:master-page-name</ref>
-  <ref>$contentautostyles/style:style[@style:family='paragraph']/@style:master-page-name</ref>
-  <ref>$contentautostyles/style:style[@style:family='table']/@style:master-page-name</ref>
-  <!--style:next-style-name-->
-  <ref>$masterstyles/style:master-page/@style:next-style-name</ref>
-  <!--text:master-page-name-->
-  <ref>$officestyles/text:notes-configuration/@text:master-page-name</ref>
-  <ref>$officestyles/style:default-style[@style:family='section']/style:section-properties/text:notes-configuration/@text:master-page-name</ref>
-  <ref>$officestyles/style:style[@style:family='section']/style:section-properties/text:notes-configuration/@text:master-page-name</ref>
-  <ref>$stylesautostyles/style:style[@style:family='section']/style:section-properties/text:notes-configuration/@text:master-page-name</ref>
-  <ref>$contentautostyles/style:style[@style:family='section']/style:section-properties/text:notes-configuration/@text:master-page-name</ref>
-  <ref>$body/office:text/text:page-sequence/text:page/@text:master-page-name</ref>
-  <!--style:parent-style-name: not handled: likely an error in the specification -->
- </key>
- <key name="presentation-page-layout">
-  <def>$officestyles/style:presentation-page-layout/@style:name</def>
-  <ref>$masterstyles/style:handout-master/@presentation:presentation-page-layout-name</ref>
-  <ref>$body/office:drawing/draw:page/@presentation:presentation-page-layout-name</ref>
-  <ref>$body/office:presentation/draw:page/@presentation:presentation-page-layout-name</ref>
- </key>
- <key name="styles-page-layout">
-  <def>$stylesautostyles/style:page-layout/@style:name</def>
-  <ref>$masterstyles/style:master-page/@style:page-layout-name</ref>
-  <ref>$masterstyles/style:master-page/presentation:notes/@style:page-layout-name</ref>
-  <ref>$masterstyles/style:handout-master/@style:page-layout-name</ref>
- </key>
- <key name="content-page-layout">
-  <def>$contentautostyles/style:page-layout/@style:name</def>
-  <ref>$body/office:presentation/draw:page/presentation:notes/@style:page-layout-name</ref>
- </key>
- <key name="common-list-styles">
-  <def>$officestyles/text:list-style/@style:name</def>
-  <def>$officestyles//style:graphic-properties/text:list-style/@style:name</def>
-  <ref emptyok="true">$officestyles/style:style/@style:list-style-name</ref>
- </key>
- <key name="styles-list-styles" extends="common-list-styles">
-  <def>$stylesautostyles/text:list-style/@style:name</def>
-  <def>$stylesautostyles//style:graphic-properties/text:list-style/@style:name</def>
-  <ref emptyok="true">$stylesautostyles/style:style/@style:list-style-name</ref>
-  <ref>$masterstyles//text:list/@text:style-name</ref>
-  <ref>$masterstyles//text:numbered-paragraphs/@text:style-name</ref>
-  <ref>$masterstyles//text:list-item/@text:style-override</ref>
- </key>
- <key name="content-list-styles" extends="common-list-styles">
-  <def>$contentautostyles/text:list-style/@style:name</def>
-  <def>$contentautostyles//style:graphic-properties/text:list-style/@style:name</def>
-  <ref emptyok="true">$contentautostyles/style:style/@style:list-style-name</ref>
-  <ref>$body//text:list/@text:style-name</ref>
-  <ref>$body//text:numbered-paragraphs/@text:style-name</ref>
-  <ref>$body//text:list-item/@text:style-override</ref>
- </key>
- <key name="common-data-styles">
-  <def>$officestyles/number:number-style/@style:name</def>
-  <def>$officestyles/number:currency-style/@style:name</def>
-  <def>$officestyles/number:percentage-style/@style:name</def>
-  <def>$officestyles/number:date-style/@style:name</def>
-  <def>$officestyles/number:time-style/@style:name</def>
-  <def>$officestyles/number:boolean-style/@style:name</def>
-  <def>$officestyles/number:text-style/@style:name</def>
-  <ref>$officestyles/style:style/@style:data-style-name</ref>
-  <ref>$officestyles/style:style/@style:percentage-data-style-name</ref>
- </key>
- <key name="styles-data-styles" extends="common-data-styles">
-  <def>$stylesautostyles/number:number-style/@style:name</def>
-  <def>$stylesautostyles/number:currency-style/@style:name</def>
-  <def>$stylesautostyles/number:percentage-style/@style:name</def>
-  <def>$stylesautostyles/number:date-style/@style:name</def>
-  <def>$stylesautostyles/number:time-style/@style:name</def>
-  <def>$stylesautostyles/number:boolean-style/@style:name</def>
-  <def>$stylesautostyles/number:text-style/@style:name</def>
-  <ref>$stylesautostyles/style:style/@style:data-style-name</ref>
-  <ref>$stylesautostyles/style:style/@style:percentage-data-style-name</ref>
-  <ref>$masterstyles//text:creation-date/@style:data-style-name</ref>
-  <ref>$masterstyles//text:creation-time/@style:data-style-name</ref>
-  <ref>$masterstyles//text:database-display/@style:data-style-name</ref>
-  <ref>$masterstyles//text:date/@style:data-style-name</ref>
-  <ref>$masterstyles//text:editing-duration/@style:data-style-name</ref>
-  <ref>$masterstyles//text:expression/@style:data-style-name</ref>
-  <ref>$masterstyles//text:meta-field/@style:data-style-name</ref>
-  <ref>$masterstyles//text:modification-date/@style:data-style-name</ref>
-  <ref>$masterstyles//text:modification-time/@style:data-style-name</ref>
-  <ref>$masterstyles//text:print-date/@style:data-style-name</ref>
-  <ref>$masterstyles//text:print-time/@style:data-style-name</ref>
-  <ref>$masterstyles//text:table-formula/@style:data-style-name</ref>
-  <ref>$masterstyles//text:time/@style:data-style-name</ref>
-  <ref>$masterstyles//text:user-defined/@style:data-style-name</ref>
-  <ref>$masterstyles//text:user-field-get/@style:data-style-name</ref>
-  <ref>$masterstyles//text:user-field-input/@style:data-style-name</ref>
-  <ref>$masterstyles//text:variable-get/@style:data-style-name</ref>
-  <ref>$masterstyles//text:variable-input/@style:data-style-name</ref>
-  <ref>$masterstyles//text:variable-set/@style:data-style-name</ref>
- </key>
- <key name="content-data-styles" extends="common-data-styles">
-  <def>$contentautostyles/number:number-style/@style:name</def>
-  <def>$contentautostyles/number:currency-style/@style:name</def>
-  <def>$contentautostyles/number:percentage-style/@style:name</def>
-  <def>$contentautostyles/number:date-style/@style:name</def>
-  <def>$contentautostyles/number:time-style/@style:name</def>
-  <def>$contentautostyles/number:boolean-style/@style:name</def>
-  <def>$contentautostyles/number:text-style/@style:name</def>
-  <ref>$contentautostyles/style:style/@style:data-style-name</ref>
-  <ref>$contentautostyles/style:style/@style:percentage-data-style-name</ref>
-  <ref>$body/office:presentation/presentation:date-time-decl/@style:data-style-name</ref>
-  <ref>$body//text:creation-date/@style:data-style-name</ref>
-  <ref>$body//text:creation-time/@style:data-style-name</ref>
-  <ref>$body//text:database-display/@style:data-style-name</ref>
-  <ref>$body//text:date/@style:data-style-name</ref>
-  <ref>$body//text:editing-duration/@style:data-style-name</ref>
-  <ref>$body//text:expression/@style:data-style-name</ref>
-  <ref>$body//text:meta-field/@style:data-style-name</ref>
-  <ref>$body//text:modification-date/@style:data-style-name</ref>
-  <ref>$body//text:modification-time/@style:data-style-name</ref>
-  <ref>$body//text:print-date/@style:data-style-name</ref>
-  <ref>$body//text:print-time/@style:data-style-name</ref>
-  <ref>$body//text:table-formula/@style:data-style-name</ref>
-  <ref>$body//text:time/@style:data-style-name</ref>
-  <ref>$body//text:user-defined/@style:data-style-name</ref>
-  <ref>$body//text:user-field-get/@style:data-style-name</ref>
-  <ref>$body//text:user-field-input/@style:data-style-name</ref>
-  <ref>$body//text:variable-get/@style:data-style-name</ref>
-  <ref>$body//text:variable-input/@style:data-style-name</ref>
-  <ref>$body//text:variable-set/@style:data-style-name</ref>
- </key>
- <key name="common-chart-style">
-  <def>$officestyles/style:style[@style:family='chart']/@style:name</def>
-  <ref>$officestyles/style:style[@style:family='chart']/@style:parent-style-name</ref>
-  <ref>$stylesautostyles/style:style[@style:family='chart']/@style:parent-style-name</ref>
-  <ref>$contentautostyles/style:style[@style:family='chart']/@style:parent-style-name</ref>
- </key>
- <key name="styles-chart-style" extends="common-chart-style">
-  <def>$stylesautostyles/style:style[@style:family='chart']/@style:name</def>
-  <ref>$masterstyles//chart:axis/@chart:style-name</ref>
-  <ref>$masterstyles//chart:chart/@chart:style-name</ref>
-  <ref>$masterstyles//chart:data-label/@chart:style-name</ref>
-  <ref>$masterstyles//chart:data-point/@chart:style-name</ref>
-  <ref>$masterstyles//chart:equation/@chart:style-name</ref>
-  <ref>$masterstyles//chart:error-indicator/@chart:style-name</ref>
-  <ref>$masterstyles//chart:floor/@chart:style-name</ref>
-  <ref>$masterstyles//chart:footer/@chart:style-name</ref>
-  <ref>$masterstyles//chart:grid/@chart:style-name</ref>
-  <ref>$masterstyles//chart:legend/@chart:style-name</ref>
-  <ref>$masterstyles//chart:mean-value/@chart:style-name</ref>
-  <ref>$masterstyles//chart:plot-area/@chart:style-name</ref>
-  <ref>$masterstyles//chart:regression-curve/@chart:style-name</ref>
-  <ref>$masterstyles//chart:series/@chart:style-name</ref>
-  <ref>$masterstyles//chart:stock-gain-marker/@chart:style-name</ref>
-  <ref>$masterstyles//chart:stock-loss-marker/@chart:style-name</ref>
-  <ref>$masterstyles//chart:stock-range-line/@chart:style-name</ref>
-  <ref>$masterstyles//chart:subtitle/@chart:style-name</ref>
-  <ref>$masterstyles//chart:title/@chart:style-name</ref>
-  <ref>$masterstyles//chart:wall/@chart:style-name</ref>
- </key>
- <key name="content-chart-style" extends="common-chart-style">
-  <def>$contentautostyles/style:style[@style:family='chart']/@style:name</def>
-  <ref>$body//chart:axis/@chart:style-name</ref>
-  <ref>$body//chart:chart/@chart:style-name</ref>
-  <ref>$body//chart:data-label/@chart:style-name</ref>
-  <ref>$body//chart:data-point/@chart:style-name</ref>
-  <ref>$body//chart:equation/@chart:style-name</ref>
-  <ref>$body//chart:error-indicator/@chart:style-name</ref>
-  <ref>$body//chart:floor/@chart:style-name</ref>
-  <ref>$body//chart:footer/@chart:style-name</ref>
-  <ref>$body//chart:grid/@chart:style-name</ref>
-  <ref>$body//chart:legend/@chart:style-name</ref>
-  <ref>$body//chart:mean-value/@chart:style-name</ref>
-  <ref>$body//chart:plot-area/@chart:style-name</ref>
-  <ref>$body//chart:regression-curve/@chart:style-name</ref>
-  <ref>$body//chart:series/@chart:style-name</ref>
-  <ref>$body//chart:stock-gain-marker/@chart:style-name</ref>
-  <ref>$body//chart:stock-loss-marker/@chart:style-name</ref>
-  <ref>$body//chart:stock-range-line/@chart:style-name</ref>
-  <ref>$body//chart:subtitle/@chart:style-name</ref>
-  <ref>$body//chart:title/@chart:style-name</ref>
-  <ref>$body//chart:wall/@chart:style-name</ref>
- </key>
- <key name="common-ruby-style">
-  <def>$officestyles/style:style[@style:family='ruby']/@style:name</def>
-  <ref>$officestyles/style:style[@style:family='ruby']/@style:parent-style-name</ref>
-  <ref>$stylesautostyles/style:style[@style:family='ruby']/@style:parent-style-name</ref>
-  <ref>$contentautostyles/style:style[@style:family='ruby']/@style:parent-style-name</ref>
- </key>
- <key name="styles-ruby-style" extends="common-ruby-style">
-  <def>$stylesautostyles/style:style[@style:family='ruby']/@style:name</def>
-  <ref>$masterstyles//text:ruby/@text:style-name</ref>
- </key>
- <key name="content-ruby-style" extends="common-ruby-style">
-  <def>$contentautostyles/style:style[@style:family='ruby']/@style:name</def>
-  <ref>$body//text:ruby/@text:style-name</ref>
- </key>
-<!-- clearly unfinished below here: more refs needed -->
- <key name="common-text-style">
-  <def>$officestyles/style:style[@style:family='text']/@style:name</def>
-  <ref>$officestyles/style:style[@style:family='text']/@style:parent-style-name</ref>
-  <ref>$stylesautostyles/style:style[@style:family='text']/@style:parent-style-name</ref>
-  <ref>$contentautostyles/style:style[@style:family='text']/@style:parent-style-name</ref>
- </key>
- <key name="styles-text-style" extends="common-text-style">
-  <def>$stylesautostyles/style:style[@style:family='text']/@style:name</def>
-  <ref>$masterstyles//text:span/@text:style-name</ref>
- </key>
- <key name="content-text-style" extends="common-text-style">
-  <def>$contentautostyles/style:style[@style:family='text']/@style:name</def>
-  <ref>$body//text:span/@text:style-name</ref>
- </key>
- <key name="common-paragraph-style">
-  <def>$officestyles/style:style[@style:family='paragraph']/@style:name</def>
-  <ref>$officestyles/style:style[@style:family='paragraph']/@style:parent-style-name</ref>
-  <ref>$stylesautostyles/style:style[@style:family='paragraph']/@style:parent-style-name</ref>
-  <ref>$contentautostyles/style:style[@style:family='paragraph']/@style:parent-style-name</ref>
- </key>
- <key name="styles-paragraph-style" extends="common-paragraph-style">
-  <def>$stylesautostyles/style:style[@style:family='paragraph']/@style:name</def>
-  <ref>$masterstyles//text:p/@text:style-name</ref>
- </key>
- <key name="content-paragraph-style" extends="common-paragraph-style">
-  <def>$contentautostyles/style:style[@style:family='paragraph']/@style:name</def>
-  <ref>$body//text:p/@text:style-name</ref>
- </key>
- <key name="common-section-style">
-  <def>$officestyles/style:style[@style:family='section']/@style:name</def>
-  <ref>$officestyles/style:style[@style:family='section']/@style:parent-style-name</ref>
-  <ref>$stylesautostyles/style:style[@style:family='section']/@style:parent-style-name</ref>
-  <ref>$contentautostyles/style:style[@style:family='section']/@style:parent-style-name</ref>
- </key>
- <key name="styles-section-style" extends="common-section-style">
-  <def>$stylesautostyles/style:style[@style:family='section']/@style:name</def>
-  <ref>$masterstyles//text:alphabetical-index/@text:style-name</ref>
- </key>
- <key name="content-section-style" extends="common-section-style">
-  <def>$contentautostyles/style:style[@style:family='section']/@style:name</def>
-  <ref>$body//text:alphabetical-index/@text:style-name</ref>
- </key>
-
- <key name="common-table-style">
-  <def>$officestyles/style:style[@style:family='table']/@style:name</def>
-  <ref>$officestyles/style:style[@style:family='table']/@style:parent-style-name</ref>
-  <ref>$stylesautostyles/style:style[@style:family='table']/@style:parent-style-name</ref>
-  <ref>$contentautostyles/style:style[@style:family='table']/@style:parent-style-name</ref>
- </key>
- <key name="styles-table-style" extends="common-table-style">
-  <def>$stylesautostyles/style:style[@style:family='table']/@style:name</def>
-  <ref>$masterstyles//table:table/@table:style-name</ref>
- </key>
- <key name="content-table-style" extends="common-table-style">
-  <def>$contentautostyles/style:style[@style:family='table']/@style:name</def>
-  <ref>$body//table:table/@table:style-name</ref>
- </key>
-
- <key name="common-table-column-style">
-  <def>$officestyles/style:style[@style:family='table-column']/@style:name</def>
-  <ref>$officestyles/style:style[@style:family='table-column']/@style:parent-style-name</ref>
-  <ref>$stylesautostyles/style:style[@style:family='table-column']/@style:parent-style-name</ref>
-  <ref>$contentautostyles/style:style[@style:family='table-column']/@style:parent-style-name</ref>
- </key>
- <key name="styles-table-column-style" extends="common-table-column-style">
-  <def>$stylesautostyles/style:style[@style:family='table-column']/@style:name</def>
-  <ref>$masterstyles//table:table-column/@table:style-name</ref>
- </key>
- <key name="content-table-column-style" extends="common-table-column-style">
-  <def>$contentautostyles/style:style[@style:family='table-column']/@style:name</def>
-  <ref>$body//table:table-column/@table:style-name</ref>
- </key>
-
- <key name="common-table-row-style">
-  <def>$officestyles/style:style[@style:family='table-row']/@style:name</def>
-  <ref>$officestyles/style:style[@style:family='table-row']/@style:parent-style-name</ref>
-  <ref>$stylesautostyles/style:style[@style:family='table-row']/@style:parent-style-name</ref>
-  <ref>$contentautostyles/style:style[@style:family='table-row']/@style:parent-style-name</ref>
- </key>
- <key name="styles-table-row-style" extends="common-table-row-style">
-  <def>$stylesautostyles/style:style[@style:family='table-row']/@style:name</def>
-  <ref>$masterstyles//table:table-row/@table:style-name</ref>
- </key>
- <key name="content-table-row-style" extends="common-table-row-style">
-  <def>$contentautostyles/style:style[@style:family='table-row']/@style:name</def>
-  <ref>$body//table:table-row/@table:style-name</ref>
- </key>
-
- <key name="common-table-cell-style">
-  <def>$officestyles/style:style[@style:family='table-cell']/@style:name</def>
-  <ref>$officestyles/style:style[@style:family='table-cell']/@style:parent-style-name</ref>
-  <ref>$stylesautostyles/style:style[@style:family='table-cell']/@style:parent-style-name</ref>
-  <ref>$contentautostyles/style:style[@style:family='table-cell']/@style:parent-style-name</ref>
- </key>
- <key name="styles-table-cell-style" extends="common-table-cell-style">
-  <def>$stylesautostyles/style:style[@style:family='table-cell']/@style:name</def>
-  <ref>$masterstyles//table:table-cell/@table:style-name</ref>
- </key>
- <key name="content-table-cell-style" extends="common-table-cell-style">
-  <def>$contentautostyles/style:style[@style:family='table-cell']/@style:name</def>
-  <ref>$body//table:table-cell/@table:style-name</ref>
- </key>
-
- <key name="common-graphic-style">
-  <def>$officestyles/style:style[@style:family='graphic']/@style:name</def>
-  <ref>$officestyles/style:style[@style:family='graphic']/@style:parent-style-name</ref>
-  <ref>$stylesautostyles/style:style[@style:family='graphic']/@style:parent-style-name</ref>
-  <ref>$contentautostyles/style:style[@style:family='graphic']/@style:parent-style-name</ref>
- </key>
- <key name="styles-graphic-style" extends="common-graphic-style">
-  <def>$stylesautostyles/style:style[@style:family='graphic']/@style:name</def>
-  <ref>$masterstyles//draw:rect/@draw:style-name</ref>
- </key>
- <key name="content-graphic-style" extends="common-graphic-style">
-  <def>$contentautostyles/style:style[@style:family='graphic']/@style:name</def>
-  <ref>$body//draw:rect/@draw:style-name</ref>
- </key>
-
- <key name="common-presentation-style">
-  <def>$officestyles/style:style[@style:family='presentation']/@style:name</def>
-  <ref>$officestyles/style:style[@style:family='presentation']/@style:parent-style-name</ref>
-  <ref>$stylesautostyles/style:style[@style:family='presentation']/@style:parent-style-name</ref>
-  <ref>$contentautostyles/style:style[@style:family='presentation']/@style:parent-style-name</ref>
- </key>
- <key name="styles-presentation-style" extends="common-presentation-style">
-  <def>$stylesautostyles/style:style[@style:family='presentation']/@style:name</def>
-  <ref>$masterstyles//draw:rect/@presentation:style-name</ref>
- </key>
- <key name="content-presentation-style" extends="common-presentation-style">
-  <def>$contentautostyles/style:style[@style:family='presentation']/@style:name</def>
-  <ref>$body//draw:rect/@presentation:style-name</ref>
- </key>
-
- <key name="common-drawing-page-style">
-  <def>$officestyles/style:style[@style:family='drawing-page']/@style:name</def>
-  <ref>$officestyles/style:style[@style:family='drawing-page']/@style:parent-style-name</ref>
-  <ref>$stylesautostyles/style:style[@style:family='drawing-page']/@style:parent-style-name</ref>
-  <ref>$contentautostyles/style:style[@style:family='drawing-page']/@style:parent-style-name</ref>
- </key>
- <key name="styles-drawing-page-style" extends="common-drawing-page-style">
-  <def>$stylesautostyles/style:style[@style:family='drawing-page']/@style:name</def>
-  <ref>$masterstyles/style:handout-master/@draw:style-name</ref>
- </key>
- <key name="content-drawing-page-style" extends="common-drawing-page-style">
-  <def>$contentautostyles/style:style[@style:family='drawing-page']/@style:name</def>
-  <ref>$body/office:drawing/draw:page/@draw:style-name</ref>
-  <ref>$body/office:presentation/draw:page/@draw:style-name</ref>
- </key>
-
-</keys>
diff --git a/apps/files_odfviewer/src/webodf/webodf/tools/runjslint.js b/apps/files_odfviewer/src/webodf/webodf/tools/runjslint.js
deleted file mode 100644
index c0d28dc77d..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/tools/runjslint.js
+++ /dev/null
@@ -1,98 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global runtime: true, core: true*/
-runtime.loadClass("core.JSLint");
-
-function checkWithJSLINT(file) {
-    "use strict";
-    var i, jslint = new core.JSLint().JSLINT,
-        jslintconfig = {
-            anon:       false, // true, if the space may be omitted in anonymous function declarations
-            bitwise:    false, // if bitwise operators should be allowed
-            browser:    false, // if the standard browser globals should be predefined
-            cap:        false, // if upper case HTML should be allowed
-            'continue': false, // if the continuation statement should be tolerated
-            css:        false, // if CSS workarounds should be tolerated
-            debug:      false, // if debugger statements should be allowed
-            devel:      false, // if logging should be allowed (console, alert, etc.)
-            eqeq:       false, // if == should be allowed
-            es5:        false, // if ES5 syntax should be allowed
-            evil:       false, // if eval should be allowed
-            forin:      false, // if for in statements need not filter
-            fragment:   false, // if HTML fragments should be allowed
-            indent:     4, // the indentation factor
-            maxerr:     10, // the maximum number of errors to allow
-            //maxlen:     300, // the maximum length of a source line
-            newcap:     false, // if constructor names capitalization is ignored
-            node:       false, // if Node.js globals should be predefined
-            nomen:      false, // if names may have dangling _
-            on:         false, // if HTML event handlers should be allowed
-            passfail:   true,  // if the scan should stop on first error
-            plusplus:   false, // if increment/decrement should be allowed
-            properties: false, // if all property names must be declared with /*properties*/
-            regexp:     false, // if the . should be allowed in regexp literals
-            rhino:      false, // if the Rhino environment globals should be predefined
-            undef:      false, // if variables can be declared out of order
-            unparam:    false, // if unused parameters should be tolerated
-            safe:       false, // if use of some browser features should be restricted
-            sloppy:     false, // if the 'use strict'; pragma is optional
-            stupid:     true,  // true if stupid practices are tolerated
-            sub:        false, // if all forms of subscript notation are tolerated
-            vars:       false, // if multiple var statements per function should be allowed
-            white:      true,  // if sloppy whitespace is tolerated
-            widget:     false, // if the Yahoo Widgets globals should be predefined
-            windows:    false  // if MS Windows-specific globals should be predefined
-        },
-        data, result, err;
-
-    // these files are an exception for now
-    if (file === "lib/core/RawInflate.js") {
-        return;
-    }
-
-    data = runtime.readFileSync(file, "utf-8");
-    result = jslint(data, jslintconfig);
-    if (!result) {
-        for (i = 0; i < jslint.errors.length && jslint.errors[i]; i += 1) {
-            err = jslint.errors[i];
-            runtime.log(file + ":" + err.line + ":" + err.character +
-                ": error: " + err.reason);
-        }
-        runtime.exit(1);
-    }
-}
-
-var i;
-for (i = 0; i < arguments.length; i += 1) {
-    checkWithJSLINT(arguments[i]);
-}
diff --git a/apps/files_odfviewer/src/webodf/webodf/webodf.css b/apps/files_odfviewer/src/webodf/webodf/webodf.css
deleted file mode 100644
index dbd6686a26..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/webodf.css
+++ /dev/null
@@ -1,200 +0,0 @@
-@namespace draw url(urn:oasis:names:tc:opendocument:xmlns:drawing:1.0);
-@namespace fo url(urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0);
-@namespace office url(urn:oasis:names:tc:opendocument:xmlns:office:1.0);
-@namespace presentation url(urn:oasis:names:tc:opendocument:xmlns:presentation:1.0);
-@namespace style url(urn:oasis:names:tc:opendocument:xmlns:style:1.0);
-@namespace svg url(urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0);
-@namespace table url(urn:oasis:names:tc:opendocument:xmlns:table:1.0);
-@namespace text url(urn:oasis:names:tc:opendocument:xmlns:text:1.0);
-@namespace runtimens url(urn:webodf); /* namespace for runtime only */
-
-office|document > *, office|document-content > * {
-  display: none;
-}
-office|body, office|document {
-  display: inline-block;
-  position: relative;
-}
-
-text|p, text|h {
-  display: block;
-  padding: 3px 3px 3px 3px;
-  margin: 5px 5px 5px 5px;
-}
-text|h {
-  font-weight: bold;
-}
-*[runtimens|containsparagraphanchor] {
-  position: relative;
-}
-text|s:before { /* this needs to be the number of spaces given by text:c */
-  content: ' ';
-}
-text|tab:before {
-  display: inline;
-  content: '        ';
-}
-text|line-break {
-  content: " ";
-  display: block;
-}
-text|tracked-changes {
-  /*Consumers that do not support change tracking, should ignore changes.*/
-  display: none;
-}
-office|binary-data {
-  display: none;
-}
-office|text {
-  display: block;
-  width: 216mm; /* default to A4 width */
-  min-height: 279mm;
-  padding-left: 32mm;
-  padding-right: 32mm;
-  padding-top: 25mm;
-  padding-bottom: 13mm;
-  margin: 2px;
-  text-align: left;
-  overflow: hidden;
-}
-office|spreadsheet {
-  display: block;
-  border-collapse: collapse;
-  empty-cells: show;
-  font-family: sans-serif;
-  font-size: 10pt;
-  text-align: left;
-  page-break-inside: avoid;
-  overflow: hidden;
-}
-office|presentation {
-  display: inline-block;
-  text-align: left;
-}
-draw|page {
-  display: block;
-  height: 21cm;
-  width: 28cm;
-  margin: 3px;
-  position: relative;
-  overflow: hidden;
-}
-presentation|notes {
-    display: none;
-}
-@media print {
-  draw|page {
-    border: 1pt solid black;
-    page-break-inside: avoid;
-  }
-  presentation|notes {
-    /*TODO*/
-  }
-}
-office|spreadsheet text|p {
-  border: 0px;
-  padding: 1px;
-  margin: 0px;
-}
-office|spreadsheet table|table {
-  margin: 3px;
-}
-office|spreadsheet table|table:after {
-  /* show sheet name the end of the sheet */
-  /*content: attr(table|name);*/ /* gives parsing error in opera */
-}
-office|spreadsheet table|table-row {
-  counter-increment: row;
-}
-office|spreadsheet table|table-row:before {
-  width: 3em;
-  background: #cccccc;
-  border: 1px solid black;
-  text-align: center;
-  content: counter(row);
-}
-office|spreadsheet table|table-cell {
-  border: 1px solid #cccccc;
-}
-table|table {
-  display: table;
-}
-draw|frame table|table {
-  width: 100%;
-  height: 100%;
-  background: white;
-}
-table|table-row {
-  display: table-row;
-}
-table|table-column {
-  display: table-column;
-}
-table|table-cell {
-  display: table-cell;
-}
-draw|frame {
-  display: block;
-}
-draw|image {
-  display: block;
-  width: 100%;
-  height: 100%;
-  top: 0px;
-  left: 0px;
-  background-repeat: no-repeat;
-  background-size: 100% 100%;
-  -moz-background-size: 100% 100%;
-}
-/* only show the first image in frame */
-draw|frame > draw|image:nth-of-type(n+2) {
-  display: none;
-}
-text|list {
-    display: block;
-    padding-left: 1.5em;
-    counter-reset: list;
-}
-text|list-item {
-    display: block;
-}
-text|list-item:before {
-    display: inline-block;
-    content: '•';
-    counter-increment: list;
-    width: 0.5em;
-    margin-left: -0.5em;
-    padding: 0px;
-    border: 0px;
-}
-text|list-item > *:first-child {
-    display: inline-block;
-}
-text|a {
-    color: blue;
-    text-decoration: underline;
-}
-text|note-citation {
-    vertical-align: super;
-    font-size: smaller;
-}
-text|note-body {
-    display: none;
-}
-text|note:hover text|note-citation {
-    background: #dddddd;
-}
-text|note:hover text|note-body {
-    display: block;
-    left:1em;
-    max-width: 80%;
-    position: absolute;
-    background: #ffffaa;
-}
-svg|title, svg|desc {
-    display: none;
-}
-video {
-  width:100%;
-  height:100%
-}
diff --git a/apps/files_odfviewer/src/webodf/webodf/xmledit/gui.js b/apps/files_odfviewer/src/webodf/webodf/xmledit/gui.js
deleted file mode 100644
index e38c286aae..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/xmledit/gui.js
+++ /dev/null
@@ -1,119 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global Ext runtime gui*/
-runtime.loadClass("gui.XMLEdit");
-
-function createXMLEdit(element, url) {
-    var head = element.ownerDocument.getElementsByTagName("head")[0],
-        xmlcss = element.ownerDocument.createElement("style"),
-        xmledt;
-
-    xmlcss.type = "text/css";
-    head.appendChild(xmlcss);
-    xmledt = new gui.XMLEdit(element, xmlcss);
-    runtime.loadXML(url, function (err, xml) {
-        if (xml.documentElement) {
-            xmledt.setXML(xml);
-        }
-    });
-}
-
-function loadXML(url, panel, title) {
-    title = title || url;
-    var tab = panel.find('url', url),
-        newTab;
-    if (tab.length) {
-        panel.setActiveTab(tab[0]);
-        return;
-    }
-    newTab = new Ext.BoxComponent({
-        title: title,
-        tabTip: url,
-        url: url,
-        closable: true,
-        autoEl: {
-            tag: 'div'
-        },
-        region: 'center'
-    });
-    panel.add(newTab);
-    panel.setActiveTab(newTab);
-
-    createXMLEdit(newTab.el.dom, url);
-}
-
-Ext.onReady(function () {
-    var tabpanel, tree, viewport, attributeEditor;
-
-    Ext.QuickTips.init();
-
-    tabpanel = new Ext.TabPanel({
-        tbar: [  ],
-        region: 'center'
-    });
-
-    attributeEditor = new Ext.grid.PropertyGrid({
-        title: 'Attributes',
-        region: 'east',
-        width: 200,
-        split: true,
-        autoScroll: true,
-        collapsible: true,
-        rootVisible: false,
-        enableTabScroll: true,
-        defaults: {autoScroll: true}
-    });
-
-    tree = new Ext.tree.TreePanel({
-        title: 'Documents',
-        region: 'west',
-        width: 200,
-        split: true,
-        autoScroll: true,
-        collapsible: true,
-        rootVisible: false,
-        enableTabScroll: true,
-        defaults: {autoScroll: true},
-        collapsed: true,
-        root: { nodeType: 'node' }
-    });
-
-    viewport = new Ext.Viewport({
-        layout: 'border',
-        items: [ tabpanel, tree, attributeEditor ]
-    });
-
-    // load the xml
-    loadXML('requirements.xml', tabpanel);
-    loadXML('../content.xml', tabpanel);
-});
diff --git a/apps/files_odfviewer/src/webodf/webodf/xmledit/index.html b/apps/files_odfviewer/src/webodf/webodf/xmledit/index.html
deleted file mode 100644
index dd6ae4942e..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/xmledit/index.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8"></meta>
-  <link rel="stylesheet" type="text/css" href="../extjs/resources/css/ext-all.css"/>
-  <!-- requirements -->
-  <script src="../extjs/adapter/ext/ext-base.js" type="text/javascript" charset="utf-8"></script>
-  <script src="../extjs/ext-all-debug.js" type="text/javascript" charset="utf-8"></script>
-  <script src="../lib/runtime.js"></script>
-  <!-- application -->
-  <script src="gui.js" type="text/javascript" charset="utf-8"></script>
- 
-  <title>XMLEdit</title>
-</head>
-<body>
-</body>
-</html>
diff --git a/apps/files_odfviewer/src/webodf/webodf/xmledit/requirements.dtd b/apps/files_odfviewer/src/webodf/webodf/xmledit/requirements.dtd
deleted file mode 100644
index 82cb8deb8f..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/xmledit/requirements.dtd
+++ /dev/null
@@ -1,12 +0,0 @@
-<!ELEMENT requirements (requirement*, dependency*)>
-<!ATTLIST desc>
-
-<!ELEMENT requirement (desc)>
-<!ATTLIST requirement id ID #REQUIRED>
-
-<!ELEMENT desc (#PCDATA)>
-<!ATTLIST desc>
-
-<!ELEMENT dependency EMPTY>
-<!ATTLIST dependency parent IDREF #REQUIRED
-                     child  IDREF #REQUIRED>
diff --git a/apps/files_odfviewer/src/webodf/webodf/xmledit/requirements.xml b/apps/files_odfviewer/src/webodf/webodf/xmledit/requirements.xml
deleted file mode 100644
index cbeae4ce7e..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/xmledit/requirements.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE requirements PUBLIC "WebODF requirements XML" "requirements.dtd">
-<!--
-     Designing an XML editor
-
-requirements:
- - load xml document in a frame and visualize it with specified css
-  - load xml document in another (underwater) frame and show it as XML
-   - parse DTD of the document format into a JSON data structure
-    - edit the text content/character of the XML document
-
--->
-
-<requirements xmlns="http://www.webodf.org/dtd/requirements" xmlns:hi="hello">
- <requirement id="r1">
-  <desc>load xml document in a frame</desc>
- </requirement> 
- <requirement id="r2">
-  <desc>show xml in a frame with a specified css</desc>
- </requirement>
- <dependency parent="r1" child="r2"/>
-</requirements>
diff --git a/apps/files_odfviewer/src/webodf/webodf/xmledit/test.xml b/apps/files_odfviewer/src/webodf/webodf/xmledit/test.xml
deleted file mode 100644
index cad3f32470..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/xmledit/test.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE requirements PUBLIC "WebODF requirements XML" "requirements.dtd">
-<!--
-     Designing an XML editor
-
-requirements:
- - load xml document in a frame and visualize it with specified css
-  - load xml document in another (underwater) frame and show it as XML
-   - parse DTD of the document format into a JSON data structure
-    - edit the text content/character of the XML document
-
--->
-
-<requirements>
- <requirement id="r1">
-  <desc>load xml document in a frame</desc>
- </requirement> 
- <requirement id="r2">
-  <desc>show xml in a frame with a specified css</desc>
- </requirement>
- <dependency parent="r1" child="r2"/>
-</requirements>
diff --git a/apps/files_pdfviewer/appinfo/app.php b/apps/files_pdfviewer/appinfo/app.php
deleted file mode 100644
index e4771ee517..0000000000
--- a/apps/files_pdfviewer/appinfo/app.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-//load the required files
-OCP\Util::addStyle( 'files_pdfviewer', 'viewer');
-
-OCP\Util::addscript( 'files_pdfviewer', 'pdfjs/compatibility');
-OCP\Util::addscript( 'files_pdfviewer', 'viewer');
-OCP\Util::addscript( 'files_pdfviewer', 'pdfjs/build/pdf');
-OCP\Util::addscript( 'files_pdfviewer', 'pdfjs/viewer');
diff --git a/apps/files_pdfviewer/appinfo/info.xml b/apps/files_pdfviewer/appinfo/info.xml
deleted file mode 100644
index 074962f57f..0000000000
--- a/apps/files_pdfviewer/appinfo/info.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?> 
-<info>
-	<id>files_pdfviewer</id>
-	<name>PDF Viewer</name>
-	<description>Inline PDF viewer (pdfjs-based)</description>
-	<licence>GPL</licence>
-	<author>Joan Creus, Thomas Müller</author>
-	<require>4</require>
-	<shipped>true</shipped>
-	<default_enable/>
-</info>
diff --git a/apps/files_pdfviewer/appinfo/version b/apps/files_pdfviewer/appinfo/version
deleted file mode 100644
index ceab6e11ec..0000000000
--- a/apps/files_pdfviewer/appinfo/version
+++ /dev/null
@@ -1 +0,0 @@
-0.1
\ No newline at end of file
diff --git a/apps/files_pdfviewer/css/history.png b/apps/files_pdfviewer/css/history.png
deleted file mode 100644
index afa0e4ab70..0000000000
Binary files a/apps/files_pdfviewer/css/history.png and /dev/null differ
diff --git a/apps/files_pdfviewer/css/viewer.css b/apps/files_pdfviewer/css/viewer.css
deleted file mode 100644
index f9ce929d8b..0000000000
--- a/apps/files_pdfviewer/css/viewer.css
+++ /dev/null
@@ -1,267 +0,0 @@
-/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- /
-/* vim: set shiftwidth=4 tabstop=8 autoindent cindent expandtab: */
-
-#viewer {
-  font-family: 'Lucida Grande', 'Lucida Sans Unicode', Helvetica, Arial, Verdana, sans-serif;
-  /*margin: 0px;*/
-  padding: 0px;
-  /*position:absolute;*/
-}
-
-[hidden] {
-  display: none;
-}
-
-#controls2 > a > img {
-    margin: 4px;
-    height: 10px;
-}
-
-#controls2 > button {
-  line-height: 10px;
-}
-
-#controls2 > button > img {
-  width: 10px;
-  height: 10px;
-}
-
-#controls2 > button[disabled] > img {
-  opacity: 0.5;
-}
-
-#pageNumber {
-  text-align: right;
-}
-
-span#info {
-  display: none;
-}
-
-@-moz-document regexp("http:.*debug=1.*") {
-  span#info {
-    display: inline-block;
-  }
-}
-
-/* === Sidebar === */
-#sidebar {
-  position: fixed;
-  width: 350px;
-  top: 62px;
-  bottom: 18px;
-  left: -290px;
-  transition: left 0.25s ease-in-out 1s;
-  -moz-transition: left 0.25s ease-in-out 1s;
-  -webkit-transition: left 0.25s ease-in-out 1s;
-  z-index: 1;
-}
-
-#sidebar:hover {
-  left: 0px;
-  transition: left 0.25s ease-in-out 0s;
-  -moz-transition: left 0.25s ease-in-out 0s;
-  -webkit-transition: left 0.25s ease-in-out 0s;
-}
-
-#sidebarBox {
-  background-color: rgba(0, 0, 0, 0.7);
-  width: 300px;
-  height: 100%;
-  border-top-right-radius: 8px;
-  border-bottom-right-radius: 8px;
-  -moz-border-radius-topright: 8px;
-  -moz-border-radius-bottomright: 8px;
-  -webkit-border-top-right-radius: 8px;
-  -webkit-border-bottom-right-radius: 8px;
-  box-shadow: 0px 2px 8px #000;
-  -moz-box-shadow: 0px 2px 8px #000;
-  -webkit-box-shadow: 0px 2px 8px #000;
-}
-
-#sidebarScrollView {
-  position: absolute;
-  overflow: hidden;
-  overflow-y: auto;
-  top: 10px;
-  bottom: 10px;
-  left: 10px;
-  width: 280px;
-}
-
-.thumbnail {
-  width: 134px;
-  height: 134px;
-  margin-top: 5px;
-  margin-bottom: 5px;
-  margin-left:auto;
-  margin-right:auto;
-  line-height: 134px;
-  text-align: center;
-  overflow: hidden;
-}
-
-.thumbnail:not([data-loaded]) {
-  background-color: gray;
-}
-
-.thumbnail > canvas {
-  vertical-align: middle;
-  display: inline-block;
-}
-
-#outlineScrollView {
-  position: absolute;
-  background-color: #fff;
-  overflow: auto;
-  top: 10px;
-  bottom: 10px;
-  left: 10px;
-  width: 280px;
-}
-
-#outlineView {
-  padding-top: 4px;
-  padding-bottom: 100px;
-  padding-left: 6px;
-  padding-right: 6px;
-  font-size: smaller;
-}
-
-.outlineItem > .outlineItems {
-  margin-left: 20px;
-}
-
-.outlineItem > a {
-  text-decoration: none;
-  color: black;
-}
-
-.outlineItem > a:hover {
-  background: #ff0;
-  box-shadow: 0px 2px 10px #ff0;
-}
-
-#sidebarControls {
-  position:absolute;
-  width: 120px;
-  height: 32px;
-  left: 15px;
-  bottom: 35px;
-}
-
-#sidebarControls > button {
-  box-shadow: 0px 4px 10px #000;
-  -moz-box-shadow: 0px 4px 10px #000;
-  -webkit-box-shadow: 0px 4px 10px #000;
-}
-
-#sidebarControls > button > img {
-  width: 32px;
-  height: 32px;
-}
-
-#sidebarControls > button[disabled] > img {
-  opacity: 0.5;
-}
-
-#sidebarControls > button[data-selected] {
-  box-shadow: 0px 4px 10px #ff0;
-  -moz-box-shadow: 0px 4px 10px #ff0;
-  -webkit-box-shadow: 0px 4px 10px #ff0;
-}
-
-/* === Content view === */
-canvas {
-  margin: auto;
-  display: block;
-}
-
-.page {
-  width: 816px;
-  height: 1056px;
-  margin: 10px auto;
-  position: relative;
-  overflow: hidden;
-  box-shadow: 0px 4px 10px #000;
-  -moz-box-shadow: 0px 4px 10px #000;
-  -webkit-box-shadow: 0px 4px 10px #000;
-  background-color: white;
-}
-
-.page > a {
-  display: block;
-  position: absolute;
-}
-
-.page > a:hover {
-  opacity: 0.2;
-  background: #ff0;
-  box-shadow: 0px 2px 10px #ff0;
-  -moz-box-shadow: 0px 2px 10px #ff0;
-  -webkit-box-shadow: 0px 2px 10px #ff0;
-}
-
-#viewer {
-  /*overflow:auto;*/
-  margin: 6.3em 0 0 0;
-  margin-right:12.5em;
-  padding: 8px 0px;
-  position:static;
-  height:100%;
-  width:100%;
-  text-align:center;
-}
-
-#sidebarView canvas:hover {
-  background: #ff0;
-  box-shadow: 0px 2px 10px #ff0;
-  -moz-box-shadow: 0px 2px 10px #ff0;
-  -webkit-box-shadow: 0px 2px 10px #ff0;
-}
-
-#pageWidthOption {
-  border-top: 1px solid black;
-}
-
-#customScaleOption {
-  display: none;
-}
-
-/* === Printed media overrides === */
-@media print {
-  #sidebar {
-    display: none;
-  }
-
-  #controls2 {
-    display: none;
-  }
-
-  #viewer {
-    margin: 0;
-    padding: 0;
-  }
-
-  .page {
-    display: none;
-    margin: 0;
-  }
-
-  .page canvas {
-    box-shadow: none;
-    -moz-box-shadow: none;
-    -webkit-box-shadow: none;
-  }
-
-  .page[data-loaded] {
-    display: block;
-    page-break-after: always;
-  }
-}
-
-#loading {
-	margin: 100px 0;
-	text-align: center;
-}
-
diff --git a/apps/files_pdfviewer/js/pdfjs/LICENSE b/apps/files_pdfviewer/js/pdfjs/LICENSE
deleted file mode 100644
index f8a8482057..0000000000
--- a/apps/files_pdfviewer/js/pdfjs/LICENSE
+++ /dev/null
@@ -1,30 +0,0 @@
-
-    Copyright (c) 2011 Mozilla Foundation
-
-    Contributors: Andreas Gal <gal@mozilla.com>
-                  Chris G Jones <cjones@mozilla.com>
-                  Shaon Barman <shaon.barman@gmail.com>
-                  Vivien Nicolas <21@vingtetun.org>
-                  Justin D'Arcangelo <justindarc@gmail.com>
-                  Yury Delendik
-                  Kalervo Kujala
-                  Adil Allawi <@ironymark>
-
-    Permission is hereby granted, free of charge, to any person obtaining a
-    copy of this software and associated documentation files (the "Software"),
-    to deal in the Software without restriction, including without limitation
-    the rights to use, copy, modify, merge, publish, distribute, sublicense,
-    and/or sell copies of the Software, and to permit persons to whom the
-    Software is furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be included in
-    all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-    THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-    DEALINGS IN THE SOFTWARE.
-
diff --git a/apps/files_pdfviewer/js/pdfjs/README b/apps/files_pdfviewer/js/pdfjs/README
deleted file mode 100644
index ec6a1e1ab1..0000000000
--- a/apps/files_pdfviewer/js/pdfjs/README
+++ /dev/null
@@ -1,7 +0,0 @@
-Upstream (http://mozilla.github.com/pdf.js/) does not yet provide releases.
-The latest version of git master can be taken from http://mozilla.github.com/pdf.js/build/pdf.js
-
-Please update pdf.js from time to time and test it!
-
-
-
diff --git a/apps/files_pdfviewer/js/pdfjs/build/pdf.js b/apps/files_pdfviewer/js/pdfjs/build/pdf.js
deleted file mode 100644
index b1fc9d9747..0000000000
--- a/apps/files_pdfviewer/js/pdfjs/build/pdf.js
+++ /dev/null
@@ -1,33830 +0,0 @@
-/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
-
-var PDFJS = {};
-
-(function pdfjsWrapper() {
-  // Use strict in our context only - users might not want it
-  'use strict';
-
-  PDFJS.build = '2aae4fd';
-
-  // Files are inserted below - see Makefile
-/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
-
-'use strict';
-
-var globalScope = (typeof window === 'undefined') ? this : window;
-
-var isWorker = (typeof window == 'undefined');
-
-var ERRORS = 0, WARNINGS = 1, INFOS = 5;
-var verbosity = WARNINGS;
-
-// The global PDFJS object exposes the API
-// In production, it will be declared outside a global wrapper
-// In development, it will be declared here
-if (!globalScope.PDFJS) {
-  globalScope.PDFJS = {};
-}
-
-// getPdf()
-// Convenience function to perform binary Ajax GET
-// Usage: getPdf('http://...', callback)
-//        getPdf({
-//                 url:String ,
-//                 [,progress:Function, error:Function]
-//               },
-//               callback)
-function getPdf(arg, callback) {
-  var params = arg;
-  if (typeof arg === 'string')
-    params = { url: arg };
-
-  var xhr = new XMLHttpRequest();
-
-  xhr.open('GET', params.url);
-
-  var headers = params.headers;
-  if (headers) {
-    for (var property in headers) {
-      if (typeof headers[property] === 'undefined')
-        continue;
-
-      xhr.setRequestHeader(property, params.headers[property]);
-    }
-  }
-
-  xhr.mozResponseType = xhr.responseType = 'arraybuffer';
-  var protocol = params.url.indexOf(':') < 0 ? window.location.protocol :
-    params.url.substring(0, params.url.indexOf(':') + 1);
-  xhr.expected = (protocol === 'http:' || protocol === 'https:') ? 200 : 0;
-
-  if ('progress' in params)
-    xhr.onprogress = params.progress || undefined;
-
-  if ('error' in params)
-    xhr.onerror = params.error || undefined;
-
-  xhr.onreadystatechange = function getPdfOnreadystatechange(e) {
-    if (xhr.readyState === 4) {
-      if (xhr.status === xhr.expected) {
-        var data = (xhr.mozResponseArrayBuffer || xhr.mozResponse ||
-                    xhr.responseArrayBuffer || xhr.response);
-        callback(data);
-      } else if (params.error) {
-        params.error(e);
-      }
-    }
-  };
-  xhr.send(null);
-}
-globalScope.PDFJS.getPdf = getPdf;
-globalScope.PDFJS.pdfBug = false;
-
-var Page = (function PageClosure() {
-  function Page(xref, pageNumber, pageDict, ref) {
-    this.pageNumber = pageNumber;
-    this.pageDict = pageDict;
-    this.xref = xref;
-    this.ref = ref;
-
-    this.displayReadyPromise = null;
-  }
-
-  Page.prototype = {
-    getPageProp: function Page_getPageProp(key) {
-      return this.pageDict.get(key);
-    },
-    inheritPageProp: function Page_inheritPageProp(key) {
-      var dict = this.pageDict;
-      var obj = dict.get(key);
-      while (obj === undefined) {
-        dict = dict.get('Parent');
-        if (!dict)
-          break;
-        obj = dict.get(key);
-      }
-      return obj;
-    },
-    get content() {
-      return shadow(this, 'content', this.getPageProp('Contents'));
-    },
-    get resources() {
-      return shadow(this, 'resources', this.inheritPageProp('Resources'));
-    },
-    get mediaBox() {
-      var obj = this.inheritPageProp('MediaBox');
-      // Reset invalid media box to letter size.
-      if (!isArray(obj) || obj.length !== 4)
-        obj = [0, 0, 612, 792];
-      return shadow(this, 'mediaBox', obj);
-    },
-    get view() {
-      var mediaBox = this.mediaBox;
-      var cropBox = this.inheritPageProp('CropBox');
-      if (!isArray(cropBox) || cropBox.length !== 4)
-        return shadow(this, 'view', mediaBox);
-
-      // From the spec, 6th ed., p.963:
-      // "The crop, bleed, trim, and art boxes should not ordinarily
-      // extend beyond the boundaries of the media box. If they do, they are
-      // effectively reduced to their intersection with the media box."
-      cropBox = Util.intersect(cropBox, mediaBox);
-      if (!cropBox)
-        return shadow(this, 'view', mediaBox);
-
-      return shadow(this, 'view', cropBox);
-    },
-    get annotations() {
-      return shadow(this, 'annotations', this.inheritPageProp('Annots'));
-    },
-    get rotate() {
-      var rotate = this.inheritPageProp('Rotate') || 0;
-      // Normalize rotation so it's a multiple of 90 and between 0 and 270
-      if (rotate % 90 != 0) {
-        rotate = 0;
-      } else if (rotate >= 360) {
-        rotate = rotate % 360;
-      } else if (rotate < 0) {
-        // The spec doesn't cover negatives, assume its counterclockwise
-        // rotation. The following is the other implementation of modulo.
-        rotate = ((rotate % 360) + 360) % 360;
-      }
-      return shadow(this, 'rotate', rotate);
-    },
-
-    getOperatorList: function Page_getOperatorList(handler, dependency) {
-      var xref = this.xref;
-      var content = this.content;
-      var resources = this.resources;
-      if (isArray(content)) {
-        // fetching items
-        var streams = [];
-        var i, n = content.length;
-        var streams = [];
-        for (i = 0; i < n; ++i)
-          streams.push(xref.fetchIfRef(content[i]));
-        content = new StreamsSequenceStream(streams);
-      } else if (isStream(content)) {
-        content.reset();
-      } else if (!content) {
-        // replacing non-existent page content with empty one
-        content = new Stream(new Uint8Array(0));
-      }
-
-      var pe = this.pe = new PartialEvaluator(
-                                xref, handler, 'p' + this.pageNumber + '_');
-
-      return pe.getOperatorList(content, resources, dependency);
-    },
-    extractTextContent: function Page_extractTextContent() {
-      var handler = {
-        on: function nullHandlerOn() {},
-        send: function nullHandlerSend() {}
-      };
-
-      var xref = this.xref;
-      var content = xref.fetchIfRef(this.content);
-      var resources = xref.fetchIfRef(this.resources);
-      if (isArray(content)) {
-        // fetching items
-        var i, n = content.length;
-        var streams = [];
-        for (i = 0; i < n; ++i)
-          streams.push(xref.fetchIfRef(content[i]));
-        content = new StreamsSequenceStream(streams);
-      } else if (isStream(content)) {
-        content.reset();
-      }
-
-      var pe = new PartialEvaluator(
-                     xref, handler, 'p' + this.pageNumber + '_');
-      return pe.getTextContent(content, resources);
-    },
-
-    ensureFonts: function Page_ensureFonts(fonts, callback) {
-      this.stats.time('Font Loading');
-      // Convert the font names to the corresponding font obj.
-      for (var i = 0, ii = fonts.length; i < ii; i++) {
-        fonts[i] = this.objs.objs[fonts[i]].data;
-      }
-
-      // Load all the fonts
-      FontLoader.bind(
-        fonts,
-        function pageEnsureFontsFontObjs(fontObjs) {
-          this.stats.timeEnd('Font Loading');
-
-          callback.call(this);
-        }.bind(this)
-      );
-    },
-    getLinks: function Page_getLinks() {
-      var links = [];
-      var annotations = pageGetAnnotations();
-      var i, n = annotations.length;
-      for (i = 0; i < n; ++i) {
-        if (annotations[i].type != 'Link')
-          continue;
-        links.push(annotations[i]);
-      }
-      return links;
-    },
-    getAnnotations: function Page_getAnnotations() {
-      var xref = this.xref;
-      function getInheritableProperty(annotation, name) {
-        var item = annotation;
-        while (item && !item.has(name)) {
-          item = item.get('Parent');
-        }
-        if (!item)
-          return null;
-        return item.get(name);
-      }
-      function isValidUrl(url) {
-        if (!url)
-          return false;
-        var colon = url.indexOf(':');
-        if (colon < 0)
-          return false;
-        var protocol = url.substr(0, colon);
-        switch (protocol) {
-          case 'http':
-          case 'https':
-          case 'ftp':
-          case 'mailto':
-            return true;
-          default:
-            return false;
-        }
-      }
-
-      var annotations = this.annotations || [];
-      var i, n = annotations.length;
-      var items = [];
-      for (i = 0; i < n; ++i) {
-        var annotationRef = annotations[i];
-        var annotation = xref.fetch(annotationRef);
-        if (!isDict(annotation))
-          continue;
-        var subtype = annotation.get('Subtype');
-        if (!isName(subtype))
-          continue;
-        var rect = annotation.get('Rect');
-
-        var item = {};
-        item.type = subtype.name;
-        item.rect = rect;
-        switch (subtype.name) {
-          case 'Link':
-            var a = annotation.get('A');
-            if (a) {
-              switch (a.get('S').name) {
-                case 'URI':
-                  var url = a.get('URI');
-                  // TODO: pdf spec mentions urls can be relative to a Base
-                  // entry in the dictionary.
-                  if (!isValidUrl(url))
-                    url = '';
-                  item.url = url;
-                  break;
-                case 'GoTo':
-                  item.dest = a.get('D');
-                  break;
-                default:
-                  TODO('other link types');
-              }
-            } else if (annotation.has('Dest')) {
-              // simple destination link
-              var dest = annotation.get('Dest');
-              item.dest = isName(dest) ? dest.name : dest;
-            }
-            break;
-          case 'Widget':
-            var fieldType = getInheritableProperty(annotation, 'FT');
-            if (!isName(fieldType))
-              break;
-            item.fieldType = fieldType.name;
-            // Building the full field name by collecting the field and
-            // its ancestors 'T' properties and joining them using '.'.
-            var fieldName = [];
-            var namedItem = annotation, ref = annotationRef;
-            while (namedItem) {
-              var parent = namedItem.get('Parent');
-              var parentRef = namedItem.getRaw('Parent');
-              var name = namedItem.get('T');
-              if (name) {
-                fieldName.unshift(stringToPDFString(name));
-              } else {
-                // The field name is absent, that means more than one field
-                // with the same name may exist. Replacing the empty name
-                // with the '`' plus index in the parent's 'Kids' array.
-                // This is not in the PDF spec but necessary to id the
-                // the input controls.
-                var kids = parent.get('Kids');
-                var j, jj;
-                for (j = 0, jj = kids.length; j < jj; j++) {
-                  var kidRef = kids[j];
-                  if (kidRef.num == ref.num && kidRef.gen == ref.gen)
-                    break;
-                }
-                fieldName.unshift('`' + j);
-              }
-              namedItem = parent;
-              ref = parentRef;
-            }
-            item.fullName = fieldName.join('.');
-            var alternativeText = stringToPDFString(annotation.get('TU') || '');
-            item.alternativeText = alternativeText;
-            var da = getInheritableProperty(annotation, 'DA') || '';
-            var m = /([\d\.]+)\sTf/.exec(da);
-            if (m)
-              item.fontSize = parseFloat(m[1]);
-            item.textAlignment = getInheritableProperty(annotation, 'Q');
-            item.flags = getInheritableProperty(annotation, 'Ff') || 0;
-            break;
-          case 'Text':
-            var content = annotation.get('Contents');
-            var title = annotation.get('T');
-            item.content = stringToPDFString(content || '');
-            item.title = stringToPDFString(title || '');
-            item.name = !annotation.has('Name') ? 'Note' :
-              annotation.get('Name').name;
-            break;
-          default:
-            TODO('unimplemented annotation type: ' + subtype.name);
-            break;
-        }
-        items.push(item);
-      }
-      return items;
-    }
-  };
-
-  return Page;
-})();
-
-/**
- * The `PDFDocument` holds all the data of the PDF file. Compared to the
- * `PDFDoc`, this one doesn't have any job management code.
- * Right now there exists one PDFDocument on the main thread + one object
- * for each worker. If there is no worker support enabled, there are two
- * `PDFDocument` objects on the main thread created.
- */
-var PDFDocument = (function PDFDocumentClosure() {
-  function PDFDocument(arg, password) {
-    if (isStream(arg))
-      init.call(this, arg, password);
-    else if (isArrayBuffer(arg))
-      init.call(this, new Stream(arg), password);
-    else
-      error('PDFDocument: Unknown argument type');
-  }
-
-  function init(stream, password) {
-    assertWellFormed(stream.length > 0, 'stream must have data');
-    this.stream = stream;
-    this.setup(password);
-    this.acroForm = this.catalog.catDict.get('AcroForm');
-  }
-
-  function find(stream, needle, limit, backwards) {
-    var pos = stream.pos;
-    var end = stream.end;
-    var str = '';
-    if (pos + limit > end)
-      limit = end - pos;
-    for (var n = 0; n < limit; ++n)
-      str += stream.getChar();
-    stream.pos = pos;
-    var index = backwards ? str.lastIndexOf(needle) : str.indexOf(needle);
-    if (index == -1)
-      return false; /* not found */
-    stream.pos += index;
-    return true; /* found */
-  }
-
-  PDFDocument.prototype = {
-    get linearization() {
-      var length = this.stream.length;
-      var linearization = false;
-      if (length) {
-        linearization = new Linearization(this.stream);
-        if (linearization.length != length)
-          linearization = false;
-      }
-      // shadow the prototype getter with a data property
-      return shadow(this, 'linearization', linearization);
-    },
-    get startXRef() {
-      var stream = this.stream;
-      var startXRef = 0;
-      var linearization = this.linearization;
-      if (linearization) {
-        // Find end of first obj.
-        stream.reset();
-        if (find(stream, 'endobj', 1024))
-          startXRef = stream.pos + 6;
-      } else {
-        // Find startxref by jumping backward from the end of the file.
-        var step = 1024;
-        var found = false, pos = stream.end;
-        while (!found && pos > 0) {
-          pos -= step - 'startxref'.length;
-          if (pos < 0)
-            pos = 0;
-          stream.pos = pos;
-          found = find(stream, 'startxref', step, true);
-        }
-        if (found) {
-          stream.skip(9);
-          var ch;
-          do {
-            ch = stream.getChar();
-          } while (Lexer.isSpace(ch));
-          var str = '';
-          while ((ch - '0') <= 9) {
-            str += ch;
-            ch = stream.getChar();
-          }
-          startXRef = parseInt(str, 10);
-          if (isNaN(startXRef))
-            startXRef = 0;
-        }
-      }
-      // shadow the prototype getter with a data property
-      return shadow(this, 'startXRef', startXRef);
-    },
-    get mainXRefEntriesOffset() {
-      var mainXRefEntriesOffset = 0;
-      var linearization = this.linearization;
-      if (linearization)
-        mainXRefEntriesOffset = linearization.mainXRefEntriesOffset;
-      // shadow the prototype getter with a data property
-      return shadow(this, 'mainXRefEntriesOffset', mainXRefEntriesOffset);
-    },
-    // Find the header, remove leading garbage and setup the stream
-    // starting from the header.
-    checkHeader: function PDFDocument_checkHeader() {
-      var stream = this.stream;
-      stream.reset();
-      if (find(stream, '%PDF-', 1024)) {
-        // Found the header, trim off any garbage before it.
-        stream.moveStart();
-        return;
-      }
-      // May not be a PDF file, continue anyway.
-    },
-    setup: function PDFDocument_setup(password) {
-      this.checkHeader();
-      var xref = new XRef(this.stream,
-                          this.startXRef,
-                          this.mainXRefEntriesOffset,
-                          password);
-      this.xref = xref;
-      this.catalog = new Catalog(xref);
-    },
-    get numPages() {
-      var linearization = this.linearization;
-      var num = linearization ? linearization.numPages : this.catalog.numPages;
-      // shadow the prototype getter
-      return shadow(this, 'numPages', num);
-    },
-    getDocumentInfo: function PDFDocument_getDocumentInfo() {
-      var info;
-      if (this.xref.trailer.has('Info')) {
-        var infoDict = this.xref.trailer.get('Info');
-
-        info = {};
-        infoDict.forEach(function(key, value) {
-          info[key] = typeof value !== 'string' ? value :
-            stringToPDFString(value);
-        });
-      }
-
-      return shadow(this, 'getDocumentInfo', info);
-    },
-    getFingerprint: function PDFDocument_getFingerprint() {
-      var xref = this.xref, fileID;
-      if (xref.trailer.has('ID')) {
-        fileID = '';
-        var id = xref.trailer.get('ID')[0];
-        id.split('').forEach(function(el) {
-          fileID += Number(el.charCodeAt(0)).toString(16);
-        });
-      } else {
-        // If we got no fileID, then we generate one,
-        // from the first 100 bytes of PDF
-        var data = this.stream.bytes.subarray(0, 100);
-        var hash = calculateMD5(data, 0, data.length);
-        fileID = '';
-        for (var i = 0, length = hash.length; i < length; i++) {
-          fileID += Number(hash[i]).toString(16);
-        }
-      }
-
-      return shadow(this, 'getFingerprint', fileID);
-    },
-    getPage: function PDFDocument_getPage(n) {
-      return this.catalog.getPage(n);
-    }
-  };
-
-  return PDFDocument;
-})();
-
-
-/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
-
-'use strict';
-
-// Use only for debugging purposes. This should not be used in any code that is
-// in mozilla master.
-function log(msg) {
-  if (console && console.log)
-    console.log(msg);
-  else if (print)
-    print(msg);
-}
-
-// A notice for devs that will not trigger the fallback UI.  These are good
-// for things that are helpful to devs, such as warning that Workers were
-// disabled, which is important to devs but not end users.
-function info(msg) {
-  if (verbosity >= INFOS) {
-    log('Info: ' + msg);
-    PDFJS.LogManager.notify('info', msg);
-  }
-}
-
-// Non-fatal warnings that should trigger the fallback UI.
-function warn(msg) {
-  if (verbosity >= WARNINGS) {
-    log('Warning: ' + msg);
-    PDFJS.LogManager.notify('warn', msg);
-  }
-}
-
-// Fatal errors that should trigger the fallback UI and halt execution by
-// throwing an exception.
-function error(msg) {
-  log('Error: ' + msg);
-  log(backtrace());
-  PDFJS.LogManager.notify('error', msg);
-  throw new Error(msg);
-}
-
-// Missing features that should trigger the fallback UI.
-function TODO(what) {
-  warn('TODO: ' + what);
-}
-
-function backtrace() {
-  try {
-    throw new Error();
-  } catch (e) {
-    return e.stack ? e.stack.split('\n').slice(2).join('\n') : '';
-  }
-}
-
-function assert(cond, msg) {
-  if (!cond)
-    error(msg);
-}
-
-// In a well-formed PDF, |cond| holds.  If it doesn't, subsequent
-// behavior is undefined.
-function assertWellFormed(cond, msg) {
-  if (!cond)
-    error(msg);
-}
-
-var LogManager = PDFJS.LogManager = (function LogManagerClosure() {
-  var loggers = [];
-  return {
-    addLogger: function logManager_addLogger(logger) {
-      loggers.push(logger);
-    },
-    notify: function(type, message) {
-      for (var i = 0, ii = loggers.length; i < ii; i++) {
-        var logger = loggers[i];
-        if (logger[type])
-          logger[type](message);
-      }
-    }
-  };
-})();
-
-function shadow(obj, prop, value) {
-  Object.defineProperty(obj, prop, { value: value,
-                                     enumerable: true,
-                                     configurable: true,
-                                     writable: false });
-  return value;
-}
-
-var PasswordException = (function PasswordExceptionClosure() {
-  function PasswordException(msg, code) {
-    this.name = 'PasswordException';
-    this.message = msg;
-    this.code = code;
-  }
-
-  PasswordException.prototype = new Error();
-  PasswordException.constructor = PasswordException;
-
-  return PasswordException;
-})();
-
-function bytesToString(bytes) {
-  var str = '';
-  var length = bytes.length;
-  for (var n = 0; n < length; ++n)
-    str += String.fromCharCode(bytes[n]);
-  return str;
-}
-
-function stringToBytes(str) {
-  var length = str.length;
-  var bytes = new Uint8Array(length);
-  for (var n = 0; n < length; ++n)
-    bytes[n] = str.charCodeAt(n) & 0xFF;
-  return bytes;
-}
-
-var IDENTITY_MATRIX = [1, 0, 0, 1, 0, 0];
-
-var Util = PDFJS.Util = (function UtilClosure() {
-  function Util() {}
-
-  Util.makeCssRgb = function Util_makeCssRgb(r, g, b) {
-    var ri = (255 * r) | 0, gi = (255 * g) | 0, bi = (255 * b) | 0;
-    return 'rgb(' + ri + ',' + gi + ',' + bi + ')';
-  };
-
-  Util.makeCssCmyk = function Util_makeCssCmyk(c, m, y, k) {
-    c = (new DeviceCmykCS()).getRgb([c, m, y, k]);
-    var ri = (255 * c[0]) | 0, gi = (255 * c[1]) | 0, bi = (255 * c[2]) | 0;
-    return 'rgb(' + ri + ',' + gi + ',' + bi + ')';
-  };
-
-  // For 2d affine transforms
-  Util.applyTransform = function Util_applyTransform(p, m) {
-    var xt = p[0] * m[0] + p[1] * m[2] + m[4];
-    var yt = p[0] * m[1] + p[1] * m[3] + m[5];
-    return [xt, yt];
-  };
-
-  Util.applyInverseTransform = function Util_applyInverseTransform(p, m) {
-    var d = m[0] * m[3] - m[1] * m[2];
-    var xt = (p[0] * m[3] - p[1] * m[2] + m[2] * m[5] - m[4] * m[3]) / d;
-    var yt = (-p[0] * m[1] + p[1] * m[0] + m[4] * m[1] - m[5] * m[0]) / d;
-    return [xt, yt];
-  };
-
-  Util.inverseTransform = function Util_inverseTransform(m) {
-    var d = m[0] * m[3] - m[1] * m[2];
-    return [m[3] / d, -m[1] / d, -m[2] / d, m[0] / d,
-      (m[2] * m[5] - m[4] * m[3]) / d, (m[4] * m[1] - m[5] * m[0]) / d];
-  };
-
-  // Apply a generic 3d matrix M on a 3-vector v:
-  //   | a b c |   | X |
-  //   | d e f | x | Y |
-  //   | g h i |   | Z |
-  // M is assumed to be serialized as [a,b,c,d,e,f,g,h,i],
-  // with v as [X,Y,Z]
-  Util.apply3dTransform = function Util_apply3dTransform(m, v) {
-    return [
-      m[0] * v[0] + m[1] * v[1] + m[2] * v[2],
-      m[3] * v[0] + m[4] * v[1] + m[5] * v[2],
-      m[6] * v[0] + m[7] * v[1] + m[8] * v[2]
-    ];
-  }
-
-  // Normalize rectangle rect=[x1, y1, x2, y2] so that (x1,y1) < (x2,y2)
-  // For coordinate systems whose origin lies in the bottom-left, this
-  // means normalization to (BL,TR) ordering. For systems with origin in the
-  // top-left, this means (TL,BR) ordering.
-  Util.normalizeRect = function Util_normalizeRect(rect) {
-    var r = rect.slice(0); // clone rect
-    if (rect[0] > rect[2]) {
-      r[0] = rect[2];
-      r[2] = rect[0];
-    }
-    if (rect[1] > rect[3]) {
-      r[1] = rect[3];
-      r[3] = rect[1];
-    }
-    return r;
-  }
-
-  // Returns a rectangle [x1, y1, x2, y2] corresponding to the
-  // intersection of rect1 and rect2. If no intersection, returns 'false'
-  // The rectangle coordinates of rect1, rect2 should be [x1, y1, x2, y2]
-  Util.intersect = function Util_intersect(rect1, rect2) {
-    function compare(a, b) {
-      return a - b;
-    };
-
-    // Order points along the axes
-    var orderedX = [rect1[0], rect1[2], rect2[0], rect2[2]].sort(compare),
-        orderedY = [rect1[1], rect1[3], rect2[1], rect2[3]].sort(compare),
-        result = [];
-
-    rect1 = Util.normalizeRect(rect1);
-    rect2 = Util.normalizeRect(rect2);
-
-    // X: first and second points belong to different rectangles?
-    if ((orderedX[0] === rect1[0] && orderedX[1] === rect2[0]) ||
-        (orderedX[0] === rect2[0] && orderedX[1] === rect1[0])) {
-      // Intersection must be between second and third points
-      result[0] = orderedX[1];
-      result[2] = orderedX[2];
-    } else {
-      return false;
-    }
-
-    // Y: first and second points belong to different rectangles?
-    if ((orderedY[0] === rect1[1] && orderedY[1] === rect2[1]) ||
-        (orderedY[0] === rect2[1] && orderedY[1] === rect1[1])) {
-      // Intersection must be between second and third points
-      result[1] = orderedY[1];
-      result[3] = orderedY[2];
-    } else {
-      return false;
-    }
-
-    return result;
-  };
-
-  Util.sign = function Util_sign(num) {
-    return num < 0 ? -1 : 1;
-  };
-
-  return Util;
-})();
-
-var PageViewport = PDFJS.PageViewport = (function PageViewportClosure() {
-  function PageViewport(viewBox, scale, rotate, offsetX, offsetY) {
-    // creating transform to convert pdf coordinate system to the normal
-    // canvas like coordinates taking in account scale and rotation
-    var centerX = (viewBox[2] + viewBox[0]) / 2;
-    var centerY = (viewBox[3] + viewBox[1]) / 2;
-    var rotateA, rotateB, rotateC, rotateD;
-    switch (rotate) {
-      case -180:
-      case 180:
-        rotateA = -1; rotateB = 0; rotateC = 0; rotateD = 1;
-        break;
-      case -270:
-      case 90:
-        rotateA = 0; rotateB = 1; rotateC = 1; rotateD = 0;
-        break;
-      case -90:
-      case 270:
-        rotateA = 0; rotateB = -1; rotateC = -1; rotateD = 0;
-        break;
-      case 360:
-      case 0:
-      default:
-        rotateA = 1; rotateB = 0; rotateC = 0; rotateD = -1;
-        break;
-    }
-    var offsetCanvasX, offsetCanvasY;
-    var width, height;
-    if (rotateA == 0) {
-      offsetCanvasX = Math.abs(centerY - viewBox[1]) * scale + offsetX;
-      offsetCanvasY = Math.abs(centerX - viewBox[0]) * scale + offsetY;
-      width = Math.abs(viewBox[3] - viewBox[1]) * scale;
-      height = Math.abs(viewBox[2] - viewBox[0]) * scale;
-    } else {
-      offsetCanvasX = Math.abs(centerX - viewBox[0]) * scale + offsetX;
-      offsetCanvasY = Math.abs(centerY - viewBox[1]) * scale + offsetY;
-      width = Math.abs(viewBox[2] - viewBox[0]) * scale;
-      height = Math.abs(viewBox[3] - viewBox[1]) * scale;
-    }
-    // creating transform for the following operations:
-    // translate(-centerX, -centerY), rotate and flip vertically,
-    // scale, and translate(offsetCanvasX, offsetCanvasY)
-    this.transform = [
-      rotateA * scale,
-      rotateB * scale,
-      rotateC * scale,
-      rotateD * scale,
-      offsetCanvasX - rotateA * scale * centerX - rotateC * scale * centerY,
-      offsetCanvasY - rotateB * scale * centerX - rotateD * scale * centerY
-    ];
-
-    this.offsetX = offsetX;
-    this.offsetY = offsetY;
-    this.width = width;
-    this.height = height;
-    this.fontScale = scale;
-  }
-  PageViewport.prototype = {
-    convertToViewportPoint: function PageViewport_convertToViewportPoint(x, y) {
-      return Util.applyTransform([x, y], this.transform);
-    },
-    convertToViewportRectangle:
-      function PageViewport_convertToViewportRectangle(rect) {
-      var tl = Util.applyTransform([rect[0], rect[1]], this.transform);
-      var br = Util.applyTransform([rect[2], rect[3]], this.transform);
-      return [tl[0], tl[1], br[0], br[1]];
-    },
-    convertToPdfPoint: function PageViewport_convertToPdfPoint(x, y) {
-      return Util.applyInverseTransform([x, y], this.transform);
-    }
-  };
-  return PageViewport;
-})();
-
-var PDFStringTranslateTable = [
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0x2D8, 0x2C7, 0x2C6, 0x2D9, 0x2DD, 0x2DB, 0x2DA, 0x2DC, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x2022, 0x2020, 0x2021, 0x2026, 0x2014,
-  0x2013, 0x192, 0x2044, 0x2039, 0x203A, 0x2212, 0x2030, 0x201E, 0x201C,
-  0x201D, 0x2018, 0x2019, 0x201A, 0x2122, 0xFB01, 0xFB02, 0x141, 0x152, 0x160,
-  0x178, 0x17D, 0x131, 0x142, 0x153, 0x161, 0x17E, 0, 0x20AC
-];
-
-function stringToPDFString(str) {
-  var i, n = str.length, str2 = '';
-  if (str[0] === '\xFE' && str[1] === '\xFF') {
-    // UTF16BE BOM
-    for (i = 2; i < n; i += 2)
-      str2 += String.fromCharCode(
-        (str.charCodeAt(i) << 8) | str.charCodeAt(i + 1));
-  } else {
-    for (i = 0; i < n; ++i) {
-      var code = PDFStringTranslateTable[str.charCodeAt(i)];
-      str2 += code ? String.fromCharCode(code) : str.charAt(i);
-    }
-  }
-  return str2;
-}
-
-function stringToUTF8String(str) {
-  return decodeURIComponent(escape(str));
-}
-
-function isBool(v) {
-  return typeof v == 'boolean';
-}
-
-function isInt(v) {
-  return typeof v == 'number' && ((v | 0) == v);
-}
-
-function isNum(v) {
-  return typeof v == 'number';
-}
-
-function isString(v) {
-  return typeof v == 'string';
-}
-
-function isNull(v) {
-  return v === null;
-}
-
-function isName(v) {
-  return v instanceof Name;
-}
-
-function isCmd(v, cmd) {
-  return v instanceof Cmd && (!cmd || v.cmd == cmd);
-}
-
-function isDict(v, type) {
-  return v instanceof Dict && (!type || v.get('Type').name == type);
-}
-
-function isArray(v) {
-  return v instanceof Array;
-}
-
-function isStream(v) {
-  return typeof v == 'object' && v != null && ('getChar' in v);
-}
-
-function isArrayBuffer(v) {
-  return typeof v == 'object' && v != null && ('byteLength' in v);
-}
-
-function isRef(v) {
-  return v instanceof Ref;
-}
-
-function isPDFFunction(v) {
-  var fnDict;
-  if (typeof v != 'object')
-    return false;
-  else if (isDict(v))
-    fnDict = v;
-  else if (isStream(v))
-    fnDict = v.dict;
-  else
-    return false;
-  return fnDict.has('FunctionType');
-}
-
-/**
- * 'Promise' object.
- * Each object that is stored in PDFObjects is based on a Promise object that
- * contains the status of the object and the data. There migth be situations,
- * where a function want to use the value of an object, but it isn't ready at
- * that time. To get a notification, once the object is ready to be used, s.o.
- * can add a callback using the `then` method on the promise that then calls
- * the callback once the object gets resolved.
- * A promise can get resolved only once and only once the data of the promise
- * can be set. If any of these happens twice or the data is required before
- * it was set, an exception is throw.
- */
-var Promise = PDFJS.Promise = (function PromiseClosure() {
-  var EMPTY_PROMISE = {};
-
-  /**
-   * If `data` is passed in this constructor, the promise is created resolved.
-   * If there isn't data, it isn't resolved at the beginning.
-   */
-  function Promise(name, data) {
-    this.name = name;
-    this.isRejected = false;
-    this.error = null;
-    // If you build a promise and pass in some data it's already resolved.
-    if (data != null) {
-      this.isResolved = true;
-      this._data = data;
-      this.hasData = true;
-    } else {
-      this.isResolved = false;
-      this._data = EMPTY_PROMISE;
-    }
-    this.callbacks = [];
-    this.errbacks = [];
-    this.progressbacks = [];
-  };
-  /**
-   * Builds a promise that is resolved when all the passed in promises are
-   * resolved.
-   * @param {Promise[]} promises Array of promises to wait for.
-   * @return {Promise} New dependant promise.
-   */
-  Promise.all = function Promise_all(promises) {
-    var deferred = new Promise();
-    var unresolved = promises.length;
-    var results = [];
-    if (unresolved === 0) {
-      deferred.resolve(results);
-      return deferred;
-    }
-    for (var i = 0, ii = promises.length; i < ii; ++i) {
-      var promise = promises[i];
-      promise.then((function(i) {
-        return function(value) {
-          results[i] = value;
-          unresolved--;
-          if (unresolved === 0)
-            deferred.resolve(results);
-        };
-      })(i));
-    }
-    return deferred;
-  };
-  Promise.prototype = {
-    hasData: false,
-
-    set data(value) {
-      if (value === undefined) {
-        return;
-      }
-      if (this._data !== EMPTY_PROMISE) {
-        error('Promise ' + this.name +
-              ': Cannot set the data of a promise twice');
-      }
-      this._data = value;
-      this.hasData = true;
-
-      if (this.onDataCallback) {
-        this.onDataCallback(value);
-      }
-    },
-
-    get data() {
-      if (this._data === EMPTY_PROMISE) {
-        error('Promise ' + this.name + ': Cannot get data that isn\'t set');
-      }
-      return this._data;
-    },
-
-    onData: function Promise_onData(callback) {
-      if (this._data !== EMPTY_PROMISE) {
-        callback(this._data);
-      } else {
-        this.onDataCallback = callback;
-      }
-    },
-
-    resolve: function Promise_resolve(data) {
-      if (this.isResolved) {
-        error('A Promise can be resolved only once ' + this.name);
-      }
-      if (this.isRejected) {
-        error('The Promise was already rejected ' + this.name);
-      }
-
-      this.isResolved = true;
-      this.data = (typeof data !== 'undefined') ? data : null;
-      var callbacks = this.callbacks;
-
-      for (var i = 0, ii = callbacks.length; i < ii; i++) {
-        callbacks[i].call(null, data);
-      }
-    },
-
-    progress: function Promise_progress(data) {
-      var callbacks = this.progressbacks;
-      for (var i = 0, ii = callbacks.length; i < ii; i++) {
-        callbacks[i].call(null, data);
-      }
-    },
-
-    reject: function Promise_reject(reason, exception) {
-      if (this.isRejected) {
-        error('A Promise can be rejected only once ' + this.name);
-      }
-      if (this.isResolved) {
-        error('The Promise was already resolved ' + this.name);
-      }
-
-      this.isRejected = true;
-      this.error = reason || null;
-      var errbacks = this.errbacks;
-
-      for (var i = 0, ii = errbacks.length; i < ii; i++) {
-        errbacks[i].call(null, reason, exception);
-      }
-    },
-
-    then: function Promise_then(callback, errback, progressback) {
-      if (!callback) {
-        error('Requiring callback' + this.name);
-      }
-
-      // If the promise is already resolved, call the callback directly.
-      if (this.isResolved) {
-        var data = this.data;
-        callback.call(null, data);
-      } else if (this.isRejected && errback) {
-        var error = this.error;
-        errback.call(null, error);
-      } else {
-        this.callbacks.push(callback);
-        if (errback)
-          this.errbacks.push(errback);
-      }
-
-      if (progressback)
-        this.progressbacks.push(progressback);
-    }
-  };
-
-  return Promise;
-})();
-
-var StatTimer = (function StatTimerClosure() {
-  function rpad(str, pad, length) {
-    while (str.length < length)
-      str += pad;
-    return str;
-  }
-  function StatTimer() {
-    this.started = {};
-    this.times = [];
-    this.enabled = true;
-  }
-  StatTimer.prototype = {
-    time: function StatTimer_time(name) {
-      if (!this.enabled)
-        return;
-      if (name in this.started)
-        throw 'Timer is already running for ' + name;
-      this.started[name] = Date.now();
-    },
-    timeEnd: function StatTimer_timeEnd(name) {
-      if (!this.enabled)
-        return;
-      if (!(name in this.started))
-        throw 'Timer has not been started for ' + name;
-      this.times.push({
-        'name': name,
-        'start': this.started[name],
-        'end': Date.now()
-      });
-      // Remove timer from started so it can be called again.
-      delete this.started[name];
-    },
-    toString: function StatTimer_toString() {
-      var times = this.times;
-      var out = '';
-      // Find the longest name for padding purposes.
-      var longest = 0;
-      for (var i = 0, ii = times.length; i < ii; ++i) {
-        var name = times[i]['name'];
-        if (name.length > longest)
-          longest = name.length;
-      }
-      for (var i = 0, ii = times.length; i < ii; ++i) {
-        var span = times[i];
-        var duration = span.end - span.start;
-        out += rpad(span['name'], ' ', longest) + ' ' + duration + 'ms\n';
-      }
-      return out;
-    }
-  };
-  return StatTimer;
-})();
-
-/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
-
-/**
- * This is the main entry point for loading a PDF and interacting with it.
- * NOTE: If a URL is used to fetch the PDF data a standard XMLHttpRequest(XHR)
- * is used, which means it must follow the same origin rules that any XHR does
- * e.g. No cross domain requests without CORS.
- *
- * @param {string|TypedAray|object} source Can be an url to where a PDF is
- * located, a typed array (Uint8Array) already populated with data or
- * and parameter object with the following possible fields:
- *  - url   - The URL of the PDF.
- *  - data  - A typed array with PDF data.
- *  - httpHeaders - Basic authentication headers.
- *  - password - For decrypting password-protected PDFs.
- *
- * @return {Promise} A promise that is resolved with {PDFDocumentProxy} object.
- */
-PDFJS.getDocument = function getDocument(source) {
-  var url, data, headers, password, parameters = {};
-  if (typeof source === 'string') {
-    url = source;
-  } else if (isArrayBuffer(source)) {
-    data = source;
-  } else if (typeof source === 'object') {
-    url = source.url;
-    data = source.data;
-    headers = source.httpHeaders;
-    password = source.password;
-    parameters.password = password || null;
-
-    if (!url && !data)
-      error('Invalid parameter array, need either .data or .url');
-  } else {
-    error('Invalid parameter in getDocument, need either Uint8Array, ' +
-          'string or a parameter object');
-  }
-
-  var promise = new PDFJS.Promise();
-  var transport = new WorkerTransport(promise);
-  if (data) {
-    // assuming the data is array, instantiating directly from it
-    transport.sendData(data, parameters);
-  } else if (url) {
-    // fetch url
-    PDFJS.getPdf(
-      {
-        url: url,
-        progress: function getPDFProgress(evt) {
-          if (evt.lengthComputable)
-            promise.progress({
-              loaded: evt.loaded,
-              total: evt.total
-            });
-        },
-        error: function getPDFError(e) {
-          promise.reject('Unexpected server response of ' +
-            e.target.status + '.');
-        },
-        headers: headers
-      },
-      function getPDFLoad(data) {
-        transport.sendData(data, parameters);
-      });
-  }
-
-  return promise;
-};
-
-/**
- * Proxy to a PDFDocument in the worker thread. Also, contains commonly used
- * properties that can be read synchronously.
- */
-var PDFDocumentProxy = (function PDFDocumentProxyClosure() {
-  function PDFDocumentProxy(pdfInfo, transport) {
-    this.pdfInfo = pdfInfo;
-    this.transport = transport;
-  }
-  PDFDocumentProxy.prototype = {
-    /**
-     * @return {number} Total number of pages the PDF contains.
-     */
-    get numPages() {
-      return this.pdfInfo.numPages;
-    },
-    /**
-     * @return {string} A unique ID to identify a PDF. Not guaranteed to be
-     * unique.
-     */
-    get fingerprint() {
-      return this.pdfInfo.fingerprint;
-    },
-    /**
-     * @param {number} The page number to get. The first page is 1.
-     * @return {Promise} A promise that is resolved with a {PDFPageProxy}
-     * object.
-     */
-    getPage: function PDFDocumentProxy_getPage(number) {
-      return this.transport.getPage(number);
-    },
-    /**
-     * @return {Promise} A promise that is resolved with a lookup table for
-     * mapping named destinations to reference numbers.
-     */
-    getDestinations: function PDFDocumentProxy_getDestinations() {
-      var promise = new PDFJS.Promise();
-      var destinations = this.pdfInfo.destinations;
-      promise.resolve(destinations);
-      return promise;
-    },
-    /**
-     * @return {Promise} A promise that is resolved with an {array} that is a
-     * tree outline (if it has one) of the PDF. The tree is in the format of:
-     * [
-     *  {
-     *   title: string,
-     *   bold: boolean,
-     *   italic: boolean,
-     *   color: rgb array,
-     *   dest: dest obj,
-     *   items: array of more items like this
-     *  },
-     *  ...
-     * ].
-     */
-    getOutline: function PDFDocumentProxy_getOutline() {
-      var promise = new PDFJS.Promise();
-      var outline = this.pdfInfo.outline;
-      promise.resolve(outline);
-      return promise;
-    },
-    /**
-     * @return {Promise} A promise that is resolved with an {object} that has
-     * info and metadata properties.  Info is an {object} filled with anything
-     * available in the information dictionary and similarly metadata is a
-     * {Metadata} object with information from the metadata section of the PDF.
-     */
-    getMetadata: function PDFDocumentProxy_getMetadata() {
-      var promise = new PDFJS.Promise();
-      var info = this.pdfInfo.info;
-      var metadata = this.pdfInfo.metadata;
-      promise.resolve({
-        info: info,
-        metadata: metadata ? new PDFJS.Metadata(metadata) : null
-      });
-      return promise;
-    },
-    isEncrypted: function PDFDocumentProxy_isEncrypted() {
-      var promise = new PDFJS.Promise();
-      promise.resolve(this.pdfInfo.encrypted);
-      return promise;
-    },
-    /**
-     * @return {Promise} A promise that is resolved with a TypedArray that has
-     * the raw data from the PDF.
-     */
-    getData: function PDFDocumentProxy_getData() {
-      var promise = new PDFJS.Promise();
-      this.transport.getData(promise);
-      return promise;
-    },
-    destroy: function PDFDocumentProxy_destroy() {
-      this.transport.destroy();
-    }
-  };
-  return PDFDocumentProxy;
-})();
-
-var PDFPageProxy = (function PDFPageProxyClosure() {
-  function PDFPageProxy(pageInfo, transport) {
-    this.pageInfo = pageInfo;
-    this.transport = transport;
-    this.stats = new StatTimer();
-    this.stats.enabled = !!globalScope.PDFJS.enableStats;
-    this.objs = transport.objs;
-    this.renderInProgress = false;
-  }
-  PDFPageProxy.prototype = {
-    /**
-     * @return {number} Page number of the page. First page is 1.
-     */
-    get pageNumber() {
-      return this.pageInfo.pageIndex + 1;
-    },
-    /**
-     * @return {number} The number of degrees the page is rotated clockwise.
-     */
-    get rotate() {
-      return this.pageInfo.rotate;
-    },
-    /**
-     * @return {object} The reference that points to this page. It has 'num' and
-     * 'gen' properties.
-     */
-    get ref() {
-      return this.pageInfo.ref;
-    },
-    /**
-     * @return {array} An array of the visible portion of the PDF page in the
-     * user space units - [x1, y1, x2, y2].
-     */
-    get view() {
-      return this.pageInfo.view;
-    },
-    /**
-     * @param {number} scale The desired scale of the viewport.
-     * @param {number} rotate Degrees to rotate the viewport. If omitted this
-     * defaults to the page rotation.
-     * @return {PageViewport} Contains 'width' and 'height' properties along
-     * with transforms required for rendering.
-     */
-    getViewport: function PDFPageProxy_getViewport(scale, rotate) {
-      if (arguments.length < 2)
-        rotate = this.rotate;
-      return new PDFJS.PageViewport(this.view, scale, rotate, 0, 0);
-    },
-    /**
-     * @return {Promise} A promise that is resolved with an {array} of the
-     * annotation objects.
-     */
-    getAnnotations: function PDFPageProxy_getAnnotations() {
-      if (this.annotationsPromise)
-        return this.annotationsPromise;
-
-      var promise = new PDFJS.Promise();
-      this.annotationsPromise = promise;
-      this.transport.getAnnotations(this.pageInfo.pageIndex);
-      return promise;
-    },
-    /**
-     * Begins the process of rendering a page to the desired context.
-     * @param {object} params A parameter object that supports:
-     * {
-     *   canvasContext(required): A 2D context of a DOM Canvas object.,
-     *   textLayer(optional): An object that has beginLayout, endLayout, and
-     *                        appendText functions.
-     * }.
-     * @return {Promise} A promise that is resolved when the page finishes
-     * rendering.
-     */
-    render: function PDFPageProxy_render(params) {
-      this.renderInProgress = true;
-
-      var promise = new Promise();
-      var stats = this.stats;
-      stats.time('Overall');
-      // If there is no displayReadyPromise yet, then the operatorList was never
-      // requested before. Make the request and create the promise.
-      if (!this.displayReadyPromise) {
-        this.displayReadyPromise = new Promise();
-        this.destroyed = false;
-
-        this.stats.time('Page Request');
-        this.transport.messageHandler.send('RenderPageRequest', {
-          pageIndex: this.pageNumber - 1
-        });
-      }
-
-      var self = this;
-      function complete(error) {
-        self.renderInProgress = false;
-        if (self.destroyed) {
-          delete self.operatorList;
-          delete self.displayReadyPromise;
-        }
-
-        if (error)
-          promise.reject(error);
-        else
-          promise.resolve();
-      };
-
-      // Once the operatorList and fonts are loaded, do the actual rendering.
-      this.displayReadyPromise.then(
-        function pageDisplayReadyPromise() {
-          if (self.destroyed) {
-            complete();
-            return;
-          }
-
-          var gfx = new CanvasGraphics(params.canvasContext,
-            this.objs, params.textLayer);
-          try {
-            this.display(gfx, params.viewport, complete);
-          } catch (e) {
-            complete(e);
-          }
-        }.bind(this),
-        function pageDisplayReadPromiseError(reason) {
-          complete(reason);
-        }
-      );
-
-      return promise;
-    },
-    /**
-     * For internal use only.
-     */
-    startRenderingFromOperatorList:
-      function PDFPageProxy_startRenderingFromOperatorList(operatorList,
-                                                           fonts) {
-      var self = this;
-      this.operatorList = operatorList;
-
-      var displayContinuation = function pageDisplayContinuation() {
-        // Always defer call to display() to work around bug in
-        // Firefox error reporting from XHR callbacks.
-        setTimeout(function pageSetTimeout() {
-          self.displayReadyPromise.resolve();
-        });
-      };
-
-      this.ensureFonts(fonts,
-        function pageStartRenderingFromOperatorListEnsureFonts() {
-          displayContinuation();
-        }
-      );
-    },
-    /**
-     * For internal use only.
-     */
-    ensureFonts: function PDFPageProxy_ensureFonts(fonts, callback) {
-      this.stats.time('Font Loading');
-      // Convert the font names to the corresponding font obj.
-      for (var i = 0, ii = fonts.length; i < ii; i++) {
-        fonts[i] = this.objs.objs[fonts[i]].data;
-      }
-
-      // Load all the fonts
-      FontLoader.bind(
-        fonts,
-        function pageEnsureFontsFontObjs(fontObjs) {
-          this.stats.timeEnd('Font Loading');
-
-          callback.call(this);
-        }.bind(this)
-      );
-    },
-    /**
-     * For internal use only.
-     */
-    display: function PDFPageProxy_display(gfx, viewport, callback) {
-      var stats = this.stats;
-      stats.time('Rendering');
-
-      gfx.beginDrawing(viewport);
-
-      var startIdx = 0;
-      var length = this.operatorList.fnArray.length;
-      var operatorList = this.operatorList;
-      var stepper = null;
-      if (PDFJS.pdfBug && StepperManager.enabled) {
-        stepper = StepperManager.create(this.pageNumber - 1);
-        stepper.init(operatorList);
-        stepper.nextBreakPoint = stepper.getNextBreakPoint();
-      }
-
-      var self = this;
-      function next() {
-        startIdx =
-          gfx.executeOperatorList(operatorList, startIdx, next, stepper);
-        if (startIdx == length) {
-          gfx.endDrawing();
-          stats.timeEnd('Rendering');
-          stats.timeEnd('Overall');
-          if (callback) callback();
-        }
-      }
-      next();
-    },
-    /**
-     * @return {Promise} That is resolved with the a {string} that is the text
-     * content from the page.
-     */
-    getTextContent: function PDFPageProxy_getTextContent() {
-      var promise = new PDFJS.Promise();
-      this.transport.messageHandler.send('GetTextContent', {
-          pageIndex: this.pageNumber - 1
-        },
-        function textContentCallback(textContent) {
-          promise.resolve(textContent);
-        }
-      );
-      return promise;
-    },
-    /**
-     * Stub for future feature.
-     */
-    getOperationList: function PDFPageProxy_getOperationList() {
-      var promise = new PDFJS.Promise();
-      var operationList = { // not implemented
-        dependencyFontsID: null,
-        operatorList: null
-      };
-      promise.resolve(operationList);
-      return promise;
-    },
-    /**
-     * Destroys resources allocated by the page.
-     */
-    destroy: function PDFPageProxy_destroy() {
-      this.destroyed = true;
-
-      if (!this.renderInProgress) {
-        delete this.operatorList;
-        delete this.displayReadyPromise;
-      }
-    }
-  };
-  return PDFPageProxy;
-})();
-/**
- * For internal use only.
- */
-var WorkerTransport = (function WorkerTransportClosure() {
-  function WorkerTransport(promise) {
-    this.workerReadyPromise = promise;
-    this.objs = new PDFObjects();
-
-    this.pageCache = [];
-    this.pagePromises = [];
-    this.fontsLoading = {};
-
-    // If worker support isn't disabled explicit and the browser has worker
-    // support, create a new web worker and test if it/the browser fullfills
-    // all requirements to run parts of pdf.js in a web worker.
-    // Right now, the requirement is, that an Uint8Array is still an Uint8Array
-    // as it arrives on the worker. Chrome added this with version 15.
-    if (!globalScope.PDFJS.disableWorker && typeof Worker !== 'undefined') {
-      var workerSrc = PDFJS.workerSrc;
-      if (typeof workerSrc === 'undefined') {
-        error('No PDFJS.workerSrc specified');
-      }
-
-      try {
-        var worker;
-        if (PDFJS.isFirefoxExtension) {
-          // The firefox extension can't load the worker from the resource://
-          // url so we have to inline the script and then use the blob loader.
-          var bb = new MozBlobBuilder();
-          bb.append(document.querySelector('#PDFJS_SCRIPT_TAG').textContent);
-          var blobUrl = window.URL.createObjectURL(bb.getBlob());
-          worker = new Worker(blobUrl);
-        } else {
-          // Some versions of FF can't create a worker on localhost, see:
-          // https://bugzilla.mozilla.org/show_bug.cgi?id=683280
-          worker = new Worker(workerSrc);
-        }
-
-        var messageHandler = new MessageHandler('main', worker);
-        this.messageHandler = messageHandler;
-
-        messageHandler.on('test', function transportTest(supportTypedArray) {
-          if (supportTypedArray) {
-            this.worker = worker;
-            this.setupMessageHandler(messageHandler);
-          } else {
-            globalScope.PDFJS.disableWorker = true;
-            this.setupFakeWorker();
-          }
-        }.bind(this));
-
-        var testObj = new Uint8Array(1);
-        // Some versions of Opera throw a DATA_CLONE_ERR on
-        // serializing the typed array.
-        messageHandler.send('test', testObj);
-        return;
-      } catch (e) {
-        info('The worker has been disabled.');
-      }
-    }
-    // Either workers are disabled, not supported or have thrown an exception.
-    // Thus, we fallback to a faked worker.
-    globalScope.PDFJS.disableWorker = true;
-    this.setupFakeWorker();
-  }
-  WorkerTransport.prototype = {
-    destroy: function WorkerTransport_destroy() {
-      if (this.worker)
-        this.worker.terminate();
-
-      this.pageCache = [];
-      this.pagePromises = [];
-    },
-    setupFakeWorker: function WorkerTransport_setupFakeWorker() {
-      // If we don't use a worker, just post/sendMessage to the main thread.
-      var fakeWorker = {
-        postMessage: function WorkerTransport_postMessage(obj) {
-          fakeWorker.onmessage({data: obj});
-        },
-        terminate: function WorkerTransport_terminate() {}
-      };
-
-      var messageHandler = new MessageHandler('main', fakeWorker);
-      this.setupMessageHandler(messageHandler);
-
-      // If the main thread is our worker, setup the handling for the messages
-      // the main thread sends to it self.
-      WorkerMessageHandler.setup(messageHandler);
-    },
-
-    setupMessageHandler:
-      function WorkerTransport_setupMessageHandler(messageHandler) {
-      this.messageHandler = messageHandler;
-
-      messageHandler.on('GetDoc', function transportDoc(data) {
-        var pdfInfo = data.pdfInfo;
-        var pdfDocument = new PDFDocumentProxy(pdfInfo, this);
-        this.pdfDocument = pdfDocument;
-        this.workerReadyPromise.resolve(pdfDocument);
-      }, this);
-
-      messageHandler.on('NeedPassword', function transportPassword(data) {
-        this.workerReadyPromise.reject(data.exception.message, data.exception);
-      }, this);
-
-      messageHandler.on('IncorrectPassword', function transportBadPass(data) {
-        this.workerReadyPromise.reject(data.exception.message, data.exception);
-      }, this);
-
-      messageHandler.on('GetPage', function transportPage(data) {
-        var pageInfo = data.pageInfo;
-        var page = new PDFPageProxy(pageInfo, this);
-        this.pageCache[pageInfo.pageIndex] = page;
-        var promise = this.pagePromises[pageInfo.pageIndex];
-        promise.resolve(page);
-      }, this);
-
-      messageHandler.on('GetAnnotations', function transportAnnotations(data) {
-        var annotations = data.annotations;
-        var promise = this.pageCache[data.pageIndex].annotationsPromise;
-        promise.resolve(annotations);
-      }, this);
-
-      messageHandler.on('RenderPage', function transportRender(data) {
-        var page = this.pageCache[data.pageIndex];
-        var depFonts = data.depFonts;
-
-        page.stats.timeEnd('Page Request');
-        page.startRenderingFromOperatorList(data.operatorList, depFonts);
-      }, this);
-
-      messageHandler.on('obj', function transportObj(data) {
-        var id = data[0];
-        var type = data[1];
-        if (this.objs.hasData(id))
-          return;
-
-        switch (type) {
-          case 'JpegStream':
-            var imageData = data[2];
-            loadJpegStream(id, imageData, this.objs);
-            break;
-          case 'Image':
-            var imageData = data[2];
-            this.objs.resolve(id, imageData);
-            break;
-          case 'Font':
-            var name = data[2];
-            var file = data[3];
-            var properties = data[4];
-
-            if (file) {
-              // Rewrap the ArrayBuffer in a stream.
-              var fontFileDict = new Dict();
-              file = new Stream(file, 0, file.length, fontFileDict);
-            }
-
-            // At this point, only the font object is created but the font is
-            // not yet attached to the DOM. This is done in `FontLoader.bind`.
-            var font = new Font(name, file, properties);
-            this.objs.resolve(id, font);
-            break;
-          default:
-            error('Got unkown object type ' + type);
-        }
-      }, this);
-
-      messageHandler.on('PageError', function transportError(data) {
-        var page = this.pageCache[data.pageNum - 1];
-        if (page.displayReadyPromise)
-          page.displayReadyPromise.reject(data.error);
-        else
-          error(data.error);
-      }, this);
-
-      messageHandler.on('JpegDecode', function(data, promise) {
-        var imageData = data[0];
-        var components = data[1];
-        if (components != 3 && components != 1)
-          error('Only 3 component or 1 component can be returned');
-
-        var img = new Image();
-        img.onload = (function messageHandler_onloadClosure() {
-          var width = img.width;
-          var height = img.height;
-          var size = width * height;
-          var rgbaLength = size * 4;
-          var buf = new Uint8Array(size * components);
-          var tmpCanvas = createScratchCanvas(width, height);
-          var tmpCtx = tmpCanvas.getContext('2d');
-          tmpCtx.drawImage(img, 0, 0);
-          var data = tmpCtx.getImageData(0, 0, width, height).data;
-
-          if (components == 3) {
-            for (var i = 0, j = 0; i < rgbaLength; i += 4, j += 3) {
-              buf[j] = data[i];
-              buf[j + 1] = data[i + 1];
-              buf[j + 2] = data[i + 2];
-            }
-          } else if (components == 1) {
-            for (var i = 0, j = 0; i < rgbaLength; i += 4, j++) {
-              buf[j] = data[i];
-            }
-          }
-          promise.resolve({ data: buf, width: width, height: height});
-        }).bind(this);
-        var src = 'data:image/jpeg;base64,' + window.btoa(imageData);
-        img.src = src;
-      });
-    },
-
-    sendData: function WorkerTransport_sendData(data, params) {
-      this.messageHandler.send('GetDocRequest', {data: data, params: params});
-    },
-
-    getData: function WorkerTransport_sendData(promise) {
-      this.messageHandler.send('GetData', null, function(data) {
-        promise.resolve(data);
-      });
-    },
-
-    getPage: function WorkerTransport_getPage(pageNumber, promise) {
-      var pageIndex = pageNumber - 1;
-      if (pageIndex in this.pagePromises)
-        return this.pagePromises[pageIndex];
-      var promise = new PDFJS.Promise('Page ' + pageNumber);
-      this.pagePromises[pageIndex] = promise;
-      this.messageHandler.send('GetPageRequest', { pageIndex: pageIndex });
-      return promise;
-    },
-
-    getAnnotations: function WorkerTransport_getAnnotations(pageIndex) {
-      this.messageHandler.send('GetAnnotationsRequest',
-        { pageIndex: pageIndex });
-    }
-  };
-  return WorkerTransport;
-
-})();
-
-/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
-
-'use strict';
-
-// <canvas> contexts store most of the state we need natively.
-// However, PDF needs a bit more state, which we store here.
-
-var TextRenderingMode = {
-  FILL: 0,
-  STROKE: 1,
-  FILL_STROKE: 2,
-  INVISIBLE: 3,
-  FILL_ADD_TO_PATH: 4,
-  STROKE_ADD_TO_PATH: 5,
-  FILL_STROKE_ADD_TO_PATH: 6,
-  ADD_TO_PATH: 7
-};
-
-// Minimal font size that would be used during canvas fillText operations.
-var MIN_FONT_SIZE = 1;
-
-function createScratchCanvas(width, height) {
-  var canvas = document.createElement('canvas');
-  canvas.width = width;
-  canvas.height = height;
-  return canvas;
-}
-
-function addContextCurrentTransform(ctx) {
-  // If the context doesn't expose a `mozCurrentTransform`, add a JS based on.
-  if (!ctx.mozCurrentTransform) {
-    // Store the original context
-    ctx._originalSave = ctx.save;
-    ctx._originalRestore = ctx.restore;
-    ctx._originalRotate = ctx.rotate;
-    ctx._originalScale = ctx.scale;
-    ctx._originalTranslate = ctx.translate;
-    ctx._originalTransform = ctx.transform;
-
-    ctx._transformMatrix = [1, 0, 0, 1, 0, 0];
-    ctx._transformStack = [];
-
-    Object.defineProperty(ctx, 'mozCurrentTransform', {
-      get: function getCurrentTransform() {
-        return this._transformMatrix;
-      }
-    });
-
-    Object.defineProperty(ctx, 'mozCurrentTransformInverse', {
-      get: function getCurrentTransformInverse() {
-        // Calculation done using WolframAlpha:
-        // http://www.wolframalpha.com/input/?
-        //   i=Inverse+{{a%2C+c%2C+e}%2C+{b%2C+d%2C+f}%2C+{0%2C+0%2C+1}}
-
-        var m = this._transformMatrix;
-        var a = m[0], b = m[1], c = m[2], d = m[3], e = m[4], f = m[5];
-
-        var ad_bc = a * d - b * c;
-        var bc_ad = b * c - a * d;
-
-        return [
-          d / ad_bc,
-          b / bc_ad,
-          c / bc_ad,
-          a / ad_bc,
-          (d * e - c * f) / bc_ad,
-          (b * e - a * f) / ad_bc
-        ];
-      }
-    });
-
-    ctx.save = function ctxSave() {
-      var old = this._transformMatrix;
-      this._transformStack.push(old);
-      this._transformMatrix = old.slice(0, 6);
-
-      this._originalSave();
-    };
-
-    ctx.restore = function ctxRestore() {
-      var prev = this._transformStack.pop();
-      if (prev) {
-        this._transformMatrix = prev;
-        this._originalRestore();
-      }
-    };
-
-    ctx.translate = function ctxTranslate(x, y) {
-      var m = this._transformMatrix;
-      m[4] = m[0] * x + m[2] * y + m[4];
-      m[5] = m[1] * x + m[3] * y + m[5];
-
-      this._originalTranslate(x, y);
-    };
-
-    ctx.scale = function ctxScale(x, y) {
-      var m = this._transformMatrix;
-      m[0] = m[0] * x;
-      m[1] = m[1] * x;
-      m[2] = m[2] * y;
-      m[3] = m[3] * y;
-
-      this._originalScale(x, y);
-    };
-
-    ctx.transform = function ctxTransform(a, b, c, d, e, f) {
-      var m = this._transformMatrix;
-      this._transformMatrix = [
-        m[0] * a + m[2] * b,
-        m[1] * a + m[3] * b,
-        m[0] * c + m[2] * d,
-        m[1] * c + m[3] * d,
-        m[0] * e + m[2] * f + m[4],
-        m[1] * e + m[3] * f + m[5]
-      ];
-
-      ctx._originalTransform(a, b, c, d, e, f);
-    };
-
-    ctx.rotate = function ctxRotate(angle) {
-      var cosValue = Math.cos(angle);
-      var sinValue = Math.sin(angle);
-
-      var m = this._transformMatrix;
-      this._transformMatrix = [
-        m[0] * cosValue + m[2] * sinValue,
-        m[1] * cosValue + m[3] * sinValue,
-        m[0] * (-sinValue) + m[2] * cosValue,
-        m[1] * (-sinValue) + m[3] * cosValue,
-        m[4],
-        m[5]
-      ];
-
-      this._originalRotate(angle);
-    };
-  }
-}
-
-var CanvasExtraState = (function CanvasExtraStateClosure() {
-  function CanvasExtraState(old) {
-    // Are soft masks and alpha values shapes or opacities?
-    this.alphaIsShape = false;
-    this.fontSize = 0;
-    this.fontSizeScale = 1;
-    this.textMatrix = IDENTITY_MATRIX;
-    this.fontMatrix = IDENTITY_MATRIX;
-    this.leading = 0;
-    // Current point (in user coordinates)
-    this.x = 0;
-    this.y = 0;
-    // Start of text line (in text coordinates)
-    this.lineX = 0;
-    this.lineY = 0;
-    // Character and word spacing
-    this.charSpacing = 0;
-    this.wordSpacing = 0;
-    this.textHScale = 1;
-    this.textRenderingMode = TextRenderingMode.FILL;
-    // Color spaces
-    this.fillColorSpace = new DeviceGrayCS();
-    this.fillColorSpaceObj = null;
-    this.strokeColorSpace = new DeviceGrayCS();
-    this.strokeColorSpaceObj = null;
-    this.fillColorObj = null;
-    this.strokeColorObj = null;
-    // Default fore and background colors
-    this.fillColor = '#000000';
-    this.strokeColor = '#000000';
-    // Note: fill alpha applies to all non-stroking operations
-    this.fillAlpha = 1;
-    this.strokeAlpha = 1;
-    this.lineWidth = 1;
-
-    this.old = old;
-  }
-
-  CanvasExtraState.prototype = {
-    clone: function CanvasExtraState_clone() {
-      return Object.create(this);
-    },
-    setCurrentPoint: function CanvasExtraState_setCurrentPoint(x, y) {
-      this.x = x;
-      this.y = y;
-    }
-  };
-  return CanvasExtraState;
-})();
-
-var CanvasGraphics = (function CanvasGraphicsClosure() {
-  // Defines the time the executeOperatorList is going to be executing
-  // before it stops and shedules a continue of execution.
-  var kExecutionTime = 15;
-
-  function CanvasGraphics(canvasCtx, objs, textLayer) {
-    this.ctx = canvasCtx;
-    this.current = new CanvasExtraState();
-    this.stateStack = [];
-    this.pendingClip = null;
-    this.res = null;
-    this.xobjs = null;
-    this.objs = objs;
-    this.textLayer = textLayer;
-    if (canvasCtx) {
-      addContextCurrentTransform(canvasCtx);
-    }
-  }
-
-  var LINE_CAP_STYLES = ['butt', 'round', 'square'];
-  var LINE_JOIN_STYLES = ['miter', 'round', 'bevel'];
-  var NORMAL_CLIP = {};
-  var EO_CLIP = {};
-
-  CanvasGraphics.prototype = {
-    slowCommands: {
-      'stroke': true,
-      'closeStroke': true,
-      'fill': true,
-      'eoFill': true,
-      'fillStroke': true,
-      'eoFillStroke': true,
-      'closeFillStroke': true,
-      'closeEOFillStroke': true,
-      'showText': true,
-      'showSpacedText': true,
-      'setStrokeColorSpace': true,
-      'setFillColorSpace': true,
-      'setStrokeColor': true,
-      'setStrokeColorN': true,
-      'setFillColor': true,
-      'setFillColorN': true,
-      'setStrokeGray': true,
-      'setFillGray': true,
-      'setStrokeRGBColor': true,
-      'setFillRGBColor': true,
-      'setStrokeCMYKColor': true,
-      'setFillCMYKColor': true,
-      'paintJpegXObject': true,
-      'paintImageXObject': true,
-      'paintImageMaskXObject': true,
-      'shadingFill': true
-    },
-
-    beginDrawing: function CanvasGraphics_beginDrawing(viewport) {
-      var transform = viewport.transform;
-      this.ctx.save();
-      this.ctx.transform.apply(this.ctx, transform);
-
-      if (this.textLayer)
-        this.textLayer.beginLayout();
-    },
-
-    executeOperatorList: function CanvasGraphics_executeOperatorList(
-                                    operatorList,
-                                    executionStartIdx, continueCallback,
-                                    stepper) {
-      var argsArray = operatorList.argsArray;
-      var fnArray = operatorList.fnArray;
-      var i = executionStartIdx || 0;
-      var argsArrayLen = argsArray.length;
-
-      // Sometimes the OperatorList to execute is empty.
-      if (argsArrayLen == i) {
-        return i;
-      }
-
-      var executionEndIdx;
-      var endTime = Date.now() + kExecutionTime;
-
-      var objs = this.objs;
-      var fnName;
-      var slowCommands = this.slowCommands;
-
-      while (true) {
-        if (stepper && i === stepper.nextBreakPoint) {
-          stepper.breakIt(i, continueCallback);
-          return i;
-        }
-
-        fnName = fnArray[i];
-
-        if (fnName !== 'dependency') {
-          this[fnName].apply(this, argsArray[i]);
-        } else {
-          var deps = argsArray[i];
-          for (var n = 0, nn = deps.length; n < nn; n++) {
-            var depObjId = deps[n];
-
-            // If the promise isn't resolved yet, add the continueCallback
-            // to the promise and bail out.
-            if (!objs.isResolved(depObjId)) {
-              objs.get(depObjId, continueCallback);
-              return i;
-            }
-          }
-        }
-
-        i++;
-
-        // If the entire operatorList was executed, stop as were done.
-        if (i == argsArrayLen) {
-          return i;
-        }
-
-        // If the execution took longer then a certain amount of time, shedule
-        // to continue exeution after a short delay.
-        // However, this is only possible if a 'continueCallback' is passed in.
-        if (continueCallback && slowCommands[fnName] && Date.now() > endTime) {
-          setTimeout(continueCallback, 0);
-          return i;
-        }
-
-        // If the operatorList isn't executed completely yet OR the execution
-        // time was short enough, do another execution round.
-      }
-    },
-
-    endDrawing: function CanvasGraphics_endDrawing() {
-      this.ctx.restore();
-
-      if (this.textLayer)
-        this.textLayer.endLayout();
-    },
-
-    // Graphics state
-    setLineWidth: function CanvasGraphics_setLineWidth(width) {
-      this.current.lineWidth = width;
-      this.ctx.lineWidth = width;
-    },
-    setLineCap: function CanvasGraphics_setLineCap(style) {
-      this.ctx.lineCap = LINE_CAP_STYLES[style];
-    },
-    setLineJoin: function CanvasGraphics_setLineJoin(style) {
-      this.ctx.lineJoin = LINE_JOIN_STYLES[style];
-    },
-    setMiterLimit: function CanvasGraphics_setMiterLimit(limit) {
-      this.ctx.miterLimit = limit;
-    },
-    setDash: function CanvasGraphics_setDash(dashArray, dashPhase) {
-      this.ctx.mozDash = dashArray;
-      this.ctx.mozDashOffset = dashPhase;
-      this.ctx.webkitLineDash = dashArray;
-      this.ctx.webkitLineDashOffset = dashPhase;
-    },
-    setRenderingIntent: function CanvasGraphics_setRenderingIntent(intent) {
-      // Maybe if we one day fully support color spaces this will be important
-      // for now we can ignore.
-      // TODO set rendering intent?
-    },
-    setFlatness: function CanvasGraphics_setFlatness(flatness) {
-      // There's no way to control this with canvas, but we can safely ignore.
-      // TODO set flatness?
-    },
-    setGState: function CanvasGraphics_setGState(states) {
-      for (var i = 0, ii = states.length; i < ii; i++) {
-        var state = states[i];
-        var key = state[0];
-        var value = state[1];
-
-        switch (key) {
-          case 'LW':
-            this.setLineWidth(value);
-            break;
-          case 'LC':
-            this.setLineCap(value);
-            break;
-          case 'LJ':
-            this.setLineJoin(value);
-            break;
-          case 'ML':
-            this.setMiterLimit(value);
-            break;
-          case 'D':
-            this.setDash(value[0], value[1]);
-            break;
-          case 'RI':
-            this.setRenderingIntent(value);
-            break;
-          case 'FL':
-            this.setFlatness(value);
-            break;
-          case 'Font':
-            this.setFont(state[1], state[2]);
-            break;
-          case 'CA':
-            this.current.strokeAlpha = state[1];
-            break;
-          case 'ca':
-            this.current.fillAlpha = state[1];
-            this.ctx.globalAlpha = state[1];
-            break;
-        }
-      }
-    },
-    save: function CanvasGraphics_save() {
-      this.ctx.save();
-      var old = this.current;
-      this.stateStack.push(old);
-      this.current = old.clone();
-    },
-    restore: function CanvasGraphics_restore() {
-      var prev = this.stateStack.pop();
-      if (prev) {
-        this.current = prev;
-        this.ctx.restore();
-      }
-    },
-    transform: function CanvasGraphics_transform(a, b, c, d, e, f) {
-      this.ctx.transform(a, b, c, d, e, f);
-    },
-
-    // Path
-    moveTo: function CanvasGraphics_moveTo(x, y) {
-      this.ctx.moveTo(x, y);
-      this.current.setCurrentPoint(x, y);
-    },
-    lineTo: function CanvasGraphics_lineTo(x, y) {
-      this.ctx.lineTo(x, y);
-      this.current.setCurrentPoint(x, y);
-    },
-    curveTo: function CanvasGraphics_curveTo(x1, y1, x2, y2, x3, y3) {
-      this.ctx.bezierCurveTo(x1, y1, x2, y2, x3, y3);
-      this.current.setCurrentPoint(x3, y3);
-    },
-    curveTo2: function CanvasGraphics_curveTo2(x2, y2, x3, y3) {
-      var current = this.current;
-      this.ctx.bezierCurveTo(current.x, current.y, x2, y2, x3, y3);
-      current.setCurrentPoint(x3, y3);
-    },
-    curveTo3: function CanvasGraphics_curveTo3(x1, y1, x3, y3) {
-      this.curveTo(x1, y1, x3, y3, x3, y3);
-      this.current.setCurrentPoint(x3, y3);
-    },
-    closePath: function CanvasGraphics_closePath() {
-      this.ctx.closePath();
-    },
-    rectangle: function CanvasGraphics_rectangle(x, y, width, height) {
-      this.ctx.rect(x, y, width, height);
-    },
-    stroke: function CanvasGraphics_stroke(consumePath) {
-      consumePath = typeof consumePath !== 'undefined' ? consumePath : true;
-      var ctx = this.ctx;
-      var strokeColor = this.current.strokeColor;
-      if (this.current.lineWidth === 0)
-        ctx.lineWidth = this.getSinglePixelWidth();
-      // For stroke we want to temporarily change the global alpha to the
-      // stroking alpha.
-      ctx.globalAlpha = this.current.strokeAlpha;
-      if (strokeColor && strokeColor.hasOwnProperty('type') &&
-          strokeColor.type === 'Pattern') {
-        // for patterns, we transform to pattern space, calculate
-        // the pattern, call stroke, and restore to user space
-        ctx.save();
-        ctx.strokeStyle = strokeColor.getPattern(ctx);
-        ctx.stroke();
-        ctx.restore();
-      } else {
-        ctx.stroke();
-      }
-      if (consumePath)
-        this.consumePath();
-      // Restore the global alpha to the fill alpha
-      ctx.globalAlpha = this.current.fillAlpha;
-    },
-    closeStroke: function CanvasGraphics_closeStroke() {
-      this.closePath();
-      this.stroke();
-    },
-    fill: function CanvasGraphics_fill(consumePath) {
-      consumePath = typeof consumePath !== 'undefined' ? consumePath : true;
-      var ctx = this.ctx;
-      var fillColor = this.current.fillColor;
-
-      if (fillColor && fillColor.hasOwnProperty('type') &&
-          fillColor.type === 'Pattern') {
-        ctx.save();
-        ctx.fillStyle = fillColor.getPattern(ctx);
-        ctx.fill();
-        ctx.restore();
-      } else {
-        ctx.fill();
-      }
-      if (consumePath)
-        this.consumePath();
-    },
-    eoFill: function CanvasGraphics_eoFill() {
-      var savedFillRule = this.setEOFillRule();
-      this.fill();
-      this.restoreFillRule(savedFillRule);
-    },
-    fillStroke: function CanvasGraphics_fillStroke() {
-      this.fill(false);
-      this.stroke(false);
-
-      this.consumePath();
-    },
-    eoFillStroke: function CanvasGraphics_eoFillStroke() {
-      var savedFillRule = this.setEOFillRule();
-      this.fillStroke();
-      this.restoreFillRule(savedFillRule);
-    },
-    closeFillStroke: function CanvasGraphics_closeFillStroke() {
-      this.closePath();
-      this.fillStroke();
-    },
-    closeEOFillStroke: function CanvasGraphics_closeEOFillStroke() {
-      var savedFillRule = this.setEOFillRule();
-      this.closePath();
-      this.fillStroke();
-      this.restoreFillRule(savedFillRule);
-    },
-    endPath: function CanvasGraphics_endPath() {
-      this.consumePath();
-    },
-
-    // Clipping
-    clip: function CanvasGraphics_clip() {
-      this.pendingClip = NORMAL_CLIP;
-    },
-    eoClip: function CanvasGraphics_eoClip() {
-      this.pendingClip = EO_CLIP;
-    },
-
-    // Text
-    beginText: function CanvasGraphics_beginText() {
-      this.current.textMatrix = IDENTITY_MATRIX;
-      this.current.x = this.current.lineX = 0;
-      this.current.y = this.current.lineY = 0;
-    },
-    endText: function CanvasGraphics_endText() {
-    },
-    setCharSpacing: function CanvasGraphics_setCharSpacing(spacing) {
-      this.current.charSpacing = spacing;
-    },
-    setWordSpacing: function CanvasGraphics_setWordSpacing(spacing) {
-      this.current.wordSpacing = spacing;
-    },
-    setHScale: function CanvasGraphics_setHScale(scale) {
-      this.current.textHScale = scale / 100;
-    },
-    setLeading: function CanvasGraphics_setLeading(leading) {
-      this.current.leading = -leading;
-    },
-    setFont: function CanvasGraphics_setFont(fontRefName, size) {
-      var fontObj = this.objs.get(fontRefName);
-      var current = this.current;
-
-      if (!fontObj)
-        error('Can\'t find font for ' + fontRefName);
-
-      // Slice-clone matrix so we can manipulate it without affecting original
-      if (fontObj.fontMatrix)
-        current.fontMatrix = fontObj.fontMatrix.slice(0);
-      else
-        current.fontMatrix = IDENTITY_MATRIX.slice(0);
-
-      // A valid matrix needs all main diagonal elements to be non-zero
-      // This also ensures we bypass FF bugzilla bug #719844.
-      if (current.fontMatrix[0] === 0 ||
-          current.fontMatrix[3] === 0) {
-        warn('Invalid font matrix for font ' + fontRefName);
-      }
-
-      // The spec for Tf (setFont) says that 'size' specifies the font 'scale',
-      // and in some docs this can be negative (inverted x-y axes).
-      // We implement this condition with fontMatrix.
-      if (size < 0) {
-        size = -size;
-        current.fontMatrix[0] *= -1;
-        current.fontMatrix[3] *= -1;
-      }
-
-      this.current.font = fontObj;
-      this.current.fontSize = size;
-
-      if (fontObj.coded)
-        return; // we don't need ctx.font for Type3 fonts
-
-      var name = fontObj.loadedName || 'sans-serif';
-      var bold = fontObj.black ? (fontObj.bold ? 'bolder' : 'bold') :
-                                 (fontObj.bold ? 'bold' : 'normal');
-
-      var italic = fontObj.italic ? 'italic' : 'normal';
-      var serif = fontObj.isSerifFont ? 'serif' : 'sans-serif';
-      var typeface = '"' + name + '", ' + serif;
-
-      // Some font backends cannot handle fonts below certain size.
-      // Keeping the font at minimal size and using the fontSizeScale to change
-      // the current transformation matrix before the fillText/strokeText.
-      // See https://bugzilla.mozilla.org/show_bug.cgi?id=726227
-      var browserFontSize = size >= MIN_FONT_SIZE ? size : MIN_FONT_SIZE;
-      this.current.fontSizeScale = browserFontSize != MIN_FONT_SIZE ? 1.0 :
-                                   size / MIN_FONT_SIZE;
-
-      var rule = italic + ' ' + bold + ' ' + browserFontSize + 'px ' + typeface;
-      this.ctx.font = rule;
-    },
-    setTextRenderingMode: function CanvasGraphics_setTextRenderingMode(mode) {
-      if (mode >= TextRenderingMode.FILL_ADD_TO_PATH)
-        TODO('unsupported text rendering mode: ' + mode);
-      this.current.textRenderingMode = mode;
-    },
-    setTextRise: function CanvasGraphics_setTextRise(rise) {
-      TODO('text rise: ' + rise);
-    },
-    moveText: function CanvasGraphics_moveText(x, y) {
-      this.current.x = this.current.lineX += x;
-      this.current.y = this.current.lineY += y;
-    },
-    setLeadingMoveText: function CanvasGraphics_setLeadingMoveText(x, y) {
-      this.setLeading(-y);
-      this.moveText(x, y);
-    },
-    setTextMatrix: function CanvasGraphics_setTextMatrix(a, b, c, d, e, f) {
-      this.current.textMatrix = [a, b, c, d, e, f];
-
-      this.current.x = this.current.lineX = 0;
-      this.current.y = this.current.lineY = 0;
-    },
-    nextLine: function CanvasGraphics_nextLine() {
-      this.moveText(0, this.current.leading);
-    },
-    applyTextTransforms: function CanvasGraphics_applyTextTransforms() {
-      var ctx = this.ctx;
-      var current = this.current;
-      var textHScale = current.textHScale;
-      var fontMatrix = current.fontMatrix || IDENTITY_MATRIX;
-
-      ctx.transform.apply(ctx, current.textMatrix);
-      ctx.scale(1, -1);
-      ctx.translate(current.x, -1 * current.y);
-      ctx.transform.apply(ctx, fontMatrix);
-      ctx.scale(textHScale, 1);
-    },
-    getTextGeometry: function CanvasGraphics_getTextGeometry() {
-      var geometry = {};
-      var ctx = this.ctx;
-      var font = this.current.font;
-      var ctxMatrix = ctx.mozCurrentTransform;
-      if (ctxMatrix) {
-        var bl = Util.applyTransform([0, 0], ctxMatrix);
-        var tr = Util.applyTransform([1, 1], ctxMatrix);
-        geometry.x = bl[0];
-        geometry.y = bl[1];
-        geometry.hScale = tr[0] - bl[0];
-        geometry.vScale = tr[1] - bl[1];
-      }
-      geometry.spaceWidth = font.spaceWidth;
-      return geometry;
-    },
-
-    showText: function CanvasGraphics_showText(str, skipTextSelection) {
-      var ctx = this.ctx;
-      var current = this.current;
-      var font = current.font;
-      var glyphs = font.charsToGlyphs(str);
-      var fontSize = current.fontSize;
-      var fontSizeScale = current.fontSizeScale;
-      var charSpacing = current.charSpacing;
-      var wordSpacing = current.wordSpacing;
-      var textHScale = current.textHScale;
-      var fontMatrix = current.fontMatrix || IDENTITY_MATRIX;
-      var textHScale2 = textHScale * fontMatrix[0];
-      var glyphsLength = glyphs.length;
-      var textLayer = this.textLayer;
-      var text = {str: '', length: 0, canvasWidth: 0, geom: {}};
-      var textSelection = textLayer && !skipTextSelection ? true : false;
-      var textRenderingMode = current.textRenderingMode;
-
-      // Type3 fonts - each glyph is a "mini-PDF"
-      if (font.coded) {
-        ctx.save();
-        ctx.transform.apply(ctx, current.textMatrix);
-        ctx.translate(current.x, current.y);
-
-        ctx.scale(textHScale, 1);
-
-        if (textSelection) {
-          this.save();
-          ctx.scale(1, -1);
-          text.geom = this.getTextGeometry();
-          this.restore();
-        }
-        for (var i = 0; i < glyphsLength; ++i) {
-
-          var glyph = glyphs[i];
-          if (glyph === null) {
-            // word break
-            this.ctx.translate(wordSpacing, 0);
-            continue;
-          }
-
-          this.save();
-          ctx.scale(fontSize, fontSize);
-          ctx.transform.apply(ctx, fontMatrix);
-          this.executeOperatorList(glyph.operatorList);
-          this.restore();
-
-          var transformed = Util.applyTransform([glyph.width, 0], fontMatrix);
-          var width = transformed[0] * fontSize +
-              Util.sign(current.fontMatrix[0]) * charSpacing;
-
-          ctx.translate(width, 0);
-          current.x += width * textHScale;
-
-          text.str += glyph.unicode;
-          text.length++;
-          text.canvasWidth += width;
-        }
-        ctx.restore();
-      } else {
-        ctx.save();
-        this.applyTextTransforms();
-
-        var lineWidth = current.lineWidth;
-        var scale = Math.abs(current.textMatrix[0] * fontMatrix[0]);
-        if (scale == 0 || lineWidth == 0)
-          lineWidth = this.getSinglePixelWidth();
-        else
-          lineWidth /= scale;
-
-        if (textSelection)
-          text.geom = this.getTextGeometry();
-
-        if (fontSizeScale != 1.0) {
-          ctx.scale(fontSizeScale, fontSizeScale);
-          lineWidth /= fontSizeScale;
-        }
-
-        ctx.lineWidth = lineWidth;
-
-        var x = 0;
-        for (var i = 0; i < glyphsLength; ++i) {
-          var glyph = glyphs[i];
-          if (glyph === null) {
-            // word break
-            x += Util.sign(current.fontMatrix[0]) * wordSpacing;
-            continue;
-          }
-
-          var character = glyph.fontChar;
-          var charWidth = glyph.width * fontSize * 0.001 +
-              Util.sign(current.fontMatrix[0]) * charSpacing;
-
-          if (!glyph.disabled) {
-            var scaledX = x / fontSizeScale;
-            switch (textRenderingMode) {
-              default: // other unsupported rendering modes
-              case TextRenderingMode.FILL:
-              case TextRenderingMode.FILL_ADD_TO_PATH:
-                ctx.fillText(character, scaledX, 0);
-                break;
-              case TextRenderingMode.STROKE:
-              case TextRenderingMode.STROKE_ADD_TO_PATH:
-                ctx.strokeText(character, scaledX, 0);
-                break;
-              case TextRenderingMode.FILL_STROKE:
-              case TextRenderingMode.FILL_STROKE_ADD_TO_PATH:
-                ctx.fillText(character, scaledX, 0);
-                ctx.strokeText(character, scaledX, 0);
-                break;
-              case TextRenderingMode.INVISIBLE:
-                break;
-            }
-          }
-
-          x += charWidth;
-
-          var glyphUnicode = glyph.unicode === ' ' ? '\u00A0' : glyph.unicode;
-          var glyphUnicodeLength = glyphUnicode.length;
-          //reverse an arabic ligature
-          if (glyphUnicodeLength > 1 &&
-              isRTLRangeFor(glyphUnicode.charCodeAt(0))) {
-            for (var ii = glyphUnicodeLength - 1; ii >= 0; ii--)
-              text.str += glyphUnicode[ii];
-          } else
-            text.str += glyphUnicode;
-          text.length += glyphUnicodeLength;
-          text.canvasWidth += charWidth;
-        }
-        current.x += x * textHScale2;
-        ctx.restore();
-      }
-
-      if (textSelection)
-        this.textLayer.appendText(text, font.loadedName, fontSize);
-
-      return text;
-    },
-    showSpacedText: function CanvasGraphics_showSpacedText(arr) {
-      var ctx = this.ctx;
-      var current = this.current;
-      var font = current.font;
-      var fontSize = current.fontSize;
-      var textHScale = current.textHScale;
-      if (!font.coded)
-        textHScale *= (current.fontMatrix || IDENTITY_MATRIX)[0];
-      var arrLength = arr.length;
-      var textLayer = this.textLayer;
-      var text = {str: '', length: 0, canvasWidth: 0, geom: {}};
-      var textSelection = textLayer ? true : false;
-
-      if (textSelection) {
-        ctx.save();
-        // Type3 fonts - each glyph is a "mini-PDF" (see also showText)
-        if (font.coded) {
-          ctx.transform.apply(ctx, current.textMatrix);
-          ctx.scale(1, -1);
-          ctx.translate(current.x, -1 * current.y);
-          ctx.scale(textHScale, 1);
-        } else
-          this.applyTextTransforms();
-        text.geom = this.getTextGeometry();
-        ctx.restore();
-      }
-
-      for (var i = 0; i < arrLength; ++i) {
-        var e = arr[i];
-        if (isNum(e)) {
-          var spacingLength = -e * 0.001 * fontSize * textHScale;
-          current.x += spacingLength;
-
-          if (textSelection) {
-            // Emulate precise spacing via HTML spaces
-            text.canvasWidth += spacingLength;
-            if (e < 0 && text.geom.spaceWidth > 0) { // avoid div by zero
-              var numFakeSpaces = Math.round(-e / text.geom.spaceWidth);
-              if (numFakeSpaces > 0) {
-                text.str += '\u00A0';
-                text.length++;
-              }
-            }
-          }
-        } else if (isString(e)) {
-          var shownText = this.showText(e, true);
-
-          if (textSelection) {
-            if (shownText.str === ' ') {
-              text.str += '\u00A0';
-            } else {
-              text.str += shownText.str;
-            }
-            text.canvasWidth += shownText.canvasWidth;
-            text.length += shownText.length;
-          }
-        } else {
-          error('TJ array element ' + e + ' is not string or num');
-        }
-      }
-
-      if (textSelection)
-        this.textLayer.appendText(text, font.loadedName, fontSize);
-    },
-    nextLineShowText: function CanvasGraphics_nextLineShowText(text) {
-      this.nextLine();
-      this.showText(text);
-    },
-    nextLineSetSpacingShowText:
-      function CanvasGraphics_nextLineSetSpacingShowText(wordSpacing,
-                                                         charSpacing,
-                                                         text) {
-      this.setWordSpacing(wordSpacing);
-      this.setCharSpacing(charSpacing);
-      this.nextLineShowText(text);
-    },
-
-    // Type3 fonts
-    setCharWidth: function CanvasGraphics_setCharWidth(xWidth, yWidth) {
-      // We can safely ignore this since the width should be the same
-      // as the width in the Widths array.
-    },
-    setCharWidthAndBounds: function CanvasGraphics_setCharWidthAndBounds(xWidth,
-                                                                        yWidth,
-                                                                        llx,
-                                                                        lly,
-                                                                        urx,
-                                                                        ury) {
-      // TODO According to the spec we're also suppose to ignore any operators
-      // that set color or include images while processing this type3 font.
-      this.rectangle(llx, lly, urx - llx, ury - lly);
-      this.clip();
-      this.endPath();
-    },
-
-    // Color
-    setStrokeColorSpace: function CanvasGraphics_setStrokeColorSpace(raw) {
-      this.current.strokeColorSpace = ColorSpace.fromIR(raw);
-    },
-    setFillColorSpace: function CanvasGraphics_setFillColorSpace(raw) {
-      this.current.fillColorSpace = ColorSpace.fromIR(raw);
-    },
-    setStrokeColor: function CanvasGraphics_setStrokeColor(/*...*/) {
-      var cs = this.current.strokeColorSpace;
-      var rgbColor = cs.getRgb(arguments);
-      var color = Util.makeCssRgb(rgbColor[0], rgbColor[1], rgbColor[2]);
-      this.ctx.strokeStyle = color;
-      this.current.strokeColor = color;
-    },
-    getColorN_Pattern: function CanvasGraphics_getColorN_Pattern(IR, cs) {
-      if (IR[0] == 'TilingPattern') {
-        var args = IR[1];
-        var base = cs.base;
-        var color;
-        if (base) {
-          var baseComps = base.numComps;
-
-          color = [];
-          for (var i = 0; i < baseComps; ++i)
-            color.push(args[i]);
-
-          color = base.getRgb(color);
-        }
-        var pattern = new TilingPattern(IR, color, this.ctx, this.objs);
-      } else if (IR[0] == 'RadialAxial' || IR[0] == 'Dummy') {
-        var pattern = Pattern.shadingFromIR(IR);
-      } else {
-        error('Unkown IR type ' + IR[0]);
-      }
-      return pattern;
-    },
-    setStrokeColorN: function CanvasGraphics_setStrokeColorN(/*...*/) {
-      var cs = this.current.strokeColorSpace;
-
-      if (cs.name == 'Pattern') {
-        this.current.strokeColor = this.getColorN_Pattern(arguments, cs);
-      } else {
-        this.setStrokeColor.apply(this, arguments);
-      }
-    },
-    setFillColor: function CanvasGraphics_setFillColor(/*...*/) {
-      var cs = this.current.fillColorSpace;
-      var rgbColor = cs.getRgb(arguments);
-      var color = Util.makeCssRgb(rgbColor[0], rgbColor[1], rgbColor[2]);
-      this.ctx.fillStyle = color;
-      this.current.fillColor = color;
-    },
-    setFillColorN: function CanvasGraphics_setFillColorN(/*...*/) {
-      var cs = this.current.fillColorSpace;
-
-      if (cs.name == 'Pattern') {
-        this.current.fillColor = this.getColorN_Pattern(arguments, cs);
-      } else {
-        this.setFillColor.apply(this, arguments);
-      }
-    },
-    setStrokeGray: function CanvasGraphics_setStrokeGray(gray) {
-      if (!(this.current.strokeColorSpace instanceof DeviceGrayCS))
-        this.current.strokeColorSpace = new DeviceGrayCS();
-
-      var color = Util.makeCssRgb(gray, gray, gray);
-      this.ctx.strokeStyle = color;
-      this.current.strokeColor = color;
-    },
-    setFillGray: function CanvasGraphics_setFillGray(gray) {
-      if (!(this.current.fillColorSpace instanceof DeviceGrayCS))
-        this.current.fillColorSpace = new DeviceGrayCS();
-
-      var color = Util.makeCssRgb(gray, gray, gray);
-      this.ctx.fillStyle = color;
-      this.current.fillColor = color;
-    },
-    setStrokeRGBColor: function CanvasGraphics_setStrokeRGBColor(r, g, b) {
-      if (!(this.current.strokeColorSpace instanceof DeviceRgbCS))
-        this.current.strokeColorSpace = new DeviceRgbCS();
-
-      var color = Util.makeCssRgb(r, g, b);
-      this.ctx.strokeStyle = color;
-      this.current.strokeColor = color;
-    },
-    setFillRGBColor: function CanvasGraphics_setFillRGBColor(r, g, b) {
-      if (!(this.current.fillColorSpace instanceof DeviceRgbCS))
-        this.current.fillColorSpace = new DeviceRgbCS();
-
-      var color = Util.makeCssRgb(r, g, b);
-      this.ctx.fillStyle = color;
-      this.current.fillColor = color;
-    },
-    setStrokeCMYKColor: function CanvasGraphics_setStrokeCMYKColor(c, m, y, k) {
-      if (!(this.current.strokeColorSpace instanceof DeviceCmykCS))
-        this.current.strokeColorSpace = new DeviceCmykCS();
-
-      var color = Util.makeCssCmyk(c, m, y, k);
-      this.ctx.strokeStyle = color;
-      this.current.strokeColor = color;
-    },
-    setFillCMYKColor: function CanvasGraphics_setFillCMYKColor(c, m, y, k) {
-      if (!(this.current.fillColorSpace instanceof DeviceCmykCS))
-        this.current.fillColorSpace = new DeviceCmykCS();
-
-      var color = Util.makeCssCmyk(c, m, y, k);
-      this.ctx.fillStyle = color;
-      this.current.fillColor = color;
-    },
-
-    shadingFill: function CanvasGraphics_shadingFill(patternIR) {
-      var ctx = this.ctx;
-
-      this.save();
-      var pattern = Pattern.shadingFromIR(patternIR);
-      ctx.fillStyle = pattern.getPattern(ctx);
-
-      var inv = ctx.mozCurrentTransformInverse;
-      if (inv) {
-        var canvas = ctx.canvas;
-        var width = canvas.width;
-        var height = canvas.height;
-
-        var bl = Util.applyTransform([0, 0], inv);
-        var br = Util.applyTransform([0, height], inv);
-        var ul = Util.applyTransform([width, 0], inv);
-        var ur = Util.applyTransform([width, height], inv);
-
-        var x0 = Math.min(bl[0], br[0], ul[0], ur[0]);
-        var y0 = Math.min(bl[1], br[1], ul[1], ur[1]);
-        var x1 = Math.max(bl[0], br[0], ul[0], ur[0]);
-        var y1 = Math.max(bl[1], br[1], ul[1], ur[1]);
-
-        this.ctx.fillRect(x0, y0, x1 - x0, y1 - y0);
-      } else {
-        // HACK to draw the gradient onto an infinite rectangle.
-        // PDF gradients are drawn across the entire image while
-        // Canvas only allows gradients to be drawn in a rectangle
-        // The following bug should allow us to remove this.
-        // https://bugzilla.mozilla.org/show_bug.cgi?id=664884
-
-        this.ctx.fillRect(-1e10, -1e10, 2e10, 2e10);
-      }
-
-      this.restore();
-    },
-
-    // Images
-    beginInlineImage: function CanvasGraphics_beginInlineImage() {
-      error('Should not call beginInlineImage');
-    },
-    beginImageData: function CanvasGraphics_beginImageData() {
-      error('Should not call beginImageData');
-    },
-
-    paintFormXObjectBegin: function CanvasGraphics_paintFormXObjectBegin(matrix,
-                                                                        bbox) {
-      this.save();
-
-      if (matrix && isArray(matrix) && 6 == matrix.length)
-        this.transform.apply(this, matrix);
-
-      if (bbox && isArray(bbox) && 4 == bbox.length) {
-        var width = bbox[2] - bbox[0];
-        var height = bbox[3] - bbox[1];
-        this.rectangle(bbox[0], bbox[1], width, height);
-        this.clip();
-        this.endPath();
-      }
-    },
-
-    paintFormXObjectEnd: function CanvasGraphics_paintFormXObjectEnd() {
-      this.restore();
-    },
-
-    paintJpegXObject: function CanvasGraphics_paintJpegXObject(objId, w, h) {
-      var domImage = this.objs.get(objId);
-      if (!domImage) {
-        error('Dependent image isn\'t ready yet');
-      }
-
-      this.save();
-
-      var ctx = this.ctx;
-      // scale the image to the unit square
-      ctx.scale(1 / w, -1 / h);
-
-      ctx.drawImage(domImage, 0, 0, domImage.width, domImage.height,
-                    0, -h, w, h);
-
-      this.restore();
-    },
-
-    paintImageMaskXObject: function CanvasGraphics_paintImageMaskXObject(
-                             imgArray, inverseDecode, width, height) {
-      function applyStencilMask(buffer, inverseDecode) {
-        var imgArrayPos = 0;
-        var i, j, mask, buf;
-        // removing making non-masked pixels transparent
-        var bufferPos = 3; // alpha component offset
-        for (i = 0; i < height; i++) {
-          mask = 0;
-          for (j = 0; j < width; j++) {
-            if (!mask) {
-              buf = imgArray[imgArrayPos++];
-              mask = 128;
-            }
-            if (!(buf & mask) == inverseDecode) {
-              buffer[bufferPos] = 0;
-            }
-            bufferPos += 4;
-            mask >>= 1;
-          }
-        }
-      }
-      function rescaleImage(pixels, widthScale, heightScale) {
-        var scaledWidth = Math.ceil(width / widthScale);
-        var scaledHeight = Math.ceil(height / heightScale);
-
-        var itemsSum = new Uint32Array(scaledWidth * scaledHeight * 4);
-        var itemsCount = new Uint32Array(scaledWidth * scaledHeight);
-        for (var i = 0, position = 0; i < height; i++) {
-          var lineOffset = (0 | (i / heightScale)) * scaledWidth;
-          for (var j = 0; j < width; j++) {
-            var countOffset = lineOffset + (0 | (j / widthScale));
-            var sumOffset = countOffset << 2;
-            itemsSum[sumOffset] += pixels[position];
-            itemsSum[sumOffset + 1] += pixels[position + 1];
-            itemsSum[sumOffset + 2] += pixels[position + 2];
-            itemsSum[sumOffset + 3] += pixels[position + 3];
-            itemsCount[countOffset]++;
-            position += 4;
-          }
-        }
-        var tmpCanvas = createScratchCanvas(scaledWidth, scaledHeight);
-        var tmpCtx = tmpCanvas.getContext('2d');
-        var imgData = tmpCtx.getImageData(0, 0, scaledWidth, scaledHeight);
-        pixels = imgData.data;
-        for (var i = 0, j = 0, ii = scaledWidth * scaledHeight; i < ii; i++) {
-          var count = itemsCount[i];
-          pixels[j] = itemsSum[j] / count;
-          pixels[j + 1] = itemsSum[j + 1] / count;
-          pixels[j + 2] = itemsSum[j + 2] / count;
-          pixels[j + 3] = itemsSum[j + 3] / count;
-          j += 4;
-        }
-        tmpCtx.putImageData(imgData, 0, 0);
-        return tmpCanvas;
-      }
-
-      this.save();
-
-      var ctx = this.ctx;
-      var w = width, h = height;
-      // scale the image to the unit square
-      ctx.scale(1 / w, -1 / h);
-
-      var tmpCanvas = createScratchCanvas(w, h);
-      var tmpCtx = tmpCanvas.getContext('2d');
-
-      var fillColor = this.current.fillColor;
-      tmpCtx.fillStyle = (fillColor && fillColor.hasOwnProperty('type') &&
-                          fillColor.type === 'Pattern') ?
-                          fillColor.getPattern(tmpCtx) : fillColor;
-      tmpCtx.fillRect(0, 0, w, h);
-
-      var imgData = tmpCtx.getImageData(0, 0, w, h);
-      var pixels = imgData.data;
-
-      applyStencilMask(pixels, inverseDecode);
-
-      var currentTransform = ctx.mozCurrentTransformInverse;
-      var widthScale = Math.max(Math.abs(currentTransform[0]), 1);
-      var heightScale = Math.max(Math.abs(currentTransform[3]), 1);
-      if (widthScale >= 2 || heightScale >= 2) {
-        // canvas does not resize well large images to small -- using simple
-        // algorithm to perform pre-scaling
-        tmpCanvas = rescaleImage(imgData.data, widthScale, heightScale);
-        ctx.scale(widthScale, heightScale);
-        ctx.drawImage(tmpCanvas, 0, -h / heightScale);
-      } else {
-        tmpCtx.putImageData(imgData, 0, 0);
-        ctx.drawImage(tmpCanvas, 0, -h);
-      }
-      this.restore();
-    },
-
-    paintImageXObject: function CanvasGraphics_paintImageXObject(objId) {
-      var imgData = this.objs.get(objId);
-      if (!imgData)
-        error('Dependent image isn\'t ready yet');
-
-      this.save();
-      var ctx = this.ctx;
-      var w = imgData.width;
-      var h = imgData.height;
-      // scale the image to the unit square
-      ctx.scale(1 / w, -1 / h);
-
-      var tmpCanvas = createScratchCanvas(w, h);
-      var tmpCtx = tmpCanvas.getContext('2d');
-      this.putBinaryImageData(tmpCtx, imgData, w, h);
-
-      ctx.drawImage(tmpCanvas, 0, -h);
-      this.restore();
-    },
-
-    putBinaryImageData: function CanvasGraphics_putBinaryImageData() {
-      //
-    },
-
-    // Marked content
-
-    markPoint: function CanvasGraphics_markPoint(tag) {
-      TODO('Marked content');
-    },
-    markPointProps: function CanvasGraphics_markPointProps(tag, properties) {
-      TODO('Marked content');
-    },
-    beginMarkedContent: function CanvasGraphics_beginMarkedContent(tag) {
-      TODO('Marked content');
-    },
-    beginMarkedContentProps: function CanvasGraphics_beginMarkedContentProps(
-                                        tag, properties) {
-      TODO('Marked content');
-    },
-    endMarkedContent: function CanvasGraphics_endMarkedContent() {
-      TODO('Marked content');
-    },
-
-    // Compatibility
-
-    beginCompat: function CanvasGraphics_beginCompat() {
-      TODO('ignore undefined operators (should we do that anyway?)');
-    },
-    endCompat: function CanvasGraphics_endCompat() {
-      TODO('stop ignoring undefined operators');
-    },
-
-    // Helper functions
-
-    consumePath: function CanvasGraphics_consumePath() {
-      if (this.pendingClip) {
-        var savedFillRule = null;
-        if (this.pendingClip == EO_CLIP)
-          savedFillRule = this.setEOFillRule();
-
-        this.ctx.clip();
-
-        this.pendingClip = null;
-        if (savedFillRule !== null)
-          this.restoreFillRule(savedFillRule);
-      }
-      this.ctx.beginPath();
-    },
-    // We generally keep the canvas context set for
-    // nonzero-winding, and just set evenodd for the operations
-    // that need them.
-    setEOFillRule: function CanvasGraphics_setEOFillRule() {
-      var savedFillRule = this.ctx.mozFillRule;
-      this.ctx.mozFillRule = 'evenodd';
-      return savedFillRule;
-    },
-    restoreFillRule: function CanvasGraphics_restoreFillRule(rule) {
-      this.ctx.mozFillRule = rule;
-    },
-    getSinglePixelWidth: function CanvasGraphics_getSinglePixelWidth(scale) {
-      var inverse = this.ctx.mozCurrentTransformInverse;
-      return Math.abs(inverse[0] + inverse[2]);
-    }
-  };
-
-  return CanvasGraphics;
-})();
-
-if (!isWorker) {
-  // Feature detection if the browser can use an Uint8Array directly as imgData.
-  var canvas = document.createElement('canvas');
-  canvas.width = 1;
-  canvas.height = 1;
-  var ctx = canvas.getContext('2d');
-
-  try {
-    ctx.putImageData({
-      width: 1,
-      height: 1,
-      data: new Uint8Array(4)
-    }, 0, 0);
-
-    CanvasGraphics.prototype.putBinaryImageData =
-      function CanvasGraphicsPutBinaryImageDataNative(ctx, imgData) {
-        ctx.putImageData(imgData, 0, 0);
-      };
-  } catch (e) {
-    CanvasGraphics.prototype.putBinaryImageData =
-      function CanvasGraphicsPutBinaryImageDataShim(ctx, imgData, w, h) {
-        var tmpImgData = ctx.getImageData(0, 0, w, h);
-
-        // Copy over the imageData pixel by pixel.
-        var tmpImgDataPixels = tmpImgData.data;
-        var len = tmpImgDataPixels.length;
-
-        while (len--) {
-          tmpImgDataPixels[len] = imgData.data[len];
-        }
-
-        ctx.putImageData(tmpImgData, 0, 0);
-      };
-  }
-}
-
-/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
-
-'use strict';
-
-var Name = (function NameClosure() {
-  function Name(name) {
-    this.name = name;
-  }
-
-  Name.prototype = {};
-
-  return Name;
-})();
-
-var Cmd = (function CmdClosure() {
-  function Cmd(cmd) {
-    this.cmd = cmd;
-  }
-
-  Cmd.prototype = {};
-
-  var cmdCache = {};
-
-  Cmd.get = function Cmd_get(cmd) {
-    var cmdValue = cmdCache[cmd];
-    if (cmdValue)
-      return cmdValue;
-
-    return cmdCache[cmd] = new Cmd(cmd);
-  };
-
-  return Cmd;
-})();
-
-var Dict = (function DictClosure() {
-  // xref is optional
-  function Dict(xref) {
-    // Map should only be used internally, use functions below to access.
-    var map = Object.create(null);
-
-    this.assignXref = function Dict_assignXref(newXref) {
-      xref = newXref;
-    };
-
-    // automatically dereferences Ref objects
-    this.get = function Dict_get(key1, key2, key3) {
-      var value;
-      if (typeof (value = map[key1]) != 'undefined' || key1 in map ||
-          typeof key2 == 'undefined') {
-        return xref ? xref.fetchIfRef(value) : value;
-      }
-      if (typeof (value = map[key2]) != 'undefined' || key2 in map ||
-          typeof key3 == 'undefined') {
-        return xref ? xref.fetchIfRef(value) : value;
-      }
-      value = map[key3] || null;
-      return xref ? xref.fetchIfRef(value) : value;
-    };
-
-    // no dereferencing
-    this.getRaw = function Dict_getRaw(key) {
-      return map[key];
-    };
-
-    // creates new map and dereferences all Refs
-    this.getAll = function Dict_getAll() {
-      var all = {};
-      for (var key in map) {
-        var obj = this.get(key);
-        all[key] = obj instanceof Dict ? obj.getAll() : obj;
-      }
-      return all;
-    };
-
-    this.set = function Dict_set(key, value) {
-      map[key] = value;
-    };
-
-    this.has = function Dict_has(key) {
-      return key in map;
-    };
-
-    this.forEach = function Dict_forEach(callback) {
-      for (var key in map) {
-        callback(key, this.get(key));
-      }
-    };
-  };
-
-  return Dict;
-})();
-
-var Ref = (function RefClosure() {
-  function Ref(num, gen) {
-    this.num = num;
-    this.gen = gen;
-  }
-
-  Ref.prototype = {};
-
-  return Ref;
-})();
-
-// The reference is identified by number and generation,
-// this structure stores only one instance of the reference.
-var RefSet = (function RefSetClosure() {
-  function RefSet() {
-    this.dict = {};
-  }
-
-  RefSet.prototype = {
-    has: function RefSet_has(ref) {
-      return !!this.dict['R' + ref.num + '.' + ref.gen];
-    },
-
-    put: function RefSet_put(ref) {
-      this.dict['R' + ref.num + '.' + ref.gen] = ref;
-    }
-  };
-
-  return RefSet;
-})();
-
-var Catalog = (function CatalogClosure() {
-  function Catalog(xref) {
-    this.xref = xref;
-    var obj = xref.getCatalogObj();
-    assertWellFormed(isDict(obj), 'catalog object is not a dictionary');
-    this.catDict = obj;
-  }
-
-  Catalog.prototype = {
-    get metadata() {
-      var streamRef = this.catDict.getRaw('Metadata');
-      if (!isRef(streamRef))
-        return shadow(this, 'metadata', null);
-
-      var encryptMetadata = !this.xref.encrypt ? false :
-        this.xref.encrypt.encryptMetadata;
-
-      var stream = this.xref.fetch(streamRef, !encryptMetadata);
-      var metadata;
-      if (stream && isDict(stream.dict)) {
-        var type = stream.dict.get('Type');
-        var subtype = stream.dict.get('Subtype');
-
-        if (isName(type) && isName(subtype) &&
-            type.name === 'Metadata' && subtype.name === 'XML') {
-          // XXX: This should examine the charset the XML document defines,
-          // however since there are currently no real means to decode
-          // arbitrary charsets, let's just hope that the author of the PDF
-          // was reasonable enough to stick with the XML default charset,
-          // which is UTF-8.
-          try {
-            metadata = stringToUTF8String(bytesToString(stream.getBytes()));
-          } catch (e) {
-            info('Skipping invalid metadata.');
-          }
-        }
-      }
-
-      return shadow(this, 'metadata', metadata);
-    },
-    get toplevelPagesDict() {
-      var pagesObj = this.catDict.get('Pages');
-      assertWellFormed(isDict(pagesObj), 'invalid top-level pages dictionary');
-      // shadow the prototype getter
-      return shadow(this, 'toplevelPagesDict', pagesObj);
-    },
-    get documentOutline() {
-      var xref = this.xref;
-      var obj = this.catDict.get('Outlines');
-      var root = { items: [] };
-      if (isDict(obj)) {
-        obj = obj.getRaw('First');
-        var processed = new RefSet();
-        if (isRef(obj)) {
-          var queue = [{obj: obj, parent: root}];
-          // to avoid recursion keeping track of the items
-          // in the processed dictionary
-          processed.put(obj);
-          while (queue.length > 0) {
-            var i = queue.shift();
-            var outlineDict = xref.fetchIfRef(i.obj);
-            if (outlineDict === null)
-              continue;
-            if (!outlineDict.has('Title'))
-              error('Invalid outline item');
-            var dest = outlineDict.get('A');
-            if (dest)
-              dest = dest.get('D');
-            else if (outlineDict.has('Dest')) {
-              dest = outlineDict.getRaw('Dest');
-              if (isName(dest))
-                dest = dest.name;
-            }
-            var title = outlineDict.get('Title');
-            var outlineItem = {
-              dest: dest,
-              title: stringToPDFString(title),
-              color: outlineDict.get('C') || [0, 0, 0],
-              count: outlineDict.get('Count'),
-              bold: !!(outlineDict.get('F') & 2),
-              italic: !!(outlineDict.get('F') & 1),
-              items: []
-            };
-            i.parent.items.push(outlineItem);
-            obj = outlineDict.getRaw('First');
-            if (isRef(obj) && !processed.has(obj)) {
-              queue.push({obj: obj, parent: outlineItem});
-              processed.put(obj);
-            }
-            obj = outlineDict.getRaw('Next');
-            if (isRef(obj) && !processed.has(obj)) {
-              queue.push({obj: obj, parent: i.parent});
-              processed.put(obj);
-            }
-          }
-        }
-      }
-      obj = root.items.length > 0 ? root.items : null;
-      return shadow(this, 'documentOutline', obj);
-    },
-    get numPages() {
-      var obj = this.toplevelPagesDict.get('Count');
-      assertWellFormed(
-        isInt(obj),
-        'page count in top level pages object is not an integer'
-      );
-      // shadow the prototype getter
-      return shadow(this, 'num', obj);
-    },
-    traverseKids: function Catalog_traverseKids(pagesDict) {
-      var pageCache = this.pageCache;
-      var kids = pagesDict.get('Kids');
-      assertWellFormed(isArray(kids),
-                       'page dictionary kids object is not an array');
-      for (var i = 0, ii = kids.length; i < ii; ++i) {
-        var kid = kids[i];
-        assertWellFormed(isRef(kid),
-                        'page dictionary kid is not a reference');
-        var obj = this.xref.fetch(kid);
-        if (isDict(obj, 'Page') || (isDict(obj) && !obj.has('Kids'))) {
-          pageCache.push(new Page(this.xref, pageCache.length, obj, kid));
-        } else { // must be a child page dictionary
-          assertWellFormed(
-            isDict(obj),
-            'page dictionary kid reference points to wrong type of object'
-          );
-          this.traverseKids(obj);
-        }
-      }
-    },
-    get destinations() {
-      function fetchDestination(dest) {
-        return isDict(dest) ? dest.get('D') : dest;
-      }
-
-      var xref = this.xref;
-      var dests = {}, nameTreeRef, nameDictionaryRef;
-      var obj = this.catDict.get('Names');
-      if (obj)
-        nameTreeRef = obj.getRaw('Dests');
-      else if (this.catDict.has('Dests'))
-        nameDictionaryRef = this.catDict.get('Dests');
-
-      if (nameDictionaryRef) {
-        // reading simple destination dictionary
-        obj = nameDictionaryRef;
-        obj.forEach(function catalogForEach(key, value) {
-          if (!value) return;
-          dests[key] = fetchDestination(value);
-        });
-      }
-      if (nameTreeRef) {
-        // reading name tree
-        var processed = new RefSet();
-        processed.put(nameTreeRef);
-        var queue = [nameTreeRef];
-        while (queue.length > 0) {
-          var i, n;
-          obj = xref.fetch(queue.shift());
-          if (obj.has('Kids')) {
-            var kids = obj.get('Kids');
-            for (i = 0, n = kids.length; i < n; i++) {
-              var kid = kids[i];
-              if (processed.has(kid))
-                error('invalid destinations');
-              queue.push(kid);
-              processed.put(kid);
-            }
-            continue;
-          }
-          var names = obj.get('Names');
-          for (i = 0, n = names.length; i < n; i += 2) {
-            dests[names[i]] = fetchDestination(xref.fetchIfRef(names[i + 1]));
-          }
-        }
-      }
-      return shadow(this, 'destinations', dests);
-    },
-    getPage: function Catalog_getPage(n) {
-      var pageCache = this.pageCache;
-      if (!pageCache) {
-        pageCache = this.pageCache = [];
-        this.traverseKids(this.toplevelPagesDict);
-      }
-      return this.pageCache[n - 1];
-    }
-  };
-
-  return Catalog;
-})();
-
-var XRef = (function XRefClosure() {
-  function XRef(stream, startXRef, mainXRefEntriesOffset, password) {
-    this.stream = stream;
-    this.entries = [];
-    this.xrefstms = {};
-    var trailerDict = this.readXRef(startXRef);
-    trailerDict.assignXref(this);
-    this.trailer = trailerDict;
-    // prepare the XRef cache
-    this.cache = [];
-
-    var encrypt = trailerDict.get('Encrypt');
-    if (encrypt) {
-      var fileId = trailerDict.get('ID');
-      this.encrypt = new CipherTransformFactory(encrypt, fileId[0], password);
-    }
-
-    // get the root dictionary (catalog) object
-    if (!(this.root = trailerDict.get('Root')))
-      error('Invalid root reference');
-  }
-
-  XRef.prototype = {
-    readXRefTable: function XRef_readXRefTable(parser) {
-      // Example of cross-reference table:
-      // xref
-      // 0 1                    <-- subsection header (first obj #, obj count)
-      // 0000000000 65535 f     <-- actual object (offset, generation #, f/n)
-      // 23 2                   <-- subsection header ... and so on ...
-      // 0000025518 00002 n
-      // 0000025635 00000 n
-      // trailer
-      // ...
-
-      // Outer loop is over subsection headers
-      var obj;
-      while (!isCmd(obj = parser.getObj(), 'trailer')) {
-        var first = obj,
-            count = parser.getObj();
-
-        if (!isInt(first) || !isInt(count))
-          error('Invalid XRef table: wrong types in subsection header');
-
-        // Inner loop is over objects themselves
-        for (var i = 0; i < count; i++) {
-          var entry = {};
-          entry.offset = parser.getObj();
-          entry.gen = parser.getObj();
-          var type = parser.getObj();
-
-          if (isCmd(type, 'f'))
-            entry.free = true;
-          else if (isCmd(type, 'n'))
-            entry.uncompressed = true;
-
-          // Validate entry obj
-          if (!isInt(entry.offset) || !isInt(entry.gen) ||
-              !(entry.free || entry.uncompressed)) {
-            error('Invalid entry in XRef subsection: ' + first + ', ' + count);
-          }
-
-          if (!this.entries[i + first])
-            this.entries[i + first] = entry;
-        }
-      }
-
-      // Sanity check: as per spec, first object must be free
-      if (this.entries[0] && !this.entries[0].free)
-        error('Invalid XRef table: unexpected first object');
-
-      // Sanity check
-      if (!isCmd(obj, 'trailer'))
-        error('Invalid XRef table: could not find trailer dictionary');
-
-      // Read trailer dictionary, e.g.
-      // trailer
-      //    << /Size 22
-      //      /Root 20R
-      //      /Info 10R
-      //      /ID [ <81b14aafa313db63dbd6f981e49f94f4> ]
-      //    >>
-      // The parser goes through the entire stream << ... >> and provides
-      // a getter interface for the key-value table
-      var dict = parser.getObj();
-      if (!isDict(dict))
-        error('Invalid XRef table: could not parse trailer dictionary');
-
-      return dict;
-    },
-    readXRefStream: function XRef_readXRefStream(stream) {
-      var streamParameters = stream.parameters;
-      var byteWidths = streamParameters.get('W');
-      var range = streamParameters.get('Index');
-      if (!range)
-        range = [0, streamParameters.get('Size')];
-      var i, j;
-      while (range.length > 0) {
-        var first = range[0], n = range[1];
-        if (!isInt(first) || !isInt(n))
-          error('Invalid XRef range fields: ' + first + ', ' + n);
-        var typeFieldWidth = byteWidths[0];
-        var offsetFieldWidth = byteWidths[1];
-        var generationFieldWidth = byteWidths[2];
-        if (!isInt(typeFieldWidth) || !isInt(offsetFieldWidth) ||
-            !isInt(generationFieldWidth)) {
-          error('Invalid XRef entry fields length: ' + first + ', ' + n);
-        }
-        for (i = 0; i < n; ++i) {
-          var type = 0, offset = 0, generation = 0;
-          for (j = 0; j < typeFieldWidth; ++j)
-            type = (type << 8) | stream.getByte();
-          // if type field is absent, its default value = 1
-          if (typeFieldWidth == 0)
-            type = 1;
-          for (j = 0; j < offsetFieldWidth; ++j)
-            offset = (offset << 8) | stream.getByte();
-          for (j = 0; j < generationFieldWidth; ++j)
-            generation = (generation << 8) | stream.getByte();
-          var entry = {};
-          entry.offset = offset;
-          entry.gen = generation;
-          switch (type) {
-            case 0:
-              entry.free = true;
-              break;
-            case 1:
-              entry.uncompressed = true;
-              break;
-            case 2:
-              break;
-            default:
-              error('Invalid XRef entry type: ' + type);
-          }
-          if (!this.entries[first + i])
-            this.entries[first + i] = entry;
-        }
-        range.splice(0, 2);
-      }
-      return streamParameters;
-    },
-    indexObjects: function XRef_indexObjects() {
-      // Simple scan through the PDF content to find objects,
-      // trailers and XRef streams.
-      function readToken(data, offset) {
-        var token = '', ch = data[offset];
-        while (ch !== 13 && ch !== 10) {
-          if (++offset >= data.length)
-            break;
-          token += String.fromCharCode(ch);
-          ch = data[offset];
-        }
-        return token;
-      }
-      function skipUntil(data, offset, what) {
-        var length = what.length, dataLength = data.length;
-        var skipped = 0;
-        // finding byte sequence
-        while (offset < dataLength) {
-          var i = 0;
-          while (i < length && data[offset + i] == what[i])
-            ++i;
-          if (i >= length)
-            break; // sequence found
-
-          offset++;
-          skipped++;
-        }
-        return skipped;
-      }
-      var trailerBytes = new Uint8Array([116, 114, 97, 105, 108, 101, 114]);
-      var startxrefBytes = new Uint8Array([115, 116, 97, 114, 116, 120, 114,
-                                          101, 102]);
-      var endobjBytes = new Uint8Array([101, 110, 100, 111, 98, 106]);
-      var xrefBytes = new Uint8Array([47, 88, 82, 101, 102]);
-
-      var stream = this.stream;
-      stream.pos = 0;
-      var buffer = stream.getBytes();
-      var position = stream.start, length = buffer.length;
-      var trailers = [], xrefStms = [];
-      var state = 0;
-      var currentToken;
-      while (position < length) {
-        var ch = buffer[position];
-        if (ch === 32 || ch === 9 || ch === 13 || ch === 10) {
-          ++position;
-          continue;
-        }
-        if (ch === 37) { // %-comment
-          do {
-            ++position;
-            ch = buffer[position];
-          } while (ch !== 13 && ch !== 10);
-          continue;
-        }
-        var token = readToken(buffer, position);
-        var m;
-        if (token === 'xref') {
-          position += skipUntil(buffer, position, trailerBytes);
-          trailers.push(position);
-          position += skipUntil(buffer, position, startxrefBytes);
-        } else if ((m = /^(\d+)\s+(\d+)\s+obj\b/.exec(token))) {
-          this.entries[m[1]] = {
-            offset: position,
-            gen: m[2] | 0,
-            uncompressed: true
-          };
-
-          var contentLength = skipUntil(buffer, position, endobjBytes) + 7;
-          var content = buffer.subarray(position, position + contentLength);
-
-          // checking XRef stream suspect
-          // (it shall have '/XRef' and next char is not a letter)
-          var xrefTagOffset = skipUntil(content, 0, xrefBytes);
-          if (xrefTagOffset < contentLength &&
-              content[xrefTagOffset + 5] < 64) {
-            xrefStms.push(position);
-            this.xrefstms[position] = 1; // don't read it recursively
-          }
-
-          position += contentLength;
-        } else
-          position += token.length + 1;
-      }
-      // reading XRef streams
-      for (var i = 0, ii = xrefStms.length; i < ii; ++i) {
-          this.readXRef(xrefStms[i], true);
-      }
-      // finding main trailer
-      var dict;
-      for (var i = 0, ii = trailers.length; i < ii; ++i) {
-        stream.pos = trailers[i];
-        var parser = new Parser(new Lexer(stream), true, null);
-        var obj = parser.getObj();
-        if (!isCmd(obj, 'trailer'))
-          continue;
-        // read the trailer dictionary
-        if (!isDict(dict = parser.getObj()))
-          continue;
-        // taking the first one with 'ID'
-        if (dict.has('ID'))
-          return dict;
-      }
-      // no tailer with 'ID', taking last one (if exists)
-      if (dict)
-        return dict;
-      // nothing helps
-      error('Invalid PDF structure');
-    },
-    readXRef: function XRef_readXRef(startXRef, recoveryMode) {
-      var stream = this.stream;
-      stream.pos = startXRef;
-
-      try {
-        var parser = new Parser(new Lexer(stream), true, null);
-        var obj = parser.getObj();
-        var dict;
-
-        // Get dictionary
-        if (isCmd(obj, 'xref')) {
-          // Parse end-of-file XRef
-          dict = this.readXRefTable(parser);
-
-          // Recursively get other XRefs 'XRefStm', if any
-          obj = dict.get('XRefStm');
-          if (isInt(obj)) {
-            var pos = obj;
-            // ignore previously loaded xref streams
-            // (possible infinite recursion)
-            if (!(pos in this.xrefstms)) {
-              this.xrefstms[pos] = 1;
-              this.readXRef(pos);
-            }
-          }
-        } else if (isInt(obj)) {
-          // Parse in-stream XRef
-          if (!isInt(parser.getObj()) ||
-              !isCmd(parser.getObj(), 'obj') ||
-              !isStream(obj = parser.getObj())) {
-            error('Invalid XRef stream');
-          }
-          dict = this.readXRefStream(obj);
-          if (!dict)
-            error('Failed to read XRef stream');
-        }
-
-        // Recursively get previous dictionary, if any
-        obj = dict.get('Prev');
-        if (isInt(obj))
-          this.readXRef(obj, recoveryMode);
-        else if (isRef(obj)) {
-          // The spec says Prev must not be a reference, i.e. "/Prev NNN"
-          // This is a fallback for non-compliant PDFs, i.e. "/Prev NNN 0 R"
-          this.readXRef(obj.num, recoveryMode);
-        }
-
-        return dict;
-      } catch (e) {
-        log('(while reading XRef): ' + e);
-      }
-
-      if (recoveryMode)
-        return;
-
-      warn('Indexing all PDF objects');
-      return this.indexObjects();
-    },
-    getEntry: function XRef_getEntry(i) {
-      var e = this.entries[i];
-      if (e === null)
-        return null;
-      return e.free ? null : e; // returns null is the entry is free
-    },
-    fetchIfRef: function XRef_fetchIfRef(obj) {
-      if (!isRef(obj))
-        return obj;
-      return this.fetch(obj);
-    },
-    fetch: function XRef_fetch(ref, suppressEncryption) {
-      assertWellFormed(isRef(ref), 'ref object is not a reference');
-      var num = ref.num;
-      if (num in this.cache)
-        return this.cache[num];
-
-      var e = this.getEntry(num);
-
-      // the referenced entry can be free
-      if (e === null)
-        return (this.cache[num] = e);
-
-      var gen = ref.gen;
-      var stream, parser;
-      if (e.uncompressed) {
-        if (e.gen != gen)
-          error('inconsistent generation in XRef');
-        stream = this.stream.makeSubStream(e.offset);
-        parser = new Parser(new Lexer(stream), true, this);
-        var obj1 = parser.getObj();
-        var obj2 = parser.getObj();
-        var obj3 = parser.getObj();
-        if (!isInt(obj1) || obj1 != num ||
-            !isInt(obj2) || obj2 != gen ||
-            !isCmd(obj3)) {
-          error('bad XRef entry');
-        }
-        if (!isCmd(obj3, 'obj')) {
-          // some bad pdfs use "obj1234" and really mean 1234
-          if (obj3.cmd.indexOf('obj') == 0) {
-            num = parseInt(obj3.cmd.substring(3), 10);
-            if (!isNaN(num))
-              return num;
-          }
-          error('bad XRef entry');
-        }
-        if (this.encrypt && !suppressEncryption) {
-          try {
-            e = parser.getObj(this.encrypt.createCipherTransform(num, gen));
-          } catch (ex) {
-            // almost all streams must be encrypted, but sometimes
-            // they are not probably due to some broken generators
-            // re-trying without encryption
-            return this.fetch(ref, true);
-          }
-        } else {
-          e = parser.getObj();
-        }
-        // Don't cache streams since they are mutable (except images).
-        if (!isStream(e) || e instanceof JpegStream)
-          this.cache[num] = e;
-        return e;
-      }
-
-      // compressed entry
-      stream = this.fetch(new Ref(e.offset, 0));
-      if (!isStream(stream))
-        error('bad ObjStm stream');
-      var first = stream.parameters.get('First');
-      var n = stream.parameters.get('N');
-      if (!isInt(first) || !isInt(n)) {
-        error('invalid first and n parameters for ObjStm stream');
-      }
-      parser = new Parser(new Lexer(stream), false, this);
-      var i, entries = [], nums = [];
-      // read the object numbers to populate cache
-      for (i = 0; i < n; ++i) {
-        num = parser.getObj();
-        if (!isInt(num)) {
-          error('invalid object number in the ObjStm stream: ' + num);
-        }
-        nums.push(num);
-        var offset = parser.getObj();
-        if (!isInt(offset)) {
-          error('invalid object offset in the ObjStm stream: ' + offset);
-        }
-      }
-      // read stream objects for cache
-      for (i = 0; i < n; ++i) {
-        entries.push(parser.getObj());
-        this.cache[nums[i]] = entries[i];
-      }
-      e = entries[e.gen];
-      if (!e) {
-        error('bad XRef entry for compressed object');
-      }
-      return e;
-    },
-    getCatalogObj: function XRef_getCatalogObj() {
-      return this.root;
-    }
-  };
-
-  return XRef;
-})();
-
-/**
- * A PDF document and page is built of many objects. E.g. there are objects
- * for fonts, images, rendering code and such. These objects might get processed
- * inside of a worker. The `PDFObjects` implements some basic functions to
- * manage these objects.
- */
-var PDFObjects = (function PDFObjectsClosure() {
-  function PDFObjects() {
-    this.objs = {};
-  }
-
-  PDFObjects.prototype = {
-    objs: null,
-
-    /**
-     * Internal function.
-     * Ensures there is an object defined for `objId`. Stores `data` on the
-     * object *if* it is created.
-     */
-    ensureObj: function PDFObjects_ensureObj(objId, data) {
-      if (this.objs[objId])
-        return this.objs[objId];
-      return this.objs[objId] = new Promise(objId, data);
-    },
-
-    /**
-     * If called *without* callback, this returns the data of `objId` but the
-     * object needs to be resolved. If it isn't, this function throws.
-     *
-     * If called *with* a callback, the callback is called with the data of the
-     * object once the object is resolved. That means, if you call this
-     * function and the object is already resolved, the callback gets called
-     * right away.
-     */
-    get: function PDFObjects_get(objId, callback) {
-      // If there is a callback, then the get can be async and the object is
-      // not required to be resolved right now
-      if (callback) {
-        this.ensureObj(objId).then(callback);
-        return null;
-      }
-
-      // If there isn't a callback, the user expects to get the resolved data
-      // directly.
-      var obj = this.objs[objId];
-
-      // If there isn't an object yet or the object isn't resolved, then the
-      // data isn't ready yet!
-      if (!obj || !obj.isResolved)
-        error('Requesting object that isn\'t resolved yet ' + objId);
-
-      return obj.data;
-    },
-
-    /**
-     * Resolves the object `objId` with optional `data`.
-     */
-    resolve: function PDFObjects_resolve(objId, data) {
-      var objs = this.objs;
-
-      // In case there is a promise already on this object, just resolve it.
-      if (objs[objId]) {
-        objs[objId].resolve(data);
-      } else {
-        this.ensureObj(objId, data);
-      }
-    },
-
-    onData: function PDFObjects_onData(objId, callback) {
-      this.ensureObj(objId).onData(callback);
-    },
-
-    isResolved: function PDFObjects_isResolved(objId) {
-      var objs = this.objs;
-      if (!objs[objId]) {
-        return false;
-      } else {
-        return objs[objId].isResolved;
-      }
-    },
-
-    hasData: function PDFObjects_hasData(objId) {
-      var objs = this.objs;
-      if (!objs[objId]) {
-        return false;
-      } else {
-        return objs[objId].hasData;
-      }
-    },
-
-    /**
-     * Sets the data of an object but *doesn't* resolve it.
-     */
-    setData: function PDFObjects_setData(objId, data) {
-      // Watchout! If you call `this.ensureObj(objId, data)` you're going to
-      // create a *resolved* promise which shouldn't be the case!
-      this.ensureObj(objId).data = data;
-    }
-  };
-  return PDFObjects;
-})();
-
-
-/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
-
-'use strict';
-
-var PDFFunction = (function PDFFunctionClosure() {
-  var CONSTRUCT_SAMPLED = 0;
-  var CONSTRUCT_INTERPOLATED = 2;
-  var CONSTRUCT_STICHED = 3;
-  var CONSTRUCT_POSTSCRIPT = 4;
-
-  return {
-    getSampleArray: function PDFFunction_getSampleArray(size, outputSize, bps,
-                                                       str) {
-      var length = 1;
-      for (var i = 0, ii = size.length; i < ii; i++)
-        length *= size[i];
-      length *= outputSize;
-
-      var array = [];
-      var codeSize = 0;
-      var codeBuf = 0;
-      // 32 is a valid bps so shifting won't work
-      var sampleMul = 1.0 / (Math.pow(2.0, bps) - 1);
-
-      var strBytes = str.getBytes((length * bps + 7) / 8);
-      var strIdx = 0;
-      for (var i = 0; i < length; i++) {
-        while (codeSize < bps) {
-          codeBuf <<= 8;
-          codeBuf |= strBytes[strIdx++];
-          codeSize += 8;
-        }
-        codeSize -= bps;
-        array.push((codeBuf >> codeSize) * sampleMul);
-        codeBuf &= (1 << codeSize) - 1;
-      }
-      return array;
-    },
-
-    getIR: function PDFFunction_getIR(xref, fn) {
-      var dict = fn.dict;
-      if (!dict)
-        dict = fn;
-
-      var types = [this.constructSampled,
-                   null,
-                   this.constructInterpolated,
-                   this.constructStiched,
-                   this.constructPostScript];
-
-      var typeNum = dict.get('FunctionType');
-      var typeFn = types[typeNum];
-      if (!typeFn)
-        error('Unknown type of function');
-
-      return typeFn.call(this, fn, dict, xref);
-    },
-
-    fromIR: function PDFFunction_fromIR(IR) {
-      var type = IR[0];
-      switch (type) {
-        case CONSTRUCT_SAMPLED:
-          return this.constructSampledFromIR(IR);
-        case CONSTRUCT_INTERPOLATED:
-          return this.constructInterpolatedFromIR(IR);
-        case CONSTRUCT_STICHED:
-          return this.constructStichedFromIR(IR);
-        case CONSTRUCT_POSTSCRIPT:
-        default:
-          return this.constructPostScriptFromIR(IR);
-      }
-    },
-
-    parse: function PDFFunction_parse(xref, fn) {
-      var IR = this.getIR(xref, fn);
-      return this.fromIR(IR);
-    },
-
-    constructSampled: function PDFFunction_constructSampled(str, dict) {
-      function toMultiArray(arr) {
-        var inputLength = arr.length;
-        var outputLength = arr.length / 2;
-        var out = [];
-        var index = 0;
-        for (var i = 0; i < inputLength; i += 2) {
-          out[index] = [arr[i], arr[i + 1]];
-          ++index;
-        }
-        return out;
-      }
-      var domain = dict.get('Domain');
-      var range = dict.get('Range');
-
-      if (!domain || !range)
-        error('No domain or range');
-
-      var inputSize = domain.length / 2;
-      var outputSize = range.length / 2;
-
-      domain = toMultiArray(domain);
-      range = toMultiArray(range);
-
-      var size = dict.get('Size');
-      var bps = dict.get('BitsPerSample');
-      var order = dict.get('Order');
-      if (!order)
-        order = 1;
-      if (order !== 1)
-        error('No support for cubic spline interpolation: ' + order);
-
-      var encode = dict.get('Encode');
-      if (!encode) {
-        encode = [];
-        for (var i = 0; i < inputSize; ++i) {
-          encode.push(0);
-          encode.push(size[i] - 1);
-        }
-      }
-      encode = toMultiArray(encode);
-
-      var decode = dict.get('Decode');
-      if (!decode)
-        decode = range;
-      else
-        decode = toMultiArray(decode);
-
-      var samples = this.getSampleArray(size, outputSize, bps, str);
-
-      return [
-        CONSTRUCT_SAMPLED, inputSize, domain, encode, decode, samples, size,
-        outputSize, Math.pow(2, bps) - 1, range
-      ];
-    },
-
-    constructSampledFromIR: function PDFFunction_constructSampledFromIR(IR) {
-      // See chapter 3, page 109 of the PDF reference
-      function interpolate(x, xmin, xmax, ymin, ymax) {
-        return ymin + ((x - xmin) * ((ymax - ymin) / (xmax - xmin)));
-      }
-
-      return function constructSampledFromIRResult(args) {
-        // See chapter 3, page 110 of the PDF reference.
-        var m = IR[1];
-        var domain = IR[2];
-        var encode = IR[3];
-        var decode = IR[4];
-        var samples = IR[5];
-        var size = IR[6];
-        var n = IR[7];
-        var mask = IR[8];
-        var range = IR[9];
-
-        if (m != args.length)
-          error('Incorrect number of arguments: ' + inputSize + ' != ' +
-                args.length);
-
-        var x = args;
-
-        // Building the cube vertices: its part and sample index
-        // http://rjwagner49.com/Mathematics/Interpolation.pdf
-        var cubeVertices = 1 << m;
-        var cubeN = new Float64Array(cubeVertices);
-        var cubeVertex = new Uint32Array(cubeVertices);
-        for (var j = 0; j < cubeVertices; j++)
-          cubeN[j] = 1;
-
-        var k = n, pos = 1;
-        // Map x_i to y_j for 0 <= i < m using the sampled function.
-        for (var i = 0; i < m; ++i) {
-          // x_i' = min(max(x_i, Domain_2i), Domain_2i+1)
-          var domain_2i = domain[i][0];
-          var domain_2i_1 = domain[i][1];
-          var xi = Math.min(Math.max(x[i], domain_2i), domain_2i_1);
-
-          // e_i = Interpolate(x_i', Domain_2i, Domain_2i+1,
-          //                   Encode_2i, Encode_2i+1)
-          var e = interpolate(xi, domain_2i, domain_2i_1,
-                              encode[i][0], encode[i][1]);
-
-          // e_i' = min(max(e_i, 0), Size_i - 1)
-          var size_i = size[i];
-          e = Math.min(Math.max(e, 0), size_i - 1);
-
-          // Adjusting the cube: N and vertex sample index
-          var e0 = e < size_i - 1 ? Math.floor(e) : e - 1; // e1 = e0 + 1;
-          var n0 = e0 + 1 - e; // (e1 - e) / (e1 - e0);
-          var n1 = e - e0; // (e - e0) / (e1 - e0);
-          var offset0 = e0 * k;
-          var offset1 = offset0 + k; // e1 * k
-          for (var j = 0; j < cubeVertices; j++) {
-            if (j & pos) {
-              cubeN[j] *= n1;
-              cubeVertex[j] += offset1;
-            } else {
-              cubeN[j] *= n0;
-              cubeVertex[j] += offset0;
-            }
-          }
-
-          k *= size_i;
-          pos <<= 1;
-        }
-
-        var y = new Float64Array(n);
-        for (var j = 0; j < n; ++j) {
-          // Sum all cube vertices' samples portions
-          var rj = 0;
-          for (var i = 0; i < cubeVertices; i++)
-            rj += samples[cubeVertex[i] + j] * cubeN[i];
-
-          // r_j' = Interpolate(r_j, 0, 2^BitsPerSample - 1,
-          //                    Decode_2j, Decode_2j+1)
-          rj = interpolate(rj, 0, 1, decode[j][0], decode[j][1]);
-
-          // y_j = min(max(r_j, range_2j), range_2j+1)
-          y[j] = Math.min(Math.max(rj, range[j][0]), range[j][1]);
-        }
-
-        return y;
-      }
-    },
-
-    constructInterpolated: function PDFFunction_constructInterpolated(str,
-                                                                      dict) {
-      var c0 = dict.get('C0') || [0];
-      var c1 = dict.get('C1') || [1];
-      var n = dict.get('N');
-
-      if (!isArray(c0) || !isArray(c1))
-        error('Illegal dictionary for interpolated function');
-
-      var length = c0.length;
-      var diff = [];
-      for (var i = 0; i < length; ++i)
-        diff.push(c1[i] - c0[i]);
-
-      return [CONSTRUCT_INTERPOLATED, c0, diff, n];
-    },
-
-    constructInterpolatedFromIR:
-      function PDFFunction_constructInterpolatedFromIR(IR) {
-      var c0 = IR[1];
-      var diff = IR[2];
-      var n = IR[3];
-
-      var length = diff.length;
-
-      return function constructInterpolatedFromIRResult(args) {
-        var x = n == 1 ? args[0] : Math.pow(args[0], n);
-
-        var out = [];
-        for (var j = 0; j < length; ++j)
-          out.push(c0[j] + (x * diff[j]));
-
-        return out;
-
-      }
-    },
-
-    constructStiched: function PDFFunction_constructStiched(fn, dict, xref) {
-      var domain = dict.get('Domain');
-
-      if (!domain)
-        error('No domain');
-
-      var inputSize = domain.length / 2;
-      if (inputSize != 1)
-        error('Bad domain for stiched function');
-
-      var fnRefs = dict.get('Functions');
-      var fns = [];
-      for (var i = 0, ii = fnRefs.length; i < ii; ++i)
-        fns.push(PDFFunction.getIR(xref, xref.fetchIfRef(fnRefs[i])));
-
-      var bounds = dict.get('Bounds');
-      var encode = dict.get('Encode');
-
-      return [CONSTRUCT_STICHED, domain, bounds, encode, fns];
-    },
-
-    constructStichedFromIR: function PDFFunction_constructStichedFromIR(IR) {
-      var domain = IR[1];
-      var bounds = IR[2];
-      var encode = IR[3];
-      var fnsIR = IR[4];
-      var fns = [];
-
-      for (var i = 0, ii = fnsIR.length; i < ii; i++) {
-        fns.push(PDFFunction.fromIR(fnsIR[i]));
-      }
-
-      return function constructStichedFromIRResult(args) {
-        var clip = function constructStichedFromIRClip(v, min, max) {
-          if (v > max)
-            v = max;
-          else if (v < min)
-            v = min;
-          return v;
-        };
-
-        // clip to domain
-        var v = clip(args[0], domain[0], domain[1]);
-        // calulate which bound the value is in
-        for (var i = 0, ii = bounds.length; i < ii; ++i) {
-          if (v < bounds[i])
-            break;
-        }
-
-        // encode value into domain of function
-        var dmin = domain[0];
-        if (i > 0)
-          dmin = bounds[i - 1];
-        var dmax = domain[1];
-        if (i < bounds.length)
-          dmax = bounds[i];
-
-        var rmin = encode[2 * i];
-        var rmax = encode[2 * i + 1];
-
-        var v2 = rmin + (v - dmin) * (rmax - rmin) / (dmax - dmin);
-
-        // call the appropropriate function
-        return fns[i]([v2]);
-      };
-    },
-
-    constructPostScript: function PDFFunction_constructPostScript(fn, dict,
-                                                                  xref) {
-      var domain = dict.get('Domain');
-      var range = dict.get('Range');
-
-      if (!domain)
-        error('No domain.');
-
-      if (!range)
-        error('No range.');
-
-      var lexer = new PostScriptLexer(fn);
-      var parser = new PostScriptParser(lexer);
-      var code = parser.parse();
-
-      return [CONSTRUCT_POSTSCRIPT, domain, range, code];
-    },
-
-    constructPostScriptFromIR: function PDFFunction_constructPostScriptFromIR(
-                                          IR) {
-      var domain = IR[1];
-      var range = IR[2];
-      var code = IR[3];
-      var numOutputs = range.length / 2;
-      var evaluator = new PostScriptEvaluator(code);
-      // Cache the values for a big speed up, the cache size is limited though
-      // since the number of possible values can be huge from a PS function.
-      var cache = new FunctionCache();
-      return function constructPostScriptFromIRResult(args) {
-        var initialStack = [];
-        for (var i = 0, ii = (domain.length / 2); i < ii; ++i) {
-          initialStack.push(args[i]);
-        }
-
-        var key = initialStack.join('_');
-        if (cache.has(key))
-          return cache.get(key);
-
-        var stack = evaluator.execute(initialStack);
-        var transformed = [];
-        for (i = numOutputs - 1; i >= 0; --i) {
-          var out = stack.pop();
-          var rangeIndex = 2 * i;
-          if (out < range[rangeIndex])
-            out = range[rangeIndex];
-          else if (out > range[rangeIndex + 1])
-            out = range[rangeIndex + 1];
-          transformed[i] = out;
-        }
-        cache.set(key, transformed);
-        return transformed;
-      };
-    }
-  };
-})();
-
-var FunctionCache = (function FunctionCacheClosure() {
-  // Of 10 PDF's with type4 functions the maxium number of distinct values seen
-  // was 256. This still may need some tweaking in the future though.
-  var MAX_CACHE_SIZE = 1024;
-  function FunctionCache() {
-    this.cache = {};
-    this.total = 0;
-  }
-  FunctionCache.prototype = {
-    has: function FunctionCache_has(key) {
-      return key in this.cache;
-    },
-    get: function FunctionCache_get(key) {
-      return this.cache[key];
-    },
-    set: function FunctionCache_set(key, value) {
-      if (this.total < MAX_CACHE_SIZE) {
-        this.cache[key] = value;
-        this.total++;
-      }
-    }
-  };
-  return FunctionCache;
-})();
-
-var PostScriptStack = (function PostScriptStackClosure() {
-  var MAX_STACK_SIZE = 100;
-  function PostScriptStack(initialStack) {
-    this.stack = initialStack || [];
-  }
-
-  PostScriptStack.prototype = {
-    push: function PostScriptStack_push(value) {
-      if (this.stack.length >= MAX_STACK_SIZE)
-        error('PostScript function stack overflow.');
-      this.stack.push(value);
-    },
-    pop: function PostScriptStack_pop() {
-      if (this.stack.length <= 0)
-        error('PostScript function stack underflow.');
-      return this.stack.pop();
-    },
-    copy: function PostScriptStack_copy(n) {
-      if (this.stack.length + n >= MAX_STACK_SIZE)
-        error('PostScript function stack overflow.');
-      var stack = this.stack;
-      for (var i = stack.length - n, j = n - 1; j >= 0; j--, i++)
-        stack.push(stack[i]);
-    },
-    index: function PostScriptStack_index(n) {
-      this.push(this.stack[this.stack.length - n - 1]);
-    },
-    // rotate the last n stack elements p times
-    roll: function PostScriptStack_roll(n, p) {
-      var stack = this.stack;
-      var l = stack.length - n;
-      var r = stack.length - 1, c = l + (p - Math.floor(p / n) * n), i, j, t;
-      for (i = l, j = r; i < j; i++, j--) {
-        t = stack[i]; stack[i] = stack[j]; stack[j] = t;
-      }
-      for (i = l, j = c - 1; i < j; i++, j--) {
-        t = stack[i]; stack[i] = stack[j]; stack[j] = t;
-      }
-      for (i = c, j = r; i < j; i++, j--) {
-        t = stack[i]; stack[i] = stack[j]; stack[j] = t;
-      }
-    }
-  };
-  return PostScriptStack;
-})();
-var PostScriptEvaluator = (function PostScriptEvaluatorClosure() {
-  function PostScriptEvaluator(operators, operands) {
-    this.operators = operators;
-    this.operands = operands;
-  }
-  PostScriptEvaluator.prototype = {
-    execute: function PostScriptEvaluator_execute(initialStack) {
-      var stack = new PostScriptStack(initialStack);
-      var counter = 0;
-      var operators = this.operators;
-      var length = operators.length;
-      var operator, a, b;
-      while (counter < length) {
-        operator = operators[counter++];
-        if (typeof operator == 'number') {
-          // Operator is really an operand and should be pushed to the stack.
-          stack.push(operator);
-          continue;
-        }
-        switch (operator) {
-          // non standard ps operators
-          case 'jz': // jump if false
-            b = stack.pop();
-            a = stack.pop();
-            if (!a)
-              counter = b;
-            break;
-          case 'j': // jump
-            a = stack.pop();
-            counter = a;
-            break;
-
-          // all ps operators in alphabetical order (excluding if/ifelse)
-          case 'abs':
-            a = stack.pop();
-            stack.push(Math.abs(a));
-            break;
-          case 'add':
-            b = stack.pop();
-            a = stack.pop();
-            stack.push(a + b);
-            break;
-          case 'and':
-            b = stack.pop();
-            a = stack.pop();
-            if (isBool(a) && isBool(b))
-              stack.push(a && b);
-            else
-              stack.push(a & b);
-            break;
-          case 'atan':
-            a = stack.pop();
-            stack.push(Math.atan(a));
-            break;
-          case 'bitshift':
-            b = stack.pop();
-            a = stack.pop();
-            if (a > 0)
-              stack.push(a << b);
-            else
-              stack.push(a >> b);
-            break;
-          case 'ceiling':
-            a = stack.pop();
-            stack.push(Math.ceil(a));
-            break;
-          case 'copy':
-            a = stack.pop();
-            stack.copy(a);
-            break;
-          case 'cos':
-            a = stack.pop();
-            stack.push(Math.cos(a));
-            break;
-          case 'cvi':
-            a = stack.pop() | 0;
-            stack.push(a);
-            break;
-          case 'cvr':
-            // noop
-            break;
-          case 'div':
-            b = stack.pop();
-            a = stack.pop();
-            stack.push(a / b);
-            break;
-          case 'dup':
-            stack.copy(1);
-            break;
-          case 'eq':
-            b = stack.pop();
-            a = stack.pop();
-            stack.push(a == b);
-            break;
-          case 'exch':
-            stack.roll(2, 1);
-            break;
-          case 'exp':
-            b = stack.pop();
-            a = stack.pop();
-            stack.push(Math.pow(a, b));
-            break;
-          case 'false':
-            stack.push(false);
-            break;
-          case 'floor':
-            a = stack.pop();
-            stack.push(Math.floor(a));
-            break;
-          case 'ge':
-            b = stack.pop();
-            a = stack.pop();
-            stack.push(a >= b);
-            break;
-          case 'gt':
-            b = stack.pop();
-            a = stack.pop();
-            stack.push(a > b);
-            break;
-          case 'idiv':
-            b = stack.pop();
-            a = stack.pop();
-            stack.push((a / b) | 0);
-            break;
-          case 'index':
-            a = stack.pop();
-            stack.index(a);
-            break;
-          case 'le':
-            b = stack.pop();
-            a = stack.pop();
-            stack.push(a <= b);
-            break;
-          case 'ln':
-            a = stack.pop();
-            stack.push(Math.log(a));
-            break;
-          case 'log':
-            a = stack.pop();
-            stack.push(Math.log(a) / Math.LN10);
-            break;
-          case 'lt':
-            b = stack.pop();
-            a = stack.pop();
-            stack.push(a < b);
-            break;
-          case 'mod':
-            b = stack.pop();
-            a = stack.pop();
-            stack.push(a % b);
-            break;
-          case 'mul':
-            b = stack.pop();
-            a = stack.pop();
-            stack.push(a * b);
-            break;
-          case 'ne':
-            b = stack.pop();
-            a = stack.pop();
-            stack.push(a != b);
-            break;
-          case 'neg':
-            a = stack.pop();
-            stack.push(-b);
-            break;
-          case 'not':
-            a = stack.pop();
-            if (isBool(a) && isBool(b))
-              stack.push(a && b);
-            else
-              stack.push(a & b);
-            break;
-          case 'or':
-            b = stack.pop();
-            a = stack.pop();
-            if (isBool(a) && isBool(b))
-              stack.push(a || b);
-            else
-              stack.push(a | b);
-            break;
-          case 'pop':
-            stack.pop();
-            break;
-          case 'roll':
-            b = stack.pop();
-            a = stack.pop();
-            stack.roll(a, b);
-            break;
-          case 'round':
-            a = stack.pop();
-            stack.push(Math.round(a));
-            break;
-          case 'sin':
-            a = stack.pop();
-            stack.push(Math.sin(a));
-            break;
-          case 'sqrt':
-            a = stack.pop();
-            stack.push(Math.sqrt(a));
-            break;
-          case 'sub':
-            b = stack.pop();
-            a = stack.pop();
-            stack.push(a - b);
-            break;
-          case 'true':
-            stack.push(true);
-            break;
-          case 'truncate':
-            a = stack.pop();
-            a = a < 0 ? Math.ceil(a) : Math.floor(a);
-            stack.push(a);
-            break;
-          case 'xor':
-            b = stack.pop();
-            a = stack.pop();
-            if (isBool(a) && isBool(b))
-              stack.push(a != b);
-            else
-              stack.push(a ^ b);
-            break;
-          default:
-            error('Unknown operator ' + operator);
-            break;
-        }
-      }
-      return stack.stack;
-    }
-  };
-  return PostScriptEvaluator;
-})();
-
-var PostScriptParser = (function PostScriptParserClosure() {
-  function PostScriptParser(lexer) {
-    this.lexer = lexer;
-    this.operators = [];
-    this.token;
-    this.prev;
-  }
-  PostScriptParser.prototype = {
-    nextToken: function PostScriptParser_nextToken() {
-      this.prev = this.token;
-      this.token = this.lexer.getToken();
-    },
-    accept: function PostScriptParser_accept(type) {
-      if (this.token.type == type) {
-        this.nextToken();
-        return true;
-      }
-      return false;
-    },
-    expect: function PostScriptParser_expect(type) {
-      if (this.accept(type))
-        return true;
-      error('Unexpected symbol: found ' + this.token.type + ' expected ' +
-            type + '.');
-    },
-    parse: function PostScriptParser_parse() {
-      this.nextToken();
-      this.expect(PostScriptTokenTypes.LBRACE);
-      this.parseBlock();
-      this.expect(PostScriptTokenTypes.RBRACE);
-      return this.operators;
-    },
-    parseBlock: function PostScriptParser_parseBlock() {
-      while (true) {
-        if (this.accept(PostScriptTokenTypes.NUMBER)) {
-          this.operators.push(this.prev.value);
-        } else if (this.accept(PostScriptTokenTypes.OPERATOR)) {
-          this.operators.push(this.prev.value);
-        } else if (this.accept(PostScriptTokenTypes.LBRACE)) {
-          this.parseCondition();
-        } else {
-          return;
-        }
-      }
-    },
-    parseCondition: function PostScriptParser_parseCondition() {
-      // Add two place holders that will be updated later
-      var conditionLocation = this.operators.length;
-      this.operators.push(null, null);
-
-      this.parseBlock();
-      this.expect(PostScriptTokenTypes.RBRACE);
-      if (this.accept(PostScriptTokenTypes.IF)) {
-        // The true block is right after the 'if' so it just falls through on
-        // true else it jumps and skips the true block.
-        this.operators[conditionLocation] = this.operators.length;
-        this.operators[conditionLocation + 1] = 'jz';
-      } else if (this.accept(PostScriptTokenTypes.LBRACE)) {
-        var jumpLocation = this.operators.length;
-        this.operators.push(null, null);
-        var endOfTrue = this.operators.length;
-        this.parseBlock();
-        this.expect(PostScriptTokenTypes.RBRACE);
-        this.expect(PostScriptTokenTypes.IFELSE);
-        // The jump is added at the end of the true block to skip the false
-        // block.
-        this.operators[jumpLocation] = this.operators.length;
-        this.operators[jumpLocation + 1] = 'j';
-
-        this.operators[conditionLocation] = endOfTrue;
-        this.operators[conditionLocation + 1] = 'jz';
-      } else {
-        error('PS Function: error parsing conditional.');
-      }
-    }
-  };
-  return PostScriptParser;
-})();
-
-var PostScriptTokenTypes = {
-  LBRACE: 0,
-  RBRACE: 1,
-  NUMBER: 2,
-  OPERATOR: 3,
-  IF: 4,
-  IFELSE: 5
-};
-
-var PostScriptToken = (function PostScriptTokenClosure() {
-  function PostScriptToken(type, value) {
-    this.type = type;
-    this.value = value;
-  }
-
-  var opCache = {};
-
-  PostScriptToken.getOperator = function PostScriptToken_getOperator(op) {
-    var opValue = opCache[op];
-    if (opValue)
-      return opValue;
-
-    return opCache[op] = new PostScriptToken(PostScriptTokenTypes.OPERATOR, op);
-  };
-
-  PostScriptToken.LBRACE = new PostScriptToken(PostScriptTokenTypes.LBRACE,
-                                                '{');
-  PostScriptToken.RBRACE = new PostScriptToken(PostScriptTokenTypes.RBRACE,
-                                                '}');
-  PostScriptToken.IF = new PostScriptToken(PostScriptTokenTypes.IF, 'IF');
-  PostScriptToken.IFELSE = new PostScriptToken(PostScriptTokenTypes.IFELSE,
-                                                'IFELSE');
-  return PostScriptToken;
-})();
-
-var PostScriptLexer = (function PostScriptLexerClosure() {
-  function PostScriptLexer(stream) {
-    this.stream = stream;
-  }
-  PostScriptLexer.prototype = {
-    getToken: function PostScriptLexer_getToken() {
-      var s = '';
-      var ch;
-      var comment = false;
-      var stream = this.stream;
-
-      // skip comments
-      while (true) {
-        if (!(ch = stream.getChar()))
-          return EOF;
-
-        if (comment) {
-          if (ch == '\x0a' || ch == '\x0d')
-            comment = false;
-        } else if (ch == '%') {
-          comment = true;
-        } else if (!Lexer.isSpace(ch)) {
-          break;
-        }
-      }
-      switch (ch) {
-        case '0': case '1': case '2': case '3': case '4':
-        case '5': case '6': case '7': case '8': case '9':
-        case '+': case '-': case '.':
-          return new PostScriptToken(PostScriptTokenTypes.NUMBER,
-                                      this.getNumber(ch));
-        case '{':
-          return PostScriptToken.LBRACE;
-        case '}':
-          return PostScriptToken.RBRACE;
-      }
-      // operator
-      var str = ch.toLowerCase();
-      while (true) {
-        ch = stream.lookChar();
-        if (ch === null)
-          break;
-        ch = ch.toLowerCase();
-        if (ch >= 'a' && ch <= 'z')
-          str += ch;
-        else
-          break;
-        stream.skip();
-      }
-      switch (str) {
-        case 'if':
-          return PostScriptToken.IF;
-        case 'ifelse':
-          return PostScriptToken.IFELSE;
-        default:
-          return PostScriptToken.getOperator(str);
-      }
-    },
-    getNumber: function PostScriptLexer_getNumber(ch) {
-      var str = ch;
-      var stream = this.stream;
-      while (true) {
-        ch = stream.lookChar();
-        if ((ch >= '0' && ch <= '9') || ch == '-' || ch == '.')
-          str += ch;
-        else
-          break;
-        stream.skip();
-      }
-      var value = parseFloat(str);
-      if (isNaN(value))
-        error('Invalid floating point number: ' + value);
-      return value;
-    }
-  };
-  return PostScriptLexer;
-})();
-
-
-/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
-
-'use strict';
-
-var ISOAdobeCharset = [
-  '.notdef', 'space', 'exclam', 'quotedbl', 'numbersign', 'dollar',
-  'percent', 'ampersand', 'quoteright', 'parenleft', 'parenright',
-  'asterisk', 'plus', 'comma', 'hyphen', 'period', 'slash', 'zero',
-  'one', 'two', 'three', 'four', 'five', 'six', 'seven', 'eight',
-  'nine', 'colon', 'semicolon', 'less', 'equal', 'greater', 'question',
-  'at', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M',
-  'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
-  'bracketleft', 'backslash', 'bracketright', 'asciicircum', 'underscore',
-  'quoteleft', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l',
-  'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
-  'braceleft', 'bar', 'braceright', 'asciitilde', 'exclamdown', 'cent',
-  'sterling', 'fraction', 'yen', 'florin', 'section', 'currency',
-  'quotesingle', 'quotedblleft', 'guillemotleft', 'guilsinglleft',
-  'guilsinglright', 'fi', 'fl', 'endash', 'dagger', 'daggerdbl',
-  'periodcentered', 'paragraph', 'bullet', 'quotesinglbase',
-  'quotedblbase', 'quotedblright', 'guillemotright', 'ellipsis',
-  'perthousand', 'questiondown', 'grave', 'acute', 'circumflex', 'tilde',
-  'macron', 'breve', 'dotaccent', 'dieresis', 'ring', 'cedilla',
-  'hungarumlaut', 'ogonek', 'caron', 'emdash', 'AE', 'ordfeminine',
-  'Lslash', 'Oslash', 'OE', 'ordmasculine', 'ae', 'dotlessi', 'lslash',
-  'oslash', 'oe', 'germandbls', 'onesuperior', 'logicalnot', 'mu',
-  'trademark', 'Eth', 'onehalf', 'plusminus', 'Thorn', 'onequarter',
-  'divide', 'brokenbar', 'degree', 'thorn', 'threequarters', 'twosuperior',
-  'registered', 'minus', 'eth', 'multiply', 'threesuperior', 'copyright',
-  'Aacute', 'Acircumflex', 'Adieresis', 'Agrave', 'Aring', 'Atilde',
-  'Ccedilla', 'Eacute', 'Ecircumflex', 'Edieresis', 'Egrave', 'Iacute',
-  'Icircumflex', 'Idieresis', 'Igrave', 'Ntilde', 'Oacute', 'Ocircumflex',
-  'Odieresis', 'Ograve', 'Otilde', 'Scaron', 'Uacute', 'Ucircumflex',
-  'Udieresis', 'Ugrave', 'Yacute', 'Ydieresis', 'Zcaron', 'aacute',
-  'acircumflex', 'adieresis', 'agrave', 'aring', 'atilde', 'ccedilla',
-  'eacute', 'ecircumflex', 'edieresis', 'egrave', 'iacute', 'icircumflex',
-  'idieresis', 'igrave', 'ntilde', 'oacute', 'ocircumflex', 'odieresis',
-  'ograve', 'otilde', 'scaron', 'uacute', 'ucircumflex', 'udieresis',
-  'ugrave', 'yacute', 'ydieresis', 'zcaron'
-];
-
-var ExpertCharset = [
-  '.notdef', 'space', 'exclamsmall', 'Hungarumlautsmall', 'dollaroldstyle',
-  'dollarsuperior', 'ampersandsmall', 'Acutesmall', 'parenleftsuperior',
-  'parenrightsuperior', 'twodotenleader', 'onedotenleader', 'comma',
-  'hyphen', 'period', 'fraction', 'zerooldstyle', 'oneoldstyle',
-  'twooldstyle', 'threeoldstyle', 'fouroldstyle', 'fiveoldstyle',
-  'sixoldstyle', 'sevenoldstyle', 'eightoldstyle', 'nineoldstyle',
-  'colon', 'semicolon', 'commasuperior', 'threequartersemdash',
-  'periodsuperior', 'questionsmall', 'asuperior', 'bsuperior',
-  'centsuperior', 'dsuperior', 'esuperior', 'isuperior', 'lsuperior',
-  'msuperior', 'nsuperior', 'osuperior', 'rsuperior', 'ssuperior',
-  'tsuperior', 'ff', 'fi', 'fl', 'ffi', 'ffl', 'parenleftinferior',
-  'parenrightinferior', 'Circumflexsmall', 'hyphensuperior', 'Gravesmall',
-  'Asmall', 'Bsmall', 'Csmall', 'Dsmall', 'Esmall', 'Fsmall', 'Gsmall',
-  'Hsmall', 'Ismall', 'Jsmall', 'Ksmall', 'Lsmall', 'Msmall', 'Nsmall',
-  'Osmall', 'Psmall', 'Qsmall', 'Rsmall', 'Ssmall', 'Tsmall', 'Usmall',
-  'Vsmall', 'Wsmall', 'Xsmall', 'Ysmall', 'Zsmall', 'colonmonetary',
-  'onefitted', 'rupiah', 'Tildesmall', 'exclamdownsmall', 'centoldstyle',
-  'Lslashsmall', 'Scaronsmall', 'Zcaronsmall', 'Dieresissmall',
-  'Brevesmall', 'Caronsmall', 'Dotaccentsmall', 'Macronsmall',
-  'figuredash', 'hypheninferior', 'Ogoneksmall', 'Ringsmall',
-  'Cedillasmall', 'onequarter', 'onehalf', 'threequarters',
-  'questiondownsmall', 'oneeighth', 'threeeighths', 'fiveeighths',
-  'seveneighths', 'onethird', 'twothirds', 'zerosuperior', 'onesuperior',
-  'twosuperior', 'threesuperior', 'foursuperior', 'fivesuperior',
-  'sixsuperior', 'sevensuperior', 'eightsuperior', 'ninesuperior',
-  'zeroinferior', 'oneinferior', 'twoinferior', 'threeinferior',
-  'fourinferior', 'fiveinferior', 'sixinferior', 'seveninferior',
-  'eightinferior', 'nineinferior', 'centinferior', 'dollarinferior',
-  'periodinferior', 'commainferior', 'Agravesmall', 'Aacutesmall',
-  'Acircumflexsmall', 'Atildesmall', 'Adieresissmall', 'Aringsmall',
-  'AEsmall', 'Ccedillasmall', 'Egravesmall', 'Eacutesmall',
-  'Ecircumflexsmall', 'Edieresissmall', 'Igravesmall', 'Iacutesmall',
-  'Icircumflexsmall', 'Idieresissmall', 'Ethsmall', 'Ntildesmall',
-  'Ogravesmall', 'Oacutesmall', 'Ocircumflexsmall', 'Otildesmall',
-  'Odieresissmall', 'OEsmall', 'Oslashsmall', 'Ugravesmall', 'Uacutesmall',
-  'Ucircumflexsmall', 'Udieresissmall', 'Yacutesmall', 'Thornsmall',
-  'Ydieresissmall'
-];
-
-var ExpertSubsetCharset = [
-  '.notdef', 'space', 'dollaroldstyle', 'dollarsuperior',
-  'parenleftsuperior', 'parenrightsuperior', 'twodotenleader',
-  'onedotenleader', 'comma', 'hyphen', 'period', 'fraction',
-  'zerooldstyle', 'oneoldstyle', 'twooldstyle', 'threeoldstyle',
-  'fouroldstyle', 'fiveoldstyle', 'sixoldstyle', 'sevenoldstyle',
-  'eightoldstyle', 'nineoldstyle', 'colon', 'semicolon', 'commasuperior',
-  'threequartersemdash', 'periodsuperior', 'asuperior', 'bsuperior',
-  'centsuperior', 'dsuperior', 'esuperior', 'isuperior', 'lsuperior',
-  'msuperior', 'nsuperior', 'osuperior', 'rsuperior', 'ssuperior',
-  'tsuperior', 'ff', 'fi', 'fl', 'ffi', 'ffl', 'parenleftinferior',
-  'parenrightinferior', 'hyphensuperior', 'colonmonetary', 'onefitted',
-  'rupiah', 'centoldstyle', 'figuredash', 'hypheninferior', 'onequarter',
-  'onehalf', 'threequarters', 'oneeighth', 'threeeighths', 'fiveeighths',
-  'seveneighths', 'onethird', 'twothirds', 'zerosuperior', 'onesuperior',
-  'twosuperior', 'threesuperior', 'foursuperior', 'fivesuperior',
-  'sixsuperior', 'sevensuperior', 'eightsuperior', 'ninesuperior',
-  'zeroinferior', 'oneinferior', 'twoinferior', 'threeinferior',
-  'fourinferior', 'fiveinferior', 'sixinferior', 'seveninferior',
-  'eightinferior', 'nineinferior', 'centinferior', 'dollarinferior',
-  'periodinferior', 'commainferior'
-];
-
-
-/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
-
-'use strict';
-
-var CIDToUnicodeMaps = {
-  'Adobe-Japan1': [[32, 160], {f: 12, c: 33}, [45, 8209], {f: 46, c: 46}, 165,
-    {f: 2, c: 93}, [95, 818], [96, 768], {f: 27, c: 97}, 166, 125, [732, 771],
-    [700, 8217], 92, [699, 8216], 124, [126, 8764], {f: 3, c: 161}, 8260, 402,
-    0, 164, 8220, 171, {f: 2, c: 8249}, {f: 2, c: 64257}, [8210, 8211], 0, 0,
-    [183, 8729], 0, 8226, 8218, 8222, 8221, 187, 0, 0, 191, {f: 2, c: 769},
-    [175, 772], {f: 3, c: 774}, 778, [184, 807], 779, 808, 780, [822, 8212],
-    198, 170, 321, 216, 338, 186, 230, 305, 322, 248, 339, 223, 173, 169, 172,
-    174, 0, 0, {f: 2, c: 178}, 181, 185, {f: 3, c: 188}, {f: 6, c: 192},
-    {f: 16, c: 199}, 0, {f: 6, c: 217}, {f: 6, c: 224}, {f: 16, c: 231}, 0,
-    {f: 7, c: 249}, 352, 376, 381, [773, 8254], 353, 8482, 382, 0, 8194,
-    {s: 91}, 65512, {s: 3}, {f: 63, c: 65377}, {s: 243}, [8195, 12288],
-    {f: 2, c: 12289}, 65292, 65294, 12539, {f: 2, c: 65306}, 65311, 65281,
-    {f: 2, c: 12443}, 180, 65344, 168, 65342, 65507, 65343, {f: 2, c: 12541},
-    {f: 2, c: 12445}, 12291, 20189, {f: 3, c: 12293}, 12540, 8213, 8208, 65295,
-    65340, [12316, 65374], 8214, 65372, 8230, 8229, {s: 4}, {f: 2, c: 65288},
-    {f: 2, c: 12308}, 65339, 65341, 65371, 65373, {f: 10, c: 12296}, 65291,
-    [8722, 65293], 177, 215, 247, 65309, 8800, 65308, 65310, {f: 2, c: 8806},
-    8734, 8756, 9794, 9792, 176, {f: 2, c: 8242}, 8451, 65509, 65284,
-    {f: 2, c: 65504}, 65285, 65283, 65286, 65290, 65312, 167, 9734, 9733, 9675,
-    9679, 9678, 9671, 9670, 9633, 9632, 9651, 9650, 9661, 9660, 8251, 12306,
-    8594, {f: 2, c: 8592}, 8595, 12307, 8712, 8715, {f: 2, c: 8838},
-    {f: 2, c: 8834}, 8746, 8745, {f: 2, c: 8743}, 65506, 8658, 8660, 8704,
-    8707, 8736, 8869, 8978, 8706, 8711, 8801, 8786, {f: 2, c: 8810}, 8730,
-    8765, 8733, 8757, {f: 2, c: 8747}, 8491, 8240, 9839, 9837, 9834,
-    {f: 2, c: 8224}, 182, 9711, {f: 10, c: 65296}, {f: 26, c: 65313},
-    {f: 26, c: 65345}, {f: 83, c: 12353}, {f: 86, c: 12449}, {f: 17, c: 913},
-    {f: 7, c: 931}, {f: 17, c: 945}, {f: 7, c: 963}, {f: 6, c: 1040}, 1025,
-    {f: 32, c: 1046}, 1105, {f: 26, c: 1078}, 20124, 21782, 23043, 38463,
-    21696, 24859, 25384, 23030, 36898, 33909, 33564, 31312, 24746, 25569,
-    28197, 26093, 33894, 33446, 39925, 26771, 22311, 26017, 25201, 23451,
-    22992, 34427, 39156, 32098, 32190, 39822, 25110, 31903, 34999, 23433,
-    24245, 25353, 26263, 26696, 38343, 38797, 26447, 20197, 20234, 20301,
-    20381, 20553, 22258, 22839, 22996, 23041, 23561, 24799, 24847, 24944,
-    26131, 26885, 28858, 30031, 30064, 31227, 32173, 32239, 32963, 33806,
-    [12176, 34915], 35586, 36949, 36986, 21307, 20117, 20133, 22495, 32946,
-    37057, 30959, [12032, 19968], 22769, 28322, 36920, 31282, 33576, 33419,
-    39983, 20801, 21360, 21693, 21729, 22240, 23035, 24341, 39154, 28139,
-    32996, 34093, 38498, 38512, 38560, 38907, 21515, 21491, 23431, 28879,
-    [12155, 32701], 36802, [12204, 38632], 21359, 40284, 31418, 19985, 30867,
-    [12165, 33276], 28198, 22040, 21764, 27421, 34074, 39995, 23013, 21417,
-    28006, [12128, 29916], 38287, 22082, 20113, 36939, 38642, 33615, 39180,
-    21473, 21942, 23344, 24433, 26144, 26355, 26628, 27704, 27891, 27945,
-    29787, 30408, 31310, 38964, 33521, 34907, 35424, 37613, 28082, 30123,
-    30410, 39365, 24742, 35585, 36234, 38322, 27022, 21421, 20870, 22290,
-    22576, 22852, 23476, 24310, 24616, 25513, 25588, 27839, 28436, 28814,
-    28948, 29017, 29141, 29503, 32257, 33398, 33489, 34199, 36960, 37467,
-    40219, 22633, 26044, 27738, 29989, 20985, 22830, 22885, 24448, 24540,
-    25276, 26106, 27178, 27431, 27572, 29579, 32705, 35158, 40236, 40206,
-    [12009, 40644], 23713, 27798, 33659, 20740, 23627, 25014, 33222, 26742,
-    29281, [12036, 20057], 20474, 21368, 24681, 28201, 31311, [12211, 38899],
-    19979, 21270, 20206, 20309, 20285, 20385, 20339, 21152, 21487, 22025,
-    22799, 23233, 23478, 23521, 31185, 26247, 26524, 26550, 27468, 27827,
-    [12117, 28779], 29634, 31117, [12146, 31166], 31292, 31623, 33457, 33499,
-    33540, 33655, 33775, 33747, 34662, 35506, 22057, 36008, 36838, 36942,
-    38686, 34442, 20420, 23784, 25105, [12123, 29273], 30011, 33253, 33469,
-    34558, 36032, 38597, 39187, 39381, 20171, 20250, 35299, 22238, 22602,
-    22730, 24315, 24555, 24618, 24724, 24674, 25040, 25106, 25296, 25913,
-    39745, 26214, 26800, 28023, 28784, 30028, 30342, 32117, 33445, 34809,
-    38283, 38542, [12185, 35997], 20977, 21182, 22806, 21683, 23475, 23830,
-    24936, 27010, 28079, 30861, 33995, 34903, 35442, 37799, 39608, 28012,
-    39336, 34521, 22435, 26623, 34510, 37390, 21123, 22151, 21508, 24275,
-    25313, 25785, 26684, 26680, 27579, 29554, 30906, 31339, 35226,
-    [12179, 35282], 36203, 36611, 37101, 38307, 38548, [12208, 38761], 23398,
-    23731, 27005, {f: 2, c: 38989}, 25499, 31520, 27179, 27263, 26806, 39949,
-    28511, 21106, 21917, 24688, 25324, 27963, 28167, 28369, 33883, 35088,
-    36676, 19988, 39993, 21494, 26907, 27194, 38788, 26666, 20828, 31427,
-    33970, 37340, 37772, 22107, 40232, 26658, 33541, 33841, 31909, 21000,
-    33477, [12129, 29926], 20094, 20355, 20896, 23506, 21002, 21208, 21223,
-    24059, 21914, 22570, 23014, 23436, 23448, 23515, [12082, 24178], 24185,
-    24739, 24863, 24931, 25022, 25563, 25954, 26577, 26707, 26874, 27454,
-    27475, 27735, 28450, 28567, 28485, 29872, [12130, 29976], 30435, 30475,
-    31487, 31649, 31777, 32233, [12152, 32566], 32752, 32925, 33382, 33694,
-    35251, 35532, 36011, 36996, 37969, 38291, 38289, 38306, 38501, 38867,
-    39208, 33304, 20024, 21547, 23736, 24012, 29609, 30284, 30524, 23721,
-    32747, 36107, 38593, 38929, 38996, 39000, 20225, 20238, 21361, 21916,
-    22120, 22522, 22855, 23305, 23492, 23696, 24076, 24190, 24524, 25582,
-    26426, 26071, 26082, 26399, 26827, 26820, 27231, 24112, 27589, 27671,
-    27773, 30079, 31048, 23395, 31232, 32000, 24509, 35215, 35352, 36020,
-    36215, 36556, 36637, 39138, 39438, [12004, 12225, 39740], [12018, 20096],
-    20605, 20736, 22931, 23452, 25135, 25216, 25836, 27450, 29344, 30097,
-    31047, 32681, 34811, 35516, 35696, 25516, 33738, 38816, 21513, 21507,
-    21931, 26708, 27224, 35440, 30759, 26485, [12233, 40653], 21364, 23458,
-    33050, 34384, 36870, 19992, 20037, 20167, 20241, 21450, 21560, 23470,
-    [12088, 24339], 24613, 25937, 26429, 27714, 27762, 27875, 28792, 29699,
-    31350, 31406, 31496, 32026, 31998, 32102, 26087, [12124, 29275], 21435,
-    23621, 24040, 25298, 25312, 25369, 28192, 34394, 35377, 36317, 37624,
-    28417, 31142, [12226, 39770], 20136, {f: 2, c: 20139}, 20379, 20384, 20689,
-    20807, 31478, 20849, 20982, 21332, 21281, 21375, 21483, 21932, 22659,
-    23777, 24375, 24394, 24623, 24656, 24685, 25375, 25945, 27211, 27841,
-    29378, 29421, 30703, 33016, 33029, 33288, 34126, 37111, 37857, 38911,
-    39255, 39514, 20208, 20957, 23597, 26241, 26989, 23616, 26354, 26997,
-    [12127, 29577], 26704, 31873, 20677, 21220, 22343, [12081, 24062], 37670,
-    [12100, 26020], 27427, 27453, 29748, 31105, 31165, 31563, 32202, 33465,
-    33740, 34943, 35167, 35641, 36817, [12198, 37329], 21535, 37504, 20061,
-    20534, 21477, 21306, 29399, 29590, 30697, 33510, 36527, 39366, 39368,
-    39378, 20855, 24858, 34398, 21936, 31354, 20598, 23507, 36935, 38533,
-    20018, 27355, 37351, 23633, 23624, 25496, 31391, 27795, 38772, 36705,
-    31402, 29066, 38536, 31874, 26647, 32368, 26705, 37740, 21234, 21531,
-    34219, 35347, 32676, 36557, 37089, 21350, 34952, 31041, 20418, 20670,
-    21009, 20804, 21843, 22317, 29674, 22411, 22865, 24418, 24452, 24693,
-    24950, 24935, 25001, 25522, 25658, 25964, 26223, 26690, 28179, 30054,
-    31293, 31995, 32076, 32153, 32331, 32619, 33550, 33610, 34509, 35336,
-    35427, 35686, 36605, 38938, 40335, 33464, 36814, 39912, 21127, 25119,
-    25731, 28608, 38553, 26689, 20625, [12107, 27424], 27770, 28500,
-    [12147, 31348], 32080, [12174, 34880], 35363, [12105, 26376], 20214, 20537,
-    20518, 20581, 20860, 21048, 21091, 21927, 22287, 22533, 23244, 24314,
-    25010, 25080, 25331, 25458, 26908, 27177, 29309, [12125, 29356], 29486,
-    30740, 30831, 32121, 30476, 32937, [12178, 35211], 35609, 36066, 36562,
-    36963, 37749, 38522, 38997, 39443, 40568, 20803, 21407, 21427, 24187,
-    24358, 28187, 28304, [12126, 29572], 29694, 32067, 33335, [12180, 35328],
-    35578, 38480, 20046, 20491, 21476, 21628, 22266, 22993, 23396,
-    [12080, 24049], 24235, 24359, [12094, 25144], 25925, 26543, 28246, 29392,
-    31946, 34996, 32929, 32993, 33776, [11969, 34382], 35463, 36328, 37431,
-    38599, 39015, [12238, 40723], 20116, 20114, 20237, 21320, 21577, 21566,
-    23087, 24460, 24481, 24735, 26791, 27278, 29786, 30849, 35486, 35492,
-    35703, 37264, 20062, 39881, 20132, 20348, 20399, 20505, 20502, 20809,
-    20844, 21151, 21177, 21246, 21402, [12061, 21475], 21521, 21518, 21897,
-    22353, 22434, 22909, 23380, 23389, 23439, [12079, 24037], 24039, 24055,
-    24184, 24195, 24218, 24247, 24344, 24658, 24908, 25239, 25304, 25511,
-    25915, 26114, 26179, 26356, 26477, 26657, 26775, 27083, 27743, 27946,
-    28009, 28207, 28317, 30002, 30343, 30828, 31295, 31968, 32005, 32024,
-    32094, 32177, 32789, 32771, 32943, 32945, 33108, 33167, 33322, 33618,
-    [12175, 34892], 34913, 35611, 36002, 36092, 37066, 37237, 37489, 30783,
-    37628, 38308, 38477, 38917, [12217, 39321], [12220, 39640], 40251, 21083,
-    21163, 21495, 21512, 22741, 25335, 28640, 35946, 36703, 40633, 20811,
-    21051, 21578, 22269, 31296, 37239, 40288, [12234, 40658], 29508, 28425,
-    33136, 29969, 24573, 24794, [12219, 39592], 29403, 36796, 27492, 38915,
-    20170, 22256, 22372, 22718, 23130, 24680, 25031, 26127, 26118, 26681,
-    26801, 28151, 30165, 32058, [12169, 33390], 39746, 20123, 20304, 21449,
-    21766, 23919, 24038, 24046, 26619, 27801, 29811, 30722, 35408, 37782,
-    35039, 22352, 24231, 25387, 20661, 20652, 20877, 26368, 21705, 22622,
-    22971, 23472, 24425, 25165, 25505, 26685, 27507, 28168, 28797, 37319,
-    29312, 30741, 30758, 31085, 25998, 32048, 33756, 35009, 36617, 38555,
-    21092, 22312, 26448, 32618, 36001, 20916, 22338, 38442, 22586, 27018,
-    32948, 21682, 23822, 22524, 30869, 40442, 20316, 21066, 21643, 25662,
-    26152, 26388, 26613, 31364, 31574, 32034, 37679, 26716, 39853, 31545,
-    21273, 20874, 21047, 23519, 25334, 25774, 25830, 26413, 27578, 34217,
-    38609, 30352, 39894, 25420, 37638, 39851, [12139, 30399], 26194, 19977,
-    20632, 21442, [12077, 23665], 24808, 25746, 25955, 26719, 29158, 29642,
-    29987, 31639, 32386, 34453, 35715, 36059, 37240, 39184, 26028, 26283,
-    27531, 20181, 20180, 20282, 20351, 21050, 21496, 21490, 21987, 22235,
-    [12064, 22763], 22987, 22985, 23039, [12070, 23376], 23629, 24066, 24107,
-    24535, 24605, 25351, [12096, 25903], 23388, 26031, 26045, 26088, 26525,
-    [12108, 27490], 27515, [12114, 27663], 29509, 31049, 31169, [12151, 31992],
-    32025, 32043, 32930, 33026, [12164, 33267], 35222, 35422, 35433, 35430,
-    35468, 35566, 36039, 36060, 38604, 39164, [12013, 27503], 20107, 20284,
-    20365, 20816, 23383, 23546, 24904, 25345, 26178, 27425, 28363, 27835,
-    29246, 29885, 30164, 30913, [12144, 31034], [12157, 32780], [12159, 32819],
-    [12163, 33258], 33940, 36766, 27728, [12229, 40575], 24335, 35672, 40235,
-    31482, 36600, 23437, 38635, 19971, 21489, 22519, 22833, 23241, 23460,
-    24713, 28287, 28422, 30142, 36074, 23455, 34048, 31712, 20594, 26612,
-    33437, 23649, 34122, 32286, 33294, 20889, 23556, 25448, 36198, 26012,
-    29038, 31038, 32023, 32773, 35613, [12190, 36554], 36974, 34503, 37034,
-    20511, 21242, 23610, 26451, 28796, 29237, 37196, 37320, 37675, 33509,
-    23490, 24369, 24825, 20027, 21462, 23432, [12095, 25163], 26417, 27530,
-    29417, 29664, 31278, 33131, 36259, 37202, [12216, 39318], 20754, 21463,
-    21610, 23551, 25480, 27193, 32172, 38656, 22234, 21454, 21608, 23447,
-    23601, 24030, 20462, 24833, 25342, 27954, 31168, 31179, 32066, 32333,
-    32722, 33261, [12168, 33311], 33936, 34886, 35186, 35728, 36468, 36655,
-    36913, 37195, 37228, 38598, 37276, 20160, 20303, 20805, [12055, 21313],
-    24467, 25102, 26580, 27713, 28171, 29539, 32294, 37325, 37507, 21460,
-    22809, 23487, 28113, 31069, 32302, 31899, 22654, 29087, 20986, 34899,
-    36848, 20426, 23803, 26149, 30636, 31459, 33308, 39423, 20934, 24490,
-    26092, 26991, 27529, 28147, 28310, 28516, 30462, 32020, 24033, 36981,
-    37255, 38918, 20966, 21021, 25152, 26257, 26329, 28186, 24246, 32210,
-    32626, 26360, 34223, 34295, 35576, 21161, 21465, [12069, 22899], 24207,
-    24464, 24661, 37604, 38500, 20663, 20767, 21213, 21280, 21319, 21484,
-    21736, 21830, 21809, 22039, 22888, 22974, 23100, 23477, 23558,
-    [12073, 23567], 23569, 23578, 24196, 24202, 24288, 24432, 25215, 25220,
-    25307, 25484, 25463, 26119, 26124, 26157, 26230, 26494, 26786, 27167,
-    27189, 27836, 28040, 28169, 28248, 28988, 28966, 29031, 30151, 30465,
-    30813, 30977, 31077, 31216, 31456, 31505, 31911, 32057, 32918, 33750,
-    33931, 34121, 34909, 35059, 35359, 35388, 35412, 35443, 35937, 36062,
-    37284, 37478, 37758, 37912, 38556, 38808, 19978, 19976, 19998, 20055,
-    20887, 21104, 22478, 22580, 22732, 23330, 24120, 24773, 25854, 26465,
-    26454, 27972, 29366, 30067, 31331, 33976, 35698, 37304, 37664, 22065,
-    22516, 39166, 25325, 26893, 27542, 29165, 32340, 32887, [12170, 33394],
-    35302, [12215, 39135], 34645, 36785, 23611, 20280, 20449, 20405, 21767,
-    23072, 23517, 23529, [12092, 24515], 24910, 25391, 26032, 26187, 26862,
-    27035, 28024, 28145, 30003, 30137, 30495, 31070, 31206, 32051,
-    [12162, 33251], 33455, 34218, 35242, 35386, [12189, 36523], [12191, 36763],
-    36914, 37341, 38663, [12040, 20154], 20161, 20995, 22645, 22764, 23563,
-    29978, 23613, 33102, 35338, 36805, 38499, 38765, 31525, 35535, 38920,
-    37218, 22259, 21416, 36887, 21561, 22402, 24101, 25512, [12116, 27700],
-    28810, 30561, 31883, 32736, 34928, 36930, 37204, 37648, 37656, 38543,
-    29790, 39620, 23815, 23913, 25968, 26530, 36264, 38619, 25454, 26441,
-    26905, 33733, 38935, 38592, 35070, 28548, 25722, [12072, 23544], 19990,
-    28716, 30045, 26159, 20932, 21046, 21218, 22995, 24449, 24615, 25104,
-    25919, 25972, 26143, 26228, 26866, 26646, 27491, 28165, 29298,
-    [12131, 29983], 30427, 31934, 32854, 22768, 35069, [11972, 35199], 35488,
-    35475, 35531, 36893, 37266, [11992, 38738], 38745, [12011, 25993], 31246,
-    33030, 38587, 24109, 24796, 25114, 26021, 26132, 26512, [12143, 30707],
-    31309, 31821, 32318, 33034, 36012, [12186, 36196], 36321, 36447, 30889,
-    20999, 25305, 25509, 25666, 25240, 35373, 31363, 31680, 35500, 38634,
-    32118, [12166, 33292], 34633, 20185, 20808, 21315, 21344, 23459, 23554,
-    23574, 24029, 25126, 25159, 25776, 26643, 26676, 27849, 27973, 27927,
-    26579, 28508, 29006, 29053, 26059, 31359, 31661, 32218, 32330, 32680,
-    33146, [12167, 33307], 33337, 34214, 35438, 36046, 36341, 36984, 36983,
-    37549, 37521, 38275, 39854, 21069, 21892, 28472, 28982, 20840, 31109,
-    32341, 33203, 31950, 22092, 22609, 23720, 25514, 26366, 26365, 26970,
-    29401, 30095, 30094, 30990, 31062, 31199, 31895, 32032, 32068, 34311,
-    35380, 38459, 36961, [12239, 40736], 20711, 21109, 21452, 21474, 20489,
-    21930, 22766, 22863, 29245, 23435, 23652, 21277, 24803, 24819, 25436,
-    25475, 25407, 25531, 25805, 26089, 26361, 24035, 27085, 27133, 28437,
-    29157, 20105, 30185, 30456, 31379, 31967, 32207, 32156, 32865, 33609,
-    33624, 33900, 33980, 34299, 35013, [12187, 36208], 36865, 36973, 37783,
-    38684, 39442, 20687, 22679, 24974, 33235, 34101, 36104, 36896, 20419,
-    20596, 21063, 21363, 24687, 25417, 26463, 28204, [12188, 36275], 36895,
-    20439, 23646, 36042, 26063, 32154, 21330, 34966, 20854, 25539, 23384,
-    23403, 23562, 25613, 26449, 36956, 20182, 22810, 22826, 27760, 35409,
-    21822, 22549, 22949, 24816, 25171, 26561, 33333, 26965, 38464, 39364,
-    39464, 20307, 22534, 23550, 32784, 23729, 24111, 24453, 24608, 24907,
-    25140, 26367, 27888, 28382, 32974, 33151, 33492, 34955, 36024, 36864,
-    36910, 38538, 40667, 39899, 20195, 21488, [12068, 22823], 31532, 37261,
-    38988, 40441, 28381, 28711, 21331, 21828, 23429, 25176, 25246, 25299,
-    27810, 28655, 29730, 35351, 37944, 28609, 35582, 33592, 20967, 34552,
-    21482, 21481, 20294, 36948, [12192, 36784], 22890, 33073, 24061, 31466,
-    36799, 26842, [12181, 35895], 29432, 40008, 27197, 35504, 20025, 21336,
-    22022, 22374, 25285, 25506, 26086, 27470, 28129, 28251, 28845, 30701,
-    31471, 31658, 32187, 32829, 32966, 34507, 35477, 37723, 22243, 22727,
-    24382, 26029, 26262, 27264, 27573, 30007, 35527, 20516, 30693, 22320,
-    24347, 24677, 26234, 27744, 30196, 31258, 32622, 33268, 34584, 36933,
-    39347, 31689, 30044, [12149, 31481], 31569, 33988, 36880, 31209, 31378,
-    33590, 23265, 30528, 20013, 20210, 23449, 24544, 25277, 26172, 26609,
-    27880, [12173, 34411], 34935, 35387, 37198, 37619, 39376, 27159, 28710,
-    29482, 33511, 33879, 36015, 19969, 20806, 20939, 21899, 23541, 24086,
-    24115, 24193, 24340, 24373, 24427, 24500, 25074, 25361, 26274, 26397,
-    28526, 29266, 30010, 30522, 32884, 33081, 33144, 34678, 35519, 35548,
-    36229, 36339, 37530, [11985, 12199, 38263], 38914, [12227, 40165], 21189,
-    25431, 30452, 26389, 27784, 29645, 36035, 37806, 38515, 27941, 22684,
-    26894, 27084, 36861, 37786, 30171, 36890, 22618, 26626, 25524, 27131,
-    20291, 28460, 26584, 36795, 34086, 32180, 37716, 26943, 28528, 22378,
-    22775, 23340, 32044, [12118, 29226], 21514, 37347, 40372, 20141, 20302,
-    20572, 20597, 21059, 35998, 21576, 22564, 23450, 24093, 24213, 24237,
-    24311, 24351, 24716, 25269, 25402, 25552, 26799, 27712, 30855, 31118,
-    31243, 32224, 33351, 35330, 35558, 36420, 36883, 37048, 37165, 37336,
-    [12237, 40718], 27877, 25688, 25826, 25973, 28404, 30340, 31515, 36969,
-    37841, 28346, 21746, 24505, 25764, 36685, 36845, 37444, 20856, 22635,
-    22825, 23637, 24215, 28155, 32399, 29980, 36028, 36578, 39003, 28857,
-    20253, 27583, 28593, [12133, 30000], 38651, 20814, 21520, 22581, 22615,
-    22956, 23648, 24466, [12099, 26007], 26460, 28193, 30331, 33759, 36077,
-    36884, 37117, 37709, 30757, 30778, 21162, 24230, [12063, 22303], 22900,
-    24594, 20498, 20826, 20908, 20941, [12049, 20992], 21776, 22612, 22616,
-    22871, 23445, 23798, 23947, 24764, 25237, 25645, 26481, 26691, 26812,
-    26847, 30423, 28120, 28271, 28059, 28783, 29128, 24403, 30168, 31095,
-    31561, 31572, 31570, 31958, 32113, 21040, 33891, 34153, 34276, 35342,
-    35588, [12182, 35910], 36367, 36867, 36879, 37913, 38518, 38957, 39472,
-    38360, 20685, 21205, 21516, 22530, 23566, 24999, 25758, 27934, 30643,
-    31461, 33012, 33796, 36947, 37509, 23776, 40199, 21311, 24471, 24499,
-    28060, 29305, 30563, 31167, 31716, 27602, 29420, 35501, 26627, 27233,
-    20984, 31361, 26932, 23626, 40182, 33515, 23493, [12195, 37193], 28702,
-    22136, 23663, 24775, 25958, 27788, 35930, 36929, 38931, 21585, 26311,
-    37389, 22856, 37027, 20869, 20045, 20970, 34201, 35598, 28760, 25466,
-    37707, 26978, 39348, 32260, 30071, 21335, 26976, 36575, 38627, 27741,
-    [12038, 20108], 23612, 24336, 36841, 21250, 36049, [12161, 32905], 34425,
-    24319, [12103, 26085], 20083, [12042, 20837], 22914, 23615, 38894, 20219,
-    22922, 24525, 35469, 28641, 31152, 31074, 23527, 33905, 29483, 29105,
-    24180, 24565, 25467, 25754, 29123, 31896, 20035, 24316, 20043, 22492,
-    22178, 24745, 28611, 32013, 33021, 33075, 33215, 36786, 35223, 34468,
-    24052, 25226, 25773, 35207, 26487, 27874, 27966, 29750, 30772, 23110,
-    32629, 33453, [12218, 39340], 20467, 24259, 25309, 25490, 25943, 26479,
-    30403, 29260, 32972, 32954, 36649, 37197, 20493, 22521, 23186, 26757,
-    26995, 29028, 29437, 36023, 22770, 36064, 38506, 36889, 34687, 31204,
-    30695, 33833, 20271, 21093, 21338, 25293, 26575, 27850, [12137, 30333],
-    31636, 31893, 33334, 34180, 36843, 26333, 28448, 29190, 32283, 33707,
-    39361, [12008, 40614], 20989, 31665, 30834, 31672, 32903, 31560, 27368,
-    24161, 32908, 30033, 30048, [12043, 20843], 37474, 28300, 30330, 37271,
-    39658, 20240, 32624, 25244, 31567, 38309, 40169, 22138, 22617, 34532,
-    38588, 20276, 21028, 21322, 21453, 21467, 24070, 25644, 26001, 26495,
-    27710, 27726, 29256, 29359, 29677, 30036, 32321, 33324, 34281, 36009,
-    31684, [12196, 37318], 29033, 38930, 39151, 25405, 26217, 30058, 30436,
-    30928, 34115, 34542, 21290, 21329, 21542, 22915, 24199, 24444, 24754,
-    25161, 25209, 25259, 26000, [12112, 27604], 27852, 30130, [12138, 30382],
-    30865, 31192, 32203, 32631, 32933, 34987, 35513, 36027, 36991,
-    [12206, 38750], [12214, 39131], 27147, 31800, 20633, 23614, 24494, 26503,
-    27608, 29749, 30473, 32654, [12240, 40763], 26570, 31255, 21305,
-    [12134, 30091], 39661, 24422, 33181, 33777, 32920, 24380, 24517, 30050,
-    31558, 36924, 26727, 23019, 23195, 32016, 30334, 35628, 20469, 24426,
-    27161, 27703, 28418, 29922, 31080, 34920, 35413, 35961, 24287, 25551,
-    30149, 31186, 33495, 37672, 37618, 33948, 34541, 39981, 21697, 24428,
-    25996, 27996, 28693, 36007, 36051, 38971, 25935, 29942, 19981, 20184,
-    22496, 22827, 23142, 23500, 20904, 24067, 24220, 24598, 25206, 25975,
-    26023, 26222, 28014, [12119, 29238], 31526, 33104, 33178, 33433, 35676,
-    36000, 36070, 36212, [12201, 38428], 38468, 20398, 25771, 27494, 33310,
-    33889, 34154, 37096, 23553, 26963, [12213, 39080], 33914, 34135, 20239,
-    21103, 24489, 24133, 26381, 31119, 33145, 35079, 35206, 28149, 24343,
-    25173, 27832, 20175, 29289, 39826, 20998, 21563, 22132, 22707, 24996,
-    25198, 28954, 22894, 31881, 31966, 32027, 38640, [12098, 25991], 32862,
-    19993, 20341, 20853, 22592, 24163, 24179, 24330, 26564, 20006, 34109,
-    38281, 38491, [12150, 31859], [12212, 38913], 20731, 22721, 30294, 30887,
-    21029, 30629, 34065, 31622, 20559, 22793, [12122, 29255], 31687, 32232,
-    36794, 36820, 36941, 20415, 21193, 23081, 24321, 38829, 20445, 33303,
-    37610, 22275, 25429, 27497, 29995, 35036, 36628, 31298, 21215, 22675,
-    24917, 25098, 26286, [11935, 27597], 31807, 33769, 20515, 20472, 21253,
-    21574, 22577, 22857, 23453, 23792, 23791, 23849, 24214, 25265, 25447,
-    25918, [12101, 26041], 26379, 27861, 27873, 28921, 30770, 32299, 32990,
-    33459, 33804, 34028, 34562, 35090, 35370, 35914, 37030, 37586, 39165,
-    40179, 40300, 20047, 20129, 20621, 21078, 22346, 22952, 24125,
-    {f: 2, c: 24536}, 25151, 26292, 26395, 26576, 26834, 20882, 32033, 32938,
-    33192, 35584, 35980, 36031, 37502, 38450, 21536, 38956, 21271, 20693,
-    [12056, 21340], 22696, 25778, 26420, 29287, 30566, 31302, 37350, 21187,
-    27809, 27526, 22528, 24140, 22868, 26412, 32763, 20961, 30406, 25705,
-    30952, 39764, [12231, 40635], 22475, 22969, 26151, 26522, 27598, 21737,
-    27097, 24149, 33180, 26517, 39850, 26622, 40018, 26717, 20134, 20451,
-    [12060, 21448], 25273, 26411, 27819, 36804, 20397, 32365, 40639, 19975,
-    24930, 28288, 28459, 34067, 21619, 26410, 39749, [11922, 24051], 31637,
-    23724, 23494, 34588, 28234, 34001, 31252, 33032, 22937, 31885,
-    [11936, 27665], 30496, 21209, 22818, 28961, 29279, [12141, 30683], 38695,
-    40289, 26891, 23167, 23064, 20901, 21517, 21629, 26126, 30431, 36855,
-    37528, 40180, 23018, 29277, 28357, 20813, 26825, 32191, 32236,
-    [12207, 38754], 40634, 25720, 27169, 33538, 22916, 23391, [12113, 27611],
-    29467, 30450, 32178, 32791, 33945, 20786, [12106, 26408], 40665,
-    [12140, 30446], 26466, 21247, 39173, 23588, 25147, 31870, 36016, 21839,
-    24758, 32011, [12200, 38272], 21249, 20063, 20918, 22812, 29242, 32822,
-    37326, 24357, [12142, 30690], 21380, 24441, 32004, 34220, 35379, 36493,
-    38742, 26611, 34222, 37971, 24841, 24840, 27833, 30290, 35565, 36664,
-    21807, 20305, 20778, 21191, 21451, 23461, 24189, 24736, 24962, 25558,
-    26377, 26586, 28263, 28044, {f: 2, c: 29494}, 30001, 31056, 35029, 35480,
-    36938, [12194, 37009], 37109, 38596, 34701, [12067, 22805], 20104, 20313,
-    19982, 35465, 36671, 38928, 20653, 24188, 22934, 23481, 24248, 25562,
-    25594, 25793, 26332, 26954, 27096, 27915, 28342, 29076, [12132, 29992],
-    31407, [12154, 32650], 32768, 33865, 33993, 35201, 35617, 36362, 36965,
-    38525, 39178, 24958, 25233, 27442, 27779, 28020, 32716, 32764, 28096,
-    32645, 34746, 35064, 26469, 33713, 38972, 38647, 27931, 32097, 33853,
-    37226, 20081, 21365, 23888, 27396, 28651, 34253, 34349, 35239, 21033,
-    21519, 23653, 26446, 26792, 29702, 29827, 30178, 35023, 35041,
-    [12197, 37324], 38626, 38520, 24459, 29575, [12148, 31435], 33870, 25504,
-    30053, 21129, 27969, 28316, 29705, 30041, 30827, 31890, 38534,
-    [12015, 31452], [12243, 40845], 20406, 24942, 26053, 34396, 20102, 20142,
-    20698, 20001, 20940, 23534, 26009, 26753, 28092, 29471, 30274, 30637,
-    31260, 31975, 33391, 35538, 36988, 37327, 38517, 38936, [12050, 21147],
-    32209, 20523, 21400, 26519, 28107, 29136, 29747, 33256, 36650, 38563,
-    40023, 40607, 29792, 22593, 28057, 32047, 39006, 20196, 20278, 20363,
-    20919, 21169, 23994, 24604, 29618, 31036, 33491, 37428, 38583, 38646,
-    38666, 40599, 40802, 26278, 27508, 21015, 21155, 28872, 35010, 24265,
-    24651, 24976, 28451, 29001, 31806, 32244, 32879, 34030, 36899, 37676,
-    21570, 39791, 27347, 28809, 36034, 36335, 38706, 21172, 23105, 24266,
-    24324, 26391, 27004, 27028, 28010, 28431, 29282, 29436, 31725,
-    [12156, 32769], 32894, 34635, 37070, 20845, 40595, 31108, 32907, 37682,
-    35542, 20525, 21644, 35441, 27498, 36036, 33031, 24785, 26528, 40434,
-    20121, 20120, 39952, 35435, 34241, 34152, 26880, 28286, 30871, 33109,
-    24332, 19984, 19989, 20010, 20017, [12034, 20022], 20028, [12035, 20031],
-    20034, 20054, 20056, 20098, [12037, 20101], 35947, 20106, 33298, 24333,
-    20110, {f: 2, c: 20126}, [12039, 20128], 20130, 20144, 20147, 20150, 20174,
-    20173, 20164, 20166, 20162, 20183, 20190, 20205, 20191, 20215, 20233,
-    20314, 20272, 20315, 20317, 20311, 20295, 20342, 20360, 20367, 20376,
-    20347, 20329, 20336, 20369, 20335, 20358, 20374, 20760, 20436, 20447,
-    20430, 20440, 20443, 20433, 20442, 20432, {f: 2, c: 20452}, 20506, 20520,
-    20500, 20522, 20517, 20485, 20252, 20470, 20513, 20521, 20524, 20478,
-    20463, 20497, 20486, 20547, 20551, 26371, 20565, 20560, 20552, 20570,
-    20566, 20588, 20600, 20608, 20634, 20613, 20660, 20658, {f: 2, c: 20681},
-    20659, 20674, 20694, 20702, 20709, 20717, 20707, 20718, 20729, 20725,
-    20745, {f: 2, c: 20737}, 20758, 20757, 20756, 20762, 20769, 20794, 20791,
-    20796, 20795, [12041, 20799], [11918, 20800], 20818, 20812, 20820, 20834,
-    31480, {f: 2, c: 20841}, 20846, 20864, [12044, 20866], 22232, 20876, 20873,
-    20879, 20881, 20883, 20885, [12045, 20886], 20900, 20902, 20898,
-    {f: 2, c: 20905}, [12046, 20907], 20915, {f: 2, c: 20913}, 20912, 20917,
-    20925, 20933, 20937, 20955, [12047, 20960], 34389, 20969, 20973, 20976,
-    [12048, 20981], 20990, 20996, 21003, 21012, 21006, 21031, 21034, 21038,
-    21043, 21049, 21071, 21060, {f: 2, c: 21067}, 21086, 21076, 21098, 21108,
-    21097, 21107, 21119, 21117, 21133, 21140, 21138, 21105, 21128, 21137,
-    36776, 36775, {f: 2, c: 21164}, 21180, 21173, 21185, 21197, 21207, 21214,
-    21219, 21222, 39149, 21216, 21235, 21237, 21240, [12051, 21241], 21254,
-    21256, 30008, 21261, 21264, 21263, [12052, 21269], [12053, 21274], 21283,
-    21295, 21297, 21299, [12054, 21304], 21312, 21318, 21317, 19991, 21321,
-    21325, 20950, 21342, [12057, 21353], 21358, 22808, 21371, 21367,
-    [12058, 21378], 21398, 21408, 21414, 21413, 21422, 21424, [12059, 21430],
-    21443, 31762, 38617, 21471, 26364, 29166, 21486, 21480, 21485, 21498,
-    21505, 21565, 21568, {f: 2, c: 21548}, 21564, 21550, 21558, 21545, 21533,
-    21582, 21647, 21621, 21646, 21599, 21617, 21623, 21616, 21650, 21627,
-    21632, 21622, 21636, 21648, 21638, 21703, 21666, 21688, 21669, 21676,
-    21700, 21704, 21672, 21675, 21698, 21668, 21694, 21692, 21720,
-    {f: 2, c: 21733}, 21775, 21780, 21757, 21742, 21741, 21754, 21730, 21817,
-    21824, 21859, 21836, 21806, 21852, 21829, {f: 2, c: 21846}, 21816, 21811,
-    21853, 21913, 21888, 21679, 21898, 21919, 21883, 21886, 21912, 21918,
-    21934, 21884, 21891, 21929, 21895, 21928, 21978, 21957, 21983, 21956,
-    21980, 21988, 21972, 22036, 22007, 22038, 22014, 22013, 22043, 22009,
-    22094, 22096, 29151, 22068, 22070, 22066, 22072, 22123, 22116, 22063,
-    22124, 22122, 22150, 22144, 22154, 22176, 22164, 22159, 22181, 22190,
-    22198, 22196, 22210, 22204, 22209, 22211, 22208, 22216, 22222, 22225,
-    22227, [12062, 22231], 22254, 22265, 22272, 22271, 22276, 22281, 22280,
-    22283, 22285, 22291, 22296, 22294, 21959, 22300, 22310, {f: 2, c: 22327},
-    22350, 22331, 22336, 22351, 22377, 22464, 22408, 22369, 22399, 22409,
-    22419, 22432, 22451, 22436, 22442, 22448, 22467, 22470, 22484,
-    {f: 2, c: 22482}, 22538, 22486, 22499, 22539, 22553, 22557, 22642, 22561,
-    22626, 22603, 22640, 27584, 22610, 22589, 22649, 22661, 22713, 22687,
-    22699, 22714, 22750, 22715, 22712, 22702, 22725, 22739, 22737, 22743,
-    22745, 22744, 22757, 22748, 22756, 22751, 22767, 22778, 22777,
-    {f: 3, c: 22779}, [12065, 22786], [12066, 22794], 22800, 22811, 26790,
-    22821, {f: 2, c: 22828}, 22834, 22840, 22846, 31442, 22869, 22864, 22862,
-    22874, 22872, 22882, 22880, 22887, 22892, 22889, 22904, 22913, 22941,
-    20318, 20395, 22947, 22962, 22982, 23016, 23004, 22925, {f: 2, c: 23001},
-    23077, 23071, 23057, 23068, 23049, 23066, 23104, 23148, 23113,
-    {f: 2, c: 23093}, 23138, 23146, 23194, 23228, 23230, 23243, 23234, 23229,
-    23267, 23255, 23270, 23273, 23254, {f: 2, c: 23290}, 23308, 23307, 23318,
-    23346, 23248, 23338, 23350, 23358, 23363, 23365, 23360, 23377, 23381,
-    {f: 2, c: 23386}, 23397, 23401, 23408, 23411, 23413, 23416, 25992, 23418,
-    [12071, 23424], 23427, 23462, 23480, 23491, 23495, 23497, 23508, 23504,
-    23524, 23526, 23522, 23518, 23525, 23531, 23536, 23542, 23539, 23557,
-    {f: 2, c: 23559}, 23565, 23571, 23584, [11920, 12074, 23586], 23592,
-    [12075, 23608], 23609, 23617, 23622, 23630, 23635, 23632, 23631, 23409,
-    23660, [12076, 23662], 20066, 23670, 23673, 23692, 23697, 23700, 22939,
-    23723, 23739, 23734, 23740, 23735, 23749, 23742, 23751, 23769, 23785,
-    23805, 23802, 23789, 23948, 23786, 23819, 23829, 23831, 23900, 23839,
-    23835, 23825, 23828, 23842, 23834, 23833, 23832, 23884, 23890, 23886,
-    23883, 23916, 23923, 23926, 23943, 23940, 23938, 23970, 23965, 23980,
-    23982, 23997, 23952, 23991, 23996, 24009, 24013, 24019, 24018, 24022,
-    [12078, 24027], 24043, 24050, 24053, 24075, 24090, 24089, 24081, 24091,
-    {f: 2, c: 24118}, 24132, 24131, 24128, 24142, 24151, 24148, 24159, 24162,
-    24164, 24135, {f: 2, c: 24181}, [11923, 12083, 24186], 40636,
-    [12084, 24191], 24224, {f: 2, c: 24257}, 24264, 24272, 24271, 24278, 24291,
-    24285, {f: 2, c: 24282}, 24290, 24289, {f: 2, c: 24296}, 24300, 24305,
-    24307, 24304, [12085, 24308], 24312, [12086, 24318], 24323, 24329, 24413,
-    24412, [12087, 24331], 24337, 24342, 24361, 24365, 24376, 24385, 24392,
-    24396, 24398, 24367, [11924, 24401], {f: 2, c: 24406}, 24409,
-    [12090, 24417], 24429, [12091, 24435], 24439, 24451, 24450, 24447, 24458,
-    24456, 24465, 24455, 24478, 24473, 24472, 24480, 24488, 24493, 24508,
-    24534, 24571, 24548, 24568, 24561, 24541, 24755, 24575, 24609, 24672,
-    24601, 24592, 24617, 24590, 24625, 24603, 24597, 24619, 24614, 24591,
-    24634, 24666, 24641, 24682, 24695, 24671, 24650, 24646, 24653, 24675,
-    24643, 24676, 24642, 24684, 24683, 24665, 24705, 24717, 24807, 24707,
-    24730, 24708, 24731, {f: 2, c: 24726}, 24722, 24743, 24715, 24801, 24760,
-    24800, 24787, 24756, 24560, 24765, 24774, 24757, 24792, 24909, 24853,
-    24838, {f: 2, c: 24822}, 24832, 24820, 24826, 24835, 24865, 24827, 24817,
-    {f: 2, c: 24845}, 24903, 24894, 24872, 24871, 24906, 24895, 24892, 24876,
-    24884, 24893, 24898, 24900, 24947, 24951, {f: 3, c: 24920}, 24939, 24948,
-    24943, 24933, 24945, 24927, 24925, 24915, 24949, 24985, 24982, 24967,
-    25004, 24980, 24986, 24970, 24977, 25003, 25006, 25036, 25034, 25033,
-    25079, 25032, 25027, 25030, 25018, 25035, 32633, 25037, 25062, 25059,
-    25078, 25082, 25076, 25087, 25085, 25084, 25086, 25088, [12093, 25096],
-    25097, 25101, 25100, 25108, 25115, 25118, 25121, 25130, 25134, 25136,
-    {f: 2, c: 25138}, 25153, 25166, 25182, 25187, 25179, 25184, 25192, 25212,
-    25218, 25225, 25214, {f: 2, c: 25234}, 25238, 25300, 25219, 25236, 25303,
-    25297, 25275, 25295, 25343, 25286, 25812, 25288, 25308, 25292, 25290,
-    25282, 25287, 25243, 25289, 25356, 25326, 25329, 25383, 25346, 25352,
-    25327, 25333, 25424, 25406, 25421, 25628, 25423, 25494, 25486, 25472,
-    25515, 25462, 25507, 25487, 25481, 25503, 25525, 25451, 25449, 25534,
-    25577, 25536, 25542, 25571, 25545, 25554, 25590, 25540, 25622, 25652,
-    25606, 25619, 25638, 25654, 25885, 25623, 25640, 25615, 25703, 25711,
-    25718, 25678, 25898, 25749, 25747, 25765, 25769, 25736, 25788, 25818,
-    25810, 25797, 25799, 25787, 25816, 25794, 25841, 25831, 33289,
-    {f: 2, c: 25824}, 25260, 25827, 25839, 25900, 25846, 25844, 25842, 25850,
-    25856, 25853, 25880, 25884, 25861, 25892, 25891, 25899, [12097, 25908],
-    [11929, 25909], 25911, 25910, 25912, 30027, 25928, 25942, 25941, 25933,
-    25944, 25950, 25949, 25970, 25976, {f: 2, c: 25986}, 35722, 26011, 26015,
-    26027, 26039, 26051, 26054, 26049, 26052, 26060, 26066, 26075, 26073,
-    [12102, 26080], [11931, 26081], 26097, 26482, 26122, 26115, 26107, 26483,
-    {f: 2, c: 26165}, 26164, 26140, 26191, 26180, 26185, 26177, 26206, 26205,
-    26212, {f: 2, c: 26215}, 26207, 26210, 26224, 26243, 26248, 26254, 26249,
-    26244, 26264, 26269, 26305, 26297, 26313, 26302, 26300, 26308, 26296,
-    26326, 26330, 26336, 26175, 26342, 26345, [12104, 26352], 26357, 26359,
-    26383, 26390, 26398, {f: 2, c: 26406}, 38712, 26414, 26431, 26422, 26433,
-    26424, 26423, 26438, 26462, 26464, 26457, {f: 2, c: 26467}, 26505, 26480,
-    26537, 26492, 26474, 26508, 26507, 26534, 26529, 26501, 26551, 26607,
-    26548, 26604, 26547, 26601, 26552, 26596, 26590, 26589, 26594, 26606,
-    26553, 26574, 26566, 26599, 27292, 26654, 26694, 26665, 26688, 26701,
-    26674, 26702, 26803, 26667, 26713, 26723, 26743, 26751, 26783, 26767,
-    26797, 26772, 26781, 26779, 26755, 27310, 26809, 26740, 26805, 26784,
-    26810, 26895, 26765, 26750, 26881, 26826, 26888, 26840, 26914, 26918,
-    26849, 26892, 26829, 26836, 26855, 26837, 26934, 26898, 26884, 26839,
-    26851, 26917, 26873, 26848, 26863, 26920, 26922, 26906, 26915, 26913,
-    26822, 27001, 26999, 26972, 27000, 26987, 26964, 27006, 26990, 26937,
-    26996, 26941, 26969, 26928, 26977, 26974, 26973, 27009, 26986, 27058,
-    27054, 27088, 27071, 27073, 27091, 27070, 27086, 23528, 27082, 27101,
-    27067, 27075, 27047, 27182, 27025, 27040, 27036, 27029, 27060, 27102,
-    27112, 27138, 27163, 27135, 27402, 27129, 27122, 27111, 27141, 27057,
-    27166, 27117, 27156, 27115, 27146, 27154, 27329, 27171, 27155, 27204,
-    27148, 27250, 27190, 27256, 27207, 27234, 27225, 27238, 27208, 27192,
-    27170, 27280, 27277, 27296, 27268, {f: 2, c: 27298}, 27287, 34327, 27323,
-    27331, 27330, 27320, 27315, 27308, 27358, 27345, 27359, 27306, 27354,
-    27370, 27387, 27397, 34326, 27386, 27410, 27414, 39729, 27423, 27448,
-    27447, 30428, 27449, 39150, 27463, 27459, 27465, 27472, 27481, 27476,
-    27483, 27487, 27489, 27512, [12109, 27513], {f: 2, c: 27519}, 27524, 27523,
-    27533, 27544, 27541, 27550, 27556, {f: 2, c: 27562}, 27567, 27570, 27569,
-    [12110, 27571], 27575, 27580, 27590, [12111, 27595], 27603, 27615, 27628,
-    27627, 27635, 27631, 40638, 27656, 27667, [12115, 27668], 27675, 27684,
-    27683, 27742, 27733, 27746, 27754, 27778, 27789, 27802, 27777, 27803,
-    27774, 27752, 27763, 27794, 27792, 27844, 27889, 27859, 27837, 27863,
-    27845, 27869, 27822, 27825, 27838, 27834, 27867, 27887, 27865, 27882,
-    27935, 34893, 27958, 27947, 27965, 27960, 27929, 27957, 27955, 27922,
-    27916, 28003, 28051, 28004, 27994, 28025, 27993, 28046, 28053, 28644,
-    28037, 28153, 28181, 28170, 28085, 28103, 28134, 28088, 28102, 28140,
-    28126, 28108, 28136, 28114, 28101, 28154, 28121, 28132, 28117, 28138,
-    28142, 28205, 28270, 28206, 28185, 28274, 28255, 28222, 28195, 28267,
-    28203, 28278, 28237, 28191, 28227, 28218, 28238, 28196, 28415, 28189,
-    28216, 28290, 28330, 28312, 28361, 28343, 28371, 28349, 28335, 28356,
-    28338, {f: 2, c: 28372}, 28303, 28325, 28354, 28319, 28481, 28433, 28748,
-    28396, 28408, 28414, 28479, 28402, 28465, 28399, 28466, 28364, 28478,
-    28435, 28407, 28550, 28538, 28536, 28545, 28544, 28527, 28507, 28659,
-    28525, 28546, 28540, 28504, 28558, 28561, 28610, 28518, 28595, 28579,
-    28577, 28580, 28601, 28614, 28586, 28639, 28629, 28652, 28628, 28632,
-    28657, 28654, 28635, 28681, 28683, 28666, 28689, 28673, 28687, 28670,
-    28699, 28698, 28532, 28701, 28696, 28703, 28720, 28734, 28722, 28753,
-    28771, 28825, 28818, 28847, 28913, 28844, 28856, 28851, 28846, 28895,
-    28875, 28893, 28889, 28937, 28925, 28956, 28953, 29029, 29013, 29064,
-    29030, 29026, 29004, 29014, 29036, 29071, 29179, 29060, 29077, 29096,
-    29100, 29143, 29113, 29118, 29138, 29129, 29140, 29134, 29152, 29164,
-    29159, 29173, 29180, 29177, 29183, 29197, 29200, 29211, 29224, 29229,
-    29228, 29232, 29234, [12120, 29243], 29244, [12121, 29247], 29248, 29254,
-    29259, 29272, 29300, 29310, 29314, 29313, 29319, 29330, 29334, 29346,
-    29351, 29369, 29362, 29379, 29382, 29380, 29390, 29394, 29410,
-    {f: 2, c: 29408}, 29433, 29431, 20495, 29463, 29450, 29468, 29462, 29469,
-    29492, 29487, 29481, 29477, 29502, {f: 2, c: 29518}, 40664, 29527, 29546,
-    29544, 29552, 29560, 29557, 29563, 29562, 29640, 29619, 29646, 29627,
-    29632, 29669, 29678, 29662, 29858, 29701, 29807, 29733, 29688, 29746,
-    29754, 29781, 29759, 29791, 29785, 29761, 29788, 29801, 29808, 29795,
-    29802, 29814, 29822, 29835, 29854, 29863, 29898, 29903, 29908, 29681,
-    29920, 29923, 29927, 29929, 29934, 29938, {f: 2, c: 29936}, 29944, 29943,
-    29956, 29955, 29957, 29964, 29966, 29965, 29973, 29971, 29982, 29990,
-    29996, 30012, 30020, 30029, 30026, 30025, 30043, 30022, 30042, 30057,
-    30052, 30055, 30059, 30061, 30072, 30070, {f: 2, c: 30086}, 30068, 30090,
-    30089, 30082, 30100, 30106, 30109, 30117, 30115, 30146, 30131, 30147,
-    30133, 30141, 30136, 30140, 30129, 30157, 30154, 30162, 30169, 30179,
-    30174, {f: 2, c: 30206}, 30204, 30209, 30192, 30202, {f: 2, c: 30194},
-    30219, 30221, 30217, 30239, 30247, {f: 3, c: 30240}, 30244, 30260, 30256,
-    30267, {f: 2, c: 30279}, 30278, 30300, 30296, {f: 2, c: 30305},
-    {f: 3, c: 30312}, 30311, 30316, 30320, 30322, [12136, 30326], 30328, 30332,
-    30336, 30339, 30344, 30347, 30350, 30358, 30355, {f: 2, c: 30361}, 30384,
-    30388, {f: 3, c: 30392}, 30402, 30413, 30422, 30418, 30430, 30433, 30437,
-    30439, 30442, 34351, 30459, 30472, 30471, 30468, 30505, 30500, 30494,
-    {f: 2, c: 30501}, 30491, {f: 2, c: 30519}, 30535, 30554, 30568, 30571,
-    30555, 30565, 30591, 30590, 30585, 30606, 30603, 30609, 30624, 30622,
-    30640, 30646, 30649, 30655, {f: 2, c: 30652}, 30651, 30663, 30669, 30679,
-    30682, 30684, 30691, 30702, 30716, 30732, 30738, 31014, 30752, 31018,
-    30789, 30862, 30836, 30854, 30844, 30874, 30860, 30883, 30901, 30890,
-    30895, 30929, 30918, 30923, 30932, 30910, 30908, 30917, 30922, 30956,
-    30951, 30938, 30973, 30964, 30983, 30994, 30993, 31001, 31020, 31019,
-    31040, 31072, 31063, 31071, 31066, 31061, 31059, 31098, 31103, 31114,
-    31133, 31143, 40779, 31146, 31150, 31155, {f: 2, c: 31161}, 31177, 31189,
-    31207, 31212, 31201, 31203, 31240, 31245, {f: 2, c: 31256}, 31264, 31263,
-    31104, 31281, 31291, 31294, 31287, 31299, 31319, 31305, {f: 2, c: 31329},
-    31337, 40861, 31344, 31353, 31357, 31368, 31383, 31381, 31384, 31382,
-    31401, 31432, 31408, 31414, 31429, 31428, 31423, 36995, 31431, 31434,
-    31437, 31439, 31445, 31443, {f: 2, c: 31449}, 31453, {f: 2, c: 31457},
-    31462, 31469, 31472, 31490, 31503, 31498, 31494, 31539, {f: 2, c: 31512},
-    31518, 31541, 31528, 31542, 31568, 31610, 31492, 31565, 31499, 31564,
-    31557, 31605, 31589, 31604, 31591, {f: 2, c: 31600}, 31596, 31598, 31645,
-    31640, 31647, 31629, 31644, 31642, 31627, 31634, 31631, 31581, 31641,
-    31691, 31681, 31692, 31695, 31668, 31686, 31709, 31721, 31761, 31764,
-    31718, 31717, 31840, 31744, 31751, 31763, 31731, 31735, 31767, 31757,
-    31734, 31779, 31783, 31786, 31775, 31799, 31787, 31805, 31820, 31811,
-    31828, 31823, 31808, 31824, 31832, 31839, 31844, 31830, 31845, 31852,
-    31861, 31875, 31888, 31908, 31917, 31906, 31915, 31905, 31912, 31923,
-    31922, 31921, 31918, 31929, 31933, 31936, 31941, 31938, 31960, 31954,
-    31964, 31970, 39739, 31983, 31986, 31988, 31990, 31994, 32006, 32002,
-    32028, 32021, 32010, 32069, 32075, 32046, 32050, 32063, 32053, 32070,
-    32115, 32086, 32078, 32114, 32104, 32110, 32079, 32099, 32147, 32137,
-    32091, 32143, 32125, 32155, 32186, 32174, 32163, 32181, 32199, 32189,
-    32171, 32317, 32162, 32175, 32220, 32184, 32159, 32176, 32216, 32221,
-    32228, 32222, 32251, 32242, 32225, 32261, 32266, 32291, 32289, 32274,
-    32305, 32287, 32265, 32267, 32290, 32326, 32358, 32315, 32309, 32313,
-    32323, 32311, 32306, 32314, 32359, 32349, 32342, 32350, {f: 2, c: 32345},
-    32377, 32362, 32361, 32380, 32379, 32387, 32213, 32381, 36782, 32383,
-    {f: 2, c: 32392}, 32396, 32402, 32400, {f: 2, c: 32403}, 32406, 32398,
-    {f: 2, c: 32411}, 32568, 32570, 32581, {f: 3, c: 32588}, 32592,
-    [12153, 32593], 32597, 32596, 32600, {f: 2, c: 32607}, {f: 2, c: 32616},
-    32615, 32632, 32642, 32646, 32643, 32648, 32647, 32652, 32660, 32670,
-    32669, 32666, 32675, 32687, 32690, 32697, 32686, 32694, 32696, 35697,
-    {f: 2, c: 32709}, 32714, 32725, 32724, 32737, 32742, 32745, 32755, 32761,
-    39132, 32774, 32772, 32779, [12158, 32786], {f: 2, c: 32792}, 32796, 32801,
-    32808, 32831, 32827, 32842, 32838, 32850, 32856, 32858, 32863, 32866,
-    32872, 32883, 32882, 32880, 32886, 32889, 32893, [12160, 32895], 32900,
-    32902, 32901, 32923, 32915, 32922, 32941, 20880, 32940, 32987, 32997,
-    32985, 32989, 32964, 32986, 32982, 33033, 33007, 33009, 33051, 33065,
-    33059, 33071, 33099, 38539, 33094, 33086, 33107, 33105, 33020, 33137,
-    33134, {f: 2, c: 33125}, 33140, 33155, 33160, 33162, 33152, 33154, 33184,
-    33173, 33188, 33187, 33119, 33171, 33193, 33200, 33205, 33214, 33208,
-    33213, 33216, 33218, 33210, 33225, 33229, 33233, 33241, 33240, 33224,
-    33242, {f: 2, c: 33247}, 33255, {f: 2, c: 33274}, 33278, {f: 2, c: 33281},
-    33285, 33287, 33290, 33293, 33296, 33302, 33321, 33323, 33336, 33331,
-    33344, 33369, 33368, 33373, 33370, 33375, 33380, 33378, 33384,
-    {f: 2, c: 33386}, 33326, 33393, 33399, [12171, 33400], 33406, 33421, 33426,
-    33451, 33439, 33467, 33452, 33505, 33507, 33503, 33490, 33524, 33523,
-    33530, 33683, 33539, 33531, 33529, 33502, 33542, 33500, 33545, 33497,
-    33589, 33588, 33558, 33586, 33585, 33600, 33593, 33616, 33605, 33583,
-    33579, {f: 2, c: 33559}, 33669, 33690, 33706, 33695, 33698, 33686, 33571,
-    33678, 33671, 33674, 33660, 33717, 33651, 33653, 33696, 33673, 33704,
-    33780, 33811, 33771, 33742, 33789, 33795, 33752, 33803, 33729, 33783,
-    33799, 33760, 33778, 33805, 33826, 33824, 33725, 33848, 34054, 33787,
-    33901, 33834, 33852, 34138, 33924, 33911, 33899, 33965, 33902, 33922,
-    33897, 33862, 33836, 33903, 33913, 33845, 33994, 33890, 33977, 33983,
-    33951, 34009, 33997, 33979, 34010, 34000, 33985, 33990, 34006, 33953,
-    34081, 34047, 34036, {f: 2, c: 34071}, 34092, 34079, 34069, 34068, 34044,
-    34112, 34147, 34136, 34120, 34113, 34306, 34123, 34133, 34176, 34212,
-    34184, 34193, 34186, 34216, 34157, 34196, 34203, 34282, 34183, 34204,
-    34167, 34174, 34192, 34249, 34234, 34255, 34233, 34256, 34261, 34269,
-    34277, 34268, 34297, 34314, 34323, 34315, 34302, 34298, 34310, 34338,
-    34330, 34352, 34367, [12172, 34381], 20053, 34388, 34399, 34407, 34417,
-    34451, 34467, {f: 2, c: 34473}, {f: 2, c: 34443}, 34486, 34479, 34500,
-    34502, 34480, 34505, 34851, 34475, 34516, 34526, 34537, 34540, 34527,
-    34523, 34543, 34578, 34566, 34568, 34560, 34563, 34555, 34577, 34569,
-    34573, 34553, 34570, 34612, 34623, 34615, 34619, 34597, 34601, 34586,
-    34656, 34655, 34680, 34636, 34638, 34676, 34647, 34664, 34670, 34649,
-    34643, 34659, 34666, 34821, 34722, 34719, 34690, 34735, 34763, 34749,
-    34752, 34768, 38614, 34731, 34756, 34739, 34759, 34758, 34747, 34799,
-    34802, 34784, 34831, 34829, 34814, {f: 2, c: 34806}, 34830, 34770, 34833,
-    34838, 34837, 34850, 34849, 34865, 34870, 34873, 34855, 34875, 34884,
-    34882, 34898, 34905, 34910, 34914, 34923, 34945, 34942, 34974, 34933,
-    34941, 34997, 34930, 34946, 34967, 34962, 34990, 34969, 34978, 34957,
-    34980, 34992, 35007, 34993, {f: 2, c: 35011}, 35028, {f: 2, c: 35032},
-    35037, 35065, 35074, 35068, 35060, 35048, 35058, 35076, 35084, 35082,
-    35091, 35139, 35102, 35109, {f: 2, c: 35114}, 35137, 35140, 35131, 35126,
-    35128, 35148, 35101, 35168, 35166, 35174, 35172, 35181, 35178, 35183,
-    35188, 35191, [12177, 35198], 35203, 35208, 35210, 35219, 35224, 35233,
-    35241, 35238, 35244, 35247, 35250, 35258, 35261, {f: 2, c: 35263}, 35290,
-    {f: 2, c: 35292}, 35303, 35316, 35320, 35331, 35350, 35344, 35340, 35355,
-    35357, 35365, 35382, 35393, 35419, 35410, 35398, 35400, 35452, 35437,
-    35436, 35426, 35461, 35458, 35460, 35496, 35489, 35473, {f: 2, c: 35493},
-    35482, 35491, 35524, 35533, 35522, 35546, 35563, 35571, 35559, 35556,
-    35569, 35604, 35552, 35554, 35575, 35550, 35547, 35596, 35591, 35610,
-    35553, 35606, 35600, 35607, 35616, 35635, 38827, 35622, 35627, 35646,
-    35624, 35649, 35660, 35663, 35662, 35657, 35670, 35675, 35674, 35691,
-    35679, 35692, 35695, 35700, 35709, 35712, 35724, 35726, {f: 2, c: 35730},
-    35734, {f: 2, c: 35737}, 35898, 35905, 35903, 35912, 35916, 35918, 35920,
-    [12183, 35925], 35938, 35948, [12184, 35960], 35962, 35970, 35977, 35973,
-    35978, {f: 2, c: 35981}, 35988, 35964, 35992, 25117, 36013, 36010, 36029,
-    {f: 2, c: 36018}, 36014, 36022, 36040, 36033, 36068, 36067, 36058, 36093,
-    {f: 2, c: 36090}, {f: 2, c: 36100}, 36106, 36103, 36111, 36109, 36112,
-    40782, 36115, 36045, 36116, 36118, 36199, 36205, 36209, 36211, 36225,
-    36249, 36290, 36286, 36282, 36303, 36314, 36310, 36300, 36315, 36299,
-    {f: 2, c: 36330}, 36319, 36323, 36348, {f: 2, c: 36360}, 36351,
-    {f: 2, c: 36381}, 36368, 36383, 36418, 36405, 36400, 36404, 36426, 36423,
-    36425, 36428, 36432, 36424, 36441, 36452, 36448, 36394, 36451, 36437,
-    36470, 36466, 36476, 36481, 36487, 36485, 36484, 36491, 36490, 36499,
-    36497, 36500, 36505, 36522, 36513, 36524, 36528, 36550, 36529, 36542,
-    36549, 36552, 36555, 36571, 36579, 36604, 36603, 36587, 36606, 36618,
-    36613, 36629, 36626, 36633, 36627, 36636, 36639, 36635, 36620, 36646,
-    36659, 36667, 36665, 36677, 36674, 36670, 36684, 36681, 36678, 36686,
-    36695, 36700, {f: 3, c: 36706}, 36764, 36767, 36771, 36781, 36783, 36791,
-    36826, 36837, 36834, 36842, 36847, 36999, 36852, 36869, {f: 2, c: 36857},
-    36881, 36885, 36897, 36877, 36894, 36886, 36875, 36903, 36918, 36917,
-    36921, 36856, {f: 4, c: 36943}, 36878, 36937, 36926, 36950, 36952, 36958,
-    36968, 36975, 36982, 38568, 36978, 36994, 36989, 36993, 36992, 37002,
-    37001, 37007, 37032, 37039, 37041, 37045, 37090, 37092, 25160, 37083,
-    37122, 37138, 37145, 37170, 37168, 37194, 37206, 37208, 37219, 37221,
-    37225, 37235, 37234, 37259, 37257, 37250, 37282, 37291, 37295, 37290,
-    37301, 37300, 37306, {f: 2, c: 37312}, 37321, 37323, 37328, 37334, 37343,
-    37345, 37339, 37372, {f: 2, c: 37365}, 37406, 37375, 37396, 37420, 37397,
-    37393, 37470, 37463, 37445, 37449, 37476, 37448, 37525, 37439, 37451,
-    37456, 37532, 37526, 37523, 37531, 37466, 37583, 37561, 37559, 37609,
-    37647, 37626, 37700, 37678, 37657, 37666, 37658, 37667, 37690, 37685,
-    37691, 37724, 37728, 37756, 37742, 37718, 37808, {f: 2, c: 37804}, 37780,
-    37817, {f: 2, c: 37846}, 37864, 37861, 37848, 37827, 37853, 37840, 37832,
-    37860, 37914, 37908, 37907, 37891, 37895, 37904, 37942, 37931, 37941,
-    37921, 37946, 37953, 37970, 37956, 37979, 37984, 37986, 37982, 37994,
-    37417, 38000, 38005, 38007, 38013, 37978, 38012, 38014, 38017, 38015,
-    38274, 38279, 38282, 38292, 38294, {f: 2, c: 38296}, 38304, 38312, 38311,
-    38317, 38332, 38331, 38329, 38334, 38346, 28662, 38339, 38349, 38348,
-    38357, 38356, 38358, 38364, 38369, 38373, 38370, 38433, 38440,
-    {f: 2, c: 38446}, 38466, 38476, 38479, 38475, 38519, 38492, 38494, 38493,
-    38495, 38502, 38514, 38508, 38541, 38552, 38549, 38551, 38570, 38567,
-    {f: 2, c: 38577}, 38576, 38580, [12202, 38582], 38584, [12203, 38585],
-    38606, 38603, 38601, 38605, 35149, 38620, 38669, 38613, 38649, 38660,
-    38662, 38664, 38675, 38670, 38673, 38671, 38678, 38681, 38692, 38698,
-    38704, 38713, {f: 2, c: 38717}, 38724, 38726, 38728, 38722, 38729, 38748,
-    38752, 38756, 38758, 38760, 21202, 38763, 38769, 38777, 38789, 38780,
-    38785, 38778, 38790, 38795, {f: 2, c: 38799}, 38812, 38824, 38822, 38819,
-    {f: 2, c: 38835}, 38851, 38854, 38856, [12209, 38859], 38876,
-    [12210, 38893], 40783, 38898, 31455, 38902, 38901, 38927, 38924, 38968,
-    38948, 38945, 38967, 38973, 38982, 38991, 38987, 39019, {f: 3, c: 39023},
-    39028, 39027, 39082, 39087, 39089, 39094, 39108, 39107, 39110, 39145,
-    39147, 39171, 39177, 39186, 39188, 39192, 39201, {f: 2, c: 39197}, 39204,
-    39200, 39212, 39214, {f: 2, c: 39229}, 39234, 39241, 39237, 39248, 39243,
-    {f: 2, c: 39249}, 39244, 39253, {f: 2, c: 39319}, 39333, {f: 2, c: 39341},
-    39356, 39391, 39387, 39389, 39384, 39377, {f: 2, c: 39405},
-    {f: 2, c: 39409}, 39419, 39416, 39425, 39439, 39429, 39394, 39449, 39467,
-    39479, 39493, 39490, 39488, 39491, 39486, 39509, 39501, 39515, 39511,
-    39519, 39522, 39525, 39524, 39529, 39531, 39530, 39597, 39600, 39612,
-    39616, 39631, 39633, {f: 2, c: 39635}, 39646, [12221, 39647],
-    {f: 2, c: 39650}, 39654, 39663, 39659, 39662, 39668, 39665, 39671, 39675,
-    39686, 39704, 39706, 39711, {f: 2, c: 39714}, [12222, 39717],
-    {f: 4, c: 39719}, 39726, [12223, 39727], [12224, 39730], 39748, 39747,
-    39759, {f: 2, c: 39757}, 39761, 39768, 39796, 39827, 39811, 39825,
-    {f: 2, c: 39830}, {f: 2, c: 39839}, 39848, 39860, 39872, 39882, 39865,
-    39878, 39887, {f: 2, c: 39889}, 39907, 39906, 39908, 39892, 39905, 39994,
-    39922, 39921, 39920, 39957, 39956, 39945, 39955, 39948, 39942, 39944,
-    39954, 39946, 39940, 39982, 39963, 39973, 39972, 39969, 39984, 40007,
-    39986, 40006, 39998, 40026, 40032, 40039, 40054, 40056, 40167, 40172,
-    40176, 40201, 40200, 40171, 40195, 40198, 40234, 40230, 40367, 40227,
-    40223, 40260, 40213, 40210, 40257, 40255, 40254, 40262, 40264,
-    {f: 2, c: 40285}, 40292, 40273, 40272, 40281, 40306, 40329, 40327, 40363,
-    40303, 40314, 40346, 40356, 40361, 40370, 40388, 40385, 40379, 40376,
-    40378, 40390, 40399, 40386, 40409, 40403, 40440, 40422, 40429, 40431,
-    40445, {f: 2, c: 40474}, 40478, [12228, 40565], 40569, 40573, 40577, 40584,
-    {f: 2, c: 40587}, 40594, 40597, 40593, 40605, [12230, 40613], 40617, 40632,
-    40618, 40621, 38753, 40652, {f: 3, c: 40654}, 40660, 40668, 40670, 40669,
-    40672, 40677, 40680, 40687, 40692, {f: 2, c: 40694}, [12235, 40697],
-    {f: 2, c: 40699}, [12236, 40701], {f: 2, c: 40711}, 30391, 40725, 40737,
-    40748, 40766, [12241, 40778], [12242, 40786], 40788, 40803,
-    {f: 3, c: 40799}, {f: 2, c: 40806}, 40812, 40810, 40823, 40818, 40822,
-    40853, [12244, 40860], [12245, 40864], 22575, 27079, 36953, 29796, 0,
-    {f: 76, c: 9472}, {f: 20, c: 9312}, {f: 10, c: 8544}, 13129, 13076, 0,
-    13133, 0, 13095, 0, 13110, 13137, 0, 13069, 13094, 0, 13099, 13130, 0,
-    {f: 3, c: 13212}, {f: 2, c: 13198}, 13252, 13217, 12317, 12319, 8470,
-    13261, 0, {f: 5, c: 12964}, {f: 2, c: 12849}, 12857, 13182, 13181, 13180,
-    8750, 8721, {s: 3}, 8735, 8895, 0, 0, 21854, {s: 7}, 167133, 0, 0, 28976,
-    0, 40407, {s: 4}, 64054, 0, 0, 22169, 15694, {s: 4}, 20448, 0, 0, 36544, 0,
-    194797, {s: 4}, 153716, 32363, 33606, 167670, {s: 3}, 40572, 0, 0, 26171,
-    0, 40628, {s: 4}, 26629, {s: 5}, 23650, 0, 194780, 0, 32353, 0, 0, 64070,
-    {s: 5}, 34083, 37292, {s: 7}, 34796, {s: 8}, 25620, 0, 0, 39506, {s: 4},
-    64074, 0, 194692, {s: 4}, 31774, {s: 6}, 64016, 25681, 0, 0, 63980, 22625,
-    39002, 0, 194679, {s: 3}, 31153, 0, 28678, {s: 9}, 22218, {s: 3}, 21085, 0,
-    28497, 37297, {s: 10}, 64106, {s: 6}, 38960, 0, 40629, {s: 9}, 33802,
-    63939, {f: 2, c: 63890}, 63897, 0, 34847, 194575, 0, 194771, 194584,
-    {s: 7}, 137754, 23643, {s: 4}, 25890, 0, 0, 26618, 0, 26766, 0, 148432,
-    194848, {s: 21}, 34110, {s: 15}, 30562, {s: 12}, 65075, 0,
-    {f: 2, c: 65073}, {s: 4}, 65072, {f: 2, c: 65077}, {f: 2, c: 65081}, 0, 0,
-    {f: 2, c: 65079}, {f: 2, c: 65087}, {f: 2, c: 65085}, {f: 4, c: 65089},
-    {f: 2, c: 65083}, {s: 41}, {f: 3, c: 12436}, 0, 0, 22099, {s: 41}, 65508,
-    65287, 65282, 0, 9665, 9655, 8681, 8679, 8678, 8680, 9634, 9831, 9825,
-    9828, 9826, 13216, 13218, {f: 2, c: 13220}, 13207, 8467, 13208, 13235,
-    13234, 13233, 13232, {f: 3, c: 13189}, 13259, 13200, 13268, 13206, 13090,
-    13078, 13080, 13077, 13059, 13091, 13143, 13122, 13113, 13115, 13056,
-    13105, 13127, 13086, 13098, 0, 13183, 8481, 9742, 12342, 12320, {s: 3},
-    {f: 9, c: 9352}, {f: 20, c: 9332}, 12881, {f: 10, c: 8560},
-    {f: 10, c: 12882}, {f: 26, c: 9372}, 12867, 12861, 12863, 12852, 12856,
-    12851, 12860, 12866, 12862, 12854, 12853, 12859, 12864, 12858, 12976,
-    12973, 12969, 12975, 12948, 12970, 12952, 12971, 12946, 12945, 12947,
-    12972, 12974, 12950, {s: 8}, {f: 3, c: 9131}, 0, {f: 3, c: 9127}, 0, 13260,
-    13061, 0, 0, 13215, 13219, 13222, 0, 0, 12958, {f: 2, c: 13192}, 13256,
-    8749, 0, 12848, {f: 6, c: 12842}, 12855, 12865, 10145, {s: 3}, 9673, 9824,
-    9829, 9827, 9830, {f: 4, c: 9728}, 9758, {f: 2, c: 9756}, 9759, 12953,
-    9450, {f: 2, c: 8554}, {s: 3}, {f: 8, c: 9601}, 9615, 9614, 9613, 9612,
-    9611, 9610, 9609, {f: 2, c: 9620}, {f: 2, c: 9581}, 9584, 9583, 9552, 9566,
-    9578, 9569, {f: 2, c: 9698}, 9701, 9700, 0, 0, {f: 3, c: 9585}, {s: 20},
-    20956, 29081, {f: 9, c: 10102}, {s: 3}, {f: 2, c: 8570}, {s: 3}, 8575,
-    8458, 8457, 0, 0, 12292, 8646, {f: 2, c: 8644}, 0, {f: 4, c: 12535}, 0, 0,
-    12957, {s: 3}, 13179, {s: 3}, 13107, 13134, {s: 30}, 32394, 35100, 37704,
-    37512, 34012, 20425, 28859, 26161, 26824, 37625, 26363, 24389,
-    [12033, 20008], 20193, 20220, 20224, 20227, 20281, 20310, 20370, 20362,
-    20378, 20372, 20429, 20544, 20514, 20479, 20510, 20550, 20592, 20546,
-    20628, 20724, 20696, 20810, 20836, 20893, 20926, 20972, 21013, 21148,
-    21158, 21184, 21211, 21248, 0, 21284, 21362, 21395, 21426, 21469, 64014,
-    21660, 21642, 21673, 21759, 21894, 22361, 22373, 22444, 22472, 22471,
-    64015, 0, 22686, 22706, 22795, 22867, 22875, 22877, 22883, 22948, 22970,
-    23382, 23488, 29999, 23512, 0, 23582, 23718, 23738, 23797, 23847, 23891, 0,
-    23874, 23917, {f: 2, c: 23992}, 24016, 24353, 24372, 24423, 24503, 24542,
-    24669, 24709, 24714, 24798, 24789, 24864, 24818, 24849, 24887, 24880,
-    24984, 25107, 25254, 25589, 25696, 25757, 25806, 25934, 26112, 26133,
-    26121, 26158, 0, 26148, 26213, 26199, 26201, 64018, 26227, 26265, 26272,
-    26290, 26303, 26362, 26382, 0, 26470, 26555, 26706, 26560, 0, 26692, 26831,
-    64019, 26984, 64020, 27032, 27106, 27184, 27243, 27206, 27251, 27262,
-    27362, 27364, 27606, 27711, 27740, 27782, 27759, 27866, 27908, 28039,
-    28015, 28054, 28076, 28111, 28152, 28146, 28156, 28217, 28252, 28199,
-    28220, 28351, 28552, 28597, 28661, 28677, 28679, 28712, 28805, 28843,
-    28943, 28932, 29020, {f: 2, c: 28998}, 0, 29121, 29182, 29361, 29374,
-    29476, 64022, 29559, 29629, 29641, 29654, 29667, 29650, 29703, 29685,
-    29734, 29738, 29737, 29742, 0, 29833, 29855, 29953, 30063, 30338, 30364,
-    30366, 30363, 30374, 64023, 30534, 21167, 30753, 30798, 30820, 30842,
-    31024, {f: 3, c: 64024}, 31124, 64027, 31131, 31441, 31463, 64028, 31467,
-    31646, 64029, 32072, 0, 32183, 32160, 32214, 32338, 32583, 32673, 64030,
-    33537, 33634, 33663, 33735, 33782, 33864, 33972, 34131, 34137, 34155,
-    64031, 34224, {f: 2, c: 64032}, 34823, 35061, 35346, 35383, 35449, 35495,
-    35518, 35551, 64034, 35574, 35667, 35711, 36080, 36084, 36114, 36214,
-    64035, 36559, 0, 64037, 36967, 37086, 64038, 37141, 37159, 37338, 37335,
-    37342, {f: 2, c: 37357}, {f: 2, c: 37348}, 37382, 37392, 37386, 37434,
-    37440, 37436, 37454, 37465, 37457, 37433, 37479, 37543, {f: 2, c: 37495},
-    37607, 37591, 37593, 37584, 64039, 37589, 37600, 37587, 37669, 37665,
-    37627, 64040, 37662, 37631, 37661, 37634, 37744, 37719, 37796, 37830,
-    37854, 37880, 37937, 37957, 37960, 38290, 0, 64041, 38557, 38575, 38707,
-    38715, 38723, 38733, 38735, [12205, 38737], 0, 38999, 39013,
-    {f: 2, c: 64042}, 39207, 64044, 39326, 39502, 39641, 39644, 39797, 39794,
-    39823, 39857, 39867, 39936, 40304, 40299, 64045, 40473, 40657, {s: 636},
-    8364, 8486, 0, 0, 64256, {f: 2, c: 64259}, 257, 299, 363, 275, 333, 256,
-    298, 362, 274, 332, {f: 4, c: 8539}, {f: 2, c: 8531}, 8304,
-    {f: 6, c: 8308}, {f: 10, c: 8320}, 461, 282, 0, 7868, 463, 0, 296, 465, 0,
-    467, 366, 360, 462, 283, 0, 7869, 464, 0, 297, 466, 0, 468, 367, 361, 593,
-    8049, 8048, 509, 0, 596, 0, 0, 601, 0, 0, 602, 0, 0, 603, 8051, 8050, 0,
-    331, 629, 652, 0, 0, 658, 643, 720, {s: 682}, {f: 10, c: 12832}, {s: 108},
-    {f: 4, c: 12892}, {f: 15, c: 12977}, {s: 50}, {f: 26, c: 9424},
-    {f: 26, c: 9398}, {s: 48}, {f: 47, c: 13008}, 0, {f: 10, c: 12928}, 12944,
-    {f: 6, c: 12938}, 0, 12959, {s: 6}, {f: 2, c: 12960}, 12955, 12954, 12963,
-    12962, 12951, 0, 12956, 12949, {s: 6}, 9676, {s: 11}, 10111,
-    {f: 10, c: 9451}, {s: 510}, 8414, {s: 815}, 13274, {s: 3}, 8448, 13250, 0,
-    0, 8453, 0, 13169, 0, 0, 13197, 13211, {s: 3}, {f: 2, c: 13271}, {s: 3},
-    {f: 2, c: 13057}, 13060, 13062, 0, 13064, 0, 13063, 13066, 0, 13065, 0,
-    13067, 0, 13068, {f: 6, c: 13070}, 0, 13079, 0, 13081, 0, {f: 4, c: 13082},
-    {f: 3, c: 13087}, 13092, 0, 13093, 0, 0, {f: 2, c: 13096}, 0, 13101, 0, 0,
-    {f: 3, c: 13102}, 13106, 0, 0, {f: 2, c: 13108}, 13116, {s: 3}, 13111, 0,
-    13112, 13114, 13117, 13121, {f: 3, c: 13118}, {f: 4, c: 13123}, 13128,
-    {f: 2, c: 13131}, {f: 2, c: 13135}, 0, 0, 13138, 13140, 0, 0, 13139,
-    {f: 2, c: 13141}, {s: 132}, 8501, 976, 8714, 8463, 0, 981, 987, 977, 0,
-    {f: 2, c: 9832}, 9836, {s: 5}, 12347, 0, {f: 3, c: 12339}, 8252, 8265,
-    {s: 5}, 8723, 0, 8771, {f: 2, c: 8818}, {s: 6}, {f: 2, c: 12312},
-    {f: 2, c: 65375}, {s: 10}, 9115, {f: 2, c: 9117}, 9120, {s: 4}, 9121,
-    {f: 2, c: 9123}, 9126, {s: 12}, [9116, 9119, 9122, 9125, 9130], {s: 8},
-    9986, 0, 0, 12349, 0, 12447, 0, 0, 8709, 8864, 8854, 8856, 8853, 8855,
-    {s: 4}, 9664, 9654, {s: 4}, 8656, 8596, {f: 2, c: 8600}, {f: 2, c: 8598},
-    8652, 8651, {s: 10}, 12336, 8967, {s: 8}, 10048, 10047, {s: 7}, 9643, 0,
-    9642, 0, 10010, {s: 12}, 9702, {s: 4}, 10070, {s: 379}, {f: 2, c: 65093},
-    {s: 679}, 64103, 64098, 32227, [12232, 40643], 28331, 64082, 64061, 64069,
-    64062, 27114, 28212, 64096, 64071, 64056, 64066, 64078, 34395, 64105,
-    64052, 64099, 25581, 25802, 30799, 64084, 63856, 64077, 64097, 64072,
-    64076, {f: 2, c: 64091}, 64081, 64067, 64090, 28041, 29376, 0, 194885,
-    64086, 64080, 64049, 64059, 24034, 64063, 64101, 21373, 64055, 64095,
-    24501, 64064, 0, 64083, 0, 64085, 64104, 64068, 64089, 26202, 64053, 64075,
-    64100, 64065, 64048, 0, 64057, 64051, 27493, 64058, 27599, 64050, 25150,
-    64079, 63773, 63964, 63798, 28122, 63952, 26310, 27511, 64087, 37706, 0,
-    37636, {s: 120}, 133390, {s: 120}, 35999, 11991, [11965, 158033], {s: 5},
-    37555, 38321, 0, 0, 194812, {s: 13}, 194965, {s: 8}, 194794, 0, 26478,
-    11974, 0, 194594, {s: 13}, 13314, 0, 0, 26083, {s: 4}, 134071, {s: 10},
-    171339, 0, 194611, 24378, {s: 8}, 11945, 0, 20465, {s: 7}, 63753, {s: 7},
-    11964, 0, 0, 194732, 26435, {s: 3}, 133732, 35329, 25142, 0, 0, 21555,
-    23067, {s: 3}, 25221, 0, 0, 194819, {s: 6}, 21567, {s: 9}, 27506, {s: 4},
-    29986, 19256, 0, 0, 24063, {s: 6}, 194827, 29626, 134047, {s: 3}, 194600,
-    0, 194849, {s: 5}, 194623, {s: 16}, 194675, {f: 2, c: 11916}, 23577,
-    {s: 3}, 131083, 23426, 194642, {s: 5}, 11997, [11999, 39136],
-    [11998, 169599], 14221, 0, [11927, 14586], 0, 194887, 0, [11909, 20155],
-    131490, {s: 7}, 13599, 0, 194738, 0, 0, [11971, 35200], {s: 4}, 31237,
-    {s: 4}, 35498, 0, 32085, 0, 28568, {s: 7}, 25591, 30246, {s: 4},
-    [11978, 163767], {s: 5}, 146686, {s: 5}, 13351, 0, 0, 33067, 0, 0, 194842,
-    {s: 5}, 11950, {s: 5}, 194714, {s: 3}, 194831, {s: 19}, 22305, 135741,
-    194586, 0, 64003, {s: 7}, 21534, 15240, 20839, {s: 4}, 63839, {s: 9},
-    20023, {s: 13}, [11946, 150804], 24421, 23020, 194658, 0, 24217, {s: 46},
-    13416, {s: 8}, 21200, {s: 9}, 26625, 0, 195024, 195039, {s: 5}, 153215, 0,
-    0, 11959, {s: 4}, 36534, 63775, {s: 3}, 63875, {s: 5}, 31867, 63906, 0,
-    63898, 0, [11961, 32770], 157360, {s: 4}, [11911, 132648], 0, 0, 131210,
-    194604, [11915, 13630], {s: 4}, 21589, 0, 22841, 0, 0, 23414, 194669,
-    23572, 14306, 23782, 0, 20040, 0, 0, 194742, {s: 4}, 158105, 25371, 0, 0,
-    26211, 0, 194779, 0, 0, 27126, 27014, {s: 3}, 27596, 0, 28183, 0, 0, 27818,
-    {s: 3}, [11942, 20012], 0, 0, 29935, 30069, 30188, 30286, 16305, 30570,
-    30633, {s: 6}, 31571, 0, 0, 16996, {s: 3}, 194924, 0, 0, 32328, {s: 5},
-    11955, {s: 4}, 33089, 17491, 0, [11966, 33401], [11967, 64094],
-    [11968, 64093], 0, 20857, 33626, {s: 3}, 17701, 0, 34292, 131248, {s: 4},
-    34429, 0, 13358, 35014, {s: 6}, 18406, {s: 8}, 36808, {s: 19}, 166279, 0,
-    0, 167447, 0, 0, 38969, {s: 6}, 39432, {s: 4}, 39903, {s: 10}, 148206,
-    {s: 5}, 21385, 0, 64017, 194785, 0, 146622, 132625, 0, {f: 2, c: 19972},
-    19999, 20011, {f: 2, c: 20015}, {f: 2, c: 20032}, 20036, [11907, 20058],
-    20095, 20109, 20118, 20153, 20176, 20192, 20221, 20223, 20235, 20245,
-    20320, 20283, 20297, 20308, 20346, {f: 2, c: 20349}, 20375, 20414, 20431,
-    20477, {f: 2, c: 20480}, 20496, 20507, 20519, 20526, 20567, 20582, 20586,
-    20539, 20623, 20630, 20636, 20684, 20710, 20713, 20719, 20744, 20747,
-    20752, 20763, 20766, 20831, 20897, 20924, 0, 20974, 20980, 20993,
-    [11913, 20994], 21011, 21065, 21089, 21094, 21139, 21192, 21232,
-    {f: 2, c: 21258}, 21310, 21324, 21323, 21345, 21356, 21419, 21466, 21478,
-    21493, 21543, 21581, 21606, 21611, 21620, 21645, 21654, 21665, 21677,
-    21689, 21695, 21702, 21709, 21774, 21803, 21813, 21834, 21856, 0, 21896,
-    21902, 22024, {f: 2, c: 22030}, 22071, 22079, 22089, 22091, 22095, 22118,
-    22121, 22127, {f: 2, c: 22129}, 22165, 22170, {f: 2, c: 22188}, 22193,
-    22217, 22237, 22244, 22282, 22293, 22307, 22319, {f: 2, c: 22323}, 22348,
-    22384, 22412, 22428, 22456, 22502, 22509, {f: 2, c: 22517}, 22527, 22537,
-    22560, 22578, 22652, 22656, 22697, 22734, 22736, 22740, 22746, 22761,
-    22796, 22820, 22831, 22881, 22893, 22986, 22994, 23005, {f: 2, c: 23011},
-    23044, 23052, 23075, 23111, 23125, 23139, 23149, 23166, 23198, 23207,
-    23212, 23219, 23264, 23296, 23321, 23333, 23341, 23361, 23420,
-    {f: 2, c: 23422}, 23434, [11919, 23587], 23595, 23600, 23651, 23657, 23676,
-    23755, 23762, 23796, 23844, 23846, 23875, 23878, 23882, 23954, 23956,
-    23961, 23968, 24024, 24032, 24056, 24064, 24082, {f: 2, c: 24084}, 24088,
-    24110, 24152, {f: 2, c: 24171}, 24232, 24234, {f: 2, c: 24254}, 0, 24274,
-    24327, 24334, {f: 2, c: 24348}, 24354, 24360, 24374, 24379, 24384,
-    [12089, 24400], 24408, 24420, 24457, 24476, 24487, 24484, 24495, 24504,
-    [11926, 24516], 24521, 24545, 24553, 24557, 24572, 24599, 24602, 24627,
-    24673, 24703, 24734, 24740, 24752, 24779, 24795, 24824, {f: 3, c: 24850},
-    24860, 24956, 24973, 24991, 25000, 25026, 25055, 25109, 25129, 25155,
-    25158, [11928, 25164], 25169, 25174, 25284, 25340, 25354, 25357, 25368,
-    25401, {f: 2, c: 25410}, 25445, 25460, 25469, 25476, 25479, 25488, 25502,
-    25553, 25564, 25609, 25616, 25634, 25684, 25691, 25709, 25723,
-    {f: 2, c: 25790}, 25829, 25847, 25851, 25860, 25878, 25881, 25927, 25959,
-    25985, 25989, 26050, 26096, 26098, 26156, 26188, {f: 2, c: 26203}, 26209,
-    26219, 0, 26276, 26312, 26348, 26373, 26387, 26419, 26440, 26444, 26486,
-    26491, 26544, 26546, 26617, 26583, 26585, 26608, 26668, {f: 2, c: 26672},
-    26715, 26738, 26741, 26746, 26756, 26789, 26802, 26832, 26838, 26856,
-    26861, {f: 2, c: 26864}, 26876, 26897, 26899, 26933, 26939, 26967, 26979,
-    26994, {f: 2, c: 27007}, 27046, 27053, 27063, {f: 2, c: 27094}, 27137,
-    27151, 27157, 27176, 27188, 27198, 27205, {f: 2, c: 27216}, 27222, 27227,
-    27267, 27273, 27281, {f: 3, c: 27293}, 27356, 27367, 27372, 27422, 27428,
-    27445, 27462, 27478, 27488, 27522, 27582, 27617, 27633, 27664, 27699,
-    [11937, 27701], 11938, 27737, 27766, 27771, 27781, 27797, 27804, 27856,
-    27860, 27862, 27872, {f: 2, c: 27883}, 27886, 27914, 27918, 27921, 27950,
-    27991, 27998, 28005, 28034, 28095, 28100, 28106, 28118, 28137, 28194,
-    28241, 28359, 28362, 28366, 28413, 28442, 28458, 28463, 28467, 28506,
-    28510, 28514, 28541, 28555, 28557, 28562, 28564, 28570, {f: 2, c: 28583},
-    28598, 28634, 28638, 0, 28729, 28732, 0, 28756, {f: 2, c: 28765}, 28772,
-    [11939, 28780], 28798, 28801, 28821, 28855, {f: 2, c: 28883}, 28888, 28892,
-    28935, 28960, 28977, 29002, 29010, 29024, 29049, 29074, 0, 29131, 29139,
-    29142, 29184, 29213, 29227, 29240, 29249, 29267, {f: 2, c: 29269}, 29276,
-    29325, [11944, 29357], 29364, 29383, 29435, {f: 2, c: 29444}, 29480, 29489,
-    29507, 29548, 29564, 29571, {f: 2, c: 29573}, 29589, {f: 3, c: 29598},
-    29606, 29611, 29621, 29623, 29628, 29647, 29657, 29673, 29684, 29693,
-    29700, 29706, {f: 2, c: 29722}, 29732, 29736, 29740, {f: 3, c: 29743},
-    29753, 29764, 29767, 29771, 29773, 29777, 29783, 29798, 29803, 29809,
-    29824, {f: 3, c: 29829}, 29840, 29848, 29852, 29856, 29859, 29864, 29867,
-    29877, 29887, 29896, 29914, 29918, 30030, 30073, 30081, 30096,
-    [12135, 30098], 30099, 30132, 30180, 30201, 30208, 30218, {f: 2, c: 30229},
-    30233, 30238, 30253, 30261, 30275, 30283, 30309, 30317, 30319, 30321,
-    30324, {f: 2, c: 30372}, 30405, 30412, 30444, 30460, 30516, 30518, 30556,
-    {f: 2, c: 30559}, 30578, 30589, 30613, 30634, 30694, 30704, 30708, 30726,
-    30754, {f: 2, c: 30765}, 30768, 30773, 30824, 30878, 30920, 30924, 30926,
-    30948, {f: 2, c: 30944}, 30962, 30967, 30971, 31025, 0, [11949, 31035],
-    31037, 31045, {f: 2, c: 31067}, 31115, 31126, 31128, [12145, 31160], 31163,
-    31178, 31194, 31235, 31241, 31249, 31262, 31277, 31289, 31301, 31308,
-    31325, 0, 31341, 31352, 31392, 31395, 31411, {f: 2, c: 31419}, 31430,
-    31495, 31508, 31527, 31537, 31559, 31566, 31584, 31593, 31597, 31602,
-    31633, 31663, 31703, 31705, 31755, 31759, 31776, 31782, 31793, 31798,
-    31825, 31833, 31847, 31854, 31856, 31932, 31935, {f: 2, c: 31944}, 31959,
-    31961, 31965, 31979, {f: 3, c: 32007}, 32019, 32029, 32035, 32065, 32083,
-    32089, 32093, 32122, 32134, {f: 2, c: 32139}, 32204, 32235, 32241, 32249,
-    32264, 32273, 32277, 32288, 32327, 32354, 32366, 32371, 32397, 32401,
-    32408, 32580, 32591, [11947, 11954, 32594], [11953, 32595], 32609, 32657,
-    32703, 32718, 32735, 32741, 32748, {f: 2, c: 32750}, 32762, 32782, 32785,
-    32788, 32804, 32806, 32826, 32828, 32864, 32881, 32885, 32926, 32934,
-    32939, {f: 2, c: 32983}, 33046, 33048, 33082, 33098, 33100, 33153, 33156,
-    33204, 33231, 33273, 33283, 33313, 33330, 33332, 33350, 33355, 33359,
-    33422, 33454, 33463, 33470, 33478, 33534, 33603, 33617, 33621, 33670,
-    33677, 33682, 33688, 33705, {f: 2, c: 33727}, 33770, 33807, 33809, 33866,
-    33910, 33960, 33967, 33984, 33986, 34032, 34045, 34060, 34100, 34142,
-    34191, 34231, 34254, 34221, 34322, 34345, 34386, 34403, 34412, 34415,
-    34426, 34445, 34449, 34456, {f: 2, c: 34471}, 34554, 34557, 34571, 34579,
-    34585, 34590, 34600, 34622, 34673, 34696, 34713, {f: 2, c: 34732}, 34741,
-    34774, 34795, 34797, 34817, 0, 34822, 34827, 34836, 34844, 34902, 34911,
-    [11970, 34916], 34968, 34986, {f: 2, c: 35005}, 35018, 35026, 35035,
-    {f: 2, c: 35056}, 35078, {f: 3, c: 35096}, 35111, 35120, 35134, 35195,
-    35284, 35286, 35301, 35313, 35335, 35343, 35349, 35362, 35406, 35455,
-    35572, 35615, 35639, {f: 2, c: 35651}, 35668, 35740, 35742, 35911, 35924,
-    35955, 36004, 36057, 36065, 36088, 36094, 36123, 36201, 36204, 36228,
-    36237, 36245, 36262, 36294, 36302, 36324, 36332, 36384, 36427, 36460,
-    36464, 36474, 36498, 36526, 36531, 36561, 36564, 36601, 36631, 36662,
-    36774, [12193, 36789], [11981, 36790], 0, 36832, 36836, 36854, 36866,
-    36908, 36932, 37000, 37013, 37017, 37019, 37026, 37044, 37079, 37085,
-    37108, 37143, 37148, 37169, 37178, 37181, 37192, 37211, 37217, 37220,
-    37262, 37278, 37288, {f: 2, c: 37293}, 37298, 37308, 37360, 37367, 37371,
-    37383, 37416, 37427, 37432, 37443, 37447, 37455, 37472, 37570,
-    {f: 2, c: 37579}, 37599, 37645, 37653, 37663, 37671, 37703, 37714, 0,
-    37738, 37741, 37787, 37818, 37801, 37825, 37834, 37858, 37882, 37885,
-    37903, 37940, 37951, 37973, 37995, 38002, [11986, 38264], 38310, 38313, 0,
-    38324, 38333, 38362, [11983, 11990, 38429], 38465, 38488, 38532, 38564,
-    38569, 38610, 195060, 38622, 38633, 38641, 38658, 38665, 38746, 38755,
-    38766, 38771, 38810, 38818, {f: 2, c: 38837}, 38873, 38878, 38900, 38922,
-    38926, 38942, 38947, 38955, 38974, {f: 2, c: 38994}, 39001, 39020, 39096,
-    39098, 39103, 39112, 39141, {f: 2, c: 39218}, 39232, 39245, 39260, 39263,
-    39345, {f: 2, c: 39353}, 39369, 39426, 39446, 39460, 39463,
-    {f: 2, c: 39469}, 39478, 39480, 39498, 39510, {f: 2, c: 39605}, 39673,
-    39683, 39712, {f: 2, c: 39731}, 39795, 39801, 39847, 39873, 39879, 39895,
-    39911, 39915, 39927, 39930, 39933, 39947, 39975, 39978, 39990, 40001,
-    40019, 40035, 40048, 40055, 40194, 40258, 40263, 40291, 40297, 40316,
-    40318, 40333, 40369, 40387, 40391, 40406, 40415, 40427, 40436, 40469,
-    40477, 40612, 40616, 40620, 40679, 40686, 40720, 40722, 40727, 40729,
-    40751, 40759, 40761, 40769, 40773, 40791, 40808, 40817, 40821, 40848,
-    40852, 40866, 0, 13317, 194564, 22048, 24267, 11925, 0, 144954, 0, 28665,
-    28390, 29107, [11940, 64073], {s: 4}, [11980, 64102], 0, 23986, 0, 20435,
-    20697, 20720, 20931, 22134, 27220, 27905, 28112, 28226, 28377, 29668,
-    29729, 30060, 30801, 34805, 144382, 29608, 15091, 13531, 17420, 16010, 0,
-    0, 19432, 0, 16090, 15138, 0, 17786, 16531, 0, 18021, 16643, 17043, 18094,
-    13448, 140809, {f: 3, c: 63584}, 63610, 63615, {s: 23}, {f: 2, c: 8836},
-    {f: 2, c: 8842}, 8713, 0, {f: 2, c: 8965}, {s: 9}, {f: 2, c: 8741},
-    {s: 14}, 8802, 0, 8773, 8776, {f: 2, c: 8822}, {s: 4}, 8487, {s: 209},
-    {f: 2, c: 8922}, 8533, 8984, {f: 2, c: 7742}, {f: 2, c: 504}, 470, 472,
-    474, 476, 260, 728, 317, 346, 350, 356, 377, 379, 261, 731, 318, 347, 711,
-    351, 357, 378, 733, 380, 340, 258, 313, 262, 268, 280, 270, 323, 327, 336,
-    344, 368, 354, 341, 259, 314, 263, 269, 281, 271, 273, 324, 328, 337, 345,
-    369, 355, 729, 264, 284, 292, 308, 348, 364, 265, 285, 293, 309, 349, 365,
-    625, 651, 638, 620, 622, 633, 648, 598, 627, 637, 642, 656, 635, 621, 607,
-    626, 669, 654, 609, 624, 641, 295, 661, 660, 614, 664, 450, 595, 599, 644,
-    608, 403, 616, 649, 600, 604, 606, 592, 623, 650, 612, 594, 653, 613, 674,
-    673, 597, 657, 634, 615, 865, 712, 716, 721, 8255, 783, {f: 5, c: 741}, 0,
-    0, 805, 812, 825, 796, {f: 2, c: 799}, 829, 809, 815, 734, 804, 816, 828,
-    820, {f: 2, c: 797}, {f: 2, c: 792}, 810, {f: 2, c: 826}, 794, {s: 3},
-    {f: 2, c: 610}, 618, 628, 630, 632, 640, 655, 665, 668, 671, 688, 690, 695,
-    704, {f: 2, c: 736}, {s: 6}, 8862, {s: 287}, 12348, 12543, 0,
-    {f: 2, c: 12310}, 9838, 9835, {f: 2, c: 10548}, 10687, 0, 12448, 0,
-    {f: 2, c: 10746}, {s: 13}, 962, {f: 10, c: 9461}, {f: 2, c: 9750}, 9649,
-    {f: 10, c: 12784}, 0, {f: 6, c: 12794}, {f: 15, c: 9150}, 0, 0, 10003, 0,
-    9251, 9166, {f: 4, c: 9680}, {f: 2, c: 8263}, 0, 8273, 8258,
-    {f: 16, c: 12688}, {s: 13}, {f: 2, c: 9136}, {f: 12, c: 9842},
-    {f: 2, c: 12441}, 8413, {s: 450}, 20296, 20319, 20330, 20332, 20494, 20504,
-    20545, 20722, 20688, 20742, 20739, 20789, 20821, 20823, 13493, 20938,
-    20962, 21079, 21196, 21206, 21243, 21276, 21347, 21405, 21522, 21631,
-    21640, 21840, 21889, 21933, 21966, 22075, 22174, 22185, 22195, 22391,
-    22396, 135963, 22479, 22500, 22628, 22665, 136302, 22738, 22752, 34369,
-    22923, 22930, 22979, 23059, 23143, 23159, 23172, 23236, 137405, 23421,
-    23443, 23570, 64060, 136884, 23674, 23695, 23711, 23715, 23722, 23760,
-    138804, 23821, 23879, 23937, 23972, 23975, 24011, 24158, 24313, 24320,
-    24322, 24355, 24381, 24404, 24445, 24589, 24596, 24600, 24629, 24647,
-    24733, 24788, 24797, 24875, 25020, 25017, 25122, 25178, 25199, 25302,
-    25468, 25573, 25721, 25796, 25808, 25897, 26013, 26170, 26146, 26155,
-    26160, 26163, 26184, 143812, {f: 2, c: 26231}, 26253, 26299, 26331, 26344,
-    26439, 26497, 26515, 26520, 26523, 26620, 26653, 26787, 26890, 26953,
-    144836, 26946, 26980, 27045, 27087, 15286, 15299, 27113, 27125, 145215,
-    27195, 145251, 27284, 27301, 15375, 27419, 27436, 27495, 27561, 27565,
-    27607, 27647, 27653, 27764, 27800, 27899, 27846, 27953, 27961, 27967,
-    27992, 28052, 28074, 28123, 28125, 28228, 28254, 28337, 28353, 28432,
-    28505, 28513, 28542, 28556, 28576, 28604, 28615, 28618, 28656, 28750,
-    28789, 28836, 28900, 28971, 28958, 28974, 29009, 29032, 29061, 29063,
-    29114, 29124, 29205, 15935, 29339, 149489, 29479, 29520, 29542, 29602,
-    29739, 29766, 29794, 29805, 29862, 29865, 29897, 29951, 29975, 16242,
-    30158, 30210, 30216, 30308, 30337, 30365, 30378, 30390, 30414, 30420,
-    30438, 30449, 30474, 30489, {f: 2, c: 30541}, 30586, 30592, 30612, 30688,
-    152718, 30787, 30830, 30896, 152846, 30893, 30976, 31004, 31022, 31028,
-    31046, 31097, 31176, 153457, 31188, 31198, 31211, 31213, 31365, 154052,
-    31438, 31485, 31506, 31533, 31547, 31599, 31745, 31795, 155041, 31853,
-    31865, 31887, 31892, 31904, 31957, 32049, 32092, 32131, 32166, 32194,
-    32296, 32663, 32731, 32821, 32823, 32970, 32992, 33011, 33120,
-    {f: 2, c: 33127}, 33133, 33211, 33226, 33239, 17499, 33376, 33396, 158463,
-    33441, {f: 2, c: 33443}, 33449, 33471, 33493, 33533, 33536, 33570, 33581,
-    33594, 33607, 33661, 33703, 33743, 33745, 33761, 33793, 33798, 33887,
-    33904, 33907, 33925, 33950, 33978, 159296, 34098, 34078, 34095, 34148,
-    34170, 34188, 34210, 34251, 34285, 34303, {f: 2, c: 34308}, 34320, 159988,
-    34328, 34360, 34391, 34402, 17821, 34421, 34488, 34556, 34695, 17898,
-    34826, 34832, 35022, 161412, 35122, 35129, 35136, 35220, 35318, 35399,
-    35421, 35425, 35445, 35536, 35654, 35673, 35689, 35741, 35913, 35944,
-    36271, 36305, 36311, 36387, 36413, 36475, 164471, 18500, 36602, 36638,
-    36653, 36692, 164813, 36840, 36846, 36872, 36909, 37015, 37043, 37054,
-    {f: 2, c: 37060}, 37063, 37103, 37140, 37142, {f: 2, c: 37154}, 37167,
-    37172, 37251, 37361, 37705, {f: 2, c: 37732}, 37795, 37855, 37892, 37939,
-    37962, 37987, 38001, 38286, 38303, 38316, 38326, 38347, 38352, 38355,
-    18864, 38366, 38565, 38639, 38734, 38805, 38830, 38842, 38849, 38857,
-    38875, 38998, 39143, 39256, 39427, 39617, 39619, 39630, 39638, 39682,
-    39688, 19479, 39725, 39774, 39782, 39812, 39818, 39838, 39886, 39909,
-    39928, 39971, {f: 2, c: 40015}, 40037, {f: 2, c: 40221}, 40259, 40274,
-    40330, 40342, 40384, 40364, 40380, 172432, 40423, 40455, 40606, 40623,
-    40855, 131209, 19970, 19983, 19986, 20009, 20014, 20039, 131234, 20049,
-    13318, 131236, 20073, 20125, 13356, 20156, 20163, 20168, 20203, 20186,
-    20209, 20213, 20246, 20324, 20279, 20286, 20312, 131603, {f: 2, c: 20343},
-    20354, 20357, 20454, 20402, 20421, 20427, 20434, 13418, 20466, 20499,
-    20508, 20558, 20563, 20579, 20643, 20616, {f: 2, c: 20626}, 20629, 20650,
-    131883, 20657, {f: 2, c: 20666}, 20676, 20679, 20723, 131969, 20686,
-    131953, 20692, 20705, 13458, 132089, 20759, 132170, 20832, 132361, 20851,
-    20867, 20875, 13500, 20888, 20899, 20909, 13511, 132566, 20979, 21010,
-    21014, 132943, 21077, 21084, 21100, 21111, 21124, 21122, 133127, 21144,
-    133178, 21156, {f: 2, c: 21178}, 21194, 21201, 133305, 21239, 21301, 21314,
-    133500, 133533, 21351, 21370, 21412, 21428, 133843, 21431, 21440, 133917,
-    {f: 2, c: 13661}, 21461, 13667, 21492, 21540, 21544, 13678, 21571, 21602,
-    21612, 21653, 21664, 21670, 21678, 21687, 21690, 21699, 134469, 21740,
-    21743, 21745, 21747, {f: 2, c: 21760}, 21769, 21820, 21825, 13734, 21831,
-    13736, 21860, 134625, 21885, 21890, 21905, 13765, 21970, 134805, 134765,
-    21951, 21961, 21964, 21969, 21981, 13786, 21986, 134756, 21993, 22056,
-    135007, 22023, 22032, 22064, 13812, 22077, 22080, 22087, 22110, 22112,
-    22125, 13829, 22152, 22156, 22173, 22184, 22194, 22213, 22221, 22239,
-    22248, {f: 2, c: 22262}, 135681, 135765, 22313, 135803, {f: 2, c: 22341},
-    22349, 135796, 22376, 22383, {f: 3, c: 22387}, 22395, 135908, 135895,
-    22426, {f: 2, c: 22429}, 22440, 22487, 135933, 22476, 135990, 136004,
-    22494, 22512, 13898, 22520, 22523, 22525, 22532, 22558, 22567, 22585,
-    136132, 22601, 22604, 22631, {f: 2, c: 22666}, 22669, {f: 2, c: 22671},
-    22676, 22685, 22698, 22705, 136301, 22723, 22733, 22754, {f: 2, c: 22771},
-    {f: 2, c: 22789}, 22797, 22804, 136663, 13969, 22845, 13977, 22854, 13974,
-    158761, 22879, 136775, {f: 2, c: 22901}, 22908, 22943, 22958, 22972, 22984,
-    22989, 23006, 23015, 23022, 136966, 137026, 14031, 23053, 23063, 23079,
-    23085, 23141, 23162, 23179, 23196, {f: 2, c: 23199}, 23202, 23217, 23221,
-    23226, 23231, 23258, 23260, 23269, 23280, 23278, 23285, 23304, 23319,
-    23348, 23372, 23378, 23400, 23407, 23425, 23428, 137667, 23446, 23468,
-    {f: 2, c: 14177}, 23502, 23510, 14188, 14187, 23537, 23549, 14197, 23555,
-    23593, 138326, 23647, {f: 2, c: 23655}, 23664, 138541, 138565, 138616,
-    138594, 23688, 23690, 14273, 138657, 138652, 23712, 23714, 23719, 138642,
-    23725, 23733, 138679, 23753, 138720, 138803, 23814, 23824, 23851, 23837,
-    23840, 23857, 23865, 14312, 23905, 23914, 14324, 23920, 139038, 14333,
-    23944, 14336, 23959, 23984, 23988, 139126, 24017, 24023, 139258, 24036,
-    24041, 14383, 14390, 14400, 24095, 24126, 24137, 14428, 24150, 14433,
-    {f: 2, c: 24173}, 139643, 24229, 24236, 24249, 24262, 24281, 140062, 24317,
-    24328, 140205, 24350, 24391, 24419, 24434, 24446, 24463, 24482, 24519,
-    24523, {f: 3, c: 24530}, 24546, {f: 2, c: 24558}, 24563, 14615, 24610,
-    24612, 14618, 24652, 24725, 24744, 141043, 24753, 24766, 24776, 24793,
-    24814, 24821, 24848, 24857, 24862, 24890, 14703, 24897, 24902, 24928,
-    141403, {f: 2, c: 24978}, 24983, 24997, 25005, 141483, 25045, 25053, 25077,
-    141711, 25123, 25170, 25185, 25188, 25211, 25197, 25203, 25241, 25301,
-    142008, 25341, 25347, 25360, {f: 2, c: 142159}, 25394, 25397,
-    {f: 2, c: 25403}, 25409, 25412, 25422, 142150, 25433, 142365, 142246,
-    25452, 25497, 142372, 25492, 25533, {f: 2, c: 25556}, 25568,
-    {f: 2, c: 25579}, 25586, 25630, 25637, 25641, 25647, 25690, 25693, 25715,
-    25725, 25735, 25745, 25759, {f: 2, c: 25803}, 25813, 25815, 142817, 25828,
-    25855, 14958, 25871, 25876, 14963, 25886, 25906, 25924, 25940, 25963,
-    25978, 25988, 25994, 26034, 26037, 26040, 26047, 26057, 26068, 15062,
-    26105, 26108, 26116, 26120, 26145, 26154, 26181, 26193, 26190, 15082,
-    143811, 143861, 143798, 26218, {f: 2, c: 26220}, 26235, 26240, 26256,
-    26258, 15118, 26285, 26289, 26293, 15130, 15132, 15063, 26369, 26386,
-    144242, 26393, 144339, 144338, 26445, 26452, 26461, 144336, 144356, 144341,
-    26484, 144346, 26514, 144351, 33635, 26640, 26563, 26568, 26578, 26587,
-    26615, 144458, 144465, 144459, 26648, 26655, 26669, 144485, 26675, 26683,
-    26686, 26693, 26697, 26700, 26709, 26711, 15223, 26731, 26734, 26748,
-    26754, 26768, 26774, 15213, {f: 3, c: 26776}, 26780, {f: 2, c: 26794},
-    26804, 26811, 26875, 144612, 144730, 26819, 26821, 26828, 26841,
-    {f: 2, c: 26852}, 26860, 26871, 26883, 26887, 15239, 144788, 15245, 26950,
-    26985, 26988, 27002, 27026, 15268, 27030, 27056, 27066, 27068, 27072,
-    27089, 144953, 144967, 144952, 27107, {f: 2, c: 27118}, 27123, 15309,
-    27124, 27134, 27153, 27162, 27165, 145180, {f: 2, c: 27186}, 27199, 27209,
-    27258, 27214, 27218, 27236, 145164, 27275, 15344, 27297, 145252, 27307,
-    27325, 27334, 27348, 27344, 27357, 145407, 145383, {f: 3, c: 27377}, 27389,
-    145444, 27403, {f: 3, c: 27407}, 145469, 27415, 15398, 27439, 27466, 27480,
-    27500, 27509, [11934, 27514], 27521, 27547, 27566, 146072, 27581,
-    {f: 3, c: 27591}, 27610, {f: 2, c: 27622}, 27630, 27650, 27658, 27662,
-    27702, 146559, 27725, 27739, 27757, 27780, 27785, 15555, 27796, 27799,
-    27821, 27842, 15570, 27868, 27881, 27885, 146688, 27904, 27940,
-    {f: 2, c: 27942}, 27751, 27951, 27964, 27995, 28000, 28016,
-    {f: 2, c: 28032}, 28042, 28045, 28049, 28056, 146752, 146938, 146937,
-    146899, 28075, 28078, 28084, 28098, 27956, 28104, 28110, 28127, 28150,
-    28214, 28190, 15633, 28210, {f: 2, c: 28232}, {f: 2, c: 28235}, 28239,
-    {f: 2, c: 28243}, 28247, 28259, 15646, 28307, 28327, 28340, 28355, 28469,
-    28395, 28409, 28411, 28426, 28428, 28440, 28453, 28470, 28476, 147326,
-    28498, 28503, 28512, 28520, 28560, 28566, 28606, 28575, 28581, 28591,
-    15716, {f: 2, c: 28616}, 28649, 147606, 28668, 28672, 28682, 28707, 147715,
-    28730, 28739, 28743, 28747, 15770, 28773, 28777, 28782, 28790, 28806,
-    28823, 147910, 28831, 28849, 147966, 28908, 28874, 28881, 28931, 28934,
-    28936, 28940, 15808, 28975, 29008, 29011, 29022, 15828, 29078, 29056,
-    29083, 29088, 29090, {f: 2, c: 29102}, 148412, 29145, 29148, 29191, 15877,
-    29236, 29241, 29250, 29271, 29283, 149033, {f: 2, c: 29294}, 29304, 29311,
-    29326, 149157, 29358, 29360, 29377, 15968, 29388, 15974, 15976, 29427,
-    29434, 29447, 29458, {f: 2, c: 29464}, 16003, 29497, 29484, 29491, 29501,
-    29522, 16020, 29547, 149654, {f: 2, c: 29550}, 29553, 29569, 29578, 29588,
-    29592, 29596, 29605, 29625, 29631, 29637, 29643, 29665, 29671, 29689,
-    29715, 29690, 29697, 29779, 29760, 29763, 29778, 29789, 29825, 29832,
-    150093, 29842, 29847, 29849, 29857, 29861, 29866, 29881, 29883, 29882,
-    29910, 29912, 29931, 150358, 29946, 150383, 29984, 29988, 29994, 16215,
-    150550, {f: 2, c: 30013}, 30016, 30024, 30032, 30034, 30066, 30065, 30074,
-    {f: 2, c: 30077}, 30092, 16245, 30114, 16247, 30128, 30135,
-    {f: 2, c: 30143}, 30150, 30159, 30163, 30173, {f: 2, c: 30175}, 30183,
-    30190, 30193, 30211, 30232, 30215, 30223, 16302, 151054, 30227,
-    {f: 2, c: 30235}, 151095, 30245, 30248, 30268, 30259, 151146, 16329, 30273,
-    151179, 30281, 30293, 16343, 30318, 30357, 30369, 30368, {f: 2, c: 30375},
-    30383, 151626, 30409, 151637, 30440, 151842, 30487, 30490, 30509, 30517,
-    151977, 16441, 152037, 152013, 30552, 152094, 30588, 152140, 16472, 30618,
-    30623, 30626, 30628, {f: 2, c: 30686}, 30692, 30698, 30700, 30715, 152622,
-    30725, 30729, 30733, 30745, 30764, 30791, 30826, 152793, 30858, 30868,
-    30884, 30877, 30879, 30907, 30933, 30950, {f: 2, c: 30969}, 30974, 152999,
-    30992, 31003, 31013, 31050, 31064, 16645, 31079, 31090, 31125, 31137,
-    31145, 31156, 31170, 31175, {f: 2, c: 31180}, 31190, 16712, 153513, 153524,
-    16719, 31242, 31253, 31259, 16739, 31288, 31303, 31318, 31321, 31324,
-    31327, 31335, 31338, 31349, 31362, 31370, 31376, 31404, 154068, 16820,
-    31417, 31422, 16831, 31436, 31464, 31476, 154340, 154339, 154353, 31549,
-    31530, {f: 2, c: 31534}, 16870, 16883, 31615, 31553, 16878, 31573, 31609,
-    31588, 31590, 31603, 154546, 16903, 31632, 31643, 16910, 31669, 31676,
-    31685, 31690, 154699, 154724, 31700, 31702, 31706, 31722, 31728, 31747,
-    31758, 31813, 31818, 31831, 31838, 31841, 31849, 31855, 155182, 155222,
-    155237, 31910, 155234, {f: 2, c: 31926}, 155352, 31940, 155330, 31949,
-    155368, 155427, 31974, 155484, 31989, 32003, 17094, 32018, 32030, 155616,
-    155604, {f: 2, c: 32061}, 32064, 32071, 155660, 155643, 17110, 32090,
-    32106, 32112, 17117, 32127, 155671, 32136, 32151, 155744, 32157, 32167,
-    32170, 32182, 32192, 32215, 32217, 32230, 17154, 155885, 64088, 32272,
-    32279, 32285, 32295, 32300, 32325, 32373, 32382, {f: 2, c: 32390}, 17195,
-    32410, 17219, 32572, 32571, 32574, 32579, 13505, 156272, 156294,
-    {f: 2, c: 32611}, 32621, {f: 2, c: 32637}, 32656, 20859, 146702, 32662,
-    32668, 32685, 156674, 32707, 32719, 32739, 32754, 32778, 32776, 32790,
-    32812, 32816, 32835, 32870, 32891, 32921, 32924, 32932, 32935, 32952,
-    157310, 32965, 32981, 32998, 33037, 33013, 33019, 17390, 33077, 33054,
-    17392, 33060, 33063, 33068, 157469, 33085, 17416, 33129, 17431, 17436,
-    33157, 17442, 33176, 33202, 33217, 33219, 33238, 33243, 157917, 33252,
-    157930, 33260, 33277, 33279, 158063, 33284, 158173, 33305, 33314, 158238,
-    33340, 33353, 33349, 158296, 17526, 17530, 33367, 158348, 33372, 33379,
-    158391, 17553, 33405, 33407, 33411, 33418, 33427, {f: 2, c: 33447}, 33458,
-    33460, 33466, 33468, 33506, 33512, 33527, {f: 2, c: 33543}, 33548, 33620,
-    33563, 33565, 33584, 33596, 33604, 33623, 17598, 17620, 17587,
-    {f: 2, c: 33684}, 33691, 33693, 33737, 33744, 33748, 33757, 33765, 33785,
-    33813, 158835, 33815, 33849, 33871, {f: 2, c: 33873}, {f: 2, c: 33881},
-    33884, 158941, 33893, 33912, 33916, 33921, 17677, 33943, 33958, 33982,
-    17672, {f: 2, c: 33998}, 34003, 159333, 34023, 34026, 34031, 34033, 34042,
-    34075, {f: 2, c: 34084}, 34091, 34127, 34159, 17731, 34129,
-    {f: 2, c: 34145}, 159636, 34171, 34173, 34175, 34177, 34182, 34195, 34205,
-    34207, 159736, {f: 2, c: 159734}, 34236, 34247, 34250, {f: 2, c: 34264},
-    34271, 34273, 34278, 34294, 34304, 34321, 34334, 34337, 34340, 34343,
-    160013, 34361, 34364, 160057, 34368, 34387, 34390, 34423, 34439, 34441,
-    {f: 2, c: 34460}, 34481, 34483, 34497, 34499, 34513, 34517, 34519, 34531,
-    34534, 17848, 34565, 34567, 34574, 34576, 34591, 34593, 34595, 34609,
-    34618, 34624, 34627, 34641, 34648, {f: 2, c: 34660}, 34674, 34684, 160731,
-    160730, 34727, 34697, 34699, 34707, 34720, 160766, 17893, 34750, 160784,
-    34753, 34766, 34783, 160841, 34787, {f: 2, c: 34789}, 34794, 34835, 34856,
-    34862, 34866, 34876, 17935, 34890, 34904, 161301, 161300, 34921, 161329,
-    34927, 34976, 35004, 35008, 161427, 35025, 35027, 17985, 35073, 161550,
-    35127, 161571, 35138, 35141, 35145, 161618, 35170, 35209, 35216, 35231,
-    35248, 35255, 35288, 35307, 18081, 35315, 35325, 35327, 18095, 35345,
-    35348, 162181, 35361, 35381, 35390, 35397, 35405, 35416, 35502, 35472,
-    35511, 35543, 35580, 162436, 35594, 35589, 35597, 35612, 35629, 18188,
-    35665, 35678, 35702, 35713, 35723, {f: 2, c: 35732}, 35897, 162739, 35901,
-    162750, 162759, 35909, 35919, 35927, 35945, 35949, 163000, 35987, 35986,
-    35993, 18276, 35995, 36054, 36053, 163232, 36081, 163344, 36105, 36110,
-    36296, 36313, 36364, 18429, 36349, 36358, 163978, 36372, 36374,
-    {f: 2, c: 36385}, 36391, 164027, 18454, 36406, 36409, 36436, 36450, 36461,
-    36463, 36504, 36510, 36533, 36539, 164482, 18510, 164595, 36608, 36616,
-    36651, 36672, 36682, 36696, 164876, 36772, 36788, 164949, 36801, 36806,
-    64036, 36810, 36813, 36819, 36821, 36849, 36853, 36859, 36876, 36919,
-    165227, 36931, 36957, {f: 2, c: 165320}, 36997, 37004, 37008, 37025, 18613,
-    37040, 37046, 37059, 37064, 165591, 37084, 37087, 165626, 37110, 37106,
-    37120, 37099, {f: 2, c: 37118}, 37124, 37126, 37144, 37150, 37175, 37177,
-    {f: 2, c: 37190}, 37207, 37209, 37236, 37241, 37253, 37299, 37302,
-    {f: 2, c: 37315}, 166217, 166214, 37356, 37377, {f: 2, c: 37398}, 166251,
-    37442, 37450, 37462, 37473, 37477, 37480, 166280, {f: 2, c: 37500}, 37503,
-    37513, 37517, 37527, 37529, 37535, 37547, {f: 2, c: 166330}, 37554,
-    {f: 2, c: 37567}, 37574, 37582, 37605, 37649, 166430, 166441, 37623, 37673,
-    166513, 166467, 37713, 37722, 37739, 37745, 37747, 37793, 166553, 166605,
-    37768, 37771, 37775, 37790, 37877, 166628, 166621, 37873, 37831, 37852,
-    37863, 37897, {f: 2, c: 37910}, 37883, 37938, 37947, 166849, 166895, 37997,
-    37999, 38265, 38278, {f: 2, c: 38284}, 167184, 167281, 38344, 167419,
-    167455, 38444, {f: 2, c: 38451}, 167478, 38460, 38497, 167561, 38530,
-    167659, 38554, 167730, 18919, 38579, 38586, 38589, 18938, 167928, 38616,
-    38618, 38621, 18948, 38676, 38691, 18985, 38710, 38721, 38727, 38743,
-    38747, 38762, 168608, 168625, 38806, 38814, {f: 2, c: 38833}, 38846, 38860,
-    38865, 38868, 38872, 38881, 38897, 38916, 38925, 38932, 38934, 19132,
-    169104, {f: 2, c: 38962}, 38949, 38983, 39014, 39083, 39085, 39088, 169423,
-    39095, {f: 2, c: 39099}, 39106, 39111, 39115, 39137, 39139, 39146,
-    {f: 2, c: 39152}, 39155, 39176, 19259, 169712, {f: 2, c: 39190}, 169753,
-    {f: 3, c: 39194}, 169808, 39217, {f: 3, c: 39226}, 39233, 39238, 39246,
-    39264, 39331, 39334, 39357, 39359, 39363, 39380, 39385, 39390, 170182,
-    39408, 39417, 39420, 39434, 39441, 39450, 39456, 39473, 39492, 39500,
-    39512, 19394, 39599, 19402, 39607, 19410, 39609, 170610, 39622, 39632,
-    39634, 39637, 39648, 39653, 39657, 39692, 39696, 39698, 39702, 39708,
-    39723, 39741, 19488, 39755, 39779, 39781, {f: 2, c: 39787},
-    {f: 2, c: 39798}, 39846, 39852, 171483, 39858, 39864, 39870, 39923, 39896,
-    39901, 39914, 39919, 39918, 171541, 171658, 171593, 39958,
-    {f: 3, c: 39960}, 39965, 39970, 39977, 171716, 39985, 39991, 40005, 40028,
-    171753, {f: 2, c: 40009}, 171739, 40020, 40024, 40027, 40029, 40031,
-    {f: 3, c: 40041}, {f: 2, c: 40045}, 40050, 40053, 40058, 40166, 40178,
-    40203, [171982, 171991], 40209, {f: 2, c: 40215}, 172079, 19652, 172058,
-    40242, 19665, 40266, 40287, 40290, 172281, 172162, 40307, {f: 2, c: 40310},
-    40324, 40345, 40353, 40383, 40373, 40377, 40381, 40393, 40410, 40416,
-    40419, 19719, 40458, 40450, 40461, 40476, 40571, 139800, 40576, 40581,
-    40603, 172940, 40637, 173111, 40671, 40703, 40706, 19831, 40707, 40762,
-    40765, 40774, 40787, 40789, 40792, 173553, 40797, 173570, 40809, 40813,
-    40816, 173746, 11948, 13844, 14509, 15820, 16348, 17854, 17936, 19326,
-    19512, 19681, 19980, {f: 2, c: 20003}, 20089, 20211, 20236, 20249, 20267,
-    20270, 20273, 20356, 20382, 20407, 20484, 20492, 20556, 20575, 20578,
-    20599, 20622, 20638, 20642, 20675, 20712, 20721, 20734, 20743,
-    {f: 3, c: 20748}, 20787, 20792, 20852, 20868, 20920, 20922, 20936, 20943,
-    20945, {f: 2, c: 20947}, 20952, 20959, 20997, 21030, 21032, 21035,
-    {f: 2, c: 21041}, 21045, 21052, 21082, 21088, 21102, {f: 2, c: 21112},
-    21130, 21132, 21217, 21225, 21233, 21251, 21265, 21279, 21293, 21298,
-    21309, 21349, 21357, 21369, 21374, 21396, 21401, 21418, 21423, 21434,
-    21441, {f: 2, c: 21444}, 21472, 21523, 21546, 21553, {f: 2, c: 21556},
-    21580, 21671, 21674, 21681, 21691, 21710, 21738, 21756, 21765, 21768,
-    21781, 21799, 21802, 21814, 21841, 21862, 21903, 21906, 21908, 21924,
-    21938, 21955, 21958, 21971, 21979, 21996, 21998, 22001, 22006, 22008,
-    22021, 22029, {f: 2, c: 22033}, 22060, 22069, 22073, 22093, 22100, 22149,
-    22175, 22182, 22199, 22220, 22223, 22233, 22241, 22251, 22253, 22257,
-    22279, 22284, {f: 2, c: 22298}, 22301, 22316, 22318, {f: 2, c: 22333},
-    22367, 22379, 22381, 22394, 22403, 22423, 22446, 22485, 22503, 22541,
-    22566, 22605, 22607, 22623, 22637, 22655, 22657, 22680, 22716, 22815,
-    22819, 22873, 22905, 22935, 22959, 22963, 23007, 23025, 23032, 23218,
-    23224, 23274, 23286, 23323, 23325, 23329, 23352, 23479, 23511, 23520,
-    23583, 23594, 23596, 23606, 23641, 23644, 23661, 23773, 23809, 23860,
-    23869, 23897, 23934, 23939, 24007, 24057, 24104, 24114, 24117, 24155,
-    24168, 24170, 24183, 24192, 24203, 24243, 24253, 24273, {f: 2, c: 24276},
-    24397, 24492, 24554, 24583, 24649, 24660, 24679, 24763, 24772, 24829,
-    24842, 24854, 24874, 24886, 24926, 24932, 24955, 24957, 24959, 24989,
-    25016, 25052, 25058, 25061, 25064, 25092, 25095, 25137, 25145, 25149,
-    25210, 25232, 25256, 25306, 25332, 25366, 25386, 25398, 25414, 25419,
-    25427, 25457, 25461, 25471, 25474, 25482, {f: 2, c: 25518}, 25578,
-    {f: 2, c: 25592}, 25618, 25624, 25632, 25636, 25642, 25653, 25661, 25663,
-    25682, 25695, 25716, 25744, {f: 2, c: 25752}, 25772, 25779, 25837, 25840,
-    25883, 25887, 25902, 25929, 25952, 26002, 26005, 26036, 26046, 26056,
-    26062, 26064, 26079, 26238, {f: 2, c: 26251}, 26291, 26304, 26319, 26405,
-    26421, 26453, 26496, 26511, 26513, 26532, 26545, 26549, 26558, 26664,
-    26758, 26859, 26869, 26903, 26931, 26936, 26971, 26981, 27048, 27051,
-    27055, 27109, 27121, 27210, 27221, 27239, 27249, 27311, {f: 2, c: 27336},
-    27395, 27451, 27455, {f: 2, c: 27517}, 27568, 27639, 27641, 27652, 27657,
-    27661, 27692, 27722, 27730, 27732, 27769, 27820, 27828, 27858, 28001,
-    28028, 28089, 28144, 28229, 28275, 28283, 28285, 28297, 28348,
-    {f: 2, c: 28378}, 28454, 28457, 28464, 28551, 28573, 28590, 28599, 28685,
-    28704, 28745, 28824, 28848, {f: 2, c: 28885}, 28997, 29106, 29172, 29207,
-    29215, 29251, {f: 2, c: 29263}, 29274, 29280, 29288, 29303, 29316, 29385,
-    29413, 29428, 29442, 29451, 29470, 29474, {f: 2, c: 29498}, 29517, 29528,
-    29543, 29810, 29871, 29919, 29924, 29940, 29947, 29974, 29985, 30015,
-    30046, 30105, 30116, 30145, 30148, 30156, 30167, 30172, 30177, 30191,
-    30212, 30220, 30237, 30258, 30264, 30277, 30282, 30303, 30381, 30397,
-    30425, 30443, 30448, 30457, 30464, 30478, 30498, 30504, 30511, 30521,
-    30526, 30533, 30538, 30543, 30558, 30564, 30567, 30572, 30596,
-    {f: 2, c: 30604}, 30614, 30631, 30639, 30647, 30654, 30665, 30673, 30681,
-    30705, 30775, 30812, 30846, 30872, 30881, 30897, 30899, 30921, 30931,
-    30988, 31007, {f: 2, c: 31015}, 31039, 31042, 31060, 31083, 31100, 31147,
-    31172, 31210, 31234, 31244, 31280, 31290, 31300, 31360, 31366, 31380,
-    31413, 31421, 31486, 31531, 31607, 31648, 31660, 31664, 31720, 31730,
-    31736, 31740, 31742, 31753, 31784, 31791, 31810, {f: 2, c: 31826},
-    {f: 3, c: 31835}, 31858, 31869, 31879, 31902, 31930, 31943, 31955, 31962,
-    32060, 32077, 32130, 32133, 32141, 32145, 32158, 32179, 32185, 32208,
-    32229, {f: 2, c: 32245}, 32303, 32310, 32324, 32367, 32376, 32385, 32573,
-    32603, 32605, 32613, 32625, {f: 2, c: 32639}, 32651, 32674,
-    {f: 3, c: 32765}, 32775, 32781, 32798, 32825, 32904, 32910, 32975, 32980,
-    33005, 33008, 33015, 33018, 33022, 33027, 33047, 33072, 33111, 33135,
-    33139, 33163, 33168, 33179, 33182, 33227, 33237, {f: 2, c: 33245}, 33249,
-    33263, 33270, 33280, 33291, {f: 2, c: 33299}, 33306, 33338, 33348, 33389,
-    33412, 33417, 33425, 33450, 33456, 33488, 33514, 33519, 33526, 33622,
-    33656, 33784, 33788, 33880, 33939, 33969, 33981, 34043, 34118, 34134,
-    34141, 34181, 34200, 34370, 34374, 34496, 34580, 34594, 34606, 34617,
-    34653, 34683, 34700, 34702, {f: 2, c: 34711}, 34718, 34723, 34734, 34751,
-    34761, 34778, 34840, 34843, 34861, 34874, 34885, 34891, 34894, 34901,
-    34906, 34926, {f: 3, c: 34970}, 35021, 35040, 35055, {f: 2, c: 35086},
-    35110, 35125, 35162, 35164, 35179, 35184, 35196, 35237, 35253, 35260,
-    35285, 35401, 35415, 35431, 35454, 35462, 35478, 35510, 35529, 35537,
-    35549, 35564, 35573, 35590, 35599, 35601, 35653, 35666, 35693, 35704,
-    35708, 35710, 35717, 35743, 35915, 35923, 35963, 36026, 36037, 36041,
-    36050, 36076, 36085, 36087, 36097, 36099, 36119, 36124, 36206, 36241,
-    36255, 36267, 36274, 36309, 36327, {f: 2, c: 36337}, 36340, 36353, 36363,
-    36390, 36401, {f: 2, c: 36416}, 36429, 36431, 36444, 36449, 36457, 36465,
-    36469, 36471, 36489, 36496, 36501, 36506, 36519, 36521, 36525, 36584,
-    36592, 36615, 36632, 36645, 36647, 36652, 36661, 36666, 36675, 36679,
-    36689, 36693, {f: 3, c: 36768}, 36773, 36868, 36891, 36911, 36940, 36955,
-    36976, 36980, 36985, 37003, 37016, 37024, 37042, 37053, 37065, 37104,
-    37125, 37157, 37210, 37223, 37242, 37258, 37265, 37269, 37296, 37307,
-    37309, 37314, 37317, 37376, 37385, 37411, 37494, 37518, 37551,
-    {f: 2, c: 37563}, 37569, 37571, 37573, 37576, 37652, 37683, 37686, 37720,
-    37759, 37762, 37770, 37819, 37836, 37862, 37881, 37890, {f: 2, c: 37901},
-    37934, 37964, 38280, 38305, 38335, 38342, 38345, {f: 2, c: 38353}, 38368,
-    38372, 38374, 38436, 38449, 38456, 38461, 38484, 38516, 38523, 38527,
-    38529, 38531, 38537, 38550, 38574, 38659, 38683, {f: 2, c: 38689}, 38696,
-    38705, 38759, 38774, 38781, 38783, 38809, 38815, 38828, 38841, 38861,
-    38880, 38895, 38919, 38950, 38958, {f: 2, c: 39010}, 39092, 39109, 39170,
-    39185, 39189, 39221, 39240, 39252, 39262, 39393, 39436, 39440, 39459,
-    39489, 39505, {f: 2, c: 39613}, 39681, 39689, 39691, {f: 2, c: 39693},
-    39705, 39733, 39752, 39765, 39784, 39808, 39814, 39824, 39837, 39856,
-    39871, 39880, 39935, 39938, 39964, 39989, 40004, 40022, 40033, 40040,
-    40240, 40253, 40298, 40315, 40421, 40425, 40435, 40570, {f: 3, c: 40578},
-    40624, 40676, 40688, 40690, 40713, 40719, 40724, 40731, 40738, 40742,
-    {f: 2, c: 40746}, 40756, 40794, 40815, 40862, 40869, 131317, 151044,
-    151538, 163187, 194581, 194630, 194713, 194726, 194789, 195038, 13790,
-    {s: 4}, 172722, 0, 0, 131416, {s: 4}, 132529, 0, 0, 132844, {s: 6}, 134488,
-    {s: 21}, 154060, {s: 9}, 14756, 14776, 142914, 0, 0, 14940, 0, 0, 143339,
-    0, 0, 162228, 0, 15044, 15051, {s: 5}, 14981, {s: 8}, 15347, 27384, {s: 5},
-    15665, {s: 9}, 147531, 0, 15936, 14497, {s: 34}, 158878, {s: 12}, 18207,
-    162876, {s: 4}, 18462, {s: 71}, 39709, 39724, 20482, 20958, 21255, 23532,
-    63784, 26142, 63785, 28746, 64021, 21857, 27706, 31328, 156492, 34819,
-    38315, 38741, 171581, 173594],
-  'Adobe-Korea1': [{f: 95, c: 32}, 8361, 8208, 169, 0, 0, [12288, 12644],
-    {f: 2, c: 12289}, 12539, 8229, [8230, 8943], 168, 12291, {f: 2, c: 8211},
-    8214, 65340, 65374, {f: 2, c: 8216}, {f: 2, c: 8220}, {f: 2, c: 12308},
-    {f: 10, c: 12296}, 177, 215, 247, 8800, {f: 2, c: 8804}, 8734, 8756, 176,
-    {f: 2, c: 8242}, 8451, 8491, {f: 2, c: 65504}, 65509, 9794, 9792, 8736,
-    8869, 8978, 8706, 8711, 8801, 8786, 167, 8251, 9734, 9733, 9675, 9679,
-    9678, 9671, 9670, 9633, 9632, 9651, 9650, 9661, 9660, 8594,
-    {f: 2, c: 8592}, {f: 2, c: 8595}, 12307, 171, 187, 8730, 8765, 8733, 8757,
-    {f: 2, c: 8747}, 8712, 8715, {f: 2, c: 8838}, {f: 2, c: 8834}, 8746, 8745,
-    {f: 2, c: 8743}, 65506, 8658, 8660, 8704, 8707, 180, 732, 711, 728, 733,
-    730, 729, 184, 731, 161, 191, 8758, 8750, 8721, 8719, 164, 8457, 8240,
-    9665, 9664, 9655, 9654, 9828, {f: 2, c: 9824}, 9829, 9831, 9827, 9673,
-    9672, 9635, {f: 2, c: 9680}, 9618, {f: 2, c: 9636}, 9640, 9639, 9638, 9641,
-    9832, 9743, 9742, 9756, 9758, 182, {f: 2, c: 8224}, 8597, 8599, 8601, 8598,
-    8600, 9837, {f: 2, c: 9833}, 9836, 12927, 12828, 8470, 13255, 8482, 13250,
-    13272, 8481, {f: 59, c: 65281}, 65510, {f: 33, c: 65341}, 65507,
-    {f: 51, c: 12593}, {f: 42, c: 12645}, {f: 10, c: 8560}, {f: 10, c: 8544},
-    {f: 17, c: 913}, {f: 7, c: 931}, {f: 17, c: 945}, {f: 7, c: 963}, 9472,
-    9474, 9484, 9488, 9496, 9492, 9500, 9516, 9508, 9524, 9532, 9473, 9475,
-    9487, 9491, 9499, 9495, 9507, 9523, 9515, 9531, 9547, 9504, 9519, 9512,
-    9527, 9535, 9501, 9520, 9509, 9528, 9538, 9490, 9489, 9498, 9497, 9494,
-    9493, 9486, 9485, {f: 2, c: 9502}, {f: 2, c: 9505}, {f: 2, c: 9510},
-    {f: 2, c: 9513}, {f: 2, c: 9517}, {f: 2, c: 9521}, {f: 2, c: 9525},
-    {f: 2, c: 9529}, {f: 2, c: 9533}, {f: 2, c: 9536}, {f: 8, c: 9539},
-    {f: 3, c: 13205}, 8467, 13208, 13252, {f: 4, c: 13219}, {f: 10, c: 13209},
-    13258, {f: 3, c: 13197}, 13263, {f: 2, c: 13192}, 13256, {f: 2, c: 13223},
-    {f: 10, c: 13232}, {f: 5, c: 13184}, {f: 6, c: 13242}, {f: 5, c: 13200},
-    8486, {f: 2, c: 13248}, {f: 3, c: 13194}, 13270, 13253, {f: 3, c: 13229},
-    13275, {f: 4, c: 13225}, 13277, 13264, 13267, 13251, 13257, 13276, 13254,
-    198, 208, 170, 294, 306, 319, 321, 216, 338, 186, 222, 358, 330,
-    {f: 28, c: 12896}, {f: 26, c: 9424}, {f: 15, c: 9312}, 189,
-    {f: 2, c: 8531}, 188, 190, {f: 4, c: 8539}, 230, 273, 240, 295, 305, 307,
-    312, 320, 322, 248, 339, 223, 254, 359, 331, 329, {f: 28, c: 12800},
-    {f: 26, c: 9372}, {f: 15, c: 9332}, 185, {f: 2, c: 178}, 8308, 8319,
-    {f: 4, c: 8321}, {f: 83, c: 12353}, {f: 86, c: 12449}, {f: 6, c: 1040},
-    1025, {f: 32, c: 1046}, 1105, {f: 26, c: 1078}, {f: 2, c: 44032}, 44036,
-    {f: 4, c: 44039}, {f: 8, c: 44048}, {f: 5, c: 44057}, 44064, 44068,
-    {f: 2, c: 44076}, {f: 3, c: 44079}, {f: 2, c: 44088}, 44092, 44096, 44107,
-    44109, 44116, 44120, 44124, {f: 2, c: 44144}, 44148, {f: 2, c: 44151},
-    44154, {f: 2, c: 44160}, {f: 4, c: 44163}, {f: 4, c: 44169}, 44176, 44180,
-    {f: 2, c: 44188}, {f: 3, c: 44191}, {f: 3, c: 44200}, 44204,
-    {f: 2, c: 44207}, {f: 2, c: 44216}, {f: 3, c: 44219}, 44225, 44228, 44232,
-    44236, 44245, 44247, {f: 2, c: 44256}, 44260, {f: 2, c: 44263}, 44266,
-    44268, {f: 3, c: 44271}, 44275, {f: 2, c: 44277}, {f: 2, c: 44284}, 44288,
-    44292, 44294, {f: 2, c: 44300}, 44303, 44305, 44312, 44316, 44320, 44329,
-    {f: 2, c: 44332}, {f: 2, c: 44340}, 44344, 44348, {f: 2, c: 44356}, 44359,
-    44361, 44368, 44372, 44376, 44385, 44387, {f: 2, c: 44396}, 44400,
-    {f: 4, c: 44403}, {f: 3, c: 44411}, 44415, {f: 2, c: 44417},
-    {f: 2, c: 44424}, 44428, 44432, {f: 2, c: 44444}, 44452, 44471,
-    {f: 2, c: 44480}, 44484, 44488, {f: 2, c: 44496}, 44499, 44508, 44512,
-    44516, {f: 2, c: 44536}, 44540, {f: 3, c: 44543}, {f: 2, c: 44552}, 44555,
-    44557, 44564, {f: 2, c: 44592}, 44596, {f: 2, c: 44599}, 44602,
-    {f: 2, c: 44608}, 44611, {f: 2, c: 44613}, 44618, {f: 3, c: 44620}, 44624,
-    44628, 44630, {f: 2, c: 44636}, {f: 3, c: 44639}, 44645, {f: 2, c: 44648},
-    44652, 44656, {f: 2, c: 44664}, {f: 3, c: 44667}, {f: 2, c: 44676}, 44684,
-    {f: 3, c: 44732}, 44736, 44740, {f: 2, c: 44748}, {f: 3, c: 44751},
-    {f: 2, c: 44760}, 44764, 44776, 44779, 44781, 44788, 44792, 44796,
-    {f: 2, c: 44807}, 44813, 44816, {f: 2, c: 44844}, 44848, 44850, 44852,
-    {f: 2, c: 44860}, 44863, {f: 3, c: 44865}, {f: 2, c: 44872}, 44880,
-    {f: 2, c: 44892}, {f: 2, c: 44900}, 44921, 44928, 44932, 44936,
-    {f: 2, c: 44944}, 44949, 44956, {f: 2, c: 44984}, 44988, 44992,
-    {f: 3, c: 44999}, 45003, {f: 2, c: 45005}, 45012, 45020, {f: 2, c: 45032},
-    {f: 2, c: 45040}, 45044, 45048, {f: 2, c: 45056}, 45060, 45068, 45072,
-    45076, {f: 2, c: 45084}, 45096, {f: 2, c: 45124}, 45128, 45130, 45132,
-    45134, {f: 3, c: 45139}, 45143, 45145, 45149, {f: 2, c: 45180}, 45184,
-    45188, {f: 2, c: 45196}, 45199, 45201, {f: 3, c: 45208}, 45212,
-    {f: 4, c: 45215}, {f: 2, c: 45224}, {f: 5, c: 45227}, 45233,
-    {f: 3, c: 45235}, 45240, 45244, {f: 2, c: 45252}, {f: 3, c: 45255},
-    {f: 2, c: 45264}, 45268, 45272, 45280, 45285, {f: 2, c: 45320},
-    {f: 2, c: 45323}, 45328, {f: 2, c: 45330}, {f: 2, c: 45336},
-    {f: 3, c: 45339}, {f: 3, c: 45347}, 45352, 45356, {f: 2, c: 45364},
-    {f: 3, c: 45367}, {f: 2, c: 45376}, 45380, 45384, {f: 2, c: 45392},
-    {f: 2, c: 45396}, 45400, 45404, 45408, {f: 2, c: 45432}, 45436, 45440,
-    45442, {f: 2, c: 45448}, 45451, 45453, {f: 3, c: 45458}, 45464, 45468,
-    45480, 45516, 45520, 45524, {f: 2, c: 45532}, 45535, {f: 2, c: 45544},
-    45548, 45552, 45561, 45563, 45565, {f: 2, c: 45572}, 45576,
-    {f: 2, c: 45579}, {f: 2, c: 45588}, 45591, 45593, 45600, 45620, 45628,
-    45656, 45660, 45664, {f: 2, c: 45672}, {f: 2, c: 45684}, 45692,
-    {f: 2, c: 45700}, 45705, {f: 2, c: 45712}, 45716, {f: 3, c: 45720},
-    {f: 2, c: 45728}, 45731, {f: 2, c: 45733}, 45738, 45740, 45744, 45748,
-    {f: 2, c: 45768}, 45772, 45776, 45778, {f: 2, c: 45784}, 45787, 45789,
-    45794, {f: 3, c: 45796}, 45800, {f: 5, c: 45803}, {f: 3, c: 45811},
-    {f: 5, c: 45815}, {f: 3, c: 45823}, 45828, 45832, {f: 2, c: 45840},
-    {f: 3, c: 45843}, 45852, {f: 3, c: 45908}, 45912, {f: 2, c: 45915},
-    {f: 2, c: 45918}, {f: 2, c: 45924}, 45927, 45929, 45931, 45934,
-    {f: 2, c: 45936}, 45940, 45944, {f: 2, c: 45952}, {f: 3, c: 45955}, 45964,
-    45968, 45972, {f: 2, c: 45984}, 45992, 45996, {f: 2, c: 46020}, 46024,
-    {f: 2, c: 46027}, 46030, 46032, {f: 2, c: 46036}, 46039, 46041, 46043,
-    46045, 46048, 46052, 46056, 46076, 46096, 46104, 46108, 46112,
-    {f: 2, c: 46120}, 46123, 46132, {f: 2, c: 46160}, 46164, 46168,
-    {f: 2, c: 46176}, 46179, 46181, 46188, 46208, 46216, 46237, 46244, 46248,
-    46252, 46261, 46263, 46265, 46272, 46276, 46280, 46288, 46293,
-    {f: 2, c: 46300}, 46304, {f: 2, c: 46307}, 46310, {f: 2, c: 46316}, 46319,
-    46321, 46328, {f: 2, c: 46356}, 46360, {f: 2, c: 46363}, {f: 2, c: 46372},
-    {f: 4, c: 46375}, {f: 2, c: 46384}, 46388, 46392, {f: 2, c: 46400},
-    {f: 3, c: 46403}, {f: 3, c: 46411}, 46416, 46420, {f: 2, c: 46428},
-    {f: 3, c: 46431}, {f: 2, c: 46496}, 46500, 46504, {f: 2, c: 46506},
-    {f: 2, c: 46512}, {f: 3, c: 46515}, {f: 3, c: 46523}, 46528, 46532,
-    {f: 2, c: 46540}, {f: 3, c: 46543}, 46552, 46572, {f: 2, c: 46608}, 46612,
-    46616, 46629, 46636, 46644, 46664, 46692, 46696, {f: 2, c: 46748}, 46752,
-    46756, {f: 2, c: 46763}, 46769, 46804, 46832, 46836, 46840,
-    {f: 2, c: 46848}, 46853, {f: 2, c: 46888}, 46892, {f: 2, c: 46895},
-    {f: 2, c: 46904}, 46907, 46916, 46920, 46924, {f: 2, c: 46932}, 46944,
-    46948, 46952, {f: 2, c: 46960}, 46963, 46965, {f: 2, c: 46972}, 46976,
-    46980, {f: 2, c: 46988}, {f: 4, c: 46991}, {f: 4, c: 46998}, 47004, 47008,
-    {f: 2, c: 47016}, {f: 3, c: 47019}, {f: 2, c: 47028}, 47032, 47047, 47049,
-    {f: 2, c: 47084}, 47088, 47092, {f: 2, c: 47100}, {f: 3, c: 47103},
-    {f: 3, c: 47111}, 47116, 47120, {f: 2, c: 47128}, 47131, 47133,
-    {f: 2, c: 47140}, 47144, 47148, {f: 2, c: 47156}, {f: 3, c: 47159}, 47168,
-    47172, 47185, 47187, {f: 2, c: 47196}, 47200, 47204, {f: 2, c: 47212},
-    47215, 47217, 47224, 47228, 47245, 47272, 47280, 47284, 47288,
-    {f: 2, c: 47296}, 47299, 47301, 47308, 47312, 47316, 47325, 47327, 47329,
-    {f: 2, c: 47336}, 47340, 47344, {f: 2, c: 47352}, 47355, 47357, 47364,
-    47384, 47392, {f: 2, c: 47420}, 47424, 47428, 47436, 47439, 47441,
-    {f: 2, c: 47448}, 47452, 47456, {f: 2, c: 47464}, 47467, 47469,
-    {f: 2, c: 47476}, 47480, 47484, {f: 2, c: 47492}, 47495, {f: 2, c: 47497},
-    {f: 2, c: 47501}, {f: 2, c: 47532}, 47536, 47540, {f: 2, c: 47548}, 47551,
-    47553, {f: 2, c: 47560}, 47564, {f: 5, c: 47566}, {f: 2, c: 47576}, 47579,
-    {f: 2, c: 47581}, 47585, {f: 3, c: 47587}, 47592, 47596, {f: 2, c: 47604},
-    {f: 4, c: 47607}, {f: 2, c: 47616}, 47624, 47637, {f: 2, c: 47672}, 47676,
-    47680, 47682, {f: 2, c: 47688}, 47691, {f: 2, c: 47693}, {f: 3, c: 47699},
-    47704, 47708, {f: 2, c: 47716}, {f: 3, c: 47719}, {f: 2, c: 47728}, 47732,
-    47736, {f: 3, c: 47747}, 47751, 47756, {f: 2, c: 47784}, {f: 2, c: 47787},
-    47792, 47794, {f: 2, c: 47800}, 47803, 47805, 47812, 47816,
-    {f: 2, c: 47832}, 47868, 47872, 47876, 47885, 47887, 47889, 47896, 47900,
-    47904, 47913, 47915, {f: 3, c: 47924}, 47928, {f: 4, c: 47931},
-    {f: 2, c: 47940}, 47943, 47945, 47949, {f: 2, c: 47951}, 47956, 47960,
-    47969, 47971, 47980, 48008, 48012, 48016, 48036, 48040, 48044, 48052,
-    48055, 48064, 48068, 48072, 48080, 48083, {f: 2, c: 48120}, 48124,
-    {f: 2, c: 48127}, 48130, {f: 2, c: 48136}, {f: 3, c: 48139}, 48143, 48145,
-    {f: 5, c: 48148}, {f: 5, c: 48155}, {f: 2, c: 48164}, 48167, 48169, 48173,
-    {f: 2, c: 48176}, 48180, 48184, {f: 2, c: 48192}, {f: 3, c: 48195}, 48201,
-    {f: 2, c: 48204}, 48208, 48221, {f: 2, c: 48260}, 48264, {f: 2, c: 48267},
-    48270, {f: 2, c: 48276}, 48279, {f: 2, c: 48281}, {f: 2, c: 48288}, 48292,
-    {f: 2, c: 48295}, {f: 2, c: 48304}, {f: 3, c: 48307}, {f: 2, c: 48316},
-    48320, 48324, 48333, {f: 3, c: 48335}, 48341, 48344, 48348,
-    {f: 3, c: 48372}, 48376, 48380, {f: 2, c: 48388}, 48391, 48393, 48400,
-    48404, 48420, 48428, 48448, {f: 2, c: 48456}, 48460, 48464,
-    {f: 2, c: 48472}, 48484, 48488, {f: 2, c: 48512}, 48516, {f: 4, c: 48519},
-    {f: 2, c: 48528}, 48531, 48533, {f: 2, c: 48537}, 48540, 48548, 48560,
-    48568, {f: 2, c: 48596}, 48600, 48604, 48617, 48624, 48628, 48632, 48640,
-    48643, 48645, {f: 2, c: 48652}, 48656, 48660, {f: 2, c: 48668}, 48671,
-    {f: 2, c: 48708}, 48712, 48716, 48718, {f: 2, c: 48724}, 48727,
-    {f: 3, c: 48729}, {f: 2, c: 48736}, 48740, 48744, 48746, {f: 2, c: 48752},
-    {f: 3, c: 48755}, {f: 3, c: 48763}, 48768, 48772, {f: 2, c: 48780},
-    {f: 3, c: 48783}, {f: 2, c: 48792}, 48808, {f: 2, c: 48848}, 48852,
-    {f: 2, c: 48855}, 48864, {f: 3, c: 48867}, 48876, 48897, {f: 2, c: 48904},
-    {f: 2, c: 48920}, {f: 3, c: 48923}, {f: 2, c: 48960}, 48964, 48968,
-    {f: 2, c: 48976}, 48981, 49044, 49072, 49093, {f: 2, c: 49100}, 49104,
-    49108, 49116, 49119, 49121, 49212, 49233, 49240, 49244, 49248,
-    {f: 2, c: 49256}, {f: 2, c: 49296}, 49300, 49304, {f: 2, c: 49312}, 49315,
-    49317, {f: 2, c: 49324}, {f: 2, c: 49327}, {f: 4, c: 49331},
-    {f: 2, c: 49340}, {f: 3, c: 49343}, 49349, {f: 2, c: 49352}, 49356, 49360,
-    {f: 2, c: 49368}, {f: 3, c: 49371}, {f: 2, c: 49380}, 49384, 49388,
-    {f: 2, c: 49396}, 49399, 49401, 49408, 49412, 49416, 49424, 49429,
-    {f: 5, c: 49436}, {f: 2, c: 49443}, {f: 2, c: 49446}, {f: 2, c: 49452},
-    {f: 3, c: 49455}, 49462, {f: 2, c: 49464}, 49468, 49472, {f: 2, c: 49480},
-    {f: 3, c: 49483}, {f: 2, c: 49492}, 49496, 49500, {f: 2, c: 49508},
-    {f: 3, c: 49511}, 49520, 49524, 49528, 49541, {f: 3, c: 49548}, 49552,
-    49556, 49558, {f: 2, c: 49564}, 49567, 49569, 49573, {f: 2, c: 49576},
-    49580, 49584, 49597, 49604, 49608, 49612, 49620, {f: 2, c: 49623}, 49632,
-    49636, 49640, {f: 2, c: 49648}, 49651, {f: 2, c: 49660}, 49664, 49668,
-    {f: 2, c: 49676}, 49679, 49681, {f: 2, c: 49688}, 49692, {f: 2, c: 49695},
-    {f: 2, c: 49704}, 49707, 49709, 49711, {f: 2, c: 49713}, 49716, 49736,
-    {f: 2, c: 49744}, 49748, 49752, 49760, 49765, {f: 2, c: 49772}, 49776,
-    49780, {f: 2, c: 49788}, 49791, 49793, {f: 2, c: 49800}, 49808, 49816,
-    49819, 49821, {f: 2, c: 49828}, 49832, {f: 2, c: 49836}, {f: 2, c: 49844},
-    49847, 49849, {f: 2, c: 49884}, 49888, {f: 2, c: 49891}, {f: 3, c: 49899},
-    49903, 49905, 49910, {f: 2, c: 49912}, {f: 2, c: 49915}, 49920,
-    {f: 2, c: 49928}, {f: 2, c: 49932}, {f: 3, c: 49939}, 49944, 49948,
-    {f: 2, c: 49956}, {f: 2, c: 49960}, 49989, {f: 2, c: 50024}, 50028, 50032,
-    50034, {f: 2, c: 50040}, {f: 2, c: 50044}, 50052, 50056, 50060, 50112,
-    {f: 2, c: 50136}, 50140, {f: 2, c: 50143}, 50146, {f: 2, c: 50152}, 50157,
-    {f: 2, c: 50164}, 50168, 50184, 50192, 50212, 50220, 50224, 50228,
-    {f: 2, c: 50236}, 50248, {f: 2, c: 50276}, 50280, 50284, {f: 2, c: 50292},
-    50297, 50304, 50324, 50332, 50360, 50364, 50409, {f: 2, c: 50416}, 50420,
-    50424, 50426, {f: 3, c: 50431}, 50444, 50448, 50452, 50460,
-    {f: 2, c: 50472}, 50476, 50480, {f: 2, c: 50488}, 50491, 50493,
-    {f: 2, c: 50500}, {f: 3, c: 50504}, {f: 3, c: 50508}, {f: 3, c: 50515},
-    {f: 3, c: 50519}, {f: 2, c: 50525}, {f: 2, c: 50528}, 50532, 50536,
-    {f: 2, c: 50544}, {f: 3, c: 50547}, {f: 2, c: 50556}, 50560, 50564, 50567,
-    {f: 2, c: 50572}, 50575, 50577, 50581, {f: 2, c: 50583}, 50588, 50592,
-    50601, {f: 2, c: 50612}, {f: 2, c: 50616}, {f: 4, c: 50619},
-    {f: 7, c: 50628}, 50636, 50638, {f: 2, c: 50640}, 50644, 50648,
-    {f: 2, c: 50656}, 50659, 50661, {f: 3, c: 50668}, 50672, 50676,
-    {f: 2, c: 50678}, {f: 6, c: 50684}, {f: 4, c: 50693}, 50700, 50704,
-    {f: 2, c: 50712}, {f: 2, c: 50715}, {f: 2, c: 50724}, 50728,
-    {f: 3, c: 50732}, 50736, {f: 3, c: 50739}, 50743, 50745, 50747,
-    {f: 2, c: 50752}, 50756, 50760, {f: 2, c: 50768}, {f: 3, c: 50771},
-    {f: 2, c: 50780}, 50784, 50796, 50799, 50801, {f: 2, c: 50808}, 50812,
-    50816, {f: 2, c: 50824}, 50827, 50829, {f: 2, c: 50836}, 50840, 50844,
-    {f: 2, c: 50852}, 50855, 50857, {f: 2, c: 50864}, 50868, {f: 3, c: 50872},
-    {f: 2, c: 50880}, 50883, 50885, {f: 2, c: 50892}, 50896, 50900,
-    {f: 2, c: 50908}, {f: 2, c: 50912}, {f: 2, c: 50920}, 50924, 50928,
-    {f: 2, c: 50936}, 50941, {f: 2, c: 50948}, 50952, 50956, {f: 2, c: 50964},
-    50967, 50969, {f: 2, c: 50976}, 50980, 50984, {f: 2, c: 50992}, 50995,
-    50997, 50999, {f: 2, c: 51004}, 51008, 51012, 51018, {f: 2, c: 51020},
-    51023, {f: 8, c: 51025}, 51036, 51040, 51048, 51051, {f: 2, c: 51060},
-    51064, {f: 3, c: 51068}, {f: 3, c: 51075}, {f: 4, c: 51079}, 51086,
-    {f: 2, c: 51088}, 51092, {f: 3, c: 51094}, 51098, {f: 2, c: 51104},
-    {f: 4, c: 51107}, {f: 2, c: 51116}, 51120, 51124, {f: 2, c: 51132},
-    {f: 3, c: 51135}, {f: 2, c: 51144}, 51148, 51150, 51152, 51160, 51165,
-    51172, 51176, 51180, {f: 2, c: 51200}, 51204, 51208, 51210,
-    {f: 2, c: 51216}, 51219, {f: 2, c: 51221}, {f: 2, c: 51228}, 51232, 51236,
-    {f: 2, c: 51244}, 51247, 51249, 51256, 51260, 51264, {f: 2, c: 51272},
-    {f: 2, c: 51276}, 51284, {f: 2, c: 51312}, 51316, 51320, 51322,
-    {f: 2, c: 51328}, 51331, {f: 3, c: 51333}, {f: 3, c: 51339}, 51348, 51357,
-    51359, 51361, 51368, {f: 2, c: 51388}, 51396, 51400, 51404,
-    {f: 2, c: 51412}, 51415, 51417, {f: 2, c: 51424}, 51428, 51445,
-    {f: 2, c: 51452}, 51456, {f: 3, c: 51460}, {f: 2, c: 51468}, 51471, 51473,
-    51480, 51500, 51508, {f: 2, c: 51536}, 51540, 51544, {f: 2, c: 51552},
-    51555, 51564, 51568, 51572, 51580, {f: 2, c: 51592}, 51596, 51600,
-    {f: 2, c: 51608}, 51611, 51613, {f: 2, c: 51648}, 51652, {f: 2, c: 51655},
-    51658, {f: 2, c: 51664}, 51667, {f: 2, c: 51669}, {f: 2, c: 51673},
-    {f: 2, c: 51676}, 51680, 51682, 51684, 51687, {f: 2, c: 51692},
-    {f: 3, c: 51695}, {f: 2, c: 51704}, 51708, 51712, {f: 2, c: 51720},
-    {f: 3, c: 51723}, 51732, 51736, 51753, {f: 2, c: 51788}, 51792, 51796,
-    {f: 2, c: 51804}, {f: 3, c: 51807}, 51816, 51837, 51844, 51864,
-    {f: 2, c: 51900}, 51904, 51908, {f: 2, c: 51916}, 51919, 51921, 51923,
-    {f: 2, c: 51928}, 51936, 51948, 51956, 51976, 51984, 51988, 51992,
-    {f: 2, c: 52000}, 52033, {f: 2, c: 52040}, 52044, 52048, {f: 2, c: 52056},
-    52061, 52068, {f: 2, c: 52088}, 52124, 52152, 52180, 52196, 52199, 52201,
-    {f: 2, c: 52236}, 52240, 52244, {f: 2, c: 52252}, {f: 2, c: 52257},
-    {f: 3, c: 52263}, 52268, 52270, 52272, {f: 2, c: 52280}, {f: 4, c: 52283},
-    {f: 2, c: 52292}, 52296, 52300, {f: 2, c: 52308}, {f: 3, c: 52311}, 52320,
-    52324, 52326, 52328, 52336, 52341, {f: 2, c: 52376}, 52380, 52384,
-    {f: 2, c: 52392}, {f: 3, c: 52395}, {f: 2, c: 52404}, 52408, 52412,
-    {f: 2, c: 52420}, 52423, 52425, 52432, 52436, 52452, 52460, 52464, 52481,
-    {f: 2, c: 52488}, 52492, 52496, {f: 2, c: 52504}, 52507, 52509, 52516,
-    52520, 52524, 52537, 52572, 52576, 52580, {f: 2, c: 52588}, 52591, 52593,
-    52600, 52616, {f: 2, c: 52628}, 52632, 52636, {f: 2, c: 52644}, 52647,
-    52649, 52656, 52676, 52684, 52688, 52712, 52716, 52720, {f: 2, c: 52728},
-    52731, 52733, 52740, 52744, 52748, 52756, 52761, {f: 2, c: 52768}, 52772,
-    52776, {f: 2, c: 52784}, 52787, 52789, {f: 2, c: 52824}, 52828,
-    {f: 3, c: 52831}, {f: 2, c: 52840}, 52843, 52845, {f: 2, c: 52852}, 52856,
-    52860, {f: 2, c: 52868}, 52871, 52873, {f: 2, c: 52880}, 52884, 52888,
-    {f: 2, c: 52896}, {f: 3, c: 52899}, {f: 2, c: 52908}, 52929,
-    {f: 2, c: 52964}, 52968, {f: 2, c: 52971}, {f: 2, c: 52980},
-    {f: 3, c: 52983}, {f: 2, c: 52992}, 52996, 53000, {f: 2, c: 53008}, 53011,
-    53013, 53020, 53024, 53028, {f: 2, c: 53036}, {f: 3, c: 53039}, 53048,
-    {f: 2, c: 53076}, 53080, 53084, {f: 2, c: 53092}, 53095, 53097,
-    {f: 2, c: 53104}, 53108, 53112, 53120, 53125, 53132, 53153, 53160, 53168,
-    53188, {f: 2, c: 53216}, 53220, 53224, {f: 2, c: 53232}, 53235, 53237,
-    53244, 53248, 53252, 53265, 53272, 53293, {f: 2, c: 53300}, 53304, 53308,
-    {f: 2, c: 53316}, 53319, 53321, 53328, 53332, 53336, 53344,
-    {f: 2, c: 53356}, 53360, 53364, {f: 2, c: 53372}, 53377, {f: 2, c: 53412},
-    53416, 53420, {f: 2, c: 53428}, 53431, 53433, {f: 2, c: 53440}, 53444,
-    {f: 2, c: 53448}, {f: 2, c: 53456}, {f: 3, c: 53459}, {f: 2, c: 53468},
-    53472, 53476, {f: 2, c: 53484}, {f: 3, c: 53487}, 53496, 53517,
-    {f: 2, c: 53552}, 53556, 53560, 53562, {f: 2, c: 53568}, {f: 3, c: 53571},
-    {f: 2, c: 53580}, 53584, 53588, {f: 2, c: 53596}, 53599, 53601, 53608,
-    53612, 53628, 53636, 53640, {f: 2, c: 53664}, 53668, 53672,
-    {f: 2, c: 53680}, 53683, 53685, 53690, 53692, 53696, 53720, 53748, 53752,
-    53767, 53769, 53776, {f: 2, c: 53804}, 53808, 53812, {f: 2, c: 53820},
-    53823, 53825, 53832, 53852, 53860, {f: 2, c: 53888}, 53892, 53896,
-    {f: 2, c: 53904}, 53909, 53916, 53920, 53924, 53932, 53937,
-    {f: 2, c: 53944}, 53948, {f: 2, c: 53951}, 53954, {f: 2, c: 53960}, 53963,
-    53972, 53976, 53980, {f: 2, c: 53988}, {f: 2, c: 54000}, 54004, 54008,
-    {f: 2, c: 54016}, 54019, 54021, {f: 3, c: 54028}, 54032, 54036, 54038,
-    {f: 2, c: 54044}, {f: 3, c: 54047}, 54053, {f: 2, c: 54056}, 54060, 54064,
-    {f: 2, c: 54072}, {f: 3, c: 54075}, {f: 2, c: 54084}, {f: 2, c: 54140},
-    54144, 54148, {f: 2, c: 54156}, {f: 3, c: 54159}, {f: 2, c: 54168}, 54172,
-    54176, {f: 2, c: 54184}, 54187, 54189, 54196, 54200, 54204,
-    {f: 2, c: 54212}, {f: 2, c: 54216}, 54224, 54232, 54241, 54243,
-    {f: 2, c: 54252}, 54256, 54260, {f: 2, c: 54268}, 54271, 54273, 54280,
-    54301, 54336, 54340, 54364, 54368, 54372, 54381, 54383, {f: 2, c: 54392},
-    54396, {f: 2, c: 54399}, 54402, {f: 2, c: 54408}, 54411, 54413, 54420,
-    54441, 54476, 54480, 54484, 54492, 54495, 54504, 54508, 54512, 54520,
-    54523, 54525, 54532, 54536, 54540, {f: 2, c: 54548}, 54551,
-    {f: 2, c: 54588}, 54592, 54596, {f: 2, c: 54604}, 54607, 54609,
-    {f: 2, c: 54616}, 54620, 54624, 54629, {f: 2, c: 54632}, 54635, 54637,
-    {f: 2, c: 54644}, 54648, 54652, {f: 2, c: 54660}, {f: 3, c: 54663}, 54672,
-    54693, {f: 2, c: 54728}, 54732, 54736, 54738, {f: 2, c: 54744}, 54747,
-    54749, {f: 2, c: 54756}, 54760, 54764, {f: 2, c: 54772}, 54775, 54777,
-    {f: 2, c: 54784}, 54788, 54792, {f: 2, c: 54800}, {f: 3, c: 54803}, 54812,
-    54816, 54820, 54829, {f: 2, c: 54840}, 54844, 54848, 54853,
-    {f: 2, c: 54856}, 54859, 54861, 54865, {f: 2, c: 54868}, 54872, 54876,
-    54887, 54889, {f: 2, c: 54896}, 54900, 54915, 54917, {f: 2, c: 54924},
-    54928, 54932, 54941, 54943, 54945, 54952, 54956, 54960, 54969, 54971,
-    {f: 2, c: 54980}, 54984, 54988, 54993, 54996, 54999, 55001, 55008, 55012,
-    55016, 55024, 55029, {f: 2, c: 55036}, 55040, 55044, 55057,
-    {f: 2, c: 55064}, 55068, 55072, {f: 2, c: 55080}, 55083, 55085,
-    {f: 2, c: 55092}, 55096, 55100, 55108, 55111, 55113, {f: 2, c: 55120},
-    55124, {f: 4, c: 55126}, {f: 2, c: 55136}, 55139, 55141, 55145, 55148,
-    55152, 55156, {f: 2, c: 55164}, 55169, {f: 2, c: 55176}, 55180, 55184,
-    {f: 2, c: 55192}, 55195, 55197, 20285, 20339, 20551, 20729, 21152, 21487,
-    21621, 21733, 22025, 23233, 23478, 26247, {f: 2, c: 26550}, 26607, 27468,
-    29634, 30146, 31292, 33499, 33540, 34903, 34952, 35382, [36040, 63747],
-    36303, 36603, 36838, 39381, 21051, 21364, 21508, 24682, 24932, 27580,
-    29647, 33050, 35258, [12179, 35282], 38307, 20355, 21002, 22718, 22904,
-    23014, [12082, 24178], 24185, 25031, 25536, 26438, 26604, 26751, 28567,
-    30286, 30475, 30965, 31240, 31487, 31777, 32925, [12169, 33390], 33393,
-    35563, 38291, 20075, 21917, 26359, 28212, 30883, 31469, 33883, 35088,
-    34638, 38824, 21208, 22350, 22570, 23884, 24863, 25022, 25121, 25954,
-    26577, 27204, 28187, [12130, 29976], 30131, 30435, 30640, 32058, 37039,
-    {f: 2, c: 37969}, 40853, 21283, 23724, 30002, 32987, 37440, 38296, 21083,
-    22536, 23004, 23713, 23831, 24247, 24378, 24394, 24951, 27743, 30074,
-    30086, 31968, 32115, 32177, 32652, 33108, 33313, 34193, 35137, 35611,
-    37628, [38477, 64009], 40007, 20171, 20215, 20491, 20977, 22607, 24887,
-    24894, 24936, 25913, 27114, 28433, 30117, 30342, 30422, 31623, 33445,
-    33995, 37799, 38283, 21888, 23458, 22353, 31923, 32697, 37301, 20520,
-    21435, 23621, 24040, 25298, 25454, 25818, 25831, 28192, 28844, 31067,
-    36317, 36382, 36989, 37445, 37624, 20094, 20214, 20581, [12081, 24062],
-    24314, 24838, 26967, 33137, 34388, 36423, 37749, 39467, 20062, 20625,
-    26480, 26688, 20745, 21133, 21138, 27298, 30652, 37392, 40660, 21163,
-    24623, 36850, 20552, 25001, 25581, 25802, 26684, 27268, 28608, 33160,
-    35233, 38548, 22533, 29309, [12125, 29356], 29956, 32121, 32365, 32937,
-    [12178, 35211, 64010], 35700, 36963, 40273, 25225, 27770, 28500, 32080,
-    32570, 35363, 20860, 24906, 31645, 35609, 37463, 37772, 20140, 20435,
-    20510, 20670, 20742, 21185, 21197, 21375, 22384, 22659, 24218, 24465,
-    24950, 25004, 25806, 25964, 26223, 26299, [26356, 63745], 26775, 28039,
-    28805, 28913, 29855, 29861, 29898, 30169, 30828, 30956, 31455, 31478,
-    32069, 32147, 32789, 32831, 33051, 33686, 35686, 36629, 36885, 37857,
-    38915, 38968, 39514, 39912, 20418, 21843, 22586, [22865, 63753], 23395,
-    23622, 24760, 25106, 26690, 26800, 26856, 28330, 30028, 30328, 30926,
-    31293, 31995, 32363, 32380, 35336, 35489, 35903, 38542, 40388, 21476,
-    21481, 21578, 21617, 22266, 22993, 23396, 23611, 24235, 25335, 25911,
-    25925, 25970, 26272, 26543, 27073, 27837, 30204, 30352, 30590, 31295,
-    32660, 32771, 32929, 33167, 33510, 33533, 33776, 34241, 34865, 34996,
-    35493, 36764, 37678, 38599, 39015, [12220, 39640], [12238, 40723], 21741,
-    26011, 26354, 26767, 31296, [12181, 35895], 40288, 22256, 22372, 23825,
-    26118, 26801, 26829, 28414, 29736, 34974, 39908, 27752, [12219, 39592],
-    20379, 20844, 20849, 21151, 23380, [12079, 24037], 24656, 24685, 25329,
-    25511, 25915, 29657, 31354, 34467, 36002, 38799, [20018, 63749], 23521,
-    [12093, 25096], 26524, [12128, 29916], 31185, 33747, 35463, 35506, 36328,
-    36942, 37707, 38982, [24275, 64011], 27112, 34303, 37101, 20896, 23448,
-    23532, 24931, 26874, 27454, 28748, 29743, 29912, 31649, 32592, 33733,
-    35264, 36011, 38364, 39208, 21038, 24669, 25324, 36866, 20362, 20809,
-    21281, 22745, 24291, 26336, 27960, 28826, 29378, 29654, 31568, 33009,
-    37979, 21350, 25499, 32619, 20054, 20608, 22602, 22750, 24618, 24871,
-    25296, 27088, 39745, 23439, 32024, 32945, 36703, 20132, 20689, 21676,
-    21932, 23308, 23968, 24039, 25898, 25934, 26657, 27211, 29409, 30350,
-    30703, 32094, 32761, 33184, 34126, 34527, 36611, 36686, 37066, 39171,
-    39509, 39851, 19992, 20037, 20061, 20167, 20465, 20855, 21246, 21312,
-    [12061, 21475], [21477, 63750], 21646, 22036, 22389, 22434, 23495, 23943,
-    24272, 25084, 25304, 25937, 26552, 26601, 27083, 27472, 27590, 27628,
-    27714, 28317, 28792, 29399, 29590, 29699, 30655, 30697, 31350, 32127,
-    32777, [12165, 33276], 33285, 33290, 33503, 34914, 35635, 36092, 36544,
-    36881, 37041, 37476, 37558, 39378, 39493, 40169, 40407,
-    [12244, 40860, 63751, 63752], 22283, 23616, 33738, 38816, 38827, 40628,
-    21531, 31384, 32676, 35033, 36557, 37089, 22528, 23624, 25496, 31391,
-    23470, [12088, 24339], 31353, 31406, 33422, 36524, 20518, 21048, 21240,
-    21367, 22280, 25331, 25458, 27402, 28099, 30519, 21413, 29527, 34152,
-    36470, 38357, 26426, 27331, 28528, 35437, 36556, 39243, 26231, 27512,
-    36020, [12225, 39740], 21483, 22317, 22862, 25542, 27131, 29674, 30789,
-    31418, 31429, 31998, 33909, 35215, 36211, 36917, 38312, 21243, 22343,
-    30023, 31584, 33740, 37406, 27224, 20811, 21067, 21127, 25119, 26840,
-    26997, 38553, 20677, 21156, 21220, 25027, [12100, 26020], 26681, 27135,
-    29822, 31563, 33465, 33771, 35250, 35641, 36817, 39241, 20170, 22935,
-    25810, 26129, 27278, 29748, 31105, 31165, 33449, {f: 2, c: 34942}, 35167,
-    37670, 20235, 21450, 24613, 25201, 27762, 32026, 32102, 20120, 20834,
-    30684, 32943, 20225, 20238, 20854, 20864, 21980, 22120, 22331, 22522,
-    22524, 22804, 22855, 22931, 23492, 23696, 23822, [12080, 24049], 24190,
-    24524, 25216, 26071, 26083, {f: 2, c: 26398}, 26462, 26827, 26820, 27231,
-    27450, 27683, 27773, 27778, 28103, 29592, 29734, 29738, 29826, 29859,
-    30072, 30079, 30849, 30959, 31041, {f: 2, c: 31047}, 31098, 31637, 32000,
-    32186, 32648, 32774, 32813, 32908, 35352, 35663, [35912, 63744], 36215,
-    37665, 37668, 39138, 39249, {f: 2, c: 39438}, 39525, 40594, 32202, 20342,
-    21513, 25326, 26708, [12198, 37329, 63754], 21931, 20794, 23068, 25062,
-    [25295, 63835], 25343, 37027, [35582, 63837], 26262, 29014, 38627, 25423,
-    25466, 21335, 26511, 26976, 28275, 30007, 32013, 34930, 22218, 23064,
-    20035, 20839, [22856, 63756], 26608, 32784, [12069, 22899, 63873],
-    [24180, 63886], [25754, 63889], [31178, 63893], [24565, 63907], 24684,
-    25288, [25467, 63908], [23527, 63839, 63914], 23511, 21162, 22900, 24361,
-    [24594, 63840], 29785, 39377, 28611, 33215, 36786, 24817, 33126,
-    [23615, 63933], 23273, 35365, [26491, 63944], [32016, 63951], 33021, 23612,
-    [27877, 63971], [21311, 63979], [28346, 63980], 22810, [33590, 63998],
-    [20025, 63838], 20150, 20294, 21934, 22296, 22727, 24406, 26039, 26086,
-    27264, 27573, 28237, 30701, 31471, 31774, 32222, 34507, 34962, 37170,
-    37723, 25787, 28606, 29562, 30136, 36948, 21846, 22349, 25018, 25812,
-    26311, 28129, 28251, 28525, 28601, 30192, 32835, 33213, 34113, 35203,
-    35527, 35674, 37663, 27795, 30035, 31572, 36367, 36957, 21776, 22530,
-    22616, 24162, 25095, 25758, 26848, 30070, [31958, 64003], 34739, 40680,
-    20195, 22408, 22382, [12068, 22823], 23565, 23729, 24118, 24453, 25140,
-    25825, 29619, 33274, 34955, 36024, 38538, 40667, [23429, 64004], 24503,
-    24755, 20498, [12049, 20992], 21040, 22294, 22581, 22615, 23566, 23648,
-    23798, 23947, [24230, 64001], 24466, 24764, 25361, 25481, 25623, 26691,
-    26873, 27330, 28120, 28193, 28372, 28644, 29182, 30428, 30585, 31153,
-    31291, 33796, 35241, 36077, 36339, 36424, 36867, 36884, 36947, 37117,
-    37709, 38518, 38876, 27602, 28678, 29272, 29346, 29544, 30563, 31167,
-    31716, 32411, [35712, 63834], 22697, 24775, 25958, 26109, 26302, 27788,
-    28958, 29129, 35930, 38931, 20077, 31361, 20189, 20908, 20941, 21205,
-    21516, 24999, 26481, 26704, 26847, [27934, 64005], 28540, 30140, 30643,
-    31461, 33012, 33891, 37509, 20828, [12099, 26007], 26460, 26515, 30168,
-    31431, 33651, [12182, 35910], 36887, 38957, 23663, 33216, 33434, 36929,
-    36975, 37389, 24471, 23965, 27225, 29128, 30331, 31561, 34276, 35588,
-    37159, 39472, [21895, 63755], [25078, 63757], [30313, 63758],
-    [32645, 63759], [34367, 63760], [34746, 63761], [35064, 63762],
-    [37007, 63763], [27931, 63765], [28889, 63766], [29662, 63767], 32097,
-    [33853, 63768], [37226, 63769], [39409, 63770], [20098, 63771],
-    [21365, 63772], [27396, 63773], 27410, 28734, [29211, 63774],
-    [34349, 63775], [40478, 63776], 21068, 36771, [23888, 63777], 25829, 25900,
-    27414, [28651, 63778], 31811, 32412, [34253, 63779], [35172, 63780], 35261,
-    [25289, 63781], [33240, 63782], [34847, 63783], [24266, 63784],
-    [26391, 63785], [28010, 63786], [29436, 63787], 29701, 29807, 34690,
-    [37086, 63788], [20358, 63789], 23821, 24480, 33802, [20919, 63790],
-    [25504, 63861], [30053, 63862], [20142, 63863], 20486, [20841, 63864],
-    [20937, 63865], [26753, 63866], 27153, 31918, 31921, [31975, 63867],
-    [33391, 63868], [35538, 63869], 36635, [37327, 63870], 20406, 20791,
-    [21237, 63871], [21570, 63872], [24300, 63874], 24942, 25150,
-    [26053, 63875], 27354, [28670, 63876], [31018, 63877], 34268, 34851,
-    [38317, 63878], 39522, [39530, 63879], [40599, 63880], [40654, 63881],
-    [12050, 21147, 63882], [26310, 63883], [27511, 63884], 28701, 31019,
-    [36706, 63885], 38722, [24976, 63887], [25088, 63888], 25891,
-    [28451, 63890], [29001, 63891], [29833, 63892], [32244, 63894],
-    [32879, 63895], [34030, 63897], [36646, 63896], [36899, 63898],
-    [37706, 63899], 20925, [21015, 63900], [21155, 63901], 27916,
-    [28872, 63903], [35010, 63904], [24265, 63906], 25986, [27566, 63909],
-    28610, [31806, 63910], [29557, 63911], [20196, 63912], 20278,
-    [22265, 63913], 23738, [23994, 63915], [24604, 63916], [29618, 63917],
-    31533, [32666, 63919], 32718, [32838, 63920], 36894, [37428, 63921],
-    [38646, 63922], [38728, 63923], [38936, 63924], 40801, [20363, 63925],
-    28583, [31150, 63926], [37300, 63927], [38583, 63928], [21214, 63791],
-    25736, [25796, 63792], [27347, 63793], 28510, 28696, [29200, 63794],
-    [30439, 63795], [12156, 32769, 63796], [34310, 63797], [34396, 63798],
-    [36335, 63799], 36613, [38706, 63800], [39791, 63801], [40442, 63802],
-    [12228, 40565], [30860, 63803], [31103, 63804], [32160, 63805],
-    [33737, 63806], [37636, 63807], [12229, 40575, 63808], 40595,
-    [35542, 63809], [22751, 63810], [24324, 63811], 26407, 28711, 29903,
-    [31840, 63812], [32894, 63813], 20769, 28712, [29282, 63814],
-    [30922, 63815], [36034, 63816], 36058, 36084, [38647, 63817],
-    [20102, 63930], [20698, 63931], [23534, 63932], 24278, [26009, 63934],
-    [29134, 63936], [30274, 63937], 30637, 32842, [34044, 63938],
-    [36988, 63939], 39719, [12243, 40845, 63940], [22744, 63818], 23105,
-    [23650, 63819], [27155, 63820], [28122, 63821], [28431, 63822], 30267,
-    [32047, 63823], [32311, 63824], 34078, 35128, 37860, [38475, 63825],
-    [21129, 63943], 26066, [26611, 63945], 27060, [27969, 63946],
-    [28316, 63947], 28687, [29705, 63948], 29792, [30041, 63949], 30244,
-    [30827, 63950], 35628, [39006, 63952], [20845, 63953], [25134, 63954],
-    [38520, 63955], 20374, [20523, 63956], [23833, 63957], [28138, 63958],
-    32184, [36650, 63959], [24459, 63960], [24900, 63961], [26647, 63962],
-    [38534, 63964], [21202, 63826], [32907, 63827], [20956, 63828],
-    [20940, 63829], 26974, [31260, 63830], [32190, 63831], [33777, 63832],
-    [38517, 63833], 20442, [21033, 63965], 21400, [21519, 63966], 21774,
-    [23653, 63967], 24743, [26446, 63969], [26792, 63970], 28012, 29313, 29432,
-    [29702, 63972], 29827, [30178, 63973], 31852, [32633, 63974], 32696, 33673,
-    [35023, 63975], [35041, 63976], [12197, 37324, 63977], 37328,
-    [38626, 63978], 39881, [21533, 63981], 28542, [29136, 63982],
-    [29848, 63983], [34298, 63984], 36522, [38563, 63985], [40023, 63986],
-    [40607, 63987], [26519, 63988], [28107, 63989], 29747, [33256, 63990],
-    38678, 30764, [12148, 31435, 63991], [31520, 63992], [31890, 63993], 25705,
-    29802, 30194, 30908, 30952, [12218, 39340], 39764, [12231, 40635], 23518,
-    24149, 28448, 33180, 33707, 37000, 19975, 21325, 23081, 24018, 24398,
-    24930, 25405, 26217, 26364, 28415, 28459, 28771, 30622, 33836, 34067,
-    34875, 36627, 39237, 39995, 21788, 25273, 26411, 27819, 33545, 35178,
-    38778, 20129, 22916, {f: 2, c: 24536}, 26395, 32178, 32596, 33426, 33579,
-    33725, 36638, 37017, 22475, 22969, 23186, 23504, 26151, 26522, 26757,
-    27599, 29028, 32629, 36023, 36067, 36993, 39749, 33032, 35978, 38476,
-    39488, [12230, 40613], 23391, 27667, 29467, 30450, 30431, 33804, 20906,
-    35219, 20813, 20885, 21193, 26825, 27796, 30468, 30496, 32191, 32236,
-    [12207, 38754], 40629, 28357, 34065, 20901, 21517, 21629, 26126, 26269,
-    26919, 28319, [12139, 30399], 30609, 33559, 33986, 34719, 37225, 37528,
-    40180, 34946, 20398, 20882, 21215, 22982, 24125, 24917, {f: 2, c: 25720},
-    26286, 26576, 27169, 27597, [12113, 27611], 29279, 29281, 29761, 30520,
-    [12141, 30683], 32791, 33468, 33541, 35584, 35624, 35980, [12106, 26408],
-    27792, 29287, [12140, 30446], 30566, 31302, 40361, 27519, 27794, 22818,
-    26406, 33945, 21359, 22675, 22937, 24287, 25551, 26164, 26483, 28218,
-    29483, 31447, 33495, 37672, 21209, 24043, 25006, 25035, 25098, 25287,
-    25771, [12102, 26080], 26969, 27494, [12111, 27595], 28961, 29687, 30045,
-    32326, 33310, 33538, 34154, 35491, 36031, 38695, 40289, 22696, 40664,
-    20497, 21006, 21563, 21839, [12098, 25991], 27766, {f: 2, c: 32010}, 32862,
-    34442, [12200, 38272], 38639, 21247, 27797, 29289, 21619, 23194, 23614,
-    23883, 24396, 24494, 26410, 26806, 26979, 28220, 28228, 30473,
-    [12150, 31859], 32654, 34183, 35598, 36855, 38753, 40692, 23735, 24758,
-    24845, 25003, 25935, {f: 2, c: 26107}, 27665, 27887, 29599, 29641, 32225,
-    38292, 23494, 34588, 35600, 21085, 21338, 25293, 25615, 25778, 26420,
-    27192, 27850, 29632, 29854, 31636, 31893, 32283, 33162, 33334, 34180,
-    36843, 38649, 39361, 20276, 21322, 21453, 21467, 25292, 25644, 25856,
-    26001, 27075, 27886, 28504, 29677, 30036, 30242, 30436, 30460, 30928,
-    [30971, 63844], 31020, 32070, 33324, 34784, 36820, 38930, 39151, 21187,
-    25300, 25765, 28196, 28497, 30332, 36299, 37297, 37474, 39662, 39747,
-    20515, 20621, 22346, 22952, 23592, 24135, 24439, 25151, 25918,
-    [12101, 26041], 26049, 26121, 26507, 27036, 28354, 30917, 32033, 32938,
-    33152, 33323, 33459, 33953, 34444, 35370, 35607, 37030, 38450, 40848,
-    20493, 20467, 22521, 24472, 25308, 25490, 26479, 28227, 28953, 30403,
-    32972, 32986, {f: 2, c: 35060}, 35097, 36064, 36649, 37197, 38506, 20271,
-    20336, 24091, 26575, 26658, [12137, 30333], 30334, 39748, 24161, 27146,
-    29033, 29140, 30058, 32321, 34115, 34281, 39132, 20240, 31567, 32624,
-    38309, 20961, 24070, 26805, 27710, 27726, 27867, 29359, 31684, 33539,
-    27861, 29754, 20731, 21128, 22721, 25816, 27287, 29863, 30294, 30887,
-    34327, 38370, 38713, 21342, 24321, 35722, 36776, 36783, 37002, 21029,
-    30629, 40009, 40712, 19993, 20482, 20853, 23643, 24183, 26142, 26170,
-    26564, 26821, 28851, 29953, 30149, 31177, 31453, 36647, 39200, 39432,
-    20445, 22561, 22577, 23542, 26222, 27493, 27921, 28282, 28541, 29668,
-    29995, 33769, 35036, 35091, 35676, 36628, 20239, 20693, 21264,
-    [12056, 21340], 23443, [24489, 63846], 26381, 31119, 33145, 33583, 34068,
-    35079, 35206, 36665, [36667, 64007], 39333, 39954, 26412, 20086, 20472,
-    22857, 23553, {f: 2, c: 23791}, 25447, 26834, 28925, 29090, 29739, 32299,
-    34028, 34562, 36898, 37586, 40179, [19981, 63847], 20184, 20463, 20613,
-    21078, 21103, 21542, 21648, 22496, 22827, 23142, 23386, 23413, 23500,
-    24220, 25206, 25975, 26023, 28014, 28325, [12119, 29238], 31526, 31807,
-    [12152, 32566], {f: 2, c: 33104}, 33178, 33344, 33433, 33705, 35331, 36000,
-    36070, 36091, 36212, 36282, 37096, 37340, [12201, 38428], 38468, 39385,
-    40167, [21271, 63843], 20998, 21545, 22132, 22707, 22868, 22894, 24575,
-    24996, 25198, 26128, 27774, 28954, 30406, 31881, 31966, 32027, 33452,
-    36033, 38640, 20315, 24343, 24447, 25282, 23849, 26379, 26842, 30844,
-    32323, 40300, 19989, 20633, [12052, 21269], 21290, 21329, 22915, 23138,
-    24199, 24754, 24970, 25161, 25209, 26000, 26503, 27047, [12112, 27604],
-    {f: 3, c: 27606}, 27832, 29749, 30202, 30738, 30865, 31189, 31192, 31875,
-    32203, 32737, 32933, 33086, 33218, 33778, 34586, 35048, 35513, 35692,
-    36027, 37145, [12206, 38750], [12214, 39131], [12240, 40763], 22188, 23338,
-    24428, 25996, 27315, 27567, 27996, 28657, 28693, 29277, 29613, 36007,
-    36051, 38971, 24977, 27703, 32856, 39425, 20045, 20107, 20123, 20181,
-    20282, 20284, 20351, 20447, 20735, 21490, 21496, 21766, 21987, 22235,
-    [12064, 22763], 22882, 23057, 23531, 23546, 23556, 24051, 24107, 24473,
-    24605, 25448, 26012, 26031, 26614, 26619, 26797, 27515, 27801, 27863,
-    28195, 28681, 29509, 30722, 31038, 31040, 31072, 31169, 31721, 32023,
-    32114, 32902, 33293, 33678, 34001, 34503, 35039, 35408, 35422, 35613,
-    36060, 36198, 36781, 37034, 39164, 39391, 40605, 21066, 26388, 20632,
-    21034, [12077, 23665], 25955, 27733, 29642, 29987, 30109, 31639, 33948,
-    37240, 38704, 20087, 25746, [27578, 63856], 29022, 34217, 19977, 26441,
-    26862, 28183, 33439, 34072, 34923, 25591, 28545, 37394, 39087, 19978,
-    20663, 20687, 20767, 21830, 21930, 22039, 23360, 23577, 23776, 24120,
-    24202, 24224, 24258, 24819, 26705, 27233, 28248, 29245, 29248,
-    [29376, 63994], 30456, 31077, 31665, 32724, 35059, 35316, 35443, 35937,
-    36062, 38684, [22622, 63852], 29885, 36093, 21959, 31329, [32034, 63850],
-    [12170, 33394], 29298, [12131, 29983], 29989, 31513, 22661, 22779, 23996,
-    24207, 24246, 24464, 24661, 25234, 25471, 25933, 26257, 26329, 26360,
-    26646, 26866, 29312, 29790, 31598, 32110, 32214, 32626, 32997, 33298,
-    34223, 35199, 35475, 36893, 37604, [12233, 40653], [12239, 40736],
-    [12067, 22805], 22893, 24109, 24796, 26132, 26227, 26512, 27728, 28101,
-    28511, [12143, 30707], 30889, 33990, 37323, 37675, 20185, 20682, 20808,
-    21892, 23307, 23459, 25159, 25982, 26059, 28210, 29053, 29697, 29764,
-    29831, 29887, 30316, 31146, 32218, 32341, 32680, 33146, 33203, 33337,
-    34330, 34796, 35445, 36323, 36984, 37521, 37925, 39245, 39854, 21352,
-    23633, 26964, 27844, 27945, 28203, [12166, 33292], 34203, 35131, 35373,
-    [35498, 63855, 63905], 38634, 40807, 21089, 26297, 27570, 32406, 34814,
-    36109, 38275, 38493, 25885, 28041, 29166, 22478, 22995, 23468, 24615,
-    24826, 25104, 26143, 26207, 29481, 29689, 30427, [30465, 63853], 31596,
-    32854, 32882, 33125, 35488, 37266, 19990, 21218, 27506, 27927, 31237,
-    31545, 32048, 36016, 21484, 22063, 22609, 23477, [12073, 23567], 23569,
-    24034, 25152, 25475, 25620, 26157, 26803, 27836, 28040, 28335, 28703,
-    28836, 29138, 29990, 30095, 30094, 30233, 31505, 31712, 31787, 32032,
-    32057, 34092, 34157, 34311, 35380, 36877, 36961, 37045, 37559, 38902,
-    39479, 20439, 23660, 26463, 28049, 31903, 32396, 35606, 36118, 36895,
-    23403, 24061, 25613, 33984, 36956, 39137, [29575, 63841, 63963], 23435,
-    24730, 26494, 28126, 35359, 35494, 36865, 38924, 21047, 28753, 30862,
-    37782, 34928, 37335, 20462, 21463, 22013, 22234, 22402, 22781, 23234,
-    23432, 23723, 23744, 24101, 24833, 25101, [12095, 25163], 25480, 25628,
-    25910, [25976, 63849], 27193, 27530, [12116, 27700], 27929, 28465, 29159,
-    29417, 29560, 29703, 29874, 30246, 30561, 31168, 31319, 31466, 31929,
-    32143, 32172, 32353, 32670, 33065, 33585, 33936, 34010, 34282, 34966,
-    35504, 35728, 36664, 36930, 36995, 37228, 37526, 37561, 38539,
-    {f: 2, c: 38567}, 38614, 38656, 38920, [12216, 39318], 39635, 39706, 21460,
-    22654, 22809, 23408, 23487, 28113, 28506, 29087, 29729, 29881, 32901,
-    33789, 24033, 24455, 24490, 24642, 26092, 26642, 26991, 27219, 27529,
-    27957, 28147, 29667, 30462, 30636, 31565, 32020, 33059, 33308, 33600,
-    34036, 34147, 35426, 35524, 37255, 37662, 38918, 39348, 25100, 34899,
-    36848, 37477, 23815, 23847, 23913, 29791, 33181, 34664, 28629,
-    [25342, 63859], 32722, 35126, 35186, 19998, 20056, 20711, 21213, 21319,
-    25215, 26119, 32361, 34821, 38494, 20365, 21273, 22070, 22987, 23204,
-    [12075, 23608], 23630, 23629, 24066, 24337, 24643, 26045, 26159, 26178,
-    26558, 26612, 29468, [12142, 30690], [12144, 31034], 32709, 33940, 33997,
-    35222, 35430, 35433, 35553, [12183, 35925], 35962, 22516, 23508, 24335,
-    24687, 25325, 26893, 27542, 28252, 29060, 31698, 34645, [35672, 63996],
-    36606, [12215, 39135], 39166, 20280, 20353, 20449, 21627, 23072, 23480,
-    24892, 26032, 26216, 29180, 30003, 31070, 32051, 33102, [12162, 33251],
-    33688, 34218, 34254, 34563, 35338, [12189, 36523], [12191, 36763], 36805,
-    22833, 23460, 23526, 24713, 23529, 23563, [12092, 24515], 27777, 28145,
-    28683, 29978, 33455, 35574, [20160, 63997], [12055, 21313], 38617,
-    [12114, 27663], 20126, 20420, 20818, 21854, 23077, 23784, 25105,
-    [12123, 29273], 33469, 33706, 34558, 34905, 35357, 38463, 38597, 39187,
-    40201, 40285, 22538, 23731, 23997, 24132, [24801, 63929], 24853, 25569,
-    [27138, 63764, 63836, 63935], 28197, 37122, 37716, 38990, 39952, 40823,
-    23433, 23736, 25353, 26191, 26696, 30524, 38593, 38797, 38996, 39839,
-    26017, 35585, 36555, 38332, 21813, 23721, 24022, 24245, 26263, 30284,
-    33780, 38343, 22739, 25276, 29390, 40232, 20208, 22830, 24591, 26171,
-    27523, 31207, 40230, 21395, 21696, 22467, 23830, 24859, 26326, 28079,
-    30861, 33406, 38552, 38724, 21380, 25212, 25494, 28082, 32266, 33099,
-    38989, 27387, 32588, 40367, 40474, 20063, 20539, 20918, 22812, 24825,
-    25590, 26928, 29242, 32822, 37326, 24369, 32004, [33509, 63860], 33903,
-    33979, 34277, 36493, 20335, 22756, 23363, 24665, 25562, 25880, 25965,
-    26264, 26954, 27171, 27915, 28673, 29036, 30162, 30221, 31155, 31344,
-    [12154, 32650], 35140, 35731, 37312, 38525, 39178, 22276, 24481, 26044,
-    28417, 30208, 31142, 35486, 39341, [12226, 39770], 40812, 20740, 25014,
-    25233, 27277, 33222, 20547, 22576, 24422, 28937, [12180, 35328], 35578,
-    23420, 34326, 20474, 20796, 22196, 22852, 25513, 28153, 23978, 26989,
-    20870, 20104, 20313, 22914, 27487, 27741, 29877, 30998, 33287, 33349,
-    33593, 36671, 36701, 39192, 20134, 22495, 24441, [26131, 63968], 30123,
-    32377, 35695, 36870, 39515, 22181, 22567, 23032, 23071, 23476, 24310,
-    25424, 25403, 26941, 27783, 27839, 28046, 28051, 28149, 28436, 28895,
-    28982, 29017, 29123, 29141, 30799, 30831, 31605, 32227, 32303, 34893,
-    36575, 37467, 40182, 24709, 28037, 29105, 38321, 21421, 26579, 28814,
-    28976, 29744, 33398, 33490, 38331, 39653, 40573, 26308, 29121,
-    [33865, 63854], 22603, 23992, 24433, 26144, 26254, 27001, 27054, 27704,
-    27891, 28214, 28481, 28634, 28699, 28719, 29008, 29151, 29552, 29787,
-    29908, 30408, 31310, 32403, 33521, 35424, 36814, 37704, 38681, 20034,
-    20522, 21000, 21473, 26355, 27757, 28618, 29450, 30591, 31330, 33454,
-    34269, 34306, 35028, 35427, 35709, 35947, 37555, 38675, 38928, 20116,
-    20237, 20425, 20658, 21320, 21566, 21555, 21978, 22626, 22714, 22887,
-    23067, 23524, 24735, 25034, 25942, 26111, 26212, 26791, 27738, 28595,
-    28879, 29100, 29522, 31613, 34568, 35492, 39986, 40711, 23627, 27779,
-    29508, [12127, 29577], 37434, 28331, 29797, 30239, 31337, 32277, 34314,
-    20800, 22725, 25793, 29934, 29973, 30320, 32705, 37013, 38605, 39252,
-    28198, [12129, 29926], {f: 2, c: 31401}, 33253, 34521, 34680, 35355, 23113,
-    23436, 23451, 26785, 26880, 28003, 29609, 29715, 29740, 30871, 32233,
-    32747, 33048, 33109, 33694, 35916, [38446, 63942], 38929, [12104, 26352],
-    24448, 26106, 26505, 27754, 29579, 20525, 23043, 27498, 30702, 22806,
-    23916, 24013, 29477, 30031, 20709, 20985, 22575, 22829, 22934, 23002,
-    23525, 23970, 25303, 25622, 25747, 25854, 26332, 27208, 29183, 29796,
-    31368, 31407, 32327, 32350, 32768, 33136, 34799, 35201, 35616, 36953,
-    36992, 39250, 24958, 27442, 28020, 32287, 35109, 36785, 20433, 20653,
-    20887, 21191, 22471, 22665, 23481, 24248, 24898, 27029, 28044, 28263,
-    28342, 29076, 29794, [12132, 29992], 29996, 32883, 33592, 33993, 36362,
-    37780, 37854, 20110, 20305, 20598, 20778, [12060, 21448], 21451, 21491,
-    23431, 23507, 23588, 24858, 24962, 26100, [12124, 29275], 29591, 29760,
-    30402, 31056, 31121, 31161, 32006, [12155, 32701], 33419, 34261, 34398,
-    36802, 36935, 37109, 37354, 38533, [12204, 38632], 38633, 21206, 24423,
-    26093, 26161, 26671, 29020, 31286, 37057, 38922, 20113, 27218, 27550,
-    28560, 29065, 32792, 33464, 34131, 36939, 38549, 38642, 38907, 34074,
-    39729, 20112, 29066, 38596, 20803, 21407, 21729, 22291, 22290, 22435,
-    23195, 23236, 23491, 24616, 24895, 25588, 27781, 27961, 28274, 28304,
-    29232, 29503, 29783, 33489, 34945, 36677, 36960, 38498, 39000, 40219,
-    [12105, 26376], 36234, 37470, 20301, 20553, 20702, 21361, 22285, 22996,
-    23041, 23561, 24944, 26256, 28205, 29234, 29771, 32239, 32963, 33806,
-    33894, 34111, 34655, 34907, 35096, 35586, 36949, [12209, 38859], 39759,
-    20083, 20369, 20754, 20842, 21807, 21929, 23418, 23461, {f: 2, c: 24188},
-    24254, 24736, 24799, {f: 2, c: 24840}, 25540, 25912, 26377, 26580, 26586,
-    {f: 2, c: 26977}, 27833, 27943, 28216, 28641, {f: 2, c: 29494}, 29788,
-    30001, 30290, 32173, 33278, 33848, 35029, 35480, 35547, 35565, 36400,
-    36418, 36938, 36926, 36986, [12195, 37193], 37321, 37742, 22537, 27603,
-    [12161, 32905], 32946, 20801, 22891, 23609, 28516, 29607, 32996, 36103,
-    37399, 38287, [12160, 32895], 25102, 28700, 32104, 34701, 22432, 24681,
-    24903, 27575, 35518, 37504, 38577, [12036, 20057], 21535, 28139, 34093,
-    38512, [12211, 38899], 39150, 25558, 27875, [12194, 37009], 20957, 25033,
-    33210, 40441, 20381, 20506, 20736, 23452, 24847, 25087, 25836, 26885,
-    27589, 30097, 30691, 32681, 33380, 34191, 34811, [12176, 34915], 35516,
-    35696, 37291, [12038, 20108], 20197, 20234, 22839, 23016, 24050, 24347,
-    24411, 24609, 29246, 29669, [30064, 63842], 30157, 31227, [12157, 32780],
-    [12159, 32819], 32900, 33505, 33617, 36029, 36019, 36999, 39156, 39180,
-    28727, 30410, 32714, 32716, 32764, 35610, [12040, 20154], 20161, 20995,
-    21360, [21693, 63902], 22240, 23035, 23493, 24341, 24525, 28270, 32106,
-    33589, 34451, 35469, 38765, 38775, [12032, 19968], 20314, 20350, 22777,
-    [12103, 26085], 28322, 36920, 37808, 39353, 20219, 22764, 22922, 23001,
-    24641, 31252, 33615, 36035, [12042, 20837], 21316, 20173, 21097, 23381,
-    33471, 20180, [21050, 63999], 21672, 22985, 23039, [12070, 23376], 23383,
-    23388, 24675, 24904, 28363, [28825, 63995], 29038, 29574, 29943, 30133,
-    30913, 32043, 32773, [12163, 33258], 33576, 34071, 34249, 35566, 36039,
-    38604, 20316, 21242, 22204, 26027, 26152, 28796, 28856, 29237, 32189,
-    33421, 37196, 38592, 40306, 23409, 26855, 27544, 28538, 30430, 23697,
-    26283, 28507, 31668, 31786, 34870, 38620, 19976, 20183, 21280, 22580,
-    22715, 22767, 22892, 23559, 24115, 24196, 24373, 25484, 26290, 26454,
-    27167, 27299, 27404, 28479, 29254, 29520, 29835, 31456, 31911, 33144,
-    33247, 33255, 33674, 33900, 34083, 34196, 34255, 35037, 36115, 37292,
-    [12199, 38263], 38556, 20877, 21705, 22312, 23472, 25165, 26448, 26685,
-    26771, 28221, 28371, 28797, 32289, 35009, 36001, 36617, 40779, 40782,
-    29229, 31631, 35533, 37658, 20295, 20302, 20786, 21632, 22992, 24213,
-    25269, 26485, 26990, 27159, 27822, 28186, 29401, 29482, 30141, 31672,
-    32053, 33511, 33785, 33879, 34295, 35419, 36015, 36487, 36889, 37048,
-    38606, 40799, 21219, 21514, 23265, 23490, 25688, 25973, 28404, 29380,
-    30340, 31309, 31515, 31821, 32318, 32735, 33659, 35627, 36042,
-    [12186, 36196], 36321, 36447, 36842, 36857, 36969, 37841, 20291, 20346,
-    20659, 20840, 20856, 21069, 21098, 22625, 22652, 22880, 23560, 23637,
-    24283, 24731, 25136, 26643, 27583, 27656, 28593, 29006, 29728,
-    [12133, 30000], 30008, 30033, 30322, 31564, 31627, 31661, 31686, 32399,
-    35438, 36670, 36681, 37439, 37523, 37666, 37931, 38651, 39002, 39019,
-    39198, [20999, 64000], 25130, 25240, 27993, 30308, 31434, 31680, 32118,
-    21344, 23742, 24215, 28472, 28857, 31896, 38673, 39822, 40670, 25509,
-    25722, 34678, 19969, 20117, 20141, 20572, 20597, 21576, 22979, 23450,
-    24128, 24237, 24311, 24449, 24773, 25402, 25919, 25972, 26060, 26230,
-    26232, 26622, 26984, 27273, 27491, 27712, 28096, 28136, 28191, 28254,
-    28702, 28833, 29582, 29693, 30010, 30555, 30855, 31118, 31243, 31357,
-    31934, 32142, 33351, 35330, 35562, 35998, 37165, 37194, 37336, 37478,
-    37580, 37664, 38662, 38742, 38748, 38914, [12237, 40718], 21046, 21137,
-    21884, 22564, 24093, 24351, 24716, 25552, 26799, 28639, 31085, 31532,
-    33229, 34234, 35069, 35576, 36420, 37261, 38500, 38555, 38717, 38988,
-    [12241, 40778], 20430, 20806, 20939, 21161, 22066, 24340, 24427, 25514,
-    25805, 26089, 26177, 26362, 26361, 26397, 26781, 26839, 27133, 28437,
-    28526, 29031, 29157, [12118, 29226], 29866, 30522, 31062, 31066, 31199,
-    31264, 31381, 31895, 31967, 32068, 32368, 32903, 34299, 34468, 35412,
-    35519, 36249, 36481, 36896, 36973, 37347, 38459, 38613, [12227, 40165],
-    26063, 31751, [12188, 36275], 37827, 23384, 23562, 21330, 25305, 29469,
-    20519, 23447, 24478, 24752, 24939, 26837, 28121, 29742, 31278, 32066,
-    32156, 32305, 33131, 36394, 36405, 37758, 37912, 20304, 22352, 24038,
-    24231, 25387, 32618, 20027, 20303, 20367, 20570, 23005, 32964, 21610,
-    21608, 22014, 22863, 23449, 24030, 24282, 26205, 26417, 26609, 26666,
-    27880, 27954, 28234, 28557, 28855, 29664, 30087, 31820, 32002, 32044,
-    32162, [12168, 33311], 34523, 35387, 35461, [12187, 36208], 36490, 36659,
-    36913, 37198, 37202, 37956, 39376, [12149, 31481], 31909, 20426, 20737,
-    20934, 22472, 23535, 23803, 26201, 27197, 27994, 28310, 28652, 28940,
-    30063, 31459, 34850, 36897, 36981, 38603, 39423, 33537, 20013, 20210,
-    34886, 37325, 21373, 27355, 26987, 27713, 33914, 22686, 24974, 26366,
-    25327, 28893, 29969, 30151, 32338, 33976, 35657, 36104, 20043, 21482,
-    21675, 22320, 22336, 24535, 25345, 25351, 25711, [12096, 25903], 26088,
-    26234, 26525, 26547, [12108, 27490], 27744, 27802, 28460, 30693, 30757,
-    31049, 31063, 32025, 32930, 33026, [12164, 33267], 33437, 33463, 34584,
-    35468, 36100, 36286, 36978, 30452, 31257, 31287, 32340, 32887, 21767,
-    21972, 22645, 25391, 25634, 26185, 26187, 26733, 27035, 27524, 27941,
-    28337, 29645, 29800, 29857, 30043, 30137, 30433, 30494, 30603, 31206,
-    32265, 32285, 33275, 34095, 34967, 35386, 36049, 36587,
-    [12192, 36784, 63857], 36914, 37805, 38499, 38515, 38663, 20356, 21489,
-    23018, 23241, 24089, 26702, 29894, 30142, 31209, 31378, 33187, 34541,
-    36074, 36300, 36845, 26015, 26389, 22519, 28503, 32221, 36655, 37878,
-    38598, 24501, 25074, 28548, 19988, 20376, 20511, 21449, 21983, 23919,
-    24046, 27425, 27492, 30923, 31642, 36425, [12190, 36554, 63746], 36974,
-    25417, 25662, 30528, 31364, 37679, 38015, 40810, 25776, 28591, 29158,
-    29864, 29914, 31428, 31762, 32386, 31922, 32408, 35738, 36106, 38013,
-    39184, 39244, 21049, 23519, 25830, 26413, 32046, 20717, [21443, 63851],
-    22649, {f: 2, c: 24920}, 25082, 26028, 31449, 35730, 35734, 20489, 20513,
-    21109, 21809, 23100, 24288, 24432, 24884, 25950, 26124, 26166, 26274,
-    27085, 28356, 28466, 29462, 30241, 31379, 33081, 33369, 33750, 33980,
-    20661, 22512, 23488, 23528, 24425, 25505, 30758, 32181, 33756, 34081,
-    37319, 37365, 20874, 26613, 31574, 36012, 20932, 22971, 24765, 34389,
-    20508, 21076, 23610, 24957, 25114, [25299, 64002], 25842, 26021, 28364,
-    30240, 33034, 36448, 38495, 38587, 20191, 21315, 21912, 22825, 24029,
-    25797, 27849, 28154, 29588, 31359, [12167, 33307], 34214, 36068, 36368,
-    36983, 37351, 38369, 38433, 38854, 20984, 21746, 21894, 24505, 25764,
-    28552, 32180, 36639, 36685, 37941, 20681, 23574, 27838, 28155, 29979,
-    30651, 31805, 31844, 35449, 35522, 22558, 22974, 24086, 25463, 29266,
-    30090, 30571, 35548, 36028, 36626, 24307, 26228, 28152, 32893, 33729,
-    35531, [12205, 38737], 39894, 21059, 26367, 28053, 28399, 32224, 35558,
-    36910, 36958, 39636, 21021, 21119, 21736, 24980, 25220, 25307, 26786,
-    26898, 26970, 27189, 28818, 28966, 30813, 30977, 30990, 31186, 31245,
-    32918, [12171, 33400], 33493, 33609, 34121, 35970, 36229, 37218, 37259,
-    37294, 20419, 22225, 29165, 30679, 34560, 35320, [12072, 23544], 24534,
-    26449, 37032, 21474, 22618, 23541, 24740, 24961, 25696, 32317, 32880,
-    34085, 37507, 25774, 20652, 23828, 26368, 22684, 25277, 25512, 26894,
-    27000, 27166, 28267, 30394, 31179, 33467, 33833, 35535, 36264, 36861,
-    37138, 37195, 37276, 37648, 37656, 37786, 38619, 39478, 39949, 19985,
-    30044, 31069, 31482, 31569, 31689, 32302, 33988, 36441, 36468, 36600,
-    36880, 26149, 26943, 29763, 20986, 26414, 40668, 20805, 24544, 27798,
-    34802, 34909, 34935, 24756, 33205, 33795, 36101, 21462, 21561, 22068,
-    23094, 23601, 28810, 32736, 32858, 33030, 33261, 36259, 37257, 39519,
-    40434, 20596, 20164, 21408, 24827, 28204, 23652, 20360, 20516, 21988,
-    23769, 24159, 24677, 26772, 27835, 28100, 29118, 30164, 30196, 30305,
-    31258, 31305, 32199, 32251, 32622, 33268, 34473, 36636, 38601, 39347,
-    [12242, 40786], 21063, 21189, 39149, 35242, 19971, 26578, 28422, 20405,
-    23522, 26517, [27784, 63858], 28024, 29723, 30759, 37341, 37756, 34756,
-    31204, 31281, 24555, 20182, 21668, 21822, 22702, 22949, 24816, 25171,
-    25302, 26422, 26965, 33333, 38464, 39345, 39389, 20524, 21331, 21828,
-    22396, 25176, 25826, 26219, 26589, 28609, 28655, 29730, 29752, 35351,
-    37944, 21585, 22022, 22374, 24392, 24986, 27470, 28760, 28845, 32187,
-    35477, 22890, 33067, 25506, 30472, 32829, 36010, 22612, 25645, 27067,
-    23445, 24081, 28271, 34153, 20812, 21488, 22826, 24608, 24907, 27526,
-    27760, 27888, 31518, 32974, 33492, 36294, 37040, 39089, 25799, 28580,
-    25745, 25860, 20814, 21520, [12063, 22303], 35342, 24927, 26742, 30171,
-    31570, 32113, 36890, 22534, 27084, 33151, 35114, 36864, 38969, 20600,
-    22871, 22956, 25237, 36879, 39722, 24925, 29305, 38358, 22369, 23110,
-    24052, 25226, 25773, 25850, 26487, 27874, 27966, 29228, 29750, 30772,
-    32631, 33453, 36315, 38935, 21028, 22338, 26495, 29256, 29923, 36009,
-    36774, 37393, 38442, [12043, 20843], 21485, 25420, 20329, 21764, 24726,
-    25943, 27803, 28031, 29260, 29437, 31255, 35207, [12185, 35997], 24429,
-    28558, 28921, 33192, 24846, [20415, 63845], 20559, 25153, [12122, 29255],
-    31687, 32232, 32745, 36941, 38829, 39449, 36022, 22378, 24179, 26544,
-    33805, 35413, 21536, 23318, 24163, 24290, 24330, 25987, 32954, 34109,
-    38281, 38491, 20296, 21253, 21261, 21263, 21638, 21754, 22275, 24067,
-    24598, 25243, 25265, 25429, 27873, 28006, 30129, 30770, 32990, 33071,
-    33502, 33889, 33970, 34957, 35090, 36875, 37610, 39165, 39825, 24133,
-    [26292, 64006], 26333, 28689, 29190, 20469, 21117, 24426, 24915, 26451,
-    27161, 28418, 29922, 31080, 34920, 35961, 39111, 39108, 39491, 21697,
-    31263, 26963, 35575, 35914, [12213, 39080], 39342, 24444, 25259, 30130,
-    [12138, 30382], 34987, 36991, 38466, 21305, 24380, 24517, [27852, 63848],
-    29644, 30050, [12134, 30091], 31558, 33534, 39325, 20047, 36924, 19979,
-    20309, 21414, 22799, 24264, 26160, 27827, 29781, 33655, 34662, 36032,
-    36944, 38686, 39957, 22737, 23416, 34384, 35604, 40372, 23506, 24680,
-    24717, 26097, 27735, 28450, 28579, 28698, 32597, 32752, {f: 2, c: 38289},
-    38480, 38867, 21106, 36676, 20989, 21547, 21688, 21859, 21898, 27323,
-    28085, 32216, 33382, 37532, 38519, 40569, 21512, 21704, 30418, 34532,
-    38308, 38356, 38492, 20130, 20233, 23022, 23270, 24055, 24658, 25239,
-    26477, 26689, 27782, 28207, 32568, 32923, 33322, 38917, 20133, 20565,
-    21683, 22419, 22874, 23401, 23475, 25032, 26999, 28023, 28707, 34809,
-    35299, 35442, 35559, 36994, 39405, 39608, 21182, 26680, 20502, 24184,
-    26447, 33607, [12175, 34892, 64008], 20139, 21521, 22190, 29670, 37141,
-    38911, 39177, 39255, [12217, 39321], 22099, 22687, 34395, 35377, 25010,
-    27382, 29563, 36562, 27463, 38570, 39511, 22869, 29184, 36203,
-    [12208, 38761], 20436, 23796, 24358, 25080, 26203, 27883, 28843,
-    [12126, 29572], 29625, 29694, 30505, 30541, 32067, 32098, 32291, 33335,
-    34898, 36066, 37449, 39023, 23377, [12147, 31348], [12174, 34880],
-    [12212, 38913], 23244, 20448, 21332, 22846, 23805, 25406, 28025, 29433,
-    33029, 33031, 33698, 37583, 38960, 20136, 20804, 21009, 22411, 24418,
-    27842, 28366, 28677, 28752, 28847, 29074, 29673, [29801, 63918], 33610,
-    34722, 34913, 36872, 37026, 37795, 39336, 20846, 24407, 24800, 24935,
-    26291, 34137, 36426, 37295, 38795, 20046, 20114, 21628, 22741, 22778,
-    22909, 23733, 24359, [12094, 25142], 25160, 26122, 26215, 27627, 28009,
-    28111, 28246, 28408, 28564, 28640, 28649, 28765, 29392, 29733, 29786,
-    29920, 30355, 31068, 31946, 32286, 32993, 33446, 33899, 33983, 34382,
-    34399, 34676, 35703, 35946, 37804, 38912, 39013, 24785, 25110, 37239,
-    23130, 26127, 28151, 28222, 29759, 39746, 24573, 24794, 31503, 21700,
-    24344, 27742, 27859, 27946, 28888, 32005, 34425, 35340, 40251, 21270,
-    21644, 23301, 27194, [12117, 28779], 30069, 31117, [12146, 31166], 33457,
-    33775, 35441, 35649, 36008, 38772, 25844, 25899, {f: 2, c: 30906}, 31339,
-    20024, 21914, 22864, 23462, 24187, 24739, 25563, 27489, 26213, 26707,
-    28185, 29029, 29872, 32008, 36996, 39529, 39973, 27963, [28369, 63748],
-    29502, 35905, 38346, 20976, 24140, 24488, 24653, 24822, 24880, 24908,
-    {f: 2, c: 26179}, 27045, 27841, 28255, 28361, 28514, 29004, 29852, 30343,
-    31681, 31783, 33618, 34647, 36945, 38541, [12232, 40643], 21295, 22238,
-    24315, 24458, 24674, 24724, 25079, 26214, 26371, 27292, 28142, 28590,
-    28784, 29546, 32362, 33214, 33588, 34516, 35496, 36036, 21123, 29554,
-    23446, 27243, 37892, 21742, 22150, 23389, 25928, 25989, 26313, 26783,
-    28045, 28102, [12120, 29243], 32948, 37237, 39501, 20399, 20505, 21402,
-    21518, 21564, 21897, 21957, 24127, 24460, 26429, 29030, 29661, 36869,
-    21211, 21235, 22628, 22734, 28932, 29071, 29179, 34224, 35347,
-    [26248, 63941], 34216, 21927, 26244, 29002, 33841, 21321, 21913, 27585,
-    24409, 24509, 25582, 26249, 28999, 35569, 36637, 40638, 20241, 25658,
-    28875, 30054, 34407, 24676, 35662, 40440, 20807, 20982, 21256, 27958,
-    33016, [12234, 40657], 26133, 27427, 28824, 30165, 21507, 23673, 32007,
-    35350, [12107, 27424], 27453, 27462, 21560, 24688, 27965, 32725, 33288,
-    20694, 20958, 21916, 22123, 22221, 23020, 23305, 24076, 24985, 24984,
-    25137, 26206, 26342, 29081, {f: 2, c: 29113}, 29351, 31143, 31232, 32690,
-    35440, {s: 163}, {f: 4, c: 12310}, {s: 14}, 8223, 8219, {f: 2, c: 8314},
-    {s: 7}, 8316, 0, {f: 2, c: 8317}, {s: 23}, 700, {s: 44}, 8942, 8759,
-    {s: 20}, {f: 10, c: 10122}, {s: 36}, {f: 26, c: 9398}, {s: 61},
-    {f: 2, c: 8826}, {f: 2, c: 8910}, {f: 2, c: 8832}, {f: 4, c: 8816}, 0,
-    8842, 0, 8843, {f: 2, c: 8822}, 8825, {f: 2, c: 8922}, {s: 5}, 8773, 8771,
-    8776, 0, 8868, {s: 78}, 8244, {s: 11}, 9839, {s: 4}, 8258, {s: 4}, 10045,
-    0, 0, 8226, {s: 4}, {f: 2, c: 8249}, {s: 16}, 10010, 10006, 0, 9711,
-    {s: 3}, 10070, 0, 9676, {s: 24}, 9775, {s: 6}, 12320, 0, {f: 10, c: 10102},
-    {s: 17}, 12306, 12342, {s: 13}, 8710, 0, 8735, 0, {f: 2, c: 8741}, 0, 8787,
-    8785, {f: 2, c: 8806}, 8723, {f: 3, c: 8853}, 0, 8980, 0, 0, 8802, 0, 9649,
-    0, 8738, 8784, 0, 0, 8867, 0, 0, {f: 2, c: 8814}, 8837, 8836, 8713, 8716,
-    {f: 2, c: 8891}, 8794, 8966, {s: 6}, 12958, 0, 8252, {s: 11}, 9702, {s: 3},
-    9663, 9653, 9657, 9667, {s: 4}, 9674, 12849, 12857, 13259, {f: 5, c: 9327},
-    {s: 18}, 8656, 8655, 8653, {s: 37}, 8657, 8659, {s: 8}, 8626, 8625, 0,
-    8628, 8624, 8627, {s: 14}, 8636, 8640, {s: 10}, {f: 2, c: 8644}, {s: 144},
-    {f: 5, c: 9347}, {s: 33}, 12948, {s: 15}, 12965, {s: 93}, 8672, 8674, 8673,
-    8675, {s: 4}, 8678, 8680, 8679, 8681, {s: 20}, 9757, 9759, {s: 76}, 12944,
-    {f: 6, c: 12938}, {s: 15}, {f: 2, c: 12318}, 8246, 0, 8245, {s: 3}, 12540,
-    0, 0, {f: 2, c: 44034}, {f: 2, c: 44037}, {f: 5, c: 44043}, 44056,
-    {f: 2, c: 44062}, {f: 3, c: 44065}, {f: 7, c: 44069}, 44078,
-    {f: 6, c: 44082}, {f: 2, c: 44090}, {f: 3, c: 44093}, {f: 10, c: 44097},
-    44108, {f: 6, c: 44110}, {f: 3, c: 44117}, {f: 3, c: 44121},
-    {f: 19, c: 44125}, {f: 2, c: 44146}, {f: 2, c: 44149}, 44153,
-    {f: 5, c: 44155}, 44162, {f: 2, c: 44167}, {f: 3, c: 44173},
-    {f: 3, c: 44177}, {f: 7, c: 44181}, 44190, {f: 6, c: 44194}, 44203,
-    {f: 2, c: 44205}, {f: 7, c: 44209}, 44218, {f: 3, c: 44222},
-    {f: 2, c: 44226}, {f: 3, c: 44229}, {f: 3, c: 44233}, {f: 8, c: 44237},
-    44246, {f: 8, c: 44248}, {f: 2, c: 44258}, {f: 2, c: 44261}, 44265, 44267,
-    {f: 2, c: 44269}, 44274, 44276, {f: 5, c: 44279}, {f: 2, c: 44286},
-    {f: 3, c: 44289}, 44293, {f: 5, c: 44295}, 44302, 44304, {f: 6, c: 44306},
-    {f: 3, c: 44313}, {f: 3, c: 44317}, {f: 8, c: 44321}, {f: 2, c: 44330},
-    {f: 6, c: 44334}, {f: 2, c: 44342}, {f: 3, c: 44345}, {f: 7, c: 44349},
-    44358, 44360, {f: 6, c: 44362}, {f: 3, c: 44369}, {f: 3, c: 44373},
-    {f: 8, c: 44377}, 44386, {f: 8, c: 44388}, {f: 2, c: 44398},
-    {f: 2, c: 44401}, {f: 4, c: 44407}, 44414, 44416, {f: 5, c: 44419},
-    {f: 2, c: 44426}, {f: 3, c: 44429}, {f: 11, c: 44433}, {f: 6, c: 44446},
-    {f: 18, c: 44453}, {f: 8, c: 44472}, {f: 2, c: 44482}, {f: 3, c: 44485},
-    {f: 7, c: 44489}, 44498, {f: 8, c: 44500}, {f: 3, c: 44509},
-    {f: 3, c: 44513}, {f: 19, c: 44517}, {f: 2, c: 44538}, {f: 2, c: 44541},
-    {f: 6, c: 44546}, 44554, 44556, {f: 6, c: 44558}, {f: 27, c: 44565},
-    {f: 2, c: 44594}, {f: 2, c: 44597}, 44601, {f: 5, c: 44603}, 44610, 44612,
-    {f: 3, c: 44615}, 44619, 44623, {f: 3, c: 44625}, 44629, {f: 5, c: 44631},
-    44638, {f: 3, c: 44642}, {f: 2, c: 44646}, {f: 2, c: 44650},
-    {f: 3, c: 44653}, {f: 7, c: 44657}, 44666, {f: 6, c: 44670},
-    {f: 6, c: 44678}, {f: 47, c: 44685}, 44735, {f: 3, c: 44737},
-    {f: 7, c: 44741}, 44750, {f: 6, c: 44754}, {f: 2, c: 44762},
-    {f: 11, c: 44765}, {f: 2, c: 44777}, 44780, {f: 6, c: 44782},
-    {f: 3, c: 44789}, {f: 3, c: 44793}, {f: 10, c: 44797}, {f: 4, c: 44809},
-    {f: 2, c: 44814}, {f: 27, c: 44817}, {f: 2, c: 44846}, 44849, 44851,
-    {f: 7, c: 44853}, 44862, 44864, {f: 4, c: 44868}, {f: 6, c: 44874},
-    {f: 11, c: 44881}, {f: 6, c: 44894}, {f: 19, c: 44902}, {f: 6, c: 44922},
-    {f: 3, c: 44929}, {f: 3, c: 44933}, {f: 7, c: 44937}, {f: 3, c: 44946},
-    {f: 6, c: 44950}, {f: 27, c: 44957}, {f: 2, c: 44986}, {f: 3, c: 44989},
-    {f: 6, c: 44993}, 45002, 45004, {f: 5, c: 45007}, {f: 7, c: 45013},
-    {f: 11, c: 45021}, {f: 6, c: 45034}, {f: 2, c: 45042}, {f: 3, c: 45045},
-    {f: 7, c: 45049}, {f: 2, c: 45058}, {f: 7, c: 45061}, {f: 3, c: 45069},
-    {f: 3, c: 45073}, {f: 7, c: 45077}, {f: 10, c: 45086}, {f: 27, c: 45097},
-    {f: 2, c: 45126}, 45129, 45131, 45133, {f: 4, c: 45135}, 45142, 45144,
-    {f: 3, c: 45146}, {f: 30, c: 45150}, {f: 2, c: 45182}, {f: 3, c: 45185},
-    {f: 7, c: 45189}, 45198, 45200, {f: 6, c: 45202}, 45211, {f: 2, c: 45213},
-    {f: 5, c: 45219}, 45226, 45232, 45234, {f: 2, c: 45238}, {f: 3, c: 45241},
-    {f: 7, c: 45245}, 45254, {f: 6, c: 45258}, {f: 2, c: 45266},
-    {f: 3, c: 45269}, {f: 7, c: 45273}, {f: 4, c: 45281}, {f: 34, c: 45286},
-    45322, {f: 3, c: 45325}, 45329, {f: 4, c: 45332}, 45338, {f: 5, c: 45342},
-    {f: 2, c: 45350}, {f: 3, c: 45353}, {f: 7, c: 45357}, 45366,
-    {f: 6, c: 45370}, {f: 2, c: 45378}, {f: 3, c: 45381}, {f: 7, c: 45385},
-    {f: 2, c: 45394}, {f: 2, c: 45398}, {f: 3, c: 45401}, {f: 3, c: 45405},
-    {f: 23, c: 45409}, {f: 2, c: 45434}, {f: 3, c: 45437}, 45441,
-    {f: 5, c: 45443}, 45450, 45452, {f: 4, c: 45454}, {f: 3, c: 45461},
-    {f: 3, c: 45465}, {f: 11, c: 45469}, {f: 35, c: 45481}, {f: 3, c: 45517},
-    {f: 3, c: 45521}, {f: 7, c: 45525}, 45534, {f: 8, c: 45536},
-    {f: 2, c: 45546}, {f: 3, c: 45549}, {f: 8, c: 45553}, 45562, 45564,
-    {f: 6, c: 45566}, {f: 2, c: 45574}, {f: 2, c: 45577}, {f: 7, c: 45581},
-    45590, 45592, {f: 6, c: 45594}, {f: 19, c: 45601}, {f: 7, c: 45621},
-    {f: 27, c: 45629}, {f: 3, c: 45657}, {f: 3, c: 45661}, {f: 7, c: 45665},
-    {f: 10, c: 45674}, {f: 6, c: 45686}, {f: 7, c: 45693}, {f: 3, c: 45702},
-    {f: 6, c: 45706}, {f: 2, c: 45714}, {f: 3, c: 45717}, {f: 5, c: 45723},
-    45730, 45732, {f: 3, c: 45735}, 45739, {f: 3, c: 45741}, {f: 3, c: 45745},
-    {f: 19, c: 45749}, {f: 2, c: 45770}, {f: 3, c: 45773}, 45777,
-    {f: 5, c: 45779}, 45786, 45788, {f: 4, c: 45790}, 45795, 45799,
-    {f: 2, c: 45801}, {f: 3, c: 45808}, 45814, {f: 3, c: 45820},
-    {f: 2, c: 45826}, {f: 3, c: 45829}, {f: 7, c: 45833}, 45842,
-    {f: 6, c: 45846}, {f: 55, c: 45853}, 45911, {f: 2, c: 45913}, 45917,
-    {f: 4, c: 45920}, 45926, 45928, 45930, {f: 2, c: 45932}, 45935,
-    {f: 2, c: 45938}, {f: 3, c: 45941}, {f: 7, c: 45945}, 45954,
-    {f: 6, c: 45958}, {f: 3, c: 45965}, {f: 3, c: 45969}, {f: 11, c: 45973},
-    {f: 6, c: 45986}, {f: 3, c: 45993}, {f: 23, c: 45997}, {f: 2, c: 46022},
-    {f: 2, c: 46025}, 46029, 46031, {f: 3, c: 46033}, 46038, 46040, 46042,
-    46044, {f: 2, c: 46046}, {f: 3, c: 46049}, {f: 3, c: 46053},
-    {f: 19, c: 46057}, {f: 19, c: 46077}, {f: 7, c: 46097}, {f: 3, c: 46105},
-    {f: 3, c: 46109}, {f: 7, c: 46113}, 46122, {f: 8, c: 46124},
-    {f: 27, c: 46133}, {f: 2, c: 46162}, {f: 3, c: 46165}, {f: 7, c: 46169},
-    46178, 46180, {f: 6, c: 46182}, {f: 19, c: 46189}, {f: 7, c: 46209},
-    {f: 20, c: 46217}, {f: 6, c: 46238}, {f: 3, c: 46245}, {f: 3, c: 46249},
-    {f: 8, c: 46253}, 46262, 46264, {f: 6, c: 46266}, {f: 3, c: 46273},
-    {f: 3, c: 46277}, {f: 7, c: 46281}, {f: 4, c: 46289}, {f: 6, c: 46294},
-    {f: 2, c: 46302}, {f: 2, c: 46305}, 46309, {f: 5, c: 46311}, 46318, 46320,
-    {f: 6, c: 46322}, {f: 27, c: 46329}, {f: 2, c: 46358}, {f: 2, c: 46361},
-    {f: 7, c: 46365}, 46374, {f: 5, c: 46379}, {f: 2, c: 46386},
-    {f: 3, c: 46389}, {f: 7, c: 46393}, 46402, {f: 5, c: 46406},
-    {f: 2, c: 46414}, {f: 3, c: 46417}, {f: 7, c: 46421}, 46430,
-    {f: 62, c: 46434}, {f: 2, c: 46498}, {f: 3, c: 46501}, 46505,
-    {f: 4, c: 46508}, 46514, {f: 5, c: 46518}, {f: 2, c: 46526},
-    {f: 3, c: 46529}, {f: 7, c: 46533}, 46542, {f: 6, c: 46546},
-    {f: 19, c: 46553}, {f: 35, c: 46573}, {f: 2, c: 46610}, {f: 3, c: 46613},
-    {f: 12, c: 46617}, {f: 6, c: 46630}, {f: 7, c: 46637}, {f: 19, c: 46645},
-    {f: 27, c: 46665}, {f: 3, c: 46693}, {f: 51, c: 46697}, {f: 2, c: 46750},
-    {f: 3, c: 46753}, {f: 6, c: 46757}, {f: 4, c: 46765}, {f: 34, c: 46770},
-    {f: 27, c: 46805}, {f: 3, c: 46833}, {f: 3, c: 46837}, {f: 7, c: 46841},
-    {f: 3, c: 46850}, {f: 34, c: 46854}, {f: 2, c: 46890}, {f: 2, c: 46893},
-    {f: 7, c: 46897}, 46906, {f: 8, c: 46908}, {f: 3, c: 46917},
-    {f: 3, c: 46921}, {f: 7, c: 46925}, {f: 10, c: 46934}, {f: 3, c: 46945},
-    {f: 3, c: 46949}, {f: 7, c: 46953}, 46962, 46964, {f: 6, c: 46966},
-    {f: 2, c: 46974}, {f: 3, c: 46977}, {f: 7, c: 46981}, 46990,
-    {f: 3, c: 46995}, {f: 2, c: 47002}, {f: 3, c: 47005}, {f: 7, c: 47009},
-    47018, {f: 6, c: 47022}, {f: 2, c: 47030}, {f: 14, c: 47033}, 47048,
-    {f: 34, c: 47050}, {f: 2, c: 47086}, {f: 3, c: 47089}, {f: 7, c: 47093},
-    47102, {f: 5, c: 47106}, {f: 2, c: 47114}, {f: 3, c: 47117},
-    {f: 7, c: 47121}, 47130, 47132, {f: 6, c: 47134}, {f: 2, c: 47142},
-    {f: 3, c: 47145}, {f: 7, c: 47149}, 47158, {f: 6, c: 47162},
-    {f: 3, c: 47169}, {f: 12, c: 47173}, 47186, {f: 8, c: 47188},
-    {f: 2, c: 47198}, {f: 3, c: 47201}, {f: 7, c: 47205}, 47214, 47216,
-    {f: 6, c: 47218}, {f: 3, c: 47225}, {f: 16, c: 47229}, {f: 26, c: 47246},
-    {f: 7, c: 47273}, {f: 3, c: 47281}, {f: 3, c: 47285}, {f: 7, c: 47289},
-    47298, 47300, {f: 6, c: 47302}, {f: 3, c: 47309}, {f: 3, c: 47313},
-    {f: 8, c: 47317}, 47326, 47328, {f: 6, c: 47330}, {f: 2, c: 47338},
-    {f: 3, c: 47341}, {f: 7, c: 47345}, 47354, 47356, {f: 6, c: 47358},
-    {f: 19, c: 47365}, {f: 7, c: 47385}, {f: 27, c: 47393}, {f: 2, c: 47422},
-    {f: 3, c: 47425}, {f: 7, c: 47429}, {f: 2, c: 47437}, 47440,
-    {f: 6, c: 47442}, {f: 2, c: 47450}, {f: 3, c: 47453}, {f: 7, c: 47457},
-    47466, 47468, {f: 6, c: 47470}, {f: 2, c: 47478}, {f: 3, c: 47481},
-    {f: 7, c: 47485}, 47494, 47496, {f: 2, c: 47499}, {f: 29, c: 47503},
-    {f: 2, c: 47534}, {f: 3, c: 47537}, {f: 7, c: 47541}, 47550, 47552,
-    {f: 6, c: 47554}, {f: 2, c: 47562}, 47565, {f: 5, c: 47571}, 47578, 47580,
-    {f: 2, c: 47583}, 47586, {f: 2, c: 47590}, {f: 3, c: 47593},
-    {f: 7, c: 47597}, 47606, {f: 5, c: 47611}, {f: 6, c: 47618},
-    {f: 12, c: 47625}, {f: 34, c: 47638}, {f: 2, c: 47674}, {f: 3, c: 47677},
-    47681, {f: 5, c: 47683}, 47690, 47692, {f: 4, c: 47695}, {f: 2, c: 47702},
-    {f: 3, c: 47705}, {f: 7, c: 47709}, 47718, {f: 6, c: 47722},
-    {f: 2, c: 47730}, {f: 3, c: 47733}, {f: 10, c: 47737}, 47750,
-    {f: 4, c: 47752}, {f: 27, c: 47757}, 47786, {f: 3, c: 47789}, 47793,
-    {f: 5, c: 47795}, 47802, 47804, {f: 6, c: 47806}, {f: 3, c: 47813},
-    {f: 15, c: 47817}, {f: 34, c: 47834}, {f: 3, c: 47869}, {f: 3, c: 47873},
-    {f: 8, c: 47877}, 47886, 47888, {f: 6, c: 47890}, {f: 3, c: 47897},
-    {f: 3, c: 47901}, {f: 8, c: 47905}, 47914, {f: 8, c: 47916}, 47927,
-    {f: 2, c: 47929}, {f: 5, c: 47935}, 47942, 47944, {f: 3, c: 47946}, 47950,
-    {f: 3, c: 47953}, {f: 3, c: 47957}, {f: 8, c: 47961}, 47970,
-    {f: 8, c: 47972}, {f: 27, c: 47981}, {f: 3, c: 48009}, {f: 3, c: 48013},
-    {f: 19, c: 48017}, {f: 3, c: 48037}, {f: 3, c: 48041}, {f: 7, c: 48045},
-    {f: 2, c: 48053}, {f: 8, c: 48056}, {f: 3, c: 48065}, {f: 3, c: 48069},
-    {f: 7, c: 48073}, {f: 2, c: 48081}, {f: 36, c: 48084}, {f: 2, c: 48122},
-    {f: 2, c: 48125}, 48129, {f: 5, c: 48131}, 48138, 48142, 48144,
-    {f: 2, c: 48146}, {f: 2, c: 48153}, {f: 4, c: 48160}, 48166, 48168,
-    {f: 3, c: 48170}, {f: 2, c: 48174}, {f: 2, c: 48178}, {f: 3, c: 48181},
-    {f: 7, c: 48185}, 48194, {f: 3, c: 48198}, {f: 2, c: 48202},
-    {f: 2, c: 48206}, {f: 12, c: 48209}, {f: 38, c: 48222}, {f: 2, c: 48262},
-    {f: 2, c: 48265}, 48269, {f: 5, c: 48271}, 48278, 48280, {f: 5, c: 48283},
-    {f: 2, c: 48290}, {f: 2, c: 48293}, {f: 7, c: 48297}, 48306,
-    {f: 6, c: 48310}, {f: 2, c: 48318}, {f: 3, c: 48321}, {f: 8, c: 48325},
-    48334, {f: 3, c: 48338}, {f: 2, c: 48342}, {f: 3, c: 48345},
-    {f: 23, c: 48349}, 48375, {f: 3, c: 48377}, {f: 7, c: 48381}, 48390, 48392,
-    {f: 6, c: 48394}, {f: 3, c: 48401}, {f: 15, c: 48405}, {f: 7, c: 48421},
-    {f: 19, c: 48429}, {f: 7, c: 48449}, {f: 2, c: 48458}, {f: 3, c: 48461},
-    {f: 7, c: 48465}, {f: 10, c: 48474}, {f: 3, c: 48485}, {f: 23, c: 48489},
-    {f: 2, c: 48514}, {f: 2, c: 48517}, {f: 5, c: 48523}, 48530, 48532,
-    {f: 3, c: 48534}, 48539, {f: 7, c: 48541}, {f: 11, c: 48549},
-    {f: 7, c: 48561}, {f: 27, c: 48569}, {f: 2, c: 48598}, {f: 3, c: 48601},
-    {f: 12, c: 48605}, {f: 6, c: 48618}, {f: 3, c: 48625}, {f: 3, c: 48629},
-    {f: 7, c: 48633}, {f: 2, c: 48641}, 48644, {f: 6, c: 48646},
-    {f: 2, c: 48654}, {f: 3, c: 48657}, {f: 7, c: 48661}, 48670,
-    {f: 36, c: 48672}, {f: 2, c: 48710}, {f: 3, c: 48713}, 48717,
-    {f: 5, c: 48719}, 48726, 48728, {f: 4, c: 48732}, {f: 2, c: 48738},
-    {f: 3, c: 48741}, 48745, {f: 5, c: 48747}, 48754, {f: 5, c: 48758},
-    {f: 2, c: 48766}, {f: 3, c: 48769}, {f: 7, c: 48773}, 48782,
-    {f: 6, c: 48786}, {f: 14, c: 48794}, {f: 39, c: 48809}, {f: 2, c: 48850},
-    {f: 2, c: 48853}, {f: 7, c: 48857}, {f: 2, c: 48865}, {f: 6, c: 48870},
-    {f: 20, c: 48877}, {f: 6, c: 48898}, {f: 14, c: 48906}, 48922,
-    {f: 34, c: 48926}, {f: 2, c: 48962}, {f: 3, c: 48965}, {f: 7, c: 48969},
-    {f: 3, c: 48978}, {f: 62, c: 48982}, {f: 27, c: 49045}, {f: 20, c: 49073},
-    {f: 6, c: 49094}, {f: 2, c: 49102}, {f: 3, c: 49105}, {f: 7, c: 49109},
-    {f: 2, c: 49117}, 49120, {f: 90, c: 49122}, {f: 20, c: 49213},
-    {f: 6, c: 49234}, {f: 3, c: 49241}, {f: 3, c: 49245}, {f: 7, c: 49249},
-    {f: 38, c: 49258}, {f: 2, c: 49298}, {f: 3, c: 49301}, {f: 7, c: 49305},
-    49314, 49316, {f: 6, c: 49318}, 49326, {f: 2, c: 49329}, {f: 5, c: 49335},
-    49342, {f: 3, c: 49346}, {f: 2, c: 49350}, {f: 2, c: 49354},
-    {f: 3, c: 49357}, {f: 7, c: 49361}, 49370, {f: 6, c: 49374},
-    {f: 2, c: 49382}, {f: 3, c: 49385}, {f: 7, c: 49389}, 49398, 49400,
-    {f: 6, c: 49402}, {f: 3, c: 49409}, {f: 3, c: 49413}, {f: 7, c: 49417},
-    {f: 4, c: 49425}, {f: 6, c: 49430}, {f: 2, c: 49441}, 49445,
-    {f: 4, c: 49448}, 49454, {f: 4, c: 49458}, 49463, {f: 2, c: 49466},
-    {f: 3, c: 49469}, {f: 7, c: 49473}, 49482, {f: 6, c: 49486},
-    {f: 2, c: 49494}, {f: 3, c: 49497}, {f: 7, c: 49501}, 49510,
-    {f: 6, c: 49514}, {f: 3, c: 49521}, {f: 3, c: 49525}, {f: 12, c: 49529},
-    {f: 6, c: 49542}, 49551, {f: 3, c: 49553}, 49557, {f: 5, c: 49559}, 49566,
-    49568, {f: 3, c: 49570}, {f: 2, c: 49574}, {f: 2, c: 49578},
-    {f: 3, c: 49581}, {f: 12, c: 49585}, {f: 6, c: 49598}, {f: 3, c: 49605},
-    {f: 3, c: 49609}, {f: 7, c: 49613}, {f: 2, c: 49621}, {f: 7, c: 49625},
-    {f: 3, c: 49633}, {f: 3, c: 49637}, {f: 7, c: 49641}, 49650,
-    {f: 8, c: 49652}, {f: 2, c: 49662}, {f: 3, c: 49665}, {f: 7, c: 49669},
-    49678, 49680, {f: 6, c: 49682}, {f: 2, c: 49690}, {f: 2, c: 49693},
-    {f: 7, c: 49697}, 49706, 49708, 49710, 49712, 49715, {f: 19, c: 49717},
-    {f: 7, c: 49737}, {f: 2, c: 49746}, {f: 3, c: 49749}, {f: 7, c: 49753},
-    {f: 4, c: 49761}, {f: 6, c: 49766}, {f: 2, c: 49774}, {f: 3, c: 49777},
-    {f: 7, c: 49781}, 49790, 49792, {f: 6, c: 49794}, {f: 6, c: 49802},
-    {f: 7, c: 49809}, {f: 2, c: 49817}, 49820, {f: 6, c: 49822},
-    {f: 2, c: 49830}, {f: 3, c: 49833}, {f: 6, c: 49838}, 49846, 49848,
-    {f: 34, c: 49850}, {f: 2, c: 49886}, {f: 2, c: 49889}, {f: 6, c: 49893},
-    49902, 49904, {f: 4, c: 49906}, 49911, 49914, {f: 3, c: 49917},
-    {f: 7, c: 49921}, {f: 2, c: 49930}, {f: 5, c: 49934}, {f: 2, c: 49942},
-    {f: 3, c: 49945}, {f: 7, c: 49949}, {f: 2, c: 49958}, {f: 27, c: 49962},
-    {f: 34, c: 49990}, {f: 2, c: 50026}, {f: 3, c: 50029}, 50033,
-    {f: 5, c: 50035}, {f: 2, c: 50042}, {f: 6, c: 50046}, {f: 3, c: 50053},
-    {f: 3, c: 50057}, {f: 51, c: 50061}, {f: 23, c: 50113}, {f: 2, c: 50138},
-    {f: 2, c: 50141}, 50145, {f: 5, c: 50147}, {f: 3, c: 50154},
-    {f: 6, c: 50158}, {f: 2, c: 50166}, {f: 15, c: 50169}, {f: 7, c: 50185},
-    {f: 19, c: 50193}, {f: 7, c: 50213}, {f: 3, c: 50221}, {f: 3, c: 50225},
-    {f: 7, c: 50229}, {f: 10, c: 50238}, {f: 27, c: 50249}, {f: 2, c: 50278},
-    {f: 3, c: 50281}, {f: 7, c: 50285}, {f: 3, c: 50294}, {f: 6, c: 50298},
-    {f: 19, c: 50305}, {f: 7, c: 50325}, {f: 27, c: 50333}, {f: 3, c: 50361},
-    {f: 44, c: 50365}, {f: 6, c: 50410}, {f: 2, c: 50418}, {f: 3, c: 50421},
-    50425, {f: 4, c: 50427}, {f: 10, c: 50434}, {f: 3, c: 50445},
-    {f: 3, c: 50449}, {f: 7, c: 50453}, {f: 11, c: 50461}, {f: 2, c: 50474},
-    {f: 3, c: 50477}, {f: 7, c: 50481}, 50490, 50492, {f: 6, c: 50494},
-    {f: 2, c: 50502}, 50507, {f: 4, c: 50511}, 50518, {f: 3, c: 50522}, 50527,
-    {f: 2, c: 50530}, {f: 3, c: 50533}, {f: 7, c: 50537}, 50546,
-    {f: 6, c: 50550}, {f: 2, c: 50558}, {f: 3, c: 50561}, {f: 2, c: 50565},
-    {f: 4, c: 50568}, 50574, 50576, {f: 3, c: 50578}, 50582, {f: 3, c: 50585},
-    {f: 3, c: 50589}, {f: 8, c: 50593}, {f: 10, c: 50602}, {f: 2, c: 50614},
-    50618, {f: 5, c: 50623}, 50635, 50637, 50639, {f: 2, c: 50642},
-    {f: 3, c: 50645}, {f: 7, c: 50649}, 50658, 50660, {f: 6, c: 50662}, 50671,
-    {f: 3, c: 50673}, 50677, {f: 4, c: 50680}, {f: 3, c: 50690},
-    {f: 3, c: 50697}, {f: 3, c: 50701}, {f: 7, c: 50705}, 50714,
-    {f: 7, c: 50717}, {f: 2, c: 50726}, {f: 3, c: 50729}, 50735,
-    {f: 2, c: 50737}, 50742, 50744, 50746, {f: 4, c: 50748}, {f: 2, c: 50754},
-    {f: 3, c: 50757}, {f: 7, c: 50761}, 50770, {f: 6, c: 50774},
-    {f: 2, c: 50782}, {f: 11, c: 50785}, {f: 2, c: 50797}, 50800,
-    {f: 6, c: 50802}, {f: 2, c: 50810}, {f: 3, c: 50813}, {f: 7, c: 50817},
-    50826, 50828, {f: 6, c: 50830}, {f: 2, c: 50838}, {f: 3, c: 50841},
-    {f: 7, c: 50845}, 50854, 50856, {f: 6, c: 50858}, {f: 2, c: 50866},
-    {f: 3, c: 50869}, {f: 5, c: 50875}, 50882, 50884, {f: 6, c: 50886},
-    {f: 2, c: 50894}, {f: 3, c: 50897}, {f: 7, c: 50901}, {f: 2, c: 50910},
-    {f: 6, c: 50914}, {f: 2, c: 50922}, {f: 3, c: 50925}, {f: 7, c: 50929},
-    {f: 3, c: 50938}, {f: 6, c: 50942}, {f: 2, c: 50950}, {f: 3, c: 50953},
-    {f: 7, c: 50957}, 50966, 50968, {f: 6, c: 50970}, {f: 2, c: 50978},
-    {f: 3, c: 50981}, {f: 7, c: 50985}, 50994, 50996, 50998, {f: 4, c: 51000},
-    {f: 2, c: 51006}, {f: 3, c: 51009}, {f: 5, c: 51013}, 51019, 51022, 51024,
-    {f: 3, c: 51033}, {f: 3, c: 51037}, {f: 7, c: 51041}, {f: 2, c: 51049},
-    {f: 8, c: 51052}, {f: 2, c: 51062}, {f: 3, c: 51065}, {f: 4, c: 51071},
-    51078, {f: 3, c: 51083}, 51087, {f: 2, c: 51090}, 51093, 51097,
-    {f: 5, c: 51099}, 51106, {f: 5, c: 51111}, {f: 2, c: 51118},
-    {f: 3, c: 51121}, {f: 7, c: 51125}, 51134, {f: 6, c: 51138},
-    {f: 2, c: 51146}, 51149, 51151, {f: 7, c: 51153}, {f: 4, c: 51161},
-    {f: 6, c: 51166}, {f: 3, c: 51173}, {f: 3, c: 51177}, {f: 19, c: 51181},
-    {f: 2, c: 51202}, {f: 3, c: 51205}, 51209, {f: 5, c: 51211}, 51218, 51220,
-    {f: 5, c: 51223}, {f: 2, c: 51230}, {f: 3, c: 51233}, {f: 7, c: 51237},
-    51246, 51248, {f: 6, c: 51250}, {f: 3, c: 51257}, {f: 3, c: 51261},
-    {f: 7, c: 51265}, {f: 2, c: 51274}, {f: 6, c: 51278}, {f: 27, c: 51285},
-    {f: 2, c: 51314}, {f: 3, c: 51317}, 51321, {f: 5, c: 51323}, 51330, 51332,
-    {f: 3, c: 51336}, {f: 6, c: 51342}, {f: 8, c: 51349}, 51358, 51360,
-    {f: 6, c: 51362}, {f: 19, c: 51369}, {f: 6, c: 51390}, {f: 3, c: 51397},
-    {f: 3, c: 51401}, {f: 7, c: 51405}, 51414, 51416, {f: 6, c: 51418},
-    {f: 2, c: 51426}, {f: 16, c: 51429}, {f: 6, c: 51446}, {f: 2, c: 51454},
-    {f: 3, c: 51457}, {f: 5, c: 51463}, 51470, 51472, {f: 6, c: 51474},
-    {f: 19, c: 51481}, {f: 7, c: 51501}, {f: 27, c: 51509}, {f: 2, c: 51538},
-    {f: 3, c: 51541}, {f: 7, c: 51545}, 51554, {f: 8, c: 51556},
-    {f: 3, c: 51565}, {f: 3, c: 51569}, {f: 7, c: 51573}, {f: 11, c: 51581},
-    {f: 2, c: 51594}, {f: 3, c: 51597}, {f: 7, c: 51601}, 51610, 51612,
-    {f: 34, c: 51614}, {f: 2, c: 51650}, {f: 2, c: 51653}, 51657,
-    {f: 5, c: 51659}, 51666, 51668, {f: 2, c: 51671}, 51675, {f: 2, c: 51678},
-    51681, 51683, {f: 2, c: 51685}, {f: 4, c: 51688}, 51694, {f: 6, c: 51698},
-    {f: 2, c: 51706}, {f: 3, c: 51709}, {f: 7, c: 51713}, 51722,
-    {f: 6, c: 51726}, {f: 3, c: 51733}, {f: 16, c: 51737}, {f: 34, c: 51754},
-    {f: 2, c: 51790}, {f: 3, c: 51793}, {f: 7, c: 51797}, 51806,
-    {f: 6, c: 51810}, {f: 20, c: 51817}, {f: 6, c: 51838}, {f: 19, c: 51845},
-    {f: 35, c: 51865}, {f: 2, c: 51902}, {f: 3, c: 51905}, {f: 7, c: 51909},
-    51918, 51920, 51922, {f: 4, c: 51924}, {f: 6, c: 51930}, {f: 11, c: 51937},
-    {f: 7, c: 51949}, {f: 19, c: 51957}, {f: 7, c: 51977}, {f: 3, c: 51985},
-    {f: 3, c: 51989}, {f: 7, c: 51993}, {f: 31, c: 52002}, {f: 6, c: 52034},
-    {f: 2, c: 52042}, {f: 3, c: 52045}, {f: 7, c: 52049}, {f: 3, c: 52058},
-    {f: 6, c: 52062}, {f: 19, c: 52069}, {f: 34, c: 52090}, {f: 27, c: 52125},
-    {f: 27, c: 52153}, {f: 15, c: 52181}, {f: 2, c: 52197}, 52200,
-    {f: 34, c: 52202}, {f: 2, c: 52238}, {f: 3, c: 52241}, {f: 7, c: 52245},
-    {f: 3, c: 52254}, {f: 4, c: 52259}, {f: 2, c: 52266}, 52269, 52271,
-    {f: 7, c: 52273}, 52282, {f: 5, c: 52287}, {f: 2, c: 52294},
-    {f: 3, c: 52297}, {f: 7, c: 52301}, 52310, {f: 6, c: 52314},
-    {f: 3, c: 52321}, 52325, 52327, {f: 7, c: 52329}, {f: 4, c: 52337},
-    {f: 34, c: 52342}, {f: 2, c: 52378}, {f: 3, c: 52381}, {f: 7, c: 52385},
-    52394, {f: 6, c: 52398}, {f: 2, c: 52406}, {f: 3, c: 52409},
-    {f: 7, c: 52413}, 52422, 52424, {f: 6, c: 52426}, {f: 3, c: 52433},
-    {f: 15, c: 52437}, {f: 7, c: 52453}, {f: 3, c: 52461}, {f: 16, c: 52465},
-    {f: 6, c: 52482}, {f: 2, c: 52490}, {f: 3, c: 52493}, {f: 7, c: 52497},
-    52506, 52508, {f: 6, c: 52510}, {f: 3, c: 52517}, {f: 3, c: 52521},
-    {f: 12, c: 52525}, {f: 34, c: 52538}, {f: 3, c: 52573}, {f: 3, c: 52577},
-    {f: 7, c: 52581}, 52590, 52592, {f: 6, c: 52594}, {f: 15, c: 52601},
-    {f: 11, c: 52617}, {f: 2, c: 52630}, {f: 3, c: 52633}, {f: 7, c: 52637},
-    52646, 52648, {f: 6, c: 52650}, {f: 19, c: 52657}, {f: 7, c: 52677},
-    {f: 3, c: 52685}, {f: 23, c: 52689}, {f: 3, c: 52713}, {f: 3, c: 52717},
-    {f: 7, c: 52721}, 52730, 52732, {f: 6, c: 52734}, {f: 3, c: 52741},
-    {f: 3, c: 52745}, {f: 7, c: 52749}, {f: 4, c: 52757}, {f: 6, c: 52762},
-    {f: 2, c: 52770}, {f: 3, c: 52773}, {f: 7, c: 52777}, 52786, 52788,
-    {f: 34, c: 52790}, {f: 2, c: 52826}, {f: 2, c: 52829}, {f: 6, c: 52834},
-    52842, 52844, {f: 6, c: 52846}, {f: 2, c: 52854}, {f: 3, c: 52857},
-    {f: 7, c: 52861}, 52870, 52872, {f: 6, c: 52874}, {f: 2, c: 52882},
-    {f: 3, c: 52885}, {f: 7, c: 52889}, 52898, {f: 6, c: 52902},
-    {f: 19, c: 52910}, {f: 34, c: 52930}, {f: 2, c: 52966}, {f: 2, c: 52969},
-    {f: 7, c: 52973}, 52982, {f: 6, c: 52986}, {f: 2, c: 52994},
-    {f: 3, c: 52997}, {f: 7, c: 53001}, 53010, 53012, {f: 6, c: 53014},
-    {f: 3, c: 53021}, {f: 3, c: 53025}, {f: 7, c: 53029}, 53038,
-    {f: 6, c: 53042}, {f: 27, c: 53049}, {f: 2, c: 53078}, {f: 3, c: 53081},
-    {f: 7, c: 53085}, 53094, 53096, {f: 6, c: 53098}, {f: 2, c: 53106},
-    {f: 3, c: 53109}, {f: 7, c: 53113}, {f: 4, c: 53121}, {f: 6, c: 53126},
-    {f: 20, c: 53133}, {f: 6, c: 53154}, {f: 7, c: 53161}, {f: 19, c: 53169},
-    {f: 27, c: 53189}, {f: 2, c: 53218}, {f: 3, c: 53221}, {f: 7, c: 53225},
-    53234, 53236, {f: 6, c: 53238}, {f: 3, c: 53245}, {f: 3, c: 53249},
-    {f: 12, c: 53253}, {f: 6, c: 53266}, {f: 20, c: 53273}, {f: 6, c: 53294},
-    {f: 2, c: 53302}, {f: 3, c: 53305}, {f: 7, c: 53309}, 53318, 53320,
-    {f: 6, c: 53322}, {f: 3, c: 53329}, {f: 3, c: 53333}, {f: 7, c: 53337},
-    {f: 11, c: 53345}, {f: 2, c: 53358}, {f: 3, c: 53361}, {f: 7, c: 53365},
-    {f: 3, c: 53374}, {f: 34, c: 53378}, {f: 2, c: 53414}, {f: 3, c: 53417},
-    {f: 7, c: 53421}, 53430, 53432, {f: 6, c: 53434}, {f: 2, c: 53442},
-    {f: 3, c: 53445}, {f: 6, c: 53450}, 53458, {f: 6, c: 53462},
-    {f: 2, c: 53470}, {f: 3, c: 53473}, {f: 7, c: 53477}, 53486,
-    {f: 6, c: 53490}, {f: 20, c: 53497}, {f: 34, c: 53518}, {f: 2, c: 53554},
-    {f: 3, c: 53557}, 53561, {f: 5, c: 53563}, 53570, {f: 6, c: 53574},
-    {f: 2, c: 53582}, {f: 3, c: 53585}, {f: 7, c: 53589}, 53598, 53600,
-    {f: 6, c: 53602}, {f: 3, c: 53609}, {f: 15, c: 53613}, {f: 7, c: 53629},
-    {f: 3, c: 53637}, {f: 23, c: 53641}, {f: 2, c: 53666}, {f: 3, c: 53669},
-    {f: 7, c: 53673}, 53682, 53684, {f: 4, c: 53686}, 53691, {f: 3, c: 53693},
-    {f: 23, c: 53697}, {f: 27, c: 53721}, {f: 3, c: 53749}, {f: 14, c: 53753},
-    53768, {f: 6, c: 53770}, {f: 27, c: 53777}, {f: 2, c: 53806},
-    {f: 3, c: 53809}, {f: 7, c: 53813}, 53822, 53824, {f: 6, c: 53826},
-    {f: 19, c: 53833}, {f: 7, c: 53853}, {f: 27, c: 53861}, {f: 2, c: 53890},
-    {f: 3, c: 53893}, {f: 7, c: 53897}, {f: 3, c: 53906}, {f: 6, c: 53910},
-    {f: 3, c: 53917}, {f: 3, c: 53921}, {f: 7, c: 53925}, {f: 4, c: 53933},
-    {f: 6, c: 53938}, {f: 2, c: 53946}, {f: 2, c: 53949}, 53953,
-    {f: 5, c: 53955}, 53962, {f: 8, c: 53964}, {f: 3, c: 53973},
-    {f: 3, c: 53977}, {f: 7, c: 53981}, {f: 10, c: 53990}, {f: 2, c: 54002},
-    {f: 3, c: 54005}, {f: 7, c: 54009}, 54018, 54020, {f: 6, c: 54022}, 54031,
-    {f: 3, c: 54033}, 54037, {f: 5, c: 54039}, 54046, {f: 3, c: 54050},
-    {f: 2, c: 54054}, {f: 2, c: 54058}, {f: 3, c: 54061}, {f: 7, c: 54065},
-    54074, {f: 6, c: 54078}, {f: 54, c: 54086}, {f: 2, c: 54142},
-    {f: 3, c: 54145}, {f: 7, c: 54149}, 54158, {f: 6, c: 54162},
-    {f: 2, c: 54170}, {f: 3, c: 54173}, {f: 7, c: 54177}, 54186, 54188,
-    {f: 6, c: 54190}, {f: 3, c: 54197}, {f: 3, c: 54201}, {f: 7, c: 54205},
-    {f: 2, c: 54214}, {f: 6, c: 54218}, {f: 7, c: 54225}, {f: 8, c: 54233},
-    54242, {f: 8, c: 54244}, {f: 2, c: 54254}, {f: 3, c: 54257},
-    {f: 7, c: 54261}, 54270, 54272, {f: 6, c: 54274}, {f: 20, c: 54281},
-    {f: 34, c: 54302}, {f: 3, c: 54337}, {f: 23, c: 54341}, {f: 3, c: 54365},
-    {f: 3, c: 54369}, {f: 8, c: 54373}, 54382, {f: 8, c: 54384},
-    {f: 2, c: 54394}, {f: 2, c: 54397}, 54401, {f: 5, c: 54403}, 54410, 54412,
-    {f: 6, c: 54414}, {f: 20, c: 54421}, {f: 34, c: 54442}, {f: 3, c: 54477},
-    {f: 3, c: 54481}, {f: 7, c: 54485}, {f: 2, c: 54493}, {f: 8, c: 54496},
-    {f: 3, c: 54505}, {f: 3, c: 54509}, {f: 7, c: 54513}, {f: 2, c: 54521},
-    54524, {f: 6, c: 54526}, {f: 3, c: 54533}, {f: 3, c: 54537},
-    {f: 7, c: 54541}, 54550, {f: 36, c: 54552}, {f: 2, c: 54590},
-    {f: 3, c: 54593}, {f: 7, c: 54597}, 54606, 54608, {f: 6, c: 54610},
-    {f: 2, c: 54618}, {f: 3, c: 54621}, {f: 4, c: 54625}, {f: 2, c: 54630},
-    54634, 54636, {f: 6, c: 54638}, {f: 2, c: 54646}, {f: 3, c: 54649},
-    {f: 7, c: 54653}, 54662, {f: 6, c: 54666}, {f: 20, c: 54673},
-    {f: 34, c: 54694}, {f: 2, c: 54730}, {f: 3, c: 54733}, 54737,
-    {f: 5, c: 54739}, 54746, 54748, {f: 6, c: 54750}, {f: 2, c: 54758},
-    {f: 3, c: 54761}, {f: 7, c: 54765}, 54774, 54776, {f: 6, c: 54778},
-    {f: 2, c: 54786}, {f: 3, c: 54789}, {f: 7, c: 54793}, 54802,
-    {f: 6, c: 54806}, {f: 3, c: 54813}, {f: 3, c: 54817}, {f: 8, c: 54821},
-    {f: 10, c: 54830}, {f: 2, c: 54842}, {f: 3, c: 54845}, {f: 4, c: 54849},
-    {f: 2, c: 54854}, 54858, 54860, {f: 3, c: 54862}, {f: 2, c: 54866},
-    {f: 2, c: 54870}, {f: 3, c: 54873}, {f: 10, c: 54877}, 54888,
-    {f: 6, c: 54890}, {f: 2, c: 54898}, {f: 14, c: 54901}, 54916,
-    {f: 6, c: 54918}, {f: 2, c: 54926}, {f: 3, c: 54929}, {f: 8, c: 54933},
-    54942, 54944, {f: 6, c: 54946}, {f: 3, c: 54953}, {f: 3, c: 54957},
-    {f: 8, c: 54961}, 54970, {f: 8, c: 54972}, {f: 2, c: 54982},
-    {f: 3, c: 54985}, {f: 4, c: 54989}, {f: 2, c: 54994}, {f: 2, c: 54997},
-    55000, {f: 6, c: 55002}, {f: 3, c: 55009}, {f: 3, c: 55013},
-    {f: 7, c: 55017}, {f: 4, c: 55025}, {f: 6, c: 55030}, {f: 2, c: 55038},
-    {f: 3, c: 55041}, {f: 12, c: 55045}, {f: 6, c: 55058}, {f: 2, c: 55066},
-    {f: 3, c: 55069}, {f: 7, c: 55073}, 55082, 55084, {f: 6, c: 55086},
-    {f: 2, c: 55094}, {f: 3, c: 55097}, {f: 7, c: 55101}, {f: 2, c: 55109},
-    55112, {f: 6, c: 55114}, {f: 2, c: 55122}, 55125, {f: 6, c: 55130}, 55138,
-    55140, {f: 3, c: 55142}, {f: 2, c: 55146}, {f: 3, c: 55149},
-    {f: 3, c: 55153}, {f: 7, c: 55157}, {f: 3, c: 55166}, {f: 6, c: 55170},
-    {f: 2, c: 55178}, {f: 3, c: 55181}, {f: 7, c: 55185}, 55194, 55196,
-    {f: 6, c: 55198}],
-  'Adobe-CNS1': [{f: 95, c: 32}, {s: 3}, 12288, 65292, {f: 2, c: 12289}, 65294,
-    8226, 65307, 65306, 65311, 65281, 65072, 8230, 8229, 65104, 65380, 65106,
-    183, {f: 4, c: 65108}, 65372, 8211, 65073, 8212, {s: 4}, {f: 2, c: 65288},
-    {f: 2, c: 65077}, 65371, 65373, {f: 2, c: 65079}, {f: 2, c: 12308},
-    {f: 2, c: 65081}, {f: 2, c: 12304}, {f: 2, c: 65083}, {f: 2, c: 12298},
-    {f: 2, c: 65085}, {f: 2, c: 12296}, {f: 2, c: 65087}, {f: 2, c: 12300},
-    {f: 2, c: 65089}, {f: 2, c: 12302}, {f: 2, c: 65091}, {f: 6, c: 65113},
-    {f: 2, c: 8216}, {f: 2, c: 8220}, {f: 2, c: 12317}, 8245, 8242, 65283,
-    65286, 65290, 8251, 167, 12291, 9675, 9679, 9651, 9650, 9678, 9734, 9733,
-    9671, 9670, 9633, 9632, 9661, 9660, 12963, 8453, 8254, 0, 65343, 0,
-    {f: 2, c: 65097}, {f: 2, c: 65101}, {f: 2, c: 65099}, {f: 3, c: 65119},
-    65291, 65293, 215, 247, 177, 8730, 65308, 65310, 65309, {f: 2, c: 8806},
-    8800, 8734, 8786, 8801, {f: 5, c: 65122}, 8764, {f: 2, c: 8745}, 8869,
-    8736, 8735, 8895, 13266, 13265, 8747, 8750, 8757, 8756, 9792, 9794, 9793,
-    9737, 8593, 8595, 8594, 8592, {f: 2, c: 8598}, 8601, 8600, 8741, 8739, 0,
-    0, 65295, 65340, 65284, 165, 12306, {f: 2, c: 162}, 65285, 65312, 8451,
-    8457, {f: 3, c: 65129}, 13269, {f: 3, c: 13212}, 13262, 13217,
-    {f: 2, c: 13198}, 13252, 176, [20825, 58834], [20827, 58835],
-    [20830, 58837], [20829, 58836], 20833, 20835, 21991, [29929, 58044],
-    [31950, 58191], {f: 8, c: 9601}, 9615, 9614, 9613, 9612, 9611, 9610, 9609,
-    9532, 9524, 9516, 9508, 9500, 9620, 9472, 9474, 9621, 9484, 9488, 9492,
-    9496, {f: 2, c: 9581}, 9584, 9583, 9552, 9566, 9578, 9569, {f: 2, c: 9698},
-    9701, 9700, {f: 3, c: 9585}, {f: 10, c: 65296}, {f: 10, c: 8544},
-    {f: 9, c: 12321}, 0, [21316, 57443], 0, {f: 26, c: 65313},
-    {f: 26, c: 65345}, {f: 17, c: 913}, {f: 7, c: 931}, {f: 17, c: 945},
-    {f: 7, c: 963}, {f: 37, c: 12549}, 729, 714, 711, 715, [9312, 63153],
-    [9313, 63154], [9314, 63155], [9315, 63156], [9316, 63157], [9317, 63158],
-    [9318, 63159], [9319, 63160], [9320, 63161], [9321, 63162], [9332, 63163],
-    [9333, 63164], [9334, 63165], [9335, 63166], [9336, 63167], [9337, 63168],
-    [9338, 63169], [9339, 63170], [9340, 63171], [9341, 63172], [8560, 63173],
-    [8561, 63174], [8562, 63175], [8563, 63176], [8564, 63177], [8565, 63178],
-    [8566, 63179], [8567, 63180], [8568, 63181], [8569, 63182], [12033, 20008],
-    [12034, 20022, 63183], [12035, 20031, 63184], [12037, 20101, 63185],
-    [12039, 20128, 63186], [12044, 20866, 63187], [12045, 20886, 63188],
-    [12046, 20907, 63189], [12051, 21241, 63190], [12054, 21304, 63191],
-    [12057, 21353, 63192], [12059, 21430, 63193],
-    [12065, 12066, 22786, 22794, 63194], [12071, 23424, 63195],
-    [12078, 24027, 63196], [12083, 24186, 63197], [12084, 24191, 63198],
-    [12085, 24308], [12089, 24400, 63200], [12090, 24417, 63201],
-    [12097, 25908, 63202], [12102, 26080], [12135, 30098, 63204],
-    [12136, 30326], [12193, 36789, 63206], [12202, 38582], {f: 32, c: 9216},
-    9249, [12032, 19968], [12036, 20057], 19969, 19971, 20035, 20061, 20102,
-    [12038, 20108], [12040, 20154], [12041, 20799], [12042, 20837],
-    [12043, 20843], [12047, 20960], [12049, 20992], 20993, [12050, 21147],
-    [12052, 21269], [12055, 21313], [12056, 21340], [12060, 21448], 19977,
-    19979, 19976, 19978, 20011, 20024, 20961, 20037, 20040, 20063, 20062,
-    20110, 20129, [20800, 64012], 20995, 21242, 21315, 21449, [12061, 21475],
-    [12063, 22303], [12064, 22763], [12067, 22805], [12068, 22823],
-    [12069, 22899], [12070, 23376], 23377, 23379, [12072, 23544],
-    [12073, 23567], [12074, 23586], [12075, 23608], [12077, 23665], 24029,
-    [12079, 24037], [12080, 24049], {f: 2, c: 24050}, [12081, 24062],
-    [12082, 24178], [12086, 24318], [12087, 24331], [12088, 24339], 25165,
-    19985, 19984, 19981, 20013, 20016, 20025, 20043, 23609, 20104, 20113,
-    20117, 20114, 20116, 20130, 20161, 20160, 20163, {f: 2, c: 20166}, 20173,
-    {f: 2, c: 20170}, 20164, 20803, 20801, 20839, {f: 2, c: 20845}, 20844,
-    20887, 20982, {f: 3, c: 20998}, 21243, {f: 2, c: 21246}, 21270, 21305,
-    21320, 21319, 21317, 21342, 21380, 21451, 21450, 21453, 22764, 22825,
-    22827, 22826, 22829, 23380, 23569, 23588, 23610, 23663, 24052, 24187,
-    24319, {f: 2, c: 24340}, [12092, 24515], [12093, 25096], [12094, 25142],
-    [12095, 25163], 25166, [12096, 25903], [12098, 25991], [12099, 26007],
-    [12100, 26020], [12101, 26041], [12103, 26085], [12104, 26352],
-    [12105, 26376], [12106, 26408], [12107, 27424], [12108, 27490],
-    [12109, 27513], [12111, 27595], [12112, 27604], [12113, 27611],
-    [12114, 27663], [12116, 27700], [12117, 28779], [12118, 29226],
-    [12119, 29238], [12120, 29243], [12122, 29255], [12123, 29273],
-    [12124, 29275], [12125, 29356], 29579, 19993, 19990, 19989, 19988, 19992,
-    20027, 20045, 20047, 20046, 20197, 20184, {f: 4, c: 20180},
-    {f: 2, c: 20195}, 20185, 20190, 20805, 20804, {f: 2, c: 20873}, 20908,
-    {f: 2, c: 20985}, 20984, 21002, 21152, 21151, [21253, 57435], 21254, 21271,
-    21277, 20191, 21322, 21321, 21345, 21344, 21359, 21358, 21435, 21487,
-    21476, 21491, 21484, 21486, 21481, 21480, 21500, 21496, 21493, 21483,
-    21478, 21482, 21490, 21489, 21488, 21477, 21485, 21499, 22235, 22234,
-    22806, 22830, 22833, 22900, 22902, 23381, 23427, 23612, 24040, 24039,
-    24038, {f: 2, c: 24066}, 24179, 24188, 24321, 24344, 24343, 24517, 25098,
-    {f: 2, c: 25171}, 25170, 25169, 26021, 26086, 26414, 26412,
-    {f: 2, c: 26410}, 26413, 27491, 27597, 27665, 27664, 27704, 27713, 27712,
-    27710, 29359, [12126, 29572], [12127, 29577], [12128, 29916],
-    [12129, 29926], [12130, 29976], [12131, 29983], [12132, 29992], 29993,
-    [12133, 30000], {f: 3, c: 30001}, [12134, 30091], [12137, 30333],
-    [12138, 30382], [12139, 30399], [12140, 30446], [12141, 30683],
-    [12142, 30690], [12143, 30707], [12144, 31034], [12146, 31166],
-    [12147, 31348], [12148, 31435], {f: 2, c: 19998}, {f: 2, c: 20050}, 20073,
-    20121, 20132, 20134, 20133, 20223, 20233, 20249, 20234, 20245, 20237,
-    {f: 2, c: 20240}, 20239, 20210, 20214, 20219, 20208, 20211, 20221, 20225,
-    20235, 20809, 20807, 20806, 20808, 20840, 20849, 20877, 20912, 21015,
-    {f: 2, c: 21009}, 21006, 21014, 21155, 21256, 21281, 21280,
-    {f: 2, c: 21360}, 21513, 21519, 21516, 21514, 21520, 21505, 21515, 21508,
-    21521, 21517, 21512, 21507, 21518, 21510, 21522, 22240, 22238, 22237,
-    22323, 22320, 22312, 22317, 22316, 22319, 22313, {f: 2, c: 22809},
-    {f: 2, c: 22839}, 22916, 22904, 22915, 22909, 22905, 22914, 22913,
-    {f: 2, c: 23383}, {f: 2, c: 23431}, 23429, 23433, 23546, 23574, 23673,
-    24030, 24070, 24182, 24180, 24335, 24347, 24537, 24534, 25102,
-    {f: 2, c: 25100}, 25104, 25187, 25179, 25176, 25910, 26089, 26088,
-    {f: 2, c: 26092}, {f: 2, c: 26354}, 26377, 26429, 26420, 26417, 26421,
-    27425, 27492, 27515, 27670, 27741, 27735, 27737, {f: 2, c: 27743}, 27728,
-    27733, 27745, 27739, {f: 2, c: 27725}, 28784, 29279, 29277, 30334,
-    [12149, 31481], [12150, 31859], [12151, 31992], [12152, 32566],
-    [12154, 32650], [12155, 32701], [12156, 32769], 32771, [12157, 32780],
-    [12158, 32786], [12159, 32819], [12160, 32895], [12161, 32905],
-    {f: 2, c: 32907}, [12162, 33251], [12163, 33258], [12164, 33267],
-    [12165, 33276], [12166, 33292], [12167, 33307], [12168, 33311],
-    [12169, 33390], [12170, 33394], 33406, [12173, 34411], [12174, 34880],
-    [12175, 34892], [12176, 34915], 35199, 38433, 20018, 20136, 20301, 20303,
-    20295, 20311, 20318, 20276, 20315, 20309, 20272, {f: 2, c: 20304}, 20285,
-    20282, 20280, 20291, 20308, 20284, 20294, 20323, 20316, 20320, 20271,
-    20302, 20278, 20313, 20317, 20296, 20314, 20812, 20811, 20813, 20853,
-    {f: 2, c: 20918}, 21029, 21028, {f: 2, c: 21033}, 21032, 21163,
-    {f: 2, c: 21161}, 21164, 21283, 21363, 21365, 21533, 21549, 21534, 21566,
-    21542, 21582, 21543, 21574, 21571, 21555, 21576, 21570, 21531, 21545,
-    21578, 21561, 21563, 21560, 21550, {f: 2, c: 21557}, 21536, 21564, 21568,
-    21553, 21547, 21535, 21548, 22250, 22256, 22244, 22251, 22346, 22353,
-    22336, 22349, 22343, 22350, 22334, 22352, 22351, 22331, 22767, 22846,
-    22941, 22930, 22952, 22942, 22947, 22937, 22934, 22925, 22948, 22931,
-    22922, 22949, 23389, 23388, {f: 2, c: 23386}, 23436, 23435, 23439, 23596,
-    {f: 2, c: 23616}, 23615, 23614, {f: 2, c: 23696}, 23700, 23692, 24043,
-    24076, 24207, 24199, 24202, 24311, 24324, 24351, 24420, 24418, 24439,
-    24441, 24536, 24524, 24535, 24525, 24561, 24555, 24568, 24554, 25106,
-    25105, 25220, 25239, 25238, 25216, 25206, 25225, 25197, 25226, 25212,
-    25214, 25209, 25203, 25234, 25199, 25240, 25198, 25237, 25235, 25233,
-    25222, 25913, 25915, 25912, 26097, 26356, 26463, {f: 4, c: 26446}, 26460,
-    26454, [26462, 57801], 26441, 26438, 26464, 26451, 26455, 27493, 27599,
-    27714, 27742, 27801, 27777, {f: 2, c: 27784}, 27781, 27803, 27754, 27770,
-    27792, 27760, 27788, 27752, 27798, 27794, 27773, 27779, 27762, 27774,
-    27764, 27782, 27766, 27789, 27796, 27800, 27778, 28790, {f: 2, c: 28796},
-    28792, 29282, 29281, 29280, 29380, 29378, 29590, 29996, 29995,
-    {f: 2, c: 30007}, 30338, 30447, 30691, 31169, 31168, 31167, 31350, 31995,
-    32597, 32918, 32915, 32925, 32920, 32923, 32922, 32946, 33391, 33426,
-    33419, 33421, [12178, 35211], [12179, 35282], [12180, 35328],
-    [12181, 35895], [12182, 35910], [12183, 35925], [12185, 35997],
-    [12186, 36196], [12187, 36208], [12188, 36275], [12189, 36523],
-    [12190, 36554], [12191, 36763], [12192, 36784], 36802, 36806, 36805, 36804,
-    24033, [12194, 37009], 37026, 37034, 37030, 37027, [12195, 37193],
-    [12196, 37318], [12197, 37324], 38450, 38446, 38449, 38442, 38444, 20006,
-    20054, 20083, 20107, 20123, 20126, {f: 2, c: 20139}, 20335, 20381, 20365,
-    20339, 20351, 20332, 20379, 20363, 20358, 20355, 20336, 20341, 20360,
-    20329, 20347, 20374, 20350, 20367, 20369, 20346, 20820, 20818, 20821,
-    20841, 20855, 20854, 20856, 20925, 20989, 21051, 21048, 21047, 21050,
-    21040, 21038, 21046, 21057, 21182, 21179, 21330, 21332, 21331, 21329,
-    21350, {f: 3, c: 21367}, 21462, 21460, 21463, 21619, 21621, 21654, 21624,
-    21653, 21632, 21627, 21623, 21636, 21650, 21638, 21628, 21648, 21617,
-    21622, 21644, 21658, 21602, 21608, 21643, 21629, 21646, 22266, 22403,
-    22391, 22378, 22377, 22369, 22374, 22372, 22396, 22812, 22857,
-    {f: 2, c: 22855}, 22852, 22868, 22974, 22971, 22996, 22969, 22958, 22993,
-    22982, 22992, 22989, 22987, 22995, 22986, 22959, 22963, 22994, 22981,
-    23391, 23396, 23395, 23447, 23450, 23448, 23452, 23449, 23451, 23578,
-    23624, {f: 2, c: 23621}, 23735, 23713, 23736, 23721, 23723, 23729, 23731,
-    24088, 24090, 24086, 24085, 24091, 24081, 24184, 24218, 24215, 24220,
-    {f: 2, c: 24213}, 24310, {f: 2, c: 24358}, 24361, {f: 2, c: 24448}, 24447,
-    24444, 24541, 24544, 24573, 24565, 24575, 24591, 24596, 24623, 24629,
-    24598, 24618, 24597, 24609, 24615, 24617, 24619, 24603, 25110, 25109,
-    25151, 25150, 25152, 25215, 25289, 25292, 25284, 25279, 25282, 25273,
-    25298, 25307, 25259, {f: 2, c: 25299}, 25291, 25288, 25256, 25277, 25276,
-    [25296, 60582], 25305, 25287, 25293, 25269, 25306, 25265, 25304,
-    {f: 2, c: 25302}, 25286, 25260, [25294, 61010], 25918, 26023, 26044, 26106,
-    26132, 26131, 26124, 26118, 26114, 26126, 26112, 26127, 26133, 26122,
-    26119, 26381, 26379, 26477, 26507, 26517, 26481, 26524, 26483, 26487,
-    26503, 26525, 26519, {f: 2, c: 26479}, 26495, 26505, 26494, 26512, 26485,
-    26522, 26515, 26492, 26474, 26482, 27427, {f: 2, c: 27494}, 27519, 27667,
-    27675, 27875, 27880, 27891, 27825, 27852, 27877, 27827, {f: 2, c: 27837},
-    27836, 27874, 27819, 27861, 27859, 27832, 27844, 27833, 27841, 27822,
-    27863, 27845, 27889, 27839, 27835, 27873, 27867, 27850, 27820, 27887,
-    27868, 27862, 27872, 28821, 28814, 28818, 28810, 28825, {f: 2, c: 29228},
-    29240, 29256, 29287, 29289, 29376, 29390, 29401, 29399, 29392, 29609,
-    29608, 29599, 29611, 29605, 30013, 30109, {f: 2, c: 30105}, 30340, 30402,
-    30450, 30452, 30693, 30717, 31038, {f: 2, c: 31040}, 31177, 31176, 31354,
-    31353, 31482, 31998, 32596, 32652, 32651, [32773, 58236], 32954, 32933,
-    32930, 32945, 32929, 32939, 32937, 32948, 32938, 32943, 33253, 33278,
-    33293, 33459, 33437, 33433, 33453, 33469, 33439, 33465, 33457, 33452,
-    33445, 33455, 33464, 33443, 33456, 33470, 33463, 34382, 34417, 21021,
-    34920, 36555, 36814, 36820, 36817, 37045, 37048, 37041, 37046, 37319,
-    [12198, 37329], [12199, 38263], [12200, 38272], [12201, 38428], 38464,
-    38463, 38459, 38468, 38466, [12203, 38585], [12204, 38632], 38738,
-    [12206, 38750], 20127, {f: 2, c: 20141}, 20449, 20405, 20399, 20415, 20448,
-    20433, 20431, 20445, 20419, 20406, 20440, 20447, 20426, 20439, 20398,
-    20432, 20420, 20418, 20442, 20430, 20446, 20407, 20823, 20882, 20881,
-    20896, 21070, 21059, 21066, 21069, 21068, 21067, 21063, 21191, 21193,
-    21187, 21185, 21261, 21335, 21371, 21402, 21467, 21676, 21696, 21672,
-    21710, 21705, 21688, 21670, 21683, 21703, 21698, 21693, 21674, 21697,
-    21700, 21704, 21679, 21675, 21681, 21691, 21673, 21671, 21695, 22271,
-    22402, 22411, 22432, 22435, 22434, 22478, 22446, 22419, 22869, 22865,
-    22863, 22862, 22864, 23004, 23000, 23039, 23011, 23016, 23043, 23013,
-    23018, 23002, 23014, 23041, 23035, 23401, 23459, 23462, 23460, 23458,
-    23461, 23553, {f: 2, c: 23630}, 23629, 23627, 23769, 23762, 24055, 24093,
-    24101, 24095, 24189, 24224, 24230, 24314, 24328, 24365, 24421, 24456,
-    24453, {f: 2, c: 24458}, 24455, 24460, 24457, 24594, 24605, 24608, 24613,
-    24590, 24616, 24653, 24688, 24680, [24674, 60712], 24646, 24643, 24684,
-    24683, 24682, 24676, 25153, 25308, 25366, 25353, 25340, 25325, 25345,
-    25326, 25341, 25351, 25329, 25335, 25327, 25324, 25342, 25332, 25361,
-    25346, 25919, 25925, 26027, 26045, 26082, 26149, 26157, 26144, 26151,
-    26159, 26143, 26152, 26161, 26148, 26359, 26623, 26579, 26609, 26580,
-    26576, 26604, 26550, 26543, 26613, 26601, 26607, 26564, 26577, 26548,
-    26586, 26597, 26552, 26575, 26590, 26611, 26544, 26585, 26594, 26589,
-    26578, 27498, 27523, 27526, 27573, 27602, 27607, 27679, 27849, 27915,
-    27954, 27946, 27969, 27941, 27916, 27953, 27934, 27927, 27963,
-    {f: 2, c: 27965}, 27958, 27931, 27893, 27961, 27943, 27960, 27945, 27950,
-    27957, 27918, 27947, 28843, 28858, 28851, 28844, 28847, 28845, 28856,
-    28846, 28836, 29232, 29298, 29295, 29300, 29417, {f: 2, c: 29408}, 29623,
-    29642, 29627, 29618, 29645, 29632, 29619, 29978, 29997, 30031, 30028,
-    30030, 30027, 30123, {f: 2, c: 30116}, {f: 2, c: 30114}, 30328,
-    {f: 3, c: 30342}, 30408, 30406, 30403, 30405, 30465, 30457, 30456, 30473,
-    30475, 30462, 30460, 30471, 30684, 30722, 30740, {f: 2, c: 30732}, 31046,
-    31049, 31048, 31047, {f: 2, c: 31161}, {f: 2, c: 31185}, 31179, 31359,
-    31361, 31487, 31485, 31869, 32002, 32005, 32000, 32009, 32007, 32004,
-    32006, 32568, 32654, 32703, 32784, 32781, 32785, 32822, 32982, 32997,
-    32986, {f: 2, c: 32963}, 32972, 32993, 32987, 32974, 32990, 32996, 32989,
-    33268, 33314, 33511, 33539, 33541, 33507, 33499, 33510, 33540, 33509,
-    33538, 33545, 33490, 33495, 33521, 33537, 33500, 33492, 33489, 33502,
-    33491, 33503, 33519, 33542, 34384, 34425, 34427, 34426, 34893, 34923,
-    35201, 35284, 35336, {f: 2, c: 35330}, 35998, 36000, 36212, 36211, 36276,
-    36557, 36556, 36848, 36838, 36834, 36842, 36837, 36845, 36843, 36836,
-    36840, 37066, 37070, 37057, 37059, 37195, 37194, 37325, 38274, 38480,
-    {f: 3, c: 38475}, [12207, 38754], [12208, 38761], [12209, 38859],
-    [12210, 38893], [12211, 38899], [12212, 38913], [12213, 39080],
-    [12214, 39131], [12215, 39135], [12216, 39318], [12217, 39321], 20056,
-    20147, {f: 2, c: 20492}, 20515, 20463, 20518, 20517, 20472, [20521, 57375],
-    20502, 20486, 20540, 20511, 20506, 20498, 20497, 20474, 20480, 20500,
-    20520, 20465, 20513, 20491, 20505, 20504, 20467, 20462, 20525, 20522,
-    20478, 20523, 20489, 20860, {f: 2, c: 20900}, 20898, 20941, 20940, 20934,
-    20939, 21078, 21084, 21076, 21083, 21085, 21290, [21375, 57459], 21407,
-    21405, 21471, 21736, 21776, 21761, 21815, 21756, 21733, 21746, 21766,
-    21754, 21780, 21737, 21741, 21729, 21769, 21742, 21738, 21734, 21799,
-    21767, 21757, 21775, {f: 2, c: 22275}, 22466, 22484, 22475, 22467, 22537,
-    22799, {f: 2, c: 22871}, 22874, 23057, 23064, 23068, 23071, 23067, 23059,
-    23020, 23072, 23075, 23081, 23077, 23052, 23049, 23403, 23640, 23472,
-    23475, 23478, 23476, 23470, 23477, 23481, 23480, 23556, 23633, 23637,
-    23632, 23789, 23805, 23803, 23786, 23784, 23792, 23798, 23809, 23796,
-    24046, 24109, 24107, 24235, 24237, 24231, 24369, 24466, 24465, 24464,
-    24665, 24675, 24677, 24656, 24661, 24685, 24681, 24687, 24708, 24735,
-    24730, 24717, 24724, 24716, 24709, 24726, 25159, 25331, 25352, 25343,
-    25422, 25406, 25391, 25429, 25410, 25414, 25423, 25417, 25402, 25424,
-    25405, {f: 2, c: 25386}, 25384, 25421, 25420, {f: 2, c: 25928}, 26009,
-    26049, 26053, 26178, 26185, 26191, 26179, 26194, 26188, 26181, 26177,
-    26360, {f: 2, c: 26388}, 26391, 26657, 26680, 26696, 26694, 26707, 26681,
-    26690, 26708, 26665, 26803, 26647, 26700, 26705, 26685, 26612, 26704,
-    26688, 26684, 26691, 26666, 26693, 26643, 26648, 26689, 27530, 27529,
-    27575, 27683, {f: 2, c: 27687}, 27686, 27684, 27888, 28010, 28053, 28040,
-    28039, 28006, 28024, 28023, 27993, 28051, 28012, 28041, 28014, 27994,
-    28020, 28009, 28044, 28042, 28025, 28037, 28005, 28052, 28874, 28888,
-    28900, 28889, 28872, 28879, 29241, 29305, 29436, 29433, 29437, 29432,
-    29431, 29574, 29677, 29705, 29678, 29664, 29674, 29662, 30036, 30045,
-    30044, 30042, 30041, 30142, 30149, 30151, {f: 2, c: 30130}, 30141, 30140,
-    30137, 30146, 30136, 30347, 30384, 30410, {f: 2, c: 30413}, 30505,
-    {f: 2, c: 30495}, 30504, 30697, 30768, 30759, 30776, 30749, 30772, 30775,
-    30757, 30765, 30752, 30751, 30770, 31061, 31056, 31072, 31071, 31062,
-    31070, 31069, 31063, 31066, 31204, [31203, 60418], 31207, 31199, 31206,
-    31209, 31192, 31364, 31368, 31449, 31494, 31505, 31881, 32033, 32023,
-    32011, 32010, 32032, 32034, 32020, 32016, 32021, 32026, 32028, 32013,
-    32025, 32027, 32570, 32607, 32660, 32709, 32705, 32774, 32772, 32792,
-    32789, 32793, 32791, 32829, 32831, 33009, 33026, 33008, 33029, 33005,
-    33012, 33030, 33016, 33011, 33032, 33021, 33034, 33020, 33007, 33261,
-    33260, 33280, 33296, {f: 2, c: 33322}, 33320, 33324, 33467, 33579, 33618,
-    33620, 33610, 33592, 33616, 33609, 33589, 33588, 33615, 33586, 33593,
-    33590, 33559, 33600, 33585, 33576, 33603, 34388, 34442, 34474, 34451,
-    34468, 34473, 34444, 34467, 34460, 34928, 34935, {f: 2, c: 34945}, 34941,
-    34937, 35352, 35344, 35342, 35340, 35349, 35338, 35351, 35347, 35350,
-    35343, 35345, 35912, 35962, 35961, {f: 2, c: 36001}, [36215, 58442], 36524,
-    36562, 36564, 36559, 36785, 36865, 36870, 36855, 36864, 36858, 36852,
-    36867, 36861, 36869, 36856, 37013, 37089, 37085, 37090, 37202, 37197,
-    37196, 37336, 37341, 37335, 37340, 37337, 38275, {f: 2, c: 38498}, 38497,
-    38491, 38493, 38500, 38488, 38494, 38587, 39138, [12218, 39340],
-    [12219, 39592], [12220, 39640], [12222, 39717], [12224, 39730],
-    [12225, 39740], 20094, 20602, [20605, 57382], 20572, 20551, 20547, 20556,
-    20570, 20553, 20581, 20598, 20558, 20565, 20597, 20596, 20599, 20559,
-    20495, 20591, 20589, 20828, 20885, 20976, 21098, 21103, 21202, 21209,
-    21208, 21205, 21264, 21263, 21273, {f: 2, c: 21311}, 21310, 21443, 26364,
-    21830, 21866, 21862, 21828, 21854, 21857, 21827, 21834, 21809, 21846,
-    21839, 21845, 21807, 21860, 21816, 21806, 21852, 21804, 21859, 21811,
-    21825, 21847, 22280, 22283, 22281, 22495, 22533, 22538, 22534, 22496,
-    22500, 22522, 22530, 22581, 22519, 22521, 22816, 22882, 23094, 23105,
-    23113, 23142, 23146, 23104, 23100, 23138, 23130, 23110, 23114, 23408,
-    23495, 23493, 23492, 23490, 23487, 23494, 23561, 23560, 23559, 23648,
-    {f: 2, c: 23644}, 23815, 23814, 23822, 23835, 23830, 23842, 23825, 23849,
-    23828, 23833, 23844, 23847, 23831, 24034, 24120, 24118, 24115, 24119,
-    {f: 2, c: 24247}, 24246, 24245, 24254, 24373, 24375, 24407, 24428, 24425,
-    24427, 24471, 24473, 24478, 24472, 24481, 24480, 24476, 24703, 24739,
-    24713, 24736, 24744, 24779, 24756, 24806, 24765, 24773, 24763, 24757,
-    24796, 24764, 24792, 24789, 24774, 24799, 24760, 24794, 24775,
-    {f: 2, c: 25114}, 25160, 25504, 25511, 25458, 25494, 25506, 25509, 25463,
-    25447, 25496, 25514, 25457, 25513, 25481, 25475, 25499, 25451, 25512,
-    25476, 25480, 25497, 25505, 25516, 25490, 25487, 25472, 25467, 25449,
-    25448, 25466, 25949, 25942, 25937, 25945, 25943, 21855, 25935, 25944,
-    25941, 25940, 26012, 26011, 26028, 26063, {f: 2, c: 26059}, 26062, 26205,
-    26202, 26212, 26216, 26214, 26206, 26361, 21207, 26395, 26753, 26799,
-    26786, 26771, 26805, 26751, 26742, 26801, 26791, 26775, 26800, 26755,
-    26820, 26797, 26758, 26757, 26772, 26781, 26792, 26783, 26785, 26754,
-    27442, 27578, {f: 2, c: 27627}, 27691, 28046, 28092, 28147, 28121, 28082,
-    28129, 28108, 28132, 28155, 28154, 28165, 28103, 28107, 28079, 28113,
-    28078, 28126, 28153, 28088, 28151, 28149, 28101, 28114, 28186, 28085,
-    28122, 28139, 28120, 28138, 28145, 28142, 28136, 28102, 28100, 28074,
-    28140, 28095, 28134, 28921, {f: 2, c: 28937}, 28925, 28911, 29245, 29309,
-    29313, 29468, 29467, 29462, 29459, 29465, 29575, 29701, 29706, 29699,
-    29702, 29694, 29709, 29920, {f: 2, c: 29942}, 29980, 29986,
-    {f: 2, c: 30053}, 30050, 30064, 30095, {f: 2, c: 30164}, 30133, 30154,
-    30157, 30350, 30420, 30418, 30427, 30519, 30526, 30524, 30518, 30520,
-    30522, 30827, 30787, 30798, 31077, 31080, 31085, 31227, 31378, 31381,
-    31520, 31528, 31515, 31532, 31526, 31513, 31518, 31534, 31890, 31895,
-    31893, 32070, 32067, 32113, 32046, 32057, 32060, 32064, 32048, 32051,
-    32068, 32047, 32066, 32050, 32049, 32573, 32670, 32666, 32716, 32718,
-    32722, 32796, 32842, 32838, 33071, 33046, 33059, 33067, 33065, 33072,
-    33060, 33282, 33333, 33335, 33334, 33337, 33678, 33694, 33688, 33656,
-    33698, 33686, 33725, 33707, 33682, 33674, 33683, 33673, 33696, 33655,
-    {f: 2, c: 33659}, 33670, 33703, 34389, 24426, 34503, 34496, 34486, 34500,
-    34485, 34502, 34507, 34481, 34479, 34505, 34899, 34974, 34952, 34987,
-    34962, 34966, 34957, 34955, 35219, 35215, 35370, 35357, 35363, 35365,
-    35377, 35373, 35359, 35355, 35362, 35913, 35930, 36009, 36012, 36011,
-    36008, 36010, 36007, 36199, 36198, 36286, 36282, 36571, 36575, 36889,
-    36877, 36890, 36887, 36899, 36895, 36893, 36880, 36885, 36894, 36896,
-    36879, 36898, 36886, 36891, 36884, 37096, 37101, [37117, 58488], 37207,
-    37326, 37365, 37350, 37347, 37351, 37357, 37353, 38281, 38506, 38517,
-    38515, 38520, 38512, 38516, {f: 2, c: 38518}, 38508, 38592, 38634, 38633,
-    31456, 31455, {f: 2, c: 38914}, [12226, 39770], [12227, 40165],
-    [12228, 40565], [12229, 40575], [12230, 40613], [12231, 40635], 20642,
-    20621, 20613, 20633, 20625, 20608, 20630, 20632, 20634, 26368, 20977,
-    21106, {f: 2, c: 21108}, 21097, 21214, 21213, 21211, 21338, 21413, 21883,
-    21888, 21927, 21884, 21898, 21917, 21912, 21890, 21916, 21930, 21908,
-    21895, 21899, 21891, 21939, 21934, 21919, 21822, 21938, 21914, 21947,
-    21932, 21937, 21886, 21897, 21931, 21913, 22285, 22575, 22570, 22580,
-    22564, {f: 2, c: 22576}, 22561, 22557, 22560, {f: 2, c: 22777}, 22880,
-    [23159, 57587], 23194, 23167, 23186, 23195, 23207, 23411, 23409, 23506,
-    23500, 23507, 23504, {f: 2, c: 23562}, 23601, 23884, 23888, 23860, 23879,
-    24061, 24133, 24125, 24128, 24131, 24190, 24266, {f: 2, c: 24257}, 24260,
-    24380, 24429, {f: 2, c: 24489}, 24488, 24785, 24801, 24754, 24758, 24800,
-    24860, 24867, 24826, 24853, 24816, 24827, 24820, 24936, 24817, 24846,
-    24822, 24841, 24832, 24850, 25119, 25161, 25507, 25484, 25551, 25536,
-    25577, 25545, 25542, 25549, 25554, 25571, 25552, 25569, 25558,
-    {f: 2, c: 25581}, 25462, 25588, 25578, 25563, 25682, 25562, 25593, 25950,
-    25958, {f: 2, c: 25954}, 26001, 26000, 26031, 26222, 26224, [26228, 57786],
-    26230, 26223, 26257, 26234, 26238, 26231, {f: 2, c: 26366}, 26399, 26397,
-    26874, 26837, 26848, 26840, 26839, 26885, 26847, 26869, 26862, 26855,
-    26873, 26834, 26866, 26851, 26827, 26829, 26893, 26898, 26894, 26825,
-    26842, 26990, 26875, 27454, 27450, 27453, 27544, 27542, 27580, 27631,
-    {f: 2, c: 27694}, 27692, [28207, 57904], 28216, 28244, 28193, 28210, 28263,
-    28234, 28192, 28197, 28195, 28187, 28251, 28248, 28196, 28246, 28270,
-    28205, 28198, 28271, 28212, 28237, 28218, 28204, 28227, [28189, 57901],
-    28222, 28363, 28297, 28185, 28238, 28259, 28228, 28274, 28265, 28255,
-    {f: 2, c: 28953}, 28966, 28976, 28961, 28982, [29038, 57958], 28956, 29260,
-    29316, 29312, 29494, 29477, 29492, 29481, 29754, 29738, 29747, 29730,
-    29733, {f: 2, c: 29749}, 29748, 29743, 29723, 29734, 29736,
-    {f: 2, c: 29989}, 30059, 30058, 30178, 30171, 30179, 30169, 30168, 30174,
-    30176, {f: 2, c: 30331}, 30358, 30355, 30388, 30428, 30543, 30701, 30813,
-    30828, 30831, 31245, 31240, 31243, 31237, 31232, 31384, 31383, 31382,
-    31461, 31459, 31561, 31574, 31558, 31568, 31570, 31572, 31565, 31563,
-    31567, [31569, 60510], 31903, 31909, 32094, 32080, 32104, 32085, 32043,
-    32110, 32114, 32097, 32102, 32098, 32112, 32115, 21892, {f: 2, c: 32724},
-    32779, 32850, 32901, 33109, 33108, 33099, 33105, 33102, 33081, 33094,
-    33086, 33100, 33107, 33140, 33298, 33308, 33769, 33795, 33784, 33805,
-    33760, 33733, 33803, [33729, 58309], 33775, 33777, 33780, 33879, 33802,
-    33776, 33804, 33740, 33789, 33778, 33738, 33848, 33806, 33796, 33756,
-    33799, 33748, 33759, 34395, 34527, 34521, 34541, 34516, 34523, 34532,
-    34512, 34526, 34903, {f: 2, c: 35009}, 34993, 35203, 35222, 35387, 35424,
-    35413, 35422, 35388, 35393, 35412, 35419, 35408, 35398, 35380, 35386,
-    35382, 35414, 35937, 35970, 36015, 36028, 36019, 36029, 36033, 36027,
-    36032, 36020, 36023, 36022, 36031, 36024, 36234, 36229, 36225, 36302,
-    36317, 36299, 36314, 36305, 36300, 36315, 36294, 36603, 36600, 36604,
-    36764, 36910, 36917, 36913, 36920, 36914, 36918, 37122, 37109, 37129,
-    37118, 37219, 37221, 37327, {f: 2, c: 37396}, 37411, 37385, 37406, 37389,
-    37392, 37383, 37393, 38292, 38287, 38283, 38289, 38291, 38290, 38286,
-    38538, 38542, 38539, 38525, {f: 2, c: 38533}, 38541, 38514, 38532, 38593,
-    38597, 38596, {f: 2, c: 38598}, 38639, 38642, 38860, {f: 2, c: 38917},
-    38920, 39143, 39146, 39151, 39145, 39154, 39149, 39342, 39341,
-    [12232, 40643], [12233, 40653], [12234, 40657], 20098, 20653, 20661,
-    {f: 2, c: 20658}, 20677, 20670, 20652, 20663, 20667, 20655, 20679, 21119,
-    21111, 21117, 21215, 21222, 21220, {f: 2, c: 21218}, 21295, 21983, 21992,
-    21971, 21990, 21966, 21980, 21959, 21969, {f: 2, c: 21987}, 21999, 21978,
-    21985, {f: 2, c: 21957}, 21989, 21961, {f: 2, c: 22290}, 22622, 22609,
-    22616, 22615, 22618, 22612, 22635, 22604, 22637, 22602, 22626, 22610,
-    22603, 22887, 23233, 23241, 23244, 23230, 23229, 23228, 23219, 23234,
-    23218, 23913, 23919, 24140, 24185, 24265, 24264, 24338, 24409, 24492,
-    24494, 24858, 24847, 24904, 24863, 24819, 24859, 24825, 24833, 24840,
-    24910, 24908, 24900, 24909, 24894, 24884, 24871, 24845, 24838, 24887,
-    {f: 2, c: 25121}, 25619, 25662, 25630, 25642, 25645, 25661, 25644, 25615,
-    25628, 25620, 25613, 25654, {f: 2, c: 25622}, 25606, 25964, 26015, 26032,
-    26263, 26249, {f: 2, c: 26247}, 26262, 26244, 26264, 26253, 26371, 27028,
-    26989, 26970, 26999, 26976, 26964, 26997, 26928, 27010, 26954, 26984,
-    26987, 26974, 26963, 27001, 27014, 26973, 26979, 26971, 27463, 27506,
-    27584, 27583, 27603, 27645, 28322, 28335, 28371, 28342, 28354, 28304,
-    28317, 28359, 28357, 28325, 28312, 28348, 28346, 28331, 28369, 28310,
-    28316, 28356, 28372, 28330, 28327, 28340, 29006, 29017, 29033, 29028,
-    29001, 29031, 29020, 29036, 29030, 29004, 29029, 29022, 28998, 29032,
-    29014, 29242, 29266, 29495, 29509, 29503, 29502, 29807, 29786, 29781,
-    29791, 29790, 29761, 29759, 29785, 29787, [29788, 58019], 30070, 30072,
-    30208, 30192, 30209, 30194, 30193, 30202, 30207, 30196, 30195,
-    {f: 2, c: 30430}, 30555, 30571, 30566, 30558, 30563, 30585, 30570, 30572,
-    30556, 30565, 30568, 30562, 30702, 30862, 30896, {f: 2, c: 30871}, 30860,
-    30857, 30844, 30865, 30867, 30847, 31098, 31103, 31105, 33836, 31165,
-    31260, 31258, 31264, 31252, 31263, 31262, {f: 2, c: 31391}, 31607, 31680,
-    31584, 31598, 31591, 31921, 31923, 31925, 32147, 32121, 32145, 32129,
-    32143, 32091, 32622, {f: 2, c: 32617}, 32626, 32681, 32680, 32676, 32854,
-    32856, 32902, 32900, 33137, 33136, 33144, 33125, 33134, 33139, 33131,
-    {f: 2, c: 33145}, 33126, 33285, 33351, 33922, 33911, 33853, 33841, 33909,
-    33894, 33899, 33865, 33900, 33883, 33852, 33845, 33889, 33891, 33897,
-    33901, 33862, 34398, 34396, 34399, 34553, 34579, 34568, 34567, 34560,
-    34558, 34555, {f: 2, c: 34562}, 34566, 34570, 34905, 35039, 35028, 35033,
-    35036, 35032, 35037, 35041, 35018, 35029, 35026, 35228, 35299, 35435,
-    {f: 2, c: 35442}, 35430, 35433, 35440, 35463, 35452, 35427, 35488, 35441,
-    35461, 35437, 35426, 35438, 35436, 35449, 35451, 35390, 35432, 35938,
-    35978, 35977, 36042, {f: 2, c: 36039}, 36036, 36018, 36035, 36034, 36037,
-    36321, 36319, 36328, 36335, 36339, 36346, 36330, 36324, 36326, 36530,
-    36611, 36617, 36606, 36618, 36767, 36786, 36939, 36938, 36947, 36930,
-    36948, 36924, 36949, 36944, 36935, 36943, 36942, 36941, 36945, 36926,
-    36929, 37138, 37143, 37228, 37226, 37225, 37321, 37431, 37463, 37432,
-    37437, 37440, 37438, 37467, 37451, 37476, 37457, 37428, 37449, 37453,
-    37445, 37433, 37439, 37466, 38296, 38552, {f: 2, c: 38548}, 38605, 38603,
-    {f: 2, c: 38601}, 38647, 38651, 38649, 38646, 38742, 38772, 38774,
-    {f: 2, c: 38928}, 38931, 38922, 38930, 38924, 39164, 39156,
-    {f: 2, c: 39165}, 39347, 39345, 39348, 39649, 40169, 40578, [12237, 40718],
-    [12238, 40723], [12239, 40736], 20711, 20718, 20709, 20694, [20717, 60903],
-    20698, 20693, 20687, 20689, 20721, 20686, 20713, 20834, 20979, 21123,
-    21122, 21297, 21421, 22014, 22016, 22043, 22039, 22013, 22036, 22022,
-    22025, {f: 2, c: 22029}, 22007, 22038, 22047, 22024, 22032, 22006, 22296,
-    22294, 22645, 22654, 22659, 22675, 22666, 22649, 22661, 22653, 22781,
-    22821, 22818, 22820, 22890, 22889, 23265, 23270, 23273, 23255, 23254,
-    23256, 23267, 23413, 23518, 23527, 23521, {f: 2, c: 23525}, 23528, 23522,
-    23524, 23519, 23565, 23650, 23940, 23943, 24155, 24163, 24149, 24151,
-    24148, 24275, 24278, 24330, 24390, 24432, 24505, 24903, 24895, 24907,
-    24951, {f: 2, c: 24930}, 24927, 24922, 24920, 24949, 25130, 25735, 25688,
-    25684, 25764, 25720, 25695, 25722, 25681, 25703, 25652, 25709, 25723,
-    25970, 26017, 26071, 26070, 26274, 26280, 26269, 27036, 27048, 27029,
-    27073, 27054, 27091, 27083, 27035, 27063, 27067, 27051, 27060, 27088,
-    27085, 27053, 27084, 27046, 27075, 27043, 27465, 27468, 27699, 28467,
-    28436, 28414, 28435, 28404, 28457, 28478, 28448, 28460, 28431, 28418,
-    28450, 28415, 28399, 28422, 28465, 28472, 28466, 28451, 28437, 28459,
-    28463, 28552, 28458, 28396, 28417, 28402, 28364, 28407, 29076, 29081,
-    29053, 29066, 29060, 29074, 29246, 29330, 29334, 29508, 29520, 29796,
-    29795, 29802, 29808, 29805, 29956, 30097, 30247, 30221, 30219, 30217,
-    30227, 30433, 30435, 30596, 30589, 30591, 30561, 30913, 30879, 30887,
-    30899, 30889, 30883, {f: 2, c: 31118}, 31117, 31278, 31281, 31402, 31401,
-    31469, 31471, 31649, 31637, 31627, 31605, 31639, 31645, 31636, 31631,
-    [31672, 58170], 31623, 31620, 31929, {f: 2, c: 31933}, 32187, 32176, 32156,
-    {f: 2, c: 32189}, 32160, 32202, 32180, 32178, 32177, 32186, 32162, 32191,
-    32181, 32184, 32173, [32210, 58202], 32199, 32172, 32624, {f: 2, c: 32736},
-    32735, 32862, 32858, 32903, 33104, 33152, 33167, 33160, 33162, 33151,
-    33154, 33255, 33274, 33287, 33300, 33310, 33355, 33993, 33983, 33990,
-    33988, 33945, 33950, 33970, 33948, 33995, 33976, 33984, 34003, 33936,
-    33980, 34001, 33994, 34623, 34588, 34619, 34594, 34597, 34612, 34584,
-    34645, 34615, 34601, 35059, 35074, 35060, 35065, 35064, 35069, 35048,
-    35098, 35055, 35494, 35468, 35486, 35491, 35469, 35489, 35475, 35492,
-    35498, 35493, 35496, 35480, 35473, 35482, 35495, 35946, 35981, 35980,
-    36051, {f: 2, c: 36049}, 36203, 36249, 36245, 36348, 36628, 36626, 36629,
-    36627, 36771, 36960, 36952, 36956, 36963, 36953, 36958, 36962, 36957,
-    36955, 37145, 37144, 37150, 37237, 37240, 37239, 37236, 37496, 37548,
-    37504, 37509, 37528, 37526, 37499, 37523, 37532, 37544, 37500, 37521,
-    38305, {f: 2, c: 38312}, 38307, 38309, 38308, 38553, 38556, 38555, 38604,
-    38610, 38656, 38780, 38789, 38902, {f: 2, c: 38935}, 39087, 39089, 39171,
-    39173, 39180, 39177, 39361, {f: 2, c: 39599}, 39654, {f: 2, c: 39745},
-    40180, 40182, 40179, 40636, [12240, 40763], [12241, 40778], 20740, 20736,
-    20731, 20725, 20729, 20738, {f: 2, c: 20744}, 20741, 20956,
-    {f: 3, c: 21127}, 21133, 21130, 21232, 21426, 22062, 22075, 22073, 22066,
-    22079, 22068, 22057, 22099, 22094, 22103, 22132, 22070, {f: 2, c: 22063},
-    22656, 22687, 22686, 22707, 22684, 22702, 22697, 22694, 22893, 23305,
-    23291, 23307, 23285, 23308, 23304, 23534, 23532, 23529, 23531,
-    {f: 2, c: 23652}, 23965, 23956, 24162, 24159, 24161, 24290, 24282, 24287,
-    24285, 24291, 24288, 24392, 24433, 24503, 24501, 24950, 24935, 24942,
-    24925, 24917, 24962, 24956, 24944, 24939, 24958, 24999, 24976, 25003,
-    24974, 25004, 24986, 24996, 24980, 25006, 25134, 25705, 25711, 25721,
-    25758, 25778, 25736, [25744, 57745], 25776, 25765, 25747, 25749, 25769,
-    25746, 25774, 25773, 25771, 25754, 25772, 25753, 25762, 25779, 25973,
-    {f: 2, c: 25975}, 26286, 26283, 26292, 26289, 27171, 27167, 27112, 27137,
-    27166, 27161, 27133, 27169, 27155, 27146, 27123, 27138, 27141, 27117,
-    27153, 27472, 27470, 27556, {f: 2, c: 27589}, 28479, 28540, 28548, 28497,
-    28518, 28500, 28550, 28525, 28507, 28536, 28526, 28558, 28538, 28528,
-    28516, 28567, 28504, 28373, 28527, 28512, 28511, 29087, 29100, 29105,
-    29096, 29270, 29339, 29518, 29527, 29801, 29835, 29827, 29822, 29824,
-    30079, 30240, 30249, 30239, 30244, 30246, {f: 2, c: 30241}, 30362, 30394,
-    30436, 30606, 30599, 30604, 30609, 30603, 30923, 30917, 30906, 30922,
-    30910, 30933, 30908, 30928, 31295, 31292, 31296, 31293, 31287, 31291,
-    31407, 31406, 31661, 31665, 31684, 31668, {f: 2, c: 31686}, 31681, 31648,
-    31692, 31946, 32224, 32244, 32239, 32251, 32216, 32236, 32221, 32232,
-    32227, 32218, 32222, 32233, 32158, 32217, 32242, 32249, 32629, 32631,
-    32687, 32745, 32806, {f: 3, c: 33179}, 33184, 33178, 33176, 34071, 34109,
-    34074, 34030, {f: 2, c: 34092}, 34067, 34065, 34083, 34081, 34068, 34028,
-    34085, 34047, 34054, 34690, 34676, 34678, 34656, 34662, 34680, 34664,
-    34649, 34647, 34636, 34643, 34907, 34909, 35088, 35079, {f: 2, c: 35090},
-    35093, 35082, 35516, 35538, 35527, 35524, 35477, 35531, 35576, 35506,
-    35529, 35522, 35519, 35504, 35542, 35533, 35510, 35513, 35547, 35916,
-    35918, 35948, 36064, 36062, 36070, 36068, {f: 2, c: 36076},
-    {f: 2, c: 36066}, 36060, 36074, 36065, 36205, 36255, 36259, 36395, 36368,
-    36381, 36386, 36367, 36393, 36383, 36385, 36382, 36538, 36637, 36635,
-    36639, 36649, 36646, 36650, 36636, 36638, 36645, 36969, 36974, 36968,
-    36973, 36983, 37168, 37165, 37159, 37169, 37255, 37257, 37259, 37251,
-    37573, 37563, 37559, 37610, 37604, 37569, 37555, 37564, 37586, 37575,
-    37616, 37554, 38317, 38321, 38660, {f: 2, c: 38662}, 38665, 38752, 38797,
-    38795, 38799, 38945, 38955, 38940, 39091, 39178, 39187, 39186, 39192,
-    39389, 39376, 39391, 39387, 39377, 39381, 39378, 39385, 39607,
-    {f: 2, c: 39662}, 39719, 39749, 39748, 39799, 39791, 40198, 40201, 40195,
-    40617, 40638, 40654, 22696, [12242, 40786], 20754, 20760, 20756, 20752,
-    20757, 20864, 20906, 20957, 21137, 21139, 21235, 22105, 22123, 22137,
-    22121, 22116, 22136, 22122, 22120, 22117, 22129, 22127, 22124, 22114,
-    22134, 22721, 22718, 22727, 22725, 22894, 23325, 23348, 23416, 23536,
-    23566, 24394, 25010, 24977, 25001, 24970, 25037, 25014, 25022, 25034,
-    25032, 25136, 25797, 25793, 25803, {f: 2, c: 25787}, 25818, 25796, 25799,
-    25794, 25805, 25791, 25810, 25812, 25790, 25972, 26310, 26313, 26297,
-    26308, 26311, 26296, 27197, 27192, 27194, 27225, 27243, 27224, 27193,
-    27204, 27234, 27233, 27211, 27207, 27189, 27231, 27208, 27481, 27511,
-    27653, 28610, 28593, 28577, 28611, 28580, 28609, 28583, 28595, 28608,
-    28601, [28598, 60318], 28582, 28576, 28596, 29118, 29129, 29136, 29138,
-    29128, 29141, 29113, 29134, 29145, 29148, {f: 2, c: 29123}, 29544, 29852,
-    29859, 29848, 29855, 29854, 29922, {f: 2, c: 29964}, 30260, 30264, 30266,
-    30439, 30437, 30624, {f: 2, c: 30622}, 30629, 30952, 30938, 30956, 30951,
-    31142, {f: 2, c: 31309}, 31302, 31308, 31307, 31418, 31705, 31761, 31689,
-    31716, 31707, 31713, 31721, 31718, {f: 2, c: 31957}, 32266, 32273, 32264,
-    32283, 32291, 32286, [32285, 58211], 32265, 32272, 32633, 32690,
-    {f: 2, c: 32752}, 32750, [32808, 58239], 33203, 33193, 33192, 33275, 33288,
-    {f: 2, c: 33368}, 34122, 34137, 34120, {f: 2, c: 34152}, 34115, 34121,
-    34157, 34154, 34142, 34691, 34719, 34718, 34722, 34701, 34913, 35114,
-    35122, 35109, 35115, 35105, 35242, [35238, 58391], 35558, 35578, 35563,
-    35569, 35584, 35548, 35559, 35566, 35582, {f: 2, c: 35585}, 35575, 35565,
-    35571, 35574, 35580, 35947, 35949, 35987, 36084, 36420, 36401, 36404,
-    36418, 36409, 36405, 36667, 36655, 36664, 36659, 36776, 36774, 36981,
-    36980, 36984, 36978, 36988, 36986, 37172, 37266, 37664, 37686, 37624,
-    37683, 37679, 37666, 37628, 37675, 37636, 37658, 37648, 37670, 37665,
-    37653, 37678, 37657, 38331, {f: 2, c: 38567}, 38570, 38613, 38670, 38673,
-    38678, 38669, 38675, 38671, 38747, [38748, 58565], 38758, 38808, 38960,
-    38968, 38971, 38967, 38957, 38969, 38948, 39184, 39208, 39198, 39195,
-    39201, 39194, 39405, 39394, 39409, 39608, 39612, 39675, 39661, 39720,
-    39825, 40213, 40227, 40230, 40232, 40210, 40219, 40664, 40660,
-    [12243, 40845], [12244, 40860], 20778, 20767, 20769, 20786, 21237, 22158,
-    22144, 22160, 22149, 22151, 22159, 22741, 22739, 22737, 22734, 23344,
-    23338, 23332, 23418, 23607, 23656, 23996, 23994, 23997, 23992, 24171,
-    24396, 24509, 25033, 25026, 25031, 25062, 25035, 25138, 25140, 25806,
-    25802, 25816, 25824, 25840, 25830, 25836, 25841, 25826, 25837,
-    {f: 2, c: 25986}, 26329, 26326, 27264, 27284, 27268, 27298, 27292, 27355,
-    27299, 27262, 27287, 27280, 27296, 27484, 27566, 27610, 27656, 28632,
-    28657, {f: 2, c: 28639}, 28635, 28644, 28651, 28655, 28544, 28652, 28641,
-    28649, 28629, 28654, 28656, 29159, [29151, 60361], 29166, 29158, 29157,
-    29165, 29164, 29172, 29152, 29237, 29254, 29552, 29554, 29865, 29872,
-    29862, 29864, 30278, 30274, 30284, 30442, 30643, 30634, 30640, 30636,
-    30631, 30637, 30703, 30967, 30970, 30964, 30959, 30977, 31143, 31146,
-    31319, 31423, 31751, 31757, 31742, 31735, 31756, 31712, 31968, 31964,
-    31966, 31970, 31967, 31961, 31965, 32302, 32318, 32326, 32311, 32306,
-    32323, 32299, 32317, 32305, 32325, 32321, 32308, 32313, 32328, 32309,
-    32319, 32303, 32580, 32755, 32764, {f: 2, c: 32881}, 32880, 32879, 32883,
-    33222, 33219, 33210, 33218, 33216, 33215, 33213, 33225, 33214, 33256,
-    33289, 33393, 34218, 34180, 34174, 34204, 34193, 34196, 34223, 34203,
-    34183, 34216, 34186, 34214, 34407, 34752, 34769, 34739, 34770, 34758,
-    34731, 34747, 34746, 34760, 34763, 35131, 35126, 35140, 35128, 35133,
-    35244, 35598, 35607, 35609, 35611, 35594, 35616, 35613, 35588, 35600,
-    35905, 35903, 35955, 36090, 36093, 36092, 36088, 36091, 36264, 36425,
-    36427, 36424, 36426, 36676, 36670, 36674, 36677, 36671, 36991, 36989,
-    36996, {f: 2, c: 36993}, 36992, 37177, 37283, 37278, 37276, 37709, 37762,
-    37672, 37749, 37706, 37733, 37707, 37656, 37758, 37740, 37723, 37744,
-    37722, 37716, {f: 3, c: 38346}, 38344, 38342, 38577, 38584, 38614, 38684,
-    38686, 38816, 38867, 38982, 39094, 39221, 39425, 39423, 39854, 39851,
-    39850, 39853, 40251, 40255, 40587, 40655, 40670, {f: 2, c: 40668}, 40667,
-    40766, 40779, 21474, 22165, 22190, 22745, 22744, 23352, 24413, 25059,
-    25139, 25844, 25842, 25854, 25862, {f: 2, c: 25850}, 25847, 26039, 26332,
-    26406, 27315, 27308, 27331, 27323, 27320, 27330, {f: 2, c: 27310}, 27487,
-    27512, 27567, 28681, 28683, 28670, 28678, 28666, 28689, 28687,
-    {f: 2, c: 29179}, 29182, 29176, 29559, 29557, 29863, 29887, 29973, 30294,
-    30296, 30290, 30653, 30655, {f: 2, c: 30651}, 30990, 31150,
-    {f: 2, c: 31329}, 31328, {f: 2, c: 31428}, 31787, 31783, 31786, 31774,
-    31779, 31777, 31975, {f: 2, c: 32340}, 32350, 32346, 32353, 32338, 32345,
-    32584, 32761, 32763, 32887, 32886, 33229, 33231, 33290, 34255, 34217,
-    34253, 34256, 34249, 34224, 34234, 34233, 34799, 34796, 34802, 34784,
-    35206, 35250, 35316, 35624, 35641, 35628, 35627, 35920, 36101, 36441,
-    36451, 36454, 36452, 36447, 36437, 36544, 36681, 36685, 36999, 36995,
-    37000, {f: 2, c: 37291}, 37328, 37780, 37770, 37782, 37794, 37811, 37806,
-    37804, 37808, 37784, 37786, 37783, 38356, 38358, 38352, 38357, 38626,
-    38620, 38617, 38619, 38622, 38692, 38819, 38822, 38829, 38905, 38989,
-    38991, 38988, 38990, 38995, 39098, {f: 2, c: 39230}, 39229, 39214, 39333,
-    39438, 39617, 39683, 39686, 39759, 39758, 39757, 39882, 39881, 39933,
-    39880, 39872, 40273, 40285, 40288, 40672, 40725, 40748, 20787, 22181,
-    22184, {f: 2, c: 22750}, 22754, 23541, 40848, 24300, 25074, 25079, 25078,
-    25077, 25856, 25871, 26336, 26333, 27365, 27357, 27354, 27347, 28699,
-    28703, 28712, 28698, 28701, 28693, 28696, 29190, 29197, 29272, 29346,
-    29560, 29562, 29885, 29898, 29923, 30087, 30086, 30303, 30305, 30663,
-    31001, 31153, 31339, 31337, {f: 2, c: 31806}, 31800, 31805, 31799, 31808,
-    32363, 32365, 32377, {f: 2, c: 32361}, 32371, 32645, 32694, 32697, 32696,
-    33240, 34281, 34269, 34282, 34261, {f: 2, c: 34276}, 34295, 34811, 34821,
-    34829, 34809, 34814, 35168, 35167, 35158, 35166, 35649, 35676, 35672,
-    35657, 35674, {f: 2, c: 35662}, 35654, 35673, 36104, 36106, 36476, 36466,
-    36487, 36470, 36460, 36474, 36468, 36692, 36686, 36781, {f: 2, c: 37002},
-    37297, 37294, 37857, 37841, 37855, 37827, 37832, {f: 2, c: 37852}, 37846,
-    37858, 37837, 37848, 37860, 37847, 37864, 38364, 38580, 38627, 38698,
-    38695, 38753, 38876, 38907, 39006, 39000, 39003, 39100, 39237, 39241,
-    39446, 39449, 39693, 39912, 39911, 39894, 39899, 40329, 40289, 40306,
-    40298, 40300, 40594, 40599, 40595, 40628, 21240, 22199, 22198, 22196,
-    22204, 22756, 23360, 23363, 23421, 23542, 24009, 25080, 25082, 25880,
-    25876, 25881, 26342, 26407, 27372, 28734, 28720, 28722, 29200, 29563,
-    29903, 30306, 30309, 31014, 31018, 31020, 31019, 31431, 31478, 31820,
-    31811, 31821, {f: 2, c: 31983}, 36782, 32381, 32380, 32386, 32588, 32768,
-    33242, 33382, 34299, 34297, 34321, 34298, 34310, 34315, 34311, 34314,
-    {f: 2, c: 34836}, 35172, 35258, 35320, 35696, 35692, 35686, 35695, 35679,
-    35691, 36111, 36109, 36489, 36481, 36485, 36482, 37300, 37323, 37912,
-    37891, 37885, 38369, 38704, 39108, 39250, 39249, 39336, 39467, 39472,
-    39479, 39477, 39955, 39949, 40569, 40629, 40680, 40751, 40799, 40803,
-    40801, {f: 2, c: 20791}, 22209, 22208, 22210, 22804, 23660, 24013, 25084,
-    25086, 25885, 25884, 26005, 26345, 27387, 27396, 27386, 27570, 28748,
-    29211, 29351, 29910, 29908, 30313, 30675, 31824, 32399, 32396, 32700,
-    34327, 34349, 34330, 34851, 34850, 34849, 34847, 35178, 35180, 35261,
-    35700, 35703, 35709, 36115, 36490, 36493, 36491, 36703, 36783, 37306,
-    37934, 37939, 37941, 37946, 37944, 37938, 37931, 38370, {f: 2, c: 38712},
-    38706, [38911, 58586], 39015, 39013, 39255, 39493, 39491, 39488, 39486,
-    39631, 39764, 39761, 39981, 39973, 40367, 40372, 40386, 40376, 40605,
-    40687, 40729, 40796, {f: 2, c: 40806}, 20796, 20795, 22216, 22218, 22217,
-    23423, 24020, 24018, 24398, 25087, 25892, 27402, 27489, 28753, 28760,
-    29568, 29924, 30090, 30318, 30316, 31155, 31840, 31839, 32894, 32893,
-    33247, 35186, 35183, 35324, 35712, {f: 2, c: 36118}, 36497, 36499, 36705,
-    37192, 37956, {f: 2, c: 37969}, {f: 2, c: 38717}, 38851, 38849, 39019,
-    39253, 39509, 39501, 39634, 39706, 40009, 39985, 39998, 39995, 40403,
-    40407, 40756, 40812, 40810, 40852, 22220, 24022, 25088, 25891, 25899,
-    25898, 26348, 27408, 29914, 31434, 31844, 31843, 31845, 32403, 32406,
-    32404, 33250, 34360, 34367, 34865, 35722, 37008, 37007, 37987, 37984,
-    37988, 38760, 39023, 39260, {f: 2, c: 39514}, 39511, {f: 2, c: 39635},
-    39633, 40020, 40023, 40022, 40421, 40607, 40692, 22225, 22761, 25900,
-    28766, {f: 2, c: 30321}, [30679, 60226], 32592, 32648, 34870, 34873, 34914,
-    35731, 35730, 35734, 33399, 36123, 37312, 37994, 38722, 38728, 38724,
-    38854, 39024, 39519, 39714, 39768, 40031, {f: 2, c: 40441},
-    {f: 2, c: 40572}, 40711, 40823, 40818, 24307, 27414, 28771, 31852, 31854,
-    34875, 35264, 36513, 37313, 38002, 38000, 39025, 39262, 39638, 39715,
-    40652, 28772, 30682, 35738, 38007, 38857, 39522, 39525, 32412, 35740,
-    36522, 37317, {f: 2, c: 38013}, 38012, {f: 2, c: 40055}, 40695, 35924,
-    38015, 40474, 29224, 39530, 39729, 40475, 40478, 31858, 20034, 20060,
-    [12048, 20981], [12053, 21274], [12058, 21378], 19975, 19980, 20039, 20109,
-    [12062, 22231], [12076, 23662], [12091, 24435], 19983, 20871, 19982, 20014,
-    20115, 20162, 20169, 20168, 20888, 21244, 21356, 21433, 22304, 22787,
-    22828, [23568, 60417], 24063, 26081, [12110, 27571], 27596, [12115, 27668],
-    [12121, 29247], 20017, 20028, 20200, 20188, 20201, 20193, 20189, 20186,
-    21004, 21001, 21276, 21324, {f: 2, c: 22306}, 22807, 22831, 23425, 23428,
-    23570, 23611, 23668, 23667, 24068, 24192, 24194, 24521, 25097, 25168,
-    27669, 27702, 27715, 27711, 27707, 29358, 29360, 29578, [12145, 31160],
-    32906, 38430, 20238, 20248, 20268, 20213, 20244, 20209, 20224, 20215,
-    20232, 20253, 20226, 20229, 20258, 20243, 20228, 20212, 20242, 20913,
-    21011, 21008, 21158, 21282, 21279, 21325, 21386, 21511, 22241, 22239,
-    22318, 22314, 22324, 22844, 22912, 22908, 22917, 22907, 22910, 22903,
-    22911, 23382, 23573, 23589, 23676, {f: 2, c: 23674}, 23678, 24031,
-    [24181, 57646], 24196, 24322, 24346, 24436, 24533, 24532, 24527, 25180,
-    25182, 25188, 25185, 25190, 25186, 25177, 25184, 25178, 25189, 25911,
-    26095, 26094, 26430, 26425, 26424, 26427, 26426, 26431, 26428, 26419,
-    27672, 27718, 27730, 27740, 27727, [27722, 60796], 27732, {f: 2, c: 27723},
-    28785, 29278, {f: 2, c: 29364}, 29582, 29994, 30335, 31349, [12153, 32593],
-    [12171, 33400], 33404, 33408, 33405, 33407, [12172, 34381], [12177, 35198],
-    37017, [37015, 59347], 37016, 37019, 37012, 38434, 38436, 38432, 38435,
-    20310, 20283, 20322, 20297, 20307, 20324, 20286, 20327, 20306, 20319,
-    20289, 20312, 20269, 20275, 20287, 20321, 20879, 20921, 21020, 21022,
-    21025, {f: 2, c: 21165}, 21257, 21347, 21362, {f: 2, c: 21390}, 21552,
-    21559, 21546, 21588, 21573, 21529, 21532, 21541, 21528, 21565, 21583,
-    21569, 21544, 21540, 21575, 22254, 22247, 22245, 22337, 22341, 22348,
-    22345, 22347, 22354, 22790, 22848, 22950, 22936, 22944, 22935, 22926,
-    22946, 22928, 22927, 22951, 22945, 23438, 23442, 23592, 23594, 23693,
-    23695, 23688, 23691, 23689, 23698, 23690, 23686, 23699, 23701, 24032,
-    24074, 24078, 24203, 24201, 24204, 24200, 24205, 24325, 24349, 24440,
-    24438, 24530, 24529, 24528, 24557, 24552, 24558, 24563, 24545, 24548,
-    24547, 24570, 24559, 24567, 24571, 24576, 24564, 25146, 25219, 25228,
-    {f: 2, c: 25230}, 25236, 25223, 25201, 25211, 25210, 25200, 25217, 25224,
-    25207, 25213, 25202, 25204, 26096, 26100, 26099, 26098, 26101, 26437,
-    26439, 26457, 26453, 26444, 26440, 26461, 26445, 26458, 26443, 27600,
-    {f: 2, c: 27673}, 27768, 27751, 27755, 27780, 27787, 27791, 27761, 27759,
-    27753, 27802, 27757, 27783, 27797, [27804, 57900], 27750, 27763, 27749,
-    27771, 27790, 28788, 28794, 29283, 29375, 29373, 29379, 29382, 29377,
-    29370, 29381, 29589, 29591, {f: 2, c: 29587}, 29586, 30010, 30009,
-    {f: 2, c: 30100}, 30337, 31037, 32820, 32917, 32921, 32912, 32914, 32924,
-    33424, 33423, 33413, 33422, 33425, 33427, 33418, {f: 2, c: 33411},
-    [12184, 35960], 36809, 36799, 37023, 37025, 37029, 37022, 37031, 37024,
-    38448, 38440, 38447, 38445, 20019, 20376, 20348, 20357, 20349, 20352,
-    20359, 20342, 20340, 20361, 20356, 20343, 20300, 20375, 20330, 20378,
-    20345, 20353, 20344, 20368, 20380, 20372, 20382, 20370, 20354, 20373,
-    20331, 20334, 20894, 20924, 20926, 21045, {f: 2, c: 21042}, 21062, 21041,
-    21180, {f: 2, c: 21258}, 21308, 21394, 21396, 21639, 21631, 21633, 21649,
-    21634, 21640, 21611, 21626, 21630, 21605, 21612, 21620, 21606, 21645,
-    21615, 21601, 21600, 21656, 21603, 21607, 21604, 22263, 22265, 22383,
-    22386, 22381, 22379, 22385, 22384, 22390, 22400, 22389, 22395,
-    {f: 2, c: 22387}, 22370, 22376, 22397, 22796, 22853, 22965, 22970, 22991,
-    22990, 22962, 22988, 22977, 22966, 22972, 22979, 22998, 22961, 22973,
-    22976, 22984, 22964, 22983, 23394, 23397, 23443, 23445, 23620, 23623,
-    23726, 23716, 23712, 23733, 23727, 23720, 23724, 23711, 23715, 23725,
-    23714, 23722, 23719, 23709, 23717, 23734, 23728, 23718, 24087, 24084,
-    24089, 24360, {f: 3, c: 24354}, 24404, 24450, 24446, 24445, 24542, 24549,
-    24621, 24614, 24601, 24626, 24587, 24628, 24586, 24599, 24627, 24602,
-    24606, 24620, 24610, 24589, 24592, 24622, 24595, 24593, 24588, 24585,
-    24604, 25108, 25149, 25261, 25268, 25297, 25278, 25258, 25270, 25290,
-    25262, 25267, 25263, 25275, 25257, 25264, 25272, 25917, 26024, 26043,
-    26121, 26108, 26116, 26130, 26120, 26107, 26115, 26123, 26125, 26117,
-    26109, 26129, 26128, 26358, 26378, 26501, 26476, 26510, 26514, 26486,
-    26491, 26520, 26502, 26500, 26484, 26509, 26508, 26490, 26527, 26513,
-    26521, 26499, 26493, 26497, {f: 2, c: 26488}, 26516, 27429, 27520, 27518,
-    27614, 27677, 27795, 27884, 27883, 27886, 27865, 27830, 27860, 27821,
-    27879, 27831, 27856, 27842, 27834, 27843, 27846, 27885, 27890, 27858,
-    27869, 27828, 27786, 27805, 27776, 27870, 27840, 27952, 27853, 27847,
-    27824, 27897, 27855, 27881, 27857, 28820, 28824, 28805, 28819, 28806,
-    28804, 28817, 28822, 28802, 28826, 28803, 29290, 29398, 29387, 29400,
-    29385, 29404, 29394, 29396, 29402, 29388, 29393, 29604, 29601, 29613,
-    29606, 29602, 29600, 29612, 29597, 29917, 29928, {f: 2, c: 30015}, 30014,
-    30092, 30104, 30383, 30451, 30449, 30448, 30453, 30712, 30716, 30713,
-    30715, 30714, 30711, 31042, 31039, 31173, 31352, 31355, 31483, 31861,
-    31997, 32821, 32911, 32942, 32931, 32952, 32949, 32941, 33312, 33440,
-    33472, 33451, 33434, 33432, 33435, 33461, 33447, 33454, 33468, 33438,
-    33466, 33460, 33448, 33441, 33449, 33474, 33444, 33475, 33462, 33442,
-    34416, 34415, {f: 2, c: 34413}, 35926, 36818, 36811, 36819, 36813, 36822,
-    36821, 36823, 37042, 37044, 37039, 37043, 37040, 38457, 38461, 38460,
-    38458, 38467, 20429, 20421, 20435, 20402, 20425, 20427, 20417, 20436,
-    20444, 20441, [20411, 60346], 20403, 20443, 20423, 20438, 20410, 20416,
-    20409, 20460, 21060, 21065, 21184, 21186, 21309, 21372, 21399, 21398,
-    21401, 21400, 21690, 21665, 21677, 21669, 21711, 21699, 33549, 21687,
-    21678, 21718, 21686, {f: 2, c: 21701}, 21664, 21616, 21692, 21666, 21694,
-    21618, 21726, 21680, 22453, {f: 2, c: 22430}, 22436, 22412, 22423, 22429,
-    22427, 22420, 22424, 22415, 22425, 22437, 22426, 22421, 22772, 22797,
-    22867, 23009, 23006, 23022, 23040, 23025, 23005, 23034, 23037, 23036,
-    23030, 23012, 23026, 23031, 23003, 23017, 23027, 23029, 23008, 23038,
-    23028, 23021, 23464, 23628, 23760, 23768, 23756, 23767, 23755, 23771,
-    23774, 23770, 23753, 23751, 23754, 23766, {f: 2, c: 23763}, 23759, 23752,
-    23750, 23758, 23775, 23800, 24057, {f: 3, c: 24097}, 24096, 24100, 24240,
-    24228, 24226, 24219, 24227, 24229, 24327, 24366, 24406, 24454, 24631,
-    24633, 24660, 24690, 24670, 24645, 24659, 24647, 24649, 24667, 24652,
-    24640, 24642, 24671, 24612, 24644, 24664, 24678, 24686, {f: 2, c: 25154},
-    25295, 25357, 25355, 25333, 25358, 25347, 25323, 25337, 25359, 25356,
-    25336, 25334, 25344, {f: 2, c: 25363}, 25338, 25365, 25339, 25328, 25921,
-    25923, 26026, 26047, 26166, 26145, 26162, 26165, 26140, 26150, 26146,
-    26163, 26155, 26170, 26141, 26164, 26169, 26158, {f: 2, c: 26383}, 26561,
-    26610, 26568, 26554, 26588, 26555, 26616, 26584, 26560, 26551, 26565,
-    26603, 26596, 26591, 26549, 26573, 26547, 26615, 26614, 26606, 26595,
-    26562, 26553, 26574, 26599, 26608, 26546, 26620, 26566, 26605, 26572,
-    26542, 26598, 26587, 26618, {f: 2, c: 26569}, 26563, 26602, 26571, 27432,
-    27522, 27524, 27574, 27606, 27608, 27616, {f: 2, c: 27680}, 27944, 27956,
-    27949, 27935, 27964, 27967, 27922, 27914, 27866, 27955, 27908, 27929,
-    27962, 27930, 27921, 27904, 27933, 27970, 27905, 27928, 27959, 27907,
-    27919, 27968, 27911, 27936, 27948, 27912, 27938, 27913, 27920, 28855,
-    28831, 28862, 28849, 28848, 28833, {f: 2, c: 28852}, 28841, 29249,
-    {f: 2, c: 29257}, 29292, 29296, 29299, 29294, 29386, 29412, 29416, 29419,
-    29407, 29418, 29414, 29411, 29573, 29644, 29634, 29640, 29637, 29625,
-    29622, 29621, 29620, 29675, 29631, 29639, 29630, 29635, 29638, 29624,
-    29643, 29932, 29934, 29998, {f: 2, c: 30023}, 30119, 30122, 30329, 30404,
-    30472, {f: 3, c: 30467}, 30474, 30455, 30459, 30458, {f: 2, c: 30695},
-    30726, {f: 2, c: 30737}, 30725, 30736, 30735, 30734, [30729, 58095], 30723,
-    30739, 31050, 31052, 31051, 31045, 31044, 31189, 31181, 31183, 31190,
-    31182, 31360, 31358, 31441, {f: 2, c: 31488}, 31866, {f: 2, c: 31864},
-    {f: 3, c: 31871}, 32003, 32008, 32001, 32600, 32657, 32653, 32702, 32775,
-    {f: 2, c: 32782}, 32788, 32823, 32984, 32967, 32992, 32977, 32968, 32962,
-    32976, 32965, 32995, 32985, 32988, 32970, 32981, 32969, 32975, 32983,
-    32998, 32973, 33279, 33313, 33428, 33497, 33534, 33529, 33543, 33512,
-    33536, 33493, 33594, 33515, 33494, 33524, 33516, 33505, 33522, 33525,
-    33548, 33531, 33526, 33520, 33514, 33508, 33504, 33530, 33523, 33517,
-    34423, 34420, 34428, 34419, 34881, 34894, 34919, 34922, 34921, 35283,
-    35332, 35335, 36210, 36835, 36833, 36846, 36832, 37105, 37053, 37055,
-    37077, 37061, 37054, 37063, 37067, 37064, [37332, 60294], 37331, 38484,
-    38479, 38481, 38483, 38474, 38478, 20510, 20485, 20487, 20499, 20514,
-    20528, 20507, 20469, 20468, 20531, 20535, 20524, {f: 2, c: 20470}, 20503,
-    20508, 20512, 20519, 20533, 20527, 20529, 20494, 20826, 20884, 20883,
-    20938, {f: 2, c: 20932}, 20936, 20942, 21089, 21082, 21074,
-    {f: 2, c: 21086}, 21077, 21090, 21197, 21262, 21406, 21798, 21730, 21783,
-    21778, 21735, 21747, 21732, 21786, 21759, 21764, 21768, 21739, 21777,
-    21765, 21745, 21770, 21755, {f: 2, c: 21751}, 21728, 21774, 21763, 21771,
-    {f: 2, c: 22273}, 22476, 22578, 22485, 22482, 22458, 22470, 22461, 22460,
-    22456, 22454, 22463, 22471, 22480, 22457, 22465, 22798, 22858, 23065,
-    23062, {f: 2, c: 23085}, 23061, 23055, 23063, 23050, 23070, 23091, 23404,
-    23463, 23469, 23468, 23555, 23638, 23636, 23788, 23807, 23790, 23793,
-    23799, 23808, 23801, 24105, 24104, 24232, 24238, 24234, 24236, 24371,
-    24368, 24423, 24669, 24666, 24679, 24641, 24738, 24712, 24704, 24722,
-    24705, 24733, 24707, 24725, 24731, 24727, 24711, 24732, 24718, 25113,
-    25158, 25330, 25360, 25430, 25388, {f: 2, c: 25412}, 25398, 25411, 25572,
-    25401, 25419, 25418, 25404, 25385, 25409, 25396, 25432, 25428, 25433,
-    25389, 25415, 25395, 25434, 25425, 25400, 25431, 25408, 25416, 25930,
-    25926, 26054, {f: 2, c: 26051}, 26050, 26186, 26207, 26183, 26193,
-    {f: 2, c: 26386}, 26655, 26650, 26697, {f: 2, c: 26674}, 26683, 26699,
-    26703, 26646, 26673, 26652, 26677, 26667, 26669, 26671, 26702, 26692,
-    26676, 26653, 26642, 26644, 26662, 26664, 26670, 26701, 26682, 26661,
-    26656, 27436, 27439, 27437, 27441, 27444, 27501, 32898, 27528, 27622,
-    27620, 27624, 27619, 27618, 27623, 27685, 28026, {f: 2, c: 28003}, 28022,
-    27917, 28001, 28050, 27992, 28002, 28013, 28015, 28049, 28045, 28143,
-    28031, 28038, 27998, [28007, 59078], 28000, 28055, 28016, 28028, 27999,
-    28034, 28056, 27951, 28008, 28043, 28030, 28032, 28036, 27926, 28035,
-    28027, 28029, 28021, 28048, 28892, 28883, 28881, 28893, 28875, 32569,
-    28898, 28887, 28882, 28894, 28896, 28884, 28877, {f: 3, c: 28869}, 28890,
-    28878, 28897, 29250, 29304, 29303, 29302, 29440, 29434, 29428, 29438,
-    29430, 29427, 29435, 29441, 29651, 29657, 29669, 29654, 29628, 29671,
-    29667, 29673, 29660, 29650, 29659, 29652, 29661, 29658, {f: 2, c: 29655},
-    29672, {f: 2, c: 29918}, {f: 2, c: 29940}, 29985, 30043, 30047, 30128,
-    30145, 30139, 30148, 30144, 30143, 30134, 30138, 30346, 30409, 30493,
-    30491, 30480, 30483, 30482, 30499, 30481, 30485, {f: 2, c: 30489}, 30498,
-    30503, 30755, 30764, 30754, 30773, 30767, 30760, 30766, 30763, 30753,
-    30761, 30771, 30762, 30769, 31060, 31067, 31055, 31068, 31059, 31058,
-    31057, {f: 2, c: 31211}, 31200, 31214, 31213, 31210, 31196, 31198, 31197,
-    31366, 31369, 31365, {f: 2, c: 31371}, 31370, 31367, 31448, 31504, 31492,
-    31507, 31493, 31503, 31496, 31498, 31502, 31497, 31506, 31876, 31889,
-    31882, 31884, 31880, 31885, 31877, 32030, 32029, 32017, 32014, 32024,
-    32022, 32019, 32031, 32018, 32015, 32012, 32604, 32609, 32606, 32608,
-    32605, 32603, 32662, 32658, 32707, 32706, 32704, 32790, 32830, 32825,
-    33018, 33010, 33017, 33013, 33025, 33019, 33024, 33281, 33327, 33317,
-    33587, 33581, 33604, 33561, 33617, 33573, 33622, 33599, 33601, 33574,
-    33564, 33570, 33602, 33614, 33563, 33578, 33544, 33596, 33613, 33558,
-    33572, 33568, 33591, 33583, 33577, 33607, 33605, 33612, 33619, 33566,
-    33580, 33611, 33575, 33608, 34387, 34386, 34466, 34472, 34454, 34445,
-    34449, 34462, 34439, 34455, 34438, 34443, 34458, 34437, 34469, 34457,
-    34465, 34471, 34453, 34456, 34446, 34461, 34448, 34452, {f: 2, c: 34883},
-    34925, {f: 2, c: 34933}, 34930, 34944, 34929, 34943, 34927, 34947, 34942,
-    34932, 34940, 35346, 35911, 35927, 35963, 36004, 36003, 36214, 36216,
-    36277, 36279, 36278, 36561, 36563, 36862, 36853, 36866, 36863, 36859,
-    36868, 36860, 36854, 37078, 37088, {f: 2, c: 37081}, 37091, 37087, 37093,
-    37080, 37083, 37079, 37084, 37092, 37200, {f: 2, c: 37198}, 37333, 37346,
-    37338, 38492, 38495, 38588, 39139, [12221, 39647], [12223, 39727], 20095,
-    20592, 20586, 20577, 20574, 20576, 20563, 20555, 20573, 20594, 20552,
-    20557, 20545, 20571, 20554, 20578, 20501, 20549, 20575, 20585, 20587,
-    {f: 2, c: 20579}, 20550, 20544, 20590, 20595, 20567, 20561, 20944, 21099,
-    21101, 21100, 21102, 21206, 21203, 21293, 21404, {f: 2, c: 21877}, 21820,
-    21837, 21840, 21812, 21802, 21841, 21858, 21814, 21813, 21808, 21842,
-    21829, 21772, 21810, 21861, 21838, 21817, 21832, 21805, 21819, 21824,
-    21835, 22282, 22279, 22523, 22548, 22498, 22518, 22492, 22516, 22528,
-    22509, 22525, 22536, 22520, 22539, 22515, 22479, 22535, 22510, 22499,
-    22514, 22501, 22508, 22497, 22542, 22524, 22544, 22503, 22529, 22540,
-    22513, 22505, 22512, 22541, 22532, 22876, 23136, 23128, 23125,
-    [23143, 60437], 23134, 23096, 23093, 23149, 23120, 23135, 23141, 23148,
-    23123, 23140, 23127, 23107, 23133, 23122, 23108, 23131, 23112, 23182,
-    23102, 23117, 23097, 23116, 23152, 23145, 23111, 23121, 23126, 23106,
-    23132, 23410, 23406, 23489, 23488, 23641, 23838, 23819, 23837, 23834,
-    23840, 23820, 23848, 23821, 23846, 23845, 23823, 23856, 23826, 23843,
-    23839, 23854, 24126, 24116, 24241, 24244, 24249, {f: 2, c: 24242}, 24374,
-    24376, 24475, 24470, 24479, 24714, 24720, 24710, 24766, 24752, 24762,
-    {f: 2, c: 24787}, 24783, 24804, 24793, 24797, 24776, 24753, 24795, 24759,
-    24778, 24767, 24771, 24781, 24768, 25394, 25445, 25482, 25474, 25469,
-    25533, 25502, 25517, 25501, 25495, 25515, 25486, 25455, 25479, 25488,
-    25454, 25519, 25461, 25500, 25453, 25518, 25468, 25508, 25403, 25503,
-    25464, 25477, 25473, 25489, 25485, 25456, 25939, 26061, 26213, 26209,
-    26203, 26201, 26204, 26210, 26392, 26745, 26759, 26768, 26780,
-    {f: 2, c: 26733}, 26798, 26795, 26966, 26735, 26787, 26796, 26793, 26741,
-    26740, 26802, 26767, 26743, 26770, 26748, 26731, 26738, 26794, 26752,
-    26737, 26750, 26779, 26774, 26763, 26784, 26761, 26788, 26744, 26747,
-    26769, 26764, 26762, 26749, 27446, 27443, {f: 2, c: 27447}, 27537, 27535,
-    {f: 2, c: 27533}, 27532, 27690, 28096, 28075, 28084, 28083, 28276, 28076,
-    28137, 28130, 28087, 28150, 28116, 28160, 28104, 28128, 28127, 28118,
-    28094, 28133, {f: 2, c: 28124}, 28123, 28148, 28106, 28093, 28141, 28144,
-    28090, 28117, 28098, 28111, 28105, 28112, 28146, 28115, 28157, 28119,
-    28109, 28131, 28091, 28922, 28941, 28919, 28951, 28916, 28940, 28912,
-    28932, 28915, 28944, 28924, 28927, 28934, 28947, 28928, 28920, 28918,
-    28939, 28930, 28942, 29310, {f: 2, c: 29307}, 29311, 29469, 29463, 29447,
-    29457, 29464, 29450, 29448, 29439, 29455, 29470, 29576, 29686, 29688,
-    29685, 29700, 29697, 29693, 29703, 29696, 29690, 29692, 29695, 29708,
-    29707, 29684, 29704, 30052, 30051, 30158, 30162, 30159, {f: 2, c: 30155},
-    30161, 30160, 30351, 30345, 30419, 30521, 30511, 30509, {f: 2, c: 30513},
-    30516, 30515, 30525, 30501, 30523, 30517, 30792, 30802, 30793, 30797,
-    30794, 30796, 30758, 30789, 30800, 31076, 31079, {f: 2, c: 31081}, 31075,
-    31083, 31073, 31163, 31226, 31224, {f: 2, c: 31222}, 31375, 31380, 31376,
-    31541, 31547, 31540, 31525, 31536, 31522, 31524, 31539, 31512, 31530,
-    31517, 31537, 31531, 31533, 31535, 31538, 31544, 31514, 31523, 31892,
-    31896, 31894, 31907, 32053, 32061, 32056, 32054, 32058, 32069, 32044,
-    32041, 32065, 32071, {f: 2, c: 32062}, 32074, 32059, 32040, 32611, 32661,
-    {f: 2, c: 32668}, 32667, {f: 2, c: 32714}, 32717, {f: 2, c: 32720}, 32711,
-    32719, 32713, 32799, 32798, 32795, 32839, 32835, 32840, 33048, 33061,
-    33049, 33051, 33069, 33055, 33068, 33054, 33057, 33045, 33063, 33053,
-    33058, 33297, 33336, 33331, 33338, 33332, 33330, 33396, 33680, 33699,
-    33704, 33677, 33658, 33651, 33700, 33652, 33679, 33665, 33685, 33689,
-    33653, 33684, 33705, 33661, 33667, 33676, 33693, 33691, 33706, 33675,
-    33662, 33701, 33711, 33672, 33687, 33712, 33663, 33702, 33671, 33710,
-    33654, 34393, 34390, 34495, 34487, 34498, 34497, 34501, 34490, 34480,
-    34504, 34489, 34483, 34488, 34508, 34484, {f: 2, c: 34491}, 34499,
-    {f: 2, c: 34493}, 34898, 34953, 34965, 34984, 34978, 34986, 34970, 34961,
-    34977, 34975, 34968, 34983, 34969, 34971, 34967, 34980, 34988, 34956,
-    34963, 34958, 35202, 35286, 35289, 35285, 35376, 35367, 35372, 35358,
-    35897, 35899, {f: 2, c: 35932}, 35965, 36005, 36221, 36219, 36217, 36284,
-    36290, 36281, 36287, 36289, 36568, 36574, 36573, 36572, 36567,
-    {f: 2, c: 36576}, 36900, 36875, 36881, 36892, 36876, 36897, 37103, 37098,
-    37104, 37108, {f: 2, c: 37106}, 37076, {f: 2, c: 37099}, 37097, 37206,
-    37208, 37210, 37203, 37205, 37356, 37364, 37361, 37363, 37368, 37348,
-    37369, {f: 2, c: 37354}, 37367, 37352, 37358, 38266, 38278, 38280, 38524,
-    38509, 38507, 38513, 38511, 38591, 38762, 38916, 39141, 39319, 20635,
-    20629, 20628, 20638, 20619, 20643, 20611, 20620, 20622, 20637, 20584,
-    20636, 20626, 20610, 20615, 20831, 20948, 21266, 21265, 21412, 21415,
-    21905, 21928, 21925, 21933, 21879, 22085, 21922, 21907, 21896, 21903,
-    21941, 21889, 21923, 21906, 21924, 21885, 21900, 21926, 21887, 21909,
-    21921, 21902, 22284, 22569, 22583, 22553, 22558, 22567, 22563, 22568,
-    22517, 22600, 22565, 22556, 22555, 22579, 22591, 22582, 22574, 22585,
-    22584, 22573, 22572, 22587, 22881, 23215, 23188, 23199, 23162, 23202,
-    23198, 23160, 23206, 23164, 23205, 23212, 23189, 23214, 23095, 23172,
-    23178, 23191, 23171, 23179, 23209, 23163, 23165, 23180, 23196, 23183,
-    23187, 23197, 23530, 23501, 23499, 23508, 23505, 23498, 23502, 23564,
-    23600, 23863, 23875, 23915, 23873, 23883, 23871, 23861, 23889, 23886,
-    23893, 23859, 23866, 23890, 23869, 23857, 23897, 23874, 23865, 23881,
-    23864, 23868, 23858, 23862, 23872, 23877, 24132, 24129, [24408, 57673],
-    24486, 24485, 24491, 24777, 24761, 24780, 24802, 24782, 24772, 24852,
-    24818, 24842, 24854, 24837, 24821, 24851, 24824, 24828, 24830, 24769,
-    24835, 24856, 24861, 24848, 24831, 24836, 24843, 25162, 25492, 25521,
-    25520, 25550, 25573, 25576, 25583, 25539, 25757, 25587, 25546, 25568,
-    25590, 25557, 25586, 25589, 25697, 25567, 25534, 25565, 25564, 25540,
-    25560, 25555, 25538, 25543, 25548, 25547, 25544, 25584, 25559, 25561,
-    25906, 25959, 25962, 25956, 25948, 25960, 25957, 25996, {f: 2, c: 26013},
-    26030, 26064, 26066, 26236, 26220, 26235, 26240, 26225, 26233, 26218,
-    26226, 26369, 26892, 26835, 26884, 26844, 26922, 26860, 26858, 26865,
-    26895, 26838, 26871, 26859, 26852, 26870, 26899, 26896, 26867, 26849,
-    26887, 26828, 26888, 26992, 26804, 26897, 26863, 26822, 26900, 26872,
-    26832, 26877, 26876, 26856, 26891, 26890, 26903, 26830, 26824,
-    {f: 2, c: 26845}, 26854, 26868, 26833, 26886, 26836, 26857, 26901, 26917,
-    26823, 27449, 27451, 27455, 27452, 27540, 27543, 27545, 27541, 27581,
-    27632, {f: 2, c: 27634}, 27696, 28156, {f: 2, c: 28230}, 28191, 28233,
-    28296, {f: 2, c: 28220}, 28229, 28258, 28203, 28223, 28225, 28253, 28275,
-    28188, 28211, 28235, 28224, 28241, 28219, 28163, 28206, 28254, 28264,
-    28252, 28257, 28209, 28200, 28256, 28273, 28267, 28217, 28194, 28208,
-    28243, 28261, 28199, 28280, 28260, 28279, 28245, 28281, 28242, 28262,
-    {f: 2, c: 28213}, 28250, 28960, 28958, 28975, 28923, 28974, 28977, 28963,
-    28965, 28962, 28978, 28959, 28968, 28986, 28955, 29259, 29274,
-    {f: 2, c: 29320}, 29318, 29317, 29323, 29458, 29451, 29488, 29474, 29489,
-    29491, 29479, 29490, 29485, 29478, 29475, 29493, 29452, 29742, 29740,
-    29744, 29739, 29718, 29722, 29729, 29741, 29745, 29732, 29731, 29725,
-    29737, 29728, 29746, 29947, 29999, 30063, 30060, 30183, 30170, 30177,
-    30182, 30173, 30175, 30180, 30167, 30357, 30354, 30426, {f: 2, c: 30534},
-    30532, 30541, 30533, 30538, 30542, {f: 2, c: 30539}, 30686, 30700, 30816,
-    {f: 2, c: 30820}, 30812, 30829, 30833, 30826, 30830, 30832, 30825, 30824,
-    30814, 30818, 31092, 31091, 31090, 31088, 31234, 31242, 31235, 31244,
-    31236, 31385, 31462, 31460, 31562, 31559, 31556, 31560, 31564, 31566,
-    31552, 31576, 31557, 31906, 31902, 31912, 31905, 32088, 32111, 32099,
-    32083, 32086, 32103, 32106, 32079, 32109, 32092, 32107, 32082, 32084,
-    32105, 32081, 32095, 32078, {f: 2, c: 32574}, {f: 2, c: 32613}, 32674,
-    {f: 2, c: 32672}, 32727, 32849, {f: 2, c: 32847}, 33022, 32980, 33091,
-    33098, 33106, 33103, 33095, 33085, 33101, 33082, 33254, 33262,
-    {f: 3, c: 33271}, 33284, {f: 2, c: 33340}, 33343, 33397, 33595,
-    [33743, 60382], 33785, 33827, 33728, 33768, 33810, 33767, 33764, 33788,
-    33782, 33808, 33734, 33736, 33771, 33763, 33727, 33793, 33757, 33765,
-    33752, 33791, 33761, 33739, 33742, 33750, 33781, 33737, 33801,
-    [33807, 58332], 33758, 33809, 33798, 33730, 33779, 33749, 33786, 33735,
-    33745, 33770, 33811, 33690, 33731, 33772, 33774, 33732, 33787, 33751,
-    33762, 33819, 33755, 33790, 34520, 34530, 34534, 34515, 34531, 34522,
-    34538, 34525, 34539, 34524, 34540, 34537, 34519, 34536, 34513, 34888,
-    34902, 34901, 35002, 35031, 35001, 35000, 35008, 35006, 34998, 35004,
-    34999, 35005, 34994, 35073, 35017, 35221, 35224, 35223, 35293,
-    {f: 2, c: 35290}, 35406, 35405, 35385, 35417, 35392, {f: 2, c: 35415},
-    {f: 2, c: 35396}, 35410, 35400, 35409, 35402, 35404, 35407, 35935, 35969,
-    35968, 36026, 36030, 36016, 36025, 36021, 36228, 36224, 36233, 36312,
-    36307, 36301, 36295, 36310, 36316, 36303, 36309, 36313, 36296, 36311,
-    36293, 36591, 36599, 36602, 36601, 36582, 36590, 36581, 36597,
-    {f: 2, c: 36583}, 36598, 36587, 36593, 36588, 36596, 36585, 36909, 36916,
-    36911, 37126, 37164, [37124, 60367], 37119, 37116, 37128, 37113, 37115,
-    37121, 37120, 37127, 37125, 37123, 37217, 37220, 37215, 37218, 37216,
-    37377, 37386, 37413, 37379, 37402, 37414, 37391, 37388, 37376, 37394,
-    37375, 37373, 37382, 37380, 37415, 37378, 37404, 37412, 37401, 37399,
-    37381, 37398, 38267, 38285, 38284, 38288, 38535, 38526, {f: 2, c: 38536},
-    38531, 38528, 38594, 38600, 38595, 38641, 38640, 38764, 38768, 38766,
-    38919, 39081, 39147, 40166, [12235, 40697], {f: 2, c: 20099}, 20150, 20669,
-    20671, 20678, 20654, 20676, 20682, 20660, 20680, 20674, 20656, 20673,
-    20666, 20657, 20683, 20681, 20662, 20664, 20951, 21114, 21112,
-    {f: 2, c: 21115}, 21955, 21979, 21964, 21968, 21963, 21962, 21981,
-    [21952, 64013], 21972, 21956, 21993, 21951, 21970, 21901, 21967, 21973,
-    21986, 21974, 21960, 22002, 21965, 21977, 21954, 22292, 22611, 22632,
-    22628, 22607, 22605, 22601, 22639, 22613, 22606, 22621, 22617, 22629,
-    22619, 22589, 22627, 22641, 22780, 23239, 23236, 23243, 23226, 23224,
-    23217, 23221, 23216, 23231, 23240, 23227, 23238, 23223, 23232, 23242,
-    23220, 23222, 23245, 23225, 23184, 23510, {f: 2, c: 23512}, 23583, 23603,
-    23921, 23907, 23882, 23909, 23922, 23916, 23902, 23912, 23911, 23906,
-    24048, 24143, 24142, 24138, 24141, 24139, 24261, 24268, 24262, 24267,
-    24263, 24384, 24495, 24493, 24823, {f: 2, c: 24905}, 24875, 24901, 24886,
-    24882, 24878, 24902, 24879, 24911, 24873, 24896, 25120, 37224, 25123,
-    25125, 25124, 25541, 25585, 25579, 25616, 25618, 25609, 25632, 25636,
-    25651, 25667, 25631, 25621, 25624, 25657, 25655, {f: 2, c: 25634}, 25612,
-    25638, 25648, 25640, 25665, 25653, 25647, 25610, 25626, 25664, 25637,
-    25639, 25611, 25575, 25627, 25646, 25633, 25614, 25967, 26002, 26067,
-    26246, 26252, 26261, 26256, 26251, 26250, 26265, 26260, 26232, 26400,
-    26982, 26975, 26936, 26958, 26978, 26993, 26943, 26949, 26986, 26937,
-    26946, 26967, 26969, 27002, {f: 2, c: 26952}, 26933, 26988, 26931, 26941,
-    26981, 26864, 27000, 26932, 26985, 26944, 26991, 26948, 26998, 26968,
-    26945, 26996, 26956, 26939, 26955, 26935, 26972, 26959, 26961, 26930,
-    26962, 26927, 27003, 26940, 27462, 27461, 27459, 27458, 27464, 27457,
-    27547, {f: 2, c: 27643}, 27641, {f: 2, c: 27639}, 28315, 28374, 28360,
-    28303, 28352, 28319, {f: 2, c: 28307}, 28320, 28337, 28345, 28358, 28370,
-    28349, 28353, 28318, 28361, 28343, 28336, 28365, 28326, 28367, 28338,
-    28350, 28355, 28380, 28376, 28313, 28306, 28302, 28301, 28324, 28321,
-    28351, 28339, 28368, 28362, 28311, 28334, 28323, 28999, 29012, 29010,
-    29027, 29024, 28993, 29021, [29026, 61080], 29042, 29048, 29034, 29025,
-    28994, 29016, 28995, 29003, 29040, 29023, 29008, 29011, 28996, 29005,
-    29018, 29263, 29325, 29324, 29329, 29328, 29326, 29500, 29506, 29499,
-    29498, 29504, 29514, 29513, 29764, {f: 2, c: 29770}, 29778, 29777, 29783,
-    29760, {f: 2, c: 29775}, 29774, 29762, 29766, 29773, 29780, 29921, 29951,
-    29950, 29949, 29981, 30073, 30071, 27011, 30191, 30223, 30211, 30199,
-    30206, 30204, [30201, 60782], 30200, 30224, 30203, 30198, 30189, 30197,
-    30205, 30361, 30389, 30429, 30549, {f: 2, c: 30559}, 30546, 30550, 30554,
-    30569, 30567, 30548, 30553, 30573, 30688, 30855, 30874, 30868, 30863,
-    30852, 30869, {f: 2, c: 30853}, 30881, 30851, 30841, 30873, 30848, 30870,
-    30843, 31100, 31106, 31101, 31097, 31249, {f: 2, c: 31256}, 31250, 31255,
-    31253, 31266, 31251, 31259, 31248, 31395, 31394, 31390, 31467, 31590,
-    31588, 31597, 31604, 31593, 31602, 31589, 31603, 31601, 31600, 31585,
-    31608, 31606, 31587, 31922, 31924, 31919, 32136, 32134, 32128, 32141,
-    32127, 32133, 32122, 32142, 32123, 32131, 32124, 32140, 32148, 32132,
-    32125, 32146, 32621, 32619, {f: 2, c: 32615}, 32620, 32678, 32677, 32679,
-    {f: 2, c: 32731}, 32801, 33124, 33120, 33143, 33116, 33129, 33115, 33122,
-    33138, 26401, 33118, 33142, 33127, 33135, 33092, 33121, 33309, 33353,
-    33348, 33344, 33346, 33349, 34033, 33855, 33878, 33910, 33913, 33935,
-    33933, 33893, 33873, 33856, 33926, 33895, 33840, 33869, 33917, 33882,
-    33881, 33908, 33907, 33885, 34055, 33886, 33847, 33850, 33844, 33914,
-    33859, 33912, 33842, 33861, 33833, 33753, 33867, 33839, 33858, 33837,
-    33887, 33904, 33849, 33870, 33868, 33874, 33903, 33989, 33934, 33851,
-    33863, 33846, 33843, 33896, 33918, 33860, 33835, 33888, 33876, 33902,
-    33872, 34571, 34564, 34551, 34572, 34554, 34518, 34549, 34637, 34552,
-    34574, 34569, 34561, 34550, 34573, 34565, 35030, 35019, {f: 2, c: 35021},
-    35038, 35035, 35034, 35020, 35024, 35205, 35227, 35295, 35301, 35300,
-    35297, 35296, 35298, 35292, 35302, 35446, 35462, 35455, 35425, 35391,
-    35447, 35458, 35460, 35445, 35459, 35457, 35444, 35450, 35900, 35915,
-    35914, 35941, 35940, 35942, 35974, {f: 2, c: 35972}, 36044,
-    {f: 2, c: 36200}, 36241, 36236, {f: 2, c: 36238}, 36237, {f: 2, c: 36243},
-    36240, 36242, 36336, 36320, 36332, 36337, 36334, 36304, 36329, 36323,
-    36322, 36327, 36338, 36331, 36340, 36614, 36607, 36609, 36608, 36613,
-    {f: 2, c: 36615}, 36610, [36619, 60507], 36946, 36927, 36932, 36937, 36925,
-    37136, 37133, 37135, 37137, 37142, 37140, 37131, 37134, {f: 2, c: 37230},
-    37448, 37458, 37424, 37434, 37478, 37427, 37477, 37470, 37507, 37422,
-    37450, 37446, 37485, 37484, 37455, 37472, 37479, 37487, 37430, 37473,
-    37488, 37425, 37460, 37475, 37456, 37490, 37454, 37459, 37452, 37462,
-    37426, 38303, 38300, 38302, 38299, {f: 2, c: 38546}, 38545, 38551, 38606,
-    38650, 38653, 38648, 38645, 38771, {f: 2, c: 38775}, 38770, 38927,
-    {f: 2, c: 38925}, 39084, 39158, 39161, 39343, 39346, 39344, 39349, 39597,
-    39595, 39771, 40170, 40173, 40167, 40576, [12236, 40701], 20710, 20692,
-    20695, 20712, 20723, 20699, 20714, 20701, 20708, 20691, 20716, 20720,
-    20719, 20707, 20704, 20952, {f: 2, c: 21120}, 21225, 21227, 21296, 21420,
-    22055, 22037, 22028, 22034, 22012, 22031, 22044, 22017, 22035, 22018,
-    22010, 22045, 22020, 22015, 22009, 22665, 22652, 22672, 22680, 22662,
-    22657, 22655, 22644, 22667, 22650, 22663, 22673, 22670, 22646, 22658,
-    22664, 22651, 22676, 22671, 22782, 22891, 23260, 23278, 23269, 23253,
-    23274, 23258, 23277, 23275, 23283, 23266, 23264, 23259, 23276, 23262,
-    23261, 23257, 23272, 23263, 23415, 23520, 23523, 23651, 23938, 23936,
-    23933, 23942, 23930, 23937, 23927, 23946, 23945, 23944, 23934, 23932,
-    23949, 23929, 23935, {f: 2, c: 24152}, 24147, 24280, 24273, 24279, 24270,
-    24284, 24277, 24281, 24274, 24276, 24388, 24387, 24431, 24502, 24876,
-    24872, 24897, 24926, 24945, 24947, {f: 2, c: 24914}, 24946, 24940, 24960,
-    24948, 24916, 24954, 24923, 24933, 24891, 24938, 24929, 24918, 25129,
-    25127, 25131, 25643, 25677, 25691, 25693, 25716, 25718, {f: 2, c: 25714},
-    25725, 25717, 25702, 25766, 25678, 25730, 25694, 25692, 25675, 25683,
-    25696, 25680, 25727, 25663, 25708, 25707, 25689, 25701, 25719, 25971,
-    26016, 26273, 26272, 26271, 26373, 26372, 26402, 27057, 27062, 27081,
-    27040, 27086, 27030, 27056, 27052, 27068, 27025, 27033, 27022, 27047,
-    27021, 27049, 27070, 27055, 27071, 27076, 27069, 27044, 27092, 27065,
-    27082, 27034, 27087, 27059, 27027, 27050, 27041, 27038, 27097, 27031,
-    27024, 27074, 27061, 27045, 27078, 27466, 27469, 27467, {f: 3, c: 27550},
-    {f: 2, c: 27587}, 27646, 28366, 28405, 28401, 28419, 28453, 28408, 28471,
-    28411, 28462, 28425, 28494, {f: 2, c: 28441}, 28455, 28440, 28475, 28434,
-    28397, 28426, 28470, 28531, 28409, 28398, 28461, 28480, 28464, 28476,
-    28469, 28395, 28423, 28430, 28483, 28421, 28413, 28406, 28473, 28444,
-    28412, 28474, 28447, 28429, 28446, 28424, 28449, 29063, 29072, 29065,
-    29056, 29061, 29058, 29071, 29051, 29062, 29057, 29079, 29252, 29267,
-    29335, 29333, 29331, 29507, 29517, 29521, 29516, 29794, 29811, 29809,
-    29813, 29810, 29799, 29806, 29952, {f: 2, c: 29954}, 30077, 30096, 30230,
-    30216, 30220, 30229, 30225, 30218, 30228, 30392, 30593, 30588, 30597,
-    30594, 30574, 30592, 30575, 30590, 30595, 30898, 30890, 30900, 30893,
-    30888, 30846, 30891, 30878, 30885, 30880, 30892, 30882, 30884, 31128,
-    {f: 2, c: 31114}, 31126, 31125, 31124, 31123, 31127, 31112, 31122, 31120,
-    31275, 31306, 31280, 31279, 31272, 31270, 31400, {f: 2, c: 31403}, 31470,
-    31624, 31644, 31626, 31633, 31632, 31638, 31629, 31628, 31643, 31630,
-    31621, 31640, 21124, 31641, 31652, 31618, 31931, 31935, 31932, 31930,
-    32167, 32183, 32194, 32163, 32170, 32193, 32192, 32197, 32157, 32206,
-    32196, 32198, {f: 2, c: 32203}, 32175, 32185, 32150, 32188, 32159, 32166,
-    32174, 32169, 32161, 32201, 32627, {f: 2, c: 32738}, 32741, 32734, 32804,
-    32861, 32860, 33161, 33158, 33155, 33159, 33165, 33164, 33163, 33301,
-    33943, 33956, 33953, 33951, 33978, 33998, 33986, 33964, 33966, 33963,
-    33977, 33972, 33985, 33997, 33962, 33946, 33969, 34000, 33949, 33959,
-    33979, 33954, 33940, 33991, 33996, 33947, 33961, 33967, [33960, 58327],
-    34006, 33944, 33974, 33999, 33952, 34007, 34004, 34002, 34011, 33968,
-    33937, 34401, 34611, 34595, 34600, 34667, 34624, 34606, 34590, 34593,
-    34585, 34587, 34627, 34604, 34625, 34622, 34630, 34592, 34610, 34602,
-    34605, 34620, 34578, 34618, 34609, 34613, 34626, {f: 2, c: 34598}, 34616,
-    34596, 34586, 34608, 34577, 35063, 35047, {f: 2, c: 35057}, 35066, 35070,
-    35054, 35068, 35062, 35067, 35056, 35052, 35051, 35229, 35233, 35231,
-    35230, 35305, 35307, 35304, 35499, 35481, 35467, 35474, 35471, 35478,
-    35901, {f: 2, c: 35944}, 36053, 36047, 36055, 36246, 36361, 36354, 36351,
-    36365, 36349, 36362, 36355, 36359, 36358, 36357, 36350, 36352, 36356,
-    {f: 2, c: 36624}, 36622, 36621, 37155, 37148, 37152, 37154, 37151, 37149,
-    37146, 37156, 37153, 37147, 37242, 37234, 37241, 37235, 37541, 37540,
-    37494, 37531, 37498, 37536, 37524, 37546, 37517, 37542, 37530, 37547,
-    37497, 37527, 37503, 37539, 37614, 37518, 37506, 37525, 37538, 37501,
-    37512, 37537, 37514, 37510, 37516, 37529, 37543, 37502, 37511, 37545,
-    37533, 37515, 37421, 38558, 38561, 38655, 38744, 38781, 38778, 38782,
-    38787, 38784, 38786, 38779, 38788, 38785, 38783, 38862, 38861, 38934,
-    {f: 2, c: 39085}, 39170, 39168, 39175, 39325, 39324, 39363, 39353, 39355,
-    39354, 39362, 39357, 39367, 39601, 39651, 39655, {f: 2, c: 39742},
-    {f: 2, c: 39776}, 39775, {f: 2, c: 40177}, 40181, 40615, 20735, 20739,
-    20784, 20728, {f: 2, c: 20742}, 20726, 20734, {f: 2, c: 20747}, 20733,
-    20746, {f: 2, c: 21131}, 21233, 21231, 22088, 22082, 22092, 22069, 22081,
-    22090, 22089, 22086, 22104, 22106, 22080, 22067, 22077, 22060, 22078,
-    22072, 22058, 22074, 22298, 22699, 22685, 22705, 22688, 22691, 22703,
-    22700, 22693, 22689, 22783, 23295, 23284, 23293, 23287, 23286, 23299,
-    23288, 23298, 23289, 23297, 23303, 23301, 23311, 23655, 23961, 23959,
-    23967, 23954, 23970, 23955, 23957, 23968, 23964, 23969, 23962, 23966,
-    24169, 24157, 24160, 24156, 32243, 24283, 24286, 24289, 24393, 24498,
-    24971, 24963, 24953, 25009, 25008, 24994, 24969, 24987, 24979, 25007,
-    25005, 24991, 24978, 25002, 24993, 24973, 24934, 25011, 25133, 25710,
-    25712, 25750, 25760, 25733, 25751, 25756, 25743, 25739, 25738, 25740,
-    25763, 25759, 25704, 25777, 25752, 25974, 25978, 25977, 25979,
-    {f: 2, c: 26034}, 26293, 26288, 26281, 26290, 26295, 26282, 26287, 27136,
-    27142, 27159, 27109, 27128, 27157, 27121, 27108, 27168, 27135, 27116,
-    27106, 27163, 27165, 27134, 27175, 27122, 27118, 27156, 27127, 27111,
-    27200, 27144, 27110, 27131, 27149, 27132, 27115, 27145, 27140, 27160,
-    27173, 27151, 27126, 27174, 27143, 27124, 27158, 27473, 27557, 27555,
-    27554, 27558, 27649, 27648, 27647, 27650, 28481, 28454, 28542, 28551,
-    28614, 28562, 28557, 28553, 28556, 28514, 28495, 28549, 28506, 28566,
-    28534, 28524, 28546, 28501, 28530, 28498, 28496, 28503, 28564, 28563,
-    28509, 28416, 28513, 28523, 28541, 28519, 28560, 28499, 28555, 28521,
-    28543, 28565, 28515, 28535, 28522, 28539, 29106, 29103, 29083, 29104,
-    29088, 29082, 29097, 29109, 29085, 29093, 29086, 29092, 29089, 29098,
-    29084, 29095, 29107, 29336, 29338, 29528, 29522, {f: 3, c: 29534}, 29533,
-    29531, 29537, 29530, 29529, 29538, 29831, {f: 2, c: 29833}, 29830, 29825,
-    29821, 29829, 29832, 29820, [29817, 58868], 29960, 29959, 30078, 30245,
-    30238, 30233, 30237, 30236, 30243, 30234, 30248, 30235, {f: 3, c: 30364},
-    30363, 30605, 30607, 30601, 30600, 30925, 30907, 30927, 30924, 30929,
-    30926, 30932, 30920, {f: 2, c: 30915}, 30921, 31130, 31137, 31136, 31132,
-    31138, [31131, 59175], 27510, 31289, 31410, 31412, 31411, 31671, 31691,
-    31678, 31660, 31694, 31663, 31673, 31690, 31669, 31941, 31944, 31948,
-    31947, 32247, 32219, 32234, 32231, 32215, 32225, 32259, 32250, 32230,
-    32246, 32241, 32240, 32238, 32223, 32630, 32684, 32688, 32685, 32749,
-    32747, 32746, 32748, 32742, 32744, 32868, 32871, 33187, 33183, 33182,
-    33173, 33186, 33177, 33175, 33302, 33359, 33363, 33362, 33360, 33358,
-    33361, 34084, 34107, 34063, 34048, 34089, 34062, 34057, 34061, 34079,
-    34058, 34087, 34076, 34043, 34091, 34042, 34056, 34060, 34036, 34090,
-    34034, 34069, 34039, 34027, 34035, 34044, 34066, 34026, 34025, 34070,
-    34046, 34088, 34077, 34094, 34050, 34045, 34078, 34038, 34097, 34086,
-    {f: 2, c: 34023}, 34032, 34031, 34041, 34072, 34080, 34096, 34059, 34073,
-    34095, 34402, 34646, {f: 2, c: 34659}, 34679, 34785, 34675, 34648, 34644,
-    34651, 34642, 34657, 34650, 34641, 34654, 34669, 34666, 34640, 34638,
-    34655, 34653, 34671, 34668, 34682, 34670, 34652, 34661, 34639, 34683,
-    34677, 34658, 34663, 34665, 34906, 35077, 35084, 35092, 35083,
-    {f: 3, c: 35095}, 35078, 35094, 35089, 35086, 35081, 35234, 35236, 35235,
-    35309, 35312, 35308, 35535, 35526, 35512, 35539, 35537, {f: 2, c: 35540},
-    35515, 35543, 35518, 35520, 35525, 35544, 35523, 35514, 35517, 35545,
-    35902, 35917, 35983, 36069, 36063, 36057, 36072, 36058, 36061, 36071,
-    36256, 36252, 36257, 36251, 36384, 36387, 36389, 36388, 36398, 36373,
-    36379, 36374, 36369, 36377, {f: 2, c: 36390}, 36372, 36370, 36376, 36371,
-    36380, 36375, 36378, 36652, 36644, 36632, 36634, 36640, 36643,
-    {f: 2, c: 36630}, 36979, 36976, 36975, 36967, 36971, 37167, 37163,
-    {f: 2, c: 37161}, 37170, 37158, 37166, {f: 2, c: 37253}, 37258,
-    {f: 2, c: 37249}, 37252, 37248, 37584, {f: 2, c: 37571}, 37568, 37593,
-    37558, 37583, 37617, 37599, 37592, 37609, 37591, 37597, 37580, 37615,
-    37570, 37608, 37578, 37576, 37582, 37606, 37581, 37589, 37577, 37600,
-    37598, 37607, 37585, 37587, 37557, 37601, 37669, 37574, 37556, 38268,
-    38316, 38315, 38318, 38320, 38564, 38562, 38611, 38661, 38664, 38658,
-    38746, 38794, 38798, 38792, 38864, 38863, 38942, 38941, 38950, 38953,
-    38952, 38944, 38939, 38951, 39090, 39176, 39162, 39185, 39188,
-    {f: 2, c: 39190}, 39189, 39388, 39373, 39375, {f: 2, c: 39379}, 39374,
-    39369, [39382, 60270], 39384, 39371, 39383, 39372, 39603, 39660, 39659,
-    39667, 39666, 39665, 39750, 39747, 39783, 39796, 39793, 39782, 39798,
-    39797, 39792, 39784, 39780, 39788, 40188, 40186, 40189, 40191, 40183,
-    40199, 40192, 40185, 40187, 40200, 40197, 40196, 40579, 40659,
-    {f: 2, c: 40719}, 20764, 20755, 20759, 20762, 20753, 20958, 21300, 21473,
-    22128, 22112, 22126, 22131, 22118, 22115, 22125, 22130, 22110, 22135,
-    22300, 22299, 22728, 22717, 22729, 22719, 22714, 22722, 22716, 22726,
-    23319, 23321, 23323, 23329, 23316, 23315, 23312, 23318, [23336, 59539],
-    23322, 23328, 23326, 23535, 23980, 23985, 23977, 23975, 23989, 23984,
-    23982, 23978, 23976, 23986, 23981, 23983, 23988, {f: 2, c: 24167}, 24166,
-    24175, 24297, 24295, 24294, 24296, 24293, 24395, 24508, 24507, 24989,
-    25000, 24982, 25029, 25012, 25030, 25025, 25036, 25018, 25023, 25016,
-    24972, 25815, 25814, 25808, 25807, 25801, 25789, 25737, 25795, 25819,
-    25843, 25817, 25907, 25983, 25980, 26018, 26312, 26302, 26304,
-    {f: 2, c: 26314}, 26319, 26301, 26299, 26298, 26316, 26403, 27188, 27238,
-    27209, 27239, 27186, 27240, 27198, 27229, 27245, 27254, 27227, 27217,
-    27176, 27226, 27195, 27199, 27201, 27242, 27236, 27216, 27215, 27220,
-    27247, 27241, 27232, 27196, 27230, 27222, 27221, {f: 2, c: 27213}, 27206,
-    27477, 27476, 27478, 27559, {f: 2, c: 27562}, 27592, 27591, 27652, 27651,
-    27654, 28589, 28619, 28579, 28615, 28604, 28622, 28616, 28510, 28612,
-    28605, 28574, 28618, 28584, 28676, 28581, 28590, 28602, 28588, 28586,
-    28623, 28607, 28600, 28578, 28617, 28587, 28621, 28591, 28594, 28592,
-    29125, 29122, 29119, 29112, 29142, {f: 2, c: 29120}, 29131, 29140, 29130,
-    29127, 29135, 29117, 29144, 29116, 29126, {f: 2, c: 29146},
-    {f: 2, c: 29341}, 29545, {f: 2, c: 29542}, 29548, 29541, 29547, 29546,
-    29823, 29850, 29856, 29844, 29842, 29845, 29857, 29963, 30080, 30255,
-    30253, 30257, 30269, 30259, 30268, 30261, 30258, 30256, 30395, 30438,
-    30618, 30621, 30625, 30620, 30619, {f: 2, c: 30626}, 30613, 30617, 30615,
-    30941, 30953, 30949, 30954, 30942, 30947, 30939, {f: 2, c: 30945}, 30957,
-    {f: 2, c: 30943}, 31140, 31300, 31304, 31303, 31414, 31416, 31413, 31409,
-    31415, 31710, 31715, 31719, 31709, 31701, 31717, 31706, 31720, 31737,
-    31700, 31722, 31714, 31708, 31723, 31704, 31711, 31954, 31956, 31959,
-    {f: 2, c: 31952}, 32274, 32289, 32279, 32268, {f: 2, c: 32287}, 32275,
-    32270, 32284, 32277, 32282, 32290, 32267, 32271, 32278, 32269, 32276,
-    32293, 32292, 32579, {f: 2, c: 32635}, 32634, 32689, 32751, 32810, 32809,
-    32876, 33201, 33190, 33198, 33209, 33205, 33195, 33200, 33196, 33204,
-    33202, 33207, 33191, 33266, {f: 3, c: 33365}, 34134, 34117, 34155, 34125,
-    34131, 34145, 34136, 34112, 34118, 34148, 34113, 34146, 34116, 34129,
-    34119, 34147, 34110, 34139, 34161, 34126, 34158, 34165, 34133, 34151,
-    34144, 34188, 34150, 34141, 34132, 34149, 34156, 34403, 34405, 34404,
-    34724, 34715, 34703, 34711, 34707, 34706, 34696, 34689, 34710, 34712,
-    34681, 34695, 34723, 34693, {f: 2, c: 34704}, 34717, 34692, 34708, 34716,
-    34714, 34697, 35102, 35110, 35120, {f: 2, c: 35117}, 35111, 35121, 35106,
-    35113, 35107, 35119, 35116, 35103, 35313, 35552, 35554, 35570,
-    {f: 2, c: 35572}, 35549, 35604, 35556, 35551, 35568, 35528, 35550, 35553,
-    35560, 35583, 35567, 35579, {f: 2, c: 35985}, 35984, 36085, 36078, 36081,
-    36080, 36083, 36204, 36206, 36261, 36263, 36403, 36414, 36408, 36416,
-    36421, 36406, {f: 2, c: 36412}, 36417, 36400, 36415, 36541, [36662, 60329],
-    36654, 36661, 36658, 36665, 36663, 36660, 36982, 36985, 36987, 36998,
-    37114, 37171, {f: 2, c: 37173}, 37267, {f: 2, c: 37264}, 37261, 37263,
-    37671, 37662, 37640, 37663, 37638, 37647, 37754, 37688, 37692, 37659,
-    37667, 37650, 37633, 37702, 37677, 37646, 37645, 37579, 37661, 37626,
-    37651, 37625, 37623, 37684, 37634, 37668, 37631, 37673, 37689, 37685,
-    37674, 37652, 37644, 37643, 37630, 37641, 37632, 37627, 37654, 38332,
-    38349, 38334, {f: 2, c: 38329}, 38326, 38335, 38325, 38333, 38569, 38612,
-    38667, 38674, 38672, 38809, 38807, 38804, 38896, 38904, 38965, 38959,
-    38962, 39204, 39199, 39207, 39209, 39326, 39406, 39404, 39397, 39396,
-    39408, 39395, 39402, 39401, 39399, 39609, 39615, 39604, 39611, 39670,
-    39674, 39673, 39671, 39731, 39808, 39813, 39815, 39804, 39806, 39803,
-    39810, 39827, 39826, 39824, 39802, 39829, 39805, 39816, 40229, 40215,
-    40224, 40222, 40212, 40233, 40221, 40216, 40226, 40208, 40217, 40223,
-    40584, {f: 2, c: 40582}, 40622, 40621, {f: 2, c: 40661}, 40698, 40722,
-    40765, 20774, 20773, 20770, 20772, 20768, 20777, 21236, 22163,
-    {f: 2, c: 22156}, 22150, 22148, 22147, 22142, 22146, 22143, 22145, 22742,
-    22740, 22735, 22738, 23341, 23333, 23346, 23331, 23340, 23335, 23334,
-    23343, 23342, 23419, {f: 2, c: 23537}, 23991, 24172, 24170, 24510, 25027,
-    25013, 25020, 25063, 25056, 25061, 25060, 25064, 25054, 25839, 25833,
-    25827, 25835, 25828, 25832, 25985, 25984, 26038, 26074, 26322, 27277,
-    27286, 27265, 27301, 27273, 27295, 27291, 27297, 27294, 27271, 27283,
-    27278, 27285, 27267, 27304, 27300, 27281, 27263, 27302, 27290, 27269,
-    27276, 27282, 27483, 27565, 27657, 28620, 28585, 28660, 28628, 28643,
-    28636, 28653, 28647, 28646, 28638, 28658, 28637, 28642, 28648, 29153,
-    29169, 29160, 29170, 29156, 29168, 29154, 29555, {f: 2, c: 29550}, 29847,
-    29874, 29867, 29840, 29866, 29869, 29873, 29861, 29871, {f: 3, c: 29968},
-    29967, 30084, 30275, {f: 2, c: 30280}, 30279, 30372, 30441, 30645, 30635,
-    30642, 30647, 30646, 30644, 30641, 30632, 30704, 30963, 30973, 30978,
-    {f: 2, c: 30971}, 30975, 30962, 30981, 30969, 30974, 30980, 31147, 31144,
-    31324, 31323, 31318, 31320, 31316, 31322, 31422, {f: 2, c: 31424}, 31749,
-    31759, 31730, 31744, 31743, 31739, 31758, 31732, 31755, 31731, 31746,
-    31753, 31747, 31745, 31736, 31741, [31750, 58176], {f: 2, c: 31728}, 31760,
-    31754, 31976, 32301, 32316, 32322, 32307, 38984, 32312, 32298, 32329,
-    32320, 32327, 32297, 32332, 32304, 32315, 32310, 32324, 32314, 32581,
-    32639, 32638, 32637, 32756, 32754, 32812, 33211, 33220, 33228, 33226,
-    33221, 33223, 33212, 33257, 33371, 33370, 33372, 34179, 34176, 34191,
-    34215, 34197, 34208, 34187, 34211, 34171, 34212, 34202, 34206, 34167,
-    34172, 34185, 34209, 34170, 34168, 34135, 34190, 34198, 34182, 34189,
-    34201, 34205, 34177, 34210, 34178, 34184, 34181, 34169, 34166, 34200,
-    34192, 34207, 34408, 34750, 34730, 34733, 34757, 34736, 34732, 34745,
-    34741, 34748, 34734, 34761, 34755, 34754, 34764, 34743, 34735, 34756,
-    34762, 34740, 34742, 34751, 34744, 34749, 34782, 34738, 35125, 35123,
-    35132, 35134, 35137, 35154, 35127, 35138, 35245, 35247, 35246,
-    {f: 2, c: 35314}, 35614, 35608, 35606, 35601, 35589, 35595, 35618, 35599,
-    35602, 35605, 35591, 35597, 35592, 35590, 35612, 35603, 35610, 35919,
-    35952, 35954, 35953, 35951, 35989, 35988, 36089, 36207, 36430, 36429,
-    36435, 36432, 36428, 36423, 36675, 36672, 36997, 36990, 37176, 37274,
-    37282, 37275, 37273, 37279, 37281, 37277, 37280, 37793, 37763, 37807,
-    37732, 37718, 37703, 37756, 37720, 37724, 37750, 37705, {f: 2, c: 37712},
-    37728, 37741, 37775, 37708, 37738, 37753, 37719, 37717, 37714, 37711,
-    37745, 37751, 37755, 37729, 37726, 37731, 37735, 37710, 37721, 38343,
-    38336, 38345, 38339, 38341, 38327, 38574, 38576, 38572, 38688, 38687,
-    38680, 38685, 38681, 38810, 38817, 38812, 38814, 38813, 38869, 38868,
-    38897, 38977, 38980, 38986, 38985, 38981, 38979, 39205, {f: 2, c: 39211},
-    39210, 39219, 39218, 39215, 39213, 39217, 39216, 39320, 39331, 39329,
-    39426, 39418, 39412, 39415, 39417, 39416, 39414, 39419, {f: 2, c: 39421},
-    39420, 39427, 39614, 39678, 39677, 39681, 39676, 39752, 39834, 39848,
-    39838, 39835, 39846, 39841, 39845, 39844, 39814, 39842, 39840, 39855,
-    40243, 40257, 40295, 40246, {f: 2, c: 40238}, 40241, 40248, 40240, 40261,
-    {f: 2, c: 40258}, 40254, 40247, 40256, 40253, 32757, 40237, 40586, 40585,
-    40589, 40624, 40648, 40666, 40699, 40703, 40740, 40739, 40738, 40788,
-    [12245, 40864], 20785, {f: 2, c: 20781}, 22168, 22172, 22167, 22170, 22173,
-    22169, 22896, 23356, {f: 2, c: 23657}, 24000, {f: 2, c: 24173}, 25048,
-    25055, {f: 2, c: 25069}, 25073, 25066, 25072, 25067, 25046, 25065, 25855,
-    25860, 25853, 25848, 25857, 25859, 25852, 26004, 26075, {f: 2, c: 26330},
-    26328, 27333, 27321, 27325, 27361, 27334, 27322, {f: 2, c: 27318}, 27335,
-    27316, 27309, 27486, 27593, 27659, 28679, {f: 2, c: 28684}, 28673, 28677,
-    28692, 28686, {f: 2, c: 28671}, 28667, 28710, 28668, 28663, 28682,
-    [29185, 60224], 29183, 29177, 29187, 29181, 29558, 29880, 29888, 29877,
-    29889, 29886, 29878, 29883, 29890, 29972, 29971, 30300, 30308, 30297,
-    30288, 30291, 30295, 30298, 30374, 30397, 30444, 30658, 30650, 30988,
-    {f: 2, c: 30995}, 30985, 30992, 30994, 30993, 31149, 31148, 31327, 31772,
-    31785, 31769, 31776, 31775, 31789, 31773, 31782, 31784, 31778, 31781,
-    31792, 32348, 32336, 32342, 32355, 32344, 32354, 32351, 32337, 32352,
-    32343, 32339, 32693, 32691, {f: 2, c: 32759}, 32885, {f: 2, c: 33233},
-    33232, 33375, 33374, 34228, 34246, 34240, 34243, 34242, 34227, 34229,
-    34237, 34247, 34244, 34239, 34251, 34254, 34248, 34245, 34225, 34230,
-    34258, 34340, 34232, 34231, 34238, 34409, 34791, 34790, 34786, 34779,
-    34795, 34794, 34789, 34783, 34803, 34788, 34772, 34780, 34771, 34797,
-    34776, 34787, 34775, 34777, 34817, 34804, 34792, 34781, 35155, 35147,
-    35151, 35148, 35142, {f: 2, c: 35152}, 35145, 35626, 35623, 35619, 35635,
-    35632, 35637, 35655, 35631, 35644, 35646, 35633, 35621, 35639, 35622,
-    35638, 35630, 35620, 35643, 35645, 35642, 35906, 35957, 35993, 35992,
-    35991, 36094, 36100, 36098, 36096, 36444, 36450, 36448, 36439, 36438,
-    36446, 36453, 36455, 36443, 36442, 36449, 36445, 36457, 36436,
-    {f: 3, c: 36678}, 36683, 37160, {f: 2, c: 37178}, 37182, 37288, 37285,
-    37287, 37295, 37290, 37813, 37772, 37778, 37815, 37787, 37789, 37769,
-    37799, 37774, 37802, 37790, 37798, 37781, 37768, 37785, 37791, 37760,
-    37773, 37809, 37777, 37810, 37796, 37800, 37812, 37795, {f: 2, c: 38354},
-    38353, 38579, 38615, 38618, 24002, 38623, 38616, 38621, 38691, 38690,
-    38693, 38828, 38830, 38824, 38827, 38820, 38826, 38818, 38821, 38871,
-    38873, 38870, 38872, 38906, {f: 3, c: 38992}, 39096, 39233, 39228, 39226,
-    39439, 39435, 39433, 39437, 39428, 39441, 39434, 39429, 39431, 39430,
-    39616, 39644, 39688, {f: 2, c: 39684}, 39721, 39733, 39754, 39756, 39755,
-    39879, 39878, 39875, 39871, 39873, 39861, 39864, 39891, 39862, 39876,
-    39865, 39869, 40284, 40275, 40271, 40266, 40283, 40267, 40281, 40278,
-    40268, 40279, 40274, 40276, 40287, 40280, 40282, 40590, 40588, 40671,
-    40705, 40704, [40726, 58693], 40741, 40747, 40746, 40745, 40744, 40780,
-    40789, {f: 2, c: 20788}, 21142, 21239, 21428, 22187, 22189,
-    {f: 2, c: 22182}, 22186, 22188, 22746, 22749, 22747, 22802,
-    {f: 3, c: 23357}, 24003, 24176, 24511, 25083, 25863, 25872, 25869, 25865,
-    25868, 25870, 25988, 26078, 26077, 26334, 27367, 27360, 27340, 27345,
-    27353, 27339, 27359, 27356, 27344, 27371, 27343, 27341, 27358, 27488,
-    27568, 27660, 28697, 28711, 28704, 28694, 28715, {f: 3, c: 28705}, 28713,
-    28695, 28708, 28700, 29196, 29194, 29191, 29186, 29189, {f: 2, c: 29349},
-    29348, 29347, 29345, 29899, 29893, 29879, 29891, 29974, 30304,
-    {f: 2, c: 30665}, 30660, 30705, 31005, 31003, 31009, 31004, 30999, 31006,
-    31152, {f: 2, c: 31335}, 31795, 31804, 31801, 31788, 31803, 31980, 31978,
-    32374, 32373, 32376, 32368, 32375, 32367, 32378, 32370, 32372, 32360,
-    32587, 32586, 32643, 32646, 32695, {f: 2, c: 32765}, 32888, 33239, 33237,
-    33291, 33380, 33377, 33379, 34283, 34289, 34285, 34265, 34273, 34280,
-    34266, 34263, 34284, 34290, 34296, 34264, 34271, 34275, 34268, 34257,
-    34288, 34278, 34287, 34270, 34274, 34816, 34810, 34819, {f: 2, c: 34806},
-    34825, 34828, 34827, 34822, 34812, 34824, 34815, 34826, 34818, 35170,
-    {f: 2, c: 35162}, 35159, 35169, 35164, 35160, 35165, 35161, 35208, 35255,
-    35254, 35318, 35664, 35656, 35658, 35648, 35667, 35670, 35668, 35659,
-    35669, 35665, 35650, 35666, 35671, 35907, 35959, 35958, 35994,
-    {f: 2, c: 36102}, 36105, 36268, 36266, 36269, 36267, 36461, 36472, 36467,
-    36458, 36463, 36475, 36546, 36690, 36689, {f: 2, c: 36687}, 36691, 36788,
-    37184, 37183, 37296, 37293, 37854, 37831, 37839, 37826, 37850, 37840,
-    37881, 37868, 37836, 37849, 37801, 37862, 37834, 37844, 37870, 37859,
-    37845, 37828, 37838, 37824, 37842, 37797, 37863, 38269, {f: 2, c: 38362},
-    38625, 38697, {f: 2, c: 38699}, 38696, 38694, 38835, 38839, 38838,
-    {f: 3, c: 38877}, 39004, 39001, 39005, 38999, 39103, 39101, 39099, 39102,
-    39240, 39239, 39235, {f: 2, c: 39334}, 39450, 39445, 39461, 39453, 39460,
-    39451, 39458, 39456, 39463, 39459, 39454, 39452, 39444, 39618, 39691,
-    39690, 39694, 39692, 39735, {f: 2, c: 39914}, 39904, 39902, 39908, 39910,
-    39906, 39920, 39892, 39895, 39916, 39900, 39897, 39909, 39893, 39905,
-    39898, 40311, 40321, 40330, 40324, 40328, 40305, 40320, 40312, 40326,
-    {f: 2, c: 40331}, 40317, 40299, {f: 2, c: 40308}, 40304, 40297, 40325,
-    40307, 40315, 40322, 40303, 40313, 40319, 40327, 40296, 40596, 40593,
-    40640, 40700, 40749, {f: 2, c: 40768}, 40781, {f: 3, c: 40790}, 21303,
-    22194, 22197, 22195, 22755, 23365, {f: 2, c: 24006}, {f: 2, c: 24302},
-    {f: 2, c: 24512}, 25081, 25879, 25878, 25877, 25875, 26079, 26344,
-    {f: 2, c: 26339}, 27379, 27376, 27370, 27368, 27385, 27377,
-    {f: 2, c: 27374}, 28732, 28725, 28719, 28727, 28724, 28721, 28738, 28728,
-    28735, 28730, 28729, 28714, 28736, 28731, 28723, 28737, {f: 2, c: 29203},
-    29352, 29565, 29564, 29882, 30379, 30378, 30398, 30445, 30668,
-    {f: 2, c: 30670}, 30669, 30706, 31013, 31011, {f: 2, c: 31015}, 31012,
-    31017, 31154, 31342, {f: 2, c: 31340}, 31479, 31817, 31816, 31818, 31815,
-    31813, 31982, 32379, 32382, 32385, 32384, 32698, 32767, 32889, 33243,
-    33241, {f: 2, c: 33384}, 34338, 34303, 34305, 34302, 34331, 34304, 34294,
-    34308, 34313, 34309, 34316, 34301, 34841, {f: 2, c: 34832}, 34839, 34835,
-    34838, 35171, 35174, 35257, 35319, 35680, 35690, 35677, 35688, 35683,
-    35685, 35687, 35693, 36270, 36486, 36488, 36484, 36697, {f: 2, c: 36694},
-    36693, 36696, 36698, 37005, 37187, 37185, 37303, 37301, {f: 2, c: 37298},
-    37899, 37907, 37883, 37920, 37903, 37908, 37886, 37909, 37904, 37928,
-    37913, 37901, 37877, 37888, 37879, 37895, 37902, 37910, 37906, 37882,
-    37897, 37880, 37948, 37898, 37887, 37884, 37900, 37878, 37905, 37894,
-    38366, 38368, 38367, {f: 2, c: 38702}, 38841, 38843, {f: 2, c: 38909},
-    39008, {f: 2, c: 39010}, 39007, {f: 2, c: 39105}, 39248, 39246, 39257,
-    39244, 39243, 39251, 39474, 39476, 39473, 39468, 39466, 39478, 39465,
-    39470, 39480, 39469, 39623, 39626, 39622, 39696, 39698, 39697, 39947,
-    39944, 39927, 39941, 39954, 39928, 40000, 39943, 39950, 39942, 39959,
-    39956, 39945, 40351, 40345, 40356, 40349, 40338, 40344, 40336, 40347,
-    40352, 40340, 40348, 40362, 40343, 40353, 40346, 40354, 40360, 40350,
-    40355, 40383, 40361, 40342, {f: 2, c: 40358}, 40601, 40603, 40602, 40677,
-    40676, 40679, 40678, 40752, 40750, 40795, 40800, 40798, 40797, 40793,
-    40849, 20794, 20793, 21144, 21143, 22211, {f: 2, c: 22205}, 23368, 23367,
-    24011, 24015, 24305, 25085, 25883, 27394, 27388, 27395, 27384, 27392,
-    {f: 2, c: 28739}, 28746, {f: 2, c: 28744}, {f: 2, c: 28741}, 29213, 29210,
-    29209, 29566, 29975, 30314, 30672, 31021, 31025, 31023, 31828, 31827,
-    31986, 32394, [32391, 60229], 32392, 32395, 32390, 32397, 32589, 32699,
-    32816, 33245, 34328, 34346, 34342, 34335, 34339, 34332, 34329, 34343,
-    34350, 34337, 34336, 34345, 34334, 34341, 34857, 34845, 34843, 34848,
-    34852, 34844, 34859, 34890, 35181, 35177, 35182, 35179, 35322, 35705,
-    35704, 35653, {f: 2, c: 35706}, 36112, 36116, 36271, 36494, 36492, 36702,
-    36699, 36701, 37190, {f: 2, c: 37188}, 37305, 37951, 37947, 37942, 37929,
-    37949, 37936, 37945, 37930, 37943, 37932, 37952, 37937, 38373, 38372,
-    38371, 38709, 38714, 38847, 38881, 39012, 39113, 39110, 39104, 39256,
-    39254, 39481, 39485, 39494, 39492, 39490, 39489, 39482, 39487, 39629,
-    39701, {f: 2, c: 39703}, 39702, 39738, 39762, 39979, 39965, 39964, 39980,
-    39971, {f: 2, c: 39976}, 39972, 39969, 40375, 40374, 40380, 40385, 40391,
-    40394, 40399, 40382, 40389, 40387, 40379, 40373, 40398, {f: 2, c: 40377},
-    40364, 40392, 40369, 40365, 40396, 40371, 40397, 40370, 40570, 40604,
-    40683, 40686, 40685, 40731, 40728, 40730, 40753, 40782, 40805, 40804,
-    40850, 20153, 22214, 22213, 22219, 22897, {f: 2, c: 23371}, 24021, 24017,
-    24306, 25889, 25888, 25894, 25890, 27403, {f: 2, c: 27400}, 27661,
-    {f: 3, c: 28757}, 28754, {f: 2, c: 29214}, 29353, 29567, 29912, 29909,
-    29913, 29911, 30317, 30381, 31029, 31156, {f: 2, c: 31344}, 31831, 31836,
-    31833, 31835, 31834, 31988, 31985, 32401, 32591, 32647, 33246, 33387,
-    {f: 2, c: 34356}, 34355, 34348, 34354, 34358, 34860, 34856, 34854, 34858,
-    34853, 35185, 35263, 35262, 35323, 35710, 35716, 35714, 35718, 35717,
-    35711, 36117, 36501, 36500, 36506, 36498, 36496, {f: 2, c: 36502}, 36704,
-    36706, 37191, 37964, 37968, {f: 2, c: 37962}, 37967, 37959, 37957,
-    {f: 2, c: 37960}, 37958, 38719, 38883, 39018, 39017, 39115, 39252, 39259,
-    39502, {f: 2, c: 39507}, 39500, 39503, 39496, 39498, 39497, 39506, 39504,
-    39632, 39705, 39723, 39739, 39766, 39765, 40006, 40008, 39999, 40004,
-    39993, 39987, 40001, 39996, 39991, 39988, 39986, 39997, 39990, 40411,
-    40402, 40414, 40410, 40395, 40400, 40412, 40401, 40415, 40425, 40409,
-    40408, 40406, 40437, 40405, 40413, 40630, 40688, 40757, 40755, 40754,
-    40770, 40811, 40853, 40866, 20797, 21145, 22760, 22759, 22898, 23373,
-    24024, 34863, 24399, 25089, {f: 2, c: 25091}, 25897, 25893, 26006, 26347,
-    {f: 2, c: 27409}, 27407, 27594, 28763, 28762, 29218, 29570, 29569, 29571,
-    30320, 30676, 31847, 31846, 32405, 33388, 34362, 34368, 34361, 34364,
-    34353, 34363, 34366, 34864, 34866, 34862, 34867, 35190, 35188, 35187,
-    35326, 35724, 35726, 35723, 35720, 35909, 36121, 36504, 36708, 36707,
-    37308, 37986, 37973, 37981, 37975, 37982, {f: 2, c: 38852}, 38912, 39510,
-    39513, {f: 3, c: 39710}, 40018, 40024, 40016, 40010, 40013, 40011, 40021,
-    40025, 40012, 40014, 40443, 40439, 40431, 40419, 40427, 40440, 40420,
-    40438, 40417, 40430, 40422, 40434, [40432, 60370], 40418, 40428, 40436,
-    40435, 40424, 40429, 40642, 40656, {f: 2, c: 40690}, 40710, 40732, 40760,
-    40759, 40758, 40771, 40783, 40817, 40816, {f: 2, c: 40814}, 22227, 22221,
-    23374, 23661, 25901, {f: 2, c: 26349}, 27411, 28767, 28769, 28765, 28768,
-    29219, 29915, 29925, 30677, 31032, 31159, 31158, 31850, 32407, 32649,
-    33389, 34371, 34872, 34871, 34869, 34891, {f: 2, c: 35732},
-    {f: 3, c: 36510}, 36509, 37310, 37309, 37314, 37995, {f: 2, c: 37992},
-    38629, 38726, 38723, 38727, 38855, 38885, 39518, 39637, 39769, 40035,
-    40039, 40038, 40034, 40030, 40032, 40450, 40446, 40455, 40451, 40454,
-    40453, {f: 2, c: 40448}, 40457, 40447, 40445, 40452, 40608, 40734, 40774,
-    {f: 3, c: 40820}, 22228, 25902, 26040, {f: 2, c: 27416}, 27415, 27418,
-    28770, 29222, 29354, {f: 2, c: 30680}, 31033, 31849, 31851, 31990, 32410,
-    32408, 32411, 32409, {f: 2, c: 33248}, {f: 3, c: 34374}, {f: 2, c: 35193},
-    35196, 35195, 35327, {f: 2, c: 35736}, 36517, 36516, 36515, 37998, 37997,
-    37999, 38001, 38003, 38729, 39026, 39263, 40040, 40046, 40045, 40459,
-    40461, 40464, 40463, 40466, 40465, 40609, 40693, 40713, 40775, 40824,
-    40827, 40826, 40825, 22302, 28774, 31855, 34876, 36274, 36518, 37315,
-    38004, 38008, 38006, 38005, 39520, [39726, 60830], 40052, 40051, 40049,
-    40053, 40468, 40467, 40694, 40714, 40868, 28776, 28773, 31991, 34410,
-    34878, 34877, 34879, 35742, 35996, 36521, 36553, 38731, {f: 2, c: 39027},
-    39116, 39265, 39339, 39524, {f: 2, c: 39526}, 39716, 40469, 40471, 40776,
-    25095, 27422, 29223, 34380, 36520, 38018, {f: 2, c: 38016}, 39529, 39528,
-    40473, 34379, 35743, 38019, 40057, 40631, 30325, 39531, 40058, 40477,
-    {f: 2, c: 28777}, 29225, 40612, 40830, 40777, 40856, {s: 97}, 65075, 0,
-    65076, 65103, [168, 776, 63208], [710, 63209, 65342], [12541, 63210],
-    [12542, 63211], [12445, 63212], [12446, 63213], 0, [12293, 63216],
-    [12294, 63217], [12295, 63218], [12540, 63219], [63220, 65339],
-    [63221, 65341], [10045, 63222], [12353, 63223], [12354, 63224],
-    [12355, 63225], [12356, 63226], [12357, 63227], [12358, 63228],
-    [12359, 63229], [12360, 63230], [12361, 63231], [12362, 63232],
-    [12363, 63233], [12364, 63234], [12365, 63235], [12366, 63236],
-    [12367, 63237], [12368, 63238], [12369, 63239], [12370, 63240],
-    [12371, 63241], [12372, 63242], [12373, 63243], [12374, 63244],
-    [12375, 63245], [12376, 63246], [12377, 63247], [12378, 63248],
-    [12379, 63249], [12380, 63250], [12381, 63251], [12382, 63252],
-    [12383, 63253], [12384, 63254], [12385, 63255], [12386, 63256],
-    [12387, 63257], [12388, 63258], [12389, 63259], [12390, 63260],
-    [12391, 63261], [12392, 63262], [12393, 63263], [12394, 63264],
-    [12395, 63265], [12396, 63266], [12397, 63267], [12398, 63268],
-    [12399, 63269], [12400, 63270], [12401, 63271], [12402, 63272],
-    [12403, 63273], [12404, 63274], [12405, 63275], [12406, 63276],
-    [12407, 63277], [12408, 63278], [12409, 63279], [12410, 63280],
-    [12411, 63281], [12412, 63282], [12413, 63283], [12414, 63284],
-    [12415, 63285], [12416, 63286], [12417, 63287], [12418, 63288],
-    [12419, 63289], [12420, 63290], [12421, 63291], [12422, 63292],
-    [12423, 63293], [12424, 63294], [12425, 63295], [12426, 63296],
-    [12427, 63297], [12428, 63298], [12429, 63299], [12430, 63300],
-    [12431, 63301], [12432, 63302], [12433, 63303], [12434, 63304],
-    [12435, 63305], [12449, 63306], [12450, 63307], [12451, 63308],
-    [12452, 63309], [12453, 63310], [12454, 63311], [12455, 63312],
-    [12456, 63313], [12457, 63314], [12458, 63315], [12459, 63316],
-    [12460, 63317], [12461, 63318], [12462, 63319], [12463, 63320],
-    [12464, 63321], [12465, 63322], [12466, 63323], [12467, 63324],
-    [12468, 63325], [12469, 63326], [12470, 63327], [12471, 63328],
-    [12472, 63329], [12473, 63330], [12474, 63331], [12475, 63332],
-    [12476, 63333], [12477, 63334], [12478, 63335], [12479, 63336],
-    [12480, 63337], [12481, 63338], [12482, 63339], [12483, 63340],
-    [12484, 63341], [12485, 63342], [12486, 63343], [12487, 63344],
-    [12488, 63345], [12489, 63346], [12490, 63347], [12491, 63348],
-    [12492, 63349], [12493, 63350], [12494, 63351], [12495, 63352],
-    [12496, 63353], [12497, 63354], [12498, 63355], [12499, 63356],
-    [12500, 63357], [12501, 63358], [12502, 63359], [12503, 63360],
-    [12504, 63361], [12505, 63362], [12506, 63363], [12507, 63364],
-    [12508, 63365], [12509, 63366], [12510, 63367], [12511, 63368],
-    [12512, 63369], [12513, 63370], [12514, 63371], [12515, 63372],
-    [12516, 63373], [12517, 63374], [12518, 63375], [12519, 63376],
-    [12520, 63377], [12521, 63378], [12522, 63379], [12523, 63380],
-    [12524, 63381], [12525, 63382], [12526, 63383], [12527, 63384],
-    [12528, 63385], [12529, 63386], [12530, 63387], [12531, 63388],
-    [12532, 63389], [12533, 63390], [12534, 63391], [1040, 63392],
-    [1041, 63393], [1042, 63394], [1043, 63395], [1044, 63396], [1045, 63397],
-    [1025, 63398], [1046, 63399], [1047, 63400], [1048, 63401], [1049, 63402],
-    [1050, 63403], [1051, 63404], [1052, 63405], [1053, 63406], [1054, 63407],
-    [1055, 63408], [1056, 63409], [1057, 63410], [1058, 63411], [1059, 63412],
-    [1060, 63413], [1061, 63414], [1062, 63415], [1063, 63416], [1064, 63417],
-    [1065, 63418], [1066, 63419], [1067, 63420], [1068, 63421], [1069, 63422],
-    [1070, 63423], [1071, 63424], [1072, 63425], [1073, 63426], [1074, 63427],
-    [1075, 63428], [1076, 63429], [1077, 63430], [1105, 63431], [1078, 63432],
-    [1079, 63433], [1080, 63434], [1081, 63435], [1082, 63436], [1083, 63437],
-    [1084, 63438], [1085, 63439], [1086, 63440], [1087, 63441], [1088, 63442],
-    [1089, 63443], [1090, 63444], [1091, 63445], [1092, 63446], [1093, 63447],
-    [1094, 63448], [1095, 63449], [1096, 63450], [1097, 63451], [1098, 63452],
-    [1099, 63453], [1100, 63454], [1101, 63455], [1102, 63456], [1103, 63457],
-    [8679, 63458], [8632, 63459], [8633, 63460], [20033, 63461],
-    [63462, 131276], [20058, 63463], [63464, 131210], [20994, 63465],
-    [17553, 63466], 63467, [20872, 63468], [13853, 63469], [63470, 161287],
-    {s: 40}, [172, 63511, 65506], [63512, 65508], [63513, 65287],
-    [63514, 65282], [12849, 63515], [8470, 63516], [8481, 63517], 30849,
-    [37561, 58501], 35023, 22715, 24658, 31911, 23290, 9556, 9574, 9559, 9568,
-    9580, 9571, 9562, 9577, 9565, 9554, 9572, 9557, {s: 3}, 9560, 9575, 9563,
-    9555, 9573, 9558, 9567, 9579, 9570, 9561, 9576, 9564, 9553, {s: 5}, 9619,
-    {s: 26}, [58129, 147159], [22462, 58130], [58131, 159443], [28990, 58132],
-    [58133, 153568], [27042, 58135], [58136, 166889], [23412, 58137],
-    [31305, 58138], [58139, 153825], [58140, 169177], [31333, 58141],
-    [31357, 58142], [58143, 154028], [31419, 58144], [31408, 58145],
-    [31426, 58146], [31427, 58147], [29137, 58148], [58149, 156813],
-    [16842, 58150], [31450, 58151], [31453, 58152], [31466, 58153],
-    [16879, 58154], [21682, 58155], [58156, 154625], [31499, 58157],
-    [31573, 58158], [31529, 58159], [58160, 152334], [58161, 154878],
-    [31650, 58162], [31599, 58163], [33692, 58164], [58165, 154548],
-    [58166, 158847], [31696, 58167], [33825, 58168], [31634, 58169], 0,
-    [58171, 154912], 0, [33938, 58174], [31738, 58175], 0, [31797, 58177],
-    [58178, 154817], [31812, 58179], [31875, 58180], [58181, 149634],
-    [31910, 58182], [58184, 148856], [31945, 58185], [31943, 58186],
-    [31974, 58187], 0, [31987, 58189], [31989, 58190], [32359, 58192],
-    [17693, 58193], [58194, 159300], [32093, 58195], [58196, 159446],
-    [32137, 58198], [32171, 58199], [28981, 58200], [32179, 58201], 32214,
-    [58203, 147543], [58204, 155689], [32228, 58205], [15635, 58206],
-    [32245, 58207], [58208, 137209], [32229, 58209], [58210, 164717], 0,
-    [58212, 155937], [58213, 155994], [32366, 58214], 0, [17195, 58216],
-    [37996, 58217], [32295, 58218], [32576, 58219], [32577, 58220],
-    [32583, 58221], [31030, 58222], [58223, 156368], [39393, 58224],
-    [32663, 58225], [58226, 156497], [32675, 58227], [58228, 136801],
-    [58229, 131176], [17756, 58230], [58231, 145254], [58233, 164666],
-    [32762, 58234], [58235, 156809], 0, [32776, 58237], [32797, 58238], 0,
-    [32815, 58240], [58241, 172167], [58242, 158915], [32827, 58243],
-    [32828, 58244], [32865, 58245], [58246, 141076], [18825, 58247],
-    [58248, 157222], [58249, 146915], [58250, 157416], [26405, 58251],
-    [32935, 58252], [58253, 166472], [33031, 58254], [33050, 58255],
-    [22704, 58256], [58257, 141046], [27775, 58258], [58259, 156824],
-    [25831, 58261], [58262, 136330], [33304, 58263], [58264, 137310],
-    [27219, 58265], [58266, 150117], [58267, 150165], [17530, 58268],
-    [33321, 58269], [58271, 158290], [58272, 146814], [20473, 58273],
-    [58274, 136445], [34018, 58275], [33634, 58276], 0, [58278, 149927],
-    [58279, 144688], [58280, 137075], [58281, 146936], [33450, 58282],
-    [26907, 58283], [58284, 194964], [16859, 58285], [34123, 58286],
-    [33488, 58287], [33562, 58288], [58289, 134678], [58290, 137140],
-    [14017, 58291], [58292, 143741], [58293, 144730], [33403, 58294],
-    [33506, 58295], [33560, 58296], [58297, 147083], [58298, 159139],
-    [58299, 158469], [58300, 158615], [58301, 144846], [15807, 58302],
-    [33565, 58303], [21996, 58304], [33669, 58305], [17675, 58306],
-    [58307, 159141], [33708, 58308], 0, [33747, 58310], [58312, 159444],
-    [27223, 58313], [34138, 58314], [13462, 58315], [58316, 159298],
-    [33880, 58318], [58319, 154596], [33905, 58320], [15827, 58321],
-    [17636, 58322], [27303, 58323], [33866, 58324], [31064, 58326], 0,
-    [58328, 158614], [58329, 159351], [58330, 159299], [34014, 58331], 0,
-    [33681, 58333], [17568, 58334], [33939, 58335], [34020, 58336],
-    [58337, 154769], [16960, 58338], [58339, 154816], [17731, 58340],
-    [34100, 58341], [23282, 58342], 0, [17703, 58344], [34163, 58345],
-    [17686, 58346], [26559, 58347], [34326, 58348], [58349, 165413],
-    [58350, 165435], [34241, 58351], [58352, 159880], [34306, 58353],
-    [58354, 136578], [58355, 159949], [58356, 194994], [17770, 58357],
-    [34344, 58358], [13896, 58359], [58360, 137378], [21495, 58361],
-    [58362, 160666], [34430, 58363], 0, [58365, 172280], [34798, 58366],
-    [58367, 142375], [34737, 58368], [34778, 58369], [34831, 58370, 60990],
-    [22113, 58371], [34412, 58372], [26710, 58373], [17935, 58374],
-    [34885, 58375], [34886, 58376], [58377, 161248], [58378, 146873],
-    [58379, 161252], [34910, 58380], [34972, 58381], [18011, 58382],
-    [34996, 58383], [34997, 58384], [35013, 58386], [58388, 161551],
-    [35207, 58389], {s: 3}, [35239, 58393], [35260, 58394], [58395, 166437],
-    [35303, 58396], [58397, 162084], [58398, 162493], [35484, 58399],
-    [30611, 58400], [37374, 58401], [35472, 58402], [58403, 162393],
-    [31465, 58404], [58405, 162618], [18195, 58407], [58408, 162616],
-    [29052, 58409], [35596, 58410], [35615, 58411], [58412, 152624],
-    [58413, 152933], [35647, 58414], 0, [35661, 58416], [35497, 58417],
-    [58418, 150138], [35728, 58419], [35739, 58420], [35503, 58421],
-    [58422, 136927], [17941, 58423], [34895, 58424], [35995, 58425],
-    [58426, 163156], [58427, 163215], [58428, 195028], [14117, 58429],
-    [58430, 163155], [36054, 58431], [58432, 163224], [58433, 163261],
-    [36114, 58434], [36099, 58435], [58436, 137488], [36059, 58437],
-    [28764, 58438], [36113, 58439], [16080, 58441], 0, [36265, 58443],
-    [58444, 163842], [58445, 135188], [58446, 149898], [15228, 58447],
-    [58448, 164284], [58449, 160012], [31463, 58450], [36525, 58451],
-    [36534, 58452], [36547, 58453], [37588, 58454], [36633, 58455],
-    [36653, 58456], [58457, 164709], [58458, 164882], [36773, 58459],
-    [37635, 58460], [58461, 172703], [58462, 133712], [36787, 58463], 0,
-    [58465, 166366], [58466, 165181], [58467, 146875], [24312, 58468],
-    [58469, 143970], [36857, 58470], 0, [58474, 140069], [14720, 58475],
-    [58476, 159447], [36919, 58477], [58478, 165180], [58479, 162494],
-    [36961, 58480], [58481, 165228], [58482, 165387], [37032, 58483],
-    [58484, 165651], [37060, 58485], [58486, 165606], [37038, 58487], 0,
-    [37223, 58489], [37289, 58491], [37316, 58492], [31916, 58493],
-    [58494, 166195], [58495, 138889], [37390, 58496], [27807, 58497],
-    [37441, 58498], [37474, 58499], [58500, 153017], [58502, 166598],
-    [58503, 146587], [58504, 166668], [58505, 153051], [58506, 134449],
-    [37676, 58507], [37739, 58508], [58509, 166625], [58510, 166891],
-    [23235, 58512], [58513, 166626], [58514, 166629], [18789, 58515],
-    [37444, 58516], [58517, 166892], [58518, 166969], [58519, 166911],
-    [37747, 58520], [37979, 58521], [36540, 58522], [38277, 58523],
-    [38310, 58524], [37926, 58525], [38304, 58526], [28662, 58527],
-    [17081, 58528], [58530, 165592], [58531, 135804], [58532, 146990],
-    [18911, 58533], [27676, 58534], [38523, 58535], [38550, 58536],
-    [16748, 58537], [38563, 58538], [58539, 159445], [25050, 58540], 58541,
-    [30965, 58542], [58543, 166624], [38589, 58544], [21452, 58545],
-    [18849, 58546], [58547, 158904], [58548, 131700], [58549, 156688],
-    [58550, 168111], [58551, 168165], [58552, 150225], [58553, 137493],
-    [58554, 144138], [38705, 58555], [34370, 58556], [38710, 58557],
-    [18959, 58558], [17725, 58559], [17797, 58560], [58561, 150249],
-    [28789, 58562], [23361, 58563], [38683, 58564], 0, [58566, 168405],
-    [38743, 58567], [23370, 58568], [58569, 168427], [38751, 58570],
-    [37925, 58571], [20688, 58572], [58573, 143543], [58574, 143548],
-    [38793, 58575], [38815, 58576], [38833, 58577], [38846, 58578],
-    [38848, 58579], [38866, 58580], [38880, 58581], [58582, 152684],
-    [38894, 58583], [29724, 58584], [58585, 169011], 0, [38901, 58587],
-    [58588, 168989], [58589, 162170], [19153, 58590], [38964, 58591],
-    [38963, 58592], [38987, 58593], [39014, 58594], [15118, 58595],
-    [58596, 160117], [15697, 58597], [58598, 132656], [58599, 147804],
-    [58600, 153350], [39114, 58601], [39095, 58602], [39112, 58603],
-    [39111, 58604], [19199, 58605], [58606, 159015], [58607, 136915],
-    [21936, 58608], [39137, 58609], [39142, 58610], [39148, 58611],
-    [37752, 58612], [39225, 58613], [58614, 150057], [19314, 58615],
-    [58616, 170071], [58617, 170245], [39413, 58618], [39436, 58619],
-    [39483, 58620], [39440, 58621], [39512, 58622], [58623, 153381],
-    [14020, 58624], [58625, 168113], [58626, 170965], [39648, 58627],
-    [39650, 58628], [58629, 170757], [39668, 58630], [19470, 58631],
-    [39700, 58632], [39725, 58633], [58634, 165376], [20532, 58635],
-    [39732, 58636], [14531, 58638], [58639, 143485], [39760, 58640],
-    [39744, 58641], [58642, 171326], [23109, 58643], [58644, 137315],
-    [39822, 58645], [39938, 58647], [39935, 58648], [39948, 58649],
-    [58650, 171624], [40404, 58651], [58652, 171959], [58653, 172434],
-    [58654, 172459], [58655, 172257], [58656, 172323], [58657, 172511],
-    [40318, 58658], [40323, 58659], [58660, 172340], [40462, 58661],
-    [40388, 58663], [58665, 172435], [58666, 172576], [58667, 137531],
-    [58668, 172595], [40249, 58669], [58670, 172217], [58671, 172724],
-    [40592, 58672], [40597, 58673], [40606, 58674], [40610, 58675],
-    [19764, 58676], [40618, 58677], [40623, 58678], [58679, 148324],
-    [40641, 58680], [15200, 58681], [14821, 58682], [15645, 58683],
-    [20274, 58684], [14270, 58685], [58686, 166955], [40706, 58687],
-    [40712, 58688], [19350, 58689], [37924, 58690], [58691, 159138],
-    [40727, 58692, 60836], 0, [40761, 58694], [22175, 58695], [22154, 58696],
-    [40773, 58697], [39352, 58698], [58699, 168075], [38898, 58700],
-    [33919, 58701], 0, [40809, 58703], [31452, 58704], [40846, 58705],
-    [29206, 58706], [19390, 58707], [58708, 149877], [58709, 149947],
-    [29047, 58710], [58711, 150008], [58712, 148296], [58713, 150097],
-    [29598, 58714], [58715, 166874], [58716, 137466], [31135, 58717],
-    [58718, 166270], [58719, 167478], [37737, 58720], [37875, 58721],
-    [58722, 166468], [37612, 58723], [37761, 58724], [37835, 58725],
-    [58726, 166252], [58727, 148665], [29207, 58728], [16107, 58729],
-    [30578, 58730], [31299, 58731], [28880, 58732], [58733, 148595],
-    [58734, 148472], [29054, 58735], [58736, 137199], [28835, 58737],
-    [58738, 137406], [58739, 144793], [16071, 58740], [58741, 137349],
-    [58742, 152623], [58743, 137208], [14114, 58744], [58745, 136955],
-    [58746, 137273], [14049, 58747], [58748, 137076], [58749, 137425],
-    [58750, 155467], [14115, 58751], [58752, 136896], [22363, 58753],
-    [58754, 150053], [58755, 136190], [58756, 135848], [58757, 136134],
-    [58758, 136374], [34051, 58759, 58761], [58760, 145062], 0, [33877, 58762],
-    [58763, 149908], [58764, 160101], [58765, 146993], [58766, 152924],
-    [58767, 147195], [58768, 159826], [17652, 58769], [58770, 145134],
-    [58771, 170397], [58772, 159526], [26617, 58773], [14131, 58774],
-    [15381, 58775], [15847, 58776], [22636, 58777], [58778, 137506],
-    [26640, 58779], [16471, 58780], [58781, 145215], [58782, 147681],
-    [58783, 147595], [58784, 147727], [58785, 158753], [21707, 58786],
-    [22174, 58787], [58788, 157361], [22162, 58789], [58790, 135135],
-    [58791, 134056], [58792, 134669], 0, [58794, 166675], [37788, 58795],
-    [20216, 58796], [20779, 58797], [14361, 58798], [58799, 148534],
-    [20156, 58800], [58801, 132197], 0, [20299, 58803], [20362, 58804],
-    [58805, 153169], [23144, 58806], [58807, 131499], [58808, 132043],
-    [14745, 58809], [58810, 131850], [58811, 132116], [13365, 58812],
-    [20265, 58813], [58814, 131776], [58815, 167603], [58816, 131701],
-    [35546, 58817], [58818, 131596], [20120, 58819], [20685, 58820],
-    [20749, 58821], [20386, 58822], [20227, 58823], [58824, 150030],
-    [58825, 147082], [20290, 58826], [20526, 58827], [20588, 58828],
-    [20609, 58829], [20428, 58830], [20453, 58831], [20568, 58832],
-    [20732, 58833], [28278, 58838], [58839, 144789], [58840, 147001],
-    [58841, 147135], [28018, 58842], [58843, 137348], [58844, 147081],
-    [20904, 58845], [20931, 58846], [58847, 132576], [17629, 58848],
-    [58849, 132259], [58850, 132242], [58851, 132241], [36218, 58852],
-    [58853, 166556], [58854, 132878], [21081, 58855], [21156, 58856],
-    [58857, 133235], [21217, 58858], 0, [18042, 58860], [29068, 58861],
-    [58862, 148364], [58863, 134176], [58864, 149932], [58865, 135396],
-    [27089, 58866], [58867, 134685], 0, [16094, 58869], [29849, 58870],
-    [29716, 58871], [29782, 58872], [29592, 58873], [19342, 58874],
-    [58875, 150204], [58876, 147597], [21456, 58877], [13700, 58878],
-    [29199, 58879], [58880, 147657], [21940, 58881], [58882, 131909],
-    [21709, 58883], [58884, 134086], [22301, 58885], [37469, 58886],
-    [38644, 58887], [22493, 58889], [22413, 58890], [22399, 58891],
-    [13886, 58892], [22731, 58893], [23193, 58894], [58895, 166470],
-    [58896, 136954], [58897, 137071], [58898, 136976], [23084, 58899],
-    [22968, 58900], [23166, 58902], [23247, 58903], [23058, 58904],
-    [58905, 153926], [58906, 137715], [58907, 137313], [58908, 148117],
-    [14069, 58909], [27909, 58910], [29763, 58911], [23073, 58912],
-    [58913, 155267], [23169, 58914], [58915, 166871], [58916, 132115],
-    [37856, 58917], [29836, 58918], [58919, 135939], [28933, 58920],
-    [18802, 58921], [37896, 58922], [58923, 166395], [37821, 58924],
-    [14240, 58925], [23582, 58926], [23710, 58927], [24158, 58928],
-    [24136, 58929], [58930, 137622], [58931, 137596], [58932, 146158],
-    [24269, 58933], [23375, 58934], [58935, 137475], [58936, 137476],
-    [14081, 58937], [58938, 137376], [14045, 58939], [58940, 136958],
-    [14035, 58941], [33066, 58942], [58943, 166471], [58944, 138682],
-    [58945, 144498], [58946, 166312], [24332, 58947, 60916], [24334, 58948],
-    [58949, 137511], [58950, 137131], [23147, 58951], [58952, 137019],
-    [23364, 58953], [58955, 161277], [34912, 58956], [24702, 58957],
-    [58958, 141408], [58959, 140843], [24539, 58960], [16056, 58961],
-    [58962, 140719], [58963, 140734], [58964, 168072], [58965, 159603],
-    [25024, 58966], [58967, 131134], [58968, 131142], [58969, 140827],
-    [24985, 58970], [24984, 58971], [24693, 58972], [58973, 142491],
-    [58974, 142599], [58975, 149204], [58976, 168269], [25713, 58977],
-    [58978, 149093], [58979, 142186], [14889, 58980], [58981, 142114],
-    [58982, 144464], [58983, 170218], [58984, 142968], [25399, 58985],
-    [25782, 58987], [25393, 58988], [25553, 58989], [58990, 149987],
-    [58991, 142695], [25252, 58992], [58993, 142497], [25659, 58994],
-    [25963, 58995], [26994, 58996], [15348, 58997], [58998, 143502],
-    [58999, 144045], [59000, 149897], [59001, 144043], [21773, 59002],
-    [59003, 144096], [59004, 137433], [59005, 169023], [26318, 59006],
-    [59007, 144009], [59008, 143795], [15072, 59009], [59011, 152964],
-    [59012, 166690], [59013, 152975], [59014, 136956], [59015, 152923],
-    [59016, 152613], [30958, 59017], [59018, 143619], [59019, 137258],
-    [59020, 143924], [13412, 59021], [59022, 143887], [59023, 143746],
-    [59024, 148169], [26254, 59025], [59026, 159012], [26219, 59027],
-    [19347, 59028], [26160, 59029], [59030, 161904], [59031, 138731],
-    [26211, 59032], [59033, 144082], [59034, 144097], [26142, 59035],
-    [59036, 153714], [14545, 59037], [59038, 145466], [59039, 145340],
-    [15257, 59040], [59041, 145314], [59042, 144382], [29904, 59043],
-    [15254, 59044], [59046, 149034], [26806, 59047], 0, [15300, 59049],
-    [27326, 59050], [59052, 145365], [59053, 148615], [27187, 59054],
-    [27218, 59055], [27337, 59056], [27397, 59057], [59058, 137490],
-    [25873, 59059], [26776, 59060], [27212, 59061], [15319, 59062],
-    [27258, 59063], [27479, 59064], [59065, 147392], [59066, 146586],
-    [37792, 59067], [37618, 59068], [59069, 166890], [59070, 166603],
-    [37513, 59071], [59072, 163870], [59073, 166364], [37991, 59074],
-    [28069, 59075], [28427, 59076], 0, [59079, 147327], [15759, 59080],
-    [28164, 59081], [59082, 147516], [23101, 59083], [28170, 59084],
-    [22599, 59085], [27940, 59086], [30786, 59087], [28987, 59088],
-    [59089, 148250], [59090, 148086], [28913, 59091], [29264, 59092, 61085],
-    [29319, 59093], [29332, 59094], [59095, 149391], [59096, 149285],
-    [20857, 59097], [59098, 150180], [59099, 132587], [29818, 59100],
-    [59101, 147192], [59102, 144991], [59103, 150090], [59104, 149783],
-    [59105, 155617], [16134, 59106], [16049, 59107], [59108, 150239],
-    [59109, 166947], [59110, 147253], [24743, 59111], [16115, 59112],
-    [29900, 59113], [29756, 59114], [37767, 59115], [29751, 59116],
-    [17567, 59117], [59118, 159210], [17745, 59119], [30083, 59120],
-    [16227, 59121], [59122, 150745], [59123, 150790], [16216, 59124],
-    [30037, 59125], [30323, 59126], [59127, 173510], 0, [29800, 59129, 61070],
-    [59130, 166604], [59131, 149931], [59132, 149902], [15099, 59133],
-    [15821, 59134], [59135, 150094], [16127, 59136], [59137, 149957],
-    [59138, 149747], [37370, 59139], [22322, 59140], [37698, 59141],
-    [59142, 166627], [59143, 137316], [20703, 59144], [59145, 152097],
-    [59146, 152039], [30584, 59147], [59148, 143922], [30478, 59149],
-    [30479, 59150], [30587, 59151], [59152, 149143], [59153, 145281],
-    [14942, 59154], [59155, 149744], [29752, 59156], [29851, 59157],
-    [16063, 59158], [59159, 150202], [59160, 150215], [16584, 59161],
-    [59162, 150166], [59163, 156078], [37639, 59164], [59165, 152961],
-    [30750, 59166], [30861, 59167], [30856, 59168], [30930, 59169],
-    [29648, 59170], [31065, 59171], [59172, 161601], [59173, 153315],
-    [16654, 59174], 0, 0, [31141, 59177], [27181, 59178], [59179, 147194],
-    [31290, 59180], [31220, 59181], [16750, 59182], [59183, 136934],
-    [16690, 59184], [37429, 59185], [31217, 59186], [59187, 134476],
-    [59188, 149900], [59189, 131737], [59190, 146874], [59191, 137070],
-    [13719, 59192], [21867, 59193], [13680, 59194], [13994, 59195],
-    [59196, 131540], [59197, 134157], [31458, 59198], [23129, 59199],
-    [59200, 141045], [59201, 154287], [59202, 154268], [23053, 59203],
-    [59204, 131675], [30960, 59205], [23082, 59206], [59207, 154566],
-    [31486, 59208], [16889, 59209], [31837, 59210], [31853, 59211],
-    [16913, 59212], [59213, 154547], [59214, 155324], [59215, 155302],
-    [31949, 59216], [59217, 150009], [59218, 137136], [31886, 59219],
-    [31868, 59220], [31918, 59221], [27314, 59222], [32220, 59223],
-    [32263, 59224], [32211, 59225], [32590, 59226], [59227, 156257],
-    [59228, 155996], [59229, 162632], [32151, 59230], [59231, 155266],
-    [17002, 59232], [59233, 158581], [59234, 133398], [26582, 59235],
-    [59236, 131150], [59237, 144847], [22468, 59238], [59239, 156690],
-    [59240, 156664], [32733, 59242], [31527, 59243], [59244, 133164],
-    [59245, 154345], [59246, 154947], [31500, 59247], [59248, 155150],
-    [39398, 59249], [34373, 59250], [39523, 59251], [27164, 59252],
-    [59253, 144447], [59255, 150007], [59256, 157101], [39455, 59257],
-    [59258, 157088], 0, [59260, 160039], [59261, 158929], [17642, 59262],
-    [33079, 59263], [17410, 59264], [32966, 59265], [33033, 59266],
-    [33090, 59267], [59268, 157620], [39107, 59269], [59270, 158274],
-    [33378, 59271], [33381, 59272], [59273, 158289], [33875, 59274],
-    [59275, 159143], [34320, 59276], [59277, 160283], [23174, 59278],
-    [16767, 59279], [59280, 137280], [23339, 59281], [59282, 137377],
-    [23268, 59283], [59284, 137432], [34464, 59285], [59286, 195004],
-    [59287, 146831], [34861, 59288], [59289, 160802], [23042, 59290],
-    [34926, 59291], [20293, 59292], [34951, 59293], [35007, 59294],
-    [35046, 59295], [35173, 59296], [35149, 59297], [59298, 153219],
-    [35156, 59299], [59300, 161669], [59301, 161668], [59302, 166901],
-    [59303, 166873], [59304, 166812], [59305, 166393], [16045, 59306],
-    [33955, 59307], [18165, 59308], [18127, 59309], [14322, 59310],
-    [35389, 59311], [35356, 59312], [59313, 169032], [24397, 59314],
-    [37419, 59315], [59316, 148100], [26068, 59317], [28969, 59318],
-    [28868, 59319], [59320, 137285], [40301, 59321], [35999, 59322],
-    [36073, 59323], [59324, 163292], [22938, 59325], [30659, 59326],
-    [23024, 59327], [14036, 59329], [36394, 59330], [36519, 59331],
-    [59332, 150537], [36656, 59333], [36682, 59334], [17140, 59335],
-    [27736, 59336], [28603, 59337], [59338, 140065], [18587, 59339],
-    [28537, 59340], [28299, 59341], [59342, 137178], [39913, 59343],
-    [14005, 59344], [59345, 149807], [37051, 59346], 0, [21873, 59348],
-    [18694, 59349], [37307, 59350], [37892, 59351], [59352, 166475],
-    [16482, 59353], [59354, 166652], [37927, 59355], [59356, 166941],
-    [59357, 166971], [34021, 59358], [35371, 59359], [38297, 59360],
-    [38311, 59361], [38295, 59362], [38294, 59363], [59364, 167220],
-    [29765, 59365], [16066, 59366], [59367, 149759], [59368, 150082],
-    [59369, 148458], [16103, 59370], [59371, 143909], [38543, 59372],
-    [59373, 167655], [59374, 167526], [59375, 167525], [16076, 59376],
-    [59377, 149997], [59378, 150136], [59379, 147438], [29714, 59380],
-    [29803, 59381], [16124, 59382], [38721, 59383], [59384, 168112],
-    [26695, 59385], [18973, 59386], [59387, 168083], [59388, 153567], 0,
-    [37736, 59390], [59391, 166281], [59392, 166950], [59393, 166703],
-    [59394, 156606], [37562, 59395], [23313, 59396], [35689, 59397],
-    [18748, 59398], [29689, 59399], [59400, 147995], [38811, 59401], 0,
-    [39224, 59403], [59404, 134950], [24001, 59405], [59406, 166853],
-    [59407, 150194], [38943, 59408], [59409, 169178], [37622, 59410],
-    [59411, 169431], [37349, 59412], [17600, 59413], [59414, 166736],
-    [59415, 150119], [59416, 166756], [39132, 59417], [59418, 166469],
-    [16128, 59419], [37418, 59420], [18725, 59421], [33812, 59422],
-    [39227, 59423], [39245, 59424], [59425, 162566], [15869, 59426], 0,
-    [19311, 59428], [39338, 59429], [39516, 59430], [59431, 166757],
-    [59432, 153800], [27279, 59433], [39457, 59434], [23294, 59435],
-    [39471, 59436], [59437, 170225], [19344, 59438], [59439, 170312],
-    [39356, 59440], [19389, 59441], [19351, 59442], [37757, 59443],
-    [22642, 59444], [59445, 135938], [22562, 59446], [59447, 149944],
-    [59448, 136424], [30788, 59449], [59450, 141087], [59451, 146872],
-    [26821, 59452], [15741, 59453], [37976, 59454], [14631, 59455],
-    [24912, 59456], [59457, 141185], [59458, 141675], [24839, 59459],
-    [40015, 59460], [40019, 59461], [40059, 59462], [39989, 59463],
-    [39952, 59464], [39807, 59465], [39887, 59466], [59467, 171565],
-    [39839, 59468], [59469, 172533], [59470, 172286], [40225, 59471],
-    [19630, 59472], [59473, 147716], [40472, 59474], [19632, 59475],
-    [40204, 59476], [59477, 172468], [59478, 172269], [59479, 172275],
-    [59480, 170287], [40357, 59481], [33981, 59482], [59483, 159250],
-    [59484, 159711], [59485, 158594], [34300, 59486], [17715, 59487],
-    [59488, 159140], [59489, 159364], [59490, 159216], [33824, 59491],
-    [34286, 59492], [59493, 159232], [59494, 145367], [59495, 155748],
-    [31202, 59496], [59497, 144796], [59498, 144960], [59500, 149982],
-    [15714, 59501], [37851, 59502], [37566, 59503], [37704, 59504],
-    [59505, 131775], [30905, 59506], [37495, 59507], [37965, 59508],
-    [20452, 59509], [13376, 59510], [36964, 59511], [59512, 152925],
-    [30781, 59513], [30804, 59514], [30902, 59515], [30795, 59516],
-    [59517, 137047], [59518, 143817], [59519, 149825], [13978, 59520],
-    [20338, 59521], [28634, 59522], [28633, 59523], 0, [28702, 59524, 59525],
-    [21524, 59526], [59527, 147893], [22459, 59528], [22771, 59529],
-    [22410, 59530], [40214, 59531], [22487, 59532], [28980, 59533],
-    [13487, 59534], [59535, 147884], [29163, 59536], [59537, 158784],
-    [59538, 151447], 0, [59540, 137141], [59541, 166473], [24844, 59542],
-    [23246, 59543], [23051, 59544], [17084, 59545], [59546, 148616],
-    [14124, 59547], [19323, 59548], [59549, 166396], [37819, 59550],
-    [37816, 59551], [59552, 137430], [59553, 134941], [33906, 59554],
-    [59555, 158912], [59556, 136211], [59557, 148218], [59558, 142374],
-    [59559, 148417], [22932, 59560], [59561, 146871], [59562, 157505],
-    [32168, 59563], [59564, 155995], [59565, 155812], [59566, 149945],
-    [59567, 149899], [59568, 166394], [37605, 59569], [29666, 59570],
-    [16105, 59571], [29876, 59572], [59573, 166755], [59574, 137375],
-    [16097, 59575], [59576, 150195], [27352, 59577], [29683, 59578],
-    [29691, 59579], [16086, 59580], [59581, 150078], [59582, 150164],
-    [59583, 137177], [59584, 150118], [59585, 132007], [59586, 136228],
-    [59587, 149989], [29768, 59588], [59589, 149782], [28837, 59590],
-    [59591, 149878], [37508, 59592], [29670, 59593], [37727, 59594],
-    [59595, 132350], [37681, 59596], [59597, 166606], [59598, 166422],
-    [37766, 59599], [59600, 166887], [59601, 153045], [18741, 59602],
-    [59603, 166530], [29035, 59604], [59605, 149827], [59606, 134399],
-    [22180, 59607], [59608, 132634], [59609, 134123], [59610, 134328],
-    [21762, 59611], [31172, 59612], [59613, 137210], [32254, 59614],
-    [59615, 136898], [59616, 150096], [59617, 137298], [17710, 59618],
-    [37889, 59619], [14090, 59620], [59621, 166592], [59622, 149933],
-    [22960, 59623], [59624, 137407], [59625, 137347], [59626, 160900],
-    [23201, 59627], [14050, 59628], [59629, 146779], [14000, 59630],
-    [37471, 59631], [23161, 59632], [59633, 166529], [59634, 137314],
-    [37748, 59635], [15565, 59636], [59637, 133812], [19094, 59638],
-    [14730, 59639], [20724, 59640], [15721, 59641], [15692, 59642],
-    [59643, 136092], [29045, 59644], [17147, 59645], [59646, 164376],
-    [28175, 59647], [59648, 168164], [17643, 59649], [27991, 59650],
-    [59651, 163407], [28775, 59652], [27823, 59653], [15574, 59654],
-    [59655, 147437], [59656, 146989], [28162, 59657], [28428, 59658],
-    [15727, 59659], [59660, 132085], [30033, 59661], [14012, 59662],
-    [13512, 59663], [18048, 59664], [16090, 59665], [18545, 59666],
-    [22980, 59667], [37486, 59668], [18750, 59669], [36673, 59670],
-    [59671, 166940], [59672, 158656], [22546, 59673], [22472, 59674],
-    [14038, 59675], [59676, 136274], [28926, 59677], [59678, 148322],
-    [59679, 150129], [59680, 143331], [59681, 135856], [59682, 140221],
-    [26809, 59683], [26983, 59684], [59685, 136088], [59686, 144613],
-    [59687, 162804], [59688, 145119], [59689, 166531], [59690, 145366],
-    [59691, 144378], [59692, 150687], [27162, 59693], [59694, 145069],
-    [59695, 158903], [33854, 59696], [17631, 59697], [17614, 59698],
-    [59699, 159014], [59700, 159057], [59701, 158850], [59702, 159710], 0, 0,
-    [33597, 59705], [59706, 137018], [33773, 59707], [59708, 158848],
-    [59709, 159827], [59710, 137179], [22921, 59711], [23170, 59712],
-    [59713, 137139], [23137, 59714], [23153, 59715], [59716, 137477],
-    [59717, 147964], [14125, 59718], [23023, 59719], [59720, 137020],
-    [14023, 59721], [29070, 59722], [37776, 59723], [26266, 59724],
-    [59725, 148133], [23150, 59726], [23083, 59727], [59728, 148115],
-    [27179, 59729], [59730, 147193], [59731, 161590], [59732, 148571],
-    [59733, 148170], [28957, 59734], [59735, 148057], [59736, 166369],
-    [20400, 59737], [59738, 159016], [23746, 59739], [59740, 148686],
-    [59741, 163405], [59742, 148413], [27148, 59743], [59744, 148054],
-    [59745, 135940], 0, [28979, 59747], [59748, 148457], [15781, 59749],
-    [27871, 59750], [59751, 194597], [23019, 59754], [24412, 59757],
-    [59764, 144128], [31955, 59776], [59783, 162548], [59786, 153334],
-    [59790, 162584], [36972, 59791], [33270, 59795], [30476, 59797],
-    [27810, 59799], [22269, 59800], [22633, 59828], [26465, 59832],
-    [23646, 59838], [22770, 59841], [28857, 59843], [26627, 59853],
-    [36795, 59859], [36796, 59861], [20001, 59871], [31545, 59898],
-    [15820, 59902], [29482, 57990, 59909], [30048, 59912], [22586, 59920],
-    [33446, 59932], [27018, 59940], [24803, 59944], [20206, 59984],
-    [39364, 60002], [40639, 60023], [21249, 60025], [26528, 60038],
-    [24808, 60046], [20916, 60053], [31363, 60064], [39994, 60075],
-    [31432, 60093], [26906, 60098], [22956, 60100], [22592, 60102],
-    [21610, 60114], [24807, 60123], [22138, 60125], [26965, 60132],
-    [39983, 60133], [34725, 60134], [23584, 60141], [24075, 60143],
-    [26398, 60147], [33965, 60157], [35713, 60161], [20088, 60166],
-    [25283, 60176], [26709, 60180], 0, [33533, 60190], [35237, 60194],
-    [36768, 60196], [38840, 60198], [38983, 60200], [39613, 60201],
-    [24497, 60218], [26184, 60219], [26303, 60220], [60221, 162425], 0,
-    [60225, 149946], 0, 0, [60230, 131910], [26382, 60232], [26904, 60233],
-    [60235, 161367], [60236, 155618], [60239, 161278], [60240, 139418],
-    [18640, 60241], [19128, 60242], [60244, 166554], [60247, 147515],
-    [60250, 150085], [60251, 132554], [20946, 60252], [60253, 132625],
-    [22943, 60254], [60255, 138920], [15294, 60256], [60257, 146687],
-    [14747, 60262], [60264, 165352], [60265, 170441], [14178, 60266],
-    [60267, 139715], [35678, 60268], [60269, 166734], 0, [29193, 60274],
-    [60276, 134264], [60280, 132985], [36570, 60281], [21135, 60283],
-    [29041, 60285], [60288, 147274], [60289, 150183], [21948, 60290],
-    [60293, 158546], [13427, 60295], [60297, 161330], [18200, 60299],
-    [60303, 149823], [20582, 60305], [13563, 60306], [60307, 144332], 0,
-    [18300, 60310], [60311, 166216], [60315, 138640], 0, [60320, 162834],
-    [36950, 60321], [60323, 151450], [35682, 60324], [23899, 60327],
-    [60328, 158711], 0, [60331, 137500], [35562, 60332], [60333, 150006],
-    [60335, 147439], [19392, 60337], [60340, 141083], [37989, 60341],
-    [60342, 153569], [24981, 60343], [23079, 60344], [60345, 194765], 0,
-    [60348, 148769], [20074, 60350], [60351, 149812], [38486, 60352],
-    [28047, 60353], [60354, 158909], [35191, 60356], [60359, 156689], 0,
-    [31554, 60363], [60364, 168128], [60365, 133649], 0, [31301, 60369],
-    [39462, 60372], [13919, 60374], [60375, 156777], [60376, 131105],
-    [31107, 60377], [23852, 60380], [60381, 144665], 0, [18128, 60384],
-    [30011, 60386], [34917, 60387], [22710, 60389], [14108, 60390],
-    [60391, 140685], [15444, 60394], [37505, 60397], [60398, 139642],
-    [37680, 60400], [60402, 149968], [27705, 60403], [60406, 134904],
-    [34855, 60407], [35061, 60408], [60409, 141606], [60410, 164979],
-    [60411, 137137], [28344, 60412], [60413, 150058], [60414, 137248],
-    [14756, 60415], 0, 0, [17727, 60419], [26294, 60420], [60421, 171181],
-    [60422, 170148], [35139, 60423], [16607, 60427], [60428, 136714],
-    [14753, 60429], [60430, 145199], [60431, 164072], [60432, 136133],
-    [29101, 60433], [33638, 60434], [60436, 168360], 0, [19639, 60438],
-    [60439, 159919], [60440, 166315], [60445, 147834], [31555, 60446],
-    [31102, 60447], [28597, 60449], [60450, 172767], [27139, 60451],
-    [60452, 164632], [21410, 60453], [60454, 159239], [37823, 60455],
-    [26678, 60456], [38749, 59389, 60457], [60458, 164207], [60460, 158133],
-    [60461, 136173], [60462, 143919], [23941, 60464], [60465, 166960],
-    [22293, 60467], [38947, 60468], [60469, 166217], [23979, 60470],
-    [60471, 149896], [26046, 60472], [27093, 60473], [21458, 60474],
-    [60475, 150181], [60476, 147329], [15377, 60477], [26422, 60478],
-    [60482, 139169], [13770, 60490], [18682, 60493], 0, [30728, 60496],
-    [37461, 60497], [17394, 60499], [17375, 60501], [23032, 60505], 0,
-    [22155, 60518], [60520, 169449], [36882, 60541], [21953, 60546],
-    [17673, 60551], [32383, 60552], [28502, 60553], [27313, 60554],
-    [13540, 60556], [60558, 161949], [14138, 60559], 0, [60562, 163876],
-    [60565, 162366], [15851, 60567], [60569, 146615], [60574, 156248],
-    [22207, 60575], [36366, 60577], [23405, 60578], [25566, 60581], 0,
-    [25904, 60585], [22061, 60586], [21530, 60588], [60591, 171416],
-    [19581, 60592], [22050, 60593], [22046, 60594], [32585, 60595],
-    [22901, 60597], [60598, 146752], [34672, 60599], [33047, 60604],
-    [40286, 60605], [36120, 60606], [30267, 60607], [40005, 60608],
-    [30286, 60609], [30649, 60610], [37701, 60611], [21554, 60612],
-    [33096, 60613], [33527, 60614], [22053, 60615], [33074, 60616],
-    [33816, 60617], [32957, 60618], [21994, 60619], [31074, 60620],
-    [22083, 60621], [21526, 60622], [60623, 134813], [13774, 60624],
-    [22021, 57509, 60625], [22001, 60626], [26353, 60627], [60628, 164578],
-    [13869, 60629], [30004, 60630], [22000, 60631], [21946, 60632],
-    [21655, 60633], [21874, 60634], [60635, 134209], [60636, 134294],
-    [24272, 57652, 60637], [60639, 134774], [60640, 142434], [60641, 134818],
-    [40619, 60642], [32090, 60643], 0, [60645, 135285], [25245, 60646],
-    [38765, 60647], [21652, 60648], [36045, 60649], [29174, 60650],
-    [37238, 60651], [25596, 60652], [25529, 60653], [25598, 60654],
-    [21865, 60655], [60656, 142147], [40050, 60657], [60658, 143027],
-    [20890, 60659], [13535, 60660], [60661, 134567], [20903, 60662],
-    [21581, 60663], [21790, 60664], [21779, 60665], [30310, 60666],
-    [36397, 60667], [60668, 157834], [30129, 60669], [32950, 60670],
-    [34820, 60671], 0, [35015, 60673], [33206, 60674], [33820, 60675],
-    [17644, 60677], [29444, 60678], [33547, 60681], [22139, 60683],
-    [37232, 60690], [37384, 60692], [60696, 134905], [29286, 60697],
-    [18254, 60699], [60701, 163833], [16634, 60703], [40029, 60704],
-    [25887, 60705], [18675, 60707], [60708, 149472], [60709, 171388], 0,
-    [60713, 161187], 60715, [60716, 155720], [29091, 60718], [32398, 60719],
-    [40272, 60720], [13687, 60723], [27826, 60725], [21351, 60726],
-    [14812, 60728], [60731, 149016], [33325, 60734], [21579, 60735], 60739,
-    [14930, 60740], [29556, 60742], [60743, 171692], [19721, 60744],
-    [39917, 60745], 0, [19547, 60748], [60751, 171998], [33884, 60752],
-    [60754, 160434], [25390, 60757], [32037, 60758], [14890, 60761],
-    [36872, 60762], [21196, 60763], [15988, 60764], [13946, 60765],
-    [17897, 60766], [60767, 132238], [30272, 60768], [23280, 60769],
-    [60770, 134838], [30842, 60771], [18358, 60772], [22695, 60773],
-    [16575, 60774], [22140, 60775], [39819, 60776], [23924, 60777],
-    [30292, 60778], [60779, 173108], [40581, 60780], [19681, 60781], 0,
-    [14331, 60783], [24857, 60784], [60786, 148466], 60787, [22109, 60788],
-    [60792, 171526], [21044, 60793], [13741, 60795], 0, [40316, 60797],
-    [31830, 60798], [39737, 60799], [22494, 60800], [23635, 60802],
-    [25811, 60803], [60804, 169168], [60805, 156469], [34477, 60807],
-    [60808, 134440], [60811, 134513], 60812, [20990, 60813], [60814, 139023],
-    [23950, 60815], [38659, 60816], [60817, 138705], [40577, 60818],
-    [36940, 60819], [31519, 60820], [39682, 60821], [23761, 60822],
-    [31651, 60823], [25192, 60824], [25397, 60825], [39679, 60826],
-    [31695, 60827], [39722, 60828], [31870, 60829], 0, [31810, 60831],
-    [31878, 60832], [39957, 60833], [31740, 60834], [39689, 60835], 0, 39982,
-    [40794, 60839], [21875, 60840], [23491, 60841], [20477, 60842],
-    [40600, 60843], [20466, 60844], [21088, 60845], [21201, 60847],
-    [22375, 60848], [20566, 60849], [22967, 60850], [24082, 60851],
-    [38856, 60852], [40363, 60853], [36700, 60854], [21609, 60855],
-    [38836, 60856], [39232, 60857], [38842, 60858], [21292, 60859],
-    [24880, 60860], [26924, 60861], [21466, 60862], [39946, 60863],
-    [40194, 60864], [19515, 60865], [38465, 60866], [27008, 60867],
-    [20646, 60868], [30022, 60869], [60870, 137069], [39386, 60871],
-    [21107, 60872], 60873, [37209, 60874], [38529, 60875], [37212, 60876],
-    60877, [37201, 60878], [60879, 167575], [25471, 60880], [27338, 60882],
-    [22033, 60883], [37262, 60884], [30074, 60885], [25221, 60886],
-    [29519, 60888], [31856, 60889], [60890, 154657], 60892, [30422, 60894],
-    [39837, 60895], [20010, 60896], [60897, 134356], [33726, 60898],
-    [34882, 60899], 60900, [23626, 60901], [27072, 60902], 0, 0,
-    [21023, 60905], [24053, 60906], [20174, 60907], [27697, 60908],
-    [60909, 131570], [20281, 60910], [21660, 60911], 0, [21146, 60913],
-    [36226, 60914], [13822, 60915], 0, [13811, 60917], 60918, [27474, 60919],
-    [37244, 60920], [40869, 60921], [39831, 60922], [38958, 60923],
-    [39092, 60924], [39610, 60925], [40616, 60926], [40580, 60927],
-    [31508, 60929], 60930, [27642, 60931], [34840, 60932], [32632, 60933],
-    60934, [22048, 60935], [60936, 173642], [36471, 60937], [40787, 60938],
-    60939, [36308, 60940], [36431, 60941], [40476, 60942], [36353, 60943],
-    [25218, 60944], [60945, 164733], [36392, 60946], [36469, 60947],
-    [31443, 60948], [31294, 60950], [30936, 60951], [27882, 60952],
-    [35431, 60953], [30215, 60954], [40742, 60956], [27854, 60957],
-    [34774, 60958], [30147, 60959], [60960, 172722], [30803, 60961],
-    [36108, 60963], [29410, 60964], [29553, 60965], [35629, 60966],
-    [29442, 60967], [29937, 60968], [36075, 60969], [60970, 150203],
-    [34351, 60971], [24506, 60972], [34976, 60973], [17591, 60974], 60975,
-    [60977, 159237], 60978, [35454, 60979], [60980, 140571], 60981,
-    [24829, 60982], [30311, 60983], [39639, 60984], [40260, 60985],
-    [37742, 58859, 60986], [39823, 60987], [34805, 60988], 60989, 0,
-    [36087, 60991], [29484, 60992], [38689, 60993], [39856, 60994],
-    [13782, 60995], [29362, 60996], [19463, 60997], [31825, 60998],
-    [39242, 60999], [24921, 61001], [19460, 61002], [40598, 61003],
-    [24957, 61004], 61005, [22367, 61006], [24943, 61007], [25254, 61008],
-    [25145, 61009], 0, [14940, 61011], [25058, 61012], [21418, 61013],
-    [25444, 61015], [26626, 61016], [13778, 61017], [23895, 61018],
-    [36826, 61020], [61021, 167481], 61022, [20697, 61023], [30982, 61025],
-    [21298, 61026], [38456, 61027], [61028, 134971], [16485, 61029], 61030,
-    [30718, 61031], 61032, [31938, 61033], [61034, 155418], [31962, 61035],
-    [31277, 61036], [32870, 61037], [32867, 61038], [32077, 61039],
-    [29957, 61040], [29938, 61041], [35220, 61042], [33306, 61043],
-    [26380, 61044], [32866, 61045], [61046, 160902], [32859, 61047],
-    [29936, 61048], [33027, 61049], [30500, 61050], [35209, 61051],
-    [61052, 157644], [30035, 61053], [34729, 61055], [34766, 61056],
-    [33224, 61057], [34700, 61058], [35401, 61059], [36013, 61060],
-    [35651, 61061], [30507, 61062], [29944, 61063], [34010, 61064],
-    [27058, 61066], [36262, 61067], 61068, [35241, 58392, 61069], 0,
-    [28089, 61071], [34753, 61072], [61073, 147473], [29927, 61074],
-    [15835, 61075], [29046, 61076], [24740, 57702, 61077], [24988, 61078],
-    [15569, 61079], 0, [24695, 61081], 61082, [32625, 61083], 0,
-    [24809, 61086], [19326, 61087], [57344, 132423], [37595, 57345],
-    [57346, 132575], [57347, 147397], [34124, 57348], [17077, 57349],
-    [29679, 57350], [20917, 57351], [13897, 57352], [57353, 149826],
-    [57354, 166372], [37700, 57355], [57356, 137691], [33518, 57357],
-    [57358, 146632], [30780, 57359], [26436, 57360], [25311, 57361],
-    [57362, 149811], [57363, 166314], [57364, 131744], [57365, 158643],
-    [57366, 135941], [20395, 57367], [57368, 140525], [20488, 57369],
-    [57370, 159017], [57371, 162436], [57372, 144896], [57373, 150193],
-    [57374, 140563], 0, [57376, 131966], [24484, 57377], [57378, 131968],
-    [57379, 131911], [28379, 57380], [57381, 132127], 20702, [20737, 57383],
-    [13434, 57384], [20750, 57385], [39020, 57386], [14147, 57387],
-    [33814, 57388], [57389, 149924], [57390, 132231], [20832, 57391],
-    [57392, 144308], [20842, 57393], [57394, 134143], [57395, 139516],
-    [57396, 131813], [57397, 140592], [57398, 132494], [57399, 143923],
-    [57400, 137603], [23426, 57401], [34685, 57402], [57403, 132531],
-    [57404, 146585], [20914, 57405], [20920, 57406], [40244, 57407],
-    [20937, 57408], [20943, 57409], [20945, 57410], [15580, 57411],
-    [20947, 57412], [57413, 150182], [20915, 57414], 0, 0, [20973, 57417],
-    [33741, 57418], [26942, 57419], [57420, 145197], [24443, 57421],
-    [21003, 57422], [21030, 57423], [21052, 57424], [21173, 57425],
-    [21079, 57426], [21140, 57427], [21177, 57428], [21189, 57429],
-    [31765, 57430], [34114, 57431], [21216, 57432], [34317, 57433],
-    [57434, 158483], 0, [57436, 166622], [21833, 57437], [28377, 57438],
-    [57439, 147328], [57440, 133460], [57441, 147436], [21299, 57442], 0,
-    [57444, 134114], [27851, 57445], [57446, 136998], [26651, 57447],
-    [29653, 57448], [24650, 57449], [16042, 57450], [14540, 57451],
-    [57452, 136936], [29149, 57453], [17570, 57454], [21357, 57455],
-    [21364, 57456], [57457, 165547], [21374, 57458], 0, [57460, 136598],
-    [57461, 136723], [30694, 57462], [21395, 57463], [57464, 166555],
-    [21408, 57465], [21419, 57466], [21422, 57467], [29607, 57468],
-    [57469, 153458], [16217, 57470], [29596, 57471], [21441, 57472],
-    [21445, 57473], [27721, 57474], [20041, 57475], [22526, 57476],
-    [21465, 57477], [15019, 57478], [57479, 134031], [21472, 57480],
-    [57481, 147435], [57482, 142755], [21494, 57483], [57484, 134263],
-    [21523, 57485], [28793, 57486], [21803, 57487], [26199, 57488],
-    [27995, 57489], [21613, 57490], [57491, 158547], [57492, 134516],
-    [21853, 57493], [21647, 57494], [21668, 57495], [18342, 57496],
-    [57497, 136973], [57498, 134877], [15796, 57499], [57500, 134477],
-    [57501, 166332], [57502, 140952], [21831, 57503], [19693, 57504],
-    [21551, 57505], [29719, 57506], [21894, 57507], [21929, 57508], 0,
-    [57510, 137431], [57511, 147514], [17746, 57512], [57513, 148533],
-    [26291, 57514], [57515, 135348], [22071, 57516], [26317, 57517],
-    [57518, 144010], [26276, 57519], 0, [22093, 57521], [22095, 57522],
-    [30961, 57523], [22257, 57524], [38791, 57525], [21502, 57526],
-    [22272, 57527], [22255, 57528], [22253, 57529], [57530, 166758],
-    [13859, 57531], [57532, 135759], [22342, 57533], [57534, 147877],
-    [27758, 57535], [28811, 57536], [22338, 57537], [14001, 57538],
-    [57539, 158846], [22502, 57540], [57541, 136214], [22531, 57542],
-    [57543, 136276], [57544, 148323], [22566, 57545], [57546, 150517], 0,
-    [22698, 57548], [13665, 57549], [22752, 57550], [22748, 57551],
-    [57552, 135740], [22779, 57553], [23551, 57554], [22339, 57555],
-    [57556, 172368], [57557, 148088], [37843, 57558], [13729, 57559],
-    [22815, 57560], [26790, 57561], [14019, 57562], [28249, 57563],
-    [57564, 136766], [23076, 57565], 0, [57567, 136850], [34053, 57568],
-    [22985, 57569], [57570, 134478], [57571, 158849], [57572, 159018],
-    [57573, 137180], [23001, 57574], [57575, 137211], [57576, 137138],
-    [57577, 159142], [28017, 57578], [57579, 137256], [57580, 136917],
-    [23033, 57581], [57582, 159301], [23211, 57583], [23139, 57584],
-    [14054, 57585], [57586, 149929], 0, [14088, 57588], [23190, 57589],
-    [29797, 57590], [23251, 57591], [57592, 159649], [57593, 140628],
-    [57595, 137489], [14130, 57596], [57597, 136888], [24195, 57598],
-    [21200, 57599], [23414, 57600], [25992, 57601], [23420, 57602],
-    [57603, 162318], [16388, 57604], [18525, 57605], [57606, 131588],
-    [23509, 57607], [57609, 137780], [57610, 154060], [57611, 132517],
-    [23539, 57612], [23453, 57613], [19728, 57614], [23557, 57615],
-    [57616, 138052], [23571, 57617], [29646, 57618], [23572, 57619],
-    [57620, 138405], [57621, 158504], [23625, 57622], [18653, 57623],
-    [23685, 57624], [23785, 57625], [23791, 57626], [23947, 57627],
-    [57628, 138745], [57629, 138807], [23824, 57630], [23832, 57631],
-    [23878, 57632], [57633, 138916], [23738, 57634], [24023, 57635],
-    [33532, 57636], [14381, 57637], [57638, 149761], [57639, 139337],
-    [57640, 139635], [33415, 57641], [14390, 57642], [15298, 57643],
-    [24110, 57644], [27274, 57645], 0, 57647, [57648, 148668], [57649, 134355],
-    [21414, 57650], [20151, 57651], 0, [21416, 57653], [57654, 137073],
-    [24073, 57655], 57656, [57657, 164994], [24313, 57658], [24315, 57659],
-    [14496, 57660], [24316, 57661], [26686, 57662], [37915, 57663],
-    [24333, 57664], [57665, 131521], [57666, 194708], [15070, 57667],
-    [57669, 135994], [24378, 57670], [57671, 157832], [57672, 140240],
-    [57674, 140401], [24419, 57675], [57677, 159342], [24434, 57678],
-    [37696, 57679], [57680, 166454], [24487, 57681], [23990, 57682],
-    [15711, 57683], [57684, 152144], [57685, 139114], [57686, 159992],
-    [57687, 140904], [37334, 57688], [57689, 131742], [57690, 166441],
-    [24625, 57691], [26245, 57692], [14691, 57694], [15815, 57695],
-    [13881, 57696], [22416, 57697], [57698, 141236], [31089, 57699],
-    [15936, 57700], [24734, 57701], 0, 0, [57704, 149890], [57705, 149903],
-    [57706, 162387], [29860, 57707], [20705, 57708], [23200, 57709],
-    [24932, 57710], [24898, 57712], [57713, 194726], [57714, 159442],
-    [24961, 57715], [20980, 57716], [57717, 132694], [24967, 57718],
-    [23466, 57719], [57720, 147383], [57721, 141407], [25043, 57722],
-    [57723, 166813], [57724, 170333], [25040, 57725], [14642, 57726],
-    [57727, 141696], [57728, 141505], [24611, 57729], [24924, 57730],
-    [25886, 57731], [25483, 57732], [57733, 131352], [25285, 57734],
-    [57735, 137072], [25301, 57736], [57737, 142861], [25452, 57738],
-    [57739, 149983], [14871, 57740], [25656, 57741], [25592, 57742],
-    [57743, 136078], [57744, 137212], [28554, 57746], [57747, 142902], 0,
-    [57750, 153373], [25825, 57751], [25829, 57752], [38011, 57753],
-    [14950, 57754], [25658, 57755], [14935, 57756], [25933, 57757],
-    [28438, 57758], [57759, 150056], [57760, 150051], [25989, 57761],
-    [25965, 57762], [25951, 57763], 0, [26037, 57765], [57766, 149824],
-    [19255, 57767], [26065, 57768], [16600, 57769], [57770, 137257], 57771,
-    [26083, 57772], [24543, 57773], [57774, 144384], [26136, 57775],
-    [57776, 143863], [57777, 143864], [26180, 57778], [57779, 143780],
-    [57780, 143781], [26187, 57781], [57782, 134773], [26215, 57783],
-    [57784, 152038], [26227, 57785], 0, [57788, 143921], [57789, 165364],
-    [57790, 143816], [57791, 152339], [30661, 57792], [57793, 141559],
-    [39332, 57794], [26370, 57795], [57796, 148380], [57797, 150049],
-    [27130, 57799], [57800, 145346], 0, [26471, 57802], [26466, 57803],
-    [57804, 147917], [57805, 168173], [26583, 57806], [17641, 57807],
-    [26658, 57808], [28240, 57809], [37436, 57810], [26625, 57811],
-    [57812, 144358], [57813, 159136], [26717, 57814], [57815, 144495],
-    [27105, 57816], [27147, 57817], [57818, 166623], [26995, 57819],
-    [26819, 57820], [57821, 144845], [26881, 57822], [26880, 57823],
-    [14849, 57825], [57826, 144956], [15232, 57827], [26540, 57828],
-    [26977, 57829], [57830, 166474], [17148, 57831], [26934, 57832],
-    [27032, 57833], [15265, 57834], [57835, 132041], [33635, 57836],
-    [20624, 57837], [27129, 57838], [57839, 144985], [57840, 139562],
-    [27205, 57841], [57842, 145155], [27293, 57843], [15347, 57844],
-    [26545, 57845], [27336, 57846], [57847, 168348], [15373, 57848],
-    [27421, 57849], [57850, 133411], [24798, 57851, 60308], [27445, 57852],
-    [27508, 57853], [57854, 141261], [28341, 57855], [57856, 146139], 0,
-    [57858, 137560], [14144, 57859], [21537, 57860], [57861, 146266],
-    [27617, 57862], [57863, 147196], [27612, 57864], [27703, 57865],
-    [57866, 140427], [57867, 149745], [57868, 158545], [27738, 57869],
-    [33318, 57870], [27769, 57871], [57872, 146876], [17605, 57873],
-    [57874, 146877], [57875, 147876], [57876, 149772], [57877, 149760],
-    [57878, 146633], [14053, 57879], [15595, 57880], [57881, 134450],
-    [39811, 57882], [57883, 143865], [57884, 140433], [32655, 57885],
-    [26679, 57886], [57887, 159013], [57888, 159137], [57889, 159211],
-    [28054, 57890], [27996, 57891], [28284, 57892], [28420, 57893],
-    [57894, 149887], [57895, 147589], [57896, 159346], [34099, 57897],
-    [57898, 159604], [20935, 57899], 0, 0, [33838, 57902], [57903, 166689], 0,
-    [57905, 146991], [29779, 57906], [57907, 147330], [31180, 57908],
-    [28239, 57909], [23185, 57910], [57911, 143435], [28664, 57912],
-    [14093, 57913], [28573, 57914], [57915, 146992], [28410, 57916],
-    [57917, 136343], [57918, 147517], [17749, 57919], [37872, 57920],
-    [28484, 57921], [28508, 57922], [15694, 57923], [28532, 57924],
-    [57925, 168304], [15675, 57926], [28575, 57927], [57928, 147780],
-    [28627, 57929], [57930, 147601], [57931, 147797], [57932, 147513],
-    [57933, 147440], [57934, 147380], [57935, 147775], [20959, 57936],
-    [57937, 147798], [57938, 147799], [57939, 147776], [57940, 156125],
-    [28747, 57941], [28798, 57942], [28839, 57943], 0, [28876, 57945],
-    [28885, 57946], [28886, 57947], [28895, 57948], [16644, 57949],
-    [15848, 57950], [29108, 57951], [29078, 57952], [57953, 148087],
-    [28971, 57954], [28997, 57955], [23176, 57956], [29002, 57957], 0,
-    [57960, 148325], [29007, 57961], [37730, 57962], [57963, 148161],
-    [28972, 57964], [57965, 148570], [57966, 150055], [57967, 150050],
-    [29114, 57968], [57969, 166888], [28861, 57970], [29198, 57971],
-    [37954, 57972], [29205, 57973], [22801, 57974], [37955, 57975],
-    [29220, 57976], [37697, 57977], [57978, 153093], [29230, 57979],
-    [29248, 57980], [57981, 149876], [26813, 57982], [29269, 57983],
-    [29271, 57984], [15957, 57985], [57986, 143428], [26637, 57987],
-    [28477, 57988], [29314, 57989], 0, [29483, 57991], [57992, 149539],
-    [57993, 165931], [18669, 57994], [57995, 165892], [29480, 57996],
-    [29486, 57997], [29647, 57998], [29610, 57999], [58000, 134202],
-    [58001, 158254], [29641, 58002], [29769, 58003], [58004, 147938],
-    [58005, 136935], [58006, 150052], [26147, 58007], [14021, 58008],
-    [58009, 149943], [58010, 149901], [58011, 150011], [29687, 58012],
-    [29717, 58013], [26883, 58014], [58015, 150054], [29753, 58016],
-    [16087, 58018], 0, [58020, 141485], [29792, 58021], [58022, 167602],
-    [29767, 58023], [29668, 58024], [29814, 58025], [33721, 58026],
-    [29804, 58027], [29812, 58029], [37873, 58030], [27180, 58031],
-    [29826, 58032], [18771, 58033], [58034, 150156], [58035, 147807],
-    [58036, 150137], [58037, 166799], [23366, 58038], [58039, 166915],
-    [58040, 137374], [29896, 58041], [58042, 137608], [29966, 58043],
-    [29982, 58045], [58046, 167641], [58047, 137803], [23511, 58048],
-    [58049, 167596], [37765, 58050], [30029, 58051], [30026, 58052],
-    [30055, 58053], [30062, 58054], [58055, 151426], [16132, 58056],
-    [58057, 150803], [30094, 58058], [29789, 58059], [30110, 58060],
-    [30132, 58061], [30210, 58062], [30252, 58063], [30289, 58064],
-    [30287, 58065], [30319, 58066], 58067, [58068, 156661], [30352, 58069],
-    [33263, 58070], [14328, 58071], [58072, 157969], [58073, 157966],
-    [30369, 58074], [30373, 58075], [30391, 58076], [30412, 58077],
-    [58078, 159647], [33890, 58079], [58080, 151709], [58081, 151933],
-    [58082, 138780], [30494, 58083], [30502, 58084], [30528, 58085],
-    [25775, 58086], [58087, 152096], [30552, 58088], [58089, 144044],
-    [30639, 58090], [58091, 166244], [58092, 166248], [58093, 136897],
-    [30708, 58094], 0, [26826, 58098], [30895, 58099], [30919, 58100],
-    [30931, 58101], [38565, 58102], [31022, 58103], [58104, 153056],
-    [30935, 58105], [31028, 58106], [30897, 58107], [58108, 161292],
-    [36792, 58109], [34948, 58110], [58113, 140828], [31110, 58114],
-    [35072, 58115], [26882, 58116], [31104, 58117], [58118, 153687],
-    [31133, 58119], [58120, 162617], [31036, 58121], [31145, 58122],
-    [28202, 58123], [58124, 160038], [16040, 58125], [31174, 58126],
-    [58127, 168205], [31188, 58128], 0, [21797, 62526], 0, [62528, 134210],
-    [62529, 134421], [62530, 151851], [21904, 62531], [62532, 142534],
-    [14828, 62533], [62534, 131905], [36422, 62535], [62536, 150968],
-    [62537, 169189], 0, [62539, 164030], [30586, 62540], [62541, 142392],
-    [14900, 62542], [18389, 62543], [62544, 164189], [62545, 158194],
-    [62546, 151018], [25821, 62547], [62548, 134524], [62549, 135092],
-    [62550, 134357], 0, [25741, 62552], [36478, 62553], [62554, 134806], 0,
-    [62556, 135012], [62557, 142505], [62558, 164438], [62559, 148691], 0,
-    [62561, 134470], [62562, 170573], [62563, 164073], [18420, 62564],
-    [62565, 151207], [62566, 142530], [39602, 62567], [14951, 62568],
-    [62569, 169460], [16365, 62570], [13574, 62571], [62572, 152263],
-    [62573, 169940], 0, [62575, 142660], [40302, 62576], [38933, 62577], 0,
-    [17369, 62579], 0, [25780, 62581], [21731, 62582], 0, [62584, 142282], 0,
-    [14843, 62586], 0, [62588, 157402], [62589, 157462], [62590, 162208],
-    [25834, 62591], [62592, 151634], [62593, 134211], [36456, 62594], 0,
-    [62596, 166732], [62597, 132913], 0, [18443, 62599], [62600, 131497],
-    [16378, 62601], [22643, 62602], [62603, 142733], 0, [62605, 148936],
-    [62606, 132348], [62607, 155799], [62608, 134988], 0, [21881, 62610], 0,
-    [17338, 62612], 0, [19124, 62614], [62615, 141926], [62616, 135325],
-    [33194, 62617], [39157, 62618], [62619, 134556], [25465, 62620],
-    [14846, 62621], [62622, 141173], [36288, 62623], [22177, 62624],
-    [25724, 62625], [15939, 62626], 0, [62628, 173569], [62629, 134665],
-    [62630, 142031], 0, 0, [62633, 135368], [62634, 145858], [14738, 62635],
-    [14854, 62636], [62637, 164507], [13688, 62638], [62639, 155209],
-    [62640, 139463], 0, 0, [62643, 142514], [62644, 169760], [13500, 62645],
-    [27709, 62646], [62647, 151099], 0, 0, [62650, 161140], [62651, 142987],
-    [62652, 139784], [62653, 173659], [62654, 167117], [62655, 134778],
-    [62656, 134196], [62683, 161337], [62684, 142286], [62687, 142417],
-    [14872, 62689], [62691, 135367], [62693, 173618], [62695, 167122],
-    [62696, 167321], [62697, 167114], [38314, 62698], 0, [62706, 161630],
-    [28992, 62708], 0, [20822, 62385], 0, [20616, 62487], 0, [13459, 62489],
-    [20870, 62491], [24130, 63037], [20997, 62495], [21031, 62436],
-    [21113, 62497], 0, [13651, 62504], [21442, 62505], [21343, 62715], 0,
-    [21823, 62520], 0, [21976, 59986], [13789, 62722], [22049, 63067], 0,
-    [22100, 60044], [60148, 135291], 0, [60153, 135379], 0, [61095, 135934], 0,
-    0, [14265, 60104], [23745, 61099], [23829, 63066], [23894, 63030],
-    [14392, 63036], [20097, 62477], [24253, 63038], [14612, 63042],
-    [25017, 63050], [25232, 63054], [25368, 63056], [25690, 63063],
-    [25745, 62381], [33133, 62709], [33156, 59922], [33171, 59924],
-    [26624, 63080], [15292, 63093], [29327, 60517], [29389, 59781], 0,
-    [29497, 59785], [30018, 59811], [30172, 59817], [16320, 59818],
-    [60278, 151205], [16343, 59820], 0, 30336, [30348, 59824, 151388],
-    [16552, 59845], [30777, 59846], [16643, 59855], [31377, 59863],
-    [31771, 59876], [31981, 59884], [32659, 62658], [32686, 59892], 0,
-    [33535, 59936], [22623, 59981], [34482, 59960], 0, [34699, 59963],
-    [35143, 59969], 0, [35369, 59972], 0, [36465, 59988], [60484, 164233],
-    [36528, 59990], 0, [37214, 62443], [37260, 62441], [39182, 60051],
-    [39196, 60054], 0, 0, [39809, 60066], [40384, 60080], [40339, 60078],
-    [40620, 60085], [19857, 60540], 0, 37818, [40571, 60084], [28809, 63148],
-    [29512, 59788], 0, [31129, 59858], [36791, 59997], 0, [39234, 60056],
-    {s: 193}, 8364, {s: 4}, [12443, 63518], [12444, 63519], [11904, 63520],
-    {f: 5, c: 62211}, [62216, 131340], 62217, [62218, 131281], [62219, 131277],
-    {f: 2, c: 62220}, [62222, 131275], [62223, 139240], 62224, [62225, 131274],
-    {f: 4, c: 62226}, [62230, 131342], {f: 2, c: 62231}, {f: 2, c: 62776},
-    [62778, 138177], [62779, 194680], [12205, 38737, 62780], [62781, 131206],
-    [20059, 62782], [20155, 62783], [13630, 62784], [23587, 62785],
-    [24401, 62786], [24516, 62787], [14586, 62788], [25164, 62789],
-    [25909, 62790], [27514, 62791], [27701, 62792], [27706, 62793],
-    [28780, 62794], [29227, 62795], [20012, 62796], [29357, 62797],
-    [62798, 149737], [32594, 62799], [31035, 62800], [31993, 62801],
-    [32595, 62802], [62803, 156266], [13505, 62804], [62806, 156491],
-    [32770, 62807], [32896, 62808], [62809, 157202], [62810, 158033],
-    [21341, 62811], [34916, 62812], [35265, 62813], [62814, 161970],
-    [35744, 62815], [36125, 62816], [38021, 62817], [38264, 62818],
-    [38271, 62819], [38376, 62820], [62821, 167439], [38886, 62822],
-    [39029, 62823], [39118, 62824], [39134, 62825], [39267, 62826],
-    [62827, 170000], [40060, 62828], [40479, 62829], [40644, 62830],
-    [27503, 62831], [62832, 63751], [20023, 62833], [62834, 131207],
-    [38429, 62835], [25143, 62836], [38050, 62837], [11908, 63521],
-    [11910, 63522], [11911, 63523], [11912, 63524], [11914, 63525],
-    [11916, 63526], [11917, 63527], [11925, 63528], [11932, 63529],
-    [11941, 63531], [11943, 63532], [11946, 63533], [11948, 63534],
-    [11950, 63535], [11958, 63536], [11964, 63537], [11966, 63538],
-    [11978, 63540], [11980, 63541], [11981, 63542], [11983, 63543],
-    [11990, 63544], [11991, 63545], [11998, 63546], [62368, 172969],
-    [62369, 135493], [25866, 62371], [20029, 62374], [28381, 62375],
-    [40270, 62376], [37343, 62377], [62380, 161589], [20250, 62382],
-    [20264, 62383], [20392, 62384], [20852, 62386], [20892, 62387],
-    [20964, 62388], [21153, 62389], [21160, 62390], [21307, 62391],
-    [21326, 62392], [21457, 62393], [21464, 62394], [22242, 62395],
-    [22768, 62396], [22788, 62397], [22791, 62398], [22834, 62399],
-    [22836, 62400], [23398, 62401], [23454, 62402], [23455, 62403],
-    [23706, 62404], [24198, 62405], [24635, 62406], [25993, 62407],
-    [26622, 62408], [26628, 62409], [26725, 62410], [27982, 62411],
-    [28860, 62412], [30005, 62413], [32420, 62414], [32428, 62415],
-    [32442, 62416], [32455, 62417], [32463, 62418], [32479, 62419],
-    [32518, 62420], [32567, 62421], [33402, 62422], [33487, 62423],
-    [33647, 62424], [35270, 62425], [35774, 62426], [35810, 62427],
-    [36710, 62428], [36711, 62429], [36718, 62430], [29713, 62431],
-    [31996, 62432], [32205, 62433], [26950, 62434], [31433, 62435],
-    [30904, 62442], [32956, 62444], [36107, 62446], [33014, 62447],
-    [62448, 133607], [32927, 62451], [40647, 62452], [19661, 62453],
-    [40393, 62454], [40460, 62455], [19518, 62456], [62457, 171510],
-    [62458, 159758], [40458, 62459], [62460, 172339], [13761, 62461],
-    [28314, 62463], [33342, 62464], [29977, 62465], [18705, 62467],
-    [39532, 62468], [39567, 62469], [40857, 62470], [31111, 62471],
-    [62472, 164972], [62473, 138698], [62474, 132560], [62475, 142054],
-    [20004, 62476], [20096, 62478], [20103, 62479], [20159, 62480],
-    [20203, 62481], [20279, 62482], [13388, 62483], [20413, 62484],
-    [15944, 62485], [20483, 62486], [13437, 62488], [13477, 62490],
-    [22789, 62492], [20955, 62493], [20988, 62494], [20105, 62496],
-    [21136, 62498], [21287, 62499], [13767, 62500], [21417, 62501],
-    [13649, 62502], [21424, 62503], [21539, 62506], [13677, 62507],
-    [13682, 62508], [13953, 62509], [21651, 62510], [21667, 62511],
-    [21684, 62512], [21689, 62513], [21712, 62514], [21743, 62515],
-    [21784, 62516], [21795, 62517], [21800, 62518], [13720, 62519],
-    [13733, 62521], [13759, 62522], [21975, 62523], [13765, 62524],
-    [62525, 163204], [16467, 62538], [62551, 135412], [62555, 134155],
-    [62574, 161992], [62580, 155813], [62583, 142668], [62585, 135287],
-    [62587, 135279], [62595, 139681], [62609, 134550], [16571, 62611],
-    [62631, 142537], [22098, 62641], [62642, 134961], [62657, 157724],
-    [62659, 135375], [62660, 141315], [62661, 141625], [13819, 62662],
-    [62663, 152035], [62664, 134796], [62665, 135053], [62666, 134826],
-    [16275, 62667], [62668, 134960], [62669, 134471], [62670, 135503],
-    [62671, 134732], [62673, 134827], [62674, 134057], [62675, 134472],
-    [62676, 135360], [62677, 135485], [16377, 62678], [62679, 140950],
-    [25650, 62680], [62681, 135085], [62682, 144372], [62685, 134526],
-    [62686, 134527], [62688, 142421], [62690, 134808], [62692, 134958],
-    [62694, 158544], [21708, 62699], [33476, 62700], [21945, 62701],
-    [62703, 171715], [39974, 62704], [39606, 62705], [62707, 142830],
-    [33004, 62710], [23580, 62711], [62712, 157042], [33076, 62713],
-    [14231, 62714], [62716, 164029], [37302, 62717], [62718, 134906],
-    [62719, 134671], [62720, 134775], [62721, 134907], [62723, 151019],
-    [13833, 62724], [62725, 134358], [22191, 62726], [62727, 141237],
-    [62728, 135369], [62729, 134672], [62730, 134776], [62731, 135288],
-    [62732, 135496], [62733, 164359], [62734, 136277], [62735, 134777],
-    [62736, 151120], [62737, 142756], [23124, 62738], [62739, 135197],
-    [62740, 135198], [62741, 135413], [62742, 135414], [22428, 62743],
-    [62744, 134673], [62745, 161428], [62746, 164557], [62747, 135093],
-    [62748, 134779], [62749, 151934], [14083, 62750], [62751, 135094],
-    [62752, 135552], [62753, 152280], [62754, 172733], [62755, 149978],
-    [62756, 137274], [62757, 147831], [62758, 164476], [22681, 62759],
-    [21096, 62760], [13850, 62761], [62762, 153405], [31666, 62763],
-    [23400, 62764], [18432, 62765], [19244, 62766], [40743, 62767],
-    [18919, 62768], [39967, 62769], [39821, 62770], [62771, 154484],
-    [62772, 143677], [22011, 62773], [13810, 62774], [22153, 62775],
-    [23870, 63028], [23880, 63029], [15868, 63031], [14351, 63032],
-    [23972, 63033], [23993, 63034], [14368, 63035], [24357, 63039],
-    [24451, 63040], [14600, 63041], [14655, 63043], [14669, 63044],
-    [24791, 63045], [24893, 63046], [23781, 63047], [14729, 63048],
-    [25015, 63049], [25039, 63051], [14776, 63052], [25132, 63053],
-    [25317, 63055], [14840, 63057], [22193, 63058], [14851, 63059],
-    [25570, 63060], [25595, 63061], [25607, 63062], [14923, 63064],
-    [25792, 63065], [40863, 63068], [14999, 63069], [25990, 63070],
-    [15037, 63071], [26111, 63072], [26195, 63073], [15090, 63074],
-    [26258, 63075], [15138, 63076], [26390, 63077], [15170, 63078],
-    [26532, 63079], [15192, 63081], [26698, 63082], [26756, 63083],
-    [15218, 63084], [15217, 63085], [15227, 63086], [26889, 63087],
-    [26947, 63088], [29276, 63089], [26980, 63090], [27039, 63091],
-    [27013, 63092], [27094, 63094], [15325, 63095], [27237, 63096],
-    [27252, 63097], [27249, 63098], [27266, 63099], [15340, 63100],
-    [27289, 63101], [15346, 63102], [27307, 63103], [27317, 63104],
-    [27348, 63105], [27382, 63106], [27521, 63107], [27585, 63108],
-    [27626, 63109], [27765, 63110], [27818, 63111], [15563, 63112],
-    [27906, 63113], [27910, 63114], [27942, 63115], [28033, 63116],
-    [15599, 63117], [28068, 63118], [28081, 63119], [28181, 63120],
-    [28184, 63121], [28201, 63122], [28294, 63123], [63124, 166336],
-    [28347, 63125], [28386, 63126], [28378, 63127], [40831, 63128],
-    [28392, 63129], [28393, 63130], [28452, 63131], [28468, 63132],
-    [15686, 63133], [63134, 147265], [28545, 63135], [28606, 63136],
-    [15722, 63137], [15733, 63138], [29111, 63139], [23705, 63140],
-    [15754, 63141], [28716, 63142], [15761, 63143], [28752, 63144],
-    [28756, 63145], [28783, 63146], [28799, 63147], [63149, 131877],
-    [17345, 63150], [13809, 63151], [63152, 134872], [13902, 58134],
-    [15789, 58172], [58173, 154725], [26237, 58183], [31860, 58188],
-    [29837, 58197], [32402, 58215], [17667, 58232], [58260, 151480],
-    [58270, 133901], [58277, 158474], [13438, 58311], [58317, 143087],
-    [58325, 146613], [58343, 159385], [34673, 58364], [25537, 58385],
-    [30583, 58387], [35210, 58390], [58406, 147343], [35660, 58415],
-    [58440, 150729], [18730, 58464], [58471, 172052], [58472, 165564],
-    [58473, 165121], [15088, 58490], [28815, 58511], [58529, 140922],
-    [58637, 158120], [58646, 148043], [26760, 58662], [58664, 139611],
-    [40802, 58702], [37830, 58793], [58802, 131967], [37734, 58888],
-    [37519, 58901], [34324, 58954], [58986, 173147], [16784, 59010],
-    [26511, 59045], [26654, 59048], [14435, 59051], [59077, 149996],
-    [15129, 59128], [33942, 59176], [59241, 149858], [14818, 59254],
-    [33920, 59259], [17262, 59328], [38769, 59402], [39323, 59427],
-    [18733, 59499], [28439, 59703], [59704, 160009], [28838, 59746],
-    [59752, 150095], [32357, 59753], [23855, 59755], [15859, 59756],
-    [59758, 150109], [59759, 137183], [32164, 59760], [33830, 59761],
-    [21637, 59762], [59763, 146170], [59765, 131604], [22398, 59766],
-    [59767, 133333], [59768, 132633], [16357, 59769], [59770, 139166],
-    [59771, 172726], [28675, 59772], [59773, 168283], [23920, 59774],
-    [29583, 59775], [59777, 166489], [59778, 168992], [20424, 59779],
-    [32743, 59780], [29456, 59782], [29496, 59784], [29505, 59787],
-    [16041, 59789], [29173, 59792], [59793, 149746], [29665, 59794],
-    [16074, 59796], [16081, 59798], [29721, 59801], [29726, 59802],
-    [29727, 59803], [16098, 59804], [16112, 59805], [16116, 59806],
-    [16122, 59807], [29907, 59808], [16142, 59809], [16211, 59810],
-    [30061, 59812], [30066, 59813], [30093, 59814], [16252, 59815],
-    [30152, 59816], [30285, 59819], [30324, 59821], [16348, 59822],
-    [30330, 59823], [29064, 59825], [22051, 59826], [35200, 59827],
-    [16413, 59829], [30531, 59830], [16441, 59831], [16453, 59833],
-    [13787, 59834], [30616, 59835], [16490, 59836], [16495, 59837],
-    [30654, 59839], [30667, 59840], [30744, 59842], [30748, 59844],
-    [30791, 59847], [30801, 59848], [30822, 59849], [33864, 59850],
-    [59851, 152885], [31027, 59852], [31026, 59854], [16649, 59856],
-    [31121, 59857], [31238, 59860], [16743, 59862], [16818, 59864],
-    [31420, 59865], [33401, 59866], [16836, 59867], [31439, 59868],
-    [31451, 59869], [16847, 59870], [31586, 59872], [31596, 59873],
-    [31611, 59874], [31762, 59875], [16992, 59877], [17018, 59878],
-    [31867, 59879], [31900, 59880], [17036, 59881], [31928, 59882],
-    [17044, 59883], [36755, 59885], [28864, 59886], [59887, 134351],
-    [32207, 59888], [32212, 59889], [32208, 59890], [32253, 59891],
-    [32692, 59893], [29343, 59894], [17303, 59895], [32800, 59896],
-    [32805, 59897], [32814, 59899], [32817, 59900], [32852, 59901],
-    [22452, 59903], [28832, 59904], [32951, 59905], [33001, 59906],
-    [17389, 59907], [33036, 59908], [33038, 59910], [33042, 59911],
-    [33044, 59913], [17409, 59914], [15161, 59915], [33110, 59916],
-    [33113, 59917], [33114, 59918], [17427, 59919], [33148, 59921],
-    [17445, 59923], [17453, 59925], [33189, 59926], [22511, 59927],
-    [33217, 59928], [33252, 59929], [33364, 59930], [17551, 59931],
-    [33398, 59933], [33482, 59934], [33496, 59935], [17584, 59937],
-    [33623, 59938], [38505, 59939], [33797, 59941], [28917, 59942],
-    [33892, 59943], [33928, 59945], [17668, 59946], [33982, 59947],
-    [34017, 59948], [34040, 59949], [34064, 59950], [34104, 59951],
-    [34130, 59952], [17723, 59953], [34159, 59954], [34160, 59955],
-    [34272, 59956], [17783, 59957], [34418, 59958], [34450, 59959],
-    [34543, 59961], [38469, 59962], [17926, 59964], [17943, 59965],
-    [34990, 59966], [35071, 59967], [35108, 59968], [35217, 59970],
-    [59971, 162151], [35384, 59973], [35476, 59974], [35508, 59975],
-    [35921, 59976], [36052, 59977], [36082, 59978], [36124, 59979],
-    [18328, 59980], [36291, 59982], [18413, 59983], [36410, 59985],
-    [22356, 59987], [22005, 59989], [18487, 59991], [36558, 59992],
-    [36578, 59993], [36580, 59994], [36589, 59995], [36594, 59996],
-    [36801, 59998], [36810, 59999], [36812, 60000], [36915, 60001],
-    [18605, 60003], [39136, 60004], [37395, 60005], [18718, 60006],
-    [37416, 60007], [37464, 60008], [37483, 60009], [37553, 60010],
-    [37550, 60011], [37567, 60012], [37603, 60013], [37611, 60014],
-    [37619, 60015], [37620, 60016], [37629, 60017], [37699, 60018],
-    [37764, 60019], [37805, 60020], [18757, 60021], [18769, 60022],
-    [37911, 60024], [37917, 60026], [37933, 60027], [37950, 60028],
-    [18794, 60029], [37972, 60030], [38009, 60031], [38189, 60032],
-    [38306, 60033], [18855, 60034], [38388, 60035], [38451, 60036],
-    [18917, 60037], [18980, 60039], [38720, 60040], [18997, 60041],
-    [38834, 60042], [38850, 60043], [19172, 60045], [39097, 60047],
-    [19225, 60048], [39153, 60049], [22596, 60050], [39193, 60052],
-    [39223, 60055], [39261, 60057], [39266, 60058], [19312, 60059],
-    [39365, 60060], [19357, 60061], [39484, 60062], [39695, 60063],
-    [39785, 60065], [39901, 60067], [39921, 60068], [39924, 60069],
-    [19565, 60070], [39968, 60071], [14191, 60072], [60073, 138178],
-    [40265, 60074], [40702, 60076], [22096, 60077], [40381, 60079],
-    [40444, 60081], [38134, 60082], [36790, 60083], [40625, 60086],
-    [40637, 60087], [40646, 60088], [38108, 60089], [40674, 60090],
-    [40689, 60091], [40696, 60092], [40772, 60094], [60095, 131220],
-    [60096, 131767], [60097, 132000], [38083, 60099], [60101, 132311],
-    [38081, 60103], [60105, 132565], [60106, 132629], [60107, 132726],
-    [60108, 136890], [22359, 60109], [29043, 60110], [60111, 133826],
-    [60112, 133837], [60113, 134079], [60115, 194619], [60116, 134091],
-    [21662, 60117], [60118, 134139], [60119, 134203], [60120, 134227],
-    [60121, 134245], [60122, 134268], [60124, 134285], [60126, 134325],
-    [60127, 134365], [60128, 134381], [60129, 134511], [60130, 134578],
-    [60131, 134600], [60135, 134660], [60136, 134670], [60137, 134871],
-    [60138, 135056], [60139, 134957], [60140, 134771], [60142, 135100],
-    [60144, 135260], [60145, 135247], [60146, 135286], [60149, 135304],
-    [60150, 135318], [13895, 60151], [60152, 135359], [60154, 135471],
-    [60155, 135483], [21348, 60156], [60158, 135907], [60159, 136053],
-    [60160, 135990], [60162, 136567], [60163, 136729], [60164, 137155],
-    [60165, 137159], [28859, 60167], [60168, 137261], [60169, 137578],
-    [60170, 137773], [60171, 137797], [60172, 138282], [60173, 138352],
-    [60174, 138412], [60175, 138952], [60177, 138965], [60178, 139029],
-    [29080, 60179], [60181, 139333], [27113, 60182], [14024, 60183],
-    [60184, 139900], [60185, 140247], [60186, 140282], [60187, 141098],
-    [60188, 141425], [60189, 141647], [60191, 141671], [60192, 141715],
-    [60193, 142037], [60195, 142056], [60197, 142094], [60199, 142143],
-    [60202, 142412], [60204, 142472], [60205, 142519], [60206, 154600],
-    [60207, 142600], [60208, 142610], [60209, 142775], [60210, 142741],
-    [60211, 142914], [60212, 143220], [60213, 143308], [60214, 143411],
-    [60215, 143462], [60216, 144159], [60217, 144350], [60222, 144743],
-    [60223, 144883], [60227, 144922], [60228, 145174], [22709, 60231],
-    [60234, 146087], [60237, 146961], [60238, 147129], [60243, 147737],
-    [60245, 148206], [60246, 148237], [60248, 148276], [60249, 148374],
-    [60258, 148484], [60259, 148694], [22408, 60260], [60261, 149108],
-    [60263, 149295], [60271, 149522], [60272, 149755], [60273, 150037],
-    [60275, 150208], [22885, 60277], [60279, 151430], [60282, 151596],
-    [22335, 60284], [60286, 152217], [60287, 152601], [60291, 152646],
-    [60292, 152686], [60296, 152895], [60298, 152926], [60300, 152930],
-    [60301, 152934], [60302, 153543], [60304, 153693], [60309, 153859],
-    [60312, 154286], [60313, 154505], [60314, 154630], [22433, 60316],
-    [29009, 60317], [60319, 155906], [60322, 156082], [60325, 156674],
-    [60326, 156746], [60330, 156804], [60334, 156808], [60336, 156946],
-    [60338, 157119], [60339, 157365], [22201, 60347], [60349, 157436],
-    [13848, 60355], [60357, 157593], [60358, 157806], [60360, 157790],
-    [60362, 157895], [60366, 157990], [60368, 158009], [60371, 158202],
-    [60373, 158253], [60378, 158260], [60379, 158555], [60383, 158621],
-    [60385, 158884], [60388, 159150], [60392, 159819], [60393, 160205],
-    [60395, 160384], [60396, 160389], [60399, 160395], [60401, 160486],
-    [38047, 60404], [60405, 160848], [14009, 60416], [60424, 161740],
-    [60425, 161880], [22230, 60426], [60435, 162269], [60441, 162301],
-    [60442, 162314], [60443, 162571], [60444, 163174], [60448, 163849],
-    [60459, 163875], [60463, 163912], [60466, 163971], [60479, 163984],
-    [60480, 164084], [60481, 164142], [60483, 164175], [60485, 164271],
-    [60486, 164378], [60487, 164614], [60488, 164655], [60489, 164746],
-    [60491, 164968], [60492, 165546], [25574, 60494], [60495, 166230],
-    [60498, 166328], [60500, 166375], [60502, 166376], [60503, 166726],
-    [60504, 166868], [60506, 166921], [60508, 167877], [60509, 168172],
-    [60511, 168208], [60512, 168252], [15863, 60513], [60514, 168286],
-    [60515, 150218], [36816, 60516], [60519, 169191], [60521, 169392],
-    [60522, 169400], [60523, 169778], [60524, 170193], [60525, 170313],
-    [60526, 170346], [60527, 170435], [60528, 170536], [60529, 170766],
-    [60530, 171354], [60531, 171419], [32415, 60532], [60533, 171768],
-    [60534, 171811], [19620, 60535], [38215, 60536], [60537, 172691],
-    [29090, 60538], [60539, 172799], [60542, 173515], [19868, 60543],
-    [60544, 134300], [36798, 60545], [36794, 60547], [60548, 140464],
-    [36793, 60549], [60550, 150163], [20202, 60555], [60557, 166700],
-    [36480, 60560], [60561, 137205], [60563, 166764], [60564, 166809],
-    [60566, 157359], [60568, 161365], [60570, 153141], [60571, 153942],
-    [20122, 60572], [60573, 155265], [60576, 134765], [60579, 147080],
-    [60580, 150686], [60583, 137206], [60584, 137339], [60587, 154698],
-    [60589, 152337], [15814, 60590], [60596, 155352], [19996, 60600],
-    [60601, 135146], [60602, 134473], [60603, 145082], [60638, 151880],
-    [21982, 60644], [34694, 60672], [60676, 135361], [60679, 149254],
-    [23440, 60680], [60682, 157843], [60684, 141044], [60685, 163119],
-    [60686, 147875], [60687, 163187], [60688, 159440], [60689, 160438],
-    [60691, 135641], [60693, 146684], [60694, 173737], [60695, 134828],
-    [60698, 138402], [60700, 151490], [60702, 135147], [60706, 142752],
-    [60710, 135148], [60711, 134666], [60714, 135149], [60717, 135559],
-    [19994, 60721], [19972, 60722], [23309, 60724], [13996, 60727],
-    [21373, 60729], [13989, 60730], [22682, 60732], [60733, 150382],
-    [22442, 60736], [60737, 154261], [60738, 133497], [60741, 140389],
-    [60746, 146686], [60747, 171824], [60749, 151465], [60750, 169374],
-    [60753, 146870], [60755, 157619], [60756, 145184], [60759, 147191],
-    [60760, 146988], [60785, 143578], [60789, 135849], [22439, 60790],
-    [60791, 149859], [60794, 159918], [60801, 137068], [60806, 160100],
-    [60809, 159010], [60810, 150242], [39963, 60837], [60838, 149822],
-    [15878, 60846], [60881, 159011], [60887, 132092], [60891, 146685],
-    [60893, 149785], [22394, 60904], [21722, 60912], [29050, 60928],
-    [60949, 150135], [60955, 166490], [60962, 194624], [60976, 137275],
-    [61000, 155993], [61014, 144373], [61019, 166850], [61024, 138566],
-    [61054, 159441], [13877, 61065], [61084, 166701], [21024, 61088],
-    [15384, 61089], [61090, 146631], [61091, 155351], [61092, 161366],
-    [61093, 152881], [61094, 137540], [61096, 170243], [61097, 159196],
-    [61098, 159917], [61100, 156077], [61101, 166415], [61102, 145015],
-    [61103, 131310], [61104, 157766], [61105, 151310], [17762, 61106],
-    [23327, 61107], [61108, 156492], [40784, 61109], [40614, 61110],
-    [61111, 156267], [20962, 57415], [21314, 57416], [26285, 57520],
-    [22620, 57547], [21843, 57566], [15749, 57594], [24928, 57608],
-    [18606, 57668], [38845, 57676], [57693, 137335], [24755, 57703],
-    [33828, 57711], [38932, 57748], [57749, 147596], [57764, 143486],
-    [57787, 138813], [15147, 57798], [15666, 57824], [57857, 132021],
-    [28801, 57944], [23708, 57959], [58017, 132547], [14128, 58028],
-    [58096, 136054], [58097, 150034], [58111, 166699], [58112, 155779],
-    [256, 62233], [193, 62234], [461, 62235], [192, 62236], [274, 62237],
-    [201, 62238], [282, 62239], [200, 62240], [332, 62241], [211, 62242],
-    [465, 62243], [210, 62244], 62245, [7870, 62246], 62247, [7872, 62248],
-    [202, 62249], [257, 62250], [225, 62251], [462, 62252], [224, 62253],
-    [593, 62254], [275, 62255], [233, 62256], [283, 62257], [232, 62258],
-    [299, 62259], [237, 62260], [464, 62261], [236, 62262], [333, 62263],
-    [243, 62264], [466, 62265], [242, 62266], [363, 62267], [250, 62268],
-    [468, 62269], [249, 62270], [470, 62271], [472, 62272], [474, 62273],
-    [476, 62274], [252, 62275], 62276, [7871, 62277], 62278, [7873, 62279],
-    [234, 62280], [609, 62281], [643, 63551], [592, 63552], [603, 63553],
-    [596, 63554], [629, 63555], [339, 63556], [248, 63557], [331, 63558],
-    [650, 63559], [618, 63560], {f: 2, c: 62282}, [11933, 63530],
-    [11974, 63539], [12003, 63547], 20539, 28158, [62841, 171123], 62842,
-    [15817, 62843], 34959, [62845, 147790], 28791, 23797, [19232, 62848],
-    [62849, 152013], [13657, 62850], [62851, 154928], 24866, [62853, 166450],
-    36775, 37366, 29073, 26393, 29626, [62859, 144001], [62860, 172295],
-    [15499, 62861], [62862, 137600], [19216, 62863], 30948, 29698, 20910,
-    [62867, 165647], [16393, 62868], 27235, [62870, 172730], [16931, 62871],
-    34319, 31274, [62875, 170311], [62876, 166634], 38741, 28749, 21284,
-    [62880, 139390], 37876, 30425, [62883, 166371], 62884, 30685, 20131, 20464,
-    20668, 20015, 20247, 62891, 21556, 32139, 22674, 22736, [62896, 138678],
-    24210, 24217, 24514, [62900, 141074], 25995, [62902, 144377], 26905, 27203,
-    [62905, 146531], 27903, 29184, [62909, 148741], 29580, [16091, 62911],
-    [62912, 150035], 23317, 29881, 35715, [62916, 154788], [62917, 153237],
-    31379, 31724, 31939, 32364, 33528, 34199, 62924, 34960, 62926, 36537,
-    62928, 36815, 34143, 39392, 37409, 62933, [62934, 167353], [62935, 136255],
-    [16497, 62936], [17058, 62937], 23066, 39016, 26475, [17014, 62944], 22333,
-    34262, [62948, 149883], 33471, [62950, 160013], [19585, 62951],
-    [62952, 159092], 23931, [62954, 158485], [62955, 159678], {f: 2, c: 62956},
-    23446, 62959, 32347],
-  'Adobe-GB1': [{f: 95, c: 32}, {f: 3, c: 12288}, [183, 12539], 713, 711, 168,
-    12291, 12293, 8212, 65374, 8214, [8230, 8943], {f: 2, c: 8216},
-    {f: 2, c: 8220}, {f: 2, c: 12308}, {f: 8, c: 12296}, {f: 2, c: 12310},
-    {f: 2, c: 12304}, 177, 215, 247, 8758, {f: 2, c: 8743}, 8721, 8719, 8746,
-    8745, 8712, 8759, 8730, 8869, 8741, 8736, 8978, 8857, 8747, 8750, 8801,
-    8780, 8776, 8765, 8733, 8800, {f: 2, c: 8814}, {f: 2, c: 8804}, 8734, 8757,
-    8756, 9794, 9792, 176, {f: 2, c: 8242}, 8451, 65284, 164, {f: 2, c: 65504},
-    8240, 167, 8470, 9734, 9733, 9675, 9679, 9678, 9671, 9670, 9633, 9632,
-    9651, 9650, 8251, 8594, {f: 2, c: 8592}, 8595, 12307, {f: 20, c: 9352},
-    {f: 20, c: 9332}, {f: 10, c: 9312}, {f: 10, c: 12832}, {f: 12, c: 8544},
-    {f: 3, c: 65281}, 65509, {f: 89, c: 65285}, 65507, {f: 83, c: 12353},
-    {f: 86, c: 12449}, {f: 17, c: 913}, {f: 7, c: 931}, {f: 17, c: 945},
-    {f: 7, c: 963}, {f: 7, c: 59277}, {f: 2, c: 65077}, {f: 2, c: 65081},
-    {f: 2, c: 65087}, {f: 2, c: 65085}, {f: 4, c: 65089}, {f: 2, c: 59284},
-    {f: 2, c: 65083}, {f: 2, c: 65079}, 65073, 59286, {f: 2, c: 65075},
-    {f: 6, c: 1040}, 1025, {f: 32, c: 1046}, 1105, {f: 26, c: 1078}, 257, 225,
-    462, 224, 275, 233, 283, 232, 299, 237, 464, 236, 333, 243, 466, 242, 363,
-    250, 468, 249, 470, 472, 474, 476, 252, 234, 593, 7743, 324, 328, 505, 609,
-    {f: 37, c: 12549}, 0, {f: 76, c: 9472}, {s: 126}, 21834, 38463, 22467,
-    25384, 21710, 21769, 21696, 30353, 30284, 34108, 30702, 33406, 30861,
-    29233, 38552, 38797, 27688, 23433, 20474, 25353, 26263, 23736, 33018,
-    26696, 32942, 26114, 30414, 20985, 25942, 29100, 32753, 34948, 20658,
-    22885, 25034, 28595, 33453, 25420, 25170, 21485, 21543, 31494,
-    [12043, 20843], 30116, 24052, 25300, 36299, 38774, 25226, 32793, 22365,
-    38712, 32610, 29240, [12137, 30333], 26575, 30334, 25670, 20336, 36133,
-    25308, 31255, 26001, 29677, 25644, 25203, 33324, 39041, 26495, 29256,
-    25198, 25292, 20276, 29923, 21322, 21150, 32458, 37030, 24110, 26758,
-    27036, 33152, 32465, 26834, 30917, 34444, 38225, 20621, 35876, 33502,
-    32990, 21253, 35090, 21093, 34180, 38649, 20445, 22561, 39281, 23453,
-    25265, 25253, 26292, 35961, 40077, 29190, 26479, 30865, 24754, 21329,
-    21271, 36744, 32972, 36125, 38049, 20493, 29384, 22791, 24811, 28953,
-    34987, 22868, 33519, 26412, 31528, 23849, 32503, 29997, 27893, 36454,
-    36856, 36924, [12240, 40763], [12112, 27604], 37145, 31508, 24444, 30887,
-    34006, 34109, 27605, 27609, 27606, 24065, 24199, 30201, 38381, 25949,
-    24330, 24517, 36767, 22721, 33218, 36991, 38491, 38829, 36793, 32534,
-    36140, 25153, 20415, 21464, 21342, {f: 2, c: 36776}, 36779, 36941, 26631,
-    24426, 33176, 34920, 40150, 24971, 21035, 30250, 24428, 25996, 28626,
-    28392, 23486, 25672, 20853, 20912, 26564, 19993, 31177, 39292, 28851,
-    30149, 24182, 29627, 33760, 25773, 25320, 38069, 27874, 21338, 21187,
-    25615, 38082, 31636, 20271, 24091, 33334, 33046, 33162, 28196, 27850,
-    39539, 25429, [12056, 21340], 21754, 34917, 22496, 19981, 24067, 27493,
-    31807, 37096, 24598, 25830, 29468, 35009, 26448, 25165, 36130, 30572,
-    36393, 37319, 24425, 33756, 34081, 39184, 21442, 34453, 27531, 24813,
-    24808, 28799, 33485, 33329, 20179, 27815, 34255, 25805, 31961, 27133,
-    26361, 33609, 21397, 31574, 20391, 20876, 27979, 23618, 36461, 25554,
-    21449, 33580, 33590, 26597, 30900, 25661, 23519, 23700, 24046, 35815,
-    25286, 26612, 35962, 25600, 25530, 34633, 39307, 35863, 32544, 38130,
-    20135, 38416, 39076, 26124, 29462, 22330, 23581, 24120, 38271, 20607,
-    32928, [12058, 21378], 25950, 30021, 21809, 20513, 36229, 25220, 38046,
-    26397, 22066, 28526, 24034, 21557, 28818, 36710, 25199, 25764, 25507,
-    24443, 28552, 37108, [12162, 33251], [12192, 36784], 23576, 26216, 24561,
-    27785, 38472, 36225, 34924, 25745, 31216, 22478, 27225, 25104, 21576,
-    20056, 31243, 24809, 28548, 35802, 25215, 36894, 39563, 31204, 21507,
-    30196, 25345, 21273, 27744, 36831, 24347, 39536, 32827, 40831, 20360,
-    23610, [12186, 36196], 32709, 26021, 28861, 20805, 20914, [12173, 34411],
-    23815, 23456, 25277, 37228, 30068, 36364, 31264, 24833, 31609, 20167,
-    32504, 30597, 19985, 33261, 21021, 20986, 27249, 21416, 36487, 38148,
-    38607, 28353, 38500, 26970, 30784, 20648, 30679, 25616, 35302, 22788,
-    25571, 24029, 31359, 26941, 20256, 33337, 21912, 20018, 30126, 31383,
-    24162, 24202, 38383, 21019, 21561, 28810, 25462, 38180, 22402, 26149,
-    26943, 37255, 21767, 28147, 32431, 34850, 25139, 32496, 30133, 33576,
-    30913, 38604, 36766, 24904, 29943, 35789, 27492, 21050, 36176, 27425,
-    32874, 33905, 22257, 21254, 20174, 19995, 20945, 31895, 37259, 31751,
-    20419, 36479, 31713, 31388, 25703, 23828, 20652, 33030, 30209, 31929,
-    28140, 32736, 26449, 23384, [12072, 23544], 30923, 25774, 25619, 25514,
-    25387, 38169, 25645, 36798, 31572, 30249, 25171, [12068, 22823], 21574,
-    [12109, 27513], 20643, 25140, 24102, 27526, 20195, 36151, 34955, 24453,
-    36910, 24608, 32829, 25285, 20025, 21333, 37112, 25528, 32966, 26086,
-    27694, 20294, 24814, 28129, 35806, 24377, 34507, 24403, 25377, 20826,
-    33633, 26723, [12049, 20992], 25443, 36424, 20498, 23707, 31095, 23548,
-    21040, 31291, 24764, 36947, 30423, 24503, 24471, 30340, 36460, 28783,
-    30331, 31561, 30634, 20979, 37011, 22564, 20302, 28404, 36842, 25932,
-    31515, 29380, 28068, 32735, 23265, 25269, 24213, 22320, 33922, 31532,
-    24093, 24351, 36882, 32532, 39072, 25474, 28359, 30872, 28857, 20856,
-    38747, 22443, 30005, 20291, 30008, 24215, 24806, 22880, 28096, 27583,
-    30857, 21500, 38613, 20939, 20993, 25481, 21514, 38035, 35843, 36300,
-    29241, 30879, 34678, 36845, 35853, 21472, 19969, 30447, 21486, 38025,
-    39030, [12237, 40718], 38189, 23450, 35746, 20002, 19996, 20908, 33891,
-    25026, 21160, 26635, 20375, 24683, 20923, 27934, 20828, 25238,
-    [12099, 26007], 38497, [12182, 35910], 36887, 30168, 37117, 30563, 27602,
-    29322, 29420, 35835, 22581, 30585, 36172, 26460, 38208, 32922, 24230,
-    28193, 22930, 31471, 30701, 38203, 27573, 26029, 32526, 22534, 20817,
-    38431, 23545, 22697, 21544, 36466, 25958, 39039, 22244, 38045, 30462,
-    36929, 25479, 21702, 22810, 22842, 22427, 36530, 26421, 36346, 33333,
-    21057, 24816, 22549, 34558, 23784, 40517, 20420, 39069, 35769, 23077,
-    24694, 21380, 25212, 36943, 37122, 39295, 24681, [12157, 32780],
-    [12041, 20799], [12159, 32819], 23572, 39285, 27953, [12038, 20108], 36144,
-    21457, 32602, 31567, 20240, 20047, 38400, 27861, 29648, 34281, 24070,
-    30058, 32763, 27146, 30718, 38034, 32321, 20961, 28902, 21453, 36820,
-    33539, 36137, 29359, 39277, 27867, 22346, 33459, [12101, 26041], 32938,
-    25151, 38450, 22952, 20223, 35775, 32442, 25918, 33778, [12206, 38750],
-    21857, 39134, 32933, 21290, 35837, 21536, 32954, 24223, 27832, 36153,
-    33452, 37210, 21545, 27675, 20998, 32439, 22367, 28954, 27774, 31881,
-    22859, 20221, 24575, 24868, 31914, 20016, 23553, 26539, 34562, 23792,
-    38155, 39118, 30127, 28925, 36898, 20911, 32541, 35773, 22857, 20964,
-    20315, 21542, 22827, 25975, 32932, 23413, 25206, 25282, 36752, 24133,
-    27679, 31526, 20239, 20440, 26381, 28014, 28074, 31119, 34993, 24343,
-    29995, 25242, 36741, 20463, 37340, 26023, 33071, 33105, 24220, 33104,
-    36212, 21103, 35206, 36171, 22797, 20613, 20184, [12201, 38428],
-    [12119, 29238], 33145, 36127, 23500, 35747, 38468, 22919, 32538, 21648,
-    22134, 22030, 35813, 25913, 27010, 38041, 30422, 28297, [12082, 24178],
-    [12130, 29976], 26438, 26577, 31487, 32925, 36214, 24863, 31174, 25954,
-    36195, 20872, 21018, 38050, 32568, 32923, 32434, 23703, 28207, 26464,
-    31705, 30347, [12220, 39640], 33167, 32660, 31957, 25630, 38224, 31295,
-    21578, 21733, 27468, 25601, [12093, 25096], 40509, 33011, 30105, 21106,
-    [12208, 38761], 33883, 26684, 34532, 38401, 38548, 38124, 20010, 21508,
-    32473, 26681, 36319, 32789, 26356, 24218, 32697, 22466, 32831, 26775,
-    [12079, 24037], 25915, 21151, 24685, 40858, 20379, 36524, 20844, 23467,
-    [12088, 24339], 24041, 27742, 25329, 36129, 20849, 38057, 21246, 27807,
-    33503, 29399, 22434, 26500, 36141, 22815, 36764, 33735, 21653, 31629,
-    20272, 27837, 23396, 22993, [12238, 40723], 21476, 34506, [12219, 39592],
-    [12181, 35895], 32929, 25925, 39038, 22266, 38599, 21038, [12128, 29916],
-    21072, 23521, 25346, 35074, 20054, 25296, 24618, 26874, 20851, 23448,
-    20896, 35266, 31649, 39302, 32592, 24815, 28748, 36143, 20809,
-    [12084, 24191], 36891, 29808, 35268, 22317, 30789, 24402, 40863, 38394,
-    36712, [12225, 39740], 35809, 30328, 26690, 26588, 36330, 36149, 21053,
-    36746, 28378, 26829, 38149, 37101, 22269, 26524, 35065, 36807, 21704,
-    39608, 23401, 28023, 27686, 20133, 23475, 39559, 37219, 25000, 37039,
-    38889, 21547, 28085, 23506, 20989, 21898, 32597, 32752, 25788, 25421,
-    26097, 25022, 24717, 28938, 27735, 27721, 22831, 26477, 33322, 22741,
-    22158, 35946, 27627, 37085, 22909, 32791, 21495, 28009, 21621, 21917,
-    33655, 33743, 26680, [12146, 31166], 21644, 20309, 21512, 30418, 35977,
-    38402, 27827, 28088, 36203, 35088, 40548, 36154, 22079, [12234, 40657],
-    30165, 24456, 29408, 24680, 21756, 20136, 27178, 34913, 24658, 36720,
-    21700, 28888, 34425, 40511, 27946, 23439, 24344, 32418, 21897, 20399,
-    29492, 21564, 21402, 20505, 21518, 21628, 20046, 24573, 29786, 22774,
-    33899, 32993, 34676, 29392, 31946, 28246, 24359, 34382, 21804, 25252,
-    20114, 27818, 25143, 33457, 21719, 21326, 29502, 28369, 30011, 21010,
-    21270, 35805, 27088, 24458, 24576, 28142, 22351, 27426, 29615, 26707,
-    36824, 32531, 25442, 24739, 21796, 30186, 35938, 28949, 28067, 23462,
-    24187, 33618, 24908, 40644, 30970, 34647, 31783, 30343, 20976, 24822,
-    29004, 26179, 24140, 24653, 35854, 28784, 25381, 36745, 24509, 24674,
-    34516, 22238, 27585, 24724, 24935, 21321, 24800, 26214, 36159, 31229,
-    20250, 28905, 27719, 35763, 35826, 32472, 33636, 26127, 23130, 39746,
-    27985, 28151, 35905, 27963, 20249, [12117, 28779], 33719, 25110, 24785,
-    38669, 36135, 31096, 20987, 22334, 22522, 26426, 30072, 31293, 31215,
-    31637, 32908, 39269, 36857, 28608, 35749, 40481, 23020, 32489, 32521,
-    21513, 26497, 26840, 36753, 31821, 38598, 21450, 24613, 30142, 27762,
-    21363, 23241, 32423, 25380, [12047, 20960], 33034, [12080, 24049], 34015,
-    25216, 20864, 23395, 20238, 31085, 21058, 24760, 27982, 23492, 23490,
-    35745, 35760, 26082, 24524, 38469, 22931, 32487, 32426, 22025, 26551,
-    22841, 20339, 23478, 21152, 33626, 39050, 36158, 30002, 38078, 20551,
-    31292, 20215, 26550, 39550, 23233, 27516, 30417, 22362, 23574, 31546,
-    38388, 29006, 20860, 32937, 33392, 22904, 32516, 33575, 26816, 26604,
-    30897, 30839, 25315, 25441, 31616, 20461, 21098, 20943, 33616, 27099,
-    37492, 36341, 36145, 35265, 38190, 31661, 20214, 20581, 33328, 21073,
-    39279, 28176, 28293, 28071, 24314, 20725, 23004, 23558, 27974, 27743,
-    30086, 33931, 26728, 22870, 35762, 21280, 37233, 38477, 34121, 26898,
-    30977, 28966, 33014, 20132, 37066, 27975, 39556, 23047, 22204, 25605,
-    38128, 30699, 20389, 33050, 29409, [12179, 35282], 39290, 32564, 32478,
-    21119, 25945, 37237, 36735, 36739, 21483, 31382, 25581, 25509, 30342,
-    31224, 34903, 38454, 25130, 21163, 33410, 26708, 26480, 25463, 30571,
-    31469, 27905, 32467, 35299, 22992, 25106, 34249, 33445, 30028, 20511,
-    20171, 30117, 35819, 23626, [12081, 24062], 31563, [12100, 26020],
-    [12198, 37329], 20170, 27941, 35167, 32039, 38182, 20165, 35880, 36827,
-    38771, 26187, 31105, 36817, 28908, 28024, 23613, 21170, 33606, 20834,
-    33550, 30555, 26230, 40120, 20140, 24778, 31934, 31923, 32463, 20117,
-    35686, 26223, 39048, 38745, 22659, 25964, 38236, 24452, 30153, 38742,
-    31455, 31454, 20928, 28847, 31384, 25578, 31350, 32416, 29590,
-    [12210, 38893], 20037, 28792, 20061, 37202, 21417, 25937, 26087,
-    [12165, 33276], 33285, 21646, 23601, 30106, 38816, 25304, 29401, 30141,
-    23621, 39545, 33738, 23616, 21632, 30697, 20030, 27822, 32858, 25298,
-    25454, 24040, 20855, 36317, 36382, 38191, 20465, 21477, 24807, 28844,
-    21095, 25424, 40515, 23071, 20518, 30519, 21367, 32482, 25733, 25899,
-    25225, 25496, 20500, 29237, 35273, 20915, 35776, 32477, 22343, 33740,
-    38055, 20891, 21531, 23803, 20426, 31459, 27994, 37089, 39567, 21888,
-    21654, 21345, 21679, 24320, 25577, 26999, 20975, 24936, 21002, 22570,
-    21208, 22350, 30733, 30475, 24247, 24951, 31968, 25179, 25239, 20130,
-    28821, 32771, 25335, 28900, 38752, 22391, 33499, 26607, 26869, 30933,
-    39063, 31185, 22771, 21683, 21487, 28212, 20811, 21051, 23458, 35838,
-    32943, 21827, 22438, 24691, 22353, 21549, 31354, 24656, 23380, 25511,
-    25248, [12061, 21475], 25187, 23495, 26543, 21741, 31391, 33510, 37239,
-    24211, 35044, 22840, 22446, 25358, 36328, 33007, 22359, 31607, 20393,
-    24555, 23485, 27454, 21281, 31568, 29378, 26694, 30719, 30518, 26103,
-    20917, 20111, 30420, 23743, 31397, 33909, 22862, 39745, 20608, 39304,
-    24871, 28291, 22372, 26118, 25414, 22256, 25324, 25193, 24275, 38420,
-    22403, 25289, 21895, 34593, 33098, 36771, 21862, 33713, 26469, 36182,
-    34013, 23146, 26639, 25318, 31726, 38417, 20848, 28572, 35888, 25597,
-    35272, 25042, 32518, 28866, 28389, 29701, 27028, 29436, 24266, 37070,
-    26391, 28010, 25438, 21171, 29282, [12156, 32769], 20332, 23013, 37226,
-    28889, 28061, 21202, 20048, 38647, 38253, 34174, 30922, 32047, 20769,
-    22418, 25794, 32907, 31867, 27882, 26865, 26974, 20919, 21400, 26792,
-    29313, 40654, 31729, 29432, 31163, 28435, 29702, 26446, [12197, 37324],
-    40100, 31036, 33673, 33620, 21519, 26647, 20029, 21385, 21169, 30782,
-    21382, 21033, 20616, 20363, 20432, 30178, [12148, 31435], 31890, 27813,
-    [12202, 38582], [12050, 21147], 29827, 21737, 20457, 32852, 33714, 36830,
-    38256, 24265, 24604, 28063, 24088, 25947, 33080, 38142, 24651, 28860,
-    32451, 31918, 20937, 26753, 31921, 33391, 20004, 36742, 37327, 26238,
-    20142, 35845, 25769, 32842, 20698, 30103, 29134, 23525, 36797, 28518,
-    20102, 25730, 38243, 24278, 26009, 21015, 35010, 28872, 21155, 29454,
-    29747, 26519, 30967, 38678, 20020, 37051, 40158, 28107, 20955, 36161,
-    21533, 25294, 29618, 33777, 38646, 40836, 38083, 20278, 32666, 20940,
-    28789, 38517, 23725, 39046, 21478, 20196, 28316, 29705, 27060, 30827,
-    39311, 30041, 21016, 30244, 27969, 26611, 20845, 40857, 32843, 21657,
-    31548, 31423, 38534, 22404, 25314, 38471, 27004, 23044, 25602, 31699,
-    28431, 38475, 33446, 21346, 39045, 24208, 28809, 25523, 21348, 34383,
-    40065, 40595, 30860, 38706, 36335, 36162, [12229, 40575], 28510, 31108,
-    24405, 38470, 25134, 39540, 21525, 38109, 20387, 26053, 23653, 23649,
-    32533, 34385, 27695, 24459, 29575, 28388, 32511, 23782, 25371, 23402,
-    28390, 21365, 20081, 25504, 30053, 25249, 36718, 20262, 20177, 27814,
-    32438, 35770, 33821, 34746, 32599, 36923, 38179, 31657, 39585, 35064,
-    33853, 27931, 39558, 32476, 22920, [12231, 40635], 29595, 30721, 34434,
-    39532, 39554, 22043, 21527, 22475, 20080, 40614, 21334, 36808, 33033,
-    30610, 39314, 34542, 28385, 34067, 26364, 24930, 28459, 35881, 33426,
-    33579, 30450, 27667, 24537, 33725, 29483, 33541, 38170, [12113, 27611],
-    [12141, 30683], 38086, 21359, 33538, 20882, 24125, 35980, 36152, 20040,
-    29611, 26522, 26757, 37238, 38665, 29028, 27809, 30473, 23186, 38209,
-    27599, 32654, 26151, 23504, 22969, 23194, 38376, 38391, 20204, 33804,
-    33945, 27308, 30431, 38192, 29467, 26790, 23391, 30511, 37274, 38753,
-    31964, 36855, 35868, 24357, [12150, 31859], 31192, 35269, 27852, 34588,
-    23494, 24130, 26825, 30496, 32501, 20885, 20813, 21193, 23081, 32517,
-    [12207, 38754], 33495, 25551, 30596, 34256, 31186, 28218, 24217, 22937,
-    34065, 28781, 27665, 25279, [12139, 30399], 25935, 24751, 38397, 26126,
-    34719, 40483, 38125, 21517, 21629, 35884, {f: 2, c: 25720}, 34321, 27169,
-    33180, 30952, 25705, 39764, 25273, 26411, 33707, 22696, 40664, 27819,
-    28448, 23518, 38476, 35851, 29279, 26576, 25287, 29281, 20137, 22982,
-    27597, 22675, 26286, 24149, 21215, 24917, [12106, 26408], [12140, 30446],
-    30566, 29287, 31302, 25343, 21738, 21584, 38048, 37027, 23068, 32435,
-    27670, 20035, 22902, 32784, 22856, 21335, 30007, 38590, 22218, 25376,
-    33041, 24700, 38393, 28118, 21602, 39297, 20869, 23273, 33021, 22958,
-    38675, 20522, 27877, 23612, 25311, 20320, 21311, 33147, 36870, 28346,
-    34091, 25288, 24180, 30910, 25781, 25467, 24565, 23064, 37247, 40479,
-    23615, 25423, 32834, 23421, 21870, 38218, 38221, 28037, 24744, 26592,
-    29406, 20957, 23425, 25319, 27870, [12124, 29275], 25197, 38062, 32445,
-    33043, 27987, 20892, 24324, 22900, 21162, 24594, [12069, 22899], 26262,
-    34384, 30111, 25386, 25062, 31983, 35834, 21734, 27431, 40485, 27572,
-    34261, 21589, 20598, 27812, 21866, 36276, 29228, 24085, 24597, 29750,
-    25293, 25490, 29260, 24472, 28227, 27966, 25856, 28504, 30424, 30928,
-    30460, 30036, 21028, 21467, 20051, 24222, 26049, 32810, 32982, 25243,
-    21638, 21032, 28846, 34957, 36305, 27873, 21624, 32986, 22521, 35060,
-    36180, 38506, 37197, 20329, 27803, 21943, 30406, 30768, 25256, 28921,
-    28558, 24429, 34028, 26842, 30844, 31735, 33192, 26379, 40527, 25447,
-    30896, 22383, 30738, 38713, 25209, 25259, 21128, 29749, 27607, 21860,
-    33086, 30130, [12138, 30382], 21305, 30174, 20731, 23617, 35692, 31687,
-    20559, [12122, 29255], 39575, 39128, 28418, 29922, 31080, 25735, 30629,
-    25340, 39057, 36139, 21697, 32856, 20050, 22378, 33529, 33805, 24179,
-    20973, 29942, 35780, 23631, 22369, 27900, 39047, 23110, 30772, 39748,
-    36843, 31893, 21078, 25169, 38138, 20166, 33670, 33889, 33769, 33970,
-    22484, 26420, 22275, 26222, 28006, 35889, 26333, 28689, 26399, 27450,
-    26646, 25114, 22971, 19971, 20932, 28422, 26578, 27791, 20854, 26827,
-    22855, 27495, 30054, 23822, 33040, 40784, 26071, 31048, 31041, 39569,
-    36215, 23682, 20062, 20225, 21551, 22865, 30732, 22120, [12115, 27668],
-    36804, 24323, 27773, 27875, 35755, 25488, 24688, 27965, 29301, 25190,
-    38030, 38085, 21315, 36801, 31614, 20191, 35878, 20094, 40660, 38065,
-    38067, 21069, 28508, 36963, 27973, 35892, 22545, 23884, [12107, 27424],
-    27465, 26538, 21595, 33108, 32652, 22681, 34103, 24378, 25250, 27207,
-    38201, 25970, 24708, 26725, 30631, 20052, 20392, 24039, 38808, 25772,
-    32728, 23789, 20431, 31373, 20999, 33540, 19988, 24623, 31363, 38054,
-    20405, 20146, 31206, 29748, 21220, 33465, 25810, 31165, 23517, 27777,
-    38738, 36731, 27682, 20542, 21375, 28165, 25806, 26228, 27696, 24773,
-    39031, 35831, 24198, 29756, 31351, 31179, 19992, 37041, 29699, 27714,
-    22234, 37195, 27845, 36235, 21306, 34502, 26354, 36527, 23624, 39537,
-    28192, 21462, 23094, 40843, 36259, 21435, 22280, 39079, 26435, 37275,
-    27849, 20840, 30154, 25331, [12125, 29356], 21048, 21149, 32570, 28820,
-    30264, 21364, 40522, 27063, 30830, 38592, 35033, 32676, 28982, 29123,
-    20873, 26579, 29924, 22756, 25880, 22199, 35753, 39286, 25200, 32469,
-    24825, 28909, 22764, 20161, [12040, 20154], 24525, 38887, 20219, 35748,
-    20995, 22922, 32427, 25172, 20173, [12103, 26085], 25102, 33592, 33993,
-    33635, 34701, 29076, 28342, 23481, 32466, 20887, 25545, 26580,
-    [12161, 32905], 33593, 34837, 20754, 23418, 22914, 36785, 20083, 27741,
-    [12042, 20837], 35109, 36719, 38446, 34122, 29790, 38160, 38384, 28070,
-    33509, 24369, 25746, 27922, 33832, 33134, 40131, 22622, 36187, 19977,
-    21441, 20254, 25955, 26705, 21971, 20007, 25620, 39578, 25195, 23234,
-    29791, [12170, 33394], 28073, 26862, 20711, 33678, 30722, 26432, 21049,
-    27801, 32433, 20667, 21861, 29022, 31579, 26194, 29642, 33515, 26441,
-    [12077, 23665], 21024, 29053, 34923, 38378, 38485, 25797, 36193, 33203,
-    21892, 27733, 25159, 32558, 22674, 20260, 21830, 36175, 26188, 19978,
-    23578, 35059, 26786, 25422, 31245, 28903, 33421, 21242, 38902, 23569,
-    21736, 37045, 32461, 22882, 36170, 34503, [12166, 33292], 33293, 36198,
-    25668, 23556, 24913, 28041, 31038, 35774, 30775, 30003, 21627, 20280,
-    [12189, 36523], 28145, 23072, 32453, 31070, 27784, 23457, 23158, 29978,
-    32958, 24910, 28183, 22768, [12131, 29983], 29989, 29298, 21319, 32499,
-    30465, 30427, 21097, 32988, 22307, 24072, 22833, 29422, 26045, 28287,
-    35799, [12075, 23608], 34417, [12055, 21313], [12143, 30707], 25342, 26102,
-    20160, [12215, 39135], 34432, 23454, 35782, 21490, [12142, 30690], 20351,
-    23630, 39542, 22987, 24335, [12144, 31034], [12064, 22763], 19990, 26623,
-    20107, 25325, 35475, 36893, 21183, 26159, 21980, 22124, 36866, 20181,
-    20365, 37322, 39280, [12114, 27663], 24066, 24643, 23460, 35270, 35797,
-    25910, [12095, 25163], [12216, 39318], 23432, 23551, 25480, 21806, 21463,
-    30246, 20861, 34092, 26530, 26803, 27530, 25234, 36755, 21460, 33298,
-    28113, 30095, 20070, 36174, 23408, 29087, 34223, 26257, 26329, 32626,
-    34560, [12233, 40653], [12239, 40736], 23646, 26415, 36848, 26641, 26463,
-    25101, 31446, 22661, 24246, 25968, 28465, 24661, 21047, 32781, 25684,
-    34928, 29993, 24069, 26643, 25332, 38684, 21452, 29245, 35841,
-    [12116, 27700], 30561, 31246, 21550, 30636, 39034, 33308, 35828, 30805,
-    26388, 28865, 26031, 25749, 22070, 24605, 31169, 21496, 19997, 27515,
-    32902, 23546, 21987, 22235, 20282, 20284, 39282, 24051, 26494, 32824,
-    24578, 39042, 36865, 23435, 35772, 35829, 25628, 33368, 25822, 22013,
-    33487, 37221, 20439, 32032, 36895, 31903, 20723, 22609, 28335, 23487,
-    35785, 32899, 37240, 33948, 31639, 34429, 38539, 38543, 32485, 39635,
-    30862, 23681, 31319, 36930, 38567, 31071, 23385, 25439, 31499, 34001,
-    26797, 21766, 32553, 29712, 32034, 38145, 25152, 22604, 20182, 23427,
-    22905, 22612, 29549, 25374, 36427, 36367, 32974, 33492, 25260, 21488,
-    27888, 37214, 22826, 24577, 27760, 22349, 25674, 36138, 30251, 28393,
-    22363, 27264, 30192, 28525, 35885, 35848, 22374, 27631, 34962, 30899,
-    25506, 21497, 28845, 27748, 22616, 25642, 22530, 26848, 33179, 21776,
-    31958, 20504, 36538, 28108, 36255, 28907, 25487, 28059, 28372, 32486,
-    33796, 26691, 36867, 28120, 38518, 35752, 22871, 29305, 34276, 33150,
-    30140, 35466, 26799, 21076, 36386, 38161, 25552, 39064, 36420, 21884,
-    20307, 26367, 22159, 24789, 28053, 21059, 23625, 22825, 28155, 22635,
-    [12133, 30000], 29980, 24684, 33300, 33094, 25361, 26465, 36834, 30522,
-    36339, 36148, 38081, 24086, 21381, 21548, 28867, 27712, 24311, 20572,
-    20141, 24237, 25402, 33351, 36890, 26704, 37230, 30643, 21516, 38108,
-    24420, 31461, 26742, 25413, 31570, 32479, 30171, 20599, 25237, 22836,
-    36879, 20984, 31171, 31361, 22270, 24466, 36884, 28034, 23648,
-    [12063, 22303], 21520, 20820, 28237, 22242, 25512, 39059, 33151, 34581,
-    35114, 36864, 21534, 23663, 33216, 25302, 25176, 33073, 40501, 38464,
-    39534, 39548, 26925, 22949, 25299, 21822, 25366, 21703, 34521, 27964,
-    23043, [12129, 29926], 34972, 27498, 22806, 35916, 24367, 28286, 29609,
-    39037, 20024, 28919, 23436, 30871, 25405, 26202, 30358, 24779, 23451,
-    23113, 19975, 33109, 27754, 29579, 20129, 26505, [12153, 32593], 24448,
-    26106, 26395, 24536, 22916, 23041, 24013, 24494, 21361, 38886, 36829,
-    26693, 22260, 21807, 24799, 20026, 28493, 32500, 33479, 33806, 22996,
-    20255, 20266, 23614, 32428, 26410, 34074, 21619, 30031, 32963, 21890,
-    39759, 20301, 28205, 35859, 23561, 24944, 21355, 30239, 28201, 34442,
-    [12098, 25991], 38395, 32441, 21563, 31283, 32010, 38382, 21985, 32705,
-    29934, 25373, 34583, 28065, 31389, 25105, 26017, 21351, 25569, 27779,
-    24043, 21596, 38056, 20044, 27745, 35820, 23627, [12102, 26080], 33436,
-    26791, 21566, 21556, [12111, 27595], 27494, 20116, 25410, 21320, 33310,
-    20237, 20398, 22366, 25098, 38654, 26212, 29289, 21247, 21153, 24735,
-    35823, 26132, 29081, 26512, 35199, 30802, 30717, 26224, 22075, 21560,
-    38177, 29306, 31232, 24687, 24076, 24713, 33181, [12067, 22805], 24796,
-    29060, 28911, 28330, 27728, 29312, 27268, 34989, 24109, 20064, 23219,
-    21916, 38115, 27927, 31995, 38553, 25103, 32454, 30606, 34430, 21283,
-    38686, 36758, 26247, 23777, 20384, 29421, 19979, 21414, 22799, 21523,
-    25472, 38184, 20808, 20185, 40092, 32420, 21688, 36132, 34900, 33335,
-    38386, 28046, 24358, 23244, 26174, 38505, 29616, 29486, 21439, 33146,
-    39301, 32673, 23466, 38519, 38480, 32447, 30456, 21410, 38262,
-    [12217, 39321], 31665, 35140, 28248, 20065, 32724, 31077, 35814, 24819,
-    21709, 20139, 39033, 24055, 27233, 20687, 21521, 35937, 33831, 30813,
-    38660, 21066, 21742, 22179, 38144, 28040, 23477, 28102, 26195,
-    [12073, 23567], 23389, 26657, 32918, 21880, 31505, 25928, 26964, 20123,
-    27463, 34638, 38795, 21327, 25375, 25658, 37034, 26012, 32961, 35856,
-    20889, 26800, 21368, 34809, 25032, 27844, 27899, 35874, 23633, 34218,
-    33455, 38156, 27427, [12191, 36763], 26032, 24571, [12092, 24515], 20449,
-    34885, 26143, 33125, 29481, 24826, 20852, 21009, 22411, 24418, 37026,
-    [12175, 34892], 37266, 24184, 26447, 24615, 22995, 20804, 20982, 33016,
-    21256, 27769, 38596, 29066, 20241, 20462, 32670, 26429, 21957, 38152,
-    31168, 34966, 32483, 22687, 25100, 38656, 34394, 22040, 39035, 24464,
-    35768, 33988, 37207, 21465, 26093, 24207, 30044, 24676, 32110, 23167,
-    32490, 32493, 36713, 21927, 23459, 24748, 26059, [12126, 29572], 36873,
-    30307, 30505, 32474, 38772, 34203, 23398, [12147, 31348], 38634,
-    [12174, 34880], 21195, 29071, 24490, 26092, 35810, 23547, 39535, 24033,
-    27529, 27739, 35757, 35759, 36874, 36805, 21387, 25276, 40486, 40493,
-    21568, 20011, 33469, [12123, 29273], 34460, 23830, 34905, 28079, 38597,
-    21713, 20122, 35766, 28937, 21693, 38409, 28895, 28153, 30416, 20005,
-    30740, 34578, 23721, 24310, [12180, 35328], 39068, 38414, 28814, 27839,
-    22852, 25513, 30524, 34893, 28436, 33395, 22576, 29141, 21388, 30746,
-    38593, 21761, 24422, 28976, 23476, 35866, 39564, 27523, 22830, 40495,
-    31207, 26472, 25196, 20335, 30113, [12154, 32650], 27915, 38451, 27687,
-    20208, 30162, 20859, 26679, 28478, 36992, 33136, 22934, 29814, 25671,
-    23591, 36965, 31377, 35875, 23002, 21676, 33280, 33647, 35201, 32768,
-    26928, 22094, 32822, 29239, 37326, 20918, 20063, 39029, 25494, 19994,
-    21494, 26355, 33099, 22812, 28082, [12032, 19968], 22777, 21307, 25558,
-    38129, 20381, 20234, [12176, 34915], 39056, 22839, 36951, 31227, 20202,
-    33008, 30097, 27778, 23452, 23016, 24413, 26885, 34433, 20506, 24050,
-    [12036, 20057], 30691, 20197, 33402, 25233, 26131, [12194, 37009], 23673,
-    20159, 24441, 33222, 36920, 32900, 30123, 20134, 35028, 24847, 27589,
-    24518, 20041, 30410, 28322, 35811, 35758, 35850, 35793, 24322, 32764,
-    32716, 32462, 33589, 33643, 22240, 27575, [12211, 38899], 38452, 23035,
-    21535, 38134, 28139, 23493, 39278, 23609, 24341, 38544, 21360, 33521,
-    27185, 23156, 40560, 24212, 32552, 33721, {f: 2, c: 33828}, 33639, 34631,
-    36814, 36194, 30408, 24433, 39062, 30828, 26144, 21727, 25317, 20323,
-    33219, 30152, 24248, 38605, 36362, 34553, 21647, 27891, 28044, 27704,
-    24703, 21191, [12132, 29992], 24189, 20248, 24736, 24551, 23588, 30001,
-    37038, 38080, 29369, 27833, 28216, [12195, 37193], 26377, 21451, 21491,
-    20305, 37321, 35825, [12060, 21448], 24188, 36802, 28132, 20110, 30402,
-    27014, 34398, 24858, 33286, 20313, 20446, 36926, 40060, 24841, 28189,
-    28180, 38533, 20104, 23089, [12204, 38632], 19982, 23679, 31161, 23431,
-    35821, [12155, 32701], [12127, 29577], 22495, 33419, 37057, 21505, 36935,
-    21947, 23786, 24481, 24840, 27442, 29425, 32946, 35465, 28020, 23507,
-    35029, 39044, 35947, 39533, 40499, 28170, 20900, 20803, 22435, 34945,
-    21407, 25588, 36757, 22253, 21592, 22278, 29503, 28304, 32536, 36828,
-    33489, 24895, 24616, 38498, [12104, 26352], 32422, 36234, 36291, 38053,
-    23731, 31908, [12105, 26376], 24742, 38405, 32792, 20113, 37095, 21248,
-    38504, 20801, 36816, 34164, 37213, 26197, 38901, 23381, 21277, 30776,
-    26434, 26685, 21705, 28798, 23472, 36733, 20877, 22312, 21681, 25874,
-    26242, 36190, 36163, 33039, 33900, 36973, 31967, 20991, 34299, 26531,
-    26089, 28577, 34468, 36481, 22122, 36896, 30338, 28790, 29157, 36131,
-    25321, 21017, 27901, 36156, 24590, 22686, 24974, 26366, 36192, 25166,
-    21939, 28195, 26413, 36711, 38113, 38392, 30504, 26629, 27048, 21643,
-    20045, 28856, 35784, 25688, 25995, 23429, 31364, 20538, 23528, 30651,
-    27617, 35449, 31896, 27838, 30415, 26025, 36759, 23853, 23637, 34360,
-    26632, 21344, 25112, 31449, 28251, 32509, 27167, 31456, 24432, 28467,
-    24352, 25484, 28072, 26454, 19976, 24080, 36134, 20183, 32960, 30260,
-    38556, 25307, 26157, 25214, 27836, 36213, 29031, 32617, 20806, 32903,
-    21484, 36974, 25240, 21746, 34544, 36761, 32773, 38167, 34071, 36825,
-    27993, 29645, 26015, 30495, 29956, 30759, 33275, 36126, 38024, 20390,
-    26517, 30137, 35786, 38663, 25391, 38215, 38453, 33976, 25379, 30529,
-    24449, 29424, 20105, 24596, 25972, 25327, 27491, 25919, 24103, 30151,
-    37073, 35777, 33437, 26525, [12096, 25903], 21553, 34584, 30693, 32930,
-    33026, 27713, 20043, 32455, 32844, 30452, 26893, 27542, 25191, 20540,
-    20356, 22336, 25351, [12108, 27490], 36286, 21482, 26088, 32440, 24535,
-    25370, 25527, [12164, 33267], 33268, 32622, 24092, 23769, 21046, 26234,
-    31209, 31258, 36136, 28825, 30164, 28382, 27835, 31378, 20013, 30405,
-    24544, 38047, 34935, 32456, 31181, 32959, 37325, 20210, 20247,
-    [12168, 33311], 21608, 24030, 27954, 35788, 31909, 36724, 32920, 24090,
-    21650, 30385, 23449, 26172, 39588, 29664, 26666, 34523, 26417, 29482,
-    35832, 35803, 36880, [12149, 31481], 28891, 29038, 25284, 30633, 22065,
-    20027, 33879, 26609, 21161, 34496, 36142, 38136, 31569, 20303, 27880,
-    31069, 39547, 25235, [12118, 29226], 25341, 19987, 30742, 36716, 25776,
-    36186, 31686, 26729, 24196, 35013, 22918, 25758, 22766, 29366, 26894,
-    38181, 36861, 36184, 22368, 32512, 35846, 20934, 25417, 25305, 21331,
-    26700, 29730, 33537, 37196, 21828, 30528, 28796, 27978, 20857, 21672,
-    36164, 23039, 28363, 28100, 23388, 32043, 20180, 31869, 28371,
-    [12070, 23376], [12163, 33258], 28173, 23383, 39683, 26837, 36394, 23447,
-    32508, 24635, 32437, 37049, [12187, 36208], 22863, 25549, 31199,
-    [12188, 36275], 21330, 26063, 31062, 35781, 38459, 32452, 38075, 32386,
-    22068, 37257, 26368, 32618, 23562, 36981, 26152, 24038, 20304, 26590,
-    20570, 20316, 22352, 24231, 20109, 19980, 20800, 19984, 24319, 21317,
-    19989, 20120, 19998, [12224, 39730], 23404, 22121, [12033, 20008], 31162,
-    [12035, 20031], [12052, 21269], 20039, 22829, [12120, 29243], 21358, 27664,
-    22239, 32996, 39319, 27603, 30590, 40727, [12034, 20022], 20127, 40720,
-    20060, 20073, 20115, 33416, 23387, 21868, 22031, 20164, 21389, 21405,
-    21411, 21413, 21422, 38757, 36189, [12053, 21274], 21493, 21286, 21294,
-    21310, 36188, 21350, 21347, 20994, 21000, 21006, 21037, 21043,
-    {f: 2, c: 21055}, 21068, 21086, 21089, 21084, 33967, 21117, 21122, 21121,
-    21136, 21139, [12044, 20866], 32596, 20155, 20163, 20169, 20162, 20200,
-    20193, 20203, 20190, 20251, 20211, 20258, 20324, 20213, 20261, 20263,
-    20233, 20267, 20318, 20327, 25912, 20314, 20317, 20319, 20311, 20274,
-    20285, 20342, 20340, 20369, 20361, 20355, 20367, 20350, 20347, 20394,
-    20348, 20396, 20372, 20454, 20456, 20458, 20421, 20442, 20451, 20444,
-    20433, 20447, 20472, 20521, 20556, 20467, 20524, 20495, 20526, 20525,
-    20478, 20508, 20492, 20517, 20520, 20606, 20547, 20565, 20552, 20558,
-    20588, 20603, 20645, 20647, 20649, 20666, 20694, 20742, 20717, 20716,
-    20710, 20718, 20743, 20747, 20189, 27709, 20312, 20325, 20430,
-    [12245, 40864], 27718, 31860, 20846, 24061, 40649, 39320, 20865, 22804,
-    [12051, 21241], 21261, 35335, 21264, 20971, 22809, 20821, [12039, 20128],
-    20822, 20147, 34926, 34980, 20149, 33044, 35026, 31104, 23348, 34819,
-    32696, [12046, 20907], 20913, 20925, 20924, 20935, [12045, 20886], 20898,
-    20901, 35744, {f: 2, c: 35750}, 35754, {f: 2, c: 35764}, 35767,
-    {f: 2, c: 35778}, 35787, 35791, 35790, {f: 3, c: 35794}, 35798,
-    {f: 2, c: 35800}, 35804, {f: 2, c: 35807}, 35812, {f: 2, c: 35816}, 35822,
-    35824, 35827, 35830, 35833, 35836, {f: 2, c: 35839}, 35842, 35844, 35847,
-    35852, 35855, {f: 2, c: 35857}, {f: 3, c: 35860}, 35865, 35867, 35864,
-    35869, {f: 3, c: 35871}, 35877, 35879, {f: 2, c: 35882}, {f: 2, c: 35886},
-    {f: 2, c: 35890}, {f: 2, c: 35893}, [12057, 21353], 21370, 38429, 38434,
-    38433, 38449, 38442, 38461, 38460, 38466, 38473, 38484, 38495, 38503,
-    38508, 38514, 38516, 38536, 38541, 38551, 38576, 37015, 37019, 37021,
-    37017, 37036, 37025, 37044, 37043, 37046, 37050, 37048, 37040, 37071,
-    37061, 37054, 37072, 37060, 37063, 37075, 37094, 37090, 37084, 37079,
-    37083, 37099, 37103, 37118, 37124, 37154, 37150, 37155, 37169, 37167,
-    37177, 37187, 37190, 21005, 22850, 21154, {f: 2, c: 21164}, 21182, 21759,
-    21200, 21206, 21232, 21471, 29166, 30669, [12085, 24308], [12048, 20981],
-    20988, [12223, 39727], [12059, 21430], 24321, 30042, 24047, 22348, 22441,
-    22433, 22654, 22716, 22725, 22737, 22313, 22316, 22314, 22323, 22329,
-    {f: 2, c: 22318}, 22364, 22331, 22338, 22377, 22405, 22379, 22406, 22396,
-    22395, 22376, 22381, 22390, 22387, 22445, 22436, 22412, 22450, 22479,
-    22439, 22452, 22419, 22432, 22485, 22488, 22490, 22489, 22482, 22456,
-    22516, 22511, 22520, 22500, 22493, 22539, 22541, 22525, 22509, 22528,
-    22558, 22553, 22596, 22560, 22629, 22636, 22657, 22665, 22682, 22656,
-    39336, 40729, 25087, 33401, 33405, 33407, 33423, 33418, 33448, 33412,
-    33422, 33425, 33431, 33433, 33451, 33464, 33470, 33456, 33480, 33482,
-    33507, 33432, 33463, 33454, {f: 2, c: 33483}, 33473, 33449, 33460, 33441,
-    33450, 33439, 33476, 33486, 33444, 33505, 33545, 33527, 33508, 33551,
-    33543, 33500, 33524, 33490, 33496, 33548, 33531, 33491, 33553, 33562,
-    33542, {f: 2, c: 33556}, 33504, 33493, 33564, 33617, {f: 2, c: 33627},
-    33544, 33682, 33596, 33588, 33585, 33691, 33630, 33583, 33615, 33607,
-    33603, 33631, 33600, 33559, 33632, 33581, 33594, 33587, 33638, 33637,
-    33640, 33563, 33641, 33644, 33642, {f: 2, c: 33645}, 33712, 33656,
-    {f: 2, c: 33715}, 33696, 33706, 33683, 33692, 33669, 33660, 33718, 33705,
-    33661, 33720, 33659, 33688, 33694, 33704, 33722, 33724, 33729, 33793,
-    33765, 33752, 22535, 33816, 33803, 33757, 33789, 33750, 33820, 33848,
-    33809, 33798, 33748, 33759, 33807, 33795, {f: 2, c: 33784}, 33770, 33733,
-    33728, 33830, 33776, 33761, 33884, 33873, 33882, 33881, 33907,
-    {f: 2, c: 33927}, 33914, 33929, 33912, 33852, 33862, 33897, 33910, 33932,
-    33934, 33841, 33901, 33985, 33997, 34000, 34022, 33981, 34003, 33994,
-    33983, 33978, 34016, 33953, 33977, 33972, 33943, 34021, 34019, 34060,
-    29965, 34104, 34032, 34105, 34079, 34106, 34134, 34107, 34047, 34044,
-    34137, 34120, 34152, 34148, 34142, 34170, 30626, 34115, 34162, 34171,
-    34212, 34216, 34183, 34191, 34169, 34222, 34204, 34181, 34233, 34231,
-    34224, 34259, 34241, 34268, 34303, 34343, 34309, 34345, 34326, 34364,
-    [12086, 24318], 24328, 22844, 22849, 32823, 22869, 22874, 22872, 21263,
-    [12074, 23586], 23589, 23596, 23604, 25164, 25194, 25247, 25275, 25290,
-    25306, 25303, 25326, 25378, 25334, 25401, 25419, 25411, 25517, 25590,
-    25457, 25466, 25486, 25524, 25453, 25516, 25482, 25449, 25518, 25532,
-    25586, 25592, 25568, 25599, 25540, 25566, 25550, 25682, 25542, 25534,
-    25669, 25665, 25611, 25627, 25632, 25612, 25638, 25633, 25694, 25732,
-    25709, 25750, 25722, {f: 2, c: 25783}, 25753, 25786, 25792, 25808, 25815,
-    25828, 25826, 25865, 25893, 25902, [12087, 24331], 24530, 29977, 24337,
-    21343, 21489, 21501, 21481, 21480, 21499, 21522, 21526, 21510, 21579,
-    {f: 3, c: 21586}, 21590, 21571, 21537, 21591, 21593, 21539, 21554, 21634,
-    21652, 21623, 21617, 21604, {f: 2, c: 21658}, 21636, 21622, 21606, 21661,
-    21712, 21677, 21698, 21684, 21714, 21671, 21670, {f: 2, c: 21715}, 21618,
-    21667, 21717, 21691, 21695, 21708, {f: 2, c: 21721}, 21724,
-    {f: 2, c: 21673}, 21668, 21725, 21711, 21726, 21787, 21735, 21792, 21757,
-    21780, 21747, {f: 2, c: 21794}, 21775, 21777, 21799, 21802, 21863, 21903,
-    21941, 21833, 21869, 21825, 21845, 21823, 21840, 21820, 21815, 21846,
-    {f: 3, c: 21877}, 21811, 21808, 21852, 21899, 21970, 21891, 21937, 21945,
-    21896, 21889, 21919, 21886, 21974, 21905, 21883, 21983, {f: 2, c: 21949},
-    21908, 21913, 21994, 22007, 21961, 22047, 21969, {f: 2, c: 21995}, 21972,
-    21990, 21981, 21956, 21999, 21989, {f: 2, c: 22002}, {f: 2, c: 21964},
-    21992, 22005, 21988, 36756, 22046, 22024, 22028, 22017, 22052, 22051,
-    22014, 22016, 22055, 22061, 22104, 22073, 22103, 22060, 22093, 22114,
-    22105, 22108, 22092, 22100, 22150, 22116, 22129, 22123, {f: 2, c: 22139},
-    22149, 22163, 22191, 22228, [12062, 22231], 22237, 22241, 22261, 22251,
-    22265, 22271, 22276, 22282, 22281, 22300, 24079, 24089, 24084, 24081,
-    24113, {f: 2, c: 24123}, 24119, 24132, 24148, 24155, 24158, 24161, 23692,
-    23674, 23693, 23696, 23702, 23688, {f: 2, c: 23704}, 23697, 23706, 23708,
-    23733, 23714, 23741, 23724, 23723, 23729, 23715, 23745, 23735, 23748,
-    23762, 23780, 23755, 23781, {f: 2, c: 23810}, 23847, 23846, 23854, 23844,
-    23838, 23814, 23835, 23896, 23870, 23860, 23869, 23916, 23899, 23919,
-    23901, 23915, 23883, 23882, 23913, 23924, 23938, 23961, 23965, 35955,
-    23991, 24005, [12091, 24435], 24439, 24450, 24455, 24457, 24460, 24469,
-    24473, 24476, 24488, 24493, 24501, 24508, 34914, [12090, 24417], 29357,
-    29360, 29364, {f: 2, c: 29367}, 29379, 29377, 29390, 29389, 29394, 29416,
-    29423, 29417, 29426, 29428, 29431, 29441, 29427, 29443, {f: 2, c: 29434},
-    29463, 29459, 29473, 29450, 29470, 29469, 29461, 29474, 29497, 29477,
-    29484, 29496, 29489, 29520, 29517, 29527, 29536, 29548, 29551, 29566,
-    [12167, 33307], 22821, 39143, 22820, [12065, 22786], 39267,
-    {f: 6, c: 39271}, 39284, 39287, 39293, 39296, 39300, 39303, 39306, 39309,
-    {f: 2, c: 39312}, {f: 3, c: 39315}, 24192, 24209, 24203, 24214, 24229,
-    24224, 24249, 24245, 24254, 24243, 36179, 24274, 24273, 24283, 24296,
-    24298, 33210, 24516, 24521, 24534, 24527, 24579, 24558, 24580, 24545,
-    24548, 24574, {f: 2, c: 24581}, 24554, 24557, 24568, 24601, 24629, 24614,
-    24603, 24591, 24589, 24617, 24619, 24586, 24639, 24609, {f: 2, c: 24696},
-    24699, 24698, 24642, 24682, 24701, 24726, 24730, 24749, 24733, 24707,
-    24722, 24716, 24731, 24812, 24763, 24753, 24797, 24792, 24774, 24794,
-    24756, 24864, 24870, 24853, 24867, 24820, 24832, 24846, 24875, 24906,
-    24949, 25004, 24980, 24999, 25015, 25044, 25077, 24541, 38579, 38377,
-    38379, 38385, 38387, {f: 2, c: 38389}, 38396, 38398, {f: 2, c: 38403},
-    38406, 38408, {f: 4, c: 38410}, 38415, 38418, {f: 3, c: 38421},
-    {f: 2, c: 38425}, 20012, [12121, 29247], 25109, 27701, 27732, 27740, 27722,
-    27811, 27781, 27792, 27796, 27788, {f: 2, c: 27752}, 27764, 27766, 27782,
-    27817, 27856, 27860, 27821, {f: 2, c: 27895}, 27889, 27863, 27826, 27872,
-    27862, 27898, 27883, 27886, 27825, 27859, 27887, 27902, 27961, 27943,
-    27916, 27971, 27976, 27911, 27908, 27929, 27918, 27947, 27981, 27950,
-    27957, 27930, 27983, 27986, 27988, 27955, 28049, 28015, 28062, 28064,
-    27998, {f: 2, c: 28051}, 27996, 28000, 28028, 28003, 28186, 28103, 28101,
-    28126, 28174, 28095, 28128, 28177, 28134, 28125, 28121, 28182, 28075,
-    28172, 28078, 28203, 28270, 28238, 28267, 28338, 28255, 28294,
-    {f: 2, c: 28243}, 28210, 28197, 28228, 28383, 28337, 28312, 28384, 28461,
-    28386, 28325, 28327, 28349, 28347, 28343, 28375, 28340, 28367, 28303,
-    28354, 28319, 28514, {f: 2, c: 28486}, 28452, 28437, 28409, 28463, 28470,
-    28491, 28532, 28458, 28425, 28457, 28553, 28557, 28556, 28536, 28530,
-    28540, 28538, 28625, 28617, 28583, 28601, 28598, 28610, 28641, 28654,
-    28638, 28640, 28655, 28698, 28707, 28699, 28729, 28725, 28751, 28766,
-    [12071, 23424], 23428, 23445, 23443, 23461, 23480, 29999, 39582, 25652,
-    23524, 23534, 35120, 23536, 36423, 35591, 36790, 36819, 36821, 36837,
-    36846, 36836, 36841, 36838, 36851, 36840, 36869, 36868, 36875, 36902,
-    36881, 36877, 36886, 36897, {f: 2, c: 36917}, 36909, 36911, 36932,
-    {f: 2, c: 36945}, 36944, 36968, 36952, 36962, 36955, 26297, 36980, 36989,
-    36994, 37000, 36995, 37003, [12089, 24400], 24407, 24406, 24408, 23611,
-    21675, 23632, 23641, 23409, 23651, 23654, 32700, 24362, 24361, 24365,
-    33396, 24380, 39739, [12076, 23662], 22913, 22915, 22925, {f: 2, c: 22953},
-    22947, 22935, 22986, 22955, 22942, 22948, 22994, 22962, 22959, 22999,
-    22974, {f: 2, c: 23045}, 23005, 23048, 23011, 23000, 23033, 23052, 23049,
-    23090, 23092, 23057, 23075, 23059, 23104, 23143, 23114, 23125, 23100,
-    23138, 23157, 33004, 23210, 23195, 23159, 23162, 23230, 23275, 23218,
-    23250, 23252, 23224, 23264, 23267, 23281, 23254, 23270, 23256, 23260,
-    23305, 23319, 23318, 23346, 23351, 23360, 23573, 23580, 23386, 23397,
-    23411, 23377, 23379, 23394, 39541, {f: 2, c: 39543}, 39546, 39551, 39549,
-    {f: 2, c: 39552}, 39557, 39560, 39562, 39568, {f: 2, c: 39570}, 39574,
-    39576, {f: 3, c: 39579}, {f: 2, c: 39583}, {f: 2, c: 39586}, 39589, 39591,
-    32415, 32417, 32419, 32421, {f: 2, c: 32424}, 32429, 32432, 32446,
-    {f: 3, c: 32448}, 32457, {f: 2, c: 32459}, 32464, 32468, 32471, 32475,
-    {f: 2, c: 32480}, 32488, 32491, {f: 2, c: 32494}, {f: 2, c: 32497}, 32525,
-    32502, {f: 2, c: 32506}, 32510, {f: 3, c: 32513}, {f: 2, c: 32519},
-    {f: 2, c: 32523}, 32527, {f: 2, c: 32529}, 32535, 32537, 32540, 32539,
-    32543, {f: 7, c: 32545}, {f: 4, c: 32554}, {f: 5, c: 32559}, 32565,
-    [12083, 24186], 30079, [12078, 24027], 30014, 37013, 29582, 29585, 29614,
-    29602, 29599, 29647, 29634, 29649, 29623, 29619, 29632, 29641, 29640,
-    29669, 29657, 39036, 29706, 29673, 29671, 29662, 29626, 29682, 29711,
-    29738, 29787, 29734, 29733, 29736, 29744, 29742, 29740, 29723, 29722,
-    29761, 29788, 29783, 29781, 29785, 29815, 29805, 29822, 29852, 29838,
-    {f: 2, c: 29824}, 29831, 29835, 29854, {f: 2, c: 29864}, 29840, 29863,
-    29906, 29882, {f: 3, c: 38890}, 26444, 26451, 26462, 26440, 26473, 26533,
-    26503, 26474, 26483, 26520, 26535, 26485, 26536, 26526, 26541, 26507,
-    26487, 26492, 26608, 26633, 26584, 26634, 26601, 26544, 26636, 26585,
-    26549, 26586, 26547, 26589, 26624, 26563, 26552, 26594, 26638, 26561,
-    26621, {f: 2, c: 26674}, {f: 2, c: 26720}, 26702, 26722, 26692, 26724,
-    26755, 26653, 26709, 26726, 26689, 26727, 26688, 26686, 26698, 26697,
-    26665, 26805, 26767, 26740, 26743, 26771, 26731, 26818, 26990, 26876,
-    {f: 2, c: 26911}, 26873, 26916, 26864, 26891, 26881, 26967, 26851, 26896,
-    26993, 26937, 26976, 26946, 26973, 27012, 26987, 27008, 27032, 27000,
-    26932, 27084, {f: 2, c: 27015}, 27086, 27017, 26982, 26979, 27001, 27035,
-    27047, 27067, 27051, 27053, 27092, 27057, 27073, 27082, 27103, 27029,
-    27104, 27021, 27135, 27183, 27117, {f: 2, c: 27159}, 27237, 27122, 27204,
-    27198, 27296, 27216, 27227, 27189, 27278, 27257, 27197, 27176, 27224,
-    27260, 27281, 27280, 27305, 27287, 27307, 29495, 29522, {f: 2, c: 27521},
-    27527, 27524, {f: 2, c: 27538}, 27533, {f: 2, c: 27546}, 27553, 27562,
-    36715, 36717, {f: 3, c: 36721}, {f: 2, c: 36725}, 36728, 36727,
-    {f: 2, c: 36729}, 36732, 36734, {f: 2, c: 36737}, 36740, 36743, 36747,
-    {f: 3, c: 36749}, 36760, 36762, 36558, 25099, 25111, 25115, 25119, 25122,
-    25121, 25125, 25124, 25132, 33255, 29935, 29940, 29951, 29967, 29969,
-    29971, [12097, 25908], {f: 3, c: 26094}, 26122, 26137, 26482, 26115, 26133,
-    26112, 28805, 26359, 26141, 26164, 26161, 26166, 26165, 32774, 26207,
-    26196, 26177, 26191, 26198, 26209, 26199, 26231, 26244, 26252, 26279,
-    26269, 26302, {f: 2, c: 26331}, 26342, 26345, {f: 2, c: 36146}, 36150,
-    36155, 36157, 36160, {f: 2, c: 36165}, {f: 2, c: 36168}, 36167, 36173,
-    36181, 36185, 35271, {f: 3, c: 35274}, {f: 4, c: 35278}, 29294, 29343,
-    29277, 29286, 29295, {f: 2, c: 29310}, 29316, 29323, 29325, 29327, 29330,
-    25352, 25394, 25520, 25663, 25816, 32772, 27626, 27635, 27645, 27637,
-    27641, 27653, 27655, 27654, 27661, 27669, {f: 3, c: 27672}, 27681, 27689,
-    27684, 27690, 27698, 25909, 25941, 25963, 29261, 29266, 29270, 29232,
-    34402, 21014, 32927, 32924, 32915, 32956, 26378, 32957, 32945, 32939,
-    32941, 32948, 32951, {f: 4, c: 32999}, 32987, 32962, 32964, 32985, 32973,
-    32983, 26384, 32989, 33003, 33009, 33012, 33005, {f: 2, c: 33037}, 33010,
-    33020, 26389, 33042, 35930, 33078, 33054, 33068, 33048, 33074, 33096,
-    33100, 33107, 33140, {f: 2, c: 33113}, 33137, 33120, 33129,
-    {f: 2, c: 33148}, 33133, 33127, 22605, 23221, 33160, 33154, 33169, 28373,
-    33187, 33194, 33228, 26406, 33226, 33211, 33217, 33190, 27428, 27447,
-    27449, 27459, 27462, 27481, {f: 3, c: 39121}, 39125, {f: 2, c: 39129},
-    [12110, 27571], 24384, 27586, 35315, 26000, 40785, 26003, 26044, 26054,
-    26052, 26051, 26060, 26062, 26066, 26070, 28800, 28828, 28822, 28829,
-    28859, 28864, 28855, 28843, 28849, 28904, 28874, 28944, 28947, 28950,
-    28975, 28977, 29043, 29020, 29032, 28997, 29042, 29002, 29048, 29050,
-    29080, 29107, 29109, 29096, 29088, 29152, 29140, 29159, 29177, 29213,
-    29224, 28780, 28952, 29030, 29113, 25150, 25149, 25155, {f: 2, c: 25160},
-    31035, 31040, 31046, 31049, {f: 2, c: 31067}, 31059, 31066, 31074, 31063,
-    31072, 31087, 31079, 31098, 31109, 31114, 31130, 31143, 31155, 24529,
-    24528, 24636, 24669, 24666, 24679, 24641, 24665, 24675, 24747, 24838,
-    24845, 24925, 25001, 24989, 25035, 25041, 25094, 32896, [12160, 32895],
-    27795, 27894, 28156, 30710, 30712, 30720, 30729, {f: 2, c: 30743}, 30737,
-    26027, 30765, {f: 2, c: 30748}, {f: 3, c: 30777}, 30751, 30780, 30757,
-    30764, 30755, 30761, 30798, 30829, {f: 2, c: 30806}, 30758, 30800, 30791,
-    30796, 30826, 30875, 30867, 30874, 30855, 30876, 30881, 30883, 30898,
-    30905, 30885, 30932, 30937, 30921, 30956, 30962, 30981, 30964, 30995,
-    31012, 31006, 31028, 40859, [12235, 40697], {f: 2, c: 40699}, 30449, 30468,
-    30477, 30457, {f: 2, c: 30471}, 30490, 30498, 30489, 30509, 30502, 30517,
-    30520, {f: 2, c: 30544}, 30535, 30531, 30554, 30568, 30562, 30565, 30591,
-    30605, 30589, 30592, 30604, 30609, {f: 2, c: 30623}, 30640, 30645, 30653,
-    30010, 30016, 30030, 30027, 30024, 30043, 30066, 30073, 30083, 32600,
-    32609, 32607, 35400, 32616, 32628, 32625, 32633, 32641, 32638, 30413,
-    30437, 34866, {f: 3, c: 38021}, 38027, 38026, {f: 2, c: 38028},
-    {f: 2, c: 38031}, 38036, 38039, 38037, {f: 3, c: 38042}, {f: 2, c: 38051},
-    38059, 38058, 38061, 38060, {f: 2, c: 38063}, 38066, 38068,
-    {f: 5, c: 38070}, {f: 2, c: 38076}, 38079, 38084, {f: 7, c: 38088},
-    {f: 3, c: 38096}, {f: 3, c: 38101}, 38105, 38104, 38107, {f: 3, c: 38110},
-    38114, {f: 2, c: 38116}, {f: 2, c: 38119}, 38122, 38121, 38123,
-    {f: 2, c: 38126}, {f: 3, c: 38131}, 38135, 38137, {f: 2, c: 38140}, 38143,
-    38147, 38146, {f: 2, c: 38150}, {f: 2, c: 38153}, {f: 3, c: 38157},
-    {f: 5, c: 38162}, 38168, 38171, {f: 3, c: 38173}, 38178, {f: 2, c: 38186},
-    38185, 38188, {f: 2, c: 38193}, 38196, {f: 3, c: 38198}, 38204,
-    {f: 2, c: 38206}, 38210, 38197, {f: 3, c: 38212}, 38217, 38220,
-    {f: 2, c: 38222}, {f: 3, c: 38226}, {f: 4, c: 38230}, 38235,
-    {f: 2, c: 38238}, 38237, {f: 2, c: 38241}, {f: 9, c: 38244}, 38255,
-    {f: 3, c: 38257}, 38202, 30695, 30700, 38601, 31189, 31213, 31203, 31211,
-    31238, 23879, 31235, 31234, 31262, 31252, 31289, 31287, 31313, 40655,
-    39333, 31344, 30344, 30350, 30355, 30361, 30372, 29918, 29920, 29996,
-    40480, 40482, {f: 5, c: 40488}, 40498, 40497, 40502, 40504, 40503,
-    {f: 2, c: 40505}, 40510, {f: 2, c: 40513}, 40516, {f: 4, c: 40518},
-    {f: 2, c: 40523}, 40526, 40529, 40533, 40535, {f: 3, c: 40538}, 40542,
-    40547, {f: 7, c: 40550}, 40561, 40557, 40563, [12135, 30098], 30100, 30102,
-    30112, 30109, 30124, 30115, {f: 2, c: 30131}, 30136, 30148, 30129, 30128,
-    30147, 30146, 30166, 30157, 30179, 30184, 30182, 30180, 30187, 30183,
-    30211, 30193, 30204, 30207, 30224, 30208, 30213, 30220, 30231, 30218,
-    30245, 30232, 30229, 30233, 30235, 30268, 30242, 30240, 30272, 30253,
-    30256, 30271, 30261, 30275, 30270, 30259, 30285, 30302, 30292, 30300,
-    30294, 30315, 30319, 32714, 31462, {f: 2, c: 31352}, 31360, 31366, 31368,
-    31381, 31398, 31392, 31404, 31400, 31405, 31411, 34916, 34921, 34930,
-    34941, 34943, 34946, 34978, 35014, 34999, 35004, 35017, 35042, 35022,
-    35043, 35045, 35057, 35098, 35068, 35048, 35070, 35056, 35105, 35097,
-    35091, 35099, 35082, 35124, 35115, 35126, 35137, 35174, 35195,
-    [12134, 30091], 32997, 30386, 30388, 30684, [12158, 32786], 32788, 32790,
-    32796, 32800, 32802, {f: 3, c: 32805}, 32809, 32808, 32817, 32779, 32821,
-    32835, 32838, 32845, 32850, 32873, 32881, 35203, 39032, 39040, 39043,
-    39049, {f: 2, c: 39052}, 39055, 39060, {f: 2, c: 39066}, {f: 2, c: 39070},
-    {f: 2, c: 39073}, {f: 2, c: 39077}, [12172, 34381], 34388, 34412, 34414,
-    34431, 34426, 34428, 34427, 34472, 34445, 34443, 34476, 34461, 34471,
-    34467, 34474, 34451, 34473, 34486, 34500, 34485, 34510, 34480, 34490,
-    34481, 34479, 34505, 34511, 34484, 34537, {f: 2, c: 34545}, 34541, 34547,
-    34512, 34579, 34526, 34548, 34527, 34520, 34513, 34563, 34567, 34552,
-    34568, 34570, 34573, 34569, 34595, 34619, 34590, 34597, 34606, 34586,
-    34622, 34632, 34612, 34609, 34601, 34615, 34623, 34690, 34594,
-    {f: 2, c: 34685}, 34683, 34656, 34672, 34636, 34670, 34699, 34643, 34659,
-    34684, 34660, 34649, 34661, 34707, 34735, 34728, 34770, 34758, 34696,
-    34693, 34733, 34711, 34691, 34731, 34789, 34732, 34741, 34739, 34763,
-    34771, 34749, 34769, 34752, 34762, 34779, 34794, 34784, 34798, 34838,
-    34835, 34814, 34826, 34843, 34849, 34873, 34876, [12152, 32566], 32578,
-    {f: 2, c: 32580}, 33296, 31482, 31485, 31496, {f: 2, c: 31491}, 31509,
-    31498, 31531, 31503, 31559, 31544, 31530, 31513, 31534, 31537, 31520,
-    31525, 31524, 31539, 31550, 31518, 31576, 31578, 31557, 31605, 31564,
-    31581, 31584, 31598, 31611, 31586, 31602, 31601, 31632, {f: 2, c: 31654},
-    31672, 31660, 31645, 31656, 31621, 31658, 31644, 31650, 31659, 31668,
-    31697, 31681, 31692, 31709, 31706, {f: 2, c: 31717}, 31722, 31756, 31742,
-    31740, 31759, 31766, 31755, 31775, 31786, 31782, 31800, 31809, 31808,
-    33278, {f: 2, c: 33281}, 33284, 33260, 34884, {f: 3, c: 33313}, 33325,
-    33327, 33320, 33323, 33336, 33339, {f: 2, c: 33331}, 33342, 33348, 33353,
-    33355, 33359, 33370, 33375, 33384, 34942, 34949, 34952, 35032, 35039,
-    35166, 32669, 32671, 32679, {f: 2, c: 32687}, 32690, 31868, 25929, 31889,
-    31901, 31900, 31902, 31906, 31922, {f: 2, c: 31932}, 31937, 31943,
-    {f: 2, c: 31948}, 31944, 31941, 31959, 31976, [12169, 33390], 26280, 32703,
-    32718, 32725, 32741, 32737, 32742, 32745, 32750, 32755, [12151, 31992],
-    32119, 32166, 32174, 32327, 32411, 40632, 40628, 36211, 36228, 36244,
-    36241, 36273, 36199, 36205, 35911, 35913, 37194, 37200, {f: 2, c: 37198},
-    37220, 37218, 37217, 37232, 37225, 37231, {f: 2, c: 37245}, 37234, 37236,
-    37241, 37260, 37253, 37264, 37261, 37265, {f: 2, c: 37282}, 37290,
-    {f: 3, c: 37293}, 37301, 37300, 37306, [12183, 35925], 40574, 36280, 36331,
-    36357, 36441, 36457, 36277, 36287, 36284, 36282, 36292, {f: 2, c: 36310},
-    36314, 36318, {f: 2, c: 36302}, 36315, 36294, 36332, {f: 2, c: 36343},
-    36323, 36345, 36347, 36324, 36361, 36349, 36372, 36381, 36383, 36396,
-    36398, 36387, 36399, 36410, 36416, 36409, 36405, 36413, 36401, 36425,
-    {f: 2, c: 36417}, {f: 2, c: 36433}, 36426, 36464, 36470, 36476, 36463,
-    36468, 36485, 36495, 36500, 36496, 36508, 36510, [12184, 35960], 35970,
-    35978, 35973, 35992, 35988, 26011, 35286, 35294, 35290, 35292, 35301,
-    35307, 35311, 35390, 35622, 38739, 38633, 38643, 38639, 38662, 38657,
-    38664, 38671, 38670, 38698, 38701, 38704, 38718, 40832, 40835,
-    {f: 6, c: 40837}, 40844, 40702, 40715, 40717, [12203, 38585],
-    {f: 2, c: 38588}, 38606, 38610, 30655, 38624, 37518, 37550, 37576, 37694,
-    37738, 37834, 37775, 37950, 37995, 40063, 40066, {f: 4, c: 40069}, 31267,
-    40075, 40078, {f: 3, c: 40080}, {f: 2, c: 40084}, {f: 2, c: 40090},
-    {f: 6, c: 40094}, {f: 5, c: 40101}, 40107, {f: 2, c: 40109},
-    {f: 8, c: 40112}, {f: 4, c: 40122}, {f: 4, c: 40132}, {f: 7, c: 40138},
-    {f: 3, c: 40147}, {f: 3, c: 40151}, {f: 2, c: 40156}, 40159, 40162, 38780,
-    38789, {f: 2, c: 38801}, 38804, 38831, 38827, 38819, 38834, 38836, 39601,
-    39600, 39607, 40536, 39606, 39610, 39612, 39617, 39616, 39621, 39618,
-    {f: 2, c: 39627}, 39633, 39749, 39747, 39751, 39753, 39752, 39757, 39761,
-    39144, 39181, 39214, 39253, 39252, [12221, 39647], 39649, 39654, 39663,
-    39659, 39675, 39661, 39673, 39688, 39695, 39699, 39711, 39715,
-    {f: 2, c: 40637}, 32315, 40578, {f: 2, c: 40583}, 40587, 40594, 37846,
-    40605, 40607, {f: 3, c: 40667}, 40672, 40671, 40674, 40681, 40679, 40677,
-    40682, 40687, 40738, 40748, 40751, 40761, 40759, {f: 2, c: 40765}, 40772,
-    12295, {s: 13}, 30362, 34297, 31001, 24859, 39599, 35158, 22761, 32631,
-    25850, 25943, 38930, 36774, 32070, 24171, 32129, 37770, 35607, 39165,
-    23542, 22577, 39825, 36649, [12185, 35997], 37575, 29437, 20633, 24970,
-    32179, 31558, 30050, 25987, 24163, 38281, 37002, 32232, 36022, 35722,
-    36783, 36782, 27161, 40009, 30303, 28693, 28657, 36051, 25839, 39173,
-    25765, 37474, 37457, 39361, 35036, 36001, 21443, 34870, 27544, 24922,
-    24920, 29158, 33980, 33369, 20489, 28356, 21408, 20596, 28204, 23652,
-    35435, 25881, 25723, 34796, 39262, 35730, 32399, 37855, 29987, 38369,
-    39019, 22580, 22039, [12199, 38263], 20767, 33144, 24288, 26274, 37396,
-    [12190, 36554], 24505, 22645, 38515, 35183, 31281, 25074, 35488, 39425,
-    36978, 39347, [12242, 40786], 29118, 34909, 34802, 23541, 30087, 36490,
-    31820, 32162, 37276, 37604, 38619, 30990, 20786, 35320, 34389, 20659,
-    30241, 38358, 21109, 37656, 32020, 32189, 36781, 35422, 36060, 32880,
-    24478, 21474, 36517, 31428, 37679, 36948, 24118, 36024, 25812, 21934,
-    37170, 25763, 33213, 24986, 35477, 24392, 30070, 25803, 40680, 34153,
-    27284, 25623, 23798, 31153, 23566, 29128, 37159, 25973, 28364, 36958,
-    32224, 39003, 40670, 22666, 38651, 28593, 37347, 35519, 35548, 37336,
-    38914, 37664, 35330, 26481, 21205, 26847, 20941, [12222, 39717], 29346,
-    29544, 35712, 36077, 37709, 37723, 26039, 32222, 38538, 23565, 22136,
-    38931, 37389, 22890, 22702, 40285, 38989, 35355, 24801, 39187, 20818,
-    29246, 39180, 36019, 30332, 32624, 38309, 31020, 37353, 29033, 31684,
-    36009, 39151, 35370, 32033, [12214, 39131], 35513, 24290, 36027, 32027,
-    22707, 22894, 24996, 31966, 35920, 26963, 37586, [12213, 39080], 30219,
-    39342, 32299, 35575, 40179, 33178, 36667, 25771, 36628, 36070, 24489,
-    36000, 35331, 23142, 32283, 35442, 37411, 33995, 24185, 36245, 36123,
-    23713, 21083, 37628, 32177, 23831, 37804, 25841, 40255, 38307, 37499,
-    20491, 32102, 40852, 38799, 36002, 37390, 28317, 27083, 36092, 34865,
-    39015, 21102, 38364, 35264, 39208, 24931, 36011, 24291, 35215, 27512,
-    [12244, 40860], 38312, 36556, 35437, 27331, 36020, 21130, 36645, 37707,
-    22283, 36942, 39405, 38867, 28450, 34399, 38305, 40372, 36032, 36703,
-    40251, 32005, 22778, 35703, 28396, 22057, 33775, 30059, 21123, 35441,
-    25079, 22750, 27489, 29872, 36996, 32233, 35594, 25582, 36637, 36036,
-    31330, 26371, 29172, 21295, 35569, 35496, 32362, 33911, 28222, 29554,
-    36008, 31117, 25802, 27231, 31309, 39249, 35663, 40388, 32318, 32221,
-    26997, 36655, 32026, 25824, 24190, 34186, 21137, 28639, 35336, 35352,
-    38555, 32380, 32000, 22846, 33698, 38960, 36040, 37440, 20729, 39381,
-    27570, 30435, 22533, 31627, 38291, 33393, 32216, 32365, 27298, 40572,
-    25536, 25791, 31777, 20745, 34214, 27323, 37970, 36368, 36068,
-    [12178, 35211], 37749, 33382, 21133, 39198, 28472, 28666, 28567, 23559,
-    28479, 34083, 27123, 22892, 35611, 37292, 33184, 28550, 39509, 23308,
-    25898, 37496, 30703, 20709, 39171, 32371, 32094, 36686, 36611, 38542,
-    31680, 28500, 32080, 35489, 32202, 37670, 20677, 35641, 36914, 29180,
-    30433, 21185, 33686, 39912, 39514, 32147, 38968, 37857, 24465, 30169,
-    31478, 31998, 33290, 39378, 33289, 25818, 37624, 25084, 21127, 40273,
-    32121, 35258, 35363, 32118, 37406, 36557, 39423, 38283, 20977, 38982,
-    27579, 35506, 22718, 25031, 25715, 24235, 35122, 35463, 22602, 20744,
-    23532, 31014, 26336, 34407, 24011, 31418, 39243, 28528, 25844, 38346,
-    34847, 33240, 33802, 20358, 36084, 34253, 27396, 25876, 31811, 38348,
-    34349, 28734, 35733, 25900, 35261, 25078, 32412, 29211, 28651, 25736,
-    21214, 28551, 27138, 37939, 22744, 39006, 31852, 38626, 28757, 35023,
-    39881, 31150, 40599, 21426, 21237, 31019, 27511, 28701, 38584, 20486,
-    32879, 34030, 36899, 37934, 24976, 28451, 31806, 25986, 33225, 37832,
-    25088, 29001, 32244, 31975, 20841, 36635, 35538, 30274, 36988, 37904,
-    29557, 33256, 37168, 40023, 36035, 40801, 37428, 38728, 23994, 38936,
-    39230, 21129, [12243, 40845], 32894, 22184, 31840, 22751, 25871, 38580,
-    27155, 23105, 25695, 31757, 34310, 30439, 39025, 24300, 29200, 25796,
-    28407, 34396, 39791, 36034, 37682, 38520, 39522, 37569, 23650, 32311,
-    24942, 28670, 32209, 24018, 25891, 23423, 28772, 20098, 25476, 36650,
-    20523, 20374, 28138, 32184, 35542, 34367, 32645, 37007, 38012, 31854,
-    39486, 39409, 32097, 23229, 29802, 30908, 34718, [12218, 39340], 39393,
-    21966, 36023, [12230, 40613], 36067, 36993, 30622, 39237, 34875, 28415,
-    35646, 37672, 37466, 36031, 37762, [12200, 38272], 24758, 20497, 37683,
-    22818, 35598, 24396, 35219, 32191, 32236, 24287, 28357, 25003, 38313,
-    40180, 37528, 35628, 35584, 30045, 37385, 32013, 38627, 25747, 33126,
-    24817, 39719, 39186, 25836, 33193, 25862, 37312, [12227, 40165], 32886,
-    22169, 38007, 37811, 27320, 29552, 23527, 25840, 28632, 37397, 32016,
-    33215, 28611, 36786, 30247, 35582, 27472, 40407, 27590, 22036, 28442,
-    30436, 40848, 36064, 22132, 40300, 39449, 39108, 38971, 36007, 34315,
-    24977, 35413, 28497, 38935, 25778, 37610, 20693, 27192, 35676, 33229,
-    [12241, 40778], 39438, 35912, 21843, 27683, 35350, 29309, 37370, 37467,
-    36983, 31805, 35609, 37666, 37463, 28154, 35700, 22649, 27085, 21958,
-    22715, 34196, 25654, 37740, 27211, 21932, 20689, 32761, 31429, 31434,
-    27453, 35242, 23522, 36629, 27691, 20670, 38915, 35531, 24950, 29898,
-    31406, 36264, 21312, 36544, 39493, 40818, 39028, 27402, 21240, 40306,
-    30906, 35731, 39250, 25854, 32350, 29105, 38860, 35469, 32009, 27054,
-    32104, 36575, 37613, 38287, 28516, 28753, 34217, 39955, 36093, 20632,
-    21930, 39479, 25475, 28544, 27578, 32023, 31721, 26348, 38275, 38493,
-    36109, 32341, 20663, 36062, 29138, 32057, 36050, 25448, 25885, 25086,
-    35373, 32051, 23529, 23352, 33102, 28402, 32882, 32361, 21213, 32854,
-    24107, 29509, 28629, 35433, 26178, 34645, 23526, 35672, 39387, 21218,
-    36969, 37323, 39166, 35222, 35430, 22781, 29560, 27166, 36664, 26360,
-    36118, 23660, 34899, 27193, 31466, 25976, 24101, 38617, 35504, 38918,
-    35500, 30889, 29197, 32114, 39164, 39686, 32883, 24939, 38924, 35359,
-    35494, 25851, 34311, 35380, 32901, 38614, 38568, 32143, 27506, 23403,
-    25613, 32302, 29795, 37782, 29562, 25787, 33274, 24907, 25892, 36010,
-    30321, 28760, 22727, 35674, 35527, 22022, 28271, 29145, 28644, 32295,
-    35342, 39472, 35588, 37563, 38988, 39636, 26781, 36028, 37941, 24307,
-    32893, 28916, 37509, 32113, 38957, 22294, 22615, 22296, 38973, 40213,
-    39345, 39389, 27234, 31402, 35178, 24398, 28771, 38929, 33836, 32178,
-    [12209, 38859], 36949, 22285, 29234, 28656, 32173, 33894, 20553, 20702,
-    32239, 35586, 34907, 32862, 32011, 31337, 21839, 25790, 34680, 28198,
-    31401, 21978, 37794, 28879, 35491, 28961, 34154, 22626, 38695, 21209,
-    35492, 37675, 29351, 35186, 32722, 37521, 25138, 32048, 34662, 36676,
-    23805, 20448, 29433, 22151, 37697, 39854, 32406, 36066, 37532, 38289,
-    39023, 38570, 29694, 29563, 32291, 39201, 25010, 32171, 38002, 37129,
-    35443, 38911, 38917, 34157, 22210, 37559, 26313, 22063, 21332, 25406,
-    33029, 35559, 23531, 28681, 35613, 37573, 37313, 33288, 37561, 32137,
-    38920, 35377, 32210, 32396, 36562, 25080, 36984, 30316, 32098, 23416,
-    21211, 35426, 23563, 39348, 35347, 35338, 36956, 22739, 40201, 40232,
-    21854, 20126, 35357, 38329, 40573, 22196, 38996, 38331, 33399, 21421,
-    30831, 35578, 39511, 40230, 26954, 25562, 30221, 38525, 30306, 39178,
-    27171, 22575, 35617, 34277, 29242, [12212, 38913], 26989, 33865, 37291,
-    37541, 38948, 36986, 20736, 34811, 34269, 20740, 25014, 32681, 35427,
-    35696, 35516, 35695, 32377, 34093, 38512, 37504, 39154, 38577, 27387,
-    23344, 40441, 25033, 32403, 29801, 34722, 29151, 29074, 34821, 36111,
-    31310, 21938, 25793, 20653, 30320, 36404, 20778, 24962, 37109, 37438,
-    29494, 35480, 36671, 39192, [12226, 39770], 28417, 33287, 23996, 35486,
-    39729, 29508, 35709, 38928, 39341, 40219, 28149, 36677, 22290, 21729,
-    22291, 32227, 36960, 39000, 32004, 36493, 38000, 38322, 38642, 37142,
-    38549, 36939, 34292, 37270, 26248, 38620, 36617, 25890, 26283, 36106,
-    36124, 33247, 38015, 26839, 31432, 36012, 25799, 21063, 28580, 36042,
-    36104, 36555, 37720, 38296, 35408, 40779, 20661, 27656, 30430, 26028,
-    36670, 23940, 26855, 25136, 32187, 24373, 28466, 24115, 36076, 33081,
-    36249, 34756, 36685, 37754, 36889, 35998, 37341, 20597, 35386, 37806,
-    38499, 24128, 30309, 37165, 35657, 32340, 32887, 22519, 34937, 32025,
-    25711, 25842, 24159, 36074, 28399, 37912, 32066, 31278, 33131, 34886,
-    35589, 36600, 30394, 26205, 39519, 35576, 35461, 29165, 30682, 22225,
-    36015, 37956, 31689, 39376, 23560, 30938, 36681, 36090, 27137, 33674,
-    35037, 22941, 22767, 29376, 37648, 36101, 22684, 32180, 35524, 28310,
-    28609, 36039, 28460, 32156, 32317, 32305, 37138, 35419, 32068, 38013,
-    21959, 21401, 21428, 38760, 36107, 21293, 21297, 36094, 21060, 21132,
-    21108, 20660, 20480, 20630, 20757, 20738, 20756, 20796, 20791, 20712,
-    20674, 20795, 20752, 20794, 20681, 31988, 40652, 22213, 40172, 35131,
-    33248, 35329, 35344, 35340, 35349, 35635, 35406, 35365, 35393, 35382,
-    35398, 35412, 35416, 35410, 35462, 35460, 35455, 35440, 35452, 35445,
-    35436, 35438, 35533, 35554, 35425, 35482, 35493, {f: 2, c: 35473}, 35535,
-    35537, 35529, 35547, 35543, 35522, 35510, 35574, 35563, 35604, 35585,
-    35556, 35565, 35580, 35571, 35558, 35566, 35550, 35624, 35740, 35606,
-    35610, 35600, 35627, 35629, 35670, 35673, 35662, 35742, 35691, 35734,
-    38488, 37178, 37140, 37172, 37087, 37174, 37126, 37192, 33467, 21233,
-    24048, 22538, 22745, 22754, 22752, 22746, 22497, 22607, 22550, 22610,
-    22557, 22628, 34188, 34131, 34294, 33703, 33799, 34031, 33511, 34338,
-    34086, 22603, 29026, 34136, 34045, 34126, 34184, 34234, 29334, 28366,
-    34113, 34254, 34130, 33984, 33874, 33892, 33940, 33845, 34207, 34133,
-    40367, 33939, 32264, 34118, 34146, 34078, 39488, 34362, 37795, 34167,
-    34334, 34298, 34308, 34282, 34330, 22889, 23607, 25451, 25718, 25759,
-    25681, 25692, 25779, 25860, 25878, 25847, 25852, 25883, 22064, 22072,
-    22216, 22182, 21764, 21692, 22144, 22109, 22112, 22069, 22006, 22118,
-    22130, 22156, 22117, 22044, 22062, 21993, 22038, 22208, 22029, 22195,
-    22209, 22127, 36705, 22198, 22165, 22279, 24131, 24172, 24152, 24151,
-    23943, 23796, 23888, 23852, 23975, 23968, 23959, 23821, 23992, 23937,
-    24020, 24480, 29559, 29505, 29546, 29499, 29547, 29568, 29564, 39136,
-    39219, 39145, 39228, {f: 2, c: 39146}, 39149, 39156, 39177, 39185, 39195,
-    39223, 39231, 39235, {f: 3, c: 39240}, 39244, 39266, 24289, 36065, 25082,
-    25006, 24938, 24894, 24757, 24884, 25036, 24927, 25064, 24827, 24887,
-    24818, 24947, 24860, 24978, 38274, 38278, 38344, 38286, 38292, 38284,
-    38373, 38317, 38315, 39726, 38316, 38334, 38326, 39721, 38335, 38333,
-    38332, 38339, 38347, 38356, 38352, 38357, 38366, 28739, 28505, 28711,
-    28696, 28668, 28039, 28025, 28254, 28590, 28687, 28408, 28527, 28150,
-    28543, 28678, 28576, 28683, 28775, 28740, 28677, 28535, 28704, 28703,
-    28722, 28712, 28765, 39467, 36999, 36885, 37008, 23656, 24371, 23285,
-    23255, 23296, 23149, 23304, 23372, 23207, 23291, 23307, 23329, 23338,
-    23321, 39380, 39391, 39385, 39478, 39515, 39377, 39384, 39501, 39498,
-    39394, 39530, 39439, 39437, 39429, 39490, 39469, 39446, 39489, 39470,
-    39480, {f: 2, c: 39491}, 39503, 39525, 39524, 31993, 32006, 32002,
-    {f: 2, c: 32007}, 32394, 32028, 32021, 32019, 32058, 32050, 32049, 32272,
-    32060, 32064, 32063, 32093, 32078, 32115, 32134, 32131, 32136, 32190,
-    32186, 32203, 32212, 32196, 32158, 32172, 32185, 32163, 32176, 32199,
-    32217, 32215, 32249, 32242, 32354, 32230, 32246, 32241, 32267, 32225,
-    32265, 32285, 32287, 32286, 32301, 32266, 32273, 32381, 32313, 32309,
-    32306, 32326, 32325, 32392, 32346, 32338, 32366, 32382, 32368, 32367,
-    32408, 29859, 29771, 29903, 38922, 29885, 29759, 29833, 29862, 29908,
-    29914, 38873, 38878, 38876, 27050, 27370, 26776, 26838, 27141, 26783,
-    27355, 27379, 27368, 27359, 27273, 26895, 27208, 26984, 27071, 27194,
-    27292, 27410, 27422, 27357, 27111, 27407, 27414, 27372, 27354, 27384,
-    27315, 27367, 27299, 27347, 27358, 27556, 27550, 27566, 27563, 27567,
-    36564, 36571, 36594, 36603, 36708, 36601, 36604, 36587, 36580, 36706,
-    36602, 36606, 36618, 36615, 36613, 36626, 36646, {f: 2, c: 36638}, 36636,
-    36659, 36678, 36692, 25108, 25127, 29964, 26311, 26308, 26249, 26326,
-    36033, 36016, 36026, 36029, 36100, 36018, 36037, 36112, 36049, 36058,
-    36053, 36075, 36071, 36091, 35224, 35244, 35233, 35263, 35238, 35247,
-    35250, 35255, 27647, 27660, 27692, 29272, 26407, 33110, 33242, 33051,
-    33214, 33121, 33231, 27487, {f: 2, c: 39086}, 39094, 39100, 39110, 39112,
-    36674, 40783, 26005, 29036, 29010, 29079, 29121, 29148, 29182, 31152,
-    31118, 31146, 25055, 24932, 25059, 25095, 28585, 30959, 30893, 30824,
-    30904, 31018, 31025, 30820, 30973, 30951, 30947, 40853, 30616, 30558,
-    30652, 32646, 32648, {f: 3, c: 37330}, 37337, 37335, 37333, 37367, 37351,
-    37348, 37702, 37365, 37369, 37384, 37414, 37445, 37393, 37392, 37377,
-    37415, 37380, 37413, 37376, 37434, 37478, 37431, 37427, 37461, 37437,
-    37432, 37470, {f: 2, c: 37484}, 37439, 37984, 37424, 37449, 37448, 37453,
-    37422, 37433, 37944, 37548, 37536, 37498, 37546, 37614, 37583, 37891,
-    37603, 37946, 37553, 37542, 37799, 37526, 37580, 37545, 37877, 37523,
-    37503, 37801, 37530, 37658, 37547, 37507, 37899, 37544, 37539, 37906,
-    37688, 37617, 37847, 37605, 37616, 37615, 37608, 37564, 37597, 37622,
-    {f: 2, c: 37926}, 37571, 37599, 37606, 37650, 37638, 37737, 37659, 37696,
-    37633, 37653, 37678, 37699, {f: 2, c: 37639}, 37663, 37657, 37733, 37703,
-    37750, 37716, 37732, 37802, 37744, 37764, 37860, 37848, 37928, 37767,
-    37836, 37784, 37816, 37823, 37798, 37808, 37813, 37964, 37858,
-    {f: 2, c: 37852}, 37837, 37854, 37827, 37831, 37841, 37908, 37917, 37879,
-    37989, 37907, 37997, 37920, 38009, 37881, 37913, 37962, 37938, 37951,
-    37972, 37987, 37758, 31329, 40169, 40182, 40199, 40198, 40227, 40327,
-    40469, 40221, 40223, 40421, 40239, 40409, 40240, 40258, 40478, 40275,
-    40477, 40288, 40274, 40435, 40284, 40289, 40339, 40298, 40303, 40329,
-    40344, 40346, 40384, 40357, 40361, 40386, 40380, 40474, 40403, 40410,
-    40431, 40422, 40434, 40440, 40460, 40442, 40475, 30308, 30296, 30311,
-    30210, {f: 2, c: 30278}, 30281, 30238, 30267, {f: 2, c: 30317}, 30313,
-    30322, 31431, 31414, 35168, 35123, 35165, 35143, 35128, 35172, 30392,
-    32814, 32812, 32889, 32885, 38919, {f: 2, c: 38926}, 38945, 38940, 28481,
-    38950, 38967, 38990, 38995, 39027, 39010, 39001, 39013, 39020, 39024,
-    34787, 34822, 34566, 34851, 34806, 34554, 34799, 34692, 34832, 34760,
-    34833, 34747, 34766, 32588, 31716, 31591, 31849, 31731, 31744, 31691,
-    31836, 31774, 31787, 31779, 31850, 31839, 33380, 33387, 35018, 32677,
-    31986, 31990, 31965, 32310, 40617, 36274, 37317, 37315, 40570, 36489,
-    36428, 36498, 36474, 36437, 36506, 36491, 36499, 36497, 36513, 36451,
-    36522, 36518, 35316, 35318, 38746, 38722, 38717, 38724, 40788, 40799,
-    40793, 40800, 40796, 40806, 40812, 40810, 40823, [12236, 40701], 40703,
-    40713, 35726, 38014, 37864, 39799, 39796, 39809, 39811, 39822, 40056,
-    31308, 39826, 40031, 39824, 39853, 39834, 39850, 39838, 40045, 39851,
-    39837, 40024, 39873, 40058, 39985, 39993, 39971, 39991, 39872, 39882,
-    39879, 39933, 39894, {f: 2, c: 39914}, 39905, 39908, 39911, 39901, 39906,
-    39920, 39899, 39924, 39892, 40029, 39944, 39952, 39949, 39954, 39945,
-    39935, 39968, 39986, 39981, 39976, 39973, 39977, 39987, 39998, 40008,
-    39995, 39989, 40005, 40022, 40020, 40018, 40039, 38851, 38845, 38857,
-    40379, 39631, 39638, 39637, 39768, 39758, 39255, 39260, 39714, 40695,
-    40690, 35180, 38342, 37686, 24390, 34068, 32404, 40803, 22137, 40725,
-    22081, 39662, 35079, 31296, 39091, 38308, 39693, 36852, 24409, 31339,
-    39138, 20642, 34193, 20760, 25458, 21067, 30543, 32397, 26310, 30637,
-    [12228, 40565], 22217, 40692, 28635, 25054, 30663, 28720, 40629, 34890,
-    38370, 38854, 31844, 32308, 38822, 40623, 22220, 39089, 27311, 32590,
-    31984, 20418, 32363, 40569, 22190, 39706, 33903, 31142, 31858, 39634,
-    38587, 32251, 35069, 30787, {f: 10, c: 8560}, {f: 2, c: 714}, 729, 8211,
-    8213, 8229, 8245, 8453, 8457, {f: 4, c: 8598}, 8725, 8735, 8739, 8786,
-    {f: 2, c: 8806}, 8895, {f: 36, c: 9552}, {f: 15, c: 9601}, {f: 3, c: 9619},
-    {f: 2, c: 9660}, {f: 4, c: 9698}, 9737, 8853, 12306, {f: 2, c: 12317},
-    {f: 9, c: 12321}, 12963, {f: 2, c: 13198}, {f: 3, c: 13212}, 13217, 13252,
-    13262, {f: 2, c: 13265}, 13269, 65072, 65506, 65508, 8481, 12849, 8208,
-    12540, {f: 2, c: 12443}, {f: 2, c: 12541}, 12294, {f: 2, c: 12445},
-    {f: 10, c: 65097}, {f: 4, c: 65108}, {f: 14, c: 65113}, {f: 4, c: 65128},
-    12350, {f: 12, c: 12272}, 19970, {f: 3, c: 19972}, 19983, 19986, 19991,
-    {f: 3, c: 19999}, 20003, 20006, 20009, {f: 2, c: 20014}, 20017, 20019,
-    20021, 20023, 20028, {f: 3, c: 20032}, 20036, 20038, 20042, 20049, 20053,
-    20055, {f: 2, c: 20058}, {f: 4, c: 20066}, {f: 2, c: 20071},
-    {f: 6, c: 20074}, 20082, {f: 10, c: 20084}, {f: 3, c: 20095},
-    {f: 2, c: 20099}, [12037, 20101], 20103, 20106, 20112, {f: 2, c: 20118},
-    20121, {f: 2, c: 20124}, 20131, 20138, {f: 3, c: 20143}, 20148,
-    {f: 4, c: 20150}, {f: 3, c: 20156}, 20168, 20172, {f: 2, c: 20175}, 20178,
-    {f: 3, c: 20186}, 20192, 20194, {f: 2, c: 20198}, 20201, {f: 3, c: 20205},
-    20209, 20212, {f: 3, c: 20216}, 20220, 20222, 20224, {f: 7, c: 20226},
-    {f: 2, c: 20235}, {f: 5, c: 20242}, {f: 2, c: 20252}, 20257, 20259,
-    {f: 2, c: 20264}, {f: 3, c: 20268}, 20273, 20275, 20277, 20279, 20281,
-    20283, {f: 5, c: 20286}, {f: 2, c: 20292}, {f: 6, c: 20295}, 20306, 20308,
-    20310, {f: 2, c: 20321}, 20326, 20328, {f: 2, c: 20330}, {f: 2, c: 20333},
-    {f: 2, c: 20337}, 20341, {f: 4, c: 20343}, 20349, {f: 3, c: 20352}, 20357,
-    20359, 20362, 20364, 20366, 20368, {f: 2, c: 20370}, 20373,
-    {f: 3, c: 20376}, 20380, {f: 2, c: 20382}, {f: 2, c: 20385}, 20388, 20395,
-    20397, {f: 5, c: 20400}, {f: 9, c: 20406}, {f: 2, c: 20416},
-    {f: 4, c: 20422}, {f: 3, c: 20427}, {f: 5, c: 20434}, 20441, 20443, 20450,
-    {f: 2, c: 20452}, 20455, {f: 2, c: 20459}, 20464, 20466, {f: 4, c: 20468},
-    20473, {f: 3, c: 20475}, 20479, {f: 5, c: 20481}, {f: 2, c: 20487}, 20490,
-    20494, 20496, 20499, {f: 3, c: 20501}, 20507, {f: 2, c: 20509}, 20512,
-    {f: 3, c: 20514}, 20519, {f: 11, c: 20527}, 20539, 20541, {f: 4, c: 20543},
-    {f: 3, c: 20548}, {f: 2, c: 20554}, 20557, {f: 5, c: 20560},
-    {f: 4, c: 20566}, 20571, {f: 8, c: 20573}, {f: 6, c: 20582},
-    {f: 7, c: 20589}, {f: 3, c: 20600}, {f: 2, c: 20604}, {f: 4, c: 20609},
-    {f: 2, c: 20614}, {f: 4, c: 20617}, {f: 8, c: 20622}, 20631,
-    {f: 8, c: 20634}, 20644, 20646, {f: 2, c: 20650}, {f: 4, c: 20654}, 20662,
-    {f: 2, c: 20664}, {f: 2, c: 20668}, {f: 3, c: 20671}, {f: 2, c: 20675},
-    {f: 3, c: 20678}, {f: 5, c: 20682}, 20688, {f: 3, c: 20690},
-    {f: 3, c: 20695}, {f: 3, c: 20699}, {f: 6, c: 20703}, {f: 3, c: 20713},
-    {f: 4, c: 20719}, 20724, {f: 3, c: 20726}, 20730, {f: 4, c: 20732}, 20737,
-    20739, 20741, 20746, {f: 4, c: 20748}, 20753, 20755, {f: 2, c: 20758},
-    {f: 6, c: 20761}, 20768, {f: 8, c: 20770}, {f: 7, c: 20779},
-    {f: 4, c: 20787}, {f: 2, c: 20792}, {f: 2, c: 20797}, 20802, 20807, 20810,
-    20812, {f: 3, c: 20814}, 20819, {f: 3, c: 20823}, 20827, {f: 5, c: 20829},
-    {f: 2, c: 20835}, {f: 2, c: 20838}, 20842, 20847, 20850, 20858,
-    {f: 2, c: 20862}, {f: 2, c: 20867}, {f: 2, c: 20870}, {f: 2, c: 20874},
-    {f: 4, c: 20878}, {f: 2, c: 20883}, 20888, 20890, {f: 3, c: 20893}, 20897,
-    20899, {f: 5, c: 20902}, {f: 2, c: 20909}, 20916, {f: 3, c: 20920},
-    {f: 2, c: 20926}, {f: 3, c: 20929}, 20933, 20936, 20938, 20942, 20944,
-    {f: 9, c: 20946}, 20956, {f: 2, c: 20958}, {f: 2, c: 20962},
-    {f: 6, c: 20965}, 20972, 20974, 20978, 20980, 20983, 20990,
-    {f: 2, c: 20996}, 21001, {f: 2, c: 21003}, {f: 2, c: 21007},
-    {f: 3, c: 21011}, 21020, {f: 2, c: 21022}, {f: 3, c: 21025},
-    {f: 3, c: 21029}, 21034, 21036, 21039, {f: 2, c: 21041}, {f: 2, c: 21044},
-    21052, 21054, {f: 2, c: 21061}, {f: 2, c: 21064}, {f: 2, c: 21070},
-    {f: 2, c: 21074}, 21077, {f: 4, c: 21079}, 21085, {f: 2, c: 21087},
-    {f: 3, c: 21090}, 21094, 21096, {f: 3, c: 21099}, {f: 2, c: 21104}, 21107,
-    {f: 7, c: 21110}, 21118, 21120, {f: 3, c: 21124}, 21131, {f: 2, c: 21134},
-    21138, {f: 7, c: 21140}, 21148, {f: 4, c: 21156}, {f: 3, c: 21166},
-    {f: 10, c: 21172}, 21184, 21186, {f: 3, c: 21188}, 21192, 21194,
-    {f: 4, c: 21196}, 21201, {f: 2, c: 21203}, 21207, 21210, 21212,
-    {f: 2, c: 21216}, 21219, {f: 11, c: 21221}, {f: 3, c: 21234},
-    {f: 2, c: 21238}, {f: 3, c: 21243}, {f: 4, c: 21249}, 21255,
-    {f: 4, c: 21257}, 21262, {f: 4, c: 21265}, 21272, {f: 2, c: 21275},
-    {f: 2, c: 21278}, 21282, {f: 2, c: 21284}, {f: 3, c: 21287},
-    {f: 2, c: 21291}, 21296, {f: 6, c: 21298}, [12054, 21304],
-    {f: 2, c: 21308}, 21314, 21316, 21318, {f: 3, c: 21323}, 21328,
-    {f: 2, c: 21336}, 21339, 21341, 21349, 21352, 21354, {f: 2, c: 21356},
-    21362, 21366, 21369, {f: 4, c: 21371}, {f: 2, c: 21376}, 21379,
-    {f: 2, c: 21383}, 21386, {f: 7, c: 21390}, {f: 2, c: 21398},
-    {f: 2, c: 21403}, 21406, 21409, 21412, 21415, {f: 3, c: 21418},
-    {f: 3, c: 21423}, 21427, 21429, {f: 4, c: 21431}, {f: 3, c: 21436}, 21440,
-    {f: 4, c: 21444}, {f: 3, c: 21454}, {f: 2, c: 21458}, 21461, 21466,
-    {f: 3, c: 21468}, 21473, 21479, 21492, 21498, {f: 3, c: 21502}, 21506,
-    21509, 21511, 21515, 21524, {f: 3, c: 21528}, 21532, 21538,
-    {f: 2, c: 21540}, 21546, 21552, 21555, {f: 2, c: 21558}, 21562, 21565,
-    21567, {f: 2, c: 21569}, {f: 2, c: 21572}, 21575, 21577, {f: 4, c: 21580},
-    21585, 21594, {f: 5, c: 21597}, 21603, 21605, 21607, {f: 8, c: 21609},
-    21620, {f: 2, c: 21625}, {f: 2, c: 21630}, 21633, 21635, 21637,
-    {f: 4, c: 21639}, 21645, 21649, 21651, {f: 2, c: 21655}, 21660,
-    {f: 5, c: 21662}, 21669, 21678, 21680, 21682, {f: 3, c: 21685},
-    {f: 2, c: 21689}, 21694, 21699, 21701, {f: 2, c: 21706}, 21718, 21720,
-    21723, 21728, {f: 3, c: 21730}, {f: 2, c: 21739}, {f: 3, c: 21743},
-    {f: 6, c: 21748}, 21755, 21758, 21760, {f: 2, c: 21762}, 21765, 21768,
-    {f: 5, c: 21770}, {f: 2, c: 21778}, {f: 6, c: 21781}, {f: 4, c: 21788},
-    21793, {f: 2, c: 21797}, {f: 2, c: 21800}, 21803, 21805, 21810,
-    {f: 3, c: 21812}, {f: 4, c: 21816}, 21821, 21824, 21826, 21829,
-    {f: 2, c: 21831}, {f: 4, c: 21835}, {f: 2, c: 21841}, 21844,
-    {f: 5, c: 21847}, 21853, {f: 2, c: 21855}, {f: 2, c: 21858},
-    {f: 2, c: 21864}, 21867, {f: 6, c: 21871}, {f: 2, c: 21881}, 21885, 21887,
-    {f: 2, c: 21893}, {f: 3, c: 21900}, 21904, {f: 2, c: 21906},
-    {f: 3, c: 21909}, {f: 2, c: 21914}, 21918, {f: 7, c: 21920},
-    {f: 2, c: 21928}, 21931, 21933, {f: 2, c: 21935}, 21940, 21942, 21944,
-    21946, 21948, {f: 5, c: 21951}, 21960, {f: 2, c: 21962}, {f: 2, c: 21967},
-    21973, {f: 3, c: 21975}, 21979, 21982, 21984, 21986, 21991,
-    {f: 2, c: 21997}, {f: 2, c: 22000}, 22004, {f: 5, c: 22008}, 22015,
-    {f: 4, c: 22018}, 22023, {f: 2, c: 22026}, {f: 4, c: 22032}, 22037,
-    {f: 2, c: 22041}, 22045, {f: 3, c: 22048}, {f: 2, c: 22053}, 22056,
-    {f: 2, c: 22058}, 22067, 22071, 22074, {f: 3, c: 22076}, 22080,
-    {f: 10, c: 22082}, {f: 5, c: 22095}, {f: 2, c: 22101}, {f: 2, c: 22106},
-    {f: 2, c: 22110}, 22113, 22115, 22119, {f: 2, c: 22125}, 22128, 22131,
-    22133, 22135, 22138, {f: 3, c: 22141}, {f: 4, c: 22145}, {f: 4, c: 22152},
-    22157, {f: 3, c: 22160}, 22164, {f: 3, c: 22166}, {f: 9, c: 22170},
-    {f: 2, c: 22180}, 22183, {f: 5, c: 22185}, {f: 3, c: 22192}, 22197,
-    {f: 4, c: 22200}, {f: 3, c: 22205}, {f: 2, c: 22211}, {f: 2, c: 22214},
-    22219, {f: 4, c: 22221}, {f: 2, c: 22226}, {f: 2, c: 22229},
-    {f: 2, c: 22232}, 22236, 22243, {f: 6, c: 22245}, 22252, {f: 2, c: 22254},
-    {f: 2, c: 22258}, {f: 3, c: 22262}, {f: 2, c: 22267}, {f: 3, c: 22272},
-    22277, 22284, {f: 4, c: 22286}, {f: 2, c: 22292}, 22295, {f: 3, c: 22297},
-    {f: 2, c: 22301}, {f: 3, c: 22304}, {f: 4, c: 22308}, 22315,
-    {f: 2, c: 22321}, {f: 5, c: 22324}, {f: 2, c: 22332}, 22335, 22337,
-    {f: 4, c: 22339}, {f: 2, c: 22344}, 22347, {f: 5, c: 22354},
-    {f: 2, c: 22360}, {f: 2, c: 22370}, 22373, 22375, 22380, 22382,
-    {f: 3, c: 22384}, {f: 2, c: 22388}, {f: 3, c: 22392}, {f: 5, c: 22397},
-    {f: 4, c: 22407}, {f: 5, c: 22413}, {f: 7, c: 22420}, {f: 4, c: 22428},
-    22437, 22440, 22442, 22444, {f: 3, c: 22447}, 22451, {f: 3, c: 22453},
-    {f: 9, c: 22457}, {f: 7, c: 22468}, {f: 2, c: 22476}, {f: 2, c: 22480},
-    22483, {f: 2, c: 22486}, {f: 2, c: 22491}, 22494, {f: 2, c: 22498},
-    {f: 8, c: 22501}, 22510, {f: 4, c: 22512}, {f: 2, c: 22517},
-    {f: 2, c: 22523}, {f: 2, c: 22526}, 22529, {f: 2, c: 22531},
-    {f: 2, c: 22536}, 22540, {f: 3, c: 22542}, {f: 3, c: 22546},
-    {f: 2, c: 22551}, {f: 3, c: 22554}, 22559, {f: 2, c: 22562},
-    {f: 5, c: 22565}, {f: 4, c: 22571}, {f: 2, c: 22578}, {f: 14, c: 22582},
-    {f: 5, c: 22597}, 22606, 22608, 22611, {f: 2, c: 22613}, {f: 5, c: 22617},
-    {f: 3, c: 22623}, 22627, {f: 5, c: 22630}, {f: 8, c: 22637},
-    {f: 3, c: 22646}, {f: 4, c: 22650}, 22655, 22658, 22660, {f: 3, c: 22662},
-    {f: 7, c: 22667}, {f: 5, c: 22676}, 22683, 22685, {f: 8, c: 22688},
-    {f: 4, c: 22698}, {f: 4, c: 22703}, {f: 7, c: 22708}, 22717,
-    {f: 2, c: 22719}, {f: 3, c: 22722}, 22726, {f: 9, c: 22728}, 22738, 22740,
-    {f: 2, c: 22742}, {f: 3, c: 22747}, 22753, 22755, {f: 4, c: 22757}, 22762,
-    22765, {f: 2, c: 22769}, {f: 2, c: 22772}, {f: 2, c: 22775},
-    {f: 2, c: 22779}, {f: 4, c: 22782}, 22787, {f: 2, c: 22789},
-    {f: 2, c: 22792}, [12066, 22794], {f: 2, c: 22795}, 22798,
-    {f: 4, c: 22800}, {f: 2, c: 22807}, 22811, {f: 2, c: 22813},
-    {f: 2, c: 22816}, 22819, 22822, 22824, 22828, 22832, {f: 2, c: 22834},
-    {f: 2, c: 22837}, 22843, 22845, {f: 2, c: 22847}, 22851, {f: 2, c: 22853},
-    22858, {f: 2, c: 22860}, 22864, {f: 2, c: 22866}, 22873, {f: 5, c: 22875},
-    22881, {f: 2, c: 22883}, {f: 3, c: 22886}, 22891, 22893, {f: 4, c: 22895},
-    22901, 22903, {f: 3, c: 22906}, {f: 3, c: 22910}, 22917, 22921,
-    {f: 2, c: 22923}, {f: 4, c: 22926}, {f: 2, c: 22932}, 22936,
-    {f: 3, c: 22938}, {f: 4, c: 22943}, {f: 2, c: 22950}, {f: 2, c: 22956},
-    {f: 2, c: 22960}, {f: 6, c: 22963}, 22970, {f: 2, c: 22972},
-    {f: 7, c: 22975}, {f: 3, c: 22983}, {f: 4, c: 22988}, {f: 2, c: 22997},
-    23001, 23003, {f: 5, c: 23006}, 23012, {f: 2, c: 23014}, {f: 3, c: 23017},
-    {f: 12, c: 23021}, 23034, {f: 3, c: 23036}, 23040, 23042, {f: 2, c: 23050},
-    {f: 4, c: 23053}, 23058, {f: 4, c: 23060}, {f: 3, c: 23065},
-    {f: 2, c: 23069}, {f: 2, c: 23073}, 23076, {f: 3, c: 23078},
-    {f: 7, c: 23082}, 23091, 23093, {f: 5, c: 23095}, {f: 3, c: 23101},
-    {f: 4, c: 23106}, {f: 2, c: 23111}, {f: 10, c: 23115}, {f: 4, c: 23126},
-    {f: 7, c: 23131}, {f: 3, c: 23139}, {f: 2, c: 23144}, {f: 2, c: 23147},
-    {f: 6, c: 23150}, {f: 2, c: 23160}, {f: 4, c: 23163}, {f: 18, c: 23168},
-    {f: 7, c: 23187}, {f: 11, c: 23196}, {f: 2, c: 23208}, {f: 7, c: 23211},
-    23220, {f: 2, c: 23222}, {f: 4, c: 23225}, {f: 2, c: 23231},
-    {f: 6, c: 23235}, {f: 2, c: 23242}, {f: 5, c: 23245}, 23251, 23253,
-    {f: 3, c: 23257}, {f: 3, c: 23261}, 23266, {f: 2, c: 23268},
-    {f: 2, c: 23271}, 23274, {f: 5, c: 23276}, {f: 3, c: 23282},
-    {f: 5, c: 23286}, {f: 4, c: 23292}, {f: 7, c: 23297}, 23306,
-    {f: 9, c: 23309}, 23320, {f: 7, c: 23322}, {f: 8, c: 23330},
-    {f: 5, c: 23339}, 23345, 23347, {f: 2, c: 23349}, {f: 7, c: 23353},
-    {f: 11, c: 23361}, {f: 3, c: 23373}, 23378, 23382, 23390, {f: 2, c: 23392},
-    {f: 2, c: 23399}, {f: 3, c: 23405}, 23410, 23412, {f: 2, c: 23414}, 23417,
-    {f: 2, c: 23419}, 23422, 23426, 23430, 23434, {f: 2, c: 23437},
-    {f: 3, c: 23440}, 23444, 23446, 23455, {f: 3, c: 23463}, {f: 4, c: 23468},
-    {f: 2, c: 23473}, 23479, {f: 3, c: 23482}, {f: 2, c: 23488}, 23491,
-    {f: 4, c: 23496}, {f: 3, c: 23501}, 23505, {f: 9, c: 23508}, 23520, 23523,
-    23530, 23533, 23535, {f: 4, c: 23537}, 23543, {f: 2, c: 23549}, 23552,
-    {f: 2, c: 23554}, 23557, 23564, 23568, {f: 2, c: 23570}, 23575, 23577,
-    23579, {f: 4, c: 23582}, 23587, 23590, {f: 4, c: 23592}, {f: 4, c: 23597},
-    {f: 2, c: 23602}, {f: 2, c: 23605}, {f: 2, c: 23619}, {f: 2, c: 23622},
-    {f: 2, c: 23628}, {f: 3, c: 23634}, {f: 3, c: 23638}, {f: 4, c: 23642},
-    23647, 23655, {f: 3, c: 23657}, 23661, 23664, {f: 7, c: 23666},
-    {f: 4, c: 23675}, 23680, {f: 5, c: 23683}, {f: 3, c: 23689},
-    {f: 2, c: 23694}, {f: 2, c: 23698}, 23701, {f: 4, c: 23709},
-    {f: 5, c: 23716}, 23722, {f: 3, c: 23726}, 23730, 23732, 23734,
-    {f: 4, c: 23737}, 23742, 23744, {f: 2, c: 23746}, {f: 6, c: 23749},
-    {f: 6, c: 23756}, {f: 6, c: 23763}, {f: 7, c: 23770}, {f: 2, c: 23778},
-    23783, 23785, {f: 2, c: 23787}, {f: 2, c: 23790}, {f: 3, c: 23793}, 23797,
-    {f: 4, c: 23799}, 23804, {f: 4, c: 23806}, {f: 2, c: 23812},
-    {f: 5, c: 23816}, {f: 5, c: 23823}, 23829, {f: 3, c: 23832},
-    {f: 2, c: 23836}, {f: 5, c: 23839}, 23845, 23848, {f: 2, c: 23850},
-    {f: 5, c: 23855}, {f: 8, c: 23861}, {f: 8, c: 23871}, {f: 2, c: 23880},
-    {f: 3, c: 23885}, {f: 7, c: 23889}, {f: 2, c: 23897}, 23900,
-    {f: 11, c: 23902}, 23914, {f: 2, c: 23917}, {f: 4, c: 23920},
-    {f: 12, c: 23925}, 23939, {f: 2, c: 23941}, {f: 15, c: 23944}, 23960,
-    {f: 3, c: 23962}, {f: 2, c: 23966}, {f: 6, c: 23969}, {f: 15, c: 23976},
-    23993, 23995, {f: 8, c: 23997}, {f: 5, c: 24006}, 24012, {f: 4, c: 24014},
-    24019, {f: 6, c: 24021}, 24028, {f: 2, c: 24031}, {f: 2, c: 24035}, 24042,
-    {f: 2, c: 24044}, {f: 2, c: 24053}, {f: 5, c: 24056}, {f: 2, c: 24063},
-    24068, 24071, {f: 3, c: 24073}, {f: 2, c: 24077}, {f: 2, c: 24082}, 24087,
-    {f: 7, c: 24094}, {f: 3, c: 24104}, 24108, {f: 2, c: 24111}, 24114,
-    {f: 2, c: 24116}, {f: 2, c: 24121}, {f: 2, c: 24126}, 24129,
-    {f: 6, c: 24134}, {f: 7, c: 24141}, 24150, {f: 2, c: 24153},
-    {f: 2, c: 24156}, 24160, {f: 7, c: 24164}, {f: 5, c: 24173}, 24181, 24183,
-    {f: 3, c: 24193}, 24197, {f: 2, c: 24200}, {f: 3, c: 24204}, 24210, 24216,
-    24219, 24221, {f: 4, c: 24225}, {f: 3, c: 24232}, 24236, {f: 5, c: 24238},
-    24244, {f: 4, c: 24250}, {f: 10, c: 24255}, {f: 6, c: 24267},
-    {f: 2, c: 24276}, {f: 4, c: 24279}, {f: 3, c: 24284}, {f: 4, c: 24292},
-    24297, 24299, {f: 6, c: 24301}, 24309, {f: 2, c: 24312}, {f: 3, c: 24315},
-    {f: 3, c: 24325}, 24329, {f: 3, c: 24332}, 24336, 24338, 24340, 24342,
-    {f: 2, c: 24345}, {f: 3, c: 24348}, {f: 4, c: 24353}, 24360,
-    {f: 2, c: 24363}, 24366, 24368, 24370, 24372, {f: 3, c: 24374}, 24379,
-    {f: 3, c: 24381}, {f: 5, c: 24385}, 24391, {f: 3, c: 24393}, 24397, 24399,
-    24401, 24404, {f: 3, c: 24410}, {f: 3, c: 24414}, 24419, 24421,
-    {f: 2, c: 24423}, 24427, {f: 2, c: 24430}, 24434, {f: 3, c: 24436}, 24440,
-    24442, {f: 3, c: 24445}, 24451, 24454, {f: 3, c: 24461}, {f: 2, c: 24467},
-    24470, {f: 2, c: 24474}, 24477, 24479, {f: 6, c: 24482}, {f: 2, c: 24491},
-    {f: 6, c: 24495}, 24502, 24504, {f: 2, c: 24506}, {f: 5, c: 24510},
-    {f: 2, c: 24519}, {f: 2, c: 24522}, 24526, {f: 3, c: 24531},
-    {f: 3, c: 24538}, {f: 2, c: 24542}, {f: 2, c: 24546}, {f: 2, c: 24549},
-    {f: 2, c: 24552}, 24556, {f: 2, c: 24559}, {f: 3, c: 24562},
-    {f: 2, c: 24566}, {f: 2, c: 24569}, 24572, {f: 3, c: 24583},
-    {f: 2, c: 24587}, {f: 2, c: 24592}, 24595, {f: 2, c: 24599}, 24602,
-    {f: 2, c: 24606}, {f: 3, c: 24610}, {f: 3, c: 24620}, {f: 5, c: 24624},
-    {f: 5, c: 24630}, {f: 2, c: 24637}, 24640, {f: 7, c: 24644}, 24652,
-    {f: 2, c: 24654}, 24657, {f: 2, c: 24659}, {f: 3, c: 24662},
-    {f: 2, c: 24667}, {f: 4, c: 24670}, {f: 2, c: 24677}, 24686,
-    {f: 2, c: 24689}, {f: 2, c: 24692}, 24695, 24702, {f: 3, c: 24704},
-    {f: 4, c: 24709}, {f: 2, c: 24714}, {f: 4, c: 24718}, 24723, 24725,
-    {f: 3, c: 24727}, 24732, 24734, {f: 2, c: 24737}, {f: 2, c: 24740}, 24743,
-    {f: 2, c: 24745}, 24750, 24752, 24755, 24759, {f: 2, c: 24761},
-    {f: 8, c: 24765}, {f: 3, c: 24775}, {f: 5, c: 24780}, {f: 3, c: 24786},
-    {f: 2, c: 24790}, 24793, 24795, 24798, {f: 4, c: 24802}, 24810, 24821,
-    {f: 2, c: 24823}, {f: 4, c: 24828}, {f: 4, c: 24834}, 24839,
-    {f: 3, c: 24842}, {f: 5, c: 24848}, {f: 4, c: 24854}, {f: 2, c: 24861},
-    {f: 2, c: 24865}, 24869, {f: 3, c: 24872}, {f: 8, c: 24876},
-    {f: 2, c: 24885}, {f: 6, c: 24888}, {f: 8, c: 24896}, 24905, 24909,
-    {f: 2, c: 24911}, {f: 3, c: 24914}, {f: 2, c: 24918}, 24921,
-    {f: 2, c: 24923}, 24926, {f: 2, c: 24928}, {f: 2, c: 24933}, 24937,
-    {f: 2, c: 24940}, 24943, {f: 2, c: 24945}, 24948, {f: 10, c: 24952},
-    {f: 7, c: 24963}, {f: 2, c: 24972}, 24975, 24979, {f: 5, c: 24981},
-    {f: 2, c: 24987}, {f: 6, c: 24990}, {f: 2, c: 24997}, 25002, 25005,
-    {f: 3, c: 25007}, {f: 3, c: 25011}, {f: 6, c: 25016}, {f: 3, c: 25023},
-    {f: 4, c: 25027}, {f: 4, c: 25037}, 25043, {f: 9, c: 25045},
-    {f: 3, c: 25056}, {f: 2, c: 25060}, 25063, {f: 9, c: 25065},
-    {f: 2, c: 25075}, 25081, 25083, 25085, {f: 5, c: 25089}, 25097, 25107,
-    25113, {f: 3, c: 25116}, 25120, 25123, 25126, {f: 2, c: 25128}, 25131,
-    25133, 25135, 25137, 25141, [12094, 25142], {f: 5, c: 25144}, 25154,
-    {f: 3, c: 25156}, 25162, {f: 2, c: 25167}, {f: 3, c: 25173},
-    {f: 2, c: 25177}, {f: 7, c: 25180}, {f: 2, c: 25188}, 25192,
-    {f: 2, c: 25201}, {f: 2, c: 25204}, {f: 2, c: 25207}, {f: 2, c: 25210},
-    25213, {f: 3, c: 25217}, {f: 4, c: 25221}, {f: 6, c: 25227}, 25236, 25241,
-    {f: 3, c: 25244}, 25251, {f: 2, c: 25254}, {f: 2, c: 25257},
-    {f: 4, c: 25261}, {f: 3, c: 25266}, {f: 3, c: 25270}, 25274, 25278,
-    {f: 2, c: 25280}, 25283, 25291, 25295, 25297, 25301, {f: 2, c: 25309},
-    {f: 2, c: 25312}, 25316, {f: 2, c: 25322}, 25328, 25330, 25333,
-    {f: 4, c: 25336}, 25344, {f: 4, c: 25347}, {f: 4, c: 25354},
-    {f: 2, c: 25359}, {f: 4, c: 25362}, {f: 3, c: 25367}, 25372,
-    {f: 2, c: 25382}, 25385, {f: 3, c: 25388}, {f: 2, c: 25392},
-    {f: 6, c: 25395}, {f: 2, c: 25403}, {f: 3, c: 25407}, 25412,
-    {f: 2, c: 25415}, 25418, {f: 4, c: 25425}, {f: 8, c: 25430}, 25440,
-    {f: 3, c: 25444}, 25450, 25452, {f: 2, c: 25455}, {f: 3, c: 25459},
-    {f: 2, c: 25464}, {f: 4, c: 25468}, 25473, {f: 2, c: 25477}, 25483, 25485,
-    25489, {f: 3, c: 25491}, 25495, {f: 7, c: 25497}, 25505, 25508, 25510,
-    25515, 25519, {f: 2, c: 25521}, {f: 2, c: 25525}, 25529, 25531, 25533,
-    25535, {f: 3, c: 25537}, 25541, {f: 2, c: 25543}, {f: 3, c: 25546}, 25553,
-    {f: 3, c: 25555}, {f: 3, c: 25559}, {f: 3, c: 25563}, 25567, 25570,
-    {f: 5, c: 25572}, {f: 2, c: 25579}, {f: 3, c: 25583}, 25587, 25589, 25591,
-    {f: 4, c: 25593}, 25598, {f: 2, c: 25603}, {f: 5, c: 25606}, 25614,
-    {f: 2, c: 25617}, {f: 2, c: 25621}, {f: 3, c: 25624}, 25629, 25631,
-    {f: 4, c: 25634}, {f: 3, c: 25639}, 25643, {f: 6, c: 25646}, 25653,
-    {f: 3, c: 25655}, {f: 2, c: 25659}, 25662, 25664, {f: 2, c: 25666}, 25673,
-    {f: 6, c: 25675}, 25683, {f: 3, c: 25685}, {f: 3, c: 25689}, 25693,
-    {f: 7, c: 25696}, 25704, {f: 3, c: 25706}, 25710, {f: 3, c: 25712},
-    {f: 2, c: 25716}, 25719, {f: 6, c: 25724}, 25731, 25734, {f: 8, c: 25737},
-    25748, {f: 2, c: 25751}, {f: 4, c: 25754}, {f: 3, c: 25760},
-    {f: 3, c: 25766}, 25770, 25775, 25777, 25780, 25782, 25785, 25789, 25795,
-    25798, {f: 2, c: 25800}, 25804, 25807, 25809, 25811, {f: 2, c: 25813},
-    25817, {f: 3, c: 25819}, 25823, 25825, 25827, 25829, {f: 5, c: 25831},
-    {f: 2, c: 25837}, 25843, {f: 2, c: 25845}, {f: 2, c: 25848}, 25853, 25855,
-    {f: 3, c: 25857}, 25861, {f: 2, c: 25863}, {f: 5, c: 25866},
-    {f: 2, c: 25872}, 25875, 25877, 25879, 25882, 25884, {f: 4, c: 25886},
-    {f: 4, c: 25894}, 25901, {f: 4, c: 25904}, 25911, 25914, {f: 2, c: 25916},
-    {f: 5, c: 25920}, {f: 2, c: 25926}, {f: 2, c: 25930}, {f: 2, c: 25933},
-    25936, {f: 3, c: 25938}, 25944, 25946, 25948, {f: 3, c: 25951},
-    {f: 2, c: 25956}, {f: 4, c: 25959}, {f: 3, c: 25965}, 25969, 25971, 25974,
-    {f: 9, c: 25977}, {f: 3, c: 25988}, {f: 3, c: 25992}, {f: 3, c: 25997},
-    26002, 26004, 26006, 26008, 26010, {f: 2, c: 26013}, 26016,
-    {f: 2, c: 26018}, 26022, 26024, 26026, 26030, {f: 6, c: 26033}, 26040,
-    {f: 2, c: 26042}, {f: 3, c: 26046}, 26050, {f: 4, c: 26055}, 26061,
-    {f: 2, c: 26064}, {f: 3, c: 26067}, {f: 8, c: 26072}, 26081,
-    {f: 2, c: 26083}, {f: 2, c: 26090}, {f: 4, c: 26098}, {f: 2, c: 26104},
-    {f: 5, c: 26107}, 26113, {f: 2, c: 26116}, {f: 3, c: 26119}, 26123, 26125,
-    {f: 3, c: 26128}, {f: 3, c: 26134}, {f: 3, c: 26138}, 26142,
-    {f: 4, c: 26145}, 26150, {f: 4, c: 26153}, 26158, 26160, {f: 2, c: 26162},
-    {f: 5, c: 26167}, 26173, {f: 2, c: 26175}, {f: 7, c: 26180},
-    {f: 2, c: 26189}, {f: 2, c: 26192}, {f: 2, c: 26200}, {f: 2, c: 26203},
-    26206, 26208, {f: 2, c: 26210}, 26213, 26215, {f: 5, c: 26217},
-    {f: 3, c: 26225}, 26229, {f: 2, c: 26232}, {f: 3, c: 26235},
-    {f: 3, c: 26239}, 26243, {f: 2, c: 26245}, {f: 2, c: 26250},
-    {f: 4, c: 26253}, {f: 4, c: 26258}, {f: 5, c: 26264}, {f: 4, c: 26270},
-    {f: 4, c: 26275}, {f: 2, c: 26281}, {f: 2, c: 26284}, {f: 5, c: 26287},
-    {f: 4, c: 26293}, {f: 4, c: 26298}, {f: 5, c: 26303}, 26309, 26312,
-    {f: 12, c: 26314}, {f: 2, c: 26327}, 26330, {f: 2, c: 26334},
-    {f: 5, c: 26337}, {f: 2, c: 26343}, {f: 2, c: 26346}, {f: 3, c: 26349},
-    26353, {f: 2, c: 26357}, {f: 2, c: 26362}, 26365, {f: 2, c: 26369},
-    {f: 4, c: 26372}, 26380, {f: 2, c: 26382}, {f: 3, c: 26385}, 26390,
-    {f: 3, c: 26392}, 26396, 26398, {f: 6, c: 26400}, 26409, 26414, 26416,
-    {f: 2, c: 26418}, {f: 4, c: 26422}, {f: 2, c: 26427}, {f: 2, c: 26430},
-    26433, {f: 2, c: 26436}, 26439, {f: 2, c: 26442}, 26445, 26450,
-    {f: 2, c: 26452}, {f: 5, c: 26455}, 26461, {f: 3, c: 26466},
-    {f: 2, c: 26470}, {f: 2, c: 26475}, 26478, 26484, 26486, {f: 4, c: 26488},
-    26493, 26496, {f: 2, c: 26498}, {f: 2, c: 26501}, 26504, 26506,
-    {f: 4, c: 26508}, {f: 4, c: 26513}, 26518, 26521, 26523, {f: 3, c: 26527},
-    26532, 26534, 26537, 26540, 26542, {f: 2, c: 26545}, 26548,
-    {f: 8, c: 26553}, 26562, {f: 10, c: 26565}, {f: 3, c: 26581}, 26587, 26591,
-    26593, {f: 2, c: 26595}, {f: 3, c: 26598}, {f: 2, c: 26602},
-    {f: 2, c: 26605}, 26610, {f: 8, c: 26613}, 26622, {f: 4, c: 26625}, 26630,
-    26637, 26640, 26642, {f: 2, c: 26644}, {f: 5, c: 26648}, {f: 3, c: 26654},
-    {f: 7, c: 26658}, {f: 7, c: 26667}, {f: 3, c: 26676}, {f: 2, c: 26682},
-    26687, 26695, 26699, 26701, 26703, 26706, {f: 10, c: 26710}, 26730,
-    {f: 8, c: 26732}, 26741, {f: 9, c: 26744}, 26754, 26756, {f: 8, c: 26759},
-    {f: 3, c: 26768}, {f: 3, c: 26772}, {f: 4, c: 26777}, 26782,
-    {f: 2, c: 26784}, {f: 3, c: 26787}, {f: 4, c: 26793}, 26798,
-    {f: 2, c: 26801}, 26804, {f: 10, c: 26806}, 26817, {f: 6, c: 26819}, 26826,
-    26828, {f: 4, c: 26830}, {f: 2, c: 26835}, 26841, {f: 4, c: 26843},
-    {f: 2, c: 26849}, {f: 3, c: 26852}, {f: 6, c: 26856}, 26863,
-    {f: 3, c: 26866}, {f: 3, c: 26870}, 26875, {f: 4, c: 26877},
-    {f: 3, c: 26882}, {f: 5, c: 26886}, 26892, 26897, {f: 12, c: 26899},
-    {f: 3, c: 26913}, {f: 8, c: 26917}, {f: 2, c: 26926}, {f: 3, c: 26929},
-    {f: 4, c: 26933}, {f: 3, c: 26938}, 26942, {f: 2, c: 26944},
-    {f: 7, c: 26947}, {f: 8, c: 26955}, {f: 2, c: 26965}, {f: 2, c: 26968},
-    {f: 2, c: 26971}, 26975, {f: 2, c: 26977}, {f: 2, c: 26980}, 26983,
-    {f: 2, c: 26985}, 26988, {f: 2, c: 26991}, {f: 3, c: 26994}, 26998,
-    {f: 2, c: 27002}, {f: 3, c: 27005}, 27009, 27011, 27013, {f: 3, c: 27018},
-    {f: 6, c: 27022}, {f: 2, c: 27030}, {f: 2, c: 27033}, {f: 10, c: 27037},
-    27049, 27052, {f: 2, c: 27055}, {f: 2, c: 27058}, {f: 2, c: 27061},
-    {f: 3, c: 27064}, {f: 3, c: 27068}, 27072, {f: 8, c: 27074}, 27087,
-    {f: 3, c: 27089}, {f: 6, c: 27093}, {f: 3, c: 27100}, {f: 6, c: 27105},
-    {f: 5, c: 27112}, {f: 4, c: 27118}, {f: 9, c: 27124}, 27134, 27136,
-    {f: 2, c: 27139}, {f: 4, c: 27142}, {f: 8, c: 27147}, {f: 3, c: 27156},
-    {f: 4, c: 27162}, 27168, 27170, {f: 4, c: 27172}, 27177, {f: 4, c: 27179},
-    27184, {f: 3, c: 27186}, {f: 2, c: 27190}, {f: 2, c: 27195},
-    {f: 5, c: 27199}, {f: 2, c: 27205}, {f: 2, c: 27209}, {f: 4, c: 27212},
-    {f: 7, c: 27217}, 27226, {f: 3, c: 27228}, 27232, {f: 2, c: 27235},
-    {f: 11, c: 27238}, {f: 7, c: 27250}, {f: 2, c: 27258}, {f: 3, c: 27261},
-    {f: 3, c: 27265}, {f: 4, c: 27269}, {f: 4, c: 27274}, 27279,
-    {f: 2, c: 27282}, {f: 2, c: 27285}, {f: 4, c: 27288}, {f: 3, c: 27293},
-    27297, {f: 5, c: 27300}, 27306, {f: 2, c: 27309}, {f: 3, c: 27312},
-    {f: 4, c: 27316}, {f: 2, c: 27321}, {f: 7, c: 27324}, {f: 15, c: 27332},
-    {f: 6, c: 27348}, 27356, {f: 7, c: 27360}, 27369, 27371, {f: 6, c: 27373},
-    {f: 4, c: 27380}, {f: 2, c: 27385}, {f: 8, c: 27388}, {f: 5, c: 27397},
-    {f: 4, c: 27403}, {f: 2, c: 27408}, {f: 3, c: 27411}, {f: 7, c: 27415},
-    27423, {f: 2, c: 27429}, {f: 10, c: 27432}, {f: 4, c: 27443}, 27448,
-    {f: 2, c: 27451}, {f: 4, c: 27455}, {f: 2, c: 27460}, 27464,
-    {f: 2, c: 27466}, {f: 3, c: 27469}, {f: 8, c: 27473}, {f: 5, c: 27482},
-    27488, {f: 2, c: 27496}, {f: 7, c: 27499}, {f: 4, c: 27507}, 27514,
-    {f: 4, c: 27517}, 27525, 27528, 27532, {f: 4, c: 27534}, {f: 2, c: 27540},
-    27543, 27545, {f: 2, c: 27548}, {f: 2, c: 27551}, {f: 2, c: 27554},
-    {f: 5, c: 27557}, {f: 2, c: 27564}, {f: 2, c: 27568}, 27574,
-    {f: 2, c: 27576}, {f: 3, c: 27580}, 27584, {f: 2, c: 27587},
-    {f: 4, c: 27591}, 27596, 27598, {f: 2, c: 27600}, 27608, 27610,
-    {f: 5, c: 27612}, {f: 8, c: 27618}, {f: 3, c: 27628}, {f: 3, c: 27632},
-    27636, {f: 3, c: 27638}, {f: 3, c: 27642}, 27646, {f: 5, c: 27648},
-    {f: 3, c: 27657}, 27662, 27666, 27671, {f: 3, c: 27676}, 27680, 27685,
-    27693, 27697, 27699, {f: 2, c: 27702}, {f: 4, c: 27705}, {f: 2, c: 27710},
-    {f: 3, c: 27715}, 27720, {f: 5, c: 27723}, {f: 3, c: 27729}, 27734,
-    {f: 3, c: 27736}, {f: 2, c: 27746}, {f: 3, c: 27749}, {f: 5, c: 27755},
-    27761, 27763, 27765, {f: 2, c: 27767}, {f: 3, c: 27770}, {f: 2, c: 27775},
-    27780, 27783, {f: 2, c: 27786}, {f: 2, c: 27789}, {f: 2, c: 27793},
-    {f: 4, c: 27797}, 27802, {f: 3, c: 27804}, 27808, 27810, 27816, 27820,
-    {f: 2, c: 27823}, {f: 4, c: 27828}, 27834, {f: 4, c: 27840},
-    {f: 3, c: 27846}, 27851, {f: 3, c: 27853}, {f: 2, c: 27857},
-    {f: 3, c: 27864}, {f: 2, c: 27868}, 27871, 27876, {f: 2, c: 27878}, 27881,
-    {f: 2, c: 27884}, 27890, 27892, 27897, {f: 2, c: 27903}, {f: 2, c: 27906},
-    {f: 2, c: 27909}, {f: 3, c: 27912}, 27917, {f: 3, c: 27919},
-    {f: 4, c: 27923}, 27928, {f: 2, c: 27932}, {f: 6, c: 27935}, 27942,
-    {f: 2, c: 27944}, {f: 2, c: 27948}, {f: 2, c: 27951}, 27956,
-    {f: 3, c: 27958}, 27962, {f: 2, c: 27967}, 27970, 27972, 27977, 27980,
-    27984, {f: 4, c: 27989}, 27995, 27997, 27999, {f: 2, c: 28001},
-    {f: 2, c: 28004}, {f: 2, c: 28007}, {f: 3, c: 28011}, {f: 4, c: 28016},
-    {f: 2, c: 28021}, {f: 2, c: 28026}, {f: 5, c: 28029}, {f: 2, c: 28035},
-    28038, {f: 2, c: 28042}, 28045, {f: 2, c: 28047}, 28050, {f: 5, c: 28054},
-    28060, 28066, 28069, {f: 2, c: 28076}, {f: 2, c: 28080}, {f: 2, c: 28083},
-    {f: 2, c: 28086}, {f: 6, c: 28089}, {f: 3, c: 28097}, {f: 3, c: 28104},
-    {f: 4, c: 28109}, {f: 4, c: 28114}, 28119, {f: 3, c: 28122}, 28127,
-    {f: 2, c: 28130}, 28133, {f: 3, c: 28135}, 28141, {f: 2, c: 28143}, 28146,
-    28148, 28152, {f: 8, c: 28157}, {f: 4, c: 28166}, 28171, 28175,
-    {f: 2, c: 28178}, 28181, {f: 2, c: 28184}, {f: 2, c: 28187},
-    {f: 2, c: 28190}, 28194, {f: 2, c: 28199}, 28202, 28206, {f: 2, c: 28208},
-    28211, {f: 3, c: 28213}, 28217, {f: 3, c: 28219}, {f: 4, c: 28223},
-    {f: 8, c: 28229}, {f: 4, c: 28239}, 28245, 28247, {f: 2, c: 28249},
-    {f: 2, c: 28252}, {f: 11, c: 28256}, {f: 2, c: 28268}, {f: 14, c: 28272},
-    {f: 3, c: 28288}, 28292, {f: 2, c: 28295}, {f: 5, c: 28298},
-    {f: 5, c: 28305}, 28311, {f: 3, c: 28313}, 28318, {f: 2, c: 28320},
-    {f: 2, c: 28323}, 28326, {f: 2, c: 28328}, {f: 4, c: 28331}, 28336, 28339,
-    28341, {f: 2, c: 28344}, 28348, {f: 3, c: 28350}, 28355, 28358,
-    {f: 3, c: 28360}, 28365, 28368, 28370, 28374, {f: 2, c: 28376},
-    {f: 3, c: 28379}, 28387, 28391, {f: 2, c: 28394}, {f: 2, c: 28397},
-    {f: 2, c: 28400}, 28403, {f: 2, c: 28405}, {f: 5, c: 28410}, 28416,
-    {f: 3, c: 28419}, {f: 2, c: 28423}, {f: 5, c: 28426}, {f: 3, c: 28432},
-    {f: 4, c: 28438}, {f: 5, c: 28443}, 28449, {f: 4, c: 28453}, 28462, 28464,
-    {f: 2, c: 28468}, 28471, {f: 5, c: 28473}, 28480, {f: 4, c: 28482},
-    {f: 3, c: 28488}, 28492, {f: 3, c: 28494}, {f: 2, c: 28498},
-    {f: 3, c: 28501}, {f: 2, c: 28506}, 28509, {f: 3, c: 28511}, 28515, 28517,
-    {f: 6, c: 28519}, 28529, 28531, {f: 2, c: 28533}, 28537, 28539,
-    {f: 2, c: 28541}, {f: 3, c: 28545}, 28549, {f: 2, c: 28554},
-    {f: 8, c: 28559}, {f: 4, c: 28568}, {f: 3, c: 28573}, {f: 2, c: 28578},
-    {f: 2, c: 28581}, 28584, {f: 4, c: 28586}, {f: 2, c: 28591}, 28594,
-    {f: 2, c: 28596}, {f: 2, c: 28599}, {f: 6, c: 28602}, {f: 5, c: 28612},
-    {f: 7, c: 28618}, {f: 2, c: 28627}, {f: 2, c: 28630}, {f: 2, c: 28633},
-    {f: 2, c: 28636}, {f: 2, c: 28642}, {f: 6, c: 28645}, {f: 2, c: 28652},
-    {f: 8, c: 28658}, 28667, 28669, {f: 6, c: 28671}, {f: 2, c: 28679}, 28682,
-    {f: 3, c: 28684}, 28688, {f: 3, c: 28690}, {f: 2, c: 28694}, 28697, 28700,
-    28702, {f: 2, c: 28705}, {f: 3, c: 28708}, {f: 7, c: 28713}, 28721,
-    {f: 2, c: 28723}, {f: 3, c: 28726}, {f: 4, c: 28730}, {f: 4, c: 28735},
-    {f: 7, c: 28741}, {f: 2, c: 28749}, 28752, {f: 3, c: 28754},
-    {f: 2, c: 28758}, {f: 4, c: 28761}, {f: 4, c: 28767}, {f: 2, c: 28773},
-    {f: 3, c: 28776}, 28782, {f: 4, c: 28785}, 28791, {f: 3, c: 28793}, 28797,
-    {f: 4, c: 28801}, {f: 3, c: 28806}, {f: 3, c: 28811}, {f: 3, c: 28815},
-    28819, {f: 2, c: 28823}, {f: 2, c: 28826}, {f: 13, c: 28830}, 28848, 28850,
-    {f: 3, c: 28852}, 28858, {f: 2, c: 28862}, {f: 4, c: 28868}, 28873,
-    {f: 4, c: 28875}, {f: 8, c: 28880}, 28890, {f: 3, c: 28892},
-    {f: 4, c: 28896}, 28901, 28906, 28910, {f: 4, c: 28912}, {f: 2, c: 28917},
-    28920, {f: 3, c: 28922}, {f: 11, c: 28926}, {f: 5, c: 28939},
-    {f: 2, c: 28945}, 28948, 28951, {f: 6, c: 28955}, {f: 4, c: 28962},
-    {f: 8, c: 28967}, {f: 4, c: 28978}, {f: 14, c: 28983}, {f: 3, c: 28998},
-    29003, 29005, {f: 3, c: 29007}, {f: 9, c: 29011}, 29021, {f: 3, c: 29023},
-    29027, 29029, {f: 2, c: 29034}, 29037, {f: 3, c: 29039}, {f: 4, c: 29044},
-    29049, {f: 2, c: 29051}, {f: 6, c: 29054}, {f: 5, c: 29061},
-    {f: 4, c: 29067}, {f: 2, c: 29072}, 29075, {f: 2, c: 29077},
-    {f: 5, c: 29082}, {f: 7, c: 29089}, {f: 3, c: 29097}, {f: 4, c: 29101},
-    29106, 29108, {f: 3, c: 29110}, {f: 4, c: 29114}, {f: 2, c: 29119}, 29122,
-    {f: 4, c: 29124}, {f: 5, c: 29129}, {f: 3, c: 29135}, 29139,
-    {f: 3, c: 29142}, {f: 2, c: 29146}, {f: 2, c: 29149}, {f: 4, c: 29153},
-    {f: 5, c: 29160}, {f: 5, c: 29167}, {f: 4, c: 29173}, {f: 2, c: 29178},
-    29181, {f: 7, c: 29183}, {f: 6, c: 29191}, {f: 2, c: 29198},
-    {f: 10, c: 29201}, 29212, {f: 10, c: 29214}, 29225, 29227,
-    {f: 3, c: 29229}, {f: 2, c: 29235}, 29244, {f: 7, c: 29248},
-    {f: 3, c: 29257}, {f: 4, c: 29262}, {f: 3, c: 29267}, 29271, 29274, 29276,
-    29278, 29280, {f: 3, c: 29283}, 29288, {f: 4, c: 29290}, {f: 2, c: 29296},
-    {f: 2, c: 29299}, {f: 3, c: 29302}, {f: 2, c: 29307}, {f: 2, c: 29314},
-    {f: 5, c: 29317}, 29324, 29326, {f: 2, c: 29328}, {f: 3, c: 29331},
-    {f: 8, c: 29335}, {f: 2, c: 29344}, {f: 4, c: 29347}, {f: 4, c: 29352},
-    29358, {f: 3, c: 29361}, 29365, {f: 6, c: 29370}, {f: 3, c: 29381},
-    {f: 4, c: 29385}, 29391, 29393, {f: 4, c: 29395}, 29400, {f: 4, c: 29402},
-    29407, {f: 6, c: 29410}, {f: 2, c: 29418}, {f: 2, c: 29429},
-    {f: 3, c: 29438}, 29442, {f: 6, c: 29444}, {f: 3, c: 29451},
-    {f: 4, c: 29455}, 29460, {f: 3, c: 29464}, {f: 2, c: 29471},
-    {f: 2, c: 29475}, {f: 3, c: 29478}, 29485, {f: 2, c: 29487},
-    {f: 2, c: 29490}, 29493, 29498, {f: 2, c: 29500}, 29504, {f: 2, c: 29506},
-    {f: 7, c: 29510}, {f: 2, c: 29518}, 29521, {f: 4, c: 29523},
-    {f: 8, c: 29528}, {f: 7, c: 29537}, 29545, 29550, 29553, {f: 2, c: 29555},
-    29558, 29561, 29565, 29567, {f: 3, c: 29569}, {f: 2, c: 29573}, 29576,
-    29578, {f: 2, c: 29580}, {f: 2, c: 29583}, {f: 4, c: 29586},
-    {f: 4, c: 29591}, {f: 3, c: 29596}, {f: 2, c: 29600}, {f: 6, c: 29603},
-    29610, {f: 2, c: 29612}, 29617, {f: 3, c: 29620}, {f: 2, c: 29624},
-    {f: 4, c: 29628}, 29633, {f: 5, c: 29635}, {f: 2, c: 29643}, 29646,
-    {f: 7, c: 29650}, {f: 4, c: 29658}, 29663, {f: 4, c: 29665}, 29670, 29672,
-    {f: 3, c: 29674}, {f: 4, c: 29678}, {f: 11, c: 29683}, {f: 4, c: 29695},
-    29700, {f: 2, c: 29703}, {f: 4, c: 29707}, {f: 9, c: 29713},
-    {f: 6, c: 29724}, {f: 2, c: 29731}, 29735, 29737, 29739, 29741, 29743,
-    {f: 2, c: 29745}, {f: 5, c: 29751}, {f: 2, c: 29757}, 29760,
-    {f: 9, c: 29762}, {f: 9, c: 29772}, 29782, 29784, 29789, {f: 3, c: 29792},
-    {f: 5, c: 29796}, {f: 2, c: 29803}, {f: 2, c: 29806}, {f: 5, c: 29809},
-    {f: 6, c: 29816}, 29823, 29826, {f: 3, c: 29828}, 29832, 29834,
-    {f: 2, c: 29836}, 29839, {f: 11, c: 29841}, 29853, {f: 4, c: 29855},
-    {f: 2, c: 29860}, {f: 6, c: 29866}, {f: 9, c: 29873}, {f: 2, c: 29883},
-    {f: 12, c: 29886}, {f: 4, c: 29899}, {f: 2, c: 29904}, 29907,
-    {f: 5, c: 29909}, 29915, 29917, 29919, 29921, 29925, {f: 7, c: 29927},
-    {f: 4, c: 29936}, 29941, {f: 7, c: 29944}, {f: 4, c: 29952},
-    {f: 7, c: 29957}, 29966, 29968, 29970, {f: 4, c: 29972}, 29979,
-    {f: 2, c: 29981}, {f: 3, c: 29984}, 29988, {f: 2, c: 29990}, 29994, 29998,
-    30004, 30006, 30009, {f: 2, c: 30012}, 30015, {f: 4, c: 30017},
-    {f: 2, c: 30022}, {f: 2, c: 30025}, 30029, {f: 4, c: 30032},
-    {f: 4, c: 30037}, {f: 4, c: 30046}, {f: 2, c: 30051}, {f: 3, c: 30055},
-    {f: 6, c: 30060}, 30067, 30069, 30071, {f: 5, c: 30074}, {f: 3, c: 30080},
-    {f: 2, c: 30084}, {f: 3, c: 30088}, {f: 3, c: 30092}, 30096, 30099, 30101,
-    30104, {f: 2, c: 30107}, 30110, 30114, {f: 5, c: 30118}, 30125,
-    {f: 2, c: 30134}, {f: 2, c: 30138}, {f: 3, c: 30143}, 30150,
-    {f: 2, c: 30155}, {f: 4, c: 30158}, 30163, 30167, 30170, {f: 2, c: 30172},
-    {f: 3, c: 30175}, 30181, 30185, {f: 4, c: 30188}, {f: 2, c: 30194},
-    {f: 4, c: 30197}, {f: 2, c: 30202}, {f: 2, c: 30205}, 30212,
-    {f: 4, c: 30214}, {f: 2, c: 30222}, {f: 4, c: 30225}, 30230, 30234,
-    {f: 2, c: 30236}, 30243, 30248, 30252, {f: 2, c: 30254}, {f: 2, c: 30257},
-    {f: 2, c: 30262}, {f: 2, c: 30265}, 30269, 30273, {f: 2, c: 30276}, 30280,
-    {f: 2, c: 30282}, {f: 6, c: 30286}, 30293, 30295, {f: 3, c: 30297}, 30301,
-    {f: 2, c: 30304}, 30310, 30312, 30314, {f: 3, c: 30323}, [12136, 30326],
-    30327, {f: 2, c: 30329}, {f: 3, c: 30335}, 30339, 30341, {f: 2, c: 30345},
-    {f: 2, c: 30348}, {f: 2, c: 30351}, 30354, {f: 2, c: 30356},
-    {f: 2, c: 30359}, {f: 9, c: 30363}, {f: 9, c: 30373}, {f: 2, c: 30383},
-    30387, {f: 3, c: 30389}, 30393, {f: 4, c: 30395}, {f: 2, c: 30400},
-    {f: 2, c: 30403}, 30407, 30409, {f: 2, c: 30411}, 30419, 30421,
-    {f: 2, c: 30425}, {f: 2, c: 30428}, 30432, 30434, 30438, {f: 6, c: 30440},
-    30448, 30451, {f: 3, c: 30453}, {f: 2, c: 30458}, 30461, {f: 2, c: 30463},
-    {f: 2, c: 30466}, {f: 2, c: 30469}, 30474, 30476, {f: 11, c: 30478},
-    {f: 4, c: 30491}, 30497, {f: 3, c: 30499}, 30503, {f: 3, c: 30506}, 30510,
-    {f: 5, c: 30512}, 30521, 30523, {f: 3, c: 30525}, 30530, {f: 3, c: 30532},
-    {f: 7, c: 30536}, {f: 8, c: 30546}, {f: 2, c: 30556}, {f: 2, c: 30559},
-    30564, 30567, {f: 2, c: 30569}, {f: 12, c: 30573}, {f: 3, c: 30586},
-    {f: 3, c: 30593}, {f: 6, c: 30598}, {f: 2, c: 30607}, {f: 5, c: 30611},
-    {f: 5, c: 30617}, 30625, {f: 2, c: 30627}, 30630, 30632, 30635,
-    {f: 2, c: 30638}, {f: 2, c: 30641}, 30644, {f: 5, c: 30646}, 30654,
-    {f: 7, c: 30656}, {f: 5, c: 30664}, {f: 9, c: 30670}, {f: 2, c: 30680},
-    {f: 5, c: 30685}, 30692, 30694, 30696, 30698, {f: 3, c: 30704},
-    {f: 2, c: 30708}, 30711, {f: 4, c: 30713}, {f: 6, c: 30723},
-    {f: 2, c: 30730}, {f: 3, c: 30734}, 30739, 30741, 30745, 30747, 30750,
-    {f: 3, c: 30752}, 30756, 30760, {f: 2, c: 30762}, {f: 2, c: 30766},
-    {f: 3, c: 30769}, {f: 2, c: 30773}, 30781, 30783, {f: 2, c: 30785}, 30788,
-    30790, {f: 4, c: 30792}, 30797, 30799, 30801, {f: 2, c: 30803},
-    {f: 5, c: 30808}, {f: 6, c: 30814}, {f: 3, c: 30821}, 30825,
-    {f: 7, c: 30832}, {f: 4, c: 30840}, {f: 10, c: 30845}, 30856,
-    {f: 2, c: 30858}, {f: 2, c: 30863}, 30866, {f: 3, c: 30868}, 30873,
-    {f: 2, c: 30877}, 30880, 30882, 30884, 30886, 30888, {f: 3, c: 30890},
-    {f: 2, c: 30894}, {f: 3, c: 30901}, 30907, 30909, {f: 2, c: 30911},
-    {f: 3, c: 30914}, {f: 3, c: 30918}, {f: 4, c: 30924}, {f: 3, c: 30929},
-    {f: 3, c: 30934}, {f: 8, c: 30939}, {f: 3, c: 30948}, {f: 3, c: 30953},
-    {f: 2, c: 30957}, {f: 2, c: 30960}, 30963, {f: 2, c: 30965},
-    {f: 2, c: 30968}, {f: 2, c: 30971}, {f: 3, c: 30974}, {f: 3, c: 30978},
-    {f: 8, c: 30982}, {f: 4, c: 30991}, {f: 5, c: 30996}, {f: 4, c: 31002},
-    {f: 5, c: 31007}, 31013, {f: 3, c: 31015}, {f: 4, c: 31021},
-    {f: 2, c: 31026}, {f: 5, c: 31029}, 31037, 31039, {f: 4, c: 31042}, 31047,
-    {f: 9, c: 31050}, {f: 2, c: 31060}, {f: 2, c: 31064}, 31073,
-    {f: 2, c: 31075}, 31078, {f: 4, c: 31081}, 31086, {f: 7, c: 31088}, 31097,
-    {f: 5, c: 31099}, {f: 2, c: 31106}, {f: 4, c: 31110}, {f: 2, c: 31115},
-    {f: 10, c: 31120}, {f: 11, c: 31131}, {f: 2, c: 31144}, {f: 3, c: 31147},
-    31151, 31154, {f: 4, c: 31156}, [12145, 31160], 31164, 31167, 31170,
-    {f: 2, c: 31172}, {f: 2, c: 31175}, 31178, 31180, {f: 3, c: 31182},
-    {f: 2, c: 31187}, {f: 2, c: 31190}, {f: 6, c: 31193}, {f: 3, c: 31200},
-    31205, 31208, 31210, 31212, 31214, {f: 7, c: 31217}, {f: 2, c: 31225},
-    31228, {f: 2, c: 31230}, 31233, {f: 2, c: 31236}, {f: 4, c: 31239}, 31244,
-    {f: 5, c: 31247}, {f: 2, c: 31253}, {f: 2, c: 31256}, {f: 3, c: 31259},
-    31263, {f: 2, c: 31265}, {f: 10, c: 31268}, {f: 2, c: 31279}, 31282,
-    {f: 3, c: 31284}, 31288, 31290, 31294, {f: 5, c: 31297}, {f: 5, c: 31303},
-    {f: 2, c: 31311}, {f: 5, c: 31314}, {f: 9, c: 31320}, {f: 6, c: 31331},
-    31338, {f: 4, c: 31340}, {f: 3, c: 31345}, 31349, {f: 4, c: 31355}, 31362,
-    31365, 31367, {f: 4, c: 31369}, {f: 3, c: 31374}, {f: 2, c: 31379},
-    {f: 3, c: 31385}, 31390, {f: 4, c: 31393}, 31399, 31403, {f: 4, c: 31407},
-    {f: 2, c: 31412}, {f: 3, c: 31415}, {f: 4, c: 31419}, {f: 4, c: 31424},
-    31430, 31433, {f: 10, c: 31436}, {f: 2, c: 31447}, {f: 4, c: 31450},
-    {f: 2, c: 31457}, 31460, {f: 3, c: 31463}, {f: 2, c: 31467}, 31470,
-    {f: 6, c: 31472}, {f: 2, c: 31479}, {f: 2, c: 31483}, 31486,
-    {f: 3, c: 31488}, 31493, 31495, 31497, {f: 3, c: 31500}, 31504,
-    {f: 2, c: 31506}, {f: 3, c: 31510}, 31514, {f: 2, c: 31516}, 31519,
-    {f: 3, c: 31521}, 31527, 31529, 31533, {f: 2, c: 31535}, 31538,
-    {f: 4, c: 31540}, 31545, 31547, 31549, {f: 6, c: 31551}, 31560, 31562,
-    {f: 2, c: 31565}, 31571, 31573, 31575, 31577, 31580, {f: 2, c: 31582},
-    31585, {f: 4, c: 31587}, {f: 6, c: 31592}, {f: 2, c: 31599},
-    {f: 2, c: 31603}, 31606, 31608, 31610, {f: 2, c: 31612}, 31615,
-    {f: 4, c: 31617}, {f: 5, c: 31622}, 31628, {f: 2, c: 31630},
-    {f: 3, c: 31633}, 31638, {f: 4, c: 31640}, {f: 3, c: 31646},
-    {f: 3, c: 31651}, {f: 3, c: 31662}, {f: 2, c: 31666}, {f: 3, c: 31669},
-    {f: 7, c: 31673}, {f: 2, c: 31682}, 31685, 31688, 31690, {f: 4, c: 31693},
-    31698, {f: 5, c: 31700}, {f: 2, c: 31707}, {f: 3, c: 31710},
-    {f: 2, c: 31714}, {f: 2, c: 31719}, {f: 3, c: 31723}, {f: 2, c: 31727},
-    31730, {f: 3, c: 31732}, {f: 4, c: 31736}, 31741, 31743, {f: 6, c: 31745},
-    {f: 3, c: 31752}, 31758, {f: 6, c: 31760}, {f: 7, c: 31767}, 31776, 31778,
-    {f: 2, c: 31780}, {f: 2, c: 31784}, {f: 12, c: 31788}, {f: 4, c: 31801},
-    31810, {f: 8, c: 31812}, {f: 14, c: 31822}, {f: 2, c: 31837},
-    {f: 3, c: 31841}, {f: 4, c: 31845}, 31851, 31853, {f: 3, c: 31855},
-    {f: 6, c: 31861}, {f: 11, c: 31870}, {f: 7, c: 31882}, {f: 2, c: 31891},
-    31894, {f: 3, c: 31897}, {f: 2, c: 31904}, 31907, {f: 4, c: 31910},
-    {f: 3, c: 31915}, {f: 2, c: 31919}, {f: 5, c: 31924}, {f: 2, c: 31930},
-    {f: 2, c: 31935}, {f: 3, c: 31938}, 31942, 31945, 31947, {f: 7, c: 31950},
-    31960, {f: 2, c: 31962}, {f: 6, c: 31969}, {f: 6, c: 31977}, 31985, 31987,
-    31989, 31991, 31994, {f: 2, c: 31996}, 31999, 32001, 32003, 32012,
-    {f: 2, c: 32014}, {f: 2, c: 32017}, 32022, 32024, {f: 3, c: 32029},
-    {f: 4, c: 32035}, {f: 3, c: 32040}, {f: 3, c: 32044}, {f: 5, c: 32052},
-    32059, {f: 2, c: 32061}, 32065, 32067, 32069, {f: 7, c: 32071}, 32079,
-    {f: 12, c: 32081}, {f: 2, c: 32095}, {f: 3, c: 32099}, 32103,
-    {f: 5, c: 32105}, {f: 2, c: 32111}, {f: 2, c: 32116}, 32120,
-    {f: 7, c: 32122}, 32130, {f: 2, c: 32132}, 32135, {f: 5, c: 32138},
-    {f: 3, c: 32144}, {f: 8, c: 32148}, 32157, {f: 3, c: 32159},
-    {f: 2, c: 32164}, {f: 4, c: 32167}, 32175, {f: 3, c: 32181}, 32188,
-    {f: 4, c: 32192}, {f: 2, c: 32197}, {f: 2, c: 32200}, {f: 5, c: 32204},
-    32211, {f: 2, c: 32213}, {f: 3, c: 32218}, 32223, 32226, {f: 2, c: 32228},
-    32231, {f: 2, c: 32234}, {f: 2, c: 32237}, 32240, 32243, 32245,
-    {f: 2, c: 32247}, 32250, {f: 12, c: 32252}, {f: 4, c: 32268},
-    {f: 9, c: 32274}, 32284, {f: 3, c: 32288}, {f: 3, c: 32292},
-    {f: 3, c: 32296}, 32300, {f: 2, c: 32303}, 32307, 32312, 32314, 32316,
-    {f: 2, c: 32319}, {f: 3, c: 32322}, {f: 10, c: 32328}, 32339,
-    {f: 4, c: 32342}, {f: 3, c: 32347}, {f: 3, c: 32351}, {f: 6, c: 32355},
-    32364, {f: 2, c: 32369}, {f: 5, c: 32372}, {f: 2, c: 32378},
-    {f: 3, c: 32383}, {f: 5, c: 32387}, 32393, 32395, 32398, {f: 3, c: 32400},
-    32405, 32407, {f: 2, c: 32409}, {f: 2, c: 32413}, 32430, 32436,
-    {f: 2, c: 32443}, 32470, 32484, 32492, 32505, 32522, 32528, 32542, 32567,
-    32569, {f: 7, c: 32571}, 32579, {f: 6, c: 32582}, 32589, 32591,
-    {f: 2, c: 32594}, 32598, 32601, {f: 4, c: 32603}, 32608, {f: 5, c: 32611},
-    {f: 3, c: 32619}, 32623, 32627, {f: 2, c: 32629}, 32632, {f: 4, c: 32634},
-    {f: 2, c: 32639}, {f: 3, c: 32642}, 32647, 32649, 32651, 32653,
-    {f: 5, c: 32655}, {f: 5, c: 32661}, {f: 2, c: 32667}, 32672,
-    {f: 2, c: 32674}, 32678, 32680, {f: 5, c: 32682}, 32689, {f: 5, c: 32691},
-    {f: 2, c: 32698}, 32702, 32704, {f: 3, c: 32706}, {f: 4, c: 32710}, 32715,
-    32717, {f: 3, c: 32719}, 32723, {f: 2, c: 32726}, {f: 6, c: 32729},
-    {f: 3, c: 32738}, {f: 2, c: 32743}, {f: 4, c: 32746}, 32751, 32754,
-    {f: 5, c: 32756}, 32762, {f: 3, c: 32765}, 32770, {f: 4, c: 32775},
-    {f: 2, c: 32782}, 32785, 32787, {f: 2, c: 32794}, {f: 3, c: 32797}, 32801,
-    {f: 2, c: 32803}, 32811, 32813, {f: 2, c: 32815}, 32818, 32820,
-    {f: 2, c: 32825}, 32828, 32830, {f: 2, c: 32832}, {f: 2, c: 32836},
-    {f: 3, c: 32839}, {f: 4, c: 32846}, 32851, 32853, 32855, 32857,
-    {f: 3, c: 32859}, {f: 10, c: 32863}, {f: 4, c: 32875}, 32884, 32888,
-    {f: 3, c: 32890}, {f: 2, c: 32897}, 32904, 32906, {f: 6, c: 32909},
-    {f: 2, c: 32916}, 32919, 32921, 32926, 32931, {f: 3, c: 32934}, 32940,
-    32944, 32947, {f: 2, c: 32949}, {f: 2, c: 32952}, 32955, 32965,
-    {f: 5, c: 32967}, {f: 7, c: 32975}, 32984, {f: 2, c: 32991},
-    {f: 2, c: 32994}, 32998, 33006, 33013, 33015, 33017, 33019,
-    {f: 4, c: 33022}, {f: 2, c: 33027}, {f: 2, c: 33031}, {f: 2, c: 33035},
-    33045, 33047, 33049, {f: 2, c: 33052}, {f: 13, c: 33055}, {f: 2, c: 33069},
-    33072, {f: 3, c: 33075}, 33079, {f: 4, c: 33082}, {f: 7, c: 33087}, 33095,
-    33097, 33101, 33103, 33106, {f: 2, c: 33111}, {f: 5, c: 33115},
-    {f: 3, c: 33122}, 33128, 33130, 33132, 33135, {f: 2, c: 33138},
-    {f: 3, c: 33141}, 33153, {f: 5, c: 33155}, 33161, {f: 4, c: 33163}, 33168,
-    {f: 6, c: 33170}, 33177, {f: 2, c: 33182}, {f: 2, c: 33185},
-    {f: 2, c: 33188}, 33191, {f: 8, c: 33195}, {f: 6, c: 33204}, 33212,
-    {f: 2, c: 33220}, {f: 2, c: 33223}, 33227, 33230, {f: 8, c: 33232}, 33241,
-    {f: 4, c: 33243}, {f: 2, c: 33249}, {f: 3, c: 33252}, 33257, 33259,
-    {f: 5, c: 33262}, {f: 5, c: 33269}, 33277, 33279, 33283, 33291,
-    {f: 2, c: 33294}, 33297, 33299, {f: 6, c: 33301}, 33309, 33312,
-    {f: 4, c: 33316}, 33321, 33326, 33330, 33338, {f: 2, c: 33340},
-    {f: 5, c: 33343}, {f: 2, c: 33349}, 33352, 33354, {f: 3, c: 33356},
-    {f: 8, c: 33360}, {f: 4, c: 33371}, {f: 4, c: 33376}, 33381, 33383,
-    {f: 2, c: 33385}, {f: 2, c: 33388}, {f: 2, c: 33397}, [12171, 33400],
-    {f: 2, c: 33403}, {f: 2, c: 33408}, 33411, {f: 3, c: 33413}, 33417, 33420,
-    33424, {f: 4, c: 33427}, {f: 2, c: 33434}, 33438, 33440, {f: 2, c: 33442},
-    33447, 33458, {f: 2, c: 33461}, 33466, 33468, {f: 2, c: 33471},
-    {f: 2, c: 33474}, {f: 2, c: 33477}, 33481, 33488, 33494, {f: 2, c: 33497},
-    33501, 33506, {f: 3, c: 33512}, {f: 3, c: 33516}, 33520, {f: 2, c: 33522},
-    {f: 2, c: 33525}, 33528, 33530, {f: 5, c: 33532}, {f: 2, c: 33546}, 33549,
-    33552, {f: 2, c: 33554}, 33558, {f: 2, c: 33560}, {f: 10, c: 33565},
-    {f: 2, c: 33577}, 33582, 33584, 33586, 33591, 33595, {f: 3, c: 33597},
-    {f: 2, c: 33601}, {f: 2, c: 33604}, 33608, {f: 5, c: 33610}, 33619,
-    {f: 5, c: 33621}, 33629, 33634, {f: 7, c: 33648}, {f: 2, c: 33657},
-    {f: 7, c: 33662}, {f: 2, c: 33671}, {f: 3, c: 33675}, {f: 3, c: 33679},
-    {f: 2, c: 33684}, 33687, {f: 2, c: 33689}, 33693, 33695, 33697,
-    {f: 4, c: 33699}, {f: 4, c: 33708}, 33717, 33723, {f: 2, c: 33726},
-    {f: 3, c: 33730}, 33734, {f: 2, c: 33736}, 33739, {f: 2, c: 33741},
-    {f: 4, c: 33744}, 33749, 33751, {f: 3, c: 33753}, 33758, {f: 3, c: 33762},
-    {f: 3, c: 33766}, {f: 4, c: 33771}, {f: 5, c: 33779}, {f: 3, c: 33786},
-    {f: 3, c: 33790}, 33794, 33797, {f: 2, c: 33800}, 33808, {f: 6, c: 33810},
-    {f: 3, c: 33817}, {f: 6, c: 33822}, {f: 3, c: 33833}, {f: 4, c: 33837},
-    {f: 3, c: 33842}, {f: 2, c: 33846}, {f: 3, c: 33849}, {f: 8, c: 33854},
-    {f: 2, c: 33863}, {f: 7, c: 33866}, {f: 4, c: 33875}, 33880,
-    {f: 4, c: 33885}, 33890, 33893, {f: 2, c: 33895}, 33898, 33902, 33904,
-    33906, 33908, 33913, {f: 7, c: 33915}, {f: 4, c: 33923}, 33930, 33933,
-    {f: 4, c: 33935}, {f: 2, c: 33941}, 33944, {f: 2, c: 33946},
-    {f: 4, c: 33949}, {f: 13, c: 33954}, {f: 2, c: 33968}, 33971,
-    {f: 3, c: 33973}, 33979, 33982, {f: 2, c: 33986}, {f: 4, c: 33989}, 33996,
-    {f: 2, c: 33998}, 34002, {f: 2, c: 34004}, {f: 6, c: 34007}, 34014,
-    {f: 2, c: 34017}, 34020, {f: 5, c: 34023}, 34029, {f: 11, c: 34033}, 34046,
-    {f: 12, c: 34048}, {f: 4, c: 34061}, 34066, {f: 2, c: 34069},
-    {f: 2, c: 34072}, {f: 3, c: 34075}, 34080, 34082, {f: 2, c: 34084},
-    {f: 4, c: 34087}, {f: 9, c: 34094}, {f: 3, c: 34110}, 34114,
-    {f: 2, c: 34116}, 34119, {f: 3, c: 34123}, {f: 3, c: 34127}, 34132, 34135,
-    {f: 4, c: 34138}, {f: 3, c: 34143}, 34147, {f: 3, c: 34149},
-    {f: 2, c: 34155}, {f: 4, c: 34158}, 34163, {f: 2, c: 34165}, 34168,
-    {f: 2, c: 34172}, {f: 5, c: 34175}, 34182, 34185, 34187, {f: 2, c: 34189},
-    34192, {f: 2, c: 34194}, {f: 6, c: 34197}, {f: 2, c: 34205},
-    {f: 4, c: 34208}, 34213, 34215, {f: 3, c: 34219}, {f: 6, c: 34225}, 34232,
-    {f: 6, c: 34235}, {f: 7, c: 34242}, {f: 3, c: 34250}, {f: 2, c: 34257},
-    34260, {f: 6, c: 34262}, {f: 6, c: 34270}, {f: 3, c: 34278},
-    {f: 9, c: 34283}, 34293, {f: 2, c: 34295}, {f: 3, c: 34300},
-    {f: 4, c: 34304}, {f: 3, c: 34312}, {f: 5, c: 34316}, {f: 4, c: 34322},
-    {f: 3, c: 34327}, {f: 3, c: 34331}, {f: 3, c: 34335}, {f: 4, c: 34339},
-    34344, {f: 3, c: 34346}, {f: 10, c: 34350}, 34361, 34363, {f: 2, c: 34365},
-    {f: 13, c: 34368}, {f: 2, c: 34386}, {f: 4, c: 34390}, 34395, 34397,
-    {f: 2, c: 34400}, {f: 4, c: 34403}, {f: 3, c: 34408}, 34413,
-    {f: 2, c: 34415}, {f: 7, c: 34418}, {f: 7, c: 34435}, {f: 5, c: 34446},
-    34452, {f: 6, c: 34454}, {f: 5, c: 34462}, {f: 2, c: 34469}, 34475,
-    {f: 2, c: 34477}, {f: 2, c: 34482}, {f: 3, c: 34487}, {f: 5, c: 34491},
-    {f: 3, c: 34497}, 34501, 34504, {f: 2, c: 34508}, {f: 2, c: 34514},
-    {f: 3, c: 34517}, 34522, {f: 2, c: 34524}, {f: 4, c: 34528},
-    {f: 4, c: 34533}, {f: 3, c: 34538}, 34543, {f: 3, c: 34549},
-    {f: 3, c: 34555}, 34559, 34561, {f: 2, c: 34564}, {f: 2, c: 34571},
-    {f: 4, c: 34574}, 34580, 34582, 34585, 34587, 34589, {f: 2, c: 34591},
-    34596, {f: 3, c: 34598}, {f: 4, c: 34602}, {f: 2, c: 34607},
-    {f: 2, c: 34610}, {f: 2, c: 34613}, {f: 3, c: 34616}, {f: 2, c: 34620},
-    {f: 7, c: 34624}, {f: 2, c: 34634}, 34637, {f: 4, c: 34639}, 34644, 34646,
-    34648, {f: 6, c: 34650}, {f: 2, c: 34657}, {f: 7, c: 34663}, 34671,
-    {f: 3, c: 34673}, 34677, 34679, {f: 2, c: 34681}, {f: 3, c: 34687},
-    {f: 2, c: 34694}, {f: 2, c: 34697}, 34700, {f: 5, c: 34702},
-    {f: 3, c: 34708}, {f: 6, c: 34712}, {f: 2, c: 34720}, {f: 5, c: 34723},
-    {f: 2, c: 34729}, 34734, {f: 3, c: 34736}, 34740, {f: 4, c: 34742}, 34748,
-    {f: 2, c: 34750}, {f: 3, c: 34753}, 34757, 34759, 34761, {f: 2, c: 34764},
-    {f: 2, c: 34767}, {f: 7, c: 34772}, {f: 4, c: 34780}, {f: 2, c: 34785},
-    34788, {f: 4, c: 34790}, 34795, 34797, {f: 2, c: 34800}, {f: 3, c: 34803},
-    {f: 2, c: 34807}, 34810, {f: 2, c: 34812}, {f: 4, c: 34815}, 34820,
-    {f: 3, c: 34823}, {f: 5, c: 34827}, 34834, 34836, {f: 4, c: 34839},
-    {f: 3, c: 34844}, 34848, {f: 13, c: 34852}, {f: 3, c: 34867},
-    {f: 2, c: 34871}, 34874, {f: 3, c: 34877}, {f: 3, c: 34881},
-    {f: 3, c: 34887}, 34891, {f: 5, c: 34894}, {f: 2, c: 34901}, 34904, 34906,
-    34908, {f: 3, c: 34910}, {f: 2, c: 34918}, 34922, 34925, 34927, 34929,
-    {f: 4, c: 34931}, 34936, {f: 3, c: 34938}, 34944, 34947, {f: 2, c: 34950},
-    {f: 2, c: 34953}, 34956, {f: 4, c: 34958}, {f: 3, c: 34963},
-    {f: 5, c: 34967}, {f: 5, c: 34973}, 34979, {f: 6, c: 34981}, 34988,
-    {f: 3, c: 34990}, {f: 5, c: 34994}, {f: 4, c: 35000}, {f: 4, c: 35005},
-    {f: 2, c: 35011}, {f: 2, c: 35015}, {f: 3, c: 35019}, {f: 2, c: 35024},
-    35027, {f: 2, c: 35030}, {f: 2, c: 35034}, 35038, {f: 2, c: 35040},
-    {f: 2, c: 35046}, {f: 7, c: 35049}, 35058, {f: 3, c: 35061},
-    {f: 2, c: 35066}, {f: 3, c: 35071}, {f: 4, c: 35075}, {f: 2, c: 35080},
-    {f: 5, c: 35083}, 35089, {f: 5, c: 35092}, {f: 5, c: 35100},
-    {f: 3, c: 35106}, {f: 4, c: 35110}, {f: 4, c: 35116}, 35121, 35125, 35127,
-    {f: 2, c: 35129}, {f: 5, c: 35132}, {f: 2, c: 35138}, {f: 2, c: 35141},
-    {f: 14, c: 35144}, {f: 6, c: 35159}, {f: 3, c: 35169}, 35173,
-    {f: 3, c: 35175}, 35179, {f: 2, c: 35181}, {f: 2, c: 35184},
-    {f: 8, c: 35187}, {f: 2, c: 35196}, [12177, 35198], 35200, 35202,
-    {f: 2, c: 35204}, {f: 4, c: 35207}, {f: 3, c: 35212}, {f: 3, c: 35216},
-    {f: 2, c: 35220}, 35223, {f: 8, c: 35225}, {f: 4, c: 35234},
-    {f: 3, c: 35239}, 35243, {f: 2, c: 35245}, {f: 2, c: 35248},
-    {f: 4, c: 35251}, {f: 2, c: 35256}, {f: 2, c: 35259}, 35262, 35267, 35277,
-    {f: 3, c: 35283}, {f: 3, c: 35287}, 35291, 35293, {f: 4, c: 35295}, 35300,
-    {f: 4, c: 35303}, {f: 3, c: 35308}, {f: 3, c: 35312}, 35317, 35319,
-    {f: 7, c: 35321}, {f: 3, c: 35332}, 35337, 35339, 35341, 35343,
-    {f: 2, c: 35345}, 35348, 35351, {f: 2, c: 35353}, 35356, 35358,
-    {f: 3, c: 35360}, 35364, {f: 4, c: 35366}, {f: 2, c: 35371},
-    {f: 3, c: 35374}, {f: 2, c: 35378}, 35381, {f: 3, c: 35383},
-    {f: 3, c: 35387}, {f: 2, c: 35391}, {f: 4, c: 35394}, 35399,
-    {f: 5, c: 35401}, 35407, 35409, 35411, {f: 2, c: 35414}, {f: 2, c: 35417},
-    {f: 2, c: 35420}, {f: 2, c: 35423}, {f: 2, c: 35428}, {f: 2, c: 35431},
-    35434, 35439, 35444, {f: 3, c: 35446}, {f: 2, c: 35450}, {f: 2, c: 35453},
-    {f: 4, c: 35456}, 35464, {f: 2, c: 35467}, {f: 3, c: 35470}, 35476,
-    {f: 2, c: 35478}, 35481, {f: 3, c: 35483}, 35487, 35490, 35495,
-    {f: 3, c: 35497}, {f: 3, c: 35501}, 35505, {f: 3, c: 35507},
-    {f: 2, c: 35511}, {f: 2, c: 35514}, {f: 2, c: 35517}, {f: 2, c: 35520},
-    35523, {f: 2, c: 35525}, 35528, 35530, 35532, 35534, 35536,
-    {f: 3, c: 35539}, {f: 3, c: 35544}, 35549, {f: 3, c: 35551}, 35555, 35557,
-    {f: 3, c: 35560}, 35564, {f: 2, c: 35567}, 35570, {f: 2, c: 35572}, 35577,
-    35579, 35581, 35583, 35587, 35590, {f: 2, c: 35592}, {f: 3, c: 35595},
-    35599, {f: 3, c: 35601}, 35605, 35608, 35612, {f: 3, c: 35614},
-    {f: 4, c: 35618}, 35623, {f: 2, c: 35625}, {f: 5, c: 35630},
-    {f: 5, c: 35636}, {f: 4, c: 35642}, {f: 10, c: 35647}, {f: 4, c: 35658},
-    {f: 6, c: 35664}, 35671, 35675, {f: 9, c: 35677}, {f: 4, c: 35687},
-    {f: 2, c: 35693}, {f: 3, c: 35697}, {f: 2, c: 35701}, {f: 5, c: 35704},
-    {f: 2, c: 35710}, {f: 9, c: 35713}, {f: 3, c: 35723}, {f: 3, c: 35727},
-    35732, {f: 5, c: 35735}, 35741, 35743, 35756, 35761, 35771, 35783, 35792,
-    35818, 35849, 35870, {f: 9, c: 35896}, {f: 4, c: 35906}, {f: 2, c: 35914},
-    {f: 3, c: 35917}, {f: 4, c: 35921}, {f: 4, c: 35926}, {f: 6, c: 35931},
-    {f: 7, c: 35939}, {f: 7, c: 35948}, {f: 4, c: 35956}, {f: 7, c: 35963},
-    {f: 2, c: 35971}, {f: 3, c: 35974}, 35979, {f: 7, c: 35981},
-    {f: 3, c: 35989}, {f: 4, c: 35993}, 35999, {f: 4, c: 36003},
-    {f: 2, c: 36013}, 36017, 36021, 36025, 36030, 36038, 36041,
-    {f: 6, c: 36043}, 36052, {f: 4, c: 36054}, 36059, 36061, 36063, 36069,
-    {f: 2, c: 36072}, {f: 6, c: 36078}, {f: 5, c: 36085}, {f: 5, c: 36095},
-    {f: 2, c: 36102}, 36105, 36108, 36110, {f: 5, c: 36113}, {f: 4, c: 36119},
-    36128, {f: 2, c: 36177}, 36183, 36191, 36197, {f: 3, c: 36200}, 36204,
-    {f: 2, c: 36206}, {f: 2, c: 36209}, {f: 9, c: 36216}, {f: 2, c: 36226},
-    {f: 4, c: 36230}, {f: 5, c: 36236}, {f: 2, c: 36242}, {f: 3, c: 36246},
-    {f: 5, c: 36250}, {f: 3, c: 36256}, {f: 4, c: 36260}, {f: 8, c: 36265},
-    {f: 2, c: 36278}, 36281, 36283, 36285, {f: 3, c: 36288}, 36293,
-    {f: 4, c: 36295}, 36301, 36304, {f: 4, c: 36306}, {f: 2, c: 36312}, 36316,
-    {f: 3, c: 36320}, {f: 3, c: 36325}, 36329, {f: 2, c: 36333},
-    {f: 3, c: 36336}, 36340, 36342, 36348, {f: 7, c: 36350}, {f: 3, c: 36358},
-    36363, {f: 2, c: 36365}, {f: 3, c: 36369}, {f: 8, c: 36373},
-    {f: 2, c: 36384}, {f: 5, c: 36388}, 36395, 36397, 36400, {f: 2, c: 36402},
-    {f: 3, c: 36406}, {f: 2, c: 36411}, {f: 2, c: 36414}, 36419,
-    {f: 2, c: 36421}, {f: 4, c: 36429}, {f: 2, c: 36435}, {f: 3, c: 36438},
-    {f: 9, c: 36442}, {f: 2, c: 36452}, {f: 2, c: 36455}, {f: 2, c: 36458},
-    36462, 36465, 36467, 36469, {f: 3, c: 36471}, 36475, {f: 2, c: 36477},
-    36480, {f: 3, c: 36482}, 36486, 36488, 36492, 36494, {f: 5, c: 36501},
-    36507, 36509, {f: 2, c: 36511}, {f: 3, c: 36514}, {f: 3, c: 36519},
-    {f: 2, c: 36525}, {f: 2, c: 36528}, {f: 7, c: 36531}, {f: 5, c: 36539},
-    {f: 9, c: 36545}, {f: 3, c: 36559}, 36563, {f: 6, c: 36565},
-    {f: 3, c: 36572}, {f: 4, c: 36576}, {f: 6, c: 36581}, {f: 6, c: 36588},
-    {f: 5, c: 36595}, 36605, {f: 4, c: 36607}, 36612, 36614, 36616,
-    {f: 7, c: 36619}, 36627, {f: 5, c: 36630}, {f: 5, c: 36640},
-    {f: 2, c: 36647}, {f: 4, c: 36651}, {f: 3, c: 36656}, {f: 4, c: 36660},
-    {f: 2, c: 36665}, {f: 2, c: 36668}, {f: 2, c: 36672}, 36675,
-    {f: 2, c: 36679}, {f: 3, c: 36682}, {f: 5, c: 36687}, {f: 10, c: 36693},
-    36704, 36707, 36709, 36714, 36736, 36748, 36754, 36765, {f: 3, c: 36768},
-    {f: 2, c: 36772}, 36775, 36778, 36780, {f: 2, c: 36787}, [12193, 36789],
-    {f: 2, c: 36791}, {f: 3, c: 36794}, {f: 2, c: 36799}, 36803, 36806,
-    {f: 5, c: 36809}, 36815, 36818, {f: 2, c: 36822}, 36826, {f: 2, c: 36832},
-    36835, 36839, 36844, 36847, {f: 2, c: 36849}, {f: 2, c: 36853},
-    {f: 3, c: 36858}, {f: 2, c: 36862}, {f: 2, c: 36871}, 36876, 36878, 36883,
-    36888, 36892, {f: 2, c: 36900}, {f: 6, c: 36903}, {f: 2, c: 36912},
-    {f: 2, c: 36915}, 36919, {f: 2, c: 36921}, 36925, {f: 2, c: 36927}, 36931,
-    {f: 2, c: 36933}, {f: 3, c: 36936}, 36940, 36950, {f: 2, c: 36953}, 36957,
-    36959, 36961, 36964, {f: 2, c: 36966}, {f: 3, c: 36970}, {f: 3, c: 36975},
-    36979, 36982, 36985, 36987, 36990, {f: 2, c: 36997}, 37001,
-    {f: 3, c: 37004}, 37010, 37012, 37014, 37016, 37018, 37020,
-    {f: 3, c: 37022}, {f: 2, c: 37028}, {f: 3, c: 37031}, 37035, 37037, 37042,
-    37047, {f: 2, c: 37052}, {f: 2, c: 37055}, {f: 2, c: 37058}, 37062,
-    {f: 2, c: 37064}, {f: 3, c: 37067}, 37074, {f: 3, c: 37076},
-    {f: 3, c: 37080}, 37086, 37088, {f: 3, c: 37091}, {f: 2, c: 37097}, 37100,
-    37102, {f: 4, c: 37104}, {f: 2, c: 37110}, {f: 4, c: 37113},
-    {f: 3, c: 37119}, 37123, 37125, {f: 2, c: 37127}, {f: 8, c: 37130}, 37139,
-    37141, {f: 2, c: 37143}, {f: 4, c: 37146}, {f: 3, c: 37151},
-    {f: 3, c: 37156}, {f: 5, c: 37160}, 37166, 37171, 37173, {f: 2, c: 37175},
-    {f: 8, c: 37179}, {f: 2, c: 37188}, 37191, 37201, {f: 4, c: 37203},
-    {f: 2, c: 37208}, {f: 2, c: 37211}, {f: 2, c: 37215}, {f: 3, c: 37222},
-    37227, 37229, 37235, {f: 3, c: 37242}, {f: 5, c: 37248}, 37254, 37256,
-    37258, {f: 2, c: 37262}, {f: 3, c: 37267}, {f: 3, c: 37271},
-    {f: 5, c: 37277}, {f: 6, c: 37284}, {f: 4, c: 37296}, {f: 4, c: 37302},
-    {f: 5, c: 37307}, 37314, 37316, [12196, 37318], 37320, 37328, 37334,
-    {f: 2, c: 37338}, {f: 5, c: 37342}, {f: 2, c: 37349}, 37352,
-    {f: 11, c: 37354}, 37366, 37368, {f: 5, c: 37371}, {f: 2, c: 37378},
-    {f: 3, c: 37381}, {f: 3, c: 37386}, 37391, {f: 2, c: 37394},
-    {f: 8, c: 37398}, {f: 4, c: 37407}, 37412, {f: 6, c: 37416}, 37423,
-    {f: 2, c: 37425}, {f: 2, c: 37429}, {f: 2, c: 37435}, {f: 4, c: 37441},
-    {f: 2, c: 37446}, {f: 3, c: 37450}, {f: 3, c: 37454}, {f: 3, c: 37458},
-    37462, {f: 2, c: 37464}, {f: 2, c: 37468}, {f: 3, c: 37471},
-    {f: 3, c: 37475}, {f: 5, c: 37479}, {f: 6, c: 37486}, {f: 3, c: 37493},
-    37497, {f: 3, c: 37500}, {f: 2, c: 37505}, 37508, {f: 8, c: 37510},
-    {f: 2, c: 37519}, 37522, {f: 2, c: 37524}, 37527, 37529, 37531,
-    {f: 3, c: 37533}, {f: 2, c: 37537}, 37540, 37543, 37549, {f: 2, c: 37551},
-    {f: 5, c: 37554}, 37560, 37562, {f: 4, c: 37565}, 37570, 37572, 37574,
-    {f: 3, c: 37577}, {f: 2, c: 37581}, {f: 2, c: 37584}, {f: 10, c: 37587},
-    37598, {f: 3, c: 37600}, 37607, 37609, {f: 2, c: 37611}, {f: 4, c: 37618},
-    37623, {f: 3, c: 37625}, {f: 4, c: 37629}, {f: 4, c: 37634},
-    {f: 7, c: 37641}, 37649, {f: 2, c: 37651}, {f: 2, c: 37654},
-    {f: 3, c: 37660}, 37665, {f: 3, c: 37667}, 37671, {f: 2, c: 37673},
-    {f: 2, c: 37676}, {f: 2, c: 37680}, {f: 2, c: 37684}, 37687,
-    {f: 5, c: 37689}, 37695, 37698, {f: 2, c: 37700}, {f: 3, c: 37704}, 37708,
-    {f: 6, c: 37710}, {f: 3, c: 37717}, {f: 2, c: 37721}, {f: 8, c: 37724},
-    {f: 3, c: 37734}, 37739, {f: 3, c: 37741}, {f: 4, c: 37745},
-    {f: 3, c: 37751}, {f: 3, c: 37755}, {f: 3, c: 37759}, 37763,
-    {f: 2, c: 37765}, {f: 2, c: 37768}, {f: 4, c: 37771}, {f: 6, c: 37776},
-    37783, {f: 9, c: 37785}, {f: 2, c: 37796}, 37800, 37803, 37805, 37807,
-    {f: 2, c: 37809}, 37812, {f: 2, c: 37814}, {f: 6, c: 37817},
-    {f: 3, c: 37824}, {f: 3, c: 37828}, 37833, 37835, {f: 3, c: 37838},
-    {f: 4, c: 37842}, {f: 3, c: 37849}, 37856, 37859, {f: 3, c: 37861},
-    {f: 12, c: 37865}, 37878, 37880, {f: 9, c: 37882}, {f: 7, c: 37892},
-    {f: 4, c: 37900}, 37905, {f: 3, c: 37909}, {f: 3, c: 37914},
-    {f: 2, c: 37918}, {f: 5, c: 37921}, {f: 5, c: 37929}, {f: 3, c: 37935},
-    37940, {f: 2, c: 37942}, 37945, {f: 3, c: 37947}, {f: 4, c: 37952},
-    {f: 5, c: 37957}, 37963, {f: 5, c: 37965}, 37971, {f: 11, c: 37973},
-    {f: 2, c: 37985}, 37988, {f: 5, c: 37990}, 37996, {f: 2, c: 37998}, 38001,
-    {f: 4, c: 38003}, 38008, {f: 2, c: 38010}, {f: 5, c: 38016}, 38033, 38038,
-    38040, 38087, 38095, {f: 2, c: 38099}, 38106, 38118, 38139, 38172, 38176,
-    38183, 38195, 38205, 38211, 38216, 38219, 38229, 38234, 38240, 38254,
-    {f: 2, c: 38260}, {f: 7, c: 38264}, 38273, {f: 2, c: 38276},
-    {f: 2, c: 38279}, 38282, 38285, 38288, 38290, {f: 3, c: 38293},
-    {f: 8, c: 38297}, 38306, {f: 2, c: 38310}, 38314, {f: 4, c: 38318},
-    {f: 3, c: 38323}, {f: 2, c: 38327}, 38330, {f: 3, c: 38336},
-    {f: 2, c: 38340}, 38343, 38345, {f: 3, c: 38349}, {f: 3, c: 38353},
-    {f: 5, c: 38359}, 38365, {f: 2, c: 38367}, {f: 2, c: 38371},
-    {f: 2, c: 38374}, 38380, 38399, 38407, 38419, 38424, 38427, 38430, 38432,
-    {f: 7, c: 38435}, {f: 3, c: 38443}, {f: 2, c: 38447}, {f: 4, c: 38455},
-    38462, 38465, 38467, 38474, {f: 2, c: 38478}, {f: 3, c: 38481},
-    {f: 2, c: 38486}, {f: 2, c: 38489}, 38492, 38494, 38496, {f: 2, c: 38501},
-    38507, {f: 3, c: 38509}, 38513, {f: 4, c: 38521}, {f: 7, c: 38526}, 38535,
-    38537, 38540, {f: 3, c: 38545}, 38550, 38554, {f: 10, c: 38557}, 38569,
-    {f: 5, c: 38571}, 38578, 38581, 38583, 38586, 38591, {f: 2, c: 38594},
-    38600, {f: 2, c: 38602}, {f: 2, c: 38608}, {f: 2, c: 38611},
-    {f: 2, c: 38615}, 38618, {f: 3, c: 38621}, 38625, {f: 4, c: 38628},
-    {f: 4, c: 38635}, {f: 2, c: 38640}, {f: 2, c: 38644}, 38648, 38650,
-    {f: 2, c: 38652}, 38655, {f: 2, c: 38658}, 38661, {f: 3, c: 38666},
-    {f: 3, c: 38672}, {f: 2, c: 38676}, {f: 5, c: 38679}, 38685,
-    {f: 8, c: 38687}, {f: 2, c: 38696}, {f: 2, c: 38699}, {f: 2, c: 38702},
-    38705, {f: 5, c: 38707}, {f: 3, c: 38714}, {f: 3, c: 38719}, 38723,
-    {f: 3, c: 38725}, {f: 8, c: 38729}, [12205, 38737], {f: 2, c: 38740},
-    {f: 2, c: 38743}, {f: 2, c: 38748}, 38751, {f: 2, c: 38755},
-    {f: 2, c: 38758}, {f: 9, c: 38762}, 38773, {f: 5, c: 38775},
-    {f: 8, c: 38781}, {f: 5, c: 38790}, 38796, 38798, 38800, 38803,
-    {f: 3, c: 38805}, {f: 7, c: 38809}, {f: 2, c: 38817}, {f: 2, c: 38820},
-    {f: 4, c: 38823}, 38828, 38830, {f: 2, c: 38832}, 38835, {f: 8, c: 38837},
-    {f: 5, c: 38846}, {f: 2, c: 38852}, {f: 2, c: 38855}, 38858,
-    {f: 6, c: 38861}, {f: 5, c: 38868}, {f: 2, c: 38874}, 38877,
-    {f: 7, c: 38879}, 38888, {f: 5, c: 38894}, 38900, {f: 8, c: 38903}, 38912,
-    38916, 38921, 38923, 38925, {f: 3, c: 38932}, {f: 3, c: 38937},
-    {f: 4, c: 38941}, {f: 2, c: 38946}, 38949, {f: 6, c: 38951},
-    {f: 2, c: 38958}, {f: 6, c: 38961}, {f: 2, c: 38969}, 38972,
-    {f: 8, c: 38974}, {f: 5, c: 38983}, {f: 4, c: 38991}, {f: 3, c: 38997},
-    39002, {f: 2, c: 39004}, {f: 3, c: 39007}, {f: 2, c: 39011}, 39014,
-    {f: 3, c: 39016}, {f: 2, c: 39021}, 39026, 39051, 39054, 39058, 39061,
-    39065, 39075, {f: 5, c: 39081}, 39088, 39090, {f: 2, c: 39092},
-    {f: 5, c: 39095}, {f: 7, c: 39101}, 39109, 39111, {f: 5, c: 39113},
-    {f: 2, c: 39119}, 39124, {f: 2, c: 39126}, {f: 2, c: 39132}, 39137,
-    {f: 4, c: 39139}, 39148, 39150, {f: 2, c: 39152}, 39155, {f: 7, c: 39157},
-    {f: 4, c: 39167}, 39172, {f: 3, c: 39174}, 39179, {f: 2, c: 39182},
-    {f: 4, c: 39188}, {f: 2, c: 39193}, {f: 2, c: 39196}, {f: 2, c: 39199},
-    {f: 6, c: 39202}, {f: 5, c: 39209}, {f: 4, c: 39215}, {f: 3, c: 39220},
-    {f: 4, c: 39224}, 39229, {f: 3, c: 39232}, 39236, {f: 2, c: 39238},
-    {f: 4, c: 39245}, 39251, 39254, {f: 4, c: 39256}, 39261, {f: 3, c: 39263},
-    39268, 39270, 39283, {f: 2, c: 39288}, 39291, 39294, {f: 2, c: 39298},
-    39305, 39308, 39310, {f: 11, c: 39322}, {f: 2, c: 39334}, {f: 3, c: 39337},
-    {f: 2, c: 39343}, 39346, {f: 12, c: 39349}, {f: 14, c: 39362}, 39379,
-    {f: 2, c: 39382}, 39386, 39388, 39390, 39392, {f: 10, c: 39395},
-    {f: 3, c: 39406}, {f: 13, c: 39410}, 39424, {f: 3, c: 39426},
-    {f: 7, c: 39430}, {f: 6, c: 39440}, {f: 2, c: 39447}, {f: 17, c: 39450},
-    39468, 39471, {f: 5, c: 39473}, {f: 5, c: 39481}, 39487, {f: 4, c: 39494},
-    {f: 2, c: 39499}, 39502, {f: 5, c: 39504}, 39510, {f: 2, c: 39512},
-    {f: 3, c: 39516}, {f: 2, c: 39520}, 39523, {f: 4, c: 39526}, 39531, 39538,
-    39555, 39561, {f: 2, c: 39565}, {f: 2, c: 39572}, 39577, 39590,
-    {f: 6, c: 39593}, {f: 4, c: 39602}, 39609, 39611, {f: 3, c: 39613},
-    {f: 2, c: 39619}, {f: 5, c: 39622}, {f: 2, c: 39629}, 39632, 39639,
-    {f: 6, c: 39641}, 39648, {f: 4, c: 39650}, {f: 4, c: 39655}, 39660,
-    {f: 9, c: 39664}, 39674, {f: 7, c: 39676}, {f: 2, c: 39684}, 39687,
-    {f: 4, c: 39689}, 39694, {f: 3, c: 39696}, {f: 6, c: 39700},
-    {f: 4, c: 39707}, {f: 2, c: 39712}, 39716, 39718, 39720, {f: 4, c: 39722},
-    39728, {f: 8, c: 39731}, {f: 4, c: 39741}, 39750, {f: 3, c: 39754}, 39760,
-    {f: 2, c: 39762}, {f: 3, c: 39765}, 39769, {f: 20, c: 39771},
-    {f: 4, c: 39792}, {f: 2, c: 39797}, {f: 9, c: 39800}, 39810,
-    {f: 10, c: 39812}, 39823, {f: 7, c: 39827}, {f: 2, c: 39835},
-    {f: 11, c: 39839}, 39852, {f: 17, c: 39855}, {f: 5, c: 39874}, 39880,
-    {f: 9, c: 39883}, 39893, {f: 4, c: 39895}, 39900, {f: 3, c: 39902}, 39907,
-    {f: 2, c: 39909}, 39913, {f: 4, c: 39916}, {f: 3, c: 39921},
-    {f: 8, c: 39925}, 39934, {f: 8, c: 39936}, {f: 3, c: 39946},
-    {f: 2, c: 39950}, 39953, {f: 12, c: 39956}, {f: 2, c: 39969}, 39972,
-    {f: 2, c: 39974}, {f: 3, c: 39978}, {f: 3, c: 39982}, 39988, 39990, 39992,
-    39994, {f: 2, c: 39996}, {f: 6, c: 39999}, {f: 2, c: 40006},
-    {f: 8, c: 40010}, 40019, 40021, {f: 4, c: 40025}, 40030, {f: 7, c: 40032},
-    {f: 5, c: 40040}, {f: 10, c: 40046}, 40057, 40059, {f: 2, c: 40061}, 40064,
-    {f: 2, c: 40067}, {f: 2, c: 40073}, 40076, 40079, 40083, {f: 4, c: 40086},
-    40093, 40106, 40108, 40111, 40121, {f: 5, c: 40126}, {f: 2, c: 40136},
-    {f: 2, c: 40145}, {f: 2, c: 40154}, {f: 2, c: 40160}, {f: 2, c: 40163},
-    {f: 3, c: 40166}, {f: 2, c: 40170}, {f: 6, c: 40173}, 40181,
-    {f: 15, c: 40183}, 40200, {f: 11, c: 40202}, {f: 5, c: 40214}, 40220,
-    40222, {f: 3, c: 40224}, {f: 2, c: 40228}, 40231, {f: 6, c: 40233},
-    {f: 10, c: 40241}, {f: 3, c: 40252}, {f: 2, c: 40256}, {f: 14, c: 40259},
-    {f: 8, c: 40276}, {f: 2, c: 40286}, {f: 8, c: 40290}, 40299,
-    {f: 2, c: 40301}, {f: 2, c: 40304}, {f: 20, c: 40307}, 40328,
-    {f: 9, c: 40330}, {f: 4, c: 40340}, 40345, {f: 10, c: 40347},
-    {f: 3, c: 40358}, {f: 5, c: 40362}, {f: 4, c: 40368}, {f: 6, c: 40373},
-    {f: 3, c: 40381}, 40385, 40387, {f: 14, c: 40389}, {f: 3, c: 40404}, 40408,
-    {f: 10, c: 40411}, {f: 8, c: 40423}, {f: 2, c: 40432}, {f: 4, c: 40436},
-    {f: 17, c: 40443}, {f: 8, c: 40461}, {f: 4, c: 40470}, 40476, 40484, 40487,
-    40494, 40496, 40500, {f: 2, c: 40507}, 40512, 40525, 40528,
-    {f: 3, c: 40530}, 40534, 40537, 40541, {f: 4, c: 40543}, 40549,
-    {f: 2, c: 40558}, 40562, 40564, {f: 3, c: 40566}, 40571, {f: 2, c: 40576},
-    {f: 4, c: 40579}, {f: 2, c: 40585}, {f: 6, c: 40588}, {f: 3, c: 40596},
-    {f: 5, c: 40600}, 40606, {f: 5, c: 40608}, {f: 2, c: 40615},
-    {f: 5, c: 40618}, {f: 4, c: 40624}, {f: 2, c: 40630}, {f: 2, c: 40633},
-    40636, {f: 4, c: 40639}, [12232, 40643], {f: 4, c: 40645},
-    {f: 2, c: 40650}, 40656, {f: 2, c: 40658}, {f: 3, c: 40661},
-    {f: 2, c: 40665}, 40673, {f: 2, c: 40675}, 40678, {f: 4, c: 40683},
-    {f: 2, c: 40688}, 40691, {f: 2, c: 40693}, 40696, 40698, {f: 9, c: 40704},
-    40714, 40716, 40719, {f: 2, c: 40721}, 40724, 40726, 40728,
-    {f: 6, c: 40730}, 40737, {f: 9, c: 40739}, {f: 2, c: 40749},
-    {f: 7, c: 40752}, 40760, 40762, 40764, {f: 5, c: 40767}, {f: 5, c: 40773},
-    {f: 3, c: 40780}, 40787, {f: 4, c: 40789}, {f: 2, c: 40794},
-    {f: 2, c: 40797}, 40802, {f: 2, c: 40804}, {f: 3, c: 40807}, 40811,
-    {f: 5, c: 40813}, {f: 4, c: 40819}, {f: 7, c: 40824}, {f: 2, c: 40833},
-    {f: 2, c: 40846}, {f: 3, c: 40849}, {f: 3, c: 40854}, {f: 2, c: 40861},
-    {f: 5, c: 40865}, 63788, {f: 3, c: 64013}, 64017, {f: 2, c: 64019}, 64024,
-    {f: 3, c: 64031}, {f: 2, c: 64035}, {f: 3, c: 64039}, 11905,
-    [59414, 131207], [59415, 131209], [59416, 131276], 11908, 13427, 13383,
-    11912, 11915, 59422, 13726, 13850, 13838, 11916, 11927, 14702, 14616,
-    59430, 14799, 14815, 14963, 14800, {f: 2, c: 59435}, 15182, 15470, 15584,
-    11943, [59441, 136663], 59442, 11946, 16470, 16735, 11950, 17207, 11955,
-    {f: 2, c: 11958}, [59451, 141711], 17329, 17324, 11963, 17373, 17622,
-    18017, 17996, [59459, 132361], 18211, 18217, 18300, 18317, 11978, 18759,
-    18810, 18813, {f: 2, c: 18818}, {f: 2, c: 18821}, 18847, 18843, 18871,
-    18870, [59476, 133533], [59477, 147966], 19619, {f: 3, c: 19615}, 19575,
-    19618, {f: 7, c: 19731}, 19886, 59492, {s: 226}, 8364, 165, 0, 0, 12351,
-    {s: 17}, 12436, {s: 14}, 12535, 12537, 12536, 12538, 0, {f: 3, c: 12339},
-    {f: 3, c: 12344}, {f: 3, c: 12586}, {f: 24, c: 12704}, 11904,
-    {f: 2, c: 11906}, {f: 3, c: 11909}, {f: 2, c: 11913}, {f: 10, c: 11917},
-    {f: 2, c: 11928}, {f: 12, c: 11931}, {f: 2, c: 11944}, {f: 3, c: 11947},
-    {f: 4, c: 11951}, {f: 2, c: 11956}, {f: 3, c: 11960}, {f: 14, c: 11964},
-    {f: 41, c: 11979}, {f: 71, c: 13312}, {f: 43, c: 13384},
-    {f: 298, c: 13428}, {f: 111, c: 13727}, {f: 11, c: 13839},
-    {f: 765, c: 13851}, {f: 85, c: 14617}, {f: 96, c: 14703},
-    {f: 14, c: 14801}, {f: 147, c: 14816}, {f: 218, c: 14964},
-    {f: 287, c: 15183}, {f: 113, c: 15471}, {f: 885, c: 15585},
-    {f: 264, c: 16471}, {f: 471, c: 16736}, {f: 116, c: 17208},
-    {f: 4, c: 17325}, {f: 43, c: 17330}, {f: 248, c: 17374},
-    {f: 373, c: 17623}, {f: 20, c: 17997}, {f: 193, c: 18018},
-    {f: 5, c: 18212}, {f: 82, c: 18218}, {f: 16, c: 18301}, {f: 441, c: 18318},
-    {f: 50, c: 18760}, {f: 2, c: 18811}, {f: 4, c: 18814}, 18820,
-    {f: 20, c: 18823}, {f: 3, c: 18844}, {f: 22, c: 18848}, {f: 703, c: 18872},
-    {f: 39, c: 19576}, {f: 111, c: 19620}, {f: 148, c: 19738},
-    {f: 7, c: 19887}]
-};
-
-
-/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
-
-'use strict';
-
-var ColorSpace = (function ColorSpaceClosure() {
-  // Constructor should define this.numComps, this.defaultColor, this.name
-  function ColorSpace() {
-    error('should not call ColorSpace constructor');
-  }
-
-  ColorSpace.prototype = {
-    // Input: array of size numComps representing color component values
-    // Output: array of rgb values, each value ranging from [0.1]
-    getRgb: function ColorSpace_getRgb(color) {
-      error('Should not call ColorSpace.getRgb: ' + color);
-    },
-    // Input: Uint8Array of component values, each value scaled to [0,255]
-    // Output: Uint8Array of rgb values, each value scaled to [0,255]
-    getRgbBuffer: function ColorSpace_getRgbBuffer(input) {
-      error('Should not call ColorSpace.getRgbBuffer: ' + input);
-    }
-  };
-
-  ColorSpace.parse = function ColorSpace_parse(cs, xref, res) {
-    var IR = ColorSpace.parseToIR(cs, xref, res);
-    if (IR instanceof AlternateCS)
-      return IR;
-
-    return ColorSpace.fromIR(IR);
-  };
-
-  ColorSpace.fromIR = function ColorSpace_fromIR(IR) {
-    var name = isArray(IR) ? IR[0] : IR;
-
-    switch (name) {
-      case 'DeviceGrayCS':
-        return new DeviceGrayCS();
-      case 'DeviceRgbCS':
-        return new DeviceRgbCS();
-      case 'DeviceCmykCS':
-        return new DeviceCmykCS();
-      case 'PatternCS':
-        var basePatternCS = IR[1];
-        if (basePatternCS)
-          basePatternCS = ColorSpace.fromIR(basePatternCS);
-        return new PatternCS(basePatternCS);
-      case 'IndexedCS':
-        var baseIndexedCS = IR[1];
-        var hiVal = IR[2];
-        var lookup = IR[3];
-        return new IndexedCS(ColorSpace.fromIR(baseIndexedCS), hiVal, lookup);
-      case 'AlternateCS':
-        var numComps = IR[1];
-        var alt = IR[2];
-        var tintFnIR = IR[3];
-
-        return new AlternateCS(numComps, ColorSpace.fromIR(alt),
-                                PDFFunction.fromIR(tintFnIR));
-      case 'LabCS':
-        var whitePoint = IR[1].WhitePoint;
-        var blackPoint = IR[1].BlackPoint;
-        var range = IR[1].Range;
-        return new LabCS(whitePoint, blackPoint, range);
-      default:
-        error('Unkown name ' + name);
-    }
-    return null;
-  };
-
-  ColorSpace.parseToIR = function ColorSpace_parseToIR(cs, xref, res) {
-    if (isName(cs)) {
-      var colorSpaces = res.get('ColorSpace');
-      if (isDict(colorSpaces)) {
-        var refcs = colorSpaces.get(cs.name);
-        if (refcs)
-          cs = refcs;
-      }
-    }
-
-    cs = xref.fetchIfRef(cs);
-    var mode;
-
-    if (isName(cs)) {
-      mode = cs.name;
-      this.mode = mode;
-
-      switch (mode) {
-        case 'DeviceGray':
-        case 'G':
-          return 'DeviceGrayCS';
-        case 'DeviceRGB':
-        case 'RGB':
-          return 'DeviceRgbCS';
-        case 'DeviceCMYK':
-        case 'CMYK':
-          return 'DeviceCmykCS';
-        case 'Pattern':
-          return ['PatternCS', null];
-        default:
-          error('unrecognized colorspace ' + mode);
-      }
-    } else if (isArray(cs)) {
-      mode = cs[0].name;
-      this.mode = mode;
-
-      switch (mode) {
-        case 'DeviceGray':
-        case 'G':
-          return 'DeviceGrayCS';
-        case 'DeviceRGB':
-        case 'RGB':
-          return 'DeviceRgbCS';
-        case 'DeviceCMYK':
-        case 'CMYK':
-          return 'DeviceCmykCS';
-        case 'CalGray':
-          return 'DeviceGrayCS';
-        case 'CalRGB':
-          return 'DeviceRgbCS';
-        case 'ICCBased':
-          var stream = xref.fetchIfRef(cs[1]);
-          var dict = stream.dict;
-          var numComps = dict.get('N');
-          if (numComps == 1)
-            return 'DeviceGrayCS';
-          if (numComps == 3)
-            return 'DeviceRgbCS';
-          if (numComps == 4)
-            return 'DeviceCmykCS';
-          break;
-        case 'Pattern':
-          var basePatternCS = cs[1];
-          if (basePatternCS)
-            basePatternCS = ColorSpace.parseToIR(basePatternCS, xref, res);
-          return ['PatternCS', basePatternCS];
-        case 'Indexed':
-        case 'I':
-          var baseIndexedCS = ColorSpace.parseToIR(cs[1], xref, res);
-          var hiVal = cs[2] + 1;
-          var lookup = xref.fetchIfRef(cs[3]);
-          return ['IndexedCS', baseIndexedCS, hiVal, lookup];
-        case 'Separation':
-        case 'DeviceN':
-          var name = cs[1];
-          var numComps = 1;
-          if (isName(name))
-            numComps = 1;
-          else if (isArray(name))
-            numComps = name.length;
-          var alt = ColorSpace.parseToIR(cs[2], xref, res);
-          var tintFnIR = PDFFunction.getIR(xref, xref.fetchIfRef(cs[3]));
-          return ['AlternateCS', numComps, alt, tintFnIR];
-        case 'Lab':
-          var params = cs[1].getAll();
-          return ['LabCS', params];
-        default:
-          error('unimplemented color space object "' + mode + '"');
-      }
-    } else {
-      error('unrecognized color space object: "' + cs + '"');
-    }
-    return null;
-  };
-  /**
-   * Checks if a decode map matches the default decode map for a color space.
-   * This handles the general decode maps where there are two values per
-   * component. e.g. [0, 1, 0, 1, 0, 1] for a RGB color.
-   * This does not handle Lab, Indexed, or Pattern decode maps since they are
-   * slightly different.
-   * @param {Array} decode Decode map (usually from an image).
-   * @param {Number} n Number of components the color space has.
-   */
-  ColorSpace.isDefaultDecode = function ColorSpace_isDefaultDecode(decode, n) {
-    if (!decode)
-      return true;
-
-    if (n * 2 !== decode.length) {
-      warning('The decode map is not the correct length');
-      return true;
-    }
-    for (var i = 0, ii = decode.length; i < ii; i += 2) {
-      if (decode[i] != 0 || decode[i + 1] != 1)
-        return false;
-    }
-    return true;
-  };
-
-  return ColorSpace;
-})();
-
-/**
- * Alternate color space handles both Separation and DeviceN color spaces.  A
- * Separation color space is actually just a DeviceN with one color component.
- * Both color spaces use a tinting function to convert colors to a base color
- * space.
- */
-var AlternateCS = (function AlternateCSClosure() {
-  function AlternateCS(numComps, base, tintFn) {
-    this.name = 'Alternate';
-    this.numComps = numComps;
-    this.defaultColor = [];
-    for (var i = 0; i < numComps; ++i)
-      this.defaultColor.push(1);
-    this.base = base;
-    this.tintFn = tintFn;
-  }
-
-  AlternateCS.prototype = {
-    getRgb: function AlternateCS_getRgb(color) {
-      var tinted = this.tintFn(color);
-      return this.base.getRgb(tinted);
-    },
-    getRgbBuffer: function AlternateCS_getRgbBuffer(input, bits) {
-      var tintFn = this.tintFn;
-      var base = this.base;
-      var scale = 1 / ((1 << bits) - 1);
-      var length = input.length;
-      var pos = 0;
-      var baseNumComps = base.numComps;
-      var baseBuf = new Uint8Array(baseNumComps * length);
-      var numComps = this.numComps;
-      var scaled = [];
-
-      for (var i = 0; i < length; i += numComps) {
-        for (var z = 0; z < numComps; ++z)
-          scaled[z] = input[i + z] * scale;
-
-        var tinted = tintFn(scaled);
-        for (var j = 0; j < baseNumComps; ++j)
-          baseBuf[pos++] = 255 * tinted[j];
-      }
-      return base.getRgbBuffer(baseBuf, 8);
-    },
-    isDefaultDecode: function AlternateCS_isDefaultDecode(decodeMap) {
-      return ColorSpace.isDefaultDecode(decodeMap, this.numComps);
-    }
-  };
-
-  return AlternateCS;
-})();
-
-var PatternCS = (function PatternCSClosure() {
-  function PatternCS(baseCS) {
-    this.name = 'Pattern';
-    this.base = baseCS;
-  }
-  PatternCS.prototype = {};
-
-  return PatternCS;
-})();
-
-var IndexedCS = (function IndexedCSClosure() {
-  function IndexedCS(base, highVal, lookup) {
-    this.name = 'Indexed';
-    this.numComps = 1;
-    this.defaultColor = [0];
-    this.base = base;
-    this.highVal = highVal;
-
-    var baseNumComps = base.numComps;
-    var length = baseNumComps * highVal;
-    var lookupArray = new Uint8Array(length);
-
-    if (isStream(lookup)) {
-      var bytes = lookup.getBytes(length);
-      lookupArray.set(bytes);
-    } else if (isString(lookup)) {
-      for (var i = 0; i < length; ++i)
-        lookupArray[i] = lookup.charCodeAt(i);
-    } else {
-      error('Unrecognized lookup table: ' + lookup);
-    }
-    this.lookup = lookupArray;
-  }
-
-  IndexedCS.prototype = {
-    getRgb: function IndexedCS_getRgb(color) {
-      var numComps = this.base.numComps;
-      var start = color[0] * numComps;
-      var c = [];
-
-      for (var i = start, ii = start + numComps; i < ii; ++i)
-        c.push(this.lookup[i]);
-
-      return this.base.getRgb(c);
-    },
-    getRgbBuffer: function IndexedCS_getRgbBuffer(input) {
-      var base = this.base;
-      var numComps = base.numComps;
-      var lookup = this.lookup;
-      var length = input.length;
-      var baseBuf = new Uint8Array(length * numComps);
-      var baseBufPos = 0;
-
-      for (var i = 0; i < length; ++i) {
-        var lookupPos = input[i] * numComps;
-        for (var j = 0; j < numComps; ++j) {
-          baseBuf[baseBufPos++] = lookup[lookupPos + j];
-        }
-      }
-
-      return base.getRgbBuffer(baseBuf, 8);
-    },
-    isDefaultDecode: function IndexedCS_isDefaultDecode(decodeMap) {
-      // indexed color maps shouldn't be changed
-      return true;
-    }
-  };
-  return IndexedCS;
-})();
-
-var DeviceGrayCS = (function DeviceGrayCSClosure() {
-  function DeviceGrayCS() {
-    this.name = 'DeviceGray';
-    this.numComps = 1;
-    this.defaultColor = [0];
-  }
-
-  DeviceGrayCS.prototype = {
-    getRgb: function DeviceGrayCS_getRgb(color) {
-      var c = color[0];
-      return [c, c, c];
-    },
-    getRgbBuffer: function DeviceGrayCS_getRgbBuffer(input, bits) {
-      var scale = 255 / ((1 << bits) - 1);
-      var length = input.length;
-      var rgbBuf = new Uint8Array(length * 3);
-      for (var i = 0, j = 0; i < length; ++i) {
-        var c = (scale * input[i]) | 0;
-        rgbBuf[j++] = c;
-        rgbBuf[j++] = c;
-        rgbBuf[j++] = c;
-      }
-      return rgbBuf;
-    },
-    isDefaultDecode: function DeviceGrayCS_isDefaultDecode(decodeMap) {
-      return ColorSpace.isDefaultDecode(decodeMap, this.numComps);
-    }
-  };
-  return DeviceGrayCS;
-})();
-
-var DeviceRgbCS = (function DeviceRgbCSClosure() {
-  function DeviceRgbCS() {
-    this.name = 'DeviceRGB';
-    this.numComps = 3;
-    this.defaultColor = [0, 0, 0];
-  }
-  DeviceRgbCS.prototype = {
-    getRgb: function DeviceRgbCS_getRgb(color) {
-      return color;
-    },
-    getRgbBuffer: function DeviceRgbCS_getRgbBuffer(input, bits) {
-      if (bits == 8)
-        return input;
-      var scale = 255 / ((1 << bits) - 1);
-      var i, length = input.length;
-      var rgbBuf = new Uint8Array(length);
-      for (i = 0; i < length; ++i)
-        rgbBuf[i] = (scale * input[i]) | 0;
-      return rgbBuf;
-    },
-    isDefaultDecode: function DeviceRgbCS_isDefaultDecode(decodeMap) {
-      return ColorSpace.isDefaultDecode(decodeMap, this.numComps);
-    }
-  };
-  return DeviceRgbCS;
-})();
-
-var DeviceCmykCS = (function DeviceCmykCSClosure() {
-  function DeviceCmykCS() {
-    this.name = 'DeviceCMYK';
-    this.numComps = 4;
-    this.defaultColor = [0, 0, 0, 1];
-  }
-  DeviceCmykCS.prototype = {
-    getRgb: function DeviceCmykCS_getRgb(color) {
-      var c = color[0], m = color[1], y = color[2], k = color[3];
-
-      // CMYK -> CMY: http://www.easyrgb.com/index.php?X=MATH&H=14#text14
-      c = (c * (1 - k) + k);
-      m = (m * (1 - k) + k);
-      y = (y * (1 - k) + k);
-
-      // CMY -> RGB: http://www.easyrgb.com/index.php?X=MATH&H=12#text12
-      var r = (1 - c);
-      var g = (1 - m);
-      var b = (1 - y);
-
-      return [r, g, b];
-    },
-    getRgbBuffer: function DeviceCmykCS_getRgbBuffer(colorBuf, bits) {
-      var scale = 1 / ((1 << bits) - 1);
-      var length = colorBuf.length / 4;
-      var rgbBuf = new Uint8Array(length * 3);
-      var rgbBufPos = 0;
-      var colorBufPos = 0;
-
-      for (var i = 0; i < length; i++) {
-        var cmyk = [];
-        for (var j = 0; j < 4; ++j)
-          cmyk.push(scale * colorBuf[colorBufPos++]);
-
-        var rgb = this.getRgb(cmyk);
-        for (var j = 0; j < 3; ++j)
-          rgbBuf[rgbBufPos++] = Math.round(rgb[j] * 255);
-      }
-
-      return rgbBuf;
-    },
-    isDefaultDecode: function DeviceCmykCS_isDefaultDecode(decodeMap) {
-      return ColorSpace.isDefaultDecode(decodeMap, this.numComps);
-    }
-  };
-
-  return DeviceCmykCS;
-})();
-
-//
-// LabCS: Based on "PDF Reference, Sixth Ed", p.250
-//
-var LabCS = (function LabCSClosure() {
-  function LabCS(whitePoint, blackPoint, range) {
-    this.name = 'Lab';
-    this.numComps = 3;
-    this.defaultColor = [0, 0, 0];
-
-    if (!whitePoint)
-      error('WhitePoint missing - required for color space Lab');
-    blackPoint = blackPoint || [0, 0, 0];
-    range = range || [-100, 100, -100, 100];
-
-    // Translate args to spec variables
-    this.XW = whitePoint[0];
-    this.YW = whitePoint[1];
-    this.ZW = whitePoint[2];
-    this.amin = range[0];
-    this.amax = range[1];
-    this.bmin = range[2];
-    this.bmax = range[3];
-
-    // These are here just for completeness - the spec doesn't offer any
-    // formulas that use BlackPoint in Lab
-    this.XB = blackPoint[0];
-    this.YB = blackPoint[1];
-    this.ZB = blackPoint[2];
-
-    // Validate vars as per spec
-    if (this.XW < 0 || this.ZW < 0 || this.YW !== 1)
-      error('Invalid WhitePoint components, no fallback available');
-
-    if (this.XB < 0 || this.YB < 0 || this.ZB < 0) {
-      info('Invalid BlackPoint, falling back to default');
-      this.XB = this.YB = this.ZB = 0;
-    }
-
-    if (this.amin > this.amax || this.bmin > this.bmax) {
-      info('Invalid Range, falling back to defaults');
-      this.amin = -100;
-      this.amax = 100;
-      this.bmin = -100;
-      this.bmax = 100;
-    }
-  };
-
-  // Function g(x) from spec
-  function g(x) {
-    if (x >= 6 / 29)
-      return x * x * x;
-    else
-      return (108 / 841) * (x - 4 / 29);
-  }
-
-  LabCS.prototype = {
-    getRgb: function LabCS_getRgb(color) {
-      // Ls,as,bs <---> L*,a*,b* in the spec
-      var Ls = color[0], as = color[1], bs = color[2];
-
-      // Adjust limits of 'as' and 'bs'
-      as = as > this.amax ? this.amax : as;
-      as = as < this.amin ? this.amin : as;
-      bs = bs > this.bmax ? this.bmax : bs;
-      bs = bs < this.bmin ? this.bmin : bs;
-
-      // Computes intermediate variables X,Y,Z as per spec
-      var M = (Ls + 16) / 116;
-      var L = M + (as / 500);
-      var N = M - (bs / 200);
-      var X = this.XW * g(L);
-      var Y = this.YW * g(M);
-      var Z = this.ZW * g(N);
-
-      // XYZ to RGB 3x3 matrix, from:
-      // http://www.poynton.com/notes/colour_and_gamma/ColorFAQ.html#RTFToC18
-      var XYZtoRGB = [3.240479, -1.537150, -0.498535,
-                      -0.969256, 1.875992, 0.041556,
-                      0.055648, -0.204043, 1.057311];
-
-      return Util.apply3dTransform(XYZtoRGB, [X, Y, Z]);
-    },
-    getRgbBuffer: function LabCS_getRgbBuffer(input, bits) {
-      if (bits == 8)
-        return input;
-      var scale = 255 / ((1 << bits) - 1);
-      var i, length = input.length / 3;
-      var rgbBuf = new Uint8Array(length);
-
-      var j = 0;
-      for (i = 0; i < length; ++i) {
-        // Convert L*, a*, s* into RGB
-        var rgb = this.getRgb([input[i], input[i + 1], input[i + 2]]);
-        rgbBuf[j++] = rgb[0];
-        rgbBuf[j++] = rgb[1];
-        rgbBuf[j++] = rgb[2];
-      }
-
-      return rgbBuf;
-    },
-    isDefaultDecode: function LabCS_isDefaultDecode(decodeMap) {
-      // From Table 90 in Adobe's:
-      // "Document management - Portable document format", 1st ed, 2008
-      if (decodeMap[0] === 0 && decodeMap[1] === 100 &&
-          decodeMap[2] === this.amin && decodeMap[3] === this.amax &&
-          decodeMap[4] === this.bmin && decodeMap[5] === this.bmax)
-        return true;
-      else
-        return false;
-    }
-  };
-  return LabCS;
-})();
-
-/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
-
-'use strict';
-
-var ARCFourCipher = (function ARCFourCipherClosure() {
-  function ARCFourCipher(key) {
-    this.a = 0;
-    this.b = 0;
-    var s = new Uint8Array(256);
-    var i, j = 0, tmp, keyLength = key.length;
-    for (i = 0; i < 256; ++i)
-      s[i] = i;
-    for (i = 0; i < 256; ++i) {
-      tmp = s[i];
-      j = (j + tmp + key[i % keyLength]) & 0xFF;
-      s[i] = s[j];
-      s[j] = tmp;
-    }
-    this.s = s;
-  }
-
-  ARCFourCipher.prototype = {
-    encryptBlock: function ARCFourCipher_encryptBlock(data) {
-      var i, n = data.length, tmp, tmp2;
-      var a = this.a, b = this.b, s = this.s;
-      var output = new Uint8Array(n);
-      for (i = 0; i < n; ++i) {
-        a = (a + 1) & 0xFF;
-        tmp = s[a];
-        b = (b + tmp) & 0xFF;
-        tmp2 = s[b];
-        s[a] = tmp2;
-        s[b] = tmp;
-        output[i] = data[i] ^ s[(tmp + tmp2) & 0xFF];
-      }
-      this.a = a;
-      this.b = b;
-      return output;
-    }
-  };
-  ARCFourCipher.prototype.decryptBlock = ARCFourCipher.prototype.encryptBlock;
-
-  return ARCFourCipher;
-})();
-
-var calculateMD5 = (function calculateMD5Closure() {
-  var r = new Uint8Array([
-    7, 12, 17, 22, 7, 12, 17, 22, 7, 12, 17, 22, 7, 12, 17, 22,
-    5, 9, 14, 20, 5, 9, 14, 20, 5, 9, 14, 20, 5, 9, 14, 20,
-    4, 11, 16, 23, 4, 11, 16, 23, 4, 11, 16, 23, 4, 11, 16, 23,
-    6, 10, 15, 21, 6, 10, 15, 21, 6, 10, 15, 21, 6, 10, 15, 21]);
-
-  var k = new Int32Array([
-    -680876936, -389564586, 606105819, -1044525330, -176418897, 1200080426,
-    -1473231341, -45705983, 1770035416, -1958414417, -42063, -1990404162,
-    1804603682, -40341101, -1502002290, 1236535329, -165796510, -1069501632,
-    643717713, -373897302, -701558691, 38016083, -660478335, -405537848,
-    568446438, -1019803690, -187363961, 1163531501, -1444681467, -51403784,
-    1735328473, -1926607734, -378558, -2022574463, 1839030562, -35309556,
-    -1530992060, 1272893353, -155497632, -1094730640, 681279174, -358537222,
-    -722521979, 76029189, -640364487, -421815835, 530742520, -995338651,
-    -198630844, 1126891415, -1416354905, -57434055, 1700485571, -1894986606,
-    -1051523, -2054922799, 1873313359, -30611744, -1560198380, 1309151649,
-    -145523070, -1120210379, 718787259, -343485551]);
-
-  function hash(data, offset, length) {
-    var h0 = 1732584193, h1 = -271733879, h2 = -1732584194, h3 = 271733878;
-    // pre-processing
-    var paddedLength = (length + 72) & ~63; // data + 9 extra bytes
-    var padded = new Uint8Array(paddedLength);
-    var i, j, n;
-    for (i = 0; i < length; ++i)
-      padded[i] = data[offset++];
-    padded[i++] = 0x80;
-    n = paddedLength - 8;
-    while (i < n)
-      padded[i++] = 0;
-    padded[i++] = (length << 3) & 0xFF;
-    padded[i++] = (length >> 5) & 0xFF;
-    padded[i++] = (length >> 13) & 0xFF;
-    padded[i++] = (length >> 21) & 0xFF;
-    padded[i++] = (length >>> 29) & 0xFF;
-    padded[i++] = 0;
-    padded[i++] = 0;
-    padded[i++] = 0;
-    // chunking
-    // TODO ArrayBuffer ?
-    var w = new Int32Array(16);
-    for (i = 0; i < paddedLength;) {
-      for (j = 0; j < 16; ++j, i += 4) {
-        w[j] = (padded[i] | (padded[i + 1] << 8) |
-                (padded[i + 2] << 16) | (padded[i + 3] << 24));
-      }
-      var a = h0, b = h1, c = h2, d = h3, f, g;
-      for (j = 0; j < 64; ++j) {
-        if (j < 16) {
-          f = (b & c) | ((~b) & d);
-          g = j;
-        } else if (j < 32) {
-          f = (d & b) | ((~d) & c);
-          g = (5 * j + 1) & 15;
-        } else if (j < 48) {
-          f = b ^ c ^ d;
-          g = (3 * j + 5) & 15;
-        } else {
-          f = c ^ (b | (~d));
-          g = (7 * j) & 15;
-        }
-        var tmp = d, rotateArg = (a + f + k[j] + w[g]) | 0, rotate = r[j];
-        d = c;
-        c = b;
-        b = (b + ((rotateArg << rotate) | (rotateArg >>> (32 - rotate)))) | 0;
-        a = tmp;
-      }
-      h0 = (h0 + a) | 0;
-      h1 = (h1 + b) | 0;
-      h2 = (h2 + c) | 0;
-      h3 = (h3 + d) | 0;
-    }
-    return new Uint8Array([
-        h0 & 0xFF, (h0 >> 8) & 0xFF, (h0 >> 16) & 0xFF, (h0 >>> 24) & 0xFF,
-        h1 & 0xFF, (h1 >> 8) & 0xFF, (h1 >> 16) & 0xFF, (h1 >>> 24) & 0xFF,
-        h2 & 0xFF, (h2 >> 8) & 0xFF, (h2 >> 16) & 0xFF, (h2 >>> 24) & 0xFF,
-        h3 & 0xFF, (h3 >> 8) & 0xFF, (h3 >> 16) & 0xFF, (h3 >>> 24) & 0xFF
-    ]);
-  }
-  return hash;
-})();
-
-var NullCipher = (function NullCipherClosure() {
-  function NullCipher() {
-  }
-
-  NullCipher.prototype = {
-    decryptBlock: function NullCipher_decryptBlock(data) {
-      return data;
-    }
-  };
-
-  return NullCipher;
-})();
-
-var AES128Cipher = (function AES128CipherClosure() {
-  var rcon = new Uint8Array([
-    0x8d, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36, 0x6c,
-    0xd8, 0xab, 0x4d, 0x9a, 0x2f, 0x5e, 0xbc, 0x63, 0xc6, 0x97, 0x35, 0x6a,
-    0xd4, 0xb3, 0x7d, 0xfa, 0xef, 0xc5, 0x91, 0x39, 0x72, 0xe4, 0xd3, 0xbd,
-    0x61, 0xc2, 0x9f, 0x25, 0x4a, 0x94, 0x33, 0x66, 0xcc, 0x83, 0x1d, 0x3a,
-    0x74, 0xe8, 0xcb, 0x8d, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80,
-    0x1b, 0x36, 0x6c, 0xd8, 0xab, 0x4d, 0x9a, 0x2f, 0x5e, 0xbc, 0x63, 0xc6,
-    0x97, 0x35, 0x6a, 0xd4, 0xb3, 0x7d, 0xfa, 0xef, 0xc5, 0x91, 0x39, 0x72,
-    0xe4, 0xd3, 0xbd, 0x61, 0xc2, 0x9f, 0x25, 0x4a, 0x94, 0x33, 0x66, 0xcc,
-    0x83, 0x1d, 0x3a, 0x74, 0xe8, 0xcb, 0x8d, 0x01, 0x02, 0x04, 0x08, 0x10,
-    0x20, 0x40, 0x80, 0x1b, 0x36, 0x6c, 0xd8, 0xab, 0x4d, 0x9a, 0x2f, 0x5e,
-    0xbc, 0x63, 0xc6, 0x97, 0x35, 0x6a, 0xd4, 0xb3, 0x7d, 0xfa, 0xef, 0xc5,
-    0x91, 0x39, 0x72, 0xe4, 0xd3, 0xbd, 0x61, 0xc2, 0x9f, 0x25, 0x4a, 0x94,
-    0x33, 0x66, 0xcc, 0x83, 0x1d, 0x3a, 0x74, 0xe8, 0xcb, 0x8d, 0x01, 0x02,
-    0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36, 0x6c, 0xd8, 0xab, 0x4d,
-    0x9a, 0x2f, 0x5e, 0xbc, 0x63, 0xc6, 0x97, 0x35, 0x6a, 0xd4, 0xb3, 0x7d,
-    0xfa, 0xef, 0xc5, 0x91, 0x39, 0x72, 0xe4, 0xd3, 0xbd, 0x61, 0xc2, 0x9f,
-    0x25, 0x4a, 0x94, 0x33, 0x66, 0xcc, 0x83, 0x1d, 0x3a, 0x74, 0xe8, 0xcb,
-    0x8d, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36, 0x6c,
-    0xd8, 0xab, 0x4d, 0x9a, 0x2f, 0x5e, 0xbc, 0x63, 0xc6, 0x97, 0x35, 0x6a,
-    0xd4, 0xb3, 0x7d, 0xfa, 0xef, 0xc5, 0x91, 0x39, 0x72, 0xe4, 0xd3, 0xbd,
-    0x61, 0xc2, 0x9f, 0x25, 0x4a, 0x94, 0x33, 0x66, 0xcc, 0x83, 0x1d, 0x3a,
-    0x74, 0xe8, 0xcb, 0x8d]);
-
-  var s = new Uint8Array([
-    0x63, 0x7c, 0x77, 0x7b, 0xf2, 0x6b, 0x6f, 0xc5, 0x30, 0x01, 0x67, 0x2b,
-    0xfe, 0xd7, 0xab, 0x76, 0xca, 0x82, 0xc9, 0x7d, 0xfa, 0x59, 0x47, 0xf0,
-    0xad, 0xd4, 0xa2, 0xaf, 0x9c, 0xa4, 0x72, 0xc0, 0xb7, 0xfd, 0x93, 0x26,
-    0x36, 0x3f, 0xf7, 0xcc, 0x34, 0xa5, 0xe5, 0xf1, 0x71, 0xd8, 0x31, 0x15,
-    0x04, 0xc7, 0x23, 0xc3, 0x18, 0x96, 0x05, 0x9a, 0x07, 0x12, 0x80, 0xe2,
-    0xeb, 0x27, 0xb2, 0x75, 0x09, 0x83, 0x2c, 0x1a, 0x1b, 0x6e, 0x5a, 0xa0,
-    0x52, 0x3b, 0xd6, 0xb3, 0x29, 0xe3, 0x2f, 0x84, 0x53, 0xd1, 0x00, 0xed,
-    0x20, 0xfc, 0xb1, 0x5b, 0x6a, 0xcb, 0xbe, 0x39, 0x4a, 0x4c, 0x58, 0xcf,
-    0xd0, 0xef, 0xaa, 0xfb, 0x43, 0x4d, 0x33, 0x85, 0x45, 0xf9, 0x02, 0x7f,
-    0x50, 0x3c, 0x9f, 0xa8, 0x51, 0xa3, 0x40, 0x8f, 0x92, 0x9d, 0x38, 0xf5,
-    0xbc, 0xb6, 0xda, 0x21, 0x10, 0xff, 0xf3, 0xd2, 0xcd, 0x0c, 0x13, 0xec,
-    0x5f, 0x97, 0x44, 0x17, 0xc4, 0xa7, 0x7e, 0x3d, 0x64, 0x5d, 0x19, 0x73,
-    0x60, 0x81, 0x4f, 0xdc, 0x22, 0x2a, 0x90, 0x88, 0x46, 0xee, 0xb8, 0x14,
-    0xde, 0x5e, 0x0b, 0xdb, 0xe0, 0x32, 0x3a, 0x0a, 0x49, 0x06, 0x24, 0x5c,
-    0xc2, 0xd3, 0xac, 0x62, 0x91, 0x95, 0xe4, 0x79, 0xe7, 0xc8, 0x37, 0x6d,
-    0x8d, 0xd5, 0x4e, 0xa9, 0x6c, 0x56, 0xf4, 0xea, 0x65, 0x7a, 0xae, 0x08,
-    0xba, 0x78, 0x25, 0x2e, 0x1c, 0xa6, 0xb4, 0xc6, 0xe8, 0xdd, 0x74, 0x1f,
-    0x4b, 0xbd, 0x8b, 0x8a, 0x70, 0x3e, 0xb5, 0x66, 0x48, 0x03, 0xf6, 0x0e,
-    0x61, 0x35, 0x57, 0xb9, 0x86, 0xc1, 0x1d, 0x9e, 0xe1, 0xf8, 0x98, 0x11,
-    0x69, 0xd9, 0x8e, 0x94, 0x9b, 0x1e, 0x87, 0xe9, 0xce, 0x55, 0x28, 0xdf,
-    0x8c, 0xa1, 0x89, 0x0d, 0xbf, 0xe6, 0x42, 0x68, 0x41, 0x99, 0x2d, 0x0f,
-    0xb0, 0x54, 0xbb, 0x16]);
-
-  var inv_s = new Uint8Array([
-    0x52, 0x09, 0x6a, 0xd5, 0x30, 0x36, 0xa5, 0x38, 0xbf, 0x40, 0xa3, 0x9e,
-    0x81, 0xf3, 0xd7, 0xfb, 0x7c, 0xe3, 0x39, 0x82, 0x9b, 0x2f, 0xff, 0x87,
-    0x34, 0x8e, 0x43, 0x44, 0xc4, 0xde, 0xe9, 0xcb, 0x54, 0x7b, 0x94, 0x32,
-    0xa6, 0xc2, 0x23, 0x3d, 0xee, 0x4c, 0x95, 0x0b, 0x42, 0xfa, 0xc3, 0x4e,
-    0x08, 0x2e, 0xa1, 0x66, 0x28, 0xd9, 0x24, 0xb2, 0x76, 0x5b, 0xa2, 0x49,
-    0x6d, 0x8b, 0xd1, 0x25, 0x72, 0xf8, 0xf6, 0x64, 0x86, 0x68, 0x98, 0x16,
-    0xd4, 0xa4, 0x5c, 0xcc, 0x5d, 0x65, 0xb6, 0x92, 0x6c, 0x70, 0x48, 0x50,
-    0xfd, 0xed, 0xb9, 0xda, 0x5e, 0x15, 0x46, 0x57, 0xa7, 0x8d, 0x9d, 0x84,
-    0x90, 0xd8, 0xab, 0x00, 0x8c, 0xbc, 0xd3, 0x0a, 0xf7, 0xe4, 0x58, 0x05,
-    0xb8, 0xb3, 0x45, 0x06, 0xd0, 0x2c, 0x1e, 0x8f, 0xca, 0x3f, 0x0f, 0x02,
-    0xc1, 0xaf, 0xbd, 0x03, 0x01, 0x13, 0x8a, 0x6b, 0x3a, 0x91, 0x11, 0x41,
-    0x4f, 0x67, 0xdc, 0xea, 0x97, 0xf2, 0xcf, 0xce, 0xf0, 0xb4, 0xe6, 0x73,
-    0x96, 0xac, 0x74, 0x22, 0xe7, 0xad, 0x35, 0x85, 0xe2, 0xf9, 0x37, 0xe8,
-    0x1c, 0x75, 0xdf, 0x6e, 0x47, 0xf1, 0x1a, 0x71, 0x1d, 0x29, 0xc5, 0x89,
-    0x6f, 0xb7, 0x62, 0x0e, 0xaa, 0x18, 0xbe, 0x1b, 0xfc, 0x56, 0x3e, 0x4b,
-    0xc6, 0xd2, 0x79, 0x20, 0x9a, 0xdb, 0xc0, 0xfe, 0x78, 0xcd, 0x5a, 0xf4,
-    0x1f, 0xdd, 0xa8, 0x33, 0x88, 0x07, 0xc7, 0x31, 0xb1, 0x12, 0x10, 0x59,
-    0x27, 0x80, 0xec, 0x5f, 0x60, 0x51, 0x7f, 0xa9, 0x19, 0xb5, 0x4a, 0x0d,
-    0x2d, 0xe5, 0x7a, 0x9f, 0x93, 0xc9, 0x9c, 0xef, 0xa0, 0xe0, 0x3b, 0x4d,
-    0xae, 0x2a, 0xf5, 0xb0, 0xc8, 0xeb, 0xbb, 0x3c, 0x83, 0x53, 0x99, 0x61,
-    0x17, 0x2b, 0x04, 0x7e, 0xba, 0x77, 0xd6, 0x26, 0xe1, 0x69, 0x14, 0x63,
-    0x55, 0x21, 0x0c, 0x7d]);
-
-  var mix = new Uint32Array([
-    0x00000000, 0x0e090d0b, 0x1c121a16, 0x121b171d, 0x3824342c, 0x362d3927,
-    0x24362e3a, 0x2a3f2331, 0x70486858, 0x7e416553, 0x6c5a724e, 0x62537f45,
-    0x486c5c74, 0x4665517f, 0x547e4662, 0x5a774b69, 0xe090d0b0, 0xee99ddbb,
-    0xfc82caa6, 0xf28bc7ad, 0xd8b4e49c, 0xd6bde997, 0xc4a6fe8a, 0xcaaff381,
-    0x90d8b8e8, 0x9ed1b5e3, 0x8ccaa2fe, 0x82c3aff5, 0xa8fc8cc4, 0xa6f581cf,
-    0xb4ee96d2, 0xbae79bd9, 0xdb3bbb7b, 0xd532b670, 0xc729a16d, 0xc920ac66,
-    0xe31f8f57, 0xed16825c, 0xff0d9541, 0xf104984a, 0xab73d323, 0xa57ade28,
-    0xb761c935, 0xb968c43e, 0x9357e70f, 0x9d5eea04, 0x8f45fd19, 0x814cf012,
-    0x3bab6bcb, 0x35a266c0, 0x27b971dd, 0x29b07cd6, 0x038f5fe7, 0x0d8652ec,
-    0x1f9d45f1, 0x119448fa, 0x4be30393, 0x45ea0e98, 0x57f11985, 0x59f8148e,
-    0x73c737bf, 0x7dce3ab4, 0x6fd52da9, 0x61dc20a2, 0xad766df6, 0xa37f60fd,
-    0xb16477e0, 0xbf6d7aeb, 0x955259da, 0x9b5b54d1, 0x894043cc, 0x87494ec7,
-    0xdd3e05ae, 0xd33708a5, 0xc12c1fb8, 0xcf2512b3, 0xe51a3182, 0xeb133c89,
-    0xf9082b94, 0xf701269f, 0x4de6bd46, 0x43efb04d, 0x51f4a750, 0x5ffdaa5b,
-    0x75c2896a, 0x7bcb8461, 0x69d0937c, 0x67d99e77, 0x3daed51e, 0x33a7d815,
-    0x21bccf08, 0x2fb5c203, 0x058ae132, 0x0b83ec39, 0x1998fb24, 0x1791f62f,
-    0x764dd68d, 0x7844db86, 0x6a5fcc9b, 0x6456c190, 0x4e69e2a1, 0x4060efaa,
-    0x527bf8b7, 0x5c72f5bc, 0x0605bed5, 0x080cb3de, 0x1a17a4c3, 0x141ea9c8,
-    0x3e218af9, 0x302887f2, 0x223390ef, 0x2c3a9de4, 0x96dd063d, 0x98d40b36,
-    0x8acf1c2b, 0x84c61120, 0xaef93211, 0xa0f03f1a, 0xb2eb2807, 0xbce2250c,
-    0xe6956e65, 0xe89c636e, 0xfa877473, 0xf48e7978, 0xdeb15a49, 0xd0b85742,
-    0xc2a3405f, 0xccaa4d54, 0x41ecdaf7, 0x4fe5d7fc, 0x5dfec0e1, 0x53f7cdea,
-    0x79c8eedb, 0x77c1e3d0, 0x65daf4cd, 0x6bd3f9c6, 0x31a4b2af, 0x3fadbfa4,
-    0x2db6a8b9, 0x23bfa5b2, 0x09808683, 0x07898b88, 0x15929c95, 0x1b9b919e,
-    0xa17c0a47, 0xaf75074c, 0xbd6e1051, 0xb3671d5a, 0x99583e6b, 0x97513360,
-    0x854a247d, 0x8b432976, 0xd134621f, 0xdf3d6f14, 0xcd267809, 0xc32f7502,
-    0xe9105633, 0xe7195b38, 0xf5024c25, 0xfb0b412e, 0x9ad7618c, 0x94de6c87,
-    0x86c57b9a, 0x88cc7691, 0xa2f355a0, 0xacfa58ab, 0xbee14fb6, 0xb0e842bd,
-    0xea9f09d4, 0xe49604df, 0xf68d13c2, 0xf8841ec9, 0xd2bb3df8, 0xdcb230f3,
-    0xcea927ee, 0xc0a02ae5, 0x7a47b13c, 0x744ebc37, 0x6655ab2a, 0x685ca621,
-    0x42638510, 0x4c6a881b, 0x5e719f06, 0x5078920d, 0x0a0fd964, 0x0406d46f,
-    0x161dc372, 0x1814ce79, 0x322bed48, 0x3c22e043, 0x2e39f75e, 0x2030fa55,
-    0xec9ab701, 0xe293ba0a, 0xf088ad17, 0xfe81a01c, 0xd4be832d, 0xdab78e26,
-    0xc8ac993b, 0xc6a59430, 0x9cd2df59, 0x92dbd252, 0x80c0c54f, 0x8ec9c844,
-    0xa4f6eb75, 0xaaffe67e, 0xb8e4f163, 0xb6edfc68, 0x0c0a67b1, 0x02036aba,
-    0x10187da7, 0x1e1170ac, 0x342e539d, 0x3a275e96, 0x283c498b, 0x26354480,
-    0x7c420fe9, 0x724b02e2, 0x605015ff, 0x6e5918f4, 0x44663bc5, 0x4a6f36ce,
-    0x587421d3, 0x567d2cd8, 0x37a10c7a, 0x39a80171, 0x2bb3166c, 0x25ba1b67,
-    0x0f853856, 0x018c355d, 0x13972240, 0x1d9e2f4b, 0x47e96422, 0x49e06929,
-    0x5bfb7e34, 0x55f2733f, 0x7fcd500e, 0x71c45d05, 0x63df4a18, 0x6dd64713,
-    0xd731dcca, 0xd938d1c1, 0xcb23c6dc, 0xc52acbd7, 0xef15e8e6, 0xe11ce5ed,
-    0xf307f2f0, 0xfd0efffb, 0xa779b492, 0xa970b999, 0xbb6bae84, 0xb562a38f,
-    0x9f5d80be, 0x91548db5, 0x834f9aa8, 0x8d4697a3]);
-
-  function expandKey128(cipherKey) {
-    var b = 176, result = new Uint8Array(b);
-    result.set(cipherKey);
-    for (var j = 16, i = 1; j < b; ++i) {
-      // RotWord
-      var t1 = result[j - 3], t2 = result[j - 2],
-          t3 = result[j - 1], t4 = result[j - 4];
-      // SubWord
-      t1 = s[t1]; t2 = s[t2]; t3 = s[t3]; t4 = s[t4];
-      // Rcon
-      t1 = t1 ^ rcon[i];
-      for (var n = 0; n < 4; ++n) {
-        result[j] = (t1 ^= result[j - 16]); j++;
-        result[j] = (t2 ^= result[j - 16]); j++;
-        result[j] = (t3 ^= result[j - 16]); j++;
-        result[j] = (t4 ^= result[j - 16]); j++;
-      }
-    }
-    return result;
-  }
-
-  function decrypt128(input, key) {
-    var state = new Uint8Array(16);
-    state.set(input);
-    var i, j, k;
-    var t, u, v;
-    // AddRoundKey
-    for (j = 0, k = 160; j < 16; ++j, ++k)
-      state[j] ^= key[k];
-    for (i = 9; i >= 1; --i) {
-      // InvShiftRows
-      t = state[13]; state[13] = state[9]; state[9] = state[5];
-      state[5] = state[1]; state[1] = t;
-      t = state[14]; u = state[10]; state[14] = state[6];
-      state[10] = state[2]; state[6] = t; state[2] = u;
-      t = state[15]; u = state[11]; v = state[7]; state[15] = state[3];
-      state[11] = t; state[7] = u; state[3] = v;
-      // InvSubBytes
-      for (j = 0; j < 16; ++j)
-        state[j] = inv_s[state[j]];
-      // AddRoundKey
-      for (j = 0, k = i * 16; j < 16; ++j, ++k)
-        state[j] ^= key[k];
-      // InvMixColumns
-      for (j = 0; j < 16; j += 4) {
-        var s0 = mix[state[j]], s1 = mix[state[j + 1]],
-            s2 = mix[state[j + 2]], s3 = mix[state[j + 3]];
-        t = (s0 ^ (s1 >>> 8) ^ (s1 << 24) ^ (s2 >>> 16) ^ (s2 << 16) ^
-            (s3 >>> 24) ^ (s3 << 8));
-        state[j] = (t >>> 24) & 0xFF;
-        state[j + 1] = (t >> 16) & 0xFF;
-        state[j + 2] = (t >> 8) & 0xFF;
-        state[j + 3] = t & 0xFF;
-      }
-    }
-    // InvShiftRows
-    t = state[13]; state[13] = state[9]; state[9] = state[5];
-    state[5] = state[1]; state[1] = t;
-    t = state[14]; u = state[10]; state[14] = state[6];
-    state[10] = state[2]; state[6] = t; state[2] = u;
-    t = state[15]; u = state[11]; v = state[7]; state[15] = state[3];
-    state[11] = t; state[7] = u; state[3] = v;
-    for (j = 0; j < 16; ++j) {
-      // InvSubBytes
-      state[j] = inv_s[state[j]];
-      // AddRoundKey
-      state[j] ^= key[j];
-    }
-    return state;
-  }
-
-  function AES128Cipher(key) {
-    this.key = expandKey128(key);
-    this.buffer = new Uint8Array(16);
-    this.bufferPosition = 0;
-  }
-
-  function decryptBlock2(data) {
-    var i, j, ii, sourceLength = data.length,
-        buffer = this.buffer, bufferLength = this.bufferPosition,
-        result = [], iv = this.iv;
-    for (i = 0; i < sourceLength; ++i) {
-      buffer[bufferLength] = data[i];
-      ++bufferLength;
-      if (bufferLength < 16)
-        continue;
-      // buffer is full, decrypting
-      var plain = decrypt128(buffer, this.key);
-      // xor-ing the IV vector to get plain text
-      for (j = 0; j < 16; ++j)
-        plain[j] ^= iv[j];
-      iv = buffer;
-      result.push(plain);
-      buffer = new Uint8Array(16);
-      bufferLength = 0;
-    }
-    // saving incomplete buffer
-    this.buffer = buffer;
-    this.bufferLength = bufferLength;
-    this.iv = iv;
-    if (result.length == 0)
-      return new Uint8Array([]);
-    if (result.length == 1)
-      return result[0];
-    // combining plain text blocks into one
-    var output = new Uint8Array(16 * result.length);
-    for (i = 0, j = 0, ii = result.length; i < ii; ++i, j += 16)
-      output.set(result[i], j);
-    return output;
-  }
-
-  AES128Cipher.prototype = {
-    decryptBlock: function AES128Cipher_decryptBlock(data) {
-      var i, sourceLength = data.length;
-      var buffer = this.buffer, bufferLength = this.bufferPosition;
-      // waiting for IV values -- they are at the start of the stream
-      for (i = 0; bufferLength < 16 && i < sourceLength; ++i, ++bufferLength)
-        buffer[bufferLength] = data[i];
-      if (bufferLength < 16) {
-        // need more data
-        this.bufferLength = bufferLength;
-        return new Uint8Array([]);
-      }
-      this.iv = buffer;
-      this.buffer = new Uint8Array(16);
-      this.bufferLength = 0;
-      // starting decryption
-      this.decryptBlock = decryptBlock2;
-      return this.decryptBlock(data.subarray(16));
-    }
-  };
-
-  return AES128Cipher;
-})();
-
-var CipherTransform = (function CipherTransformClosure() {
-  function CipherTransform(stringCipherConstructor, streamCipherConstructor) {
-    this.stringCipherConstructor = stringCipherConstructor;
-    this.streamCipherConstructor = streamCipherConstructor;
-  }
-  CipherTransform.prototype = {
-    createStream: function CipherTransform_createStream(stream) {
-      var cipher = new this.streamCipherConstructor();
-      return new DecryptStream(stream,
-        function cipherTransformDecryptStream(data) {
-          return cipher.decryptBlock(data);
-        }
-      );
-    },
-    decryptString: function CipherTransform_decryptString(s) {
-      var cipher = new this.stringCipherConstructor();
-      var data = stringToBytes(s);
-      data = cipher.decryptBlock(data);
-      return bytesToString(data);
-    }
-  };
-  return CipherTransform;
-})();
-
-var CipherTransformFactory = (function CipherTransformFactoryClosure() {
-  var defaultPasswordBytes = new Uint8Array([
-    0x28, 0xBF, 0x4E, 0x5E, 0x4E, 0x75, 0x8A, 0x41,
-    0x64, 0x00, 0x4E, 0x56, 0xFF, 0xFA, 0x01, 0x08,
-    0x2E, 0x2E, 0x00, 0xB6, 0xD0, 0x68, 0x3E, 0x80,
-    0x2F, 0x0C, 0xA9, 0xFE, 0x64, 0x53, 0x69, 0x7A]);
-
-  function prepareKeyData(fileId, password, ownerPassword, userPassword,
-                          flags, revision, keyLength, encryptMetadata) {
-    var hashData = new Uint8Array(100), i = 0, j, n;
-    if (password) {
-      n = Math.min(32, password.length);
-      for (; i < n; ++i)
-        hashData[i] = password[i];
-    }
-    j = 0;
-    while (i < 32) {
-      hashData[i++] = defaultPasswordBytes[j++];
-    }
-    // as now the padded password in the hashData[0..i]
-    for (j = 0, n = ownerPassword.length; j < n; ++j)
-      hashData[i++] = ownerPassword[j];
-    hashData[i++] = flags & 0xFF;
-    hashData[i++] = (flags >> 8) & 0xFF;
-    hashData[i++] = (flags >> 16) & 0xFF;
-    hashData[i++] = (flags >>> 24) & 0xFF;
-    for (j = 0, n = fileId.length; j < n; ++j)
-      hashData[i++] = fileId[j];
-    if (revision >= 4 && !encryptMetadata) {
-      hashData[i++] = 0xFF;
-      hashData[i++] = 0xFF;
-      hashData[i++] = 0xFF;
-      hashData[i++] = 0xFF;
-    }
-    var hash = calculateMD5(hashData, 0, i);
-    var keyLengthInBytes = keyLength >> 3;
-    if (revision >= 3) {
-      for (j = 0; j < 50; ++j) {
-         hash = calculateMD5(hash, 0, keyLengthInBytes);
-      }
-    }
-    var encryptionKey = hash.subarray(0, keyLengthInBytes);
-    var cipher, checkData;
-
-    if (revision >= 3) {
-      for (i = 0; i < 32; ++i)
-        hashData[i] = defaultPasswordBytes[i];
-      for (j = 0, n = fileId.length; j < n; ++j)
-        hashData[i++] = fileId[j];
-      cipher = new ARCFourCipher(encryptionKey);
-      var checkData = cipher.encryptBlock(calculateMD5(hashData, 0, i));
-      n = encryptionKey.length;
-      var derivedKey = new Uint8Array(n), k;
-      for (j = 1; j <= 19; ++j) {
-        for (k = 0; k < n; ++k)
-          derivedKey[k] = encryptionKey[k] ^ j;
-        cipher = new ARCFourCipher(derivedKey);
-        checkData = cipher.encryptBlock(checkData);
-      }
-      for (j = 0, n = checkData.length; j < n; ++j) {
-        if (userPassword[j] != checkData[j])
-          return null;
-      }
-    } else {
-      cipher = new ARCFourCipher(encryptionKey);
-      checkData = cipher.encryptBlock(defaultPasswordBytes);
-      for (j = 0, n = checkData.length; j < n; ++j) {
-        if (userPassword[j] != checkData[j])
-          return null;
-      }
-    }
-    return encryptionKey;
-  }
-  function decodeUserPassword(password, ownerPassword, revision, keyLength) {
-    var hashData = new Uint8Array(32), i = 0, j, n;
-    n = Math.min(32, password.length);
-    for (; i < n; ++i)
-      hashData[i] = password[i];
-    j = 0;
-    while (i < 32) {
-      hashData[i++] = defaultPasswordBytes[j++];
-    }
-    var hash = calculateMD5(hashData, 0, i);
-    var keyLengthInBytes = keyLength >> 3;
-    if (revision >= 3) {
-      for (j = 0; j < 50; ++j) {
-         hash = calculateMD5(hash, 0, hash.length);
-      }
-    }
-
-    var cipher, userPassword;
-    if (revision >= 3) {
-      userPassword = ownerPassword;
-      var derivedKey = new Uint8Array(keyLengthInBytes), k;
-      for (j = 19; j >= 0; j--) {
-        for (k = 0; k < keyLengthInBytes; ++k)
-          derivedKey[k] = hash[k] ^ j;
-        cipher = new ARCFourCipher(derivedKey);
-        userPassword = cipher.encryptBlock(userPassword);
-      }
-    } else {
-      cipher = new ARCFourCipher(hash.subarray(0, keyLengthInBytes));
-      userPassword = cipher.encryptBlock(ownerPassword);
-    }
-    return userPassword;
-  }
-
-  var identityName = new Name('Identity');
-
-  function CipherTransformFactory(dict, fileId, password) {
-    var filter = dict.get('Filter');
-    if (!isName(filter) || filter.name != 'Standard')
-      error('unknown encryption method');
-    this.dict = dict;
-    var algorithm = dict.get('V');
-    if (!isInt(algorithm) ||
-      (algorithm != 1 && algorithm != 2 && algorithm != 4))
-      error('unsupported encryption algorithm');
-    this.algorithm = algorithm;
-    var keyLength = dict.get('Length') || 40;
-    if (!isInt(keyLength) ||
-      keyLength < 40 || (keyLength % 8) != 0)
-      error('invalid key length');
-    // prepare keys
-    var ownerPassword = stringToBytes(dict.get('O'));
-    var userPassword = stringToBytes(dict.get('U'));
-    var flags = dict.get('P');
-    var revision = dict.get('R');
-    var encryptMetadata = algorithm == 4 &&  // meaningful when V is 4
-      dict.get('EncryptMetadata') !== false; // makes true as default value
-    this.encryptMetadata = encryptMetadata;
-
-    var fileIdBytes = stringToBytes(fileId);
-    var passwordBytes;
-    if (password)
-      passwordBytes = stringToBytes(password);
-
-    var encryptionKey = prepareKeyData(fileIdBytes, passwordBytes,
-                                       ownerPassword, userPassword, flags,
-                                       revision, keyLength, encryptMetadata);
-    if (!encryptionKey && !password) {
-      throw new PasswordException('No password given', 'needpassword');
-    } else if (!encryptionKey && password) {
-      // Attempting use the password as an owner password
-      var decodedPassword = decodeUserPassword(passwordBytes, ownerPassword,
-                                               revision, keyLength);
-      encryptionKey = prepareKeyData(fileIdBytes, decodedPassword,
-                                     ownerPassword, userPassword, flags,
-                                     revision, keyLength, encryptMetadata);
-    }
-
-    if (!encryptionKey)
-      throw new PasswordException('Incorrect Password', 'incorrectpassword');
-
-    this.encryptionKey = encryptionKey;
-
-    if (algorithm == 4) {
-      this.cf = dict.get('CF');
-      this.stmf = dict.get('StmF') || identityName;
-      this.strf = dict.get('StrF') || identityName;
-      this.eff = dict.get('EFF') || this.strf;
-    }
-  }
-
-  function buildObjectKey(num, gen, encryptionKey, isAes) {
-    var key = new Uint8Array(encryptionKey.length + 9), i, n;
-    for (i = 0, n = encryptionKey.length; i < n; ++i)
-      key[i] = encryptionKey[i];
-    key[i++] = num & 0xFF;
-    key[i++] = (num >> 8) & 0xFF;
-    key[i++] = (num >> 16) & 0xFF;
-    key[i++] = gen & 0xFF;
-    key[i++] = (gen >> 8) & 0xFF;
-    if (isAes) {
-      key[i++] = 0x73;
-      key[i++] = 0x41;
-      key[i++] = 0x6C;
-      key[i++] = 0x54;
-    }
-    var hash = calculateMD5(key, 0, i);
-    return hash.subarray(0, Math.min(encryptionKey.length + 5, 16));
-  }
-
-  function buildCipherConstructor(cf, name, num, gen, key) {
-    var cryptFilter = cf.get(name.name);
-    var cfm;
-    if (cryptFilter != null)
-      cfm = cryptFilter.get('CFM');
-    if (!cfm || cfm.name == 'None') {
-      return function cipherTransformFactoryBuildCipherConstructorNone() {
-        return new NullCipher();
-      };
-    }
-    if ('V2' == cfm.name) {
-      return function cipherTransformFactoryBuildCipherConstructorV2() {
-        return new ARCFourCipher(
-          buildObjectKey(num, gen, key, false));
-      };
-    }
-    if ('AESV2' == cfm.name) {
-      return function cipherTransformFactoryBuildCipherConstructorAESV2() {
-        return new AES128Cipher(
-          buildObjectKey(num, gen, key, true));
-      };
-    }
-    error('Unknown crypto method');
-  }
-
-  CipherTransformFactory.prototype = {
-    createCipherTransform:
-      function CipherTransformFactory_createCipherTransform(num, gen) {
-      if (this.algorithm == 4) {
-        return new CipherTransform(
-          buildCipherConstructor(this.cf, this.stmf,
-            num, gen, this.encryptionKey),
-          buildCipherConstructor(this.cf, this.strf,
-            num, gen, this.encryptionKey));
-      }
-      // algorithms 1 and 2
-      var key = buildObjectKey(num, gen, this.encryptionKey, false);
-      var cipherConstructor = function buildCipherCipherConstructor() {
-        return new ARCFourCipher(key);
-      };
-      return new CipherTransform(cipherConstructor, cipherConstructor);
-    }
-  };
-
-  return CipherTransformFactory;
-})();
-
-
-/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
-
-'use strict';
-
-var PartialEvaluator = (function PartialEvaluatorClosure() {
-  function PartialEvaluator(xref, handler, uniquePrefix) {
-    this.state = new EvalState();
-    this.stateStack = [];
-
-    this.xref = xref;
-    this.handler = handler;
-    this.uniquePrefix = uniquePrefix;
-    this.objIdCounter = 0;
-  }
-
-  var OP_MAP = {
-    // Graphics state
-    w: 'setLineWidth',
-    J: 'setLineCap',
-    j: 'setLineJoin',
-    M: 'setMiterLimit',
-    d: 'setDash',
-    ri: 'setRenderingIntent',
-    i: 'setFlatness',
-    gs: 'setGState',
-    q: 'save',
-    Q: 'restore',
-    cm: 'transform',
-
-    // Path
-    m: 'moveTo',
-    l: 'lineTo',
-    c: 'curveTo',
-    v: 'curveTo2',
-    y: 'curveTo3',
-    h: 'closePath',
-    re: 'rectangle',
-    S: 'stroke',
-    s: 'closeStroke',
-    f: 'fill',
-    F: 'fill',
-    'f*': 'eoFill',
-    B: 'fillStroke',
-    'B*': 'eoFillStroke',
-    b: 'closeFillStroke',
-    'b*': 'closeEOFillStroke',
-    n: 'endPath',
-
-    // Clipping
-    W: 'clip',
-    'W*': 'eoClip',
-
-    // Text
-    BT: 'beginText',
-    ET: 'endText',
-    Tc: 'setCharSpacing',
-    Tw: 'setWordSpacing',
-    Tz: 'setHScale',
-    TL: 'setLeading',
-    Tf: 'setFont',
-    Tr: 'setTextRenderingMode',
-    Ts: 'setTextRise',
-    Td: 'moveText',
-    TD: 'setLeadingMoveText',
-    Tm: 'setTextMatrix',
-    'T*': 'nextLine',
-    Tj: 'showText',
-    TJ: 'showSpacedText',
-    "'": 'nextLineShowText',
-    '"': 'nextLineSetSpacingShowText',
-
-    // Type3 fonts
-    d0: 'setCharWidth',
-    d1: 'setCharWidthAndBounds',
-
-    // Color
-    CS: 'setStrokeColorSpace',
-    cs: 'setFillColorSpace',
-    SC: 'setStrokeColor',
-    SCN: 'setStrokeColorN',
-    sc: 'setFillColor',
-    scn: 'setFillColorN',
-    G: 'setStrokeGray',
-    g: 'setFillGray',
-    RG: 'setStrokeRGBColor',
-    rg: 'setFillRGBColor',
-    K: 'setStrokeCMYKColor',
-    k: 'setFillCMYKColor',
-
-    // Shading
-    sh: 'shadingFill',
-
-    // Images
-    BI: 'beginInlineImage',
-    ID: 'beginImageData',
-    EI: 'endInlineImage',
-
-    // XObjects
-    Do: 'paintXObject',
-
-    // Marked content
-    MP: 'markPoint',
-    DP: 'markPointProps',
-    BMC: 'beginMarkedContent',
-    BDC: 'beginMarkedContentProps',
-    EMC: 'endMarkedContent',
-
-    // Compatibility
-    BX: 'beginCompat',
-    EX: 'endCompat',
-
-    // (reserved partial commands for the lexer)
-    BM: null,
-    BD: null,
-    'true': null,
-    fa: null,
-    fal: null,
-    fals: null,
-    'false': null,
-    nu: null,
-    nul: null,
-    'null': null
-  };
-
-  PartialEvaluator.prototype = {
-    getOperatorList: function PartialEvaluator_getOperatorList(stream,
-                                                               resources,
-                                                               dependency,
-                                                               queue) {
-
-      var self = this;
-      var xref = this.xref;
-      var handler = this.handler;
-      var uniquePrefix = this.uniquePrefix || '';
-
-      function insertDependency(depList) {
-        fnArray.push('dependency');
-        argsArray.push(depList);
-        for (var i = 0, ii = depList.length; i < ii; i++) {
-          var dep = depList[i];
-          if (dependency.indexOf(dep) == -1) {
-            dependency.push(depList[i]);
-          }
-        }
-      }
-
-      function handleSetFont(fontName, font) {
-        var loadedName = null;
-
-        var fontRes = resources.get('Font');
-
-        assert(fontRes, 'fontRes not available');
-
-        font = xref.fetchIfRef(font) || fontRes.get(fontName);
-        assertWellFormed(isDict(font));
-
-        ++self.objIdCounter;
-        if (!font.loadedName) {
-          font.translated = self.translateFont(font, xref, resources,
-                                               dependency);
-          if (font.translated) {
-            // keep track of each font we translated so the caller can
-            // load them asynchronously before calling display on a page
-            loadedName = 'font_' + uniquePrefix + self.objIdCounter;
-            font.translated.properties.loadedName = loadedName;
-            font.loadedName = loadedName;
-
-            var translated = font.translated;
-            // Convert the file to an ArrayBuffer which will be turned back into
-            // a Stream in the main thread.
-            if (translated.file)
-              translated.file = translated.file.getBytes();
-            if (translated.properties.file) {
-              translated.properties.file =
-                  translated.properties.file.getBytes();
-            }
-
-            handler.send('obj', [
-                loadedName,
-                'Font',
-                translated.name,
-                translated.file,
-                translated.properties
-            ]);
-          }
-        }
-        loadedName = loadedName || font.loadedName;
-
-        // Ensure the font is ready before the font is set
-        // and later on used for drawing.
-        // OPTIMIZE: This should get insert to the operatorList only once per
-        // page.
-        insertDependency([loadedName]);
-        return loadedName;
-      }
-
-      function buildPaintImageXObject(image, inline) {
-        var dict = image.dict;
-        var w = dict.get('Width', 'W');
-        var h = dict.get('Height', 'H');
-
-        var imageMask = dict.get('ImageMask', 'IM') || false;
-        if (imageMask) {
-          // This depends on a tmpCanvas beeing filled with the
-          // current fillStyle, such that processing the pixel
-          // data can't be done here. Instead of creating a
-          // complete PDFImage, only read the information needed
-          // for later.
-
-          var width = dict.get('Width', 'W');
-          var height = dict.get('Height', 'H');
-          var bitStrideLength = (width + 7) >> 3;
-          var imgArray = image.getBytes(bitStrideLength * height);
-          var decode = dict.get('Decode', 'D');
-          var inverseDecode = !!decode && decode[0] > 0;
-
-          fn = 'paintImageMaskXObject';
-          args = [imgArray, inverseDecode, width, height];
-          return;
-        }
-
-        // If there is no imageMask, create the PDFImage and a lot
-        // of image processing can be done here.
-        var objId = 'img_' + uniquePrefix + (++self.objIdCounter);
-        insertDependency([objId]);
-        args = [objId, w, h];
-
-        var softMask = dict.get('SMask', 'IM') || false;
-        if (!softMask && image instanceof JpegStream &&
-            image.isNativelySupported(xref, resources)) {
-          // These JPEGs don't need any more processing so we can just send it.
-          fn = 'paintJpegXObject';
-          handler.send('obj', [objId, 'JpegStream', image.getIR()]);
-          return;
-        }
-
-        fn = 'paintImageXObject';
-
-        PDFImage.buildImage(function(imageObj) {
-            var drawWidth = imageObj.drawWidth;
-            var drawHeight = imageObj.drawHeight;
-            var imgData = {
-              width: drawWidth,
-              height: drawHeight,
-              data: new Uint8Array(drawWidth * drawHeight * 4)
-            };
-            var pixels = imgData.data;
-            imageObj.fillRgbaBuffer(pixels, drawWidth, drawHeight);
-            handler.send('obj', [objId, 'Image', imgData]);
-          }, handler, xref, resources, image, inline);
-      }
-
-      if (!queue)
-        queue = {};
-
-      if (!queue.argsArray) {
-        queue.argsArray = [];
-      }
-      if (!queue.fnArray) {
-        queue.fnArray = [];
-      }
-
-      var fnArray = queue.fnArray, argsArray = queue.argsArray;
-      var dependencyArray = dependency || [];
-
-      resources = resources || new Dict();
-      var xobjs = resources.get('XObject') || new Dict();
-      var patterns = resources.get('Pattern') || new Dict();
-      var parser = new Parser(new Lexer(stream, OP_MAP), false, xref);
-      var res = resources;
-      var args = [], obj;
-      var TILING_PATTERN = 1, SHADING_PATTERN = 2;
-
-      while (true) {
-        obj = parser.getObj();
-        if (isEOF(obj))
-          break;
-
-        if (isCmd(obj)) {
-          var cmd = obj.cmd;
-          var fn = OP_MAP[cmd];
-          assertWellFormed(fn, 'Unknown command "' + cmd + '"');
-          // TODO figure out how to type-check vararg functions
-
-          if ((cmd == 'SCN' || cmd == 'scn') && !args[args.length - 1].code) {
-            // compile tiling patterns
-            var patternName = args[args.length - 1];
-            // SCN/scn applies patterns along with normal colors
-            if (isName(patternName)) {
-              var pattern = patterns.get(patternName.name);
-              if (pattern) {
-                var dict = isStream(pattern) ? pattern.dict : pattern;
-                var typeNum = dict.get('PatternType');
-
-                if (typeNum == TILING_PATTERN) {
-                  // Create an IR of the pattern code.
-                  var depIdx = dependencyArray.length;
-                  var operatorList = this.getOperatorList(pattern,
-                      dict.get('Resources') || resources, dependencyArray);
-
-                  // Add the dependencies that are required to execute the
-                  // operatorList.
-                  insertDependency(dependencyArray.slice(depIdx));
-
-                  args = TilingPattern.getIR(operatorList, dict, args);
-                }
-                else if (typeNum == SHADING_PATTERN) {
-                  var shading = dict.get('Shading');
-                  var matrix = dict.get('Matrix');
-                  var pattern = Pattern.parseShading(shading, matrix, xref,
-                                                     res);
-                  args = pattern.getIR();
-                } else {
-                  error('Unkown PatternType ' + typeNum);
-                }
-              }
-            }
-          } else if (cmd == 'Do' && !args[0].code) {
-            // eagerly compile XForm objects
-            var name = args[0].name;
-            var xobj = xobjs.get(name);
-            if (xobj) {
-              assertWellFormed(isStream(xobj), 'XObject should be a stream');
-
-              var type = xobj.dict.get('Subtype');
-              assertWellFormed(
-                isName(type),
-                'XObject should have a Name subtype'
-              );
-
-              if ('Form' == type.name) {
-                var matrix = xobj.dict.get('Matrix');
-                var bbox = xobj.dict.get('BBox');
-
-                fnArray.push('paintFormXObjectBegin');
-                argsArray.push([matrix, bbox]);
-
-                // This adds the operatorList of the xObj to the current queue.
-                var depIdx = dependencyArray.length;
-
-                // Pass in the current `queue` object. That means the `fnArray`
-                // and the `argsArray` in this scope is reused and new commands
-                // are added to them.
-                this.getOperatorList(xobj,
-                    xobj.dict.get('Resources') || resources,
-                    dependencyArray, queue);
-
-               // Add the dependencies that are required to execute the
-               // operatorList.
-               insertDependency(dependencyArray.slice(depIdx));
-
-                fn = 'paintFormXObjectEnd';
-                args = [];
-              } else if ('Image' == type.name) {
-                buildPaintImageXObject(xobj, false);
-              } else {
-                error('Unhandled XObject subtype ' + type.name);
-              }
-            }
-          } else if (cmd == 'Tf') { // eagerly collect all fonts
-            args[0] = handleSetFont(args[0].name);
-          } else if (cmd == 'EI') {
-            buildPaintImageXObject(args[0], true);
-          }
-
-          switch (fn) {
-            // Parse the ColorSpace data to a raw format.
-            case 'setFillColorSpace':
-            case 'setStrokeColorSpace':
-              args = [ColorSpace.parseToIR(args[0], xref, resources)];
-              break;
-            case 'shadingFill':
-              var shadingRes = res.get('Shading');
-              if (!shadingRes)
-                error('No shading resource found');
-
-              var shading = shadingRes.get(args[0].name);
-              if (!shading)
-                error('No shading object found');
-
-              var shadingFill = Pattern.parseShading(shading, null, xref, res);
-              var patternIR = shadingFill.getIR();
-              args = [patternIR];
-              fn = 'shadingFill';
-              break;
-            case 'setGState':
-              var dictName = args[0];
-              var extGState = resources.get('ExtGState');
-
-              if (!isDict(extGState) || !extGState.has(dictName.name))
-                break;
-
-              var gsState = extGState.get(dictName.name);
-
-              // This array holds the converted/processed state data.
-              var gsStateObj = [];
-
-              gsState.forEach(
-                function canvasGraphicsSetGStateForEach(key, value) {
-                  switch (key) {
-                    case 'Type':
-                      break;
-                    case 'LW':
-                    case 'LC':
-                    case 'LJ':
-                    case 'ML':
-                    case 'D':
-                    case 'RI':
-                    case 'FL':
-                    case 'CA':
-                    case 'ca':
-                      gsStateObj.push([key, value]);
-                      break;
-                    case 'Font':
-                      gsStateObj.push([
-                        'Font',
-                        handleSetFont(null, value[0]),
-                        value[1]
-                      ]);
-                      break;
-                    case 'BM':
-                      // We support the default so don't trigger the TODO.
-                      if (!isName(value) || value.name != 'Normal')
-                        TODO('graphic state operator ' + key);
-                      break;
-                    case 'SMask':
-                      // We support the default so don't trigger the TODO.
-                      if (!isName(value) || value.name != 'None')
-                        TODO('graphic state operator ' + key);
-                      break;
-                    // Only generate info log messages for the following since
-                    // they are unlikey to have a big impact on the rendering.
-                    case 'OP':
-                    case 'op':
-                    case 'OPM':
-                    case 'BG':
-                    case 'BG2':
-                    case 'UCR':
-                    case 'UCR2':
-                    case 'TR':
-                    case 'TR2':
-                    case 'HT':
-                    case 'SM':
-                    case 'SA':
-                    case 'AIS':
-                    case 'TK':
-                      // TODO implement these operators.
-                      info('graphic state operator ' + key);
-                      break;
-                    default:
-                      info('Unknown graphic state operator ' + key);
-                      break;
-                  }
-                }
-              );
-              args = [gsStateObj];
-              break;
-          } // switch
-
-          fnArray.push(fn);
-          argsArray.push(args);
-          args = [];
-        } else if (obj != null) {
-          assertWellFormed(args.length <= 33, 'Too many arguments');
-          args.push(obj instanceof Dict ? obj.getAll() : obj);
-        }
-      }
-
-      return queue;
-    },
-
-    getTextContent: function partialEvaluatorGetIRQueue(stream, resources) {
-
-      var self = this;
-      var xref = this.xref;
-
-      function handleSetFont(fontName, fontRef) {
-        var fontRes = resources.get('Font');
-
-        // TODO: TOASK: Is it possible to get here? If so, what does
-        // args[0].name should be like???
-        assert(fontRes, 'fontRes not available');
-
-        fontRes = xref.fetchIfRef(fontRes);
-        fontRef = fontRef || fontRes.get(fontName);
-        var font = xref.fetchIfRef(fontRef), tra;
-        assertWellFormed(isDict(font));
-        if (!font.translated) {
-          font.translated = self.translateFont(font, xref, resources);
-        }
-        return font;
-      }
-
-      resources = xref.fetchIfRef(resources) || new Dict();
-
-      var parser = new Parser(new Lexer(stream), false);
-      var res = resources;
-      var args = [], obj;
-
-      var text = '';
-      var chunk = '';
-      var font = null;
-      while (!isEOF(obj = parser.getObj())) {
-        if (isCmd(obj)) {
-          var cmd = obj.cmd;
-          switch (cmd) {
-            case 'Tf':
-              font = handleSetFont(args[0].name);
-              break;
-            case 'TJ':
-              var items = args[0];
-              for (var j = 0, jj = items.length; j < jj; j++) {
-                if (typeof items[j] === 'string') {
-                  chunk += items[j];
-                } else if (items[j] < 0) {
-                  // making all negative offsets a space - better to have
-                  // a space in incorrect place than not have them at all
-                  chunk += ' ';
-                }
-              }
-              break;
-            case 'Tj':
-              chunk += args[0];
-              break;
-            case "'":
-              chunk += args[0] + ' ';
-              break;
-            case '"':
-              chunk += args[2] + ' ';
-              break;
-          } // switch
-          if (chunk !== '') {
-            text += fontCharsToUnicode(chunk, font.translated.properties);
-            chunk = '';
-          }
-
-          args = [];
-        } else if (obj != null) {
-          assertWellFormed(args.length <= 33, 'Too many arguments');
-          args.push(obj);
-        }
-      }
-
-      return text;
-    },
-
-    extractDataStructures: function
-      partialEvaluatorExtractDataStructures(dict, baseDict,
-                                            xref, properties) {
-      // 9.10.2
-      var toUnicode = dict.get('ToUnicode') ||
-        baseDict.get('ToUnicode');
-      if (toUnicode)
-        properties.toUnicode = this.readToUnicode(toUnicode, xref, properties);
-
-      if (properties.composite) {
-        // CIDSystemInfo helps to match CID to glyphs
-        var cidSystemInfo = dict.get('CIDSystemInfo');
-        if (isDict(cidSystemInfo)) {
-          properties.cidSystemInfo = {
-            registry: cidSystemInfo.get('Registry'),
-            ordering: cidSystemInfo.get('Ordering'),
-            supplement: cidSystemInfo.get('Supplement')
-          };
-        }
-
-        var cidToGidMap = dict.get('CIDToGIDMap');
-        if (isStream(cidToGidMap))
-          properties.cidToGidMap = this.readCidToGidMap(cidToGidMap);
-      }
-
-      var flags = properties.flags;
-      var differences = [];
-      var baseEncoding = !!(flags & FontFlags.Symbolic) ?
-                         Encodings.symbolsEncoding : Encodings.StandardEncoding;
-      var hasEncoding = dict.has('Encoding');
-      if (hasEncoding) {
-        var encoding = dict.get('Encoding');
-        if (isDict(encoding)) {
-          var baseName = encoding.get('BaseEncoding');
-          if (baseName)
-            baseEncoding = Encodings[baseName.name];
-          else
-            hasEncoding = false; // base encoding was not provided
-
-          // Load the differences between the base and original
-          if (encoding.has('Differences')) {
-            var diffEncoding = encoding.get('Differences');
-            var index = 0;
-            for (var j = 0, jj = diffEncoding.length; j < jj; j++) {
-              var data = diffEncoding[j];
-              if (isNum(data))
-                index = data;
-              else
-                differences[index++] = data.name;
-            }
-          }
-        } else if (isName(encoding)) {
-          baseEncoding = Encodings[encoding.name];
-        } else {
-          error('Encoding is not a Name nor a Dict');
-        }
-      }
-
-      properties.differences = differences;
-      properties.baseEncoding = baseEncoding;
-      properties.hasEncoding = hasEncoding;
-    },
-
-    readToUnicode: function PartialEvaluator_readToUnicode(toUnicode, xref,
-                                                           properties) {
-      var cmapObj = toUnicode;
-      var charToUnicode = [];
-      if (isName(cmapObj)) {
-        var isIdentityMap = cmapObj.name.substr(0, 9) == 'Identity-';
-        if (!isIdentityMap)
-          error('ToUnicode file cmap translation not implemented');
-      } else if (isStream(cmapObj)) {
-        var tokens = [];
-        var token = '';
-        var beginArrayToken = {};
-
-        var cmap = cmapObj.getBytes(cmapObj.length);
-        for (var i = 0, ii = cmap.length; i < ii; i++) {
-          var octet = cmap[i];
-          if (octet == 0x20 || octet == 0x0D || octet == 0x0A ||
-              octet == 0x3C || octet == 0x5B || octet == 0x5D) {
-            switch (token) {
-              case 'usecmap':
-                error('usecmap is not implemented');
-                break;
-
-              case 'beginbfchar':
-              case 'beginbfrange':
-              case 'begincidchar':
-              case 'begincidrange':
-                token = '';
-                tokens = [];
-                break;
-
-              case 'endcidrange':
-              case 'endbfrange':
-                for (var j = 0, jj = tokens.length; j < jj; j += 3) {
-                  var startRange = tokens[j];
-                  var endRange = tokens[j + 1];
-                  var code = tokens[j + 2];
-                  if (code == 0xFFFF) {
-                    // CMap is broken, assuming code == startRange
-                    code = startRange;
-                  }
-                  if (isArray(code)) {
-                    var codeindex = 0;
-                    while (startRange <= endRange) {
-                      charToUnicode[startRange] = code[codeindex++];
-                      ++startRange;
-                    }
-                  } else {
-                    while (startRange <= endRange) {
-                      charToUnicode[startRange] = code++;
-                      ++startRange;
-                    }
-                  }
-                }
-                break;
-
-              case 'endcidchar':
-              case 'endbfchar':
-                for (var j = 0, jj = tokens.length; j < jj; j += 2) {
-                  var index = tokens[j];
-                  var code = tokens[j + 1];
-                  charToUnicode[index] = code;
-                }
-                break;
-
-              case '':
-                break;
-
-              default:
-                if (token[0] >= '0' && token[0] <= '9')
-                  token = parseInt(token, 10); // a number
-                tokens.push(token);
-                token = '';
-            }
-            switch (octet) {
-              case 0x5B:
-                // begin list parsing
-                tokens.push(beginArrayToken);
-                break;
-              case 0x5D:
-                // collect array items
-                var items = [], item;
-                while (tokens.length &&
-                       (item = tokens.pop()) != beginArrayToken)
-                  items.unshift(item);
-                tokens.push(items);
-                break;
-            }
-          } else if (octet == 0x3E) {
-            if (token.length) {
-              // Heuristic: guessing chars size by checking numbers sizes
-              // in the CMap entries.
-              if (token.length == 2 && properties.composite)
-                properties.wideChars = false;
-
-              if (token.length <= 4) {
-                // parsing hex number
-                tokens.push(parseInt(token, 16));
-                token = '';
-              } else {
-                // parsing hex UTF-16BE numbers
-                var str = [];
-                for (var k = 0, kk = token.length; k < kk; k += 4) {
-                  var b = parseInt(token.substr(k, 4), 16);
-                  if (b <= 0x10) {
-                    k += 4;
-                    b = (b << 16) | parseInt(token.substr(k, 4), 16);
-                    b -= 0x10000;
-                    str.push(0xD800 | (b >> 10));
-                    str.push(0xDC00 | (b & 0x3FF));
-                    break;
-                  }
-                  str.push(b);
-                }
-                tokens.push(String.fromCharCode.apply(String, str));
-                token = '';
-              }
-            }
-          } else {
-            token += String.fromCharCode(octet);
-          }
-        }
-      }
-      return charToUnicode;
-    },
-    readCidToGidMap: function PartialEvaluator_readCidToGidMap(cidToGidStream) {
-      // Extract the encoding from the CIDToGIDMap
-      var glyphsData = cidToGidStream.getBytes();
-
-      // Set encoding 0 to later verify the font has an encoding
-      var result = [];
-      for (var j = 0, jj = glyphsData.length; j < jj; j++) {
-        var glyphID = (glyphsData[j++] << 8) | glyphsData[j];
-        if (glyphID == 0)
-          continue;
-
-        var code = j >> 1;
-        result[code] = glyphID;
-      }
-      return result;
-    },
-
-    extractWidths: function PartialEvaluator_extractWidths(dict,
-                                                   xref,
-                                                   descriptor,
-                                                   properties) {
-      var glyphsWidths = [];
-      var defaultWidth = 0;
-      if (properties.composite) {
-        defaultWidth = dict.get('DW') || 1000;
-
-        var widths = dict.get('W');
-        if (widths) {
-          var start = 0, end = 0;
-          for (var i = 0, ii = widths.length; i < ii; i++) {
-            var code = widths[i];
-            if (isArray(code)) {
-              for (var j = 0, jj = code.length; j < jj; j++)
-                glyphsWidths[start++] = code[j];
-              start = 0;
-            } else if (start) {
-              var width = widths[++i];
-              for (var j = start; j <= code; j++)
-                glyphsWidths[j] = width;
-              start = 0;
-            } else {
-              start = code;
-            }
-          }
-        }
-      } else {
-        var firstChar = properties.firstChar;
-        var widths = dict.get('Widths');
-        if (widths) {
-          var j = firstChar;
-          for (var i = 0, ii = widths.length; i < ii; i++)
-            glyphsWidths[j++] = widths[i];
-          defaultWidth = parseFloat(descriptor.get('MissingWidth')) || 0;
-        } else {
-          // Trying get the BaseFont metrics (see comment above).
-          var baseFontName = dict.get('BaseFont');
-          if (isName(baseFontName)) {
-            var metrics = this.getBaseFontMetrics(baseFontName.name);
-
-            glyphsWidths = metrics.widths;
-            defaultWidth = metrics.defaultWidth;
-          }
-        }
-      }
-
-      properties.defaultWidth = defaultWidth;
-      properties.widths = glyphsWidths;
-    },
-
-    getBaseFontMetrics: function PartialEvaluator_getBaseFontMetrics(name) {
-      var defaultWidth = 0, widths = [];
-      var glyphWidths = Metrics[stdFontMap[name] || name];
-      if (isNum(glyphWidths)) {
-        defaultWidth = glyphWidths;
-      } else {
-        widths = glyphWidths;
-      }
-
-      return {
-        defaultWidth: defaultWidth,
-        widths: widths
-      };
-    },
-
-    translateFont: function PartialEvaluator_translateFont(dict,
-                                                           xref,
-                                                           resources,
-                                                           dependency) {
-      var baseDict = dict;
-      var type = dict.get('Subtype');
-      assertWellFormed(isName(type), 'invalid font Subtype');
-
-      var composite = false;
-      if (type.name == 'Type0') {
-        // If font is a composite
-        //  - get the descendant font
-        //  - set the type according to the descendant font
-        //  - get the FontDescriptor from the descendant font
-        var df = dict.get('DescendantFonts');
-        if (!df)
-          return null;
-
-        dict = isArray(df) ? xref.fetchIfRef(df[0]) : df;
-
-        type = dict.get('Subtype');
-        assertWellFormed(isName(type), 'invalid font Subtype');
-        composite = true;
-      }
-      var maxCharIndex = composite ? 0xFFFF : 0xFF;
-
-      var descriptor = dict.get('FontDescriptor');
-      if (!descriptor) {
-        if (type.name == 'Type3') {
-          // FontDescriptor is only required for Type3 fonts when the document
-          // is a tagged pdf. Create a barbebones one to get by.
-          descriptor = new Dict();
-          descriptor.set('FontName', new Name(type.name));
-        } else {
-          // Before PDF 1.5 if the font was one of the base 14 fonts, having a
-          // FontDescriptor was not required.
-          // This case is here for compatibility.
-          var baseFontName = dict.get('BaseFont');
-          if (!isName(baseFontName))
-            return null;
-
-          // Using base font name as a font name.
-          baseFontName = baseFontName.name.replace(/[,_]/g, '-');
-          var metrics = this.getBaseFontMetrics(baseFontName);
-
-          // Simulating descriptor flags attribute
-          var fontNameWoStyle = baseFontName.split('-')[0];
-          var flags = (serifFonts[fontNameWoStyle] ||
-            (fontNameWoStyle.search(/serif/gi) != -1) ? FontFlags.Serif : 0) |
-            (symbolsFonts[fontNameWoStyle] ? FontFlags.Symbolic :
-            FontFlags.Nonsymbolic);
-
-          var properties = {
-            type: type.name,
-            widths: metrics.widths,
-            defaultWidth: metrics.defaultWidth,
-            flags: flags,
-            firstChar: 0,
-            lastChar: maxCharIndex
-          };
-          this.extractDataStructures(dict, dict, xref, properties);
-
-          return {
-            name: baseFontName,
-            dict: baseDict,
-            properties: properties
-          };
-        }
-      }
-
-      // According to the spec if 'FontDescriptor' is declared, 'FirstChar',
-      // 'LastChar' and 'Widths' should exist too, but some PDF encoders seem
-      // to ignore this rule when a variant of a standart font is used.
-      // TODO Fill the width array depending on which of the base font this is
-      // a variant.
-      var firstChar = dict.get('FirstChar') || 0;
-      var lastChar = dict.get('LastChar') || maxCharIndex;
-      var fontName = descriptor.get('FontName');
-      // Some bad pdf's have a string as the font name.
-      if (isString(fontName))
-        fontName = new Name(fontName);
-      assertWellFormed(isName(fontName), 'invalid font name');
-
-      var fontFile = descriptor.get('FontFile', 'FontFile2', 'FontFile3');
-      if (fontFile) {
-        if (fontFile.dict) {
-          var subtype = fontFile.dict.get('Subtype');
-          if (subtype)
-            subtype = subtype.name;
-
-          var length1 = fontFile.dict.get('Length1');
-
-          var length2 = fontFile.dict.get('Length2');
-        }
-      }
-
-      var properties = {
-        type: type.name,
-        subtype: subtype,
-        file: fontFile,
-        length1: length1,
-        length2: length2,
-        composite: composite,
-        wideChars: composite,
-        fixedPitch: false,
-        fontMatrix: dict.get('FontMatrix') || IDENTITY_MATRIX,
-        firstChar: firstChar || 0,
-        lastChar: lastChar || maxCharIndex,
-        bbox: descriptor.get('FontBBox'),
-        ascent: descriptor.get('Ascent'),
-        descent: descriptor.get('Descent'),
-        xHeight: descriptor.get('XHeight'),
-        capHeight: descriptor.get('CapHeight'),
-        flags: descriptor.get('Flags'),
-        italicAngle: descriptor.get('ItalicAngle'),
-        coded: false
-      };
-      this.extractWidths(dict, xref, descriptor, properties);
-      this.extractDataStructures(dict, baseDict, xref, properties);
-
-      if (type.name === 'Type3') {
-        properties.coded = true;
-        var charProcs = dict.get('CharProcs').getAll();
-        var fontResources = dict.get('Resources') || resources;
-        properties.charProcOperatorList = {};
-        for (var key in charProcs) {
-          var glyphStream = charProcs[key];
-          properties.charProcOperatorList[key] =
-            this.getOperatorList(glyphStream, fontResources, dependency);
-        }
-      }
-
-      return {
-        name: fontName.name,
-        dict: baseDict,
-        file: fontFile,
-        properties: properties
-      };
-    }
-  };
-
-  return PartialEvaluator;
-})();
-
-var EvalState = (function EvalStateClosure() {
-  function EvalState() {
-    // Are soft masks and alpha values shapes or opacities?
-    this.alphaIsShape = false;
-    this.fontSize = 0;
-    this.textMatrix = IDENTITY_MATRIX;
-    this.leading = 0;
-    // Start of text line (in text coordinates)
-    this.lineX = 0;
-    this.lineY = 0;
-    // Character and word spacing
-    this.charSpacing = 0;
-    this.wordSpacing = 0;
-    this.textHScale = 1;
-    // Color spaces
-    this.fillColorSpace = null;
-    this.strokeColorSpace = null;
-  }
-  EvalState.prototype = {
-  };
-  return EvalState;
-})();
-
-
-/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
-
-'use strict';
-
-/**
- * Maximum time to wait for a font to be loaded by font-face rules.
- */
-var kMaxWaitForFontFace = 1000;
-
-// Unicode Private Use Area
-var kCmapGlyphOffset = 0xE000;
-var kSizeOfGlyphArea = 0x1900;
-var kSymbolicFontGlyphOffset = 0xF000;
-
-// PDF Glyph Space Units are one Thousandth of a TextSpace Unit
-// except for Type 3 fonts
-var kPDFGlyphSpaceUnits = 1000;
-
-// Until hinting is fully supported this constant can be used
-var kHintingEnabled = false;
-
-var FontFlags = {
-  FixedPitch: 1,
-  Serif: 2,
-  Symbolic: 4,
-  Script: 8,
-  Nonsymbolic: 32,
-  Italic: 64,
-  AllCap: 65536,
-  SmallCap: 131072,
-  ForceBold: 262144
-};
-
-var Encodings = {
-  ExpertEncoding: ['', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-    '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-    'space', 'exclamsmall', 'Hungarumlautsmall', '', 'dollaroldstyle',
-    'dollarsuperior', 'ampersandsmall', 'Acutesmall', 'parenleftsuperior',
-    'parenrightsuperior', 'twodotenleader', 'onedotenleader', 'comma',
-    'hyphen', 'period', 'fraction', 'zerooldstyle', 'oneoldstyle',
-    'twooldstyle', 'threeoldstyle', 'fouroldstyle', 'fiveoldstyle',
-    'sixoldstyle', 'sevenoldstyle', 'eightoldstyle', 'nineoldstyle', 'colon',
-    'semicolon', 'commasuperior', 'threequartersemdash', 'periodsuperior',
-    'questionsmall', '', 'asuperior', 'bsuperior', 'centsuperior', 'dsuperior',
-    'esuperior', '', '', 'isuperior', '', '', 'lsuperior', 'msuperior',
-    'nsuperior', 'osuperior', '', '', 'rsuperior', 'ssuperior', 'tsuperior',
-    '', 'ff', 'fi', 'fl', 'ffi', 'ffl', 'parenleftinferior', '',
-    'parenrightinferior', 'Circumflexsmall', 'hyphensuperior', 'Gravesmall',
-    'Asmall', 'Bsmall', 'Csmall', 'Dsmall', 'Esmall', 'Fsmall', 'Gsmall',
-    'Hsmall', 'Ismall', 'Jsmall', 'Ksmall', 'Lsmall', 'Msmall', 'Nsmall',
-    'Osmall', 'Psmall', 'Qsmall', 'Rsmall', 'Ssmall', 'Tsmall', 'Usmall',
-    'Vsmall', 'Wsmall', 'Xsmall', 'Ysmall', 'Zsmall', 'colonmonetary',
-    'onefitted', 'rupiah', 'Tildesmall', '', '', '', '', '', '', '', '', '',
-    '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-    '', '', '', '', '', '', 'exclamdownsmall', 'centoldstyle', 'Lslashsmall',
-    '', '', 'Scaronsmall', 'Zcaronsmall', 'Dieresissmall', 'Brevesmall',
-    'Caronsmall', '', 'Dotaccentsmall', '', '', 'Macronsmall', '', '',
-    'figuredash', 'hypheninferior', '', '', 'Ogoneksmall', 'Ringsmall',
-    'Cedillasmall', '', '', '', 'onequarter', 'onehalf', 'threequarters',
-    'questiondownsmall', 'oneeighth', 'threeeighths', 'fiveeighths',
-    'seveneighths', 'onethird', 'twothirds', '', '', 'zerosuperior',
-    'onesuperior', 'twosuperior', 'threesuperior', 'foursuperior',
-    'fivesuperior', 'sixsuperior', 'sevensuperior', 'eightsuperior',
-    'ninesuperior', 'zeroinferior', 'oneinferior', 'twoinferior',
-    'threeinferior', 'fourinferior', 'fiveinferior', 'sixinferior',
-    'seveninferior', 'eightinferior', 'nineinferior', 'centinferior',
-    'dollarinferior', 'periodinferior', 'commainferior', 'Agravesmall',
-    'Aacutesmall', 'Acircumflexsmall', 'Atildesmall', 'Adieresissmall',
-    'Aringsmall', 'AEsmall', 'Ccedillasmall', 'Egravesmall', 'Eacutesmall',
-    'Ecircumflexsmall', 'Edieresissmall', 'Igravesmall', 'Iacutesmall',
-    'Icircumflexsmall', 'Idieresissmall', 'Ethsmall', 'Ntildesmall',
-    'Ogravesmall', 'Oacutesmall', 'Ocircumflexsmall', 'Otildesmall',
-    'Odieresissmall', 'OEsmall', 'Oslashsmall', 'Ugravesmall', 'Uacutesmall',
-    'Ucircumflexsmall', 'Udieresissmall', 'Yacutesmall', 'Thornsmall',
-    'Ydieresissmall'],
-  MacExpertEncoding: ['', '', '', '', '', '', '', '', '', '', '', '', '', '',
-    '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-    'space', 'exclamsmall', 'Hungarumlautsmall', 'centoldstyle',
-    'dollaroldstyle', 'dollarsuperior', 'ampersandsmall', 'Acutesmall',
-    'parenleftsuperior', 'parenrightsuperior', 'twodotenleader',
-    'onedotenleader', 'comma', 'hyphen', 'period', 'fraction', 'zerooldstyle',
-    'oneoldstyle', 'twooldstyle', 'threeoldstyle', 'fouroldstyle',
-    'fiveoldstyle', 'sixoldstyle', 'sevenoldstyle', 'eightoldstyle',
-    'nineoldstyle', 'colon', 'semicolon', '', 'threequartersemdash', '',
-    'questionsmall', '', '', '', '', 'Ethsmall', '', '', 'onequarter',
-    'onehalf', 'threequarters', 'oneeighth', 'threeeighths', 'fiveeighths',
-    'seveneighths', 'onethird', 'twothirds', '', '', '', '', '', '', 'ff',
-    'fi', 'fl', 'ffi', 'ffl', 'parenleftinferior', '', 'parenrightinferior',
-    'Circumflexsmall', 'hypheninferior', 'Gravesmall', 'Asmall', 'Bsmall',
-    'Csmall', 'Dsmall', 'Esmall', 'Fsmall', 'Gsmall', 'Hsmall', 'Ismall',
-    'Jsmall', 'Ksmall', 'Lsmall', 'Msmall', 'Nsmall', 'Osmall', 'Psmall',
-    'Qsmall', 'Rsmall', 'Ssmall', 'Tsmall', 'Usmall', 'Vsmall', 'Wsmall',
-    'Xsmall', 'Ysmall', 'Zsmall', 'colonmonetary', 'onefitted', 'rupiah',
-    'Tildesmall', '', '', 'asuperior', 'centsuperior', '', '', '', '',
-    'Aacutesmall', 'Agravesmall', 'Acircumflexsmall', 'Adieresissmall',
-    'Atildesmall', 'Aringsmall', 'Ccedillasmall', 'Eacutesmall', 'Egravesmall',
-    'Ecircumflexsmall', 'Edieresissmall', 'Iacutesmall', 'Igravesmall',
-    'Icircumflexsmall', 'Idieresissmall', 'Ntildesmall', 'Oacutesmall',
-    'Ogravesmall', 'Ocircumflexsmall', 'Odieresissmall', 'Otildesmall',
-    'Uacutesmall', 'Ugravesmall', 'Ucircumflexsmall', 'Udieresissmall', '',
-    'eightsuperior', 'fourinferior', 'threeinferior', 'sixinferior',
-    'eightinferior', 'seveninferior', 'Scaronsmall', '', 'centinferior',
-    'twoinferior', '', 'Dieresissmall', '', 'Caronsmall', 'osuperior',
-    'fiveinferior', '', 'commainferior', 'periodinferior', 'Yacutesmall', '',
-    'dollarinferior', '', 'Thornsmall', '', 'nineinferior', 'zeroinferior',
-    'Zcaronsmall', 'AEsmall', 'Oslashsmall', 'questiondownsmall',
-    'oneinferior', 'Lslashsmall', '', '', '', '', '', '', 'Cedillasmall', '',
-    '', '', '', '', 'OEsmall', 'figuredash', 'hyphensuperior', '', '', '', '',
-    'exclamdownsmall', '', 'Ydieresissmall', '', 'onesuperior', 'twosuperior',
-    'threesuperior', 'foursuperior', 'fivesuperior', 'sixsuperior',
-    'sevensuperior', 'ninesuperior', 'zerosuperior', '', 'esuperior',
-    'rsuperior', 'tsuperior', '', '', 'isuperior', 'ssuperior', 'dsuperior',
-    '', '', '', '', '', 'lsuperior', 'Ogoneksmall', 'Brevesmall',
-    'Macronsmall', 'bsuperior', 'nsuperior', 'msuperior', 'commasuperior',
-    'periodsuperior', 'Dotaccentsmall', 'Ringsmall'],
-  MacRomanEncoding: ['', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-    '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-    'space', 'exclam', 'quotedbl', 'numbersign', 'dollar', 'percent',
-    'ampersand', 'quotesingle', 'parenleft', 'parenright', 'asterisk', 'plus',
-    'comma', 'hyphen', 'period', 'slash', 'zero', 'one', 'two', 'three',
-    'four', 'five', 'six', 'seven', 'eight', 'nine', 'colon', 'semicolon',
-    'less', 'equal', 'greater', 'question', 'at', 'A', 'B', 'C', 'D', 'E', 'F',
-    'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U',
-    'V', 'W', 'X', 'Y', 'Z', 'bracketleft', 'backslash', 'bracketright',
-    'asciicircum', 'underscore', 'grave', 'a', 'b', 'c', 'd', 'e', 'f', 'g',
-    'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v',
-    'w', 'x', 'y', 'z', 'braceleft', 'bar', 'braceright', 'asciitilde', '',
-    'Adieresis', 'Aring', 'Ccedilla', 'Eacute', 'Ntilde', 'Odieresis',
-    'Udieresis', 'aacute', 'agrave', 'acircumflex', 'adieresis', 'atilde',
-    'aring', 'ccedilla', 'eacute', 'egrave', 'ecircumflex', 'edieresis',
-    'iacute', 'igrave', 'icircumflex', 'idieresis', 'ntilde', 'oacute',
-    'ograve', 'ocircumflex', 'odieresis', 'otilde', 'uacute', 'ugrave',
-    'ucircumflex', 'udieresis', 'dagger', 'degree', 'cent', 'sterling',
-    'section', 'bullet', 'paragraph', 'germandbls', 'registered', 'copyright',
-    'trademark', 'acute', 'dieresis', 'notequal', 'AE', 'Oslash', 'infinity',
-    'plusminus', 'lessequal', 'greaterequal', 'yen', 'mu', 'partialdiff',
-    'summation', 'product', 'pi', 'integral', 'ordfeminine', 'ordmasculine',
-    'Omega', 'ae', 'oslash', 'questiondown', 'exclamdown', 'logicalnot',
-    'radical', 'florin', 'approxequal', 'Delta', 'guillemotleft',
-    'guillemotright', 'ellipsis', '', 'Agrave', 'Atilde', 'Otilde', 'OE',
-    'oe', 'endash', 'emdash', 'quotedblleft', 'quotedblright', 'quoteleft',
-    'quoteright', 'divide', 'lozenge', 'ydieresis', 'Ydieresis', 'fraction',
-    'currency', 'guilsinglleft', 'guilsinglright', 'fi', 'fl', 'daggerdbl',
-    'periodcentered', 'quotesinglbase', 'quotedblbase', 'perthousand',
-    'Acircumflex', 'Ecircumflex', 'Aacute', 'Edieresis', 'Egrave', 'Iacute',
-    'Icircumflex', 'Idieresis', 'Igrave', 'Oacute', 'Ocircumflex', 'apple',
-    'Ograve', 'Uacute', 'Ucircumflex', 'Ugrave', 'dotlessi', 'circumflex',
-    'tilde', 'macron', 'breve', 'dotaccent', 'ring', 'cedilla', 'hungarumlaut',
-    'ogonek', 'caron'],
-  StandardEncoding: ['', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-    '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-    'space', 'exclam', 'quotedbl', 'numbersign', 'dollar', 'percent',
-    'ampersand', 'quoteright', 'parenleft', 'parenright', 'asterisk', 'plus',
-    'comma', 'hyphen', 'period', 'slash', 'zero', 'one', 'two', 'three',
-    'four', 'five', 'six', 'seven', 'eight', 'nine', 'colon', 'semicolon',
-    'less', 'equal', 'greater', 'question', 'at', 'A', 'B', 'C', 'D', 'E', 'F',
-    'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U',
-    'V', 'W', 'X', 'Y', 'Z', 'bracketleft', 'backslash', 'bracketright',
-    'asciicircum', 'underscore', 'quoteleft', 'a', 'b', 'c', 'd', 'e', 'f',
-    'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u',
-    'v', 'w', 'x', 'y', 'z', 'braceleft', 'bar', 'braceright', 'asciitilde',
-    '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-    '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', 'exclamdown',
-    'cent', 'sterling', 'fraction', 'yen', 'florin', 'section', 'currency',
-    'quotesingle', 'quotedblleft', 'guillemotleft', 'guilsinglleft',
-    'guilsinglright', 'fi', 'fl', '', 'endash', 'dagger', 'daggerdbl',
-    'periodcentered', '', 'paragraph', 'bullet', 'quotesinglbase',
-    'quotedblbase', 'quotedblright', 'guillemotright', 'ellipsis',
-    'perthousand', '', 'questiondown', '', 'grave', 'acute', 'circumflex',
-    'tilde', 'macron', 'breve', 'dotaccent', 'dieresis', '', 'ring', 'cedilla',
-    '', 'hungarumlaut', 'ogonek', 'caron', 'emdash', '', '', '', '', '', '',
-    '', '', '', '', '', '', '', '', '', '', 'AE', '', 'ordfeminine', '', '',
-    '', '', 'Lslash', 'Oslash', 'OE', 'ordmasculine', '', '', '', '', '', 'ae',
-    '', '', '', 'dotlessi', '', '', 'lslash', 'oslash', 'oe', 'germandbls'],
-  WinAnsiEncoding: ['', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-    '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-    'space', 'exclam', 'quotedbl', 'numbersign', 'dollar', 'percent',
-    'ampersand', 'quotesingle', 'parenleft', 'parenright', 'asterisk', 'plus',
-    'comma', 'hyphen', 'period', 'slash', 'zero', 'one', 'two', 'three',
-    'four', 'five', 'six', 'seven', 'eight', 'nine', 'colon', 'semicolon',
-    'less', 'equal', 'greater', 'question', 'at', 'A', 'B', 'C', 'D', 'E', 'F',
-    'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U',
-    'V', 'W', 'X', 'Y', 'Z', 'bracketleft', 'backslash', 'bracketright',
-    'asciicircum', 'underscore', 'grave', 'a', 'b', 'c', 'd', 'e', 'f', 'g',
-    'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v',
-    'w', 'x', 'y', 'z', 'braceleft', 'bar', 'braceright', 'asciitilde',
-    'bullet', 'Euro', 'bullet', 'quotesinglbase', 'florin', 'quotedblbase',
-    'ellipsis', 'dagger', 'daggerdbl', 'circumflex', 'perthousand', 'Scaron',
-    'guilsinglleft', 'OE', 'bullet', 'Zcaron', 'bullet', 'bullet', 'quoteleft',
-    'quoteright', 'quotedblleft', 'quotedblright', 'bullet', 'endash',
-    'emdash', 'tilde', 'trademark', 'scaron', 'guilsinglright', 'oe', 'bullet',
-    'zcaron', 'Ydieresis', '', 'exclamdown', 'cent', 'sterling',
-    'currency', 'yen', 'brokenbar', 'section', 'dieresis', 'copyright',
-    'ordfeminine', 'guillemotleft', 'logicalnot', 'hyphen', 'registered',
-    'macron', 'degree', 'plusminus', 'twosuperior', 'threesuperior', 'acute',
-    'mu', 'paragraph', 'periodcentered', 'cedilla', 'onesuperior',
-    'ordmasculine', 'guillemotright', 'onequarter', 'onehalf', 'threequarters',
-    'questiondown', 'Agrave', 'Aacute', 'Acircumflex', 'Atilde', 'Adieresis',
-    'Aring', 'AE', 'Ccedilla', 'Egrave', 'Eacute', 'Ecircumflex', 'Edieresis',
-    'Igrave', 'Iacute', 'Icircumflex', 'Idieresis', 'Eth', 'Ntilde', 'Ograve',
-    'Oacute', 'Ocircumflex', 'Otilde', 'Odieresis', 'multiply', 'Oslash',
-    'Ugrave', 'Uacute', 'Ucircumflex', 'Udieresis', 'Yacute', 'Thorn',
-    'germandbls', 'agrave', 'aacute', 'acircumflex', 'atilde', 'adieresis',
-    'aring', 'ae', 'ccedilla', 'egrave', 'eacute', 'ecircumflex', 'edieresis',
-    'igrave', 'iacute', 'icircumflex', 'idieresis', 'eth', 'ntilde', 'ograve',
-    'oacute', 'ocircumflex', 'otilde', 'odieresis', 'divide', 'oslash',
-    'ugrave', 'uacute', 'ucircumflex', 'udieresis', 'yacute', 'thorn',
-    'ydieresis'],
-  symbolsEncoding: ['', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-    '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-    'space', 'exclam', 'universal', 'numbersign', 'existential', 'percent',
-    'ampersand', 'suchthat', 'parenleft', 'parenright', 'asteriskmath', 'plus',
-    'comma', 'minus', 'period', 'slash', 'zero', 'one', 'two', 'three', 'four',
-    'five', 'six', 'seven', 'eight', 'nine', 'colon', 'semicolon', 'less',
-    'equal', 'greater', 'question', 'congruent', 'Alpha', 'Beta', 'Chi',
-    'Delta', 'Epsilon', 'Phi', 'Gamma', 'Eta', 'Iota', 'theta1', 'Kappa',
-    'Lambda', 'Mu', 'Nu', 'Omicron', 'Pi', 'Theta', 'Rho', 'Sigma', 'Tau',
-    'Upsilon', 'sigma1', 'Omega', 'Xi', 'Psi', 'Zeta', 'bracketleft',
-    'therefore', 'bracketright', 'perpendicular', 'underscore', 'radicalex',
-    'alpha', 'beta', 'chi', 'delta', 'epsilon', 'phi', 'gamma', 'eta', 'iota',
-    'phi1', 'kappa', 'lambda', 'mu', 'nu', 'omicron', 'pi', 'theta', 'rho',
-    'sigma', 'tau', 'upsilon', 'omega1', 'omega', 'xi', 'psi', 'zeta',
-    'braceleft', 'bar', 'braceright', 'similar', '', '', '', '', '', '', '',
-    '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-    '', '', '', '', '', '', '', 'Euro', 'Upsilon1', 'minute', 'lessequal',
-    'fraction', 'infinity', 'florin', 'club', 'diamond', 'heart', 'spade',
-    'arrowboth', 'arrowleft', 'arrowup', 'arrowright', 'arrowdown', 'degree',
-    'plusminus', 'second', 'greaterequal', 'multiply', 'proportional',
-    'partialdiff', 'bullet', 'divide', 'notequal', 'equivalence',
-    'approxequal', 'ellipsis', 'arrowvertex', 'arrowhorizex', 'carriagereturn',
-    'aleph', 'Ifraktur', 'Rfraktur', 'weierstrass', 'circlemultiply',
-    'circleplus', 'emptyset', 'intersection', 'union', 'propersuperset',
-    'reflexsuperset', 'notsubset', 'propersubset', 'reflexsubset', 'element',
-    'notelement', 'angle', 'gradient', 'registerserif', 'copyrightserif',
-    'trademarkserif', 'product', 'radical', 'dotmath', 'logicalnot',
-    'logicaland', 'logicalor', 'arrowdblboth', 'arrowdblleft', 'arrowdblup',
-    'arrowdblright', 'arrowdbldown', 'lozenge', 'angleleft', 'registersans',
-    'copyrightsans', 'trademarksans', 'summation', 'parenlefttp',
-    'parenleftex', 'parenleftbt', 'bracketlefttp', 'bracketleftex',
-    'bracketleftbt', 'bracelefttp', 'braceleftmid', 'braceleftbt', 'braceex',
-    '', 'angleright', 'integral', 'integraltp', 'integralex', 'integralbt',
-    'parenrighttp', 'parenrightex', 'parenrightbt', 'bracketrighttp',
-    'bracketrightex', 'bracketrightbt', 'bracerighttp', 'bracerightmid',
-    'bracerightbt'],
-  zapfDingbatsEncoding: ['', '', '', '', '', '', '', '', '', '', '', '', '', '',
-    '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-    'space', 'a1', 'a2', 'a202', 'a3', 'a4', 'a5', 'a119', 'a118', 'a117',
-    'a11', 'a12', 'a13', 'a14', 'a15', 'a16', 'a105', 'a17', 'a18', 'a19',
-    'a20', 'a21', 'a22', 'a23', 'a24', 'a25', 'a26', 'a27', 'a28', 'a6', 'a7',
-    'a8', 'a9', 'a10', 'a29', 'a30', 'a31', 'a32', 'a33', 'a34', 'a35', 'a36',
-    'a37', 'a38', 'a39', 'a40', 'a41', 'a42', 'a43', 'a44', 'a45', 'a46',
-    'a47', 'a48', 'a49', 'a50', 'a51', 'a52', 'a53', 'a54', 'a55', 'a56',
-    'a57', 'a58', 'a59', 'a60', 'a61', 'a62', 'a63', 'a64', 'a65', 'a66',
-    'a67', 'a68', 'a69', 'a70', 'a71', 'a72', 'a73', 'a74', 'a203', 'a75',
-    'a204', 'a76', 'a77', 'a78', 'a79', 'a81', 'a82', 'a83', 'a84', 'a97',
-    'a98', 'a99', 'a100', '', '', '', '', '', '', '', '', '', '', '', '', '',
-    '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-    '', '', 'a101', 'a102', 'a103', 'a104', 'a106', 'a107', 'a108', 'a112',
-    'a111', 'a110', 'a109', 'a120', 'a121', 'a122', 'a123', 'a124', 'a125',
-    'a126', 'a127', 'a128', 'a129', 'a130', 'a131', 'a132', 'a133', 'a134',
-    'a135', 'a136', 'a137', 'a138', 'a139', 'a140', 'a141', 'a142', 'a143',
-    'a144', 'a145', 'a146', 'a147', 'a148', 'a149', 'a150', 'a151', 'a152',
-    'a153', 'a154', 'a155', 'a156', 'a157', 'a158', 'a159', 'a160', 'a161',
-    'a163', 'a164', 'a196', 'a165', 'a192', 'a166', 'a167', 'a168', 'a169',
-    'a170', 'a171', 'a172', 'a173', 'a162', 'a174', 'a175', 'a176', 'a177',
-    'a178', 'a179', 'a193', 'a180', 'a199', 'a181', 'a200', 'a182', '', 'a201',
-    'a183', 'a184', 'a197', 'a185', 'a194', 'a198', 'a186', 'a195', 'a187',
-    'a188', 'a189', 'a190', 'a191']
-};
-
-/**
- * Hold a map of decoded fonts and of the standard fourteen Type1
- * fonts and their acronyms.
- */
-var stdFontMap = {
-  'ArialNarrow': 'Helvetica',
-  'ArialNarrow-Bold': 'Helvetica-Bold',
-  'ArialNarrow-BoldItalic': 'Helvetica-BoldOblique',
-  'ArialNarrow-Italic': 'Helvetica-Oblique',
-  'ArialBlack': 'Helvetica',
-  'ArialBlack-Bold': 'Helvetica-Bold',
-  'ArialBlack-BoldItalic': 'Helvetica-BoldOblique',
-  'ArialBlack-Italic': 'Helvetica-Oblique',
-  'Arial': 'Helvetica',
-  'Arial-Bold': 'Helvetica-Bold',
-  'Arial-BoldItalic': 'Helvetica-BoldOblique',
-  'Arial-Italic': 'Helvetica-Oblique',
-  'Arial-BoldItalicMT': 'Helvetica-BoldOblique',
-  'Arial-BoldMT': 'Helvetica-Bold',
-  'Arial-ItalicMT': 'Helvetica-Oblique',
-  'ArialMT': 'Helvetica',
-  'Courier-Bold': 'Courier-Bold',
-  'Courier-BoldItalic': 'Courier-BoldOblique',
-  'Courier-Italic': 'Courier-Oblique',
-  'CourierNew': 'Courier',
-  'CourierNew-Bold': 'Courier-Bold',
-  'CourierNew-BoldItalic': 'Courier-BoldOblique',
-  'CourierNew-Italic': 'Courier-Oblique',
-  'CourierNewPS-BoldItalicMT': 'Courier-BoldOblique',
-  'CourierNewPS-BoldMT': 'Courier-Bold',
-  'CourierNewPS-ItalicMT': 'Courier-Oblique',
-  'CourierNewPSMT': 'Courier',
-  'Helvetica-Bold': 'Helvetica-Bold',
-  'Helvetica-BoldItalic': 'Helvetica-BoldOblique',
-  'Helvetica-Italic': 'Helvetica-Oblique',
-  'Symbol-Bold': 'Symbol',
-  'Symbol-BoldItalic': 'Symbol',
-  'Symbol-Italic': 'Symbol',
-  'TimesNewRoman': 'Times-Roman',
-  'TimesNewRoman-Bold': 'Times-Bold',
-  'TimesNewRoman-BoldItalic': 'Times-BoldItalic',
-  'TimesNewRoman-Italic': 'Times-Italic',
-  'TimesNewRomanPS': 'Times-Roman',
-  'TimesNewRomanPS-Bold': 'Times-Bold',
-  'TimesNewRomanPS-BoldItalic': 'Times-BoldItalic',
-  'TimesNewRomanPS-BoldItalicMT': 'Times-BoldItalic',
-  'TimesNewRomanPS-BoldMT': 'Times-Bold',
-  'TimesNewRomanPS-Italic': 'Times-Italic',
-  'TimesNewRomanPS-ItalicMT': 'Times-Italic',
-  'TimesNewRomanPSMT': 'Times-Roman',
-  'TimesNewRomanPSMT-Bold': 'Times-Bold',
-  'TimesNewRomanPSMT-BoldItalic': 'Times-BoldItalic',
-  'TimesNewRomanPSMT-Italic': 'Times-Italic'
-};
-
-/**
- * Holds the map of the non-standard fonts that might be included as a standard
- * fonts without glyph data.
- */
-var nonStdFontMap = {
-  'ComicSansMS': 'Comic Sans MS',
-  'ComicSansMS-Bold': 'Comic Sans MS-Bold',
-  'ComicSansMS-BoldItalic': 'Comic Sans MS-BoldItalic',
-  'ComicSansMS-Italic': 'Comic Sans MS-Italic',
-  'LucidaConsole': 'Courier',
-  'LucidaConsole-Bold': 'Courier-Bold',
-  'LucidaConsole-BoldItalic': 'Courier-BoldOblique',
-  'LucidaConsole-Italic': 'Courier-Oblique'
-};
-
-var serifFonts = {
-  'Adobe Jenson': true, 'Adobe Text': true, 'Albertus': true,
-  'Aldus': true, 'Alexandria': true, 'Algerian': true,
-  'American Typewriter': true, 'Antiqua': true, 'Apex': true,
-  'Arno': true, 'Aster': true, 'Aurora': true,
-  'Baskerville': true, 'Bell': true, 'Bembo': true,
-  'Bembo Schoolbook': true, 'Benguiat': true, 'Berkeley Old Style': true,
-  'Bernhard Modern': true, 'Berthold City': true, 'Bodoni': true,
-  'Bauer Bodoni': true, 'Book Antiqua': true, 'Bookman': true,
-  'Bordeaux Roman': true, 'Californian FB': true, 'Calisto': true,
-  'Calvert': true, 'Capitals': true, 'Cambria': true,
-  'Cartier': true, 'Caslon': true, 'Catull': true,
-  'Centaur': true, 'Century Old Style': true, 'Century Schoolbook': true,
-  'Chaparral': true, 'Charis SIL': true, 'Cheltenham': true,
-  'Cholla Slab': true, 'Clarendon': true, 'Clearface': true,
-  'Cochin': true, 'Colonna': true, 'Computer Modern': true,
-  'Concrete Roman': true, 'Constantia': true, 'Cooper Black': true,
-  'Corona': true, 'Ecotype': true, 'Egyptienne': true,
-  'Elephant': true, 'Excelsior': true, 'Fairfield': true,
-  'FF Scala': true, 'Folkard': true, 'Footlight': true,
-  'FreeSerif': true, 'Friz Quadrata': true, 'Garamond': true,
-  'Gentium': true, 'Georgia': true, 'Gloucester': true,
-  'Goudy Old Style': true, 'Goudy Schoolbook': true, 'Goudy Pro Font': true,
-  'Granjon': true, 'Guardian Egyptian': true, 'Heather': true,
-  'Hercules': true, 'High Tower Text': true, 'Hiroshige': true,
-  'Hoefler Text': true, 'Humana Serif': true, 'Imprint': true,
-  'Ionic No. 5': true, 'Janson': true, 'Joanna': true,
-  'Korinna': true, 'Lexicon': true, 'Liberation Serif': true,
-  'Linux Libertine': true, 'Literaturnaya': true, 'Lucida': true,
-  'Lucida Bright': true, 'Melior': true, 'Memphis': true,
-  'Miller': true, 'Minion': true, 'Modern': true,
-  'Mona Lisa': true, 'Mrs Eaves': true, 'MS Serif': true,
-  'Museo Slab': true, 'New York': true, 'Nimbus Roman': true,
-  'NPS Rawlinson Roadway': true, 'Palatino': true, 'Perpetua': true,
-  'Plantin': true, 'Plantin Schoolbook': true, 'Playbill': true,
-  'Poor Richard': true, 'Rawlinson Roadway': true, 'Renault': true,
-  'Requiem': true, 'Rockwell': true, 'Roman': true,
-  'Rotis Serif': true, 'Sabon': true, 'Scala': true,
-  'Seagull': true, 'Sistina': true, 'Souvenir': true,
-  'STIX': true, 'Stone Informal': true, 'Stone Serif': true,
-  'Sylfaen': true, 'Times': true, 'Trajan': true,
-  'Trinité': true, 'Trump Mediaeval': true, 'Utopia': true,
-  'Vale Type': true, 'Bitstream Vera': true, 'Vera Serif': true,
-  'Versailles': true, 'Wanted': true, 'Weiss': true,
-  'Wide Latin': true, 'Windsor': true, 'XITS': true
-};
-
-var symbolsFonts = {
-  'Dingbats': true, 'Symbol': true, 'ZapfDingbats': true
-};
-
-// Some characters, e.g. copyrightserif, mapped to the private use area and
-// might not be displayed using standard fonts. Mapping/hacking well-known chars
-// to the similar equivalents in the normal characters range.
-function mapPrivateUseChars(code) {
-  switch (code) {
-    case 0xF8E9: // copyrightsans
-    case 0xF6D9: // copyrightserif
-      return 0x00A9; // copyright
-    default:
-      return code;
-  }
-}
-
-var FontLoader = {
-  listeningForFontLoad: false,
-
-  bind: function fontLoaderBind(fonts, callback) {
-    function checkFontsLoaded() {
-      for (var i = 0, ii = fonts.length; i < ii; i++) {
-        var fontObj = fonts[i];
-        if (fontObj.loading) {
-          return false;
-        }
-      }
-
-      document.documentElement.removeEventListener(
-        'pdfjsFontLoad', checkFontsLoaded, false);
-
-      callback();
-      return true;
-    }
-
-    var rules = [], names = [], fontsToLoad = [];
-    var fontCreateTimer = 0;
-
-    for (var i = 0, ii = fonts.length; i < ii; i++) {
-      var font = fonts[i];
-
-      // Add the font to the DOM only once or skip if the font
-      // is already loaded.
-      if (font.attached || font.loading == false) {
-        continue;
-      }
-      font.attached = true;
-
-      fontsToLoad.push(font);
-
-      var str = '';
-      var data = font.data;
-      if (data) {
-        var length = data.length;
-        for (var j = 0; j < length; j++)
-          str += String.fromCharCode(data[j]);
-
-        var rule = font.bindDOM(str);
-        if (rule) {
-          rules.push(rule);
-          names.push(font.loadedName);
-        }
-      }
-    }
-
-    this.listeningForFontLoad = false;
-    if (!isWorker && rules.length) {
-      FontLoader.prepareFontLoadEvent(rules, names, fontsToLoad);
-    }
-
-    if (!checkFontsLoaded()) {
-      document.documentElement.addEventListener(
-        'pdfjsFontLoad', checkFontsLoaded, false);
-    }
-  },
-  // Set things up so that at least one pdfjsFontLoad event is
-  // dispatched when all the @font-face |rules| for |names| have been
-  // loaded in a subdocument.  It's expected that the load of |rules|
-  // has already started in this (outer) document, so that they should
-  // be ordered before the load in the subdocument.
-  prepareFontLoadEvent: function fontLoaderPrepareFontLoadEvent(rules, names,
-                                                                fonts) {
-      /** Hack begin */
-      // There's no event when a font has finished downloading so the
-      // following code is a dirty hack to 'guess' when a font is
-      // ready.  This code will be obsoleted by Mozilla bug 471915.
-      //
-      // The only reliable way to know if a font is loaded in Gecko
-      // (at the moment) is document.onload in a document with
-      // a @font-face rule defined in a "static" stylesheet.  We use a
-      // subdocument in an <iframe>, set up properly, to know when
-      // our @font-face rule was loaded.  However, the subdocument and
-      // outer document can't share CSS rules, so the inner document
-      // is only part of the puzzle.  The second piece is an invisible
-      // div created in order to force loading of the @font-face in
-      // the *outer* document.  (The font still needs to be loaded for
-      // its metrics, for reflow).  We create the div first for the
-      // outer document, then create the iframe.  Unless something
-      // goes really wonkily, we expect the @font-face for the outer
-      // document to be processed before the inner.  That's still
-      // fragile, but seems to work in practice.
-      //
-      // The postMessage() hackery was added to work around chrome bug
-      // 82402.
-
-      // Validate the names parameter -- the values can used to construct HTML.
-      if (!/^\w+$/.test(names.join(''))) {
-        error('Invalid font name(s): ' + names.join());
-
-        // Normally the error-function throws. But if a malicious code
-        // intercepts the function call then the return is needed.
-        return;
-      }
-
-      var div = document.createElement('div');
-      div.setAttribute('style',
-                       'visibility: hidden;' +
-                       'width: 10px; height: 10px;' +
-                       'position: absolute; top: 0px; left: 0px;');
-      var html = '';
-      for (var i = 0, ii = names.length; i < ii; ++i) {
-        html += '<span style="font-family:' + names[i] + '">Hi</span>';
-      }
-      div.innerHTML = html;
-      document.body.appendChild(div);
-
-      if (!this.listeningForFontLoad) {
-        window.addEventListener(
-          'message',
-          function fontLoaderMessage(e) {
-            var fontNames = JSON.parse(e.data);
-            for (var i = 0, ii = fonts.length; i < ii; ++i) {
-              var font = fonts[i];
-              font.loading = false;
-            }
-            var evt = document.createEvent('Events');
-            evt.initEvent('pdfjsFontLoad', true, false);
-            document.documentElement.dispatchEvent(evt);
-          },
-          false);
-        this.listeningForFontLoad = true;
-      }
-
-      // XXX we should have a time-out here too, and maybe fire
-      // pdfjsFontLoadFailed?
-      var src = '<!DOCTYPE HTML><html><head>';
-      src += '<style type="text/css">';
-      for (var i = 0, ii = rules.length; i < ii; ++i) {
-        src += rules[i];
-      }
-      src += '</style>';
-      src += '<script type="application/javascript">';
-      var fontNamesArray = '';
-      for (var i = 0, ii = names.length; i < ii; ++i) {
-        fontNamesArray += '"' + names[i] + '", ';
-      }
-      src += '  var fontNames=[' + fontNamesArray + '];\n';
-      src += '  window.onload = function fontLoaderOnload() {\n';
-      src += '    parent.postMessage(JSON.stringify(fontNames), "*");\n';
-      src += '  }';
-      // Hack so the end script tag isn't counted if this is inline JS.
-      src += '</scr' + 'ipt></head><body>';
-      for (var i = 0, ii = names.length; i < ii; ++i) {
-        src += '<p style="font-family:\'' + names[i] + '\'">Hi</p>';
-      }
-      src += '</body></html>';
-      var frame = document.createElement('iframe');
-      frame.src = 'data:text/html,' + src;
-      frame.setAttribute('style',
-                         'visibility: hidden;' +
-                         'width: 10px; height: 10px;' +
-                         'position: absolute; top: 0px; left: 0px;');
-      document.body.appendChild(frame);
-      /** Hack end */
-  }
-};
-
-var UnicodeRanges = [
-  { 'begin': 0x0000, 'end': 0x007F }, // Basic Latin
-  { 'begin': 0x0080, 'end': 0x00FF }, // Latin-1 Supplement
-  { 'begin': 0x0100, 'end': 0x017F }, // Latin Extended-A
-  { 'begin': 0x0180, 'end': 0x024F }, // Latin Extended-B
-  { 'begin': 0x0250, 'end': 0x02AF }, // IPA Extensions
-  { 'begin': 0x02B0, 'end': 0x02FF }, // Spacing Modifier Letters
-  { 'begin': 0x0300, 'end': 0x036F }, // Combining Diacritical Marks
-  { 'begin': 0x0370, 'end': 0x03FF }, // Greek and Coptic
-  { 'begin': 0x2C80, 'end': 0x2CFF }, // Coptic
-  { 'begin': 0x0400, 'end': 0x04FF }, // Cyrillic
-  { 'begin': 0x0530, 'end': 0x058F }, // Armenian
-  { 'begin': 0x0590, 'end': 0x05FF }, // Hebrew
-  { 'begin': 0xA500, 'end': 0xA63F }, // Vai
-  { 'begin': 0x0600, 'end': 0x06FF }, // Arabic
-  { 'begin': 0x07C0, 'end': 0x07FF }, // NKo
-  { 'begin': 0x0900, 'end': 0x097F }, // Devanagari
-  { 'begin': 0x0980, 'end': 0x09FF }, // Bengali
-  { 'begin': 0x0A00, 'end': 0x0A7F }, // Gurmukhi
-  { 'begin': 0x0A80, 'end': 0x0AFF }, // Gujarati
-  { 'begin': 0x0B00, 'end': 0x0B7F }, // Oriya
-  { 'begin': 0x0B80, 'end': 0x0BFF }, // Tamil
-  { 'begin': 0x0C00, 'end': 0x0C7F }, // Telugu
-  { 'begin': 0x0C80, 'end': 0x0CFF }, // Kannada
-  { 'begin': 0x0D00, 'end': 0x0D7F }, // Malayalam
-  { 'begin': 0x0E00, 'end': 0x0E7F }, // Thai
-  { 'begin': 0x0E80, 'end': 0x0EFF }, // Lao
-  { 'begin': 0x10A0, 'end': 0x10FF }, // Georgian
-  { 'begin': 0x1B00, 'end': 0x1B7F }, // Balinese
-  { 'begin': 0x1100, 'end': 0x11FF }, // Hangul Jamo
-  { 'begin': 0x1E00, 'end': 0x1EFF }, // Latin Extended Additional
-  { 'begin': 0x1F00, 'end': 0x1FFF }, // Greek Extended
-  { 'begin': 0x2000, 'end': 0x206F }, // General Punctuation
-  { 'begin': 0x2070, 'end': 0x209F }, // Superscripts And Subscripts
-  { 'begin': 0x20A0, 'end': 0x20CF }, // Currency Symbol
-  { 'begin': 0x20D0, 'end': 0x20FF }, // Combining Diacritical Marks For Symbols
-  { 'begin': 0x2100, 'end': 0x214F }, // Letterlike Symbols
-  { 'begin': 0x2150, 'end': 0x218F }, // Number Forms
-  { 'begin': 0x2190, 'end': 0x21FF }, // Arrows
-  { 'begin': 0x2200, 'end': 0x22FF }, // Mathematical Operators
-  { 'begin': 0x2300, 'end': 0x23FF }, // Miscellaneous Technical
-  { 'begin': 0x2400, 'end': 0x243F }, // Control Pictures
-  { 'begin': 0x2440, 'end': 0x245F }, // Optical Character Recognition
-  { 'begin': 0x2460, 'end': 0x24FF }, // Enclosed Alphanumerics
-  { 'begin': 0x2500, 'end': 0x257F }, // Box Drawing
-  { 'begin': 0x2580, 'end': 0x259F }, // Block Elements
-  { 'begin': 0x25A0, 'end': 0x25FF }, // Geometric Shapes
-  { 'begin': 0x2600, 'end': 0x26FF }, // Miscellaneous Symbols
-  { 'begin': 0x2700, 'end': 0x27BF }, // Dingbats
-  { 'begin': 0x3000, 'end': 0x303F }, // CJK Symbols And Punctuation
-  { 'begin': 0x3040, 'end': 0x309F }, // Hiragana
-  { 'begin': 0x30A0, 'end': 0x30FF }, // Katakana
-  { 'begin': 0x3100, 'end': 0x312F }, // Bopomofo
-  { 'begin': 0x3130, 'end': 0x318F }, // Hangul Compatibility Jamo
-  { 'begin': 0xA840, 'end': 0xA87F }, // Phags-pa
-  { 'begin': 0x3200, 'end': 0x32FF }, // Enclosed CJK Letters And Months
-  { 'begin': 0x3300, 'end': 0x33FF }, // CJK Compatibility
-  { 'begin': 0xAC00, 'end': 0xD7AF }, // Hangul Syllables
-  { 'begin': 0xD800, 'end': 0xDFFF }, // Non-Plane 0 *
-  { 'begin': 0x10900, 'end': 0x1091F }, // Phoenicia
-  { 'begin': 0x4E00, 'end': 0x9FFF }, // CJK Unified Ideographs
-  { 'begin': 0xE000, 'end': 0xF8FF }, // Private Use Area (plane 0)
-  { 'begin': 0x31C0, 'end': 0x31EF }, // CJK Strokes
-  { 'begin': 0xFB00, 'end': 0xFB4F }, // Alphabetic Presentation Forms
-  { 'begin': 0xFB50, 'end': 0xFDFF }, // Arabic Presentation Forms-A
-  { 'begin': 0xFE20, 'end': 0xFE2F }, // Combining Half Marks
-  { 'begin': 0xFE10, 'end': 0xFE1F }, // Vertical Forms
-  { 'begin': 0xFE50, 'end': 0xFE6F }, // Small Form Variants
-  { 'begin': 0xFE70, 'end': 0xFEFF }, // Arabic Presentation Forms-B
-  { 'begin': 0xFF00, 'end': 0xFFEF }, // Halfwidth And Fullwidth Forms
-  { 'begin': 0xFFF0, 'end': 0xFFFF }, // Specials
-  { 'begin': 0x0F00, 'end': 0x0FFF }, // Tibetan
-  { 'begin': 0x0700, 'end': 0x074F }, // Syriac
-  { 'begin': 0x0780, 'end': 0x07BF }, // Thaana
-  { 'begin': 0x0D80, 'end': 0x0DFF }, // Sinhala
-  { 'begin': 0x1000, 'end': 0x109F }, // Myanmar
-  { 'begin': 0x1200, 'end': 0x137F }, // Ethiopic
-  { 'begin': 0x13A0, 'end': 0x13FF }, // Cherokee
-  { 'begin': 0x1400, 'end': 0x167F }, // Unified Canadian Aboriginal Syllabics
-  { 'begin': 0x1680, 'end': 0x169F }, // Ogham
-  { 'begin': 0x16A0, 'end': 0x16FF }, // Runic
-  { 'begin': 0x1780, 'end': 0x17FF }, // Khmer
-  { 'begin': 0x1800, 'end': 0x18AF }, // Mongolian
-  { 'begin': 0x2800, 'end': 0x28FF }, // Braille Patterns
-  { 'begin': 0xA000, 'end': 0xA48F }, // Yi Syllables
-  { 'begin': 0x1700, 'end': 0x171F }, // Tagalog
-  { 'begin': 0x10300, 'end': 0x1032F }, // Old Italic
-  { 'begin': 0x10330, 'end': 0x1034F }, // Gothic
-  { 'begin': 0x10400, 'end': 0x1044F }, // Deseret
-  { 'begin': 0x1D000, 'end': 0x1D0FF }, // Byzantine Musical Symbols
-  { 'begin': 0x1D400, 'end': 0x1D7FF }, // Mathematical Alphanumeric Symbols
-  { 'begin': 0xFF000, 'end': 0xFFFFD }, // Private Use (plane 15)
-  { 'begin': 0xFE00, 'end': 0xFE0F }, // Variation Selectors
-  { 'begin': 0xE0000, 'end': 0xE007F }, // Tags
-  { 'begin': 0x1900, 'end': 0x194F }, // Limbu
-  { 'begin': 0x1950, 'end': 0x197F }, // Tai Le
-  { 'begin': 0x1980, 'end': 0x19DF }, // New Tai Lue
-  { 'begin': 0x1A00, 'end': 0x1A1F }, // Buginese
-  { 'begin': 0x2C00, 'end': 0x2C5F }, // Glagolitic
-  { 'begin': 0x2D30, 'end': 0x2D7F }, // Tifinagh
-  { 'begin': 0x4DC0, 'end': 0x4DFF }, // Yijing Hexagram Symbols
-  { 'begin': 0xA800, 'end': 0xA82F }, // Syloti Nagri
-  { 'begin': 0x10000, 'end': 0x1007F }, // Linear B Syllabary
-  { 'begin': 0x10140, 'end': 0x1018F }, // Ancient Greek Numbers
-  { 'begin': 0x10380, 'end': 0x1039F }, // Ugaritic
-  { 'begin': 0x103A0, 'end': 0x103DF }, // Old Persian
-  { 'begin': 0x10450, 'end': 0x1047F }, // Shavian
-  { 'begin': 0x10480, 'end': 0x104AF }, // Osmanya
-  { 'begin': 0x10800, 'end': 0x1083F }, // Cypriot Syllabary
-  { 'begin': 0x10A00, 'end': 0x10A5F }, // Kharoshthi
-  { 'begin': 0x1D300, 'end': 0x1D35F }, // Tai Xuan Jing Symbols
-  { 'begin': 0x12000, 'end': 0x123FF }, // Cuneiform
-  { 'begin': 0x1D360, 'end': 0x1D37F }, // Counting Rod Numerals
-  { 'begin': 0x1B80, 'end': 0x1BBF }, // Sundanese
-  { 'begin': 0x1C00, 'end': 0x1C4F }, // Lepcha
-  { 'begin': 0x1C50, 'end': 0x1C7F }, // Ol Chiki
-  { 'begin': 0xA880, 'end': 0xA8DF }, // Saurashtra
-  { 'begin': 0xA900, 'end': 0xA92F }, // Kayah Li
-  { 'begin': 0xA930, 'end': 0xA95F }, // Rejang
-  { 'begin': 0xAA00, 'end': 0xAA5F }, // Cham
-  { 'begin': 0x10190, 'end': 0x101CF }, // Ancient Symbols
-  { 'begin': 0x101D0, 'end': 0x101FF }, // Phaistos Disc
-  { 'begin': 0x102A0, 'end': 0x102DF }, // Carian
-  { 'begin': 0x1F030, 'end': 0x1F09F }  // Domino Tiles
-];
-
-var MacStandardGlyphOrdering = [
-  '.notdef', '.null', 'nonmarkingreturn', 'space', 'exclam', 'quotedbl',
-  'numbersign', 'dollar', 'percent', 'ampersand', 'quotesingle', 'parenleft',
-  'parenright', 'asterisk', 'plus', 'comma', 'hyphen', 'period', 'slash',
-  'zero', 'one', 'two', 'three', 'four', 'five', 'six', 'seven', 'eight',
-  'nine', 'colon', 'semicolon', 'less', 'equal', 'greater', 'question', 'at',
-  'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O',
-  'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'bracketleft',
-  'backslash', 'bracketright', 'asciicircum', 'underscore', 'grave', 'a', 'b',
-  'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q',
-  'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', 'braceleft', 'bar', 'braceright',
-  'asciitilde', 'Adieresis', 'Aring', 'Ccedilla', 'Eacute', 'Ntilde',
-  'Odieresis', 'Udieresis', 'aacute', 'agrave', 'acircumflex', 'adieresis',
-  'atilde', 'aring', 'ccedilla', 'eacute', 'egrave', 'ecircumflex', 'edieresis',
-  'iacute', 'igrave', 'icircumflex', 'idieresis', 'ntilde', 'oacute', 'ograve',
-  'ocircumflex', 'odieresis', 'otilde', 'uacute', 'ugrave', 'ucircumflex',
-  'udieresis', 'dagger', 'degree', 'cent', 'sterling', 'section', 'bullet',
-  'paragraph', 'germandbls', 'registered', 'copyright', 'trademark', 'acute',
-  'dieresis', 'notequal', 'AE', 'Oslash', 'infinity', 'plusminus', 'lessequal',
-  'greaterequal', 'yen', 'mu', 'partialdiff', 'summation', 'product', 'pi',
-  'integral', 'ordfeminine', 'ordmasculine', 'Omega', 'ae', 'oslash',
-  'questiondown', 'exclamdown', 'logicalnot', 'radical', 'florin',
-  'approxequal', 'Delta', 'guillemotleft', 'guillemotright', 'ellipsis',
-  'nonbreakingspace', 'Agrave', 'Atilde', 'Otilde', 'OE', 'oe', 'endash',
-  'emdash', 'quotedblleft', 'quotedblright', 'quoteleft', 'quoteright',
-  'divide', 'lozenge', 'ydieresis', 'Ydieresis', 'fraction', 'currency',
-  'guilsinglleft', 'guilsinglright', 'fi', 'fl', 'daggerdbl', 'periodcentered',
-  'quotesinglbase', 'quotedblbase', 'perthousand', 'Acircumflex',
-  'Ecircumflex', 'Aacute', 'Edieresis', 'Egrave', 'Iacute', 'Icircumflex',
-  'Idieresis', 'Igrave', 'Oacute', 'Ocircumflex', 'apple', 'Ograve', 'Uacute',
-  'Ucircumflex', 'Ugrave', 'dotlessi', 'circumflex', 'tilde', 'macron',
-  'breve', 'dotaccent', 'ring', 'cedilla', 'hungarumlaut', 'ogonek', 'caron',
-  'Lslash', 'lslash', 'Scaron', 'scaron', 'Zcaron', 'zcaron', 'brokenbar',
-  'Eth', 'eth', 'Yacute', 'yacute', 'Thorn', 'thorn', 'minus', 'multiply',
-  'onesuperior', 'twosuperior', 'threesuperior', 'onehalf', 'onequarter',
-  'threequarters', 'franc', 'Gbreve', 'gbreve', 'Idotaccent', 'Scedilla',
-  'scedilla', 'Cacute', 'cacute', 'Ccaron', 'ccaron', 'dcroat'];
-
-function getUnicodeRangeFor(value) {
-  for (var i = 0, ii = UnicodeRanges.length; i < ii; i++) {
-    var range = UnicodeRanges[i];
-    if (value >= range.begin && value < range.end)
-      return i;
-  }
-  return -1;
-}
-
-function isRTLRangeFor(value) {
-  var range = UnicodeRanges[13];
-  if (value >= range.begin && value < range.end)
-    return true;
-  range = UnicodeRanges[11];
-  if (value >= range.begin && value < range.end)
-    return true;
-  return false;
-}
-
-function isSpecialUnicode(unicode) {
-  return (unicode <= 0x1F || (unicode >= 127 && unicode < kSizeOfGlyphArea)) ||
-    (unicode >= kCmapGlyphOffset &&
-    unicode < kCmapGlyphOffset + kSizeOfGlyphArea);
-}
-
-// The normalization table is obtained by filtering the Unicode characters
-// database with <compat> entries.
-var NormalizedUnicodes = {
-  '\u00A8': '\u0020\u0308',
-  '\u00AF': '\u0020\u0304',
-  '\u00B4': '\u0020\u0301',
-  '\u00B5': '\u03BC',
-  '\u00B8': '\u0020\u0327',
-  '\u0132': '\u0049\u004A',
-  '\u0133': '\u0069\u006A',
-  '\u013F': '\u004C\u00B7',
-  '\u0140': '\u006C\u00B7',
-  '\u0149': '\u02BC\u006E',
-  '\u017F': '\u0073',
-  '\u01C4': '\u0044\u017D',
-  '\u01C5': '\u0044\u017E',
-  '\u01C6': '\u0064\u017E',
-  '\u01C7': '\u004C\u004A',
-  '\u01C8': '\u004C\u006A',
-  '\u01C9': '\u006C\u006A',
-  '\u01CA': '\u004E\u004A',
-  '\u01CB': '\u004E\u006A',
-  '\u01CC': '\u006E\u006A',
-  '\u01F1': '\u0044\u005A',
-  '\u01F2': '\u0044\u007A',
-  '\u01F3': '\u0064\u007A',
-  '\u02D8': '\u0020\u0306',
-  '\u02D9': '\u0020\u0307',
-  '\u02DA': '\u0020\u030A',
-  '\u02DB': '\u0020\u0328',
-  '\u02DC': '\u0020\u0303',
-  '\u02DD': '\u0020\u030B',
-  '\u037A': '\u0020\u0345',
-  '\u0384': '\u0020\u0301',
-  '\u03D0': '\u03B2',
-  '\u03D1': '\u03B8',
-  '\u03D2': '\u03A5',
-  '\u03D5': '\u03C6',
-  '\u03D6': '\u03C0',
-  '\u03F0': '\u03BA',
-  '\u03F1': '\u03C1',
-  '\u03F2': '\u03C2',
-  '\u03F4': '\u0398',
-  '\u03F5': '\u03B5',
-  '\u03F9': '\u03A3',
-  '\u0587': '\u0565\u0582',
-  '\u0675': '\u0627\u0674',
-  '\u0676': '\u0648\u0674',
-  '\u0677': '\u06C7\u0674',
-  '\u0678': '\u064A\u0674',
-  '\u0E33': '\u0E4D\u0E32',
-  '\u0EB3': '\u0ECD\u0EB2',
-  '\u0EDC': '\u0EAB\u0E99',
-  '\u0EDD': '\u0EAB\u0EA1',
-  '\u0F77': '\u0FB2\u0F81',
-  '\u0F79': '\u0FB3\u0F81',
-  '\u1E9A': '\u0061\u02BE',
-  '\u1FBD': '\u0020\u0313',
-  '\u1FBF': '\u0020\u0313',
-  '\u1FC0': '\u0020\u0342',
-  '\u1FFE': '\u0020\u0314',
-  '\u2002': '\u0020',
-  '\u2003': '\u0020',
-  '\u2004': '\u0020',
-  '\u2005': '\u0020',
-  '\u2006': '\u0020',
-  '\u2008': '\u0020',
-  '\u2009': '\u0020',
-  '\u200A': '\u0020',
-  '\u2017': '\u0020\u0333',
-  '\u2024': '\u002E',
-  '\u2025': '\u002E\u002E',
-  '\u2026': '\u002E\u002E\u002E',
-  '\u2033': '\u2032\u2032',
-  '\u2034': '\u2032\u2032\u2032',
-  '\u2036': '\u2035\u2035',
-  '\u2037': '\u2035\u2035\u2035',
-  '\u203C': '\u0021\u0021',
-  '\u203E': '\u0020\u0305',
-  '\u2047': '\u003F\u003F',
-  '\u2048': '\u003F\u0021',
-  '\u2049': '\u0021\u003F',
-  '\u2057': '\u2032\u2032\u2032\u2032',
-  '\u205F': '\u0020',
-  '\u20A8': '\u0052\u0073',
-  '\u2100': '\u0061\u002F\u0063',
-  '\u2101': '\u0061\u002F\u0073',
-  '\u2103': '\u00B0\u0043',
-  '\u2105': '\u0063\u002F\u006F',
-  '\u2106': '\u0063\u002F\u0075',
-  '\u2107': '\u0190',
-  '\u2109': '\u00B0\u0046',
-  '\u2116': '\u004E\u006F',
-  '\u2121': '\u0054\u0045\u004C',
-  '\u2135': '\u05D0',
-  '\u2136': '\u05D1',
-  '\u2137': '\u05D2',
-  '\u2138': '\u05D3',
-  '\u213B': '\u0046\u0041\u0058',
-  '\u2160': '\u0049',
-  '\u2161': '\u0049\u0049',
-  '\u2162': '\u0049\u0049\u0049',
-  '\u2163': '\u0049\u0056',
-  '\u2164': '\u0056',
-  '\u2165': '\u0056\u0049',
-  '\u2166': '\u0056\u0049\u0049',
-  '\u2167': '\u0056\u0049\u0049\u0049',
-  '\u2168': '\u0049\u0058',
-  '\u2169': '\u0058',
-  '\u216A': '\u0058\u0049',
-  '\u216B': '\u0058\u0049\u0049',
-  '\u216C': '\u004C',
-  '\u216D': '\u0043',
-  '\u216E': '\u0044',
-  '\u216F': '\u004D',
-  '\u2170': '\u0069',
-  '\u2171': '\u0069\u0069',
-  '\u2172': '\u0069\u0069\u0069',
-  '\u2173': '\u0069\u0076',
-  '\u2174': '\u0076',
-  '\u2175': '\u0076\u0069',
-  '\u2176': '\u0076\u0069\u0069',
-  '\u2177': '\u0076\u0069\u0069\u0069',
-  '\u2178': '\u0069\u0078',
-  '\u2179': '\u0078',
-  '\u217A': '\u0078\u0069',
-  '\u217B': '\u0078\u0069\u0069',
-  '\u217C': '\u006C',
-  '\u217D': '\u0063',
-  '\u217E': '\u0064',
-  '\u217F': '\u006D',
-  '\u222C': '\u222B\u222B',
-  '\u222D': '\u222B\u222B\u222B',
-  '\u222F': '\u222E\u222E',
-  '\u2230': '\u222E\u222E\u222E',
-  '\u2474': '\u0028\u0031\u0029',
-  '\u2475': '\u0028\u0032\u0029',
-  '\u2476': '\u0028\u0033\u0029',
-  '\u2477': '\u0028\u0034\u0029',
-  '\u2478': '\u0028\u0035\u0029',
-  '\u2479': '\u0028\u0036\u0029',
-  '\u247A': '\u0028\u0037\u0029',
-  '\u247B': '\u0028\u0038\u0029',
-  '\u247C': '\u0028\u0039\u0029',
-  '\u247D': '\u0028\u0031\u0030\u0029',
-  '\u247E': '\u0028\u0031\u0031\u0029',
-  '\u247F': '\u0028\u0031\u0032\u0029',
-  '\u2480': '\u0028\u0031\u0033\u0029',
-  '\u2481': '\u0028\u0031\u0034\u0029',
-  '\u2482': '\u0028\u0031\u0035\u0029',
-  '\u2483': '\u0028\u0031\u0036\u0029',
-  '\u2484': '\u0028\u0031\u0037\u0029',
-  '\u2485': '\u0028\u0031\u0038\u0029',
-  '\u2486': '\u0028\u0031\u0039\u0029',
-  '\u2487': '\u0028\u0032\u0030\u0029',
-  '\u2488': '\u0031\u002E',
-  '\u2489': '\u0032\u002E',
-  '\u248A': '\u0033\u002E',
-  '\u248B': '\u0034\u002E',
-  '\u248C': '\u0035\u002E',
-  '\u248D': '\u0036\u002E',
-  '\u248E': '\u0037\u002E',
-  '\u248F': '\u0038\u002E',
-  '\u2490': '\u0039\u002E',
-  '\u2491': '\u0031\u0030\u002E',
-  '\u2492': '\u0031\u0031\u002E',
-  '\u2493': '\u0031\u0032\u002E',
-  '\u2494': '\u0031\u0033\u002E',
-  '\u2495': '\u0031\u0034\u002E',
-  '\u2496': '\u0031\u0035\u002E',
-  '\u2497': '\u0031\u0036\u002E',
-  '\u2498': '\u0031\u0037\u002E',
-  '\u2499': '\u0031\u0038\u002E',
-  '\u249A': '\u0031\u0039\u002E',
-  '\u249B': '\u0032\u0030\u002E',
-  '\u249C': '\u0028\u0061\u0029',
-  '\u249D': '\u0028\u0062\u0029',
-  '\u249E': '\u0028\u0063\u0029',
-  '\u249F': '\u0028\u0064\u0029',
-  '\u24A0': '\u0028\u0065\u0029',
-  '\u24A1': '\u0028\u0066\u0029',
-  '\u24A2': '\u0028\u0067\u0029',
-  '\u24A3': '\u0028\u0068\u0029',
-  '\u24A4': '\u0028\u0069\u0029',
-  '\u24A5': '\u0028\u006A\u0029',
-  '\u24A6': '\u0028\u006B\u0029',
-  '\u24A7': '\u0028\u006C\u0029',
-  '\u24A8': '\u0028\u006D\u0029',
-  '\u24A9': '\u0028\u006E\u0029',
-  '\u24AA': '\u0028\u006F\u0029',
-  '\u24AB': '\u0028\u0070\u0029',
-  '\u24AC': '\u0028\u0071\u0029',
-  '\u24AD': '\u0028\u0072\u0029',
-  '\u24AE': '\u0028\u0073\u0029',
-  '\u24AF': '\u0028\u0074\u0029',
-  '\u24B0': '\u0028\u0075\u0029',
-  '\u24B1': '\u0028\u0076\u0029',
-  '\u24B2': '\u0028\u0077\u0029',
-  '\u24B3': '\u0028\u0078\u0029',
-  '\u24B4': '\u0028\u0079\u0029',
-  '\u24B5': '\u0028\u007A\u0029',
-  '\u2A0C': '\u222B\u222B\u222B\u222B',
-  '\u2A74': '\u003A\u003A\u003D',
-  '\u2A75': '\u003D\u003D',
-  '\u2A76': '\u003D\u003D\u003D',
-  '\u2E9F': '\u6BCD',
-  '\u2EF3': '\u9F9F',
-  '\u2F00': '\u4E00',
-  '\u2F01': '\u4E28',
-  '\u2F02': '\u4E36',
-  '\u2F03': '\u4E3F',
-  '\u2F04': '\u4E59',
-  '\u2F05': '\u4E85',
-  '\u2F06': '\u4E8C',
-  '\u2F07': '\u4EA0',
-  '\u2F08': '\u4EBA',
-  '\u2F09': '\u513F',
-  '\u2F0A': '\u5165',
-  '\u2F0B': '\u516B',
-  '\u2F0C': '\u5182',
-  '\u2F0D': '\u5196',
-  '\u2F0E': '\u51AB',
-  '\u2F0F': '\u51E0',
-  '\u2F10': '\u51F5',
-  '\u2F11': '\u5200',
-  '\u2F12': '\u529B',
-  '\u2F13': '\u52F9',
-  '\u2F14': '\u5315',
-  '\u2F15': '\u531A',
-  '\u2F16': '\u5338',
-  '\u2F17': '\u5341',
-  '\u2F18': '\u535C',
-  '\u2F19': '\u5369',
-  '\u2F1A': '\u5382',
-  '\u2F1B': '\u53B6',
-  '\u2F1C': '\u53C8',
-  '\u2F1D': '\u53E3',
-  '\u2F1E': '\u56D7',
-  '\u2F1F': '\u571F',
-  '\u2F20': '\u58EB',
-  '\u2F21': '\u5902',
-  '\u2F22': '\u590A',
-  '\u2F23': '\u5915',
-  '\u2F24': '\u5927',
-  '\u2F25': '\u5973',
-  '\u2F26': '\u5B50',
-  '\u2F27': '\u5B80',
-  '\u2F28': '\u5BF8',
-  '\u2F29': '\u5C0F',
-  '\u2F2A': '\u5C22',
-  '\u2F2B': '\u5C38',
-  '\u2F2C': '\u5C6E',
-  '\u2F2D': '\u5C71',
-  '\u2F2E': '\u5DDB',
-  '\u2F2F': '\u5DE5',
-  '\u2F30': '\u5DF1',
-  '\u2F31': '\u5DFE',
-  '\u2F32': '\u5E72',
-  '\u2F33': '\u5E7A',
-  '\u2F34': '\u5E7F',
-  '\u2F35': '\u5EF4',
-  '\u2F36': '\u5EFE',
-  '\u2F37': '\u5F0B',
-  '\u2F38': '\u5F13',
-  '\u2F39': '\u5F50',
-  '\u2F3A': '\u5F61',
-  '\u2F3B': '\u5F73',
-  '\u2F3C': '\u5FC3',
-  '\u2F3D': '\u6208',
-  '\u2F3E': '\u6236',
-  '\u2F3F': '\u624B',
-  '\u2F40': '\u652F',
-  '\u2F41': '\u6534',
-  '\u2F42': '\u6587',
-  '\u2F43': '\u6597',
-  '\u2F44': '\u65A4',
-  '\u2F45': '\u65B9',
-  '\u2F46': '\u65E0',
-  '\u2F47': '\u65E5',
-  '\u2F48': '\u66F0',
-  '\u2F49': '\u6708',
-  '\u2F4A': '\u6728',
-  '\u2F4B': '\u6B20',
-  '\u2F4C': '\u6B62',
-  '\u2F4D': '\u6B79',
-  '\u2F4E': '\u6BB3',
-  '\u2F4F': '\u6BCB',
-  '\u2F50': '\u6BD4',
-  '\u2F51': '\u6BDB',
-  '\u2F52': '\u6C0F',
-  '\u2F53': '\u6C14',
-  '\u2F54': '\u6C34',
-  '\u2F55': '\u706B',
-  '\u2F56': '\u722A',
-  '\u2F57': '\u7236',
-  '\u2F58': '\u723B',
-  '\u2F59': '\u723F',
-  '\u2F5A': '\u7247',
-  '\u2F5B': '\u7259',
-  '\u2F5C': '\u725B',
-  '\u2F5D': '\u72AC',
-  '\u2F5E': '\u7384',
-  '\u2F5F': '\u7389',
-  '\u2F60': '\u74DC',
-  '\u2F61': '\u74E6',
-  '\u2F62': '\u7518',
-  '\u2F63': '\u751F',
-  '\u2F64': '\u7528',
-  '\u2F65': '\u7530',
-  '\u2F66': '\u758B',
-  '\u2F67': '\u7592',
-  '\u2F68': '\u7676',
-  '\u2F69': '\u767D',
-  '\u2F6A': '\u76AE',
-  '\u2F6B': '\u76BF',
-  '\u2F6C': '\u76EE',
-  '\u2F6D': '\u77DB',
-  '\u2F6E': '\u77E2',
-  '\u2F6F': '\u77F3',
-  '\u2F70': '\u793A',
-  '\u2F71': '\u79B8',
-  '\u2F72': '\u79BE',
-  '\u2F73': '\u7A74',
-  '\u2F74': '\u7ACB',
-  '\u2F75': '\u7AF9',
-  '\u2F76': '\u7C73',
-  '\u2F77': '\u7CF8',
-  '\u2F78': '\u7F36',
-  '\u2F79': '\u7F51',
-  '\u2F7A': '\u7F8A',
-  '\u2F7B': '\u7FBD',
-  '\u2F7C': '\u8001',
-  '\u2F7D': '\u800C',
-  '\u2F7E': '\u8012',
-  '\u2F7F': '\u8033',
-  '\u2F80': '\u807F',
-  '\u2F81': '\u8089',
-  '\u2F82': '\u81E3',
-  '\u2F83': '\u81EA',
-  '\u2F84': '\u81F3',
-  '\u2F85': '\u81FC',
-  '\u2F86': '\u820C',
-  '\u2F87': '\u821B',
-  '\u2F88': '\u821F',
-  '\u2F89': '\u826E',
-  '\u2F8A': '\u8272',
-  '\u2F8B': '\u8278',
-  '\u2F8C': '\u864D',
-  '\u2F8D': '\u866B',
-  '\u2F8E': '\u8840',
-  '\u2F8F': '\u884C',
-  '\u2F90': '\u8863',
-  '\u2F91': '\u897E',
-  '\u2F92': '\u898B',
-  '\u2F93': '\u89D2',
-  '\u2F94': '\u8A00',
-  '\u2F95': '\u8C37',
-  '\u2F96': '\u8C46',
-  '\u2F97': '\u8C55',
-  '\u2F98': '\u8C78',
-  '\u2F99': '\u8C9D',
-  '\u2F9A': '\u8D64',
-  '\u2F9B': '\u8D70',
-  '\u2F9C': '\u8DB3',
-  '\u2F9D': '\u8EAB',
-  '\u2F9E': '\u8ECA',
-  '\u2F9F': '\u8F9B',
-  '\u2FA0': '\u8FB0',
-  '\u2FA1': '\u8FB5',
-  '\u2FA2': '\u9091',
-  '\u2FA3': '\u9149',
-  '\u2FA4': '\u91C6',
-  '\u2FA5': '\u91CC',
-  '\u2FA6': '\u91D1',
-  '\u2FA7': '\u9577',
-  '\u2FA8': '\u9580',
-  '\u2FA9': '\u961C',
-  '\u2FAA': '\u96B6',
-  '\u2FAB': '\u96B9',
-  '\u2FAC': '\u96E8',
-  '\u2FAD': '\u9751',
-  '\u2FAE': '\u975E',
-  '\u2FAF': '\u9762',
-  '\u2FB0': '\u9769',
-  '\u2FB1': '\u97CB',
-  '\u2FB2': '\u97ED',
-  '\u2FB3': '\u97F3',
-  '\u2FB4': '\u9801',
-  '\u2FB5': '\u98A8',
-  '\u2FB6': '\u98DB',
-  '\u2FB7': '\u98DF',
-  '\u2FB8': '\u9996',
-  '\u2FB9': '\u9999',
-  '\u2FBA': '\u99AC',
-  '\u2FBB': '\u9AA8',
-  '\u2FBC': '\u9AD8',
-  '\u2FBD': '\u9ADF',
-  '\u2FBE': '\u9B25',
-  '\u2FBF': '\u9B2F',
-  '\u2FC0': '\u9B32',
-  '\u2FC1': '\u9B3C',
-  '\u2FC2': '\u9B5A',
-  '\u2FC3': '\u9CE5',
-  '\u2FC4': '\u9E75',
-  '\u2FC5': '\u9E7F',
-  '\u2FC6': '\u9EA5',
-  '\u2FC7': '\u9EBB',
-  '\u2FC8': '\u9EC3',
-  '\u2FC9': '\u9ECD',
-  '\u2FCA': '\u9ED1',
-  '\u2FCB': '\u9EF9',
-  '\u2FCC': '\u9EFD',
-  '\u2FCD': '\u9F0E',
-  '\u2FCE': '\u9F13',
-  '\u2FCF': '\u9F20',
-  '\u2FD0': '\u9F3B',
-  '\u2FD1': '\u9F4A',
-  '\u2FD2': '\u9F52',
-  '\u2FD3': '\u9F8D',
-  '\u2FD4': '\u9F9C',
-  '\u2FD5': '\u9FA0',
-  '\u3036': '\u3012',
-  '\u3038': '\u5341',
-  '\u3039': '\u5344',
-  '\u303A': '\u5345',
-  '\u309B': '\u0020\u3099',
-  '\u309C': '\u0020\u309A',
-  '\u3131': '\u1100',
-  '\u3132': '\u1101',
-  '\u3133': '\u11AA',
-  '\u3134': '\u1102',
-  '\u3135': '\u11AC',
-  '\u3136': '\u11AD',
-  '\u3137': '\u1103',
-  '\u3138': '\u1104',
-  '\u3139': '\u1105',
-  '\u313A': '\u11B0',
-  '\u313B': '\u11B1',
-  '\u313C': '\u11B2',
-  '\u313D': '\u11B3',
-  '\u313E': '\u11B4',
-  '\u313F': '\u11B5',
-  '\u3140': '\u111A',
-  '\u3141': '\u1106',
-  '\u3142': '\u1107',
-  '\u3143': '\u1108',
-  '\u3144': '\u1121',
-  '\u3145': '\u1109',
-  '\u3146': '\u110A',
-  '\u3147': '\u110B',
-  '\u3148': '\u110C',
-  '\u3149': '\u110D',
-  '\u314A': '\u110E',
-  '\u314B': '\u110F',
-  '\u314C': '\u1110',
-  '\u314D': '\u1111',
-  '\u314E': '\u1112',
-  '\u314F': '\u1161',
-  '\u3150': '\u1162',
-  '\u3151': '\u1163',
-  '\u3152': '\u1164',
-  '\u3153': '\u1165',
-  '\u3154': '\u1166',
-  '\u3155': '\u1167',
-  '\u3156': '\u1168',
-  '\u3157': '\u1169',
-  '\u3158': '\u116A',
-  '\u3159': '\u116B',
-  '\u315A': '\u116C',
-  '\u315B': '\u116D',
-  '\u315C': '\u116E',
-  '\u315D': '\u116F',
-  '\u315E': '\u1170',
-  '\u315F': '\u1171',
-  '\u3160': '\u1172',
-  '\u3161': '\u1173',
-  '\u3162': '\u1174',
-  '\u3163': '\u1175',
-  '\u3164': '\u1160',
-  '\u3165': '\u1114',
-  '\u3166': '\u1115',
-  '\u3167': '\u11C7',
-  '\u3168': '\u11C8',
-  '\u3169': '\u11CC',
-  '\u316A': '\u11CE',
-  '\u316B': '\u11D3',
-  '\u316C': '\u11D7',
-  '\u316D': '\u11D9',
-  '\u316E': '\u111C',
-  '\u316F': '\u11DD',
-  '\u3170': '\u11DF',
-  '\u3171': '\u111D',
-  '\u3172': '\u111E',
-  '\u3173': '\u1120',
-  '\u3174': '\u1122',
-  '\u3175': '\u1123',
-  '\u3176': '\u1127',
-  '\u3177': '\u1129',
-  '\u3178': '\u112B',
-  '\u3179': '\u112C',
-  '\u317A': '\u112D',
-  '\u317B': '\u112E',
-  '\u317C': '\u112F',
-  '\u317D': '\u1132',
-  '\u317E': '\u1136',
-  '\u317F': '\u1140',
-  '\u3180': '\u1147',
-  '\u3181': '\u114C',
-  '\u3182': '\u11F1',
-  '\u3183': '\u11F2',
-  '\u3184': '\u1157',
-  '\u3185': '\u1158',
-  '\u3186': '\u1159',
-  '\u3187': '\u1184',
-  '\u3188': '\u1185',
-  '\u3189': '\u1188',
-  '\u318A': '\u1191',
-  '\u318B': '\u1192',
-  '\u318C': '\u1194',
-  '\u318D': '\u119E',
-  '\u318E': '\u11A1',
-  '\u3200': '\u0028\u1100\u0029',
-  '\u3201': '\u0028\u1102\u0029',
-  '\u3202': '\u0028\u1103\u0029',
-  '\u3203': '\u0028\u1105\u0029',
-  '\u3204': '\u0028\u1106\u0029',
-  '\u3205': '\u0028\u1107\u0029',
-  '\u3206': '\u0028\u1109\u0029',
-  '\u3207': '\u0028\u110B\u0029',
-  '\u3208': '\u0028\u110C\u0029',
-  '\u3209': '\u0028\u110E\u0029',
-  '\u320A': '\u0028\u110F\u0029',
-  '\u320B': '\u0028\u1110\u0029',
-  '\u320C': '\u0028\u1111\u0029',
-  '\u320D': '\u0028\u1112\u0029',
-  '\u320E': '\u0028\u1100\u1161\u0029',
-  '\u320F': '\u0028\u1102\u1161\u0029',
-  '\u3210': '\u0028\u1103\u1161\u0029',
-  '\u3211': '\u0028\u1105\u1161\u0029',
-  '\u3212': '\u0028\u1106\u1161\u0029',
-  '\u3213': '\u0028\u1107\u1161\u0029',
-  '\u3214': '\u0028\u1109\u1161\u0029',
-  '\u3215': '\u0028\u110B\u1161\u0029',
-  '\u3216': '\u0028\u110C\u1161\u0029',
-  '\u3217': '\u0028\u110E\u1161\u0029',
-  '\u3218': '\u0028\u110F\u1161\u0029',
-  '\u3219': '\u0028\u1110\u1161\u0029',
-  '\u321A': '\u0028\u1111\u1161\u0029',
-  '\u321B': '\u0028\u1112\u1161\u0029',
-  '\u321C': '\u0028\u110C\u116E\u0029',
-  '\u321D': '\u0028\u110B\u1169\u110C\u1165\u11AB\u0029',
-  '\u321E': '\u0028\u110B\u1169\u1112\u116E\u0029',
-  '\u3220': '\u0028\u4E00\u0029',
-  '\u3221': '\u0028\u4E8C\u0029',
-  '\u3222': '\u0028\u4E09\u0029',
-  '\u3223': '\u0028\u56DB\u0029',
-  '\u3224': '\u0028\u4E94\u0029',
-  '\u3225': '\u0028\u516D\u0029',
-  '\u3226': '\u0028\u4E03\u0029',
-  '\u3227': '\u0028\u516B\u0029',
-  '\u3228': '\u0028\u4E5D\u0029',
-  '\u3229': '\u0028\u5341\u0029',
-  '\u322A': '\u0028\u6708\u0029',
-  '\u322B': '\u0028\u706B\u0029',
-  '\u322C': '\u0028\u6C34\u0029',
-  '\u322D': '\u0028\u6728\u0029',
-  '\u322E': '\u0028\u91D1\u0029',
-  '\u322F': '\u0028\u571F\u0029',
-  '\u3230': '\u0028\u65E5\u0029',
-  '\u3231': '\u0028\u682A\u0029',
-  '\u3232': '\u0028\u6709\u0029',
-  '\u3233': '\u0028\u793E\u0029',
-  '\u3234': '\u0028\u540D\u0029',
-  '\u3235': '\u0028\u7279\u0029',
-  '\u3236': '\u0028\u8CA1\u0029',
-  '\u3237': '\u0028\u795D\u0029',
-  '\u3238': '\u0028\u52B4\u0029',
-  '\u3239': '\u0028\u4EE3\u0029',
-  '\u323A': '\u0028\u547C\u0029',
-  '\u323B': '\u0028\u5B66\u0029',
-  '\u323C': '\u0028\u76E3\u0029',
-  '\u323D': '\u0028\u4F01\u0029',
-  '\u323E': '\u0028\u8CC7\u0029',
-  '\u323F': '\u0028\u5354\u0029',
-  '\u3240': '\u0028\u796D\u0029',
-  '\u3241': '\u0028\u4F11\u0029',
-  '\u3242': '\u0028\u81EA\u0029',
-  '\u3243': '\u0028\u81F3\u0029',
-  '\u32C0': '\u0031\u6708',
-  '\u32C1': '\u0032\u6708',
-  '\u32C2': '\u0033\u6708',
-  '\u32C3': '\u0034\u6708',
-  '\u32C4': '\u0035\u6708',
-  '\u32C5': '\u0036\u6708',
-  '\u32C6': '\u0037\u6708',
-  '\u32C7': '\u0038\u6708',
-  '\u32C8': '\u0039\u6708',
-  '\u32C9': '\u0031\u0030\u6708',
-  '\u32CA': '\u0031\u0031\u6708',
-  '\u32CB': '\u0031\u0032\u6708',
-  '\u3358': '\u0030\u70B9',
-  '\u3359': '\u0031\u70B9',
-  '\u335A': '\u0032\u70B9',
-  '\u335B': '\u0033\u70B9',
-  '\u335C': '\u0034\u70B9',
-  '\u335D': '\u0035\u70B9',
-  '\u335E': '\u0036\u70B9',
-  '\u335F': '\u0037\u70B9',
-  '\u3360': '\u0038\u70B9',
-  '\u3361': '\u0039\u70B9',
-  '\u3362': '\u0031\u0030\u70B9',
-  '\u3363': '\u0031\u0031\u70B9',
-  '\u3364': '\u0031\u0032\u70B9',
-  '\u3365': '\u0031\u0033\u70B9',
-  '\u3366': '\u0031\u0034\u70B9',
-  '\u3367': '\u0031\u0035\u70B9',
-  '\u3368': '\u0031\u0036\u70B9',
-  '\u3369': '\u0031\u0037\u70B9',
-  '\u336A': '\u0031\u0038\u70B9',
-  '\u336B': '\u0031\u0039\u70B9',
-  '\u336C': '\u0032\u0030\u70B9',
-  '\u336D': '\u0032\u0031\u70B9',
-  '\u336E': '\u0032\u0032\u70B9',
-  '\u336F': '\u0032\u0033\u70B9',
-  '\u3370': '\u0032\u0034\u70B9',
-  '\u33E0': '\u0031\u65E5',
-  '\u33E1': '\u0032\u65E5',
-  '\u33E2': '\u0033\u65E5',
-  '\u33E3': '\u0034\u65E5',
-  '\u33E4': '\u0035\u65E5',
-  '\u33E5': '\u0036\u65E5',
-  '\u33E6': '\u0037\u65E5',
-  '\u33E7': '\u0038\u65E5',
-  '\u33E8': '\u0039\u65E5',
-  '\u33E9': '\u0031\u0030\u65E5',
-  '\u33EA': '\u0031\u0031\u65E5',
-  '\u33EB': '\u0031\u0032\u65E5',
-  '\u33EC': '\u0031\u0033\u65E5',
-  '\u33ED': '\u0031\u0034\u65E5',
-  '\u33EE': '\u0031\u0035\u65E5',
-  '\u33EF': '\u0031\u0036\u65E5',
-  '\u33F0': '\u0031\u0037\u65E5',
-  '\u33F1': '\u0031\u0038\u65E5',
-  '\u33F2': '\u0031\u0039\u65E5',
-  '\u33F3': '\u0032\u0030\u65E5',
-  '\u33F4': '\u0032\u0031\u65E5',
-  '\u33F5': '\u0032\u0032\u65E5',
-  '\u33F6': '\u0032\u0033\u65E5',
-  '\u33F7': '\u0032\u0034\u65E5',
-  '\u33F8': '\u0032\u0035\u65E5',
-  '\u33F9': '\u0032\u0036\u65E5',
-  '\u33FA': '\u0032\u0037\u65E5',
-  '\u33FB': '\u0032\u0038\u65E5',
-  '\u33FC': '\u0032\u0039\u65E5',
-  '\u33FD': '\u0033\u0030\u65E5',
-  '\u33FE': '\u0033\u0031\u65E5',
-  '\uFB00': '\u0066\u0066',
-  '\uFB01': '\u0066\u0069',
-  '\uFB02': '\u0066\u006C',
-  '\uFB03': '\u0066\u0066\u0069',
-  '\uFB04': '\u0066\u0066\u006C',
-  '\uFB05': '\u017F\u0074',
-  '\uFB06': '\u0073\u0074',
-  '\uFB13': '\u0574\u0576',
-  '\uFB14': '\u0574\u0565',
-  '\uFB15': '\u0574\u056B',
-  '\uFB16': '\u057E\u0576',
-  '\uFB17': '\u0574\u056D',
-  '\uFB4F': '\u05D0\u05DC',
-  '\uFE49': '\u203E',
-  '\uFE4A': '\u203E',
-  '\uFE4B': '\u203E',
-  '\uFE4C': '\u203E',
-  '\uFE4D': '\u005F',
-  '\uFE4E': '\u005F',
-  '\uFE4F': '\u005F'
-};
-
-function fontCharsToUnicode(charCodes, fontProperties) {
-  var toUnicode = fontProperties.toUnicode;
-  var composite = fontProperties.composite;
-  var encoding, differences, cidToUnicode;
-  var result = '';
-  if (composite) {
-    cidToUnicode = fontProperties.cidToUnicode;
-    for (var i = 0, ii = charCodes.length; i < ii; i += 2) {
-      var charCode = (charCodes.charCodeAt(i) << 8) |
-        charCodes.charCodeAt(i + 1);
-      if (toUnicode && charCode in toUnicode) {
-        var unicode = toUnicode[charCode];
-        result += typeof unicode !== 'number' ? unicode :
-          String.fromCharCode(unicode);
-        continue;
-      }
-      result += String.fromCharCode(!cidToUnicode ? charCode :
-        cidToUnicode[charCode] || charCode);
-    }
-  } else {
-    differences = fontProperties.differences;
-    encoding = fontProperties.baseEncoding;
-    for (var i = 0, ii = charCodes.length; i < ii; i++) {
-      var charCode = charCodes.charCodeAt(i);
-      var unicode;
-      if (toUnicode && charCode in toUnicode) {
-        var unicode = toUnicode[charCode];
-        result += typeof unicode !== 'number' ? unicode :
-          String.fromCharCode(unicode);
-        continue;
-      }
-
-      var glyphName = charCode in differences ? differences[charCode] :
-        encoding[charCode];
-      if (glyphName in GlyphsUnicode) {
-        result += String.fromCharCode(GlyphsUnicode[glyphName]);
-        continue;
-      }
-      result += String.fromCharCode(charCode);
-    }
-  }
-  // normalizing the unicode characters
-  for (var i = 0, ii = result.length; i < ii; i++) {
-    if (!(result[i] in NormalizedUnicodes))
-      continue;
-    result = result.substring(0, i) + NormalizedUnicodes[result[i]] +
-      result.substring(i + 1);
-    ii = result.length;
-  }
-  return result;
-}
-
-/**
- * 'Font' is the class the outside world should use, it encapsulate all the font
- * decoding logics whatever type it is (assuming the font type is supported).
- *
- * For example to read a Type1 font and to attach it to the document:
- *   var type1Font = new Font("MyFontName", binaryFile, propertiesObject);
- *   type1Font.bind();
- */
-var Font = (function FontClosure() {
-  function Font(name, file, properties) {
-    this.name = name;
-    this.coded = properties.coded;
-    this.charProcOperatorList = properties.charProcOperatorList;
-    this.sizes = [];
-
-    var names = name.split('+');
-    names = names.length > 1 ? names[1] : names[0];
-    names = names.split(/[-,_]/g)[0];
-    this.isSerifFont = !!(properties.flags & FontFlags.Serif);
-    this.isSymbolicFont = !!(properties.flags & FontFlags.Symbolic);
-
-    var type = properties.type;
-    this.type = type;
-
-    // If the font is to be ignored, register it like an already loaded font
-    // to avoid the cost of waiting for it be be loaded by the platform.
-    if (properties.ignore) {
-      this.loadedName = this.isSerifFont ? 'serif' : 'sans-serif';
-      this.loading = false;
-      return;
-    }
-
-    this.differences = properties.differences;
-    this.widths = properties.widths;
-    this.defaultWidth = properties.defaultWidth;
-    this.composite = properties.composite;
-    this.wideChars = properties.wideChars;
-    this.hasEncoding = properties.hasEncoding;
-
-    this.fontMatrix = properties.fontMatrix;
-    this.widthMultiplier = 1.0;
-    if (properties.type == 'Type3') {
-      this.encoding = properties.baseEncoding;
-      return;
-    }
-
-    // Trying to fix encoding using glyph CIDSystemInfo.
-    this.loadCidToUnicode(properties);
-
-    if (properties.toUnicode)
-      this.toUnicode = properties.toUnicode;
-    else
-      this.rebuildToUnicode(properties);
-
-    this.toFontChar = this.buildToFontChar(this.toUnicode);
-
-    if (!file) {
-      // The file data is not specified. Trying to fix the font name
-      // to be used with the canvas.font.
-      var fontName = name.replace(/[,_]/g, '-');
-      fontName = stdFontMap[fontName] || nonStdFontMap[fontName] || fontName;
-
-      this.bold = (fontName.search(/bold/gi) != -1);
-      this.italic = (fontName.search(/oblique/gi) != -1) ||
-                    (fontName.search(/italic/gi) != -1);
-
-      // Use 'name' instead of 'fontName' here because the original
-      // name ArialBlack for example will be replaced by Helvetica.
-      this.black = (name.search(/Black/g) != -1);
-
-      this.encoding = properties.baseEncoding;
-      this.noUnicodeAdaptation = true;
-      this.loadedName = fontName.split('-')[0];
-      this.loading = false;
-      return;
-    }
-
-    var data;
-    switch (type) {
-      case 'Type1':
-      case 'CIDFontType0':
-        this.mimetype = 'font/opentype';
-
-        var subtype = properties.subtype;
-        var cff = (subtype == 'Type1C' || subtype == 'CIDFontType0C') ?
-          new CFFFont(file, properties) : new Type1Font(name, file, properties);
-
-        // Wrap the CFF data inside an OTF font file
-        data = this.convert(name, cff, properties);
-        break;
-
-      case 'TrueType':
-      case 'CIDFontType2':
-        this.mimetype = 'font/opentype';
-
-        // Repair the TrueType file. It is can be damaged in the point of
-        // view of the sanitizer
-        data = this.checkAndRepair(name, file, properties);
-        break;
-
-      default:
-        warn('Font ' + properties.type + ' is not supported');
-        break;
-    }
-
-    this.data = data;
-    this.fontMatrix = properties.fontMatrix;
-    this.widthMultiplier = !properties.fontMatrix ? 1.0 :
-      1.0 / properties.fontMatrix[0];
-    this.encoding = properties.baseEncoding;
-    this.loadedName = properties.loadedName;
-    this.loading = true;
-  };
-
-  var numFonts = 0;
-  function getUniqueName() {
-    return 'pdfFont' + numFonts++;
-  }
-
-  function stringToArray(str) {
-    var array = [];
-    for (var i = 0, ii = str.length; i < ii; ++i)
-      array[i] = str.charCodeAt(i);
-
-    return array;
-  };
-
-  function arrayToString(arr) {
-    var str = '';
-    for (var i = 0, ii = arr.length; i < ii; ++i)
-      str += String.fromCharCode(arr[i]);
-
-    return str;
-  };
-
-  function int16(bytes) {
-    return (bytes[0] << 8) + (bytes[1] & 0xff);
-  };
-
-  function int32(bytes) {
-    return (bytes[0] << 24) + (bytes[1] << 16) +
-           (bytes[2] << 8) + (bytes[3] & 0xff);
-  };
-
-  function getMaxPower2(number) {
-    var maxPower = 0;
-    var value = number;
-    while (value >= 2) {
-      value /= 2;
-      maxPower++;
-    }
-
-    value = 2;
-    for (var i = 1; i < maxPower; i++)
-      value *= 2;
-    return value;
-  };
-
-  function string16(value) {
-    return String.fromCharCode((value >> 8) & 0xff) +
-           String.fromCharCode(value & 0xff);
-  };
-
-  function safeString16(value) {
-    // clamp value to the 16-bit int range
-    value = value > 0x7FFF ? 0x7FFF : value < -0x8000 ? -0x8000 : value;
-    return String.fromCharCode((value >> 8) & 0xff) +
-           String.fromCharCode(value & 0xff);
-  };
-
-  function string32(value) {
-    return String.fromCharCode((value >> 24) & 0xff) +
-           String.fromCharCode((value >> 16) & 0xff) +
-           String.fromCharCode((value >> 8) & 0xff) +
-           String.fromCharCode(value & 0xff);
-  };
-
-  function createOpenTypeHeader(sfnt, file, numTables) {
-    // Windows hates the Mac TrueType sfnt version number
-    if (sfnt == 'true')
-      sfnt = string32(0x00010000);
-
-    // sfnt version (4 bytes)
-    var header = sfnt;
-
-    // numTables (2 bytes)
-    header += string16(numTables);
-
-    // searchRange (2 bytes)
-    var tablesMaxPower2 = getMaxPower2(numTables);
-    var searchRange = tablesMaxPower2 * 16;
-    header += string16(searchRange);
-
-    // entrySelector (2 bytes)
-    header += string16(Math.log(tablesMaxPower2) / Math.log(2));
-
-    // rangeShift (2 bytes)
-    header += string16(numTables * 16 - searchRange);
-
-    file.file += header;
-    file.virtualOffset += header.length;
-  };
-
-  function createTableEntry(file, tag, data) {
-    // offset
-    var offset = file.virtualOffset;
-
-    // length
-    var length = data.length;
-
-    // Per spec tables must be 4-bytes align so add padding as needed
-    while (data.length & 3)
-      data.push(0x00);
-
-    while (file.virtualOffset & 3)
-      file.virtualOffset++;
-
-    // checksum
-    var checksum = 0, n = data.length;
-    for (var i = 0; i < n; i += 4)
-      checksum = (checksum + int32([data[i], data[i + 1], data[i + 2],
-                                    data[i + 3]])) | 0;
-
-    var tableEntry = (tag + string32(checksum) +
-                      string32(offset) + string32(length));
-    file.file += tableEntry;
-    file.virtualOffset += data.length;
-  };
-
-  function getRanges(glyphs) {
-    // Array.sort() sorts by characters, not numerically, so convert to an
-    // array of characters.
-    var codes = [];
-    var length = glyphs.length;
-    for (var n = 0; n < length; ++n)
-      codes.push({ unicode: glyphs[n].unicode, code: n });
-    codes.sort(function fontGetRangesSort(a, b) {
-      return a.unicode - b.unicode;
-    });
-
-    // Split the sorted codes into ranges.
-    var ranges = [];
-    for (var n = 0; n < length; ) {
-      var start = codes[n].unicode;
-      var codeIndices = [codes[n].code];
-      ++n;
-      var end = start;
-      while (n < length && end + 1 == codes[n].unicode) {
-        codeIndices.push(codes[n].code);
-        ++end;
-        ++n;
-      }
-      ranges.push([start, end, codeIndices]);
-    }
-
-    return ranges;
-  };
-
-  function createCMapTable(glyphs, deltas) {
-    var ranges = getRanges(glyphs);
-
-    var numTables = 1;
-    var cmap = '\x00\x00' + // version
-               string16(numTables) +  // numTables
-               '\x00\x03' + // platformID
-               '\x00\x01' + // encodingID
-               string32(4 + numTables * 8); // start of the table record
-
-    var segCount = ranges.length + 1;
-    var segCount2 = segCount * 2;
-    var searchRange = getMaxPower2(segCount) * 2;
-    var searchEntry = Math.log(segCount) / Math.log(2);
-    var rangeShift = 2 * segCount - searchRange;
-
-    // Fill up the 4 parallel arrays describing the segments.
-    var startCount = '';
-    var endCount = '';
-    var idDeltas = '';
-    var idRangeOffsets = '';
-    var glyphsIds = '';
-    var bias = 0;
-
-    if (deltas) {
-      for (var i = 0; i < segCount - 1; i++) {
-        var range = ranges[i];
-        var start = range[0];
-        var end = range[1];
-        var offset = (segCount - i) * 2 + bias * 2;
-        bias += (end - start + 1);
-
-        startCount += string16(start);
-        endCount += string16(end);
-        idDeltas += string16(0);
-        idRangeOffsets += string16(offset);
-
-        var codes = range[2];
-        for (var j = 0, jj = codes.length; j < jj; ++j)
-          glyphsIds += string16(deltas[codes[j]]);
-      }
-    } else {
-      for (var i = 0; i < segCount - 1; i++) {
-        var range = ranges[i];
-        var start = range[0];
-        var end = range[1];
-        var startCode = range[2][0];
-
-        startCount += string16(start);
-        endCount += string16(end);
-        idDeltas += string16((startCode - start + 1) & 0xFFFF);
-        idRangeOffsets += string16(0);
-      }
-    }
-
-    endCount += '\xFF\xFF';
-    startCount += '\xFF\xFF';
-    idDeltas += '\x00\x01';
-    idRangeOffsets += '\x00\x00';
-
-    var format314 = '\x00\x00' + // language
-                    string16(segCount2) +
-                    string16(searchRange) +
-                    string16(searchEntry) +
-                    string16(rangeShift) +
-                    endCount + '\x00\x00' + startCount +
-                    idDeltas + idRangeOffsets + glyphsIds;
-
-    return stringToArray(cmap +
-                         '\x00\x04' + // format
-                         string16(format314.length + 4) + // length
-                         format314);
-  };
-
-  function createOS2Table(properties, charstrings, override) {
-    override = override || {
-      unitsPerEm: 0,
-      yMax: 0,
-      yMin: 0,
-      ascent: 0,
-      descent: 0
-    };
-
-    var ulUnicodeRange1 = 0;
-    var ulUnicodeRange2 = 0;
-    var ulUnicodeRange3 = 0;
-    var ulUnicodeRange4 = 0;
-
-    var firstCharIndex = null;
-    var lastCharIndex = 0;
-
-    if (charstrings) {
-      for (var i = 0; i < charstrings.length; ++i) {
-        var code = charstrings[i].unicode;
-        if (firstCharIndex > code || !firstCharIndex)
-          firstCharIndex = code;
-        if (lastCharIndex < code)
-          lastCharIndex = code;
-
-        var position = getUnicodeRangeFor(code);
-        if (position < 32) {
-          ulUnicodeRange1 |= 1 << position;
-        } else if (position < 64) {
-          ulUnicodeRange2 |= 1 << position - 32;
-        } else if (position < 96) {
-          ulUnicodeRange3 |= 1 << position - 64;
-        } else if (position < 123) {
-          ulUnicodeRange4 |= 1 << position - 96;
-        } else {
-          error('Unicode ranges Bits > 123 are reserved for internal usage');
-        }
-      }
-    } else {
-      // TODO
-      firstCharIndex = 0;
-      lastCharIndex = 255;
-    }
-
-    var unitsPerEm = override.unitsPerEm || kPDFGlyphSpaceUnits;
-    var typoAscent = override.ascent || properties.ascent;
-    var typoDescent = override.descent || properties.descent;
-    var winAscent = override.yMax || typoAscent;
-    var winDescent = -override.yMin || -typoDescent;
-
-    // if there is a units per em value but no other override
-    // then scale the calculated ascent
-    if (unitsPerEm != kPDFGlyphSpaceUnits &&
-        'undefined' == typeof(override.ascent)) {
-      // if the font units differ to the PDF glyph space units
-      // then scale up the values
-      typoAscent = Math.round(typoAscent * unitsPerEm / kPDFGlyphSpaceUnits);
-      typoDescent = Math.round(typoDescent * unitsPerEm / kPDFGlyphSpaceUnits);
-      winAscent = typoAscent;
-      winDescent = -typoDescent;
-    }
-
-    return '\x00\x03' + // version
-           '\x02\x24' + // xAvgCharWidth
-           '\x01\xF4' + // usWeightClass
-           '\x00\x05' + // usWidthClass
-           '\x00\x00' + // fstype (0 to let the font loads via font-face on IE)
-           '\x02\x8A' + // ySubscriptXSize
-           '\x02\xBB' + // ySubscriptYSize
-           '\x00\x00' + // ySubscriptXOffset
-           '\x00\x8C' + // ySubscriptYOffset
-           '\x02\x8A' + // ySuperScriptXSize
-           '\x02\xBB' + // ySuperScriptYSize
-           '\x00\x00' + // ySuperScriptXOffset
-           '\x01\xDF' + // ySuperScriptYOffset
-           '\x00\x31' + // yStrikeOutSize
-           '\x01\x02' + // yStrikeOutPosition
-           '\x00\x00' + // sFamilyClass
-           '\x00\x00\x06' +
-           String.fromCharCode(properties.fixedPitch ? 0x09 : 0x00) +
-           '\x00\x00\x00\x00\x00\x00' + // Panose
-           string32(ulUnicodeRange1) + // ulUnicodeRange1 (Bits 0-31)
-           string32(ulUnicodeRange2) + // ulUnicodeRange2 (Bits 32-63)
-           string32(ulUnicodeRange3) + // ulUnicodeRange3 (Bits 64-95)
-           string32(ulUnicodeRange4) + // ulUnicodeRange4 (Bits 96-127)
-           '\x2A\x32\x31\x2A' + // achVendID
-           string16(properties.italicAngle ? 1 : 0) + // fsSelection
-           string16(firstCharIndex ||
-                    properties.firstChar) + // usFirstCharIndex
-           string16(lastCharIndex || properties.lastChar) +  // usLastCharIndex
-           string16(typoAscent) + // sTypoAscender
-           string16(typoDescent) + // sTypoDescender
-           '\x00\x64' + // sTypoLineGap (7%-10% of the unitsPerEM value)
-           string16(winAscent) + // usWinAscent
-           string16(winDescent) + // usWinDescent
-           '\x00\x00\x00\x00' + // ulCodePageRange1 (Bits 0-31)
-           '\x00\x00\x00\x00' + // ulCodePageRange2 (Bits 32-63)
-           string16(properties.xHeight) + // sxHeight
-           string16(properties.capHeight) + // sCapHeight
-           string16(0) + // usDefaultChar
-           string16(firstCharIndex || properties.firstChar) + // usBreakChar
-           '\x00\x03';  // usMaxContext
-  };
-
-  function createPostTable(properties) {
-    var angle = Math.floor(properties.italicAngle * (Math.pow(2, 16)));
-    return '\x00\x03\x00\x00' + // Version number
-           string32(angle) + // italicAngle
-           '\x00\x00' + // underlinePosition
-           '\x00\x00' + // underlineThickness
-           string32(properties.fixedPitch) + // isFixedPitch
-           '\x00\x00\x00\x00' + // minMemType42
-           '\x00\x00\x00\x00' + // maxMemType42
-           '\x00\x00\x00\x00' + // minMemType1
-           '\x00\x00\x00\x00';  // maxMemType1
-  };
-
-  function createNameTable(name) {
-    var strings = [
-      'Original licence',  // 0.Copyright
-      name,                // 1.Font family
-      'Unknown',           // 2.Font subfamily (font weight)
-      'uniqueID',          // 3.Unique ID
-      name,                // 4.Full font name
-      'Version 0.11',      // 5.Version
-      '',                  // 6.Postscript name
-      'Unknown',           // 7.Trademark
-      'Unknown',           // 8.Manufacturer
-      'Unknown'            // 9.Designer
-    ];
-
-    // Mac want 1-byte per character strings while Windows want
-    // 2-bytes per character, so duplicate the names table
-    var stringsUnicode = [];
-    for (var i = 0, ii = strings.length; i < ii; i++) {
-      var str = strings[i];
-
-      var strUnicode = '';
-      for (var j = 0, jj = str.length; j < jj; j++)
-        strUnicode += string16(str.charCodeAt(j));
-      stringsUnicode.push(strUnicode);
-    }
-
-    var names = [strings, stringsUnicode];
-    var platforms = ['\x00\x01', '\x00\x03'];
-    var encodings = ['\x00\x00', '\x00\x01'];
-    var languages = ['\x00\x00', '\x04\x09'];
-
-    var namesRecordCount = strings.length * platforms.length;
-    var nameTable =
-      '\x00\x00' +                           // format
-      string16(namesRecordCount) +           // Number of names Record
-      string16(namesRecordCount * 12 + 6);   // Storage
-
-    // Build the name records field
-    var strOffset = 0;
-    for (var i = 0, ii = platforms.length; i < ii; i++) {
-      var strs = names[i];
-      for (var j = 0, jj = strs.length; j < jj; j++) {
-        var str = strs[j];
-        var nameRecord =
-          platforms[i] + // platform ID
-          encodings[i] + // encoding ID
-          languages[i] + // language ID
-          string16(j) + // name ID
-          string16(str.length) +
-          string16(strOffset);
-        nameTable += nameRecord;
-        strOffset += str.length;
-      }
-    }
-
-    nameTable += strings.join('') + stringsUnicode.join('');
-    return nameTable;
-  }
-
-  Font.prototype = {
-    name: null,
-    font: null,
-    mimetype: null,
-    encoding: null,
-
-    checkAndRepair: function Font_checkAndRepair(name, font, properties) {
-      function readTableEntry(file) {
-        var tag = file.getBytes(4);
-        tag = String.fromCharCode(tag[0]) +
-              String.fromCharCode(tag[1]) +
-              String.fromCharCode(tag[2]) +
-              String.fromCharCode(tag[3]);
-
-        var checksum = int32(file.getBytes(4));
-        var offset = int32(file.getBytes(4));
-        var length = int32(file.getBytes(4));
-
-        // Read the table associated data
-        var previousPosition = file.pos;
-        file.pos = file.start ? file.start : 0;
-        file.skip(offset);
-        var data = file.getBytes(length);
-        file.pos = previousPosition;
-
-        if (tag == 'head') {
-          // clearing checksum adjustment
-          data[8] = data[9] = data[10] = data[11] = 0;
-          data[17] |= 0x20; //Set font optimized for cleartype flag
-        }
-
-        return {
-          tag: tag,
-          checksum: checksum,
-          length: length,
-          offset: offset,
-          data: data
-        };
-      };
-
-      function readOpenTypeHeader(ttf) {
-        return {
-          version: arrayToString(ttf.getBytes(4)),
-          numTables: int16(ttf.getBytes(2)),
-          searchRange: int16(ttf.getBytes(2)),
-          entrySelector: int16(ttf.getBytes(2)),
-          rangeShift: int16(ttf.getBytes(2))
-        };
-      };
-
-      function createGlyphNameMap(glyphs, ids, properties) {
-        var glyphNames = properties.glyphNames;
-        if (!glyphNames) {
-          properties.glyphNameMap = {};
-          return;
-        }
-        var glyphsLength = glyphs.length;
-        var glyphNameMap = {};
-        var encoding = [];
-        for (var i = 0; i < glyphsLength; ++i) {
-          var glyphName = glyphNames[ids[i]];
-          if (!glyphName)
-            continue;
-          var unicode = glyphs[i].unicode;
-          glyphNameMap[glyphName] = unicode;
-          var code = glyphs[i].code;
-          encoding[code] = glyphName;
-        }
-        properties.glyphNameMap = glyphNameMap;
-        if (!properties.hasEncoding)
-          properties.baseEncoding = encoding;
-      }
-
-      function readCMapTable(cmap, font) {
-        var start = (font.start ? font.start : 0) + cmap.offset;
-        font.pos = start;
-
-        var version = int16(font.getBytes(2));
-        var numRecords = int16(font.getBytes(2));
-
-        var records = [];
-        for (var i = 0; i < numRecords; i++) {
-          records.push({
-            platformID: int16(font.getBytes(2)),
-            encodingID: int16(font.getBytes(2)),
-            offset: int32(font.getBytes(4))
-          });
-        }
-
-        // Check that table are sorted by platformID then encodingID,
-        records.sort(function fontReadCMapTableSort(a, b) {
-          return ((a.platformID << 16) + a.encodingID) -
-                 ((b.platformID << 16) + b.encodingID);
-        });
-
-        var tables = [records[0]];
-        for (var i = 1; i < numRecords; i++) {
-          // The sanitizer will drop the font if 2 tables have the same
-          // platformID and the same encodingID, this will be correct for
-          // most cases but if the font has been made for Mac it could
-          // exist a few platformID: 1, encodingID: 0 but with a different
-          // language field and that's correct. But the sanitizer does not
-          // seem to support this case.
-          var current = records[i];
-          var previous = records[i - 1];
-          if (((current.platformID << 16) + current.encodingID) <=
-             ((previous.platformID << 16) + previous.encodingID))
-                continue;
-          tables.push(current);
-        }
-
-        var missing = numRecords - tables.length;
-        if (missing) {
-          numRecords = tables.length;
-          var data = string16(version) + string16(numRecords);
-
-          for (var i = 0; i < numRecords; i++) {
-            var table = tables[i];
-            data += string16(table.platformID) +
-                    string16(table.encodingID) +
-                    string32(table.offset);
-          }
-
-          for (var i = 0, ii = data.length; i < ii; i++)
-            cmap.data[i] = data.charCodeAt(i);
-        }
-
-        for (var i = 0; i < numRecords; i++) {
-          var table = tables[i];
-          font.pos = start + table.offset;
-
-          var format = int16(font.getBytes(2));
-          var length = int16(font.getBytes(2));
-          var language = int16(font.getBytes(2));
-
-          if (format == 0) {
-            // Characters below 0x20 are controls characters that are hardcoded
-            // into the platform so if some characters in the font are assigned
-            // under this limit they will not be displayed so let's rewrite the
-            // CMap.
-            var glyphs = [];
-            var ids = [];
-            for (var j = 0; j < 256; j++) {
-              var index = font.getByte();
-              if (index) {
-                glyphs.push({ unicode: j, code: j });
-                ids.push(index);
-              }
-            }
-            return {
-              glyphs: glyphs,
-              ids: ids,
-              hasShortCmap: true
-            };
-          } else if (format == 4) {
-            // re-creating the table in format 4 since the encoding
-            // might be changed
-            var segCount = (int16(font.getBytes(2)) >> 1);
-            font.getBytes(6); // skipping range fields
-            var segIndex, segments = [];
-            for (segIndex = 0; segIndex < segCount; segIndex++) {
-              segments.push({ end: int16(font.getBytes(2)) });
-            }
-            font.getBytes(2);
-            for (segIndex = 0; segIndex < segCount; segIndex++) {
-              segments[segIndex].start = int16(font.getBytes(2));
-            }
-
-            for (segIndex = 0; segIndex < segCount; segIndex++) {
-              segments[segIndex].delta = int16(font.getBytes(2));
-            }
-
-            var offsetsCount = 0;
-            for (segIndex = 0; segIndex < segCount; segIndex++) {
-              var segment = segments[segIndex];
-              var rangeOffset = int16(font.getBytes(2));
-              if (!rangeOffset) {
-                segment.offsetIndex = -1;
-                continue;
-              }
-
-              var offsetIndex = (rangeOffset >> 1) - (segCount - segIndex);
-              segment.offsetIndex = offsetIndex;
-              offsetsCount = Math.max(offsetsCount, offsetIndex +
-                segment.end - segment.start + 1);
-            }
-
-            var offsets = [];
-            for (var j = 0; j < offsetsCount; j++)
-              offsets.push(int16(font.getBytes(2)));
-
-            var glyphs = [], ids = [];
-
-            for (segIndex = 0; segIndex < segCount; segIndex++) {
-              var segment = segments[segIndex];
-              var start = segment.start, end = segment.end;
-              var delta = segment.delta, offsetIndex = segment.offsetIndex;
-
-              for (var j = start; j <= end; j++) {
-                if (j == 0xFFFF)
-                  continue;
-
-                var glyphCode = offsetIndex < 0 ? j :
-                  offsets[offsetIndex + j - start];
-                glyphCode = (glyphCode + delta) & 0xFFFF;
-                if (glyphCode == 0)
-                  continue;
-
-                glyphs.push({ unicode: j, code: j });
-                ids.push(glyphCode);
-              }
-            }
-
-            return {
-              glyphs: glyphs,
-              ids: ids
-            };
-          } else if (format == 6) {
-            // Format 6 is a 2-bytes dense mapping, which means the font data
-            // lives glue together even if they are pretty far in the unicode
-            // table. (This looks weird, so I can have missed something), this
-            // works on Linux but seems to fails on Mac so let's rewrite the
-            // cmap table to a 3-1-4 style
-            var firstCode = int16(font.getBytes(2));
-            var entryCount = int16(font.getBytes(2));
-
-            var glyphs = [];
-            var ids = [];
-            for (var j = 0; j < entryCount; j++) {
-              var glyphCode = int16(font.getBytes(2));
-              var code = firstCode + j;
-
-              glyphs.push({ unicode: code, code: code });
-              ids.push(glyphCode);
-            }
-
-            return {
-              glyphs: glyphs,
-              ids: ids
-            };
-          }
-        }
-        error('Unsupported cmap table format');
-      };
-
-      function sanitizeMetrics(font, header, metrics, numGlyphs) {
-        if (!header && !metrics)
-          return;
-
-        // The vhea/vmtx tables are not required, so it happens that
-        // some fonts embed a vmtx table without a vhea table. In this
-        // situation the sanitizer assume numOfLongVerMetrics = 1. As
-        // a result it tries to read numGlyphs - 1 SHORT from the vmtx
-        // table, and if it is not possible, the font is rejected.
-        // So remove the vmtx table if there is no vhea table.
-        if (!header && metrics) {
-          metrics.data = null;
-          return;
-        }
-
-        font.pos = (font.start ? font.start : 0) + header.offset;
-        font.pos += header.length - 2;
-        var numOfMetrics = int16(font.getBytes(2));
-
-        var numOfSidebearings = numGlyphs - numOfMetrics;
-        var numMissing = numOfSidebearings -
-          ((hmtx.length - numOfMetrics * 4) >> 1);
-        if (numMissing > 0) {
-          font.pos = (font.start ? font.start : 0) + metrics.offset;
-          var entries = '';
-          for (var i = 0, ii = hmtx.length; i < ii; i++)
-            entries += String.fromCharCode(font.getByte());
-          for (var i = 0; i < numMissing; i++)
-            entries += '\x00\x00';
-          metrics.data = stringToArray(entries);
-        }
-      };
-
-      function sanitizeGlyph(source, sourceStart, sourceEnd, dest, destStart) {
-        if (sourceEnd - sourceStart <= 12) {
-          // glyph with data less than 12 is invalid one
-          return 0;
-        }
-        var glyf = source.subarray(sourceStart, sourceEnd);
-        var contoursCount = (glyf[0] << 8) | glyf[1];
-        if (contoursCount & 0x8000) {
-          // complex glyph, writing as is
-          dest.set(glyf, destStart);
-          return glyf.length;
-        }
-
-        var j = 10, flagsCount = 0;
-        for (var i = 0; i < contoursCount; i++) {
-          var endPoint = (glyf[j] << 8) | glyf[j + 1];
-          flagsCount = endPoint + 1;
-          j += 2;
-        }
-        // skipping instructions
-        var instructionsLength = (glyf[j] << 8) | glyf[j + 1];
-        j += 2 + instructionsLength;
-        // validating flags
-        var coordinatesLength = 0;
-        for (var i = 0; i < flagsCount; i++) {
-          var flag = glyf[j++];
-          if (flag & 0xC0) {
-            // reserved flags must be zero, rejecting
-            return 0;
-          }
-          var xyLength = ((flag & 2) ? 1 : (flag & 16) ? 0 : 2) +
-                         ((flag & 4) ? 1 : (flag & 32) ? 0 : 2);
-          coordinatesLength += xyLength;
-          if (flag & 8) {
-            var repeat = glyf[j++];
-            i += repeat;
-            coordinatesLength += repeat * xyLength;
-          }
-        }
-        var glyphDataLength = j + coordinatesLength;
-        if (glyphDataLength > glyf.length) {
-          // not enough data for coordinates
-          return 0;
-        }
-        if (glyf.length - glyphDataLength > 3) {
-          // truncating and aligning to 4 bytes the long glyph data
-          glyphDataLength = (glyphDataLength + 3) & ~3;
-          dest.set(glyf.subarray(0, glyphDataLength), destStart);
-          return glyphDataLength;
-        }
-        // glyph data is fine
-        dest.set(glyf, destStart);
-        return glyf.length;
-      }
-
-      function sanitizeGlyphLocations(loca, glyf, numGlyphs,
-                                      isGlyphLocationsLong) {
-        var itemSize, itemDecode, itemEncode;
-        if (isGlyphLocationsLong) {
-          itemSize = 4;
-          itemDecode = function fontItemDecodeLong(data, offset) {
-            return (data[offset] << 24) | (data[offset + 1] << 16) |
-                   (data[offset + 2] << 8) | data[offset + 3];
-          };
-          itemEncode = function fontItemEncodeLong(data, offset, value) {
-            data[offset] = (value >>> 24) & 0xFF;
-            data[offset + 1] = (value >> 16) & 0xFF;
-            data[offset + 2] = (value >> 8) & 0xFF;
-            data[offset + 3] = value & 0xFF;
-          };
-        } else {
-          itemSize = 2;
-          itemDecode = function fontItemDecode(data, offset) {
-            return (data[offset] << 9) | (data[offset + 1] << 1);
-          };
-          itemEncode = function fontItemEncode(data, offset, value) {
-            data[offset] = (value >> 9) & 0xFF;
-            data[offset + 1] = (value >> 1) & 0xFF;
-          };
-        }
-        var locaData = loca.data;
-        // removing the invalid glyphs
-        var oldGlyfData = glyf.data;
-        var oldGlyfDataLength = oldGlyfData.length;
-        var newGlyfData = new Uint8Array(oldGlyfDataLength);
-        var startOffset = itemDecode(locaData, 0);
-        var writeOffset = 0;
-        itemEncode(locaData, 0, writeOffset);
-        for (var i = 0, j = itemSize; i < numGlyphs; i++, j += itemSize) {
-          var endOffset = itemDecode(locaData, j);
-          if (endOffset > oldGlyfDataLength) {
-            // glyph end offset points outside glyf data, rejecting the glyph
-            itemEncode(locaData, j, writeOffset);
-            startOffset = endOffset;
-            continue;
-          }
-
-          var newLength = sanitizeGlyph(oldGlyfData, startOffset, endOffset,
-                                        newGlyfData, writeOffset);
-          writeOffset += newLength;
-          itemEncode(locaData, j, writeOffset);
-          startOffset = endOffset;
-        }
-
-        if (writeOffset == 0) {
-          // glyf table cannot be empty -- redoing the glyf and loca tables
-          // to have single glyph with one point
-          var simpleGlyph = new Uint8Array(
-            [0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 49, 0]);
-          for (var i = 0, j = itemSize; i < numGlyphs; i++, j += itemSize)
-            itemEncode(locaData, j, simpleGlyph.length);
-          glyf.data = simpleGlyph;
-          return;
-        }
-
-        glyf.data = newGlyfData.subarray(0, writeOffset);
-      }
-
-      function findEmptyGlyphs(locaTable, isGlyphLocationsLong, emptyGlyphIds) {
-        var itemSize, itemDecode;
-        if (isGlyphLocationsLong) {
-          itemSize = 4;
-          itemDecode = function fontItemDecodeLong(data, offset) {
-            return (data[offset] << 24) | (data[offset + 1] << 16) |
-                   (data[offset + 2] << 8) | data[offset + 3];
-          };
-        } else {
-          itemSize = 2;
-          itemDecode = function fontItemDecode(data, offset) {
-            return (data[offset] << 9) | (data[offset + 1] << 1);
-          };
-        }
-        var data = locaTable.data, length = data.length;
-        var lastOffset = itemDecode(data, 0);
-        for (var i = itemSize, j = 0; i < length; i += itemSize, j++) {
-          var offset = itemDecode(data, i);
-          if (offset == lastOffset)
-            emptyGlyphIds[j] = true;
-          lastOffset = offset;
-        }
-      }
-
-      function readGlyphNameMap(post, properties) {
-        var start = (font.start ? font.start : 0) + post.offset;
-        font.pos = start;
-
-        var length = post.length, end = start + length;
-        var version = int32(font.getBytes(4));
-        // skip rest to the tables
-        font.getBytes(28);
-
-        var glyphNames;
-        switch (version) {
-          case 0x00010000:
-            glyphNames = MacStandardGlyphOrdering;
-            break;
-          case 0x00020000:
-            var numGlyphs = int16(font.getBytes(2));
-            var glyphNameIndexes = [];
-            for (var i = 0; i < numGlyphs; ++i)
-              glyphNameIndexes.push(int16(font.getBytes(2)));
-            var customNames = [];
-            while (font.pos < end) {
-              var stringLength = font.getByte();
-              var string = '';
-              for (var i = 0; i < stringLength; ++i)
-                string += font.getChar();
-              customNames.push(string);
-            }
-            glyphNames = [];
-            for (var i = 0; i < numGlyphs; ++i) {
-              var j = glyphNameIndexes[i];
-              if (j < 258) {
-                glyphNames.push(MacStandardGlyphOrdering[j]);
-                continue;
-              }
-              glyphNames.push(customNames[j - 258]);
-            }
-            break;
-          case 0x00030000:
-            break;
-          default:
-            warn('Unknown/unsupported post table version ' + version);
-            break;
-        }
-        properties.glyphNames = glyphNames;
-      }
-
-      function isOS2Valid(os2Table) {
-        var data = os2Table.data;
-        // usWinAscent == 0 makes font unreadable by windows
-        var usWinAscent = (data[74] << 8) | data[75];
-        if (usWinAscent == 0)
-          return false;
-
-        return true;
-      }
-
-      // Check that required tables are present
-      var requiredTables = ['OS/2', 'cmap', 'head', 'hhea',
-                             'hmtx', 'maxp', 'name', 'post'];
-
-      var header = readOpenTypeHeader(font);
-      var numTables = header.numTables;
-
-      var cmap, post, maxp, hhea, hmtx, vhea, vmtx, head, loca, glyf, os2;
-      var tables = [];
-      for (var i = 0; i < numTables; i++) {
-        var table = readTableEntry(font);
-        var index = requiredTables.indexOf(table.tag);
-        if (index != -1) {
-          if (table.tag == 'cmap')
-            cmap = table;
-          else if (table.tag == 'post')
-            post = table;
-          else if (table.tag == 'maxp')
-            maxp = table;
-          else if (table.tag == 'hhea')
-            hhea = table;
-          else if (table.tag == 'hmtx')
-            hmtx = table;
-          else if (table.tag == 'head')
-            head = table;
-          else if (table.tag == 'OS/2')
-            os2 = table;
-
-          requiredTables.splice(index, 1);
-        } else {
-          if (table.tag == 'vmtx')
-            vmtx = table;
-          else if (table.tag == 'vhea')
-            vhea = table;
-          else if (table.tag == 'loca')
-            loca = table;
-          else if (table.tag == 'glyf')
-            glyf = table;
-        }
-        tables.push(table);
-      }
-
-      var numTables = tables.length + requiredTables.length;
-
-      // header and new offsets. Table entry information is appended to the
-      // end of file. The virtualOffset represents where to put the actual
-      // data of a particular table;
-      var ttf = {
-        file: '',
-        virtualOffset: numTables * (4 * 4)
-      };
-
-      // The new numbers of tables will be the last one plus the num
-      // of missing tables
-      createOpenTypeHeader(header.version, ttf, numTables);
-
-      // Invalid OS/2 can break the font for the Windows
-      if (os2 && !isOS2Valid(os2)) {
-        tables.splice(tables.indexOf(os2), 1);
-        os2 = null;
-      }
-
-      // Ensure the [h/v]mtx tables contains the advance width and
-      // sidebearings information for numGlyphs in the maxp table
-      font.pos = (font.start || 0) + maxp.offset;
-      var version = int16(font.getBytes(4));
-      var numGlyphs = int16(font.getBytes(2));
-
-      sanitizeMetrics(font, hhea, hmtx, numGlyphs);
-      sanitizeMetrics(font, vhea, vmtx, numGlyphs);
-
-      var isGlyphLocationsLong = int16([head.data[50], head.data[51]]);
-      if (head && loca && glyf) {
-        sanitizeGlyphLocations(loca, glyf, numGlyphs, isGlyphLocationsLong);
-      }
-
-      var emptyGlyphIds = [];
-      if (glyf)
-        findEmptyGlyphs(loca, isGlyphLocationsLong, emptyGlyphIds);
-
-      // Sanitizer reduces the glyph advanceWidth to the maxAdvanceWidth
-      // Sometimes it's 0. That needs to be fixed
-      if (hhea.data[10] == 0 && hhea.data[11] == 0) {
-        hhea.data[10] = 0xFF;
-        hhea.data[11] = 0xFF;
-      }
-
-      // The 'post' table has glyphs names.
-      if (post) {
-        readGlyphNameMap(post, properties);
-      }
-
-      var glyphs, ids;
-      if (properties.type == 'CIDFontType2') {
-        // Replace the old CMAP table with a shiny new one
-        // Type2 composite fonts map characters directly to glyphs so the cmap
-        // table must be replaced.
-        // canvas fillText will reencode some characters even if the font has a
-        // glyph at that position - e.g. newline is converted to a space and
-        // U+00AD (soft hyphen) is not drawn.
-        // So, offset all the glyphs by 0xFF to avoid these cases and use
-        // the encoding to map incoming characters to the new glyph positions
-        if (!cmap) {
-          cmap = {
-            tag: 'cmap',
-            data: null
-          };
-          tables.push(cmap);
-        }
-
-        var cidToGidMap = properties.cidToGidMap || [];
-        var gidToCidMap = [0];
-        if (cidToGidMap.length > 0) {
-          for (var j = cidToGidMap.length - 1; j >= 0; j--) {
-            var gid = cidToGidMap[j];
-            if (gid)
-              gidToCidMap[gid] = j;
-          }
-          // filling the gaps using CID above the CIDs currently used in font
-          var nextCid = cidToGidMap.length;
-          for (var i = 1; i < numGlyphs; i++) {
-            if (!gidToCidMap[i])
-              gidToCidMap[i] = nextCid++;
-          }
-        }
-
-        glyphs = [];
-        ids = [];
-
-        var usedUnicodes = [];
-        var unassignedUnicodeItems = [];
-        for (var i = 1; i < numGlyphs; i++) {
-          var cid = gidToCidMap[i] || i;
-          var unicode = this.toFontChar[cid];
-          if (!unicode || typeof unicode !== 'number' ||
-              isSpecialUnicode(unicode) || unicode in usedUnicodes) {
-            unassignedUnicodeItems.push(i);
-            continue;
-          }
-          usedUnicodes[unicode] = true;
-          glyphs.push({ unicode: unicode, code: cid });
-          ids.push(i);
-        }
-        // trying to fit as many unassigned symbols as we can
-        // in the range allocated for the user defined symbols
-        var unusedUnicode = kCmapGlyphOffset;
-        for (var j = 0, jj = unassignedUnicodeItems.length; j < jj; j++) {
-          var i = unassignedUnicodeItems[j];
-          var cid = gidToCidMap[i] || i;
-          while (unusedUnicode in usedUnicodes)
-            unusedUnicode++;
-          if (unusedUnicode >= kCmapGlyphOffset + kSizeOfGlyphArea)
-            break;
-          var unicode = unusedUnicode++;
-          this.toFontChar[cid] = unicode;
-          usedUnicodes[unicode] = true;
-          glyphs.push({ unicode: unicode, code: cid });
-          ids.push(i);
-        }
-      } else {
-        var cmapTable = readCMapTable(cmap, font);
-
-        glyphs = cmapTable.glyphs;
-        ids = cmapTable.ids;
-
-        var hasShortCmap = !!cmapTable.hasShortCmap;
-        var toFontChar = this.toFontChar;
-
-        if (hasShortCmap && ids.length == numGlyphs) {
-          // Fixes the short cmap tables -- some generators use incorrect
-          // glyph id.
-          for (var i = 0, ii = ids.length; i < ii; i++)
-            ids[i] = i;
-        }
-
-        var unusedUnicode = kCmapGlyphOffset;
-        var glyphNames = properties.glyphNames || [];
-        var encoding = properties.baseEncoding;
-        var differences = properties.differences;
-        if (toFontChar && toFontChar.length > 0) {
-          // checking if cmap is just identity map
-          var isIdentity = true;
-          for (var i = 0, ii = glyphs.length; i < ii; i++) {
-            if (glyphs[i].unicode != i + 1) {
-              isIdentity = false;
-              break;
-            }
-          }
-          // if it is, replacing with meaningful toUnicode values
-          if (isIdentity && !this.isSymbolicFont) {
-            var usedUnicodes = [], unassignedUnicodeItems = [];
-            for (var i = 0, ii = glyphs.length; i < ii; i++) {
-              var unicode = toFontChar[i + 1];
-              if (!unicode || typeof unicode !== 'number' ||
-                  unicode in usedUnicodes) {
-                unassignedUnicodeItems.push(i);
-                continue;
-              }
-              glyphs[i].unicode = unicode;
-              usedUnicodes[unicode] = true;
-            }
-            for (var j = 0, jj = unassignedUnicodeItems.length; j < jj; j++) {
-              var i = unassignedUnicodeItems[j];
-              while (unusedUnicode in usedUnicodes)
-                unusedUnicode++;
-              var cid = i + 1;
-              // override only if unicode mapping is not specified
-              if (!(cid in toFontChar))
-                toFontChar[cid] = unusedUnicode;
-              glyphs[i].unicode = unusedUnicode++;
-            }
-            this.useToFontChar = true;
-          }
-        }
-
-        // remove glyph references outside range of avaialable glyphs or empty
-        var glyphsRemoved = 0;
-        for (var i = ids.length - 1; i >= 0; i--) {
-          if (ids[i] < numGlyphs &&
-              (!emptyGlyphIds[ids[i]] || this.isSymbolicFont))
-            continue;
-          ids.splice(i, 1);
-          glyphs.splice(i, 1);
-          glyphsRemoved++;
-        }
-
-        // checking if it's a "true" symbolic font
-        if (this.isSymbolicFont) {
-          var minUnicode = 0xFFFF, maxUnicode = 0;
-          for (var i = 0, ii = glyphs.length; i < ii; i++) {
-            var unicode = glyphs[i].unicode;
-            minUnicode = Math.min(minUnicode, unicode);
-            maxUnicode = Math.max(maxUnicode, unicode);
-          }
-          // high byte must be the same for min and max unicodes
-          if ((maxUnicode & 0xFF00) != (minUnicode & 0xFF00))
-            this.isSymbolicFont = false;
-        }
-
-        // heuristics: if removed more than 10 glyphs encoding WinAnsiEncoding
-        // does not set properly (broken PDFs have about 100 removed glyphs)
-        if (glyphsRemoved > 10) {
-          warn('Switching TrueType encoding to MacRomanEncoding for ' +
-               this.name + ' font');
-          encoding = Encodings.MacRomanEncoding;
-        }
-
-        if (hasShortCmap && this.hasEncoding && !this.isSymbolicFont) {
-          // Re-encode short map encoding to unicode -- that simplifies the
-          // resolution of MacRoman encoded glyphs logic for TrueType fonts:
-          // copying all characters to private use area, all mapping all known
-          // glyphs to the unicodes. The glyphs and ids arrays will grow.
-          var usedUnicodes = [];
-          for (var i = 0, ii = glyphs.length; i < ii; i++) {
-            var code = glyphs[i].unicode;
-            var gid = ids[i];
-            glyphs[i].unicode += kCmapGlyphOffset;
-            toFontChar[code] = glyphs[i].unicode;
-
-            var glyphName = glyphNames[gid] || encoding[code];
-            if (glyphName in GlyphsUnicode) {
-              var unicode = GlyphsUnicode[glyphName];
-              if (unicode in usedUnicodes)
-                continue;
-
-              usedUnicodes[unicode] = true;
-              glyphs.push({
-                unicode: unicode,
-                code: glyphs[i].code
-              });
-              ids.push(gid);
-              toFontChar[code] = unicode;
-            }
-          }
-          this.useToFontChar = true;
-        } else if (!this.isSymbolicFont && (this.hasEncoding ||
-                    properties.glyphNames || differences.length > 0)) {
-          // Re-encode cmap encoding to unicode, based on the 'post' table data
-          // diffrence array or base encoding
-          var reverseMap = [];
-          for (var i = 0, ii = glyphs.length; i < ii; i++)
-            reverseMap[glyphs[i].unicode] = i;
-
-          var newGlyphUnicodes = [];
-          for (var i = 0, ii = glyphs.length; i < ii; i++) {
-            var code = glyphs[i].unicode;
-            var changeCode = false;
-            var gid = ids[i];
-
-            var glyphName = glyphNames[gid];
-            if (!glyphName) {
-              glyphName = differences[code] || encoding[code];
-              changeCode = true;
-            }
-            if (glyphName in GlyphsUnicode) {
-              var unicode = GlyphsUnicode[glyphName];
-              if (!unicode || reverseMap[unicode] === i)
-                continue; // unknown glyph name or in its own place
-
-              newGlyphUnicodes[i] = unicode;
-              if (changeCode)
-                toFontChar[code] = unicode;
-              delete reverseMap[code];
-            }
-          }
-          for (var index in newGlyphUnicodes) {
-            var unicode = newGlyphUnicodes[index];
-            if (reverseMap[unicode]) {
-              // avoiding assigning to the same unicode
-              glyphs[index].unicode = unusedUnicode++;
-              continue;
-            }
-            glyphs[index].unicode = unicode;
-            reverseMap[unicode] = index;
-          }
-          this.useToFontChar = true;
-        }
-
-        // Moving all symbolic font glyphs into 0xF000 - 0xF0FF range.
-        if (this.isSymbolicFont) {
-          for (var i = 0, ii = glyphs.length; i < ii; i++) {
-            var code = glyphs[i].unicode & 0xFF;
-            var fontCharCode = kSymbolicFontGlyphOffset | code;
-            glyphs[i].unicode = toFontChar[code] = fontCharCode;
-          }
-          this.useToFontChar = true;
-        }
-
-        createGlyphNameMap(glyphs, ids, properties);
-        this.glyphNameMap = properties.glyphNameMap;
-      }
-
-      // Converting glyphs and ids into font's cmap table
-      cmap.data = createCMapTable(glyphs, ids);
-      var unicodeIsEnabled = [];
-      for (var i = 0, ii = glyphs.length; i < ii; i++) {
-        unicodeIsEnabled[glyphs[i].unicode] = true;
-      }
-      this.unicodeIsEnabled = unicodeIsEnabled;
-
-      if (!os2) {
-        // extract some more font properties from the OpenType head and
-        // hhea tables; yMin and descent value are always negative
-        var override = {
-          unitsPerEm: int16([head.data[18], head.data[19]]),
-          yMax: int16([head.data[42], head.data[43]]),
-          yMin: int16([head.data[38], head.data[39]]) - 0x10000,
-          ascent: int16([hhea.data[4], hhea.data[5]]),
-          descent: int16([hhea.data[6], hhea.data[7]]) - 0x10000
-        };
-
-        tables.push({
-          tag: 'OS/2',
-          data: stringToArray(createOS2Table(properties, glyphs, override))
-        });
-      }
-
-      // Rewrite the 'post' table if needed
-      if (requiredTables.indexOf('post') != -1) {
-        tables.push({
-          tag: 'post',
-          data: stringToArray(createPostTable(properties))
-        });
-      }
-
-      // Rewrite the 'name' table if needed
-      if (requiredTables.indexOf('name') != -1) {
-        tables.push({
-          tag: 'name',
-          data: stringToArray(createNameTable(this.name))
-        });
-      }
-
-      // Tables needs to be written by ascendant alphabetic order
-      tables.sort(function tables_sort(a, b) {
-        return (a.tag > b.tag) - (a.tag < b.tag);
-      });
-
-      // rewrite the tables but tweak offsets
-      for (var i = 0, ii = tables.length; i < ii; i++) {
-        var table = tables[i];
-        var data = [];
-
-        var tableData = table.data;
-        for (var j = 0, jj = tableData.length; j < jj; j++)
-          data.push(tableData[j]);
-        createTableEntry(ttf, table.tag, data);
-      }
-
-      // Add the table datas
-      for (var i = 0, ii = tables.length; i < ii; i++) {
-        var table = tables[i];
-        var tableData = table.data;
-        ttf.file += arrayToString(tableData);
-
-        // 4-byte aligned data
-        while (ttf.file.length & 3)
-          ttf.file += String.fromCharCode(0);
-      }
-
-      return stringToArray(ttf.file);
-    },
-
-    convert: function Font_convert(fontName, font, properties) {
-      function isFixedPitch(glyphs) {
-        for (var i = 0, ii = glyphs.length - 1; i < ii; i++) {
-          if (glyphs[i] != glyphs[i + 1])
-            return false;
-        }
-        return true;
-      }
-
-      // The offsets object holds at the same time a representation of where
-      // to write the table entry information about a table and another offset
-      // representing the offset where to draw the actual data of a particular
-      // table
-      var kRequiredTablesCount = 9;
-
-      var otf = {
-        file: '',
-        virtualOffset: 9 * (4 * 4)
-      };
-
-      createOpenTypeHeader('\x4F\x54\x54\x4F', otf, 9);
-
-      var charstrings = font.charstrings;
-      properties.fixedPitch = isFixedPitch(charstrings);
-
-      var glyphNameMap = {};
-      for (var i = 0; i < charstrings.length; ++i) {
-        var charstring = charstrings[i];
-        glyphNameMap[charstring.glyph] = charstring.unicode;
-      }
-      this.glyphNameMap = glyphNameMap;
-
-      if (!properties.hasEncoding && (properties.subtype == 'Type1C' ||
-          properties.subtype == 'CIDFontType0C')) {
-        var encoding = [];
-        for (var i = 0; i < charstrings.length; ++i) {
-          var charstring = charstrings[i];
-          encoding[charstring.code] = charstring.glyph;
-        }
-        properties.baseEncoding = encoding;
-      }
-      if (properties.subtype == 'CIDFontType0C') {
-        var toFontChar = [];
-        for (var i = 0; i < charstrings.length; ++i) {
-          var charstring = charstrings[i];
-          toFontChar[charstring.code] = charstring.unicode;
-        }
-        this.toFontChar = toFontChar;
-      }
-
-      var fields = {
-        // PostScript Font Program
-        'CFF ': font.data,
-
-        // OS/2 and Windows Specific metrics
-        'OS/2': stringToArray(createOS2Table(properties, charstrings)),
-
-        // Character to glyphs mapping
-        'cmap': createCMapTable(charstrings.slice(),
-                                ('glyphIds' in font) ? font.glyphIds : null),
-
-        // Font header
-        'head': (function fontFieldsHead() {
-          return stringToArray(
-              '\x00\x01\x00\x00' + // Version number
-              '\x00\x00\x10\x00' + // fontRevision
-              '\x00\x00\x00\x00' + // checksumAdjustement
-              '\x5F\x0F\x3C\xF5' + // magicNumber
-              '\x00\x00' + // Flags
-              '\x03\xE8' + // unitsPerEM (defaulting to 1000)
-              '\x00\x00\x00\x00\x9e\x0b\x7e\x27' + // creation date
-              '\x00\x00\x00\x00\x9e\x0b\x7e\x27' + // modifification date
-              '\x00\x00' + // xMin
-              safeString16(properties.descent) + // yMin
-              '\x0F\xFF' + // xMax
-              safeString16(properties.ascent) + // yMax
-              string16(properties.italicAngle ? 2 : 0) + // macStyle
-              '\x00\x11' + // lowestRecPPEM
-              '\x00\x00' + // fontDirectionHint
-              '\x00\x00' + // indexToLocFormat
-              '\x00\x00');  // glyphDataFormat
-        })(),
-
-        // Horizontal header
-        'hhea': (function fontFieldsHhea() {
-          return stringToArray(
-              '\x00\x01\x00\x00' + // Version number
-              safeString16(properties.ascent) + // Typographic Ascent
-              safeString16(properties.descent) + // Typographic Descent
-              '\x00\x00' + // Line Gap
-              '\xFF\xFF' + // advanceWidthMax
-              '\x00\x00' + // minLeftSidebearing
-              '\x00\x00' + // minRightSidebearing
-              '\x00\x00' + // xMaxExtent
-              safeString16(properties.capHeight) + // caretSlopeRise
-              safeString16(Math.tan(properties.italicAngle) *
-                       properties.xHeight) + // caretSlopeRun
-              '\x00\x00' + // caretOffset
-              '\x00\x00' + // -reserved-
-              '\x00\x00' + // -reserved-
-              '\x00\x00' + // -reserved-
-              '\x00\x00' + // -reserved-
-              '\x00\x00' + // metricDataFormat
-              string16(charstrings.length + 1)); // Number of HMetrics
-        })(),
-
-        // Horizontal metrics
-        'hmtx': (function fontFieldsHmtx() {
-          var hmtx = '\x00\x00\x00\x00'; // Fake .notdef
-          for (var i = 0, ii = charstrings.length; i < ii; i++) {
-            var charstring = charstrings[i];
-            var width = 'width' in charstring ? charstring.width : 0;
-            hmtx += string16(width) + string16(0);
-          }
-          return stringToArray(hmtx);
-        })(),
-
-        // Maximum profile
-        'maxp': (function fontFieldsMaxp() {
-          return stringToArray(
-              '\x00\x00\x50\x00' + // Version number
-             string16(charstrings.length + 1)); // Num of glyphs
-        })(),
-
-        // Naming tables
-        'name': stringToArray(createNameTable(fontName)),
-
-        // PostScript informations
-        'post': stringToArray(createPostTable(properties))
-      };
-
-      for (var field in fields)
-        createTableEntry(otf, field, fields[field]);
-
-      for (var field in fields) {
-        var table = fields[field];
-        otf.file += arrayToString(table);
-      }
-
-      return stringToArray(otf.file);
-    },
-
-    buildToFontChar: function Font_buildToFontChar(toUnicode) {
-      var result = [];
-      var unusedUnicode = kCmapGlyphOffset;
-      for (var i = 0, ii = toUnicode.length; i < ii; i++) {
-        var unicode = toUnicode[i];
-        var fontCharCode = typeof unicode === 'object' ? unusedUnicode++ :
-          unicode;
-        if (typeof unicode !== 'undefined')
-          result[i] = fontCharCode;
-      }
-      return result;
-    },
-
-    rebuildToUnicode: function Font_rebuildToUnicode(properties) {
-      var firstChar = properties.firstChar, lastChar = properties.lastChar;
-      var map = [];
-      if (properties.composite) {
-        var isIdentityMap = this.cidToUnicode.length == 0;
-        for (var i = firstChar, ii = lastChar; i <= ii; i++) {
-          // TODO missing map the character according font's CMap
-          var cid = i;
-          map[i] = isIdentityMap ? cid : this.cidToUnicode[cid];
-        }
-      } else {
-        for (var i = firstChar, ii = lastChar; i <= ii; i++) {
-          var glyph = properties.differences[i];
-          if (!glyph)
-            glyph = properties.baseEncoding[i];
-          if (!!glyph && (glyph in GlyphsUnicode))
-            map[i] = GlyphsUnicode[glyph];
-        }
-      }
-      this.toUnicode = map;
-    },
-
-    loadCidToUnicode: function Font_loadCidToUnicode(properties) {
-      if (!properties.cidSystemInfo)
-        return;
-
-      var cidToUnicodeMap = [], unicodeToCIDMap = [];
-      this.cidToUnicode = cidToUnicodeMap;
-      this.unicodeToCID = unicodeToCIDMap;
-
-      var cidSystemInfo = properties.cidSystemInfo;
-      var cidToUnicode;
-      if (cidSystemInfo) {
-        cidToUnicode = CIDToUnicodeMaps[
-          cidSystemInfo.registry + '-' + cidSystemInfo.ordering];
-      }
-
-      if (!cidToUnicode)
-        return; // identity encoding
-
-      var cid = 1, i, j, k, ii;
-      for (i = 0, ii = cidToUnicode.length; i < ii; ++i) {
-        var unicode = cidToUnicode[i];
-        if (isArray(unicode)) {
-          var length = unicode.length;
-          for (j = 0; j < length; j++) {
-            cidToUnicodeMap[cid] = unicode[j];
-            unicodeToCIDMap[unicode[j]] = cid;
-          }
-          cid++;
-        } else if (typeof unicode === 'object') {
-          var fillLength = unicode.f;
-          if (fillLength) {
-            k = unicode.c;
-            for (j = 0; j < fillLength; ++j) {
-              cidToUnicodeMap[cid] = k;
-              unicodeToCIDMap[k] = cid;
-              cid++;
-              k++;
-            }
-          } else
-            cid += unicode.s;
-        } else if (unicode) {
-          cidToUnicodeMap[cid] = unicode;
-          unicodeToCIDMap[unicode] = cid;
-          cid++;
-        } else
-          cid++;
-      }
-    },
-
-    bindDOM: function Font_bindDOM(data) {
-      var fontName = this.loadedName;
-
-      // Add the font-face rule to the document
-      var url = ('url(data:' + this.mimetype + ';base64,' +
-                 window.btoa(data) + ');');
-      var rule = "@font-face { font-family:'" + fontName + "';src:" + url + '}';
-
-      var styleElement = document.createElement('style');
-      document.documentElement.getElementsByTagName('head')[0].appendChild(
-        styleElement);
-
-      var styleSheet = styleElement.sheet;
-      styleSheet.insertRule(rule, styleSheet.cssRules.length);
-
-      if (PDFJS.pdfBug && FontInspector.enabled)
-        FontInspector.fontAdded(this, url);
-
-      return rule;
-    },
-
-    get spaceWidth() {
-      // trying to estimate space character width
-      var possibleSpaceReplacements = ['space', 'minus', 'one', 'i'];
-      var width;
-      for (var i = 0, ii = possibleSpaceReplacements.length; i < ii; i++) {
-        var glyphName = possibleSpaceReplacements[i];
-        // if possible, getting width by glyph name
-        if (glyphName in this.widths) {
-          width = this.widths[glyphName];
-          break;
-        }
-        var glyphUnicode = GlyphsUnicode[glyphName];
-        // finding the charcode via unicodeToCID map
-        var charcode = 0;
-        if (this.composite)
-          charcode = this.unicodeToCID[glyphUnicode];
-        // ... via toUnicode map
-        if (!charcode && 'toUnicode' in this)
-          charcode = this.toUnicode.indexOf(glyphUnicode);
-        // setting it to unicode if negative or undefined
-        if (!(charcode > 0))
-          charcode = glyphUnicode;
-        // trying to get width via charcode
-        width = this.widths[charcode];
-        if (width)
-          break; // the non-zero width found
-      }
-      width = (width || this.defaultWidth) * this.widthMultiplier;
-      return shadow(this, 'spaceWidth', width);
-    },
-
-    charToGlyph: function Font_charToGlyph(charcode) {
-      var fontCharCode, width, operatorList, disabled;
-
-      var width = this.widths[charcode];
-
-      switch (this.type) {
-        case 'CIDFontType0':
-          if (this.noUnicodeAdaptation) {
-            width = this.widths[this.unicodeToCID[charcode] || charcode];
-            fontCharCode = mapPrivateUseChars(charcode);
-            break;
-          }
-          fontCharCode = this.toFontChar[charcode] || charcode;
-          break;
-        case 'CIDFontType2':
-          if (this.noUnicodeAdaptation) {
-            width = this.widths[this.unicodeToCID[charcode] || charcode];
-            fontCharCode = mapPrivateUseChars(charcode);
-            break;
-          }
-          fontCharCode = this.toFontChar[charcode] || charcode;
-          break;
-        case 'Type1':
-          var glyphName = this.differences[charcode] || this.encoding[charcode];
-          if (!isNum(width))
-            width = this.widths[glyphName];
-          if (this.noUnicodeAdaptation) {
-            fontCharCode = mapPrivateUseChars(GlyphsUnicode[glyphName] ||
-              charcode);
-            break;
-          }
-          fontCharCode = this.glyphNameMap[glyphName] ||
-            GlyphsUnicode[glyphName] || charcode;
-          break;
-        case 'Type3':
-          var glyphName = this.differences[charcode] || this.encoding[charcode];
-          operatorList = this.charProcOperatorList[glyphName];
-          fontCharCode = charcode;
-          break;
-        case 'TrueType':
-          if (this.useToFontChar) {
-            fontCharCode = this.toFontChar[charcode] || charcode;
-            break;
-          }
-          var glyphName = this.differences[charcode] || this.encoding[charcode];
-          if (!glyphName)
-            glyphName = Encodings.StandardEncoding[charcode];
-          if (!isNum(width))
-            width = this.widths[glyphName];
-          if (this.noUnicodeAdaptation) {
-            fontCharCode = GlyphsUnicode[glyphName] || charcode;
-            break;
-          }
-          if (!this.hasEncoding || this.isSymbolicFont) {
-            fontCharCode = this.useToFontChar ? this.toFontChar[charcode] :
-              charcode;
-            break;
-          }
-
-          // MacRoman encoding address by re-encoding the cmap table
-
-          fontCharCode = glyphName in this.glyphNameMap ?
-            this.glyphNameMap[glyphName] : GlyphsUnicode[glyphName];
-          break;
-        default:
-          warn('Unsupported font type: ' + this.type);
-          break;
-      }
-
-      var unicodeChars = !('toUnicode' in this) ? charcode :
-        this.toUnicode[charcode] || charcode;
-      if (typeof unicodeChars === 'number')
-        unicodeChars = String.fromCharCode(unicodeChars);
-
-      width = (isNum(width) ? width : this.defaultWidth) * this.widthMultiplier;
-      disabled = this.unicodeIsEnabled ?
-        !this.unicodeIsEnabled[fontCharCode] : false;
-
-      return {
-        fontChar: String.fromCharCode(fontCharCode),
-        unicode: unicodeChars,
-        width: width,
-        disabled: disabled,
-        operatorList: operatorList
-      };
-    },
-
-    charsToGlyphs: function Font_charsToGlyphs(chars) {
-      var charsCache = this.charsCache;
-      var glyphs;
-
-      // if we translated this string before, just grab it from the cache
-      if (charsCache) {
-        glyphs = charsCache[chars];
-        if (glyphs)
-          return glyphs;
-      }
-
-      // lazily create the translation cache
-      if (!charsCache)
-        charsCache = this.charsCache = Object.create(null);
-
-      glyphs = [];
-
-      if (this.wideChars) {
-        // composite fonts have multi-byte strings convert the string from
-        // single-byte to multi-byte
-        // XXX assuming CIDFonts are two-byte - later need to extract the
-        // correct byte encoding according to the PDF spec
-        var length = chars.length - 1; // looping over two bytes at a time so
-                                       // loop should never end on the last byte
-        for (var i = 0; i < length; i++) {
-          var charcode = int16([chars.charCodeAt(i++), chars.charCodeAt(i)]);
-          var glyph = this.charToGlyph(charcode);
-          glyphs.push(glyph);
-          // placing null after each word break charcode (ASCII SPACE)
-          if (charcode == 0x20)
-            glyphs.push(null);
-        }
-      }
-      else {
-        for (var i = 0, ii = chars.length; i < ii; ++i) {
-          var charcode = chars.charCodeAt(i);
-          var glyph = this.charToGlyph(charcode);
-          glyphs.push(glyph);
-          if (charcode == 0x20)
-            glyphs.push(null);
-        }
-      }
-
-      // Enter the translated string into the cache
-      return (charsCache[chars] = glyphs);
-    }
-  };
-
-  return Font;
-})();
-
-/*
- * Type1Parser encapsulate the needed code for parsing a Type1 font
- * program. Some of its logic depends on the Type2 charstrings
- * structure.
- */
-var Type1Parser = function type1Parser() {
-  /*
-   * Decrypt a Sequence of Ciphertext Bytes to Produce the Original Sequence
-   * of Plaintext Bytes. The function took a key as a parameter which can be
-   * for decrypting the eexec block of for decoding charStrings.
-   */
-  var kEexecEncryptionKey = 55665;
-  var kCharStringsEncryptionKey = 4330;
-
-  function decrypt(stream, key, discardNumber) {
-    var r = key, c1 = 52845, c2 = 22719;
-    var decryptedString = [];
-
-    var value = '';
-    var count = stream.length;
-    for (var i = 0; i < count; i++) {
-      value = stream[i];
-      decryptedString[i] = value ^ (r >> 8);
-      r = ((value + r) * c1 + c2) & ((1 << 16) - 1);
-    }
-    return decryptedString.slice(discardNumber);
-  }
-
-  /*
-   * CharStrings are encoded following the the CharString Encoding sequence
-   * describe in Chapter 6 of the "Adobe Type1 Font Format" specification.
-   * The value in a byte indicates a command, a number, or subsequent bytes
-   * that are to be interpreted in a special way.
-   *
-   * CharString Number Encoding:
-   *  A CharString byte containing the values from 32 through 255 inclusive
-   *  indicate an integer. These values are decoded in four ranges.
-   *
-   * 1. A CharString byte containing a value, v, between 32 and 246 inclusive,
-   * indicate the integer v - 139. Thus, the integer values from -107 through
-   * 107 inclusive may be encoded in single byte.
-   *
-   * 2. A CharString byte containing a value, v, between 247 and 250 inclusive,
-   * indicates an integer involving the next byte, w, according to the formula:
-   * [(v - 247) x 256] + w + 108
-   *
-   * 3. A CharString byte containing a value, v, between 251 and 254 inclusive,
-   * indicates an integer involving the next byte, w, according to the formula:
-   * -[(v - 251) * 256] - w - 108
-   *
-   * 4. A CharString containing the value 255 indicates that the next 4 bytes
-   * are a two complement signed integer. The first of these bytes contains the
-   * highest order bits, the second byte contains the next higher order bits
-   * and the fourth byte contain the lowest order bits.
-   *
-   *
-   * CharString Command Encoding:
-   *  CharStrings commands are encoded in 1 or 2 bytes.
-   *
-   *  Single byte commands are encoded in 1 byte that contains a value between
-   *  0 and 31 inclusive.
-   *  If a command byte contains the value 12, then the value in the next byte
-   *  indicates a command. This "escape" mechanism allows many extra commands
-   * to be encoded and this encoding technique helps to minimize the length of
-   * the charStrings.
-   */
-  var charStringDictionary = {
-    '1': 'hstem',
-    '3': 'vstem',
-    '4': 'vmoveto',
-    '5': 'rlineto',
-    '6': 'hlineto',
-    '7': 'vlineto',
-    '8': 'rrcurveto',
-
-    // closepath is a Type1 command that do not take argument and is useless
-    // in Type2 and it can simply be ignored.
-    '9': null, // closepath
-
-    '10': 'callsubr',
-
-    // return is normally used inside sub-routines to tells to the execution
-    // flow that it can be back to normal.
-    // During the translation process Type1 charstrings will be flattened and
-    // sub-routines will be embedded directly into the charstring directly, so
-    // this can be ignored safely.
-    '11': 'return',
-
-    '12': {
-      // dotsection is a Type1 command to specify some hinting feature for dots
-      // that do not take a parameter and it can safely be ignored for Type2.
-      '0': null, // dotsection
-
-      // [vh]stem3 are Type1 only and Type2 supports [vh]stem with multiple
-      // parameters, so instead of returning [vh]stem3 take a shortcut and
-      // return [vhstem] instead.
-      '1': 'vstem',
-      '2': 'hstem',
-
-      // Type1 only command with command not (yet) built-in ,throw an error
-      '6': -1, // seac
-      '7': -1, // sbw
-
-      '11': 'sub',
-      '12': 'div',
-
-      // callothersubr is a mechanism to make calls on the postscript
-      // interpreter, this is not supported by Type2 charstring but hopefully
-      // most of the default commands can be ignored safely.
-      '16': 'callothersubr',
-
-      '17': 'pop',
-
-      // setcurrentpoint sets the current point to x, y without performing a
-      // moveto (this is a one shot positionning command). This is used only
-      // with the return of an OtherSubrs call.
-      // TODO Implement the OtherSubrs charstring embedding and replace this
-      // call by a no-op, like 2 'pop' commands for example.
-      '33': null // setcurrentpoint
-    },
-    '13': 'hsbw',
-    '14': 'endchar',
-    '21': 'rmoveto',
-    '22': 'hmoveto',
-    '30': 'vhcurveto',
-    '31': 'hvcurveto'
-  };
-
-  var kEscapeCommand = 12;
-
-  function decodeCharString(array) {
-    var charstring = [];
-    var lsb = 0;
-    var width = 0;
-    var flexState = 0;
-
-    var value = '';
-    var count = array.length;
-    for (var i = 0; i < count; i++) {
-      value = array[i];
-
-      if (value < 32) {
-        var command = null;
-        if (value == kEscapeCommand) {
-          var escape = array[++i];
-
-          // TODO Clean this code
-          if (escape == 16) {
-            var index = charstring.pop();
-            var argc = charstring.pop();
-            for (var j = 0; j < argc; j++)
-              charstring.push('drop');
-
-            // If the flex mechanism is not used in a font program, Adobe
-            // states that entries 0, 1 and 2 can simply be replaced by
-            // {}, which means that we can simply ignore them.
-            if (index < 3) {
-              continue;
-            }
-
-            // This is the same things about hint replacement, if it is not used
-            // entry 3 can be replaced by {3}
-            // TODO support hint replacment
-            if (index == 3) {
-              charstring.push(3);
-              i++;
-              continue;
-            }
-          } else if (escape == 17 || escape == 33) {
-            // pop or setcurrentpoint commands can be ignored
-            // since we are not doing callothersubr
-            continue;
-          } else if (!kHintingEnabled && (escape == 1 || escape == 2)) {
-            charstring.push('drop', 'drop', 'drop', 'drop', 'drop', 'drop');
-            continue;
-          }
-
-          command = charStringDictionary['12'][escape];
-        } else {
-          // TODO Clean this code
-          if (value == 13) { // hsbw
-            if (charstring.length == 2) {
-              lsb = charstring[0];
-              width = charstring[1];
-              charstring.splice(0, 1);
-            } else if (charstring.length == 4 && charstring[3] == 'div') {
-              lsb = charstring[0];
-              width = charstring[1] / charstring[2];
-              charstring.splice(0, 1);
-            } else if (charstring.length == 4 && charstring[2] == 'div') {
-              lsb = charstring[0] / charstring[1];
-              width = charstring[3];
-              charstring.splice(0, 3);
-            } else {
-              error('Unsupported hsbw format: ' + charstring);
-            }
-
-            charstring.push(lsb, 'hmoveto');
-            continue;
-          } else if (value == 10) { // callsubr
-            if (charstring[charstring.length - 1] < 3) { // subr #0..2
-              var subrNumber = charstring.pop();
-              switch (subrNumber) {
-                case 1:
-                  flexState = 1; // prepare for flex coordinates
-                  break;
-                case 2:
-                  flexState = 2; // flex in progress
-                  break;
-                case 0:
-                  // type2 flex command does not need final coords
-                  charstring.push('exch', 'drop', 'exch', 'drop');
-                  charstring.push('flex');
-                  flexState = 0;
-                  break;
-              }
-              continue;
-            }
-          } else if (value == 21 && flexState > 0) {
-            if (flexState > 1)
-              continue; // ignoring rmoveto
-            value = 5; // first segment replacing with rlineto
-          } else if (!kHintingEnabled && (value == 1 || value == 3)) {
-            charstring.push('drop', 'drop');
-            continue;
-          }
-          command = charStringDictionary[value];
-        }
-
-        // Some charstring commands are meaningless in Type2 and will return
-        // a null, let's just ignored them
-        if (!command && i < count) {
-          continue;
-        } else if (!command) {
-          break;
-        } else if (command == -1) {
-          warn('Support for Type1 command ' + value +
-                ' (' + escape + ') is not implemented in charstring: ' +
-                charstring);
-          if (value == 12) {
-            // we know how to ignore only some the Type1 commands
-            switch (escape) {
-              case 7:
-                charstring.push('drop', 'drop', 'drop', 'drop');
-                continue;
-              case 8:
-                charstring.push('drop');
-                continue;
-            }
-          }
-        }
-
-        value = command;
-      } else if (value <= 246) {
-        value = value - 139;
-      } else if (value <= 250) {
-        value = ((value - 247) * 256) + array[++i] + 108;
-      } else if (value <= 254) {
-        value = -((value - 251) * 256) - array[++i] - 108;
-      } else {
-        value = (array[++i] & 0xff) << 24 | (array[++i] & 0xff) << 16 |
-                (array[++i] & 0xff) << 8 | (array[++i] & 0xff) << 0;
-      }
-
-      charstring.push(value);
-    }
-
-    return { charstring: charstring, width: width, lsb: lsb };
-  }
-
-  /*
-   * Returns an object containing a Subrs array and a CharStrings
-   * array extracted from and eexec encrypted block of data
-   */
-  function readNumberArray(str, index) {
-    var start = index;
-    while (str[index++] != '[')
-      start++;
-    start++;
-
-    var count = 0;
-    while (str[index++] != ']')
-      count++;
-
-    str = str.substr(start, count);
-
-    str = str.trim();
-    // Remove adjacent spaces
-    str = str.replace(/\s+/g, ' ');
-
-    var array = str.split(' ');
-    for (var i = 0, ii = array.length; i < ii; i++)
-      array[i] = parseFloat(array[i] || 0);
-    return array;
-  }
-
-  function readNumber(str, index) {
-    while (str[index] == ' ')
-      index++;
-
-    var start = index;
-
-    var count = 0;
-    while (str[index++] != ' ')
-      count++;
-
-    return parseFloat(str.substr(start, count) || 0);
-  }
-
-  function isSeparator(c) {
-    return c == ' ' || c == '\n' || c == '\x0d';
-  }
-
-  this.extractFontProgram = function Type1Parser_extractFontProgram(stream) {
-    var eexec = decrypt(stream, kEexecEncryptionKey, 4);
-    var eexecStr = '';
-    for (var i = 0, ii = eexec.length; i < ii; i++)
-      eexecStr += String.fromCharCode(eexec[i]);
-
-    var glyphsSection = false, subrsSection = false;
-    var program = {
-      subrs: [],
-      charstrings: [],
-      properties: {
-        'privateData': {
-          'lenIV': 4
-        }
-      }
-    };
-
-    var glyph = '';
-    var token = '';
-    var length = 0;
-
-    var c = '';
-    var count = eexecStr.length;
-    for (var i = 0; i < count; i++) {
-      var getToken = function getToken() {
-        while (i < count && isSeparator(eexecStr[i]))
-          ++i;
-
-        var token = '';
-        while (i < count && !isSeparator(eexecStr[i]))
-          token += eexecStr[i++];
-
-        return token;
-      };
-      var c = eexecStr[i];
-
-      if ((glyphsSection || subrsSection) &&
-          (token == 'RD' || token == '-|')) {
-        i++;
-        var data = eexec.slice(i, i + length);
-        var lenIV = program.properties.privateData['lenIV'];
-        var encoded = decrypt(data, kCharStringsEncryptionKey, lenIV);
-        var str = decodeCharString(encoded);
-
-        if (glyphsSection) {
-          program.charstrings.push({
-            glyph: glyph,
-            data: str.charstring,
-            lsb: str.lsb,
-            width: str.width
-          });
-        } else {
-          program.subrs.push(str.charstring);
-        }
-        i += length;
-        token = '';
-      } else if (isSeparator(c)) {
-        length = parseInt(token, 10);
-        token = '';
-      } else {
-        token += c;
-        if (!glyphsSection) {
-          switch (token) {
-            case '/CharString':
-              glyphsSection = true;
-              break;
-            case '/Subrs':
-              ++i;
-              var num = parseInt(getToken(), 10);
-              getToken(); // read in 'array'
-              for (var j = 0; j < num; ++j) {
-                var t = getToken(); // read in 'dup'
-                if (t == 'ND' || t == '|-' || t == 'noaccess')
-                  break;
-                var index = parseInt(getToken(), 10);
-                if (index > j)
-                  j = index;
-                var length = parseInt(getToken(), 10);
-                getToken(); // read in 'RD'
-                var data = eexec.slice(i + 1, i + 1 + length);
-                var lenIV = program.properties.privateData['lenIV'];
-                var encoded = decrypt(data, kCharStringsEncryptionKey, lenIV);
-                var str = decodeCharString(encoded);
-                i = i + 1 + length;
-                t = getToken(); // read in 'NP'
-                if (t == 'noaccess')
-                  getToken(); // read in 'put'
-                program.subrs[index] = str.charstring;
-              }
-              break;
-            case '/BlueValues':
-            case '/OtherBlues':
-            case '/FamilyBlues':
-            case '/FamilyOtherBlues':
-            case '/StemSnapH':
-            case '/StemSnapV':
-              program.properties.privateData[token.substring(1)] =
-                readNumberArray(eexecStr, i + 1);
-              break;
-            case '/StdHW':
-            case '/StdVW':
-              program.properties.privateData[token.substring(1)] =
-                readNumberArray(eexecStr, i + 2)[0];
-              break;
-            case '/BlueShift':
-            case '/lenIV':
-            case '/BlueFuzz':
-            case '/BlueScale':
-            case '/LanguageGroup':
-            case '/ExpansionFactor':
-              program.properties.privateData[token.substring(1)] =
-                readNumber(eexecStr, i + 1);
-              break;
-          }
-        } else if (c == '/') {
-          token = glyph = '';
-          while ((c = eexecStr[++i]) != ' ')
-            glyph += c;
-        }
-      }
-    }
-
-    return program;
-  };
-
-  this.extractFontHeader = function Type1Parser_extractFontHeader(stream,
-                                                                  properties) {
-    var headerString = '';
-    for (var i = 0, ii = stream.length; i < ii; i++)
-      headerString += String.fromCharCode(stream[i]);
-
-    var token = '';
-    var count = headerString.length;
-    for (var i = 0; i < count; i++) {
-      var getToken = function getToken() {
-        var character = headerString[i];
-        while (i < count && (isSeparator(character) || character == '/'))
-          character = headerString[++i];
-
-        var token = '';
-        while (i < count && !(isSeparator(character) || character == '/')) {
-          token += character;
-          character = headerString[++i];
-        }
-
-        return token;
-      };
-
-      var c = headerString[i];
-      if (isSeparator(c)) {
-        switch (token) {
-          case '/FontMatrix':
-            var matrix = readNumberArray(headerString, i + 1);
-
-            // The FontMatrix is in unitPerEm, so make it pixels
-            for (var j = 0, jj = matrix.length; j < jj; j++)
-              matrix[j] *= 1000;
-
-            // Make the angle into the right direction
-            matrix[2] *= -1;
-
-            properties.fontMatrix = matrix;
-            break;
-          case '/Encoding':
-            var encodingArg = getToken();
-            var encoding;
-            if (!/^\d+$/.test(encodingArg)) {
-              // encoding name is specified
-              encoding = Encodings[encodingArg];
-            } else {
-              encoding = [];
-              var size = parseInt(encodingArg, 10);
-              getToken(); // read in 'array'
-
-              for (var j = 0; j < size; j++) {
-                var token = getToken();
-                if (token == 'dup') {
-                  var index = parseInt(getToken(), 10);
-                  var glyph = getToken();
-                  encoding[index] = glyph;
-                  getToken(); // read the in 'put'
-                }
-              }
-            }
-            if (!properties.hasEncoding && encoding) {
-              properties.baseEncoding = encoding;
-              break;
-            }
-            break;
-        }
-        token = '';
-      } else {
-        token += c;
-      }
-    }
-  };
-};
-
-/**
- * The CFF class takes a Type1 file and wrap it into a
- * 'Compact Font Format' which itself embed Type2 charstrings.
- */
-var CFFStandardStrings = [
-  '.notdef', 'space', 'exclam', 'quotedbl', 'numbersign', 'dollar', 'percent',
-  'ampersand', 'quoteright', 'parenleft', 'parenright', 'asterisk', 'plus',
-  'comma', 'hyphen', 'period', 'slash', 'zero', 'one', 'two', 'three', 'four',
-  'five', 'six', 'seven', 'eight', 'nine', 'colon', 'semicolon', 'less',
-  'equal', 'greater', 'question', 'at', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H',
-  'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W',
-  'X', 'Y', 'Z', 'bracketleft', 'backslash', 'bracketright', 'asciicircum',
-  'underscore', 'quoteleft', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j',
-  'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y',
-  'z', 'braceleft', 'bar', 'braceright', 'asciitilde', 'exclamdown', 'cent',
-  'sterling', 'fraction', 'yen', 'florin', 'section', 'currency',
-  'quotesingle', 'quotedblleft', 'guillemotleft', 'guilsinglleft',
-  'guilsinglright', 'fi', 'fl', 'endash', 'dagger', 'daggerdbl',
-  'periodcentered', 'paragraph', 'bullet', 'quotesinglbase', 'quotedblbase',
-  'quotedblright', 'guillemotright', 'ellipsis', 'perthousand', 'questiondown',
-  'grave', 'acute', 'circumflex', 'tilde', 'macron', 'breve', 'dotaccent',
-  'dieresis', 'ring', 'cedilla', 'hungarumlaut', 'ogonek', 'caron', 'emdash',
-  'AE', 'ordfeminine', 'Lslash', 'Oslash', 'OE', 'ordmasculine', 'ae',
-  'dotlessi', 'lslash', 'oslash', 'oe', 'germandbls', 'onesuperior',
-  'logicalnot', 'mu', 'trademark', 'Eth', 'onehalf', 'plusminus', 'Thorn',
-  'onequarter', 'divide', 'brokenbar', 'degree', 'thorn', 'threequarters',
-  'twosuperior', 'registered', 'minus', 'eth', 'multiply', 'threesuperior',
-  'copyright', 'Aacute', 'Acircumflex', 'Adieresis', 'Agrave', 'Aring',
-  'Atilde', 'Ccedilla', 'Eacute', 'Ecircumflex', 'Edieresis', 'Egrave',
-  'Iacute', 'Icircumflex', 'Idieresis', 'Igrave', 'Ntilde', 'Oacute',
-  'Ocircumflex', 'Odieresis', 'Ograve', 'Otilde', 'Scaron', 'Uacute',
-  'Ucircumflex', 'Udieresis', 'Ugrave', 'Yacute', 'Ydieresis', 'Zcaron',
-  'aacute', 'acircumflex', 'adieresis', 'agrave', 'aring', 'atilde',
-  'ccedilla', 'eacute', 'ecircumflex', 'edieresis', 'egrave', 'iacute',
-  'icircumflex', 'idieresis', 'igrave', 'ntilde', 'oacute', 'ocircumflex',
-  'odieresis', 'ograve', 'otilde', 'scaron', 'uacute', 'ucircumflex',
-  'udieresis', 'ugrave', 'yacute', 'ydieresis', 'zcaron', 'exclamsmall',
-  'Hungarumlautsmall', 'dollaroldstyle', 'dollarsuperior', 'ampersandsmall',
-  'Acutesmall', 'parenleftsuperior', 'parenrightsuperior', '266 ff',
-  'onedotenleader', 'zerooldstyle', 'oneoldstyle', 'twooldstyle',
-  'threeoldstyle', 'fouroldstyle', 'fiveoldstyle', 'sixoldstyle',
-  'sevenoldstyle', 'eightoldstyle', 'nineoldstyle', 'commasuperior',
-  'threequartersemdash', 'periodsuperior', 'questionsmall', 'asuperior',
-  'bsuperior', 'centsuperior', 'dsuperior', 'esuperior', 'isuperior',
-  'lsuperior', 'msuperior', 'nsuperior', 'osuperior', 'rsuperior', 'ssuperior',
-  'tsuperior', 'ff', 'ffi', 'ffl', 'parenleftinferior', 'parenrightinferior',
-  'Circumflexsmall', 'hyphensuperior', 'Gravesmall', 'Asmall', 'Bsmall',
-  'Csmall', 'Dsmall', 'Esmall', 'Fsmall', 'Gsmall', 'Hsmall', 'Ismall',
-  'Jsmall', 'Ksmall', 'Lsmall', 'Msmall', 'Nsmall', 'Osmall', 'Psmall',
-  'Qsmall', 'Rsmall', 'Ssmall', 'Tsmall', 'Usmall', 'Vsmall', 'Wsmall',
-  'Xsmall', 'Ysmall', 'Zsmall', 'colonmonetary', 'onefitted', 'rupiah',
-  'Tildesmall', 'exclamdownsmall', 'centoldstyle', 'Lslashsmall',
-  'Scaronsmall', 'Zcaronsmall', 'Dieresissmall', 'Brevesmall', 'Caronsmall',
-  'Dotaccentsmall', 'Macronsmall', 'figuredash', 'hypheninferior',
-  'Ogoneksmall', 'Ringsmall', 'Cedillasmall', 'questiondownsmall', 'oneeighth',
-  'threeeighths', 'fiveeighths', 'seveneighths', 'onethird', 'twothirds',
-  'zerosuperior', 'foursuperior', 'fivesuperior', 'sixsuperior',
-  'sevensuperior', 'eightsuperior', 'ninesuperior', 'zeroinferior',
-  'oneinferior', 'twoinferior', 'threeinferior', 'fourinferior',
-  'fiveinferior', 'sixinferior', 'seveninferior', 'eightinferior',
-  'nineinferior', 'centinferior', 'dollarinferior', 'periodinferior',
-  'commainferior', 'Agravesmall', 'Aacutesmall', 'Acircumflexsmall',
-  'Atildesmall', 'Adieresissmall', 'Aringsmall', 'AEsmall', 'Ccedillasmall',
-  'Egravesmall', 'Eacutesmall', 'Ecircumflexsmall', 'Edieresissmall',
-  'Igravesmall', 'Iacutesmall', 'Icircumflexsmall', 'Idieresissmall',
-  'Ethsmall', 'Ntildesmall', 'Ogravesmall', 'Oacutesmall', 'Ocircumflexsmall',
-  'Otildesmall', 'Odieresissmall', 'OEsmall', 'Oslashsmall', 'Ugravesmall',
-  'Uacutesmall', 'Ucircumflexsmall', 'Udieresissmall', 'Yacutesmall',
-  'Thornsmall', 'Ydieresissmall', '001.000', '001.001', '001.002', '001.003',
-  'Black', 'Bold', 'Book', 'Light', 'Medium', 'Regular', 'Roman', 'Semibold'
-];
-
-var type1Parser = new Type1Parser();
-
-// Type1Font is also a CIDFontType0.
-var Type1Font = function Type1Font(name, file, properties) {
-  // Get the data block containing glyphs and subrs informations
-  var headerBlock = file.getBytes(properties.length1);
-  type1Parser.extractFontHeader(headerBlock, properties);
-
-  // Decrypt the data blocks and retrieve it's content
-  var eexecBlock = file.getBytes(properties.length2);
-  var data = type1Parser.extractFontProgram(eexecBlock);
-  for (var info in data.properties)
-    properties[info] = data.properties[info];
-
-  var charstrings = this.getOrderedCharStrings(data.charstrings, properties);
-  var type2Charstrings = this.getType2Charstrings(charstrings);
-  var subrs = this.getType2Subrs(data.subrs);
-
-  this.charstrings = charstrings;
-  this.data = this.wrap(name, type2Charstrings, this.charstrings,
-                        subrs, properties);
-};
-
-Type1Font.prototype = {
-  createCFFIndexHeader: function Type1Font_createCFFIndexHeader(objects,
-                                                                isByte) {
-    // First 2 bytes contains the number of objects contained into this index
-    var count = objects.length;
-
-    // If there is no object, just create an array saying that with another
-    // offset byte.
-    if (count == 0)
-      return '\x00\x00\x00';
-
-    var data = String.fromCharCode((count >> 8) & 0xFF, count & 0xff);
-
-    // Next byte contains the offset size use to reference object in the file
-    // Actually we're using 0x04 to be sure to be able to store everything
-    // without thinking of it while coding.
-    data += '\x04';
-
-    // Add another offset after this one because we need a new offset
-    var relativeOffset = 1;
-    for (var i = 0; i < count + 1; i++) {
-      data += String.fromCharCode((relativeOffset >>> 24) & 0xFF,
-                                  (relativeOffset >> 16) & 0xFF,
-                                  (relativeOffset >> 8) & 0xFF,
-                                  relativeOffset & 0xFF);
-
-      if (objects[i])
-        relativeOffset += objects[i].length;
-    }
-
-    for (var i = 0; i < count; i++) {
-      for (var j = 0, jj = objects[i].length; j < jj; j++)
-        data += isByte ? String.fromCharCode(objects[i][j] & 0xFF) :
-                objects[i][j];
-    }
-    return data;
-  },
-
-  encodeNumber: function Type1Font_encodeNumber(value) {
-    // some of the fonts has ouf-of-range values
-    // they are just arithmetic overflows
-    // make sanitizer happy
-    value |= 0;
-    if (value >= -32768 && value <= 32767) {
-      return '\x1c' +
-             String.fromCharCode((value >> 8) & 0xFF) +
-             String.fromCharCode(value & 0xFF);
-    } else {
-      return '\x1d' +
-             String.fromCharCode((value >> 24) & 0xFF) +
-             String.fromCharCode((value >> 16) & 0xFF) +
-             String.fromCharCode((value >> 8) & 0xFF) +
-             String.fromCharCode(value & 0xFF);
-    }
-  },
-
-  getOrderedCharStrings: function Type1Font_getOrderedCharStrings(glyphs,
-                                                            properties) {
-    var charstrings = [];
-    var i, length, glyphName;
-    var unusedUnicode = kCmapGlyphOffset;
-    for (i = 0, length = glyphs.length; i < length; i++) {
-      var item = glyphs[i];
-      var glyphName = item.glyph;
-      var unicode = glyphName in GlyphsUnicode ?
-        GlyphsUnicode[glyphName] : unusedUnicode++;
-      charstrings.push({
-        glyph: glyphName,
-        unicode: unicode,
-        gid: i,
-        charstring: item.data,
-        width: item.width,
-        lsb: item.lsb
-      });
-    }
-
-    charstrings.sort(function charstrings_sort(a, b) {
-      return a.unicode - b.unicode;
-    });
-    return charstrings;
-  },
-
-  getType2Charstrings: function Type1Font_getType2Charstrings(
-                                  type1Charstrings) {
-    var type2Charstrings = [];
-    var count = type1Charstrings.length;
-    for (var i = 0; i < count; i++) {
-      var charstring = type1Charstrings[i].charstring;
-      type2Charstrings.push(this.flattenCharstring(charstring.slice(),
-                                                   this.commandsMap));
-    }
-    return type2Charstrings;
-  },
-
-  getType2Subrs: function Type1Font_getType2Subrs(type1Subrs) {
-    var bias = 0;
-    var count = type1Subrs.length;
-    if (count < 1240)
-      bias = 107;
-    else if (count < 33900)
-      bias = 1131;
-    else
-      bias = 32768;
-
-    // Add a bunch of empty subrs to deal with the Type2 bias
-    var type2Subrs = [];
-    for (var i = 0; i < bias; i++)
-      type2Subrs.push([0x0B]);
-
-    for (var i = 0; i < count; i++) {
-      var subr = type1Subrs[i];
-      if (!subr)
-        subr = [0x0B];
-
-      type2Subrs.push(this.flattenCharstring(subr, this.commandsMap));
-    }
-
-    return type2Subrs;
-  },
-
-  /*
-   * Flatten the commands by interpreting the postscript code and replacing
-   * every 'callsubr', 'callothersubr' by the real commands.
-   */
-  commandsMap: {
-    'hstem': 1,
-    'vstem': 3,
-    'vmoveto': 4,
-    'rlineto': 5,
-    'hlineto': 6,
-    'vlineto': 7,
-    'rrcurveto': 8,
-    'callsubr': 10,
-    'return': 11,
-    'sub': [12, 11],
-    'div': [12, 12],
-    'exch': [12, 28],
-    'flex': [12, 35],
-    'drop' : [12, 18],
-    'endchar': 14,
-    'rmoveto': 21,
-    'hmoveto': 22,
-    'vhcurveto': 30,
-    'hvcurveto': 31
-  },
-
-  flattenCharstring: function Type1Font_flattenCharstring(charstring, map) {
-    // charstring changes size - can't cache .length in loop
-    for (var i = 0; i < charstring.length; i++) {
-      var command = charstring[i];
-      if (command.charAt) {
-        var cmd = map[command];
-        assert(cmd, 'Unknow command: ' + command);
-
-        if (isArray(cmd))
-          charstring.splice(i++, 1, cmd[0], cmd[1]);
-        else
-          charstring[i] = cmd;
-      } else {
-        // Type1 charstring use a division for number above 32000
-        if (command > 32000) {
-          var divisor = charstring[i + 1];
-          command /= divisor;
-          charstring.splice(i, 3, 28, command >> 8, command & 0xff);
-        } else {
-          charstring.splice(i, 1, 28, command >> 8, command & 0xff);
-        }
-        i += 2;
-      }
-    }
-    return charstring;
-  },
-
-  wrap: function Type1Font_wrap(name, glyphs, charstrings, subrs, properties) {
-    var fields = {
-      // major version, minor version, header size, offset size
-      'header': '\x01\x00\x04\x04',
-
-      'names': this.createCFFIndexHeader([name]),
-
-      'topDict': (function topDict(self) {
-        return function cffWrapTopDict() {
-          var header = '\x00\x01\x01\x01';
-          var dict =
-              '\xf8\x1b\x00' + // version
-              '\xf8\x1c\x01' + // Notice
-              '\xf8\x1d\x02' + // FullName
-              '\xf8\x1e\x03' + // FamilyName
-              '\xf8\x1f\x04' +  // Weight
-              '\x1c\x00\x00\x10'; // Encoding
-
-          var boundingBox = properties.bbox;
-          for (var i = 0, ii = boundingBox.length; i < ii; i++)
-            dict += self.encodeNumber(boundingBox[i]);
-          dict += '\x05'; // FontBBox;
-
-          var offset = fields.header.length +
-                       fields.names.length +
-                       (header.length + 1) +
-                       (dict.length + (4 + 4)) +
-                       fields.strings.length +
-                       fields.globalSubrs.length;
-
-          // If the offset if over 32767, encodeNumber is going to return
-          // 5 bytes to encode the position instead of 3.
-          if ((offset + fields.charstrings.length) > 32767) {
-            offset += 9;
-          } else {
-            offset += 7;
-          }
-
-          dict += self.encodeNumber(offset) + '\x0f'; // Charset
-
-          offset = offset + (glyphs.length * 2) + 1;
-          dict += self.encodeNumber(offset) + '\x11'; // Charstrings
-
-          offset = offset + fields.charstrings.length;
-          dict += self.encodeNumber(fields.privateData.length);
-          dict += self.encodeNumber(offset) + '\x12'; // Private
-
-          return header + String.fromCharCode(dict.length + 1) + dict;
-        };
-      })(this),
-
-      'strings': (function strings(self) {
-        var strings = [
-          'Version 0.11',         // Version
-          'See original notice',  // Notice
-          name,                   // FullName
-          name,                   // FamilyName
-          'Medium'                // Weight
-        ];
-        return self.createCFFIndexHeader(strings);
-      })(this),
-
-      'globalSubrs': this.createCFFIndexHeader([]),
-
-      'charset': (function charset(self) {
-        var charsetString = '\x00'; // Encoding
-
-        var count = glyphs.length;
-        for (var i = 0; i < count; i++) {
-          var index = CFFStandardStrings.indexOf(charstrings[i].glyph);
-          // Some characters like asterikmath && circlecopyrt are
-          // missing from the original strings, for the moment let's
-          // map them to .notdef and see later if it cause any
-          // problems
-          if (index == -1)
-            index = 0;
-
-          charsetString += String.fromCharCode(index >> 8, index & 0xff);
-        }
-        return charsetString;
-      })(this),
-
-      'charstrings': this.createCFFIndexHeader([[0x8B, 0x0E]].concat(glyphs),
-                                               true),
-
-      'privateData': (function cffWrapPrivate(self) {
-        var data =
-            '\x8b\x14' + // defaultWidth
-            '\x8b\x15';  // nominalWidth
-        var fieldMap = {
-          BlueValues: '\x06',
-          OtherBlues: '\x07',
-          FamilyBlues: '\x08',
-          FamilyOtherBlues: '\x09',
-          StemSnapH: '\x0c\x0c',
-          StemSnapV: '\x0c\x0d',
-          BlueShift: '\x0c\x0a',
-          BlueFuzz: '\x0c\x0b',
-          BlueScale: '\x0c\x09',
-          LanguageGroup: '\x0c\x11',
-          ExpansionFactor: '\x0c\x18'
-        };
-        for (var field in fieldMap) {
-          if (!properties.privateData.hasOwnProperty(field))
-            continue;
-          var value = properties.privateData[field];
-
-          if (isArray(value)) {
-            data += self.encodeNumber(value[0]);
-            for (var i = 1, ii = value.length; i < ii; i++)
-              data += self.encodeNumber(value[i] - value[i - 1]);
-          } else {
-            data += self.encodeNumber(value);
-          }
-          data += fieldMap[field];
-        }
-
-        data += self.encodeNumber(data.length + 4) + '\x13'; // Subrs offset
-
-        return data;
-      })(this),
-
-      'localSubrs': this.createCFFIndexHeader(subrs, true)
-    };
-    fields.topDict = fields.topDict();
-
-
-    var cff = [];
-    for (var index in fields) {
-      var field = fields[index];
-      for (var i = 0, ii = field.length; i < ii; i++)
-        cff.push(field.charCodeAt(i));
-    }
-
-    return cff;
-  }
-};
-
-var CFFFont = (function CFFFontClosure() {
-  function CFFFont(file, properties) {
-    this.properties = properties;
-
-    var parser = new CFFParser(file, properties);
-    var cff = parser.parse(true);
-    var compiler = new CFFCompiler(cff);
-    this.readExtra(cff);
-    try {
-      this.data = compiler.compile();
-    } catch (e) {
-      warn('Failed to compile font ' + properties.loadedName);
-      // There may have just been an issue with the compiler, set the data
-      // anyway and hope the font loaded.
-      this.data = file;
-    }
-  }
-
-  CFFFont.prototype = {
-    readExtra: function CFFFont_readExtra(cff) {
-      // charstrings contains info about glyphs (one element per glyph
-      // containing mappings for {unicode, width})
-      var charset = cff.charset.charset;
-      var encoding = cff.encoding ? cff.encoding.encoding : null;
-      var charstrings = this.getCharStrings(charset, encoding);
-
-      // create the mapping between charstring and glyph id
-      var glyphIds = [];
-      for (var i = 0, ii = charstrings.length; i < ii; i++)
-        glyphIds.push(charstrings[i].gid);
-
-      this.charstrings = charstrings;
-      this.glyphIds = glyphIds;
-    },
-    getCharStrings: function CFFFont_getCharStrings(charsets, encoding) {
-      var charstrings = [];
-      var unicodeUsed = [];
-      var unassignedUnicodeItems = [];
-      var inverseEncoding = [];
-      // CID fonts don't have an encoding.
-      if (encoding !== null)
-        for (var charcode in encoding)
-          inverseEncoding[encoding[charcode]] = charcode | 0;
-      else
-        inverseEncoding = charsets;
-      for (var i = 0, ii = charsets.length; i < ii; i++) {
-        var glyph = charsets[i];
-        if (glyph == '.notdef')
-          continue;
-
-        var code = inverseEncoding[i];
-        if (!code || isSpecialUnicode(code)) {
-          unassignedUnicodeItems.push(i);
-          continue;
-        }
-        charstrings.push({
-          unicode: code,
-          code: code,
-          gid: i,
-          glyph: glyph
-        });
-        unicodeUsed[code] = true;
-      }
-
-      var nextUnusedUnicode = kCmapGlyphOffset;
-      for (var j = 0, jj = unassignedUnicodeItems.length; j < jj; ++j) {
-        var i = unassignedUnicodeItems[j];
-        // giving unicode value anyway
-        while (nextUnusedUnicode in unicodeUsed)
-          nextUnusedUnicode++;
-        var unicode = nextUnusedUnicode++;
-        charstrings.push({
-          unicode: unicode,
-          code: inverseEncoding[i] || 0,
-          gid: i,
-          glyph: charsets[i]
-        });
-      }
-
-      // sort the array by the unicode value (again)
-      charstrings.sort(function getCharStringsSort(a, b) {
-        return a.unicode - b.unicode;
-      });
-      return charstrings;
-    }
-  };
-
-  return CFFFont;
-})();
-
-var CFFParser = (function CFFParserClosure() {
-  function CFFParser(file, properties) {
-    this.bytes = file.getBytes();
-    this.properties = properties;
-  }
-  CFFParser.prototype = {
-    parse: function CFFParser_parse(normalizeCIDData) {
-      var properties = this.properties;
-      var cff = new CFF();
-      this.cff = cff;
-
-      // The first five sections must be in order, all the others are reached
-      // via offsets contained in one of the below.
-      var header = this.parseHeader();
-      var nameIndex = this.parseIndex(header.endPos);
-      var topDictIndex = this.parseIndex(nameIndex.endPos);
-      var stringIndex = this.parseIndex(topDictIndex.endPos);
-      var globalSubrIndex = this.parseIndex(stringIndex.endPos);
-
-      var topDictParsed = this.parseDict(topDictIndex.obj.get(0));
-      var topDict = this.createDict(CFFTopDict, topDictParsed, cff.strings);
-
-      cff.header = header.obj;
-      cff.names = this.parseNameIndex(nameIndex.obj);
-      cff.strings = this.parseStringIndex(stringIndex.obj);
-      cff.topDict = topDict;
-      cff.globalSubrIndex = globalSubrIndex.obj;
-
-      this.parsePrivateDict(cff.topDict);
-
-      cff.isCIDFont = topDict.hasName('ROS');
-
-      var charStringOffset = topDict.getByName('CharStrings');
-      cff.charStrings = this.parseCharStrings(charStringOffset);
-
-      var charset, encoding;
-      if (cff.isCIDFont) {
-        var fdArrayIndex = this.parseIndex(topDict.getByName('FDArray')).obj;
-        for (var i = 0, ii = fdArrayIndex.count; i < ii; ++i) {
-          var dictRaw = fdArrayIndex.get(i);
-          var fontDict = this.createDict(CFFTopDict, this.parseDict(dictRaw),
-                                         cff.strings);
-          this.parsePrivateDict(fontDict);
-          cff.fdArray.push(fontDict);
-        }
-        // cid fonts don't have an encoding
-        encoding = null;
-        charset = this.parseCharsets(topDict.getByName('charset'),
-                                     cff.charStrings.count, cff.strings, true);
-        cff.fdSelect = this.parseFDSelect(topDict.getByName('FDSelect'),
-                                             cff.charStrings.count);
-      } else {
-        charset = this.parseCharsets(topDict.getByName('charset'),
-                                     cff.charStrings.count, cff.strings, false);
-        encoding = this.parseEncoding(topDict.getByName('Encoding'),
-                                      properties,
-                                      cff.strings, charset.charset);
-      }
-      cff.charset = charset;
-      cff.encoding = encoding;
-
-      if (!cff.isCIDFont || !normalizeCIDData)
-        return cff;
-
-      // DirectWrite does not like CID fonts data. Trying to convert/flatten
-      // the font data and remove CID properties.
-      if (cff.fdArray.length !== 1)
-        error('Unable to normalize CID font in CFF data');
-
-      var fontDict = cff.fdArray[0];
-      fontDict.setByKey(17, topDict.getByName('CharStrings'));
-      cff.topDict = fontDict;
-      cff.isCIDFont = false;
-      delete cff.fdArray;
-      delete cff.fdSelect;
-
-      return cff;
-    },
-    parseHeader: function CFFParser_parseHeader() {
-      var bytes = this.bytes;
-      var offset = 0;
-
-      while (bytes[offset] != 1)
-        ++offset;
-
-      if (offset != 0) {
-        info('cff data is shifted');
-        bytes = bytes.subarray(offset);
-        this.bytes = bytes;
-      }
-      var major = bytes[0];
-      var minor = bytes[1];
-      var hdrSize = bytes[2];
-      var offSize = bytes[3];
-      var header = new CFFHeader(major, minor, hdrSize, offSize);
-      return {obj: header, endPos: hdrSize};
-    },
-    parseDict: function CFFParser_parseDict(dict) {
-      var pos = 0;
-
-      function parseOperand() {
-        var value = dict[pos++];
-        if (value === 30) {
-          return parseFloatOperand(pos);
-        } else if (value === 28) {
-          value = dict[pos++];
-          value = (value << 8) | dict[pos++];
-          return value;
-        } else if (value === 29) {
-          value = dict[pos++];
-          value = (value << 8) | dict[pos++];
-          value = (value << 8) | dict[pos++];
-          value = (value << 8) | dict[pos++];
-          return value;
-        } else if (value >= 32 && value <= 246) {
-          return value - 139;
-        } else if (value >= 247 && value <= 250) {
-          return ((value - 247) * 256) + dict[pos++] + 108;
-        } else if (value >= 251 && value <= 254) {
-          return -((value - 251) * 256) - dict[pos++] - 108;
-        } else {
-          error('255 is not a valid DICT command');
-        }
-        return -1;
-      }
-
-      function parseFloatOperand() {
-        var str = '';
-        var eof = 15;
-        var lookup = ['0', '1', '2', '3', '4', '5', '6', '7', '8',
-            '9', '.', 'E', 'E-', null, '-'];
-        var length = dict.length;
-        while (pos < length) {
-          var b = dict[pos++];
-          var b1 = b >> 4;
-          var b2 = b & 15;
-
-          if (b1 == eof)
-            break;
-          str += lookup[b1];
-
-          if (b2 == eof)
-            break;
-          str += lookup[b2];
-        }
-        return parseFloat(str);
-      }
-
-      var operands = [];
-      var entries = [];
-
-      var pos = 0;
-      var end = dict.length;
-      while (pos < end) {
-        var b = dict[pos];
-        if (b <= 21) {
-          if (b === 12)
-            b = (b << 8) | dict[++pos];
-          entries.push([b, operands]);
-          operands = [];
-          ++pos;
-        } else {
-          operands.push(parseOperand());
-        }
-      }
-      return entries;
-    },
-    parseIndex: function CFFParser_parseIndex(pos) {
-      var cffIndex = new CFFIndex();
-      var bytes = this.bytes;
-      var count = (bytes[pos++] << 8) | bytes[pos++];
-      var offsets = [];
-      var start = pos;
-      var end = pos;
-
-      if (count != 0) {
-        var offsetSize = bytes[pos++];
-        // add 1 for offset to determine size of last object
-        var startPos = pos + ((count + 1) * offsetSize) - 1;
-
-        for (var i = 0, ii = count + 1; i < ii; ++i) {
-          var offset = 0;
-          for (var j = 0; j < offsetSize; ++j) {
-            offset <<= 8;
-            offset += bytes[pos++];
-          }
-          offsets.push(startPos + offset);
-        }
-        end = offsets[count];
-      }
-      for (var i = 0, ii = offsets.length - 1; i < ii; ++i) {
-        var offsetStart = offsets[i];
-        var offsetEnd = offsets[i + 1];
-        cffIndex.add(bytes.subarray(offsetStart, offsetEnd));
-      }
-      return {obj: cffIndex, endPos: end};
-    },
-    parseNameIndex: function CFFParser_parseNameIndex(index) {
-      var names = [];
-      for (var i = 0, ii = index.count; i < ii; ++i) {
-        var name = index.get(i);
-        // OTS doesn't allow names to be over 127 characters.
-        var length = Math.min(name.length, 127);
-        var data = [];
-        // OTS also only permits certain characters in the name.
-        for (var j = 0; j < length; ++j) {
-          var c = name[j];
-          if (j === 0 && c === 0) {
-            data[j] = c;
-            continue;
-          }
-          if ((c < 33 || c > 126) || c === 91 /* [ */ || c === 93 /* ] */ ||
-              c === 40 /* ( */ || c === 41 /* ) */ || c === 123 /* { */ ||
-              c === 125 /* } */ || c === 60 /* < */ || c === 62 /* > */ ||
-              c === 47 /* / */ || c === 37 /* % */) {
-            data[j] = 95;
-            continue;
-          }
-          data[j] = c;
-        }
-        names.push(String.fromCharCode.apply(null, data));
-      }
-      return names;
-    },
-    parseStringIndex: function CFFParser_parseStringIndex(index) {
-      var strings = new CFFStrings();
-      for (var i = 0, ii = index.count; i < ii; ++i) {
-        var data = index.get(i);
-        strings.add(String.fromCharCode.apply(null, data));
-      }
-      return strings;
-    },
-    createDict: function CFFParser_createDict(type, dict, strings) {
-      var cffDict = new type(strings);
-      var types = cffDict.types;
-
-      for (var i = 0, ii = dict.length; i < ii; ++i) {
-        var pair = dict[i];
-        var key = pair[0];
-        var value = pair[1];
-        cffDict.setByKey(key, value);
-      }
-      return cffDict;
-    },
-    parseCharStrings: function CFFParser_parseCharStrings(charStringOffset) {
-      var charStrings = this.parseIndex(charStringOffset).obj;
-      // The CFF specification state that the 'dotsection' command
-      // (12, 0) is deprecated and treated as a no-op, but all Type2
-      // charstrings processors should support them. Unfortunately
-      // the font sanitizer don't. As a workaround the sequence (12, 0)
-      // is replaced by a useless (0, hmoveto).
-      var count = charStrings.count;
-      for (var i = 0; i < count; i++) {
-        var charstring = charStrings.get(i);
-
-        var data = charstring;
-        var length = data.length;
-        for (var j = 0; j <= length; j) {
-          var value = data[j++];
-          if (value == 12 && data[j++] == 0) {
-              data[j - 2] = 139;
-              data[j - 1] = 22;
-          } else if (value === 28) {
-            j += 2;
-          } else if (value >= 247 && value <= 254) {
-            j++;
-          } else if (value == 255) {
-            j += 4;
-          }
-        }
-      }
-      return charStrings;
-    },
-    parsePrivateDict: function CFFParser_parsePrivateDict(parentDict) {
-      // no private dict, do nothing
-      if (!parentDict.hasName('Private'))
-        return;
-      var privateOffset = parentDict.getByName('Private');
-      // make sure the params are formatted correctly
-      if (!isArray(privateOffset) || privateOffset.length !== 2) {
-        parentDict.removeByName('Private');
-        return;
-      }
-      var size = privateOffset[0];
-      var offset = privateOffset[1];
-      // remove empty dicts or ones that refer to invalid location
-      if (size === 0 || offset >= this.bytes.length) {
-        parentDict.removeByName('Private');
-        return;
-      }
-
-      var privateDictEnd = offset + size;
-      var dictData = this.bytes.subarray(offset, privateDictEnd);
-      var dict = this.parseDict(dictData);
-      var privateDict = this.createDict(CFFPrivateDict, dict,
-                                        parentDict.strings);
-      parentDict.privateDict = privateDict;
-
-      // Parse the Subrs index also since it's relative to the private dict.
-      if (!privateDict.getByName('Subrs'))
-        return;
-      var subrsOffset = privateDict.getByName('Subrs');
-      var relativeOffset = offset + subrsOffset;
-      // Validate the offset.
-      if (subrsOffset === 0 || relativeOffset >= this.bytes.length) {
-        privateDict.removeByName('Subrs');
-        return;
-      }
-      var subrsIndex = this.parseIndex(relativeOffset);
-      privateDict.subrsIndex = subrsIndex.obj;
-    },
-    parseCharsets: function CFFParser_parseCharsets(pos, length, strings, cid) {
-      if (pos == 0) {
-        return new CFFCharset(true, CFFCharsetPredefinedTypes.ISO_ADOBE,
-                              ISOAdobeCharset);
-      } else if (pos == 1) {
-        return new CFFCharset(true, CFFCharsetPredefinedTypes.EXPERT,
-                              ExpertCharset);
-      } else if (pos == 2) {
-        return new CFFCharset(true, CFFCharsetPredefinedTypes.EXPERT_SUBSET,
-                              ExpertSubsetCharset);
-      }
-
-      var bytes = this.bytes;
-      var start = pos;
-      var format = bytes[pos++];
-      var charset = ['.notdef'];
-
-      // subtract 1 for the .notdef glyph
-      length -= 1;
-
-      switch (format) {
-        case 0:
-          for (var i = 0; i < length; i++) {
-            var id = (bytes[pos++] << 8) | bytes[pos++];
-            charset.push(cid ? id : strings.get(id));
-          }
-          break;
-        case 1:
-          while (charset.length <= length) {
-            var id = (bytes[pos++] << 8) | bytes[pos++];
-            var count = bytes[pos++];
-            for (var i = 0; i <= count; i++)
-              charset.push(cid ? id++ : strings.get(id++));
-          }
-          break;
-        case 2:
-          while (charset.length <= length) {
-            var id = (bytes[pos++] << 8) | bytes[pos++];
-            var count = (bytes[pos++] << 8) | bytes[pos++];
-            for (var i = 0; i <= count; i++)
-              charset.push(cid ? id++ : strings.get(id++));
-          }
-          break;
-        default:
-          error('Unknown charset format');
-      }
-      // Raw won't be needed if we actually compile the charset.
-      var end = pos;
-      var raw = bytes.subarray(start, end);
-
-      return new CFFCharset(false, format, charset, raw);
-    },
-    parseEncoding: function CFFParser_parseEncoding(pos,
-                                                    properties,
-                                                    strings,
-                                                    charset) {
-      var encoding = {};
-      var bytes = this.bytes;
-      var predefined = false;
-      var hasSupplement = false;
-      var format;
-      var raw = null;
-
-      function readSupplement() {
-        var supplementsCount = bytes[pos++];
-        for (var i = 0; i < supplementsCount; i++) {
-          var code = bytes[pos++];
-          var sid = (bytes[pos++] << 8) + (bytes[pos++] & 0xff);
-          encoding[code] = properties.differences.indexOf(strings.get(sid));
-        }
-      }
-
-      if (pos == 0 || pos == 1) {
-        predefined = true;
-        format = pos;
-        var gid = 1;
-        var baseEncoding = pos ? Encodings.ExpertEncoding :
-                                 Encodings.StandardEncoding;
-        for (var i = 0, ii = charset.length; i < ii; i++) {
-          var index = baseEncoding.indexOf(charset[i]);
-          if (index != -1)
-            encoding[index] = gid++;
-        }
-      } else {
-        var dataStart = pos;
-        var format = bytes[pos++];
-        switch (format & 0x7f) {
-          case 0:
-            var glyphsCount = bytes[pos++];
-            for (var i = 1; i <= glyphsCount; i++)
-              encoding[bytes[pos++]] = i;
-            break;
-
-          case 1:
-            var rangesCount = bytes[pos++];
-            var gid = 1;
-            for (var i = 0; i < rangesCount; i++) {
-              var start = bytes[pos++];
-              var left = bytes[pos++];
-              for (var j = start; j <= start + left; j++)
-                encoding[j] = gid++;
-            }
-            break;
-
-          default:
-            error('Unknow encoding format: ' + format + ' in CFF');
-            break;
-        }
-        var dataEnd = pos;
-        if (format & 0x80) {
-          // The font sanitizer does not support CFF encoding with a
-          // supplement, since the encoding is not really used to map
-          // between gid to glyph, let's overwrite what is declared in
-          // the top dictionary to let the sanitizer think the font use
-          // StandardEncoding, that's a lie but that's ok.
-          bytes[dataStart] &= 0x7f;
-          readSupplement();
-          hasSupplement = true;
-        }
-        raw = bytes.subarray(dataStart, dataEnd);
-      }
-      format = format & 0x7f;
-      return new CFFEncoding(predefined, format, encoding, raw);
-    },
-    parseFDSelect: function CFFParser_parseFDSelect(pos, length) {
-      var start = pos;
-      var bytes = this.bytes;
-      var format = bytes[pos++];
-      var fdSelect = [];
-      switch (format) {
-        case 0:
-          for (var i = 0; i < length; ++i) {
-            var id = bytes[pos++];
-            fdSelect.push(id);
-          }
-          break;
-        case 3:
-          var rangesCount = (bytes[pos++] << 8) | bytes[pos++];
-          for (var i = 0; i < rangesCount; ++i) {
-            var first = (bytes[pos++] << 8) | bytes[pos++];
-            var fdIndex = bytes[pos++];
-            var next = (bytes[pos] << 8) | bytes[pos + 1];
-            for (var j = first; j < next; ++j)
-              fdSelect.push(fdIndex);
-          }
-          // Advance past the sentinel(next).
-          pos += 2;
-          break;
-        default:
-          error('Unknown fdselect format ' + format);
-          break;
-      }
-      var end = pos;
-      return new CFFFDSelect(fdSelect, bytes.subarray(start, end));
-    }
-  };
-  return CFFParser;
-})();
-
-// Compact Font Format
-var CFF = (function CFFClosure() {
-  function CFF() {
-    this.header = null;
-    this.names = [];
-    this.topDict = null;
-    this.strings = new CFFStrings();
-    this.globalSubrIndex = null;
-
-    // The following could really be per font, but since we only have one font
-    // store them here.
-    this.encoding = null;
-    this.charset = null;
-    this.charStrings = null;
-    this.fdArray = [];
-    this.fdSelect = null;
-
-    this.isCIDFont = false;
-  }
-  return CFF;
-})();
-
-var CFFHeader = (function CFFHeaderClosure() {
-  function CFFHeader(major, minor, hdrSize, offSize) {
-    this.major = major;
-    this.minor = minor;
-    this.hdrSize = hdrSize;
-    this.offSize = offSize;
-  }
-  return CFFHeader;
-})();
-
-var CFFStrings = (function CFFStringsClosure() {
-  function CFFStrings() {
-    this.strings = [];
-  }
-  CFFStrings.prototype = {
-    get: function CFFStrings_get(index) {
-      if (index >= 0 && index <= 390)
-        return CFFStandardStrings[index];
-      if (index - 391 <= this.strings.length)
-        return this.strings[index - 391];
-      return CFFStandardStrings[0];
-    },
-    add: function CFFStrings_add(value) {
-      this.strings.push(value);
-    },
-    get count() {
-      return this.strings.length;
-    }
-  };
-  return CFFStrings;
-})();
-
-var CFFIndex = (function CFFIndexClosure() {
-  function CFFIndex() {
-    this.objects = [];
-    this.length = 0;
-  }
-  CFFIndex.prototype = {
-    add: function CFFIndex_add(data) {
-      this.length += data.length;
-      this.objects.push(data);
-    },
-    get: function CFFIndex_get(index) {
-      return this.objects[index];
-    },
-    get count() {
-      return this.objects.length;
-    }
-  };
-  return CFFIndex;
-})();
-
-var CFFDict = (function CFFDictClosure() {
-  function CFFDict(tables, strings) {
-    this.keyToNameMap = tables.keyToNameMap;
-    this.nameToKeyMap = tables.nameToKeyMap;
-    this.defaults = tables.defaults;
-    this.types = tables.types;
-    this.opcodes = tables.opcodes;
-    this.order = tables.order;
-    this.strings = strings;
-    this.values = {};
-  }
-  CFFDict.prototype = {
-    // value should always be an array
-    setByKey: function CFFDict_setByKey(key, value) {
-      if (!(key in this.keyToNameMap))
-        return false;
-      // ignore empty values
-      if (value.length === 0)
-        return true;
-      var type = this.types[key];
-      // remove the array wrapping these types of values
-      if (type === 'num' || type === 'sid' || type === 'offset')
-        value = value[0];
-      this.values[key] = value;
-      return true;
-    },
-    hasName: function CFFDict_hasName(name) {
-      return this.nameToKeyMap[name] in this.values;
-    },
-    getByName: function CFFDict_getByName(name) {
-      if (!(name in this.nameToKeyMap))
-        error('Invalid dictionary name "' + name + '"');
-      var key = this.nameToKeyMap[name];
-      if (!(key in this.values))
-        return this.defaults[key];
-      return this.values[key];
-    },
-    removeByName: function CFFDict_removeByName(name) {
-      delete this.values[this.nameToKeyMap[name]];
-    }
-  };
-  CFFDict.createTables = function CFFDict_createTables(layout) {
-    var tables = {
-      keyToNameMap: {},
-      nameToKeyMap: {},
-      defaults: {},
-      types: {},
-      opcodes: {},
-      order: []
-    };
-    for (var i = 0, ii = layout.length; i < ii; ++i) {
-      var entry = layout[i];
-      var key = isArray(entry[0]) ? (entry[0][0] << 8) + entry[0][1] : entry[0];
-      tables.keyToNameMap[key] = entry[1];
-      tables.nameToKeyMap[entry[1]] = key;
-      tables.types[key] = entry[2];
-      tables.defaults[key] = entry[3];
-      tables.opcodes[key] = isArray(entry[0]) ? entry[0] : [entry[0]];
-      tables.order.push(key);
-    }
-    return tables;
-  };
-  return CFFDict;
-})();
-
-var CFFTopDict = (function CFFTopDictClosure() {
-  var layout = [
-    [[12, 30], 'ROS', ['sid', 'sid', 'num'], null],
-    [[12, 20], 'SyntheticBase', 'num', null],
-    [0, 'version', 'sid', null],
-    [1, 'Notice', 'sid', null],
-    [[12, 0], 'Copyright', 'sid', null],
-    [2, 'FullName', 'sid', null],
-    [3, 'FamilyName', 'sid', null],
-    [4, 'Weight', 'sid', null],
-    [[12, 1], 'isFixedPitch', 'num', 0],
-    [[12, 2], 'ItalicAngle', 'num', 0],
-    [[12, 3], 'UnderlinePosition', 'num', -100],
-    [[12, 4], 'UnderlineThickness', 'num', 50],
-    [[12, 5], 'PaintType', 'num', 0],
-    [[12, 6], 'CharstringType', 'num', 2],
-    [[12, 7], 'FontMatrix', ['num', 'num', 'num', 'num', 'num', 'num'],
-                            [.001, 0, 0, .001, 0, 0]],
-    [13, 'UniqueID', 'num', null],
-    [5, 'FontBBox', ['num', 'num', 'num', 'num'], [0, 0, 0, 0]],
-    [[12, 8], 'StrokeWidth', 'num', 0],
-    [14, 'XUID', 'array', null],
-    [15, 'charset', 'offset', 0],
-    [16, 'Encoding', 'offset', 0],
-    [17, 'CharStrings', 'offset', 0],
-    [18, 'Private', ['offset', 'offset'], null],
-    [[12, 21], 'PostScript', 'sid', null],
-    [[12, 22], 'BaseFontName', 'sid', null],
-    [[12, 23], 'BaseFontBlend', 'delta', null],
-    [[12, 31], 'CIDFontVersion', 'num', 0],
-    [[12, 32], 'CIDFontRevision', 'num', 0],
-    [[12, 33], 'CIDFontType', 'num', 0],
-    [[12, 34], 'CIDCount', 'num', 8720],
-    [[12, 35], 'UIDBase', 'num', null],
-    [[12, 36], 'FDArray', 'offset', null],
-    [[12, 37], 'FDSelect', 'offset', null],
-    [[12, 38], 'FontName', 'sid', null]];
-  var tables = null;
-  function CFFTopDict(strings) {
-    if (tables === null)
-      tables = CFFDict.createTables(layout);
-    CFFDict.call(this, tables, strings);
-    this.privateDict = null;
-  }
-  CFFTopDict.prototype = Object.create(CFFDict.prototype);
-  return CFFTopDict;
-})();
-
-var CFFPrivateDict = (function CFFPrivateDictClosure() {
-  var layout = [
-    [6, 'BlueValues', 'delta', null],
-    [7, 'OtherBlues', 'delta', null],
-    [8, 'FamilyBlues', 'delta', null],
-    [9, 'FamilyOtherBlues', 'delta', null],
-    [[12, 9], 'BlueScale', 'num', 0.039625],
-    [[12, 10], 'BlueShift', 'num', 7],
-    [[12, 11], 'BlueFuzz', 'num', 1],
-    [10, 'StdHW', 'num', null],
-    [11, 'StdVW', 'num', null],
-    [[12, 12], 'StemSnapH', 'delta', null],
-    [[12, 13], 'StemSnapV', 'delta', null],
-    [[12, 14], 'ForceBold', 'num', 0],
-    [[12, 17], 'LanguageGroup', 'num', 0],
-    [[12, 18], 'ExpansionFactor', 'num', 0.06],
-    [[12, 19], 'initialRandomSeed', 'num', 0],
-    [20, 'defaultWidthX', 'num', 0],
-    [21, 'nominalWidthX', 'num', 0],
-    [19, 'Subrs', 'offset', null]
-  ];
-  var tables = null;
-  function CFFPrivateDict(strings) {
-    if (tables === null)
-      tables = CFFDict.createTables(layout);
-    CFFDict.call(this, tables, strings);
-    this.subrsIndex = null;
-  }
-  CFFPrivateDict.prototype = Object.create(CFFDict.prototype);
-  return CFFPrivateDict;
-})();
-
-var CFFCharsetPredefinedTypes = {
-  ISO_ADOBE: 0,
-  EXPERT: 1,
-  EXPERT_SUBSET: 2
-};
-var CFFCharsetEmbeddedTypes = {
-  FORMAT0: 0,
-  FORMAT1: 1,
-  FORMAT2: 2
-};
-var CFFCharset = (function CFFCharsetClosure() {
-  function CFFCharset(predefined, format, charset, raw) {
-    this.predefined = predefined;
-    this.format = format;
-    this.charset = charset;
-    this.raw = raw;
-  }
-  return CFFCharset;
-})();
-
-var CFFEncodingPredefinedTypes = {
-  STANDARD: 0,
-  EXPERT: 1
-};
-var CFFCharsetEmbeddedTypes = {
-  FORMAT0: 0,
-  FORMAT1: 1
-};
-var CFFEncoding = (function CFFEncodingClosure() {
-  function CFFEncoding(predefined, format, encoding, raw) {
-    this.predefined = predefined;
-    this.format = format;
-    this.encoding = encoding;
-    this.raw = raw;
-  }
-  return CFFEncoding;
-})();
-
-var CFFFDSelect = (function CFFFDSelectClosure() {
-  function CFFFDSelect(fdSelect, raw) {
-    this.fdSelect = fdSelect;
-    this.raw = raw;
-  }
-  return CFFFDSelect;
-})();
-
-// Helper class to keep track of where an offset is within the data and helps
-// filling in that offset once it's known.
-var CFFOffsetTracker = (function CFFOffsetTrackerClosure() {
-  function CFFOffsetTracker() {
-    this.offsets = {};
-  }
-  CFFOffsetTracker.prototype = {
-    isTracking: function CFFOffsetTracker_isTracking(key) {
-      return key in this.offsets;
-    },
-    track: function CFFOffsetTracker_track(key, location) {
-      if (key in this.offsets)
-        error('Already tracking location of ' + key);
-      this.offsets[key] = location;
-    },
-    offset: function CFFOffsetTracker_offset(value) {
-      for (var key in this.offsets) {
-        this.offsets[key] += value;
-      }
-    },
-    setEntryLocation: function CFFOffsetTracker_setEntryLocation(key,
-                                                                 values,
-                                                                 output) {
-      if (!(key in this.offsets))
-        error('Not tracking location of ' + key);
-      var data = output.data;
-      var dataOffset = this.offsets[key];
-      var size = 5;
-      for (var i = 0, ii = values.length; i < ii; ++i) {
-        var offset0 = i * size + dataOffset;
-        var offset1 = offset0 + 1;
-        var offset2 = offset0 + 2;
-        var offset3 = offset0 + 3;
-        var offset4 = offset0 + 4;
-        // It's easy to screw up offsets so perform this sanity check.
-        if (data[offset0] !== 0x1d || data[offset1] !== 0 ||
-            data[offset2] !== 0 || data[offset3] !== 0 || data[offset4] !== 0)
-          error('writing to an offset that is not empty');
-        var value = values[i];
-        data[offset0] = 0x1d;
-        data[offset1] = (value >> 24) & 0xFF;
-        data[offset2] = (value >> 16) & 0xFF;
-        data[offset3] = (value >> 8) & 0xFF;
-        data[offset4] = value & 0xFF;
-      }
-    }
-  };
-  return CFFOffsetTracker;
-})();
-
-// Takes a CFF and converts it to the binary representation.
-var CFFCompiler = (function CFFCompilerClosure() {
-  function stringToArray(str) {
-    var array = [];
-    for (var i = 0, ii = str.length; i < ii; ++i)
-      array[i] = str.charCodeAt(i);
-
-    return array;
-  };
-  function CFFCompiler(cff) {
-    this.cff = cff;
-  }
-  CFFCompiler.prototype = {
-    compile: function CFFCompiler_compile() {
-      var cff = this.cff;
-      var output = {
-        data: [],
-        length: 0,
-        add: function CFFCompiler_add(data) {
-          this.data = this.data.concat(data);
-          this.length = this.data.length;
-        }
-      };
-
-      // Compile the five entries that must be in order.
-      var header = this.compileHeader(cff.header);
-      output.add(header);
-
-      var nameIndex = this.compileNameIndex(cff.names);
-      output.add(nameIndex);
-
-      var compiled = this.compileTopDicts([cff.topDict], output.length);
-      output.add(compiled.output);
-      var topDictTracker = compiled.trackers[0];
-
-      var stringIndex = this.compileStringIndex(cff.strings.strings);
-      output.add(stringIndex);
-
-      var globalSubrIndex = this.compileIndex(cff.globalSubrIndex);
-      output.add(globalSubrIndex);
-
-      // Now start on the other entries that have no specfic order.
-      if (cff.encoding && cff.topDict.hasName('Encoding')) {
-        if (cff.encoding.predefined) {
-          topDictTracker.setEntryLocation('Encoding', [cff.encoding.format],
-                                          output);
-        } else {
-          var encoding = this.compileEncoding(cff.encoding);
-          topDictTracker.setEntryLocation('Encoding', [output.length], output);
-          output.add(encoding);
-        }
-      }
-
-      if (cff.charset && cff.topDict.hasName('charset')) {
-        if (cff.charset.predefined) {
-          topDictTracker.setEntryLocation('charset', [cff.charset.format],
-                                          output);
-        } else {
-          var charset = this.compileCharset(cff.charset);
-          topDictTracker.setEntryLocation('charset', [output.length], output);
-          output.add(charset);
-        }
-      }
-
-      var charStrings = this.compileCharStrings(cff.charStrings);
-      topDictTracker.setEntryLocation('CharStrings', [output.length], output);
-      output.add(charStrings);
-
-      if (cff.isCIDFont) {
-        // For some reason FDSelect must be in front of FDArray on windows. OSX
-        // and linux don't seem to care.
-        topDictTracker.setEntryLocation('FDSelect', [output.length], output);
-        var fdSelect = this.compileFDSelect(cff.fdSelect.raw);
-        output.add(fdSelect);
-
-        var compiled = this.compileTopDicts(cff.fdArray, output.length);
-        topDictTracker.setEntryLocation('FDArray', [output.length], output);
-        output.add(compiled.output);
-        var fontDictTrackers = compiled.trackers;
-
-        this.compilePrivateDicts(cff.fdArray, fontDictTrackers, output);
-      }
-
-      this.compilePrivateDicts([cff.topDict], [topDictTracker], output);
-
-      return output.data;
-    },
-    encodeNumber: function CFFCompiler_encodeNumber(value) {
-      if (parseFloat(value) == parseInt(value) && !isNaN(value)) // isInt
-        return this.encodeInteger(value);
-      else
-        return this.encodeFloat(value);
-    },
-    encodeFloat: function CFFCompiler_encodeFloat(value) {
-      value = value.toString();
-      // Strip off the any leading zeros.
-      if (value.substr(0, 2) === '0.')
-        value = value.substr(1);
-      else if (value.substr(0, 3) === '-0.')
-        value = '-' + value.substr(2);
-      var nibbles = [];
-      for (var i = 0, ii = value.length; i < ii; ++i) {
-        var a = value.charAt(i), b = value.charAt(i + 1);
-        var nibble;
-        if (a === 'e' && b === '-') {
-          nibble = 0xc;
-          ++i;
-        } else if (a === '.') {
-          nibble = 0xa;
-        } else if (a === 'E') {
-          nibble = 0xb;
-        } else if (a === '-') {
-          nibble = 0xe;
-        } else {
-          nibble = a;
-        }
-        nibbles.push(nibble);
-      }
-      nibbles.push(0xf);
-      if (nibbles.length % 2)
-        nibbles.push(0xf);
-      var out = [30];
-      for (var i = 0, ii = nibbles.length; i < ii; i += 2)
-        out.push(nibbles[i] << 4 | nibbles[i + 1]);
-      return out;
-    },
-    encodeInteger: function CFFCompiler_encodeInteger(value) {
-      var code;
-      if (value >= -107 && value <= 107) {
-        code = [value + 139];
-      } else if (value >= 108 && value <= 1131) {
-        value = [value - 108];
-        code = [(value >> 8) + 247, value & 0xFF];
-      } else if (value >= -1131 && value <= -108) {
-        value = -value - 108;
-        code = [(value >> 8) + 251, value & 0xFF];
-      } else if (value >= -32768 && value <= 32767) {
-        code = [0x1c, (value >> 8) & 0xFF, value & 0xFF];
-      } else {
-        code = [0x1d,
-                (value >> 24) & 0xFF,
-                (value >> 16) & 0xFF,
-                (value >> 8) & 0xFF,
-                 value & 0xFF];
-      }
-      return code;
-    },
-    compileHeader: function CFFCompiler_compileHeader(header) {
-      return [
-        header.major,
-        header.minor,
-        header.hdrSize,
-        header.offSize
-      ];
-    },
-    compileNameIndex: function CFFCompiler_compileNameIndex(names) {
-      var nameIndex = new CFFIndex();
-      for (var i = 0, ii = names.length; i < ii; ++i)
-        nameIndex.add(stringToArray(names[i]));
-      return this.compileIndex(nameIndex);
-    },
-    compileTopDicts: function CFFCompiler_compileTopDicts(dicts, length) {
-      var fontDictTrackers = [];
-      var fdArrayIndex = new CFFIndex();
-      for (var i = 0, ii = dicts.length; i < ii; ++i) {
-        var fontDict = dicts[i];
-        var fontDictTracker = new CFFOffsetTracker();
-        var fontDictData = this.compileDict(fontDict, fontDictTracker);
-        fontDictTrackers.push(fontDictTracker);
-        fdArrayIndex.add(fontDictData);
-        fontDictTracker.offset(length);
-      }
-      fdArrayIndex = this.compileIndex(fdArrayIndex, fontDictTrackers);
-      return {
-        trackers: fontDictTrackers,
-        output: fdArrayIndex
-      };
-    },
-    compilePrivateDicts: function CFFCompiler_compilePrivateDicts(dicts,
-                                                                  trackers,
-                                                                  output) {
-      for (var i = 0, ii = dicts.length; i < ii; ++i) {
-        var fontDict = dicts[i];
-        if (!fontDict.privateDict || !fontDict.hasName('Private'))
-          continue;
-        var privateDict = fontDict.privateDict;
-        var privateDictTracker = new CFFOffsetTracker();
-        var privateDictData = this.compileDict(privateDict, privateDictTracker);
-
-        privateDictTracker.offset(output.length);
-        trackers[i].setEntryLocation('Private',
-                                     [privateDictData.length, output.length],
-                                     output);
-        output.add(privateDictData);
-
-        if (privateDict.subrsIndex && privateDict.hasName('Subrs')) {
-          var subrs = this.compileIndex(privateDict.subrsIndex);
-          privateDictTracker.setEntryLocation('Subrs', [privateDictData.length],
-                                              output);
-          output.add(subrs);
-        }
-      }
-    },
-    compileDict: function CFFCompiler_compileDict(dict, offsetTracker) {
-      var out = [];
-      // The dictionary keys must be in a certain order.
-      var order = dict.order;
-      for (var i = 0; i < order.length; ++i) {
-        var key = order[i];
-        if (!(key in dict.values))
-          continue;
-        var values = dict.values[key];
-        var types = dict.types[key];
-        if (!isArray(types)) types = [types];
-        if (!isArray(values)) values = [values];
-
-        // Remove any empty dict values.
-        if (values.length === 0)
-          continue;
-
-        for (var j = 0, jj = types.length; j < jj; ++j) {
-          var type = types[j];
-          var value = values[j];
-          switch (type) {
-            case 'num':
-            case 'sid':
-              out = out.concat(this.encodeNumber(value));
-              break;
-            case 'offset':
-              // For offsets we just insert a 32bit integer so we don't have to
-              // deal with figuring out the length of the offset when it gets
-              // replaced later on by the compiler.
-              var name = dict.keyToNameMap[key];
-              // Some offsets have the offset and the length, so just record the
-              // position of the first one.
-              if (!offsetTracker.isTracking(name))
-                offsetTracker.track(name, out.length);
-              out = out.concat([0x1d, 0, 0, 0, 0]);
-              break;
-            case 'array':
-            case 'delta':
-              out = out.concat(this.encodeNumber(value));
-              for (var k = 1, kk = values.length; k < kk; ++k)
-                out = out.concat(this.encodeNumber(values[k]));
-              break;
-            default:
-              error('Unknown data type of ' + type);
-              break;
-          }
-        }
-        out = out.concat(dict.opcodes[key]);
-      }
-      return out;
-    },
-    compileStringIndex: function CFFCompiler_compileStringIndex(strings) {
-      var stringIndex = new CFFIndex();
-      for (var i = 0, ii = strings.length; i < ii; ++i)
-        stringIndex.add(stringToArray(strings[i]));
-      return this.compileIndex(stringIndex);
-    },
-    compileGlobalSubrIndex: function CFFCompiler_compileGlobalSubrIndex() {
-      var globalSubrIndex = this.cff.globalSubrIndex;
-      this.out.writeByteArray(this.compileIndex(globalSubrIndex));
-    },
-    compileCharStrings: function CFFCompiler_compileCharStrings(charStrings) {
-      return this.compileIndex(charStrings);
-    },
-    compileCharset: function CFFCompiler_compileCharset(charset) {
-      return this.compileTypedArray(charset.raw);
-    },
-    compileEncoding: function CFFCompiler_compileEncoding(encoding) {
-      return this.compileTypedArray(encoding.raw);
-    },
-    compileFDSelect: function CFFCompiler_compileFDSelect(fdSelect) {
-      return this.compileTypedArray(fdSelect);
-    },
-    compileTypedArray: function CFFCompiler_compileTypedArray(data) {
-      var out = [];
-      for (var i = 0, ii = data.length; i < ii; ++i)
-        out[i] = data[i];
-      return out;
-    },
-    compileIndex: function CFFCompiler_compileIndex(index, trackers) {
-      trackers = trackers || [];
-      var objects = index.objects;
-      // First 2 bytes contains the number of objects contained into this index
-      var count = objects.length;
-
-      // If there is no object, just create an index. This technically
-      // should just be [0, 0] but OTS has an issue with that.
-      if (count == 0)
-        return [0, 0, 0];
-
-      var data = [(count >> 8) & 0xFF, count & 0xff];
-
-      var lastOffset = 1;
-      for (var i = 0; i < count; ++i)
-        lastOffset += objects[i].length;
-
-      var offsetSize;
-      if (lastOffset < 0x100)
-        offsetSize = 1;
-      else if (lastOffset < 0x10000)
-        offsetSize = 2;
-      else if (lastOffset < 0x1000000)
-        offsetSize = 3;
-      else
-        offsetSize = 4;
-
-      // Next byte contains the offset size use to reference object in the file
-      data.push(offsetSize);
-
-      // Add another offset after this one because we need a new offset
-      var relativeOffset = 1;
-      for (var i = 0; i < count + 1; i++) {
-        if (offsetSize === 1) {
-          data.push(relativeOffset & 0xFF);
-        } else if (offsetSize === 2) {
-          data.push((relativeOffset >> 8) & 0xFF,
-                     relativeOffset & 0xFF);
-        } else if (offsetSize === 3) {
-          data.push((relativeOffset >> 16) & 0xFF,
-                    (relativeOffset >> 8) & 0xFF,
-                     relativeOffset & 0xFF);
-        } else {
-          data.push((relativeOffset >>> 24) & 0xFF,
-                    (relativeOffset >> 16) & 0xFF,
-                    (relativeOffset >> 8) & 0xFF,
-                     relativeOffset & 0xFF);
-        }
-
-        if (objects[i])
-          relativeOffset += objects[i].length;
-      }
-      var offset = data.length;
-
-      for (var i = 0; i < count; i++) {
-        // Notify the tracker where the object will be offset in the data.
-        if (trackers[i])
-          trackers[i].offset(data.length);
-        for (var j = 0, jj = objects[i].length; j < jj; j++)
-          data.push(objects[i][j]);
-      }
-      return data;
-    }
-  };
-  return CFFCompiler;
-})();
-
-
-/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
-
-'use strict';
-
-var GlyphsUnicode = {
-  A: 0x0041,
-  AE: 0x00C6,
-  AEacute: 0x01FC,
-  AEmacron: 0x01E2,
-  AEsmall: 0xF7E6,
-  Aacute: 0x00C1,
-  Aacutesmall: 0xF7E1,
-  Abreve: 0x0102,
-  Abreveacute: 0x1EAE,
-  Abrevecyrillic: 0x04D0,
-  Abrevedotbelow: 0x1EB6,
-  Abrevegrave: 0x1EB0,
-  Abrevehookabove: 0x1EB2,
-  Abrevetilde: 0x1EB4,
-  Acaron: 0x01CD,
-  Acircle: 0x24B6,
-  Acircumflex: 0x00C2,
-  Acircumflexacute: 0x1EA4,
-  Acircumflexdotbelow: 0x1EAC,
-  Acircumflexgrave: 0x1EA6,
-  Acircumflexhookabove: 0x1EA8,
-  Acircumflexsmall: 0xF7E2,
-  Acircumflextilde: 0x1EAA,
-  Acute: 0xF6C9,
-  Acutesmall: 0xF7B4,
-  Acyrillic: 0x0410,
-  Adblgrave: 0x0200,
-  Adieresis: 0x00C4,
-  Adieresiscyrillic: 0x04D2,
-  Adieresismacron: 0x01DE,
-  Adieresissmall: 0xF7E4,
-  Adotbelow: 0x1EA0,
-  Adotmacron: 0x01E0,
-  Agrave: 0x00C0,
-  Agravesmall: 0xF7E0,
-  Ahookabove: 0x1EA2,
-  Aiecyrillic: 0x04D4,
-  Ainvertedbreve: 0x0202,
-  Alpha: 0x0391,
-  Alphatonos: 0x0386,
-  Amacron: 0x0100,
-  Amonospace: 0xFF21,
-  Aogonek: 0x0104,
-  Aring: 0x00C5,
-  Aringacute: 0x01FA,
-  Aringbelow: 0x1E00,
-  Aringsmall: 0xF7E5,
-  Asmall: 0xF761,
-  Atilde: 0x00C3,
-  Atildesmall: 0xF7E3,
-  Aybarmenian: 0x0531,
-  B: 0x0042,
-  Bcircle: 0x24B7,
-  Bdotaccent: 0x1E02,
-  Bdotbelow: 0x1E04,
-  Becyrillic: 0x0411,
-  Benarmenian: 0x0532,
-  Beta: 0x0392,
-  Bhook: 0x0181,
-  Blinebelow: 0x1E06,
-  Bmonospace: 0xFF22,
-  Brevesmall: 0xF6F4,
-  Bsmall: 0xF762,
-  Btopbar: 0x0182,
-  C: 0x0043,
-  Caarmenian: 0x053E,
-  Cacute: 0x0106,
-  Caron: 0xF6CA,
-  Caronsmall: 0xF6F5,
-  Ccaron: 0x010C,
-  Ccedilla: 0x00C7,
-  Ccedillaacute: 0x1E08,
-  Ccedillasmall: 0xF7E7,
-  Ccircle: 0x24B8,
-  Ccircumflex: 0x0108,
-  Cdot: 0x010A,
-  Cdotaccent: 0x010A,
-  Cedillasmall: 0xF7B8,
-  Chaarmenian: 0x0549,
-  Cheabkhasiancyrillic: 0x04BC,
-  Checyrillic: 0x0427,
-  Chedescenderabkhasiancyrillic: 0x04BE,
-  Chedescendercyrillic: 0x04B6,
-  Chedieresiscyrillic: 0x04F4,
-  Cheharmenian: 0x0543,
-  Chekhakassiancyrillic: 0x04CB,
-  Cheverticalstrokecyrillic: 0x04B8,
-  Chi: 0x03A7,
-  Chook: 0x0187,
-  Circumflexsmall: 0xF6F6,
-  Cmonospace: 0xFF23,
-  Coarmenian: 0x0551,
-  Csmall: 0xF763,
-  D: 0x0044,
-  DZ: 0x01F1,
-  DZcaron: 0x01C4,
-  Daarmenian: 0x0534,
-  Dafrican: 0x0189,
-  Dcaron: 0x010E,
-  Dcedilla: 0x1E10,
-  Dcircle: 0x24B9,
-  Dcircumflexbelow: 0x1E12,
-  Dcroat: 0x0110,
-  Ddotaccent: 0x1E0A,
-  Ddotbelow: 0x1E0C,
-  Decyrillic: 0x0414,
-  Deicoptic: 0x03EE,
-  Delta: 0x2206,
-  Deltagreek: 0x0394,
-  Dhook: 0x018A,
-  Dieresis: 0xF6CB,
-  DieresisAcute: 0xF6CC,
-  DieresisGrave: 0xF6CD,
-  Dieresissmall: 0xF7A8,
-  Digammagreek: 0x03DC,
-  Djecyrillic: 0x0402,
-  Dlinebelow: 0x1E0E,
-  Dmonospace: 0xFF24,
-  Dotaccentsmall: 0xF6F7,
-  Dslash: 0x0110,
-  Dsmall: 0xF764,
-  Dtopbar: 0x018B,
-  Dz: 0x01F2,
-  Dzcaron: 0x01C5,
-  Dzeabkhasiancyrillic: 0x04E0,
-  Dzecyrillic: 0x0405,
-  Dzhecyrillic: 0x040F,
-  E: 0x0045,
-  Eacute: 0x00C9,
-  Eacutesmall: 0xF7E9,
-  Ebreve: 0x0114,
-  Ecaron: 0x011A,
-  Ecedillabreve: 0x1E1C,
-  Echarmenian: 0x0535,
-  Ecircle: 0x24BA,
-  Ecircumflex: 0x00CA,
-  Ecircumflexacute: 0x1EBE,
-  Ecircumflexbelow: 0x1E18,
-  Ecircumflexdotbelow: 0x1EC6,
-  Ecircumflexgrave: 0x1EC0,
-  Ecircumflexhookabove: 0x1EC2,
-  Ecircumflexsmall: 0xF7EA,
-  Ecircumflextilde: 0x1EC4,
-  Ecyrillic: 0x0404,
-  Edblgrave: 0x0204,
-  Edieresis: 0x00CB,
-  Edieresissmall: 0xF7EB,
-  Edot: 0x0116,
-  Edotaccent: 0x0116,
-  Edotbelow: 0x1EB8,
-  Efcyrillic: 0x0424,
-  Egrave: 0x00C8,
-  Egravesmall: 0xF7E8,
-  Eharmenian: 0x0537,
-  Ehookabove: 0x1EBA,
-  Eightroman: 0x2167,
-  Einvertedbreve: 0x0206,
-  Eiotifiedcyrillic: 0x0464,
-  Elcyrillic: 0x041B,
-  Elevenroman: 0x216A,
-  Emacron: 0x0112,
-  Emacronacute: 0x1E16,
-  Emacrongrave: 0x1E14,
-  Emcyrillic: 0x041C,
-  Emonospace: 0xFF25,
-  Encyrillic: 0x041D,
-  Endescendercyrillic: 0x04A2,
-  Eng: 0x014A,
-  Enghecyrillic: 0x04A4,
-  Enhookcyrillic: 0x04C7,
-  Eogonek: 0x0118,
-  Eopen: 0x0190,
-  Epsilon: 0x0395,
-  Epsilontonos: 0x0388,
-  Ercyrillic: 0x0420,
-  Ereversed: 0x018E,
-  Ereversedcyrillic: 0x042D,
-  Escyrillic: 0x0421,
-  Esdescendercyrillic: 0x04AA,
-  Esh: 0x01A9,
-  Esmall: 0xF765,
-  Eta: 0x0397,
-  Etarmenian: 0x0538,
-  Etatonos: 0x0389,
-  Eth: 0x00D0,
-  Ethsmall: 0xF7F0,
-  Etilde: 0x1EBC,
-  Etildebelow: 0x1E1A,
-  Euro: 0x20AC,
-  Ezh: 0x01B7,
-  Ezhcaron: 0x01EE,
-  Ezhreversed: 0x01B8,
-  F: 0x0046,
-  Fcircle: 0x24BB,
-  Fdotaccent: 0x1E1E,
-  Feharmenian: 0x0556,
-  Feicoptic: 0x03E4,
-  Fhook: 0x0191,
-  Fitacyrillic: 0x0472,
-  Fiveroman: 0x2164,
-  Fmonospace: 0xFF26,
-  Fourroman: 0x2163,
-  Fsmall: 0xF766,
-  G: 0x0047,
-  GBsquare: 0x3387,
-  Gacute: 0x01F4,
-  Gamma: 0x0393,
-  Gammaafrican: 0x0194,
-  Gangiacoptic: 0x03EA,
-  Gbreve: 0x011E,
-  Gcaron: 0x01E6,
-  Gcedilla: 0x0122,
-  Gcircle: 0x24BC,
-  Gcircumflex: 0x011C,
-  Gcommaaccent: 0x0122,
-  Gdot: 0x0120,
-  Gdotaccent: 0x0120,
-  Gecyrillic: 0x0413,
-  Ghadarmenian: 0x0542,
-  Ghemiddlehookcyrillic: 0x0494,
-  Ghestrokecyrillic: 0x0492,
-  Gheupturncyrillic: 0x0490,
-  Ghook: 0x0193,
-  Gimarmenian: 0x0533,
-  Gjecyrillic: 0x0403,
-  Gmacron: 0x1E20,
-  Gmonospace: 0xFF27,
-  Grave: 0xF6CE,
-  Gravesmall: 0xF760,
-  Gsmall: 0xF767,
-  Gsmallhook: 0x029B,
-  Gstroke: 0x01E4,
-  H: 0x0048,
-  H18533: 0x25CF,
-  H18543: 0x25AA,
-  H18551: 0x25AB,
-  H22073: 0x25A1,
-  HPsquare: 0x33CB,
-  Haabkhasiancyrillic: 0x04A8,
-  Hadescendercyrillic: 0x04B2,
-  Hardsigncyrillic: 0x042A,
-  Hbar: 0x0126,
-  Hbrevebelow: 0x1E2A,
-  Hcedilla: 0x1E28,
-  Hcircle: 0x24BD,
-  Hcircumflex: 0x0124,
-  Hdieresis: 0x1E26,
-  Hdotaccent: 0x1E22,
-  Hdotbelow: 0x1E24,
-  Hmonospace: 0xFF28,
-  Hoarmenian: 0x0540,
-  Horicoptic: 0x03E8,
-  Hsmall: 0xF768,
-  Hungarumlaut: 0xF6CF,
-  Hungarumlautsmall: 0xF6F8,
-  Hzsquare: 0x3390,
-  I: 0x0049,
-  IAcyrillic: 0x042F,
-  IJ: 0x0132,
-  IUcyrillic: 0x042E,
-  Iacute: 0x00CD,
-  Iacutesmall: 0xF7ED,
-  Ibreve: 0x012C,
-  Icaron: 0x01CF,
-  Icircle: 0x24BE,
-  Icircumflex: 0x00CE,
-  Icircumflexsmall: 0xF7EE,
-  Icyrillic: 0x0406,
-  Idblgrave: 0x0208,
-  Idieresis: 0x00CF,
-  Idieresisacute: 0x1E2E,
-  Idieresiscyrillic: 0x04E4,
-  Idieresissmall: 0xF7EF,
-  Idot: 0x0130,
-  Idotaccent: 0x0130,
-  Idotbelow: 0x1ECA,
-  Iebrevecyrillic: 0x04D6,
-  Iecyrillic: 0x0415,
-  Ifraktur: 0x2111,
-  Igrave: 0x00CC,
-  Igravesmall: 0xF7EC,
-  Ihookabove: 0x1EC8,
-  Iicyrillic: 0x0418,
-  Iinvertedbreve: 0x020A,
-  Iishortcyrillic: 0x0419,
-  Imacron: 0x012A,
-  Imacroncyrillic: 0x04E2,
-  Imonospace: 0xFF29,
-  Iniarmenian: 0x053B,
-  Iocyrillic: 0x0401,
-  Iogonek: 0x012E,
-  Iota: 0x0399,
-  Iotaafrican: 0x0196,
-  Iotadieresis: 0x03AA,
-  Iotatonos: 0x038A,
-  Ismall: 0xF769,
-  Istroke: 0x0197,
-  Itilde: 0x0128,
-  Itildebelow: 0x1E2C,
-  Izhitsacyrillic: 0x0474,
-  Izhitsadblgravecyrillic: 0x0476,
-  J: 0x004A,
-  Jaarmenian: 0x0541,
-  Jcircle: 0x24BF,
-  Jcircumflex: 0x0134,
-  Jecyrillic: 0x0408,
-  Jheharmenian: 0x054B,
-  Jmonospace: 0xFF2A,
-  Jsmall: 0xF76A,
-  K: 0x004B,
-  KBsquare: 0x3385,
-  KKsquare: 0x33CD,
-  Kabashkircyrillic: 0x04A0,
-  Kacute: 0x1E30,
-  Kacyrillic: 0x041A,
-  Kadescendercyrillic: 0x049A,
-  Kahookcyrillic: 0x04C3,
-  Kappa: 0x039A,
-  Kastrokecyrillic: 0x049E,
-  Kaverticalstrokecyrillic: 0x049C,
-  Kcaron: 0x01E8,
-  Kcedilla: 0x0136,
-  Kcircle: 0x24C0,
-  Kcommaaccent: 0x0136,
-  Kdotbelow: 0x1E32,
-  Keharmenian: 0x0554,
-  Kenarmenian: 0x053F,
-  Khacyrillic: 0x0425,
-  Kheicoptic: 0x03E6,
-  Khook: 0x0198,
-  Kjecyrillic: 0x040C,
-  Klinebelow: 0x1E34,
-  Kmonospace: 0xFF2B,
-  Koppacyrillic: 0x0480,
-  Koppagreek: 0x03DE,
-  Ksicyrillic: 0x046E,
-  Ksmall: 0xF76B,
-  L: 0x004C,
-  LJ: 0x01C7,
-  LL: 0xF6BF,
-  Lacute: 0x0139,
-  Lambda: 0x039B,
-  Lcaron: 0x013D,
-  Lcedilla: 0x013B,
-  Lcircle: 0x24C1,
-  Lcircumflexbelow: 0x1E3C,
-  Lcommaaccent: 0x013B,
-  Ldot: 0x013F,
-  Ldotaccent: 0x013F,
-  Ldotbelow: 0x1E36,
-  Ldotbelowmacron: 0x1E38,
-  Liwnarmenian: 0x053C,
-  Lj: 0x01C8,
-  Ljecyrillic: 0x0409,
-  Llinebelow: 0x1E3A,
-  Lmonospace: 0xFF2C,
-  Lslash: 0x0141,
-  Lslashsmall: 0xF6F9,
-  Lsmall: 0xF76C,
-  M: 0x004D,
-  MBsquare: 0x3386,
-  Macron: 0xF6D0,
-  Macronsmall: 0xF7AF,
-  Macute: 0x1E3E,
-  Mcircle: 0x24C2,
-  Mdotaccent: 0x1E40,
-  Mdotbelow: 0x1E42,
-  Menarmenian: 0x0544,
-  Mmonospace: 0xFF2D,
-  Msmall: 0xF76D,
-  Mturned: 0x019C,
-  Mu: 0x039C,
-  N: 0x004E,
-  NJ: 0x01CA,
-  Nacute: 0x0143,
-  Ncaron: 0x0147,
-  Ncedilla: 0x0145,
-  Ncircle: 0x24C3,
-  Ncircumflexbelow: 0x1E4A,
-  Ncommaaccent: 0x0145,
-  Ndotaccent: 0x1E44,
-  Ndotbelow: 0x1E46,
-  Nhookleft: 0x019D,
-  Nineroman: 0x2168,
-  Nj: 0x01CB,
-  Njecyrillic: 0x040A,
-  Nlinebelow: 0x1E48,
-  Nmonospace: 0xFF2E,
-  Nowarmenian: 0x0546,
-  Nsmall: 0xF76E,
-  Ntilde: 0x00D1,
-  Ntildesmall: 0xF7F1,
-  Nu: 0x039D,
-  O: 0x004F,
-  OE: 0x0152,
-  OEsmall: 0xF6FA,
-  Oacute: 0x00D3,
-  Oacutesmall: 0xF7F3,
-  Obarredcyrillic: 0x04E8,
-  Obarreddieresiscyrillic: 0x04EA,
-  Obreve: 0x014E,
-  Ocaron: 0x01D1,
-  Ocenteredtilde: 0x019F,
-  Ocircle: 0x24C4,
-  Ocircumflex: 0x00D4,
-  Ocircumflexacute: 0x1ED0,
-  Ocircumflexdotbelow: 0x1ED8,
-  Ocircumflexgrave: 0x1ED2,
-  Ocircumflexhookabove: 0x1ED4,
-  Ocircumflexsmall: 0xF7F4,
-  Ocircumflextilde: 0x1ED6,
-  Ocyrillic: 0x041E,
-  Odblacute: 0x0150,
-  Odblgrave: 0x020C,
-  Odieresis: 0x00D6,
-  Odieresiscyrillic: 0x04E6,
-  Odieresissmall: 0xF7F6,
-  Odotbelow: 0x1ECC,
-  Ogoneksmall: 0xF6FB,
-  Ograve: 0x00D2,
-  Ogravesmall: 0xF7F2,
-  Oharmenian: 0x0555,
-  Ohm: 0x2126,
-  Ohookabove: 0x1ECE,
-  Ohorn: 0x01A0,
-  Ohornacute: 0x1EDA,
-  Ohorndotbelow: 0x1EE2,
-  Ohorngrave: 0x1EDC,
-  Ohornhookabove: 0x1EDE,
-  Ohorntilde: 0x1EE0,
-  Ohungarumlaut: 0x0150,
-  Oi: 0x01A2,
-  Oinvertedbreve: 0x020E,
-  Omacron: 0x014C,
-  Omacronacute: 0x1E52,
-  Omacrongrave: 0x1E50,
-  Omega: 0x2126,
-  Omegacyrillic: 0x0460,
-  Omegagreek: 0x03A9,
-  Omegaroundcyrillic: 0x047A,
-  Omegatitlocyrillic: 0x047C,
-  Omegatonos: 0x038F,
-  Omicron: 0x039F,
-  Omicrontonos: 0x038C,
-  Omonospace: 0xFF2F,
-  Oneroman: 0x2160,
-  Oogonek: 0x01EA,
-  Oogonekmacron: 0x01EC,
-  Oopen: 0x0186,
-  Oslash: 0x00D8,
-  Oslashacute: 0x01FE,
-  Oslashsmall: 0xF7F8,
-  Osmall: 0xF76F,
-  Ostrokeacute: 0x01FE,
-  Otcyrillic: 0x047E,
-  Otilde: 0x00D5,
-  Otildeacute: 0x1E4C,
-  Otildedieresis: 0x1E4E,
-  Otildesmall: 0xF7F5,
-  P: 0x0050,
-  Pacute: 0x1E54,
-  Pcircle: 0x24C5,
-  Pdotaccent: 0x1E56,
-  Pecyrillic: 0x041F,
-  Peharmenian: 0x054A,
-  Pemiddlehookcyrillic: 0x04A6,
-  Phi: 0x03A6,
-  Phook: 0x01A4,
-  Pi: 0x03A0,
-  Piwrarmenian: 0x0553,
-  Pmonospace: 0xFF30,
-  Psi: 0x03A8,
-  Psicyrillic: 0x0470,
-  Psmall: 0xF770,
-  Q: 0x0051,
-  Qcircle: 0x24C6,
-  Qmonospace: 0xFF31,
-  Qsmall: 0xF771,
-  R: 0x0052,
-  Raarmenian: 0x054C,
-  Racute: 0x0154,
-  Rcaron: 0x0158,
-  Rcedilla: 0x0156,
-  Rcircle: 0x24C7,
-  Rcommaaccent: 0x0156,
-  Rdblgrave: 0x0210,
-  Rdotaccent: 0x1E58,
-  Rdotbelow: 0x1E5A,
-  Rdotbelowmacron: 0x1E5C,
-  Reharmenian: 0x0550,
-  Rfraktur: 0x211C,
-  Rho: 0x03A1,
-  Ringsmall: 0xF6FC,
-  Rinvertedbreve: 0x0212,
-  Rlinebelow: 0x1E5E,
-  Rmonospace: 0xFF32,
-  Rsmall: 0xF772,
-  Rsmallinverted: 0x0281,
-  Rsmallinvertedsuperior: 0x02B6,
-  S: 0x0053,
-  SF010000: 0x250C,
-  SF020000: 0x2514,
-  SF030000: 0x2510,
-  SF040000: 0x2518,
-  SF050000: 0x253C,
-  SF060000: 0x252C,
-  SF070000: 0x2534,
-  SF080000: 0x251C,
-  SF090000: 0x2524,
-  SF100000: 0x2500,
-  SF110000: 0x2502,
-  SF190000: 0x2561,
-  SF200000: 0x2562,
-  SF210000: 0x2556,
-  SF220000: 0x2555,
-  SF230000: 0x2563,
-  SF240000: 0x2551,
-  SF250000: 0x2557,
-  SF260000: 0x255D,
-  SF270000: 0x255C,
-  SF280000: 0x255B,
-  SF360000: 0x255E,
-  SF370000: 0x255F,
-  SF380000: 0x255A,
-  SF390000: 0x2554,
-  SF400000: 0x2569,
-  SF410000: 0x2566,
-  SF420000: 0x2560,
-  SF430000: 0x2550,
-  SF440000: 0x256C,
-  SF450000: 0x2567,
-  SF460000: 0x2568,
-  SF470000: 0x2564,
-  SF480000: 0x2565,
-  SF490000: 0x2559,
-  SF500000: 0x2558,
-  SF510000: 0x2552,
-  SF520000: 0x2553,
-  SF530000: 0x256B,
-  SF540000: 0x256A,
-  Sacute: 0x015A,
-  Sacutedotaccent: 0x1E64,
-  Sampigreek: 0x03E0,
-  Scaron: 0x0160,
-  Scarondotaccent: 0x1E66,
-  Scaronsmall: 0xF6FD,
-  Scedilla: 0x015E,
-  Schwa: 0x018F,
-  Schwacyrillic: 0x04D8,
-  Schwadieresiscyrillic: 0x04DA,
-  Scircle: 0x24C8,
-  Scircumflex: 0x015C,
-  Scommaaccent: 0x0218,
-  Sdotaccent: 0x1E60,
-  Sdotbelow: 0x1E62,
-  Sdotbelowdotaccent: 0x1E68,
-  Seharmenian: 0x054D,
-  Sevenroman: 0x2166,
-  Shaarmenian: 0x0547,
-  Shacyrillic: 0x0428,
-  Shchacyrillic: 0x0429,
-  Sheicoptic: 0x03E2,
-  Shhacyrillic: 0x04BA,
-  Shimacoptic: 0x03EC,
-  Sigma: 0x03A3,
-  Sixroman: 0x2165,
-  Smonospace: 0xFF33,
-  Softsigncyrillic: 0x042C,
-  Ssmall: 0xF773,
-  Stigmagreek: 0x03DA,
-  T: 0x0054,
-  Tau: 0x03A4,
-  Tbar: 0x0166,
-  Tcaron: 0x0164,
-  Tcedilla: 0x0162,
-  Tcircle: 0x24C9,
-  Tcircumflexbelow: 0x1E70,
-  Tcommaaccent: 0x0162,
-  Tdotaccent: 0x1E6A,
-  Tdotbelow: 0x1E6C,
-  Tecyrillic: 0x0422,
-  Tedescendercyrillic: 0x04AC,
-  Tenroman: 0x2169,
-  Tetsecyrillic: 0x04B4,
-  Theta: 0x0398,
-  Thook: 0x01AC,
-  Thorn: 0x00DE,
-  Thornsmall: 0xF7FE,
-  Threeroman: 0x2162,
-  Tildesmall: 0xF6FE,
-  Tiwnarmenian: 0x054F,
-  Tlinebelow: 0x1E6E,
-  Tmonospace: 0xFF34,
-  Toarmenian: 0x0539,
-  Tonefive: 0x01BC,
-  Tonesix: 0x0184,
-  Tonetwo: 0x01A7,
-  Tretroflexhook: 0x01AE,
-  Tsecyrillic: 0x0426,
-  Tshecyrillic: 0x040B,
-  Tsmall: 0xF774,
-  Twelveroman: 0x216B,
-  Tworoman: 0x2161,
-  U: 0x0055,
-  Uacute: 0x00DA,
-  Uacutesmall: 0xF7FA,
-  Ubreve: 0x016C,
-  Ucaron: 0x01D3,
-  Ucircle: 0x24CA,
-  Ucircumflex: 0x00DB,
-  Ucircumflexbelow: 0x1E76,
-  Ucircumflexsmall: 0xF7FB,
-  Ucyrillic: 0x0423,
-  Udblacute: 0x0170,
-  Udblgrave: 0x0214,
-  Udieresis: 0x00DC,
-  Udieresisacute: 0x01D7,
-  Udieresisbelow: 0x1E72,
-  Udieresiscaron: 0x01D9,
-  Udieresiscyrillic: 0x04F0,
-  Udieresisgrave: 0x01DB,
-  Udieresismacron: 0x01D5,
-  Udieresissmall: 0xF7FC,
-  Udotbelow: 0x1EE4,
-  Ugrave: 0x00D9,
-  Ugravesmall: 0xF7F9,
-  Uhookabove: 0x1EE6,
-  Uhorn: 0x01AF,
-  Uhornacute: 0x1EE8,
-  Uhorndotbelow: 0x1EF0,
-  Uhorngrave: 0x1EEA,
-  Uhornhookabove: 0x1EEC,
-  Uhorntilde: 0x1EEE,
-  Uhungarumlaut: 0x0170,
-  Uhungarumlautcyrillic: 0x04F2,
-  Uinvertedbreve: 0x0216,
-  Ukcyrillic: 0x0478,
-  Umacron: 0x016A,
-  Umacroncyrillic: 0x04EE,
-  Umacrondieresis: 0x1E7A,
-  Umonospace: 0xFF35,
-  Uogonek: 0x0172,
-  Upsilon: 0x03A5,
-  Upsilon1: 0x03D2,
-  Upsilonacutehooksymbolgreek: 0x03D3,
-  Upsilonafrican: 0x01B1,
-  Upsilondieresis: 0x03AB,
-  Upsilondieresishooksymbolgreek: 0x03D4,
-  Upsilonhooksymbol: 0x03D2,
-  Upsilontonos: 0x038E,
-  Uring: 0x016E,
-  Ushortcyrillic: 0x040E,
-  Usmall: 0xF775,
-  Ustraightcyrillic: 0x04AE,
-  Ustraightstrokecyrillic: 0x04B0,
-  Utilde: 0x0168,
-  Utildeacute: 0x1E78,
-  Utildebelow: 0x1E74,
-  V: 0x0056,
-  Vcircle: 0x24CB,
-  Vdotbelow: 0x1E7E,
-  Vecyrillic: 0x0412,
-  Vewarmenian: 0x054E,
-  Vhook: 0x01B2,
-  Vmonospace: 0xFF36,
-  Voarmenian: 0x0548,
-  Vsmall: 0xF776,
-  Vtilde: 0x1E7C,
-  W: 0x0057,
-  Wacute: 0x1E82,
-  Wcircle: 0x24CC,
-  Wcircumflex: 0x0174,
-  Wdieresis: 0x1E84,
-  Wdotaccent: 0x1E86,
-  Wdotbelow: 0x1E88,
-  Wgrave: 0x1E80,
-  Wmonospace: 0xFF37,
-  Wsmall: 0xF777,
-  X: 0x0058,
-  Xcircle: 0x24CD,
-  Xdieresis: 0x1E8C,
-  Xdotaccent: 0x1E8A,
-  Xeharmenian: 0x053D,
-  Xi: 0x039E,
-  Xmonospace: 0xFF38,
-  Xsmall: 0xF778,
-  Y: 0x0059,
-  Yacute: 0x00DD,
-  Yacutesmall: 0xF7FD,
-  Yatcyrillic: 0x0462,
-  Ycircle: 0x24CE,
-  Ycircumflex: 0x0176,
-  Ydieresis: 0x0178,
-  Ydieresissmall: 0xF7FF,
-  Ydotaccent: 0x1E8E,
-  Ydotbelow: 0x1EF4,
-  Yericyrillic: 0x042B,
-  Yerudieresiscyrillic: 0x04F8,
-  Ygrave: 0x1EF2,
-  Yhook: 0x01B3,
-  Yhookabove: 0x1EF6,
-  Yiarmenian: 0x0545,
-  Yicyrillic: 0x0407,
-  Yiwnarmenian: 0x0552,
-  Ymonospace: 0xFF39,
-  Ysmall: 0xF779,
-  Ytilde: 0x1EF8,
-  Yusbigcyrillic: 0x046A,
-  Yusbigiotifiedcyrillic: 0x046C,
-  Yuslittlecyrillic: 0x0466,
-  Yuslittleiotifiedcyrillic: 0x0468,
-  Z: 0x005A,
-  Zaarmenian: 0x0536,
-  Zacute: 0x0179,
-  Zcaron: 0x017D,
-  Zcaronsmall: 0xF6FF,
-  Zcircle: 0x24CF,
-  Zcircumflex: 0x1E90,
-  Zdot: 0x017B,
-  Zdotaccent: 0x017B,
-  Zdotbelow: 0x1E92,
-  Zecyrillic: 0x0417,
-  Zedescendercyrillic: 0x0498,
-  Zedieresiscyrillic: 0x04DE,
-  Zeta: 0x0396,
-  Zhearmenian: 0x053A,
-  Zhebrevecyrillic: 0x04C1,
-  Zhecyrillic: 0x0416,
-  Zhedescendercyrillic: 0x0496,
-  Zhedieresiscyrillic: 0x04DC,
-  Zlinebelow: 0x1E94,
-  Zmonospace: 0xFF3A,
-  Zsmall: 0xF77A,
-  Zstroke: 0x01B5,
-  a: 0x0061,
-  aabengali: 0x0986,
-  aacute: 0x00E1,
-  aadeva: 0x0906,
-  aagujarati: 0x0A86,
-  aagurmukhi: 0x0A06,
-  aamatragurmukhi: 0x0A3E,
-  aarusquare: 0x3303,
-  aavowelsignbengali: 0x09BE,
-  aavowelsigndeva: 0x093E,
-  aavowelsigngujarati: 0x0ABE,
-  abbreviationmarkarmenian: 0x055F,
-  abbreviationsigndeva: 0x0970,
-  abengali: 0x0985,
-  abopomofo: 0x311A,
-  abreve: 0x0103,
-  abreveacute: 0x1EAF,
-  abrevecyrillic: 0x04D1,
-  abrevedotbelow: 0x1EB7,
-  abrevegrave: 0x1EB1,
-  abrevehookabove: 0x1EB3,
-  abrevetilde: 0x1EB5,
-  acaron: 0x01CE,
-  acircle: 0x24D0,
-  acircumflex: 0x00E2,
-  acircumflexacute: 0x1EA5,
-  acircumflexdotbelow: 0x1EAD,
-  acircumflexgrave: 0x1EA7,
-  acircumflexhookabove: 0x1EA9,
-  acircumflextilde: 0x1EAB,
-  acute: 0x00B4,
-  acutebelowcmb: 0x0317,
-  acutecmb: 0x0301,
-  acutecomb: 0x0301,
-  acutedeva: 0x0954,
-  acutelowmod: 0x02CF,
-  acutetonecmb: 0x0341,
-  acyrillic: 0x0430,
-  adblgrave: 0x0201,
-  addakgurmukhi: 0x0A71,
-  adeva: 0x0905,
-  adieresis: 0x00E4,
-  adieresiscyrillic: 0x04D3,
-  adieresismacron: 0x01DF,
-  adotbelow: 0x1EA1,
-  adotmacron: 0x01E1,
-  ae: 0x00E6,
-  aeacute: 0x01FD,
-  aekorean: 0x3150,
-  aemacron: 0x01E3,
-  afii00208: 0x2015,
-  afii08941: 0x20A4,
-  afii10017: 0x0410,
-  afii10018: 0x0411,
-  afii10019: 0x0412,
-  afii10020: 0x0413,
-  afii10021: 0x0414,
-  afii10022: 0x0415,
-  afii10023: 0x0401,
-  afii10024: 0x0416,
-  afii10025: 0x0417,
-  afii10026: 0x0418,
-  afii10027: 0x0419,
-  afii10028: 0x041A,
-  afii10029: 0x041B,
-  afii10030: 0x041C,
-  afii10031: 0x041D,
-  afii10032: 0x041E,
-  afii10033: 0x041F,
-  afii10034: 0x0420,
-  afii10035: 0x0421,
-  afii10036: 0x0422,
-  afii10037: 0x0423,
-  afii10038: 0x0424,
-  afii10039: 0x0425,
-  afii10040: 0x0426,
-  afii10041: 0x0427,
-  afii10042: 0x0428,
-  afii10043: 0x0429,
-  afii10044: 0x042A,
-  afii10045: 0x042B,
-  afii10046: 0x042C,
-  afii10047: 0x042D,
-  afii10048: 0x042E,
-  afii10049: 0x042F,
-  afii10050: 0x0490,
-  afii10051: 0x0402,
-  afii10052: 0x0403,
-  afii10053: 0x0404,
-  afii10054: 0x0405,
-  afii10055: 0x0406,
-  afii10056: 0x0407,
-  afii10057: 0x0408,
-  afii10058: 0x0409,
-  afii10059: 0x040A,
-  afii10060: 0x040B,
-  afii10061: 0x040C,
-  afii10062: 0x040E,
-  afii10063: 0xF6C4,
-  afii10064: 0xF6C5,
-  afii10065: 0x0430,
-  afii10066: 0x0431,
-  afii10067: 0x0432,
-  afii10068: 0x0433,
-  afii10069: 0x0434,
-  afii10070: 0x0435,
-  afii10071: 0x0451,
-  afii10072: 0x0436,
-  afii10073: 0x0437,
-  afii10074: 0x0438,
-  afii10075: 0x0439,
-  afii10076: 0x043A,
-  afii10077: 0x043B,
-  afii10078: 0x043C,
-  afii10079: 0x043D,
-  afii10080: 0x043E,
-  afii10081: 0x043F,
-  afii10082: 0x0440,
-  afii10083: 0x0441,
-  afii10084: 0x0442,
-  afii10085: 0x0443,
-  afii10086: 0x0444,
-  afii10087: 0x0445,
-  afii10088: 0x0446,
-  afii10089: 0x0447,
-  afii10090: 0x0448,
-  afii10091: 0x0449,
-  afii10092: 0x044A,
-  afii10093: 0x044B,
-  afii10094: 0x044C,
-  afii10095: 0x044D,
-  afii10096: 0x044E,
-  afii10097: 0x044F,
-  afii10098: 0x0491,
-  afii10099: 0x0452,
-  afii10100: 0x0453,
-  afii10101: 0x0454,
-  afii10102: 0x0455,
-  afii10103: 0x0456,
-  afii10104: 0x0457,
-  afii10105: 0x0458,
-  afii10106: 0x0459,
-  afii10107: 0x045A,
-  afii10108: 0x045B,
-  afii10109: 0x045C,
-  afii10110: 0x045E,
-  afii10145: 0x040F,
-  afii10146: 0x0462,
-  afii10147: 0x0472,
-  afii10148: 0x0474,
-  afii10192: 0xF6C6,
-  afii10193: 0x045F,
-  afii10194: 0x0463,
-  afii10195: 0x0473,
-  afii10196: 0x0475,
-  afii10831: 0xF6C7,
-  afii10832: 0xF6C8,
-  afii10846: 0x04D9,
-  afii299: 0x200E,
-  afii300: 0x200F,
-  afii301: 0x200D,
-  afii57381: 0x066A,
-  afii57388: 0x060C,
-  afii57392: 0x0660,
-  afii57393: 0x0661,
-  afii57394: 0x0662,
-  afii57395: 0x0663,
-  afii57396: 0x0664,
-  afii57397: 0x0665,
-  afii57398: 0x0666,
-  afii57399: 0x0667,
-  afii57400: 0x0668,
-  afii57401: 0x0669,
-  afii57403: 0x061B,
-  afii57407: 0x061F,
-  afii57409: 0x0621,
-  afii57410: 0x0622,
-  afii57411: 0x0623,
-  afii57412: 0x0624,
-  afii57413: 0x0625,
-  afii57414: 0x0626,
-  afii57415: 0x0627,
-  afii57416: 0x0628,
-  afii57417: 0x0629,
-  afii57418: 0x062A,
-  afii57419: 0x062B,
-  afii57420: 0x062C,
-  afii57421: 0x062D,
-  afii57422: 0x062E,
-  afii57423: 0x062F,
-  afii57424: 0x0630,
-  afii57425: 0x0631,
-  afii57426: 0x0632,
-  afii57427: 0x0633,
-  afii57428: 0x0634,
-  afii57429: 0x0635,
-  afii57430: 0x0636,
-  afii57431: 0x0637,
-  afii57432: 0x0638,
-  afii57433: 0x0639,
-  afii57434: 0x063A,
-  afii57440: 0x0640,
-  afii57441: 0x0641,
-  afii57442: 0x0642,
-  afii57443: 0x0643,
-  afii57444: 0x0644,
-  afii57445: 0x0645,
-  afii57446: 0x0646,
-  afii57448: 0x0648,
-  afii57449: 0x0649,
-  afii57450: 0x064A,
-  afii57451: 0x064B,
-  afii57452: 0x064C,
-  afii57453: 0x064D,
-  afii57454: 0x064E,
-  afii57455: 0x064F,
-  afii57456: 0x0650,
-  afii57457: 0x0651,
-  afii57458: 0x0652,
-  afii57470: 0x0647,
-  afii57505: 0x06A4,
-  afii57506: 0x067E,
-  afii57507: 0x0686,
-  afii57508: 0x0698,
-  afii57509: 0x06AF,
-  afii57511: 0x0679,
-  afii57512: 0x0688,
-  afii57513: 0x0691,
-  afii57514: 0x06BA,
-  afii57519: 0x06D2,
-  afii57534: 0x06D5,
-  afii57636: 0x20AA,
-  afii57645: 0x05BE,
-  afii57658: 0x05C3,
-  afii57664: 0x05D0,
-  afii57665: 0x05D1,
-  afii57666: 0x05D2,
-  afii57667: 0x05D3,
-  afii57668: 0x05D4,
-  afii57669: 0x05D5,
-  afii57670: 0x05D6,
-  afii57671: 0x05D7,
-  afii57672: 0x05D8,
-  afii57673: 0x05D9,
-  afii57674: 0x05DA,
-  afii57675: 0x05DB,
-  afii57676: 0x05DC,
-  afii57677: 0x05DD,
-  afii57678: 0x05DE,
-  afii57679: 0x05DF,
-  afii57680: 0x05E0,
-  afii57681: 0x05E1,
-  afii57682: 0x05E2,
-  afii57683: 0x05E3,
-  afii57684: 0x05E4,
-  afii57685: 0x05E5,
-  afii57686: 0x05E6,
-  afii57687: 0x05E7,
-  afii57688: 0x05E8,
-  afii57689: 0x05E9,
-  afii57690: 0x05EA,
-  afii57694: 0xFB2A,
-  afii57695: 0xFB2B,
-  afii57700: 0xFB4B,
-  afii57705: 0xFB1F,
-  afii57716: 0x05F0,
-  afii57717: 0x05F1,
-  afii57718: 0x05F2,
-  afii57723: 0xFB35,
-  afii57793: 0x05B4,
-  afii57794: 0x05B5,
-  afii57795: 0x05B6,
-  afii57796: 0x05BB,
-  afii57797: 0x05B8,
-  afii57798: 0x05B7,
-  afii57799: 0x05B0,
-  afii57800: 0x05B2,
-  afii57801: 0x05B1,
-  afii57802: 0x05B3,
-  afii57803: 0x05C2,
-  afii57804: 0x05C1,
-  afii57806: 0x05B9,
-  afii57807: 0x05BC,
-  afii57839: 0x05BD,
-  afii57841: 0x05BF,
-  afii57842: 0x05C0,
-  afii57929: 0x02BC,
-  afii61248: 0x2105,
-  afii61289: 0x2113,
-  afii61352: 0x2116,
-  afii61573: 0x202C,
-  afii61574: 0x202D,
-  afii61575: 0x202E,
-  afii61664: 0x200C,
-  afii63167: 0x066D,
-  afii64937: 0x02BD,
-  agrave: 0x00E0,
-  agujarati: 0x0A85,
-  agurmukhi: 0x0A05,
-  ahiragana: 0x3042,
-  ahookabove: 0x1EA3,
-  aibengali: 0x0990,
-  aibopomofo: 0x311E,
-  aideva: 0x0910,
-  aiecyrillic: 0x04D5,
-  aigujarati: 0x0A90,
-  aigurmukhi: 0x0A10,
-  aimatragurmukhi: 0x0A48,
-  ainarabic: 0x0639,
-  ainfinalarabic: 0xFECA,
-  aininitialarabic: 0xFECB,
-  ainmedialarabic: 0xFECC,
-  ainvertedbreve: 0x0203,
-  aivowelsignbengali: 0x09C8,
-  aivowelsigndeva: 0x0948,
-  aivowelsigngujarati: 0x0AC8,
-  akatakana: 0x30A2,
-  akatakanahalfwidth: 0xFF71,
-  akorean: 0x314F,
-  alef: 0x05D0,
-  alefarabic: 0x0627,
-  alefdageshhebrew: 0xFB30,
-  aleffinalarabic: 0xFE8E,
-  alefhamzaabovearabic: 0x0623,
-  alefhamzaabovefinalarabic: 0xFE84,
-  alefhamzabelowarabic: 0x0625,
-  alefhamzabelowfinalarabic: 0xFE88,
-  alefhebrew: 0x05D0,
-  aleflamedhebrew: 0xFB4F,
-  alefmaddaabovearabic: 0x0622,
-  alefmaddaabovefinalarabic: 0xFE82,
-  alefmaksuraarabic: 0x0649,
-  alefmaksurafinalarabic: 0xFEF0,
-  alefmaksurainitialarabic: 0xFEF3,
-  alefmaksuramedialarabic: 0xFEF4,
-  alefpatahhebrew: 0xFB2E,
-  alefqamatshebrew: 0xFB2F,
-  aleph: 0x2135,
-  allequal: 0x224C,
-  alpha: 0x03B1,
-  alphatonos: 0x03AC,
-  amacron: 0x0101,
-  amonospace: 0xFF41,
-  ampersand: 0x0026,
-  ampersandmonospace: 0xFF06,
-  ampersandsmall: 0xF726,
-  amsquare: 0x33C2,
-  anbopomofo: 0x3122,
-  angbopomofo: 0x3124,
-  angbracketleft: 0x3008, // This glyph is missing from Adobe's original list.
-  angbracketright: 0x3009, // This glyph is missing from Adobe's original list.
-  angkhankhuthai: 0x0E5A,
-  angle: 0x2220,
-  anglebracketleft: 0x3008,
-  anglebracketleftvertical: 0xFE3F,
-  anglebracketright: 0x3009,
-  anglebracketrightvertical: 0xFE40,
-  angleleft: 0x2329,
-  angleright: 0x232A,
-  angstrom: 0x212B,
-  anoteleia: 0x0387,
-  anudattadeva: 0x0952,
-  anusvarabengali: 0x0982,
-  anusvaradeva: 0x0902,
-  anusvaragujarati: 0x0A82,
-  aogonek: 0x0105,
-  apaatosquare: 0x3300,
-  aparen: 0x249C,
-  apostrophearmenian: 0x055A,
-  apostrophemod: 0x02BC,
-  apple: 0xF8FF,
-  approaches: 0x2250,
-  approxequal: 0x2248,
-  approxequalorimage: 0x2252,
-  approximatelyequal: 0x2245,
-  araeaekorean: 0x318E,
-  araeakorean: 0x318D,
-  arc: 0x2312,
-  arighthalfring: 0x1E9A,
-  aring: 0x00E5,
-  aringacute: 0x01FB,
-  aringbelow: 0x1E01,
-  arrowboth: 0x2194,
-  arrowdashdown: 0x21E3,
-  arrowdashleft: 0x21E0,
-  arrowdashright: 0x21E2,
-  arrowdashup: 0x21E1,
-  arrowdblboth: 0x21D4,
-  arrowdbldown: 0x21D3,
-  arrowdblleft: 0x21D0,
-  arrowdblright: 0x21D2,
-  arrowdblup: 0x21D1,
-  arrowdown: 0x2193,
-  arrowdownleft: 0x2199,
-  arrowdownright: 0x2198,
-  arrowdownwhite: 0x21E9,
-  arrowheaddownmod: 0x02C5,
-  arrowheadleftmod: 0x02C2,
-  arrowheadrightmod: 0x02C3,
-  arrowheadupmod: 0x02C4,
-  arrowhorizex: 0xF8E7,
-  arrowleft: 0x2190,
-  arrowleftdbl: 0x21D0,
-  arrowleftdblstroke: 0x21CD,
-  arrowleftoverright: 0x21C6,
-  arrowleftwhite: 0x21E6,
-  arrowright: 0x2192,
-  arrowrightdblstroke: 0x21CF,
-  arrowrightheavy: 0x279E,
-  arrowrightoverleft: 0x21C4,
-  arrowrightwhite: 0x21E8,
-  arrowtableft: 0x21E4,
-  arrowtabright: 0x21E5,
-  arrowup: 0x2191,
-  arrowupdn: 0x2195,
-  arrowupdnbse: 0x21A8,
-  arrowupdownbase: 0x21A8,
-  arrowupleft: 0x2196,
-  arrowupleftofdown: 0x21C5,
-  arrowupright: 0x2197,
-  arrowupwhite: 0x21E7,
-  arrowvertex: 0xF8E6,
-  asciicircum: 0x005E,
-  asciicircummonospace: 0xFF3E,
-  asciitilde: 0x007E,
-  asciitildemonospace: 0xFF5E,
-  ascript: 0x0251,
-  ascriptturned: 0x0252,
-  asmallhiragana: 0x3041,
-  asmallkatakana: 0x30A1,
-  asmallkatakanahalfwidth: 0xFF67,
-  asterisk: 0x002A,
-  asteriskaltonearabic: 0x066D,
-  asteriskarabic: 0x066D,
-  asteriskmath: 0x2217,
-  asteriskmonospace: 0xFF0A,
-  asterisksmall: 0xFE61,
-  asterism: 0x2042,
-  asuperior: 0xF6E9,
-  asymptoticallyequal: 0x2243,
-  at: 0x0040,
-  atilde: 0x00E3,
-  atmonospace: 0xFF20,
-  atsmall: 0xFE6B,
-  aturned: 0x0250,
-  aubengali: 0x0994,
-  aubopomofo: 0x3120,
-  audeva: 0x0914,
-  augujarati: 0x0A94,
-  augurmukhi: 0x0A14,
-  aulengthmarkbengali: 0x09D7,
-  aumatragurmukhi: 0x0A4C,
-  auvowelsignbengali: 0x09CC,
-  auvowelsigndeva: 0x094C,
-  auvowelsigngujarati: 0x0ACC,
-  avagrahadeva: 0x093D,
-  aybarmenian: 0x0561,
-  ayin: 0x05E2,
-  ayinaltonehebrew: 0xFB20,
-  ayinhebrew: 0x05E2,
-  b: 0x0062,
-  babengali: 0x09AC,
-  backslash: 0x005C,
-  backslashmonospace: 0xFF3C,
-  badeva: 0x092C,
-  bagujarati: 0x0AAC,
-  bagurmukhi: 0x0A2C,
-  bahiragana: 0x3070,
-  bahtthai: 0x0E3F,
-  bakatakana: 0x30D0,
-  bar: 0x007C,
-  barmonospace: 0xFF5C,
-  bbopomofo: 0x3105,
-  bcircle: 0x24D1,
-  bdotaccent: 0x1E03,
-  bdotbelow: 0x1E05,
-  beamedsixteenthnotes: 0x266C,
-  because: 0x2235,
-  becyrillic: 0x0431,
-  beharabic: 0x0628,
-  behfinalarabic: 0xFE90,
-  behinitialarabic: 0xFE91,
-  behiragana: 0x3079,
-  behmedialarabic: 0xFE92,
-  behmeeminitialarabic: 0xFC9F,
-  behmeemisolatedarabic: 0xFC08,
-  behnoonfinalarabic: 0xFC6D,
-  bekatakana: 0x30D9,
-  benarmenian: 0x0562,
-  bet: 0x05D1,
-  beta: 0x03B2,
-  betasymbolgreek: 0x03D0,
-  betdagesh: 0xFB31,
-  betdageshhebrew: 0xFB31,
-  bethebrew: 0x05D1,
-  betrafehebrew: 0xFB4C,
-  bhabengali: 0x09AD,
-  bhadeva: 0x092D,
-  bhagujarati: 0x0AAD,
-  bhagurmukhi: 0x0A2D,
-  bhook: 0x0253,
-  bihiragana: 0x3073,
-  bikatakana: 0x30D3,
-  bilabialclick: 0x0298,
-  bindigurmukhi: 0x0A02,
-  birusquare: 0x3331,
-  blackcircle: 0x25CF,
-  blackdiamond: 0x25C6,
-  blackdownpointingtriangle: 0x25BC,
-  blackleftpointingpointer: 0x25C4,
-  blackleftpointingtriangle: 0x25C0,
-  blacklenticularbracketleft: 0x3010,
-  blacklenticularbracketleftvertical: 0xFE3B,
-  blacklenticularbracketright: 0x3011,
-  blacklenticularbracketrightvertical: 0xFE3C,
-  blacklowerlefttriangle: 0x25E3,
-  blacklowerrighttriangle: 0x25E2,
-  blackrectangle: 0x25AC,
-  blackrightpointingpointer: 0x25BA,
-  blackrightpointingtriangle: 0x25B6,
-  blacksmallsquare: 0x25AA,
-  blacksmilingface: 0x263B,
-  blacksquare: 0x25A0,
-  blackstar: 0x2605,
-  blackupperlefttriangle: 0x25E4,
-  blackupperrighttriangle: 0x25E5,
-  blackuppointingsmalltriangle: 0x25B4,
-  blackuppointingtriangle: 0x25B2,
-  blank: 0x2423,
-  blinebelow: 0x1E07,
-  block: 0x2588,
-  bmonospace: 0xFF42,
-  bobaimaithai: 0x0E1A,
-  bohiragana: 0x307C,
-  bokatakana: 0x30DC,
-  bparen: 0x249D,
-  bqsquare: 0x33C3,
-  braceex: 0xF8F4,
-  braceleft: 0x007B,
-  braceleftbt: 0xF8F3,
-  braceleftmid: 0xF8F2,
-  braceleftmonospace: 0xFF5B,
-  braceleftsmall: 0xFE5B,
-  bracelefttp: 0xF8F1,
-  braceleftvertical: 0xFE37,
-  braceright: 0x007D,
-  bracerightbt: 0xF8FE,
-  bracerightmid: 0xF8FD,
-  bracerightmonospace: 0xFF5D,
-  bracerightsmall: 0xFE5C,
-  bracerighttp: 0xF8FC,
-  bracerightvertical: 0xFE38,
-  bracketleft: 0x005B,
-  bracketleftbt: 0xF8F0,
-  bracketleftex: 0xF8EF,
-  bracketleftmonospace: 0xFF3B,
-  bracketlefttp: 0xF8EE,
-  bracketright: 0x005D,
-  bracketrightbt: 0xF8FB,
-  bracketrightex: 0xF8FA,
-  bracketrightmonospace: 0xFF3D,
-  bracketrighttp: 0xF8F9,
-  breve: 0x02D8,
-  brevebelowcmb: 0x032E,
-  brevecmb: 0x0306,
-  breveinvertedbelowcmb: 0x032F,
-  breveinvertedcmb: 0x0311,
-  breveinverteddoublecmb: 0x0361,
-  bridgebelowcmb: 0x032A,
-  bridgeinvertedbelowcmb: 0x033A,
-  brokenbar: 0x00A6,
-  bstroke: 0x0180,
-  bsuperior: 0xF6EA,
-  btopbar: 0x0183,
-  buhiragana: 0x3076,
-  bukatakana: 0x30D6,
-  bullet: 0x2022,
-  bulletinverse: 0x25D8,
-  bulletoperator: 0x2219,
-  bullseye: 0x25CE,
-  c: 0x0063,
-  caarmenian: 0x056E,
-  cabengali: 0x099A,
-  cacute: 0x0107,
-  cadeva: 0x091A,
-  cagujarati: 0x0A9A,
-  cagurmukhi: 0x0A1A,
-  calsquare: 0x3388,
-  candrabindubengali: 0x0981,
-  candrabinducmb: 0x0310,
-  candrabindudeva: 0x0901,
-  candrabindugujarati: 0x0A81,
-  capslock: 0x21EA,
-  careof: 0x2105,
-  caron: 0x02C7,
-  caronbelowcmb: 0x032C,
-  caroncmb: 0x030C,
-  carriagereturn: 0x21B5,
-  cbopomofo: 0x3118,
-  ccaron: 0x010D,
-  ccedilla: 0x00E7,
-  ccedillaacute: 0x1E09,
-  ccircle: 0x24D2,
-  ccircumflex: 0x0109,
-  ccurl: 0x0255,
-  cdot: 0x010B,
-  cdotaccent: 0x010B,
-  cdsquare: 0x33C5,
-  cedilla: 0x00B8,
-  cedillacmb: 0x0327,
-  cent: 0x00A2,
-  centigrade: 0x2103,
-  centinferior: 0xF6DF,
-  centmonospace: 0xFFE0,
-  centoldstyle: 0xF7A2,
-  centsuperior: 0xF6E0,
-  chaarmenian: 0x0579,
-  chabengali: 0x099B,
-  chadeva: 0x091B,
-  chagujarati: 0x0A9B,
-  chagurmukhi: 0x0A1B,
-  chbopomofo: 0x3114,
-  cheabkhasiancyrillic: 0x04BD,
-  checkmark: 0x2713,
-  checyrillic: 0x0447,
-  chedescenderabkhasiancyrillic: 0x04BF,
-  chedescendercyrillic: 0x04B7,
-  chedieresiscyrillic: 0x04F5,
-  cheharmenian: 0x0573,
-  chekhakassiancyrillic: 0x04CC,
-  cheverticalstrokecyrillic: 0x04B9,
-  chi: 0x03C7,
-  chieuchacirclekorean: 0x3277,
-  chieuchaparenkorean: 0x3217,
-  chieuchcirclekorean: 0x3269,
-  chieuchkorean: 0x314A,
-  chieuchparenkorean: 0x3209,
-  chochangthai: 0x0E0A,
-  chochanthai: 0x0E08,
-  chochingthai: 0x0E09,
-  chochoethai: 0x0E0C,
-  chook: 0x0188,
-  cieucacirclekorean: 0x3276,
-  cieucaparenkorean: 0x3216,
-  cieuccirclekorean: 0x3268,
-  cieuckorean: 0x3148,
-  cieucparenkorean: 0x3208,
-  cieucuparenkorean: 0x321C,
-  circle: 0x25CB,
-  circlecopyrt: 0x00A9, // This glyph is missing from Adobe's original list.
-  circlemultiply: 0x2297,
-  circleot: 0x2299,
-  circleplus: 0x2295,
-  circlepostalmark: 0x3036,
-  circlewithlefthalfblack: 0x25D0,
-  circlewithrighthalfblack: 0x25D1,
-  circumflex: 0x02C6,
-  circumflexbelowcmb: 0x032D,
-  circumflexcmb: 0x0302,
-  clear: 0x2327,
-  clickalveolar: 0x01C2,
-  clickdental: 0x01C0,
-  clicklateral: 0x01C1,
-  clickretroflex: 0x01C3,
-  club: 0x2663,
-  clubsuitblack: 0x2663,
-  clubsuitwhite: 0x2667,
-  cmcubedsquare: 0x33A4,
-  cmonospace: 0xFF43,
-  cmsquaredsquare: 0x33A0,
-  coarmenian: 0x0581,
-  colon: 0x003A,
-  colonmonetary: 0x20A1,
-  colonmonospace: 0xFF1A,
-  colonsign: 0x20A1,
-  colonsmall: 0xFE55,
-  colontriangularhalfmod: 0x02D1,
-  colontriangularmod: 0x02D0,
-  comma: 0x002C,
-  commaabovecmb: 0x0313,
-  commaaboverightcmb: 0x0315,
-  commaaccent: 0xF6C3,
-  commaarabic: 0x060C,
-  commaarmenian: 0x055D,
-  commainferior: 0xF6E1,
-  commamonospace: 0xFF0C,
-  commareversedabovecmb: 0x0314,
-  commareversedmod: 0x02BD,
-  commasmall: 0xFE50,
-  commasuperior: 0xF6E2,
-  commaturnedabovecmb: 0x0312,
-  commaturnedmod: 0x02BB,
-  compass: 0x263C,
-  congruent: 0x2245,
-  contourintegral: 0x222E,
-  control: 0x2303,
-  controlACK: 0x0006,
-  controlBEL: 0x0007,
-  controlBS: 0x0008,
-  controlCAN: 0x0018,
-  controlCR: 0x000D,
-  controlDC1: 0x0011,
-  controlDC2: 0x0012,
-  controlDC3: 0x0013,
-  controlDC4: 0x0014,
-  controlDEL: 0x007F,
-  controlDLE: 0x0010,
-  controlEM: 0x0019,
-  controlENQ: 0x0005,
-  controlEOT: 0x0004,
-  controlESC: 0x001B,
-  controlETB: 0x0017,
-  controlETX: 0x0003,
-  controlFF: 0x000C,
-  controlFS: 0x001C,
-  controlGS: 0x001D,
-  controlHT: 0x0009,
-  controlLF: 0x000A,
-  controlNAK: 0x0015,
-  controlRS: 0x001E,
-  controlSI: 0x000F,
-  controlSO: 0x000E,
-  controlSOT: 0x0002,
-  controlSTX: 0x0001,
-  controlSUB: 0x001A,
-  controlSYN: 0x0016,
-  controlUS: 0x001F,
-  controlVT: 0x000B,
-  copyright: 0x00A9,
-  copyrightsans: 0xF8E9,
-  copyrightserif: 0xF6D9,
-  cornerbracketleft: 0x300C,
-  cornerbracketlefthalfwidth: 0xFF62,
-  cornerbracketleftvertical: 0xFE41,
-  cornerbracketright: 0x300D,
-  cornerbracketrighthalfwidth: 0xFF63,
-  cornerbracketrightvertical: 0xFE42,
-  corporationsquare: 0x337F,
-  cosquare: 0x33C7,
-  coverkgsquare: 0x33C6,
-  cparen: 0x249E,
-  cruzeiro: 0x20A2,
-  cstretched: 0x0297,
-  curlyand: 0x22CF,
-  curlyor: 0x22CE,
-  currency: 0x00A4,
-  cyrBreve: 0xF6D1,
-  cyrFlex: 0xF6D2,
-  cyrbreve: 0xF6D4,
-  cyrflex: 0xF6D5,
-  d: 0x0064,
-  daarmenian: 0x0564,
-  dabengali: 0x09A6,
-  dadarabic: 0x0636,
-  dadeva: 0x0926,
-  dadfinalarabic: 0xFEBE,
-  dadinitialarabic: 0xFEBF,
-  dadmedialarabic: 0xFEC0,
-  dagesh: 0x05BC,
-  dageshhebrew: 0x05BC,
-  dagger: 0x2020,
-  daggerdbl: 0x2021,
-  dagujarati: 0x0AA6,
-  dagurmukhi: 0x0A26,
-  dahiragana: 0x3060,
-  dakatakana: 0x30C0,
-  dalarabic: 0x062F,
-  dalet: 0x05D3,
-  daletdagesh: 0xFB33,
-  daletdageshhebrew: 0xFB33,
-  dalethebrew: 0x05D3,
-  dalfinalarabic: 0xFEAA,
-  dammaarabic: 0x064F,
-  dammalowarabic: 0x064F,
-  dammatanaltonearabic: 0x064C,
-  dammatanarabic: 0x064C,
-  danda: 0x0964,
-  dargahebrew: 0x05A7,
-  dargalefthebrew: 0x05A7,
-  dasiapneumatacyrilliccmb: 0x0485,
-  dblGrave: 0xF6D3,
-  dblanglebracketleft: 0x300A,
-  dblanglebracketleftvertical: 0xFE3D,
-  dblanglebracketright: 0x300B,
-  dblanglebracketrightvertical: 0xFE3E,
-  dblarchinvertedbelowcmb: 0x032B,
-  dblarrowleft: 0x21D4,
-  dblarrowright: 0x21D2,
-  dbldanda: 0x0965,
-  dblgrave: 0xF6D6,
-  dblgravecmb: 0x030F,
-  dblintegral: 0x222C,
-  dbllowline: 0x2017,
-  dbllowlinecmb: 0x0333,
-  dbloverlinecmb: 0x033F,
-  dblprimemod: 0x02BA,
-  dblverticalbar: 0x2016,
-  dblverticallineabovecmb: 0x030E,
-  dbopomofo: 0x3109,
-  dbsquare: 0x33C8,
-  dcaron: 0x010F,
-  dcedilla: 0x1E11,
-  dcircle: 0x24D3,
-  dcircumflexbelow: 0x1E13,
-  dcroat: 0x0111,
-  ddabengali: 0x09A1,
-  ddadeva: 0x0921,
-  ddagujarati: 0x0AA1,
-  ddagurmukhi: 0x0A21,
-  ddalarabic: 0x0688,
-  ddalfinalarabic: 0xFB89,
-  dddhadeva: 0x095C,
-  ddhabengali: 0x09A2,
-  ddhadeva: 0x0922,
-  ddhagujarati: 0x0AA2,
-  ddhagurmukhi: 0x0A22,
-  ddotaccent: 0x1E0B,
-  ddotbelow: 0x1E0D,
-  decimalseparatorarabic: 0x066B,
-  decimalseparatorpersian: 0x066B,
-  decyrillic: 0x0434,
-  degree: 0x00B0,
-  dehihebrew: 0x05AD,
-  dehiragana: 0x3067,
-  deicoptic: 0x03EF,
-  dekatakana: 0x30C7,
-  deleteleft: 0x232B,
-  deleteright: 0x2326,
-  delta: 0x03B4,
-  deltaturned: 0x018D,
-  denominatorminusonenumeratorbengali: 0x09F8,
-  dezh: 0x02A4,
-  dhabengali: 0x09A7,
-  dhadeva: 0x0927,
-  dhagujarati: 0x0AA7,
-  dhagurmukhi: 0x0A27,
-  dhook: 0x0257,
-  dialytikatonos: 0x0385,
-  dialytikatonoscmb: 0x0344,
-  diamond: 0x2666,
-  diamondsuitwhite: 0x2662,
-  dieresis: 0x00A8,
-  dieresisacute: 0xF6D7,
-  dieresisbelowcmb: 0x0324,
-  dieresiscmb: 0x0308,
-  dieresisgrave: 0xF6D8,
-  dieresistonos: 0x0385,
-  dihiragana: 0x3062,
-  dikatakana: 0x30C2,
-  dittomark: 0x3003,
-  divide: 0x00F7,
-  divides: 0x2223,
-  divisionslash: 0x2215,
-  djecyrillic: 0x0452,
-  dkshade: 0x2593,
-  dlinebelow: 0x1E0F,
-  dlsquare: 0x3397,
-  dmacron: 0x0111,
-  dmonospace: 0xFF44,
-  dnblock: 0x2584,
-  dochadathai: 0x0E0E,
-  dodekthai: 0x0E14,
-  dohiragana: 0x3069,
-  dokatakana: 0x30C9,
-  dollar: 0x0024,
-  dollarinferior: 0xF6E3,
-  dollarmonospace: 0xFF04,
-  dollaroldstyle: 0xF724,
-  dollarsmall: 0xFE69,
-  dollarsuperior: 0xF6E4,
-  dong: 0x20AB,
-  dorusquare: 0x3326,
-  dotaccent: 0x02D9,
-  dotaccentcmb: 0x0307,
-  dotbelowcmb: 0x0323,
-  dotbelowcomb: 0x0323,
-  dotkatakana: 0x30FB,
-  dotlessi: 0x0131,
-  dotlessj: 0xF6BE,
-  dotlessjstrokehook: 0x0284,
-  dotmath: 0x22C5,
-  dottedcircle: 0x25CC,
-  doubleyodpatah: 0xFB1F,
-  doubleyodpatahhebrew: 0xFB1F,
-  downtackbelowcmb: 0x031E,
-  downtackmod: 0x02D5,
-  dparen: 0x249F,
-  dsuperior: 0xF6EB,
-  dtail: 0x0256,
-  dtopbar: 0x018C,
-  duhiragana: 0x3065,
-  dukatakana: 0x30C5,
-  dz: 0x01F3,
-  dzaltone: 0x02A3,
-  dzcaron: 0x01C6,
-  dzcurl: 0x02A5,
-  dzeabkhasiancyrillic: 0x04E1,
-  dzecyrillic: 0x0455,
-  dzhecyrillic: 0x045F,
-  e: 0x0065,
-  eacute: 0x00E9,
-  earth: 0x2641,
-  ebengali: 0x098F,
-  ebopomofo: 0x311C,
-  ebreve: 0x0115,
-  ecandradeva: 0x090D,
-  ecandragujarati: 0x0A8D,
-  ecandravowelsigndeva: 0x0945,
-  ecandravowelsigngujarati: 0x0AC5,
-  ecaron: 0x011B,
-  ecedillabreve: 0x1E1D,
-  echarmenian: 0x0565,
-  echyiwnarmenian: 0x0587,
-  ecircle: 0x24D4,
-  ecircumflex: 0x00EA,
-  ecircumflexacute: 0x1EBF,
-  ecircumflexbelow: 0x1E19,
-  ecircumflexdotbelow: 0x1EC7,
-  ecircumflexgrave: 0x1EC1,
-  ecircumflexhookabove: 0x1EC3,
-  ecircumflextilde: 0x1EC5,
-  ecyrillic: 0x0454,
-  edblgrave: 0x0205,
-  edeva: 0x090F,
-  edieresis: 0x00EB,
-  edot: 0x0117,
-  edotaccent: 0x0117,
-  edotbelow: 0x1EB9,
-  eegurmukhi: 0x0A0F,
-  eematragurmukhi: 0x0A47,
-  efcyrillic: 0x0444,
-  egrave: 0x00E8,
-  egujarati: 0x0A8F,
-  eharmenian: 0x0567,
-  ehbopomofo: 0x311D,
-  ehiragana: 0x3048,
-  ehookabove: 0x1EBB,
-  eibopomofo: 0x311F,
-  eight: 0x0038,
-  eightarabic: 0x0668,
-  eightbengali: 0x09EE,
-  eightcircle: 0x2467,
-  eightcircleinversesansserif: 0x2791,
-  eightdeva: 0x096E,
-  eighteencircle: 0x2471,
-  eighteenparen: 0x2485,
-  eighteenperiod: 0x2499,
-  eightgujarati: 0x0AEE,
-  eightgurmukhi: 0x0A6E,
-  eighthackarabic: 0x0668,
-  eighthangzhou: 0x3028,
-  eighthnotebeamed: 0x266B,
-  eightideographicparen: 0x3227,
-  eightinferior: 0x2088,
-  eightmonospace: 0xFF18,
-  eightoldstyle: 0xF738,
-  eightparen: 0x247B,
-  eightperiod: 0x248F,
-  eightpersian: 0x06F8,
-  eightroman: 0x2177,
-  eightsuperior: 0x2078,
-  eightthai: 0x0E58,
-  einvertedbreve: 0x0207,
-  eiotifiedcyrillic: 0x0465,
-  ekatakana: 0x30A8,
-  ekatakanahalfwidth: 0xFF74,
-  ekonkargurmukhi: 0x0A74,
-  ekorean: 0x3154,
-  elcyrillic: 0x043B,
-  element: 0x2208,
-  elevencircle: 0x246A,
-  elevenparen: 0x247E,
-  elevenperiod: 0x2492,
-  elevenroman: 0x217A,
-  ellipsis: 0x2026,
-  ellipsisvertical: 0x22EE,
-  emacron: 0x0113,
-  emacronacute: 0x1E17,
-  emacrongrave: 0x1E15,
-  emcyrillic: 0x043C,
-  emdash: 0x2014,
-  emdashvertical: 0xFE31,
-  emonospace: 0xFF45,
-  emphasismarkarmenian: 0x055B,
-  emptyset: 0x2205,
-  enbopomofo: 0x3123,
-  encyrillic: 0x043D,
-  endash: 0x2013,
-  endashvertical: 0xFE32,
-  endescendercyrillic: 0x04A3,
-  eng: 0x014B,
-  engbopomofo: 0x3125,
-  enghecyrillic: 0x04A5,
-  enhookcyrillic: 0x04C8,
-  enspace: 0x2002,
-  eogonek: 0x0119,
-  eokorean: 0x3153,
-  eopen: 0x025B,
-  eopenclosed: 0x029A,
-  eopenreversed: 0x025C,
-  eopenreversedclosed: 0x025E,
-  eopenreversedhook: 0x025D,
-  eparen: 0x24A0,
-  epsilon: 0x03B5,
-  epsilontonos: 0x03AD,
-  equal: 0x003D,
-  equalmonospace: 0xFF1D,
-  equalsmall: 0xFE66,
-  equalsuperior: 0x207C,
-  equivalence: 0x2261,
-  erbopomofo: 0x3126,
-  ercyrillic: 0x0440,
-  ereversed: 0x0258,
-  ereversedcyrillic: 0x044D,
-  escyrillic: 0x0441,
-  esdescendercyrillic: 0x04AB,
-  esh: 0x0283,
-  eshcurl: 0x0286,
-  eshortdeva: 0x090E,
-  eshortvowelsigndeva: 0x0946,
-  eshreversedloop: 0x01AA,
-  eshsquatreversed: 0x0285,
-  esmallhiragana: 0x3047,
-  esmallkatakana: 0x30A7,
-  esmallkatakanahalfwidth: 0xFF6A,
-  estimated: 0x212E,
-  esuperior: 0xF6EC,
-  eta: 0x03B7,
-  etarmenian: 0x0568,
-  etatonos: 0x03AE,
-  eth: 0x00F0,
-  etilde: 0x1EBD,
-  etildebelow: 0x1E1B,
-  etnahtafoukhhebrew: 0x0591,
-  etnahtafoukhlefthebrew: 0x0591,
-  etnahtahebrew: 0x0591,
-  etnahtalefthebrew: 0x0591,
-  eturned: 0x01DD,
-  eukorean: 0x3161,
-  euro: 0x20AC,
-  evowelsignbengali: 0x09C7,
-  evowelsigndeva: 0x0947,
-  evowelsigngujarati: 0x0AC7,
-  exclam: 0x0021,
-  exclamarmenian: 0x055C,
-  exclamdbl: 0x203C,
-  exclamdown: 0x00A1,
-  exclamdownsmall: 0xF7A1,
-  exclammonospace: 0xFF01,
-  exclamsmall: 0xF721,
-  existential: 0x2203,
-  ezh: 0x0292,
-  ezhcaron: 0x01EF,
-  ezhcurl: 0x0293,
-  ezhreversed: 0x01B9,
-  ezhtail: 0x01BA,
-  f: 0x0066,
-  fadeva: 0x095E,
-  fagurmukhi: 0x0A5E,
-  fahrenheit: 0x2109,
-  fathaarabic: 0x064E,
-  fathalowarabic: 0x064E,
-  fathatanarabic: 0x064B,
-  fbopomofo: 0x3108,
-  fcircle: 0x24D5,
-  fdotaccent: 0x1E1F,
-  feharabic: 0x0641,
-  feharmenian: 0x0586,
-  fehfinalarabic: 0xFED2,
-  fehinitialarabic: 0xFED3,
-  fehmedialarabic: 0xFED4,
-  feicoptic: 0x03E5,
-  female: 0x2640,
-  ff: 0xFB00,
-  ffi: 0xFB03,
-  ffl: 0xFB04,
-  fi: 0xFB01,
-  fifteencircle: 0x246E,
-  fifteenparen: 0x2482,
-  fifteenperiod: 0x2496,
-  figuredash: 0x2012,
-  filledbox: 0x25A0,
-  filledrect: 0x25AC,
-  finalkaf: 0x05DA,
-  finalkafdagesh: 0xFB3A,
-  finalkafdageshhebrew: 0xFB3A,
-  finalkafhebrew: 0x05DA,
-  finalmem: 0x05DD,
-  finalmemhebrew: 0x05DD,
-  finalnun: 0x05DF,
-  finalnunhebrew: 0x05DF,
-  finalpe: 0x05E3,
-  finalpehebrew: 0x05E3,
-  finaltsadi: 0x05E5,
-  finaltsadihebrew: 0x05E5,
-  firsttonechinese: 0x02C9,
-  fisheye: 0x25C9,
-  fitacyrillic: 0x0473,
-  five: 0x0035,
-  fivearabic: 0x0665,
-  fivebengali: 0x09EB,
-  fivecircle: 0x2464,
-  fivecircleinversesansserif: 0x278E,
-  fivedeva: 0x096B,
-  fiveeighths: 0x215D,
-  fivegujarati: 0x0AEB,
-  fivegurmukhi: 0x0A6B,
-  fivehackarabic: 0x0665,
-  fivehangzhou: 0x3025,
-  fiveideographicparen: 0x3224,
-  fiveinferior: 0x2085,
-  fivemonospace: 0xFF15,
-  fiveoldstyle: 0xF735,
-  fiveparen: 0x2478,
-  fiveperiod: 0x248C,
-  fivepersian: 0x06F5,
-  fiveroman: 0x2174,
-  fivesuperior: 0x2075,
-  fivethai: 0x0E55,
-  fl: 0xFB02,
-  florin: 0x0192,
-  fmonospace: 0xFF46,
-  fmsquare: 0x3399,
-  fofanthai: 0x0E1F,
-  fofathai: 0x0E1D,
-  fongmanthai: 0x0E4F,
-  forall: 0x2200,
-  four: 0x0034,
-  fourarabic: 0x0664,
-  fourbengali: 0x09EA,
-  fourcircle: 0x2463,
-  fourcircleinversesansserif: 0x278D,
-  fourdeva: 0x096A,
-  fourgujarati: 0x0AEA,
-  fourgurmukhi: 0x0A6A,
-  fourhackarabic: 0x0664,
-  fourhangzhou: 0x3024,
-  fourideographicparen: 0x3223,
-  fourinferior: 0x2084,
-  fourmonospace: 0xFF14,
-  fournumeratorbengali: 0x09F7,
-  fouroldstyle: 0xF734,
-  fourparen: 0x2477,
-  fourperiod: 0x248B,
-  fourpersian: 0x06F4,
-  fourroman: 0x2173,
-  foursuperior: 0x2074,
-  fourteencircle: 0x246D,
-  fourteenparen: 0x2481,
-  fourteenperiod: 0x2495,
-  fourthai: 0x0E54,
-  fourthtonechinese: 0x02CB,
-  fparen: 0x24A1,
-  fraction: 0x2044,
-  franc: 0x20A3,
-  g: 0x0067,
-  gabengali: 0x0997,
-  gacute: 0x01F5,
-  gadeva: 0x0917,
-  gafarabic: 0x06AF,
-  gaffinalarabic: 0xFB93,
-  gafinitialarabic: 0xFB94,
-  gafmedialarabic: 0xFB95,
-  gagujarati: 0x0A97,
-  gagurmukhi: 0x0A17,
-  gahiragana: 0x304C,
-  gakatakana: 0x30AC,
-  gamma: 0x03B3,
-  gammalatinsmall: 0x0263,
-  gammasuperior: 0x02E0,
-  gangiacoptic: 0x03EB,
-  gbopomofo: 0x310D,
-  gbreve: 0x011F,
-  gcaron: 0x01E7,
-  gcedilla: 0x0123,
-  gcircle: 0x24D6,
-  gcircumflex: 0x011D,
-  gcommaaccent: 0x0123,
-  gdot: 0x0121,
-  gdotaccent: 0x0121,
-  gecyrillic: 0x0433,
-  gehiragana: 0x3052,
-  gekatakana: 0x30B2,
-  geometricallyequal: 0x2251,
-  gereshaccenthebrew: 0x059C,
-  gereshhebrew: 0x05F3,
-  gereshmuqdamhebrew: 0x059D,
-  germandbls: 0x00DF,
-  gershayimaccenthebrew: 0x059E,
-  gershayimhebrew: 0x05F4,
-  getamark: 0x3013,
-  ghabengali: 0x0998,
-  ghadarmenian: 0x0572,
-  ghadeva: 0x0918,
-  ghagujarati: 0x0A98,
-  ghagurmukhi: 0x0A18,
-  ghainarabic: 0x063A,
-  ghainfinalarabic: 0xFECE,
-  ghaininitialarabic: 0xFECF,
-  ghainmedialarabic: 0xFED0,
-  ghemiddlehookcyrillic: 0x0495,
-  ghestrokecyrillic: 0x0493,
-  gheupturncyrillic: 0x0491,
-  ghhadeva: 0x095A,
-  ghhagurmukhi: 0x0A5A,
-  ghook: 0x0260,
-  ghzsquare: 0x3393,
-  gihiragana: 0x304E,
-  gikatakana: 0x30AE,
-  gimarmenian: 0x0563,
-  gimel: 0x05D2,
-  gimeldagesh: 0xFB32,
-  gimeldageshhebrew: 0xFB32,
-  gimelhebrew: 0x05D2,
-  gjecyrillic: 0x0453,
-  glottalinvertedstroke: 0x01BE,
-  glottalstop: 0x0294,
-  glottalstopinverted: 0x0296,
-  glottalstopmod: 0x02C0,
-  glottalstopreversed: 0x0295,
-  glottalstopreversedmod: 0x02C1,
-  glottalstopreversedsuperior: 0x02E4,
-  glottalstopstroke: 0x02A1,
-  glottalstopstrokereversed: 0x02A2,
-  gmacron: 0x1E21,
-  gmonospace: 0xFF47,
-  gohiragana: 0x3054,
-  gokatakana: 0x30B4,
-  gparen: 0x24A2,
-  gpasquare: 0x33AC,
-  gradient: 0x2207,
-  grave: 0x0060,
-  gravebelowcmb: 0x0316,
-  gravecmb: 0x0300,
-  gravecomb: 0x0300,
-  gravedeva: 0x0953,
-  gravelowmod: 0x02CE,
-  gravemonospace: 0xFF40,
-  gravetonecmb: 0x0340,
-  greater: 0x003E,
-  greaterequal: 0x2265,
-  greaterequalorless: 0x22DB,
-  greatermonospace: 0xFF1E,
-  greaterorequivalent: 0x2273,
-  greaterorless: 0x2277,
-  greateroverequal: 0x2267,
-  greatersmall: 0xFE65,
-  gscript: 0x0261,
-  gstroke: 0x01E5,
-  guhiragana: 0x3050,
-  guillemotleft: 0x00AB,
-  guillemotright: 0x00BB,
-  guilsinglleft: 0x2039,
-  guilsinglright: 0x203A,
-  gukatakana: 0x30B0,
-  guramusquare: 0x3318,
-  gysquare: 0x33C9,
-  h: 0x0068,
-  haabkhasiancyrillic: 0x04A9,
-  haaltonearabic: 0x06C1,
-  habengali: 0x09B9,
-  hadescendercyrillic: 0x04B3,
-  hadeva: 0x0939,
-  hagujarati: 0x0AB9,
-  hagurmukhi: 0x0A39,
-  haharabic: 0x062D,
-  hahfinalarabic: 0xFEA2,
-  hahinitialarabic: 0xFEA3,
-  hahiragana: 0x306F,
-  hahmedialarabic: 0xFEA4,
-  haitusquare: 0x332A,
-  hakatakana: 0x30CF,
-  hakatakanahalfwidth: 0xFF8A,
-  halantgurmukhi: 0x0A4D,
-  hamzaarabic: 0x0621,
-  hamzalowarabic: 0x0621,
-  hangulfiller: 0x3164,
-  hardsigncyrillic: 0x044A,
-  harpoonleftbarbup: 0x21BC,
-  harpoonrightbarbup: 0x21C0,
-  hasquare: 0x33CA,
-  hatafpatah: 0x05B2,
-  hatafpatah16: 0x05B2,
-  hatafpatah23: 0x05B2,
-  hatafpatah2f: 0x05B2,
-  hatafpatahhebrew: 0x05B2,
-  hatafpatahnarrowhebrew: 0x05B2,
-  hatafpatahquarterhebrew: 0x05B2,
-  hatafpatahwidehebrew: 0x05B2,
-  hatafqamats: 0x05B3,
-  hatafqamats1b: 0x05B3,
-  hatafqamats28: 0x05B3,
-  hatafqamats34: 0x05B3,
-  hatafqamatshebrew: 0x05B3,
-  hatafqamatsnarrowhebrew: 0x05B3,
-  hatafqamatsquarterhebrew: 0x05B3,
-  hatafqamatswidehebrew: 0x05B3,
-  hatafsegol: 0x05B1,
-  hatafsegol17: 0x05B1,
-  hatafsegol24: 0x05B1,
-  hatafsegol30: 0x05B1,
-  hatafsegolhebrew: 0x05B1,
-  hatafsegolnarrowhebrew: 0x05B1,
-  hatafsegolquarterhebrew: 0x05B1,
-  hatafsegolwidehebrew: 0x05B1,
-  hbar: 0x0127,
-  hbopomofo: 0x310F,
-  hbrevebelow: 0x1E2B,
-  hcedilla: 0x1E29,
-  hcircle: 0x24D7,
-  hcircumflex: 0x0125,
-  hdieresis: 0x1E27,
-  hdotaccent: 0x1E23,
-  hdotbelow: 0x1E25,
-  he: 0x05D4,
-  heart: 0x2665,
-  heartsuitblack: 0x2665,
-  heartsuitwhite: 0x2661,
-  hedagesh: 0xFB34,
-  hedageshhebrew: 0xFB34,
-  hehaltonearabic: 0x06C1,
-  heharabic: 0x0647,
-  hehebrew: 0x05D4,
-  hehfinalaltonearabic: 0xFBA7,
-  hehfinalalttwoarabic: 0xFEEA,
-  hehfinalarabic: 0xFEEA,
-  hehhamzaabovefinalarabic: 0xFBA5,
-  hehhamzaaboveisolatedarabic: 0xFBA4,
-  hehinitialaltonearabic: 0xFBA8,
-  hehinitialarabic: 0xFEEB,
-  hehiragana: 0x3078,
-  hehmedialaltonearabic: 0xFBA9,
-  hehmedialarabic: 0xFEEC,
-  heiseierasquare: 0x337B,
-  hekatakana: 0x30D8,
-  hekatakanahalfwidth: 0xFF8D,
-  hekutaarusquare: 0x3336,
-  henghook: 0x0267,
-  herutusquare: 0x3339,
-  het: 0x05D7,
-  hethebrew: 0x05D7,
-  hhook: 0x0266,
-  hhooksuperior: 0x02B1,
-  hieuhacirclekorean: 0x327B,
-  hieuhaparenkorean: 0x321B,
-  hieuhcirclekorean: 0x326D,
-  hieuhkorean: 0x314E,
-  hieuhparenkorean: 0x320D,
-  hihiragana: 0x3072,
-  hikatakana: 0x30D2,
-  hikatakanahalfwidth: 0xFF8B,
-  hiriq: 0x05B4,
-  hiriq14: 0x05B4,
-  hiriq21: 0x05B4,
-  hiriq2d: 0x05B4,
-  hiriqhebrew: 0x05B4,
-  hiriqnarrowhebrew: 0x05B4,
-  hiriqquarterhebrew: 0x05B4,
-  hiriqwidehebrew: 0x05B4,
-  hlinebelow: 0x1E96,
-  hmonospace: 0xFF48,
-  hoarmenian: 0x0570,
-  hohipthai: 0x0E2B,
-  hohiragana: 0x307B,
-  hokatakana: 0x30DB,
-  hokatakanahalfwidth: 0xFF8E,
-  holam: 0x05B9,
-  holam19: 0x05B9,
-  holam26: 0x05B9,
-  holam32: 0x05B9,
-  holamhebrew: 0x05B9,
-  holamnarrowhebrew: 0x05B9,
-  holamquarterhebrew: 0x05B9,
-  holamwidehebrew: 0x05B9,
-  honokhukthai: 0x0E2E,
-  hookabovecomb: 0x0309,
-  hookcmb: 0x0309,
-  hookpalatalizedbelowcmb: 0x0321,
-  hookretroflexbelowcmb: 0x0322,
-  hoonsquare: 0x3342,
-  horicoptic: 0x03E9,
-  horizontalbar: 0x2015,
-  horncmb: 0x031B,
-  hotsprings: 0x2668,
-  house: 0x2302,
-  hparen: 0x24A3,
-  hsuperior: 0x02B0,
-  hturned: 0x0265,
-  huhiragana: 0x3075,
-  huiitosquare: 0x3333,
-  hukatakana: 0x30D5,
-  hukatakanahalfwidth: 0xFF8C,
-  hungarumlaut: 0x02DD,
-  hungarumlautcmb: 0x030B,
-  hv: 0x0195,
-  hyphen: 0x002D,
-  hypheninferior: 0xF6E5,
-  hyphenmonospace: 0xFF0D,
-  hyphensmall: 0xFE63,
-  hyphensuperior: 0xF6E6,
-  hyphentwo: 0x2010,
-  i: 0x0069,
-  iacute: 0x00ED,
-  iacyrillic: 0x044F,
-  ibengali: 0x0987,
-  ibopomofo: 0x3127,
-  ibreve: 0x012D,
-  icaron: 0x01D0,
-  icircle: 0x24D8,
-  icircumflex: 0x00EE,
-  icyrillic: 0x0456,
-  idblgrave: 0x0209,
-  ideographearthcircle: 0x328F,
-  ideographfirecircle: 0x328B,
-  ideographicallianceparen: 0x323F,
-  ideographiccallparen: 0x323A,
-  ideographiccentrecircle: 0x32A5,
-  ideographicclose: 0x3006,
-  ideographiccomma: 0x3001,
-  ideographiccommaleft: 0xFF64,
-  ideographiccongratulationparen: 0x3237,
-  ideographiccorrectcircle: 0x32A3,
-  ideographicearthparen: 0x322F,
-  ideographicenterpriseparen: 0x323D,
-  ideographicexcellentcircle: 0x329D,
-  ideographicfestivalparen: 0x3240,
-  ideographicfinancialcircle: 0x3296,
-  ideographicfinancialparen: 0x3236,
-  ideographicfireparen: 0x322B,
-  ideographichaveparen: 0x3232,
-  ideographichighcircle: 0x32A4,
-  ideographiciterationmark: 0x3005,
-  ideographiclaborcircle: 0x3298,
-  ideographiclaborparen: 0x3238,
-  ideographicleftcircle: 0x32A7,
-  ideographiclowcircle: 0x32A6,
-  ideographicmedicinecircle: 0x32A9,
-  ideographicmetalparen: 0x322E,
-  ideographicmoonparen: 0x322A,
-  ideographicnameparen: 0x3234,
-  ideographicperiod: 0x3002,
-  ideographicprintcircle: 0x329E,
-  ideographicreachparen: 0x3243,
-  ideographicrepresentparen: 0x3239,
-  ideographicresourceparen: 0x323E,
-  ideographicrightcircle: 0x32A8,
-  ideographicsecretcircle: 0x3299,
-  ideographicselfparen: 0x3242,
-  ideographicsocietyparen: 0x3233,
-  ideographicspace: 0x3000,
-  ideographicspecialparen: 0x3235,
-  ideographicstockparen: 0x3231,
-  ideographicstudyparen: 0x323B,
-  ideographicsunparen: 0x3230,
-  ideographicsuperviseparen: 0x323C,
-  ideographicwaterparen: 0x322C,
-  ideographicwoodparen: 0x322D,
-  ideographiczero: 0x3007,
-  ideographmetalcircle: 0x328E,
-  ideographmooncircle: 0x328A,
-  ideographnamecircle: 0x3294,
-  ideographsuncircle: 0x3290,
-  ideographwatercircle: 0x328C,
-  ideographwoodcircle: 0x328D,
-  ideva: 0x0907,
-  idieresis: 0x00EF,
-  idieresisacute: 0x1E2F,
-  idieresiscyrillic: 0x04E5,
-  idotbelow: 0x1ECB,
-  iebrevecyrillic: 0x04D7,
-  iecyrillic: 0x0435,
-  ieungacirclekorean: 0x3275,
-  ieungaparenkorean: 0x3215,
-  ieungcirclekorean: 0x3267,
-  ieungkorean: 0x3147,
-  ieungparenkorean: 0x3207,
-  igrave: 0x00EC,
-  igujarati: 0x0A87,
-  igurmukhi: 0x0A07,
-  ihiragana: 0x3044,
-  ihookabove: 0x1EC9,
-  iibengali: 0x0988,
-  iicyrillic: 0x0438,
-  iideva: 0x0908,
-  iigujarati: 0x0A88,
-  iigurmukhi: 0x0A08,
-  iimatragurmukhi: 0x0A40,
-  iinvertedbreve: 0x020B,
-  iishortcyrillic: 0x0439,
-  iivowelsignbengali: 0x09C0,
-  iivowelsigndeva: 0x0940,
-  iivowelsigngujarati: 0x0AC0,
-  ij: 0x0133,
-  ikatakana: 0x30A4,
-  ikatakanahalfwidth: 0xFF72,
-  ikorean: 0x3163,
-  ilde: 0x02DC,
-  iluyhebrew: 0x05AC,
-  imacron: 0x012B,
-  imacroncyrillic: 0x04E3,
-  imageorapproximatelyequal: 0x2253,
-  imatragurmukhi: 0x0A3F,
-  imonospace: 0xFF49,
-  increment: 0x2206,
-  infinity: 0x221E,
-  iniarmenian: 0x056B,
-  integral: 0x222B,
-  integralbottom: 0x2321,
-  integralbt: 0x2321,
-  integralex: 0xF8F5,
-  integraltop: 0x2320,
-  integraltp: 0x2320,
-  intersection: 0x2229,
-  intisquare: 0x3305,
-  invbullet: 0x25D8,
-  invcircle: 0x25D9,
-  invsmileface: 0x263B,
-  iocyrillic: 0x0451,
-  iogonek: 0x012F,
-  iota: 0x03B9,
-  iotadieresis: 0x03CA,
-  iotadieresistonos: 0x0390,
-  iotalatin: 0x0269,
-  iotatonos: 0x03AF,
-  iparen: 0x24A4,
-  irigurmukhi: 0x0A72,
-  ismallhiragana: 0x3043,
-  ismallkatakana: 0x30A3,
-  ismallkatakanahalfwidth: 0xFF68,
-  issharbengali: 0x09FA,
-  istroke: 0x0268,
-  isuperior: 0xF6ED,
-  iterationhiragana: 0x309D,
-  iterationkatakana: 0x30FD,
-  itilde: 0x0129,
-  itildebelow: 0x1E2D,
-  iubopomofo: 0x3129,
-  iucyrillic: 0x044E,
-  ivowelsignbengali: 0x09BF,
-  ivowelsigndeva: 0x093F,
-  ivowelsigngujarati: 0x0ABF,
-  izhitsacyrillic: 0x0475,
-  izhitsadblgravecyrillic: 0x0477,
-  j: 0x006A,
-  jaarmenian: 0x0571,
-  jabengali: 0x099C,
-  jadeva: 0x091C,
-  jagujarati: 0x0A9C,
-  jagurmukhi: 0x0A1C,
-  jbopomofo: 0x3110,
-  jcaron: 0x01F0,
-  jcircle: 0x24D9,
-  jcircumflex: 0x0135,
-  jcrossedtail: 0x029D,
-  jdotlessstroke: 0x025F,
-  jecyrillic: 0x0458,
-  jeemarabic: 0x062C,
-  jeemfinalarabic: 0xFE9E,
-  jeeminitialarabic: 0xFE9F,
-  jeemmedialarabic: 0xFEA0,
-  jeharabic: 0x0698,
-  jehfinalarabic: 0xFB8B,
-  jhabengali: 0x099D,
-  jhadeva: 0x091D,
-  jhagujarati: 0x0A9D,
-  jhagurmukhi: 0x0A1D,
-  jheharmenian: 0x057B,
-  jis: 0x3004,
-  jmonospace: 0xFF4A,
-  jparen: 0x24A5,
-  jsuperior: 0x02B2,
-  k: 0x006B,
-  kabashkircyrillic: 0x04A1,
-  kabengali: 0x0995,
-  kacute: 0x1E31,
-  kacyrillic: 0x043A,
-  kadescendercyrillic: 0x049B,
-  kadeva: 0x0915,
-  kaf: 0x05DB,
-  kafarabic: 0x0643,
-  kafdagesh: 0xFB3B,
-  kafdageshhebrew: 0xFB3B,
-  kaffinalarabic: 0xFEDA,
-  kafhebrew: 0x05DB,
-  kafinitialarabic: 0xFEDB,
-  kafmedialarabic: 0xFEDC,
-  kafrafehebrew: 0xFB4D,
-  kagujarati: 0x0A95,
-  kagurmukhi: 0x0A15,
-  kahiragana: 0x304B,
-  kahookcyrillic: 0x04C4,
-  kakatakana: 0x30AB,
-  kakatakanahalfwidth: 0xFF76,
-  kappa: 0x03BA,
-  kappasymbolgreek: 0x03F0,
-  kapyeounmieumkorean: 0x3171,
-  kapyeounphieuphkorean: 0x3184,
-  kapyeounpieupkorean: 0x3178,
-  kapyeounssangpieupkorean: 0x3179,
-  karoriisquare: 0x330D,
-  kashidaautoarabic: 0x0640,
-  kashidaautonosidebearingarabic: 0x0640,
-  kasmallkatakana: 0x30F5,
-  kasquare: 0x3384,
-  kasraarabic: 0x0650,
-  kasratanarabic: 0x064D,
-  kastrokecyrillic: 0x049F,
-  katahiraprolongmarkhalfwidth: 0xFF70,
-  kaverticalstrokecyrillic: 0x049D,
-  kbopomofo: 0x310E,
-  kcalsquare: 0x3389,
-  kcaron: 0x01E9,
-  kcedilla: 0x0137,
-  kcircle: 0x24DA,
-  kcommaaccent: 0x0137,
-  kdotbelow: 0x1E33,
-  keharmenian: 0x0584,
-  kehiragana: 0x3051,
-  kekatakana: 0x30B1,
-  kekatakanahalfwidth: 0xFF79,
-  kenarmenian: 0x056F,
-  kesmallkatakana: 0x30F6,
-  kgreenlandic: 0x0138,
-  khabengali: 0x0996,
-  khacyrillic: 0x0445,
-  khadeva: 0x0916,
-  khagujarati: 0x0A96,
-  khagurmukhi: 0x0A16,
-  khaharabic: 0x062E,
-  khahfinalarabic: 0xFEA6,
-  khahinitialarabic: 0xFEA7,
-  khahmedialarabic: 0xFEA8,
-  kheicoptic: 0x03E7,
-  khhadeva: 0x0959,
-  khhagurmukhi: 0x0A59,
-  khieukhacirclekorean: 0x3278,
-  khieukhaparenkorean: 0x3218,
-  khieukhcirclekorean: 0x326A,
-  khieukhkorean: 0x314B,
-  khieukhparenkorean: 0x320A,
-  khokhaithai: 0x0E02,
-  khokhonthai: 0x0E05,
-  khokhuatthai: 0x0E03,
-  khokhwaithai: 0x0E04,
-  khomutthai: 0x0E5B,
-  khook: 0x0199,
-  khorakhangthai: 0x0E06,
-  khzsquare: 0x3391,
-  kihiragana: 0x304D,
-  kikatakana: 0x30AD,
-  kikatakanahalfwidth: 0xFF77,
-  kiroguramusquare: 0x3315,
-  kiromeetorusquare: 0x3316,
-  kirosquare: 0x3314,
-  kiyeokacirclekorean: 0x326E,
-  kiyeokaparenkorean: 0x320E,
-  kiyeokcirclekorean: 0x3260,
-  kiyeokkorean: 0x3131,
-  kiyeokparenkorean: 0x3200,
-  kiyeoksioskorean: 0x3133,
-  kjecyrillic: 0x045C,
-  klinebelow: 0x1E35,
-  klsquare: 0x3398,
-  kmcubedsquare: 0x33A6,
-  kmonospace: 0xFF4B,
-  kmsquaredsquare: 0x33A2,
-  kohiragana: 0x3053,
-  kohmsquare: 0x33C0,
-  kokaithai: 0x0E01,
-  kokatakana: 0x30B3,
-  kokatakanahalfwidth: 0xFF7A,
-  kooposquare: 0x331E,
-  koppacyrillic: 0x0481,
-  koreanstandardsymbol: 0x327F,
-  koroniscmb: 0x0343,
-  kparen: 0x24A6,
-  kpasquare: 0x33AA,
-  ksicyrillic: 0x046F,
-  ktsquare: 0x33CF,
-  kturned: 0x029E,
-  kuhiragana: 0x304F,
-  kukatakana: 0x30AF,
-  kukatakanahalfwidth: 0xFF78,
-  kvsquare: 0x33B8,
-  kwsquare: 0x33BE,
-  l: 0x006C,
-  labengali: 0x09B2,
-  lacute: 0x013A,
-  ladeva: 0x0932,
-  lagujarati: 0x0AB2,
-  lagurmukhi: 0x0A32,
-  lakkhangyaothai: 0x0E45,
-  lamaleffinalarabic: 0xFEFC,
-  lamalefhamzaabovefinalarabic: 0xFEF8,
-  lamalefhamzaaboveisolatedarabic: 0xFEF7,
-  lamalefhamzabelowfinalarabic: 0xFEFA,
-  lamalefhamzabelowisolatedarabic: 0xFEF9,
-  lamalefisolatedarabic: 0xFEFB,
-  lamalefmaddaabovefinalarabic: 0xFEF6,
-  lamalefmaddaaboveisolatedarabic: 0xFEF5,
-  lamarabic: 0x0644,
-  lambda: 0x03BB,
-  lambdastroke: 0x019B,
-  lamed: 0x05DC,
-  lameddagesh: 0xFB3C,
-  lameddageshhebrew: 0xFB3C,
-  lamedhebrew: 0x05DC,
-  lamfinalarabic: 0xFEDE,
-  lamhahinitialarabic: 0xFCCA,
-  laminitialarabic: 0xFEDF,
-  lamjeeminitialarabic: 0xFCC9,
-  lamkhahinitialarabic: 0xFCCB,
-  lamlamhehisolatedarabic: 0xFDF2,
-  lammedialarabic: 0xFEE0,
-  lammeemhahinitialarabic: 0xFD88,
-  lammeeminitialarabic: 0xFCCC,
-  largecircle: 0x25EF,
-  lbar: 0x019A,
-  lbelt: 0x026C,
-  lbopomofo: 0x310C,
-  lcaron: 0x013E,
-  lcedilla: 0x013C,
-  lcircle: 0x24DB,
-  lcircumflexbelow: 0x1E3D,
-  lcommaaccent: 0x013C,
-  ldot: 0x0140,
-  ldotaccent: 0x0140,
-  ldotbelow: 0x1E37,
-  ldotbelowmacron: 0x1E39,
-  leftangleabovecmb: 0x031A,
-  lefttackbelowcmb: 0x0318,
-  less: 0x003C,
-  lessequal: 0x2264,
-  lessequalorgreater: 0x22DA,
-  lessmonospace: 0xFF1C,
-  lessorequivalent: 0x2272,
-  lessorgreater: 0x2276,
-  lessoverequal: 0x2266,
-  lesssmall: 0xFE64,
-  lezh: 0x026E,
-  lfblock: 0x258C,
-  lhookretroflex: 0x026D,
-  lira: 0x20A4,
-  liwnarmenian: 0x056C,
-  lj: 0x01C9,
-  ljecyrillic: 0x0459,
-  ll: 0xF6C0,
-  lladeva: 0x0933,
-  llagujarati: 0x0AB3,
-  llinebelow: 0x1E3B,
-  llladeva: 0x0934,
-  llvocalicbengali: 0x09E1,
-  llvocalicdeva: 0x0961,
-  llvocalicvowelsignbengali: 0x09E3,
-  llvocalicvowelsigndeva: 0x0963,
-  lmiddletilde: 0x026B,
-  lmonospace: 0xFF4C,
-  lmsquare: 0x33D0,
-  lochulathai: 0x0E2C,
-  logicaland: 0x2227,
-  logicalnot: 0x00AC,
-  logicalnotreversed: 0x2310,
-  logicalor: 0x2228,
-  lolingthai: 0x0E25,
-  longs: 0x017F,
-  lowlinecenterline: 0xFE4E,
-  lowlinecmb: 0x0332,
-  lowlinedashed: 0xFE4D,
-  lozenge: 0x25CA,
-  lparen: 0x24A7,
-  lslash: 0x0142,
-  lsquare: 0x2113,
-  lsuperior: 0xF6EE,
-  ltshade: 0x2591,
-  luthai: 0x0E26,
-  lvocalicbengali: 0x098C,
-  lvocalicdeva: 0x090C,
-  lvocalicvowelsignbengali: 0x09E2,
-  lvocalicvowelsigndeva: 0x0962,
-  lxsquare: 0x33D3,
-  m: 0x006D,
-  mabengali: 0x09AE,
-  macron: 0x00AF,
-  macronbelowcmb: 0x0331,
-  macroncmb: 0x0304,
-  macronlowmod: 0x02CD,
-  macronmonospace: 0xFFE3,
-  macute: 0x1E3F,
-  madeva: 0x092E,
-  magujarati: 0x0AAE,
-  magurmukhi: 0x0A2E,
-  mahapakhhebrew: 0x05A4,
-  mahapakhlefthebrew: 0x05A4,
-  mahiragana: 0x307E,
-  maichattawalowleftthai: 0xF895,
-  maichattawalowrightthai: 0xF894,
-  maichattawathai: 0x0E4B,
-  maichattawaupperleftthai: 0xF893,
-  maieklowleftthai: 0xF88C,
-  maieklowrightthai: 0xF88B,
-  maiekthai: 0x0E48,
-  maiekupperleftthai: 0xF88A,
-  maihanakatleftthai: 0xF884,
-  maihanakatthai: 0x0E31,
-  maitaikhuleftthai: 0xF889,
-  maitaikhuthai: 0x0E47,
-  maitholowleftthai: 0xF88F,
-  maitholowrightthai: 0xF88E,
-  maithothai: 0x0E49,
-  maithoupperleftthai: 0xF88D,
-  maitrilowleftthai: 0xF892,
-  maitrilowrightthai: 0xF891,
-  maitrithai: 0x0E4A,
-  maitriupperleftthai: 0xF890,
-  maiyamokthai: 0x0E46,
-  makatakana: 0x30DE,
-  makatakanahalfwidth: 0xFF8F,
-  male: 0x2642,
-  mansyonsquare: 0x3347,
-  maqafhebrew: 0x05BE,
-  mars: 0x2642,
-  masoracirclehebrew: 0x05AF,
-  masquare: 0x3383,
-  mbopomofo: 0x3107,
-  mbsquare: 0x33D4,
-  mcircle: 0x24DC,
-  mcubedsquare: 0x33A5,
-  mdotaccent: 0x1E41,
-  mdotbelow: 0x1E43,
-  meemarabic: 0x0645,
-  meemfinalarabic: 0xFEE2,
-  meeminitialarabic: 0xFEE3,
-  meemmedialarabic: 0xFEE4,
-  meemmeeminitialarabic: 0xFCD1,
-  meemmeemisolatedarabic: 0xFC48,
-  meetorusquare: 0x334D,
-  mehiragana: 0x3081,
-  meizierasquare: 0x337E,
-  mekatakana: 0x30E1,
-  mekatakanahalfwidth: 0xFF92,
-  mem: 0x05DE,
-  memdagesh: 0xFB3E,
-  memdageshhebrew: 0xFB3E,
-  memhebrew: 0x05DE,
-  menarmenian: 0x0574,
-  merkhahebrew: 0x05A5,
-  merkhakefulahebrew: 0x05A6,
-  merkhakefulalefthebrew: 0x05A6,
-  merkhalefthebrew: 0x05A5,
-  mhook: 0x0271,
-  mhzsquare: 0x3392,
-  middledotkatakanahalfwidth: 0xFF65,
-  middot: 0x00B7,
-  mieumacirclekorean: 0x3272,
-  mieumaparenkorean: 0x3212,
-  mieumcirclekorean: 0x3264,
-  mieumkorean: 0x3141,
-  mieumpansioskorean: 0x3170,
-  mieumparenkorean: 0x3204,
-  mieumpieupkorean: 0x316E,
-  mieumsioskorean: 0x316F,
-  mihiragana: 0x307F,
-  mikatakana: 0x30DF,
-  mikatakanahalfwidth: 0xFF90,
-  minus: 0x2212,
-  minusbelowcmb: 0x0320,
-  minuscircle: 0x2296,
-  minusmod: 0x02D7,
-  minusplus: 0x2213,
-  minute: 0x2032,
-  miribaarusquare: 0x334A,
-  mirisquare: 0x3349,
-  mlonglegturned: 0x0270,
-  mlsquare: 0x3396,
-  mmcubedsquare: 0x33A3,
-  mmonospace: 0xFF4D,
-  mmsquaredsquare: 0x339F,
-  mohiragana: 0x3082,
-  mohmsquare: 0x33C1,
-  mokatakana: 0x30E2,
-  mokatakanahalfwidth: 0xFF93,
-  molsquare: 0x33D6,
-  momathai: 0x0E21,
-  moverssquare: 0x33A7,
-  moverssquaredsquare: 0x33A8,
-  mparen: 0x24A8,
-  mpasquare: 0x33AB,
-  mssquare: 0x33B3,
-  msuperior: 0xF6EF,
-  mturned: 0x026F,
-  mu: 0x00B5,
-  mu1: 0x00B5,
-  muasquare: 0x3382,
-  muchgreater: 0x226B,
-  muchless: 0x226A,
-  mufsquare: 0x338C,
-  mugreek: 0x03BC,
-  mugsquare: 0x338D,
-  muhiragana: 0x3080,
-  mukatakana: 0x30E0,
-  mukatakanahalfwidth: 0xFF91,
-  mulsquare: 0x3395,
-  multiply: 0x00D7,
-  mumsquare: 0x339B,
-  munahhebrew: 0x05A3,
-  munahlefthebrew: 0x05A3,
-  musicalnote: 0x266A,
-  musicalnotedbl: 0x266B,
-  musicflatsign: 0x266D,
-  musicsharpsign: 0x266F,
-  mussquare: 0x33B2,
-  muvsquare: 0x33B6,
-  muwsquare: 0x33BC,
-  mvmegasquare: 0x33B9,
-  mvsquare: 0x33B7,
-  mwmegasquare: 0x33BF,
-  mwsquare: 0x33BD,
-  n: 0x006E,
-  nabengali: 0x09A8,
-  nabla: 0x2207,
-  nacute: 0x0144,
-  nadeva: 0x0928,
-  nagujarati: 0x0AA8,
-  nagurmukhi: 0x0A28,
-  nahiragana: 0x306A,
-  nakatakana: 0x30CA,
-  nakatakanahalfwidth: 0xFF85,
-  napostrophe: 0x0149,
-  nasquare: 0x3381,
-  nbopomofo: 0x310B,
-  nbspace: 0x00A0,
-  ncaron: 0x0148,
-  ncedilla: 0x0146,
-  ncircle: 0x24DD,
-  ncircumflexbelow: 0x1E4B,
-  ncommaaccent: 0x0146,
-  ndotaccent: 0x1E45,
-  ndotbelow: 0x1E47,
-  nehiragana: 0x306D,
-  nekatakana: 0x30CD,
-  nekatakanahalfwidth: 0xFF88,
-  newsheqelsign: 0x20AA,
-  nfsquare: 0x338B,
-  ngabengali: 0x0999,
-  ngadeva: 0x0919,
-  ngagujarati: 0x0A99,
-  ngagurmukhi: 0x0A19,
-  ngonguthai: 0x0E07,
-  nhiragana: 0x3093,
-  nhookleft: 0x0272,
-  nhookretroflex: 0x0273,
-  nieunacirclekorean: 0x326F,
-  nieunaparenkorean: 0x320F,
-  nieuncieuckorean: 0x3135,
-  nieuncirclekorean: 0x3261,
-  nieunhieuhkorean: 0x3136,
-  nieunkorean: 0x3134,
-  nieunpansioskorean: 0x3168,
-  nieunparenkorean: 0x3201,
-  nieunsioskorean: 0x3167,
-  nieuntikeutkorean: 0x3166,
-  nihiragana: 0x306B,
-  nikatakana: 0x30CB,
-  nikatakanahalfwidth: 0xFF86,
-  nikhahitleftthai: 0xF899,
-  nikhahitthai: 0x0E4D,
-  nine: 0x0039,
-  ninearabic: 0x0669,
-  ninebengali: 0x09EF,
-  ninecircle: 0x2468,
-  ninecircleinversesansserif: 0x2792,
-  ninedeva: 0x096F,
-  ninegujarati: 0x0AEF,
-  ninegurmukhi: 0x0A6F,
-  ninehackarabic: 0x0669,
-  ninehangzhou: 0x3029,
-  nineideographicparen: 0x3228,
-  nineinferior: 0x2089,
-  ninemonospace: 0xFF19,
-  nineoldstyle: 0xF739,
-  nineparen: 0x247C,
-  nineperiod: 0x2490,
-  ninepersian: 0x06F9,
-  nineroman: 0x2178,
-  ninesuperior: 0x2079,
-  nineteencircle: 0x2472,
-  nineteenparen: 0x2486,
-  nineteenperiod: 0x249A,
-  ninethai: 0x0E59,
-  nj: 0x01CC,
-  njecyrillic: 0x045A,
-  nkatakana: 0x30F3,
-  nkatakanahalfwidth: 0xFF9D,
-  nlegrightlong: 0x019E,
-  nlinebelow: 0x1E49,
-  nmonospace: 0xFF4E,
-  nmsquare: 0x339A,
-  nnabengali: 0x09A3,
-  nnadeva: 0x0923,
-  nnagujarati: 0x0AA3,
-  nnagurmukhi: 0x0A23,
-  nnnadeva: 0x0929,
-  nohiragana: 0x306E,
-  nokatakana: 0x30CE,
-  nokatakanahalfwidth: 0xFF89,
-  nonbreakingspace: 0x00A0,
-  nonenthai: 0x0E13,
-  nonuthai: 0x0E19,
-  noonarabic: 0x0646,
-  noonfinalarabic: 0xFEE6,
-  noonghunnaarabic: 0x06BA,
-  noonghunnafinalarabic: 0xFB9F,
-  nooninitialarabic: 0xFEE7,
-  noonjeeminitialarabic: 0xFCD2,
-  noonjeemisolatedarabic: 0xFC4B,
-  noonmedialarabic: 0xFEE8,
-  noonmeeminitialarabic: 0xFCD5,
-  noonmeemisolatedarabic: 0xFC4E,
-  noonnoonfinalarabic: 0xFC8D,
-  notcontains: 0x220C,
-  notelement: 0x2209,
-  notelementof: 0x2209,
-  notequal: 0x2260,
-  notgreater: 0x226F,
-  notgreaternorequal: 0x2271,
-  notgreaternorless: 0x2279,
-  notidentical: 0x2262,
-  notless: 0x226E,
-  notlessnorequal: 0x2270,
-  notparallel: 0x2226,
-  notprecedes: 0x2280,
-  notsubset: 0x2284,
-  notsucceeds: 0x2281,
-  notsuperset: 0x2285,
-  nowarmenian: 0x0576,
-  nparen: 0x24A9,
-  nssquare: 0x33B1,
-  nsuperior: 0x207F,
-  ntilde: 0x00F1,
-  nu: 0x03BD,
-  nuhiragana: 0x306C,
-  nukatakana: 0x30CC,
-  nukatakanahalfwidth: 0xFF87,
-  nuktabengali: 0x09BC,
-  nuktadeva: 0x093C,
-  nuktagujarati: 0x0ABC,
-  nuktagurmukhi: 0x0A3C,
-  numbersign: 0x0023,
-  numbersignmonospace: 0xFF03,
-  numbersignsmall: 0xFE5F,
-  numeralsigngreek: 0x0374,
-  numeralsignlowergreek: 0x0375,
-  numero: 0x2116,
-  nun: 0x05E0,
-  nundagesh: 0xFB40,
-  nundageshhebrew: 0xFB40,
-  nunhebrew: 0x05E0,
-  nvsquare: 0x33B5,
-  nwsquare: 0x33BB,
-  nyabengali: 0x099E,
-  nyadeva: 0x091E,
-  nyagujarati: 0x0A9E,
-  nyagurmukhi: 0x0A1E,
-  o: 0x006F,
-  oacute: 0x00F3,
-  oangthai: 0x0E2D,
-  obarred: 0x0275,
-  obarredcyrillic: 0x04E9,
-  obarreddieresiscyrillic: 0x04EB,
-  obengali: 0x0993,
-  obopomofo: 0x311B,
-  obreve: 0x014F,
-  ocandradeva: 0x0911,
-  ocandragujarati: 0x0A91,
-  ocandravowelsigndeva: 0x0949,
-  ocandravowelsigngujarati: 0x0AC9,
-  ocaron: 0x01D2,
-  ocircle: 0x24DE,
-  ocircumflex: 0x00F4,
-  ocircumflexacute: 0x1ED1,
-  ocircumflexdotbelow: 0x1ED9,
-  ocircumflexgrave: 0x1ED3,
-  ocircumflexhookabove: 0x1ED5,
-  ocircumflextilde: 0x1ED7,
-  ocyrillic: 0x043E,
-  odblacute: 0x0151,
-  odblgrave: 0x020D,
-  odeva: 0x0913,
-  odieresis: 0x00F6,
-  odieresiscyrillic: 0x04E7,
-  odotbelow: 0x1ECD,
-  oe: 0x0153,
-  oekorean: 0x315A,
-  ogonek: 0x02DB,
-  ogonekcmb: 0x0328,
-  ograve: 0x00F2,
-  ogujarati: 0x0A93,
-  oharmenian: 0x0585,
-  ohiragana: 0x304A,
-  ohookabove: 0x1ECF,
-  ohorn: 0x01A1,
-  ohornacute: 0x1EDB,
-  ohorndotbelow: 0x1EE3,
-  ohorngrave: 0x1EDD,
-  ohornhookabove: 0x1EDF,
-  ohorntilde: 0x1EE1,
-  ohungarumlaut: 0x0151,
-  oi: 0x01A3,
-  oinvertedbreve: 0x020F,
-  okatakana: 0x30AA,
-  okatakanahalfwidth: 0xFF75,
-  okorean: 0x3157,
-  olehebrew: 0x05AB,
-  omacron: 0x014D,
-  omacronacute: 0x1E53,
-  omacrongrave: 0x1E51,
-  omdeva: 0x0950,
-  omega: 0x03C9,
-  omega1: 0x03D6,
-  omegacyrillic: 0x0461,
-  omegalatinclosed: 0x0277,
-  omegaroundcyrillic: 0x047B,
-  omegatitlocyrillic: 0x047D,
-  omegatonos: 0x03CE,
-  omgujarati: 0x0AD0,
-  omicron: 0x03BF,
-  omicrontonos: 0x03CC,
-  omonospace: 0xFF4F,
-  one: 0x0031,
-  onearabic: 0x0661,
-  onebengali: 0x09E7,
-  onecircle: 0x2460,
-  onecircleinversesansserif: 0x278A,
-  onedeva: 0x0967,
-  onedotenleader: 0x2024,
-  oneeighth: 0x215B,
-  onefitted: 0xF6DC,
-  onegujarati: 0x0AE7,
-  onegurmukhi: 0x0A67,
-  onehackarabic: 0x0661,
-  onehalf: 0x00BD,
-  onehangzhou: 0x3021,
-  oneideographicparen: 0x3220,
-  oneinferior: 0x2081,
-  onemonospace: 0xFF11,
-  onenumeratorbengali: 0x09F4,
-  oneoldstyle: 0xF731,
-  oneparen: 0x2474,
-  oneperiod: 0x2488,
-  onepersian: 0x06F1,
-  onequarter: 0x00BC,
-  oneroman: 0x2170,
-  onesuperior: 0x00B9,
-  onethai: 0x0E51,
-  onethird: 0x2153,
-  oogonek: 0x01EB,
-  oogonekmacron: 0x01ED,
-  oogurmukhi: 0x0A13,
-  oomatragurmukhi: 0x0A4B,
-  oopen: 0x0254,
-  oparen: 0x24AA,
-  openbullet: 0x25E6,
-  option: 0x2325,
-  ordfeminine: 0x00AA,
-  ordmasculine: 0x00BA,
-  orthogonal: 0x221F,
-  oshortdeva: 0x0912,
-  oshortvowelsigndeva: 0x094A,
-  oslash: 0x00F8,
-  oslashacute: 0x01FF,
-  osmallhiragana: 0x3049,
-  osmallkatakana: 0x30A9,
-  osmallkatakanahalfwidth: 0xFF6B,
-  ostrokeacute: 0x01FF,
-  osuperior: 0xF6F0,
-  otcyrillic: 0x047F,
-  otilde: 0x00F5,
-  otildeacute: 0x1E4D,
-  otildedieresis: 0x1E4F,
-  oubopomofo: 0x3121,
-  overline: 0x203E,
-  overlinecenterline: 0xFE4A,
-  overlinecmb: 0x0305,
-  overlinedashed: 0xFE49,
-  overlinedblwavy: 0xFE4C,
-  overlinewavy: 0xFE4B,
-  overscore: 0x00AF,
-  ovowelsignbengali: 0x09CB,
-  ovowelsigndeva: 0x094B,
-  ovowelsigngujarati: 0x0ACB,
-  p: 0x0070,
-  paampssquare: 0x3380,
-  paasentosquare: 0x332B,
-  pabengali: 0x09AA,
-  pacute: 0x1E55,
-  padeva: 0x092A,
-  pagedown: 0x21DF,
-  pageup: 0x21DE,
-  pagujarati: 0x0AAA,
-  pagurmukhi: 0x0A2A,
-  pahiragana: 0x3071,
-  paiyannoithai: 0x0E2F,
-  pakatakana: 0x30D1,
-  palatalizationcyrilliccmb: 0x0484,
-  palochkacyrillic: 0x04C0,
-  pansioskorean: 0x317F,
-  paragraph: 0x00B6,
-  parallel: 0x2225,
-  parenleft: 0x0028,
-  parenleftaltonearabic: 0xFD3E,
-  parenleftbt: 0xF8ED,
-  parenleftex: 0xF8EC,
-  parenleftinferior: 0x208D,
-  parenleftmonospace: 0xFF08,
-  parenleftsmall: 0xFE59,
-  parenleftsuperior: 0x207D,
-  parenlefttp: 0xF8EB,
-  parenleftvertical: 0xFE35,
-  parenright: 0x0029,
-  parenrightaltonearabic: 0xFD3F,
-  parenrightbt: 0xF8F8,
-  parenrightex: 0xF8F7,
-  parenrightinferior: 0x208E,
-  parenrightmonospace: 0xFF09,
-  parenrightsmall: 0xFE5A,
-  parenrightsuperior: 0x207E,
-  parenrighttp: 0xF8F6,
-  parenrightvertical: 0xFE36,
-  partialdiff: 0x2202,
-  paseqhebrew: 0x05C0,
-  pashtahebrew: 0x0599,
-  pasquare: 0x33A9,
-  patah: 0x05B7,
-  patah11: 0x05B7,
-  patah1d: 0x05B7,
-  patah2a: 0x05B7,
-  patahhebrew: 0x05B7,
-  patahnarrowhebrew: 0x05B7,
-  patahquarterhebrew: 0x05B7,
-  patahwidehebrew: 0x05B7,
-  pazerhebrew: 0x05A1,
-  pbopomofo: 0x3106,
-  pcircle: 0x24DF,
-  pdotaccent: 0x1E57,
-  pe: 0x05E4,
-  pecyrillic: 0x043F,
-  pedagesh: 0xFB44,
-  pedageshhebrew: 0xFB44,
-  peezisquare: 0x333B,
-  pefinaldageshhebrew: 0xFB43,
-  peharabic: 0x067E,
-  peharmenian: 0x057A,
-  pehebrew: 0x05E4,
-  pehfinalarabic: 0xFB57,
-  pehinitialarabic: 0xFB58,
-  pehiragana: 0x307A,
-  pehmedialarabic: 0xFB59,
-  pekatakana: 0x30DA,
-  pemiddlehookcyrillic: 0x04A7,
-  perafehebrew: 0xFB4E,
-  percent: 0x0025,
-  percentarabic: 0x066A,
-  percentmonospace: 0xFF05,
-  percentsmall: 0xFE6A,
-  period: 0x002E,
-  periodarmenian: 0x0589,
-  periodcentered: 0x00B7,
-  periodhalfwidth: 0xFF61,
-  periodinferior: 0xF6E7,
-  periodmonospace: 0xFF0E,
-  periodsmall: 0xFE52,
-  periodsuperior: 0xF6E8,
-  perispomenigreekcmb: 0x0342,
-  perpendicular: 0x22A5,
-  perthousand: 0x2030,
-  peseta: 0x20A7,
-  pfsquare: 0x338A,
-  phabengali: 0x09AB,
-  phadeva: 0x092B,
-  phagujarati: 0x0AAB,
-  phagurmukhi: 0x0A2B,
-  phi: 0x03C6,
-  phi1: 0x03D5,
-  phieuphacirclekorean: 0x327A,
-  phieuphaparenkorean: 0x321A,
-  phieuphcirclekorean: 0x326C,
-  phieuphkorean: 0x314D,
-  phieuphparenkorean: 0x320C,
-  philatin: 0x0278,
-  phinthuthai: 0x0E3A,
-  phisymbolgreek: 0x03D5,
-  phook: 0x01A5,
-  phophanthai: 0x0E1E,
-  phophungthai: 0x0E1C,
-  phosamphaothai: 0x0E20,
-  pi: 0x03C0,
-  pieupacirclekorean: 0x3273,
-  pieupaparenkorean: 0x3213,
-  pieupcieuckorean: 0x3176,
-  pieupcirclekorean: 0x3265,
-  pieupkiyeokkorean: 0x3172,
-  pieupkorean: 0x3142,
-  pieupparenkorean: 0x3205,
-  pieupsioskiyeokkorean: 0x3174,
-  pieupsioskorean: 0x3144,
-  pieupsiostikeutkorean: 0x3175,
-  pieupthieuthkorean: 0x3177,
-  pieuptikeutkorean: 0x3173,
-  pihiragana: 0x3074,
-  pikatakana: 0x30D4,
-  pisymbolgreek: 0x03D6,
-  piwrarmenian: 0x0583,
-  plus: 0x002B,
-  plusbelowcmb: 0x031F,
-  pluscircle: 0x2295,
-  plusminus: 0x00B1,
-  plusmod: 0x02D6,
-  plusmonospace: 0xFF0B,
-  plussmall: 0xFE62,
-  plussuperior: 0x207A,
-  pmonospace: 0xFF50,
-  pmsquare: 0x33D8,
-  pohiragana: 0x307D,
-  pointingindexdownwhite: 0x261F,
-  pointingindexleftwhite: 0x261C,
-  pointingindexrightwhite: 0x261E,
-  pointingindexupwhite: 0x261D,
-  pokatakana: 0x30DD,
-  poplathai: 0x0E1B,
-  postalmark: 0x3012,
-  postalmarkface: 0x3020,
-  pparen: 0x24AB,
-  precedes: 0x227A,
-  prescription: 0x211E,
-  primemod: 0x02B9,
-  primereversed: 0x2035,
-  product: 0x220F,
-  projective: 0x2305,
-  prolongedkana: 0x30FC,
-  propellor: 0x2318,
-  propersubset: 0x2282,
-  propersuperset: 0x2283,
-  proportion: 0x2237,
-  proportional: 0x221D,
-  psi: 0x03C8,
-  psicyrillic: 0x0471,
-  psilipneumatacyrilliccmb: 0x0486,
-  pssquare: 0x33B0,
-  puhiragana: 0x3077,
-  pukatakana: 0x30D7,
-  pvsquare: 0x33B4,
-  pwsquare: 0x33BA,
-  q: 0x0071,
-  qadeva: 0x0958,
-  qadmahebrew: 0x05A8,
-  qafarabic: 0x0642,
-  qaffinalarabic: 0xFED6,
-  qafinitialarabic: 0xFED7,
-  qafmedialarabic: 0xFED8,
-  qamats: 0x05B8,
-  qamats10: 0x05B8,
-  qamats1a: 0x05B8,
-  qamats1c: 0x05B8,
-  qamats27: 0x05B8,
-  qamats29: 0x05B8,
-  qamats33: 0x05B8,
-  qamatsde: 0x05B8,
-  qamatshebrew: 0x05B8,
-  qamatsnarrowhebrew: 0x05B8,
-  qamatsqatanhebrew: 0x05B8,
-  qamatsqatannarrowhebrew: 0x05B8,
-  qamatsqatanquarterhebrew: 0x05B8,
-  qamatsqatanwidehebrew: 0x05B8,
-  qamatsquarterhebrew: 0x05B8,
-  qamatswidehebrew: 0x05B8,
-  qarneyparahebrew: 0x059F,
-  qbopomofo: 0x3111,
-  qcircle: 0x24E0,
-  qhook: 0x02A0,
-  qmonospace: 0xFF51,
-  qof: 0x05E7,
-  qofdagesh: 0xFB47,
-  qofdageshhebrew: 0xFB47,
-  qofhebrew: 0x05E7,
-  qparen: 0x24AC,
-  quarternote: 0x2669,
-  qubuts: 0x05BB,
-  qubuts18: 0x05BB,
-  qubuts25: 0x05BB,
-  qubuts31: 0x05BB,
-  qubutshebrew: 0x05BB,
-  qubutsnarrowhebrew: 0x05BB,
-  qubutsquarterhebrew: 0x05BB,
-  qubutswidehebrew: 0x05BB,
-  question: 0x003F,
-  questionarabic: 0x061F,
-  questionarmenian: 0x055E,
-  questiondown: 0x00BF,
-  questiondownsmall: 0xF7BF,
-  questiongreek: 0x037E,
-  questionmonospace: 0xFF1F,
-  questionsmall: 0xF73F,
-  quotedbl: 0x0022,
-  quotedblbase: 0x201E,
-  quotedblleft: 0x201C,
-  quotedblmonospace: 0xFF02,
-  quotedblprime: 0x301E,
-  quotedblprimereversed: 0x301D,
-  quotedblright: 0x201D,
-  quoteleft: 0x2018,
-  quoteleftreversed: 0x201B,
-  quotereversed: 0x201B,
-  quoteright: 0x2019,
-  quoterightn: 0x0149,
-  quotesinglbase: 0x201A,
-  quotesingle: 0x0027,
-  quotesinglemonospace: 0xFF07,
-  r: 0x0072,
-  raarmenian: 0x057C,
-  rabengali: 0x09B0,
-  racute: 0x0155,
-  radeva: 0x0930,
-  radical: 0x221A,
-  radicalex: 0xF8E5,
-  radoverssquare: 0x33AE,
-  radoverssquaredsquare: 0x33AF,
-  radsquare: 0x33AD,
-  rafe: 0x05BF,
-  rafehebrew: 0x05BF,
-  ragujarati: 0x0AB0,
-  ragurmukhi: 0x0A30,
-  rahiragana: 0x3089,
-  rakatakana: 0x30E9,
-  rakatakanahalfwidth: 0xFF97,
-  ralowerdiagonalbengali: 0x09F1,
-  ramiddlediagonalbengali: 0x09F0,
-  ramshorn: 0x0264,
-  ratio: 0x2236,
-  rbopomofo: 0x3116,
-  rcaron: 0x0159,
-  rcedilla: 0x0157,
-  rcircle: 0x24E1,
-  rcommaaccent: 0x0157,
-  rdblgrave: 0x0211,
-  rdotaccent: 0x1E59,
-  rdotbelow: 0x1E5B,
-  rdotbelowmacron: 0x1E5D,
-  referencemark: 0x203B,
-  reflexsubset: 0x2286,
-  reflexsuperset: 0x2287,
-  registered: 0x00AE,
-  registersans: 0xF8E8,
-  registerserif: 0xF6DA,
-  reharabic: 0x0631,
-  reharmenian: 0x0580,
-  rehfinalarabic: 0xFEAE,
-  rehiragana: 0x308C,
-  rekatakana: 0x30EC,
-  rekatakanahalfwidth: 0xFF9A,
-  resh: 0x05E8,
-  reshdageshhebrew: 0xFB48,
-  reshhebrew: 0x05E8,
-  reversedtilde: 0x223D,
-  reviahebrew: 0x0597,
-  reviamugrashhebrew: 0x0597,
-  revlogicalnot: 0x2310,
-  rfishhook: 0x027E,
-  rfishhookreversed: 0x027F,
-  rhabengali: 0x09DD,
-  rhadeva: 0x095D,
-  rho: 0x03C1,
-  rhook: 0x027D,
-  rhookturned: 0x027B,
-  rhookturnedsuperior: 0x02B5,
-  rhosymbolgreek: 0x03F1,
-  rhotichookmod: 0x02DE,
-  rieulacirclekorean: 0x3271,
-  rieulaparenkorean: 0x3211,
-  rieulcirclekorean: 0x3263,
-  rieulhieuhkorean: 0x3140,
-  rieulkiyeokkorean: 0x313A,
-  rieulkiyeoksioskorean: 0x3169,
-  rieulkorean: 0x3139,
-  rieulmieumkorean: 0x313B,
-  rieulpansioskorean: 0x316C,
-  rieulparenkorean: 0x3203,
-  rieulphieuphkorean: 0x313F,
-  rieulpieupkorean: 0x313C,
-  rieulpieupsioskorean: 0x316B,
-  rieulsioskorean: 0x313D,
-  rieulthieuthkorean: 0x313E,
-  rieultikeutkorean: 0x316A,
-  rieulyeorinhieuhkorean: 0x316D,
-  rightangle: 0x221F,
-  righttackbelowcmb: 0x0319,
-  righttriangle: 0x22BF,
-  rihiragana: 0x308A,
-  rikatakana: 0x30EA,
-  rikatakanahalfwidth: 0xFF98,
-  ring: 0x02DA,
-  ringbelowcmb: 0x0325,
-  ringcmb: 0x030A,
-  ringhalfleft: 0x02BF,
-  ringhalfleftarmenian: 0x0559,
-  ringhalfleftbelowcmb: 0x031C,
-  ringhalfleftcentered: 0x02D3,
-  ringhalfright: 0x02BE,
-  ringhalfrightbelowcmb: 0x0339,
-  ringhalfrightcentered: 0x02D2,
-  rinvertedbreve: 0x0213,
-  rittorusquare: 0x3351,
-  rlinebelow: 0x1E5F,
-  rlongleg: 0x027C,
-  rlonglegturned: 0x027A,
-  rmonospace: 0xFF52,
-  rohiragana: 0x308D,
-  rokatakana: 0x30ED,
-  rokatakanahalfwidth: 0xFF9B,
-  roruathai: 0x0E23,
-  rparen: 0x24AD,
-  rrabengali: 0x09DC,
-  rradeva: 0x0931,
-  rragurmukhi: 0x0A5C,
-  rreharabic: 0x0691,
-  rrehfinalarabic: 0xFB8D,
-  rrvocalicbengali: 0x09E0,
-  rrvocalicdeva: 0x0960,
-  rrvocalicgujarati: 0x0AE0,
-  rrvocalicvowelsignbengali: 0x09C4,
-  rrvocalicvowelsigndeva: 0x0944,
-  rrvocalicvowelsigngujarati: 0x0AC4,
-  rsuperior: 0xF6F1,
-  rtblock: 0x2590,
-  rturned: 0x0279,
-  rturnedsuperior: 0x02B4,
-  ruhiragana: 0x308B,
-  rukatakana: 0x30EB,
-  rukatakanahalfwidth: 0xFF99,
-  rupeemarkbengali: 0x09F2,
-  rupeesignbengali: 0x09F3,
-  rupiah: 0xF6DD,
-  ruthai: 0x0E24,
-  rvocalicbengali: 0x098B,
-  rvocalicdeva: 0x090B,
-  rvocalicgujarati: 0x0A8B,
-  rvocalicvowelsignbengali: 0x09C3,
-  rvocalicvowelsigndeva: 0x0943,
-  rvocalicvowelsigngujarati: 0x0AC3,
-  s: 0x0073,
-  sabengali: 0x09B8,
-  sacute: 0x015B,
-  sacutedotaccent: 0x1E65,
-  sadarabic: 0x0635,
-  sadeva: 0x0938,
-  sadfinalarabic: 0xFEBA,
-  sadinitialarabic: 0xFEBB,
-  sadmedialarabic: 0xFEBC,
-  sagujarati: 0x0AB8,
-  sagurmukhi: 0x0A38,
-  sahiragana: 0x3055,
-  sakatakana: 0x30B5,
-  sakatakanahalfwidth: 0xFF7B,
-  sallallahoualayhewasallamarabic: 0xFDFA,
-  samekh: 0x05E1,
-  samekhdagesh: 0xFB41,
-  samekhdageshhebrew: 0xFB41,
-  samekhhebrew: 0x05E1,
-  saraaathai: 0x0E32,
-  saraaethai: 0x0E41,
-  saraaimaimalaithai: 0x0E44,
-  saraaimaimuanthai: 0x0E43,
-  saraamthai: 0x0E33,
-  saraathai: 0x0E30,
-  saraethai: 0x0E40,
-  saraiileftthai: 0xF886,
-  saraiithai: 0x0E35,
-  saraileftthai: 0xF885,
-  saraithai: 0x0E34,
-  saraothai: 0x0E42,
-  saraueeleftthai: 0xF888,
-  saraueethai: 0x0E37,
-  saraueleftthai: 0xF887,
-  sarauethai: 0x0E36,
-  sarauthai: 0x0E38,
-  sarauuthai: 0x0E39,
-  sbopomofo: 0x3119,
-  scaron: 0x0161,
-  scarondotaccent: 0x1E67,
-  scedilla: 0x015F,
-  schwa: 0x0259,
-  schwacyrillic: 0x04D9,
-  schwadieresiscyrillic: 0x04DB,
-  schwahook: 0x025A,
-  scircle: 0x24E2,
-  scircumflex: 0x015D,
-  scommaaccent: 0x0219,
-  sdotaccent: 0x1E61,
-  sdotbelow: 0x1E63,
-  sdotbelowdotaccent: 0x1E69,
-  seagullbelowcmb: 0x033C,
-  second: 0x2033,
-  secondtonechinese: 0x02CA,
-  section: 0x00A7,
-  seenarabic: 0x0633,
-  seenfinalarabic: 0xFEB2,
-  seeninitialarabic: 0xFEB3,
-  seenmedialarabic: 0xFEB4,
-  segol: 0x05B6,
-  segol13: 0x05B6,
-  segol1f: 0x05B6,
-  segol2c: 0x05B6,
-  segolhebrew: 0x05B6,
-  segolnarrowhebrew: 0x05B6,
-  segolquarterhebrew: 0x05B6,
-  segoltahebrew: 0x0592,
-  segolwidehebrew: 0x05B6,
-  seharmenian: 0x057D,
-  sehiragana: 0x305B,
-  sekatakana: 0x30BB,
-  sekatakanahalfwidth: 0xFF7E,
-  semicolon: 0x003B,
-  semicolonarabic: 0x061B,
-  semicolonmonospace: 0xFF1B,
-  semicolonsmall: 0xFE54,
-  semivoicedmarkkana: 0x309C,
-  semivoicedmarkkanahalfwidth: 0xFF9F,
-  sentisquare: 0x3322,
-  sentosquare: 0x3323,
-  seven: 0x0037,
-  sevenarabic: 0x0667,
-  sevenbengali: 0x09ED,
-  sevencircle: 0x2466,
-  sevencircleinversesansserif: 0x2790,
-  sevendeva: 0x096D,
-  seveneighths: 0x215E,
-  sevengujarati: 0x0AED,
-  sevengurmukhi: 0x0A6D,
-  sevenhackarabic: 0x0667,
-  sevenhangzhou: 0x3027,
-  sevenideographicparen: 0x3226,
-  seveninferior: 0x2087,
-  sevenmonospace: 0xFF17,
-  sevenoldstyle: 0xF737,
-  sevenparen: 0x247A,
-  sevenperiod: 0x248E,
-  sevenpersian: 0x06F7,
-  sevenroman: 0x2176,
-  sevensuperior: 0x2077,
-  seventeencircle: 0x2470,
-  seventeenparen: 0x2484,
-  seventeenperiod: 0x2498,
-  seventhai: 0x0E57,
-  sfthyphen: 0x00AD,
-  shaarmenian: 0x0577,
-  shabengali: 0x09B6,
-  shacyrillic: 0x0448,
-  shaddaarabic: 0x0651,
-  shaddadammaarabic: 0xFC61,
-  shaddadammatanarabic: 0xFC5E,
-  shaddafathaarabic: 0xFC60,
-  shaddakasraarabic: 0xFC62,
-  shaddakasratanarabic: 0xFC5F,
-  shade: 0x2592,
-  shadedark: 0x2593,
-  shadelight: 0x2591,
-  shademedium: 0x2592,
-  shadeva: 0x0936,
-  shagujarati: 0x0AB6,
-  shagurmukhi: 0x0A36,
-  shalshelethebrew: 0x0593,
-  shbopomofo: 0x3115,
-  shchacyrillic: 0x0449,
-  sheenarabic: 0x0634,
-  sheenfinalarabic: 0xFEB6,
-  sheeninitialarabic: 0xFEB7,
-  sheenmedialarabic: 0xFEB8,
-  sheicoptic: 0x03E3,
-  sheqel: 0x20AA,
-  sheqelhebrew: 0x20AA,
-  sheva: 0x05B0,
-  sheva115: 0x05B0,
-  sheva15: 0x05B0,
-  sheva22: 0x05B0,
-  sheva2e: 0x05B0,
-  shevahebrew: 0x05B0,
-  shevanarrowhebrew: 0x05B0,
-  shevaquarterhebrew: 0x05B0,
-  shevawidehebrew: 0x05B0,
-  shhacyrillic: 0x04BB,
-  shimacoptic: 0x03ED,
-  shin: 0x05E9,
-  shindagesh: 0xFB49,
-  shindageshhebrew: 0xFB49,
-  shindageshshindot: 0xFB2C,
-  shindageshshindothebrew: 0xFB2C,
-  shindageshsindot: 0xFB2D,
-  shindageshsindothebrew: 0xFB2D,
-  shindothebrew: 0x05C1,
-  shinhebrew: 0x05E9,
-  shinshindot: 0xFB2A,
-  shinshindothebrew: 0xFB2A,
-  shinsindot: 0xFB2B,
-  shinsindothebrew: 0xFB2B,
-  shook: 0x0282,
-  sigma: 0x03C3,
-  sigma1: 0x03C2,
-  sigmafinal: 0x03C2,
-  sigmalunatesymbolgreek: 0x03F2,
-  sihiragana: 0x3057,
-  sikatakana: 0x30B7,
-  sikatakanahalfwidth: 0xFF7C,
-  siluqhebrew: 0x05BD,
-  siluqlefthebrew: 0x05BD,
-  similar: 0x223C,
-  sindothebrew: 0x05C2,
-  siosacirclekorean: 0x3274,
-  siosaparenkorean: 0x3214,
-  sioscieuckorean: 0x317E,
-  sioscirclekorean: 0x3266,
-  sioskiyeokkorean: 0x317A,
-  sioskorean: 0x3145,
-  siosnieunkorean: 0x317B,
-  siosparenkorean: 0x3206,
-  siospieupkorean: 0x317D,
-  siostikeutkorean: 0x317C,
-  six: 0x0036,
-  sixarabic: 0x0666,
-  sixbengali: 0x09EC,
-  sixcircle: 0x2465,
-  sixcircleinversesansserif: 0x278F,
-  sixdeva: 0x096C,
-  sixgujarati: 0x0AEC,
-  sixgurmukhi: 0x0A6C,
-  sixhackarabic: 0x0666,
-  sixhangzhou: 0x3026,
-  sixideographicparen: 0x3225,
-  sixinferior: 0x2086,
-  sixmonospace: 0xFF16,
-  sixoldstyle: 0xF736,
-  sixparen: 0x2479,
-  sixperiod: 0x248D,
-  sixpersian: 0x06F6,
-  sixroman: 0x2175,
-  sixsuperior: 0x2076,
-  sixteencircle: 0x246F,
-  sixteencurrencydenominatorbengali: 0x09F9,
-  sixteenparen: 0x2483,
-  sixteenperiod: 0x2497,
-  sixthai: 0x0E56,
-  slash: 0x002F,
-  slashmonospace: 0xFF0F,
-  slong: 0x017F,
-  slongdotaccent: 0x1E9B,
-  smileface: 0x263A,
-  smonospace: 0xFF53,
-  sofpasuqhebrew: 0x05C3,
-  softhyphen: 0x00AD,
-  softsigncyrillic: 0x044C,
-  sohiragana: 0x305D,
-  sokatakana: 0x30BD,
-  sokatakanahalfwidth: 0xFF7F,
-  soliduslongoverlaycmb: 0x0338,
-  solidusshortoverlaycmb: 0x0337,
-  sorusithai: 0x0E29,
-  sosalathai: 0x0E28,
-  sosothai: 0x0E0B,
-  sosuathai: 0x0E2A,
-  space: 0x0020,
-  spacehackarabic: 0x0020,
-  spade: 0x2660,
-  spadesuitblack: 0x2660,
-  spadesuitwhite: 0x2664,
-  sparen: 0x24AE,
-  squarebelowcmb: 0x033B,
-  squarecc: 0x33C4,
-  squarecm: 0x339D,
-  squarediagonalcrosshatchfill: 0x25A9,
-  squarehorizontalfill: 0x25A4,
-  squarekg: 0x338F,
-  squarekm: 0x339E,
-  squarekmcapital: 0x33CE,
-  squareln: 0x33D1,
-  squarelog: 0x33D2,
-  squaremg: 0x338E,
-  squaremil: 0x33D5,
-  squaremm: 0x339C,
-  squaremsquared: 0x33A1,
-  squareorthogonalcrosshatchfill: 0x25A6,
-  squareupperlefttolowerrightfill: 0x25A7,
-  squareupperrighttolowerleftfill: 0x25A8,
-  squareverticalfill: 0x25A5,
-  squarewhitewithsmallblack: 0x25A3,
-  srsquare: 0x33DB,
-  ssabengali: 0x09B7,
-  ssadeva: 0x0937,
-  ssagujarati: 0x0AB7,
-  ssangcieuckorean: 0x3149,
-  ssanghieuhkorean: 0x3185,
-  ssangieungkorean: 0x3180,
-  ssangkiyeokkorean: 0x3132,
-  ssangnieunkorean: 0x3165,
-  ssangpieupkorean: 0x3143,
-  ssangsioskorean: 0x3146,
-  ssangtikeutkorean: 0x3138,
-  ssuperior: 0xF6F2,
-  sterling: 0x00A3,
-  sterlingmonospace: 0xFFE1,
-  strokelongoverlaycmb: 0x0336,
-  strokeshortoverlaycmb: 0x0335,
-  subset: 0x2282,
-  subsetnotequal: 0x228A,
-  subsetorequal: 0x2286,
-  succeeds: 0x227B,
-  suchthat: 0x220B,
-  suhiragana: 0x3059,
-  sukatakana: 0x30B9,
-  sukatakanahalfwidth: 0xFF7D,
-  sukunarabic: 0x0652,
-  summation: 0x2211,
-  sun: 0x263C,
-  superset: 0x2283,
-  supersetnotequal: 0x228B,
-  supersetorequal: 0x2287,
-  svsquare: 0x33DC,
-  syouwaerasquare: 0x337C,
-  t: 0x0074,
-  tabengali: 0x09A4,
-  tackdown: 0x22A4,
-  tackleft: 0x22A3,
-  tadeva: 0x0924,
-  tagujarati: 0x0AA4,
-  tagurmukhi: 0x0A24,
-  taharabic: 0x0637,
-  tahfinalarabic: 0xFEC2,
-  tahinitialarabic: 0xFEC3,
-  tahiragana: 0x305F,
-  tahmedialarabic: 0xFEC4,
-  taisyouerasquare: 0x337D,
-  takatakana: 0x30BF,
-  takatakanahalfwidth: 0xFF80,
-  tatweelarabic: 0x0640,
-  tau: 0x03C4,
-  tav: 0x05EA,
-  tavdages: 0xFB4A,
-  tavdagesh: 0xFB4A,
-  tavdageshhebrew: 0xFB4A,
-  tavhebrew: 0x05EA,
-  tbar: 0x0167,
-  tbopomofo: 0x310A,
-  tcaron: 0x0165,
-  tccurl: 0x02A8,
-  tcedilla: 0x0163,
-  tcheharabic: 0x0686,
-  tchehfinalarabic: 0xFB7B,
-  tchehinitialarabic: 0xFB7C,
-  tchehmedialarabic: 0xFB7D,
-  tcircle: 0x24E3,
-  tcircumflexbelow: 0x1E71,
-  tcommaaccent: 0x0163,
-  tdieresis: 0x1E97,
-  tdotaccent: 0x1E6B,
-  tdotbelow: 0x1E6D,
-  tecyrillic: 0x0442,
-  tedescendercyrillic: 0x04AD,
-  teharabic: 0x062A,
-  tehfinalarabic: 0xFE96,
-  tehhahinitialarabic: 0xFCA2,
-  tehhahisolatedarabic: 0xFC0C,
-  tehinitialarabic: 0xFE97,
-  tehiragana: 0x3066,
-  tehjeeminitialarabic: 0xFCA1,
-  tehjeemisolatedarabic: 0xFC0B,
-  tehmarbutaarabic: 0x0629,
-  tehmarbutafinalarabic: 0xFE94,
-  tehmedialarabic: 0xFE98,
-  tehmeeminitialarabic: 0xFCA4,
-  tehmeemisolatedarabic: 0xFC0E,
-  tehnoonfinalarabic: 0xFC73,
-  tekatakana: 0x30C6,
-  tekatakanahalfwidth: 0xFF83,
-  telephone: 0x2121,
-  telephoneblack: 0x260E,
-  telishagedolahebrew: 0x05A0,
-  telishaqetanahebrew: 0x05A9,
-  tencircle: 0x2469,
-  tenideographicparen: 0x3229,
-  tenparen: 0x247D,
-  tenperiod: 0x2491,
-  tenroman: 0x2179,
-  tesh: 0x02A7,
-  tet: 0x05D8,
-  tetdagesh: 0xFB38,
-  tetdageshhebrew: 0xFB38,
-  tethebrew: 0x05D8,
-  tetsecyrillic: 0x04B5,
-  tevirhebrew: 0x059B,
-  tevirlefthebrew: 0x059B,
-  thabengali: 0x09A5,
-  thadeva: 0x0925,
-  thagujarati: 0x0AA5,
-  thagurmukhi: 0x0A25,
-  thalarabic: 0x0630,
-  thalfinalarabic: 0xFEAC,
-  thanthakhatlowleftthai: 0xF898,
-  thanthakhatlowrightthai: 0xF897,
-  thanthakhatthai: 0x0E4C,
-  thanthakhatupperleftthai: 0xF896,
-  theharabic: 0x062B,
-  thehfinalarabic: 0xFE9A,
-  thehinitialarabic: 0xFE9B,
-  thehmedialarabic: 0xFE9C,
-  thereexists: 0x2203,
-  therefore: 0x2234,
-  theta: 0x03B8,
-  theta1: 0x03D1,
-  thetasymbolgreek: 0x03D1,
-  thieuthacirclekorean: 0x3279,
-  thieuthaparenkorean: 0x3219,
-  thieuthcirclekorean: 0x326B,
-  thieuthkorean: 0x314C,
-  thieuthparenkorean: 0x320B,
-  thirteencircle: 0x246C,
-  thirteenparen: 0x2480,
-  thirteenperiod: 0x2494,
-  thonangmonthothai: 0x0E11,
-  thook: 0x01AD,
-  thophuthaothai: 0x0E12,
-  thorn: 0x00FE,
-  thothahanthai: 0x0E17,
-  thothanthai: 0x0E10,
-  thothongthai: 0x0E18,
-  thothungthai: 0x0E16,
-  thousandcyrillic: 0x0482,
-  thousandsseparatorarabic: 0x066C,
-  thousandsseparatorpersian: 0x066C,
-  three: 0x0033,
-  threearabic: 0x0663,
-  threebengali: 0x09E9,
-  threecircle: 0x2462,
-  threecircleinversesansserif: 0x278C,
-  threedeva: 0x0969,
-  threeeighths: 0x215C,
-  threegujarati: 0x0AE9,
-  threegurmukhi: 0x0A69,
-  threehackarabic: 0x0663,
-  threehangzhou: 0x3023,
-  threeideographicparen: 0x3222,
-  threeinferior: 0x2083,
-  threemonospace: 0xFF13,
-  threenumeratorbengali: 0x09F6,
-  threeoldstyle: 0xF733,
-  threeparen: 0x2476,
-  threeperiod: 0x248A,
-  threepersian: 0x06F3,
-  threequarters: 0x00BE,
-  threequartersemdash: 0xF6DE,
-  threeroman: 0x2172,
-  threesuperior: 0x00B3,
-  threethai: 0x0E53,
-  thzsquare: 0x3394,
-  tihiragana: 0x3061,
-  tikatakana: 0x30C1,
-  tikatakanahalfwidth: 0xFF81,
-  tikeutacirclekorean: 0x3270,
-  tikeutaparenkorean: 0x3210,
-  tikeutcirclekorean: 0x3262,
-  tikeutkorean: 0x3137,
-  tikeutparenkorean: 0x3202,
-  tilde: 0x02DC,
-  tildebelowcmb: 0x0330,
-  tildecmb: 0x0303,
-  tildecomb: 0x0303,
-  tildedoublecmb: 0x0360,
-  tildeoperator: 0x223C,
-  tildeoverlaycmb: 0x0334,
-  tildeverticalcmb: 0x033E,
-  timescircle: 0x2297,
-  tipehahebrew: 0x0596,
-  tipehalefthebrew: 0x0596,
-  tippigurmukhi: 0x0A70,
-  titlocyrilliccmb: 0x0483,
-  tiwnarmenian: 0x057F,
-  tlinebelow: 0x1E6F,
-  tmonospace: 0xFF54,
-  toarmenian: 0x0569,
-  tohiragana: 0x3068,
-  tokatakana: 0x30C8,
-  tokatakanahalfwidth: 0xFF84,
-  tonebarextrahighmod: 0x02E5,
-  tonebarextralowmod: 0x02E9,
-  tonebarhighmod: 0x02E6,
-  tonebarlowmod: 0x02E8,
-  tonebarmidmod: 0x02E7,
-  tonefive: 0x01BD,
-  tonesix: 0x0185,
-  tonetwo: 0x01A8,
-  tonos: 0x0384,
-  tonsquare: 0x3327,
-  topatakthai: 0x0E0F,
-  tortoiseshellbracketleft: 0x3014,
-  tortoiseshellbracketleftsmall: 0xFE5D,
-  tortoiseshellbracketleftvertical: 0xFE39,
-  tortoiseshellbracketright: 0x3015,
-  tortoiseshellbracketrightsmall: 0xFE5E,
-  tortoiseshellbracketrightvertical: 0xFE3A,
-  totaothai: 0x0E15,
-  tpalatalhook: 0x01AB,
-  tparen: 0x24AF,
-  trademark: 0x2122,
-  trademarksans: 0xF8EA,
-  trademarkserif: 0xF6DB,
-  tretroflexhook: 0x0288,
-  triagdn: 0x25BC,
-  triaglf: 0x25C4,
-  triagrt: 0x25BA,
-  triagup: 0x25B2,
-  ts: 0x02A6,
-  tsadi: 0x05E6,
-  tsadidagesh: 0xFB46,
-  tsadidageshhebrew: 0xFB46,
-  tsadihebrew: 0x05E6,
-  tsecyrillic: 0x0446,
-  tsere: 0x05B5,
-  tsere12: 0x05B5,
-  tsere1e: 0x05B5,
-  tsere2b: 0x05B5,
-  tserehebrew: 0x05B5,
-  tserenarrowhebrew: 0x05B5,
-  tserequarterhebrew: 0x05B5,
-  tserewidehebrew: 0x05B5,
-  tshecyrillic: 0x045B,
-  tsuperior: 0xF6F3,
-  ttabengali: 0x099F,
-  ttadeva: 0x091F,
-  ttagujarati: 0x0A9F,
-  ttagurmukhi: 0x0A1F,
-  tteharabic: 0x0679,
-  ttehfinalarabic: 0xFB67,
-  ttehinitialarabic: 0xFB68,
-  ttehmedialarabic: 0xFB69,
-  tthabengali: 0x09A0,
-  tthadeva: 0x0920,
-  tthagujarati: 0x0AA0,
-  tthagurmukhi: 0x0A20,
-  tturned: 0x0287,
-  tuhiragana: 0x3064,
-  tukatakana: 0x30C4,
-  tukatakanahalfwidth: 0xFF82,
-  tusmallhiragana: 0x3063,
-  tusmallkatakana: 0x30C3,
-  tusmallkatakanahalfwidth: 0xFF6F,
-  twelvecircle: 0x246B,
-  twelveparen: 0x247F,
-  twelveperiod: 0x2493,
-  twelveroman: 0x217B,
-  twentycircle: 0x2473,
-  twentyhangzhou: 0x5344,
-  twentyparen: 0x2487,
-  twentyperiod: 0x249B,
-  two: 0x0032,
-  twoarabic: 0x0662,
-  twobengali: 0x09E8,
-  twocircle: 0x2461,
-  twocircleinversesansserif: 0x278B,
-  twodeva: 0x0968,
-  twodotenleader: 0x2025,
-  twodotleader: 0x2025,
-  twodotleadervertical: 0xFE30,
-  twogujarati: 0x0AE8,
-  twogurmukhi: 0x0A68,
-  twohackarabic: 0x0662,
-  twohangzhou: 0x3022,
-  twoideographicparen: 0x3221,
-  twoinferior: 0x2082,
-  twomonospace: 0xFF12,
-  twonumeratorbengali: 0x09F5,
-  twooldstyle: 0xF732,
-  twoparen: 0x2475,
-  twoperiod: 0x2489,
-  twopersian: 0x06F2,
-  tworoman: 0x2171,
-  twostroke: 0x01BB,
-  twosuperior: 0x00B2,
-  twothai: 0x0E52,
-  twothirds: 0x2154,
-  u: 0x0075,
-  uacute: 0x00FA,
-  ubar: 0x0289,
-  ubengali: 0x0989,
-  ubopomofo: 0x3128,
-  ubreve: 0x016D,
-  ucaron: 0x01D4,
-  ucircle: 0x24E4,
-  ucircumflex: 0x00FB,
-  ucircumflexbelow: 0x1E77,
-  ucyrillic: 0x0443,
-  udattadeva: 0x0951,
-  udblacute: 0x0171,
-  udblgrave: 0x0215,
-  udeva: 0x0909,
-  udieresis: 0x00FC,
-  udieresisacute: 0x01D8,
-  udieresisbelow: 0x1E73,
-  udieresiscaron: 0x01DA,
-  udieresiscyrillic: 0x04F1,
-  udieresisgrave: 0x01DC,
-  udieresismacron: 0x01D6,
-  udotbelow: 0x1EE5,
-  ugrave: 0x00F9,
-  ugujarati: 0x0A89,
-  ugurmukhi: 0x0A09,
-  uhiragana: 0x3046,
-  uhookabove: 0x1EE7,
-  uhorn: 0x01B0,
-  uhornacute: 0x1EE9,
-  uhorndotbelow: 0x1EF1,
-  uhorngrave: 0x1EEB,
-  uhornhookabove: 0x1EED,
-  uhorntilde: 0x1EEF,
-  uhungarumlaut: 0x0171,
-  uhungarumlautcyrillic: 0x04F3,
-  uinvertedbreve: 0x0217,
-  ukatakana: 0x30A6,
-  ukatakanahalfwidth: 0xFF73,
-  ukcyrillic: 0x0479,
-  ukorean: 0x315C,
-  umacron: 0x016B,
-  umacroncyrillic: 0x04EF,
-  umacrondieresis: 0x1E7B,
-  umatragurmukhi: 0x0A41,
-  umonospace: 0xFF55,
-  underscore: 0x005F,
-  underscoredbl: 0x2017,
-  underscoremonospace: 0xFF3F,
-  underscorevertical: 0xFE33,
-  underscorewavy: 0xFE4F,
-  union: 0x222A,
-  universal: 0x2200,
-  uogonek: 0x0173,
-  uparen: 0x24B0,
-  upblock: 0x2580,
-  upperdothebrew: 0x05C4,
-  upsilon: 0x03C5,
-  upsilondieresis: 0x03CB,
-  upsilondieresistonos: 0x03B0,
-  upsilonlatin: 0x028A,
-  upsilontonos: 0x03CD,
-  uptackbelowcmb: 0x031D,
-  uptackmod: 0x02D4,
-  uragurmukhi: 0x0A73,
-  uring: 0x016F,
-  ushortcyrillic: 0x045E,
-  usmallhiragana: 0x3045,
-  usmallkatakana: 0x30A5,
-  usmallkatakanahalfwidth: 0xFF69,
-  ustraightcyrillic: 0x04AF,
-  ustraightstrokecyrillic: 0x04B1,
-  utilde: 0x0169,
-  utildeacute: 0x1E79,
-  utildebelow: 0x1E75,
-  uubengali: 0x098A,
-  uudeva: 0x090A,
-  uugujarati: 0x0A8A,
-  uugurmukhi: 0x0A0A,
-  uumatragurmukhi: 0x0A42,
-  uuvowelsignbengali: 0x09C2,
-  uuvowelsigndeva: 0x0942,
-  uuvowelsigngujarati: 0x0AC2,
-  uvowelsignbengali: 0x09C1,
-  uvowelsigndeva: 0x0941,
-  uvowelsigngujarati: 0x0AC1,
-  v: 0x0076,
-  vadeva: 0x0935,
-  vagujarati: 0x0AB5,
-  vagurmukhi: 0x0A35,
-  vakatakana: 0x30F7,
-  vav: 0x05D5,
-  vavdagesh: 0xFB35,
-  vavdagesh65: 0xFB35,
-  vavdageshhebrew: 0xFB35,
-  vavhebrew: 0x05D5,
-  vavholam: 0xFB4B,
-  vavholamhebrew: 0xFB4B,
-  vavvavhebrew: 0x05F0,
-  vavyodhebrew: 0x05F1,
-  vcircle: 0x24E5,
-  vdotbelow: 0x1E7F,
-  vecyrillic: 0x0432,
-  veharabic: 0x06A4,
-  vehfinalarabic: 0xFB6B,
-  vehinitialarabic: 0xFB6C,
-  vehmedialarabic: 0xFB6D,
-  vekatakana: 0x30F9,
-  venus: 0x2640,
-  verticalbar: 0x007C,
-  verticallineabovecmb: 0x030D,
-  verticallinebelowcmb: 0x0329,
-  verticallinelowmod: 0x02CC,
-  verticallinemod: 0x02C8,
-  vewarmenian: 0x057E,
-  vhook: 0x028B,
-  vikatakana: 0x30F8,
-  viramabengali: 0x09CD,
-  viramadeva: 0x094D,
-  viramagujarati: 0x0ACD,
-  visargabengali: 0x0983,
-  visargadeva: 0x0903,
-  visargagujarati: 0x0A83,
-  vmonospace: 0xFF56,
-  voarmenian: 0x0578,
-  voicediterationhiragana: 0x309E,
-  voicediterationkatakana: 0x30FE,
-  voicedmarkkana: 0x309B,
-  voicedmarkkanahalfwidth: 0xFF9E,
-  vokatakana: 0x30FA,
-  vparen: 0x24B1,
-  vtilde: 0x1E7D,
-  vturned: 0x028C,
-  vuhiragana: 0x3094,
-  vukatakana: 0x30F4,
-  w: 0x0077,
-  wacute: 0x1E83,
-  waekorean: 0x3159,
-  wahiragana: 0x308F,
-  wakatakana: 0x30EF,
-  wakatakanahalfwidth: 0xFF9C,
-  wakorean: 0x3158,
-  wasmallhiragana: 0x308E,
-  wasmallkatakana: 0x30EE,
-  wattosquare: 0x3357,
-  wavedash: 0x301C,
-  wavyunderscorevertical: 0xFE34,
-  wawarabic: 0x0648,
-  wawfinalarabic: 0xFEEE,
-  wawhamzaabovearabic: 0x0624,
-  wawhamzaabovefinalarabic: 0xFE86,
-  wbsquare: 0x33DD,
-  wcircle: 0x24E6,
-  wcircumflex: 0x0175,
-  wdieresis: 0x1E85,
-  wdotaccent: 0x1E87,
-  wdotbelow: 0x1E89,
-  wehiragana: 0x3091,
-  weierstrass: 0x2118,
-  wekatakana: 0x30F1,
-  wekorean: 0x315E,
-  weokorean: 0x315D,
-  wgrave: 0x1E81,
-  whitebullet: 0x25E6,
-  whitecircle: 0x25CB,
-  whitecircleinverse: 0x25D9,
-  whitecornerbracketleft: 0x300E,
-  whitecornerbracketleftvertical: 0xFE43,
-  whitecornerbracketright: 0x300F,
-  whitecornerbracketrightvertical: 0xFE44,
-  whitediamond: 0x25C7,
-  whitediamondcontainingblacksmalldiamond: 0x25C8,
-  whitedownpointingsmalltriangle: 0x25BF,
-  whitedownpointingtriangle: 0x25BD,
-  whiteleftpointingsmalltriangle: 0x25C3,
-  whiteleftpointingtriangle: 0x25C1,
-  whitelenticularbracketleft: 0x3016,
-  whitelenticularbracketright: 0x3017,
-  whiterightpointingsmalltriangle: 0x25B9,
-  whiterightpointingtriangle: 0x25B7,
-  whitesmallsquare: 0x25AB,
-  whitesmilingface: 0x263A,
-  whitesquare: 0x25A1,
-  whitestar: 0x2606,
-  whitetelephone: 0x260F,
-  whitetortoiseshellbracketleft: 0x3018,
-  whitetortoiseshellbracketright: 0x3019,
-  whiteuppointingsmalltriangle: 0x25B5,
-  whiteuppointingtriangle: 0x25B3,
-  wihiragana: 0x3090,
-  wikatakana: 0x30F0,
-  wikorean: 0x315F,
-  wmonospace: 0xFF57,
-  wohiragana: 0x3092,
-  wokatakana: 0x30F2,
-  wokatakanahalfwidth: 0xFF66,
-  won: 0x20A9,
-  wonmonospace: 0xFFE6,
-  wowaenthai: 0x0E27,
-  wparen: 0x24B2,
-  wring: 0x1E98,
-  wsuperior: 0x02B7,
-  wturned: 0x028D,
-  wynn: 0x01BF,
-  x: 0x0078,
-  xabovecmb: 0x033D,
-  xbopomofo: 0x3112,
-  xcircle: 0x24E7,
-  xdieresis: 0x1E8D,
-  xdotaccent: 0x1E8B,
-  xeharmenian: 0x056D,
-  xi: 0x03BE,
-  xmonospace: 0xFF58,
-  xparen: 0x24B3,
-  xsuperior: 0x02E3,
-  y: 0x0079,
-  yaadosquare: 0x334E,
-  yabengali: 0x09AF,
-  yacute: 0x00FD,
-  yadeva: 0x092F,
-  yaekorean: 0x3152,
-  yagujarati: 0x0AAF,
-  yagurmukhi: 0x0A2F,
-  yahiragana: 0x3084,
-  yakatakana: 0x30E4,
-  yakatakanahalfwidth: 0xFF94,
-  yakorean: 0x3151,
-  yamakkanthai: 0x0E4E,
-  yasmallhiragana: 0x3083,
-  yasmallkatakana: 0x30E3,
-  yasmallkatakanahalfwidth: 0xFF6C,
-  yatcyrillic: 0x0463,
-  ycircle: 0x24E8,
-  ycircumflex: 0x0177,
-  ydieresis: 0x00FF,
-  ydotaccent: 0x1E8F,
-  ydotbelow: 0x1EF5,
-  yeharabic: 0x064A,
-  yehbarreearabic: 0x06D2,
-  yehbarreefinalarabic: 0xFBAF,
-  yehfinalarabic: 0xFEF2,
-  yehhamzaabovearabic: 0x0626,
-  yehhamzaabovefinalarabic: 0xFE8A,
-  yehhamzaaboveinitialarabic: 0xFE8B,
-  yehhamzaabovemedialarabic: 0xFE8C,
-  yehinitialarabic: 0xFEF3,
-  yehmedialarabic: 0xFEF4,
-  yehmeeminitialarabic: 0xFCDD,
-  yehmeemisolatedarabic: 0xFC58,
-  yehnoonfinalarabic: 0xFC94,
-  yehthreedotsbelowarabic: 0x06D1,
-  yekorean: 0x3156,
-  yen: 0x00A5,
-  yenmonospace: 0xFFE5,
-  yeokorean: 0x3155,
-  yeorinhieuhkorean: 0x3186,
-  yerahbenyomohebrew: 0x05AA,
-  yerahbenyomolefthebrew: 0x05AA,
-  yericyrillic: 0x044B,
-  yerudieresiscyrillic: 0x04F9,
-  yesieungkorean: 0x3181,
-  yesieungpansioskorean: 0x3183,
-  yesieungsioskorean: 0x3182,
-  yetivhebrew: 0x059A,
-  ygrave: 0x1EF3,
-  yhook: 0x01B4,
-  yhookabove: 0x1EF7,
-  yiarmenian: 0x0575,
-  yicyrillic: 0x0457,
-  yikorean: 0x3162,
-  yinyang: 0x262F,
-  yiwnarmenian: 0x0582,
-  ymonospace: 0xFF59,
-  yod: 0x05D9,
-  yoddagesh: 0xFB39,
-  yoddageshhebrew: 0xFB39,
-  yodhebrew: 0x05D9,
-  yodyodhebrew: 0x05F2,
-  yodyodpatahhebrew: 0xFB1F,
-  yohiragana: 0x3088,
-  yoikorean: 0x3189,
-  yokatakana: 0x30E8,
-  yokatakanahalfwidth: 0xFF96,
-  yokorean: 0x315B,
-  yosmallhiragana: 0x3087,
-  yosmallkatakana: 0x30E7,
-  yosmallkatakanahalfwidth: 0xFF6E,
-  yotgreek: 0x03F3,
-  yoyaekorean: 0x3188,
-  yoyakorean: 0x3187,
-  yoyakthai: 0x0E22,
-  yoyingthai: 0x0E0D,
-  yparen: 0x24B4,
-  ypogegrammeni: 0x037A,
-  ypogegrammenigreekcmb: 0x0345,
-  yr: 0x01A6,
-  yring: 0x1E99,
-  ysuperior: 0x02B8,
-  ytilde: 0x1EF9,
-  yturned: 0x028E,
-  yuhiragana: 0x3086,
-  yuikorean: 0x318C,
-  yukatakana: 0x30E6,
-  yukatakanahalfwidth: 0xFF95,
-  yukorean: 0x3160,
-  yusbigcyrillic: 0x046B,
-  yusbigiotifiedcyrillic: 0x046D,
-  yuslittlecyrillic: 0x0467,
-  yuslittleiotifiedcyrillic: 0x0469,
-  yusmallhiragana: 0x3085,
-  yusmallkatakana: 0x30E5,
-  yusmallkatakanahalfwidth: 0xFF6D,
-  yuyekorean: 0x318B,
-  yuyeokorean: 0x318A,
-  yyabengali: 0x09DF,
-  yyadeva: 0x095F,
-  z: 0x007A,
-  zaarmenian: 0x0566,
-  zacute: 0x017A,
-  zadeva: 0x095B,
-  zagurmukhi: 0x0A5B,
-  zaharabic: 0x0638,
-  zahfinalarabic: 0xFEC6,
-  zahinitialarabic: 0xFEC7,
-  zahiragana: 0x3056,
-  zahmedialarabic: 0xFEC8,
-  zainarabic: 0x0632,
-  zainfinalarabic: 0xFEB0,
-  zakatakana: 0x30B6,
-  zaqefgadolhebrew: 0x0595,
-  zaqefqatanhebrew: 0x0594,
-  zarqahebrew: 0x0598,
-  zayin: 0x05D6,
-  zayindagesh: 0xFB36,
-  zayindageshhebrew: 0xFB36,
-  zayinhebrew: 0x05D6,
-  zbopomofo: 0x3117,
-  zcaron: 0x017E,
-  zcircle: 0x24E9,
-  zcircumflex: 0x1E91,
-  zcurl: 0x0291,
-  zdot: 0x017C,
-  zdotaccent: 0x017C,
-  zdotbelow: 0x1E93,
-  zecyrillic: 0x0437,
-  zedescendercyrillic: 0x0499,
-  zedieresiscyrillic: 0x04DF,
-  zehiragana: 0x305C,
-  zekatakana: 0x30BC,
-  zero: 0x0030,
-  zeroarabic: 0x0660,
-  zerobengali: 0x09E6,
-  zerodeva: 0x0966,
-  zerogujarati: 0x0AE6,
-  zerogurmukhi: 0x0A66,
-  zerohackarabic: 0x0660,
-  zeroinferior: 0x2080,
-  zeromonospace: 0xFF10,
-  zerooldstyle: 0xF730,
-  zeropersian: 0x06F0,
-  zerosuperior: 0x2070,
-  zerothai: 0x0E50,
-  zerowidthjoiner: 0xFEFF,
-  zerowidthnonjoiner: 0x200C,
-  zerowidthspace: 0x200B,
-  zeta: 0x03B6,
-  zhbopomofo: 0x3113,
-  zhearmenian: 0x056A,
-  zhebrevecyrillic: 0x04C2,
-  zhecyrillic: 0x0436,
-  zhedescendercyrillic: 0x0497,
-  zhedieresiscyrillic: 0x04DD,
-  zihiragana: 0x3058,
-  zikatakana: 0x30B8,
-  zinorhebrew: 0x05AE,
-  zlinebelow: 0x1E95,
-  zmonospace: 0xFF5A,
-  zohiragana: 0x305E,
-  zokatakana: 0x30BE,
-  zparen: 0x24B5,
-  zretroflexhook: 0x0290,
-  zstroke: 0x01B6,
-  zuhiragana: 0x305A,
-  zukatakana: 0x30BA,
-  '.notdef': 0x0000
-};
-
-
-/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
-
-'use strict';
-
-var PDFImage = (function PDFImageClosure() {
-  /**
-   * Decode the image in the main thread if it supported. Resovles the promise
-   * when the image data is ready.
-   */
-  function handleImageData(handler, xref, res, image, promise) {
-    if (image instanceof JpegStream && image.isNativelyDecodable(xref, res)) {
-      // For natively supported jpegs send them to the main thread for decoding.
-      var dict = image.dict;
-      var colorSpace = dict.get('ColorSpace', 'CS');
-      colorSpace = ColorSpace.parse(colorSpace, xref, res);
-      var numComps = colorSpace.numComps;
-      handler.send('JpegDecode', [image.getIR(), numComps], function(message) {
-        var data = message.data;
-        var stream = new Stream(data, 0, data.length, image.dict);
-        promise.resolve(stream);
-      });
-    } else {
-      promise.resolve(image);
-    }
-  }
-  /**
-   * Decode and clamp a value. The formula is different from the spec because we
-   * don't decode to float range [0,1], we decode it in the [0,max] range.
-   */
-  function decodeAndClamp(value, addend, coefficient, max) {
-    value = addend + value * coefficient;
-    // Clamp the value to the range
-    return value < 0 ? 0 : value > max ? max : value;
-  }
-  function PDFImage(xref, res, image, inline, smask) {
-    this.image = image;
-    if (image.getParams) {
-      // JPX/JPEG2000 streams directly contain bits per component
-      // and color space mode information.
-      TODO('get params from actual stream');
-      // var bits = ...
-      // var colorspace = ...
-    }
-    // TODO cache rendered images?
-
-    var dict = image.dict;
-    this.width = dict.get('Width', 'W');
-    this.height = dict.get('Height', 'H');
-
-    if (this.width < 1 || this.height < 1)
-      error('Invalid image width: ' + this.width + ' or height: ' +
-            this.height);
-
-    this.interpolate = dict.get('Interpolate', 'I') || false;
-    this.imageMask = dict.get('ImageMask', 'IM') || false;
-
-    var bitsPerComponent = image.bitsPerComponent;
-    if (!bitsPerComponent) {
-      bitsPerComponent = dict.get('BitsPerComponent', 'BPC');
-      if (!bitsPerComponent) {
-        if (this.imageMask)
-          bitsPerComponent = 1;
-        else
-          error('Bits per component missing in image: ' + this.imageMask);
-      }
-    }
-    this.bpc = bitsPerComponent;
-
-    if (!this.imageMask) {
-      var colorSpace = dict.get('ColorSpace', 'CS');
-      if (!colorSpace) {
-        TODO('JPX images (which don"t require color spaces');
-        colorSpace = new Name('DeviceRGB');
-      }
-      this.colorSpace = ColorSpace.parse(colorSpace, xref, res);
-      this.numComps = this.colorSpace.numComps;
-    }
-
-    this.decode = dict.get('Decode', 'D');
-    this.needsDecode = false;
-    if (this.decode && this.colorSpace &&
-        !this.colorSpace.isDefaultDecode(this.decode)) {
-      this.needsDecode = true;
-      // Do some preprocessing to avoid more math.
-      var max = (1 << bitsPerComponent) - 1;
-      this.decodeCoefficients = [];
-      this.decodeAddends = [];
-      for (var i = 0, j = 0; i < this.decode.length; i += 2, ++j) {
-        var dmin = this.decode[i];
-        var dmax = this.decode[i + 1];
-        this.decodeCoefficients[j] = dmax - dmin;
-        this.decodeAddends[j] = max * dmin;
-      }
-    }
-
-    var mask = dict.get('Mask');
-
-    if (mask) {
-      TODO('masked images');
-    } else if (smask) {
-      this.smask = new PDFImage(xref, res, smask, false);
-    }
-  }
-  /**
-   * Handles processing of image data and calls the callback with an argument
-   * of a PDFImage when the image is ready to be used.
-   */
-  PDFImage.buildImage = function PDFImage_buildImage(callback, handler, xref,
-                                                     res, image, inline) {
-    var imageDataPromise = new Promise();
-    var smaskPromise = new Promise();
-    // The image data and smask data may not be ready yet, wait till both are
-    // resolved.
-    Promise.all([imageDataPromise, smaskPromise]).then(function(results) {
-      var imageData = results[0], smaskData = results[1];
-      var image = new PDFImage(xref, res, imageData, inline, smaskData);
-      callback(image);
-    });
-
-    handleImageData(handler, xref, res, image, imageDataPromise);
-
-    var smask = image.dict.get('SMask');
-    if (smask)
-      handleImageData(handler, xref, res, smask, smaskPromise);
-    else
-      smaskPromise.resolve(null);
-  };
-
-  /**
-   * Resize an image using the nearest neighbor algorithm.  Currently only
-   * supports one and three component images.
-   * @param {TypedArray} pixels The original image with one component.
-   * @param {Number} bpc Number of bits per component.
-   * @param {Number} components Number of color components, 1 or 3 is supported.
-   * @param {Number} w1 Original width.
-   * @param {Number} h1 Original height.
-   * @param {Number} w2 New width.
-   * @param {Number} h2 New height.
-   * @return {TypedArray} Resized image data.
-   */
-  PDFImage.resize = function PDFImage_resize(pixels, bpc, components,
-                                             w1, h1, w2, h2) {
-    var length = w2 * h2 * components;
-    var temp = bpc <= 8 ? new Uint8Array(length) :
-        bpc <= 16 ? new Uint16Array(length) : new Uint32Array(length);
-    var xRatio = w1 / w2;
-    var yRatio = h1 / h2;
-    var px, py, newIndex, oldIndex;
-    for (var i = 0; i < h2; i++) {
-      for (var j = 0; j < w2; j++) {
-        px = Math.floor(j * xRatio);
-        py = Math.floor(i * yRatio);
-        newIndex = (i * w2) + j;
-        oldIndex = ((py * w1) + px);
-        if (components === 1) {
-          temp[newIndex] = pixels[oldIndex];
-        } else if (components === 3) {
-          newIndex *= 3;
-          oldIndex *= 3;
-          temp[newIndex] = pixels[oldIndex];
-          temp[newIndex + 1] = pixels[oldIndex + 1];
-          temp[newIndex + 2] = pixels[oldIndex + 2];
-        }
-      }
-    }
-    return temp;
-  };
-
-  PDFImage.prototype = {
-    get drawWidth() {
-      if (!this.smask)
-        return this.width;
-      return Math.max(this.width, this.smask.width);
-    },
-    get drawHeight() {
-      if (!this.smask)
-        return this.height;
-      return Math.max(this.height, this.smask.height);
-    },
-    getComponents: function PDFImage_getComponents(buffer) {
-      var bpc = this.bpc;
-      var needsDecode = this.needsDecode;
-      var decodeMap = this.decode;
-
-      // This image doesn't require any extra work.
-      if (bpc == 8 && !needsDecode)
-        return buffer;
-
-      var bufferLength = buffer.length;
-      var width = this.width;
-      var height = this.height;
-      var numComps = this.numComps;
-
-      var length = width * height * numComps;
-      var bufferPos = 0;
-      var output = bpc <= 8 ? new Uint8Array(length) :
-        bpc <= 16 ? new Uint16Array(length) : new Uint32Array(length);
-      var rowComps = width * numComps;
-      var decodeAddends, decodeCoefficients;
-      if (needsDecode) {
-        decodeAddends = this.decodeAddends;
-        decodeCoefficients = this.decodeCoefficients;
-      }
-      var max = (1 << bpc) - 1;
-
-      if (bpc == 8) {
-        // Optimization for reading 8 bpc images that have a decode.
-        for (var i = 0, ii = length; i < ii; ++i) {
-          var compIndex = i % numComps;
-          var value = buffer[i];
-          value = decodeAndClamp(value, decodeAddends[compIndex],
-                          decodeCoefficients[compIndex], max);
-          output[i] = value;
-        }
-      } else if (bpc == 1) {
-        // Optimization for reading 1 bpc images.
-        var valueZero = 0, valueOne = 1;
-        if (decodeMap) {
-          valueZero = decodeMap[0] ? 1 : 0;
-          valueOne = decodeMap[1] ? 1 : 0;
-        }
-        var mask = 0;
-        var buf = 0;
-
-        for (var i = 0, ii = length; i < ii; ++i) {
-          if (i % rowComps == 0) {
-            mask = 0;
-            buf = 0;
-          } else {
-            mask >>= 1;
-          }
-
-          if (mask <= 0) {
-            buf = buffer[bufferPos++];
-            mask = 128;
-          }
-
-          output[i] = !(buf & mask) ? valueZero : valueOne;
-        }
-      } else {
-        // The general case that handles all other bpc values.
-        var bits = 0, buf = 0;
-        for (var i = 0, ii = length; i < ii; ++i) {
-          if (i % rowComps == 0) {
-            buf = 0;
-            bits = 0;
-          }
-
-          while (bits < bpc) {
-            buf = (buf << 8) | buffer[bufferPos++];
-            bits += 8;
-          }
-
-          var remainingBits = bits - bpc;
-          var value = buf >> remainingBits;
-          if (needsDecode) {
-            var compIndex = i % numComps;
-            value = decodeAndClamp(value, decodeAddends[compIndex],
-                            decodeCoefficients[compIndex], max);
-          }
-          output[i] = value;
-          buf = buf & ((1 << remainingBits) - 1);
-          bits = remainingBits;
-        }
-      }
-      return output;
-    },
-    getOpacity: function PDFImage_getOpacity(width, height) {
-      var smask = this.smask;
-      var originalWidth = this.width;
-      var originalHeight = this.height;
-      var buf;
-
-      if (smask) {
-        var sw = smask.width;
-        var sh = smask.height;
-        buf = new Uint8Array(sw * sh);
-        smask.fillGrayBuffer(buf);
-        if (sw != width || sh != height)
-          buf = PDFImage.resize(buf, smask.bps, 1, sw, sh, width, height);
-      } else {
-        buf = new Uint8Array(width * height);
-        for (var i = 0, ii = width * height; i < ii; ++i)
-          buf[i] = 255;
-      }
-      return buf;
-    },
-    applyStencilMask: function PDFImage_applyStencilMask(buffer,
-                                                         inverseDecode) {
-      var width = this.width, height = this.height;
-      var bitStrideLength = (width + 7) >> 3;
-      var imgArray = this.getImageBytes(bitStrideLength * height);
-      var imgArrayPos = 0;
-      var i, j, mask, buf;
-      // removing making non-masked pixels transparent
-      var bufferPos = 3; // alpha component offset
-      for (i = 0; i < height; i++) {
-        mask = 0;
-        for (j = 0; j < width; j++) {
-          if (!mask) {
-            buf = imgArray[imgArrayPos++];
-            mask = 128;
-          }
-          if (!(buf & mask) == inverseDecode) {
-            buffer[bufferPos] = 0;
-          }
-          bufferPos += 4;
-          mask >>= 1;
-        }
-      }
-    },
-    fillRgbaBuffer: function PDFImage_fillRgbaBuffer(buffer, width, height) {
-      var numComps = this.numComps;
-      var originalWidth = this.width;
-      var originalHeight = this.height;
-      var bpc = this.bpc;
-
-      // rows start at byte boundary;
-      var rowBytes = (originalWidth * numComps * bpc + 7) >> 3;
-      var imgArray = this.getImageBytes(originalHeight * rowBytes);
-
-      var comps = this.colorSpace.getRgbBuffer(
-        this.getComponents(imgArray), bpc);
-      if (originalWidth != width || originalHeight != height)
-        comps = PDFImage.resize(comps, this.bpc, 3, originalWidth,
-                                originalHeight, width, height);
-      var compsPos = 0;
-      var opacity = this.getOpacity(width, height);
-      var opacityPos = 0;
-      var length = width * height * 4;
-
-      for (var i = 0; i < length; i += 4) {
-        buffer[i] = comps[compsPos++];
-        buffer[i + 1] = comps[compsPos++];
-        buffer[i + 2] = comps[compsPos++];
-        buffer[i + 3] = opacity[opacityPos++];
-      }
-    },
-    fillGrayBuffer: function PDFImage_fillGrayBuffer(buffer) {
-      var numComps = this.numComps;
-      if (numComps != 1)
-        error('Reading gray scale from a color image: ' + numComps);
-
-      var width = this.width;
-      var height = this.height;
-      var bpc = this.bpc;
-
-      // rows start at byte boundary;
-      var rowBytes = (width * numComps * bpc + 7) >> 3;
-      var imgArray = this.getImageBytes(height * rowBytes);
-
-      var comps = this.getComponents(imgArray);
-      var length = width * height;
-      // we aren't using a colorspace so we need to scale the value
-      var scale = 255 / ((1 << bpc) - 1);
-      for (var i = 0; i < length; ++i)
-        buffer[i] = (scale * comps[i]) | 0;
-    },
-    getImageBytes: function PDFImage_getImageBytes(length) {
-      this.image.reset();
-      return this.image.getBytes(length);
-    }
-  };
-  return PDFImage;
-})();
-
-function loadJpegStream(id, imageData, objs) {
-  var img = new Image();
-  img.onload = (function loadJpegStream_onloadClosure() {
-    objs.resolve(id, img);
-  });
-  img.src = 'data:image/jpeg;base64,' + window.btoa(imageData);
-}
-
-
-/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
-
-'use strict';
-
-// The Metrics object contains glyph widths (in glyph space units).
-// As per PDF spec, for most fonts (Type 3 being an exception) a glyph
-// space unit corresponds to 1/1000th of text space unit.
-var Metrics = {
-  'Courier': 600,
-  'Courier-Bold': 600,
-  'Courier-BoldOblique': 600,
-  'Courier-Oblique': 600,
-  'Helvetica' : {
-    'space': 278,
-    'exclam': 278,
-    'quotedbl': 355,
-    'numbersign': 556,
-    'dollar': 556,
-    'percent': 889,
-    'ampersand': 667,
-    'quoteright': 222,
-    'parenleft': 333,
-    'parenright': 333,
-    'asterisk': 389,
-    'plus': 584,
-    'comma': 278,
-    'hyphen': 333,
-    'period': 278,
-    'slash': 278,
-    'zero': 556,
-    'one': 556,
-    'two': 556,
-    'three': 556,
-    'four': 556,
-    'five': 556,
-    'six': 556,
-    'seven': 556,
-    'eight': 556,
-    'nine': 556,
-    'colon': 278,
-    'semicolon': 278,
-    'less': 584,
-    'equal': 584,
-    'greater': 584,
-    'question': 556,
-    'at': 1015,
-    'A': 667,
-    'B': 667,
-    'C': 722,
-    'D': 722,
-    'E': 667,
-    'F': 611,
-    'G': 778,
-    'H': 722,
-    'I': 278,
-    'J': 500,
-    'K': 667,
-    'L': 556,
-    'M': 833,
-    'N': 722,
-    'O': 778,
-    'P': 667,
-    'Q': 778,
-    'R': 722,
-    'S': 667,
-    'T': 611,
-    'U': 722,
-    'V': 667,
-    'W': 944,
-    'X': 667,
-    'Y': 667,
-    'Z': 611,
-    'bracketleft': 278,
-    'backslash': 278,
-    'bracketright': 278,
-    'asciicircum': 469,
-    'underscore': 556,
-    'quoteleft': 222,
-    'a': 556,
-    'b': 556,
-    'c': 500,
-    'd': 556,
-    'e': 556,
-    'f': 278,
-    'g': 556,
-    'h': 556,
-    'i': 222,
-    'j': 222,
-    'k': 500,
-    'l': 222,
-    'm': 833,
-    'n': 556,
-    'o': 556,
-    'p': 556,
-    'q': 556,
-    'r': 333,
-    's': 500,
-    't': 278,
-    'u': 556,
-    'v': 500,
-    'w': 722,
-    'x': 500,
-    'y': 500,
-    'z': 500,
-    'braceleft': 334,
-    'bar': 260,
-    'braceright': 334,
-    'asciitilde': 584,
-    'exclamdown': 333,
-    'cent': 556,
-    'sterling': 556,
-    'fraction': 167,
-    'yen': 556,
-    'florin': 556,
-    'section': 556,
-    'currency': 556,
-    'quotesingle': 191,
-    'quotedblleft': 333,
-    'guillemotleft': 556,
-    'guilsinglleft': 333,
-    'guilsinglright': 333,
-    'fi': 500,
-    'fl': 500,
-    'endash': 556,
-    'dagger': 556,
-    'daggerdbl': 556,
-    'periodcentered': 278,
-    'paragraph': 537,
-    'bullet': 350,
-    'quotesinglbase': 222,
-    'quotedblbase': 333,
-    'quotedblright': 333,
-    'guillemotright': 556,
-    'ellipsis': 1000,
-    'perthousand': 1000,
-    'questiondown': 611,
-    'grave': 333,
-    'acute': 333,
-    'circumflex': 333,
-    'tilde': 333,
-    'macron': 333,
-    'breve': 333,
-    'dotaccent': 333,
-    'dieresis': 333,
-    'ring': 333,
-    'cedilla': 333,
-    'hungarumlaut': 333,
-    'ogonek': 333,
-    'caron': 333,
-    'emdash': 1000,
-    'AE': 1000,
-    'ordfeminine': 370,
-    'Lslash': 556,
-    'Oslash': 778,
-    'OE': 1000,
-    'ordmasculine': 365,
-    'ae': 889,
-    'dotlessi': 278,
-    'lslash': 222,
-    'oslash': 611,
-    'oe': 944,
-    'germandbls': 611,
-    'Idieresis': 278,
-    'eacute': 556,
-    'abreve': 556,
-    'uhungarumlaut': 556,
-    'ecaron': 556,
-    'Ydieresis': 667,
-    'divide': 584,
-    'Yacute': 667,
-    'Acircumflex': 667,
-    'aacute': 556,
-    'Ucircumflex': 722,
-    'yacute': 500,
-    'scommaaccent': 500,
-    'ecircumflex': 556,
-    'Uring': 722,
-    'Udieresis': 722,
-    'aogonek': 556,
-    'Uacute': 722,
-    'uogonek': 556,
-    'Edieresis': 667,
-    'Dcroat': 722,
-    'commaaccent': 250,
-    'copyright': 737,
-    'Emacron': 667,
-    'ccaron': 500,
-    'aring': 556,
-    'Ncommaaccent': 722,
-    'lacute': 222,
-    'agrave': 556,
-    'Tcommaaccent': 611,
-    'Cacute': 722,
-    'atilde': 556,
-    'Edotaccent': 667,
-    'scaron': 500,
-    'scedilla': 500,
-    'iacute': 278,
-    'lozenge': 471,
-    'Rcaron': 722,
-    'Gcommaaccent': 778,
-    'ucircumflex': 556,
-    'acircumflex': 556,
-    'Amacron': 667,
-    'rcaron': 333,
-    'ccedilla': 500,
-    'Zdotaccent': 611,
-    'Thorn': 667,
-    'Omacron': 778,
-    'Racute': 722,
-    'Sacute': 667,
-    'dcaron': 643,
-    'Umacron': 722,
-    'uring': 556,
-    'threesuperior': 333,
-    'Ograve': 778,
-    'Agrave': 667,
-    'Abreve': 667,
-    'multiply': 584,
-    'uacute': 556,
-    'Tcaron': 611,
-    'partialdiff': 476,
-    'ydieresis': 500,
-    'Nacute': 722,
-    'icircumflex': 278,
-    'Ecircumflex': 667,
-    'adieresis': 556,
-    'edieresis': 556,
-    'cacute': 500,
-    'nacute': 556,
-    'umacron': 556,
-    'Ncaron': 722,
-    'Iacute': 278,
-    'plusminus': 584,
-    'brokenbar': 260,
-    'registered': 737,
-    'Gbreve': 778,
-    'Idotaccent': 278,
-    'summation': 600,
-    'Egrave': 667,
-    'racute': 333,
-    'omacron': 556,
-    'Zacute': 611,
-    'Zcaron': 611,
-    'greaterequal': 549,
-    'Eth': 722,
-    'Ccedilla': 722,
-    'lcommaaccent': 222,
-    'tcaron': 317,
-    'eogonek': 556,
-    'Uogonek': 722,
-    'Aacute': 667,
-    'Adieresis': 667,
-    'egrave': 556,
-    'zacute': 500,
-    'iogonek': 222,
-    'Oacute': 778,
-    'oacute': 556,
-    'amacron': 556,
-    'sacute': 500,
-    'idieresis': 278,
-    'Ocircumflex': 778,
-    'Ugrave': 722,
-    'Delta': 612,
-    'thorn': 556,
-    'twosuperior': 333,
-    'Odieresis': 778,
-    'mu': 556,
-    'igrave': 278,
-    'ohungarumlaut': 556,
-    'Eogonek': 667,
-    'dcroat': 556,
-    'threequarters': 834,
-    'Scedilla': 667,
-    'lcaron': 299,
-    'Kcommaaccent': 667,
-    'Lacute': 556,
-    'trademark': 1000,
-    'edotaccent': 556,
-    'Igrave': 278,
-    'Imacron': 278,
-    'Lcaron': 556,
-    'onehalf': 834,
-    'lessequal': 549,
-    'ocircumflex': 556,
-    'ntilde': 556,
-    'Uhungarumlaut': 722,
-    'Eacute': 667,
-    'emacron': 556,
-    'gbreve': 556,
-    'onequarter': 834,
-    'Scaron': 667,
-    'Scommaaccent': 667,
-    'Ohungarumlaut': 778,
-    'degree': 400,
-    'ograve': 556,
-    'Ccaron': 722,
-    'ugrave': 556,
-    'radical': 453,
-    'Dcaron': 722,
-    'rcommaaccent': 333,
-    'Ntilde': 722,
-    'otilde': 556,
-    'Rcommaaccent': 722,
-    'Lcommaaccent': 556,
-    'Atilde': 667,
-    'Aogonek': 667,
-    'Aring': 667,
-    'Otilde': 778,
-    'zdotaccent': 500,
-    'Ecaron': 667,
-    'Iogonek': 278,
-    'kcommaaccent': 500,
-    'minus': 584,
-    'Icircumflex': 278,
-    'ncaron': 556,
-    'tcommaaccent': 278,
-    'logicalnot': 584,
-    'odieresis': 556,
-    'udieresis': 556,
-    'notequal': 549,
-    'gcommaaccent': 556,
-    'eth': 556,
-    'zcaron': 500,
-    'ncommaaccent': 556,
-    'onesuperior': 333,
-    'imacron': 278,
-    'Euro': 556
-  },
-  'Helvetica-Bold': {
-    'space': 278,
-    'exclam': 333,
-    'quotedbl': 474,
-    'numbersign': 556,
-    'dollar': 556,
-    'percent': 889,
-    'ampersand': 722,
-    'quoteright': 278,
-    'parenleft': 333,
-    'parenright': 333,
-    'asterisk': 389,
-    'plus': 584,
-    'comma': 278,
-    'hyphen': 333,
-    'period': 278,
-    'slash': 278,
-    'zero': 556,
-    'one': 556,
-    'two': 556,
-    'three': 556,
-    'four': 556,
-    'five': 556,
-    'six': 556,
-    'seven': 556,
-    'eight': 556,
-    'nine': 556,
-    'colon': 333,
-    'semicolon': 333,
-    'less': 584,
-    'equal': 584,
-    'greater': 584,
-    'question': 611,
-    'at': 975,
-    'A': 722,
-    'B': 722,
-    'C': 722,
-    'D': 722,
-    'E': 667,
-    'F': 611,
-    'G': 778,
-    'H': 722,
-    'I': 278,
-    'J': 556,
-    'K': 722,
-    'L': 611,
-    'M': 833,
-    'N': 722,
-    'O': 778,
-    'P': 667,
-    'Q': 778,
-    'R': 722,
-    'S': 667,
-    'T': 611,
-    'U': 722,
-    'V': 667,
-    'W': 944,
-    'X': 667,
-    'Y': 667,
-    'Z': 611,
-    'bracketleft': 333,
-    'backslash': 278,
-    'bracketright': 333,
-    'asciicircum': 584,
-    'underscore': 556,
-    'quoteleft': 278,
-    'a': 556,
-    'b': 611,
-    'c': 556,
-    'd': 611,
-    'e': 556,
-    'f': 333,
-    'g': 611,
-    'h': 611,
-    'i': 278,
-    'j': 278,
-    'k': 556,
-    'l': 278,
-    'm': 889,
-    'n': 611,
-    'o': 611,
-    'p': 611,
-    'q': 611,
-    'r': 389,
-    's': 556,
-    't': 333,
-    'u': 611,
-    'v': 556,
-    'w': 778,
-    'x': 556,
-    'y': 556,
-    'z': 500,
-    'braceleft': 389,
-    'bar': 280,
-    'braceright': 389,
-    'asciitilde': 584,
-    'exclamdown': 333,
-    'cent': 556,
-    'sterling': 556,
-    'fraction': 167,
-    'yen': 556,
-    'florin': 556,
-    'section': 556,
-    'currency': 556,
-    'quotesingle': 238,
-    'quotedblleft': 500,
-    'guillemotleft': 556,
-    'guilsinglleft': 333,
-    'guilsinglright': 333,
-    'fi': 611,
-    'fl': 611,
-    'endash': 556,
-    'dagger': 556,
-    'daggerdbl': 556,
-    'periodcentered': 278,
-    'paragraph': 556,
-    'bullet': 350,
-    'quotesinglbase': 278,
-    'quotedblbase': 500,
-    'quotedblright': 500,
-    'guillemotright': 556,
-    'ellipsis': 1000,
-    'perthousand': 1000,
-    'questiondown': 611,
-    'grave': 333,
-    'acute': 333,
-    'circumflex': 333,
-    'tilde': 333,
-    'macron': 333,
-    'breve': 333,
-    'dotaccent': 333,
-    'dieresis': 333,
-    'ring': 333,
-    'cedilla': 333,
-    'hungarumlaut': 333,
-    'ogonek': 333,
-    'caron': 333,
-    'emdash': 1000,
-    'AE': 1000,
-    'ordfeminine': 370,
-    'Lslash': 611,
-    'Oslash': 778,
-    'OE': 1000,
-    'ordmasculine': 365,
-    'ae': 889,
-    'dotlessi': 278,
-    'lslash': 278,
-    'oslash': 611,
-    'oe': 944,
-    'germandbls': 611,
-    'Idieresis': 278,
-    'eacute': 556,
-    'abreve': 556,
-    'uhungarumlaut': 611,
-    'ecaron': 556,
-    'Ydieresis': 667,
-    'divide': 584,
-    'Yacute': 667,
-    'Acircumflex': 722,
-    'aacute': 556,
-    'Ucircumflex': 722,
-    'yacute': 556,
-    'scommaaccent': 556,
-    'ecircumflex': 556,
-    'Uring': 722,
-    'Udieresis': 722,
-    'aogonek': 556,
-    'Uacute': 722,
-    'uogonek': 611,
-    'Edieresis': 667,
-    'Dcroat': 722,
-    'commaaccent': 250,
-    'copyright': 737,
-    'Emacron': 667,
-    'ccaron': 556,
-    'aring': 556,
-    'Ncommaaccent': 722,
-    'lacute': 278,
-    'agrave': 556,
-    'Tcommaaccent': 611,
-    'Cacute': 722,
-    'atilde': 556,
-    'Edotaccent': 667,
-    'scaron': 556,
-    'scedilla': 556,
-    'iacute': 278,
-    'lozenge': 494,
-    'Rcaron': 722,
-    'Gcommaaccent': 778,
-    'ucircumflex': 611,
-    'acircumflex': 556,
-    'Amacron': 722,
-    'rcaron': 389,
-    'ccedilla': 556,
-    'Zdotaccent': 611,
-    'Thorn': 667,
-    'Omacron': 778,
-    'Racute': 722,
-    'Sacute': 667,
-    'dcaron': 743,
-    'Umacron': 722,
-    'uring': 611,
-    'threesuperior': 333,
-    'Ograve': 778,
-    'Agrave': 722,
-    'Abreve': 722,
-    'multiply': 584,
-    'uacute': 611,
-    'Tcaron': 611,
-    'partialdiff': 494,
-    'ydieresis': 556,
-    'Nacute': 722,
-    'icircumflex': 278,
-    'Ecircumflex': 667,
-    'adieresis': 556,
-    'edieresis': 556,
-    'cacute': 556,
-    'nacute': 611,
-    'umacron': 611,
-    'Ncaron': 722,
-    'Iacute': 278,
-    'plusminus': 584,
-    'brokenbar': 280,
-    'registered': 737,
-    'Gbreve': 778,
-    'Idotaccent': 278,
-    'summation': 600,
-    'Egrave': 667,
-    'racute': 389,
-    'omacron': 611,
-    'Zacute': 611,
-    'Zcaron': 611,
-    'greaterequal': 549,
-    'Eth': 722,
-    'Ccedilla': 722,
-    'lcommaaccent': 278,
-    'tcaron': 389,
-    'eogonek': 556,
-    'Uogonek': 722,
-    'Aacute': 722,
-    'Adieresis': 722,
-    'egrave': 556,
-    'zacute': 500,
-    'iogonek': 278,
-    'Oacute': 778,
-    'oacute': 611,
-    'amacron': 556,
-    'sacute': 556,
-    'idieresis': 278,
-    'Ocircumflex': 778,
-    'Ugrave': 722,
-    'Delta': 612,
-    'thorn': 611,
-    'twosuperior': 333,
-    'Odieresis': 778,
-    'mu': 611,
-    'igrave': 278,
-    'ohungarumlaut': 611,
-    'Eogonek': 667,
-    'dcroat': 611,
-    'threequarters': 834,
-    'Scedilla': 667,
-    'lcaron': 400,
-    'Kcommaaccent': 722,
-    'Lacute': 611,
-    'trademark': 1000,
-    'edotaccent': 556,
-    'Igrave': 278,
-    'Imacron': 278,
-    'Lcaron': 611,
-    'onehalf': 834,
-    'lessequal': 549,
-    'ocircumflex': 611,
-    'ntilde': 611,
-    'Uhungarumlaut': 722,
-    'Eacute': 667,
-    'emacron': 556,
-    'gbreve': 611,
-    'onequarter': 834,
-    'Scaron': 667,
-    'Scommaaccent': 667,
-    'Ohungarumlaut': 778,
-    'degree': 400,
-    'ograve': 611,
-    'Ccaron': 722,
-    'ugrave': 611,
-    'radical': 549,
-    'Dcaron': 722,
-    'rcommaaccent': 389,
-    'Ntilde': 722,
-    'otilde': 611,
-    'Rcommaaccent': 722,
-    'Lcommaaccent': 611,
-    'Atilde': 722,
-    'Aogonek': 722,
-    'Aring': 722,
-    'Otilde': 778,
-    'zdotaccent': 500,
-    'Ecaron': 667,
-    'Iogonek': 278,
-    'kcommaaccent': 556,
-    'minus': 584,
-    'Icircumflex': 278,
-    'ncaron': 611,
-    'tcommaaccent': 333,
-    'logicalnot': 584,
-    'odieresis': 611,
-    'udieresis': 611,
-    'notequal': 549,
-    'gcommaaccent': 611,
-    'eth': 611,
-    'zcaron': 500,
-    'ncommaaccent': 611,
-    'onesuperior': 333,
-    'imacron': 278,
-    'Euro': 556
-  },
-  'Helvetica-BoldOblique': {
-    'space': 278,
-    'exclam': 333,
-    'quotedbl': 474,
-    'numbersign': 556,
-    'dollar': 556,
-    'percent': 889,
-    'ampersand': 722,
-    'quoteright': 278,
-    'parenleft': 333,
-    'parenright': 333,
-    'asterisk': 389,
-    'plus': 584,
-    'comma': 278,
-    'hyphen': 333,
-    'period': 278,
-    'slash': 278,
-    'zero': 556,
-    'one': 556,
-    'two': 556,
-    'three': 556,
-    'four': 556,
-    'five': 556,
-    'six': 556,
-    'seven': 556,
-    'eight': 556,
-    'nine': 556,
-    'colon': 333,
-    'semicolon': 333,
-    'less': 584,
-    'equal': 584,
-    'greater': 584,
-    'question': 611,
-    'at': 975,
-    'A': 722,
-    'B': 722,
-    'C': 722,
-    'D': 722,
-    'E': 667,
-    'F': 611,
-    'G': 778,
-    'H': 722,
-    'I': 278,
-    'J': 556,
-    'K': 722,
-    'L': 611,
-    'M': 833,
-    'N': 722,
-    'O': 778,
-    'P': 667,
-    'Q': 778,
-    'R': 722,
-    'S': 667,
-    'T': 611,
-    'U': 722,
-    'V': 667,
-    'W': 944,
-    'X': 667,
-    'Y': 667,
-    'Z': 611,
-    'bracketleft': 333,
-    'backslash': 278,
-    'bracketright': 333,
-    'asciicircum': 584,
-    'underscore': 556,
-    'quoteleft': 278,
-    'a': 556,
-    'b': 611,
-    'c': 556,
-    'd': 611,
-    'e': 556,
-    'f': 333,
-    'g': 611,
-    'h': 611,
-    'i': 278,
-    'j': 278,
-    'k': 556,
-    'l': 278,
-    'm': 889,
-    'n': 611,
-    'o': 611,
-    'p': 611,
-    'q': 611,
-    'r': 389,
-    's': 556,
-    't': 333,
-    'u': 611,
-    'v': 556,
-    'w': 778,
-    'x': 556,
-    'y': 556,
-    'z': 500,
-    'braceleft': 389,
-    'bar': 280,
-    'braceright': 389,
-    'asciitilde': 584,
-    'exclamdown': 333,
-    'cent': 556,
-    'sterling': 556,
-    'fraction': 167,
-    'yen': 556,
-    'florin': 556,
-    'section': 556,
-    'currency': 556,
-    'quotesingle': 238,
-    'quotedblleft': 500,
-    'guillemotleft': 556,
-    'guilsinglleft': 333,
-    'guilsinglright': 333,
-    'fi': 611,
-    'fl': 611,
-    'endash': 556,
-    'dagger': 556,
-    'daggerdbl': 556,
-    'periodcentered': 278,
-    'paragraph': 556,
-    'bullet': 350,
-    'quotesinglbase': 278,
-    'quotedblbase': 500,
-    'quotedblright': 500,
-    'guillemotright': 556,
-    'ellipsis': 1000,
-    'perthousand': 1000,
-    'questiondown': 611,
-    'grave': 333,
-    'acute': 333,
-    'circumflex': 333,
-    'tilde': 333,
-    'macron': 333,
-    'breve': 333,
-    'dotaccent': 333,
-    'dieresis': 333,
-    'ring': 333,
-    'cedilla': 333,
-    'hungarumlaut': 333,
-    'ogonek': 333,
-    'caron': 333,
-    'emdash': 1000,
-    'AE': 1000,
-    'ordfeminine': 370,
-    'Lslash': 611,
-    'Oslash': 778,
-    'OE': 1000,
-    'ordmasculine': 365,
-    'ae': 889,
-    'dotlessi': 278,
-    'lslash': 278,
-    'oslash': 611,
-    'oe': 944,
-    'germandbls': 611,
-    'Idieresis': 278,
-    'eacute': 556,
-    'abreve': 556,
-    'uhungarumlaut': 611,
-    'ecaron': 556,
-    'Ydieresis': 667,
-    'divide': 584,
-    'Yacute': 667,
-    'Acircumflex': 722,
-    'aacute': 556,
-    'Ucircumflex': 722,
-    'yacute': 556,
-    'scommaaccent': 556,
-    'ecircumflex': 556,
-    'Uring': 722,
-    'Udieresis': 722,
-    'aogonek': 556,
-    'Uacute': 722,
-    'uogonek': 611,
-    'Edieresis': 667,
-    'Dcroat': 722,
-    'commaaccent': 250,
-    'copyright': 737,
-    'Emacron': 667,
-    'ccaron': 556,
-    'aring': 556,
-    'Ncommaaccent': 722,
-    'lacute': 278,
-    'agrave': 556,
-    'Tcommaaccent': 611,
-    'Cacute': 722,
-    'atilde': 556,
-    'Edotaccent': 667,
-    'scaron': 556,
-    'scedilla': 556,
-    'iacute': 278,
-    'lozenge': 494,
-    'Rcaron': 722,
-    'Gcommaaccent': 778,
-    'ucircumflex': 611,
-    'acircumflex': 556,
-    'Amacron': 722,
-    'rcaron': 389,
-    'ccedilla': 556,
-    'Zdotaccent': 611,
-    'Thorn': 667,
-    'Omacron': 778,
-    'Racute': 722,
-    'Sacute': 667,
-    'dcaron': 743,
-    'Umacron': 722,
-    'uring': 611,
-    'threesuperior': 333,
-    'Ograve': 778,
-    'Agrave': 722,
-    'Abreve': 722,
-    'multiply': 584,
-    'uacute': 611,
-    'Tcaron': 611,
-    'partialdiff': 494,
-    'ydieresis': 556,
-    'Nacute': 722,
-    'icircumflex': 278,
-    'Ecircumflex': 667,
-    'adieresis': 556,
-    'edieresis': 556,
-    'cacute': 556,
-    'nacute': 611,
-    'umacron': 611,
-    'Ncaron': 722,
-    'Iacute': 278,
-    'plusminus': 584,
-    'brokenbar': 280,
-    'registered': 737,
-    'Gbreve': 778,
-    'Idotaccent': 278,
-    'summation': 600,
-    'Egrave': 667,
-    'racute': 389,
-    'omacron': 611,
-    'Zacute': 611,
-    'Zcaron': 611,
-    'greaterequal': 549,
-    'Eth': 722,
-    'Ccedilla': 722,
-    'lcommaaccent': 278,
-    'tcaron': 389,
-    'eogonek': 556,
-    'Uogonek': 722,
-    'Aacute': 722,
-    'Adieresis': 722,
-    'egrave': 556,
-    'zacute': 500,
-    'iogonek': 278,
-    'Oacute': 778,
-    'oacute': 611,
-    'amacron': 556,
-    'sacute': 556,
-    'idieresis': 278,
-    'Ocircumflex': 778,
-    'Ugrave': 722,
-    'Delta': 612,
-    'thorn': 611,
-    'twosuperior': 333,
-    'Odieresis': 778,
-    'mu': 611,
-    'igrave': 278,
-    'ohungarumlaut': 611,
-    'Eogonek': 667,
-    'dcroat': 611,
-    'threequarters': 834,
-    'Scedilla': 667,
-    'lcaron': 400,
-    'Kcommaaccent': 722,
-    'Lacute': 611,
-    'trademark': 1000,
-    'edotaccent': 556,
-    'Igrave': 278,
-    'Imacron': 278,
-    'Lcaron': 611,
-    'onehalf': 834,
-    'lessequal': 549,
-    'ocircumflex': 611,
-    'ntilde': 611,
-    'Uhungarumlaut': 722,
-    'Eacute': 667,
-    'emacron': 556,
-    'gbreve': 611,
-    'onequarter': 834,
-    'Scaron': 667,
-    'Scommaaccent': 667,
-    'Ohungarumlaut': 778,
-    'degree': 400,
-    'ograve': 611,
-    'Ccaron': 722,
-    'ugrave': 611,
-    'radical': 549,
-    'Dcaron': 722,
-    'rcommaaccent': 389,
-    'Ntilde': 722,
-    'otilde': 611,
-    'Rcommaaccent': 722,
-    'Lcommaaccent': 611,
-    'Atilde': 722,
-    'Aogonek': 722,
-    'Aring': 722,
-    'Otilde': 778,
-    'zdotaccent': 500,
-    'Ecaron': 667,
-    'Iogonek': 278,
-    'kcommaaccent': 556,
-    'minus': 584,
-    'Icircumflex': 278,
-    'ncaron': 611,
-    'tcommaaccent': 333,
-    'logicalnot': 584,
-    'odieresis': 611,
-    'udieresis': 611,
-    'notequal': 549,
-    'gcommaaccent': 611,
-    'eth': 611,
-    'zcaron': 500,
-    'ncommaaccent': 611,
-    'onesuperior': 333,
-    'imacron': 278,
-    'Euro': 556
-  },
-  'Helvetica-Oblique' : {
-    'space': 278,
-    'exclam': 278,
-    'quotedbl': 355,
-    'numbersign': 556,
-    'dollar': 556,
-    'percent': 889,
-    'ampersand': 667,
-    'quoteright': 222,
-    'parenleft': 333,
-    'parenright': 333,
-    'asterisk': 389,
-    'plus': 584,
-    'comma': 278,
-    'hyphen': 333,
-    'period': 278,
-    'slash': 278,
-    'zero': 556,
-    'one': 556,
-    'two': 556,
-    'three': 556,
-    'four': 556,
-    'five': 556,
-    'six': 556,
-    'seven': 556,
-    'eight': 556,
-    'nine': 556,
-    'colon': 278,
-    'semicolon': 278,
-    'less': 584,
-    'equal': 584,
-    'greater': 584,
-    'question': 556,
-    'at': 1015,
-    'A': 667,
-    'B': 667,
-    'C': 722,
-    'D': 722,
-    'E': 667,
-    'F': 611,
-    'G': 778,
-    'H': 722,
-    'I': 278,
-    'J': 500,
-    'K': 667,
-    'L': 556,
-    'M': 833,
-    'N': 722,
-    'O': 778,
-    'P': 667,
-    'Q': 778,
-    'R': 722,
-    'S': 667,
-    'T': 611,
-    'U': 722,
-    'V': 667,
-    'W': 944,
-    'X': 667,
-    'Y': 667,
-    'Z': 611,
-    'bracketleft': 278,
-    'backslash': 278,
-    'bracketright': 278,
-    'asciicircum': 469,
-    'underscore': 556,
-    'quoteleft': 222,
-    'a': 556,
-    'b': 556,
-    'c': 500,
-    'd': 556,
-    'e': 556,
-    'f': 278,
-    'g': 556,
-    'h': 556,
-    'i': 222,
-    'j': 222,
-    'k': 500,
-    'l': 222,
-    'm': 833,
-    'n': 556,
-    'o': 556,
-    'p': 556,
-    'q': 556,
-    'r': 333,
-    's': 500,
-    't': 278,
-    'u': 556,
-    'v': 500,
-    'w': 722,
-    'x': 500,
-    'y': 500,
-    'z': 500,
-    'braceleft': 334,
-    'bar': 260,
-    'braceright': 334,
-    'asciitilde': 584,
-    'exclamdown': 333,
-    'cent': 556,
-    'sterling': 556,
-    'fraction': 167,
-    'yen': 556,
-    'florin': 556,
-    'section': 556,
-    'currency': 556,
-    'quotesingle': 191,
-    'quotedblleft': 333,
-    'guillemotleft': 556,
-    'guilsinglleft': 333,
-    'guilsinglright': 333,
-    'fi': 500,
-    'fl': 500,
-    'endash': 556,
-    'dagger': 556,
-    'daggerdbl': 556,
-    'periodcentered': 278,
-    'paragraph': 537,
-    'bullet': 350,
-    'quotesinglbase': 222,
-    'quotedblbase': 333,
-    'quotedblright': 333,
-    'guillemotright': 556,
-    'ellipsis': 1000,
-    'perthousand': 1000,
-    'questiondown': 611,
-    'grave': 333,
-    'acute': 333,
-    'circumflex': 333,
-    'tilde': 333,
-    'macron': 333,
-    'breve': 333,
-    'dotaccent': 333,
-    'dieresis': 333,
-    'ring': 333,
-    'cedilla': 333,
-    'hungarumlaut': 333,
-    'ogonek': 333,
-    'caron': 333,
-    'emdash': 1000,
-    'AE': 1000,
-    'ordfeminine': 370,
-    'Lslash': 556,
-    'Oslash': 778,
-    'OE': 1000,
-    'ordmasculine': 365,
-    'ae': 889,
-    'dotlessi': 278,
-    'lslash': 222,
-    'oslash': 611,
-    'oe': 944,
-    'germandbls': 611,
-    'Idieresis': 278,
-    'eacute': 556,
-    'abreve': 556,
-    'uhungarumlaut': 556,
-    'ecaron': 556,
-    'Ydieresis': 667,
-    'divide': 584,
-    'Yacute': 667,
-    'Acircumflex': 667,
-    'aacute': 556,
-    'Ucircumflex': 722,
-    'yacute': 500,
-    'scommaaccent': 500,
-    'ecircumflex': 556,
-    'Uring': 722,
-    'Udieresis': 722,
-    'aogonek': 556,
-    'Uacute': 722,
-    'uogonek': 556,
-    'Edieresis': 667,
-    'Dcroat': 722,
-    'commaaccent': 250,
-    'copyright': 737,
-    'Emacron': 667,
-    'ccaron': 500,
-    'aring': 556,
-    'Ncommaaccent': 722,
-    'lacute': 222,
-    'agrave': 556,
-    'Tcommaaccent': 611,
-    'Cacute': 722,
-    'atilde': 556,
-    'Edotaccent': 667,
-    'scaron': 500,
-    'scedilla': 500,
-    'iacute': 278,
-    'lozenge': 471,
-    'Rcaron': 722,
-    'Gcommaaccent': 778,
-    'ucircumflex': 556,
-    'acircumflex': 556,
-    'Amacron': 667,
-    'rcaron': 333,
-    'ccedilla': 500,
-    'Zdotaccent': 611,
-    'Thorn': 667,
-    'Omacron': 778,
-    'Racute': 722,
-    'Sacute': 667,
-    'dcaron': 643,
-    'Umacron': 722,
-    'uring': 556,
-    'threesuperior': 333,
-    'Ograve': 778,
-    'Agrave': 667,
-    'Abreve': 667,
-    'multiply': 584,
-    'uacute': 556,
-    'Tcaron': 611,
-    'partialdiff': 476,
-    'ydieresis': 500,
-    'Nacute': 722,
-    'icircumflex': 278,
-    'Ecircumflex': 667,
-    'adieresis': 556,
-    'edieresis': 556,
-    'cacute': 500,
-    'nacute': 556,
-    'umacron': 556,
-    'Ncaron': 722,
-    'Iacute': 278,
-    'plusminus': 584,
-    'brokenbar': 260,
-    'registered': 737,
-    'Gbreve': 778,
-    'Idotaccent': 278,
-    'summation': 600,
-    'Egrave': 667,
-    'racute': 333,
-    'omacron': 556,
-    'Zacute': 611,
-    'Zcaron': 611,
-    'greaterequal': 549,
-    'Eth': 722,
-    'Ccedilla': 722,
-    'lcommaaccent': 222,
-    'tcaron': 317,
-    'eogonek': 556,
-    'Uogonek': 722,
-    'Aacute': 667,
-    'Adieresis': 667,
-    'egrave': 556,
-    'zacute': 500,
-    'iogonek': 222,
-    'Oacute': 778,
-    'oacute': 556,
-    'amacron': 556,
-    'sacute': 500,
-    'idieresis': 278,
-    'Ocircumflex': 778,
-    'Ugrave': 722,
-    'Delta': 612,
-    'thorn': 556,
-    'twosuperior': 333,
-    'Odieresis': 778,
-    'mu': 556,
-    'igrave': 278,
-    'ohungarumlaut': 556,
-    'Eogonek': 667,
-    'dcroat': 556,
-    'threequarters': 834,
-    'Scedilla': 667,
-    'lcaron': 299,
-    'Kcommaaccent': 667,
-    'Lacute': 556,
-    'trademark': 1000,
-    'edotaccent': 556,
-    'Igrave': 278,
-    'Imacron': 278,
-    'Lcaron': 556,
-    'onehalf': 834,
-    'lessequal': 549,
-    'ocircumflex': 556,
-    'ntilde': 556,
-    'Uhungarumlaut': 722,
-    'Eacute': 667,
-    'emacron': 556,
-    'gbreve': 556,
-    'onequarter': 834,
-    'Scaron': 667,
-    'Scommaaccent': 667,
-    'Ohungarumlaut': 778,
-    'degree': 400,
-    'ograve': 556,
-    'Ccaron': 722,
-    'ugrave': 556,
-    'radical': 453,
-    'Dcaron': 722,
-    'rcommaaccent': 333,
-    'Ntilde': 722,
-    'otilde': 556,
-    'Rcommaaccent': 722,
-    'Lcommaaccent': 556,
-    'Atilde': 667,
-    'Aogonek': 667,
-    'Aring': 667,
-    'Otilde': 778,
-    'zdotaccent': 500,
-    'Ecaron': 667,
-    'Iogonek': 278,
-    'kcommaaccent': 500,
-    'minus': 584,
-    'Icircumflex': 278,
-    'ncaron': 556,
-    'tcommaaccent': 278,
-    'logicalnot': 584,
-    'odieresis': 556,
-    'udieresis': 556,
-    'notequal': 549,
-    'gcommaaccent': 556,
-    'eth': 556,
-    'zcaron': 500,
-    'ncommaaccent': 556,
-    'onesuperior': 333,
-    'imacron': 278,
-    'Euro': 556
-  },
-  'Symbol': {
-    'space': 250,
-    'exclam': 333,
-    'universal': 713,
-    'numbersign': 500,
-    'existential': 549,
-    'percent': 833,
-    'ampersand': 778,
-    'suchthat': 439,
-    'parenleft': 333,
-    'parenright': 333,
-    'asteriskmath': 500,
-    'plus': 549,
-    'comma': 250,
-    'minus': 549,
-    'period': 250,
-    'slash': 278,
-    'zero': 500,
-    'one': 500,
-    'two': 500,
-    'three': 500,
-    'four': 500,
-    'five': 500,
-    'six': 500,
-    'seven': 500,
-    'eight': 500,
-    'nine': 500,
-    'colon': 278,
-    'semicolon': 278,
-    'less': 549,
-    'equal': 549,
-    'greater': 549,
-    'question': 444,
-    'congruent': 549,
-    'Alpha': 722,
-    'Beta': 667,
-    'Chi': 722,
-    'Delta': 612,
-    'Epsilon': 611,
-    'Phi': 763,
-    'Gamma': 603,
-    'Eta': 722,
-    'Iota': 333,
-    'theta1': 631,
-    'Kappa': 722,
-    'Lambda': 686,
-    'Mu': 889,
-    'Nu': 722,
-    'Omicron': 722,
-    'Pi': 768,
-    'Theta': 741,
-    'Rho': 556,
-    'Sigma': 592,
-    'Tau': 611,
-    'Upsilon': 690,
-    'sigma1': 439,
-    'Omega': 768,
-    'Xi': 645,
-    'Psi': 795,
-    'Zeta': 611,
-    'bracketleft': 333,
-    'therefore': 863,
-    'bracketright': 333,
-    'perpendicular': 658,
-    'underscore': 500,
-    'radicalex': 500,
-    'alpha': 631,
-    'beta': 549,
-    'chi': 549,
-    'delta': 494,
-    'epsilon': 439,
-    'phi': 521,
-    'gamma': 411,
-    'eta': 603,
-    'iota': 329,
-    'phi1': 603,
-    'kappa': 549,
-    'lambda': 549,
-    'mu': 576,
-    'nu': 521,
-    'omicron': 549,
-    'pi': 549,
-    'theta': 521,
-    'rho': 549,
-    'sigma': 603,
-    'tau': 439,
-    'upsilon': 576,
-    'omega1': 713,
-    'omega': 686,
-    'xi': 493,
-    'psi': 686,
-    'zeta': 494,
-    'braceleft': 480,
-    'bar': 200,
-    'braceright': 480,
-    'similar': 549,
-    'Euro': 750,
-    'Upsilon1': 620,
-    'minute': 247,
-    'lessequal': 549,
-    'fraction': 167,
-    'infinity': 713,
-    'florin': 500,
-    'club': 753,
-    'diamond': 753,
-    'heart': 753,
-    'spade': 753,
-    'arrowboth': 1042,
-    'arrowleft': 987,
-    'arrowup': 603,
-    'arrowright': 987,
-    'arrowdown': 603,
-    'degree': 400,
-    'plusminus': 549,
-    'second': 411,
-    'greaterequal': 549,
-    'multiply': 549,
-    'proportional': 713,
-    'partialdiff': 494,
-    'bullet': 460,
-    'divide': 549,
-    'notequal': 549,
-    'equivalence': 549,
-    'approxequal': 549,
-    'ellipsis': 1000,
-    'arrowvertex': 603,
-    'arrowhorizex': 1000,
-    'carriagereturn': 658,
-    'aleph': 823,
-    'Ifraktur': 686,
-    'Rfraktur': 795,
-    'weierstrass': 987,
-    'circlemultiply': 768,
-    'circleplus': 768,
-    'emptyset': 823,
-    'intersection': 768,
-    'union': 768,
-    'propersuperset': 713,
-    'reflexsuperset': 713,
-    'notsubset': 713,
-    'propersubset': 713,
-    'reflexsubset': 713,
-    'element': 713,
-    'notelement': 713,
-    'angle': 768,
-    'gradient': 713,
-    'registerserif': 790,
-    'copyrightserif': 790,
-    'trademarkserif': 890,
-    'product': 823,
-    'radical': 549,
-    'dotmath': 250,
-    'logicalnot': 713,
-    'logicaland': 603,
-    'logicalor': 603,
-    'arrowdblboth': 1042,
-    'arrowdblleft': 987,
-    'arrowdblup': 603,
-    'arrowdblright': 987,
-    'arrowdbldown': 603,
-    'lozenge': 494,
-    'angleleft': 329,
-    'registersans': 790,
-    'copyrightsans': 790,
-    'trademarksans': 786,
-    'summation': 713,
-    'parenlefttp': 384,
-    'parenleftex': 384,
-    'parenleftbt': 384,
-    'bracketlefttp': 384,
-    'bracketleftex': 384,
-    'bracketleftbt': 384,
-    'bracelefttp': 494,
-    'braceleftmid': 494,
-    'braceleftbt': 494,
-    'braceex': 494,
-    'angleright': 329,
-    'integral': 274,
-    'integraltp': 686,
-    'integralex': 686,
-    'integralbt': 686,
-    'parenrighttp': 384,
-    'parenrightex': 384,
-    'parenrightbt': 384,
-    'bracketrighttp': 384,
-    'bracketrightex': 384,
-    'bracketrightbt': 384,
-    'bracerighttp': 494,
-    'bracerightmid': 494,
-    'bracerightbt': 494,
-    'apple': 790
-  },
-  'Times-Roman': {
-    'space': 250,
-    'exclam': 333,
-    'quotedbl': 408,
-    'numbersign': 500,
-    'dollar': 500,
-    'percent': 833,
-    'ampersand': 778,
-    'quoteright': 333,
-    'parenleft': 333,
-    'parenright': 333,
-    'asterisk': 500,
-    'plus': 564,
-    'comma': 250,
-    'hyphen': 333,
-    'period': 250,
-    'slash': 278,
-    'zero': 500,
-    'one': 500,
-    'two': 500,
-    'three': 500,
-    'four': 500,
-    'five': 500,
-    'six': 500,
-    'seven': 500,
-    'eight': 500,
-    'nine': 500,
-    'colon': 278,
-    'semicolon': 278,
-    'less': 564,
-    'equal': 564,
-    'greater': 564,
-    'question': 444,
-    'at': 921,
-    'A': 722,
-    'B': 667,
-    'C': 667,
-    'D': 722,
-    'E': 611,
-    'F': 556,
-    'G': 722,
-    'H': 722,
-    'I': 333,
-    'J': 389,
-    'K': 722,
-    'L': 611,
-    'M': 889,
-    'N': 722,
-    'O': 722,
-    'P': 556,
-    'Q': 722,
-    'R': 667,
-    'S': 556,
-    'T': 611,
-    'U': 722,
-    'V': 722,
-    'W': 944,
-    'X': 722,
-    'Y': 722,
-    'Z': 611,
-    'bracketleft': 333,
-    'backslash': 278,
-    'bracketright': 333,
-    'asciicircum': 469,
-    'underscore': 500,
-    'quoteleft': 333,
-    'a': 444,
-    'b': 500,
-    'c': 444,
-    'd': 500,
-    'e': 444,
-    'f': 333,
-    'g': 500,
-    'h': 500,
-    'i': 278,
-    'j': 278,
-    'k': 500,
-    'l': 278,
-    'm': 778,
-    'n': 500,
-    'o': 500,
-    'p': 500,
-    'q': 500,
-    'r': 333,
-    's': 389,
-    't': 278,
-    'u': 500,
-    'v': 500,
-    'w': 722,
-    'x': 500,
-    'y': 500,
-    'z': 444,
-    'braceleft': 480,
-    'bar': 200,
-    'braceright': 480,
-    'asciitilde': 541,
-    'exclamdown': 333,
-    'cent': 500,
-    'sterling': 500,
-    'fraction': 167,
-    'yen': 500,
-    'florin': 500,
-    'section': 500,
-    'currency': 500,
-    'quotesingle': 180,
-    'quotedblleft': 444,
-    'guillemotleft': 500,
-    'guilsinglleft': 333,
-    'guilsinglright': 333,
-    'fi': 556,
-    'fl': 556,
-    'endash': 500,
-    'dagger': 500,
-    'daggerdbl': 500,
-    'periodcentered': 250,
-    'paragraph': 453,
-    'bullet': 350,
-    'quotesinglbase': 333,
-    'quotedblbase': 444,
-    'quotedblright': 444,
-    'guillemotright': 500,
-    'ellipsis': 1000,
-    'perthousand': 1000,
-    'questiondown': 444,
-    'grave': 333,
-    'acute': 333,
-    'circumflex': 333,
-    'tilde': 333,
-    'macron': 333,
-    'breve': 333,
-    'dotaccent': 333,
-    'dieresis': 333,
-    'ring': 333,
-    'cedilla': 333,
-    'hungarumlaut': 333,
-    'ogonek': 333,
-    'caron': 333,
-    'emdash': 1000,
-    'AE': 889,
-    'ordfeminine': 276,
-    'Lslash': 611,
-    'Oslash': 722,
-    'OE': 889,
-    'ordmasculine': 310,
-    'ae': 667,
-    'dotlessi': 278,
-    'lslash': 278,
-    'oslash': 500,
-    'oe': 722,
-    'germandbls': 500,
-    'Idieresis': 333,
-    'eacute': 444,
-    'abreve': 444,
-    'uhungarumlaut': 500,
-    'ecaron': 444,
-    'Ydieresis': 722,
-    'divide': 564,
-    'Yacute': 722,
-    'Acircumflex': 722,
-    'aacute': 444,
-    'Ucircumflex': 722,
-    'yacute': 500,
-    'scommaaccent': 389,
-    'ecircumflex': 444,
-    'Uring': 722,
-    'Udieresis': 722,
-    'aogonek': 444,
-    'Uacute': 722,
-    'uogonek': 500,
-    'Edieresis': 611,
-    'Dcroat': 722,
-    'commaaccent': 250,
-    'copyright': 760,
-    'Emacron': 611,
-    'ccaron': 444,
-    'aring': 444,
-    'Ncommaaccent': 722,
-    'lacute': 278,
-    'agrave': 444,
-    'Tcommaaccent': 611,
-    'Cacute': 667,
-    'atilde': 444,
-    'Edotaccent': 611,
-    'scaron': 389,
-    'scedilla': 389,
-    'iacute': 278,
-    'lozenge': 471,
-    'Rcaron': 667,
-    'Gcommaaccent': 722,
-    'ucircumflex': 500,
-    'acircumflex': 444,
-    'Amacron': 722,
-    'rcaron': 333,
-    'ccedilla': 444,
-    'Zdotaccent': 611,
-    'Thorn': 556,
-    'Omacron': 722,
-    'Racute': 667,
-    'Sacute': 556,
-    'dcaron': 588,
-    'Umacron': 722,
-    'uring': 500,
-    'threesuperior': 300,
-    'Ograve': 722,
-    'Agrave': 722,
-    'Abreve': 722,
-    'multiply': 564,
-    'uacute': 500,
-    'Tcaron': 611,
-    'partialdiff': 476,
-    'ydieresis': 500,
-    'Nacute': 722,
-    'icircumflex': 278,
-    'Ecircumflex': 611,
-    'adieresis': 444,
-    'edieresis': 444,
-    'cacute': 444,
-    'nacute': 500,
-    'umacron': 500,
-    'Ncaron': 722,
-    'Iacute': 333,
-    'plusminus': 564,
-    'brokenbar': 200,
-    'registered': 760,
-    'Gbreve': 722,
-    'Idotaccent': 333,
-    'summation': 600,
-    'Egrave': 611,
-    'racute': 333,
-    'omacron': 500,
-    'Zacute': 611,
-    'Zcaron': 611,
-    'greaterequal': 549,
-    'Eth': 722,
-    'Ccedilla': 667,
-    'lcommaaccent': 278,
-    'tcaron': 326,
-    'eogonek': 444,
-    'Uogonek': 722,
-    'Aacute': 722,
-    'Adieresis': 722,
-    'egrave': 444,
-    'zacute': 444,
-    'iogonek': 278,
-    'Oacute': 722,
-    'oacute': 500,
-    'amacron': 444,
-    'sacute': 389,
-    'idieresis': 278,
-    'Ocircumflex': 722,
-    'Ugrave': 722,
-    'Delta': 612,
-    'thorn': 500,
-    'twosuperior': 300,
-    'Odieresis': 722,
-    'mu': 500,
-    'igrave': 278,
-    'ohungarumlaut': 500,
-    'Eogonek': 611,
-    'dcroat': 500,
-    'threequarters': 750,
-    'Scedilla': 556,
-    'lcaron': 344,
-    'Kcommaaccent': 722,
-    'Lacute': 611,
-    'trademark': 980,
-    'edotaccent': 444,
-    'Igrave': 333,
-    'Imacron': 333,
-    'Lcaron': 611,
-    'onehalf': 750,
-    'lessequal': 549,
-    'ocircumflex': 500,
-    'ntilde': 500,
-    'Uhungarumlaut': 722,
-    'Eacute': 611,
-    'emacron': 444,
-    'gbreve': 500,
-    'onequarter': 750,
-    'Scaron': 556,
-    'Scommaaccent': 556,
-    'Ohungarumlaut': 722,
-    'degree': 400,
-    'ograve': 500,
-    'Ccaron': 667,
-    'ugrave': 500,
-    'radical': 453,
-    'Dcaron': 722,
-    'rcommaaccent': 333,
-    'Ntilde': 722,
-    'otilde': 500,
-    'Rcommaaccent': 667,
-    'Lcommaaccent': 611,
-    'Atilde': 722,
-    'Aogonek': 722,
-    'Aring': 722,
-    'Otilde': 722,
-    'zdotaccent': 444,
-    'Ecaron': 611,
-    'Iogonek': 333,
-    'kcommaaccent': 500,
-    'minus': 564,
-    'Icircumflex': 333,
-    'ncaron': 500,
-    'tcommaaccent': 278,
-    'logicalnot': 564,
-    'odieresis': 500,
-    'udieresis': 500,
-    'notequal': 549,
-    'gcommaaccent': 500,
-    'eth': 500,
-    'zcaron': 444,
-    'ncommaaccent': 500,
-    'onesuperior': 300,
-    'imacron': 278,
-    'Euro': 500
-  },
-  'Times-Bold': {
-    'space': 250,
-    'exclam': 333,
-    'quotedbl': 555,
-    'numbersign': 500,
-    'dollar': 500,
-    'percent': 1000,
-    'ampersand': 833,
-    'quoteright': 333,
-    'parenleft': 333,
-    'parenright': 333,
-    'asterisk': 500,
-    'plus': 570,
-    'comma': 250,
-    'hyphen': 333,
-    'period': 250,
-    'slash': 278,
-    'zero': 500,
-    'one': 500,
-    'two': 500,
-    'three': 500,
-    'four': 500,
-    'five': 500,
-    'six': 500,
-    'seven': 500,
-    'eight': 500,
-    'nine': 500,
-    'colon': 333,
-    'semicolon': 333,
-    'less': 570,
-    'equal': 570,
-    'greater': 570,
-    'question': 500,
-    'at': 930,
-    'A': 722,
-    'B': 667,
-    'C': 722,
-    'D': 722,
-    'E': 667,
-    'F': 611,
-    'G': 778,
-    'H': 778,
-    'I': 389,
-    'J': 500,
-    'K': 778,
-    'L': 667,
-    'M': 944,
-    'N': 722,
-    'O': 778,
-    'P': 611,
-    'Q': 778,
-    'R': 722,
-    'S': 556,
-    'T': 667,
-    'U': 722,
-    'V': 722,
-    'W': 1000,
-    'X': 722,
-    'Y': 722,
-    'Z': 667,
-    'bracketleft': 333,
-    'backslash': 278,
-    'bracketright': 333,
-    'asciicircum': 581,
-    'underscore': 500,
-    'quoteleft': 333,
-    'a': 500,
-    'b': 556,
-    'c': 444,
-    'd': 556,
-    'e': 444,
-    'f': 333,
-    'g': 500,
-    'h': 556,
-    'i': 278,
-    'j': 333,
-    'k': 556,
-    'l': 278,
-    'm': 833,
-    'n': 556,
-    'o': 500,
-    'p': 556,
-    'q': 556,
-    'r': 444,
-    's': 389,
-    't': 333,
-    'u': 556,
-    'v': 500,
-    'w': 722,
-    'x': 500,
-    'y': 500,
-    'z': 444,
-    'braceleft': 394,
-    'bar': 220,
-    'braceright': 394,
-    'asciitilde': 520,
-    'exclamdown': 333,
-    'cent': 500,
-    'sterling': 500,
-    'fraction': 167,
-    'yen': 500,
-    'florin': 500,
-    'section': 500,
-    'currency': 500,
-    'quotesingle': 278,
-    'quotedblleft': 500,
-    'guillemotleft': 500,
-    'guilsinglleft': 333,
-    'guilsinglright': 333,
-    'fi': 556,
-    'fl': 556,
-    'endash': 500,
-    'dagger': 500,
-    'daggerdbl': 500,
-    'periodcentered': 250,
-    'paragraph': 540,
-    'bullet': 350,
-    'quotesinglbase': 333,
-    'quotedblbase': 500,
-    'quotedblright': 500,
-    'guillemotright': 500,
-    'ellipsis': 1000,
-    'perthousand': 1000,
-    'questiondown': 500,
-    'grave': 333,
-    'acute': 333,
-    'circumflex': 333,
-    'tilde': 333,
-    'macron': 333,
-    'breve': 333,
-    'dotaccent': 333,
-    'dieresis': 333,
-    'ring': 333,
-    'cedilla': 333,
-    'hungarumlaut': 333,
-    'ogonek': 333,
-    'caron': 333,
-    'emdash': 1000,
-    'AE': 1000,
-    'ordfeminine': 300,
-    'Lslash': 667,
-    'Oslash': 778,
-    'OE': 1000,
-    'ordmasculine': 330,
-    'ae': 722,
-    'dotlessi': 278,
-    'lslash': 278,
-    'oslash': 500,
-    'oe': 722,
-    'germandbls': 556,
-    'Idieresis': 389,
-    'eacute': 444,
-    'abreve': 500,
-    'uhungarumlaut': 556,
-    'ecaron': 444,
-    'Ydieresis': 722,
-    'divide': 570,
-    'Yacute': 722,
-    'Acircumflex': 722,
-    'aacute': 500,
-    'Ucircumflex': 722,
-    'yacute': 500,
-    'scommaaccent': 389,
-    'ecircumflex': 444,
-    'Uring': 722,
-    'Udieresis': 722,
-    'aogonek': 500,
-    'Uacute': 722,
-    'uogonek': 556,
-    'Edieresis': 667,
-    'Dcroat': 722,
-    'commaaccent': 250,
-    'copyright': 747,
-    'Emacron': 667,
-    'ccaron': 444,
-    'aring': 500,
-    'Ncommaaccent': 722,
-    'lacute': 278,
-    'agrave': 500,
-    'Tcommaaccent': 667,
-    'Cacute': 722,
-    'atilde': 500,
-    'Edotaccent': 667,
-    'scaron': 389,
-    'scedilla': 389,
-    'iacute': 278,
-    'lozenge': 494,
-    'Rcaron': 722,
-    'Gcommaaccent': 778,
-    'ucircumflex': 556,
-    'acircumflex': 500,
-    'Amacron': 722,
-    'rcaron': 444,
-    'ccedilla': 444,
-    'Zdotaccent': 667,
-    'Thorn': 611,
-    'Omacron': 778,
-    'Racute': 722,
-    'Sacute': 556,
-    'dcaron': 672,
-    'Umacron': 722,
-    'uring': 556,
-    'threesuperior': 300,
-    'Ograve': 778,
-    'Agrave': 722,
-    'Abreve': 722,
-    'multiply': 570,
-    'uacute': 556,
-    'Tcaron': 667,
-    'partialdiff': 494,
-    'ydieresis': 500,
-    'Nacute': 722,
-    'icircumflex': 278,
-    'Ecircumflex': 667,
-    'adieresis': 500,
-    'edieresis': 444,
-    'cacute': 444,
-    'nacute': 556,
-    'umacron': 556,
-    'Ncaron': 722,
-    'Iacute': 389,
-    'plusminus': 570,
-    'brokenbar': 220,
-    'registered': 747,
-    'Gbreve': 778,
-    'Idotaccent': 389,
-    'summation': 600,
-    'Egrave': 667,
-    'racute': 444,
-    'omacron': 500,
-    'Zacute': 667,
-    'Zcaron': 667,
-    'greaterequal': 549,
-    'Eth': 722,
-    'Ccedilla': 722,
-    'lcommaaccent': 278,
-    'tcaron': 416,
-    'eogonek': 444,
-    'Uogonek': 722,
-    'Aacute': 722,
-    'Adieresis': 722,
-    'egrave': 444,
-    'zacute': 444,
-    'iogonek': 278,
-    'Oacute': 778,
-    'oacute': 500,
-    'amacron': 500,
-    'sacute': 389,
-    'idieresis': 278,
-    'Ocircumflex': 778,
-    'Ugrave': 722,
-    'Delta': 612,
-    'thorn': 556,
-    'twosuperior': 300,
-    'Odieresis': 778,
-    'mu': 556,
-    'igrave': 278,
-    'ohungarumlaut': 500,
-    'Eogonek': 667,
-    'dcroat': 556,
-    'threequarters': 750,
-    'Scedilla': 556,
-    'lcaron': 394,
-    'Kcommaaccent': 778,
-    'Lacute': 667,
-    'trademark': 1000,
-    'edotaccent': 444,
-    'Igrave': 389,
-    'Imacron': 389,
-    'Lcaron': 667,
-    'onehalf': 750,
-    'lessequal': 549,
-    'ocircumflex': 500,
-    'ntilde': 556,
-    'Uhungarumlaut': 722,
-    'Eacute': 667,
-    'emacron': 444,
-    'gbreve': 500,
-    'onequarter': 750,
-    'Scaron': 556,
-    'Scommaaccent': 556,
-    'Ohungarumlaut': 778,
-    'degree': 400,
-    'ograve': 500,
-    'Ccaron': 722,
-    'ugrave': 556,
-    'radical': 549,
-    'Dcaron': 722,
-    'rcommaaccent': 444,
-    'Ntilde': 722,
-    'otilde': 500,
-    'Rcommaaccent': 722,
-    'Lcommaaccent': 667,
-    'Atilde': 722,
-    'Aogonek': 722,
-    'Aring': 722,
-    'Otilde': 778,
-    'zdotaccent': 444,
-    'Ecaron': 667,
-    'Iogonek': 389,
-    'kcommaaccent': 556,
-    'minus': 570,
-    'Icircumflex': 389,
-    'ncaron': 556,
-    'tcommaaccent': 333,
-    'logicalnot': 570,
-    'odieresis': 500,
-    'udieresis': 556,
-    'notequal': 549,
-    'gcommaaccent': 500,
-    'eth': 500,
-    'zcaron': 444,
-    'ncommaaccent': 556,
-    'onesuperior': 300,
-    'imacron': 278,
-    'Euro': 500
-  },
-  'Times-BoldItalic': {
-    'space': 250,
-    'exclam': 389,
-    'quotedbl': 555,
-    'numbersign': 500,
-    'dollar': 500,
-    'percent': 833,
-    'ampersand': 778,
-    'quoteright': 333,
-    'parenleft': 333,
-    'parenright': 333,
-    'asterisk': 500,
-    'plus': 570,
-    'comma': 250,
-    'hyphen': 333,
-    'period': 250,
-    'slash': 278,
-    'zero': 500,
-    'one': 500,
-    'two': 500,
-    'three': 500,
-    'four': 500,
-    'five': 500,
-    'six': 500,
-    'seven': 500,
-    'eight': 500,
-    'nine': 500,
-    'colon': 333,
-    'semicolon': 333,
-    'less': 570,
-    'equal': 570,
-    'greater': 570,
-    'question': 500,
-    'at': 832,
-    'A': 667,
-    'B': 667,
-    'C': 667,
-    'D': 722,
-    'E': 667,
-    'F': 667,
-    'G': 722,
-    'H': 778,
-    'I': 389,
-    'J': 500,
-    'K': 667,
-    'L': 611,
-    'M': 889,
-    'N': 722,
-    'O': 722,
-    'P': 611,
-    'Q': 722,
-    'R': 667,
-    'S': 556,
-    'T': 611,
-    'U': 722,
-    'V': 667,
-    'W': 889,
-    'X': 667,
-    'Y': 611,
-    'Z': 611,
-    'bracketleft': 333,
-    'backslash': 278,
-    'bracketright': 333,
-    'asciicircum': 570,
-    'underscore': 500,
-    'quoteleft': 333,
-    'a': 500,
-    'b': 500,
-    'c': 444,
-    'd': 500,
-    'e': 444,
-    'f': 333,
-    'g': 500,
-    'h': 556,
-    'i': 278,
-    'j': 278,
-    'k': 500,
-    'l': 278,
-    'm': 778,
-    'n': 556,
-    'o': 500,
-    'p': 500,
-    'q': 500,
-    'r': 389,
-    's': 389,
-    't': 278,
-    'u': 556,
-    'v': 444,
-    'w': 667,
-    'x': 500,
-    'y': 444,
-    'z': 389,
-    'braceleft': 348,
-    'bar': 220,
-    'braceright': 348,
-    'asciitilde': 570,
-    'exclamdown': 389,
-    'cent': 500,
-    'sterling': 500,
-    'fraction': 167,
-    'yen': 500,
-    'florin': 500,
-    'section': 500,
-    'currency': 500,
-    'quotesingle': 278,
-    'quotedblleft': 500,
-    'guillemotleft': 500,
-    'guilsinglleft': 333,
-    'guilsinglright': 333,
-    'fi': 556,
-    'fl': 556,
-    'endash': 500,
-    'dagger': 500,
-    'daggerdbl': 500,
-    'periodcentered': 250,
-    'paragraph': 500,
-    'bullet': 350,
-    'quotesinglbase': 333,
-    'quotedblbase': 500,
-    'quotedblright': 500,
-    'guillemotright': 500,
-    'ellipsis': 1000,
-    'perthousand': 1000,
-    'questiondown': 500,
-    'grave': 333,
-    'acute': 333,
-    'circumflex': 333,
-    'tilde': 333,
-    'macron': 333,
-    'breve': 333,
-    'dotaccent': 333,
-    'dieresis': 333,
-    'ring': 333,
-    'cedilla': 333,
-    'hungarumlaut': 333,
-    'ogonek': 333,
-    'caron': 333,
-    'emdash': 1000,
-    'AE': 944,
-    'ordfeminine': 266,
-    'Lslash': 611,
-    'Oslash': 722,
-    'OE': 944,
-    'ordmasculine': 300,
-    'ae': 722,
-    'dotlessi': 278,
-    'lslash': 278,
-    'oslash': 500,
-    'oe': 722,
-    'germandbls': 500,
-    'Idieresis': 389,
-    'eacute': 444,
-    'abreve': 500,
-    'uhungarumlaut': 556,
-    'ecaron': 444,
-    'Ydieresis': 611,
-    'divide': 570,
-    'Yacute': 611,
-    'Acircumflex': 667,
-    'aacute': 500,
-    'Ucircumflex': 722,
-    'yacute': 444,
-    'scommaaccent': 389,
-    'ecircumflex': 444,
-    'Uring': 722,
-    'Udieresis': 722,
-    'aogonek': 500,
-    'Uacute': 722,
-    'uogonek': 556,
-    'Edieresis': 667,
-    'Dcroat': 722,
-    'commaaccent': 250,
-    'copyright': 747,
-    'Emacron': 667,
-    'ccaron': 444,
-    'aring': 500,
-    'Ncommaaccent': 722,
-    'lacute': 278,
-    'agrave': 500,
-    'Tcommaaccent': 611,
-    'Cacute': 667,
-    'atilde': 500,
-    'Edotaccent': 667,
-    'scaron': 389,
-    'scedilla': 389,
-    'iacute': 278,
-    'lozenge': 494,
-    'Rcaron': 667,
-    'Gcommaaccent': 722,
-    'ucircumflex': 556,
-    'acircumflex': 500,
-    'Amacron': 667,
-    'rcaron': 389,
-    'ccedilla': 444,
-    'Zdotaccent': 611,
-    'Thorn': 611,
-    'Omacron': 722,
-    'Racute': 667,
-    'Sacute': 556,
-    'dcaron': 608,
-    'Umacron': 722,
-    'uring': 556,
-    'threesuperior': 300,
-    'Ograve': 722,
-    'Agrave': 667,
-    'Abreve': 667,
-    'multiply': 570,
-    'uacute': 556,
-    'Tcaron': 611,
-    'partialdiff': 494,
-    'ydieresis': 444,
-    'Nacute': 722,
-    'icircumflex': 278,
-    'Ecircumflex': 667,
-    'adieresis': 500,
-    'edieresis': 444,
-    'cacute': 444,
-    'nacute': 556,
-    'umacron': 556,
-    'Ncaron': 722,
-    'Iacute': 389,
-    'plusminus': 570,
-    'brokenbar': 220,
-    'registered': 747,
-    'Gbreve': 722,
-    'Idotaccent': 389,
-    'summation': 600,
-    'Egrave': 667,
-    'racute': 389,
-    'omacron': 500,
-    'Zacute': 611,
-    'Zcaron': 611,
-    'greaterequal': 549,
-    'Eth': 722,
-    'Ccedilla': 667,
-    'lcommaaccent': 278,
-    'tcaron': 366,
-    'eogonek': 444,
-    'Uogonek': 722,
-    'Aacute': 667,
-    'Adieresis': 667,
-    'egrave': 444,
-    'zacute': 389,
-    'iogonek': 278,
-    'Oacute': 722,
-    'oacute': 500,
-    'amacron': 500,
-    'sacute': 389,
-    'idieresis': 278,
-    'Ocircumflex': 722,
-    'Ugrave': 722,
-    'Delta': 612,
-    'thorn': 500,
-    'twosuperior': 300,
-    'Odieresis': 722,
-    'mu': 576,
-    'igrave': 278,
-    'ohungarumlaut': 500,
-    'Eogonek': 667,
-    'dcroat': 500,
-    'threequarters': 750,
-    'Scedilla': 556,
-    'lcaron': 382,
-    'Kcommaaccent': 667,
-    'Lacute': 611,
-    'trademark': 1000,
-    'edotaccent': 444,
-    'Igrave': 389,
-    'Imacron': 389,
-    'Lcaron': 611,
-    'onehalf': 750,
-    'lessequal': 549,
-    'ocircumflex': 500,
-    'ntilde': 556,
-    'Uhungarumlaut': 722,
-    'Eacute': 667,
-    'emacron': 444,
-    'gbreve': 500,
-    'onequarter': 750,
-    'Scaron': 556,
-    'Scommaaccent': 556,
-    'Ohungarumlaut': 722,
-    'degree': 400,
-    'ograve': 500,
-    'Ccaron': 667,
-    'ugrave': 556,
-    'radical': 549,
-    'Dcaron': 722,
-    'rcommaaccent': 389,
-    'Ntilde': 722,
-    'otilde': 500,
-    'Rcommaaccent': 667,
-    'Lcommaaccent': 611,
-    'Atilde': 667,
-    'Aogonek': 667,
-    'Aring': 667,
-    'Otilde': 722,
-    'zdotaccent': 389,
-    'Ecaron': 667,
-    'Iogonek': 389,
-    'kcommaaccent': 500,
-    'minus': 606,
-    'Icircumflex': 389,
-    'ncaron': 556,
-    'tcommaaccent': 278,
-    'logicalnot': 606,
-    'odieresis': 500,
-    'udieresis': 556,
-    'notequal': 549,
-    'gcommaaccent': 500,
-    'eth': 500,
-    'zcaron': 389,
-    'ncommaaccent': 556,
-    'onesuperior': 300,
-    'imacron': 278,
-    'Euro': 500
-  },
-  'Times-Italic': {
-    'space': 250,
-    'exclam': 333,
-    'quotedbl': 420,
-    'numbersign': 500,
-    'dollar': 500,
-    'percent': 833,
-    'ampersand': 778,
-    'quoteright': 333,
-    'parenleft': 333,
-    'parenright': 333,
-    'asterisk': 500,
-    'plus': 675,
-    'comma': 250,
-    'hyphen': 333,
-    'period': 250,
-    'slash': 278,
-    'zero': 500,
-    'one': 500,
-    'two': 500,
-    'three': 500,
-    'four': 500,
-    'five': 500,
-    'six': 500,
-    'seven': 500,
-    'eight': 500,
-    'nine': 500,
-    'colon': 333,
-    'semicolon': 333,
-    'less': 675,
-    'equal': 675,
-    'greater': 675,
-    'question': 500,
-    'at': 920,
-    'A': 611,
-    'B': 611,
-    'C': 667,
-    'D': 722,
-    'E': 611,
-    'F': 611,
-    'G': 722,
-    'H': 722,
-    'I': 333,
-    'J': 444,
-    'K': 667,
-    'L': 556,
-    'M': 833,
-    'N': 667,
-    'O': 722,
-    'P': 611,
-    'Q': 722,
-    'R': 611,
-    'S': 500,
-    'T': 556,
-    'U': 722,
-    'V': 611,
-    'W': 833,
-    'X': 611,
-    'Y': 556,
-    'Z': 556,
-    'bracketleft': 389,
-    'backslash': 278,
-    'bracketright': 389,
-    'asciicircum': 422,
-    'underscore': 500,
-    'quoteleft': 333,
-    'a': 500,
-    'b': 500,
-    'c': 444,
-    'd': 500,
-    'e': 444,
-    'f': 278,
-    'g': 500,
-    'h': 500,
-    'i': 278,
-    'j': 278,
-    'k': 444,
-    'l': 278,
-    'm': 722,
-    'n': 500,
-    'o': 500,
-    'p': 500,
-    'q': 500,
-    'r': 389,
-    's': 389,
-    't': 278,
-    'u': 500,
-    'v': 444,
-    'w': 667,
-    'x': 444,
-    'y': 444,
-    'z': 389,
-    'braceleft': 400,
-    'bar': 275,
-    'braceright': 400,
-    'asciitilde': 541,
-    'exclamdown': 389,
-    'cent': 500,
-    'sterling': 500,
-    'fraction': 167,
-    'yen': 500,
-    'florin': 500,
-    'section': 500,
-    'currency': 500,
-    'quotesingle': 214,
-    'quotedblleft': 556,
-    'guillemotleft': 500,
-    'guilsinglleft': 333,
-    'guilsinglright': 333,
-    'fi': 500,
-    'fl': 500,
-    'endash': 500,
-    'dagger': 500,
-    'daggerdbl': 500,
-    'periodcentered': 250,
-    'paragraph': 523,
-    'bullet': 350,
-    'quotesinglbase': 333,
-    'quotedblbase': 556,
-    'quotedblright': 556,
-    'guillemotright': 500,
-    'ellipsis': 889,
-    'perthousand': 1000,
-    'questiondown': 500,
-    'grave': 333,
-    'acute': 333,
-    'circumflex': 333,
-    'tilde': 333,
-    'macron': 333,
-    'breve': 333,
-    'dotaccent': 333,
-    'dieresis': 333,
-    'ring': 333,
-    'cedilla': 333,
-    'hungarumlaut': 333,
-    'ogonek': 333,
-    'caron': 333,
-    'emdash': 889,
-    'AE': 889,
-    'ordfeminine': 276,
-    'Lslash': 556,
-    'Oslash': 722,
-    'OE': 944,
-    'ordmasculine': 310,
-    'ae': 667,
-    'dotlessi': 278,
-    'lslash': 278,
-    'oslash': 500,
-    'oe': 667,
-    'germandbls': 500,
-    'Idieresis': 333,
-    'eacute': 444,
-    'abreve': 500,
-    'uhungarumlaut': 500,
-    'ecaron': 444,
-    'Ydieresis': 556,
-    'divide': 675,
-    'Yacute': 556,
-    'Acircumflex': 611,
-    'aacute': 500,
-    'Ucircumflex': 722,
-    'yacute': 444,
-    'scommaaccent': 389,
-    'ecircumflex': 444,
-    'Uring': 722,
-    'Udieresis': 722,
-    'aogonek': 500,
-    'Uacute': 722,
-    'uogonek': 500,
-    'Edieresis': 611,
-    'Dcroat': 722,
-    'commaaccent': 250,
-    'copyright': 760,
-    'Emacron': 611,
-    'ccaron': 444,
-    'aring': 500,
-    'Ncommaaccent': 667,
-    'lacute': 278,
-    'agrave': 500,
-    'Tcommaaccent': 556,
-    'Cacute': 667,
-    'atilde': 500,
-    'Edotaccent': 611,
-    'scaron': 389,
-    'scedilla': 389,
-    'iacute': 278,
-    'lozenge': 471,
-    'Rcaron': 611,
-    'Gcommaaccent': 722,
-    'ucircumflex': 500,
-    'acircumflex': 500,
-    'Amacron': 611,
-    'rcaron': 389,
-    'ccedilla': 444,
-    'Zdotaccent': 556,
-    'Thorn': 611,
-    'Omacron': 722,
-    'Racute': 611,
-    'Sacute': 500,
-    'dcaron': 544,
-    'Umacron': 722,
-    'uring': 500,
-    'threesuperior': 300,
-    'Ograve': 722,
-    'Agrave': 611,
-    'Abreve': 611,
-    'multiply': 675,
-    'uacute': 500,
-    'Tcaron': 556,
-    'partialdiff': 476,
-    'ydieresis': 444,
-    'Nacute': 667,
-    'icircumflex': 278,
-    'Ecircumflex': 611,
-    'adieresis': 500,
-    'edieresis': 444,
-    'cacute': 444,
-    'nacute': 500,
-    'umacron': 500,
-    'Ncaron': 667,
-    'Iacute': 333,
-    'plusminus': 675,
-    'brokenbar': 275,
-    'registered': 760,
-    'Gbreve': 722,
-    'Idotaccent': 333,
-    'summation': 600,
-    'Egrave': 611,
-    'racute': 389,
-    'omacron': 500,
-    'Zacute': 556,
-    'Zcaron': 556,
-    'greaterequal': 549,
-    'Eth': 722,
-    'Ccedilla': 667,
-    'lcommaaccent': 278,
-    'tcaron': 300,
-    'eogonek': 444,
-    'Uogonek': 722,
-    'Aacute': 611,
-    'Adieresis': 611,
-    'egrave': 444,
-    'zacute': 389,
-    'iogonek': 278,
-    'Oacute': 722,
-    'oacute': 500,
-    'amacron': 500,
-    'sacute': 389,
-    'idieresis': 278,
-    'Ocircumflex': 722,
-    'Ugrave': 722,
-    'Delta': 612,
-    'thorn': 500,
-    'twosuperior': 300,
-    'Odieresis': 722,
-    'mu': 500,
-    'igrave': 278,
-    'ohungarumlaut': 500,
-    'Eogonek': 611,
-    'dcroat': 500,
-    'threequarters': 750,
-    'Scedilla': 500,
-    'lcaron': 300,
-    'Kcommaaccent': 667,
-    'Lacute': 556,
-    'trademark': 980,
-    'edotaccent': 444,
-    'Igrave': 333,
-    'Imacron': 333,
-    'Lcaron': 611,
-    'onehalf': 750,
-    'lessequal': 549,
-    'ocircumflex': 500,
-    'ntilde': 500,
-    'Uhungarumlaut': 722,
-    'Eacute': 611,
-    'emacron': 444,
-    'gbreve': 500,
-    'onequarter': 750,
-    'Scaron': 500,
-    'Scommaaccent': 500,
-    'Ohungarumlaut': 722,
-    'degree': 400,
-    'ograve': 500,
-    'Ccaron': 667,
-    'ugrave': 500,
-    'radical': 453,
-    'Dcaron': 722,
-    'rcommaaccent': 389,
-    'Ntilde': 667,
-    'otilde': 500,
-    'Rcommaaccent': 611,
-    'Lcommaaccent': 556,
-    'Atilde': 611,
-    'Aogonek': 611,
-    'Aring': 611,
-    'Otilde': 722,
-    'zdotaccent': 389,
-    'Ecaron': 611,
-    'Iogonek': 333,
-    'kcommaaccent': 444,
-    'minus': 675,
-    'Icircumflex': 333,
-    'ncaron': 500,
-    'tcommaaccent': 278,
-    'logicalnot': 675,
-    'odieresis': 500,
-    'udieresis': 500,
-    'notequal': 549,
-    'gcommaaccent': 500,
-    'eth': 500,
-    'zcaron': 389,
-    'ncommaaccent': 500,
-    'onesuperior': 300,
-    'imacron': 278,
-    'Euro': 500
-  },
-  'ZapfDingbats': {
-    'space': 278,
-    'a1': 974,
-    'a2': 961,
-    'a202': 974,
-    'a3': 980,
-    'a4': 719,
-    'a5': 789,
-    'a119': 790,
-    'a118': 791,
-    'a117': 690,
-    'a11': 960,
-    'a12': 939,
-    'a13': 549,
-    'a14': 855,
-    'a15': 911,
-    'a16': 933,
-    'a105': 911,
-    'a17': 945,
-    'a18': 974,
-    'a19': 755,
-    'a20': 846,
-    'a21': 762,
-    'a22': 761,
-    'a23': 571,
-    'a24': 677,
-    'a25': 763,
-    'a26': 760,
-    'a27': 759,
-    'a28': 754,
-    'a6': 494,
-    'a7': 552,
-    'a8': 537,
-    'a9': 577,
-    'a10': 692,
-    'a29': 786,
-    'a30': 788,
-    'a31': 788,
-    'a32': 790,
-    'a33': 793,
-    'a34': 794,
-    'a35': 816,
-    'a36': 823,
-    'a37': 789,
-    'a38': 841,
-    'a39': 823,
-    'a40': 833,
-    'a41': 816,
-    'a42': 831,
-    'a43': 923,
-    'a44': 744,
-    'a45': 723,
-    'a46': 749,
-    'a47': 790,
-    'a48': 792,
-    'a49': 695,
-    'a50': 776,
-    'a51': 768,
-    'a52': 792,
-    'a53': 759,
-    'a54': 707,
-    'a55': 708,
-    'a56': 682,
-    'a57': 701,
-    'a58': 826,
-    'a59': 815,
-    'a60': 789,
-    'a61': 789,
-    'a62': 707,
-    'a63': 687,
-    'a64': 696,
-    'a65': 689,
-    'a66': 786,
-    'a67': 787,
-    'a68': 713,
-    'a69': 791,
-    'a70': 785,
-    'a71': 791,
-    'a72': 873,
-    'a73': 761,
-    'a74': 762,
-    'a203': 762,
-    'a75': 759,
-    'a204': 759,
-    'a76': 892,
-    'a77': 892,
-    'a78': 788,
-    'a79': 784,
-    'a81': 438,
-    'a82': 138,
-    'a83': 277,
-    'a84': 415,
-    'a97': 392,
-    'a98': 392,
-    'a99': 668,
-    'a100': 668,
-    'a89': 390,
-    'a90': 390,
-    'a93': 317,
-    'a94': 317,
-    'a91': 276,
-    'a92': 276,
-    'a205': 509,
-    'a85': 509,
-    'a206': 410,
-    'a86': 410,
-    'a87': 234,
-    'a88': 234,
-    'a95': 334,
-    'a96': 334,
-    'a101': 732,
-    'a102': 544,
-    'a103': 544,
-    'a104': 910,
-    'a106': 667,
-    'a107': 760,
-    'a108': 760,
-    'a112': 776,
-    'a111': 595,
-    'a110': 694,
-    'a109': 626,
-    'a120': 788,
-    'a121': 788,
-    'a122': 788,
-    'a123': 788,
-    'a124': 788,
-    'a125': 788,
-    'a126': 788,
-    'a127': 788,
-    'a128': 788,
-    'a129': 788,
-    'a130': 788,
-    'a131': 788,
-    'a132': 788,
-    'a133': 788,
-    'a134': 788,
-    'a135': 788,
-    'a136': 788,
-    'a137': 788,
-    'a138': 788,
-    'a139': 788,
-    'a140': 788,
-    'a141': 788,
-    'a142': 788,
-    'a143': 788,
-    'a144': 788,
-    'a145': 788,
-    'a146': 788,
-    'a147': 788,
-    'a148': 788,
-    'a149': 788,
-    'a150': 788,
-    'a151': 788,
-    'a152': 788,
-    'a153': 788,
-    'a154': 788,
-    'a155': 788,
-    'a156': 788,
-    'a157': 788,
-    'a158': 788,
-    'a159': 788,
-    'a160': 894,
-    'a161': 838,
-    'a163': 1016,
-    'a164': 458,
-    'a196': 748,
-    'a165': 924,
-    'a192': 748,
-    'a166': 918,
-    'a167': 927,
-    'a168': 928,
-    'a169': 928,
-    'a170': 834,
-    'a171': 873,
-    'a172': 828,
-    'a173': 924,
-    'a162': 924,
-    'a174': 917,
-    'a175': 930,
-    'a176': 931,
-    'a177': 463,
-    'a178': 883,
-    'a179': 836,
-    'a193': 836,
-    'a180': 867,
-    'a199': 867,
-    'a181': 696,
-    'a200': 696,
-    'a182': 874,
-    'a201': 874,
-    'a183': 760,
-    'a184': 946,
-    'a197': 771,
-    'a185': 865,
-    'a194': 771,
-    'a198': 888,
-    'a186': 967,
-    'a195': 888,
-    'a187': 831,
-    'a188': 873,
-    'a189': 927,
-    'a190': 970,
-    'a191': 918
-  }
-};
-
-
-/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
-
-'use strict';
-
-var EOF = {};
-
-function isEOF(v) {
-  return v == EOF;
-}
-
-var Parser = (function ParserClosure() {
-  function Parser(lexer, allowStreams, xref) {
-    this.lexer = lexer;
-    this.allowStreams = allowStreams;
-    this.xref = xref;
-    this.inlineImg = 0;
-    this.refill();
-  }
-
-  Parser.prototype = {
-    refill: function Parser_refill() {
-      this.buf1 = this.lexer.getObj();
-      this.buf2 = this.lexer.getObj();
-    },
-    shift: function Parser_shift() {
-      if (isCmd(this.buf2, 'ID')) {
-        this.buf1 = this.buf2;
-        this.buf2 = null;
-        // skip byte after ID
-        this.lexer.skip();
-      } else {
-        this.buf1 = this.buf2;
-        this.buf2 = this.lexer.getObj();
-      }
-    },
-    getObj: function Parser_getObj(cipherTransform) {
-      if (isCmd(this.buf1, 'BI')) { // inline image
-        this.shift();
-        return this.makeInlineImage(cipherTransform);
-      }
-      if (isCmd(this.buf1, '[')) { // array
-        this.shift();
-        var array = [];
-        while (!isCmd(this.buf1, ']') && !isEOF(this.buf1))
-          array.push(this.getObj());
-        if (isEOF(this.buf1))
-          error('End of file inside array');
-        this.shift();
-        return array;
-      }
-      if (isCmd(this.buf1, '<<')) { // dictionary or stream
-        this.shift();
-        var dict = new Dict(this.xref);
-        while (!isCmd(this.buf1, '>>') && !isEOF(this.buf1)) {
-          if (!isName(this.buf1))
-            error('Dictionary key must be a name object');
-
-          var key = this.buf1.name;
-          this.shift();
-          if (isEOF(this.buf1))
-            break;
-          dict.set(key, this.getObj(cipherTransform));
-        }
-        if (isEOF(this.buf1))
-          error('End of file inside dictionary');
-
-        // stream objects are not allowed inside content streams or
-        // object streams
-        if (isCmd(this.buf2, 'stream')) {
-          return this.allowStreams ?
-            this.makeStream(dict, cipherTransform) : dict;
-        }
-        this.shift();
-        return dict;
-      }
-      if (isInt(this.buf1)) { // indirect reference or integer
-        var num = this.buf1;
-        this.shift();
-        if (isInt(this.buf1) && isCmd(this.buf2, 'R')) {
-          var ref = new Ref(num, this.buf1);
-          this.shift();
-          this.shift();
-          return ref;
-        }
-        return num;
-      }
-      if (isString(this.buf1)) { // string
-        var str = this.buf1;
-        this.shift();
-        if (cipherTransform)
-          str = cipherTransform.decryptString(str);
-        return str;
-      }
-
-      // simple object
-      var obj = this.buf1;
-      this.shift();
-      return obj;
-    },
-    makeInlineImage: function Parser_makeInlineImage(cipherTransform) {
-      var lexer = this.lexer;
-      var stream = lexer.stream;
-
-      // parse dictionary
-      var dict = new Dict();
-      while (!isCmd(this.buf1, 'ID') && !isEOF(this.buf1)) {
-        if (!isName(this.buf1))
-          error('Dictionary key must be a name object');
-
-        var key = this.buf1.name;
-        this.shift();
-        if (isEOF(this.buf1))
-          break;
-        dict.set(key, this.getObj(cipherTransform));
-      }
-
-      // parse image stream
-      var startPos = stream.pos;
-
-      // searching for the /EI\s/
-      var state = 0, ch;
-      while (state != 4 && (ch = stream.getByte()) != null) {
-        switch (ch) {
-          case 0x20:
-          case 0x0D:
-          case 0x0A:
-            state = state === 3 ? 4 : 0;
-            break;
-          case 0x45:
-            state = 2;
-            break;
-          case 0x49:
-            state = state === 2 ? 3 : 0;
-            break;
-          default:
-            state = 0;
-            break;
-        }
-      }
-
-      // TODO improve the small images performance to remove the limit
-      var inlineImgLimit = 500;
-      if (++this.inlineImg >= inlineImgLimit) {
-        if (this.inlineImg === inlineImgLimit)
-          warn('Too many inline images');
-        this.shift();
-        return null;
-      }
-
-      var length = (stream.pos - 4) - startPos;
-      var imageStream = stream.makeSubStream(startPos, length, dict);
-      if (cipherTransform)
-        imageStream = cipherTransform.createStream(imageStream);
-      imageStream = this.filter(imageStream, dict, length);
-      imageStream.parameters = dict;
-
-      this.buf2 = Cmd.get('EI');
-      this.shift();
-
-      return imageStream;
-    },
-    fetchIfRef: function Parser_fetchIfRef(obj) {
-      // not relying on the xref.fetchIfRef -- xref might not be set
-      return isRef(obj) ? this.xref.fetch(obj) : obj;
-    },
-    makeStream: function Parser_makeStream(dict, cipherTransform) {
-      var lexer = this.lexer;
-      var stream = lexer.stream;
-
-      // get stream start position
-      lexer.skipToNextLine();
-      var pos = stream.pos;
-
-      // get length
-      var length = this.fetchIfRef(dict.get('Length'));
-      if (!isInt(length))
-        error('Bad ' + length + ' attribute in stream');
-
-      // skip over the stream data
-      stream.pos = pos + length;
-      this.shift(); // '>>'
-      this.shift(); // 'stream'
-      if (!isCmd(this.buf1, 'endstream'))
-        error('Missing endstream');
-      this.shift();
-
-      stream = stream.makeSubStream(pos, length, dict);
-      if (cipherTransform)
-        stream = cipherTransform.createStream(stream);
-      stream = this.filter(stream, dict, length);
-      stream.parameters = dict;
-      return stream;
-    },
-    filter: function Parser_filter(stream, dict, length) {
-      var filter = this.fetchIfRef(dict.get('Filter', 'F'));
-      var params = this.fetchIfRef(dict.get('DecodeParms', 'DP'));
-      if (isName(filter))
-        return this.makeFilter(stream, filter.name, length, params);
-      if (isArray(filter)) {
-        var filterArray = filter;
-        var paramsArray = params;
-        for (var i = 0, ii = filterArray.length; i < ii; ++i) {
-          filter = filterArray[i];
-          if (!isName(filter))
-            error('Bad filter name: ' + filter);
-
-          params = null;
-          if (isArray(paramsArray) && (i in paramsArray))
-            params = paramsArray[i];
-          stream = this.makeFilter(stream, filter.name, length, params);
-          // after the first stream the length variable is invalid
-          length = null;
-        }
-      }
-      return stream;
-    },
-    makeFilter: function Parser_makeFilter(stream, name, length, params) {
-      if (name == 'FlateDecode' || name == 'Fl') {
-        if (params) {
-          return new PredictorStream(new FlateStream(stream), params);
-        }
-        return new FlateStream(stream);
-      }
-      if (name == 'LZWDecode' || name == 'LZW') {
-        var earlyChange = 1;
-        if (params) {
-          if (params.has('EarlyChange'))
-            earlyChange = params.get('EarlyChange');
-          return new PredictorStream(
-            new LZWStream(stream, earlyChange), params);
-        }
-        return new LZWStream(stream, earlyChange);
-      }
-      if (name == 'DCTDecode' || name == 'DCT') {
-        var bytes = stream.getBytes(length);
-        return new JpegStream(bytes, stream.dict, this.xref);
-      }
-      if (name == 'JPXDecode' || name == 'JPX') {
-        var bytes = stream.getBytes(length);
-        return new JpxStream(bytes, stream.dict);
-      }
-      if (name == 'ASCII85Decode' || name == 'A85') {
-        return new Ascii85Stream(stream);
-      }
-      if (name == 'ASCIIHexDecode' || name == 'AHx') {
-        return new AsciiHexStream(stream);
-      }
-      if (name == 'CCITTFaxDecode' || name == 'CCF') {
-        return new CCITTFaxStream(stream, params);
-      }
-      if (name == 'RunLengthDecode' || name == 'RL') {
-        return new RunLengthStream(stream);
-      }
-      if (name == 'JBIG2Decode') {
-        error('JBIG2 image format is not currently supprted.');
-      }
-      warn('filter "' + name + '" not supported yet');
-      return stream;
-    }
-  };
-
-  return Parser;
-})();
-
-var Lexer = (function LexerClosure() {
-  function Lexer(stream, knownCommands) {
-    this.stream = stream;
-    // The PDFs might have "glued" commands with other commands, operands or
-    // literals, e.g. "q1". The knownCommands is a dictionary of the valid
-    // commands and their prefixes. The prefixes are built the following way:
-    // if there a command that is a prefix of the other valid command or
-    // literal (e.g. 'f' and 'false') the following prefixes must be included,
-    // 'fa', 'fal', 'fals'. The prefixes are not needed, if the command has no
-    // other commands or literals as a prefix. The knowCommands is optional.
-    this.knownCommands = knownCommands;
-  }
-
-  Lexer.isSpace = function Lexer_isSpace(ch) {
-    return ch == ' ' || ch == '\t' || ch == '\x0d' || ch == '\x0a';
-  };
-
-  // A '1' in this array means the character is white space.  A '1' or
-  // '2' means the character ends a name or command.
-  var specialChars = [
-    1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 1, 0, 0,   // 0x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   // 1x
-    1, 0, 0, 0, 0, 2, 0, 0, 2, 2, 0, 0, 0, 0, 0, 2,   // 2x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 2, 0,   // 3x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   // 4x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 2, 0, 0,   // 5x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   // 6x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 2, 0, 0,   // 7x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   // 8x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   // 9x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   // ax
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   // bx
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   // cx
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   // dx
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   // ex
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0    // fx
-  ];
-
-  function toHexDigit(ch) {
-    if (ch >= '0' && ch <= '9')
-      return ch.charCodeAt(0) - 48;
-    ch = ch.toUpperCase();
-    if (ch >= 'A' && ch <= 'F')
-      return ch.charCodeAt(0) - 55;
-    return -1;
-  }
-
-  Lexer.prototype = {
-    getNumber: function Lexer_getNumber(ch) {
-      var floating = false;
-      var str = ch;
-      var stream = this.stream;
-      for (;;) {
-        ch = stream.lookChar();
-        if (ch == '.' && !floating) {
-          str += ch;
-          floating = true;
-        } else if (ch == '-') {
-          // ignore minus signs in the middle of numbers to match
-          // Adobe's behavior
-          warn('Badly formated number');
-        } else if (ch >= '0' && ch <= '9') {
-          str += ch;
-        } else if (ch == 'e' || ch == 'E') {
-          floating = true;
-        } else {
-          // the last character doesn't belong to us
-          break;
-        }
-        stream.skip();
-      }
-      var value = parseFloat(str);
-      if (isNaN(value))
-        error('Invalid floating point number: ' + value);
-      return value;
-    },
-    getString: function Lexer_getString() {
-      var numParen = 1;
-      var done = false;
-      var str = '';
-      var stream = this.stream;
-      var ch;
-      do {
-        ch = stream.getChar();
-        switch (ch) {
-          case undefined:
-            warn('Unterminated string');
-            done = true;
-            break;
-          case '(':
-            ++numParen;
-            str += ch;
-            break;
-          case ')':
-            if (--numParen == 0) {
-              done = true;
-            } else {
-              str += ch;
-            }
-            break;
-          case '\\':
-            ch = stream.getChar();
-            switch (ch) {
-              case undefined:
-                warn('Unterminated string');
-                done = true;
-                break;
-              case 'n':
-                str += '\n';
-                break;
-              case 'r':
-                str += '\r';
-                break;
-              case 't':
-                str += '\t';
-                break;
-              case 'b':
-                str += '\b';
-                break;
-              case 'f':
-                str += '\f';
-                break;
-              case '\\':
-              case '(':
-              case ')':
-                str += ch;
-                break;
-              case '0': case '1': case '2': case '3':
-              case '4': case '5': case '6': case '7':
-                var x = ch - '0';
-                ch = stream.lookChar();
-                if (ch >= '0' && ch <= '7') {
-                  stream.skip();
-                  x = (x << 3) + (ch - '0');
-                  ch = stream.lookChar();
-                  if (ch >= '0' && ch <= '7') {
-                    stream.skip();
-                    x = (x << 3) + (ch - '0');
-                  }
-                }
-
-                str += String.fromCharCode(x);
-                break;
-              case '\r':
-                ch = stream.lookChar();
-                if (ch == '\n')
-                  stream.skip();
-                break;
-              case '\n':
-                break;
-              default:
-                str += ch;
-            }
-            break;
-          default:
-            str += ch;
-        }
-      } while (!done);
-      return str;
-    },
-    getName: function Lexer_getName(ch) {
-      var str = '';
-      var stream = this.stream;
-      while (!!(ch = stream.lookChar()) && !specialChars[ch.charCodeAt(0)]) {
-        stream.skip();
-        if (ch == '#') {
-          ch = stream.lookChar();
-          var x = toHexDigit(ch);
-          if (x != -1) {
-            stream.skip();
-            var x2 = toHexDigit(stream.getChar());
-            if (x2 == -1)
-              error('Illegal digit in hex char in name: ' + x2);
-            str += String.fromCharCode((x << 4) | x2);
-          } else {
-            str += '#';
-            str += ch;
-          }
-        } else {
-          str += ch;
-        }
-      }
-      if (str.length > 128)
-        error('Warning: name token is longer than allowed by the spec: ' +
-              str.length);
-      return new Name(str);
-    },
-    getHexString: function Lexer_getHexString(ch) {
-      var str = '';
-      var stream = this.stream;
-      for (;;) {
-        ch = stream.getChar();
-        if (ch == '>') {
-          break;
-        }
-        if (!ch) {
-          warn('Unterminated hex string');
-          break;
-        }
-        if (specialChars[ch.charCodeAt(0)] != 1) {
-          var x, x2;
-          if ((x = toHexDigit(ch)) == -1)
-            error('Illegal character in hex string: ' + ch);
-
-          ch = stream.getChar();
-          while (specialChars[ch.charCodeAt(0)] == 1)
-            ch = stream.getChar();
-
-          if ((x2 = toHexDigit(ch)) == -1)
-            error('Illegal character in hex string: ' + ch);
-
-          str += String.fromCharCode((x << 4) | x2);
-        }
-      }
-      return str;
-    },
-    getObj: function Lexer_getObj() {
-      // skip whitespace and comments
-      var comment = false;
-      var stream = this.stream;
-      var ch;
-      while (true) {
-        if (!(ch = stream.getChar()))
-          return EOF;
-        if (comment) {
-          if (ch == '\r' || ch == '\n')
-            comment = false;
-        } else if (ch == '%') {
-          comment = true;
-        } else if (specialChars[ch.charCodeAt(0)] != 1) {
-          break;
-        }
-      }
-
-      // start reading token
-      switch (ch) {
-        case '0': case '1': case '2': case '3': case '4':
-        case '5': case '6': case '7': case '8': case '9':
-        case '+': case '-': case '.':
-          return this.getNumber(ch);
-        case '(':
-          return this.getString();
-        case '/':
-          return this.getName(ch);
-        // array punctuation
-        case '[':
-        case ']':
-          return Cmd.get(ch);
-        // hex string or dict punctuation
-        case '<':
-          ch = stream.lookChar();
-          if (ch == '<') {
-            // dict punctuation
-            stream.skip();
-            return Cmd.get('<<');
-          }
-          return this.getHexString(ch);
-        // dict punctuation
-        case '>':
-          ch = stream.lookChar();
-          if (ch == '>') {
-            stream.skip();
-            return Cmd.get('>>');
-          }
-        case '{':
-        case '}':
-          return Cmd.get(ch);
-        // fall through
-        case ')':
-          error('Illegal character: ' + ch);
-      }
-
-      // command
-      var str = ch;
-      var knownCommands = this.knownCommands;
-      var knownCommandFound = knownCommands && (str in knownCommands);
-      while (!!(ch = stream.lookChar()) && !specialChars[ch.charCodeAt(0)]) {
-        // stop if known command is found and next character does not make
-        // the str a command
-        if (knownCommandFound && !((str + ch) in knownCommands))
-          break;
-        stream.skip();
-        if (str.length == 128)
-          error('Command token too long: ' + str.length);
-        str += ch;
-        knownCommandFound = knownCommands && (str in knownCommands);
-      }
-      if (str == 'true')
-        return true;
-      if (str == 'false')
-        return false;
-      if (str == 'null')
-        return null;
-      return Cmd.get(str);
-    },
-    skipToNextLine: function Lexer_skipToNextLine() {
-      var stream = this.stream;
-      while (true) {
-        var ch = stream.getChar();
-        if (!ch || ch == '\n')
-          return;
-        if (ch == '\r') {
-          if ((ch = stream.lookChar()) == '\n')
-            stream.skip();
-          return;
-        }
-      }
-    },
-    skip: function Lexer_skip() {
-      this.stream.skip();
-    }
-  };
-
-  return Lexer;
-})();
-
-var Linearization = (function LinearizationClosure() {
-  function Linearization(stream) {
-    this.parser = new Parser(new Lexer(stream), false, null);
-    var obj1 = this.parser.getObj();
-    var obj2 = this.parser.getObj();
-    var obj3 = this.parser.getObj();
-    this.linDict = this.parser.getObj();
-    if (isInt(obj1) && isInt(obj2) && isCmd(obj3, 'obj') &&
-        isDict(this.linDict)) {
-      var obj = this.linDict.get('Linearized');
-      if (!(isNum(obj) && obj > 0))
-        this.linDict = null;
-    }
-  }
-
-  Linearization.prototype = {
-    getInt: function Linearization_getInt(name) {
-      var linDict = this.linDict;
-      var obj;
-      if (isDict(linDict) &&
-          isInt(obj = linDict.get(name)) &&
-          obj > 0) {
-        return obj;
-      }
-      error('"' + name + '" field in linearization table is invalid');
-    },
-    getHint: function Linearization_getHint(index) {
-      var linDict = this.linDict;
-      var obj1, obj2;
-      if (isDict(linDict) &&
-          isArray(obj1 = linDict.get('H')) &&
-          obj1.length >= 2 &&
-          isInt(obj2 = obj1[index]) &&
-          obj2 > 0) {
-        return obj2;
-      }
-      error('Hints table in linearization table is invalid: ' + index);
-    },
-    get length() {
-      if (!isDict(this.linDict))
-        return 0;
-      return this.getInt('L');
-    },
-    get hintsOffset() {
-      return this.getHint(0);
-    },
-    get hintsLength() {
-      return this.getHint(1);
-    },
-    get hintsOffset2() {
-      return this.getHint(2);
-    },
-    get hintsLenth2() {
-      return this.getHint(3);
-    },
-    get objectNumberFirst() {
-      return this.getInt('O');
-    },
-    get endFirst() {
-      return this.getInt('E');
-    },
-    get numPages() {
-      return this.getInt('N');
-    },
-    get mainXRefEntriesOffset() {
-      return this.getInt('T');
-    },
-    get pageFirst() {
-      return this.getInt('P');
-    }
-  };
-
-  return Linearization;
-})();
-
-
-/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
-
-'use strict';
-
-var PatternType = {
-  AXIAL: 2,
-  RADIAL: 3
-};
-
-var Pattern = (function PatternClosure() {
-  // Constructor should define this.getPattern
-  function Pattern() {
-    error('should not call Pattern constructor');
-  }
-
-  Pattern.prototype = {
-    // Input: current Canvas context
-    // Output: the appropriate fillStyle or strokeStyle
-    getPattern: function Pattern_getPattern(ctx) {
-      error('Should not call Pattern.getStyle: ' + ctx);
-    }
-  };
-
-  Pattern.shadingFromIR = function Pattern_shadingFromIR(raw) {
-    return Shadings[raw[0]].fromIR(raw);
-  };
-
-  Pattern.parseShading = function Pattern_parseShading(shading, matrix, xref,
-                                                       res) {
-
-    var dict = isStream(shading) ? shading.dict : shading;
-    var type = dict.get('ShadingType');
-
-    switch (type) {
-      case PatternType.AXIAL:
-      case PatternType.RADIAL:
-        // Both radial and axial shadings are handled by RadialAxial shading.
-        return new Shadings.RadialAxial(dict, matrix, xref, res);
-      default:
-        return new Shadings.Dummy();
-    }
-  };
-  return Pattern;
-})();
-
-var Shadings = {};
-
-// Radial and axial shading have very similar implementations
-// If needed, the implementations can be broken into two classes
-Shadings.RadialAxial = (function RadialAxialClosure() {
-  function RadialAxial(dict, matrix, xref, res, ctx) {
-    this.matrix = matrix;
-    this.coordsArr = dict.get('Coords');
-    this.shadingType = dict.get('ShadingType');
-    this.type = 'Pattern';
-
-    this.ctx = ctx;
-    var cs = dict.get('ColorSpace', 'CS');
-    cs = ColorSpace.parse(cs, xref, res);
-    this.cs = cs;
-
-    var t0 = 0.0, t1 = 1.0;
-    if (dict.has('Domain')) {
-      var domainArr = dict.get('Domain');
-      t0 = domainArr[0];
-      t1 = domainArr[1];
-    }
-
-    var extendStart = false, extendEnd = false;
-    if (dict.has('Extend')) {
-      var extendArr = dict.get('Extend');
-      extendStart = extendArr[0];
-      extendEnd = extendArr[1];
-      TODO('Support extend');
-    }
-
-    this.extendStart = extendStart;
-    this.extendEnd = extendEnd;
-
-    var fnObj = dict.get('Function');
-    if (isArray(fnObj))
-      error('No support for array of functions');
-    if (!isPDFFunction(fnObj))
-      error('Invalid function');
-    var fn = PDFFunction.parse(xref, fnObj);
-
-    // 10 samples seems good enough for now, but probably won't work
-    // if there are sharp color changes. Ideally, we would implement
-    // the spec faithfully and add lossless optimizations.
-    var step = (t1 - t0) / 10;
-    var diff = t1 - t0;
-
-    var colorStops = [];
-    for (var i = t0; i <= t1; i += step) {
-      var rgbColor = cs.getRgb(fn([i]));
-      var cssColor = Util.makeCssRgb(rgbColor[0], rgbColor[1], rgbColor[2]);
-      colorStops.push([(i - t0) / diff, cssColor]);
-    }
-
-    this.colorStops = colorStops;
-  }
-
-  RadialAxial.fromIR = function RadialAxial_fromIR(raw) {
-    var type = raw[1];
-    var colorStops = raw[2];
-    var p0 = raw[3];
-    var p1 = raw[4];
-    var r0 = raw[5];
-    var r1 = raw[6];
-    return {
-      type: 'Pattern',
-      getPattern: function RadialAxial_getPattern(ctx) {
-        var curMatrix = ctx.mozCurrentTransform;
-        if (curMatrix) {
-          var userMatrix = ctx.mozCurrentTransformInverse;
-
-          p0 = Util.applyTransform(p0, curMatrix);
-          p0 = Util.applyTransform(p0, userMatrix);
-
-          p1 = Util.applyTransform(p1, curMatrix);
-          p1 = Util.applyTransform(p1, userMatrix);
-        }
-
-        var grad;
-        if (type == PatternType.AXIAL)
-          grad = ctx.createLinearGradient(p0[0], p0[1], p1[0], p1[1]);
-        else if (type == PatternType.RADIAL)
-          grad = ctx.createRadialGradient(p0[0], p0[1], r0, p1[0], p1[1], r1);
-
-        for (var i = 0, ii = colorStops.length; i < ii; ++i) {
-          var c = colorStops[i];
-          grad.addColorStop(c[0], c[1]);
-        }
-        return grad;
-      }
-    };
-  };
-
-  RadialAxial.prototype = {
-    getIR: function RadialAxial_getIR() {
-      var coordsArr = this.coordsArr;
-      var type = this.shadingType;
-      if (type == PatternType.AXIAL) {
-        var p0 = [coordsArr[0], coordsArr[1]];
-        var p1 = [coordsArr[2], coordsArr[3]];
-        var r0 = null;
-        var r1 = null;
-      } else if (type == PatternType.RADIAL) {
-        var p0 = [coordsArr[0], coordsArr[1]];
-        var p1 = [coordsArr[3], coordsArr[4]];
-        var r0 = coordsArr[2];
-        var r1 = coordsArr[5];
-      } else {
-        error('getPattern type unknown: ' + type);
-      }
-
-      var matrix = this.matrix;
-      if (matrix) {
-        p0 = Util.applyTransform(p0, matrix);
-        p1 = Util.applyTransform(p1, matrix);
-      }
-
-      return ['RadialAxial', type, this.colorStops, p0, p1, r0, r1];
-    }
-  };
-
-  return RadialAxial;
-})();
-
-Shadings.Dummy = (function DummyClosure() {
-  function Dummy() {
-    this.type = 'Pattern';
-  }
-
-  Dummy.fromIR = function Dummy_fromIR() {
-    return 'hotpink';
-  };
-
-  Dummy.prototype = {
-    getIR: function Dummy_getIR() {
-      return ['Dummy'];
-    }
-  };
-  return Dummy;
-})();
-
-var TilingPattern = (function TilingPatternClosure() {
-  var PaintType = {
-    COLORED: 1,
-    UNCOLORED: 2
-  };
-  var MAX_PATTERN_SIZE = 512;
-
-  function TilingPattern(IR, color, ctx, objs) {
-    var operatorList = IR[2];
-    this.matrix = IR[3];
-    var bbox = IR[4];
-    var xstep = IR[5];
-    var ystep = IR[6];
-    var paintType = IR[7];
-
-    TODO('TilingType');
-
-    this.curMatrix = ctx.mozCurrentTransform;
-    this.invMatrix = ctx.mozCurrentTransformInverse;
-    this.ctx = ctx;
-    this.type = 'Pattern';
-
-    var x0 = bbox[0], y0 = bbox[1], x1 = bbox[2], y1 = bbox[3];
-
-    var topLeft = [x0, y0];
-    // we want the canvas to be as large as the step size
-    var botRight = [x0 + xstep, y0 + ystep];
-
-    var width = botRight[0] - topLeft[0];
-    var height = botRight[1] - topLeft[1];
-
-    // TODO: hack to avoid OOM, we would ideally compute the tiling
-    // pattern to be only as large as the acual size in device space
-    // This could be computed with .mozCurrentTransform, but still
-    // needs to be implemented
-    while (Math.abs(width) > MAX_PATTERN_SIZE ||
-           Math.abs(height) > MAX_PATTERN_SIZE) {
-      width = height = MAX_PATTERN_SIZE;
-    }
-
-    var tmpCanvas = createScratchCanvas(width, height);
-
-    // set the new canvas element context as the graphics context
-    var tmpCtx = tmpCanvas.getContext('2d');
-    var graphics = new CanvasGraphics(tmpCtx, objs);
-
-    switch (paintType) {
-      case PaintType.COLORED:
-        tmpCtx.fillStyle = ctx.fillStyle;
-        tmpCtx.strokeStyle = ctx.strokeStyle;
-        break;
-      case PaintType.UNCOLORED:
-        var cssColor = Util.makeCssRgb(this, color[0], color[1], color[2]);
-        tmpCtx.fillStyle = cssColor;
-        tmpCtx.strokeStyle = cssColor;
-        break;
-      default:
-        error('Unsupported paint type: ' + paintType);
-    }
-
-    var scale = [width / xstep, height / ystep];
-    this.scale = scale;
-
-    // transform coordinates to pattern space
-    var tmpTranslate = [1, 0, 0, 1, -topLeft[0], -topLeft[1]];
-    var tmpScale = [scale[0], 0, 0, scale[1], 0, 0];
-    graphics.transform.apply(graphics, tmpScale);
-    graphics.transform.apply(graphics, tmpTranslate);
-
-    if (bbox && isArray(bbox) && 4 == bbox.length) {
-      var bboxWidth = x1 - x0;
-      var bboxHeight = y1 - y0;
-      graphics.rectangle(x0, y0, bboxWidth, bboxHeight);
-      graphics.clip();
-      graphics.endPath();
-    }
-
-    graphics.executeOperatorList(operatorList);
-
-    this.canvas = tmpCanvas;
-  }
-
-  TilingPattern.getIR = function TilingPattern_getIR(operatorList, dict, args) {
-    var matrix = dict.get('Matrix');
-    var bbox = dict.get('BBox');
-    var xstep = dict.get('XStep');
-    var ystep = dict.get('YStep');
-    var paintType = dict.get('PaintType');
-
-    return [
-      'TilingPattern', args, operatorList, matrix, bbox, xstep, ystep, paintType
-    ];
-  };
-
-  TilingPattern.prototype = {
-    getPattern: function TilingPattern_getPattern() {
-      var matrix = this.matrix;
-      var curMatrix = this.curMatrix;
-      var ctx = this.ctx;
-
-      if (curMatrix)
-        ctx.setTransform.apply(ctx, curMatrix);
-
-      if (matrix)
-        ctx.transform.apply(ctx, matrix);
-
-      var scale = this.scale;
-      ctx.scale(1 / scale[0], 1 / scale[1]);
-
-      return ctx.createPattern(this.canvas, 'repeat');
-    }
-  };
-
-  return TilingPattern;
-})();
-
-
-/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
-
-'use strict';
-
-var Stream = (function StreamClosure() {
-  function Stream(arrayBuffer, start, length, dict) {
-    this.bytes = new Uint8Array(arrayBuffer);
-    this.start = start || 0;
-    this.pos = this.start;
-    this.end = (start + length) || this.bytes.length;
-    this.dict = dict;
-  }
-
-  // required methods for a stream. if a particular stream does not
-  // implement these, an error should be thrown
-  Stream.prototype = {
-    get length() {
-      return this.end - this.start;
-    },
-    getByte: function Stream_getByte() {
-      if (this.pos >= this.end)
-        return null;
-      return this.bytes[this.pos++];
-    },
-    // returns subarray of original buffer
-    // should only be read
-    getBytes: function Stream_getBytes(length) {
-      var bytes = this.bytes;
-      var pos = this.pos;
-      var strEnd = this.end;
-
-      if (!length)
-        return bytes.subarray(pos, strEnd);
-
-      var end = pos + length;
-      if (end > strEnd)
-        end = strEnd;
-
-      this.pos = end;
-      return bytes.subarray(pos, end);
-    },
-    lookChar: function Stream_lookChar() {
-      if (this.pos >= this.end)
-        return null;
-      return String.fromCharCode(this.bytes[this.pos]);
-    },
-    getChar: function Stream_getChar() {
-      if (this.pos >= this.end)
-        return null;
-      return String.fromCharCode(this.bytes[this.pos++]);
-    },
-    skip: function Stream_skip(n) {
-      if (!n)
-        n = 1;
-      this.pos += n;
-    },
-    reset: function Stream_reset() {
-      this.pos = this.start;
-    },
-    moveStart: function Stream_moveStart() {
-      this.start = this.pos;
-    },
-    makeSubStream: function Stream_makeSubStream(start, length, dict) {
-      return new Stream(this.bytes.buffer, start, length, dict);
-    },
-    isStream: true
-  };
-
-  return Stream;
-})();
-
-var StringStream = (function StringStreamClosure() {
-  function StringStream(str) {
-    var length = str.length;
-    var bytes = new Uint8Array(length);
-    for (var n = 0; n < length; ++n)
-      bytes[n] = str.charCodeAt(n);
-    Stream.call(this, bytes);
-  }
-
-  StringStream.prototype = Stream.prototype;
-
-  return StringStream;
-})();
-
-// super class for the decoding streams
-var DecodeStream = (function DecodeStreamClosure() {
-  function DecodeStream() {
-    this.pos = 0;
-    this.bufferLength = 0;
-    this.eof = false;
-    this.buffer = null;
-  }
-
-  DecodeStream.prototype = {
-    ensureBuffer: function DecodeStream_ensureBuffer(requested) {
-      var buffer = this.buffer;
-      var current = buffer ? buffer.byteLength : 0;
-      if (requested < current)
-        return buffer;
-      var size = 512;
-      while (size < requested)
-        size <<= 1;
-      var buffer2 = new Uint8Array(size);
-      for (var i = 0; i < current; ++i)
-        buffer2[i] = buffer[i];
-      return (this.buffer = buffer2);
-    },
-    getByte: function DecodeStream_getByte() {
-      var pos = this.pos;
-      while (this.bufferLength <= pos) {
-        if (this.eof)
-          return null;
-        this.readBlock();
-      }
-      return this.buffer[this.pos++];
-    },
-    getBytes: function DecodeStream_getBytes(length) {
-      var end, pos = this.pos;
-
-      if (length) {
-        this.ensureBuffer(pos + length);
-        end = pos + length;
-
-        while (!this.eof && this.bufferLength < end)
-          this.readBlock();
-
-        var bufEnd = this.bufferLength;
-        if (end > bufEnd)
-          end = bufEnd;
-      } else {
-        while (!this.eof)
-          this.readBlock();
-
-        end = this.bufferLength;
-
-        // checking if bufferLength is still 0 then
-        // the buffer has to be initialized
-        if (!end)
-          this.buffer = new Uint8Array(0);
-      }
-
-      this.pos = end;
-      return this.buffer.subarray(pos, end);
-    },
-    lookChar: function DecodeStream_lookChar() {
-      var pos = this.pos;
-      while (this.bufferLength <= pos) {
-        if (this.eof)
-          return null;
-        this.readBlock();
-      }
-      return String.fromCharCode(this.buffer[this.pos]);
-    },
-    getChar: function DecodeStream_getChar() {
-      var pos = this.pos;
-      while (this.bufferLength <= pos) {
-        if (this.eof)
-          return null;
-        this.readBlock();
-      }
-      return String.fromCharCode(this.buffer[this.pos++]);
-    },
-    makeSubStream: function DecodeStream_makeSubStream(start, length, dict) {
-      var end = start + length;
-      while (this.bufferLength <= end && !this.eof)
-        this.readBlock();
-      return new Stream(this.buffer, start, length, dict);
-    },
-    skip: function DecodeStream_skip(n) {
-      if (!n)
-        n = 1;
-      this.pos += n;
-    },
-    reset: function DecodeStream_reset() {
-      this.pos = 0;
-    }
-  };
-
-  return DecodeStream;
-})();
-
-var FakeStream = (function FakeStreamClosure() {
-  function FakeStream(stream) {
-    this.dict = stream.dict;
-    DecodeStream.call(this);
-  }
-
-  FakeStream.prototype = Object.create(DecodeStream.prototype);
-  FakeStream.prototype.readBlock = function FakeStream_readBlock() {
-    var bufferLength = this.bufferLength;
-    bufferLength += 1024;
-    var buffer = this.ensureBuffer(bufferLength);
-    this.bufferLength = bufferLength;
-  };
-
-  FakeStream.prototype.getBytes = function FakeStream_getBytes(length) {
-    var end, pos = this.pos;
-
-    if (length) {
-      this.ensureBuffer(pos + length);
-      end = pos + length;
-
-      while (!this.eof && this.bufferLength < end)
-        this.readBlock();
-
-      var bufEnd = this.bufferLength;
-      if (end > bufEnd)
-        end = bufEnd;
-    } else {
-      this.eof = true;
-      end = this.bufferLength;
-    }
-
-    this.pos = end;
-    return this.buffer.subarray(pos, end);
-  };
-
-  return FakeStream;
-})();
-
-var StreamsSequenceStream = (function StreamsSequenceStreamClosure() {
-  function StreamsSequenceStream(streams) {
-    this.streams = streams;
-    DecodeStream.call(this);
-  }
-
-  StreamsSequenceStream.prototype = Object.create(DecodeStream.prototype);
-
-  StreamsSequenceStream.prototype.readBlock =
-    function streamSequenceStreamReadBlock() {
-
-    var streams = this.streams;
-    if (streams.length == 0) {
-      this.eof = true;
-      return;
-    }
-    var stream = streams.shift();
-    var chunk = stream.getBytes();
-    var bufferLength = this.bufferLength;
-    var newLength = bufferLength + chunk.length;
-    var buffer = this.ensureBuffer(newLength);
-    buffer.set(chunk, bufferLength);
-    this.bufferLength = newLength;
-  };
-
-  return StreamsSequenceStream;
-})();
-
-var FlateStream = (function FlateStreamClosure() {
-  var codeLenCodeMap = new Uint32Array([
-    16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15
-  ]);
-
-  var lengthDecode = new Uint32Array([
-    0x00003, 0x00004, 0x00005, 0x00006, 0x00007, 0x00008, 0x00009, 0x0000a,
-    0x1000b, 0x1000d, 0x1000f, 0x10011, 0x20013, 0x20017, 0x2001b, 0x2001f,
-    0x30023, 0x3002b, 0x30033, 0x3003b, 0x40043, 0x40053, 0x40063, 0x40073,
-    0x50083, 0x500a3, 0x500c3, 0x500e3, 0x00102, 0x00102, 0x00102
-  ]);
-
-  var distDecode = new Uint32Array([
-    0x00001, 0x00002, 0x00003, 0x00004, 0x10005, 0x10007, 0x20009, 0x2000d,
-    0x30011, 0x30019, 0x40021, 0x40031, 0x50041, 0x50061, 0x60081, 0x600c1,
-    0x70101, 0x70181, 0x80201, 0x80301, 0x90401, 0x90601, 0xa0801, 0xa0c01,
-    0xb1001, 0xb1801, 0xc2001, 0xc3001, 0xd4001, 0xd6001
-  ]);
-
-  var fixedLitCodeTab = [new Uint32Array([
-    0x70100, 0x80050, 0x80010, 0x80118, 0x70110, 0x80070, 0x80030, 0x900c0,
-    0x70108, 0x80060, 0x80020, 0x900a0, 0x80000, 0x80080, 0x80040, 0x900e0,
-    0x70104, 0x80058, 0x80018, 0x90090, 0x70114, 0x80078, 0x80038, 0x900d0,
-    0x7010c, 0x80068, 0x80028, 0x900b0, 0x80008, 0x80088, 0x80048, 0x900f0,
-    0x70102, 0x80054, 0x80014, 0x8011c, 0x70112, 0x80074, 0x80034, 0x900c8,
-    0x7010a, 0x80064, 0x80024, 0x900a8, 0x80004, 0x80084, 0x80044, 0x900e8,
-    0x70106, 0x8005c, 0x8001c, 0x90098, 0x70116, 0x8007c, 0x8003c, 0x900d8,
-    0x7010e, 0x8006c, 0x8002c, 0x900b8, 0x8000c, 0x8008c, 0x8004c, 0x900f8,
-    0x70101, 0x80052, 0x80012, 0x8011a, 0x70111, 0x80072, 0x80032, 0x900c4,
-    0x70109, 0x80062, 0x80022, 0x900a4, 0x80002, 0x80082, 0x80042, 0x900e4,
-    0x70105, 0x8005a, 0x8001a, 0x90094, 0x70115, 0x8007a, 0x8003a, 0x900d4,
-    0x7010d, 0x8006a, 0x8002a, 0x900b4, 0x8000a, 0x8008a, 0x8004a, 0x900f4,
-    0x70103, 0x80056, 0x80016, 0x8011e, 0x70113, 0x80076, 0x80036, 0x900cc,
-    0x7010b, 0x80066, 0x80026, 0x900ac, 0x80006, 0x80086, 0x80046, 0x900ec,
-    0x70107, 0x8005e, 0x8001e, 0x9009c, 0x70117, 0x8007e, 0x8003e, 0x900dc,
-    0x7010f, 0x8006e, 0x8002e, 0x900bc, 0x8000e, 0x8008e, 0x8004e, 0x900fc,
-    0x70100, 0x80051, 0x80011, 0x80119, 0x70110, 0x80071, 0x80031, 0x900c2,
-    0x70108, 0x80061, 0x80021, 0x900a2, 0x80001, 0x80081, 0x80041, 0x900e2,
-    0x70104, 0x80059, 0x80019, 0x90092, 0x70114, 0x80079, 0x80039, 0x900d2,
-    0x7010c, 0x80069, 0x80029, 0x900b2, 0x80009, 0x80089, 0x80049, 0x900f2,
-    0x70102, 0x80055, 0x80015, 0x8011d, 0x70112, 0x80075, 0x80035, 0x900ca,
-    0x7010a, 0x80065, 0x80025, 0x900aa, 0x80005, 0x80085, 0x80045, 0x900ea,
-    0x70106, 0x8005d, 0x8001d, 0x9009a, 0x70116, 0x8007d, 0x8003d, 0x900da,
-    0x7010e, 0x8006d, 0x8002d, 0x900ba, 0x8000d, 0x8008d, 0x8004d, 0x900fa,
-    0x70101, 0x80053, 0x80013, 0x8011b, 0x70111, 0x80073, 0x80033, 0x900c6,
-    0x70109, 0x80063, 0x80023, 0x900a6, 0x80003, 0x80083, 0x80043, 0x900e6,
-    0x70105, 0x8005b, 0x8001b, 0x90096, 0x70115, 0x8007b, 0x8003b, 0x900d6,
-    0x7010d, 0x8006b, 0x8002b, 0x900b6, 0x8000b, 0x8008b, 0x8004b, 0x900f6,
-    0x70103, 0x80057, 0x80017, 0x8011f, 0x70113, 0x80077, 0x80037, 0x900ce,
-    0x7010b, 0x80067, 0x80027, 0x900ae, 0x80007, 0x80087, 0x80047, 0x900ee,
-    0x70107, 0x8005f, 0x8001f, 0x9009e, 0x70117, 0x8007f, 0x8003f, 0x900de,
-    0x7010f, 0x8006f, 0x8002f, 0x900be, 0x8000f, 0x8008f, 0x8004f, 0x900fe,
-    0x70100, 0x80050, 0x80010, 0x80118, 0x70110, 0x80070, 0x80030, 0x900c1,
-    0x70108, 0x80060, 0x80020, 0x900a1, 0x80000, 0x80080, 0x80040, 0x900e1,
-    0x70104, 0x80058, 0x80018, 0x90091, 0x70114, 0x80078, 0x80038, 0x900d1,
-    0x7010c, 0x80068, 0x80028, 0x900b1, 0x80008, 0x80088, 0x80048, 0x900f1,
-    0x70102, 0x80054, 0x80014, 0x8011c, 0x70112, 0x80074, 0x80034, 0x900c9,
-    0x7010a, 0x80064, 0x80024, 0x900a9, 0x80004, 0x80084, 0x80044, 0x900e9,
-    0x70106, 0x8005c, 0x8001c, 0x90099, 0x70116, 0x8007c, 0x8003c, 0x900d9,
-    0x7010e, 0x8006c, 0x8002c, 0x900b9, 0x8000c, 0x8008c, 0x8004c, 0x900f9,
-    0x70101, 0x80052, 0x80012, 0x8011a, 0x70111, 0x80072, 0x80032, 0x900c5,
-    0x70109, 0x80062, 0x80022, 0x900a5, 0x80002, 0x80082, 0x80042, 0x900e5,
-    0x70105, 0x8005a, 0x8001a, 0x90095, 0x70115, 0x8007a, 0x8003a, 0x900d5,
-    0x7010d, 0x8006a, 0x8002a, 0x900b5, 0x8000a, 0x8008a, 0x8004a, 0x900f5,
-    0x70103, 0x80056, 0x80016, 0x8011e, 0x70113, 0x80076, 0x80036, 0x900cd,
-    0x7010b, 0x80066, 0x80026, 0x900ad, 0x80006, 0x80086, 0x80046, 0x900ed,
-    0x70107, 0x8005e, 0x8001e, 0x9009d, 0x70117, 0x8007e, 0x8003e, 0x900dd,
-    0x7010f, 0x8006e, 0x8002e, 0x900bd, 0x8000e, 0x8008e, 0x8004e, 0x900fd,
-    0x70100, 0x80051, 0x80011, 0x80119, 0x70110, 0x80071, 0x80031, 0x900c3,
-    0x70108, 0x80061, 0x80021, 0x900a3, 0x80001, 0x80081, 0x80041, 0x900e3,
-    0x70104, 0x80059, 0x80019, 0x90093, 0x70114, 0x80079, 0x80039, 0x900d3,
-    0x7010c, 0x80069, 0x80029, 0x900b3, 0x80009, 0x80089, 0x80049, 0x900f3,
-    0x70102, 0x80055, 0x80015, 0x8011d, 0x70112, 0x80075, 0x80035, 0x900cb,
-    0x7010a, 0x80065, 0x80025, 0x900ab, 0x80005, 0x80085, 0x80045, 0x900eb,
-    0x70106, 0x8005d, 0x8001d, 0x9009b, 0x70116, 0x8007d, 0x8003d, 0x900db,
-    0x7010e, 0x8006d, 0x8002d, 0x900bb, 0x8000d, 0x8008d, 0x8004d, 0x900fb,
-    0x70101, 0x80053, 0x80013, 0x8011b, 0x70111, 0x80073, 0x80033, 0x900c7,
-    0x70109, 0x80063, 0x80023, 0x900a7, 0x80003, 0x80083, 0x80043, 0x900e7,
-    0x70105, 0x8005b, 0x8001b, 0x90097, 0x70115, 0x8007b, 0x8003b, 0x900d7,
-    0x7010d, 0x8006b, 0x8002b, 0x900b7, 0x8000b, 0x8008b, 0x8004b, 0x900f7,
-    0x70103, 0x80057, 0x80017, 0x8011f, 0x70113, 0x80077, 0x80037, 0x900cf,
-    0x7010b, 0x80067, 0x80027, 0x900af, 0x80007, 0x80087, 0x80047, 0x900ef,
-    0x70107, 0x8005f, 0x8001f, 0x9009f, 0x70117, 0x8007f, 0x8003f, 0x900df,
-    0x7010f, 0x8006f, 0x8002f, 0x900bf, 0x8000f, 0x8008f, 0x8004f, 0x900ff
-  ]), 9];
-
-  var fixedDistCodeTab = [new Uint32Array([
-    0x50000, 0x50010, 0x50008, 0x50018, 0x50004, 0x50014, 0x5000c, 0x5001c,
-    0x50002, 0x50012, 0x5000a, 0x5001a, 0x50006, 0x50016, 0x5000e, 0x00000,
-    0x50001, 0x50011, 0x50009, 0x50019, 0x50005, 0x50015, 0x5000d, 0x5001d,
-    0x50003, 0x50013, 0x5000b, 0x5001b, 0x50007, 0x50017, 0x5000f, 0x00000
-  ]), 5];
-
-  function FlateStream(stream) {
-    var bytes = stream.getBytes();
-    var bytesPos = 0;
-
-    this.dict = stream.dict;
-    var cmf = bytes[bytesPos++];
-    var flg = bytes[bytesPos++];
-    if (cmf == -1 || flg == -1)
-      error('Invalid header in flate stream: ' + cmf + ', ' + flg);
-    if ((cmf & 0x0f) != 0x08)
-      error('Unknown compression method in flate stream: ' + cmf + ', ' + flg);
-    if ((((cmf << 8) + flg) % 31) != 0)
-      error('Bad FCHECK in flate stream: ' + cmf + ', ' + flg);
-    if (flg & 0x20)
-      error('FDICT bit set in flate stream: ' + cmf + ', ' + flg);
-
-    this.bytes = bytes;
-    this.bytesPos = bytesPos;
-
-    this.codeSize = 0;
-    this.codeBuf = 0;
-
-    DecodeStream.call(this);
-  }
-
-  FlateStream.prototype = Object.create(DecodeStream.prototype);
-
-  FlateStream.prototype.getBits = function FlateStream_getBits(bits) {
-    var codeSize = this.codeSize;
-    var codeBuf = this.codeBuf;
-    var bytes = this.bytes;
-    var bytesPos = this.bytesPos;
-
-    var b;
-    while (codeSize < bits) {
-      if (typeof (b = bytes[bytesPos++]) == 'undefined')
-        error('Bad encoding in flate stream');
-      codeBuf |= b << codeSize;
-      codeSize += 8;
-    }
-    b = codeBuf & ((1 << bits) - 1);
-    this.codeBuf = codeBuf >> bits;
-    this.codeSize = codeSize -= bits;
-    this.bytesPos = bytesPos;
-    return b;
-  };
-
-  FlateStream.prototype.getCode = function FlateStream_getCode(table) {
-    var codes = table[0];
-    var maxLen = table[1];
-    var codeSize = this.codeSize;
-    var codeBuf = this.codeBuf;
-    var bytes = this.bytes;
-    var bytesPos = this.bytesPos;
-
-    while (codeSize < maxLen) {
-      var b;
-      if (typeof (b = bytes[bytesPos++]) == 'undefined')
-        error('Bad encoding in flate stream');
-      codeBuf |= (b << codeSize);
-      codeSize += 8;
-    }
-    var code = codes[codeBuf & ((1 << maxLen) - 1)];
-    var codeLen = code >> 16;
-    var codeVal = code & 0xffff;
-    if (codeSize == 0 || codeSize < codeLen || codeLen == 0)
-      error('Bad encoding in flate stream');
-    this.codeBuf = (codeBuf >> codeLen);
-    this.codeSize = (codeSize - codeLen);
-    this.bytesPos = bytesPos;
-    return codeVal;
-  };
-
-  FlateStream.prototype.generateHuffmanTable =
-    function flateStreamGenerateHuffmanTable(lengths) {
-    var n = lengths.length;
-
-    // find max code length
-    var maxLen = 0;
-    for (var i = 0; i < n; ++i) {
-      if (lengths[i] > maxLen)
-        maxLen = lengths[i];
-    }
-
-    // build the table
-    var size = 1 << maxLen;
-    var codes = new Uint32Array(size);
-    for (var len = 1, code = 0, skip = 2;
-         len <= maxLen;
-         ++len, code <<= 1, skip <<= 1) {
-      for (var val = 0; val < n; ++val) {
-        if (lengths[val] == len) {
-          // bit-reverse the code
-          var code2 = 0;
-          var t = code;
-          for (var i = 0; i < len; ++i) {
-            code2 = (code2 << 1) | (t & 1);
-            t >>= 1;
-          }
-
-          // fill the table entries
-          for (var i = code2; i < size; i += skip)
-            codes[i] = (len << 16) | val;
-
-          ++code;
-        }
-      }
-    }
-
-    return [codes, maxLen];
-  };
-
-  FlateStream.prototype.readBlock = function FlateStream_readBlock() {
-    // read block header
-    var hdr = this.getBits(3);
-    if (hdr & 1)
-      this.eof = true;
-    hdr >>= 1;
-
-    if (hdr == 0) { // uncompressed block
-      var bytes = this.bytes;
-      var bytesPos = this.bytesPos;
-      var b;
-
-      if (typeof (b = bytes[bytesPos++]) == 'undefined')
-        error('Bad block header in flate stream');
-      var blockLen = b;
-      if (typeof (b = bytes[bytesPos++]) == 'undefined')
-        error('Bad block header in flate stream');
-      blockLen |= (b << 8);
-      if (typeof (b = bytes[bytesPos++]) == 'undefined')
-        error('Bad block header in flate stream');
-      var check = b;
-      if (typeof (b = bytes[bytesPos++]) == 'undefined')
-        error('Bad block header in flate stream');
-      check |= (b << 8);
-      if (check != (~blockLen & 0xffff))
-        error('Bad uncompressed block length in flate stream');
-
-      this.codeBuf = 0;
-      this.codeSize = 0;
-
-      var bufferLength = this.bufferLength;
-      var buffer = this.ensureBuffer(bufferLength + blockLen);
-      var end = bufferLength + blockLen;
-      this.bufferLength = end;
-      for (var n = bufferLength; n < end; ++n) {
-        if (typeof (b = bytes[bytesPos++]) == 'undefined') {
-          this.eof = true;
-          break;
-        }
-        buffer[n] = b;
-      }
-      this.bytesPos = bytesPos;
-      return;
-    }
-
-    var litCodeTable;
-    var distCodeTable;
-    if (hdr == 1) { // compressed block, fixed codes
-      litCodeTable = fixedLitCodeTab;
-      distCodeTable = fixedDistCodeTab;
-    } else if (hdr == 2) { // compressed block, dynamic codes
-      var numLitCodes = this.getBits(5) + 257;
-      var numDistCodes = this.getBits(5) + 1;
-      var numCodeLenCodes = this.getBits(4) + 4;
-
-      // build the code lengths code table
-      var codeLenCodeLengths = new Uint8Array(codeLenCodeMap.length);
-
-      for (var i = 0; i < numCodeLenCodes; ++i)
-        codeLenCodeLengths[codeLenCodeMap[i]] = this.getBits(3);
-      var codeLenCodeTab = this.generateHuffmanTable(codeLenCodeLengths);
-
-      // build the literal and distance code tables
-      var len = 0;
-      var i = 0;
-      var codes = numLitCodes + numDistCodes;
-      var codeLengths = new Uint8Array(codes);
-      while (i < codes) {
-        var code = this.getCode(codeLenCodeTab);
-        if (code == 16) {
-          var bitsLength = 2, bitsOffset = 3, what = len;
-        } else if (code == 17) {
-          var bitsLength = 3, bitsOffset = 3, what = (len = 0);
-        } else if (code == 18) {
-          var bitsLength = 7, bitsOffset = 11, what = (len = 0);
-        } else {
-          codeLengths[i++] = len = code;
-          continue;
-        }
-
-        var repeatLength = this.getBits(bitsLength) + bitsOffset;
-        while (repeatLength-- > 0)
-          codeLengths[i++] = what;
-      }
-
-      litCodeTable =
-        this.generateHuffmanTable(codeLengths.subarray(0, numLitCodes));
-      distCodeTable =
-        this.generateHuffmanTable(codeLengths.subarray(numLitCodes, codes));
-    } else {
-      error('Unknown block type in flate stream');
-    }
-
-    var buffer = this.buffer;
-    var limit = buffer ? buffer.length : 0;
-    var pos = this.bufferLength;
-    while (true) {
-      var code1 = this.getCode(litCodeTable);
-      if (code1 < 256) {
-        if (pos + 1 >= limit) {
-          buffer = this.ensureBuffer(pos + 1);
-          limit = buffer.length;
-        }
-        buffer[pos++] = code1;
-        continue;
-      }
-      if (code1 == 256) {
-        this.bufferLength = pos;
-        return;
-      }
-      code1 -= 257;
-      code1 = lengthDecode[code1];
-      var code2 = code1 >> 16;
-      if (code2 > 0)
-        code2 = this.getBits(code2);
-      var len = (code1 & 0xffff) + code2;
-      code1 = this.getCode(distCodeTable);
-      code1 = distDecode[code1];
-      code2 = code1 >> 16;
-      if (code2 > 0)
-        code2 = this.getBits(code2);
-      var dist = (code1 & 0xffff) + code2;
-      if (pos + len >= limit) {
-        buffer = this.ensureBuffer(pos + len);
-        limit = buffer.length;
-      }
-      for (var k = 0; k < len; ++k, ++pos)
-        buffer[pos] = buffer[pos - dist];
-    }
-  };
-
-  return FlateStream;
-})();
-
-var PredictorStream = (function PredictorStreamClosure() {
-  function PredictorStream(stream, params) {
-    var predictor = this.predictor = params.get('Predictor') || 1;
-
-    if (predictor <= 1)
-      return stream; // no prediction
-    if (predictor !== 2 && (predictor < 10 || predictor > 15))
-      error('Unsupported predictor: ' + predictor);
-
-    if (predictor === 2)
-      this.readBlock = this.readBlockTiff;
-    else
-      this.readBlock = this.readBlockPng;
-
-    this.stream = stream;
-    this.dict = stream.dict;
-
-    var colors = this.colors = params.get('Colors') || 1;
-    var bits = this.bits = params.get('BitsPerComponent') || 8;
-    var columns = this.columns = params.get('Columns') || 1;
-
-    this.pixBytes = (colors * bits + 7) >> 3;
-    this.rowBytes = (columns * colors * bits + 7) >> 3;
-
-    DecodeStream.call(this);
-    return this;
-  }
-
-  PredictorStream.prototype = Object.create(DecodeStream.prototype);
-
-  PredictorStream.prototype.readBlockTiff =
-    function predictorStreamReadBlockTiff() {
-    var rowBytes = this.rowBytes;
-
-    var bufferLength = this.bufferLength;
-    var buffer = this.ensureBuffer(bufferLength + rowBytes);
-
-    var bits = this.bits;
-    var colors = this.colors;
-
-    var rawBytes = this.stream.getBytes(rowBytes);
-
-    var inbuf = 0, outbuf = 0;
-    var inbits = 0, outbits = 0;
-    var pos = bufferLength;
-
-    if (bits === 1) {
-      for (var i = 0; i < rowBytes; ++i) {
-        var c = rawBytes[i];
-        inbuf = (inbuf << 8) | c;
-        // bitwise addition is exclusive or
-        // first shift inbuf and then add
-        buffer[pos++] = (c ^ (inbuf >> colors)) & 0xFF;
-        // truncate inbuf (assumes colors < 16)
-        inbuf &= 0xFFFF;
-      }
-    } else if (bits === 8) {
-      for (var i = 0; i < colors; ++i)
-        buffer[pos++] = rawBytes[i];
-      for (; i < rowBytes; ++i) {
-        buffer[pos] = buffer[pos - colors] + rawBytes[i];
-        pos++;
-      }
-    } else {
-      var compArray = new Uint8Array(colors + 1);
-      var bitMask = (1 << bits) - 1;
-      var j = 0, k = bufferLength;
-      var columns = this.columns;
-      for (var i = 0; i < columns; ++i) {
-        for (var kk = 0; kk < colors; ++kk) {
-          if (inbits < bits) {
-            inbuf = (inbuf << 8) | (rawBytes[j++] & 0xFF);
-            inbits += 8;
-          }
-          compArray[kk] = (compArray[kk] +
-                           (inbuf >> (inbits - bits))) & bitMask;
-          inbits -= bits;
-          outbuf = (outbuf << bits) | compArray[kk];
-          outbits += bits;
-          if (outbits >= 8) {
-            buffer[k++] = (outbuf >> (outbits - 8)) & 0xFF;
-            outbits -= 8;
-          }
-        }
-      }
-      if (outbits > 0) {
-        buffer[k++] = (outbuf << (8 - outbits)) +
-        (inbuf & ((1 << (8 - outbits)) - 1));
-      }
-    }
-    this.bufferLength += rowBytes;
-  };
-
-  PredictorStream.prototype.readBlockPng =
-    function predictorStreamReadBlockPng() {
-
-    var rowBytes = this.rowBytes;
-    var pixBytes = this.pixBytes;
-
-    var predictor = this.stream.getByte();
-    var rawBytes = this.stream.getBytes(rowBytes);
-
-    var bufferLength = this.bufferLength;
-    var buffer = this.ensureBuffer(bufferLength + rowBytes);
-
-    var prevRow = buffer.subarray(bufferLength - rowBytes, bufferLength);
-    if (prevRow.length == 0)
-      prevRow = new Uint8Array(rowBytes);
-
-    var j = bufferLength;
-    switch (predictor) {
-      case 0:
-        for (var i = 0; i < rowBytes; ++i)
-          buffer[j++] = rawBytes[i];
-        break;
-      case 1:
-        for (var i = 0; i < pixBytes; ++i)
-          buffer[j++] = rawBytes[i];
-        for (; i < rowBytes; ++i) {
-          buffer[j] = (buffer[j - pixBytes] + rawBytes[i]) & 0xFF;
-          j++;
-        }
-        break;
-      case 2:
-        for (var i = 0; i < rowBytes; ++i)
-          buffer[j++] = (prevRow[i] + rawBytes[i]) & 0xFF;
-        break;
-      case 3:
-        for (var i = 0; i < pixBytes; ++i)
-          buffer[j++] = (prevRow[i] >> 1) + rawBytes[i];
-        for (; i < rowBytes; ++i) {
-          buffer[j] = (((prevRow[i] + buffer[j - pixBytes]) >> 1) +
-                           rawBytes[i]) & 0xFF;
-          j++;
-        }
-        break;
-      case 4:
-        // we need to save the up left pixels values. the simplest way
-        // is to create a new buffer
-        for (var i = 0; i < pixBytes; ++i) {
-          var up = prevRow[i];
-          var c = rawBytes[i];
-          buffer[j++] = up + c;
-        }
-        for (; i < rowBytes; ++i) {
-          var up = prevRow[i];
-          var upLeft = prevRow[i - pixBytes];
-          var left = buffer[j - pixBytes];
-          var p = left + up - upLeft;
-
-          var pa = p - left;
-          if (pa < 0)
-            pa = -pa;
-          var pb = p - up;
-          if (pb < 0)
-            pb = -pb;
-          var pc = p - upLeft;
-          if (pc < 0)
-            pc = -pc;
-
-          var c = rawBytes[i];
-          if (pa <= pb && pa <= pc)
-            buffer[j++] = left + c;
-          else if (pb <= pc)
-            buffer[j++] = up + c;
-          else
-            buffer[j++] = upLeft + c;
-        }
-        break;
-      default:
-        error('Unsupported predictor: ' + predictor);
-    }
-    this.bufferLength += rowBytes;
-  };
-
-  return PredictorStream;
-})();
-
-/**
- * Depending on the type of JPEG a JpegStream is handled in different ways. For
- * JPEG's that are supported natively such as DeviceGray and DeviceRGB the image
- * data is stored and then loaded by the browser.  For unsupported JPEG's we use
- * a library to decode these images and the stream behaves like all the other
- * DecodeStreams.
- */
-var JpegStream = (function JpegStreamClosure() {
-  function isAdobeImage(bytes) {
-    var maxBytesScanned = Math.max(bytes.length - 16, 1024);
-    // Looking for APP14, 'Adobe'
-    for (var i = 0; i < maxBytesScanned; ++i) {
-      if (bytes[i] == 0xFF && bytes[i + 1] == 0xEE &&
-          bytes[i + 2] == 0x00 && bytes[i + 3] == 0x0E &&
-          bytes[i + 4] == 0x41 && bytes[i + 5] == 0x64 &&
-          bytes[i + 6] == 0x6F && bytes[i + 7] == 0x62 &&
-          bytes[i + 8] == 0x65 && bytes[i + 9] == 0x00)
-          return true;
-      // scanning until frame tag
-      if (bytes[i] == 0xFF && bytes[i + 1] == 0xC0)
-        break;
-    }
-    return false;
-  }
-
-  function fixAdobeImage(bytes) {
-    // Inserting 'EMBED' marker after JPEG signature
-    var embedMarker = new Uint8Array([0xFF, 0xEC, 0, 8, 0x45, 0x4D, 0x42, 0x45,
-                                      0x44, 0]);
-    var newBytes = new Uint8Array(bytes.length + embedMarker.length);
-    newBytes.set(bytes, embedMarker.length);
-    // copy JPEG header
-    newBytes[0] = bytes[0];
-    newBytes[1] = bytes[1];
-    newBytes.set(embedMarker, 2);
-    return newBytes;
-  }
-
-  function JpegStream(bytes, dict, xref) {
-    // TODO: per poppler, some images may have 'junk' before that
-    // need to be removed
-    this.dict = dict;
-
-    this.isAdobeImage = false;
-    this.colorTransform = dict.get('ColorTransform') || -1;
-
-    if (isAdobeImage(bytes)) {
-      this.isAdobeImage = true;
-      bytes = fixAdobeImage(bytes);
-    }
-
-    this.bytes = bytes;
-
-    DecodeStream.call(this);
-  }
-
-  JpegStream.prototype = Object.create(DecodeStream.prototype);
-
-  JpegStream.prototype.ensureBuffer = function JpegStream_ensureBuffer(req) {
-    if (this.bufferLength)
-      return;
-    try {
-      var jpegImage = new JpegImage();
-      if (this.colorTransform != -1)
-        jpegImage.colorTransform = this.colorTransform;
-      jpegImage.parse(this.bytes);
-      var width = jpegImage.width;
-      var height = jpegImage.height;
-      var data = jpegImage.getData(width, height);
-      this.buffer = data;
-      this.bufferLength = data.length;
-    } catch (e) {
-      error('JPEG error: ' + e);
-    }
-  };
-  JpegStream.prototype.getIR = function JpegStream_getIR() {
-    return bytesToString(this.bytes);
-  };
-  JpegStream.prototype.getChar = function JpegStream_getChar() {
-    error('internal error: getChar is not valid on JpegStream');
-  };
-  /**
-   * Checks if the image can be decoded and displayed by the browser without any
-   * further processing such as color space conversions.
-   */
-  JpegStream.prototype.isNativelySupported =
-    function JpegStream_isNativelySupported(xref, res) {
-    var cs = ColorSpace.parse(this.dict.get('ColorSpace'), xref, res);
-    // when bug 674619 lands, let's check if browser can do
-    // normal cmyk and then we won't need to decode in JS
-    if (cs.name === 'DeviceGray' || cs.name === 'DeviceRGB')
-      return true;
-    if (cs.name === 'DeviceCMYK' && !this.isAdobeImage &&
-        this.colorTransform < 1)
-      return true;
-    return false;
-  };
-  /**
-   * Checks if the image can be decoded by the browser.
-   */
-  JpegStream.prototype.isNativelyDecodable =
-    function JpegStream_isNativelyDecodable(xref, res) {
-    var cs = ColorSpace.parse(this.dict.get('ColorSpace'), xref, res);
-    var numComps = cs.numComps;
-    if (numComps == 1 || numComps == 3)
-      return true;
-
-    return false;
-  };
-
-  return JpegStream;
-})();
-
-/**
- * For JPEG 2000's we use a library to decode these images and
- * the stream behaves like all the other DecodeStreams.
- */
-var JpxStream = (function JpxStreamClosure() {
-  function JpxStream(bytes, dict) {
-    this.dict = dict;
-    this.bytes = bytes;
-
-    DecodeStream.call(this);
-  }
-
-  JpxStream.prototype = Object.create(DecodeStream.prototype);
-
-  JpxStream.prototype.ensureBuffer = function JpxStream_ensureBuffer(req) {
-    if (this.bufferLength)
-      return;
-
-    var jpxImage = new JpxImage();
-    jpxImage.parse(this.bytes);
-
-    var width = jpxImage.width;
-    var height = jpxImage.height;
-    var componentsCount = jpxImage.componentsCount;
-    if (componentsCount != 1 && componentsCount != 3 && componentsCount != 4)
-      error('JPX with ' + componentsCount + ' components is not supported');
-
-    var data = new Uint8Array(width * height * componentsCount);
-
-    for (var k = 0, kk = jpxImage.tiles.length; k < kk; k++) {
-      var tileCompoments = jpxImage.tiles[k];
-      var tileWidth = tileCompoments[0].width;
-      var tileHeight = tileCompoments[0].height;
-      var tileLeft = tileCompoments[0].left;
-      var tileTop = tileCompoments[0].top;
-
-      var dataPosition, sourcePosition, data0, data1, data2, data3, rowFeed;
-      switch (componentsCount) {
-        case 1:
-          data0 = tileCompoments[0].items;
-
-          dataPosition = width * tileTop + tileLeft;
-          rowFeed = width - tileWidth;
-          sourcePosition = 0;
-          for (var j = 0; j < tileHeight; j++) {
-            for (var i = 0; i < tileWidth; i++)
-              data[dataPosition++] = data0[sourcePosition++];
-            dataPosition += rowFeed;
-          }
-          break;
-        case 3:
-          data0 = tileCompoments[0].items;
-          data1 = tileCompoments[1].items;
-          data2 = tileCompoments[2].items;
-
-          dataPosition = (width * tileTop + tileLeft) * 3;
-          rowFeed = (width - tileWidth) * 3;
-          sourcePosition = 0;
-          for (var j = 0; j < tileHeight; j++) {
-            for (var i = 0; i < tileWidth; i++) {
-              data[dataPosition++] = data0[sourcePosition];
-              data[dataPosition++] = data1[sourcePosition];
-              data[dataPosition++] = data2[sourcePosition];
-              sourcePosition++;
-            }
-            dataPosition += rowFeed;
-          }
-          break;
-        case 4:
-          data0 = tileCompoments[0].items;
-          data1 = tileCompoments[1].items;
-          data2 = tileCompoments[2].items;
-          data3 = tileCompoments[3].items;
-
-          dataPosition = (width * tileTop + tileLeft) * 4;
-          rowFeed = (width - tileWidth) * 4;
-          sourcePosition = 0;
-          for (var j = 0; j < tileHeight; j++) {
-            for (var i = 0; i < tileWidth; i++) {
-              data[dataPosition++] = data0[sourcePosition];
-              data[dataPosition++] = data1[sourcePosition];
-              data[dataPosition++] = data2[sourcePosition];
-              data[dataPosition++] = data3[sourcePosition];
-              sourcePosition++;
-            }
-            dataPosition += rowFeed;
-          }
-          break;
-      }
-    }
-
-    this.buffer = data;
-    this.bufferLength = data.length;
-  };
-  JpxStream.prototype.getChar = function JpxStream_getChar() {
-    error('internal error: getChar is not valid on JpxStream');
-  };
-
-  return JpxStream;
-})();
-
-var DecryptStream = (function DecryptStreamClosure() {
-  function DecryptStream(str, decrypt) {
-    this.str = str;
-    this.dict = str.dict;
-    this.decrypt = decrypt;
-
-    DecodeStream.call(this);
-  }
-
-  var chunkSize = 512;
-
-  DecryptStream.prototype = Object.create(DecodeStream.prototype);
-
-  DecryptStream.prototype.readBlock = function DecryptStream_readBlock() {
-    var chunk = this.str.getBytes(chunkSize);
-    if (!chunk || chunk.length == 0) {
-      this.eof = true;
-      return;
-    }
-    var decrypt = this.decrypt;
-    chunk = decrypt(chunk);
-
-    var bufferLength = this.bufferLength;
-    var i, n = chunk.length;
-    var buffer = this.ensureBuffer(bufferLength + n);
-    for (i = 0; i < n; i++)
-      buffer[bufferLength++] = chunk[i];
-    this.bufferLength = bufferLength;
-  };
-
-  return DecryptStream;
-})();
-
-var Ascii85Stream = (function Ascii85StreamClosure() {
-  function Ascii85Stream(str) {
-    this.str = str;
-    this.dict = str.dict;
-    this.input = new Uint8Array(5);
-
-    DecodeStream.call(this);
-  }
-
-  Ascii85Stream.prototype = Object.create(DecodeStream.prototype);
-
-  Ascii85Stream.prototype.readBlock = function Ascii85Stream_readBlock() {
-    var tildaCode = '~'.charCodeAt(0);
-    var zCode = 'z'.charCodeAt(0);
-    var str = this.str;
-
-    var c = str.getByte();
-    while (Lexer.isSpace(String.fromCharCode(c)))
-      c = str.getByte();
-
-    if (!c || c === tildaCode) {
-      this.eof = true;
-      return;
-    }
-
-    var bufferLength = this.bufferLength, buffer;
-
-    // special code for z
-    if (c == zCode) {
-      buffer = this.ensureBuffer(bufferLength + 4);
-      for (var i = 0; i < 4; ++i)
-        buffer[bufferLength + i] = 0;
-      this.bufferLength += 4;
-    } else {
-      var input = this.input;
-      input[0] = c;
-      for (var i = 1; i < 5; ++i) {
-        c = str.getByte();
-        while (Lexer.isSpace(String.fromCharCode(c)))
-          c = str.getByte();
-
-        input[i] = c;
-
-        if (!c || c == tildaCode)
-          break;
-      }
-      buffer = this.ensureBuffer(bufferLength + i - 1);
-      this.bufferLength += i - 1;
-
-      // partial ending;
-      if (i < 5) {
-        for (; i < 5; ++i)
-          input[i] = 0x21 + 84;
-        this.eof = true;
-      }
-      var t = 0;
-      for (var i = 0; i < 5; ++i)
-        t = t * 85 + (input[i] - 0x21);
-
-      for (var i = 3; i >= 0; --i) {
-        buffer[bufferLength + i] = t & 0xFF;
-        t >>= 8;
-      }
-    }
-  };
-
-  return Ascii85Stream;
-})();
-
-var AsciiHexStream = (function AsciiHexStreamClosure() {
-  function AsciiHexStream(str) {
-    this.str = str;
-    this.dict = str.dict;
-
-    DecodeStream.call(this);
-  }
-
-  var hexvalueMap = {
-      9: -1, // \t
-      32: -1, // space
-      48: 0,
-      49: 1,
-      50: 2,
-      51: 3,
-      52: 4,
-      53: 5,
-      54: 6,
-      55: 7,
-      56: 8,
-      57: 9,
-      65: 10,
-      66: 11,
-      67: 12,
-      68: 13,
-      69: 14,
-      70: 15,
-      97: 10,
-      98: 11,
-      99: 12,
-      100: 13,
-      101: 14,
-      102: 15
-  };
-
-  AsciiHexStream.prototype = Object.create(DecodeStream.prototype);
-
-  AsciiHexStream.prototype.readBlock = function AsciiHexStream_readBlock() {
-    var gtCode = '>'.charCodeAt(0), bytes = this.str.getBytes(), c, n,
-        decodeLength, buffer, bufferLength, i, length;
-
-    decodeLength = (bytes.length + 1) >> 1;
-    buffer = this.ensureBuffer(this.bufferLength + decodeLength);
-    bufferLength = this.bufferLength;
-
-    for (i = 0, length = bytes.length; i < length; i++) {
-      c = hexvalueMap[bytes[i]];
-      while (c == -1 && (i + 1) < length) {
-        c = hexvalueMap[bytes[++i]];
-      }
-
-      if ((i + 1) < length && (bytes[i + 1] !== gtCode)) {
-        n = hexvalueMap[bytes[++i]];
-        buffer[bufferLength++] = c * 16 + n;
-      } else {
-        // EOD marker at an odd number, behave as if a 0 followed the last
-        // digit.
-        if (bytes[i] !== gtCode) {
-          buffer[bufferLength++] = c * 16;
-        }
-      }
-    }
-
-    this.bufferLength = bufferLength;
-    this.eof = true;
-  };
-
-  return AsciiHexStream;
-})();
-
-var RunLengthStream = (function RunLengthStreamClosure() {
-  function RunLengthStream(str) {
-    this.str = str;
-    this.dict = str.dict;
-
-    DecodeStream.call(this);
-  }
-
-  RunLengthStream.prototype = Object.create(DecodeStream.prototype);
-
-  RunLengthStream.prototype.readBlock = function RunLengthStream_readBlock() {
-    // The repeatHeader has following format. The first byte defines type of run
-    // and amount of bytes to repeat/copy: n = 0 through 127 - copy next n bytes
-    // (in addition to the second byte from the header), n = 129 through 255 -
-    // duplicate the second byte from the header (257 - n) times, n = 128 - end.
-    var repeatHeader = this.str.getBytes(2);
-    if (!repeatHeader || repeatHeader.length < 2 || repeatHeader[0] == 128) {
-      this.eof = true;
-      return;
-    }
-
-    var bufferLength = this.bufferLength;
-    var n = repeatHeader[0];
-    if (n < 128) {
-      // copy n bytes
-      var buffer = this.ensureBuffer(bufferLength + n + 1);
-      buffer[bufferLength++] = repeatHeader[1];
-      if (n > 0) {
-        var source = this.str.getBytes(n);
-        buffer.set(source, bufferLength);
-        bufferLength += n;
-      }
-    } else {
-      n = 257 - n;
-      var b = repeatHeader[1];
-      var buffer = this.ensureBuffer(bufferLength + n + 1);
-      for (var i = 0; i < n; i++)
-        buffer[bufferLength++] = b;
-    }
-    this.bufferLength = bufferLength;
-  };
-
-  return RunLengthStream;
-})();
-
-var CCITTFaxStream = (function CCITTFaxStreamClosure() {
-
-  var ccittEOL = -2;
-  var twoDimPass = 0;
-  var twoDimHoriz = 1;
-  var twoDimVert0 = 2;
-  var twoDimVertR1 = 3;
-  var twoDimVertL1 = 4;
-  var twoDimVertR2 = 5;
-  var twoDimVertL2 = 6;
-  var twoDimVertR3 = 7;
-  var twoDimVertL3 = 8;
-
-  var twoDimTable = [
-    [-1, -1], [-1, -1],                   // 000000x
-    [7, twoDimVertL3],                    // 0000010
-    [7, twoDimVertR3],                    // 0000011
-    [6, twoDimVertL2], [6, twoDimVertL2], // 000010x
-    [6, twoDimVertR2], [6, twoDimVertR2], // 000011x
-    [4, twoDimPass], [4, twoDimPass],     // 0001xxx
-    [4, twoDimPass], [4, twoDimPass],
-    [4, twoDimPass], [4, twoDimPass],
-    [4, twoDimPass], [4, twoDimPass],
-    [3, twoDimHoriz], [3, twoDimHoriz],   // 001xxxx
-    [3, twoDimHoriz], [3, twoDimHoriz],
-    [3, twoDimHoriz], [3, twoDimHoriz],
-    [3, twoDimHoriz], [3, twoDimHoriz],
-    [3, twoDimHoriz], [3, twoDimHoriz],
-    [3, twoDimHoriz], [3, twoDimHoriz],
-    [3, twoDimHoriz], [3, twoDimHoriz],
-    [3, twoDimHoriz], [3, twoDimHoriz],
-    [3, twoDimVertL1], [3, twoDimVertL1], // 010xxxx
-    [3, twoDimVertL1], [3, twoDimVertL1],
-    [3, twoDimVertL1], [3, twoDimVertL1],
-    [3, twoDimVertL1], [3, twoDimVertL1],
-    [3, twoDimVertL1], [3, twoDimVertL1],
-    [3, twoDimVertL1], [3, twoDimVertL1],
-    [3, twoDimVertL1], [3, twoDimVertL1],
-    [3, twoDimVertL1], [3, twoDimVertL1],
-    [3, twoDimVertR1], [3, twoDimVertR1], // 011xxxx
-    [3, twoDimVertR1], [3, twoDimVertR1],
-    [3, twoDimVertR1], [3, twoDimVertR1],
-    [3, twoDimVertR1], [3, twoDimVertR1],
-    [3, twoDimVertR1], [3, twoDimVertR1],
-    [3, twoDimVertR1], [3, twoDimVertR1],
-    [3, twoDimVertR1], [3, twoDimVertR1],
-    [3, twoDimVertR1], [3, twoDimVertR1],
-    [1, twoDimVert0], [1, twoDimVert0],   // 1xxxxxx
-    [1, twoDimVert0], [1, twoDimVert0],
-    [1, twoDimVert0], [1, twoDimVert0],
-    [1, twoDimVert0], [1, twoDimVert0],
-    [1, twoDimVert0], [1, twoDimVert0],
-    [1, twoDimVert0], [1, twoDimVert0],
-    [1, twoDimVert0], [1, twoDimVert0],
-    [1, twoDimVert0], [1, twoDimVert0],
-    [1, twoDimVert0], [1, twoDimVert0],
-    [1, twoDimVert0], [1, twoDimVert0],
-    [1, twoDimVert0], [1, twoDimVert0],
-    [1, twoDimVert0], [1, twoDimVert0],
-    [1, twoDimVert0], [1, twoDimVert0],
-    [1, twoDimVert0], [1, twoDimVert0],
-    [1, twoDimVert0], [1, twoDimVert0],
-    [1, twoDimVert0], [1, twoDimVert0],
-    [1, twoDimVert0], [1, twoDimVert0],
-    [1, twoDimVert0], [1, twoDimVert0],
-    [1, twoDimVert0], [1, twoDimVert0],
-    [1, twoDimVert0], [1, twoDimVert0],
-    [1, twoDimVert0], [1, twoDimVert0],
-    [1, twoDimVert0], [1, twoDimVert0],
-    [1, twoDimVert0], [1, twoDimVert0],
-    [1, twoDimVert0], [1, twoDimVert0],
-    [1, twoDimVert0], [1, twoDimVert0],
-    [1, twoDimVert0], [1, twoDimVert0],
-    [1, twoDimVert0], [1, twoDimVert0],
-    [1, twoDimVert0], [1, twoDimVert0],
-    [1, twoDimVert0], [1, twoDimVert0],
-    [1, twoDimVert0], [1, twoDimVert0],
-    [1, twoDimVert0], [1, twoDimVert0],
-    [1, twoDimVert0], [1, twoDimVert0]
-  ];
-
-  var whiteTable1 = [
-    [-1, -1],                               // 00000
-    [12, ccittEOL],                         // 00001
-    [-1, -1], [-1, -1],                     // 0001x
-    [-1, -1], [-1, -1], [-1, -1], [-1, -1], // 001xx
-    [-1, -1], [-1, -1], [-1, -1], [-1, -1], // 010xx
-    [-1, -1], [-1, -1], [-1, -1], [-1, -1], // 011xx
-    [11, 1792], [11, 1792],                 // 1000x
-    [12, 1984],                             // 10010
-    [12, 2048],                             // 10011
-    [12, 2112],                             // 10100
-    [12, 2176],                             // 10101
-    [12, 2240],                             // 10110
-    [12, 2304],                             // 10111
-    [11, 1856], [11, 1856],                 // 1100x
-    [11, 1920], [11, 1920],                 // 1101x
-    [12, 2368],                             // 11100
-    [12, 2432],                             // 11101
-    [12, 2496],                             // 11110
-    [12, 2560]                              // 11111
-  ];
-
-  var whiteTable2 = [
-    [-1, -1], [-1, -1], [-1, -1], [-1, -1],     // 0000000xx
-    [8, 29], [8, 29],                           // 00000010x
-    [8, 30], [8, 30],                           // 00000011x
-    [8, 45], [8, 45],                           // 00000100x
-    [8, 46], [8, 46],                           // 00000101x
-    [7, 22], [7, 22], [7, 22], [7, 22],         // 0000011xx
-    [7, 23], [7, 23], [7, 23], [7, 23],         // 0000100xx
-    [8, 47], [8, 47],                           // 00001010x
-    [8, 48], [8, 48],                           // 00001011x
-    [6, 13], [6, 13], [6, 13], [6, 13],         // 000011xxx
-    [6, 13], [6, 13], [6, 13], [6, 13],
-    [7, 20], [7, 20], [7, 20], [7, 20],         // 0001000xx
-    [8, 33], [8, 33],                           // 00010010x
-    [8, 34], [8, 34],                           // 00010011x
-    [8, 35], [8, 35],                           // 00010100x
-    [8, 36], [8, 36],                           // 00010101x
-    [8, 37], [8, 37],                           // 00010110x
-    [8, 38], [8, 38],                           // 00010111x
-    [7, 19], [7, 19], [7, 19], [7, 19],         // 0001100xx
-    [8, 31], [8, 31],                           // 00011010x
-    [8, 32], [8, 32],                           // 00011011x
-    [6, 1], [6, 1], [6, 1], [6, 1],             // 000111xxx
-    [6, 1], [6, 1], [6, 1], [6, 1],
-    [6, 12], [6, 12], [6, 12], [6, 12],         // 001000xxx
-    [6, 12], [6, 12], [6, 12], [6, 12],
-    [8, 53], [8, 53],                           // 00100100x
-    [8, 54], [8, 54],                           // 00100101x
-    [7, 26], [7, 26], [7, 26], [7, 26],         // 0010011xx
-    [8, 39], [8, 39],                           // 00101000x
-    [8, 40], [8, 40],                           // 00101001x
-    [8, 41], [8, 41],                           // 00101010x
-    [8, 42], [8, 42],                           // 00101011x
-    [8, 43], [8, 43],                           // 00101100x
-    [8, 44], [8, 44],                           // 00101101x
-    [7, 21], [7, 21], [7, 21], [7, 21],         // 0010111xx
-    [7, 28], [7, 28], [7, 28], [7, 28],         // 0011000xx
-    [8, 61], [8, 61],                           // 00110010x
-    [8, 62], [8, 62],                           // 00110011x
-    [8, 63], [8, 63],                           // 00110100x
-    [8, 0], [8, 0],                             // 00110101x
-    [8, 320], [8, 320],                         // 00110110x
-    [8, 384], [8, 384],                         // 00110111x
-    [5, 10], [5, 10], [5, 10], [5, 10],         // 00111xxxx
-    [5, 10], [5, 10], [5, 10], [5, 10],
-    [5, 10], [5, 10], [5, 10], [5, 10],
-    [5, 10], [5, 10], [5, 10], [5, 10],
-    [5, 11], [5, 11], [5, 11], [5, 11],         // 01000xxxx
-    [5, 11], [5, 11], [5, 11], [5, 11],
-    [5, 11], [5, 11], [5, 11], [5, 11],
-    [5, 11], [5, 11], [5, 11], [5, 11],
-    [7, 27], [7, 27], [7, 27], [7, 27],         // 0100100xx
-    [8, 59], [8, 59],                           // 01001010x
-    [8, 60], [8, 60],                           // 01001011x
-    [9, 1472],                                  // 010011000
-    [9, 1536],                                  // 010011001
-    [9, 1600],                                  // 010011010
-    [9, 1728],                                  // 010011011
-    [7, 18], [7, 18], [7, 18], [7, 18],         // 0100111xx
-    [7, 24], [7, 24], [7, 24], [7, 24],         // 0101000xx
-    [8, 49], [8, 49],                           // 01010010x
-    [8, 50], [8, 50],                           // 01010011x
-    [8, 51], [8, 51],                           // 01010100x
-    [8, 52], [8, 52],                           // 01010101x
-    [7, 25], [7, 25], [7, 25], [7, 25],         // 0101011xx
-    [8, 55], [8, 55],                           // 01011000x
-    [8, 56], [8, 56],                           // 01011001x
-    [8, 57], [8, 57],                           // 01011010x
-    [8, 58], [8, 58],                           // 01011011x
-    [6, 192], [6, 192], [6, 192], [6, 192],     // 010111xxx
-    [6, 192], [6, 192], [6, 192], [6, 192],
-    [6, 1664], [6, 1664], [6, 1664], [6, 1664], // 011000xxx
-    [6, 1664], [6, 1664], [6, 1664], [6, 1664],
-    [8, 448], [8, 448],                         // 01100100x
-    [8, 512], [8, 512],                         // 01100101x
-    [9, 704],                                   // 011001100
-    [9, 768],                                   // 011001101
-    [8, 640], [8, 640],                         // 01100111x
-    [8, 576], [8, 576],                         // 01101000x
-    [9, 832],                                   // 011010010
-    [9, 896],                                   // 011010011
-    [9, 960],                                   // 011010100
-    [9, 1024],                                  // 011010101
-    [9, 1088],                                  // 011010110
-    [9, 1152],                                  // 011010111
-    [9, 1216],                                  // 011011000
-    [9, 1280],                                  // 011011001
-    [9, 1344],                                  // 011011010
-    [9, 1408],                                  // 011011011
-    [7, 256], [7, 256], [7, 256], [7, 256],     // 0110111xx
-    [4, 2], [4, 2], [4, 2], [4, 2],             // 0111xxxxx
-    [4, 2], [4, 2], [4, 2], [4, 2],
-    [4, 2], [4, 2], [4, 2], [4, 2],
-    [4, 2], [4, 2], [4, 2], [4, 2],
-    [4, 2], [4, 2], [4, 2], [4, 2],
-    [4, 2], [4, 2], [4, 2], [4, 2],
-    [4, 2], [4, 2], [4, 2], [4, 2],
-    [4, 2], [4, 2], [4, 2], [4, 2],
-    [4, 3], [4, 3], [4, 3], [4, 3],             // 1000xxxxx
-    [4, 3], [4, 3], [4, 3], [4, 3],
-    [4, 3], [4, 3], [4, 3], [4, 3],
-    [4, 3], [4, 3], [4, 3], [4, 3],
-    [4, 3], [4, 3], [4, 3], [4, 3],
-    [4, 3], [4, 3], [4, 3], [4, 3],
-    [4, 3], [4, 3], [4, 3], [4, 3],
-    [4, 3], [4, 3], [4, 3], [4, 3],
-    [5, 128], [5, 128], [5, 128], [5, 128],     // 10010xxxx
-    [5, 128], [5, 128], [5, 128], [5, 128],
-    [5, 128], [5, 128], [5, 128], [5, 128],
-    [5, 128], [5, 128], [5, 128], [5, 128],
-    [5, 8], [5, 8], [5, 8], [5, 8],             // 10011xxxx
-    [5, 8], [5, 8], [5, 8], [5, 8],
-    [5, 8], [5, 8], [5, 8], [5, 8],
-    [5, 8], [5, 8], [5, 8], [5, 8],
-    [5, 9], [5, 9], [5, 9], [5, 9],             // 10100xxxx
-    [5, 9], [5, 9], [5, 9], [5, 9],
-    [5, 9], [5, 9], [5, 9], [5, 9],
-    [5, 9], [5, 9], [5, 9], [5, 9],
-    [6, 16], [6, 16], [6, 16], [6, 16],         // 101010xxx
-    [6, 16], [6, 16], [6, 16], [6, 16],
-    [6, 17], [6, 17], [6, 17], [6, 17],         // 101011xxx
-    [6, 17], [6, 17], [6, 17], [6, 17],
-    [4, 4], [4, 4], [4, 4], [4, 4],             // 1011xxxxx
-    [4, 4], [4, 4], [4, 4], [4, 4],
-    [4, 4], [4, 4], [4, 4], [4, 4],
-    [4, 4], [4, 4], [4, 4], [4, 4],
-    [4, 4], [4, 4], [4, 4], [4, 4],
-    [4, 4], [4, 4], [4, 4], [4, 4],
-    [4, 4], [4, 4], [4, 4], [4, 4],
-    [4, 4], [4, 4], [4, 4], [4, 4],
-    [4, 5], [4, 5], [4, 5], [4, 5],             // 1100xxxxx
-    [4, 5], [4, 5], [4, 5], [4, 5],
-    [4, 5], [4, 5], [4, 5], [4, 5],
-    [4, 5], [4, 5], [4, 5], [4, 5],
-    [4, 5], [4, 5], [4, 5], [4, 5],
-    [4, 5], [4, 5], [4, 5], [4, 5],
-    [4, 5], [4, 5], [4, 5], [4, 5],
-    [4, 5], [4, 5], [4, 5], [4, 5],
-    [6, 14], [6, 14], [6, 14], [6, 14],         // 110100xxx
-    [6, 14], [6, 14], [6, 14], [6, 14],
-    [6, 15], [6, 15], [6, 15], [6, 15],         // 110101xxx
-    [6, 15], [6, 15], [6, 15], [6, 15],
-    [5, 64], [5, 64], [5, 64], [5, 64],         // 11011xxxx
-    [5, 64], [5, 64], [5, 64], [5, 64],
-    [5, 64], [5, 64], [5, 64], [5, 64],
-    [5, 64], [5, 64], [5, 64], [5, 64],
-    [4, 6], [4, 6], [4, 6], [4, 6],             // 1110xxxxx
-    [4, 6], [4, 6], [4, 6], [4, 6],
-    [4, 6], [4, 6], [4, 6], [4, 6],
-    [4, 6], [4, 6], [4, 6], [4, 6],
-    [4, 6], [4, 6], [4, 6], [4, 6],
-    [4, 6], [4, 6], [4, 6], [4, 6],
-    [4, 6], [4, 6], [4, 6], [4, 6],
-    [4, 6], [4, 6], [4, 6], [4, 6],
-    [4, 7], [4, 7], [4, 7], [4, 7],             // 1111xxxxx
-    [4, 7], [4, 7], [4, 7], [4, 7],
-    [4, 7], [4, 7], [4, 7], [4, 7],
-    [4, 7], [4, 7], [4, 7], [4, 7],
-    [4, 7], [4, 7], [4, 7], [4, 7],
-    [4, 7], [4, 7], [4, 7], [4, 7],
-    [4, 7], [4, 7], [4, 7], [4, 7],
-    [4, 7], [4, 7], [4, 7], [4, 7]
-  ];
-
-  var blackTable1 = [
-    [-1, -1], [-1, -1],                             // 000000000000x
-    [12, ccittEOL], [12, ccittEOL],                 // 000000000001x
-    [-1, -1], [-1, -1], [-1, -1], [-1, -1],         // 00000000001xx
-    [-1, -1], [-1, -1], [-1, -1], [-1, -1],         // 00000000010xx
-    [-1, -1], [-1, -1], [-1, -1], [-1, -1],         // 00000000011xx
-    [-1, -1], [-1, -1], [-1, -1], [-1, -1],         // 00000000100xx
-    [-1, -1], [-1, -1], [-1, -1], [-1, -1],         // 00000000101xx
-    [-1, -1], [-1, -1], [-1, -1], [-1, -1],         // 00000000110xx
-    [-1, -1], [-1, -1], [-1, -1], [-1, -1],         // 00000000111xx
-    [11, 1792], [11, 1792], [11, 1792], [11, 1792], // 00000001000xx
-    [12, 1984], [12, 1984],                         // 000000010010x
-    [12, 2048], [12, 2048],                         // 000000010011x
-    [12, 2112], [12, 2112],                         // 000000010100x
-    [12, 2176], [12, 2176],                         // 000000010101x
-    [12, 2240], [12, 2240],                         // 000000010110x
-    [12, 2304], [12, 2304],                         // 000000010111x
-    [11, 1856], [11, 1856], [11, 1856], [11, 1856], // 00000001100xx
-    [11, 1920], [11, 1920], [11, 1920], [11, 1920], // 00000001101xx
-    [12, 2368], [12, 2368],                         // 000000011100x
-    [12, 2432], [12, 2432],                         // 000000011101x
-    [12, 2496], [12, 2496],                         // 000000011110x
-    [12, 2560], [12, 2560],                         // 000000011111x
-    [10, 18], [10, 18], [10, 18], [10, 18],         // 0000001000xxx
-    [10, 18], [10, 18], [10, 18], [10, 18],
-    [12, 52], [12, 52],                             // 000000100100x
-    [13, 640],                                      // 0000001001010
-    [13, 704],                                      // 0000001001011
-    [13, 768],                                      // 0000001001100
-    [13, 832],                                      // 0000001001101
-    [12, 55], [12, 55],                             // 000000100111x
-    [12, 56], [12, 56],                             // 000000101000x
-    [13, 1280],                                     // 0000001010010
-    [13, 1344],                                     // 0000001010011
-    [13, 1408],                                     // 0000001010100
-    [13, 1472],                                     // 0000001010101
-    [12, 59], [12, 59],                             // 000000101011x
-    [12, 60], [12, 60],                             // 000000101100x
-    [13, 1536],                                     // 0000001011010
-    [13, 1600],                                     // 0000001011011
-    [11, 24], [11, 24], [11, 24], [11, 24],         // 00000010111xx
-    [11, 25], [11, 25], [11, 25], [11, 25],         // 00000011000xx
-    [13, 1664],                                     // 0000001100100
-    [13, 1728],                                     // 0000001100101
-    [12, 320], [12, 320],                           // 000000110011x
-    [12, 384], [12, 384],                           // 000000110100x
-    [12, 448], [12, 448],                           // 000000110101x
-    [13, 512],                                      // 0000001101100
-    [13, 576],                                      // 0000001101101
-    [12, 53], [12, 53],                             // 000000110111x
-    [12, 54], [12, 54],                             // 000000111000x
-    [13, 896],                                      // 0000001110010
-    [13, 960],                                      // 0000001110011
-    [13, 1024],                                     // 0000001110100
-    [13, 1088],                                     // 0000001110101
-    [13, 1152],                                     // 0000001110110
-    [13, 1216],                                     // 0000001110111
-    [10, 64], [10, 64], [10, 64], [10, 64],         // 0000001111xxx
-    [10, 64], [10, 64], [10, 64], [10, 64]
-  ];
-
-  var blackTable2 = [
-    [8, 13], [8, 13], [8, 13], [8, 13],     // 00000100xxxx
-    [8, 13], [8, 13], [8, 13], [8, 13],
-    [8, 13], [8, 13], [8, 13], [8, 13],
-    [8, 13], [8, 13], [8, 13], [8, 13],
-    [11, 23], [11, 23],                     // 00000101000x
-    [12, 50],                               // 000001010010
-    [12, 51],                               // 000001010011
-    [12, 44],                               // 000001010100
-    [12, 45],                               // 000001010101
-    [12, 46],                               // 000001010110
-    [12, 47],                               // 000001010111
-    [12, 57],                               // 000001011000
-    [12, 58],                               // 000001011001
-    [12, 61],                               // 000001011010
-    [12, 256],                              // 000001011011
-    [10, 16], [10, 16], [10, 16], [10, 16], // 0000010111xx
-    [10, 17], [10, 17], [10, 17], [10, 17], // 0000011000xx
-    [12, 48],                               // 000001100100
-    [12, 49],                               // 000001100101
-    [12, 62],                               // 000001100110
-    [12, 63],                               // 000001100111
-    [12, 30],                               // 000001101000
-    [12, 31],                               // 000001101001
-    [12, 32],                               // 000001101010
-    [12, 33],                               // 000001101011
-    [12, 40],                               // 000001101100
-    [12, 41],                               // 000001101101
-    [11, 22], [11, 22],                     // 00000110111x
-    [8, 14], [8, 14], [8, 14], [8, 14],     // 00000111xxxx
-    [8, 14], [8, 14], [8, 14], [8, 14],
-    [8, 14], [8, 14], [8, 14], [8, 14],
-    [8, 14], [8, 14], [8, 14], [8, 14],
-    [7, 10], [7, 10], [7, 10], [7, 10],     // 0000100xxxxx
-    [7, 10], [7, 10], [7, 10], [7, 10],
-    [7, 10], [7, 10], [7, 10], [7, 10],
-    [7, 10], [7, 10], [7, 10], [7, 10],
-    [7, 10], [7, 10], [7, 10], [7, 10],
-    [7, 10], [7, 10], [7, 10], [7, 10],
-    [7, 10], [7, 10], [7, 10], [7, 10],
-    [7, 10], [7, 10], [7, 10], [7, 10],
-    [7, 11], [7, 11], [7, 11], [7, 11],     // 0000101xxxxx
-    [7, 11], [7, 11], [7, 11], [7, 11],
-    [7, 11], [7, 11], [7, 11], [7, 11],
-    [7, 11], [7, 11], [7, 11], [7, 11],
-    [7, 11], [7, 11], [7, 11], [7, 11],
-    [7, 11], [7, 11], [7, 11], [7, 11],
-    [7, 11], [7, 11], [7, 11], [7, 11],
-    [7, 11], [7, 11], [7, 11], [7, 11],
-    [9, 15], [9, 15], [9, 15], [9, 15],     // 000011000xxx
-    [9, 15], [9, 15], [9, 15], [9, 15],
-    [12, 128],                              // 000011001000
-    [12, 192],                              // 000011001001
-    [12, 26],                               // 000011001010
-    [12, 27],                               // 000011001011
-    [12, 28],                               // 000011001100
-    [12, 29],                               // 000011001101
-    [11, 19], [11, 19],                     // 00001100111x
-    [11, 20], [11, 20],                     // 00001101000x
-    [12, 34],                               // 000011010010
-    [12, 35],                               // 000011010011
-    [12, 36],                               // 000011010100
-    [12, 37],                               // 000011010101
-    [12, 38],                               // 000011010110
-    [12, 39],                               // 000011010111
-    [11, 21], [11, 21],                     // 00001101100x
-    [12, 42],                               // 000011011010
-    [12, 43],                               // 000011011011
-    [10, 0], [10, 0], [10, 0], [10, 0],     // 0000110111xx
-    [7, 12], [7, 12], [7, 12], [7, 12],     // 0000111xxxxx
-    [7, 12], [7, 12], [7, 12], [7, 12],
-    [7, 12], [7, 12], [7, 12], [7, 12],
-    [7, 12], [7, 12], [7, 12], [7, 12],
-    [7, 12], [7, 12], [7, 12], [7, 12],
-    [7, 12], [7, 12], [7, 12], [7, 12],
-    [7, 12], [7, 12], [7, 12], [7, 12],
-    [7, 12], [7, 12], [7, 12], [7, 12]
-  ];
-
-  var blackTable3 = [
-    [-1, -1], [-1, -1], [-1, -1], [-1, -1], // 0000xx
-    [6, 9],                                 // 000100
-    [6, 8],                                 // 000101
-    [5, 7], [5, 7],                         // 00011x
-    [4, 6], [4, 6], [4, 6], [4, 6],         // 0010xx
-    [4, 5], [4, 5], [4, 5], [4, 5],         // 0011xx
-    [3, 1], [3, 1], [3, 1], [3, 1],         // 010xxx
-    [3, 1], [3, 1], [3, 1], [3, 1],
-    [3, 4], [3, 4], [3, 4], [3, 4],         // 011xxx
-    [3, 4], [3, 4], [3, 4], [3, 4],
-    [2, 3], [2, 3], [2, 3], [2, 3],         // 10xxxx
-    [2, 3], [2, 3], [2, 3], [2, 3],
-    [2, 3], [2, 3], [2, 3], [2, 3],
-    [2, 3], [2, 3], [2, 3], [2, 3],
-    [2, 2], [2, 2], [2, 2], [2, 2],         // 11xxxx
-    [2, 2], [2, 2], [2, 2], [2, 2],
-    [2, 2], [2, 2], [2, 2], [2, 2],
-    [2, 2], [2, 2], [2, 2], [2, 2]
-  ];
-
-  function CCITTFaxStream(str, params) {
-    this.str = str;
-    this.dict = str.dict;
-
-    params = params || new Dict();
-
-    this.encoding = params.get('K') || 0;
-    this.eoline = params.get('EndOfLine') || false;
-    this.byteAlign = params.get('EncodedByteAlign') || false;
-    this.columns = params.get('Columns') || 1728;
-    this.rows = params.get('Rows') || 0;
-    var eoblock = params.get('EndOfBlock');
-    if (eoblock == null)
-      eoblock = true;
-    this.eoblock = eoblock;
-    this.black = params.get('BlackIs1') || false;
-
-    this.codingLine = new Uint32Array(this.columns + 1);
-    this.refLine = new Uint32Array(this.columns + 2);
-
-    this.codingLine[0] = this.columns;
-    this.codingPos = 0;
-
-    this.row = 0;
-    this.nextLine2D = this.encoding < 0;
-    this.inputBits = 0;
-    this.inputBuf = 0;
-    this.outputBits = 0;
-    this.buf = EOF;
-
-    var code1;
-    while ((code1 = this.lookBits(12)) == 0) {
-      this.eatBits(1);
-    }
-    if (code1 == 1) {
-      this.eatBits(12);
-    }
-    if (this.encoding > 0) {
-      this.nextLine2D = !this.lookBits(1);
-      this.eatBits(1);
-    }
-
-    DecodeStream.call(this);
-  }
-
-  CCITTFaxStream.prototype = Object.create(DecodeStream.prototype);
-
-  CCITTFaxStream.prototype.readBlock = function CCITTFaxStream_readBlock() {
-    while (!this.eof) {
-      var c = this.lookChar();
-      this.buf = EOF;
-      this.ensureBuffer(this.bufferLength + 1);
-      this.buffer[this.bufferLength++] = c;
-    }
-  };
-
-  CCITTFaxStream.prototype.addPixels =
-    function ccittFaxStreamAddPixels(a1, blackPixels) {
-    var codingLine = this.codingLine;
-    var codingPos = this.codingPos;
-
-    if (a1 > codingLine[codingPos]) {
-      if (a1 > this.columns) {
-        info('row is wrong length');
-        this.err = true;
-        a1 = this.columns;
-      }
-      if ((codingPos & 1) ^ blackPixels) {
-        ++codingPos;
-      }
-
-      codingLine[codingPos] = a1;
-    }
-    this.codingPos = codingPos;
-  };
-
-  CCITTFaxStream.prototype.addPixelsNeg =
-    function ccittFaxStreamAddPixelsNeg(a1, blackPixels) {
-    var codingLine = this.codingLine;
-    var codingPos = this.codingPos;
-
-    if (a1 > codingLine[codingPos]) {
-      if (a1 > this.columns) {
-        info('row is wrong length');
-        this.err = true;
-        a1 = this.columns;
-      }
-      if ((codingPos & 1) ^ blackPixels)
-        ++codingPos;
-
-      codingLine[codingPos] = a1;
-    } else if (a1 < codingLine[codingPos]) {
-      if (a1 < 0) {
-        info('invalid code');
-        this.err = true;
-        a1 = 0;
-      }
-      while (codingPos > 0 && a1 < codingLine[codingPos - 1])
-        --codingPos;
-      codingLine[codingPos] = a1;
-    }
-
-    this.codingPos = codingPos;
-  };
-
-  CCITTFaxStream.prototype.lookChar = function CCITTFaxStream_lookChar() {
-    if (this.buf != EOF)
-      return this.buf;
-
-    var refLine = this.refLine;
-    var codingLine = this.codingLine;
-    var columns = this.columns;
-
-    var refPos, blackPixels, bits;
-
-    if (this.outputBits == 0) {
-      if (this.eof)
-        return null;
-
-      this.err = false;
-
-      var code1, code2, code3;
-      if (this.nextLine2D) {
-        for (var i = 0; codingLine[i] < columns; ++i)
-          refLine[i] = codingLine[i];
-
-        refLine[i++] = columns;
-        refLine[i] = columns;
-        codingLine[0] = 0;
-        this.codingPos = 0;
-        refPos = 0;
-        blackPixels = 0;
-
-        while (codingLine[this.codingPos] < columns) {
-          code1 = this.getTwoDimCode();
-          switch (code1) {
-            case twoDimPass:
-              this.addPixels(refLine[refPos + 1], blackPixels);
-              if (refLine[refPos + 1] < columns)
-                refPos += 2;
-              break;
-            case twoDimHoriz:
-              code1 = code2 = 0;
-              if (blackPixels) {
-                do {
-                  code1 += (code3 = this.getBlackCode());
-                } while (code3 >= 64);
-                do {
-                  code2 += (code3 = this.getWhiteCode());
-                } while (code3 >= 64);
-              } else {
-                do {
-                  code1 += (code3 = this.getWhiteCode());
-                } while (code3 >= 64);
-                do {
-                  code2 += (code3 = this.getBlackCode());
-                } while (code3 >= 64);
-              }
-              this.addPixels(codingLine[this.codingPos] +
-                             code1, blackPixels);
-              if (codingLine[this.codingPos] < columns) {
-                this.addPixels(codingLine[this.codingPos] + code2,
-                               blackPixels ^ 1);
-              }
-              while (refLine[refPos] <= codingLine[this.codingPos] &&
-                     refLine[refPos] < columns) {
-                refPos += 2;
-              }
-              break;
-            case twoDimVertR3:
-              this.addPixels(refLine[refPos] + 3, blackPixels);
-              blackPixels ^= 1;
-              if (codingLine[this.codingPos] < columns) {
-                ++refPos;
-                while (refLine[refPos] <= codingLine[this.codingPos] &&
-                       refLine[refPos] < columns)
-                  refPos += 2;
-              }
-              break;
-            case twoDimVertR2:
-              this.addPixels(refLine[refPos] + 2, blackPixels);
-              blackPixels ^= 1;
-              if (codingLine[this.codingPos] < columns) {
-                ++refPos;
-                while (refLine[refPos] <= codingLine[this.codingPos] &&
-                       refLine[refPos] < columns) {
-                  refPos += 2;
-                }
-              }
-              break;
-            case twoDimVertR1:
-              this.addPixels(refLine[refPos] + 1, blackPixels);
-              blackPixels ^= 1;
-              if (codingLine[this.codingPos] < columns) {
-                ++refPos;
-                while (refLine[refPos] <= codingLine[this.codingPos] &&
-                       refLine[refPos] < columns)
-                  refPos += 2;
-              }
-              break;
-            case twoDimVert0:
-              this.addPixels(refLine[refPos], blackPixels);
-              blackPixels ^= 1;
-              if (codingLine[this.codingPos] < columns) {
-                ++refPos;
-                while (refLine[refPos] <= codingLine[this.codingPos] &&
-                       refLine[refPos] < columns)
-                  refPos += 2;
-              }
-              break;
-            case twoDimVertL3:
-              this.addPixelsNeg(refLine[refPos] - 3, blackPixels);
-              blackPixels ^= 1;
-              if (codingLine[this.codingPos] < columns) {
-                if (refPos > 0)
-                  --refPos;
-                else
-                  ++refPos;
-                while (refLine[refPos] <= codingLine[this.codingPos] &&
-                       refLine[refPos] < columns)
-                  refPos += 2;
-              }
-              break;
-            case twoDimVertL2:
-              this.addPixelsNeg(refLine[refPos] - 2, blackPixels);
-              blackPixels ^= 1;
-              if (codingLine[this.codingPos] < columns) {
-                if (refPos > 0)
-                  --refPos;
-                else
-                  ++refPos;
-                while (refLine[refPos] <= codingLine[this.codingPos] &&
-                       refLine[refPos] < columns)
-                  refPos += 2;
-              }
-              break;
-            case twoDimVertL1:
-              this.addPixelsNeg(refLine[refPos] - 1, blackPixels);
-              blackPixels ^= 1;
-              if (codingLine[this.codingPos] < columns) {
-                if (refPos > 0)
-                  --refPos;
-                else
-                  ++refPos;
-
-                while (refLine[refPos] <= codingLine[this.codingPos] &&
-                       refLine[refPos] < columns)
-                  refPos += 2;
-              }
-              break;
-            case EOF:
-              this.addPixels(columns, 0);
-              this.eof = true;
-              break;
-            default:
-              info('bad 2d code');
-              this.addPixels(columns, 0);
-              this.err = true;
-          }
-        }
-      } else {
-        codingLine[0] = 0;
-        this.codingPos = 0;
-        blackPixels = 0;
-        while (codingLine[this.codingPos] < columns) {
-          code1 = 0;
-          if (blackPixels) {
-            do {
-              code1 += (code3 = this.getBlackCode());
-            } while (code3 >= 64);
-          } else {
-            do {
-              code1 += (code3 = this.getWhiteCode());
-            } while (code3 >= 64);
-          }
-          this.addPixels(codingLine[this.codingPos] + code1, blackPixels);
-          blackPixels ^= 1;
-        }
-      }
-
-      if (this.byteAlign)
-        this.inputBits &= ~7;
-
-      var gotEOL = false;
-
-      if (!this.eoblock && this.row == this.rows - 1) {
-        this.eof = true;
-      } else {
-        code1 = this.lookBits(12);
-        while (code1 == 0) {
-          this.eatBits(1);
-          code1 = this.lookBits(12);
-        }
-        if (code1 == 1) {
-          this.eatBits(12);
-          gotEOL = true;
-        } else if (code1 == EOF) {
-          this.eof = true;
-        }
-      }
-
-      if (!this.eof && this.encoding > 0) {
-        this.nextLine2D = !this.lookBits(1);
-        this.eatBits(1);
-      }
-
-      if (this.eoblock && gotEOL) {
-        code1 = this.lookBits(12);
-        if (code1 == 1) {
-          this.eatBits(12);
-          if (this.encoding > 0) {
-            this.lookBits(1);
-            this.eatBits(1);
-          }
-          if (this.encoding >= 0) {
-            for (var i = 0; i < 4; ++i) {
-              code1 = this.lookBits(12);
-              if (code1 != 1)
-                info('bad rtc code: ' + code1);
-              this.eatBits(12);
-              if (this.encoding > 0) {
-                this.lookBits(1);
-                this.eatBits(1);
-              }
-            }
-          }
-          this.eof = true;
-        }
-      } else if (this.err && this.eoline) {
-        while (true) {
-          code1 = this.lookBits(13);
-          if (code1 == EOF) {
-            this.eof = true;
-            return null;
-          }
-          if ((code1 >> 1) == 1) {
-            break;
-          }
-          this.eatBits(1);
-        }
-        this.eatBits(12);
-        if (this.encoding > 0) {
-          this.eatBits(1);
-          this.nextLine2D = !(code1 & 1);
-        }
-      }
-
-      if (codingLine[0] > 0)
-        this.outputBits = codingLine[this.codingPos = 0];
-      else
-        this.outputBits = codingLine[this.codingPos = 1];
-      this.row++;
-    }
-
-    if (this.outputBits >= 8) {
-      this.buf = (this.codingPos & 1) ? 0 : 0xFF;
-      this.outputBits -= 8;
-      if (this.outputBits == 0 && codingLine[this.codingPos] < columns) {
-        this.codingPos++;
-        this.outputBits = (codingLine[this.codingPos] -
-                           codingLine[this.codingPos - 1]);
-      }
-    } else {
-      var bits = 8;
-      this.buf = 0;
-      do {
-        if (this.outputBits > bits) {
-          this.buf <<= bits;
-          if (!(this.codingPos & 1)) {
-            this.buf |= 0xFF >> (8 - bits);
-          }
-          this.outputBits -= bits;
-          bits = 0;
-        } else {
-          this.buf <<= this.outputBits;
-          if (!(this.codingPos & 1)) {
-            this.buf |= 0xFF >> (8 - this.outputBits);
-          }
-          bits -= this.outputBits;
-          this.outputBits = 0;
-          if (codingLine[this.codingPos] < columns) {
-            this.codingPos++;
-            this.outputBits = (codingLine[this.codingPos] -
-                               codingLine[this.codingPos - 1]);
-          } else if (bits > 0) {
-            this.buf <<= bits;
-            bits = 0;
-          }
-        }
-      } while (bits);
-    }
-    if (this.black) {
-      this.buf ^= 0xFF;
-    }
-    return this.buf;
-  };
-
-  // This functions returns the code found from the table.
-  // The start and end parameters set the boundaries for searching the table.
-  // The limit parameter is optional. Function returns an array with three
-  // values. The first array element indicates whether a valid code is being
-  // returned. The second array element is the actual code. The third array
-  // element indicates whether EOF was reached.
-  CCITTFaxStream.prototype.findTableCode =
-    function ccittFaxStreamFindTableCode(start, end, table, limit) {
-
-    var limitValue = limit || 0;
-    for (var i = start; i <= end; ++i) {
-      var code = this.lookBits(i);
-      if (code == EOF)
-        return [true, 1, false];
-      if (i < end)
-        code <<= end - i;
-      if (!limitValue || code >= limitValue) {
-        var p = table[code - limitValue];
-        if (p[0] == i) {
-          this.eatBits(i);
-          return [true, p[1], true];
-        }
-      }
-    }
-    return [false, 0, false];
-  };
-
-  CCITTFaxStream.prototype.getTwoDimCode =
-    function ccittFaxStreamGetTwoDimCode() {
-
-    var code = 0;
-    var p;
-    if (this.eoblock) {
-      code = this.lookBits(7);
-      p = twoDimTable[code];
-      if (p && p[0] > 0) {
-        this.eatBits(p[0]);
-        return p[1];
-      }
-    } else {
-      var result = this.findTableCode(1, 7, twoDimTable);
-      if (result[0] && result[2])
-        return result[1];
-    }
-    info('Bad two dim code');
-    return EOF;
-  };
-
-  CCITTFaxStream.prototype.getWhiteCode =
-    function ccittFaxStreamGetWhiteCode() {
-
-    var code = 0;
-    var p;
-    var n;
-    if (this.eoblock) {
-      code = this.lookBits(12);
-      if (code == EOF)
-        return 1;
-
-      if ((code >> 5) == 0)
-        p = whiteTable1[code];
-      else
-        p = whiteTable2[code >> 3];
-
-      if (p[0] > 0) {
-        this.eatBits(p[0]);
-        return p[1];
-      }
-    } else {
-      var result = this.findTableCode(1, 9, whiteTable2);
-      if (result[0])
-        return result[1];
-
-      result = this.findTableCode(11, 12, whiteTable1);
-      if (result[0])
-        return result[1];
-    }
-    info('bad white code');
-    this.eatBits(1);
-    return 1;
-  };
-
-  CCITTFaxStream.prototype.getBlackCode =
-    function ccittFaxStreamGetBlackCode() {
-
-    var code, p;
-    if (this.eoblock) {
-      code = this.lookBits(13);
-      if (code == EOF)
-        return 1;
-      if ((code >> 7) == 0)
-        p = blackTable1[code];
-      else if ((code >> 9) == 0 && (code >> 7) != 0)
-        p = blackTable2[(code >> 1) - 64];
-      else
-        p = blackTable3[code >> 7];
-
-      if (p[0] > 0) {
-        this.eatBits(p[0]);
-        return p[1];
-      }
-    } else {
-      var result = this.findTableCode(2, 6, blackTable3);
-      if (result[0])
-        return result[1];
-
-      result = this.findTableCode(7, 12, blackTable2, 64);
-      if (result[0])
-        return result[1];
-
-      result = this.findTableCode(10, 13, blackTable1);
-      if (result[0])
-        return result[1];
-    }
-    info('bad black code');
-    this.eatBits(1);
-    return 1;
-  };
-
-  CCITTFaxStream.prototype.lookBits = function CCITTFaxStream_lookBits(n) {
-    var c;
-    while (this.inputBits < n) {
-      if ((c = this.str.getByte()) == null) {
-        if (this.inputBits == 0)
-          return EOF;
-        return ((this.inputBuf << (n - this.inputBits)) &
-                (0xFFFF >> (16 - n)));
-      }
-      this.inputBuf = (this.inputBuf << 8) + c;
-      this.inputBits += 8;
-    }
-    return (this.inputBuf >> (this.inputBits - n)) & (0xFFFF >> (16 - n));
-  };
-
-  CCITTFaxStream.prototype.eatBits = function CCITTFaxStream_eatBits(n) {
-    if ((this.inputBits -= n) < 0)
-      this.inputBits = 0;
-  };
-
-  return CCITTFaxStream;
-})();
-
-var LZWStream = (function LZWStreamClosure() {
-  function LZWStream(str, earlyChange) {
-    this.str = str;
-    this.dict = str.dict;
-    this.cachedData = 0;
-    this.bitsCached = 0;
-
-    var maxLzwDictionarySize = 4096;
-    var lzwState = {
-      earlyChange: earlyChange,
-      codeLength: 9,
-      nextCode: 258,
-      dictionaryValues: new Uint8Array(maxLzwDictionarySize),
-      dictionaryLengths: new Uint16Array(maxLzwDictionarySize),
-      dictionaryPrevCodes: new Uint16Array(maxLzwDictionarySize),
-      currentSequence: new Uint8Array(maxLzwDictionarySize),
-      currentSequenceLength: 0
-    };
-    for (var i = 0; i < 256; ++i) {
-      lzwState.dictionaryValues[i] = i;
-      lzwState.dictionaryLengths[i] = 1;
-    }
-    this.lzwState = lzwState;
-
-    DecodeStream.call(this);
-  }
-
-  LZWStream.prototype = Object.create(DecodeStream.prototype);
-
-  LZWStream.prototype.readBits = function LZWStream_readBits(n) {
-    var bitsCached = this.bitsCached;
-    var cachedData = this.cachedData;
-    while (bitsCached < n) {
-      var c = this.str.getByte();
-      if (c == null) {
-        this.eof = true;
-        return null;
-      }
-      cachedData = (cachedData << 8) | c;
-      bitsCached += 8;
-    }
-    this.bitsCached = (bitsCached -= n);
-    this.cachedData = cachedData;
-    this.lastCode = null;
-    return (cachedData >>> bitsCached) & ((1 << n) - 1);
-  };
-
-  LZWStream.prototype.readBlock = function LZWStream_readBlock() {
-    var blockSize = 512;
-    var estimatedDecodedSize = blockSize * 2, decodedSizeDelta = blockSize;
-    var i, j, q;
-
-    var lzwState = this.lzwState;
-    if (!lzwState)
-      return; // eof was found
-
-    var earlyChange = lzwState.earlyChange;
-    var nextCode = lzwState.nextCode;
-    var dictionaryValues = lzwState.dictionaryValues;
-    var dictionaryLengths = lzwState.dictionaryLengths;
-    var dictionaryPrevCodes = lzwState.dictionaryPrevCodes;
-    var codeLength = lzwState.codeLength;
-    var prevCode = lzwState.prevCode;
-    var currentSequence = lzwState.currentSequence;
-    var currentSequenceLength = lzwState.currentSequenceLength;
-
-    var decodedLength = 0;
-    var currentBufferLength = this.bufferLength;
-    var buffer = this.ensureBuffer(this.bufferLength + estimatedDecodedSize);
-
-    for (i = 0; i < blockSize; i++) {
-      var code = this.readBits(codeLength);
-      var hasPrev = currentSequenceLength > 0;
-      if (code < 256) {
-        currentSequence[0] = code;
-        currentSequenceLength = 1;
-      } else if (code >= 258) {
-        if (code < nextCode) {
-          currentSequenceLength = dictionaryLengths[code];
-          for (j = currentSequenceLength - 1, q = code; j >= 0; j--) {
-            currentSequence[j] = dictionaryValues[q];
-            q = dictionaryPrevCodes[q];
-          }
-        } else {
-          currentSequence[currentSequenceLength++] = currentSequence[0];
-        }
-      } else if (code == 256) {
-        codeLength = 9;
-        nextCode = 258;
-        currentSequenceLength = 0;
-        continue;
-      } else {
-        this.eof = true;
-        delete this.lzwState;
-        break;
-      }
-
-      if (hasPrev) {
-        dictionaryPrevCodes[nextCode] = prevCode;
-        dictionaryLengths[nextCode] = dictionaryLengths[prevCode] + 1;
-        dictionaryValues[nextCode] = currentSequence[0];
-        nextCode++;
-        codeLength = (nextCode + earlyChange) & (nextCode + earlyChange - 1) ?
-          codeLength : Math.min(Math.log(nextCode + earlyChange) /
-          0.6931471805599453 + 1, 12) | 0;
-      }
-      prevCode = code;
-
-      decodedLength += currentSequenceLength;
-      if (estimatedDecodedSize < decodedLength) {
-        do {
-          estimatedDecodedSize += decodedSizeDelta;
-        } while (estimatedDecodedSize < decodedLength);
-        buffer = this.ensureBuffer(this.bufferLength + estimatedDecodedSize);
-      }
-      for (j = 0; j < currentSequenceLength; j++)
-        buffer[currentBufferLength++] = currentSequence[j];
-    }
-    lzwState.nextCode = nextCode;
-    lzwState.codeLength = codeLength;
-    lzwState.prevCode = prevCode;
-    lzwState.currentSequenceLength = currentSequenceLength;
-
-    this.bufferLength = currentBufferLength;
-  };
-
-  return LZWStream;
-})();
-
-
-/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
-
-'use strict';
-
-function MessageHandler(name, comObj) {
-  this.name = name;
-  this.comObj = comObj;
-  this.callbackIndex = 1;
-  var callbacks = this.callbacks = {};
-  var ah = this.actionHandler = {};
-
-  ah['console_log'] = [function ahConsoleLog(data) {
-    console.log.apply(console, data);
-  }];
-  ah['console_error'] = [function ahConsoleError(data) {
-    console.error.apply(console, data);
-  }];
-  ah['_warn'] = [function ah_Warn(data) {
-    warn(data);
-  }];
-
-  comObj.onmessage = function messageHandlerComObjOnMessage(event) {
-    var data = event.data;
-    if (data.isReply) {
-      var callbackId = data.callbackId;
-      if (data.callbackId in callbacks) {
-        var callback = callbacks[callbackId];
-        delete callbacks[callbackId];
-        callback(data.data);
-      } else {
-        error('Cannot resolve callback ' + callbackId);
-      }
-    } else if (data.action in ah) {
-      var action = ah[data.action];
-      if (data.callbackId) {
-        var promise = new Promise();
-        promise.then(function(resolvedData) {
-          comObj.postMessage({
-            isReply: true,
-            callbackId: data.callbackId,
-            data: resolvedData
-          });
-        });
-        action[0].call(action[1], data.data, promise);
-      } else {
-        action[0].call(action[1], data.data);
-      }
-    } else {
-      error('Unkown action from worker: ' + data.action);
-    }
-  };
-}
-
-MessageHandler.prototype = {
-  on: function messageHandlerOn(actionName, handler, scope) {
-    var ah = this.actionHandler;
-    if (ah[actionName]) {
-      error('There is already an actionName called "' + actionName + '"');
-    }
-    ah[actionName] = [handler, scope];
-  },
-  /**
-   * Sends a message to the comObj to invoke the action with the supplied data.
-   * @param {String} actionName Action to call.
-   * @param {JSON} data JSON data to send.
-   * @param {function} [callback] Optional callback that will handle a reply.
-   */
-  send: function messageHandlerSend(actionName, data, callback) {
-    var message = {
-      action: actionName,
-      data: data
-    };
-    if (callback) {
-      var callbackId = this.callbackIndex++;
-      this.callbacks[callbackId] = callback;
-      message.callbackId = callbackId;
-    }
-    this.comObj.postMessage(message);
-  }
-};
-
-var WorkerMessageHandler = {
-  setup: function wphSetup(handler) {
-    var pdfModel = null;
-
-    handler.on('test', function wphSetupTest(data) {
-      handler.send('test', data instanceof Uint8Array);
-    });
-
-    handler.on('GetDocRequest', function wphSetupDoc(data) {
-      // Create only the model of the PDFDoc, which is enough for
-      // processing the content of the pdf.
-      var pdfData = data.data;
-      var pdfPassword = data.params.password;
-      try {
-        pdfModel = new PDFDocument(new Stream(pdfData), pdfPassword);
-      } catch (e) {
-        if (e instanceof PasswordException) {
-          if (e.code === 'needpassword') {
-            handler.send('NeedPassword', {
-              exception: e
-            });
-          } else if (e.code === 'incorrectpassword') {
-            handler.send('IncorrectPassword', {
-              exception: e
-            });
-          }
-
-          return;
-        } else {
-          throw e;
-        }
-      }
-      var doc = {
-        numPages: pdfModel.numPages,
-        fingerprint: pdfModel.getFingerprint(),
-        destinations: pdfModel.catalog.destinations,
-        outline: pdfModel.catalog.documentOutline,
-        info: pdfModel.getDocumentInfo(),
-        metadata: pdfModel.catalog.metadata,
-        encrypted: !!pdfModel.xref.encrypt
-      };
-      handler.send('GetDoc', {pdfInfo: doc});
-    });
-
-    handler.on('GetPageRequest', function wphSetupGetPage(data) {
-      var pageNumber = data.pageIndex + 1;
-      var pdfPage = pdfModel.getPage(pageNumber);
-      var page = {
-        pageIndex: data.pageIndex,
-        rotate: pdfPage.rotate,
-        ref: pdfPage.ref,
-        view: pdfPage.view
-      };
-      handler.send('GetPage', {pageInfo: page});
-    });
-
-    handler.on('GetData', function wphSetupGetData(data, promise) {
-      promise.resolve(pdfModel.stream.bytes);
-    });
-
-    handler.on('GetAnnotationsRequest', function wphSetupGetAnnotations(data) {
-      var pdfPage = pdfModel.getPage(data.pageIndex + 1);
-      handler.send('GetAnnotations', {
-        pageIndex: data.pageIndex,
-        annotations: pdfPage.getAnnotations()
-      });
-    });
-
-    handler.on('RenderPageRequest', function wphSetupRenderPage(data) {
-      var pageNum = data.pageIndex + 1;
-
-      // The following code does quite the same as
-      // Page.prototype.startRendering, but stops at one point and sends the
-      // result back to the main thread.
-      var gfx = new CanvasGraphics(null);
-
-      var start = Date.now();
-
-      var dependency = [];
-      var operatorList = null;
-      try {
-        var page = pdfModel.getPage(pageNum);
-        // Pre compile the pdf page and fetch the fonts/images.
-        operatorList = page.getOperatorList(handler, dependency);
-      } catch (e) {
-        var minimumStackMessage =
-            'worker.js: while trying to getPage() and getOperatorList()';
-
-        // Turn the error into an obj that can be serialized
-        if (typeof e === 'string') {
-          e = {
-            message: e,
-            stack: minimumStackMessage
-          };
-        } else if (typeof e === 'object') {
-          e = {
-            message: e.message || e.toString(),
-            stack: e.stack || minimumStackMessage
-          };
-        } else {
-          e = {
-            message: 'Unknown exception type: ' + (typeof e),
-            stack: minimumStackMessage
-          };
-        }
-
-        handler.send('PageError', {
-          pageNum: pageNum,
-          error: e
-        });
-        return;
-      }
-
-      console.log('page=%d - getOperatorList: time=%dms, len=%d', pageNum,
-                              Date.now() - start, operatorList.fnArray.length);
-
-      // Filter the dependecies for fonts.
-      var fonts = {};
-      for (var i = 0, ii = dependency.length; i < ii; i++) {
-        var dep = dependency[i];
-        if (dep.indexOf('font_') == 0) {
-          fonts[dep] = true;
-        }
-      }
-      handler.send('RenderPage', {
-        pageIndex: data.pageIndex,
-        operatorList: operatorList,
-        depFonts: Object.keys(fonts)
-      });
-    }, this);
-
-    handler.on('GetTextContent', function wphExtractText(data, promise) {
-      var pageNum = data.pageIndex + 1;
-      var start = Date.now();
-
-      var textContent = '';
-      try {
-        var page = pdfModel.getPage(pageNum);
-        textContent = page.extractTextContent();
-        promise.resolve(textContent);
-      } catch (e) {
-        // Skip errored pages
-        promise.reject(e);
-      }
-
-      console.log('text indexing: page=%d - time=%dms',
-                      pageNum, Date.now() - start);
-    });
-  }
-};
-
-var consoleTimer = {};
-
-var workerConsole = {
-  log: function log() {
-    var args = Array.prototype.slice.call(arguments);
-    postMessage({
-      action: 'console_log',
-      data: args
-    });
-  },
-
-  error: function error() {
-    var args = Array.prototype.slice.call(arguments);
-    postMessage({
-      action: 'console_error',
-      data: args
-    });
-    throw 'pdf.js execution error';
-  },
-
-  time: function time(name) {
-    consoleTimer[name] = Date.now();
-  },
-
-  timeEnd: function timeEnd(name) {
-    var time = consoleTimer[name];
-    if (time == null) {
-      error('Unkown timer name ' + name);
-    }
-    this.log('Timer:', name, Date.now() - time);
-  }
-};
-
-// Worker thread?
-if (typeof window === 'undefined') {
-  globalScope.console = workerConsole;
-
-  // Add a logger so we can pass warnings on to the main thread, errors will
-  // throw an exception which will be forwarded on automatically.
-  PDFJS.LogManager.addLogger({
-    warn: function(msg) {
-      postMessage({
-        action: '_warn',
-        data: msg
-      });
-    }
-  });
-
-  var handler = new MessageHandler('worker_processor', this);
-  WorkerMessageHandler.setup(handler);
-}
-
-
-/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- /
-/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
-
-// - The JPEG specification can be found in the ITU CCITT Recommendation T.81
-//   (www.w3.org/Graphics/JPEG/itu-t81.pdf)
-// - The JFIF specification can be found in the JPEG File Interchange Format
-//   (www.w3.org/Graphics/JPEG/jfif3.pdf)
-// - The Adobe Application-Specific JPEG markers in the Supporting the DCT Filters
-//   in PostScript Level 2, Technical Note #5116
-//   (partners.adobe.com/public/developer/en/ps/sdk/5116.DCT_Filter.pdf)
-
-var JpegImage = (function jpegImage() {
-  "use strict";
-  var dctZigZag = new Int32Array([
-     0,
-     1,  8,
-    16,  9,  2,
-     3, 10, 17, 24,
-    32, 25, 18, 11, 4,
-     5, 12, 19, 26, 33, 40,
-    48, 41, 34, 27, 20, 13,  6,
-     7, 14, 21, 28, 35, 42, 49, 56,
-    57, 50, 43, 36, 29, 22, 15,
-    23, 30, 37, 44, 51, 58,
-    59, 52, 45, 38, 31,
-    39, 46, 53, 60,
-    61, 54, 47,
-    55, 62,
-    63
-  ]);
-
-  var dctCos1  =  4017   // cos(pi/16)
-  var dctSin1  =   799   // sin(pi/16)
-  var dctCos3  =  3406   // cos(3*pi/16)
-  var dctSin3  =  2276   // sin(3*pi/16)
-  var dctCos6  =  1567   // cos(6*pi/16)
-  var dctSin6  =  3784   // sin(6*pi/16)
-  var dctSqrt2 =  5793   // sqrt(2)
-  var dctSqrt1d2 = 2896  // sqrt(2) / 2
-
-  function constructor() {
-  }
-
-  function buildHuffmanTable(codeLengths, values) {
-    var k = 0, code = [], i, j, length = 16;
-    while (length > 0 && !codeLengths[length - 1])
-      length--;
-    code.push({children: [], index: 0});
-    var p = code[0], q;
-    for (i = 0; i < length; i++) {
-      for (j = 0; j < codeLengths[i]; j++) {
-        p = code.pop();
-        p.children[p.index] = values[k];
-        while (p.index > 0) {
-          p = code.pop();
-        }
-        p.index++;
-        code.push(p);
-        while (code.length <= i) {
-          code.push(q = {children: [], index: 0});
-          p.children[p.index] = q.children;
-          p = q;
-        }
-        k++;
-      }
-      if (i + 1 < length) {
-        // p here points to last code
-        code.push(q = {children: [], index: 0});
-        p.children[p.index] = q.children;
-        p = q;
-      }
-    }
-    return code[0].children;
-  }
-
-  function decodeScan(data, offset,
-                      frame, components, resetInterval,
-                      spectralStart, spectralEnd,
-                      successivePrev, successive) {
-    var precision = frame.precision;
-    var samplesPerLine = frame.samplesPerLine;
-    var scanLines = frame.scanLines;
-    var mcusPerLine = frame.mcusPerLine;
-    var progressive = frame.progressive;
-    var maxH = frame.maxH, maxV = frame.maxV;
-
-    var startOffset = offset, bitsData = 0, bitsCount = 0;
-    function readBit() {
-      if (bitsCount > 0) {
-        bitsCount--;
-        return (bitsData >> bitsCount) & 1;
-      }
-      bitsData = data[offset++];
-      if (bitsData == 0xFF) {
-        var nextByte = data[offset++];
-        if (nextByte) {
-          throw "unexpected marker: " + ((bitsData << 8) | nextByte).toString(16);
-        }
-        // unstuff 0
-      }
-      bitsCount = 7;
-      return bitsData >>> 7;
-    }
-    function decodeHuffman(tree) {
-      var node = tree, bit;
-      while ((bit = readBit()) !== null) {
-        node = node[bit];
-        if (typeof node === 'number')
-          return node;
-        if (typeof node !== 'object')
-          throw "invalid huffman sequence";
-      }
-      return null;
-    }
-    function receive(length) {
-      var n = 0;
-      while (length > 0) {
-        var bit = readBit();
-        if (bit === null) return;
-        n = (n << 1) | bit;
-        length--;
-      }
-      return n;
-    }
-    function receiveAndExtend(length) {
-      var n = receive(length);
-      if (n >= 1 << (length - 1))
-        return n;
-      return n + (-1 << length) + 1;
-    }
-    function decodeBaseline(component, zz) {
-      var t = decodeHuffman(component.huffmanTableDC);
-      var diff = t === 0 ? 0 : receiveAndExtend(t);
-      zz[0]= (component.pred += diff);
-      var k = 1;
-      while (k < 64) {
-        var rs = decodeHuffman(component.huffmanTableAC);
-        var s = rs & 15, r = rs >> 4;
-        if (s === 0) {
-          if (r < 15)
-            break;
-          k += 16;
-          continue;
-        }
-        k += r;
-        var z = dctZigZag[k];
-        zz[z] = receiveAndExtend(s);
-        k++;
-      }
-    }
-    function decodeDCFirst(component, zz) {
-      var t = decodeHuffman(component.huffmanTableDC);
-      var diff = t === 0 ? 0 : (receiveAndExtend(t) << successive);
-      zz[0] = (component.pred += diff);
-    }
-    function decodeDCSuccessive(component, zz) {
-      zz[0] |= readBit() << successive;
-    }
-    var eobrun = 0;
-    function decodeACFirst(component, zz) {
-      if (eobrun > 0) {
-        eobrun--;
-        return;
-      }
-      var k = spectralStart, e = spectralEnd;
-      while (k <= e) {
-        var rs = decodeHuffman(component.huffmanTableAC);
-        var s = rs & 15, r = rs >> 4;
-        if (s === 0) {
-          if (r < 15) {
-            eobrun = receive(r) + (1 << r) - 1;
-            break;
-          }
-          k += 16;
-          continue;
-        }
-        k += r;
-        var z = dctZigZag[k];
-        zz[z] = receiveAndExtend(s) * (1 << successive);
-        k++;
-      }
-    }
-    var successiveACState = 0, successiveACNextValue;
-    function decodeACSuccessive(component, zz) {
-      var k = spectralStart, e = spectralEnd, r = 0;
-      while (k <= e) {
-        var z = dctZigZag[k];
-        switch (successiveACState) {
-        case 0: // initial state
-          var rs = decodeHuffman(component.huffmanTableAC);
-          var s = rs & 15, r = rs >> 4;
-          if (s === 0) {
-            if (r < 15) {
-              eobrun = receive(r) + (1 << r);
-              successiveACState = 4;
-            } else {
-              r = 16;
-              successiveACState = 1;
-            }
-          } else {
-            if (s !== 1)
-              throw "invalid ACn encoding";
-            successiveACNextValue = receiveAndExtend(s);
-            successiveACState = r ? 2 : 3;
-          }
-          continue;
-        case 1: // skipping r zero items
-        case 2:
-          if (zz[z])
-            zz[z] += (readBit() << successive);
-          else {
-            r--;
-            if (r === 0)
-              successiveACState = successiveACState == 2 ? 3 : 0;
-          }
-          break;
-        case 3: // set value for a zero item
-          if (zz[z])
-            zz[z] += (readBit() << successive);
-          else {
-            zz[z] = successiveACNextValue << successive;
-            successiveACState = 0;
-          }
-          break;
-        case 4: // eob
-          if (zz[z])
-            zz[z] += (readBit() << successive);
-          break;
-        }
-        k++;
-      }
-      if (successiveACState === 4) {
-        eobrun--;
-        if (eobrun === 0)
-          successiveACState = 0;
-      }
-    }
-    function decodeMcu(component, decode, mcu, row, col) {
-      var mcuRow = (mcu / mcusPerLine) | 0;
-      var mcuCol = mcu % mcusPerLine;
-      var blockRow = mcuRow * component.v + row;
-      var blockCol = mcuCol * component.h + col;
-      decode(component, component.blocks[blockRow][blockCol]);
-    }
-    function decodeBlock(component, decode, mcu) {
-      var blockRow = (mcu / component.blocksPerLine) | 0;
-      var blockCol = mcu % component.blocksPerLine;
-      decode(component, component.blocks[blockRow][blockCol]);
-    }
-
-    var componentsLength = components.length;
-    var component, i, j, k, n;
-    var decodeFn;
-    if (progressive) {
-      if (spectralStart === 0)
-        decodeFn = successivePrev === 0 ? decodeDCFirst : decodeDCSuccessive;
-      else
-        decodeFn = successivePrev === 0 ? decodeACFirst : decodeACSuccessive;
-    } else {
-      decodeFn = decodeBaseline;
-    }
-
-    var mcu = 0, marker;
-    var mcuExpected;
-    if (componentsLength == 1) {
-      mcuExpected = components[0].blocksPerLine * components[0].blocksPerColumn;
-    } else {
-      mcuExpected = mcusPerLine * frame.mcusPerColumn;
-    }
-    if (!resetInterval) resetInterval = mcuExpected;
-
-    var h, v;
-    while (mcu < mcuExpected) {
-      // reset interval stuff
-      for (i = 0; i < componentsLength; i++)
-        components[i].pred = 0;
-      eobrun = 0;
-
-      if (componentsLength == 1) {
-        component = components[0];
-        for (n = 0; n < resetInterval; n++) {
-          decodeBlock(component, decodeFn, mcu);
-          mcu++;
-        }
-      } else {
-        for (n = 0; n < resetInterval; n++) {
-          for (i = 0; i < componentsLength; i++) {
-            component = components[i];
-            h = component.h;
-            v = component.v;
-            for (j = 0; j < v; j++) {
-              for (k = 0; k < h; k++) {
-                decodeMcu(component, decodeFn, mcu, j, k);
-              }
-            }
-          }
-          mcu++;
-        }
-      }
-
-      // find marker
-      bitsCount = 0;
-      marker = (data[offset] << 8) | data[offset + 1];
-      if (marker <= 0xFF00) {
-        throw "marker was not found";
-      }
-
-      if (marker >= 0xFFD0 && marker <= 0xFFD7) { // RSTx
-        offset += 2;
-      }
-      else
-        break;
-    }
-
-    return offset - startOffset;
-  }
-
-  function buildComponentData(frame, component) {
-    var lines = [];
-    var blocksPerLine = component.blocksPerLine;
-    var blocksPerColumn = component.blocksPerColumn;
-    var samplesPerLine = blocksPerLine << 3;
-    var R = new Int32Array(64), r = new Uint8Array(64);
-
-    // A port of poppler's IDCT method which in turn is taken from:
-    //   Christoph Loeffler, Adriaan Ligtenberg, George S. Moschytz,
-    //   "Practical Fast 1-D DCT Algorithms with 11 Multiplications",
-    //   IEEE Intl. Conf. on Acoustics, Speech & Signal Processing, 1989,
-    //   988-991.
-    function quantizeAndInverse(zz, dataOut, dataIn) {
-      var qt = component.quantizationTable;
-      var v0, v1, v2, v3, v4, v5, v6, v7, t;
-      var p = dataIn;
-      var i;
-
-      // dequant
-      for (i = 0; i < 64; i++)
-        p[i] = zz[i] * qt[i];
-
-      // inverse DCT on rows
-      for (i = 0; i < 8; ++i) {
-        var row = 8 * i;
-
-        // check for all-zero AC coefficients
-        if (p[1 + row] == 0 && p[2 + row] == 0 && p[3 + row] == 0 &&
-            p[4 + row] == 0 && p[5 + row] == 0 && p[6 + row] == 0 &&
-            p[7 + row] == 0) {
-          t = (dctSqrt2 * p[0 + row] + 512) >> 10;
-          p[0 + row] = t;
-          p[1 + row] = t;
-          p[2 + row] = t;
-          p[3 + row] = t;
-          p[4 + row] = t;
-          p[5 + row] = t;
-          p[6 + row] = t;
-          p[7 + row] = t;
-          continue;
-        }
-
-        // stage 4
-        v0 = (dctSqrt2 * p[0 + row] + 128) >> 8;
-        v1 = (dctSqrt2 * p[4 + row] + 128) >> 8;
-        v2 = p[2 + row];
-        v3 = p[6 + row];
-        v4 = (dctSqrt1d2 * (p[1 + row] - p[7 + row]) + 128) >> 8;
-        v7 = (dctSqrt1d2 * (p[1 + row] + p[7 + row]) + 128) >> 8;
-        v5 = p[3 + row] << 4;
-        v6 = p[5 + row] << 4;
-
-        // stage 3
-        t = (v0 - v1+ 1) >> 1;
-        v0 = (v0 + v1 + 1) >> 1;
-        v1 = t;
-        t = (v2 * dctSin6 + v3 * dctCos6 + 128) >> 8;
-        v2 = (v2 * dctCos6 - v3 * dctSin6 + 128) >> 8;
-        v3 = t;
-        t = (v4 - v6 + 1) >> 1;
-        v4 = (v4 + v6 + 1) >> 1;
-        v6 = t;
-        t = (v7 + v5 + 1) >> 1;
-        v5 = (v7 - v5 + 1) >> 1;
-        v7 = t;
-
-        // stage 2
-        t = (v0 - v3 + 1) >> 1;
-        v0 = (v0 + v3 + 1) >> 1;
-        v3 = t;
-        t = (v1 - v2 + 1) >> 1;
-        v1 = (v1 + v2 + 1) >> 1;
-        v2 = t;
-        t = (v4 * dctSin3 + v7 * dctCos3 + 2048) >> 12;
-        v4 = (v4 * dctCos3 - v7 * dctSin3 + 2048) >> 12;
-        v7 = t;
-        t = (v5 * dctSin1 + v6 * dctCos1 + 2048) >> 12;
-        v5 = (v5 * dctCos1 - v6 * dctSin1 + 2048) >> 12;
-        v6 = t;
-
-        // stage 1
-        p[0 + row] = v0 + v7;
-        p[7 + row] = v0 - v7;
-        p[1 + row] = v1 + v6;
-        p[6 + row] = v1 - v6;
-        p[2 + row] = v2 + v5;
-        p[5 + row] = v2 - v5;
-        p[3 + row] = v3 + v4;
-        p[4 + row] = v3 - v4;
-      }
-
-      // inverse DCT on columns
-      for (i = 0; i < 8; ++i) {
-        var col = i;
-
-        // check for all-zero AC coefficients
-        if (p[1*8 + col] == 0 && p[2*8 + col] == 0 && p[3*8 + col] == 0 &&
-            p[4*8 + col] == 0 && p[5*8 + col] == 0 && p[6*8 + col] == 0 &&
-            p[7*8 + col] == 0) {
-          t = (dctSqrt2 * dataIn[i+0] + 8192) >> 14;
-          p[0*8 + col] = t;
-          p[1*8 + col] = t;
-          p[2*8 + col] = t;
-          p[3*8 + col] = t;
-          p[4*8 + col] = t;
-          p[5*8 + col] = t;
-          p[6*8 + col] = t;
-          p[7*8 + col] = t;
-          continue;
-        }
-
-        // stage 4
-        v0 = (dctSqrt2 * p[0*8 + col] + 2048) >> 12;
-        v1 = (dctSqrt2 * p[4*8 + col] + 2048) >> 12;
-        v2 = p[2*8 + col];
-        v3 = p[6*8 + col];
-        v4 = (dctSqrt1d2 * (p[1*8 + col] - p[7*8 + col]) + 2048) >> 12;
-        v7 = (dctSqrt1d2 * (p[1*8 + col] + p[7*8 + col]) + 2048) >> 12;
-        v5 = p[3*8 + col];
-        v6 = p[5*8 + col];
-
-        // stage 3
-        t = (v0 - v1 + 1) >> 1;
-        v0 = (v0 + v1 + 1) >> 1;
-        v1 = t;
-        t = (v2 * dctSin6 + v3 * dctCos6 + 2048) >> 12;
-        v2 = (v2 * dctCos6 - v3 * dctSin6 + 2048) >> 12;
-        v3 = t;
-        t = (v4 - v6 + 1) >> 1;
-        v4 = (v4 + v6 + 1) >> 1;
-        v6 = t;
-        t = (v7 + v5 + 1) >> 1;
-        v5 = (v7 - v5 + 1) >> 1;
-        v7 = t;
-
-        // stage 2
-        t = (v0 - v3 + 1) >> 1;
-        v0 = (v0 + v3 + 1) >> 1;
-        v3 = t;
-        t = (v1 - v2 + 1) >> 1;
-        v1 = (v1 + v2 + 1) >> 1;
-        v2 = t;
-        t = (v4 * dctSin3 + v7 * dctCos3 + 2048) >> 12;
-        v4 = (v4 * dctCos3 - v7 * dctSin3 + 2048) >> 12;
-        v7 = t;
-        t = (v5 * dctSin1 + v6 * dctCos1 + 2048) >> 12;
-        v5 = (v5 * dctCos1 - v6 * dctSin1 + 2048) >> 12;
-        v6 = t;
-
-        // stage 1
-        p[0*8 + col] = v0 + v7;
-        p[7*8 + col] = v0 - v7;
-        p[1*8 + col] = v1 + v6;
-        p[6*8 + col] = v1 - v6;
-        p[2*8 + col] = v2 + v5;
-        p[5*8 + col] = v2 - v5;
-        p[3*8 + col] = v3 + v4;
-        p[4*8 + col] = v3 - v4;
-      }
-
-      // convert to 8-bit integers
-      for (i = 0; i < 64; ++i) {
-        var sample = 128 + ((p[i] + 8) >> 4);
-        dataOut[i] = sample < 0 ? 0 : sample > 0xFF ? 0xFF : sample;
-      }
-    }
-
-    var i, j;
-    for (var blockRow = 0; blockRow < blocksPerColumn; blockRow++) {
-      var scanLine = blockRow << 3;
-      for (i = 0; i < 8; i++)
-        lines.push(new Uint8Array(samplesPerLine));
-      for (var blockCol = 0; blockCol < blocksPerLine; blockCol++) {
-        quantizeAndInverse(component.blocks[blockRow][blockCol], r, R);
-
-        var offset = 0, sample = blockCol << 3;
-        for (j = 0; j < 8; j++) {
-          var line = lines[scanLine + j];
-          for (i = 0; i < 8; i++)
-            line[sample + i] = r[offset++];
-        }
-      }
-    }
-    return lines;
-  }
-
-  constructor.prototype = {
-    load: function load(path) {
-      var xhr = new XMLHttpRequest();
-      xhr.open("GET", path, true);
-      xhr.responseType = "arraybuffer";
-      xhr.onload = (function() {
-        // TODO catch parse error
-        var data = new Uint8Array(xhr.response || xhr.mozResponseArrayBuffer);
-        this.parse(data);
-        if (this.onload)
-          this.onload();
-      }).bind(this);
-      xhr.send(null);
-    },
-    parse: function parse(data) {
-      var offset = 0, length = data.length;
-      function readUint16() {
-        var value = (data[offset] << 8) | data[offset + 1];
-        offset += 2;
-        return value;
-      }
-      function readDataBlock() {
-        var length = readUint16();
-        var array = data.subarray(offset, offset + length - 2);
-        offset += array.length;
-        return array;
-      }
-      function prepareComponents(frame) {
-        var maxH = 0, maxV = 0;
-        var component, componentId;
-        for (componentId in frame.components) {
-          if (frame.components.hasOwnProperty(componentId)) {
-            component = frame.components[componentId];
-            if (maxH < component.h) maxH = component.h;
-            if (maxV < component.v) maxV = component.v;
-          }
-        }
-        var mcusPerLine = Math.ceil(frame.samplesPerLine / 8 / maxH);
-        var mcusPerColumn = Math.ceil(frame.scanLines / 8 / maxV);
-        for (componentId in frame.components) {
-          if (frame.components.hasOwnProperty(componentId)) {
-            component = frame.components[componentId];
-            var blocksPerLine = Math.ceil(Math.ceil(frame.samplesPerLine / 8) * component.h / maxH);
-            var blocksPerColumn = Math.ceil(Math.ceil(frame.scanLines  / 8) * component.v / maxV);
-            var blocksPerLineForMcu = mcusPerLine * component.h;
-            var blocksPerColumnForMcu = mcusPerColumn * component.v;
-            var blocks = [];
-            for (var i = 0; i < blocksPerColumnForMcu; i++) {
-              var row = [];
-              for (var j = 0; j < blocksPerLineForMcu; j++)
-                row.push(new Int32Array(64));
-              blocks.push(row);
-            }
-            component.blocksPerLine = blocksPerLine;
-            component.blocksPerColumn = blocksPerColumn;
-            component.blocks = blocks;
-          }
-        }
-        frame.maxH = maxH;
-        frame.maxV = maxV;
-        frame.mcusPerLine = mcusPerLine;
-        frame.mcusPerColumn = mcusPerColumn;
-      }
-      var jfif = null;
-      var adobe = null;
-      var pixels = null;
-      var frame, resetInterval;
-      var quantizationTables = [], frames = [];
-      var huffmanTablesAC = [], huffmanTablesDC = [];
-      var fileMarker = readUint16();
-      if (fileMarker != 0xFFD8) { // SOI (Start of Image)
-        throw "SOI not found";
-      }
-
-      fileMarker = readUint16();
-      while (fileMarker != 0xFFD9) { // EOI (End of image)
-        var i, j, l;
-        switch(fileMarker) {
-          case 0xFFE0: // APP0 (Application Specific)
-          case 0xFFE1: // APP1
-          case 0xFFE2: // APP2
-          case 0xFFE3: // APP3
-          case 0xFFE4: // APP4
-          case 0xFFE5: // APP5
-          case 0xFFE6: // APP6
-          case 0xFFE7: // APP7
-          case 0xFFE8: // APP8
-          case 0xFFE9: // APP9
-          case 0xFFEA: // APP10
-          case 0xFFEB: // APP11
-          case 0xFFEC: // APP12
-          case 0xFFED: // APP13
-          case 0xFFEE: // APP14
-          case 0xFFEF: // APP15
-          case 0xFFFE: // COM (Comment)
-            var appData = readDataBlock();
-
-            if (fileMarker === 0xFFE0) {
-              if (appData[0] === 0x4A && appData[1] === 0x46 && appData[2] === 0x49 &&
-                appData[3] === 0x46 && appData[4] === 0) { // 'JFIF\x00'
-                jfif = {
-                  version: { major: appData[5], minor: appData[6] },
-                  densityUnits: appData[7],
-                  xDensity: (appData[8] << 8) | appData[9],
-                  yDensity: (appData[10] << 8) | appData[11],
-                  thumbWidth: appData[12],
-                  thumbHeight: appData[13],
-                  thumbData: appData.subarray(14, 14 + 3 * appData[12] * appData[13])
-                };
-              }
-            }
-            // TODO APP1 - Exif
-            if (fileMarker === 0xFFEE) {
-              if (appData[0] === 0x41 && appData[1] === 0x64 && appData[2] === 0x6F &&
-                appData[3] === 0x62 && appData[4] === 0x65 && appData[5] === 0) { // 'Adobe\x00'
-                adobe = {
-                  version: appData[6],
-                  flags0: (appData[7] << 8) | appData[8],
-                  flags1: (appData[9] << 8) | appData[10],
-                  transformCode: appData[11]
-                };
-              }
-            }
-            break;
-
-          case 0xFFDB: // DQT (Define Quantization Tables)
-            var quantizationTableCount = Math.floor((readUint16() - 2) / 65);
-            for (i = 0; i < quantizationTableCount; i++) {
-              var quantizationTableSpec = data[offset++];
-              var tableData = new Int32Array(64);
-              if ((quantizationTableSpec >> 4) === 0) { // 8 bit values
-                for (j = 0; j < 64; j++) {
-                  var z = dctZigZag[j];
-                  tableData[z] = data[offset++];
-                }
-              } else if ((quantizationTableSpec >> 4) === 1) { //16 bit
-                for (j = 0; j < 64; j++) {
-                  var z = dctZigZag[j];
-                  tableData[z] = readUint16();
-                }
-              } else
-                throw "DQT: invalid table spec";
-              quantizationTables[quantizationTableSpec & 15] = tableData;
-            }
-            break;
-
-          case 0xFFC0: // SOF0 (Start of Frame, Baseline DCT)
-          case 0xFFC2: // SOF2 (Start of Frame, Progressive DCT)
-            readUint16(); // skip data length
-            frame = {};
-            frame.progressive = (fileMarker === 0xFFC2);
-            frame.precision = data[offset++];
-            frame.scanLines = readUint16();
-            frame.samplesPerLine = readUint16();
-            frame.components = {};
-            frame.componentsOrder = [];
-            var componentsCount = data[offset++], componentId;
-            var maxH = 0, maxV = 0;
-            for (i = 0; i < componentsCount; i++) {
-              componentId = data[offset];
-              var h = data[offset + 1] >> 4;
-              var v = data[offset + 1] & 15;
-              var qId = data[offset + 2];
-              frame.componentsOrder.push(componentId);
-              frame.components[componentId] = {
-                h: h,
-                v: v,
-                quantizationTable: quantizationTables[qId]
-              };
-              offset += 3;
-            }
-            prepareComponents(frame);
-            frames.push(frame);
-            break;
-
-          case 0xFFC4: // DHT (Define Huffman Tables)
-            var huffmanLength = readUint16();
-            for (i = 2; i < huffmanLength;) {
-              var huffmanTableSpec = data[offset++];
-              var codeLengths = new Uint8Array(16);
-              var codeLengthSum = 0;
-              for (j = 0; j < 16; j++, offset++)
-                codeLengthSum += (codeLengths[j] = data[offset]);
-              var huffmanValues = new Uint8Array(codeLengthSum);
-              for (j = 0; j < codeLengthSum; j++, offset++)
-                huffmanValues[j] = data[offset];
-              i += 17 + codeLengthSum;
-
-              ((huffmanTableSpec >> 4) === 0 ? 
-                huffmanTablesDC : huffmanTablesAC)[huffmanTableSpec & 15] =
-                buildHuffmanTable(codeLengths, huffmanValues);
-            }
-            break;
-
-          case 0xFFDD: // DRI (Define Restart Interval)
-            readUint16(); // skip data length
-            resetInterval = readUint16();
-            break;
-
-          case 0xFFDA: // SOS (Start of Scan)
-            var scanLength = readUint16();
-            var selectorsCount = data[offset++];
-            var components = [], component;
-            for (i = 0; i < selectorsCount; i++) {
-              component = frame.components[data[offset++]];
-              var tableSpec = data[offset++];
-              component.huffmanTableDC = huffmanTablesDC[tableSpec >> 4];
-              component.huffmanTableAC = huffmanTablesAC[tableSpec & 15];
-              components.push(component);
-            }
-            var spectralStart = data[offset++];
-            var spectralEnd = data[offset++];
-            var successiveApproximation = data[offset++];
-            var processed = decodeScan(data, offset,
-              frame, components, resetInterval,
-              spectralStart, spectralEnd,
-              successiveApproximation >> 4, successiveApproximation & 15);
-            offset += processed;
-            break;
-          default:
-            throw "unknown JPEG marker " + fileMarker.toString(16);
-        }
-        fileMarker = readUint16();
-      }
-      if (frames.length != 1)
-        throw "only single frame JPEGs supported";
-
-      this.width = frame.samplesPerLine;
-      this.height = frame.scanLines;
-      this.jfif = jfif;
-      this.adobe = adobe;
-      this.components = [];
-      for (var i = 0; i < frame.componentsOrder.length; i++) {
-        var component = frame.components[frame.componentsOrder[i]];
-        this.components.push({
-          lines: buildComponentData(frame, component),
-          scaleX: component.h / frame.maxH,
-          scaleY: component.v / frame.maxV
-        });
-      }
-    },
-    getData: function getData(width, height) {
-      function clampTo8bit(a) {
-        return a < 0 ? 0 : a > 255 ? 255 : a;
-      }
-      var scaleX = this.width / width, scaleY = this.height / height;
-
-      var component1, component2, component3, component4;
-      var component1Line, component2Line, component3Line, component4Line;
-      var x, y;
-      var offset = 0;
-      var Y, Cb, Cr, K, C, M, Ye, R, G, B;
-      var colorTransform;
-      var dataLength = width * height * this.components.length;
-      var data = new Uint8Array(dataLength);
-      switch (this.components.length) {
-        case 1:
-          component1 = this.components[0];
-          for (y = 0; y < height; y++) {
-            component1Line = component1.lines[0 | (y * component1.scaleY * scaleY)];
-            for (x = 0; x < width; x++) {
-              Y = component1Line[0 | (x * component1.scaleX * scaleX)];
-
-              data[offset++] = Y;
-            }
-          }
-          break;
-        case 3:
-          // The default transform for three components is true
-          colorTransform = true;
-          // The adobe transform marker overrides any previous setting
-          if (this.adobe && this.adobe.transformCode)
-            colorTransform = true;
-          else if (typeof this.colorTransform !== 'undefined')
-            colorTransform = !!this.colorTransform;
-
-          component1 = this.components[0];
-          component2 = this.components[1];
-          component3 = this.components[2];
-          for (y = 0; y < height; y++) {
-            component1Line = component1.lines[0 | (y * component1.scaleY * scaleY)];
-            component2Line = component2.lines[0 | (y * component2.scaleY * scaleY)];
-            component3Line = component3.lines[0 | (y * component3.scaleY * scaleY)];
-            for (x = 0; x < width; x++) {
-              if (!colorTransform) {
-                R = component1Line[0 | (x * component1.scaleX * scaleX)];
-                G = component2Line[0 | (x * component2.scaleX * scaleX)];
-                B = component3Line[0 | (x * component3.scaleX * scaleX)];
-              } else {
-                Y = component1Line[0 | (x * component1.scaleX * scaleX)];
-                Cb = component2Line[0 | (x * component2.scaleX * scaleX)];
-                Cr = component3Line[0 | (x * component3.scaleX * scaleX)];
-
-                R = clampTo8bit(Y + 1.402 * (Cr - 128));
-                G = clampTo8bit(Y - 0.3441363 * (Cb - 128) - 0.71413636 * (Cr - 128));
-                B = clampTo8bit(Y + 1.772 * (Cb - 128));
-              }
-
-              data[offset++] = R;
-              data[offset++] = G;
-              data[offset++] = B;
-            }
-          }
-          break;
-        case 4:
-          if (!this.adobe)
-            throw 'Unsupported color mode (4 components)';
-          // The default transform for four components is false
-          colorTransform = false;
-          // The adobe transform marker overrides any previous setting
-          if (this.adobe && this.adobe.transformCode)
-            colorTransform = true;
-          else if (typeof this.colorTransform !== 'undefined')
-            colorTransform = !!this.colorTransform;
-
-          component1 = this.components[0];
-          component2 = this.components[1];
-          component3 = this.components[2];
-          component4 = this.components[3];
-          for (y = 0; y < height; y++) {
-            component1Line = component1.lines[0 | (y * component1.scaleY * scaleY)];
-            component2Line = component2.lines[0 | (y * component2.scaleY * scaleY)];
-            component3Line = component3.lines[0 | (y * component3.scaleY * scaleY)];
-            component4Line = component4.lines[0 | (y * component4.scaleY * scaleY)];
-            for (x = 0; x < width; x++) {
-              if (!colorTransform) {
-                C = component1Line[0 | (x * component1.scaleX * scaleX)];
-                M = component2Line[0 | (x * component2.scaleX * scaleX)];
-                Ye = component3Line[0 | (x * component3.scaleX * scaleX)];
-                K = component4Line[0 | (x * component4.scaleX * scaleX)];
-              } else {
-                Y = component1Line[0 | (x * component1.scaleX * scaleX)];
-                Cb = component2Line[0 | (x * component2.scaleX * scaleX)];
-                Cr = component3Line[0 | (x * component3.scaleX * scaleX)];
-                K = component4Line[0 | (x * component4.scaleX * scaleX)];
-
-                C = 255 - clampTo8bit(Y + 1.402 * (Cr - 128));
-                M = 255 - clampTo8bit(Y - 0.3441363 * (Cb - 128) - 0.71413636 * (Cr - 128));
-                Ye = 255 - clampTo8bit(Y + 1.772 * (Cb - 128));
-              }
-              data[offset++] = C;
-              data[offset++] = M;
-              data[offset++] = Ye;
-              data[offset++] = K;
-            }
-          }
-          break;
-        default:
-          throw 'Unsupported color mode';
-      }
-      return data;
-    },
-    copyToImageData: function copyToImageData(imageData) {
-      var width = imageData.width, height = imageData.height;
-      var imageDataArray = imageData.data;
-      var data = this.getData(width, height);
-      var i = 0, j = 0, x, y;
-      var Y, K, C, M, R, G, B;
-      switch (this.components.length) {
-        case 1:
-          for (y = 0; y < height; y++) {
-            for (x = 0; x < width; x++) {
-              Y = data[i++];
-
-              imageDataArray[j++] = Y;
-              imageDataArray[j++] = Y;
-              imageDataArray[j++] = Y;
-              imageDataArray[j++] = 255;
-            }
-          }
-          break;
-        case 3:
-          for (y = 0; y < height; y++) {
-            for (x = 0; x < width; x++) {
-              R = data[i++];
-              G = data[i++];
-              B = data[i++];
-
-              imageDataArray[j++] = R;
-              imageDataArray[j++] = G;
-              imageDataArray[j++] = B;
-              imageDataArray[j++] = 255;
-            }
-          }
-          break;
-        case 4:
-          for (y = 0; y < height; y++) {
-            for (x = 0; x < width; x++) {
-              C = data[i++];
-              M = data[i++];
-              Y = data[i++];
-              K = data[i++];
-
-              R = 255 - clampTo8bit(C * (1 - K / 255) + K);
-              G = 255 - clampTo8bit(M * (1 - K / 255) + K);
-              B = 255 - clampTo8bit(Y * (1 - K / 255) + K);
-
-              imageDataArray[j++] = R;
-              imageDataArray[j++] = G;
-              imageDataArray[j++] = B;
-              imageDataArray[j++] = 255;
-            }
-          }
-          break;
-        default:
-          throw 'Unsupported color mode';
-      }
-    }
-  };
-
-  return constructor;
-})();
-/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
-
-'use strict';
-
-var JpxImage = (function JpxImageClosure() {
-  // Table E.1
-  var SubbandsGainLog2 = {
-    'LL': 0,
-    'LH': 1,
-    'HL': 1,
-    'HH': 2
-  };
-  function JpxImage() {
-    this.failOnCorruptedImage = false;
-  }
-  JpxImage.prototype = {
-    load: function JpxImage_load(url) {
-      var xhr = new XMLHttpRequest();
-      xhr.open('GET', url, true);
-      xhr.responseType = 'arraybuffer';
-      xhr.onload = (function() {
-        // TODO catch parse error
-        var data = new Uint8Array(xhr.response || xhr.mozResponseArrayBuffer);
-        this.parse(data);
-        if (this.onload)
-          this.onload();
-      }).bind(this);
-      xhr.send(null);
-    },
-    parse: function JpxImage_parse(data) {
-      function ReadUint(data, offset, bytes) {
-        var n = 0;
-        for (var i = 0; i < bytes; i++)
-          n = n * 256 + (data[offset + i] & 0xFF);
-        return n;
-      }
-      var position = 0, length = data.length;
-      while (position < length) {
-        var headerSize = 8;
-        var lbox = ReadUint(data, position, 4);
-        var tbox = ReadUint(data, position + 4, 4);
-        position += headerSize;
-        if (lbox == 1) {
-          lbox = ReadUint(data, position, 8);
-          position += 8;
-          headerSize += 8;
-        }
-        if (lbox == 0)
-          lbox = length - position + headerSize;
-        if (lbox < headerSize)
-          error('JPX error: Invalid box field size');
-        var dataLength = lbox - headerSize;
-        var jumpDataLength = true;
-        switch (tbox) {
-          case 0x6A501A1A: // 'jP\032\032'
-            // TODO
-            break;
-          case 0x6A703268: // 'jp2h'
-            jumpDataLength = false; // parsing child boxes
-            break;
-          case 0x636F6C72: // 'colr'
-            // TODO
-            break;
-          case 0x6A703263: // 'jp2c'
-            this.parseCodestream(data, position, position + dataLength);
-            break;
-        }
-        if (jumpDataLength)
-          position += dataLength;
-      }
-    },
-    parseCodestream: function JpxImage_parseCodestream(data, start, end) {
-      var context = {};
-      try {
-        var position = start;
-        while (position < end) {
-          var code = readUint16(data, position);
-          position += 2;
-
-          var length = 0, j;
-          switch (code) {
-            case 0xFF4F: // Start of codestream (SOC)
-              context.mainHeader = true;
-              break;
-            case 0xFFD9: // End of codestream (EOC)
-              break;
-            case 0xFF51: // Image and tile size (SIZ)
-              length = readUint16(data, position);
-              var siz = {};
-              siz.Xsiz = readUint32(data, position + 4);
-              siz.Ysiz = readUint32(data, position + 8);
-              siz.XOsiz = readUint32(data, position + 12);
-              siz.YOsiz = readUint32(data, position + 16);
-              siz.XTsiz = readUint32(data, position + 20);
-              siz.YTsiz = readUint32(data, position + 24);
-              siz.XTOsiz = readUint32(data, position + 28);
-              siz.YTOsiz = readUint32(data, position + 32);
-              var componentsCount = readUint16(data, position + 36);
-              siz.Csiz = componentsCount;
-              var components = [];
-              j = position + 38;
-              for (var i = 0; i < componentsCount; i++) {
-                var component = {
-                  precision: (data[j] & 0x7F) + 1,
-                  isSigned: !!(data[j] & 0x80),
-                  XRsiz: data[j + 1],
-                  YRsiz: data[j + 1]
-                };
-                calculateComponentDimensions(component, siz);
-                components.push(component);
-              }
-              context.SIZ = siz;
-              context.components = components;
-              calculateTileGrids(context, components);
-              context.QCC = [];
-              context.COC = [];
-              break;
-            case 0xFF5C: // Quantization default (QCD)
-              length = readUint16(data, position);
-              var qcd = {};
-              j = position + 2;
-              var sqcd = data[j++];
-              var spqcdSize, scalarExpounded;
-              switch (sqcd & 0x1F) {
-                case 0:
-                  spqcdSize = 8;
-                  scalarExpounded = true;
-                  break;
-                case 1:
-                  spqcdSize = 16;
-                  scalarExpounded = false;
-                  break;
-                case 2:
-                  spqcdSize = 16;
-                  scalarExpounded = true;
-                  break;
-                default:
-                  throw 'Invalid SQcd value ' + sqcd;
-              }
-              qcd.noQuantization = spqcdSize == 8;
-              qcd.scalarExpounded = scalarExpounded;
-              qcd.guardBits = sqcd >> 5;
-              var spqcds = [];
-              while (j < length + position) {
-                var spqcd = {};
-                if (spqcdSize == 8) {
-                  spqcd.epsilon = data[j++] >> 3;
-                  spqcd.mu = 0;
-                } else {
-                  spqcd.epsilon = data[j] >> 3;
-                  spqcd.mu = ((data[j] & 0x7) << 8) | data[j + 1];
-                  j += 2;
-                }
-                spqcds.push(spqcd);
-              }
-              qcd.SPqcds = spqcds;
-              if (context.mainHeader)
-                context.QCD = qcd;
-              else {
-                context.currentTile.QCD = qcd;
-                context.currentTile.QCC = [];
-              }
-              break;
-            case 0xFF5D: // Quantization component (QCC)
-              length = readUint16(data, position);
-              var qcc = {};
-              j = position + 2;
-              var cqcc;
-              if (context.SIZ.Csiz < 257)
-                cqcc = data[j++];
-              else {
-                cqcc = readUint16(data, j);
-                j += 2;
-              }
-              var sqcd = data[j++];
-              var spqcdSize, scalarExpounded;
-              switch (sqcd & 0x1F) {
-                case 0:
-                  spqcdSize = 8;
-                  scalarExpounded = true;
-                  break;
-                case 1:
-                  spqcdSize = 16;
-                  scalarExpounded = false;
-                  break;
-                case 2:
-                  spqcdSize = 16;
-                  scalarExpounded = true;
-                  break;
-                default:
-                  throw 'Invalid SQcd value ' + sqcd;
-              }
-              qcc.noQuantization = spqcdSize == 8;
-              qcc.scalarExpounded = scalarExpounded;
-              qcc.guardBits = sqcd >> 5;
-              var spqcds = [];
-              while (j < length + position) {
-                var spqcd = {};
-                if (spqcdSize == 8) {
-                  spqcd.epsilon = data[j++] >> 3;
-                  spqcd.mu = 0;
-                } else {
-                  spqcd.epsilon = data[j] >> 3;
-                  spqcd.mu = ((data[j] & 0x7) << 8) | data[j + 1];
-                  j += 2;
-                }
-                spqcds.push(spqcd);
-              }
-              qcc.SPqcds = spqcds;
-              if (context.mainHeader)
-                context.QCC[cqcc] = qcc;
-              else
-                context.currentTile.QCC[cqcc] = qcc;
-              break;
-            case 0xFF52: // Coding style default (COD)
-              length = readUint16(data, position);
-              var cod = {};
-              j = position + 2;
-              var scod = data[j++];
-              cod.entropyCoderWithCustomPrecincts = !!(scod & 1);
-              cod.sopMarkerUsed = !!(scod & 2);
-              cod.ephMarkerUsed = !!(scod & 4);
-              var codingStyle = {};
-              cod.progressionOrder = data[j++];
-              cod.layersCount = readUint16(data, j);
-              j += 2;
-              cod.multipleComponentTransform = data[j++];
-
-              cod.decompositionLevelsCount = data[j++];
-              cod.xcb = (data[j++] & 0xF) + 2;
-              cod.ycb = (data[j++] & 0xF) + 2;
-              var blockStyle = data[j++];
-              cod.selectiveArithmeticCodingBypass = !!(blockStyle & 1);
-              cod.resetContextProbabilities = !!(blockStyle & 2);
-              cod.terminationOnEachCodingPass = !!(blockStyle & 4);
-              cod.verticalyStripe = !!(blockStyle & 8);
-              cod.predictableTermination = !!(blockStyle & 16);
-              cod.segmentationSymbolUsed = !!(blockStyle & 32);
-              cod.transformation = data[j++];
-              if (cod.entropyCoderWithCustomPrecincts) {
-                var precinctsSizes = {};
-                while (j < length + position) {
-                  var precinctsSize = data[j];
-                  precinctsSizes.push({
-                    PPx: precinctsSize & 0xF,
-                    PPy: precinctsSize >> 4
-                  });
-                }
-                cod.precinctsSizes = precinctsSizes;
-              }
-
-              if (cod.sopMarkerUsed || cod.ephMarkerUsed ||
-                  cod.selectiveArithmeticCodingBypass ||
-                  cod.resetContextProbabilities ||
-                  cod.terminationOnEachCodingPass ||
-                  cod.verticalyStripe || cod.predictableTermination ||
-                  cod.segmentationSymbolUsed)
-                throw 'Unsupported COD options: ' + uneval(cod);
-
-              if (context.mainHeader)
-                context.COD = cod;
-              else {
-                context.currentTile.COD = cod;
-                context.currentTile.COC = [];
-              }
-              break;
-            case 0xFF90: // Start of tile-part (SOT)
-              length = readUint16(data, position);
-              var tile = {};
-              tile.index = readUint16(data, position + 2);
-              tile.length = readUint32(data, position + 4);
-              tile.dataEnd = tile.length + position - 2;
-              tile.partIndex = data[position + 8];
-              tile.partsCount = data[position + 9];
-
-              context.mainHeader = false;
-              if (tile.partIndex == 0) {
-                // reset component specific settings
-                tile.COD = context.COD;
-                tile.COC = context.COC.slice(0); // clone of the global COC
-                tile.QCD = context.QCD;
-                tile.QCC = context.QCC.slice(0); // clone of the global COC
-              }
-              context.currentTile = tile;
-              break;
-            case 0xFF93: // Start of data (SOD)
-              var tile = context.currentTile;
-              if (tile.partIndex == 0) {
-                initializeTile(context, tile.index);
-                buildPackets(context);
-              }
-
-              // moving to the end of the data
-              length = tile.dataEnd - position;
-
-              parseTilePackets(context, data, position, length);
-              break;
-            case 0xFF64: // Comment (COM)
-              length = readUint16(data, position);
-              // skipping content
-              break;
-            default:
-              throw 'Unknown codestream code: ' + code.toString(16);
-          }
-          position += length;
-        }
-      } catch (e) {
-        if (this.failOnCorruptedImage)
-          error('JPX error: ' + e);
-        else
-          warn('JPX error: ' + e + '. Trying to recover');
-      }
-      this.tiles = transformComponents(context);
-      this.width = context.SIZ.Xsiz - context.SIZ.XOsiz;
-      this.height = context.SIZ.Ysiz - context.SIZ.YOsiz;
-      this.componentsCount = context.SIZ.Csiz;
-    }
-  };
-  function readUint32(data, offset) {
-    return (data[offset] << 24) | (data[offset + 1] << 16) |
-      (data[offset + 2] << 8) | data[offset + 3];
-  }
-  function readUint16(data, offset) {
-    return (data[offset] << 8) | data[offset + 1];
-  }
-  function log2(x) {
-    var n = 1, i = 0;
-    while (x > n) {
-      n <<= 1;
-      i++;
-    }
-    return i;
-  }
-  function calculateComponentDimensions(component, siz) {
-    // Section B.2 Component mapping
-    component.x0 = Math.ceil(siz.XOsiz / component.XRsiz);
-    component.x1 = Math.ceil(siz.Xsiz / component.XRsiz);
-    component.y0 = Math.ceil(siz.YOsiz / component.YRsiz);
-    component.y1 = Math.ceil(siz.Ysiz / component.YRsiz);
-    component.width = component.x1 - component.x0;
-    component.height = component.y1 - component.y0;
-  }
-  function calculateTileGrids(context, components) {
-    var siz = context.SIZ;
-    // Section B.3 Division into tile and tile-components
-    var tiles = [];
-    var numXtiles = Math.ceil((siz.Xsiz - siz.XTOsiz) / siz.XTsiz);
-    var numYtiles = Math.ceil((siz.Ysiz - siz.YTOsiz) / siz.YTsiz);
-    for (var q = 0; q < numYtiles; q++) {
-      for (var p = 0; p < numXtiles; p++) {
-        var tile = {};
-        tile.tx0 = Math.max(siz.XTOsiz + p * siz.XTsiz, siz.XOsiz);
-        tile.ty0 = Math.max(siz.YTOsiz + q * siz.YTsiz, siz.YOsiz);
-        tile.tx1 = Math.min(siz.XTOsiz + (p + 1) * siz.XTsiz, siz.Xsiz);
-        tile.ty1 = Math.min(siz.YTOsiz + (q + 1) * siz.YTsiz, siz.Ysiz);
-        tile.width = tile.tx1 - tile.tx0;
-        tile.height = tile.ty1 - tile.ty0;
-        tile.components = [];
-        tiles.push(tile);
-      }
-    }
-    context.tiles = tiles;
-
-    var componentsCount = siz.Csiz;
-    for (var i = 0, ii = componentsCount; i < ii; i++) {
-      var component = components[i];
-      var tileComponents = [];
-      for (var j = 0, jj = tiles.length; j < jj; j++) {
-        var tileComponent = {}, tile = tiles[j];
-        tileComponent.tcx0 = Math.ceil(tile.tx0 / component.XRsiz);
-        tileComponent.tcy0 = Math.ceil(tile.ty0 / component.YRsiz);
-        tileComponent.tcx1 = Math.ceil(tile.tx1 / component.XRsiz);
-        tileComponent.tcy1 = Math.ceil(tile.ty1 / component.YRsiz);
-        tileComponent.width = tileComponent.tcx1 - tileComponent.tcx0;
-        tileComponent.height = tileComponent.tcy1 - tileComponent.tcy0;
-        tile.components[i] = tileComponent;
-      }
-    }
-  }
-  function getBlocksDimensions(context, component, r) {
-    var codOrCoc = component.codingStyleParameters;
-    var result = {};
-    if (!codOrCoc.entropyCoderWithCustomPrecincts) {
-      result.PPx = 15;
-      result.PPy = 15;
-    } else {
-      result.PPx = codOrCoc.precinctsSizes[r].PPx;
-      result.PPy = codOrCoc.precinctsSizes[r].PPy;
-    }
-    // calculate codeblock size as described in section B.7
-    result.xcb_ = r > 0 ? Math.min(codOrCoc.xcb, result.PPx - 1) :
-      Math.min(codOrCoc.xcb, result.PPx);
-    result.ycb_ = r > 0 ? Math.min(codOrCoc.ycb, result.PPy - 1) :
-      Math.min(codOrCoc.ycb, result.PPy);
-    return result;
-  }
-  function buildPrecincts(context, resolution, dimensions) {
-    // Section B.6 Division resolution to precincts
-    var precinctWidth = 1 << dimensions.PPx;
-    var precinctHeight = 1 << dimensions.PPy;
-    var numprecinctswide = resolution.trx1 > resolution.trx0 ?
-      Math.ceil(resolution.trx1 / precinctWidth) -
-      Math.floor(resolution.trx0 / precinctWidth) : 0;
-    var numprecinctshigh = resolution.try1 > resolution.try0 ?
-      Math.ceil(resolution.try1 / precinctHeight) -
-      Math.floor(resolution.try0 / precinctHeight) : 0;
-    var numprecincts = numprecinctswide * numprecinctshigh;
-    var precinctXOffset = Math.floor(resolution.trx0 / precinctWidth) *
-      precinctWidth;
-    var precinctYOffset = Math.floor(resolution.try0 / precinctHeight) *
-      precinctHeight;
-    resolution.precinctParameters = {
-      precinctXOffset: precinctXOffset,
-      precinctYOffset: precinctYOffset,
-      precinctWidth: precinctWidth,
-      precinctHeight: precinctHeight,
-      numprecinctswide: numprecinctswide,
-      numprecinctshigh: numprecinctshigh,
-      numprecincts: numprecincts
-    };
-  }
-  function buildCodeblocks(context, subband, dimensions) {
-    // Section B.7 Division sub-band into code-blocks
-    var xcb_ = dimensions.xcb_;
-    var ycb_ = dimensions.ycb_;
-    var codeblockWidth = 1 << xcb_;
-    var codeblockHeight = 1 << ycb_;
-    var cbx0 = Math.floor(subband.tbx0 / codeblockWidth);
-    var cby0 = Math.floor(subband.tby0 / codeblockHeight);
-    var cbx1 = Math.ceil(subband.tbx1 / codeblockWidth);
-    var cby1 = Math.ceil(subband.tby1 / codeblockHeight);
-    var precinctParameters = subband.resolution.precinctParameters;
-    var codeblocks = [];
-    var precincts = [];
-    for (var j = cby0; j < cby1; j++) {
-      for (var i = cbx0; i < cbx1; i++) {
-        var codeblock = {
-          cbx: i,
-          cby: j,
-          tbx0: codeblockWidth * i,
-          tby0: codeblockHeight * j,
-          tbx1: codeblockWidth * (i + 1),
-          tby1: codeblockHeight * (j + 1)
-        };
-        // calculate precinct number
-        var pi = Math.floor((codeblock.tbx0 -
-          precinctParameters.precinctXOffset) /
-          precinctParameters.precinctWidth);
-        var pj = Math.floor((codeblock.tby0 -
-          precinctParameters.precinctYOffset) /
-          precinctParameters.precinctHeight);
-        var precinctNumber = pj +
-          pi * precinctParameters.numprecinctswide;
-        codeblock.tbx0_ = Math.max(subband.tbx0, codeblock.tbx0);
-        codeblock.tby0_ = Math.max(subband.tby0, codeblock.tby0);
-        codeblock.tbx1_ = Math.min(subband.tbx1, codeblock.tbx1);
-        codeblock.tby1_ = Math.min(subband.tby1, codeblock.tby1);
-        codeblock.precinctNumber = precinctNumber;
-        codeblock.subbandType = subband.type;
-        var coefficientsLength = (codeblock.tbx1_ - codeblock.tbx0_) *
-          (codeblock.tby1_ - codeblock.tby0_);
-        codeblock.Lblock = 3;
-        codeblocks.push(codeblock);
-        // building precinct for the sub-band
-        var precinct;
-        if (precinctNumber in precincts) {
-          precinct = precincts[precinctNumber];
-          precinct.cbxMin = Math.min(precinct.cbxMin, i);
-          precinct.cbyMin = Math.min(precinct.cbyMin, j);
-          precinct.cbxMax = Math.max(precinct.cbxMax, i);
-          precinct.cbyMax = Math.max(precinct.cbyMax, j);
-        } else {
-          precincts[precinctNumber] = precinct = {
-            cbxMin: i,
-            cbyMin: j,
-            cbxMax: i,
-            cbyMax: j
-          };
-        }
-        codeblock.precinct = precinct;
-      }
-    }
-    subband.codeblockParameters = {
-      codeblockWidth: xcb_,
-      codeblockHeight: ycb_,
-      numcodeblockwide: cbx1 - cbx0 + 1,
-      numcodeblockhigh: cby1 - cby1 + 1
-    };
-    subband.codeblocks = codeblocks;
-    for (var i = 0, ii = codeblocks.length; i < ii; i++) {
-      var codeblock = codeblocks[i];
-      var precinctNumber = codeblock.precinctNumber;
-    }
-    subband.precincts = precincts;
-  }
-  function createPacket(resolution, precinctNumber, layerNumber) {
-    var precinctCodeblocks = [];
-    // Section B.10.8 Order of info in packet
-    var subbands = resolution.subbands;
-    // sub-bands already ordered in 'LL', 'HL', 'LH', and 'HH' sequence
-    for (var i = 0, ii = subbands.length; i < ii; i++) {
-      var subband = subbands[i];
-      var codeblocks = subband.codeblocks;
-      for (var j = 0, jj = codeblocks.length; j < jj; j++) {
-        var codeblock = codeblocks[j];
-        if (codeblock.precinctNumber != precinctNumber)
-          continue;
-        precinctCodeblocks.push(codeblock);
-      }
-    }
-    return {
-      layerNumber: layerNumber,
-      codeblocks: precinctCodeblocks
-    };
-  }
-  function LayerResolutionComponentPositionIterator(context) {
-    var siz = context.SIZ;
-    var tileIndex = context.currentTile.index;
-    var tile = context.tiles[tileIndex];
-    var layersCount = tile.codingStyleDefaultParameters.layersCount;
-    var componentsCount = siz.Csiz;
-    var maxDecompositionLevelsCount = 0;
-    for (var q = 0; q < componentsCount; q++) {
-      maxDecompositionLevelsCount = Math.max(maxDecompositionLevelsCount,
-        tile.components[q].codingStyleParameters.decompositionLevelsCount);
-    }
-
-    var l = 0, r = 0, i = 0, k = 0;
-
-    this.nextPacket = function JpxImage_nextPacket() {
-      // Section B.12.1.1 Layer-resolution-component-position
-      for (; l < layersCount; l++) {
-        for (; r <= maxDecompositionLevelsCount; r++) {
-          for (; i < componentsCount; i++) {
-            var component = tile.components[i];
-            if (r > component.codingStyleParameters.decompositionLevelsCount)
-              continue;
-
-            var resolution = component.resolutions[r];
-            var numprecincts = resolution.precinctParameters.numprecincts;
-            for (; k < numprecincts;) {
-              var packet = createPacket(resolution, k, l);
-              k++;
-              return packet;
-            }
-            k = 0;
-          }
-          i = 0;
-        }
-        r = 0;
-      }
-      throw 'Out of packets';
-    };
-  }
-  function ResolutionLayerComponentPositionIterator(context) {
-    var siz = context.SIZ;
-    var tileIndex = context.currentTile.index;
-    var tile = context.tiles[tileIndex];
-    var layersCount = tile.codingStyleDefaultParameters.layersCount;
-    var componentsCount = siz.Csiz;
-    var maxDecompositionLevelsCount = 0;
-    for (var q = 0; q < componentsCount; q++) {
-      maxDecompositionLevelsCount = Math.max(maxDecompositionLevelsCount,
-        tile.components[q].codingStyleParameters.decompositionLevelsCount);
-    }
-
-    var r = 0, l = 0, i = 0, k = 0;
-
-    this.nextPacket = function JpxImage_nextPacket() {
-      // Section B.12.1.2 Resolution-layer-component-position
-      for (; r <= maxDecompositionLevelsCount; r++) {
-        for (; l < layersCount; l++) {
-          for (; i < componentsCount; i++) {
-            var component = tile.components[i];
-            if (r > component.codingStyleParameters.decompositionLevelsCount)
-              continue;
-
-            var resolution = component.resolutions[r];
-            var numprecincts = resolution.precinctParameters.numprecincts;
-            for (; k < numprecincts;) {
-              var packet = createPacket(resolution, k, l);
-              k++;
-              return packet;
-            }
-            k = 0;
-          }
-          i = 0;
-        }
-        l = 0;
-      }
-      throw 'Out of packets';
-    };
-  }
-  function buildPackets(context) {
-    var siz = context.SIZ;
-    var tileIndex = context.currentTile.index;
-    var tile = context.tiles[tileIndex];
-    var componentsCount = siz.Csiz;
-    // Creating resolutions and sub-bands for each component
-    for (var c = 0; c < componentsCount; c++) {
-      var component = tile.components[c];
-      var decompositionLevelsCount =
-        component.codingStyleParameters.decompositionLevelsCount;
-      // Section B.5 Resolution levels and sub-bands
-      var resolutions = [];
-      var subbands = [];
-      for (var r = 0; r <= decompositionLevelsCount; r++) {
-        var blocksDimensions = getBlocksDimensions(context, component, r);
-        var resolution = {};
-        var scale = 1 << (decompositionLevelsCount - r);
-        resolution.trx0 = Math.ceil(component.tcx0 / scale);
-        resolution.try0 = Math.ceil(component.tcy0 / scale);
-        resolution.trx1 = Math.ceil(component.tcx1 / scale);
-        resolution.try1 = Math.ceil(component.tcy1 / scale);
-        buildPrecincts(context, resolution, blocksDimensions);
-        resolutions.push(resolution);
-
-        var subband;
-        if (r == 0) {
-          // one sub-band (LL) with last decomposition
-          subband = {};
-          subband.type = 'LL';
-          subband.tbx0 = Math.ceil(component.tcx0 / scale);
-          subband.tby0 = Math.ceil(component.tcy0 / scale);
-          subband.tbx1 = Math.ceil(component.tcx1 / scale);
-          subband.tby1 = Math.ceil(component.tcy1 / scale);
-          subband.resolution = resolution;
-          buildCodeblocks(context, subband, blocksDimensions);
-          subbands.push(subband);
-          resolution.subbands = [subband];
-        } else {
-          var bscale = 1 << (decompositionLevelsCount - r + 1);
-          var resolutionSubbands = [];
-          // three sub-bands (HL, LH and HH) with rest of decompositions
-          subband = {};
-          subband.type = 'HL';
-          subband.tbx0 = Math.ceil(component.tcx0 / bscale - 0.5);
-          subband.tby0 = Math.ceil(component.tcy0 / bscale);
-          subband.tbx1 = Math.ceil(component.tcx1 / bscale - 0.5);
-          subband.tby1 = Math.ceil(component.tcy1 / bscale);
-          subband.resolution = resolution;
-          buildCodeblocks(context, subband, blocksDimensions);
-          subbands.push(subband);
-          resolutionSubbands.push(subband);
-
-          subband = {};
-          subband.type = 'LH';
-          subband.tbx0 = Math.ceil(component.tcx0 / bscale);
-          subband.tby0 = Math.ceil(component.tcy0 / bscale - 0.5);
-          subband.tbx1 = Math.ceil(component.tcx1 / bscale);
-          subband.tby1 = Math.ceil(component.tcy1 / bscale - 0.5);
-          subband.resolution = resolution;
-          buildCodeblocks(context, subband, blocksDimensions);
-          subbands.push(subband);
-          resolutionSubbands.push(subband);
-
-          subband = {};
-          subband.type = 'HH';
-          subband.tbx0 = Math.ceil(component.tcx0 / bscale - 0.5);
-          subband.tby0 = Math.ceil(component.tcy0 / bscale - 0.5);
-          subband.tbx1 = Math.ceil(component.tcx1 / bscale - 0.5);
-          subband.tby1 = Math.ceil(component.tcy1 / bscale - 0.5);
-          subband.resolution = resolution;
-          buildCodeblocks(context, subband, blocksDimensions);
-          subbands.push(subband);
-          resolutionSubbands.push(subband);
-
-          resolution.subbands = resolutionSubbands;
-        }
-      }
-      component.resolutions = resolutions;
-      component.subbands = subbands;
-    }
-    // Generate the packets sequence
-    var progressionOrder = tile.codingStyleDefaultParameters.progressionOrder;
-    var packetsIterator;
-    switch (progressionOrder) {
-      case 0:
-        tile.packetsIterator =
-          new LayerResolutionComponentPositionIterator(context);
-        break;
-      case 1:
-        tile.packetsIterator =
-          new ResolutionLayerComponentPositionIterator(context);
-        break;
-      default:
-        throw 'Unsupported progression order ' + progressionOrder;
-    }
-  }
-  function parseTilePackets(context, data, offset, dataLength) {
-    var position = 0;
-    var buffer, bufferSize = 0, skipNextBit = false;
-    function readBits(count) {
-      while (bufferSize < count) {
-        var b = data[offset + position];
-        position++;
-        if (skipNextBit) {
-          buffer = (buffer << 7) | b;
-          bufferSize += 7;
-          skipNextBit = false;
-        } else {
-          buffer = (buffer << 8) | b;
-          bufferSize += 8;
-        }
-        if (b == 0xFF) {
-          skipNextBit = true;
-        }
-      }
-      bufferSize -= count;
-      return (buffer >>> bufferSize) & ((1 << count) - 1);
-    }
-    function alignToByte() {
-      bufferSize = 0;
-      if (skipNextBit) {
-        position++;
-        skipNextBit = false;
-      }
-    }
-    function readCodingpasses() {
-      var value = readBits(1);
-      if (value == 0)
-        return 1;
-      value = (value << 1) | readBits(1);
-      if (value == 0x02)
-        return 2;
-      value = (value << 2) | readBits(2);
-      if (value <= 0x0E)
-        return (value & 0x03) + 3;
-      value = (value << 5) | readBits(5);
-      if (value <= 0x1FE)
-        return (value & 0x1F) + 6;
-      value = (value << 7) | readBits(7);
-      return (value & 0x7F) + 37;
-    }
-    var tileIndex = context.currentTile.index;
-    var tile = context.tiles[tileIndex];
-    var packetsIterator = tile.packetsIterator;
-    while (position < dataLength) {
-      var packet = packetsIterator.nextPacket();
-      if (!readBits(1)) {
-        alignToByte();
-        continue;
-      }
-      var layerNumber = packet.layerNumber;
-      var queue = [];
-      for (var i = 0, ii = packet.codeblocks.length; i < ii; i++) {
-        var codeblock = packet.codeblocks[i];
-        var precinct = codeblock.precinct;
-        var codeblockColumn = codeblock.cbx - precinct.cbxMin;
-        var codeblockRow = codeblock.cby - precinct.cbyMin;
-        var codeblockIncluded = false;
-        var firstTimeInclusion = false;
-        if ('included' in codeblock) {
-          codeblockIncluded = !!readBits(1);
-        } else {
-          // reading inclusion tree
-          var precinct = codeblock.precinct;
-          var inclusionTree, zeroBitPlanesTree;
-          if ('inclusionTree' in precinct) {
-            inclusionTree = precinct.inclusionTree;
-          } else {
-            // building inclusion and zero bit-planes trees
-            var width = precinct.cbxMax - precinct.cbxMin + 1;
-            var height = precinct.cbyMax - precinct.cbyMin + 1;
-            inclusionTree = new InclusionTree(width, height, layerNumber);
-            zeroBitPlanesTree = new TagTree(width, height);
-            precinct.inclusionTree = inclusionTree;
-            precinct.zeroBitPlanesTree = zeroBitPlanesTree;
-          }
-
-          if (inclusionTree.reset(codeblockColumn, codeblockRow, layerNumber)) {
-            while (true) {
-              if (readBits(1)) {
-                var valueReady = !inclusionTree.nextLevel();
-                if (valueReady) {
-                  codeblock.included = true;
-                  codeblockIncluded = firstTimeInclusion = true;
-                  break;
-                }
-              } else {
-                inclusionTree.incrementValue(layerNumber);
-                break;
-              }
-            }
-          }
-        }
-        if (!codeblockIncluded)
-          continue;
-        if (firstTimeInclusion) {
-          zeroBitPlanesTree = precinct.zeroBitPlanesTree;
-          zeroBitPlanesTree.reset(codeblockColumn, codeblockRow);
-          while (true) {
-            if (readBits(1)) {
-              var valueReady = !zeroBitPlanesTree.nextLevel();
-              if (valueReady)
-                break;
-            } else
-              zeroBitPlanesTree.incrementValue();
-          }
-          codeblock.zeroBitPlanes = zeroBitPlanesTree.value;
-        }
-        var codingpasses = readCodingpasses();
-        while (readBits(1))
-          codeblock.Lblock++;
-        var codingpassesLog2 = log2(codingpasses);
-        // rounding down log2
-        var bits = ((codingpasses < (1 << codingpassesLog2)) ?
-          codingpassesLog2 - 1 : codingpassesLog2) + codeblock.Lblock;
-        var codedDataLength = readBits(bits);
-        queue.push({
-          codeblock: codeblock,
-          codingpasses: codingpasses,
-          dataLength: codedDataLength
-        });
-      }
-      alignToByte();
-      while (queue.length > 0) {
-        var packetItem = queue.shift();
-        var codeblock = packetItem.codeblock;
-        if (!('data' in codeblock))
-          codeblock.data = [];
-        codeblock.data.push({
-          data: data,
-          start: offset + position,
-          end: offset + position + packetItem.dataLength,
-          codingpasses: packetItem.codingpasses
-        });
-        position += packetItem.dataLength;
-      }
-    }
-    return position;
-  }
-  function copyCoefficients(coefficients, x0, y0, width, height,
-                            delta, mb, codeblocks, transformation) {
-    var r = 0.5; // formula (E-6)
-    for (var i = 0, ii = codeblocks.length; i < ii; ++i) {
-      var codeblock = codeblocks[i];
-      var blockWidth = codeblock.tbx1_ - codeblock.tbx0_;
-      var blockHeight = codeblock.tby1_ - codeblock.tby0_;
-      if (blockWidth == 0 || blockHeight == 0)
-        continue;
-      if (!('data' in codeblock))
-        continue;
-
-      var bitModel, currentCodingpassType;
-      bitModel = new BitModel(blockWidth, blockHeight, codeblock.subbandType,
-        codeblock.zeroBitPlanes);
-      currentCodingpassType = 2; // first bit plane starts from cleanup
-
-      // collect data
-      var data = codeblock.data, totalLength = 0, codingpasses = 0;
-      for (var q = 0, qq = data.length; q < qq; q++) {
-        var dataItem = data[q];
-        totalLength += dataItem.end - dataItem.start;
-        codingpasses += dataItem.codingpasses;
-      }
-      var encodedData = new Uint8Array(totalLength), k = 0;
-      for (var q = 0, qq = data.length; q < qq; q++) {
-        var dataItem = data[q];
-        var chunk = dataItem.data.subarray(dataItem.start, dataItem.end);
-        encodedData.set(chunk, k);
-        k += chunk.length;
-      }
-      // decoding the item
-      var decoder = new ArithmeticDecoder(encodedData, 0, totalLength);
-      bitModel.setDecoder(decoder);
-
-      for (var q = 0; q < codingpasses; q++) {
-        switch (currentCodingpassType) {
-          case 0:
-            bitModel.runSignificancePropogationPass();
-            break;
-          case 1:
-            bitModel.runMagnitudeRefinementPass();
-            break;
-          case 2:
-            bitModel.runCleanupPass();
-            break;
-        }
-        currentCodingpassType = (currentCodingpassType + 1) % 3;
-      }
-
-      var offset = (codeblock.tbx0_ - x0) + (codeblock.tby0_ - y0) * width;
-      var position = 0;
-      for (var j = 0; j < blockHeight; j++) {
-        for (var k = 0; k < blockWidth; k++) {
-          var n = (bitModel.coefficentsSign[position] ? -1 : 1) *
-            bitModel.coefficentsMagnitude[position];
-          var nb = bitModel.bitsDecoded[position], correction;
-          if (transformation == 0 || mb > nb) {
-            // use r only if transformation is irreversible or
-            // not all bitplanes were decoded for reversible transformation
-            n += n < 0 ? n - r : n > 0 ? n + r : 0;
-            correction = 1 << (mb - nb);
-          } else
-            correction = 1;
-          coefficients[offset++] = n * correction * delta;
-          position++;
-        }
-        offset += width - blockWidth;
-      }
-    }
-  }
-  function transformTile(context, tile, c) {
-    var component = tile.components[c];
-    var codingStyleParameters = component.codingStyleParameters;
-    var quantizationParameters = component.quantizationParameters;
-    var decompositionLevelsCount =
-      codingStyleParameters.decompositionLevelsCount;
-    var spqcds = quantizationParameters.SPqcds;
-    var scalarExpounded = quantizationParameters.scalarExpounded;
-    var guardBits = quantizationParameters.guardBits;
-    var transformation = codingStyleParameters.transformation;
-    var precision = context.components[c].precision;
-
-    var subbandCoefficients = [];
-    var k = 0, b = 0;
-    for (var i = 0; i <= decompositionLevelsCount; i++) {
-      var resolution = component.resolutions[i];
-
-      for (var j = 0, jj = resolution.subbands.length; j < jj; j++) {
-        var mu, epsilon;
-        if (!scalarExpounded) {
-          // formula E-5
-          mu = spqcds[0].mu;
-          epsilon = spqcds[0].epsilon + (i > 0 ? 1 - i : 0);
-        } else {
-          mu = spqcds[b].mu;
-          epsilon = spqcds[b].epsilon;
-        }
-
-        var subband = resolution.subbands[j];
-        var width = subband.tbx1 - subband.tbx0;
-        var height = subband.tby1 - subband.tby0;
-        var gainLog2 = SubbandsGainLog2[subband.type];
-
-        // calulate quantization coefficient (Section E.1.1.1)
-        var delta = Math.pow(2, (precision + gainLog2) - epsilon) *
-          (1 + mu / 2048);
-        var mb = (guardBits + epsilon - 1);
-
-        var coefficients = new Float32Array(width * height);
-        copyCoefficients(coefficients, subband.tbx0, subband.tby0,
-          width, height, delta, mb, subband.codeblocks, transformation);
-
-        subbandCoefficients.push({
-          width: width,
-          height: height,
-          items: coefficients
-        });
-
-        b++;
-      }
-    }
-
-    var transformation = codingStyleParameters.transformation;
-    var transform = transformation == 0 ? new IrreversibleTransform() :
-      new ReversibleTransform();
-    var result = transform.calculate(subbandCoefficients,
-      component.tcx0, component.tcy0);
-    return {
-      left: component.tcx0,
-      top: component.tcy0,
-      width: result.width,
-      height: result.height,
-      items: result.items
-    };
-  }
-  function transformComponents(context) {
-    var siz = context.SIZ;
-    var components = context.components;
-    var componentsCount = siz.Csiz;
-    var resultImages = [];
-    for (var i = 0, ii = context.tiles.length; i < ii; i++) {
-      var tile = context.tiles[i];
-      var result = [];
-      for (var c = 0; c < componentsCount; c++) {
-        var image = transformTile(context, tile, c);
-        result.push(image);
-      }
-
-      // Section G.2.2 Inverse multi component transform
-      if (tile.codingStyleDefaultParameters.multipleComponentTransform) {
-        var y0items = result[0].items;
-        var y1items = result[1].items;
-        var y2items = result[2].items;
-        for (var j = 0, jj = y0items.length; j < jj; j++) {
-          var y0 = y0items[j], y1 = y1items[j], y2 = y2items[j];
-          var i1 = y0 - ((y2 + y1) >> 2);
-          y1items[j] = i1;
-          y0items[j] = y2 + i1;
-          y2items[j] = y1 + i1;
-        }
-      }
-
-      // Section G.1 DC level shifting to unsigned component values
-      for (var c = 0; c < componentsCount; c++) {
-        var component = components[c];
-        if (component.isSigned)
-          continue;
-
-        var offset = 1 << (component.precision - 1);
-        var tileImage = result[c];
-        var items = tileImage.items;
-        for (var j = 0, jj = items.length; j < jj; j++)
-          items[j] += offset;
-      }
-
-      // To simplify things: shift and clamp output to 8 bit unsigned
-      for (var c = 0; c < componentsCount; c++) {
-        var component = components[c];
-        var offset = component.isSigned ? 128 : 0;
-        var shift = component.precision - 8;
-        var tileImage = result[c];
-        var items = tileImage.items;
-        var data = new Uint8Array(items.length);
-        for (var j = 0, jj = items.length; j < jj; j++) {
-          var value = (items[j] >> shift) + offset;
-          data[j] = value < 0 ? 0 : value > 255 ? 255 : value;
-        }
-        result[c].items = data;
-      }
-
-      resultImages.push(result);
-    }
-    return resultImages;
-  }
-  function initializeTile(context, tileIndex) {
-    var siz = context.SIZ;
-    var componentsCount = siz.Csiz;
-    var tile = context.tiles[tileIndex];
-    var resultTiles = [];
-    for (var c = 0; c < componentsCount; c++) {
-      var component = tile.components[c];
-      var qcdOrQcc = c in context.currentTile.QCC ?
-        context.currentTile.QCC[c] : context.currentTile.QCD;
-      component.quantizationParameters = qcdOrQcc;
-      var codOrCoc = c in context.currentTile.COC ?
-        context.currentTile.COC[c] : context.currentTile.COD;
-      component.codingStyleParameters = codOrCoc;
-    }
-    tile.codingStyleDefaultParameters = context.currentTile.COD;
-  }
-
-  // Section B.10.2 Tag trees
-  var TagTree = (function TagTreeClosure() {
-    function TagTree(width, height) {
-      var levelsLength = log2(Math.max(width, height)) + 1;
-      this.levels = [];
-      for (var i = 0; i < levelsLength; i++) {
-        var level = {
-          width: width,
-          height: height,
-          items: []
-        };
-        this.levels.push(level);
-        width = Math.ceil(width / 2);
-        height = Math.ceil(height / 2);
-      }
-    }
-    TagTree.prototype = {
-      reset: function TagTree_reset(i, j) {
-        var currentLevel = 0, value = 0;
-        while (currentLevel < this.levels.length) {
-          var level = this.levels[currentLevel];
-          var index = i + j * level.width;
-          if (index in level.items) {
-            value = level.items[index];
-            break;
-          }
-          level.index = index;
-          i >>= 1;
-          j >>= 1;
-          currentLevel++;
-        }
-        currentLevel--;
-        var level = this.levels[currentLevel];
-        level.items[level.index] = value;
-        this.currentLevel = currentLevel;
-        delete this.value;
-      },
-      incrementValue: function TagTree_incrementValue() {
-        var level = this.levels[this.currentLevel];
-        level.items[level.index]++;
-      },
-      nextLevel: function TagTree_nextLevel() {
-        var currentLevel = this.currentLevel;
-        var level = this.levels[currentLevel];
-        var value = level.items[level.index];
-        currentLevel--;
-        if (currentLevel < 0) {
-          this.value = value;
-          return false;
-        }
-
-        this.currentLevel = currentLevel;
-        var level = this.levels[currentLevel];
-        level.items[level.index] = value;
-        return true;
-      }
-    };
-    return TagTree;
-  })();
-
-  var InclusionTree = (function InclusionTreeClosure() {
-    function InclusionTree(width, height,  defaultValue) {
-      var levelsLength = log2(Math.max(width, height)) + 1;
-      this.levels = [];
-      for (var i = 0; i < levelsLength; i++) {
-        var items = new Uint8Array(width * height);
-        for (var j = 0, jj = items.length; j < jj; j++)
-          items[j] = defaultValue;
-
-        var level = {
-          width: width,
-          height: height,
-          items: items
-        };
-        this.levels.push(level);
-
-        width = Math.ceil(width / 2);
-        height = Math.ceil(height / 2);
-      }
-    }
-    InclusionTree.prototype = {
-      reset: function InclusionTree_reset(i, j, stopValue) {
-        var currentLevel = 0;
-        while (currentLevel < this.levels.length) {
-          var level = this.levels[currentLevel];
-          var index = i + j * level.width;
-          level.index = index;
-          var value = level.items[index];
-
-          if (value == 0xFF)
-            break;
-
-          if (value > stopValue) {
-            this.currentLevel = currentLevel;
-            // already know about this one, propagating the value to top levels
-            this.propagateValues();
-            return false;
-          }
-
-          i >>= 1;
-          j >>= 1;
-          currentLevel++;
-        }
-        this.currentLevel = currentLevel - 1;
-        return true;
-      },
-      incrementValue: function InclusionTree_incrementValue(stopValue) {
-        var level = this.levels[this.currentLevel];
-        level.items[level.index] = stopValue + 1;
-        this.propagateValues();
-      },
-      propagateValues: function InclusionTree_propagateValues() {
-        var levelIndex = this.currentLevel;
-        var level = this.levels[levelIndex];
-        var currentValue = level.items[level.index];
-        while (--levelIndex >= 0) {
-          var level = this.levels[levelIndex];
-          level.items[level.index] = currentValue;
-        }
-      },
-      nextLevel: function InclusionTree_nextLevel() {
-        var currentLevel = this.currentLevel;
-        var level = this.levels[currentLevel];
-        var value = level.items[level.index];
-        level.items[level.index] = 0xFF;
-        currentLevel--;
-        if (currentLevel < 0)
-          return false;
-
-        this.currentLevel = currentLevel;
-        var level = this.levels[currentLevel];
-        level.items[level.index] = value;
-        return true;
-      }
-    };
-    return InclusionTree;
-  })();
-
-  // Implements C.3. Arithmetic decoding procedures
-  var ArithmeticDecoder = (function ArithmeticDecoderClosure() {
-    var QeTable = [
-      {qe: 0x5601, nmps: 1, nlps: 1, switchFlag: 1},
-      {qe: 0x3401, nmps: 2, nlps: 6, switchFlag: 0},
-      {qe: 0x1801, nmps: 3, nlps: 9, switchFlag: 0},
-      {qe: 0x0AC1, nmps: 4, nlps: 12, switchFlag: 0},
-      {qe: 0x0521, nmps: 5, nlps: 29, switchFlag: 0},
-      {qe: 0x0221, nmps: 38, nlps: 33, switchFlag: 0},
-      {qe: 0x5601, nmps: 7, nlps: 6, switchFlag: 1},
-      {qe: 0x5401, nmps: 8, nlps: 14, switchFlag: 0},
-      {qe: 0x4801, nmps: 9, nlps: 14, switchFlag: 0},
-      {qe: 0x3801, nmps: 10, nlps: 14, switchFlag: 0},
-      {qe: 0x3001, nmps: 11, nlps: 17, switchFlag: 0},
-      {qe: 0x2401, nmps: 12, nlps: 18, switchFlag: 0},
-      {qe: 0x1C01, nmps: 13, nlps: 20, switchFlag: 0},
-      {qe: 0x1601, nmps: 29, nlps: 21, switchFlag: 0},
-      {qe: 0x5601, nmps: 15, nlps: 14, switchFlag: 1},
-      {qe: 0x5401, nmps: 16, nlps: 14, switchFlag: 0},
-      {qe: 0x5101, nmps: 17, nlps: 15, switchFlag: 0},
-      {qe: 0x4801, nmps: 18, nlps: 16, switchFlag: 0},
-      {qe: 0x3801, nmps: 19, nlps: 17, switchFlag: 0},
-      {qe: 0x3401, nmps: 20, nlps: 18, switchFlag: 0},
-      {qe: 0x3001, nmps: 21, nlps: 19, switchFlag: 0},
-      {qe: 0x2801, nmps: 22, nlps: 19, switchFlag: 0},
-      {qe: 0x2401, nmps: 23, nlps: 20, switchFlag: 0},
-      {qe: 0x2201, nmps: 24, nlps: 21, switchFlag: 0},
-      {qe: 0x1C01, nmps: 25, nlps: 22, switchFlag: 0},
-      {qe: 0x1801, nmps: 26, nlps: 23, switchFlag: 0},
-      {qe: 0x1601, nmps: 27, nlps: 24, switchFlag: 0},
-      {qe: 0x1401, nmps: 28, nlps: 25, switchFlag: 0},
-      {qe: 0x1201, nmps: 29, nlps: 26, switchFlag: 0},
-      {qe: 0x1101, nmps: 30, nlps: 27, switchFlag: 0},
-      {qe: 0x0AC1, nmps: 31, nlps: 28, switchFlag: 0},
-      {qe: 0x09C1, nmps: 32, nlps: 29, switchFlag: 0},
-      {qe: 0x08A1, nmps: 33, nlps: 30, switchFlag: 0},
-      {qe: 0x0521, nmps: 34, nlps: 31, switchFlag: 0},
-      {qe: 0x0441, nmps: 35, nlps: 32, switchFlag: 0},
-      {qe: 0x02A1, nmps: 36, nlps: 33, switchFlag: 0},
-      {qe: 0x0221, nmps: 37, nlps: 34, switchFlag: 0},
-      {qe: 0x0141, nmps: 38, nlps: 35, switchFlag: 0},
-      {qe: 0x0111, nmps: 39, nlps: 36, switchFlag: 0},
-      {qe: 0x0085, nmps: 40, nlps: 37, switchFlag: 0},
-      {qe: 0x0049, nmps: 41, nlps: 38, switchFlag: 0},
-      {qe: 0x0025, nmps: 42, nlps: 39, switchFlag: 0},
-      {qe: 0x0015, nmps: 43, nlps: 40, switchFlag: 0},
-      {qe: 0x0009, nmps: 44, nlps: 41, switchFlag: 0},
-      {qe: 0x0005, nmps: 45, nlps: 42, switchFlag: 0},
-      {qe: 0x0001, nmps: 45, nlps: 43, switchFlag: 0},
-      {qe: 0x5601, nmps: 46, nlps: 46, switchFlag: 0}
-    ];
-
-    function ArithmeticDecoder(data, start, end) {
-      this.data = data;
-      this.bp = start;
-      this.dataEnd = end;
-
-      this.chigh = data[start];
-      this.clow = 0;
-
-      this.byteIn();
-
-      this.chigh = ((this.chigh << 7) & 0xFFFF) | ((this.clow >> 9) & 0x7F);
-      this.clow = (this.clow << 7) & 0xFFFF;
-      this.ct -= 7;
-      this.a = 0x8000;
-    }
-
-    ArithmeticDecoder.prototype = {
-      byteIn: function ArithmeticDecoder_byteIn() {
-        var data = this.data;
-        var bp = this.bp;
-        if (data[bp] == 0xFF) {
-          var b1 = data[bp + 1];
-          if (b1 > 0x8F) {
-            this.clow += 0xFF00;
-            this.ct = 8;
-          } else {
-            bp++;
-            this.clow += (data[bp] << 9);
-            this.ct = 7;
-            this.bp = bp;
-          }
-        } else {
-          bp++;
-          this.clow += bp < this.dataEnd ? (data[bp] << 8) : 0xFF00;
-          this.ct = 8;
-          this.bp = bp;
-        }
-        if (this.clow > 0xFFFF) {
-          this.chigh += (this.clow >> 16);
-          this.clow &= 0xFFFF;
-        }
-      },
-      readBit: function ArithmeticDecoder_readBit(cx) {
-        var qeIcx = QeTable[cx.index].qe;
-        this.a -= qeIcx;
-
-        if (this.chigh < qeIcx) {
-          var d = this.exchangeLps(cx);
-          this.renormD();
-          return d;
-        } else {
-          this.chigh -= qeIcx;
-          if ((this.a & 0x8000) == 0) {
-            var d = this.exchangeMps(cx);
-            this.renormD();
-            return d;
-          } else {
-            return cx.mps;
-          }
-        }
-      },
-      renormD: function ArithmeticDecoder_renormD() {
-        do {
-          if (this.ct == 0)
-            this.byteIn();
-
-          this.a <<= 1;
-          this.chigh = ((this.chigh << 1) & 0xFFFF) | ((this.clow >> 15) & 1);
-          this.clow = (this.clow << 1) & 0xFFFF;
-          this.ct--;
-        } while ((this.a & 0x8000) == 0);
-      },
-      exchangeMps: function ArithmeticDecoder_exchangeMps(cx) {
-        var d;
-        var qeTableIcx = QeTable[cx.index];
-        if (this.a < qeTableIcx.qe) {
-          d = 1 - cx.mps;
-
-          if (qeTableIcx.switchFlag == 1) {
-            cx.mps = 1 - cx.mps;
-          }
-          cx.index = qeTableIcx.nlps;
-        } else {
-          d = cx.mps;
-          cx.index = qeTableIcx.nmps;
-        }
-        return d;
-      },
-      exchangeLps: function ArithmeticDecoder_exchangeLps(cx) {
-        var d;
-        var qeTableIcx = QeTable[cx.index];
-        if (this.a < qeTableIcx.qe) {
-          this.a = qeTableIcx.qe;
-          d = cx.mps;
-          cx.index = qeTableIcx.nmps;
-        } else {
-          this.a = qeTableIcx.qe;
-          d = 1 - cx.mps;
-
-          if (qeTableIcx.switchFlag == 1) {
-            cx.mps = 1 - cx.mps;
-          }
-          cx.index = qeTableIcx.nlps;
-        }
-        return d;
-      }
-    };
-
-    return ArithmeticDecoder;
-  })();
-
-  // Section D. Coefficient bit modeling
-  var BitModel = (function BitModelClosure() {
-    // Table D-1
-    // The index is binary presentation: 0dddvvhh, ddd - sum of Di (0..4),
-    // vv - sum of Vi (0..2), and hh - sum of Hi (0..2)
-    var LLAndLHContextsLabel = new Uint8Array([
-      0, 5, 8, 0, 3, 7, 8, 0, 4, 7, 8, 0, 0, 0, 0, 0, 1, 6, 8, 0, 3, 7, 8, 0, 4,
-      7, 8, 0, 0, 0, 0, 0, 2, 6, 8, 0, 3, 7, 8, 0, 4, 7, 8, 0, 0, 0, 0, 0, 2, 6,
-      8, 0, 3, 7, 8, 0, 4, 7, 8, 0, 0, 0, 0, 0, 2, 6, 8, 0, 3, 7, 8, 0, 4, 7, 8
-    ]);
-    var HLContextLabel = new Uint8Array([
-      0, 3, 4, 0, 5, 7, 7, 0, 8, 8, 8, 0, 0, 0, 0, 0, 1, 3, 4, 0, 6, 7, 7, 0, 8,
-      8, 8, 0, 0, 0, 0, 0, 2, 3, 4, 0, 6, 7, 7, 0, 8, 8, 8, 0, 0, 0, 0, 0, 2, 3,
-      4, 0, 6, 7, 7, 0, 8, 8, 8, 0, 0, 0, 0, 0, 2, 3, 4, 0, 6, 7, 7, 0, 8, 8, 8
-    ]);
-    var HHContextLabel = new Uint8Array([
-      0, 1, 2, 0, 1, 2, 2, 0, 2, 2, 2, 0, 0, 0, 0, 0, 3, 4, 5, 0, 4, 5, 5, 0, 5,
-      5, 5, 0, 0, 0, 0, 0, 6, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 0, 0, 0, 0, 8, 8,
-      8, 0, 8, 8, 8, 0, 8, 8, 8, 0, 0, 0, 0, 0, 8, 8, 8, 0, 8, 8, 8, 0, 8, 8, 8
-    ]);
-
-    // Table D-2
-    function calcSignContribution(significance0, sign0, significance1, sign1) {
-      if (significance1) {
-        if (!sign1)
-          return significance0 ? (!sign0 ? 1 : 0) : 1;
-        else
-          return significance0 ? (!sign0 ? 0 : -1) : -1;
-      } else
-        return significance0 ? (!sign0 ? 1 : -1) : 0;
-    }
-    // Table D-3
-    var SignContextLabels = [
-      {contextLabel: 13, xorBit: 0},
-      {contextLabel: 12, xorBit: 0},
-      {contextLabel: 11, xorBit: 0},
-      {contextLabel: 10, xorBit: 0},
-      {contextLabel: 9, xorBit: 0},
-      {contextLabel: 10, xorBit: 1},
-      {contextLabel: 11, xorBit: 1},
-      {contextLabel: 12, xorBit: 1},
-      {contextLabel: 13, xorBit: 1}
-    ];
-
-    function BitModel(width, height, subband, zeroBitPlanes) {
-      this.width = width;
-      this.height = height;
-
-      this.contextLabelTable = subband == 'HH' ? HHContextLabel :
-        subband == 'HL' ? HLContextLabel : LLAndLHContextsLabel;
-
-      var coefficientCount = width * height;
-
-      // coefficients outside the encoding region treated as insignificant
-      // add border state cells for significanceState
-      this.neighborsSignificance = new Uint8Array(coefficientCount);
-      this.coefficentsSign = new Uint8Array(coefficientCount);
-      this.coefficentsMagnitude = new Uint32Array(coefficientCount);
-      this.processingFlags = new Uint8Array(coefficientCount);
-
-      var bitsDecoded = new Uint8Array(this.width * this.height);
-      for (var i = 0, ii = bitsDecoded.length; i < ii; i++)
-        bitsDecoded[i] = zeroBitPlanes;
-      this.bitsDecoded = bitsDecoded;
-
-      this.reset();
-    }
-
-    BitModel.prototype = {
-      setDecoder: function BitModel_setDecoder(decoder) {
-        this.decoder = decoder;
-      },
-      reset: function BitModel_reset() {
-        this.uniformContext = {index: 46, mps: 0};
-        this.runLengthContext = {index: 3, mps: 0};
-        this.contexts = [];
-        this.contexts.push({index: 4, mps: 0});
-        for (var i = 1; i <= 16; i++)
-          this.contexts.push({index: 0, mps: 0});
-      },
-      setNeighborsSignificance:
-        function BitModel_setNeighborsSignificance(row, column) {
-        var neighborsSignificance = this.neighborsSignificance;
-        var width = this.width, height = this.height;
-        var index = row * width + column;
-        if (row > 0) {
-          if (column > 0)
-            neighborsSignificance[index - width - 1] += 0x10;
-          if (column + 1 < width)
-            neighborsSignificance[index - width + 1] += 0x10;
-          neighborsSignificance[index - width] += 0x04;
-        }
-        if (row + 1 < height) {
-          if (column > 0)
-            neighborsSignificance[index + width - 1] += 0x10;
-          if (column + 1 < width)
-            neighborsSignificance[index + width + 1] += 0x10;
-          neighborsSignificance[index + width] += 0x04;
-        }
-        if (column > 0)
-          neighborsSignificance[index - 1] += 0x01;
-        if (column + 1 < width)
-          neighborsSignificance[index + 1] += 0x01;
-        neighborsSignificance[index] |= 0x80;
-      },
-      runSignificancePropogationPass:
-        function BitModel_runSignificancePropogationPass() {
-        var decoder = this.decoder;
-        var width = this.width, height = this.height;
-        var coefficentsMagnitude = this.coefficentsMagnitude;
-        var coefficentsSign = this.coefficentsSign;
-        var contextLabels = this.contextLabels;
-        var neighborsSignificance = this.neighborsSignificance;
-        var processingFlags = this.processingFlags;
-        var contexts = this.contexts;
-        var labels = this.contextLabelTable;
-        var bitsDecoded = this.bitsDecoded;
-        // clear processed flag
-        var processedInverseMask = ~1;
-        var processedMask = 1;
-        var firstMagnitudeBitMask = 2;
-        for (var q = 0, qq = width * height; q < qq; q++)
-          processingFlags[q] &= processedInverseMask;
-
-        for (var i0 = 0; i0 < height; i0 += 4) {
-          for (var j = 0; j < width; j++) {
-            var index = i0 * width + j;
-            for (var i1 = 0; i1 < 4; i1++, index += width) {
-              var i = i0 + i1;
-              if (i >= height)
-                break;
-
-              if (coefficentsMagnitude[index] || !neighborsSignificance[index])
-                continue;
-
-              var contextLabel = labels[neighborsSignificance[index]];
-              var cx = contexts[contextLabel];
-              var decision = decoder.readBit(cx);
-              if (decision) {
-                var sign = this.decodeSignBit(i, j);
-                coefficentsSign[index] = sign;
-                coefficentsMagnitude[index] = 1;
-                this.setNeighborsSignificance(i, j);
-                processingFlags[index] |= firstMagnitudeBitMask;
-              }
-              bitsDecoded[index]++;
-              processingFlags[index] |= processedMask;
-            }
-          }
-        }
-      },
-      decodeSignBit: function BitModel_decodeSignBit(row, column) {
-        var width = this.width, height = this.height;
-        var index = row * width + column;
-        var coefficentsMagnitude = this.coefficentsMagnitude;
-        var coefficentsSign = this.coefficentsSign;
-        var horizontalContribution = calcSignContribution(
-          column > 0 && coefficentsMagnitude[index - 1],
-          coefficentsSign[index - 1],
-          column + 1 < width && coefficentsMagnitude[index + 1],
-          coefficentsSign[index + 1]);
-        var verticalContribution = calcSignContribution(
-          row > 0 && coefficentsMagnitude[index - width],
-          coefficentsSign[index - width],
-          row + 1 < height && coefficentsMagnitude[index + width],
-          coefficentsSign[index + width]);
-
-        var contextLabelAndXor = SignContextLabels[
-          3 * (1 - horizontalContribution) + (1 - verticalContribution)];
-        var contextLabel = contextLabelAndXor.contextLabel;
-        var cx = this.contexts[contextLabel];
-        var decoded = this.decoder.readBit(cx);
-        return decoded ^ contextLabelAndXor.xorBit;
-      },
-      runMagnitudeRefinementPass:
-        function BitModel_runMagnitudeRefinementPass() {
-        var decoder = this.decoder;
-        var width = this.width, height = this.height;
-        var coefficentsMagnitude = this.coefficentsMagnitude;
-        var neighborsSignificance = this.neighborsSignificance;
-        var contexts = this.contexts;
-        var bitsDecoded = this.bitsDecoded;
-        var processingFlags = this.processingFlags;
-        var processedMask = 1;
-        var firstMagnitudeBitMask = 2;
-        for (var i0 = 0; i0 < height; i0 += 4) {
-          for (var j = 0; j < width; j++) {
-            for (var i1 = 0; i1 < 4; i1++) {
-              var i = i0 + i1;
-              if (i >= height)
-                break;
-              var index = i * width + j;
-
-              // significant but not those that have just become
-              if (!coefficentsMagnitude[index] ||
-                (processingFlags[index] & processedMask) != 0)
-                continue;
-
-              var contextLabel = 16;
-              if ((processingFlags[index] &
-                firstMagnitudeBitMask) != 0) {
-                processingFlags[i * width + j] ^= firstMagnitudeBitMask;
-                // first refinement
-                var significance = neighborsSignificance[index];
-                var sumOfSignificance = (significance & 3) +
-                  ((significance >> 2) & 3) + ((significance >> 4) & 7);
-                contextLabel = sumOfSignificance >= 1 ? 15 : 14;
-              }
-
-              var cx = contexts[contextLabel];
-              var bit = decoder.readBit(cx);
-              coefficentsMagnitude[index] =
-                (coefficentsMagnitude[index] << 1) | bit;
-              bitsDecoded[index]++;
-              processingFlags[index] |= processedMask;
-            }
-          }
-        }
-      },
-      runCleanupPass: function BitModel_runCleanupPass() {
-        var decoder = this.decoder;
-        var width = this.width, height = this.height;
-        var neighborsSignificance = this.neighborsSignificance;
-        var significanceState = this.significanceState;
-        var coefficentsMagnitude = this.coefficentsMagnitude;
-        var coefficentsSign = this.coefficentsSign;
-        var contexts = this.contexts;
-        var labels = this.contextLabelTable;
-        var bitsDecoded = this.bitsDecoded;
-        var processingFlags = this.processingFlags;
-        var processedMask = 1;
-        var firstMagnitudeBitMask = 2;
-        var oneRowDown = width;
-        var twoRowsDown = width * 2;
-        var threeRowsDown = width * 3;
-        for (var i0 = 0; i0 < height; i0 += 4) {
-          for (var j = 0; j < width; j++) {
-            var index0 = i0 * width + j;
-            // using the property: labels[neighborsSignificance[index]] == 0
-            // when neighborsSignificance[index] == 0
-            var allEmpty = i0 + 3 < height &&
-              processingFlags[index0] == 0 &&
-              processingFlags[index0 + oneRowDown] == 0 &&
-              processingFlags[index0 + twoRowsDown] == 0 &&
-              processingFlags[index0 + threeRowsDown] == 0 &&
-              neighborsSignificance[index0] == 0 &&
-              neighborsSignificance[index0 + oneRowDown] == 0 &&
-              neighborsSignificance[index0 + twoRowsDown] == 0 &&
-              neighborsSignificance[index0 + threeRowsDown] == 0;
-            var i1 = 0, index = index0;
-            var cx, i;
-            if (allEmpty) {
-              cx = this.runLengthContext;
-              var hasSignificantCoefficent = decoder.readBit(cx);
-              if (!hasSignificantCoefficent) {
-                bitsDecoded[index0]++;
-                bitsDecoded[index0 + oneRowDown]++;
-                bitsDecoded[index0 + twoRowsDown]++;
-                bitsDecoded[index0 + threeRowsDown]++;
-                continue; // next column
-              }
-              cx = this.uniformContext;
-              i1 = (decoder.readBit(cx) << 1) | decoder.readBit(cx);
-              i = i0 + i1;
-              index += i1 * width;
-
-              var sign = this.decodeSignBit(i, j);
-              coefficentsSign[index] = sign;
-              coefficentsMagnitude[index] = 1;
-              this.setNeighborsSignificance(i, j);
-              processingFlags[index] |= firstMagnitudeBitMask;
-
-              index = index0;
-              for (var i2 = i0; i2 <= i; i2++, index += width)
-                bitsDecoded[index]++;
-
-              i1++;
-            }
-            for (; i1 < 4; i1++, index += width) {
-              i = i0 + i1;
-              if (i >= height)
-                break;
-
-              if (coefficentsMagnitude[index] ||
-                (processingFlags[index] & processedMask) != 0)
-                continue;
-
-              var contextLabel = labels[neighborsSignificance[index]];
-              cx = contexts[contextLabel];
-              var decision = decoder.readBit(cx);
-              if (decision == 1) {
-                var sign = this.decodeSignBit(i, j);
-                coefficentsSign[index] = sign;
-                coefficentsMagnitude[index] = 1;
-                this.setNeighborsSignificance(i, j);
-                processingFlags[index] |= firstMagnitudeBitMask;
-              }
-              bitsDecoded[index]++;
-            }
-          }
-        }
-      }
-    };
-
-    return BitModel;
-  })();
-
-  // Section F, Discrete wavelet transofrmation
-  var Transform = (function TransformClosure() {
-    function Transform() {
-    }
-    Transform.prototype.calculate =
-      function transformCalculate(subbands, u0, v0) {
-      var ll = subbands[0];
-      for (var i = 1, ii = subbands.length, j = 1; i < ii; i += 3, j++) {
-        ll = this.iterate(ll, subbands[i], subbands[i + 1],
-                          subbands[i + 2], u0, v0);
-      }
-      return ll;
-    };
-    Transform.prototype.iterate = function Transform_iterate(ll, hl, lh, hh,
-                                                            u0, v0) {
-      var llWidth = ll.width, llHeight = ll.height, llItems = ll.items;
-      var hlWidth = hl.width, hlHeight = hl.height, hlItems = hl.items;
-      var lhWidth = lh.width, lhHeight = lh.height, lhItems = lh.items;
-      var hhWidth = hh.width, hhHeight = hh.height, hhItems = hh.items;
-
-      // Section F.3.3 interleave
-      var width = llWidth + hlWidth;
-      var height = llHeight + lhHeight;
-      var items = new Float32Array(width * height);
-      for (var i = 0, ii = llHeight; i < ii; i++) {
-        var k = i * llWidth, l = i * 2 * width;
-        for (var j = 0, jj = llWidth; j < jj; j++, k++, l += 2)
-          items[l] = llItems[k];
-      }
-      for (var i = 0, ii = hlHeight; i < ii; i++) {
-        var k = i * hlWidth, l = i * 2 * width + 1;
-        for (var j = 0, jj = hlWidth; j < jj; j++, k++, l += 2)
-          items[l] = hlItems[k];
-      }
-      for (var i = 0, ii = lhHeight; i < ii; i++) {
-        var k = i * lhWidth, l = (i * 2 + 1) * width;
-        for (var j = 0, jj = lhWidth; j < jj; j++, k++, l += 2)
-          items[l] = lhItems[k];
-      }
-      for (var i = 0, ii = hhHeight; i < ii; i++) {
-        var k = i * hhWidth, l = (i * 2 + 1) * width + 1;
-        for (var j = 0, jj = hhWidth; j < jj; j++, k++, l += 2)
-          items[l] = hhItems[k];
-      }
-
-      var bufferPadding = 4;
-      var bufferLength = new Float32Array(Math.max(width, height) +
-        2 * bufferPadding);
-      var buffer = new Float32Array(bufferLength);
-      var bufferOut = new Float32Array(bufferLength);
-
-      // Section F.3.4 HOR_SR
-      for (var v = 0; v < height; v++) {
-        if (width == 1) {
-          // if width = 1, when u0 even keep items as is, when odd divide by 2
-          if ((u0 % 1) != 0) {
-            items[v * width] /= 2;
-          }
-          continue;
-        }
-
-        var k = v * width;
-        var l = bufferPadding;
-        for (var u = 0; u < width; u++, k++, l++)
-          buffer[l] = items[k];
-
-        // Section F.3.7 extending... using max extension of 4
-        var i1 = bufferPadding - 1, j1 = bufferPadding + 1;
-        var i2 = bufferPadding + width - 2, j2 = bufferPadding + width;
-        buffer[i1--] = buffer[j1++];
-        buffer[j2++] = buffer[i2--];
-        buffer[i1--] = buffer[j1++];
-        buffer[j2++] = buffer[i2--];
-        buffer[i1--] = buffer[j1++];
-        buffer[j2++] = buffer[i2--];
-        buffer[i1--] = buffer[j1++];
-        buffer[j2++] = buffer[i2--];
-
-        this.filter(buffer, bufferPadding, width, u0, bufferOut);
-
-        k = v * width;
-        l = bufferPadding;
-        for (var u = 0; u < width; u++, k++, l++)
-          items[k] = bufferOut[l];
-      }
-
-      // Section F.3.5 VER_SR
-      for (var u = 0; u < width; u++) {
-        if (height == 1) {
-          // if height = 1, when v0 even keep items as is, when odd divide by 2
-          if ((v0 % 1) != 0) {
-            items[u] /= 2;
-          }
-          continue;
-        }
-
-        var k = u;
-        var l = bufferPadding;
-        for (var v = 0; v < height; v++, k += width, l++)
-          buffer[l] = items[k];
-
-        // Section F.3.7 extending... using max extension of 4
-        var i1 = bufferPadding - 1, j1 = bufferPadding + 1;
-        var i2 = bufferPadding + height - 2, j2 = bufferPadding + height;
-        buffer[i1--] = buffer[j1++];
-        buffer[j2++] = buffer[i2--];
-        buffer[i1--] = buffer[j1++];
-        buffer[j2++] = buffer[i2--];
-        buffer[i1--] = buffer[j1++];
-        buffer[j2++] = buffer[i2--];
-        buffer[i1--] = buffer[j1++];
-        buffer[j2++] = buffer[i2--];
-
-        this.filter(buffer, bufferPadding, height, v0, bufferOut);
-
-        k = u;
-        l = bufferPadding;
-        for (var v = 0; v < height; v++, k += width, l++)
-          items[k] = bufferOut[l];
-      }
-      return {
-        width: width,
-        height: height,
-        items: items
-      };
-    };
-    return Transform;
-  })();
-
-  // Section 3.8.2 Irreversible 9-7 filter
-  var IrreversibleTransform = (function IrreversibleTransformClosure() {
-    function IrreversibleTransform() {
-      Transform.call(this);
-    }
-
-    IrreversibleTransform.prototype = Object.create(Transform.prototype);
-    IrreversibleTransform.prototype.filter =
-      function irreversibleTransformFilter(y, offset, length, i0, x) {
-      var i0_ = Math.floor(i0 / 2);
-      var i1_ = Math.floor((i0 + length) / 2);
-      var offset_ = offset - (i0 % 1);
-
-      var alpha = -1.586134342059924;
-      var beta = -0.052980118572961;
-      var gamma = 0.882911075530934;
-      var delta = 0.443506852043971;
-      var K = 1.230174104914001;
-      var K_ = 1 / K;
-
-      // step 1
-      var j = offset_ - 2;
-      for (var n = i0_ - 1, nn = i1_ + 2; n < nn; n++, j += 2)
-        x[j] = K * y[j];
-
-      // step 2
-      var j = offset_ - 3;
-      for (var n = i0_ - 2, nn = i1_ + 2; n < nn; n++, j += 2)
-        x[j] = K_ * y[j];
-
-      // step 3
-      var j = offset_ - 2;
-      for (var n = i0_ - 1, nn = i1_ + 2; n < nn; n++, j += 2)
-        x[j] -= delta * (x[j - 1] + x[j + 1]);
-
-      // step 4
-      var j = offset_ - 1;
-      for (var n = i0_ - 1, nn = i1_ + 1; n < nn; n++, j += 2)
-        x[j] -= gamma * (x[j - 1] + x[j + 1]);
-
-      // step 5
-      var j = offset_;
-      for (var n = i0_, nn = i1_ + 1; n < nn; n++, j += 2)
-        x[j] -= beta * (x[j - 1] + x[j + 1]);
-
-      // step 6
-      var j = offset_ + 1;
-      for (var n = i0_, nn = i1_; n < nn; n++, j += 2)
-        x[j] -= alpha * (x[j - 1] + x[j + 1]);
-    };
-
-    return IrreversibleTransform;
-  })();
-
-  // Section 3.8.1 Reversible 5-3 filter
-  var ReversibleTransform = (function ReversibleTransformClosure() {
-    function ReversibleTransform() {
-      Transform.call(this);
-    }
-
-    ReversibleTransform.prototype = Object.create(Transform.prototype);
-    ReversibleTransform.prototype.filter =
-      function reversibleTransformFilter(y, offset, length, i0, x) {
-      var i0_ = Math.floor(i0 / 2);
-      var i1_ = Math.floor((i0 + length) / 2);
-      var offset_ = offset - (i0 % 1);
-
-      for (var n = i0_, nn = i1_ + 1, j = offset_; n < nn; n++, j += 2)
-        x[j] = y[j] - Math.floor((y[j - 1] + y[j + 1] + 2) / 4);
-
-      for (var n = i0_, nn = i1_, j = offset_ + 1; n < nn; n++, j += 2)
-        x[j] = y[j] + Math.floor((x[j - 1] + x[j + 1]) / 2);
-    };
-
-    return ReversibleTransform;
-  })();
-
-  return JpxImage;
-})();
-
-
-/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
-
-'use strict';
-
-var bidi = PDFJS.bidi = (function bidiClosure() {
-  // Character types for symbols from 0000 to 00FF.
-  var baseTypes = [
-    'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'S', 'B', 'S', 'WS',
-    'B', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN',
-    'BN', 'BN', 'B', 'B', 'B', 'S', 'WS', 'ON', 'ON', 'ET', 'ET', 'ET', 'ON',
-    'ON', 'ON', 'ON', 'ON', 'ON', 'CS', 'ON', 'CS', 'ON', 'EN', 'EN', 'EN',
-    'EN', 'EN', 'EN', 'EN', 'EN', 'EN', 'EN', 'ON', 'ON', 'ON', 'ON', 'ON',
-    'ON', 'ON', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L',
-    'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'ON', 'ON',
-    'ON', 'ON', 'ON', 'ON', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L',
-    'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L',
-    'L', 'ON', 'ON', 'ON', 'ON', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'B', 'BN',
-    'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN',
-    'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN',
-    'BN', 'CS', 'ON', 'ET', 'ET', 'ET', 'ET', 'ON', 'ON', 'ON', 'ON', 'L', 'ON',
-    'ON', 'ON', 'ON', 'ON', 'ET', 'ET', 'EN', 'EN', 'ON', 'L', 'ON', 'ON', 'ON',
-    'EN', 'L', 'ON', 'ON', 'ON', 'ON', 'ON', 'L', 'L', 'L', 'L', 'L', 'L', 'L',
-    'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L',
-    'L', 'ON', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L',
-    'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L',
-    'L', 'L', 'L', 'ON', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L'
-  ];
-
-  // Character types for symbols from 0600 to 06FF
-  var arabicTypes = [
-    'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL',
-    'CS', 'AL', 'ON', 'ON', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'AL',
-    'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL',
-    'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL',
-    'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL',
-    'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL',
-    'AL', 'AL', 'AL', 'AL', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM',
-    'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'AL', 'AL', 'AL', 'AL',
-    'AL', 'AL', 'AL', 'AN', 'AN', 'AN', 'AN', 'AN', 'AN', 'AN', 'AN', 'AN',
-    'AN', 'ET', 'AN', 'AN', 'AL', 'AL', 'AL', 'NSM', 'AL', 'AL', 'AL', 'AL',
-    'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL',
-    'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL',
-    'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL',
-    'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL',
-    'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL',
-    'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL',
-    'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL',
-    'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL',
-    'AL', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM',
-    'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'ON', 'NSM',
-    'NSM', 'NSM', 'NSM', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL',
-    'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL'
-  ];
-
-  function isOdd(i) {
-    return (i & 1) != 0;
-  }
-
-  function isEven(i) {
-    return (i & 1) == 0;
-  }
-
-  function findUnequal(arr, start, value) {
-    var j;
-    for (var j = start, jj = arr.length; j < jj; ++j) {
-      if (arr[j] != value)
-        return j;
-    }
-    return j;
-  }
-
-  function setValues(arr, start, end, value) {
-    for (var j = start; j < end; ++j) {
-      arr[j] = value;
-    }
-  }
-
-  function reverseValues(arr, start, end) {
-    for (var i = start, j = end - 1; i < j; ++i, --j) {
-      var temp = arr[i];
-      arr[i] = arr[j];
-      arr[j] = temp;
-    }
-  }
-
-  function mirrorGlyphs(c) {
-    /*
-     # BidiMirroring-1.txt
-     0028; 0029 # LEFT PARENTHESIS
-     0029; 0028 # RIGHT PARENTHESIS
-     003C; 003E # LESS-THAN SIGN
-     003E; 003C # GREATER-THAN SIGN
-     005B; 005D # LEFT SQUARE BRACKET
-     005D; 005B # RIGHT SQUARE BRACKET
-     007B; 007D # LEFT CURLY BRACKET
-     007D; 007B # RIGHT CURLY BRACKET
-     00AB; 00BB # LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
-     00BB; 00AB # RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
-     */
-    switch (c) {
-      case '(':
-        return ')';
-      case ')':
-        return '(';
-      case '<':
-        return '>';
-      case '>':
-        return '<';
-      case ']':
-        return '[';
-      case '[':
-        return ']';
-      case '}':
-        return '{';
-      case '{':
-        return '}';
-      case '\u00AB':
-        return '\u00BB';
-      case '\u00BB':
-        return '\u00AB';
-      default:
-        return c;
-    }
-  }
-
-  function bidi(text, startLevel) {
-    var str = text.str;
-    var strLength = str.length;
-    if (strLength == 0)
-      return str;
-
-    // get types, fill arrays
-
-    var chars = [];
-    var types = [];
-    var oldtypes = [];
-    var numBidi = 0;
-
-    for (var i = 0; i < strLength; ++i) {
-      chars[i] = str.charAt(i);
-
-      var charCode = str.charCodeAt(i);
-      var charType = 'L';
-      if (charCode <= 0x00ff)
-        charType = baseTypes[charCode];
-      else if (0x0590 <= charCode && charCode <= 0x05f4)
-        charType = 'R';
-      else if (0x0600 <= charCode && charCode <= 0x06ff)
-        charType = arabicTypes[charCode & 0xff];
-      else if (0x0700 <= charCode && charCode <= 0x08AC)
-        charType = 'AL';
-
-      if (charType == 'R' || charType == 'AL' || charType == 'AN')
-        numBidi++;
-
-      oldtypes[i] = types[i] = charType;
-    }
-
-    // detect the bidi method
-    //  if there are no rtl characters then no bidi needed
-    //  if less than 30% chars are rtl then string is primarily ltr
-    //  if more than 30% chars are rtl then string is primarily rtl
-    if (numBidi == 0) {
-      text.direction = 'ltr';
-      return str;
-    }
-
-    if (startLevel == -1) {
-      if ((strLength / numBidi) < 0.3) {
-        text.direction = 'ltr';
-        startLevel = 0;
-      } else {
-        text.direction = 'rtl';
-        startLevel = 1;
-      }
-    }
-
-    var levels = [];
-
-    for (var i = 0; i < strLength; ++i) {
-      levels[i] = startLevel;
-    }
-
-    /*
-     X1-X10: skip most of this, since we are NOT doing the embeddings.
-     */
-
-    var e = isOdd(startLevel) ? 'R' : 'L';
-    var sor = e;
-    var eor = sor;
-
-    /*
-     W1. Examine each non-spacing mark (NSM) in the level run, and change the
-     type of the NSM to the type of the previous character. If the NSM is at the
-     start of the level run, it will get the type of sor.
-     */
-
-    var lastType = sor;
-    for (var i = 0; i < strLength; ++i) {
-      if (types[i] == 'NSM')
-        types[i] = lastType;
-      else
-        lastType = types[i];
-    }
-
-    /*
-     W2. Search backwards from each instance of a European number until the
-     first strong type (R, L, AL, or sor) is found.  If an AL is found, change
-     the type of the European number to Arabic number.
-     */
-
-    var lastType = sor;
-    for (var i = 0; i < strLength; ++i) {
-      var t = types[i];
-      if (t == 'EN')
-        types[i] = (lastType == 'AL') ? 'AN' : 'EN';
-      else if (t == 'R' || t == 'L' || t == 'AL')
-        lastType = t;
-    }
-
-    /*
-     W3. Change all ALs to R.
-     */
-
-    for (var i = 0; i < strLength; ++i) {
-      var t = types[i];
-      if (t == 'AL')
-        types[i] = 'R';
-    }
-
-    /*
-     W4. A single European separator between two European numbers changes to a
-     European number. A single common separator between two numbers of the same
-     type changes to that type:
-     */
-
-    for (var i = 1; i < strLength - 1; ++i) {
-      if (types[i] == 'ES' && types[i - 1] == 'EN' && types[i + 1] == 'EN')
-        types[i] = 'EN';
-      if (types[i] == 'CS' && (types[i - 1] == 'EN' || types[i - 1] == 'AN') &&
-          types[i + 1] == types[i - 1])
-        types[i] = types[i - 1];
-    }
-
-    /*
-     W5. A sequence of European terminators adjacent to European numbers changes
-     to all European numbers:
-     */
-
-    for (var i = 0; i < strLength; ++i) {
-      if (types[i] == 'EN') {
-        // do before
-        for (var j = i - 1; j >= 0; --j) {
-          if (types[j] != 'ET')
-            break;
-          types[j] = 'EN';
-        }
-        // do after
-        for (var j = i + 1; j < strLength; --j) {
-          if (types[j] != 'ET')
-            break;
-          types[j] = 'EN';
-        }
-      }
-    }
-
-    /*
-     W6. Otherwise, separators and terminators change to Other Neutral:
-     */
-
-    for (var i = 0; i < strLength; ++i) {
-      var t = types[i];
-      if (t == 'WS' || t == 'ES' || t == 'ET' || t == 'CS')
-        types[i] = 'ON';
-    }
-
-    /*
-     W7. Search backwards from each instance of a European number until the
-     first strong type (R, L, or sor) is found. If an L is found,  then change
-     the type of the European number to L.
-     */
-
-    var lastType = sor;
-    for (var i = 0; i < strLength; ++i) {
-      var t = types[i];
-      if (t == 'EN')
-        types[i] = (lastType == 'L') ? 'L' : 'EN';
-      else if (t == 'R' || t == 'L')
-        lastType = t;
-    }
-
-    /*
-     N1. A sequence of neutrals takes the direction of the surrounding strong
-     text if the text on both sides has the same direction. European and Arabic
-     numbers are treated as though they were R. Start-of-level-run (sor) and
-     end-of-level-run (eor) are used at level run boundaries.
-     */
-
-    for (var i = 0; i < strLength; ++i) {
-      if (types[i] == 'ON') {
-        var end = findUnequal(types, i + 1, 'ON');
-        var before = sor;
-        if (i > 0)
-          before = types[i - 1];
-        var after = eor;
-        if (end + 1 < strLength)
-          after = types[end + 1];
-        if (before != 'L')
-          before = 'R';
-        if (after != 'L')
-          after = 'R';
-        if (before == after)
-          setValues(types, i, end, before);
-        i = end - 1; // reset to end (-1 so next iteration is ok)
-      }
-    }
-
-    /*
-     N2. Any remaining neutrals take the embedding direction.
-     */
-
-    for (var i = 0; i < strLength; ++i) {
-      if (types[i] == 'ON')
-        types[i] = e;
-    }
-
-    /*
-     I1. For all characters with an even (left-to-right) embedding direction,
-     those of type R go up one level and those of type AN or EN go up two
-     levels.
-     I2. For all characters with an odd (right-to-left) embedding direction,
-     those of type L, EN or AN go up one level.
-     */
-
-    for (var i = 0; i < strLength; ++i) {
-      var t = types[i];
-      if (isEven(levels[i])) {
-        if (t == 'R') {
-          levels[i] += 1;
-        } else if (t == 'AN' || t == 'EN') {
-          levels[i] += 2;
-        }
-      } else { // isOdd, so
-        if (t == 'L' || t == 'AN' || t == 'EN') {
-          levels[i] += 1;
-        }
-      }
-    }
-
-    /*
-     L1. On each line, reset the embedding level of the following characters to
-     the paragraph embedding level:
-
-     segment separators,
-     paragraph separators,
-     any sequence of whitespace characters preceding a segment separator or
-     paragraph separator, and any sequence of white space characters at the end
-     of the line.
-     */
-
-    // don't bother as text is only single line
-
-    /*
-     L2. From the highest level found in the text to the lowest odd level on
-     each line, reverse any contiguous sequence of characters that are at that
-     level or higher.
-     */
-
-    // find highest level & lowest odd level
-
-    var highestLevel = -1;
-    var lowestOddLevel = 99;
-    for (var i = 0, ii = levels.length; i < ii; ++i) {
-      var level = levels[i];
-      if (highestLevel < level)
-        highestLevel = level;
-      if (lowestOddLevel > level && isOdd(level))
-        lowestOddLevel = level;
-    }
-
-    // now reverse between those limits
-
-    for (var level = highestLevel; level >= lowestOddLevel; --level) {
-      // find segments to reverse
-      var start = -1;
-      for (var i = 0, ii = levels.length; i < ii; ++i) {
-        if (levels[i] < level) {
-          if (start >= 0) {
-            reverseValues(chars, start, i);
-            start = -1;
-          }
-        } else if (start < 0) {
-          start = i;
-        }
-      }
-      if (start >= 0) {
-        reverseValues(chars, start, levels.length);
-      }
-    }
-
-    /*
-     L3. Combining marks applied to a right-to-left base character will at this
-     point precede their base character. If the rendering engine expects them to
-     follow the base characters in the final display process, then the ordering
-     of the marks and the base character must be reversed.
-     */
-
-    // don't bother for now
-
-    /*
-     L4. A character that possesses the mirrored property as specified by
-     Section 4.7, Mirrored, must be depicted by a mirrored glyph if the resolved
-     directionality of that character is R.
-     */
-
-    // don't mirror as characters are already mirrored in the pdf
-
-    // Finally, return string
-
-    var result = '';
-    for (var i = 0, ii = chars.length; i < ii; ++i) {
-      var ch = chars[i];
-      if (ch != '<' && ch != '>')
-        result += ch;
-    }
-    return result;
-  }
-
-  return bidi;
-})();
-
-
-/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
-
-'use strict';
-
-var Metadata = PDFJS.Metadata = (function MetadataClosure() {
-  function fixMetadata(meta) {
-    return meta.replace(/>\\376\\377([^<]+)/g, function(all, codes) {
-      var bytes = codes.replace(/\\([0-3])([0-7])([0-7])/g,
-                                function(code, d1, d2, d3) {
-        return String.fromCharCode(d1 * 64 + d2 * 8 + d3 * 1);
-      });
-      var chars = '';
-      for (var i = 0; i < bytes.length; i += 2) {
-        var code = bytes.charCodeAt(i) * 256 + bytes.charCodeAt(i + 1);
-        chars += code >= 32 && code < 127 && code != 60 && code != 62 &&
-          code != 38 && false ? String.fromCharCode(code) :
-          '&#x' + (0x10000 + code).toString(16).substring(1) + ';';
-      }
-      return '>' + chars;
-    });
-  }
-
-  function Metadata(meta) {
-    if (typeof meta === 'string') {
-      // Ghostscript produces invalid metadata
-      meta = fixMetadata(meta);
-
-      var parser = new DOMParser();
-      meta = parser.parseFromString(meta, 'application/xml');
-    } else if (!(meta instanceof Document)) {
-      error('Metadata: Invalid metadata object');
-    }
-
-    this.metaDocument = meta;
-    this.metadata = {};
-    this.parse();
-  }
-
-  Metadata.prototype = {
-    parse: function Metadata_parse() {
-      var doc = this.metaDocument;
-      var rdf = doc.documentElement;
-
-      if (rdf.nodeName.toLowerCase() !== 'rdf:rdf') { // Wrapped in <xmpmeta>
-        rdf = rdf.firstChild;
-        while (rdf && rdf.nodeName.toLowerCase() !== 'rdf:rdf')
-          rdf = rdf.nextSibling;
-      }
-
-      var nodeName = (rdf) ? rdf.nodeName.toLowerCase() : null;
-      if (!rdf || nodeName !== 'rdf:rdf' || !rdf.hasChildNodes())
-        return;
-
-      var childNodes = rdf.childNodes, desc, namespace, entries, entry;
-
-      for (var i = 0, length = childNodes.length; i < length; i++) {
-        desc = childNodes[i];
-        if (desc.nodeName.toLowerCase() !== 'rdf:description')
-          continue;
-
-        entries = [];
-        for (var ii = 0, iLength = desc.childNodes.length; ii < iLength; ii++) {
-          if (desc.childNodes[ii].nodeName.toLowerCase() !== '#text')
-            entries.push(desc.childNodes[ii]);
-        }
-
-        for (ii = 0, iLength = entries.length; ii < iLength; ii++) {
-          var entry = entries[ii];
-          var name = entry.nodeName.toLowerCase();
-          this.metadata[name] = entry.textContent.trim();
-        }
-      }
-    },
-
-    get: function Metadata_get(name) {
-      return this.metadata[name] || null;
-    },
-
-    has: function Metadata_has(name) {
-      return typeof this.metadata[name] !== 'undefined';
-    }
-  };
-
-  return Metadata;
-})();
-
-}).call((typeof window === 'undefined') ? this : window);
diff --git a/apps/files_pdfviewer/js/pdfjs/compatibility.js b/apps/files_pdfviewer/js/pdfjs/compatibility.js
deleted file mode 100644
index 528841bb61..0000000000
--- a/apps/files_pdfviewer/js/pdfjs/compatibility.js
+++ /dev/null
@@ -1,340 +0,0 @@
-/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
-
-'use strict';
-
-// Checking if the typed arrays are supported
-(function checkTypedArrayCompatibility() {
-  if (typeof Uint8Array !== 'undefined') {
-    // some mobile version might not support Float64Array
-    if (typeof Float64Array === 'undefined')
-      window.Float64Array = Float32Array;
-
-    return;
-  }
-
-  function subarray(start, end) {
-    return new TypedArray(this.slice(start, end));
-  }
-
-  function setArrayOffset(array, offset) {
-    if (arguments.length < 2)
-      offset = 0;
-    for (var i = 0, n = array.length; i < n; ++i, ++offset)
-      this[offset] = array[i] & 0xFF;
-  }
-
-  function TypedArray(arg1) {
-    var result;
-    if (typeof arg1 === 'number') {
-      result = [];
-      for (var i = 0; i < arg1; ++i)
-        result[i] = 0;
-    } else
-      result = arg1.slice(0);
-
-    result.subarray = subarray;
-    result.buffer = result;
-    result.byteLength = result.length;
-    result.set = setArrayOffset;
-
-    if (typeof arg1 === 'object' && arg1.buffer)
-      result.buffer = arg1.buffer;
-
-    return result;
-  }
-
-  window.Uint8Array = TypedArray;
-
-  // we don't need support for set, byteLength for 32-bit array
-  // so we can use the TypedArray as well
-  window.Uint32Array = TypedArray;
-  window.Int32Array = TypedArray;
-  window.Uint16Array = TypedArray;
-  window.Float32Array = TypedArray;
-  window.Float64Array = TypedArray;
-})();
-
-// Object.create() ?
-(function checkObjectCreateCompatibility() {
-  if (typeof Object.create !== 'undefined')
-    return;
-
-  Object.create = function objectCreate(proto) {
-    var constructor = function objectCreateConstructor() {};
-    constructor.prototype = proto;
-    return new constructor();
-  };
-})();
-
-// Object.defineProperty() ?
-(function checkObjectDefinePropertyCompatibility() {
-  if (typeof Object.defineProperty !== 'undefined')
-    return;
-
-  Object.defineProperty = function objectDefineProperty(obj, name, def) {
-    delete obj[name];
-    if ('get' in def)
-      obj.__defineGetter__(name, def['get']);
-    if ('set' in def)
-      obj.__defineSetter__(name, def['set']);
-    if ('value' in def) {
-      obj.__defineSetter__(name, function objectDefinePropertySetter(value) {
-        this.__defineGetter__(name, function objectDefinePropertyGetter() {
-          return value;
-        });
-        return value;
-      });
-      obj[name] = def.value;
-    }
-  };
-})();
-
-// Object.keys() ?
-(function checkObjectKeysCompatibility() {
-  if (typeof Object.keys !== 'undefined')
-    return;
-
-  Object.keys = function objectKeys(obj) {
-    var result = [];
-    for (var i in obj) {
-      if (obj.hasOwnProperty(i))
-        result.push(i);
-    }
-    return result;
-  };
-})();
-
-// No XMLHttpRequest.response ?
-(function checkXMLHttpRequestResponseCompatibility() {
-  var xhrPrototype = XMLHttpRequest.prototype;
-  if ('response' in xhrPrototype ||
-      'mozResponseArrayBuffer' in xhrPrototype ||
-      'mozResponse' in xhrPrototype ||
-      'responseArrayBuffer' in xhrPrototype)
-    return;
-  // IE ?
-  if (typeof VBArray !== 'undefined') {
-    Object.defineProperty(xhrPrototype, 'response', {
-      get: function xmlHttpRequestResponseGet() {
-        return new Uint8Array(new VBArray(this.responseBody).toArray());
-      }
-    });
-    Object.defineProperty(xhrPrototype, 'overrideMimeType', {
-      value: function xmlHttpRequestOverrideMimeType(mimeType) {}
-    });
-    return;
-  }
-
-  // other browsers
-  function responseTypeSetter() {
-    // will be only called to set "arraybuffer"
-    this.overrideMimeType('text/plain; charset=x-user-defined');
-  }
-  if (typeof xhrPrototype.overrideMimeType === 'function') {
-    Object.defineProperty(xhrPrototype, 'responseType',
-                          { set: responseTypeSetter });
-  }
-  function responseGetter() {
-    var text = this.responseText;
-    var i, n = text.length;
-    var result = new Uint8Array(n);
-    for (i = 0; i < n; ++i)
-      result[i] = text.charCodeAt(i) & 0xFF;
-    return result;
-  }
-  Object.defineProperty(xhrPrototype, 'response', { get: responseGetter });
-})();
-
-// window.btoa (base64 encode function) ?
-(function checkWindowBtoaCompatibility() {
-  if ('btoa' in window)
-    return;
-
-  var digits =
-    'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=';
-
-  window.btoa = function windowBtoa(chars) {
-    var buffer = '';
-    var i, n;
-    for (i = 0, n = chars.length; i < n; i += 3) {
-      var b1 = chars.charCodeAt(i) & 0xFF;
-      var b2 = chars.charCodeAt(i + 1) & 0xFF;
-      var b3 = chars.charCodeAt(i + 2) & 0xFF;
-      var d1 = b1 >> 2, d2 = ((b1 & 3) << 4) | (b2 >> 4);
-      var d3 = i + 1 < n ? ((b2 & 0xF) << 2) | (b3 >> 6) : 64;
-      var d4 = i + 2 < n ? (b3 & 0x3F) : 64;
-      buffer += (digits.charAt(d1) + digits.charAt(d2) +
-                 digits.charAt(d3) + digits.charAt(d4));
-    }
-    return buffer;
-  };
-})();
-
-// Function.prototype.bind ?
-(function checkFunctionPrototypeBindCompatibility() {
-  if (typeof Function.prototype.bind !== 'undefined')
-    return;
-
-  Function.prototype.bind = function functionPrototypeBind(obj) {
-    var fn = this, headArgs = Array.prototype.slice.call(arguments, 1);
-    var bound = function functionPrototypeBindBound() {
-      var args = Array.prototype.concat.apply(headArgs, arguments);
-      return fn.apply(obj, args);
-    };
-    return bound;
-  };
-})();
-
-// IE9 text/html data URI
-(function checkDocumentDocumentModeCompatibility() {
-  if (!('documentMode' in document) || document.documentMode !== 9)
-    return;
-  // overriding the src property
-  var originalSrcDescriptor = Object.getOwnPropertyDescriptor(
-    HTMLIFrameElement.prototype, 'src');
-  Object.defineProperty(HTMLIFrameElement.prototype, 'src', {
-    get: function htmlIFrameElementPrototypeSrcGet() { return this.$src; },
-    set: function htmlIFrameElementPrototypeSrcSet(src) {
-      this.$src = src;
-      if (src.substr(0, 14) != 'data:text/html') {
-        originalSrcDescriptor.set.call(this, src);
-        return;
-      }
-      // for text/html, using blank document and then
-      // document's open, write, and close operations
-      originalSrcDescriptor.set.call(this, 'about:blank');
-      setTimeout((function htmlIFrameElementPrototypeSrcOpenWriteClose() {
-        var doc = this.contentDocument;
-        doc.open('text/html');
-        doc.write(src.substr(src.indexOf(',') + 1));
-        doc.close();
-      }).bind(this), 0);
-    },
-    enumerable: true
-  });
-})();
-
-// HTMLElement dataset property
-(function checkDatasetProperty() {
-  var div = document.createElement('div');
-  if ('dataset' in div)
-    return; // dataset property exists
-
-  Object.defineProperty(HTMLElement.prototype, 'dataset', {
-    get: function() {
-      if (this._dataset)
-        return this._dataset;
-
-      var dataset = {};
-      for (var j = 0, jj = this.attributes.length; j < jj; j++) {
-        var attribute = this.attributes[j];
-        if (attribute.name.substring(0, 5) != 'data-')
-          continue;
-        var key = attribute.name.substring(5).replace(/\-([a-z])/g,
-          function(all, ch) { return ch.toUpperCase(); });
-        dataset[key] = attribute.value;
-      }
-
-      Object.defineProperty(this, '_dataset', {
-        value: dataset,
-        writable: false,
-        enumerable: false
-      });
-      return dataset;
-    },
-    enumerable: true
-  });
-})();
-
-// HTMLElement classList property
-(function checkClassListProperty() {
-  var div = document.createElement('div');
-  if ('classList' in div)
-    return; // classList property exists
-
-  function changeList(element, itemName, add, remove) {
-    var s = element.className || '';
-    var list = s.split(/\s+/g);
-    if (list[0] == '') list.shift();
-    var index = list.indexOf(itemName);
-    if (index < 0 && add)
-      list.push(itemName);
-    if (index >= 0 && remove)
-      list.splice(index, 1);
-    element.className = list.join(' ');
-  }
-
-  var classListPrototype = {
-    add: function(name) {
-      changeList(this.element, name, true, false);
-    },
-    remove: function(name) {
-      changeList(this.element, name, false, true);
-    },
-    toggle: function(name) {
-      changeList(this.element, name, true, true);
-    }
-  };
-
-  Object.defineProperty(HTMLElement.prototype, 'classList', {
-    get: function() {
-      if (this._classList)
-        return this._classList;
-
-      var classList = Object.create(classListPrototype, {
-        element: {
-          value: this,
-          writable: false,
-          enumerable: true
-        }
-      });
-      Object.defineProperty(this, '_classList', {
-        value: classList,
-        writable: false,
-        enumerable: false
-      });
-      return classList;
-    },
-    enumerable: true
-  });
-})();
-
-// Check console compatability
-(function checkConsoleCompatibility() {
-  if (typeof console == 'undefined') {
-    console = {log: function() {}};
-  }
-})();
-
-// Check onclick compatibility in Opera
-(function checkOnClickCompatibility() {
-  // workaround for reported Opera bug DSK-354448:
-  // onclick fires on disabled buttons with opaque content
-  function ignoreIfTargetDisabled(event) {
-    if (isDisabled(event.target)) {
-      event.stopPropagation();
-    }
-  }
-  function isDisabled(node) {
-    return node.disabled || (node.parentNode && isDisabled(node.parentNode));
-  }
-  if (navigator.userAgent.indexOf('Opera') != -1) {
-    // use browser detection since we cannot feature-check this bug
-    document.addEventListener('click', ignoreIfTargetDisabled, true);
-  }
-})();
-
-// Checks if navigator.language is supported
-(function checkNavigatorLanguage() {
-  if ('language' in navigator)
-    return;
-  Object.defineProperty(navigator, 'language', {
-    get: function navigatorLanguage() {
-      var language = navigator.userLanguage || 'en-US';
-      return language.substring(0, 2).toLowerCase() +
-        language.substring(2).toUpperCase();
-    },
-    enumerable: true
-  });
-})();
diff --git a/apps/files_pdfviewer/js/pdfjs/update.sh b/apps/files_pdfviewer/js/pdfjs/update.sh
deleted file mode 100755
index df100e780b..0000000000
--- a/apps/files_pdfviewer/js/pdfjs/update.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-cd build
-rm pdf.js
-wget http://mozilla.github.com/pdf.js/build/pdf.js
-wget http://mozilla.github.com/pdf.js/web/compatibility.js
-wget http://mozilla.github.com/pdf.js/web/viewer.js
-
diff --git a/apps/files_pdfviewer/js/pdfjs/viewer.js b/apps/files_pdfviewer/js/pdfjs/viewer.js
deleted file mode 100644
index 90dd1eef02..0000000000
--- a/apps/files_pdfviewer/js/pdfjs/viewer.js
+++ /dev/null
@@ -1,1873 +0,0 @@
-/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
-
-'use strict';
-
-var kDefaultURL = 'compressed.tracemonkey-pldi-09.pdf';
-var kDefaultScale = 'auto';
-var kDefaultScaleDelta = 1.1;
-var kUnknownScale = 0;
-var kCacheSize = 20;
-var kCssUnits = 96.0 / 72.0;
-var kScrollbarPadding = 40;
-var kMinScale = 0.25;
-var kMaxScale = 4.0;
-var kImageDirectory = './images/';
-var kSettingsMemory = 20;
-
-var mozL10n = document.mozL10n || document.webL10n;
-
-function getFileName(url) {
-  var anchor = url.indexOf('#');
-  var query = url.indexOf('?');
-  var end = Math.min(
-    anchor > 0 ? anchor : url.length,
-    query > 0 ? query : url.length);
-  return url.substring(url.lastIndexOf('/', end) + 1, end);
-}
-
-var Cache = function cacheCache(size) {
-  var data = [];
-  this.push = function cachePush(view) {
-    var i = data.indexOf(view);
-    if (i >= 0)
-      data.splice(i);
-    data.push(view);
-    if (data.length > size)
-      data.shift().destroy();
-  };
-};
-
-var ProgressBar = (function ProgressBarClosure() {
-
-  function clamp(v, min, max) {
-    return Math.min(Math.max(v, min), max);
-  }
-
-  function ProgressBar(id, opts) {
-
-    // Fetch the sub-elements for later
-    this.div = document.querySelector(id + ' .progress');
-
-    // Get options, with sensible defaults
-    this.height = opts.height || 100;
-    this.width = opts.width || 100;
-    this.units = opts.units || '%';
-    this.percent = opts.percent || 0;
-
-    // Initialize heights
-    this.div.style.height = this.height + this.units;
-  }
-
-  ProgressBar.prototype = {
-
-    updateBar: function ProgressBar_updateBar() {
-      var progressSize = this.width * this._percent / 100;
-
-      if (this._percent > 95)
-        this.div.classList.add('full');
-
-      this.div.style.width = progressSize + this.units;
-    },
-
-    get percent() {
-      return this._percent;
-    },
-
-    set percent(val) {
-      this._percent = clamp(val, 0, 100);
-      this.updateBar();
-    }
-  };
-
-  return ProgressBar;
-})();
-
-var RenderingQueue = (function RenderingQueueClosure() {
-  function RenderingQueue() {
-    this.items = [];
-  }
-
-  RenderingQueue.prototype = {
-    enqueueDraw: function RenderingQueueEnqueueDraw(item) {
-      if (!item.drawingRequired())
-        return; // as no redraw required, no need for queueing.
-
-      this.items.push(item);
-      if (this.items.length > 1)
-        return; // not first item
-
-      item.draw(this.continueExecution.bind(this));
-    },
-    continueExecution: function RenderingQueueContinueExecution() {
-      var item = this.items.shift();
-
-      if (this.items.length == 0)
-        return; // queue is empty
-
-      item = this.items[0];
-      item.draw(this.continueExecution.bind(this));
-    }
-  };
-
-  return RenderingQueue;
-})();
-
-var FirefoxCom = (function FirefoxComClosure() {
-  return {
-    /**
-     * Creates an event that the extension is listening for and will
-     * synchronously respond to.
-     * NOTE: It is reccomended to use request() instead since one day we may not
-     * be able to synchronously reply.
-     * @param {String} action The action to trigger.
-     * @param {String} data Optional data to send.
-     * @return {*} The response.
-     */
-    requestSync: function(action, data) {
-      var request = document.createTextNode('');
-      request.setUserData('action', action, null);
-      request.setUserData('data', data, null);
-      request.setUserData('sync', true, null);
-      document.documentElement.appendChild(request);
-
-      var sender = document.createEvent('Events');
-      sender.initEvent('pdf.js.message', true, false);
-      request.dispatchEvent(sender);
-      var response = request.getUserData('response');
-      document.documentElement.removeChild(request);
-      return response;
-    },
-    /**
-     * Creates an event that the extension is listening for and will
-     * asynchronously respond by calling the callback.
-     * @param {String} action The action to trigger.
-     * @param {String} data Optional data to send.
-     * @param {Function} callback Optional response callback that will be called
-     * with one data argument.
-     */
-    request: function(action, data, callback) {
-      var request = document.createTextNode('');
-      request.setUserData('action', action, null);
-      request.setUserData('data', data, null);
-      request.setUserData('sync', false, null);
-      if (callback) {
-        request.setUserData('callback', callback, null);
-
-        document.addEventListener('pdf.js.response', function listener(event) {
-          var node = event.target,
-              callback = node.getUserData('callback'),
-              response = node.getUserData('response');
-
-          document.documentElement.removeChild(node);
-
-          document.removeEventListener('pdf.js.response', listener, false);
-          return callback(response);
-        }, false);
-      }
-      document.documentElement.appendChild(request);
-
-      var sender = document.createEvent('HTMLEvents');
-      sender.initEvent('pdf.js.message', true, false);
-      return request.dispatchEvent(sender);
-    }
-  };
-})();
-
-// Settings Manager - This is a utility for saving settings
-// First we see if localStorage is available
-// If not, we use FUEL in FF
-var Settings = (function SettingsClosure() {
-  var isLocalStorageEnabled = (function localStorageEnabledTest() {
-    // Feature test as per http://diveintohtml5.info/storage.html
-    // The additional localStorage call is to get around a FF quirk, see
-    // bug #495747 in bugzilla
-    try {
-      return 'localStorage' in window && window['localStorage'] !== null &&
-          localStorage;
-    } catch (e) {
-      return false;
-    }
-  })();
-
-  var isFirefoxExtension = PDFJS.isFirefoxExtension;
-
-  function Settings(fingerprint) {
-    var database = null;
-    var index;
-    if (isFirefoxExtension)
-      database = FirefoxCom.requestSync('getDatabase', null) || '{}';
-    else if (isLocalStorageEnabled)
-      database = localStorage.getItem('database') || '{}';
-    else
-      return false;
-
-    database = JSON.parse(database);
-    if (!('files' in database))
-      database.files = [];
-    if (database.files.length >= kSettingsMemory)
-      database.files.shift();
-    for (var i = 0, length = database.files.length; i < length; i++) {
-      var branch = database.files[i];
-      if (branch.fingerprint == fingerprint) {
-        index = i;
-        break;
-      }
-    }
-    if (typeof index != 'number')
-      index = database.files.push({fingerprint: fingerprint}) - 1;
-    this.file = database.files[index];
-    this.database = database;
-  }
-
-  Settings.prototype = {
-    set: function settingsSet(name, val) {
-      if (!('file' in this))
-        return false;
-
-      var file = this.file;
-      file[name] = val;
-      var database = JSON.stringify(this.database);
-      if (isFirefoxExtension)
-        FirefoxCom.requestSync('setDatabase', database);
-      else if (isLocalStorageEnabled)
-        localStorage.setItem('database', database);
-    },
-
-    get: function settingsGet(name, defaultValue) {
-      if (!('file' in this))
-        return defaultValue;
-
-      return this.file[name] || defaultValue;
-    }
-  };
-
-  return Settings;
-})();
-
-var cache = new Cache(kCacheSize);
-var renderingQueue = new RenderingQueue();
-var currentPageNumber = 1;
-
-var PDFView = {
-  pages: [],
-  thumbnails: [],
-  currentScale: kUnknownScale,
-  currentScaleValue: null,
-  initialBookmark: document.location.hash.substring(1),
-  startedTextExtraction: false,
-  pageText: [],
-  container: null,
-  initialized: false,
-  fellback: false,
-  pdfDocument: null,
-  // called once when the document is loaded
-  initialize: function pdfViewInitialize() {
-    this.container = document.getElementById('viewer');
-    this.initialized = true;
-  },
-
-  setScale: function pdfViewSetScale(val, resetAutoSettings) {
-    if (val == this.currentScale)
-      return;
-
-    var pages = this.pages;
-    for (var i = 0; i < pages.length; i++)
-      pages[i].update(val * kCssUnits);
-
-    if (this.currentScale != val)
-      this.pages[this.page - 1].scrollIntoView();
-    this.currentScale = val;
-
-    var event = document.createEvent('UIEvents');
-    event.initUIEvent('scalechange', false, false, window, 0);
-    event.scale = val;
-    event.resetAutoSettings = resetAutoSettings;
-    window.dispatchEvent(event);
-  },
-
-  parseScale: function pdfViewParseScale(value, resetAutoSettings) {
-    if ('custom' == value)
-      return;
-
-    var scale = parseFloat(value);
-    this.currentScaleValue = value;
-    if (scale) {
-      this.setScale(scale, true);
-      return;
-    }
-
-    var container = this.container;
-    var currentPage = this.pages[this.page - 1];
-    var pageWidthScale = (container.clientWidth - kScrollbarPadding) /
-                          currentPage.width * currentPage.scale / kCssUnits;
-    var pageHeightScale = (container.clientHeight - kScrollbarPadding) /
-                           currentPage.height * currentPage.scale / kCssUnits;
-    switch (value) {
-      case 'page-actual':
-        this.setScale(1, resetAutoSettings);
-        break;
-      case 'page-width':
-        this.setScale(pageWidthScale, resetAutoSettings);
-        break;
-      case 'page-height':
-        this.setScale(pageHeightScale, resetAutoSettings);
-        break;
-      case 'page-fit':
-        this.setScale(
-            Math.min(pageWidthScale, pageHeightScale), resetAutoSettings);
-        break;
-      case 'auto':
-        this.setScale(Math.min(1.0, pageWidthScale), resetAutoSettings);
-        break;
-    }
-
-    selectScaleOption(value);
-  },
-
-  zoomIn: function pdfViewZoomIn() {
-    var newScale = (this.currentScale * kDefaultScaleDelta).toFixed(2);
-    newScale = Math.min(kMaxScale, newScale);
-    this.parseScale(newScale, true);
-  },
-
-  zoomOut: function pdfViewZoomOut() {
-    var newScale = (this.currentScale / kDefaultScaleDelta).toFixed(2);
-    newScale = Math.max(kMinScale, newScale);
-    this.parseScale(newScale, true);
-  },
-
-  set page(val) {
-    var pages = this.pages;
-    var input = document.getElementById('pageNumber');
-    if (!(0 < val && val <= pages.length)) {
-      var event = document.createEvent('UIEvents');
-      event.initUIEvent('pagechange', false, false, window, 0);
-      event.pageNumber = this.page;
-      window.dispatchEvent(event);
-      return;
-    }
-
-    pages[val - 1].updateStats();
-    currentPageNumber = val;
-    var event = document.createEvent('UIEvents');
-    event.initUIEvent('pagechange', false, false, window, 0);
-    event.pageNumber = val;
-    window.dispatchEvent(event);
-
-    // checking if the this.page was called from the updateViewarea function:
-    // avoiding the creation of two "set page" method (internal and public)
-    if (updateViewarea.inProgress)
-      return;
-
-    // Avoid scrolling the first page during loading
-    if (this.loading && val == 1)
-      return;
-
-    pages[val - 1].scrollIntoView();
-  },
-
-  get page() {
-    return currentPageNumber;
-  },
-
-  open: function pdfViewOpen(url, scale, password) {
-    var parameters = {password: password};
-    if (typeof url === 'string') { // URL
-      this.url = url;
-      document.title = decodeURIComponent(getFileName(url)) || url;
-      parameters.url = url;
-    } else if (url && 'byteLength' in url) { // ArrayBuffer
-      parameters.data = url;
-    }
-
-//    if (!PDFView.loadingBar) {
-//      PDFView.loadingBar = new ProgressBar('#loadingBar', {});
-//    }
-
-    this.container = document.getElementById('viewer');
-
-    this.pdfDocument = null;
-    var self = this;
-    self.loading = true;
-    PDFJS.getDocument(parameters).then(
-      function getDocumentCallback(pdfDocument) {
-        self.load(pdfDocument, scale);
-        self.loading = false;
-      },
-      function getDocumentError(message, exception) {
-        if (exception.name === 'PasswordException') {
-          if (exception.code === 'needpassword') {
-            var promptString = mozL10n.get('request_password', null,
-                                      'PDF is protected by a password:');
-            password = prompt(promptString);
-            if (password && password.length > 0) {
-              return PDFView.open(url, scale, password);
-            }
-          }
-        }
-
-        var loadingIndicator = document.getElementById('loading');
-        loadingIndicator.textContent = mozL10n.get('loading_error_indicator',
-          null, 'Error');
-        var moreInfo = {
-          message: message
-        };
-        self.error(mozL10n.get('loading_error', null,
-          'An error occurred while loading the PDF.'), moreInfo);
-        self.loading = false;
-      },
-      function getDocumentProgress(progressData) {
-        self.progress(progressData.loaded / progressData.total);
-      }
-    );
-  },
-
-  download: function pdfViewDownload() {
-    function noData() {
-      FirefoxCom.request('download', { originalUrl: url });
-    }
-
-    var url = this.url.split('#')[0];
-    if (PDFJS.isFirefoxExtension) {
-      // Document isn't ready just try to download with the url.
-      if (!this.pdfDocument) {
-        noData();
-        return;
-      }
-      this.pdfDocument.getData().then(
-        function getDataSuccess(data) {
-          var bb = new MozBlobBuilder();
-          bb.append(data.buffer);
-          var blobUrl = window.URL.createObjectURL(
-                          bb.getBlob('application/pdf'));
-
-          FirefoxCom.request('download', { blobUrl: blobUrl, originalUrl: url },
-            function response(err) {
-              if (err) {
-                // This error won't really be helpful because it's likely the
-                // fallback won't work either (or is already open).
-                PDFView.error('PDF failed to download.');
-              }
-              window.URL.revokeObjectURL(blobUrl);
-            }
-          );
-        },
-        noData // Error ocurred try downloading with just the url.
-      );
-    } else {
-      url += '#pdfjs.action=download', '_parent';
-      window.open(url, '_parent');
-    }
-  },
-
-  fallback: function pdfViewFallback() {
-    if (!PDFJS.isFirefoxExtension)
-      return;
-    // Only trigger the fallback once so we don't spam the user with messages
-    // for one PDF.
-    if (this.fellback)
-      return;
-    this.fellback = true;
-    var url = this.url.split('#')[0];
-    FirefoxCom.request('fallback', url, function response(download) {
-      if (!download)
-        return;
-      PDFView.download();
-    });
-  },
-
-  navigateTo: function pdfViewNavigateTo(dest) {
-    if (typeof dest === 'string')
-      dest = this.destinations[dest];
-    if (!(dest instanceof Array))
-      return; // invalid destination
-    // dest array looks like that: <page-ref> </XYZ|FitXXX> <args..>
-    var destRef = dest[0];
-    var pageNumber = destRef instanceof Object ?
-      this.pagesRefMap[destRef.num + ' ' + destRef.gen + ' R'] : (destRef + 1);
-    if (pageNumber > this.pages.length)
-      pageNumber = this.pages.length;
-    if (pageNumber) {
-      this.page = pageNumber;
-      var currentPage = this.pages[pageNumber - 1];
-      currentPage.scrollIntoView(dest);
-    }
-  },
-
-  getDestinationHash: function pdfViewGetDestinationHash(dest) {
-    if (typeof dest === 'string')
-      return PDFView.getAnchorUrl('#' + escape(dest));
-    if (dest instanceof Array) {
-      var destRef = dest[0]; // see navigateTo method for dest format
-      var pageNumber = destRef instanceof Object ?
-        this.pagesRefMap[destRef.num + ' ' + destRef.gen + ' R'] :
-        (destRef + 1);
-      if (pageNumber) {
-        var pdfOpenParams = PDFView.getAnchorUrl('#page=' + pageNumber);
-        var destKind = dest[1];
-        if (typeof destKind === 'object' && 'name' in destKind &&
-            destKind.name == 'XYZ') {
-          var scale = (dest[4] || this.currentScale);
-          pdfOpenParams += '&zoom=' + (scale * 100);
-          if (dest[2] || dest[3]) {
-            pdfOpenParams += ',' + (dest[2] || 0) + ',' + (dest[3] || 0);
-          }
-        }
-        return pdfOpenParams;
-      }
-    }
-    return '';
-  },
-
-  /**
-   * For the firefox extension we prefix the full url on anchor links so they
-   * don't come up as resource:// urls and so open in new tab/window works.
-   * @param {String} anchor The anchor hash include the #.
-   */
-  getAnchorUrl: function getAnchorUrl(anchor) {
-    if (PDFJS.isFirefoxExtension)
-      return this.url.split('#')[0] + anchor;
-    return anchor;
-  },
-
-  /**
-   * Show the error box.
-   * @param {String} message A message that is human readable.
-   * @param {Object} moreInfo (optional) Further information about the error
-   *                            that is more technical.  Should have a 'message'
-   *                            and optionally a 'stack' property.
-   */
-  error: function pdfViewError(message, moreInfo) {
-    var moreInfoText = mozL10n.get('error_build', {build: PDFJS.build},
-      'PDF.JS Build: {{build}}') + '\n';
-    if (moreInfo) {
-      moreInfoText +=
-        mozL10n.get('error_message', {message: moreInfo.message},
-        'Message: {{message}}');
-      if (moreInfo.stack) {
-        moreInfoText += '\n' +
-          mozL10n.get('error_stack', {stack: moreInfo.stack},
-          'Stack: {{stack}}');
-      } else {
-        if (moreInfo.filename) {
-          moreInfoText += '\n' +
-            mozL10n.get('error_file', {file: moreInfo.filename},
-            'File: {{file}}');
-        }
-        if (moreInfo.lineNumber) {
-          moreInfoText += '\n' +
-            mozL10n.get('error_line', {line: moreInfo.lineNumber},
-            'Line: {{line}}');
-        }
-      }
-    }
-    if (PDFJS.isFirefoxExtension) {
-      console.error(message + '\n' + moreInfoText);
-      this.fallback();
-      return;
-    }
-    var errorWrapper = document.getElementById('errorWrapper');
-    errorWrapper.removeAttribute('hidden');
-
-    var errorMessage = document.getElementById('errorMessage');
-    errorMessage.textContent = message;
-
-    var closeButton = document.getElementById('errorClose');
-    closeButton.onclick = function() {
-      errorWrapper.setAttribute('hidden', 'true');
-    };
-
-    var errorMoreInfo = document.getElementById('errorMoreInfo');
-    var moreInfoButton = document.getElementById('errorShowMore');
-    var lessInfoButton = document.getElementById('errorShowLess');
-    moreInfoButton.onclick = function() {
-      errorMoreInfo.removeAttribute('hidden');
-      moreInfoButton.setAttribute('hidden', 'true');
-      lessInfoButton.removeAttribute('hidden');
-    };
-    lessInfoButton.onclick = function() {
-      errorMoreInfo.setAttribute('hidden', 'true');
-      moreInfoButton.removeAttribute('hidden');
-      lessInfoButton.setAttribute('hidden', 'true');
-    };
-    moreInfoButton.removeAttribute('hidden');
-    lessInfoButton.setAttribute('hidden', 'true');
-    errorMoreInfo.value = moreInfoText;
-
-    errorMoreInfo.rows = moreInfoText.split('\n').length - 1;
-  },
-
-  progress: function pdfViewProgress(level) {
-    var percent = Math.round(level * 100);
-    var loadingIndicator = document.getElementById('loading');
-    loadingIndicator.textContent = mozL10n.get('loading', {percent: percent},
-      'Loading... {{percent}}%');
-
-//    PDFView.loadingBar.percent = percent;
-  },
-
-  load: function pdfViewLoad(pdfDocument, scale) {
-    function bindOnAfterDraw(pageView, thumbnailView) {
-      // when page is painted, using the image as thumbnail base
-      pageView.onAfterDraw = function pdfViewLoadOnAfterDraw() {
-        thumbnailView.setImage(pageView.canvas);
-        preDraw();
-      };
-    }
-
-    this.pdfDocument = pdfDocument;
-
-//    var errorWrapper = document.getElementById('errorWrapper');
-//    errorWrapper.setAttribute('hidden', 'true');
-
-    var loadingBox = document.getElementById('loading');
-    loadingBox.setAttribute('hidden', 'true');
-
-//    var loadingBox = document.getElementById('loadingBox');
-//    loadingBox.setAttribute('hidden', 'true');
-
-//    var thumbsView = document.getElementById('thumbnailView');
-//    thumbsView.parentNode.scrollTop = 0;
-
-//    while (thumbsView.hasChildNodes())
-//      thumbsView.removeChild(thumbsView.lastChild);
-
-//    if ('_loadingInterval' in thumbsView)
-//      clearInterval(thumbsView._loadingInterval);
-
-    var container = document.getElementById('viewer');
-    while (container.hasChildNodes())
-      container.removeChild(container.lastChild);
-
-    var pagesCount = pdfDocument.numPages;
-    var id = pdfDocument.fingerprint;
-    var storedHash = null;
-//    document.getElementById('numPages').textContent =
-//      mozL10n.get('page_of', {pageCount: pagesCount}, 'of {{pageCount}}');
-    document.getElementById('numPages').innerHTML = pagesCount;
-    document.getElementById('pageNumber').max = pagesCount;
-    PDFView.documentFingerprint = id;
-    var store = PDFView.store = new Settings(id);
-    if (store.get('exists', false)) {
-      var page = store.get('page', '1');
-      var zoom = store.get('zoom', PDFView.currentScale);
-      var left = store.get('scrollLeft', '0');
-      var top = store.get('scrollTop', '0');
-
-      storedHash = 'page=' + page + '&zoom=' + zoom + ',' + left + ',' + top;
-    }
-
-    var pages = this.pages = [];
-    this.pageText = [];
-    this.startedTextExtraction = false;
-    var pagesRefMap = {};
-    var thumbnails = this.thumbnails = [];
-    var pagePromises = [];
-    for (var i = 1; i <= pagesCount; i++)
-      pagePromises.push(pdfDocument.getPage(i));
-    var self = this;
-    var pagesPromise = PDFJS.Promise.all(pagePromises);
-    pagesPromise.then(function(promisedPages) {
-      for (var i = 1; i <= pagesCount; i++) {
-        var page = promisedPages[i - 1];
-        var pageView = new PageView(container, page, i, scale,
-                                    page.stats, self.navigateTo.bind(self));
-//        var thumbnailView = new ThumbnailView(thumbsView, page, i);
-//        bindOnAfterDraw(pageView, thumbnailView);
-
-        pages.push(pageView);
-//        thumbnails.push(thumbnailView);
-        var pageRef = page.ref;
-        pagesRefMap[pageRef.num + ' ' + pageRef.gen + ' R'] = i;
-      }
-
-      self.pagesRefMap = pagesRefMap;
-    });
-
-    var destinationsPromise = pdfDocument.getDestinations();
-    destinationsPromise.then(function(destinations) {
-      self.destinations = destinations;
-    });
-
-    // outline and initial view depends on destinations and pagesRefMap
-    PDFJS.Promise.all([pagesPromise, destinationsPromise]).then(function() {
-      pdfDocument.getOutline().then(function(outline) {
-        self.outline = new DocumentOutlineView(outline);
-      });
-
-      self.setInitialView(storedHash, scale);
-    });
-
-    pdfDocument.getMetadata().then(function(data) {
-      var info = data.info, metadata = data.metadata;
-      self.documentInfo = info;
-      self.metadata = metadata;
-
-      var pdfTitle;
-      if (metadata) {
-        if (metadata.has('dc:title'))
-          pdfTitle = metadata.get('dc:title');
-      }
-
-      if (!pdfTitle && info && info['Title'])
-        pdfTitle = info['Title'];
-
-      if (pdfTitle)
-        document.title = pdfTitle + ' - ' + document.title;
-    });
-  },
-
-  setInitialView: function pdfViewSetInitialView(storedHash, scale) {
-    // Reset the current scale, as otherwise the page's scale might not get
-    // updated if the zoom level stayed the same.
-    this.currentScale = 0;
-    this.currentScaleValue = null;
-    if (this.initialBookmark) {
-      this.setHash(this.initialBookmark);
-      this.initialBookmark = null;
-    }
-    else if (storedHash)
-      this.setHash(storedHash);
-    else if (scale) {
-      this.parseScale(scale, true);
-      this.page = 1;
-    }
-
-    if (PDFView.currentScale === kUnknownScale) {
-      // Scale was not initialized: invalid bookmark or scale was not specified.
-      // Setting the default one.
-      this.parseScale(kDefaultScale, true);
-    }
-  },
-
-  search: function pdfViewStartSearch() {
-    // Limit this function to run every <SEARCH_TIMEOUT>ms.
-    var SEARCH_TIMEOUT = 250;
-    var lastSeach = this.lastSearch;
-    var now = Date.now();
-    if (lastSeach && (now - lastSeach) < SEARCH_TIMEOUT) {
-      if (!this.searchTimer) {
-        this.searchTimer = setTimeout(function resumeSearch() {
-            PDFView.search();
-          },
-          SEARCH_TIMEOUT - (now - lastSeach)
-        );
-      }
-      return;
-    }
-    this.searchTimer = null;
-    this.lastSearch = now;
-
-    function bindLink(link, pageNumber) {
-      link.href = '#' + pageNumber;
-      link.onclick = function searchBindLink() {
-        PDFView.page = pageNumber;
-        return false;
-      };
-    }
-
-    var searchResults = document.getElementById('searchResults');
-
-    var searchTermsInput = document.getElementById('searchTermsInput');
-    searchResults.removeAttribute('hidden');
-    searchResults.textContent = '';
-
-    var terms = searchTermsInput.value;
-
-    if (!terms)
-      return;
-
-    // simple search: removing spaces and hyphens, then scanning every
-    terms = terms.replace(/\s-/g, '').toLowerCase();
-    var index = PDFView.pageText;
-    var pageFound = false;
-    for (var i = 0, ii = index.length; i < ii; i++) {
-      var pageText = index[i].replace(/\s-/g, '').toLowerCase();
-      var j = pageText.indexOf(terms);
-      if (j < 0)
-        continue;
-
-      var pageNumber = i + 1;
-      var textSample = index[i].substr(j, 50);
-      var link = document.createElement('a');
-      bindLink(link, pageNumber);
-      link.textContent = 'Page ' + pageNumber + ': ' + textSample;
-      searchResults.appendChild(link);
-
-      pageFound = true;
-    }
-    if (!pageFound) {
-      searchResults.textContent = mozL10n.get('search_terms_not_found', null,
-                                              '(Not found)');
-    }
-  },
-
-  setHash: function pdfViewSetHash(hash) {
-    if (!hash)
-      return;
-
-    if (hash.indexOf('=') >= 0) {
-      var params = PDFView.parseQueryString(hash);
-      // borrowing syntax from "Parameters for Opening PDF Files"
-      if ('nameddest' in params) {
-        PDFView.navigateTo(params.nameddest);
-        return;
-      }
-      if ('page' in params) {
-        var pageNumber = (params.page | 0) || 1;
-        this.page = pageNumber;
-        if ('zoom' in params) {
-          var zoomArgs = params.zoom.split(','); // scale,left,top
-          // building destination array
-
-          // If the zoom value, it has to get divided by 100. If it is a string,
-          // it should stay as it is.
-          var zoomArg = zoomArgs[0];
-          var zoomArgNumber = parseFloat(zoomArg);
-          if (zoomArgNumber)
-            zoomArg = zoomArgNumber / 100;
-
-          var dest = [null, {name: 'XYZ'}, (zoomArgs[1] | 0),
-            (zoomArgs[2] | 0), zoomArg];
-          var currentPage = this.pages[pageNumber - 1];
-          currentPage.scrollIntoView(dest);
-        } else
-          this.page = params.page; // simple page
-        return;
-      }
-    } else if (/^\d+$/.test(hash)) // page number
-      this.page = hash;
-    else // named destination
-      PDFView.navigateTo(unescape(hash));
-  },
-
-  switchSidebarView: function pdfViewSwitchSidebarView(view) {
-    var thumbsView = document.getElementById('thumbnailView');
-    var outlineView = document.getElementById('outlineView');
-    var searchView = document.getElementById('searchView');
-
-    var thumbsButton = document.getElementById('viewThumbnail');
-    var outlineButton = document.getElementById('viewOutline');
-    var searchButton = document.getElementById('viewSearch');
-
-    switch (view) {
-      case 'thumbs':
-        thumbsButton.classList.add('toggled');
-        outlineButton.classList.remove('toggled');
-        searchButton.classList.remove('toggled');
-        thumbsView.classList.remove('hidden');
-        outlineView.classList.add('hidden');
-        searchView.classList.add('hidden');
-
-        updateThumbViewArea();
-        break;
-
-      case 'outline':
-        thumbsButton.classList.remove('toggled');
-        outlineButton.classList.add('toggled');
-        searchButton.classList.remove('toggled');
-        thumbsView.classList.add('hidden');
-        outlineView.classList.remove('hidden');
-        searchView.classList.add('hidden');
-
-        if (outlineButton.getAttribute('disabled'))
-          return;
-        break;
-
-      case 'search':
-        thumbsButton.classList.remove('toggled');
-        outlineButton.classList.remove('toggled');
-        searchButton.classList.add('toggled');
-        thumbsView.classList.add('hidden');
-        outlineView.classList.add('hidden');
-        searchView.classList.remove('hidden');
-
-        var searchTermsInput = document.getElementById('searchTermsInput');
-        searchTermsInput.focus();
-        // Start text extraction as soon as the search gets displayed.
-        this.extractText();
-        break;
-    }
-  },
-
-  extractText: function() {
-    if (this.startedTextExtraction)
-      return;
-    this.startedTextExtraction = true;
-    var self = this;
-    function extractPageText(pageIndex) {
-      self.pages[pageIndex].pdfPage.getTextContent().then(
-        function textContentResolved(textContent) {
-          self.pageText[pageIndex] = textContent;
-          self.search();
-          if ((pageIndex + 1) < self.pages.length)
-            extractPageText(pageIndex + 1);
-        }
-      );
-    };
-    extractPageText(0);
-  },
-
-  getVisiblePages: function pdfViewGetVisiblePages() {
-    var pages = this.pages;
-    var kBottomMargin = 10;
-    var kTopPadding = 30;
-    var visiblePages = [];
-
-    var currentHeight = kTopPadding + kBottomMargin;
-    //var container = this.container;
-    var container = document.getElementById('viewer');
-
-    // Add 1px to the scrolltop to give a little wiggle room if the math is off,
-    // this won't be needed if we calc current page number based off the middle
-    // of the screen instead of the top.
-    var containerTop = container.scrollTop + 1;
-    for (var i = 1; i <= pages.length; ++i) {
-      var page = pages[i - 1];
-      var pageHeight = page.height + kBottomMargin;
-      if (currentHeight + pageHeight > containerTop)
-        break;
-
-      currentHeight += pageHeight;
-    }
-
-    var containerBottom = containerTop + container.clientHeight;
-    for (; i <= pages.length && currentHeight < containerBottom; ++i) {
-      var singlePage = pages[i - 1];
-      visiblePages.push({ id: singlePage.id, y: currentHeight,
-                          view: singlePage });
-      currentHeight += page.height + kBottomMargin;
-    }
-    return visiblePages;
-  },
-
-  getVisibleThumbs: function pdfViewGetVisibleThumbs() {
-    var thumbs = this.thumbnails;
-    var kBottomMargin = 15;
-    var visibleThumbs = [];
-
-    var view = document.getElementById('thumbnailView');
-    var currentHeight = kBottomMargin;
-
-    var top = view.scrollTop;
-    for (var i = 1; i <= thumbs.length; ++i) {
-      var thumb = thumbs[i - 1];
-      var thumbHeight = thumb.height * thumb.scaleY + kBottomMargin;
-      if (currentHeight + thumbHeight > top)
-        break;
-
-      currentHeight += thumbHeight;
-    }
-
-    var bottom = top + view.clientHeight;
-    for (; i <= thumbs.length && currentHeight < bottom; ++i) {
-      var singleThumb = thumbs[i - 1];
-      visibleThumbs.push({ id: singleThumb.id, y: currentHeight,
-                          view: singleThumb });
-      currentHeight += singleThumb.height * singleThumb.scaleY + kBottomMargin;
-    }
-
-    return visibleThumbs;
-  },
-
-  // Helper function to parse query string (e.g. ?param1=value&parm2=...).
-  parseQueryString: function pdfViewParseQueryString(query) {
-    var parts = query.split('&');
-    var params = {};
-    for (var i = 0, ii = parts.length; i < parts.length; ++i) {
-      var param = parts[i].split('=');
-      var key = param[0];
-      var value = param.length > 1 ? param[1] : null;
-      params[unescape(key)] = unescape(value);
-    }
-    return params;
-  }
-};
-
-var PageView = function pageView(container, pdfPage, id, scale,
-                                 stats, navigateTo) {
-  this.id = id;
-  this.pdfPage = pdfPage;
-
-  this.scale = scale || 1.0;
-  this.viewport = this.pdfPage.getViewport(this.scale);
-
-  var anchor = document.createElement('a');
-  anchor.name = '' + this.id;
-
-  var div = document.createElement('div');
-  div.id = 'pageContainer' + this.id;
-  div.className = 'page';
-
-  container.appendChild(anchor);
-  container.appendChild(div);
-
-  this.destroy = function pageViewDestroy() {
-    this.update();
-    this.pdfPage.destroy();
-  };
-
-  this.update = function pageViewUpdate(scale) {
-    this.scale = scale || this.scale;
-    var viewport = this.pdfPage.getViewport(this.scale);
-
-    this.viewport = viewport;
-    div.style.width = viewport.width + 'px';
-    div.style.height = viewport.height + 'px';
-
-    while (div.hasChildNodes())
-      div.removeChild(div.lastChild);
-    div.removeAttribute('data-loaded');
-
-    delete this.canvas;
-
-    this.loadingIconDiv = document.createElement('div');
-    this.loadingIconDiv.className = 'loadingIcon';
-    div.appendChild(this.loadingIconDiv);
-  };
-
-  Object.defineProperty(this, 'width', {
-    get: function PageView_getWidth() {
-      return this.viewport.width;
-    },
-    enumerable: true
-  });
-
-  Object.defineProperty(this, 'height', {
-    get: function PageView_getHeight() {
-      return this.viewport.height;
-    },
-    enumerable: true
-  });
-
-  function setupAnnotations(pdfPage, viewport) {
-    function bindLink(link, dest) {
-      link.href = PDFView.getDestinationHash(dest);
-      link.onclick = function pageViewSetupLinksOnclick() {
-        if (dest)
-          PDFView.navigateTo(dest);
-        return false;
-      };
-    }
-    function createElementWithStyle(tagName, item) {
-      var rect = viewport.convertToViewportRectangle(item.rect);
-      rect = PDFJS.Util.normalizeRect(rect);
-      var element = document.createElement(tagName);
-      element.style.left = Math.floor(rect[0]) + 'px';
-      element.style.top = Math.floor(rect[1]) + 'px';
-      element.style.width = Math.ceil(rect[2] - rect[0]) + 'px';
-      element.style.height = Math.ceil(rect[3] - rect[1]) + 'px';
-      return element;
-    }
-    function createCommentAnnotation(type, item) {
-      var container = document.createElement('section');
-      container.className = 'annotComment';
-
-      var image = createElementWithStyle('img', item);
-      var type = item.type;
-      var rect = viewport.convertToViewportRectangle(item.rect);
-      rect = PDFJS.Util.normalizeRect(rect);
-      image.src = kImageDirectory + 'annotation-' + type.toLowerCase() + '.svg';
-      image.alt = mozL10n.get('text_annotation_type', {type: type},
-        '[{{type}} Annotation]');
-      var content = document.createElement('div');
-      content.setAttribute('hidden', true);
-      var title = document.createElement('h1');
-      var text = document.createElement('p');
-      content.style.left = Math.floor(rect[2]) + 'px';
-      content.style.top = Math.floor(rect[1]) + 'px';
-      title.textContent = item.title;
-
-      if (!item.content && !item.title) {
-        content.setAttribute('hidden', true);
-      } else {
-        var e = document.createElement('span');
-        var lines = item.content.split('\n');
-        for (var i = 0, ii = lines.length; i < ii; ++i) {
-          var line = lines[i];
-          e.appendChild(document.createTextNode(line));
-          if (i < (ii - 1))
-            e.appendChild(document.createElement('br'));
-        }
-        text.appendChild(e);
-        image.addEventListener('mouseover', function annotationImageOver() {
-           content.removeAttribute('hidden');
-        }, false);
-
-        image.addEventListener('mouseout', function annotationImageOut() {
-           content.setAttribute('hidden', true);
-        }, false);
-      }
-
-      content.appendChild(title);
-      content.appendChild(text);
-      container.appendChild(image);
-      container.appendChild(content);
-
-      return container;
-    }
-
-    pdfPage.getAnnotations().then(function(items) {
-      for (var i = 0; i < items.length; i++) {
-        var item = items[i];
-        switch (item.type) {
-          case 'Link':
-            var link = createElementWithStyle('a', item);
-            link.href = item.url || '';
-            if (!item.url)
-              bindLink(link, ('dest' in item) ? item.dest : null);
-            div.appendChild(link);
-            break;
-          case 'Text':
-            var comment = createCommentAnnotation(item.name, item);
-            if (comment)
-              div.appendChild(comment);
-            break;
-          case 'Widget':
-            // TODO: support forms
-            PDFView.fallback();
-            break;
-        }
-      }
-    });
-  }
-
-  this.getPagePoint = function pageViewGetPagePoint(x, y) {
-    return this.viewport.convertToPdfPoint(x, y);
-  };
-
-  this.scrollIntoView = function pageViewScrollIntoView(dest) {
-      if (!dest) {
-        div.scrollIntoView(true);
-        return;
-      }
-
-      var x = 0, y = 0;
-      var width = 0, height = 0, widthScale, heightScale;
-      var scale = 0;
-      switch (dest[1].name) {
-        case 'XYZ':
-          x = dest[2];
-          y = dest[3];
-          scale = dest[4];
-          break;
-        case 'Fit':
-        case 'FitB':
-          scale = 'page-fit';
-          break;
-        case 'FitH':
-        case 'FitBH':
-          y = dest[2];
-          scale = 'page-width';
-          break;
-        case 'FitV':
-        case 'FitBV':
-          x = dest[2];
-          scale = 'page-height';
-          break;
-        case 'FitR':
-          x = dest[2];
-          y = dest[3];
-          width = dest[4] - x;
-          height = dest[5] - y;
-          widthScale = (this.container.clientWidth - kScrollbarPadding) /
-            width / kCssUnits;
-          heightScale = (this.container.clientHeight - kScrollbarPadding) /
-            height / kCssUnits;
-          scale = Math.min(widthScale, heightScale);
-          break;
-        default:
-          return;
-      }
-
-      if (scale && scale !== PDFView.currentScale)
-        PDFView.parseScale(scale, true);
-      else if (PDFView.currentScale === kUnknownScale)
-        PDFView.parseScale(kDefaultScale, true);
-
-      var boundingRect = [
-        this.viewport.convertToViewportPoint(x, y),
-        this.viewport.convertToViewportPoint(x + width, y + height)
-      ];
-      setTimeout(function pageViewScrollIntoViewRelayout() {
-        // letting page to re-layout before scrolling
-        var scale = PDFView.currentScale;
-        var x = Math.min(boundingRect[0][0], boundingRect[1][0]);
-        var y = Math.min(boundingRect[0][1], boundingRect[1][1]);
-        var width = Math.abs(boundingRect[0][0] - boundingRect[1][0]);
-        var height = Math.abs(boundingRect[0][1] - boundingRect[1][1]);
-
-        // using temporary div to scroll it into view
-        var tempDiv = document.createElement('div');
-        tempDiv.style.position = 'absolute';
-        tempDiv.style.left = Math.floor(x) + 'px';
-        tempDiv.style.top = Math.floor(y) + 'px';
-        tempDiv.style.width = Math.ceil(width) + 'px';
-        tempDiv.style.height = Math.ceil(height) + 'px';
-        div.appendChild(tempDiv);
-        tempDiv.scrollIntoView(true);
-        div.removeChild(tempDiv);
-      }, 0);
-  };
-
-  this.drawingRequired = function() {
-    return !div.querySelector('canvas');
-  };
-
-  this.draw = function pageviewDraw(callback) {
-    if (!this.drawingRequired()) {
-      this.updateStats();
-      callback();
-      return;
-    }
-
-    var canvas = document.createElement('canvas');
-    canvas.id = 'page' + this.id;
-    canvas.mozOpaque = true;
-    div.appendChild(canvas);
-    this.canvas = canvas;
-
-    var textLayerDiv = null;
-    if (!PDFJS.disableTextLayer) {
-      textLayerDiv = document.createElement('div');
-      textLayerDiv.className = 'textLayer';
-      div.appendChild(textLayerDiv);
-    }
-    var textLayer = textLayerDiv ? new TextLayerBuilder(textLayerDiv) : null;
-
-    var scale = this.scale, viewport = this.viewport;
-    canvas.width = viewport.width;
-    canvas.height = viewport.height;
-
-    var ctx = canvas.getContext('2d');
-    ctx.save();
-    ctx.fillStyle = 'rgb(255, 255, 255)';
-    ctx.fillRect(0, 0, canvas.width, canvas.height);
-    ctx.restore();
-
-    // Rendering area
-
-    var self = this;
-    function pageViewDrawCallback(error) {
-      if (self.loadingIconDiv) {
-        div.removeChild(self.loadingIconDiv);
-        delete self.loadingIconDiv;
-      }
-
-      if (error) {
-        PDFView.error(mozL10n.get('rendering_error', null,
-          'An error occurred while rendering the page.'), error);
-      }
-
-      self.stats = pdfPage.stats;
-      self.updateStats();
-      if (self.onAfterDraw)
-        self.onAfterDraw();
-
-      cache.push(self);
-      callback();
-    }
-
-    var renderContext = {
-      canvasContext: ctx,
-      viewport: this.viewport,
-      textLayer: textLayer
-    };
-    this.pdfPage.render(renderContext).then(
-      function pdfPageRenderCallback() {
-        pageViewDrawCallback(null);
-      },
-      function pdfPageRenderError(error) {
-        pageViewDrawCallback(error);
-      }
-    );
-
-    setupAnnotations(this.pdfPage, this.viewport);
-    div.setAttribute('data-loaded', true);
-  };
-
-  this.updateStats = function pageViewUpdateStats() {
-    if (PDFJS.pdfBug && Stats.enabled) {
-      var stats = this.stats;
-      Stats.add(this.id, stats);
-    }
-  };
-};
-
-var ThumbnailView = function thumbnailView(container, pdfPage, id) {
-  var anchor = document.createElement('a');
-  anchor.href = PDFView.getAnchorUrl('#page=' + id);
-  anchor.title = mozL10n.get('thumb_page_title', {page: id}, 'Page {{page}}');
-  anchor.onclick = function stopNavigation() {
-    PDFView.page = id;
-    return false;
-  };
-
-  var viewport = pdfPage.getViewport(1);
-  var pageWidth = this.width = viewport.width;
-  var pageHeight = this.height = viewport.height;
-  var pageRatio = pageWidth / pageHeight;
-  this.id = id;
-
-  var canvasWidth = 98;
-  var canvasHeight = canvasWidth / this.width * this.height;
-  var scaleX = this.scaleX = (canvasWidth / pageWidth);
-  var scaleY = this.scaleY = (canvasHeight / pageHeight);
-
-  var div = document.createElement('div');
-  div.id = 'thumbnailContainer' + id;
-  div.className = 'thumbnail';
-
-  anchor.appendChild(div);
-  container.appendChild(anchor);
-
-  this.hasImage = false;
-
-  function getPageDrawContext() {
-    var canvas = document.createElement('canvas');
-    canvas.id = 'thumbnail' + id;
-    canvas.mozOpaque = true;
-
-    canvas.width = canvasWidth;
-    canvas.height = canvasHeight;
-    canvas.className = 'thumbnailImage';
-    canvas.setAttribute('aria-label', mozL10n.get('thumb_page_canvas',
-      {page: id}, 'Thumbnail of Page {{page}}'));
-
-    div.setAttribute('data-loaded', true);
-
-    var ring = document.createElement('div');
-    ring.className = 'thumbnailSelectionRing';
-    ring.appendChild(canvas);
-    div.appendChild(ring);
-
-    var ctx = canvas.getContext('2d');
-    ctx.save();
-    ctx.fillStyle = 'rgb(255, 255, 255)';
-    ctx.fillRect(0, 0, canvasWidth, canvasHeight);
-    ctx.restore();
-    return ctx;
-  }
-
-  this.drawingRequired = function thumbnailViewDrawingRequired() {
-    return !this.hasImage;
-  };
-
-  this.draw = function thumbnailViewDraw(callback) {
-    if (this.hasImage) {
-      callback();
-      return;
-    }
-
-    var ctx = getPageDrawContext();
-    var drawViewport = pdfPage.getViewport(scaleX);
-    var renderContext = {
-      canvasContext: ctx,
-      viewport: drawViewport
-    };
-    pdfPage.render(renderContext).then(
-      function pdfPageRenderCallback() {
-        callback();
-      },
-      function pdfPageRenderError(error) {
-        callback();
-      }
-    );
-    this.hasImage = true;
-  };
-
-  this.setImage = function thumbnailViewSetImage(img) {
-    if (this.hasImage || !img)
-      return;
-
-    var ctx = getPageDrawContext();
-    ctx.drawImage(img, 0, 0, img.width, img.height,
-                  0, 0, ctx.canvas.width, ctx.canvas.height);
-
-    this.hasImage = true;
-  };
-};
-
-var DocumentOutlineView = function documentOutlineView(outline) {
-  var outlineView = document.getElementById('outlineView');
-//  while (outlineView.firstChild)
-//    outlineView.removeChild(outlineView.firstChild);
-
-  function bindItemLink(domObj, item) {
-    domObj.href = PDFView.getDestinationHash(item.dest);
-    domObj.onclick = function documentOutlineViewOnclick(e) {
-      PDFView.navigateTo(item.dest);
-      return false;
-    };
-  }
-
-  if (!outline) {
-    var noOutline = document.createElement('div');
-    noOutline.classList.add('noOutline');
-    //noOutline.textContent = mozL10n.get('no_outline', null,
-    //  'No Outline Available');
-    noOutline.textContent = 'No Outline Available';
-    //outlineView.appendChild(noOutline);
-    return;
-  }
-
-  var queue = [{parent: outlineView, items: outline}];
-  while (queue.length > 0) {
-    var levelData = queue.shift();
-    var i, n = levelData.items.length;
-    for (i = 0; i < n; i++) {
-      var item = levelData.items[i];
-      var div = document.createElement('div');
-      div.className = 'outlineItem';
-      var a = document.createElement('a');
-      bindItemLink(a, item);
-      a.textContent = item.title;
-      div.appendChild(a);
-
-      if (item.items.length > 0) {
-        var itemsDiv = document.createElement('div');
-        itemsDiv.className = 'outlineItems';
-        div.appendChild(itemsDiv);
-        queue.push({parent: itemsDiv, items: item.items});
-      }
-
-//      levelData.parent.appendChild(div);
-    }
-  }
-};
-
-// optimised CSS custom property getter/setter
-var CustomStyle = (function CustomStyleClosure() {
-
-  // As noted on: http://www.zachstronaut.com/posts/2009/02/17/
-  //              animate-css-transforms-firefox-webkit.html
-  // in some versions of IE9 it is critical that ms appear in this list
-  // before Moz
-  var prefixes = ['ms', 'Moz', 'Webkit', 'O'];
-  var _cache = { };
-
-  function CustomStyle() {
-  }
-
-  CustomStyle.getProp = function get(propName, element) {
-    // check cache only when no element is given
-    if (arguments.length == 1 && typeof _cache[propName] == 'string') {
-      return _cache[propName];
-    }
-
-    element = element || document.documentElement;
-    var style = element.style, prefixed, uPropName;
-
-    // test standard property first
-    if (typeof style[propName] == 'string') {
-      return (_cache[propName] = propName);
-    }
-
-    // capitalize
-    uPropName = propName.charAt(0).toUpperCase() + propName.slice(1);
-
-    // test vendor specific properties
-    for (var i = 0, l = prefixes.length; i < l; i++) {
-      prefixed = prefixes[i] + uPropName;
-      if (typeof style[prefixed] == 'string') {
-        return (_cache[propName] = prefixed);
-      }
-    }
-
-    //if all fails then set to undefined
-    return (_cache[propName] = 'undefined');
-  }
-
-  CustomStyle.setProp = function set(propName, element, str) {
-    var prop = this.getProp(propName);
-    if (prop != 'undefined')
-      element.style[prop] = str;
-  }
-
-  return CustomStyle;
-})();
-
-var TextLayerBuilder = function textLayerBuilder(textLayerDiv) {
-  this.textLayerDiv = textLayerDiv;
-
-  this.beginLayout = function textLayerBuilderBeginLayout() {
-    this.textDivs = [];
-    this.textLayerQueue = [];
-  };
-
-  this.endLayout = function textLayerBuilderEndLayout() {
-    var self = this;
-    var textDivs = this.textDivs;
-    var textLayerDiv = this.textLayerDiv;
-    var renderTimer = null;
-    var renderingDone = false;
-    var renderInterval = 0;
-    var resumeInterval = 500; // in ms
-
-    // Render the text layer, one div at a time
-    function renderTextLayer() {
-      if (textDivs.length === 0) {
-        clearInterval(renderTimer);
-        renderingDone = true;
-        return;
-      }
-      var textDiv = textDivs.shift();
-      if (textDiv.dataset.textLength > 0) {
-        textLayerDiv.appendChild(textDiv);
-
-        if (textDiv.dataset.textLength > 1) { // avoid div by zero
-          // Adjust div width to match canvas text
-          // Due to the .offsetWidth calls, this is slow
-          // This needs to come after appending to the DOM
-          var textScale = textDiv.dataset.canvasWidth / textDiv.offsetWidth;
-          CustomStyle.setProp('transform' , textDiv,
-            'scale(' + textScale + ', 1)');
-          CustomStyle.setProp('transformOrigin' , textDiv, '0% 0%');
-        }
-      } // textLength > 0
-    }
-    renderTimer = setInterval(renderTextLayer, renderInterval);
-
-    // Stop rendering when user scrolls. Resume after XXX milliseconds
-    // of no scroll events
-    var scrollTimer = null;
-    function textLayerOnScroll() {
-      if (renderingDone) {
-        window.removeEventListener('scroll', textLayerOnScroll, false);
-        return;
-      }
-
-      // Immediately pause rendering
-      clearInterval(renderTimer);
-
-      clearTimeout(scrollTimer);
-      scrollTimer = setTimeout(function textLayerScrollTimer() {
-        // Resume rendering
-        renderTimer = setInterval(renderTextLayer, renderInterval);
-      }, resumeInterval);
-    }; // textLayerOnScroll
-
-    window.addEventListener('scroll', textLayerOnScroll, false);
-  }; // endLayout
-
-  this.appendText = function textLayerBuilderAppendText(text,
-                                                        fontName, fontSize) {
-    var textDiv = document.createElement('div');
-
-    // vScale and hScale already contain the scaling to pixel units
-    var fontHeight = fontSize * text.geom.vScale;
-    textDiv.dataset.canvasWidth = text.canvasWidth * text.geom.hScale;
-    textDiv.dataset.fontName = fontName;
-
-    textDiv.style.fontSize = fontHeight + 'px';
-    textDiv.style.left = text.geom.x + 'px';
-    textDiv.style.top = (text.geom.y - fontHeight) + 'px';
-    textDiv.textContent = PDFJS.bidi(text, -1);
-    textDiv.dir = text.direction;
-    textDiv.dataset.textLength = text.length;
-    this.textDivs.push(textDiv);
-  };
-};
-
-window.addEventListener('load', function webViewerLoad(evt) {
-  PDFView.initialize();
-  var params = PDFView.parseQueryString(document.location.search.substring(1));
-
-  var file = PDFJS.isFirefoxExtension ?
-              window.location.toString() : params.file || kDefaultURL;
-
-/*  if (PDFJS.isFirefoxExtension || !window.File || !window.FileReader ||
-      !window.FileList || !window.Blob) {
-    document.getElementById('openFile').setAttribute('hidden', 'true');
-  } else {
-    document.getElementById('fileInput').value = null;
-  }
-*/
-  // Special debugging flags in the hash section of the URL.
-  var hash = document.location.hash.substring(1);
-  var hashParams = PDFView.parseQueryString(hash);
-
-  if ('disableWorker' in hashParams)
-    PDFJS.disableWorker = (hashParams['disableWorker'] === 'true');
-
-/*  if (!PDFJS.isFirefoxExtension) {
-    var locale = navigator.language;
-    if ('locale' in hashParams)
-      locale = hashParams['locale'];
-    mozL10n.language.code = locale;
-  }
-*/
-  if ('disableTextLayer' in hashParams)
-    PDFJS.disableTextLayer = (hashParams['disableTextLayer'] === 'true');
-
-  if ('pdfBug' in hashParams &&
-      (!PDFJS.isFirefoxExtension || FirefoxCom.requestSync('pdfBugEnabled'))) {
-    PDFJS.pdfBug = true;
-    var pdfBug = hashParams['pdfBug'];
-    var enabled = pdfBug.split(',');
-    PDFBug.enable(enabled);
-    PDFBug.init();
-  }
-
-/*  if (!PDFJS.isFirefoxExtension ||
-    (PDFJS.isFirefoxExtension && FirefoxCom.requestSync('searchEnabled'))) {
-    document.querySelector('#viewSearch').classList.remove('hidden');
-  }
-*/
-  // Listen for warnings to trigger the fallback UI.  Errors should be caught
-  // and call PDFView.error() so we don't need to listen for those.
-  PDFJS.LogManager.addLogger({
-    warn: function() {
-      PDFView.fallback();
-    }
-  });
-
-//  var thumbsView = document.getElementById('thumbnailView');
-//  thumbsView.addEventListener('scroll', updateThumbViewArea, true);
-/*
-  var mainContainer = document.getElementById('mainContainer');
-  var outerContainer = document.getElementById('outerContainer');
-  mainContainer.addEventListener('transitionend', function(e) {
-    if (e.target == mainContainer) {
-      var event = document.createEvent('UIEvents');
-      event.initUIEvent('resize', false, false, window, 0);
-      window.dispatchEvent(event);
-      outerContainer.classList.remove('sidebarMoving');
-    }
-  }, true);
-
-  document.getElementById('sidebarToggle').addEventListener('click',
-    function() {
-      this.classList.toggle('toggled');
-      outerContainer.classList.add('sidebarMoving');
-      outerContainer.classList.toggle('sidebarOpen');
-      updateThumbViewArea();
-    });
-
-  PDFView.open(file, 0);
-*/
-}, true);
-
-/**
- * Render the next not yet visible page already such that it is
- * hopefully ready once the user scrolls to it.
- */
-function preDraw() {
-  var pages = PDFView.pages;
-  var visible = PDFView.getVisiblePages();
-  var last = visible[visible.length - 1];
-  // PageView.id is the actual page number, which is + 1 compared
-  // to the index in `pages`. That means, pages[last.id] is the next
-  // PageView instance.
-  if (pages[last.id] && pages[last.id].drawingRequired()) {
-    renderingQueue.enqueueDraw(pages[last.id]);
-    return;
-  }
-  // If there is nothing to draw on the next page, maybe the user
-  // is scrolling up, so, let's try to render the next page *before*
-  // the first visible page
-  if (pages[visible[0].id - 2]) {
-    renderingQueue.enqueueDraw(pages[visible[0].id - 2]);
-  }
-}
-
-function updateViewarea() {
-  if (!PDFView.initialized)
-    return;
-  var container = document.getElementById('viewer');
-  if (!container)
-    return;
-
-  var visiblePages = PDFView.getVisiblePages();
-  var pageToDraw;
-  for (var i = 0; i < visiblePages.length; i++) {
-    var page = visiblePages[i];
-    var pageObj = PDFView.pages[page.id - 1];
-
-    pageToDraw |= pageObj.drawingRequired();
-    renderingQueue.enqueueDraw(pageObj);
-  }
-
-  if (!visiblePages.length)
-    return;
-
-  // If there is no need to draw a page that is currenlty visible, preDraw the
-  // next page the user might scroll to.
-  if (!pageToDraw) {
-    preDraw();
-  }
-
-  updateViewarea.inProgress = true; // used in "set page"
-  var currentId = PDFView.page;
-  var firstPage = visiblePages[0];
-  PDFView.page = firstPage.id;
-  updateViewarea.inProgress = false;
-
-  var currentScale = PDFView.currentScale;
-  var currentScaleValue = PDFView.currentScaleValue;
-  var normalizedScaleValue = currentScaleValue == currentScale ?
-    currentScale * 100 : currentScaleValue;
-
-  var pageNumber = firstPage.id;
-  var pdfOpenParams = '#page=' + pageNumber;
-  pdfOpenParams += '&zoom=' + normalizedScaleValue;
-  var currentPage = PDFView.pages[pageNumber - 1];
-  var topLeft = currentPage.getPagePoint(PDFView.container.scrollLeft,
-    (PDFView.container.scrollTop - firstPage.y));
-  pdfOpenParams += ',' + Math.round(topLeft[0]) + ',' + Math.round(topLeft[1]);
-
-  var store = PDFView.store;
-  store.set('exists', true);
-  store.set('page', pageNumber);
-  store.set('zoom', normalizedScaleValue);
-  store.set('scrollLeft', Math.round(topLeft[0]));
-  store.set('scrollTop', Math.round(topLeft[1]));
-//  var href = PDFView.getAnchorUrl(pdfOpenParams);
-//  document.getElementById('viewBookmark').href = href;
-}
-
-window.addEventListener('scroll', function webViewerScroll(evt) {
-  updateViewarea();
-}, true);
-
-var thumbnailTimer;
-
-function updateThumbViewArea() {
-  // Only render thumbs after pausing scrolling for this amount of time
-  // (makes UI more responsive)
-  var delay = 50; // in ms
-
-  if (thumbnailTimer)
-    clearTimeout(thumbnailTimer);
-
-  thumbnailTimer = setTimeout(function() {
-    var visibleThumbs = PDFView.getVisibleThumbs();
-    for (var i = 0; i < visibleThumbs.length; i++) {
-      var thumb = visibleThumbs[i];
-      renderingQueue.enqueueDraw(PDFView.thumbnails[thumb.id - 1]);
-    }
-  }, delay);
-}
-
-window.addEventListener('resize', function webViewerResize(evt) {
-  if (PDFView.initialized && PDFView.active &&
-      (document.getElementById('pageWidthOption').selected ||
-      document.getElementById('pageFitOption').selected ))
-      PDFView.parseScale(document.getElementById('scaleSelect').value);
-  updateViewarea();
-});
-
-window.addEventListener('hashchange', function webViewerHashchange(evt) {
-  PDFView.setHash(document.location.hash.substring(1));
-});
-
-window.addEventListener('change', function webViewerChange(evt) {
-  var files = evt.target.files;
-  if (!files || files.length == 0)
-    return;
-
-  // Read the local file into a Uint8Array.
-  var fileReader = new FileReader();
-  fileReader.onload = function webViewerChangeFileReaderOnload(evt) {
-    var data = evt.target.result;
-    var buffer = new ArrayBuffer(data.length);
-    var uint8Array = new Uint8Array(buffer);
-
-    for (var i = 0; i < data.length; i++)
-      uint8Array[i] = data.charCodeAt(i);
-
-    PDFView.open(uint8Array, 0);
-  };
-
-  // Read as a binary string since "readAsArrayBuffer" is not yet
-  // implemented in Firefox.
-  var file = files[0];
-  fileReader.readAsBinaryString(file);
-  document.title = file.name;
-
-  // URL does not reflect proper document location - hiding some icons.
-//  document.getElementById('viewBookmark').setAttribute('hidden', 'true');
-//  document.getElementById('download').setAttribute('hidden', 'true');
-}, true);
-
-function selectScaleOption(value) {
-  var options = document.getElementById('scaleSelect').options;
-  var predefinedValueFound = false;
-  for (var i = 0; i < options.length; i++) {
-    var option = options[i];
-    if (option.value != value) {
-      option.selected = false;
-      continue;
-    }
-    option.selected = true;
-    predefinedValueFound = true;
-  }
-  return predefinedValueFound;
-}
-
-window.addEventListener('localized', function localized(evt) {
-  document.getElementsByTagName('html')[0].dir = mozL10n.language.direction;
-}, true);
-
-window.addEventListener('scalechange', function scalechange(evt) {
-  var customScaleOption = document.getElementById('customScaleOption');
-  customScaleOption.selected = false;
-
-  if (!evt.resetAutoSettings &&
-       (document.getElementById('pageWidthOption').selected ||
-        document.getElementById('pageFitOption').selected ||
-        document.getElementById('pageAutoOption').selected)) {
-      updateViewarea();
-      return;
-  }
-
-  var predefinedValueFound = selectScaleOption('' + evt.scale);
-  if (!predefinedValueFound) {
-    customScaleOption.textContent = Math.round(evt.scale * 10000) / 100 + '%';
-    customScaleOption.selected = true;
-  }
-
-  updateViewarea();
-}, true);
-
-window.addEventListener('pagechange', function pagechange(evt) {
-  var page = evt.pageNumber;
-  if (document.getElementById('pageNumber').value != page) {
-    document.getElementById('pageNumber').value = page;
-    var selected = document.querySelector('.thumbnail.selected');
-    if (selected)
-      selected.classList.remove('selected');
-/*
-    var thumbnail = document.getElementById('thumbnailContainer' + page);
-    thumbnail.classList.add('selected');
-    var visibleThumbs = PDFView.getVisibleThumbs();
-    var numVisibleThumbs = visibleThumbs.length;
-    // If the thumbnail isn't currently visible scroll it into view.
-    if (numVisibleThumbs > 0) {
-      var first = visibleThumbs[0].id;
-      // Account for only one thumbnail being visible.
-      var last = numVisibleThumbs > 1 ?
-                  visibleThumbs[numVisibleThumbs - 1].id : first;
-      if (page <= first || page >= last)
-        thumbnail.scrollIntoView();
-    }
-*/
-  }
-  document.getElementById('previous').disabled = (page <= 1);
-  document.getElementById('next').disabled = (page >= PDFView.pages.length);
-}, true);
-
-// Firefox specific event, so that we can prevent browser from zooming
-window.addEventListener('DOMMouseScroll', function(evt) {
-  if (evt.ctrlKey) {
-    evt.preventDefault();
-
-    var ticks = evt.detail;
-    var direction = (ticks > 0) ? 'zoomOut' : 'zoomIn';
-    for (var i = 0, length = Math.abs(ticks); i < length; i++)
-      PDFView[direction]();
-  }
-}, false);
-
-
diff --git a/apps/files_pdfviewer/js/pdfjs/web/images/bookmark.svg b/apps/files_pdfviewer/js/pdfjs/web/images/bookmark.svg
deleted file mode 100644
index bee6efefdf..0000000000
--- a/apps/files_pdfviewer/js/pdfjs/web/images/bookmark.svg
+++ /dev/null
@@ -1,662 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   inkscape:export-ydpi="240.00000"
-   inkscape:export-xdpi="240.00000"
-   inkscape:export-filename="/home/jimmac/gfx/novell/pdes/trunk/docs/BIGmime-text.png"
-   sodipodi:docname="bookmark.svg"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:version="0.32"
-   id="svg249"
-   height="48.000000px"
-   width="48.000000px"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.1"
-   viewbox="0 0 48 48">
-  <defs
-     id="defs3">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 24 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="48 : 24 : 1"
-       inkscape:persp3d-origin="24 : 16 : 1"
-       id="perspective100" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5060"
-       id="radialGradient5031"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
-       cx="605.71429"
-       cy="486.64789"
-       fx="605.71429"
-       fy="486.64789"
-       r="117.14286" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5060">
-      <stop
-         style="stop-color:black;stop-opacity:1;"
-         offset="0"
-         id="stop5062" />
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="1"
-         id="stop5064" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5060"
-       id="radialGradient5029"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
-       cx="605.71429"
-       cy="486.64789"
-       fx="605.71429"
-       fy="486.64789"
-       r="117.14286" />
-    <linearGradient
-       id="linearGradient5048">
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="0"
-         id="stop5050" />
-      <stop
-         id="stop5056"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:1;" />
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="1"
-         id="stop5052" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5048"
-       id="linearGradient5027"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
-       x1="302.85715"
-       y1="366.64789"
-       x2="302.85715"
-       y2="609.50507" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2906">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop2908" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop2910" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2896">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop2898" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop2900" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2598">
-      <stop
-         style="stop-color:#859dbc;stop-opacity:1;"
-         offset="0"
-         id="stop2600" />
-      <stop
-         style="stop-color:#547299;stop-opacity:1;"
-         offset="1"
-         id="stop2602" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2590">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop2592" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop2594" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5897">
-      <stop
-         style="stop-color:#000000;stop-opacity:0.0000000;"
-         offset="0.0000000"
-         id="stop5899" />
-      <stop
-         id="stop5905"
-         offset="0.50000000"
-         style="stop-color:#000000;stop-opacity:0.56701028;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0.0000000;"
-         offset="1.0000000"
-         id="stop5901" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5866">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop5868" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop5870" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4404">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop4406" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop4408" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4542">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop4544" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop4546" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient15662">
-      <stop
-         id="stop15664"
-         offset="0.0000000"
-         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
-      <stop
-         id="stop15666"
-         offset="1.0000000"
-         style="stop-color:#f8f8f8;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient269">
-      <stop
-         id="stop270"
-         offset="0.0000000"
-         style="stop-color:#a3a3a3;stop-opacity:1.0000000;" />
-      <stop
-         id="stop271"
-         offset="1.0000000"
-         style="stop-color:#4c4c4c;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient259">
-      <stop
-         id="stop260"
-         offset="0.0000000"
-         style="stop-color:#fafafa;stop-opacity:1.0000000;" />
-      <stop
-         id="stop261"
-         offset="1.0000000"
-         style="stop-color:#bbbbbb;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient12512">
-      <stop
-         id="stop12513"
-         offset="0.0000000"
-         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
-      <stop
-         id="stop12517"
-         offset="0.50000000"
-         style="stop-color:#fff520;stop-opacity:0.89108908;" />
-      <stop
-         id="stop12514"
-         offset="1.0000000"
-         style="stop-color:#fff300;stop-opacity:0.0000000;" />
-    </linearGradient>
-    <radialGradient
-       r="14.375000"
-       fy="125.00000"
-       fx="55.000000"
-       cy="125.00000"
-       cx="55.000000"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient278"
-       xlink:href="#linearGradient12512"
-       inkscape:collect="always" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient269"
-       id="radialGradient15656"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.968273,0.000000,0.000000,1.036374,3.250000,0.489522)"
-       cx="8.8244190"
-       cy="3.7561285"
-       fx="8.8244190"
-       fy="3.7561285"
-       r="37.751713" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient259"
-       id="radialGradient15658"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.960493,0.000000,0.000000,1.044769,-0.103553,-0.159183)"
-       cx="33.966679"
-       cy="35.736916"
-       fx="33.966679"
-       fy="35.736916"
-       r="86.708450" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient15662"
-       id="radialGradient15668"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.973033,0.000000,0.000000,1.034937,3.168754,0.555277)"
-       cx="8.1435566"
-       cy="7.2678967"
-       fx="8.1435566"
-       fy="7.2678967"
-       r="38.158695" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4542"
-       id="radialGradient4548"
-       cx="24.306795"
-       cy="42.07798"
-       fx="24.306795"
-       fy="42.07798"
-       r="15.821514"
-       gradientTransform="matrix(1.000000,0.000000,0.000000,0.284916,0.000000,30.08928)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4404"
-       id="linearGradient4410"
-       x1="16.812500"
-       y1="1.8750000"
-       x2="16.812500"
-       y2="4.7187500"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.319549,0.000000,0.000000,1.362060,40.38853,-0.362057)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5866"
-       id="linearGradient5872"
-       x1="19.452349"
-       y1="13.174174"
-       x2="19.685436"
-       y2="27.095339"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.224255,0.000000,0.000000,1.282176,0.371569,0.264657)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5897"
-       id="linearGradient5903"
-       x1="19.000000"
-       y1="9.7738247"
-       x2="19.000000"
-       y2="15.635596"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.319549,0.000000,0.000000,2.133926,-4.476133,-14.64845)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2590"
-       id="linearGradient2596"
-       x1="19.970377"
-       y1="6.1167107"
-       x2="19.970377"
-       y2="2.53125"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.319549,0.000000,0.000000,1.280356,-5.745298,0.249007)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2598"
-       id="linearGradient2604"
-       x1="18.431311"
-       y1="19.119474"
-       x2="18.402472"
-       y2="4.2702327"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.319549,0.000000,0.000000,1.299013,-3.106200,-1.336165)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2896"
-       id="linearGradient2902"
-       x1="14.584077"
-       y1="1.6392649"
-       x2="14.552828"
-       y2="2.4912448"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.000000,0.000000,0.000000,1.594214,0.000000,-0.790249)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2906"
-       id="linearGradient2912"
-       x1="13.354311"
-       y1="1.4866425"
-       x2="14.075844"
-       y2="2.4017651"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.000000,0.000000,0.000000,1.184816,0.000000,-0.727880)" />
-  </defs>
-  <sodipodi:namedview
-     inkscape:window-y="158"
-     inkscape:window-x="433"
-     inkscape:window-height="690"
-     inkscape:window-width="872"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     showgrid="false"
-     inkscape:current-layer="layer5"
-     inkscape:cy="24"
-     inkscape:cx="24"
-     inkscape:zoom="9.8333333"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     borderopacity="0.25490196"
-     bordercolor="#666666"
-     pagecolor="#ffffff"
-     id="base"
-     inkscape:showpageshadow="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata4">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>New Bookmark</dc:title>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>bookmark</rdf:li>
-            <rdf:li>remember</rdf:li>
-            <rdf:li>favorite</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Andreas Nilsson</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:source />
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title>Jakub Steiner</dc:title>
-          </cc:Agent>
-        </dc:contributor>
-        <dc:description>create bookmark action</dc:description>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/publicdomain/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     id="layer6"
-     inkscape:label="Shadow">
-    <g
-       style="display:inline"
-       id="g5022"
-       transform="matrix(2.165152e-2,0,0,1.485743e-2,43.0076,42.68539)">
-      <rect
-         y="-150.69685"
-         x="-1559.2523"
-         height="478.35718"
-         width="1339.6335"
-         id="rect4173"
-         style="opacity:0.40206185;color:black;fill:url(#linearGradient5027);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-      <path
-         sodipodi:nodetypes="cccc"
-         id="path5058"
-         d="M -219.61876,-150.68038 C -219.61876,-150.68038 -219.61876,327.65041 -219.61876,327.65041 C -76.744594,328.55086 125.78146,220.48075 125.78138,88.454235 C 125.78138,-43.572302 -33.655436,-150.68036 -219.61876,-150.68038 z "
-         style="opacity:0.40206185;color:black;fill:url(#radialGradient5029);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-      <path
-         style="opacity:0.40206185;color:black;fill:url(#radialGradient5031);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         d="M -1559.2523,-150.68038 C -1559.2523,-150.68038 -1559.2523,327.65041 -1559.2523,327.65041 C -1702.1265,328.55086 -1904.6525,220.48075 -1904.6525,88.454235 C -1904.6525,-43.572302 -1745.2157,-150.68036 -1559.2523,-150.68038 z "
-         id="path5018"
-         sodipodi:nodetypes="cccc" />
-    </g>
-  </g>
-  <g
-     style="display:inline"
-     inkscape:groupmode="layer"
-     inkscape:label="Base"
-     id="layer1">
-    <rect
-       style="color:#000000;fill:url(#radialGradient15658);fill-opacity:1.0000000;fill-rule:nonzero;stroke:url(#radialGradient15656);stroke-width:0.99999982;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block;overflow:visible"
-       id="rect15391"
-       width="34.875000"
-       height="41.063431"
-       x="6.5000000"
-       y="3.5000000"
-       ry="1.1490481"
-       rx="1.1490486" />
-    <rect
-       style="color:#000000;fill:none;fill-opacity:1.0000000;fill-rule:nonzero;stroke:url(#radialGradient15668);stroke-width:0.99999958;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block;overflow:visible"
-       id="rect15660"
-       width="32.937012"
-       height="39.028210"
-       x="7.5024552"
-       y="4.5010486"
-       ry="0.14904849"
-       rx="0.14904852" />
-    <path
-       style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.98855311;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:0.017543854"
-       d="M 11.505723,5.4942766 L 11.505723,43.400869"
-       id="path15672"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:0.20467831"
-       d="M 12.500000,5.0205154 L 12.500000,43.038228"
-       id="path15674"
-       sodipodi:nodetypes="cc" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="Text"
-     style="display:inline">
-    <g
-       id="g2188">
-      <rect
-         style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
-         id="rect15686"
-         width="20.000006"
-         height="1.0000000"
-         x="15.999994"
-         y="9.0000000"
-         rx="0.13778631"
-         ry="0.065390877" />
-      <rect
-         style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
-         id="rect15688"
-         width="20.000006"
-         height="1.0000000"
-         x="15.999994"
-         y="11.000000"
-         rx="0.13778631"
-         ry="0.065390877" />
-      <rect
-         style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
-         id="rect15690"
-         width="20.000006"
-         height="1.0000000"
-         x="15.999994"
-         y="13.000000"
-         rx="0.13778631"
-         ry="0.065390877" />
-      <rect
-         style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
-         id="rect15692"
-         width="20.000006"
-         height="1.0000000"
-         x="15.999994"
-         y="15.000000"
-         rx="0.13778631"
-         ry="0.065390877" />
-      <rect
-         style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
-         id="rect15694"
-         width="20.000006"
-         height="1.0000000"
-         x="15.999994"
-         y="17.000000"
-         rx="0.13778631"
-         ry="0.065390877" />
-      <rect
-         style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
-         id="rect15696"
-         width="20.000006"
-         height="1.0000000"
-         x="15.999994"
-         y="19.000000"
-         rx="0.13778631"
-         ry="0.065390877" />
-      <rect
-         style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
-         id="rect15698"
-         width="20.000006"
-         height="1.0000000"
-         x="15.999994"
-         y="21.000000"
-         rx="0.13778631"
-         ry="0.065390877" />
-      <rect
-         style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
-         id="rect15700"
-         width="20.000006"
-         height="1.0000000"
-         x="15.999994"
-         y="23.000000"
-         rx="0.13778631"
-         ry="0.065390877" />
-      <rect
-         style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
-         id="rect15732"
-         width="9.0000057"
-         height="1.0000000"
-         x="15.999986"
-         y="25.000000"
-         rx="0.062003858"
-         ry="0.065390877" />
-      <rect
-         style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
-         id="rect15736"
-         width="20.000006"
-         height="1.0000000"
-         x="15.999986"
-         y="29.000000"
-         rx="0.13778631"
-         ry="0.065390877" />
-      <rect
-         style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
-         id="rect15738"
-         width="20.000006"
-         height="1.0000000"
-         x="15.999986"
-         y="31.000000"
-         rx="0.13778631"
-         ry="0.065390877" />
-      <rect
-         style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
-         id="rect15740"
-         width="20.000006"
-         height="1.0000000"
-         x="15.999986"
-         y="33.000000"
-         rx="0.13778631"
-         ry="0.065390877" />
-      <rect
-         style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
-         id="rect15742"
-         width="20.000006"
-         height="1.0000000"
-         x="15.999986"
-         y="35.000000"
-         rx="0.13778631"
-         ry="0.065390877" />
-      <rect
-         style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
-         id="rect15744"
-         width="14.000014"
-         height="1.0000000"
-         x="15.999986"
-         y="37.000000"
-         rx="0.096450485"
-         ry="0.065390877" />
-    </g>
-    <path
-       style="opacity:0.28021976;fill:url(#linearGradient5872);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.25pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 28.245858,31.324906 L 21.147869,27.133701 L 14.30757,30.8838 L 13.761859,3.9475667 L 28.549598,3.9475667 L 28.245858,31.324906 z "
-       id="path5138"
-       sodipodi:nodetypes="cccccc" />
-    <path
-       style="fill:url(#linearGradient2604);fill-opacity:1;fill-rule:evenodd;stroke:#364878;stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;display:inline"
-       d="M 12.427339,3.5180202 C 12.427339,3.5180202 12.240033,0.60520607 15.107867,0.54270607 L 25.119343,0.50728624 C 26.277287,0.50728624 26.581888,1.1910178 26.581888,2.1095589 L 26.581888,29.729916 L 20.545426,24.533862 L 14.674346,29.729916 L 14.591655,3.519629 L 12.427339,3.5180202 z "
-       id="path2204"
-       sodipodi:nodetypes="ccccccccc" />
-    <path
-       style="opacity:0.4450549;fill:url(#linearGradient4410);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.25pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 13.030252,3.0117919 C 13.011046,2.225362 13.312918,1.0801307 15.375418,1.0176307 L 25.027906,1 C 25.640922,1 26.090152,1.1674319 26.090152,1.7994802 L 26.060994,10.491851 L 15.317102,10.491851 L 15.192102,2.9993251 C 15.192102,2.9993251 13.030252,3.0117919 13.030252,3.0117919 z "
-       id="path3668"
-       sodipodi:nodetypes="cccccccs" />
-    <rect
-       style="opacity:0.28021976;fill:url(#linearGradient5903);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect5895"
-       width="10.556392"
-       height="12.803556"
-       x="15.317101"
-       y="6.6907959"
-       rx="0.062003858"
-       ry="0.065390877" />
-    <path
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2596);stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.19125683;display:inline"
-       d="M 24.476832,2.2095507 L 25.575535,3.113139 L 25.547445,27.511911 L 20.497463,23.203758 L 15.704084,27.415203 L 15.699081,2.7495618 L 24.476832,2.2095507 z "
-       id="path5969"
-       sodipodi:nodetypes="ccccccc" />
-    <path
-       style="opacity:0.48295456;color:#000000;fill:url(#linearGradient2912);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.10533953;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 15.158602,3.9384083 L 15.114407,1.0335178 C 12.983906,1.0335178 12.993087,2.9680775 12.993087,3.9384083 L 15.158602,3.9384083 z "
-       id="path2894"
-       sodipodi:nodetypes="cccc" />
-    <path
-       sodipodi:nodetypes="cccc"
-       id="path2904"
-       d="M 15.158602,3.9384086 L 15.114407,1.8247593 C 12.81631,1.8426926 12.993087,3.9384086 12.993087,3.9384086 L 15.158602,3.9384086 z "
-       style="opacity:0.35795455;color:#000000;fill:url(#linearGradient2902);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.10533953;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-  </g>
-</svg>
diff --git a/apps/files_pdfviewer/js/pdfjs/web/images/check.svg b/apps/files_pdfviewer/js/pdfjs/web/images/check.svg
deleted file mode 100644
index e0e1590a93..0000000000
--- a/apps/files_pdfviewer/js/pdfjs/web/images/check.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg height="40" width="40" xmlns="http://www.w3.org/2000/svg">
-  <path d="M2.379,14.729 5.208,11.899 12.958,19.648 25.877,6.733 28.707,9.561 12.958,25.308z" fill="#333333"></path>
-</svg>
diff --git a/apps/files_pdfviewer/js/pdfjs/web/images/comment.svg b/apps/files_pdfviewer/js/pdfjs/web/images/comment.svg
deleted file mode 100644
index 84feef1c89..0000000000
--- a/apps/files_pdfviewer/js/pdfjs/web/images/comment.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg height="40" width="40" xmlns="http://www.w3.org/2000/svg">
-  <path d="M16,5.333c-7.732,0-14,4.701-14,10.5c0,1.982,0.741,3.833,2.016,5.414L2,25.667l5.613-1.441c2.339,1.317,5.237,2.107,8.387,2.107c7.732,0,14-4.701,14-10.5C30,10.034,23.732,5.333,16,5.333z" fill="#333333"></path>
-</svg>
diff --git a/apps/files_pdfviewer/js/pdfjs/web/images/document-print.svg b/apps/files_pdfviewer/js/pdfjs/web/images/document-print.svg
deleted file mode 100644
index 4d062fbb69..0000000000
--- a/apps/files_pdfviewer/js/pdfjs/web/images/document-print.svg
+++ /dev/null
@@ -1,533 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   sodipodi:docname="document-print.svg"
-   sodipodi:docbase="/home/jimmac/src/cvs/tango-icon-theme/scalable/actions"
-   inkscape:version="0.46"
-   sodipodi:version="0.32"
-   id="svg2994"
-   height="48px"
-   width="48px"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   viewbox="0 0 48 48">
-  <defs
-     id="defs3">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 24 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="48 : 24 : 1"
-       inkscape:persp3d-origin="24 : 16 : 1"
-       id="perspective84" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5060"
-       id="radialGradient5031"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
-       cx="605.71429"
-       cy="486.64789"
-       fx="605.71429"
-       fy="486.64789"
-       r="117.14286" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5060">
-      <stop
-         style="stop-color:black;stop-opacity:1;"
-         offset="0"
-         id="stop5062" />
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="1"
-         id="stop5064" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5060"
-       id="radialGradient5029"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
-       cx="605.71429"
-       cy="486.64789"
-       fx="605.71429"
-       fy="486.64789"
-       r="117.14286" />
-    <linearGradient
-       id="linearGradient5048">
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="0"
-         id="stop5050" />
-      <stop
-         id="stop5056"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:1;" />
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="1"
-         id="stop5052" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5048"
-       id="linearGradient5027"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
-       x1="302.85715"
-       y1="366.64789"
-       x2="302.85715"
-       y2="609.50507" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient7612">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop7614" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop7616" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7612"
-       id="radialGradient7618"
-       cx="24.000000"
-       cy="41.875000"
-       fx="24.000000"
-       fy="41.875000"
-       r="19.125000"
-       gradientTransform="matrix(1.000000,0.000000,0.000000,0.333333,0.000000,27.91667)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient4762">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.12371134;"
-         offset="0.0000000"
-         id="stop4764" />
-      <stop
-         id="stop4768"
-         offset="0.10344828"
-         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop4766" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4741">
-      <stop
-         id="stop4743"
-         offset="0.0000000"
-         style="stop-color:#dcdcda;stop-opacity:1.0000000;" />
-      <stop
-         id="stop4745"
-         offset="1.0000000"
-         style="stop-color:#bab9b7;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4733">
-      <stop
-         id="stop4735"
-         offset="0.0000000"
-         style="stop-color:#000000;stop-opacity:0.23711340;" />
-      <stop
-         id="stop4737"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4698">
-      <stop
-         id="stop4700"
-         offset="0.0000000"
-         style="stop-color:#fffffd;stop-opacity:1.0000000;" />
-      <stop
-         style="stop-color:#bbbbb9;stop-opacity:1.0000000;"
-         offset="0.50000000"
-         id="stop4706" />
-      <stop
-         id="stop4702"
-         offset="1.0000000"
-         style="stop-color:#000000;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4688">
-      <stop
-         id="stop4690"
-         offset="0.0000000"
-         style="stop-color:#666666;stop-opacity:1.0000000;" />
-      <stop
-         id="stop4692"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4680"
-       inkscape:collect="always">
-      <stop
-         id="stop4682"
-         offset="0"
-         style="stop-color:#f7f6f5;stop-opacity:1;" />
-      <stop
-         id="stop4684"
-         offset="1"
-         style="stop-color:#f7f6f5;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4668">
-      <stop
-         id="stop4670"
-         offset="0"
-         style="stop-color:#8e8d87;stop-opacity:1;" />
-      <stop
-         style="stop-color:#cbc9c1;stop-opacity:1.0000000;"
-         offset="0.27586207"
-         id="stop4676" />
-      <stop
-         id="stop4672"
-         offset="1.0000000"
-         style="stop-color:#8e8d87;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient259">
-      <stop
-         id="stop260"
-         offset="0.0000000"
-         style="stop-color:#e0e0e0;stop-opacity:1.0000000;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1.0000000;"
-         offset="0.40546969"
-         id="stop4886" />
-      <stop
-         style="stop-color:#cdcdcd;stop-opacity:1.0000000;"
-         offset="0.53448278"
-         id="stop4884" />
-      <stop
-         id="stop261"
-         offset="1.0000000"
-         style="stop-color:#494949;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient15662">
-      <stop
-         id="stop15664"
-         offset="0.0000000"
-         style="stop-color:#ffffff;stop-opacity:0.0000000;" />
-      <stop
-         id="stop15666"
-         offset="1.0000000"
-         style="stop-color:#f8f8f8;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <radialGradient
-       r="2.1227016"
-       fy="26.925594"
-       fx="9.1295490"
-       cy="26.925594"
-       cx="9.1295490"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient1433"
-       xlink:href="#linearGradient4698"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="72.064316"
-       x2="9.9128132"
-       y1="57.227650"
-       x1="9.8698082"
-       gradientTransform="matrix(2.772086,0.000000,0.000000,0.360739,0.618718,2.883883)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1447"
-       xlink:href="#linearGradient4733"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="54.136139"
-       x2="10.338233"
-       y1="64.652260"
-       x1="10.338233"
-       gradientTransform="matrix(2.369844,0.000000,0.000000,0.421969,0.000000,2.000000)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1451"
-       xlink:href="#linearGradient4680"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="62.282467"
-       x2="9.7052784"
-       y1="70.724976"
-       x1="9.7316532"
-       gradientTransform="matrix(2.369844,0.000000,0.000000,0.421969,0.000000,2.000000)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1453"
-       xlink:href="#linearGradient4688"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="19.337463"
-       x2="20.717800"
-       y1="25.140253"
-       x1="20.771229"
-       gradientTransform="matrix(1.198769,0,0,0.853565,-0.143086,2.034513)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1456"
-       xlink:href="#linearGradient15662"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="25.247311"
-       x2="24.789707"
-       y1="3.6785457"
-       x1="25.056711"
-       gradientTransform="matrix(0.944939,0,0,1.076147,6.844577e-2,4.093177)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1459"
-       xlink:href="#linearGradient259"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="58.831264"
-       x2="15.487823"
-       y1="32.539238"
-       x1="15.387969"
-       gradientTransform="matrix(1.490161,0,0,0.668741,8.895132e-2,2)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1464"
-       xlink:href="#linearGradient4762"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="88.294930"
-       x2="18.972126"
-       y1="88.294930"
-       x1="1.8456430"
-       gradientTransform="matrix(2.291824,0,0,0.434269,8.855179e-2,2)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1468"
-       xlink:href="#linearGradient4741"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="88.294933"
-       x2="18.972126"
-       y1="88.294933"
-       x1="1.8456431"
-       gradientTransform="matrix(2.30272,0,0,0.437918,0,0.584034)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1471"
-       xlink:href="#linearGradient4668"
-       inkscape:collect="always" />
-  </defs>
-  <sodipodi:namedview
-     inkscape:window-y="160"
-     inkscape:window-x="331"
-     inkscape:window-height="688"
-     inkscape:window-width="872"
-     inkscape:guide-bbox="true"
-     showguides="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     showgrid="false"
-     inkscape:current-layer="layer1"
-     inkscape:cy="-18.264187"
-     inkscape:cx="-72.591911"
-     inkscape:zoom="1"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     borderopacity="0.090196078"
-     bordercolor="#666666"
-     pagecolor="#ffffff"
-     id="base"
-     inkscape:showpageshadow="false"
-     fill="#729fcf" />
-  <metadata
-     id="metadata4">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Print Document</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Jakub Steiner</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
-        <dc:source>http://jimmac.musichall.cz</dc:source>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>document</rdf:li>
-            <rdf:li>lpr</rdf:li>
-            <rdf:li>print</rdf:li>
-            <rdf:li>local</rdf:li>
-            <rdf:li>laser</rdf:li>
-            <rdf:li>bubblejet</rdf:li>
-            <rdf:li>inkjet</rdf:li>
-            <rdf:li>print</rdf:li>
-            <rdf:li>output</rdf:li>
-            <rdf:li>cups</rdf:li>
-            <rdf:li>lpd</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/publicdomain/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
-     id="layer1">
-    <g
-       style="display:inline"
-       id="g5022"
-       transform="matrix(2.411405e-2,0,0,1.929202e-2,45.48953,39.75228)">
-      <rect
-         y="-150.69685"
-         x="-1559.2523"
-         height="478.35718"
-         width="1339.6335"
-         id="rect4173"
-         style="opacity:0.40206185;color:black;fill:url(#linearGradient5027);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-      <path
-         sodipodi:nodetypes="cccc"
-         id="path5058"
-         d="M -219.61876,-150.68038 C -219.61876,-150.68038 -219.61876,327.65041 -219.61876,327.65041 C -76.744594,328.55086 125.78146,220.48075 125.78138,88.454235 C 125.78138,-43.572302 -33.655436,-150.68036 -219.61876,-150.68038 z "
-         style="opacity:0.40206185;color:black;fill:url(#radialGradient5029);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-      <path
-         style="opacity:0.40206185;color:black;fill:url(#radialGradient5031);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         d="M -1559.2523,-150.68038 C -1559.2523,-150.68038 -1559.2523,327.65041 -1559.2523,327.65041 C -1702.1265,328.55086 -1904.6525,220.48075 -1904.6525,88.454235 C -1904.6525,-43.572302 -1745.2157,-150.68036 -1559.2523,-150.68038 z "
-         id="path5018"
-         sodipodi:nodetypes="cccc" />
-    </g>
-    <rect
-       ry="1.7115477"
-       rx="1.7115483"
-       y="36.004189"
-       x="4.75"
-       height="6.4915943"
-       width="38.4375"
-       id="rect4652"
-       style="fill:url(#linearGradient1471);fill-opacity:1;stroke:#595959;stroke-width:0.99999982;stroke-miterlimit:4;stroke-opacity:1" />
-    <path
-       sodipodi:nodetypes="cssssssssssss"
-       id="rect4609"
-       d="M 7.1308961,21.5 L 40.870615,21.5 C 41.255661,21.5 41.747648,21.788155 42.051049,22.223919 C 42.354451,22.659684 43.787518,24.83394 44.109448,25.297964 C 44.431378,25.761987 44.502397,26.201852 44.502397,26.774049 L 44.502397,38.850951 C 44.502397,39.764524 43.770402,40.5 42.861152,40.5 L 5.1403596,40.5 C 4.2311094,40.5 3.4991138,39.764524 3.4991138,38.850951 L 3.4991138,26.774049 C 3.4991138,26.280031 3.6002798,25.571641 3.9455202,25.120718 C 4.3811666,24.551713 5.5498664,22.57277 5.8581276,22.153118 C 6.1663887,21.733467 6.7324461,21.5 7.1308961,21.5 z "
-       style="color:#000000;fill:url(#linearGradient1468);fill-opacity:1;fill-rule:nonzero;stroke:#676767;stroke-width:1.00000036;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    <path
-       sodipodi:nodetypes="cssssssss"
-       id="path4718"
-       d="M 7.705278,21.975532 C 7.20729,21.975532 6.5669691,22.107308 6.3043987,22.511224 L 4.4657443,25.339651 C 4.169761,25.794966 4.4993705,26.868141 5.3900051,26.868141 L 42.678553,26.868141 C 43.883282,26.868141 43.8868,25.858073 43.602814,25.428039 L 41.851714,22.776389 C 41.534204,22.295589 41.418956,21.975532 40.625945,21.975532 L 7.705278,21.975532 z "
-       style="fill:#fbfbfb;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient1464);stroke-width:0.94696701;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 7.6002951,22.445756 L 40.374658,22.445756 C 40.739745,22.445756 41.206233,22.718629 41.493909,23.131283 C 41.781585,23.543938 42.788049,25.160945 43.093293,25.60036 C 43.398536,26.039775 43.528159,26.456312 43.528159,26.998164 L 43.528159,38.279261 C 43.528159,39.144385 43.394653,39.528356 42.532529,39.528356 L 5.530506,39.528356 C 4.6683828,39.528356 4.472593,39.144385 4.472593,38.279261 L 4.472593,26.998164 C 4.472593,26.530345 4.6930819,25.859523 5.0204282,25.432514 C 5.4334949,24.893685 6.1012112,23.461633 6.393495,23.064237 C 6.6857789,22.666841 7.222497,22.445756 7.6002951,22.445756 z "
-       id="path4750"
-       sodipodi:nodetypes="cssssssssssss" />
-    <path
-       sodipodi:nodetypes="ccccccc"
-       id="rect15391"
-       d="M 11.68177,4.4977642 L 36.313839,4.4977642 C 36.964072,4.4977642 37.487546,5.007949 37.487546,5.6416762 L 37.487546,24.348117 L 10.508063,24.348117 L 10.508063,5.6416762 C 10.508063,5.007949 11.031536,4.4977642 11.68177,4.4977642 z "
-       style="color:#000000;fill:url(#linearGradient1459);fill-opacity:1;fill-rule:nonzero;stroke:#898989;stroke-width:1.00000012;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
-    <rect
-       style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient1456);stroke-width:1.00000024;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-       id="rect15660"
-       width="25.000576"
-       height="18.836374"
-       x="11.498513"
-       y="5.4992466"
-       ry="0.17677675"
-       rx="0.17677672" />
-    <rect
-       ry="1.7115483"
-       rx="1.7115483"
-       y="27.375000"
-       x="6.8750000"
-       height="5.1875000"
-       width="33.750000"
-       id="rect4678"
-       style="fill:url(#linearGradient1451);fill-opacity:1.0000000;stroke:url(#linearGradient1453);stroke-width:1.0000000;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
-    <path
-       transform="translate(0.000000,2.000000)"
-       d="M 10.871767 27.626486 A 1.2816310 1.2816310 0 1 1  8.3085046,27.626486 A 1.2816310 1.2816310 0 1 1  10.871767 27.626486 z"
-       sodipodi:ry="1.2816310"
-       sodipodi:rx="1.2816310"
-       sodipodi:cy="27.626486"
-       sodipodi:cx="9.5901356"
-       id="path4696"
-       style="fill:url(#radialGradient1433);fill-opacity:1.0000000;stroke:none;stroke-width:1.0000000;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000"
-       sodipodi:type="arc" />
-    <path
-       sodipodi:nodetypes="csscssssc"
-       id="path4731"
-       d="M 11.743718,25.416053 L 37.306218,25.478553 C 37.993716,25.480234 38.294038,25.107558 38.243718,24.478553 L 38.118718,22.916053 L 39.984835,22.916053 C 40.797335,22.916053 40.975035,23.108616 41.172335,23.478553 L 41.672335,24.416053 C 42.199130,25.403793 43.483508,26.390165 42.170495,26.390165 C 37.667784,26.390165 13.993718,26.041053 11.743718,25.416053 z "
-       style="fill:url(#linearGradient1447);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;opacity:0.36571429" />
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-       d="M 42.9375,26.5 L 4.8125,26.5"
-       id="path4760"
-       sodipodi:nodetypes="cc" />
-    <g
-       transform="translate(0.000000,2.000000)"
-       style="opacity:0.43575415"
-       id="g4849">
-      <rect
-         style="color:#000000;fill:#000000;fill-opacity:0.29239765;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
-         id="rect4831"
-         width="19.000000"
-         height="1.0000000"
-         x="14.000000"
-         y="5.0000000" />
-      <rect
-         y="7.0000000"
-         x="14.000000"
-         height="1.0000000"
-         width="19.000000"
-         id="rect4833"
-         style="color:#000000;fill:#000000;fill-opacity:0.29239765;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible" />
-      <rect
-         style="color:#000000;fill:#000000;fill-opacity:0.29239765;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
-         id="rect4835"
-         width="19.000000"
-         height="1.0000000"
-         x="14.000000"
-         y="9.0000000" />
-      <rect
-         y="11.000000"
-         x="14.000000"
-         height="1.0000000"
-         width="19.000000"
-         id="rect4837"
-         style="color:#000000;fill:#000000;fill-opacity:0.29239765;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible" />
-      <rect
-         style="color:#000000;fill:#000000;fill-opacity:0.29239765;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
-         id="rect4839"
-         width="11.000000"
-         height="1.0000000"
-         x="14.000000"
-         y="13.000000" />
-    </g>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="arrow">
-    <path
-       sodipodi:nodetypes="cccccccc"
-       id="path8643"
-       d="M 21.02159,20.989431 L 27.989391,20.989431 L 27.989391,16.064984 L 31,16.064984 L 24.553756,8 L 17.435622,15.986875 L 21.023684,15.986875 L 21.02159,20.989431 z "
-       style="opacity:1;color:#000000;fill:#a7a7a7;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.99999958;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-  </g>
-</svg>
diff --git a/apps/files_pdfviewer/js/pdfjs/web/images/download.svg b/apps/files_pdfviewer/js/pdfjs/web/images/download.svg
deleted file mode 100644
index 884e3deed5..0000000000
--- a/apps/files_pdfviewer/js/pdfjs/web/images/download.svg
+++ /dev/null
@@ -1,620 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   sodipodi:docname="document-save.svg"
-   sodipodi:docbase="/home/jimmac/src/cvs/tango-icon-theme/scalable/actions"
-   inkscape:version="0.46"
-   sodipodi:version="0.32"
-   id="svg2913"
-   height="48px"
-   width="48px"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   viewbox="0 0 48 48">
-  <defs
-     id="defs3">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 24 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="48 : 24 : 1"
-       inkscape:persp3d-origin="24 : 16 : 1"
-       id="perspective104" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5060"
-       id="radialGradient5031"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
-       cx="605.71429"
-       cy="486.64789"
-       fx="605.71429"
-       fy="486.64789"
-       r="117.14286" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5060">
-      <stop
-         style="stop-color:black;stop-opacity:1;"
-         offset="0"
-         id="stop5062" />
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="1"
-         id="stop5064" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5060"
-       id="radialGradient5029"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
-       cx="605.71429"
-       cy="486.64789"
-       fx="605.71429"
-       fy="486.64789"
-       r="117.14286" />
-    <linearGradient
-       id="linearGradient5048">
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="0"
-         id="stop5050" />
-      <stop
-         id="stop5056"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:1;" />
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="1"
-         id="stop5052" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5048"
-       id="linearGradient5027"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
-       x1="302.85715"
-       y1="366.64789"
-       x2="302.85715"
-       y2="609.50507" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient6925">
-      <stop
-         style="stop-color:#204a87;stop-opacity:1;"
-         offset="0"
-         id="stop6927" />
-      <stop
-         style="stop-color:#204a87;stop-opacity:0;"
-         offset="1"
-         id="stop6929" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient6901">
-      <stop
-         style="stop-color:#3465a4;stop-opacity:1;"
-         offset="0"
-         id="stop6903" />
-      <stop
-         style="stop-color:#3465a4;stop-opacity:0;"
-         offset="1"
-         id="stop6905" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4991">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop4993" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop4995" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4991"
-       id="radialGradient4997"
-       cx="23.447077"
-       cy="6.4576745"
-       fx="23.447077"
-       fy="6.4576745"
-       r="19.0625"
-       gradientTransform="matrix(-1.314471,-1.006312e-2,-1.022964e-2,1.336221,46.22108,-4.909887)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient2187"
-       inkscape:collect="always">
-      <stop
-         id="stop2189"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop2191"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2187"
-       id="linearGradient1764"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.914114,1.412791e-16,-1.412791e-16,0.914114,-3.868698,-2.706902)"
-       x1="33.059906"
-       y1="27.394117"
-       x2="12.624337"
-       y2="12.583769" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient8662">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop8664" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop8666" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8662"
-       id="radialGradient8668"
-       cx="24.837126"
-       cy="36.421127"
-       fx="24.837126"
-       fy="36.421127"
-       r="15.644737"
-       gradientTransform="matrix(1.000000,-7.816467e-32,-1.132409e-32,0.536723,-5.897962e-14,16.87306)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient2555">
-      <stop
-         id="stop2557"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1.0000000;"
-         offset="0.50000000"
-         id="stop2561" />
-      <stop
-         id="stop2563"
-         offset="0.75000000"
-         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
-      <stop
-         style="stop-color:#e1e1e1;stop-opacity:1.0000000;"
-         offset="0.84166664"
-         id="stop2565" />
-      <stop
-         id="stop2559"
-         offset="1.0000000"
-         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4274">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.25490198;"
-         offset="0.0000000"
-         id="stop4276" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop4278" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4264"
-       inkscape:collect="always">
-      <stop
-         id="stop4266"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         id="stop4268"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4254"
-       inkscape:collect="always">
-      <stop
-         id="stop4256"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop4258"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4244">
-      <stop
-         id="stop4246"
-         offset="0.0000000"
-         style="stop-color:#e4e4e4;stop-opacity:1.0000000;" />
-      <stop
-         id="stop4248"
-         offset="1.0000000"
-         style="stop-color:#d3d3d3;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4236"
-       inkscape:collect="always">
-      <stop
-         id="stop4238"
-         offset="0"
-         style="stop-color:#eeeeee;stop-opacity:1;" />
-      <stop
-         id="stop4240"
-         offset="1"
-         style="stop-color:#eeeeee;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4228">
-      <stop
-         id="stop4230"
-         offset="0.0000000"
-         style="stop-color:#bbbbbb;stop-opacity:1.0000000;" />
-      <stop
-         id="stop4232"
-         offset="1.0000000"
-         style="stop-color:#9f9f9f;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4184">
-      <stop
-         id="stop4186"
-         offset="0.0000000"
-         style="stop-color:#838383;stop-opacity:1.0000000;" />
-      <stop
-         id="stop4188"
-         offset="1.0000000"
-         style="stop-color:#bbbbbb;stop-opacity:0.0000000;" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="translate(0.795493,3.799180)"
-       y2="35.281250"
-       x2="24.687500"
-       y1="35.281250"
-       x1="7.0625000"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4209"
-       xlink:href="#linearGradient4184"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="40.943935"
-       x2="36.183067"
-       y1="28.481176"
-       x1="7.6046205"
-       id="linearGradient4234"
-       xlink:href="#linearGradient4228"
-       inkscape:collect="always"
-       gradientTransform="translate(0.000000,5.125000)" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="33.758667"
-       x2="12.221823"
-       y1="37.205811"
-       x1="12.277412"
-       id="linearGradient4242"
-       xlink:href="#linearGradient4236"
-       inkscape:collect="always"
-       gradientTransform="translate(0.000000,5.125000)" />
-    <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.286242,0.781698,-0.710782,1.169552,-2.354348,0.248140)"
-       r="20.935817"
-       fy="2.9585190"
-       fx="15.571491"
-       cy="2.9585190"
-       cx="15.571491"
-       id="radialGradient4250"
-       xlink:href="#linearGradient4244"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="47.620636"
-       x2="44.096100"
-       y1="4.4331360"
-       x1="12.378357"
-       id="linearGradient4260"
-       xlink:href="#linearGradient4254"
-       inkscape:collect="always"
-       gradientTransform="translate(0.000000,5.125000)" />
-    <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.000000,0.000000,0.000000,0.651032,-2.885063e-16,9.455693)"
-       r="23.555494"
-       fy="27.096155"
-       fx="23.201941"
-       cy="27.096155"
-       cx="23.201941"
-       id="radialGradient4270"
-       xlink:href="#linearGradient4264"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="26.357183"
-       x2="23.688078"
-       y1="11.318835"
-       x1="23.688078"
-       id="linearGradient4272"
-       xlink:href="#linearGradient4274"
-       inkscape:collect="always"
-       gradientTransform="translate(0.000000,5.125000)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2555"
-       id="linearGradient2553"
-       x1="33.431175"
-       y1="31.964777"
-       x2="21.747974"
-       y2="11.780679"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6901"
-       id="linearGradient6907"
-       x1="14.751649"
-       y1="15.868432"
-       x2="8.8953285"
-       y2="16.743431"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6925"
-       id="linearGradient6931"
-       x1="12.25"
-       y1="18.25"
-       x2="7"
-       y2="21.118431"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <sodipodi:namedview
-     inkscape:window-y="30"
-     inkscape:window-x="0"
-     inkscape:window-height="818"
-     inkscape:window-width="999"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     showgrid="false"
-     inkscape:current-layer="layer2"
-     inkscape:cy="11.891468"
-     inkscape:cx="-133.68151"
-     inkscape:zoom="1"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     borderopacity="0.22745098"
-     bordercolor="#666666"
-     pagecolor="#ffffff"
-     id="base"
-     inkscape:showpageshadow="false"
-     fill="#3465a4"
-     stroke="#204a87" />
-  <metadata
-     id="metadata4">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Save</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Jakub Steiner</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>hdd</rdf:li>
-            <rdf:li>hard drive</rdf:li>
-            <rdf:li>save</rdf:li>
-            <rdf:li>io</rdf:li>
-            <rdf:li>store</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
-        <dc:identifier />
-        <dc:source>http://jimmac.musichall.cz</dc:source>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/publicdomain/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="pix"
-     id="layer2"
-     inkscape:groupmode="layer">
-    <g
-       style="display:inline"
-       id="g5022"
-       transform="matrix(2.411405e-2,0,0,1.929202e-2,45.48953,41.75228)">
-      <rect
-         y="-150.69685"
-         x="-1559.2523"
-         height="478.35718"
-         width="1339.6335"
-         id="rect4173"
-         style="opacity:0.40206185;color:black;fill:url(#linearGradient5027);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-      <path
-         sodipodi:nodetypes="cccc"
-         id="path5058"
-         d="M -219.61876,-150.68038 C -219.61876,-150.68038 -219.61876,327.65041 -219.61876,327.65041 C -76.744594,328.55086 125.78146,220.48075 125.78138,88.454235 C 125.78138,-43.572302 -33.655436,-150.68036 -219.61876,-150.68038 z "
-         style="opacity:0.40206185;color:black;fill:url(#radialGradient5029);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-      <path
-         style="opacity:0.40206185;color:black;fill:url(#radialGradient5031);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         d="M -1559.2523,-150.68038 C -1559.2523,-150.68038 -1559.2523,327.65041 -1559.2523,327.65041 C -1702.1265,328.55086 -1904.6525,220.48075 -1904.6525,88.454235 C -1904.6525,-43.572302 -1745.2157,-150.68036 -1559.2523,-150.68038 z "
-         id="path5018"
-         sodipodi:nodetypes="cccc" />
-    </g>
-    <path
-       sodipodi:nodetypes="cccsccccccccc"
-       id="path4196"
-       d="M 11.28569,13.087628 C 10.66069,13.087628 10.254441,13.377808 10.004442,13.931381 C 10.004441,13.931381 3.5356915,31.034938 3.5356915,31.034938 C 3.5356915,31.034938 3.2856915,31.706497 3.2856915,32.816188 C 3.2856915,32.816188 3.2856915,42.466156 3.2856915,42.466156 C 3.2856915,43.548769 3.943477,44.091158 4.9419415,44.091156 L 43.50444,44.091156 C 44.489293,44.091156 45.09819,43.372976 45.09819,42.247406 L 45.09819,32.597438 C 45.09819,32.597438 45.204153,31.827015 45.00444,31.284938 L 38.28569,14.087631 C 38.101165,13.575725 37.648785,13.099533 37.16069,13.087628 L 11.28569,13.087628 z "
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#535353;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       sodipodi:nodetypes="ccccccccc"
-       id="path4170"
-       d="M 3.2735915,32.121812 L 4.0381936,31.429597 L 41.647883,31.492097 L 45.11029,31.809395 L 45.11029,42.247927 C 45.11029,43.373496 44.503272,44.091258 43.518419,44.091258 L 4.9354314,44.091258 C 3.9369667,44.091258 3.2735915,43.549207 3.2735915,42.466594 L 3.2735915,32.121812 z "
-       style="fill:url(#linearGradient4234);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.02044296px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       sodipodi:nodetypes="csccccccs"
-       id="path3093"
-       d="M 3.5490842,31.039404 C 2.8347985,32.50369 3.5484686,33.432261 4.5847985,33.432261 C 4.5847985,33.432261 43.584797,33.432261 43.584797,33.432261 C 44.703844,33.408451 45.430035,32.420356 45.013368,31.289403 L 38.299082,14.078704 C 38.114558,13.566798 37.64432,13.090606 37.156225,13.078701 L 11.299083,13.078701 C 10.674083,13.078701 10.263369,13.382274 10.01337,13.935847 C 10.01337,13.935847 3.5490842,31.039404 3.5490842,31.039404 z "
-       style="fill:url(#radialGradient4250);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    <rect
-       y="36.299183"
-       x="7.857996"
-       height="5.5625"
-       width="17.625"
-       id="rect4174"
-       style="opacity:1;color:#000000;fill:url(#linearGradient4209);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.40899992;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    <path
-       sodipodi:nodetypes="cscc"
-       id="path4194"
-       d="M 7.8579947,41.86168 C 7.8579947,41.86168 7.8579947,37.850195 7.8579947,37.850195 C 9.6935221,41.029421 16.154485,41.86168 20.795492,41.86168 C 20.795492,41.86168 7.8579947,41.86168 7.8579947,41.86168 z "
-       style="opacity:0.81142853;fill:url(#linearGradient4242);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       sodipodi:nodetypes="cccccccc"
-       id="path4201"
-       d="M 44.796162,30.753688 C 44.859684,32.003662 44.382159,33.069528 43.474046,33.097438 C 43.474046,33.097438 5.3553296,33.097437 5.3553297,33.097438 C 4.0660978,33.097438 3.4875937,32.772491 3.271279,32.229382 C 3.3630404,33.173714 4.0970964,33.878688 5.3553297,33.878688 C 5.3553296,33.878687 43.474046,33.878688 43.474046,33.878688 C 44.550053,33.845617 45.226851,32.454664 44.82621,30.883897 L 44.796162,30.753688 z "
-       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       id="path4211"
-       d="M 10.96875,15.28125 C 10.922675,15.481571 10.78125,15.668047 10.78125,15.875 C 10.78125,16.823605 11.37223,17.664474 12.125,18.46875 C 12.365268,18.314675 12.490117,18.114342 12.75,17.96875 C 11.809691,17.152746 11.196604,16.252168 10.96875,15.28125 z M 37.625,15.28125 C 37.396273,16.250866 36.782988,17.153676 35.84375,17.96875 C 36.117894,18.122332 36.247738,18.33699 36.5,18.5 C 37.257262,17.693344 37.8125,16.826956 37.8125,15.875 C 37.8125,15.668047 37.670906,15.481571 37.625,15.28125 z M 39.8125,23.71875 C 39.198709,27.758861 32.513887,30.96875 24.28125,30.96875 C 16.068996,30.968751 9.4211001,27.775964 8.78125,23.75 C 8.7488928,23.947132 8.65625,24.141882 8.65625,24.34375 C 8.6562503,28.661697 15.645354,32.187501 24.28125,32.1875 C 32.917146,32.1875 39.937499,28.661698 39.9375,24.34375 C 39.9375,24.130826 39.848449,23.926394 39.8125,23.71875 z "
-       style="opacity:0.69142857;color:#000000;fill:url(#linearGradient4272);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    <path
-       transform="translate(8.838843e-2,5.301780)"
-       d="M 8.5736699 25.593554 A 1.3700194 1.016466 0 1 1  5.833631,25.593554 A 1.3700194 1.016466 0 1 1  8.5736699 25.593554 z"
-       sodipodi:ry="1.016466"
-       sodipodi:rx="1.3700194"
-       sodipodi:cy="25.593554"
-       sodipodi:cx="7.2036505"
-       id="path4224"
-       style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:0.45762706;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       sodipodi:type="arc" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:0.45762706;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="path4226"
-       sodipodi:cx="7.2036505"
-       sodipodi:cy="25.593554"
-       sodipodi:rx="1.3700194"
-       sodipodi:ry="1.016466"
-       d="M 8.5736699 25.593554 A 1.3700194 1.016466 0 1 1  5.833631,25.593554 A 1.3700194 1.016466 0 1 1  8.5736699 25.593554 z"
-       transform="translate(33.96705,5.213390)" />
-    <path
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4260);stroke-width:1.00000024;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 11.642515,13.540723 C 11.040823,13.540723 10.649724,13.820081 10.409049,14.35301 C 10.409048,14.35301 3.9940341,30.943732 3.9940341,30.943732 C 3.9940341,30.943732 3.7533573,31.590247 3.7533573,32.658555 C 3.7533573,32.658555 3.7533573,41.948651 3.7533573,41.948651 C 3.7533573,43.303391 4.1974134,43.57555 5.3478414,43.57555 L 43.034746,43.57555 C 44.357872,43.57555 44.569062,43.259153 44.569062,41.738058 L 44.569062,32.447962 C 44.569062,32.447962 44.671072,31.706271 44.478807,31.184409 L 37.885616,14.378434 C 37.707973,13.885617 37.334964,13.552184 36.865071,13.540723 L 11.642515,13.540723 z "
-       id="path4252"
-       sodipodi:nodetypes="cccsccccccccc" />
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.00000048px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.42372885"
-       d="M 40.5,36.554166 L 40.5,41.575101"
-       id="path4282" />
-    <path
-       id="path4284"
-       d="M 38.5,36.613943 L 38.5,41.634878"
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.00000048px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.42372885" />
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.00000048px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.42372885"
-       d="M 36.5,36.613943 L 36.5,41.634878"
-       id="path4286" />
-    <path
-       id="path4288"
-       d="M 34.5,36.613943 L 34.5,41.634878"
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.00000048px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.42372885" />
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.00000048px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.42372885"
-       d="M 32.5,36.613943 L 32.5,41.634878"
-       id="path4290" />
-    <path
-       id="path4292"
-       d="M 30.5,36.613943 L 30.5,41.634878"
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.00000048px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.42372885" />
-    <path
-       id="path4294"
-       d="M 39.5,36.604065 L 39.5,41.625"
-       style="opacity:0.09714284;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000048px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       style="opacity:0.09714284;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000048px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 37.5,36.663842 L 37.5,41.684777"
-       id="path4296" />
-    <path
-       id="path4298"
-       d="M 35.5,36.663842 L 35.5,41.684777"
-       style="opacity:0.09714284;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000048px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       style="opacity:0.09714284;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000048px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 33.5,36.663842 L 33.5,41.684777"
-       id="path4300" />
-    <path
-       id="path4302"
-       d="M 31.5,36.663842 L 31.5,41.684777"
-       style="opacity:0.09714284;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000048px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       id="path4572"
-       d="M 7.875,36.3125 L 7.875,41.84375 L 20.4375,41.84375 L 8.21875,41.5 L 7.875,36.3125 z "
-       style="opacity:0.43999999;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:0.20571427;color:#000000;fill:url(#linearGradient2553);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.93365198;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.42372879;visibility:visible;display:inline;overflow:visible"
-       id="path2545"
-       sodipodi:cx="25"
-       sodipodi:cy="19.5625"
-       sodipodi:rx="14.875"
-       sodipodi:ry="6.6875"
-       d="M 39.875 19.5625 A 14.875 6.6875 0 1 1  10.125,19.5625 A 14.875 6.6875 0 1 1  39.875 19.5625 z"
-       transform="matrix(1.037815,0.000000,0.000000,1.060747,-1.632878,3.030370)" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer1"
-     inkscape:label="down">
-    <path
-       transform="matrix(1.130190,1.178179e-16,7.918544e-17,-0.759601,-3.909725,53.66554)"
-       d="M 40.481863 36.421127 A 15.644737 8.3968935 0 1 1  9.1923885,36.421127 A 15.644737 8.3968935 0 1 1  40.481863 36.421127 z"
-       sodipodi:ry="8.3968935"
-       sodipodi:rx="15.644737"
-       sodipodi:cy="36.421127"
-       sodipodi:cx="24.837126"
-       id="path8660"
-       style="opacity:0.14117647;color:#000000;fill:url(#radialGradient8668);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       sodipodi:type="arc" />
-    <path
-       style="opacity:1;color:#000000;fill:url(#linearGradient6907);fill-opacity:1.0;fill-rule:nonzero;stroke:url(#linearGradient6931);stroke-width:0.99999982;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-       d="M 3.2034501,25.835194 C 2.1729477,-5.3853369 28.741616,-0.4511153 28.582416,15.788689 L 35.89533,15.788689 L 24.517652,28.774671 L 12.585426,15.788689 C 12.585426,15.788689 20.126859,15.788689 20.126859,15.788689 C 20.583921,4.8193225 3.4092324,1.6100346 3.2034501,25.835194 z "
-       id="path1432"
-       sodipodi:nodetypes="ccccccc" />
-    <path
-       sodipodi:nodetypes="ccccccc"
-       id="path2177"
-       d="M 7.6642103,9.1041047 C 12.40638,-0.0400306 28.122336,2.7175443 27.761604,16.579393 L 34.078976,16.579393 C 34.078976,16.579393 24.513151,27.536769 24.513151,27.536769 L 14.41668,16.579393 C 14.41668,16.579393 20.87332,16.579393 20.87332,16.579393 C 21.144975,5.0041615 10.922265,5.5345215 7.6642103,9.1041047 z "
-       style="opacity:0.47159091;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient1764);stroke-width:0.99999934;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
-    <path
-       style="opacity:0.49431817;color:#000000;fill:url(#radialGradient4997);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.9999997;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 34.767155,16.211613 L 32.782979,18.757322 C 27.372947,17.241029 24.896829,21.486664 17.109284,20.489112 L 13.247998,16.080077 L 20.434468,16.162862 C 20.483219,4.3164571 8.3443098,4.998966 5.0292663,13.627829 C 8.8372201,-1.2611216 27.893316,0.8064118 28.28332,16.114112 L 34.767155,16.211613 z "
-       id="path4989"
-       sodipodi:nodetypes="cccccccc" />
-  </g>
-</svg>
diff --git a/apps/files_pdfviewer/js/pdfjs/web/images/go-down.svg b/apps/files_pdfviewer/js/pdfjs/web/images/go-down.svg
deleted file mode 100644
index 655fdba16d..0000000000
--- a/apps/files_pdfviewer/js/pdfjs/web/images/go-down.svg
+++ /dev/null
@@ -1,201 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   sodipodi:docname="go-down.svg"
-   sodipodi:docbase="/home/tigert/cvs/freedesktop.org/tango-icon-theme/scalable/actions"
-   inkscape:version="0.46"
-   sodipodi:version="0.32"
-   id="svg11300"
-   height="48px"
-   width="48px"
-   inkscape:export-filename="/home/jimmac/Desktop/wi-fi.png"
-   inkscape:export-xdpi="90.000000"
-   inkscape:export-ydpi="90.000000"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   viewbox="0 0 48 48">
-  <defs
-     id="defs3">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 24 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="48 : 24 : 1"
-       inkscape:persp3d-origin="24 : 16 : 1"
-       id="perspective24" />
-    <linearGradient
-       id="linearGradient1442">
-      <stop
-         id="stop1444"
-         offset="0"
-         style="stop-color:#73d216" />
-      <stop
-         id="stop1446"
-         offset="1.0000000"
-         style="stop-color:#4e9a06" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient8662"
-       inkscape:collect="always">
-      <stop
-         id="stop8664"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         id="stop8666"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient8650"
-       inkscape:collect="always">
-      <stop
-         id="stop8652"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop8654"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8662"
-       id="radialGradient1444"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.000000,0.000000,0.000000,0.536723,1.614716e-15,16.87306)"
-       cx="24.837126"
-       cy="36.421127"
-       fx="24.837126"
-       fy="36.421127"
-       r="15.644737" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1442"
-       id="radialGradient1469"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.871885e-16,-0.843022,1.020168,2.265228e-16,0.606436,42.58614)"
-       cx="35.292667"
-       cy="20.494493"
-       fx="35.292667"
-       fy="20.494493"
-       r="16.956199" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8650"
-       id="radialGradient1471"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(3.749427e-16,-2.046729,-1.557610,-2.853404e-16,44.11559,66.93275)"
-       cx="15.987216"
-       cy="1.5350308"
-       fx="15.987216"
-       fy="1.5350308"
-       r="17.171415" />
-  </defs>
-  <sodipodi:namedview
-     inkscape:window-y="30"
-     inkscape:window-x="0"
-     inkscape:window-height="818"
-     inkscape:window-width="1280"
-     inkscape:showpageshadow="false"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     showgrid="false"
-     inkscape:current-layer="layer1"
-     inkscape:cy="23.239067"
-     inkscape:cx="15.972815"
-     inkscape:zoom="11.313708"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     borderopacity="0.25490196"
-     bordercolor="#666666"
-     pagecolor="#ffffff"
-     id="base"
-     fill="#4e9a06"
-     stroke="#4e9a06" />
-  <metadata
-     id="metadata4">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Jakub Steiner</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:source>http://jimmac.musichall.cz</dc:source>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
-        <dc:title>Go Down</dc:title>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>go</rdf:li>
-            <rdf:li>lower</rdf:li>
-            <rdf:li>down</rdf:li>
-            <rdf:li>arrow</rdf:li>
-            <rdf:li>pointer</rdf:li>
-            <rdf:li>&gt;</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title>Andreas Nilsson</dc:title>
-          </cc:Agent>
-        </dc:contributor>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/publicdomain/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
-     id="layer1">
-    <path
-       transform="matrix(1.214466,0.000000,0.000000,0.595458,-6.163846,16.31275)"
-       d="M 40.481863 36.421127 A 15.644737 8.3968935 0 1 1  9.1923885,36.421127 A 15.644737 8.3968935 0 1 1  40.481863 36.421127 z"
-       sodipodi:ry="8.3968935"
-       sodipodi:rx="15.644737"
-       sodipodi:cy="36.421127"
-       sodipodi:cx="24.837126"
-       id="path8660"
-       style="opacity:0.20454545;color:#000000;fill:url(#radialGradient1444);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
-       sodipodi:type="arc" />
-    <g
-       id="g1464"
-       transform="matrix(-1.000000,0.000000,0.000000,-1.000000,47.02856,43.99921)">
-      <path
-         style="opacity:1.0000000;color:#000000;fill:url(#radialGradient1469);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#3a7304;stroke-width:1.0000004;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         d="M 14.519136,38.500000 L 32.524165,38.496094 L 32.524165,25.504468 L 40.519531,25.496656 L 23.374809,5.4992135 L 6.5285585,25.497284 L 14.524440,25.501074 L 14.519136,38.500000 z "
-         id="path8643"
-         sodipodi:nodetypes="cccccccc" />
-      <path
-         style="opacity:0.50802141;color:#000000;fill:url(#radialGradient1471);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
-         d="M 39.429889,24.993467 L 32.023498,25.005186 L 32.026179,37.998023 L 16.647623,37.98887 C 17.417545,19.64788 27.370272,26.995797 32.029282,16.341991 L 39.429889,24.993467 z "
-         id="path8645"
-         sodipodi:nodetypes="cccccc" />
-      <path
-         sodipodi:nodetypes="cccccccc"
-         id="path8658"
-         d="M 15.520704,37.496094 L 31.522109,37.500000 L 31.522109,24.507050 L 38.338920,24.491425 L 23.384644,7.0388396 L 8.6781173,24.495782 L 15.518018,24.501029 L 15.520704,37.496094 z "
-         style="opacity:0.48128340;color:#000000;fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.0000004;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible" />
-    </g>
-  </g>
-</svg>
diff --git a/apps/files_pdfviewer/js/pdfjs/web/images/go-up.svg b/apps/files_pdfviewer/js/pdfjs/web/images/go-up.svg
deleted file mode 100644
index 5e2f9a2c64..0000000000
--- a/apps/files_pdfviewer/js/pdfjs/web/images/go-up.svg
+++ /dev/null
@@ -1,197 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   sodipodi:docname="go-up.svg"
-   sodipodi:docbase="/home/tigert/cvs/freedesktop.org/tango-icon-theme/scalable/actions"
-   inkscape:version="0.46"
-   sodipodi:version="0.32"
-   id="svg11300"
-   height="48px"
-   width="48px"
-   inkscape:export-filename="/home/jimmac/Desktop/wi-fi.png"
-   inkscape:export-xdpi="90.000000"
-   inkscape:export-ydpi="90.000000"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   viewbox="0 0 48 48">
-  <defs
-     id="defs3">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 24 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="48 : 24 : 1"
-       inkscape:persp3d-origin="24 : 16 : 1"
-       id="perspective23" />
-    <linearGradient
-       id="linearGradient2304">
-      <stop
-         id="stop2306"
-         offset="0"
-         style="stop-color:#73d216" />
-      <stop
-         id="stop2308"
-         offset="1.0000000"
-         style="stop-color:#4e9a06" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient8662"
-       inkscape:collect="always">
-      <stop
-         id="stop8664"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         id="stop8666"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient8650"
-       inkscape:collect="always">
-      <stop
-         id="stop8652"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop8654"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8650"
-       id="radialGradient1438"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-3.749427e-16,-2.046729,1.557610,-2.853404e-16,2.767009,66.93275)"
-       cx="24.53788"
-       cy="0.40010813"
-       fx="24.53788"
-       fy="0.40010813"
-       r="17.171415" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2304"
-       id="radialGradient1441"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.871885e-16,-0.843022,1.020168,2.265228e-16,0.606436,42.58614)"
-       cx="11.319205"
-       cy="22.454971"
-       fx="11.319205"
-       fy="22.454971"
-       r="16.956199" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8662"
-       id="radialGradient1444"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.000000,0.000000,0.000000,0.536723,1.614716e-15,16.87306)"
-       cx="24.837126"
-       cy="36.421127"
-       fx="24.837126"
-       fy="36.421127"
-       r="15.644737" />
-  </defs>
-  <sodipodi:namedview
-     inkscape:window-y="30"
-     inkscape:window-x="0"
-     inkscape:window-height="818"
-     inkscape:window-width="1280"
-     inkscape:showpageshadow="false"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     showgrid="false"
-     inkscape:current-layer="layer1"
-     inkscape:cy="25.620377"
-     inkscape:cx="9.6380363"
-     inkscape:zoom="13.059378"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     borderopacity="0.25490196"
-     bordercolor="#666666"
-     pagecolor="#ffffff"
-     id="base"
-     fill="#73d216"
-     stroke="#73d216" />
-  <metadata
-     id="metadata4">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Jakub Steiner</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:source>http://jimmac.musichall.cz</dc:source>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
-        <dc:title>Go Up</dc:title>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>go</rdf:li>
-            <rdf:li>higher</rdf:li>
-            <rdf:li>up</rdf:li>
-            <rdf:li>arrow</rdf:li>
-            <rdf:li>pointer</rdf:li>
-            <rdf:li>&gt;</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title>Andreas Nilsson</dc:title>
-          </cc:Agent>
-        </dc:contributor>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/publicdomain/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
-     id="layer1">
-    <path
-       transform="matrix(1.214466,0.000000,0.000000,0.595458,-6.163846,16.31275)"
-       d="M 40.481863 36.421127 A 15.644737 8.3968935 0 1 1  9.1923885,36.421127 A 15.644737 8.3968935 0 1 1  40.481863 36.421127 z"
-       sodipodi:ry="8.3968935"
-       sodipodi:rx="15.644737"
-       sodipodi:cy="36.421127"
-       sodipodi:cx="24.837126"
-       id="path8660"
-       style="opacity:0.29946521;color:#000000;fill:url(#radialGradient1444);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
-       sodipodi:type="arc" />
-    <path
-       sodipodi:nodetypes="cccccccc"
-       id="path8643"
-       d="M 14.491792,38.500000 L 32.469477,38.500000 L 32.469477,25.547437 L 40.500000,25.547437 L 23.374809,5.4992135 L 6.5285585,25.489471 L 14.497096,25.555762 L 14.491792,38.500000 z "
-       style="opacity:1.0000000;color:#000000;fill:url(#radialGradient1441);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#3a7304;stroke-width:1.0000004;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    <path
-       sodipodi:nodetypes="cccscc"
-       id="path8645"
-       d="M 7.5855237,25.03253 L 14.995821,25.03253 L 15.062422,31.594339 C 20.718034,20.593878 31.055517,22.749928 31.656768,15.966674 C 31.656768,15.966674 23.366938,6.4219692 23.366938,6.4219692 L 7.5855237,25.03253 z "
-       style="opacity:0.50802141;color:#000000;fill:url(#radialGradient1438);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible" />
-    <path
-       style="opacity:0.48128340;color:#000000;fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.0000004;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
-       d="M 15.602735,37.500000 L 31.502578,37.500000 L 31.502578,24.507050 L 38.311576,24.507050 L 23.361206,7.0700896 L 8.6546798,24.550470 L 15.475049,24.528373 L 15.602735,37.500000 z "
-       id="path8658"
-       sodipodi:nodetypes="cccccccc" />
-  </g>
-</svg>
diff --git a/apps/files_pdfviewer/js/pdfjs/web/images/nav-outline.svg b/apps/files_pdfviewer/js/pdfjs/web/images/nav-outline.svg
deleted file mode 100644
index 4d4323ce37..0000000000
--- a/apps/files_pdfviewer/js/pdfjs/web/images/nav-outline.svg
+++ /dev/null
@@ -1,202 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48px"
-   height="48px"
-   id="svg3007"
-   version="1.1"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="nav-outline.svg">
-  <defs
-     id="defs3009">
-    <filter
-       inkscape:collect="always"
-       id="filter5333"
-       x="-0.16623206"
-       width="1.3324641"
-       y="-0.030014125"
-       height="1.0600282">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.47888561"
-         id="feGaussianBlur5335" />
-    </filter>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.945051"
-     inkscape:cx="20.614872"
-     inkscape:cy="23.423899"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1440"
-     inkscape:window-height="773"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata3012">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <rect
-       style="fill:#f0f0f0;fill-rule:evenodd;stroke:#808080;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1;fill-opacity:1"
-       id="rect3783"
-       width="46.16272"
-       height="45.59861"
-       x="1.0341953"
-       y="0.99112236" />
-    <rect
-       style="fill:#404040;fill-opacity:1;stroke:none"
-       id="rect3787"
-       width="2.8205326"
-       height="2.7823999"
-       x="4.2307992"
-       y="4.093708" />
-    <rect
-       style="fill:#404040;fill-opacity:1;stroke:none"
-       id="rect5257"
-       width="24.68285"
-       height="1.4102663"
-       x="8.0855274"
-       y="4.657815" />
-    <rect
-       y="8.4185247"
-       x="8.4615984"
-       height="2.7823999"
-       width="2.8205326"
-       id="rect5259"
-       style="fill:#404040;fill-opacity:1;stroke:none" />
-    <rect
-       y="9.0766497"
-       x="12.410344"
-       height="1.4102663"
-       width="30.498053"
-       id="rect5261"
-       style="fill:#404040;fill-opacity:1;stroke:none" />
-    <rect
-       style="fill:#404040;fill-opacity:1;stroke:none"
-       id="rect5263"
-       width="2.8205326"
-       height="2.7823999"
-       x="8.4615984"
-       y="13.307448" />
-    <rect
-       style="fill:#404040;fill-opacity:1;stroke:none"
-       id="rect5265"
-       width="24.972752"
-       height="1.4102663"
-       x="12.410344"
-       y="13.965573" />
-    <rect
-       y="17.444229"
-       x="4.3248172"
-       height="2.7823999"
-       width="2.8205326"
-       id="rect5267"
-       style="fill:#404040;fill-opacity:1;stroke:none" />
-    <rect
-       y="18.008337"
-       x="8.1795454"
-       height="1.4102663"
-       width="25.101433"
-       id="rect5269"
-       style="fill:#404040;fill-opacity:1;stroke:none" />
-    <rect
-       style="fill:#404040;fill-opacity:1;stroke:none"
-       id="rect5271"
-       width="2.8205326"
-       height="2.7823999"
-       x="8.5556164"
-       y="21.769047" />
-    <rect
-       style="fill:#404040;fill-opacity:1;stroke:none"
-       id="rect5273"
-       width="28.782515"
-       height="1.4102663"
-       x="12.880433"
-       y="22.427172" />
-    <rect
-       y="26.65797"
-       x="13.475181"
-       height="2.7823999"
-       width="2.8205326"
-       id="rect5275"
-       style="fill:#404040;fill-opacity:1;stroke:none" />
-    <rect
-       y="27.316095"
-       x="17.479"
-       height="1.4102663"
-       width="23.681646"
-       id="rect5277"
-       style="fill:#404040;fill-opacity:1;stroke:none" />
-    <rect
-       style="fill:#404040;fill-opacity:1;stroke:none"
-       id="rect5279"
-       width="2.8205326"
-       height="2.7823999"
-       x="8.5130949"
-       y="31.006269" />
-    <rect
-       style="fill:#404040;fill-opacity:1;stroke:none"
-       id="rect5281"
-       width="24.557148"
-       height="1.4102663"
-       x="12.592034"
-       y="31.636858" />
-    <rect
-       y="35.464046"
-       x="13.475181"
-       height="2.7823999"
-       width="2.8205326"
-       id="rect5283"
-       style="fill:#404040;fill-opacity:1;stroke:none" />
-    <rect
-       y="36.055695"
-       x="17.744923"
-       height="1.4102663"
-       width="18.577394"
-       id="rect5285"
-       style="fill:#404040;fill-opacity:1;stroke:none" />
-    <rect
-       style="fill:#404040;fill-opacity:1;stroke:none"
-       id="rect5287"
-       width="2.8205326"
-       height="2.7823999"
-       x="13.54166"
-       y="40.35297" />
-    <rect
-       style="fill:#404040;fill-opacity:1;stroke:none"
-       id="rect5289"
-       width="23.080858"
-       height="1.4102663"
-       x="17.678442"
-       y="40.944618" />
-  </g>
-</svg>
diff --git a/apps/files_pdfviewer/js/pdfjs/web/images/nav-thumbs.svg b/apps/files_pdfviewer/js/pdfjs/web/images/nav-thumbs.svg
deleted file mode 100644
index 8737b8cb63..0000000000
--- a/apps/files_pdfviewer/js/pdfjs/web/images/nav-thumbs.svg
+++ /dev/null
@@ -1,283 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48px"
-   height="48px"
-   id="svg3007"
-   version="1.1"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="nav-thumbs.svg">
-  <defs
-     id="defs3009">
-    <filter
-       inkscape:collect="always"
-       id="filter5333"
-       x="-0.16623206"
-       width="1.3324641"
-       y="-0.030014125"
-       height="1.0600282">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.47888561"
-         id="feGaussianBlur5335" />
-    </filter>
-    <filter
-       inkscape:collect="always"
-       id="filter5966">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.3570515"
-         id="feGaussianBlur5968" />
-    </filter>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.945051"
-     inkscape:cx="9.375932"
-     inkscape:cy="24.942259"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1440"
-     inkscape:window-height="773"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata3012">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <rect
-       style="fill:#484848;fill-rule:evenodd;stroke:#808080;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1;fill-opacity:1"
-       id="rect3783"
-       width="46.16272"
-       height="45.59861"
-       x="1.0341953"
-       y="0.99112236" />
-    <rect
-       y="4.7876148"
-       x="14.359808"
-       height="12.764274"
-       width="9.7061672"
-       id="rect5960"
-       style="fill:#000000;fill-opacity:1;stroke:none;filter:url(#filter5966)"
-       transform="matrix(1.0465713,0,0,1.0642851,3.6426579,-2.1141417)" />
-    <rect
-       style="fill:#ffffff;fill-opacity:1;stroke:none"
-       id="rect5958"
-       width="9.7061672"
-       height="12.764274"
-       x="18.897236"
-       y="3.1920807" />
-    <rect
-       transform="matrix(1.0465713,0,0,1.0642851,3.6426579,13.043433)"
-       style="fill:#000000;fill-opacity:1;stroke:none;filter:url(#filter5966)"
-       id="rect5970"
-       width="9.7061672"
-       height="12.764274"
-       x="14.359808"
-       y="4.7876148" />
-    <rect
-       y="18.349655"
-       x="18.897236"
-       height="12.764274"
-       width="9.7061672"
-       id="rect5972"
-       style="fill:#ffffff;fill-opacity:1;stroke:none" />
-    <rect
-       y="4.7876148"
-       x="14.359808"
-       height="12.764274"
-       width="9.7061672"
-       id="rect5974"
-       style="fill:#000000;fill-opacity:1;stroke:none;filter:url(#filter5966)"
-       transform="matrix(1.0465713,0,0,0.9368834,3.6426579,29.209842)" />
-    <rect
-       style="fill:#ffffff;fill-opacity:1;stroke:none"
-       id="rect5976"
-       width="9.7061672"
-       height="11.833546"
-       x="18.897236"
-       y="33.906113" />
-    <rect
-       y="4.905829"
-       x="19.960924"
-       height="0.66480595"
-       width="7.7117486"
-       id="rect5995"
-       style="fill:#808080;fill-opacity:1;stroke:none" />
-    <rect
-       style="fill:#808080;fill-opacity:1;stroke:none"
-       id="rect6177"
-       width="3.6219761"
-       height="0.66480595"
-       x="19.960924"
-       y="6.0340419" />
-    <rect
-       style="fill:#808080;fill-opacity:1;stroke:none"
-       id="rect6179"
-       width="7.7117486"
-       height="0.66480595"
-       x="19.960924"
-       y="7.2562728" />
-    <rect
-       y="8.3844862"
-       x="19.960924"
-       height="0.66480595"
-       width="5.6903667"
-       id="rect6181"
-       style="fill:#808080;fill-opacity:1;stroke:none" />
-    <rect
-       y="9.7007341"
-       x="19.960924"
-       height="0.66480595"
-       width="7.7117486"
-       id="rect6183"
-       style="fill:#808080;fill-opacity:1;stroke:none" />
-    <rect
-       style="fill:#808080;fill-opacity:1;stroke:none"
-       id="rect6185"
-       width="7.7117486"
-       height="0.66480595"
-       x="19.960924"
-       y="10.828948" />
-    <rect
-       y="12.051179"
-       x="19.960924"
-       height="0.66480595"
-       width="7.7117486"
-       id="rect6187"
-       style="fill:#808080;fill-opacity:1;stroke:none" />
-    <rect
-       y="14.213587"
-       x="23.204536"
-       height="0.66480595"
-       width="1.2245234"
-       id="rect6189"
-       style="fill:#808080;fill-opacity:1;stroke:none" />
-    <rect
-       style="fill:#808080;fill-opacity:1;stroke:none"
-       id="rect6209"
-       width="7.7117486"
-       height="0.66480595"
-       x="19.772888"
-       y="19.854652" />
-    <rect
-       y="39.08128"
-       x="19.913914"
-       height="0.66480595"
-       width="3.6219761"
-       id="rect6211"
-       style="fill:#808080;fill-opacity:1;stroke:none" />
-    <rect
-       y="22.205095"
-       x="19.772888"
-       height="0.66480595"
-       width="6.6305442"
-       id="rect6213"
-       style="fill:#808080;fill-opacity:1;stroke:none" />
-    <rect
-       style="fill:#808080;fill-opacity:1;stroke:none"
-       id="rect6215"
-       width="7.7587576"
-       height="0.66480595"
-       x="19.866905"
-       y="37.859051" />
-    <rect
-       style="fill:#808080;fill-opacity:1;stroke:none"
-       id="rect6217"
-       width="7.7117486"
-       height="0.66480595"
-       x="19.772888"
-       y="21.029873" />
-    <rect
-       y="25.777771"
-       x="19.772888"
-       height="0.66480595"
-       width="7.7117486"
-       id="rect6219"
-       style="fill:#808080;fill-opacity:1;stroke:none" />
-    <rect
-       style="fill:#808080;fill-opacity:1;stroke:none"
-       id="rect6221"
-       width="7.7117486"
-       height="0.66480595"
-       x="19.772888"
-       y="27.000002" />
-    <rect
-       style="fill:#808080;fill-opacity:1;stroke:none"
-       id="rect6223"
-       width="1.2245234"
-       height="0.66480595"
-       x="23.204536"
-       y="28.974375" />
-    <rect
-       style="fill:#808080;fill-opacity:1;stroke:none"
-       id="rect6225"
-       width="3.6219761"
-       height="0.66480595"
-       x="19.960922"
-       y="42.983021" />
-    <rect
-       style="fill:#808080;fill-opacity:1;stroke:none"
-       id="rect6227"
-       width="7.7117486"
-       height="0.66480595"
-       x="19.913914"
-       y="36.777847" />
-    <rect
-       y="35.602627"
-       x="19.913914"
-       height="0.66480595"
-       width="7.7117486"
-       id="rect6231"
-       style="fill:#808080;fill-opacity:1;stroke:none" />
-    <rect
-       style="fill:#808080;fill-opacity:1;stroke:none"
-       id="rect6233"
-       width="7.7117486"
-       height="0.66480595"
-       x="19.913914"
-       y="40.350525" />
-    <rect
-       y="41.572754"
-       x="19.913914"
-       height="0.66480595"
-       width="7.7117486"
-       id="rect6235"
-       style="fill:#808080;fill-opacity:1;stroke:none" />
-    <rect
-       style="fill:#0000e6;fill-opacity:0.44444448;stroke:none"
-       id="rect6237"
-       width="3.5256658"
-       height="1.927364"
-       x="22.077036"
-       y="23.367346" />
-  </g>
-</svg>
diff --git a/apps/files_pdfviewer/js/pdfjs/web/images/pin-down.svg b/apps/files_pdfviewer/js/pdfjs/web/images/pin-down.svg
deleted file mode 100644
index 357667600b..0000000000
--- a/apps/files_pdfviewer/js/pdfjs/web/images/pin-down.svg
+++ /dev/null
@@ -1,297 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48"
-   height="48"
-   id="svg3075"
-   version="1.1"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="pin-down.svg"
-   viewPort="0 0 48 48">
-  <defs
-     id="defs3077">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3804">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop3806" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop3808" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3965">
-      <stop
-         id="stop3967"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1"
-         id="stop3969" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3885">
-      <stop
-         style="stop-color:#a8b5e9;stop-opacity:1;"
-         offset="0"
-         id="stop3889" />
-      <stop
-         id="stop3891"
-         offset="1"
-         style="stop-color:#1d4488;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3865">
-      <stop
-         style="stop-color:#0e0ec3;stop-opacity:0"
-         offset="0"
-         id="stop3867" />
-      <stop
-         id="stop3883"
-         offset="0.5"
-         style="stop-color:#95b1e4;stop-opacity:1;" />
-      <stop
-         style="stop-color:#0d29c0;stop-opacity:1;"
-         offset="1"
-         id="stop3869" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3853">
-      <stop
-         style="stop-color:#717171;stop-opacity:1;"
-         offset="0"
-         id="stop3855" />
-      <stop
-         id="stop3861"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         style="stop-color:#818181;stop-opacity:1;"
-         offset="1"
-         id="stop3857" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3885"
-       id="radialGradient3792"
-       cx="13.508819"
-       cy="30.521608"
-       fx="13.508819"
-       fy="30.521608"
-       r="13.254341"
-       gradientTransform="matrix(1,0,0,1.045977,0,-1.4434017)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3885"
-       id="linearGradient3802"
-       x1="15.306904"
-       y1="13.407407"
-       x2="29.35461"
-       y2="30.15519"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2304178,0,0,1.1235308,-2.1158755,998.83747)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3804"
-       id="radialGradient3812"
-       cx="20.111172"
-       cy="28.238274"
-       fx="20.111172"
-       fy="28.238274"
-       r="7.6291947"
-       gradientTransform="matrix(1.2304178,0,0,1.1452771,-2.1158755,998.22337)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3885"
-       id="radialGradient3822"
-       cx="23.985939"
-       cy="24.847366"
-       fx="23.985939"
-       fy="24.847366"
-       r="10.593476"
-       gradientTransform="matrix(0.63682384,0.44303926,-1.1714282,1.6838088,35.523491,-26.055439)"
-       gradientUnits="userSpaceOnUse" />
-    <filter
-       inkscape:collect="always"
-       id="filter3856"
-       x="-0.30370581"
-       width="1.6074116"
-       y="-0.32771564"
-       height="1.6554313">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="4.7808869"
-         id="feGaussianBlur3858" />
-    </filter>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3885"
-       id="radialGradient3865"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,1.045977,0,-1.4434017)"
-       cx="13.508819"
-       cy="30.521608"
-       fx="13.508819"
-       fy="30.521608"
-       r="13.254341" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3885"
-       id="linearGradient3867"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2304178,0,0,1.1235308,-2.1158755,998.83747)"
-       x1="15.306904"
-       y1="13.407407"
-       x2="29.35461"
-       y2="30.15519" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3804"
-       id="radialGradient3869"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2304178,0,0,1.1452771,-2.1158755,998.22337)"
-       cx="20.111172"
-       cy="28.238274"
-       fx="20.111172"
-       fy="28.238274"
-       r="7.6291947" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3885"
-       id="radialGradient3871"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.63682384,0.44303926,-1.1714282,1.6838088,35.523491,-26.055439)"
-       cx="23.985939"
-       cy="24.847366"
-       fx="23.985939"
-       fy="24.847366"
-       r="10.593476" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3885"
-       id="linearGradient3875"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.98683814,0,0,0.9524914,3.4991888,1004.1467)"
-       x1="15.306904"
-       y1="13.407407"
-       x2="29.35461"
-       y2="30.15519" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3804"
-       id="radialGradient3877"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.195641,0.23932984,-0.18533175,0.95255553,4.5333676,999.33159)"
-       cx="20.111172"
-       cy="28.238274"
-       fx="20.111172"
-       fy="28.238274"
-       r="7.6291947" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3885"
-       id="radialGradient3880"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.5847553,0.52693722,-0.99805104,2.7064773,14.11088,-45.304477)"
-       cx="18.133854"
-       cy="19.778509"
-       fx="18.133854"
-       fy="19.778509"
-       r="10.593476" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3885"
-       id="radialGradient3882"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,1.045977,0,-1.4434017)"
-       cx="13.508819"
-       cy="30.521608"
-       fx="13.508819"
-       fy="30.521608"
-       r="13.254341" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="4.9558805"
-     inkscape:cx="3.0237013"
-     inkscape:cy="17.287267"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1291"
-     inkscape:window-height="776"
-     inkscape:window-x="16"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata3080">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1004.3622)">
-    <path
-       style="fill:#ffffff;fill-opacity:1;stroke:none;filter:url(#filter3856)"
-       d="m 14.326415,1019.2702 c -8.3327876,4.0675 -9.8235436,10.8833 -8.8783416,15.1336 4.6840646,7.9754 8.3608166,13.8165 24.0118786,12.9139 9.657617,-3.7312 12.9762,-9.3269 13.519293,-15.7389 -0.547269,-4.3839 -1.957958,-9.3396 -5.649854,-14.9317 -3.965534,-2.471 -6.300859,-4.4246 -10.290805,-4.2374 -8.25193,0.5026 -8.752485,4.4502 -12.712171,6.8605 z"
-       id="path3826"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccc"
-       transform="matrix(0.69099294,0,0,0.75978808,7.3427938,249.11025)" />
-    <path
-       sodipodi:type="arc"
-       style="fill:url(#radialGradient3882);fill-opacity:1;stroke:none"
-       id="path3011"
-       sodipodi:cx="21.176477"
-       sodipodi:cy="31.393986"
-       sodipodi:rx="13.254341"
-       sodipodi:ry="13.863736"
-       d="m 34.430819,31.393986 a 13.254341,13.863736 0 1 1 -26.5086827,0 13.254341,13.863736 0 1 1 26.5086827,0 z"
-       transform="matrix(0.98683814,0,0,0.83062636,2.696034,1005.3655)" />
-    <path
-       style="fill:url(#linearGradient3875);fill-opacity:1;stroke:url(#radialGradient3877);stroke-width:0.9695127;stroke-opacity:1"
-       d="m 17.246758,1026.7905 c -1.7156,4.5052 -2.482464,10.6205 8.726963,10.7476 4.849099,-1.8941 3.522783,-5.3561 6.021544,-11.8282 l -10.973104,-1.5977 z"
-       id="path3794"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       sodipodi:type="arc"
-       style="fill:url(#radialGradient3880);fill-opacity:1;stroke:none"
-       id="path3814"
-       sodipodi:cx="24.718111"
-       sodipodi:cy="23.38278"
-       sodipodi:rx="10.593476"
-       sodipodi:ry="9.6854639"
-       d="m 35.311587,23.38278 a 10.593476,9.6854639 0 1 1 -21.186952,0 10.593476,9.6854639 0 1 1 21.186952,0 z"
-       transform="matrix(0.85425691,0,0,0.84187503,3.9779774,1006.7561)" />
-  </g>
-</svg>
diff --git a/apps/files_pdfviewer/js/pdfjs/web/images/pin-up.svg b/apps/files_pdfviewer/js/pdfjs/web/images/pin-up.svg
deleted file mode 100644
index e55cec7a04..0000000000
--- a/apps/files_pdfviewer/js/pdfjs/web/images/pin-up.svg
+++ /dev/null
@@ -1,230 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48"
-   height="48"
-   id="svg3075"
-   version="1.1"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="pin-up.svg"
-   viewPort="0 0 48 48">
-  <defs
-     id="defs3077">
-    <linearGradient
-       id="linearGradient3965">
-      <stop
-         id="stop3967"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1"
-         id="stop3969" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3885">
-      <stop
-         style="stop-color:#a8b5e9;stop-opacity:1;"
-         offset="0"
-         id="stop3889" />
-      <stop
-         id="stop3891"
-         offset="1"
-         style="stop-color:#1d4488;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3865">
-      <stop
-         style="stop-color:#0e0ec3;stop-opacity:1;"
-         offset="0"
-         id="stop3867" />
-      <stop
-         id="stop3883"
-         offset="0.5"
-         style="stop-color:#95b1e4;stop-opacity:1;" />
-      <stop
-         style="stop-color:#0d29c0;stop-opacity:1;"
-         offset="1"
-         id="stop3869" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3853">
-      <stop
-         style="stop-color:#717171;stop-opacity:1;"
-         offset="0"
-         id="stop3855" />
-      <stop
-         id="stop3861"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         style="stop-color:#818181;stop-opacity:1;"
-         offset="1"
-         id="stop3857" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3853"
-       id="linearGradient3859"
-       x1="7.7696066"
-       y1="34.979828"
-       x2="11.854106"
-       y2="39.107044"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(4.8388015,1001.6582)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3885"
-       id="radialGradient3871"
-       cx="14.801222"
-       cy="1030.6609"
-       fx="14.801222"
-       fy="1030.6609"
-       r="10.177785"
-       gradientTransform="matrix(1,0,0,1.0108042,4.8388015,-13.880529)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3865"
-       id="linearGradient3881"
-       x1="15.012629"
-       y1="11.922465"
-       x2="31.098303"
-       y2="28.858271"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.97315436,4.8388015,1002.4769)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3885"
-       id="radialGradient3909"
-       cx="16.437693"
-       cy="22.596292"
-       fx="16.437693"
-       fy="22.596292"
-       r="1.7789712"
-       gradientTransform="matrix(1,0,0,8.3599999,0,-166.30871)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3865"
-       id="linearGradient3927"
-       x1="26.47109"
-       y1="1010.7343"
-       x2="35.294788"
-       y2="1019.8425"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(4.5541661,-2.1347654)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965"
-       id="radialGradient3995"
-       cx="23.189369"
-       cy="25.704245"
-       fx="23.189369"
-       fy="25.704245"
-       r="37.336674"
-       gradientTransform="matrix(1,0,0,1.0332422,0,-0.85446479)"
-       gradientUnits="userSpaceOnUse" />
-    <filter
-       inkscape:collect="always"
-       id="filter4009"
-       x="-0.19299152"
-       width="1.385983"
-       y="-0.18351803"
-       height="1.3670361">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="3.8667902"
-         id="feGaussianBlur4011" />
-    </filter>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="3.2819435"
-     inkscape:cx="18.697469"
-     inkscape:cy="17.287267"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="970"
-     inkscape:window-height="778"
-     inkscape:window-x="284"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata3080">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1004.3622)">
-    <path
-       style="fill:url(#radialGradient3995);stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1.0;filter:url(#filter4009)"
-       d="M -0.85390618,50.988672 14.231769,27.790888 C 12.21393,25.133052 9.5514307,24.605255 9.9622384,18.824874 13.947134,14.236899 17.362759,16.258973 21.347654,16.54779 l 8.966014,-8.6813789 c 1.467204,-2.4778468 -1.023584,-4.6422045 0.569271,-7.25820222 4.802307,-0.84764718 6.662499,1.15219542 11.527733,6.26197842 4.061691,4.1873637 5.648882,7.0611607 4.411848,9.5352857 -1.075122,2.776443 -4.518349,-0.692782 -5.835025,0.56927 l -9.108332,10.104556 c -0.418785,3.74872 2.078647,7.861968 -1.280859,11.243098 -4.132171,0.818036 -6.734336,-1.933944 -9.819921,-3.557942 z"
-       id="path3955"
-       inkscape:connector-curvature="0"
-       transform="translate(0,1004.3622)"
-       sodipodi:nodetypes="ccccccccccccc" />
-    <g
-       id="g3929">
-      <path
-         sodipodi:nodetypes="cccc"
-         inkscape:connector-curvature="0"
-         id="path3083"
-         d="m 3.2884874,1051.0662 c 3.1862139,-6.2911 11.3693156,-15.19 15.4471616,-20.0327 l 2.86533,3.0086 c -3.476851,3.6575 -10.192375,10.8664 -18.3124916,17.0241 z"
-         style="fill:url(#linearGradient3859);fill-opacity:1;stroke:#a5a5a5;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="path3863"
-         d="m 11.10078,1023.3294 c 5.038264,10.1095 11.83652,14.8875 18.358981,18.2167 1.196291,-2.5422 1.454996,-5.6203 0,-9.6776 l -8.539061,-8.6814 c -3.704654,-1.8936 -6.871076,-1.3652 -9.81992,0.1423 z"
-         style="fill:url(#radialGradient3871);fill-opacity:1;stroke:none" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="path3873"
-         d="m 33.729292,1011.5171 -13.235545,11.4952 c 2.869602,4.2703 6.221839,7.4544 9.108332,9.1408 l 11.385416,-13.0187 z"
-         style="fill:url(#linearGradient3881);fill-opacity:1;stroke:none" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="path3893"
-         d="m 33.228885,1011.6148 c 1.843189,2.7806 3.431654,5.6597 7.19852,7.6953 l 5.398891,1.7423 c -7.6738,-4.7914 -10.989683,-9.5828 -13.947133,-14.3741 z"
-         style="fill:url(#linearGradient3927);fill-opacity:1;stroke:none" />
-      <path
-         transform="matrix(0.68275275,-0.5590416,0.45791123,0.47036287,17.42507,1012.2127)"
-         d="m 18.216664,22.596292 a 1.7789712,14.872199 0 1 1 -3.557943,0 1.7789712,14.872199 0 1 1 3.557943,0 z"
-         sodipodi:ry="14.872199"
-         sodipodi:rx="1.7789712"
-         sodipodi:cy="22.596292"
-         sodipodi:cx="16.437693"
-         id="path3901"
-         style="fill:url(#radialGradient3909);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-    </g>
-  </g>
-</svg>
diff --git a/apps/files_pdfviewer/js/pdfjs/web/images/zoom-in.svg b/apps/files_pdfviewer/js/pdfjs/web/images/zoom-in.svg
deleted file mode 100644
index 48ee42dd9b..0000000000
--- a/apps/files_pdfviewer/js/pdfjs/web/images/zoom-in.svg
+++ /dev/null
@@ -1,437 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48px"
-   height="48px"
-   id="svg6431"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docbase="/home/jimmac/src/cvs/tango-icon-theme/scalable/actions"
-   sodipodi:docname="list-add.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   viewbox="0 0 48 48">
-  <defs
-     id="defs6433">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 24 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="48 : 24 : 1"
-       inkscape:persp3d-origin="24 : 16 : 1"
-       id="perspective70" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2091">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop2093" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop2095" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7916">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop7918" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.34020618;"
-         offset="1.0000000"
-         id="stop7920" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient8662">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop8664" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop8666" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8662"
-       id="radialGradient1503"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.000000,0.000000,0.000000,0.536723,-1.018989e-13,16.87306)"
-       cx="24.837126"
-       cy="36.421127"
-       fx="24.837126"
-       fy="36.421127"
-       r="15.644737" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2847">
-      <stop
-         style="stop-color:#3465a4;stop-opacity:1;"
-         offset="0"
-         id="stop2849" />
-      <stop
-         style="stop-color:#3465a4;stop-opacity:0;"
-         offset="1"
-         id="stop2851" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2847"
-       id="linearGradient1488"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.000000,0.000000,0.000000,-1.000000,-1.242480,40.08170)"
-       x1="37.128052"
-       y1="29.729605"
-       x2="37.065414"
-       y2="26.194071" />
-    <linearGradient
-       id="linearGradient2831">
-      <stop
-         style="stop-color:#3465a4;stop-opacity:1;"
-         offset="0"
-         id="stop2833" />
-      <stop
-         id="stop2855"
-         offset="0.33333334"
-         style="stop-color:#5b86be;stop-opacity:1;" />
-      <stop
-         style="stop-color:#83a8d8;stop-opacity:0;"
-         offset="1"
-         id="stop2835" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2831"
-       id="linearGradient1486"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-48.30498,-6.043298)"
-       x1="13.478554"
-       y1="10.612206"
-       x2="15.419417"
-       y2="19.115122" />
-    <linearGradient
-       id="linearGradient2380">
-      <stop
-         style="stop-color:#b9cfe7;stop-opacity:1"
-         offset="0"
-         id="stop2382" />
-      <stop
-         style="stop-color:#729fcf;stop-opacity:1"
-         offset="1"
-         id="stop2384" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2682">
-      <stop
-         style="stop-color:#3977c3;stop-opacity:1;"
-         offset="0"
-         id="stop2684" />
-      <stop
-         style="stop-color:#89aedc;stop-opacity:0;"
-         offset="1"
-         id="stop2686" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2682"
-       id="linearGradient2688"
-       x1="36.713837"
-       y1="31.455952"
-       x2="37.124462"
-       y2="24.842253"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-48.77039,-5.765705)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2690">
-      <stop
-         style="stop-color:#c4d7eb;stop-opacity:1;"
-         offset="0"
-         id="stop2692" />
-      <stop
-         style="stop-color:#c4d7eb;stop-opacity:0;"
-         offset="1"
-         id="stop2694" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2690"
-       id="linearGradient2696"
-       x1="32.647972"
-       y1="30.748846"
-       x2="37.124462"
-       y2="24.842253"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-48.77039,-5.765705)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2871">
-      <stop
-         style="stop-color:#3465a4;stop-opacity:1;"
-         offset="0"
-         id="stop2873" />
-      <stop
-         style="stop-color:#3465a4;stop-opacity:1"
-         offset="1"
-         id="stop2875" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2402">
-      <stop
-         style="stop-color:#729fcf;stop-opacity:1;"
-         offset="0"
-         id="stop2404" />
-      <stop
-         style="stop-color:#528ac5;stop-opacity:1;"
-         offset="1"
-         id="stop2406" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2797"
-       id="linearGradient1493"
-       gradientUnits="userSpaceOnUse"
-       x1="5.9649176"
-       y1="26.048164"
-       x2="52.854097"
-       y2="26.048164" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2797">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop2799" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop2801" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2797"
-       id="linearGradient1491"
-       gradientUnits="userSpaceOnUse"
-       x1="5.9649176"
-       y1="26.048164"
-       x2="52.854097"
-       y2="26.048164" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient7179">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop7181" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop7183" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2316">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop2318" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.65979379;"
-         offset="1"
-         id="stop2320" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient1322">
-      <stop
-         id="stop1324"
-         offset="0.0000000"
-         style="stop-color:#729fcf" />
-      <stop
-         id="stop1326"
-         offset="1.0000000"
-         style="stop-color:#5187d6;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1322"
-       id="linearGradient4975"
-       x1="34.892849"
-       y1="36.422989"
-       x2="45.918697"
-       y2="48.547989"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-18.01785,-13.57119)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7179"
-       id="linearGradient7185"
-       x1="13.435029"
-       y1="13.604306"
-       x2="22.374878"
-       y2="23.554308"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7179"
-       id="linearGradient7189"
-       gradientUnits="userSpaceOnUse"
-       x1="13.435029"
-       y1="13.604306"
-       x2="22.374878"
-       y2="23.554308"
-       gradientTransform="matrix(-1.000000,0.000000,0.000000,-1.000000,47.93934,50.02474)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2380"
-       id="linearGradient7180"
-       gradientUnits="userSpaceOnUse"
-       x1="62.513836"
-       y1="36.061237"
-       x2="15.984863"
-       y2="20.60858" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2871"
-       id="linearGradient7182"
-       gradientUnits="userSpaceOnUse"
-       x1="46.834816"
-       y1="45.264122"
-       x2="45.380436"
-       y2="50.939667" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2402"
-       id="linearGradient7184"
-       gradientUnits="userSpaceOnUse"
-       x1="18.935766"
-       y1="23.667896"
-       x2="53.588622"
-       y2="26.649362" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2871"
-       id="linearGradient7186"
-       gradientUnits="userSpaceOnUse"
-       x1="46.834816"
-       y1="45.264122"
-       x2="45.380436"
-       y2="50.939667" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7916"
-       id="linearGradient7922"
-       x1="16.874998"
-       y1="22.851799"
-       x2="27.900846"
-       y2="34.976799"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2091"
-       id="radialGradient2097"
-       cx="23.070683"
-       cy="35.127438"
-       fx="23.070683"
-       fy="35.127438"
-       r="10.319340"
-       gradientTransform="matrix(0.914812,1.265023e-2,-8.21502e-3,0.213562,2.253914,27.18889)"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="0.15686275"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="-123.56934"
-     inkscape:cy="0.031886897"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1280"
-     inkscape:window-height="818"
-     inkscape:window-x="0"
-     inkscape:window-y="30"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:showpageshadow="false" />
-  <metadata
-     id="metadata6436">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Add</dc:title>
-        <dc:date>2006-01-04</dc:date>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Andreas Nilsson</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:source>http://tango-project.org</dc:source>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>add</rdf:li>
-            <rdf:li>plus</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/publicdomain/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       sodipodi:type="arc"
-       style="opacity:0.10824742;fill:url(#radialGradient2097);fill-opacity:1;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="path1361"
-       sodipodi:cx="22.958872"
-       sodipodi:cy="34.94062"
-       sodipodi:rx="10.31934"
-       sodipodi:ry="2.320194"
-       d="M 33.278212 34.94062 A 10.31934 2.320194 0 1 1  12.639532,34.94062 A 10.31934 2.320194 0 1 1  33.278212 34.94062 z"
-       transform="matrix(1.550487,0,0,1.978714,-12.4813,-32.49103)" />
-    <path
-       style="fill:#75a1d0;fill-opacity:1.0000000;stroke:#3465a4;stroke-width:1.0000004px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000"
-       d="M 27.514356,37.542682 L 27.514356,28.515722 L 37.492820,28.475543 L 37.492820,21.480219 L 27.523285,21.480219 L 27.514356,11.520049 L 20.498082,11.531210 L 20.502546,21.462362 L 10.512920,21.536022 L 10.477206,28.504561 L 20.511475,28.475543 L 20.518171,37.515896 L 27.514356,37.542682 z "
-       id="text1314"
-       sodipodi:nodetypes="ccccccccccccc" />
-    <path
-       style="opacity:0.40860215;fill:url(#linearGradient4975);fill-opacity:1.0000000;stroke:url(#linearGradient7922);stroke-width:1.0000006px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000"
-       d="M 26.498702,36.533920 L 26.498702,27.499738 L 36.501304,27.499738 L 36.494607,22.475309 L 26.507630,22.475309 L 26.507630,12.480335 L 21.512796,12.498193 L 21.521725,22.475309 L 11.495536,22.493166 L 11.468750,27.466256 L 21.533143,27.475185 L 21.519750,36.502670 L 26.498702,36.533920 z "
-       id="path7076"
-       sodipodi:nodetypes="ccccccccccccc" />
-    <path
-       style="fill:#ffffff;fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;opacity:0.31182796"
-       d="M 11.000000,25.000000 C 11.000000,26.937500 36.984375,24.031250 36.984375,24.968750 L 36.984375,21.968750 L 27.000000,22.000000 L 27.000000,12.034772 L 21.000000,12.034772 L 21.000000,22.000000 L 11.000000,22.000000 L 11.000000,25.000000 z "
-       id="path7914"
-       sodipodi:nodetypes="ccccccccc" />
-  </g>
-</svg>
diff --git a/apps/files_pdfviewer/js/pdfjs/web/images/zoom-out.svg b/apps/files_pdfviewer/js/pdfjs/web/images/zoom-out.svg
deleted file mode 100644
index eb13b60e37..0000000000
--- a/apps/files_pdfviewer/js/pdfjs/web/images/zoom-out.svg
+++ /dev/null
@@ -1,425 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48px"
-   height="48px"
-   id="svg6431"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docbase="/home/jimmac/src/cvs/tango-icon-theme/scalable/actions"
-   sodipodi:docname="list-remove.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   viewbox="0 0 48 48">
-  <defs
-     id="defs6433">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 24 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="48 : 24 : 1"
-       inkscape:persp3d-origin="24 : 16 : 1"
-       id="perspective69" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2091">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop2093" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop2095" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2091"
-       id="radialGradient2097"
-       cx="23.070683"
-       cy="35.127438"
-       fx="23.070683"
-       fy="35.127438"
-       r="10.319340"
-       gradientTransform="matrix(0.914812,1.265023e-2,-8.21502e-3,0.213562,2.253914,27.18889)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient7916">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop7918" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.34020618;"
-         offset="1.0000000"
-         id="stop7920" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient8662">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop8664" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop8666" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8662"
-       id="radialGradient1503"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.000000,0.000000,0.000000,0.536723,-1.018989e-13,16.87306)"
-       cx="24.837126"
-       cy="36.421127"
-       fx="24.837126"
-       fy="36.421127"
-       r="15.644737" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2847">
-      <stop
-         style="stop-color:#3465a4;stop-opacity:1;"
-         offset="0"
-         id="stop2849" />
-      <stop
-         style="stop-color:#3465a4;stop-opacity:0;"
-         offset="1"
-         id="stop2851" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2847"
-       id="linearGradient1488"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.000000,0.000000,0.000000,-1.000000,-1.242480,40.08170)"
-       x1="37.128052"
-       y1="29.729605"
-       x2="37.065414"
-       y2="26.194071" />
-    <linearGradient
-       id="linearGradient2831">
-      <stop
-         style="stop-color:#3465a4;stop-opacity:1;"
-         offset="0"
-         id="stop2833" />
-      <stop
-         id="stop2855"
-         offset="0.33333334"
-         style="stop-color:#5b86be;stop-opacity:1;" />
-      <stop
-         style="stop-color:#83a8d8;stop-opacity:0;"
-         offset="1"
-         id="stop2835" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2831"
-       id="linearGradient1486"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-48.30498,-6.043298)"
-       x1="13.478554"
-       y1="10.612206"
-       x2="15.419417"
-       y2="19.115122" />
-    <linearGradient
-       id="linearGradient2380">
-      <stop
-         style="stop-color:#b9cfe7;stop-opacity:1"
-         offset="0"
-         id="stop2382" />
-      <stop
-         style="stop-color:#729fcf;stop-opacity:1"
-         offset="1"
-         id="stop2384" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2682">
-      <stop
-         style="stop-color:#3977c3;stop-opacity:1;"
-         offset="0"
-         id="stop2684" />
-      <stop
-         style="stop-color:#89aedc;stop-opacity:0;"
-         offset="1"
-         id="stop2686" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2682"
-       id="linearGradient2688"
-       x1="36.713837"
-       y1="31.455952"
-       x2="37.124462"
-       y2="24.842253"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-48.77039,-5.765705)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2690">
-      <stop
-         style="stop-color:#c4d7eb;stop-opacity:1;"
-         offset="0"
-         id="stop2692" />
-      <stop
-         style="stop-color:#c4d7eb;stop-opacity:0;"
-         offset="1"
-         id="stop2694" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2690"
-       id="linearGradient2696"
-       x1="32.647972"
-       y1="30.748846"
-       x2="37.124462"
-       y2="24.842253"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-48.77039,-5.765705)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2871">
-      <stop
-         style="stop-color:#3465a4;stop-opacity:1;"
-         offset="0"
-         id="stop2873" />
-      <stop
-         style="stop-color:#3465a4;stop-opacity:1"
-         offset="1"
-         id="stop2875" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2402">
-      <stop
-         style="stop-color:#729fcf;stop-opacity:1;"
-         offset="0"
-         id="stop2404" />
-      <stop
-         style="stop-color:#528ac5;stop-opacity:1;"
-         offset="1"
-         id="stop2406" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2797"
-       id="linearGradient1493"
-       gradientUnits="userSpaceOnUse"
-       x1="5.9649176"
-       y1="26.048164"
-       x2="52.854097"
-       y2="26.048164" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2797">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop2799" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop2801" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2797"
-       id="linearGradient1491"
-       gradientUnits="userSpaceOnUse"
-       x1="5.9649176"
-       y1="26.048164"
-       x2="52.854097"
-       y2="26.048164" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient7179">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop7181" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop7183" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2316">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop2318" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.65979379;"
-         offset="1"
-         id="stop2320" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient1322">
-      <stop
-         id="stop1324"
-         offset="0.0000000"
-         style="stop-color:#729fcf" />
-      <stop
-         id="stop1326"
-         offset="1.0000000"
-         style="stop-color:#5187d6;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1322"
-       id="linearGradient4975"
-       x1="34.892849"
-       y1="36.422989"
-       x2="45.918697"
-       y2="48.547989"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-18.01785,-13.57119)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7179"
-       id="linearGradient7185"
-       x1="13.435029"
-       y1="13.604306"
-       x2="22.374878"
-       y2="23.554308"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7179"
-       id="linearGradient7189"
-       gradientUnits="userSpaceOnUse"
-       x1="13.435029"
-       y1="13.604306"
-       x2="22.374878"
-       y2="23.554308"
-       gradientTransform="matrix(-1.000000,0.000000,0.000000,-1.000000,47.93934,50.02474)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2380"
-       id="linearGradient7180"
-       gradientUnits="userSpaceOnUse"
-       x1="62.513836"
-       y1="36.061237"
-       x2="15.984863"
-       y2="20.60858" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2871"
-       id="linearGradient7182"
-       gradientUnits="userSpaceOnUse"
-       x1="46.834816"
-       y1="45.264122"
-       x2="45.380436"
-       y2="50.939667" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2402"
-       id="linearGradient7184"
-       gradientUnits="userSpaceOnUse"
-       x1="18.935766"
-       y1="23.667896"
-       x2="53.588622"
-       y2="26.649362" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2871"
-       id="linearGradient7186"
-       gradientUnits="userSpaceOnUse"
-       x1="46.834816"
-       y1="45.264122"
-       x2="45.380436"
-       y2="50.939667" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7916"
-       id="linearGradient7922"
-       x1="16.874998"
-       y1="22.851799"
-       x2="27.900846"
-       y2="34.976799"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="0.10980392"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="-123.27226"
-     inkscape:cy="26.474252"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1280"
-     inkscape:window-height="818"
-     inkscape:window-x="0"
-     inkscape:window-y="30"
-     inkscape:showpageshadow="false" />
-  <metadata
-     id="metadata6436">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Remove</dc:title>
-        <dc:date>2006-01-04</dc:date>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Andreas Nilsson</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:source>http://tango-project.org</dc:source>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>remove</rdf:li>
-            <rdf:li>delete</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/publicdomain/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       style="fill:#75a1d0;fill-opacity:1.0000000;stroke:#3465a4;stroke-width:1.0000004px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000"
-       d="M 27.514356,28.359472 L 39.633445,28.475543 L 39.633445,21.480219 L 27.523285,21.480219 L 20.502546,21.462362 L 8.5441705,21.489147 L 8.5084565,28.457686 L 20.511475,28.475543 L 27.514356,28.359472 z "
-       id="text1314"
-       sodipodi:nodetypes="ccccccccc" />
-    <path
-       style="opacity:0.40860215;fill:url(#linearGradient4975);fill-opacity:1.0000000;stroke:url(#linearGradient7922);stroke-width:1.0000006px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000"
-       d="M 38.579429,27.484113 L 38.588357,22.475309 L 9.5267863,22.493166 L 9.5000003,27.466256 L 38.579429,27.484113 z "
-       id="path7076"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:#ffffff;fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;opacity:0.31182796"
-       d="M 9.0000000,25.000000 C 9.0000000,26.937500 39.125000,24.062500 39.125000,25.000000 L 39.125000,22.000000 L 9.0000000,22.000000 L 9.0000000,25.000000 z "
-       id="path7914"
-       sodipodi:nodetypes="ccccc" />
-  </g>
-</svg>
diff --git a/apps/files_pdfviewer/js/pdfview.js b/apps/files_pdfviewer/js/pdfview.js
deleted file mode 100644
index 51f6e169f7..0000000000
--- a/apps/files_pdfviewer/js/pdfview.js
+++ /dev/null
@@ -1,762 +0,0 @@
-/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
-
-/* FROM PDF.JS, ADAPTED */
-
-'use strict';
-
-var kDefaultURL = 'compressed.tracemonkey-pldi-09.pdf';
-var kDefaultScale = 1.25;
-var kDefaultScaleDelta = 1.1;
-var kCacheSize = 20;
-var kCssUnits = 96.0 / 72.0;
-var kScrollbarPadding = 40;
-var kMinScale = 0.25;
-var kMaxScale = 4.0;
-
-
-var Cache = function cacheCache(size) {
-  var data = [];
-  this.push = function cachePush(view) {
-    var i = data.indexOf(view);
-    if (i >= 0)
-      data.splice(i);
-    data.push(view);
-    if (data.length > size)
-      data.shift().update();
-  };
-};
-
-var cache = new Cache(kCacheSize);
-var currentPageNumber = 1;
-
-var PDFView = {
-  active: false,
-  pages: [],
-  thumbnails: [],
-  currentScale: kDefaultScale,
-  initialBookmark: document.location.hash.substring(1),
-
-  setScale: function pdfViewSetScale(val, resetAutoSettings) {
-    var pages = this.pages;
-    for (var i = 0; i < pages.length; i++)
-      pages[i].update(val * kCssUnits);
-
-    if (this.currentScale != val)
-      this.pages[this.page - 1].scrollIntoView();
-    this.currentScale = val;
-
-    var event = document.createEvent('UIEvents');
-    event.initUIEvent('scalechange', false, false, window, 0);
-    event.scale = val;
-    event.resetAutoSettings = resetAutoSettings;
-    window.dispatchEvent(event);
-  },
-
-  parseScale: function pdfViewParseScale(value, resetAutoSettings) {
-    if ('custom' == value)
-      return;
-
-    var scale = parseFloat(value);
-    if (scale) {
-      this.setScale(scale, true);
-      return;
-    }
-
-    var currentPage = this.pages[this.page - 1];
-    var pageWidthScale = ($("#content").width() - kScrollbarPadding) /
-                          currentPage.width / kCssUnits;
-    var pageHeightScale = ($("#content").height() - kScrollbarPadding) /
-                           currentPage.height / kCssUnits;
-    if ('page-width' == value)
-      this.setScale(pageWidthScale, resetAutoSettings);
-    if ('page-height' == value)
-      this.setScale(pageHeightScale, resetAutoSettings);
-    if ('page-fit' == value) {
-      this.setScale(
-        Math.min(pageWidthScale, pageHeightScale), resetAutoSettings);
-    }
-  },
-
-  zoomIn: function pdfViewZoomIn() {
-    var newScale = Math.min(kMaxScale, this.currentScale * kDefaultScaleDelta);
-    this.setScale(newScale, true);
-  },
-
-  zoomOut: function pdfViewZoomOut() {
-    var newScale = Math.max(kMinScale, this.currentScale / kDefaultScaleDelta);
-    this.setScale(newScale, true);
-  },
-
-  set page(val) {
-    var pages = this.pages;
-    var input = document.getElementById('pageNumber');
-    if (!(0 < val && val <= pages.length)) {
-      var event = document.createEvent('UIEvents');
-      event.initUIEvent('pagechange', false, false, window, 0);
-      event.pageNumber = this.page;
-      window.dispatchEvent(event);
-      return;
-    }
-
-    currentPageNumber = val;
-    var event = document.createEvent('UIEvents');
-    event.initUIEvent('pagechange', false, false, window, 0);
-    event.pageNumber = val;
-    window.dispatchEvent(event);
-
-    // checking if the this.page was called from the updateViewarea function:
-    // avoiding the creation of two "set page" method (internal and public)
-    if (updateViewarea.inProgress)
-      return;
-
-    // Avoid scrolling the first page during loading
-    if (this.loading && val == 1)
-      return;
-
-    pages[val - 1].scrollIntoView();
-  },
-
-  get page() {
-    return currentPageNumber;
-  },
-
-  open: function pdfViewOpen(url, scale) {
-    document.title = PDFView.Ptitle;
-    this.url = url;
-    var self = this;
-    PDFJS.getPdf(
-      {
-        url: url,
-        progress: function getPdfProgress(evt) {
-          if (evt.lengthComputable)
-            self.progress(evt.loaded / evt.total);
-        },
-        error: self.error
-      },
-      function getPdfLoad(data) {
-        self.loading = true;
-        self.load(data, scale);
-        self.loading = false;
-      });
-  },
-
-  download: function pdfViewDownload() {
-    window.open(this.url + '#pdfjs.action=download', '_parent');
-  },
-
-  navigateTo: function pdfViewNavigateTo(dest) {
-    if (typeof dest === 'string')
-		if(!this.destinations || ! this.destinations[dest]){
-			return; // invalid destination
-		}
-      dest = this.destinations[dest];
-    if (!(dest instanceof Array))
-      return; // invalid destination
-    // dest array looks like that: <page-ref> </XYZ|FitXXX> <args..>
-    var destRef = dest[0];
-    var pageNumber = destRef instanceof Object ?
-      this.pagesRefMap[destRef.num + ' ' + destRef.gen + ' R'] : (destRef + 1);
-    if (pageNumber) {
-      this.page = pageNumber;
-      var currentPage = this.pages[pageNumber - 1];
-      currentPage.scrollIntoView(dest);
-    }
-  },
-
-  getDestinationHash: function pdfViewGetDestinationHash(dest) {
-    if (typeof dest === 'string')
-      return '#' + escape(dest);
-    if (dest instanceof Array) {
-      var destRef = dest[0]; // see navigateTo method for dest format
-      var pageNumber = destRef instanceof Object ?
-        this.pagesRefMap[destRef.num + ' ' + destRef.gen + ' R'] :
-        (destRef + 1);
-      if (pageNumber) {
-        var pdfOpenParams = '#page=' + pageNumber;
-        if (isName(dest[1], 'XYZ')) {
-          var scale = (dest[4] || this.currentScale);
-          pdfOpenParams += '&zoom=' + (scale * 100);
-          if (dest[2] || dest[3]) {
-            pdfOpenParams += ',' + (dest[2] || 0) + ',' + (dest[3] || 0);
-          }
-        }
-        return pdfOpenParams;
-      }
-    }
-    return '';
-  },
-
-  error: function pdfViewError() {
-    var loadingIndicator = document.getElementById('loading');
-    loadingIndicator.innerHTML = 'Error';
-  },
-
-  progress: function pdfViewProgress(level) {
-    var percent = Math.round(level * 100);
-    var loadingIndicator = document.getElementById('loading');
-    loadingIndicator.innerHTML = 'Loading... ' + percent + '%';
-  },
-
-  load: function pdfViewLoad(data, scale) {
-    var loadingIndicator = document.getElementById('loading');
-    loadingIndicator.setAttribute('hidden', 'true');
-
-    var container = document.getElementById('viewer');
-    while (container.hasChildNodes())
-      container.removeChild(container.lastChild);
-
-    var pdf = new PDFJS.PDFDoc(data);
-    var pagesCount = pdf.numPages;
-    document.getElementById('numPages').innerHTML = pagesCount;
-    document.getElementById('pageNumber').max = pagesCount;
-
-    var pages = this.pages = [];
-    var pagesRefMap = {};
-    var thumbnails = this.thumbnails = [];
-    for (var i = 1; i <= pagesCount; i++) {
-      var page = pdf.getPage(i);
-      pages.push(new PageView(container, page, i, page.width, page.height,
-                              page.stats, this.navigateTo.bind(this)));
-      /*thumbnails.push(new ThumbnailView(sidebar, page, i,
-                                        page.width / page.height));*/
-      var pageRef = page.ref;
-      pagesRefMap[pageRef.num + ' ' + pageRef.gen + ' R'] = i;
-    }
-
-    this.setScale(scale || kDefaultScale, true);
-
-    /*this.pagesRefMap = pagesRefMap;
-    this.destinations = pdf.catalog.destinations;
-    if (pdf.catalog.documentOutline) {
-      this.outline = new DocumentOutlineView(pdf.catalog.documentOutline);
-      var outlineSwitchButton = document.getElementById('outlineSwitch');
-      outlineSwitchButton.removeAttribute('disabled');
-      this.switchSidebarView('outline');
-    }*/
-    this.page = 1;
-
-    /*if (this.initialBookmark) {
-      this.setHash(this.initialBookmark);
-      this.initialBookmark = null;
-    }
-    else
-      this.page = 1;*/
-  },
-
-  setHash: function pdfViewSetHash(hash) {
-    if (!hash)
-      return;
-
-    if (hash.indexOf('=') >= 0) {
-      // parsing query string
-      var paramsPairs = hash.split('&');
-      var params = {};
-      for (var i = 0; i < paramsPairs.length; ++i) {
-        var paramPair = paramsPairs[i].split('=');
-        params[paramPair[0]] = paramPair[1];
-      }
-      // borrowing syntax from "Parameters for Opening PDF Files"
-      if ('nameddest' in params) {
-        PDFView.navigateTo(params.nameddest);
-        return;
-      }
-      if ('page' in params) {
-        var pageNumber = (params.page | 0) || 1;
-        this.page = pageNumber;
-        if ('zoom' in params) {
-          var zoomArgs = params.zoom.split(','); // scale,left,top
-          // building destination array
-          var dest = [null, new Name('XYZ'), (zoomArgs[1] | 0),
-            (zoomArgs[2] | 0), (zoomArgs[0] | 0) / 100];
-          var currentPage = this.pages[pageNumber - 1];
-          currentPage.scrollIntoView(dest);
-        } else
-          this.page = params.page; // simple page
-        return;
-      }
-    } else if (/^\d+$/.test(hash)) // page number
-      this.page = hash;
-    else // named destination
-      PDFView.navigateTo(unescape(hash));
-  },
-
-  /*switchSidebarView: function pdfViewSwitchSidebarView(view) {
-    var thumbsScrollView = document.getElementById('sidebarScrollView');
-    var outlineScrollView = document.getElementById('outlineScrollView');
-    var thumbsSwitchButton = document.getElementById('thumbsSwitch');
-    var outlineSwitchButton = document.getElementById('outlineSwitch');
-    switch (view) {
-      case 'thumbs':
-        thumbsScrollView.removeAttribute('hidden');
-        outlineScrollView.setAttribute('hidden', 'true');
-        thumbsSwitchButton.setAttribute('data-selected', true);
-        outlineSwitchButton.removeAttribute('data-selected');
-        break;
-      case 'outline':
-        thumbsScrollView.setAttribute('hidden', 'true');
-        outlineScrollView.removeAttribute('hidden');
-        thumbsSwitchButton.removeAttribute('data-selected');
-        outlineSwitchButton.setAttribute('data-selected', true);
-        break;
-    }
-  },*/
-
-  getVisiblePages: function pdfViewGetVisiblePages() {
-    var pages = this.pages;
-    var kBottomMargin = 10;
-    var visiblePages = [];
-
-    var currentHeight = kBottomMargin;
-    var windowTop = window.pageYOffset;
-    for (var i = 1; i <= pages.length; ++i) {
-      var page = pages[i - 1];
-      var pageHeight = page.height * page.scale + kBottomMargin;
-      if (currentHeight + pageHeight > windowTop)
-        break;
-
-      currentHeight += pageHeight;
-    }
-
-    var windowBottom = window.pageYOffset + window.innerHeight;
-    for (; i <= pages.length && currentHeight < windowBottom; ++i) {
-      var singlePage = pages[i - 1];
-      visiblePages.push({ id: singlePage.id, y: currentHeight,
-                          view: singlePage });
-      currentHeight += singlePage.height * singlePage.scale + kBottomMargin;
-    }
-    return visiblePages;
-  }
-};
-
-var PageView = function pageView(container, content, id, pageWidth, pageHeight,
-                                 stats, navigateTo) {
-  this.id = id;
-  this.content = content;
-
-  var view = this.content.view;
-  this.x = view.x;
-  this.y = view.y;
-  this.width = view.width;
-  this.height = view.height;
-
-  var anchor = document.createElement('a');
-  anchor.name = '' + this.id;
-
-  var div = document.createElement('div');
-  div.id = 'pageContainer' + this.id;
-  div.className = 'page';
-
-  container.appendChild(anchor);
-  container.appendChild(div);
-
-  this.update = function pageViewUpdate(scale) {
-    this.scale = scale || this.scale;
-    div.style.width = (this.width * this.scale) + 'px';
-    
-    div.style.height = (this.height * this.scale) + 'px';
-
-    var container = document.getElementById('viewer');
-    container.style.left = (document.getElementById("content").offsetWidth-(this.width))/2 + 'px';
-
-    while (div.hasChildNodes())
-      div.removeChild(div.lastChild);
-    div.removeAttribute('data-loaded');
-  };
-
-  function setupLinks(content, scale) {
-    function bindLink(link, dest) {
-      link.href = PDFView.getDestinationHash(dest);
-      link.onclick = function pageViewSetupLinksOnclick() {
-        if (dest)
-          PDFView.navigateTo(dest);
-        return false;
-      };
-    }
-
-    var links = content.getLinks();
-    for (var i = 0; i < links.length; i++) {
-      var link = document.createElement('a');
-      link.style.left = (Math.floor(links[i].x - view.x) * scale) + 'px';
-      link.style.top = (Math.floor(links[i].y - view.y) * scale) + 'px';
-      link.style.width = Math.ceil(links[i].width * scale) + 'px';
-      link.style.height = Math.ceil(links[i].height * scale) + 'px';
-      link.href = links[i].url || '';
-      if (!links[i].url)
-        bindLink(link, ('dest' in links[i]) ? links[i].dest : null);
-      div.appendChild(link);
-    }
-  }
-
-  this.getPagePoint = function pageViewGetPagePoint(x, y) {
-    var scale = PDFView.currentScale;
-    return this.content.rotatePoint(x / scale, y / scale);
-  };
-
-  this.scrollIntoView = function pageViewScrollIntoView(dest) {
-      if (!dest) {
-        div.scrollIntoView(true);
-        return;
-      }
-
-      var x = 0, y = 0;
-      var width = 0, height = 0, widthScale, heightScale;
-      var scale = 0;
-      switch (dest[1].name) {
-        case 'XYZ':
-          x = dest[2];
-          y = dest[3];
-          scale = dest[4];
-          break;
-        case 'Fit':
-        case 'FitB':
-          scale = 'page-fit';
-          break;
-        case 'FitH':
-        case 'FitBH':
-          y = dest[2];
-          scale = 'page-width';
-          break;
-        case 'FitV':
-        case 'FitBV':
-          x = dest[2];
-          scale = 'page-height';
-          break;
-        case 'FitR':
-          x = dest[2];
-          y = dest[3];
-          width = dest[4] - x;
-          height = dest[5] - y;
-          widthScale = (window.innerWidth - kScrollbarPadding) /
-            width / kCssUnits;
-          heightScale = (window.innerHeight - kScrollbarPadding) /
-            height / kCssUnits;
-          scale = Math.min(widthScale, heightScale);
-          break;
-        default:
-          return;
-      }
-
-      var boundingRect = [
-        this.content.rotatePoint(x, y),
-        this.content.rotatePoint(x + width, y + height)
-      ];
-
-      if (scale && scale !== PDFView.currentScale)
-        PDFView.setScale(scale, true);
-
-      setTimeout(function pageViewScrollIntoViewRelayout() {
-        // letting page to re-layout before scrolling
-        var scale = PDFView.currentScale;
-        var x = Math.min(boundingRect[0].x, boundingRect[1].x);
-        var y = Math.min(boundingRect[0].y, boundingRect[1].y);
-        var width = Math.abs(boundingRect[0].x - boundingRect[1].x);
-        var height = Math.abs(boundingRect[0].y - boundingRect[1].y);
-
-        // using temporary div to scroll it into view
-        var tempDiv = document.createElement('div');
-        tempDiv.style.position = 'absolute';
-        tempDiv.style.left = Math.floor(x * scale) + 'px';
-        tempDiv.style.top = Math.floor(y * scale) + 'px';
-        tempDiv.style.width = Math.ceil(width * scale) + 'px';
-        tempDiv.style.height = Math.ceil(height * scale) + 'px';
-        div.appendChild(tempDiv);
-        tempDiv.scrollIntoView(true);
-        div.removeChild(tempDiv);
-      }, 0);
-  };
-
-  this.draw = function pageviewDraw() {
-    if (div.hasChildNodes()) {
-      this.updateStats();
-      return false;
-    }
-
-    var canvas = document.createElement('canvas');
-    canvas.id = 'page' + this.id;
-    canvas.mozOpaque = true;
-    div.appendChild(canvas);
-
-    var scale = this.scale;
-    canvas.width = pageWidth * scale;
-    canvas.height = pageHeight * scale;
-
-    var ctx = canvas.getContext('2d');
-    ctx.save();
-    ctx.fillStyle = 'rgb(255, 255, 255)';
-    ctx.fillRect(0, 0, canvas.width, canvas.height);
-    ctx.restore();
-    ctx.translate(-this.x * scale, -this.y * scale);
-
-    stats.begin = Date.now();
-    this.content.startRendering(ctx, this.updateStats);
-
-    setupLinks(this.content, this.scale);
-    div.setAttribute('data-loaded', true);
-
-    return true;
-  };
-
-  this.updateStats = function pageViewUpdateStats() {
-    var t1 = stats.compile, t2 = stats.fonts, t3 = stats.render;
-    var str = 'Time to compile/fonts/render: ' +
-              (t1 - stats.begin) + '/' + (t2 - t1) + '/' + (t3 - t2) + ' ms';
-  };
-};
-
-var ThumbnailView = function thumbnailView(container, page, id, pageRatio) {
-  var anchor = document.createElement('a');
-  anchor.href = '#' + id;
-  anchor.onclick = function stopNivigation() {
-    PDFView.page = id;
-    return false;
-  };
-
-  var div = document.createElement('div');
-  div.id = 'thumbnailContainer' + id;
-  div.className = 'thumbnail';
-
-  anchor.appendChild(div);
-  container.appendChild(anchor);
-
-  this.draw = function thumbnailViewDraw() {
-    if (div.hasChildNodes())
-      return;
-
-    var canvas = document.createElement('canvas');
-    canvas.id = 'thumbnail' + id;
-    canvas.mozOpaque = true;
-
-    var maxThumbSize = 134;
-    canvas.width = pageRatio >= 1 ? maxThumbSize :
-      maxThumbSize * pageRatio;
-    canvas.height = pageRatio <= 1 ? maxThumbSize :
-      maxThumbSize / pageRatio;
-
-    div.setAttribute('data-loaded', true);
-    div.appendChild(canvas);
-
-    var ctx = canvas.getContext('2d');
-    ctx.save();
-    ctx.fillStyle = 'rgb(255, 255, 255)';
-    ctx.fillRect(0, 0, canvas.width, canvas.height);
-    ctx.restore();
-
-    var view = page.view;
-    var scaleX = (canvas.width / page.width);
-    var scaleY = (canvas.height / page.height);
-    ctx.translate(-view.x * scaleX, -view.y * scaleY);
-    div.style.width = (view.width * scaleX) + 'px';
-    div.style.height = (view.height * scaleY) + 'px';
-    div.style.lineHeight = (view.height * scaleY) + 'px';
-
-    page.startRendering(ctx, function thumbnailViewDrawStartRendering() {});
-  };
-};
-
-var DocumentOutlineView = function documentOutlineView(outline) {
-  var outlineView = document.getElementById('outlineView');
-
-  function bindItemLink(domObj, item) {
-    domObj.href = PDFView.getDestinationHash(item.dest);
-    domObj.onclick = function documentOutlineViewOnclick(e) {
-      PDFView.navigateTo(item.dest);
-      return false;
-    };
-  }
-
-  var queue = [{parent: outlineView, items: outline}];
-  while (queue.length > 0) {
-    var levelData = queue.shift();
-    var i, n = levelData.items.length;
-    for (i = 0; i < n; i++) {
-      var item = levelData.items[i];
-      var div = document.createElement('div');
-      div.className = 'outlineItem';
-      var a = document.createElement('a');
-      bindItemLink(a, item);
-      a.textContent = item.title;
-      div.appendChild(a);
-
-      if (item.items.length > 0) {
-        var itemsDiv = document.createElement('div');
-        itemsDiv.className = 'outlineItems';
-        div.appendChild(itemsDiv);
-        queue.push({parent: itemsDiv, items: item.items});
-      }
-
-      levelData.parent.appendChild(div);
-    }
-  }
-};
-
-function webViewerLoad(url) {
-  var scale = kDefaultScale;
-  PDFView.open(url, parseFloat(PDFView.parseScale(scale)));
-
-  if (!window.File || !window.FileReader || !window.FileList || !window.Blob)
-    document.getElementById('fileInput').setAttribute('hidden', 'true');
-  else
-    document.getElementById('fileInput').value = null;
-}
-
-window.addEventListener('unload', function webViewerUnload(evt) {
-  window.scrollTo(0, 0);
-}, true);
-
-function updateViewarea() {
-  var visiblePages = PDFView.getVisiblePages();
-  for (var i = 0; i < visiblePages.length; i++) {
-    var page = visiblePages[i];
-    if (PDFView.pages[page.id - 1].draw())
-      cache.push(page.view);
-  }
-
-  if (!visiblePages.length)
-    return;
-
-  updateViewarea.inProgress = true; // used in "set page"
-  var currentId = PDFView.page;
-  var firstPage = visiblePages[0];
-  PDFView.page = firstPage.id;
-  updateViewarea.inProgress = false;
-
-  var kViewerTopMargin = 52;
-  var pageNumber = firstPage.id;
-  var pdfOpenParams = '#page=' + pageNumber;
-  pdfOpenParams += '&zoom=' + Math.round(PDFView.currentScale * 100);
-  var currentPage = PDFView.pages[pageNumber - 1];
-  var topLeft = currentPage.getPagePoint(window.pageXOffset,
-    window.pageYOffset - firstPage.y - kViewerTopMargin);
-  pdfOpenParams += ',' + Math.round(topLeft.x) + ',' + Math.round(topLeft.y);
-}
-
-window.addEventListener('scroll', function webViewerScroll(evt) {
-	if(!PDFView.active){
-		return;
-	}
-  updateViewarea();
-}, true);
-
-window.addEventListener('resize', function webViewerResize(evt) {
-	if(!PDFView.active){
-		return;
-	}
-  if (document.getElementById('pageWidthOption').selected ||
-      document.getElementById('pageFitOption').selected)
-      PDFView.parseScale(document.getElementById('scaleSelect').value);
-  updateViewarea();
-});
-
-window.addEventListener('hashchange', function webViewerHashchange(evt) {
-	if(!PDFView.active){
-		return;
-	}
-  PDFView.setHash(document.location.hash.substring(1));
-});
-
-window.addEventListener('change', function webViewerChange(evt) {
-	if(!PDFView.active){
-		return;
-	}
-  var files = evt.target.files;
-  if (!files || files.length == 0)
-    return;
-
-  // Read the local file into a Uint8Array.
-  var fileReader = new FileReader();
-  fileReader.onload = function webViewerChangeFileReaderOnload(evt) {
-    var data = evt.target.result;
-    var buffer = new ArrayBuffer(data.length);
-    var uint8Array = new Uint8Array(buffer);
-
-    for (var i = 0; i < data.length; i++)
-      uint8Array[i] = data.charCodeAt(i);
-    PDFView.load(uint8Array);
-  };
-
-  // Read as a binary string since "readAsArrayBuffer" is not yet
-  // implemented in Firefox.
-  var file = files[0];
-  fileReader.readAsBinaryString(file);
-
-  document.title = PDFView.Ptitle;
-
-  // URL does not reflect proper document location - hiding some icons.
-  document.getElementById('download').setAttribute('hidden', 'true');
-}, true);
-
-window.addEventListener('scalechange', function scalechange(evt) {
-	if(!PDFView.active){
-		return;
-	}
-  var customScaleOption = document.getElementById('customScaleOption');
-  customScaleOption.selected = false;
-
-  if (!evt.resetAutoSettings &&
-       (document.getElementById('pageWidthOption').selected ||
-        document.getElementById('pageFitOption').selected)) {
-      updateViewarea();
-      return;
-  }
-
-  var options = document.getElementById('scaleSelect').options;
-  var predefinedValueFound = false;
-  var value = '' + evt.scale;
-  for (var i = 0; i < options.length; i++) {
-    var option = options[i];
-    if (option.value != value) {
-      option.selected = false;
-      continue;
-    }
-    option.selected = true;
-    predefinedValueFound = true;
-  }
-
-  if (!predefinedValueFound) {
-    customScaleOption.textContent = Math.round(evt.scale * 10000) / 100 + '%';
-    customScaleOption.selected = true;
-  }
-
-  updateViewarea();
-}, true);
-
-window.addEventListener('pagechange', function pagechange(evt) {
-	if(!PDFView.active){
-		return;
-	}
-  var page = evt.pageNumber;
-  if (document.getElementById('pageNumber').value != page)
-    document.getElementById('pageNumber').value = page;
-  document.getElementById('previous').disabled = (page <= 1);
-  document.getElementById('next').disabled = (page >= PDFView.pages.length);
-}, true);
-
-window.addEventListener('keydown', function keydown(evt) {
-	if(!PDFView.active){
-		return;
-	}
-  var curElement = document.activeElement;
-  var controlsElement = document.getElementById('controls2');
-  while (curElement) {
-    if (curElement === controlsElement)
-      return; // ignoring if the 'controls' element is focused
-    curElement = curElement.parentNode;
-  }
-  switch (evt.keyCode) {
-    case 61: // FF/Mac '='
-    case 107: // FF '+' and '='
-    case 187: // Chrome '+'
-      PDFView.zoomIn();
-      break;
-    case 109: // FF '-'
-    case 189: // Chrome '-'
-      PDFView.zoomOut();
-      break;
-    case 48: // '0'
-      PDFView.setScale(kDefaultScale, true);
-      break;
-  }
-});
-
-
diff --git a/apps/files_pdfviewer/js/viewer.js b/apps/files_pdfviewer/js/viewer.js
deleted file mode 100644
index 29db2ea7f2..0000000000
--- a/apps/files_pdfviewer/js/viewer.js
+++ /dev/null
@@ -1,50 +0,0 @@
-function hidePDFviewer() {
-	showPDFviewer.shown = false;
-	$('table').show();
-	$('#controls').html(showPDFviewer.oldcode);
-	$("#viewer").remove();
-	$("#loading").remove()
-	$("#editor").show();
-	document.title = showPDFviewer.lastTitle;
-	PDFView.active=false;
-	$('iframe').remove();
-}
-
-function showPDFviewer(dir,filename){
-	if(!showPDFviewer.shown){
-		$("#editor").hide();
-		var url = OC.filePath('files','ajax','download.php')+encodeURIComponent('?files='+encodeURIComponent(filename)+"&dir="+encodeURIComponent(dir));
-		$('table').hide();
-		function im(path) { return OC.filePath('files_pdfviewer','js','pdfjs/web/images/'+path); }
-		showPDFviewer.oldcode = $("#controls").html();
-		$("#controls").empty();
-		$("#controls").html('<button id="previous" onclick="PDFView.page--;" oncontextmenu="return false;"><img src="'+im('go-up.svg')+'" align="top" height="10"/>Previous</button><button id="next" onclick="PDFView.page++;" oncontextmenu="return false;"><img src="'+im('go-down.svg')+'" align="top" height="10"/>Next</button><div class="separator"></div><input style="width:25px;" type="number" id="pageNumber" onchange="PDFView.page = this.value;" value="1" size="4" min="1" /><span>/</span><span id="numPages">--</span><div class="separator"></div><button id="zoomOut" title="Zoom Out" onclick="PDFView.zoomOut();" oncontextmenu="return false;"><img src="'+im('zoom-out.svg')+'" align="top" height="10"/></button><button id="zoomIn" title="Zoom In" onclick="PDFView.zoomIn();" oncontextmenu="return false;"><img src="'+im('zoom-in.svg')+
-			'" align="top" height="10"/></button><div class="separator"></div><select id="scaleSelect" onchange="PDFView.parseScale(this.value);" oncontextmenu="return false;"><option id="customScaleOption" value="custom"></option><option value="0.5">50%</option><option value="0.75">75%</option><option value="1">100%</option><option value="1.25" selected="selected">125%</option><option value="1.5">150%</option><option value="2">200%</option><option id="pageWidthOption" value="page-width">Page Width</option><option id="pageFitOption" value="page-fit">Page Fit</option></select><div class="separator"></div><button id="print" onclick="window.print();" oncontextmenu="return false;"><img src="'+im('document-print.svg')+'" align="top" height="10"/>Print</button><button id="download" title="Download" onclick="PDFView.download();" oncontextmenu="return false;">'+
-			'<img src="'+im('download.svg')+'" align="top" height="10"/>Download</button><button id="close" title="Close viewer" onclick="hidePDFviewer();" oncontextmenu="return false;">x</button><span id="info">--</span></div>');
-		var oldcontent = $("#content").html();
-		$("#content").html(oldcontent+'<div id="loading">Loading... 0%</div><div id="viewer"></div>');
-		showPDFviewer.lastTitle = document.title;
-		PDFView.Ptitle = filename;
-		PDFView.open(url,1.00);
-		PDFView.active=true;
-		$("#pageWidthOption").attr("selected","selected");
-		showPDFviewer.shown = true;
-	}
-}
-showPDFviewer.shown=false;
-showPDFviewer.oldCode='';
-showPDFviewer.lastTitle='';
-
-$(document).ready(function(){
-	if(!$.browser.msie){//doesnt work on IE
-		if(location.href.indexOf("files")!=-1) {
-			PDFJS.workerSrc = OC.filePath('files_pdfviewer','js','pdfjs/build/pdf.js');
-			if(typeof FileActions!=='undefined'){
-				FileActions.register('application/pdf','Edit', FileActions.PERMISSION_READ, '',function(filename){
-					showPDFviewer($('#dir').val(),filename);
-				});
-				FileActions.setDefault('application/pdf','Edit');
-			}
-		}
-	}
-});
diff --git a/apps/files_sharing/ajax/togglesharewitheveryone.php b/apps/files_sharing/ajax/togglesharewitheveryone.php
deleted file mode 100644
index 96c43711cb..0000000000
--- a/apps/files_sharing/ajax/togglesharewitheveryone.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-OCP\JSON::callCheck();
-
-OCP\JSON::checkAppEnabled('files_sharing');
-OCP\JSON::checkAdminUser();
-if ($_POST['allowSharingWithEveryone'] == true) {
-	OCP\Config::setAppValue('files_sharing', 'allowSharingWithEveryone', 'yes');
-} else {
-	OCP\Config::setAppValue('files_sharing', 'allowSharingWithEveryone', 'no');
-}
\ No newline at end of file
diff --git a/apps/files_sharing/appinfo/database.xml b/apps/files_sharing/appinfo/database.xml
deleted file mode 100644
index c5cb632d4f..0000000000
--- a/apps/files_sharing/appinfo/database.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<database>
-	 <name>*dbname*</name>
-	 <create>true</create>
-	 <overwrite>false</overwrite>
-	 <charset>utf8</charset>
-	 <table>
-		<name>*dbprefix*sharing</name>
-		<declaration>
-			<field>
-				<name>uid_owner</name>
-				<type>text</type>
-				<notnull>true</notnull>
-				<length>64</length>
-			</field>
-			<field>
-				<name>uid_shared_with</name>
-				<type>text</type>
-				<notnull>true</notnull>
-				<length>64</length>
-			</field>
-			<field>
-				<name>source</name>
-				<type>text</type>
-				<notnull>true</notnull>
-				<length>128</length>
-			</field>
-			<field>
-				<name>target</name>
-				<type>text</type>
-				<notnull>true</notnull>
-				<length>128</length>
-			</field>
-			<field>
-				<name>permissions</name>
-				<type>integer</type>
-				<notnull>true</notnull>
-				<length>1</length>
-			 </field>
-		</declaration>
-	</table>
-</database>
diff --git a/apps/files_sharing/appinfo/info.xml b/apps/files_sharing/appinfo/info.xml
index e31d3299f5..6a8fc89ada 100644
--- a/apps/files_sharing/appinfo/info.xml
+++ b/apps/files_sharing/appinfo/info.xml
@@ -12,7 +12,7 @@
 		<filesystem/>
 	</types>
 	<public>
-		<files>get.php</files>
-		<webdav>get.php</webdav>
+		<files>public.php</files>
+		<webdav>public.php</webdav>
 	</public>
 </info>
diff --git a/apps/files_sharing/appinfo/update.php b/apps/files_sharing/appinfo/update.php
index b43269d69f..feafa5fb99 100644
--- a/apps/files_sharing/appinfo/update.php
+++ b/apps/files_sharing/appinfo/update.php
@@ -4,13 +4,13 @@
 $datadir = \OCP\Config::getSystemValue('datadirectory');
 $currentVersion=OC_Appconfig::getValue('files_sharing', 'installed_version');
 if (version_compare($currentVersion, '0.2.2', '<')) {
-	if ($handle = opendir($datadir)) {
-		while (false !== ($entry = readdir($handle))) {
-			$sharedFolder = $datadir.'/'.$entry.'/files/Shared';
-			if ($entry != "." && $entry != ".." && is_dir($sharedFolder)) {
-				touch($sharedFolder);
-			}
-		}
-		closedir($handle);
+	if ($handle = opendir($datadir)) {
+		while (false !== ($entry = readdir($handle))) {
+			$sharedFolder = $datadir.'/'.$entry.'/files/Shared';
+			if ($entry != "." && $entry != ".." && is_dir($sharedFolder)) {
+				touch($sharedFolder);
+			}
+		}
+		closedir($handle);
 	}
 }
\ No newline at end of file
diff --git a/apps/files_sharing/appinfo/version b/apps/files_sharing/appinfo/version
index f4778493c5..a2268e2de4 100644
--- a/apps/files_sharing/appinfo/version
+++ b/apps/files_sharing/appinfo/version
@@ -1 +1 @@
-0.2.2
\ No newline at end of file
+0.3.1
\ No newline at end of file
diff --git a/apps/files_sharing/css/public.css b/apps/files_sharing/css/public.css
new file mode 100644
index 0000000000..f38afae3dd
--- /dev/null
+++ b/apps/files_sharing/css/public.css
@@ -0,0 +1,7 @@
+body { background:#ddd; }
+#header { position:fixed; top:0; left:0; right:0; z-index:100; height:2.5em; line-height:2.5em; padding:.5em; background:#1d2d44; -moz-box-shadow:0 0 10px rgba(0, 0, 0, .5), inset 0 -2px 10px #222; -webkit-box-shadow:0 0 10px rgba(0, 0, 0, .5), inset 0 -2px 10px #222; box-shadow:0 0 10px rgba(0, 0, 0, .5), inset 0 -2px 10px #222; }
+#details { color:#fff; }
+#download { margin-left:2em; font-weight:bold; color:#fff; }
+#preview { min-height:30em; margin:50px auto; border-bottom:1px solid #f8f8f8; background:#eee; text-align:center; }
+p.info { width:22em; text-align: center; margin:2em auto; color:#777; text-shadow:#fff 0 1px 0; }
+p.info a { font-weight:bold; color:#777; }
\ No newline at end of file
diff --git a/apps/files_sharing/get.php b/apps/files_sharing/get.php
deleted file mode 100644
index bcbe5985fb..0000000000
--- a/apps/files_sharing/get.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-// only need authentication apps
-$RUNTIME_APPTYPES=array('authentication');
-OC_App::loadApps($RUNTIME_APPTYPES);
-
-OCP\JSON::checkAppEnabled('files_sharing');
-//FIXME lib_share / OC_Share no longer exists
-require_once 'lib_share.php';
-
-//get the path of the shared file
-if (isset($_GET['token']) && $source = OC_Share::getSource($_GET['token'])) {
-	$token = $_GET['token'];
-	// TODO Manipulating the string may not be the best choice. Is there an alternative?
-	$user = substr($source, 1, strpos($source, "/", 1) - 1);
-	OC_Util::setupFS($user);
-	$source = substr($source, strlen("/".$user."/files"));
-	$subPath = isset( $_GET['path'] ) ? $_GET['path'] : '';
-	$root = $source;
-	$source .= $subPath;
-	if (!OC_Filesystem::file_exists($source)) {
-		header("HTTP/1.0 404 Not Found");
-		$tmpl = new OCP\Template("", "404", "guest");
-		$tmpl->assign("file", $subPath);
-		$tmpl->printPage();
-		exit;
-	}
-	if (OC_Filesystem::is_dir($source)) {
-		$files = array();
-		$rootLength = strlen($root);
-		foreach (OC_Files::getdirectorycontent($source) as $i) {
-			$i['date'] = OCP\Util::formatDate($i['mtime'] );
-			if ($i['type'] == 'file') {
-				$fileinfo = pathinfo($i['name']);
-				$i['basename'] = $fileinfo['filename'];
-				$i['extension'] = isset($fileinfo['extension']) ? ('.'.$fileinfo['extension']) : '';
-			}
-			$i['directory'] = substr($i['directory'], $rootLength);
-			if ($i['directory'] == "/") {
-				$i['directory'] = "";
-			}
-			$files[] = $i;
-		}
-		// Make breadcrumb
-		$breadcrumb = array();
-		$pathtohere = "";
-		foreach (explode("/", $subPath) as $i) {
-			if ($i != "") {
-				$pathtohere .= "/$i";
-				$breadcrumb[] = array("dir" => $pathtohere, "name" => $i);
-			}
-		}
-		// Load the files we need
-		OCP\Util::addStyle("files", "files");
-		$breadcrumbNav = new OCP\Template("files", "part.breadcrumb", "");
-		$breadcrumbNav->assign("breadcrumb", $breadcrumb);
-		$breadcrumbNav->assign("baseURL", OCP\Util::linkTo("", "public.php")."?service=files&token=".$token."&path=");
-		$list = new OCP\Template("files", "part.list", "");
-		$list->assign("files", $files);
-		$list->assign("baseURL", OCP\Util::linkTo("", "public.php")."?service=files&token=".$token."&path=");
-		$list->assign("downloadURL", OCP\Util::linkTo("", "public.php")."?service=files&token=".$token."&path=");
-		$list->assign("readonly", true);
-		$tmpl = new OCP\Template("files", "index", "user");
-		$tmpl->assign("fileList", $list->fetchPage(), false);
-		$tmpl->assign("breadcrumb", $breadcrumbNav->fetchPage());
-		$tmpl->assign("readonly", true);
-		$tmpl->assign("allowZipDownload", false);
-		$tmpl->assign("dir", 'shared dir');
-		$tmpl->printPage();
-	} else {
-		//get time mimetype and set the headers
-		$mimetype = OC_Filesystem::getMimeType($source);
-		header("Content-Transfer-Encoding: binary");
-		OCP\Response::disableCaching();
-		header('Content-Disposition: attachment; filename="'.basename($source).'"');
-		header("Content-Type: " . $mimetype);
-		header("Content-Length: " . OC_Filesystem::filesize($source));
-		//download the file
-		@ob_clean();
-		//FIXME OC_Share no longer exists
-		OCP\Util::emitHook('OC_Share', 'public-download', array('source'=>$source, 'token'=>$token));
-		OC_Filesystem::readfile($source);
-	}
-} else {
-	header("HTTP/1.0 404 Not Found");
-	$tmpl = new OCP\Template("", "404", "guest");
-	$tmpl->printPage();
-	die();
-}
diff --git a/apps/files_sharing/js/public.js b/apps/files_sharing/js/public.js
new file mode 100644
index 0000000000..755382e073
--- /dev/null
+++ b/apps/files_sharing/js/public.js
@@ -0,0 +1,18 @@
+// Override download path to files_sharing/public.php
+function fileDownloadPath(dir, file) {
+	return $('#downloadURL').val();
+}
+
+$(document).ready(function() {
+
+	if (typeof FileActions !== 'undefined') {
+		var mimetype = $('#mimetype').val();
+		// Show file preview if previewer is available, images are already handled by the template
+		if (mimetype.substr(0, mimetype.indexOf('/')) != 'image') {
+			// Trigger default action if not download TODO
+			var action = FileActions.getDefault(mimetype, 'file', FileActions.PERMISSION_READ);
+			action($('#filename').val());
+		}
+	}
+
+});
\ No newline at end of file
diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js
index 8754b16b06..79ab4adeba 100644
--- a/apps/files_sharing/js/share.js
+++ b/apps/files_sharing/js/share.js
@@ -1,6 +1,6 @@
 $(document).ready(function() {
 
-	if (typeof FileActions !== 'undefined') {
+	if (typeof OC.Share !== 'undefined' && typeof FileActions !== 'undefined') {
 		OC.Share.loadIcons('file');
 		FileActions.register('all', 'Share', FileActions.PERMISSION_READ, function(filename) {
 			// Return the correct sharing icon
diff --git a/apps/files_sharing/l10n/eu.php b/apps/files_sharing/l10n/eu.php
new file mode 100644
index 0000000000..916c3151dc
--- /dev/null
+++ b/apps/files_sharing/l10n/eu.php
@@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Size" => "Tamaina",
+"Modified" => "Aldatuta",
+"Delete all" => "Ezabatu dena",
+"Delete" => "Ezabatu"
+);
diff --git a/apps/files_sharing/l10n/hu_HU.php b/apps/files_sharing/l10n/hu_HU.php
new file mode 100644
index 0000000000..881b5afd81
--- /dev/null
+++ b/apps/files_sharing/l10n/hu_HU.php
@@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Size" => "Méret",
+"Modified" => "Módosítva",
+"Delete all" => "Összes törlése",
+"Delete" => "Törlés"
+);
diff --git a/apps/files_sharing/l10n/sl.php b/apps/files_sharing/l10n/sl.php
index 485ab7a85a..a241c6e504 100644
--- a/apps/files_sharing/l10n/sl.php
+++ b/apps/files_sharing/l10n/sl.php
@@ -2,5 +2,5 @@
 "Size" => "Velikost",
 "Modified" => "Spremenjeno",
 "Delete all" => "Izbriši vse",
-"Delete" => "Izbris"
+"Delete" => "Izbriši"
 );
diff --git a/apps/files_sharing/lib/share/file.php b/apps/files_sharing/lib/share/file.php
index 5005d9a39d..b1e3ca8b48 100644
--- a/apps/files_sharing/lib/share/file.php
+++ b/apps/files_sharing/lib/share/file.php
@@ -27,7 +27,7 @@ class OC_Share_Backend_File implements OCP\Share_Backend_File_Dependent {
 	const FORMAT_OPENDIR = 3;
 
 	private $path;
-	
+
 	public function isValidSource($itemSource, $uidOwner) {
 		$path = OC_FileCache::getPath($itemSource, $uidOwner);
 		if (OC_Filesystem::file_exists($path)) {
@@ -94,7 +94,7 @@ class OC_Share_Backend_File implements OCP\Share_Backend_File_Dependent {
 				$files[] = basename($item['file_target']);
 			}
 			return $files;
-		} 
+		}
 		return array();
 	}
 
diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php
index 527cec0afe..6a2905b52c 100644
--- a/apps/files_sharing/lib/sharedstorage.php
+++ b/apps/files_sharing/lib/sharedstorage.php
@@ -24,10 +24,10 @@
  * Convert target path to source path and pass the function call to the correct storage provider
  */
 class OC_Filestorage_Shared extends OC_Filestorage_Common {
-	
+
 	private $sharedFolder;
 	private $files = array();
-	
+
 	public function __construct($arguments) {
 		$this->sharedFolder = $arguments['sharedFolder'];
 	}
@@ -77,6 +77,8 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 	private function getSourcePath($target) {
 		$file = $this->getFile($target);
 		if (isset($file['path'])) {
+			$uid = substr($file['path'], 1, strpos($file['path'], '/', 1) - 1);
+			OC_Filesystem::mount('OC_Filestorage_Local', array('datadir' => OC_User::getHome($uid)), $uid);
 			return $file['path'];
 		}
 		return false;
@@ -105,17 +107,17 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 		$internalPath = substr($path, strlen($mountPoint));
 		return $internalPath;
 	}
-	
+
 	public function mkdir($path) {
 		if ($path == '' || $path == '/' || !$this->isCreatable(dirname($path))) {
-			return false; 
+			return false;
 		} else if ($source = $this->getSourcePath($path)) {
 			$storage = OC_Filesystem::getStorage($source);
 			return $storage->mkdir($this->getInternalPath($source));
 		}
 		return false;
 	}
-	
+
 	public function rmdir($path) {
 		if (($source = $this->getSourcePath($path)) && $this->isDeletable($path)) {
 			$storage = OC_Filesystem::getStorage($source);
@@ -123,7 +125,7 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 		}
 		return false;
 	}
-	
+
 	public function opendir($path) {
 		if ($path == '' || $path == '/') {
 			$files = OCP\Share::getItemsSharedWith('file', OC_Share_Backend_Folder::FORMAT_OPENDIR);
@@ -228,10 +230,10 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 		}
 		return false;
 	}
-	
+
 	public function filectime($path) {
 		if ($path == '' || $path == '/') {
-			$ctime = 0; 
+			$ctime = 0;
 			if ($dh = $this->opendir($path)) {
 				while (($filename = readdir($dh)) !== false) {
 					$tempctime = $this->filectime($filename);
@@ -249,10 +251,10 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 			}
 		}
 	}
-	
+
 	public function filemtime($path) {
 		if ($path == '' || $path == '/') {
-			$mtime = 0; 
+			$mtime = 0;
 			if ($dh = $this->opendir($path)) {
 				while (($filename = readdir($dh)) !== false) {
 					$tempmtime = $this->filemtime($filename);
@@ -270,7 +272,7 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 			}
 		}
 	}
-	
+
 	public function file_get_contents($path) {
 		$source = $this->getSourcePath($path);
 		if ($source) {
@@ -283,7 +285,7 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 			return $storage->file_get_contents($this->getInternalPath($source));
 		}
 	}
-	
+
 	public function file_put_contents($path, $data) {
 		if ($source = $this->getSourcePath($path)) {
 			// Check if permission is granted
@@ -301,7 +303,7 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 		}
 		return false;
 	}
-	
+
 	public function unlink($path) {
 		// Delete the file if DELETE permission is granted
 		if (($source = $this->getSourcePath($path)) && $this->isDeletable($path)) {
@@ -310,7 +312,7 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 		}
 		return false;
 	}
-	
+
 	public function rename($path1, $path2) {
 		// Renaming/moving is only allowed within shared folders
 		$pos1 = strpos($path1, '/', 1);
@@ -343,7 +345,7 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 		}
 		return false;
 	}
-	
+
 	public function copy($path1, $path2) {
 		// Copy the file if CREATE permission is granted
 		if ($this->isCreatable(dirname($path2))) {
diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php
new file mode 100644
index 0000000000..7f72ef81bd
--- /dev/null
+++ b/apps/files_sharing/public.php
@@ -0,0 +1,75 @@
+<?php
+// Load other apps for file previews
+OC_App::loadApps();
+if (isset($_GET['file'])) {
+	$pos = strpos($_GET['file'], '/', 1);
+	$uidOwner = substr($_GET['file'], 1, $pos - 1);
+	if (OCP\User::userExists($uidOwner)) {
+		OC_Util::setupFS($uidOwner);
+		$file = substr($_GET['file'], $pos);
+		$fileSource = OC_Filecache::getId($_GET['file'], '');
+		if ($linkItem = OCP\Share::getItemSharedWithByLink('file', $fileSource, $uidOwner)) {
+			if (isset($linkItem['share_with'])) {
+				// Check password
+				if (isset($_POST['password'])) {
+					$password = $_POST['password'];
+					$storedHash = $linkItem['share_with'];
+					$forcePortable = (CRYPT_BLOWFISH != 1);
+					$hasher = new PasswordHash(8, $forcePortable);
+					if (!($hasher->CheckPassword($password.OC_Config::getValue('passwordsalt', ''), $storedHash))) {
+						$tmpl = new OCP\Template('files_sharing', 'authenticate', 'guest');
+						$tmpl->assign('URL', OCP\Util::linkToPublic('files').'&file='.$_GET['file']);
+						$tmpl->assign('error', true);
+						$tmpl->printPage();
+						exit();
+					} else {
+						// Save item id in session for future requests
+						$_SESSION['public_link_authenticated'] = $linkItem['id'];
+					}
+				// Check if item id is set in session
+				} else if (!isset($_SESSION['public_link_authenticated']) || $_SESSION['public_link_authenticated'] !== $linkItem['id']) {
+					// Prompt for password
+					$tmpl = new OCP\Template('files_sharing', 'authenticate', 'guest');
+					$tmpl->assign('URL', OCP\Util::linkToPublic('files').'&file='.$_GET['file']);
+					$tmpl->printPage();
+					exit();
+				}
+			}
+			$path = $linkItem['path'];
+			// Download the file
+			if (isset($_GET['download'])) {
+				$mimetype = OC_Filesystem::getMimeType($path);
+				header('Content-Transfer-Encoding: binary');
+				header('Content-Disposition: attachment; filename="'.basename($path).'"');
+				header('Content-Type: '.$mimetype);
+				header('Content-Length: '.OC_Filesystem::filesize($path));
+				OCP\Response::disableCaching();
+				@ob_clean();
+				OC_Filesystem::readfile($path);
+			} else {
+				OCP\Util::addStyle('files_sharing', 'public');
+				OCP\Util::addScript('files_sharing', 'public');
+				OCP\Util::addScript('files', 'fileactions');
+				$tmpl = new OCP\Template('files_sharing', 'public', 'base');
+				$tmpl->assign('details', $uidOwner.' shared the file '.basename($path).' with you');
+				$tmpl->assign('owner', $uidOwner);
+				$tmpl->assign('name', basename($path));
+				// Show file list
+				if (OC_Filesystem::is_dir($path)) {
+					// TODO
+				} else {
+					// Show file preview if viewer is available
+					$tmpl->assign('dir', dirname($path));
+					$tmpl->assign('filename', basename($path));
+					$tmpl->assign('mimetype', OC_Filesystem::getMimeType($path));
+					$tmpl->assign('downloadURL', OCP\Util::linkToPublic('files').'&file='.$_GET['file'].'&download');
+				}
+				$tmpl->printPage();
+			}
+			exit();
+		}
+	}
+}
+header('HTTP/1.0 404 Not Found');
+$tmpl = new OCP\Template('', '404', 'guest');
+$tmpl->printPage();
diff --git a/apps/files_sharing/templates/authenticate.php b/apps/files_sharing/templates/authenticate.php
new file mode 100644
index 0000000000..9695caebf1
--- /dev/null
+++ b/apps/files_sharing/templates/authenticate.php
@@ -0,0 +1,9 @@
+<form action="<?php echo $_['URL']; ?>" method="post">
+	<fieldset>
+		<p>
+			<label for="password" class="infield"><?php echo $l->t('Password'); ?></label>
+			<input type="password" name="password" id="password" value="" />
+			<input type="submit" value="<?php echo $l->t('Submit'); ?>" />
+		</p>
+	</fieldset>
+</form>
\ No newline at end of file
diff --git a/apps/files_sharing/templates/get.php b/apps/files_sharing/templates/get.php
deleted file mode 100755
index 57275f07a3..0000000000
--- a/apps/files_sharing/templates/get.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<table>
-	<thead>
-		<tr>
-			<th id="headerSize"><?php echo $l->t( 'Size' ); ?></th>
-			<th id="headerDate"><span id="modified"><?php echo $l->t( 'Modified' ); ?></span><span class="selectedActions"><a href="" class="delete"><?php echo $l->t('Delete all')?> <img class="svg" alt="<?php echo $l->t('Delete')?>" src="<?php echo OCP\image_path("core", "actions/delete.svg"); ?>" /></a></span></th>
-		</tr>
-	</thead>
-	<tbody id="fileList" data-readonly="<?php echo $_['readonly'];?>">
-		<?php echo($_['fileList']); ?>
-	</tbody>
-</table>
\ No newline at end of file
diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php
new file mode 100755
index 0000000000..36e159dafe
--- /dev/null
+++ b/apps/files_sharing/templates/public.php
@@ -0,0 +1,17 @@
+<input type="hidden" name="dir" value="<?php echo $_['dir'] ?>" id="dir">
+<input type="hidden" name="downloadURL" value="<?php echo $_['downloadURL'] ?>" id="downloadURL">
+<input type="hidden" name="filename" value="<?php echo $_['filename'] ?>" id="filename">
+<input type="hidden" name="mimetype" value="<?php echo $_['mimetype'] ?>" id="mimetype">
+<header><div id="header">
+	<a href="<?php echo link_to('', 'index.php'); ?>" title="" id="owncloud"><img class="svg" src="<?php echo image_path('', 'logo-wide.svg'); ?>" alt="ownCloud" /></a>
+	<div class="header-right">
+		<span id="details"><?php echo $_['details']; ?></span>
+		<a href="<?php echo $_['downloadURL']; ?>" id="download"><img class="svg" alt="Download" src="<?php echo OCP\image_path("core", "actions/download.svg"); ?>" /><?php echo $l->t('Download')?></a>
+	</div>
+</div></header>
+<div id="preview">
+	<?php if (substr($_['mimetype'], 0 , strpos($_['mimetype'], '/')) == 'image'): ?>
+		<img src="<?php echo $_['downloadURL']; ?>" />
+	<?php endif; ?>
+</div>
+<footer><p class="info"><a href="http://owncloud.org/">ownCloud</a> &ndash; <?php echo $l->t('web services under your control'); ?></p></footer>
\ No newline at end of file
diff --git a/apps/files_sharing_log/appinfo/app.php b/apps/files_sharing_log/appinfo/app.php
deleted file mode 100644
index 23cae61fbf..0000000000
--- a/apps/files_sharing_log/appinfo/app.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Bart Visscher <bartv@thisnet.nl>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-OC::$CLASSPATH['OC_Files_Sharing_Log'] = 'apps/files_sharing_log/log.php';
-
-$l=new OC_L10N('files_sharing_log');
-OCP\App::addNavigationEntry( array(
-  'id' => 'files_sharing_log_index',
-  'order' => 5,
-  'href' => OCP\Util::linkTo( 'files_sharing_log', 'index.php' ),
-  'icon' => OCP\Util::imagePath( 'files_sharing_log', 'icon.png' ),
-  'name' => $l->t('Shared files log'))
-);
-
-OCP\Util::connectHook('OC_Filestorage_Shared', 'fopen', 'OC_Files_Sharing_Log', 'fopen');
-OCP\Util::connectHook('OC_Filestorage_Shared', 'file_get_contents', 'OC_Files_Sharing_Log', 'file_get_contents');
-OCP\Util::connectHook('OC_Filestorage_Shared', 'file_put_contents', 'OC_Files_Sharing_Log', 'file_put_contents');
diff --git a/apps/files_sharing_log/appinfo/database.xml b/apps/files_sharing_log/appinfo/database.xml
deleted file mode 100644
index dae811f87f..0000000000
--- a/apps/files_sharing_log/appinfo/database.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<database>
-	 <name>*dbname*</name>
-	 <create>true</create>
-	 <overwrite>false</overwrite>
-	 <charset>utf8</charset>
-	 <table>
-		<name>*dbprefix*sharing_log</name>
-		<declaration>
-			<field>
-				<name>user_id</name>
-				<type>text</type>
-				<notnull>true</notnull>
-				<length>64</length>
-			</field>
-			<field>
-				<name>source</name>
-				<type>text</type>
-				<notnull>true</notnull>
-				<length>128</length>
-			</field>
-			<field>
-				<name>uid_who</name>
-				<type>text</type>
-				<notnull>true</notnull>
-				<length>64</length>
-			</field>
-			<field>
-				<name>when</name>
-				<type>integer</type>
-				<default></default>
-				<notnull>false</notnull>
-				<unsigned>true</unsigned>
-				<length>4</length>
-			</field>
-			<field>
-				<name>mode</name>
-				<type>text</type>
-				<notnull>true</notnull>
-				<length>4</length>
-			</field>
-		</declaration>
-	</table>
-</database>
diff --git a/apps/files_sharing_log/appinfo/info.xml b/apps/files_sharing_log/appinfo/info.xml
deleted file mode 100644
index d5e3283df3..0000000000
--- a/apps/files_sharing_log/appinfo/info.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<info>
-	<id>files_sharing_log</id>
-	<name>File Shared access logging app</name>
-	<description>Log access to shared files</description>
-	<licence>AGPL</licence>
-	<author>Bart Visscher</author>
-	<require>4</require>
-	<shipped>true</shipped>
-</info>
diff --git a/apps/files_sharing_log/appinfo/version b/apps/files_sharing_log/appinfo/version
deleted file mode 100644
index 49d59571fb..0000000000
--- a/apps/files_sharing_log/appinfo/version
+++ /dev/null
@@ -1 +0,0 @@
-0.1
diff --git a/apps/files_sharing_log/css/style.css b/apps/files_sharing_log/css/style.css
deleted file mode 100644
index 069d3a45e0..0000000000
--- a/apps/files_sharing_log/css/style.css
+++ /dev/null
@@ -1,7 +0,0 @@
-#files_sharing_log {
-padding: 2em;
-}
-#files_sharing_log th,
-#files_sharing_log td {
-padding: 0 1em;
-}
diff --git a/apps/files_sharing_log/index.php b/apps/files_sharing_log/index.php
deleted file mode 100644
index 8d05e3fbd0..0000000000
--- a/apps/files_sharing_log/index.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Bart Visscher <bartv@thisnet.nl>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-OCP\User::checkLoggedIn();
-OCP\App::checkAppEnabled('files_sharing_log');
-
-OCP\App::setActiveNavigationEntry('files_sharing_log_index');
-
-OCP\Util::addStyle('files_sharing_log', 'style');
-
-$query = OCP\DB::prepare('SELECT * FROM `*PREFIX*sharing_log` WHERE `user_id` = ?');
-$log = $query->execute(array(OCP\User::getUser()))->fetchAll();
-
-$output = new OCP\Template('files_sharing_log', 'index', 'user');
-$output->assign('log', $log);
-$output->printPage();
diff --git a/apps/files_sharing_log/log.php b/apps/files_sharing_log/log.php
deleted file mode 100644
index a032d635ac..0000000000
--- a/apps/files_sharing_log/log.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-class OC_Files_Sharing_Log {
-	static public function fopen($arguments) {
-		$target = $arguments['target'];
-		$source = $arguments['source'];
-		$mode = $arguments['mode'];
-		self::log($target, $source, $mode);
-	}
-
-	static public function file_get_contents($arguments) {
-		$target = $arguments['target'];
-		$source = $arguments['source'];
-		$mode = 'get';
-		self::log($target, $source, $mode);
-	}
-
-	static public function file_put_contents($arguments) {
-		$target = $arguments['target'];
-		$source = $arguments['source'];
-		$mode = 'put';
-		self::log($target, $source, $mode);
-	}
-
-	static public function log($target, $source, $mode) {
-		$query = OCP\DB::prepare('SELECT * FROM `*PREFIX*sharing` WHERE `source` = ? AND `target` = ?');
-		$info = $query->execute(array($source, $target))->fetchAll();
-		$info = $info[0];
-		//var_dump($info);
-		$query = OCP\DB::prepare('INSERT INTO `*PREFIX*sharing_log` VALUES (?,?,?,?,?)');
-		$query->execute(array($info['uid_owner'], $source, OCP\User::getUser(), time(), $mode));
-		//die;
-	}
-}
diff --git a/apps/files_sharing_log/templates/index.php b/apps/files_sharing_log/templates/index.php
deleted file mode 100644
index 55bfc1d6a3..0000000000
--- a/apps/files_sharing_log/templates/index.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<table id="files_sharing_log">
-	<thead>
-		<tr>
-			<th><?php echo $l->t('File') ?></th>
-			<th><?php echo $l->t('Who') ?></th>
-			<th><?php echo $l->t('When') ?></th>
-			<th><?php echo $l->t('What') ?></th>
-		</tr>
-	</thead>
-	<tbody>
-		<?php foreach($_['log'] as $log): ?>
-		<tr>
-			<td>
-			<?php echo $log['source'] ?>
-			</td>
-			<td>
-			<?php echo $log['uid_who'] ?>
-			</td>
-			<td>
-			<?php echo date('Y-m-d H:i:s', $log['when']) ?>
-			</td>
-			<td>
-			<?php switch ($log['mode']):
-				case 'get':
-					echo $l->t('Read');
-					break;
-				case 'put':
-					echo $l->t('Write');
-					break;
-				default:
-					if (strpos('r', $log['mode']) !== false):
-						echo $l->t('Read');
-					else:
-						echo $l->t('Write');
-					endif;
-			      endswitch;
-			?>
-			</td>
-		</tr>
-		<?php endforeach; ?>
-	</tbody>
-</table>
diff --git a/apps/files_texteditor/ajax/loadfile.php b/apps/files_texteditor/ajax/loadfile.php
deleted file mode 100644
index 5a5affa46b..0000000000
--- a/apps/files_texteditor/ajax/loadfile.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/**
- * ownCloud - files_texteditor
- *
- * @author Tom Needham
- * @copyright 2011 Tom Needham contact@tomneedham.com
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *
- * You should have received a copy of the GNU Affero General Public
- * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-// Init owncloud
- 
-
-
-// Check if we are a user
-OCP\JSON::checkLoggedIn();
-
-// Set the session key for the file we are about to edit.
-$dir = isset($_GET['dir']) ? $_GET['dir'] : '';
-$filename = isset($_GET['file']) ? $_GET['file'] : '';
-if(!empty($filename))
-{	
-	$path = $dir.'/'.$filename;
-	if(OC_Filesystem::is_writable($path))
-	{
-		$mtime = OC_Filesystem::filemtime($path);
-		$filecontents = OC_Filesystem::file_get_contents($path);
-		OCP\JSON::success(array('data' => array('filecontents' => $filecontents, 'write' => 'true', 'mtime' => $mtime)));
-	}
-	else
-	{
-		$mtime = OC_Filesystem::filemtime($path);
-		$filecontents = OC_Filesystem::file_get_contents($path);
-		$filecontents = iconv(mb_detect_encoding($filecontents), "UTF-8", $filecontents);
-		OCP\JSON::success(array('data' => array('filecontents' => $filecontents, 'write' => 'false', 'mtime' => $mtime)));	
-	}	
-} else {
-	OCP\JSON::error(array('data' => array( 'message' => 'Invalid file path supplied.')));	
-}
\ No newline at end of file
diff --git a/apps/files_texteditor/ajax/mtime.php b/apps/files_texteditor/ajax/mtime.php
deleted file mode 100644
index ee683722ad..0000000000
--- a/apps/files_texteditor/ajax/mtime.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/**
- * ownCloud - files_texteditor
- *
- * @author Tom Needham
- * @copyright 2011 Tom Needham contact@tomneedham.com
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *
- * You should have received a copy of the GNU Affero General Public
- * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-// Init owncloud
- 
-
-
-// Check if we are a user
-OCP\JSON::checkLoggedIn();
-
-// Get the path from GET
-$path = isset($_GEt['path']) ? $_GET['path'] : '';
-
-if($path != '')
-{
-	// Find the mtime
-	$mtime = OC_Filesystem::filemtime($path);
-	if($mtime)
-	{
-		OCP\JSON::success(array('data' => array('path' => $path, 'mtime' => $mtime)));
-	}
-	else
-	{
-		OCP\JSON::error();
-	}	
-}
-else
-{
-	OCP\JSON::error();	
-}
\ No newline at end of file
diff --git a/apps/files_texteditor/ajax/savefile.php b/apps/files_texteditor/ajax/savefile.php
deleted file mode 100644
index f3ac323e32..0000000000
--- a/apps/files_texteditor/ajax/savefile.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-/**
- * ownCloud - files_texteditor
- *
- * @author Tom Needham
- * @copyright 2011 Tom Needham contact@tomneedham.com
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *
- * You should have received a copy of the GNU Affero General Public
- * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-// Init owncloud
- 
-
-
-// Check if we are a user
-OCP\JSON::checkLoggedIn();
-OCP\JSON::callCheck();
-
-// Get paramteres
-$filecontents = isset($_POST['filecontents']) ? $_POST['filecontents'] : false;
-$path = isset($_POST['path']) ? $_POST['path'] : '';
-$mtime = isset($_POST['mtime']) ? $_POST['mtime'] : '';
-
-if($path != '' && $mtime != '' && $filecontents)
-{
-	// Get file mtime
-	$filemtime = OC_Filesystem::filemtime($path);
-	if($mtime != $filemtime)
-	{
-		// Then the file has changed since opening
-		OCP\JSON::error();
-		OCP\Util::writeLog('files_texteditor',"File: ".$path." modified since opening.",OCP\Util::ERROR);	
-	}
-	else
-	{
-		// File same as when opened
-		// Save file
-		if(OC_Filesystem::is_writable($path))
-		{
-			$filecontents = iconv(mb_detect_encoding($filecontents), "UTF-8", $filecontents);
-			OC_Filesystem::file_put_contents($path, $filecontents);
-			// Clear statcache
-			clearstatcache();
-			// Get new mtime
-			$newmtime = OC_Filesystem::filemtime($path);
-			OCP\JSON::success(array('data' => array('mtime' => $newmtime)));
-		}
-		else
-		{
-			// Not writeable!
-			OCP\JSON::error(array('data' => array( 'message' => 'Insufficient permissions')));	
-			OCP\Util::writeLog('files_texteditor',"User does not have permission to write to file: ".$path,OCP\Util::ERROR);
-		}
-	}
-} else if($path == ''){
-	OCP\JSON::error(array('data' => array( 'message' => 'File path not supplied')));
-	OCP\Util::writeLog('files_texteditor','No file path supplied', OCP\Util::ERROR);
-} else if($mtime == ''){
-	OCP\JSON::error(array('data' => array( 'message' => 'File mtime not supplied')));
-	OCP\Util::writeLog('files_texteditor','No file mtime supplied' ,OCP\Util::ERROR);
-} else if(!$filecontents){
-	OCP\JSON::error(array('data' => array( 'message' => 'File contents not supplied')));
-	OCP\Util::writeLog('files_texteditor','The file contents was not supplied',OCP\Util::ERROR);	
-}
diff --git a/apps/files_texteditor/appinfo/app.php b/apps/files_texteditor/appinfo/app.php
deleted file mode 100644
index 1f9773bca3..0000000000
--- a/apps/files_texteditor/appinfo/app.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-//load the required files
-OCP\Util::addStyle( 'files_texteditor', 'DroidSansMono/stylesheet' );
-OCP\Util::addStyle( 'files_texteditor', 'style' );
-OCP\Util::addscript( 'files_texteditor', 'editor');
-OCP\Util::addscript( 'files_texteditor', 'aceeditor/ace');
diff --git a/apps/files_texteditor/appinfo/info.xml b/apps/files_texteditor/appinfo/info.xml
deleted file mode 100644
index e3c6615e04..0000000000
--- a/apps/files_texteditor/appinfo/info.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?> 
-<info>
-	<id>files_texteditor</id>
-	<name>Text Editor</name>
-	<description>Simple plain text editor based on Ace editor.</description>
-	<licence>AGPL</licence>
-	<author>Tom Needham</author>
-	<require>4</require>
-	<shipped>true</shipped>
-	<default_enable/>
-</info>
diff --git a/apps/files_texteditor/appinfo/version b/apps/files_texteditor/appinfo/version
deleted file mode 100644
index 1d71ef9744..0000000000
--- a/apps/files_texteditor/appinfo/version
+++ /dev/null
@@ -1 +0,0 @@
-0.3
\ No newline at end of file
diff --git a/apps/files_texteditor/css/DroidSansMono/DroidSansMono-webfont.eot b/apps/files_texteditor/css/DroidSansMono/DroidSansMono-webfont.eot
deleted file mode 100644
index bc2d524aa7..0000000000
Binary files a/apps/files_texteditor/css/DroidSansMono/DroidSansMono-webfont.eot and /dev/null differ
diff --git a/apps/files_texteditor/css/DroidSansMono/DroidSansMono-webfont.svg b/apps/files_texteditor/css/DroidSansMono/DroidSansMono-webfont.svg
deleted file mode 100644
index 4ca5fc20dc..0000000000
--- a/apps/files_texteditor/css/DroidSansMono/DroidSansMono-webfont.svg
+++ /dev/null
@@ -1,630 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
-<svg xmlns="http://www.w3.org/2000/svg">
-<metadata>
-This is a custom SVG webfont generated by Font Squirrel.
-Copyright   : Digitized data copyright  2006 Google Corporation
-Foundry     : Ascender Corporation
-Foundry URL : httpwwwascendercorpcom
-</metadata>
-<defs>
-<font id="webfontq63XZdUr" horiz-adv-x="1228" >
-<font-face units-per-em="2048" ascent="1638" descent="-410" />
-<missing-glyph horiz-adv-x="500" />
-<glyph unicode=" " />
-<glyph unicode="!" d="M487 110.5q0 139.5 127 139.5t127 -139.5t-127 -139.5t-127 139.5zM504 1462h223l-51 -1048h-121z" />
-<glyph unicode="&#x22;" d="M285 1462h237l-41 -528h-155zM707 1462h237l-41 -528h-155z" />
-<glyph unicode="#" d="M45 428v137h244l65 328h-233v137h258l82 432h147l-82 -432h293l84 432h144l-84 -432h221v-137h-248l-64 -328h240v-137h-266l-82 -428h-148l84 428h-290l-82 -428h-144l78 428h-217zM436 565h291l64 328h-291z" />
-<glyph unicode="$" d="M182 172v172q197 -92 365 -92v434q-197 66 -271 145q-78 84 -77 220q0 131 92 217q90 84 256 106v180h137v-176q182 -8 336 -78l-66 -145q-143 63 -270 72v-422q199 -68 279 -148q82 -82 81 -211q0 -281 -360 -335v-230h-137v221q-228 0 -365 70zM375 1049q0 -76 41 -121 q41 -43 131 -74v369q-172 -27 -172 -174zM684 262q184 28 184 184q0 127 -184 189v-373z" />
-<glyph unicode="%" d="M0 1133q0 164 80 256q78 90 215 90q131 0 211 -92.5t80 -253.5q0 -166 -78 -256q-80 -92 -217 -93q-131 0 -211 95q-80 96 -80 254zM152 1133q0 -229 141 -230q139 0 139 230q0 225 -139 225q-141 0 -141 -225zM170 0l729 1462h158l-729 -1462h-158zM643 330 q0 164 80 256q78 90 215 90q131 0 211 -92t80 -254q0 -164 -78 -254q-82 -94 -217 -94q-131 0 -211 94q-80 96 -80 254zM795 330q0 -229 141 -230q139 0 139 230q0 225 -139 225q-141 0 -141 -225z" />
-<glyph unicode="&#x26;" d="M61 381q0 133 64 229q63 98 235 199q-164 193 -163 356q0 147 96 233.5t274 86.5q168 0 260.5 -86t92.5 -234q0 -203 -318 -389l281 -348q70 119 104 266h184q-53 -236 -178 -403l234 -291h-217l-131 166q-174 -186 -412 -186q-190 0 -297 106q-109 109 -109 295z M252 387q0 -104 67 -176q68 -70 160 -70q162 0 299 146l-323 401q-203 -123 -203 -301zM375 1165q0 -117 133 -268q133 80 184 139q49 57 49 133q0 72 -49 119q-51 47 -131 47q-86 0 -137 -45q-49 -43 -49 -125z" />
-<glyph unicode="'" d="M496 1462h237l-41 -528h-155z" />
-<glyph unicode="(" d="M295 567q0 532 444 895h193q-449 -375 -449 -893q0 -522 447 -893h-191q-444 352 -444 891z" />
-<glyph unicode=")" d="M297 1462h192q444 -362 445 -895q0 -541 -445 -891h-190q446 373 446 893q1 518 -448 893z" />
-<glyph unicode="*" d="M133 1081l29 193l391 -111l-43 393h205l-43 -393l397 111l27 -193l-379 -28l246 -326l-179 -96l-176 358l-157 -358l-185 96l242 326z" />
-<glyph unicode="+" d="M152 647v150h387v389h149v-389h387v-150h-387v-385h-149v385h-387z" />
-<glyph unicode="," d="M440 -289q76 322 111 551h219l16 -24q-59 -229 -194 -527h-152z" />
-<glyph unicode="-" d="M285 465v168h659v-168h-659z" />
-<glyph unicode="." d="M463 135q0 166 151.5 166t151.5 -166t-151.5 -166t-151.5 166z" />
-<glyph unicode="/" d="M211 0l627 1462h178l-627 -1462h-178z" />
-<glyph unicode="0" d="M147 733q0 752 465 752q231 0 350 -192.5t119 -559.5q0 -754 -469 -753q-231 0 -348 194q-117 193 -117 559zM332 733q0 -317 67 -459q68 -139 213 -139q147 0 215 141q70 145 70 457q0 309 -70 455q-68 141 -215 141q-145 0 -213 -139q-67 -138 -67 -457z" />
-<glyph unicode="1" d="M225 1163l383 299h150v-1462h-176v913q0 147 8 361q-43 -47 -121 -113l-147 -121z" />
-<glyph unicode="2" d="M158 0v156l350 381q201 219 258 317q61 104 61 231q0 115 -63 179q-66 66 -172 65q-162 0 -318 -137l-102 119q190 172 422 172q197 0 305 -107q113 -109 113 -284q0 -115 -59.5 -244t-290.5 -375l-281 -299v-8h688v-166h-911z" />
-<glyph unicode="3" d="M131 59v170q186 -96 383 -96q354 0 354 289q0 258 -381 258h-133v151h133q160 0 248 76t88 201q0 104 -67 162q-70 59 -183 59q-176 0 -344 -121l-92 125q186 150 436 150q205 0 322 -99q115 -96 115 -264q0 -141 -82 -231q-86 -94 -234 -119v-6q360 -45 361 -348 q0 -203 -137 -320q-138 -117 -400 -116q-243 -1 -387 79z" />
-<glyph unicode="4" d="M61 328v159l664 983h188v-976h213v-166h-213v-328h-176v328h-676zM240 494h497v356q0 178 13 432h-9q-41 -111 -90 -180z" />
-<glyph unicode="5" d="M172 59v172q145 -96 360 -96q336 0 336 314q0 295 -344 294q-78 0 -231 -26l-90 57l55 688h690v-166h-532l-39 -419q102 20 209 20q209 0 340 -115q129 -114 129 -313q0 -233 -137 -363q-135 -127 -390 -126q-224 -1 -356 79z" />
-<glyph unicode="6" d="M154 625q0 858 639 858q104 0 172 -19v-155q-71 25 -166 24q-221 0 -336 -141t-123 -447h12q96 170 307 170q195 0 306 -118q111 -120 110 -326q0 -227 -121 -360q-119 -131 -323 -131q-219 0 -348 170t-129 475zM336 506q0 -150 82 -262q80 -111 211 -111q129 0 198 88 q72 90 72 250q0 147 -68 223q-68 78 -196 78q-125 0 -213 -82q-86 -80 -86 -184z" />
-<glyph unicode="7" d="M143 1296v166h940v-145l-555 -1317h-194l563 1296h-754z" />
-<glyph unicode="8" d="M156 373q0 258 282 393q-236 150 -235 369q0 160 116 256q115 94 295 94q184 0 297 -94q115 -96 115 -258q0 -229 -262 -359q309 -160 309 -393q0 -180 -127 -291q-126 -111 -332 -110q-217 0 -337.5 104.5t-120.5 288.5zM334 371q0 -240 276 -240q135 0 211 66 q74 66 74 182q0 90 -63.5 159.5t-213.5 143.5l-30 14q-254 -118 -254 -325zM381 1126q0 -92 49 -153q47 -57 186 -125q231 104 232 278q0 102 -64 154q-66 53 -172 53q-104 0 -167.5 -53.5t-63.5 -153.5z" />
-<glyph unicode="9" d="M154 991q0 227 120 361q119 131 324 131q221 0 348 -170q129 -172 129 -475q0 -858 -639 -858q-104 0 -172 18v156q68 -25 166 -25q221 0 336 141.5t123 446.5h-12q-96 -170 -308 -170q-193 0 -305 119q-110 116 -110 325zM330 991q0 -143 69 -223q68 -78 195 -78 q129 0 213 82q86 84 86 184q0 152 -80 262.5t-213 110.5q-127 0 -198.5 -88t-71.5 -250z" />
-<glyph unicode=":" d="M487 110.5q0 139.5 127 139.5t127 -139.5t-127 -139.5t-127 139.5zM487 987q0 139 127 139t127 -139t-127 -139t-127 139z" />
-<glyph unicode=";" d="M410 -264q66 276 100 502h199l14 -23q-55 -209 -176 -479h-137zM494 987q0 139 127 139t127 -139t-127 -139t-127 139z" />
-<glyph unicode="&#x3c;" d="M152 672v102l923 451v-160l-715 -342l715 -342v-160z" />
-<glyph unicode="=" d="M152 442v150h923v-150h-923zM152 852v149h923v-149h-923z" />
-<glyph unicode="&#x3e;" d="M152 221v160l714 342l-714 342v160l923 -451v-102z" />
-<glyph unicode="?" d="M168 1386q205 96 426 97q217 0 340 -97q125 -98 125 -262q0 -133 -53 -217q-52 -83 -197 -190q-119 -88 -151.5 -141.5t-32.5 -143.5v-18h-160v37q0 119 47 194.5t160 157.5q131 100 172 155.5t41 157.5q0 92 -74 150q-72 57 -207 57q-172 0 -371 -90zM426 110.5 q0 139.5 127 139.5t127 -139.5t-127 -139.5t-127 139.5z" />
-<glyph unicode="@" d="M31 602q0 395 168 629q166 231 454 231q248 0 396 -196q150 -199 149 -535q0 -236 -63 -371q-66 -139 -179 -139q-131 0 -157 180h-4q-74 -180 -230 -180q-120 0 -190 105q-70 102 -70 280q0 209 96 332q98 127 256 127q133 0 256 -47l-22 -416q-2 -25 -2 -70v-6 q0 -176 72 -176q100 0 100 383q0 279 -110.5 436.5t-299.5 157.5q-225 0 -352 -192.5t-127 -526.5q0 -311 129 -483q127 -170 369 -170q178 0 346 78v-133q-156 -82 -352 -82q-295 0 -465 207q-168 204 -168 577zM465 602q0 -252 127 -252q131 0 145 312l15 253 q-53 20 -103 21q-90 0 -137 -94.5t-47 -239.5z" />
-<glyph unicode="A" d="M33 0l483 1468h195l485 -1468h-192l-144 453h-491l-146 -453h-190zM422 618h385l-133 424q-39 121 -62 226q-20 -88 -47 -183z" />
-<glyph unicode="B" d="M135 0v1462h440q272 0 398 -88q123 -86 123 -282q0 -129 -78 -213t-213 -103v-10q332 -55 332 -342q0 -199 -127 -311.5t-348 -112.5h-527zM322 158h307q311 0 311 274q0 254 -324 254h-294v-528zM322 842h284q157 0 228 55q72 55 71 182q0 121 -75.5 172.5t-243.5 51.5 h-264v-461z" />
-<glyph unicode="C" d="M129 733q0 344 178 547t490 203q219 0 383 -86l-78 -156q-156 78 -305 78q-215 0 -342 -158q-129 -160 -129 -430q0 -287 120 -438q119 -150 351 -150q135 0 327 58v-162q-150 -59 -358 -59q-310 0 -473 196q-164 199 -164 557z" />
-<glyph unicode="D" d="M135 0v1462h342q319 0 494 -188q176 -193 176 -529q0 -365 -182 -552q-186 -193 -529 -193h-301zM322 160h96q532 0 532 579q0 563 -493 564h-135v-1143z" />
-<glyph unicode="E" d="M217 0v1462h842v-164h-656v-452h617v-162h-617v-520h656v-164h-842z" />
-<glyph unicode="F" d="M244 0v1462h841v-164h-655v-516h617v-164h-617v-618h-186z" />
-<glyph unicode="G" d="M117 733q0 352 161.5 551t446.5 199q193 0 346 -86l-72 -162q-150 84 -280 84q-193 0 -299.5 -155.5t-106.5 -432.5q0 -588 394 -588q94 0 202 29v436h-237v164h422v-717q-199 -76 -420 -75q-262 0 -410 200q-147 200 -147 553z" />
-<glyph unicode="H" d="M135 0v1462h187v-616h585v616h187v-1462h-187v682h-585v-682h-187z" />
-<glyph unicode="I" d="M225 0v123l295 20v1176l-295 20v123h776v-123l-294 -20v-1176l294 -20v-123h-776z" />
-<glyph unicode="J" d="M137 39v166q162 -61 309 -62q162 0 254.5 80t92.5 226v1013h186v-1011q0 -215 -141 -345q-139 -127 -377 -126q-215 0 -324 59z" />
-<glyph unicode="K" d="M211 0v1462h186v-731l121 168l453 563h209l-521 -637l539 -825h-211l-450 698l-140 -114v-584h-186z" />
-<glyph unicode="L" d="M233 0v1462h187v-1296h635v-166h-822z" />
-<glyph unicode="M" d="M113 0v1462h247l248 -1192h6l250 1192h252v-1462h-153v887q0 121 14 391h-8l-283 -1278h-154l-278 1280h-8q18 -268 18 -406v-874h-151z" />
-<glyph unicode="N" d="M135 0v1462h213l578 -1204h6q-14 285 -14 404v800h174v-1462h-215l-580 1210h-8q18 -276 18 -417v-793h-172z" />
-<glyph unicode="O" d="M84 735q0 750 534 750q258 0 392 -195q137 -199 137 -557q0 -362 -137 -557q-138 -197 -394 -196q-532 -1 -532 755zM281 733q0 -590 335 -590q174 0 254 145.5t80 444.5q0 305 -82 445q-84 143 -250 143q-337 0 -337 -588z" />
-<glyph unicode="P" d="M176 0v1462h404q514 0 514 -428q0 -219 -137.5 -342t-403.5 -123h-191v-569h-186zM362 727h170q195 0 283 72q86 70 86 225q0 279 -338 279h-201v-576z" />
-<glyph unicode="Q" d="M84 735q0 750 534 750q258 0 392 -195q137 -199 137 -557q0 -526 -285 -694q86 -180 279 -311l-121 -142q-238 172 -328 400q-37 -6 -76 -6q-532 -1 -532 755zM281 733q0 -590 335 -590q174 0 254 145.5t80 444.5q0 305 -82 445q-84 143 -250 143q-337 0 -337 -588z" />
-<glyph unicode="R" d="M186 0v1462h357q520 0 520 -415q0 -287 -289 -392l397 -655h-219l-350 604h-229v-604h-187zM373 762h164q170 0 251.5 65.5t81.5 210.5q0 141 -79.5 203t-258.5 62h-159v-541z" />
-<glyph unicode="S" d="M141 49v178q211 -86 414 -86q350 0 350 240q0 104 -71 160q-74 57 -285 133q-211 74 -299 174q-90 102 -90 264q0 174 129 272.5t352 98.5q225 0 416 -78l-64 -164q-197 78 -360 78q-293 0 -293 -209q0 -102 66 -164q66 -63 270 -133q244 -88 327.5 -182t83.5 -240 q0 -190 -139 -301q-138 -111 -393 -110q-258 -1 -414 69z" />
-<glyph unicode="T" d="M102 1298v164h1022v-164h-417v-1298h-187v1298h-418z" />
-<glyph unicode="U" d="M125 520v942h186v-932q0 -387 307 -387q293 0 300 389v932h186v-948q0 -260 -125 -397q-127 -139 -371 -139q-483 -1 -483 540z" />
-<glyph unicode="V" d="M33 1462h196l295 -927q45 -143 88 -334q33 152 93 340l292 921h199l-489 -1462h-187z" />
-<glyph unicode="W" d="M2 1462h170l88 -663q18 -145 39 -377q18 -203 18 -242q27 162 70 312l141 516h177l145 -521q57 -205 72 -307q6 92 65 619l70 663h170l-187 -1462h-190l-168 580q-43 147 -66 282q-31 -168 -65 -284l-156 -578h-190z" />
-<glyph unicode="X" d="M53 0l453 764l-422 698h199l331 -559l334 559h191l-422 -692l457 -770h-211l-355 635l-366 -635h-189z" />
-<glyph unicode="Y" d="M33 1462h203l376 -739l381 739h201l-487 -893v-569h-187v559z" />
-<glyph unicode="Z" d="M102 0v145l793 1151h-772v166h981v-145l-793 -1151h813v-166h-1022z" />
-<glyph unicode="[" d="M412 -324v1786h528v-149h-346v-1487h346v-150h-528z" />
-<glyph unicode="\" d="M211 1462h178l627 -1462h-178z" />
-<glyph unicode="]" d="M289 -174h346v1487h-346v149h528v-1786h-528v150z" />
-<glyph unicode="^" d="M111 549l424 924h102l481 -924h-162l-368 735l-318 -735h-159z" />
-<glyph unicode="_" d="M-16 -184h1259v-140h-1259v140z" />
-<glyph unicode="`" d="M418 1548v21h219q88 -182 174 -301v-27h-121q-163 139 -272 307z" />
-<glyph unicode="a" d="M135 307q0 332 510 348l203 7v69q0 236 -244 236q-150 0 -328 -82l-63 137q199 96 383 96q223 0 328 -88q102 -86 102 -278v-752h-131l-37 152h-8q-74 -94 -158 -133t-209 -39q-164 0 -256 85.5t-92 241.5zM324 305q0 -178 200 -178q150 0 234 82q88 84 88 229v99 l-162 -7q-195 -8 -278 -61q-82 -51 -82 -164z" />
-<glyph unicode="b" d="M158 0v1556h182v-376q0 -96 -8 -226h8q109 164 322 164q203 0 315 -149q115 -152 115 -418q0 -268 -115 -419.5t-315 -151.5q-207 0 -322 159h-12l-37 -139h-133zM340 551q0 -229 70 -324q72 -96 221 -96q272 0 272 422q0 414 -274 414q-154 0 -221.5 -94.5t-67.5 -321.5 z" />
-<glyph unicode="c" d="M172 543q0 279 145 428q145 147 408 147q176 0 336 -59l-62 -158q-147 57 -268 57q-371 0 -371 -413q0 -406 361 -406q160 0 321 62v-160q-135 -61 -329 -61q-258 0 -400 145q-141 145 -141 418z" />
-<glyph unicode="d" d="M137 547q0 268 115 419.5t315 151.5q205 0 322 -160h12q-12 129 -12 162v436h182v-1556h-147l-27 147h-8q-115 -168 -322 -167q-203 0 -315 149q-115 152 -115 418zM326 545q0 -414 274 -414q152 0 219 88q66 88 70 287v41q0 229 -70 323q-72 96 -221 97 q-272 0 -272 -422z" />
-<glyph unicode="e" d="M133 541q0 266 135 421.5t363 155.5q212 0 338 -135q127 -137 127 -356v-113h-774q9 -375 344 -375q199 0 370 76v-160q-170 -76 -364 -75q-244 0 -391 149q-148 151 -148 412zM326 662h573q0 305 -272 305q-276 0 -301 -305z" />
-<glyph unicode="f" d="M156 961v110l317 33v96q0 195 90 281q88 86 299 86q125 0 252 -35l-41 -143q-109 29 -207 28q-123 0 -168 -51q-43 -49 -43 -164v-104h389v-137h-389v-961h-182v961h-317z" />
-<glyph unicode="g" d="M102 -186q0 212 240 270q-96 47 -96 154q0 113 133 192q-86 35 -139 123q-51 84 -52 186q0 182 106.5 280.5t303.5 98.5q88 0 150 -20h378v-113l-196 -27q66 -88 65 -213q0 -162 -106 -256q-109 -96 -297 -96q-55 0 -86 6q-100 -55 -100 -133q0 -84 161 -84h187 q172 0 266 -78q92 -76 92 -219q0 -377 -565 -377q-218 0 -332 80q-113 81 -113 226zM274 -180q0 -174 271 -174q395 0 395 223q0 88 -49 118.5t-199 30.5h-188q-230 1 -230 -198zM367 745q0 -227 227 -227q223 0 223 230q0 240 -225 239.5t-225 -242.5z" />
-<glyph unicode="h" d="M160 0v1556h182v-462l-8 -144h10q104 168 336 168q389 0 389 -401v-717h-182v707q0 260 -238 260q-307 0 -307 -398v-569h-182z" />
-<glyph unicode="i" d="M197 0v123l344 20v811l-269 21v123h451v-955l352 -20v-123h-878zM526 1435.5q0 114.5 106.5 114.5t106.5 -114q0 -57 -32.5 -86t-73.5 -29q-107 0 -107 114.5z" />
-<glyph unicode="j" d="M135 -303q131 -39 289 -39q119 0 182 57q66 59 66 158v1081l-420 21v123h602v-1215q0 -180 -113 -278q-111 -96 -319 -97q-160 0 -287 35v154zM637 1435.5q0 114.5 106.5 114.5t106.5 -114.5t-106.5 -114.5t-106.5 114.5z" />
-<glyph unicode="k" d="M215 0v1556h180v-714l-16 -289h4l135 152l395 393h222l-494 -475l522 -623h-213l-426 504l-129 -82v-422h-180z" />
-<glyph unicode="l" d="M188 0v123l344 20v1270l-268 21v122h451v-1413l352 -20v-123h-879z" />
-<glyph unicode="m" d="M92 0v1098h127l27 -148h10q68 168 201 168q164 0 213 -182h6q78 182 219 182q129 0 186 -92q57 -90 58 -309v-717h-162v707q0 147 -27 202q-27 57 -88 58q-88 0 -127 -82q-39 -80 -39 -279v-606h-161v707q0 260 -125 260q-82 0 -119 -80t-37 -318v-569h-162z" />
-<glyph unicode="n" d="M160 0v1098h147l27 -148h10q104 168 336 168q389 0 389 -401v-717h-182v707q0 260 -238 260q-307 0 -307 -398v-569h-182z" />
-<glyph unicode="o" d="M115 551q0 264 135 415.5t366 151.5q217 0 356.5 -155.5t139.5 -411.5q0 -266 -137 -418q-139 -154 -365 -153q-219 0 -356 155q-139 158 -139 416zM303 551q0 -420 311 -420q309 0 310 420q0 416 -312 416q-309 0 -309 -416z" />
-<glyph unicode="p" d="M158 -492v1590h147l27 -148h8q111 168 322 168q203 0 315 -149q115 -152 115 -418q0 -268 -115 -419.5t-315 -151.5q-207 0 -322 159h-12q12 -129 12 -162v-469h-182zM340 551q0 -229 70 -324q72 -96 221 -96q272 0 272 422q0 414 -274 414q-152 0 -219.5 -88t-69.5 -287 v-41z" />
-<glyph unicode="q" d="M137 547q0 268 115 419.5t315 151.5q209 0 322 -168h8l27 148h147v-1590h-182v469q0 41 12 170h-12q-115 -168 -322 -167q-203 0 -315 149q-115 152 -115 418zM326 545q0 -414 274 -414q152 0 219 88q66 88 70 287v41q0 229 -70 323q-72 96 -221 97q-272 0 -272 -422z " />
-<glyph unicode="r" d="M264 0v1098h148l22 -201h8q76 117 162 170q84 51 215 51q119 0 240 -45l-49 -166q-121 45 -224 45q-163 0 -251 -92q-88 -90 -89 -268v-592h-182z" />
-<glyph unicode="s" d="M203 49v166q195 -86 370 -86q274 0 275 162q0 55 -49 98t-226 107q-233 86 -294 159q-59 72 -60 172q0 135 111 213q113 78 309.5 78t368.5 -74l-60 -149q-184 72 -319 72q-236 0 -236 -133q0 -57 51.5 -96.5t231.5 -102.5q207 -76 280 -152q70 -72 70 -182 q0 -150 -116.5 -235.5t-331.5 -85.5q-246 -1 -375 69z" />
-<glyph unicode="t" d="M139 961v94l267 49l77 287h105v-293h438v-137h-438v-637q0 -195 192 -195q98 0 240 21v-138q-137 -33 -252 -32q-362 0 -362 344v637h-267z" />
-<glyph unicode="u" d="M160 381v717h182v-707q0 -260 236 -260q162 0 235.5 92t73.5 305v570h182v-1098h-147l-27 147h-10q-106 -168 -334 -167q-391 0 -391 401z" />
-<glyph unicode="v" d="M82 1098h188l240 -652q84 -225 100 -325h6q8 53 101 325l239 652h189l-416 -1098h-231z" />
-<glyph unicode="w" d="M-4 1098h162l98 -543q39 -215 57 -393h6q33 195 68 358l133 578h193l127 -578q43 -188 67 -358h6q29 225 60 393l102 543h158l-225 -1098h-195l-131 596l-68 330h-6l-65 -334l-135 -592h-189z" />
-<glyph unicode="x" d="M96 0l414 563l-393 535h207l290 -410l291 410h207l-395 -535l413 -563h-206l-310 436l-311 -436h-207z" />
-<glyph unicode="y" d="M82 1098h188l262 -654q82 -203 89 -290h6q20 106 90 292l239 652h189l-475 -1241q-70 -178 -156 -263q-89 -86 -246 -86q-94 0 -168 17v145q61 -12 136 -12q96 0 149 41t96 141l58 150z" />
-<glyph unicode="z" d="M182 0v125l660 836h-627v137h811v-146l-647 -815h665v-137h-862z" />
-<glyph unicode="{" d="M225 492v155q338 0 338 189v333q0 287 438 293v-149q-147 -4 -200 -39q-55 -37 -56 -119v-332q0 -209 -233 -248v-12q233 -39 233 -248v-331q0 -82 56 -119q53 -35 200 -39v-150q-438 6 -438 293v334q0 189 -338 189z" />
-<glyph unicode="|" d="M539 -492v2048h149v-2048h-149z" />
-<glyph unicode="}" d="M227 -174q141 0 198.5 39t57.5 119v331q0 209 234 248v12q-233 39 -234 248v332q0 80 -57 119t-199 39v149q438 -6 439 -293v-333q0 -188 338 -189v-155q-338 0 -338 -189v-334q0 -287 -439 -293v150z" />
-<glyph unicode="~" d="M152 586v162q98 109 247 108q102 0 248 -63q129 -55 201 -56q106 0 227 121v-162q-98 -109 -248 -108q-102 0 -247 63q-133 55 -201 56q-106 0 -227 -121z" />
-<glyph unicode="&#xa0;" />
-<glyph unicode="&#xa1;" d="M487 979q0 139 127 139t127 -139t-127 -139t-127 139zM502 -373l51 1049h121l51 -1049h-223z" />
-<glyph unicode="&#xa2;" d="M172 743q0 494 434 568v172h137v-164q158 -2 318 -59l-62 -158q-147 57 -268 57q-371 0 -371 -414q0 -406 361 -405q152 0 321 61v-159q-123 -59 -299 -62v-200h-137v206q-434 68 -434 557z" />
-<glyph unicode="&#xa3;" d="M119 0v154q201 49 200 284v213h-198v137h198v324q0 166 109 268q106 100 289 101q193 0 346 -80l-66 -144q-143 72 -272 72q-223 0 -223 -246v-295h377v-137h-377v-211q0 -199 -140 -274h748v-166h-991z" />
-<glyph unicode="&#xa4;" d="M174 1065l98 98l127 -129q101 68 215 68q115 0 213 -68l129 129l99 -96l-129 -129q68 -101 67 -215q0 -120 -67 -215l127 -127l-97 -96l-129 127q-100 -66 -213 -66q-117 0 -215 68l-127 -127l-96 96l127 127q-66 96 -65 213q0 113 65 213zM375 723q0 -98 71 -170 q70 -70 168 -70q102 0 172 70q72 72 72 170q0 100 -71.5 172t-172 72t-170 -70t-69.5 -174z" />
-<glyph unicode="&#xa5;" d="M78 1462h192l342 -739l346 739h191l-385 -768h240v-137h-302v-158h302v-137h-302v-262h-178v262h-301v137h301v158h-301v137h234z" />
-<glyph unicode="&#xa6;" d="M539 289h149v-781h-149v781zM539 776v780h149v-780h-149z" />
-<glyph unicode="&#xa7;" d="M244 55v158q170 -82 323 -82q240 0 240 141q0 55 -43 97q-45 41 -195 102q-197 82 -254 160q-55 74 -55 178q0 178 160 258q-160 80 -160 236q0 123 105 192q106 72 276 72q160 0 326 -72l-56 -139q-157 68 -276 67q-201 0 -201 -116q0 -53 49 -93q47 -37 197 -100 q158 -61 231 -139q74 -77 74 -191q0 -180 -145 -270q145 -80 145 -225q0 -139 -110.5 -219t-307.5 -80q-202 -1 -323 65zM414 831q0 -74 57 -126q55 -51 207 -117l35 -15q115 78 114 185q0 90 -73 145q-68 51 -207 103q-133 -50 -133 -175z" />
-<glyph unicode="&#xa8;" d="M330 1394.5q0 102.5 96 102.5t96 -102.5t-96 -102.5t-96 102.5zM705 1394.5q0 102.5 96 102.5t96 -102.5t-96 -102.5t-96 102.5z" />
-<glyph unicode="&#xa9;" d="M6 731q0 342 160 547t448 205q283 0 447 -203q162 -201 162 -549t-162 -549q-164 -203 -447 -202q-285 0 -446.5 204.5t-161.5 546.5zM115 731q0 -301 129 -473q127 -170 370 -170q242 0 369 170q131 174 131 473t-131 473q-127 170 -368.5 170t-370.5 -172t-129 -471z M248 733q0 209 110.5 332t300.5 123q127 0 254 -62l-61 -127q-106 53 -193 54q-123 0 -186 -86q-66 -88 -65 -236q0 -324 251 -323q98 0 215 45v-131q-108 -49 -221 -50q-197 0 -301 123t-104 338z" />
-<glyph unicode="&#xaa;" d="M276 989q0 117 84 168t277 57l125 5v10q0 133 -152 133q-117 0 -245 -51l-41 110q135 57 294 58q291 0 291 -238v-444h-110l-33 118q-104 -131 -268 -131q-222 0 -222 205zM428 987q0 -90 104 -90q106 0 168 55.5t62 145.5v20l-100 -2q-111 -2 -175 -29q-59 -24 -59 -100 z" />
-<glyph unicode="&#xab;" d="M197 526v27l309 414l117 -78l-238 -348l238 -348l-117 -78zM604 526v27l309 414l117 -78l-237 -348l237 -348l-117 -78z" />
-<glyph unicode="&#xac;" d="M152 647v150h923v-535h-149v385h-774z" />
-<glyph unicode="&#xad;" d="M285 465v168h659v-168h-659z" />
-<glyph unicode="&#xae;" d="M6 731q0 342 160 547t448 205q283 0 447 -203q162 -201 162 -549t-162 -549q-164 -203 -447 -202q-285 0 -446.5 204.5t-161.5 546.5zM115 731q0 -301 129 -473q127 -170 370 -170q242 0 369 170q131 174 131 473t-131 473q-127 170 -368.5 170t-370.5 -172t-129 -471z M348 285v893h234q326 0 325 -265q0 -163 -159 -233l237 -395h-178l-207 352h-94v-352h-158zM506 768h72q170 0 170 141q0 74 -41 103q-43 31 -132 30h-69v-274z" />
-<glyph unicode="&#xaf;" d="M-20 1556v140h1269v-140h-1269z" />
-<glyph unicode="&#xb0;" d="M299 1167q0 129 92 222q94 94 223 94q127 0 221.5 -94.5t94.5 -221.5q0 -129 -92.5 -221t-223.5 -92t-223 92t-92 221zM422 1167q0 -80 55 -135t137 -55q78 0 135.5 55t57.5 135t-57.5 137.5t-135.5 57.5q-80 0 -135 -57q-57 -62 -57 -138z" />
-<glyph unicode="&#xb1;" d="M152 0v150h923v-150h-923zM152 647v150h387v389h149v-389h387v-150h-387v-385h-149v385h-387z" />
-<glyph unicode="&#xb2;" d="M348 672v102l187 199q106 113 141 168q31 49 31 108q0 115 -111 115q-82 0 -164 -76l-78 86q115 102 248 103q121 0 182 -60q66 -61 66 -164q0 -66 -35 -135q-33 -66 -164 -196l-135 -136h363v-114h-531z" />
-<glyph unicode="&#xb3;" d="M342 705v124q113 -66 203 -65q150 0 149 137q0 125 -147 125h-72v104h70q123 0 123 127q0 111 -97 111q-74 0 -161 -70l-66 86q111 92 238 93q113 0 174 -54q63 -55 63 -149q0 -139 -149 -189q176 -41 176 -186q0 -117 -74 -180q-72 -63 -215 -64q-132 1 -215 50z" />
-<glyph unicode="&#xb4;" d="M418 1241v27q92 127 174 301h219v-21q-109 -168 -272 -307h-121z" />
-<glyph unicode="&#xb5;" d="M180 -492v1590h182v-707q0 -260 218 -260q152 0 217 90q70 94 69 307v570h183v-1098h-148l-27 147h-10q-96 -168 -295 -167q-139 0 -213 88q6 -154 6 -240v-320h-182z" />
-<glyph unicode="&#xb6;" d="M66 1042q0 256 108 388q106 127 342 126h563v-1816h-121v1657h-206v-1657h-121v819q-61 -18 -146 -18q-419 -1 -419 501z" />
-<glyph unicode="&#xb7;" d="M487 723q0 139 127 139t127 -139t-127 -139t-127 139z" />
-<glyph unicode="&#xb8;" d="M428 -375q34 -6 80 -6q152 0 151 92q0 72 -172 113l91 176h120l-57 -115q160 -37 160 -172q0 -205 -291 -205q-39 0 -82 9v108z" />
-<glyph unicode="&#xb9;" d="M367 1309l219 151h135v-788h-146v465q0 84 9 200q-43 -45 -74 -65l-70 -51z" />
-<glyph unicode="&#xba;" d="M281 1133q0 160 90 253q88 92 245 93q145 0 238 -93q94 -94 94 -253q0 -164 -92 -256.5t-244 -92.5q-145 0 -237 93q-94 94 -94 256zM432 1133q0 -229 182 -230q180 0 181 230q0 225 -181 225q-182 0 -182 -225z" />
-<glyph unicode="&#xbb;" d="M197 193l237 348l-237 348l116 78l310 -414v-27l-310 -411zM604 193l238 348l-238 348l117 78l309 -414v-27l-309 -411z" />
-<glyph unicode="&#xbc;" d="M23 1309l219 151h135v-788h-146v465q0 84 9 200q-43 -45 -74 -65l-70 -51zM170 0l729 1462h158l-729 -1462h-158zM606 174v98l377 523h141v-508h84v-113h-84v-174h-143v174h-375zM751 287h230v176q0 83 6 172q-37 -70 -80 -131z" />
-<glyph unicode="&#xbd;" d="M2 1309l219 151h135v-788h-146v465q0 84 9 200q-43 -45 -74 -65l-70 -51zM104 0l729 1462h158l-729 -1462h-158zM694 0v102l187 199q106 113 141 168q31 49 31 108q0 115 -111 115q-82 0 -164 -76l-78 86q115 102 248 103q121 0 182 -60q66 -61 66 -164q0 -66 -35 -135 q-33 -66 -164 -196l-135 -136h363v-114h-531z" />
-<glyph unicode="&#xbe;" d="M20 705v124q113 -66 203 -65q150 0 149 137q0 125 -147 125h-72v104h70q123 0 123 127q0 111 -97 111q-74 0 -161 -70l-66 86q111 92 238 93q113 0 174 -54q63 -55 63 -149q0 -139 -149 -189q176 -41 176 -186q0 -117 -74 -180q-72 -63 -215 -64q-132 1 -215 50zM223 0 l729 1462h158l-729 -1462h-158zM627 174v98l377 523h141v-508h84v-113h-84v-174h-143v174h-375zM772 287h230v176q0 83 6 172q-37 -70 -80 -131z" />
-<glyph unicode="&#xbf;" d="M168 -35q0 133 53 217q52 83 197 191q113 80 151 141q33 51 33 143v19h160v-37q0 -115 -45 -193q-45 -76 -162 -159q-127 -96 -170 -156q-43 -57 -43 -158q0 -94 74 -149q76 -57 207 -57q178 0 370 90l62 -144q-215 -106 -422 -106q-217 0 -340 98q-125 100 -125 260z M547 979q0 139 127 139t127 -139t-127 -139t-127 139z" />
-<glyph unicode="&#xc0;" d="M33 0l483 1468h195l485 -1468h-192l-144 453h-491l-146 -453h-190zM422 618h385l-133 424q-39 121 -62 226q-20 -88 -47 -183zM340 1886v21h219q88 -182 174 -301v-27h-121q-163 139 -272 307z" />
-<glyph unicode="&#xc1;" d="M33 0l483 1468h195l485 -1468h-192l-144 453h-491l-146 -453h-190zM422 618h385l-133 424q-39 121 -62 226q-20 -88 -47 -183zM520 1579v27q92 127 174 301h219v-21q-109 -168 -272 -307h-121z" />
-<glyph unicode="&#xc2;" d="M33 0l483 1468h195l485 -1468h-192l-144 453h-491l-146 -453h-190zM422 618h385l-133 424q-39 121 -62 226q-20 -88 -47 -183zM283 1579v27l59 67q141 156 176 234h193q35 -78 176 -234l59 -67v-27h-121q-78 49 -211 186q-133 -137 -211 -186h-120z" />
-<glyph unicode="&#xc3;" d="M33 0l483 1468h195l485 -1468h-192l-144 453h-491l-146 -453h-190zM422 618h385l-133 424q-39 121 -62 226q-20 -88 -47 -183zM254 1579q25 264 211 264q57 0 162 -55q104 -57 135 -57q82 0 106 114h105q-27 -264 -211 -264q-57 0 -158 57q-100 55 -139 56 q-82 0 -107 -115h-104z" />
-<glyph unicode="&#xc4;" d="M33 0l483 1468h195l485 -1468h-192l-144 453h-491l-146 -453h-190zM422 618h385l-133 424q-39 121 -62 226q-20 -88 -47 -183zM330 1732.5q0 102.5 96 102.5t96 -102.5t-96 -102.5t-96 102.5zM705 1732.5q0 102.5 96 102.5t96 -102.5t-96 -102.5t-96 102.5z" />
-<glyph unicode="&#xc5;" d="M33 0l483 1468h195l485 -1468h-192l-144 453h-491l-146 -453h-190zM422 618h385l-133 424q-39 121 -62 226q-20 -88 -47 -183zM387 1581q0 100 62 158q59 57 161 57q100 0 166 -59q63 -57 64 -154q0 -100 -64 -158q-66 -59 -166 -59q-102 0 -161 57q-62 58 -62 158z M498 1581q0 -113 112 -113q53 0 82 29q31 31 31 84q0 51 -30.5 82t-82.5 31q-49 0 -80 -31q-32 -33 -32 -82z" />
-<glyph unicode="&#xc6;" d="M0 0l338 1462h872v-164h-477v-452h438v-162h-438v-520h477v-164h-653v453h-289l-96 -453h-172zM305 618h252v680h-106z" />
-<glyph unicode="&#xc7;" d="M129 733q0 344 178 547t490 203q219 0 383 -86l-78 -156q-156 78 -305 78q-215 0 -342 -158q-129 -160 -129 -430q0 -287 120 -438q119 -150 351 -150q135 0 327 58v-162q-150 -59 -358 -59q-310 0 -473 196q-164 199 -164 557zM508 -375q34 -6 80 -6q152 0 151 92 q0 72 -172 113l91 176h120l-57 -115q160 -37 160 -172q0 -205 -291 -205q-39 0 -82 9v108z" />
-<glyph unicode="&#xc8;" d="M217 0v1462h842v-164h-656v-452h617v-162h-617v-520h656v-164h-842zM344 1886v21h219q88 -182 174 -301v-27h-121q-163 139 -272 307z" />
-<glyph unicode="&#xc9;" d="M217 0v1462h842v-164h-656v-452h617v-162h-617v-520h656v-164h-842zM481 1579v27q92 127 174 301h219v-21q-109 -168 -272 -307h-121z" />
-<glyph unicode="&#xca;" d="M217 0v1462h842v-164h-656v-452h617v-162h-617v-520h656v-164h-842zM318 1579v27l59 67q141 156 176 234h193q35 -78 176 -234l59 -67v-27h-121q-78 49 -211 186q-133 -137 -211 -186h-120z" />
-<glyph unicode="&#xcb;" d="M217 0v1462h842v-164h-656v-452h617v-162h-617v-520h656v-164h-842zM355 1732.5q0 102.5 96 102.5t96 -102.5t-96 -102.5t-96 102.5zM730 1732.5q0 102.5 96 102.5t96 -102.5t-96 -102.5t-96 102.5z" />
-<glyph unicode="&#xcc;" d="M225 0v123l295 20v1176l-295 20v123h776v-123l-294 -20v-1176l294 -20v-123h-776zM309 1886v21h219q88 -182 174 -301v-27h-121q-163 139 -272 307z" />
-<glyph unicode="&#xcd;" d="M225 0v123l295 20v1176l-295 20v123h776v-123l-294 -20v-1176l294 -20v-123h-776zM537 1579v27q92 127 174 301h219v-21q-109 -168 -272 -307h-121z" />
-<glyph unicode="&#xce;" d="M225 0v123l295 20v1176l-295 20v123h776v-123l-294 -20v-1176l294 -20v-123h-776zM283 1579v27l59 67q141 156 176 234h193q35 -78 176 -234l59 -67v-27h-121q-78 49 -211 186q-133 -137 -211 -186h-120z" />
-<glyph unicode="&#xcf;" d="M225 0v123l295 20v1176l-295 20v123h776v-123l-294 -20v-1176l294 -20v-123h-776zM332 1732.5q0 102.5 96 102.5t96 -102.5t-96 -102.5t-96 102.5zM707 1732.5q0 102.5 96 102.5t96 -102.5t-96 -102.5t-96 102.5z" />
-<glyph unicode="&#xd0;" d="M0 659v162h135v641h342q319 0 494 -188q176 -193 176 -529q0 -365 -182 -552q-186 -193 -529 -193h-301v659h-135zM322 160h96q532 0 532 579q0 563 -493 564h-135v-482h380v-162h-380v-499z" />
-<glyph unicode="&#xd1;" d="M135 0v1462h213l578 -1204h6q-14 285 -14 404v800h174v-1462h-215l-580 1210h-8q18 -276 18 -417v-793h-172zM258 1579q25 264 211 264q57 0 162 -55q104 -57 135 -57q82 0 106 114h105q-27 -264 -211 -264q-57 0 -158 57q-100 55 -139 56q-82 0 -107 -115h-104z" />
-<glyph unicode="&#xd2;" d="M84 735q0 750 534 750q258 0 392 -195q137 -199 137 -557q0 -362 -137 -557q-138 -197 -394 -196q-532 -1 -532 755zM281 733q0 -590 335 -590q174 0 254 145.5t80 444.5q0 305 -82 445q-84 143 -250 143q-337 0 -337 -588zM336 1886v21h219q88 -182 174 -301v-27h-121 q-163 139 -272 307z" />
-<glyph unicode="&#xd3;" d="M84 735q0 750 534 750q258 0 392 -195q137 -199 137 -557q0 -362 -137 -557q-138 -197 -394 -196q-532 -1 -532 755zM281 733q0 -590 335 -590q174 0 254 145.5t80 444.5q0 305 -82 445q-84 143 -250 143q-337 0 -337 -588zM508 1579v27q92 127 174 301h219v-21 q-109 -168 -272 -307h-121z" />
-<glyph unicode="&#xd4;" d="M84 735q0 750 534 750q258 0 392 -195q137 -199 137 -557q0 -362 -137 -557q-138 -197 -394 -196q-532 -1 -532 755zM281 733q0 -590 335 -590q174 0 254 145.5t80 444.5q0 305 -82 445q-84 143 -250 143q-337 0 -337 -588zM283 1579v27l59 67q141 156 176 234h193 q35 -78 176 -234l59 -67v-27h-121q-78 49 -211 186q-133 -137 -211 -186h-120z" />
-<glyph unicode="&#xd5;" d="M84 735q0 750 534 750q258 0 392 -195q137 -199 137 -557q0 -362 -137 -557q-138 -197 -394 -196q-532 -1 -532 755zM281 733q0 -590 335 -590q174 0 254 145.5t80 444.5q0 305 -82 445q-84 143 -250 143q-337 0 -337 -588zM262 1579q25 264 211 264q57 0 162 -55 q104 -57 135 -57q82 0 106 114h105q-27 -264 -211 -264q-57 0 -158 57q-100 55 -139 56q-82 0 -107 -115h-104z" />
-<glyph unicode="&#xd6;" d="M84 735q0 750 534 750q258 0 392 -195q137 -199 137 -557q0 -362 -137 -557q-138 -197 -394 -196q-532 -1 -532 755zM281 733q0 -590 335 -590q174 0 254 145.5t80 444.5q0 305 -82 445q-84 143 -250 143q-337 0 -337 -588zM332 1732.5q0 102.5 96 102.5t96 -102.5 t-96 -102.5t-96 102.5zM707 1732.5q0 102.5 96 102.5t96 -102.5t-96 -102.5t-96 102.5z" />
-<glyph unicode="&#xd7;" d="M190 1042l105 105l317 -318l322 318l104 -103l-321 -321l319 -320l-102 -102l-322 317l-317 -315l-102 103l315 317z" />
-<glyph unicode="&#xd8;" d="M80 2l121 197q-117 184 -117 536q0 750 534 750q186 0 310 -105l92 152l137 -78l-125 -201q115 -188 115 -520q0 -362 -137 -557q-138 -197 -394 -196q-193 0 -307 94l-92 -150zM281 733q0 -205 38 -342l515 836q-80 94 -216 94q-337 0 -337 -588zM403 229 q80 -86 213 -86q174 0 254 145.5t80 444.5q0 205 -35 328z" />
-<glyph unicode="&#xd9;" d="M125 520v942h186v-932q0 -387 307 -387q293 0 300 389v932h186v-948q0 -260 -125 -397q-127 -139 -371 -139q-483 -1 -483 540zM348 1886v21h219q88 -182 174 -301v-27h-121q-163 139 -272 307z" />
-<glyph unicode="&#xda;" d="M125 520v942h186v-932q0 -387 307 -387q293 0 300 389v932h186v-948q0 -260 -125 -397q-127 -139 -371 -139q-483 -1 -483 540zM494 1579v27q92 127 174 301h219v-21q-109 -168 -272 -307h-121z" />
-<glyph unicode="&#xdb;" d="M125 520v942h186v-932q0 -387 307 -387q293 0 300 389v932h186v-948q0 -260 -125 -397q-127 -139 -371 -139q-483 -1 -483 540zM283 1579v27l59 67q141 156 176 234h193q35 -78 176 -234l59 -67v-27h-121q-78 49 -211 186q-133 -137 -211 -186h-120z" />
-<glyph unicode="&#xdc;" d="M125 520v942h186v-932q0 -387 307 -387q293 0 300 389v932h186v-948q0 -260 -125 -397q-127 -139 -371 -139q-483 -1 -483 540zM332 1732.5q0 102.5 96 102.5t96 -102.5t-96 -102.5t-96 102.5zM707 1732.5q0 102.5 96 102.5t96 -102.5t-96 -102.5t-96 102.5z" />
-<glyph unicode="&#xdd;" d="M33 1462h203l376 -739l381 739h201l-487 -893v-569h-187v559zM494 1579v27q92 127 174 301h219v-21q-109 -168 -272 -307h-121z" />
-<glyph unicode="&#xde;" d="M176 0v1462h186v-252h218q514 0 514 -428q0 -219 -137.5 -342t-403.5 -123h-191v-317h-186zM362 475h170q195 0 283 72q86 72 86 225q0 279 -338 279h-201v-576z" />
-<glyph unicode="&#xdf;" d="M164 0v1200q0 367 424 367q195 0 303 -80t108 -227q0 -131 -133 -248q-80 -72 -108 -107q-25 -31 -25 -63q0 -37 29 -70q27 -29 151 -110q144 -95 191 -173t47 -176q0 -162 -100.5 -247.5t-282.5 -85.5q-178 0 -289 69v166q143 -86 277 -86q213 0 213 174q0 80 -45 131 t-144 113q-125 78 -174 139.5t-49 147.5q0 117 129 223q129 108 129 196q0 164 -227 164q-242 0 -242 -215v-1202h-182z" />
-<glyph unicode="&#xe0;" d="M135 307q0 332 510 348l203 7v69q0 236 -244 236q-150 0 -328 -82l-63 137q199 96 383 96q223 0 328 -88q102 -86 102 -278v-752h-131l-37 152h-8q-74 -94 -158 -133t-209 -39q-164 0 -256 85.5t-92 241.5zM324 305q0 -178 200 -178q150 0 234 82q88 84 88 229v99 l-162 -7q-195 -8 -278 -61q-82 -51 -82 -164zM332 1548v21h219q88 -182 174 -301v-27h-121q-163 139 -272 307z" />
-<glyph unicode="&#xe1;" d="M135 307q0 332 510 348l203 7v69q0 236 -244 236q-150 0 -328 -82l-63 137q199 96 383 96q223 0 328 -88q102 -86 102 -278v-752h-131l-37 152h-8q-74 -94 -158 -133t-209 -39q-164 0 -256 85.5t-92 241.5zM324 305q0 -178 200 -178q150 0 234 82q88 84 88 229v99 l-162 -7q-195 -8 -278 -61q-82 -51 -82 -164zM502 1241v27q92 127 174 301h219v-21q-109 -168 -272 -307h-121z" />
-<glyph unicode="&#xe2;" d="M135 307q0 332 510 348l203 7v69q0 236 -244 236q-150 0 -328 -82l-63 137q199 96 383 96q223 0 328 -88q102 -86 102 -278v-752h-131l-37 152h-8q-74 -94 -158 -133t-209 -39q-164 0 -256 85.5t-92 241.5zM324 305q0 -178 200 -178q150 0 234 82q88 84 88 229v99 l-162 -7q-195 -8 -278 -61q-82 -51 -82 -164zM291 1241v27l59 67q141 156 176 234h193q35 -78 176 -234l59 -67v-27h-121q-78 49 -211 186q-133 -137 -211 -186h-120z" />
-<glyph unicode="&#xe3;" d="M135 307q0 332 510 348l203 7v69q0 236 -244 236q-150 0 -328 -82l-63 137q199 96 383 96q223 0 328 -88q102 -86 102 -278v-752h-131l-37 152h-8q-74 -94 -158 -133t-209 -39q-164 0 -256 85.5t-92 241.5zM324 305q0 -178 200 -178q150 0 234 82q88 84 88 229v99 l-162 -7q-195 -8 -278 -61q-82 -51 -82 -164zM264 1241q25 264 211 264q57 0 162 -55q104 -57 135 -57q82 0 106 114h105q-27 -264 -211 -264q-57 0 -158 57q-100 55 -139 56q-82 0 -107 -115h-104z" />
-<glyph unicode="&#xe4;" d="M135 307q0 332 510 348l203 7v69q0 236 -244 236q-150 0 -328 -82l-63 137q199 96 383 96q223 0 328 -88q102 -86 102 -278v-752h-131l-37 152h-8q-74 -94 -158 -133t-209 -39q-164 0 -256 85.5t-92 241.5zM324 305q0 -178 200 -178q150 0 234 82q88 84 88 229v99 l-162 -7q-195 -8 -278 -61q-82 -51 -82 -164zM342 1394.5q0 102.5 96 102.5t96 -102.5t-96 -102.5t-96 102.5zM717 1394.5q0 102.5 96 102.5t96 -102.5t-96 -102.5t-96 102.5z" />
-<glyph unicode="&#xe5;" d="M135 307q0 332 510 348l203 7v69q0 236 -244 236q-150 0 -328 -82l-63 137q199 96 383 96q223 0 328 -88q102 -86 102 -278v-752h-131l-37 152h-8q-74 -94 -158 -133t-209 -39q-164 0 -256 85.5t-92 241.5zM324 305q0 -178 200 -178q150 0 234 82q88 84 88 229v99 l-162 -7q-195 -8 -278 -61q-82 -51 -82 -164zM387 1456q0 100 62 158q59 57 161 57q100 0 166 -59q63 -57 64 -154q0 -100 -64 -158q-66 -59 -166 -59q-102 0 -161 57q-62 58 -62 158zM498 1456q0 -113 112 -113q53 0 82 29q31 31 31 84q0 51 -30.5 82t-82.5 31 q-49 0 -80 -31q-32 -33 -32 -82z" />
-<glyph unicode="&#xe6;" d="M45 307q0 334 328 348l149 7v69q0 236 -139 236q-109 0 -211 -82l-57 137q133 96 276 96q187 0 246 -178q77 178 240 178q137 0 223 -135t86 -356v-113h-496q3 -190 68 -283q66 -92 168 -92q113 0 233 76v-162q-106 -74 -241 -73q-221 0 -316 229q-104 -229 -301 -229 q-117 0 -186 86q-70 83 -70 241zM215 305q0 -82 33 -131q31 -47 86 -47q84 0 135 82t51 229v99l-88 -7q-217 -18 -217 -225zM694 662h316q0 137 -41 223q-39 82 -111 82q-66 0 -113 -78q-45 -75 -51 -227z" />
-<glyph unicode="&#xe7;" d="M172 543q0 279 145 428q145 147 408 147q176 0 336 -59l-62 -158q-147 57 -268 57q-371 0 -371 -413q0 -406 361 -406q160 0 321 62v-160q-135 -61 -329 -61q-258 0 -400 145q-141 145 -141 418zM477 -375q34 -6 80 -6q152 0 151 92q0 72 -172 113l91 176h120l-57 -115 q160 -37 160 -172q0 -205 -291 -205q-39 0 -82 9v108z" />
-<glyph unicode="&#xe8;" d="M133 541q0 266 135 421.5t363 155.5q212 0 338 -135q127 -137 127 -356v-113h-774q9 -375 344 -375q199 0 370 76v-160q-170 -76 -364 -75q-244 0 -391 149q-148 151 -148 412zM326 662h573q0 305 -272 305q-276 0 -301 -305zM375 1548v21h219q88 -182 174 -301v-27h-121 q-163 139 -272 307z" />
-<glyph unicode="&#xe9;" d="M133 541q0 266 135 421.5t363 155.5q212 0 338 -135q127 -137 127 -356v-113h-774q9 -375 344 -375q199 0 370 76v-160q-170 -76 -364 -75q-244 0 -391 149q-148 151 -148 412zM326 662h573q0 305 -272 305q-276 0 -301 -305zM500 1241v27q92 127 174 301h219v-21 q-109 -168 -272 -307h-121z" />
-<glyph unicode="&#xea;" d="M133 541q0 266 135 421.5t363 155.5q212 0 338 -135q127 -137 127 -356v-113h-774q9 -375 344 -375q199 0 370 76v-160q-170 -76 -364 -75q-244 0 -391 149q-148 151 -148 412zM326 662h573q0 305 -272 305q-276 0 -301 -305zM299 1241v27l59 67q141 156 176 234h193 q35 -78 176 -234l59 -67v-27h-121q-78 49 -211 186q-133 -137 -211 -186h-120z" />
-<glyph unicode="&#xeb;" d="M133 541q0 266 135 421.5t363 155.5q212 0 338 -135q127 -137 127 -356v-113h-774q9 -375 344 -375q199 0 370 76v-160q-170 -76 -364 -75q-244 0 -391 149q-148 151 -148 412zM326 662h573q0 305 -272 305q-276 0 -301 -305zM348 1394.5q0 102.5 96 102.5t96 -102.5 t-96 -102.5t-96 102.5zM723 1394.5q0 102.5 96 102.5t96 -102.5t-96 -102.5t-96 102.5z" />
-<glyph unicode="&#xec;" d="M197 0v123l344 20v811l-269 21v123h451v-955l352 -20v-123h-878zM332 1548v21h219q88 -182 174 -301v-27h-121q-163 139 -272 307z" />
-<glyph unicode="&#xed;" d="M197 0v123l344 20v811l-269 21v123h451v-955l352 -20v-123h-878zM531 1241v27q92 127 174 301h219v-21q-109 -168 -272 -307h-121z" />
-<glyph unicode="&#xee;" d="M197 0v123l344 20v811l-269 21v123h451v-955l352 -20v-123h-878zM283 1241v27l59 67q141 156 176 234h193q35 -78 176 -234l59 -67v-27h-121q-78 49 -211 186q-133 -137 -211 -186h-120z" />
-<glyph unicode="&#xef;" d="M197 0v123l344 20v811l-269 21v123h451v-955l352 -20v-123h-878zM330 1394.5q0 102.5 96 102.5t96 -102.5t-96 -102.5t-96 102.5zM705 1394.5q0 102.5 96 102.5t96 -102.5t-96 -102.5t-96 102.5z" />
-<glyph unicode="&#xf0;" d="M135 477.5q0 233.5 121 364.5q121 129 334 129q211 0 299 -119l8 4q-57 225 -242 391l-256 -153l-73 114l217 131q-113 76 -172 109l69 123q135 -66 246 -148l227 138l74 -113l-194 -117q301 -291 301 -758q0 -279 -129 -436t-353 -157q-213 0 -346 133 q-131 131 -131 364.5zM328 471q0 -340 288 -340q152 0 222 100q68 98 67 295q0 129 -77.5 213t-213.5 84q-286 0 -286 -352z" />
-<glyph unicode="&#xf1;" d="M160 0v1098h147l27 -148h10q104 168 336 168q389 0 389 -401v-717h-182v707q0 260 -238 260q-307 0 -307 -398v-569h-182zM260 1241q25 264 211 264q57 0 162 -55q104 -57 135 -57q82 0 106 114h105q-27 -264 -211 -264q-57 0 -158 57q-100 55 -139 56q-82 0 -107 -115 h-104z" />
-<glyph unicode="&#xf2;" d="M115 551q0 264 135 415.5t366 151.5q217 0 356.5 -155.5t139.5 -411.5q0 -266 -137 -418q-139 -154 -365 -153q-219 0 -356 155q-139 158 -139 416zM303 551q0 -420 311 -420q309 0 310 420q0 416 -312 416q-309 0 -309 -416zM377 1548v21h219q88 -182 174 -301v-27h-121 q-163 139 -272 307z" />
-<glyph unicode="&#xf3;" d="M115 551q0 264 135 415.5t366 151.5q217 0 356.5 -155.5t139.5 -411.5q0 -266 -137 -418q-139 -154 -365 -153q-219 0 -356 155q-139 158 -139 416zM303 551q0 -420 311 -420q309 0 310 420q0 416 -312 416q-309 0 -309 -416zM498 1241v27q92 127 174 301h219v-21 q-109 -168 -272 -307h-121z" />
-<glyph unicode="&#xf4;" d="M115 551q0 264 135 415.5t366 151.5q217 0 356.5 -155.5t139.5 -411.5q0 -266 -137 -418q-139 -154 -365 -153q-219 0 -356 155q-139 158 -139 416zM303 551q0 -420 311 -420q309 0 310 420q0 416 -312 416q-309 0 -309 -416zM279 1241v27l59 67q141 156 176 234h193 q35 -78 176 -234l59 -67v-27h-121q-78 49 -211 186q-133 -137 -211 -186h-120z" />
-<glyph unicode="&#xf5;" d="M115 551q0 264 135 415.5t366 151.5q217 0 356.5 -155.5t139.5 -411.5q0 -266 -137 -418q-139 -154 -365 -153q-219 0 -356 155q-139 158 -139 416zM303 551q0 -420 311 -420q309 0 310 420q0 416 -312 416q-309 0 -309 -416zM254 1241q25 264 211 264q57 0 162 -55 q104 -57 135 -57q82 0 106 114h105q-27 -264 -211 -264q-57 0 -158 57q-100 55 -139 56q-82 0 -107 -115h-104z" />
-<glyph unicode="&#xf6;" d="M115 551q0 264 135 415.5t366 151.5q217 0 356.5 -155.5t139.5 -411.5q0 -266 -137 -418q-139 -154 -365 -153q-219 0 -356 155q-139 158 -139 416zM303 551q0 -420 311 -420q309 0 310 420q0 416 -312 416q-309 0 -309 -416zM324 1394.5q0 102.5 96 102.5t96 -102.5 t-96 -102.5t-96 102.5zM699 1394.5q0 102.5 96 102.5t96 -102.5t-96 -102.5t-96 102.5z" />
-<glyph unicode="&#xf7;" d="M152 647v150h923v-150h-923zM498 373q0 125 114.5 125t114.5 -125t-114.5 -125t-114.5 125zM498 1071q0 125 114.5 125t114.5 -125t-114.5 -125t-114.5 125z" />
-<glyph unicode="&#xf8;" d="M115 551q0 264 133 415.5t368 151.5q129 0 236 -57l76 119l131 -84l-84 -131q137 -156 137 -414q0 -272 -135 -421.5t-367 -149.5q-127 0 -233 53l-76 -119l-131 84l84 131q-139 158 -139 422zM303 551q0 -178 53 -275l406 656q-66 35 -156 35q-162 0 -231 -103 q-72 -106 -72 -313zM467 164q59 -33 154 -33q162 0 233 105q70 102 70 315q0 166 -52 266z" />
-<glyph unicode="&#xf9;" d="M160 381v717h182v-707q0 -260 236 -260q162 0 235.5 92t73.5 305v570h182v-1098h-147l-27 147h-10q-106 -168 -334 -167q-391 0 -391 401zM340 1548v21h219q88 -182 174 -301v-27h-121q-163 139 -272 307z" />
-<glyph unicode="&#xfa;" d="M160 381v717h182v-707q0 -260 236 -260q162 0 235.5 92t73.5 305v570h182v-1098h-147l-27 147h-10q-106 -168 -334 -167q-391 0 -391 401zM500 1241v27q92 127 174 301h219v-21q-109 -168 -272 -307h-121z" />
-<glyph unicode="&#xfb;" d="M160 381v717h182v-707q0 -260 236 -260q162 0 235.5 92t73.5 305v570h182v-1098h-147l-27 147h-10q-106 -168 -334 -167q-391 0 -391 401zM291 1241v27l59 67q141 156 176 234h193q35 -78 176 -234l59 -67v-27h-121q-78 49 -211 186q-133 -137 -211 -186h-120z" />
-<glyph unicode="&#xfc;" d="M160 381v717h182v-707q0 -260 236 -260q162 0 235.5 92t73.5 305v570h182v-1098h-147l-27 147h-10q-106 -168 -334 -167q-391 0 -391 401zM332 1394.5q0 102.5 96 102.5t96 -102.5t-96 -102.5t-96 102.5zM707 1394.5q0 102.5 96 102.5t96 -102.5t-96 -102.5t-96 102.5z " />
-<glyph unicode="&#xfd;" d="M82 1098h188l262 -654q82 -203 89 -290h6q20 106 90 292l239 652h189l-475 -1241q-70 -178 -156 -263q-89 -86 -246 -86q-94 0 -168 17v145q61 -12 136 -12q96 0 149 41t96 141l58 150zM494 1241v27q92 127 174 301h219v-21q-109 -168 -272 -307h-121z" />
-<glyph unicode="&#xfe;" d="M158 -492v2048h182v-458l-8 -148h8q111 168 322 168q203 0 315 -149q115 -152 115 -418q0 -268 -115 -419.5t-315 -151.5q-207 0 -322 159h-12q12 -129 12 -162v-469h-182zM340 551q0 -229 70 -324q72 -96 221 -96q272 0 272 422q0 414 -274 414q-152 0 -219.5 -88 t-69.5 -287v-41z" />
-<glyph unicode="&#xff;" d="M82 1098h188l262 -654q82 -203 89 -290h6q20 106 90 292l239 652h189l-475 -1241q-70 -178 -156 -263q-89 -86 -246 -86q-94 0 -168 17v145q61 -12 136 -12q96 0 149 41t96 141l58 150zM338 1394.5q0 102.5 96 102.5t96 -102.5t-96 -102.5t-96 102.5zM713 1394.5 q0 102.5 96 102.5t96 -102.5t-96 -102.5t-96 102.5z" />
-<glyph unicode="&#x100;" d="M33 0l483 1468h195l485 -1468h-192l-144 453h-491l-146 -453h-190zM422 618h385l-133 424q-39 121 -62 226q-20 -88 -47 -183zM326 1579v150h575v-150h-575z" />
-<glyph unicode="&#x101;" d="M135 307q0 332 510 348l203 7v69q0 236 -244 236q-150 0 -328 -82l-63 137q199 96 383 96q223 0 328 -88q102 -86 102 -278v-752h-131l-37 152h-8q-74 -94 -158 -133t-209 -39q-164 0 -256 85.5t-92 241.5zM324 305q0 -178 200 -178q150 0 234 82q88 84 88 229v99 l-162 -7q-195 -8 -278 -61q-82 -51 -82 -164zM318 1241v150h575v-150h-575z" />
-<glyph unicode="&#x102;" d="M33 0l483 1468h195l485 -1468h-192l-144 453h-491l-146 -453h-190zM422 618h385l-133 424q-39 121 -62 226q-20 -88 -47 -183zM311 1856h109q6 -76 47 -101q39 -25 143 -24q182 0 191 125h112q-10 -127 -90 -201q-82 -76 -215 -76q-279 1 -297 277z" />
-<glyph unicode="&#x103;" d="M135 307q0 332 510 348l203 7v69q0 236 -244 236q-150 0 -328 -82l-63 137q199 96 383 96q223 0 328 -88q102 -86 102 -278v-752h-131l-37 152h-8q-74 -94 -158 -133t-209 -39q-164 0 -256 85.5t-92 241.5zM324 305q0 -178 200 -178q150 0 234 82q88 84 88 229v99 l-162 -7q-195 -8 -278 -61q-82 -51 -82 -164zM303 1518h109q6 -76 47 -101q39 -25 143 -24q182 0 191 125h112q-10 -127 -90 -201q-82 -76 -215 -76q-279 1 -297 277z" />
-<glyph unicode="&#x104;" d="M33 0l483 1468h195l485 -1468h-192l-144 453h-491l-146 -453h-190zM422 618h385l-133 424q-39 121 -62 226q-20 -88 -47 -183zM813 -252q0 144 190 252h131q-170 -127 -170 -238q0 -96 127 -96q68 0 123 15v-113q-78 -23 -156 -23q-121 0 -182 54q-63 55 -63 149z" />
-<glyph unicode="&#x105;" d="M135 307q0 332 510 348l203 7v69q0 236 -244 236q-150 0 -328 -82l-63 137q199 96 383 96q223 0 328 -88q102 -86 102 -278v-752h-131l-37 152h-8q-74 -94 -158 -133t-209 -39q-164 0 -256 85.5t-92 241.5zM324 305q0 -178 200 -178q150 0 234 82q88 84 88 229v99 l-162 -7q-195 -8 -278 -61q-82 -51 -82 -164zM705 -252q0 144 190 252h131q-170 -127 -170 -238q0 -96 127 -96q68 0 123 15v-113q-78 -23 -156 -23q-121 0 -182 54q-63 55 -63 149z" />
-<glyph unicode="&#x106;" d="M129 733q0 344 178 547t490 203q219 0 383 -86l-78 -156q-156 78 -305 78q-215 0 -342 -158q-129 -160 -129 -430q0 -287 120 -438q119 -150 351 -150q135 0 327 58v-162q-150 -59 -358 -59q-310 0 -473 196q-164 199 -164 557zM660 1579v27q92 127 174 301h219v-21 q-109 -168 -272 -307h-121z" />
-<glyph unicode="&#x107;" d="M172 543q0 279 145 428q145 147 408 147q176 0 336 -59l-62 -158q-147 57 -268 57q-371 0 -371 -413q0 -406 361 -406q160 0 321 62v-160q-135 -61 -329 -61q-258 0 -400 145q-141 145 -141 418zM578 1241v27q92 127 174 301h219v-21q-109 -168 -272 -307h-121z" />
-<glyph unicode="&#x108;" d="M129 733q0 344 178 547t490 203q219 0 383 -86l-78 -156q-156 78 -305 78q-215 0 -342 -158q-129 -160 -129 -430q0 -287 120 -438q119 -150 351 -150q135 0 327 58v-162q-150 -59 -358 -59q-310 0 -473 196q-164 199 -164 557zM443 1579v27l59 67q141 156 176 234h193 q35 -78 176 -234l59 -67v-27h-121q-78 49 -211 186q-133 -137 -211 -186h-120z" />
-<glyph unicode="&#x109;" d="M172 543q0 279 145 428q145 147 408 147q176 0 336 -59l-62 -158q-147 57 -268 57q-371 0 -371 -413q0 -406 361 -406q160 0 321 62v-160q-135 -61 -329 -61q-258 0 -400 145q-141 145 -141 418zM367 1241v27l59 67q141 156 176 234h193q35 -78 176 -234l59 -67v-27h-121 q-78 49 -211 186q-133 -137 -211 -186h-120z" />
-<glyph unicode="&#x10a;" d="M129 733q0 344 178 547t490 203q219 0 383 -86l-78 -156q-156 78 -305 78q-215 0 -342 -158q-129 -160 -129 -430q0 -287 120 -438q119 -150 351 -150q135 0 327 58v-162q-150 -59 -358 -59q-310 0 -473 196q-164 199 -164 557zM672 1732.5q0 114.5 106.5 114.5 t106.5 -114.5t-106.5 -114.5t-106.5 114.5z" />
-<glyph unicode="&#x10b;" d="M172 543q0 279 145 428q145 147 408 147q176 0 336 -59l-62 -158q-147 57 -268 57q-371 0 -371 -413q0 -406 361 -406q160 0 321 62v-160q-135 -61 -329 -61q-258 0 -400 145q-141 145 -141 418zM592 1394.5q0 114.5 106.5 114.5t106.5 -114.5t-106.5 -114.5 t-106.5 114.5z" />
-<glyph unicode="&#x10c;" d="M129 733q0 344 178 547t490 203q219 0 383 -86l-78 -156q-156 78 -305 78q-215 0 -342 -158q-129 -160 -129 -430q0 -287 120 -438q119 -150 351 -150q135 0 327 58v-162q-150 -59 -358 -59q-310 0 -473 196q-164 199 -164 557zM437 1880v27h120q82 -55 211 -187 q123 129 211 187h121v-27l-59 -67q-143 -160 -176 -234h-193q-33 74 -176 234z" />
-<glyph unicode="&#x10d;" d="M172 543q0 279 145 428q145 147 408 147q176 0 336 -59l-62 -158q-147 57 -268 57q-371 0 -371 -413q0 -406 361 -406q160 0 321 62v-160q-135 -61 -329 -61q-258 0 -400 145q-141 145 -141 418zM375 1542v27h120q82 -55 211 -187q123 129 211 187h121v-27l-59 -67 q-143 -160 -176 -234h-193q-33 74 -176 234z" />
-<glyph unicode="&#x10e;" d="M135 0v1462h342q319 0 494 -188q176 -193 176 -529q0 -365 -182 -552q-186 -193 -529 -193h-301zM322 160h96q532 0 532 579q0 563 -493 564h-135v-1143zM275 1880v27h120q82 -55 211 -187q123 129 211 187h121v-27l-59 -67q-143 -160 -176 -234h-193q-33 74 -176 234z " />
-<glyph unicode="&#x10f;" d="M80 547q0 268 115 419.5t315 151.5q205 0 322 -160h12q-12 129 -12 162v436h182v-1556h-147l-27 147h-8q-115 -168 -322 -167q-203 0 -315 149q-115 152 -115 418zM269 545q0 -414 274 -414q152 0 219 88q66 88 70 287v41q0 229 -70 323q-72 96 -221 97q-272 0 -272 -422 zM1074 1229v26l26 107q27 127 35 194h180v-20q0 -14 -43 -113q-49 -111 -102 -194h-96z" />
-<glyph unicode="&#x110;" d="M0 659v162h135v641h342q319 0 494 -188q176 -193 176 -529q0 -365 -182 -552q-186 -193 -529 -193h-301v659h-135zM322 160h96q532 0 532 579q0 563 -493 564h-135v-482h380v-162h-380v-499z" />
-<glyph unicode="&#x111;" d="M137 526q0 260 115 405.5t315 145.5q207 0 322 -159h12q-12 127 -12 161v158h-379v137h379v182h182v-182h156v-137h-156v-1237h-147l-27 147h-8q-115 -168 -322 -167q-201 0 -315.5 145t-114.5 401zM326 524q0 -393 274 -393q150 0 217 82q70 84 72 274v39q0 217 -70 308 q-71 92 -221 92q-272 -1 -272 -402z" />
-<glyph unicode="&#x112;" d="M217 0v1462h842v-164h-656v-452h617v-162h-617v-520h656v-164h-842zM336 1579v150h575v-150h-575z" />
-<glyph unicode="&#x113;" d="M133 541q0 266 135 421.5t363 155.5q212 0 338 -135q127 -137 127 -356v-113h-774q9 -375 344 -375q199 0 370 76v-160q-170 -76 -364 -75q-244 0 -391 149q-148 151 -148 412zM326 662h573q0 305 -272 305q-276 0 -301 -305zM346 1241v150h575v-150h-575z" />
-<glyph unicode="&#x114;" d="M217 0v1462h842v-164h-656v-452h617v-162h-617v-520h656v-164h-842zM342 1856h109q6 -76 47 -101q39 -25 143 -24q182 0 191 125h112q-10 -127 -90 -201q-82 -76 -215 -76q-279 1 -297 277z" />
-<glyph unicode="&#x115;" d="M133 541q0 266 135 421.5t363 155.5q212 0 338 -135q127 -137 127 -356v-113h-774q9 -375 344 -375q199 0 370 76v-160q-170 -76 -364 -75q-244 0 -391 149q-148 151 -148 412zM326 662h573q0 305 -272 305q-276 0 -301 -305zM329 1518h109q6 -76 47 -101q39 -25 143 -24 q182 0 191 125h112q-10 -127 -90 -201q-82 -76 -215 -76q-279 1 -297 277z" />
-<glyph unicode="&#x116;" d="M217 0v1462h842v-164h-656v-452h617v-162h-617v-520h656v-164h-842zM543 1703.5q0 114.5 106.5 114.5t106.5 -114.5t-106.5 -114.5t-106.5 114.5z" />
-<glyph unicode="&#x117;" d="M133 541q0 266 135 421.5t363 155.5q212 0 338 -135q127 -137 127 -356v-113h-774q9 -375 344 -375q199 0 370 76v-160q-170 -76 -364 -75q-244 0 -391 149q-148 151 -148 412zM326 662h573q0 305 -272 305q-276 0 -301 -305zM531 1394.5q0 114.5 106.5 114.5 t106.5 -114.5t-106.5 -114.5t-106.5 114.5z" />
-<glyph unicode="&#x118;" d="M217 0v1462h842v-164h-656v-452h617v-162h-617v-520h656v-164h-842zM619 -252q0 144 190 252h131q-170 -127 -170 -238q0 -96 127 -96q68 0 123 15v-113q-78 -23 -156 -23q-121 0 -182 54q-63 55 -63 149z" />
-<glyph unicode="&#x119;" d="M133 541q0 266 135 421.5t363 155.5q212 0 338 -135q127 -137 127 -356v-113h-774q9 -375 344 -375q199 0 370 76v-160q-170 -76 -364 -75q-244 0 -391 149q-148 151 -148 412zM326 662h573q0 305 -272 305q-276 0 -301 -305zM641 -221q0 144 190 252h131 q-170 -127 -170 -238q0 -96 127 -96q68 0 123 15v-113q-78 -23 -156 -23q-121 0 -182 54q-63 55 -63 149z" />
-<glyph unicode="&#x11a;" d="M217 0v1462h842v-164h-656v-452h617v-162h-617v-520h656v-164h-842zM318 1880v27h120q82 -55 211 -187q123 129 211 187h121v-27l-59 -67q-143 -160 -176 -234h-193q-33 74 -176 234z" />
-<glyph unicode="&#x11b;" d="M133 541q0 266 135 421.5t363 155.5q212 0 338 -135q127 -137 127 -356v-113h-774q9 -375 344 -375q199 0 370 76v-160q-170 -76 -364 -75q-244 0 -391 149q-148 151 -148 412zM326 662h573q0 305 -272 305q-276 0 -301 -305zM308 1542v27h120q82 -55 211 -187 q123 129 211 187h121v-27l-59 -67q-143 -160 -176 -234h-193q-33 74 -176 234z" />
-<glyph unicode="&#x11c;" d="M117 733q0 352 161.5 551t446.5 199q193 0 346 -86l-72 -162q-150 84 -280 84q-193 0 -299.5 -155.5t-106.5 -432.5q0 -588 394 -588q94 0 202 29v436h-237v164h422v-717q-199 -76 -420 -75q-262 0 -410 200q-147 200 -147 553zM363 1579v27l59 67q141 156 176 234h193 q35 -78 176 -234l59 -67v-27h-121q-78 49 -211 186q-133 -137 -211 -186h-120z" />
-<glyph unicode="&#x11d;" d="M102 -186q0 212 240 270q-96 47 -96 154q0 113 133 192q-86 35 -139 123q-51 84 -52 186q0 182 106.5 280.5t303.5 98.5q88 0 150 -20h378v-113l-196 -27q66 -88 65 -213q0 -162 -106 -256q-109 -96 -297 -96q-55 0 -86 6q-100 -55 -100 -133q0 -84 161 -84h187 q172 0 266 -78q92 -76 92 -219q0 -377 -565 -377q-218 0 -332 80q-113 81 -113 226zM274 -180q0 -174 271 -174q395 0 395 223q0 88 -49 118.5t-199 30.5h-188q-230 1 -230 -198zM367 745q0 -227 227 -227q223 0 223 230q0 240 -225 239.5t-225 -242.5zM275 1241v27l59 67 q141 156 176 234h193q35 -78 176 -234l59 -67v-27h-121q-78 49 -211 186q-133 -137 -211 -186h-120z" />
-<glyph unicode="&#x11e;" d="M117 733q0 352 161.5 551t446.5 199q193 0 346 -86l-72 -162q-150 84 -280 84q-193 0 -299.5 -155.5t-106.5 -432.5q0 -588 394 -588q94 0 202 29v436h-237v164h422v-717q-199 -76 -420 -75q-262 0 -410 200q-147 200 -147 553zM411 1856h109q6 -76 47 -101 q39 -25 143 -24q182 0 191 125h112q-10 -127 -90 -201q-82 -76 -215 -76q-279 1 -297 277z" />
-<glyph unicode="&#x11f;" d="M102 -186q0 212 240 270q-96 47 -96 154q0 113 133 192q-86 35 -139 123q-51 84 -52 186q0 182 106.5 280.5t303.5 98.5q88 0 150 -20h378v-113l-196 -27q66 -88 65 -213q0 -162 -106 -256q-109 -96 -297 -96q-55 0 -86 6q-100 -55 -100 -133q0 -84 161 -84h187 q172 0 266 -78q92 -76 92 -219q0 -377 -565 -377q-218 0 -332 80q-113 81 -113 226zM274 -180q0 -174 271 -174q395 0 395 223q0 88 -49 118.5t-199 30.5h-188q-230 1 -230 -198zM367 745q0 -227 227 -227q223 0 223 230q0 240 -225 239.5t-225 -242.5zM301 1518h109 q6 -76 47 -101q39 -25 143 -24q182 0 191 125h112q-10 -127 -90 -201q-82 -76 -215 -76q-279 1 -297 277z" />
-<glyph unicode="&#x120;" d="M117 733q0 352 161.5 551t446.5 199q193 0 346 -86l-72 -162q-150 84 -280 84q-193 0 -299.5 -155.5t-106.5 -432.5q0 -588 394 -588q94 0 202 29v436h-237v164h422v-717q-199 -76 -420 -75q-262 0 -410 200q-147 200 -147 553zM617 1732.5q0 114.5 106.5 114.5 t106.5 -114.5t-106.5 -114.5t-106.5 114.5z" />
-<glyph unicode="&#x121;" d="M102 -186q0 212 240 270q-96 47 -96 154q0 113 133 192q-86 35 -139 123q-51 84 -52 186q0 182 106.5 280.5t303.5 98.5q88 0 150 -20h378v-113l-196 -27q66 -88 65 -213q0 -162 -106 -256q-109 -96 -297 -96q-55 0 -86 6q-100 -55 -100 -133q0 -84 161 -84h187 q172 0 266 -78q92 -76 92 -219q0 -377 -565 -377q-218 0 -332 80q-113 81 -113 226zM274 -180q0 -174 271 -174q395 0 395 223q0 88 -49 118.5t-199 30.5h-188q-230 1 -230 -198zM367 745q0 -227 227 -227q223 0 223 230q0 240 -225 239.5t-225 -242.5zM508 1394.5 q0 114.5 106.5 114.5t106.5 -114.5t-106.5 -114.5t-106.5 114.5z" />
-<glyph unicode="&#x122;" d="M117 733q0 352 161.5 551t446.5 199q193 0 346 -86l-72 -162q-150 84 -280 84q-193 0 -299.5 -155.5t-106.5 -432.5q0 -588 394 -588q94 0 202 29v436h-237v164h422v-717q-199 -76 -420 -75q-262 0 -410 200q-147 200 -147 553zM540 -426q63 145 84 301h178v-20 q0 -22 -49 -123q-51 -109 -114 -185h-99v27z" />
-<glyph unicode="&#x123;" d="M102 -186q0 212 240 270q-96 47 -96 154q0 113 133 192q-86 35 -139 123q-51 84 -52 186q0 182 106.5 280.5t303.5 98.5q88 0 150 -20h378v-113l-196 -27q66 -88 65 -213q0 -162 -106 -256q-109 -96 -297 -96q-55 0 -86 6q-100 -55 -100 -133q0 -84 161 -84h187 q172 0 266 -78q92 -76 92 -219q0 -377 -565 -377q-218 0 -332 80q-113 81 -113 226zM274 -180q0 -174 271 -174q395 0 395 223q0 88 -49 118.5t-199 30.5h-188q-230 1 -230 -198zM367 745q0 -227 227 -227q223 0 223 230q0 240 -225 239.5t-225 -242.5zM528 1241v21 q0 20 45 118q45 100 119 189h98v-27q-61 -145 -83 -301h-179z" />
-<glyph unicode="&#x124;" d="M135 0v1462h187v-616h585v616h187v-1462h-187v682h-585v-682h-187zM283 1579v27l59 67q141 156 176 234h193q35 -78 176 -234l59 -67v-27h-121q-78 49 -211 186q-133 -137 -211 -186h-120z" />
-<glyph unicode="&#x125;" d="M160 0v1556h182v-462l-8 -144h10q104 168 336 168q389 0 389 -401v-717h-182v707q0 260 -238 260q-307 0 -307 -398v-569h-182zM297 1634v27l59 67q141 156 176 234h193q35 -78 176 -234l59 -67v-27h-121q-78 49 -211 186q-133 -137 -211 -186h-120z" />
-<glyph unicode="&#x126;" d="M0 1069v150h135v243h187v-243h585v243h187v-243h135v-150h-135v-1069h-187v682h-585v-682h-187v1069h-135zM322 846h585v223h-585v-223z" />
-<glyph unicode="&#x127;" d="M4 1237v137h156v182h184v-182h418v-137h-420v-184l-10 -144h10q106 168 346 168q190 0 287 -96q94 -94 94 -305v-676h-182v666q0 260 -236 260q-160 0 -235 -95q-74 -92 -74 -303v-528h-182v1237h-156z" />
-<glyph unicode="&#x128;" d="M225 0v123l295 20v1176l-295 20v123h776v-123l-294 -20v-1176l294 -20v-123h-776zM254 1579q25 264 211 264q57 0 162 -55q104 -57 135 -57q82 0 106 114h105q-27 -264 -211 -264q-57 0 -158 57q-100 55 -139 56q-82 0 -107 -115h-104z" />
-<glyph unicode="&#x129;" d="M197 0v123l344 20v811l-269 21v123h451v-955l352 -20v-123h-878zM252 1241q25 264 211 264q57 0 162 -55q104 -57 135 -57q82 0 106 114h105q-27 -264 -211 -264q-57 0 -158 57q-100 55 -139 56q-82 0 -107 -115h-104z" />
-<glyph unicode="&#x12a;" d="M225 0v123l295 20v1176l-295 20v123h776v-123l-294 -20v-1176l294 -20v-123h-776zM328 1579v150h575v-150h-575z" />
-<glyph unicode="&#x12b;" d="M197 0v123l344 20v811l-269 21v123h451v-955l352 -20v-123h-878zM326 1241v150h575v-150h-575z" />
-<glyph unicode="&#x12c;" d="M225 0v123l295 20v1176l-295 20v123h776v-123l-294 -20v-1176l294 -20v-123h-776zM313 1856h109q6 -76 47 -101q39 -25 143 -24q182 0 191 125h112q-10 -127 -90 -201q-82 -76 -215 -76q-279 1 -297 277z" />
-<glyph unicode="&#x12d;" d="M197 0v123l344 20v811l-269 21v123h451v-955l352 -20v-123h-878zM338 1518h109q6 -76 47 -101q39 -25 143 -24q182 0 191 125h112q-10 -127 -90 -201q-82 -76 -215 -76q-279 1 -297 277z" />
-<glyph unicode="&#x12e;" d="M225 0v123l295 20v1176l-295 20v123h776v-123l-294 -20v-1176l294 -20v-123h-776zM422 -252q0 144 190 252h131q-170 -127 -170 -238q0 -96 127 -96q68 0 123 15v-113q-78 -23 -156 -23q-121 0 -182 54q-63 55 -63 149z" />
-<glyph unicode="&#x12f;" d="M197 0v123l344 20v811l-269 21v123h451v-955l352 -20v-123h-878zM526 1435.5q0 114.5 106.5 114.5t106.5 -114q0 -57 -32.5 -86t-73.5 -29q-107 0 -107 114.5zM439 -252q0 144 190 252h131q-170 -127 -170 -238q0 -96 127 -96q68 0 123 15v-113q-78 -23 -156 -23 q-121 0 -182 54q-63 55 -63 149z" />
-<glyph unicode="&#x130;" d="M225 0v123l295 20v1176l-295 20v123h776v-123l-294 -20v-1176l294 -20v-123h-776zM508 1732.5q0 114.5 106.5 114.5t106.5 -114.5t-106.5 -114.5t-106.5 114.5z" />
-<glyph unicode="&#x131;" d="M197 0v123l344 20v811l-269 21v123h451v-955l352 -20v-123h-878z" />
-<glyph unicode="&#x132;" d="M156 0v1462h186v-1462h-186zM492 23v163q90 -45 186 -45q195 0 194 283v1038h187v-1026q0 -457 -365 -456q-134 0 -202 43z" />
-<glyph unicode="&#x133;" d="M188 1435.5q0 114.5 106.5 114.5t106.5 -114q0 -57 -32.5 -86t-73.5 -29q-107 0 -107 114.5zM203 0v1098h182v-1098h-182zM502 -303q86 -39 190 -39q164 0 164 215v1081l-215 21v123h397v-1215q0 -182 -86 -278.5t-235 -96.5q-121 0 -215 35v154zM821 1435.5 q0 114.5 106.5 114.5t106.5 -114q0 -58 -30 -86q-33 -29 -76 -29q-107 0 -107 114.5z" />
-<glyph unicode="&#x134;" d="M137 39v166q162 -61 309 -62q162 0 254.5 80t92.5 226v1013h186v-1011q0 -215 -141 -345q-139 -127 -377 -126q-215 0 -324 59zM551 1579v27l59 67q141 156 176 234h193q35 -78 176 -234l59 -67v-27h-121q-78 49 -211 186q-133 -137 -211 -186h-120z" />
-<glyph unicode="&#x135;" d="M303 1241v27l59 67q141 156 176 234h193q35 -78 176 -234l59 -67v-27h-121q-78 49 -211 186q-133 -137 -211 -186h-120zM135 -303q131 -39 289 -39q119 0 182 57q66 59 66 158v1081l-420 21v123h602v-1215q0 -180 -113 -278q-111 -96 -319 -97q-160 0 -287 35v154z" />
-<glyph unicode="&#x136;" d="M211 0v1462h186v-731l121 168l453 563h209l-521 -637l539 -825h-211l-450 698l-140 -114v-584h-186zM510 -426q63 145 84 301h178v-20q0 -22 -49 -123q-51 -109 -114 -185h-99v27z" />
-<glyph unicode="&#x137;" d="M215 0v1556h180v-714l-16 -289h4l135 152l395 393h222l-494 -475l522 -623h-213l-426 504l-129 -82v-422h-180zM485 -426q63 145 84 301h178v-20q0 -22 -49 -123q-51 -109 -114 -185h-99v27z" />
-<glyph unicode="&#x138;" d="M215 0v1098h180v-291l-16 -299h4l137 166l402 424h213l-494 -510l522 -588h-213l-426 469l-129 -82v-387h-180z" />
-<glyph unicode="&#x139;" d="M233 0v1462h187v-1296h635v-166h-822zM262 1579v27q92 127 174 301h219v-21q-109 -168 -272 -307h-121z" />
-<glyph unicode="&#x13a;" d="M188 0v123l344 20v1270l-268 21v122h451v-1413l352 -20v-123h-879zM496 1636v27q92 127 174 301h219v-21q-109 -168 -272 -307h-121z" />
-<glyph unicode="&#x13b;" d="M233 0v1462h187v-1296h635v-166h-822zM491 -426q63 145 84 301h178v-20q0 -22 -49 -123q-51 -109 -114 -185h-99v27z" />
-<glyph unicode="&#x13c;" d="M188 0v123l344 20v1270l-268 21v122h451v-1413l352 -20v-123h-879zM460 -426q63 145 84 301h178v-20q0 -22 -49 -123q-51 -109 -114 -185h-99v27z" />
-<glyph unicode="&#x13d;" d="M233 0v1462h187v-1296h635v-166h-822zM750 1137v26l26 107q27 127 35 194h180v-20q0 -14 -43 -113q-49 -111 -102 -194h-96z" />
-<glyph unicode="&#x13e;" d="M188 0v123l344 20v1270l-268 21v122h451v-1413l352 -20v-123h-879zM865 1229v26l26 107q27 127 35 194h180v-20q0 -14 -43 -113q-49 -111 -102 -194h-96z" />
-<glyph unicode="&#x13f;" d="M233 0v1462h187v-1296h635v-166h-822zM750 773.5q0 114.5 106.5 114.5t106.5 -114.5t-106.5 -114.5t-106.5 114.5z" />
-<glyph unicode="&#x140;" d="M188 0v123l344 20v1270l-268 21v122h451v-1413l352 -20v-123h-879zM866 681.5q0 114.5 106.5 114.5t106.5 -114.5t-106.5 -114.5t-106.5 114.5z" />
-<glyph unicode="&#x141;" d="M72 539l198 125v798h187v-680l299 189l78 -125l-377 -238v-442h635v-166h-822v492l-125 -78z" />
-<glyph unicode="&#x142;" d="M188 0v123l344 20v449l-141 -92l-78 121l219 143v649l-268 21v122h451v-673l164 108l77 -121l-241 -159v-568l352 -20v-123h-879z" />
-<glyph unicode="&#x143;" d="M135 0v1462h213l578 -1204h6q-14 285 -14 404v800h174v-1462h-215l-580 1210h-8q18 -276 18 -417v-793h-172zM516 1579v27q92 127 174 301h219v-21q-109 -168 -272 -307h-121z" />
-<glyph unicode="&#x144;" d="M160 0v1098h147l27 -148h10q104 168 336 168q389 0 389 -401v-717h-182v707q0 260 -238 260q-307 0 -307 -398v-569h-182zM529 1241v27q92 127 174 301h219v-21q-109 -168 -272 -307h-121z" />
-<glyph unicode="&#x145;" d="M135 0v1462h213l578 -1204h6q-14 285 -14 404v800h174v-1462h-215l-580 1210h-8q18 -276 18 -417v-793h-172zM434 -426q63 145 84 301h178v-20q0 -22 -49 -123q-51 -109 -114 -185h-99v27z" />
-<glyph unicode="&#x146;" d="M160 0v1098h147l27 -148h10q104 168 336 168q389 0 389 -401v-717h-182v707q0 260 -238 260q-307 0 -307 -398v-569h-182zM454 -426q63 145 84 301h178v-20q0 -22 -49 -123q-51 -109 -114 -185h-99v27z" />
-<glyph unicode="&#x147;" d="M135 0v1462h213l578 -1204h6q-14 285 -14 404v800h174v-1462h-215l-580 1210h-8q18 -276 18 -417v-793h-172zM281 1880v27h120q82 -55 211 -187q123 129 211 187h121v-27l-59 -67q-143 -160 -176 -234h-193q-33 74 -176 234z" />
-<glyph unicode="&#x148;" d="M160 0v1098h147l27 -148h10q104 168 336 168q389 0 389 -401v-717h-182v707q0 260 -238 260q-307 0 -307 -398v-569h-182zM295 1542v27h120q82 -55 211 -187q123 129 211 187h121v-27l-59 -67q-143 -160 -176 -234h-193q-33 74 -176 234z" />
-<glyph unicode="&#x149;" d="M-16 961q59 231 100 501h199l14 -22q-47 -190 -176 -479h-137zM262 0v1098h148l26 -148h10q43 77 129 123q84 45 189 45q367 0 366 -401v-717h-182v707q0 260 -219 260q-285 0 -285 -398v-569h-182z" />
-<glyph unicode="&#x14a;" d="M135 0v1462h213l578 -1128h10q-18 272 -18 403v725h174v-1442q0 -201 -101 -303q-102 -106 -286 -106q-94 0 -156 24v160q74 -20 158 -20q211 0 211 225l-621 1210h-8q18 -276 18 -417v-793h-172z" />
-<glyph unicode="&#x14b;" d="M160 0v1098h147l27 -148h10q104 168 336 168q389 0 389 -401v-875q0 -334 -291 -334q-82 0 -133 25v148q53 -20 115 -21q127 0 127 170v877q0 260 -238 260q-307 0 -307 -398v-569h-182z" />
-<glyph unicode="&#x14c;" d="M84 735q0 750 534 750q258 0 392 -195q137 -199 137 -557q0 -362 -137 -557q-138 -197 -394 -196q-532 -1 -532 755zM281 733q0 -590 335 -590q174 0 254 145.5t80 444.5q0 305 -82 445q-84 143 -250 143q-337 0 -337 -588zM330 1579v150h575v-150h-575z" />
-<glyph unicode="&#x14d;" d="M115 551q0 264 135 415.5t366 151.5q217 0 356.5 -155.5t139.5 -411.5q0 -266 -137 -418q-139 -154 -365 -153q-219 0 -356 155q-139 158 -139 416zM303 551q0 -420 311 -420q309 0 310 420q0 416 -312 416q-309 0 -309 -416zM326 1241v150h575v-150h-575z" />
-<glyph unicode="&#x14e;" d="M84 735q0 750 534 750q258 0 392 -195q137 -199 137 -557q0 -362 -137 -557q-138 -197 -394 -196q-532 -1 -532 755zM281 733q0 -590 335 -590q174 0 254 145.5t80 444.5q0 305 -82 445q-84 143 -250 143q-337 0 -337 -588zM313 1856h109q6 -76 47 -101q39 -25 143 -24 q182 0 191 125h112q-10 -127 -90 -201q-82 -76 -215 -76q-279 1 -297 277z" />
-<glyph unicode="&#x14f;" d="M115 551q0 264 135 415.5t366 151.5q217 0 356.5 -155.5t139.5 -411.5q0 -266 -137 -418q-139 -154 -365 -153q-219 0 -356 155q-139 158 -139 416zM303 551q0 -420 311 -420q309 0 310 420q0 416 -312 416q-309 0 -309 -416zM313 1518h109q6 -76 47 -101q39 -25 143 -24 q182 0 191 125h112q-10 -127 -90 -201q-82 -76 -215 -76q-279 1 -297 277z" />
-<glyph unicode="&#x150;" d="M84 735q0 750 534 750q258 0 392 -195q137 -199 137 -557q0 -362 -137 -557q-138 -197 -394 -196q-532 -1 -532 755zM281 733q0 -590 335 -590q174 0 254 145.5t80 444.5q0 305 -82 445q-84 143 -250 143q-337 0 -337 -588zM326 1579v27q92 127 174 301h198v-21 q-109 -168 -272 -307h-100zM688 1579v27q92 125 174 301h199v-21q-109 -168 -272 -307h-101z" />
-<glyph unicode="&#x151;" d="M115 551q0 264 135 415.5t366 151.5q217 0 356.5 -155.5t139.5 -411.5q0 -266 -137 -418q-139 -154 -365 -153q-219 0 -356 155q-139 158 -139 416zM303 551q0 -420 311 -420q309 0 310 420q0 416 -312 416q-309 0 -309 -416zM328 1241v27q92 127 174 301h198v-21 q-109 -168 -272 -307h-100zM690 1241v27q92 125 174 301h199v-21q-109 -168 -272 -307h-101z" />
-<glyph unicode="&#x152;" d="M20 735q0 750 512 750q80 0 154 -23h541v-164h-398v-452h359v-162h-359v-520h398v-164h-574l-49 -10q-57 -10 -96 -10q-488 -1 -488 755zM209 733q0 -590 309 -590q70 0 133 33v1112q-57 33 -131 33q-311 0 -311 -588z" />
-<glyph unicode="&#x153;" d="M57 551q0 268 88 417.5t242 149.5q172 0 260 -217q82 217 242 217q131 0 209 -133q76 -131 76 -358v-113h-439q2 -375 189 -375q111 0 204 76v-162q-96 -74 -217 -73q-88 0 -159 59q-70 57 -101 162q-90 -221 -266 -221q-145 0 -238 153q-90 150 -90 418zM227 551 q0 -213 39 -315q41 -104 131 -105q168 0 168 410q0 426 -170 426q-90 0 -129 -102.5t-39 -313.5zM737 662h260q0 305 -123 305q-125 0 -137 -305z" />
-<glyph unicode="&#x154;" d="M186 0v1462h357q520 0 520 -415q0 -287 -289 -392l397 -655h-219l-350 604h-229v-604h-187zM373 762h164q170 0 251.5 65.5t81.5 210.5q0 141 -79.5 203t-258.5 62h-159v-541zM447 1579v27q92 127 174 301h219v-21q-109 -168 -272 -307h-121z" />
-<glyph unicode="&#x155;" d="M264 0v1098h148l22 -201h8q76 117 162 170q84 51 215 51q119 0 240 -45l-49 -166q-121 45 -224 45q-163 0 -251 -92q-88 -90 -89 -268v-592h-182zM510 1241v27q92 127 174 301h219v-21q-109 -168 -272 -307h-121z" />
-<glyph unicode="&#x156;" d="M186 0v1462h357q520 0 520 -415q0 -287 -289 -392l397 -655h-219l-350 604h-229v-604h-187zM373 762h164q170 0 251.5 65.5t81.5 210.5q0 141 -79.5 203t-258.5 62h-159v-541zM481 -426q63 145 84 301h178v-20q0 -22 -49 -123q-51 -109 -114 -185h-99v27z" />
-<glyph unicode="&#x157;" d="M264 0v1098h148l22 -201h8q76 117 162 170q84 51 215 51q119 0 240 -45l-49 -166q-121 45 -224 45q-163 0 -251 -92q-88 -90 -89 -268v-592h-182zM186 -426q63 145 84 301h178v-20q0 -22 -49 -123q-51 -109 -114 -185h-99v27z" />
-<glyph unicode="&#x158;" d="M186 0v1462h357q520 0 520 -415q0 -287 -289 -392l397 -655h-219l-350 604h-229v-604h-187zM373 762h164q170 0 251.5 65.5t81.5 210.5q0 141 -79.5 203t-258.5 62h-159v-541zM252 1880v27h120q82 -55 211 -187q123 129 211 187h121v-27l-59 -67q-143 -160 -176 -234 h-193q-33 74 -176 234z" />
-<glyph unicode="&#x159;" d="M264 0v1098h148l22 -201h8q76 117 162 170q84 51 215 51q119 0 240 -45l-49 -166q-121 45 -224 45q-163 0 -251 -92q-88 -90 -89 -268v-592h-182zM295 1542v27h120q82 -55 211 -187q123 129 211 187h121v-27l-59 -67q-143 -160 -176 -234h-193q-33 74 -176 234z" />
-<glyph unicode="&#x15a;" d="M141 49v178q211 -86 414 -86q350 0 350 240q0 104 -71 160q-74 57 -285 133q-211 74 -299 174q-90 102 -90 264q0 174 129 272.5t352 98.5q225 0 416 -78l-64 -164q-197 78 -360 78q-293 0 -293 -209q0 -102 66 -164q66 -63 270 -133q244 -88 327.5 -182t83.5 -240 q0 -190 -139 -301q-138 -111 -393 -110q-258 -1 -414 69zM514 1579v27q92 127 174 301h219v-21q-109 -168 -272 -307h-121z" />
-<glyph unicode="&#x15b;" d="M203 49v166q195 -86 370 -86q274 0 275 162q0 55 -49 98t-226 107q-233 86 -294 159q-59 72 -60 172q0 135 111 213q113 78 309.5 78t368.5 -74l-60 -149q-184 72 -319 72q-236 0 -236 -133q0 -57 51.5 -96.5t231.5 -102.5q207 -76 280 -152q70 -72 70 -182 q0 -150 -116.5 -235.5t-331.5 -85.5q-246 -1 -375 69zM512 1241v27q92 127 174 301h219v-21q-109 -168 -272 -307h-121z" />
-<glyph unicode="&#x15c;" d="M141 49v178q211 -86 414 -86q350 0 350 240q0 104 -71 160q-74 57 -285 133q-211 74 -299 174q-90 102 -90 264q0 174 129 272.5t352 98.5q225 0 416 -78l-64 -164q-197 78 -360 78q-293 0 -293 -209q0 -102 66 -164q66 -63 270 -133q244 -88 327.5 -182t83.5 -240 q0 -190 -139 -301q-138 -111 -393 -110q-258 -1 -414 69zM303 1579v27l59 67q141 156 176 234h193q35 -78 176 -234l59 -67v-27h-121q-78 49 -211 186q-133 -137 -211 -186h-120z" />
-<glyph unicode="&#x15d;" d="M203 49v166q195 -86 370 -86q274 0 275 162q0 55 -49 98t-226 107q-233 86 -294 159q-59 72 -60 172q0 135 111 213q113 78 309.5 78t368.5 -74l-60 -149q-184 72 -319 72q-236 0 -236 -133q0 -57 51.5 -96.5t231.5 -102.5q207 -76 280 -152q70 -72 70 -182 q0 -150 -116.5 -235.5t-331.5 -85.5q-246 -1 -375 69zM306 1241v27l59 67q141 156 176 234h193q35 -78 176 -234l59 -67v-27h-121q-78 49 -211 186q-133 -137 -211 -186h-120z" />
-<glyph unicode="&#x15e;" d="M141 49v178q211 -86 414 -86q350 0 350 240q0 104 -71 160q-74 57 -285 133q-211 74 -299 174q-90 102 -90 264q0 174 129 272.5t352 98.5q225 0 416 -78l-64 -164q-197 78 -360 78q-293 0 -293 -209q0 -102 66 -164q66 -63 270 -133q244 -88 327.5 -182t83.5 -240 q0 -190 -139 -301q-138 -111 -393 -110q-258 -1 -414 69zM405 -375q34 -6 80 -6q152 0 151 92q0 72 -172 113l91 176h120l-57 -115q160 -37 160 -172q0 -205 -291 -205q-39 0 -82 9v108z" />
-<glyph unicode="&#x15f;" d="M203 49v166q195 -86 370 -86q274 0 275 162q0 55 -49 98t-226 107q-233 86 -294 159q-59 72 -60 172q0 135 111 213q113 78 309.5 78t368.5 -74l-60 -149q-184 72 -319 72q-236 0 -236 -133q0 -57 51.5 -96.5t231.5 -102.5q207 -76 280 -152q70 -72 70 -182 q0 -150 -116.5 -235.5t-331.5 -85.5q-246 -1 -375 69zM420 -375q34 -6 80 -6q152 0 151 92q0 72 -172 113l91 176h120l-57 -115q160 -37 160 -172q0 -205 -291 -205q-39 0 -82 9v108z" />
-<glyph unicode="&#x160;" d="M141 49v178q211 -86 414 -86q350 0 350 240q0 104 -71 160q-74 57 -285 133q-211 74 -299 174q-90 102 -90 264q0 174 129 272.5t352 98.5q225 0 416 -78l-64 -164q-197 78 -360 78q-293 0 -293 -209q0 -102 66 -164q66 -63 270 -133q244 -88 327.5 -182t83.5 -240 q0 -190 -139 -301q-138 -111 -393 -110q-258 -1 -414 69zM314 1880v27h120q82 -55 211 -187q123 129 211 187h121v-27l-59 -67q-143 -160 -176 -234h-193q-33 74 -176 234z" />
-<glyph unicode="&#x161;" d="M203 49v166q195 -86 370 -86q274 0 275 162q0 55 -49 98t-226 107q-233 86 -294 159q-59 72 -60 172q0 135 111 213q113 78 309.5 78t368.5 -74l-60 -149q-184 72 -319 72q-236 0 -236 -133q0 -57 51.5 -96.5t231.5 -102.5q207 -76 280 -152q70 -72 70 -182 q0 -150 -116.5 -235.5t-331.5 -85.5q-246 -1 -375 69zM293 1542v27h120q82 -55 211 -187q123 129 211 187h121v-27l-59 -67q-143 -160 -176 -234h-193q-33 74 -176 234z" />
-<glyph unicode="&#x162;" d="M102 1298v164h1022v-164h-417v-1298h-187v1298h-418zM448 -426q63 145 84 301h178v-20q0 -22 -49 -123q-51 -109 -114 -185h-99v27z" />
-<glyph unicode="&#x163;" d="M139 961v94l267 49l77 287h105v-293h438v-137h-438v-637q0 -195 192 -195q98 0 240 21v-138q-137 -33 -252 -32q-362 0 -362 344v637h-267zM489 -426q63 145 84 301h178v-20q0 -22 -49 -123q-51 -109 -114 -185h-99v27z" />
-<glyph unicode="&#x164;" d="M102 1298v164h1022v-164h-417v-1298h-187v1298h-418zM283 1880v27h120q82 -55 211 -187q123 129 211 187h121v-27l-59 -67q-143 -160 -176 -234h-193q-33 74 -176 234z" />
-<glyph unicode="&#x165;" d="M139 961v94l267 49l77 287h105v-293h438v-137h-438v-637q0 -195 192 -195q98 0 240 21v-138q-137 -33 -252 -32q-362 0 -362 344v637h-267zM799 1229v26l26 107q27 127 35 194h180v-20q0 -14 -43 -113q-49 -111 -102 -194h-96z" />
-<glyph unicode="&#x166;" d="M102 1298v164h1022v-164h-417v-479h294v-149h-294v-670h-187v670h-297v149h297v479h-418z" />
-<glyph unicode="&#x167;" d="M139 961v94l267 49l77 287h105v-293h438v-137h-438v-248h307v-138h-307v-251q0 -195 192 -195q98 0 240 21v-138q-137 -33 -252 -32q-362 0 -362 344v251h-162v138h162v248h-267z" />
-<glyph unicode="&#x168;" d="M125 520v942h186v-932q0 -387 307 -387q293 0 300 389v932h186v-948q0 -260 -125 -397q-127 -139 -371 -139q-483 -1 -483 540zM260 1579q25 264 211 264q57 0 162 -55q104 -57 135 -57q82 0 106 114h105q-27 -264 -211 -264q-57 0 -158 57q-100 55 -139 56 q-82 0 -107 -115h-104z" />
-<glyph unicode="&#x169;" d="M160 381v717h182v-707q0 -260 236 -260q162 0 235.5 92t73.5 305v570h182v-1098h-147l-27 147h-10q-106 -168 -334 -167q-391 0 -391 401zM256 1241q25 264 211 264q57 0 162 -55q104 -57 135 -57q82 0 106 114h105q-27 -264 -211 -264q-57 0 -158 57q-100 55 -139 56 q-82 0 -107 -115h-104z" />
-<glyph unicode="&#x16a;" d="M125 520v942h186v-932q0 -387 307 -387q293 0 300 389v932h186v-948q0 -260 -125 -397q-127 -139 -371 -139q-483 -1 -483 540zM326 1579v150h575v-150h-575z" />
-<glyph unicode="&#x16b;" d="M160 381v717h182v-707q0 -260 236 -260q162 0 235.5 92t73.5 305v570h182v-1098h-147l-27 147h-10q-106 -168 -334 -167q-391 0 -391 401zM328 1241v150h575v-150h-575z" />
-<glyph unicode="&#x16c;" d="M125 520v942h186v-932q0 -387 307 -387q293 0 300 389v932h186v-948q0 -260 -125 -397q-127 -139 -371 -139q-483 -1 -483 540zM313 1856h109q6 -76 47 -101q39 -25 143 -24q182 0 191 125h112q-10 -127 -90 -201q-82 -76 -215 -76q-279 1 -297 277z" />
-<glyph unicode="&#x16d;" d="M160 381v717h182v-707q0 -260 236 -260q162 0 235.5 92t73.5 305v570h182v-1098h-147l-27 147h-10q-106 -168 -334 -167q-391 0 -391 401zM313 1518h109q6 -76 47 -101q39 -25 143 -24q182 0 191 125h112q-10 -127 -90 -201q-82 -76 -215 -76q-279 1 -297 277z" />
-<glyph unicode="&#x16e;" d="M125 520v942h186v-932q0 -387 307 -387q293 0 300 389v932h186v-948q0 -260 -125 -397q-127 -139 -371 -139q-483 -1 -483 540zM389 1794q0 100 62 158q59 57 161 57q100 0 166 -59q63 -57 64 -154q0 -100 -64 -158q-66 -59 -166 -59q-102 0 -161 57q-62 58 -62 158z M500 1794q0 -113 112 -113q53 0 82 29q31 31 31 84q0 51 -30.5 82t-82.5 31q-49 0 -80 -31q-32 -33 -32 -82z" />
-<glyph unicode="&#x16f;" d="M160 381v717h182v-707q0 -260 236 -260q162 0 235.5 92t73.5 305v570h182v-1098h-147l-27 147h-10q-106 -168 -334 -167q-391 0 -391 401zM385 1456q0 100 62 158q59 57 161 57q100 0 166 -59q63 -57 64 -154q0 -100 -64 -158q-66 -59 -166 -59q-102 0 -161 57 q-62 58 -62 158zM496 1456q0 -113 112 -113q53 0 82 29q31 31 31 84q0 51 -30.5 82t-82.5 31q-49 0 -80 -31q-32 -33 -32 -82z" />
-<glyph unicode="&#x170;" d="M125 520v942h186v-932q0 -387 307 -387q293 0 300 389v932h186v-948q0 -260 -125 -397q-127 -139 -371 -139q-483 -1 -483 540zM322 1579v27q92 127 174 301h198v-21q-109 -168 -272 -307h-100zM684 1579v27q92 125 174 301h199v-21q-109 -168 -272 -307h-101z" />
-<glyph unicode="&#x171;" d="M160 381v717h182v-707q0 -260 236 -260q162 0 235.5 92t73.5 305v570h182v-1098h-147l-27 147h-10q-106 -168 -334 -167q-391 0 -391 401zM326 1241v27q92 127 174 301h198v-21q-109 -168 -272 -307h-100zM688 1241v27q92 125 174 301h199v-21q-109 -168 -272 -307h-101z " />
-<glyph unicode="&#x172;" d="M125 520v942h186v-932q0 -387 307 -387q293 0 300 389v932h186v-948q0 -260 -125 -397q-127 -139 -371 -139q-483 -1 -483 540zM441 -252q0 144 190 252h131q-170 -127 -170 -238q0 -96 127 -96q68 0 123 15v-113q-78 -23 -156 -23q-121 0 -182 54q-63 55 -63 149z" />
-<glyph unicode="&#x173;" d="M160 381v717h182v-707q0 -260 236 -260q162 0 235.5 92t73.5 305v570h182v-1098h-147l-27 147h-10q-106 -168 -334 -167q-391 0 -391 401zM723 -252q0 144 190 252h131q-170 -127 -170 -238q0 -96 127 -96q68 0 123 15v-113q-78 -23 -156 -23q-121 0 -182 54 q-63 55 -63 149z" />
-<glyph unicode="&#x174;" d="M2 1462h170l88 -663q18 -145 39 -377q18 -203 18 -242q27 162 70 312l141 516h177l145 -521q57 -205 72 -307q6 92 65 619l70 663h170l-187 -1462h-190l-168 580q-43 147 -66 282q-31 -168 -65 -284l-156 -578h-190zM285 1579v27l59 67q141 156 176 234h193 q35 -78 176 -234l59 -67v-27h-121q-78 49 -211 186q-133 -137 -211 -186h-120z" />
-<glyph unicode="&#x175;" d="M-4 1098h162l98 -543q39 -215 57 -393h6q33 195 68 358l133 578h193l127 -578q43 -188 67 -358h6q29 225 60 393l102 543h158l-225 -1098h-195l-131 596l-68 330h-6l-65 -334l-135 -592h-189zM281 1241v27l59 67q141 156 176 234h193q35 -78 176 -234l59 -67v-27h-121 q-78 49 -211 186q-133 -137 -211 -186h-120z" />
-<glyph unicode="&#x176;" d="M33 1462h203l376 -739l381 739h201l-487 -893v-569h-187v559zM283 1579v27l59 67q141 156 176 234h193q35 -78 176 -234l59 -67v-27h-121q-78 49 -211 186q-133 -137 -211 -186h-120z" />
-<glyph unicode="&#x177;" d="M82 1098h188l262 -654q82 -203 89 -290h6q20 106 90 292l239 652h189l-475 -1241q-70 -178 -156 -263q-89 -86 -246 -86q-94 0 -168 17v145q61 -12 136 -12q96 0 149 41t96 141l58 150zM285 1241v27l59 67q141 156 176 234h193q35 -78 176 -234l59 -67v-27h-121 q-78 49 -211 186q-133 -137 -211 -186h-120z" />
-<glyph unicode="&#x178;" d="M33 1462h203l376 -739l381 739h201l-487 -893v-569h-187v559zM332 1732.5q0 102.5 96 102.5t96 -102.5t-96 -102.5t-96 102.5zM707 1732.5q0 102.5 96 102.5t96 -102.5t-96 -102.5t-96 102.5z" />
-<glyph unicode="&#x179;" d="M102 0v145l793 1151h-772v166h981v-145l-793 -1151h813v-166h-1022zM475 1579v27q92 127 174 301h219v-21q-109 -168 -272 -307h-121z" />
-<glyph unicode="&#x17a;" d="M182 0v125l660 836h-627v137h811v-146l-647 -815h665v-137h-862zM496 1241v27q92 127 174 301h219v-21q-109 -168 -272 -307h-121z" />
-<glyph unicode="&#x17b;" d="M102 0v145l793 1151h-772v166h981v-145l-793 -1151h813v-166h-1022zM524 1732.5q0 114.5 106.5 114.5t106.5 -114.5t-106.5 -114.5t-106.5 114.5z" />
-<glyph unicode="&#x17c;" d="M182 0v125l660 836h-627v137h811v-146l-647 -815h665v-137h-862zM524 1394.5q0 114.5 106.5 114.5t106.5 -114.5t-106.5 -114.5t-106.5 114.5z" />
-<glyph unicode="&#x17d;" d="M102 0v145l793 1151h-772v166h981v-145l-793 -1151h813v-166h-1022zM283 1880v27h120q82 -55 211 -187q123 129 211 187h121v-27l-59 -67q-143 -160 -176 -234h-193q-33 74 -176 234z" />
-<glyph unicode="&#x17e;" d="M182 0v125l660 836h-627v137h811v-146l-647 -815h665v-137h-862zM295 1542v27h120q82 -55 211 -187q123 129 211 187h121v-27l-59 -67q-143 -160 -176 -234h-193q-33 74 -176 234z" />
-<glyph unicode="&#x17f;" d="M356 0v1200q0 188 90 279q88 88 299 88q121 0 273 -35l-41 -143q-109 29 -227.5 28.5t-163.5 -49.5q-47 -51 -47 -166v-1202h-183z" />
-<glyph unicode="&#x192;" d="M215 -324q59 -18 115 -18q92 0 123 51q33 55 32 164v963h-194v75l194 68v137q0 190 76 278.5t256 88.5q96 0 197 -37l-47 -141q-82 29 -144 28q-92 0 -123 -51q-33 -55 -32 -164v-145h245v-137h-245v-961q0 -190 -76 -278.5t-256 -88.5q-55 0 -121 15v153z" />
-<glyph unicode="&#x1f0;" d="M135 -303q131 -39 289 -39q119 0 182 57q66 59 66 158v1081l-420 21v123h602v-1215q0 -180 -113 -278q-111 -96 -319 -97q-160 0 -287 35v154zM275 1542v27h120q82 -55 211 -187q123 129 211 187h121v-27l-59 -67q-143 -160 -176 -234h-193q-33 74 -176 234z" />
-<glyph unicode="&#x1fa;" d="M33 0l483 1468h195l485 -1468h-192l-144 453h-491l-146 -453h-190zM422 618h385l-133 424q-39 121 -62 226q-20 -88 -47 -183zM389 1581q0 100 62 158q59 57 161 57q100 0 166 -59q63 -57 64 -154q0 -100 -64 -158q-66 -59 -166 -59q-102 0 -161 57q-62 58 -62 158z M500 1581q0 -113 112 -113q53 0 82 29q31 31 31 84q0 51 -30.5 82t-82.5 31q-49 0 -80 -31q-32 -33 -32 -82zM490 1835v27q92 127 174 301h219v-21q-109 -168 -272 -307h-121z" />
-<glyph unicode="&#x1fb;" d="M135 307q0 332 510 348l203 7v69q0 236 -244 236q-150 0 -328 -82l-63 137q199 96 383 96q223 0 328 -88q102 -86 102 -278v-752h-131l-37 152h-8q-74 -94 -158 -133t-209 -39q-164 0 -256 85.5t-92 241.5zM324 305q0 -178 200 -178q150 0 234 82q88 84 88 229v99 l-162 -7q-195 -8 -278 -61q-82 -51 -82 -164zM387 1456q0 100 62 158q59 57 161 57q100 0 166 -59q63 -57 64 -154q0 -100 -64 -158q-66 -59 -166 -59q-102 0 -161 57q-62 58 -62 158zM498 1456q0 -113 112 -113q53 0 82 29q31 31 31 84q0 51 -30.5 82t-82.5 31 q-49 0 -80 -31q-32 -33 -32 -82zM512 1720v27q92 127 174 301h219v-21q-109 -168 -272 -307h-121z" />
-<glyph unicode="&#x1fc;" d="M0 0l338 1462h872v-164h-477v-452h438v-162h-438v-520h477v-164h-653v453h-289l-96 -453h-172zM305 618h252v680h-106zM631 1579v27q92 127 174 301h219v-21q-109 -168 -272 -307h-121z" />
-<glyph unicode="&#x1fd;" d="M45 307q0 334 328 348l149 7v69q0 236 -139 236q-109 0 -211 -82l-57 137q133 96 276 96q187 0 246 -178q77 178 240 178q137 0 223 -135t86 -356v-113h-496q3 -190 68 -283q66 -92 168 -92q113 0 233 76v-162q-106 -74 -241 -73q-221 0 -316 229q-104 -229 -301 -229 q-117 0 -186 86q-70 83 -70 241zM215 305q0 -82 33 -131q31 -47 86 -47q84 0 135 82t51 229v99l-88 -7q-217 -18 -217 -225zM694 662h316q0 137 -41 223q-39 82 -111 82q-66 0 -113 -78q-45 -75 -51 -227zM531 1241v27q92 127 174 301h219v-21q-109 -168 -272 -307h-121z " />
-<glyph unicode="&#x1fe;" d="M80 2l121 197q-117 184 -117 536q0 750 534 750q186 0 310 -105l92 152l137 -78l-125 -201q115 -188 115 -520q0 -362 -137 -557q-138 -197 -394 -196q-193 0 -307 94l-92 -150zM281 733q0 -205 38 -342l515 836q-80 94 -216 94q-337 0 -337 -588zM403 229 q80 -86 213 -86q174 0 254 145.5t80 444.5q0 205 -35 328zM475 1579v27q92 127 174 301h219v-21q-109 -168 -272 -307h-121z" />
-<glyph unicode="&#x1ff;" d="M115 551q0 264 133 415.5t368 151.5q129 0 236 -57l76 119l131 -84l-84 -131q137 -156 137 -414q0 -272 -135 -421.5t-367 -149.5q-127 0 -233 53l-76 -119l-131 84l84 131q-139 158 -139 422zM303 551q0 -178 53 -275l406 656q-66 35 -156 35q-162 0 -231 -103 q-72 -106 -72 -313zM467 164q59 -33 154 -33q162 0 233 105q70 102 70 315q0 166 -52 266zM498 1241v27q92 127 174 301h219v-21q-109 -168 -272 -307h-121z" />
-<glyph unicode="&#x218;" d="M141 49v178q211 -86 414 -86q350 0 350 240q0 104 -71 160q-74 57 -285 133q-211 74 -299 174q-90 102 -90 264q0 174 129 272.5t352 98.5q225 0 416 -78l-64 -164q-197 78 -360 78q-293 0 -293 -209q0 -102 66 -164q66 -63 270 -133q244 -88 327.5 -182t83.5 -240 q0 -190 -139 -301q-138 -111 -393 -110q-258 -1 -414 69zM483 -426q63 145 84 301h178v-20q0 -22 -49 -123q-51 -109 -114 -185h-99v27z" />
-<glyph unicode="&#x219;" d="M203 49v166q195 -86 370 -86q274 0 275 162q0 55 -49 98t-226 107q-233 86 -294 159q-59 72 -60 172q0 135 111 213q113 78 309.5 78t368.5 -74l-60 -149q-184 72 -319 72q-236 0 -236 -133q0 -57 51.5 -96.5t231.5 -102.5q207 -76 280 -152q70 -72 70 -182 q0 -150 -116.5 -235.5t-331.5 -85.5q-246 -1 -375 69zM454 -426q63 145 84 301h178v-20q0 -22 -49 -123q-51 -109 -114 -185h-99v27z" />
-<glyph unicode="&#x2bc;" d="M446 961q61 254 101 501h219l14 -22q-53 -207 -176 -479h-158z" />
-<glyph unicode="&#x2c6;" d="M283 1241v27l59 67q141 156 176 234h193q35 -78 176 -234l59 -67v-27h-121q-78 49 -211 186q-133 -137 -211 -186h-120z" />
-<glyph unicode="&#x2c7;" d="M283 1542v27h120q82 -55 211 -187q123 129 211 187h121v-27l-59 -67q-143 -160 -176 -234h-193q-33 74 -176 234z" />
-<glyph unicode="&#x2c9;" d="M326 1241v150h575v-150h-575z" />
-<glyph unicode="&#x2d8;" d="M313 1518h109q6 -76 47 -101q39 -25 143 -24q182 0 191 125h112q-10 -127 -90 -201q-82 -76 -215 -76q-279 1 -297 277z" />
-<glyph unicode="&#x2d9;" d="M508 1394.5q0 114.5 106.5 114.5t106.5 -114.5t-106.5 -114.5t-106.5 114.5z" />
-<glyph unicode="&#x2da;" d="M387 1456q0 100 62 158q59 57 161 57q100 0 166 -59q63 -57 64 -154q0 -100 -64 -158q-66 -59 -166 -59q-102 0 -161 57q-62 58 -62 158zM498 1456q0 -113 112 -113q53 0 82 29q31 31 31 84q0 51 -30.5 82t-82.5 31q-49 0 -80 -31q-32 -33 -32 -82z" />
-<glyph unicode="&#x2db;" d="M414 -252q0 144 190 252h131q-170 -127 -170 -238q0 -96 127 -96q68 0 123 15v-113q-78 -23 -156 -23q-121 0 -182 54q-63 55 -63 149z" />
-<glyph unicode="&#x2dc;" d="M254 1241q25 264 211 264q57 0 162 -55q104 -57 135 -57q82 0 106 114h105q-27 -264 -211 -264q-57 0 -158 57q-100 55 -139 56q-82 0 -107 -115h-104z" />
-<glyph unicode="&#x2dd;" d="M246 1241v27q92 127 174 301h198v-21q-109 -168 -272 -307h-100zM608 1241v27q92 125 174 301h199v-21q-109 -168 -272 -307h-101z" />
-<glyph unicode="&#x2f3;" d="M387 -340q0 47 16 90q16 41 46 68q31 29 69 43q37 14 92 14q49 0 90 -14q39 -14 72 -43t49 -66q18 -39 19 -90q0 -57 -17 -92q-18 -40 -49 -67.5t-74 -43.5q-41 -14 -90 -14q-55 0 -92 14q-39 14 -69 43q-29 27 -46 68q-16 43 -16 90zM498 -340q0 -51 28 -84 q27 -29 84 -29q53 0 82 29q31 31 31 84t-31 84q-29 29 -82 29q-51 0 -80 -29q-32 -33 -32 -84z" />
-<glyph unicode="&#x384;" d="M479 1241v27l31 106q29 106 39 195h199v-21q0 -16 -50 -121q-47 -102 -110 -186h-109z" />
-<glyph unicode="&#x385;" d="M299 1394.5q0 102.5 96.5 102.5t96.5 -102q0 -49 -27 -76t-70 -27q-96 0 -96 102.5zM532 1389v26q53 147 91 301h206v-20q-92 -163 -215 -307h-82zM735 1394.5q0 102.5 96.5 102.5t96.5 -102.5t-96.5 -102.5t-96.5 102.5z" />
-<glyph unicode="&#x386;" d="M33 0l483 1468h195l485 -1468h-192l-144 453h-491l-146 -453h-190zM422 618h385l-133 424q-39 121 -62 226q-20 -88 -47 -183zM37 1137v27l31 106q29 106 39 195h199v-21q0 -16 -50 -121q-47 -102 -110 -186h-109z" />
-<glyph unicode="&#x387;" d="M487 723q0 139 127 139t127 -139t-127 -139t-127 139z" />
-<glyph unicode="&#x388;" d="M217 0v1462h842v-164h-656v-452h617v-162h-617v-520h656v-164h-842zM-115 1137v27l31 106q29 106 39 195h199v-21q0 -16 -50 -121q-47 -102 -110 -186h-109z" />
-<glyph unicode="&#x389;" d="M135 0v1462h187v-616h585v616h187v-1462h-187v682h-585v-682h-187zM-156 1137v27l31 106q29 106 39 195h199v-21q0 -16 -50 -121q-47 -102 -110 -186h-109z" />
-<glyph unicode="&#x38a;" d="M225 0v123l295 20v1176l-295 20v123h776v-123l-294 -20v-1176l294 -20v-123h-776zM-92 1137v27l31 106q29 106 39 195h199v-21q0 -16 -50 -121q-47 -102 -110 -186h-109z" />
-<glyph unicode="&#x38c;" d="M84 735q0 750 534 750q258 0 392 -195q137 -199 137 -557q0 -362 -137 -557q-138 -197 -394 -196q-532 -1 -532 755zM281 733q0 -590 335 -590q174 0 254 145.5t80 444.5q0 305 -82 445q-84 143 -250 143q-337 0 -337 -588zM-131 1137v27l31 106q29 106 39 195h199v-21 q0 -16 -50 -121q-47 -102 -110 -186h-109z" />
-<glyph unicode="&#x38e;" d="M33 1462h203l376 -739l381 739h201l-487 -893v-569h-187v559zM-238 1137v27l31 106q29 106 39 195h199v-21q0 -16 -50 -121q-47 -102 -110 -186h-109z" />
-<glyph unicode="&#x38f;" d="M74 0v164h266q-254 233 -254 661q0 313 139 486q141 174 391 174q248 0 390 -174q141 -176 141 -486q0 -428 -256 -661h268v-164h-469v147q260 229 260 674q0 500 -335.5 500t-335.5 -500q0 -442 262 -674v-147h-467zM-133 1137v27l31 106q29 106 39 195h199v-21 q0 -16 -50 -121q-47 -102 -110 -186h-109z" />
-<glyph unicode="&#x390;" d="M428 324v774h182v-774q0 -195 193 -195q117 0 213 21v-138q-98 -33 -225 -32q-363 0 -363 344zM242 1394.5q0 102.5 96.5 102.5t96.5 -102q0 -49 -27 -76t-70 -27q-96 0 -96 102.5zM475 1389v26q53 147 91 301h206v-20q-92 -163 -215 -307h-82zM678 1394.5 q0 102.5 96.5 102.5t96.5 -102.5t-96.5 -102.5t-96.5 102.5z" />
-<glyph unicode="&#x391;" d="M33 0l483 1468h195l485 -1468h-192l-144 453h-491l-146 -453h-190zM422 618h385l-133 424q-39 121 -62 226q-20 -88 -47 -183z" />
-<glyph unicode="&#x392;" d="M135 0v1462h440q272 0 398 -88q123 -86 123 -282q0 -129 -78 -213t-213 -103v-10q332 -55 332 -342q0 -199 -127 -311.5t-348 -112.5h-527zM322 158h307q311 0 311 274q0 254 -324 254h-294v-528zM322 842h284q157 0 228 55q72 55 71 182q0 121 -75.5 172.5t-243.5 51.5 h-264v-461z" />
-<glyph unicode="&#x393;" d="M233 0v1462h826v-166h-639v-1296h-187z" />
-<glyph unicode="&#x394;" d="M68 0v133l450 1329h187l454 -1337v-125h-1091zM268 166h686l-252 752q-51 150 -92 339q-53 -231 -88 -333z" />
-<glyph unicode="&#x395;" d="M217 0v1462h842v-164h-656v-452h617v-162h-617v-520h656v-164h-842z" />
-<glyph unicode="&#x396;" d="M102 0v145l793 1151h-772v166h981v-145l-793 -1151h813v-166h-1022z" />
-<glyph unicode="&#x397;" d="M135 0v1462h187v-616h585v616h187v-1462h-187v682h-585v-682h-187z" />
-<glyph unicode="&#x398;" d="M84 735q0 750 534 750q258 0 392 -195q137 -199 137 -557q0 -362 -137 -557q-138 -197 -394 -196q-532 -1 -532 755zM281 733q0 -590 335 -590q174 0 254 145.5t80 444.5q0 305 -82 445q-84 143 -250 143q-337 0 -337 -588zM410 664v161h411v-161h-411z" />
-<glyph unicode="&#x399;" d="M225 0v123l295 20v1176l-295 20v123h776v-123l-294 -20v-1176l294 -20v-123h-776z" />
-<glyph unicode="&#x39a;" d="M211 0v1462h186v-731l121 168l453 563h209l-521 -637l539 -825h-211l-450 698l-140 -114v-584h-186z" />
-<glyph unicode="&#x39b;" d="M33 0l487 1462h187l489 -1462h-199l-292 922q-55 172 -93 340q-47 -207 -88 -334l-295 -928h-196z" />
-<glyph unicode="&#x39c;" d="M113 0v1462h247l248 -1192h6l250 1192h252v-1462h-153v887q0 121 14 391h-8l-283 -1278h-154l-278 1280h-8q18 -268 18 -406v-874h-151z" />
-<glyph unicode="&#x39d;" d="M135 0v1462h213l578 -1204h6q-14 285 -14 404v800h174v-1462h-215l-580 1210h-8q18 -276 18 -417v-793h-172z" />
-<glyph unicode="&#x39e;" d="M111 0v164h1005v-164h-1005zM152 1298v164h923v-164h-923zM233 684v162h760v-162h-760z" />
-<glyph unicode="&#x39f;" d="M84 735q0 750 534 750q258 0 392 -195q137 -199 137 -557q0 -362 -137 -557q-138 -197 -394 -196q-532 -1 -532 755zM281 733q0 -590 335 -590q174 0 254 145.5t80 444.5q0 305 -82 445q-84 143 -250 143q-337 0 -337 -588z" />
-<glyph unicode="&#x3a0;" d="M135 0v1462h959v-1462h-187v1298h-585v-1298h-187z" />
-<glyph unicode="&#x3a1;" d="M176 0v1462h404q514 0 514 -428q0 -219 -137.5 -342t-403.5 -123h-191v-569h-186zM362 727h170q195 0 283 72q86 70 86 225q0 279 -338 279h-201v-576z" />
-<glyph unicode="&#x3a3;" d="M131 0v152l414 614l-402 549v147h893v-164h-680l389 -530l-409 -604h760v-164h-965z" />
-<glyph unicode="&#x3a4;" d="M102 1298v164h1022v-164h-417v-1298h-187v1298h-418z" />
-<glyph unicode="&#x3a5;" d="M33 1462h203l376 -739l381 739h201l-487 -893v-569h-187v559z" />
-<glyph unicode="&#x3a6;" d="M27 758q0 238 122.5 391.5t335.5 153.5h47v180h166v-180h47q213 0 336 -154t123 -391q0 -233 -127 -396q-125 -158 -354 -157h-25v-225h-166v225h-24q-230 0 -356 160q-125 157 -125 393zM199 762q0 -184 86 -293q86 -106 241 -107h6v781h-32q-141 0 -221 -104.5 t-80 -276.5zM698 362h7q156 0 241 107q86 109 86 293q0 172 -80 276.5t-221 104.5h-33v-781z" />
-<glyph unicode="&#x3a7;" d="M53 0l453 764l-422 698h199l331 -559l334 559h191l-422 -692l457 -770h-211l-355 635l-366 -635h-189z" />
-<glyph unicode="&#x3a8;" d="M57 979v483h172v-479q0 -229 70 -305q68 -74 217 -74h16v858h166v-858h17q150 0 217 72q70 74 69 303v483h173v-479q0 -289 -115 -412q-117 -125 -344 -125h-17v-446h-166v446h-16q-231 0 -344 125q-115 127 -115 408z" />
-<glyph unicode="&#x3a9;" d="M74 0v164h266q-254 233 -254 661q0 313 139 486q141 174 391 174q248 0 390 -174q141 -176 141 -486q0 -428 -256 -661h268v-164h-469v147q260 229 260 674q0 500 -335.5 500t-335.5 -500q0 -442 262 -674v-147h-467z" />
-<glyph unicode="&#x3aa;" d="M225 0v123l295 20v1176l-295 20v123h776v-123l-294 -20v-1176l294 -20v-123h-776zM332 1732.5q0 102.5 96 102.5t96 -102.5t-96 -102.5t-96 102.5zM707 1732.5q0 102.5 96 102.5t96 -102.5t-96 -102.5t-96 102.5z" />
-<glyph unicode="&#x3ab;" d="M33 1462h203l376 -739l381 739h201l-487 -893v-569h-187v559zM332 1732.5q0 102.5 96 102.5t96 -102.5t-96 -102.5t-96 102.5zM707 1732.5q0 102.5 96 102.5t96 -102.5t-96 -102.5t-96 102.5z" />
-<glyph unicode="&#x3ac;" d="M121 547q0 270 115 422q113 150 321 149q211 0 305 -168h12q29 100 68 148h143q-51 -162 -51 -439v-419q0 -111 84 -111q25 0 60 10v-133q-57 -27 -115 -26q-158 0 -199 167h-12q-109 -168 -313 -167q-193 0 -305.5 149.5t-112.5 417.5zM309 545q0 -414 264 -414 q147 0 211 92q66 92 68 309v15q0 227 -67.5 323.5t-213.5 96.5q-262 0 -262 -422zM495 1241v27l31 106q29 106 39 195h199v-21q0 -16 -50 -121q-47 -102 -110 -186h-109z" />
-<glyph unicode="&#x3ad;" d="M201 299q0 195 237 268v11q-203 66 -202 249q0 135 112.5 213t300.5 78q219 0 383 -76l-63 -147q-162 72 -316 72q-244 0 -243 -154q0 -166 276 -166h154v-153h-160q-301 0 -301 -185q0 -180 283 -180q199 0 366 86v-160q-139 -76 -377 -75q-211 0 -332 83 q-118 82 -118 236zM575 1241v27l31 106q29 106 39 195h199v-21q0 -16 -50 -121q-47 -102 -110 -186h-109z" />
-<glyph unicode="&#x3ae;" d="M160 0v1098h147l27 -148h10q100 168 336 168q389 0 389 -401v-1209h-182v1199q0 260 -238 260q-307 0 -307 -398v-569h-182zM559 1241v27l31 106q29 106 39 195h199v-21q0 -16 -50 -121q-47 -102 -110 -186h-109z" />
-<glyph unicode="&#x3af;" d="M428 324v774h182v-774q0 -195 193 -195q117 0 213 21v-138q-98 -33 -225 -32q-363 0 -363 344zM471 1241v27l31 106q29 106 39 195h199v-21q0 -16 -50 -121q-47 -102 -110 -186h-109z" />
-<glyph unicode="&#x3b0;" d="M160 498v600h182v-590q0 -379 274 -379q150 0 217.5 116.5t67.5 362.5q0 242 -63 490h182q63 -242 63 -498q0 -317 -114.5 -468.5t-358.5 -151.5q-450 0 -450 518zM297 1394.5q0 102.5 96.5 102.5t96.5 -102q0 -49 -27 -76t-70 -27q-96 0 -96 102.5zM530 1389v26 q53 147 91 301h206v-20q-92 -163 -215 -307h-82zM733 1394.5q0 102.5 96.5 102.5t96.5 -102.5t-96.5 -102.5t-96.5 102.5z" />
-<glyph unicode="&#x3b1;" d="M121 547q0 270 115 422q113 150 321 149q211 0 305 -168h12q29 100 68 148h143q-51 -162 -51 -439v-419q0 -111 84 -111q25 0 60 10v-133q-57 -27 -115 -26q-158 0 -199 167h-12q-109 -168 -313 -167q-193 0 -305.5 149.5t-112.5 417.5zM309 545q0 -414 264 -414 q147 0 211 92q66 92 68 309v15q0 227 -67.5 323.5t-213.5 96.5q-262 0 -262 -422z" />
-<glyph unicode="&#x3b2;" d="M158 -492v1588q0 227 118 348q121 123 328 123q199 0 316 -105q119 -106 118 -288q0 -135 -80 -228q-76 -88 -235 -117v-6q381 -49 381 -409q0 -206 -123 -320q-125 -115 -338 -114q-188 0 -303 63v-535h-182zM340 209q135 -80 289 -80q293 0 293 299q0 147 -94.5 229 t-254.5 82h-94v152h70q141 0 223 76q80 74 80 200q0 119 -68 185q-70 66 -180 65q-264 0 -264 -330v-878z" />
-<glyph unicode="&#x3b3;" d="M82 1098h192l242 -592q70 -174 107 -320h6q18 82 98 295l229 617h189l-406 -1035q-111 -281 -110 -555h-191q0 209 101 504z" />
-<glyph unicode="&#x3b4;" d="M135 438q0 371 422 500q-254 143 -254 348q0 135 90 207q92 74 252 74q199 0 393 -109l-73 -145q-168 106 -328 106q-74 0 -117 -36.5t-43 -100.5q0 -66 41 -115q39 -49 215 -151q360 -205 361 -518q0 -246 -129 -381q-131 -137 -355 -137q-209 0 -344 124 q-131 123 -131 334zM328 434q0 -137 75 -219q78 -84 207 -84q295 0 295 350q0 244 -221 373q-356 -101 -356 -420z" />
-<glyph unicode="&#x3b5;" d="M201 299q0 195 237 268v11q-203 66 -202 249q0 135 112.5 213t300.5 78q219 0 383 -76l-63 -147q-162 72 -316 72q-244 0 -243 -154q0 -166 276 -166h154v-153h-160q-301 0 -301 -185q0 -180 283 -180q199 0 366 86v-160q-139 -76 -377 -75q-211 0 -332 83 q-118 82 -118 236z" />
-<glyph unicode="&#x3b6;" d="M162 469q0 254 162 477q160 223 536 469q-215 -12 -352 -12h-285v153h838v-141q-396 -289 -553 -485q-158 -199 -158 -453q0 -154 82 -217q83 -65 313 -104q168 -31 246 -80q76 -49 76 -162q0 -147 -121 -315h-170q121 164 121 260q0 57 -51 90q-52 34 -246 61 q-227 33 -334 146q-104 110 -104 313z" />
-<glyph unicode="&#x3b7;" d="M160 0v1098h147l27 -148h10q100 168 336 168q389 0 389 -401v-1209h-182v1199q0 260 -238 260q-307 0 -307 -398v-569h-182z" />
-<glyph unicode="&#x3b8;" d="M147 729q0 381 113 563.5t352 182.5q230 0 351 -191q119 -188 118 -555q0 -750 -469 -749q-229 0 -348 192q-117 190 -117 557zM332 670q6 -276 71.5 -407.5t209 -131.5t208.5 127q68 129 74 412h-563zM332 807h563q-6 258 -73.5 387t-209.5 129q-139 0 -206 -125 q-64 -121 -74 -391z" />
-<glyph unicode="&#x3b9;" d="M428 324v774h182v-774q0 -195 193 -195q117 0 213 21v-138q-98 -33 -225 -32q-363 0 -363 344z" />
-<glyph unicode="&#x3ba;" d="M215 0v1098h180v-291l-16 -299h4l137 166l402 424h213l-494 -510l522 -588h-213l-426 469l-129 -82v-387h-180z" />
-<glyph unicode="&#x3bb;" d="M61 0l504 1083l-53 160q-33 100 -78 139q-43 37 -115 37q-55 0 -104 -12v145q57 16 127 17q141 0 213 -67.5t141 -278.5l326 -983q37 -111 102 -111q25 0 60 10v-133q-53 -27 -115 -26q-80 0 -125 40q-43 41 -72 127l-135 418q-74 238 -94 336h-6q-37 -141 -119 -321 l-268 -580h-189z" />
-<glyph unicode="&#x3bc;" d="M160 -492v1590h182v-707q0 -260 238 -260q160 0 233.5 92t73.5 305v570h182v-1098h-147l-27 147h-10q-100 -168 -301 -167q-174 0 -248 88q6 -154 6 -240v-320h-182z" />
-<glyph unicode="&#x3bd;" d="M61 1098h189l223 -586q106 -276 121 -358h6q156 162 235.5 368.5t79.5 575.5h183q0 -367 -100.5 -610.5t-325.5 -487.5h-187z" />
-<glyph unicode="&#x3be;" d="M172 422q0 137 76 240q78 104 207 147v12q-215 59 -215 279q0 113 75 188q74 74 260 127q-174 -12 -280 -12h-62v153h764v-153h-69q-217 0 -364.5 -80t-147.5 -219q0 -114 92 -166q90 -51 287 -51h190v-137h-201q-209 0 -315 -82q-109 -84 -109 -230q0 -90 37 -143 q39 -55 109 -82q76 -31 248 -59q158 -27 237 -78q76 -49 76 -162q0 -147 -121 -315h-170q121 164 121 262q0 52 -49 86q-49 33 -238 61q-438 68 -438 414z" />
-<glyph unicode="&#x3bf;" d="M115 551q0 264 135 415.5t366 151.5q217 0 356.5 -155.5t139.5 -411.5q0 -266 -137 -418q-139 -154 -365 -153q-219 0 -356 155q-139 158 -139 416zM303 551q0 -420 311 -420q309 0 310 420q0 416 -312 416q-309 0 -309 -416z" />
-<glyph unicode="&#x3c0;" d="M14 944v74l138 80h1062v-154h-210v-690q0 -125 90 -125q49 0 90 21v-144q-57 -27 -137 -26q-225 0 -226 262v702h-403v-944h-182v944h-222z" />
-<glyph unicode="&#x3c1;" d="M158 -492v1043q0 264 127 415.5t344 151.5q207 0 329 -153q125 -156 125 -414q0 -268 -122.5 -419.5t-339.5 -151.5q-166 0 -281 90h-6q6 -176 6 -271v-291h-182zM340 231q109 -100 283 -100q144 0 208 105q63 102 64 315q0 207 -66 313q-63 102 -208 103 q-281 0 -281 -396v-340z" />
-<glyph unicode="&#x3c2;" d="M172 516q0 602 567 602q162 0 322 -59l-62 -158q-154 57 -272 57q-367 0 -367 -440q0 -186 78 -254q78 -70 269 -102q358 -63 358 -252q0 -143 -125 -311h-166q121 164 121 262q0 59 -66 90q-59 29 -229 57q-428 72 -428 508z" />
-<glyph unicode="&#x3c3;" d="M129 524q0 573 555 574h490v-154h-267q178 -195 178 -440q0 -233 -129 -378.5t-352 -145.5t-348 143q-127 145 -127 401zM317 524q0 -186 76 -288q78 -104 219 -105q137 0 211 96.5t74 268.5q0 270 -154 448h-59q-200 0 -283 -98q-84 -101 -84 -322z" />
-<glyph unicode="&#x3c4;" d="M106 944v74l134 80h841v-154h-475v-606q0 -215 209 -215q111 0 191 20v-135q-86 -35 -220 -35q-362 0 -362 344v627h-318z" />
-<glyph unicode="&#x3c5;" d="M160 498v600h182v-590q0 -379 274 -379q150 0 217.5 116.5t67.5 362.5q0 242 -63 490h182q63 -242 63 -498q0 -317 -114.5 -468.5t-358.5 -151.5q-450 0 -450 518z" />
-<glyph unicode="&#x3c6;" d="M74 547q0 311 207 559l120 -90q-98 -129 -131 -232q-35 -109 -34 -237q0 -383 288 -416v606q0 381 281 381q166 0 258 -147.5t92 -399.5q0 -264 -125 -419.5t-348 -169.5v-474h-158v474q-450 24 -450 565zM682 131q305 29 305 438q0 397 -176 398q-129 0 -129 -228v-608z " />
-<glyph unicode="&#x3c7;" d="M43 -492l475 830l-180 446q-68 168 -152 168q-27 0 -63 -10v143q47 16 129 17q80 0 135 -55.5t111 -192.5l139 -348l311 592h178l-417 -776l186 -461q47 -115 86 -158q41 -45 104 -45q47 0 80 8v-139q-63 -18 -118 -19q-104 0 -170 46q-68 47 -138 221l-147 377 l-354 -644h-195z" />
-<glyph unicode="&#x3c8;" d="M80 555v543h172v-529q0 -424 272 -438v1423h158v-1421q301 28 301 436q0 254 -63 529h172q63 -272 63 -523q0 -569 -473 -593v-474h-158v474q-233 10 -338 143q-106 137 -106 430z" />
-<glyph unicode="&#x3c9;" d="M90 532q0 301 105 566h165q-104 -261 -104 -566q0 -401 139 -401q68 0 105 72q37 71 37 196v306h157v-306q0 -133 39 -198q41 -70 103 -70q139 0 139 401q0 303 -105 566h166q104 -258 105 -566q0 -553 -289 -552q-182 0 -231 178h-11q-49 -178 -231 -178 q-289 -1 -289 552z" />
-<glyph unicode="&#x3ca;" d="M428 324v774h182v-774q0 -195 193 -195q117 0 213 21v-138q-98 -33 -225 -32q-363 0 -363 344zM258 1394.5q0 102.5 96 102.5t96 -102.5t-96 -102.5t-96 102.5zM633 1394.5q0 102.5 96 102.5t96 -102.5t-96 -102.5t-96 102.5z" />
-<glyph unicode="&#x3cb;" d="M160 498v600h182v-590q0 -379 274 -379q150 0 217.5 116.5t67.5 362.5q0 242 -63 490h182q63 -242 63 -498q0 -317 -114.5 -468.5t-358.5 -151.5q-450 0 -450 518zM330 1394.5q0 102.5 96 102.5t96 -102.5t-96 -102.5t-96 102.5zM705 1394.5q0 102.5 96 102.5t96 -102.5 t-96 -102.5t-96 102.5z" />
-<glyph unicode="&#x3cc;" d="M115 551q0 264 135 415.5t366 151.5q217 0 356.5 -155.5t139.5 -411.5q0 -266 -137 -418q-139 -154 -365 -153q-219 0 -356 155q-139 158 -139 416zM303 551q0 -420 311 -420q309 0 310 420q0 416 -312 416q-309 0 -309 -416zM551 1241v27l31 106q29 106 39 195h199v-21 q0 -16 -50 -121q-47 -102 -110 -186h-109z" />
-<glyph unicode="&#x3cd;" d="M160 498v600h182v-590q0 -379 274 -379q150 0 217.5 116.5t67.5 362.5q0 242 -63 490h182q63 -242 63 -498q0 -317 -114.5 -468.5t-358.5 -151.5q-450 0 -450 518zM518 1241v27l31 106q29 106 39 195h199v-21q0 -16 -50 -121q-47 -102 -110 -186h-109z" />
-<glyph unicode="&#x3ce;" d="M90 532q0 301 105 566h165q-104 -261 -104 -566q0 -401 139 -401q68 0 105 72q37 71 37 196v306h157v-306q0 -133 39 -198q41 -70 103 -70q139 0 139 401q0 303 -105 566h166q104 -258 105 -566q0 -553 -289 -552q-182 0 -231 178h-11q-49 -178 -231 -178 q-289 -1 -289 552zM530 1241v27l31 106q29 106 39 195h199v-21q0 -16 -50 -121q-47 -102 -110 -186h-109z" />
-<glyph unicode="&#x3d1;" d="M10 825q29 14 86.5 28.5t104.5 14.5q53 0 84 -14q39 -18 57 -39q20 -25 31 -59q10 -37 10 -74q0 -49 -4 -78q-2 -25 -6 -48.5t-6 -41.5q-2 -16 -5.5 -47t-5.5 -47q-4 -33 -4 -94q0 -37 10 -78q8 -37 35 -66q23 -25 64 -41q43 -16 96 -16q163 0 246 154q82 152 82 456v53 q0 23 -4 52q-178 4 -295 39q-125 39 -197 98q-76 63 -108.5 137t-32.5 158q0 61 20 123q18 59 60 98q43 43 104 63q68 23 152 23q104 0 184 -43q82 -45 139 -119q59 -78 97 -190q37 -111 55 -250h143v-137h-137q2 -14 2 -52q0 -8 1 -28.5t1 -30.5q0 -150 -33 -297 q-29 -133 -96 -237q-63 -98 -162 -158q-96 -57 -229 -57q-109 0 -184 28q-70 27 -115 74q-41 45 -62 111q-16 55 -16 131q0 55 4 86q2 10 4 29.5t4 34.5t4 28l11 82q4 25 4 61q0 47 -15 62q-16 16 -47 16q-14 0 -51 -8q-25 -6 -43 -17zM426 1272q0 -53 23 -109 q23 -53 76 -94t139 -65q94 -27 210 -27q-10 90 -43 192q-29 90 -65 144q-41 59 -84 88q-47 31 -94 31q-76 0 -119 -43t-43 -117z" />
-<glyph unicode="&#x3d2;" d="M31 1462h202l379 -731q29 86 62 160q18 41 78 164q39 80 75 147l32.5 63.5t27.5 49.5q16 31 45 71q22 31 49 50q29 20 59 28q35 10 74 11q27 0 55 -5q20 -2 39 -12v-145q-8 2 -28 6q-10 2 -29 2q-31 0 -59 -23q-35 -29 -66 -84q-6 -8 -9 -15t-10.5 -19.5t-15.5 -28.5 l-21.5 -37t-31.5 -59l-61 -119q-39 -72 -66 -133q-41 -90 -59 -135q-35 -82 -47 -127v-541h-187v559z" />
-<glyph unicode="&#x3d6;" d="M18 944v74l134 80h1052v-154h-155q12 -33 41 -123q18 -61 30 -112q8 -39 17 -113q4 -39 4 -125q0 -121 -14.5 -205t-51.5 -153q-33 -63 -90 -98t-133 -35q-94 0 -150 43q-57 45 -81 135h-11q-25 -90 -82 -135q-55 -43 -149 -43q-76 0 -133.5 34.5t-89.5 98.5 q-34 65 -50 153q-16 94 -16 205q0 86 4 125q8 74 17 113q16 74 28 112q18 58 43 123h-164zM256 471q0 -98 8 -156q10 -74 25 -104q20 -43 44.5 -61.5t61.5 -18.5t64 21q23 18 43 57q18 35 26 84q8 43 9 106v203h157v-203q0 -133 39 -198q41 -70 103 -70q37 0 61.5 18.5 t44.5 61.5q14 31 25 104q8 57 8 156q0 80 -4 119q-8 74 -17 112q-12 59 -30 115l-41 127h-535q-23 -61 -43 -127q-10 -35 -29 -115q-8 -39 -16 -112q-4 -39 -4 -119z" />
-<glyph unicode="&#x401;" d="M217 0v1462h842v-164h-656v-452h617v-162h-617v-520h656v-164h-842zM355 1732.5q0 102.5 96 102.5t96 -102.5t-96 -102.5t-96 102.5zM730 1732.5q0 102.5 96 102.5t96 -102.5t-96 -102.5t-96 102.5z" />
-<glyph unicode="&#x402;" d="M23 1298v164h841v-164h-356v-401h264q184 0 291 -96q102 -94 102 -275v-137q0 -197 -94 -303t-266 -106q-89 0 -141 24v160q63 -20 135 -21q180 0 180 226v133q0 231 -227 231h-244v-733h-186v1298h-299z" />
-<glyph unicode="&#x403;" d="M233 0v1462h826v-166h-639v-1296h-187zM508 1579v27q92 127 174 301h219v-21q-109 -168 -272 -307h-121z" />
-<glyph unicode="&#x404;" d="M129 733q0 344 178 547t490 203q219 0 383 -86l-78 -156q-156 78 -305 78q-188 0 -314 -125q-123 -125 -151 -348h629v-162h-635q23 -541 471 -541q135 0 327 58v-162q-150 -59 -358 -59q-310 0 -473 196q-164 199 -164 557z" />
-<glyph unicode="&#x405;" d="M141 49v178q211 -86 414 -86q350 0 350 240q0 104 -71 160q-74 57 -285 133q-211 74 -299 174q-90 102 -90 264q0 174 129 272.5t352 98.5q225 0 416 -78l-64 -164q-197 78 -360 78q-293 0 -293 -209q0 -102 66 -164q66 -63 270 -133q244 -88 327.5 -182t83.5 -240 q0 -190 -139 -301q-138 -111 -393 -110q-258 -1 -414 69z" />
-<glyph unicode="&#x406;" d="M225 0v123l295 20v1176l-295 20v123h776v-123l-294 -20v-1176l294 -20v-123h-776z" />
-<glyph unicode="&#x407;" d="M225 0v123l295 20v1176l-295 20v123h776v-123l-294 -20v-1176l294 -20v-123h-776zM332 1732.5q0 102.5 96 102.5t96 -102.5t-96 -102.5t-96 102.5zM707 1732.5q0 102.5 96 102.5t96 -102.5t-96 -102.5t-96 102.5z" />
-<glyph unicode="&#x408;" d="M137 39v166q162 -61 309 -62q162 0 254.5 80t92.5 226v1013h186v-1011q0 -215 -141 -345q-139 -127 -377 -126q-215 0 -324 59z" />
-<glyph unicode="&#x409;" d="M0 -2v145q29 -14 68 -14q33 0 61 35q27 33 39 127q10 80 33 524q23 434 24 647h498v-616h39q446 0 446 -418q0 -207 -114.5 -317.5t-329.5 -110.5h-207v1298h-182l-21 -548q-23 -580 -82 -672q-63 -98 -176 -98q-55 0 -96 18zM723 160h45q268 0 268 268q0 131 -69 195 q-66 59 -224 59h-20v-522z" />
-<glyph unicode="&#x40a;" d="M66 0v1462h165v-616h318v616h166v-616h39q221 0 333.5 -106.5t112.5 -311.5q0 -207 -114.5 -317.5t-329.5 -110.5h-207v682h-318v-682h-165zM715 160h45q268 0 268 268q0 131 -70 195q-66 59 -223 59h-20v-522z" />
-<glyph unicode="&#x40b;" d="M23 1298v164h841v-164h-356v-401h264q184 0 291 -96q102 -94 102 -275v-526h-186v502q0 231 -227 231h-244v-733h-186v1298h-299z" />
-<glyph unicode="&#x40c;" d="M211 0v1462h186v-708l566 708h206l-565 -702l594 -760h-219l-582 741v-741h-186zM574 1579v27q92 127 174 301h219v-21q-109 -168 -272 -307h-121z" />
-<glyph unicode="&#x40e;" d="M27 1462h204l383 -809q2 -4 21 -47l7 -21.5t9 -23.5h2l39 109l312 792h196l-428 -1030q-80 -190 -135 -268q-61 -86 -150 -135t-215 -49q-104 0 -178 30v185q84 -45 178 -45q111 0 170 51q59 49 115 174zM237 1897h170q10 -104 50 -144q43 -43 161 -43q193 0 211 187h174 q-20 -317 -389 -318q-195 0 -281 74t-96 244z" />
-<glyph unicode="&#x40f;" d="M135 0v1462h187v-1296h585v1296h187v-1462h-394v-385h-176v385h-389z" />
-<glyph unicode="&#x410;" d="M33 0l483 1468h195l485 -1468h-192l-144 453h-491l-146 -453h-190zM422 618h385l-133 424q-39 121 -62 226q-20 -88 -47 -183z" />
-<glyph unicode="&#x411;" d="M135 0v1462h912v-164h-725v-452h272q541 0 541 -418q0 -207 -131.5 -317.5t-382.5 -110.5h-486zM322 160h282q338 0 338 268q0 131 -86 192.5t-283 61.5h-251v-522z" />
-<glyph unicode="&#x412;" d="M135 0v1462h440q272 0 398 -88q123 -86 123 -282q0 -129 -78 -213t-213 -103v-10q332 -55 332 -342q0 -199 -127 -311.5t-348 -112.5h-527zM322 158h307q311 0 311 274q0 254 -324 254h-294v-528zM322 842h284q157 0 228 55q72 55 71 182q0 121 -75.5 172.5t-243.5 51.5 h-264v-461z" />
-<glyph unicode="&#x413;" d="M233 0v1462h826v-166h-639v-1296h-187z" />
-<glyph unicode="&#x414;" d="M6 166h113q133 246 217 594q86 360 98 702h592v-1296h195v-551h-177v385h-862v-385h-176v551zM311 166h529v1130h-242q-18 -281 -98 -596q-85 -339 -189 -534z" />
-<glyph unicode="&#x415;" d="M217 0v1462h842v-164h-656v-452h617v-162h-617v-520h656v-164h-842z" />
-<glyph unicode="&#x416;" d="M0 0l373 754l-361 708h178l349 -708v708h155v-708l342 708h178l-356 -708l371 -754h-185l-350 741v-741h-155v741l-357 -741h-182z" />
-<glyph unicode="&#x417;" d="M139 59v170q186 -96 383 -96q354 0 355 283q0 264 -394 264h-190v151h176q178 0 281 74q100 74 100 199q0 102 -70 164q-72 61 -188 61q-184 0 -354 -121l-93 125q193 150 455 150q209 0 326 -99q119 -100 118 -264q0 -135 -90 -229t-252 -121v-6q176 -20 273 -115 q96 -92 96 -233q0 -203 -141.5 -319.5t-403.5 -116.5q-243 -1 -387 79z" />
-<glyph unicode="&#x418;" d="M137 0v1462h174v-800q0 -106 -8 -254l-6 -150h6l578 1204h213v-1462h-172v793q0 141 18 417h-8l-580 -1210h-215z" />
-<glyph unicode="&#x419;" d="M137 0v1462h174v-800q0 -106 -8 -254l-6 -150h6l578 1204h213v-1462h-172v793q0 141 18 417h-8l-580 -1210h-215zM231 1897h170q10 -104 50 -144q43 -43 161 -43q193 0 211 187h174q-20 -317 -389 -318q-195 0 -281 74t-96 244z" />
-<glyph unicode="&#x41a;" d="M211 0v1462h186v-708l566 708h206l-565 -702l594 -760h-219l-582 741v-741h-186z" />
-<glyph unicode="&#x41b;" d="M4 2v150q57 -25 113 -25q102 0 157 180q53 176 181 1155h639v-1462h-187v1298h-297q-117 -979 -204 -1148q-89 -172 -265 -173q-71 0 -137 25z" />
-<glyph unicode="&#x41c;" d="M113 0v1462h247l248 -1192h6l250 1192h252v-1462h-153v887q0 121 14 391h-8l-283 -1278h-154l-278 1280h-8q18 -268 18 -406v-874h-151z" />
-<glyph unicode="&#x41d;" d="M135 0v1462h187v-616h585v616h187v-1462h-187v682h-585v-682h-187z" />
-<glyph unicode="&#x41e;" d="M84 735q0 750 534 750q258 0 392 -195q137 -199 137 -557q0 -362 -137 -557q-138 -197 -394 -196q-532 -1 -532 755zM281 733q0 -590 335 -590q174 0 254 145.5t80 444.5q0 305 -82 445q-84 143 -250 143q-337 0 -337 -588z" />
-<glyph unicode="&#x41f;" d="M135 0v1462h959v-1462h-187v1298h-585v-1298h-187z" />
-<glyph unicode="&#x420;" d="M176 0v1462h404q514 0 514 -428q0 -219 -137.5 -342t-403.5 -123h-191v-569h-186zM362 727h170q195 0 283 72q86 70 86 225q0 279 -338 279h-201v-576z" />
-<glyph unicode="&#x421;" d="M129 733q0 344 178 547t490 203q219 0 383 -86l-78 -156q-156 78 -305 78q-215 0 -342 -158q-129 -160 -129 -430q0 -287 120 -438q119 -150 351 -150q135 0 327 58v-162q-150 -59 -358 -59q-310 0 -473 196q-164 199 -164 557z" />
-<glyph unicode="&#x422;" d="M102 1298v164h1022v-164h-417v-1298h-187v1298h-418z" />
-<glyph unicode="&#x423;" d="M27 1462h204l383 -809q2 -4 21 -47l7 -21.5t9 -23.5h2l39 109l312 792h196l-428 -1030q-80 -190 -135 -268q-61 -86 -150 -135t-215 -49q-104 0 -178 30v185q84 -45 178 -45q111 0 170 51q59 49 115 174z" />
-<glyph unicode="&#x424;" d="M27 758q0 238 122.5 391.5t335.5 153.5h47v180h166v-180h47q213 0 336 -154t123 -391q0 -233 -127 -396q-125 -158 -354 -157h-25v-225h-166v225h-24q-230 0 -356 160q-125 157 -125 393zM199 762q0 -184 86 -293q86 -106 241 -107h6v781h-32q-141 0 -221 -104.5 t-80 -276.5zM698 362h7q156 0 241 107q86 109 86 293q0 172 -80 276.5t-221 104.5h-33v-781z" />
-<glyph unicode="&#x425;" d="M53 0l453 764l-422 698h199l331 -559l334 559h191l-422 -692l457 -770h-211l-355 635l-366 -635h-189z" />
-<glyph unicode="&#x426;" d="M135 0v1462h187v-1296h526v1296h186v-1296h176v-551h-176v385h-899z" />
-<glyph unicode="&#x427;" d="M135 879v583h187v-559q0 -131 51 -180q55 -51 162 -51q154 0 372 80v710h187v-1462h-187v598q-229 -90 -393 -90q-379 0 -379 371z" />
-<glyph unicode="&#x428;" d="M121 0v1462h166v-1296h245v1296h166v-1296h246v1296h166v-1462h-989z" />
-<glyph unicode="&#x429;" d="M61 0v1462h166v-1296h246v1296h166v-1296h246v1296h166v-1296h178v-551h-176v385h-992z" />
-<glyph unicode="&#x42a;" d="M27 1298v164h485v-616h68q270 0 415.5 -108.5t145.5 -309.5q0 -203 -137.5 -315.5t-397.5 -112.5h-280v1298h-299zM512 160h98q338 0 338 268q0 131 -86 192.5t-282 61.5h-68v-522z" />
-<glyph unicode="&#x42b;" d="M96 0v1462h166v-616h47q541 0 541 -418q0 -207 -131 -317q-133 -111 -383 -111h-240zM262 160h78q338 0 338 268q0 131 -86 192.5t-283 61.5h-47v-522zM967 0v1462h166v-1462h-166z" />
-<glyph unicode="&#x42c;" d="M176 0v1462h186v-616h191q541 0 541 -418q0 -207 -131.5 -317.5t-382.5 -110.5h-404zM362 160h201q338 0 338 268q0 131 -86 192.5t-283 61.5h-170v-522z" />
-<glyph unicode="&#x42d;" d="M68 1397q160 86 383 86q305 0 477 -194.5t172 -530.5q0 -375 -170 -576q-172 -203 -488 -202q-209 0 -358 59v162q193 -57 328 -58q473 0 489 541h-629v162h625q-18 223 -137 348t-309 125q-150 0 -306 -78z" />
-<glyph unicode="&#x42e;" d="M98 0v1462h166v-616h144q18 346 106 493q86 145 270 146q190 0 283 -176q92 -174 92 -576q0 -397 -92 -575t-285 -178q-190 0 -280 157q-88 156 -99 545h-139v-682h-166zM580 733q0 -346 47 -469q47 -121 155 -121t154 117q47 119 47 473q0 365 -47 473q-49 115 -154 115 q-111 0 -155 -119q-47 -123 -47 -469z" />
-<glyph unicode="&#x42f;" d="M57 0l381 655q-272 98 -272 408q0 399 504 399h372v-1462h-186v604h-246l-334 -604h-219zM358 1047q0 -137 82 -211q84 -74 236 -74h180v541h-188q-310 0 -310 -256z" />
-<glyph unicode="&#x430;" d="M135 307q0 332 510 348l203 7v69q0 236 -244 236q-150 0 -328 -82l-63 137q199 96 383 96q223 0 328 -88q102 -86 102 -278v-752h-131l-37 152h-8q-74 -94 -158 -133t-209 -39q-164 0 -256 85.5t-92 241.5zM324 305q0 -178 200 -178q150 0 234 82q88 84 88 229v99 l-162 -7q-195 -8 -278 -61q-82 -51 -82 -164z" />
-<glyph unicode="&#x431;" d="M143 659q0 212 31 357q31 143 82 231q49 84 123 142q72 55 170 81q90 25 491 101l33 -160q-408 -70 -500 -100q-102 -35 -165 -140q-61 -104 -72 -319h12q117 170 336 170q186 0 292.5 -131t106.5 -361q0 -262 -125 -405q-127 -145 -346 -145t-344 180t-125 499zM332 655 q0 -524 293 -524q266 0 266 375q0 365 -240 364q-96 0 -184 -63q-90 -66 -135 -152z" />
-<glyph unicode="&#x432;" d="M176 0v1098h510q387 0 387 -277q0 -197 -229 -239v-7q264 -34 264 -258q0 -152 -107 -233q-109 -84 -313 -84h-512zM358 150h318q254 0 254 180q0 92 -66 129q-61 35 -192 35h-314v-344zM358 647h293q135 0 191 35q57 37 57 121q0 141 -217 141h-324v-297z" />
-<glyph unicode="&#x433;" d="M291 0v1098h747v-154h-565v-944h-182z" />
-<glyph unicode="&#x434;" d="M33 154h86q264 393 266 944h592v-944h151v-535h-174v381h-747v-381h-174v535zM311 154h484v804h-250q-37 -481 -234 -804z" />
-<glyph unicode="&#x435;" d="M133 541q0 266 135 421.5t363 155.5q212 0 338 -135q127 -137 127 -356v-113h-774q9 -375 344 -375q199 0 370 76v-160q-170 -76 -364 -75q-244 0 -391 149q-148 151 -148 412zM326 662h573q0 305 -272 305q-276 0 -301 -305z" />
-<glyph unicode="&#x436;" d="M0 1098h184l351 -533v533h159v-533l350 533h185l-367 -533l365 -565h-195l-338 557v-557h-159v557l-338 -557h-195l367 565z" />
-<glyph unicode="&#x437;" d="M201 1042q158 76 370 76q205 0 315.5 -73.5t110.5 -215.5q0 -184 -192 -243v-11q227 -63 227 -272q0 -152 -121 -237q-120 -86 -344 -86q-233 0 -362 69v166q180 -86 366 -86q283 0 283 180q0 184 -311 185h-150v153h113q172 0 244 39q74 39 73 127q0 154 -250 154 q-131 0 -309 -72z" />
-<glyph unicode="&#x438;" d="M160 0v1098h172v-668l-13 -252l517 920h233v-1098h-172v647l10 271l-514 -918h-233z" />
-<glyph unicode="&#x439;" d="M160 0v1098h172v-668l-13 -252l517 920h233v-1098h-172v647l10 271l-514 -918h-233zM268 1559h170q10 -104 50 -144q43 -43 161 -43q193 0 211 187h174q-20 -317 -389 -318q-195 0 -281 74t-96 244z" />
-<glyph unicode="&#x43a;" d="M215 0v1098h180v-533l518 533h222l-527 -527l566 -571h-232l-547 557v-557h-180z" />
-<glyph unicode="&#x43b;" d="M31 -2v131q22 -6 49 -6q111 0 178 237q68 237 104 738h678v-1098h-182v944h-340q-37 -487 -127 -725q-88 -233 -268 -233q-61 0 -92 12z" />
-<glyph unicode="&#x43c;" d="M115 0v1098h211l215 -656q23 -72 73 -268q2 4 54 191q10 47 20 73l219 660h207v-1098h-151v897q-8 -23 -33 -127q-18 -74 -35 -123l-213 -647h-135l-213 647q-2 6 -10.5 35t-24.5 91.5l-33 123.5v-897h-151z" />
-<glyph unicode="&#x43d;" d="M160 0v1098h182v-455h545v455h182v-1098h-182v489h-545v-489h-182z" />
-<glyph unicode="&#x43e;" d="M115 551q0 264 135 415.5t366 151.5q217 0 356.5 -155.5t139.5 -411.5q0 -266 -137 -418q-139 -154 -365 -153q-219 0 -356 155q-139 158 -139 416zM303 551q0 -420 311 -420q309 0 310 420q0 416 -312 416q-309 0 -309 -416z" />
-<glyph unicode="&#x43f;" d="M160 0v1098h909v-1098h-182v944h-545v-944h-182z" />
-<glyph unicode="&#x440;" d="M158 -492v1590h147l27 -148h8q111 168 322 168q203 0 315 -149q115 -152 115 -418q0 -268 -115 -419.5t-315 -151.5q-207 0 -322 159h-12q12 -129 12 -162v-469h-182zM340 551q0 -229 70 -324q72 -96 221 -96q272 0 272 422q0 414 -274 414q-152 0 -219.5 -88t-69.5 -287 v-41z" />
-<glyph unicode="&#x441;" d="M172 543q0 279 145 428q145 147 408 147q176 0 336 -59l-62 -158q-147 57 -268 57q-371 0 -371 -413q0 -406 361 -406q160 0 321 62v-160q-135 -61 -329 -61q-258 0 -400 145q-141 145 -141 418z" />
-<glyph unicode="&#x442;" d="M121 944v154h985v-154h-401v-944h-183v944h-401z" />
-<glyph unicode="&#x443;" d="M82 1098h188l262 -654q82 -203 89 -290h6q20 106 90 292l239 652h189l-475 -1241q-70 -178 -156 -263q-89 -86 -246 -86q-94 0 -168 17v145q61 -12 136 -12q96 0 149 41t96 141l58 150z" />
-<glyph unicode="&#x444;" d="M74 551q0 524 463 563v442h157v-442q459 -49 459 -563q0 -524 -459 -567v-476h-157v476q-463 45 -463 567zM242 551q0 -385 295 -416v828q-295 -28 -295 -412zM694 135q291 33 291 416q0 377 -291 410v-826z" />
-<glyph unicode="&#x445;" d="M96 0l414 563l-393 535h207l290 -410l291 410h207l-395 -535l413 -563h-206l-310 436l-311 -436h-207z" />
-<glyph unicode="&#x446;" d="M152 0v1098h182v-944h504v944h182v-944h160v-535h-183v381h-845z" />
-<glyph unicode="&#x447;" d="M152 676v422h182v-410q0 -174 205 -174q170 0 340 115v469h182v-1098h-182v489q-182 -127 -381 -127q-160 0 -252 87q-94 88 -94 227z" />
-<glyph unicode="&#x448;" d="M125 0v1098h162v-944h248v944h161v-944h248v944h162v-1098h-981z" />
-<glyph unicode="&#x449;" d="M109 0v1098h161v-944h248v944h162v-944h248v944h162v-944h118v-535h-161v381h-938z" />
-<glyph unicode="&#x44a;" d="M43 944v154h543v-451h153q416 0 416 -311q0 -336 -420 -336h-332v944h-360zM586 150h137q254 0 254 172q0 90 -59.5 131t-198.5 41h-133v-344z" />
-<glyph unicode="&#x44b;" d="M113 0v1098h161v-451h134q416 0 415 -311q0 -336 -420 -336h-290zM274 150h138q254 0 254 172q0 90 -59.5 131t-198.5 41h-134v-344zM952 0v1098h162v-1098h-162z" />
-<glyph unicode="&#x44c;" d="M217 0v1098h182v-451h277q416 0 416 -311q0 -336 -420 -336h-455zM399 150h260q254 0 254 172q0 90 -59 131t-199 41h-256v-344z" />
-<glyph unicode="&#x44d;" d="M184 1059q156 59 332 59q268 0 406 -145q139 -150 139 -430q0 -270 -143 -416q-143 -147 -408 -147q-187 0 -320 61v160q162 -61 316 -62q350 0 368 348h-538v154h536q-29 317 -364 317q-111 0 -262 -57z" />
-<glyph unicode="&#x44e;" d="M123 0v1098h162v-455h151q33 475 367 475q172 0 266 -147q96 -150 96 -420q0 -571 -368 -571q-335 0 -363 509h-149v-489h-162zM602 551q0 -219 47 -319.5t151.5 -100.5t149.5 98q47 100 47 322q0 217 -47 317q-45 98 -151 99q-102 0 -150 -97q-47 -98 -47 -319z" />
-<glyph unicode="&#x44f;" d="M115 0l291 461q-233 68 -234 315q0 150 102.5 236t274.5 86h485v-1098h-182v432h-285l-254 -432h-198zM346 772q0 -186 238 -186h268v358h-295q-211 0 -211 -172z" />
-<glyph unicode="&#x451;" d="M133 541q0 266 135 421.5t363 155.5q212 0 338 -135q127 -137 127 -356v-113h-774q9 -375 344 -375q199 0 370 76v-160q-170 -76 -364 -75q-244 0 -391 149q-148 151 -148 412zM326 662h573q0 305 -272 305q-276 0 -301 -305zM348 1394.5q0 102.5 96 102.5t96 -102.5 t-96 -102.5t-96 102.5zM723 1394.5q0 102.5 96 102.5t96 -102.5t-96 -102.5t-96 102.5z" />
-<glyph unicode="&#x452;" d="M4 1237v137h156v182h182v-182h379v-137h-379v-184l-8 -144h10q106 168 334 168q391 0 391 -401v-834q0 -334 -291 -334q-82 0 -133 25v148q53 -20 115 -21q127 0 127 170v836q0 260 -236 260q-160 0 -235 -95q-74 -92 -74 -303v-528h-182v1237h-156z" />
-<glyph unicode="&#x453;" d="M291 0v1098h747v-154h-565v-944h-182zM522 1241v27q92 127 174 301h219v-21q-109 -168 -272 -307h-121z" />
-<glyph unicode="&#x454;" d="M172 543q0 281 145 430q143 145 414 145q176 0 330 -59l-62 -158q-147 57 -262 57q-346 0 -377 -317h537v-154h-539q23 -348 369 -348q154 0 315 62v-160q-132 -61 -319 -61q-264 0 -408 147q-143 146 -143 416z" />
-<glyph unicode="&#x455;" d="M203 49v166q195 -86 370 -86q274 0 275 162q0 55 -49 98t-226 107q-233 86 -294 159q-59 72 -60 172q0 135 111 213q113 78 309.5 78t368.5 -74l-60 -149q-184 72 -319 72q-236 0 -236 -133q0 -57 51.5 -96.5t231.5 -102.5q207 -76 280 -152q70 -72 70 -182 q0 -150 -116.5 -235.5t-331.5 -85.5q-246 -1 -375 69z" />
-<glyph unicode="&#x456;" d="M197 0v123l344 20v811l-269 21v123h451v-955l352 -20v-123h-878zM526 1435.5q0 114.5 106.5 114.5t106.5 -114q0 -57 -32.5 -86t-73.5 -29q-107 0 -107 114.5z" />
-<glyph unicode="&#x457;" d="M197 0v123l344 20v811l-269 21v123h451v-955l352 -20v-123h-878zM330 1394.5q0 102.5 96 102.5t96 -102.5t-96 -102.5t-96 102.5zM705 1394.5q0 102.5 96 102.5t96 -102.5t-96 -102.5t-96 102.5z" />
-<glyph unicode="&#x458;" d="M135 -303q131 -39 289 -39q119 0 182 57q66 59 66 158v1081l-420 21v123h602v-1215q0 -180 -113 -278q-111 -96 -319 -97q-160 0 -287 35v154zM637 1435.5q0 114.5 106.5 114.5t106.5 -114.5t-106.5 -114.5t-106.5 114.5z" />
-<glyph unicode="&#x459;" d="M0 -2v131q22 -6 49 -6q41 0 66 43q27 45 47 231q27 233 57 701h494v-451h51q416 0 416 -311q0 -336 -420 -336h-209v944h-186q-33 -463 -60 -663q-25 -188 -72 -241.5t-141 -53.5q-61 0 -92 12zM713 150h55q254 0 254 172q0 90 -59.5 131t-198.5 41h-51v-344z" />
-<glyph unicode="&#x45a;" d="M106 0v1098h162v-455h299v455h162v-451h51q416 0 416 -311q0 -336 -420 -336h-209v489h-299v-489h-162zM729 150h55q254 0 254 172q0 90 -59 131t-199 41h-51v-344z" />
-<glyph unicode="&#x45b;" d="M4 1237v137h156v182h184v-182h418v-137h-420v-184l-10 -144h10q106 168 346 168q190 0 287 -96q94 -94 94 -305v-676h-182v666q0 260 -236 260q-160 0 -235 -95q-74 -92 -74 -303v-528h-182v1237h-156z" />
-<glyph unicode="&#x45c;" d="M215 0v1098h180v-291l-16 -299h4l137 166l402 424h213l-494 -510l522 -588h-213l-426 469l-129 -82v-387h-180zM508 1241v27q92 127 174 301h219v-21q-109 -168 -272 -307h-121z" />
-<glyph unicode="&#x45e;" d="M82 1098h188l262 -654q82 -203 89 -290h6q20 106 90 292l239 652h189l-475 -1241q-70 -178 -156 -263q-89 -86 -246 -86q-94 0 -168 17v145q61 -12 136 -12q96 0 149 41t96 141l58 150zM241 1559h170q10 -104 50 -144q43 -43 161 -43q193 0 211 187h174 q-20 -317 -389 -318q-195 0 -281 74t-96 244z" />
-<glyph unicode="&#x45f;" d="M160 0v1098h182v-944h545v944h182v-1098h-354v-381h-183v381h-372z" />
-<glyph unicode="&#x490;" d="M233 0v1462h637v301h177v-467h-627v-1296h-187z" />
-<glyph unicode="&#x491;" d="M291 0v1098h545v319h182v-456h-545v-961h-182z" />
-<glyph unicode="&#x1e00;" d="M33 0l483 1468h195l485 -1468h-192l-144 453h-491l-146 -453h-190zM422 618h385l-133 424q-39 121 -62 226q-20 -88 -47 -183zM389 -340q0 47 16 90q16 41 46 68q31 29 69 43q37 14 92 14q49 0 90 -14q39 -14 72 -43t49 -66q18 -39 19 -90q0 -57 -17 -92 q-18 -40 -49 -67.5t-74 -43.5q-41 -14 -90 -14q-55 0 -92 14q-39 14 -69 43q-29 27 -46 68q-16 43 -16 90zM500 -340q0 -51 28 -84q27 -29 84 -29q53 0 82 29q31 31 31 84t-31 84q-29 29 -82 29q-51 0 -80 -29q-32 -33 -32 -84z" />
-<glyph unicode="&#x1e01;" d="M135 307q0 332 510 348l203 7v69q0 236 -244 236q-150 0 -328 -82l-63 137q199 96 383 96q223 0 328 -88q102 -86 102 -278v-752h-131l-37 152h-8q-74 -94 -158 -133t-209 -39q-164 0 -256 85.5t-92 241.5zM324 305q0 -178 200 -178q150 0 234 82q88 84 88 229v99 l-162 -7q-195 -8 -278 -61q-82 -51 -82 -164zM383 -340q0 47 16 90q16 41 46 68q31 29 69 43q37 14 92 14q49 0 90 -14q39 -14 72 -43t49 -66q18 -39 19 -90q0 -57 -17 -92q-18 -40 -49 -67.5t-74 -43.5q-41 -14 -90 -14q-55 0 -92 14q-39 14 -69 43q-29 27 -46 68 q-16 43 -16 90zM494 -340q0 -51 28 -84q27 -29 84 -29q53 0 82 29q31 31 31 84t-31 84q-29 29 -82 29q-51 0 -80 -29q-32 -33 -32 -84z" />
-<glyph unicode="&#x1e3e;" d="M113 0v1462h247l248 -1192h6l250 1192h252v-1462h-153v887q0 121 14 391h-8l-283 -1278h-154l-278 1280h-8q18 -268 18 -406v-874h-151zM518 1581v27q92 127 174 301h219v-21q-109 -168 -272 -307h-121z" />
-<glyph unicode="&#x1e3f;" d="M92 0v1098h127l27 -148h10q68 168 201 168q164 0 213 -182h6q78 182 219 182q129 0 186 -92q57 -90 58 -309v-717h-162v707q0 147 -27 202q-27 57 -88 58q-88 0 -127 -82q-39 -80 -39 -279v-606h-161v707q0 260 -125 260q-82 0 -119 -80t-37 -318v-569h-162zM545 1241v27 q92 127 174 301h219v-21q-109 -168 -272 -307h-121z" />
-<glyph unicode="&#x1e80;" d="M2 1462h170l88 -663q18 -145 39 -377q18 -203 18 -242q27 162 70 312l141 516h177l145 -521q57 -205 72 -307q6 92 65 619l70 663h170l-187 -1462h-190l-168 580q-43 147 -66 282q-31 -168 -65 -284l-156 -578h-190zM336 1886v21h219q88 -182 174 -301v-27h-121 q-163 139 -272 307z" />
-<glyph unicode="&#x1e81;" d="M-4 1098h162l98 -543q39 -215 57 -393h6q33 195 68 358l133 578h193l127 -578q43 -188 67 -358h6q29 225 60 393l102 543h158l-225 -1098h-195l-131 596l-68 330h-6l-65 -334l-135 -592h-189zM303 1548v21h219q88 -182 174 -301v-27h-121q-163 139 -272 307z" />
-<glyph unicode="&#x1e82;" d="M2 1462h170l88 -663q18 -145 39 -377q18 -203 18 -242q27 162 70 312l141 516h177l145 -521q57 -205 72 -307q6 92 65 619l70 663h170l-187 -1462h-190l-168 580q-43 147 -66 282q-31 -168 -65 -284l-156 -578h-190zM500 1579v27q92 127 174 301h219v-21 q-109 -168 -272 -307h-121z" />
-<glyph unicode="&#x1e83;" d="M-4 1098h162l98 -543q39 -215 57 -393h6q33 195 68 358l133 578h193l127 -578q43 -188 67 -358h6q29 225 60 393l102 543h158l-225 -1098h-195l-131 596l-68 330h-6l-65 -334l-135 -592h-189zM522 1241v27q92 127 174 301h219v-21q-109 -168 -272 -307h-121z" />
-<glyph unicode="&#x1e84;" d="M2 1462h170l88 -663q18 -145 39 -377q18 -203 18 -242q27 162 70 312l141 516h177l145 -521q57 -205 72 -307q6 92 65 619l70 663h170l-187 -1462h-190l-168 580q-43 147 -66 282q-31 -168 -65 -284l-156 -578h-190zM334 1732.5q0 102.5 96 102.5t96 -102.5t-96 -102.5 t-96 102.5zM709 1732.5q0 102.5 96 102.5t96 -102.5t-96 -102.5t-96 102.5z" />
-<glyph unicode="&#x1e85;" d="M-4 1098h162l98 -543q39 -215 57 -393h6q33 195 68 358l133 578h193l127 -578q43 -188 67 -358h6q29 225 60 393l102 543h158l-225 -1098h-195l-131 596l-68 330h-6l-65 -334l-135 -592h-189zM330 1394.5q0 102.5 96 102.5t96 -102.5t-96 -102.5t-96 102.5zM705 1394.5 q0 102.5 96 102.5t96 -102.5t-96 -102.5t-96 102.5z" />
-<glyph unicode="&#x1ef2;" d="M33 1462h203l376 -739l381 739h201l-487 -893v-569h-187v559zM303 1886v21h219q88 -182 174 -301v-27h-121q-163 139 -272 307z" />
-<glyph unicode="&#x1ef3;" d="M82 1098h188l262 -654q82 -203 89 -290h6q20 106 90 292l239 652h189l-475 -1241q-70 -178 -156 -263q-89 -86 -246 -86q-94 0 -168 17v145q61 -12 136 -12q96 0 149 41t96 141l58 150zM314 1548v21h219q88 -182 174 -301v-27h-121q-163 139 -272 307z" />
-<glyph unicode="&#x1f4d;" d="M229 735q0 750 534 750q258 0 392 -195q137 -199 137 -557q0 -362 -137 -557q-138 -197 -394 -196q-532 -1 -532 755zM426 733q0 -590 335 -590q174 0 254 145.5t80 444.5q0 305 -82 445q-84 143 -250 143q-337 0 -337 -588zM-311 1255q0 78 59 136q61 57 183 88v-76 q-55 -18 -88 -45q-29 -23 -29 -47q0 -18 16 -29l33 -16q18 -10 33 -21q16 -12 16 -41q0 -39 -24.5 -57.5t-71.5 -18.5q-57 0 -92 35t-35 92zM-2 1135v26l23 68l24 76l25 81q4 16 10 44t8 32h207v-20l-43 -70l-51 -80q-6 -10 -59 -80q-31 -41 -62 -77h-82z" />
-<glyph unicode="&#x2000;" />
-<glyph unicode="&#x2001;" />
-<glyph unicode="&#x2002;" />
-<glyph unicode="&#x2003;" />
-<glyph unicode="&#x2004;" />
-<glyph unicode="&#x2005;" />
-<glyph unicode="&#x2006;" />
-<glyph unicode="&#x2007;" />
-<glyph unicode="&#x2008;" />
-<glyph unicode="&#x2009;" />
-<glyph unicode="&#x200a;" />
-<glyph unicode="&#x200b;" />
-<glyph unicode="&#x2010;" d="M285 465v168h659v-168h-659z" />
-<glyph unicode="&#x2011;" d="M285 465v168h659v-168h-659z" />
-<glyph unicode="&#x2012;" d="M285 465v168h659v-168h-659z" />
-<glyph unicode="&#x2013;" d="M184 465v168h860v-168h-860z" />
-<glyph unicode="&#x2014;" d="M-6 465v168h1241v-168h-1241z" />
-<glyph unicode="&#x2015;" d="M-6 465v168h1241v-168h-1241z" />
-<glyph unicode="&#x2017;" d="M-20 -45h1269v-139h-1269v139zM-20 -324h1269v-139h-1269v139z" />
-<glyph unicode="&#x2018;" d="M446 983q57 217 177 479h157q-66 -276 -100 -501h-219z" />
-<glyph unicode="&#x2019;" d="M446 961q61 254 101 501h219l14 -22q-53 -207 -176 -479h-158z" />
-<glyph unicode="&#x201a;" d="M457 -264q76 309 100 502h199l14 -23q-53 -207 -176 -479h-137z" />
-<glyph unicode="&#x201b;" d="M446 1440l15 22h219q41 -270 100 -501h-157q-126 278 -177 479z" />
-<glyph unicode="&#x201c;" d="M233 983q57 217 177 479h157q-66 -276 -100 -501h-219zM659 983q57 217 177 479h157q-66 -276 -100 -501h-219z" />
-<glyph unicode="&#x201d;" d="M233 961q61 254 101 501h219l14 -22q-53 -207 -176 -479h-158zM659 961q61 254 101 501h219l14 -22q-53 -207 -176 -479h-158z" />
-<glyph unicode="&#x201e;" d="M244 -264q76 309 100 502h199l14 -23q-53 -207 -176 -479h-137zM670 -264q76 309 100 502h199l14 -23q-55 -209 -176 -479h-137z" />
-<glyph unicode="&#x2020;" d="M240 989v180l311 -30l-55 417h217l-56 -417l332 30v-180l-332 31l56 -1020h-217l55 1020z" />
-<glyph unicode="&#x2021;" d="M229 346v180l332 -30l-47 290l47 275l-332 -31v180l332 -30l-55 376h217l-55 -376l331 30v-180l-331 31l47 -275l-47 -290l331 30v-180l-331 31l55 -377h-217l55 377z" />
-<glyph unicode="&#x2022;" d="M379 748q0 262 235.5 262t235.5 -262q0 -129 -64 -195q-65 -68 -172 -68q-113 0 -174 68t-61 195z" />
-<glyph unicode="&#x2026;" d="M78 110.5q0 139.5 127 139.5t127 -139.5t-127 -139.5t-127 139.5zM487 110.5q0 139.5 127 139.5t127 -139.5t-127 -139.5t-127 139.5zM897 110.5q0 139.5 127 139.5t127 -139.5t-127 -139.5t-127 139.5z" />
-<glyph unicode="&#x202f;" horiz-adv-x="430" />
-<glyph unicode="&#x2030;" d="M4 655l698 289l41 -100l-698 -287zM20 1171q0 309 244 310q113 0 176 -80q63 -78 64 -230q0 -311 -244 -311q-113 0 -176.5 82t-63.5 229zM156 1171q0 -102 22.5 -153t84 -51t83.5 51q20 47 21 153q0 119 -23 158q-25 43 -82 43q-55 0 -82 -45q-24 -43 -24 -156zM195 311 q0 309 243 310q111 0 176 -80q63 -78 64 -230q0 -311 -244 -311q-115 0 -176 82q-63 86 -63 229zM330 311q0 -104 22 -155q20 -49 84 -49.5t84 49.5q20 47 21 155q0 119 -23 158q-25 43 -82 43q-55 0 -82 -45q-24 -43 -24 -156zM725 311q0 309 244 310q113 0 176 -80 q63 -78 63 -230q0 -311 -243 -311q-115 0 -177 82q-63 86 -63 229zM860 311q0 -104 23 -155q23 -49 84 -49.5t84 49.5q20 47 20 155q0 113 -22 158q-20 43 -82 43q-59 0 -84 -43q-23 -39 -23 -158z" />
-<glyph unicode="&#x2032;" d="M496 1462h237l-41 -528h-155z" />
-<glyph unicode="&#x2033;" d="M285 1462h237l-41 -528h-155zM707 1462h237l-41 -528h-155z" />
-<glyph unicode="&#x2039;" d="M401 526v27l310 414l116 -78l-237 -348l237 -348l-116 -78z" />
-<glyph unicode="&#x203a;" d="M401 193l238 348l-238 348l117 78l309 -414v-27l-309 -411z" />
-<glyph unicode="&#x203c;" d="M718 110.5q0 139.5 127 139.5t127 -139.5t-127 -139.5t-127 139.5zM735 1462h223l-51 -1048h-121zM256 110.5q0 139.5 127 139.5t127 -139.5t-127 -139.5t-127 139.5zM273 1462h223l-51 -1048h-121z" />
-<glyph unicode="&#x2044;" d="M170 0l729 1462h158l-729 -1462h-158z" />
-<glyph unicode="&#x205f;" horiz-adv-x="538" />
-<glyph unicode="&#x207f;" d="M317 797v665h125l17 -104h8q68 121 207 121q109 0 174 -66q63 -63 63 -184v-432h-147v413q0 150 -127 150q-98 0 -135 -53q-37 -52 -37 -172v-338h-148z" />
-<glyph unicode="&#x20a3;" d="M129 262v137h176v1063h752v-164h-574v-516h535v-164h-535v-219h293v-137h-293v-262h-178v262h-176z" />
-<glyph unicode="&#x20a4;" d="M119 0v154q201 49 200 284v21h-198v137h198v158h-198v137h198v221q0 166 109 268q106 100 289 101q193 0 346 -80l-66 -144q-143 72 -272 72q-223 0 -223 -246v-192h377v-137h-377v-158h377v-137h-377v-19q0 -199 -140 -274h748v-166h-991z" />
-<glyph unicode="&#x20a7;" d="M82 0v1462h205q451 0 450 -428q0 -219 -114 -344q-113 -121 -342 -121h-41v-569h-158zM240 715h41q293 0 292 309q0 291 -268 291h-65v-600zM688 618v70l115 51l65 215h86v-211h209v-125h-209v-348q0 -154 113 -153q63 0 123 20v-125q-70 -33 -166 -32q-221 0 -221 282 v356h-115z" />
-<glyph unicode="&#x20ac;" d="M96 502v137h148l-2 39l2 119h-148v137h160q41 262 180 405q141 143 359 144q193 0 335 -92l-79 -146q-123 74 -242 74q-133 0 -234 -100q-96 -96 -133 -285h432v-137h-446q0 -6 -1 -14.5t-1 -14.5v-25v-61q0 -29 2 -43h385v-137h-367q74 -358 369 -359q139 0 268 58v-162 q-125 -59 -282 -59q-444 0 -541 522h-164z" />
-<glyph unicode="&#x2105;" d="M8 1126q0 168 90 258q88 88 252 89q100 0 182 -37l-32 -107q-80 33 -150 33q-199 0 -198 -234q0 -229 194 -229q104 0 176 33v-107q-74 -37 -182 -37q-156 0 -244 86t-88 252zM156 0l729 1462h157l-729 -1462h-157zM616 334q0 164 82 252q84 90 224 90q129 0 217 -94 q84 -90 84 -248q0 -160 -82 -250q-84 -92 -223 -92q-131 0 -218 92q-84 90 -84 250zM762 334q0 -233 158 -234q156 0 155 234q0 231 -155 231q-158 0 -158 -231z" />
-<glyph unicode="&#x2113;" d="M227 510v121q66 16 193 59v494q0 137 69 219q68 80 201 80q109 0 172.5 -82t63.5 -219q0 -354 -340 -541v-301q0 -221 145 -221q143 0 154 213h114q-18 -352 -286 -352q-138 0 -215 92q-78 94 -78 264v231q-105 -37 -193 -57zM586 770q207 121 207 406q0 188 -103 188 q-53 0 -78 -41q-27 -43 -26 -147v-406z" />
-<glyph unicode="&#x2116;" d="M25 0v1462h176l323 -1163h6q-14 285 -14 403v760h133v-1462h-174l-325 1169h-9q18 -252 19 -417v-752h-135zM705 623q0 346 253 346q115 0 182.5 -92.5t67.5 -253.5q0 -168 -65.5 -258.5t-188.5 -90.5q-115 0 -182 92.5t-67 256.5zM745 0v147h414v-147h-414zM844 623 q0 -111 24 -170q25 -57 88 -58q61 0 86 58q25 59 25 170q0 113 -24.5 168t-86.5 55q-63 0 -87.5 -55t-24.5 -168z" />
-<glyph unicode="&#x2122;" d="M0 1354v108h481v-108h-178v-613h-127v613h-176zM526 741v721h187l139 -534l149 534h179v-721h-127v342q0 74 10 207h-12l-154 -549h-100l-146 549h-12l10 -180v-369h-123z" />
-<glyph unicode="&#x2126;" d="M74 0v164h266q-254 233 -254 661q0 313 139 486q141 174 391 174q248 0 390 -174q141 -176 141 -486q0 -428 -256 -661h268v-164h-469v147q260 229 260 674q0 500 -335.5 500t-335.5 -500q0 -442 262 -674v-147h-467z" />
-<glyph unicode="&#x212e;" d="M82 530q0 260 154 414q152 152 376 152q229 0 381 -156q150 -152 150 -405v-5h-828v-356q123 -123 297 -123q254 0 396 234l71 -41q-98 -158 -207 -217q-111 -61 -260 -62q-242 0 -385 162q-145 163 -145 403zM315 616h596v277q-119 119 -301 119q-172 0 -295 -117v-279z " />
-<glyph unicode="&#x215b;" d="M19 1309l219 151h135v-788h-146v465q0 84 9 200q-43 -45 -74 -65l-70 -51zM115 0l729 1462h158l-729 -1462h-158zM647 211q0 131 139 204q-115 80 -114 193q0 90 71 145q70 55 184.5 55.5t182.5 -53.5q70 -55 70 -147q0 -117 -140 -184q166 -86 166 -207 q0 -104 -75.5 -166t-200.5 -62q-133 0 -209 60q-74 60 -74 162zM793 211q0 -117 131 -117q135 0 135 117q0 89 -135 147l-13 6q-118 -65 -118 -153zM819 606q0 -80 109 -133q106 49 106 133q0 96 -108 96q-107 0 -107 -96z" />
-<glyph unicode="&#x215c;" d="M10 705v124q113 -66 203 -65q150 0 149 137q0 125 -147 125h-72v104h70q123 0 123 127q0 111 -97 111q-74 0 -161 -70l-66 86q111 92 238 93q113 0 174 -54q63 -55 63 -149q0 -139 -149 -189q176 -41 176 -186q0 -117 -74 -180q-72 -63 -215 -64q-132 1 -215 50zM154 0 l729 1462h158l-729 -1462h-158zM667 211q0 131 139 204q-115 80 -114 193q0 90 71 145q70 55 184.5 55.5t182.5 -53.5q70 -55 70 -147q0 -117 -140 -184q166 -86 166 -207q0 -104 -75.5 -166t-200.5 -62q-133 0 -209 60q-74 60 -74 162zM813 211q0 -117 131 -117 q135 0 135 117q0 89 -135 147l-13 6q-118 -65 -118 -153zM839 606q0 -80 109 -133q106 49 106 133q0 96 -108 96q-107 0 -107 -96z" />
-<glyph unicode="&#x215d;" d="M25 705v129q102 -68 207 -68q162 0 162 147q0 145 -166 146q-59 0 -125 -17l-62 39l31 381h397v-110h-288l-17 -193q33 6 96 6q115 0 191 -65q74 -63 74 -174q0 -127 -74 -199q-72 -70 -221 -70q-129 1 -205 48zM154 0l729 1462h158l-729 -1462h-158zM667 211 q0 131 139 204q-115 80 -114 193q0 90 71 145q70 55 184.5 55.5t182.5 -53.5q70 -55 70 -147q0 -117 -140 -184q166 -86 166 -207q0 -104 -75.5 -166t-200.5 -62q-133 0 -209 60q-74 60 -74 162zM813 211q0 -117 131 -117q135 0 135 117q0 89 -135 147l-13 6 q-118 -65 -118 -153zM839 606q0 -80 109 -133q106 49 106 133q0 96 -108 96q-107 0 -107 -96z" />
-<glyph unicode="&#x215e;" d="M27 1341v121h548v-100l-309 -690h-155l309 669h-393zM88 0l729 1462h158l-729 -1462h-158zM667 211q0 131 139 204q-115 80 -114 193q0 90 71 145q70 55 184.5 55.5t182.5 -53.5q70 -55 70 -147q0 -117 -140 -184q166 -86 166 -207q0 -104 -75.5 -166t-200.5 -62 q-133 0 -209 60q-74 60 -74 162zM813 211q0 -117 131 -117q135 0 135 117q0 89 -135 147l-13 6q-118 -65 -118 -153zM839 606q0 -80 109 -133q106 49 106 133q0 96 -108 96q-107 0 -107 -96z" />
-<glyph unicode="&#x2202;" d="M121 375q0 250 137 442.5t383 192.5q184 0 283 -148l2 39q10 184 -58 303q-68 121 -219 121q-131 0 -258 -84v174q135 61 283 62q432 0 432 -543q0 -391 -168 -672q-169 -283 -455 -282q-362 0 -362 395zM309 369q0 -236 187 -236q137 0 247.5 153.5t147.5 393.5 q-20 84 -86 137t-139 53q-160 0 -258.5 -159.5t-98.5 -341.5z" />
-<glyph unicode="&#x2206;" d="M74 0v113l446 1349h187l448 -1351v-111h-1081zM274 164h678l-247 758q-57 176 -93 340q-47 -207 -88 -334z" />
-<glyph unicode="&#x220f;" d="M156 -492v1954h956v-1954h-186v1788h-584v-1788h-186z" />
-<glyph unicode="&#x2211;" d="M74 -377l583 914l-567 811v114h1014v-164h-754l529 -759l-555 -867h845v-164h-1095v115z" />
-<glyph unicode="&#x2212;" d="M152 647v150h923v-150h-923z" />
-<glyph unicode="&#x221a;" d="M23 764v143h296l230 -663l512 1452h145l-594 -1710h-133l-276 778h-180z" />
-<glyph unicode="&#x221e;" d="M70 723q0 133 75 225q74 90 193 90q166 0 274 -219q117 213 281 213q117 0 190.5 -86t73.5 -229q0 -133 -76 -223q-78 -92 -188 -93q-172 0 -283 220q-117 -213 -272 -213q-117 0 -192.5 88t-75.5 227zM205 721q0 -80 41 -131t106 -51q102 0 189 184q-83 184 -191 184 q-63 0 -104 -53t-41 -133zM684 717q86 -184 193 -185q66 0 104 54q41 57 41 133q0 82 -41 131q-43 51 -107 51q-104 0 -190 -184z" />
-<glyph unicode="&#x222b;" d="M236 -326q61 -25 116 -24q180 0 180 233v1319q0 354 330 354q88 0 131 -18v-147q-59 27 -114 26q-172 0 -172 -233v-1321q0 -176 -89 -264q-90 -90 -249 -91q-78 0 -133 19v147z" />
-<glyph unicode="&#x2248;" d="M152 379v162q98 109 247 108q102 0 248 -63q129 -55 201 -56q106 0 227 121v-162q-98 -109 -248 -108q-102 0 -247 63q-133 55 -201 56q-106 0 -227 -121zM152 788v162q98 109 247 109q100 0 248 -64q127 -55 201 -55q111 0 227 121v-162q-98 -109 -248 -108 q-102 0 -247 63q-129 55 -201 55q-112 0 -227 -121z" />
-<glyph unicode="&#x2260;" d="M152 442v150h317l121 260h-438v149h507l134 283l137 -59l-105 -224h250v-149h-319l-123 -260h442v-150h-512l-129 -278l-137 57l102 221h-247z" />
-<glyph unicode="&#x2264;" d="M152 0v150h923v-150h-923zM152 672v102l923 451v-160l-715 -342l715 -342v-160z" />
-<glyph unicode="&#x2265;" d="M152 0v150h923v-150h-923zM152 221v160l714 342l-714 342v160l923 -451v-102z" />
-<glyph unicode="&#x25ca;" d="M125 735l450 740h76l453 -738l-453 -737h-76zM309 737l305 -514l306 514l-306 512z" />
-<glyph unicode="&#xe000;" horiz-adv-x="1100" d="M0 1100h1100v-1100h-1100v1100z" />
-<glyph unicode="&#xfb01;" d="M49 961v75l195 68v96q0 190 75.5 278.5t255.5 88.5q96 0 197 -37l-47 -141q-82 29 -143 28q-90 0 -123 -51q-33 -53 -33 -164v-104h246v-137h-246v-961h-182v961h-195zM854 1394.5q0 114.5 106.5 114.5t106.5 -114q0 -58 -31 -86q-33 -29 -75 -29q-107 0 -107 114.5z M868 0v1098h183v-1098h-183z" />
-<glyph unicode="&#xfb02;" d="M49 961v75l195 68v96q0 190 75.5 278.5t255.5 88.5q96 0 197 -37l-47 -141q-82 29 -143 28q-90 0 -123 -51q-33 -53 -33 -164v-104h246v-137h-246v-961h-182v961h-195zM868 0v1556h183v-1556h-183z" />
-<glyph unicode="&#xfb03;" d="M66 971v65l100 62v82q0 109 20 176q23 76 58 112q37 39 96 60q55 18 127 18q57 0 92 -10q47 -14 78 -25q43 33 88 43q53 12 115 13q59 0 98 -11q49 -14 82 -26l-41 -131q-18 8 -64 20q-31 8 -71 8q-37 0 -66 -12q-27 -12 -45 -37q-16 -23 -26 -69q-8 -39 -9 -107v-104 h367v-1098h-164v971h-203v-971h-163v971h-205v-971h-164v971h-100zM330 1098h205v102q0 115 24 193q-29 8 -43 10q-29 4 -45 4q-39 0 -61 -10q-27 -12 -45 -37q-14 -18 -25 -70q-10 -47 -10 -108v-84z" />
-<glyph unicode="&#xfb04;" d="M66 971v65l100 62v82q0 109 20 176q23 76 58 112q37 39 96 60q55 18 127 18q57 0 92 -10q47 -14 78 -25q43 33 88 43q53 12 115 13q55 0 94 -11h131v-1556h-164v1421q-20 4 -29 4q-4 0 -14 1t-14 1q-37 0 -66 -12q-27 -12 -45 -37q-16 -23 -26 -69q-8 -39 -9 -107v-104 h142v-127h-142v-971h-163v971h-205v-971h-164v971h-100zM330 1098h205v102q0 115 24 193q-29 8 -43 10q-29 4 -45 4q-39 0 -61 -10q-27 -12 -45 -37q-14 -18 -25 -70q-10 -47 -10 -108v-84z" />
-<glyph unicode="&#xfeff;" />
-<glyph unicode="&#xfffc;" d="M55 39v270h111v-270h-111zM55 -80h111v-194h192v-109h-303v303zM55 430v272h111v-272h-111zM55 823v271h111v-271h-111zM55 1214v304h303v-111h-192v-193h-111zM254 1083.5q0 55.5 12 98.5q12 45 39 78q23 29 64 47t94 18t92 -18q45 -20 66 -47q27 -33 38 -78 q12 -43 12.5 -98.5t-12 -98.5t-38.5 -76q-25 -31 -66 -49q-39 -18 -92 -18t-94 18q-39 18 -64 49q-27 33 -39 76t-12 98.5zM354 1083.5q0 -75.5 27 -116.5t82 -41q59 0 82 41q27 47 26.5 116.5t-26.5 116.5q-23 41 -82 41q-55 0 -82 -41t-27 -116.5zM479 -274h271v-109h-271 v109zM479 1407v111h271v-111h-271zM535 326v469h137q92 0 133 -27q43 -28 43 -92q0 -40 -19 -68q-18 -27 -53 -33v-4q12 -2 33 -10q10 -4 27 -20q12 -12 18 -31q8 -25 8 -47q0 -63 -43 -100t-119 -37h-165zM633 408h59q37 0 53 18q14 16 15 47q0 27 -15 41q-16 16 -57 16 h-55v-122zM633 610h51q37 0 51.5 12.5t14.5 39t-16.5 39t-53.5 12.5h-47v-103zM709 -111q4 -2 15 -3t17 -1q12 -2 43 -2t47 15q20 16 21 55v244h-94v77h266v-77h-72v-242q0 -80 -45 -119q-43 -37 -112 -37q-37 0 -52 2q-25 4 -34 6v82zM870 -274h195v194h109v-303h-304v109z M870 1407v111h304v-304h-109v193h-195zM1065 39v270h109v-270h-109zM1065 430v272h109v-272h-109zM1065 823v271h109v-271h-109z" />
-<glyph unicode="&#xfffd;" d="M4 618l610 938l613 -938l-613 -937zM342 1014l66 -160q51 29 106 51q49 20 96 21q53 0 78 -27t25 -68q0 -25 -6.5 -47t-16.5 -36q-12 -18 -31 -37q-10 -10 -47 -43q-31 -29 -53 -54q-23 -27 -35 -53q-16 -39 -20 -55q-6 -31 -6 -66v-55h170v43q0 16 4 41q2 16 12 33 q6 10 29 33q27 27 45 40l61 62q25 23 45 59q18 29 27 66q8 33 8 82q0 125 -76 192q-78 68 -211 68q-35 0 -71 -6q-29 -4 -72 -21q-12 -4 -66 -28q-28 -12 -61 -35zM477 139.5q0 -67.5 33 -94.5q35 -29 82 -29q18 0 41 7q20 6 37 22q18 18 26 39q8 23 9 55q0 35 -9 58 q-8 20 -26 39q-14 14 -37 20t-41 6q-47 0 -82 -29q-33 -26 -33 -93.5z" />
-<glyph d="M231 1559h170q10 -104 50 -144q43 -43 161 -43q193 0 211 187h174q-20 -317 -389 -318q-195 0 -281 74t-96 244z" />
-<glyph d="M135 -303q131 -39 289 -39q119 0 182 57q66 59 66 158v1081l-420 21v123h602v-1215q0 -180 -113 -278q-111 -96 -319 -97q-160 0 -287 35v154z" />
-<glyph d="M494 1229v26l26 107q27 127 35 194h180v-20q0 -14 -43 -113q-49 -111 -102 -194h-96z" />
-<glyph d="M483 -426q63 145 84 301h178v-20q0 -22 -49 -123q-51 -109 -114 -185h-99v27z" />
-<glyph d="M483 1241v21q0 20 45 118q45 100 119 189h98v-27q-61 -145 -83 -301h-179z" />
-<glyph d="M313 1026q0 453 299 453q150 0 226 -117q78 -119 77 -336q0 -457 -303 -457q-141 0 -221 117q-78 115 -78 340zM461 1026q0 -326 151 -326q156 0 156 326q0 324 -156 324q-151 0 -151 -324z" />
-<glyph d="M293 854v98l377 523h141v-508h84v-113h-84v-174h-143v174h-375zM438 967h230v176q0 83 6 172q-37 -70 -80 -131z" />
-<glyph d="M336 705v129q102 -68 207 -68q162 0 162 147q0 145 -166 146q-59 0 -125 -17l-62 39l31 381h397v-110h-288l-17 -193q33 6 96 6q115 0 191 -65q74 -63 74 -174q0 -127 -74 -199q-72 -70 -221 -70q-129 1 -205 48z" />
-<glyph d="M313 913q0 408 484 580l45 -109q-329 -111 -381 -325h10q61 92 201 92q115 0 178 -76q66 -78 65 -205q0 -133 -83.5 -217t-215.5 -84q-137 0 -219 93q-84 93 -84 251zM455 889q0 -84 47 -141.5t121 -57.5q68 0 110 45q41 43 41 133q0 172 -147 172q-74 0 -123 -42.5 t-49 -108.5z" />
-<glyph d="M367 1341v121h548v-100l-309 -690h-155l309 669h-393z" />
-<glyph d="M305 877q0 131 139 204q-115 80 -114 193q0 90 71 145q70 55 184.5 55.5t182.5 -53.5q70 -55 70 -147q0 -117 -140 -184q166 -86 166 -207q0 -104 -75.5 -166t-200.5 -62q-133 0 -209 60q-74 60 -74 162zM451 877q0 -117 131 -117q135 0 135 117q0 89 -135 147l-13 6 q-118 -65 -118 -153zM477 1272q0 -80 109 -133q106 49 106 133q0 96 -108 96q-107 0 -107 -96z" />
-<glyph d="M313 1178q0 133 80 219q78 84 211 84q141 0 227 -103q84 -98 84 -288q0 -520 -413 -521q-66 0 -111 15v125q41 -23 101 -23q272 0 286 315h-8q-71 -98 -197 -98q-123 0 -190 74q-70 76 -70 201zM453 1180q0 -164 149 -164q72 0 121 43t49 100q0 78 -45 141 q-43 61 -121 62q-68 0 -110 -47q-43 -46 -43 -135z" />
-<glyph d="M158 547q0 268 112 422q111 150 305 149q203 0 314 -168h8l27 148h147v-1121q0 -225 -119 -346q-121 -123 -336 -123q-195 0 -352 76v170q186 -96 350 -96q274 0 275 309v10q0 41 12 170h-12q-109 -168 -314 -167q-193 0 -305 149.5t-112 417.5zM346 545q0 -414 264 -414 q147 0 211 88q66 90 68 287v41q0 227 -67.5 323.5t-213.5 96.5q-262 0 -262 -422z" />
-<glyph d="M-18 735q0 362 163 557q162 193 473 193q299 0 465 -199q166 -200 166 -553q0 -549 -379 -708l338 -373l-153 -109l-367 441q-41 -4 -72 -4q-309 0 -471 196q-163 199 -163 559zM178 733q0 -590 438 -590q436 0 437 590q0 588 -435 588q-440 0 -440 -588z" />
-<glyph d="M348 1163l383 299h150v-1462h-176v913q0 147 8 361q-43 -47 -121 -113l-148 -121z" />
-<glyph d="M346 946v193q236 111 369 323h166v-1462h-179v823l5 408q-119 -154 -361 -285z" />
-<glyph d="M371 1092v127l301 34l71 209h113v-1462h-176v909q0 111 8 183h-317z" />
-<glyph d="M301 1255q0 78 59 136q61 57 183 88v-76q-55 -18 -88 -45q-29 -23 -29 -47q0 -18 16 -29l33 -16q18 -10 33 -21q16 -12 16 -41q0 -39 -24.5 -57.5t-71.5 -18.5q-57 0 -92 35t-35 92zM610 1135v26l23 68l24 76l25 81q4 16 10 44t8 32h207v-20l-43 -70l-51 -80 q-6 -10 -59 -80q-31 -41 -62 -77h-82z" />
-</font>
-</defs></svg>
\ No newline at end of file
diff --git a/apps/files_texteditor/css/DroidSansMono/DroidSansMono-webfont.ttf b/apps/files_texteditor/css/DroidSansMono/DroidSansMono-webfont.ttf
deleted file mode 100644
index e125bc1f31..0000000000
Binary files a/apps/files_texteditor/css/DroidSansMono/DroidSansMono-webfont.ttf and /dev/null differ
diff --git a/apps/files_texteditor/css/DroidSansMono/DroidSansMono-webfont.woff b/apps/files_texteditor/css/DroidSansMono/DroidSansMono-webfont.woff
deleted file mode 100644
index 31d51be4a7..0000000000
Binary files a/apps/files_texteditor/css/DroidSansMono/DroidSansMono-webfont.woff and /dev/null differ
diff --git a/apps/files_texteditor/css/DroidSansMono/Google Android License.txt b/apps/files_texteditor/css/DroidSansMono/Google Android License.txt
deleted file mode 100644
index 0a010886a1..0000000000
--- a/apps/files_texteditor/css/DroidSansMono/Google Android License.txt	
+++ /dev/null
@@ -1,18 +0,0 @@
-Copyright (C) 2008 The Android Open Source Project
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-##########
-
-This directory contains the fonts for the platform. They are licensed
-under the Apache 2 license.
diff --git a/apps/files_texteditor/css/DroidSansMono/demo.html b/apps/files_texteditor/css/DroidSansMono/demo.html
deleted file mode 100644
index e305598817..0000000000
--- a/apps/files_texteditor/css/DroidSansMono/demo.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-
-	<title>Font Face Demo</title>
-	<link rel="stylesheet" href="stylesheet.css" type="text/css" charset="utf-8">
-	<style type="text/css" media="screen">
-		h1.fontface {font: 60px/68px 'DroidSansMonoRegular', Arial, sans-serif;letter-spacing: 0;}
-
-		p.style1 {font: 18px/27px 'DroidSansMonoRegular', Arial, sans-serif;}
-
-		#container {
-			width: 800px;
-			margin-left: auto;
-			margin-right: auto;
-		}
-	</style>
-</head>
-
-<body>
-	<div id="container">
-		<h1 class="fontface">Font-face Demo for the Droid Sans Mono Font</h1>
-
-
-
-	<p class="style1">Droid Sans Mono Regular - Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
-
-		</div>
-</body>
-</html>
diff --git a/apps/files_texteditor/css/DroidSansMono/stylesheet.css b/apps/files_texteditor/css/DroidSansMono/stylesheet.css
deleted file mode 100644
index 4d814b262d..0000000000
--- a/apps/files_texteditor/css/DroidSansMono/stylesheet.css
+++ /dev/null
@@ -1,15 +0,0 @@
-/* Generated by Font Squirrel (http://www.fontsquirrel.com) on June 13, 2012 02:50:54 PM America/New_York */
-
-
-
-@font-face {
-    font-family: 'Droid Sans Mono';
-    src: url('%appswebroot%/files_texteditor/css/DroidSansMono/DroidSansMono-webfont.eot');
-    src: url('%appswebroot%/files_texteditor/css/DroidSansMono/DroidSansMono-webfont.eot?#iefix') format('embedded-opentype'),
-         url('%appswebroot%/files_texteditor/css/DroidSansMono/DroidSansMono-webfont.woff') format('woff'),
-         url('%appswebroot%/files_texteditor/css/DroidSansMono/DroidSansMono-webfont.ttf') format('truetype'),
-         url('%appswebroot%/files_texteditor/css/DroidSansMono/DroidSansMono-webfont.svg#DroidSansMonoRegular') format('svg');
-    font-weight: normal;
-    font-style: normal;
-
-}
diff --git a/apps/files_texteditor/css/style.css b/apps/files_texteditor/css/style.css
deleted file mode 100644
index 14a1c4a9bb..0000000000
--- a/apps/files_texteditor/css/style.css
+++ /dev/null
@@ -1,11 +0,0 @@
-#editor{
-	position: fixed;
-	display: block;
-	top: 6.8em;
-	left: 12.5em;
-	z-index: 20;
-}
-#editor_save{
-	margin-left: 7px;
-	float: left;
-}
diff --git a/apps/files_texteditor/js/aceeditor/LICENSE b/apps/files_texteditor/js/aceeditor/LICENSE
deleted file mode 100644
index 853e4fd5a5..0000000000
--- a/apps/files_texteditor/js/aceeditor/LICENSE
+++ /dev/null
@@ -1,476 +0,0 @@
-Licensed under the tri-license MPL/LGPL/GPL.
-
-                          MOZILLA PUBLIC LICENSE
-                                Version 1.1
-
-                              ---------------
-
-1. Definitions.
-
-     1.0.1. "Commercial Use" means distribution or otherwise making the
-     Covered Code available to a third party.
-
-     1.1. "Contributor" means each entity that creates or contributes to
-     the creation of Modifications.
-
-     1.2. "Contributor Version" means the combination of the Original
-     Code, prior Modifications used by a Contributor, and the Modifications
-     made by that particular Contributor.
-
-     1.3. "Covered Code" means the Original Code or Modifications or the
-     combination of the Original Code and Modifications, in each case
-     including portions thereof.
-
-     1.4. "Electronic Distribution Mechanism" means a mechanism generally
-     accepted in the software development community for the electronic
-     transfer of data.
-
-     1.5. "Executable" means Covered Code in any form other than Source
-     Code.
-
-     1.6. "Initial Developer" means the individual or entity identified
-     as the Initial Developer in the Source Code notice required by Exhibit
-     A.
-
-     1.7. "Larger Work" means a work which combines Covered Code or
-     portions thereof with code not governed by the terms of this License.
-
-     1.8. "License" means this document.
-
-     1.8.1. "Licensable" means having the right to grant, to the maximum
-     extent possible, whether at the time of the initial grant or
-     subsequently acquired, any and all of the rights conveyed herein.
-
-     1.9. "Modifications" means any addition to or deletion from the
-     substance or structure of either the Original Code or any previous
-     Modifications. When Covered Code is released as a series of files, a
-     Modification is:
-          A. Any addition to or deletion from the contents of a file
-          containing Original Code or previous Modifications.
-
-          B. Any new file that contains any part of the Original Code or
-          previous Modifications.
-
-     1.10. "Original Code" means Source Code of computer software code
-     which is described in the Source Code notice required by Exhibit A as
-     Original Code, and which, at the time of its release under this
-     License is not already Covered Code governed by this License.
-
-     1.10.1. "Patent Claims" means any patent claim(s), now owned or
-     hereafter acquired, including without limitation,  method, process,
-     and apparatus claims, in any patent Licensable by grantor.
-
-     1.11. "Source Code" means the preferred form of the Covered Code for
-     making modifications to it, including all modules it contains, plus
-     any associated interface definition files, scripts used to control
-     compilation and installation of an Executable, or source code
-     differential comparisons against either the Original Code or another
-     well known, available Covered Code of the Contributor's choice. The
-     Source Code can be in a compressed or archival form, provided the
-     appropriate decompression or de-archiving software is widely available
-     for no charge.
-
-     1.12. "You" (or "Your")  means an individual or a legal entity
-     exercising rights under, and complying with all of the terms of, this
-     License or a future version of this License issued under Section 6.1.
-     For legal entities, "You" includes any entity which controls, is
-     controlled by, or is under common control with You. For purposes of
-     this definition, "control" means (a) the power, direct or indirect,
-     to cause the direction or management of such entity, whether by
-     contract or otherwise, or (b) ownership of more than fifty percent
-     (50%) of the outstanding shares or beneficial ownership of such
-     entity.
-
-2. Source Code License.
-
-     2.1. The Initial Developer Grant.
-     The Initial Developer hereby grants You a world-wide, royalty-free,
-     non-exclusive license, subject to third party intellectual property
-     claims:
-          (a)  under intellectual property rights (other than patent or
-          trademark) Licensable by Initial Developer to use, reproduce,
-          modify, display, perform, sublicense and distribute the Original
-          Code (or portions thereof) with or without Modifications, and/or
-          as part of a Larger Work; and
-
-          (b) under Patents Claims infringed by the making, using or
-          selling of Original Code, to make, have made, use, practice,
-          sell, and offer for sale, and/or otherwise dispose of the
-          Original Code (or portions thereof).
-
-          (c) the licenses granted in this Section 2.1(a) and (b) are
-          effective on the date Initial Developer first distributes
-          Original Code under the terms of this License.
-
-          (d) Notwithstanding Section 2.1(b) above, no patent license is
-          granted: 1) for code that You delete from the Original Code; 2)
-          separate from the Original Code;  or 3) for infringements caused
-          by: i) the modification of the Original Code or ii) the
-          combination of the Original Code with other software or devices.
-
-     2.2. Contributor Grant.
-     Subject to third party intellectual property claims, each Contributor
-     hereby grants You a world-wide, royalty-free, non-exclusive license
-
-          (a)  under intellectual property rights (other than patent or
-          trademark) Licensable by Contributor, to use, reproduce, modify,
-          display, perform, sublicense and distribute the Modifications
-          created by such Contributor (or portions thereof) either on an
-          unmodified basis, with other Modifications, as Covered Code
-          and/or as part of a Larger Work; and
-
-          (b) under Patent Claims infringed by the making, using, or
-          selling of  Modifications made by that Contributor either alone
-          and/or in combination with its Contributor Version (or portions
-          of such combination), to make, use, sell, offer for sale, have
-          made, and/or otherwise dispose of: 1) Modifications made by that
-          Contributor (or portions thereof); and 2) the combination of
-          Modifications made by that Contributor with its Contributor
-          Version (or portions of such combination).
-
-          (c) the licenses granted in Sections 2.2(a) and 2.2(b) are
-          effective on the date Contributor first makes Commercial Use of
-          the Covered Code.
-
-          (d)    Notwithstanding Section 2.2(b) above, no patent license is
-          granted: 1) for any code that Contributor has deleted from the
-          Contributor Version; 2)  separate from the Contributor Version;
-          3)  for infringements caused by: i) third party modifications of
-          Contributor Version or ii)  the combination of Modifications made
-          by that Contributor with other software  (except as part of the
-          Contributor Version) or other devices; or 4) under Patent Claims
-          infringed by Covered Code in the absence of Modifications made by
-          that Contributor.
-
-3. Distribution Obligations.
-
-     3.1. Application of License.
-     The Modifications which You create or to which You contribute are
-     governed by the terms of this License, including without limitation
-     Section 2.2. The Source Code version of Covered Code may be
-     distributed only under the terms of this License or a future version
-     of this License released under Section 6.1, and You must include a
-     copy of this License with every copy of the Source Code You
-     distribute. You may not offer or impose any terms on any Source Code
-     version that alters or restricts the applicable version of this
-     License or the recipients' rights hereunder. However, You may include
-     an additional document offering the additional rights described in
-     Section 3.5.
-
-     3.2. Availability of Source Code.
-     Any Modification which You create or to which You contribute must be
-     made available in Source Code form under the terms of this License
-     either on the same media as an Executable version or via an accepted
-     Electronic Distribution Mechanism to anyone to whom you made an
-     Executable version available; and if made available via Electronic
-     Distribution Mechanism, must remain available for at least twelve (12)
-     months after the date it initially became available, or at least six
-     (6) months after a subsequent version of that particular Modification
-     has been made available to such recipients. You are responsible for
-     ensuring that the Source Code version remains available even if the
-     Electronic Distribution Mechanism is maintained by a third party.
-
-     3.3. Description of Modifications.
-     You must cause all Covered Code to which You contribute to contain a
-     file documenting the changes You made to create that Covered Code and
-     the date of any change. You must include a prominent statement that
-     the Modification is derived, directly or indirectly, from Original
-     Code provided by the Initial Developer and including the name of the
-     Initial Developer in (a) the Source Code, and (b) in any notice in an
-     Executable version or related documentation in which You describe the
-     origin or ownership of the Covered Code.
-
-     3.4. Intellectual Property Matters
-          (a) Third Party Claims.
-          If Contributor has knowledge that a license under a third party's
-          intellectual property rights is required to exercise the rights
-          granted by such Contributor under Sections 2.1 or 2.2,
-          Contributor must include a text file with the Source Code
-          distribution titled "LEGAL" which describes the claim and the
-          party making the claim in sufficient detail that a recipient will
-          know whom to contact. If Contributor obtains such knowledge after
-          the Modification is made available as described in Section 3.2,
-          Contributor shall promptly modify the LEGAL file in all copies
-          Contributor makes available thereafter and shall take other steps
-          (such as notifying appropriate mailing lists or newsgroups)
-          reasonably calculated to inform those who received the Covered
-          Code that new knowledge has been obtained.
-
-          (b) Contributor APIs.
-          If Contributor's Modifications include an application programming
-          interface and Contributor has knowledge of patent licenses which
-          are reasonably necessary to implement that API, Contributor must
-          also include this information in the LEGAL file.
-
-               (c)    Representations.
-          Contributor represents that, except as disclosed pursuant to
-          Section 3.4(a) above, Contributor believes that Contributor's
-          Modifications are Contributor's original creation(s) and/or
-          Contributor has sufficient rights to grant the rights conveyed by
-          this License.
-
-     3.5. Required Notices.
-     You must duplicate the notice in Exhibit A in each file of the Source
-     Code.  If it is not possible to put such notice in a particular Source
-     Code file due to its structure, then You must include such notice in a
-     location (such as a relevant directory) where a user would be likely
-     to look for such a notice.  If You created one or more Modification(s)
-     You may add your name as a Contributor to the notice described in
-     Exhibit A.  You must also duplicate this License in any documentation
-     for the Source Code where You describe recipients' rights or ownership
-     rights relating to Covered Code.  You may choose to offer, and to
-     charge a fee for, warranty, support, indemnity or liability
-     obligations to one or more recipients of Covered Code. However, You
-     may do so only on Your own behalf, and not on behalf of the Initial
-     Developer or any Contributor. You must make it absolutely clear than
-     any such warranty, support, indemnity or liability obligation is
-     offered by You alone, and You hereby agree to indemnify the Initial
-     Developer and every Contributor for any liability incurred by the
-     Initial Developer or such Contributor as a result of warranty,
-     support, indemnity or liability terms You offer.
-
-     3.6. Distribution of Executable Versions.
-     You may distribute Covered Code in Executable form only if the
-     requirements of Section 3.1-3.5 have been met for that Covered Code,
-     and if You include a notice stating that the Source Code version of
-     the Covered Code is available under the terms of this License,
-     including a description of how and where You have fulfilled the
-     obligations of Section 3.2. The notice must be conspicuously included
-     in any notice in an Executable version, related documentation or
-     collateral in which You describe recipients' rights relating to the
-     Covered Code. You may distribute the Executable version of Covered
-     Code or ownership rights under a license of Your choice, which may
-     contain terms different from this License, provided that You are in
-     compliance with the terms of this License and that the license for the
-     Executable version does not attempt to limit or alter the recipient's
-     rights in the Source Code version from the rights set forth in this
-     License. If You distribute the Executable version under a different
-     license You must make it absolutely clear that any terms which differ
-     from this License are offered by You alone, not by the Initial
-     Developer or any Contributor. You hereby agree to indemnify the
-     Initial Developer and every Contributor for any liability incurred by
-     the Initial Developer or such Contributor as a result of any such
-     terms You offer.
-
-     3.7. Larger Works.
-     You may create a Larger Work by combining Covered Code with other code
-     not governed by the terms of this License and distribute the Larger
-     Work as a single product. In such a case, You must make sure the
-     requirements of this License are fulfilled for the Covered Code.
-
-4. Inability to Comply Due to Statute or Regulation.
-
-     If it is impossible for You to comply with any of the terms of this
-     License with respect to some or all of the Covered Code due to
-     statute, judicial order, or regulation then You must: (a) comply with
-     the terms of this License to the maximum extent possible; and (b)
-     describe the limitations and the code they affect. Such description
-     must be included in the LEGAL file described in Section 3.4 and must
-     be included with all distributions of the Source Code. Except to the
-     extent prohibited by statute or regulation, such description must be
-     sufficiently detailed for a recipient of ordinary skill to be able to
-     understand it.
-
-5. Application of this License.
-
-     This License applies to code to which the Initial Developer has
-     attached the notice in Exhibit A and to related Covered Code.
-
-6. Versions of the License.
-
-     6.1. New Versions.
-     Netscape Communications Corporation ("Netscape") may publish revised
-     and/or new versions of the License from time to time. Each version
-     will be given a distinguishing version number.
-
-     6.2. Effect of New Versions.
-     Once Covered Code has been published under a particular version of the
-     License, You may always continue to use it under the terms of that
-     version. You may also choose to use such Covered Code under the terms
-     of any subsequent version of the License published by Netscape. No one
-     other than Netscape has the right to modify the terms applicable to
-     Covered Code created under this License.
-
-     6.3. Derivative Works.
-     If You create or use a modified version of this License (which you may
-     only do in order to apply it to code which is not already Covered Code
-     governed by this License), You must (a) rename Your license so that
-     the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape",
-     "MPL", "NPL" or any confusingly similar phrase do not appear in your
-     license (except to note that your license differs from this License)
-     and (b) otherwise make it clear that Your version of the license
-     contains terms which differ from the Mozilla Public License and
-     Netscape Public License. (Filling in the name of the Initial
-     Developer, Original Code or Contributor in the notice described in
-     Exhibit A shall not of themselves be deemed to be modifications of
-     this License.)
-
-7. DISCLAIMER OF WARRANTY.
-
-     COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS,
-     WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-     WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF
-     DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING.
-     THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE
-     IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT,
-     YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE
-     COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
-     OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
-     ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
-
-8. TERMINATION.
-
-     8.1.  This License and the rights granted hereunder will terminate
-     automatically if You fail to comply with terms herein and fail to cure
-     such breach within 30 days of becoming aware of the breach. All
-     sublicenses to the Covered Code which are properly granted shall
-     survive any termination of this License. Provisions which, by their
-     nature, must remain in effect beyond the termination of this License
-     shall survive.
-
-     8.2.  If You initiate litigation by asserting a patent infringement
-     claim (excluding declatory judgment actions) against Initial Developer
-     or a Contributor (the Initial Developer or Contributor against whom
-     You file such action is referred to as "Participant")  alleging that:
-
-     (a)  such Participant's Contributor Version directly or indirectly
-     infringes any patent, then any and all rights granted by such
-     Participant to You under Sections 2.1 and/or 2.2 of this License
-     shall, upon 60 days notice from Participant terminate prospectively,
-     unless if within 60 days after receipt of notice You either: (i)
-     agree in writing to pay Participant a mutually agreeable reasonable
-     royalty for Your past and future use of Modifications made by such
-     Participant, or (ii) withdraw Your litigation claim with respect to
-     the Contributor Version against such Participant.  If within 60 days
-     of notice, a reasonable royalty and payment arrangement are not
-     mutually agreed upon in writing by the parties or the litigation claim
-     is not withdrawn, the rights granted by Participant to You under
-     Sections 2.1 and/or 2.2 automatically terminate at the expiration of
-     the 60 day notice period specified above.
-
-     (b)  any software, hardware, or device, other than such Participant's
-     Contributor Version, directly or indirectly infringes any patent, then
-     any rights granted to You by such Participant under Sections 2.1(b)
-     and 2.2(b) are revoked effective as of the date You first made, used,
-     sold, distributed, or had made, Modifications made by that
-     Participant.
-
-     8.3.  If You assert a patent infringement claim against Participant
-     alleging that such Participant's Contributor Version directly or
-     indirectly infringes any patent where such claim is resolved (such as
-     by license or settlement) prior to the initiation of patent
-     infringement litigation, then the reasonable value of the licenses
-     granted by such Participant under Sections 2.1 or 2.2 shall be taken
-     into account in determining the amount or value of any payment or
-     license.
-
-     8.4.  In the event of termination under Sections 8.1 or 8.2 above,
-     all end user license agreements (excluding distributors and resellers)
-     which have been validly granted by You or any distributor hereunder
-     prior to termination shall survive termination.
-
-9. LIMITATION OF LIABILITY.
-
-     UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
-     (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL
-     DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE,
-     OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR
-     ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY
-     CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL,
-     WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
-     COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
-     INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
-     LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY
-     RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW
-     PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE
-     EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO
-     THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
-
-10. U.S. GOVERNMENT END USERS.
-
-     The Covered Code is a "commercial item," as that term is defined in
-     48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer
-     software" and "commercial computer software documentation," as such
-     terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48
-     C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995),
-     all U.S. Government End Users acquire Covered Code with only those
-     rights set forth herein.
-
-11. MISCELLANEOUS.
-
-     This License represents the complete agreement concerning subject
-     matter hereof. If any provision of this License is held to be
-     unenforceable, such provision shall be reformed only to the extent
-     necessary to make it enforceable. This License shall be governed by
-     California law provisions (except to the extent applicable law, if
-     any, provides otherwise), excluding its conflict-of-law provisions.
-     With respect to disputes in which at least one party is a citizen of,
-     or an entity chartered or registered to do business in the United
-     States of America, any litigation relating to this License shall be
-     subject to the jurisdiction of the Federal Courts of the Northern
-     District of California, with venue lying in Santa Clara County,
-     California, with the losing party responsible for costs, including
-     without limitation, court costs and reasonable attorneys' fees and
-     expenses. The application of the United Nations Convention on
-     Contracts for the International Sale of Goods is expressly excluded.
-     Any law or regulation which provides that the language of a contract
-     shall be construed against the drafter shall not apply to this
-     License.
-
-12. RESPONSIBILITY FOR CLAIMS.
-
-     As between Initial Developer and the Contributors, each party is
-     responsible for claims and damages arising, directly or indirectly,
-     out of its utilization of rights under this License and You agree to
-     work with Initial Developer and Contributors to distribute such
-     responsibility on an equitable basis. Nothing herein is intended or
-     shall be deemed to constitute any admission of liability.
-
-13. MULTIPLE-LICENSED CODE.
-
-     Initial Developer may designate portions of the Covered Code as
-     "Multiple-Licensed".  "Multiple-Licensed" means that the Initial
-     Developer permits you to utilize portions of the Covered Code under
-     Your choice of the NPL or the alternative licenses, if any, specified
-     by the Initial Developer in the file described in Exhibit A.
-
-EXHIBIT A -Mozilla Public License.
-
-     ``The contents of this file are subject to the Mozilla Public License
-     Version 1.1 (the "License"); you may not use this file except in
-     compliance with the License. You may obtain a copy of the License at
-     http://www.mozilla.org/MPL/
-
-     Software distributed under the License is distributed on an "AS IS"
-     basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-     License for the specific language governing rights and limitations
-     under the License.
-
-     The Original Code is ______________________________________.
-
-     The Initial Developer of the Original Code is ________________________.
-     Portions created by ______________________ are Copyright (C) ______
-     _______________________. All Rights Reserved.
-
-     Contributor(s): ______________________________________.
-
-     Alternatively, the contents of this file may be used under the terms
-     of the _____ license (the  "[___] License"), in which case the
-     provisions of [______] License are applicable instead of those
-     above.  If you wish to allow use of your version of this file only
-     under the terms of the [____] License and not to allow others to use
-     your version of this file under the MPL, indicate your decision by
-     deleting  the provisions above and replace  them with the notice and
-     other provisions required by the [___] License.  If you do not delete
-     the provisions above, a recipient may use your version of this file
-     under either the MPL or the [___] License."
-
-     [NOTE: The text of this Exhibit A may differ slightly from the text of
-     the notices in the Source Code files of the Original Code. You should
-     use the text of this Exhibit A rather than the text found in the
-     Original Code Source Code for Your Modifications.]
-
-
-
-                   GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/ace-compat-uncompressed.js b/apps/files_texteditor/js/aceeditor/ace-compat-uncompressed.js
deleted file mode 100644
index 50efbe1443..0000000000
--- a/apps/files_texteditor/js/aceeditor/ace-compat-uncompressed.js
+++ /dev/null
@@ -1,480 +0,0 @@
-/* vim:ts=4:sts=4:sw=4:
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('pilot/index', ['require', 'exports', 'module' , 'pilot/browser_focus', 'pilot/dom', 'pilot/event', 'pilot/event_emitter', 'pilot/fixoldbrowsers', 'pilot/keys', 'pilot/lang', 'pilot/oop', 'pilot/useragent', 'pilot/canon'], function(require, exports, module) {
-    require("pilot/browser_focus");
-    require("pilot/dom");
-    require("pilot/event");
-    require("pilot/event_emitter");
-    require("pilot/fixoldbrowsers");
-    require("pilot/keys");
-    require("pilot/lang");
-    require("pilot/oop");
-    require("pilot/useragent");
-    require("pilot/canon");
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('pilot/browser_focus', ['require', 'exports', 'module' , 'ace/lib/browser_focus'], function(require, exports, module) {
-    console.warn("DEPRECATED: 'pilot/browser_focus' is deprecated. Use 'ace/lib/browser_focus' instead");
-    module.exports = require("ace/lib/browser_focus");
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('pilot/dom', ['require', 'exports', 'module' , 'ace/lib/dom'], function(require, exports, module) {
-    console.warn("DEPRECATED: 'pilot/dom' is deprecated. Use 'ace/lib/dom' instead");
-    module.exports = require("ace/lib/dom");
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('pilot/event', ['require', 'exports', 'module' , 'ace/lib/event'], function(require, exports, module) {
-    console.warn("DEPRECATED: 'pilot/event' is deprecated. Use 'ace/lib/event' instead");
-    module.exports = require("ace/lib/event");
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('pilot/event_emitter', ['require', 'exports', 'module' , 'ace/lib/event_emitter'], function(require, exports, module) {
-    console.warn("DEPRECATED: 'pilot/event_emitter' is deprecated. Use 'ace/lib/event_emitter' instead");
-    module.exports = require("ace/lib/event_emitter");
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('pilot/fixoldbrowsers', ['require', 'exports', 'module' , 'ace/lib/fixoldbrowsers'], function(require, exports, module) {
-    console.warn("DEPRECATED: 'pilot/fixoldbrowsers' is deprecated. Use 'ace/lib/fixoldbrowsers' instead");
-    module.exports = require("ace/lib/fixoldbrowsers");
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('pilot/keys', ['require', 'exports', 'module' , 'ace/lib/keys'], function(require, exports, module) {
-    console.warn("DEPRECATED: 'pilot/keys' is deprecated. Use 'ace/lib/keys' instead");
-    module.exports = require("ace/lib/keys");
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('pilot/lang', ['require', 'exports', 'module' , 'ace/lib/lang'], function(require, exports, module) {
-    console.warn("DEPRECATED: 'pilot/lang' is deprecated. Use 'ace/lib/lang' instead");
-    module.exports = require("ace/lib/lang");
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('pilot/oop', ['require', 'exports', 'module' , 'ace/lib/oop'], function(require, exports, module) {
-    console.warn("DEPRECATED: 'pilot/oop' is deprecated. Use 'ace/lib/oop' instead");
-    module.exports = require("ace/lib/oop");
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('pilot/useragent', ['require', 'exports', 'module' , 'ace/lib/useragent'], function(require, exports, module) {
-    console.warn("DEPRECATED: 'pilot/useragent' is deprecated. Use 'ace/lib/useragent' instead");
-    module.exports = require("ace/lib/useragent");
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('pilot/canon', ['require', 'exports', 'module' ], function(require, exports, module) {
-    console.warn("DEPRECATED: 'pilot/canon' is deprecated.");
-    //return require("ace/lib/dom");
-    
-    exports.addCommand = function() {
-        console.warn("DEPRECATED: 'canon.addCommand()' is deprecated. Use 'editor.commands.addCommand(command)' instead.");
-        console.trace();
-    }
-    
-    exports.removeCommand = function() {
-        console.warn("DEPRECATED: 'canon.removeCommand()' is deprecated. Use 'editor.commands.removeCommand(command)' instead.");
-        console.trace();
-    }
-});
diff --git a/apps/files_texteditor/js/aceeditor/ace-compat.js b/apps/files_texteditor/js/aceeditor/ace-compat.js
deleted file mode 100644
index 18d2ed78d0..0000000000
--- a/apps/files_texteditor/js/aceeditor/ace-compat.js
+++ /dev/null
@@ -1 +0,0 @@
-define("pilot/index",["require","exports","module","pilot/browser_focus","pilot/dom","pilot/event","pilot/event_emitter","pilot/fixoldbrowsers","pilot/keys","pilot/lang","pilot/oop","pilot/useragent","pilot/canon"],function(a,b,c){a("pilot/browser_focus"),a("pilot/dom"),a("pilot/event"),a("pilot/event_emitter"),a("pilot/fixoldbrowsers"),a("pilot/keys"),a("pilot/lang"),a("pilot/oop"),a("pilot/useragent"),a("pilot/canon")}),define("pilot/browser_focus",["require","exports","module","ace/lib/browser_focus"],function(a,b,c){console.warn("DEPRECATED: 'pilot/browser_focus' is deprecated. Use 'ace/lib/browser_focus' instead"),c.exports=a("ace/lib/browser_focus")}),define("pilot/dom",["require","exports","module","ace/lib/dom"],function(a,b,c){console.warn("DEPRECATED: 'pilot/dom' is deprecated. Use 'ace/lib/dom' instead"),c.exports=a("ace/lib/dom")}),define("pilot/event",["require","exports","module","ace/lib/event"],function(a,b,c){console.warn("DEPRECATED: 'pilot/event' is deprecated. Use 'ace/lib/event' instead"),c.exports=a("ace/lib/event")}),define("pilot/event_emitter",["require","exports","module","ace/lib/event_emitter"],function(a,b,c){console.warn("DEPRECATED: 'pilot/event_emitter' is deprecated. Use 'ace/lib/event_emitter' instead"),c.exports=a("ace/lib/event_emitter")}),define("pilot/fixoldbrowsers",["require","exports","module","ace/lib/fixoldbrowsers"],function(a,b,c){console.warn("DEPRECATED: 'pilot/fixoldbrowsers' is deprecated. Use 'ace/lib/fixoldbrowsers' instead"),c.exports=a("ace/lib/fixoldbrowsers")}),define("pilot/keys",["require","exports","module","ace/lib/keys"],function(a,b,c){console.warn("DEPRECATED: 'pilot/keys' is deprecated. Use 'ace/lib/keys' instead"),c.exports=a("ace/lib/keys")}),define("pilot/lang",["require","exports","module","ace/lib/lang"],function(a,b,c){console.warn("DEPRECATED: 'pilot/lang' is deprecated. Use 'ace/lib/lang' instead"),c.exports=a("ace/lib/lang")}),define("pilot/oop",["require","exports","module","ace/lib/oop"],function(a,b,c){console.warn("DEPRECATED: 'pilot/oop' is deprecated. Use 'ace/lib/oop' instead"),c.exports=a("ace/lib/oop")}),define("pilot/useragent",["require","exports","module","ace/lib/useragent"],function(a,b,c){console.warn("DEPRECATED: 'pilot/useragent' is deprecated. Use 'ace/lib/useragent' instead"),c.exports=a("ace/lib/useragent")}),define("pilot/canon",["require","exports","module"],function(a,b,c){console.warn("DEPRECATED: 'pilot/canon' is deprecated."),b.addCommand=function(){console.warn("DEPRECATED: 'canon.addCommand()' is deprecated. Use 'editor.commands.addCommand(command)' instead."),console.trace()},b.removeCommand=function(){console.warn("DEPRECATED: 'canon.removeCommand()' is deprecated. Use 'editor.commands.removeCommand(command)' instead."),console.trace()}})
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/ace-uncompressed.js b/apps/files_texteditor/js/aceeditor/ace-uncompressed.js
deleted file mode 100644
index 74bb44b16d..0000000000
--- a/apps/files_texteditor/js/aceeditor/ace-uncompressed.js
+++ /dev/null
@@ -1,16616 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/**
- * Define a module along with a payload
- * @param module a name for the payload
- * @param payload a function to call with (require, exports, module) params
- */
-
-(function() {
-
-var ACE_NAMESPACE = "";
-
-var global = (function() {
-    return this;
-})();
-
-var _define = function(module, deps, payload) {
-    if (typeof module !== 'string') {
-        if (_define.original)
-            _define.original.apply(window, arguments);
-        else {
-            console.error('dropping module because define wasn\'t a string.');
-            console.trace();
-        }
-        return;
-    }
-
-    if (arguments.length == 2)
-        payload = deps;
-
-    if (!_define.modules)
-        _define.modules = {};
-
-    _define.modules[module] = payload;
-};
-
-/**
- * Get at functionality define()ed using the function above
- */
-var _require = function(parentId, module, callback) {
-    if (Object.prototype.toString.call(module) === "[object Array]") {
-        var params = [];
-        for (var i = 0, l = module.length; i < l; ++i) {
-            var dep = lookup(parentId, module[i]);
-            if (!dep && _require.original)
-                return _require.original.apply(window, arguments);
-            params.push(dep);
-        }
-        if (callback) {
-            callback.apply(null, params);
-        }
-    }
-    else if (typeof module === 'string') {
-        var payload = lookup(parentId, module);
-        if (!payload && _require.original)
-            return _require.original.apply(window, arguments);
-
-        if (callback) {
-            callback();
-        }
-
-        return payload;
-    }
-    else {
-        if (_require.original)
-            return _require.original.apply(window, arguments);
-    }
-};
-
-var normalizeModule = function(parentId, moduleName) {
-    // normalize plugin requires
-    if (moduleName.indexOf("!") !== -1) {
-        var chunks = moduleName.split("!");
-        return normalizeModule(parentId, chunks[0]) + "!" + normalizeModule(parentId, chunks[1]);
-    }
-    // normalize relative requires
-    if (moduleName.charAt(0) == ".") {
-        var base = parentId.split("/").slice(0, -1).join("/");
-        moduleName = base + "/" + moduleName;
-
-        while(moduleName.indexOf(".") !== -1 && previous != moduleName) {
-            var previous = moduleName;
-            moduleName = moduleName.replace(/\/\.\//, "/").replace(/[^\/]+\/\.\.\//, "");
-        }
-    }
-
-    return moduleName;
-};
-
-/**
- * Internal function to lookup moduleNames and resolve them by calling the
- * definition function if needed.
- */
-var lookup = function(parentId, moduleName) {
-
-    moduleName = normalizeModule(parentId, moduleName);
-
-    var module = _define.modules[moduleName];
-    if (!module) {
-        return null;
-    }
-
-    if (typeof module === 'function') {
-        var exports = {};
-        var mod = {
-            id: moduleName,
-            uri: '',
-            exports: exports,
-            packaged: true
-        };
-
-        var req = function(module, callback) {
-            return _require(moduleName, module, callback);
-        };
-
-        var returnValue = module(req, exports, mod);
-        exports = returnValue || mod.exports;
-
-        // cache the resulting module object for next time
-        _define.modules[moduleName] = exports;
-        return exports;
-    }
-
-    return module;
-};
-
-function exportAce(ns) {
-
-    if (typeof requirejs !== "undefined") {
-
-        var define = global.define;
-        global.define = function(id, deps, callback) {
-            if (typeof callback !== "function")
-                return define.apply(this, arguments);
-
-            return define(id, deps, function(require, exports, module) {
-                if (deps[2] == "module")
-                    module.packaged = true;
-                return callback.apply(this, arguments);
-            });
-        };
-        global.define.packaged = true;
-
-        return;
-    }
-
-    var require = function(module, callback) {
-        return _require("", module, callback);
-    };
-    require.packaged = true;
-
-    var root = global;
-    if (ns) {
-        if (!global[ns])
-            global[ns] = {};
-        root = global[ns];
-    }
-
-    if (root.define)
-        _define.original = root.define;
-
-    root.define = _define;
-
-    if (root.require)
-        _require.original = root.require;
-
-    root.require = require;
-}
-
-exportAce(ACE_NAMESPACE);
-
-})();/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Skywriter.
- *
- * The Initial Developer of the Original Code is
- * Mozilla.
- * Portions created by the Initial Developer are Copyright (C) 2009
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Kevin Dangoor (kdangoor@mozilla.com)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/ace', ['require', 'exports', 'module' , 'ace/lib/fixoldbrowsers', 'ace/lib/dom', 'ace/lib/event', 'ace/editor', 'ace/edit_session', 'ace/undomanager', 'ace/virtual_renderer', 'ace/multi_select', 'ace/worker/worker_client', 'ace/keyboard/hash_handler', 'ace/keyboard/state_handler', 'ace/placeholder', 'ace/config', 'ace/theme/textmate'], function(require, exports, module) {
-"use strict";
-
-require("./lib/fixoldbrowsers");
-
-var Dom = require("./lib/dom");
-var Event = require("./lib/event");
-
-var Editor = require("./editor").Editor;
-var EditSession = require("./edit_session").EditSession;
-var UndoManager = require("./undomanager").UndoManager;
-var Renderer = require("./virtual_renderer").VirtualRenderer;
-var MultiSelect = require("./multi_select").MultiSelect;
-
-// The following require()s are for inclusion in the built ace file
-require("./worker/worker_client");
-require("./keyboard/hash_handler");
-require("./keyboard/state_handler");
-require("./placeholder");
-require("./config").init();
-
-exports.edit = function(el) {
-    if (typeof(el) == "string") {
-        el = document.getElementById(el);
-    }
-
-    var doc = new EditSession(Dom.getInnerText(el));
-    doc.setUndoManager(new UndoManager());
-    el.innerHTML = '';
-
-    var editor = new Editor(new Renderer(el, require("./theme/textmate")));
-    new MultiSelect(editor);
-    editor.setSession(doc);
-
-    var env = {};
-    env.document = doc;
-    env.editor = editor;
-    editor.resize();
-    Event.addListener(window, "resize", function() {
-        editor.resize();
-    });
-    el.env = env;
-    // Store env on editor such that it can be accessed later on from
-    // the returned object.
-    editor.env = env;
-    return editor;
-};
-
-});// vim:set ts=4 sts=4 sw=4 st:
-// -- kriskowal Kris Kowal Copyright (C) 2009-2010 MIT License
-// -- tlrobinson Tom Robinson Copyright (C) 2009-2010 MIT License (Narwhal Project)
-// -- dantman Daniel Friesen Copyright(C) 2010 XXX No License Specified
-// -- fschaefer Florian Schäfer Copyright (C) 2010 MIT License
-// -- Irakli Gozalishvili Copyright (C) 2010 MIT License
-
-/*!
-    Copyright (c) 2009, 280 North Inc. http://280north.com/
-    MIT License. http://github.com/280north/narwhal/blob/master/README.md
-*/
-
-define('ace/lib/fixoldbrowsers', ['require', 'exports', 'module' , 'ace/lib/regexp', 'ace/lib/es5-shim'], function(require, exports, module) {
-"use strict";
-
-require("./regexp");
-require("./es5-shim");
-
-});/**
- *  Based on code from:
- *
- * XRegExp 1.5.0
- * (c) 2007-2010 Steven Levithan
- * MIT License
- * <http://xregexp.com>
- * Provides an augmented, extensible, cross-browser implementation of regular expressions,
- * including support for additional syntax, flags, and methods
- */
- 
-define('ace/lib/regexp', ['require', 'exports', 'module' ], function(require, exports, module) {
-"use strict";
-
-    //---------------------------------
-    //  Private variables
-    //---------------------------------
-
-    var real = {
-            exec: RegExp.prototype.exec,
-            test: RegExp.prototype.test,
-            match: String.prototype.match,
-            replace: String.prototype.replace,
-            split: String.prototype.split
-        },
-        compliantExecNpcg = real.exec.call(/()??/, "")[1] === undefined, // check `exec` handling of nonparticipating capturing groups
-        compliantLastIndexIncrement = function () {
-            var x = /^/g;
-            real.test.call(x, "");
-            return !x.lastIndex;
-        }();
-
-    //---------------------------------
-    //  Overriden native methods
-    //---------------------------------
-
-    // Adds named capture support (with backreferences returned as `result.name`), and fixes two
-    // cross-browser issues per ES3:
-    // - Captured values for nonparticipating capturing groups should be returned as `undefined`,
-    //   rather than the empty string.
-    // - `lastIndex` should not be incremented after zero-length matches.
-    RegExp.prototype.exec = function (str) {
-        var match = real.exec.apply(this, arguments),
-            name, r2;
-        if ( typeof(str) == 'string' && match) {
-            // Fix browsers whose `exec` methods don't consistently return `undefined` for
-            // nonparticipating capturing groups
-            if (!compliantExecNpcg && match.length > 1 && indexOf(match, "") > -1) {
-                r2 = RegExp(this.source, real.replace.call(getNativeFlags(this), "g", ""));
-                // Using `str.slice(match.index)` rather than `match[0]` in case lookahead allowed
-                // matching due to characters outside the match
-                real.replace.call(str.slice(match.index), r2, function () {
-                    for (var i = 1; i < arguments.length - 2; i++) {
-                        if (arguments[i] === undefined)
-                            match[i] = undefined;
-                    }
-                });
-            }
-            // Attach named capture properties
-            if (this._xregexp && this._xregexp.captureNames) {
-                for (var i = 1; i < match.length; i++) {
-                    name = this._xregexp.captureNames[i - 1];
-                    if (name)
-                       match[name] = match[i];
-                }
-            }
-            // Fix browsers that increment `lastIndex` after zero-length matches
-            if (!compliantLastIndexIncrement && this.global && !match[0].length && (this.lastIndex > match.index))
-                this.lastIndex--;
-        }
-        return match;
-    };
-
-    // Don't override `test` if it won't change anything
-    if (!compliantLastIndexIncrement) {
-        // Fix browser bug in native method
-        RegExp.prototype.test = function (str) {
-            // Use the native `exec` to skip some processing overhead, even though the overriden
-            // `exec` would take care of the `lastIndex` fix
-            var match = real.exec.call(this, str);
-            // Fix browsers that increment `lastIndex` after zero-length matches
-            if (match && this.global && !match[0].length && (this.lastIndex > match.index))
-                this.lastIndex--;
-            return !!match;
-        };
-    }
-
-    //---------------------------------
-    //  Private helper functions
-    //---------------------------------
-
-    function getNativeFlags (regex) {
-        return (regex.global     ? "g" : "") +
-               (regex.ignoreCase ? "i" : "") +
-               (regex.multiline  ? "m" : "") +
-               (regex.extended   ? "x" : "") + // Proposed for ES4; included in AS3
-               (regex.sticky     ? "y" : "");
-    };
-
-    function indexOf (array, item, from) {
-        if (Array.prototype.indexOf) // Use the native array method if available
-            return array.indexOf(item, from);
-        for (var i = from || 0; i < array.length; i++) {
-            if (array[i] === item)
-                return i;
-        }
-        return -1;
-    };
-
-});
-// vim: ts=4 sts=4 sw=4 expandtab
-// -- kriskowal Kris Kowal Copyright (C) 2009-2011 MIT License
-// -- tlrobinson Tom Robinson Copyright (C) 2009-2010 MIT License (Narwhal Project)
-// -- dantman Daniel Friesen Copyright (C) 2010 XXX TODO License or CLA
-// -- fschaefer Florian Schäfer Copyright (C) 2010 MIT License
-// -- Gozala Irakli Gozalishvili Copyright (C) 2010 MIT License
-// -- kitcambridge Kit Cambridge Copyright (C) 2011 MIT License
-// -- kossnocorp Sasha Koss XXX TODO License or CLA
-// -- bryanforbes Bryan Forbes XXX TODO License or CLA
-// -- killdream Quildreen Motta Copyright (C) 2011 MIT Licence
-// -- michaelficarra Michael Ficarra Copyright (C) 2011 3-clause BSD License
-// -- sharkbrainguy Gerard Paapu Copyright (C) 2011 MIT License
-// -- bbqsrc Brendan Molloy (C) 2011 Creative Commons Zero (public domain)
-// -- iwyg XXX TODO License or CLA
-// -- DomenicDenicola Domenic Denicola Copyright (C) 2011 MIT License
-// -- xavierm02 Montillet Xavier XXX TODO License or CLA
-// -- Raynos Raynos XXX TODO License or CLA
-// -- samsonjs Sami Samhuri Copyright (C) 2010 MIT License
-// -- rwldrn Rick Waldron Copyright (C) 2011 MIT License
-// -- lexer Alexey Zakharov XXX TODO License or CLA
-
-/*!
-    Copyright (c) 2009, 280 North Inc. http://280north.com/
-    MIT License. http://github.com/280north/narwhal/blob/master/README.md
-*/
-
-define('ace/lib/es5-shim', ['require', 'exports', 'module' ], function(require, exports, module) {
-
-/**
- * Brings an environment as close to ECMAScript 5 compliance
- * as is possible with the facilities of erstwhile engines.
- *
- * Annotated ES5: http://es5.github.com/ (specific links below)
- * ES5 Spec: http://www.ecma-international.org/publications/files/ECMA-ST/Ecma-262.pdf
- *
- * @module
- */
-
-/*whatsupdoc*/
-
-//
-// Function
-// ========
-//
-
-// ES-5 15.3.4.5
-// http://es5.github.com/#x15.3.4.5
-
-if (!Function.prototype.bind) {
-    Function.prototype.bind = function bind(that) { // .length is 1
-        // 1. Let Target be the this value.
-        var target = this;
-        // 2. If IsCallable(Target) is false, throw a TypeError exception.
-        if (typeof target != "function")
-            throw new TypeError(); // TODO message
-        // 3. Let A be a new (possibly empty) internal list of all of the
-        //   argument values provided after thisArg (arg1, arg2 etc), in order.
-        // XXX slicedArgs will stand in for "A" if used
-        var args = slice.call(arguments, 1); // for normal call
-        // 4. Let F be a new native ECMAScript object.
-        // 11. Set the [[Prototype]] internal property of F to the standard
-        //   built-in Function prototype object as specified in 15.3.3.1.
-        // 12. Set the [[Call]] internal property of F as described in
-        //   15.3.4.5.1.
-        // 13. Set the [[Construct]] internal property of F as described in
-        //   15.3.4.5.2.
-        // 14. Set the [[HasInstance]] internal property of F as described in
-        //   15.3.4.5.3.
-        var bound = function () {
-
-            if (this instanceof bound) {
-                // 15.3.4.5.2 [[Construct]]
-                // When the [[Construct]] internal method of a function object,
-                // F that was created using the bind function is called with a
-                // list of arguments ExtraArgs, the following steps are taken:
-                // 1. Let target be the value of F's [[TargetFunction]]
-                //   internal property.
-                // 2. If target has no [[Construct]] internal method, a
-                //   TypeError exception is thrown.
-                // 3. Let boundArgs be the value of F's [[BoundArgs]] internal
-                //   property.
-                // 4. Let args be a new list containing the same values as the
-                //   list boundArgs in the same order followed by the same
-                //   values as the list ExtraArgs in the same order.
-                // 5. Return the result of calling the [[Construct]] internal 
-                //   method of target providing args as the arguments.
-
-                var F = function(){};
-                F.prototype = target.prototype;
-                var self = new F;
-
-                var result = target.apply(
-                    self,
-                    args.concat(slice.call(arguments))
-                );
-                if (result !== null && Object(result) === result)
-                    return result;
-                return self;
-
-            } else {
-                // 15.3.4.5.1 [[Call]]
-                // When the [[Call]] internal method of a function object, F,
-                // which was created using the bind function is called with a
-                // this value and a list of arguments ExtraArgs, the following
-                // steps are taken:
-                // 1. Let boundArgs be the value of F's [[BoundArgs]] internal
-                //   property.
-                // 2. Let boundThis be the value of F's [[BoundThis]] internal
-                //   property.
-                // 3. Let target be the value of F's [[TargetFunction]] internal
-                //   property.
-                // 4. Let args be a new list containing the same values as the 
-                //   list boundArgs in the same order followed by the same 
-                //   values as the list ExtraArgs in the same order.
-                // 5. Return the result of calling the [[Call]] internal method 
-                //   of target providing boundThis as the this value and 
-                //   providing args as the arguments.
-
-                // equiv: target.call(this, ...boundArgs, ...args)
-                return target.apply(
-                    that,
-                    args.concat(slice.call(arguments))
-                );
-
-            }
-
-        };
-        // XXX bound.length is never writable, so don't even try
-        //
-        // 15. If the [[Class]] internal property of Target is "Function", then
-        //     a. Let L be the length property of Target minus the length of A.
-        //     b. Set the length own property of F to either 0 or L, whichever is 
-        //       larger.
-        // 16. Else set the length own property of F to 0.
-        // 17. Set the attributes of the length own property of F to the values
-        //   specified in 15.3.5.1.
-
-        // TODO
-        // 18. Set the [[Extensible]] internal property of F to true.
-        
-        // TODO
-        // 19. Let thrower be the [[ThrowTypeError]] function Object (13.2.3).
-        // 20. Call the [[DefineOwnProperty]] internal method of F with 
-        //   arguments "caller", PropertyDescriptor {[[Get]]: thrower, [[Set]]:
-        //   thrower, [[Enumerable]]: false, [[Configurable]]: false}, and 
-        //   false.
-        // 21. Call the [[DefineOwnProperty]] internal method of F with 
-        //   arguments "arguments", PropertyDescriptor {[[Get]]: thrower, 
-        //   [[Set]]: thrower, [[Enumerable]]: false, [[Configurable]]: false},
-        //   and false.
-
-        // TODO
-        // NOTE Function objects created using Function.prototype.bind do not 
-        // have a prototype property or the [[Code]], [[FormalParameters]], and
-        // [[Scope]] internal properties.
-        // XXX can't delete prototype in pure-js.
-
-        // 22. Return F.
-        return bound;
-    };
-}
-
-// Shortcut to an often accessed properties, in order to avoid multiple
-// dereference that costs universally.
-// _Please note: Shortcuts are defined after `Function.prototype.bind` as we
-// us it in defining shortcuts.
-var call = Function.prototype.call;
-var prototypeOfArray = Array.prototype;
-var prototypeOfObject = Object.prototype;
-var slice = prototypeOfArray.slice;
-var toString = call.bind(prototypeOfObject.toString);
-var owns = call.bind(prototypeOfObject.hasOwnProperty);
-
-// If JS engine supports accessors creating shortcuts.
-var defineGetter;
-var defineSetter;
-var lookupGetter;
-var lookupSetter;
-var supportsAccessors;
-if ((supportsAccessors = owns(prototypeOfObject, "__defineGetter__"))) {
-    defineGetter = call.bind(prototypeOfObject.__defineGetter__);
-    defineSetter = call.bind(prototypeOfObject.__defineSetter__);
-    lookupGetter = call.bind(prototypeOfObject.__lookupGetter__);
-    lookupSetter = call.bind(prototypeOfObject.__lookupSetter__);
-}
-
-//
-// Array
-// =====
-//
-
-// ES5 15.4.3.2
-// http://es5.github.com/#x15.4.3.2
-// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/isArray
-if (!Array.isArray) {
-    Array.isArray = function isArray(obj) {
-        return toString(obj) == "[object Array]";
-    };
-}
-
-// The IsCallable() check in the Array functions
-// has been replaced with a strict check on the
-// internal class of the object to trap cases where
-// the provided function was actually a regular
-// expression literal, which in V8 and
-// JavaScriptCore is a typeof "function".  Only in
-// V8 are regular expression literals permitted as
-// reduce parameters, so it is desirable in the
-// general case for the shim to match the more
-// strict and common behavior of rejecting regular
-// expressions.
-
-// ES5 15.4.4.18
-// http://es5.github.com/#x15.4.4.18
-// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/array/forEach
-if (!Array.prototype.forEach) {
-    Array.prototype.forEach = function forEach(fun /*, thisp*/) {
-        var self = toObject(this),
-            thisp = arguments[1],
-            i = 0,
-            length = self.length >>> 0;
-
-        // If no callback function or if callback is not a callable function
-        if (toString(fun) != "[object Function]") {
-            throw new TypeError(); // TODO message
-        }
-
-        while (i < length) {
-            if (i in self) {
-                // Invoke the callback function with call, passing arguments:
-                // context, property value, property key, thisArg object context
-                fun.call(thisp, self[i], i, self);
-            }
-            i++;
-        }
-    };
-}
-
-// ES5 15.4.4.19
-// http://es5.github.com/#x15.4.4.19
-// https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Objects/Array/map
-if (!Array.prototype.map) {
-    Array.prototype.map = function map(fun /*, thisp*/) {
-        var self = toObject(this),
-            length = self.length >>> 0,
-            result = Array(length),
-            thisp = arguments[1];
-
-        // If no callback function or if callback is not a callable function
-        if (toString(fun) != "[object Function]") {
-            throw new TypeError(); // TODO message
-        }
-
-        for (var i = 0; i < length; i++) {
-            if (i in self)
-                result[i] = fun.call(thisp, self[i], i, self);
-        }
-        return result;
-    };
-}
-
-// ES5 15.4.4.20
-// http://es5.github.com/#x15.4.4.20
-// https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Objects/Array/filter
-if (!Array.prototype.filter) {
-    Array.prototype.filter = function filter(fun /*, thisp */) {
-        var self = toObject(this),
-            length = self.length >>> 0,
-            result = [],
-            thisp = arguments[1];
-
-        // If no callback function or if callback is not a callable function
-        if (toString(fun) != "[object Function]") {
-            throw new TypeError(); // TODO message
-        }
-
-        for (var i = 0; i < length; i++) {
-            if (i in self && fun.call(thisp, self[i], i, self))
-                result.push(self[i]);
-        }
-        return result;
-    };
-}
-
-// ES5 15.4.4.16
-// http://es5.github.com/#x15.4.4.16
-// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/every
-if (!Array.prototype.every) {
-    Array.prototype.every = function every(fun /*, thisp */) {
-        var self = toObject(this),
-            length = self.length >>> 0,
-            thisp = arguments[1];
-
-        // If no callback function or if callback is not a callable function
-        if (toString(fun) != "[object Function]") {
-            throw new TypeError(); // TODO message
-        }
-
-        for (var i = 0; i < length; i++) {
-            if (i in self && !fun.call(thisp, self[i], i, self))
-                return false;
-        }
-        return true;
-    };
-}
-
-// ES5 15.4.4.17
-// http://es5.github.com/#x15.4.4.17
-// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/some
-if (!Array.prototype.some) {
-    Array.prototype.some = function some(fun /*, thisp */) {
-        var self = toObject(this),
-            length = self.length >>> 0,
-            thisp = arguments[1];
-
-        // If no callback function or if callback is not a callable function
-        if (toString(fun) != "[object Function]") {
-            throw new TypeError(); // TODO message
-        }
-
-        for (var i = 0; i < length; i++) {
-            if (i in self && fun.call(thisp, self[i], i, self))
-                return true;
-        }
-        return false;
-    };
-}
-
-// ES5 15.4.4.21
-// http://es5.github.com/#x15.4.4.21
-// https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Objects/Array/reduce
-if (!Array.prototype.reduce) {
-    Array.prototype.reduce = function reduce(fun /*, initial*/) {
-        var self = toObject(this),
-            length = self.length >>> 0;
-
-        // If no callback function or if callback is not a callable function
-        if (toString(fun) != "[object Function]") {
-            throw new TypeError(); // TODO message
-        }
-
-        // no value to return if no initial value and an empty array
-        if (!length && arguments.length == 1)
-            throw new TypeError(); // TODO message
-
-        var i = 0;
-        var result;
-        if (arguments.length >= 2) {
-            result = arguments[1];
-        } else {
-            do {
-                if (i in self) {
-                    result = self[i++];
-                    break;
-                }
-
-                // if array contains no values, no initial value to return
-                if (++i >= length)
-                    throw new TypeError(); // TODO message
-            } while (true);
-        }
-
-        for (; i < length; i++) {
-            if (i in self)
-                result = fun.call(void 0, result, self[i], i, self);
-        }
-
-        return result;
-    };
-}
-
-// ES5 15.4.4.22
-// http://es5.github.com/#x15.4.4.22
-// https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Objects/Array/reduceRight
-if (!Array.prototype.reduceRight) {
-    Array.prototype.reduceRight = function reduceRight(fun /*, initial*/) {
-        var self = toObject(this),
-            length = self.length >>> 0;
-
-        // If no callback function or if callback is not a callable function
-        if (toString(fun) != "[object Function]") {
-            throw new TypeError(); // TODO message
-        }
-
-        // no value to return if no initial value, empty array
-        if (!length && arguments.length == 1)
-            throw new TypeError(); // TODO message
-
-        var result, i = length - 1;
-        if (arguments.length >= 2) {
-            result = arguments[1];
-        } else {
-            do {
-                if (i in self) {
-                    result = self[i--];
-                    break;
-                }
-
-                // if array contains no values, no initial value to return
-                if (--i < 0)
-                    throw new TypeError(); // TODO message
-            } while (true);
-        }
-
-        do {
-            if (i in this)
-                result = fun.call(void 0, result, self[i], i, self);
-        } while (i--);
-
-        return result;
-    };
-}
-
-// ES5 15.4.4.14
-// http://es5.github.com/#x15.4.4.14
-// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/indexOf
-if (!Array.prototype.indexOf) {
-    Array.prototype.indexOf = function indexOf(sought /*, fromIndex */ ) {
-        var self = toObject(this),
-            length = self.length >>> 0;
-
-        if (!length)
-            return -1;
-
-        var i = 0;
-        if (arguments.length > 1)
-            i = toInteger(arguments[1]);
-
-        // handle negative indices
-        i = i >= 0 ? i : Math.max(0, length + i);
-        for (; i < length; i++) {
-            if (i in self && self[i] === sought) {
-                return i;
-            }
-        }
-        return -1;
-    };
-}
-
-// ES5 15.4.4.15
-// http://es5.github.com/#x15.4.4.15
-// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/lastIndexOf
-if (!Array.prototype.lastIndexOf) {
-    Array.prototype.lastIndexOf = function lastIndexOf(sought /*, fromIndex */) {
-        var self = toObject(this),
-            length = self.length >>> 0;
-
-        if (!length)
-            return -1;
-        var i = length - 1;
-        if (arguments.length > 1)
-            i = Math.min(i, toInteger(arguments[1]));
-        // handle negative indices
-        i = i >= 0 ? i : length - Math.abs(i);
-        for (; i >= 0; i--) {
-            if (i in self && sought === self[i])
-                return i;
-        }
-        return -1;
-    };
-}
-
-//
-// Object
-// ======
-//
-
-// ES5 15.2.3.2
-// http://es5.github.com/#x15.2.3.2
-if (!Object.getPrototypeOf) {
-    // https://github.com/kriskowal/es5-shim/issues#issue/2
-    // http://ejohn.org/blog/objectgetprototypeof/
-    // recommended by fschaefer on github
-    Object.getPrototypeOf = function getPrototypeOf(object) {
-        return object.__proto__ || (
-            object.constructor ?
-            object.constructor.prototype :
-            prototypeOfObject
-        );
-    };
-}
-
-// ES5 15.2.3.3
-// http://es5.github.com/#x15.2.3.3
-if (!Object.getOwnPropertyDescriptor) {
-    var ERR_NON_OBJECT = "Object.getOwnPropertyDescriptor called on a " +
-                         "non-object: ";
-    Object.getOwnPropertyDescriptor = function getOwnPropertyDescriptor(object, property) {
-        if ((typeof object != "object" && typeof object != "function") || object === null)
-            throw new TypeError(ERR_NON_OBJECT + object);
-        // If object does not owns property return undefined immediately.
-        if (!owns(object, property))
-            return;
-
-        var descriptor, getter, setter;
-
-        // If object has a property then it's for sure both `enumerable` and
-        // `configurable`.
-        descriptor =  { enumerable: true, configurable: true };
-
-        // If JS engine supports accessor properties then property may be a
-        // getter or setter.
-        if (supportsAccessors) {
-            // Unfortunately `__lookupGetter__` will return a getter even
-            // if object has own non getter property along with a same named
-            // inherited getter. To avoid misbehavior we temporary remove
-            // `__proto__` so that `__lookupGetter__` will return getter only
-            // if it's owned by an object.
-            var prototype = object.__proto__;
-            object.__proto__ = prototypeOfObject;
-
-            var getter = lookupGetter(object, property);
-            var setter = lookupSetter(object, property);
-
-            // Once we have getter and setter we can put values back.
-            object.__proto__ = prototype;
-
-            if (getter || setter) {
-                if (getter) descriptor.get = getter;
-                if (setter) descriptor.set = setter;
-
-                // If it was accessor property we're done and return here
-                // in order to avoid adding `value` to the descriptor.
-                return descriptor;
-            }
-        }
-
-        // If we got this far we know that object has an own property that is
-        // not an accessor so we set it as a value and return descriptor.
-        descriptor.value = object[property];
-        return descriptor;
-    };
-}
-
-// ES5 15.2.3.4
-// http://es5.github.com/#x15.2.3.4
-if (!Object.getOwnPropertyNames) {
-    Object.getOwnPropertyNames = function getOwnPropertyNames(object) {
-        return Object.keys(object);
-    };
-}
-
-// ES5 15.2.3.5
-// http://es5.github.com/#x15.2.3.5
-if (!Object.create) {
-    Object.create = function create(prototype, properties) {
-        var object;
-        if (prototype === null) {
-            object = { "__proto__": null };
-        } else {
-            if (typeof prototype != "object")
-                throw new TypeError("typeof prototype["+(typeof prototype)+"] != 'object'");
-            var Type = function () {};
-            Type.prototype = prototype;
-            object = new Type();
-            // IE has no built-in implementation of `Object.getPrototypeOf`
-            // neither `__proto__`, but this manually setting `__proto__` will
-            // guarantee that `Object.getPrototypeOf` will work as expected with
-            // objects created using `Object.create`
-            object.__proto__ = prototype;
-        }
-        if (properties !== void 0)
-            Object.defineProperties(object, properties);
-        return object;
-    };
-}
-
-// ES5 15.2.3.6
-// http://es5.github.com/#x15.2.3.6
-
-// Patch for WebKit and IE8 standard mode
-// Designed by hax <hax.github.com>
-// related issue: https://github.com/kriskowal/es5-shim/issues#issue/5
-// IE8 Reference:
-//     http://msdn.microsoft.com/en-us/library/dd282900.aspx
-//     http://msdn.microsoft.com/en-us/library/dd229916.aspx
-// WebKit Bugs:
-//     https://bugs.webkit.org/show_bug.cgi?id=36423
-
-function doesDefinePropertyWork(object) {
-    try {
-        Object.defineProperty(object, "sentinel", {});
-        return "sentinel" in object;
-    } catch (exception) {
-        // returns falsy
-    }
-}
-
-// check whether defineProperty works if it's given. Otherwise,
-// shim partially.
-if (Object.defineProperty) {
-    var definePropertyWorksOnObject = doesDefinePropertyWork({});
-    var definePropertyWorksOnDom = typeof document == "undefined" ||
-        doesDefinePropertyWork(document.createElement("div"));
-    if (!definePropertyWorksOnObject || !definePropertyWorksOnDom) {
-        var definePropertyFallback = Object.defineProperty;
-    }
-}
-
-if (!Object.defineProperty || definePropertyFallback) {
-    var ERR_NON_OBJECT_DESCRIPTOR = "Property description must be an object: ";
-    var ERR_NON_OBJECT_TARGET = "Object.defineProperty called on non-object: "
-    var ERR_ACCESSORS_NOT_SUPPORTED = "getters & setters can not be defined " +
-                                      "on this javascript engine";
-
-    Object.defineProperty = function defineProperty(object, property, descriptor) {
-        if ((typeof object != "object" && typeof object != "function") || object === null)
-            throw new TypeError(ERR_NON_OBJECT_TARGET + object);
-        if ((typeof descriptor != "object" && typeof descriptor != "function") || descriptor === null)
-            throw new TypeError(ERR_NON_OBJECT_DESCRIPTOR + descriptor);
-
-        // make a valiant attempt to use the real defineProperty
-        // for I8's DOM elements.
-        if (definePropertyFallback) {
-            try {
-                return definePropertyFallback.call(Object, object, property, descriptor);
-            } catch (exception) {
-                // try the shim if the real one doesn't work
-            }
-        }
-
-        // If it's a data property.
-        if (owns(descriptor, "value")) {
-            // fail silently if "writable", "enumerable", or "configurable"
-            // are requested but not supported
-            /*
-            // alternate approach:
-            if ( // can't implement these features; allow false but not true
-                !(owns(descriptor, "writable") ? descriptor.writable : true) ||
-                !(owns(descriptor, "enumerable") ? descriptor.enumerable : true) ||
-                !(owns(descriptor, "configurable") ? descriptor.configurable : true)
-            )
-                throw new RangeError(
-                    "This implementation of Object.defineProperty does not " +
-                    "support configurable, enumerable, or writable."
-                );
-            */
-
-            if (supportsAccessors && (lookupGetter(object, property) ||
-                                      lookupSetter(object, property)))
-            {
-                // As accessors are supported only on engines implementing
-                // `__proto__` we can safely override `__proto__` while defining
-                // a property to make sure that we don't hit an inherited
-                // accessor.
-                var prototype = object.__proto__;
-                object.__proto__ = prototypeOfObject;
-                // Deleting a property anyway since getter / setter may be
-                // defined on object itself.
-                delete object[property];
-                object[property] = descriptor.value;
-                // Setting original `__proto__` back now.
-                object.__proto__ = prototype;
-            } else {
-                object[property] = descriptor.value;
-            }
-        } else {
-            if (!supportsAccessors)
-                throw new TypeError(ERR_ACCESSORS_NOT_SUPPORTED);
-            // If we got that far then getters and setters can be defined !!
-            if (owns(descriptor, "get"))
-                defineGetter(object, property, descriptor.get);
-            if (owns(descriptor, "set"))
-                defineSetter(object, property, descriptor.set);
-        }
-
-        return object;
-    };
-}
-
-// ES5 15.2.3.7
-// http://es5.github.com/#x15.2.3.7
-if (!Object.defineProperties) {
-    Object.defineProperties = function defineProperties(object, properties) {
-        for (var property in properties) {
-            if (owns(properties, property))
-                Object.defineProperty(object, property, properties[property]);
-        }
-        return object;
-    };
-}
-
-// ES5 15.2.3.8
-// http://es5.github.com/#x15.2.3.8
-if (!Object.seal) {
-    Object.seal = function seal(object) {
-        // this is misleading and breaks feature-detection, but
-        // allows "securable" code to "gracefully" degrade to working
-        // but insecure code.
-        return object;
-    };
-}
-
-// ES5 15.2.3.9
-// http://es5.github.com/#x15.2.3.9
-if (!Object.freeze) {
-    Object.freeze = function freeze(object) {
-        // this is misleading and breaks feature-detection, but
-        // allows "securable" code to "gracefully" degrade to working
-        // but insecure code.
-        return object;
-    };
-}
-
-// detect a Rhino bug and patch it
-try {
-    Object.freeze(function () {});
-} catch (exception) {
-    Object.freeze = (function freeze(freezeObject) {
-        return function freeze(object) {
-            if (typeof object == "function") {
-                return object;
-            } else {
-                return freezeObject(object);
-            }
-        };
-    })(Object.freeze);
-}
-
-// ES5 15.2.3.10
-// http://es5.github.com/#x15.2.3.10
-if (!Object.preventExtensions) {
-    Object.preventExtensions = function preventExtensions(object) {
-        // this is misleading and breaks feature-detection, but
-        // allows "securable" code to "gracefully" degrade to working
-        // but insecure code.
-        return object;
-    };
-}
-
-// ES5 15.2.3.11
-// http://es5.github.com/#x15.2.3.11
-if (!Object.isSealed) {
-    Object.isSealed = function isSealed(object) {
-        return false;
-    };
-}
-
-// ES5 15.2.3.12
-// http://es5.github.com/#x15.2.3.12
-if (!Object.isFrozen) {
-    Object.isFrozen = function isFrozen(object) {
-        return false;
-    };
-}
-
-// ES5 15.2.3.13
-// http://es5.github.com/#x15.2.3.13
-if (!Object.isExtensible) {
-    Object.isExtensible = function isExtensible(object) {
-        // 1. If Type(O) is not Object throw a TypeError exception.
-        if (Object(object) === object) {
-            throw new TypeError(); // TODO message
-        }
-        // 2. Return the Boolean value of the [[Extensible]] internal property of O.
-        var name = '';
-        while (owns(object, name)) {
-            name += '?';
-        }
-        object[name] = true;
-        var returnValue = owns(object, name);
-        delete object[name];
-        return returnValue;
-    };
-}
-
-// ES5 15.2.3.14
-// http://es5.github.com/#x15.2.3.14
-if (!Object.keys) {
-    // http://whattheheadsaid.com/2010/10/a-safer-object-keys-compatibility-implementation
-    var hasDontEnumBug = true,
-        dontEnums = [
-            "toString",
-            "toLocaleString",
-            "valueOf",
-            "hasOwnProperty",
-            "isPrototypeOf",
-            "propertyIsEnumerable",
-            "constructor"
-        ],
-        dontEnumsLength = dontEnums.length;
-
-    for (var key in {"toString": null})
-        hasDontEnumBug = false;
-
-    Object.keys = function keys(object) {
-
-        if ((typeof object != "object" && typeof object != "function") || object === null)
-            throw new TypeError("Object.keys called on a non-object");
-
-        var keys = [];
-        for (var name in object) {
-            if (owns(object, name)) {
-                keys.push(name);
-            }
-        }
-
-        if (hasDontEnumBug) {
-            for (var i = 0, ii = dontEnumsLength; i < ii; i++) {
-                var dontEnum = dontEnums[i];
-                if (owns(object, dontEnum)) {
-                    keys.push(dontEnum);
-                }
-            }
-        }
-
-        return keys;
-    };
-
-}
-
-//
-// Date
-// ====
-//
-
-// ES5 15.9.5.43
-// http://es5.github.com/#x15.9.5.43
-// This function returns a String value represent the instance in time 
-// represented by this Date object. The format of the String is the Date Time 
-// string format defined in 15.9.1.15. All fields are present in the String. 
-// The time zone is always UTC, denoted by the suffix Z. If the time value of 
-// this object is not a finite Number a RangeError exception is thrown.
-if (!Date.prototype.toISOString || (new Date(-62198755200000).toISOString().indexOf('-000001') === -1)) {
-    Date.prototype.toISOString = function toISOString() {
-        var result, length, value, year;
-        if (!isFinite(this))
-            throw new RangeError;
-
-        // the date time string format is specified in 15.9.1.15.
-        result = [this.getUTCMonth() + 1, this.getUTCDate(),
-            this.getUTCHours(), this.getUTCMinutes(), this.getUTCSeconds()];
-        year = this.getUTCFullYear();
-        year = (year < 0 ? '-' : (year > 9999 ? '+' : '')) + ('00000' + Math.abs(year)).slice(0 <= year && year <= 9999 ? -4 : -6);
-
-        length = result.length;
-        while (length--) {
-            value = result[length];
-            // pad months, days, hours, minutes, and seconds to have two digits.
-            if (value < 10)
-                result[length] = "0" + value;
-        }
-        // pad milliseconds to have three digits.
-        return year + "-" + result.slice(0, 2).join("-") + "T" + result.slice(2).join(":") + "." +
-            ("000" + this.getUTCMilliseconds()).slice(-3) + "Z";
-    }
-}
-
-// ES5 15.9.4.4
-// http://es5.github.com/#x15.9.4.4
-if (!Date.now) {
-    Date.now = function now() {
-        return new Date().getTime();
-    };
-}
-
-// ES5 15.9.5.44
-// http://es5.github.com/#x15.9.5.44
-// This function provides a String representation of a Date object for use by 
-// JSON.stringify (15.12.3).
-if (!Date.prototype.toJSON) {
-    Date.prototype.toJSON = function toJSON(key) {
-        // When the toJSON method is called with argument key, the following 
-        // steps are taken:
-
-        // 1.  Let O be the result of calling ToObject, giving it the this
-        // value as its argument.
-        // 2. Let tv be ToPrimitive(O, hint Number).
-        // 3. If tv is a Number and is not finite, return null.
-        // XXX
-        // 4. Let toISO be the result of calling the [[Get]] internal method of
-        // O with argument "toISOString".
-        // 5. If IsCallable(toISO) is false, throw a TypeError exception.
-        if (typeof this.toISOString != "function")
-            throw new TypeError(); // TODO message
-        // 6. Return the result of calling the [[Call]] internal method of
-        //  toISO with O as the this value and an empty argument list.
-        return this.toISOString();
-
-        // NOTE 1 The argument is ignored.
-
-        // NOTE 2 The toJSON function is intentionally generic; it does not
-        // require that its this value be a Date object. Therefore, it can be
-        // transferred to other kinds of objects for use as a method. However,
-        // it does require that any such object have a toISOString method. An
-        // object is free to use the argument key to filter its
-        // stringification.
-    };
-}
-
-// ES5 15.9.4.2
-// http://es5.github.com/#x15.9.4.2
-// based on work shared by Daniel Friesen (dantman)
-// http://gist.github.com/303249
-if (Date.parse("+275760-09-13T00:00:00.000Z") !== 8.64e15) {
-    // XXX global assignment won't work in embeddings that use
-    // an alternate object for the context.
-    Date = (function(NativeDate) {
-
-        // Date.length === 7
-        var Date = function Date(Y, M, D, h, m, s, ms) {
-            var length = arguments.length;
-            if (this instanceof NativeDate) {
-                var date = length == 1 && String(Y) === Y ? // isString(Y)
-                    // We explicitly pass it through parse:
-                    new NativeDate(Date.parse(Y)) :
-                    // We have to manually make calls depending on argument
-                    // length here
-                    length >= 7 ? new NativeDate(Y, M, D, h, m, s, ms) :
-                    length >= 6 ? new NativeDate(Y, M, D, h, m, s) :
-                    length >= 5 ? new NativeDate(Y, M, D, h, m) :
-                    length >= 4 ? new NativeDate(Y, M, D, h) :
-                    length >= 3 ? new NativeDate(Y, M, D) :
-                    length >= 2 ? new NativeDate(Y, M) :
-                    length >= 1 ? new NativeDate(Y) :
-                                  new NativeDate();
-                // Prevent mixups with unfixed Date object
-                date.constructor = Date;
-                return date;
-            }
-            return NativeDate.apply(this, arguments);
-        };
-
-        // 15.9.1.15 Date Time String Format.
-        var isoDateExpression = new RegExp("^" +
-            "(\\d{4}|[\+\-]\\d{6})" + // four-digit year capture or sign + 6-digit extended year
-            "(?:-(\\d{2})" + // optional month capture
-            "(?:-(\\d{2})" + // optional day capture
-            "(?:" + // capture hours:minutes:seconds.milliseconds
-                "T(\\d{2})" + // hours capture
-                ":(\\d{2})" + // minutes capture
-                "(?:" + // optional :seconds.milliseconds
-                    ":(\\d{2})" + // seconds capture
-                    "(?:\\.(\\d{3}))?" + // milliseconds capture
-                ")?" +
-            "(?:" + // capture UTC offset component
-                "Z|" + // UTC capture
-                "(?:" + // offset specifier +/-hours:minutes
-                    "([-+])" + // sign capture
-                    "(\\d{2})" + // hours offset capture
-                    ":(\\d{2})" + // minutes offset capture
-                ")" +
-            ")?)?)?)?" +
-        "$");
-
-        // Copy any custom methods a 3rd party library may have added
-        for (var key in NativeDate)
-            Date[key] = NativeDate[key];
-
-        // Copy "native" methods explicitly; they may be non-enumerable
-        Date.now = NativeDate.now;
-        Date.UTC = NativeDate.UTC;
-        Date.prototype = NativeDate.prototype;
-        Date.prototype.constructor = Date;
-
-        // Upgrade Date.parse to handle simplified ISO 8601 strings
-        Date.parse = function parse(string) {
-            var match = isoDateExpression.exec(string);
-            if (match) {
-                match.shift(); // kill match[0], the full match
-                // parse months, days, hours, minutes, seconds, and milliseconds
-                for (var i = 1; i < 7; i++) {
-                    // provide default values if necessary
-                    match[i] = +(match[i] || (i < 3 ? 1 : 0));
-                    // match[1] is the month. Months are 0-11 in JavaScript
-                    // `Date` objects, but 1-12 in ISO notation, so we
-                    // decrement.
-                    if (i == 1)
-                        match[i]--;
-                }
-
-                // parse the UTC offset component
-                var minuteOffset = +match.pop(), hourOffset = +match.pop(), sign = match.pop();
-
-                // compute the explicit time zone offset if specified
-                var offset = 0;
-                if (sign) {
-                    // detect invalid offsets and return early
-                    if (hourOffset > 23 || minuteOffset > 59)
-                        return NaN;
-
-                    // express the provided time zone offset in minutes. The offset is
-                    // negative for time zones west of UTC; positive otherwise.
-                    offset = (hourOffset * 60 + minuteOffset) * 6e4 * (sign == "+" ? -1 : 1);
-                }
-
-                // Date.UTC for years between 0 and 99 converts year to 1900 + year
-                // The Gregorian calendar has a 400-year cycle, so 
-                // to Date.UTC(year + 400, .... ) - 12622780800000 == Date.UTC(year, ...),
-                // where 12622780800000 - number of milliseconds in Gregorian calendar 400 years
-                var year = +match[0];
-                if (0 <= year && year <= 99) {
-                    match[0] = year + 400;
-                    return NativeDate.UTC.apply(this, match) + offset - 12622780800000;
-                }
-
-                // compute a new UTC date value, accounting for the optional offset
-                return NativeDate.UTC.apply(this, match) + offset;
-            }
-            return NativeDate.parse.apply(this, arguments);
-        };
-
-        return Date;
-    })(Date);
-}
-
-//
-// String
-// ======
-//
-
-// ES5 15.5.4.20
-// http://es5.github.com/#x15.5.4.20
-var ws = "\x09\x0A\x0B\x0C\x0D\x20\xA0\u1680\u180E\u2000\u2001\u2002\u2003" +
-    "\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u202F\u205F\u3000\u2028" +
-    "\u2029\uFEFF";
-if (!String.prototype.trim || ws.trim()) {
-    // http://blog.stevenlevithan.com/archives/faster-trim-javascript
-    // http://perfectionkills.com/whitespace-deviations/
-    ws = "[" + ws + "]";
-    var trimBeginRegexp = new RegExp("^" + ws + ws + "*"),
-        trimEndRegexp = new RegExp(ws + ws + "*$");
-    String.prototype.trim = function trim() {
-        return String(this).replace(trimBeginRegexp, "").replace(trimEndRegexp, "");
-    };
-}
-
-//
-// Util
-// ======
-//
-
-// ES5 9.4
-// http://es5.github.com/#x9.4
-// http://jsperf.com/to-integer
-var toInteger = function (n) {
-    n = +n;
-    if (n !== n) // isNaN
-        n = 0;
-    else if (n !== 0 && n !== (1/0) && n !== -(1/0))
-        n = (n > 0 || -1) * Math.floor(Math.abs(n));
-    return n;
-};
-
-var prepareString = "a"[0] != "a",
-    // ES5 9.9
-    // http://es5.github.com/#x9.9
-    toObject = function (o) {
-        if (o == null) { // this matches both null and undefined
-            throw new TypeError(); // TODO message
-        }
-        // If the implementation doesn't support by-index access of
-        // string characters (ex. IE < 7), split the string
-        if (prepareString && typeof o == "string" && o) {
-            return o.split("");
-        }
-        return Object(o);
-    };
-});/* vim:ts=4:sts=4:sw=4:
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Mihai Sucan <mihai AT sucan AT gmail ODT com>
- *      Irakli Gozalishvili <rfobic@gmail.com> (http://jeditoolkit.com)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/lib/dom', ['require', 'exports', 'module' ], function(require, exports, module) {
-"use strict";
-
-var XHTML_NS = "http://www.w3.org/1999/xhtml";
-
-exports.createElement = function(tag, ns) {
-    return document.createElementNS ?
-           document.createElementNS(ns || XHTML_NS, tag) :
-           document.createElement(tag);
-};
-
-exports.setText = function(elem, text) {
-    if (elem.innerText !== undefined) {
-        elem.innerText = text;
-    }
-    if (elem.textContent !== undefined) {
-        elem.textContent = text;
-    }
-};
-
-exports.hasCssClass = function(el, name) {
-    var classes = el.className.split(/\s+/g);
-    return classes.indexOf(name) !== -1;
-};
-
-/**
-* Add a CSS class to the list of classes on the given node
-*/
-exports.addCssClass = function(el, name) {
-    if (!exports.hasCssClass(el, name)) {
-        el.className += " " + name;
-    }
-};
-
-/**
-* Remove a CSS class from the list of classes on the given node
-*/
-exports.removeCssClass = function(el, name) {
-    var classes = el.className.split(/\s+/g);
-    while (true) {
-        var index = classes.indexOf(name);
-        if (index == -1) {
-            break;
-        }
-        classes.splice(index, 1);
-    }
-    el.className = classes.join(" ");
-};
-
-exports.toggleCssClass = function(el, name) {
-    var classes = el.className.split(/\s+/g), add = true;
-    while (true) {
-        var index = classes.indexOf(name);
-        if (index == -1) {
-            break;
-        }
-        add = false;
-        classes.splice(index, 1);
-    }
-    if(add)
-        classes.push(name);
-
-    el.className = classes.join(" ");
-    return add;
-};
-
-/**
- * Add or remove a CSS class from the list of classes on the given node
- * depending on the value of <tt>include</tt>
- */
-exports.setCssClass = function(node, className, include) {
-    if (include) {
-        exports.addCssClass(node, className);
-    } else {
-        exports.removeCssClass(node, className);
-    }
-};
-
-exports.hasCssString = function(id, doc) {
-    var index = 0, sheets;
-    doc = doc || document;
-
-    if (doc.createStyleSheet && (sheets = doc.styleSheets)) {
-        while (index < sheets.length)
-            if (sheets[index++].owningElement.id === id) return true;
-    } else if ((sheets = doc.getElementsByTagName("style"))) {
-        while (index < sheets.length)
-            if (sheets[index++].id === id) return true;
-    }
-
-    return false;
-};
-
-exports.importCssString = function importCssString(cssText, id, doc) {
-    doc = doc || document;
-    // If style is already imported return immediately.
-    if (id && exports.hasCssString(id, doc))
-        return null;
-    
-    var style;
-    
-    if (doc.createStyleSheet) {
-        style = doc.createStyleSheet();
-        style.cssText = cssText;
-        if (id)
-            style.owningElement.id = id;
-    } else {
-        style = doc.createElementNS
-            ? doc.createElementNS(XHTML_NS, "style")
-            : doc.createElement("style");
-
-        style.appendChild(doc.createTextNode(cssText));
-        if (id)
-            style.id = id;
-
-        var head = doc.getElementsByTagName("head")[0] || doc.documentElement;
-        head.appendChild(style);
-    }
-};
-
-exports.importCssStylsheet = function(uri, doc) {
-    if (doc.createStyleSheet) {
-        doc.createStyleSheet(uri);
-    } else {
-        var link = exports.createElement('link');
-        link.rel = 'stylesheet';
-        link.href = uri;
-
-        var head = doc.getElementsByTagName("head")[0] || doc.documentElement;
-        head.appendChild(link);
-    }
-};
-
-exports.getInnerWidth = function(element) {
-    return (
-        parseInt(exports.computedStyle(element, "paddingLeft"), 10) +
-        parseInt(exports.computedStyle(element, "paddingRight"), 10) + 
-        element.clientWidth
-    );
-};
-
-exports.getInnerHeight = function(element) {
-    return (
-        parseInt(exports.computedStyle(element, "paddingTop"), 10) +
-        parseInt(exports.computedStyle(element, "paddingBottom"), 10) +
-        element.clientHeight
-    );
-};
-
-if (window.pageYOffset !== undefined) {
-    exports.getPageScrollTop = function() {
-        return window.pageYOffset;
-    };
-
-    exports.getPageScrollLeft = function() {
-        return window.pageXOffset;
-    };
-}
-else {
-    exports.getPageScrollTop = function() {
-        return document.body.scrollTop;
-    };
-
-    exports.getPageScrollLeft = function() {
-        return document.body.scrollLeft;
-    };
-}
-
-if (window.getComputedStyle)
-    exports.computedStyle = function(element, style) {
-        if (style)
-            return (window.getComputedStyle(element, "") || {})[style] || "";
-        return window.getComputedStyle(element, "") || {};
-    };
-else
-    exports.computedStyle = function(element, style) {
-        if (style)
-            return element.currentStyle[style];
-        return element.currentStyle;
-    };
-
-exports.scrollbarWidth = function(document) {
-
-    var inner = exports.createElement("p");
-    inner.style.width = "100%";
-    inner.style.minWidth = "0px";
-    inner.style.height = "200px";
-
-    var outer = exports.createElement("div");
-    var style = outer.style;
-
-    style.position = "absolute";
-    style.left = "-10000px";
-    style.overflow = "hidden";
-    style.width = "200px";
-    style.minWidth = "0px";
-    style.height = "150px";
-
-    outer.appendChild(inner);
-
-    var body = document.body || document.documentElement;
-    body.appendChild(outer);
-
-    var noScrollbar = inner.offsetWidth;
-
-    style.overflow = "scroll";
-    var withScrollbar = inner.offsetWidth;
-
-    if (noScrollbar == withScrollbar) {
-        withScrollbar = outer.clientWidth;
-    }
-
-    body.removeChild(outer);
-
-    return noScrollbar-withScrollbar;
-};
-
-/**
- * Optimized set innerHTML. This is faster than plain innerHTML if the element
- * already contains a lot of child elements.
- *
- * See http://blog.stevenlevithan.com/archives/faster-than-innerhtml for details
- */
-exports.setInnerHtml = function(el, innerHtml) {
-    var element = el.cloneNode(false);//document.createElement("div");
-    element.innerHTML = innerHtml;
-    el.parentNode.replaceChild(element, el);
-    return element;
-};
-
-exports.setInnerText = function(el, innerText) {
-    var document = el.ownerDocument;
-    if (document.body && "textContent" in document.body)
-        el.textContent = innerText;
-    else
-        el.innerText = innerText;
-
-};
-
-exports.getInnerText = function(el) {
-    var document = el.ownerDocument;
-    if (document.body && "textContent" in document.body)
-        return el.textContent;
-    else
-         return el.innerText || el.textContent || "";
-};
-
-exports.getParentWindow = function(document) {
-    return document.defaultView || document.parentWindow;
-};
-
-});/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/lib/event', ['require', 'exports', 'module' , 'ace/lib/keys', 'ace/lib/useragent', 'ace/lib/dom'], function(require, exports, module) {
-"use strict";
-
-var keys = require("./keys");
-var useragent = require("./useragent");
-var dom = require("./dom");
-
-exports.addListener = function(elem, type, callback) {
-    if (elem.addEventListener) {
-        return elem.addEventListener(type, callback, false);
-    }
-    if (elem.attachEvent) {
-        var wrapper = function() {
-            callback(window.event);
-        };
-        callback._wrapper = wrapper;
-        elem.attachEvent("on" + type, wrapper);
-    }
-};
-
-exports.removeListener = function(elem, type, callback) {
-    if (elem.removeEventListener) {
-        return elem.removeEventListener(type, callback, false);
-    }
-    if (elem.detachEvent) {
-        elem.detachEvent("on" + type, callback._wrapper || callback);
-    }
-};
-
-/**
-* Prevents propagation and clobbers the default action of the passed event
-*/
-exports.stopEvent = function(e) {
-    exports.stopPropagation(e);
-    exports.preventDefault(e);
-    return false;
-};
-
-exports.stopPropagation = function(e) {
-    if (e.stopPropagation)
-        e.stopPropagation();
-    else
-        e.cancelBubble = true;
-};
-
-exports.preventDefault = function(e) {
-    if (e.preventDefault)
-        e.preventDefault();
-    else
-        e.returnValue = false;
-};
-
-exports.getDocumentX = function(e) {
-    if (e.clientX) {
-        return e.clientX + dom.getPageScrollLeft();
-    } else {
-        return e.pageX;
-    }
-};
-
-exports.getDocumentY = function(e) {
-    if (e.clientY) {
-        return e.clientY + dom.getPageScrollTop();
-    } else {
-        return e.pageY;
-    }
-};
-
-/**
- * @return {Number} 0 for left button, 1 for middle button, 2 for right button
- */
-exports.getButton = function(e) {
-    if (e.type == "dblclick")
-        return 0;
-    else if (e.type == "contextmenu")
-        return 2;
-
-    // DOM Event
-    if (e.preventDefault) {
-        return e.button;
-    }
-    // old IE
-    else {
-        return {1:0, 2:2, 4:1}[e.button];
-    }
-};
-
-if (document.documentElement.setCapture) {
-    exports.capture = function(el, eventHandler, releaseCaptureHandler) {
-        function onMouseMove(e) {
-            eventHandler(e);
-            return exports.stopPropagation(e);
-        }
-
-        var called = false;
-        function onReleaseCapture(e) {
-            eventHandler(e);
-
-            if (!called) {
-                called = true;
-                releaseCaptureHandler(e);
-            }
-
-            exports.removeListener(el, "mousemove", eventHandler);
-            exports.removeListener(el, "mouseup", onReleaseCapture);
-            exports.removeListener(el, "losecapture", onReleaseCapture);
-
-            el.releaseCapture();
-        }
-
-        exports.addListener(el, "mousemove", eventHandler);
-        exports.addListener(el, "mouseup", onReleaseCapture);
-        exports.addListener(el, "losecapture", onReleaseCapture);
-        el.setCapture();
-    };
-}
-else {
-    exports.capture = function(el, eventHandler, releaseCaptureHandler) {
-        function onMouseMove(e) {
-            eventHandler(e);
-            e.stopPropagation();
-        }
-
-        function onMouseUp(e) {
-            eventHandler && eventHandler(e);
-            releaseCaptureHandler && releaseCaptureHandler(e);
-
-            document.removeEventListener("mousemove", onMouseMove, true);
-            document.removeEventListener("mouseup", onMouseUp, true);
-
-            e.stopPropagation();
-        }
-
-        document.addEventListener("mousemove", onMouseMove, true);
-        document.addEventListener("mouseup", onMouseUp, true);
-    };
-}
-
-exports.addMouseWheelListener = function(el, callback) {
-    var factor = 8;
-    var listener = function(e) {
-        if (e.wheelDelta !== undefined) {
-            if (e.wheelDeltaX !== undefined) {
-                e.wheelX = -e.wheelDeltaX / factor;
-                e.wheelY = -e.wheelDeltaY / factor;
-            } else {
-                e.wheelX = 0;
-                e.wheelY = -e.wheelDelta / factor;
-            }
-        }
-        else {
-            if (e.axis && e.axis == e.HORIZONTAL_AXIS) {
-                e.wheelX = (e.detail || 0) * 5;
-                e.wheelY = 0;
-            } else {
-                e.wheelX = 0;
-                e.wheelY = (e.detail || 0) * 5;
-            }
-        }
-        callback(e);
-    };
-    exports.addListener(el, "DOMMouseScroll", listener);
-    exports.addListener(el, "mousewheel", listener);
-};
-
-exports.addMultiMouseDownListener = function(el, button, count, timeout, callback) {
-    var clicks = 0;
-    var startX, startY;
-
-    var listener = function(e) {
-        clicks += 1;
-        if (clicks == 1) {
-            startX = e.clientX;
-            startY = e.clientY;
-
-            setTimeout(function() {
-                clicks = 0;
-            }, timeout || 600);
-        }
-
-        var isButton = exports.getButton(e) == button;
-        if (!isButton || Math.abs(e.clientX - startX) > 5 || Math.abs(e.clientY - startY) > 5)
-            clicks = 0;
-
-        if (clicks == count) {
-            clicks = 0;
-            callback(e);
-        }
-
-        if (isButton)
-            return exports.preventDefault(e);
-    };
-
-    exports.addListener(el, "mousedown", listener);
-    useragent.isOldIE && exports.addListener(el, "dblclick", listener);
-};
-
-function normalizeCommandKeys(callback, e, keyCode) {
-    var hashId = 0;
-    if (useragent.isOpera && useragent.isMac) {
-        hashId = 0 | (e.metaKey ? 1 : 0) | (e.altKey ? 2 : 0)
-            | (e.shiftKey ? 4 : 0) | (e.ctrlKey ? 8 : 0);
-    } else {
-        hashId = 0 | (e.ctrlKey ? 1 : 0) | (e.altKey ? 2 : 0)
-            | (e.shiftKey ? 4 : 0) | (e.metaKey ? 8 : 0);
-    }
-
-    if (keyCode in keys.MODIFIER_KEYS) {
-        switch (keys.MODIFIER_KEYS[keyCode]) {
-            case "Alt":
-                hashId = 2;
-                break;
-            case "Shift":
-                hashId = 4;
-                break;
-            case "Ctrl":
-                hashId = 1;
-                break;
-            default:
-                hashId = 8;
-                break;
-        }
-        keyCode = 0;
-    }
-
-    if (hashId & 8 && (keyCode == 91 || keyCode == 93)) {
-        keyCode = 0;
-    }
-
-    // If there is no hashID and the keyCode is not a function key, then
-    // we don't call the callback as we don't handle a command key here
-    // (it's a normal key/character input).
-    if (!hashId && !(keyCode in keys.FUNCTION_KEYS) && !(keyCode in keys.PRINTABLE_KEYS)) {
-        return false;
-    }
-    return callback(e, hashId, keyCode);
-}
-
-exports.addCommandKeyListener = function(el, callback) {
-    var addListener = exports.addListener;
-    if (useragent.isOldGecko || useragent.isOpera) {
-        // Old versions of Gecko aka. Firefox < 4.0 didn't repeat the keydown
-        // event if the user pressed the key for a longer time. Instead, the
-        // keydown event was fired once and later on only the keypress event.
-        // To emulate the 'right' keydown behavior, the keyCode of the initial
-        // keyDown event is stored and in the following keypress events the
-        // stores keyCode is used to emulate a keyDown event.
-        var lastKeyDownKeyCode = null;
-        addListener(el, "keydown", function(e) {
-            lastKeyDownKeyCode = e.keyCode;
-        });
-        addListener(el, "keypress", function(e) {
-            return normalizeCommandKeys(callback, e, lastKeyDownKeyCode);
-        });
-    } else {
-        var lastDown = null;
-
-        addListener(el, "keydown", function(e) {
-            lastDown = e.keyIdentifier || e.keyCode;
-            return normalizeCommandKeys(callback, e, e.keyCode);
-        });
-    }
-};
-
-if (window.postMessage) {
-    var postMessageId = 1;
-    exports.nextTick = function(callback, win) {
-        win = win || window;
-        var messageName = "zero-timeout-message-" + postMessageId;            
-        exports.addListener(win, "message", function listener(e) {
-            if (e.data == messageName) {
-                exports.stopPropagation(e);
-                exports.removeListener(win, "message", listener);
-                callback();
-            }
-        });
-        win.postMessage(messageName, "*");
-    };
-}
-else {
-    exports.nextTick = function(callback, win) {
-        win = win || window;
-        window.setTimeout(callback, 0);
-    };
-}
-
-});
-/*! @license
-==========================================================================
-SproutCore -- JavaScript Application Framework
-copyright 2006-2009, Sprout Systems Inc., Apple Inc. and contributors.
-
-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.
-
-SproutCore and the SproutCore logo are trademarks of Sprout Systems, Inc.
-
-For more information about SproutCore, visit http://www.sproutcore.com
-
-
-==========================================================================
-@license */
-
-// Most of the following code is taken from SproutCore with a few changes.
-
-define('ace/lib/keys', ['require', 'exports', 'module' , 'ace/lib/oop'], function(require, exports, module) {
-"use strict";
-
-var oop = require("./oop");
-
-/**
- * Helper functions and hashes for key handling.
- */
-var Keys = (function() {
-    var ret = {
-        MODIFIER_KEYS: {
-            16: 'Shift', 17: 'Ctrl', 18: 'Alt', 224: 'Meta'
-        },
-
-        KEY_MODS: {
-            "ctrl": 1, "alt": 2, "option" : 2,
-            "shift": 4, "meta": 8, "command": 8
-        },
-
-        FUNCTION_KEYS : {
-            8  : "Backspace",
-            9  : "Tab",
-            13 : "Return",
-            19 : "Pause",
-            27 : "Esc",
-            32 : "Space",
-            33 : "PageUp",
-            34 : "PageDown",
-            35 : "End",
-            36 : "Home",
-            37 : "Left",
-            38 : "Up",
-            39 : "Right",
-            40 : "Down",
-            44 : "Print",
-            45 : "Insert",
-            46 : "Delete",
-            96 : "Numpad0",
-            97 : "Numpad1",
-            98 : "Numpad2",
-            99 : "Numpad3",
-            100: "Numpad4",
-            101: "Numpad5",
-            102: "Numpad6",
-            103: "Numpad7",
-            104: "Numpad8",
-            105: "Numpad9",
-            112: "F1",
-            113: "F2",
-            114: "F3",
-            115: "F4",
-            116: "F5",
-            117: "F6",
-            118: "F7",
-            119: "F8",
-            120: "F9",
-            121: "F10",
-            122: "F11",
-            123: "F12",
-            144: "Numlock",
-            145: "Scrolllock"
-        },
-
-        PRINTABLE_KEYS: {
-           32: ' ',  48: '0',  49: '1',  50: '2',  51: '3',  52: '4', 53:  '5',
-           54: '6',  55: '7',  56: '8',  57: '9',  59: ';',  61: '=', 65:  'a',
-           66: 'b',  67: 'c',  68: 'd',  69: 'e',  70: 'f',  71: 'g', 72:  'h',
-           73: 'i',  74: 'j',  75: 'k',  76: 'l',  77: 'm',  78: 'n', 79:  'o',
-           80: 'p',  81: 'q',  82: 'r',  83: 's',  84: 't',  85: 'u', 86:  'v',
-           87: 'w',  88: 'x',  89: 'y',  90: 'z', 107: '+', 109: '-', 110: '.',
-          188: ',', 190: '.', 191: '/', 192: '`', 219: '[', 220: '\\',
-          221: ']', 222: '\"'
-        }
-    };
-
-    // A reverse map of FUNCTION_KEYS
-    for (var i in ret.FUNCTION_KEYS) {
-        var name = ret.FUNCTION_KEYS[i].toUpperCase();
-        ret[name] = parseInt(i, 10);
-    }
-
-    // Add the MODIFIER_KEYS, FUNCTION_KEYS and PRINTABLE_KEYS to the KEY
-    // variables as well.
-    oop.mixin(ret, ret.MODIFIER_KEYS);
-    oop.mixin(ret, ret.PRINTABLE_KEYS);
-    oop.mixin(ret, ret.FUNCTION_KEYS);
-
-    return ret;
-})();
-oop.mixin(exports, Keys);
-
-exports.keyCodeToString = function(keyCode) {
-    return (Keys[keyCode] || String.fromCharCode(keyCode)).toLowerCase();
-}
-
-});/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/lib/oop', ['require', 'exports', 'module' ], function(require, exports, module) {
-"use strict";
-
-exports.inherits = (function() {
-    var tempCtor = function() {};
-    return function(ctor, superCtor) {
-        tempCtor.prototype = superCtor.prototype;
-        ctor.super_ = superCtor.prototype;
-        ctor.prototype = new tempCtor();
-        ctor.prototype.constructor = ctor;
-    };
-}());
-
-exports.mixin = function(obj, mixin) {
-    for (var key in mixin) {
-        obj[key] = mixin[key];
-    }
-};
-
-exports.implement = function(proto, mixin) {
-    exports.mixin(proto, mixin);
-};
-
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/lib/useragent', ['require', 'exports', 'module' ], function(require, exports, module) {
-"use strict";
-
-var os = (navigator.platform.match(/mac|win|linux/i) || ["other"])[0].toLowerCase();
-var ua = navigator.userAgent;
-
-/** Is the user using a browser that identifies itself as Windows */
-exports.isWin = (os == "win");
-
-/** Is the user using a browser that identifies itself as Mac OS */
-exports.isMac = (os == "mac");
-
-/** Is the user using a browser that identifies itself as Linux */
-exports.isLinux = (os == "linux");
-
-exports.isIE = 
-    navigator.appName == "Microsoft Internet Explorer"
-    && parseFloat(navigator.userAgent.match(/MSIE ([0-9]+[\.0-9]+)/)[1]);
-    
-exports.isOldIE = exports.isIE && exports.isIE < 9;
-
-/** Is this Firefox or related? */
-exports.isGecko = exports.isMozilla = window.controllers && window.navigator.product === "Gecko";
-
-/** oldGecko == rev < 2.0 **/
-exports.isOldGecko = exports.isGecko && parseInt((navigator.userAgent.match(/rv\:(\d+)/)||[])[1], 10) < 4;
-
-/** Is this Opera */
-exports.isOpera = window.opera && Object.prototype.toString.call(window.opera) == "[object Opera]";
-
-/** Is the user using a browser that identifies itself as WebKit */
-exports.isWebKit = parseFloat(ua.split("WebKit/")[1]) || undefined;
-
-exports.isChrome = parseFloat(ua.split(" Chrome/")[1]) || undefined;
-
-exports.isAIR = ua.indexOf("AdobeAIR") >= 0;
-
-exports.isIPad = ua.indexOf("iPad") >= 0;
-
-exports.isTouchPad = ua.indexOf("TouchPad") >= 0;
-
-/**
- * I hate doing this, but we need some way to determine if the user is on a Mac
- * The reason is that users have different expectations of their key combinations.
- *
- * Take copy as an example, Mac people expect to use CMD or APPLE + C
- * Windows folks expect to use CTRL + C
- */
-exports.OS = {
-    LINUX: "LINUX",
-    MAC: "MAC",
-    WINDOWS: "WINDOWS"
-};
-
-/**
- * Return an exports.OS constant
- */
-exports.getOS = function() {
-    if (exports.isMac) {
-        return exports.OS.MAC;
-    } else if (exports.isLinux) {
-        return exports.OS.LINUX;
-    } else {
-        return exports.OS.WINDOWS;
-    }
-};
-
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Irakli Gozalishvili <rfobic@gmail.com> (http://jeditoolkit.com)
- *      Julian Viereck <julian.viereck@gmail.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/editor', ['require', 'exports', 'module' , 'ace/lib/fixoldbrowsers', 'ace/lib/oop', 'ace/lib/lang', 'ace/lib/useragent', 'ace/keyboard/textinput', 'ace/mouse/mouse_handler', 'ace/mouse/fold_handler', 'ace/keyboard/keybinding', 'ace/edit_session', 'ace/search', 'ace/range', 'ace/lib/event_emitter', 'ace/commands/command_manager', 'ace/commands/default_commands'], function(require, exports, module) {
-"use strict";
-
-require("./lib/fixoldbrowsers");
-
-var oop = require("./lib/oop");
-var lang = require("./lib/lang");
-var useragent = require("./lib/useragent");
-var TextInput = require("./keyboard/textinput").TextInput;
-var MouseHandler = require("./mouse/mouse_handler").MouseHandler;
-var FoldHandler = require("./mouse/fold_handler").FoldHandler;
-//var TouchHandler = require("./touch_handler").TouchHandler;
-var KeyBinding = require("./keyboard/keybinding").KeyBinding;
-var EditSession = require("./edit_session").EditSession;
-var Search = require("./search").Search;
-var Range = require("./range").Range;
-var EventEmitter = require("./lib/event_emitter").EventEmitter;
-var CommandManager = require("./commands/command_manager").CommandManager;
-var defaultCommands = require("./commands/default_commands").commands;
-
-var Editor = function(renderer, session) {
-    var container = renderer.getContainerElement();
-    this.container = container;
-    this.renderer = renderer;
-
-    this.textInput  = new TextInput(renderer.getTextAreaContainer(), this);
-    this.keyBinding = new KeyBinding(this);
-
-    // TODO detect touch event support
-    if (useragent.isIPad) {
-        //this.$mouseHandler = new TouchHandler(this);
-    } else {
-        this.$mouseHandler = new MouseHandler(this);
-        new FoldHandler(this);
-    }
-
-    this.$blockScrolling = 0;
-    this.$search = new Search().set({
-        wrap: true
-    });
-
-    this.commands = new CommandManager(useragent.isMac ? "mac" : "win", defaultCommands);
-    this.setSession(session || new EditSession(""));
-};
-
-(function(){
-
-    oop.implement(this, EventEmitter);
-
-    this.setKeyboardHandler = function(keyboardHandler) {
-        this.keyBinding.setKeyboardHandler(keyboardHandler);
-    };
-
-    this.getKeyboardHandler = function() {
-        return this.keyBinding.getKeyboardHandler();
-    };
-
-    this.setSession = function(session) {
-        if (this.session == session)
-            return;
-
-        if (this.session) {
-            var oldSession = this.session;
-            this.session.removeEventListener("change", this.$onDocumentChange);
-            this.session.removeEventListener("changeMode", this.$onChangeMode);
-            this.session.removeEventListener("tokenizerUpdate", this.$onTokenizerUpdate);
-            this.session.removeEventListener("changeTabSize", this.$onChangeTabSize);
-            this.session.removeEventListener("changeWrapLimit", this.$onChangeWrapLimit);
-            this.session.removeEventListener("changeWrapMode", this.$onChangeWrapMode);
-            this.session.removeEventListener("onChangeFold", this.$onChangeFold);
-            this.session.removeEventListener("changeFrontMarker", this.$onChangeFrontMarker);
-            this.session.removeEventListener("changeBackMarker", this.$onChangeBackMarker);
-            this.session.removeEventListener("changeBreakpoint", this.$onChangeBreakpoint);
-            this.session.removeEventListener("changeAnnotation", this.$onChangeAnnotation);
-            this.session.removeEventListener("changeOverwrite", this.$onCursorChange);
-            this.session.removeEventListener("changeScrollTop", this.$onScrollTopChange);
-            this.session.removeEventListener("changeLeftTop", this.$onScrollLeftChange);
-
-            var selection = this.session.getSelection();
-            selection.removeEventListener("changeCursor", this.$onCursorChange);
-            selection.removeEventListener("changeSelection", this.$onSelectionChange);
-        }
-
-        this.session = session;
-
-        this.$onDocumentChange = this.onDocumentChange.bind(this);
-        session.addEventListener("change", this.$onDocumentChange);
-        this.renderer.setSession(session);
-
-        this.$onChangeMode = this.onChangeMode.bind(this);
-        session.addEventListener("changeMode", this.$onChangeMode);
-
-        this.$onTokenizerUpdate = this.onTokenizerUpdate.bind(this);
-        session.addEventListener("tokenizerUpdate", this.$onTokenizerUpdate);
-
-        this.$onChangeTabSize = this.renderer.updateText.bind(this.renderer);
-        session.addEventListener("changeTabSize", this.$onChangeTabSize);
-
-        this.$onChangeWrapLimit = this.onChangeWrapLimit.bind(this);
-        session.addEventListener("changeWrapLimit", this.$onChangeWrapLimit);
-
-        this.$onChangeWrapMode = this.onChangeWrapMode.bind(this);
-        session.addEventListener("changeWrapMode", this.$onChangeWrapMode);
-
-        this.$onChangeFold = this.onChangeFold.bind(this);
-        session.addEventListener("changeFold", this.$onChangeFold);
-
-        this.$onChangeFrontMarker = this.onChangeFrontMarker.bind(this);
-        this.session.addEventListener("changeFrontMarker", this.$onChangeFrontMarker);
-
-        this.$onChangeBackMarker = this.onChangeBackMarker.bind(this);
-        this.session.addEventListener("changeBackMarker", this.$onChangeBackMarker);
-
-        this.$onChangeBreakpoint = this.onChangeBreakpoint.bind(this);
-        this.session.addEventListener("changeBreakpoint", this.$onChangeBreakpoint);
-
-        this.$onChangeAnnotation = this.onChangeAnnotation.bind(this);
-        this.session.addEventListener("changeAnnotation", this.$onChangeAnnotation);
-
-        this.$onCursorChange = this.onCursorChange.bind(this);
-        this.session.addEventListener("changeOverwrite", this.$onCursorChange);
-
-        this.$onScrollTopChange = this.onScrollTopChange.bind(this);
-        this.session.addEventListener("changeScrollTop", this.$onScrollTopChange);
-
-        this.$onScrollLeftChange = this.onScrollLeftChange.bind(this);
-        this.session.addEventListener("changeScrollLeft", this.$onScrollLeftChange);
-
-        this.selection = session.getSelection();
-        this.selection.addEventListener("changeCursor", this.$onCursorChange);
-
-        this.$onSelectionChange = this.onSelectionChange.bind(this);
-        this.selection.addEventListener("changeSelection", this.$onSelectionChange);
-
-        this.onChangeMode();
-
-        this.$blockScrolling += 1;
-        this.onCursorChange();
-        this.$blockScrolling -= 1;
-
-        this.onScrollTopChange();
-        this.onScrollLeftChange();
-        this.onSelectionChange();
-        this.onChangeFrontMarker();
-        this.onChangeBackMarker();
-        this.onChangeBreakpoint();
-        this.onChangeAnnotation();
-        this.session.getUseWrapMode() && this.renderer.adjustWrapLimit();
-        this.renderer.updateFull();
-
-        this._emit("changeSession", {
-            session: session,
-            oldSession: oldSession
-        });
-    };
-
-    this.getSession = function() {
-        return this.session;
-    };
-
-    this.getSelection = function() {
-        return this.selection;
-    };
-
-    this.resize = function() {
-        this.renderer.onResize();
-    };
-
-    this.setTheme = function(theme) {
-        this.renderer.setTheme(theme);
-    };
-
-    this.getTheme = function() {
-        return this.renderer.getTheme();
-    };
-
-    this.setStyle = function(style) {
-        this.renderer.setStyle(style);
-    };
-
-    this.unsetStyle = function(style) {
-        this.renderer.unsetStyle(style);
-    };
-
-    this.setFontSize = function(size) {
-        this.container.style.fontSize = size;
-        this.renderer.updateFontSize();
-    };
-
-    this.$highlightBrackets = function() {
-        if (this.session.$bracketHighlight) {
-            this.session.removeMarker(this.session.$bracketHighlight);
-            this.session.$bracketHighlight = null;
-        }
-
-        if (this.$highlightPending) {
-            return;
-        }
-
-        // perform highlight async to not block the browser during navigation
-        var self = this;
-        this.$highlightPending = true;
-        setTimeout(function() {
-            self.$highlightPending = false;
-
-            var pos = self.session.findMatchingBracket(self.getCursorPosition());
-            if (pos) {
-                var range = new Range(pos.row, pos.column, pos.row, pos.column+1);
-                self.session.$bracketHighlight = self.session.addMarker(range, "ace_bracket", "text");
-            }
-        }, 10);
-    };
-
-    this.focus = function() {
-        // Safari needs the timeout
-        // iOS and Firefox need it called immediately
-        // to be on the save side we do both
-        var _self = this;
-        setTimeout(function() {
-            _self.textInput.focus();
-        });
-        this.textInput.focus();
-    };
-
-    this.isFocused = function() {
-        return this.textInput.isFocused();
-    };
-
-    this.blur = function() {
-        this.textInput.blur();
-    };
-
-    this.onFocus = function() {
-        this.renderer.showCursor();
-        this.renderer.visualizeFocus();
-        this._emit("focus");
-    };
-
-    this.onBlur = function() {
-        this.renderer.hideCursor();
-        this.renderer.visualizeBlur();
-        this._emit("blur");
-    };
-
-    this.onDocumentChange = function(e) {
-        var delta = e.data;
-        var range = delta.range;
-        var lastRow;
-
-        if (range.start.row == range.end.row && delta.action != "insertLines" && delta.action != "removeLines")
-            lastRow = range.end.row;
-        else
-            lastRow = Infinity;
-        this.renderer.updateLines(range.start.row, lastRow);
-
-        this._emit("change", e);
-
-        // update cursor because tab characters can influence the cursor position
-        this.onCursorChange();
-    };
-
-    this.onTokenizerUpdate = function(e) {
-        var rows = e.data;
-        this.renderer.updateLines(rows.first, rows.last);
-    };
-
-    this.onScrollTopChange = function() {
-        this.renderer.scrollToY(this.session.getScrollTop());
-    };
-
-    this.onScrollLeftChange = function() {
-        this.renderer.scrollToX(this.session.getScrollLeft());
-    };
-
-    this.onCursorChange = function() {
-        this.renderer.updateCursor();
-
-        if (!this.$blockScrolling) {
-            this.renderer.scrollCursorIntoView();
-        }
-
-        // move text input over the cursor
-        // this is required for iOS and IME
-        this.renderer.moveTextAreaToCursor(this.textInput.getElement());
-
-        this.$highlightBrackets();
-        this.$updateHighlightActiveLine();
-    };
-
-    this.$updateHighlightActiveLine = function() {
-        var session = this.getSession();
-
-        if (session.$highlightLineMarker)
-            session.removeMarker(session.$highlightLineMarker);
-        if (typeof this.$lastrow == "number")
-            this.renderer.removeGutterDecoration(this.$lastrow, "ace_gutter_active_line");
-
-        session.$highlightLineMarker = null;
-        this.$lastrow = null;
-
-        if (this.getHighlightActiveLine()) {
-            var cursor = this.getCursorPosition(),
-                foldLine = this.session.getFoldLine(cursor.row);
-
-            if ((this.getSelectionStyle() != "line" || !this.selection.isMultiLine())) {
-                var range;
-                if (foldLine) {
-                    range = new Range(foldLine.start.row, 0, foldLine.end.row + 1, 0);
-                } else {
-                    range = new Range(cursor.row, 0, cursor.row+1, 0);
-                }
-                session.$highlightLineMarker = session.addMarker(range, "ace_active_line", "background");
-            }
-
-            this.renderer.addGutterDecoration(this.$lastrow = cursor.row, "ace_gutter_active_line");
-        }
-    };
-
-    this.onSelectionChange = function(e) {
-        var session = this.getSession();
-
-        if (session.$selectionMarker) {
-            session.removeMarker(session.$selectionMarker);
-        }
-        session.$selectionMarker = null;
-
-        if (!this.selection.isEmpty()) {
-            var range = this.selection.getRange();
-            var style = this.getSelectionStyle();
-            session.$selectionMarker = session.addMarker(range, "ace_selection", style);
-        } else {
-            this.$updateHighlightActiveLine();
-        }
-
-        if (this.$highlightSelectedWord)
-            this.session.getMode().highlightSelection(this);
-    };
-
-    this.onChangeFrontMarker = function() {
-        this.renderer.updateFrontMarkers();
-    };
-
-    this.onChangeBackMarker = function() {
-        this.renderer.updateBackMarkers();
-    };
-
-    this.onChangeBreakpoint = function() {
-        this.renderer.setBreakpoints(this.session.getBreakpoints());
-    };
-
-    this.onChangeAnnotation = function() {
-        this.renderer.setAnnotations(this.session.getAnnotations());
-    };
-
-    this.onChangeMode = function() {
-        this.renderer.updateText();
-    };
-
-    this.onChangeWrapLimit = function() {
-        this.renderer.updateFull();
-    };
-
-    this.onChangeWrapMode = function() {
-        this.renderer.onResize(true);
-    };
-
-    this.onChangeFold = function() {
-        // Update the active line marker as due to folding changes the current
-        // line range on the screen might have changed.
-        this.$updateHighlightActiveLine();
-        // TODO: This might be too much updating. Okay for now.
-        this.renderer.updateFull();
-    };
-
-    this.getCopyText = function() {
-        var text = "";
-        if (!this.selection.isEmpty())
-            text = this.session.getTextRange(this.getSelectionRange());
-
-        this._emit("copy", text);
-        return text;
-    };
-
-    this.onCut = function() {
-        this.commands.exec("cut", this);
-    };
-
-    this.insert = function(text) {
-        var session = this.session;
-        var mode = session.getMode();
-
-        var cursor = this.getCursorPosition();
-
-        if (this.getBehavioursEnabled()) {
-            // Get a transform if the current mode wants one.
-            var transform = mode.transformAction(session.getState(cursor.row), 'insertion', this, session, text);
-            if (transform)
-                text = transform.text;
-        }
-
-        text = text.replace("\t", this.session.getTabString());
-
-        // remove selected text
-        if (!this.selection.isEmpty()) {
-            cursor = this.session.remove(this.getSelectionRange());
-            this.clearSelection();
-        }
-        else if (this.session.getOverwrite()) {
-            var range = new Range.fromPoints(cursor, cursor);
-            range.end.column += text.length;
-            this.session.remove(range);
-        }
-
-        this.clearSelection();
-
-        var start = cursor.column;
-        var lineState = session.getState(cursor.row);
-        var shouldOutdent = mode.checkOutdent(lineState, session.getLine(cursor.row), text);
-        var line = session.getLine(cursor.row);
-        var lineIndent = mode.getNextLineIndent(lineState, line.slice(0, cursor.column), session.getTabString());
-        var end = session.insert(cursor, text);
-
-        if (transform && transform.selection) {
-            if (transform.selection.length == 2) { // Transform relative to the current column
-                this.selection.setSelectionRange(
-                    new Range(cursor.row, start + transform.selection[0],
-                              cursor.row, start + transform.selection[1]));
-            } else { // Transform relative to the current row.
-                this.selection.setSelectionRange(
-                    new Range(cursor.row + transform.selection[0],
-                              transform.selection[1],
-                              cursor.row + transform.selection[2],
-                              transform.selection[3]));
-            }
-        }
-
-        var lineState = session.getState(cursor.row);
-
-        // TODO disabled multiline auto indent
-        // possibly doing the indent before inserting the text
-        // if (cursor.row !== end.row) {
-        if (session.getDocument().isNewLine(text)) {
-            this.moveCursorTo(cursor.row+1, 0);
-
-            var size = session.getTabSize();
-            var minIndent = Number.MAX_VALUE;
-
-            for (var row = cursor.row + 1; row <= end.row; ++row) {
-                var indent = 0;
-
-                line = session.getLine(row);
-                for (var i = 0; i < line.length; ++i)
-                    if (line.charAt(i) == '\t')
-                        indent += size;
-                    else if (line.charAt(i) == ' ')
-                        indent += 1;
-                    else
-                        break;
-                if (/[^\s]/.test(line))
-                    minIndent = Math.min(indent, minIndent);
-            }
-
-            for (var row = cursor.row + 1; row <= end.row; ++row) {
-                var outdent = minIndent;
-
-                line = session.getLine(row);
-                for (var i = 0; i < line.length && outdent > 0; ++i)
-                    if (line.charAt(i) == '\t')
-                        outdent -= size;
-                    else if (line.charAt(i) == ' ')
-                        outdent -= 1;
-                session.remove(new Range(row, 0, row, i));
-            }
-            session.indentRows(cursor.row + 1, end.row, lineIndent);
-        }
-        if (shouldOutdent)
-            mode.autoOutdent(lineState, session, cursor.row);
-    };
-
-    this.onTextInput = function(text, pasted) {
-        if (pasted)
-            this._emit("paste", text);
-
-        this.keyBinding.onTextInput(text, pasted);
-    };
-
-    this.onCommandKey = function(e, hashId, keyCode) {
-        this.keyBinding.onCommandKey(e, hashId, keyCode);
-    };
-
-    this.setOverwrite = function(overwrite) {
-        this.session.setOverwrite(overwrite);
-    };
-
-    this.getOverwrite = function() {
-        return this.session.getOverwrite();
-    };
-
-    this.toggleOverwrite = function() {
-        this.session.toggleOverwrite();
-    };
-
-    this.setScrollSpeed = function(speed) {
-        this.$mouseHandler.setScrollSpeed(speed);
-    };
-
-    this.getScrollSpeed = function() {
-        return this.$mouseHandler.getScrollSpeed();
-    };
-
-    this.setDragDelay = function(dragDelay) {
-        this.$mouseHandler.setDragDelay(dragDelay);
-    };
-
-    this.getDragDelay = function() {
-        return this.$mouseHandler.getDragDelay();
-    };
-
-    this.$selectionStyle = "line";
-    this.setSelectionStyle = function(style) {
-        if (this.$selectionStyle == style) return;
-
-        this.$selectionStyle = style;
-        this.onSelectionChange();
-        this._emit("changeSelectionStyle", {data: style});
-    };
-
-    this.getSelectionStyle = function() {
-        return this.$selectionStyle;
-    };
-
-    this.$highlightActiveLine = true;
-    this.setHighlightActiveLine = function(shouldHighlight) {
-        if (this.$highlightActiveLine == shouldHighlight) return;
-
-        this.$highlightActiveLine = shouldHighlight;
-        this.$updateHighlightActiveLine();
-    };
-
-    this.getHighlightActiveLine = function() {
-        return this.$highlightActiveLine;
-    };
-
-    this.$highlightSelectedWord = true;
-    this.setHighlightSelectedWord = function(shouldHighlight) {
-        if (this.$highlightSelectedWord == shouldHighlight)
-            return;
-
-        this.$highlightSelectedWord = shouldHighlight;
-        if (shouldHighlight)
-            this.session.getMode().highlightSelection(this);
-        else
-            this.session.getMode().clearSelectionHighlight(this);
-    };
-
-    this.getHighlightSelectedWord = function() {
-        return this.$highlightSelectedWord;
-    };
-
-    this.setAnimatedScroll = function(shouldAnimate){
-        this.renderer.setAnimatedScroll(shouldAnimate);
-    };
-
-    this.getAnimatedScroll = function(){
-        return this.renderer.getAnimatedScroll();
-    };
-
-    this.setShowInvisibles = function(showInvisibles) {
-        if (this.getShowInvisibles() == showInvisibles)
-            return;
-
-        this.renderer.setShowInvisibles(showInvisibles);
-    };
-
-    this.getShowInvisibles = function() {
-        return this.renderer.getShowInvisibles();
-    };
-
-    this.setShowPrintMargin = function(showPrintMargin) {
-        this.renderer.setShowPrintMargin(showPrintMargin);
-    };
-
-    this.getShowPrintMargin = function() {
-        return this.renderer.getShowPrintMargin();
-    };
-
-    this.setPrintMarginColumn = function(showPrintMargin) {
-        this.renderer.setPrintMarginColumn(showPrintMargin);
-    };
-
-    this.getPrintMarginColumn = function() {
-        return this.renderer.getPrintMarginColumn();
-    };
-
-    this.$readOnly = false;
-    this.setReadOnly = function(readOnly) {
-        this.$readOnly = readOnly;
-    };
-
-    this.getReadOnly = function() {
-        return this.$readOnly;
-    };
-
-    this.$modeBehaviours = true;
-    this.setBehavioursEnabled = function (enabled) {
-        this.$modeBehaviours = enabled;
-    };
-
-    this.getBehavioursEnabled = function () {
-        return this.$modeBehaviours;
-    };
-
-    this.setShowFoldWidgets = function(show) {
-        var gutter = this.renderer.$gutterLayer;
-        if (gutter.getShowFoldWidgets() == show)
-            return;
-
-        this.renderer.$gutterLayer.setShowFoldWidgets(show);
-        this.$showFoldWidgets = show;
-        this.renderer.updateFull();
-    };
-
-    this.getShowFoldWidgets = function() {
-        return this.renderer.$gutterLayer.getShowFoldWidgets();
-    };
-
-    this.remove = function(dir) {
-        if (this.selection.isEmpty()){
-            if(dir == "left")
-                this.selection.selectLeft();
-            else
-                this.selection.selectRight();
-        }
-
-        var range = this.getSelectionRange();
-        if (this.getBehavioursEnabled()) {
-            var session = this.session;
-            var state = session.getState(range.start.row);
-            var new_range = session.getMode().transformAction(state, 'deletion', this, session, range);
-            if (new_range)
-                range = new_range;
-        }
-
-        this.session.remove(range);
-        this.clearSelection();
-    };
-
-    this.removeWordRight = function() {
-        if (this.selection.isEmpty())
-            this.selection.selectWordRight();
-
-        this.session.remove(this.getSelectionRange());
-        this.clearSelection();
-    };
-
-    this.removeWordLeft = function() {
-        if (this.selection.isEmpty())
-            this.selection.selectWordLeft();
-
-        this.session.remove(this.getSelectionRange());
-        this.clearSelection();
-    };
-
-    this.removeToLineStart = function() {
-        if (this.selection.isEmpty())
-            this.selection.selectLineStart();
-
-        this.session.remove(this.getSelectionRange());
-        this.clearSelection();
-    };
-
-    this.removeToLineEnd = function() {
-        if (this.selection.isEmpty())
-            this.selection.selectLineEnd();
-
-        var range = this.getSelectionRange();
-        if (range.start.column == range.end.column && range.start.row == range.end.row) {
-            range.end.column = 0;
-            range.end.row++;
-        }
-
-        this.session.remove(range);
-        this.clearSelection();
-    };
-
-    this.splitLine = function() {
-        if (!this.selection.isEmpty()) {
-            this.session.remove(this.getSelectionRange());
-            this.clearSelection();
-        }
-
-        var cursor = this.getCursorPosition();
-        this.insert("\n");
-        this.moveCursorToPosition(cursor);
-    };
-
-    this.transposeLetters = function() {
-        if (!this.selection.isEmpty()) {
-            return;
-        }
-
-        var cursor = this.getCursorPosition();
-        var column = cursor.column;
-        if (column === 0)
-            return;
-
-        var line = this.session.getLine(cursor.row);
-        var swap, range;
-        if (column < line.length) {
-            swap = line.charAt(column) + line.charAt(column-1);
-            range = new Range(cursor.row, column-1, cursor.row, column+1);
-        }
-        else {
-            swap = line.charAt(column-1) + line.charAt(column-2);
-            range = new Range(cursor.row, column-2, cursor.row, column);
-        }
-        this.session.replace(range, swap);
-    };
-
-    this.toLowerCase = function() {
-        var originalRange = this.getSelectionRange();
-        if (this.selection.isEmpty()) {
-            this.selection.selectWord();
-        }
-
-        var range = this.getSelectionRange();
-        var text = this.session.getTextRange(range);
-        this.session.replace(range, text.toLowerCase());
-        this.selection.setSelectionRange(originalRange);
-    };
-
-    this.toUpperCase = function() {
-        var originalRange = this.getSelectionRange();
-        if (this.selection.isEmpty()) {
-            this.selection.selectWord();
-        }
-
-        var range = this.getSelectionRange();
-        var text = this.session.getTextRange(range);
-        this.session.replace(range, text.toUpperCase());
-        this.selection.setSelectionRange(originalRange);
-    };
-
-    this.indent = function() {
-        var session = this.session;
-        var range = this.getSelectionRange();
-
-        if (range.start.row < range.end.row || range.start.column < range.end.column) {
-            var rows = this.$getSelectedRows();
-            session.indentRows(rows.first, rows.last, "\t");
-        } else {
-            var indentString;
-
-            if (this.session.getUseSoftTabs()) {
-                var size        = session.getTabSize(),
-                    position    = this.getCursorPosition(),
-                    column      = session.documentToScreenColumn(position.row, position.column),
-                    count       = (size - column % size);
-
-                indentString = lang.stringRepeat(" ", count);
-            } else
-                indentString = "\t";
-            return this.insert(indentString);
-        }
-    };
-
-    this.blockOutdent = function() {
-        var selection = this.session.getSelection();
-        this.session.outdentRows(selection.getRange());
-    };
-
-    this.toggleCommentLines = function() {
-        var state = this.session.getState(this.getCursorPosition().row);
-        var rows = this.$getSelectedRows();
-        this.session.getMode().toggleCommentLines(state, this.session, rows.first, rows.last);
-    };
-
-    this.removeLines = function() {
-        var rows = this.$getSelectedRows();
-        var range;
-        if (rows.first === 0 || rows.last+1 < this.session.getLength())
-            range = new Range(rows.first, 0, rows.last+1, 0);
-        else
-            range = new Range(
-                rows.first-1, this.session.getLine(rows.first-1).length,
-                rows.last, this.session.getLine(rows.last).length
-            );
-        this.session.remove(range);
-        this.clearSelection();
-    };
-
-    this.moveLinesDown = function() {
-        this.$moveLines(function(firstRow, lastRow) {
-            return this.session.moveLinesDown(firstRow, lastRow);
-        });
-    };
-
-    this.moveLinesUp = function() {
-        this.$moveLines(function(firstRow, lastRow) {
-            return this.session.moveLinesUp(firstRow, lastRow);
-        });
-    };
-
-    this.moveText = function(range, toPosition) {
-        if (this.$readOnly)
-            return null;
-
-        return this.session.moveText(range, toPosition);
-    };
-
-    this.copyLinesUp = function() {
-        this.$moveLines(function(firstRow, lastRow) {
-            this.session.duplicateLines(firstRow, lastRow);
-            return 0;
-        });
-    };
-
-    this.copyLinesDown = function() {
-        this.$moveLines(function(firstRow, lastRow) {
-            return this.session.duplicateLines(firstRow, lastRow);
-        });
-    };
-
-
-    this.$moveLines = function(mover) {
-        var rows = this.$getSelectedRows();
-        var selection = this.selection;
-        if (!selection.isMultiLine()) {
-            var range = selection.getRange();
-            var reverse = selection.isBackwards();
-        }
-
-        var linesMoved = mover.call(this, rows.first, rows.last);
-
-        if (range) {
-            range.start.row += linesMoved;
-            range.end.row += linesMoved;
-            selection.setSelectionRange(range, reverse);
-        }
-        else {
-            selection.setSelectionAnchor(rows.last+linesMoved+1, 0);
-            selection.$moveSelection(function() {
-                selection.moveCursorTo(rows.first+linesMoved, 0);
-            });
-        }
-    };
-
-    this.$getSelectedRows = function() {
-        var range = this.getSelectionRange().collapseRows();
-
-        return {
-            first: range.start.row,
-            last: range.end.row
-        };
-    };
-
-    this.onCompositionStart = function(text) {
-        this.renderer.showComposition(this.getCursorPosition());
-    };
-
-    this.onCompositionUpdate = function(text) {
-        this.renderer.setCompositionText(text);
-    };
-
-    this.onCompositionEnd = function() {
-        this.renderer.hideComposition();
-    };
-
-    this.getFirstVisibleRow = function() {
-        return this.renderer.getFirstVisibleRow();
-    };
-
-    this.getLastVisibleRow = function() {
-        return this.renderer.getLastVisibleRow();
-    };
-
-    this.isRowVisible = function(row) {
-        return (row >= this.getFirstVisibleRow() && row <= this.getLastVisibleRow());
-    };
-
-    this.isRowFullyVisible = function(row) {
-        return (row >= this.renderer.getFirstFullyVisibleRow() && row <= this.renderer.getLastFullyVisibleRow());
-    };
-
-    this.$getVisibleRowCount = function() {
-        return this.renderer.getScrollBottomRow() - this.renderer.getScrollTopRow() + 1;
-    };
-
-    this.$getPageDownRow = function() {
-        return this.renderer.getScrollBottomRow();
-    };
-
-    this.$getPageUpRow = function() {
-        var firstRow = this.renderer.getScrollTopRow();
-        var lastRow = this.renderer.getScrollBottomRow();
-
-        return firstRow - (lastRow - firstRow);
-    };
-
-    this.selectPageDown = function() {
-        var row = this.$getPageDownRow() + Math.floor(this.$getVisibleRowCount() / 2);
-
-        this.scrollPageDown();
-
-        var selection = this.getSelection();
-        var leadScreenPos = this.session.documentToScreenPosition(selection.getSelectionLead());
-        var dest = this.session.screenToDocumentPosition(row, leadScreenPos.column);
-        selection.selectTo(dest.row, dest.column);
-    };
-
-    this.selectPageUp = function() {
-        var visibleRows = this.renderer.getScrollTopRow() - this.renderer.getScrollBottomRow();
-        var row = this.$getPageUpRow() + Math.round(visibleRows / 2);
-
-        this.scrollPageUp();
-
-        var selection = this.getSelection();
-        var leadScreenPos = this.session.documentToScreenPosition(selection.getSelectionLead());
-        var dest = this.session.screenToDocumentPosition(row, leadScreenPos.column);
-        selection.selectTo(dest.row, dest.column);
-    };
-
-    this.gotoPageDown = function() {
-        var row = this.$getPageDownRow();
-        var column = this.getCursorPositionScreen().column;
-
-        this.scrollToRow(row);
-        this.getSelection().moveCursorToScreen(row, column);
-    };
-
-    this.gotoPageUp = function() {
-        var row = this.$getPageUpRow();
-        var column = this.getCursorPositionScreen().column;
-
-       this.scrollToRow(row);
-       this.getSelection().moveCursorToScreen(row, column);
-    };
-
-    this.scrollPageDown = function() {
-        this.scrollToRow(this.$getPageDownRow());
-    };
-
-    this.scrollPageUp = function() {
-        this.renderer.scrollToRow(this.$getPageUpRow());
-    };
-
-    this.scrollToRow = function(row) {
-        this.renderer.scrollToRow(row);
-    };
-
-    this.scrollToLine = function(line, center) {
-        this.renderer.scrollToLine(line, center);
-    };
-
-    this.centerSelection = function() {
-        var range = this.getSelectionRange();
-        var line = Math.floor(range.start.row + (range.end.row - range.start.row) / 2);
-        this.renderer.scrollToLine(line, true);
-    };
-
-    this.getCursorPosition = function() {
-        return this.selection.getCursor();
-    };
-
-    this.getCursorPositionScreen = function() {
-        return this.session.documentToScreenPosition(this.getCursorPosition());
-    };
-
-    this.getSelectionRange = function() {
-        return this.selection.getRange();
-    };
-
-
-    this.selectAll = function() {
-        this.$blockScrolling += 1;
-        this.selection.selectAll();
-        this.$blockScrolling -= 1;
-    };
-
-    this.clearSelection = function() {
-        this.selection.clearSelection();
-    };
-
-    this.moveCursorTo = function(row, column) {
-        this.selection.moveCursorTo(row, column);
-    };
-
-    this.moveCursorToPosition = function(pos) {
-        this.selection.moveCursorToPosition(pos);
-    };
-
-    this.jumpToMatching = function() {
-        var cursor = this.getCursorPosition();
-        var pos = this.session.findMatchingBracket(cursor);
-        if (!pos) {
-            cursor.column += 1;
-            pos = this.session.findMatchingBracket(cursor);
-        }
-        if (!pos) {
-            cursor.column -= 2;
-            pos = this.session.findMatchingBracket(cursor);
-        }
-
-        if (pos) {
-            this.clearSelection();
-            this.moveCursorTo(pos.row, pos.column);
-        }
-    };
-
-    this.gotoLine = function(lineNumber, column) {
-        this.selection.clearSelection();
-        this.session.unfold({row: lineNumber - 1, column: column || 0});
-
-        this.$blockScrolling += 1;
-        this.moveCursorTo(lineNumber-1, column || 0);
-        this.$blockScrolling -= 1;
-        if (!this.isRowFullyVisible(this.getCursorPosition().row))
-            this.scrollToLine(lineNumber, true);
-    };
-
-    this.navigateTo = function(row, column) {
-        this.clearSelection();
-        this.moveCursorTo(row, column);
-    };
-
-    this.navigateUp = function(times) {
-        this.selection.clearSelection();
-        times = times || 1;
-        this.selection.moveCursorBy(-times, 0);
-    };
-
-    this.navigateDown = function(times) {
-        this.selection.clearSelection();
-        times = times || 1;
-        this.selection.moveCursorBy(times, 0);
-    };
-
-    this.navigateLeft = function(times) {
-        if (!this.selection.isEmpty()) {
-            var selectionStart = this.getSelectionRange().start;
-            this.moveCursorToPosition(selectionStart);
-        }
-        else {
-            times = times || 1;
-            while (times--) {
-                this.selection.moveCursorLeft();
-            }
-        }
-        this.clearSelection();
-    };
-
-    this.navigateRight = function(times) {
-        if (!this.selection.isEmpty()) {
-            var selectionEnd = this.getSelectionRange().end;
-            this.moveCursorToPosition(selectionEnd);
-        }
-        else {
-            times = times || 1;
-            while (times--) {
-                this.selection.moveCursorRight();
-            }
-        }
-        this.clearSelection();
-    };
-
-    this.navigateLineStart = function() {
-        this.selection.moveCursorLineStart();
-        this.clearSelection();
-    };
-
-    this.navigateLineEnd = function() {
-        this.selection.moveCursorLineEnd();
-        this.clearSelection();
-    };
-
-    this.navigateFileEnd = function() {
-        this.selection.moveCursorFileEnd();
-        this.clearSelection();
-    };
-
-    this.navigateFileStart = function() {
-        this.selection.moveCursorFileStart();
-        this.clearSelection();
-    };
-
-    this.navigateWordRight = function() {
-        this.selection.moveCursorWordRight();
-        this.clearSelection();
-    };
-
-    this.navigateWordLeft = function() {
-        this.selection.moveCursorWordLeft();
-        this.clearSelection();
-    };
-
-    this.replace = function(replacement, options) {
-        if (options)
-            this.$search.set(options);
-
-        var range = this.$search.find(this.session);
-        var replaced = 0;
-        if (!range)
-            return replaced;
-
-        if (this.$tryReplace(range, replacement)) {
-            replaced = 1;
-        }
-        if (range !== null) {
-            this.selection.setSelectionRange(range);
-            this.renderer.scrollSelectionIntoView(range.start, range.end);
-        }
-
-        return replaced;
-    };
-
-    this.replaceAll = function(replacement, options) {
-        if (options) {
-            this.$search.set(options);
-        }
-
-        var ranges = this.$search.findAll(this.session);
-        var replaced = 0;
-        if (!ranges.length)
-            return replaced;
-
-        var selection = this.getSelectionRange();
-        this.clearSelection();
-        this.selection.moveCursorTo(0, 0);
-
-        this.$blockScrolling += 1;
-        for (var i = ranges.length - 1; i >= 0; --i) {
-            if(this.$tryReplace(ranges[i], replacement)) {
-                replaced++;
-            }
-        }
-
-        this.selection.setSelectionRange(selection);
-        this.$blockScrolling -= 1;
-
-        return replaced;
-    };
-
-    this.$tryReplace = function(range, replacement) {
-        var input = this.session.getTextRange(range);
-        replacement = this.$search.replace(input, replacement);
-        if (replacement !== null) {
-            range.end = this.session.replace(range, replacement);
-            return range;
-        } else {
-            return null;
-        }
-    };
-
-    this.getLastSearchOptions = function() {
-        return this.$search.getOptions();
-    };
-
-    this.find = function(needle, options) {
-        this.clearSelection();
-        options = options || {};
-        options.needle = needle;
-        this.$search.set(options);
-        this.$find();
-    };
-
-    this.findNext = function(options) {
-        options = options || {};
-        if (typeof options.backwards == "undefined")
-            options.backwards = false;
-        this.$search.set(options);
-        this.$find();
-    };
-
-    this.findPrevious = function(options) {
-        options = options || {};
-        if (typeof options.backwards == "undefined")
-            options.backwards = true;
-        this.$search.set(options);
-        this.$find();
-    };
-
-    this.$find = function(backwards) {
-        if (!this.selection.isEmpty())
-            this.$search.set({needle: this.session.getTextRange(this.getSelectionRange())});
-
-        if (typeof backwards != "undefined")
-            this.$search.set({backwards: backwards});
-
-        var range = this.$search.find(this.session);
-        if (range) {
-            this.session.unfold(range);
-
-            this.$blockScrolling += 1;
-            this.selection.setSelectionRange(range);
-            this.$blockScrolling -= 1;
-
-            if (this.getAnimatedScroll()) {
-                var cursor = this.getCursorPosition();
-                if (!this.isRowFullyVisible(cursor.row))
-                    this.scrollToLine(cursor.row, true);
-    
-                //@todo scroll X
-                //if (!this.isColumnFullyVisible(cursor.column))
-                    //this.scrollToRow(cursor.column);
-            }
-            else {
-                this.renderer.scrollSelectionIntoView(range.start, range.end);
-            }
-        }
-    };
-
-    this.undo = function() {
-        this.session.getUndoManager().undo();
-    };
-
-    this.redo = function() {
-        this.session.getUndoManager().redo();
-    };
-
-    this.destroy = function() {
-        this.renderer.destroy();
-    };
-
-}).call(Editor.prototype);
-
-
-exports.Editor = Editor;
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/lib/lang', ['require', 'exports', 'module' ], function(require, exports, module) {
-"use strict";
-
-exports.stringReverse = function(string) {
-    return string.split("").reverse().join("");
-};
-
-exports.stringRepeat = function (string, count) {
-     return new Array(count + 1).join(string);
-};
-
-var trimBeginRegexp = /^\s\s*/;
-var trimEndRegexp = /\s\s*$/;
-
-exports.stringTrimLeft = function (string) {
-    return string.replace(trimBeginRegexp, '');
-};
-
-exports.stringTrimRight = function (string) {
-    return string.replace(trimEndRegexp, '');
-};
-
-exports.copyObject = function(obj) {
-    var copy = {};
-    for (var key in obj) {
-        copy[key] = obj[key];
-    }
-    return copy;
-};
-
-exports.copyArray = function(array){
-    var copy = [];
-    for (var i=0, l=array.length; i<l; i++) {
-        if (array[i] && typeof array[i] == "object")
-            copy[i] = this.copyObject( array[i] );
-        else 
-            copy[i] = array[i];
-    }
-    return copy;
-};
-
-exports.deepCopy = function (obj) {
-    if (typeof obj != "object") {
-        return obj;
-    }
-    
-    var copy = obj.constructor();
-    for (var key in obj) {
-        if (typeof obj[key] == "object") {
-            copy[key] = this.deepCopy(obj[key]);
-        } else {
-            copy[key] = obj[key];
-        }
-    }
-    return copy;
-};
-
-exports.arrayToMap = function(arr) {
-    var map = {};
-    for (var i=0; i<arr.length; i++) {
-        map[arr[i]] = 1;
-    }
-    return map;
-
-};
-
-/**
- * splice out of 'array' anything that === 'value'
- */
-exports.arrayRemove = function(array, value) {
-  for (var i = 0; i <= array.length; i++) {
-    if (value === array[i]) {
-      array.splice(i, 1);
-    }
-  }
-};
-
-exports.escapeRegExp = function(str) {
-    return str.replace(/([.*+?^${}()|[\]\/\\])/g, '\\$1');
-};
-
-exports.deferredCall = function(fcn) {
-
-    var timer = null;
-    var callback = function() {
-        timer = null;
-        fcn();
-    };
-
-    var deferred = function(timeout) {
-        deferred.cancel();
-        timer = setTimeout(callback, timeout || 0);
-        return deferred;
-    };
-
-    deferred.schedule = deferred;
-
-    deferred.call = function() {
-        this.cancel();
-        fcn();
-        return deferred;
-    };
-
-    deferred.cancel = function() {
-        clearTimeout(timer);
-        timer = null;
-        return deferred;
-    };
-
-    return deferred;
-};
-
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Mihai Sucan <mihai DOT sucan AT gmail DOT com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/keyboard/textinput', ['require', 'exports', 'module' , 'ace/lib/event', 'ace/lib/useragent', 'ace/lib/dom'], function(require, exports, module) {
-"use strict";
-
-var event = require("../lib/event");
-var useragent = require("../lib/useragent");
-var dom = require("../lib/dom");
-
-var TextInput = function(parentNode, host) {
-
-    var text = dom.createElement("textarea");
-    if (useragent.isTouchPad)
-        text.setAttribute("x-palm-disable-auto-cap", true);
-        
-    text.style.left = "-10000px";
-    text.style.position = "fixed";
-    parentNode.insertBefore(text, parentNode.firstChild);
-
-    var PLACEHOLDER = String.fromCharCode(0);
-    sendText();
-
-    var inCompostion = false;
-    var copied = false;
-    var pasted = false;
-    var tempStyle = '';
-
-    function select() {
-        try {
-            text.select();
-        } catch (e) {}
-    }
-
-    function sendText(valueToSend) {
-        if (!copied) {
-            var value = valueToSend || text.value;
-            if (value) {
-                if (value.charCodeAt(value.length-1) == PLACEHOLDER.charCodeAt(0)) {
-                    value = value.slice(0, -1);
-                    if (value)
-                        host.onTextInput(value, pasted);
-                }
-                else {
-                    host.onTextInput(value, pasted);
-                }
-
-                // If editor is no longer focused we quit immediately, since
-                // it means that something else is in charge now.
-                if (!isFocused())
-                    return false;
-            }
-        }
-
-        copied = false;
-        pasted = false;
-
-        // Safari doesn't fire copy events if no text is selected
-        text.value = PLACEHOLDER;
-        select();
-    }
-
-    var onTextInput = function(e) {
-        setTimeout(function () {
-            if (!inCompostion)
-                sendText(e.data);                
-        }, 0);
-    };
-    
-    var onPropertyChange = function(e) {
-        if (useragent.isOldIE && text.value.charCodeAt(0) > 128) return;
-        setTimeout(function() {
-            if (!inCompostion)
-                sendText();
-        }, 0);
-    };
-
-    var onCompositionStart = function(e) {
-        inCompostion = true;
-        host.onCompositionStart();
-        if (!useragent.isGecko) setTimeout(onCompositionUpdate, 0);
-    };
-
-    var onCompositionUpdate = function() {
-        if (!inCompostion) return;
-        host.onCompositionUpdate(text.value);
-    };
-
-    var onCompositionEnd = function(e) {
-        inCompostion = false;
-        host.onCompositionEnd();
-    };
-
-    var onCopy = function(e) {
-        copied = true;
-        var copyText = host.getCopyText();
-        if(copyText)
-            text.value = copyText;
-        else
-            e.preventDefault();
-        select();
-        setTimeout(function () {
-            sendText();
-        }, 0);
-    };
-    
-    var onCut = function(e) {
-        copied = true;
-        var copyText = host.getCopyText();
-        if(copyText) {
-            text.value = copyText;
-            host.onCut();
-        } else
-            e.preventDefault();
-        select();
-        setTimeout(function () {
-            sendText();
-        }, 0);
-    };
-
-    event.addCommandKeyListener(text, host.onCommandKey.bind(host));
-    if (useragent.isOldIE) {
-        var keytable = { 13:1, 27:1 };
-        event.addListener(text, "keyup", function (e) {
-            if (inCompostion && (!text.value || keytable[e.keyCode]))
-                setTimeout(onCompositionEnd, 0);
-            if ((text.value.charCodeAt(0)|0) < 129) {
-                return;
-            }
-            inCompostion ? onCompositionUpdate() : onCompositionStart();
-        });
-    }
-    
-    if ("onpropertychange" in text && !("oninput" in text))
-        event.addListener(text, "propertychange", onPropertyChange);
-    else
-        event.addListener(text, "input", onTextInput);
-    
-    event.addListener(text, "paste", function(e) {
-        // Mark that the next input text comes from past.
-        pasted = true;
-        // Some browsers support the event.clipboardData API. Use this to get
-        // the pasted content which increases speed if pasting a lot of lines.
-        if (e.clipboardData && e.clipboardData.getData) {
-            sendText(e.clipboardData.getData("text/plain"));
-            e.preventDefault();
-        } 
-        else {
-            // If a browser doesn't support any of the things above, use the regular
-            // method to detect the pasted input.
-            onPropertyChange();
-        }
-    });
-
-    if ("onbeforecopy" in text && typeof clipboardData !== "undefined") {
-        event.addListener(text, "beforecopy", function(e) {
-            var copyText = host.getCopyText();
-            if (copyText)
-                clipboardData.setData("Text", copyText);
-            else
-                e.preventDefault();
-        });
-        event.addListener(parentNode, "keydown", function(e) {
-            if (e.ctrlKey && e.keyCode == 88) {
-                var copyText = host.getCopyText();
-                if (copyText) {
-                    clipboardData.setData("Text", copyText);
-                    host.onCut();
-                }
-                event.preventDefault(e);
-            }
-        });
-    }
-    else {
-        event.addListener(text, "copy", onCopy);
-        event.addListener(text, "cut", onCut);
-    }
-
-    event.addListener(text, "compositionstart", onCompositionStart);
-    if (useragent.isGecko) {
-        event.addListener(text, "text", onCompositionUpdate);
-    }
-    if (useragent.isWebKit) {
-        event.addListener(text, "keyup", onCompositionUpdate);
-    }
-    event.addListener(text, "compositionend", onCompositionEnd);
-
-    event.addListener(text, "blur", function() {
-        host.onBlur();
-    });
-
-    event.addListener(text, "focus", function() {
-        host.onFocus();
-        select();
-    });
-
-    this.focus = function() {
-        host.onFocus();
-        select();
-        text.focus();
-    };
-
-    this.blur = function() {
-        text.blur();
-    };
-
-    function isFocused() {
-        return document.activeElement === text;
-    }
-    this.isFocused = isFocused;
-
-    this.getElement = function() {
-        return text;
-    };
-
-    this.onContextMenu = function(mousePos, isEmpty){
-        if (mousePos) {
-            if (!tempStyle)
-                tempStyle = text.style.cssText;
-                
-            text.style.cssText = 
-                'position:fixed; z-index:1000;' +
-                'left:' + (mousePos.x - 2) + 'px; top:' + (mousePos.y - 2) + 'px;';
-
-        }
-        if (isEmpty)
-            text.value='';
-    };
-
-    this.onContextMenuClose = function(){
-        setTimeout(function () {
-            if (tempStyle) {
-                text.style.cssText = tempStyle;
-                tempStyle = '';
-            }
-            sendText();
-        }, 0);
-    };
-};
-
-exports.TextInput = TextInput;
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Mihai Sucan <mihai DOT sucan AT gmail DOT com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mouse/mouse_handler', ['require', 'exports', 'module' , 'ace/lib/event', 'ace/mouse/default_handlers', 'ace/mouse/default_gutter_handler', 'ace/mouse/mouse_event'], function(require, exports, module) {
-"use strict";
-
-var event = require("../lib/event");
-var DefaultHandlers = require("./default_handlers").DefaultHandlers;
-var DefaultGutterHandler = require("./default_gutter_handler").GutterHandler;
-var MouseEvent = require("./mouse_event").MouseEvent;
-
-var MouseHandler = function(editor) {
-    this.editor = editor;
-    
-    new DefaultHandlers(editor);
-    new DefaultGutterHandler(editor);
-    
-    event.addListener(editor.container, "mousedown", function(e) {
-        editor.focus();
-        return event.preventDefault(e);
-    });
-    event.addListener(editor.container, "selectstart", function(e) {
-        return event.preventDefault(e);
-    });
-
-    var mouseTarget = editor.renderer.getMouseEventTarget();
-    event.addListener(mouseTarget, "mousedown", this.onMouseEvent.bind(this, "mousedown"));
-    event.addListener(mouseTarget, "click", this.onMouseEvent.bind(this, "click"));
-    event.addListener(mouseTarget, "mousemove", this.onMouseMove.bind(this, "mousemove"));
-    event.addMultiMouseDownListener(mouseTarget, 0, 2, 500, this.onMouseEvent.bind(this, "dblclick"));
-    event.addMultiMouseDownListener(mouseTarget, 0, 3, 600, this.onMouseEvent.bind(this, "tripleclick"));
-    event.addMultiMouseDownListener(mouseTarget, 0, 4, 600, this.onMouseEvent.bind(this, "quadclick"));
-    event.addMouseWheelListener(editor.container, this.onMouseWheel.bind(this, "mousewheel"));
-    
-    var gutterEl = editor.renderer.$gutter;
-    event.addListener(gutterEl, "mousedown", this.onMouseEvent.bind(this, "guttermousedown"));
-    event.addListener(gutterEl, "click", this.onMouseEvent.bind(this, "gutterclick"));
-    event.addListener(gutterEl, "dblclick", this.onMouseEvent.bind(this, "gutterdblclick"));
-    event.addListener(gutterEl, "mousemove", this.onMouseMove.bind(this, "gutter"));
-};
-
-(function() {
-
-    this.$scrollSpeed = 1;
-    this.setScrollSpeed = function(speed) {
-        this.$scrollSpeed = speed;
-    };
-
-    this.getScrollSpeed = function() {
-        return this.$scrollSpeed;
-    };
-
-    this.onMouseEvent = function(name, e) {
-        this.editor._emit(name, new MouseEvent(e, this.editor));
-    };
-    
-    this.$dragDelay = 250;
-    this.setDragDelay = function(dragDelay) {
-        this.$dragDelay = dragDelay;
-    };
-
-    this.getDragDelay = function() {
-        return this.$dragDelay;
-    };
-
-    this.onMouseMove = function(name, e) {
-        // optimization, because mousemove doesn't have a default handler.
-        var listeners = this.editor._eventRegistry && this.editor._eventRegistry.mousemove;
-        if (!listeners || !listeners.length)
-            return;
-
-        this.editor._emit(name, new MouseEvent(e, this.editor));
-    };
-
-    this.onMouseWheel = function(name, e) {
-        var mouseEvent = new MouseEvent(e, this.editor);
-        mouseEvent.speed = this.$scrollSpeed * 2;
-        mouseEvent.wheelX = e.wheelX;
-        mouseEvent.wheelY = e.wheelY;
-        
-        this.editor._emit(name, mouseEvent);
-    };
-
-}).call(MouseHandler.prototype);
-
-exports.MouseHandler = MouseHandler;
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Mike de Boer <mike AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mouse/default_handlers', ['require', 'exports', 'module' , 'ace/lib/event', 'ace/lib/dom', 'ace/lib/browser_focus'], function(require, exports, module) {
-"use strict";
-
-var event = require("../lib/event");
-var dom = require("../lib/dom");
-var BrowserFocus = require("../lib/browser_focus").BrowserFocus;
-
-var STATE_UNKNOWN = 0;
-var STATE_SELECT = 1;
-var STATE_DRAG = 2;
-
-var DRAG_OFFSET = 5; // pixels
-
-function DefaultHandlers(editor) {
-    this.editor = editor;
-    this.$clickSelection = null;
-    this.browserFocus = new BrowserFocus();
-
-    editor.setDefaultHandler("mousedown", this.onMouseDown.bind(this));
-    editor.setDefaultHandler("dblclick", this.onDoubleClick.bind(this));
-    editor.setDefaultHandler("tripleclick", this.onTripleClick.bind(this));
-    editor.setDefaultHandler("quadclick", this.onQuadClick.bind(this));
-    editor.setDefaultHandler("mousewheel", this.onScroll.bind(this));
-}
-
-(function() {
-    
-    this.onMouseDown = function(ev) {
-        var inSelection = ev.inSelection();
-        var pageX = ev.pageX;
-        var pageY = ev.pageY;
-        var pos = ev.getDocumentPosition();
-        var editor = this.editor;
-        var _self = this;
-        
-        var selectionRange = editor.getSelectionRange();
-        var selectionEmpty = selectionRange.isEmpty();
-        var state = STATE_UNKNOWN;
-        
-        // if this click caused the editor to be focused should not clear the
-        // selection
-        if (
-            inSelection && (
-                !this.browserFocus.isFocused()
-                || new Date().getTime() - this.browserFocus.lastFocus < 20
-                || !editor.isFocused()
-            )
-        ) {
-            editor.focus();
-            return;
-        }
-
-        var button = ev.getButton();
-        if (button !== 0) {
-            if (selectionEmpty) {
-                editor.moveCursorToPosition(pos);
-            }
-            if (button == 2) {
-                editor.textInput.onContextMenu({x: ev.clientX, y: ev.clientY}, selectionEmpty);
-                event.capture(editor.container, function(){}, editor.textInput.onContextMenuClose);
-            }
-            return;
-        }
-
-        if (!inSelection) {
-            // Directly pick STATE_SELECT, since the user is not clicking inside
-            // a selection.
-            onStartSelect(pos);
-        }
-
-        var mousePageX = pageX, mousePageY = pageY;
-        var mousedownTime = (new Date()).getTime();
-        var dragCursor, dragRange, dragSelectionMarker;
-
-        var onMouseSelection = function(e) {
-            mousePageX = event.getDocumentX(e);
-            mousePageY = event.getDocumentY(e);
-        };
-
-        var onMouseSelectionEnd = function(e) {
-            clearInterval(timerId);
-            if (state == STATE_UNKNOWN)
-                onStartSelect(pos);
-            else if (state == STATE_DRAG)
-                onMouseDragSelectionEnd(e);
-
-            _self.$clickSelection = null;
-            state = STATE_UNKNOWN;
-        };
-
-        var onMouseDragSelectionEnd = function(e) {
-            dom.removeCssClass(editor.container, "ace_dragging");
-            editor.session.removeMarker(dragSelectionMarker);
-
-            if (!editor.$mouseHandler.$clickSelection) {
-                if (!dragCursor) {
-                    editor.moveCursorToPosition(pos);
-                    editor.selection.clearSelection();
-                }
-            }
-
-            if (!dragCursor)
-                return;
-
-            if (dragRange.contains(dragCursor.row, dragCursor.column)) {
-                dragCursor = null;
-                return;
-            }
-
-            editor.clearSelection();
-            if (e && (e.ctrlKey || e.altKey)) {
-                var session = editor.session;
-                var newRange = session.insert(dragCursor, session.getTextRange(dragRange));
-            } else {
-                var newRange = editor.moveText(dragRange, dragCursor);
-            }
-            if (!newRange) {
-                dragCursor = null;
-                return;
-            }
-
-            editor.selection.setSelectionRange(newRange);
-        };
-
-        var onSelectionInterval = function() {
-            if (state == STATE_UNKNOWN) {
-                var distance = calcDistance(pageX, pageY, mousePageX, mousePageY);
-                var time = (new Date()).getTime();
-
-                if (distance > DRAG_OFFSET) {
-                    state = STATE_SELECT;
-                    var cursor = editor.renderer.screenToTextCoordinates(mousePageX, mousePageY);
-                    onStartSelect(cursor);
-                }
-                else if ((time - mousedownTime) > editor.getDragDelay()) {
-                    state = STATE_DRAG;
-                    dragRange = editor.getSelectionRange();
-                    var style = editor.getSelectionStyle();
-                    dragSelectionMarker = editor.session.addMarker(dragRange, "ace_selection", style);
-                    editor.clearSelection();
-                    dom.addCssClass(editor.container, "ace_dragging");
-                }
-
-            }
-
-            if (state == STATE_DRAG)
-                onDragSelectionInterval();
-            else if (state == STATE_SELECT)
-                onUpdateSelectionInterval();
-        };
-
-        function onStartSelect(pos) {
-            if (ev.getShiftKey()) {
-                editor.selection.selectToPosition(pos);
-            }
-            else {
-                if (!_self.$clickSelection) {
-                    editor.moveCursorToPosition(pos);
-                    editor.selection.clearSelection();
-                }
-            }
-            state = STATE_SELECT;
-        }
-
-        var onUpdateSelectionInterval = function() {
-            var anchor;
-            var cursor = editor.renderer.screenToTextCoordinates(mousePageX, mousePageY);
-
-            if (_self.$clickSelection) {
-                if (_self.$clickSelection.contains(cursor.row, cursor.column)) {
-                    editor.selection.setSelectionRange(_self.$clickSelection);
-                }
-                else {
-                    if (_self.$clickSelection.compare(cursor.row, cursor.column) == -1) {
-                        anchor = _self.$clickSelection.end;
-                    }
-                    else {
-                        anchor = _self.$clickSelection.start;
-                    }
-                    editor.selection.setSelectionAnchor(anchor.row, anchor.column);
-                    editor.selection.selectToPosition(cursor);
-                }
-            }
-            else {
-                editor.selection.selectToPosition(cursor);
-            }
-
-            editor.renderer.scrollCursorIntoView();
-        };
-
-        var onDragSelectionInterval = function() {
-            dragCursor = editor.renderer.screenToTextCoordinates(mousePageX, mousePageY);
-            editor.moveCursorToPosition(dragCursor);
-        };
-
-        event.capture(editor.container, onMouseSelection, onMouseSelectionEnd);
-        var timerId = setInterval(onSelectionInterval, 20);
-
-        return ev.preventDefault();
-    };
-    
-    this.onDoubleClick = function(ev) {
-        var pos = ev.getDocumentPosition();
-        var editor = this.editor;
-        
-        editor.moveCursorToPosition(pos);
-        editor.selection.selectWord();
-        this.$clickSelection = editor.getSelectionRange();
-    };
-    
-    this.onTripleClick = function(ev) {
-        var pos = ev.getDocumentPosition();
-        var editor = this.editor;
-        
-        editor.moveCursorToPosition(pos);
-        editor.selection.selectLine();
-        this.$clickSelection = editor.getSelectionRange();
-    };
-    
-    this.onQuadClick = function(ev) {
-        var editor = this.editor;
-        
-        editor.selectAll();
-        this.$clickSelection = editor.getSelectionRange();
-    };
-    
-    this.onScroll = function(ev) {
-        var editor = this.editor;
-        
-        editor.renderer.scrollBy(ev.wheelX * ev.speed, ev.wheelY * ev.speed);
-        if (editor.renderer.isScrollableBy(ev.wheelX * ev.speed, ev.wheelY * ev.speed))
-            return ev.preventDefault();
-    };
-    
-}).call(DefaultHandlers.prototype);
-
-exports.DefaultHandlers = DefaultHandlers;
-
-function calcDistance(ax, ay, bx, by) {
-    return Math.sqrt(Math.pow(bx - ax, 2) + Math.pow(by - ay, 2));
-}
-
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Irakli Gozalishvili <rfobic@gmail.com> (http://jeditoolkit.com)
- *      Julian Viereck <julian.viereck@gmail.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/lib/browser_focus', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/event', 'ace/lib/event_emitter'], function(require, exports, module) {
-"use strict";
-
-var oop = require("./oop");
-var event = require("./event");
-var EventEmitter = require("./event_emitter").EventEmitter;
-
-/**
- * This class keeps track of the focus state of the given window.
- * Focus changes for example when the user switches a browser tab,
- * goes to the location bar or switches to another application.
- */ 
-var BrowserFocus = function(win) {
-    win = win || window;
-    
-    this.lastFocus = new Date().getTime();
-    this._isFocused = true;
-    
-    var _self = this;
-
-    // IE < 9 supports focusin and focusout events
-    if ("onfocusin" in win.document) {
-        event.addListener(win.document, "focusin", function(e) {
-            _self._setFocused(true);
-        });
-
-        event.addListener(win.document, "focusout", function(e) {
-            _self._setFocused(!!e.toElement);
-        });
-    }
-    else {
-        event.addListener(win, "blur", function(e) {
-            _self._setFocused(false);
-        });
-
-        event.addListener(win, "focus", function(e) {
-            _self._setFocused(true);
-        });
-    }
-};
-
-(function(){
-
-    oop.implement(this, EventEmitter);
-    
-    this.isFocused = function() {
-        return this._isFocused;
-    };
-    
-    this._setFocused = function(isFocused) {
-        if (this._isFocused == isFocused)
-            return;
-            
-        if (isFocused)
-            this.lastFocus = new Date().getTime();
-            
-        this._isFocused = isFocused;
-        this._emit("changeFocus");
-    };
-
-}).call(BrowserFocus.prototype);
-
-
-exports.BrowserFocus = BrowserFocus;
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Irakli Gozalishvili <rfobic@gmail.com> (http://jeditoolkit.com)
- *      Mike de Boer <mike AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/lib/event_emitter', ['require', 'exports', 'module' ], function(require, exports, module) {
-"use strict";
-
-var EventEmitter = {};
-
-EventEmitter._emit =
-EventEmitter._dispatchEvent = function(eventName, e) {
-    this._eventRegistry = this._eventRegistry || {};
-    this._defaultHandlers = this._defaultHandlers || {};
-
-    var listeners = this._eventRegistry[eventName] || [];
-    var defaultHandler = this._defaultHandlers[eventName];
-    if (!listeners.length && !defaultHandler)
-        return;
-
-    e = e || {};
-    e.type = eventName;
-    
-    if (!e.stopPropagation) {
-        e.stopPropagation = function() {
-            this.propagationStopped = true;
-        };
-    }
-    
-    if (!e.preventDefault) {
-        e.preventDefault = function() {
-            this.defaultPrevented = true;
-        };
-    }
-
-    for (var i=0; i<listeners.length; i++) {
-        listeners[i](e);
-        if (e.propagationStopped)
-            break;
-    }
-    
-    if (defaultHandler && !e.defaultPrevented)
-        defaultHandler(e);
-};
-
-EventEmitter.setDefaultHandler = function(eventName, callback) {
-    this._defaultHandlers = this._defaultHandlers || {};
-    
-    if (this._defaultHandlers[eventName])
-        throw new Error("The default handler for '" + eventName + "' is already set");
-        
-    this._defaultHandlers[eventName] = callback;
-};
-
-EventEmitter.on =
-EventEmitter.addEventListener = function(eventName, callback) {
-    this._eventRegistry = this._eventRegistry || {};
-
-    var listeners = this._eventRegistry[eventName];
-    if (!listeners)
-        var listeners = this._eventRegistry[eventName] = [];
-
-    if (listeners.indexOf(callback) == -1)
-        listeners.push(callback);
-};
-
-EventEmitter.removeListener =
-EventEmitter.removeEventListener = function(eventName, callback) {
-    this._eventRegistry = this._eventRegistry || {};
-
-    var listeners = this._eventRegistry[eventName];
-    if (!listeners)
-        return;
-
-    var index = listeners.indexOf(callback);
-    if (index !== -1)
-        listeners.splice(index, 1);
-};
-
-EventEmitter.removeAllListeners = function(eventName) {
-    if (this._eventRegistry) this._eventRegistry[eventName] = [];
-};
-
-exports.EventEmitter = EventEmitter;
-
-});/* vim:ts=4:sts=4:sw=4:
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mouse/default_gutter_handler', ['require', 'exports', 'module' ], function(require, exports, module) {
-"use strict";
-
-function GutterHandler(editor) {
-    editor.setDefaultHandler("gutterclick", function(e) {
-        var row = e.getDocumentPosition().row;
-        var selection = editor.session.selection;
-        
-        selection.moveCursorTo(row, 0);
-        selection.selectLine();
-    });
-}
-
-exports.GutterHandler = GutterHandler;
-
-});/* vim:ts=4:sts=4:sw=4:
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mouse/mouse_event', ['require', 'exports', 'module' , 'ace/lib/event'], function(require, exports, module) {
-"use strict";
-
-var event = require("../lib/event");
-
-/**
- * Custom Ace mouse event
- */
-var MouseEvent = exports.MouseEvent = function(domEvent, editor) {
-    this.domEvent = domEvent;
-    this.editor = editor;
-    
-    this.pageX = event.getDocumentX(domEvent);
-    this.pageY = event.getDocumentY(domEvent);
-    
-    this.clientX = domEvent.clientX;
-    this.clientY = domEvent.clientY;
-
-    this.$pos = null;
-    this.$inSelection = null;
-    
-    this.propagationStopped = false;
-    this.defaultPrevented = false;
-};
-
-(function() {  
-    
-    this.stopPropagation = function() {
-        event.stopPropagation(this.domEvent);
-        this.propagationStopped = true;
-    };
-    
-    this.preventDefault = function() {
-        event.preventDefault(this.domEvent);
-        this.defaultPrevented = true;
-    };
-    
-    this.stop = function() {
-        this.stopPropagation();
-        this.preventDefault();
-    };
-
-    /**
-     * Get the document position below the mouse cursor
-     * 
-     * @return {Object} 'row' and 'column' of the document position
-     */
-    this.getDocumentPosition = function() {
-        if (this.$pos)
-            return this.$pos;
-            
-        var pageX = event.getDocumentX(this.domEvent);
-        var pageY = event.getDocumentY(this.domEvent);
-        this.$pos = this.editor.renderer.screenToTextCoordinates(pageX, pageY);
-        return this.$pos;
-    };
-    
-    /**
-     * Check if the mouse cursor is inside of the text selection
-     * 
-     * @return {Boolean} whether the mouse cursor is inside of the selection
-     */
-    this.inSelection = function() {
-        if (this.$inSelection !== null)
-            return this.$inSelection;
-            
-        var editor = this.editor;
-        
-        if (editor.getReadOnly()) {
-            this.$inSelection = false;
-        }
-        else {
-            var selectionRange = editor.getSelectionRange();
-            if (selectionRange.isEmpty())
-                this.$inSelection = false;
-            else {
-                var pos = this.getDocumentPosition();
-                this.$inSelection = selectionRange.contains(pos.row, pos.column);
-            }
-        }
-        return this.$inSelection;
-    };
-    
-    /**
-     * Get the clicked mouse button
-     * 
-     * @return {Number} 0 for left button, 1 for middle button, 2 for right button
-     */
-    this.getButton = function() {
-        return event.getButton(this.domEvent);
-    };
-    
-    /**
-     * @return {Boolean} whether the shift key was pressed when the event was emitted
-     */
-    this.getShiftKey = function() {
-        return this.domEvent.shiftKey;
-    };
-    
-    this.getAccelKey = function() {
-        return this.domEvent.ctrlKey || this.domEvent.metaKey ;
-    };
-    
-}).call(MouseEvent.prototype);
-
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mouse/fold_handler', ['require', 'exports', 'module' ], function(require, exports, module) {
-"use strict";
-
-function FoldHandler(editor) {
-    
-    editor.on("click", function(e) {
-        var position = e.getDocumentPosition();
-        var session = editor.session;
-        
-        // If the user clicked on a fold, then expand it.
-        var fold = session.getFoldAt(position.row, position.column, 1);
-        if (fold) {
-            if (e.getAccelKey())
-                session.removeFold(fold);
-            else
-                session.expandFold(fold);
-                
-            e.stop();
-        }
-    });
-    
-    editor.on("gutterclick", function(e) {
-        if (e.domEvent.target.className.indexOf("ace_fold-widget") != -1) {
-            var row = e.getDocumentPosition().row;
-            editor.session.onFoldWidgetClick(row, e.domEvent);
-            e.stop();
-        }
-    });
-}
-
-exports.FoldHandler = FoldHandler;
-
-});/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Julian Viereck <julian.viereck@gmail.com>
- *      Harutyun Amirjanyan <amirjanyan@gmail.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/keyboard/keybinding', ['require', 'exports', 'module' , 'ace/lib/keys', 'ace/lib/event', 'ace/commands/default_commands'], function(require, exports, module) {
-"use strict";
-
-var keyUtil  = require("../lib/keys");
-var event = require("../lib/event");
-require("../commands/default_commands");
-
-var KeyBinding = function(editor) {
-    this.$editor = editor;
-    this.$data = { };
-    this.$handlers = [this];
-};
-
-(function() {
-    this.setKeyboardHandler = function(keyboardHandler) {
-        if (this.$handlers[this.$handlers.length - 1] == keyboardHandler)
-            return;
-        this.$data = { };
-        this.$handlers = keyboardHandler ? [this, keyboardHandler] : [this];
-    };
-
-    this.addKeyboardHandler = function(keyboardHandler) {
-        this.removeKeyboardHandler(keyboardHandler);
-        this.$handlers.push(keyboardHandler);
-    };
-
-    this.removeKeyboardHandler = function(keyboardHandler) {
-        var i = this.$handlers.indexOf(keyboardHandler);
-        if (i == -1)
-            return false;
-        this.$handlers.splice(i, 1);
-        return true;
-    };
-
-    this.getKeyboardHandler = function() {
-        return this.$handlers[this.$handlers.length - 1];
-    };
-
-    this.$callKeyboardHandlers = function (hashId, keyString, keyCode, e) {
-        var toExecute;
-        for (var i = this.$handlers.length; i--;) {
-            toExecute = this.$handlers[i].handleKeyboard(
-                this.$data, hashId, keyString, keyCode, e
-            );
-            if (toExecute && toExecute.command)
-                break;
-        }
-
-        if (!toExecute || !toExecute.command)
-            return false;
-
-        var success = false;
-        var commands = this.$editor.commands;
-
-        // allow keyboardHandler to consume keys
-        if (toExecute.command != "null")
-            success = commands.exec(toExecute.command, this.$editor, toExecute.args);
-        else
-            success = true;
-
-        if (success && e)
-            event.stopEvent(e);
-
-        return success;
-    };
-
-    this.handleKeyboard = function(data, hashId, keyString) {
-        return {
-            command: this.$editor.commands.findKeyCommand(hashId, keyString)
-        };
-    };
-
-    this.onCommandKey = function(e, hashId, keyCode) {
-        var keyString = keyUtil.keyCodeToString(keyCode);
-        this.$callKeyboardHandlers(hashId, keyString, keyCode, e);
-    };
-
-    this.onTextInput = function(text, pasted) {
-        var success = false;
-        if (!pasted && text.length == 1)
-            success = this.$callKeyboardHandlers(0, text);
-        if (!success)
-            this.$editor.commands.exec("insertstring", this.$editor, text);
-    };
-
-}).call(KeyBinding.prototype);
-
-exports.KeyBinding = KeyBinding;
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Julian Viereck <julian.viereck@gmail.com>
- *      Mihai Sucan <mihai.sucan@gmail.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/commands/default_commands', ['require', 'exports', 'module' , 'ace/lib/lang'], function(require, exports, module) {
-"use strict";
-
-var lang = require("../lib/lang");
-
-function bindKey(win, mac) {
-    return {
-        win: win,
-        mac: mac
-    };
-}
-
-exports.commands = [{
-    name: "selectall",
-    bindKey: bindKey("Ctrl-A", "Command-A"),
-    exec: function(editor) { editor.selectAll(); },
-    readOnly: true
-}, {
-    name: "centerselection",
-    bindKey: bindKey(null, "Ctrl-L"),
-    exec: function(editor) { editor.centerSelection(); },
-    readOnly: true
-}, {
-    name: "gotoline",
-    bindKey: bindKey("Ctrl-L", "Command-L"),
-    exec: function(editor) {
-        var line = parseInt(prompt("Enter line number:"), 10);
-        if (!isNaN(line)) {
-            editor.gotoLine(line);
-        }
-    },
-    readOnly: true
-}, {
-    name: "fold",
-    bindKey: bindKey("Alt-L", "Alt-L"),
-    exec: function(editor) { editor.session.toggleFold(false); },
-    readOnly: true
-}, {
-    name: "unfold",
-    bindKey: bindKey("Alt-Shift-L", "Alt-Shift-L"),
-    exec: function(editor) { editor.session.toggleFold(true); },
-    readOnly: true
-}, {
-    name: "foldall",
-    bindKey: bindKey("Alt-0", "Alt-0"),
-    exec: function(editor) { editor.session.foldAll(); },
-    readOnly: true
-}, {
-    name: "unfoldall",
-    bindKey: bindKey("Alt-Shift-0", "Alt-Shift-0"),
-    exec: function(editor) { editor.session.unfold(); },
-    readOnly: true
-}, {
-    name: "findnext",
-    bindKey: bindKey("Ctrl-K", "Command-G"),
-    exec: function(editor) { editor.findNext(); },
-    readOnly: true
-}, {
-    name: "findprevious",
-    bindKey: bindKey("Ctrl-Shift-K", "Command-Shift-G"),
-    exec: function(editor) { editor.findPrevious(); },
-    readOnly: true
-}, {
-    name: "find",
-    bindKey: bindKey("Ctrl-F", "Command-F"),
-    exec: function(editor) {
-        var needle = prompt("Find:", editor.getCopyText());
-        editor.find(needle);
-    },
-    readOnly: true
-}, {
-    name: "overwrite",
-    bindKey: bindKey("Insert", "Insert"),
-    exec: function(editor) { editor.toggleOverwrite(); },
-    readOnly: true
-}, {
-    name: "selecttostart",
-    bindKey: bindKey("Ctrl-Shift-Home|Alt-Shift-Up", "Command-Shift-Up"),
-    exec: function(editor) { editor.getSelection().selectFileStart(); },
-    readOnly: true
-}, {
-    name: "gotostart",
-    bindKey: bindKey("Ctrl-Home|Ctrl-Up", "Command-Home|Command-Up"),
-    exec: function(editor) { editor.navigateFileStart(); },
-    readOnly: true
-}, {
-    name: "selectup",
-    bindKey: bindKey("Shift-Up", "Shift-Up"),
-    exec: function(editor) { editor.getSelection().selectUp(); },
-    multiSelectAction: "forEach",
-    readOnly: true
-}, {
-    name: "golineup",
-    bindKey: bindKey("Up", "Up|Ctrl-P"),
-    exec: function(editor, args) { editor.navigateUp(args.times); },
-    multiSelectAction: "forEach",
-    readOnly: true
-}, {
-    name: "selecttoend",
-    bindKey: bindKey("Ctrl-Shift-End|Alt-Shift-Down", "Command-Shift-Down"),
-    exec: function(editor) { editor.getSelection().selectFileEnd(); },
-    multiSelectAction: "forEach",
-    readOnly: true
-}, {
-    name: "gotoend",
-    bindKey: bindKey("Ctrl-End|Ctrl-Down", "Command-End|Command-Down"),
-    exec: function(editor) { editor.navigateFileEnd(); },
-    multiSelectAction: "forEach",
-    readOnly: true
-}, {
-    name: "selectdown",
-    bindKey: bindKey("Shift-Down", "Shift-Down"),
-    exec: function(editor) { editor.getSelection().selectDown(); },
-    multiSelectAction: "forEach",
-    readOnly: true
-}, {
-    name: "golinedown",
-    bindKey: bindKey("Down", "Down|Ctrl-N"),
-    exec: function(editor, args) { editor.navigateDown(args.times); },
-    multiSelectAction: "forEach",
-    readOnly: true
-}, {
-    name: "selectwordleft",
-    bindKey: bindKey("Ctrl-Shift-Left", "Option-Shift-Left"),
-    exec: function(editor) { editor.getSelection().selectWordLeft(); },
-    multiSelectAction: "forEach",
-    readOnly: true
-}, {
-    name: "gotowordleft",
-    bindKey: bindKey("Ctrl-Left", "Option-Left"),
-    exec: function(editor) { editor.navigateWordLeft(); },
-    multiSelectAction: "forEach",
-    readOnly: true
-}, {
-    name: "selecttolinestart",
-    bindKey: bindKey("Alt-Shift-Left", "Command-Shift-Left"),
-    exec: function(editor) { editor.getSelection().selectLineStart(); },
-    multiSelectAction: "forEach",
-    readOnly: true
-}, {
-    name: "gotolinestart",
-    bindKey: bindKey("Alt-Left|Home", "Command-Left|Home|Ctrl-A"),
-    exec: function(editor) { editor.navigateLineStart(); },
-    multiSelectAction: "forEach",
-    readOnly: true
-}, {
-    name: "selectleft",
-    bindKey: bindKey("Shift-Left", "Shift-Left"),
-    exec: function(editor) { editor.getSelection().selectLeft(); },
-    multiSelectAction: "forEach",
-    readOnly: true
-}, {
-    name: "gotoleft",
-    bindKey: bindKey("Left", "Left|Ctrl-B"),
-    exec: function(editor, args) { editor.navigateLeft(args.times); },
-    multiSelectAction: "forEach",
-    readOnly: true
-}, {
-    name: "selectwordright",
-    bindKey: bindKey("Ctrl-Shift-Right", "Option-Shift-Right"),
-    exec: function(editor) { editor.getSelection().selectWordRight(); },
-    multiSelectAction: "forEach",
-    readOnly: true
-}, {
-    name: "gotowordright",
-    bindKey: bindKey("Ctrl-Right", "Option-Right"),
-    exec: function(editor) { editor.navigateWordRight(); },
-    multiSelectAction: "forEach",
-    readOnly: true
-}, {
-    name: "selecttolineend",
-    bindKey: bindKey("Alt-Shift-Right", "Command-Shift-Right"),
-    exec: function(editor) { editor.getSelection().selectLineEnd(); },
-    multiSelectAction: "forEach",
-    readOnly: true
-}, {
-    name: "gotolineend",
-    bindKey: bindKey("Alt-Right|End", "Command-Right|End|Ctrl-E"),
-    exec: function(editor) { editor.navigateLineEnd(); },
-    multiSelectAction: "forEach",
-    readOnly: true
-}, {
-    name: "selectright",
-    bindKey: bindKey("Shift-Right", "Shift-Right"),
-    exec: function(editor) { editor.getSelection().selectRight(); },
-    multiSelectAction: "forEach",
-    readOnly: true
-}, {
-    name: "gotoright",
-    bindKey: bindKey("Right", "Right|Ctrl-F"),
-    exec: function(editor, args) { editor.navigateRight(args.times); },
-    multiSelectAction: "forEach",
-    readOnly: true
-}, {
-    name: "selectpagedown",
-    bindKey: bindKey("Shift-PageDown", "Shift-PageDown"),
-    exec: function(editor) { editor.selectPageDown(); },
-    readOnly: true
-}, {
-    name: "pagedown",
-    bindKey: bindKey(null, "PageDown"),
-    exec: function(editor) { editor.scrollPageDown(); },
-    readOnly: true
-}, {
-    name: "gotopagedown",
-    bindKey: bindKey("PageDown", "Option-PageDown|Ctrl-V"),
-    exec: function(editor) { editor.gotoPageDown(); },
-    readOnly: true
-}, {
-    name: "selectpageup",
-    bindKey: bindKey("Shift-PageUp", "Shift-PageUp"),
-    exec: function(editor) { editor.selectPageUp(); },
-    readOnly: true
-}, {
-    name: "pageup",
-    bindKey: bindKey(null, "PageUp"),
-    exec: function(editor) { editor.scrollPageUp(); },
-    readOnly: true
-}, {
-    name: "gotopageup",
-    bindKey: bindKey("PageUp", "Option-PageUp"),
-    exec: function(editor) { editor.gotoPageUp(); },
-    readOnly: true
-}, {
-    name: "selectlinestart",
-    bindKey: bindKey("Shift-Home", "Shift-Home"),
-    exec: function(editor) { editor.getSelection().selectLineStart(); },
-    multiSelectAction: "forEach",
-    readOnly: true
-}, {
-    name: "selectlineend",
-    bindKey: bindKey("Shift-End", "Shift-End"),
-    exec: function(editor) { editor.getSelection().selectLineEnd(); },
-    multiSelectAction: "forEach",
-    readOnly: true
-}, {
-    name: "togglerecording",
-    bindKey: bindKey("Ctrl-Alt-E", "Command-Option-E"),
-    exec: function(editor) { editor.commands.toggleRecording(); },
-    readOnly: true
-}, {
-    name: "replaymacro",
-    bindKey: bindKey("Ctrl-Shift-E", "Command-Shift-E"),
-    exec: function(editor) { editor.commands.replay(editor); },
-    readOnly: true
-}, {
-    name: "jumptomatching",
-    bindKey: bindKey("Ctrl-Shift-P", "Ctrl-Shift-P"),
-    exec: function(editor) { editor.jumpToMatching(); },
-    multiSelectAction: "forEach",
-    readOnly: true
-}, 
-
-// commands disabled in readOnly mode
-{
-    name: "cut",
-    exec: function(editor) {
-        var range = editor.getSelectionRange();
-        editor._emit("cut", range);
-
-        if (!editor.selection.isEmpty()) {
-            editor.session.remove(range);
-            editor.clearSelection();
-        }
-    },
-    multiSelectAction: "forEach"
-}, {
-    name: "removeline",
-    bindKey: bindKey("Ctrl-D", "Command-D"),
-    exec: function(editor) { editor.removeLines(); },
-    multiSelectAction: "forEach"
-}, {
-    name: "togglecomment",
-    bindKey: bindKey("Ctrl-7", "Command-7"),
-    exec: function(editor) { editor.toggleCommentLines(); },
-    multiSelectAction: "forEach"
-}, {
-    name: "replace",
-    bindKey: bindKey("Ctrl-R", "Command-Option-F"),
-    exec: function(editor) {
-        var needle = prompt("Find:", editor.getCopyText());
-        if (!needle)
-            return;
-        var replacement = prompt("Replacement:");
-        if (!replacement)
-            return;
-        editor.replace(replacement, {needle: needle});
-    }
-}, {
-    name: "replaceall",
-    bindKey: bindKey("Ctrl-Shift-R", "Command-Shift-Option-F"),
-    exec: function(editor) {
-        var needle = prompt("Find:");
-        if (!needle)
-            return;
-        var replacement = prompt("Replacement:");
-        if (!replacement)
-            return;
-        editor.replaceAll(replacement, {needle: needle});
-    }
-}, {
-    name: "undo",
-    bindKey: bindKey("Ctrl-Z", "Command-Z"),
-    exec: function(editor) { editor.undo(); }
-}, {
-    name: "redo",
-    bindKey: bindKey("Ctrl-Shift-Z|Ctrl-Y", "Command-Shift-Z|Command-Y"),
-    exec: function(editor) { editor.redo(); }
-}, {
-    name: "copylinesup",
-    bindKey: bindKey("Ctrl-Alt-Up", "Command-Option-Up"),
-    exec: function(editor) { editor.copyLinesUp(); }
-}, {
-    name: "movelinesup",
-    bindKey: bindKey("Alt-Up", "Option-Up"),
-    exec: function(editor) { editor.moveLinesUp(); }
-}, {
-    name: "copylinesdown",
-    bindKey: bindKey("Ctrl-Alt-Down", "Command-Option-Down"),
-    exec: function(editor) { editor.copyLinesDown(); }
-}, {
-    name: "movelinesdown",
-    bindKey: bindKey("Alt-Down", "Option-Down"),
-    exec: function(editor) { editor.moveLinesDown(); }
-}, {
-    name: "del",
-    bindKey: bindKey("Delete", "Delete|Ctrl-D"),
-    exec: function(editor) { editor.remove("right"); },
-    multiSelectAction: "forEach"
-}, {
-    name: "backspace",
-    bindKey: bindKey(
-        "Command-Backspace|Option-Backspace|Shift-Backspace|Backspace",
-        "Ctrl-Backspace|Command-Backspace|Shift-Backspace|Backspace|Ctrl-H"
-    ),
-    exec: function(editor) { editor.remove("left"); },
-    multiSelectAction: "forEach"
-}, {
-    name: "removetolinestart",
-    bindKey: bindKey("Alt-Backspace", "Command-Backspace"),
-    exec: function(editor) { editor.removeToLineStart(); },
-    multiSelectAction: "forEach"
-}, {
-    name: "removetolineend",
-    bindKey: bindKey("Alt-Delete", "Ctrl-K"),
-    exec: function(editor) { editor.removeToLineEnd(); },
-    multiSelectAction: "forEach"
-}, {
-    name: "removewordleft",
-    bindKey: bindKey("Ctrl-Backspace", "Alt-Backspace|Ctrl-Alt-Backspace"),
-    exec: function(editor) { editor.removeWordLeft(); },
-    multiSelectAction: "forEach"
-}, {
-    name: "removewordright",
-    bindKey: bindKey("Ctrl-Delete", "Alt-Delete"),
-    exec: function(editor) { editor.removeWordRight(); },
-    multiSelectAction: "forEach"
-}, {
-    name: "outdent",
-    bindKey: bindKey("Shift-Tab", "Shift-Tab"),
-    exec: function(editor) { editor.blockOutdent(); },
-    multiSelectAction: "forEach"
-}, {
-    name: "indent",
-    bindKey: bindKey("Tab", "Tab"),
-    exec: function(editor) { editor.indent(); },
-    multiSelectAction: "forEach"
-}, {
-    name: "insertstring",
-    exec: function(editor, str) { editor.insert(str); },
-    multiSelectAction: "forEach"
-}, {
-    name: "inserttext",
-    exec: function(editor, args) {
-        editor.insert(lang.stringRepeat(args.text  || "", args.times || 1));
-    },
-    multiSelectAction: "forEach"
-}, {
-    name: "splitline",
-    bindKey: bindKey(null, "Ctrl-O"),
-    exec: function(editor) { editor.splitLine(); },
-    multiSelectAction: "forEach"
-}, {
-    name: "transposeletters",
-    bindKey: bindKey("Ctrl-T", "Ctrl-T"),
-    exec: function(editor) { editor.transposeLetters(); },
-    multiSelectAction: function(editor) {editor.transposeSelections(1); }
-}, {
-    name: "touppercase",
-    bindKey: bindKey("Ctrl-U", "Ctrl-U"),
-    exec: function(editor) { editor.toUpperCase(); },
-    multiSelectAction: "forEach"
-}, {
-    name: "tolowercase",
-    bindKey: bindKey("Ctrl-Shift-U", "Ctrl-Shift-U"),
-    exec: function(editor) { editor.toLowerCase(); },
-    multiSelectAction: "forEach"
-}];
-
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Mihai Sucan <mihai DOT sucan AT gmail DOT com>
- *      Julian Viereck <julian DOT viereck AT gmail DOT com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/edit_session', ['require', 'exports', 'module' , 'ace/config', 'ace/lib/oop', 'ace/lib/lang', 'ace/lib/net', 'ace/lib/event_emitter', 'ace/selection', 'ace/mode/text', 'ace/range', 'ace/document', 'ace/background_tokenizer', 'ace/edit_session/folding', 'ace/edit_session/bracket_match'], function(require, exports, module) {
-"use strict";
-
-var config = require("./config");
-var oop = require("./lib/oop");
-var lang = require("./lib/lang");
-var net = require("./lib/net");
-var EventEmitter = require("./lib/event_emitter").EventEmitter;
-var Selection = require("./selection").Selection;
-var TextMode = require("./mode/text").Mode;
-var Range = require("./range").Range;
-var Document = require("./document").Document;
-var BackgroundTokenizer = require("./background_tokenizer").BackgroundTokenizer;
-
-var EditSession = function(text, mode) {
-    this.$modified = true;
-    this.$breakpoints = [];
-    this.$frontMarkers = {};
-    this.$backMarkers = {};
-    this.$markerId = 1;
-    this.$rowCache = [];
-    this.$wrapData = [];
-    this.$foldData = [];
-    this.$undoSelect = true;
-    this.$foldData.toString = function() {
-        var str = "";
-        this.forEach(function(foldLine) {
-            str += "\n" + foldLine.toString();
-        });
-        return str;
-    }
-
-    if (text instanceof Document) {
-        this.setDocument(text);
-    } else {
-        this.setDocument(new Document(text));
-    }
-
-    this.selection = new Selection(this);
-    if (mode)
-        this.setMode(mode);
-    else
-        this.setMode(new TextMode());
-};
-
-
-(function() {
-
-    oop.implement(this, EventEmitter);
-
-    this.setDocument = function(doc) {
-        if (this.doc)
-            throw new Error("Document is already set");
-
-        this.doc = doc;
-        doc.on("change", this.onChange.bind(this));
-        this.on("changeFold", this.onChangeFold.bind(this));
-
-        if (this.bgTokenizer) {
-            this.bgTokenizer.setDocument(this.getDocument());
-            this.bgTokenizer.start(0);
-        }
-    };
-
-    this.getDocument = function() {
-        return this.doc;
-    };
-
-    this.$resetRowCache = function(row) {
-        if (row == 0) {
-            this.$rowCache = [];
-            return;
-        }
-        var rowCache = this.$rowCache;
-        for (var i = 0; i < rowCache.length; i++) {
-            if (rowCache[i].docRow >= row) {
-                rowCache.splice(i, rowCache.length);
-                return;
-            }
-        }
-    };
-
-    this.onChangeFold = function(e) {
-        var fold = e.data;
-        this.$resetRowCache(fold.start.row);
-    };
-
-    this.onChange = function(e) {
-        var delta = e.data;
-        this.$modified = true;
-
-        this.$resetRowCache(delta.range.start.row);
-
-        var removedFolds = this.$updateInternalDataOnChange(e);
-        if (!this.$fromUndo && this.$undoManager && !delta.ignore) {
-            this.$deltasDoc.push(delta);
-            if (removedFolds && removedFolds.length != 0) {
-                this.$deltasFold.push({
-                    action: "removeFolds",
-                    folds:  removedFolds
-                });
-            }
-
-            this.$informUndoManager.schedule();
-        }
-
-        this.bgTokenizer.start(delta.range.start.row);
-        this._emit("change", e);
-    };
-
-    this.setValue = function(text) {
-        this.doc.setValue(text);
-        this.selection.moveCursorTo(0, 0);
-        this.selection.clearSelection();
-
-        this.$resetRowCache(0);
-        this.$deltas = [];
-        this.$deltasDoc = [];
-        this.$deltasFold = [];
-        this.getUndoManager().reset();
-    };
-
-    this.getValue =
-    this.toString = function() {
-        return this.doc.getValue();
-    };
-
-    this.getSelection = function() {
-        return this.selection;
-    };
-
-    this.getState = function(row) {
-        return this.bgTokenizer.getState(row);
-    };
-
-    this.getTokens = function(firstRow, lastRow) {
-        return this.bgTokenizer.getTokens(firstRow, lastRow);
-    };
-
-    this.getTokenAt = function(row, column) {
-        var tokens = this.bgTokenizer.getTokens(row, row)[0].tokens;
-        var token, c = 0;
-        if (column == null) {
-            i = tokens.length - 1;
-            c = this.getLine(row).length;
-        } else {
-            for (var i = 0; i < tokens.length; i++) {
-                c += tokens[i].value.length;
-                if (c >= column)
-                    break;
-            }
-        }
-        token = tokens[i];
-        if (!token)
-            return null;
-        token.index = i;
-        token.start = c - token.value.length;
-        return token;
-    };
-
-    this.setUndoManager = function(undoManager) {
-        this.$undoManager = undoManager;
-        this.$resetRowCache(0);
-        this.$deltas = [];
-        this.$deltasDoc = [];
-        this.$deltasFold = [];
-
-        if (this.$informUndoManager)
-            this.$informUndoManager.cancel();
-
-        if (undoManager) {
-            var self = this;
-            this.$syncInformUndoManager = function() {
-                self.$informUndoManager.cancel();
-
-                if (self.$deltasFold.length) {
-                    self.$deltas.push({
-                        group: "fold",
-                        deltas: self.$deltasFold
-                    });
-                    self.$deltasFold = [];
-                }
-
-                if (self.$deltasDoc.length) {
-                    self.$deltas.push({
-                        group: "doc",
-                        deltas: self.$deltasDoc
-                    });
-                    self.$deltasDoc = [];
-                }
-
-                if (self.$deltas.length > 0) {
-                    undoManager.execute({
-                        action: "aceupdate",
-                        args: [self.$deltas, self]
-                    });
-                }
-
-                self.$deltas = [];
-            }
-            this.$informUndoManager =
-                lang.deferredCall(this.$syncInformUndoManager);
-        }
-    };
-
-    this.$defaultUndoManager = {
-        undo: function() {},
-        redo: function() {},
-        reset: function() {}
-    };
-
-    this.getUndoManager = function() {
-        return this.$undoManager || this.$defaultUndoManager;
-    },
-
-    this.getTabString = function() {
-        if (this.getUseSoftTabs()) {
-            return lang.stringRepeat(" ", this.getTabSize());
-        } else {
-            return "\t";
-        }
-    };
-
-    this.$useSoftTabs = true;
-    this.setUseSoftTabs = function(useSoftTabs) {
-        if (this.$useSoftTabs === useSoftTabs) return;
-
-        this.$useSoftTabs = useSoftTabs;
-    };
-
-    this.getUseSoftTabs = function() {
-        return this.$useSoftTabs;
-    };
-
-    this.$tabSize = 4;
-    this.setTabSize = function(tabSize) {
-        if (isNaN(tabSize) || this.$tabSize === tabSize) return;
-
-        this.$modified = true;
-        this.$tabSize = tabSize;
-        this._emit("changeTabSize");
-    };
-
-    this.getTabSize = function() {
-        return this.$tabSize;
-    };
-
-    this.isTabStop = function(position) {
-        return this.$useSoftTabs && (position.column % this.$tabSize == 0);
-    };
-
-    this.$overwrite = false;
-    this.setOverwrite = function(overwrite) {
-        if (this.$overwrite == overwrite) return;
-
-        this.$overwrite = overwrite;
-        this._emit("changeOverwrite");
-    };
-
-    this.getOverwrite = function() {
-        return this.$overwrite;
-    };
-
-    this.toggleOverwrite = function() {
-        this.setOverwrite(!this.$overwrite);
-    };
-
-    this.getBreakpoints = function() {
-        return this.$breakpoints;
-    };
-
-    this.setBreakpoints = function(rows) {
-        this.$breakpoints = [];
-        for (var i=0; i<rows.length; i++) {
-            this.$breakpoints[rows[i]] = true;
-        }
-        this._emit("changeBreakpoint", {});
-    };
-
-    this.clearBreakpoints = function() {
-        this.$breakpoints = [];
-        this._emit("changeBreakpoint", {});
-    };
-
-    this.setBreakpoint = function(row) {
-        this.$breakpoints[row] = true;
-        this._emit("changeBreakpoint", {});
-    };
-
-    this.clearBreakpoint = function(row) {
-        delete this.$breakpoints[row];
-        this._emit("changeBreakpoint", {});
-    };
-
-    this.getBreakpoints = function() {
-        return this.$breakpoints;
-    };
-
-    this.addMarker = function(range, clazz, type, inFront) {
-        var id = this.$markerId++;
-
-        var marker = {
-            range : range,
-            type : type || "line",
-            renderer: typeof type == "function" ? type : null,
-            clazz : clazz,
-            inFront: !!inFront
-        }
-
-        if (inFront) {
-            this.$frontMarkers[id] = marker;
-            this._emit("changeFrontMarker")
-        } else {
-            this.$backMarkers[id] = marker;
-            this._emit("changeBackMarker")
-        }
-
-        return id;
-    };
-
-    this.removeMarker = function(markerId) {
-        var marker = this.$frontMarkers[markerId] || this.$backMarkers[markerId];
-        if (!marker)
-            return;
-
-        var markers = marker.inFront ? this.$frontMarkers : this.$backMarkers;
-        if (marker) {
-            delete (markers[markerId]);
-            this._emit(marker.inFront ? "changeFrontMarker" : "changeBackMarker");
-        }
-    };
-
-    this.getMarkers = function(inFront) {
-        return inFront ? this.$frontMarkers : this.$backMarkers;
-    };
-
-    /**
-     * Error:
-     *  {
-     *    row: 12,
-     *    column: 2, //can be undefined
-     *    text: "Missing argument",
-     *    type: "error" // or "warning" or "info"
-     *  }
-     */
-    this.setAnnotations = function(annotations) {
-        this.$annotations = {};
-        for (var i=0; i<annotations.length; i++) {
-            var annotation = annotations[i];
-            var row = annotation.row;
-            if (this.$annotations[row])
-                this.$annotations[row].push(annotation);
-            else
-                this.$annotations[row] = [annotation];
-        }
-        this._emit("changeAnnotation", {});
-    };
-
-    this.getAnnotations = function() {
-        return this.$annotations || {};
-    };
-
-    this.clearAnnotations = function() {
-        this.$annotations = {};
-        this._emit("changeAnnotation", {});
-    };
-
-    this.$detectNewLine = function(text) {
-        var match = text.match(/^.*?(\r?\n)/m);
-        if (match) {
-            this.$autoNewLine = match[1];
-        } else {
-            this.$autoNewLine = "\n";
-        }
-    };
-
-    this.getWordRange = function(row, column) {
-        var line = this.getLine(row);
-
-        var inToken = false;
-        if (column > 0) {
-            inToken = !!line.charAt(column - 1).match(this.tokenRe);
-        }
-
-        if (!inToken) {
-            inToken = !!line.charAt(column).match(this.tokenRe);
-        }
-
-        var re = inToken ? this.tokenRe : this.nonTokenRe;
-
-        var start = column;
-        if (start > 0) {
-            do {
-                start--;
-            }
-            while (start >= 0 && line.charAt(start).match(re));
-            start++;
-        }
-
-        var end = column;
-        while (end < line.length && line.charAt(end).match(re)) {
-            end++;
-        }
-
-        return new Range(row, start, row, end);
-    };
-
-    // Gets the range of a word including its right whitespace
-    this.getAWordRange = function(row, column) {
-        var wordRange = this.getWordRange(row, column);
-        var line = this.getLine(wordRange.end.row);
-
-        while (line.charAt(wordRange.end.column).match(/[ \t]/)) {
-            wordRange.end.column += 1;
-        }
-        return wordRange;
-    };
-
-    this.setNewLineMode = function(newLineMode) {
-        this.doc.setNewLineMode(newLineMode);
-    };
-
-    this.getNewLineMode = function() {
-        return this.doc.getNewLineMode();
-    };
-
-    this.$useWorker = true;
-    this.setUseWorker = function(useWorker) {
-        if (this.$useWorker == useWorker)
-            return;
-
-        this.$useWorker = useWorker;
-
-        this.$stopWorker();
-        if (useWorker)
-            this.$startWorker();
-    };
-
-    this.getUseWorker = function() {
-        return this.$useWorker;
-    };
-
-    this.onReloadTokenizer = function(e) {
-        var rows = e.data;
-        this.bgTokenizer.start(rows.first);
-        this._emit("tokenizerUpdate", e);
-    };
-
-    this.$modes = {};
-    this._loadMode = function(mode, callback) {
-        if (this.$modes[mode])
-            return callback(this.$modes[mode]);
-        
-        var _self = this;
-        var module;
-        try {
-            module = require(mode);
-        } catch (e) {};
-        if (module)
-            return done(module);
-            
-        fetch(function() {
-            require([mode], done);
-        });
-        
-        function done(module) {
-            if (_self.$modes[mode])
-                return callback(_self.$modes[mode]);
-            
-            _self.$modes[mode] = new module.Mode();
-            _self._emit("loadmode", {
-                name: mode,
-                mode: _self.$modes[mode]
-            });
-            callback(_self.$modes[mode]);
-        }
-
-        function fetch(callback) {
-            if (!config.get("packaged"))
-                return callback();
-                
-            var base = mode.split("/").pop();
-            var filename = config.get("modePath") + "/mode-" + base + config.get("suffix");
-            net.loadScript(filename, callback);
-        }
-    };
-
-    this.$mode = null;
-    this.$origMode = null;
-    this.setMode = function(mode) {
-        this.$origMode = mode;
-        
-        // load on demand
-        if (typeof mode === "string") {
-            var _self = this;
-            this._loadMode(mode, function(module) {
-                if (_self.$origMode !== mode)
-                    return;
-            
-                _self.setMode(module);
-            });
-            return;
-        }
-        
-        if (this.$mode === mode) return;
-        this.$mode = mode;
-        
-
-        this.$stopWorker();
-
-        if (this.$useWorker)
-            this.$startWorker();
-
-        var tokenizer = mode.getTokenizer();
-
-        if(tokenizer.addEventListener !== undefined) {
-            var onReloadTokenizer = this.onReloadTokenizer.bind(this);
-            tokenizer.addEventListener("update", onReloadTokenizer);
-        }
-
-        if (!this.bgTokenizer) {
-            this.bgTokenizer = new BackgroundTokenizer(tokenizer);
-            var _self = this;
-            this.bgTokenizer.addEventListener("update", function(e) {
-                _self._emit("tokenizerUpdate", e);
-            });
-        } else {
-            this.bgTokenizer.setTokenizer(tokenizer);
-        }
-
-        this.bgTokenizer.setDocument(this.getDocument());
-        this.bgTokenizer.start(0);
-
-        this.tokenRe = mode.tokenRe;
-        this.nonTokenRe = mode.nonTokenRe;
-
-        this.$setFolding(mode.foldingRules);
-
-        this._emit("changeMode");
-    };
-
-    this.$stopWorker = function() {
-        if (this.$worker)
-            this.$worker.terminate();
-
-        this.$worker = null;
-    };
-
-    this.$startWorker = function() {
-        if (typeof Worker !== "undefined" && !require.noWorker) {
-            try {
-                this.$worker = this.$mode.createWorker(this);
-            } catch (e) {
-                console.log("Could not load worker");
-                console.log(e);
-                this.$worker = null;
-            }
-        }
-        else
-            this.$worker = null;
-    };
-
-    this.getMode = function() {
-        return this.$mode;
-    };
-    
-    this.$scrollTop = 0;
-    this.setScrollTop = function(scrollTop) {
-        scrollTop = Math.round(Math.max(0, scrollTop));
-        if (this.$scrollTop === scrollTop)
-            return;
-
-        this.$scrollTop = scrollTop;
-        this._emit("changeScrollTop", scrollTop);
-    };
-
-    this.getScrollTop = function() {
-        return this.$scrollTop;
-    };
-    
-    this.$scrollLeft = 0;
-    this.setScrollLeft = function(scrollLeft) {
-        scrollLeft = Math.round(Math.max(0, scrollLeft));
-        if (this.$scrollLeft === scrollLeft)
-            return;
-
-        this.$scrollLeft = scrollLeft;
-        this._emit("changeScrollLeft", scrollLeft);
-    };
-
-    this.getScrollLeft = function() {
-        return this.$scrollLeft;
-    };
-
-    this.getWidth = function() {
-        this.$computeWidth();
-        return this.width;
-    };
-
-    this.getScreenWidth = function() {
-        this.$computeWidth();
-        return this.screenWidth;
-    };
-
-    this.$computeWidth = function(force) {
-        if (this.$modified || force) {
-            this.$modified = false;
-
-            var lines = this.doc.getAllLines();
-            var longestLine = 0;
-            var longestScreenLine = 0;
-
-            for ( var i = 0; i < lines.length; i++) {
-                var foldLine = this.getFoldLine(i),
-                    line, len;
-
-                line = lines[i];
-                if (foldLine) {
-                    var end = foldLine.range.end;
-                    line = this.getFoldDisplayLine(foldLine);
-                    // Continue after the foldLine.end.row. All the lines in
-                    // between are folded.
-                    i = end.row;
-                }
-                len = line.length;
-                longestLine = Math.max(longestLine, len);
-                if (!this.$useWrapMode) {
-                    longestScreenLine = Math.max(
-                        longestScreenLine,
-                        this.$getStringScreenWidth(line)[0]
-                    );
-                }
-            }
-            this.width = longestLine;
-
-            if (this.$useWrapMode) {
-                this.screenWidth = this.$wrapLimit;
-            } else {
-                this.screenWidth = longestScreenLine;
-            }
-        }
-    };
-
-    /**
-     * Get a verbatim copy of the given line as it is in the document
-     */
-    this.getLine = function(row) {
-        return this.doc.getLine(row);
-    };
-
-    this.getLines = function(firstRow, lastRow) {
-        return this.doc.getLines(firstRow, lastRow);
-    };
-
-    this.getLength = function() {
-        return this.doc.getLength();
-    };
-
-    this.getTextRange = function(range) {
-        return this.doc.getTextRange(range);
-    };
-
-    this.insert = function(position, text) {
-        return this.doc.insert(position, text);
-    };
-
-    this.remove = function(range) {
-        return this.doc.remove(range);
-    };
-
-    this.undoChanges = function(deltas, dontSelect) {
-        if (!deltas.length)
-            return;
-
-        this.$fromUndo = true;
-        var lastUndoRange = null;
-        for (var i = deltas.length - 1; i != -1; i--) {
-            var delta = deltas[i];
-            if (delta.group == "doc") {
-                this.doc.revertDeltas(delta.deltas);
-                lastUndoRange =
-                    this.$getUndoSelection(delta.deltas, true, lastUndoRange);
-            } else {
-                delta.deltas.forEach(function(foldDelta) {
-                    this.addFolds(foldDelta.folds);
-                }, this);
-            }
-        }
-        this.$fromUndo = false;
-        lastUndoRange &&
-            this.$undoSelect &&
-            !dontSelect &&
-            this.selection.setSelectionRange(lastUndoRange);
-        return lastUndoRange;
-    };
-
-    this.redoChanges = function(deltas, dontSelect) {
-        if (!deltas.length)
-            return;
-
-        this.$fromUndo = true;
-        var lastUndoRange = null;
-        for (var i = 0; i < deltas.length; i++) {
-            var delta = deltas[i];
-            if (delta.group == "doc") {
-                this.doc.applyDeltas(delta.deltas);
-                lastUndoRange =
-                    this.$getUndoSelection(delta.deltas, false, lastUndoRange);
-            }
-        }
-        this.$fromUndo = false;
-        lastUndoRange &&
-            this.$undoSelect &&
-            !dontSelect &&
-            this.selection.setSelectionRange(lastUndoRange);
-        return lastUndoRange;
-    };
-    
-    this.setUndoSelect = function(enable) {
-        this.$undoSelect = enable;
-    };
-
-    this.$getUndoSelection = function(deltas, isUndo, lastUndoRange) {
-        function isInsert(delta) {
-            var insert =
-                delta.action == "insertText" || delta.action == "insertLines";
-            return isUndo ? !insert : insert;
-        }
-
-        var delta = deltas[0];
-        var range, point;
-        var lastDeltaIsInsert = false;
-        if (isInsert(delta)) {
-            range = delta.range.clone();
-            lastDeltaIsInsert = true;
-        } else {
-            range = Range.fromPoints(delta.range.start, delta.range.start);
-            lastDeltaIsInsert = false;
-        }
-
-        for (var i = 1; i < deltas.length; i++) {
-            delta = deltas[i];
-            if (isInsert(delta)) {
-                point = delta.range.start;
-                if (range.compare(point.row, point.column) == -1) {
-                    range.setStart(delta.range.start);
-                }
-                point = delta.range.end;
-                if (range.compare(point.row, point.column) == 1) {
-                    range.setEnd(delta.range.end);
-                }
-                lastDeltaIsInsert = true;
-            } else {
-                point = delta.range.start;
-                if (range.compare(point.row, point.column) == -1) {
-                    range =
-                        Range.fromPoints(delta.range.start, delta.range.start);
-                }
-                lastDeltaIsInsert = false;
-            }
-        }
-
-        // Check if this range and the last undo range has something in common.
-        // If true, merge the ranges.
-        if (lastUndoRange != null) {
-            var cmp = lastUndoRange.compareRange(range);
-            if (cmp == 1) {
-                range.setStart(lastUndoRange.start);
-            } else if (cmp == -1) {
-                range.setEnd(lastUndoRange.end);
-            }
-        }
-
-        return range;
-    },
-
-    this.replace = function(range, text) {
-        return this.doc.replace(range, text);
-    };
-
-    /**
-     * Move a range of text from the given range to the given position.
-     *
-     * @param fromRange {Range} The range of text you want moved within the
-     * document.
-     * @param toPosition {Object} The location (row and column) where you want
-     * to move the text to.
-     * @return {Range} The new range where the text was moved to.
-     */
-    this.moveText = function(fromRange, toPosition) {
-        var text = this.getTextRange(fromRange);
-        this.remove(fromRange);
-
-        var toRow = toPosition.row;
-        var toColumn = toPosition.column;
-
-        // Make sure to update the insert location, when text is removed in
-        // front of the chosen point of insertion.
-        if (!fromRange.isMultiLine() && fromRange.start.row == toRow &&
-            fromRange.end.column < toColumn)
-            toColumn -= text.length;
-
-        if (fromRange.isMultiLine() && fromRange.end.row < toRow) {
-            var lines = this.doc.$split(text);
-            toRow -= lines.length - 1;
-        }
-
-        var endRow = toRow + fromRange.end.row - fromRange.start.row;
-        var endColumn = fromRange.isMultiLine() ?
-                        fromRange.end.column :
-                        toColumn + fromRange.end.column - fromRange.start.column;
-
-        var toRange = new Range(toRow, toColumn, endRow, endColumn);
-
-        this.insert(toRange.start, text);
-
-        return toRange;
-    };
-
-    this.indentRows = function(startRow, endRow, indentString) {
-        indentString = indentString.replace(/\t/g, this.getTabString());
-        for (var row=startRow; row<=endRow; row++)
-            this.insert({row: row, column:0}, indentString);
-    };
-
-    this.outdentRows = function (range) {
-        var rowRange = range.collapseRows();
-        var deleteRange = new Range(0, 0, 0, 0);
-        var size = this.getTabSize();
-
-        for (var i = rowRange.start.row; i <= rowRange.end.row; ++i) {
-            var line = this.getLine(i);
-
-            deleteRange.start.row = i;
-            deleteRange.end.row = i;
-            for (var j = 0; j < size; ++j)
-                if (line.charAt(j) != ' ')
-                    break;
-            if (j < size && line.charAt(j) == '\t') {
-                deleteRange.start.column = j;
-                deleteRange.end.column = j + 1;
-            } else {
-                deleteRange.start.column = 0;
-                deleteRange.end.column = j;
-            }
-            this.remove(deleteRange);
-        }
-    };
-
-    this.moveLinesUp = function(firstRow, lastRow) {
-        if (firstRow <= 0) return 0;
-
-        var removed = this.doc.removeLines(firstRow, lastRow);
-        this.doc.insertLines(firstRow - 1, removed);
-        return -1;
-    };
-
-    this.moveLinesDown = function(firstRow, lastRow) {
-        if (lastRow >= this.doc.getLength()-1) return 0;
-
-        var removed = this.doc.removeLines(firstRow, lastRow);
-        this.doc.insertLines(firstRow+1, removed);
-        return 1;
-    };
-
-    this.duplicateLines = function(firstRow, lastRow) {
-        var firstRow = this.$clipRowToDocument(firstRow);
-        var lastRow = this.$clipRowToDocument(lastRow);
-
-        var lines = this.getLines(firstRow, lastRow);
-        this.doc.insertLines(firstRow, lines);
-
-        var addedRows = lastRow - firstRow + 1;
-        return addedRows;
-    };
-
-    this.$clipRowToDocument = function(row) {
-        return Math.max(0, Math.min(row, this.doc.getLength()-1));
-    };
-
-    this.$clipColumnToRow = function(row, column) {
-        if (column < 0)
-            return 0;
-        return Math.min(this.doc.getLine(row).length, column);
-    };
-
-    this.$clipPositionToDocument = function(row, column) {
-        column = Math.max(0, column);
-
-        if (row < 0) {
-            row = 0;
-            column = 0;
-        } else {
-            var len = this.doc.getLength();
-            if (row >= len) {
-                row = len - 1;
-                column = this.doc.getLine(len-1).length;
-            } else {
-                column = Math.min(this.doc.getLine(row).length, column);
-            }
-        }
-
-        return {
-            row: row,
-            column: column
-        };
-    };
-
-    this.$clipRangeToDocument = function(range) {
-        if (range.start.row < 0) {
-            range.start.row = 0;
-            range.start.column = 0
-        } else {
-            range.start.column = this.$clipColumnToRow(
-                range.start.row,
-                range.start.column
-            );
-        }
-        
-        var len = this.doc.getLength() - 1;
-        if (range.end.row > len) {
-            range.end.row = len;
-            range.end.column = this.doc.getLine(len).length;
-        } else {
-            range.end.column = this.$clipColumnToRow(
-                range.end.row,
-                range.end.column
-            );
-        }
-        return range;
-    };
-
-    // WRAPMODE
-    this.$wrapLimit = 80;
-    this.$useWrapMode = false;
-    this.$wrapLimitRange = {
-        min : null,
-        max : null
-    };
-
-    this.setUseWrapMode = function(useWrapMode) {
-        if (useWrapMode != this.$useWrapMode) {
-            this.$useWrapMode = useWrapMode;
-            this.$modified = true;
-            this.$resetRowCache(0);
-
-            // If wrapMode is activaed, the wrapData array has to be initialized.
-            if (useWrapMode) {
-                var len = this.getLength();
-                this.$wrapData = [];
-                for (var i = 0; i < len; i++) {
-                    this.$wrapData.push([]);
-                }
-                this.$updateWrapData(0, len - 1);
-            }
-
-            this._emit("changeWrapMode");
-        }
-    };
-
-    this.getUseWrapMode = function() {
-        return this.$useWrapMode;
-    };
-
-    // Allow the wrap limit to move freely between min and max. Either
-    // parameter can be null to allow the wrap limit to be unconstrained
-    // in that direction. Or set both parameters to the same number to pin
-    // the limit to that value.
-    this.setWrapLimitRange = function(min, max) {
-        if (this.$wrapLimitRange.min !== min || this.$wrapLimitRange.max !== max) {
-            this.$wrapLimitRange.min = min;
-            this.$wrapLimitRange.max = max;
-            this.$modified = true;
-            // This will force a recalculation of the wrap limit
-            this._emit("changeWrapMode");
-        }
-    };
-
-    // This should generally only be called by the renderer when a resize
-    // is detected.
-    this.adjustWrapLimit = function(desiredLimit) {
-        var wrapLimit = this.$constrainWrapLimit(desiredLimit);
-        if (wrapLimit != this.$wrapLimit && wrapLimit > 0) {
-            this.$wrapLimit = wrapLimit;
-            this.$modified = true;
-            if (this.$useWrapMode) {
-                this.$updateWrapData(0, this.getLength() - 1);
-                this.$resetRowCache(0)
-                this._emit("changeWrapLimit");
-            }
-            return true;
-        }
-        return false;
-    };
-
-    this.$constrainWrapLimit = function(wrapLimit) {
-        var min = this.$wrapLimitRange.min;
-        if (min)
-            wrapLimit = Math.max(min, wrapLimit);
-
-        var max = this.$wrapLimitRange.max;
-        if (max)
-            wrapLimit = Math.min(max, wrapLimit);
-
-        // What would a limit of 0 even mean?
-        return Math.max(1, wrapLimit);
-    };
-
-    this.getWrapLimit = function() {
-        return this.$wrapLimit;
-    };
-
-    this.getWrapLimitRange = function() {
-        // Avoid unexpected mutation by returning a copy
-        return {
-            min : this.$wrapLimitRange.min,
-            max : this.$wrapLimitRange.max
-        };
-    };
-
-    this.$updateInternalDataOnChange = function(e) {
-        var useWrapMode = this.$useWrapMode;
-        var len;
-        var action = e.data.action;
-        var firstRow = e.data.range.start.row;
-        var lastRow = e.data.range.end.row;
-        var start = e.data.range.start;
-        var end = e.data.range.end;
-        var removedFolds = null;
-
-        if (action.indexOf("Lines") != -1) {
-            if (action == "insertLines") {
-                lastRow = firstRow + (e.data.lines.length);
-            } else {
-                lastRow = firstRow;
-            }
-            len = e.data.lines ? e.data.lines.length : lastRow - firstRow;
-        } else {
-            len = lastRow - firstRow;
-        }
-
-        if (len != 0) {
-            if (action.indexOf("remove") != -1) {
-                useWrapMode && this.$wrapData.splice(firstRow, len);
-
-                var foldLines = this.$foldData;
-                removedFolds = this.getFoldsInRange(e.data.range);
-                this.removeFolds(removedFolds);
-
-                var foldLine = this.getFoldLine(end.row);
-                var idx = 0;
-                if (foldLine) {
-                    foldLine.addRemoveChars(end.row, end.column, start.column - end.column);
-                    foldLine.shiftRow(-len);
-
-                    var foldLineBefore = this.getFoldLine(firstRow);
-                    if (foldLineBefore && foldLineBefore !== foldLine) {
-                        foldLineBefore.merge(foldLine);
-                        foldLine = foldLineBefore;
-                    }
-                    idx = foldLines.indexOf(foldLine) + 1;
-                }
-
-                for (idx; idx < foldLines.length; idx++) {
-                    var foldLine = foldLines[idx];
-                    if (foldLine.start.row >= end.row) {
-                        foldLine.shiftRow(-len);
-                    }
-                }
-
-                lastRow = firstRow;
-            } else {
-                var args;
-                if (useWrapMode) {
-                    args = [firstRow, 0];
-                    for (var i = 0; i < len; i++) args.push([]);
-                    this.$wrapData.splice.apply(this.$wrapData, args);
-                }
-
-                // If some new line is added inside of a foldLine, then split
-                // the fold line up.
-                var foldLines = this.$foldData;
-                var foldLine = this.getFoldLine(firstRow);
-                var idx = 0;
-                if (foldLine) {
-                    var cmp = foldLine.range.compareInside(start.row, start.column)
-                    // Inside of the foldLine range. Need to split stuff up.
-                    if (cmp == 0) {
-                        foldLine = foldLine.split(start.row, start.column);
-                        foldLine.shiftRow(len);
-                        foldLine.addRemoveChars(
-                            lastRow, 0, end.column - start.column);
-                    } else
-                    // Infront of the foldLine but same row. Need to shift column.
-                    if (cmp == -1) {
-                        foldLine.addRemoveChars(firstRow, 0, end.column - start.column);
-                        foldLine.shiftRow(len);
-                    }
-                    // Nothing to do if the insert is after the foldLine.
-                    idx = foldLines.indexOf(foldLine) + 1;
-                }
-
-                for (idx; idx < foldLines.length; idx++) {
-                    var foldLine = foldLines[idx];
-                    if (foldLine.start.row >= firstRow) {
-                        foldLine.shiftRow(len);
-                    }
-                }
-            }
-        } else {
-            // Realign folds. E.g. if you add some new chars before a fold, the
-            // fold should "move" to the right.
-            len = Math.abs(e.data.range.start.column - e.data.range.end.column);
-            if (action.indexOf("remove") != -1) {
-                // Get all the folds in the change range and remove them.
-                removedFolds = this.getFoldsInRange(e.data.range);
-                this.removeFolds(removedFolds);
-
-                len = -len;
-            }
-            var foldLine = this.getFoldLine(firstRow);
-            if (foldLine) {
-                foldLine.addRemoveChars(firstRow, start.column, len);
-            }
-        }
-
-        if (useWrapMode && this.$wrapData.length != this.doc.getLength()) {
-            console.error("doc.getLength() and $wrapData.length have to be the same!");
-        }
-
-        useWrapMode && this.$updateWrapData(firstRow, lastRow);
-
-        return removedFolds;
-    };
-
-    this.$updateWrapData = function(firstRow, lastRow) {
-        var lines = this.doc.getAllLines();
-        var tabSize = this.getTabSize();
-        var wrapData = this.$wrapData;
-        var wrapLimit = this.$wrapLimit;
-        var tokens;
-        var foldLine;
-
-        var row = firstRow;
-        lastRow = Math.min(lastRow, lines.length - 1);
-        while (row <= lastRow) {
-            foldLine = this.getFoldLine(row, foldLine);
-            if (!foldLine) {
-                tokens = this.$getDisplayTokens(lang.stringTrimRight(lines[row]));
-                wrapData[row] = this.$computeWrapSplits(tokens, wrapLimit, tabSize);
-                row ++;
-            } else {
-                tokens = [];
-                foldLine.walk(
-                    function(placeholder, row, column, lastColumn) {
-                        var walkTokens;
-                        if (placeholder) {
-                            walkTokens = this.$getDisplayTokens(
-                                            placeholder, tokens.length);
-                            walkTokens[0] = PLACEHOLDER_START;
-                            for (var i = 1; i < walkTokens.length; i++) {
-                                walkTokens[i] = PLACEHOLDER_BODY;
-                            }
-                        } else {
-                            walkTokens = this.$getDisplayTokens(
-                                lines[row].substring(lastColumn, column),
-                                tokens.length);
-                        }
-                        tokens = tokens.concat(walkTokens);
-                    }.bind(this),
-                    foldLine.end.row,
-                    lines[foldLine.end.row].length + 1
-                );
-                // Remove spaces/tabs from the back of the token array.
-                while (tokens.length != 0 && tokens[tokens.length - 1] >= SPACE)
-                    tokens.pop();
-
-                wrapData[foldLine.start.row]
-                    = this.$computeWrapSplits(tokens, wrapLimit, tabSize);
-                row = foldLine.end.row + 1;
-            }
-        }
-    };
-
-    // "Tokens"
-    var CHAR = 1,
-        CHAR_EXT = 2,
-        PLACEHOLDER_START = 3,
-        PLACEHOLDER_BODY =  4,
-        PUNCTUATION = 9,
-        SPACE = 10,
-        TAB = 11,
-        TAB_SPACE = 12;
-
-    this.$computeWrapSplits = function(tokens, wrapLimit) {
-        if (tokens.length == 0) {
-            return [];
-        }
-
-        var splits = [];
-        var displayLength = tokens.length;
-        var lastSplit = 0, lastDocSplit = 0;
-
-        function addSplit(screenPos) {
-            var displayed = tokens.slice(lastSplit, screenPos);
-
-            // The document size is the current size - the extra width for tabs
-            // and multipleWidth characters.
-            var len = displayed.length;
-            displayed.join("").
-                // Get all the TAB_SPACEs.
-                replace(/12/g, function() {
-                    len -= 1;
-                }).
-                // Get all the CHAR_EXT/multipleWidth characters.
-                replace(/2/g, function() {
-                    len -= 1;
-                });
-
-            lastDocSplit += len;
-            splits.push(lastDocSplit);
-            lastSplit = screenPos;
-        }
-
-        while (displayLength - lastSplit > wrapLimit) {
-            // This is, where the split should be.
-            var split = lastSplit + wrapLimit;
-
-            // If there is a space or tab at this split position, then making
-            // a split is simple.
-            if (tokens[split] >= SPACE) {
-                // Include all following spaces + tabs in this split as well.
-                while (tokens[split] >= SPACE) {
-                    split ++;
-                }
-                addSplit(split);
-                continue;
-            }
-
-            // === ELSE ===
-            // Check if split is inside of a placeholder. Placeholder are
-            // not splitable. Therefore, seek the beginning of the placeholder
-            // and try to place the split beofre the placeholder's start.
-            if (tokens[split] == PLACEHOLDER_START
-                || tokens[split] == PLACEHOLDER_BODY)
-            {
-                // Seek the start of the placeholder and do the split
-                // before the placeholder. By definition there always
-                // a PLACEHOLDER_START between split and lastSplit.
-                for (split; split != lastSplit - 1; split--) {
-                    if (tokens[split] == PLACEHOLDER_START) {
-                        // split++; << No incremental here as we want to
-                        //  have the position before the Placeholder.
-                        break;
-                    }
-                }
-
-                // If the PLACEHOLDER_START is not the index of the
-                // last split, then we can do the split
-                if (split > lastSplit) {
-                    addSplit(split);
-                    continue;
-                }
-
-                // If the PLACEHOLDER_START IS the index of the last
-                // split, then we have to place the split after the
-                // placeholder. So, let's seek for the end of the placeholder.
-                split = lastSplit + wrapLimit;
-                for (split; split < tokens.length; split++) {
-                    if (tokens[split] != PLACEHOLDER_BODY)
-                    {
-                        break;
-                    }
-                }
-
-                // If spilt == tokens.length, then the placeholder is the last
-                // thing in the line and adding a new split doesn't make sense.
-                if (split == tokens.length) {
-                    break;  // Breaks the while-loop.
-                }
-
-                // Finally, add the split...
-                addSplit(split);
-                continue;
-            }
-
-            // === ELSE ===
-            // Search for the first non space/tab/placeholder/punctuation token backwards.
-            var minSplit = Math.max(split - 10, lastSplit - 1);
-            while (split > minSplit && tokens[split] < PLACEHOLDER_START) {
-                split --;
-            }
-            while (split > minSplit && tokens[split] == PUNCTUATION) {
-                split --;
-            }
-            // If we found one, then add the split.
-            if (split > minSplit) {
-                addSplit(++split);
-                continue;
-            }
-
-            // === ELSE ===
-            split = lastSplit + wrapLimit;
-            // The split is inside of a CHAR or CHAR_EXT token and no space
-            // around -> force a split.
-            addSplit(split);
-        }
-        return splits;
-    }
-
-    /**
-     * @param
-     *   offset: The offset in screenColumn at which position str starts.
-     *           Important for calculating the realTabSize.
-     */
-    this.$getDisplayTokens = function(str, offset) {
-        var arr = [];
-        var tabSize;
-        offset = offset || 0;
-
-        for (var i = 0; i < str.length; i++) {
-            var c = str.charCodeAt(i);
-            // Tab
-            if (c == 9) {
-                tabSize = this.getScreenTabSize(arr.length + offset);
-                arr.push(TAB);
-                for (var n = 1; n < tabSize; n++) {
-                    arr.push(TAB_SPACE);
-                }
-            }
-            // Space
-            else if (c == 32) {
-                arr.push(SPACE);
-            } else if((c > 39 && c < 48) || (c > 57 && c < 64)) {
-                arr.push(PUNCTUATION);
-            }
-            // full width characters
-            else if (c >= 0x1100 && isFullWidth(c)) {
-                arr.push(CHAR, CHAR_EXT);
-            } else {
-                arr.push(CHAR);
-            }
-        }
-        return arr;
-    }
-
-    /**
-     * Calculates the width of the a string on the screen while assuming that
-     * the string starts at the first column on the screen.
-     *
-     * @param string str String to calculate the screen width of
-     * @return array
-     *      [0]: number of columns for str on screen.
-     *      [1]: docColumn position that was read until (useful with screenColumn)
-     */
-    this.$getStringScreenWidth = function(str, maxScreenColumn, screenColumn) {
-        if (maxScreenColumn == 0) {
-            return [0, 0];
-        }
-        if (maxScreenColumn == null) {
-            maxScreenColumn = screenColumn +
-                str.length * Math.max(this.getTabSize(), 2);
-        }
-        screenColumn = screenColumn || 0;
-
-        var c, column;
-        for (column = 0; column < str.length; column++) {
-            c = str.charCodeAt(column);
-            // tab
-            if (c == 9) {
-                screenColumn += this.getScreenTabSize(screenColumn);
-            }
-            // full width characters
-            else if (c >= 0x1100 && isFullWidth(c)) {
-                screenColumn += 2;
-            } else {
-                screenColumn += 1;
-            }
-            if (screenColumn > maxScreenColumn) {
-                break
-            }
-        }
-
-        return [screenColumn, column];
-    }
-
-    /**
-     * Returns the number of rows required to render this row on the screen
-     */
-    this.getRowLength = function(row) {
-        if (!this.$useWrapMode || !this.$wrapData[row]) {
-            return 1;
-        } else {
-            return this.$wrapData[row].length + 1;
-        }
-    }
-
-    /**
-     * Returns the height in pixels required to render this row on the screen
-     **/
-    this.getRowHeight = function(config, row) {
-        return this.getRowLength(row) * config.lineHeight;
-    }
-
-    this.getScreenLastRowColumn = function(screenRow) {
-        var pos = this.screenToDocumentPosition(screenRow, Number.MAX_VALUE)
-        return this.documentToScreenColumn(pos.row, pos.column);
-    };
-
-    this.getDocumentLastRowColumn = function(docRow, docColumn) {
-        var screenRow = this.documentToScreenRow(docRow, docColumn);
-        return this.getScreenLastRowColumn(screenRow);
-    };
-
-    this.getDocumentLastRowColumnPosition = function(docRow, docColumn) {
-        var screenRow = this.documentToScreenRow(docRow, docColumn);
-        return this.screenToDocumentPosition(screenRow, Number.MAX_VALUE / 10);
-    };
-
-    this.getRowSplitData = function(row) {
-        if (!this.$useWrapMode) {
-            return undefined;
-        } else {
-            return this.$wrapData[row];
-        }
-    };
-
-    /**
-     * Returns the width of a tab character at screenColumn.
-     */
-    this.getScreenTabSize = function(screenColumn) {
-        return this.$tabSize - screenColumn % this.$tabSize;
-    };
-
-    this.screenToDocumentRow = function(screenRow, screenColumn) {
-        return this.screenToDocumentPosition(screenRow, screenColumn).row;
-    };
-
-    this.screenToDocumentColumn = function(screenRow, screenColumn) {
-        return this.screenToDocumentPosition(screenRow, screenColumn).column;
-    };
-
-    this.screenToDocumentPosition = function(screenRow, screenColumn) {
-        if (screenRow < 0) {
-            return {
-                row: 0,
-                column: 0
-            }
-        }
-
-        var line;
-        var docRow = 0;
-        var docColumn = 0;
-        var column;
-        var row = 0;
-        var rowLength = 0;
-
-        var rowCache = this.$rowCache;
-        for (var i = 0; i < rowCache.length; i++) {
-            if (rowCache[i].screenRow < screenRow) {
-                row = rowCache[i].screenRow;
-                docRow = rowCache[i].docRow;
-            }
-            else {
-                break;
-            }
-        }
-        var doCache = !rowCache.length || i == rowCache.length;
-
-        var maxRow = this.getLength() - 1;
-        var foldLine = this.getNextFoldLine(docRow);
-        var foldStart = foldLine ? foldLine.start.row : Infinity;
-
-        while (row <= screenRow) {
-            rowLength = this.getRowLength(docRow);
-            if (row + rowLength - 1 >= screenRow || docRow >= maxRow) {
-                break;
-            } else {
-                row += rowLength;
-                docRow++;
-                if (docRow > foldStart) {
-                    docRow = foldLine.end.row+1;
-                    foldLine = this.getNextFoldLine(docRow, foldLine);
-                    foldStart = foldLine ? foldLine.start.row : Infinity;
-                }
-            }
-            if (doCache) {
-                rowCache.push({
-                    docRow: docRow,
-                    screenRow: row
-                });
-            }
-        }
-
-        if (foldLine && foldLine.start.row <= docRow) {
-            line = this.getFoldDisplayLine(foldLine);
-            docRow = foldLine.start.row;
-        } else if (row + rowLength <= screenRow || docRow > maxRow) {
-            // clip at the end of the document
-            return {
-                row: maxRow,
-                column: this.getLine(maxRow).length
-            }
-        } else {
-            line = this.getLine(docRow);
-            foldLine = null;
-        }
-
-        if (this.$useWrapMode) {
-            var splits = this.$wrapData[docRow];
-            if (splits) {
-                column = splits[screenRow - row];
-                if(screenRow > row && splits.length) {
-                    docColumn = splits[screenRow - row - 1] || splits[splits.length - 1];
-                    line = line.substring(docColumn);
-                }
-            }
-        }
-
-        docColumn += this.$getStringScreenWidth(line, screenColumn)[1];
-
-        // We remove one character at the end so that the docColumn
-        // position returned is not associated to the next row on the screen.
-        if (this.$useWrapMode && docColumn >= column) {
-            docColumn = column - 1;
-        }
-
-        if (foldLine) {
-            return foldLine.idxToPosition(docColumn);
-        }
-
-        return {
-            row: docRow,
-            column: docColumn
-        }
-    };
-
-    this.documentToScreenPosition = function(docRow, docColumn) {
-        // Normalize the passed in arguments.
-        if (typeof docColumn === "undefined")
-            var pos = this.$clipPositionToDocument(docRow.row, docRow.column);
-        else
-            pos = this.$clipPositionToDocument(docRow, docColumn);
-
-        docRow = pos.row;
-        docColumn = pos.column;
-
-        var wrapData;
-        // Special case in wrapMode if the doc is at the end of the document.
-        if (this.$useWrapMode) {
-            wrapData = this.$wrapData;
-            if (docRow > wrapData.length - 1) {
-                return {
-                    row: this.getScreenLength(),
-                    column: wrapData.length == 0
-                        ? 0
-                        : (wrapData[wrapData.length - 1].length - 1)
-                };
-            }
-        }
-
-        var screenRow = 0;
-        var foldStartRow = null;
-        var fold = null;
-
-        // Clamp the docRow position in case it's inside of a folded block.
-        fold = this.getFoldAt(docRow, docColumn, 1);
-        if (fold) {
-            docRow = fold.start.row;
-            docColumn = fold.start.column;
-        }
-
-        var rowEnd, row = 0;
-        var rowCache = this.$rowCache;
-
-        for (var i = 0; i < rowCache.length; i++) {
-            if (rowCache[i].docRow < docRow) {
-                screenRow = rowCache[i].screenRow;
-                row = rowCache[i].docRow;
-            } else {
-                break;
-            }
-        }
-        var doCache = !rowCache.length || i == rowCache.length;
-
-        var foldLine = this.getNextFoldLine(row);
-        var foldStart = foldLine ?foldLine.start.row :Infinity;
-
-        while (row < docRow) {
-            if (row >= foldStart) {
-                rowEnd = foldLine.end.row + 1;
-                if (rowEnd > docRow)
-                    break;
-                foldLine = this.getNextFoldLine(rowEnd, foldLine);
-                foldStart = foldLine ?foldLine.start.row :Infinity;
-            }
-            else {
-                rowEnd = row + 1;
-            }
-
-            screenRow += this.getRowLength(row);
-            row = rowEnd;
-
-            if (doCache) {
-                rowCache.push({
-                    docRow: row,
-                    screenRow: screenRow
-                });
-            }
-        }
-
-        // Calculate the text line that is displayed in docRow on the screen.
-        var textLine = "";
-        // Check if the final row we want to reach is inside of a fold.
-        if (foldLine && row >= foldStart) {
-            textLine = this.getFoldDisplayLine(foldLine, docRow, docColumn);
-            foldStartRow = foldLine.start.row;
-        } else {
-            textLine = this.getLine(docRow).substring(0, docColumn);
-            foldStartRow = docRow;
-        }
-        // Clamp textLine if in wrapMode.
-        if (this.$useWrapMode) {
-            var wrapRow = wrapData[foldStartRow];
-            var screenRowOffset = 0;
-            while (textLine.length >= wrapRow[screenRowOffset]) {
-                screenRow ++;
-                screenRowOffset++;
-            }
-            textLine = textLine.substring(
-                wrapRow[screenRowOffset - 1] || 0, textLine.length
-            );
-        }
-
-        return {
-            row: screenRow,
-            column: this.$getStringScreenWidth(textLine)[0]
-        };
-    };
-
-    this.documentToScreenColumn = function(row, docColumn) {
-        return this.documentToScreenPosition(row, docColumn).column;
-    };
-
-    this.documentToScreenRow = function(docRow, docColumn) {
-        return this.documentToScreenPosition(docRow, docColumn).row;
-    };
-
-    this.getScreenLength = function() {
-        var screenRows = 0;
-        var fold = null;
-        if (!this.$useWrapMode) {
-            screenRows = this.getLength();
-
-            // Remove the folded lines again.
-            var foldData = this.$foldData;
-            for (var i = 0; i < foldData.length; i++) {
-                fold = foldData[i];
-                screenRows -= fold.end.row - fold.start.row;
-            }
-        } else {
-            var lastRow = this.$wrapData.length;
-            var row = 0, i = 0;
-            var fold = this.$foldData[i++];
-            var foldStart = fold ? fold.start.row :Infinity;
-
-            while (row < lastRow) {
-                screenRows += this.$wrapData[row].length + 1;
-                row ++;
-                if (row > foldStart) {
-                    row = fold.end.row+1;
-                    fold = this.$foldData[i++];
-                    foldStart = fold ?fold.start.row :Infinity;
-                }
-            }
-        }
-
-        return screenRows;
-    }
-
-    // For every keystroke this gets called once per char in the whole doc!!
-    // Wouldn't hurt to make it a bit faster for c >= 0x1100
-    function isFullWidth(c) {
-        if (c < 0x1100)
-            return false;
-        return c >= 0x1100 && c <= 0x115F ||
-               c >= 0x11A3 && c <= 0x11A7 ||
-               c >= 0x11FA && c <= 0x11FF ||
-               c >= 0x2329 && c <= 0x232A ||
-               c >= 0x2E80 && c <= 0x2E99 ||
-               c >= 0x2E9B && c <= 0x2EF3 ||
-               c >= 0x2F00 && c <= 0x2FD5 ||
-               c >= 0x2FF0 && c <= 0x2FFB ||
-               c >= 0x3000 && c <= 0x303E ||
-               c >= 0x3041 && c <= 0x3096 ||
-               c >= 0x3099 && c <= 0x30FF ||
-               c >= 0x3105 && c <= 0x312D ||
-               c >= 0x3131 && c <= 0x318E ||
-               c >= 0x3190 && c <= 0x31BA ||
-               c >= 0x31C0 && c <= 0x31E3 ||
-               c >= 0x31F0 && c <= 0x321E ||
-               c >= 0x3220 && c <= 0x3247 ||
-               c >= 0x3250 && c <= 0x32FE ||
-               c >= 0x3300 && c <= 0x4DBF ||
-               c >= 0x4E00 && c <= 0xA48C ||
-               c >= 0xA490 && c <= 0xA4C6 ||
-               c >= 0xA960 && c <= 0xA97C ||
-               c >= 0xAC00 && c <= 0xD7A3 ||
-               c >= 0xD7B0 && c <= 0xD7C6 ||
-               c >= 0xD7CB && c <= 0xD7FB ||
-               c >= 0xF900 && c <= 0xFAFF ||
-               c >= 0xFE10 && c <= 0xFE19 ||
-               c >= 0xFE30 && c <= 0xFE52 ||
-               c >= 0xFE54 && c <= 0xFE66 ||
-               c >= 0xFE68 && c <= 0xFE6B ||
-               c >= 0xFF01 && c <= 0xFF60 ||
-               c >= 0xFFE0 && c <= 0xFFE6;
-    };
-
-}).call(EditSession.prototype);
-
-require("./edit_session/folding").Folding.call(EditSession.prototype);
-require("./edit_session/bracket_match").BracketMatch.call(EditSession.prototype);
-
-exports.EditSession = EditSession;
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/config', ['require', 'exports', 'module' , 'ace/lib/lang'], function(require, exports, module) {
-"no use strict";
-
-var lang = require("./lib/lang");
-
-var global = (function() {
-    return this;
-})();
-
-var options = {
-    packaged: false,
-    workerPath: "",
-    modePath: "",
-    themePath: "",
-    suffix: ".js"
-};
-
-exports.get = function(key) {
-    if (!options.hasOwnProperty(key))
-        throw new Error("Unknown confik key: " + key);
-        
-    return options[key];
-};
-
-exports.set = function(key, value) {
-    if (!options.hasOwnProperty(key))
-        throw new Error("Unknown confik key: " + key);
-        
-    options[key] = value;
-};
-
-exports.all = function() {
-    return lang.copyObject(options);
-};
-
-exports.init = function() {
-    options.packaged = require.packaged || module.packaged || (global.define && define.packaged);
-
-    if (!global.document)
-        return "";
-
-    var scriptOptions = {};
-    var scriptUrl = "";
-    var suffix;
-    
-    var scripts = document.getElementsByTagName("script");
-    for (var i=0; i<scripts.length; i++) {
-        var script = scripts[i];
-
-        var src = script.src || script.getAttribute("src");
-        if (!src) {
-            continue;
-        }
-        
-        var attributes = script.attributes;
-        for (var j=0, l=attributes.length; j < l; j++) {
-            var attr = attributes[j];
-            if (attr.name.indexOf("data-ace-") === 0) {
-                scriptOptions[deHyphenate(attr.name.replace(/^data-ace-/, ""))] = attr.value;
-            }
-        }
-
-        var m = src.match(/^(?:(.*\/)ace\.js|(.*\/)ace((-uncompressed)?(-noconflict)?\.js))(?:\?|$)/);
-        if (m) {
-            scriptUrl = m[1] || m[2];
-            suffix = m[3];
-        }
-    }
-    
-    if (scriptUrl) {
-        scriptOptions.base = scriptOptions.base || scriptUrl;
-        scriptOptions.packaged = true;
-    }
-    
-    scriptOptions.suffix = scriptOptions.suffix || suffix;
-    scriptOptions.workerPath = scriptOptions.workerPath || scriptOptions.base;
-    scriptOptions.modePath = scriptOptions.modePath || scriptOptions.base;
-    scriptOptions.themePath = scriptOptions.themePath || scriptOptions.base;
-    delete scriptOptions.base;
-    
-    for (var key in scriptOptions)
-        if (typeof scriptOptions[key] !== "undefined")
-            exports.set(key, scriptOptions[key]);
-};
-
-function deHyphenate(str) {
-    return str.replace(/-(.)/g, function(m, m1) { return m1.toUpperCase(); });
-}
-
-});/**
- * based on code from:
- * 
- * @license RequireJS text 0.25.0 Copyright (c) 2010-2011, The Dojo Foundation All Rights Reserved.
- * Available via the MIT or new BSD license.
- * see: http://github.com/jrburke/requirejs for details
- */
-define('ace/lib/net', ['require', 'exports', 'module' ], function(require, exports, module) {
-"use strict";
-
-exports.get = function (url, callback) {
-    var xhr = exports.createXhr();
-    xhr.open('GET', url, true);
-    xhr.onreadystatechange = function (evt) {
-        //Do not explicitly handle errors, those should be
-        //visible via console output in the browser.
-        if (xhr.readyState === 4) {
-            callback(xhr.responseText);
-        }
-    };
-    xhr.send(null);
-};
-
-var progIds = ['Msxml2.XMLHTTP', 'Microsoft.XMLHTTP', 'Msxml2.XMLHTTP.4.0'];
-
-exports.createXhr = function() {
-    //Would love to dump the ActiveX crap in here. Need IE 6 to die first.
-    var xhr, i, progId;
-    if (typeof XMLHttpRequest !== "undefined") {
-        return new XMLHttpRequest();
-    } else {
-        for (i = 0; i < 3; i++) {
-            progId = progIds[i];
-            try {
-                xhr = new ActiveXObject(progId);
-            } catch (e) {}
-
-            if (xhr) {
-                progIds = [progId];  // so faster next time
-                break;
-            }
-        }
-    }
-
-    if (!xhr) {
-        throw new Error("createXhr(): XMLHttpRequest not available");
-    }
-
-    return xhr;
-};
-
-exports.loadScript = function(path, callback) {
-    var head = document.getElementsByTagName('head')[0];
-    var s = document.createElement('script');
-
-    s.src = path;
-    head.appendChild(s);
-    
-    s.onload = callback;
-};
-
-});/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Julian Viereck <julian.viereck@gmail.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/selection', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/lib/event_emitter', 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var oop = require("./lib/oop");
-var lang = require("./lib/lang");
-var EventEmitter = require("./lib/event_emitter").EventEmitter;
-var Range = require("./range").Range;
-
-/**
- * Keeps cursor position and the text selection of an edit session.
- *
- * The row/columns used in the selection are in document coordinates
- * representing ths coordinates as thez appear in the document
- * before applying soft wrap and folding.
- */
-var Selection = function(session) {
-    this.session = session;
-    this.doc = session.getDocument();
-
-    this.clearSelection();
-    this.selectionLead = this.doc.createAnchor(0, 0);
-    this.selectionAnchor = this.doc.createAnchor(0, 0);
-
-    var self = this;
-    this.selectionLead.on("change", function(e) {
-        self._emit("changeCursor");
-        if (!self.$isEmpty)
-            self._emit("changeSelection");
-        if (!self.$keepDesiredColumnOnChange && e.old.column != e.value.column)
-            self.$desiredColumn = null;
-    });
-
-    this.selectionAnchor.on("change", function() {
-        if (!self.$isEmpty)
-            self._emit("changeSelection");
-    });
-};
-
-(function() {
-
-    oop.implement(this, EventEmitter);
-
-    this.isEmpty = function() {
-        return (this.$isEmpty || (
-            this.selectionAnchor.row == this.selectionLead.row &&
-            this.selectionAnchor.column == this.selectionLead.column
-        ));
-    };
-
-    this.isMultiLine = function() {
-        if (this.isEmpty()) {
-            return false;
-        }
-
-        return this.getRange().isMultiLine();
-    };
-
-    this.getCursor = function() {
-        return this.selectionLead.getPosition();
-    };
-
-    this.setSelectionAnchor = function(row, column) {
-        this.selectionAnchor.setPosition(row, column);
-
-        if (this.$isEmpty) {
-            this.$isEmpty = false;
-            this._emit("changeSelection");
-        }
-    };
-
-    this.getSelectionAnchor = function() {
-        if (this.$isEmpty)
-            return this.getSelectionLead()
-        else
-            return this.selectionAnchor.getPosition();
-    };
-
-    this.getSelectionLead = function() {
-        return this.selectionLead.getPosition();
-    };
-
-    this.shiftSelection = function(columns) {
-        if (this.$isEmpty) {
-            this.moveCursorTo(this.selectionLead.row, this.selectionLead.column + columns);
-            return;
-        };
-
-        var anchor = this.getSelectionAnchor();
-        var lead = this.getSelectionLead();
-
-        var isBackwards = this.isBackwards();
-
-        if (!isBackwards || anchor.column !== 0)
-            this.setSelectionAnchor(anchor.row, anchor.column + columns);
-
-        if (isBackwards || lead.column !== 0) {
-            this.$moveSelection(function() {
-                this.moveCursorTo(lead.row, lead.column + columns);
-            });
-        }
-    };
-
-    this.isBackwards = function() {
-        var anchor = this.selectionAnchor;
-        var lead = this.selectionLead;
-        return (anchor.row > lead.row || (anchor.row == lead.row && anchor.column > lead.column));
-    };
-
-    this.getRange = function() {
-        var anchor = this.selectionAnchor;
-        var lead = this.selectionLead;
-
-        if (this.isEmpty())
-            return Range.fromPoints(lead, lead);
-
-        if (this.isBackwards()) {
-            return Range.fromPoints(lead, anchor);
-        }
-        else {
-            return Range.fromPoints(anchor, lead);
-        }
-    };
-
-    this.clearSelection = function() {
-        if (!this.$isEmpty) {
-            this.$isEmpty = true;
-            this._emit("changeSelection");
-        }
-    };
-
-    this.selectAll = function() {
-        var lastRow = this.doc.getLength() - 1;
-        this.setSelectionAnchor(lastRow, this.doc.getLine(lastRow).length);
-        this.moveCursorTo(0, 0);
-    };
-
-    this.setSelectionRange = function(range, reverse) {
-        if (reverse) {
-            this.setSelectionAnchor(range.end.row, range.end.column);
-            this.selectTo(range.start.row, range.start.column);
-        } else {
-            this.setSelectionAnchor(range.start.row, range.start.column);
-            this.selectTo(range.end.row, range.end.column);
-        }
-        this.$desiredColumn = null;
-    };
-
-    this.$moveSelection = function(mover) {
-        var lead = this.selectionLead;
-        if (this.$isEmpty)
-            this.setSelectionAnchor(lead.row, lead.column);
-
-        mover.call(this);
-    };
-
-    this.selectTo = function(row, column) {
-        this.$moveSelection(function() {
-            this.moveCursorTo(row, column);
-        });
-    };
-
-    this.selectToPosition = function(pos) {
-        this.$moveSelection(function() {
-            this.moveCursorToPosition(pos);
-        });
-    };
-
-    this.selectUp = function() {
-        this.$moveSelection(this.moveCursorUp);
-    };
-
-    this.selectDown = function() {
-        this.$moveSelection(this.moveCursorDown);
-    };
-
-    this.selectRight = function() {
-        this.$moveSelection(this.moveCursorRight);
-    };
-
-    this.selectLeft = function() {
-        this.$moveSelection(this.moveCursorLeft);
-    };
-
-    this.selectLineStart = function() {
-        this.$moveSelection(this.moveCursorLineStart);
-    };
-
-    this.selectLineEnd = function() {
-        this.$moveSelection(this.moveCursorLineEnd);
-    };
-
-    this.selectFileEnd = function() {
-        this.$moveSelection(this.moveCursorFileEnd);
-    };
-
-    this.selectFileStart = function() {
-        this.$moveSelection(this.moveCursorFileStart);
-    };
-
-    this.selectWordRight = function() {
-        this.$moveSelection(this.moveCursorWordRight);
-    };
-
-    this.selectWordLeft = function() {
-        this.$moveSelection(this.moveCursorWordLeft);
-    };
-
-    this.selectWord = function() {
-        var cursor = this.getCursor();
-        var range  = this.session.getWordRange(cursor.row, cursor.column);
-        this.setSelectionRange(range);
-    };
-
-    // Selects a word including its right whitespace
-    this.selectAWord = function() {
-        var cursor = this.getCursor();
-        var range = this.session.getAWordRange(cursor.row, cursor.column);
-        this.setSelectionRange(range);
-    };
-
-    this.selectLine = function() {
-        var rowStart = this.selectionLead.row;
-        var rowEnd;
-
-        var foldLine = this.session.getFoldLine(rowStart);
-        if (foldLine) {
-            rowStart = foldLine.start.row;
-            rowEnd = foldLine.end.row;
-        } else {
-            rowEnd = rowStart;
-        }
-        this.setSelectionAnchor(rowStart, 0);
-        this.$moveSelection(function() {
-            this.moveCursorTo(rowEnd + 1, 0);
-        });
-    };
-
-    this.moveCursorUp = function() {
-        this.moveCursorBy(-1, 0);
-    };
-
-    this.moveCursorDown = function() {
-        this.moveCursorBy(1, 0);
-    };
-
-    this.moveCursorLeft = function() {
-        var cursor = this.selectionLead.getPosition(),
-            fold;
-
-        if (fold = this.session.getFoldAt(cursor.row, cursor.column, -1)) {
-            this.moveCursorTo(fold.start.row, fold.start.column);
-        } else if (cursor.column == 0) {
-            // cursor is a line (start
-            if (cursor.row > 0) {
-                this.moveCursorTo(cursor.row - 1, this.doc.getLine(cursor.row - 1).length);
-            }
-        }
-        else {
-            var tabSize = this.session.getTabSize();
-            if (this.session.isTabStop(cursor) && this.doc.getLine(cursor.row).slice(cursor.column-tabSize, cursor.column).split(" ").length-1 == tabSize)
-                this.moveCursorBy(0, -tabSize);
-            else
-                this.moveCursorBy(0, -1);
-        }
-    };
-
-    this.moveCursorRight = function() {
-        var cursor = this.selectionLead.getPosition(),
-            fold;
-        if (fold = this.session.getFoldAt(cursor.row, cursor.column, 1)) {
-            this.moveCursorTo(fold.end.row, fold.end.column);
-        }
-        else if (this.selectionLead.column == this.doc.getLine(this.selectionLead.row).length) {
-            if (this.selectionLead.row < this.doc.getLength() - 1) {
-                this.moveCursorTo(this.selectionLead.row + 1, 0);
-            }
-        }
-        else {
-            var tabSize = this.session.getTabSize();
-            var cursor = this.selectionLead;
-            if (this.session.isTabStop(cursor) && this.doc.getLine(cursor.row).slice(cursor.column, cursor.column+tabSize).split(" ").length-1 == tabSize)
-                this.moveCursorBy(0, tabSize);
-            else
-                this.moveCursorBy(0, 1);
-        }
-    };
-
-    this.moveCursorLineStart = function() {
-        var row = this.selectionLead.row;
-        var column = this.selectionLead.column;
-        var screenRow = this.session.documentToScreenRow(row, column);
-
-        // Determ the doc-position of the first character at the screen line.
-        var firstColumnPosition = this.session.screenToDocumentPosition(screenRow, 0);
-
-        // Determ the line
-        var beforeCursor = this.session.getDisplayLine(
-            row, null,
-            firstColumnPosition.row, firstColumnPosition.column
-        );
-
-        var leadingSpace = beforeCursor.match(/^\s*/);
-        if (leadingSpace[0].length == column) {
-            this.moveCursorTo(
-                firstColumnPosition.row, firstColumnPosition.column
-            );
-        }
-        else {
-            this.moveCursorTo(
-                firstColumnPosition.row,
-                firstColumnPosition.column + leadingSpace[0].length
-            );
-        }
-    };
-
-    this.moveCursorLineEnd = function() {
-        var lead = this.selectionLead;
-        var lastRowColumnPosition =
-            this.session.getDocumentLastRowColumnPosition(lead.row, lead.column);
-        this.moveCursorTo(
-            lastRowColumnPosition.row,
-            lastRowColumnPosition.column
-        );
-    };
-
-    this.moveCursorFileEnd = function() {
-        var row = this.doc.getLength() - 1;
-        var column = this.doc.getLine(row).length;
-        this.moveCursorTo(row, column);
-    };
-
-    this.moveCursorFileStart = function() {
-        this.moveCursorTo(0, 0);
-    };
-
-    this.moveCursorWordRight = function() {
-        var row = this.selectionLead.row;
-        var column = this.selectionLead.column;
-        var line = this.doc.getLine(row);
-        var rightOfCursor = line.substring(column);
-
-        var match;
-        this.session.nonTokenRe.lastIndex = 0;
-        this.session.tokenRe.lastIndex = 0;
-
-        // skip folds
-        var fold = this.session.getFoldAt(row, column, 1);
-        if (fold) {
-            this.moveCursorTo(fold.end.row, fold.end.column);
-            return;
-        }
-
-        // first skip space
-        if (match = this.session.nonTokenRe.exec(rightOfCursor)) {
-            column += this.session.nonTokenRe.lastIndex;
-            this.session.nonTokenRe.lastIndex = 0;
-            rightOfCursor = line.substring(column);
-        }
-
-        // if at line end proceed with next line
-        if (column >= line.length) {
-            this.moveCursorTo(row, line.length);
-            this.moveCursorRight();
-            if (row < this.doc.getLength() - 1)
-                this.moveCursorWordRight();
-            return;
-        }
-
-        // advance to the end of the next token
-        if (match = this.session.tokenRe.exec(rightOfCursor)) {
-            column += this.session.tokenRe.lastIndex;
-            this.session.tokenRe.lastIndex = 0;
-        }
-
-        this.moveCursorTo(row, column);
-    };
-
-    this.moveCursorWordLeft = function() {
-        var row = this.selectionLead.row;
-        var column = this.selectionLead.column;
-
-        // skip folds
-        var fold;
-        if (fold = this.session.getFoldAt(row, column, -1)) {
-            this.moveCursorTo(fold.start.row, fold.start.column);
-            return;
-        }
-
-        var str = this.session.getFoldStringAt(row, column, -1);
-        if (str == null) {
-            str = this.doc.getLine(row).substring(0, column)
-        }
-
-        var leftOfCursor = lang.stringReverse(str);
-        var match;
-        this.session.nonTokenRe.lastIndex = 0;
-        this.session.tokenRe.lastIndex = 0;
-
-        // skip whitespace
-        if (match = this.session.nonTokenRe.exec(leftOfCursor)) {
-            column -= this.session.nonTokenRe.lastIndex;
-            leftOfCursor = leftOfCursor.slice(this.session.nonTokenRe.lastIndex);
-            this.session.nonTokenRe.lastIndex = 0;
-        }
-
-        // if at begin of the line proceed in line above
-        if (column <= 0) {
-            this.moveCursorTo(row, 0);
-            this.moveCursorLeft();
-            if (row > 0)
-                this.moveCursorWordLeft();
-            return;
-        }
-
-        // move to the begin of the word
-        if (match = this.session.tokenRe.exec(leftOfCursor)) {
-            column -= this.session.tokenRe.lastIndex;
-            this.session.tokenRe.lastIndex = 0;
-        }
-
-        this.moveCursorTo(row, column);
-    };
-
-    this.moveCursorBy = function(rows, chars) {
-        var screenPos = this.session.documentToScreenPosition(
-            this.selectionLead.row,
-            this.selectionLead.column
-        );
-
-        if (chars === 0) {
-            if (this.$desiredColumn)
-                screenPos.column = this.$desiredColumn;
-            else
-                this.$desiredColumn = screenPos.column;
-        }
-
-        var docPos = this.session.screenToDocumentPosition(screenPos.row + rows, screenPos.column);
-
-        // move the cursor and update the desired column
-        this.moveCursorTo(docPos.row, docPos.column + chars, chars === 0);
-    };
-
-    this.moveCursorToPosition = function(position) {
-        this.moveCursorTo(position.row, position.column);
-    };
-
-    this.moveCursorTo = function(row, column, keepDesiredColumn) {
-        // Ensure the row/column is not inside of a fold.
-        var fold = this.session.getFoldAt(row, column, 1);
-        if (fold) {
-            row = fold.start.row;
-            column = fold.start.column;
-        }
-
-        this.$keepDesiredColumnOnChange = true;
-        this.selectionLead.setPosition(row, column);
-        this.$keepDesiredColumnOnChange = false;
-
-        if (!keepDesiredColumn)
-            this.$desiredColumn = null;
-    };
-
-    this.moveCursorToScreen = function(row, column, keepDesiredColumn) {
-        var pos = this.session.screenToDocumentPosition(row, column);
-        this.moveCursorTo(pos.row, pos.column, keepDesiredColumn);
-    };
-
-    // remove listeners from document
-    this.detach = function() {
-        this.selectionLead.detach();
-        this.selectionAnchor.detach();
-        this.session = this.doc = null;
-    }
-
-    this.fromOrientedRange = function(range) {
-        this.setSelectionRange(range, range.cursor == range.start);
-        this.$desiredColumn = range.desiredColumn || this.$desiredColumn;
-    }
-
-    this.toOrientedRange = function(range) {
-        var r = this.getRange();
-        if (range) {
-            range.start.column = r.start.column;
-            range.start.row = r.start.row;
-            range.end.column = r.end.column;
-            range.end.row = r.end.row;
-        } else {
-            range = r;
-        }
-
-        range.cursor = this.isBackwards() ? range.start : range.end;
-        range.desiredColumn = this.$desiredColumn;
-        return range;
-    }
-
-}).call(Selection.prototype);
-
-exports.Selection = Selection;
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/range', ['require', 'exports', 'module' ], function(require, exports, module) {
-"use strict";
-
-var Range = function(startRow, startColumn, endRow, endColumn) {
-    this.start = {
-        row: startRow,
-        column: startColumn
-    };
-
-    this.end = {
-        row: endRow,
-        column: endColumn
-    };
-};
-
-(function() {
-    this.isEqual = function(range) {
-        return this.start.row == range.start.row &&
-            this.end.row == range.end.row &&
-            this.start.column == range.start.column &&
-            this.end.column == range.end.column
-    };
-
-    this.toString = function() {
-        return ("Range: [" + this.start.row + "/" + this.start.column +
-            "] -> [" + this.end.row + "/" + this.end.column + "]");
-    };
-
-    this.contains = function(row, column) {
-        return this.compare(row, column) == 0;
-    };
-
-    /**
-     * Compares this range (A) with another range (B), where B is the passed in
-     * range.
-     *
-     * Return values:
-     *  -2: (B) is infront of (A) and doesn't intersect with (A)
-     *  -1: (B) begins before (A) but ends inside of (A)
-     *   0: (B) is completly inside of (A) OR (A) is complety inside of (B)
-     *  +1: (B) begins inside of (A) but ends outside of (A)
-     *  +2: (B) is after (A) and doesn't intersect with (A)
-     *
-     *  42: FTW state: (B) ends in (A) but starts outside of (A)
-     */
-    this.compareRange = function(range) {
-        var cmp,
-            end = range.end,
-            start = range.start;
-
-        cmp = this.compare(end.row, end.column);
-        if (cmp == 1) {
-            cmp = this.compare(start.row, start.column);
-            if (cmp == 1) {
-                return 2;
-            } else if (cmp == 0) {
-                return 1;
-            } else {
-                return 0;
-            }
-        } else if (cmp == -1) {
-            return -2;
-        } else {
-            cmp = this.compare(start.row, start.column);
-            if (cmp == -1) {
-                return -1;
-            } else if (cmp == 1) {
-                return 42;
-            } else {
-                return 0;
-            }
-        }
-    }
-
-    this.comparePoint = function(p) {
-        return this.compare(p.row, p.column);
-    }
-
-    this.containsRange = function(range) {
-        return this.comparePoint(range.start) == 0 && this.comparePoint(range.end) == 0;
-    }
-
-    this.intersectsRange = function(range) {
-        var cmp = this.compareRange(range);
-        return (cmp == -1 || cmp == 0 || cmp == 1);
-    }
-
-    this.isEnd = function(row, column) {
-        return this.end.row == row && this.end.column == column;
-    }
-
-    this.isStart = function(row, column) {
-        return this.start.row == row && this.start.column == column;
-    }
-
-    this.setStart = function(row, column) {
-        if (typeof row == "object") {
-            this.start.column = row.column;
-            this.start.row = row.row;
-        } else {
-            this.start.row = row;
-            this.start.column = column;
-        }
-    }
-
-    this.setEnd = function(row, column) {
-        if (typeof row == "object") {
-            this.end.column = row.column;
-            this.end.row = row.row;
-        } else {
-            this.end.row = row;
-            this.end.column = column;
-        }
-    }
-
-    this.inside = function(row, column) {
-        if (this.compare(row, column) == 0) {
-            if (this.isEnd(row, column) || this.isStart(row, column)) {
-                return false;
-            } else {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    this.insideStart = function(row, column) {
-        if (this.compare(row, column) == 0) {
-            if (this.isEnd(row, column)) {
-                return false;
-            } else {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    this.insideEnd = function(row, column) {
-        if (this.compare(row, column) == 0) {
-            if (this.isStart(row, column)) {
-                return false;
-            } else {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    this.compare = function(row, column) {
-        if (!this.isMultiLine()) {
-            if (row === this.start.row) {
-                return column < this.start.column ? -1 : (column > this.end.column ? 1 : 0);
-            };
-        }
-
-        if (row < this.start.row)
-            return -1;
-
-        if (row > this.end.row)
-            return 1;
-
-        if (this.start.row === row)
-            return column >= this.start.column ? 0 : -1;
-
-        if (this.end.row === row)
-            return column <= this.end.column ? 0 : 1;
-
-        return 0;
-    };
-
-    /**
-     * Like .compare(), but if isStart is true, return -1;
-     */
-    this.compareStart = function(row, column) {
-        if (this.start.row == row && this.start.column == column) {
-            return -1;
-        } else {
-            return this.compare(row, column);
-        }
-    }
-
-    /**
-     * Like .compare(), but if isEnd is true, return 1;
-     */
-    this.compareEnd = function(row, column) {
-        if (this.end.row == row && this.end.column == column) {
-            return 1;
-        } else {
-            return this.compare(row, column);
-        }
-    }
-
-    this.compareInside = function(row, column) {
-        if (this.end.row == row && this.end.column == column) {
-            return 1;
-        } else if (this.start.row == row && this.start.column == column) {
-            return -1;
-        } else {
-            return this.compare(row, column);
-        }
-    }
-
-    this.clipRows = function(firstRow, lastRow) {
-        if (this.end.row > lastRow) {
-            var end = {
-                row: lastRow+1,
-                column: 0
-            };
-        }
-
-        if (this.start.row > lastRow) {
-            var start = {
-                row: lastRow+1,
-                column: 0
-            };
-        }
-
-        if (this.start.row < firstRow) {
-            var start = {
-                row: firstRow,
-                column: 0
-            };
-        }
-
-        if (this.end.row < firstRow) {
-            var end = {
-                row: firstRow,
-                column: 0
-            };
-        }
-        return Range.fromPoints(start || this.start, end || this.end);
-    };
-
-    this.extend = function(row, column) {
-        var cmp = this.compare(row, column);
-
-        if (cmp == 0)
-            return this;
-        else if (cmp == -1)
-            var start = {row: row, column: column};
-        else
-            var end = {row: row, column: column};
-
-        return Range.fromPoints(start || this.start, end || this.end);
-    };
-
-    this.fixOrientation = function() {
-        if (
-            this.start.row < this.end.row 
-            || (this.start.row == this.end.row && this.start.column < this.end.column)
-        ) {
-            return false;
-        }
-        
-        var temp = this.start;
-        this.end = this.start;
-        this.start = temp;
-        return true;
-    };
-
-
-    this.isEmpty = function() {
-        return (this.start.row == this.end.row && this.start.column == this.end.column);
-    };
-
-    this.isMultiLine = function() {
-        return (this.start.row !== this.end.row);
-    };
-
-    this.clone = function() {
-        return Range.fromPoints(this.start, this.end);
-    };
-
-    this.collapseRows = function() {
-        if (this.end.column == 0)
-            return new Range(this.start.row, 0, Math.max(this.start.row, this.end.row-1), 0)
-        else
-            return new Range(this.start.row, 0, this.end.row, 0)
-    };
-
-    this.toScreenRange = function(session) {
-        var screenPosStart =
-            session.documentToScreenPosition(this.start);
-        var screenPosEnd =
-            session.documentToScreenPosition(this.end);
-
-        return new Range(
-            screenPosStart.row, screenPosStart.column,
-            screenPosEnd.row, screenPosEnd.column
-        );
-    };
-
-}).call(Range.prototype);
-
-
-Range.fromPoints = function(start, end) {
-    return new Range(start.row, start.column, end.row, end.column);
-};
-
-exports.Range = Range;
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Mihai Sucan <mihai DOT sucan AT gmail DOT com>
- *      Chris Spencer <chris.ag.spencer AT googlemail DOT com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/text', ['require', 'exports', 'module' , 'ace/tokenizer', 'ace/mode/text_highlight_rules', 'ace/mode/behaviour', 'ace/unicode'], function(require, exports, module) {
-"use strict";
-
-var Tokenizer = require("../tokenizer").Tokenizer;
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-var Behaviour = require("./behaviour").Behaviour;
-var unicode = require("../unicode");
-
-var Mode = function() {
-    this.$tokenizer = new Tokenizer(new TextHighlightRules().getRules());
-    this.$behaviour = new Behaviour();
-};
-
-(function() {
-
-    this.tokenRe = new RegExp("^["
-        + unicode.packages.L
-        + unicode.packages.Mn + unicode.packages.Mc
-        + unicode.packages.Nd
-        + unicode.packages.Pc + "\\$_]+", "g"
-    );
-    
-    this.nonTokenRe = new RegExp("^(?:[^"
-        + unicode.packages.L
-        + unicode.packages.Mn + unicode.packages.Mc
-        + unicode.packages.Nd
-        + unicode.packages.Pc + "\\$_]|\s])+", "g"
-    );
-
-    this.getTokenizer = function() {
-        return this.$tokenizer;
-    };
-
-    this.toggleCommentLines = function(state, doc, startRow, endRow) {
-    };
-
-    this.getNextLineIndent = function(state, line, tab) {
-        return "";
-    };
-
-    this.checkOutdent = function(state, line, input) {
-        return false;
-    };
-
-    this.autoOutdent = function(state, doc, row) {
-    };
-
-    this.$getIndent = function(line) {
-        var match = line.match(/^(\s+)/);
-        if (match) {
-            return match[1];
-        }
-
-        return "";
-    };
-    
-    this.createWorker = function(session) {
-        return null;
-    };
-
-    this.highlightSelection = function(editor) {
-        var session = editor.session;
-        if (!session.$selectionOccurrences)
-            session.$selectionOccurrences = [];
-
-        if (session.$selectionOccurrences.length)
-            this.clearSelectionHighlight(editor);
-
-        var selection = editor.getSelectionRange();
-        if (selection.isEmpty() || selection.isMultiLine())
-            return;
-
-        var startOuter = selection.start.column - 1;
-        var endOuter = selection.end.column + 1;
-        var line = session.getLine(selection.start.row);
-        var lineCols = line.length;
-        var needle = line.substring(Math.max(startOuter, 0),
-                                    Math.min(endOuter, lineCols));
-
-        // Make sure the outer characters are not part of the word.
-        if ((startOuter >= 0 && /^[\w\d]/.test(needle)) ||
-            (endOuter <= lineCols && /[\w\d]$/.test(needle)))
-            return;
-
-        needle = line.substring(selection.start.column, selection.end.column);
-        if (!/^[\w\d]+$/.test(needle))
-            return;
-
-        var cursor = editor.getCursorPosition();
-
-        var newOptions = {
-            wrap: true,
-            wholeWord: true,
-            caseSensitive: true,
-            needle: needle
-        };
-
-        var currentOptions = editor.$search.getOptions();
-        editor.$search.set(newOptions);
-
-        var ranges = editor.$search.findAll(session);
-        ranges.forEach(function(range) {
-            if (!range.contains(cursor.row, cursor.column)) {
-                var marker = session.addMarker(range, "ace_selected_word", "text");
-                session.$selectionOccurrences.push(marker);
-            }
-        });
-
-        editor.$search.set(currentOptions);
-    };
-
-    this.clearSelectionHighlight = function(editor) {
-        if (!editor.session.$selectionOccurrences)
-            return;
-
-        editor.session.$selectionOccurrences.forEach(function(marker) {
-            editor.session.removeMarker(marker);
-        });
-
-        editor.session.$selectionOccurrences = [];
-    };
-    
-    this.createModeDelegates = function (mapping) {
-        if (!this.$embeds) {
-            return;
-        }
-        this.$modes = {};
-        for (var i = 0; i < this.$embeds.length; i++) {
-            if (mapping[this.$embeds[i]]) {
-                this.$modes[this.$embeds[i]] = new mapping[this.$embeds[i]]();
-            }
-        }
-        
-        var delegations = ['toggleCommentLines', 'getNextLineIndent', 'checkOutdent', 'autoOutdent', 'transformAction'];
-
-        for (var i = 0; i < delegations.length; i++) {
-            (function(scope) {
-              var functionName = delegations[i];
-              var defaultHandler = scope[functionName];
-              scope[delegations[i]] = function() {
-                  return this.$delegator(functionName, arguments, defaultHandler);
-              }
-            } (this));
-        }
-    }
-    
-    this.$delegator = function(method, args, defaultHandler) {
-        var state = args[0];
-        
-        for (var i = 0; i < this.$embeds.length; i++) {
-            if (!this.$modes[this.$embeds[i]]) continue;
-            
-            var split = state.split(this.$embeds[i]);
-            if (!split[0] && split[1]) {
-                args[0] = split[1];
-                var mode = this.$modes[this.$embeds[i]];
-                return mode[method].apply(mode, args);
-            }
-        }
-        var ret = defaultHandler.apply(this, args);
-        return defaultHandler ? ret : undefined;
-    };
-    
-    this.transformAction = function(state, action, editor, session, param) {
-        if (this.$behaviour) {
-            var behaviours = this.$behaviour.getBehaviours();
-            for (var key in behaviours) {
-                if (behaviours[key][action]) {
-                    var ret = behaviours[key][action].apply(this, arguments);
-                    if (ret) {
-                        return ret;
-                    }
-                }
-            }
-        }
-    }
-    
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/tokenizer', ['require', 'exports', 'module' ], function(require, exports, module) {
-"use strict";
-
-var Tokenizer = function(rules, flag) {
-    flag = flag ? "g" + flag : "g";
-    this.rules = rules;
-
-    this.regExps = {};
-    this.matchMappings = {};
-    for ( var key in this.rules) {
-        var rule = this.rules[key];
-        var state = rule;
-        var ruleRegExps = [];
-        var matchTotal = 0;
-        var mapping = this.matchMappings[key] = {};
-
-        for ( var i = 0; i < state.length; i++) {
-
-            if (state[i].regex instanceof RegExp)
-                state[i].regex = state[i].regex.toString().slice(1, -1);
-
-            // Count number of matching groups. 2 extra groups from the full match
-            // And the catch-all on the end (used to force a match);
-            var matchcount = new RegExp("(?:(" + state[i].regex + ")|(.))").exec("a").length - 2;
-
-            // Replace any backreferences and offset appropriately.
-            var adjustedregex = state[i].regex.replace(/\\([0-9]+)/g, function (match, digit) {
-                return "\\" + (parseInt(digit, 10) + matchTotal + 1);
-            });
-
-            if (matchcount > 1 && state[i].token.length !== matchcount-1)
-                throw new Error("Matching groups and length of the token array don't match in rule #" + i + " of state " + key);
-
-            mapping[matchTotal] = {
-                rule: i,
-                len: matchcount
-            };
-            matchTotal += matchcount;
-
-            ruleRegExps.push(adjustedregex);
-        }
-
-        this.regExps[key] = new RegExp("(?:(" + ruleRegExps.join(")|(") + ")|(.))", flag);
-    }
-};
-
-(function() {
-
-    this.getLineTokens = function(line, startState) {
-        var currentState = startState;
-        var state = this.rules[currentState];
-        var mapping = this.matchMappings[currentState];
-        var re = this.regExps[currentState];
-        re.lastIndex = 0;
-
-        var match, tokens = [];
-
-        var lastIndex = 0;
-
-        var token = {
-            type: null,
-            value: ""
-        };
-
-        while (match = re.exec(line)) {
-            var type = "text";
-            var rule = null;
-            var value = [match[0]];
-
-            for (var i = 0; i < match.length-2; i++) {
-                if (match[i + 1] === undefined)
-                    continue;
-
-                rule = state[mapping[i].rule];
-
-                if (mapping[i].len > 1)
-                    value = match.slice(i+2, i+1+mapping[i].len);
-
-                // compute token type
-                if (typeof rule.token == "function")
-                    type = rule.token.apply(this, value);
-                else
-                    type = rule.token;
-
-                var next = rule.next;
-                if (next && next !== currentState) {
-                    currentState = next;
-                    state = this.rules[currentState];
-                    mapping = this.matchMappings[currentState];
-                    lastIndex = re.lastIndex;
-
-                    re = this.regExps[currentState];
-                    re.lastIndex = lastIndex;
-                }
-                break;
-            }
-
-            if (value[0]) {
-                if (typeof type == "string") {
-                    value = [value.join("")];
-                    type = [type];
-                }
-                for (var i = 0; i < value.length; i++) {
-                    if (!value[i])
-                        continue;
-
-                    if ((!rule || rule.merge || type[i] === "text") && token.type === type[i]) {
-                        token.value += value[i];
-                    } else {
-                        if (token.type)
-                            tokens.push(token);
-
-                        token = {
-                            type: type[i],
-                            value: value[i]
-                        };
-                    }
-                }
-            }
-
-            if (lastIndex == line.length)
-                break;
-
-            lastIndex = re.lastIndex;
-        }
-
-        if (token.type)
-            tokens.push(token);
-
-        return {
-            tokens : tokens,
-            state : currentState
-        };
-    };
-
-}).call(Tokenizer.prototype);
-
-exports.Tokenizer = Tokenizer;
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/text_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/lang'], function(require, exports, module) {
-"use strict";
-
-var lang = require("../lib/lang");
-
-var TextHighlightRules = function() {
-
-    // regexp must not have capturing parentheses
-    // regexps are ordered -> the first match is used
-
-    this.$rules = {
-        "start" : [{
-            token : "empty_line",
-            regex : '^$'
-        }, {
-            token : "text",
-            regex : ".+"
-        }]
-    };
-};
-
-(function() {
-
-    this.addRules = function(rules, prefix) {
-        for (var key in rules) {
-            var state = rules[key];
-            for (var i=0; i<state.length; i++) {
-                var rule = state[i];
-                if (rule.next) {
-                    rule.next = prefix + rule.next;
-                } else {
-                    rule.next = prefix + key;
-                }
-            }
-            this.$rules[prefix + key] = state;
-        }
-    };
-
-    this.getRules = function() {
-        return this.$rules;
-    };
-    
-    this.embedRules = function (HighlightRules, prefix, escapeRules, states) {
-        var embedRules = new HighlightRules().getRules();
-        if (states) {
-            for (var i = 0; i < states.length; i++) {
-                states[i] = prefix + states[i];
-            }
-        } else {
-            states = [];
-            for (var key in embedRules) {
-                states.push(prefix + key);
-            }
-        }
-        this.addRules(embedRules, prefix);
-        
-        for (var i = 0; i < states.length; i++) {
-            Array.prototype.unshift.apply(this.$rules[states[i]], lang.deepCopy(escapeRules));
-        }
-        
-        if (!this.$embeds) {
-            this.$embeds = [];
-        }
-        this.$embeds.push(prefix);
-    }
-    
-    this.getEmbeds = function() {
-        return this.$embeds;
-    }
-
-}).call(TextHighlightRules.prototype);
-
-exports.TextHighlightRules = TextHighlightRules;
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Chris Spencer <chris.ag.spencer AT googlemail DOT com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/behaviour', ['require', 'exports', 'module' ], function(require, exports, module) {
-"use strict";
-
-var Behaviour = function() {
-   this.$behaviours = {};
-};
-
-(function () {
-
-    this.add = function (name, action, callback) {
-        switch (undefined) {
-          case this.$behaviours:
-              this.$behaviours = {};
-          case this.$behaviours[name]:
-              this.$behaviours[name] = {};
-        }
-        this.$behaviours[name][action] = callback;
-    }
-    
-    this.addBehaviours = function (behaviours) {
-        for (var key in behaviours) {
-            for (var action in behaviours[key]) {
-                this.add(key, action, behaviours[key][action]);
-            }
-        }
-    }
-    
-    this.remove = function (name) {
-        if (this.$behaviours && this.$behaviours[name]) {
-            delete this.$behaviours[name];
-        }
-    }
-    
-    this.inherit = function (mode, filter) {
-        if (typeof mode === "function") {
-            var behaviours = new mode().getBehaviours(filter);
-        } else {
-            var behaviours = mode.getBehaviours(filter);
-        }
-        this.addBehaviours(behaviours);
-    }
-    
-    this.getBehaviours = function (filter) {
-        if (!filter) {
-            return this.$behaviours;
-        } else {
-            var ret = {}
-            for (var i = 0; i < filter.length; i++) {
-                if (this.$behaviours[filter[i]]) {
-                    ret[filter[i]] = this.$behaviours[filter[i]];
-                }
-            }
-            return ret;
-        }
-    }
-
-}).call(Behaviour.prototype);
-
-exports.Behaviour = Behaviour;
-});define('ace/unicode', ['require', 'exports', 'module' ], function(require, exports, module) {
-"use strict";
-
-/*
-XRegExp Unicode plugin pack: Categories 1.0
-(c) 2010 Steven Levithan
-MIT License
-<http://xregexp.com>
-Uses the Unicode 5.2 character database
-
-This package for the XRegExp Unicode plugin enables the following Unicode categories (aka properties):
-
-L - Letter (the top-level Letter category is included in the Unicode plugin base script)
-    Ll - Lowercase letter
-    Lu - Uppercase letter
-    Lt - Titlecase letter
-    Lm - Modifier letter
-    Lo - Letter without case
-M - Mark
-    Mn - Non-spacing mark
-    Mc - Spacing combining mark
-    Me - Enclosing mark
-N - Number
-    Nd - Decimal digit
-    Nl - Letter number
-    No -  Other number
-P - Punctuation
-    Pd - Dash punctuation
-    Ps - Open punctuation
-    Pe - Close punctuation
-    Pi - Initial punctuation
-    Pf - Final punctuation
-    Pc - Connector punctuation
-    Po - Other punctuation
-S - Symbol
-    Sm - Math symbol
-    Sc - Currency symbol
-    Sk - Modifier symbol
-    So - Other symbol
-Z - Separator
-    Zs - Space separator
-    Zl - Line separator
-    Zp - Paragraph separator
-C - Other
-    Cc - Control
-    Cf - Format
-    Co - Private use
-    Cs - Surrogate
-    Cn - Unassigned
-
-Example usage:
-
-    \p{N}
-    \p{Cn}
-*/
-
-
-// will be populated by addUnicodePackage
-exports.packages = {};
-
-addUnicodePackage({
-    L:  "0041-005A0061-007A00AA00B500BA00C0-00D600D8-00F600F8-02C102C6-02D102E0-02E402EC02EE0370-037403760377037A-037D03860388-038A038C038E-03A103A3-03F503F7-0481048A-05250531-055605590561-058705D0-05EA05F0-05F20621-064A066E066F0671-06D306D506E506E606EE06EF06FA-06FC06FF07100712-072F074D-07A507B107CA-07EA07F407F507FA0800-0815081A082408280904-0939093D09500958-0961097109720979-097F0985-098C098F09900993-09A809AA-09B009B209B6-09B909BD09CE09DC09DD09DF-09E109F009F10A05-0A0A0A0F0A100A13-0A280A2A-0A300A320A330A350A360A380A390A59-0A5C0A5E0A72-0A740A85-0A8D0A8F-0A910A93-0AA80AAA-0AB00AB20AB30AB5-0AB90ABD0AD00AE00AE10B05-0B0C0B0F0B100B13-0B280B2A-0B300B320B330B35-0B390B3D0B5C0B5D0B5F-0B610B710B830B85-0B8A0B8E-0B900B92-0B950B990B9A0B9C0B9E0B9F0BA30BA40BA8-0BAA0BAE-0BB90BD00C05-0C0C0C0E-0C100C12-0C280C2A-0C330C35-0C390C3D0C580C590C600C610C85-0C8C0C8E-0C900C92-0CA80CAA-0CB30CB5-0CB90CBD0CDE0CE00CE10D05-0D0C0D0E-0D100D12-0D280D2A-0D390D3D0D600D610D7A-0D7F0D85-0D960D9A-0DB10DB3-0DBB0DBD0DC0-0DC60E01-0E300E320E330E40-0E460E810E820E840E870E880E8A0E8D0E94-0E970E99-0E9F0EA1-0EA30EA50EA70EAA0EAB0EAD-0EB00EB20EB30EBD0EC0-0EC40EC60EDC0EDD0F000F40-0F470F49-0F6C0F88-0F8B1000-102A103F1050-1055105A-105D106110651066106E-10701075-1081108E10A0-10C510D0-10FA10FC1100-1248124A-124D1250-12561258125A-125D1260-1288128A-128D1290-12B012B2-12B512B8-12BE12C012C2-12C512C8-12D612D8-13101312-13151318-135A1380-138F13A0-13F41401-166C166F-167F1681-169A16A0-16EA1700-170C170E-17111720-17311740-17511760-176C176E-17701780-17B317D717DC1820-18771880-18A818AA18B0-18F51900-191C1950-196D1970-19741980-19AB19C1-19C71A00-1A161A20-1A541AA71B05-1B331B45-1B4B1B83-1BA01BAE1BAF1C00-1C231C4D-1C4F1C5A-1C7D1CE9-1CEC1CEE-1CF11D00-1DBF1E00-1F151F18-1F1D1F20-1F451F48-1F4D1F50-1F571F591F5B1F5D1F5F-1F7D1F80-1FB41FB6-1FBC1FBE1FC2-1FC41FC6-1FCC1FD0-1FD31FD6-1FDB1FE0-1FEC1FF2-1FF41FF6-1FFC2071207F2090-209421022107210A-211321152119-211D212421262128212A-212D212F-2139213C-213F2145-2149214E218321842C00-2C2E2C30-2C5E2C60-2CE42CEB-2CEE2D00-2D252D30-2D652D6F2D80-2D962DA0-2DA62DA8-2DAE2DB0-2DB62DB8-2DBE2DC0-2DC62DC8-2DCE2DD0-2DD62DD8-2DDE2E2F300530063031-3035303B303C3041-3096309D-309F30A1-30FA30FC-30FF3105-312D3131-318E31A0-31B731F0-31FF3400-4DB54E00-9FCBA000-A48CA4D0-A4FDA500-A60CA610-A61FA62AA62BA640-A65FA662-A66EA67F-A697A6A0-A6E5A717-A71FA722-A788A78BA78CA7FB-A801A803-A805A807-A80AA80C-A822A840-A873A882-A8B3A8F2-A8F7A8FBA90A-A925A930-A946A960-A97CA984-A9B2A9CFAA00-AA28AA40-AA42AA44-AA4BAA60-AA76AA7AAA80-AAAFAAB1AAB5AAB6AAB9-AABDAAC0AAC2AADB-AADDABC0-ABE2AC00-D7A3D7B0-D7C6D7CB-D7FBF900-FA2DFA30-FA6DFA70-FAD9FB00-FB06FB13-FB17FB1DFB1F-FB28FB2A-FB36FB38-FB3CFB3EFB40FB41FB43FB44FB46-FBB1FBD3-FD3DFD50-FD8FFD92-FDC7FDF0-FDFBFE70-FE74FE76-FEFCFF21-FF3AFF41-FF5AFF66-FFBEFFC2-FFC7FFCA-FFCFFFD2-FFD7FFDA-FFDC",
-    Ll: "0061-007A00AA00B500BA00DF-00F600F8-00FF01010103010501070109010B010D010F01110113011501170119011B011D011F01210123012501270129012B012D012F01310133013501370138013A013C013E014001420144014601480149014B014D014F01510153015501570159015B015D015F01610163016501670169016B016D016F0171017301750177017A017C017E-0180018301850188018C018D019201950199-019B019E01A101A301A501A801AA01AB01AD01B001B401B601B901BA01BD-01BF01C601C901CC01CE01D001D201D401D601D801DA01DC01DD01DF01E101E301E501E701E901EB01ED01EF01F001F301F501F901FB01FD01FF02010203020502070209020B020D020F02110213021502170219021B021D021F02210223022502270229022B022D022F02310233-0239023C023F0240024202470249024B024D024F-02930295-02AF037103730377037B-037D039003AC-03CE03D003D103D5-03D703D903DB03DD03DF03E103E303E503E703E903EB03ED03EF-03F303F503F803FB03FC0430-045F04610463046504670469046B046D046F04710473047504770479047B047D047F0481048B048D048F04910493049504970499049B049D049F04A104A304A504A704A904AB04AD04AF04B104B304B504B704B904BB04BD04BF04C204C404C604C804CA04CC04CE04CF04D104D304D504D704D904DB04DD04DF04E104E304E504E704E904EB04ED04EF04F104F304F504F704F904FB04FD04FF05010503050505070509050B050D050F05110513051505170519051B051D051F0521052305250561-05871D00-1D2B1D62-1D771D79-1D9A1E011E031E051E071E091E0B1E0D1E0F1E111E131E151E171E191E1B1E1D1E1F1E211E231E251E271E291E2B1E2D1E2F1E311E331E351E371E391E3B1E3D1E3F1E411E431E451E471E491E4B1E4D1E4F1E511E531E551E571E591E5B1E5D1E5F1E611E631E651E671E691E6B1E6D1E6F1E711E731E751E771E791E7B1E7D1E7F1E811E831E851E871E891E8B1E8D1E8F1E911E931E95-1E9D1E9F1EA11EA31EA51EA71EA91EAB1EAD1EAF1EB11EB31EB51EB71EB91EBB1EBD1EBF1EC11EC31EC51EC71EC91ECB1ECD1ECF1ED11ED31ED51ED71ED91EDB1EDD1EDF1EE11EE31EE51EE71EE91EEB1EED1EEF1EF11EF31EF51EF71EF91EFB1EFD1EFF-1F071F10-1F151F20-1F271F30-1F371F40-1F451F50-1F571F60-1F671F70-1F7D1F80-1F871F90-1F971FA0-1FA71FB0-1FB41FB61FB71FBE1FC2-1FC41FC61FC71FD0-1FD31FD61FD71FE0-1FE71FF2-1FF41FF61FF7210A210E210F2113212F21342139213C213D2146-2149214E21842C30-2C5E2C612C652C662C682C6A2C6C2C712C732C742C76-2C7C2C812C832C852C872C892C8B2C8D2C8F2C912C932C952C972C992C9B2C9D2C9F2CA12CA32CA52CA72CA92CAB2CAD2CAF2CB12CB32CB52CB72CB92CBB2CBD2CBF2CC12CC32CC52CC72CC92CCB2CCD2CCF2CD12CD32CD52CD72CD92CDB2CDD2CDF2CE12CE32CE42CEC2CEE2D00-2D25A641A643A645A647A649A64BA64DA64FA651A653A655A657A659A65BA65DA65FA663A665A667A669A66BA66DA681A683A685A687A689A68BA68DA68FA691A693A695A697A723A725A727A729A72BA72DA72F-A731A733A735A737A739A73BA73DA73FA741A743A745A747A749A74BA74DA74FA751A753A755A757A759A75BA75DA75FA761A763A765A767A769A76BA76DA76FA771-A778A77AA77CA77FA781A783A785A787A78CFB00-FB06FB13-FB17FF41-FF5A",
-    Lu: "0041-005A00C0-00D600D8-00DE01000102010401060108010A010C010E01100112011401160118011A011C011E01200122012401260128012A012C012E01300132013401360139013B013D013F0141014301450147014A014C014E01500152015401560158015A015C015E01600162016401660168016A016C016E017001720174017601780179017B017D018101820184018601870189-018B018E-0191019301940196-0198019C019D019F01A001A201A401A601A701A901AC01AE01AF01B1-01B301B501B701B801BC01C401C701CA01CD01CF01D101D301D501D701D901DB01DE01E001E201E401E601E801EA01EC01EE01F101F401F6-01F801FA01FC01FE02000202020402060208020A020C020E02100212021402160218021A021C021E02200222022402260228022A022C022E02300232023A023B023D023E02410243-02460248024A024C024E03700372037603860388-038A038C038E038F0391-03A103A3-03AB03CF03D2-03D403D803DA03DC03DE03E003E203E403E603E803EA03EC03EE03F403F703F903FA03FD-042F04600462046404660468046A046C046E04700472047404760478047A047C047E0480048A048C048E04900492049404960498049A049C049E04A004A204A404A604A804AA04AC04AE04B004B204B404B604B804BA04BC04BE04C004C104C304C504C704C904CB04CD04D004D204D404D604D804DA04DC04DE04E004E204E404E604E804EA04EC04EE04F004F204F404F604F804FA04FC04FE05000502050405060508050A050C050E05100512051405160518051A051C051E0520052205240531-055610A0-10C51E001E021E041E061E081E0A1E0C1E0E1E101E121E141E161E181E1A1E1C1E1E1E201E221E241E261E281E2A1E2C1E2E1E301E321E341E361E381E3A1E3C1E3E1E401E421E441E461E481E4A1E4C1E4E1E501E521E541E561E581E5A1E5C1E5E1E601E621E641E661E681E6A1E6C1E6E1E701E721E741E761E781E7A1E7C1E7E1E801E821E841E861E881E8A1E8C1E8E1E901E921E941E9E1EA01EA21EA41EA61EA81EAA1EAC1EAE1EB01EB21EB41EB61EB81EBA1EBC1EBE1EC01EC21EC41EC61EC81ECA1ECC1ECE1ED01ED21ED41ED61ED81EDA1EDC1EDE1EE01EE21EE41EE61EE81EEA1EEC1EEE1EF01EF21EF41EF61EF81EFA1EFC1EFE1F08-1F0F1F18-1F1D1F28-1F2F1F38-1F3F1F48-1F4D1F591F5B1F5D1F5F1F68-1F6F1FB8-1FBB1FC8-1FCB1FD8-1FDB1FE8-1FEC1FF8-1FFB21022107210B-210D2110-211221152119-211D212421262128212A-212D2130-2133213E213F214521832C00-2C2E2C602C62-2C642C672C692C6B2C6D-2C702C722C752C7E-2C802C822C842C862C882C8A2C8C2C8E2C902C922C942C962C982C9A2C9C2C9E2CA02CA22CA42CA62CA82CAA2CAC2CAE2CB02CB22CB42CB62CB82CBA2CBC2CBE2CC02CC22CC42CC62CC82CCA2CCC2CCE2CD02CD22CD42CD62CD82CDA2CDC2CDE2CE02CE22CEB2CEDA640A642A644A646A648A64AA64CA64EA650A652A654A656A658A65AA65CA65EA662A664A666A668A66AA66CA680A682A684A686A688A68AA68CA68EA690A692A694A696A722A724A726A728A72AA72CA72EA732A734A736A738A73AA73CA73EA740A742A744A746A748A74AA74CA74EA750A752A754A756A758A75AA75CA75EA760A762A764A766A768A76AA76CA76EA779A77BA77DA77EA780A782A784A786A78BFF21-FF3A",
-    Lt: "01C501C801CB01F21F88-1F8F1F98-1F9F1FA8-1FAF1FBC1FCC1FFC",
-    Lm: "02B0-02C102C6-02D102E0-02E402EC02EE0374037A0559064006E506E607F407F507FA081A0824082809710E460EC610FC17D718431AA71C78-1C7D1D2C-1D611D781D9B-1DBF2071207F2090-20942C7D2D6F2E2F30053031-3035303B309D309E30FC-30FEA015A4F8-A4FDA60CA67FA717-A71FA770A788A9CFAA70AADDFF70FF9EFF9F",
-    Lo: "01BB01C0-01C3029405D0-05EA05F0-05F20621-063F0641-064A066E066F0671-06D306D506EE06EF06FA-06FC06FF07100712-072F074D-07A507B107CA-07EA0800-08150904-0939093D09500958-096109720979-097F0985-098C098F09900993-09A809AA-09B009B209B6-09B909BD09CE09DC09DD09DF-09E109F009F10A05-0A0A0A0F0A100A13-0A280A2A-0A300A320A330A350A360A380A390A59-0A5C0A5E0A72-0A740A85-0A8D0A8F-0A910A93-0AA80AAA-0AB00AB20AB30AB5-0AB90ABD0AD00AE00AE10B05-0B0C0B0F0B100B13-0B280B2A-0B300B320B330B35-0B390B3D0B5C0B5D0B5F-0B610B710B830B85-0B8A0B8E-0B900B92-0B950B990B9A0B9C0B9E0B9F0BA30BA40BA8-0BAA0BAE-0BB90BD00C05-0C0C0C0E-0C100C12-0C280C2A-0C330C35-0C390C3D0C580C590C600C610C85-0C8C0C8E-0C900C92-0CA80CAA-0CB30CB5-0CB90CBD0CDE0CE00CE10D05-0D0C0D0E-0D100D12-0D280D2A-0D390D3D0D600D610D7A-0D7F0D85-0D960D9A-0DB10DB3-0DBB0DBD0DC0-0DC60E01-0E300E320E330E40-0E450E810E820E840E870E880E8A0E8D0E94-0E970E99-0E9F0EA1-0EA30EA50EA70EAA0EAB0EAD-0EB00EB20EB30EBD0EC0-0EC40EDC0EDD0F000F40-0F470F49-0F6C0F88-0F8B1000-102A103F1050-1055105A-105D106110651066106E-10701075-1081108E10D0-10FA1100-1248124A-124D1250-12561258125A-125D1260-1288128A-128D1290-12B012B2-12B512B8-12BE12C012C2-12C512C8-12D612D8-13101312-13151318-135A1380-138F13A0-13F41401-166C166F-167F1681-169A16A0-16EA1700-170C170E-17111720-17311740-17511760-176C176E-17701780-17B317DC1820-18421844-18771880-18A818AA18B0-18F51900-191C1950-196D1970-19741980-19AB19C1-19C71A00-1A161A20-1A541B05-1B331B45-1B4B1B83-1BA01BAE1BAF1C00-1C231C4D-1C4F1C5A-1C771CE9-1CEC1CEE-1CF12135-21382D30-2D652D80-2D962DA0-2DA62DA8-2DAE2DB0-2DB62DB8-2DBE2DC0-2DC62DC8-2DCE2DD0-2DD62DD8-2DDE3006303C3041-3096309F30A1-30FA30FF3105-312D3131-318E31A0-31B731F0-31FF3400-4DB54E00-9FCBA000-A014A016-A48CA4D0-A4F7A500-A60BA610-A61FA62AA62BA66EA6A0-A6E5A7FB-A801A803-A805A807-A80AA80C-A822A840-A873A882-A8B3A8F2-A8F7A8FBA90A-A925A930-A946A960-A97CA984-A9B2AA00-AA28AA40-AA42AA44-AA4BAA60-AA6FAA71-AA76AA7AAA80-AAAFAAB1AAB5AAB6AAB9-AABDAAC0AAC2AADBAADCABC0-ABE2AC00-D7A3D7B0-D7C6D7CB-D7FBF900-FA2DFA30-FA6DFA70-FAD9FB1DFB1F-FB28FB2A-FB36FB38-FB3CFB3EFB40FB41FB43FB44FB46-FBB1FBD3-FD3DFD50-FD8FFD92-FDC7FDF0-FDFBFE70-FE74FE76-FEFCFF66-FF6FFF71-FF9DFFA0-FFBEFFC2-FFC7FFCA-FFCFFFD2-FFD7FFDA-FFDC",
-    M:  "0300-036F0483-04890591-05BD05BF05C105C205C405C505C70610-061A064B-065E067006D6-06DC06DE-06E406E706E806EA-06ED07110730-074A07A6-07B007EB-07F30816-0819081B-08230825-08270829-082D0900-0903093C093E-094E0951-0955096209630981-098309BC09BE-09C409C709C809CB-09CD09D709E209E30A01-0A030A3C0A3E-0A420A470A480A4B-0A4D0A510A700A710A750A81-0A830ABC0ABE-0AC50AC7-0AC90ACB-0ACD0AE20AE30B01-0B030B3C0B3E-0B440B470B480B4B-0B4D0B560B570B620B630B820BBE-0BC20BC6-0BC80BCA-0BCD0BD70C01-0C030C3E-0C440C46-0C480C4A-0C4D0C550C560C620C630C820C830CBC0CBE-0CC40CC6-0CC80CCA-0CCD0CD50CD60CE20CE30D020D030D3E-0D440D46-0D480D4A-0D4D0D570D620D630D820D830DCA0DCF-0DD40DD60DD8-0DDF0DF20DF30E310E34-0E3A0E47-0E4E0EB10EB4-0EB90EBB0EBC0EC8-0ECD0F180F190F350F370F390F3E0F3F0F71-0F840F860F870F90-0F970F99-0FBC0FC6102B-103E1056-1059105E-10601062-10641067-106D1071-10741082-108D108F109A-109D135F1712-17141732-1734175217531772177317B6-17D317DD180B-180D18A91920-192B1930-193B19B0-19C019C819C91A17-1A1B1A55-1A5E1A60-1A7C1A7F1B00-1B041B34-1B441B6B-1B731B80-1B821BA1-1BAA1C24-1C371CD0-1CD21CD4-1CE81CED1CF21DC0-1DE61DFD-1DFF20D0-20F02CEF-2CF12DE0-2DFF302A-302F3099309AA66F-A672A67CA67DA6F0A6F1A802A806A80BA823-A827A880A881A8B4-A8C4A8E0-A8F1A926-A92DA947-A953A980-A983A9B3-A9C0AA29-AA36AA43AA4CAA4DAA7BAAB0AAB2-AAB4AAB7AAB8AABEAABFAAC1ABE3-ABEAABECABEDFB1EFE00-FE0FFE20-FE26",
-    Mn: "0300-036F0483-04870591-05BD05BF05C105C205C405C505C70610-061A064B-065E067006D6-06DC06DF-06E406E706E806EA-06ED07110730-074A07A6-07B007EB-07F30816-0819081B-08230825-08270829-082D0900-0902093C0941-0948094D0951-095509620963098109BC09C1-09C409CD09E209E30A010A020A3C0A410A420A470A480A4B-0A4D0A510A700A710A750A810A820ABC0AC1-0AC50AC70AC80ACD0AE20AE30B010B3C0B3F0B41-0B440B4D0B560B620B630B820BC00BCD0C3E-0C400C46-0C480C4A-0C4D0C550C560C620C630CBC0CBF0CC60CCC0CCD0CE20CE30D41-0D440D4D0D620D630DCA0DD2-0DD40DD60E310E34-0E3A0E47-0E4E0EB10EB4-0EB90EBB0EBC0EC8-0ECD0F180F190F350F370F390F71-0F7E0F80-0F840F860F870F90-0F970F99-0FBC0FC6102D-10301032-10371039103A103D103E10581059105E-10601071-1074108210851086108D109D135F1712-17141732-1734175217531772177317B7-17BD17C617C9-17D317DD180B-180D18A91920-19221927192819321939-193B1A171A181A561A58-1A5E1A601A621A65-1A6C1A73-1A7C1A7F1B00-1B031B341B36-1B3A1B3C1B421B6B-1B731B801B811BA2-1BA51BA81BA91C2C-1C331C361C371CD0-1CD21CD4-1CE01CE2-1CE81CED1DC0-1DE61DFD-1DFF20D0-20DC20E120E5-20F02CEF-2CF12DE0-2DFF302A-302F3099309AA66FA67CA67DA6F0A6F1A802A806A80BA825A826A8C4A8E0-A8F1A926-A92DA947-A951A980-A982A9B3A9B6-A9B9A9BCAA29-AA2EAA31AA32AA35AA36AA43AA4CAAB0AAB2-AAB4AAB7AAB8AABEAABFAAC1ABE5ABE8ABEDFB1EFE00-FE0FFE20-FE26",
-    Mc: "0903093E-09400949-094C094E0982098309BE-09C009C709C809CB09CC09D70A030A3E-0A400A830ABE-0AC00AC90ACB0ACC0B020B030B3E0B400B470B480B4B0B4C0B570BBE0BBF0BC10BC20BC6-0BC80BCA-0BCC0BD70C01-0C030C41-0C440C820C830CBE0CC0-0CC40CC70CC80CCA0CCB0CD50CD60D020D030D3E-0D400D46-0D480D4A-0D4C0D570D820D830DCF-0DD10DD8-0DDF0DF20DF30F3E0F3F0F7F102B102C10311038103B103C105610571062-10641067-106D108310841087-108C108F109A-109C17B617BE-17C517C717C81923-19261929-192B193019311933-193819B0-19C019C819C91A19-1A1B1A551A571A611A631A641A6D-1A721B041B351B3B1B3D-1B411B431B441B821BA11BA61BA71BAA1C24-1C2B1C341C351CE11CF2A823A824A827A880A881A8B4-A8C3A952A953A983A9B4A9B5A9BAA9BBA9BD-A9C0AA2FAA30AA33AA34AA4DAA7BABE3ABE4ABE6ABE7ABE9ABEAABEC",
-    Me: "0488048906DE20DD-20E020E2-20E4A670-A672",
-    N:  "0030-003900B200B300B900BC-00BE0660-066906F0-06F907C0-07C90966-096F09E6-09EF09F4-09F90A66-0A6F0AE6-0AEF0B66-0B6F0BE6-0BF20C66-0C6F0C78-0C7E0CE6-0CEF0D66-0D750E50-0E590ED0-0ED90F20-0F331040-10491090-10991369-137C16EE-16F017E0-17E917F0-17F91810-18191946-194F19D0-19DA1A80-1A891A90-1A991B50-1B591BB0-1BB91C40-1C491C50-1C5920702074-20792080-20892150-21822185-21892460-249B24EA-24FF2776-27932CFD30073021-30293038-303A3192-31953220-32293251-325F3280-328932B1-32BFA620-A629A6E6-A6EFA830-A835A8D0-A8D9A900-A909A9D0-A9D9AA50-AA59ABF0-ABF9FF10-FF19",
-    Nd: "0030-00390660-066906F0-06F907C0-07C90966-096F09E6-09EF0A66-0A6F0AE6-0AEF0B66-0B6F0BE6-0BEF0C66-0C6F0CE6-0CEF0D66-0D6F0E50-0E590ED0-0ED90F20-0F291040-10491090-109917E0-17E91810-18191946-194F19D0-19DA1A80-1A891A90-1A991B50-1B591BB0-1BB91C40-1C491C50-1C59A620-A629A8D0-A8D9A900-A909A9D0-A9D9AA50-AA59ABF0-ABF9FF10-FF19",
-    Nl: "16EE-16F02160-21822185-218830073021-30293038-303AA6E6-A6EF",
-    No: "00B200B300B900BC-00BE09F4-09F90BF0-0BF20C78-0C7E0D70-0D750F2A-0F331369-137C17F0-17F920702074-20792080-20892150-215F21892460-249B24EA-24FF2776-27932CFD3192-31953220-32293251-325F3280-328932B1-32BFA830-A835",
-    P:  "0021-00230025-002A002C-002F003A003B003F0040005B-005D005F007B007D00A100AB00B700BB00BF037E0387055A-055F0589058A05BE05C005C305C605F305F40609060A060C060D061B061E061F066A-066D06D40700-070D07F7-07F90830-083E0964096509700DF40E4F0E5A0E5B0F04-0F120F3A-0F3D0F850FD0-0FD4104A-104F10FB1361-13681400166D166E169B169C16EB-16ED1735173617D4-17D617D8-17DA1800-180A1944194519DE19DF1A1E1A1F1AA0-1AA61AA8-1AAD1B5A-1B601C3B-1C3F1C7E1C7F1CD32010-20272030-20432045-20512053-205E207D207E208D208E2329232A2768-277527C527C627E6-27EF2983-299829D8-29DB29FC29FD2CF9-2CFC2CFE2CFF2E00-2E2E2E302E313001-30033008-30113014-301F3030303D30A030FBA4FEA4FFA60D-A60FA673A67EA6F2-A6F7A874-A877A8CEA8CFA8F8-A8FAA92EA92FA95FA9C1-A9CDA9DEA9DFAA5C-AA5FAADEAADFABEBFD3EFD3FFE10-FE19FE30-FE52FE54-FE61FE63FE68FE6AFE6BFF01-FF03FF05-FF0AFF0C-FF0FFF1AFF1BFF1FFF20FF3B-FF3DFF3FFF5BFF5DFF5F-FF65",
-    Pd: "002D058A05BE140018062010-20152E172E1A301C303030A0FE31FE32FE58FE63FF0D",
-    Ps: "0028005B007B0F3A0F3C169B201A201E2045207D208D23292768276A276C276E27702772277427C527E627E827EA27EC27EE2983298529872989298B298D298F299129932995299729D829DA29FC2E222E242E262E283008300A300C300E3010301430163018301A301DFD3EFE17FE35FE37FE39FE3BFE3DFE3FFE41FE43FE47FE59FE5BFE5DFF08FF3BFF5BFF5FFF62",
-    Pe: "0029005D007D0F3B0F3D169C2046207E208E232A2769276B276D276F27712773277527C627E727E927EB27ED27EF298429862988298A298C298E2990299229942996299829D929DB29FD2E232E252E272E293009300B300D300F3011301530173019301B301E301FFD3FFE18FE36FE38FE3AFE3CFE3EFE40FE42FE44FE48FE5AFE5CFE5EFF09FF3DFF5DFF60FF63",
-    Pi: "00AB2018201B201C201F20392E022E042E092E0C2E1C2E20",
-    Pf: "00BB2019201D203A2E032E052E0A2E0D2E1D2E21",
-    Pc: "005F203F20402054FE33FE34FE4D-FE4FFF3F",
-    Po: "0021-00230025-0027002A002C002E002F003A003B003F0040005C00A100B700BF037E0387055A-055F058905C005C305C605F305F40609060A060C060D061B061E061F066A-066D06D40700-070D07F7-07F90830-083E0964096509700DF40E4F0E5A0E5B0F04-0F120F850FD0-0FD4104A-104F10FB1361-1368166D166E16EB-16ED1735173617D4-17D617D8-17DA1800-18051807-180A1944194519DE19DF1A1E1A1F1AA0-1AA61AA8-1AAD1B5A-1B601C3B-1C3F1C7E1C7F1CD3201620172020-20272030-2038203B-203E2041-20432047-205120532055-205E2CF9-2CFC2CFE2CFF2E002E012E06-2E082E0B2E0E-2E162E182E192E1B2E1E2E1F2E2A-2E2E2E302E313001-3003303D30FBA4FEA4FFA60D-A60FA673A67EA6F2-A6F7A874-A877A8CEA8CFA8F8-A8FAA92EA92FA95FA9C1-A9CDA9DEA9DFAA5C-AA5FAADEAADFABEBFE10-FE16FE19FE30FE45FE46FE49-FE4CFE50-FE52FE54-FE57FE5F-FE61FE68FE6AFE6BFF01-FF03FF05-FF07FF0AFF0CFF0EFF0FFF1AFF1BFF1FFF20FF3CFF61FF64FF65",
-    S:  "0024002B003C-003E005E0060007C007E00A2-00A900AC00AE-00B100B400B600B800D700F702C2-02C502D2-02DF02E5-02EB02ED02EF-02FF03750384038503F604820606-0608060B060E060F06E906FD06FE07F609F209F309FA09FB0AF10B700BF3-0BFA0C7F0CF10CF20D790E3F0F01-0F030F13-0F170F1A-0F1F0F340F360F380FBE-0FC50FC7-0FCC0FCE0FCF0FD5-0FD8109E109F13601390-139917DB194019E0-19FF1B61-1B6A1B74-1B7C1FBD1FBF-1FC11FCD-1FCF1FDD-1FDF1FED-1FEF1FFD1FFE20442052207A-207C208A-208C20A0-20B8210021012103-21062108210921142116-2118211E-2123212521272129212E213A213B2140-2144214A-214D214F2190-2328232B-23E82400-24262440-244A249C-24E92500-26CD26CF-26E126E326E8-26FF2701-27042706-2709270C-27272729-274B274D274F-27522756-275E2761-276727942798-27AF27B1-27BE27C0-27C427C7-27CA27CC27D0-27E527F0-29822999-29D729DC-29FB29FE-2B4C2B50-2B592CE5-2CEA2E80-2E992E9B-2EF32F00-2FD52FF0-2FFB300430123013302030363037303E303F309B309C319031913196-319F31C0-31E33200-321E322A-32503260-327F328A-32B032C0-32FE3300-33FF4DC0-4DFFA490-A4C6A700-A716A720A721A789A78AA828-A82BA836-A839AA77-AA79FB29FDFCFDFDFE62FE64-FE66FE69FF04FF0BFF1C-FF1EFF3EFF40FF5CFF5EFFE0-FFE6FFE8-FFEEFFFCFFFD",
-    Sm: "002B003C-003E007C007E00AC00B100D700F703F60606-060820442052207A-207C208A-208C2140-2144214B2190-2194219A219B21A021A321A621AE21CE21CF21D221D421F4-22FF2308-230B23202321237C239B-23B323DC-23E125B725C125F8-25FF266F27C0-27C427C7-27CA27CC27D0-27E527F0-27FF2900-29822999-29D729DC-29FB29FE-2AFF2B30-2B442B47-2B4CFB29FE62FE64-FE66FF0BFF1C-FF1EFF5CFF5EFFE2FFE9-FFEC",
-    Sc: "002400A2-00A5060B09F209F309FB0AF10BF90E3F17DB20A0-20B8A838FDFCFE69FF04FFE0FFE1FFE5FFE6",
-    Sk: "005E006000A800AF00B400B802C2-02C502D2-02DF02E5-02EB02ED02EF-02FF0375038403851FBD1FBF-1FC11FCD-1FCF1FDD-1FDF1FED-1FEF1FFD1FFE309B309CA700-A716A720A721A789A78AFF3EFF40FFE3",
-    So: "00A600A700A900AE00B000B60482060E060F06E906FD06FE07F609FA0B700BF3-0BF80BFA0C7F0CF10CF20D790F01-0F030F13-0F170F1A-0F1F0F340F360F380FBE-0FC50FC7-0FCC0FCE0FCF0FD5-0FD8109E109F13601390-1399194019E0-19FF1B61-1B6A1B74-1B7C210021012103-21062108210921142116-2118211E-2123212521272129212E213A213B214A214C214D214F2195-2199219C-219F21A121A221A421A521A7-21AD21AF-21CD21D021D121D321D5-21F32300-2307230C-231F2322-2328232B-237B237D-239A23B4-23DB23E2-23E82400-24262440-244A249C-24E92500-25B625B8-25C025C2-25F72600-266E2670-26CD26CF-26E126E326E8-26FF2701-27042706-2709270C-27272729-274B274D274F-27522756-275E2761-276727942798-27AF27B1-27BE2800-28FF2B00-2B2F2B452B462B50-2B592CE5-2CEA2E80-2E992E9B-2EF32F00-2FD52FF0-2FFB300430123013302030363037303E303F319031913196-319F31C0-31E33200-321E322A-32503260-327F328A-32B032C0-32FE3300-33FF4DC0-4DFFA490-A4C6A828-A82BA836A837A839AA77-AA79FDFDFFE4FFE8FFEDFFEEFFFCFFFD",
-    Z:  "002000A01680180E2000-200A20282029202F205F3000",
-    Zs: "002000A01680180E2000-200A202F205F3000",
-    Zl: "2028",
-    Zp: "2029",
-    C:  "0000-001F007F-009F00AD03780379037F-0383038B038D03A20526-05300557055805600588058B-059005C8-05CF05EB-05EF05F5-0605061C061D0620065F06DD070E070F074B074C07B2-07BF07FB-07FF082E082F083F-08FF093A093B094F095609570973-097809800984098D098E0991099209A909B109B3-09B509BA09BB09C509C609C909CA09CF-09D609D8-09DB09DE09E409E509FC-0A000A040A0B-0A0E0A110A120A290A310A340A370A3A0A3B0A3D0A43-0A460A490A4A0A4E-0A500A52-0A580A5D0A5F-0A650A76-0A800A840A8E0A920AA90AB10AB40ABA0ABB0AC60ACA0ACE0ACF0AD1-0ADF0AE40AE50AF00AF2-0B000B040B0D0B0E0B110B120B290B310B340B3A0B3B0B450B460B490B4A0B4E-0B550B58-0B5B0B5E0B640B650B72-0B810B840B8B-0B8D0B910B96-0B980B9B0B9D0BA0-0BA20BA5-0BA70BAB-0BAD0BBA-0BBD0BC3-0BC50BC90BCE0BCF0BD1-0BD60BD8-0BE50BFB-0C000C040C0D0C110C290C340C3A-0C3C0C450C490C4E-0C540C570C5A-0C5F0C640C650C70-0C770C800C810C840C8D0C910CA90CB40CBA0CBB0CC50CC90CCE-0CD40CD7-0CDD0CDF0CE40CE50CF00CF3-0D010D040D0D0D110D290D3A-0D3C0D450D490D4E-0D560D58-0D5F0D640D650D76-0D780D800D810D840D97-0D990DB20DBC0DBE0DBF0DC7-0DC90DCB-0DCE0DD50DD70DE0-0DF10DF5-0E000E3B-0E3E0E5C-0E800E830E850E860E890E8B0E8C0E8E-0E930E980EA00EA40EA60EA80EA90EAC0EBA0EBE0EBF0EC50EC70ECE0ECF0EDA0EDB0EDE-0EFF0F480F6D-0F700F8C-0F8F0F980FBD0FCD0FD9-0FFF10C6-10CF10FD-10FF1249124E124F12571259125E125F1289128E128F12B112B612B712BF12C112C612C712D7131113161317135B-135E137D-137F139A-139F13F5-13FF169D-169F16F1-16FF170D1715-171F1737-173F1754-175F176D17711774-177F17B417B517DE17DF17EA-17EF17FA-17FF180F181A-181F1878-187F18AB-18AF18F6-18FF191D-191F192C-192F193C-193F1941-1943196E196F1975-197F19AC-19AF19CA-19CF19DB-19DD1A1C1A1D1A5F1A7D1A7E1A8A-1A8F1A9A-1A9F1AAE-1AFF1B4C-1B4F1B7D-1B7F1BAB-1BAD1BBA-1BFF1C38-1C3A1C4A-1C4C1C80-1CCF1CF3-1CFF1DE7-1DFC1F161F171F1E1F1F1F461F471F4E1F4F1F581F5A1F5C1F5E1F7E1F7F1FB51FC51FD41FD51FDC1FF01FF11FF51FFF200B-200F202A-202E2060-206F20722073208F2095-209F20B9-20CF20F1-20FF218A-218F23E9-23FF2427-243F244B-245F26CE26E226E4-26E727002705270A270B2728274C274E2753-2755275F27602795-279727B027BF27CB27CD-27CF2B4D-2B4F2B5A-2BFF2C2F2C5F2CF2-2CF82D26-2D2F2D66-2D6E2D70-2D7F2D97-2D9F2DA72DAF2DB72DBF2DC72DCF2DD72DDF2E32-2E7F2E9A2EF4-2EFF2FD6-2FEF2FFC-2FFF3040309730983100-3104312E-3130318F31B8-31BF31E4-31EF321F32FF4DB6-4DBF9FCC-9FFFA48D-A48FA4C7-A4CFA62C-A63FA660A661A674-A67BA698-A69FA6F8-A6FFA78D-A7FAA82C-A82FA83A-A83FA878-A87FA8C5-A8CDA8DA-A8DFA8FC-A8FFA954-A95EA97D-A97FA9CEA9DA-A9DDA9E0-A9FFAA37-AA3FAA4EAA4FAA5AAA5BAA7C-AA7FAAC3-AADAAAE0-ABBFABEEABEFABFA-ABFFD7A4-D7AFD7C7-D7CAD7FC-F8FFFA2EFA2FFA6EFA6FFADA-FAFFFB07-FB12FB18-FB1CFB37FB3DFB3FFB42FB45FBB2-FBD2FD40-FD4FFD90FD91FDC8-FDEFFDFEFDFFFE1A-FE1FFE27-FE2FFE53FE67FE6C-FE6FFE75FEFD-FF00FFBF-FFC1FFC8FFC9FFD0FFD1FFD8FFD9FFDD-FFDFFFE7FFEF-FFFBFFFEFFFF",
-    Cc: "0000-001F007F-009F",
-    Cf: "00AD0600-060306DD070F17B417B5200B-200F202A-202E2060-2064206A-206FFEFFFFF9-FFFB",
-    Co: "E000-F8FF",
-    Cs: "D800-DFFF",
-    Cn: "03780379037F-0383038B038D03A20526-05300557055805600588058B-059005C8-05CF05EB-05EF05F5-05FF06040605061C061D0620065F070E074B074C07B2-07BF07FB-07FF082E082F083F-08FF093A093B094F095609570973-097809800984098D098E0991099209A909B109B3-09B509BA09BB09C509C609C909CA09CF-09D609D8-09DB09DE09E409E509FC-0A000A040A0B-0A0E0A110A120A290A310A340A370A3A0A3B0A3D0A43-0A460A490A4A0A4E-0A500A52-0A580A5D0A5F-0A650A76-0A800A840A8E0A920AA90AB10AB40ABA0ABB0AC60ACA0ACE0ACF0AD1-0ADF0AE40AE50AF00AF2-0B000B040B0D0B0E0B110B120B290B310B340B3A0B3B0B450B460B490B4A0B4E-0B550B58-0B5B0B5E0B640B650B72-0B810B840B8B-0B8D0B910B96-0B980B9B0B9D0BA0-0BA20BA5-0BA70BAB-0BAD0BBA-0BBD0BC3-0BC50BC90BCE0BCF0BD1-0BD60BD8-0BE50BFB-0C000C040C0D0C110C290C340C3A-0C3C0C450C490C4E-0C540C570C5A-0C5F0C640C650C70-0C770C800C810C840C8D0C910CA90CB40CBA0CBB0CC50CC90CCE-0CD40CD7-0CDD0CDF0CE40CE50CF00CF3-0D010D040D0D0D110D290D3A-0D3C0D450D490D4E-0D560D58-0D5F0D640D650D76-0D780D800D810D840D97-0D990DB20DBC0DBE0DBF0DC7-0DC90DCB-0DCE0DD50DD70DE0-0DF10DF5-0E000E3B-0E3E0E5C-0E800E830E850E860E890E8B0E8C0E8E-0E930E980EA00EA40EA60EA80EA90EAC0EBA0EBE0EBF0EC50EC70ECE0ECF0EDA0EDB0EDE-0EFF0F480F6D-0F700F8C-0F8F0F980FBD0FCD0FD9-0FFF10C6-10CF10FD-10FF1249124E124F12571259125E125F1289128E128F12B112B612B712BF12C112C612C712D7131113161317135B-135E137D-137F139A-139F13F5-13FF169D-169F16F1-16FF170D1715-171F1737-173F1754-175F176D17711774-177F17DE17DF17EA-17EF17FA-17FF180F181A-181F1878-187F18AB-18AF18F6-18FF191D-191F192C-192F193C-193F1941-1943196E196F1975-197F19AC-19AF19CA-19CF19DB-19DD1A1C1A1D1A5F1A7D1A7E1A8A-1A8F1A9A-1A9F1AAE-1AFF1B4C-1B4F1B7D-1B7F1BAB-1BAD1BBA-1BFF1C38-1C3A1C4A-1C4C1C80-1CCF1CF3-1CFF1DE7-1DFC1F161F171F1E1F1F1F461F471F4E1F4F1F581F5A1F5C1F5E1F7E1F7F1FB51FC51FD41FD51FDC1FF01FF11FF51FFF2065-206920722073208F2095-209F20B9-20CF20F1-20FF218A-218F23E9-23FF2427-243F244B-245F26CE26E226E4-26E727002705270A270B2728274C274E2753-2755275F27602795-279727B027BF27CB27CD-27CF2B4D-2B4F2B5A-2BFF2C2F2C5F2CF2-2CF82D26-2D2F2D66-2D6E2D70-2D7F2D97-2D9F2DA72DAF2DB72DBF2DC72DCF2DD72DDF2E32-2E7F2E9A2EF4-2EFF2FD6-2FEF2FFC-2FFF3040309730983100-3104312E-3130318F31B8-31BF31E4-31EF321F32FF4DB6-4DBF9FCC-9FFFA48D-A48FA4C7-A4CFA62C-A63FA660A661A674-A67BA698-A69FA6F8-A6FFA78D-A7FAA82C-A82FA83A-A83FA878-A87FA8C5-A8CDA8DA-A8DFA8FC-A8FFA954-A95EA97D-A97FA9CEA9DA-A9DDA9E0-A9FFAA37-AA3FAA4EAA4FAA5AAA5BAA7C-AA7FAAC3-AADAAAE0-ABBFABEEABEFABFA-ABFFD7A4-D7AFD7C7-D7CAD7FC-D7FFFA2EFA2FFA6EFA6FFADA-FAFFFB07-FB12FB18-FB1CFB37FB3DFB3FFB42FB45FBB2-FBD2FD40-FD4FFD90FD91FDC8-FDEFFDFEFDFFFE1A-FE1FFE27-FE2FFE53FE67FE6C-FE6FFE75FEFDFEFEFF00FFBF-FFC1FFC8FFC9FFD0FFD1FFD8FFD9FFDD-FFDFFFE7FFEF-FFF8FFFEFFFF"
-});
-
-function addUnicodePackage (pack) {
-    var codePoint = /\w{4}/g;
-    for (var name in pack)
-        exports.packages[name] = pack[name].replace(codePoint, "\\u$&");
-};
-
-});/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/document', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/event_emitter', 'ace/range', 'ace/anchor'], function(require, exports, module) {
-"use strict";
-
-var oop = require("./lib/oop");
-var EventEmitter = require("./lib/event_emitter").EventEmitter;
-var Range = require("./range").Range;
-var Anchor = require("./anchor").Anchor;
-
-var Document = function(text) {
-    this.$lines = [];
-
-    if (Array.isArray(text)) {
-        this.insertLines(0, text);
-    }
-    // There has to be one line at least in the document. If you pass an empty
-    // string to the insert function, nothing will happen. Workaround.
-    else if (text.length == 0) {
-        this.$lines = [""];
-    } else {
-        this.insert({row: 0, column:0}, text);
-    }
-};
-
-(function() {
-
-    oop.implement(this, EventEmitter);
-
-    this.setValue = function(text) {
-        var len = this.getLength();
-        this.remove(new Range(0, 0, len, this.getLine(len-1).length));
-        this.insert({row: 0, column:0}, text);
-    };
-
-    this.getValue = function() {
-        return this.getAllLines().join(this.getNewLineCharacter());
-    };
-
-    this.createAnchor = function(row, column) {
-        return new Anchor(this, row, column);
-    };
-
-    // check for IE split bug
-    if ("aaa".split(/a/).length == 0)
-        this.$split = function(text) {
-            return text.replace(/\r\n|\r/g, "\n").split("\n");
-        }
-    else
-        this.$split = function(text) {
-            return text.split(/\r\n|\r|\n/);
-        };
-
-
-    this.$detectNewLine = function(text) {
-        var match = text.match(/^.*?(\r\n|\r|\n)/m);
-        if (match) {
-            this.$autoNewLine = match[1];
-        } else {
-            this.$autoNewLine = "\n";
-        }
-    };
-
-    this.getNewLineCharacter = function() {
-      switch (this.$newLineMode) {
-          case "windows":
-              return "\r\n";
-
-          case "unix":
-              return "\n";
-
-          case "auto":
-              return this.$autoNewLine;
-      }
-    };
-
-    this.$autoNewLine = "\n";
-    this.$newLineMode = "auto";
-    this.setNewLineMode = function(newLineMode) {
-        if (this.$newLineMode === newLineMode)
-            return;
-
-        this.$newLineMode = newLineMode;
-    };
-
-    this.getNewLineMode = function() {
-        return this.$newLineMode;
-    };
-
-    this.isNewLine = function(text) {
-        return (text == "\r\n" || text == "\r" || text == "\n");
-    };
-
-    /**
-     * Get a verbatim copy of the given line as it is in the document
-     */
-    this.getLine = function(row) {
-        return this.$lines[row] || "";
-    };
-
-    this.getLines = function(firstRow, lastRow) {
-        return this.$lines.slice(firstRow, lastRow + 1);
-    };
-
-    /**
-     * Returns all lines in the document as string array. Warning: The caller
-     * should not modify this array!
-     */
-    this.getAllLines = function() {
-        return this.getLines(0, this.getLength());
-    };
-
-    this.getLength = function() {
-        return this.$lines.length;
-    };
-
-    this.getTextRange = function(range) {
-        if (range.start.row == range.end.row) {
-            return this.$lines[range.start.row].substring(range.start.column,
-                                                         range.end.column);
-        }
-        else {
-            var lines = [];
-            lines.push(this.$lines[range.start.row].substring(range.start.column));
-            lines.push.apply(lines, this.getLines(range.start.row+1, range.end.row-1));
-            lines.push(this.$lines[range.end.row].substring(0, range.end.column));
-            return lines.join(this.getNewLineCharacter());
-        }
-    };
-
-    this.$clipPosition = function(position) {
-        var length = this.getLength();
-        if (position.row >= length) {
-            position.row = Math.max(0, length - 1);
-            position.column = this.getLine(length-1).length;
-        }
-        return position;
-    };
-
-    this.insert = function(position, text) {
-        if (!text || text.length === 0)
-            return position;
-
-        position = this.$clipPosition(position);
-
-        // only detect new lines if the document has no line break yet
-        if (this.getLength() <= 1)
-            this.$detectNewLine(text);
-
-        var lines = this.$split(text);
-        var firstLine = lines.splice(0, 1)[0];
-        var lastLine = lines.length == 0 ? null : lines.splice(lines.length - 1, 1)[0];
-
-        position = this.insertInLine(position, firstLine);
-        if (lastLine !== null) {
-            position = this.insertNewLine(position); // terminate first line
-            position = this.insertLines(position.row, lines);
-            position = this.insertInLine(position, lastLine || "");
-        }
-        return position;
-    };
-
-    this.insertLines = function(row, lines) {
-        if (lines.length == 0)
-            return {row: row, column: 0};
-
-        var args = [row, 0];
-        args.push.apply(args, lines);
-        this.$lines.splice.apply(this.$lines, args);
-
-        var range = new Range(row, 0, row + lines.length, 0);
-        var delta = {
-            action: "insertLines",
-            range: range,
-            lines: lines
-        };
-        this._emit("change", { data: delta });
-        return range.end;
-    };
-
-    this.insertNewLine = function(position) {
-        position = this.$clipPosition(position);
-        var line = this.$lines[position.row] || "";
-
-        this.$lines[position.row] = line.substring(0, position.column);
-        this.$lines.splice(position.row + 1, 0, line.substring(position.column, line.length));
-
-        var end = {
-            row : position.row + 1,
-            column : 0
-        };
-
-        var delta = {
-            action: "insertText",
-            range: Range.fromPoints(position, end),
-            text: this.getNewLineCharacter()
-        };
-        this._emit("change", { data: delta });
-
-        return end;
-    };
-
-    this.insertInLine = function(position, text) {
-        if (text.length == 0)
-            return position;
-
-        var line = this.$lines[position.row] || "";
-
-        this.$lines[position.row] = line.substring(0, position.column) + text
-                + line.substring(position.column);
-
-        var end = {
-            row : position.row,
-            column : position.column + text.length
-        };
-
-        var delta = {
-            action: "insertText",
-            range: Range.fromPoints(position, end),
-            text: text
-        };
-        this._emit("change", { data: delta });
-
-        return end;
-    };
-
-    this.remove = function(range) {
-        // clip to document
-        range.start = this.$clipPosition(range.start);
-        range.end = this.$clipPosition(range.end);
-
-        if (range.isEmpty())
-            return range.start;
-
-        var firstRow = range.start.row;
-        var lastRow = range.end.row;
-
-        if (range.isMultiLine()) {
-            var firstFullRow = range.start.column == 0 ? firstRow : firstRow + 1;
-            var lastFullRow = lastRow - 1;
-
-            if (range.end.column > 0)
-                this.removeInLine(lastRow, 0, range.end.column);
-
-            if (lastFullRow >= firstFullRow)
-                this.removeLines(firstFullRow, lastFullRow);
-
-            if (firstFullRow != firstRow) {
-                this.removeInLine(firstRow, range.start.column, this.getLine(firstRow).length);
-                this.removeNewLine(range.start.row);
-            }
-        }
-        else {
-            this.removeInLine(firstRow, range.start.column, range.end.column);
-        }
-        return range.start;
-    };
-
-    this.removeInLine = function(row, startColumn, endColumn) {
-        if (startColumn == endColumn)
-            return;
-
-        var range = new Range(row, startColumn, row, endColumn);
-        var line = this.getLine(row);
-        var removed = line.substring(startColumn, endColumn);
-        var newLine = line.substring(0, startColumn) + line.substring(endColumn, line.length);
-        this.$lines.splice(row, 1, newLine);
-
-        var delta = {
-            action: "removeText",
-            range: range,
-            text: removed
-        };
-        this._emit("change", { data: delta });
-        return range.start;
-    };
-
-    /**
-     * Removes a range of full lines
-     *
-     * @param firstRow {Integer} The first row to be removed
-     * @param lastRow {Integer} The last row to be removed
-     * @return {String[]} The removed lines
-     */
-    this.removeLines = function(firstRow, lastRow) {
-        var range = new Range(firstRow, 0, lastRow + 1, 0);
-        var removed = this.$lines.splice(firstRow, lastRow - firstRow + 1);
-
-        var delta = {
-            action: "removeLines",
-            range: range,
-            nl: this.getNewLineCharacter(),
-            lines: removed
-        };
-        this._emit("change", { data: delta });
-        return removed;
-    };
-
-    this.removeNewLine = function(row) {
-        var firstLine = this.getLine(row);
-        var secondLine = this.getLine(row+1);
-
-        var range = new Range(row, firstLine.length, row+1, 0);
-        var line = firstLine + secondLine;
-
-        this.$lines.splice(row, 2, line);
-
-        var delta = {
-            action: "removeText",
-            range: range,
-            text: this.getNewLineCharacter()
-        };
-        this._emit("change", { data: delta });
-    };
-
-    this.replace = function(range, text) {
-        if (text.length == 0 && range.isEmpty())
-            return range.start;
-
-        // Shortcut: If the text we want to insert is the same as it is already
-        // in the document, we don't have to replace anything.
-        if (text == this.getTextRange(range))
-            return range.end;
-
-        this.remove(range);
-        if (text) {
-            var end = this.insert(range.start, text);
-        }
-        else {
-            end = range.start;
-        }
-
-        return end;
-    };
-
-    this.applyDeltas = function(deltas) {
-        for (var i=0; i<deltas.length; i++) {
-            var delta = deltas[i];
-            var range = Range.fromPoints(delta.range.start, delta.range.end);
-
-            if (delta.action == "insertLines")
-                this.insertLines(range.start.row, delta.lines);
-            else if (delta.action == "insertText")
-                this.insert(range.start, delta.text);
-            else if (delta.action == "removeLines")
-                this.removeLines(range.start.row, range.end.row - 1);
-            else if (delta.action == "removeText")
-                this.remove(range);
-        }
-    };
-
-    this.revertDeltas = function(deltas) {
-        for (var i=deltas.length-1; i>=0; i--) {
-            var delta = deltas[i];
-
-            var range = Range.fromPoints(delta.range.start, delta.range.end);
-
-            if (delta.action == "insertLines")
-                this.removeLines(range.start.row, range.end.row - 1);
-            else if (delta.action == "insertText")
-                this.remove(range);
-            else if (delta.action == "removeLines")
-                this.insertLines(range.start.row, delta.lines);
-            else if (delta.action == "removeText")
-                this.insert(range.start, delta.text);
-        }
-    };
-
-}).call(Document.prototype);
-
-exports.Document = Document;
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/anchor', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/event_emitter'], function(require, exports, module) {
-"use strict";
-
-var oop = require("./lib/oop");
-var EventEmitter = require("./lib/event_emitter").EventEmitter;
-
-/**
- * An Anchor is a floating pointer in the document. Whenever text is inserted or
- * deleted before the cursor, the position of the cursor is updated
- */
-var Anchor = exports.Anchor = function(doc, row, column) {
-    this.document = doc;
-    
-    if (typeof column == "undefined")
-        this.setPosition(row.row, row.column);
-    else
-        this.setPosition(row, column);
-
-    this.$onChange = this.onChange.bind(this);
-    doc.on("change", this.$onChange);
-};
-
-(function() {
-
-    oop.implement(this, EventEmitter);
-    
-    this.getPosition = function() {
-        return this.$clipPositionToDocument(this.row, this.column);
-    };
-    
-    this.getDocument = function() {
-        return this.document;
-    };
-    
-    this.onChange = function(e) {
-        var delta = e.data;
-        var range = delta.range;
-            
-        if (range.start.row == range.end.row && range.start.row != this.row)
-            return;
-            
-        if (range.start.row > this.row)
-            return;
-            
-        if (range.start.row == this.row && range.start.column > this.column)
-            return;
-    
-        var row = this.row;
-        var column = this.column;
-        
-        if (delta.action === "insertText") {
-            if (range.start.row === row && range.start.column <= column) {
-                if (range.start.row === range.end.row) {
-                    column += range.end.column - range.start.column;
-                }
-                else {
-                    column -= range.start.column;
-                    row += range.end.row - range.start.row;
-                }
-            }
-            else if (range.start.row !== range.end.row && range.start.row < row) {
-                row += range.end.row - range.start.row;
-            }
-        } else if (delta.action === "insertLines") {
-            if (range.start.row <= row) {
-                row += range.end.row - range.start.row;
-            }
-        }
-        else if (delta.action == "removeText") {
-            if (range.start.row == row && range.start.column < column) {
-                if (range.end.column >= column)
-                    column = range.start.column;
-                else
-                    column = Math.max(0, column - (range.end.column - range.start.column));
-                
-            } else if (range.start.row !== range.end.row && range.start.row < row) {
-                if (range.end.row == row) {
-                    column = Math.max(0, column - range.end.column) + range.start.column;
-                }
-                row -= (range.end.row - range.start.row);
-            }
-            else if (range.end.row == row) {
-                row -= range.end.row - range.start.row;
-                column = Math.max(0, column - range.end.column) + range.start.column;
-            }
-        } else if (delta.action == "removeLines") {
-            if (range.start.row <= row) {
-                if (range.end.row <= row)
-                    row -= range.end.row - range.start.row;
-                else {
-                    row = range.start.row;
-                    column = 0;
-                }
-            }
-        }
-
-        this.setPosition(row, column, true);
-    };
-
-    this.setPosition = function(row, column, noClip) {
-        var pos;
-        if (noClip) {
-            pos = {
-                row: row,
-                column: column
-            };
-        }
-        else {
-            pos = this.$clipPositionToDocument(row, column);
-        }
-        
-        if (this.row == pos.row && this.column == pos.column)
-            return;
-            
-        var old = {
-            row: this.row,
-            column: this.column
-        };
-        
-        this.row = pos.row;
-        this.column = pos.column;
-        this._emit("change", {
-            old: old,
-            value: pos
-        });
-    };
-    
-    this.detach = function() {
-        this.document.removeEventListener("change", this.$onChange);
-    };
-    
-    this.$clipPositionToDocument = function(row, column) {
-        var pos = {};
-    
-        if (row >= this.document.getLength()) {
-            pos.row = Math.max(0, this.document.getLength() - 1);
-            pos.column = this.document.getLine(pos.row).length;
-        }
-        else if (row < 0) {
-            pos.row = 0;
-            pos.column = 0;
-        }
-        else {
-            pos.row = row;
-            pos.column = Math.min(this.document.getLine(pos.row).length, Math.max(0, column));
-        }
-        
-        if (column < 0)
-            pos.column = 0;
-            
-        return pos;
-    };
-    
-}).call(Anchor.prototype);
-
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/background_tokenizer', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/event_emitter'], function(require, exports, module) {
-"use strict";
-
-var oop = require("./lib/oop");
-var EventEmitter = require("./lib/event_emitter").EventEmitter;
-
-var BackgroundTokenizer = function(tokenizer, editor) {
-    this.running = false;    
-    this.lines = [];
-    this.currentLine = 0;
-    this.tokenizer = tokenizer;
-
-    var self = this;
-
-    this.$worker = function() {
-        if (!self.running) { return; }
-
-        var workerStart = new Date();
-        var startLine = self.currentLine;
-        var doc = self.doc;
-
-        var processedLines = 0;
-
-        var len = doc.getLength();
-        while (self.currentLine < len) {
-            self.lines[self.currentLine] = self.$tokenizeRows(self.currentLine, self.currentLine)[0];
-            self.currentLine++;
-
-            // only check every 5 lines
-            processedLines += 1;
-            if ((processedLines % 5 == 0) && (new Date() - workerStart) > 20) {
-                self.fireUpdateEvent(startLine, self.currentLine-1);
-                self.running = setTimeout(self.$worker, 20);
-                return;
-            }
-        }
-
-        self.running = false;
-
-        self.fireUpdateEvent(startLine, len - 1);
-    };
-};
-
-(function(){
-
-    oop.implement(this, EventEmitter);
-
-    this.setTokenizer = function(tokenizer) {
-        this.tokenizer = tokenizer;
-        this.lines = [];
-
-        this.start(0);
-    };
-
-    this.setDocument = function(doc) {
-        this.doc = doc;
-        this.lines = [];
-
-        this.stop();
-    };
-
-    this.fireUpdateEvent = function(firstRow, lastRow) {
-        var data = {
-            first: firstRow,
-            last: lastRow
-        };
-        this._emit("update", {data: data});
-    };
-
-    this.start = function(startRow) {
-        this.currentLine = Math.min(startRow || 0, this.currentLine,
-                                    this.doc.getLength());
-
-        // remove all cached items below this line
-        this.lines.splice(this.currentLine, this.lines.length);
-
-        this.stop();
-        // pretty long delay to prevent the tokenizer from interfering with the user
-        this.running = setTimeout(this.$worker, 700);
-    };
-
-    this.stop = function() {
-        if (this.running)
-            clearTimeout(this.running);
-        this.running = false;
-    };
-
-    this.getTokens = function(firstRow, lastRow) {
-        return this.$tokenizeRows(firstRow, lastRow);
-    };
-
-    this.getState = function(row) {
-        return this.$tokenizeRows(row, row)[0].state;
-    };
-
-    this.$tokenizeRows = function(firstRow, lastRow) {
-        if (!this.doc || isNaN(firstRow) || isNaN(lastRow))
-            return [{'state':'start','tokens':[]}];
-            
-        var rows = [];
-
-        // determine start state
-        var state = "start";
-        var doCache = false;
-        if (firstRow > 0 && this.lines[firstRow - 1]) {
-            state = this.lines[firstRow - 1].state;
-            doCache = true;
-        } else if (firstRow == 0) {
-            state = "start";
-            doCache = true;
-        } else if (this.lines.length > 0) {
-            // Guess that we haven't changed state.
-            state = this.lines[this.lines.length-1].state;
-        }
-
-        var lines = this.doc.getLines(firstRow, lastRow);
-        for (var row=firstRow; row<=lastRow; row++) {
-            if (!this.lines[row]) {
-                var tokens = this.tokenizer.getLineTokens(lines[row-firstRow] || "", state);
-                var state = tokens.state;
-                rows.push(tokens);
-
-                if (doCache) {
-                    this.lines[row] = tokens;
-                }
-            }
-            else {
-                var tokens = this.lines[row];
-                state = tokens.state;
-                rows.push(tokens);
-            }
-        }
-        return rows;
-    };
-
-}).call(BackgroundTokenizer.prototype);
-
-exports.BackgroundTokenizer = BackgroundTokenizer;
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Julian Viereck <julian DOT viereck AT gmail DOT com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/edit_session/folding', ['require', 'exports', 'module' , 'ace/range', 'ace/edit_session/fold_line', 'ace/edit_session/fold', 'ace/token_iterator'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../range").Range;
-var FoldLine = require("./fold_line").FoldLine;
-var Fold = require("./fold").Fold;
-var TokenIterator = require("../token_iterator").TokenIterator;
-
-function Folding() {
-    /**
-     * Looks up a fold at a given row/column. Possible values for side:
-     *   -1: ignore a fold if fold.start = row/column
-     *   +1: ignore a fold if fold.end = row/column
-     */
-    this.getFoldAt = function(row, column, side) {
-        var foldLine = this.getFoldLine(row);
-        if (!foldLine)
-            return null;
-
-        var folds = foldLine.folds;
-        for (var i = 0; i < folds.length; i++) {
-            var fold = folds[i];
-            if (fold.range.contains(row, column)) {
-                if (side == 1 && fold.range.isEnd(row, column)) {
-                    continue;
-                } else if (side == -1 && fold.range.isStart(row, column)) {
-                    continue;
-                }
-                return fold;
-            }
-        }
-    };
-
-    /**
-     * Returns all folds in the given range. Note, that this will return folds
-     *
-     */
-    this.getFoldsInRange = function(range) {
-        range = range.clone();
-        var start = range.start;
-        var end = range.end;
-        var foldLines = this.$foldData;
-        var foundFolds = [];
-
-        start.column += 1;
-        end.column -= 1;
-
-        for (var i = 0; i < foldLines.length; i++) {
-            var cmp = foldLines[i].range.compareRange(range);
-            if (cmp == 2) {
-                // Range is before foldLine. No intersection. This means,
-                // there might be other foldLines that intersect.
-                continue;
-            }
-            else if (cmp == -2) {
-                // Range is after foldLine. There can't be any other foldLines then,
-                // so let's give up.
-                break;
-            }
-
-            var folds = foldLines[i].folds;
-            for (var j = 0; j < folds.length; j++) {
-                var fold = folds[j];
-                cmp = fold.range.compareRange(range);
-                if (cmp == -2) {
-                    break;
-                } else if (cmp == 2) {
-                    continue;
-                } else
-                // WTF-state: Can happen due to -1/+1 to start/end column.
-                if (cmp == 42) {
-                    break;
-                }
-                foundFolds.push(fold);
-            }
-        }
-        return foundFolds;
-    };
-    
-    /**
-     * Returns all folds in the document
-     */
-    this.getAllFolds = function() {
-        var folds = [];
-        var foldLines = this.$foldData;
-        
-        function addFold(fold) {
-            folds.push(fold);
-            if (!fold.subFolds)
-                return;
-                
-            for (var i = 0; i < fold.subFolds.length; i++)
-                addFold(fold.subFolds[i]);
-        }
-        
-        for (var i = 0; i < foldLines.length; i++)
-            for (var j = 0; j < foldLines[i].folds.length; j++)
-                addFold(foldLines[i].folds[j]);
-
-        return folds;
-    };
-
-    /**
-     * Returns the string between folds at the given position.
-     * E.g.
-     *  foo<fold>b|ar<fold>wolrd -> "bar"
-     *  foo<fold>bar<fold>wol|rd -> "world"
-     *  foo<fold>bar<fo|ld>wolrd -> <null>
-     *
-     * where | means the position of row/column
-     *
-     * The trim option determs if the return string should be trimed according
-     * to the "side" passed with the trim value:
-     *
-     * E.g.
-     *  foo<fold>b|ar<fold>wolrd -trim=-1> "b"
-     *  foo<fold>bar<fold>wol|rd -trim=+1> "rld"
-     *  fo|o<fold>bar<fold>wolrd -trim=00> "foo"
-     */
-    this.getFoldStringAt = function(row, column, trim, foldLine) {
-        foldLine = foldLine || this.getFoldLine(row);
-        if (!foldLine)
-            return null;
-
-        var lastFold = {
-            end: { column: 0 }
-        };
-        // TODO: Refactor to use getNextFoldTo function.
-        var str, fold;
-        for (var i = 0; i < foldLine.folds.length; i++) {
-            fold = foldLine.folds[i];
-            var cmp = fold.range.compareEnd(row, column);
-            if (cmp == -1) {
-                str = this
-                    .getLine(fold.start.row)
-                    .substring(lastFold.end.column, fold.start.column);
-                break;
-            }
-            else if (cmp === 0) {
-                return null;
-            }
-            lastFold = fold;
-        }
-        if (!str)
-            str = this.getLine(fold.start.row).substring(lastFold.end.column);
-
-        if (trim == -1)
-            return str.substring(0, column - lastFold.end.column);
-        else if (trim == 1)
-            return str.substring(column - lastFold.end.column);
-        else
-            return str;
-    };
-
-    this.getFoldLine = function(docRow, startFoldLine) {
-        var foldData = this.$foldData;
-        var i = 0;
-        if (startFoldLine)
-            i = foldData.indexOf(startFoldLine);
-        if (i == -1)
-            i = 0;
-        for (i; i < foldData.length; i++) {
-            var foldLine = foldData[i];
-            if (foldLine.start.row <= docRow && foldLine.end.row >= docRow) {
-                return foldLine;
-            } else if (foldLine.end.row > docRow) {
-                return null;
-            }
-        }
-        return null;
-    };
-
-    // returns the fold which starts after or contains docRow
-    this.getNextFoldLine = function(docRow, startFoldLine) {
-        var foldData = this.$foldData;
-        var i = 0;
-        if (startFoldLine)
-            i = foldData.indexOf(startFoldLine);
-        if (i == -1)
-            i = 0;
-        for (i; i < foldData.length; i++) {
-            var foldLine = foldData[i];
-            if (foldLine.end.row >= docRow) {
-                return foldLine;
-            }
-        }
-        return null;
-    };
-
-    this.getFoldedRowCount = function(first, last) {
-        var foldData = this.$foldData, rowCount = last-first+1;
-        for (var i = 0; i < foldData.length; i++) {
-            var foldLine = foldData[i],
-                end = foldLine.end.row,
-                start = foldLine.start.row;
-            if (end >= last) {
-                if(start < last) {
-                    if(start >= first)
-                        rowCount -= last-start;
-                    else
-                        rowCount = 0;//in one fold
-                }
-                break;
-            } else if(end >= first){
-                if (start >= first) //fold inside range
-                    rowCount -=  end-start;
-                else
-                    rowCount -=  end-first+1;
-            }
-        }
-        return rowCount;
-    };
-
-    this.$addFoldLine = function(foldLine) {
-        this.$foldData.push(foldLine);
-        this.$foldData.sort(function(a, b) {
-            return a.start.row - b.start.row;
-        });
-        return foldLine;
-    };
-
-    /**
-     * Adds a new fold.
-     *
-     * @returns
-     *      The new created Fold object or an existing fold object in case the
-     *      passed in range fits an existing fold exactly.
-     */
-    this.addFold = function(placeholder, range) {
-        var foldData = this.$foldData;
-        var added = false;
-        var fold;
-        
-        if (placeholder instanceof Fold)
-            fold = placeholder;
-        else
-            fold = new Fold(range, placeholder);
-
-        this.$clipRangeToDocument(fold.range);
-
-        var startRow = fold.start.row;
-        var startColumn = fold.start.column;
-        var endRow = fold.end.row;
-        var endColumn = fold.end.column;
-
-        // --- Some checking ---
-        if (fold.placeholder.length < 2)
-            throw "Placeholder has to be at least 2 characters";
-
-        if (startRow == endRow && endColumn - startColumn < 2)
-            throw "The range has to be at least 2 characters width";
-
-        var startFold = this.getFoldAt(startRow, startColumn, 1);
-        var endFold = this.getFoldAt(endRow, endColumn, -1);
-        if (startFold && endFold == startFold)
-            return startFold.addSubFold(fold);
-
-        if (
-            (startFold && !startFold.range.isStart(startRow, startColumn))
-            || (endFold && !endFold.range.isEnd(endRow, endColumn))
-        ) {
-            throw "A fold can't intersect already existing fold" + fold.range + startFold.range;
-        }
-
-        // Check if there are folds in the range we create the new fold for.
-        var folds = this.getFoldsInRange(fold.range);
-        if (folds.length > 0) {
-            // Remove the folds from fold data.
-            this.removeFolds(folds);
-            // Add the removed folds as subfolds on the new fold.
-            fold.subFolds = folds;
-        }
-
-        for (var i = 0; i < foldData.length; i++) {
-            var foldLine = foldData[i];
-            if (endRow == foldLine.start.row) {
-                foldLine.addFold(fold);
-                added = true;
-                break;
-            }
-            else if (startRow == foldLine.end.row) {
-                foldLine.addFold(fold);
-                added = true;
-                if (!fold.sameRow) {
-                    // Check if we might have to merge two FoldLines.
-                    var foldLineNext = foldData[i + 1];
-                    if (foldLineNext && foldLineNext.start.row == endRow) {
-                        // We need to merge!
-                        foldLine.merge(foldLineNext);
-                        break;
-                    }
-                }
-                break;
-            }
-            else if (endRow <= foldLine.start.row) {
-                break;
-            }
-        }
-
-        if (!added)
-            foldLine = this.$addFoldLine(new FoldLine(this.$foldData, fold));
-
-        if (this.$useWrapMode)
-            this.$updateWrapData(foldLine.start.row, foldLine.start.row);
-
-        // Notify that fold data has changed.
-        this.$modified = true;
-        this._emit("changeFold", { data: fold });
-
-        return fold;
-    };
-
-    this.addFolds = function(folds) {
-        folds.forEach(function(fold) {
-            this.addFold(fold);
-        }, this);
-    };
-
-    this.removeFold = function(fold) {
-        var foldLine = fold.foldLine;
-        var startRow = foldLine.start.row;
-        var endRow = foldLine.end.row;
-
-        var foldLines = this.$foldData;
-        var folds = foldLine.folds;
-        // Simple case where there is only one fold in the FoldLine such that
-        // the entire fold line can get removed directly.
-        if (folds.length == 1) {
-            foldLines.splice(foldLines.indexOf(foldLine), 1);
-        } else
-        // If the fold is the last fold of the foldLine, just remove it.
-        if (foldLine.range.isEnd(fold.end.row, fold.end.column)) {
-            folds.pop();
-            foldLine.end.row = folds[folds.length - 1].end.row;
-            foldLine.end.column = folds[folds.length - 1].end.column;
-        } else
-        // If the fold is the first fold of the foldLine, just remove it.
-        if (foldLine.range.isStart(fold.start.row, fold.start.column)) {
-            folds.shift();
-            foldLine.start.row = folds[0].start.row;
-            foldLine.start.column = folds[0].start.column;
-        } else
-        // We know there are more then 2 folds and the fold is not at the edge.
-        // This means, the fold is somewhere in between.
-        //
-        // If the fold is in one row, we just can remove it.
-        if (fold.sameRow) {
-            folds.splice(folds.indexOf(fold), 1);
-        } else
-        // The fold goes over more then one row. This means remvoing this fold
-        // will cause the fold line to get splitted up. newFoldLine is the second part
-        {
-            var newFoldLine = foldLine.split(fold.start.row, fold.start.column);
-            folds = newFoldLine.folds;
-            folds.shift();
-            newFoldLine.start.row = folds[0].start.row;
-            newFoldLine.start.column = folds[0].start.column;
-        }
-
-        if (this.$useWrapMode) {
-            this.$updateWrapData(startRow, endRow);
-        }
-
-        // Notify that fold data has changed.
-        this.$modified = true;
-        this._emit("changeFold", { data: fold });
-    };
-
-    this.removeFolds = function(folds) {
-        // We need to clone the folds array passed in as it might be the folds
-        // array of a fold line and as we call this.removeFold(fold), folds
-        // are removed from folds and changes the current index.
-        var cloneFolds = [];
-        for (var i = 0; i < folds.length; i++) {
-            cloneFolds.push(folds[i]);
-        }
-
-        cloneFolds.forEach(function(fold) {
-            this.removeFold(fold);
-        }, this);
-        this.$modified = true;
-    };
-
-    this.expandFold = function(fold) {
-        this.removeFold(fold);
-        fold.subFolds.forEach(function(fold) {
-            this.addFold(fold);
-        }, this);
-        fold.subFolds = [];
-    };
-
-    this.expandFolds = function(folds) {
-        folds.forEach(function(fold) {
-            this.expandFold(fold);
-        }, this);
-    };
-
-    this.unfold = function(location, expandInner) {
-        var range, folds;
-        if (location == null)
-            range = new Range(0, 0, this.getLength(), 0);
-        else if (typeof location == "number")
-            range = new Range(location, 0, location, this.getLine(location).length);
-        else if ("row" in location)
-            range = Range.fromPoints(location, location);
-        else
-            range = location;
-
-        folds = this.getFoldsInRange(range);
-        if (expandInner) {
-            this.removeFolds(folds);
-        } else {
-            // TODO: might need to remove and add folds in one go instead of using
-            // expandFolds several times.
-            while (folds.length) {
-                this.expandFolds(folds);
-                folds = this.getFoldsInRange(range);
-            }
-        }
-    };
-
-    /**
-     * Checks if a given documentRow is folded. This is true if there are some
-     * folded parts such that some parts of the line is still visible.
-     **/
-    this.isRowFolded = function(docRow, startFoldRow) {
-        return !!this.getFoldLine(docRow, startFoldRow);
-    };
-
-    this.getRowFoldEnd = function(docRow, startFoldRow) {
-        var foldLine = this.getFoldLine(docRow, startFoldRow);
-        return (foldLine
-            ? foldLine.end.row
-            : docRow);
-    };
-
-    this.getFoldDisplayLine = function(foldLine, endRow, endColumn, startRow, startColumn) {
-        if (startRow == null) {
-            startRow = foldLine.start.row;
-            startColumn = 0;
-        }
-
-        if (endRow == null) {
-            endRow = foldLine.end.row;
-            endColumn = this.getLine(endRow).length;
-        }
-
-        // Build the textline using the FoldLine walker.
-        var doc = this.doc;
-        var textLine = "";
-
-        foldLine.walk(function(placeholder, row, column, lastColumn) {
-            if (row < startRow) {
-                return;
-            } else if (row == startRow) {
-                if (column < startColumn) {
-                    return;
-                }
-                lastColumn = Math.max(startColumn, lastColumn);
-            }
-            if (placeholder) {
-                textLine += placeholder;
-            } else {
-                textLine += doc.getLine(row).substring(lastColumn, column);
-            }
-        }.bind(this), endRow, endColumn);
-        return textLine;
-    };
-
-    this.getDisplayLine = function(row, endColumn, startRow, startColumn) {
-        var foldLine = this.getFoldLine(row);
-
-        if (!foldLine) {
-            var line;
-            line = this.doc.getLine(row);
-            return line.substring(startColumn || 0, endColumn || line.length);
-        } else {
-            return this.getFoldDisplayLine(
-                foldLine, row, endColumn, startRow, startColumn);
-        }
-    };
-
-    this.$cloneFoldData = function() {
-        var fd = [];
-        fd = this.$foldData.map(function(foldLine) {
-            var folds = foldLine.folds.map(function(fold) {
-                return fold.clone();
-            });
-            return new FoldLine(fd, folds);
-        });
-
-        return fd;
-    };
-
-    this.toggleFold = function(tryToUnfold) {
-        var selection = this.selection;
-        var range = selection.getRange();
-        var fold;
-        var bracketPos;
-
-        if (range.isEmpty()) {
-            var cursor = range.start;
-            fold = this.getFoldAt(cursor.row, cursor.column);
-
-            if (fold) {
-                this.expandFold(fold);
-                return;
-            }
-            else if (bracketPos = this.findMatchingBracket(cursor)) {
-                if (range.comparePoint(bracketPos) == 1) {
-                    range.end = bracketPos;
-                } 
-                else {
-                    range.start = bracketPos;
-                    range.start.column++;
-                    range.end.column--;
-                }
-            }
-            else if (bracketPos = this.findMatchingBracket({row: cursor.row, column: cursor.column + 1})) {
-                if (range.comparePoint(bracketPos) == 1)
-                    range.end = bracketPos;
-                else
-                    range.start = bracketPos;
-
-                range.start.column++;
-            }
-            else {
-                range = this.getCommentFoldRange(cursor.row, cursor.column) || range;
-            }
-        } else {
-            var folds = this.getFoldsInRange(range);
-            if (tryToUnfold && folds.length) {
-                this.expandFolds(folds);
-                return;
-            } 
-            else if (folds.length == 1 ) {
-                fold = folds[0];
-            }
-        }
-
-        if (!fold)
-            fold = this.getFoldAt(range.start.row, range.start.column);
-
-        if (fold && fold.range.toString() == range.toString()) {
-            this.expandFold(fold);
-            return;
-        }
-
-        var placeholder = "...";
-        if (!range.isMultiLine()) {
-            placeholder = this.getTextRange(range);
-            if(placeholder.length < 4)
-                return;
-            placeholder = placeholder.trim().substring(0, 2) + "..";
-        }
-
-        this.addFold(placeholder, range);
-    };
-
-    this.getCommentFoldRange = function(row, column) {
-        var iterator = new TokenIterator(this, row, column);
-        var token = iterator.getCurrentToken();
-        if (token && /^comment|string/.test(token.type)) {
-            var range = new Range();
-            var re = new RegExp(token.type.replace(/\..*/, "\\."));
-            do {
-                token = iterator.stepBackward();
-            } while(token && re.test(token.type));
-
-            iterator.stepForward();
-            range.start.row = iterator.getCurrentTokenRow();
-            range.start.column = iterator.getCurrentTokenColumn() + 2;
-
-            iterator = new TokenIterator(this, row, column);
-
-            do {
-                token = iterator.stepForward();
-            } while(token && re.test(token.type));
-            
-            token = iterator.stepBackward();
-
-            range.end.row = iterator.getCurrentTokenRow();
-            range.end.column = iterator.getCurrentTokenColumn() + token.value.length;
-            return range;
-        }
-    };
-
-    this.foldAll = function(startRow, endRow) {
-        var foldWidgets = this.foldWidgets;
-        endRow = endRow || this.getLength();
-        for (var row = startRow || 0; row < endRow; row++) {
-            if (foldWidgets[row] == null)
-                foldWidgets[row] = this.getFoldWidget(row);
-            if (foldWidgets[row] != "start")
-                continue;
-
-            var range = this.getFoldWidgetRange(row);
-            // sometimes range can be incompatible with existing fold
-            // wouldn't it be better for addFold to return null istead of throwing?
-            if (range && range.end.row < endRow) try {
-                this.addFold("...", range);
-            } catch(e) {}
-        }
-    };
-    
-    this.$foldStyles = {
-        "manual": 1,
-        "markbegin": 1,
-        "markbeginend": 1
-    };
-    this.$foldStyle = "markbegin";
-    this.setFoldStyle = function(style) {
-        if (!this.$foldStyles[style])
-            throw new Error("invalid fold style: " + style + "[" + Object.keys(this.$foldStyles).join(", ") + "]");
-        
-        if (this.$foldStyle == style)
-            return;
-
-        this.$foldStyle = style;
-        
-        if (style == "manual")
-            this.unfold();
-        
-        // reset folding
-        var mode = this.$foldMode;
-        this.$setFolding(null);
-        this.$setFolding(mode);
-    };
-
-    // structured folding
-    this.$setFolding = function(foldMode) {
-        if (this.$foldMode == foldMode)
-            return;
-            
-        this.$foldMode = foldMode;
-        
-        this.removeListener('change', this.$updateFoldWidgets);
-        this._emit("changeAnnotation");
-        
-        if (!foldMode || this.$foldStyle == "manual") {
-            this.foldWidgets = null;
-            return;
-        }
-        
-        this.foldWidgets = [];
-        this.getFoldWidget = foldMode.getFoldWidget.bind(foldMode, this, this.$foldStyle);
-        this.getFoldWidgetRange = foldMode.getFoldWidgetRange.bind(foldMode, this, this.$foldStyle);
-        
-        this.$updateFoldWidgets = this.updateFoldWidgets.bind(this);
-        this.on('change', this.$updateFoldWidgets);
-        
-    };
-
-    this.onFoldWidgetClick = function(row, e) {
-        var type = this.getFoldWidget(row);
-        var line = this.getLine(row);
-        var onlySubfolds = e.shiftKey;
-        var addSubfolds = onlySubfolds || e.ctrlKey || e.altKey || e.metaKey;
-        var fold;
-
-        if (type == "end")
-            fold = this.getFoldAt(row, 0, -1);
-        else
-            fold = this.getFoldAt(row, line.length, 1);
-
-        if (fold) {
-            if (addSubfolds)
-                this.removeFold(fold);
-            else
-                this.expandFold(fold);
-            return;
-        }
-
-        var range = this.getFoldWidgetRange(row);
-        if (range) {
-            // sometimes singleline folds can be missed by the code above
-            if (!range.isMultiLine()) {
-                fold = this.getFoldAt(range.start.row, range.start.column, 1);
-                if (fold && range.isEqual(fold.range)) {
-                    this.removeFold(fold);
-                    return;
-                }
-            }
-            
-            if (!onlySubfolds)
-                this.addFold("...", range);
-
-            if (addSubfolds)
-                this.foldAll(range.start.row + 1, range.end.row);
-        } else {
-            if (addSubfolds)
-                this.foldAll(row + 1, this.getLength());
-            e.target.className += " invalid"
-        }
-    };
-    
-    this.updateFoldWidgets = function(e) {
-        var delta = e.data;
-        var range = delta.range;
-        var firstRow = range.start.row;
-        var len = range.end.row - firstRow;
-
-        if (len === 0) {
-            this.foldWidgets[firstRow] = null;
-        } else if (delta.action == "removeText" || delta.action == "removeLines") {
-            this.foldWidgets.splice(firstRow, len + 1, null);
-        } else {
-            var args = Array(len + 1);
-            args.unshift(firstRow, 1);
-            this.foldWidgets.splice.apply(this.foldWidgets, args);
-        }
-    };
-
-}
-
-exports.Folding = Folding;
-
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Julian Viereck <julian DOT viereck AT gmail DOT com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/edit_session/fold_line', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../range").Range;
-
-/**
- * If an array is passed in, the folds are expected to be sorted already.
- */
-function FoldLine(foldData, folds) {
-    this.foldData = foldData;
-    if (Array.isArray(folds)) {
-        this.folds = folds;
-    } else {
-        folds = this.folds = [ folds ];
-    }
-
-    var last = folds[folds.length - 1]
-    this.range = new Range(folds[0].start.row, folds[0].start.column,
-                           last.end.row, last.end.column);
-    this.start = this.range.start;
-    this.end   = this.range.end;
-
-    this.folds.forEach(function(fold) {
-        fold.setFoldLine(this);
-    }, this);
-}
-
-(function() {
-    /**
-     * Note: This doesn't update wrapData!
-     */
-    this.shiftRow = function(shift) {
-        this.start.row += shift;
-        this.end.row += shift;
-        this.folds.forEach(function(fold) {
-            fold.start.row += shift;
-            fold.end.row += shift;
-        });
-    }
-
-    this.addFold = function(fold) {
-        if (fold.sameRow) {
-            if (fold.start.row < this.startRow || fold.endRow > this.endRow) {
-                throw "Can't add a fold to this FoldLine as it has no connection";
-            }
-            this.folds.push(fold);
-            this.folds.sort(function(a, b) {
-                return -a.range.compareEnd(b.start.row, b.start.column);
-            });
-            if (this.range.compareEnd(fold.start.row, fold.start.column) > 0) {
-                this.end.row = fold.end.row;
-                this.end.column =  fold.end.column;
-            } else if (this.range.compareStart(fold.end.row, fold.end.column) < 0) {
-                this.start.row = fold.start.row;
-                this.start.column = fold.start.column;
-            }
-        } else if (fold.start.row == this.end.row) {
-            this.folds.push(fold);
-            this.end.row = fold.end.row;
-            this.end.column = fold.end.column;
-        } else if (fold.end.row == this.start.row) {
-            this.folds.unshift(fold);
-            this.start.row = fold.start.row;
-            this.start.column = fold.start.column;
-        } else {
-            throw "Trying to add fold to FoldRow that doesn't have a matching row";
-        }
-        fold.foldLine = this;
-    }
-
-    this.containsRow = function(row) {
-        return row >= this.start.row && row <= this.end.row;
-    }
-
-    this.walk = function(callback, endRow, endColumn) {
-        var lastEnd = 0,
-            folds = this.folds,
-            fold,
-            comp, stop, isNewRow = true;
-
-        if (endRow == null) {
-            endRow = this.end.row;
-            endColumn = this.end.column;
-        }
-
-        for (var i = 0; i < folds.length; i++) {
-            fold = folds[i];
-
-            comp = fold.range.compareStart(endRow, endColumn);
-            // This fold is after the endRow/Column.
-            if (comp == -1) {
-                callback(null, endRow, endColumn, lastEnd, isNewRow);
-                return;
-            }
-
-            stop = callback(null, fold.start.row, fold.start.column, lastEnd, isNewRow);
-            stop = !stop && callback(fold.placeholder, fold.start.row, fold.start.column, lastEnd);
-
-            // If the user requested to stop the walk or endRow/endColumn is
-            // inside of this fold (comp == 0), then end here.
-            if (stop || comp == 0) {
-                return;
-            }
-
-            // Note the new lastEnd might not be on the same line. However,
-            // it's the callback's job to recognize this.
-            isNewRow = !fold.sameRow;
-            lastEnd = fold.end.column;
-        }
-        callback(null, endRow, endColumn, lastEnd, isNewRow);
-    }
-
-    this.getNextFoldTo = function(row, column) {
-        var fold, cmp;
-        for (var i = 0; i < this.folds.length; i++) {
-            fold = this.folds[i];
-            cmp = fold.range.compareEnd(row, column);
-            if (cmp == -1) {
-                return {
-                    fold: fold,
-                    kind: "after"
-                };
-            } else if (cmp == 0) {
-                return {
-                    fold: fold,
-                    kind: "inside"
-                }
-            }
-        }
-        return null;
-    }
-
-    this.addRemoveChars = function(row, column, len) {
-        var ret = this.getNextFoldTo(row, column),
-            fold, folds;
-        if (ret) {
-            fold = ret.fold;
-            if (ret.kind == "inside"
-                && fold.start.column != column
-                && fold.start.row != row)
-            {
-                throw "Moving characters inside of a fold should never be reached";
-            } else if (fold.start.row == row) {
-                folds = this.folds;
-                var i = folds.indexOf(fold);
-                if (i == 0) {
-                    this.start.column += len;
-                }
-                for (i; i < folds.length; i++) {
-                    fold = folds[i];
-                    fold.start.column += len;
-                    if (!fold.sameRow) {
-                        return;
-                    }
-                    fold.end.column += len;
-                }
-                this.end.column += len;
-            }
-        }
-    }
-
-    this.split = function(row, column) {
-        var fold = this.getNextFoldTo(row, column).fold,
-            folds = this.folds;
-        var foldData = this.foldData;
-
-        if (!fold) {
-            return null;
-        }
-        var i = folds.indexOf(fold);
-        var foldBefore = folds[i - 1];
-        this.end.row = foldBefore.end.row;
-        this.end.column = foldBefore.end.column;
-
-        // Remove the folds after row/column and create a new FoldLine
-        // containing these removed folds.
-        folds = folds.splice(i, folds.length - i);
-
-        var newFoldLine = new FoldLine(foldData, folds);
-        foldData.splice(foldData.indexOf(this) + 1, 0, newFoldLine);
-        return newFoldLine;
-    }
-
-    this.merge = function(foldLineNext) {
-        var folds = foldLineNext.folds;
-        for (var i = 0; i < folds.length; i++) {
-            this.addFold(folds[i]);
-        }
-        // Remove the foldLineNext - no longer needed, as
-        // it's merged now with foldLineNext.
-        var foldData = this.foldData;
-        foldData.splice(foldData.indexOf(foldLineNext), 1);
-    }
-
-    this.toString = function() {
-        var ret = [this.range.toString() + ": [" ];
-
-        this.folds.forEach(function(fold) {
-            ret.push("  " + fold.toString());
-        });
-        ret.push("]")
-        return ret.join("\n");
-    }
-
-    this.idxToPosition = function(idx) {
-        var lastFoldEndColumn = 0;
-        var fold;
-
-        for (var i = 0; i < this.folds.length; i++) {
-            var fold = this.folds[i];
-
-            idx -= fold.start.column - lastFoldEndColumn;
-            if (idx < 0) {
-                return {
-                    row: fold.start.row,
-                    column: fold.start.column + idx
-                };
-            }
-
-            idx -= fold.placeholder.length;
-            if (idx < 0) {
-                return fold.start;
-            }
-
-            lastFoldEndColumn = fold.end.column;
-        }
-
-        return {
-            row: this.end.row,
-            column: this.end.column + idx
-        };
-    }
-}).call(FoldLine.prototype);
-
-exports.FoldLine = FoldLine;
-});/* vim:ts=4:sts=4:sw=4:
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Julian Viereck <julian DOT viereck AT gmail DOT com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/edit_session/fold', ['require', 'exports', 'module' ], function(require, exports, module) {
-"use strict";
-
-/**
- * Simple fold-data struct.
- **/
-var Fold = exports.Fold = function(range, placeholder) {
-    this.foldLine = null;
-    this.placeholder = placeholder;
-    this.range = range;
-    this.start = range.start;
-    this.end = range.end;
-
-    this.sameRow = range.start.row == range.end.row;
-    this.subFolds = [];
-};
-
-(function() {
-
-    this.toString = function() {
-        return '"' + this.placeholder + '" ' + this.range.toString();
-    };
-
-    this.setFoldLine = function(foldLine) {
-        this.foldLine = foldLine;
-        this.subFolds.forEach(function(fold) {
-            fold.setFoldLine(foldLine);
-        });
-    };
-
-    this.clone = function() {
-        var range = this.range.clone();
-        var fold = new Fold(range, this.placeholder);
-        this.subFolds.forEach(function(subFold) {
-            fold.subFolds.push(subFold.clone());
-        });
-        return fold;
-    };
-
-    this.addSubFold = function(fold) {
-        if (this.range.isEqual(fold))
-            return this;
-
-        if (!this.range.containsRange(fold))
-            throw "A fold can't intersect already existing fold" + fold.range + this.range;
-
-        var row = fold.range.start.row, column = fold.range.start.column;
-        for (var i = 0, cmp = -1; i < this.subFolds.length; i++) {
-            cmp = this.subFolds[i].range.compare(row, column);
-            if (cmp != 1)
-                break;
-        }
-        var afterStart = this.subFolds[i];
-
-        if (cmp == 0)
-            return afterStart.addSubFold(fold)
-
-        // cmp == -1
-        var row = fold.range.end.row, column = fold.range.end.column;
-        for (var j = i, cmp = -1; j < this.subFolds.length; j++) {
-            cmp = this.subFolds[j].range.compare(row, column);
-            if (cmp != 1)
-                break;
-        }
-        var afterEnd = this.subFolds[j];
-
-        if (cmp == 0)
-            throw "A fold can't intersect already existing fold" + fold.range + this.range;
-
-        var consumedFolds = this.subFolds.splice(i, j - i, fold)
-        fold.setFoldLine(this.foldLine);
-
-        return fold;
-    }
-
-}).call(Fold.prototype);
-
-});/* vim:ts=4:sts=4:sw=4:
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/token_iterator', ['require', 'exports', 'module' ], function(require, exports, module) {
-"use strict";
-
-var TokenIterator = function(session, initialRow, initialColumn) {
-    this.$session = session;
-    this.$row = initialRow;
-    this.$rowTokens = session.getTokens(initialRow, initialRow)[0].tokens;
-
-    var token = session.getTokenAt(initialRow, initialColumn);
-    this.$tokenIndex = token ? token.index : -1;
-};
-
-(function() {
-    
-    this.stepBackward = function() {
-        this.$tokenIndex -= 1;
-        
-        while (this.$tokenIndex < 0) {
-            this.$row -= 1;
-            if (this.$row < 0) {
-                this.$row = 0;
-                return null;
-            }
-                
-            this.$rowTokens = this.$session.getTokens(this.$row, this.$row)[0].tokens;
-            this.$tokenIndex = this.$rowTokens.length - 1;
-        }
-            
-        return this.$rowTokens[this.$tokenIndex];
-    };
-    
-    this.stepForward = function() {
-        var rowCount = this.$session.getLength();
-        this.$tokenIndex += 1;
-        
-        while (this.$tokenIndex >= this.$rowTokens.length) {
-            this.$row += 1;
-            if (this.$row >= rowCount) {
-                this.$row = rowCount - 1;
-                return null;
-            }
-
-            this.$rowTokens = this.$session.getTokens(this.$row, this.$row)[0].tokens;
-            this.$tokenIndex = 0;
-        }
-            
-        return this.$rowTokens[this.$tokenIndex];
-    };
-    
-    this.getCurrentToken = function () {
-        return this.$rowTokens[this.$tokenIndex];
-    };
-    
-    this.getCurrentTokenRow = function () {
-        return this.$row;
-    };
-    
-    this.getCurrentTokenColumn = function() {
-        var rowTokens = this.$rowTokens;
-        var tokenIndex = this.$tokenIndex;
-        
-        // If a column was cached by EditSession.getTokenAt, then use it
-        var column = rowTokens[tokenIndex].start;
-        if (column !== undefined)
-            return column;
-            
-        column = 0;
-        while (tokenIndex > 0) {
-            tokenIndex -= 1;
-            column += rowTokens[tokenIndex].value.length;
-        }
-        
-        return column;  
-    };
-            
-}).call(TokenIterator.prototype);
-
-exports.TokenIterator = TokenIterator;
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/edit_session/bracket_match', ['require', 'exports', 'module' , 'ace/token_iterator'], function(require, exports, module) {
-"use strict";
-
-var TokenIterator = require("../token_iterator").TokenIterator;
-
-function BracketMatch() {
-
-    this.findMatchingBracket = function(position) {
-        if (position.column == 0) return null;
-
-        var charBeforeCursor = this.getLine(position.row).charAt(position.column-1);
-        if (charBeforeCursor == "") return null;
-
-        var match = charBeforeCursor.match(/([\(\[\{])|([\)\]\}])/);
-        if (!match) {
-            return null;
-        }
-
-        if (match[1]) {
-            return this.$findClosingBracket(match[1], position);
-        } else {
-            return this.$findOpeningBracket(match[2], position);
-        }
-    };
-
-    this.$brackets = {
-        ")": "(",
-        "(": ")",
-        "]": "[",
-        "[": "]",
-        "{": "}",
-        "}": "{"
-    };
-
-    this.$findOpeningBracket = function(bracket, position) {
-        var openBracket = this.$brackets[bracket];
-        var depth = 1;
-
-        var iterator = new TokenIterator(this, position.row, position.column);
-        var token = iterator.getCurrentToken();
-        if (!token) return null;
-        
-        // token.type contains a period-delimited list of token identifiers
-        // (e.g.: "constant.numeric" or "paren.lparen").  Create a pattern that
-        // matches any token containing the same identifiers or a subset.  In
-        // addition, if token.type includes "rparen", then also match "lparen".
-        // So if type.token is "paren.rparen", then typeRe will match "lparen.paren".
-        var typeRe = new RegExp("(\\.?" +
-            token.type.replace(".", "|").replace("rparen", "lparen|rparen") + ")+");
-        
-        // Start searching in token, just before the character at position.column
-        var valueIndex = position.column - iterator.getCurrentTokenColumn() - 2;
-        var value = token.value;
-        
-        while (true) {
-        
-            while (valueIndex >= 0) {
-                var chr = value.charAt(valueIndex);
-                if (chr == openBracket) {
-                    depth -= 1;
-                    if (depth == 0) {
-                        return {row: iterator.getCurrentTokenRow(),
-                            column: valueIndex + iterator.getCurrentTokenColumn()};
-                    }
-                }
-                else if (chr == bracket) {
-                    depth += 1;
-                }
-                valueIndex -= 1;
-            }
-
-            // Scan backward through the document, looking for the next token
-            // whose type matches typeRe
-            do {
-                token = iterator.stepBackward();
-            } while (token && !typeRe.test(token.type));
-
-            if (token == null)
-                break;
-                
-            value = token.value;
-            valueIndex = value.length - 1;
-        }
-        
-        return null;
-    };
-
-    this.$findClosingBracket = function(bracket, position) {
-        var closingBracket = this.$brackets[bracket];
-        var depth = 1;
-
-        var iterator = new TokenIterator(this, position.row, position.column);
-        var token = iterator.getCurrentToken();
-        if (!token) return null;
-
-        // token.type contains a period-delimited list of token identifiers
-        // (e.g.: "constant.numeric" or "paren.lparen").  Create a pattern that
-        // matches any token containing the same identifiers or a subset.  In
-        // addition, if token.type includes "lparen", then also match "rparen".
-        // So if type.token is "lparen.paren", then typeRe will match "paren.rparen".
-        var typeRe = new RegExp("(\\.?" +
-            token.type.replace(".", "|").replace("lparen", "lparen|rparen") + ")+");
-
-        // Start searching in token, after the character at position.column
-        var valueIndex = position.column - iterator.getCurrentTokenColumn();
-
-        while (true) {
-
-            var value = token.value;
-            var valueLength = value.length;
-            while (valueIndex < valueLength) {
-                var chr = value.charAt(valueIndex);
-                if (chr == closingBracket) {
-                    depth -= 1;
-                    if (depth == 0) {
-                        return {row: iterator.getCurrentTokenRow(),
-                            column: valueIndex + iterator.getCurrentTokenColumn()};
-                    }
-                }
-                else if (chr == bracket) {
-                    depth += 1;
-                }
-                valueIndex += 1;
-            }
-
-            // Scan forward through the document, looking for the next token
-            // whose type matches typeRe
-            do {
-                token = iterator.stepForward();
-            } while (token && !typeRe.test(token.type));
-
-            if (token == null)
-                break;
-
-            valueIndex = 0;
-        }
-        
-        return null;
-    };
-}
-exports.BracketMatch = BracketMatch;
-
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Mihai Sucan <mihai DOT sucan AT gmail DOT com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/search', ['require', 'exports', 'module' , 'ace/lib/lang', 'ace/lib/oop', 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var lang = require("./lib/lang");
-var oop = require("./lib/oop");
-var Range = require("./range").Range;
-
-var Search = function() {
-    this.$options = {
-        needle: "",
-        backwards: false,
-        wrap: false,
-        caseSensitive: false,
-        wholeWord: false,
-        scope: Search.ALL,
-        regExp: false
-    };
-};
-
-Search.ALL = 1;
-Search.SELECTION = 2;
-
-(function() {
-
-    this.set = function(options) {
-        oop.mixin(this.$options, options);
-        return this;
-    };
-    
-    this.getOptions = function() {
-        return lang.copyObject(this.$options);
-    };
-
-    this.find = function(session) {
-        if (!this.$options.needle)
-            return null;
-
-        if (this.$options.backwards) {
-            var iterator = this.$backwardMatchIterator(session);
-        } else {
-            iterator = this.$forwardMatchIterator(session);
-        }
-
-        var firstRange = null;
-        iterator.forEach(function(range) {
-            firstRange = range;
-            return true;
-        });
-
-        return firstRange;
-    };
-
-    this.findAll = function(session) {
-        var options = this.$options;
-        if (!options.needle)
-            return [];
-
-        if (options.backwards) {
-            var iterator = this.$backwardMatchIterator(session);
-        } else {
-            iterator = this.$forwardMatchIterator(session);
-        }
-
-        var ignoreCursor = !options.start && options.wrap && options.scope == Search.ALL;
-        if (ignoreCursor)
-            options.start = {row: 0, column: 0};
-
-        var ranges = [];
-        iterator.forEach(function(range) {
-            ranges.push(range);
-        });
-
-        if (ignoreCursor)
-            options.start = null;
-
-        return ranges;
-    };
-
-    this.replace = function(input, replacement) {
-        var re = this.$assembleRegExp();
-        var match = re.exec(input);
-        if (match && match[0].length == input.length) {
-            if (this.$options.regExp) {
-                return input.replace(re, replacement);
-            } else {
-                return replacement;
-            }
-        } else {
-            return null;
-        }
-    };
-
-    this.$forwardMatchIterator = function(session) {
-        var re = this.$assembleRegExp();
-        var self = this;
-
-        return {
-            forEach: function(callback) {
-                self.$forwardLineIterator(session).forEach(function(line, startIndex, row) {
-                    if (startIndex) {
-                        line = line.substring(startIndex);
-                    }
-
-                    var matches = [];
-
-                    line.replace(re, function(str) {
-                        var offset = arguments[arguments.length-2];
-                        matches.push({
-                            str: str,
-                            offset: startIndex + offset
-                        });
-                        return str;
-                    });
-
-                    for (var i=0; i<matches.length; i++) {
-                        var match = matches[i];
-                        var range = self.$rangeFromMatch(row, match.offset, match.str.length);
-                        if (callback(range))
-                            return true;
-                    }
-
-                });
-            }
-        };
-    };
-
-    this.$backwardMatchIterator = function(session) {
-        var re = this.$assembleRegExp();
-        var self = this;
-
-        return {
-            forEach: function(callback) {
-                self.$backwardLineIterator(session).forEach(function(line, startIndex, row) {
-                    if (startIndex) {
-                        line = line.substring(startIndex);
-                    }
-
-                    var matches = [];
-
-                    line.replace(re, function(str, offset) {
-                        matches.push({
-                            str: str,
-                            offset: startIndex + offset
-                        });
-                        return str;
-                    });
-
-                    for (var i=matches.length-1; i>= 0; i--) {
-                        var match = matches[i];
-                        var range = self.$rangeFromMatch(row, match.offset, match.str.length);
-                        if (callback(range))
-                            return true;
-                    }
-                });
-            }
-        };
-    };
-
-    this.$rangeFromMatch = function(row, column, length) {
-        return new Range(row, column, row, column+length);
-    };
-
-    this.$assembleRegExp = function() {
-        if (this.$options.regExp) {
-            var needle = this.$options.needle;
-        } else {
-            needle = lang.escapeRegExp(this.$options.needle);
-        }
-
-        if (this.$options.wholeWord) {
-            needle = "\\b" + needle + "\\b";
-        }
-
-        var modifier = "g";
-        if (!this.$options.caseSensitive) {
-            modifier += "i";
-        }
-
-        var re = new RegExp(needle, modifier);
-        return re;
-    };
-
-    this.$forwardLineIterator = function(session) {
-        var searchSelection = this.$options.scope == Search.SELECTION;
-
-        var range = this.$options.range || session.getSelection().getRange();
-        var start = this.$options.start || range[searchSelection ? "start" : "end"];
-
-        var firstRow = searchSelection ? range.start.row : 0;
-        var firstColumn = searchSelection ? range.start.column : 0;
-        var lastRow = searchSelection ? range.end.row : session.getLength() - 1;
-
-        var wrap = this.$options.wrap;
-        var inWrap = false;
-
-        function getLine(row) {
-            var line = session.getLine(row);
-            if (searchSelection && row == range.end.row) {
-                line = line.substring(0, range.end.column);
-            }
-            if (inWrap && row == start.row) {
-                line = line.substring(0, start.column);
-            }
-            return line;
-        }
-
-        return {
-            forEach: function(callback) {
-                var row = start.row;
-
-                var line = getLine(row);
-                var startIndex = start.column;
-
-                var stop = false;
-                inWrap = false;
-
-                while (!callback(line, startIndex, row)) {
-
-                    if (stop) {
-                        return;
-                    }
-
-                    row++;
-                    startIndex = 0;
-
-                    if (row > lastRow) {
-                        if (wrap) {
-                            row = firstRow;
-                            startIndex = firstColumn;
-                            inWrap = true;
-                        } else {
-                            return;
-                        }
-                    }
-
-                    if (row == start.row)
-                        stop = true;
-
-                    line = getLine(row);
-                }
-            }
-        };
-    };
-
-    this.$backwardLineIterator = function(session) {
-        var searchSelection = this.$options.scope == Search.SELECTION;
-
-        var range = this.$options.range || session.getSelection().getRange();
-        var start = this.$options.start || range[searchSelection ? "end" : "start"];
-
-        var firstRow = searchSelection ? range.start.row : 0;
-        var firstColumn = searchSelection ? range.start.column : 0;
-        var lastRow = searchSelection ? range.end.row : session.getLength() - 1;
-
-        var wrap = this.$options.wrap;
-
-        return {
-            forEach : function(callback) {
-                var row = start.row;
-
-                var line = session.getLine(row).substring(0, start.column);
-                var startIndex = 0;
-                var stop = false;
-                var inWrap = false;
-
-                while (!callback(line, startIndex, row)) {
-
-                    if (stop)
-                        return;
-
-                    row--;
-                    startIndex = 0;
-
-                    if (row < firstRow) {
-                        if (wrap) {
-                            row = lastRow;
-                            inWrap = true;
-                        } else {
-                            return;
-                        }
-                    }
-
-                    if (row == start.row)
-                        stop = true;
-
-                    line = session.getLine(row);
-                    if (searchSelection) {
-                        if (row == firstRow)
-                            startIndex = firstColumn;
-                        else if (row == lastRow)
-                            line = line.substring(0, range.end.column);
-                    }
-
-                    if (inWrap && row == start.row)
-                        startIndex = start.column;
-                }
-            }
-        };
-    };
-
-}).call(Search.prototype);
-
-exports.Search = Search;
-});
-define('ace/commands/command_manager', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/keyboard/hash_handler', 'ace/lib/event_emitter'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var HashHandler = require("../keyboard/hash_handler").HashHandler;
-var EventEmitter = require("../lib/event_emitter").EventEmitter;
-
-var CommandManager = function(platform, commands) {
-    this.platform = platform;
-    this.commands = {};
-    this.commmandKeyBinding = {};
-
-    this.addCommands(commands);
-    
-    this.setDefaultHandler("exec", function(e) {
-        e.command.exec(e.editor, e.args || {});
-    });
-};
-
-oop.inherits(CommandManager, HashHandler);
-
-(function() {
-
-    oop.implement(this, EventEmitter);
-
-    this.exec = function(command, editor, args) {
-        if (typeof command === 'string')
-            command = this.commands[command];
-
-        if (!command)
-            return false;
-
-        if (editor && editor.$readOnly && !command.readOnly)
-            return false;
-
-        this._emit("exec", {editor: editor, command: command, args: args});
-        return true;
-    };
-
-    this.toggleRecording = function() {
-        if (this.$inReplay)
-            return;
-        if (this.recording) {
-            this.macro.pop();
-            this.removeEventListener("exec", this.$addCommandToMacro);
-
-            if (!this.macro.length)
-                this.macro = this.oldMacro;
-
-            return this.recording = false;
-        }
-        if (!this.$addCommandToMacro) {
-            this.$addCommandToMacro = function(e) {
-                    this.macro.push([e.command, e.args]);
-                }.bind(this);
-        }
-
-        this.oldMacro = this.macro;
-        this.macro = [];
-        this.on("exec", this.$addCommandToMacro);
-        return this.recording = true;
-    };
-
-    this.replay = function(editor) {
-        if (this.$inReplay || !this.macro)
-            return;
-
-        if (this.recording)
-            return this.toggleRecording();
-
-        try {
-            this.$inReplay = true;
-            this.macro.forEach(function(x) {
-                if (typeof x == "string")
-                    this.exec(x, editor);
-                else
-                    this.exec(x[0], editor, x[1]);
-            }, this);
-        } finally {
-            this.$inReplay = false;
-        }
-    };
-
-    this.trimMacro = function(m) {
-        return m.map(function(x){
-            if (typeof x[0] != "string")
-                x[0] = x[0].name;
-            if (!x[1])
-                x = x[0];
-            return x;
-        });
-    };
-
-}).call(CommandManager.prototype);
-
-exports.CommandManager = CommandManager;
-
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Skywriter.
- *
- * The Initial Developer of the Original Code is
- * Mozilla.
- * Portions created by the Initial Developer are Copyright (C) 2009
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Fabian Jakobs <fabian AT ajax DOT org>
- *   Julian Viereck (julian.viereck@gmail.com)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/keyboard/hash_handler', ['require', 'exports', 'module' , 'ace/lib/keys'], function(require, exports, module) {
-"use strict";
-
-var keyUtil  = require("../lib/keys");
-
-function HashHandler(config, platform) {
-    this.platform = platform;
-    this.commands = {};
-    this.commmandKeyBinding = {};
-
-    this.addCommands(config);
-};
-
-(function() {
-
-    this.addCommand = function(command) {
-        if (this.commands[command.name])
-            this.removeCommand(command);
-
-        this.commands[command.name] = command;
-
-        if (command.bindKey) {
-            this._buildKeyHash(command);
-        }
-    };
-
-    this.removeCommand = function(command) {
-        var name = (typeof command === 'string' ? command : command.name);
-        command = this.commands[name];
-        delete this.commands[name];
-
-        // exhaustive search is brute force but since removeCommand is
-        // not a performance critical operation this should be OK
-        var ckb = this.commmandKeyBinding;
-        for (var hashId in ckb) {
-            for (var key in ckb[hashId]) {
-                if (ckb[hashId][key] == command)
-                    delete ckb[hashId][key];
-            }
-        }
-    };
-
-    this.addCommands = function(commands) {
-        commands && Object.keys(commands).forEach(function(name) {
-            var command = commands[name];
-            if (typeof command === "string")
-                return this.bindKey(command, name);
-
-            if (typeof command === "function")
-                command = { exec: command };
-
-            if (!command.name)
-                command.name = name;
-
-            this.addCommand(command);
-        }, this);
-    };
-
-    this.removeCommands = function(commands) {
-        Object.keys(commands).forEach(function(name) {
-            this.removeCommand(commands[name]);
-        }, this);
-    };
-
-    this.bindKey = function(key, command) {
-        if(!key)
-            return;
-
-        var ckb = this.commmandKeyBinding;
-        key.split("|").forEach(function(keyPart) {
-            var binding = parseKeys(keyPart, command);
-            var hashId = binding.hashId;
-            (ckb[hashId] || (ckb[hashId] = {}))[binding.key] = command;
-        });
-    };
-
-    this.bindKeys = function(keyList) {
-        Object.keys(keyList).forEach(function(key) {
-            this.bindKey(key, keyList[key]);
-        }, this);
-    };
-
-    this._buildKeyHash = function(command) {
-        var binding = command.bindKey;
-        if (!binding)
-            return;
-
-        var key = typeof binding == "string" ? binding: binding[this.platform];
-        this.bindKey(key, command);
-    };
-
-    function parseKeys(keys, val, ret) {
-        var key;
-        var hashId = 0;
-        var parts = splitSafe(keys.toLowerCase());
-
-        for (var i = 0, l = parts.length; i < l; i++) {
-            if (keyUtil.KEY_MODS[parts[i]])
-                hashId = hashId | keyUtil.KEY_MODS[parts[i]];
-            else
-                key = parts[i] || "-"; //when empty, the splitSafe removed a '-'
-        }
-
-        return {
-            key: key,
-            hashId: hashId
-        };
-    }
-
-    function splitSafe(s) {
-        return (s.trim()
-            .split(new RegExp("[\\s ]*\\-[\\s ]*", "g"), 999));
-    }
-
-    this.findKeyCommand = function findKeyCommand(hashId, keyString) {
-        var ckbr = this.commmandKeyBinding;
-        return ckbr[hashId] && ckbr[hashId][keyString.toLowerCase()];
-    }
-
-    this.handleKeyboard = function(data, hashId, keyString, keyCode) {
-        return {
-            command: this.findKeyCommand(hashId, keyString)
-        };
-    };
-
-}).call(HashHandler.prototype)
-
-exports.HashHandler = HashHandler;
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Mihai Sucan <mihai DOT sucan AT gmail DOT com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/undomanager', ['require', 'exports', 'module' ], function(require, exports, module) {
-"use strict";
-
-var UndoManager = function() {
-    this.reset();
-};
-
-(function() {
-
-    this.execute = function(options) {
-        var deltas = options.args[0];
-        this.$doc  = options.args[1];
-        this.$undoStack.push(deltas);
-        this.$redoStack = [];
-    };
-
-    this.undo = function(dontSelect) {
-        var deltas = this.$undoStack.pop();
-        var undoSelectionRange = null;
-        if (deltas) {
-            undoSelectionRange =
-                this.$doc.undoChanges(deltas, dontSelect);
-            this.$redoStack.push(deltas);
-        }
-        return undoSelectionRange;
-    };
-
-    this.redo = function(dontSelect) {
-        var deltas = this.$redoStack.pop();
-        var redoSelectionRange = null;
-        if (deltas) {
-            redoSelectionRange =
-                this.$doc.redoChanges(deltas, dontSelect);
-            this.$undoStack.push(deltas);
-        }
-        return redoSelectionRange;
-    };
-
-    this.reset = function() {
-        this.$undoStack = [];
-        this.$redoStack = [];
-    };
-
-    this.hasUndo = function() {
-        return this.$undoStack.length > 0;
-    };
-
-    this.hasRedo = function() {
-        return this.$redoStack.length > 0;
-    };
-
-}).call(UndoManager.prototype);
-
-exports.UndoManager = UndoManager;
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian@ajax.org>
- *      Irakli Gozalishvili <rfobic@gmail.com> (http://jeditoolkit.com)
- *      Julian Viereck <julian.viereck@gmail.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/virtual_renderer', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/dom', 'ace/lib/event', 'ace/lib/useragent', 'ace/config', 'ace/lib/net', 'ace/layer/gutter', 'ace/layer/marker', 'ace/layer/text', 'ace/layer/cursor', 'ace/scrollbar', 'ace/renderloop', 'ace/lib/event_emitter', 'text!ace/css/editor.css'], function(require, exports, module) {
-"use strict";
-
-var oop = require("./lib/oop");
-var dom = require("./lib/dom");
-var event = require("./lib/event");
-var useragent = require("./lib/useragent");
-var config = require("./config");
-var net = require("./lib/net");
-var GutterLayer = require("./layer/gutter").Gutter;
-var MarkerLayer = require("./layer/marker").Marker;
-var TextLayer = require("./layer/text").Text;
-var CursorLayer = require("./layer/cursor").Cursor;
-var ScrollBar = require("./scrollbar").ScrollBar;
-var RenderLoop = require("./renderloop").RenderLoop;
-var EventEmitter = require("./lib/event_emitter").EventEmitter;
-var editorCss = require("text!./css/editor.css");
-
-dom.importCssString(editorCss, "ace_editor");
-
-var VirtualRenderer = function(container, theme) {
-    var _self = this;
-
-    this.container = container;
-
-    // TODO: this breaks rendering in Cloud9 with multiple ace instances
-//    // Imports CSS once per DOM document ('ace_editor' serves as an identifier).
-//    dom.importCssString(editorCss, "ace_editor", container.ownerDocument);
-
-    dom.addCssClass(container, "ace_editor");
-
-    this.setTheme(theme);
-
-    this.$gutter = dom.createElement("div");
-    this.$gutter.className = "ace_gutter";
-    this.container.appendChild(this.$gutter);
-
-    this.scroller = dom.createElement("div");
-    this.scroller.className = "ace_scroller";
-    this.container.appendChild(this.scroller);
-
-    this.content = dom.createElement("div");
-    this.content.className = "ace_content";
-    this.scroller.appendChild(this.content);
-
-    this.$gutterLayer = new GutterLayer(this.$gutter);
-    this.$gutterLayer.on("changeGutterWidth", this.onResize.bind(this, true));
-
-    this.$markerBack = new MarkerLayer(this.content);
-
-    var textLayer = this.$textLayer = new TextLayer(this.content);
-    this.canvas = textLayer.element;
-
-    this.$markerFront = new MarkerLayer(this.content);
-
-    this.characterWidth = textLayer.getCharacterWidth();
-    this.lineHeight = textLayer.getLineHeight();
-
-    this.$cursorLayer = new CursorLayer(this.content);
-    this.$cursorPadding = 8;
-
-    // Indicates whether the horizontal scrollbar is visible
-    this.$horizScroll = true;
-    this.$horizScrollAlwaysVisible = true;
-
-    this.$animatedScroll = false;
-
-    this.scrollBar = new ScrollBar(container);
-    this.scrollBar.addEventListener("scroll", function(e) {
-        _self.session.setScrollTop(e.data);
-    });
-
-    this.scrollTop = 0;
-    this.scrollLeft = 0;
-
-    event.addListener(this.scroller, "scroll", function() {
-        var scrollLeft = _self.scroller.scrollLeft;
-        _self.scrollLeft = scrollLeft;
-        _self.session.setScrollLeft(scrollLeft);
-
-        if (scrollLeft == 0) {
-            _self.$gutter.className = "ace_gutter";
-        }
-        else {
-            _self.$gutter.className = "ace_gutter horscroll";
-        }
-    });
-
-    this.cursorPos = {
-        row : 0,
-        column : 0
-    };
-
-    this.$textLayer.addEventListener("changeCharacterSize", function() {
-        _self.characterWidth = textLayer.getCharacterWidth();
-        _self.lineHeight = textLayer.getLineHeight();
-        _self.$updatePrintMargin();
-        _self.onResize(true);
-
-        _self.$loop.schedule(_self.CHANGE_FULL);
-    });
-
-    this.$size = {
-        width: 0,
-        height: 0,
-        scrollerHeight: 0,
-        scrollerWidth: 0
-    };
-
-    this.layerConfig = {
-        width : 1,
-        padding : 0,
-        firstRow : 0,
-        firstRowScreen: 0,
-        lastRow : 0,
-        lineHeight : 1,
-        characterWidth : 1,
-        minHeight : 1,
-        maxHeight : 1,
-        offset : 0,
-        height : 1
-    };
-
-    this.$loop = new RenderLoop(
-        this.$renderChanges.bind(this),
-        this.container.ownerDocument.defaultView
-    );
-    this.$loop.schedule(this.CHANGE_FULL);
-
-    this.setPadding(4);
-    this.$updatePrintMargin();
-};
-
-(function() {
-    this.showGutter = true;
-
-    this.CHANGE_CURSOR = 1;
-    this.CHANGE_MARKER = 2;
-    this.CHANGE_GUTTER = 4;
-    this.CHANGE_SCROLL = 8;
-    this.CHANGE_LINES = 16;
-    this.CHANGE_TEXT = 32;
-    this.CHANGE_SIZE = 64;
-    this.CHANGE_MARKER_BACK = 128;
-    this.CHANGE_MARKER_FRONT = 256;
-    this.CHANGE_FULL = 512;
-    this.CHANGE_H_SCROLL = 1024;
-
-    oop.implement(this, EventEmitter);
-
-    this.setSession = function(session) {
-        this.session = session;
-        this.$cursorLayer.setSession(session);
-        this.$markerBack.setSession(session);
-        this.$markerFront.setSession(session);
-        this.$gutterLayer.setSession(session);
-        this.$textLayer.setSession(session);
-        this.$loop.schedule(this.CHANGE_FULL);
-    };
-
-    /**
-     * Triggers partial update of the text layer
-     */
-    this.updateLines = function(firstRow, lastRow) {
-        if (lastRow === undefined)
-            lastRow = Infinity;
-
-        if (!this.$changedLines) {
-            this.$changedLines = {
-                firstRow: firstRow,
-                lastRow: lastRow
-            };
-        }
-        else {
-            if (this.$changedLines.firstRow > firstRow)
-                this.$changedLines.firstRow = firstRow;
-
-            if (this.$changedLines.lastRow < lastRow)
-                this.$changedLines.lastRow = lastRow;
-        }
-
-        this.$loop.schedule(this.CHANGE_LINES);
-    };
-
-    /**
-     * Triggers full update of the text layer
-     */
-    this.updateText = function() {
-        this.$loop.schedule(this.CHANGE_TEXT);
-    };
-
-    /**
-     * Triggers a full update of all layers
-     */
-    this.updateFull = function() {
-        this.$loop.schedule(this.CHANGE_FULL);
-    };
-
-    this.updateFontSize = function() {
-        this.$textLayer.checkForSizeChanges();
-    };
-
-    /**
-     * Triggers resize of the editor
-     */
-    this.onResize = function(force) {
-        var changes = this.CHANGE_SIZE;
-        var size = this.$size;
-
-        var height = dom.getInnerHeight(this.container);
-        if (force || size.height != height) {
-            size.height = height;
-
-            this.scroller.style.height = height + "px";
-            size.scrollerHeight = this.scroller.clientHeight;
-            this.scrollBar.setHeight(size.scrollerHeight);
-
-            if (this.session) {
-                this.session.setScrollTop(this.getScrollTop());
-                changes = changes | this.CHANGE_FULL;
-            }
-        }
-
-        var width = dom.getInnerWidth(this.container);
-        if (force || size.width != width) {
-            size.width = width;
-
-            var gutterWidth = this.showGutter ? this.$gutter.offsetWidth : 0;
-            this.scroller.style.left = gutterWidth + "px";
-            size.scrollerWidth = Math.max(0, width - gutterWidth - this.scrollBar.getWidth());
-            this.scroller.style.width = size.scrollerWidth + "px";
-
-            if (this.session.getUseWrapMode() && this.adjustWrapLimit() || force)
-                changes = changes | this.CHANGE_FULL;
-        }
-
-        this.$loop.schedule(changes);
-    };
-
-    this.adjustWrapLimit = function() {
-        var availableWidth = this.$size.scrollerWidth - this.$padding * 2;
-        var limit = Math.floor(availableWidth / this.characterWidth);
-        return this.session.adjustWrapLimit(limit);
-    };
-
-    this.setAnimatedScroll = function(shouldAnimate){
-        this.$animatedScroll = shouldAnimate;
-    };
-
-    this.getAnimatedScroll = function() {
-        return this.$animatedScroll;
-    };
-
-    this.setShowInvisibles = function(showInvisibles) {
-        if (this.$textLayer.setShowInvisibles(showInvisibles))
-            this.$loop.schedule(this.CHANGE_TEXT);
-    };
-
-    this.getShowInvisibles = function() {
-        return this.$textLayer.showInvisibles;
-    };
-
-    this.$showPrintMargin = true;
-    this.setShowPrintMargin = function(showPrintMargin) {
-        this.$showPrintMargin = showPrintMargin;
-        this.$updatePrintMargin();
-    };
-
-    this.getShowPrintMargin = function() {
-        return this.$showPrintMargin;
-    };
-
-    this.$printMarginColumn = 80;
-    this.setPrintMarginColumn = function(showPrintMargin) {
-        this.$printMarginColumn = showPrintMargin;
-        this.$updatePrintMargin();
-    };
-
-    this.getPrintMarginColumn = function() {
-        return this.$printMarginColumn;
-    };
-
-    this.getShowGutter = function(){
-        return this.showGutter;
-    };
-
-    this.setShowGutter = function(show){
-        if(this.showGutter === show)
-            return;
-        this.$gutter.style.display = show ? "block" : "none";
-        this.showGutter = show;
-        this.onResize(true);
-    };
-
-    this.$updatePrintMargin = function() {
-        var containerEl;
-
-        if (!this.$showPrintMargin && !this.$printMarginEl)
-            return;
-
-        if (!this.$printMarginEl) {
-            containerEl = dom.createElement("div");
-            containerEl.className = "ace_print_margin_layer";
-            this.$printMarginEl = dom.createElement("div");
-            this.$printMarginEl.className = "ace_print_margin";
-            containerEl.appendChild(this.$printMarginEl);
-            this.content.insertBefore(containerEl, this.$textLayer.element);
-        }
-
-        var style = this.$printMarginEl.style;
-        style.left = ((this.characterWidth * this.$printMarginColumn) + this.$padding) + "px";
-        style.visibility = this.$showPrintMargin ? "visible" : "hidden";
-    };
-
-    this.getContainerElement = function() {
-        return this.container;
-    };
-
-    this.getMouseEventTarget = function() {
-        return this.content;
-    };
-
-    this.getTextAreaContainer = function() {
-        return this.container;
-    };
-
-    this.moveTextAreaToCursor = function(textarea) {
-        // in IE the native cursor always shines through
-        // this persists in IE9
-        if (useragent.isIE)
-            return;
-
-        if (this.layerConfig.lastRow === 0)
-            return;
-
-        var pos = this.$cursorLayer.getPixelPosition();
-        if (!pos)
-            return;
-
-        var bounds = this.content.getBoundingClientRect();
-        var offset = this.layerConfig.offset;
-
-        textarea.style.left = (bounds.left + pos.left) + "px";
-        textarea.style.top = (bounds.top + pos.top - this.scrollTop + offset) + "px";
-    };
-
-    this.getFirstVisibleRow = function() {
-        return this.layerConfig.firstRow;
-    };
-
-    this.getFirstFullyVisibleRow = function() {
-        return this.layerConfig.firstRow + (this.layerConfig.offset === 0 ? 0 : 1);
-    };
-
-    this.getLastFullyVisibleRow = function() {
-        var flint = Math.floor((this.layerConfig.height + this.layerConfig.offset) / this.layerConfig.lineHeight);
-        return this.layerConfig.firstRow - 1 + flint;
-    };
-
-    this.getLastVisibleRow = function() {
-        return this.layerConfig.lastRow;
-    };
-
-    this.$padding = null;
-    this.setPadding = function(padding) {
-        this.$padding = padding;
-        this.$textLayer.setPadding(padding);
-        this.$cursorLayer.setPadding(padding);
-        this.$markerFront.setPadding(padding);
-        this.$markerBack.setPadding(padding);
-        this.$loop.schedule(this.CHANGE_FULL);
-        this.$updatePrintMargin();
-    };
-
-    this.getHScrollBarAlwaysVisible = function() {
-        return this.$horizScrollAlwaysVisible;
-    };
-
-    this.setHScrollBarAlwaysVisible = function(alwaysVisible) {
-        if (this.$horizScrollAlwaysVisible != alwaysVisible) {
-            this.$horizScrollAlwaysVisible = alwaysVisible;
-            if (!this.$horizScrollAlwaysVisible || !this.$horizScroll)
-                this.$loop.schedule(this.CHANGE_SCROLL);
-        }
-    };
-
-    this.$updateScrollBar = function() {
-        this.scrollBar.setInnerHeight(this.layerConfig.maxHeight);
-        this.scrollBar.setScrollTop(this.scrollTop);
-    };
-
-    this.$renderChanges = function(changes) {
-        if (!changes || !this.session || !this.container.offsetWidth)
-            return;
-
-        // text, scrolling and resize changes can cause the view port size to change
-        if (changes & this.CHANGE_FULL ||
-            changes & this.CHANGE_SIZE ||
-            changes & this.CHANGE_TEXT ||
-            changes & this.CHANGE_LINES ||
-            changes & this.CHANGE_SCROLL
-        )
-            this.$computeLayerConfig();
-
-        // horizontal scrolling
-        if (changes & this.CHANGE_H_SCROLL) {
-            this.scroller.scrollLeft = this.scrollLeft;
-
-            // read the value after writing it since the value might get clipped
-            var scrollLeft = this.scroller.scrollLeft;
-            this.scrollLeft = scrollLeft;
-            this.session.setScrollLeft(scrollLeft);
-        }
-
-        // full
-        if (changes & this.CHANGE_FULL) {
-            this.$textLayer.checkForSizeChanges();
-            // update scrollbar first to not lose scroll position when gutter calls resize
-            this.$updateScrollBar();
-            this.$textLayer.update(this.layerConfig);
-            if (this.showGutter)
-                this.$gutterLayer.update(this.layerConfig);
-            this.$markerBack.update(this.layerConfig);
-            this.$markerFront.update(this.layerConfig);
-            this.$cursorLayer.update(this.layerConfig);
-            return;
-        }
-
-        // scrolling
-        if (changes & this.CHANGE_SCROLL) {
-            this.$updateScrollBar();
-            if (changes & this.CHANGE_TEXT || changes & this.CHANGE_LINES)
-                this.$textLayer.update(this.layerConfig);
-            else
-                this.$textLayer.scrollLines(this.layerConfig);
-
-            if (this.showGutter)
-                this.$gutterLayer.update(this.layerConfig);
-            this.$markerBack.update(this.layerConfig);
-            this.$markerFront.update(this.layerConfig);
-            this.$cursorLayer.update(this.layerConfig);
-            return;
-        }
-
-        if (changes & this.CHANGE_TEXT) {
-            this.$textLayer.update(this.layerConfig);
-            if (this.showGutter)
-                this.$gutterLayer.update(this.layerConfig);
-        }
-        else if (changes & this.CHANGE_LINES) {
-            if (this.$updateLines()) {
-                this.$updateScrollBar();
-                if (this.showGutter)
-                    this.$gutterLayer.update(this.layerConfig);
-            }
-        } else if (changes & this.CHANGE_GUTTER) {
-            if (this.showGutter)
-                this.$gutterLayer.update(this.layerConfig);
-        }
-
-        if (changes & this.CHANGE_CURSOR)
-            this.$cursorLayer.update(this.layerConfig);
-
-        if (changes & (this.CHANGE_MARKER | this.CHANGE_MARKER_FRONT)) {
-            this.$markerFront.update(this.layerConfig);
-        }
-
-        if (changes & (this.CHANGE_MARKER | this.CHANGE_MARKER_BACK)) {
-            this.$markerBack.update(this.layerConfig);
-        }
-
-        if (changes & this.CHANGE_SIZE)
-            this.$updateScrollBar();
-    };
-
-    this.$computeLayerConfig = function() {
-        var session = this.session;
-
-        var offset = this.scrollTop % this.lineHeight;
-        var minHeight = this.$size.scrollerHeight + this.lineHeight;
-
-        var longestLine = this.$getLongestLine();
-
-        var horizScroll = this.$horizScrollAlwaysVisible || this.$size.scrollerWidth - longestLine < 0;
-        var horizScrollChanged = this.$horizScroll !== horizScroll;
-        this.$horizScroll = horizScroll;
-        if (horizScrollChanged) {
-            this.scroller.style.overflowX = horizScroll ? "scroll" : "hidden";
-            // when we hide scrollbar scroll event isn't emited
-            // leaving session with wrong scrollLeft value
-            if (!horizScroll)
-                this.session.setScrollLeft(0);
-        }
-        var maxHeight = this.session.getScreenLength() * this.lineHeight;
-        this.session.setScrollTop(Math.max(0, Math.min(this.scrollTop, maxHeight - this.$size.scrollerHeight)));
-
-        var lineCount = Math.ceil(minHeight / this.lineHeight) - 1;
-        var firstRow = Math.max(0, Math.round((this.scrollTop - offset) / this.lineHeight));
-        var lastRow = firstRow + lineCount;
-
-        // Map lines on the screen to lines in the document.
-        var firstRowScreen, firstRowHeight;
-        var lineHeight = { lineHeight: this.lineHeight };
-        firstRow = session.screenToDocumentRow(firstRow, 0);
-
-        // Check if firstRow is inside of a foldLine. If true, then use the first
-        // row of the foldLine.
-        var foldLine = session.getFoldLine(firstRow);
-        if (foldLine) {
-            firstRow = foldLine.start.row;
-        }
-
-        firstRowScreen = session.documentToScreenRow(firstRow, 0);
-        firstRowHeight = session.getRowHeight(lineHeight, firstRow);
-
-        lastRow = Math.min(session.screenToDocumentRow(lastRow, 0), session.getLength() - 1);
-        minHeight = this.$size.scrollerHeight + session.getRowHeight(lineHeight, lastRow)+
-                                                firstRowHeight;
-
-        offset = this.scrollTop - firstRowScreen * this.lineHeight;
-
-        this.layerConfig = {
-            width : longestLine,
-            padding : this.$padding,
-            firstRow : firstRow,
-            firstRowScreen: firstRowScreen,
-            lastRow : lastRow,
-            lineHeight : this.lineHeight,
-            characterWidth : this.characterWidth,
-            minHeight : minHeight,
-            maxHeight : maxHeight,
-            offset : offset,
-            height : this.$size.scrollerHeight
-        };
-
-        // For debugging.
-        // console.log(JSON.stringify(this.layerConfig));
-
-        this.$gutterLayer.element.style.marginTop = (-offset) + "px";
-        this.content.style.marginTop = (-offset) + "px";
-        this.content.style.width = longestLine + 2 * this.$padding + "px";
-        this.content.style.height = minHeight + "px";
-
-        // Horizontal scrollbar visibility may have changed, which changes
-        // the client height of the scroller
-        if (horizScrollChanged)
-            this.onResize(true);
-    };
-
-    this.$updateLines = function() {
-        var firstRow = this.$changedLines.firstRow;
-        var lastRow = this.$changedLines.lastRow;
-        this.$changedLines = null;
-
-        var layerConfig = this.layerConfig;
-
-        // if the update changes the width of the document do a full redraw
-        if (layerConfig.width != this.$getLongestLine())
-            return this.$textLayer.update(layerConfig);
-
-        if (firstRow > layerConfig.lastRow + 1) { return; }
-        if (lastRow < layerConfig.firstRow) { return; }
-
-        // if the last row is unknown -> redraw everything
-        if (lastRow === Infinity) {
-            if (this.showGutter)
-                this.$gutterLayer.update(layerConfig);
-            this.$textLayer.update(layerConfig);
-            return;
-        }
-
-        // else update only the changed rows
-        this.$textLayer.updateLines(layerConfig, firstRow, lastRow);
-        return true;
-    };
-
-    this.$getLongestLine = function() {
-        var charCount = this.session.getScreenWidth();
-        if (this.$textLayer.showInvisibles)
-            charCount += 1;
-
-        return Math.max(this.$size.scrollerWidth - 2 * this.$padding, Math.round(charCount * this.characterWidth));
-    };
-
-    this.updateFrontMarkers = function() {
-        this.$markerFront.setMarkers(this.session.getMarkers(true));
-        this.$loop.schedule(this.CHANGE_MARKER_FRONT);
-    };
-
-    this.updateBackMarkers = function() {
-        this.$markerBack.setMarkers(this.session.getMarkers());
-        this.$loop.schedule(this.CHANGE_MARKER_BACK);
-    };
-
-    this.addGutterDecoration = function(row, className){
-        this.$gutterLayer.addGutterDecoration(row, className);
-        this.$loop.schedule(this.CHANGE_GUTTER);
-    };
-
-    this.removeGutterDecoration = function(row, className){
-        this.$gutterLayer.removeGutterDecoration(row, className);
-        this.$loop.schedule(this.CHANGE_GUTTER);
-    };
-
-    this.setBreakpoints = function(rows) {
-        this.$gutterLayer.setBreakpoints(rows);
-        this.$loop.schedule(this.CHANGE_GUTTER);
-    };
-
-    this.setAnnotations = function(annotations) {
-        this.$gutterLayer.setAnnotations(annotations);
-        this.$loop.schedule(this.CHANGE_GUTTER);
-    };
-
-    this.updateCursor = function() {
-        this.$loop.schedule(this.CHANGE_CURSOR);
-    };
-
-    this.hideCursor = function() {
-        this.$cursorLayer.hideCursor();
-    };
-
-    this.showCursor = function() {
-        this.$cursorLayer.showCursor();
-    };
-
-    this.scrollSelectionIntoView = function(anchor, lead) {
-        // first scroll anchor into view then scroll lead into view
-        this.scrollCursorIntoView(anchor);
-        this.scrollCursorIntoView(lead);
-    };
-
-    this.scrollCursorIntoView = function(cursor) {
-        // the editor is not visible
-        if (this.$size.scrollerHeight === 0)
-            return;
-
-        var pos = this.$cursorLayer.getPixelPosition(cursor);
-
-        var left = pos.left;
-        var top = pos.top;
-
-        if (this.scrollTop > top) {
-            this.session.setScrollTop(top);
-        }
-
-        if (this.scrollTop + this.$size.scrollerHeight < top + this.lineHeight) {
-            this.session.setScrollTop(top + this.lineHeight - this.$size.scrollerHeight);
-        }
-
-        var scrollLeft = this.scrollLeft;
-
-        if (scrollLeft > left) {
-            if (left < this.$padding + 2 * this.layerConfig.characterWidth)
-                left = 0;
-            this.session.setScrollLeft(left);
-        }
-
-        if (scrollLeft + this.$size.scrollerWidth < left + this.characterWidth) {
-            this.session.setScrollLeft(Math.round(left + this.characterWidth - this.$size.scrollerWidth));
-        }
-    };
-
-    this.getScrollTop = function() {
-        return this.session.getScrollTop();
-    };
-
-    this.getScrollLeft = function() {
-        return this.session.getScrollLeft();
-    };
-
-    this.getScrollTopRow = function() {
-        return this.scrollTop / this.lineHeight;
-    };
-
-    this.getScrollBottomRow = function() {
-        return Math.max(0, Math.floor((this.scrollTop + this.$size.scrollerHeight) / this.lineHeight) - 1);
-    };
-
-    this.scrollToRow = function(row) {
-        this.session.setScrollTop(row * this.lineHeight);
-    };
-
-    this.STEPS = 10;
-    this.$calcSteps = function(fromValue, toValue){
-        var i = 0;
-        var l = this.STEPS;
-        var steps = [];
-
-        var func  = function(t, x_min, dx) {
-            if ((t /= .5) < 1)
-                return dx / 2 * Math.pow(t, 3) + x_min;
-            return dx / 2 * (Math.pow(t - 2, 3) + 2) + x_min;
-        };
-
-        for (i = 0; i < l; ++i)
-            steps.push(func(i / this.STEPS, fromValue, toValue - fromValue));
-        steps.push(toValue);
-
-        return steps;
-    };
-
-    this.scrollToLine = function(line, center) {
-        var pos = this.$cursorLayer.getPixelPosition({row: line, column: 0});
-        var offset = pos.top;
-        if (center)
-            offset -= this.$size.scrollerHeight / 2;
-
-        if (this.$animatedScroll && Math.abs(offset - this.scrollTop) < 10000) {
-            var _self = this;
-            var steps = _self.$calcSteps(this.scrollTop, offset);
-
-            clearInterval(this.$timer);
-            this.$timer = setInterval(function() {
-                _self.session.setScrollTop(steps.shift());
-                
-                if (!steps.length)
-                    clearInterval(_self.$timer);
-            }, 10);
-        }
-        else {
-            this.session.setScrollTop(offset);
-        }
-    };
-
-    this.scrollToY = function(scrollTop) {
-        // after calling scrollBar.setScrollTop
-        // scrollbar sends us event with same scrollTop. ignore it
-        if (this.scrollTop !== scrollTop) {
-            this.$loop.schedule(this.CHANGE_SCROLL);
-            this.scrollTop = scrollTop;
-        }
-    };
-
-    this.scrollToX = function(scrollLeft) {
-        if (scrollLeft <= this.$padding)
-            scrollLeft = 0;
-
-        if (this.scrollLeft !== scrollLeft)
-            this.scrollLeft = scrollLeft;
-        this.$loop.schedule(this.CHANGE_H_SCROLL);
-    };
-
-    this.scrollBy = function(deltaX, deltaY) {
-        deltaY && this.session.setScrollTop(this.session.getScrollTop() + deltaY);
-        deltaX && this.session.setScrollLeft(this.session.getScrollLeft() + deltaX);
-    };
-
-    this.isScrollableBy = function(deltaX, deltaY) {
-        if (deltaY < 0 && this.session.getScrollTop() > 0)
-           return true;
-        if (deltaY > 0 && this.session.getScrollTop() + this.$size.scrollerHeight < this.layerConfig.maxHeight)
-           return true;
-        // todo: handle horizontal scrolling
-    };
-
-    this.pixelToScreenCoordinates = function(pageX, pageY) {
-        var canvasPos = this.scroller.getBoundingClientRect();
-
-        var col = Math.round(
-            (pageX + this.scrollLeft - canvasPos.left - this.$padding - dom.getPageScrollLeft()) / this.characterWidth
-        );
-        var row = Math.floor(
-            (pageY + this.scrollTop - canvasPos.top - dom.getPageScrollTop()) / this.lineHeight
-        );
-
-        return {row: row, column: col};
-    };
-
-    this.screenToTextCoordinates = function(pageX, pageY) {
-        var canvasPos = this.scroller.getBoundingClientRect();
-
-        var col = Math.round(
-            (pageX + this.scrollLeft - canvasPos.left - this.$padding - dom.getPageScrollLeft()) / this.characterWidth
-        );
-        var row = Math.floor(
-            (pageY + this.scrollTop - canvasPos.top - dom.getPageScrollTop()) / this.lineHeight
-        );
-
-        return this.session.screenToDocumentPosition(row, Math.max(col, 0));
-    };
-
-    this.textToScreenCoordinates = function(row, column) {
-        var canvasPos = this.scroller.getBoundingClientRect();
-        var pos = this.session.documentToScreenPosition(row, column);
-
-        var x = this.$padding + Math.round(pos.column * this.characterWidth);
-        var y = pos.row * this.lineHeight;
-
-        return {
-            pageX: canvasPos.left + x - this.scrollLeft,
-            pageY: canvasPos.top + y - this.scrollTop
-        };
-    };
-
-    this.visualizeFocus = function() {
-        dom.addCssClass(this.container, "ace_focus");
-    };
-
-    this.visualizeBlur = function() {
-        dom.removeCssClass(this.container, "ace_focus");
-    };
-
-    this.showComposition = function(position) {
-        if (!this.$composition) {
-            this.$composition = dom.createElement("div");
-            this.$composition.className = "ace_composition";
-            this.content.appendChild(this.$composition);
-        }
-
-        this.$composition.innerHTML = "&#160;";
-
-        var pos = this.$cursorLayer.getPixelPosition();
-        var style = this.$composition.style;
-        style.top = pos.top + "px";
-        style.left = (pos.left + this.$padding) + "px";
-        style.height = this.lineHeight + "px";
-
-        this.hideCursor();
-    };
-
-    this.setCompositionText = function(text) {
-        dom.setInnerText(this.$composition, text);
-    };
-
-    this.hideComposition = function() {
-        this.showCursor();
-
-        if (!this.$composition)
-            return;
-
-        var style = this.$composition.style;
-        style.top = "-10000px";
-        style.left = "-10000px";
-    };
-
-    this._loadTheme = function(name, callback) {
-        if (!config.get("packaged"))
-            return callback();
-
-        var base = name.split("/").pop();
-        var filename = config.get("themePath") + "/theme-" + base + config.get("suffix");
-        net.loadScript(filename, callback);
-    };
-
-    this.setTheme = function(theme) {
-        var _self = this;
-
-        this.$themeValue = theme;
-        if (!theme || typeof theme == "string") {
-            var moduleName = theme || "ace/theme/textmate";
-
-            var module;
-            try {
-                module = require(moduleName);
-            } catch (e) {};
-            if (module)
-                return afterLoad(module);
-
-            _self._loadTheme(moduleName, function() {
-                require([moduleName], function(module) {
-                    if (_self.$themeValue !== theme)
-                        return;
-
-                    afterLoad(module);
-                });
-            });
-        } else {
-            afterLoad(theme);
-        }
-
-        function afterLoad(theme) {
-            dom.importCssString(
-                theme.cssText,
-                theme.cssClass,
-                _self.container.ownerDocument
-            );
-
-            if (_self.$theme)
-                dom.removeCssClass(_self.container, _self.$theme);
-
-            _self.$theme = theme ? theme.cssClass : null;
-
-            if (_self.$theme)
-                dom.addCssClass(_self.container, _self.$theme);
-
-            if (theme && theme.isDark)
-                dom.addCssClass(_self.container, "ace_dark");
-            else
-                dom.removeCssClass(_self.container, "ace_dark");
-
-            // force re-measure of the gutter width
-            if (_self.$size) {
-                _self.$size.width = 0;
-                _self.onResize();
-            }
-        }
-    };
-
-    this.getTheme = function() {
-        return this.$themeValue;
-    };
-
-    // Methods allows to add / remove CSS classnames to the editor element.
-    // This feature can be used by plug-ins to provide a visual indication of
-    // a certain mode that editor is in.
-
-    this.setStyle = function setStyle(style) {
-      dom.addCssClass(this.container, style);
-    };
-
-    this.unsetStyle = function unsetStyle(style) {
-      dom.removeCssClass(this.container, style);
-    };
-
-    this.destroy = function() {
-        this.$textLayer.destroy();
-        this.$cursorLayer.destroy();
-    };
-
-}).call(VirtualRenderer.prototype);
-
-exports.VirtualRenderer = VirtualRenderer;
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Julian Viereck <julian DOT viereck AT gmail DOT com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/layer/gutter', ['require', 'exports', 'module' , 'ace/lib/dom', 'ace/lib/oop', 'ace/lib/event_emitter'], function(require, exports, module) {
-"use strict";
-
-var dom = require("../lib/dom");
-var oop = require("../lib/oop");
-var EventEmitter = require("../lib/event_emitter").EventEmitter;
-
-var Gutter = function(parentEl) {
-    this.element = dom.createElement("div");
-    this.element.className = "ace_layer ace_gutter-layer";
-    parentEl.appendChild(this.element);
-    this.setShowFoldWidgets(this.$showFoldWidgets);
-    
-    this.gutterWidth = 0;
-
-    this.$breakpoints = [];
-    this.$annotations = [];
-    this.$decorations = [];
-};
-
-(function() {
-
-    oop.implement(this, EventEmitter);
-    
-    this.setSession = function(session) {
-        this.session = session;
-    };
-
-    this.addGutterDecoration = function(row, className){
-        if (!this.$decorations[row])
-            this.$decorations[row] = "";
-        this.$decorations[row] += " " + className;
-    };
-
-    this.removeGutterDecoration = function(row, className){
-        this.$decorations[row] = this.$decorations[row].replace(" " + className, "");
-    };
-
-    this.setBreakpoints = function(rows) {
-        this.$breakpoints = rows.concat();
-    };
-
-    this.setAnnotations = function(annotations) {
-        // iterate over sparse array
-        this.$annotations = [];
-        for (var row in annotations) if (annotations.hasOwnProperty(row)) {
-            var rowAnnotations = annotations[row];
-            if (!rowAnnotations)
-                continue;
-
-            var rowInfo = this.$annotations[row] = {
-                text: []
-            };
-            for (var i=0; i<rowAnnotations.length; i++) {
-                var annotation = rowAnnotations[i];
-                var annoText = annotation.text.replace(/"/g, "&quot;").replace(/'/g, "&#8217;").replace(/</, "&lt;");
-                if (rowInfo.text.indexOf(annoText) === -1)
-                    rowInfo.text.push(annoText);
-                var type = annotation.type;
-                if (type == "error")
-                    rowInfo.className = "ace_error";
-                else if (type == "warning" && rowInfo.className != "ace_error")
-                    rowInfo.className = "ace_warning";
-                else if (type == "info" && (!rowInfo.className))
-                    rowInfo.className = "ace_info";
-            }
-        }
-    };
-
-    this.update = function(config) {
-        this.$config = config;
-
-        var emptyAnno = {className: "", text: []};
-        var html = [];
-        var i = config.firstRow;
-        var lastRow = config.lastRow;
-        var fold = this.session.getNextFoldLine(i);
-        var foldStart = fold ? fold.start.row : Infinity;
-        var foldWidgets = this.$showFoldWidgets && this.session.foldWidgets;
-
-        while (true) {
-            if(i > foldStart) {
-                i = fold.end.row + 1;
-                fold = this.session.getNextFoldLine(i, fold);
-                foldStart = fold ?fold.start.row :Infinity;
-            }
-            if(i > lastRow)
-                break;
-
-            var annotation = this.$annotations[i] || emptyAnno;
-            html.push("<div class='ace_gutter-cell",
-                this.$decorations[i] || "",
-                this.$breakpoints[i] ? " ace_breakpoint " : " ",
-                annotation.className,
-                "' title='", annotation.text.join("\n"),
-                "' style='height:", config.lineHeight, "px;'>", (i+1));
-
-            if (foldWidgets) {
-                var c = foldWidgets[i];
-                // check if cached value is invalidated and we need to recompute
-                if (c == null)
-                    c = foldWidgets[i] = this.session.getFoldWidget(i);
-                if (c)
-                    html.push(
-                        "<span class='ace_fold-widget ", c,
-                        c == "start" && i == foldStart && i < fold.end.row ? " closed" : " open",
-                        "'></span>"
-                    );
-            }
-
-            var wrappedRowLength = this.session.getRowLength(i) - 1;
-            while (wrappedRowLength--) {
-                html.push("</div><div class='ace_gutter-cell' style='height:", config.lineHeight, "px'>\xA6");
-            }
-
-            html.push("</div>");
-
-            i++;
-        }
-        this.element = dom.setInnerHtml(this.element, html.join(""));
-        this.element.style.height = config.minHeight + "px";
-        
-        var gutterWidth = this.element.offsetWidth;
-        if (gutterWidth !== this.gutterWidth) {
-            this.gutterWidth = gutterWidth;
-            this._emit("changeGutterWidth", gutterWidth);
-        }
-    };
-
-    this.$showFoldWidgets = true;
-    this.setShowFoldWidgets = function(show) {
-        if (show)
-            dom.addCssClass(this.element, "ace_folding-enabled");
-        else
-            dom.removeCssClass(this.element, "ace_folding-enabled");
-
-        this.$showFoldWidgets = show;
-    };
-    
-    this.getShowFoldWidgets = function() {
-        return this.$showFoldWidgets;
-    };
-
-}).call(Gutter.prototype);
-
-exports.Gutter = Gutter;
-
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Julian Viereck <julian.viereck@gmail.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/layer/marker', ['require', 'exports', 'module' , 'ace/range', 'ace/lib/dom'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../range").Range;
-var dom = require("../lib/dom");
-
-var Marker = function(parentEl) {
-    this.element = dom.createElement("div");
-    this.element.className = "ace_layer ace_marker-layer";
-    parentEl.appendChild(this.element);
-};
-
-(function() {
-
-    this.$padding = 0;
-
-    this.setPadding = function(padding) {
-        this.$padding = padding;
-    };
-    this.setSession = function(session) {
-        this.session = session;
-    };
-    
-    this.setMarkers = function(markers) {
-        this.markers = markers;
-    };
-
-    this.update = function(config) {
-        var config = config || this.config;
-        if (!config)
-            return;
-
-        this.config = config;
-
-
-        var html = [];
-        for ( var key in this.markers) {
-            var marker = this.markers[key];
-
-            var range = marker.range.clipRows(config.firstRow, config.lastRow);
-            if (range.isEmpty()) continue;
-
-            range = range.toScreenRange(this.session);
-            if (marker.renderer) {
-                var top = this.$getTop(range.start.row, config);
-                var left = Math.round(
-                    this.$padding + range.start.column * config.characterWidth
-                );
-                marker.renderer(html, range, left, top, config);
-            }
-            else if (range.isMultiLine()) {
-                if (marker.type == "text") {
-                    this.drawTextMarker(html, range, marker.clazz, config);
-                } else {
-                    this.drawMultiLineMarker(
-                        html, range, marker.clazz, config,
-                        marker.type
-                    );
-                }
-            }
-            else {
-                this.drawSingleLineMarker(
-                    html, range, marker.clazz, config,
-                    null, marker.type
-                );
-            }
-        }
-        this.element = dom.setInnerHtml(this.element, html.join(""));
-    };
-
-    this.$getTop = function(row, layerConfig) {
-        return (row - layerConfig.firstRowScreen) * layerConfig.lineHeight;
-    };
-
-    /**
-     * Draws a marker, which spans a range of text on multiple lines
-     */ 
-    this.drawTextMarker = function(stringBuilder, range, clazz, layerConfig) {
-        // selection start
-        var row = range.start.row;
-
-        var lineRange = new Range(
-            row, range.start.column,
-            row, this.session.getScreenLastRowColumn(row)
-        );
-        this.drawSingleLineMarker(stringBuilder, lineRange, clazz, layerConfig, 1, "text");
-
-        // selection end
-        row = range.end.row;
-        lineRange = new Range(row, 0, row, range.end.column);
-        this.drawSingleLineMarker(stringBuilder, lineRange, clazz, layerConfig, 0, "text");
-
-        for (row = range.start.row + 1; row < range.end.row; row++) {
-            lineRange.start.row = row;
-            lineRange.end.row = row;
-            lineRange.end.column = this.session.getScreenLastRowColumn(row);
-            this.drawSingleLineMarker(stringBuilder, lineRange, clazz, layerConfig, 1, "text");
-        }
-    };
-
-    /**
-     * Draws a multi line marker, where lines span the full width
-     */
-     this.drawMultiLineMarker = function(stringBuilder, range, clazz, layerConfig, type) {
-        var padding = type === "background" ? 0 : this.$padding;
-        var layerWidth = layerConfig.width + 2 * this.$padding - padding;
-        // from selection start to the end of the line
-        var height = layerConfig.lineHeight;
-        var width = Math.round(layerWidth - (range.start.column * layerConfig.characterWidth));
-        var top = this.$getTop(range.start.row, layerConfig);
-        var left = Math.round(
-            padding + range.start.column * layerConfig.characterWidth
-        );
-
-        stringBuilder.push(
-            "<div class='", clazz, "' style='",
-            "height:", height, "px;",
-            "width:", width, "px;",
-            "top:", top, "px;",
-            "left:", left, "px;'></div>"
-        );
-
-        // from start of the last line to the selection end
-        top = this.$getTop(range.end.row, layerConfig);
-        width = Math.round(range.end.column * layerConfig.characterWidth);
-
-        stringBuilder.push(
-            "<div class='", clazz, "' style='",
-            "height:", height, "px;",
-            "width:", width, "px;",
-            "top:", top, "px;",
-            "left:", padding, "px;'></div>"
-        );
-
-        // all the complete lines
-        height = (range.end.row - range.start.row - 1) * layerConfig.lineHeight;
-        if (height < 0)
-            return;
-        top = this.$getTop(range.start.row + 1, layerConfig);
-
-        stringBuilder.push(
-            "<div class='", clazz, "' style='",
-            "height:", height, "px;",
-            "width:", layerWidth, "px;",
-            "top:", top, "px;",
-            "left:", padding, "px;'></div>"
-        );
-    };
-
-    /**
-     * Draws a marker which covers part or whole width of a single screen line
-     */
-    this.drawSingleLineMarker = function(stringBuilder, range, clazz, layerConfig, extraLength, type) {
-        var padding = type === "background" ? 0 : this.$padding;
-        var height = layerConfig.lineHeight;
-
-        if (type === "background")
-            var width = layerConfig.width;
-        else
-            width = Math.round((range.end.column + (extraLength || 0) - range.start.column) * layerConfig.characterWidth);
-
-        var top = this.$getTop(range.start.row, layerConfig);
-        var left = Math.round(
-            padding + range.start.column * layerConfig.characterWidth
-        );
-
-        stringBuilder.push(
-            "<div class='", clazz, "' style='",
-            "height:", height, "px;",
-            "width:", width, "px;",
-            "top:", top, "px;",
-            "left:", left,"px;'></div>"
-        );
-    };
-
-}).call(Marker.prototype);
-
-exports.Marker = Marker;
-
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Julian Viereck <julian DOT viereck AT gmail DOT com>
- *      Mihai Sucan <mihai.sucan@gmail.com>
- *      Irakli Gozalishvili <rfobic@gmail.com> (http://jeditoolkit.com)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/layer/text', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/dom', 'ace/lib/lang', 'ace/lib/useragent', 'ace/lib/event_emitter'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var dom = require("../lib/dom");
-var lang = require("../lib/lang");
-var useragent = require("../lib/useragent");
-var EventEmitter = require("../lib/event_emitter").EventEmitter;
-
-var Text = function(parentEl) {
-    this.element = dom.createElement("div");
-    this.element.className = "ace_layer ace_text-layer";
-    parentEl.appendChild(this.element);
-
-    this.$characterSize = this.$measureSizes() || {width: 0, height: 0};
-    this.$pollSizeChanges();
-};
-
-(function() {
-
-    oop.implement(this, EventEmitter);
-
-    this.EOF_CHAR = "\xB6"; //"&para;";
-    this.EOL_CHAR = "\xAC"; //"&not;";
-    this.TAB_CHAR = "\u2192"; //"&rarr;";
-    this.SPACE_CHAR = "\xB7"; //"&middot;";
-    this.$padding = 0;
-
-    this.setPadding = function(padding) {
-        this.$padding = padding;
-        this.element.style.padding = "0 " + padding + "px";
-    };
-
-    this.getLineHeight = function() {
-        return this.$characterSize.height || 1;
-    };
-
-    this.getCharacterWidth = function() {
-        return this.$characterSize.width || 1;
-    };
-
-    this.checkForSizeChanges = function() {
-        var size = this.$measureSizes();
-        if (size && (this.$characterSize.width !== size.width || this.$characterSize.height !== size.height)) {
-            this.$characterSize = size;
-            this._emit("changeCharacterSize", {data: size});
-        }
-    };
-
-    this.$pollSizeChanges = function() {
-        var self = this;
-        this.$pollSizeChangesTimer = setInterval(function() {
-            self.checkForSizeChanges();
-        }, 500);
-    };
-
-    this.$fontStyles = {
-        fontFamily : 1,
-        fontSize : 1,
-        fontWeight : 1,
-        fontStyle : 1,
-        lineHeight : 1
-    };
-
-    this.$measureSizes = useragent.isIE || useragent.isOldGecko ? function() {
-        var n = 1000;
-        if (!this.$measureNode) {
-            var measureNode = this.$measureNode = dom.createElement("div");
-            var style = measureNode.style;
-
-            style.width = style.height = "auto";
-            style.left = style.top = (-n * 40)  + "px";
-
-            style.visibility = "hidden";
-            style.position = "fixed";
-            style.overflow = "visible";
-            style.whiteSpace = "nowrap";
-
-            // in FF 3.6 monospace fonts can have a fixed sub pixel width.
-            // that's why we have to measure many characters
-            // Note: characterWidth can be a float!
-            measureNode.innerHTML = lang.stringRepeat("Xy", n);
-
-            if (this.element.ownerDocument.body) {
-                this.element.ownerDocument.body.appendChild(measureNode);
-            } else {
-                var container = this.element.parentNode;
-                while (!dom.hasCssClass(container, "ace_editor"))
-                    container = container.parentNode;
-                container.appendChild(measureNode);
-            }
-        }
-        
-        // Size and width can be null if the editor is not visible or
-        // detached from the document
-        if (!this.element.offsetWidth)
-            return null;
-
-        var style = this.$measureNode.style;
-        var computedStyle = dom.computedStyle(this.element);
-        for (var prop in this.$fontStyles)
-            style[prop] = computedStyle[prop];
-
-        var size = {
-            height: this.$measureNode.offsetHeight,
-            width: this.$measureNode.offsetWidth / (n * 2)
-        };
-
-        // Size and width can be null if the editor is not visible or
-        // detached from the document
-        if (size.width == 0 || size.height == 0)
-            return null;
-
-        return size;
-    } 
-    : function() {
-        if (!this.$measureNode) {
-            var measureNode = this.$measureNode = dom.createElement("div");
-            var style = measureNode.style;
-
-            style.width = style.height = "auto";
-            style.left = style.top = -100 + "px";
-
-            style.visibility = "hidden";
-            style.position = "fixed";
-            style.overflow = "visible";
-            style.whiteSpace = "nowrap";
-
-            measureNode.innerHTML = "X";
-
-            var container = this.element.parentNode;
-            while (container && !dom.hasCssClass(container, "ace_editor"))
-                container = container.parentNode;
-
-            if (!container)
-                return this.$measureNode = null;
-
-            container.appendChild(measureNode);
-        }
-        
-        var rect = this.$measureNode.getBoundingClientRect();
-
-        var size = {
-            height: rect.height,
-            width: rect.width
-        };
-
-        // Size and width can be null if the editor is not visible or
-        // detached from the document
-        if (size.width == 0 || size.height == 0)
-            return null;
-
-        return size;
-    };
-
-    this.setSession = function(session) {
-        this.session = session;
-    };
-
-    this.showInvisibles = false;
-    this.setShowInvisibles = function(showInvisibles) {
-        if (this.showInvisibles == showInvisibles)
-            return false;
-
-        this.showInvisibles = showInvisibles;
-        return true;
-    };
-
-    this.$tabStrings = [];
-    this.$computeTabString = function() {
-        var tabSize = this.session.getTabSize();
-        var tabStr = this.$tabStrings = [0];
-        for (var i = 1; i < tabSize + 1; i++) {
-            if (this.showInvisibles) {
-                tabStr.push("<span class='ace_invisible'>"
-                    + this.TAB_CHAR
-                    + new Array(i).join("&#160;")
-                    + "</span>");
-            } else {
-                tabStr.push(new Array(i+1).join("&#160;"));
-            }
-        }
-
-    };
-
-    this.updateLines = function(config, firstRow, lastRow) {
-        this.$computeTabString();
-        // Due to wrap line changes there can be new lines if e.g.
-        // the line to updated wrapped in the meantime.
-        if (this.config.lastRow != config.lastRow ||
-            this.config.firstRow != config.firstRow) {
-            this.scrollLines(config);
-        }
-        this.config = config;
-
-        var first = Math.max(firstRow, config.firstRow);
-        var last = Math.min(lastRow, config.lastRow);
-
-        var lineElements = this.element.childNodes;
-        var lineElementsIdx = 0;
-
-        for (var row = config.firstRow; row < first; row++) {
-            var foldLine = this.session.getFoldLine(row);
-            if (foldLine) {
-                if (foldLine.containsRow(first)) {
-                    first = foldLine.start.row;
-                    break;
-                } else {
-                    row = foldLine.end.row;
-                }
-            }
-            lineElementsIdx ++;
-        }
-
-        for (var i=first; i<=last; i++) {
-            var lineElement = lineElements[lineElementsIdx++];
-            if (!lineElement)
-                continue;
-
-            var html = [];
-            var tokens = this.session.getTokens(i, i);
-            this.$renderLine(html, i, tokens[0].tokens, !this.$useLineGroups());
-            lineElement = dom.setInnerHtml(lineElement, html.join(""));
-
-            i = this.session.getRowFoldEnd(i);
-        }
-    };
-
-    this.scrollLines = function(config) {
-        this.$computeTabString();
-        var oldConfig = this.config;
-        this.config = config;
-
-        if (!oldConfig || oldConfig.lastRow < config.firstRow)
-            return this.update(config);
-
-        if (config.lastRow < oldConfig.firstRow)
-            return this.update(config);
-
-        var el = this.element;
-        if (oldConfig.firstRow < config.firstRow)
-            for (var row=this.session.getFoldedRowCount(oldConfig.firstRow, config.firstRow - 1); row>0; row--)
-                el.removeChild(el.firstChild);
-
-        if (oldConfig.lastRow > config.lastRow)
-            for (var row=this.session.getFoldedRowCount(config.lastRow + 1, oldConfig.lastRow); row>0; row--)
-                el.removeChild(el.lastChild);
-
-        if (config.firstRow < oldConfig.firstRow) {
-            var fragment = this.$renderLinesFragment(config, config.firstRow, oldConfig.firstRow - 1);
-            if (el.firstChild)
-                el.insertBefore(fragment, el.firstChild);
-            else
-                el.appendChild(fragment);
-        }
-
-        if (config.lastRow > oldConfig.lastRow) {
-            var fragment = this.$renderLinesFragment(config, oldConfig.lastRow + 1, config.lastRow);
-            el.appendChild(fragment);
-        }
-    };
-
-    this.$renderLinesFragment = function(config, firstRow, lastRow) {
-        var fragment = this.element.ownerDocument.createDocumentFragment();
-        var row = firstRow;
-        var foldLine = this.session.getNextFoldLine(row);
-        var foldStart = foldLine ? foldLine.start.row : Infinity;
-
-        while (true) {
-            if (row > foldStart) {
-                row = foldLine.end.row+1;
-                foldLine = this.session.getNextFoldLine(row, foldLine);
-                foldStart = foldLine ? foldLine.start.row : Infinity;
-            }
-            if (row > lastRow)
-                break;
-
-            var container = dom.createElement("div");
-
-            var html = [];
-            // Get the tokens per line as there might be some lines in between
-            // beeing folded.
-            // OPTIMIZE: If there is a long block of unfolded lines, just make
-            // this call once for that big block of unfolded lines.
-            var tokens = this.session.getTokens(row, row);
-            if (tokens.length == 1)
-                this.$renderLine(html, row, tokens[0].tokens, false);
-
-            // don't use setInnerHtml since we are working with an empty DIV
-            container.innerHTML = html.join("");
-            if (this.$useLineGroups()) {
-                container.className = 'ace_line_group';
-                fragment.appendChild(container);
-            } else {
-                var lines = container.childNodes
-                while(lines.length)
-                    fragment.appendChild(lines[0]);
-            }
-
-            row++;
-        }
-        return fragment;
-    };
-
-    this.update = function(config) {
-        this.$computeTabString();
-        this.config = config;
-
-        var html = [];
-        var firstRow = config.firstRow, lastRow = config.lastRow;
-
-        var row = firstRow;
-        var foldLine = this.session.getNextFoldLine(row);
-        var foldStart = foldLine ? foldLine.start.row : Infinity;
-
-        while (true) {
-            if (row > foldStart) {
-                row = foldLine.end.row+1;
-                foldLine = this.session.getNextFoldLine(row, foldLine);
-                foldStart = foldLine ? foldLine.start.row :Infinity;
-            }
-            if (row > lastRow)
-                break;
-
-            if (this.$useLineGroups())
-                html.push("<div class='ace_line_group'>")
-
-            // Get the tokens per line as there might be some lines in between
-            // beeing folded.
-            // OPTIMIZE: If there is a long block of unfolded lines, just make
-            // this call once for that big block of unfolded lines.
-            var tokens = this.session.getTokens(row, row);
-            if (tokens.length == 1)
-                this.$renderLine(html, row, tokens[0].tokens, false);
-
-            if (this.$useLineGroups())
-                html.push("</div>"); // end the line group
-
-            row++;
-        }
-        this.element = dom.setInnerHtml(this.element, html.join(""));
-    };
-
-    this.$textToken = {
-        "text": true,
-        "rparen": true,
-        "lparen": true
-    };
-
-    this.$renderToken = function(stringBuilder, screenColumn, token, value) {        
-        var self = this;
-        var replaceReg = /\t|&|<|( +)|([\v\f \u00a0\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u200b\u2028\u2029\u3000])|[\u1100-\u115F]|[\u11A3-\u11A7]|[\u11FA-\u11FF]|[\u2329-\u232A]|[\u2E80-\u2E99]|[\u2E9B-\u2EF3]|[\u2F00-\u2FD5]|[\u2FF0-\u2FFB]|[\u3000-\u303E]|[\u3041-\u3096]|[\u3099-\u30FF]|[\u3105-\u312D]|[\u3131-\u318E]|[\u3190-\u31BA]|[\u31C0-\u31E3]|[\u31F0-\u321E]|[\u3220-\u3247]|[\u3250-\u32FE]|[\u3300-\u4DBF]|[\u4E00-\uA48C]|[\uA490-\uA4C6]|[\uA960-\uA97C]|[\uAC00-\uD7A3]|[\uD7B0-\uD7C6]|[\uD7CB-\uD7FB]|[\uF900-\uFAFF]|[\uFE10-\uFE19]|[\uFE30-\uFE52]|[\uFE54-\uFE66]|[\uFE68-\uFE6B]|[\uFF01-\uFF60]|[\uFFE0-\uFFE6]/g;
-        var replaceFunc = function(c, a, b, tabIdx, idx4) {
-            if (c.charCodeAt(0) == 32) {
-                return new Array(c.length+1).join("&#160;");
-            } else if (c == "\t") {
-                var tabSize = self.session.getScreenTabSize(screenColumn + tabIdx);
-                screenColumn += tabSize - 1;
-                return self.$tabStrings[tabSize];
-            } else if (c == "&") {
-                if (useragent.isOldGecko)
-                    return "&";
-                else
-                    return "&amp;";
-            } else if (c == "<") {
-                return "&lt;";
-            } else if (c == "\u3000") {
-                // U+3000 is both invisible AND full-width, so must be handled uniquely
-                var classToUse = self.showInvisibles ? "ace_cjk ace_invisible" : "ace_cjk";
-                var space = self.showInvisibles ? self.SPACE_CHAR : "";
-                screenColumn += 1;
-                return "<span class='" + classToUse + "' style='width:" +
-                    (self.config.characterWidth * 2) +
-                    "px'>" + space + "</span>";
-            } else if (c.match(/[\v\f \u00a0\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u200b\u2028\u2029\u3000]/)) {
-                if (self.showInvisibles) {
-                    var space = new Array(c.length+1).join(self.SPACE_CHAR);
-                    return "<span class='ace_invisible'>" + space + "</span>";
-                } else {
-                    return "&#160;";
-                }
-            } else {
-                screenColumn += 1;
-                return "<span class='ace_cjk' style='width:" +
-                    (self.config.characterWidth * 2) +
-                    "px'>" + c + "</span>";
-            }
-        };
-
-        var output = value.replace(replaceReg, replaceFunc);
-
-        if (!this.$textToken[token.type]) {
-            var classes = "ace_" + token.type.replace(/\./g, " ace_");
-            var style = "";
-            if (token.type == "fold")
-                style = " style='width:" + (token.value.length * this.config.characterWidth) + "px;' ";
-            stringBuilder.push("<span class='", classes, "'", style, ">", output, "</span>");
-        }
-        else {
-            stringBuilder.push(output);
-        }
-        return screenColumn + value.length;
-    };
-
-    this.$renderLineCore = function(stringBuilder, lastRow, tokens, splits, onlyContents) {
-        var chars = 0;
-        var split = 0;
-        var splitChars;
-        var screenColumn = 0;
-        var self = this;
-
-        if (!splits || splits.length == 0)
-            splitChars = Number.MAX_VALUE;
-        else
-            splitChars = splits[0];
-
-        if (!onlyContents) {
-            stringBuilder.push("<div class='ace_line' style='height:",
-                this.config.lineHeight, "px",
-                "'>"
-            );
-        }
-        
-        for (var i = 0; i < tokens.length; i++) {
-            var token = tokens[i];
-            var value = token.value;
-
-            if (chars + value.length < splitChars) {
-                screenColumn = self.$renderToken(
-                    stringBuilder, screenColumn, token, value
-                );
-                chars += value.length;
-            }
-            else {
-                while (chars + value.length >= splitChars) {
-                    screenColumn = self.$renderToken(
-                        stringBuilder, screenColumn, 
-                        token, value.substring(0, splitChars - chars)
-                    );
-                    value = value.substring(splitChars - chars);
-                    chars = splitChars;
-                    
-                    if (!onlyContents) {
-                        stringBuilder.push("</div>",
-                            "<div class='ace_line' style='height:",
-                            this.config.lineHeight, "px",
-                            "'>"
-                        );
-                    }
-
-                    split ++;
-                    screenColumn = 0;
-                    splitChars = splits[split] || Number.MAX_VALUE;
-                }
-                if (value.length != 0) {
-                    chars += value.length;
-                    screenColumn = self.$renderToken(
-                        stringBuilder, screenColumn, token, value
-                    );
-                }
-            }
-        }
-
-        if (this.showInvisibles) {
-            if (lastRow !== this.session.getLength() - 1)
-                stringBuilder.push("<span class='ace_invisible'>" + this.EOL_CHAR + "</span>");
-            else
-                stringBuilder.push("<span class='ace_invisible'>" + this.EOF_CHAR + "</span>");
-        }
-        if (!onlyContents)
-            stringBuilder.push("</div>");
-    };
-
-    this.$renderLine = function(stringBuilder, row, tokens, onlyContents) {
-        // Check if the line to render is folded or not. If not, things are
-        // simple, otherwise, we need to fake some things...
-        if (!this.session.isRowFolded(row)) {
-            var splits = this.session.getRowSplitData(row);
-            this.$renderLineCore(stringBuilder, row, tokens, splits, onlyContents);
-        } else {
-            this.$renderFoldLine(stringBuilder, row, tokens, onlyContents);
-        }
-    };
-
-    this.$renderFoldLine = function(stringBuilder, row, tokens, onlyContents) {
-        var session = this.session,
-            foldLine = session.getFoldLine(row),
-            renderTokens = [];
-
-        function addTokens(tokens, from, to) {
-            var idx = 0, col = 0;
-            while ((col + tokens[idx].value.length) < from) {
-                col += tokens[idx].value.length;
-                idx++;
-
-                if (idx == tokens.length) {
-                    return;
-                }
-            }
-            if (col != from) {
-                var value = tokens[idx].value.substring(from - col);
-                // Check if the token value is longer then the from...to spacing.
-                if (value.length > (to - from)) {
-                    value = value.substring(0, to - from);
-                }
-
-                renderTokens.push({
-                    type: tokens[idx].type,
-                    value: value
-                });
-
-                col = from + value.length;
-                idx += 1;
-            }
-
-            while (col < to) {
-                var value = tokens[idx].value;
-                if (value.length + col > to) {
-                    value = value.substring(0, to - col);
-                }
-                renderTokens.push({
-                    type: tokens[idx].type,
-                    value: value
-                });
-                col += value.length;
-                idx += 1;
-            }
-        }
-
-        foldLine.walk(function(placeholder, row, column, lastColumn, isNewRow) {
-            if (placeholder) {
-               renderTokens.push({
-                    type: "fold",
-                    value: placeholder
-                });
-            } else {
-                if (isNewRow) {
-                   tokens = this.session.getTokens(row, row)[0].tokens;
-                }
-                if (tokens.length != 0) {
-                    addTokens(tokens, lastColumn, column);
-                }
-            }
-        }.bind(this), foldLine.end.row, this.session.getLine(foldLine.end.row).length);
-
-        // TODO: Build a fake splits array!
-        var splits = this.session.$useWrapMode?this.session.$wrapData[row]:null;
-        this.$renderLineCore(stringBuilder, row, renderTokens, splits, onlyContents);
-    };
-    
-    this.$useLineGroups = function() {
-        // For the updateLines function to work correctly, it's important that the
-        // child nodes of this.element correspond on a 1-to-1 basis to rows in the 
-        // document (as distinct from lines on the screen). For sessions that are
-        // wrapped, this means we need to add a layer to the node hierarchy (tagged
-        // with the class name ace_line_group).
-        return this.session.getUseWrapMode();
-    };
-
-    this.destroy = function() {
-        clearInterval(this.$pollSizeChangesTimer);
-        if (this.$measureNode)
-            this.$measureNode.parentNode.removeChild(this.$measureNode);
-        delete this.$measureNode;
-    };
-
-}).call(Text.prototype);
-
-exports.Text = Text;
-
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Julian Viereck <julian.viereck@gmail.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/layer/cursor', ['require', 'exports', 'module' , 'ace/lib/dom'], function(require, exports, module) {
-"use strict";
-
-var dom = require("../lib/dom");
-
-var Cursor = function(parentEl) {
-    this.element = dom.createElement("div");
-    this.element.className = "ace_layer ace_cursor-layer";
-    parentEl.appendChild(this.element);
-
-    this.isVisible = false;
-
-    this.cursors = [];
-    this.cursor = this.addCursor();
-};
-
-(function() {
-
-    this.$padding = 0;
-    this.setPadding = function(padding) {
-        this.$padding = padding;
-    };
-
-    this.setSession = function(session) {
-        this.session = session;
-    };
-
-    this.addCursor = function() {
-        var el = dom.createElement("div");
-        var className = "ace_cursor";
-        if (!this.isVisible)
-            className += " ace_hidden";
-        if (this.overwrite)
-            className += " ace_overwrite";
-
-        el.className = className;
-        this.element.appendChild(el);
-        this.cursors.push(el);
-        return el;
-    };
-
-    this.removeCursor = function() {
-        if (this.cursors.length > 1) {
-            var el = this.cursors.pop();
-            el.parentNode.removeChild(el);
-            return el;
-        }
-    };
-
-    this.hideCursor = function() {
-        this.isVisible = false;
-        for (var i = this.cursors.length; i--; )
-            dom.addCssClass(this.cursors[i], "ace_hidden");
-        clearInterval(this.blinkId);
-    };
-
-    this.showCursor = function() {
-        this.isVisible = true;
-        for (var i = this.cursors.length; i--; )
-            dom.removeCssClass(this.cursors[i], "ace_hidden");
-
-        this.element.style.visibility = "";
-        this.restartTimer();
-    };
-
-    this.restartTimer = function() {
-        clearInterval(this.blinkId);
-        if (!this.isVisible)
-            return;
-
-        var element = this.element;
-        this.blinkId = setInterval(function() {
-            element.style.visibility = "hidden";
-            setTimeout(function() {
-                element.style.visibility = "visible";
-            }, 400);
-        }, 1000);
-    };
-
-    this.getPixelPosition = function(position, onScreen) {
-        if (!this.config || !this.session) {
-            return {
-                left : 0,
-                top : 0
-            };
-        }
-
-        if (!position)
-            position = this.session.selection.getCursor();
-        var pos = this.session.documentToScreenPosition(position);
-        var cursorLeft = Math.round(this.$padding +
-                                    pos.column * this.config.characterWidth);
-        var cursorTop = (pos.row - (onScreen ? this.config.firstRowScreen : 0)) *
-            this.config.lineHeight;
-
-        return {
-            left : cursorLeft,
-            top : cursorTop
-        };
-    };
-
-    this.update = function(config) {
-        this.config = config;
-
-        if (this.session.selectionMarkerCount > 1) {
-            var selections = this.session.$selectionMarkers;
-            var i = 0, sel, cursorIndex = 0;
-
-            for (var i = selections.length; i--; ) {
-                sel = selections[i];
-                var pixelPos = this.getPixelPosition(sel.cursor, true);
-
-                var style = (this.cursors[cursorIndex++] || this.addCursor()).style;
-
-                style.left = pixelPos.left + "px";
-                style.top = pixelPos.top + "px";
-                style.width = config.characterWidth + "px";
-                style.height = config.lineHeight + "px";
-            }
-            if (cursorIndex > 1)
-                while (this.cursors.length > cursorIndex)
-                    this.removeCursor();
-        } else {
-            var pixelPos = this.getPixelPosition(null, true);
-            var style = this.cursor.style;
-            style.left = pixelPos.left + "px";
-            style.top = pixelPos.top + "px";
-            style.width = config.characterWidth + "px";
-            style.height = config.lineHeight + "px";
-
-            while (this.cursors.length > 1)
-                this.removeCursor();
-        }
-
-        var overwrite = this.session.getOverwrite();
-        if (overwrite != this.overwrite)
-            this.$setOverite(overwrite);
-
-        this.restartTimer();
-    };
-
-    this.$setOverite = function(overwrite) {
-        this.overwrite = overwrite;
-        for (var i = this.cursors.length; i--; ) {
-            if (overwrite)
-                dom.addCssClass(this.cursors[i], "ace_overwrite");
-            else
-                dom.removeCssClass(this.cursors[i], "ace_overwrite");
-        }
-    };
-
-    this.destroy = function() {
-        clearInterval(this.blinkId);
-    }
-
-}).call(Cursor.prototype);
-
-exports.Cursor = Cursor;
-
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Irakli Gozalishvili <rfobic@gmail.com> (http://jeditoolkit.com)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/scrollbar', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/dom', 'ace/lib/event', 'ace/lib/event_emitter'], function(require, exports, module) {
-"use strict";
-
-var oop = require("./lib/oop");
-var dom = require("./lib/dom");
-var event = require("./lib/event");
-var EventEmitter = require("./lib/event_emitter").EventEmitter;
-
-var ScrollBar = function(parent) {
-    this.element = dom.createElement("div");
-    this.element.className = "ace_sb";
-
-    this.inner = dom.createElement("div");
-    this.element.appendChild(this.inner);
-
-    parent.appendChild(this.element);
-
-    // in OSX lion the scrollbars appear to have no width. In this case resize
-    // the to show the scrollbar but still pretend that the scrollbar has a width
-    // of 0px
-    // in Firefox 6+ scrollbar is hidden if element has the same width as scrollbar
-    // make element a little bit wider to retain scrollbar when page is zoomed 
-    this.width = dom.scrollbarWidth(parent.ownerDocument);
-    this.element.style.width = (this.width || 15) + 5 + "px";
-
-    event.addListener(this.element, "scroll", this.onScroll.bind(this));
-};
-
-(function() {
-    oop.implement(this, EventEmitter);
-
-    this.onScroll = function() {
-        this._emit("scroll", {data: this.element.scrollTop});
-    };
-
-    this.getWidth = function() {
-        return this.width;
-    };
-
-    this.setHeight = function(height) {
-        this.element.style.height = height + "px";
-    };
-
-    this.setInnerHeight = function(height) {
-        this.inner.style.height = height + "px";
-    };
-
-    // TODO: on chrome 17+ after for small zoom levels after this function
-    // this.element.scrollTop != scrollTop which makes page to scroll up.
-    this.setScrollTop = function(scrollTop) {
-        this.element.scrollTop = scrollTop;
-    };
-
-}).call(ScrollBar.prototype);
-
-exports.ScrollBar = ScrollBar;
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Irakli Gozalishvili <rfobic@gmail.com> (http://jeditoolkit.com)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/renderloop', ['require', 'exports', 'module' , 'ace/lib/event'], function(require, exports, module) {
-"use strict";
-
-var event = require("./lib/event");
-
-var RenderLoop = function(onRender, win) {
-    this.onRender = onRender;
-    this.pending = false;
-    this.changes = 0;
-    this.window = win || window;
-};
-
-(function() {
-
-    this.schedule = function(change) {
-        //this.onRender(change);
-        //return;
-        this.changes = this.changes | change;
-        if (!this.pending) {
-            this.pending = true;
-            var _self = this;
-            event.nextTick(function() {
-                _self.pending = false;
-                var changes;
-                while (changes = _self.changes) {
-                    _self.changes = 0;
-                    _self.onRender(changes);
-                }
-            }, this.window);
-        }
-    };
-
-}).call(RenderLoop.prototype);
-
-exports.RenderLoop = RenderLoop;
-});
-define("text!ace/css/editor.css", [], "@import url(//fonts.googleapis.com/css?family=Droid+Sans+Mono);\n" +
-  "\n" +
-  ".ace_editor {\n" +
-  "    position: absolute;\n" +
-  "    overflow: hidden;\n" +
-  "    font-family: 'Monaco', 'Menlo', 'Ubuntu Mono', 'Droid Sans Mono', 'Consolas', monospace;\n" +
-  "    font-size: 12px;\n" +
-  "}\n" +
-  "\n" +
-  ".ace_scroller {\n" +
-  "    position: absolute;\n" +
-  "    overflow-x: scroll;\n" +
-  "    overflow-y: hidden;\n" +
-  "}\n" +
-  "\n" +
-  ".ace_content {\n" +
-  "    position: absolute;\n" +
-  "    box-sizing: border-box;\n" +
-  "    -moz-box-sizing: border-box;\n" +
-  "    -webkit-box-sizing: border-box;\n" +
-  "    cursor: text;\n" +
-  "}\n" +
-  "\n" +
-  ".ace_composition {\n" +
-  "    position: absolute;\n" +
-  "    background: #555;\n" +
-  "    color: #DDD;\n" +
-  "    z-index: 4;\n" +
-  "}\n" +
-  "\n" +
-  ".ace_gutter {\n" +
-  "    position: absolute;\n" +
-  "    overflow : hidden;\n" +
-  "    height: 100%;\n" +
-  "    width: auto;\n" +
-  "    cursor: default;\n" +
-  "    z-index: 1000;\n" +
-  "}\n" +
-  "\n" +
-  ".ace_gutter.horscroll {\n" +
-  "    box-shadow: 0px 0px 20px rgba(0,0,0,0.4);\n" +
-  "}\n" +
-  "\n" +
-  ".ace_gutter-cell {\n" +
-  "    padding-left: 19px;\n" +
-  "    padding-right: 6px;\n" +
-  "}\n" +
-  "\n" +
-  ".ace_gutter-cell.ace_error {\n" +
-  "    background-image: url(\"data:image/gif,GIF89a%10%00%10%00%D5%00%00%F5or%F5%87%88%F5nr%F4ns%EBmq%F5z%7F%DDJT%DEKS%DFOW%F1Yc%F2ah%CE(7%CE)8%D18E%DD%40M%F2KZ%EBU%60%F4%60m%DCir%C8%16(%C8%19*%CE%255%F1%3FR%F1%3FS%E6%AB%B5%CA%5DI%CEn%5E%F7%A2%9A%C9G%3E%E0a%5B%F7%89%85%F5yy%F6%82%80%ED%82%80%FF%BF%BF%E3%C4%C4%FF%FF%FF%FF%FF%FF%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00!%F9%04%01%00%00%25%00%2C%00%00%00%00%10%00%10%00%00%06p%C0%92pH%2C%1A%8F%C8%D2H%93%E1d4%23%E4%88%D3%09mB%1DN%B48%F5%90%40%60%92G%5B%94%20%3E%22%D2%87%24%FA%20%24%C5%06A%00%20%B1%07%02B%A38%89X.v%17%82%11%13q%10%0Fi%24%0F%8B%10%7BD%12%0Ei%09%92%09%0EpD%18%15%24%0A%9Ci%05%0C%18F%18%0B%07%04%01%04%06%A0H%18%12%0D%14%0D%12%A1I%B3%B4%B5IA%00%3B\");\n" +
-  "    background-repeat: no-repeat;\n" +
-  "    background-position: 2px center;\n" +
-  "}\n" +
-  "\n" +
-  ".ace_gutter-cell.ace_warning {\n" +
-  "    background-image: url(\"data:image/gif,GIF89a%10%00%10%00%D5%00%00%FF%DBr%FF%DE%81%FF%E2%8D%FF%E2%8F%FF%E4%96%FF%E3%97%FF%E5%9D%FF%E6%9E%FF%EE%C1%FF%C8Z%FF%CDk%FF%D0s%FF%D4%81%FF%D5%82%FF%D5%83%FF%DC%97%FF%DE%9D%FF%E7%B8%FF%CCl%7BQ%13%80U%15%82W%16%81U%16%89%5B%18%87%5B%18%8C%5E%1A%94d%1D%C5%83-%C9%87%2F%C6%84.%C6%85.%CD%8B2%C9%871%CB%8A3%CD%8B5%DC%98%3F%DF%9BB%E0%9CC%E1%A5U%CB%871%CF%8B5%D1%8D6%DB%97%40%DF%9AB%DD%99B%E3%B0p%E7%CC%AE%FF%FF%FF%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00!%F9%04%01%00%00%2F%00%2C%00%00%00%00%10%00%10%00%00%06a%C0%97pH%2C%1A%8FH%A1%ABTr%25%87%2B%04%82%F4%7C%B9X%91%08%CB%99%1C!%26%13%84*iJ9(%15G%CA%84%14%01%1A%97%0C%03%80%3A%9A%3E%81%84%3E%11%08%B1%8B%20%02%12%0F%18%1A%0F%0A%03'F%1C%04%0B%10%16%18%10%0B%05%1CF%1D-%06%07%9A%9A-%1EG%1B%A0%A1%A0U%A4%A5%A6BA%00%3B\");\n" +
-  "    background-repeat: no-repeat;\n" +
-  "    background-position: 2px center;\n" +
-  "}\n" +
-  "\n" +
-  ".ace_gutter-cell.ace_info {\n" +
-  "    background-image: url(\"data:image/gif;base64,R0lGODlhEAAQAMQAAAAAAEFBQVJSUl5eXmRkZGtra39/f4WFhYmJiZGRkaampry8vMPDw8zMzNXV1dzc3OTk5Orq6vDw8P///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAkAABQALAAAAAAQABAAAAUuICWOZGmeaBml5XGwFCQSBGyXRSAwtqQIiRuiwIM5BoYVbEFIyGCQoeJGrVptIQA7\");\n" +
-  "    background-repeat: no-repeat;\n" +
-  "    background-position: 2px center;\n" +
-  "}\n" +
-  "\n" +
-  ".ace_editor .ace_sb {\n" +
-  "    position: absolute;\n" +
-  "    overflow-x: hidden;\n" +
-  "    overflow-y: scroll;\n" +
-  "    right: 0;\n" +
-  "}\n" +
-  "\n" +
-  ".ace_editor .ace_sb div {\n" +
-  "    position: absolute;\n" +
-  "    width: 1px;\n" +
-  "    left: 0;\n" +
-  "}\n" +
-  "\n" +
-  ".ace_editor .ace_print_margin_layer {\n" +
-  "    z-index: 0;\n" +
-  "    position: absolute;\n" +
-  "    overflow: hidden;\n" +
-  "    margin: 0;\n" +
-  "    left: 0;\n" +
-  "    height: 100%;\n" +
-  "    width: 100%;\n" +
-  "}\n" +
-  "\n" +
-  ".ace_editor .ace_print_margin {\n" +
-  "    position: absolute;\n" +
-  "    height: 100%;\n" +
-  "}\n" +
-  "\n" +
-  ".ace_editor textarea {\n" +
-  "    position: fixed;\n" +
-  "    z-index: 0;\n" +
-  "    width: 10px;\n" +
-  "    height: 30px;\n" +
-  "    opacity: 0;\n" +
-  "    background: transparent;\n" +
-  "    appearance: none;\n" +
-  "    -moz-appearance: none;\n" +
-  "    border: none;\n" +
-  "    resize: none;\n" +
-  "    outline: none;\n" +
-  "    overflow: hidden;\n" +
-  "}\n" +
-  "\n" +
-  ".ace_layer {\n" +
-  "    z-index: 1;\n" +
-  "    position: absolute;\n" +
-  "    overflow: hidden;\n" +
-  "    white-space: nowrap;\n" +
-  "    height: 100%;\n" +
-  "    width: 100%;\n" +
-  "    box-sizing: border-box;\n" +
-  "    -moz-box-sizing: border-box;\n" +
-  "    -webkit-box-sizing: border-box;\n" +
-  "    /* setting pointer-events: auto; on node under the mouse, which changes\n" +
-  "        during scroll, will break mouse wheel scrolling in Safari */\n" +
-  "    pointer-events: none;\n" +
-  "}\n" +
-  "\n" +
-  ".ace_gutter .ace_layer {\n" +
-  "    position: relative;\n" +
-  "    min-width: 40px;\n" +
-  "    text-align: right;\n" +
-  "    pointer-events: auto;\n" +
-  "}\n" +
-  "\n" +
-  ".ace_text-layer {\n" +
-  "    color: black;\n" +
-  "}\n" +
-  "\n" +
-  ".ace_cjk {\n" +
-  "    display: inline-block;\n" +
-  "    text-align: center;\n" +
-  "}\n" +
-  "\n" +
-  ".ace_cursor-layer {\n" +
-  "    z-index: 4;\n" +
-  "}\n" +
-  "\n" +
-  ".ace_cursor {\n" +
-  "    z-index: 4;\n" +
-  "    position: absolute;\n" +
-  "}\n" +
-  "\n" +
-  ".ace_cursor.ace_hidden {\n" +
-  "    opacity: 0.2;\n" +
-  "}\n" +
-  "\n" +
-  ".ace_line {\n" +
-  "    white-space: nowrap;\n" +
-  "}\n" +
-  "\n" +
-  ".ace_marker-layer .ace_step {\n" +
-  "    position: absolute;\n" +
-  "    z-index: 3;\n" +
-  "}\n" +
-  "\n" +
-  ".ace_marker-layer .ace_selection {\n" +
-  "    position: absolute;\n" +
-  "    z-index: 5;\n" +
-  "}\n" +
-  "\n" +
-  ".ace_marker-layer .ace_bracket {\n" +
-  "    position: absolute;\n" +
-  "    z-index: 6;\n" +
-  "}\n" +
-  "\n" +
-  ".ace_marker-layer .ace_active_line {\n" +
-  "    position: absolute;\n" +
-  "    z-index: 2;\n" +
-  "}\n" +
-  "\n" +
-  ".ace_gutter .ace_gutter_active_line{\n" +
-  "    background-color : #dcdcdc;\n" +
-  "}\n" +
-  "\n" +
-  ".ace_marker-layer .ace_selected_word {\n" +
-  "    position: absolute;\n" +
-  "    z-index: 4;\n" +
-  "    box-sizing: border-box;\n" +
-  "    -moz-box-sizing: border-box;\n" +
-  "    -webkit-box-sizing: border-box;\n" +
-  "}\n" +
-  "\n" +
-  ".ace_line .ace_fold {\n" +
-  "    box-sizing: border-box;\n" +
-  "    -moz-box-sizing: border-box;\n" +
-  "    -webkit-box-sizing: border-box;\n" +
-  "    \n" +
-  "    display: inline-block;\n" +
-  "    height: 11px;\n" +
-  "    margin-top: -2px;\n" +
-  "    vertical-align: middle;\n" +
-  "\n" +
-  "    background-image: \n" +
-  "        url(\"data:image/png,%89PNG%0D%0A%1A%0A%00%00%00%0DIHDR%00%00%00%11%00%00%00%09%08%06%00%00%00%D4%E8%C7%0C%00%00%03%1EiCCPICC%20Profile%00%00x%01%85T%DFk%D3P%14%FE%DAe%9D%B0%E1%8B%3Ag%11%09%3Eh%91ndStC%9C%B6kW%BA%CDZ%EA6%B7!H%9B%A6m%5C%9A%C6%24%ED~%B0%07%D9%8Bo%3A%C5w%F1%07%3E%F9%07%0C%D9%83o%7B%92%0D%C6%14a%F8%AC%88%22L%F6%22%B3%9E%9B4M'S%03%B9%F7%BB%DF%F9%EE9'%E7%E4%5E%A0%F9qZ%D3%14%2F%0F%14USO%C5%C2%FC%C4%E4%14%DF%F2%01%5E%1CC%2B%FChM%8B%86%16J%26G%40%0F%D3%B2y%EF%B3%F3%0E%1E%C6lt%EEo%DF%AB%FEc%D5%9A%95%0C%11%F0%1C%20%BE%945%C4%22%E1Y%A0i%5C%D4t%13%E0%D6%89%EF%9D15%C2%CDLsX%A7%04%09%1Fg8oc%81%E1%8C%8D%23%96f45%40%9A%09%C2%07%C5B%3AK%B8%408%98i%E0%F3%0D%D8%CE%81%14%E4'%26%A9%92.%8B%3C%ABER%2F%E5dE%B2%0C%F6%F0%1Fs%83%F2_%B0%A8%94%E9%9B%AD%E7%10%8Dm%9A%19N%D1%7C%8A%DE%1F9%7Dp%8C%E6%00%D5%C1%3F_%18%BDA%B8%9DpX6%E3%A35~B%CD%24%AE%11%26%BD%E7%EEti%98%EDe%9A%97Y)%12%25%1C%24%BCbT%AE3li%E6%0B%03%89%9A%E6%D3%ED%F4P%92%B0%9F4%BF43Y%F3%E3%EDP%95%04%EB1%C5%F5%F6KF%F4%BA%BD%D7%DB%91%93%07%E35%3E%A7)%D6%7F%40%FE%BD%F7%F5r%8A%E5y%92%F0%EB%B4%1E%8D%D5%F4%5B%92%3AV%DB%DB%E4%CD%A6%23%C3%C4wQ%3F%03HB%82%8E%1Cd(%E0%91B%0Ca%9Ac%C4%AA%F8L%16%19%22J%A4%D2itTy%B28%D6%3B(%93%96%ED%1CGx%C9_%0E%B8%5E%16%F5%5B%B2%B8%F6%E0%FB%9E%DD%25%D7%8E%BC%15%85%C5%B7%A3%D8Q%ED%B5%81%E9%BA%B2%13%9A%1B%7Fua%A5%A3n%E17%B9%E5%9B%1Bm%AB%0B%08Q%FE%8A%E5%B1H%5Ee%CAO%82Q%D7u6%E6%90S%97%FCu%0B%CF2%94%EE%25v%12X%0C%BA%AC%F0%5E%F8*l%0AO%85%17%C2%97%BF%D4%C8%CE%DE%AD%11%CB%80q%2C%3E%AB%9ES%CD%C6%EC%25%D2L%D2%EBd%B8%BF%8A%F5B%C6%18%F9%901CZ%9D%BE%24M%9C%8A9%F2%DAP%0B'%06w%82%EB%E6%E2%5C%2F%D7%07%9E%BB%CC%5D%E1%FA%B9%08%AD.r%23%8E%C2%17%F5E%7C!%F0%BE3%BE%3E_%B7o%88a%A7%DB%BE%D3d%EB%A31Z%EB%BB%D3%91%BA%A2%B1z%94%8F%DB'%F6%3D%8E%AA%13%19%B2%B1%BE%B1~V%08%2B%B4%A2cjJ%B3tO%00%03%25mN%97%F3%05%93%EF%11%84%0B%7C%88%AE-%89%8F%ABbW%90O%2B%0Ao%99%0C%5E%97%0CI%AFH%D9.%B0%3B%8F%ED%03%B6S%D6%5D%E6i_s9%F3*p%E9%1B%FD%C3%EB.7U%06%5E%19%C0%D1s.%17%A03u%E4%09%B0%7C%5E%2C%EB%15%DB%1F%3C%9E%B7%80%91%3B%DBc%AD%3Dma%BA%8B%3EV%AB%DBt.%5B%1E%01%BB%0F%AB%D5%9F%CF%AA%D5%DD%E7%E4%7F%0Bx%A3%FC%06%A9%23%0A%D6%C2%A1_2%00%00%00%09pHYs%00%00%0B%13%00%00%0B%13%01%00%9A%9C%18%00%00%00%B5IDAT(%15%A5%91%3D%0E%02!%10%85ac%E1%05%D6%CE%D6%C6%CE%D2%E8%ED%CD%DE%C0%C6%D6N.%E0V%F8%3D%9Ca%891XH%C2%BE%D9y%3F%90!%E6%9C%C3%BFk%E5%011%C6-%F5%C8N%04%DF%BD%FF%89%DFt%83DN%60%3E%F3%AB%A0%DE%1A%5Dg%BE%10Q%97%1B%40%9C%A8o%10%8F%5E%828%B4%1B%60%87%F6%02%26%85%1Ch%1E%C1%2B%5Bk%FF%86%EE%B7j%09%9A%DA%9B%ACe%A3%F9%EC%DA!9%B4%D5%A6%81%86%86%98%CC%3C%5B%40%FA%81%B3%E9%CB%23%94%C16Azo%05%D4%E1%C1%95a%3B%8A'%A0%E8%CC%17%22%85%1D%BA%00%A2%FA%DC%0A%94%D1%D1%8D%8B%3A%84%17B%C7%60%1A%25Z%FC%8D%00%00%00%00IEND%AEB%60%82\"),\n" +
-  "        url(\"data:image/png,%89PNG%0D%0A%1A%0A%00%00%00%0DIHDR%00%00%00%05%00%00%007%08%06%00%00%00%C4%DD%80C%00%00%03%1EiCCPICC%20Profile%00%00x%01%85T%DFk%D3P%14%FE%DAe%9D%B0%E1%8B%3Ag%11%09%3Eh%91ndStC%9C%B6kW%BA%CDZ%EA6%B7!H%9B%A6m%5C%9A%C6%24%ED~%B0%07%D9%8Bo%3A%C5w%F1%07%3E%F9%07%0C%D9%83o%7B%92%0D%C6%14a%F8%AC%88%22L%F6%22%B3%9E%9B4M'S%03%B9%F7%BB%DF%F9%EE9'%E7%E4%5E%A0%F9qZ%D3%14%2F%0F%14USO%C5%C2%FC%C4%E4%14%DF%F2%01%5E%1CC%2B%FChM%8B%86%16J%26G%40%0F%D3%B2y%EF%B3%F3%0E%1E%C6lt%EEo%DF%AB%FEc%D5%9A%95%0C%11%F0%1C%20%BE%945%C4%22%E1Y%A0i%5C%D4t%13%E0%D6%89%EF%9D15%C2%CDLsX%A7%04%09%1Fg8oc%81%E1%8C%8D%23%96f45%40%9A%09%C2%07%C5B%3AK%B8%408%98i%E0%F3%0D%D8%CE%81%14%E4'%26%A9%92.%8B%3C%ABER%2F%E5dE%B2%0C%F6%F0%1Fs%83%F2_%B0%A8%94%E9%9B%AD%E7%10%8Dm%9A%19N%D1%7C%8A%DE%1F9%7Dp%8C%E6%00%D5%C1%3F_%18%BDA%B8%9DpX6%E3%A35~B%CD%24%AE%11%26%BD%E7%EEti%98%EDe%9A%97Y)%12%25%1C%24%BCbT%AE3li%E6%0B%03%89%9A%E6%D3%ED%F4P%92%B0%9F4%BF43Y%F3%E3%EDP%95%04%EB1%C5%F5%F6KF%F4%BA%BD%D7%DB%91%93%07%E35%3E%A7)%D6%7F%40%FE%BD%F7%F5r%8A%E5y%92%F0%EB%B4%1E%8D%D5%F4%5B%92%3AV%DB%DB%E4%CD%A6%23%C3%C4wQ%3F%03HB%82%8E%1Cd(%E0%91B%0Ca%9Ac%C4%AA%F8L%16%19%22J%A4%D2itTy%B28%D6%3B(%93%96%ED%1CGx%C9_%0E%B8%5E%16%F5%5B%B2%B8%F6%E0%FB%9E%DD%25%D7%8E%BC%15%85%C5%B7%A3%D8Q%ED%B5%81%E9%BA%B2%13%9A%1B%7Fua%A5%A3n%E17%B9%E5%9B%1Bm%AB%0B%08Q%FE%8A%E5%B1H%5Ee%CAO%82Q%D7u6%E6%90S%97%FCu%0B%CF2%94%EE%25v%12X%0C%BA%AC%F0%5E%F8*l%0AO%85%17%C2%97%BF%D4%C8%CE%DE%AD%11%CB%80q%2C%3E%AB%9ES%CD%C6%EC%25%D2L%D2%EBd%B8%BF%8A%F5B%C6%18%F9%901CZ%9D%BE%24M%9C%8A9%F2%DAP%0B'%06w%82%EB%E6%E2%5C%2F%D7%07%9E%BB%CC%5D%E1%FA%B9%08%AD.r%23%8E%C2%17%F5E%7C!%F0%BE3%BE%3E_%B7o%88a%A7%DB%BE%D3d%EB%A31Z%EB%BB%D3%91%BA%A2%B1z%94%8F%DB'%F6%3D%8E%AA%13%19%B2%B1%BE%B1~V%08%2B%B4%A2cjJ%B3tO%00%03%25mN%97%F3%05%93%EF%11%84%0B%7C%88%AE-%89%8F%ABbW%90O%2B%0Ao%99%0C%5E%97%0CI%AFH%D9.%B0%3B%8F%ED%03%B6S%D6%5D%E6i_s9%F3*p%E9%1B%FD%C3%EB.7U%06%5E%19%C0%D1s.%17%A03u%E4%09%B0%7C%5E%2C%EB%15%DB%1F%3C%9E%B7%80%91%3B%DBc%AD%3Dma%BA%8B%3EV%AB%DBt.%5B%1E%01%BB%0F%AB%D5%9F%CF%AA%D5%DD%E7%E4%7F%0Bx%A3%FC%06%A9%23%0A%D6%C2%A1_2%00%00%00%09pHYs%00%00%0B%13%00%00%0B%13%01%00%9A%9C%18%00%00%00%3AIDAT8%11c%FC%FF%FF%7F%18%03%1A%60%01%F2%3F%A0%891%80%04%FF%11-%F8%17%9BJ%E2%05%B1ZD%81v%26t%E7%80%F8%A3%82h%A12%1A%20%A3%01%02%0F%01%BA%25%06%00%19%C0%0D%AEF%D5%3ES%00%00%00%00IEND%AEB%60%82\");\n" +
-  "    background-repeat: no-repeat, repeat-x;\n" +
-  "    background-position: center center, top left;\n" +
-  "    color: transparent;\n" +
-  "\n" +
-  "    border: 1px solid black;\n" +
-  "    -moz-border-radius: 2px;\n" +
-  "    -webkit-border-radius: 2px;\n" +
-  "    border-radius: 2px;\n" +
-  "    \n" +
-  "    cursor: pointer;\n" +
-  "    pointer-events: auto;\n" +
-  "}\n" +
-  "\n" +
-  ".ace_dark .ace_fold {\n" +
-  "}\n" +
-  "\n" +
-  ".ace_fold:hover{\n" +
-  "    background-image: \n" +
-  "        url(\"data:image/png,%89PNG%0D%0A%1A%0A%00%00%00%0DIHDR%00%00%00%11%00%00%00%09%08%06%00%00%00%D4%E8%C7%0C%00%00%03%1EiCCPICC%20Profile%00%00x%01%85T%DFk%D3P%14%FE%DAe%9D%B0%E1%8B%3Ag%11%09%3Eh%91ndStC%9C%B6kW%BA%CDZ%EA6%B7!H%9B%A6m%5C%9A%C6%24%ED~%B0%07%D9%8Bo%3A%C5w%F1%07%3E%F9%07%0C%D9%83o%7B%92%0D%C6%14a%F8%AC%88%22L%F6%22%B3%9E%9B4M'S%03%B9%F7%BB%DF%F9%EE9'%E7%E4%5E%A0%F9qZ%D3%14%2F%0F%14USO%C5%C2%FC%C4%E4%14%DF%F2%01%5E%1CC%2B%FChM%8B%86%16J%26G%40%0F%D3%B2y%EF%B3%F3%0E%1E%C6lt%EEo%DF%AB%FEc%D5%9A%95%0C%11%F0%1C%20%BE%945%C4%22%E1Y%A0i%5C%D4t%13%E0%D6%89%EF%9D15%C2%CDLsX%A7%04%09%1Fg8oc%81%E1%8C%8D%23%96f45%40%9A%09%C2%07%C5B%3AK%B8%408%98i%E0%F3%0D%D8%CE%81%14%E4'%26%A9%92.%8B%3C%ABER%2F%E5dE%B2%0C%F6%F0%1Fs%83%F2_%B0%A8%94%E9%9B%AD%E7%10%8Dm%9A%19N%D1%7C%8A%DE%1F9%7Dp%8C%E6%00%D5%C1%3F_%18%BDA%B8%9DpX6%E3%A35~B%CD%24%AE%11%26%BD%E7%EEti%98%EDe%9A%97Y)%12%25%1C%24%BCbT%AE3li%E6%0B%03%89%9A%E6%D3%ED%F4P%92%B0%9F4%BF43Y%F3%E3%EDP%95%04%EB1%C5%F5%F6KF%F4%BA%BD%D7%DB%91%93%07%E35%3E%A7)%D6%7F%40%FE%BD%F7%F5r%8A%E5y%92%F0%EB%B4%1E%8D%D5%F4%5B%92%3AV%DB%DB%E4%CD%A6%23%C3%C4wQ%3F%03HB%82%8E%1Cd(%E0%91B%0Ca%9Ac%C4%AA%F8L%16%19%22J%A4%D2itTy%B28%D6%3B(%93%96%ED%1CGx%C9_%0E%B8%5E%16%F5%5B%B2%B8%F6%E0%FB%9E%DD%25%D7%8E%BC%15%85%C5%B7%A3%D8Q%ED%B5%81%E9%BA%B2%13%9A%1B%7Fua%A5%A3n%E17%B9%E5%9B%1Bm%AB%0B%08Q%FE%8A%E5%B1H%5Ee%CAO%82Q%D7u6%E6%90S%97%FCu%0B%CF2%94%EE%25v%12X%0C%BA%AC%F0%5E%F8*l%0AO%85%17%C2%97%BF%D4%C8%CE%DE%AD%11%CB%80q%2C%3E%AB%9ES%CD%C6%EC%25%D2L%D2%EBd%B8%BF%8A%F5B%C6%18%F9%901CZ%9D%BE%24M%9C%8A9%F2%DAP%0B'%06w%82%EB%E6%E2%5C%2F%D7%07%9E%BB%CC%5D%E1%FA%B9%08%AD.r%23%8E%C2%17%F5E%7C!%F0%BE3%BE%3E_%B7o%88a%A7%DB%BE%D3d%EB%A31Z%EB%BB%D3%91%BA%A2%B1z%94%8F%DB'%F6%3D%8E%AA%13%19%B2%B1%BE%B1~V%08%2B%B4%A2cjJ%B3tO%00%03%25mN%97%F3%05%93%EF%11%84%0B%7C%88%AE-%89%8F%ABbW%90O%2B%0Ao%99%0C%5E%97%0CI%AFH%D9.%B0%3B%8F%ED%03%B6S%D6%5D%E6i_s9%F3*p%E9%1B%FD%C3%EB.7U%06%5E%19%C0%D1s.%17%A03u%E4%09%B0%7C%5E%2C%EB%15%DB%1F%3C%9E%B7%80%91%3B%DBc%AD%3Dma%BA%8B%3EV%AB%DBt.%5B%1E%01%BB%0F%AB%D5%9F%CF%AA%D5%DD%E7%E4%7F%0Bx%A3%FC%06%A9%23%0A%D6%C2%A1_2%00%00%00%09pHYs%00%00%0B%13%00%00%0B%13%01%00%9A%9C%18%00%00%00%B5IDAT(%15%A5%91%3D%0E%02!%10%85ac%E1%05%D6%CE%D6%C6%CE%D2%E8%ED%CD%DE%C0%C6%D6N.%E0V%F8%3D%9Ca%891XH%C2%BE%D9y%3F%90!%E6%9C%C3%BFk%E5%011%C6-%F5%C8N%04%DF%BD%FF%89%DFt%83DN%60%3E%F3%AB%A0%DE%1A%5Dg%BE%10Q%97%1B%40%9C%A8o%10%8F%5E%828%B4%1B%60%87%F6%02%26%85%1Ch%1E%C1%2B%5Bk%FF%86%EE%B7j%09%9A%DA%9B%ACe%A3%F9%EC%DA!9%B4%D5%A6%81%86%86%98%CC%3C%5B%40%FA%81%B3%E9%CB%23%94%C16Azo%05%D4%E1%C1%95a%3B%8A'%A0%E8%CC%17%22%85%1D%BA%00%A2%FA%DC%0A%94%D1%D1%8D%8B%3A%84%17B%C7%60%1A%25Z%FC%8D%00%00%00%00IEND%AEB%60%82\"),\n" +
-  "        url(\"data:image/png,%89PNG%0D%0A%1A%0A%00%00%00%0DIHDR%00%00%00%05%00%00%007%08%06%00%00%00%C4%DD%80C%00%00%03%1EiCCPICC%20Profile%00%00x%01%85T%DFk%D3P%14%FE%DAe%9D%B0%E1%8B%3Ag%11%09%3Eh%91ndStC%9C%B6kW%BA%CDZ%EA6%B7!H%9B%A6m%5C%9A%C6%24%ED~%B0%07%D9%8Bo%3A%C5w%F1%07%3E%F9%07%0C%D9%83o%7B%92%0D%C6%14a%F8%AC%88%22L%F6%22%B3%9E%9B4M'S%03%B9%F7%BB%DF%F9%EE9'%E7%E4%5E%A0%F9qZ%D3%14%2F%0F%14USO%C5%C2%FC%C4%E4%14%DF%F2%01%5E%1CC%2B%FChM%8B%86%16J%26G%40%0F%D3%B2y%EF%B3%F3%0E%1E%C6lt%EEo%DF%AB%FEc%D5%9A%95%0C%11%F0%1C%20%BE%945%C4%22%E1Y%A0i%5C%D4t%13%E0%D6%89%EF%9D15%C2%CDLsX%A7%04%09%1Fg8oc%81%E1%8C%8D%23%96f45%40%9A%09%C2%07%C5B%3AK%B8%408%98i%E0%F3%0D%D8%CE%81%14%E4'%26%A9%92.%8B%3C%ABER%2F%E5dE%B2%0C%F6%F0%1Fs%83%F2_%B0%A8%94%E9%9B%AD%E7%10%8Dm%9A%19N%D1%7C%8A%DE%1F9%7Dp%8C%E6%00%D5%C1%3F_%18%BDA%B8%9DpX6%E3%A35~B%CD%24%AE%11%26%BD%E7%EEti%98%EDe%9A%97Y)%12%25%1C%24%BCbT%AE3li%E6%0B%03%89%9A%E6%D3%ED%F4P%92%B0%9F4%BF43Y%F3%E3%EDP%95%04%EB1%C5%F5%F6KF%F4%BA%BD%D7%DB%91%93%07%E35%3E%A7)%D6%7F%40%FE%BD%F7%F5r%8A%E5y%92%F0%EB%B4%1E%8D%D5%F4%5B%92%3AV%DB%DB%E4%CD%A6%23%C3%C4wQ%3F%03HB%82%8E%1Cd(%E0%91B%0Ca%9Ac%C4%AA%F8L%16%19%22J%A4%D2itTy%B28%D6%3B(%93%96%ED%1CGx%C9_%0E%B8%5E%16%F5%5B%B2%B8%F6%E0%FB%9E%DD%25%D7%8E%BC%15%85%C5%B7%A3%D8Q%ED%B5%81%E9%BA%B2%13%9A%1B%7Fua%A5%A3n%E17%B9%E5%9B%1Bm%AB%0B%08Q%FE%8A%E5%B1H%5Ee%CAO%82Q%D7u6%E6%90S%97%FCu%0B%CF2%94%EE%25v%12X%0C%BA%AC%F0%5E%F8*l%0AO%85%17%C2%97%BF%D4%C8%CE%DE%AD%11%CB%80q%2C%3E%AB%9ES%CD%C6%EC%25%D2L%D2%EBd%B8%BF%8A%F5B%C6%18%F9%901CZ%9D%BE%24M%9C%8A9%F2%DAP%0B'%06w%82%EB%E6%E2%5C%2F%D7%07%9E%BB%CC%5D%E1%FA%B9%08%AD.r%23%8E%C2%17%F5E%7C!%F0%BE3%BE%3E_%B7o%88a%A7%DB%BE%D3d%EB%A31Z%EB%BB%D3%91%BA%A2%B1z%94%8F%DB'%F6%3D%8E%AA%13%19%B2%B1%BE%B1~V%08%2B%B4%A2cjJ%B3tO%00%03%25mN%97%F3%05%93%EF%11%84%0B%7C%88%AE-%89%8F%ABbW%90O%2B%0Ao%99%0C%5E%97%0CI%AFH%D9.%B0%3B%8F%ED%03%B6S%D6%5D%E6i_s9%F3*p%E9%1B%FD%C3%EB.7U%06%5E%19%C0%D1s.%17%A03u%E4%09%B0%7C%5E%2C%EB%15%DB%1F%3C%9E%B7%80%91%3B%DBc%AD%3Dma%BA%8B%3EV%AB%DBt.%5B%1E%01%BB%0F%AB%D5%9F%CF%AA%D5%DD%E7%E4%7F%0Bx%A3%FC%06%A9%23%0A%D6%C2%A1_2%00%00%00%09pHYs%00%00%0B%13%00%00%0B%13%01%00%9A%9C%18%00%00%003IDAT8%11c%FC%FF%FF%7F%3E%03%1A%60%01%F2%3F%A3%891%80%04%FFQ%26%F8w%C0%B43%A1%DB%0C%E2%8F%0A%A2%85%CAh%80%8C%06%08%3C%04%E8%96%18%00%A3S%0D%CD%CF%D8%C1%9D%00%00%00%00IEND%AEB%60%82\");\n" +
-  "    background-repeat: no-repeat, repeat-x;\n" +
-  "    background-position: center center, top left;\n" +
-  "}\n" +
-  "\n" +
-  ".ace_dragging .ace_content {\n" +
-  "    cursor: move;\n" +
-  "}\n" +
-  "\n" +
-  ".ace_folding-enabled > .ace_gutter-cell {\n" +
-  "    padding-right: 13px;\n" +
-  "}\n" +
-  "\n" +
-  ".ace_fold-widget {\n" +
-  "    box-sizing: border-box;\n" +
-  "    -moz-box-sizing: border-box;\n" +
-  "    -webkit-box-sizing: border-box;\n" +
-  "\n" +
-  "    margin: 0 -12px 1px 1px;\n" +
-  "    display: inline-block;\n" +
-  "    height: 14px;\n" +
-  "    width: 11px;\n" +
-  "    vertical-align: text-bottom;\n" +
-  "    \n" +
-  "    background-image: url(\"data:image/png,%89PNG%0D%0A%1A%0A%00%00%00%0DIHDR%00%00%00%05%00%00%00%05%08%06%00%00%00%8Do%26%E5%00%00%004IDATx%DAe%8A%B1%0D%000%0C%C2%F2%2CK%96%BC%D0%8F9%81%88H%E9%D0%0E%96%C0%10%92%3E%02%80%5E%82%E4%A9*-%EEsw%C8%CC%11%EE%96w%D8%DC%E9*Eh%0C%151(%00%00%00%00IEND%AEB%60%82\");\n" +
-  "    background-repeat: no-repeat;\n" +
-  "    background-position: center 5px;\n" +
-  "\n" +
-  "    border-radius: 3px;\n" +
-  "}\n" +
-  "\n" +
-  ".ace_fold-widget.end {\n" +
-  "    background-image: url(\"data:image/png,%89PNG%0D%0A%1A%0A%00%00%00%0DIHDR%00%00%00%05%00%00%00%05%08%06%00%00%00%8Do%26%E5%00%00%004IDATx%DAm%C7%C1%09%000%08C%D1%8C%ECE%C8E(%8E%EC%02)%1EZJ%F1%C1'%04%07I%E1%E5%EE%CAL%F5%A2%99%99%22%E2%D6%1FU%B5%FE0%D9x%A7%26Wz5%0E%D5%00%00%00%00IEND%AEB%60%82\");\n" +
-  "}\n" +
-  "\n" +
-  ".ace_fold-widget.closed {\n" +
-  "    background-image: url(\"data:image/png,%89PNG%0D%0A%1A%0A%00%00%00%0DIHDR%00%00%00%03%00%00%00%06%08%06%00%00%00%06%E5%24%0C%00%00%009IDATx%DA5%CA%C1%09%000%08%03%C0%AC*(%3E%04%C1%0D%BA%B1%23%A4Uh%E0%20%81%C0%CC%F8%82%81%AA%A2%AArGfr%88%08%11%11%1C%DD%7D%E0%EE%5B%F6%F6%CB%B8%05Q%2F%E9tai%D9%00%00%00%00IEND%AEB%60%82\");\n" +
-  "}\n" +
-  "\n" +
-  ".ace_fold-widget:hover {\n" +
-  "    border: 1px solid rgba(0, 0, 0, 0.3);\n" +
-  "    background-color: rgba(255, 255, 255, 0.2);\n" +
-  "    -moz-box-shadow:inset 0 1px 1px rgba(255, 255, 255, 0.7);\n" +
-  "    -moz-box-shadow: 0 1px 1px rgba(255, 255, 255, 0.7);\n" +
-  "    -webkit-box-shadow:inset 0 1px 1px rgba(255, 255, 255, 0.7);\n" +
-  "    -webkit-box-shadow: 0 1px 1px rgba(255, 255, 255, 0.7);\n" +
-  "    box-shadow:inset 0 1px 1px rgba(255, 255, 255, 0.7);\n" +
-  "    box-shadow: 0 1px 1px rgba(255, 255, 255, 0.7);\n" +
-  "    background-position: center 4px;\n" +
-  "}\n" +
-  "\n" +
-  ".ace_fold-widget:active {\n" +
-  "    border: 1px solid rgba(0, 0, 0, 0.4);\n" +
-  "    background-color: rgba(0, 0, 0, 0.05);\n" +
-  "    -moz-box-shadow:inset 0 1px 1px rgba(255, 255, 255);\n" +
-  "    -moz-box-shadow: 0 1px 1px rgba(255, 255, 255, 0.8);\n" +
-  "    -webkit-box-shadow:inset 0 1px 1px rgba(255, 255, 255);\n" +
-  "    -webkit-box-shadow: 0 1px 1px rgba(255, 255, 255, 0.8);\n" +
-  "    box-shadow:inset 0 1px 1px rgba(255, 255, 255);\n" +
-  "    box-shadow: 0 1px 1px rgba(255, 255, 255, 0.8);\n" +
-  "}\n" +
-  "\n" +
-  ".ace_fold-widget.invalid {\n" +
-  "    background-color: #FFB4B4;\n" +
-  "    border-color: #DE5555;\n" +
-  "}\n" +
-  "");
-
-/* vim:ts=4:sts=4:sw=4:
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Harutyun Amirjanyan <amirjanyan AT gmail DOT com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/multi_select', ['require', 'exports', 'module' , 'ace/range_list', 'ace/range', 'ace/selection', 'ace/mouse/multi_select_handler', 'ace/commands/multi_select_commands', 'ace/search', 'ace/edit_session', 'ace/editor'], function(require, exports, module) {
-
-var RangeList = require("./range_list").RangeList;
-var Range = require("./range").Range;
-var Selection = require("./selection").Selection;
-var onMouseDown = require("./mouse/multi_select_handler").onMouseDown;
-exports.commands = require("./commands/multi_select_commands");
-
-// Todo: session.find or editor.findVolatile that returns range
-var Search = require("./search").Search;
-var search = new Search();
-
-function find(session, needle, dir) {
-    search.$options.wrap = true;
-    search.$options.needle = needle;
-    search.$options.backwards = dir == -1;
-    return search.find(session);
-}
-
-// extend EditSession
-var EditSession = require("./edit_session").EditSession;
-(function() {
-    this.getSelectionMarkers = function() {
-        return this.$selectionMarkers;
-    };
-}).call(EditSession.prototype);
-
-// extend Selection
-(function() {
-    // list of ranges in reverse addition order
-    this.ranges = null;
-
-    // automatically sorted list of ranges
-    this.rangeList = null;
-
-    /**
-     * Selection.addRange(Range) -> Void
-     *
-     * adds a range to selection entering multiselect mode if necessary
-     **/
-    this.addRange = function(range) {
-        if (!this.inMultiSelectMode && this.rangeCount == 0) {
-            var oldRange = this.toOrientedRange();
-            if (!range || !range.isEqual(oldRange)) {
-                this.rangeList.add(oldRange);
-                this.$onAddRange(oldRange);
-            }
-        }
-
-        if (!range)
-            return;
-
-        if (!range.cursor)
-            range.cursor = range.end;
-
-        var removed = this.rangeList.add(range);
-
-        this.$onAddRange(range);
-
-        if (removed.length)
-            this.$onRemoveRange(removed);
-
-        if (this.rangeCount > 0 && !this.inMultiSelectMode) {
-            this._emit("multiSelect");
-            this.inMultiSelectMode = true;
-            this.session.$undoSelect = false;
-            this.rangeList.attach(this.session);
-        }
-    };
-
-    this.toSingleRange = function(range) {
-        range = range || this.ranges[0];
-        var removed = this.rangeList.removeAll();
-        if (removed.length)
-            this.$onRemoveRange(removed);
-
-        range && this.fromOrientedRange(range);
-    };
-    
-    /**
-     * Selection.addRange(pos) -> Range
-     * pos: {row, column}
-     *
-     * removes range containing pos (if exists)
-     **/
-    this.substractPoint = function(pos) {
-        var removed = this.rangeList.substractPoint(pos);
-        if (removed) {
-            this.$onRemoveRange(removed);
-            return removed[0];
-        }
-    };
-
-    /**
-     * Selection.mergeOverlappingRanges() -> Void
-     *
-     * merges overlapping ranges ensuring consistency after changes
-     **/
-    this.mergeOverlappingRanges = function() {
-        var removed = this.rangeList.merge();
-        if (removed.length)
-            this.$onRemoveRange(removed);
-        else if(this.ranges[0])
-            this.fromOrientedRange(this.ranges[0]);
-    };
-
-    this.$onAddRange = function(range) {
-        this.rangeCount = this.rangeList.ranges.length;
-        this.ranges.unshift(range);
-        this.fromOrientedRange(range);
-        this._emit("addRange", {range: range});
-    };
-
-    this.$onRemoveRange = function(removed) {
-        this.rangeCount = this.rangeList.ranges.length;
-        if (this.rangeCount == 1 && this.inMultiSelectMode) {
-            var lastRange = this.rangeList.ranges.pop();
-            removed.push(lastRange);
-            this.rangeCount = 0;
-        }
-
-        for (var i = removed.length; i--; ) {
-            var index = this.ranges.indexOf(removed[i]);
-            this.ranges.splice(index, 1);
-        }
-
-        this._emit("removeRange", {ranges: removed});
-
-        if (this.rangeCount == 0 && this.inMultiSelectMode) {
-            this.inMultiSelectMode = false;
-            this._emit("singleSelect");
-            this.session.$undoSelect = true;
-            this.rangeList.detach(this.session);
-        }
-
-        lastRange = lastRange || this.ranges[0];
-        if (lastRange && !lastRange.isEqual(this.getRange()))
-            this.fromOrientedRange(lastRange);
-    };
-
-    // adds multicursor support to selection
-    this.$initRangeList = function() {
-        if (this.rangeList)
-            return;
-
-        this.rangeList = new RangeList();
-        this.ranges = [];
-        this.rangeCount = 0;
-    };
-
-    this.getAllRanges = function() {
-        return this.rangeList.ranges.concat();
-    };
-
-    this.splitIntoLines = function () {
-        if (this.rangeCount > 1) {
-            var ranges = this.rangeList.ranges;
-            var lastRange = ranges[ranges.length - 1];
-            var range = Range.fromPoints(ranges[0].start, lastRange.end);
-
-            this.toSingleRange();
-            this.setSelectionRange(range, lastRange.cursor == lastRange.start);
-        } else {
-            var cursor = this.session.documentToScreenPosition(this.selectionLead);
-            var anchor = this.session.documentToScreenPosition(this.selectionAnchor);
-
-            var rectSel = this.rectangularRangeBlock(cursor, anchor);
-            rectSel.forEach(this.addRange, this);
-        }
-    };
-
-    /**
-     *   Selection.rectangularRangeBlock(screenCursor, screenAnchor, includeEmptyLines) -> [Range]
-     *   gets list of ranges composing rectangular block on the screen
-     *   @includeEmptyLines if true includes ranges inside the block which
-     *         are empty becuase of the clipping
-     */
-    this.rectangularRangeBlock = function(screenCursor, screenAnchor, includeEmptyLines) {
-        var rectSel = [];
-
-        var xBackwards = screenCursor.column < screenAnchor.column;
-        if (xBackwards) {
-            var startColumn = screenCursor.column;
-            var endColumn = screenAnchor.column;
-        } else {
-            var startColumn = screenAnchor.column;
-            var endColumn = screenCursor.column;
-        }
-
-        var yBackwards = screenCursor.row < screenAnchor.row;
-        if (yBackwards) {
-            var startRow = screenCursor.row;
-            var endRow = screenAnchor.row;
-        } else {
-            var startRow = screenAnchor.row;
-            var endRow = screenCursor.row;
-        }
-
-        if (startColumn < 0)
-            startColumn = 0;
-        if (startRow < 0)
-            startRow = 0;
-
-        if (startRow == endRow)
-            includeEmptyLines = true;
-
-        for (var row = startRow; row <= endRow; row++) {
-            var range = Range.fromPoints(
-                this.session.screenToDocumentPosition(row, startColumn),
-                this.session.screenToDocumentPosition(row, endColumn)
-            );
-            if (range.isEmpty()) {
-                if (docEnd && isSamePoint(range.end, docEnd))
-                    break;
-                var docEnd = range.end;
-            }
-            range.cursor = xBackwards ? range.start : range.end;
-            rectSel.push(range);
-        }
-
-        if (yBackwards)
-            rectSel.reverse();
-
-        if (!includeEmptyLines) {
-            var end = rectSel.length - 1;
-            while (rectSel[end].isEmpty() && end > 0)
-                end--;
-            if (end > 0) {
-                var start = 0;
-                while (rectSel[start].isEmpty())
-                    start++;
-            }
-            for (var i = end; i >= start; i--) {
-                if (rectSel[i].isEmpty())
-                    rectSel.splice(i, 1);
-            }
-        }
-
-        return rectSel;
-    };
-}).call(Selection.prototype);
-
-// extend Editor
-var Editor = require("./editor").Editor;
-(function() {
-    /**
-     * Editor.updateSelectionMarkers() -> Void
-     *
-     * updates cursor and marker layers
-     **/
-    this.updateSelectionMarkers = function() {
-        this.renderer.updateCursor();
-        this.renderer.updateBackMarkers();
-    };
-
-    /**
-     * Editor.addSelectionMarker(orientedRange) -> Range
-     * - orientedRange: range with cursor
-     *
-     * adds selection and cursor
-     **/
-    this.addSelectionMarker = function(orientedRange) {
-        if (!orientedRange.cursor)
-            orientedRange.cursor = orientedRange.end;
-
-        var style = this.getSelectionStyle();
-        orientedRange.marker = this.session.addMarker(orientedRange, "ace_selection", style);
-
-        this.session.$selectionMarkers.push(orientedRange);
-        this.session.selectionMarkerCount = this.session.$selectionMarkers.length;
-        return orientedRange;
-    };
-
-    this.removeSelectionMarkers = function(ranges) {
-        for (var i = ranges.length; i--; ) {
-            var range = ranges[i];
-            if (!range.marker)
-                continue;
-            this.session.removeMarker(range.marker);
-            var index = this.session.$selectionMarkers.indexOf(range);
-            if (index != -1)
-                this.session.$selectionMarkers.splice(index, 1);
-        }
-        this.session.selectionMarkerCount = this.session.$selectionMarkers.length;
-    };
-
-    this.$onAddRange = function(e) {
-        this.addSelectionMarker(e.range);
-        this.renderer.updateCursor();
-        this.renderer.updateBackMarkers();
-    };
-    
-    this.$onRemoveRange = function(e) {
-        this.removeSelectionMarkers(e.ranges);
-        this.renderer.updateCursor();
-        this.renderer.updateBackMarkers();
-    };
-    
-    this.$onMultiSelect = function(e) {
-        if (this.inMultiSelectMode)
-            return;
-        this.inMultiSelectMode = true;
-
-        this.setStyle("multiselect");
-        this.keyBinding.addKeyboardHandler(exports.commands.keyboardHandler);
-        this.commands.on("exec", this.$onMultiSelectExec);
-
-        this.renderer.updateCursor();
-        this.renderer.updateBackMarkers();
-    };
-    
-    this.$onSingleSelect = function(e) {
-        if (this.session.multiSelect.inVirtualMode)
-            return;
-        this.inMultiSelectMode = false;
-
-        this.unsetStyle("multiselect");
-        this.keyBinding.removeKeyboardHandler(exports.commands.keyboardHandler);
-
-        this.commands.removeEventListener("exec", this.$onMultiSelectExec);
-        this.renderer.updateCursor();
-        this.renderer.updateBackMarkers();
-    };
-
-    this.$onMultiSelectExec = function(e) {
-        var command = e.command;
-        var editor = e.editor;
-        if (!command.multiSelectAction) {
-            command.exec(editor, e.args || {});
-            editor.multiSelect.addRange(editor.multiSelect.toOrientedRange());
-            editor.multiSelect.mergeOverlappingRanges();
-        } else if (command.multiSelectAction == "forEach") {
-            editor.forEachSelection(command, e.args);
-        } else if (command.multiSelectAction == "single") {
-            editor.exitMultiSelectMode();
-            command.exec(editor, e.args || {});
-        } else {
-            command.multiSelectAction(editor, e.args || {});
-        }
-        e.preventDefault();
-    };
-
-    /**
-     * Editor.forEachSelection(cmd, args) -> Void
-     * - cmd: command to execute
-     * - args: arguments to the command
-     *
-     * executes command for each selection range
-     **/
-    this.forEachSelection = function(cmd, args) {
-        if (this.inVirtualSelectionMode)
-            return;
-
-        var session = this.session;
-        var selection = this.selection;
-        var rangeList = selection.rangeList;
-
-        var reg = selection._eventRegistry;
-        selection._eventRegistry = {};
-
-        var tmpSel = new Selection(session);
-        this.inVirtualSelectionMode = true;
-        for (var i = rangeList.ranges.length; i--;) {
-            tmpSel.fromOrientedRange(rangeList.ranges[i]);
-            this.selection = session.selection = tmpSel;
-            cmd.exec(this, args || {});
-            tmpSel.toOrientedRange(rangeList.ranges[i]);
-        }
-        tmpSel.detach();
-
-        this.selection = session.selection = selection;
-        this.inVirtualSelectionMode = false;
-        selection._eventRegistry = reg;
-        selection.mergeOverlappingRanges();
-
-        this.onCursorChange();
-        this.onSelectionChange();
-    };
-    
-    /**
-    * Editor.exitMultiSelectMode() -> Void
-    *
-    * removes all selections except the last added one.
-    **/
-    this.exitMultiSelectMode = function() {
-        if (this.inVirtualSelectionMode)
-            return;
-        this.multiSelect.toSingleRange();
-    };
-
-    this.getCopyText = function() {
-        var text = "";
-        if (this.inMultiSelectMode) {
-            var ranges = this.multiSelect.rangeList.ranges;
-            text = [];
-            for (var i = 0; i < ranges.length; i++) {
-                text.push(this.session.getTextRange(ranges[i]));
-            }
-            text = text.join(this.session.getDocument().getNewLineCharacter());
-        } else if (!this.selection.isEmpty()) {
-            text = this.session.getTextRange(this.getSelectionRange());
-        }
-
-        return text;
-    };
-
-
-    // commands
-    /**
-     * Editor.selectMoreLines(dir, skip) -> Void
-     * - dir: -1 up, 1 down
-     * - skip: remove active selection range if true
-     *
-     * adds cursor above or bellow active cursor
-     **/
-    this.selectMoreLines = function(dir, skip) {
-        var range = this.selection.toOrientedRange();
-        var isBackwards = range.cursor == range.end;
-
-        var screenLead = this.session.documentToScreenPosition(range.cursor);
-        if (this.selection.$desiredColumn)
-            screenLead.column = this.selection.$desiredColumn;
-
-        var lead = this.session.screenToDocumentPosition(screenLead.row + dir, screenLead.column);
-
-        if (!range.isEmpty()) {
-            var screenAnchor = this.session.documentToScreenPosition(isBackwards ? range.end : range.start);
-            var anchor = this.session.screenToDocumentPosition(screenAnchor.row + dir, screenAnchor.column);
-        } else {
-            var anchor = lead;
-        }
-
-        if (isBackwards) {
-            var newRange = Range.fromPoints(lead, anchor);
-            newRange.cursor = newRange.start;
-        } else {
-            var newRange = Range.fromPoints(anchor, lead);
-            newRange.cursor = newRange.end;
-        }
-
-        newRange.desiredColumn = screenLead.column;
-        if (!this.selection.inMultiSelectMode) {
-            this.selection.addRange(range);
-        } else {
-            if (skip)
-                var toRemove = range.cursor;
-        }
-
-        this.selection.addRange(newRange);
-        if (toRemove)
-            this.selection.substractPoint(toRemove);
-    };
-
-    /**
-     * Editor.transposeSelections(dir) -> Void
-     * - dir: direction to rotate selections
-     *
-     * contents 
-     * empty ranges are expanded to word
-     **/
-    this.transposeSelections = function(dir) {
-        var session = this.session;
-        var sel = session.multiSelect;
-        var all = sel.ranges;
-
-        for (var i = all.length; i--; ) {
-            var range = all[i];
-            if (range.isEmpty()) {
-                var tmp = session.getWordRange(range.start.row, range.start.column);
-                range.start.row = tmp.start.row;
-                range.start.column = tmp.start.column;
-                range.end.row = tmp.end.row;
-                range.end.column = tmp.end.column;
-            }
-        }
-        sel.mergeOverlappingRanges();
-        
-        var words = [];
-        for (var i = all.length; i--; ) {
-            var range = all[i];
-            words.unshift(session.getTextRange(range));
-        }
-
-        if (dir < 0)
-            words.unshift(words.pop());
-        else
-            words.push(words.shift());
-
-        for (var i = all.length; i--; ) {
-            var range = all[i];
-            var tmp = range.clone();
-            session.replace(range, words[i]);
-            range.start.row = tmp.start.row;
-            range.start.column = tmp.start.column;
-        }
-    }
-
-    /**
-     * Editor.selectMore(dir, skip) -> Void
-     * - dir: 1 next, -1 previous
-     * - skip: remove active selection range if true
-     *
-     * finds next occurence of text in active selection
-     * and adds it to the selections
-     **/
-    this.selectMore = function (dir, skip) {
-        var session = this.session;
-        var sel = session.multiSelect;
-
-        var range = sel.toOrientedRange();
-        if (range.isEmpty()) {
-            var range = session.getWordRange(range.start.row, range.start.column);
-            range.cursor = range.end;
-            this.multiSelect.addRange(range);
-        }
-        var needle = session.getTextRange(range);
-
-        var newRange = find(session, needle, dir);
-        if (newRange) {
-            newRange.cursor = dir == -1 ? newRange.start : newRange.end;
-            this.multiSelect.addRange(newRange);
-        }
-        if (skip)
-            this.multiSelect.substractPoint(range.cursor);
-    };
-}).call(Editor.prototype);
-
-
-function isSamePoint(p1, p2) {
-    return p1.row == p2.row && p1.column == p2.column;
-}
-
-// patch
-// adds multicursor support to a session
-exports.onSessionChange = function(e) {
-    var session = e.session;
-    if (!session.multiSelect) {
-        session.$selectionMarkers = [];
-        session.selection.$initRangeList();
-        session.multiSelect = session.selection;
-    }
-    this.multiSelect = session.multiSelect;
-
-    var oldSession = e.oldSession;
-    if (oldSession) {
-        // todo use events
-        if (oldSession.multiSelect && oldSession.multiSelect.editor == this)
-            oldSession.multiSelect.editor = null;
-
-        session.multiSelect.removeEventListener("addRange", this.$onAddRange);
-        session.multiSelect.removeEventListener("removeRange", this.$onRemoveRange);
-        session.multiSelect.removeEventListener("multiSelect", this.$onMultiSelect);
-        session.multiSelect.removeEventListener("singleSelect", this.$onSingleSelect);
-    }
-
-    session.multiSelect.on("addRange", this.$onAddRange);
-    session.multiSelect.on("removeRange", this.$onRemoveRange);
-    session.multiSelect.on("multiSelect", this.$onMultiSelect);
-    session.multiSelect.on("singleSelect", this.$onSingleSelect);
-
-    // this.$onSelectionChange = this.onSelectionChange.bind(this);
-
-    if (this.inMultiSelectMode != session.selection.inMultiSelectMode) {
-        if (session.selection.inMultiSelectMode)
-            this.$onMultiSelect();
-        else
-            this.$onSingleSelect();
-    }
-};
-
-/**
- * MultiSelect(editor) -> Void
- *
- * adds multiple selection support to the editor
- * (note: should be called only once for each editor instance)
- **/
-function MultiSelect(editor) {
-    editor.$onAddRange = editor.$onAddRange.bind(editor);
-    editor.$onRemoveRange = editor.$onRemoveRange.bind(editor);
-    editor.$onMultiSelect = editor.$onMultiSelect.bind(editor);
-    editor.$onSingleSelect = editor.$onSingleSelect.bind(editor);
-
-    exports.onSessionChange.call(editor, editor);
-    editor.on("changeSession", exports.onSessionChange.bind(editor));
-
-    editor.on("mousedown", onMouseDown);
-    editor.commands.addCommands(exports.commands.defaultCommands);
-}
-
-exports.MultiSelect = MultiSelect;
-
-});/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Harutyun Amirjanyan <amirjanyan AT gmail DOT com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/range_list', ['require', 'exports', 'module' ], function(require, exports, module) {
-"use strict";
-
-
-var RangeList = function() {
-    this.ranges = [];
-};
-
-(function() {
-    this.comparePoints = function(p1, p2) {
-        return p1.row - p2.row || p1.column - p2.column;
-    };
-
-    this.pointIndex = function(pos, startIndex) {
-        var list = this.ranges;
-
-        for (var i = startIndex || 0; i < list.length; i++) {
-            var range = list[i];
-            var cmp = this.comparePoints(pos, range.end);
-
-            if (cmp > 0)
-                continue;
-            if (cmp == 0)
-                return i;
-            cmp = this.comparePoints(pos, range.start);
-            if (cmp >= 0)
-                return i;
-
-            return -i-1;
-        }
-        return -i - 1;
-    };
-
-    this.add = function(range) {
-        var startIndex = this.pointIndex(range.start);
-        if (startIndex < 0)
-            startIndex = -startIndex - 1;
-
-        var endIndex = this.pointIndex(range.end, startIndex);
-
-        if (endIndex < 0)
-            endIndex = -endIndex - 1;
-        else
-            endIndex++;
-
-        return this.ranges.splice(startIndex, endIndex - startIndex, range);
-    };
-
-    this.addList = function(list) {
-        var removed = [];
-        for (var i = list.length; i--; ) {
-            removed.push.call(removed, this.add(list[i]));
-        }
-        return removed;
-    };
-
-    this.substractPoint = function(pos) {
-        var i = this.pointIndex(pos);
-
-        if (i >= 0)
-            return this.ranges.splice(i, 1);
-    };
-
-    // merge overlapping ranges
-    this.merge = function() {
-        var removed = [];
-        var list = this.ranges;
-        var next = list[0], range;
-        for (var i = 1; i < list.length; i++) {
-            range = next;
-            next = list[i];
-            var cmp = this.comparePoints(range.end, next.start);
-            if (cmp < 0)
-                continue;
-
-            if (cmp == 0 && !(range.isEmpty() || next.isEmpty()))
-                continue;
-
-            if (this.comparePoints(range.end, next.end) < 0) {
-                range.end.row = next.end.row;
-                range.end.column = next.end.column;
-            }
-
-            list.splice(i, 1);
-            removed.push(next);
-            next = range;
-            i--;
-        }
-
-        return removed;
-    };
-
-    this.contains = function(row, column) {
-        return this.pointIndex({row: row, column: column}) >= 0;
-    };
-
-    this.containsPoint = function(pos) {
-        return this.pointIndex(pos) >= 0;
-    };
-
-    this.rangeAtPoint = function(pos) {
-        var i = this.pointIndex(pos);
-        if (i >= 0)
-            return this.ranges[i];
-    };
-
-
-    this.clipRows = function(startRow, endRow) {
-        var list = this.ranges;
-        if (list[0].start.row > endRow || list[list.length - 1].start.row < startRow)
-            return [];
-
-        var startIndex = this.pointIndex({row: startRow, column: 0});
-        if (startIndex < 0)
-            startIndex = -startIndex - 1;
-        var endIndex = this.pointIndex({row: endRow, column: 0}, startIndex);
-        if (endIndex < 0)
-            endIndex = -endIndex - 1;
-
-        var clipped = [];
-        for (var i = startIndex; i < endIndex; i++) {
-            clipped.push(list[i]);
-        }
-        return clipped;
-    };
-
-    this.removeAll = function() {
-        return this.ranges.splice(0, this.ranges.length);
-    };
-
-    this.attach = function(session) {
-        if (this.session)
-            this.detach();
-
-        this.session = session;
-        this.onChange = this.$onChange.bind(this);
-
-        this.session.on('change', this.onChange);
-    };
-
-    this.detach = function() {
-        if (!this.session)
-            return;
-        this.session.removeListener('change', this.onChange);
-        this.session = null;
-    };
-
-    this.$onChange = function(e) {
-        var changeRange = e.data.range;
-        if (e.data.action[0] == "i"){
-            var start = changeRange.start;
-            var end = changeRange.end;
-        } else {
-            var end = changeRange.start;
-            var start = changeRange.end;
-        }
-        var startRow = start.row;
-        var endRow = end.row;
-        var lineDif = endRow - startRow;
-
-        var colDiff = -start.column + end.column;
-
-        var ranges = this.ranges;
-
-        for (var i=0, n = ranges.length; i < n; i++) {
-            var r = ranges[i];
-            if (r.end.row < startRow)
-                continue;
-            if (r.start.row > startRow)
-                break;
-
-            if (r.start.row == startRow && r.start.column >= start.column ) {
-                r.start.column += colDiff;
-                r.start.row += lineDif;
-            }
-            if (r.end.row == startRow && r.end.column >=  start.column) {
-                r.end.column += colDiff;
-                r.end.row += lineDif;
-            }
-        }
-
-        if (lineDif != 0 && i < n) {
-            for (; i < n; i++) {
-                var r = ranges[i];
-                r.start.row += lineDif;
-                r.end.row += lineDif;
-            }
-        }
-    };
-
-}).call(RangeList.prototype);
-
-exports.RangeList = RangeList;
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Harutyun Amirjanyan <amirjanyan AT gmail DOT com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mouse/multi_select_handler', ['require', 'exports', 'module' , 'ace/lib/event'], function(require, exports, module) {
-
-var event = require("../lib/event");
-
-
-// mouse
-function isSamePoint(p1, p2) {
-    return p1.row == p2.row && p1.column == p2.column;
-}
-
-function onMouseDown(e) {
-    var ev = e.domEvent;
-    var alt = ev.altKey;
-    var shift = ev.shiftKey;
-    var ctrl = e.getAccelKey();
-    var button = e.getButton();
-
-    if (!ctrl && !alt) {
-        if (e.editor.inMultiSelectMode) {
-            if (button == 0) {
-                e.editor.exitMultiSelectMode();
-            } else if (button == 2) {
-                var editor = e.editor;
-                var selectionEmpty = editor.selection.isEmpty();
-                editor.textInput.onContextMenu({x: e.clientX, y: e.clientY}, selectionEmpty);
-                event.capture(editor.container, function(){}, editor.textInput.onContextMenuClose);
-                e.stop();
-            }
-        }
-        return;
-    }
-
-    var editor = e.editor;
-    var selection = editor.selection;
-    var isMultiSelect = editor.inMultiSelectMode;
-    var pos = e.getDocumentPosition();
-    var cursor = selection.getCursor();
-    var inSelection = e.inSelection() || (selection.isEmpty() && isSamePoint(pos, cursor));
-
-
-    var mouseX = e.pageX, mouseY = e.pageY;
-    var onMouseSelection = function(e) {
-        mouseX = event.getDocumentX(e);
-        mouseY = event.getDocumentY(e);
-    };
-
-    var blockSelect = function() {
-        var newCursor = editor.renderer.pixelToScreenCoordinates(mouseX, mouseY);
-        var cursor = session.screenToDocumentPosition(newCursor.row, newCursor.column);
-
-        if (isSamePoint(screenCursor, newCursor)
-            && isSamePoint(cursor, selection.selectionLead))
-            return;
-        screenCursor = newCursor;
-
-        editor.selection.moveCursorToPosition(cursor);
-        editor.selection.clearSelection();
-        editor.renderer.scrollCursorIntoView();
-
-        editor.removeSelectionMarkers(rectSel);
-        rectSel = selection.rectangularRangeBlock(screenCursor, screenAnchor);
-        rectSel.forEach(editor.addSelectionMarker, editor);
-        editor.updateSelectionMarkers();
-    };
-    
-    var session = editor.session;
-    var screenAnchor = editor.renderer.pixelToScreenCoordinates(mouseX, mouseY);
-    var screenCursor = screenAnchor;
-
-    
-
-    if (ctrl && !shift && !alt && button == 0) {
-        if (!isMultiSelect && inSelection)
-            return; // dragging
-
-        if (!isMultiSelect)
-            selection.addRange(selection.toOrientedRange());
-
-
-        var oldRange = selection.rangeList.rangeAtPoint(pos);
-
-        event.capture(editor.container, function(){}, function() {
-            var tmpSel = selection.toOrientedRange();
-
-            if (oldRange && tmpSel.isEmpty() && isSamePoint(oldRange.cursor, tmpSel.cursor))
-                selection.substractPoint(tmpSel.cursor);
-            else
-                selection.addRange(tmpSel);
-        });
-
-    } else if (!shift && alt && button == 0) {
-        e.stop();
-
-        if (isMultiSelect && !ctrl)
-            selection.toSingleRange();
-        else if (!isMultiSelect && ctrl)
-            selection.addRange();
-
-        selection.moveCursorToPosition(pos);
-        selection.clearSelection();
-
-        var rectSel = [];
-
-        var onMouseSelectionEnd = function(e) {
-            clearInterval(timerId);
-            editor.removeSelectionMarkers(rectSel);
-            for (var i = 0; i < rectSel.length; i++)
-                selection.addRange(rectSel[i]);
-        };
-
-        var onSelectionInterval = blockSelect;
-
-        event.capture(editor.container, onMouseSelection, onMouseSelectionEnd);
-        var timerId = setInterval(function() {onSelectionInterval();}, 20);
-
-        return e.preventDefault();
-    }
-}
-
-
-exports.onMouseDown = onMouseDown;
-
-});/* vim:ts=4:sts=4:sw=4:
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Harutyun Amirjanyan <amirjanyan AT gmail DOT com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/commands/multi_select_commands', ['require', 'exports', 'module' , 'ace/keyboard/hash_handler'], function(require, exports, module) {
-
-// commands to enter multiselect mode
-exports.defaultCommands = [{
-    name: "addCursorAbove",
-    exec: function(editor) { editor.selectMoreLines(-1); },
-    bindKey: {win: "Ctrl-Alt-Up", mac: "Ctrl-Alt-Up"},
-    readonly: true
-}, {
-    name: "addCursorBelow",
-    exec: function(editor) { editor.selectMoreLines(1); },
-    bindKey: {win: "Ctrl-Alt-Down", mac: "Ctrl-Alt-Down"},
-    readonly: true
-}, {
-    name: "addCursorAboveSkipCurrent",
-    exec: function(editor) { editor.selectMoreLines(-1, true); },
-    bindKey: {win: "Ctrl-Alt-Shift-Up", mac: "Ctrl-Alt-Shift-Up"},
-    readonly: true
-}, {
-    name: "addCursorBelowSkipCurrent",
-    exec: function(editor) { editor.selectMoreLines(1, true); },
-    bindKey: {win: "Ctrl-Alt-Shift-Down", mac: "Ctrl-Alt-Shift-Down"},
-    readonly: true
-}, {
-    name: "selectMoreBefore",
-    exec: function(editor) { editor.selectMore(-1); },
-    bindKey: {win: "Ctrl-Alt-Left", mac: "Ctrl-Alt-Left"},
-    readonly: true
-}, {
-    name: "selectMoreAfter",
-    exec: function(editor) { editor.selectMore(1); },
-    bindKey: {win: "Ctrl-Alt-Right", mac: "Ctrl-Alt-Right"},
-    readonly: true
-}, {
-    name: "selectNextBefore",
-    exec: function(editor) { editor.selectMore(-1, true); },
-    bindKey: {win: "Ctrl-Alt-Shift-Left", mac: "Ctrl-Alt-Shift-Left"},
-    readonly: true
-}, {
-    name: "selectNextAfter",
-    exec: function(editor) { editor.selectMore(1, true); },
-    bindKey: {win: "Ctrl-Alt-Shift-Right", mac: "Ctrl-Alt-Shift-Right"},
-    readonly: true
-},  {
-    name: "splitIntoLines",
-    exec: function(editor) { editor.multiSelect.splitIntoLines(); },
-    bindKey: {win: "Ctrl-Shift-L", mac: "Ctrl-Shift-L"},
-    readonly: true
-}];
-
-// commands active in multiselect mode
-exports.multiEditCommands = [{
-    name: "singleSelection",
-    bindKey: "esc",
-    exec: function(editor) { editor.exitMultiSelectMode(); },
-    readonly: true
-}];
-
-var HashHandler = require("../keyboard/hash_handler").HashHandler;
-exports.keyboardHandler = new HashHandler(exports.multiEditCommands);
-
-});/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/worker/worker_client', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/event_emitter', 'ace/config'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var EventEmitter = require("../lib/event_emitter").EventEmitter;
-var config = require("../config");
-
-var WorkerClient = function(topLevelNamespaces, packagedJs, mod, classname) {
-
-    this.changeListener = this.changeListener.bind(this);
-
-    if (config.get("packaged")) {
-        this.$worker = new Worker(config.get("workerPath") + "/" + packagedJs);
-    }
-    else {
-        var workerUrl = this.$normalizePath(require.nameToUrl("ace/worker/worker", null, "_"));
-        this.$worker = new Worker(workerUrl);
-
-        var tlns = {};
-        for (var i=0; i<topLevelNamespaces.length; i++) {
-            var ns = topLevelNamespaces[i];
-            var path = this.$normalizePath(require.nameToUrl(ns, null, "_").replace(/.js$/, ""));
-
-            tlns[ns] = path;
-        }
-    }
-
-    this.$worker.postMessage({
-        init : true,
-        tlns: tlns,
-        module: mod,
-        classname: classname
-    });
-
-    this.callbackId = 1;
-    this.callbacks = {};
-
-    var _self = this;
-    this.$worker.onerror = function(e) {
-        window.console && console.log && console.log(e);
-        throw e;
-    };
-    this.$worker.onmessage = function(e) {
-        var msg = e.data;
-        switch(msg.type) {
-            case "log":
-                window.console && console.log && console.log(msg.data);
-                break;
-
-            case "event":
-                _self._emit(msg.name, {data: msg.data});
-                break;
-
-            case "call":
-                var callback = _self.callbacks[msg.id];
-                if (callback) {
-                    callback(msg.data);
-                    delete _self.callbacks[msg.id];
-                }
-                break;
-        }
-    };
-};
-
-(function(){
-
-    oop.implement(this, EventEmitter);
-
-    this.$normalizePath = function(path) {
-        path = path.replace(/^[a-z]+:\/\/[^\/]+/, ""); // Remove domain name and rebuild it
-        path = location.protocol + "//" + location.host
-            // paths starting with a slash are relative to the root (host)
-            + (path.charAt(0) == "/" ? "" : location.pathname.replace(/\/[^\/]*$/, ""))
-            + "/" + path.replace(/^[\/]+/, "");
-        return path;
-    };
-
-    this.terminate = function() {
-        this._emit("terminate", {});
-        this.$worker.terminate();
-        this.$worker = null;
-        this.$doc.removeEventListener("change", this.changeListener);
-        this.$doc = null;
-    };
-
-    this.send = function(cmd, args) {
-        this.$worker.postMessage({command: cmd, args: args});
-    };
-
-    this.call = function(cmd, args, callback) {
-        if (callback) {
-            var id = this.callbackId++;
-            this.callbacks[id] = callback;
-            args.push(id);
-        }
-        this.send(cmd, args);
-    };
-
-    this.emit = function(event, data) {
-        try {
-            // firefox refuses to clone objects which have function properties
-            // TODO: cleanup event
-            this.$worker.postMessage({event: event, data: {data: data.data}});
-        }
-        catch(ex) {}
-    };
-
-    this.attachToDocument = function(doc) {
-        if(this.$doc)
-            this.terminate();
-
-        this.$doc = doc;
-        this.call("setValue", [doc.getValue()]);
-        doc.on("change", this.changeListener);
-    };
-
-    this.changeListener = function(e) {
-        e.range = {
-            start: e.data.range.start,
-            end: e.data.range.end
-        };
-        this.emit("change", e);
-    };
-
-}).call(WorkerClient.prototype);
-
-exports.WorkerClient = WorkerClient;
-
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Skywriter.
- *
- * The Initial Developer of the Original Code is
- * Mozilla.
- * Portions created by the Initial Developer are Copyright (C) 2009
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Julian Viereck (julian.viereck@gmail.com)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/keyboard/state_handler', ['require', 'exports', 'module' ], function(require, exports, module) {
-"use strict";
-
-// If you're developing a new keymapping and want to get an idea what's going
-// on, then enable debugging.
-var DEBUG = false;
-
-function StateHandler(keymapping) {
-    this.keymapping = this.$buildKeymappingRegex(keymapping);
-}
-
-StateHandler.prototype = {
-    /**
-     * Build the RegExp from the keymapping as RegExp can't stored directly
-     * in the metadata JSON and as the RegExp used to match the keys/buffer
-     * need to be adapted.
-     */
-    $buildKeymappingRegex: function(keymapping) {
-        for (var state in keymapping) {
-            this.$buildBindingsRegex(keymapping[state]);
-        }
-        return keymapping;
-    },
-
-    $buildBindingsRegex: function(bindings) {
-        // Escape a given Regex string.
-        bindings.forEach(function(binding) {
-            if (binding.key) {
-                binding.key = new RegExp('^' + binding.key + '$');
-            } else if (Array.isArray(binding.regex)) {
-                if (!('key' in binding))
-                  binding.key = new RegExp('^' + binding.regex[1] + '$');
-                binding.regex = new RegExp(binding.regex.join('') + '$');
-            } else if (binding.regex) {
-                binding.regex = new RegExp(binding.regex + '$');
-            }
-        });
-    },
-
-    $composeBuffer: function(data, hashId, key, e) {
-        // Initialize the data object.
-        if (data.state == null || data.buffer == null) {
-            data.state = "start";
-            data.buffer = "";
-        }
-
-        var keyArray = [];
-        if (hashId & 1) keyArray.push("ctrl");
-        if (hashId & 8) keyArray.push("command");
-        if (hashId & 2) keyArray.push("option");
-        if (hashId & 4) keyArray.push("shift");
-        if (key)        keyArray.push(key);
-
-        var symbolicName = keyArray.join("-");
-        var bufferToUse = data.buffer + symbolicName;
-
-        // Don't add the symbolic name to the key buffer if the alt_ key is
-        // part of the symbolic name. If it starts with alt_, this means
-        // that the user hit an alt keycombo and there will be a single,
-        // new character detected after this event, which then will be
-        // added to the buffer (e.g. alt_j will result in ∆).
-        //
-        // We test for 2 and not for & 2 as we only want to exclude the case where
-        // the option key is pressed alone.
-        if (hashId != 2) {
-            data.buffer = bufferToUse;
-        }
-
-        var bufferObj = {
-            bufferToUse: bufferToUse,
-            symbolicName: symbolicName,
-        };
-
-        if (e) {
-            bufferObj.keyIdentifier = e.keyIdentifier
-        }
-
-        return bufferObj;
-    },
-
-    $find: function(data, buffer, symbolicName, hashId, key, keyIdentifier) {
-        // Holds the command to execute and the args if a command matched.
-        var result = {};
-
-        // Loop over all the bindings of the keymap until a match is found.
-        this.keymapping[data.state].some(function(binding) {
-            var match;
-
-            // Check if the key matches.
-            if (binding.key && !binding.key.test(symbolicName)) {
-                return false;
-            }
-
-            // Check if the regex matches.
-            if (binding.regex && !(match = binding.regex.exec(buffer))) {
-                return false;
-            }
-
-            // Check if the match function matches.
-            if (binding.match && !binding.match(buffer, hashId, key, symbolicName, keyIdentifier)) {
-                return false;
-            }
-
-            // Check for disallowed matches.
-            if (binding.disallowMatches) {
-                for (var i = 0; i < binding.disallowMatches.length; i++) {
-                    if (!!match[binding.disallowMatches[i]]) {
-                        return false;
-                    }
-                }
-            }
-
-            // If there is a command to execute, then figure out the
-            // command and the arguments.
-            if (binding.exec) {
-                result.command = binding.exec;
-
-                // Build the arguments.
-                if (binding.params) {
-                    var value;
-                    result.args = {};
-                    binding.params.forEach(function(param) {
-                        if (param.match != null && match != null) {
-                            value = match[param.match] || param.defaultValue;
-                        } else {
-                            value = param.defaultValue;
-                        }
-
-                        if (param.type === 'number') {
-                            value = parseInt(value);
-                        }
-
-                        result.args[param.name] = value;
-                    });
-                }
-                data.buffer = "";
-            }
-
-            // Handle the 'then' property.
-            if (binding.then) {
-                data.state = binding.then;
-                data.buffer = "";
-            }
-
-            // If no command is set, then execute the "null" fake command.
-            if (result.command == null) {
-                result.command = "null";
-            }
-
-            if (DEBUG) {
-                console.log("KeyboardStateMapper#find", binding);
-            }
-            return true;
-        });
-
-        if (result.command) {
-            return result;
-        } else {
-            data.buffer = "";
-            return false;
-        }
-    },
-
-    /**
-     * This function is called by keyBinding.
-     */
-    handleKeyboard: function(data, hashId, key, keyCode, e) {
-        // If we pressed any command key but no other key, then ignore the input.
-        // Otherwise "shift-" is added to the buffer, and later on "shift-g"
-        // which results in "shift-shift-g" which doesn't make sense.
-        if (hashId != 0 && (key == "" || key == String.fromCharCode(0))) {
-            return null;
-        }
-
-        // Compute the current value of the keyboard input buffer.
-        var r = this.$composeBuffer(data, hashId, key, e);
-        var buffer = r.bufferToUse;
-        var symbolicName = r.symbolicName;
-        var keyId = r.keyIdentifier;
-
-        r = this.$find(data, buffer, symbolicName, hashId, key, keyId);
-        if (DEBUG) {
-            console.log("KeyboardStateMapper#match", buffer, symbolicName, r);
-        }
-
-        return r;
-    }
-}
-
-/**
- * This is a useful matching function and therefore is defined here so that
- * users of KeyboardStateMapper can use it.
- *
- * @return boolean
- *          If no command key (Command|Option|Shift|Ctrl) is pressed, it
- *          returns true. If the only the Shift key is pressed + a character
- *          true is returned as well. Otherwise, false is returned.
- *          Summing up, the function returns true whenever the user typed
- *          a normal character on the keyboard and no shortcut.
- */
-exports.matchCharacterOnly = function(buffer, hashId, key, symbolicName) {
-    // If no command keys are pressed, then catch the input.
-    if (hashId == 0) {
-        return true;
-    }
-    // If only the shift key is pressed and a character key, then
-    // catch that input as well.
-    else if ((hashId == 4) && key.length == 1) {
-        return true;
-    }
-    // Otherwise, we let the input got through.
-    else {
-        return false;
-    }
-};
-
-exports.StateHandler = StateHandler;
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Zef Hemel <zef@c9.io>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-define('ace/placeholder', ['require', 'exports', 'module' , 'ace/range', 'ace/lib/event_emitter', 'ace/lib/oop'], function(require, exports, module) {
-"use strict";
-
-var Range = require('./range').Range;
-var EventEmitter = require("./lib/event_emitter").EventEmitter;
-var oop = require("./lib/oop");
-
-var PlaceHolder = function(session, length, pos, others, mainClass, othersClass) {
-    var _self = this;
-    this.length = length;
-    this.session = session;
-    this.doc = session.getDocument();
-    this.mainClass = mainClass;
-    this.othersClass = othersClass;
-    this.$onUpdate = this.onUpdate.bind(this);
-    this.doc.on("change", this.$onUpdate);
-    this.$others = others;
-    
-    this.$onCursorChange = function() {
-        setTimeout(function() {
-            _self.onCursorChange();
-        });
-    };
-    
-    this.$pos = pos;
-    // Used for reset
-    var undoStack = session.getUndoManager().$undoStack || session.getUndoManager().$undostack || {length: -1};
-    this.$undoStackDepth =  undoStack.length;
-    this.setup();
-
-    session.selection.on("changeCursor", this.$onCursorChange);
-};
-
-(function() {
-
-    oop.implement(this, EventEmitter);
-
-    this.setup = function() {
-        var _self = this;
-        var doc = this.doc;
-        var session = this.session;
-        var pos = this.$pos;
-
-        this.pos = doc.createAnchor(pos.row, pos.column);
-        this.markerId = session.addMarker(new Range(pos.row, pos.column, pos.row, pos.column + this.length), this.mainClass, null, false);
-        this.pos.on("change", function(event) {
-            session.removeMarker(_self.markerId);
-            _self.markerId = session.addMarker(new Range(event.value.row, event.value.column, event.value.row, event.value.column+_self.length), _self.mainClass, null, false);
-        });
-        this.others = [];
-        this.$others.forEach(function(other) {
-            var anchor = doc.createAnchor(other.row, other.column);
-            _self.others.push(anchor);
-        });
-        session.setUndoSelect(false);
-    };
-    
-    this.showOtherMarkers = function() {
-        if(this.othersActive) return;
-        var session = this.session;
-        var _self = this;
-        this.othersActive = true;
-        this.others.forEach(function(anchor) {
-            anchor.markerId = session.addMarker(new Range(anchor.row, anchor.column, anchor.row, anchor.column+_self.length), _self.othersClass, null, false);
-            anchor.on("change", function(event) {
-                session.removeMarker(anchor.markerId);
-                anchor.markerId = session.addMarker(new Range(event.value.row, event.value.column, event.value.row, event.value.column+_self.length), _self.othersClass, null, false);
-            });
-        });
-    };
-    
-    this.hideOtherMarkers = function() {
-        if(!this.othersActive) return;
-        this.othersActive = false;
-        for (var i = 0; i < this.others.length; i++) {
-            this.session.removeMarker(this.others[i].markerId);
-        }
-    };
-
-    this.onUpdate = function(event) {
-        var delta = event.data;
-        var range = delta.range;
-        if(range.start.row !== range.end.row) return;
-        if(range.start.row !== this.pos.row) return;
-        if (this.$updating) return;
-        this.$updating = true;
-        var lengthDiff = delta.action === "insertText" ? range.end.column - range.start.column : range.start.column - range.end.column;
-        
-        if(range.start.column >= this.pos.column && range.start.column <= this.pos.column + this.length + 1) {
-            var distanceFromStart = range.start.column - this.pos.column;
-            this.length += lengthDiff;
-            if(!this.session.$fromUndo) {
-                if(delta.action === "insertText") {
-                    for (var i = this.others.length - 1; i >= 0; i--) {
-                        var otherPos = this.others[i];
-                        var newPos = {row: otherPos.row, column: otherPos.column + distanceFromStart};
-                        if(otherPos.row === range.start.row && range.start.column < otherPos.column)
-                            newPos.column += lengthDiff;
-                        this.doc.insert(newPos, delta.text);
-                    }
-                } else if(delta.action === "removeText") {
-                    for (var i = this.others.length - 1; i >= 0; i--) {
-                        var otherPos = this.others[i];
-                        var newPos = {row: otherPos.row, column: otherPos.column + distanceFromStart};
-                        if(otherPos.row === range.start.row && range.start.column < otherPos.column)
-                            newPos.column += lengthDiff;
-                        this.doc.remove(new Range(newPos.row, newPos.column, newPos.row, newPos.column - lengthDiff));
-                    }
-                }
-                // Special case: insert in beginning
-                if(range.start.column === this.pos.column && delta.action === "insertText") {
-                    setTimeout(function() {
-                        this.pos.setPosition(this.pos.row, this.pos.column - lengthDiff);
-                        for (var i = 0; i < this.others.length; i++) {
-                            var other = this.others[i];
-                            var newPos = {row: other.row, column: other.column - lengthDiff};
-                            if(other.row === range.start.row && range.start.column < other.column)
-                                newPos.column += lengthDiff;
-                            other.setPosition(newPos.row, newPos.column);
-                        }
-                    }.bind(this), 0);
-                }
-                else if(range.start.column === this.pos.column && delta.action === "removeText") {
-                    setTimeout(function() {
-                        for (var i = 0; i < this.others.length; i++) {
-                            var other = this.others[i];
-                            if(other.row === range.start.row && range.start.column < other.column) {
-                                other.setPosition(other.row, other.column - lengthDiff);
-                            }
-                        }
-                    }.bind(this), 0);
-                }
-            }
-            this.pos._emit("change", {value: this.pos});
-            for (var i = 0; i < this.others.length; i++) {
-                this.others[i]._emit("change", {value: this.others[i]});
-            }
-        }
-        this.$updating = false;
-    };
-    
-    this.onCursorChange = function(event) {
-        if (this.$updating) return;
-        var pos = this.session.selection.getCursor();
-        if(pos.row === this.pos.row && pos.column >= this.pos.column && pos.column <= this.pos.column + this.length) {
-            this.showOtherMarkers();
-            this._emit("cursorEnter", event);
-        } else {
-            this.hideOtherMarkers();
-            this._emit("cursorLeave", event);
-        }
-    };
-    
-    this.detach = function() {
-        this.session.removeMarker(this.markerId);
-        this.hideOtherMarkers();
-        this.doc.removeEventListener("change", this.$onUpdate);
-        this.session.selection.removeEventListener("changeCursor", this.$onCursorChange);
-        this.pos.detach();
-        for (var i = 0; i < this.others.length; i++) {
-            this.others[i].detach();
-        }
-        this.session.setUndoSelect(true);
-    };
-    
-    this.cancel = function() {
-        if(this.$undoStackDepth === -1)
-            throw Error("Canceling placeholders only supported with undo manager attached to session.");
-        var undoManager = this.session.getUndoManager();
-        var undosRequired = (undoManager.$undoStack || undoManager.$undostack).length - this.$undoStackDepth;
-        for (var i = 0; i < undosRequired; i++) {
-            undoManager.undo(true);
-        }
-    };
-}).call(PlaceHolder.prototype);
-
-
-exports.PlaceHolder = PlaceHolder;
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/theme/textmate', ['require', 'exports', 'module' , 'ace/lib/dom'], function(require, exports, module) {
-"use strict";
-
-exports.isDark = false;
-exports.cssClass = "ace-tm";
-exports.cssText = ".ace-tm .ace_editor {\
-  border: 2px solid rgb(159, 159, 159);\
-}\
-\
-.ace-tm .ace_editor.ace_focus {\
-  border: 2px solid #327fbd;\
-}\
-\
-.ace-tm .ace_gutter {\
-  background: #e8e8e8;\
-  color: #333;\
-}\
-\
-.ace-tm .ace_print_margin {\
-  width: 1px;\
-  background: #e8e8e8;\
-}\
-\
-.ace-tm .ace_fold {\
-    background-color: #6B72E6;\
-}\
-\
-.ace-tm .ace_text-layer {\
-  cursor: text;\
-}\
-\
-.ace-tm .ace_cursor {\
-  border-left: 1px solid black;\
-}\
-\
-.ace-tm .ace_cursor.ace_overwrite {\
-  border-left: 0px;\
-  border-bottom: 1px solid black;\
-}\
-        \
-.ace-tm .ace_line .ace_invisible {\
-  color: rgb(191, 191, 191);\
-}\
-\
-.ace-tm .ace_line .ace_storage,\
-.ace-tm .ace_line .ace_keyword {\
-  color: blue;\
-}\
-\
-.ace-tm .ace_line .ace_constant {\
-  color: rgb(197, 6, 11);\
-}\
-\
-.ace-tm .ace_line .ace_constant.ace_buildin {\
-  color: rgb(88, 72, 246);\
-}\
-\
-.ace-tm .ace_line .ace_constant.ace_language {\
-  color: rgb(88, 92, 246);\
-}\
-\
-.ace-tm .ace_line .ace_constant.ace_library {\
-  color: rgb(6, 150, 14);\
-}\
-\
-.ace-tm .ace_line .ace_invalid {\
-  background-color: rgb(153, 0, 0);\
-  color: white;\
-}\
-\
-.ace-tm .ace_line .ace_support.ace_function {\
-  color: rgb(60, 76, 114);\
-}\
-\
-.ace-tm .ace_line .ace_support.ace_constant {\
-  color: rgb(6, 150, 14);\
-}\
-\
-.ace-tm .ace_line .ace_support.ace_type,\
-.ace-tm .ace_line .ace_support.ace_class {\
-  color: rgb(109, 121, 222);\
-}\
-\
-.ace-tm .ace_line .ace_keyword.ace_operator {\
-  color: rgb(104, 118, 135);\
-}\
-\
-.ace-tm .ace_line .ace_string {\
-  color: rgb(3, 106, 7);\
-}\
-\
-.ace-tm .ace_line .ace_comment {\
-  color: rgb(76, 136, 107);\
-}\
-\
-.ace-tm .ace_line .ace_comment.ace_doc {\
-  color: rgb(0, 102, 255);\
-}\
-\
-.ace-tm .ace_line .ace_comment.ace_doc.ace_tag {\
-  color: rgb(128, 159, 191);\
-}\
-\
-.ace-tm .ace_line .ace_constant.ace_numeric {\
-  color: rgb(0, 0, 205);\
-}\
-\
-.ace-tm .ace_line .ace_variable {\
-  color: rgb(49, 132, 149);\
-}\
-\
-.ace-tm .ace_line .ace_xml_pe {\
-  color: rgb(104, 104, 91);\
-}\
-\
-.ace-tm .ace_entity.ace_name.ace_function {\
-  color: #0000A2;\
-}\
-\
-.ace-tm .ace_markup.ace_markupine {\
-    text-decoration:underline;\
-}\
-\
-.ace-tm .ace_markup.ace_heading {\
-  color: rgb(12, 7, 255);\
-}\
-\
-.ace-tm .ace_markup.ace_list {\
-  color:rgb(185, 6, 144);\
-}\
-\
-.ace-tm .ace_marker-layer .ace_selection {\
-  background: rgb(181, 213, 255);\
-}\
-\
-.ace-tm .ace_marker-layer .ace_step {\
-  background: rgb(252, 255, 0);\
-}\
-\
-.ace-tm .ace_marker-layer .ace_stack {\
-  background: rgb(164, 229, 101);\
-}\
-\
-.ace-tm .ace_marker-layer .ace_bracket {\
-  margin: -1px 0 0 -1px;\
-  border: 1px solid rgb(192, 192, 192);\
-}\
-\
-.ace-tm .ace_marker-layer .ace_active_line {\
-  background: rgba(0, 0, 0, 0.07);\
-}\
-\
-.ace-tm .ace_marker-layer .ace_selected_word {\
-  background: rgb(250, 250, 255);\
-  border: 1px solid rgb(200, 200, 250);\
-}\
-\
-.ace-tm .ace_meta.ace_tag {\
-  color:rgb(28, 2, 255);\
-}\
-\
-.ace-tm .ace_string.ace_regex {\
-  color: rgb(255, 0, 0)\
-}";
-
-var dom = require("../lib/dom");
-dom.importCssString(exports.cssText, exports.cssClass);
-});
-;
-            (function() {
-                window.require(["ace/ace"], function(a) {
-                    if (!window.ace)
-                        window.ace = {};
-                    for (var key in a) if (a.hasOwnProperty(key))
-                        ace[key] = a[key];
-                });
-            })();
-        
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/ace.js b/apps/files_texteditor/js/aceeditor/ace.js
deleted file mode 100644
index 679230926e..0000000000
--- a/apps/files_texteditor/js/aceeditor/ace.js
+++ /dev/null
@@ -1,9 +0,0 @@
-(function(){function g(a){if(typeof requirejs!="undefined"){var e=b.define;b.define=function(a,b,c){return typeof c!="function"?e.apply(this,arguments):e(a,b,function(a,d,e){return b[2]=="module"&&(e.packaged=!0),c.apply(this,arguments)})},b.define.packaged=!0;return}var f=function(a,b){return d("",a,b)};f.packaged=!0;var g=b;a&&(b[a]||(b[a]={}),g=b[a]),g.define&&(c.original=g.define),g.define=c,g.require&&(d.original=g.require),g.require=f}var a="",b=function(){return this}(),c=function(a,b,d){if(typeof a!="string"){c.original?c.original.apply(window,arguments):(console.error("dropping module because define wasn't a string."),console.trace());return}arguments.length==2&&(d=b),c.modules||(c.modules={}),c.modules[a]=d},d=function(a,b,c){if(Object.prototype.toString.call(b)==="[object Array]"){var e=[];for(var g=0,h=b.length;g<h;++g){var i=f(a,b[g]);if(!i&&d.original)return d.original.apply(window,arguments);e.push(i)}c&&c.apply(null,e)}else{if(typeof b=="string"){var j=f(a,b);return!j&&d.original?d.original.apply(window,arguments):(c&&c(),j)}if(d.original)return d.original.apply(window,arguments)}},e=function(a,b){if(b.indexOf("!")!==-1){var c=b.split("!");return e(a,c[0])+"!"+e(a,c[1])}if(b.charAt(0)=="."){var d=a.split("/").slice(0,-1).join("/");b=d+"/"+b;while(b.indexOf(".")!==-1&&f!=b){var f=b;b=b.replace(/\/\.\//,"/").replace(/[^\/]+\/\.\.\//,"")}}return b},f=function(a,b){b=e(a,b);var f=c.modules[b];if(!f)return null;if(typeof f=="function"){var g={},h={id:b,uri:"",exports:g,packaged:!0},i=function(a,c){return d(b,a,c)},j=f(i,g,h);return g=j||h.exports,c.modules[b]=g,g}return f};g(a)})(),define("ace/ace",["require","exports","module","ace/lib/fixoldbrowsers","ace/lib/dom","ace/lib/event","ace/editor","ace/edit_session","ace/undomanager","ace/virtual_renderer","ace/multi_select","ace/worker/worker_client","ace/keyboard/hash_handler","ace/keyboard/state_handler","ace/placeholder","ace/config","ace/theme/textmate"],function(a,b,c){"use strict",a("./lib/fixoldbrowsers");var d=a("./lib/dom"),e=a("./lib/event"),f=a("./editor").Editor,g=a("./edit_session").EditSession,h=a("./undomanager").UndoManager,i=a("./virtual_renderer").VirtualRenderer,j=a("./multi_select").MultiSelect;a("./worker/worker_client"),a("./keyboard/hash_handler"),a("./keyboard/state_handler"),a("./placeholder"),a("./config").init(),b.edit=function(b){typeof b=="string"&&(b=document.getElementById(b));var c=new g(d.getInnerText(b));c.setUndoManager(new h),b.innerHTML="";var k=new f(new i(b,a("./theme/textmate")));new j(k),k.setSession(c);var l={};return l.document=c,l.editor=k,k.resize(),e.addListener(window,"resize",function(){k.resize()}),b.env=l,k.env=l,k}}),define("ace/lib/fixoldbrowsers",["require","exports","module","ace/lib/regexp","ace/lib/es5-shim"],function(a,b,c){"use strict",a("./regexp"),a("./es5-shim")}),define("ace/lib/regexp",["require","exports","module"],function(a,b,c){function g(a){return(a.global?"g":"")+(a.ignoreCase?"i":"")+(a.multiline?"m":"")+(a.extended?"x":"")+(a.sticky?"y":"")}function h(a,b,c){if(Array.prototype.indexOf)return a.indexOf(b,c);for(var d=c||0;d<a.length;d++)if(a[d]===b)return d;return-1}"use strict";var d={exec:RegExp.prototype.exec,test:RegExp.prototype.test,match:String.prototype.match,replace:String.prototype.replace,split:String.prototype.split},e=d.exec.call(/()??/,"")[1]===undefined,f=function(){var a=/^/g;return d.test.call(a,""),!a.lastIndex}();RegExp.prototype.exec=function(a){var b=d.exec.apply(this,arguments),c,i;if(typeof a=="string"&&b){!e&&b.length>1&&h(b,"")>-1&&(i=RegExp(this.source,d.replace.call(g(this),"g","")),d.replace.call(a.slice(b.index),i,function(){for(var a=1;a<arguments.length-2;a++)arguments[a]===undefined&&(b[a]=undefined)}));if(this._xregexp&&this._xregexp.captureNames)for(var j=1;j<b.length;j++)c=this._xregexp.captureNames[j-1],c&&(b[c]=b[j]);!f&&this.global&&!b[0].length&&this.lastIndex>b.index&&this.lastIndex--}return b},f||(RegExp.prototype.test=function(a){var b=d.exec.call(this,a);return b&&this.global&&!b[0].length&&this.lastIndex>b.index&&this.lastIndex--,!!b})}),define("ace/lib/es5-shim",["require","exports","module"],function(a,b,c){function p(a){try{return Object.defineProperty(a,"sentinel",{}),"sentinel"in a}catch(b){}}Function.prototype.bind||(Function.prototype.bind=function(b){var c=this;if(typeof c!="function")throw new TypeError;var d=g.call(arguments,1),e=function(){if(this instanceof e){var a=function(){};a.prototype=c.prototype;var f=new a,h=c.apply(f,d.concat(g.call(arguments)));return h!==null&&Object(h)===h?h:f}return c.apply(b,d.concat(g.call(arguments)))};return e});var d=Function.prototype.call,e=Array.prototype,f=Object.prototype,g=e.slice,h=d.bind(f.toString),i=d.bind(f.hasOwnProperty),j,k,l,m,n;if(n=i(f,"__defineGetter__"))j=d.bind(f.__defineGetter__),k=d.bind(f.__defineSetter__),l=d.bind(f.__lookupGetter__),m=d.bind(f.__lookupSetter__);Array.isArray||(Array.isArray=function(b){return h(b)=="[object Array]"}),Array.prototype.forEach||(Array.prototype.forEach=function(b){var c=G(this),d=arguments[1],e=0,f=c.length>>>0;if(h(b)!="[object Function]")throw new TypeError;while(e<f)e in c&&b.call(d,c[e],e,c),e++}),Array.prototype.map||(Array.prototype.map=function(b){var c=G(this),d=c.length>>>0,e=Array(d),f=arguments[1];if(h(b)!="[object Function]")throw new TypeError;for(var g=0;g<d;g++)g in c&&(e[g]=b.call(f,c[g],g,c));return e}),Array.prototype.filter||(Array.prototype.filter=function(b){var c=G(this),d=c.length>>>0,e=[],f=arguments[1];if(h(b)!="[object Function]")throw new TypeError;for(var g=0;g<d;g++)g in c&&b.call(f,c[g],g,c)&&e.push(c[g]);return e}),Array.prototype.every||(Array.prototype.every=function(b){var c=G(this),d=c.length>>>0,e=arguments[1];if(h(b)!="[object Function]")throw new TypeError;for(var f=0;f<d;f++)if(f in c&&!b.call(e,c[f],f,c))return!1;return!0}),Array.prototype.some||(Array.prototype.some=function(b){var c=G(this),d=c.length>>>0,e=arguments[1];if(h(b)!="[object Function]")throw new TypeError;for(var f=0;f<d;f++)if(f in c&&b.call(e,c[f],f,c))return!0;return!1}),Array.prototype.reduce||(Array.prototype.reduce=function(b){var c=G(this),d=c.length>>>0;if(h(b)!="[object Function]")throw new TypeError;if(!d&&arguments.length==1)throw new TypeError;var e=0,f;if(arguments.length>=2)f=arguments[1];else do{if(e in c){f=c[e++];break}if(++e>=d)throw new TypeError}while(!0);for(;e<d;e++)e in c&&(f=b.call(void 0,f,c[e],e,c));return f}),Array.prototype.reduceRight||(Array.prototype.reduceRight=function(b){var c=G(this),d=c.length>>>0;if(h(b)!="[object Function]")throw new TypeError;if(!d&&arguments.length==1)throw new TypeError;var e,f=d-1;if(arguments.length>=2)e=arguments[1];else do{if(f in c){e=c[f--];break}if(--f<0)throw new TypeError}while(!0);do f in this&&(e=b.call(void 0,e,c[f],f,c));while(f--);return e}),Array.prototype.indexOf||(Array.prototype.indexOf=function(b){var c=G(this),d=c.length>>>0;if(!d)return-1;var e=0;arguments.length>1&&(e=E(arguments[1])),e=e>=0?e:Math.max(0,d+e);for(;e<d;e++)if(e in c&&c[e]===b)return e;return-1}),Array.prototype.lastIndexOf||(Array.prototype.lastIndexOf=function(b){var c=G(this),d=c.length>>>0;if(!d)return-1;var e=d-1;arguments.length>1&&(e=Math.min(e,E(arguments[1]))),e=e>=0?e:d-Math.abs(e);for(;e>=0;e--)if(e in c&&b===c[e])return e;return-1}),Object.getPrototypeOf||(Object.getPrototypeOf=function(b){return b.__proto__||(b.constructor?b.constructor.prototype:f)});if(!Object.getOwnPropertyDescriptor){var o="Object.getOwnPropertyDescriptor called on a non-object: ";Object.getOwnPropertyDescriptor=function(b,c){if(typeof b!="object"&&typeof b!="function"||b===null)throw new TypeError(o+b);if(!i(b,c))return;var d,e,g;d={enumerable:!0,configurable:!0};if(n){var h=b.__proto__;b.__proto__=f;var e=l(b,c),g=m(b,c);b.__proto__=h;if(e||g)return e&&(d.get=e),g&&(d.set=g),d}return d.value=b[c],d}}Object.getOwnPropertyNames||(Object.getOwnPropertyNames=function(b){return Object.keys(b)}),Object.create||(Object.create=function(b,c){var d;if(b===null)d={__proto__:null};else{if(typeof b!="object")throw new TypeError("typeof prototype["+typeof b+"] != 'object'");var e=function(){};e.prototype=b,d=new e,d.__proto__=b}return c!==void 0&&Object.defineProperties(d,c),d});if(Object.defineProperty){var q=p({}),r=typeof document=="undefined"||p(document.createElement("div"));if(!q||!r)var s=Object.defineProperty}if(!Object.defineProperty||s){var t="Property description must be an object: ",u="Object.defineProperty called on non-object: ",v="getters & setters can not be defined on this javascript engine";Object.defineProperty=function(b,c,d){if(typeof b!="object"&&typeof b!="function"||b===null)throw new TypeError(u+b);if(typeof d!="object"&&typeof d!="function"||d===null)throw new TypeError(t+d);if(s)try{return s.call(Object,b,c,d)}catch(e){}if(i(d,"value"))if(n&&(l(b,c)||m(b,c))){var g=b.__proto__;b.__proto__=f,delete b[c],b[c]=d.value,b.__proto__=g}else b[c]=d.value;else{if(!n)throw new TypeError(v);i(d,"get")&&j(b,c,d.get),i(d,"set")&&k(b,c,d.set)}return b}}Object.defineProperties||(Object.defineProperties=function(b,c){for(var d in c)i(c,d)&&Object.defineProperty(b,d,c[d]);return b}),Object.seal||(Object.seal=function(b){return b}),Object.freeze||(Object.freeze=function(b){return b});try{Object.freeze(function(){})}catch(w){Object.freeze=function(b){return function(c){return typeof c=="function"?c:b(c)}}(Object.freeze)}Object.preventExtensions||(Object.preventExtensions=function(b){return b}),Object.isSealed||(Object.isSealed=function(b){return!1}),Object.isFrozen||(Object.isFrozen=function(b){return!1}),Object.isExtensible||(Object.isExtensible=function(b){if(Object(b)===b)throw new TypeError;var c="";while(i(b,c))c+="?";b[c]=!0;var d=i(b,c);return delete b[c],d});if(!Object.keys){var x=!0,y=["toString","toLocaleString","valueOf","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","constructor"],z=y.length;for(var A in{toString:null})x=!1;Object.keys=function H(a){if(typeof a!="object"&&typeof a!="function"||a===null)throw new TypeError("Object.keys called on a non-object");var H=[];for(var b in a)i(a,b)&&H.push(b);if(x)for(var c=0,d=z;c<d;c++){var e=y[c];i(a,e)&&H.push(e)}return H}}if(!Date.prototype.toISOString||(new Date(-621987552e5)).toISOString().indexOf("-000001")===-1)Date.prototype.toISOString=function(){var b,c,d,e;if(!isFinite(this))throw new RangeError;b=[this.getUTCMonth()+1,this.getUTCDate(),this.getUTCHours(),this.getUTCMinutes(),this.getUTCSeconds()],e=this.getUTCFullYear(),e=(e<0?"-":e>9999?"+":"")+("00000"+Math.abs(e)).slice(0<=e&&e<=9999?-4:-6),c=b.length;while(c--)d=b[c],d<10&&(b[c]="0"+d);return e+"-"+b.slice(0,2).join("-")+"T"+b.slice(2).join(":")+"."+("000"+this.getUTCMilliseconds()).slice(-3)+"Z"};Date.now||(Date.now=function(){return(new Date).getTime()}),Date.prototype.toJSON||(Date.prototype.toJSON=function(b){if(typeof this.toISOString!="function")throw new TypeError;return this.toISOString()}),Date.parse("+275760-09-13T00:00:00.000Z")!==864e13&&(Date=function(a){var b=function e(b,c,d,f,g,h,i){var j=arguments.length;if(this instanceof a){var k=j==1&&String(b)===b?new a(e.parse(b)):j>=7?new a(b,c,d,f,g,h,i):j>=6?new a(b,c,d,f,g,h):j>=5?new a(b,c,d,f,g):j>=4?new a(b,c,d,f):j>=3?new a(b,c,d):j>=2?new a(b,c):j>=1?new a(b):new a;return k.constructor=e,k}return a.apply(this,arguments)},c=new RegExp("^(\\d{4}|[+-]\\d{6})(?:-(\\d{2})(?:-(\\d{2})(?:T(\\d{2}):(\\d{2})(?::(\\d{2})(?:\\.(\\d{3}))?)?(?:Z|(?:([-+])(\\d{2}):(\\d{2})))?)?)?)?$");for(var d in a)b[d]=a[d];return b.now=a.now,b.UTC=a.UTC,b.prototype=a.prototype,b.prototype.constructor=b,b.parse=function(d){var e=c.exec(d);if(e){e.shift();for(var f=1;f<7;f++)e[f]=+(e[f]||(f<3?1:0)),f==1&&e[f]--;var g=+e.pop(),h=+e.pop(),i=e.pop(),j=0;if(i){if(h>23||g>59)return NaN;j=(h*60+g)*6e4*(i=="+"?-1:1)}var k=+e[0];return 0<=k&&k<=99?(e[0]=k+400,a.UTC.apply(this,e)+j-126227808e5):a.UTC.apply(this,e)+j}return a.parse.apply(this,arguments)},b}(Date));var B="	\n\f\r   ᠎             　\u2028\u2029";if(!String.prototype.trim||B.trim()){B="["+B+"]";var C=new RegExp("^"+B+B+"*"),D=new RegExp(B+B+"*$");String.prototype.trim=function(){return String(this).replace(C,"").replace(D,"")}}var E=function(a){return a=+a,a!==a?a=0:a!==0&&a!==1/0&&a!==-Infinity&&(a=(a>0||-1)*Math.floor(Math.abs(a))),a},F="a"[0]!="a",G=function(a){if(a==null)throw new TypeError;return F&&typeof a=="string"&&a?a.split(""):Object(a)}}),define("ace/lib/dom",["require","exports","module"],function(a,b,c){"use strict";var d="http://www.w3.org/1999/xhtml";b.createElement=function(a,b){return document.createElementNS?document.createElementNS(b||d,a):document.createElement(a)},b.setText=function(a,b){a.innerText!==undefined&&(a.innerText=b),a.textContent!==undefined&&(a.textContent=b)},b.hasCssClass=function(a,b){var c=a.className.split(/\s+/g);return c.indexOf(b)!==-1},b.addCssClass=function(a,c){b.hasCssClass(a,c)||(a.className+=" "+c)},b.removeCssClass=function(a,b){var c=a.className.split(/\s+/g);for(;;){var d=c.indexOf(b);if(d==-1)break;c.splice(d,1)}a.className=c.join(" ")},b.toggleCssClass=function(a,b){var c=a.className.split(/\s+/g),d=!0;for(;;){var e=c.indexOf(b);if(e==-1)break;d=!1,c.splice(e,1)}return d&&c.push(b),a.className=c.join(" "),d},b.setCssClass=function(a,c,d){d?b.addCssClass(a,c):b.removeCssClass(a,c)},b.hasCssString=function(a,b){var c=0,d;b=b||document;if(b.createStyleSheet&&(d=b.styleSheets)){while(c<d.length)if(d[c++].owningElement.id===a)return!0}else if(d=b.getElementsByTagName("style"))while(c<d.length)if(d[c++].id===a)return!0;return!1},b.importCssString=function(c,e,f){f=f||document;if(e&&b.hasCssString(e,f))return null;var g;if(f.createStyleSheet)g=f.createStyleSheet(),g.cssText=c,e&&(g.owningElement.id=e);else{g=f.createElementNS?f.createElementNS(d,"style"):f.createElement("style"),g.appendChild(f.createTextNode(c)),e&&(g.id=e);var h=f.getElementsByTagName("head")[0]||f.documentElement;h.appendChild(g)}},b.importCssStylsheet=function(a,c){if(c.createStyleSheet)c.createStyleSheet(a);else{var d=b.createElement("link");d.rel="stylesheet",d.href=a;var e=c.getElementsByTagName("head")[0]||c.documentElement;e.appendChild(d)}},b.getInnerWidth=function(a){return parseInt(b.computedStyle(a,"paddingLeft"),10)+parseInt(b.computedStyle(a,"paddingRight"),10)+a.clientWidth},b.getInnerHeight=function(a){return parseInt(b.computedStyle(a,"paddingTop"),10)+parseInt(b.computedStyle(a,"paddingBottom"),10)+a.clientHeight},window.pageYOffset!==undefined?(b.getPageScrollTop=function(){return window.pageYOffset},b.getPageScrollLeft=function(){return window.pageXOffset}):(b.getPageScrollTop=function(){return document.body.scrollTop},b.getPageScrollLeft=function(){return document.body.scrollLeft}),window.getComputedStyle?b.computedStyle=function(a,b){return b?(window.getComputedStyle(a,"")||{})[b]||"":window.getComputedStyle(a,"")||{}}:b.computedStyle=function(a,b){return b?a.currentStyle[b]:a.currentStyle},b.scrollbarWidth=function(a){var c=b.createElement("p");c.style.width="100%",c.style.minWidth="0px",c.style.height="200px";var d=b.createElement("div"),e=d.style;e.position="absolute",e.left="-10000px",e.overflow="hidden",e.width="200px",e.minWidth="0px",e.height="150px",d.appendChild(c);var f=a.body||a.documentElement;f.appendChild(d);var g=c.offsetWidth;e.overflow="scroll";var h=c.offsetWidth;return g==h&&(h=d.clientWidth),f.removeChild(d),g-h},b.setInnerHtml=function(a,b){var c=a.cloneNode(!1);return c.innerHTML=b,a.parentNode.replaceChild(c,a),c},b.setInnerText=function(a,b){var c=a.ownerDocument;c.body&&"textContent"in c.body?a.textContent=b:a.innerText=b},b.getInnerText=function(a){var b=a.ownerDocument;return b.body&&"textContent"in b.body?a.textContent:a.innerText||a.textContent||""},b.getParentWindow=function(a){return a.defaultView||a.parentWindow}}),define("ace/lib/event",["require","exports","module","ace/lib/keys","ace/lib/useragent","ace/lib/dom"],function(a,b,c){function g(a,b,c){var f=0;e.isOpera&&e.isMac?f=0|(b.metaKey?1:0)|(b.altKey?2:0)|(b.shiftKey?4:0)|(b.ctrlKey?8:0):f=0|(b.ctrlKey?1:0)|(b.altKey?2:0)|(b.shiftKey?4:0)|(b.metaKey?8:0);if(c in d.MODIFIER_KEYS){switch(d.MODIFIER_KEYS[c]){case"Alt":f=2;break;case"Shift":f=4;break;case"Ctrl":f=1;break;default:f=8}c=0}return f&8&&(c==91||c==93)&&(c=0),!!f||c in d.FUNCTION_KEYS||c in d.PRINTABLE_KEYS?a(b,f,c):!1}"use strict";var d=a("./keys"),e=a("./useragent"),f=a("./dom");b.addListener=function(a,b,c){if(a.addEventListener)return a.addEventListener(b,c,!1);if(a.attachEvent){var d=function(){c(window.event)};c._wrapper=d,a.attachEvent("on"+b,d)}},b.removeListener=function(a,b,c){if(a.removeEventListener)return a.removeEventListener(b,c,!1);a.detachEvent&&a.detachEvent("on"+b,c._wrapper||c)},b.stopEvent=function(a){return b.stopPropagation(a),b.preventDefault(a),!1},b.stopPropagation=function(a){a.stopPropagation?a.stopPropagation():a.cancelBubble=!0},b.preventDefault=function(a){a.preventDefault?a.preventDefault():a.returnValue=!1},b.getDocumentX=function(a){return a.clientX?a.clientX+f.getPageScrollLeft():a.pageX},b.getDocumentY=function(a){return a.clientY?a.clientY+f.getPageScrollTop():a.pageY},b.getButton=function(a){return a.type=="dblclick"?0:a.type=="contextmenu"?2:a.preventDefault?a.button:{1:0,2:2,4:1}[a.button]},document.documentElement.setCapture?b.capture=function(a,c,d){function e(a){return c(a),b.stopPropagation(a)}function g(e){c(e),f||(f=!0,d(e)),b.removeListener(a,"mousemove",c),b.removeListener(a,"mouseup",g),b.removeListener(a,"losecapture",g),a.releaseCapture()}var f=!1;b.addListener(a,"mousemove",c),b.addListener(a,"mouseup",g),b.addListener(a,"losecapture",g),a.setCapture()}:b.capture=function(a,b,c){function d(a){b(a),a.stopPropagation()}function e(a){b&&b(a),c&&c(a),document.removeEventListener("mousemove",d,!0),document.removeEventListener("mouseup",e,!0),a.stopPropagation()}document.addEventListener("mousemove",d,!0),document.addEventListener("mouseup",e,!0)},b.addMouseWheelListener=function(a,c){var d=8,e=function(a){a.wheelDelta!==undefined?a.wheelDeltaX!==undefined?(a.wheelX=-a.wheelDeltaX/d,a.wheelY=-a.wheelDeltaY/d):(a.wheelX=0,a.wheelY=-a.wheelDelta/d):a.axis&&a.axis==a.HORIZONTAL_AXIS?(a.wheelX=(a.detail||0)*5,a.wheelY=0):(a.wheelX=0,a.wheelY=(a.detail||0)*5),c(a)};b.addListener(a,"DOMMouseScroll",e),b.addListener(a,"mousewheel",e)},b.addMultiMouseDownListener=function(a,c,d,f,g){var h=0,i,j,k=function(a){h+=1,h==1&&(i=a.clientX,j=a.clientY,setTimeout(function(){h=0},f||600));var e=b.getButton(a)==c;if(!e||Math.abs(a.clientX-i)>5||Math.abs(a.clientY-j)>5)h=0;h==d&&(h=0,g(a));if(e)return b.preventDefault(a)};b.addListener(a,"mousedown",k),e.isOldIE&&b.addListener(a,"dblclick",k)},b.addCommandKeyListener=function(a,c){var d=b.addListener;if(e.isOldGecko||e.isOpera){var f=null;d(a,"keydown",function(a){f=a.keyCode}),d(a,"keypress",function(a){return g(c,a,f)})}else{var h=null;d(a,"keydown",function(a){return h=a.keyIdentifier||a.keyCode,g(c,a,a.keyCode)})}};if(window.postMessage){var h=1;b.nextTick=function(a,c){c=c||window;var d="zero-timeout-message-"+h;b.addListener(c,"message",function e(f){f.data==d&&(b.stopPropagation(f),b.removeListener(c,"message",e),a())}),c.postMessage(d,"*")}}else b.nextTick=function(a,b){b=b||window,window.setTimeout(a,0)}}),define("ace/lib/keys",["require","exports","module","ace/lib/oop"],function(a,b,c){"use strict";var d=a("./oop"),e=function(){var a={MODIFIER_KEYS:{16:"Shift",17:"Ctrl",18:"Alt",224:"Meta"},KEY_MODS:{ctrl:1,alt:2,option:2,shift:4,meta:8,command:8},FUNCTION_KEYS:{8:"Backspace",9:"Tab",13:"Return",19:"Pause",27:"Esc",32:"Space",33:"PageUp",34:"PageDown",35:"End",36:"Home",37:"Left",38:"Up",39:"Right",40:"Down",44:"Print",45:"Insert",46:"Delete",96:"Numpad0",97:"Numpad1",98:"Numpad2",99:"Numpad3",100:"Numpad4",101:"Numpad5",102:"Numpad6",103:"Numpad7",104:"Numpad8",105:"Numpad9",112:"F1",113:"F2",114:"F3",115:"F4",116:"F5",117:"F6",118:"F7",119:"F8",120:"F9",121:"F10",122:"F11",123:"F12",144:"Numlock",145:"Scrolllock"},PRINTABLE_KEYS:{32:" ",48:"0",49:"1",50:"2",51:"3",52:"4",53:"5",54:"6",55:"7",56:"8",57:"9",59:";",61:"=",65:"a",66:"b",67:"c",68:"d",69:"e",70:"f",71:"g",72:"h",73:"i",74:"j",75:"k",76:"l",77:"m",78:"n",79:"o",80:"p",81:"q",82:"r",83:"s",84:"t",85:"u",86:"v",87:"w",88:"x",89:"y",90:"z",107:"+",109:"-",110:".",188:",",190:".",191:"/",192:"`",219:"[",220:"\\",221:"]",222:'"'}};for(var b in a.FUNCTION_KEYS){var c=a.FUNCTION_KEYS[b].toUpperCase();a[c]=parseInt(b,10)}return d.mixin(a,a.MODIFIER_KEYS),d.mixin(a,a.PRINTABLE_KEYS),d.mixin(a,a.FUNCTION_KEYS),a}();d.mixin(b,e),b.keyCodeToString=function(a){return(e[a]||String.fromCharCode(a)).toLowerCase()}}),define("ace/lib/oop",["require","exports","module"],function(a,b,c){"use strict",b.inherits=function(){var a=function(){};return function(b,c){a.prototype=c.prototype,b.super_=c.prototype,b.prototype=new a,b.prototype.constructor=b}}(),b.mixin=function(a,b){for(var c in b)a[c]=b[c]},b.implement=function(a,c){b.mixin(a,c)}}),define("ace/lib/useragent",["require","exports","module"],function(a,b,c){"use strict";var d=(navigator.platform.match(/mac|win|linux/i)||["other"])[0].toLowerCase(),e=navigator.userAgent;b.isWin=d=="win",b.isMac=d=="mac",b.isLinux=d=="linux",b.isIE=navigator.appName=="Microsoft Internet Explorer"&&parseFloat(navigator.userAgent.match(/MSIE ([0-9]+[\.0-9]+)/)[1]),b.isOldIE=b.isIE&&b.isIE<9,b.isGecko=b.isMozilla=window.controllers&&window.navigator.product==="Gecko",b.isOldGecko=b.isGecko&&parseInt((navigator.userAgent.match(/rv\:(\d+)/)||[])[1],10)<4,b.isOpera=window.opera&&Object.prototype.toString.call(window.opera)=="[object Opera]",b.isWebKit=parseFloat(e.split("WebKit/")[1])||undefined,b.isChrome=parseFloat(e.split(" Chrome/")[1])||undefined,b.isAIR=e.indexOf("AdobeAIR")>=0,b.isIPad=e.indexOf("iPad")>=0,b.isTouchPad=e.indexOf("TouchPad")>=0,b.OS={LINUX:"LINUX",MAC:"MAC",WINDOWS:"WINDOWS"},b.getOS=function(){return b.isMac?b.OS.MAC:b.isLinux?b.OS.LINUX:b.OS.WINDOWS}}),define("ace/editor",["require","exports","module","ace/lib/fixoldbrowsers","ace/lib/oop","ace/lib/lang","ace/lib/useragent","ace/keyboard/textinput","ace/mouse/mouse_handler","ace/mouse/fold_handler","ace/keyboard/keybinding","ace/edit_session","ace/search","ace/range","ace/lib/event_emitter","ace/commands/command_manager","ace/commands/default_commands"],function(a,b,c){"use strict",a("./lib/fixoldbrowsers");var d=a("./lib/oop"),e=a("./lib/lang"),f=a("./lib/useragent"),g=a("./keyboard/textinput").TextInput,h=a("./mouse/mouse_handler").MouseHandler,i=a("./mouse/fold_handler").FoldHandler,j=a("./keyboard/keybinding").KeyBinding,k=a("./edit_session").EditSession,l=a("./search").Search,m=a("./range").Range,n=a("./lib/event_emitter").EventEmitter,o=a("./commands/command_manager").CommandManager,p=a("./commands/default_commands").commands,q=function(a,b){var c=a.getContainerElement();this.container=c,this.renderer=a,this.textInput=new g(a.getTextAreaContainer(),this),this.keyBinding=new j(this),f.isIPad||(this.$mouseHandler=new h(this),new i(this)),this.$blockScrolling=0,this.$search=(new l).set({wrap:!0}),this.commands=new o(f.isMac?"mac":"win",p),this.setSession(b||new k(""))};(function(){d.implement(this,n),this.setKeyboardHandler=function(a){this.keyBinding.setKeyboardHandler(a)},this.getKeyboardHandler=function(){return this.keyBinding.getKeyboardHandler()},this.setSession=function(a){if(this.session==a)return;if(this.session){var b=this.session;this.session.removeEventListener("change",this.$onDocumentChange),this.session.removeEventListener("changeMode",this.$onChangeMode),this.session.removeEventListener("tokenizerUpdate",this.$onTokenizerUpdate),this.session.removeEventListener("changeTabSize",this.$onChangeTabSize),this.session.removeEventListener("changeWrapLimit",this.$onChangeWrapLimit),this.session.removeEventListener("changeWrapMode",this.$onChangeWrapMode),this.session.removeEventListener("onChangeFold",this.$onChangeFold),this.session.removeEventListener("changeFrontMarker",this.$onChangeFrontMarker),this.session.removeEventListener("changeBackMarker",this.$onChangeBackMarker),this.session.removeEventListener("changeBreakpoint",this.$onChangeBreakpoint),this.session.removeEventListener("changeAnnotation",this.$onChangeAnnotation),this.session.removeEventListener("changeOverwrite",this.$onCursorChange),this.session.removeEventListener("changeScrollTop",this.$onScrollTopChange),this.session.removeEventListener("changeLeftTop",this.$onScrollLeftChange);var c=this.session.getSelection();c.removeEventListener("changeCursor",this.$onCursorChange),c.removeEventListener("changeSelection",this.$onSelectionChange)}this.session=a,this.$onDocumentChange=this.onDocumentChange.bind(this),a.addEventListener("change",this.$onDocumentChange),this.renderer.setSession(a),this.$onChangeMode=this.onChangeMode.bind(this),a.addEventListener("changeMode",this.$onChangeMode),this.$onTokenizerUpdate=this.onTokenizerUpdate.bind(this),a.addEventListener("tokenizerUpdate",this.$onTokenizerUpdate),this.$onChangeTabSize=this.renderer.updateText.bind(this.renderer),a.addEventListener("changeTabSize",this.$onChangeTabSize),this.$onChangeWrapLimit=this.onChangeWrapLimit.bind(this),a.addEventListener("changeWrapLimit",this.$onChangeWrapLimit),this.$onChangeWrapMode=this.onChangeWrapMode.bind(this),a.addEventListener("changeWrapMode",this.$onChangeWrapMode),this.$onChangeFold=this.onChangeFold.bind(this),a.addEventListener("changeFold",this.$onChangeFold),this.$onChangeFrontMarker=this.onChangeFrontMarker.bind(this),this.session.addEventListener("changeFrontMarker",this.$onChangeFrontMarker),this.$onChangeBackMarker=this.onChangeBackMarker.bind(this),this.session.addEventListener("changeBackMarker",this.$onChangeBackMarker),this.$onChangeBreakpoint=this.onChangeBreakpoint.bind(this),this.session.addEventListener("changeBreakpoint",this.$onChangeBreakpoint),this.$onChangeAnnotation=this.onChangeAnnotation.bind(this),this.session.addEventListener("changeAnnotation",this.$onChangeAnnotation),this.$onCursorChange=this.onCursorChange.bind(this),this.session.addEventListener("changeOverwrite",this.$onCursorChange),this.$onScrollTopChange=this.onScrollTopChange.bind(this),this.session.addEventListener("changeScrollTop",this.$onScrollTopChange),this.$onScrollLeftChange=this.onScrollLeftChange.bind(this),this.session.addEventListener("changeScrollLeft",this.$onScrollLeftChange),this.selection=a.getSelection(),this.selection.addEventListener("changeCursor",this.$onCursorChange),this.$onSelectionChange=this.onSelectionChange.bind(this),this.selection.addEventListener("changeSelection",this.$onSelectionChange),this.onChangeMode(),this.$blockScrolling+=1,this.onCursorChange(),this.$blockScrolling-=1,this.onScrollTopChange(),this.onScrollLeftChange(),this.onSelectionChange(),this.onChangeFrontMarker(),this.onChangeBackMarker(),this.onChangeBreakpoint(),this.onChangeAnnotation(),this.session.getUseWrapMode()&&this.renderer.adjustWrapLimit(),this.renderer.updateFull(),this._emit("changeSession",{session:a,oldSession:b})},this.getSession=function(){return this.session},this.getSelection=function(){return this.selection},this.resize=function(){this.renderer.onResize()},this.setTheme=function(a){this.renderer.setTheme(a)},this.getTheme=function(){return this.renderer.getTheme()},this.setStyle=function(a){this.renderer.setStyle(a)},this.unsetStyle=function(a){this.renderer.unsetStyle(a)},this.setFontSize=function(a){this.container.style.fontSize=a,this.renderer.updateFontSize()},this.$highlightBrackets=function(){this.session.$bracketHighlight&&(this.session.removeMarker(this.session.$bracketHighlight),this.session.$bracketHighlight=null);if(this.$highlightPending)return;var a=this;this.$highlightPending=!0,setTimeout(function(){a.$highlightPending=!1;var b=a.session.findMatchingBracket(a.getCursorPosition());if(b){var c=new m(b.row,b.column,b.row,b.column+1);a.session.$bracketHighlight=a.session.addMarker(c,"ace_bracket","text")}},10)},this.focus=function(){var a=this;setTimeout(function(){a.textInput.focus()}),this.textInput.focus()},this.isFocused=function(){return this.textInput.isFocused()},this.blur=function(){this.textInput.blur()},this.onFocus=function(){this.renderer.showCursor(),this.renderer.visualizeFocus(),this._emit("focus")},this.onBlur=function(){this.renderer.hideCursor(),this.renderer.visualizeBlur(),this._emit("blur")},this.onDocumentChange=function(a){var b=a.data,c=b.range,d;c.start.row==c.end.row&&b.action!="insertLines"&&b.action!="removeLines"?d=c.end.row:d=Infinity,this.renderer.updateLines(c.start.row,d),this._emit("change",a),this.onCursorChange()},this.onTokenizerUpdate=function(a){var b=a.data;this.renderer.updateLines(b.first,b.last)},this.onScrollTopChange=function(){this.renderer.scrollToY(this.session.getScrollTop())},this.onScrollLeftChange=function(){this.renderer.scrollToX(this.session.getScrollLeft())},this.onCursorChange=function(){this.renderer.updateCursor(),this.$blockScrolling||this.renderer.scrollCursorIntoView(),this.renderer.moveTextAreaToCursor(this.textInput.getElement()),this.$highlightBrackets(),this.$updateHighlightActiveLine()},this.$updateHighlightActiveLine=function(){var a=this.getSession();a.$highlightLineMarker&&a.removeMarker(a.$highlightLineMarker),typeof this.$lastrow=="number"&&this.renderer.removeGutterDecoration(this.$lastrow,"ace_gutter_active_line"),a.$highlightLineMarker=null,this.$lastrow=null;if(this.getHighlightActiveLine()){var b=this.getCursorPosition(),c=this.session.getFoldLine(b.row);if(this.getSelectionStyle()!="line"||!this.selection.isMultiLine()){var d;c?d=new m(c.start.row,0,c.end.row+1,0):d=new m(b.row,0,b.row+1,0),a.$highlightLineMarker=a.addMarker(d,"ace_active_line","background")}this.renderer.addGutterDecoration(this.$lastrow=b.row,"ace_gutter_active_line")}},this.onSelectionChange=function(a){var b=this.getSession();b.$selectionMarker&&b.removeMarker(b.$selectionMarker),b.$selectionMarker=null;if(!this.selection.isEmpty()){var c=this.selection.getRange(),d=this.getSelectionStyle();b.$selectionMarker=b.addMarker(c,"ace_selection",d)}else this.$updateHighlightActiveLine();this.$highlightSelectedWord&&this.session.getMode().highlightSelection(this)},this.onChangeFrontMarker=function(){this.renderer.updateFrontMarkers()},this.onChangeBackMarker=function(){this.renderer.updateBackMarkers()},this.onChangeBreakpoint=function(){this.renderer.setBreakpoints(this.session.getBreakpoints())},this.onChangeAnnotation=function(){this.renderer.setAnnotations(this.session.getAnnotations())},this.onChangeMode=function(){this.renderer.updateText()},this.onChangeWrapLimit=function(){this.renderer.updateFull()},this.onChangeWrapMode=function(){this.renderer.onResize(!0)},this.onChangeFold=function(){this.$updateHighlightActiveLine(),this.renderer.updateFull()},this.getCopyText=function(){var a="";return this.selection.isEmpty()||(a=this.session.getTextRange(this.getSelectionRange())),this._emit("copy",a),a},this.onCut=function(){this.commands.exec("cut",this)},this.insert=function(a){var b=this.session,c=b.getMode(),d=this.getCursorPosition();if(this.getBehavioursEnabled()){var e=c.transformAction(b.getState(d.row),"insertion",this,b,a);e&&(a=e.text)}a=a.replace("	",this.session.getTabString());if(!this.selection.isEmpty())d=this.session.remove(this.getSelectionRange()),this.clearSelection();else if(this.session.getOverwrite()){var f=new m.fromPoints(d,d);f.end.column+=a.length,this.session.remove(f)}this.clearSelection();var g=d.column,h=b.getState(d.row),i=c.checkOutdent(h,b.getLine(d.row),a),j=b.getLine(d.row),k=c.getNextLineIndent(h,j.slice(0,d.column),b.getTabString()),l=b.insert(d,a);e&&e.selection&&(e.selection.length==2?this.selection.setSelectionRange(new m(d.row,g+e.selection[0],d.row,g+e.selection[1])):this.selection.setSelectionRange(new m(d.row+e.selection[0],e.selection[1],d.row+e.selection[2],e.selection[3])));var h=b.getState(d.row);if(b.getDocument().isNewLine(a)){this.moveCursorTo(d.row+1,0);var n=b.getTabSize(),o=Number.MAX_VALUE;for(var p=d.row+1;p<=l.row;++p){var q=0;j=b.getLine(p);for(var r=0;r<j.length;++r)if(j.charAt(r)=="	")q+=n;else{if(j.charAt(r)!=" ")break;q+=1}/[^\s]/.test(j)&&(o=Math.min(q,o))}for(var p=d.row+1;p<=l.row;++p){var s=o;j=b.getLine(p);for(var r=0;r<j.length&&s>0;++r)j.charAt(r)=="	"?s-=n:j.charAt(r)==" "&&(s-=1);b.remove(new m(p,0,p,r))}b.indentRows(d.row+1,l.row,k)}i&&c.autoOutdent(h,b,d.row)},this.onTextInput=function(a,b){b&&this._emit("paste",a),this.keyBinding.onTextInput(a,b)},this.onCommandKey=function(a,b,c){this.keyBinding.onCommandKey(a,b,c)},this.setOverwrite=function(a){this.session.setOverwrite(a)},this.getOverwrite=function(){return this.session.getOverwrite()},this.toggleOverwrite=function(){this.session.toggleOverwrite()},this.setScrollSpeed=function(a){this.$mouseHandler.setScrollSpeed(a)},this.getScrollSpeed=function(){return this.$mouseHandler.getScrollSpeed()},this.setDragDelay=function(a){this.$mouseHandler.setDragDelay(a)},this.getDragDelay=function(){return this.$mouseHandler.getDragDelay()},this.$selectionStyle="line",this.setSelectionStyle=function(a){if(this.$selectionStyle==a)return;this.$selectionStyle=a,this.onSelectionChange(),this._emit("changeSelectionStyle",{data:a})},this.getSelectionStyle=function(){return this.$selectionStyle},this.$highlightActiveLine=!0,this.setHighlightActiveLine=function(a){if(this.$highlightActiveLine==a)return;this.$highlightActiveLine=a,this.$updateHighlightActiveLine()},this.getHighlightActiveLine=function(){return this.$highlightActiveLine},this.$highlightSelectedWord=!0,this.setHighlightSelectedWord=function(a){if(this.$highlightSelectedWord==a)return;this.$highlightSelectedWord=a,a?this.session.getMode().highlightSelection(this):this.session.getMode().clearSelectionHighlight(this)},this.getHighlightSelectedWord=function(){return this.$highlightSelectedWord},this.setAnimatedScroll=function(a){this.renderer.setAnimatedScroll(a)},this.getAnimatedScroll=function(){return this.renderer.getAnimatedScroll()},this.setShowInvisibles=function(a){if(this.getShowInvisibles()==a)return;this.renderer.setShowInvisibles(a)},this.getShowInvisibles=function(){return this.renderer.getShowInvisibles()},this.setShowPrintMargin=function(a){this.renderer.setShowPrintMargin(a)},this.getShowPrintMargin=function(){return this.renderer.getShowPrintMargin()},this.setPrintMarginColumn=function(a){this.renderer.setPrintMarginColumn(a)},this.getPrintMarginColumn=function(){return this.renderer.getPrintMarginColumn()},this.$readOnly=!1,this.setReadOnly=function(a){this.$readOnly=a},this.getReadOnly=function(){return this.$readOnly},this.$modeBehaviours=!0,this.setBehavioursEnabled=function(a){this.$modeBehaviours=a},this.getBehavioursEnabled=function(){return this.$modeBehaviours},this.setShowFoldWidgets=function(a){var b=this.renderer.$gutterLayer;if(b.getShowFoldWidgets()==a)return;this.renderer.$gutterLayer.setShowFoldWidgets(a),this.$showFoldWidgets=a,this.renderer.updateFull()},this.getShowFoldWidgets=function(){return this.renderer.$gutterLayer.getShowFoldWidgets()},this.remove=function(a){this.selection.isEmpty()&&(a=="left"?this.selection.selectLeft():this.selection.selectRight());var b=this.getSelectionRange();if(this.getBehavioursEnabled()){var c=this.session,d=c.getState(b.start.row),e=c.getMode().transformAction(d,"deletion",this,c,b);e&&(b=e)}this.session.remove(b),this.clearSelection()},this.removeWordRight=function(){this.selection.isEmpty()&&this.selection.selectWordRight(),this.session.remove(this.getSelectionRange()),this.clearSelection()},this.removeWordLeft=function(){this.selection.isEmpty()&&this.selection.selectWordLeft(),this.session.remove(this.getSelectionRange()),this.clearSelection()},this.removeToLineStart=function(){this.selection.isEmpty()&&this.selection.selectLineStart(),this.session.remove(this.getSelectionRange()),this.clearSelection()},this.removeToLineEnd=function(){this.selection.isEmpty()&&this.selection.selectLineEnd();var a=this.getSelectionRange();a.start.column==a.end.column&&a.start.row==a.end.row&&(a.end.column=0,a.end.row++),this.session.remove(a),this.clearSelection()},this.splitLine=function(){this.selection.isEmpty()||(this.session.remove(this.getSelectionRange()),this.clearSelection());var a=this.getCursorPosition();this.insert("\n"),this.moveCursorToPosition(a)},this.transposeLetters=function(){if(!this.selection.isEmpty())return;var a=this.getCursorPosition(),b=a.column;if(b===0)return;var c=this.session.getLine(a.row),d,e;b<c.length?(d=c.charAt(b)+c.charAt(b-1),e=new m(a.row,b-1,a.row,b+1)):(d=c.charAt(b-1)+c.charAt(b-2),e=new m(a.row,b-2,a.row,b)),this.session.replace(e,d)},this.toLowerCase=function(){var a=this.getSelectionRange();this.selection.isEmpty()&&this.selection.selectWord();var b=this.getSelectionRange(),c=this.session.getTextRange(b);this.session.replace(b,c.toLowerCase()),this.selection.setSelectionRange(a)},this.toUpperCase=function(){var a=this.getSelectionRange();this.selection.isEmpty()&&this.selection.selectWord();var b=this.getSelectionRange(),c=this.session.getTextRange(b);this.session.replace(b,c.toUpperCase()),this.selection.setSelectionRange(a)},this.indent=function(){var a=this.session,b=this.getSelectionRange();if(!(b.start.row<b.end.row||b.start.column<b.end.column)){var d;if(this.session.getUseSoftTabs()){var f=a.getTabSize(),g=this.getCursorPosition(),h=a.documentToScreenColumn(g.row,g.column),i=f-h%f;d=e.stringRepeat(" ",i)}else d="	";return this.insert(d)}var c=this.$getSelectedRows();a.indentRows(c.first,c.last,"	")},this.blockOutdent=function(){var a=this.session.getSelection();this.session.outdentRows(a.getRange())},this.toggleCommentLines=function(){var a=this.session.getState(this.getCursorPosition().row),b=this.$getSelectedRows();this.session.getMode().toggleCommentLines(a,this.session,b.first,b.last)},this.removeLines=function(){var a=this.$getSelectedRows(),b;a.first===0||a.last+1<this.session.getLength()?b=new m(a.first,0,a.last+1,0):b=new m(a.first-1,this.session.getLine(a.first-1).length,a.last,this.session.getLine(a.last).length),this.session.remove(b),this.clearSelection()},this.moveLinesDown=function(){this.$moveLines(function(a,b){return this.session.moveLinesDown(a,b)})},this.moveLinesUp=function(){this.$moveLines(function(a,b){return this.session.moveLinesUp(a,b)})},this.moveText=function(a,b){return this.$readOnly?null:this.session.moveText(a,b)},this.copyLinesUp=function(){this.$moveLines(function(a,b){return this.session.duplicateLines(a,b),0})},this.copyLinesDown=function(){this.$moveLines(function(a,b){return this.session.duplicateLines(a,b)})},this.$moveLines=function(a){var b=this.$getSelectedRows(),c=this.selection;if(!c.isMultiLine())var d=c.getRange(),e=c.isBackwards();var f=a.call(this,b.first,b.last);d?(d.start.row+=f,d.end.row+=f,c.setSelectionRange(d,e)):(c.setSelectionAnchor(b.last+f+1,0),c.$moveSelection(function(){c.moveCursorTo(b.first+f,0)}))},this.$getSelectedRows=function(){var a=this.getSelectionRange().collapseRows();return{first:a.start.row,last:a.end.row}},this.onCompositionStart=function(a){this.renderer.showComposition(this.getCursorPosition())},this.onCompositionUpdate=function(a){this.renderer.setCompositionText(a)},this.onCompositionEnd=function(){this.renderer.hideComposition()},this.getFirstVisibleRow=function(){return this.renderer.getFirstVisibleRow()},this.getLastVisibleRow=function(){return this.renderer.getLastVisibleRow()},this.isRowVisible=function(a){return a>=this.getFirstVisibleRow()&&a<=this.getLastVisibleRow()},this.isRowFullyVisible=function(a){return a>=this.renderer.getFirstFullyVisibleRow()&&a<=this.renderer.getLastFullyVisibleRow()},this.$getVisibleRowCount=function(){return this.renderer.getScrollBottomRow()-this.renderer.getScrollTopRow()+1},this.$getPageDownRow=function(){return this.renderer.getScrollBottomRow()},this.$getPageUpRow=function(){var a=this.renderer.getScrollTopRow(),b=this.renderer.getScrollBottomRow();return a-(b-a)},this.selectPageDown=function(){var a=this.$getPageDownRow()+Math.floor(this.$getVisibleRowCount()/2);this.scrollPageDown();var b=this.getSelection(),c=this.session.documentToScreenPosition(b.getSelectionLead()),d=this.session.screenToDocumentPosition(a,c.column);b.selectTo(d.row,d.column)},this.selectPageUp=function(){var a=this.renderer.getScrollTopRow()-this.renderer.getScrollBottomRow(),b=this.$getPageUpRow()+Math.round(a/2);this.scrollPageUp();var c=this.getSelection(),d=this.session.documentToScreenPosition(c.getSelectionLead()),e=this.session.screenToDocumentPosition(b,d.column);c.selectTo(e.row,e.column)},this.gotoPageDown=function(){var a=this.$getPageDownRow(),b=this.getCursorPositionScreen().column;this.scrollToRow(a),this.getSelection().moveCursorToScreen(a,b)},this.gotoPageUp=function(){var a=this.$getPageUpRow(),b=this.getCursorPositionScreen().column;this.scrollToRow(a),this.getSelection().moveCursorToScreen(a,b)},this.scrollPageDown=function(){this.scrollToRow(this.$getPageDownRow())},this.scrollPageUp=function(){this.renderer.scrollToRow(this.$getPageUpRow())},this.scrollToRow=function(a){this.renderer.scrollToRow(a)},this.scrollToLine=function(a,b){this.renderer.scrollToLine(a,b)},this.centerSelection=function(){var a=this.getSelectionRange(),b=Math.floor(a.start.row+(a.end.row-a.start.row)/2);this.renderer.scrollToLine(b,!0)},this.getCursorPosition=function(){return this.selection.getCursor()},this.getCursorPositionScreen=function(){return this.session.documentToScreenPosition(this.getCursorPosition())},this.getSelectionRange=function(){return this.selection.getRange()},this.selectAll=function(){this.$blockScrolling+=1,this.selection.selectAll(),this.$blockScrolling-=1},this.clearSelection=function(){this.selection.clearSelection()},this.moveCursorTo=function(a,b){this.selection.moveCursorTo(a,b)},this.moveCursorToPosition=function(a){this.selection.moveCursorToPosition(a)},this.jumpToMatching=function(){var a=this.getCursorPosition(),b=this.session.findMatchingBracket(a);b||(a.column+=1,b=this.session.findMatchingBracket(a)),b||(a.column-=2,b=this.session.findMatchingBracket(a)),b&&(this.clearSelection(),this.moveCursorTo(b.row,b.column))},this.gotoLine=function(a,b){this.selection.clearSelection(),this.session.unfold({row:a-1,column:b||0}),this.$blockScrolling+=1,this.moveCursorTo(a-1,b||0),this.$blockScrolling-=1,this.isRowFullyVisible(this.getCursorPosition().row)||this.scrollToLine(a,!0)},this.navigateTo=function(a,b){this.clearSelection(),this.moveCursorTo(a,b)},this.navigateUp=function(a){this.selection.clearSelection(),a=a||1,this.selection.moveCursorBy(-a,0)},this.navigateDown=function(a){this.selection.clearSelection(),a=a||1,this.selection.moveCursorBy(a,0)},this.navigateLeft=function(a){if(!this.selection.isEmpty()){var b=this.getSelectionRange().start;this.moveCursorToPosition(b)}else{a=a||1;while(a--)this.selection.moveCursorLeft()}this.clearSelection()},this.navigateRight=function(a){if(!this.selection.isEmpty()){var b=this.getSelectionRange().end;this.moveCursorToPosition(b)}else{a=a||1;while(a--)this.selection.moveCursorRight()}this.clearSelection()},this.navigateLineStart=function(){this.selection.moveCursorLineStart(),this.clearSelection()},this.navigateLineEnd=function(){this.selection.moveCursorLineEnd(),this.clearSelection()},this.navigateFileEnd=function(){this.selection.moveCursorFileEnd(),this.clearSelection()},this.navigateFileStart=function(){this.selection.moveCursorFileStart(),this.clearSelection()},this.navigateWordRight=function(){this.selection.moveCursorWordRight(),this.clearSelection()},this.navigateWordLeft=function(){this.selection.moveCursorWordLeft(),this.clearSelection()},this.replace=function(a,b){b&&this.$search.set(b);var c=this.$search.find(this.session),d=0;return c?(this.$tryReplace(c,a)&&(d=1),c!==null&&(this.selection.setSelectionRange(c),this.renderer.scrollSelectionIntoView(c.start,c.end)),d):d},this.replaceAll=function(a,b){b&&this.$search.set(b);var c=this.$search.findAll(this.session),d=0;if(!c.length)return d;var e=this.getSelectionRange();this.clearSelection(),this.selection.moveCursorTo(0,0),this.$blockScrolling+=1;for(var f=c.length-1;f>=0;--f)this.$tryReplace(c[f],a)&&d++;return this.selection.setSelectionRange(e),this.$blockScrolling-=1,d},this.$tryReplace=function(a,b){var c=this.session.getTextRange(a);return b=this.$search.replace(c,b),b!==null?(a.end=this.session.replace(a,b),a):null},this.getLastSearchOptions=function(){return this.$search.getOptions()},this.find=function(a,b){this.clearSelection(),b=b||{},b.needle=a,this.$search.set(b),this.$find()},this.findNext=function(a){a=a||{},typeof a.backwards=="undefined"&&(a.backwards=!1),this.$search.set(a),this.$find()},this.findPrevious=function(a){a=a||{},typeof a.backwards=="undefined"&&(a.backwards=!0),this.$search.set(a),this.$find()},this.$find=function(a){this.selection.isEmpty()||this.$search.set({needle:this.session.getTextRange(this.getSelectionRange())}),typeof a!="undefined"&&this.$search.set({backwards:a});var b=this.$search.find(this.session);if(b){this.session.unfold(b),this.$blockScrolling+=1,this.selection.setSelectionRange(b),this.$blockScrolling-=1;if(this.getAnimatedScroll()){var c=this.getCursorPosition();this.isRowFullyVisible(c.row)||this.scrollToLine(c.row,!0)}else this.renderer.scrollSelectionIntoView(b.start,b.end)}},this.undo=function(){this.session.getUndoManager().undo()},this.redo=function(){this.session.getUndoManager().redo()},this.destroy=function(){this.renderer.destroy()}}).call(q.prototype),b.Editor=q}),define("ace/lib/lang",["require","exports","module"],function(a,b,c){"use strict",b.stringReverse=function(a){return a.split("").reverse().join("")},b.stringRepeat=function(a,b){return(new Array(b+1)).join(a)};var d=/^\s\s*/,e=/\s\s*$/;b.stringTrimLeft=function(a){return a.replace(d,"")},b.stringTrimRight=function(a){return a.replace(e,"")},b.copyObject=function(a){var b={};for(var c in a)b[c]=a[c];return b},b.copyArray=function(a){var b=[];for(var c=0,d=a.length;c<d;c++)a[c]&&typeof a[c]=="object"?b[c]=this.copyObject(a[c]):b[c]=a[c];return b},b.deepCopy=function(a){if(typeof a!="object")return a;var b=a.constructor();for(var c in a)typeof a[c]=="object"?b[c]=this.deepCopy(a[c]):b[c]=a[c];return b},b.arrayToMap=function(a){var b={};for(var c=0;c<a.length;c++)b[a[c]]=1;return b},b.arrayRemove=function(a,b){for(var c=0;c<=a.length;c++)b===a[c]&&a.splice(c,1)},b.escapeRegExp=function(a){return a.replace(/([.*+?^${}()|[\]\/\\])/g,"\\$1")},b.deferredCall=function(a){var b=null,c=function(){b=null,a()},d=function(a){return d.cancel(),b=setTimeout(c,a||0),d};return d.schedule=d,d.call=function(){return this.cancel(),a(),d},d.cancel=function(){return clearTimeout(b),b=null,d},d}}),define("ace/keyboard/textinput",["require","exports","module","ace/lib/event","ace/lib/useragent","ace/lib/dom"],function(a,b,c){"use strict";var d=a("../lib/event"),e=a("../lib/useragent"),f=a("../lib/dom"),g=function(a,b){function l(){try{c.select()}catch(a){}}function m(a){if(!i){var d=a||c.value;if(d){d.charCodeAt(d.length-1)==g.charCodeAt(0)?(d=d.slice(0,-1),d&&b.onTextInput(d,j)):b.onTextInput(d,j);if(!v())return!1}}i=!1,j=!1,c.value=g,l()}function v(){return document.activeElement===c}var c=f.createElement("textarea");e.isTouchPad&&c.setAttribute("x-palm-disable-auto-cap",!0),c.style.left="-10000px",c.style.position="fixed",a.insertBefore(c,a.firstChild);var g=String.fromCharCode(0);m();var h=!1,i=!1,j=!1,k="",n=function(a){setTimeout(function(){h||m(a.data)},0)},o=function(a){if(e.isOldIE&&c.value.charCodeAt(0)>128)return;setTimeout(function(){h||m()},0)},p=function(a){h=!0,b.onCompositionStart(),e.isGecko||setTimeout(q,0)},q=function(){if(!h)return;b.onCompositionUpdate(c.value)},r=function(a){h=!1,b.onCompositionEnd()},s=function(a){i=!0;var d=b.getCopyText();d?c.value=d:a.preventDefault(),l(),setTimeout(function(){m()},0)},t=function(a){i=!0;var d=b.getCopyText();d?(c.value=d,b.onCut()):a.preventDefault(),l(),setTimeout(function(){m()},0)};d.addCommandKeyListener(c,b.onCommandKey.bind(b));if(e.isOldIE){var u={13:1,27:1};d.addListener(c,"keyup",function(a){h&&(!c.value||u[a.keyCode])&&setTimeout(r,0);if((c.value.charCodeAt(0)|0)<129)return;h?q():p()})}"onpropertychange"in c&&!("oninput"in c)?d.addListener(c,"propertychange",o):d.addListener(c,"input",n),d.addListener(c,"paste",function(a){j=!0,a.clipboardData&&a.clipboardData.getData?(m(a.clipboardData.getData("text/plain")),a.preventDefault()):o()}),"onbeforecopy"in c&&typeof clipboardData!="undefined"?(d.addListener(c,"beforecopy",function(a){var c=b.getCopyText();c?clipboardData.setData("Text",c):a.preventDefault()}),d.addListener(a,"keydown",function(a){if(a.ctrlKey&&a.keyCode==88){var c=b.getCopyText();c&&(clipboardData.setData("Text",c),b.onCut()),d.preventDefault(a)}})):(d.addListener(c,"copy",s),d.addListener(c,"cut",t)),d.addListener(c,"compositionstart",p),e.isGecko&&d.addListener(c,"text",q),e.isWebKit&&d.addListener(c,"keyup",q),d.addListener(c,"compositionend",r),d.addListener(c,"blur",function(){b.onBlur()}),d.addListener(c,"focus",function(){b.onFocus(),l()}),this.focus=function(){b.onFocus(),l(),c.focus()},this.blur=function(){c.blur()},this.isFocused=v,this.getElement=function(){return c},this.onContextMenu=function(a,b){a&&(k||(k=c.style.cssText),c.style.cssText="position:fixed; z-index:1000;left:"+(a.x-2)+"px; top:"+(a.y-2)+"px;"),b&&(c.value="")},this.onContextMenuClose=function(){setTimeout(function(){k&&(c.style.cssText=k,k=""),m()},0)}};b.TextInput=g}),define("ace/mouse/mouse_handler",["require","exports","module","ace/lib/event","ace/mouse/default_handlers","ace/mouse/default_gutter_handler","ace/mouse/mouse_event"],function(a,b,c){"use strict";var d=a("../lib/event"),e=a("./default_handlers").DefaultHandlers,f=a("./default_gutter_handler").GutterHandler,g=a("./mouse_event").MouseEvent,h=function(a){this.editor=a,new e(a),new f(a),d.addListener(a.container,"mousedown",function(b){return a.focus(),d.preventDefault(b)}),d.addListener(a.container,"selectstart",function(a){return d.preventDefault(a)});var b=a.renderer.getMouseEventTarget();d.addListener(b,"mousedown",this.onMouseEvent.bind(this,"mousedown")),d.addListener(b,"click",this.onMouseEvent.bind(this,"click")),d.addListener(b,"mousemove",this.onMouseMove.bind(this,"mousemove")),d.addMultiMouseDownListener(b,0,2,500,this.onMouseEvent.bind(this,"dblclick")),d.addMultiMouseDownListener(b,0,3,600,this.onMouseEvent.bind(this,"tripleclick")),d.addMultiMouseDownListener(b,0,4,600,this.onMouseEvent.bind(this,"quadclick")),d.addMouseWheelListener(a.container,this.onMouseWheel.bind(this,"mousewheel"));var c=a.renderer.$gutter;d.addListener(c,"mousedown",this.onMouseEvent.bind(this,"guttermousedown")),d.addListener(c,"click",this.onMouseEvent.bind(this,"gutterclick")),d.addListener(c,"dblclick",this.onMouseEvent.bind(this,"gutterdblclick")),d.addListener(c,"mousemove",this.onMouseMove.bind(this,"gutter"))};(function(){this.$scrollSpeed=1,this.setScrollSpeed=function(a){this.$scrollSpeed=a},this.getScrollSpeed=function(){return this.$scrollSpeed},this.onMouseEvent=function(a,b){this.editor._emit(a,new g(b,this.editor))},this.$dragDelay=250,this.setDragDelay=function(a){this.$dragDelay=a},this.getDragDelay=function(){return this.$dragDelay},this.onMouseMove=function(a,b){var c=this.editor._eventRegistry&&this.editor._eventRegistry.mousemove;if(!c||!c.length)return;this.editor._emit(a,new g(b,this.editor))},this.onMouseWheel=function(a,b){var c=new g(b,this.editor);c.speed=this.$scrollSpeed*2,c.wheelX=b.wheelX,c.wheelY=b.wheelY,this.editor._emit(a,c)}}).call(h.prototype),b.MouseHandler=h}),define("ace/mouse/default_handlers",["require","exports","module","ace/lib/event","ace/lib/dom","ace/lib/browser_focus"],function(a,b,c){function k(a){this.editor=a,this.$clickSelection=null,this.browserFocus=new f,a.setDefaultHandler("mousedown",this.onMouseDown.bind(this)),a.setDefaultHandler("dblclick",this.onDoubleClick.bind(this)),a.setDefaultHandler("tripleclick",this.onTripleClick.bind(this)),a.setDefaultHandler("quadclick",this.onQuadClick.bind(this)),a.setDefaultHandler("mousewheel",this.onScroll.bind(this))}function l(a,b,c,d){return Math.sqrt(Math.pow(c-a,2)+Math.pow(d-b,2))}"use strict";var d=a("../lib/event"),e=a("../lib/dom"),f=a("../lib/browser_focus").BrowserFocus,g=0,h=1,i=2,j=5;(function(){this.onMouseDown=function(a){function C(b){a.getShiftKey()?m.selection.selectToPosition(b):n.$clickSelection||(m.moveCursorToPosition(b),m.selection.clearSelection()),q=h}var b=a.inSelection(),c=a.pageX,f=a.pageY,k=a.getDocumentPosition(),m=this.editor,n=this,o=m.getSelectionRange(),p=o.isEmpty(),q=g;if(b&&(!this.browserFocus.isFocused()||(new Date).getTime()-this.browserFocus.lastFocus<20||!m.isFocused())){m.focus();return}var r=a.getButton();if(r!==0){p&&m.moveCursorToPosition(k),r==2&&(m.textInput.onContextMenu({x:a.clientX,y:a.clientY},p),d.capture(m.container,function(){},m.textInput.onContextMenuClose));return}b||C(k);var s=c,t=f,u=(new Date).getTime(),v,w,x,y=function(a){s=d.getDocumentX(a),t=d.getDocumentY(a)},z=function(a){clearInterval(F),q==g?C(k):q==i&&A(a),n.$clickSelection=null,q=g},A=function(a){e.removeCssClass(m.container,"ace_dragging"),m.session.removeMarker(x),m.$mouseHandler.$clickSelection||v||(m.moveCursorToPosition(k),m.selection.clearSelection());if(!v)return;if(w.contains(v.row,v.column)){v=null;return}m.clearSelection();if(a&&(a.ctrlKey||a.altKey))var b=m.session,c=b.insert(v,b.getTextRange(w));else var c=m.moveText(w,v);if(!c){v=null;return}m.selection.setSelectionRange(c)},B=function(){if(q==g){var a=l(c,f,s,t),b=(new Date).getTime();if(a>j){q=h;var d=m.renderer.screenToTextCoordinates(s,t);C(d)}else if(b-u>m.getDragDelay()){q=i,w=m.getSelectionRange();var k=m.getSelectionStyle();x=m.session.addMarker(w,"ace_selection",k),m.clearSelection(),e.addCssClass(m.container,"ace_dragging")}}q==i?E():q==h&&D()},D=function(){var a,b=m.renderer.screenToTextCoordinates(s,t);n.$clickSelection?n.$clickSelection.contains(b.row,b.column)?m.selection.setSelectionRange(n.$clickSelection):(n.$clickSelection.compare(b.row,b.column)==-1?a=n.$clickSelection.end:a=n.$clickSelection.start,m.selection.setSelectionAnchor(a.row,a.column),m.selection.selectToPosition(b)):m.selection.selectToPosition(b),m.renderer.scrollCursorIntoView()},E=function(){v=m.renderer.screenToTextCoordinates(s,t),m.moveCursorToPosition(v)};d.capture(m.container,y,z);var F=setInterval(B,20);return a.preventDefault()},this.onDoubleClick=function(a){var b=a.getDocumentPosition(),c=this.editor;c.moveCursorToPosition(b),c.selection.selectWord(),this.$clickSelection=c.getSelectionRange()},this.onTripleClick=function(a){var b=a.getDocumentPosition(),c=this.editor;c.moveCursorToPosition(b),c.selection.selectLine(),this.$clickSelection=c.getSelectionRange()},this.onQuadClick=function(a){var b=this.editor;b.selectAll(),this.$clickSelection=b.getSelectionRange()},this.onScroll=function(a){var b=this.editor;b.renderer.scrollBy(a.wheelX*a.speed,a.wheelY*a.speed);if(b.renderer.isScrollableBy(a.wheelX*a.speed,a.wheelY*a.speed))return a.preventDefault()}}).call(k.prototype),b.DefaultHandlers=k}),define("ace/lib/browser_focus",["require","exports","module","ace/lib/oop","ace/lib/event","ace/lib/event_emitter"],function(a,b,c){"use strict";var d=a("./oop"),e=a("./event"),f=a("./event_emitter").EventEmitter,g=function(a){a=a||window,this.lastFocus=(new Date).getTime(),this._isFocused=!0;var b=this;"onfocusin"in a.document?(e.addListener(a.document,"focusin",function(a){b._setFocused(!0)}),e.addListener(a.document,"focusout",function(a){b._setFocused(!!a.toElement)})):(e.addListener(a,"blur",function(a){b._setFocused(!1)}),e.addListener(a,"focus",function(a){b._setFocused(!0)}))};(function(){d.implement(this,f),this.isFocused=function(){return this._isFocused},this._setFocused=function(a){if(this._isFocused==a)return;a&&(this.lastFocus=(new Date).getTime()),this._isFocused=a,this._emit("changeFocus")}}).call(g.prototype),b.BrowserFocus=g}),define("ace/lib/event_emitter",["require","exports","module"],function(a,b,c){"use strict";var d={};d._emit=d._dispatchEvent=function(a,b){this._eventRegistry=this._eventRegistry||{},this._defaultHandlers=this._defaultHandlers||{};var c=this._eventRegistry[a]||[],d=this._defaultHandlers[a];if(!c.length&&!d)return;b=b||{},b.type=a,b.stopPropagation||(b.stopPropagation=function(){this.propagationStopped=!0}),b.preventDefault||(b.preventDefault=function(){this.defaultPrevented=!0});for(var e=0;e<c.length;e++){c[e](b);if(b.propagationStopped)break}d&&!b.defaultPrevented&&d(b)},d.setDefaultHandler=function(a,b){this._defaultHandlers=this._defaultHandlers||{};if(this._defaultHandlers[a])throw new Error("The default handler for '"+a+"' is already set");this._defaultHandlers[a]=b},d.on=d.addEventListener=function(a,b){this._eventRegistry=this._eventRegistry||{};var c=this._eventRegistry[a];if(!c)var c=this._eventRegistry[a]=[];c.indexOf(b)==-1&&c.push(b)},d.removeListener=d.removeEventListener=function(a,b){this._eventRegistry=this._eventRegistry||{};var c=this._eventRegistry[a];if(!c)return;var d=c.indexOf(b);d!==-1&&c.splice(d,1)},d.removeAllListeners=function(a){this._eventRegistry&&(this._eventRegistry[a]=[])},b.EventEmitter=d}),define("ace/mouse/default_gutter_handler",["require","exports","module"],function(a,b,c){function d(a){a.setDefaultHandler("gutterclick",function(b){var c=b.getDocumentPosition().row,d=a.session.selection;d.moveCursorTo(c,0),d.selectLine()})}"use strict",b.GutterHandler=d}),define("ace/mouse/mouse_event",["require","exports","module","ace/lib/event"],function(a,b,c){"use strict";var d=a("../lib/event"),e=b.MouseEvent=function(a,b){this.domEvent=a,this.editor=b,this.pageX=d.getDocumentX(a),this.pageY=d.getDocumentY(a),this.clientX=a.clientX,this.clientY=a.clientY,this.$pos=null,this.$inSelection=null,this.propagationStopped=!1,this.defaultPrevented=!1};(function(){this.stopPropagation=function(){d.stopPropagation(this.domEvent),this.propagationStopped=!0},this.preventDefault=function(){d.preventDefault(this.domEvent),this.defaultPrevented=!0},this.stop=function(){this.stopPropagation(),this.preventDefault()},this.getDocumentPosition=function(){if(this.$pos)return this.$pos;var a=d.getDocumentX(this.domEvent),b=d.getDocumentY(this.domEvent);return this.$pos=this.editor.renderer.screenToTextCoordinates(a,b),this.$pos},this.inSelection=function(){if(this.$inSelection!==null)return this.$inSelection;var a=this.editor;if(a.getReadOnly())this.$inSelection=!1;else{var b=a.getSelectionRange();if(b.isEmpty())this.$inSelection=!1;else{var c=this.getDocumentPosition();this.$inSelection=b.contains(c.row,c.column)}}return this.$inSelection},this.getButton=function(){return d.getButton(this.domEvent)},this.getShiftKey=function(){return this.domEvent.shiftKey},this.getAccelKey=function(){return this.domEvent.ctrlKey||this.domEvent.metaKey}}).call(e.prototype)}),define("ace/mouse/fold_handler",["require","exports","module"],function(a,b,c){function d(a){a.on("click",function(b){var c=b.getDocumentPosition(),d=a.session,e=d.getFoldAt(c.row,c.column,1);e&&(b.getAccelKey()?d.removeFold(e):d.expandFold(e),b.stop())}),a.on("gutterclick",function(b){if(b.domEvent.target.className.indexOf("ace_fold-widget")!=-1){var c=b.getDocumentPosition().row;a.session.onFoldWidgetClick(c,b.domEvent),b.stop()}})}"use strict",b.FoldHandler=d}),define("ace/keyboard/keybinding",["require","exports","module","ace/lib/keys","ace/lib/event","ace/commands/default_commands"],function(a,b,c){"use strict";var d=a("../lib/keys"),e=a("../lib/event");a("../commands/default_commands");var f=function(a){this.$editor=a,this.$data={},this.$handlers=[this]};(function(){this.setKeyboardHandler=function(a){if(this.$handlers[this.$handlers.length-1]==a)return;this.$data={},this.$handlers=a?[this,a]:[this]},this.addKeyboardHandler=function(a){this.removeKeyboardHandler(a),this.$handlers.push(a)},this.removeKeyboardHandler=function(a){var b=this.$handlers.indexOf(a);return b==-1?!1:(this.$handlers.splice(b,1),!0)},this.getKeyboardHandler=function(){return this.$handlers[this.$handlers.length-1]},this.$callKeyboardHandlers=function(a,b,c,d){var f;for(var g=this.$handlers.length;g--;){f=this.$handlers[g].handleKeyboard(this.$data,a,b,c,d);if(f&&f.command)break}if(!f||!f.command)return!1;var h=!1,i=this.$editor.commands;return f.command!="null"?h=i.exec(f.command,this.$editor,f.args):h=!0,h&&d&&e.stopEvent(d),h},this.handleKeyboard=function(a,b,c){return{command:this.$editor.commands.findKeyCommand(b,c)}},this.onCommandKey=function(a,b,c){var e=d.keyCodeToString(c);this.$callKeyboardHandlers(b,e,c,a)},this.onTextInput=function(a,b){var c=!1;!b&&a.length==1&&(c=this.$callKeyboardHandlers(0,a)),c||this.$editor.commands.exec("insertstring",this.$editor,a)}}).call(f.prototype),b.KeyBinding=f}),define("ace/commands/default_commands",["require","exports","module","ace/lib/lang"],function(a,b,c){function e(a,b){return{win:a,mac:b}}"use strict";var d=a("../lib/lang");b.commands=[{name:"selectall",bindKey:e("Ctrl-A","Command-A"),exec:function(a){a.selectAll()},readOnly:!0},{name:"centerselection",bindKey:e(null,"Ctrl-L"),exec:function(a){a.centerSelection()},readOnly:!0},{name:"gotoline",bindKey:e("Ctrl-L","Command-L"),exec:function(a){var b=parseInt(prompt("Enter line number:"),10);isNaN(b)||a.gotoLine(b)},readOnly:!0},{name:"fold",bindKey:e("Alt-L","Alt-L"),exec:function(a){a.session.toggleFold(!1)},readOnly:!0},{name:"unfold",bindKey:e("Alt-Shift-L","Alt-Shift-L"),exec:function(a){a.session.toggleFold(!0)},readOnly:!0},{name:"foldall",bindKey:e("Alt-0","Alt-0"),exec:function(a){a.session.foldAll()},readOnly:!0},{name:"unfoldall",bindKey:e("Alt-Shift-0","Alt-Shift-0"),exec:function(a){a.session.unfold()},readOnly:!0},{name:"findnext",bindKey:e("Ctrl-K","Command-G"),exec:function(a){a.findNext()},readOnly:!0},{name:"findprevious",bindKey:e("Ctrl-Shift-K","Command-Shift-G"),exec:function(a){a.findPrevious()},readOnly:!0},{name:"find",bindKey:e("Ctrl-F","Command-F"),exec:function(a){var b=prompt("Find:",a.getCopyText());a.find(b)},readOnly:!0},{name:"overwrite",bindKey:e("Insert","Insert"),exec:function(a){a.toggleOverwrite()},readOnly:!0},{name:"selecttostart",bindKey:e("Ctrl-Shift-Home|Alt-Shift-Up","Command-Shift-Up"),exec:function(a){a.getSelection().selectFileStart()},readOnly:!0},{name:"gotostart",bindKey:e("Ctrl-Home|Ctrl-Up","Command-Home|Command-Up"),exec:function(a){a.navigateFileStart()},readOnly:!0},{name:"selectup",bindKey:e("Shift-Up","Shift-Up"),exec:function(a){a.getSelection().selectUp()},multiSelectAction:"forEach",readOnly:!0},{name:"golineup",bindKey:e("Up","Up|Ctrl-P"),exec:function(a,b){a.navigateUp(b.times)},multiSelectAction:"forEach",readOnly:!0},{name:"selecttoend",bindKey:e("Ctrl-Shift-End|Alt-Shift-Down","Command-Shift-Down"),exec:function(a){a.getSelection().selectFileEnd()},multiSelectAction:"forEach",readOnly:!0},{name:"gotoend",bindKey:e("Ctrl-End|Ctrl-Down","Command-End|Command-Down"),exec:function(a){a.navigateFileEnd()},multiSelectAction:"forEach",readOnly:!0},{name:"selectdown",bindKey:e("Shift-Down","Shift-Down"),exec:function(a){a.getSelection().selectDown()},multiSelectAction:"forEach",readOnly:!0},{name:"golinedown",bindKey:e("Down","Down|Ctrl-N"),exec:function(a,b){a.navigateDown(b.times)},multiSelectAction:"forEach",readOnly:!0},{name:"selectwordleft",bindKey:e("Ctrl-Shift-Left","Option-Shift-Left"),exec:function(a){a.getSelection().selectWordLeft()},multiSelectAction:"forEach",readOnly:!0},{name:"gotowordleft",bindKey:e("Ctrl-Left","Option-Left"),exec:function(a){a.navigateWordLeft()},multiSelectAction:"forEach",readOnly:!0},{name:"selecttolinestart",bindKey:e("Alt-Shift-Left","Command-Shift-Left"),exec:function(a){a.getSelection().selectLineStart()},multiSelectAction:"forEach",readOnly:!0},{name:"gotolinestart",bindKey:e("Alt-Left|Home","Command-Left|Home|Ctrl-A"),exec:function(a){a.navigateLineStart()},multiSelectAction:"forEach",readOnly:!0},{name:"selectleft",bindKey:e("Shift-Left","Shift-Left"),exec:function(a){a.getSelection().selectLeft()},multiSelectAction:"forEach",readOnly:!0},{name:"gotoleft",bindKey:e("Left","Left|Ctrl-B"),exec:function(a,b){a.navigateLeft(b.times)},multiSelectAction:"forEach",readOnly:!0},{name:"selectwordright",bindKey:e("Ctrl-Shift-Right","Option-Shift-Right"),exec:function(a){a.getSelection().selectWordRight()},multiSelectAction:"forEach",readOnly:!0},{name:"gotowordright",bindKey:e("Ctrl-Right","Option-Right"),exec:function(a){a.navigateWordRight()},multiSelectAction:"forEach",readOnly:!0},{name:"selecttolineend",bindKey:e("Alt-Shift-Right","Command-Shift-Right"),exec:function(a){a.getSelection().selectLineEnd()},multiSelectAction:"forEach",readOnly:!0},{name:"gotolineend",bindKey:e("Alt-Right|End","Command-Right|End|Ctrl-E"),exec:function(a){a.navigateLineEnd()},multiSelectAction:"forEach",readOnly:!0},{name:"selectright",bindKey:e("Shift-Right","Shift-Right"),exec:function(a){a.getSelection().selectRight()},multiSelectAction:"forEach",readOnly:!0},{name:"gotoright",bindKey:e("Right","Right|Ctrl-F"),exec:function(a,b){a.navigateRight(b.times)},multiSelectAction:"forEach",readOnly:!0},{name:"selectpagedown",bindKey:e("Shift-PageDown","Shift-PageDown"),exec:function(a){a.selectPageDown()},readOnly:!0},{name:"pagedown",bindKey:e(null,"PageDown"),exec:function(a){a.scrollPageDown()},readOnly:!0},{name:"gotopagedown",bindKey:e("PageDown","Option-PageDown|Ctrl-V"),exec:function(a){a.gotoPageDown()},readOnly:!0},{name:"selectpageup",bindKey:e("Shift-PageUp","Shift-PageUp"),exec:function(a){a.selectPageUp()},readOnly:!0},{name:"pageup",bindKey:e(null,"PageUp"),exec:function(a){a.scrollPageUp()},readOnly:!0},{name:"gotopageup",bindKey:e("PageUp","Option-PageUp"),exec:function(a){a.gotoPageUp()},readOnly:!0},{name:"selectlinestart",bindKey:e("Shift-Home","Shift-Home"),exec:function(a){a.getSelection().selectLineStart()},multiSelectAction:"forEach",readOnly:!0},{name:"selectlineend",bindKey:e("Shift-End","Shift-End"),exec:function(a){a.getSelection().selectLineEnd()},multiSelectAction:"forEach",readOnly:!0},{name:"togglerecording",bindKey:e("Ctrl-Alt-E","Command-Option-E"),exec:function(a){a.commands.toggleRecording()},readOnly:!0},{name:"replaymacro",bindKey:e("Ctrl-Shift-E","Command-Shift-E"),exec:function(a){a.commands.replay(a)},readOnly:!0},{name:"jumptomatching",bindKey:e("Ctrl-Shift-P","Ctrl-Shift-P"),exec:function(a){a.jumpToMatching()},multiSelectAction:"forEach",readOnly:!0},{name:"cut",exec:function(a){var b=a.getSelectionRange();a._emit("cut",b),a.selection.isEmpty()||(a.session.remove(b),a.clearSelection())},multiSelectAction:"forEach"},{name:"removeline",bindKey:e("Ctrl-D","Command-D"),exec:function(a){a.removeLines()},multiSelectAction:"forEach"},{name:"togglecomment",bindKey:e("Ctrl-7","Command-7"),exec:function(a){a.toggleCommentLines()},multiSelectAction:"forEach"},{name:"replace",bindKey:e("Ctrl-R","Command-Option-F"),exec:function(a){var b=prompt("Find:",a.getCopyText());if(!b)return;var c=prompt("Replacement:");if(!c)return;a.replace(c,{needle:b})}},{name:"replaceall",bindKey:e("Ctrl-Shift-R","Command-Shift-Option-F"),exec:function(a){var b=prompt("Find:");if(!b)return;var c=prompt("Replacement:");if(!c)return;a.replaceAll(c,{needle:b})}},{name:"undo",bindKey:e("Ctrl-Z","Command-Z"),exec:function(a){a.undo()}},{name:"redo",bindKey:e("Ctrl-Shift-Z|Ctrl-Y","Command-Shift-Z|Command-Y"),exec:function(a){a.redo()}},{name:"copylinesup",bindKey:e("Ctrl-Alt-Up","Command-Option-Up"),exec:function(a){a.copyLinesUp()}},{name:"movelinesup",bindKey:e("Alt-Up","Option-Up"),exec:function(a){a.moveLinesUp()}},{name:"copylinesdown",bindKey:e("Ctrl-Alt-Down","Command-Option-Down"),exec:function(a){a.copyLinesDown()}},{name:"movelinesdown",bindKey:e("Alt-Down","Option-Down"),exec:function(a){a.moveLinesDown()}},{name:"del",bindKey:e("Delete","Delete|Ctrl-D"),exec:function(a){a.remove("right")},multiSelectAction:"forEach"},{name:"backspace",bindKey:e("Command-Backspace|Option-Backspace|Shift-Backspace|Backspace","Ctrl-Backspace|Command-Backspace|Shift-Backspace|Backspace|Ctrl-H"),exec:function(a){a.remove("left")},multiSelectAction:"forEach"},{name:"removetolinestart",bindKey:e("Alt-Backspace","Command-Backspace"),exec:function(a){a.removeToLineStart()},multiSelectAction:"forEach"},{name:"removetolineend",bindKey:e("Alt-Delete","Ctrl-K"),exec:function(a){a.removeToLineEnd()},multiSelectAction:"forEach"},{name:"removewordleft",bindKey:e("Ctrl-Backspace","Alt-Backspace|Ctrl-Alt-Backspace"),exec:function(a){a.removeWordLeft()},multiSelectAction:"forEach"},{name:"removewordright",bindKey:e("Ctrl-Delete","Alt-Delete"),exec:function(a){a.removeWordRight()},multiSelectAction:"forEach"},{name:"outdent",bindKey:e("Shift-Tab","Shift-Tab"),exec:function(a){a.blockOutdent()},multiSelectAction:"forEach"},{name:"indent",bindKey:e("Tab","Tab"),exec:function(a){a.indent()},multiSelectAction:"forEach"},{name:"insertstring",exec:function(a,b){a.insert(b)},multiSelectAction:"forEach"},{name:"inserttext",exec:function(a,b){a.insert(d.stringRepeat(b.text||"",b.times||1))},multiSelectAction:"forEach"},{name:"splitline",bindKey:e(null,"Ctrl-O"),exec:function(a){a.splitLine()},multiSelectAction:"forEach"},{name:"transposeletters",bindKey:e("Ctrl-T","Ctrl-T"),exec:function(a){a.transposeLetters()},multiSelectAction:function(a){a.transposeSelections(1)}},{name:"touppercase",bindKey:e("Ctrl-U","Ctrl-U"),exec:function(a){a.toUpperCase()},multiSelectAction:"forEach"},{name:"tolowercase",bindKey:e("Ctrl-Shift-U","Ctrl-Shift-U"),exec:function(a){a.toLowerCase()},multiSelectAction:"forEach"}]}),define("ace/edit_session",["require","exports","module","ace/config","ace/lib/oop","ace/lib/lang","ace/lib/net","ace/lib/event_emitter","ace/selection","ace/mode/text","ace/range","ace/document","ace/background_tokenizer","ace/edit_session/folding","ace/edit_session/bracket_match"],function(a,b,c){"use strict";var d=a("./config"),e=a("./lib/oop"),f=a("./lib/lang"),g=a("./lib/net"),h=a("./lib/event_emitter").EventEmitter,i=a("./selection").Selection,j=a("./mode/text").Mode,k=a("./range").Range,l=a("./document").Document,m=a("./background_tokenizer").BackgroundTokenizer,n=function(a,b){this.$modified=!0,this.$breakpoints=[],this.$frontMarkers={},this.$backMarkers={},this.$markerId=1,this.$rowCache=[],this.$wrapData=[],this.$foldData=[],this.$undoSelect=!0,this.$foldData.toString=function(){var a="";return this.forEach(function(b){a+="\n"+b.toString()}),a},a instanceof l?this.setDocument(a):this.setDocument(new l(a)),this.selection=new i(this),b?this.setMode(b):this.setMode(new j)};(function(){function q(a){return a<4352?!1:a>=4352&&a<=4447||a>=4515&&a<=4519||a>=4602&&a<=4607||a>=9001&&a<=9002||a>=11904&&a<=11929||a>=11931&&a<=12019||a>=12032&&a<=12245||a>=12272&&a<=12283||a>=12288&&a<=12350||a>=12353&&a<=12438||a>=12441&&a<=12543||a>=12549&&a<=12589||a>=12593&&a<=12686||a>=12688&&a<=12730||a>=12736&&a<=12771||a>=12784&&a<=12830||a>=12832&&a<=12871||a>=12880&&a<=13054||a>=13056&&a<=19903||a>=19968&&a<=42124||a>=42128&&a<=42182||a>=43360&&a<=43388||a>=44032&&a<=55203||a>=55216&&a<=55238||a>=55243&&a<=55291||a>=63744&&a<=64255||a>=65040&&a<=65049||a>=65072&&a<=65106||a>=65108&&a<=65126||a>=65128&&a<=65131||a>=65281&&a<=65376||a>=65504&&a<=65510}e.implement(this,h),this.setDocument=function(a){if(this.doc)throw new Error("Document is already set");this.doc=a,a.on("change",this.onChange.bind(this)),this.on("changeFold",this.onChangeFold.bind(this)),this.bgTokenizer&&(this.bgTokenizer.setDocument(this.getDocument()),this.bgTokenizer.start(0))},this.getDocument=function(){return this.doc},this.$resetRowCache=function(a){if(a==0){this.$rowCache=[];return}var b=this.$rowCache;for(var c=0;c<b.length;c++)if(b[c].docRow>=a){b.splice(c,b.length);return}},this.onChangeFold=function(a){var b=a.data;this.$resetRowCache(b.start.row)},this.onChange=function(a){var b=a.data;this.$modified=!0,this.$resetRowCache(b.range.start.row);var c=this.$updateInternalDataOnChange(a);!this.$fromUndo&&this.$undoManager&&!b.ignore&&(this.$deltasDoc.push(b),c&&c.length!=0&&this.$deltasFold.push({action:"removeFolds",folds:c}),this.$informUndoManager.schedule()),this.bgTokenizer.start(b.range.start.row),this._emit("change",a)},this.setValue=function(a){this.doc.setValue(a),this.selection.moveCursorTo(0,0),this.selection.clearSelection(),this.$resetRowCache(0),this.$deltas=[],this.$deltasDoc=[],this.$deltasFold=[],this.getUndoManager().reset()},this.getValue=this.toString=function(){return this.doc.getValue()},this.getSelection=function(){return this.selection},this.getState=function(a){return this.bgTokenizer.getState(a)},this.getTokens=function(a,b){return this.bgTokenizer.getTokens(a,b)},this.getTokenAt=function(a,b){var c=this.bgTokenizer.getTokens(a,a)[0].tokens,d,e=0;if(b==null)f=c.length-1,e=this.getLine(a).length;else for(var f=0;f<c.length;f++){e+=c[f].value.length;if(e>=b)break}return d=c[f],d?(d.index=f,d.start=e-d.value.length,d):null},this.setUndoManager=function(a){this.$undoManager=a,this.$resetRowCache(0),this.$deltas=[],this.$deltasDoc=[],this.$deltasFold=[],this.$informUndoManager&&this.$informUndoManager.cancel();if(a){var b=this;this.$syncInformUndoManager=function(){b.$informUndoManager.cancel(),b.$deltasFold.length&&(b.$deltas.push({group:"fold",deltas:b.$deltasFold}),b.$deltasFold=[]),b.$deltasDoc.length&&(b.$deltas.push({group:"doc",deltas:b.$deltasDoc}),b.$deltasDoc=[]),b.$deltas.length>0&&a.execute({action:"aceupdate",args:[b.$deltas,b]}),b.$deltas=[]},this.$informUndoManager=f.deferredCall(this.$syncInformUndoManager)}},this.$defaultUndoManager={undo:function(){},redo:function(){},reset:function(){}},this.getUndoManager=function(){return this.$undoManager||this.$defaultUndoManager},this.getTabString=function(){return this.getUseSoftTabs()?f.stringRepeat(" ",this.getTabSize()):"	"},this.$useSoftTabs=!0,this.setUseSoftTabs=function(a){if(this.$useSoftTabs===a)return;this.$useSoftTabs=a},this.getUseSoftTabs=function(){return this.$useSoftTabs},this.$tabSize=4,this.setTabSize=function(a){if(isNaN(a)||this.$tabSize===a)return;this.$modified=!0,this.$tabSize=a,this._emit("changeTabSize")},this.getTabSize=function(){return this.$tabSize},this.isTabStop=function(a){return this.$useSoftTabs&&a.column%this.$tabSize==0},this.$overwrite=!1,this.setOverwrite=function(a){if(this.$overwrite==a)return;this.$overwrite=a,this._emit("changeOverwrite")},this.getOverwrite=function(){return this.$overwrite},this.toggleOverwrite=function(){this.setOverwrite(!this.$overwrite)},this.getBreakpoints=function(){return this.$breakpoints},this.setBreakpoints=function(a){this.$breakpoints=[];for(var b=0;b<a.length;b++)this.$breakpoints[a[b]]=!0;this._emit("changeBreakpoint",{})},this.clearBreakpoints=function(){this.$breakpoints=[],this._emit("changeBreakpoint",{})},this.setBreakpoint=function(a){this.$breakpoints[a]=!0,this._emit("changeBreakpoint",{})},this.clearBreakpoint=function(a){delete this.$breakpoints[a],this._emit("changeBreakpoint",{})},this.getBreakpoints=function(){return this.$breakpoints},this.addMarker=function(a,b,c,d){var e=this.$markerId++,f={range:a,type:c||"line",renderer:typeof c=="function"?c:null,clazz:b,inFront:!!d};return d?(this.$frontMarkers[e]=f,this._emit("changeFrontMarker")):(this.$backMarkers[e]=f,this._emit("changeBackMarker")),e},this.removeMarker=function(a){var b=this.$frontMarkers[a]||this.$backMarkers[a];if(!b)return;var c=b.inFront?this.$frontMarkers:this.$backMarkers;b&&(delete c[a],this._emit(b.inFront?"changeFrontMarker":"changeBackMarker"))},this.getMarkers=function(a){return a?this.$frontMarkers:this.$backMarkers},this.setAnnotations=function(a){this.$annotations={};for(var b=0;b<a.length;b++){var c=a[b],d=c.row;this.$annotations[d]?this.$annotations[d].push(c):this.$annotations[d]=[c]}this._emit("changeAnnotation",{})},this.getAnnotations=function(){return this.$annotations||{}},this.clearAnnotations=function(){this.$annotations={},this._emit("changeAnnotation",{})},this.$detectNewLine=function(a){var b=a.match(/^.*?(\r?\n)/m);b?this.$autoNewLine=b[1]:this.$autoNewLine="\n"},this.getWordRange=function(a,b){var c=this.getLine(a),d=!1;b>0&&(d=!!c.charAt(b-1).match(this.tokenRe)),d||(d=!!c.charAt(b).match(this.tokenRe));var e=d?this.tokenRe:this.nonTokenRe,f=b;if(f>0){do f--;while(f>=0&&c.charAt(f).match(e));f++}var g=b;while(g<c.length&&c.charAt(g).match(e))g++;return new k(a,f,a,g)},this.getAWordRange=function(a,b){var c=this.getWordRange(a,b),d=this.getLine(c.end.row);while(d.charAt(c.end.column).match(/[ \t]/))c.end.column+=1;return c},this.setNewLineMode=function(a){this.doc.setNewLineMode(a)},this.getNewLineMode=function(){return this.doc.getNewLineMode()},this.$useWorker=!0,this.setUseWorker=function(a){if(this.$useWorker==a)return;this.$useWorker=a,this.$stopWorker(),a&&this.$startWorker()},this.getUseWorker=function(){return this.$useWorker},this.onReloadTokenizer=function(a){var b=a.data;this.bgTokenizer.start(b.first),this._emit("tokenizerUpdate",a)},this.$modes={},this._loadMode=function(b,c){function i(a){if(e.$modes[b])return c(e.$modes[b]);e.$modes[b]=new a.Mode,e._emit("loadmode",{name:b,mode:e.$modes[b]}),c(e.$modes[b])}function j(a){if(!d.get("packaged"))return a();var c=b.split("/").pop(),e=d.get("modePath")+"/mode-"+c+d.get("suffix");g.loadScript(e,a)}if(this.$modes[b])return c(this.$modes[b]);var e=this,f;try{f=a(b)}catch(h){}if(f)return i(f);j(function(){a([b],i)})},this.$mode=null,this.$origMode=null,this.setMode=function(a){this.$origMode=a;if(typeof a=="string"){var b=this;this._loadMode(a,function(c){if(b.$origMode!==a)return;b.setMode(c)});return}if(this.$mode===a)return;this.$mode=a,this.$stopWorker(),this.$useWorker&&this.$startWorker();var c=a.getTokenizer();if(c.addEventListener!==undefined){var d=this.onReloadTokenizer.bind(this);c.addEventListener("update",d)}if(!this.bgTokenizer){this.bgTokenizer=new m(c);var b=this;this.bgTokenizer.addEventListener("update",function(a){b._emit("tokenizerUpdate",a)})}else this.bgTokenizer.setTokenizer(c);this.bgTokenizer.setDocument(this.getDocument()),this.bgTokenizer.start(0),this.tokenRe=a.tokenRe,this.nonTokenRe=a.nonTokenRe,this.$setFolding(a.foldingRules),this._emit("changeMode")},this.$stopWorker=function(){this.$worker&&this.$worker.terminate(),this.$worker=null},this.$startWorker=function(){if(typeof Worker!="undefined"&&!a.noWorker)try{this.$worker=this.$mode.createWorker(this)}catch(b){console.log("Could not load worker"),console.log(b),this.$worker=null}else this.$worker=null},this.getMode=function(){return this.$mode},this.$scrollTop=0,this.setScrollTop=function(a){a=Math.round(Math.max(0,a));if(this.$scrollTop===a)return;this.$scrollTop=a,this._emit("changeScrollTop",a)},this.getScrollTop=function(){return this.$scrollTop},this.$scrollLeft=0,this.setScrollLeft=function(a){a=Math.round(Math.max(0,a));if(this.$scrollLeft===a)return;this.$scrollLeft=a,this._emit("changeScrollLeft",a)},this.getScrollLeft=function(){return this.$scrollLeft},this.getWidth=function(){return this.$computeWidth(),this.width},this.getScreenWidth=function(){return this.$computeWidth(),this.screenWidth},this.$computeWidth=function(a){if(this.$modified||a){this.$modified=!1;var b=this.doc.getAllLines(),c=0,d=0;for(var e=0;e<b.length;e++){var f=this.getFoldLine(e),g,h;g=b[e];if(f){var i=f.range.end;g=this.getFoldDisplayLine(f),e=i.row}h=g.length,c=Math.max(c,h),this.$useWrapMode||(d=Math.max(d,this.$getStringScreenWidth(g)[0]))}this.width=c,this.$useWrapMode?this.screenWidth=this.$wrapLimit:this.screenWidth=d}},this.getLine=function(a){return this.doc.getLine(a)},this.getLines=function(a,b){return this.doc.getLines(a,b)},this.getLength=function(){return this.doc.getLength()},this.getTextRange=function(a){return this.doc.getTextRange(a)},this.insert=function(a,b){return this.doc.insert(a,b)},this.remove=function(a){return this.doc.remove(a)},this.undoChanges=function(a,b){if(!a.length)return;this.$fromUndo=!0;var c=null;for(var d=a.length-1;d!=-1;d--){var e=a[d];e.group=="doc"?(this.doc.revertDeltas(e.deltas),c=this.$getUndoSelection(e.deltas,!0,c)):e.deltas.forEach(function(a){this.addFolds(a.folds)},this)}return this.$fromUndo=!1,c&&this.$undoSelect&&!b&&this.selection.setSelectionRange(c),c},this.redoChanges=function(a,b){if(!a.length)return;this.$fromUndo=!0;var c=null;for(var d=0;d<a.length;d++){var e=a[d];e.group=="doc"&&(this.doc.applyDeltas(e.deltas),c=this.$getUndoSelection(e.deltas,!1,c))}return this.$fromUndo=!1,c&&this.$undoSelect&&!b&&this.selection.setSelectionRange(c),c},this.setUndoSelect=function(a){this.$undoSelect=a},this.$getUndoSelection=function(a,b,c){function d(a){var c=a.action=="insertText"||a.action=="insertLines";return b?!c:c}var e=a[0],f,g,h=!1;d(e)?(f=e.range.clone(),h=!0):(f=k.fromPoints(e.range.start,e.range.start),h=!1);for(var i=1;i<a.length;i++)e=a[i],d(e)?(g=e.range.start,f.compare(g.row,g.column)==-1&&f.setStart(e.range.start),g=e.range.end,f.compare(g.row,g.column)==1&&f.setEnd(e.range.end),h=!0):(g=e.range.start,f.compare(g.row,g.column)==-1&&(f=k.fromPoints(e.range.start,e.range.start)),h=!1);if(c!=null){var j=c.compareRange(f);j==1?f.setStart(c.start):j==-1&&f.setEnd(c.end)}return f},this.replace=function(a,b){return this.doc.replace(a,b)},this.moveText=function(a,b){var c=this.getTextRange(a);this.remove(a);var d=b.row,e=b.column;!a.isMultiLine()&&a.start.row==d&&a.end.column<e&&(e-=c.length);if(a.isMultiLine()&&a.end.row<d){var f=this.doc.$split(c);d-=f.length-1}var g=d+a.end.row-a.start.row,h=a.isMultiLine()?a.end.column:e+a.end.column-a.start.column,i=new k(d,e,g,h);return this.insert(i.start,c),i},this.indentRows=function(a,b,c){c=c.replace(/\t/g,this.getTabString());for(var d=a;d<=b;d++)this.insert({row:d,column:0},c)},this.outdentRows=function(a){var b=a.collapseRows(),c=new k(0,0,0,0),d=this.getTabSize();for(var e=b.start.row;e<=b.end.row;++e){var f=this.getLine(e);c.start.row=e,c.end.row=e;for(var g=0;g<d;++g)if(f.charAt(g)!=" ")break;g<d&&f.charAt(g)=="	"?(c.start.column=g,c.end.column=g+1):(c.start.column=0,c.end.column=g),this.remove(c)}},this.moveLinesUp=function(a,b){if(a<=0)return 0;var c=this.doc.removeLines(a,b);return this.doc.insertLines(a-1,c),-1},this.moveLinesDown=function(a,b){if(b>=this.doc.getLength()-1)return 0;var c=this.doc.removeLines(a,b);return this.doc.insertLines(a+1,c),1},this.duplicateLines=function(a,b){var a=this.$clipRowToDocument(a),b=this.$clipRowToDocument(b),c=this.getLines(a,b);this.doc.insertLines(a,c);var d=b-a+1;return d},this.$clipRowToDocument=function(a){return Math.max(0,Math.min(a,this.doc.getLength()-1))},this.$clipColumnToRow=function(a,b){return b<0?0:Math.min(this.doc.getLine(a).length,b)},this.$clipPositionToDocument=function(a,b){b=Math.max(0,b);if(a<0)a=0,b=0;else{var c=this.doc.getLength();a>=c?(a=c-1,b=this.doc.getLine(c-1).length):b=Math.min(this.doc.getLine(a).length,b)}return{row:a,column:b}},this.$clipRangeToDocument=function(a){a.start.row<0?(a.start.row=0,a.start.column=0):a.start.column=this.$clipColumnToRow(a.start.row,a.start.column);var b=this.doc.getLength()-1;return a.end.row>b?(a.end.row=b,a.end.column=this.doc.getLine(b).length):a.end.column=this.$clipColumnToRow(a.end.row,a.end.column),a},this.$wrapLimit=80,this.$useWrapMode=!1,this.$wrapLimitRange={min:null,max:null},this.setUseWrapMode=function(a){if(a!=this.$useWrapMode){this.$useWrapMode=a,this.$modified=!0,this.$resetRowCache(0);if(a){var b=this.getLength();this.$wrapData=[];for(var c=0;c<b;c++)this.$wrapData.push([]);this.$updateWrapData(0,b-1)}this._emit("changeWrapMode")}},this.getUseWrapMode=function(){return this.$useWrapMode},this.setWrapLimitRange=function(a,b){if(this.$wrapLimitRange.min!==a||this.$wrapLimitRange.max!==b)this.$wrapLimitRange.min=a,this.$wrapLimitRange.max=b,this.$modified=!0,this._emit("changeWrapMode")},this.adjustWrapLimit=function(a){var b=this.$constrainWrapLimit(a);return b!=this.$wrapLimit&&b>0?(this.$wrapLimit=b,this.$modified=!0,this.$useWrapMode&&(this.$updateWrapData(0,this.getLength()-1),this.$resetRowCache(0),this._emit("changeWrapLimit")),!0):!1},this.$constrainWrapLimit=function(a){var b=this.$wrapLimitRange.min;b&&(a=Math.max(b,a));var c=this.$wrapLimitRange.max;return c&&(a=Math.min(c,a)),Math.max(1,a)},this.getWrapLimit=function(){return this.$wrapLimit},this.getWrapLimitRange=function(){return{min:this.$wrapLimitRange.min,max:this.$wrapLimitRange.max}},this.$updateInternalDataOnChange=function(a){var b=this.$useWrapMode,c,d=a.data.action,e=a.data.range.start.row,f=a.data.range.end.row,g=a.data.range.start,h=a.data.range.end,i=null;d.indexOf("Lines")!=-1?(d=="insertLines"?f=e+a.data.lines.length:f=e,c=a.data.lines?a.data.lines.length:f-e):c=f-e;if(c!=0)if(d.indexOf("remove")!=-1){b&&this.$wrapData.splice(e,c);var j=this.$foldData;i=this.getFoldsInRange(a.data.range),this.removeFolds(i);var k=this.getFoldLine(h.row),l=0;if(k){k.addRemoveChars(h.row,h.column,g.column-h.column),k.shiftRow(-c);var m=this.getFoldLine(e);m&&m!==k&&(m.merge(k),k=m),l=j.indexOf(k)+1}for(l;l<j.length;l++){var k=j[l];k.start.row>=h.row&&k.shiftRow(-c)}f=e}else{var n;if(b){n=[e,0];for(var o=0;o<c;o++)n.push([]);this.$wrapData.splice.apply(this.$wrapData,n)}var j=this.$foldData,k=this.getFoldLine(e),l=0;if(k){var p=k.range.compareInside(g.row,g.column);p==0?(k=k.split(g.row,g.column),k.shiftRow(c),k.addRemoveChars(f,0,h.column-g.column)):p==-1&&(k.addRemoveChars(e,0,h.column-g.column),k.shiftRow(c)),l=j.indexOf(k)+1}for(l;l<j.length;l++){var k=j[l];k.start.row>=e&&k.shiftRow(c)}}else{c=Math.abs(a.data.range.start.column-a.data.range.end.column),d.indexOf("remove")!=-1&&(i=this.getFoldsInRange(a.data.range),this.removeFolds(i),c=-c);var k=this.getFoldLine(e);k&&k.addRemoveChars(e,g.column,c)}return b&&this.$wrapData.length!=this.doc.getLength()&&console.error("doc.getLength() and $wrapData.length have to be the same!"),b&&this.$updateWrapData(e,f),i},this.$updateWrapData=function(a,b){var c=this.doc.getAllLines(),d=this.getTabSize(),e=this.$wrapData,g=this.$wrapLimit,h,k,l=a;b=Math.min(b,c.length-1);while(l<=b){k=this.getFoldLine(l,k);if(!k)h=this.$getDisplayTokens(f.stringTrimRight(c[l])),e[l]=this.$computeWrapSplits(h,g,d),l++;else{h=[],k.walk(function(a,b,d,e){var f;if(a){f=this.$getDisplayTokens(a,h.length),f[0]=i;for(var g=1;g<f.length;g++)f[g]=j}else f=this.$getDisplayTokens(c[b].substring(e,d),h.length);h=h.concat(f)}.bind(this),k.end.row,c[k.end.row].length+1);while(h.length!=0&&h[h.length-1]>=n)h.pop();e[k.start.row]=this.$computeWrapSplits(h,g,d),l=k.end.row+1}}};var b=1,c=2,i=3,j=4,l=9,n=10,o=11,p=12;this.$computeWrapSplits=function(a,b){function g(b){var d=a.slice(e,b),g=d.length;d.join("").replace(/12/g,function(){g-=1}).replace(/2/g,function(){g-=1}),f+=g,c.push(f),e=b}if(a.length==0)return[];var c=[],d=a.length,e=0,f=0;while(d-e>b){var h=e+b;if(a[h]>=n){while(a[h]>=n)h++;g(h);continue}if(a[h]==i||a[h]==j){for(h;h!=e-1;h--)if(a[h]==i)break;if(h>e){g(h);continue}h=e+b;for(h;h<a.length;h++)if(a[h]!=j)break;if(h==a.length)break;g(h);continue}var k=Math.max(h-10,e-1);while(h>k&&a[h]<i)h--;while(h>k&&a[h]==l)h--;if(h>k){g(++h);continue}h=e+b,g(h)}return c},this.$getDisplayTokens=function(a,d){var e=[],f;d=d||0;for(var g=0;g<a.length;g++){var h=a.charCodeAt(g);if(h==9){f=this.getScreenTabSize(e.length+d),e.push(o);for(var i=1;i<f;i++)e.push(p)}else h==32?e.push(n):h>39&&h<48||h>57&&h<64?e.push(l):h>=4352&&q(h)?e.push(b,c):e.push(b)}return e},this.$getStringScreenWidth=function(a,b,c){if(b==0)return[0,0];b==null&&(b=c+a.length*Math.max(this.getTabSize(),2)),c=c||0;var d,e;for(e=0;e<a.length;e++){d=a.charCodeAt(e),d==9?c+=this.getScreenTabSize(c):d>=4352&&q(d)?c+=2:c+=1;if(c>b)break}return[c,e]},this.getRowLength=function(a){return!this.$useWrapMode||!this.$wrapData[a]?1:this.$wrapData[a].length+1},this.getRowHeight=function(a,b){return this.getRowLength(b)*a.lineHeight},this.getScreenLastRowColumn=function(a){var b=this.screenToDocumentPosition(a,Number.MAX_VALUE);return this.documentToScreenColumn(b.row,b.column)},this.getDocumentLastRowColumn=function(a,b){var c=this.documentToScreenRow(a,b);return this.getScreenLastRowColumn(c)},this.getDocumentLastRowColumnPosition=function(a,b){var c=this.documentToScreenRow(a,b);return this.screenToDocumentPosition(c,Number.MAX_VALUE/10)},this.getRowSplitData=function(a){return this.$useWrapMode?this.$wrapData[a]:undefined},this.getScreenTabSize=function(a){return this.$tabSize-a%this.$tabSize},this.screenToDocumentRow=function(a,b){return this.screenToDocumentPosition(a,b).row},this.screenToDocumentColumn=function(a,b){return this.screenToDocumentPosition(a,b).column},this.screenToDocumentPosition=function(a,b){if(a<0)return{row:0,column:0};var c,d=0,e=0,f,g=0,h=0,i=this.$rowCache;for(var j=0;j<i.length;j++){if(!(i[j].screenRow<a))break;g=i[j].screenRow,d=i[j].docRow}var k=!i.length||j==i.length,l=this.getLength()-1,m=this.getNextFoldLine(d),n=m?m.start.row:Infinity;while(g<=a){h=this.getRowLength(d);if(g+h-1>=a||d>=l)break;g+=h,d++,d>n&&(d=m.end.row+1,m=this.getNextFoldLine(d,m),n=m?m.start.row:Infinity),k&&i.push({docRow:d,screenRow:g})}if(m&&m.start.row<=d)c=this.getFoldDisplayLine(m),d=m.start.row;else{if(g+h<=a||d>l)return{row:l,column:this.getLine(l).length};c=this.getLine(d),m=null}if(this.$useWrapMode){var o=this.$wrapData[d];o&&(f=o[a-g],a>g&&o.length&&(e=o[a-g-1]||o[o.length-1],c=c.substring(e)))}return e+=this.$getStringScreenWidth(c,b)[1],this.$useWrapMode&&e>=f&&(e=f-1),m?m.idxToPosition(e):{row:d,column:e}},this.documentToScreenPosition=function(a,b){if(typeof b=="undefined")var c=this.$clipPositionToDocument(a.row,a.column);else c=this.$clipPositionToDocument(a,b);a=c.row,b=c.column;var d;if(this.$useWrapMode){d=this.$wrapData;if(a>d.length-1)return{row:this.getScreenLength(),column:d.length==0?0:d[d.length-1].length-1}}var e=0,f=null,g=null;g=this.getFoldAt(a,b,1),g&&(a=g.start.row,b=g.start.column);var h,i=0,j=this.$rowCache;for(var k=0;k<j.length;k++){if(!(j[k].docRow<a))break;e=j[k].screenRow,i=j[k].docRow}var l=!j.length||k==j.length,m=this.getNextFoldLine(i),n=m?m.start.row:Infinity;while(i<a){if(i>=n){h=m.end.row+1;if(h>a)break;m=this.getNextFoldLine(h,m),n=m?m.start.row:Infinity}else h=i+1;e+=this.getRowLength(i),i=h,l&&j.push({docRow:i,screenRow:e})}var o="";m&&i>=n?(o=this.getFoldDisplayLine(m,a,b),f=m.start.row):(o=this.getLine(a).substring(0,b),f=a);if(this.$useWrapMode){var p=d[f],q=0;while(o.length>=p[q])e++,q++;o=o.substring(p[q-1]||0,o.length)}return{row:e,column:this.$getStringScreenWidth(o)[0]}},this.documentToScreenColumn=function(a,b){return this.documentToScreenPosition(a,b).column},this.documentToScreenRow=function(a,b){return this.documentToScreenPosition(a,b).row},this.getScreenLength=function(){var a=0,b=null;if(!this.$useWrapMode){a=this.getLength();var c=this.$foldData;for(var d=0;d<c.length;d++)b=c[d],a-=b.end.row-b.start.row}else{var e=this.$wrapData.length,f=0,d=0,b=this.$foldData[d++],g=b?b.start.row:Infinity;while(f<e)a+=this.$wrapData[f].length+1,f++,f>g&&(f=b.end.row+1,b=this.$foldData[d++],g=b?b.start.row:Infinity)}return a}}).call(n.prototype),a("./edit_session/folding").Folding.call(n.prototype),a("./edit_session/bracket_match").BracketMatch.call(n.prototype),b.EditSession=n}),define("ace/config",["require","exports","module","ace/lib/lang"],function(a,b,c){function g(a){return a.replace(/-(.)/g,function(a,b){return b.toUpperCase()})}"no use strict";var d=a("./lib/lang"),e=function(){return this}(),f={packaged:!1,workerPath:"",modePath:"",themePath:"",suffix:".js"};b.get=function(a){if(!f.hasOwnProperty(a))throw new Error("Unknown confik key: "+a);return f[a]},b.set=function(a,b){if(!f.hasOwnProperty(a))throw new Error("Unknown confik key: "+a);f[a]=b},b.all=function(){return d.copyObject(f)},b.init=function(){f.packaged=a.packaged||c.packaged||e.define&&define.packaged;if(!e.document)return"";var d={},h="",i,j=document.getElementsByTagName("script");for(var k=0;k<j.length;k++){var l=j[k],m=l.src||l.getAttribute("src");if(!m)continue;var n=l.attributes;for(var o=0,p=n.length;o<p;o++){var q=n[o];q.name.indexOf("data-ace-")===0&&(d[g(q.name.replace(/^data-ace-/,""))]=q.value)}var r=m.match(/^(?:(.*\/)ace\.js|(.*\/)ace((-uncompressed)?(-noconflict)?\.js))(?:\?|$)/);r&&(h=r[1]||r[2],i=r[3])}h&&(d.base=d.base||h,d.packaged=!0),d.suffix=d.suffix||i,d.workerPath=d.workerPath||d.base,d.modePath=d.modePath||d.base,d.themePath=d.themePath||d.base,delete d.base;for(var s in d)typeof d[s]!="undefined"&&b.set(s,d[s])}}),define("ace/lib/net",["require","exports","module"],function(a,b,c){"use strict",b.get=function(a,c){var d=b.createXhr();d.open("GET",a,!0),d.onreadystatechange=function(a){d.readyState===4&&c(d.responseText)},d.send(null)};var d=["Msxml2.XMLHTTP","Microsoft.XMLHTTP","Msxml2.XMLHTTP.4.0"];b.createXhr=function(){var a,b,c;if(typeof XMLHttpRequest!="undefined")return new XMLHttpRequest;for(b=0;b<3;b++){c=d[b];try{a=new ActiveXObject(c)}catch(e){}if(a){d=[c];break}}if(!a)throw new Error("createXhr(): XMLHttpRequest not available");return a},b.loadScript=function(a,b){var c=document.getElementsByTagName("head")[0],d=document.createElement("script");d.src=a,c.appendChild(d),d.onload=b}}),define("ace/selection",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/lib/event_emitter","ace/range"],function(a,b,c){"use strict";var d=a("./lib/oop"),e=a("./lib/lang"),f=a("./lib/event_emitter").EventEmitter,g=a("./range").Range,h=function(a){this.session=a,this.doc=a.getDocument(),this.clearSelection(),this.selectionLead=this.doc.createAnchor(0,0),this.selectionAnchor=this.doc.createAnchor(0,0);var b=this;this.selectionLead.on("change",function(a){b._emit("changeCursor"),b.$isEmpty||b._emit("changeSelection"),!b.$keepDesiredColumnOnChange&&a.old.column!=a.value.column&&(b.$desiredColumn=null)}),this.selectionAnchor.on("change",function(){b.$isEmpty||b._emit("changeSelection")})};(function(){d.implement(this,f),this.isEmpty=function(){return this.$isEmpty||this.selectionAnchor.row==this.selectionLead.row&&this.selectionAnchor.column==this.selectionLead.column},this.isMultiLine=function(){return this.isEmpty()?!1:this.getRange().isMultiLine()},this.getCursor=function(){return this.selectionLead.getPosition()},this.setSelectionAnchor=function(a,b){this.selectionAnchor.setPosition(a,b),this.$isEmpty&&(this.$isEmpty=!1,this._emit("changeSelection"))},this.getSelectionAnchor=function(){return this.$isEmpty?this.getSelectionLead():this.selectionAnchor.getPosition()},this.getSelectionLead=function(){return this.selectionLead.getPosition()},this.shiftSelection=function(a){if(this.$isEmpty){this.moveCursorTo(this.selectionLead.row,this.selectionLead.column+a);return}var b=this.getSelectionAnchor(),c=this.getSelectionLead(),d=this.isBackwards();(!d||b.column!==0)&&this.setSelectionAnchor(b.row,b.column+a),(d||c.column!==0)&&this.$moveSelection(function(){this.moveCursorTo(c.row,c.column+a)})},this.isBackwards=function(){var a=this.selectionAnchor,b=this.selectionLead;return a.row>b.row||a.row==b.row&&a.column>b.column},this.getRange=function(){var a=this.selectionAnchor,b=this.selectionLead;return this.isEmpty()?g.fromPoints(b,b):this.isBackwards()?g.fromPoints(b,a):g.fromPoints(a,b)},this.clearSelection=function(){this.$isEmpty||(this.$isEmpty=!0,this._emit("changeSelection"))},this.selectAll=function(){var a=this.doc.getLength()-1;this.setSelectionAnchor(a,this.doc.getLine(a).length),this.moveCursorTo(0,0)},this.setSelectionRange=function(a,b){b?(this.setSelectionAnchor(a.end.row,a.end.column),this.selectTo(a.start.row,a.start.column)):(this.setSelectionAnchor(a.start.row,a.start.column),this.selectTo(a.end.row,a.end.column)),this.$desiredColumn=null},this.$moveSelection=function(a){var b=this.selectionLead;this.$isEmpty&&this.setSelectionAnchor(b.row,b.column),a.call(this)},this.selectTo=function(a,b){this.$moveSelection(function(){this.moveCursorTo(a,b)})},this.selectToPosition=function(a){this.$moveSelection(function(){this.moveCursorToPosition(a)})},this.selectUp=function(){this.$moveSelection(this.moveCursorUp)},this.selectDown=function(){this.$moveSelection(this.moveCursorDown)},this.selectRight=function(){this.$moveSelection(this.moveCursorRight)},this.selectLeft=function(){this.$moveSelection(this.moveCursorLeft)},this.selectLineStart=function(){this.$moveSelection(this.moveCursorLineStart)},this.selectLineEnd=function(){this.$moveSelection(this.moveCursorLineEnd)},this.selectFileEnd=function(){this.$moveSelection(this.moveCursorFileEnd)},this.selectFileStart=function(){this.$moveSelection(this.moveCursorFileStart)},this.selectWordRight=function(){this.$moveSelection(this.moveCursorWordRight)},this.selectWordLeft=function(){this.$moveSelection(this.moveCursorWordLeft)},this.selectWord=function(){var a=this.getCursor(),b=this.session.getWordRange(a.row,a.column);this.setSelectionRange(b)},this.selectAWord=function(){var a=this.getCursor(),b=this.session.getAWordRange(a.row,a.column);this.setSelectionRange(b)},this.selectLine=function(){var a=this.selectionLead.row,b,c=this.session.getFoldLine(a);c?(a=c.start.row,b=c.end.row):b=a,this.setSelectionAnchor(a,0),this.$moveSelection(function(){this.moveCursorTo(b+1,0)})},this.moveCursorUp=function(){this.moveCursorBy(-1,0)},this.moveCursorDown=function(){this.moveCursorBy(1,0)},this.moveCursorLeft=function(){var a=this.selectionLead.getPosition(),b;if(b=this.session.getFoldAt(a.row,a.column,-1))this.moveCursorTo(b.start.row,b.start.column);else if(a.column==0)a.row>0&&this.moveCursorTo(a.row-1,this.doc.getLine(a.row-1).length);else{var c=this.session.getTabSize();this.session.isTabStop(a)&&this.doc.getLine(a.row).slice(a.column-c,a.column).split(" ").length-1==c?this.moveCursorBy(0,-c):this.moveCursorBy(0,-1)}},this.moveCursorRight=function(){var a=this.selectionLead.getPosition(),b;if(b=this.session.getFoldAt(a.row,a.column,1))this.moveCursorTo(b.end.row,b.end.column);else if(this.selectionLead.column==this.doc.getLine(this.selectionLead.row).length)this.selectionLead.row<this.doc.getLength()-1&&this.moveCursorTo(this.selectionLead.row+1,0);else{var c=this.session.getTabSize(),a=this.selectionLead;this.session.isTabStop(a)&&this.doc.getLine(a.row).slice(a.column,a.column+c).split(" ").length-1==c?this.moveCursorBy(0,c):this.moveCursorBy(0,1)}},this.moveCursorLineStart=function(){var a=this.selectionLead.row,b=this.selectionLead.column,c=this.session.documentToScreenRow(a,b),d=this.session.screenToDocumentPosition(c,0),e=this.session.getDisplayLine(a,null,d.row,d.column),f=e.match(/^\s*/);f[0].length==b?this.moveCursorTo(d.row,d.column):this.moveCursorTo(d.row,d.column+f[0].length)},this.moveCursorLineEnd=function(){var a=this.selectionLead,b=this.session.getDocumentLastRowColumnPosition(a.row,a.column);this.moveCursorTo(b.row,b.column)},this.moveCursorFileEnd=function(){var a=this.doc.getLength()-1,b=this.doc.getLine(a).length;this.moveCursorTo(a,b)},this.moveCursorFileStart=function(){this.moveCursorTo(0,0)},this.moveCursorWordRight=function(){var a=this.selectionLead.row,b=this.selectionLead.column,c=this.doc.getLine(a),d=c.substring(b),e;this.session.nonTokenRe.lastIndex=0,this.session.tokenRe.lastIndex=0;var f=this.session.getFoldAt(a,b,1);if(f){this.moveCursorTo(f.end.row,f.end.column);return}if(e=this.session.nonTokenRe.exec(d))b+=this.session.nonTokenRe.lastIndex,this.session.nonTokenRe.lastIndex=0,d=c.substring(b);if(b>=c.length){this.moveCursorTo(a,c.length),this.moveCursorRight(),a<this.doc.getLength()-1&&this.moveCursorWordRight();return}if(e=this.session.tokenRe.exec(d))b+=this.session.tokenRe.lastIndex,this.session.tokenRe.lastIndex=0;this.moveCursorTo(a,b)},this.moveCursorWordLeft=function(){var a=this.selectionLead.row,b=this.selectionLead.column,c;if(c=this.session.getFoldAt(a,b,-1)){this.moveCursorTo(c.start.row,c.start.column);return}var d=this.session.getFoldStringAt(a,b,-1);d==null&&(d=this.doc.getLine(a).substring(0,b));var f=e.stringReverse(d),g;this.session.nonTokenRe.lastIndex=0,this.session.tokenRe.lastIndex=0;if(g=this.session.nonTokenRe.exec(f))b-=this.session.nonTokenRe.lastIndex,f=f.slice(this.session.nonTokenRe.lastIndex),this.session.nonTokenRe.lastIndex=0;if(b<=0){this.moveCursorTo(a,0),this.moveCursorLeft(),a>0&&this.moveCursorWordLeft();return}if(g=this.session.tokenRe.exec(f))b-=this.session.tokenRe.lastIndex,this.session.tokenRe.lastIndex=0;this.moveCursorTo(a,b)},this.moveCursorBy=function(a,b){var c=this.session.documentToScreenPosition(this.selectionLead.row,this.selectionLead.column);b===0&&(this.$desiredColumn?c.column=this.$desiredColumn:this.$desiredColumn=c.column);var d=this.session.screenToDocumentPosition(c.row+a,c.column);this.moveCursorTo(d.row,d.column+b,b===0)},this.moveCursorToPosition=function(a){this.moveCursorTo(a.row,a.column)},this.moveCursorTo=function(a,b,c){var d=this.session.getFoldAt(a,b,1);d&&(a=d.start.row,b=d.start.column),this.$keepDesiredColumnOnChange=!0,this.selectionLead.setPosition(a,b),this.$keepDesiredColumnOnChange=!1,c||(this.$desiredColumn=null)},this.moveCursorToScreen=function(a,b,c){var d=this.session.screenToDocumentPosition(a,b);this.moveCursorTo(d.row,d.column,c)},this.detach=function(){this.selectionLead.detach(),this.selectionAnchor.detach(),this.session=this.doc=null},this.fromOrientedRange=function(a){this.setSelectionRange(a,a.cursor==a.start),this.$desiredColumn=a.desiredColumn||this.$desiredColumn},this.toOrientedRange=function(a){var b=this.getRange();return a?(a.start.column=b.start.column,a.start.row=b.start.row,a.end.column=b.end.column,a.end.row=b.end.row):a=b,a.cursor=this.isBackwards()?a.start:a.end,a.desiredColumn=this.$desiredColumn,a}}).call(h.prototype),b.Selection=h}),define("ace/range",["require","exports","module"],function(a,b,c){"use strict";var d=function(a,b,c,d){this.start={row:a,column:b},this.end={row:c,column:d}};(function(){this.isEqual=function(a){return this.start.row==a.start.row&&this.end.row==a.end.row&&this.start.column==a.start.column&&this.end.column==a.end.column},this.toString=function(){return"Range: ["+this.start.row+"/"+this.start.column+"] -> ["+this.end.row+"/"+this.end.column+"]"},this.contains=function(a,b){return this.compare(a,b)==0},this.compareRange=function(a){var b,c=a.end,d=a.start;return b=this.compare(c.row,c.column),b==1?(b=this.compare(d.row,d.column),b==1?2:b==0?1:0):b==-1?-2:(b=this.compare(d.row,d.column),b==-1?-1:b==1?42:0)},this.comparePoint=function(a){return this.compare(a.row,a.column)},this.containsRange=function(a){return this.comparePoint(a.start)==0&&this.comparePoint(a.end)==0},this.intersectsRange=function(a){var b=this.compareRange(a);return b==-1||b==0||b==1},this.isEnd=function(a,b){return this.end.row==a&&this.end.column==b},this.isStart=function(a,b){return this.start.row==a&&this.start.column==b},this.setStart=function(a,b){typeof a=="object"?(this.start.column=a.column,this.start.row=a.row):(this.start.row=a,this.start.column=b)},this.setEnd=function(a,b){typeof a=="object"?(this.end.column=a.column,this.end.row=a.row):(this.end.row=a,this.end.column=b)},this.inside=function(a,b){return this.compare(a,b)==0?this.isEnd(a,b)||this.isStart(a,b)?!1:!0:!1},this.insideStart=function(a,b){return this.compare(a,b)==0?this.isEnd(a,b)?!1:!0:!1},this.insideEnd=function(a,b){return this.compare(a,b)==0?this.isStart(a,b)?!1:!0:!1},this.compare=function(a,b){return!this.isMultiLine()&&a===this.start.row?b<this.start.column?-1:b>this.end.column?1:0:a<this.start.row?-1:a>this.end.row?1:this.start.row===a?b>=this.start.column?0:-1:this.end.row===a?b<=this.end.column?0:1:0},this.compareStart=function(a,b){return this.start.row==a&&this.start.column==b?-1:this.compare(a,b)},this.compareEnd=function(a,b){return this.end.row==a&&this.end.column==b?1:this.compare(a,b)},this.compareInside=function(a,b){return this.end.row==a&&this.end.column==b?1:this.start.row==a&&this.start.column==b?-1:this.compare(a,b)},this.clipRows=function(a,b){if(this.end.row>b)var c={row:b+1,column:0};if(this.start.row>b)var e={row:b+1,column:0};if(this.start.row<a)var e={row:a,column:0};if(this.end.row<a)var c={row:a,column:0};return d.fromPoints(e||this.start,c||this.end)},this.extend=function(a,b){var c=this.compare(a,b);if(c==0)return this;if(c==-1)var e={row:a,column:b};else var f={row:a,column:b};return d.fromPoints(e||this.start,f||this.end)},this.fixOrientation=function(){if(this.start.row<this.end.row||this.start.row==this.end.row&&this.start.column<this.end.column)return!1;var a=this.start;return this.end=this.start,this.start=a,!0},this.isEmpty=function(){return this.start.row==this.end.row&&this.start.column==this.end.column},this.isMultiLine=function(){return this.start.row!==this.end.row},this.clone=function(){return d.fromPoints(this.start,this.end)},this.collapseRows=function(){return this.end.column==0?new d(this.start.row,0,Math.max(this.start.row,this.end.row-1),0):new d(this.start.row,0,this.end.row,0)},this.toScreenRange=function(a){var b=a.documentToScreenPosition(this.start),c=a.documentToScreenPosition(this.end);return new d(b.row,b.column,c.row,c.column)}}).call(d.prototype),d.fromPoints=function(a,b){return new d(a.row,a.column,b.row,b.column)},b.Range=d}),define("ace/mode/text",["require","exports","module","ace/tokenizer","ace/mode/text_highlight_rules","ace/mode/behaviour","ace/unicode"],function(a,b,c){"use strict";var d=a("../tokenizer").Tokenizer,e=a("./text_highlight_rules").TextHighlightRules,f=a("./behaviour").Behaviour,g=a("../unicode"),h=function(){this.$tokenizer=new d((new e).getRules()),this.$behaviour=new f};(function(){this.tokenRe=new RegExp("^["+g.packages.L+g.packages.Mn+g.packages.Mc+g.packages.Nd+g.packages.Pc+"\\$_]+","g"),this.nonTokenRe=new RegExp("^(?:[^"+g.packages.L+g.packages.Mn+g.packages.Mc+g.packages.Nd+g.packages.Pc+"\\$_]|s])+","g"),this.getTokenizer=function(){return this.$tokenizer},this.toggleCommentLines=function(a,b,c,d){},this.getNextLineIndent=function(a,b,c){return""},this.checkOutdent=function(a,b,c){return!1},this.autoOutdent=function(a,b,c){},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""},this.createWorker=function(a){return null},this.highlightSelection=function(a){var b=a.session;b.$selectionOccurrences||(b.$selectionOccurrences=[]),b.$selectionOccurrences.length&&this.clearSelectionHighlight(a);var c=a.getSelectionRange();if(c.isEmpty()||c.isMultiLine())return;var d=c.start.column-1,e=c.end.column+1,f=b.getLine(c.start.row),g=f.length,h=f.substring(Math.max(d,0),Math.min(e,g));if(d>=0&&/^[\w\d]/.test(h)||e<=g&&/[\w\d]$/.test(h))return;h=f.substring(c.start.column,c.end.column);if(!/^[\w\d]+$/.test(h))return;var i=a.getCursorPosition(),j={wrap:!0,wholeWord:!0,caseSensitive:!0,needle:h},k=a.$search.getOptions();a.$search.set(j);var l=a.$search.findAll(b);l.forEach(function(a){if(!a.contains(i.row,i.column)){var c=b.addMarker(a,"ace_selected_word","text");b.$selectionOccurrences.push(c)}}),a.$search.set(k)},this.clearSelectionHighlight=function(a){if(!a.session.$selectionOccurrences)return;a.session.$selectionOccurrences.forEach(function(b){a.session.removeMarker(b)}),a.session.$selectionOccurrences=[]},this.createModeDelegates=function(a){if(!this.$embeds)return;this.$modes={};for(var b=0;b<this.$embeds.length;b++)a[this.$embeds[b]]&&(this.$modes[this.$embeds[b]]=new a[this.$embeds[b]]);var c=["toggleCommentLines","getNextLineIndent","checkOutdent","autoOutdent","transformAction"];for(var b=0;b<c.length;b++)(function(a){var d=c[b],e=a[d];a[c[b]]=function(){return this.$delegator(d,arguments,e)}})(this)},this.$delegator=function(a,b,c){var d=b[0];for(var e=0;e<this.$embeds.length;e++){if(!this.$modes[this.$embeds[e]])continue;var f=d.split(this.$embeds[e]);if(!f[0]&&f[1]){b[0]=f[1];var g=this.$modes[this.$embeds[e]];return g[a].apply(g,b)}}var h=c.apply(this,b);return c?h:undefined},this.transformAction=function(a,b,c,d,e){if(this.$behaviour){var f=this.$behaviour.getBehaviours();for(var g in f)if(f[g][b]){var h=f[g][b].apply(this,arguments);if(h)return h}}}}).call(h.prototype),b.Mode=h}),define("ace/tokenizer",["require","exports","module"],function(a,b,c){"use strict";var d=function(a,b){b=b?"g"+b:"g",this.rules=a,this.regExps={},this.matchMappings={};for(var c in this.rules){var d=this.rules[c],e=d,f=[],g=0,h=this.matchMappings[c]={};for(var i=0;i<e.length;i++){e[i].regex instanceof RegExp&&(e[i].regex=e[i].regex.toString().slice(1,-1));var j=(new RegExp("(?:("+e[i].regex+")|(.))")).exec("a").length-2,k=e[i].regex.replace(/\\([0-9]+)/g,function(a,b){return"\\"+(parseInt(b,10)+g+1)});if(j>1&&e[i].token.length!==j-1)throw new Error("Matching groups and length of the token array don't match in rule #"+i+" of state "+c);h[g]={rule:i,len:j},g+=j,f.push(k)}this.regExps[c]=new RegExp("(?:("+f.join(")|(")+")|(.))",b)}};(function(){this.getLineTokens=function(a,b){var c=b,d=this.rules[c],e=this.matchMappings[c],f=this.regExps[c];f.lastIndex=0;var g,h=[],i=0,j={type:null,value:""};while(g=f.exec(a)){var k="text",l=null,m=[g[0]];for(var n=0;n<g.length-2;n++){if(g[n+1]===undefined)continue;l=d[e[n].rule],e[n].len>1&&(m=g.slice(n+2,n+1+e[n].len)),typeof l.token=="function"?k=l.token.apply(this,m):k=l.token;var o=l.next;o&&o!==c&&(c=o,d=this.rules[c],e=this.matchMappings[c],i=f.lastIndex,f=this.regExps[c],f.lastIndex=i);break}if(m[0]){typeof k=="string"&&(m=[m.join("")],k=[k]);for(var n=0;n<m.length;n++){if(!m[n])continue;(!l||l.merge||k[n]==="text")&&j.type===k[n]?j.value+=m[n]:(j.type&&h.push(j),j={type:k[n],value:m[n]})}}if(i==a.length)break;i=f.lastIndex}return j.type&&h.push(j),{tokens:h,state:c}}}).call(d.prototype),b.Tokenizer=d}),define("ace/mode/text_highlight_rules",["require","exports","module","ace/lib/lang"],function(a,b,c){"use strict";var d=a("../lib/lang"),e=function(){this.$rules={start:[{token:"empty_line",regex:"^$"},{token:"text",regex:".+"}]}};(function(){this.addRules=function(a,b){for(var c in a){var d=a[c];for(var e=0;e<d.length;e++){var f=d[e];f.next?f.next=b+f.next:f.next=b+c}this.$rules[b+c]=d}},this.getRules=function(){return this.$rules},this.embedRules=function(a,b,c,e){var f=(new a).getRules();if(e)for(var g=0;g<e.length;g++)e[g]=b+e[g];else{e=[];for(var h in f)e.push(b+h)}this.addRules(f,b);for(var g=0;g<e.length;g++)Array.prototype.unshift.apply(this.$rules[e[g]],d.deepCopy(c));this.$embeds||(this.$embeds=[]),this.$embeds.push(b)},this.getEmbeds=function(){return this.$embeds}}).call(e.prototype),b.TextHighlightRules=e}),define("ace/mode/behaviour",["require","exports","module"],function(a,b,c){"use strict";var d=function(){this.$behaviours={}};(function(){this.add=function(a,b,c){switch(undefined){case this.$behaviours:this.$behaviours={};case this.$behaviours[a]:this.$behaviours[a]={}}this.$behaviours[a][b]=c},this.addBehaviours=function(a){for(var b in a)for(var c in a[b])this.add(b,c,a[b][c])},this.remove=function(a){this.$behaviours&&this.$behaviours[a]&&delete this.$behaviours[a]},this.inherit=function(a,b){if(typeof a=="function")var c=(new a).getBehaviours(b);else var c=a.getBehaviours(b);this.addBehaviours(c)},this.getBehaviours=function(a){if(!a)return this.$behaviours;var b={};for(var c=0;c<a.length;c++)this.$behaviours[a[c]]&&(b[a[c]]=this.$behaviours[a[c]]);return b}}).call(d.prototype),b.Behaviour=d}),define("ace/unicode",["require","exports","module"],function(a,b,c){function d(a){var c=/\w{4}/g;for(var d in a)b.packages[d]=a[d].replace(c,"\\u$&")}"use strict",b.packages={},d({L:"0041-005A0061-007A00AA00B500BA00C0-00D600D8-00F600F8-02C102C6-02D102E0-02E402EC02EE0370-037403760377037A-037D03860388-038A038C038E-03A103A3-03F503F7-0481048A-05250531-055605590561-058705D0-05EA05F0-05F20621-064A066E066F0671-06D306D506E506E606EE06EF06FA-06FC06FF07100712-072F074D-07A507B107CA-07EA07F407F507FA0800-0815081A082408280904-0939093D09500958-0961097109720979-097F0985-098C098F09900993-09A809AA-09B009B209B6-09B909BD09CE09DC09DD09DF-09E109F009F10A05-0A0A0A0F0A100A13-0A280A2A-0A300A320A330A350A360A380A390A59-0A5C0A5E0A72-0A740A85-0A8D0A8F-0A910A93-0AA80AAA-0AB00AB20AB30AB5-0AB90ABD0AD00AE00AE10B05-0B0C0B0F0B100B13-0B280B2A-0B300B320B330B35-0B390B3D0B5C0B5D0B5F-0B610B710B830B85-0B8A0B8E-0B900B92-0B950B990B9A0B9C0B9E0B9F0BA30BA40BA8-0BAA0BAE-0BB90BD00C05-0C0C0C0E-0C100C12-0C280C2A-0C330C35-0C390C3D0C580C590C600C610C85-0C8C0C8E-0C900C92-0CA80CAA-0CB30CB5-0CB90CBD0CDE0CE00CE10D05-0D0C0D0E-0D100D12-0D280D2A-0D390D3D0D600D610D7A-0D7F0D85-0D960D9A-0DB10DB3-0DBB0DBD0DC0-0DC60E01-0E300E320E330E40-0E460E810E820E840E870E880E8A0E8D0E94-0E970E99-0E9F0EA1-0EA30EA50EA70EAA0EAB0EAD-0EB00EB20EB30EBD0EC0-0EC40EC60EDC0EDD0F000F40-0F470F49-0F6C0F88-0F8B1000-102A103F1050-1055105A-105D106110651066106E-10701075-1081108E10A0-10C510D0-10FA10FC1100-1248124A-124D1250-12561258125A-125D1260-1288128A-128D1290-12B012B2-12B512B8-12BE12C012C2-12C512C8-12D612D8-13101312-13151318-135A1380-138F13A0-13F41401-166C166F-167F1681-169A16A0-16EA1700-170C170E-17111720-17311740-17511760-176C176E-17701780-17B317D717DC1820-18771880-18A818AA18B0-18F51900-191C1950-196D1970-19741980-19AB19C1-19C71A00-1A161A20-1A541AA71B05-1B331B45-1B4B1B83-1BA01BAE1BAF1C00-1C231C4D-1C4F1C5A-1C7D1CE9-1CEC1CEE-1CF11D00-1DBF1E00-1F151F18-1F1D1F20-1F451F48-1F4D1F50-1F571F591F5B1F5D1F5F-1F7D1F80-1FB41FB6-1FBC1FBE1FC2-1FC41FC6-1FCC1FD0-1FD31FD6-1FDB1FE0-1FEC1FF2-1FF41FF6-1FFC2071207F2090-209421022107210A-211321152119-211D212421262128212A-212D212F-2139213C-213F2145-2149214E218321842C00-2C2E2C30-2C5E2C60-2CE42CEB-2CEE2D00-2D252D30-2D652D6F2D80-2D962DA0-2DA62DA8-2DAE2DB0-2DB62DB8-2DBE2DC0-2DC62DC8-2DCE2DD0-2DD62DD8-2DDE2E2F300530063031-3035303B303C3041-3096309D-309F30A1-30FA30FC-30FF3105-312D3131-318E31A0-31B731F0-31FF3400-4DB54E00-9FCBA000-A48CA4D0-A4FDA500-A60CA610-A61FA62AA62BA640-A65FA662-A66EA67F-A697A6A0-A6E5A717-A71FA722-A788A78BA78CA7FB-A801A803-A805A807-A80AA80C-A822A840-A873A882-A8B3A8F2-A8F7A8FBA90A-A925A930-A946A960-A97CA984-A9B2A9CFAA00-AA28AA40-AA42AA44-AA4BAA60-AA76AA7AAA80-AAAFAAB1AAB5AAB6AAB9-AABDAAC0AAC2AADB-AADDABC0-ABE2AC00-D7A3D7B0-D7C6D7CB-D7FBF900-FA2DFA30-FA6DFA70-FAD9FB00-FB06FB13-FB17FB1DFB1F-FB28FB2A-FB36FB38-FB3CFB3EFB40FB41FB43FB44FB46-FBB1FBD3-FD3DFD50-FD8FFD92-FDC7FDF0-FDFBFE70-FE74FE76-FEFCFF21-FF3AFF41-FF5AFF66-FFBEFFC2-FFC7FFCA-FFCFFFD2-FFD7FFDA-FFDC",Ll:"0061-007A00AA00B500BA00DF-00F600F8-00FF01010103010501070109010B010D010F01110113011501170119011B011D011F01210123012501270129012B012D012F01310133013501370138013A013C013E014001420144014601480149014B014D014F01510153015501570159015B015D015F01610163016501670169016B016D016F0171017301750177017A017C017E-0180018301850188018C018D019201950199-019B019E01A101A301A501A801AA01AB01AD01B001B401B601B901BA01BD-01BF01C601C901CC01CE01D001D201D401D601D801DA01DC01DD01DF01E101E301E501E701E901EB01ED01EF01F001F301F501F901FB01FD01FF02010203020502070209020B020D020F02110213021502170219021B021D021F02210223022502270229022B022D022F02310233-0239023C023F0240024202470249024B024D024F-02930295-02AF037103730377037B-037D039003AC-03CE03D003D103D5-03D703D903DB03DD03DF03E103E303E503E703E903EB03ED03EF-03F303F503F803FB03FC0430-045F04610463046504670469046B046D046F04710473047504770479047B047D047F0481048B048D048F04910493049504970499049B049D049F04A104A304A504A704A904AB04AD04AF04B104B304B504B704B904BB04BD04BF04C204C404C604C804CA04CC04CE04CF04D104D304D504D704D904DB04DD04DF04E104E304E504E704E904EB04ED04EF04F104F304F504F704F904FB04FD04FF05010503050505070509050B050D050F05110513051505170519051B051D051F0521052305250561-05871D00-1D2B1D62-1D771D79-1D9A1E011E031E051E071E091E0B1E0D1E0F1E111E131E151E171E191E1B1E1D1E1F1E211E231E251E271E291E2B1E2D1E2F1E311E331E351E371E391E3B1E3D1E3F1E411E431E451E471E491E4B1E4D1E4F1E511E531E551E571E591E5B1E5D1E5F1E611E631E651E671E691E6B1E6D1E6F1E711E731E751E771E791E7B1E7D1E7F1E811E831E851E871E891E8B1E8D1E8F1E911E931E95-1E9D1E9F1EA11EA31EA51EA71EA91EAB1EAD1EAF1EB11EB31EB51EB71EB91EBB1EBD1EBF1EC11EC31EC51EC71EC91ECB1ECD1ECF1ED11ED31ED51ED71ED91EDB1EDD1EDF1EE11EE31EE51EE71EE91EEB1EED1EEF1EF11EF31EF51EF71EF91EFB1EFD1EFF-1F071F10-1F151F20-1F271F30-1F371F40-1F451F50-1F571F60-1F671F70-1F7D1F80-1F871F90-1F971FA0-1FA71FB0-1FB41FB61FB71FBE1FC2-1FC41FC61FC71FD0-1FD31FD61FD71FE0-1FE71FF2-1FF41FF61FF7210A210E210F2113212F21342139213C213D2146-2149214E21842C30-2C5E2C612C652C662C682C6A2C6C2C712C732C742C76-2C7C2C812C832C852C872C892C8B2C8D2C8F2C912C932C952C972C992C9B2C9D2C9F2CA12CA32CA52CA72CA92CAB2CAD2CAF2CB12CB32CB52CB72CB92CBB2CBD2CBF2CC12CC32CC52CC72CC92CCB2CCD2CCF2CD12CD32CD52CD72CD92CDB2CDD2CDF2CE12CE32CE42CEC2CEE2D00-2D25A641A643A645A647A649A64BA64DA64FA651A653A655A657A659A65BA65DA65FA663A665A667A669A66BA66DA681A683A685A687A689A68BA68DA68FA691A693A695A697A723A725A727A729A72BA72DA72F-A731A733A735A737A739A73BA73DA73FA741A743A745A747A749A74BA74DA74FA751A753A755A757A759A75BA75DA75FA761A763A765A767A769A76BA76DA76FA771-A778A77AA77CA77FA781A783A785A787A78CFB00-FB06FB13-FB17FF41-FF5A",Lu:"0041-005A00C0-00D600D8-00DE01000102010401060108010A010C010E01100112011401160118011A011C011E01200122012401260128012A012C012E01300132013401360139013B013D013F0141014301450147014A014C014E01500152015401560158015A015C015E01600162016401660168016A016C016E017001720174017601780179017B017D018101820184018601870189-018B018E-0191019301940196-0198019C019D019F01A001A201A401A601A701A901AC01AE01AF01B1-01B301B501B701B801BC01C401C701CA01CD01CF01D101D301D501D701D901DB01DE01E001E201E401E601E801EA01EC01EE01F101F401F6-01F801FA01FC01FE02000202020402060208020A020C020E02100212021402160218021A021C021E02200222022402260228022A022C022E02300232023A023B023D023E02410243-02460248024A024C024E03700372037603860388-038A038C038E038F0391-03A103A3-03AB03CF03D2-03D403D803DA03DC03DE03E003E203E403E603E803EA03EC03EE03F403F703F903FA03FD-042F04600462046404660468046A046C046E04700472047404760478047A047C047E0480048A048C048E04900492049404960498049A049C049E04A004A204A404A604A804AA04AC04AE04B004B204B404B604B804BA04BC04BE04C004C104C304C504C704C904CB04CD04D004D204D404D604D804DA04DC04DE04E004E204E404E604E804EA04EC04EE04F004F204F404F604F804FA04FC04FE05000502050405060508050A050C050E05100512051405160518051A051C051E0520052205240531-055610A0-10C51E001E021E041E061E081E0A1E0C1E0E1E101E121E141E161E181E1A1E1C1E1E1E201E221E241E261E281E2A1E2C1E2E1E301E321E341E361E381E3A1E3C1E3E1E401E421E441E461E481E4A1E4C1E4E1E501E521E541E561E581E5A1E5C1E5E1E601E621E641E661E681E6A1E6C1E6E1E701E721E741E761E781E7A1E7C1E7E1E801E821E841E861E881E8A1E8C1E8E1E901E921E941E9E1EA01EA21EA41EA61EA81EAA1EAC1EAE1EB01EB21EB41EB61EB81EBA1EBC1EBE1EC01EC21EC41EC61EC81ECA1ECC1ECE1ED01ED21ED41ED61ED81EDA1EDC1EDE1EE01EE21EE41EE61EE81EEA1EEC1EEE1EF01EF21EF41EF61EF81EFA1EFC1EFE1F08-1F0F1F18-1F1D1F28-1F2F1F38-1F3F1F48-1F4D1F591F5B1F5D1F5F1F68-1F6F1FB8-1FBB1FC8-1FCB1FD8-1FDB1FE8-1FEC1FF8-1FFB21022107210B-210D2110-211221152119-211D212421262128212A-212D2130-2133213E213F214521832C00-2C2E2C602C62-2C642C672C692C6B2C6D-2C702C722C752C7E-2C802C822C842C862C882C8A2C8C2C8E2C902C922C942C962C982C9A2C9C2C9E2CA02CA22CA42CA62CA82CAA2CAC2CAE2CB02CB22CB42CB62CB82CBA2CBC2CBE2CC02CC22CC42CC62CC82CCA2CCC2CCE2CD02CD22CD42CD62CD82CDA2CDC2CDE2CE02CE22CEB2CEDA640A642A644A646A648A64AA64CA64EA650A652A654A656A658A65AA65CA65EA662A664A666A668A66AA66CA680A682A684A686A688A68AA68CA68EA690A692A694A696A722A724A726A728A72AA72CA72EA732A734A736A738A73AA73CA73EA740A742A744A746A748A74AA74CA74EA750A752A754A756A758A75AA75CA75EA760A762A764A766A768A76AA76CA76EA779A77BA77DA77EA780A782A784A786A78BFF21-FF3A",Lt:"01C501C801CB01F21F88-1F8F1F98-1F9F1FA8-1FAF1FBC1FCC1FFC",Lm:"02B0-02C102C6-02D102E0-02E402EC02EE0374037A0559064006E506E607F407F507FA081A0824082809710E460EC610FC17D718431AA71C78-1C7D1D2C-1D611D781D9B-1DBF2071207F2090-20942C7D2D6F2E2F30053031-3035303B309D309E30FC-30FEA015A4F8-A4FDA60CA67FA717-A71FA770A788A9CFAA70AADDFF70FF9EFF9F",Lo:"01BB01C0-01C3029405D0-05EA05F0-05F20621-063F0641-064A066E066F0671-06D306D506EE06EF06FA-06FC06FF07100712-072F074D-07A507B107CA-07EA0800-08150904-0939093D09500958-096109720979-097F0985-098C098F09900993-09A809AA-09B009B209B6-09B909BD09CE09DC09DD09DF-09E109F009F10A05-0A0A0A0F0A100A13-0A280A2A-0A300A320A330A350A360A380A390A59-0A5C0A5E0A72-0A740A85-0A8D0A8F-0A910A93-0AA80AAA-0AB00AB20AB30AB5-0AB90ABD0AD00AE00AE10B05-0B0C0B0F0B100B13-0B280B2A-0B300B320B330B35-0B390B3D0B5C0B5D0B5F-0B610B710B830B85-0B8A0B8E-0B900B92-0B950B990B9A0B9C0B9E0B9F0BA30BA40BA8-0BAA0BAE-0BB90BD00C05-0C0C0C0E-0C100C12-0C280C2A-0C330C35-0C390C3D0C580C590C600C610C85-0C8C0C8E-0C900C92-0CA80CAA-0CB30CB5-0CB90CBD0CDE0CE00CE10D05-0D0C0D0E-0D100D12-0D280D2A-0D390D3D0D600D610D7A-0D7F0D85-0D960D9A-0DB10DB3-0DBB0DBD0DC0-0DC60E01-0E300E320E330E40-0E450E810E820E840E870E880E8A0E8D0E94-0E970E99-0E9F0EA1-0EA30EA50EA70EAA0EAB0EAD-0EB00EB20EB30EBD0EC0-0EC40EDC0EDD0F000F40-0F470F49-0F6C0F88-0F8B1000-102A103F1050-1055105A-105D106110651066106E-10701075-1081108E10D0-10FA1100-1248124A-124D1250-12561258125A-125D1260-1288128A-128D1290-12B012B2-12B512B8-12BE12C012C2-12C512C8-12D612D8-13101312-13151318-135A1380-138F13A0-13F41401-166C166F-167F1681-169A16A0-16EA1700-170C170E-17111720-17311740-17511760-176C176E-17701780-17B317DC1820-18421844-18771880-18A818AA18B0-18F51900-191C1950-196D1970-19741980-19AB19C1-19C71A00-1A161A20-1A541B05-1B331B45-1B4B1B83-1BA01BAE1BAF1C00-1C231C4D-1C4F1C5A-1C771CE9-1CEC1CEE-1CF12135-21382D30-2D652D80-2D962DA0-2DA62DA8-2DAE2DB0-2DB62DB8-2DBE2DC0-2DC62DC8-2DCE2DD0-2DD62DD8-2DDE3006303C3041-3096309F30A1-30FA30FF3105-312D3131-318E31A0-31B731F0-31FF3400-4DB54E00-9FCBA000-A014A016-A48CA4D0-A4F7A500-A60BA610-A61FA62AA62BA66EA6A0-A6E5A7FB-A801A803-A805A807-A80AA80C-A822A840-A873A882-A8B3A8F2-A8F7A8FBA90A-A925A930-A946A960-A97CA984-A9B2AA00-AA28AA40-AA42AA44-AA4BAA60-AA6FAA71-AA76AA7AAA80-AAAFAAB1AAB5AAB6AAB9-AABDAAC0AAC2AADBAADCABC0-ABE2AC00-D7A3D7B0-D7C6D7CB-D7FBF900-FA2DFA30-FA6DFA70-FAD9FB1DFB1F-FB28FB2A-FB36FB38-FB3CFB3EFB40FB41FB43FB44FB46-FBB1FBD3-FD3DFD50-FD8FFD92-FDC7FDF0-FDFBFE70-FE74FE76-FEFCFF66-FF6FFF71-FF9DFFA0-FFBEFFC2-FFC7FFCA-FFCFFFD2-FFD7FFDA-FFDC",M:"0300-036F0483-04890591-05BD05BF05C105C205C405C505C70610-061A064B-065E067006D6-06DC06DE-06E406E706E806EA-06ED07110730-074A07A6-07B007EB-07F30816-0819081B-08230825-08270829-082D0900-0903093C093E-094E0951-0955096209630981-098309BC09BE-09C409C709C809CB-09CD09D709E209E30A01-0A030A3C0A3E-0A420A470A480A4B-0A4D0A510A700A710A750A81-0A830ABC0ABE-0AC50AC7-0AC90ACB-0ACD0AE20AE30B01-0B030B3C0B3E-0B440B470B480B4B-0B4D0B560B570B620B630B820BBE-0BC20BC6-0BC80BCA-0BCD0BD70C01-0C030C3E-0C440C46-0C480C4A-0C4D0C550C560C620C630C820C830CBC0CBE-0CC40CC6-0CC80CCA-0CCD0CD50CD60CE20CE30D020D030D3E-0D440D46-0D480D4A-0D4D0D570D620D630D820D830DCA0DCF-0DD40DD60DD8-0DDF0DF20DF30E310E34-0E3A0E47-0E4E0EB10EB4-0EB90EBB0EBC0EC8-0ECD0F180F190F350F370F390F3E0F3F0F71-0F840F860F870F90-0F970F99-0FBC0FC6102B-103E1056-1059105E-10601062-10641067-106D1071-10741082-108D108F109A-109D135F1712-17141732-1734175217531772177317B6-17D317DD180B-180D18A91920-192B1930-193B19B0-19C019C819C91A17-1A1B1A55-1A5E1A60-1A7C1A7F1B00-1B041B34-1B441B6B-1B731B80-1B821BA1-1BAA1C24-1C371CD0-1CD21CD4-1CE81CED1CF21DC0-1DE61DFD-1DFF20D0-20F02CEF-2CF12DE0-2DFF302A-302F3099309AA66F-A672A67CA67DA6F0A6F1A802A806A80BA823-A827A880A881A8B4-A8C4A8E0-A8F1A926-A92DA947-A953A980-A983A9B3-A9C0AA29-AA36AA43AA4CAA4DAA7BAAB0AAB2-AAB4AAB7AAB8AABEAABFAAC1ABE3-ABEAABECABEDFB1EFE00-FE0FFE20-FE26",Mn:"0300-036F0483-04870591-05BD05BF05C105C205C405C505C70610-061A064B-065E067006D6-06DC06DF-06E406E706E806EA-06ED07110730-074A07A6-07B007EB-07F30816-0819081B-08230825-08270829-082D0900-0902093C0941-0948094D0951-095509620963098109BC09C1-09C409CD09E209E30A010A020A3C0A410A420A470A480A4B-0A4D0A510A700A710A750A810A820ABC0AC1-0AC50AC70AC80ACD0AE20AE30B010B3C0B3F0B41-0B440B4D0B560B620B630B820BC00BCD0C3E-0C400C46-0C480C4A-0C4D0C550C560C620C630CBC0CBF0CC60CCC0CCD0CE20CE30D41-0D440D4D0D620D630DCA0DD2-0DD40DD60E310E34-0E3A0E47-0E4E0EB10EB4-0EB90EBB0EBC0EC8-0ECD0F180F190F350F370F390F71-0F7E0F80-0F840F860F870F90-0F970F99-0FBC0FC6102D-10301032-10371039103A103D103E10581059105E-10601071-1074108210851086108D109D135F1712-17141732-1734175217531772177317B7-17BD17C617C9-17D317DD180B-180D18A91920-19221927192819321939-193B1A171A181A561A58-1A5E1A601A621A65-1A6C1A73-1A7C1A7F1B00-1B031B341B36-1B3A1B3C1B421B6B-1B731B801B811BA2-1BA51BA81BA91C2C-1C331C361C371CD0-1CD21CD4-1CE01CE2-1CE81CED1DC0-1DE61DFD-1DFF20D0-20DC20E120E5-20F02CEF-2CF12DE0-2DFF302A-302F3099309AA66FA67CA67DA6F0A6F1A802A806A80BA825A826A8C4A8E0-A8F1A926-A92DA947-A951A980-A982A9B3A9B6-A9B9A9BCAA29-AA2EAA31AA32AA35AA36AA43AA4CAAB0AAB2-AAB4AAB7AAB8AABEAABFAAC1ABE5ABE8ABEDFB1EFE00-FE0FFE20-FE26",Mc:"0903093E-09400949-094C094E0982098309BE-09C009C709C809CB09CC09D70A030A3E-0A400A830ABE-0AC00AC90ACB0ACC0B020B030B3E0B400B470B480B4B0B4C0B570BBE0BBF0BC10BC20BC6-0BC80BCA-0BCC0BD70C01-0C030C41-0C440C820C830CBE0CC0-0CC40CC70CC80CCA0CCB0CD50CD60D020D030D3E-0D400D46-0D480D4A-0D4C0D570D820D830DCF-0DD10DD8-0DDF0DF20DF30F3E0F3F0F7F102B102C10311038103B103C105610571062-10641067-106D108310841087-108C108F109A-109C17B617BE-17C517C717C81923-19261929-192B193019311933-193819B0-19C019C819C91A19-1A1B1A551A571A611A631A641A6D-1A721B041B351B3B1B3D-1B411B431B441B821BA11BA61BA71BAA1C24-1C2B1C341C351CE11CF2A823A824A827A880A881A8B4-A8C3A952A953A983A9B4A9B5A9BAA9BBA9BD-A9C0AA2FAA30AA33AA34AA4DAA7BABE3ABE4ABE6ABE7ABE9ABEAABEC",Me:"0488048906DE20DD-20E020E2-20E4A670-A672",N:"0030-003900B200B300B900BC-00BE0660-066906F0-06F907C0-07C90966-096F09E6-09EF09F4-09F90A66-0A6F0AE6-0AEF0B66-0B6F0BE6-0BF20C66-0C6F0C78-0C7E0CE6-0CEF0D66-0D750E50-0E590ED0-0ED90F20-0F331040-10491090-10991369-137C16EE-16F017E0-17E917F0-17F91810-18191946-194F19D0-19DA1A80-1A891A90-1A991B50-1B591BB0-1BB91C40-1C491C50-1C5920702074-20792080-20892150-21822185-21892460-249B24EA-24FF2776-27932CFD30073021-30293038-303A3192-31953220-32293251-325F3280-328932B1-32BFA620-A629A6E6-A6EFA830-A835A8D0-A8D9A900-A909A9D0-A9D9AA50-AA59ABF0-ABF9FF10-FF19",Nd:"0030-00390660-066906F0-06F907C0-07C90966-096F09E6-09EF0A66-0A6F0AE6-0AEF0B66-0B6F0BE6-0BEF0C66-0C6F0CE6-0CEF0D66-0D6F0E50-0E590ED0-0ED90F20-0F291040-10491090-109917E0-17E91810-18191946-194F19D0-19DA1A80-1A891A90-1A991B50-1B591BB0-1BB91C40-1C491C50-1C59A620-A629A8D0-A8D9A900-A909A9D0-A9D9AA50-AA59ABF0-ABF9FF10-FF19",Nl:"16EE-16F02160-21822185-218830073021-30293038-303AA6E6-A6EF",No:"00B200B300B900BC-00BE09F4-09F90BF0-0BF20C78-0C7E0D70-0D750F2A-0F331369-137C17F0-17F920702074-20792080-20892150-215F21892460-249B24EA-24FF2776-27932CFD3192-31953220-32293251-325F3280-328932B1-32BFA830-A835",P:"0021-00230025-002A002C-002F003A003B003F0040005B-005D005F007B007D00A100AB00B700BB00BF037E0387055A-055F0589058A05BE05C005C305C605F305F40609060A060C060D061B061E061F066A-066D06D40700-070D07F7-07F90830-083E0964096509700DF40E4F0E5A0E5B0F04-0F120F3A-0F3D0F850FD0-0FD4104A-104F10FB1361-13681400166D166E169B169C16EB-16ED1735173617D4-17D617D8-17DA1800-180A1944194519DE19DF1A1E1A1F1AA0-1AA61AA8-1AAD1B5A-1B601C3B-1C3F1C7E1C7F1CD32010-20272030-20432045-20512053-205E207D207E208D208E2329232A2768-277527C527C627E6-27EF2983-299829D8-29DB29FC29FD2CF9-2CFC2CFE2CFF2E00-2E2E2E302E313001-30033008-30113014-301F3030303D30A030FBA4FEA4FFA60D-A60FA673A67EA6F2-A6F7A874-A877A8CEA8CFA8F8-A8FAA92EA92FA95FA9C1-A9CDA9DEA9DFAA5C-AA5FAADEAADFABEBFD3EFD3FFE10-FE19FE30-FE52FE54-FE61FE63FE68FE6AFE6BFF01-FF03FF05-FF0AFF0C-FF0FFF1AFF1BFF1FFF20FF3B-FF3DFF3FFF5BFF5DFF5F-FF65",Pd:"002D058A05BE140018062010-20152E172E1A301C303030A0FE31FE32FE58FE63FF0D",Ps:"0028005B007B0F3A0F3C169B201A201E2045207D208D23292768276A276C276E27702772277427C527E627E827EA27EC27EE2983298529872989298B298D298F299129932995299729D829DA29FC2E222E242E262E283008300A300C300E3010301430163018301A301DFD3EFE17FE35FE37FE39FE3BFE3DFE3FFE41FE43FE47FE59FE5BFE5DFF08FF3BFF5BFF5FFF62",Pe:"0029005D007D0F3B0F3D169C2046207E208E232A2769276B276D276F27712773277527C627E727E927EB27ED27EF298429862988298A298C298E2990299229942996299829D929DB29FD2E232E252E272E293009300B300D300F3011301530173019301B301E301FFD3FFE18FE36FE38FE3AFE3CFE3EFE40FE42FE44FE48FE5AFE5CFE5EFF09FF3DFF5DFF60FF63",Pi:"00AB2018201B201C201F20392E022E042E092E0C2E1C2E20",Pf:"00BB2019201D203A2E032E052E0A2E0D2E1D2E21",Pc:"005F203F20402054FE33FE34FE4D-FE4FFF3F",Po:"0021-00230025-0027002A002C002E002F003A003B003F0040005C00A100B700BF037E0387055A-055F058905C005C305C605F305F40609060A060C060D061B061E061F066A-066D06D40700-070D07F7-07F90830-083E0964096509700DF40E4F0E5A0E5B0F04-0F120F850FD0-0FD4104A-104F10FB1361-1368166D166E16EB-16ED1735173617D4-17D617D8-17DA1800-18051807-180A1944194519DE19DF1A1E1A1F1AA0-1AA61AA8-1AAD1B5A-1B601C3B-1C3F1C7E1C7F1CD3201620172020-20272030-2038203B-203E2041-20432047-205120532055-205E2CF9-2CFC2CFE2CFF2E002E012E06-2E082E0B2E0E-2E162E182E192E1B2E1E2E1F2E2A-2E2E2E302E313001-3003303D30FBA4FEA4FFA60D-A60FA673A67EA6F2-A6F7A874-A877A8CEA8CFA8F8-A8FAA92EA92FA95FA9C1-A9CDA9DEA9DFAA5C-AA5FAADEAADFABEBFE10-FE16FE19FE30FE45FE46FE49-FE4CFE50-FE52FE54-FE57FE5F-FE61FE68FE6AFE6BFF01-FF03FF05-FF07FF0AFF0CFF0EFF0FFF1AFF1BFF1FFF20FF3CFF61FF64FF65",S:"0024002B003C-003E005E0060007C007E00A2-00A900AC00AE-00B100B400B600B800D700F702C2-02C502D2-02DF02E5-02EB02ED02EF-02FF03750384038503F604820606-0608060B060E060F06E906FD06FE07F609F209F309FA09FB0AF10B700BF3-0BFA0C7F0CF10CF20D790E3F0F01-0F030F13-0F170F1A-0F1F0F340F360F380FBE-0FC50FC7-0FCC0FCE0FCF0FD5-0FD8109E109F13601390-139917DB194019E0-19FF1B61-1B6A1B74-1B7C1FBD1FBF-1FC11FCD-1FCF1FDD-1FDF1FED-1FEF1FFD1FFE20442052207A-207C208A-208C20A0-20B8210021012103-21062108210921142116-2118211E-2123212521272129212E213A213B2140-2144214A-214D214F2190-2328232B-23E82400-24262440-244A249C-24E92500-26CD26CF-26E126E326E8-26FF2701-27042706-2709270C-27272729-274B274D274F-27522756-275E2761-276727942798-27AF27B1-27BE27C0-27C427C7-27CA27CC27D0-27E527F0-29822999-29D729DC-29FB29FE-2B4C2B50-2B592CE5-2CEA2E80-2E992E9B-2EF32F00-2FD52FF0-2FFB300430123013302030363037303E303F309B309C319031913196-319F31C0-31E33200-321E322A-32503260-327F328A-32B032C0-32FE3300-33FF4DC0-4DFFA490-A4C6A700-A716A720A721A789A78AA828-A82BA836-A839AA77-AA79FB29FDFCFDFDFE62FE64-FE66FE69FF04FF0BFF1C-FF1EFF3EFF40FF5CFF5EFFE0-FFE6FFE8-FFEEFFFCFFFD",Sm:"002B003C-003E007C007E00AC00B100D700F703F60606-060820442052207A-207C208A-208C2140-2144214B2190-2194219A219B21A021A321A621AE21CE21CF21D221D421F4-22FF2308-230B23202321237C239B-23B323DC-23E125B725C125F8-25FF266F27C0-27C427C7-27CA27CC27D0-27E527F0-27FF2900-29822999-29D729DC-29FB29FE-2AFF2B30-2B442B47-2B4CFB29FE62FE64-FE66FF0BFF1C-FF1EFF5CFF5EFFE2FFE9-FFEC",Sc:"002400A2-00A5060B09F209F309FB0AF10BF90E3F17DB20A0-20B8A838FDFCFE69FF04FFE0FFE1FFE5FFE6",Sk:"005E006000A800AF00B400B802C2-02C502D2-02DF02E5-02EB02ED02EF-02FF0375038403851FBD1FBF-1FC11FCD-1FCF1FDD-1FDF1FED-1FEF1FFD1FFE309B309CA700-A716A720A721A789A78AFF3EFF40FFE3",So:"00A600A700A900AE00B000B60482060E060F06E906FD06FE07F609FA0B700BF3-0BF80BFA0C7F0CF10CF20D790F01-0F030F13-0F170F1A-0F1F0F340F360F380FBE-0FC50FC7-0FCC0FCE0FCF0FD5-0FD8109E109F13601390-1399194019E0-19FF1B61-1B6A1B74-1B7C210021012103-21062108210921142116-2118211E-2123212521272129212E213A213B214A214C214D214F2195-2199219C-219F21A121A221A421A521A7-21AD21AF-21CD21D021D121D321D5-21F32300-2307230C-231F2322-2328232B-237B237D-239A23B4-23DB23E2-23E82400-24262440-244A249C-24E92500-25B625B8-25C025C2-25F72600-266E2670-26CD26CF-26E126E326E8-26FF2701-27042706-2709270C-27272729-274B274D274F-27522756-275E2761-276727942798-27AF27B1-27BE2800-28FF2B00-2B2F2B452B462B50-2B592CE5-2CEA2E80-2E992E9B-2EF32F00-2FD52FF0-2FFB300430123013302030363037303E303F319031913196-319F31C0-31E33200-321E322A-32503260-327F328A-32B032C0-32FE3300-33FF4DC0-4DFFA490-A4C6A828-A82BA836A837A839AA77-AA79FDFDFFE4FFE8FFEDFFEEFFFCFFFD",Z:"002000A01680180E2000-200A20282029202F205F3000",Zs:"002000A01680180E2000-200A202F205F3000",Zl:"2028",Zp:"2029",C:"0000-001F007F-009F00AD03780379037F-0383038B038D03A20526-05300557055805600588058B-059005C8-05CF05EB-05EF05F5-0605061C061D0620065F06DD070E070F074B074C07B2-07BF07FB-07FF082E082F083F-08FF093A093B094F095609570973-097809800984098D098E0991099209A909B109B3-09B509BA09BB09C509C609C909CA09CF-09D609D8-09DB09DE09E409E509FC-0A000A040A0B-0A0E0A110A120A290A310A340A370A3A0A3B0A3D0A43-0A460A490A4A0A4E-0A500A52-0A580A5D0A5F-0A650A76-0A800A840A8E0A920AA90AB10AB40ABA0ABB0AC60ACA0ACE0ACF0AD1-0ADF0AE40AE50AF00AF2-0B000B040B0D0B0E0B110B120B290B310B340B3A0B3B0B450B460B490B4A0B4E-0B550B58-0B5B0B5E0B640B650B72-0B810B840B8B-0B8D0B910B96-0B980B9B0B9D0BA0-0BA20BA5-0BA70BAB-0BAD0BBA-0BBD0BC3-0BC50BC90BCE0BCF0BD1-0BD60BD8-0BE50BFB-0C000C040C0D0C110C290C340C3A-0C3C0C450C490C4E-0C540C570C5A-0C5F0C640C650C70-0C770C800C810C840C8D0C910CA90CB40CBA0CBB0CC50CC90CCE-0CD40CD7-0CDD0CDF0CE40CE50CF00CF3-0D010D040D0D0D110D290D3A-0D3C0D450D490D4E-0D560D58-0D5F0D640D650D76-0D780D800D810D840D97-0D990DB20DBC0DBE0DBF0DC7-0DC90DCB-0DCE0DD50DD70DE0-0DF10DF5-0E000E3B-0E3E0E5C-0E800E830E850E860E890E8B0E8C0E8E-0E930E980EA00EA40EA60EA80EA90EAC0EBA0EBE0EBF0EC50EC70ECE0ECF0EDA0EDB0EDE-0EFF0F480F6D-0F700F8C-0F8F0F980FBD0FCD0FD9-0FFF10C6-10CF10FD-10FF1249124E124F12571259125E125F1289128E128F12B112B612B712BF12C112C612C712D7131113161317135B-135E137D-137F139A-139F13F5-13FF169D-169F16F1-16FF170D1715-171F1737-173F1754-175F176D17711774-177F17B417B517DE17DF17EA-17EF17FA-17FF180F181A-181F1878-187F18AB-18AF18F6-18FF191D-191F192C-192F193C-193F1941-1943196E196F1975-197F19AC-19AF19CA-19CF19DB-19DD1A1C1A1D1A5F1A7D1A7E1A8A-1A8F1A9A-1A9F1AAE-1AFF1B4C-1B4F1B7D-1B7F1BAB-1BAD1BBA-1BFF1C38-1C3A1C4A-1C4C1C80-1CCF1CF3-1CFF1DE7-1DFC1F161F171F1E1F1F1F461F471F4E1F4F1F581F5A1F5C1F5E1F7E1F7F1FB51FC51FD41FD51FDC1FF01FF11FF51FFF200B-200F202A-202E2060-206F20722073208F2095-209F20B9-20CF20F1-20FF218A-218F23E9-23FF2427-243F244B-245F26CE26E226E4-26E727002705270A270B2728274C274E2753-2755275F27602795-279727B027BF27CB27CD-27CF2B4D-2B4F2B5A-2BFF2C2F2C5F2CF2-2CF82D26-2D2F2D66-2D6E2D70-2D7F2D97-2D9F2DA72DAF2DB72DBF2DC72DCF2DD72DDF2E32-2E7F2E9A2EF4-2EFF2FD6-2FEF2FFC-2FFF3040309730983100-3104312E-3130318F31B8-31BF31E4-31EF321F32FF4DB6-4DBF9FCC-9FFFA48D-A48FA4C7-A4CFA62C-A63FA660A661A674-A67BA698-A69FA6F8-A6FFA78D-A7FAA82C-A82FA83A-A83FA878-A87FA8C5-A8CDA8DA-A8DFA8FC-A8FFA954-A95EA97D-A97FA9CEA9DA-A9DDA9E0-A9FFAA37-AA3FAA4EAA4FAA5AAA5BAA7C-AA7FAAC3-AADAAAE0-ABBFABEEABEFABFA-ABFFD7A4-D7AFD7C7-D7CAD7FC-F8FFFA2EFA2FFA6EFA6FFADA-FAFFFB07-FB12FB18-FB1CFB37FB3DFB3FFB42FB45FBB2-FBD2FD40-FD4FFD90FD91FDC8-FDEFFDFEFDFFFE1A-FE1FFE27-FE2FFE53FE67FE6C-FE6FFE75FEFD-FF00FFBF-FFC1FFC8FFC9FFD0FFD1FFD8FFD9FFDD-FFDFFFE7FFEF-FFFBFFFEFFFF",Cc:"0000-001F007F-009F",Cf:"00AD0600-060306DD070F17B417B5200B-200F202A-202E2060-2064206A-206FFEFFFFF9-FFFB",Co:"E000-F8FF",Cs:"D800-DFFF",Cn:"03780379037F-0383038B038D03A20526-05300557055805600588058B-059005C8-05CF05EB-05EF05F5-05FF06040605061C061D0620065F070E074B074C07B2-07BF07FB-07FF082E082F083F-08FF093A093B094F095609570973-097809800984098D098E0991099209A909B109B3-09B509BA09BB09C509C609C909CA09CF-09D609D8-09DB09DE09E409E509FC-0A000A040A0B-0A0E0A110A120A290A310A340A370A3A0A3B0A3D0A43-0A460A490A4A0A4E-0A500A52-0A580A5D0A5F-0A650A76-0A800A840A8E0A920AA90AB10AB40ABA0ABB0AC60ACA0ACE0ACF0AD1-0ADF0AE40AE50AF00AF2-0B000B040B0D0B0E0B110B120B290B310B340B3A0B3B0B450B460B490B4A0B4E-0B550B58-0B5B0B5E0B640B650B72-0B810B840B8B-0B8D0B910B96-0B980B9B0B9D0BA0-0BA20BA5-0BA70BAB-0BAD0BBA-0BBD0BC3-0BC50BC90BCE0BCF0BD1-0BD60BD8-0BE50BFB-0C000C040C0D0C110C290C340C3A-0C3C0C450C490C4E-0C540C570C5A-0C5F0C640C650C70-0C770C800C810C840C8D0C910CA90CB40CBA0CBB0CC50CC90CCE-0CD40CD7-0CDD0CDF0CE40CE50CF00CF3-0D010D040D0D0D110D290D3A-0D3C0D450D490D4E-0D560D58-0D5F0D640D650D76-0D780D800D810D840D97-0D990DB20DBC0DBE0DBF0DC7-0DC90DCB-0DCE0DD50DD70DE0-0DF10DF5-0E000E3B-0E3E0E5C-0E800E830E850E860E890E8B0E8C0E8E-0E930E980EA00EA40EA60EA80EA90EAC0EBA0EBE0EBF0EC50EC70ECE0ECF0EDA0EDB0EDE-0EFF0F480F6D-0F700F8C-0F8F0F980FBD0FCD0FD9-0FFF10C6-10CF10FD-10FF1249124E124F12571259125E125F1289128E128F12B112B612B712BF12C112C612C712D7131113161317135B-135E137D-137F139A-139F13F5-13FF169D-169F16F1-16FF170D1715-171F1737-173F1754-175F176D17711774-177F17DE17DF17EA-17EF17FA-17FF180F181A-181F1878-187F18AB-18AF18F6-18FF191D-191F192C-192F193C-193F1941-1943196E196F1975-197F19AC-19AF19CA-19CF19DB-19DD1A1C1A1D1A5F1A7D1A7E1A8A-1A8F1A9A-1A9F1AAE-1AFF1B4C-1B4F1B7D-1B7F1BAB-1BAD1BBA-1BFF1C38-1C3A1C4A-1C4C1C80-1CCF1CF3-1CFF1DE7-1DFC1F161F171F1E1F1F1F461F471F4E1F4F1F581F5A1F5C1F5E1F7E1F7F1FB51FC51FD41FD51FDC1FF01FF11FF51FFF2065-206920722073208F2095-209F20B9-20CF20F1-20FF218A-218F23E9-23FF2427-243F244B-245F26CE26E226E4-26E727002705270A270B2728274C274E2753-2755275F27602795-279727B027BF27CB27CD-27CF2B4D-2B4F2B5A-2BFF2C2F2C5F2CF2-2CF82D26-2D2F2D66-2D6E2D70-2D7F2D97-2D9F2DA72DAF2DB72DBF2DC72DCF2DD72DDF2E32-2E7F2E9A2EF4-2EFF2FD6-2FEF2FFC-2FFF3040309730983100-3104312E-3130318F31B8-31BF31E4-31EF321F32FF4DB6-4DBF9FCC-9FFFA48D-A48FA4C7-A4CFA62C-A63FA660A661A674-A67BA698-A69FA6F8-A6FFA78D-A7FAA82C-A82FA83A-A83FA878-A87FA8C5-A8CDA8DA-A8DFA8FC-A8FFA954-A95EA97D-A97FA9CEA9DA-A9DDA9E0-A9FFAA37-AA3FAA4EAA4FAA5AAA5BAA7C-AA7FAAC3-AADAAAE0-ABBFABEEABEFABFA-ABFFD7A4-D7AFD7C7-D7CAD7FC-D7FFFA2EFA2FFA6EFA6FFADA-FAFFFB07-FB12FB18-FB1CFB37FB3DFB3FFB42FB45FBB2-FBD2FD40-FD4FFD90FD91FDC8-FDEFFDFEFDFFFE1A-FE1FFE27-FE2FFE53FE67FE6C-FE6FFE75FEFDFEFEFF00FFBF-FFC1FFC8FFC9FFD0FFD1FFD8FFD9FFDD-FFDFFFE7FFEF-FFF8FFFEFFFF"})}),define("ace/document",["require","exports","module","ace/lib/oop","ace/lib/event_emitter","ace/range","ace/anchor"],function(a,b,c){"use strict";var d=a("./lib/oop"),e=a("./lib/event_emitter").EventEmitter,f=a("./range").Range,g=a("./anchor").Anchor,h=function(a){this.$lines=[],Array.isArray(a)?this.insertLines(0,a):a.length==0?this.$lines=[""]:this.insert({row:0,column:0},a)};(function(){d.implement(this,e),this.setValue=function(a){var b=this.getLength();this.remove(new f(0,0,b,this.getLine(b-1).length)),this.insert({row:0,column:0},a)},this.getValue=function(){return this.getAllLines().join(this.getNewLineCharacter())},this.createAnchor=function(a,b){return new g(this,a,b)},"aaa".split(/a/).length==0?this.$split=function(a){return a.replace(/\r\n|\r/g,"\n").split("\n")}:this.$split=function(a){return a.split(/\r\n|\r|\n/)},this.$detectNewLine=function(a){var b=a.match(/^.*?(\r\n|\r|\n)/m);b?this.$autoNewLine=b[1]:this.$autoNewLine="\n"},this.getNewLineCharacter=function(){switch(this.$newLineMode){case"windows":return"\r\n";case"unix":return"\n";case"auto":return this.$autoNewLine}},this.$autoNewLine="\n",this.$newLineMode="auto",this.setNewLineMode=function(a){if(this.$newLineMode===a)return;this.$newLineMode=a},this.getNewLineMode=function(){return this.$newLineMode},this.isNewLine=function(a){return a=="\r\n"||a=="\r"||a=="\n"},this.getLine=function(a){return this.$lines[a]||""},this.getLines=function(a,b){return this.$lines.slice(a,b+1)},this.getAllLines=function(){return this.getLines(0,this.getLength())},this.getLength=function(){return this.$lines.length},this.getTextRange=function(a){if(a.start.row==a.end.row)return this.$lines[a.start.row].substring(a.start.column,a.end.column);var b=[];return b.push(this.$lines[a.start.row].substring(a.start.column)),b.push.apply(b,this.getLines(a.start.row+1,a.end.row-1)),b.push(this.$lines[a.end.row].substring(0,a.end.column)),b.join(this.getNewLineCharacter())},this.$clipPosition=function(a){var b=this.getLength();return a.row>=b&&(a.row=Math.max(0,b-1),a.column=this.getLine(b-1).length),a},this.insert=function(a,b){if(!b||b.length===0)return a;a=this.$clipPosition(a),this.getLength()<=1&&this.$detectNewLine(b);var c=this.$split(b),d=c.splice(0,1)[0],e=c.length==0?null:c.splice(c.length-1,1)[0];return a=this.insertInLine(a,d),e!==null&&(a=this.insertNewLine(a),a=this.insertLines(a.row,c),a=this.insertInLine(a,e||"")),a},this.insertLines=function(a,b){if(b.length==0)return{row:a,column:0};var c=[a,0];c.push.apply(c,b),this.$lines.splice.apply(this.$lines,c);var d=new f(a,0,a+b.length,0),e={action:"insertLines",range:d,lines:b};return this._emit("change",{data:e}),d.end},this.insertNewLine=function(a){a=this.$clipPosition(a);var b=this.$lines[a.row]||"";this.$lines[a.row]=b.substring(0,a.column),this.$lines.splice(a.row+1,0,b.substring(a.column,b.length));var c={row:a.row+1,column:0},d={action:"insertText",range:f.fromPoints(a,c),text:this.getNewLineCharacter()};return this._emit("change",{data:d}),c},this.insertInLine=function(a,b){if(b.length==0)return a;var c=this.$lines[a.row]||"";this.$lines[a.row]=c.substring(0,a.column)+b+c.substring(a.column);var d={row:a.row,column:a.column+b.length},e={action:"insertText",range:f.fromPoints(a,d),text:b};return this._emit("change",{data:e}),d},this.remove=function(a){a.start=this.$clipPosition(a.start),a.end=this.$clipPosition(a.end);if(a.isEmpty())return a.start;var b=a.start.row,c=a.end.row;if(a.isMultiLine()){var d=a.start.column==0?b:b+1,e=c-1;a.end.column>0&&this.removeInLine(c,0,a.end.column),e>=d&&this.removeLines(d,e),d!=b&&(this.removeInLine(b,a.start.column,this.getLine(b).length),this.removeNewLine(a.start.row))}else this.removeInLine(b,a.start.column,a.end.column);return a.start},this.removeInLine=function(a,b,c){if(b==c)return;var d=new f(a,b,a,c),e=this.getLine(a),g=e.substring(b,c),h=e.substring(0,b)+e.substring(c,e.length);this.$lines.splice(a,1,h);var i={action:"removeText",range:d,text:g};return this._emit("change",{data:i}),d.start},this.removeLines=function(a,b){var c=new f(a,0,b+1,0),d=this.$lines.splice(a,b-a+1),e={action:"removeLines",range:c,nl:this.getNewLineCharacter(),lines:d};return this._emit("change",{data:e}),d},this.removeNewLine=function(a){var b=this.getLine(a),c=this.getLine(a+1),d=new f(a,b.length,a+1,0),e=b+c;this.$lines.splice(a,2,e);var g={action:"removeText",range:d,text:this.getNewLineCharacter()};this._emit("change",{data:g})},this.replace=function(a,b){if(b.length==0&&a.isEmpty())return a.start;if(b==this.getTextRange(a))return a.end;this.remove(a);if(b)var c=this.insert(a.start,b);else c=a.start;return c},this.applyDeltas=function(a){for(var b=0;b<a.length;b++){var c=a[b],d=f.fromPoints(c.range.start,c.range.end);c.action=="insertLines"?this.insertLines(d.start.row,c.lines):c.action=="insertText"?this.insert(d.start,c.text):c.action=="removeLines"?this.removeLines(d.start.row,d.end.row-1):c.action=="removeText"&&this.remove(d)}},this.revertDeltas=function(a){for(var b=a.length-1;b>=0;b--){var c=a[b],d=f.fromPoints(c.range.start,c.range.end);c.action=="insertLines"?this.removeLines(d.start.row,d.end.row-1):c.action=="insertText"?this.remove(d):c.action=="removeLines"?this.insertLines(d.start.row,c.lines):c.action=="removeText"&&this.insert(d.start,c.text)}}}).call(h.prototype),b.Document=h}),define("ace/anchor",["require","exports","module","ace/lib/oop","ace/lib/event_emitter"],function(a,b,c){"use strict";var d=a("./lib/oop"),e=a("./lib/event_emitter").EventEmitter,f=b.Anchor=function(a,b,c){this.document=a,typeof c=="undefined"?this.setPosition(b.row,b.column):this.setPosition(b,c),this.$onChange=this.onChange.bind(this),a.on("change",this.$onChange)};(function(){d.implement(this,e),this.getPosition=function(){return this.$clipPositionToDocument(this.row,this.column)},this.getDocument=function(){return this.document},this.onChange=function(a){var b=a.data,c=b.range;if(c.start.row==c.end.row&&c.start.row!=this.row)return;if(c.start.row>this.row)return;if(c.start.row==this.row&&c.start.column>this.column)return;var d=this.row,e=this.column;b.action==="insertText"?c.start.row===d&&c.start.column<=e?c.start.row===c.end.row?e+=c.end.column-c.start.column:(e-=c.start.column,d+=c.end.row-c.start.row):c.start.row!==c.end.row&&c.start.row<d&&(d+=c.end.row-c.start.row):b.action==="insertLines"?c.start.row<=d&&(d+=c.end.row-c.start.row):b.action=="removeText"?c.start.row==d&&c.start.column<e?c.end.column>=e?e=c.start.column:e=Math.max(0,e-(c.end.column-c.start.column)):c.start.row!==c.end.row&&c.start.row<d?(c.end.row==d&&(e=Math.max(0,e-c.end.column)+c.start.column),d-=c.end.row-c.start.row):c.end.row==d&&(d-=c.end.row-c.start.row,e=Math.max(0,e-c.end.column)+c.start.column):b.action=="removeLines"&&c.start.row<=d&&(c.end.row<=d?d-=c.end.row-c.start.row:(d=c.start.row,e=0)),this.setPosition(d,e,!0)},this.setPosition=function(a,b,c){var d;c?d={row:a,column:b}:d=this.$clipPositionToDocument(a,b);if(this.row==d.row&&this.column==d.column)return;var e={row:this.row,column:this.column};this.row=d.row,this.column=d.column,this._emit("change",{old:e,value:d})},this.detach=function(){this.document.removeEventListener("change",this.$onChange)},this.$clipPositionToDocument=function(a,b){var c={};return a>=this.document.getLength()?(c.row=Math.max(0,this.document.getLength()-1),c.column=this.document.getLine(c.row).length):a<0?(c.row=0,c.column=0):(c.row=a,c.column=Math.min(this.document.getLine(c.row).length,Math.max(0,b))),b<0&&(c.column=0),c}}).call(f.prototype)}),define("ace/background_tokenizer",["require","exports","module","ace/lib/oop","ace/lib/event_emitter"],function(a,b,c){"use strict";var d=a("./lib/oop"),e=a("./lib/event_emitter").EventEmitter,f=function(a,b){this.running=!1,this.lines=[],this.currentLine=0,this.tokenizer=a;var c=this;this.$worker=function(){if(!c.running)return;var a=new Date,b=c.currentLine,d=c.doc,e=0,f=d.getLength();while(c.currentLine<f){c.lines[c.currentLine]=c.$tokenizeRows(c.currentLine,c.currentLine)[0],c.currentLine++,e+=1;if(e%5==0&&new Date-a>20){c.fireUpdateEvent(b,c.currentLine-1),c.running=setTimeout(c.$worker,20);return}}c.running=!1,c.fireUpdateEvent(b,f-1)}};(function(){d.implement(this,e),this.setTokenizer=function(a){this.tokenizer=a,this.lines=[],this.start(0)},this.setDocument=function(a){this.doc=a,this.lines=[],this.stop()},this.fireUpdateEvent=function(a,b){var c={first:a,last:b};this._emit("update",{data:c})},this.start=function(a){this.currentLine=Math.min(a||0,this.currentLine,this.doc.getLength()),this.lines.splice(this.currentLine,this.lines.length),this.stop(),this.running=setTimeout(this.$worker,700)},this.stop=function(){this.running&&clearTimeout(this.running),this.running=!1},this.getTokens=function(a,b){return this.$tokenizeRows(a,b)},this.getState=function(a){return this.$tokenizeRows(a,a)[0].state},this.$tokenizeRows=function(a,b){if(!this.doc||isNaN(a)||isNaN(b))return[{state:"start",tokens:[]}];var c=[],d="start",e=!1;a>0&&this.lines[a-1]?(d=this.lines[a-1].state,e=!0):a==0?(d="start",e=!0):this.lines.length>0&&(d=this.lines[this.lines.length-1].state);var f=this.doc.getLines(a,b);for(var g=a;g<=b;g++)if(!this.lines[g]){var h=this.tokenizer.getLineTokens(f[g-a]||"",d),d=h.state;c.push(h),e&&(this.lines[g]=h)}else{var h=this.lines[g];d=h.state,c.push(h)}return c}}).call(f.prototype),b.BackgroundTokenizer=f}),define("ace/edit_session/folding",["require","exports","module","ace/range","ace/edit_session/fold_line","ace/edit_session/fold","ace/token_iterator"],function(a,b,c){function h(){this.getFoldAt=function(a,b,c){var d=this.getFoldLine(a);if(!d)return null;var e=d.folds;for(var f=0;f<e.length;f++){var g=e[f];if(g.range.contains(a,b)){if(c==1&&g.range.isEnd(a,b))continue;if(c==-1&&g.range.isStart(a,b))continue;return g}}},this.getFoldsInRange=function(a){a=a.clone();var b=a.start,c=a.end,d=this.$foldData,e=[];b.column+=1,c.column-=1;for(var f=0;f<d.length;f++){var g=d[f].range.compareRange(a);if(g==2)continue;if(g==-2)break;var h=d[f].folds;for(var i=0;i<h.length;i++){var j=h[i];g=j.range.compareRange(a);if(g==-2)break;if(g==2)continue;if(g==42)break;e.push(j)}}return e},this.getAllFolds=function(){function c(b){a.push(b);if(!b.subFolds)return;for(var d=0;d<b.subFolds.length;d++)c(b.subFolds[d])}var a=[],b=this.$foldData;for(var d=0;d<b.length;d++)for(var e=0;e<b[d].folds.length;e++)c(b[d].folds[e]);return a},this.getFoldStringAt=function(a,b,c,d){d=d||this.getFoldLine(a);if(!d)return null;var e={end:{column:0}},f,g;for(var h=0;h<d.folds.length;h++){g=d.folds[h];var i=g.range.compareEnd(a,b);if(i==-1){f=this.getLine(g.start.row).substring(e.end.column,g.start.column);break}if(i===0)return null;e=g}return f||(f=this.getLine(g.start.row).substring(e.end.column)),c==-1?f.substring(0,b-e.end.column):c==1?f.substring(b-e.end.column):f},this.getFoldLine=function(a,b){var c=this.$foldData,d=0;b&&(d=c.indexOf(b)),d==-1&&(d=0);for(d;d<c.length;d++){var e=c[d];if(e.start.row<=a&&e.end.row>=a)return e;if(e.end.row>a)return null}return null},this.getNextFoldLine=function(a,b){var c=this.$foldData,d=0;b&&(d=c.indexOf(b)),d==-1&&(d=0);for(d;d<c.length;d++){var e=c[d];if(e.end.row>=a)return e}return null},this.getFoldedRowCount=function(a,b){var c=this.$foldData,d=b-a+1;for(var e=0;e<c.length;e++){var f=c[e],g=f.end.row,h=f.start.row;if(g>=b){h<b&&(h>=a?d-=b-h:d=0);break}g>=a&&(h>=a?d-=g-h:d-=g-a+1)}return d},this.$addFoldLine=function(a){return this.$foldData.push(a),this.$foldData.sort(function(a,b){return a.start.row-b.start.row}),a},this.addFold=function(a,b){var c=this.$foldData,d=!1,g;a instanceof f?g=a:g=new f(b,a),this.$clipRangeToDocument(g.range);var h=g.start.row,i=g.start.column,j=g.end.row,k=g.end.column;if(g.placeholder.length<2)throw"Placeholder has to be at least 2 characters";if(h==j&&k-i<2)throw"The range has to be at least 2 characters width";var l=this.getFoldAt(h,i,1),m=this.getFoldAt(j,k,-1);if(l&&m==l)return l.addSubFold(g);if(l&&!l.range.isStart(h,i)||m&&!m.range.isEnd(j,k))throw"A fold can't intersect already existing fold"+g.range+l.range;var n=this.getFoldsInRange(g.range);n.length>0&&(this.removeFolds(n),g.subFolds=n);for(var o=0;o<c.length;o++){var p=c[o];if(j==p.start.row){p.addFold(g),d=!0;break}if(h==p.end.row){p.addFold(g),d=!0;if(!g.sameRow){var q=c[o+1];if(q&&q.start.row==j){p.merge(q);break}}break}if(j<=p.start.row)break}return d||(p=this.$addFoldLine(new e(this.$foldData,g))),this.$useWrapMode&&this.$updateWrapData(p.start.row,p.start.row),this.$modified=!0,this._emit("changeFold",{data:g}),g},this.addFolds=function(a){a.forEach(function(a){this.addFold(a)},this)},this.removeFold=function(a){var b=a.foldLine,c=b.start.row,d=b.end.row,e=this.$foldData,f=b.folds;if(f.length==1)e.splice(e.indexOf(b),1);else if(b.range.isEnd(a.end.row,a.end.column))f.pop(),b.end.row=f[f.length-1].end.row,b.end.column=f[f.length-1].end.column;else if(b.range.isStart(a.start.row,a.start.column))f.shift(),b.start.row=f[0].start.row,b.start.column=f[0].start.column;else if(a.sameRow)f.splice(f.indexOf(a),1);else{var g=b.split(a.start.row,a.start.column);f=g.folds,f.shift(),g.start.row=f[0].start.row,g.start.column=f[0].start.column}this.$useWrapMode&&this.$updateWrapData(c,d),this.$modified=!0,this._emit("changeFold",{data:a})},this.removeFolds=function(a){var b=[];for(var c=0;c<a.length;c++)b.push(a[c]);b.forEach(function(a){this.removeFold(a)},this),this.$modified=!0},this.expandFold=function(a){this.removeFold(a),a.subFolds.forEach(function(a){this.addFold(a)},this),a.subFolds=[]},this.expandFolds=function(a){a.forEach(function(a){this.expandFold(a)},this)},this.unfold=function(a,b){var c,e;a==null?c=new d(0,0,this.getLength(),0):typeof a=="number"?c=new d(a,0,a,this.getLine(a).length):"row"in a?c=d.fromPoints(a,a):c=a,e=this.getFoldsInRange(c);if(b)this.removeFolds(e);else while(e.length)this.expandFolds(e),e=this.getFoldsInRange(c)},this.isRowFolded=function(a,b){return!!this.getFoldLine(a,b)},this.getRowFoldEnd=function(a,b){var c=this.getFoldLine(a,b);return c?c.end.row:a},this.getFoldDisplayLine=function(a,b,c,d,e){d==null&&(d=a.start.row,e=0),b==null&&(b=a.end.row,c=this.getLine(b).length);var f=this.doc,g="";return a.walk(function(a,b,c,h){if(b<d)return;if(b==d){if(c<e)return;h=Math.max(e,h)}a?g+=a:g+=f.getLine(b).substring(h,c)}.bind(this),b,c),g},this.getDisplayLine=function(a,b,c,d){var e=this.getFoldLine(a);if(!e){var f;return f=this.doc.getLine(a),f.substring(d||0,b||f.length)}return this.getFoldDisplayLine(e,a,b,c,d)},this.$cloneFoldData=function(){var a=[];return a=this.$foldData.map(function(b){var c=b.folds.map(function(a){return a.clone()});return new e(a,c)}),a},this.toggleFold=function(a){var b=this.selection,c=b.getRange(),d,e;if(c.isEmpty()){var f=c.start;d=this.getFoldAt(f.row,f.column);if(d){this.expandFold(d);return}(e=this.findMatchingBracket(f))?c.comparePoint(e)==1?c.end=e:(c.start=e,c.start.column++,c.end.column--):(e=this.findMatchingBracket({row:f.row,column:f.column+1}))?(c.comparePoint(e)==1?c.end=e:c.start=e,c.start.column++):c=this.getCommentFoldRange(f.row,f.column)||c}else{var g=this.getFoldsInRange(c);if(a&&g.length){this.expandFolds(g);return}g.length==1&&(d=g[0])}d||(d=this.getFoldAt(c.start.row,c.start.column));if(d&&d.range.toString()==c.toString()){this.expandFold(d);return}var h="...";if(!c.isMultiLine()){h=this.getTextRange(c);if(h.length<4)return;h=h.trim().substring(0,2)+".."}this.addFold(h,c)},this.getCommentFoldRange=function(a,b){var c=new g(this,a,b),e=c.getCurrentToken();if(e&&/^comment|string/.test(e.type)){var f=new d,h=new RegExp(e.type.replace(/\..*/,"\\."));do e=c.stepBackward();while(e&&h.test(e.type));c.stepForward(),f.start.row=c.getCurrentTokenRow(),f.start.column=c.getCurrentTokenColumn()+2,c=new g(this,a,b);do e=c.stepForward();while(e&&h.test(e.type));return e=c.stepBackward(),f.end.row=c.getCurrentTokenRow(),f.end.column=c.getCurrentTokenColumn()+e.value.length,f}},this.foldAll=function(a,b){var c=this.foldWidgets;b=b||this.getLength();for(var d=a||0;d<b;d++){c[d]==null&&(c[d]=this.getFoldWidget(d));if(c[d]!="start")continue;var e=this.getFoldWidgetRange(d);if(e&&e.end.row<b)try{this.addFold("...",e)}catch(f){}}},this.$foldStyles={manual:1,markbegin:1,markbeginend:1},this.$foldStyle="markbegin",this.setFoldStyle=function(a){if(!this.$foldStyles[a])throw new Error("invalid fold style: "+a+"["+Object.keys(this.$foldStyles).join(", ")+"]");if(this.$foldStyle==a)return;this.$foldStyle=a,a=="manual"&&this.unfold();var b=this.$foldMode;this.$setFolding(null),this.$setFolding(b)},this.$setFolding=function(a){if(this.$foldMode==a)return;this.$foldMode=a,this.removeListener("change",this.$updateFoldWidgets),this._emit("changeAnnotation");if(!a||this.$foldStyle=="manual"){this.foldWidgets=null;return}this.foldWidgets=[],this.getFoldWidget=a.getFoldWidget.bind(a,this,this.$foldStyle),this.getFoldWidgetRange=a.getFoldWidgetRange.bind(a,this,this.$foldStyle),this.$updateFoldWidgets=this.updateFoldWidgets.bind(this),this.on("change",this.$updateFoldWidgets)},this.onFoldWidgetClick=function(a,b){var c=this.getFoldWidget(a),d=this.getLine(a),e=b.shiftKey,f=e||b.ctrlKey||b.altKey||b.metaKey,g;c=="end"?g=this.getFoldAt(a,0,-1):g=this.getFoldAt(a,d.length,1);if(g){f?this.removeFold(g):this.expandFold(g);return}var h=this.getFoldWidgetRange(a);if(h){if(!h.isMultiLine()){g=this.getFoldAt(h.start.row,h.start.column,1);if(g&&h.isEqual(g.range)){this.removeFold(g);return}}e||this.addFold("...",h),f&&this.foldAll(h.start.row+1,h.end.row)}else f&&this.foldAll(a+1,this.getLength()),b.target.className+=" invalid"},this.updateFoldWidgets=function(a){var b=a.data,c=b.range,d=c.start.row,e=c.end.row-d;if(e===0)this.foldWidgets[d]=null;else if(b.action=="removeText"||b.action=="removeLines")this.foldWidgets.splice(d,e+1,null);else{var f=Array(e+1);f.unshift(d,1),this.foldWidgets.splice.apply(this.foldWidgets,f)}}}"use strict";var d=a("../range").Range,e=a("./fold_line").FoldLine,f=a("./fold").Fold,g=a("../token_iterator").TokenIterator;b.Folding=h}),define("ace/edit_session/fold_line",["require","exports","module","ace/range"],function(a,b,c){function e(a,b){this.foldData=a,Array.isArray(b)?this.folds=b:b=this.folds=[b];var c=b[b.length-1];this.range=new d(b[0].start.row,b[0].start.column,c.end.row,c.end.column),this.start=this.range.start,this.end=this.range.end,this.folds.forEach(function(a){a.setFoldLine(this)},this)}"use strict";var d=a("../range").Range;(function(){this.shiftRow=function(a){this.start.row+=a,this.end.row+=a,this.folds.forEach(function(b){b.start.row+=a,b.end.row+=a})},this.addFold=function(a){if(a.sameRow){if(a.start.row<this.startRow||a.endRow>this.endRow)throw"Can't add a fold to this FoldLine as it has no connection";this.folds.push(a),this.folds.sort(function(a,b){return-a.range.compareEnd(b.start.row,b.start.column)}),this.range.compareEnd(a.start.row,a.start.column)>0?(this.end.row=a.end.row,this.end.column=a.end.column):this.range.compareStart(a.end.row,a.end.column)<0&&(this.start.row=a.start.row,this.start.column=a.start.column)}else if(a.start.row==this.end.row)this.folds.push(a),this.end.row=a.end.row,this.end.column=a.end.column;else{if(a.end.row!=this.start.row)throw"Trying to add fold to FoldRow that doesn't have a matching row";this.folds.unshift(a),this.start.row=a.start.row,this.start.column=a.start.column}a.foldLine=this},this.containsRow=function(a){return a>=this.start.row&&a<=this.end.row},this.walk=function(a,b,c){var d=0,e=this.folds,f,g,h,i=!0;b==null&&(b=this.end.row,c=this.end.column);for(var j=0;j<e.length;j++){f=e[j],g=f.range.compareStart(b,c);if(g==-1){a(null,b,c,d,i);return}h=a(null,f.start.row,f.start.column,d,i),h=!h&&a(f.placeholder,f.start.row,f.start.column,d);if(h||g==0)return;i=!f.sameRow,d=f.end.column}a(null,b,c,d,i)},this.getNextFoldTo=function(a,b){var c,d;for(var e=0;e<this.folds.length;e++){c=this.folds[e],d=c.range.compareEnd(a,b);if(d==-1)return{fold:c,kind:"after"};if(d==0)return{fold:c,kind:"inside"}}return null},this.addRemoveChars=function(a,b,c){var d=this.getNextFoldTo(a,b),e,f;if(d){e=d.fold;if(d.kind=="inside"&&e.start.column!=b&&e.start.row!=a)throw"Moving characters inside of a fold should never be reached";if(e.start.row==a){f=this.folds;var g=f.indexOf(e);g==0&&(this.start.column+=c);for(g;g<f.length;g++){e=f[g],e.start.column+=c;if(!e.sameRow)return;e.end.column+=c}this.end.column+=c}}},this.split=function(a,b){var c=this.getNextFoldTo(a,b).fold,d=this.folds,f=this.foldData;if(!c)return null;var g=d.indexOf(c),h=d[g-1];this.end.row=h.end.row,this.end.column=h.end.column,d=d.splice(g,d.length-g);var i=new e(f,d);return f.splice(f.indexOf(this)+1,0,i),i},this.merge=function(a){var b=a.folds;for(var c=0;c<b.length;c++)this.addFold(b[c]);var d=this.foldData;d.splice(d.indexOf(a),1)},this.toString=function(){var a=[this.range.toString()+": ["];return this.folds.forEach(function(b){a.push("  "+b.toString())}),a.push("]"),a.join("\n")},this.idxToPosition=function(a){var b=0,c;for(var d=0;d<this.folds.length;d++){var c=this.folds[d];a-=c.start.column-b;if(a<0)return{row:c.start.row,column:c.start.column+a};a-=c.placeholder.length;if(a<0)return c.start;b=c.end.column}return{row:this.end.row,column:this.end.column+a}}}).call(e.prototype),b.FoldLine=e}),define("ace/edit_session/fold",["require","exports","module"],function(a,b,c){"use strict";var d=b.Fold=function(a,b){this.foldLine=null,this.placeholder=b,this.range=a,this.start=a.start,this.end=a.end,this.sameRow=a.start.row==a.end.row,this.subFolds=[]};(function(){this.toString=function(){return'"'+this.placeholder+'" '+this.range.toString()},this.setFoldLine=function(a){this.foldLine=a,this.subFolds.forEach(function(b){b.setFoldLine(a)})},this.clone=function(){var a=this.range.clone(),b=new d(a,this.placeholder);return this.subFolds.forEach(function(a){b.subFolds.push(a.clone())}),b},this.addSubFold=function(a){if(this.range.isEqual(a))return this;if(!this.range.containsRange(a))throw"A fold can't intersect already existing fold"+a.range+this.range;var b=a.range.start.row,c=a.range.start.column;for(var d=0,e=-1;d<this.subFolds.length;d++){e=this.subFolds[d].range.compare(b,c);if(e!=1)break}var f=this.subFolds[d];if(e==0)return f.addSubFold(a);var b=a.range.end.row,c=a.range.end.column;for(var g=d,e=-1;g<this.subFolds.length;g++){e=this.subFolds[g].range.compare(b,c);if(e!=1)break}var h=this.subFolds[g];if(e==0)throw"A fold can't intersect already existing fold"+a.range+this.range;var i=this.subFolds.splice(d,g-d,a);return a.setFoldLine(this.foldLine),a}}).call(d.prototype)}),define("ace/token_iterator",["require","exports","module"],function(a,b,c){"use strict";var d=function(a,b,c){this.$session=a,this.$row=b,this.$rowTokens=a.getTokens(b,b)[0].tokens;var d=a.getTokenAt(b,c);this.$tokenIndex=d?d.index:-1};(function(){this.stepBackward=function(){this.$tokenIndex-=1;while(this.$tokenIndex<0){this.$row-=1;if(this.$row<0)return this.$row=0,null;this.$rowTokens=this.$session.getTokens(this.$row,this.$row)[0].tokens,this.$tokenIndex=this.$rowTokens.length-1}return this.$rowTokens[this.$tokenIndex]},this.stepForward=function(){var a=this.$session.getLength();this.$tokenIndex+=1;while(this.$tokenIndex>=this.$rowTokens.length){this.$row+=1;if(this.$row>=a)return this.$row=a-1,null;this.$rowTokens=this.$session.getTokens(this.$row,this.$row)[0].tokens,this.$tokenIndex=0}return this.$rowTokens[this.$tokenIndex]},this.getCurrentToken=function(){return this.$rowTokens[this.$tokenIndex]},this.getCurrentTokenRow=function(){return this.$row},this.getCurrentTokenColumn=function(){var a=this.$rowTokens,b=this.$tokenIndex,c=a[b].start;if(c!==undefined)return c;c=0;while(b>0)b-=1,c+=a[b].value.length;return c}}).call(d.prototype),b.TokenIterator=d}),define("ace/edit_session/bracket_match",["require","exports","module","ace/token_iterator"],function(a,b,c){function e(){this.findMatchingBracket=function(a){if(a.column==0)return null;var b=this.getLine(a.row).charAt(a.column-1);if(b=="")return null;var c=b.match(/([\(\[\{])|([\)\]\}])/);return c?c[1]?this.$findClosingBracket(c[1],a):this.$findOpeningBracket(c[2],a):null},this.$brackets={")":"(","(":")","]":"[","[":"]","{":"}","}":"{"},this.$findOpeningBracket=function(a,b){var c=this.$brackets[a],e=1,f=new d(this,b.row,b.column),g=f.getCurrentToken();if(!g)return null;var h=new RegExp("(\\.?"+g.type.replace(".","|").replace("rparen","lparen|rparen")+")+"),i=b.column-f.getCurrentTokenColumn()-2,j=g.value;for(;;){while(i>=0){var k=j.charAt(i);if(k==c){e-=1;if(e==0)return{row:f.getCurrentTokenRow(),column:i+f.getCurrentTokenColumn()}}else k==a&&(e+=1);i-=1}do g=f.stepBackward();while(g&&!h.test(g.type));if(g==null)break;j=g.value,i=j.length-1}return null},this.$findClosingBracket=function(a,b){var c=this.$brackets[a],e=1,f=new d(this,b.row,b.column),g=f.getCurrentToken();if(!g)return null;var h=new RegExp("(\\.?"+g.type.replace(".","|").replace("lparen","lparen|rparen")+")+"),i=b.column-f.getCurrentTokenColumn();for(;;){var j=g.value,k=j.length;while(i<k){var l=j.charAt(i);if(l==c){e-=1;if(e==0)return{row:f.getCurrentTokenRow(),column:i+f.getCurrentTokenColumn()}}else l==a&&(e+=1);i+=1}do g=f.stepForward();while(g&&!h.test(g.type));if(g==null)break;i=0}return null}}"use strict";var d=a("../token_iterator").TokenIterator;b.BracketMatch=e}),define("ace/search",["require","exports","module","ace/lib/lang","ace/lib/oop","ace/range"],function(a,b,c){"use strict";var d=a("./lib/lang"),e=a("./lib/oop"),f=a("./range").Range,g=function(){this.$options={needle:"",backwards:!1,wrap:!1,caseSensitive:!1,wholeWord:!1,scope:g.ALL,regExp:!1}};g.ALL=1,g.SELECTION=2,function(){this.set=function(a){return e.mixin(this.$options,a),this},this.getOptions=function(){return d.copyObject(this.$options)},this.find=function(a){if(!this.$options.needle)return null;if(this.$options.backwards)var b=this.$backwardMatchIterator(a);else b=this.$forwardMatchIterator(a);var c=null;return b.forEach(function(a){return c=a,!0}),c},this.findAll=function(a){var b=this.$options;if(!b.needle)return[];if(b.backwards)var c=this.$backwardMatchIterator(a);else c=this.$forwardMatchIterator(a);var d=!b.start&&b.wrap&&b.scope==g.ALL;d&&(b.start={row:0,column:0});var e=[];return c.forEach(function(a){e.push(a)}),d&&(b.start=null),e},this.replace=function(a,b){var c=this.$assembleRegExp(),d=c.exec(a);return d&&d[0].length==a.length?this.$options.regExp?a.replace(c,b):b:null},this.$forwardMatchIterator=function(a){var b=this.$assembleRegExp(),c=this;return{forEach:function(d){c.$forwardLineIterator(a).forEach(function(a,e,f){e&&(a=a.substring(e));var g=[];a.replace(b,function(a){var b=arguments[arguments.length-2];return g.push({str:a,offset:e+b}),a});for(var h=0;h<g.length;h++){var i=g[h],j=c.$rangeFromMatch(f,i.offset,i.str.length);if(d(j))return!0}})}}},this.$backwardMatchIterator=function(a){var b=this.$assembleRegExp(),c=this;return{forEach:function(d){c.$backwardLineIterator(a).forEach(function(a,e,f){e&&(a=a.substring(e));var g=[];a.replace(b,function(a,b){return g.push({str:a,offset:e+b}),a});for(var h=g.length-1;h>=0;h--){var i=g[h],j=c.$rangeFromMatch(f,i.offset,i.str.length);if(d(j))return!0}})}}},this.$rangeFromMatch=function(a,b,c){return new f(a,b,a,b+c)},this.$assembleRegExp=function(){if(this.$options.regExp)var a=this.$options.needle;else a=d.escapeRegExp(this.$options.needle);this.$options.wholeWord&&(a="\\b"+a+"\\b");var b="g";this.$options.caseSensitive||(b+="i");var c=new RegExp(a,b);return c},this.$forwardLineIterator=function(a){function k(e){var f=a.getLine(e);return b&&e==c.end.row&&(f=f.substring(0,c.end.column)),j&&e==d.row&&(f=f.substring(0,d.column)),f}var b=this.$options.scope==g.SELECTION,c=this.$options.range||a.getSelection().getRange(),d=this.$options.start||c[b?"start":"end"],e=b?c.start.row:0,f=b?c.start.column:0,h=b?c.end.row:a.getLength()-1,i=this.$options.wrap,j=!1;return{forEach:function(a){var b=d.row,c=k(b),g=d.column,l=!1;j=!1;while(!a(c,g,b)){if(l)return;b++,g=0;if(b>h){if(!i)return;b=e,g=f,j=!0}b==d.row&&(l=!0),c=k(b)}}}},this.$backwardLineIterator=function(a){var b=this.$options.scope==g.SELECTION,c=this.$options.range||a.getSelection().getRange(),d=this.$options.start||c[b?"end":"start"],e=b?c.start.row:0,f=b?c.start.column:0,h=b?c.end.row:a.getLength()-1,i=this.$options.wrap;return{forEach:function(g){var j=d.row,k=a.getLine(j).substring(0,d.column),l=0,m=!1,n=!1;while(!g(k,l,j)){if(m)return;j--,l=0;if(j<e){if(!i)return;j=h,n=!0}j==d.row&&(m=!0),k=a.getLine(j),b&&(j==e?l=f:j==h&&(k=k.substring(0,c.end.column))),n&&j==d.row&&(l=d.column)}}}}}.call(g.prototype),b.Search=g}),define("ace/commands/command_manager",["require","exports","module","ace/lib/oop","ace/keyboard/hash_handler","ace/lib/event_emitter"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../keyboard/hash_handler").HashHandler,f=a("../lib/event_emitter").EventEmitter,g=function(a,b){this.platform=a,this.commands={},this.commmandKeyBinding={},this.addCommands(b),this.setDefaultHandler("exec",function(a){a.command.exec(a.editor,a.args||{})})};d.inherits(g,e),function(){d.implement(this,f),this.exec=function(a,b,c){return typeof a=="string"&&(a=this.commands[a]),a?b&&b.$readOnly&&!a.readOnly?!1:(this._emit("exec",{editor:b,command:a,args:c}),!0):!1},this.toggleRecording=function(){if(this.$inReplay)return;return this.recording?(this.macro.pop(),this.removeEventListener("exec",this.$addCommandToMacro),this.macro.length||(this.macro=this.oldMacro),this.recording=!1):(this.$addCommandToMacro||(this.$addCommandToMacro=function(a){this.macro.push([a.command,a.args])}.bind(this)),this.oldMacro=this.macro,this.macro=[],this.on("exec",this.$addCommandToMacro),this.recording=!0)},this.replay=function(a){if(this.$inReplay||!this.macro)return;if(this.recording)return this.toggleRecording();try{this.$inReplay=!0,this.macro.forEach(function(b){typeof b=="string"?this.exec(b,a):this.exec(b[0],a,b[1])},this)}finally{this.$inReplay=!1}},this.trimMacro=function(a){return a.map(function(a){return typeof a[0]!="string"&&(a[0]=a[0].name),a[1]||(a=a[0]),a})}}.call(g.prototype),b.CommandManager=g}),define("ace/keyboard/hash_handler",["require","exports","module","ace/lib/keys"],function(a,b,c){function e(a,b){this.platform=b,this.commands={},this.commmandKeyBinding={},this.addCommands(a)}"use strict";var d=a("../lib/keys");(function(){function a(a,c,e){var f,g=0,h=b(a.toLowerCase());for(var i=0,j=h.length;i<j;i++)d.KEY_MODS[h[i]]?g|=d.KEY_MODS[h[i]]:f=h[i]||"-";return{key:f,hashId:g}}function b(a){return a.trim().split(new RegExp("[\\s ]*\\-[\\s ]*","g"),999)}this.addCommand=function(a){this.commands[a.name]&&this.removeCommand(a),this.commands[a.name]=a,a.bindKey&&this._buildKeyHash(a)},this.removeCommand=function(a){var b=typeof a=="string"?a:a.name;a=this.commands[b],delete this.commands[b];var c=this.commmandKeyBinding;for(var d in c)for(var e in c[d])c[d][e]==a&&delete c[d][e]},this.addCommands=function(a){a&&Object.keys(a).forEach(function(b){var c=a[b];if(typeof c=="string")return this.bindKey(c,b);typeof c=="function"&&(c={exec:c}),c.name||(c.name=b),this.addCommand(c)},this)},this.removeCommands=function(a){Object.keys(a).forEach(function(b){this.removeCommand(a[b])},this)},this.bindKey=function(b,c){if(!b)return;var d=this.commmandKeyBinding;b.split("|").forEach(function(b){var e=a(b,c),f=e.hashId;(d[f]||(d[f]={}))[e.key]=c})},this.bindKeys=function(a){Object.keys(a).forEach(function(b){this.bindKey(b,a[b])},this)},this._buildKeyHash=function(a){var b=a.bindKey;if(!b)return;var c=typeof b=="string"?b:b[this.platform];this.bindKey(c,a)},this.findKeyCommand=function(b,c){var d=this.commmandKeyBinding;return d[b]&&d[b][c.toLowerCase()]},this.handleKeyboard=function(a,b,c,d){return{command:this.findKeyCommand(b,c)}}}).call(e.prototype),b.HashHandler=e}),define("ace/undomanager",["require","exports","module"],function(a,b,c){"use strict";var d=function(){this.reset()};(function(){this.execute=function(a){var b=a.args[0];this.$doc=a.args[1],this.$undoStack.push(b),this.$redoStack=[]},this.undo=function(a){var b=this.$undoStack.pop(),c=null;return b&&(c=this.$doc.undoChanges(b,a),this.$redoStack.push(b)),c},this.redo=function(a){var b=this.$redoStack.pop(),c=null;return b&&(c=this.$doc.redoChanges(b,a),this.$undoStack.push(b)),c},this.reset=function(){this.$undoStack=[],this.$redoStack=[]},this.hasUndo=function(){return this.$undoStack.length>0},this.hasRedo=function(){return this.$redoStack.length>0}}).call(d.prototype),b.UndoManager=d}),define("ace/virtual_renderer",["require","exports","module","ace/lib/oop","ace/lib/dom","ace/lib/event","ace/lib/useragent","ace/config","ace/lib/net","ace/layer/gutter","ace/layer/marker","ace/layer/text","ace/layer/cursor","ace/scrollbar","ace/renderloop","ace/lib/event_emitter","text!ace/css/editor.css"],function(a,b,c){"use strict";var d=a("./lib/oop"),e=a("./lib/dom"),f=a("./lib/event"),g=a("./lib/useragent"),h=a("./config"),i=a("./lib/net"),j=a("./layer/gutter").Gutter,k=a("./layer/marker").Marker,l=a("./layer/text").Text,m=a("./layer/cursor").Cursor,n=a("./scrollbar").ScrollBar,o=a("./renderloop").RenderLoop,p=a("./lib/event_emitter").EventEmitter,q=a("text!./css/editor.css");e.importCssString(q,"ace_editor");var r=function(a,b){var c=this;this.container=a,e.addCssClass(a,"ace_editor"),this.setTheme(b),this.$gutter=e.createElement("div"),this.$gutter.className="ace_gutter",this.container.appendChild(this.$gutter),this.scroller=e.createElement("div"),this.scroller.className="ace_scroller",this.container.appendChild(this.scroller),this.content=e.createElement("div"),this.content.className="ace_content",this.scroller.appendChild(this.content),this.$gutterLayer=new j(this.$gutter),this.$gutterLayer.on("changeGutterWidth",this.onResize.bind(this,!0)),this.$markerBack=new k(this.content);var d=this.$textLayer=new l(this.content);this.canvas=d.element,this.$markerFront=new k(this.content),this.characterWidth=d.getCharacterWidth(),this.lineHeight=d.getLineHeight(),this.$cursorLayer=new m(this.content),this.$cursorPadding=8,this.$horizScroll=!0,this.$horizScrollAlwaysVisible=!0,this.$animatedScroll=!1,this.scrollBar=new n(a),this.scrollBar.addEventListener("scroll",function(a){c.session.setScrollTop(a.data)}),this.scrollTop=0,this.scrollLeft=0,f.addListener(this.scroller,"scroll",function(){var a=c.scroller.scrollLeft;c.scrollLeft=a,c.session.setScrollLeft(a),a==0?c.$gutter.className="ace_gutter":c.$gutter.className="ace_gutter horscroll"}),this.cursorPos={row:0,column:0},this.$textLayer.addEventListener("changeCharacterSize",function(){c.characterWidth=d.getCharacterWidth(),c.lineHeight=d.getLineHeight(),c.$updatePrintMargin(),c.onResize(!0),c.$loop.schedule(c.CHANGE_FULL)}),this.$size={width:0,height:0,scrollerHeight:0,scrollerWidth:0},this.layerConfig={width:1,padding:0,firstRow:0,firstRowScreen:0,lastRow:0,lineHeight:1,characterWidth:1,minHeight:1,maxHeight:1,offset:0,height:1},this.$loop=new o(this.$renderChanges.bind(this),this.container.ownerDocument.defaultView),this.$loop.schedule(this.CHANGE_FULL),this.setPadding(4),this.$updatePrintMargin()};(function(){this.showGutter=!0,this.CHANGE_CURSOR=1,this.CHANGE_MARKER=2,this.CHANGE_GUTTER=4,this.CHANGE_SCROLL=8,this.CHANGE_LINES=16,this.CHANGE_TEXT=32,this.CHANGE_SIZE=64,this.CHANGE_MARKER_BACK=128,this.CHANGE_MARKER_FRONT=256,this.CHANGE_FULL=512,this.CHANGE_H_SCROLL=1024,d.implement(this,p),this.setSession=function(a){this.session=a,this.$cursorLayer.setSession(a),this.$markerBack.setSession(a),this.$markerFront.setSession(a),this.$gutterLayer.setSession(a),this.$textLayer.setSession(a),this.$loop.schedule(this.CHANGE_FULL)},this.updateLines=function(a,b){b===undefined&&(b=Infinity),this.$changedLines?(this.$changedLines.firstRow>a&&(this.$changedLines.firstRow=a),this.$changedLines.lastRow<b&&(this.$changedLines.lastRow=b)):this.$changedLines={firstRow:a,lastRow:b},this.$loop.schedule(this.CHANGE_LINES)},this.updateText=function(){this.$loop.schedule(this.CHANGE_TEXT)},this.updateFull=function(){this.$loop.schedule(this.CHANGE_FULL)},this.updateFontSize=function(){this.$textLayer.checkForSizeChanges()},this.onResize=function(a){var b=this.CHANGE_SIZE,c=this.$size,d=e.getInnerHeight(this.container);if(a||c.height!=d)c.height=d,this.scroller.style.height=d+"px",c.scrollerHeight=this.scroller.clientHeight,this.scrollBar.setHeight(c.scrollerHeight),this.session&&(this.session.setScrollTop(this.getScrollTop()),b|=this.CHANGE_FULL);var f=e.getInnerWidth(this.container);if(a||c.width!=f){c.width=f;var g=this.showGutter?this.$gutter.offsetWidth:0;this.scroller.style.left=g+"px",c.scrollerWidth=Math.max(0,f-g-this.scrollBar.getWidth()),this.scroller.style.width=c.scrollerWidth+"px";if(this.session.getUseWrapMode()&&this.adjustWrapLimit()||a)b|=this.CHANGE_FULL}this.$loop.schedule(b)},this.adjustWrapLimit=function(){var a=this.$size.scrollerWidth-this.$padding*2,b=Math.floor(a/this.characterWidth);return this.session.adjustWrapLimit(b)},this.setAnimatedScroll=function(a){this.$animatedScroll=a},this.getAnimatedScroll=function(){return this.$animatedScroll},this.setShowInvisibles=function(a){this.$textLayer.setShowInvisibles(a)&&this.$loop.schedule(this.CHANGE_TEXT)},this.getShowInvisibles=function(){return this.$textLayer.showInvisibles},this.$showPrintMargin=!0,this.setShowPrintMargin=function(a){this.$showPrintMargin=a,this.$updatePrintMargin()},this.getShowPrintMargin=function(){return this.$showPrintMargin},this.$printMarginColumn=80,this.setPrintMarginColumn=function(a){this.$printMarginColumn=a,this.$updatePrintMargin()},this.getPrintMarginColumn=function(){return this.$printMarginColumn},this.getShowGutter=function(){return this.showGutter},this.setShowGutter=function(a){if(this.showGutter===a)return;this.$gutter.style.display=a?"block":"none",this.showGutter=a,this.onResize(!0)},this.$updatePrintMargin=function(){var a;if(!this.$showPrintMargin&&!this.$printMarginEl)return;this.$printMarginEl||(a=e.createElement("div"),a.className="ace_print_margin_layer",this.$printMarginEl=e.createElement("div"),this.$printMarginEl.className="ace_print_margin",a.appendChild(this.$printMarginEl),this.content.insertBefore(a,this.$textLayer.element));var b=this.$printMarginEl.style;b.left=this.characterWidth*this.$printMarginColumn+this.$padding+"px",b.visibility=this.$showPrintMargin?"visible":"hidden"},this.getContainerElement=function(){return this.container},this.getMouseEventTarget=function(){return this.content},this.getTextAreaContainer=function(){return this.container},this.moveTextAreaToCursor=function(a){if(g.isIE)return;if(this.layerConfig.lastRow===0)return;var b=this.$cursorLayer.getPixelPosition();if(!b)return;var c=this.content.getBoundingClientRect(),d=this.layerConfig.offset;a.style.left=c.left+b.left+"px",a.style.top=c.top+b.top-this.scrollTop+d+"px"},this.getFirstVisibleRow=function(){return this.layerConfig.firstRow},this.getFirstFullyVisibleRow=function(){return this.layerConfig.firstRow+(this.layerConfig.offset===0?0:1)},this.getLastFullyVisibleRow=function(){var a=Math.floor((this.layerConfig.height+this.layerConfig.offset)/this.layerConfig.lineHeight);return this.layerConfig.firstRow-1+a},this.getLastVisibleRow=function(){return this.layerConfig.lastRow},this.$padding=null,this.setPadding=function(a){this.$padding=a,this.$textLayer.setPadding(a),this.$cursorLayer.setPadding(a),this.$markerFront.setPadding(a),this.$markerBack.setPadding(a),this.$loop.schedule(this.CHANGE_FULL),this.$updatePrintMargin()},this.getHScrollBarAlwaysVisible=function(){return this.$horizScrollAlwaysVisible},this.setHScrollBarAlwaysVisible=function(a){this.$horizScrollAlwaysVisible!=a&&(this.$horizScrollAlwaysVisible=a,(!this.$horizScrollAlwaysVisible||!this.$horizScroll)&&this.$loop.schedule(this.CHANGE_SCROLL))},this.$updateScrollBar=function(){this.scrollBar.setInnerHeight(this.layerConfig.maxHeight),this.scrollBar.setScrollTop(this.scrollTop)},this.$renderChanges=function(a){if(!a||!this.session||!this.container.offsetWidth)return;(a&this.CHANGE_FULL||a&this.CHANGE_SIZE||a&this.CHANGE_TEXT||a&this.CHANGE_LINES||a&this.CHANGE_SCROLL)&&this.$computeLayerConfig();if(a&this.CHANGE_H_SCROLL){this.scroller.scrollLeft=this.scrollLeft;var b=this.scroller.scrollLeft;this.scrollLeft=b,this.session.setScrollLeft(b)}if(a&this.CHANGE_FULL){this.$textLayer.checkForSizeChanges(),this.$updateScrollBar(),this.$textLayer.update(this.layerConfig),this.showGutter&&this.$gutterLayer.update(this.layerConfig),this.$markerBack.update(this.layerConfig),this.$markerFront.update(this.layerConfig),this.$cursorLayer.update(this.layerConfig);return}if(a&this.CHANGE_SCROLL){this.$updateScrollBar(),a&this.CHANGE_TEXT||a&this.CHANGE_LINES?this.$textLayer.update(this.layerConfig):this.$textLayer.scrollLines(this.layerConfig),this.showGutter&&this.$gutterLayer.update(this.layerConfig),this.$markerBack.update(this.layerConfig),this.$markerFront.update(this.layerConfig),this.$cursorLayer.update(this.layerConfig);return}a&this.CHANGE_TEXT?(this.$textLayer.update(this.layerConfig),this.showGutter&&this.$gutterLayer.update(this.layerConfig)):a&this.CHANGE_LINES?this.$updateLines()&&(this.$updateScrollBar(),this.showGutter&&this.$gutterLayer.update(this.layerConfig)):a&this.CHANGE_GUTTER&&this.showGutter&&this.$gutterLayer.update(this.layerConfig),a&this.CHANGE_CURSOR&&this.$cursorLayer.update(this.layerConfig),a&(this.CHANGE_MARKER|this.CHANGE_MARKER_FRONT)&&this.$markerFront.update(this.layerConfig),a&(this.CHANGE_MARKER|this.CHANGE_MARKER_BACK)&&this.$markerBack.update(this.layerConfig),a&this.CHANGE_SIZE&&this.$updateScrollBar()},this.$computeLayerConfig=function(){var a=this.session,b=this.scrollTop%this.lineHeight,c=this.$size.scrollerHeight+this.lineHeight,d=this.$getLongestLine(),e=this.$horizScrollAlwaysVisible||this.$size.scrollerWidth-d<0,f=this.$horizScroll!==e;this.$horizScroll=e,f&&(this.scroller.style.overflowX=e?"scroll":"hidden",e||this.session.setScrollLeft(0));var g=this.session.getScreenLength()*this.lineHeight;this.session.setScrollTop(Math.max(0,Math.min(this.scrollTop,g-this.$size.scrollerHeight)));var h=Math.ceil(c/this.lineHeight)-1,i=Math.max(0,Math.round((this.scrollTop-b)/this.lineHeight)),j=i+h,k,l,m={lineHeight:this.lineHeight};i=a.screenToDocumentRow(i,0);var n=a.getFoldLine(i);n&&(i=n.start.row),k=a.documentToScreenRow(i,0),l=a.getRowHeight(m,i),j=Math.min(a.screenToDocumentRow(j,0),a.getLength()-1),c=this.$size.scrollerHeight+a.getRowHeight(m,j)+l,b=this.scrollTop-k*this.lineHeight,this.layerConfig={width:d,padding:this.$padding,firstRow:i,firstRowScreen:k,lastRow:j,lineHeight:this.lineHeight,characterWidth:this.characterWidth,minHeight:c,maxHeight:g,offset:b,height:this.$size.scrollerHeight},this.$gutterLayer.element.style.marginTop=-b+"px",this.content.style.marginTop=-b+"px",this.content.style.width=d+2*this.$padding+"px",this.content.style.height=c+"px",f&&this.onResize(!0)},this.$updateLines=function(){var a=this.$changedLines.firstRow,b=this.$changedLines.lastRow;this.$changedLines=null;var c=this.layerConfig;if(c.width!=this.$getLongestLine())return this.$textLayer.update(c);if(a>c.lastRow+1)return;if(b<c.firstRow)return;if(b===Infinity){this.showGutter&&this.$gutterLayer.update(c),this.$textLayer.update(c);return}return this.$textLayer.updateLines(c,a,b),!0},this.$getLongestLine=function(){var a=this.session.getScreenWidth();return this.$textLayer.showInvisibles&&(a+=1),Math.max(this.$size.scrollerWidth-2*this.$padding,Math.round(a*this.characterWidth))},this.updateFrontMarkers=function(){this.$markerFront.setMarkers(this.session.getMarkers(!0)),this.$loop.schedule(this.CHANGE_MARKER_FRONT)},this.updateBackMarkers=function(){this.$markerBack.setMarkers(this.session.getMarkers()),this.$loop.schedule(this.CHANGE_MARKER_BACK)},this.addGutterDecoration=function(a,b){this.$gutterLayer.addGutterDecoration(a,b),this.$loop.schedule(this.CHANGE_GUTTER)},this.removeGutterDecoration=function(a,b){this.$gutterLayer.removeGutterDecoration(a,b),this.$loop.schedule(this.CHANGE_GUTTER)},this.setBreakpoints=function(a){this.$gutterLayer.setBreakpoints(a),this.$loop.schedule(this.CHANGE_GUTTER)},this.setAnnotations=function(a){this.$gutterLayer.setAnnotations(a),this.$loop.schedule(this.CHANGE_GUTTER)},this.updateCursor=function(){this.$loop.schedule(this.CHANGE_CURSOR)},this.hideCursor=function(){this.$cursorLayer.hideCursor()},this.showCursor=function(){this.$cursorLayer.showCursor()},this.scrollSelectionIntoView=function(a,b){this.scrollCursorIntoView(a),this.scrollCursorIntoView(b)},this.scrollCursorIntoView=function(a){if(this.$size.scrollerHeight===0)return;var b=this.$cursorLayer.getPixelPosition(a),c=b.left,d=b.top;this.scrollTop>d&&this.session.setScrollTop(d),this.scrollTop+this.$size.scrollerHeight<d+this.lineHeight&&this.session.setScrollTop(d+this.lineHeight-this.$size.scrollerHeight);var e=this.scrollLeft;e>c&&(c<this.$padding+2*this.layerConfig.characterWidth&&(c=0),this.session.setScrollLeft(c)),e+this.$size.scrollerWidth<c+this.characterWidth&&this.session.setScrollLeft(Math.round(c+this.characterWidth-this.$size.scrollerWidth))},this.getScrollTop=function(){return this.session.getScrollTop()},this.getScrollLeft=function(){return this.session.getScrollLeft()},this.getScrollTopRow=function(){return this.scrollTop/this.lineHeight},this.getScrollBottomRow=function(){return Math.max(0,Math.floor((this.scrollTop+this.$size.scrollerHeight)/this.lineHeight)-1)},this.scrollToRow=function(a){this.session.setScrollTop(a*this.lineHeight)},this.STEPS=10,this.$calcSteps=function(a,b){var c=0,d=this.STEPS,e=[],f=function(a,b,c){return(a/=.5)<1?c/2*Math.pow(a,3)+b:c/2*(Math.pow(a-2,3)+2)+b};for(c=0;c<d;++c)e.push(f(c/this.STEPS,a,b-a));return e.push(b),e},this.scrollToLine=function(a,b){var c=this.$cursorLayer.getPixelPosition({row:a,column:0}),d=c.top;b&&(d-=this.$size.scrollerHeight/2);if(this.$animatedScroll&&Math.abs(d-this.scrollTop)<1e4){var e=this,f=e.$calcSteps(this.scrollTop,d);clearInterval(this.$timer),this.$timer=setInterval(function(){e.session.setScrollTop(f.shift()),f.length||clearInterval(e.$timer)},10)}else this.session.setScrollTop(d)},this.scrollToY=function(a){this.scrollTop!==a&&(this.$loop.schedule(this.CHANGE_SCROLL),this.scrollTop=a)},this.scrollToX=function(a){a<=this.$padding&&(a=0),this.scrollLeft!==a&&(this.scrollLeft=a),this.$loop.schedule(this.CHANGE_H_SCROLL)},this.scrollBy=function(a,b){b&&this.session.setScrollTop(this.session.getScrollTop()+b),a&&this.session.setScrollLeft(this.session.getScrollLeft()+a)},this.isScrollableBy=function(a,b){if(b<0&&this.session.getScrollTop()>0)return!0;if(b>0&&this.session.getScrollTop()+this.$size.scrollerHeight<this.layerConfig.maxHeight)return!0},this.pixelToScreenCoordinates=function(a,b){var c=this.scroller.getBoundingClientRect(),d=Math.round((a+this.scrollLeft-c.left-this.$padding-e.getPageScrollLeft())/this.characterWidth),f=Math.floor((b+this.scrollTop-c.top-e.getPageScrollTop())/this.lineHeight);return{row:f,column:d}},this.screenToTextCoordinates=function(a,b){var c=this.scroller.getBoundingClientRect(),d=Math.round((a+this.scrollLeft-c.left-this.$padding-e.getPageScrollLeft())/this.characterWidth),f=Math.floor((b+this.scrollTop-c.top-e.getPageScrollTop())/this.lineHeight);return this.session.screenToDocumentPosition(f,Math.max(d,0))},this.textToScreenCoordinates=function(a,b){var c=this.scroller.getBoundingClientRect(),d=this.session.documentToScreenPosition(a,b),e=this.$padding+Math.round(d.column*this.characterWidth),f=d.row*this.lineHeight;return{pageX:c.left+e-this.scrollLeft,pageY:c.top+f-this.scrollTop}},this.visualizeFocus=function(){e.addCssClass(this.container,"ace_focus")},this.visualizeBlur=function(){e.removeCssClass(this.container,"ace_focus")},this.showComposition=function(a){this.$composition||(this.$composition=e.createElement("div"),this.$composition.className="ace_composition",this.content.appendChild(this.$composition)),this.$composition.innerHTML="&#160;";var b=this.$cursorLayer.getPixelPosition(),c=this.$composition.style;c.top=b.top+"px",c.left=b.left+this.$padding+"px",c.height=this.lineHeight+"px",this.hideCursor()},this.setCompositionText=function(a){e.setInnerText(this.$composition,a)},this.hideComposition=function(){this.showCursor();if(!this.$composition)return;var a=this.$composition.style;a.top="-10000px",a.left="-10000px"},this._loadTheme=function(a,b){if(!h.get("packaged"))return b();var c=a.split("/").pop(),d=h.get("themePath")+"/theme-"+c+h.get("suffix");i.loadScript(d,b)},this.setTheme=function(b){function h(a){e.importCssString(a.cssText,a.cssClass,c.container.ownerDocument),c.$theme&&e.removeCssClass(c.container,c.$theme),c.$theme=a?a.cssClass:null,c.$theme&&e.addCssClass(c.container,c.$theme),a&&a.isDark?e.addCssClass(c.container,"ace_dark"):e.removeCssClass(c.container,"ace_dark"),c.$size&&(c.$size.width=0,c.onResize())}var c=this;this.$themeValue=b;if(!b||typeof b=="string"){var d=b||"ace/theme/textmate",f;try{f=a(d)}catch(g){}if(f)return h(f);c._loadTheme(d,function(){a([d],function(a){if(c.$themeValue!==b)return;h(a)})})}else h(b)},this.getTheme=function(){return this.$themeValue},this.setStyle=function(b){e.addCssClass(this.container,b)},this.unsetStyle=function(b){e.removeCssClass(this.container,b)},this.destroy=function(){this.$textLayer.destroy(),this.$cursorLayer.destroy()}}).call(r.prototype),b.VirtualRenderer=r}),define("ace/layer/gutter",["require","exports","module","ace/lib/dom","ace/lib/oop","ace/lib/event_emitter"],function(a,b,c){"use strict";var d=a("../lib/dom"),e=a("../lib/oop"),f=a("../lib/event_emitter").EventEmitter,g=function(a){this.element=d.createElement("div"),this.element.className="ace_layer ace_gutter-layer",a.appendChild(this.element),this.setShowFoldWidgets(this.$showFoldWidgets),this.gutterWidth=0,this.$breakpoints=[],this.$annotations=[],this.$decorations=[]};(function(){e.implement(this,f),this.setSession=function(a){this.session=a},this.addGutterDecoration=function(a,b){this.$decorations[a]||(this.$decorations[a]=""),this.$decorations[a]+=" "+b},this.removeGutterDecoration=function(a,b){this.$decorations[a]=this.$decorations[a].replace(" "+b,"")},this.setBreakpoints=function(a){this.$breakpoints=a.concat()},this.setAnnotations=function(a){this.$annotations=[];for(var b in a)if(a.hasOwnProperty(b)){var c=a[b];if(!c)continue;var d=this.$annotations[b]={text:[]};for(var e=0;e<c.length;e++){var f=c[e],g=f.text.replace(/"/g,"&quot;").replace(/'/g,"&#8217;").replace(/</,"&lt;");d.text.indexOf(g)===-1&&d.text.push(g);var h=f.type;h=="error"?d.className="ace_error":h=="warning"&&d.className!="ace_error"?d.className="ace_warning":h=="info"&&!d.className&&(d.className="ace_info")}}},this.update=function(a){this.$config=a;var b={className:"",text:[]},c=[],e=a.firstRow,f=a.lastRow,g=this.session.getNextFoldLine(e),h=g?g.start.row:Infinity,i=this.$showFoldWidgets&&this.session.foldWidgets;for(;;){e>h&&(e=g.end.row+1,g=this.session.getNextFoldLine(e,g),h=g?g.start.row:Infinity);if(e>f)break;var j=this.$annotations[e]||b;c.push("<div class='ace_gutter-cell",this.$decorations[e]||"",this.$breakpoints[e]?" ace_breakpoint ":" ",j.className,"' title='",j.text.join("\n"),"' style='height:",a.lineHeight,"px;'>",e+1);if(i){var k=i[e];k==null&&(k=i[e]=this.session.getFoldWidget(e)),k&&c.push("<span class='ace_fold-widget ",k,k=="start"&&e==h&&e<g.end.row?" closed":" open","'></span>")}var l=this.session.getRowLength(e)-1;while(l--)c.push("</div><div class='ace_gutter-cell' style='height:",a.lineHeight,"px'>¦");c.push("</div>"),e++}this.element=d.setInnerHtml(this.element,c.join("")),this.element.style.height=a.minHeight+"px";var m=this.element.offsetWidth;m!==this.gutterWidth&&(this.gutterWidth=m,this._emit("changeGutterWidth",m))},this.$showFoldWidgets=!0,this.setShowFoldWidgets=function(a){a?d.addCssClass(this.element,"ace_folding-enabled"):d.removeCssClass(this.element,"ace_folding-enabled"),this.$showFoldWidgets=a},this.getShowFoldWidgets=function(){return this.$showFoldWidgets}}).call(g.prototype),b.Gutter=g}),define("ace/layer/marker",["require","exports","module","ace/range","ace/lib/dom"],function(a,b,c){"use strict";var d=a("../range").Range,e=a("../lib/dom"),f=function(a){this.element=e.createElement("div"),this.element.className="ace_layer ace_marker-layer",a.appendChild(this.element)};(function(){this.$padding=0,this.setPadding=function(a){this.$padding=a},this.setSession=function(a){this.session=a},this.setMarkers=function(a){this.markers=a},this.update=function(a){var a=a||this.config;if(!a)return;this.config=a;var b=[];for(var c in this.markers){var d=this.markers[c],f=d.range.clipRows(a.firstRow,a.lastRow);if(f.isEmpty())continue;f=f.toScreenRange(this.session);if(d.renderer){var g=this.$getTop(f.start.row,a),h=Math.round(this.$padding+f.start.column*a.characterWidth);d.renderer(b,f,h,g,a)}else f.isMultiLine()?d.type=="text"?this.drawTextMarker(b,f,d.clazz,a):this.drawMultiLineMarker(b,f,d.clazz,a,d.type):this.drawSingleLineMarker(b,f,d.clazz,a,null,d.type)}this.element=e.setInnerHtml(this.element,b.join(""))},this.$getTop=function(a,b){return(a-b.firstRowScreen)*b.lineHeight},this.drawTextMarker=function(a,b,c,e){var f=b.start.row,g=new d(f,b.start.column,f,this.session.getScreenLastRowColumn(f));this.drawSingleLineMarker(a,g,c,e,1,"text"),f=b.end.row,g=new d(f,0,f,b.end.column),this.drawSingleLineMarker(a,g,c,e,0,"text");for(f=b.start.row+1;f<b.end.row;f++)g.start.row=f,g.end.row=f,g.end.column=this.session.getScreenLastRowColumn(f),this.drawSingleLineMarker(a,g,c,e,1,"text")},this.drawMultiLineMarker=function(a,b,c,d,e){var f=e==="background"?0:this.$padding,g=d.width+2*this.$padding-f,h=d.lineHeight,i=Math.round(g-b.start.column*d.characterWidth),j=this.$getTop(b.start.row,d),k=Math.round(f+b.start.column*d.characterWidth);a.push("<div class='",c,"' style='","height:",h,"px;","width:",i,"px;","top:",j,"px;","left:",k,"px;'></div>"),j=this.$getTop(b.end.row,d),i=Math.round(b.end.column*d.characterWidth),a.push("<div class='",c,"' style='","height:",h,"px;","width:",i,"px;","top:",j,"px;","left:",f,"px;'></div>"),h=(b.end.row-b.start.row-1)*d.lineHeight;if(h<0)return;j=this.$getTop(b.start.row+1,d),a.push("<div class='",c,"' style='","height:",h,"px;","width:",g,"px;","top:",j,"px;","left:",f,"px;'></div>")},this.drawSingleLineMarker=function(a,b,c,d,e,f){var g=f==="background"?0:this.$padding,h=d.lineHeight;if(f==="background")var i=d.width;else i=Math.round((b.end.column+(e||0)-b.start.column)*d.characterWidth);var j=this.$getTop(b.start.row,d),k=Math.round(g+b.start.column*d.characterWidth);a.push("<div class='",c,"' style='","height:",h,"px;","width:",i,"px;","top:",j,"px;","left:",k,"px;'></div>")}}).call(f.prototype),b.Marker=f}),define("ace/layer/text",["require","exports","module","ace/lib/oop","ace/lib/dom","ace/lib/lang","ace/lib/useragent","ace/lib/event_emitter"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/dom"),f=a("../lib/lang"),g=a("../lib/useragent"),h=a("../lib/event_emitter").EventEmitter,i=function(a){this.element=e.createElement("div"),this.element.className="ace_layer ace_text-layer",a.appendChild(this.element),this.$characterSize=this.$measureSizes()||{width:0,height:0},this.$pollSizeChanges()};(function(){d.implement(this,h),this.EOF_CHAR="¶",this.EOL_CHAR="¬",this.TAB_CHAR="→",this.SPACE_CHAR="·",this.$padding=0,this.setPadding=function(a){this.$padding=a,this.element.style.padding="0 "+a+"px"},this.getLineHeight=function(){return this.$characterSize.height||1},this.getCharacterWidth=function(){return this.$characterSize.width||1},this.checkForSizeChanges=function(){var a=this.$measureSizes();a&&(this.$characterSize.width!==a.width||this.$characterSize.height!==a.height)&&(this.$characterSize=a,this._emit("changeCharacterSize",{data:a}))},this.$pollSizeChanges=function(){var a=this;this.$pollSizeChangesTimer=setInterval(function(){a.checkForSizeChanges()},500)},this.$fontStyles={fontFamily:1,fontSize:1,fontWeight:1,fontStyle:1,lineHeight:1},this.$measureSizes=g.isIE||g.isOldGecko?function(){var a=1e3;if(!this.$measureNode){var b=this.$measureNode=e.createElement("div"),c=b.style;c.width=c.height="auto",c.left=c.top=-a*40+"px",c.visibility="hidden",c.position="fixed",c.overflow="visible",c.whiteSpace="nowrap",b.innerHTML=f.stringRepeat("Xy",a);if(this.element.ownerDocument.body)this.element.ownerDocument.body.appendChild(b);else{var d=this.element.parentNode;while(!e.hasCssClass(d,"ace_editor"))d=d.parentNode;d.appendChild(b)}}if(!this.element.offsetWidth)return null;var c=this.$measureNode.style,g=e.computedStyle(this.element);for(var h in this.$fontStyles)c[h]=g[h];var i={height:this.$measureNode.offsetHeight,width:this.$measureNode.offsetWidth/(a*2)};return i.width==0||i.height==0?null:i}:function(){if(!this.$measureNode){var a=this.$measureNode=e.createElement("div"),b=a.style;b.width=b.height="auto",b.left=b.top="-100px",b.visibility="hidden",b.position="fixed",b.overflow="visible",b.whiteSpace="nowrap",a.innerHTML="X";var c=this.element.parentNode;while(c&&!e.hasCssClass(c,"ace_editor"))c=c.parentNode;if(!c)return this.$measureNode=null;c.appendChild(a)}var d=this.$measureNode.getBoundingClientRect(),f={height:d.height,width:d.width};return f.width==0||f.height==0?null:f},this.setSession=function(a){this.session=a},this.showInvisibles=!1,this.setShowInvisibles=function(a){return this.showInvisibles==a?!1:(this.showInvisibles=a,!0)},this.$tabStrings=[],this.$computeTabString=function(){var a=this.session.getTabSize(),b=this.$tabStrings=[0];for(var c=1;c<a+1;c++)this.showInvisibles?b.push("<span class='ace_invisible'>"+this.TAB_CHAR+(new Array(c)).join("&#160;")+"</span>"):b.push((new Array(c+1)).join("&#160;"))},this.updateLines=function(a,b,c){this.$computeTabString(),(this.config.lastRow!=a.lastRow||this.config.firstRow!=a.firstRow)&&this.scrollLines(a),this.config=a;var d=Math.max(b,a.firstRow),f=Math.min(c,a.lastRow),g=this.element.childNodes,h=0;for(var i=a.firstRow;i<d;i++){var j=this.session.getFoldLine(i);if(j){if(j.containsRow(d)){d=j.start.row;break}i=j.end.row}h++}for(var k=d;k<=f;k++){var l=g[h++];if(!l)continue;var m=[],n=this.session.getTokens(k,k);this.$renderLine(m,k,n[0].tokens,!this.$useLineGroups()),l=e.setInnerHtml(l,m.join("")),k=this.session.getRowFoldEnd(k)}},this.scrollLines=function(a){this.$computeTabString();var b=this.config;this.config=a;if(!b||b.lastRow<a.firstRow)return this.update(a);if(a.lastRow<b.firstRow)return this.update(a);var c=this.element;if(b.firstRow<a.firstRow)for(var d=this.session.getFoldedRowCount(b.firstRow,a.firstRow-1);d>0;d--)c.removeChild(c.firstChild);if(b.lastRow>a.lastRow)for(var d=this.session.getFoldedRowCount(a.lastRow+1,b.lastRow);d>0;d--)c.removeChild(c.lastChild);if(a.firstRow<b.firstRow){var e=this.$renderLinesFragment(a,a.firstRow,b.firstRow-1);c.firstChild?c.insertBefore(e,c.firstChild):c.appendChild(e)}if(a.lastRow>b.lastRow){var e=this.$renderLinesFragment(a,b.lastRow+1,a.lastRow);c.appendChild(e)}},this.$renderLinesFragment=function(a,b,c){var d=this.element.ownerDocument.createDocumentFragment(),f=b,g=this.session.getNextFoldLine(f),h=g?g.start.row:Infinity;for(;;){f>h&&(f=g.end.row+1,g=this.session.getNextFoldLine(f,g),h=g?g.start.row:Infinity);if(f>c)break;var i=e.createElement("div"),j=[],k=this.session.getTokens(f,f);k.length==1&&this.$renderLine(j,f,k[0].tokens,!1),i.innerHTML=j.join("");if(this.$useLineGroups())i.className="ace_line_group",d.appendChild(i);else{var l=i.childNodes;while(l.length)d.appendChild(l[0])}f++}return d},this.update=function(a){this.$computeTabString(),this.config=a;var b=[],c=a.firstRow,d=a.lastRow,f=c,g=this.session.getNextFoldLine(f),h=g?g.start.row:Infinity;for(;;){f>h&&(f=g.end.row+1,g=this.session.getNextFoldLine(f,g),h=g?g.start.row:Infinity);if(f>d)break;this.$useLineGroups()&&b.push("<div class='ace_line_group'>");var i=this.session.getTokens(f,f);i.length==1&&this.$renderLine(b,f,i[0].tokens,!1),this.$useLineGroups()&&b.push("</div>"),f++}this.element=e.setInnerHtml(this.element,b.join(""))},this.$textToken={text:!0,rparen:!0,lparen:!0},this.$renderToken=function(a,b,c,d){var e=this,f=/\t|&|<|( +)|([\v\f \u00a0\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u200b\u2028\u2029\u3000])|[\u1100-\u115F]|[\u11A3-\u11A7]|[\u11FA-\u11FF]|[\u2329-\u232A]|[\u2E80-\u2E99]|[\u2E9B-\u2EF3]|[\u2F00-\u2FD5]|[\u2FF0-\u2FFB]|[\u3000-\u303E]|[\u3041-\u3096]|[\u3099-\u30FF]|[\u3105-\u312D]|[\u3131-\u318E]|[\u3190-\u31BA]|[\u31C0-\u31E3]|[\u31F0-\u321E]|[\u3220-\u3247]|[\u3250-\u32FE]|[\u3300-\u4DBF]|[\u4E00-\uA48C]|[\uA490-\uA4C6]|[\uA960-\uA97C]|[\uAC00-\uD7A3]|[\uD7B0-\uD7C6]|[\uD7CB-\uD7FB]|[\uF900-\uFAFF]|[\uFE10-\uFE19]|[\uFE30-\uFE52]|[\uFE54-\uFE66]|[\uFE68-\uFE6B]|[\uFF01-\uFF60]|[\uFFE0-\uFFE6]/g,h=function(a,c,d,f,h){if(a.charCodeAt(0)==32)return(new Array(a.length+1)).join("&#160;");if(a=="	"){var i=e.session.getScreenTabSize(b+f);return b+=i-1,e.$tabStrings[i]}if(a=="&")return g.isOldGecko?"&":"&amp;";if(a=="<")return"&lt;";if(a=="　"){var j=e.showInvisibles?"ace_cjk ace_invisible":"ace_cjk",k=e.showInvisibles?e.SPACE_CHAR:"";return b+=1,"<span class='"+j+"' style='width:"+e.config.characterWidth*2+"px'>"+k+"</span>"}if(a.match(/[\v\f \u00a0\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u200b\u2028\u2029\u3000]/)){if(e.showInvisibles){var k=(new Array(a.length+1)).join(e.SPACE_CHAR);return"<span class='ace_invisible'>"+k+"</span>"}return"&#160;"}return b+=1,"<span class='ace_cjk' style='width:"+e.config.characterWidth*2+"px'>"+a+"</span>"},i=d.replace(f,h);if(!this.$textToken[c.type]){var j="ace_"+c.type.replace(/\./g," ace_"),k="";c.type=="fold"&&(k=" style='width:"+c.value.length*this.config.characterWidth+"px;' "),a.push("<span class='",j,"'",k,">",i,"</span>")}else a.push(i);return b+d.length},this.$renderLineCore=function(a,b,c,d,e){var f=0,g=0,h,i=0,j=this;!d||d.length==0?h=Number.MAX_VALUE:h=d[0],e||a.push("<div class='ace_line' style='height:",this.config.lineHeight,"px","'>");for(var k=0;k<c.length;k++){var l=c[k],m=l.value;if(f+m.length<h)i=j.$renderToken(a,i,l,m),f+=m.length;else{while(f+m.length>=h)i=j.$renderToken(a,i,l,m.substring(0,h-f)),m=m.substring(h-f),f=h,e||a.push("</div>","<div class='ace_line' style='height:",this.config.lineHeight,"px","'>"),g++,i=0,h=d[g]||Number.MAX_VALUE;m.length!=0&&(f+=m.length,i=j.$renderToken(a,i,l,m))}}this.showInvisibles&&(b!==this.session.getLength()-1?a.push("<span class='ace_invisible'>"+this.EOL_CHAR+"</span>"):a.push("<span class='ace_invisible'>"+this.EOF_CHAR+"</span>")),e||a.push("</div>")},this.$renderLine=function(a,b,c,d){if(!this.session.isRowFolded(b)){var e=this.session.getRowSplitData(b);this.$renderLineCore(a,b,c,e,d)}else this.$renderFoldLine(a,b,c,d)},this.$renderFoldLine=function(a,b,c,d){function h(a,b,c){var d=0,e=0;while(e+a[d].value.length<b){e+=a[d].value.length,d++;if(d==a.length)return}if(e!=b){var f=a[d].value.substring(b-e);f.length>c-b&&(f=f.substring(0,c-b)),g.push({type:a[d].type,value:f}),e=b+f.length,d+=1}while(e<c){var f=a[d].value;f.length+e>c&&(f=f.substring(0,c-e)),g.push({type:a[d].type,value:f}),e+=f.length,d+=1}}var e=this.session,f=e.getFoldLine(b),g=[];f.walk(function(a,b,d,e,f){a?g.push({type:"fold",value:a}):(f&&(c=this.session.getTokens(b,b)[0].tokens),c.length!=0&&h(c,e,d))}.bind(this),f.end.row,this.session.getLine(f.end.row).length);var i=this.session.$useWrapMode?this.session.$wrapData[b]:null;this.$renderLineCore(a,b,g,i,d)},this.$useLineGroups=function(){return this.session.getUseWrapMode()},this.destroy=function(){clearInterval(this.$pollSizeChangesTimer),this.$measureNode&&this.$measureNode.parentNode.removeChild(this.$measureNode),delete this.$measureNode}}).call(i.prototype),b.Text=i}),define("ace/layer/cursor",["require","exports","module","ace/lib/dom"],function(a,b,c){"use strict";var d=a("../lib/dom"),e=function(a){this.element=d.createElement("div"),this.element.className="ace_layer ace_cursor-layer",a.appendChild(this.element),this.isVisible=!1,this.cursors=[],this.cursor=this.addCursor()};(function(){this.$padding=0,this.setPadding=function(a){this.$padding=a},this.setSession=function(a){this.session=a},this.addCursor=function(){var a=d.createElement("div"),b="ace_cursor";return this.isVisible||(b+=" ace_hidden"),this.overwrite&&(b+=" ace_overwrite"),a.className=b,this.element.appendChild(a),this.cursors.push(a),a},this.removeCursor=function(){if(this.cursors.length>1){var a=this.cursors.pop();return a.parentNode.removeChild(a),a}},this.hideCursor=function(){this.isVisible=!1;for(var a=this.cursors.length;a--;)d.addCssClass(this.cursors[a],"ace_hidden");clearInterval(this.blinkId)},this.showCursor=function(){this.isVisible=!0;for(var a=this.cursors.length;a--;)d.removeCssClass(this.cursors[a],"ace_hidden");this.element.style.visibility="",this.restartTimer()},this.restartTimer=function(){clearInterval(this.blinkId);if(!this.isVisible)return;var a=this.element;this.blinkId=setInterval(function(){a.style.visibility="hidden",setTimeout(function(){a.style.visibility="visible"},400)},1e3)},this.getPixelPosition=function(a,b){if(!this.config||!this.session)return{left:0,top:0};a||(a=this.session.selection.getCursor());var c=this.session.documentToScreenPosition(a),d=Math.round(this.$padding+c.column*this.config.characterWidth),e=(c.row-(b?this.config.firstRowScreen:0))*this.config.lineHeight;return{left:d,top:e}},this.update=function(a){this.config=a;if(this.session.selectionMarkerCount>1){var b=this.session.$selectionMarkers,c=0,d,e=0;for(var c=b.length;c--;){d=b[c];var f=this.getPixelPosition(d.cursor,!0),g=(this.cursors[e++]||this.addCursor()).style;g.left=f.left+"px",g.top=f.top+"px",g.width=a.characterWidth+"px",g.height=a.lineHeight+"px"}if(e>1)while(this.cursors.length>e)this.removeCursor()}else{var f=this.getPixelPosition(null,!0),g=this.cursor.style;g.left=f.left+"px",g.top=f.top+"px",g.width=a.characterWidth+"px",g.height=a.lineHeight+"px";while(this.cursors.length>1)this.removeCursor()}var h=this.session.getOverwrite();h!=this.overwrite&&this.$setOverite(h),this.restartTimer()},this.$setOverite=function(a){this.overwrite=a;for(var b=this.cursors.length;b--;)a?d.addCssClass(this.cursors[b],"ace_overwrite"):d.removeCssClass(this.cursors[b],"ace_overwrite")},this.destroy=function(){clearInterval(this.blinkId)}}).call(e.prototype),b.Cursor=e}),define("ace/scrollbar",["require","exports","module","ace/lib/oop","ace/lib/dom","ace/lib/event","ace/lib/event_emitter"],function(a,b,c){"use strict";var d=a("./lib/oop"),e=a("./lib/dom"),f=a("./lib/event"),g=a("./lib/event_emitter").EventEmitter,h=function(a){this.element=e.createElement("div"),this.element.className="ace_sb",this.inner=e.createElement("div"),this.element.appendChild(this.inner),a.appendChild(this.element),this.width=e.scrollbarWidth(a.ownerDocument),this.element.style.width=(this.width||15)+5+"px",f.addListener(this.element,"scroll",this.onScroll.bind(this))};(function(){d.implement(this,g),this.onScroll=function(){this._emit("scroll",{data:this.element.scrollTop})},this.getWidth=function(){return this.width},this.setHeight=function(a){this.element.style.height=a+"px"},this.setInnerHeight=function(a){this.inner.style.height=a+"px"},this.setScrollTop=function(a){this.element.scrollTop=a}}).call(h.prototype),b.ScrollBar=h}),define("ace/renderloop",["require","exports","module","ace/lib/event"],function(a,b,c){"use strict";var d=a("./lib/event"),e=function(a,b){this.onRender=a,this.pending=!1,this.changes=0,this.window=b||window};(function(){this.schedule=function(a){this.changes=this.changes|a;if(!this.pending){this.pending=!0;var b=this;d.nextTick(function(){b.pending=!1;var a;while(a=b.changes)b.changes=0,b.onRender(a)},this.window)}}}).call(e.prototype),b.RenderLoop=e}),define("text!ace/css/editor.css",[],".ace_editor {\n    position: absolute;\n    overflow: hidden;\n    font-family: 'Monaco', 'Menlo', 'Ubuntu Mono', 'Droid Sans Mono', 'Consolas', monospace;\n    font-size: 12px;\n}\n\n.ace_scroller {\n    position: absolute;\n    overflow-x: scroll;\n    overflow-y: hidden;\n}\n\n.ace_content {\n    position: absolute;\n    box-sizing: border-box;\n    -moz-box-sizing: border-box;\n    -webkit-box-sizing: border-box;\n    cursor: text;\n}\n\n.ace_composition {\n    position: absolute;\n    background: #555;\n    color: #DDD;\n    z-index: 4;\n}\n\n.ace_gutter {\n    position: absolute;\n    overflow : hidden;\n    height: 100%;\n    width: auto;\n    cursor: default;\n    z-index: 1000;\n}\n\n.ace_gutter.horscroll {\n    box-shadow: 0px 0px 20px rgba(0,0,0,0.4);\n}\n\n.ace_gutter-cell {\n    padding-left: 19px;\n    padding-right: 6px;\n}\n\n.ace_gutter-cell.ace_error {\n    background-image: url(\"data:image/gif,GIF89a%10%00%10%00%D5%00%00%F5or%F5%87%88%F5nr%F4ns%EBmq%F5z%7F%DDJT%DEKS%DFOW%F1Yc%F2ah%CE(7%CE)8%D18E%DD%40M%F2KZ%EBU%60%F4%60m%DCir%C8%16(%C8%19*%CE%255%F1%3FR%F1%3FS%E6%AB%B5%CA%5DI%CEn%5E%F7%A2%9A%C9G%3E%E0a%5B%F7%89%85%F5yy%F6%82%80%ED%82%80%FF%BF%BF%E3%C4%C4%FF%FF%FF%FF%FF%FF%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00!%F9%04%01%00%00%25%00%2C%00%00%00%00%10%00%10%00%00%06p%C0%92pH%2C%1A%8F%C8%D2H%93%E1d4%23%E4%88%D3%09mB%1DN%B48%F5%90%40%60%92G%5B%94%20%3E%22%D2%87%24%FA%20%24%C5%06A%00%20%B1%07%02B%A38%89X.v%17%82%11%13q%10%0Fi%24%0F%8B%10%7BD%12%0Ei%09%92%09%0EpD%18%15%24%0A%9Ci%05%0C%18F%18%0B%07%04%01%04%06%A0H%18%12%0D%14%0D%12%A1I%B3%B4%B5IA%00%3B\");\n    background-repeat: no-repeat;\n    background-position: 2px center;\n}\n\n.ace_gutter-cell.ace_warning {\n    background-image: url(\"data:image/gif,GIF89a%10%00%10%00%D5%00%00%FF%DBr%FF%DE%81%FF%E2%8D%FF%E2%8F%FF%E4%96%FF%E3%97%FF%E5%9D%FF%E6%9E%FF%EE%C1%FF%C8Z%FF%CDk%FF%D0s%FF%D4%81%FF%D5%82%FF%D5%83%FF%DC%97%FF%DE%9D%FF%E7%B8%FF%CCl%7BQ%13%80U%15%82W%16%81U%16%89%5B%18%87%5B%18%8C%5E%1A%94d%1D%C5%83-%C9%87%2F%C6%84.%C6%85.%CD%8B2%C9%871%CB%8A3%CD%8B5%DC%98%3F%DF%9BB%E0%9CC%E1%A5U%CB%871%CF%8B5%D1%8D6%DB%97%40%DF%9AB%DD%99B%E3%B0p%E7%CC%AE%FF%FF%FF%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00!%F9%04%01%00%00%2F%00%2C%00%00%00%00%10%00%10%00%00%06a%C0%97pH%2C%1A%8FH%A1%ABTr%25%87%2B%04%82%F4%7C%B9X%91%08%CB%99%1C!%26%13%84*iJ9(%15G%CA%84%14%01%1A%97%0C%03%80%3A%9A%3E%81%84%3E%11%08%B1%8B%20%02%12%0F%18%1A%0F%0A%03'F%1C%04%0B%10%16%18%10%0B%05%1CF%1D-%06%07%9A%9A-%1EG%1B%A0%A1%A0U%A4%A5%A6BA%00%3B\");\n    background-repeat: no-repeat;\n    background-position: 2px center;\n}\n\n.ace_gutter-cell.ace_info {\n    background-image: url(\"data:image/gif;base64,R0lGODlhEAAQAMQAAAAAAEFBQVJSUl5eXmRkZGtra39/f4WFhYmJiZGRkaampry8vMPDw8zMzNXV1dzc3OTk5Orq6vDw8P///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAkAABQALAAAAAAQABAAAAUuICWOZGmeaBml5XGwFCQSBGyXRSAwtqQIiRuiwIM5BoYVbEFIyGCQoeJGrVptIQA7\");\n    background-repeat: no-repeat;\n    background-position: 2px center;\n}\n\n.ace_editor .ace_sb {\n    position: absolute;\n    overflow-x: hidden;\n    overflow-y: scroll;\n    right: 0;\n}\n\n.ace_editor .ace_sb div {\n    position: absolute;\n    width: 1px;\n    left: 0;\n}\n\n.ace_editor .ace_print_margin_layer {\n    z-index: 0;\n    position: absolute;\n    overflow: hidden;\n    margin: 0;\n    left: 0;\n    height: 100%;\n    width: 100%;\n}\n\n.ace_editor .ace_print_margin {\n    position: absolute;\n    height: 100%;\n}\n\n.ace_editor textarea {\n    position: fixed;\n    z-index: 0;\n    width: 10px;\n    height: 30px;\n    opacity: 0;\n    background: transparent;\n    appearance: none;\n    -moz-appearance: none;\n    border: none;\n    resize: none;\n    outline: none;\n    overflow: hidden;\n}\n\n.ace_layer {\n    z-index: 1;\n    position: absolute;\n    overflow: hidden;\n    white-space: nowrap;\n    height: 100%;\n    width: 100%;\n    box-sizing: border-box;\n    -moz-box-sizing: border-box;\n    -webkit-box-sizing: border-box;\n    /* setting pointer-events: auto; on node under the mouse, which changes\n        during scroll, will break mouse wheel scrolling in Safari */\n    pointer-events: none;\n}\n\n.ace_gutter .ace_layer {\n    position: relative;\n    min-width: 40px;\n    text-align: right;\n    pointer-events: auto;\n}\n\n.ace_text-layer {\n    color: black;\n}\n\n.ace_cjk {\n    display: inline-block;\n    text-align: center;\n}\n\n.ace_cursor-layer {\n    z-index: 4;\n}\n\n.ace_cursor {\n    z-index: 4;\n    position: absolute;\n}\n\n.ace_cursor.ace_hidden {\n    opacity: 0.2;\n}\n\n.ace_line {\n    white-space: nowrap;\n}\n\n.ace_marker-layer .ace_step {\n    position: absolute;\n    z-index: 3;\n}\n\n.ace_marker-layer .ace_selection {\n    position: absolute;\n    z-index: 5;\n}\n\n.ace_marker-layer .ace_bracket {\n    position: absolute;\n    z-index: 6;\n}\n\n.ace_marker-layer .ace_active_line {\n    position: absolute;\n    z-index: 2;\n}\n\n.ace_gutter .ace_gutter_active_line{\n    background-color : #dcdcdc;\n}\n\n.ace_marker-layer .ace_selected_word {\n    position: absolute;\n    z-index: 4;\n    box-sizing: border-box;\n    -moz-box-sizing: border-box;\n    -webkit-box-sizing: border-box;\n}\n\n.ace_line .ace_fold {\n    box-sizing: border-box;\n    -moz-box-sizing: border-box;\n    -webkit-box-sizing: border-box;\n    \n    display: inline-block;\n    height: 11px;\n    margin-top: -2px;\n    vertical-align: middle;\n\n    background-image: \n        url(\"data:image/png,%89PNG%0D%0A%1A%0A%00%00%00%0DIHDR%00%00%00%11%00%00%00%09%08%06%00%00%00%D4%E8%C7%0C%00%00%03%1EiCCPICC%20Profile%00%00x%01%85T%DFk%D3P%14%FE%DAe%9D%B0%E1%8B%3Ag%11%09%3Eh%91ndStC%9C%B6kW%BA%CDZ%EA6%B7!H%9B%A6m%5C%9A%C6%24%ED~%B0%07%D9%8Bo%3A%C5w%F1%07%3E%F9%07%0C%D9%83o%7B%92%0D%C6%14a%F8%AC%88%22L%F6%22%B3%9E%9B4M'S%03%B9%F7%BB%DF%F9%EE9'%E7%E4%5E%A0%F9qZ%D3%14%2F%0F%14USO%C5%C2%FC%C4%E4%14%DF%F2%01%5E%1CC%2B%FChM%8B%86%16J%26G%40%0F%D3%B2y%EF%B3%F3%0E%1E%C6lt%EEo%DF%AB%FEc%D5%9A%95%0C%11%F0%1C%20%BE%945%C4%22%E1Y%A0i%5C%D4t%13%E0%D6%89%EF%9D15%C2%CDLsX%A7%04%09%1Fg8oc%81%E1%8C%8D%23%96f45%40%9A%09%C2%07%C5B%3AK%B8%408%98i%E0%F3%0D%D8%CE%81%14%E4'%26%A9%92.%8B%3C%ABER%2F%E5dE%B2%0C%F6%F0%1Fs%83%F2_%B0%A8%94%E9%9B%AD%E7%10%8Dm%9A%19N%D1%7C%8A%DE%1F9%7Dp%8C%E6%00%D5%C1%3F_%18%BDA%B8%9DpX6%E3%A35~B%CD%24%AE%11%26%BD%E7%EEti%98%EDe%9A%97Y)%12%25%1C%24%BCbT%AE3li%E6%0B%03%89%9A%E6%D3%ED%F4P%92%B0%9F4%BF43Y%F3%E3%EDP%95%04%EB1%C5%F5%F6KF%F4%BA%BD%D7%DB%91%93%07%E35%3E%A7)%D6%7F%40%FE%BD%F7%F5r%8A%E5y%92%F0%EB%B4%1E%8D%D5%F4%5B%92%3AV%DB%DB%E4%CD%A6%23%C3%C4wQ%3F%03HB%82%8E%1Cd(%E0%91B%0Ca%9Ac%C4%AA%F8L%16%19%22J%A4%D2itTy%B28%D6%3B(%93%96%ED%1CGx%C9_%0E%B8%5E%16%F5%5B%B2%B8%F6%E0%FB%9E%DD%25%D7%8E%BC%15%85%C5%B7%A3%D8Q%ED%B5%81%E9%BA%B2%13%9A%1B%7Fua%A5%A3n%E17%B9%E5%9B%1Bm%AB%0B%08Q%FE%8A%E5%B1H%5Ee%CAO%82Q%D7u6%E6%90S%97%FCu%0B%CF2%94%EE%25v%12X%0C%BA%AC%F0%5E%F8*l%0AO%85%17%C2%97%BF%D4%C8%CE%DE%AD%11%CB%80q%2C%3E%AB%9ES%CD%C6%EC%25%D2L%D2%EBd%B8%BF%8A%F5B%C6%18%F9%901CZ%9D%BE%24M%9C%8A9%F2%DAP%0B'%06w%82%EB%E6%E2%5C%2F%D7%07%9E%BB%CC%5D%E1%FA%B9%08%AD.r%23%8E%C2%17%F5E%7C!%F0%BE3%BE%3E_%B7o%88a%A7%DB%BE%D3d%EB%A31Z%EB%BB%D3%91%BA%A2%B1z%94%8F%DB'%F6%3D%8E%AA%13%19%B2%B1%BE%B1~V%08%2B%B4%A2cjJ%B3tO%00%03%25mN%97%F3%05%93%EF%11%84%0B%7C%88%AE-%89%8F%ABbW%90O%2B%0Ao%99%0C%5E%97%0CI%AFH%D9.%B0%3B%8F%ED%03%B6S%D6%5D%E6i_s9%F3*p%E9%1B%FD%C3%EB.7U%06%5E%19%C0%D1s.%17%A03u%E4%09%B0%7C%5E%2C%EB%15%DB%1F%3C%9E%B7%80%91%3B%DBc%AD%3Dma%BA%8B%3EV%AB%DBt.%5B%1E%01%BB%0F%AB%D5%9F%CF%AA%D5%DD%E7%E4%7F%0Bx%A3%FC%06%A9%23%0A%D6%C2%A1_2%00%00%00%09pHYs%00%00%0B%13%00%00%0B%13%01%00%9A%9C%18%00%00%00%B5IDAT(%15%A5%91%3D%0E%02!%10%85ac%E1%05%D6%CE%D6%C6%CE%D2%E8%ED%CD%DE%C0%C6%D6N.%E0V%F8%3D%9Ca%891XH%C2%BE%D9y%3F%90!%E6%9C%C3%BFk%E5%011%C6-%F5%C8N%04%DF%BD%FF%89%DFt%83DN%60%3E%F3%AB%A0%DE%1A%5Dg%BE%10Q%97%1B%40%9C%A8o%10%8F%5E%828%B4%1B%60%87%F6%02%26%85%1Ch%1E%C1%2B%5Bk%FF%86%EE%B7j%09%9A%DA%9B%ACe%A3%F9%EC%DA!9%B4%D5%A6%81%86%86%98%CC%3C%5B%40%FA%81%B3%E9%CB%23%94%C16Azo%05%D4%E1%C1%95a%3B%8A'%A0%E8%CC%17%22%85%1D%BA%00%A2%FA%DC%0A%94%D1%D1%8D%8B%3A%84%17B%C7%60%1A%25Z%FC%8D%00%00%00%00IEND%AEB%60%82\"),\n        url(\"data:image/png,%89PNG%0D%0A%1A%0A%00%00%00%0DIHDR%00%00%00%05%00%00%007%08%06%00%00%00%C4%DD%80C%00%00%03%1EiCCPICC%20Profile%00%00x%01%85T%DFk%D3P%14%FE%DAe%9D%B0%E1%8B%3Ag%11%09%3Eh%91ndStC%9C%B6kW%BA%CDZ%EA6%B7!H%9B%A6m%5C%9A%C6%24%ED~%B0%07%D9%8Bo%3A%C5w%F1%07%3E%F9%07%0C%D9%83o%7B%92%0D%C6%14a%F8%AC%88%22L%F6%22%B3%9E%9B4M'S%03%B9%F7%BB%DF%F9%EE9'%E7%E4%5E%A0%F9qZ%D3%14%2F%0F%14USO%C5%C2%FC%C4%E4%14%DF%F2%01%5E%1CC%2B%FChM%8B%86%16J%26G%40%0F%D3%B2y%EF%B3%F3%0E%1E%C6lt%EEo%DF%AB%FEc%D5%9A%95%0C%11%F0%1C%20%BE%945%C4%22%E1Y%A0i%5C%D4t%13%E0%D6%89%EF%9D15%C2%CDLsX%A7%04%09%1Fg8oc%81%E1%8C%8D%23%96f45%40%9A%09%C2%07%C5B%3AK%B8%408%98i%E0%F3%0D%D8%CE%81%14%E4'%26%A9%92.%8B%3C%ABER%2F%E5dE%B2%0C%F6%F0%1Fs%83%F2_%B0%A8%94%E9%9B%AD%E7%10%8Dm%9A%19N%D1%7C%8A%DE%1F9%7Dp%8C%E6%00%D5%C1%3F_%18%BDA%B8%9DpX6%E3%A35~B%CD%24%AE%11%26%BD%E7%EEti%98%EDe%9A%97Y)%12%25%1C%24%BCbT%AE3li%E6%0B%03%89%9A%E6%D3%ED%F4P%92%B0%9F4%BF43Y%F3%E3%EDP%95%04%EB1%C5%F5%F6KF%F4%BA%BD%D7%DB%91%93%07%E35%3E%A7)%D6%7F%40%FE%BD%F7%F5r%8A%E5y%92%F0%EB%B4%1E%8D%D5%F4%5B%92%3AV%DB%DB%E4%CD%A6%23%C3%C4wQ%3F%03HB%82%8E%1Cd(%E0%91B%0Ca%9Ac%C4%AA%F8L%16%19%22J%A4%D2itTy%B28%D6%3B(%93%96%ED%1CGx%C9_%0E%B8%5E%16%F5%5B%B2%B8%F6%E0%FB%9E%DD%25%D7%8E%BC%15%85%C5%B7%A3%D8Q%ED%B5%81%E9%BA%B2%13%9A%1B%7Fua%A5%A3n%E17%B9%E5%9B%1Bm%AB%0B%08Q%FE%8A%E5%B1H%5Ee%CAO%82Q%D7u6%E6%90S%97%FCu%0B%CF2%94%EE%25v%12X%0C%BA%AC%F0%5E%F8*l%0AO%85%17%C2%97%BF%D4%C8%CE%DE%AD%11%CB%80q%2C%3E%AB%9ES%CD%C6%EC%25%D2L%D2%EBd%B8%BF%8A%F5B%C6%18%F9%901CZ%9D%BE%24M%9C%8A9%F2%DAP%0B'%06w%82%EB%E6%E2%5C%2F%D7%07%9E%BB%CC%5D%E1%FA%B9%08%AD.r%23%8E%C2%17%F5E%7C!%F0%BE3%BE%3E_%B7o%88a%A7%DB%BE%D3d%EB%A31Z%EB%BB%D3%91%BA%A2%B1z%94%8F%DB'%F6%3D%8E%AA%13%19%B2%B1%BE%B1~V%08%2B%B4%A2cjJ%B3tO%00%03%25mN%97%F3%05%93%EF%11%84%0B%7C%88%AE-%89%8F%ABbW%90O%2B%0Ao%99%0C%5E%97%0CI%AFH%D9.%B0%3B%8F%ED%03%B6S%D6%5D%E6i_s9%F3*p%E9%1B%FD%C3%EB.7U%06%5E%19%C0%D1s.%17%A03u%E4%09%B0%7C%5E%2C%EB%15%DB%1F%3C%9E%B7%80%91%3B%DBc%AD%3Dma%BA%8B%3EV%AB%DBt.%5B%1E%01%BB%0F%AB%D5%9F%CF%AA%D5%DD%E7%E4%7F%0Bx%A3%FC%06%A9%23%0A%D6%C2%A1_2%00%00%00%09pHYs%00%00%0B%13%00%00%0B%13%01%00%9A%9C%18%00%00%00%3AIDAT8%11c%FC%FF%FF%7F%18%03%1A%60%01%F2%3F%A0%891%80%04%FF%11-%F8%17%9BJ%E2%05%B1ZD%81v%26t%E7%80%F8%A3%82h%A12%1A%20%A3%01%02%0F%01%BA%25%06%00%19%C0%0D%AEF%D5%3ES%00%00%00%00IEND%AEB%60%82\");\n    background-repeat: no-repeat, repeat-x;\n    background-position: center center, top left;\n    color: transparent;\n\n    border: 1px solid black;\n    -moz-border-radius: 2px;\n    -webkit-border-radius: 2px;\n    border-radius: 2px;\n    \n    cursor: pointer;\n    pointer-events: auto;\n}\n\n.ace_dark .ace_fold {\n}\n\n.ace_fold:hover{\n    background-image: \n        url(\"data:image/png,%89PNG%0D%0A%1A%0A%00%00%00%0DIHDR%00%00%00%11%00%00%00%09%08%06%00%00%00%D4%E8%C7%0C%00%00%03%1EiCCPICC%20Profile%00%00x%01%85T%DFk%D3P%14%FE%DAe%9D%B0%E1%8B%3Ag%11%09%3Eh%91ndStC%9C%B6kW%BA%CDZ%EA6%B7!H%9B%A6m%5C%9A%C6%24%ED~%B0%07%D9%8Bo%3A%C5w%F1%07%3E%F9%07%0C%D9%83o%7B%92%0D%C6%14a%F8%AC%88%22L%F6%22%B3%9E%9B4M'S%03%B9%F7%BB%DF%F9%EE9'%E7%E4%5E%A0%F9qZ%D3%14%2F%0F%14USO%C5%C2%FC%C4%E4%14%DF%F2%01%5E%1CC%2B%FChM%8B%86%16J%26G%40%0F%D3%B2y%EF%B3%F3%0E%1E%C6lt%EEo%DF%AB%FEc%D5%9A%95%0C%11%F0%1C%20%BE%945%C4%22%E1Y%A0i%5C%D4t%13%E0%D6%89%EF%9D15%C2%CDLsX%A7%04%09%1Fg8oc%81%E1%8C%8D%23%96f45%40%9A%09%C2%07%C5B%3AK%B8%408%98i%E0%F3%0D%D8%CE%81%14%E4'%26%A9%92.%8B%3C%ABER%2F%E5dE%B2%0C%F6%F0%1Fs%83%F2_%B0%A8%94%E9%9B%AD%E7%10%8Dm%9A%19N%D1%7C%8A%DE%1F9%7Dp%8C%E6%00%D5%C1%3F_%18%BDA%B8%9DpX6%E3%A35~B%CD%24%AE%11%26%BD%E7%EEti%98%EDe%9A%97Y)%12%25%1C%24%BCbT%AE3li%E6%0B%03%89%9A%E6%D3%ED%F4P%92%B0%9F4%BF43Y%F3%E3%EDP%95%04%EB1%C5%F5%F6KF%F4%BA%BD%D7%DB%91%93%07%E35%3E%A7)%D6%7F%40%FE%BD%F7%F5r%8A%E5y%92%F0%EB%B4%1E%8D%D5%F4%5B%92%3AV%DB%DB%E4%CD%A6%23%C3%C4wQ%3F%03HB%82%8E%1Cd(%E0%91B%0Ca%9Ac%C4%AA%F8L%16%19%22J%A4%D2itTy%B28%D6%3B(%93%96%ED%1CGx%C9_%0E%B8%5E%16%F5%5B%B2%B8%F6%E0%FB%9E%DD%25%D7%8E%BC%15%85%C5%B7%A3%D8Q%ED%B5%81%E9%BA%B2%13%9A%1B%7Fua%A5%A3n%E17%B9%E5%9B%1Bm%AB%0B%08Q%FE%8A%E5%B1H%5Ee%CAO%82Q%D7u6%E6%90S%97%FCu%0B%CF2%94%EE%25v%12X%0C%BA%AC%F0%5E%F8*l%0AO%85%17%C2%97%BF%D4%C8%CE%DE%AD%11%CB%80q%2C%3E%AB%9ES%CD%C6%EC%25%D2L%D2%EBd%B8%BF%8A%F5B%C6%18%F9%901CZ%9D%BE%24M%9C%8A9%F2%DAP%0B'%06w%82%EB%E6%E2%5C%2F%D7%07%9E%BB%CC%5D%E1%FA%B9%08%AD.r%23%8E%C2%17%F5E%7C!%F0%BE3%BE%3E_%B7o%88a%A7%DB%BE%D3d%EB%A31Z%EB%BB%D3%91%BA%A2%B1z%94%8F%DB'%F6%3D%8E%AA%13%19%B2%B1%BE%B1~V%08%2B%B4%A2cjJ%B3tO%00%03%25mN%97%F3%05%93%EF%11%84%0B%7C%88%AE-%89%8F%ABbW%90O%2B%0Ao%99%0C%5E%97%0CI%AFH%D9.%B0%3B%8F%ED%03%B6S%D6%5D%E6i_s9%F3*p%E9%1B%FD%C3%EB.7U%06%5E%19%C0%D1s.%17%A03u%E4%09%B0%7C%5E%2C%EB%15%DB%1F%3C%9E%B7%80%91%3B%DBc%AD%3Dma%BA%8B%3EV%AB%DBt.%5B%1E%01%BB%0F%AB%D5%9F%CF%AA%D5%DD%E7%E4%7F%0Bx%A3%FC%06%A9%23%0A%D6%C2%A1_2%00%00%00%09pHYs%00%00%0B%13%00%00%0B%13%01%00%9A%9C%18%00%00%00%B5IDAT(%15%A5%91%3D%0E%02!%10%85ac%E1%05%D6%CE%D6%C6%CE%D2%E8%ED%CD%DE%C0%C6%D6N.%E0V%F8%3D%9Ca%891XH%C2%BE%D9y%3F%90!%E6%9C%C3%BFk%E5%011%C6-%F5%C8N%04%DF%BD%FF%89%DFt%83DN%60%3E%F3%AB%A0%DE%1A%5Dg%BE%10Q%97%1B%40%9C%A8o%10%8F%5E%828%B4%1B%60%87%F6%02%26%85%1Ch%1E%C1%2B%5Bk%FF%86%EE%B7j%09%9A%DA%9B%ACe%A3%F9%EC%DA!9%B4%D5%A6%81%86%86%98%CC%3C%5B%40%FA%81%B3%E9%CB%23%94%C16Azo%05%D4%E1%C1%95a%3B%8A'%A0%E8%CC%17%22%85%1D%BA%00%A2%FA%DC%0A%94%D1%D1%8D%8B%3A%84%17B%C7%60%1A%25Z%FC%8D%00%00%00%00IEND%AEB%60%82\"),\n        url(\"data:image/png,%89PNG%0D%0A%1A%0A%00%00%00%0DIHDR%00%00%00%05%00%00%007%08%06%00%00%00%C4%DD%80C%00%00%03%1EiCCPICC%20Profile%00%00x%01%85T%DFk%D3P%14%FE%DAe%9D%B0%E1%8B%3Ag%11%09%3Eh%91ndStC%9C%B6kW%BA%CDZ%EA6%B7!H%9B%A6m%5C%9A%C6%24%ED~%B0%07%D9%8Bo%3A%C5w%F1%07%3E%F9%07%0C%D9%83o%7B%92%0D%C6%14a%F8%AC%88%22L%F6%22%B3%9E%9B4M'S%03%B9%F7%BB%DF%F9%EE9'%E7%E4%5E%A0%F9qZ%D3%14%2F%0F%14USO%C5%C2%FC%C4%E4%14%DF%F2%01%5E%1CC%2B%FChM%8B%86%16J%26G%40%0F%D3%B2y%EF%B3%F3%0E%1E%C6lt%EEo%DF%AB%FEc%D5%9A%95%0C%11%F0%1C%20%BE%945%C4%22%E1Y%A0i%5C%D4t%13%E0%D6%89%EF%9D15%C2%CDLsX%A7%04%09%1Fg8oc%81%E1%8C%8D%23%96f45%40%9A%09%C2%07%C5B%3AK%B8%408%98i%E0%F3%0D%D8%CE%81%14%E4'%26%A9%92.%8B%3C%ABER%2F%E5dE%B2%0C%F6%F0%1Fs%83%F2_%B0%A8%94%E9%9B%AD%E7%10%8Dm%9A%19N%D1%7C%8A%DE%1F9%7Dp%8C%E6%00%D5%C1%3F_%18%BDA%B8%9DpX6%E3%A35~B%CD%24%AE%11%26%BD%E7%EEti%98%EDe%9A%97Y)%12%25%1C%24%BCbT%AE3li%E6%0B%03%89%9A%E6%D3%ED%F4P%92%B0%9F4%BF43Y%F3%E3%EDP%95%04%EB1%C5%F5%F6KF%F4%BA%BD%D7%DB%91%93%07%E35%3E%A7)%D6%7F%40%FE%BD%F7%F5r%8A%E5y%92%F0%EB%B4%1E%8D%D5%F4%5B%92%3AV%DB%DB%E4%CD%A6%23%C3%C4wQ%3F%03HB%82%8E%1Cd(%E0%91B%0Ca%9Ac%C4%AA%F8L%16%19%22J%A4%D2itTy%B28%D6%3B(%93%96%ED%1CGx%C9_%0E%B8%5E%16%F5%5B%B2%B8%F6%E0%FB%9E%DD%25%D7%8E%BC%15%85%C5%B7%A3%D8Q%ED%B5%81%E9%BA%B2%13%9A%1B%7Fua%A5%A3n%E17%B9%E5%9B%1Bm%AB%0B%08Q%FE%8A%E5%B1H%5Ee%CAO%82Q%D7u6%E6%90S%97%FCu%0B%CF2%94%EE%25v%12X%0C%BA%AC%F0%5E%F8*l%0AO%85%17%C2%97%BF%D4%C8%CE%DE%AD%11%CB%80q%2C%3E%AB%9ES%CD%C6%EC%25%D2L%D2%EBd%B8%BF%8A%F5B%C6%18%F9%901CZ%9D%BE%24M%9C%8A9%F2%DAP%0B'%06w%82%EB%E6%E2%5C%2F%D7%07%9E%BB%CC%5D%E1%FA%B9%08%AD.r%23%8E%C2%17%F5E%7C!%F0%BE3%BE%3E_%B7o%88a%A7%DB%BE%D3d%EB%A31Z%EB%BB%D3%91%BA%A2%B1z%94%8F%DB'%F6%3D%8E%AA%13%19%B2%B1%BE%B1~V%08%2B%B4%A2cjJ%B3tO%00%03%25mN%97%F3%05%93%EF%11%84%0B%7C%88%AE-%89%8F%ABbW%90O%2B%0Ao%99%0C%5E%97%0CI%AFH%D9.%B0%3B%8F%ED%03%B6S%D6%5D%E6i_s9%F3*p%E9%1B%FD%C3%EB.7U%06%5E%19%C0%D1s.%17%A03u%E4%09%B0%7C%5E%2C%EB%15%DB%1F%3C%9E%B7%80%91%3B%DBc%AD%3Dma%BA%8B%3EV%AB%DBt.%5B%1E%01%BB%0F%AB%D5%9F%CF%AA%D5%DD%E7%E4%7F%0Bx%A3%FC%06%A9%23%0A%D6%C2%A1_2%00%00%00%09pHYs%00%00%0B%13%00%00%0B%13%01%00%9A%9C%18%00%00%003IDAT8%11c%FC%FF%FF%7F%3E%03%1A%60%01%F2%3F%A3%891%80%04%FFQ%26%F8w%C0%B43%A1%DB%0C%E2%8F%0A%A2%85%CAh%80%8C%06%08%3C%04%E8%96%18%00%A3S%0D%CD%CF%D8%C1%9D%00%00%00%00IEND%AEB%60%82\");\n    background-repeat: no-repeat, repeat-x;\n    background-position: center center, top left;\n}\n\n.ace_dragging .ace_content {\n    cursor: move;\n}\n\n.ace_folding-enabled > .ace_gutter-cell {\n    padding-right: 13px;\n}\n\n.ace_fold-widget {\n    box-sizing: border-box;\n    -moz-box-sizing: border-box;\n    -webkit-box-sizing: border-box;\n\n    margin: 0 -12px 1px 1px;\n    display: inline-block;\n    height: 14px;\n    width: 11px;\n    vertical-align: text-bottom;\n    \n    background-image: url(\"data:image/png,%89PNG%0D%0A%1A%0A%00%00%00%0DIHDR%00%00%00%05%00%00%00%05%08%06%00%00%00%8Do%26%E5%00%00%004IDATx%DAe%8A%B1%0D%000%0C%C2%F2%2CK%96%BC%D0%8F9%81%88H%E9%D0%0E%96%C0%10%92%3E%02%80%5E%82%E4%A9*-%EEsw%C8%CC%11%EE%96w%D8%DC%E9*Eh%0C%151(%00%00%00%00IEND%AEB%60%82\");\n    background-repeat: no-repeat;\n    background-position: center 5px;\n\n    border-radius: 3px;\n}\n\n.ace_fold-widget.end {\n    background-image: url(\"data:image/png,%89PNG%0D%0A%1A%0A%00%00%00%0DIHDR%00%00%00%05%00%00%00%05%08%06%00%00%00%8Do%26%E5%00%00%004IDATx%DAm%C7%C1%09%000%08C%D1%8C%ECE%C8E(%8E%EC%02)%1EZJ%F1%C1'%04%07I%E1%E5%EE%CAL%F5%A2%99%99%22%E2%D6%1FU%B5%FE0%D9x%A7%26Wz5%0E%D5%00%00%00%00IEND%AEB%60%82\");\n}\n\n.ace_fold-widget.closed {\n    background-image: url(\"data:image/png,%89PNG%0D%0A%1A%0A%00%00%00%0DIHDR%00%00%00%03%00%00%00%06%08%06%00%00%00%06%E5%24%0C%00%00%009IDATx%DA5%CA%C1%09%000%08%03%C0%AC*(%3E%04%C1%0D%BA%B1%23%A4Uh%E0%20%81%C0%CC%F8%82%81%AA%A2%AArGfr%88%08%11%11%1C%DD%7D%E0%EE%5B%F6%F6%CB%B8%05Q%2F%E9tai%D9%00%00%00%00IEND%AEB%60%82\");\n}\n\n.ace_fold-widget:hover {\n    border: 1px solid rgba(0, 0, 0, 0.3);\n    background-color: rgba(255, 255, 255, 0.2);\n    -moz-box-shadow:inset 0 1px 1px rgba(255, 255, 255, 0.7);\n    -moz-box-shadow: 0 1px 1px rgba(255, 255, 255, 0.7);\n    -webkit-box-shadow:inset 0 1px 1px rgba(255, 255, 255, 0.7);\n    -webkit-box-shadow: 0 1px 1px rgba(255, 255, 255, 0.7);\n    box-shadow:inset 0 1px 1px rgba(255, 255, 255, 0.7);\n    box-shadow: 0 1px 1px rgba(255, 255, 255, 0.7);\n    background-position: center 4px;\n}\n\n.ace_fold-widget:active {\n    border: 1px solid rgba(0, 0, 0, 0.4);\n    background-color: rgba(0, 0, 0, 0.05);\n    -moz-box-shadow:inset 0 1px 1px rgba(255, 255, 255);\n    -moz-box-shadow: 0 1px 1px rgba(255, 255, 255, 0.8);\n    -webkit-box-shadow:inset 0 1px 1px rgba(255, 255, 255);\n    -webkit-box-shadow: 0 1px 1px rgba(255, 255, 255, 0.8);\n    box-shadow:inset 0 1px 1px rgba(255, 255, 255);\n    box-shadow: 0 1px 1px rgba(255, 255, 255, 0.8);\n}\n\n.ace_fold-widget.invalid {\n    background-color: #FFB4B4;\n    border-color: #DE5555;\n}\n"),define("ace/multi_select",["require","exports","module","ace/range_list","ace/range","ace/selection","ace/mouse/multi_select_handler","ace/commands/multi_select_commands","ace/search","ace/edit_session","ace/editor"],function(a,b,c){function j(a,b,c){return i.$options.wrap=!0,i.$options.needle=b,i.$options.backwards=c==-1,i.find(a)}function m(a,b){return a.row==b.row&&a.column==b.column}function n(a){a.$onAddRange=a.$onAddRange.bind(a),a.$onRemoveRange=a.$onRemoveRange.bind(a),a.$onMultiSelect=a.$onMultiSelect.bind(a),a.$onSingleSelect=a.$onSingleSelect.bind(a),b.onSessionChange.call(a,a),a.on("changeSession",b.onSessionChange.bind(a)),a.on("mousedown",g),a.commands.addCommands(b.commands.defaultCommands)}var d=a("./range_list").RangeList,e=a("./range").Range,f=a("./selection").Selection,g=a("./mouse/multi_select_handler").onMouseDown;b.commands=a("./commands/multi_select_commands");var h=a("./search").Search,i=new h,k=a("./edit_session").EditSession;(function(){this.getSelectionMarkers=function(){return this.$selectionMarkers}}).call(k.prototype),function(){this.ranges=null,this.rangeList=null,this.addRange=function(a){if(!this.inMultiSelectMode&&this.rangeCount==0){var b=this.toOrientedRange();if(!a||!a.isEqual(b))this.rangeList.add(b),this.$onAddRange(b)}if(!a)return;a.cursor||(a.cursor=a.end);var c=this.rangeList.add(a);this.$onAddRange(a),c.length&&this.$onRemoveRange(c),this.rangeCount>0&&!this.inMultiSelectMode&&(this._emit("multiSelect"),this.inMultiSelectMode=!0,this.session.$undoSelect=!1,this.rangeList.attach(this.session))},this.toSingleRange=function(a){a=a||this.ranges[0];var b=this.rangeList.removeAll();b.length&&this.$onRemoveRange(b),a&&this.fromOrientedRange(a)},this.substractPoint=function(a){var b=this.rangeList.substractPoint(a);if(b)return this.$onRemoveRange(b),b[0]},this.mergeOverlappingRanges=function(){var a=this.rangeList.merge();a.length?this.$onRemoveRange(a):this.ranges[0]&&this.fromOrientedRange(this.ranges[0])},this.$onAddRange=function(a){this.rangeCount=this.rangeList.ranges.length,this.ranges.unshift(a),this.fromOrientedRange(a),this._emit("addRange",{range:a})},this.$onRemoveRange=function(a){this.rangeCount=this.rangeList.ranges.length;if(this.rangeCount==1&&this.inMultiSelectMode){var b=this.rangeList.ranges.pop();a.push(b),this.rangeCount=0}for(var c=a.length;c--;){var d=this.ranges.indexOf(a[c]);this.ranges.splice(d,1)}this._emit("removeRange",{ranges:a}),this.rangeCount==0&&this.inMultiSelectMode&&(this.inMultiSelectMode=!1,this._emit("singleSelect"),this.session.$undoSelect=!0,this.rangeList.detach(this.session)),b=b||this.ranges[0],b&&!b.isEqual(this.getRange())&&this.fromOrientedRange(b)},this.$initRangeList=function(){if(this.rangeList)return;this.rangeList=new d,this.ranges=[],this.rangeCount=0},this.getAllRanges=function(){return this.rangeList.ranges.concat()},this.splitIntoLines=function(){if(this.rangeCount>1){var a=this.rangeList.ranges,b=a[a.length-1],c=e.fromPoints(a[0].start,b.end);this.toSingleRange(),this.setSelectionRange(c,b.cursor==b.start)}else{var d=this.session.documentToScreenPosition(this.selectionLead),f=this.session.documentToScreenPosition(this.selectionAnchor),g=this.rectangularRangeBlock(d,f);g.forEach(this.addRange,this)}},this.rectangularRangeBlock=function(a,b,c){var d=[],f=a.column<b.column;if(f)var g=a.column,h=b.column;else var g=b.column,h=a.column;var i=a.row<b.row;if(i)var j=a.row,k=b.row;else var j=b.row,k=a.row;g<0&&(g=0),j<0&&(j=0),j==k&&(c=!0);for(var l=j;l<=k;l++){var n=e.fromPoints(this.session.screenToDocumentPosition(l,g),this.session.screenToDocumentPosition(l,h));if(n.isEmpty()){if(o&&m(n.end,o))break;var o=n.end}n.cursor=f?n.start:n.end,d.push(n)}i&&d.reverse();if(!c){var p=d.length-1;while(d[p].isEmpty()&&p>0)p--;if(p>0){var q=0;while(d[q].isEmpty())q++}for(var r=p;r>=q;r--)d[r].isEmpty()&&d.splice(r,1)}return d}}.call(f.prototype);var l=a("./editor").Editor;(function(){this.updateSelectionMarkers=function(){this.renderer.updateCursor(),this.renderer.updateBackMarkers()},this.addSelectionMarker=function(a){a.cursor||(a.cursor=a.end);var b=this.getSelectionStyle();return a.marker=this.session.addMarker(a,"ace_selection",b),this.session.$selectionMarkers.push(a),this.session.selectionMarkerCount=this.session.$selectionMarkers.length,a},this.removeSelectionMarkers=function(a){for(var b=a.length;b--;){var c=a[b];if(!c.marker)continue;this.session.removeMarker(c.marker);var d=this.session.$selectionMarkers.indexOf(c);d!=-1&&this.session.$selectionMarkers.splice(d,1)}this.session.selectionMarkerCount=this.session.$selectionMarkers.length},this.$onAddRange=function(a){this.addSelectionMarker(a.range),this.renderer.updateCursor(),this.renderer.updateBackMarkers()},this.$onRemoveRange=function(a){this.removeSelectionMarkers(a.ranges),this.renderer.updateCursor(),this.renderer.updateBackMarkers()},this.$onMultiSelect=function(a){if(this.inMultiSelectMode)return;this.inMultiSelectMode=!0,this.setStyle("multiselect"),this.keyBinding.addKeyboardHandler(b.commands.keyboardHandler),this.commands.on("exec",this.$onMultiSelectExec),this.renderer.updateCursor(),this.renderer.updateBackMarkers()},this.$onSingleSelect=function(a){if(this.session.multiSelect.inVirtualMode)return;this.inMultiSelectMode=!1,this.unsetStyle("multiselect"),this.keyBinding.removeKeyboardHandler(b.commands.keyboardHandler),this.commands.removeEventListener("exec",this.$onMultiSelectExec),this.renderer.updateCursor(),this.renderer.updateBackMarkers()},this.$onMultiSelectExec=function(a){var b=a.command,c=a.editor;b.multiSelectAction?b.multiSelectAction=="forEach"?c.forEachSelection(b,a.args):b.multiSelectAction=="single"?(c.exitMultiSelectMode(),b.exec(c,a.args||{})):b.multiSelectAction(c,a.args||{}):(b.exec(c,a.args||{}),c.multiSelect.addRange(c.multiSelect.toOrientedRange()),c.multiSelect.mergeOverlappingRanges()),a.preventDefault()},this.forEachSelection=function(a,b){if(this.inVirtualSelectionMode)return;var c=this.session,d=this.selection,e=d.rangeList,g=d._eventRegistry;d._eventRegistry={};var h=new f(c);this.inVirtualSelectionMode=!0;for(var i=e.ranges.length;i--;)h.fromOrientedRange(e.ranges[i]),this.selection=c.selection=h,a.exec(this,b||{}),h.toOrientedRange(e.ranges[i]);h.detach(),this.selection=c.selection=d,this.inVirtualSelectionMode=!1,d._eventRegistry=g,d.mergeOverlappingRanges(),this.onCursorChange(),this.onSelectionChange()},this.exitMultiSelectMode=function(){if(this.inVirtualSelectionMode)return;this.multiSelect.toSingleRange()},this.getCopyText=function(){var a="";if(this.inMultiSelectMode){var b=this.multiSelect.rangeList.ranges;a=[];for(var c=0;c<b.length;c++)a.push(this.session.getTextRange(b[c]));a=a.join(this.session.getDocument().getNewLineCharacter())}else this.selection.isEmpty()||(a=this.session.getTextRange(this.getSelectionRange()));return a},this.selectMoreLines=function(a,b){var c=this.selection.toOrientedRange(),d=c.cursor==c.end,f=this.session.documentToScreenPosition(c.cursor);this.selection.$desiredColumn&&(f.column=this.selection.$desiredColumn);var g=this.session.screenToDocumentPosition(f.row+a,f.column);if(!c.isEmpty())var h=this.session.documentToScreenPosition(d?c.end:c.start),i=this.session.screenToDocumentPosition(h.row+a,h.column);else var i=g;if(d){var j=e.fromPoints(g,i);j.cursor=j.start}else{var j=e.fromPoints(i,g);j.cursor=j.end}j.desiredColumn=f.column;if(!this.selection.inMultiSelectMode)this.selection.addRange(c);else if(b)var k=c.cursor;this.selection.addRange(j),k&&this.selection.substractPoint(k)},this.transposeSelections=function(a){var b=this.session,c=b.multiSelect,d=c.ranges;for(var e=d.length;e--;){var f=d[e];if(f.isEmpty()){var g=b.getWordRange(f.start.row,f.start.column);f.start.row=g.start.row,f.start.column=g.start.column,f.end.row=g.end.row,f.end.column=g.end.column}}c.mergeOverlappingRanges();var h=[];for(var e=d.length;e--;){var f=d[e];h.unshift(b.getTextRange(f))}a<0?h.unshift(h.pop()):h.push(h.shift());for(var e=d.length;e--;){var f=d[e],g=f.clone();b.replace(f,h[e]),f.start.row=g.start.row,f.start.column=g.start.column}},this.selectMore=function(a,b){var c=this.session,d=c.multiSelect,e=d.toOrientedRange();if(e.isEmpty()){var e=c.getWordRange(e.start.row,e.start.column);e.cursor=e.end,this.multiSelect.addRange(e)}var f=c.getTextRange(e),g=j(c,f,a);g&&(g.cursor=a==-1?g.start:g.end,this.multiSelect.addRange(g)),b&&this.multiSelect.substractPoint(e.cursor)}}).call(l.prototype),b.onSessionChange=function(a){var b=a.session;b.multiSelect||(b.$selectionMarkers=[],b.selection.$initRangeList(),b.multiSelect=b.selection),this.multiSelect=b.multiSelect;var c=a.oldSession;c&&(c.multiSelect&&c.multiSelect.editor==this&&(c.multiSelect.editor=null),b.multiSelect.removeEventListener("addRange",this.$onAddRange),b.multiSelect.removeEventListener("removeRange",this.$onRemoveRange),b.multiSelect.removeEventListener("multiSelect",this.$onMultiSelect),b.multiSelect.removeEventListener("singleSelect",this.$onSingleSelect)),b.multiSelect.on("addRange",this.$onAddRange),b.multiSelect.on("removeRange",this.$onRemoveRange),b.multiSelect.on("multiSelect",this.$onMultiSelect),b.multiSelect.on("singleSelect",this.$onSingleSelect),this.inMultiSelectMode!=b.selection.inMultiSelectMode&&(b.selection.inMultiSelectMode?this.$onMultiSelect():this.$onSingleSelect())},b.MultiSelect=n}),define("ace/range_list",["require","exports","module"],function(a,b,c){"use strict";var d=function(){this.ranges=[]};(function(){this.comparePoints=function(a,b){return a.row-b.row||a.column-b.column},this.pointIndex=function(a,b){var c=this.ranges;for(var d=b||0;d<c.length;d++){var e=c[d],f=this.comparePoints(a,e.end);if(f>0)continue;return f==0?d:(f=this.comparePoints(a,e.start),f>=0?d:-d-1)}return-d-1},this.add=function(a){var b=this.pointIndex(a.start);b<0&&(b=-b-1);var c=this.pointIndex(a.end,b);return c<0?c=-c-1:c++,this.ranges.splice(b,c-b,a)},this.addList=function(a){var b=[];for(var c=a.length;c--;)b.push.call(b,this.add(a[c]));return b},this.substractPoint=function(a){var b=this.pointIndex(a);if(b>=0)return this.ranges.splice(b,1)},this.merge=function(){var a=[],b=this.ranges,c=b[0],d;for(var e=1;e<b.length;e++){d=c,c=b[e];var f=this.comparePoints(d.end,c.start);if(f<0)continue;if(f==0&&!d.isEmpty()&&!c.isEmpty())continue;this.comparePoints(d.end,c.end)<0&&(d.end.row=c.end.row,d.end.column=c.end.column),b.splice(e,1),a.push(c),c=d,e--}return a},this.contains=function(a,b){return this.pointIndex({row:a,column:b})>=0},this.containsPoint=function(a){return this.pointIndex(a)>=0},this.rangeAtPoint=function(a){var b=this.pointIndex(a);if(b>=0)return this.ranges[b]},this.clipRows=function(a,b){var c=this.ranges;if(c[0].start.row>b||c[c.length-1].start.row<a)return[];var d=this.pointIndex({row:a,column:0});d<0&&(d=-d-1);var e=this.pointIndex({row:b,column:0},d);e<0&&(e=-e-1);var f=[];for(var g=d;g<e;g++)f.push(c[g]);return f},this.removeAll=function(){return this.ranges.splice(0,this.ranges.length)},this.attach=function(a){this.session&&this.detach(),this.session=a,this.onChange=this.$onChange.bind(this),this.session.on("change",this.onChange)},this.detach=function(){if(!this.session)return;this.session.removeListener("change",this.onChange),this.session=null},this.$onChange=function(a){var b=a.data.range;if(a.data.action[0]=="i")var c=b.start,d=b.end;else var d=b.start,c=b.end;var e=c.row,f=d.row,g=f-e,h=-c.column+d.column,i=this.ranges;for(var j=0,k=i.length;j<k;j++){var l=i[j];if(l.end.row<e)continue;if(l.start.row>e)break;l.start.row==e&&l.start.column>=c.column&&(l.start.column+=h,l.start.row+=g),l.end.row==e&&l.end.column>=c.column&&(l.end.column+=h,l.end.row+=g)}if(g!=0&&j<k)for(;j<k;j++){var l=i[j];l.start.row+=g,l.end.row+=g}}}).call(d.prototype),b.RangeList=d}),define("ace/mouse/multi_select_handler",["require","exports","module","ace/lib/event"],function(a,b,c){function e(a,b){return a.row==b.row&&a.column==b.column}function f(a){var b=a.domEvent,c=b.altKey,f=b.shiftKey,g=a.getAccelKey(),h=a.getButton();if(!g&&!c){if(a.editor.inMultiSelectMode)if(h==0)a.editor.exitMultiSelectMode();else if(h==2){var i=a.editor,j=i.selection.isEmpty();i.textInput.onContextMenu({x:a.clientX,y:a.clientY},j),d.capture(i.container,function(){},i.textInput.onContextMenuClose),a.stop()}return}var i=a.editor,k=i.selection,l=i.inMultiSelectMode,m=a.getDocumentPosition(),n=k.getCursor(),o=a.inSelection()||k.isEmpty()&&e(m,n),p=a.pageX,q=a.pageY,r=function(a){p=d.getDocumentX(a),q=d.getDocumentY(a)},s=function(){var a=i.renderer.pixelToScreenCoordinates(p,q),b=t.screenToDocumentPosition(a.row,a.column);if(e(v,a)&&e(b,k.selectionLead))return;v=a,i.selection.moveCursorToPosition(b),i.selection.clearSelection(),i.renderer.scrollCursorIntoView(),i.removeSelectionMarkers(x),x=k.rectangularRangeBlock(v,u),x.forEach(i.addSelectionMarker,i),i.updateSelectionMarkers()},t=i.session,u=i.renderer.pixelToScreenCoordinates(p,q),v=u;if(g&&!f&&!c&&h==0){if(!l&&o)return;l||k.addRange(k.toOrientedRange());var w=k.rangeList.rangeAtPoint(m);d.capture(i.container,function(){},function(){var a=k.toOrientedRange();w&&a.isEmpty()&&e(w.cursor,a.cursor)?k.substractPoint(a.cursor):k.addRange(a)})}else if(!f&&c&&h==0){a.stop(),l&&!g?k.toSingleRange():!l&&g&&k.addRange(),k.moveCursorToPosition(m),k.clearSelection();var x=[],y=function(a){clearInterval(A),i.removeSelectionMarkers(x);for(var b=0;b<x.length;b++)k.addRange(x[b])},z=s;d.capture(i.container,r,y);var A=setInterval(function(){z()},20);return a.preventDefault()}}var d=a("../lib/event");b.onMouseDown=f}),define("ace/commands/multi_select_commands",["require","exports","module","ace/keyboard/hash_handler"],function(a,b,c){b.defaultCommands=[{name:"addCursorAbove",exec:function(a){a.selectMoreLines(-1)},bindKey:{win:"Ctrl-Alt-Up",mac:"Ctrl-Alt-Up"},readonly:!0},{name:"addCursorBelow",exec:function(a){a.selectMoreLines(1)},bindKey:{win:"Ctrl-Alt-Down",mac:"Ctrl-Alt-Down"},readonly:!0},{name:"addCursorAboveSkipCurrent",exec:function(a){a.selectMoreLines(-1,!0)},bindKey:{win:"Ctrl-Alt-Shift-Up",mac:"Ctrl-Alt-Shift-Up"},readonly:!0},{name:"addCursorBelowSkipCurrent",exec:function(a){a.selectMoreLines(1,!0)},bindKey:{win:"Ctrl-Alt-Shift-Down",mac:"Ctrl-Alt-Shift-Down"},readonly:!0},{name:"selectMoreBefore",exec:function(a){a.selectMore(-1)},bindKey:{win:"Ctrl-Alt-Left",mac:"Ctrl-Alt-Left"},readonly:!0},{name:"selectMoreAfter",exec:function(a){a.selectMore(1)},bindKey:{win:"Ctrl-Alt-Right",mac:"Ctrl-Alt-Right"},readonly:!0},{name:"selectNextBefore",exec:function(a){a.selectMore(-1,!0)},bindKey:{win:"Ctrl-Alt-Shift-Left",mac:"Ctrl-Alt-Shift-Left"},readonly:!0},{name:"selectNextAfter",exec:function(a){a.selectMore(1,!0)},bindKey:{win:"Ctrl-Alt-Shift-Right",mac:"Ctrl-Alt-Shift-Right"},readonly:!0},{name:"splitIntoLines",exec:function(a){a.multiSelect.splitIntoLines()},bindKey:{win:"Ctrl-Shift-L",mac:"Ctrl-Shift-L"},readonly:!0}],b.multiEditCommands=[{name:"singleSelection",bindKey:"esc",exec:function(a){a.exitMultiSelectMode()},readonly:!0}];var d=a("../keyboard/hash_handler").HashHandler;b.keyboardHandler=new d(b.multiEditCommands)}),define("ace/worker/worker_client",["require","exports","module","ace/lib/oop","ace/lib/event_emitter","ace/config"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/event_emitter").EventEmitter,f=a("../config"),g=function(b,c,d,e){this.changeListener=this.changeListener.bind(this);if(f.get("packaged"))this.$worker=new Worker(f.get("workerPath")+"/"+c);else{var g=this.$normalizePath(a.nameToUrl("ace/worker/worker",null,"_"));this.$worker=new Worker(g);var h={};for(var i=0;i<b.length;i++){var j=b[i],k=this.$normalizePath(a.nameToUrl(j,null,"_").replace(/.js$/,""));h[j]=k}}this.$worker.postMessage({init:!0,tlns:h,module:d,classname:e}),this.callbackId=1,this.callbacks={};var l=this;this.$worker.onerror=function(a){throw window.console&&console.log&&console.log(a),a},this.$worker.onmessage=function(a){var b=a.data;switch(b.type){case"log":window.console&&console.log&&console.log(b.data);break;case"event":l._emit(b.name,{data:b.data});break;case"call":var c=l.callbacks[b.id];c&&(c(b.data),delete l.callbacks[b.id])}}};(function(){d.implement(this,e),this.$normalizePath=function(a){return a=a.replace(/^[a-z]+:\/\/[^\/]+/,""),a=location.protocol+"//"+location.host+(a.charAt(0)=="/"?"":location.pathname.replace(/\/[^\/]*$/,""))+"/"+a.replace(/^[\/]+/,""),a},this.terminate=function(){this._emit("terminate",{}),this.$worker.terminate(),this.$worker=null,this.$doc.removeEventListener("change",this.changeListener),this.$doc=null},this.send=function(a,b){this.$worker.postMessage({command:a,args:b})},this.call=function(a,b,c){if(c){var d=this.callbackId++;this.callbacks[d]=c,b.push(d)}this.send(a,b)},this.emit=function(a,b){try{this.$worker.postMessage({event:a,data:{data:b.data}})}catch(c){}},this.attachToDocument=function(a){this.$doc&&this.terminate(),this.$doc=a,this.call("setValue",[a.getValue()]),a.on("change",this.changeListener)},this.changeListener=function(a){a.range={start:a.data.range.start,end:a.data.range.end},this.emit("change",a)}}).call(g.prototype),b.WorkerClient=g}),define("ace/keyboard/state_handler",["require","exports","module"],function(a,b,c){function e(a){this.keymapping=this.$buildKeymappingRegex(a)}"use strict";var d=!1;e.prototype={$buildKeymappingRegex:function(a){for(var b in a)this.$buildBindingsRegex(a[b]);return a},$buildBindingsRegex:function(a){a.forEach(function(a){a.key?a.key=new RegExp("^"+a.key+"$"):Array.isArray(a.regex)?("key"in a||(a.key=new RegExp("^"+a.regex[1]+"$")),a.regex=new RegExp(a.regex.join("")+"$")):a.regex&&(a.regex=new RegExp(a.regex+"$"))})},$composeBuffer:function(a,b,c,d){if(a.state==null||a.buffer==null)a.state="start",a.buffer="";var e=[];b&1&&e.push("ctrl"),b&8&&e.push("command"),b&2&&e.push("option"),b&4&&e.push("shift"),c&&e.push(c);var f=e.join("-"),g=a.buffer+f;b!=2&&(a.buffer=g);var h={bufferToUse:g,symbolicName:f};return d&&(h.keyIdentifier=d.keyIdentifier),h},$find:function(a,b,c,e,f,g){var h={};return this.keymapping[a.state].some(function(i){var j;if(i.key&&!i.key.test(c))return!1;if(i.regex&&!(j=i.regex.exec(b)))return!1;if(i.match&&!i.match(b,e,f,c,g))return!1;if(i.disallowMatches)for(var k=0;k<i.disallowMatches.length;k++)if(!!j[i.disallowMatches[k]])return!1;if(i.exec){h.command=i.exec;if(i.params){var l;h.args={},i.params.forEach(function(a){a.match!=null&&j!=null?l=j[a.match]||a.defaultValue:l=a.defaultValue,a.type==="number"&&(l=parseInt(l)),h.args[a.name]=l})}a.buffer=""}return i.then&&(a.state=i.then,a.buffer=""),h.command==null&&(h.command="null"),d&&console.log("KeyboardStateMapper#find",i),!0}),h.command?h:(a.buffer="",!1)},handleKeyboard:function(a,b,c,e,f){if(b==0||c!=""&&c!=String.fromCharCode(0)){var g=this.$composeBuffer(a,b,c,f),h=g.bufferToUse,i=g.symbolicName,j=g.keyIdentifier;return g=this.$find(a,h,i,b,c,j),d&&console.log("KeyboardStateMapper#match",h,i,g),g}return null}},b.matchCharacterOnly=function(a,b,c,d){return b==0?!0:b==4&&c.length==1?!0:!1},b.StateHandler=e}),define("ace/placeholder",["require","exports","module","ace/range","ace/lib/event_emitter","ace/lib/oop"],function(a,b,c){"use strict";var d=a("./range").Range,e=a("./lib/event_emitter").EventEmitter,f=a("./lib/oop"),g=function(a,b,c,d,e,f){var g=this;this.length=b,this.session=a,this.doc=a.getDocument(),this.mainClass=e,this.othersClass=f,this.$onUpdate=this.onUpdate.bind(this),this.doc.on("change",this.$onUpdate),this.$others=d,this.$onCursorChange=function(){setTimeout(function(){g.onCursorChange()})},this.$pos=c;var h=a.getUndoManager().$undoStack||a.getUndoManager().$undostack||{length:-1};this.$undoStackDepth=h.length,this.setup(),a.selection.on("changeCursor",this.$onCursorChange)};(function(){f.implement(this,e),this.setup=function(){var a=this,b=this.doc,c=this.session,e=this.$pos;this.pos=b.createAnchor(e.row,e.column),this.markerId=c.addMarker(new d(e.row,e.column,e.row,e.column+this.length),this.mainClass,null,!1),this.pos.on("change",function(b){c.removeMarker(a.markerId),a.markerId=c.addMarker(new d(b.value.row,b.value.column,b.value.row,b.value.column+a.length),a.mainClass,null,!1)}),this.others=[],this.$others.forEach(function(c){var d=b.createAnchor(c.row,c.column);a.others.push(d)}),c.setUndoSelect(!1)},this.showOtherMarkers=function(){if(this.othersActive)return;var a=this.session,b=this;this.othersActive=!0,this.others.forEach(function(c){c.markerId=a.addMarker(new d(c.row,c.column,c.row,c.column+b.length),b.othersClass,null,!1),c.on("change",function(e){a.removeMarker(c.markerId),c.markerId=a.addMarker(new d(e.value.row,e.value.column,e.value.row,e.value.column+b.length),b.othersClass,null,!1)})})},this.hideOtherMarkers=function(){if(!this.othersActive)return;this.othersActive=!1;for(var a=0;a<this.others.length;a++)this.session.removeMarker(this.others[a].markerId)},this.onUpdate=function(a){var b=a.data,c=b.range;if(c.start.row!==c.end.row)return;if(c.start.row!==this.pos.row)return;if(this.$updating)return;this.$updating=!0;var e=b.action==="insertText"?c.end.column-c.start.column:c.start.column-c.end.column;if(c.start.column>=this.pos.column&&c.start.column<=this.pos.column+this.length+1){var f=c.start.column-this.pos.column;this.length+=e;if(!this.session.$fromUndo){if(b.action==="insertText")for(var g=this.others.length-1;g>=0;g--){var h=this.others[g],i={row:h.row,column:h.column+f};h.row===c.start.row&&c.start.column<h.column&&(i.column+=e),this.doc.insert(i,b.text)}else if(b.action==="removeText")for(var g=this.others.length-1;g>=0;g--){var h=this.others[g],i={row:h.row,column:h.column+f};h.row===c.start.row&&c.start.column<h.column&&(i.column+=e),this.doc.remove(new d(i.row,i.column,i.row,i.column-e))}c.start.column===this.pos.column&&b.action==="insertText"?setTimeout(function(){this.pos.setPosition(this.pos.row,this.pos.column-e);for(var a=0;a<this.others.length;a++){var b=this.others[a],d={row:b.row,column:b.column-e};b.row===c.start.row&&c.start.column<b.column&&(d.column+=e),b.setPosition(d.row,d.column)}}.bind(this),0):c.start.column===this.pos.column&&b.action==="removeText"&&setTimeout(function(){for(var a=0;a<this.others.length;a++){var b=this.others[a];b.row===c.start.row&&c.start.column<b.column&&b.setPosition(b.row,b.column-e)}}.bind(this),0)}this.pos._emit("change",{value:this.pos});for(var g=0;g<this.others.length;g++)this.others[g]._emit("change",{value:this.others[g]})}this.$updating=!1},this.onCursorChange=function(a){if(this.$updating)return;var b=this.session.selection.getCursor();b.row===this.pos.row&&b.column>=this.pos.column&&b.column<=this.pos.column+this.length?(this.showOtherMarkers(),this._emit("cursorEnter",a)):(this.hideOtherMarkers(),this._emit("cursorLeave",a))},this.detach=function(){this.session.removeMarker(this.markerId),this.hideOtherMarkers(),this.doc.removeEventListener("change",this.$onUpdate),this.session.selection.removeEventListener("changeCursor",this.$onCursorChange),this.pos.detach();for(var a=0;a<this.others.length;a++)this.others[a].detach();this.session.setUndoSelect(!0)},this.cancel=function(){if(this.$undoStackDepth===-1)throw Error("Canceling placeholders only supported with undo manager attached to session.");var a=this.session.getUndoManager(),b=(a.$undoStack||a.$undostack).length-this.$undoStackDepth;for(var c=0;c<b;c++)a.undo(!0)}}).call(g.prototype),b.PlaceHolder=g}),define("ace/theme/textmate",["require","exports","module","ace/lib/dom"],function(a,b,c){"use strict",b.isDark=!1,b.cssClass="ace-tm",b.cssText=".ace-tm .ace_editor {  border: 2px solid rgb(159, 159, 159);}.ace-tm .ace_editor.ace_focus {  border: 2px solid #327fbd;}.ace-tm .ace_gutter {  background: #e8e8e8;  color: #333;}.ace-tm .ace_print_margin {  width: 1px;  background: #e8e8e8;}.ace-tm .ace_fold {    background-color: #6B72E6;}.ace-tm .ace_text-layer {  cursor: text;}.ace-tm .ace_cursor {  border-left: 1px solid black;}.ace-tm .ace_cursor.ace_overwrite {  border-left: 0px;  border-bottom: 1px solid black;}        .ace-tm .ace_line .ace_invisible {  color: rgb(191, 191, 191);}.ace-tm .ace_line .ace_storage,.ace-tm .ace_line .ace_keyword {  color: blue;}.ace-tm .ace_line .ace_constant {  color: rgb(197, 6, 11);}.ace-tm .ace_line .ace_constant.ace_buildin {  color: rgb(88, 72, 246);}.ace-tm .ace_line .ace_constant.ace_language {  color: rgb(88, 92, 246);}.ace-tm .ace_line .ace_constant.ace_library {  color: rgb(6, 150, 14);}.ace-tm .ace_line .ace_invalid {  background-color: rgb(153, 0, 0);  color: white;}.ace-tm .ace_line .ace_support.ace_function {  color: rgb(60, 76, 114);}.ace-tm .ace_line .ace_support.ace_constant {  color: rgb(6, 150, 14);}.ace-tm .ace_line .ace_support.ace_type,.ace-tm .ace_line .ace_support.ace_class {  color: rgb(109, 121, 222);}.ace-tm .ace_line .ace_keyword.ace_operator {  color: rgb(104, 118, 135);}.ace-tm .ace_line .ace_string {  color: rgb(3, 106, 7);}.ace-tm .ace_line .ace_comment {  color: rgb(76, 136, 107);}.ace-tm .ace_line .ace_comment.ace_doc {  color: rgb(0, 102, 255);}.ace-tm .ace_line .ace_comment.ace_doc.ace_tag {  color: rgb(128, 159, 191);}.ace-tm .ace_line .ace_constant.ace_numeric {  color: rgb(0, 0, 205);}.ace-tm .ace_line .ace_variable {  color: rgb(49, 132, 149);}.ace-tm .ace_line .ace_xml_pe {  color: rgb(104, 104, 91);}.ace-tm .ace_entity.ace_name.ace_function {  color: #0000A2;}.ace-tm .ace_markup.ace_markupine {    text-decoration:underline;}.ace-tm .ace_markup.ace_heading {  color: rgb(12, 7, 255);}.ace-tm .ace_markup.ace_list {  color:rgb(185, 6, 144);}.ace-tm .ace_marker-layer .ace_selection {  background: rgb(181, 213, 255);}.ace-tm .ace_marker-layer .ace_step {  background: rgb(252, 255, 0);}.ace-tm .ace_marker-layer .ace_stack {  background: rgb(164, 229, 101);}.ace-tm .ace_marker-layer .ace_bracket {  margin: -1px 0 0 -1px;  border: 1px solid rgb(192, 192, 192);}.ace-tm .ace_marker-layer .ace_active_line {  background: rgba(0, 0, 0, 0.07);}.ace-tm .ace_marker-layer .ace_selected_word {  background: rgb(250, 250, 255);  border: 1px solid rgb(200, 200, 250);}.ace-tm .ace_meta.ace_tag {  color:rgb(28, 2, 255);}.ace-tm .ace_string.ace_regex {  color: rgb(255, 0, 0)}";var d=a("../lib/dom");d.importCssString(b.cssText,b.cssClass)});
-            (function() {
-                window.require(["ace/ace"], function(a) {
-                    if (!window.ace)
-                        window.ace = {};
-                    for (var key in a) if (a.hasOwnProperty(key))
-                        ace[key] = a[key];
-                });
-            })();
diff --git a/apps/files_texteditor/js/aceeditor/keybinding-emacs-uncompressed.js b/apps/files_texteditor/js/aceeditor/keybinding-emacs-uncompressed.js
deleted file mode 100644
index 757c908c9f..0000000000
--- a/apps/files_texteditor/js/aceeditor/keybinding-emacs-uncompressed.js
+++ /dev/null
@@ -1,150 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Skywriter.
- *
- * The Initial Developer of the Original Code is
- * Mozilla.
- * Portions created by the Initial Developer are Copyright (C) 2009
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Julian Viereck (julian.viereck@gmail.com)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/keyboard/keybinding/emacs', ['require', 'exports', 'module' , 'ace/keyboard/state_handler'], function(require, exports, module) {
-"use strict";
-
-var StateHandler = require("../state_handler").StateHandler;
-var matchCharacterOnly =  require("../state_handler").matchCharacterOnly;
-
-var emacsState = {
-    start: [
-        {
-            key:    "ctrl-x",
-            then:   "c-x"
-        },
-        {
-            regex:  [ "(?:command-([0-9]*))*", "(down|ctrl-n)" ],
-            exec:   "golinedown",
-            params: [
-                {
-                    name: "times",
-                    match: 1,
-                    type: "number",
-                    defaultValue: 1
-                }
-            ]
-        },
-        {
-            regex: [ "(?:command-([0-9]*))*", "(right|ctrl-f)" ],
-            exec: "gotoright",
-            params: [
-                {
-                    name: "times",
-                    match: 1,
-                    type: "number",
-                    defaultValue: 1
-                }
-            ]
-        },
-        {
-            regex: [ "(?:command-([0-9]*))*", "(up|ctrl-p)" ],
-            exec: "golineup",
-            params: [
-                {
-                    name: "times",
-                    match: 1,
-                    type: "number",
-                    defaultValue: 1
-                }
-            ]
-        },
-        {
-            regex: [ "(?:command-([0-9]*))*", "(left|ctrl-b)" ],
-            exec: "gotoleft",
-            params: [
-                {
-                    name: "times",
-                    match: 1,
-                    type: "number",
-                    defaultValue: 1
-                }
-            ]
-        },
-        {
-            comment: "This binding matches all printable characters except numbers as long as they are no numbers and print them n times.",
-            regex:  [ "(?:command-([0-9]*))", "([^0-9]+)*" ],
-            match:  matchCharacterOnly,
-            exec:   "inserttext",
-            params: [
-                {
-                    name: "times",
-                    match: 1,
-                    type: "number",
-                    defaultValue: "1"
-                },
-                {
-                    name: "text",
-                    match: 2
-                }
-            ]
-        },
-        {
-            comment: "This binding matches numbers as long as there is no meta_number in the buffer.",
-            regex:  [ "(command-[0-9]*)*", "([0-9]+)" ],
-            match:  matchCharacterOnly,
-            disallowMatches:  [ 1 ],
-            exec:   "inserttext",
-            params: [
-                {
-                    name: "text",
-                    match: 2,
-                    type: "text"
-                }
-            ]
-        },
-        {
-            regex: [ "command-([0-9]*)", "(command-[0-9]|[0-9])" ],
-            comment: "Stops execution if the regex /meta_[0-9]+/ matches to avoid resetting the buffer."
-        }
-    ],
-    "c-x": [
-        {
-            key: "ctrl-g",
-            then: "start"
-        },
-        {
-            key: "ctrl-s",
-            exec: "save",
-            then: "start"
-        }
-    ]
-};
-
-exports.Emacs = new StateHandler(emacsState);
-
-});
diff --git a/apps/files_texteditor/js/aceeditor/keybinding-emacs.js b/apps/files_texteditor/js/aceeditor/keybinding-emacs.js
deleted file mode 100644
index f2eb354a9d..0000000000
--- a/apps/files_texteditor/js/aceeditor/keybinding-emacs.js
+++ /dev/null
@@ -1 +0,0 @@
-define("ace/keyboard/keybinding/emacs",["require","exports","module","ace/keyboard/state_handler"],function(a,b,c){"use strict";var d=a("../state_handler").StateHandler,e=a("../state_handler").matchCharacterOnly,f={start:[{key:"ctrl-x",then:"c-x"},{regex:["(?:command-([0-9]*))*","(down|ctrl-n)"],exec:"golinedown",params:[{name:"times",match:1,type:"number",defaultValue:1}]},{regex:["(?:command-([0-9]*))*","(right|ctrl-f)"],exec:"gotoright",params:[{name:"times",match:1,type:"number",defaultValue:1}]},{regex:["(?:command-([0-9]*))*","(up|ctrl-p)"],exec:"golineup",params:[{name:"times",match:1,type:"number",defaultValue:1}]},{regex:["(?:command-([0-9]*))*","(left|ctrl-b)"],exec:"gotoleft",params:[{name:"times",match:1,type:"number",defaultValue:1}]},{comment:"This binding matches all printable characters except numbers as long as they are no numbers and print them n times.",regex:["(?:command-([0-9]*))","([^0-9]+)*"],match:e,exec:"inserttext",params:[{name:"times",match:1,type:"number",defaultValue:"1"},{name:"text",match:2}]},{comment:"This binding matches numbers as long as there is no meta_number in the buffer.",regex:["(command-[0-9]*)*","([0-9]+)"],match:e,disallowMatches:[1],exec:"inserttext",params:[{name:"text",match:2,type:"text"}]},{regex:["command-([0-9]*)","(command-[0-9]|[0-9])"],comment:"Stops execution if the regex /meta_[0-9]+/ matches to avoid resetting the buffer."}],"c-x":[{key:"ctrl-g",then:"start"},{key:"ctrl-s",exec:"save",then:"start"}]};b.Emacs=new d(f)})
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/keybinding-vim-uncompressed.js b/apps/files_texteditor/js/aceeditor/keybinding-vim-uncompressed.js
deleted file mode 100644
index 3643eb3fd6..0000000000
--- a/apps/files_texteditor/js/aceeditor/keybinding-vim-uncompressed.js
+++ /dev/null
@@ -1,138 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Skywriter.
- *
- * The Initial Developer of the Original Code is
- * Mozilla.
- * Portions created by the Initial Developer are Copyright (C) 2009
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Julian Viereck (julian.viereck@gmail.com)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/keyboard/keybinding/vim', ['require', 'exports', 'module' , 'ace/keyboard/state_handler'], function(require, exports, module) {
-"use strict";
-
-var StateHandler = require("../state_handler").StateHandler;
-var matchCharacterOnly =  require("../state_handler").matchCharacterOnly;
-
-var vimcommand = function(key, exec, then) {
-    return {
-        regex:  [ "([0-9]*)", key ],
-        exec:   exec,
-        params: [
-            {
-                name:     "times",
-                match:    1,
-                type:     "number",
-                defaultValue:     1
-            }
-        ],
-        then:   then
-    }
-}
-
-var vimStates = {
-    start: [
-        {
-            key:    "i",
-            then:   "insertMode"
-        },
-        {
-            key:    "d",
-            then:   "deleteMode"
-        },
-        {
-            key:    "a",
-            exec:   "gotoright",
-            then:   "insertMode"
-        },
-        {
-            key:    "shift-i",
-            exec:   "gotolinestart",
-            then:   "insertMode"
-        },
-        {
-            key:    "shift-a",
-            exec:   "gotolineend",
-            then:   "insertMode"
-        },
-        {
-            key:    "shift-c",
-            exec:   "removetolineend",
-            then:   "insertMode"
-        },
-        {
-            key:    "shift-r",
-            exec:   "overwrite",
-            then:   "replaceMode"
-        },
-        vimcommand("(k|up)", "golineup"),
-        vimcommand("(j|down)", "golinedown"),
-        vimcommand("(l|right)", "gotoright"),
-        vimcommand("(h|left)", "gotoleft"),
-        {
-            key:    "shift-g",
-            exec:   "gotoend"
-        },
-        vimcommand("b", "gotowordleft"),
-        vimcommand("e", "gotowordright"),
-        vimcommand("x", "del"),
-        vimcommand("shift-x", "backspace"),
-        vimcommand("shift-d", "removetolineend"),
-        vimcommand("u", "undo"), // [count] on this may/may not work, depending on browser implementation...
-        {
-            comment:    "Catch some keyboard input to stop it here",
-            match:      matchCharacterOnly
-        }
-    ],
-    insertMode: [
-        {
-            key:      "esc",
-            then:     "start"
-        }
-    ],
-    replaceMode: [
-        {
-            key:      "esc",
-            exec:     "overwrite",
-            then:     "start"
-        }
-    ],
-    deleteMode: [
-        {
-            key:      "d",
-            exec:     "removeline",
-            then:     "start"
-        }
-    ]
-};
-
-exports.Vim = new StateHandler(vimStates);
-
-});
diff --git a/apps/files_texteditor/js/aceeditor/keybinding-vim.js b/apps/files_texteditor/js/aceeditor/keybinding-vim.js
deleted file mode 100644
index 124607d8e6..0000000000
--- a/apps/files_texteditor/js/aceeditor/keybinding-vim.js
+++ /dev/null
@@ -1 +0,0 @@
-define("ace/keyboard/keybinding/vim",["require","exports","module","ace/keyboard/state_handler"],function(a,b,c){"use strict";var d=a("../state_handler").StateHandler,e=a("../state_handler").matchCharacterOnly,f=function(a,b,c){return{regex:["([0-9]*)",a],exec:b,params:[{name:"times",match:1,type:"number",defaultValue:1}],then:c}},g={start:[{key:"i",then:"insertMode"},{key:"d",then:"deleteMode"},{key:"a",exec:"gotoright",then:"insertMode"},{key:"shift-i",exec:"gotolinestart",then:"insertMode"},{key:"shift-a",exec:"gotolineend",then:"insertMode"},{key:"shift-c",exec:"removetolineend",then:"insertMode"},{key:"shift-r",exec:"overwrite",then:"replaceMode"},f("(k|up)","golineup"),f("(j|down)","golinedown"),f("(l|right)","gotoright"),f("(h|left)","gotoleft"),{key:"shift-g",exec:"gotoend"},f("b","gotowordleft"),f("e","gotowordright"),f("x","del"),f("shift-x","backspace"),f("shift-d","removetolineend"),f("u","undo"),{comment:"Catch some keyboard input to stop it here",match:e}],insertMode:[{key:"esc",then:"start"}],replaceMode:[{key:"esc",exec:"overwrite",then:"start"}],deleteMode:[{key:"d",exec:"removeline",then:"start"}]};b.Vim=new d(g)})
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-c_cpp-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-c_cpp-uncompressed.js
deleted file mode 100644
index abd3190bfb..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-c_cpp-uncompressed.js
+++ /dev/null
@@ -1,920 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Gastón Kleiman <gaston.kleiman AT gmail DOT com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/c_cpp', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/c_cpp_highlight_rules', 'ace/mode/matching_brace_outdent', 'ace/range', 'ace/mode/behaviour/cstyle', 'ace/mode/folding/cstyle'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
-var c_cppHighlightRules = require("./c_cpp_highlight_rules").c_cppHighlightRules;
-var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
-var Range = require("../range").Range;
-var CstyleBehaviour = require("./behaviour/cstyle").CstyleBehaviour;
-var CStyleFoldMode = require("./folding/cstyle").FoldMode;
-
-var Mode = function() {
-    this.$tokenizer = new Tokenizer(new c_cppHighlightRules().getRules());
-    this.$outdent = new MatchingBraceOutdent();
-    this.$behaviour = new CstyleBehaviour();
-    this.foldingRules = new CStyleFoldMode();
-};
-oop.inherits(Mode, TextMode);
-
-(function() {
-
-    this.toggleCommentLines = function(state, doc, startRow, endRow) {
-        var outdent = true;
-        var re = /^(\s*)\/\//;
-
-        for (var i=startRow; i<= endRow; i++) {
-            if (!re.test(doc.getLine(i))) {
-                outdent = false;
-                break;
-            }
-        }
-
-        if (outdent) {
-            var deleteRange = new Range(0, 0, 0, 0);
-            for (var i=startRow; i<= endRow; i++)
-            {
-                var line = doc.getLine(i);
-                var m = line.match(re);
-                deleteRange.start.row = i;
-                deleteRange.end.row = i;
-                deleteRange.end.column = m[0].length;
-                doc.replace(deleteRange, m[1]);
-            }
-        }
-        else {
-            doc.indentRows(startRow, endRow, "//");
-        }
-    };
-
-    this.getNextLineIndent = function(state, line, tab) {
-        var indent = this.$getIndent(line);
-
-        var tokenizedLine = this.$tokenizer.getLineTokens(line, state);
-        var tokens = tokenizedLine.tokens;
-        var endState = tokenizedLine.state;
-
-        if (tokens.length && tokens[tokens.length-1].type == "comment") {
-            return indent;
-        }
-
-        if (state == "start") {
-            var match = line.match(/^.*[\{\(\[]\s*$/);
-            if (match) {
-                indent += tab;
-            }
-        } else if (state == "doc-start") {
-            if (endState == "start") {
-                return "";
-            }
-            var match = line.match(/^\s*(\/?)\*/);
-            if (match) {
-                if (match[1]) {
-                    indent += " ";
-                }
-                indent += "* ";
-            }
-        }
-
-        return indent;
-    };
-
-    this.checkOutdent = function(state, line, input) {
-        return this.$outdent.checkOutdent(line, input);
-    };
-
-    this.autoOutdent = function(state, doc, row) {
-        this.$outdent.autoOutdent(doc, row);
-    };
-
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Gastón Kleiman <gaston.kleiman AT gmail DOT com>
- *
- * Based on Bespin's C/C++ Syntax Plugin by Marc McIntyre.
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/c_cpp_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/mode/doc_comment_highlight_rules', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var lang = require("../lib/lang");
-var DocCommentHighlightRules = require("./doc_comment_highlight_rules").DocCommentHighlightRules;
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var c_cppHighlightRules = function() {
-
-    var keywords = lang.arrayToMap(
-        ("and|double|not_eq|throw|and_eq|dynamic_cast|operator|true|" +
-        "asm|else|or|try|auto|enum|or_eq|typedef|bitand|explicit|private|" +
-        "typeid|bitor|extern|protected|typename|bool|false|public|union|" +
-        "break|float|register|unsigned|case|fro|reinterpret-cast|using|catch|" +
-        "friend|return|virtual|char|goto|short|void|class|if|signed|volatile|" +
-        "compl|inline|sizeof|wchar_t|const|int|static|while|const-cast|long|" +
-        "static_cast|xor|continue|mutable|struct|xor_eq|default|namespace|" +
-        "switch|delete|new|template|do|not|this|for").split("|")
-    );
-
-    var buildinConstants = lang.arrayToMap(
-        ("NULL").split("|")
-    );
-
-    // regexp must not have capturing parentheses. Use (?:) instead.
-    // regexps are ordered -> the first match is used
-
-    this.$rules = {
-        "start" : [
-            {
-                token : "comment",
-                regex : "\\/\\/.*$"
-            },
-            new DocCommentHighlightRules().getStartRule("doc-start"),
-            {
-                token : "comment", // multi line comment
-                merge : true,
-                regex : "\\/\\*",
-                next : "comment"
-            }, {
-                token : "string", // single line
-                regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
-            }, {
-                token : "string", // multi line string start
-                merge : true,
-                regex : '["].*\\\\$',
-                next : "qqstring"
-            }, {
-                token : "string", // single line
-                regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"
-            }, {
-                token : "string", // multi line string start
-                merge : true,
-                regex : "['].*\\\\$",
-                next : "qstring"
-            }, {
-                token : "constant.numeric", // hex
-                regex : "0[xX][0-9a-fA-F]+\\b"
-            }, {
-                token : "constant.numeric", // float
-                regex : "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"
-            }, {
-              token : "constant", // <CONSTANT>
-              regex : "<[a-zA-Z0-9.]+>"
-            }, {
-              token : "keyword", // pre-compiler directivs
-              regex : "(?:#include|#pragma|#line|#define|#undef|#ifdef|#else|#elif|#endif|#ifndef)"
-          }, {
-                token : function(value) {
-                    if (value == "this")
-                        return "variable.language";
-                    else if (keywords.hasOwnProperty(value))
-                        return "keyword";
-                    else if (buildinConstants.hasOwnProperty(value))
-                        return "constant.language";
-                    else
-                        return "identifier";
-                },
-                regex : "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
-            }, {
-                token : "keyword.operator",
-                regex : "!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|==|=|!=|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|new|delete|typeof|void)"
-            }, {
-              token : "punctuation.operator",
-              regex : "\\?|\\:|\\,|\\;|\\."
-            }, {
-                token : "paren.lparen",
-                regex : "[[({]"
-            }, {
-                token : "paren.rparen",
-                regex : "[\\])}]"
-            }, {
-                token : "text",
-                regex : "\\s+"
-            }
-        ],
-        "comment" : [
-            {
-                token : "comment", // closing comment
-                regex : ".*?\\*\\/",
-                next : "start"
-            }, {
-                token : "comment", // comment spanning whole line
-                merge : true,
-                regex : ".+"
-            }
-        ],
-        "qqstring" : [
-            {
-                token : "string",
-                regex : '(?:(?:\\\\.)|(?:[^"\\\\]))*?"',
-                next : "start"
-            }, {
-                token : "string",
-                merge : true,
-                regex : '.+'
-            }
-        ],
-        "qstring" : [
-            {
-                token : "string",
-                regex : "(?:(?:\\\\.)|(?:[^'\\\\]))*?'",
-                next : "start"
-            }, {
-                token : "string",
-                merge : true,
-                regex : '.+'
-            }
-        ]
-    };
-    
-    this.embedRules(DocCommentHighlightRules, "doc-",
-        [ new DocCommentHighlightRules().getEndRule("start") ]);
-};
-
-oop.inherits(c_cppHighlightRules, TextHighlightRules);
-
-exports.c_cppHighlightRules = c_cppHighlightRules;
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/doc_comment_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var DocCommentHighlightRules = function() {
-
-    this.$rules = {
-        "start" : [ {
-            token : "comment.doc.tag",
-            regex : "@[\\w\\d_]+" // TODO: fix email addresses
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "\\s+"
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "TODO"
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "[^@\\*]+"
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "."
-        }]
-    };
-};
-
-oop.inherits(DocCommentHighlightRules, TextHighlightRules);
-
-(function() {
-
-    this.getStartRule = function(start) {
-        return {
-            token : "comment.doc", // doc comment
-            merge : true,
-            regex : "\\/\\*(?=\\*)",
-            next  : start
-        };
-    };
-    
-    this.getEndRule = function (start) {
-        return {
-            token : "comment.doc", // closing comment
-            merge : true,
-            regex : "\\*\\/",
-            next  : start
-        };
-    };
-
-}).call(DocCommentHighlightRules.prototype);
-
-exports.DocCommentHighlightRules = DocCommentHighlightRules;
-
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/matching_brace_outdent', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../range").Range;
-
-var MatchingBraceOutdent = function() {};
-
-(function() {
-
-    this.checkOutdent = function(line, input) {
-        if (! /^\s+$/.test(line))
-            return false;
-
-        return /^\s*\}/.test(input);
-    };
-
-    this.autoOutdent = function(doc, row) {
-        var line = doc.getLine(row);
-        var match = line.match(/^(\s*\})/);
-
-        if (!match) return 0;
-
-        var column = match[1].length;
-        var openBracePos = doc.findMatchingBracket({row: row, column: column});
-
-        if (!openBracePos || openBracePos.row == row) return 0;
-
-        var indent = this.$getIndent(doc.getLine(openBracePos.row));
-        doc.replace(new Range(row, 0, row, column-1), indent);
-    };
-
-    this.$getIndent = function(line) {
-        var match = line.match(/^(\s+)/);
-        if (match) {
-            return match[1];
-        }
-
-        return "";
-    };
-
-}).call(MatchingBraceOutdent.prototype);
-
-exports.MatchingBraceOutdent = MatchingBraceOutdent;
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Chris Spencer <chris.ag.spencer AT googlemail DOT com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/behaviour/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/behaviour'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var Behaviour = require('../behaviour').Behaviour;
-
-var CstyleBehaviour = function () {
-
-    this.add("braces", "insertion", function (state, action, editor, session, text) {
-        if (text == '{') {
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: '{' + selected + '}',
-                    selection: false
-                };
-            } else {
-                return {
-                    text: '{}',
-                    selection: [1, 1]
-                };
-            }
-        } else if (text == '}') {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == '}') {
-                var matching = session.$findOpeningBracket('}', {column: cursor.column + 1, row: cursor.row});
-                if (matching !== null) {
-                    return {
-                        text: '',
-                        selection: [1, 1]
-                    };
-                }
-            }
-        } else if (text == "\n") {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == '}') {
-                var openBracePos = session.findMatchingBracket({row: cursor.row, column: cursor.column + 1});
-                if (!openBracePos)
-                     return null;
-
-                var indent = this.getNextLineIndent(state, line.substring(0, line.length - 1), session.getTabString());
-                var next_indent = this.$getIndent(session.doc.getLine(openBracePos.row));
-
-                return {
-                    text: '\n' + indent + '\n' + next_indent,
-                    selection: [1, indent.length, 1, indent.length]
-                };
-            }
-        }
-    });
-
-    this.add("braces", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && selected == '{') {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.end.column, range.end.column + 1);
-            if (rightChar == '}') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-    this.add("parens", "insertion", function (state, action, editor, session, text) {
-        if (text == '(') {
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: '(' + selected + ')',
-                    selection: false
-                };
-            } else {
-                return {
-                    text: '()',
-                    selection: [1, 1]
-                };
-            }
-        } else if (text == ')') {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == ')') {
-                var matching = session.$findOpeningBracket(')', {column: cursor.column + 1, row: cursor.row});
-                if (matching !== null) {
-                    return {
-                        text: '',
-                        selection: [1, 1]
-                    };
-                }
-            }
-        }
-    });
-
-    this.add("parens", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && selected == '(') {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
-            if (rightChar == ')') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-    this.add("string_dquotes", "insertion", function (state, action, editor, session, text) {
-        if (text == '"' || text == "'") {
-            var quote = text;
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: quote + selected + quote,
-                    selection: false
-                };
-            } else {
-                var cursor = editor.getCursorPosition();
-                var line = session.doc.getLine(cursor.row);
-                var leftChar = line.substring(cursor.column-1, cursor.column);
-
-                // We're escaped.
-                if (leftChar == '\\') {
-                    return null;
-                }
-
-                // Find what token we're inside.
-                var tokens = session.getTokens(selection.start.row, selection.start.row)[0].tokens;
-                var col = 0, token;
-                var quotepos = -1; // Track whether we're inside an open quote.
-
-                for (var x = 0; x < tokens.length; x++) {
-                    token = tokens[x];
-                    if (token.type == "string") {
-                      quotepos = -1;
-                    } else if (quotepos < 0) {
-                      quotepos = token.value.indexOf(quote);
-                    }
-                    if ((token.value.length + col) > selection.start.column) {
-                        break;
-                    }
-                    col += tokens[x].value.length;
-                }
-
-                // Try and be smart about when we auto insert.
-                if (!token || (quotepos < 0 && token.type !== "comment" && (token.type !== "string" || ((selection.start.column !== token.value.length+col-1) && token.value.lastIndexOf(quote) === token.value.length-1)))) {
-                    return {
-                        text: quote + quote,
-                        selection: [1,1]
-                    };
-                } else if (token && token.type === "string") {
-                    // Ignore input and move right one if we're typing over the closing quote.
-                    var rightChar = line.substring(cursor.column, cursor.column + 1);
-                    if (rightChar == quote) {
-                        return {
-                            text: '',
-                            selection: [1, 1]
-                        };
-                    }
-                }
-            }
-        }
-    });
-
-    this.add("string_dquotes", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && (selected == '"' || selected == "'")) {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
-            if (rightChar == '"') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-};
-
-oop.inherits(CstyleBehaviour, Behaviour);
-
-exports.CstyleBehaviour = CstyleBehaviour;
-});/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/folding/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/range', 'ace/mode/folding/fold_mode'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var Range = require("../../range").Range;
-var BaseFoldMode = require("./fold_mode").FoldMode;
-
-var FoldMode = exports.FoldMode = function() {};
-oop.inherits(FoldMode, BaseFoldMode);
-
-(function() {
-
-    this.foldingStartMarker = /(\{|\[)[^\}\]]*$|^\s*(\/\*)/;
-    this.foldingStopMarker = /^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/;
-    
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        var line = session.getLine(row);
-        var match = line.match(this.foldingStartMarker);
-        if (match) {
-            var i = match.index;
-
-            if (match[1])
-                return this.openingBracketBlock(session, match[1], row, i);
-
-            var range = session.getCommentFoldRange(row, i + match[0].length);
-            range.end.column -= 2;
-            return range;
-        }
-
-        if (foldStyle !== "markbeginend")
-            return;
-            
-        var match = line.match(this.foldingStopMarker);
-        if (match) {
-            var i = match.index + match[0].length;
-
-            if (match[2]) {
-                var range = session.getCommentFoldRange(row, i);
-                range.end.column -= 2;
-                return range;
-            }
-
-            var end = {row: row, column: i};
-            var start = session.$findOpeningBracket(match[1], end);
-            
-            if (!start)
-                return;
-
-            start.column++;
-            end.column--;
-
-            return  Range.fromPoints(start, end);
-        }
-    };
-    
-}).call(FoldMode.prototype);
-
-});/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/folding/fold_mode', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../../range").Range;
-
-var FoldMode = exports.FoldMode = function() {};
-
-(function() {
-
-    this.foldingStartMarker = null;
-    this.foldingStopMarker = null;
-
-    // must return "" if there's no fold, to enable caching
-    this.getFoldWidget = function(session, foldStyle, row) {
-        var line = session.getLine(row);
-        if (this.foldingStartMarker.test(line))
-            return "start";
-        if (foldStyle == "markbeginend"
-                && this.foldingStopMarker
-                && this.foldingStopMarker.test(line))
-            return "end";
-        return "";
-    };
-    
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        return null;
-    };
-
-    this.indentationBlock = function(session, row, column) {
-        var re = /^\s*/;
-        var startRow = row;
-        var endRow = row;
-        var line = session.getLine(row);
-        var startColumn = column || line.length;
-        var startLevel = line.match(re)[0].length;
-        var maxRow = session.getLength()
-        
-        while (++row < maxRow) {
-            line = session.getLine(row);
-            var level = line.match(re)[0].length;
-
-            if (level == line.length)
-                continue;
-
-            if (level <= startLevel)
-                break;
-
-            endRow = row;
-        }
-
-        if (endRow > startRow) {
-            var endColumn = session.getLine(endRow).length;
-            return new Range(startRow, startColumn, endRow, endColumn);
-        }
-    };
-
-    this.openingBracketBlock = function(session, bracket, row, column) {
-        var start = {row: row, column: column + 1};
-        var end = session.$findClosingBracket(bracket, start);
-        if (!end)
-            return;
-
-        var fw = session.foldWidgets[end.row];
-        if (fw == null)
-            fw = this.getFoldWidget(session, end.row);
-
-        if (fw == "start") {
-            end.row --;
-            end.column = session.getLine(end.row).length;
-        }
-        return Range.fromPoints(start, end);
-    };
-
-}).call(FoldMode.prototype);
-
-});
diff --git a/apps/files_texteditor/js/aceeditor/mode-c_cpp.js b/apps/files_texteditor/js/aceeditor/mode-c_cpp.js
deleted file mode 100644
index 078afcaa78..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-c_cpp.js
+++ /dev/null
@@ -1 +0,0 @@
-define("ace/mode/c_cpp",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/c_cpp_highlight_rules","ace/mode/matching_brace_outdent","ace/range","ace/mode/behaviour/cstyle","ace/mode/folding/cstyle"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./c_cpp_highlight_rules").c_cppHighlightRules,h=a("./matching_brace_outdent").MatchingBraceOutdent,i=a("../range").Range,j=a("./behaviour/cstyle").CstyleBehaviour,k=a("./folding/cstyle").FoldMode,l=function(){this.$tokenizer=new f((new g).getRules()),this.$outdent=new h,this.$behaviour=new j,this.foldingRules=new k};d.inherits(l,e),function(){this.toggleCommentLines=function(a,b,c,d){var e=!0,f=/^(\s*)\/\//;for(var g=c;g<=d;g++)if(!f.test(b.getLine(g))){e=!1;break}if(e){var h=new i(0,0,0,0);for(var g=c;g<=d;g++){var j=b.getLine(g),k=j.match(f);h.start.row=g,h.end.row=g,h.end.column=k[0].length,b.replace(h,k[1])}}else b.indentRows(c,d,"//")},this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a),f=e.tokens,g=e.state;if(f.length&&f[f.length-1].type=="comment")return d;if(a=="start"){var h=b.match(/^.*[\{\(\[]\s*$/);h&&(d+=c)}else if(a=="doc-start"){if(g=="start")return"";var h=b.match(/^\s*(\/?)\*/);h&&(h[1]&&(d+=" "),d+="* ")}return d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)}}.call(l.prototype),b.Mode=l}),define("ace/mode/c_cpp_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/doc_comment_highlight_rules","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("./doc_comment_highlight_rules").DocCommentHighlightRules,g=a("./text_highlight_rules").TextHighlightRules,h=function(){var a=e.arrayToMap("and|double|not_eq|throw|and_eq|dynamic_cast|operator|true|asm|else|or|try|auto|enum|or_eq|typedef|bitand|explicit|private|typeid|bitor|extern|protected|typename|bool|false|public|union|break|float|register|unsigned|case|fro|reinterpret-cast|using|catch|friend|return|virtual|char|goto|short|void|class|if|signed|volatile|compl|inline|sizeof|wchar_t|const|int|static|while|const-cast|long|static_cast|xor|continue|mutable|struct|xor_eq|default|namespace|switch|delete|new|template|do|not|this|for".split("|")),b=e.arrayToMap("NULL".split("|"));this.$rules={start:[{token:"comment",regex:"\\/\\/.*$"},(new f).getStartRule("doc-start"),{token:"comment",merge:!0,regex:"\\/\\*",next:"comment"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",merge:!0,regex:'["].*\\\\$',next:"qqstring"},{token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:"string",merge:!0,regex:"['].*\\\\$",next:"qstring"},{token:"constant.numeric",regex:"0[xX][0-9a-fA-F]+\\b"},{token:"constant.numeric",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:"constant",regex:"<[a-zA-Z0-9.]+>"},{token:"keyword",regex:"(?:#include|#pragma|#line|#define|#undef|#ifdef|#else|#elif|#endif|#ifndef)"},{token:function(c){return c=="this"?"variable.language":a.hasOwnProperty(c)?"keyword":b.hasOwnProperty(c)?"constant.language":"identifier"},regex:"[a-zA-Z_$][a-zA-Z0-9_$]*\\b"},{token:"keyword.operator",regex:"!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|==|=|!=|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|new|delete|typeof|void)"},{token:"punctuation.operator",regex:"\\?|\\:|\\,|\\;|\\."},{token:"paren.lparen",regex:"[[({]"},{token:"paren.rparen",regex:"[\\])}]"},{token:"text",regex:"\\s+"}],comment:[{token:"comment",regex:".*?\\*\\/",next:"start"},{token:"comment",merge:!0,regex:".+"}],qqstring:[{token:"string",regex:'(?:(?:\\\\.)|(?:[^"\\\\]))*?"',next:"start"},{token:"string",merge:!0,regex:".+"}],qstring:[{token:"string",regex:"(?:(?:\\\\.)|(?:[^'\\\\]))*?'",next:"start"},{token:"string",merge:!0,regex:".+"}]},this.embedRules(f,"doc-",[(new f).getEndRule("start")])};d.inherits(h,g),b.c_cppHighlightRules=h}),define("ace/mode/doc_comment_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text_highlight_rules").TextHighlightRules,f=function(){this.$rules={start:[{token:"comment.doc.tag",regex:"@[\\w\\d_]+"},{token:"comment.doc",merge:!0,regex:"\\s+"},{token:"comment.doc",merge:!0,regex:"TODO"},{token:"comment.doc",merge:!0,regex:"[^@\\*]+"},{token:"comment.doc",merge:!0,regex:"."}]}};d.inherits(f,e),function(){this.getStartRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\/\\*(?=\\*)",next:a}},this.getEndRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\*\\/",next:a}}}.call(f.prototype),b.DocCommentHighlightRules=f}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../range").Range,e=function(){};(function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}}).call(e.prototype),b.MatchingBraceOutdent=e}),define("ace/mode/behaviour/cstyle",["require","exports","module","ace/lib/oop","ace/mode/behaviour"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../behaviour").Behaviour,f=function(){this.add("braces","insertion",function(a,b,c,d,e){if(e=="{"){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"{"+g+"}",selection:!1}:{text:"{}",selection:[1,1]}}if(e=="}"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var k=d.$findOpeningBracket("}",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}else if(e=="\n"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var l=d.findMatchingBracket({row:h.row,column:h.column+1});if(!l)return null;var m=this.getNextLineIndent(a,i.substring(0,i.length-1),d.getTabString()),n=this.$getIndent(d.doc.getLine(l.row));return{text:"\n"+m+"\n"+n,selection:[1,m.length,1,m.length]}}}}),this.add("braces","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="{"){var g=d.doc.getLine(e.start.row),h=g.substring(e.end.column,e.end.column+1);if(h=="}")return e.end.column++,e}}),this.add("parens","insertion",function(a,b,c,d,e){if(e=="("){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"("+g+")",selection:!1}:{text:"()",selection:[1,1]}}if(e==")"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j==")"){var k=d.$findOpeningBracket(")",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}}),this.add("parens","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="("){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h==")")return e.end.column++,e}}),this.add("string_dquotes","insertion",function(a,b,c,d,e){if(e=='"'||e=="'"){var f=e,g=c.getSelectionRange(),h=d.doc.getTextRange(g);if(h!=="")return{text:f+h+f,selection:!1};var i=c.getCursorPosition(),j=d.doc.getLine(i.row),k=j.substring(i.column-1,i.column);if(k=="\\")return null;var l=d.getTokens(g.start.row,g.start.row)[0].tokens,m=0,n,o=-1;for(var p=0;p<l.length;p++){n=l[p],n.type=="string"?o=-1:o<0&&(o=n.value.indexOf(f));if(n.value.length+m>g.start.column)break;m+=l[p].value.length}if(!n||o<0&&n.type!=="comment"&&(n.type!=="string"||g.start.column!==n.value.length+m-1&&n.value.lastIndexOf(f)===n.value.length-1))return{text:f+f,selection:[1,1]};if(n&&n.type==="string"){var q=j.substring(i.column,i.column+1);if(q==f)return{text:"",selection:[1,1]}}}}),this.add("string_dquotes","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&(f=='"'||f=="'")){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h=='"')return e.end.column++,e}})};d.inherits(f,e),b.CstyleBehaviour=f}),define("ace/mode/folding/cstyle",["require","exports","module","ace/lib/oop","ace/range","ace/mode/folding/fold_mode"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../../range").Range,f=a("./fold_mode").FoldMode,g=b.FoldMode=function(){};d.inherits(g,f),function(){this.foldingStartMarker=/(\{|\[)[^\}\]]*$|^\s*(\/\*)/,this.foldingStopMarker=/^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/,this.getFoldWidgetRange=function(a,b,c){var d=a.getLine(c),f=d.match(this.foldingStartMarker);if(f){var g=f.index;if(f[1])return this.openingBracketBlock(a,f[1],c,g);var h=a.getCommentFoldRange(c,g+f[0].length);return h.end.column-=2,h}if(b!=="markbeginend")return;var f=d.match(this.foldingStopMarker);if(f){var g=f.index+f[0].length;if(f[2]){var h=a.getCommentFoldRange(c,g);return h.end.column-=2,h}var i={row:c,column:g},j=a.$findOpeningBracket(f[1],i);if(!j)return;return j.column++,i.column--,e.fromPoints(j,i)}}}.call(g.prototype)}),define("ace/mode/folding/fold_mode",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../../range").Range,e=b.FoldMode=function(){};(function(){this.foldingStartMarker=null,this.foldingStopMarker=null,this.getFoldWidget=function(a,b,c){var d=a.getLine(c);return this.foldingStartMarker.test(d)?"start":b=="markbeginend"&&this.foldingStopMarker&&this.foldingStopMarker.test(d)?"end":""},this.getFoldWidgetRange=function(a,b,c){return null},this.indentationBlock=function(a,b,c){var e=/^\s*/,f=b,g=b,h=a.getLine(b),i=c||h.length,j=h.match(e)[0].length,k=a.getLength();while(++b<k){h=a.getLine(b);var l=h.match(e)[0].length;if(l==h.length)continue;if(l<=j)break;g=b}if(g>f){var m=a.getLine(g).length;return new d(f,i,g,m)}},this.openingBracketBlock=function(a,b,c,e){var f={row:c,column:e+1},g=a.$findClosingBracket(b,f);if(!g)return;var h=a.foldWidgets[g.row];return h==null&&(h=this.getFoldWidget(a,g.row)),h=="start"&&(g.row--,g.column=a.getLine(g.row).length),d.fromPoints(f,g)}}).call(e.prototype)})
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-clojure-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-clojure-uncompressed.js
deleted file mode 100644
index cb0081316f..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-clojure-uncompressed.js
+++ /dev/null
@@ -1,422 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Shlomo Zalman Heigh <shlomozalmanheigh AT gmail DOT com>
- *      Carin Meier
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/clojure', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/clojure_highlight_rules', 'ace/mode/matching_parens_outdent', 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
-var ClojureHighlightRules = require("./clojure_highlight_rules").ClojureHighlightRules;
-var MatchingParensOutdent = require("./matching_parens_outdent").MatchingParensOutdent;
-var Range = require("../range").Range;
-
-var Mode = function() {
-    this.$tokenizer = new Tokenizer(new ClojureHighlightRules().getRules());
-    this.$outdent = new MatchingParensOutdent();
-};
-oop.inherits(Mode, TextMode);
-
-(function() {
-
-    this.toggleCommentLines = function(state, doc, startRow, endRow) {
-        var outdent = true;
-        var re = /^(\s*)#/;
-
-        for (var i=startRow; i<= endRow; i++) {
-            if (!re.test(doc.getLine(i))) {
-                outdent = false;
-                break;
-            }
-        }
-
-        if (outdent) {
-            var deleteRange = new Range(0, 0, 0, 0);
-            for (var i=startRow; i<= endRow; i++)
-            {
-                var line = doc.getLine(i);
-                var m = line.match(re);
-                deleteRange.start.row = i;
-                deleteRange.end.row = i;
-                deleteRange.end.column = m[0].length;
-                doc.replace(deleteRange, m[1]);
-            }
-        }
-        else {
-            doc.indentRows(startRow, endRow, ";");
-        }
-    };
-
-    this.getNextLineIndent = function(state, line, tab) {
-        var indent = this.$getIndent(line);
-
-        var tokenizedLine = this.$tokenizer.getLineTokens(line, state);
-        var tokens = tokenizedLine.tokens;
-
-        if (tokens.length && tokens[tokens.length-1].type == "comment") {
-            return indent;
-        }
-        
-        if (state == "start") {
-            var match = line.match(/[\(\[]/);
-            if (match) {
-                indent += "  ";
-            }
-            match = line.match(/[\)]/);
-            if (match) {
-              indent = "";
-            }
-        }
-
-        return indent;
-    };
-
-    this.checkOutdent = function(state, line, input) {
-        return this.$outdent.checkOutdent(line, input);
-    };
-
-    this.autoOutdent = function(state, doc, row) {
-        this.$outdent.autoOutdent(doc, row);
-    };
-
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Shlomo Zalman Heigh <shlomozalmanheigh AT gmail DOT com>
- *      Carin Meier
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/clojure_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var lang = require("../lib/lang");
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-
-
-var ClojureHighlightRules = function() {
-
-       var builtinFunctions = lang.arrayToMap(
-        ('* *1 *2 *3 *agent* *allow-unresolved-vars* *assert* *clojure-version* ' +
-            '*command-line-args* *compile-files* *compile-path* *e *err* *file* ' +
-            '*flush-on-newline* *in* *macro-meta* *math-context* *ns* *out* ' +
-            '*print-dup* *print-length* *print-level* *print-meta* *print-readably* ' +
-            '*read-eval* *source-path* *use-context-classloader* ' +
-            '*warn-on-reflection* + - -> -&gt; ->> -&gt;&gt; .. / < &lt; <= &lt;= = ' +
-            '== > &gt; >= &gt;= accessor aclone ' +
-            'add-classpath add-watch agent agent-errors aget alength alias all-ns ' +
-            'alter alter-meta! alter-var-root amap ancestors and apply areduce ' +
-            'array-map aset aset-boolean aset-byte aset-char aset-double aset-float ' +
-            'aset-int aset-long aset-short assert assoc assoc! assoc-in associative? ' +
-            'atom await await-for await1 bases bean bigdec bigint binding bit-and ' +
-            'bit-and-not bit-clear bit-flip bit-not bit-or bit-set bit-shift-left ' +
-            'bit-shift-right bit-test bit-xor boolean boolean-array booleans ' +
-            'bound-fn bound-fn* butlast byte byte-array bytes cast char char-array ' +
-            'char-escape-string char-name-string char? chars chunk chunk-append ' +
-            'chunk-buffer chunk-cons chunk-first chunk-next chunk-rest chunked-seq? ' +
-            'class class? clear-agent-errors clojure-version coll? comment commute ' +
-            'comp comparator compare compare-and-set! compile complement concat cond ' +
-            'condp conj conj! cons constantly construct-proxy contains? count ' +
-            'counted? create-ns create-struct cycle dec decimal? declare definline ' +
-            'defmacro defmethod defmulti defn defn- defonce defstruct delay delay? ' +
-            'deliver deref derive descendants destructure disj disj! dissoc dissoc! ' +
-            'distinct distinct? doall doc dorun doseq dosync dotimes doto double ' +
-            'double-array doubles drop drop-last drop-while empty empty? ensure ' +
-            'enumeration-seq eval even? every? false? ffirst file-seq filter find ' +
-            'find-doc find-ns find-var first float float-array float? floats flush ' +
-            'fn fn? fnext for force format future future-call future-cancel ' +
-            'future-cancelled? future-done? future? gen-class gen-interface gensym ' +
-            'get get-in get-method get-proxy-class get-thread-bindings get-validator ' +
-            'hash hash-map hash-set identical? identity if-let if-not ifn? import ' +
-            'in-ns inc init-proxy instance? int int-array integer? interleave intern ' +
-            'interpose into into-array ints io! isa? iterate iterator-seq juxt key ' +
-            'keys keyword keyword? last lazy-cat lazy-seq let letfn line-seq list ' +
-            'list* list? load load-file load-reader load-string loaded-libs locking ' +
-            'long long-array longs loop macroexpand macroexpand-1 make-array ' +
-            'make-hierarchy map map? mapcat max max-key memfn memoize merge ' +
-            'merge-with meta method-sig methods min min-key mod name namespace neg? ' +
-            'newline next nfirst nil? nnext not not-any? not-empty not-every? not= ' +
-            'ns ns-aliases ns-imports ns-interns ns-map ns-name ns-publics ' +
-            'ns-refers ns-resolve ns-unalias ns-unmap nth nthnext num number? odd? ' +
-            'or parents partial partition pcalls peek persistent! pmap pop pop! ' +
-            'pop-thread-bindings pos? pr pr-str prefer-method prefers ' +
-            'primitives-classnames print print-ctor print-doc print-dup print-method ' +
-            'print-namespace-doc print-simple print-special-doc print-str printf ' +
-            'println println-str prn prn-str promise proxy proxy-call-with-super ' +
-            'proxy-mappings proxy-name proxy-super push-thread-bindings pvalues quot ' +
-            'rand rand-int range ratio? rational? rationalize re-find re-groups ' +
-            're-matcher re-matches re-pattern re-seq read read-line read-string ' +
-            'reduce ref ref-history-count ref-max-history ref-min-history ref-set ' +
-            'refer refer-clojure release-pending-sends rem remove remove-method ' +
-            'remove-ns remove-watch repeat repeatedly replace replicate require ' +
-            'reset! reset-meta! resolve rest resultset-seq reverse reversible? rseq ' +
-            'rsubseq second select-keys send send-off seq seq? seque sequence ' +
-            'sequential? set set-validator! set? short short-array shorts ' +
-            'shutdown-agents slurp some sort sort-by sorted-map sorted-map-by ' +
-            'sorted-set sorted-set-by sorted? special-form-anchor special-symbol? ' +
-            'split-at split-with str stream? string? struct struct-map subs subseq ' +
-            'subvec supers swap! symbol symbol? sync syntax-symbol-anchor take ' +
-            'take-last take-nth take-while test the-ns time to-array to-array-2d ' +
-            'trampoline transient tree-seq true? type unchecked-add unchecked-dec ' +
-            'unchecked-divide unchecked-inc unchecked-multiply unchecked-negate ' +
-            'unchecked-remainder unchecked-subtract underive unquote ' +
-            'unquote-splicing update-in update-proxy use val vals var-get var-set ' +
-            'var? vary-meta vec vector vector? when when-first when-let when-not ' +
-            'while with-bindings with-bindings* with-in-str with-loading-context ' +
-            'with-local-vars with-meta with-open with-out-str with-precision xml-seq ' +
-            'zero? zipmap ').split(" ")
-    );
-
-    var keywords = lang.arrayToMap(
-        ('def do fn if let loop monitor-enter monitor-exit new quote recur set! ' +
-            'throw try var').split(" ")
-    );
-
-    var buildinConstants = lang.arrayToMap(
-        ("true false nil").split(" ")
-    );
-
-
-    // regexp must not have capturing parentheses. Use (?:) instead.
-    // regexps are ordered -> the first match is used
-
-    this.$rules = {
-        "start" : [
-            {
-                token : "comment",
-                regex : ";.*$"
-            }, {
-                token : "comment", // multi line comment
-                regex : "^=begin$",
-                next : "comment"
-            }, {
-                token : "keyword", //parens
-                regex : "[\\(|\\)]"
-            }, {
-                token : "keyword", //lists
-                regex : "[\\'\\(]"
-            }, {
-                token : "keyword", //vectors
-                regex : "[\\[|\\]]"
-            }, {
-                token : "keyword", //sets and maps
-                regex : "[\\{|\\}|\\#\\{|\\#\\}]"
-            }, {
-                    token : "keyword", // ampersands
-                    regex : '[\\&]'
-            }, {
-                    token : "keyword", // metadata
-                    regex : '[\\#\\^\\{]'
-            }, {
-                    token : "keyword", // anonymous fn syntactic sugar
-                    regex : '[\\%]'
-            }, {
-                    token : "keyword", // deref reader macro
-                    regex : '[@]'
-            }, {
-                token : "constant.numeric", // hex
-                regex : "0[xX][0-9a-fA-F]+\\b"
-            }, {
-                token : "constant.numeric", // float
-                regex : "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"
-            }, {
-                token : "constant.language",
-                regex : '[!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+||=|!=|<=|>=|<>|<|>|!|&&]'
-            }, {
-                token : function(value) {
-                    if (keywords.hasOwnProperty(value))
-                        return "keyword";
-                    else if (buildinConstants.hasOwnProperty(value))
-                        return "constant.language";
-                        else if (builtinFunctions.hasOwnProperty(value))
-                        return "support.function";
-                    else
-                        return "identifier";
-                },
-                // TODO: Unicode escape sequences
-                // TODO: Unicode identifiers
-                regex : "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
-            }, {
-                token : "string", // single line
-                regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
-            }, {
-                token : "string", // symbol
-                regex : "[:](?:[a-zA-Z]|\\d)+"
-            }, {
-                token : "string.regexp", //Regular Expressions
-                regex : '/#"(?:\\.|(?:\\\")|[^\""\n])*"/g'
-            }
-
-        ],
-        "comment" : [
-            {
-                token : "comment", // closing comment
-                regex : "^=end$",
-                next : "start"
-            }, {
-                token : "comment", // comment spanning whole line
-                merge : true,
-                regex : ".+"
-            }
-        ]
-    };
-};
-
-oop.inherits(ClojureHighlightRules, TextHighlightRules);
-
-exports.ClojureHighlightRules = ClojureHighlightRules;
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/matching_parens_outdent', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../range").Range;
-
-var MatchingParensOutdent = function() {};
-
-(function() {
-
-    this.checkOutdent = function(line, input) {
-        if (! /^\s+$/.test(line))
-            return false;
-
-        return /^\s*\)/.test(input);
-    };
-
-    this.autoOutdent = function(doc, row) {
-        var line = doc.getLine(row);
-        var match = line.match(/^(\s*\))/);
-
-        if (!match) return 0;
-
-        var column = match[1].length;
-        var openBracePos = doc.findMatchingBracket({row: row, column: column});
-
-        if (!openBracePos || openBracePos.row == row) return 0;
-
-        var indent = this.$getIndent(doc.getLine(openBracePos.row));
-        doc.replace(new Range(row, 0, row, column-1), indent);
-    };
-
-    this.$getIndent = function(line) {
-        var match = line.match(/^(\s+)/);
-        if (match) {
-            return match[1];
-        }
-
-        return "";
-    };
-
-}).call(MatchingParensOutdent.prototype);
-
-exports.MatchingParensOutdent = MatchingParensOutdent;
-});
diff --git a/apps/files_texteditor/js/aceeditor/mode-clojure.js b/apps/files_texteditor/js/aceeditor/mode-clojure.js
deleted file mode 100644
index 3afd7673f8..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-clojure.js
+++ /dev/null
@@ -1 +0,0 @@
-define("ace/mode/clojure",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/clojure_highlight_rules","ace/mode/matching_parens_outdent","ace/range"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./clojure_highlight_rules").ClojureHighlightRules,h=a("./matching_parens_outdent").MatchingParensOutdent,i=a("../range").Range,j=function(){this.$tokenizer=new f((new g).getRules()),this.$outdent=new h};d.inherits(j,e),function(){this.toggleCommentLines=function(a,b,c,d){var e=!0,f=/^(\s*)#/;for(var g=c;g<=d;g++)if(!f.test(b.getLine(g))){e=!1;break}if(e){var h=new i(0,0,0,0);for(var g=c;g<=d;g++){var j=b.getLine(g),k=j.match(f);h.start.row=g,h.end.row=g,h.end.column=k[0].length,b.replace(h,k[1])}}else b.indentRows(c,d,";")},this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a),f=e.tokens;if(f.length&&f[f.length-1].type=="comment")return d;if(a=="start"){var g=b.match(/[\(\[]/);g&&(d+="  "),g=b.match(/[\)]/),g&&(d="")}return d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)}}.call(j.prototype),b.Mode=j}),define("ace/mode/clojure_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("./text_highlight_rules").TextHighlightRules,g=function(){var a=e.arrayToMap("* *1 *2 *3 *agent* *allow-unresolved-vars* *assert* *clojure-version* *command-line-args* *compile-files* *compile-path* *e *err* *file* *flush-on-newline* *in* *macro-meta* *math-context* *ns* *out* *print-dup* *print-length* *print-level* *print-meta* *print-readably* *read-eval* *source-path* *use-context-classloader* *warn-on-reflection* + - -> -&gt; ->> -&gt;&gt; .. / < &lt; <= &lt;= = == > &gt; >= &gt;= accessor aclone add-classpath add-watch agent agent-errors aget alength alias all-ns alter alter-meta! alter-var-root amap ancestors and apply areduce array-map aset aset-boolean aset-byte aset-char aset-double aset-float aset-int aset-long aset-short assert assoc assoc! assoc-in associative? atom await await-for await1 bases bean bigdec bigint binding bit-and bit-and-not bit-clear bit-flip bit-not bit-or bit-set bit-shift-left bit-shift-right bit-test bit-xor boolean boolean-array booleans bound-fn bound-fn* butlast byte byte-array bytes cast char char-array char-escape-string char-name-string char? chars chunk chunk-append chunk-buffer chunk-cons chunk-first chunk-next chunk-rest chunked-seq? class class? clear-agent-errors clojure-version coll? comment commute comp comparator compare compare-and-set! compile complement concat cond condp conj conj! cons constantly construct-proxy contains? count counted? create-ns create-struct cycle dec decimal? declare definline defmacro defmethod defmulti defn defn- defonce defstruct delay delay? deliver deref derive descendants destructure disj disj! dissoc dissoc! distinct distinct? doall doc dorun doseq dosync dotimes doto double double-array doubles drop drop-last drop-while empty empty? ensure enumeration-seq eval even? every? false? ffirst file-seq filter find find-doc find-ns find-var first float float-array float? floats flush fn fn? fnext for force format future future-call future-cancel future-cancelled? future-done? future? gen-class gen-interface gensym get get-in get-method get-proxy-class get-thread-bindings get-validator hash hash-map hash-set identical? identity if-let if-not ifn? import in-ns inc init-proxy instance? int int-array integer? interleave intern interpose into into-array ints io! isa? iterate iterator-seq juxt key keys keyword keyword? last lazy-cat lazy-seq let letfn line-seq list list* list? load load-file load-reader load-string loaded-libs locking long long-array longs loop macroexpand macroexpand-1 make-array make-hierarchy map map? mapcat max max-key memfn memoize merge merge-with meta method-sig methods min min-key mod name namespace neg? newline next nfirst nil? nnext not not-any? not-empty not-every? not= ns ns-aliases ns-imports ns-interns ns-map ns-name ns-publics ns-refers ns-resolve ns-unalias ns-unmap nth nthnext num number? odd? or parents partial partition pcalls peek persistent! pmap pop pop! pop-thread-bindings pos? pr pr-str prefer-method prefers primitives-classnames print print-ctor print-doc print-dup print-method print-namespace-doc print-simple print-special-doc print-str printf println println-str prn prn-str promise proxy proxy-call-with-super proxy-mappings proxy-name proxy-super push-thread-bindings pvalues quot rand rand-int range ratio? rational? rationalize re-find re-groups re-matcher re-matches re-pattern re-seq read read-line read-string reduce ref ref-history-count ref-max-history ref-min-history ref-set refer refer-clojure release-pending-sends rem remove remove-method remove-ns remove-watch repeat repeatedly replace replicate require reset! reset-meta! resolve rest resultset-seq reverse reversible? rseq rsubseq second select-keys send send-off seq seq? seque sequence sequential? set set-validator! set? short short-array shorts shutdown-agents slurp some sort sort-by sorted-map sorted-map-by sorted-set sorted-set-by sorted? special-form-anchor special-symbol? split-at split-with str stream? string? struct struct-map subs subseq subvec supers swap! symbol symbol? sync syntax-symbol-anchor take take-last take-nth take-while test the-ns time to-array to-array-2d trampoline transient tree-seq true? type unchecked-add unchecked-dec unchecked-divide unchecked-inc unchecked-multiply unchecked-negate unchecked-remainder unchecked-subtract underive unquote unquote-splicing update-in update-proxy use val vals var-get var-set var? vary-meta vec vector vector? when when-first when-let when-not while with-bindings with-bindings* with-in-str with-loading-context with-local-vars with-meta with-open with-out-str with-precision xml-seq zero? zipmap ".split(" ")),b=e.arrayToMap("def do fn if let loop monitor-enter monitor-exit new quote recur set! throw try var".split(" ")),c=e.arrayToMap("true false nil".split(" "));this.$rules={start:[{token:"comment",regex:";.*$"},{token:"comment",regex:"^=begin$",next:"comment"},{token:"keyword",regex:"[\\(|\\)]"},{token:"keyword",regex:"[\\'\\(]"},{token:"keyword",regex:"[\\[|\\]]"},{token:"keyword",regex:"[\\{|\\}|\\#\\{|\\#\\}]"},{token:"keyword",regex:"[\\&]"},{token:"keyword",regex:"[\\#\\^\\{]"},{token:"keyword",regex:"[\\%]"},{token:"keyword",regex:"[@]"},{token:"constant.numeric",regex:"0[xX][0-9a-fA-F]+\\b"},{token:"constant.numeric",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:"constant.language",regex:"[!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+||=|!=|<=|>=|<>|<|>|!|&&]"},{token:function(d){return b.hasOwnProperty(d)?"keyword":c.hasOwnProperty(d)?"constant.language":a.hasOwnProperty(d)?"support.function":"identifier"},regex:"[a-zA-Z_$][a-zA-Z0-9_$]*\\b"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",regex:"[:](?:[a-zA-Z]|\\d)+"},{token:"string.regexp",regex:'/#"(?:\\.|(?:\\")|[^""\n])*"/g'}],comment:[{token:"comment",regex:"^=end$",next:"start"},{token:"comment",merge:!0,regex:".+"}]}};d.inherits(g,f),b.ClojureHighlightRules=g}),define("ace/mode/matching_parens_outdent",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../range").Range,e=function(){};(function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\)/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\))/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}}).call(e.prototype),b.MatchingParensOutdent=e})
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-coffee-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-coffee-uncompressed.js
deleted file mode 100644
index de6cbf4137..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-coffee-uncompressed.js
+++ /dev/null
@@ -1,605 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Satoshi Murakami <murky.satyr AT gmail DOT com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/coffee', ['require', 'exports', 'module' , 'ace/tokenizer', 'ace/mode/coffee_highlight_rules', 'ace/mode/matching_brace_outdent', 'ace/mode/folding/pythonic', 'ace/range', 'ace/mode/text', 'ace/worker/worker_client', 'ace/lib/oop'], function(require, exports, module) {
-"use strict";
-
-var Tokenizer = require("../tokenizer").Tokenizer;
-var Rules = require("./coffee_highlight_rules").CoffeeHighlightRules;
-var Outdent = require("./matching_brace_outdent").MatchingBraceOutdent;
-var PythonFoldMode = require("./folding/pythonic").FoldMode;
-var Range = require("../range").Range;
-var TextMode = require("./text").Mode;
-var WorkerClient = require("../worker/worker_client").WorkerClient;
-var oop = require("../lib/oop");
-
-function Mode() {
-    this.$tokenizer = new Tokenizer(new Rules().getRules());
-    this.$outdent   = new Outdent();
-    this.foldingRules = new PythonFoldMode("=|=>|->|\\s*class [^#]*");
-}
-
-oop.inherits(Mode, TextMode);
-
-(function() {
-    
-    var indenter = /(?:[({[=:]|[-=]>|\b(?:else|switch|try|catch(?:\s*[$A-Za-z_\x7f-\uffff][$\w\x7f-\uffff]*)?|finally))\s*$/;
-    var commentLine = /^(\s*)#/;
-    var hereComment = /^\s*###(?!#)/;
-    var indentation = /^\s*/;
-    
-    this.getNextLineIndent = function(state, line, tab) {
-        var indent = this.$getIndent(line);
-        var tokens = this.$tokenizer.getLineTokens(line, state).tokens;
-    
-        if (!(tokens.length && tokens[tokens.length - 1].type === 'comment') &&
-            state === 'start' && indenter.test(line))
-            indent += tab;
-        return indent;
-    };
-    
-    this.toggleCommentLines = function(state, doc, startRow, endRow){
-        console.log("toggle");
-        var range = new Range(0, 0, 0, 0);
-        for (var i = startRow; i <= endRow; ++i) {
-            var line = doc.getLine(i);
-            if (hereComment.test(line))
-                continue;
-                
-            if (commentLine.test(line))
-                line = line.replace(commentLine, '$1');
-            else
-                line = line.replace(indentation, '$&#');
-    
-            range.end.row = range.start.row = i;
-            range.end.column = line.length + 1;
-            doc.replace(range, line);
-        }
-    };
-    
-    this.checkOutdent = function(state, line, input) {
-        return this.$outdent.checkOutdent(line, input);
-    };
-    
-    this.autoOutdent = function(state, doc, row) {
-        this.$outdent.autoOutdent(doc, row);
-    };
-    
-    this.createWorker = function(session) {
-        var worker = new WorkerClient(["ace"], "worker-coffee.js", "ace/mode/coffee_worker", "Worker");
-        worker.attachToDocument(session.getDocument());
-        
-        worker.on("error", function(e) {
-            session.setAnnotations([e.data]);
-        });
-        
-        worker.on("ok", function(e) {
-            session.clearAnnotations();
-        });
-        
-        return worker;
-    };
-
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-
-});/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Satoshi Murakami <murky.satyr AT gmail DOT com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/coffee_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/lang', 'ace/lib/oop', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-    var lang = require("../lib/lang");
-    var oop = require("../lib/oop");
-    var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-    
-    oop.inherits(CoffeeHighlightRules, TextHighlightRules);
-
-    function CoffeeHighlightRules() {
-        var identifier = "[$A-Za-z_\\x7f-\\uffff][$\\w\\x7f-\\uffff]*";
-        var stringfill = {
-            token : "string",
-            merge : true,
-            regex : ".+"
-        };
-
-        var keywords = lang.arrayToMap((
-            "this|throw|then|try|typeof|super|switch|return|break|by)|continue|" +
-            "catch|class|in|instanceof|is|isnt|if|else|extends|for|forown|" +
-            "finally|function|while|when|new|no|not|delete|debugger|do|loop|of|off|" +
-            "or|on|unless|until|and|yes").split("|")
-        );
-        
-        var langConstant = lang.arrayToMap((
-            "true|false|null|undefined").split("|")
-        );
-        
-        var illegal = lang.arrayToMap((
-            "case|const|default|function|var|void|with|enum|export|implements|" +
-            "interface|let|package|private|protected|public|static|yield|" +
-            "__hasProp|extends|slice|bind|indexOf").split("|")
-        );
-        
-        var supportClass = lang.arrayToMap((
-            "Array|Boolean|Date|Function|Number|Object|RegExp|ReferenceError|" +
-            "RangeError|String|SyntaxError|Error|EvalError|TypeError|URIError").split("|")
-        );
-        
-        var supportFunction = lang.arrayToMap((
-            "Math|JSON|isNaN|isFinite|parseInt|parseFloat|encodeURI|" +
-            "encodeURIComponent|decodeURI|decodeURIComponent|RangeError|String|" +
-            "SyntaxError|Error|EvalError|TypeError|URIError").split("|")
-        );
-
-        this.$rules = {
-            start : [
-                {
-                    token : "identifier",
-                    regex : "(?:(?:\\.|::)\\s*)" + identifier
-                }, {
-                    token : "variable",
-                    regex : "@(?:" + identifier + ")?"
-                }, {
-                    token: function(value) {
-                        if (keywords.hasOwnProperty(value))
-                            return "keyword";
-                        else if (langConstant.hasOwnProperty(value))
-                            return "constant.language";
-                        else if (illegal.hasOwnProperty(value))
-                            return "invalid.illegal";
-                        else if (supportClass.hasOwnProperty(value))
-                            return "language.support.class";
-                        else if (supportFunction.hasOwnProperty(value))
-                            return "language.support.function";
-                        else
-                            return "identifier";
-                    },
-                    regex : identifier
-                }, {
-                    token : "constant.numeric",
-                    regex : "(?:0x[\\da-fA-F]+|(?:\\d+(?:\\.\\d+)?|\\.\\d+)(?:[eE][+-]?\\d+)?)"
-                }, {
-                    token : "string",
-                    merge : true,
-                    regex : "'''",
-                    next : "qdoc"
-                }, {
-                    token : "string",
-                    merge : true,
-                    regex : '"""',
-                    next : "qqdoc"
-                }, {
-                    token : "string",
-                    merge : true,
-                    regex : "'",
-                    next : "qstring"
-                }, {
-                    token : "string",
-                    merge : true,
-                    regex : '"',
-                    next : "qqstring"
-                }, {
-                    token : "string",
-                    merge : true,
-                    regex : "`",
-                    next : "js"
-                }, {
-                    token : "string.regex",
-                    merge : true,
-                    regex : "///",
-                    next : "heregex"
-                }, {
-                    token : "string.regex",
-                    regex : "/(?!\\s)[^[/\\n\\\\]*(?: (?:\\\\.|\\[[^\\]\\n\\\\]*(?:\\\\.[^\\]\\n\\\\]*)*\\])[^[/\\n\\\\]*)*/[imgy]{0,4}(?!\\w)"
-                }, {
-                    token : "comment",
-                    merge : true,
-                    regex : "###(?!#)",
-                    next : "comment"
-                }, {
-                    token : "comment",
-                    regex : "#.*"
-                }, {
-                    token : "punctuation.operator",
-                    regex : "\\?|\\:|\\,|\\."
-                }, {
-                    token : "keyword.operator",
-                    regex : "(?:[\\-=]>|[-+*/%<>&|^!?=]=|>>>=?|\\-\\-|\\+\\+|::|&&=|\\|\\|=|<<=|>>=|\\?\\.|\\.{2,3}|\\!)"
-                }, {
-                    token : "paren.lparen",
-                    regex : "[({[]"
-                }, {
-                    token : "paren.rparen",
-                    regex : "[\\]})]"
-                }, {
-                    token : "text",
-                    regex : "\\s+"
-                }],
-            
-            qdoc : [{
-                token : "string",
-                regex : ".*?'''",
-                next : "start"
-            }, stringfill],
-            
-            qqdoc : [{
-                token : "string",
-                regex : '.*?"""',
-                next : "start"
-            }, stringfill],
-            
-            qstring : [{
-                token : "string",
-                regex : "[^\\\\']*(?:\\\\.[^\\\\']*)*'",
-                merge : true,
-                next : "start"
-            }, stringfill],
-            
-            qqstring : [{
-                token : "string",
-                regex : '[^\\\\"]*(?:\\\\.[^\\\\"]*)*"',
-                merge : true,
-                next : "start"
-            }, stringfill],
-            
-            js : [{
-                token : "string",
-                merge : true,
-                regex : "[^\\\\`]*(?:\\\\.[^\\\\`]*)*`",
-                next : "start"
-            }, stringfill],
-            
-            heregex : [{
-                token : "string.regex",
-                regex : '.*?///[imgy]{0,4}',
-                next : "start"
-            }, {
-                token : "comment.regex",
-                regex : "\\s+(?:#.*)?"
-            }, {
-                token : "string.regex",
-                merge : true,
-                regex : "\\S+"
-            }],
-            
-            comment : [{
-                token : "comment",
-                regex : '.*?###',
-                next : "start"
-            }, {
-                token : "comment",
-                merge : true,
-                regex : ".+"
-            }]
-        };
-    }
-
-    exports.CoffeeHighlightRules = CoffeeHighlightRules;
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/matching_brace_outdent', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../range").Range;
-
-var MatchingBraceOutdent = function() {};
-
-(function() {
-
-    this.checkOutdent = function(line, input) {
-        if (! /^\s+$/.test(line))
-            return false;
-
-        return /^\s*\}/.test(input);
-    };
-
-    this.autoOutdent = function(doc, row) {
-        var line = doc.getLine(row);
-        var match = line.match(/^(\s*\})/);
-
-        if (!match) return 0;
-
-        var column = match[1].length;
-        var openBracePos = doc.findMatchingBracket({row: row, column: column});
-
-        if (!openBracePos || openBracePos.row == row) return 0;
-
-        var indent = this.$getIndent(doc.getLine(openBracePos.row));
-        doc.replace(new Range(row, 0, row, column-1), indent);
-    };
-
-    this.$getIndent = function(line) {
-        var match = line.match(/^(\s+)/);
-        if (match) {
-            return match[1];
-        }
-
-        return "";
-    };
-
-}).call(MatchingBraceOutdent.prototype);
-
-exports.MatchingBraceOutdent = MatchingBraceOutdent;
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/folding/pythonic', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/folding/fold_mode'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var BaseFoldMode = require("./fold_mode").FoldMode;
-
-var FoldMode = exports.FoldMode = function(markers) {
-    this.foldingStartMarker = new RegExp("(?:([\\[{])|(" + markers + "))(?:\\s*)(?:#.*)?$");
-};
-oop.inherits(FoldMode, BaseFoldMode);
-
-(function() {
-
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        var line = session.getLine(row);
-        var match = line.match(this.foldingStartMarker);
-        if (match) {
-            if (match[1])
-                return this.openingBracketBlock(session, match[1], row, match.index);
-            if (match[2])
-                return this.indentationBlock(session, row, match.index + match[2].length);
-            return this.indentationBlock(session, row);
-        }
-    }
-
-}).call(FoldMode.prototype);
-
-});/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/folding/fold_mode', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../../range").Range;
-
-var FoldMode = exports.FoldMode = function() {};
-
-(function() {
-
-    this.foldingStartMarker = null;
-    this.foldingStopMarker = null;
-
-    // must return "" if there's no fold, to enable caching
-    this.getFoldWidget = function(session, foldStyle, row) {
-        var line = session.getLine(row);
-        if (this.foldingStartMarker.test(line))
-            return "start";
-        if (foldStyle == "markbeginend"
-                && this.foldingStopMarker
-                && this.foldingStopMarker.test(line))
-            return "end";
-        return "";
-    };
-    
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        return null;
-    };
-
-    this.indentationBlock = function(session, row, column) {
-        var re = /^\s*/;
-        var startRow = row;
-        var endRow = row;
-        var line = session.getLine(row);
-        var startColumn = column || line.length;
-        var startLevel = line.match(re)[0].length;
-        var maxRow = session.getLength()
-        
-        while (++row < maxRow) {
-            line = session.getLine(row);
-            var level = line.match(re)[0].length;
-
-            if (level == line.length)
-                continue;
-
-            if (level <= startLevel)
-                break;
-
-            endRow = row;
-        }
-
-        if (endRow > startRow) {
-            var endColumn = session.getLine(endRow).length;
-            return new Range(startRow, startColumn, endRow, endColumn);
-        }
-    };
-
-    this.openingBracketBlock = function(session, bracket, row, column) {
-        var start = {row: row, column: column + 1};
-        var end = session.$findClosingBracket(bracket, start);
-        if (!end)
-            return;
-
-        var fw = session.foldWidgets[end.row];
-        if (fw == null)
-            fw = this.getFoldWidget(session, end.row);
-
-        if (fw == "start") {
-            end.row --;
-            end.column = session.getLine(end.row).length;
-        }
-        return Range.fromPoints(start, end);
-    };
-
-}).call(FoldMode.prototype);
-
-});
diff --git a/apps/files_texteditor/js/aceeditor/mode-coffee.js b/apps/files_texteditor/js/aceeditor/mode-coffee.js
deleted file mode 100644
index f8a9d63788..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-coffee.js
+++ /dev/null
@@ -1 +0,0 @@
-define("ace/mode/coffee",["require","exports","module","ace/tokenizer","ace/mode/coffee_highlight_rules","ace/mode/matching_brace_outdent","ace/mode/folding/pythonic","ace/range","ace/mode/text","ace/worker/worker_client","ace/lib/oop"],function(a,b,c){function l(){this.$tokenizer=new d((new e).getRules()),this.$outdent=new f,this.foldingRules=new g("=|=>|->|\\s*class [^#]*")}"use strict";var d=a("../tokenizer").Tokenizer,e=a("./coffee_highlight_rules").CoffeeHighlightRules,f=a("./matching_brace_outdent").MatchingBraceOutdent,g=a("./folding/pythonic").FoldMode,h=a("../range").Range,i=a("./text").Mode,j=a("../worker/worker_client").WorkerClient,k=a("../lib/oop");k.inherits(l,i),function(){var a=/(?:[({[=:]|[-=]>|\b(?:else|switch|try|catch(?:\s*[$A-Za-z_\x7f-\uffff][$\w\x7f-\uffff]*)?|finally))\s*$/,b=/^(\s*)#/,c=/^\s*###(?!#)/,d=/^\s*/;this.getNextLineIndent=function(b,c,d){var e=this.$getIndent(c),f=this.$tokenizer.getLineTokens(c,b).tokens;return(!f.length||f[f.length-1].type!=="comment")&&b==="start"&&a.test(c)&&(e+=d),e},this.toggleCommentLines=function(a,e,f,g){console.log("toggle");var i=new h(0,0,0,0);for(var j=f;j<=g;++j){var k=e.getLine(j);if(c.test(k))continue;b.test(k)?k=k.replace(b,"$1"):k=k.replace(d,"$&#"),i.end.row=i.start.row=j,i.end.column=k.length+1,e.replace(i,k)}},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)},this.createWorker=function(a){var b=new j(["ace"],"worker-coffee.js","ace/mode/coffee_worker","Worker");return b.attachToDocument(a.getDocument()),b.on("error",function(b){a.setAnnotations([b.data])}),b.on("ok",function(b){a.clearAnnotations()}),b}}.call(l.prototype),b.Mode=l}),define("ace/mode/coffee_highlight_rules",["require","exports","module","ace/lib/lang","ace/lib/oop","ace/mode/text_highlight_rules"],function(a,b,c){function g(){var a="[$A-Za-z_\\x7f-\\uffff][$\\w\\x7f-\\uffff]*",b={token:"string",merge:!0,regex:".+"},c=d.arrayToMap("this|throw|then|try|typeof|super|switch|return|break|by)|continue|catch|class|in|instanceof|is|isnt|if|else|extends|for|forown|finally|function|while|when|new|no|not|delete|debugger|do|loop|of|off|or|on|unless|until|and|yes".split("|")),e=d.arrayToMap("true|false|null|undefined".split("|")),f=d.arrayToMap("case|const|default|function|var|void|with|enum|export|implements|interface|let|package|private|protected|public|static|yield|__hasProp|extends|slice|bind|indexOf".split("|")),g=d.arrayToMap("Array|Boolean|Date|Function|Number|Object|RegExp|ReferenceError|RangeError|String|SyntaxError|Error|EvalError|TypeError|URIError".split("|")),h=d.arrayToMap("Math|JSON|isNaN|isFinite|parseInt|parseFloat|encodeURI|encodeURIComponent|decodeURI|decodeURIComponent|RangeError|String|SyntaxError|Error|EvalError|TypeError|URIError".split("|"));this.$rules={start:[{token:"identifier",regex:"(?:(?:\\.|::)\\s*)"+a},{token:"variable",regex:"@(?:"+a+")?"},{token:function(a){return c.hasOwnProperty(a)?"keyword":e.hasOwnProperty(a)?"constant.language":f.hasOwnProperty(a)?"invalid.illegal":g.hasOwnProperty(a)?"language.support.class":h.hasOwnProperty(a)?"language.support.function":"identifier"},regex:a},{token:"constant.numeric",regex:"(?:0x[\\da-fA-F]+|(?:\\d+(?:\\.\\d+)?|\\.\\d+)(?:[eE][+-]?\\d+)?)"},{token:"string",merge:!0,regex:"'''",next:"qdoc"},{token:"string",merge:!0,regex:'"""',next:"qqdoc"},{token:"string",merge:!0,regex:"'",next:"qstring"},{token:"string",merge:!0,regex:'"',next:"qqstring"},{token:"string",merge:!0,regex:"`",next:"js"},{token:"string.regex",merge:!0,regex:"///",next:"heregex"},{token:"string.regex",regex:"/(?!\\s)[^[/\\n\\\\]*(?: (?:\\\\.|\\[[^\\]\\n\\\\]*(?:\\\\.[^\\]\\n\\\\]*)*\\])[^[/\\n\\\\]*)*/[imgy]{0,4}(?!\\w)"},{token:"comment",merge:!0,regex:"###(?!#)",next:"comment"},{token:"comment",regex:"#.*"},{token:"punctuation.operator",regex:"\\?|\\:|\\,|\\."},{token:"keyword.operator",regex:"(?:[\\-=]>|[-+*/%<>&|^!?=]=|>>>=?|\\-\\-|\\+\\+|::|&&=|\\|\\|=|<<=|>>=|\\?\\.|\\.{2,3}|\\!)"},{token:"paren.lparen",regex:"[({[]"},{token:"paren.rparen",regex:"[\\]})]"},{token:"text",regex:"\\s+"}],qdoc:[{token:"string",regex:".*?'''",next:"start"},b],qqdoc:[{token:"string",regex:'.*?"""',next:"start"},b],qstring:[{token:"string",regex:"[^\\\\']*(?:\\\\.[^\\\\']*)*'",merge:!0,next:"start"},b],qqstring:[{token:"string",regex:'[^\\\\"]*(?:\\\\.[^\\\\"]*)*"',merge:!0,next:"start"},b],js:[{token:"string",merge:!0,regex:"[^\\\\`]*(?:\\\\.[^\\\\`]*)*`",next:"start"},b],heregex:[{token:"string.regex",regex:".*?///[imgy]{0,4}",next:"start"},{token:"comment.regex",regex:"\\s+(?:#.*)?"},{token:"string.regex",merge:!0,regex:"\\S+"}],comment:[{token:"comment",regex:".*?###",next:"start"},{token:"comment",merge:!0,regex:".+"}]}}"use strict";var d=a("../lib/lang"),e=a("../lib/oop"),f=a("./text_highlight_rules").TextHighlightRules;e.inherits(g,f),b.CoffeeHighlightRules=g}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../range").Range,e=function(){};(function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}}).call(e.prototype),b.MatchingBraceOutdent=e}),define("ace/mode/folding/pythonic",["require","exports","module","ace/lib/oop","ace/mode/folding/fold_mode"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("./fold_mode").FoldMode,f=b.FoldMode=function(a){this.foldingStartMarker=new RegExp("(?:([\\[{])|("+a+"))(?:\\s*)(?:#.*)?$")};d.inherits(f,e),function(){this.getFoldWidgetRange=function(a,b,c){var d=a.getLine(c),e=d.match(this.foldingStartMarker);if(e)return e[1]?this.openingBracketBlock(a,e[1],c,e.index):e[2]?this.indentationBlock(a,c,e.index+e[2].length):this.indentationBlock(a,c)}}.call(f.prototype)}),define("ace/mode/folding/fold_mode",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../../range").Range,e=b.FoldMode=function(){};(function(){this.foldingStartMarker=null,this.foldingStopMarker=null,this.getFoldWidget=function(a,b,c){var d=a.getLine(c);return this.foldingStartMarker.test(d)?"start":b=="markbeginend"&&this.foldingStopMarker&&this.foldingStopMarker.test(d)?"end":""},this.getFoldWidgetRange=function(a,b,c){return null},this.indentationBlock=function(a,b,c){var e=/^\s*/,f=b,g=b,h=a.getLine(b),i=c||h.length,j=h.match(e)[0].length,k=a.getLength();while(++b<k){h=a.getLine(b);var l=h.match(e)[0].length;if(l==h.length)continue;if(l<=j)break;g=b}if(g>f){var m=a.getLine(g).length;return new d(f,i,g,m)}},this.openingBracketBlock=function(a,b,c,e){var f={row:c,column:e+1},g=a.$findClosingBracket(b,f);if(!g)return;var h=a.foldWidgets[g.row];return h==null&&(h=this.getFoldWidget(a,g.row)),h=="start"&&(g.row--,g.column=a.getLine(g.row).length),d.fromPoints(f,g)}}).call(e.prototype)})
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-coldfusion-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-coldfusion-uncompressed.js
deleted file mode 100644
index af5e3914b5..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-coldfusion-uncompressed.js
+++ /dev/null
@@ -1,2433 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/coldfusion', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/xml', 'ace/mode/javascript', 'ace/mode/css', 'ace/tokenizer', 'ace/mode/coldfusion_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var XmlMode = require("./xml").Mode;
-var JavaScriptMode = require("./javascript").Mode;
-var CssMode = require("./css").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
-var ColdfusionHighlightRules = require("./coldfusion_highlight_rules").ColdfusionHighlightRules;
-
-var Mode = function() {
-    XmlMode.call(this);
-    
-    var highlighter = new ColdfusionHighlightRules();
-    this.$tokenizer = new Tokenizer(highlighter.getRules());
-    
-    this.$embeds = highlighter.getEmbeds();
-    this.createModeDelegates({
-      "js-": JavaScriptMode,
-      "css-": CssMode
-    });
-};
-oop.inherits(Mode, XmlMode);
-
-(function() {
-
-    this.getNextLineIndent = function(state, line, tab) {
-        return this.$getIndent(line);
-    };
-
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/xml', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/xml_highlight_rules', 'ace/mode/behaviour/xml', 'ace/mode/folding/xml'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
-var XmlHighlightRules = require("./xml_highlight_rules").XmlHighlightRules;
-var XmlBehaviour = require("./behaviour/xml").XmlBehaviour;
-var XmlFoldMode = require("./folding/xml").FoldMode;
-
-var Mode = function() {
-    this.$tokenizer = new Tokenizer(new XmlHighlightRules().getRules());
-    this.$behaviour = new XmlBehaviour();
-    this.foldingRules = new XmlFoldMode();
-};
-
-oop.inherits(Mode, TextMode);
-
-(function() {
-    
-    this.getNextLineIndent = function(state, line, tab) {
-        return this.$getIndent(line);
-    };
-
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/xml_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/xml_util', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var xmlUtil = require("./xml_util");
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var XmlHighlightRules = function() {
-
-    // regexp must not have capturing parentheses
-    // regexps are ordered -> the first match is used
-    this.$rules = {
-        start : [{
-            token : "text",
-            regex : "<\\!\\[CDATA\\[",
-            next : "cdata"
-        }, {
-            token : "xml_pe",
-            regex : "<\\?.*?\\?>"
-        }, {
-            token : "comment",
-            merge : true,
-            regex : "<\\!--",
-            next : "comment"
-        }, {
-            token : "xml_pe",
-            regex : "<\\!.*?>"
-        }, {
-            token : "meta.tag", // opening tag
-            regex : "<\\/?",
-            next : "tag"
-        }, {
-            token : "text",
-            regex : "\\s+"
-        }, {
-            token : "constant.character.entity",
-            regex : "(?:&#[0-9]+;)|(?:&#x[0-9a-fA-F]+;)|(?:&[a-zA-Z0-9_:\\.-]+;)"
-        }, {
-            token : "text",
-            regex : "[^<]+"
-        }],
-        
-        cdata : [{
-            token : "text",
-            regex : "\\]\\]>",
-            next : "start"
-        }, {
-            token : "text",
-            regex : "\\s+"
-        }, {
-            token : "text",
-            regex : "(?:[^\\]]|\\](?!\\]>))+"
-        }],
-
-        comment : [{
-            token : "comment",
-            regex : ".*?-->",
-            next : "start"
-        }, {
-            token : "comment",
-            merge : true,
-            regex : ".+"
-        }]
-    };
-    
-    xmlUtil.tag(this.$rules, "tag", "start");
-};
-
-oop.inherits(XmlHighlightRules, TextHighlightRules);
-
-exports.XmlHighlightRules = XmlHighlightRules;
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/xml_util', ['require', 'exports', 'module' , 'ace/lib/lang'], function(require, exports, module) {
-"use strict";
-
-var lang = require("../lib/lang");
-
-var formTags = lang.arrayToMap(
-    ("button|form|input|label|select|textarea").split("|")
-);
-
-var tableTags = lang.arrayToMap(
-    ("table|tbody|td|tfoot|th|tr").split("|")
-);
-
-function string(state) {
-    return [{
-        token : "string",
-        regex : '".*?"'
-    }, {
-        token : "string", // multi line string start
-        merge : true,
-        regex : '["].*',
-        next : state + "_qqstring"
-    }, {
-        token : "string",
-        regex : "'.*?'"
-    }, {
-        token : "string", // multi line string start
-        merge : true,
-        regex : "['].*",
-        next : state + "_qstring"
-    }];
-}
-
-function multiLineString(quote, state) {
-    return [{
-        token : "string",
-        merge : true,
-        regex : ".*?" + quote,
-        next : state
-    }, {
-        token : "string",
-        merge : true,
-        regex : '.+'
-    }];
-}
-
-exports.tag = function(states, name, nextState) {
-    states[name] = [{
-        token : "text",
-        regex : "\\s+"
-    }, {
-        //token : "meta.tag",
-        
-    token : function(value) {
-            if ( value==='a' ) {
-                return "meta.tag.anchor";
-            }
-            else if ( value==='img' ) {
-                return "meta.tag.image";
-            }
-            else if ( value==='script' ) {
-                return "meta.tag.script";
-            }
-            else if ( value==='style' ) {
-                return "meta.tag.style";
-            }
-            else if (formTags.hasOwnProperty(value.toLowerCase())) {
-                return "meta.tag.form";
-            }
-            else if (tableTags.hasOwnProperty(value.toLowerCase())) {
-                return "meta.tag.table";
-            }
-            else {
-                return "meta.tag";
-            }
-        },        
-        merge : true,
-        regex : "[-_a-zA-Z0-9:]+",
-        next : name + "_embed_attribute_list" 
-    }, {
-        token: "empty",
-        regex: "",
-        next : name + "_embed_attribute_list"
-    }];
-
-    states[name + "_qstring"] = multiLineString("'", name + "_embed_attribute_list");
-    states[name + "_qqstring"] = multiLineString("\"", name + "_embed_attribute_list");
-    
-    states[name + "_embed_attribute_list"] = [{
-        token : "meta.tag",
-        merge : true,
-        regex : "\/?>",
-        next : nextState
-    }, {
-        token : "keyword.operator",
-        regex : "="
-    }, {
-        token : "entity.other.attribute-name",
-        regex : "[-_a-zA-Z0-9:]+"
-    }, {
-        token : "constant.numeric", // float
-        regex : "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"
-    }, {
-        token : "text",
-        regex : "\\s+"
-    }].concat(string(name));
-};
-
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Chris Spencer <chris.ag.spencer AT googlemail DOT com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/behaviour/xml', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/behaviour', 'ace/mode/behaviour/cstyle'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var Behaviour = require("../behaviour").Behaviour;
-var CstyleBehaviour = require("./cstyle").CstyleBehaviour;
-
-var XmlBehaviour = function () {
-    
-    this.inherit(CstyleBehaviour, ["string_dquotes"]); // Get string behaviour
-    
-    this.add("brackets", "insertion", function (state, action, editor, session, text) {
-        if (text == '<') {
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return false;
-            } else {
-                return {
-                    text: '<>',
-                    selection: [1, 1]
-                }
-            }
-        } else if (text == '>') {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == '>') { // need some kind of matching check here
-                return {
-                    text: '',
-                    selection: [1, 1]
-                }
-            }
-        } else if (text == "\n") {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChars = line.substring(cursor.column, cursor.column + 2);
-            if (rightChars == '</') {
-                var indent = this.$getIndent(session.doc.getLine(cursor.row)) + session.getTabString();
-                var next_indent = this.$getIndent(session.doc.getLine(cursor.row));
-
-                return {
-                    text: '\n' + indent + '\n' + next_indent,
-                    selection: [1, indent.length, 1, indent.length]
-                }
-            }
-        }
-    });
-    
-}
-oop.inherits(XmlBehaviour, Behaviour);
-
-exports.XmlBehaviour = XmlBehaviour;
-});/* vim:ts=4:sts=4:sw=4:
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Chris Spencer <chris.ag.spencer AT googlemail DOT com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/behaviour/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/behaviour'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var Behaviour = require('../behaviour').Behaviour;
-
-var CstyleBehaviour = function () {
-
-    this.add("braces", "insertion", function (state, action, editor, session, text) {
-        if (text == '{') {
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: '{' + selected + '}',
-                    selection: false
-                };
-            } else {
-                return {
-                    text: '{}',
-                    selection: [1, 1]
-                };
-            }
-        } else if (text == '}') {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == '}') {
-                var matching = session.$findOpeningBracket('}', {column: cursor.column + 1, row: cursor.row});
-                if (matching !== null) {
-                    return {
-                        text: '',
-                        selection: [1, 1]
-                    };
-                }
-            }
-        } else if (text == "\n") {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == '}') {
-                var openBracePos = session.findMatchingBracket({row: cursor.row, column: cursor.column + 1});
-                if (!openBracePos)
-                     return null;
-
-                var indent = this.getNextLineIndent(state, line.substring(0, line.length - 1), session.getTabString());
-                var next_indent = this.$getIndent(session.doc.getLine(openBracePos.row));
-
-                return {
-                    text: '\n' + indent + '\n' + next_indent,
-                    selection: [1, indent.length, 1, indent.length]
-                };
-            }
-        }
-    });
-
-    this.add("braces", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && selected == '{') {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.end.column, range.end.column + 1);
-            if (rightChar == '}') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-    this.add("parens", "insertion", function (state, action, editor, session, text) {
-        if (text == '(') {
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: '(' + selected + ')',
-                    selection: false
-                };
-            } else {
-                return {
-                    text: '()',
-                    selection: [1, 1]
-                };
-            }
-        } else if (text == ')') {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == ')') {
-                var matching = session.$findOpeningBracket(')', {column: cursor.column + 1, row: cursor.row});
-                if (matching !== null) {
-                    return {
-                        text: '',
-                        selection: [1, 1]
-                    };
-                }
-            }
-        }
-    });
-
-    this.add("parens", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && selected == '(') {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
-            if (rightChar == ')') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-    this.add("string_dquotes", "insertion", function (state, action, editor, session, text) {
-        if (text == '"' || text == "'") {
-            var quote = text;
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: quote + selected + quote,
-                    selection: false
-                };
-            } else {
-                var cursor = editor.getCursorPosition();
-                var line = session.doc.getLine(cursor.row);
-                var leftChar = line.substring(cursor.column-1, cursor.column);
-
-                // We're escaped.
-                if (leftChar == '\\') {
-                    return null;
-                }
-
-                // Find what token we're inside.
-                var tokens = session.getTokens(selection.start.row, selection.start.row)[0].tokens;
-                var col = 0, token;
-                var quotepos = -1; // Track whether we're inside an open quote.
-
-                for (var x = 0; x < tokens.length; x++) {
-                    token = tokens[x];
-                    if (token.type == "string") {
-                      quotepos = -1;
-                    } else if (quotepos < 0) {
-                      quotepos = token.value.indexOf(quote);
-                    }
-                    if ((token.value.length + col) > selection.start.column) {
-                        break;
-                    }
-                    col += tokens[x].value.length;
-                }
-
-                // Try and be smart about when we auto insert.
-                if (!token || (quotepos < 0 && token.type !== "comment" && (token.type !== "string" || ((selection.start.column !== token.value.length+col-1) && token.value.lastIndexOf(quote) === token.value.length-1)))) {
-                    return {
-                        text: quote + quote,
-                        selection: [1,1]
-                    };
-                } else if (token && token.type === "string") {
-                    // Ignore input and move right one if we're typing over the closing quote.
-                    var rightChar = line.substring(cursor.column, cursor.column + 1);
-                    if (rightChar == quote) {
-                        return {
-                            text: '',
-                            selection: [1, 1]
-                        };
-                    }
-                }
-            }
-        }
-    });
-
-    this.add("string_dquotes", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && (selected == '"' || selected == "'")) {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
-            if (rightChar == '"') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-};
-
-oop.inherits(CstyleBehaviour, Behaviour);
-
-exports.CstyleBehaviour = CstyleBehaviour;
-});/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/folding/xml', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/range', 'ace/mode/folding/fold_mode', 'ace/token_iterator'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var lang = require("../../lib/lang");
-var Range = require("../../range").Range;
-var BaseFoldMode = require("./fold_mode").FoldMode;
-var TokenIterator = require("../../token_iterator").TokenIterator;
-
-var FoldMode = exports.FoldMode = function(voidElements) {
-    BaseFoldMode.call(this);
-    this.voidElements = voidElements || {};
-};
-oop.inherits(FoldMode, BaseFoldMode);
-
-(function() {
-
-    this.getFoldWidget = function(session, foldStyle, row) {
-        var tag = this._getFirstTagInLine(session, row);
-
-        if (tag.closing)
-            return foldStyle == "markbeginend" ? "end" : "";
-
-        if (!tag.tagName || this.voidElements[tag.tagName.toLowerCase()])
-            return "";
-
-        if (tag.selfClosing)
-            return "";
-
-        if (tag.value.indexOf("/" + tag.tagName) !== -1)
-            return "";
-
-        return "start";
-    };
-    
-    this._getFirstTagInLine = function(session, row) {
-        var tokens = session.getTokens(row, row)[0].tokens;
-        var value = "";
-        for (var i = 0; i < tokens.length; i++) {
-            var token = tokens[i];
-            if (token.type.indexOf("meta.tag") === 0)
-                value += token.value;
-            else
-                value += lang.stringRepeat(" ", token.value.length);
-        }
-        
-        return this._parseTag(value);
-    };
-
-    this.tagRe = /^(\s*)(<?(\/?)([-_a-zA-Z0-9:!]*)\s*(\/?)>?)/;
-    this._parseTag = function(tag) {
-        
-        var match = this.tagRe.exec(tag);
-        var column = this.tagRe.lastIndex || 0;
-        this.tagRe.lastIndex = 0;
-
-        return {
-            value: tag,
-            match: match ? match[2] : "",
-            closing: match ? !!match[3] : false,
-            selfClosing: match ? !!match[5] || match[2] == "/>" : false,
-            tagName: match ? match[4] : "",
-            column: match[1] ? column + match[1].length : column
-        };
-    };
-    
-    /**
-     * reads a full tag and places the iterator after the tag
-     */
-    this._readTagForward = function(iterator) {
-        var token = iterator.getCurrentToken();
-        if (!token)
-            return null;
-            
-        var value = "";
-        var start;
-        
-        do {
-            if (token.type.indexOf("meta.tag") === 0) {
-                if (!start) {
-                    var start = {
-                        row: iterator.getCurrentTokenRow(),
-                        column: iterator.getCurrentTokenColumn()
-                    };
-                }
-                value += token.value;
-                if (value.indexOf(">") !== -1) {
-                    var tag = this._parseTag(value);
-                    tag.start = start;
-                    tag.end = {
-                        row: iterator.getCurrentTokenRow(),
-                        column: iterator.getCurrentTokenColumn() + token.value.length
-                    };
-                    iterator.stepForward();
-                    return tag;
-                }
-            }
-        } while(token = iterator.stepForward());
-        
-        return null;
-    };
-    
-    this._readTagBackward = function(iterator) {
-        var token = iterator.getCurrentToken();
-        if (!token)
-            return null;
-            
-        var value = "";
-        var end;
-
-        do {
-            if (token.type.indexOf("meta.tag") === 0) {
-                if (!end) {
-                    end = {
-                        row: iterator.getCurrentTokenRow(),
-                        column: iterator.getCurrentTokenColumn() + token.value.length
-                    };
-                }
-                value = token.value + value;
-                if (value.indexOf("<") !== -1) {
-                    var tag = this._parseTag(value);
-                    tag.end = end;
-                    tag.start = {
-                        row: iterator.getCurrentTokenRow(),
-                        column: iterator.getCurrentTokenColumn()
-                    };
-                    iterator.stepBackward();
-                    return tag;
-                }
-            }
-        } while(token = iterator.stepBackward());
-        
-        return null;
-    };
-    
-    this._pop = function(stack, tag) {
-        while (stack.length) {
-            
-            var top = stack[stack.length-1];
-            if (!tag || top.tagName == tag.tagName) {
-                return stack.pop();
-            }
-            else if (this.voidElements[tag.tagName]) {
-                return;
-            }
-            else if (this.voidElements[top.tagName]) {
-                stack.pop();
-                continue;
-            } else {
-                return null;
-            }
-        }
-    };
-    
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        var firstTag = this._getFirstTagInLine(session, row);
-        
-        if (!firstTag.match)
-            return null;
-        
-        var isBackward = firstTag.closing || firstTag.selfClosing;
-        var stack = [];
-        var tag;
-        
-        if (!isBackward) {
-            var iterator = new TokenIterator(session, row, firstTag.column);
-            var start = {
-                row: row,
-                column: firstTag.column + firstTag.tagName.length + 2
-            };
-            while (tag = this._readTagForward(iterator)) {
-                if (tag.selfClosing) {
-                    if (!stack.length) {
-                        tag.start.column += tag.tagName.length + 2;
-                        tag.end.column -= 2;
-                        return Range.fromPoints(tag.start, tag.end);
-                    } else
-                        continue;
-                }
-                
-                if (tag.closing) {
-                    this._pop(stack, tag);
-                    if (stack.length == 0)
-                        return Range.fromPoints(start, tag.start);
-                }
-                else {
-                    stack.push(tag)
-                }
-            }
-        }
-        else {
-            var iterator = new TokenIterator(session, row, firstTag.column + firstTag.match.length);
-            var end = {
-                row: row,
-                column: firstTag.column
-            };
-            
-            while (tag = this._readTagBackward(iterator)) {
-                if (tag.selfClosing) {
-                    if (!stack.length) {
-                        tag.start.column += tag.tagName.length + 2;
-                        tag.end.column -= 2;
-                        return Range.fromPoints(tag.start, tag.end);
-                    } else
-                        continue;
-                }
-                
-                if (!tag.closing) {
-                    this._pop(stack, tag);
-                    if (stack.length == 0) {
-                        tag.start.column += tag.tagName.length + 2;
-                        return Range.fromPoints(tag.start, end);
-                    }
-                }
-                else {
-                    stack.push(tag)
-                }
-            }
-        }
-        
-    };
-
-}).call(FoldMode.prototype);
-
-});/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/folding/fold_mode', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../../range").Range;
-
-var FoldMode = exports.FoldMode = function() {};
-
-(function() {
-
-    this.foldingStartMarker = null;
-    this.foldingStopMarker = null;
-
-    // must return "" if there's no fold, to enable caching
-    this.getFoldWidget = function(session, foldStyle, row) {
-        var line = session.getLine(row);
-        if (this.foldingStartMarker.test(line))
-            return "start";
-        if (foldStyle == "markbeginend"
-                && this.foldingStopMarker
-                && this.foldingStopMarker.test(line))
-            return "end";
-        return "";
-    };
-    
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        return null;
-    };
-
-    this.indentationBlock = function(session, row, column) {
-        var re = /^\s*/;
-        var startRow = row;
-        var endRow = row;
-        var line = session.getLine(row);
-        var startColumn = column || line.length;
-        var startLevel = line.match(re)[0].length;
-        var maxRow = session.getLength()
-        
-        while (++row < maxRow) {
-            line = session.getLine(row);
-            var level = line.match(re)[0].length;
-
-            if (level == line.length)
-                continue;
-
-            if (level <= startLevel)
-                break;
-
-            endRow = row;
-        }
-
-        if (endRow > startRow) {
-            var endColumn = session.getLine(endRow).length;
-            return new Range(startRow, startColumn, endRow, endColumn);
-        }
-    };
-
-    this.openingBracketBlock = function(session, bracket, row, column) {
-        var start = {row: row, column: column + 1};
-        var end = session.$findClosingBracket(bracket, start);
-        if (!end)
-            return;
-
-        var fw = session.foldWidgets[end.row];
-        if (fw == null)
-            fw = this.getFoldWidget(session, end.row);
-
-        if (fw == "start") {
-            end.row --;
-            end.column = session.getLine(end.row).length;
-        }
-        return Range.fromPoints(start, end);
-    };
-
-}).call(FoldMode.prototype);
-
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/javascript', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/javascript_highlight_rules', 'ace/mode/matching_brace_outdent', 'ace/range', 'ace/worker/worker_client', 'ace/mode/behaviour/cstyle', 'ace/mode/folding/cstyle'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
-var JavaScriptHighlightRules = require("./javascript_highlight_rules").JavaScriptHighlightRules;
-var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
-var Range = require("../range").Range;
-var WorkerClient = require("../worker/worker_client").WorkerClient;
-var CstyleBehaviour = require("./behaviour/cstyle").CstyleBehaviour;
-var CStyleFoldMode = require("./folding/cstyle").FoldMode;
-
-var Mode = function() {
-    this.$tokenizer = new Tokenizer(new JavaScriptHighlightRules().getRules());
-    this.$outdent = new MatchingBraceOutdent();
-    this.$behaviour = new CstyleBehaviour();
-    this.foldingRules = new CStyleFoldMode();
-};
-oop.inherits(Mode, TextMode);
-
-(function() {
-
-
-    this.toggleCommentLines = function(state, doc, startRow, endRow) {
-        var outdent = true;
-        var re = /^(\s*)\/\//;
-
-        for (var i=startRow; i<= endRow; i++) {
-            if (!re.test(doc.getLine(i))) {
-                outdent = false;
-                break;
-            }
-        }
-
-        if (outdent) {
-            var deleteRange = new Range(0, 0, 0, 0);
-            for (var i=startRow; i<= endRow; i++)
-            {
-                var line = doc.getLine(i);
-                var m = line.match(re);
-                deleteRange.start.row = i;
-                deleteRange.end.row = i;
-                deleteRange.end.column = m[0].length;
-                doc.replace(deleteRange, m[1]);
-            }
-        }
-        else {
-            doc.indentRows(startRow, endRow, "//");
-        }
-    };
-
-    this.getNextLineIndent = function(state, line, tab) {
-        var indent = this.$getIndent(line);
-
-        var tokenizedLine = this.$tokenizer.getLineTokens(line, state);
-        var tokens = tokenizedLine.tokens;
-        var endState = tokenizedLine.state;
-
-        if (tokens.length && tokens[tokens.length-1].type == "comment") {
-            return indent;
-        }
-        
-        if (state == "start" || state == "regex_allowed") {
-            var match = line.match(/^.*(?:\bcase\b.*\:|[\{\(\[])\s*$/);
-            if (match) {
-                indent += tab;
-            }
-        } else if (state == "doc-start") {
-            if (endState == "start" || state == "regex_allowed") {
-                return "";
-            }
-            var match = line.match(/^\s*(\/?)\*/);
-            if (match) {
-                if (match[1]) {
-                    indent += " ";
-                }
-                indent += "* ";
-            }
-        }
-
-        return indent;
-    };
-
-    this.checkOutdent = function(state, line, input) {
-        return this.$outdent.checkOutdent(line, input);
-    };
-
-    this.autoOutdent = function(state, doc, row) {
-        this.$outdent.autoOutdent(doc, row);
-    };
-    
-    this.createWorker = function(session) {
-        var worker = new WorkerClient(["ace"], "worker-javascript.js", "ace/mode/javascript_worker", "JavaScriptWorker");
-        worker.attachToDocument(session.getDocument());
-            
-        worker.on("jslint", function(results) {
-            var errors = [];
-            for (var i=0; i<results.data.length; i++) {
-                var error = results.data[i];
-                if (error)
-                    errors.push({
-                        row: error.line-1,
-                        column: error.character-1,
-                        text: error.reason,
-                        type: "warning",
-                        lint: error
-                    });
-            }
-            session.setAnnotations(errors);
-        });
-        
-        worker.on("narcissus", function(e) {
-            session.setAnnotations([e.data]);
-        });
-        
-        worker.on("terminate", function() {
-            session.clearAnnotations();
-        });
-        
-        return worker;
-    };
-
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Mihai Sucan <mihai DOT sucan AT gmail DOT com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/javascript_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/unicode', 'ace/mode/doc_comment_highlight_rules', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var lang = require("../lib/lang");
-var unicode = require("../unicode");
-var DocCommentHighlightRules = require("./doc_comment_highlight_rules").DocCommentHighlightRules;
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var JavaScriptHighlightRules = function() {
-
-    // see: https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects
-    var globals = lang.arrayToMap(
-      // Constructors
-        ("Array|Boolean|Date|Function|Iterator|Number|Object|RegExp|String|Proxy|" +
-      // E4X
-         "Namespace|QName|XML|XMLList|" +
-         "ArrayBuffer|Float32Array|Float64Array|Int16Array|Int32Array|Int8Array|" +
-         "Uint16Array|Uint32Array|Uint8Array|Uint8ClampedArray|" +
-      // Errors
-        "Error|EvalError|InternalError|RangeError|ReferenceError|StopIteration|" +
-        "SyntaxError|TypeError|URIError|" +
-      //  Non-constructor functions
-        "decodeURI|decodeURIComponent|encodeURI|encodeURIComponent|eval|isFinite|" +
-        "isNaN|parseFloat|parseInt|" +
-      // Other
-        "JSON|Math|" +
-      // Pseudo
-        "this|arguments|prototype|window|document"
-      ).split("|")
-    );
-
-    var keywords = lang.arrayToMap(
-        ("break|case|catch|continue|default|delete|do|else|finally|for|function|" +
-        "if|in|instanceof|new|return|switch|throw|try|typeof|let|var|while|with|" +
-        "const|yield|import|get|set").split("|")
-    );
-
-    // keywords which can be followed by regular expressions
-    var kwBeforeRe = "case|do|else|finally|in|instanceof|return|throw|try|typeof|yield";
-
-    var deprecated = lang.arrayToMap(
-        ("__parent__|__count__|escape|unescape|with|__proto__").split("|")
-    );
-
-    var definitions = lang.arrayToMap(("const|let|var|function").split("|"));
-
-    var buildinConstants = lang.arrayToMap(
-        ("null|Infinity|NaN|undefined").split("|")
-    );
-
-    var futureReserved = lang.arrayToMap(
-        ("class|enum|extends|super|export|implements|private|" +
-        "public|interface|package|protected|static").split("|")
-    );
-
-    // TODO: Unicode escape sequences
-    var identifierRe = "[" + unicode.packages.L + "\\$_]["
-        + unicode.packages.L
-        + unicode.packages.Mn + unicode.packages.Mc
-        + unicode.packages.Nd
-        + unicode.packages.Pc + "\\$_]*\\b";
-
-    var escapedRe = "\\\\(?:x[0-9a-fA-F]{2}|" + // hex
-        "u[0-9a-fA-F]{4}|" + // unicode
-        "[0-2][0-7]{0,2}|" + // oct
-        "3[0-6][0-7]?|" + // oct
-        "37[0-7]?|" + // oct
-        "[4-7][0-7]?|" + //oct
-        ".)";
-
-    // regexp must not have capturing parentheses. Use (?:) instead.
-    // regexps are ordered -> the first match is used
-
-    this.$rules = {
-        "start" : [
-            {
-                token : "comment",
-                regex : /\/\/.*$/
-            },
-            new DocCommentHighlightRules().getStartRule("doc-start"),
-            {
-                token : "comment", // multi line comment
-                merge : true,
-                regex : /\/\*/,
-                next : "comment"
-            }, {
-                token : "string",
-                regex : "'",
-                next  : "qstring"
-            }, {
-                token : "string",
-                regex : '"',
-                next  : "qqstring"
-            }, {
-                token : "constant.numeric", // hex
-                regex : /0[xX][0-9a-fA-F]+\b/
-            }, {
-                token : "constant.numeric", // float
-                regex : /[+-]?\d+(?:(?:\.\d*)?(?:[eE][+-]?\d+)?)?\b/
-            }, { // match stuff like: Sound.prototype.play = function() { }
-                token : [
-                    "storage.type",
-                    "punctuation.operator",
-                    "support.function",
-                    "punctuation.operator",
-                    "entity.name.function",
-                    "text",
-                    "keyword.operator",
-                    "text",
-                    "storage.type",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(" + identifierRe + ")(\\.)(prototype)(\\.)(" + identifierRe +")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"
-            }, { // match stuff like: Sound.prototype.play = myfunc
-                token : [
-                    "storage.type",
-                    "punctuation.operator",
-                    "support.function",
-                    "punctuation.operator",
-                    "entity.name.function",
-                    "text",
-                    "keyword.operator",
-                    "text"
-                ],
-                regex : "(" + identifierRe + ")(\\.)(prototype)(\\.)(" + identifierRe +")(\\s*)(=)(\\s*)"
-            }, { // match stuff like: Sound.play = function() {  }
-                token : [
-                    "storage.type",
-                    "punctuation.operator",
-                    "entity.name.function",
-                    "text",
-                    "keyword.operator",
-                    "text",
-                    "storage.type",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(" + identifierRe + ")(\\.)(" + identifierRe +")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"
-            }, { // match stuff like: play = function() {  }
-                token : [
-                    "entity.name.function",
-                    "text",
-                    "keyword.operator",
-                    "text",
-                    "storage.type",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(" + identifierRe +")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"
-            }, { // match regular function like: function myFunc(arg) { }
-                token : [
-                    "storage.type",
-                    "text",
-                    "entity.name.function",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(function)(\\s+)(" + identifierRe + ")(\\s*)(\\()(.*?)(\\))"
-            }, { // match stuff like: foobar: function() { }
-                token : [
-                    "entity.name.function",
-                    "text",
-                    "punctuation.operator",
-                    "text",
-                    "storage.type",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(" + identifierRe + ")(\\s*)(:)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"
-            }, { // Attempt to match : function() { } (this is for issues with 'foo': function() { })
-                token : [
-                    "text",
-                    "text",
-                    "storage.type",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(:)(\\s*)(function)?(\\s*)(\\()([^)]*)(\\))"
-            }, {
-                token : "constant.language.boolean",
-                regex : /(?:true|false)\b/
-            }, {
-                token : "keyword",
-                regex : "(?:" + kwBeforeRe + ")\\b",
-                next : "regex_allowed"
-            }, {
-                token : ["punctuation.operator", "support.function"],
-                regex : /(\.)(s(?:h(?:ift|ow(?:Mod(?:elessDialog|alDialog)|Help))|croll(?:X|By(?:Pages|Lines)?|Y|To)?|t(?:opzzzz|rike)|i(?:n|zeToContent|debar|gnText)|ort|u(?:p|b(?:str(?:ing)?)?)|pli(?:ce|t)|e(?:nd|t(?:Re(?:sizable|questHeader)|M(?:i(?:nutes|lliseconds)|onth)|Seconds|Ho(?:tKeys|urs)|Year|Cursor|Time(?:out)?|Interval|ZOptions|Date|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Date|FullYear)|FullYear|Active)|arch)|qrt|lice|avePreferences|mall)|h(?:ome|andleEvent)|navigate|c(?:har(?:CodeAt|At)|o(?:s|n(?:cat|textual|firm)|mpile)|eil|lear(?:Timeout|Interval)?|a(?:ptureEvents|ll)|reate(?:StyleSheet|Popup|EventObject))|t(?:o(?:GMTString|S(?:tring|ource)|U(?:TCString|pperCase)|Lo(?:caleString|werCase))|est|a(?:n|int(?:Enabled)?))|i(?:s(?:NaN|Finite)|ndexOf|talics)|d(?:isableExternalCapture|ump|etachEvent)|u(?:n(?:shift|taint|escape|watch)|pdateCommands)|j(?:oin|avaEnabled)|p(?:o(?:p|w)|ush|lugins.refresh|a(?:ddings|rse(?:Int|Float)?)|r(?:int|ompt|eference))|e(?:scape|nableExternalCapture|val|lementFromPoint|x(?:p|ec(?:Script|Command)?))|valueOf|UTC|queryCommand(?:State|Indeterm|Enabled|Value)|f(?:i(?:nd|le(?:ModifiedDate|Size|CreatedDate|UpdatedDate)|xed)|o(?:nt(?:size|color)|rward)|loor|romCharCode)|watch|l(?:ink|o(?:ad|g)|astIndexOf)|a(?:sin|nchor|cos|t(?:tachEvent|ob|an(?:2)?)|pply|lert|b(?:s|ort))|r(?:ou(?:nd|teEvents)|e(?:size(?:By|To)|calc|turnValue|place|verse|l(?:oad|ease(?:Capture|Events)))|andom)|g(?:o|et(?:ResponseHeader|M(?:i(?:nutes|lliseconds)|onth)|Se(?:conds|lection)|Hours|Year|Time(?:zoneOffset)?|Da(?:y|te)|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Da(?:y|te)|FullYear)|FullYear|A(?:ttention|llResponseHeaders)))|m(?:in|ove(?:B(?:y|elow)|To(?:Absolute)?|Above)|ergeAttributes|a(?:tch|rgins|x))|b(?:toa|ig|o(?:ld|rderWidths)|link|ack))\b(?=\()/
-            }, {
-                token : ["punctuation.operator", "support.function.dom"],
-                regex : /(\.)(s(?:ub(?:stringData|mit)|plitText|e(?:t(?:NamedItem|Attribute(?:Node)?)|lect))|has(?:ChildNodes|Feature)|namedItem|c(?:l(?:ick|o(?:se|neNode))|reate(?:C(?:omment|DATASection|aption)|T(?:Head|extNode|Foot)|DocumentFragment|ProcessingInstruction|E(?:ntityReference|lement)|Attribute))|tabIndex|i(?:nsert(?:Row|Before|Cell|Data)|tem)|open|delete(?:Row|C(?:ell|aption)|T(?:Head|Foot)|Data)|focus|write(?:ln)?|a(?:dd|ppend(?:Child|Data))|re(?:set|place(?:Child|Data)|move(?:NamedItem|Child|Attribute(?:Node)?)?)|get(?:NamedItem|Element(?:sBy(?:Name|TagName)|ById)|Attribute(?:Node)?)|blur)\b(?=\()/
-            }, {
-                token : ["punctuation.operator", "support.constant"],
-                regex : /(\.)(s(?:ystemLanguage|cr(?:ipts|ollbars|een(?:X|Y|Top|Left))|t(?:yle(?:Sheets)?|atus(?:Text|bar)?)|ibling(?:Below|Above)|ource|uffixes|e(?:curity(?:Policy)?|l(?:ection|f)))|h(?:istory|ost(?:name)?|as(?:h|Focus))|y|X(?:MLDocument|SLDocument)|n(?:ext|ame(?:space(?:s|URI)|Prop))|M(?:IN_VALUE|AX_VALUE)|c(?:haracterSet|o(?:n(?:structor|trollers)|okieEnabled|lorDepth|mp(?:onents|lete))|urrent|puClass|l(?:i(?:p(?:boardData)?|entInformation)|osed|asses)|alle(?:e|r)|rypto)|t(?:o(?:olbar|p)|ext(?:Transform|Indent|Decoration|Align)|ags)|SQRT(?:1_2|2)|i(?:n(?:ner(?:Height|Width)|put)|ds|gnoreCase)|zIndex|o(?:scpu|n(?:readystatechange|Line)|uter(?:Height|Width)|p(?:sProfile|ener)|ffscreenBuffering)|NEGATIVE_INFINITY|d(?:i(?:splay|alog(?:Height|Top|Width|Left|Arguments)|rectories)|e(?:scription|fault(?:Status|Ch(?:ecked|arset)|View)))|u(?:ser(?:Profile|Language|Agent)|n(?:iqueID|defined)|pdateInterval)|_content|p(?:ixelDepth|ort|ersonalbar|kcs11|l(?:ugins|atform)|a(?:thname|dding(?:Right|Bottom|Top|Left)|rent(?:Window|Layer)?|ge(?:X(?:Offset)?|Y(?:Offset)?))|r(?:o(?:to(?:col|type)|duct(?:Sub)?|mpter)|e(?:vious|fix)))|e(?:n(?:coding|abledPlugin)|x(?:ternal|pando)|mbeds)|v(?:isibility|endor(?:Sub)?|Linkcolor)|URLUnencoded|P(?:I|OSITIVE_INFINITY)|f(?:ilename|o(?:nt(?:Size|Family|Weight)|rmName)|rame(?:s|Element)|gColor)|E|whiteSpace|l(?:i(?:stStyleType|n(?:eHeight|kColor))|o(?:ca(?:tion(?:bar)?|lName)|wsrc)|e(?:ngth|ft(?:Context)?)|a(?:st(?:M(?:odified|atch)|Index|Paren)|yer(?:s|X)|nguage))|a(?:pp(?:MinorVersion|Name|Co(?:deName|re)|Version)|vail(?:Height|Top|Width|Left)|ll|r(?:ity|guments)|Linkcolor|bove)|r(?:ight(?:Context)?|e(?:sponse(?:XML|Text)|adyState))|global|x|m(?:imeTypes|ultiline|enubar|argin(?:Right|Bottom|Top|Left))|L(?:N(?:10|2)|OG(?:10E|2E))|b(?:o(?:ttom|rder(?:Width|RightWidth|BottomWidth|Style|Color|TopWidth|LeftWidth))|ufferDepth|elow|ackground(?:Color|Image)))\b/
-            }, {
-                token : ["storage.type", "punctuation.operator", "support.function.firebug"],
-                regex : /(console)(\.)(warn|info|log|error|time|timeEnd|assert)\b/
-            }, {
-                token : function(value) {
-                    if (globals.hasOwnProperty(value))
-                        return "variable.language";
-                    else if (deprecated.hasOwnProperty(value))
-                        return "invalid.deprecated";
-                    else if (definitions.hasOwnProperty(value))
-                        return "storage.type";
-                    else if (keywords.hasOwnProperty(value))
-                        return "keyword";
-                    else if (buildinConstants.hasOwnProperty(value))
-                        return "constant.language";
-                    else if (futureReserved.hasOwnProperty(value))
-                        return "invalid.illegal";
-                    else if (value == "debugger")
-                        return "invalid.deprecated";
-                    else
-                        return "identifier";
-                },
-                regex : identifierRe
-            }, {
-                token : "keyword.operator",
-                regex : /!|\$|%|&|\*|\-\-|\-|\+\+|\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\|\||\?\:|\*=|%=|\+=|\-=|&=|\^=|\b(?:in|instanceof|new|delete|typeof|void)/,
-                next  : "regex_allowed"
-            }, {
-                token : "punctuation.operator",
-                regex : /\?|\:|\,|\;|\./,
-                next  : "regex_allowed"
-            }, {
-                token : "paren.lparen",
-                regex : /[\[({]/,
-                next  : "regex_allowed"
-            }, {
-                token : "paren.rparen",
-                regex : /[\])}]/
-            }, {
-                token : "keyword.operator",
-                regex : /\/=?/,
-                next  : "regex_allowed"
-            }, {
-                token: "comment",
-                regex: /^#!.*$/
-            }, {
-                token : "text",
-                regex : /\s+/
-            }
-        ],
-        // regular expressions are only allowed after certain tokens. This
-        // makes sure we don't mix up regexps with the divison operator
-        "regex_allowed": [
-            {
-                token : "comment", // multi line comment
-                merge : true,
-                regex : "\\/\\*",
-                next : "comment_regex_allowed"
-            }, {
-                token : "comment",
-                regex : "\\/\\/.*$"
-            }, {
-                token: "string.regexp",
-                regex: "\\/",
-                next: "regex",
-                merge: true
-            }, {
-                token : "text",
-                regex : "\\s+"
-            }, {
-                // immediately return to the start mode without matching
-                // anything
-                token: "empty",
-                regex: "",
-                next: "start"
-            }
-        ],
-        "regex": [
-            {
-                token: "regexp.keyword.operator",
-                regex: "\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",
-                next: "regex"
-            }, {
-				// flag
-                token: "string.regexp",
-                regex: "/\\w*",
-                next: "start",
-                merge: true
-            }, {
-                token: "string.regexp",
-                regex: "[^\\\\/\\[]+",
-                next: "regex",
-                merge: true
-            }, {
-                token: "string.regexp.charachterclass",
-                regex: "\\[",
-                next: "regex_character_class",
-                merge: true
-            }, {
-                token: "empty",
-                regex: "",
-                next: "start"
-            }
-        ],
-        "regex_character_class": [
-            {
-                token: "regexp.keyword.operator",
-                regex: "\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",
-                next: "regex_character_class"
-            }, {
-                token: "string.regexp.charachterclass",
-                regex: "]",
-                next: "regex",
-                merge: true
-            }, {
-                token: "string.regexp.charachterclass",
-                regex: "[^\\\\\\]]+",
-                next: "regex_character_class",
-                merge: true
-            }, {
-                token: "empty",
-                regex: "",
-                next: "start"
-            }
-        ],
-        "comment_regex_allowed" : [
-            {
-                token : "comment", // closing comment
-                regex : ".*?\\*\\/",
-                merge : true,
-                next : "regex_allowed"
-            }, {
-                token : "comment", // comment spanning whole line
-                merge : true,
-                regex : ".+"
-            }
-        ],
-        "comment" : [
-            {
-                token : "comment", // closing comment
-                regex : ".*?\\*\\/",
-                merge : true,
-                next : "start"
-            }, {
-                token : "comment", // comment spanning whole line
-                merge : true,
-                regex : ".+"
-            }
-        ],
-        "qqstring" : [
-            {
-                token : "constant.language.escape",
-                regex : escapedRe
-            }, {
-                token : "string",
-                regex : '[^"\\\\]+'
-            }, {
-                token : "string",
-                regex : '"',
-                next  : "start"
-            }
-        ],
-        "qstring" : [
-            {
-                token : "constant.language.escape",
-                regex : escapedRe
-            }, {
-                token : "string",
-                regex : "[^'\\\\]+"
-            }, {
-                token : "string",
-                regex : "'",
-                next  : "start"
-            }
-        ]
-    };
-
-    this.embedRules(DocCommentHighlightRules, "doc-",
-        [ new DocCommentHighlightRules().getEndRule("start") ]);
-};
-
-oop.inherits(JavaScriptHighlightRules, TextHighlightRules);
-
-exports.JavaScriptHighlightRules = JavaScriptHighlightRules;
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/doc_comment_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var DocCommentHighlightRules = function() {
-
-    this.$rules = {
-        "start" : [ {
-            token : "comment.doc.tag",
-            regex : "@[\\w\\d_]+" // TODO: fix email addresses
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "\\s+"
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "TODO"
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "[^@\\*]+"
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "."
-        }]
-    };
-};
-
-oop.inherits(DocCommentHighlightRules, TextHighlightRules);
-
-(function() {
-
-    this.getStartRule = function(start) {
-        return {
-            token : "comment.doc", // doc comment
-            merge : true,
-            regex : "\\/\\*(?=\\*)",
-            next  : start
-        };
-    };
-    
-    this.getEndRule = function (start) {
-        return {
-            token : "comment.doc", // closing comment
-            merge : true,
-            regex : "\\*\\/",
-            next  : start
-        };
-    };
-
-}).call(DocCommentHighlightRules.prototype);
-
-exports.DocCommentHighlightRules = DocCommentHighlightRules;
-
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/matching_brace_outdent', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../range").Range;
-
-var MatchingBraceOutdent = function() {};
-
-(function() {
-
-    this.checkOutdent = function(line, input) {
-        if (! /^\s+$/.test(line))
-            return false;
-
-        return /^\s*\}/.test(input);
-    };
-
-    this.autoOutdent = function(doc, row) {
-        var line = doc.getLine(row);
-        var match = line.match(/^(\s*\})/);
-
-        if (!match) return 0;
-
-        var column = match[1].length;
-        var openBracePos = doc.findMatchingBracket({row: row, column: column});
-
-        if (!openBracePos || openBracePos.row == row) return 0;
-
-        var indent = this.$getIndent(doc.getLine(openBracePos.row));
-        doc.replace(new Range(row, 0, row, column-1), indent);
-    };
-
-    this.$getIndent = function(line) {
-        var match = line.match(/^(\s+)/);
-        if (match) {
-            return match[1];
-        }
-
-        return "";
-    };
-
-}).call(MatchingBraceOutdent.prototype);
-
-exports.MatchingBraceOutdent = MatchingBraceOutdent;
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/folding/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/range', 'ace/mode/folding/fold_mode'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var Range = require("../../range").Range;
-var BaseFoldMode = require("./fold_mode").FoldMode;
-
-var FoldMode = exports.FoldMode = function() {};
-oop.inherits(FoldMode, BaseFoldMode);
-
-(function() {
-
-    this.foldingStartMarker = /(\{|\[)[^\}\]]*$|^\s*(\/\*)/;
-    this.foldingStopMarker = /^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/;
-    
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        var line = session.getLine(row);
-        var match = line.match(this.foldingStartMarker);
-        if (match) {
-            var i = match.index;
-
-            if (match[1])
-                return this.openingBracketBlock(session, match[1], row, i);
-
-            var range = session.getCommentFoldRange(row, i + match[0].length);
-            range.end.column -= 2;
-            return range;
-        }
-
-        if (foldStyle !== "markbeginend")
-            return;
-            
-        var match = line.match(this.foldingStopMarker);
-        if (match) {
-            var i = match.index + match[0].length;
-
-            if (match[2]) {
-                var range = session.getCommentFoldRange(row, i);
-                range.end.column -= 2;
-                return range;
-            }
-
-            var end = {row: row, column: i};
-            var start = session.$findOpeningBracket(match[1], end);
-            
-            if (!start)
-                return;
-
-            start.column++;
-            end.column--;
-
-            return  Range.fromPoints(start, end);
-        }
-    };
-    
-}).call(FoldMode.prototype);
-
-});/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/css', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/css_highlight_rules', 'ace/mode/matching_brace_outdent', 'ace/worker/worker_client', 'ace/mode/folding/cstyle'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
-var CssHighlightRules = require("./css_highlight_rules").CssHighlightRules;
-var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
-var WorkerClient = require("../worker/worker_client").WorkerClient;
-var CStyleFoldMode = require("./folding/cstyle").FoldMode;
-
-var Mode = function() {
-    this.$tokenizer = new Tokenizer(new CssHighlightRules().getRules(), "i");
-    this.$outdent = new MatchingBraceOutdent();
-    this.foldingRules = new CStyleFoldMode();
-};
-oop.inherits(Mode, TextMode);
-
-(function() {
-
-    this.foldingRules = "cStyle";
-
-    this.getNextLineIndent = function(state, line, tab) {
-        var indent = this.$getIndent(line);
-
-        // ignore braces in comments
-        var tokens = this.$tokenizer.getLineTokens(line, state).tokens;
-        if (tokens.length && tokens[tokens.length-1].type == "comment") {
-            return indent;
-        }
-
-        var match = line.match(/^.*\{\s*$/);
-        if (match) {
-            indent += tab;
-        }
-
-        return indent;
-    };
-
-    this.checkOutdent = function(state, line, input) {
-        return this.$outdent.checkOutdent(line, input);
-    };
-
-    this.autoOutdent = function(state, doc, row) {
-        this.$outdent.autoOutdent(doc, row);
-    };
-    
-    this.createWorker = function(session) {
-        var worker = new WorkerClient(["ace"], "worker-css.js", "ace/mode/css_worker", "Worker");
-        worker.attachToDocument(session.getDocument());
-        
-        worker.on("csslint", function(e) {
-            var errors = [];
-            e.data.forEach(function(message) {
-                errors.push({
-                    row: message.line - 1,
-                    column: message.col - 1,
-                    text: message.message,
-                    type: message.type,
-                    lint: message
-                });
-            });
-            
-            session.setAnnotations(errors);
-        });
-        return worker;
-    };
-
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/css_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var lang = require("../lib/lang");
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var CssHighlightRules = function() {
-
-    var properties = lang.arrayToMap(
-        ("animation-fill-mode|alignment-adjust|alignment-baseline|animation-delay|animation-direction|animation-duration|animation-iteration-count|animation-name|animation-play-state|animation-timing-function|animation|appearance|azimuth|backface-visibility|background-attachment|background-break|background-clip|background-color|background-image|background-origin|background-position|background-repeat|background-size|background|baseline-shift|binding|bleed|bookmark-label|bookmark-level|bookmark-state|bookmark-target|border-bottom|border-bottom-color|border-bottom-left-radius|border-bottom-right-radius|border-bottom-style|border-bottom-width|border-collapse|border-color|border-image|border-image-outset|border-image-repeat|border-image-slice|border-image-source|border-image-width|border-left|border-left-color|border-left-style|border-left-width|border-radius|border-right|border-right-color|border-right-style|border-right-width|border-spacing|border-style|border-top|border-top-color|border-top-left-radius|border-top-right-radius|border-top-style|border-top-width|border-width|border|bottom|box-align|box-decoration-break|box-direction|box-flex-group|box-flex|box-lines|box-ordinal-group|box-orient|box-pack|box-shadow|box-sizing|break-after|break-before|break-inside|caption-side|clear|clip|color-profile|color|column-count|column-fill|column-gap|column-rule|column-rule-color|column-rule-style|column-rule-width|column-span|column-width|columns|content|counter-increment|counter-reset|crop|cue-after|cue-before|cue|cursor|direction|display|dominant-baseline|drop-initial-after-adjust|drop-initial-after-align|drop-initial-before-adjust|drop-initial-before-align|drop-initial-size|drop-initial-value|elevation|empty-cells|fit|fit-position|float-offset|float|font-family|font-size|font-size-adjust|font-stretch|font-style|font-variant|font-weight|font|grid-columns|grid-rows|hanging-punctuation|height|hyphenate-after|hyphenate-before|hyphenate-character|hyphenate-lines|hyphenate-resource|hyphens|icon|image-orientation|image-rendering|image-resolution|inline-box-align|left|letter-spacing|line-height|line-stacking-ruby|line-stacking-shift|line-stacking-strategy|line-stacking|list-style-image|list-style-position|list-style-type|list-style|margin-bottom|margin-left|margin-right|margin-top|margin|mark-after|mark-before|mark|marks|marquee-direction|marquee-play-count|marquee-speed|marquee-style|max-height|max-width|min-height|min-width|move-to|nav-down|nav-index|nav-left|nav-right|nav-up|opacity|orphans|outline-color|outline-offset|outline-style|outline-width|outline|overflow-style|overflow-x|overflow-y|overflow|padding-bottom|padding-left|padding-right|padding-top|padding|page-break-after|page-break-before|page-break-inside|page-policy|page|pause-after|pause-before|pause|perspective-origin|perspective|phonemes|pitch-range|pitch|play-during|position|presentation-level|punctuation-trim|quotes|rendering-intent|resize|rest-after|rest-before|rest|richness|right|rotation-point|rotation|ruby-align|ruby-overhang|ruby-position|ruby-span|size|speak-header|speak-numeral|speak-punctuation|speak|speech-rate|stress|string-set|table-layout|target-name|target-new|target-position|target|text-align-last|text-align|text-decoration|text-emphasis|text-height|text-indent|text-justify|text-outline|text-shadow|text-transform|text-wrap|top|transform-origin|transform-style|transform|transition-delay|transition-duration|transition-property|transition-timing-function|transition|unicode-bidi|vertical-align|visibility|voice-balance|voice-duration|voice-family|voice-pitch-range|voice-pitch|voice-rate|voice-stress|voice-volume|volume|white-space-collapse|white-space|widows|width|word-break|word-spacing|word-wrap|z-index").split("|")
-    );
-
-    var functions = lang.arrayToMap(
-        ("rgb|rgba|url|attr|counter|counters").split("|")
-    );
-
-    var constants = lang.arrayToMap(
-        ("absolute|after-edge|after|all-scroll|all|alphabetic|always|antialiased|armenian|auto|avoid-column|avoid-page|avoid|balance|baseline|before-edge|before|below|bidi-override|block-line-height|block|bold|bolder|border-box|both|bottom|box|break-all|break-word|capitalize|caps-height|caption|center|central|char|circle|cjk-ideographic|clone|close-quote|col-resize|collapse|column|consider-shifts|contain|content-box|cover|crosshair|cubic-bezier|dashed|decimal-leading-zero|decimal|default|disabled|disc|disregard-shifts|distribute-all-lines|distribute-letter|distribute-space|distribute|dotted|double|e-resize|ease-in|ease-in-out|ease-out|ease|ellipsis|end|exclude-ruby|fill|fixed|font-size|font|georgian|glyphs|grid-height|groove|hand|hanging|hebrew|help|hidden|hiragana-iroha|hiragana|horizontal|icon|ideograph-alpha|ideograph-numeric|ideograph-parenthesis|ideograph-space|ideographic|inactive|include-ruby|inherit|initial|inline-block|inline-box|inline-line-height|inline-table|inline|inset|inside|inter-ideograph|inter-word|invert|italic|justify|katakana-iroha|katakana|keep-all|last|left|lighter|line-edge|line-through|line|linear|list-item|local|loose|lower-alpha|lower-greek|lower-latin|lower-roman|lowercase|lr-tb|ltr|mathematical|max-height|max-size|medium|menu|message-box|middle|move|n-resize|ne-resize|newspaper|no-change|no-close-quote|no-drop|no-open-quote|no-repeat|none|normal|not-allowed|nowrap|nw-resize|oblique|open-quote|outset|outside|overline|padding-box|page|pointer|pre-line|pre-wrap|pre|preserve-3d|progress|relative|repeat-x|repeat-y|repeat|replaced|reset-size|ridge|right|round|row-resize|rtl|s-resize|scroll|se-resize|separate|slice|small-caps|small-caption|solid|space|square|start|static|status-bar|step-end|step-start|steps|stretch|strict|sub|super|sw-resize|table-caption|table-cell|table-column-group|table-column|table-footer-group|table-header-group|table-row-group|table-row|table|tb-rl|text-after-edge|text-before-edge|text-bottom|text-size|text-top|text|thick|thin|top|transparent|underline|upper-alpha|upper-latin|upper-roman|uppercase|use-script|vertical-ideographic|vertical-text|visible|w-resize|wait|whitespace|z-index|zero").split("|")
-    );
-
-    var colors = lang.arrayToMap(
-        ("aqua|black|blue|fuchsia|gray|green|lime|maroon|navy|olive|orange|" +
-        "purple|red|silver|teal|white|yellow").split("|")
-    );
-
-    var fonts = lang.arrayToMap(
-        ("arial|century|comic|courier|garamond|georgia|helvetica|impact|lucida|" +
-        "symbol|system|tahoma|times|trebuchet|utopia|verdana|webdings|sans-serif|" +
-        "serif|monospace").split("|")
-    );
-    
-    // regexp must not have capturing parentheses. Use (?:) instead.
-    // regexps are ordered -> the first match is used
-
-    var numRe = "\\-?(?:(?:[0-9]+)|(?:[0-9]*\\.[0-9]+))";
-    var pseudoElements = "(\\:+)\\b(after|before|first-letter|first-line|moz-selection|selection)\\b";
-    var pseudoClasses = "(:)\\b(active|checked|disabled|empty|enabled|first-child|first-of-type|focus|hover|indeterminate|invalid|last-child|last-of-type|link|not|nth-child|nth-last-child|nth-last-of-type|nth-of-type|only-child|only-of-type|required|root|target|valid|visited)\\b";
-    
-    var base_ruleset = [
-        {
-            token : "comment", // multi line comment
-            merge : true,
-            regex : "\\/\\*",
-            next : "ruleset_comment"
-        }, {
-            token : "string", // single line
-            regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
-        }, {
-            token : "string", // single line
-            regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"
-        }, {
-            token : ["constant.numeric", "keyword"],
-            regex : "(" + numRe + ")(ch|cm|deg|em|ex|fr|gd|grad|Hz|in|kHz|mm|ms|pc|pt|px|rad|rem|s|turn|vh|vm|vw|%)"
-        }, {
-            token : ["constant.numeric"],
-            regex : "([0-9]+)"
-        }, {
-            token : "constant.numeric",  // hex6 color
-            regex : "#[a-f0-9]{6}"
-        }, {
-            token : "constant.numeric", // hex3 color
-            regex : "#[a-f0-9]{3}"
-        }, {
-            token : ["punctuation", "entity.other.attribute-name.pseudo-element.css"], 
-            regex : pseudoElements
-        }, {
-            token : ["punctuation", "entity.other.attribute-name.pseudo-class.css"], 
-            regex : pseudoClasses
-        }, {
-            token : function(value) {
-                if (properties.hasOwnProperty(value.toLowerCase())) {
-                    return "support.type";
-                }
-                else if (functions.hasOwnProperty(value.toLowerCase())) {
-                    return "support.function";
-                }
-                else if (constants.hasOwnProperty(value.toLowerCase())) {
-                    return "support.constant";
-                }
-                else if (colors.hasOwnProperty(value.toLowerCase())) {
-                    return "support.constant.color";
-                }
-                else if (fonts.hasOwnProperty(value.toLowerCase())) {
-                    return "support.constant.fonts";
-                }
-                else {
-                    return "text";
-                }
-            },
-            regex : "\\-?[a-zA-Z_][a-zA-Z0-9_\\-]*"
-        } 
-      ];
-
-    var ruleset = lang.copyArray(base_ruleset);
-    ruleset.unshift({
-        token : "paren.rparen",
-        regex : "\\}",
-        next:   "start"
-    });
-
-    var media_ruleset = lang.copyArray( base_ruleset );
-    media_ruleset.unshift({
-        token : "paren.rparen",
-        regex : "\\}",
-        next:   "media"
-    });
-
-    var base_comment = [{
-          token : "comment", // comment spanning whole line
-          merge : true,
-          regex : ".+"
-    }];
-
-    var comment = lang.copyArray(base_comment);
-    comment.unshift({
-          token : "comment", // closing comment
-          regex : ".*?\\*\\/",
-          next : "start"
-    });
-
-    var media_comment = lang.copyArray(base_comment);
-    media_comment.unshift({
-          token : "comment", // closing comment
-          regex : ".*?\\*\\/",
-          next : "media"
-    });
-
-    var ruleset_comment = lang.copyArray(base_comment);
-    ruleset_comment.unshift({
-          token : "comment", // closing comment
-          regex : ".*?\\*\\/",
-          next : "ruleset"
-    });
-
-    this.$rules = {
-        "start" : [{
-            token : "comment", // multi line comment
-            merge : true,
-            regex : "\\/\\*",
-            next : "comment"
-        }, {
-            token: "paren.lparen",
-            regex: "\\{",
-            next:  "ruleset"
-        }, {
-            token: "string",
-            regex: "@.*?{",
-            next:  "media"
-        },{
-            token: "keyword",
-            regex: "#[a-z0-9-_]+"
-        },{
-            token: "variable",
-            regex: "\\.[a-z0-9-_]+"
-        },{
-            token: "string",
-            regex: ":[a-z0-9-_]+"
-        },{
-            token: "constant",
-            regex: "[a-z0-9-_]+"
-        }],
-
-        "media" : [ {
-            token : "comment", // multi line comment
-            merge : true,
-            regex : "\\/\\*",
-            next : "media_comment"
-        }, {
-            token: "paren.lparen",
-            regex: "\\{",
-            next:  "media_ruleset"
-        },{
-            token: "string",
-            regex: "\\}",
-            next:  "start"
-        },{
-            token: "keyword",
-            regex: "#[a-z0-9-_]+"
-        },{
-            token: "variable",
-            regex: "\\.[a-z0-9-_]+"
-        },{
-            token: "string",
-            regex: ":[a-z0-9-_]+"
-        },{
-            token: "constant",
-            regex: "[a-z0-9-_]+"
-        }],
-
-        "comment" : comment,
-
-        "ruleset" : ruleset,
-        "ruleset_comment" : ruleset_comment,
-
-        "media_ruleset" : media_ruleset,
-        "media_comment" : media_comment
-    };
-};
-
-oop.inherits(CssHighlightRules, TextHighlightRules);
-
-exports.CssHighlightRules = CssHighlightRules;
-
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/coldfusion_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/css_highlight_rules', 'ace/mode/javascript_highlight_rules', 'ace/mode/text_highlight_rules', 'ace/mode/xml_util'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var CssHighlightRules = require("./css_highlight_rules").CssHighlightRules;
-var JavaScriptHighlightRules = require("./javascript_highlight_rules").JavaScriptHighlightRules;
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-var xml_util = require("./xml_util");
-
-var ColdfusionHighlightRules = function() {
-
-    // regexp must not have capturing parentheses
-    // regexps are ordered -> the first match is used
-
-    this.$rules = {
-        start : [ {
-            token : "text",
-            merge : true,
-            regex : "<\\!\\[CDATA\\[",
-            next : "cdata"
-        }, {
-            token : "xml_pe",
-            regex : "<\\?.*?\\?>"
-        }, {
-            token : "comment",
-            merge : true,
-            regex : "<\\!--",
-            next : "comment"
-        }, {
-            token : "meta.tag",
-            regex : "<(?=\s*script)",
-            next : "script"
-        }, {
-            token : "meta.tag",
-            regex : "<(?=\s*style)",
-            next : "style"
-        }, {
-            token : "meta.tag", // opening tag
-            regex : "<\\/?",
-            next : "tag"
-        }, {
-            token : "text",
-            regex : "\\s+"
-        }, {
-            token : "text",
-            regex : "[^<]+"
-        } ],
-    
-        cdata : [ {
-            token : "text",
-            regex : "\\]\\]>",
-            next : "start"
-        }, {
-            token : "text",
-            merge : true,
-            regex : "\\s+"
-        }, {
-            token : "text",
-            merge : true,
-            regex : ".+"
-        } ],
-
-        comment : [ {
-            token : "comment",
-            regex : ".*?-->",
-            next : "start"
-        }, {
-            token : "comment",
-            merge : true,
-            regex : ".+"
-        } ]
-    };
-    
-    xml_util.tag(this.$rules, "tag", "start");
-    xml_util.tag(this.$rules, "style", "css-start");
-    xml_util.tag(this.$rules, "script", "js-start");
-    
-    this.embedRules(JavaScriptHighlightRules, "js-", [{
-        token: "comment",
-        regex: "\\/\\/.*(?=<\\/script>)",
-        next: "tag"
-    }, {
-        token: "meta.tag",
-        regex: "<\\/(?=script)",
-        next: "tag"
-    }]);
-    
-    this.embedRules(CssHighlightRules, "css-", [{
-        token: "meta.tag",
-        regex: "<\\/(?=style)",
-        next: "tag"
-    }]);
-};
-
-oop.inherits(ColdfusionHighlightRules, TextHighlightRules);
-
-exports.ColdfusionHighlightRules = ColdfusionHighlightRules;
-});
diff --git a/apps/files_texteditor/js/aceeditor/mode-coldfusion.js b/apps/files_texteditor/js/aceeditor/mode-coldfusion.js
deleted file mode 100644
index 7080a63534..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-coldfusion.js
+++ /dev/null
@@ -1 +0,0 @@
-define("ace/mode/coldfusion",["require","exports","module","ace/lib/oop","ace/mode/xml","ace/mode/javascript","ace/mode/css","ace/tokenizer","ace/mode/coldfusion_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./xml").Mode,f=a("./javascript").Mode,g=a("./css").Mode,h=a("../tokenizer").Tokenizer,i=a("./coldfusion_highlight_rules").ColdfusionHighlightRules,j=function(){e.call(this);var a=new i;this.$tokenizer=new h(a.getRules()),this.$embeds=a.getEmbeds(),this.createModeDelegates({"js-":f,"css-":g})};d.inherits(j,e),function(){this.getNextLineIndent=function(a,b,c){return this.$getIndent(b)}}.call(j.prototype),b.Mode=j}),define("ace/mode/xml",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/xml_highlight_rules","ace/mode/behaviour/xml","ace/mode/folding/xml"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./xml_highlight_rules").XmlHighlightRules,h=a("./behaviour/xml").XmlBehaviour,i=a("./folding/xml").FoldMode,j=function(){this.$tokenizer=new f((new g).getRules()),this.$behaviour=new h,this.foldingRules=new i};d.inherits(j,e),function(){this.getNextLineIndent=function(a,b,c){return this.$getIndent(b)}}.call(j.prototype),b.Mode=j}),define("ace/mode/xml_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/xml_util","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./xml_util"),f=a("./text_highlight_rules").TextHighlightRules,g=function(){this.$rules={start:[{token:"text",regex:"<\\!\\[CDATA\\[",next:"cdata"},{token:"xml_pe",regex:"<\\?.*?\\?>"},{token:"comment",merge:!0,regex:"<\\!--",next:"comment"},{token:"xml_pe",regex:"<\\!.*?>"},{token:"meta.tag",regex:"<\\/?",next:"tag"},{token:"text",regex:"\\s+"},{token:"constant.character.entity",regex:"(?:&#[0-9]+;)|(?:&#x[0-9a-fA-F]+;)|(?:&[a-zA-Z0-9_:\\.-]+;)"},{token:"text",regex:"[^<]+"}],cdata:[{token:"text",regex:"\\]\\]>",next:"start"},{token:"text",regex:"\\s+"},{token:"text",regex:"(?:[^\\]]|\\](?!\\]>))+"}],comment:[{token:"comment",regex:".*?-->",next:"start"},{token:"comment",merge:!0,regex:".+"}]},e.tag(this.$rules,"tag","start")};d.inherits(g,f),b.XmlHighlightRules=g}),define("ace/mode/xml_util",["require","exports","module","ace/lib/lang"],function(a,b,c){function g(a){return[{token:"string",regex:'".*?"'},{token:"string",merge:!0,regex:'["].*',next:a+"_qqstring"},{token:"string",regex:"'.*?'"},{token:"string",merge:!0,regex:"['].*",next:a+"_qstring"}]}function h(a,b){return[{token:"string",merge:!0,regex:".*?"+a,next:b},{token:"string",merge:!0,regex:".+"}]}"use strict";var d=a("../lib/lang"),e=d.arrayToMap("button|form|input|label|select|textarea".split("|")),f=d.arrayToMap("table|tbody|td|tfoot|th|tr".split("|"));b.tag=function(a,b,c){a[b]=[{token:"text",regex:"\\s+"},{token:function(a){return a==="a"?"meta.tag.anchor":a==="img"?"meta.tag.image":a==="script"?"meta.tag.script":a==="style"?"meta.tag.style":e.hasOwnProperty(a.toLowerCase())?"meta.tag.form":f.hasOwnProperty(a.toLowerCase())?"meta.tag.table":"meta.tag"},merge:!0,regex:"[-_a-zA-Z0-9:]+",next:b+"_embed_attribute_list"},{token:"empty",regex:"",next:b+"_embed_attribute_list"}],a[b+"_qstring"]=h("'",b+"_embed_attribute_list"),a[b+"_qqstring"]=h('"',b+"_embed_attribute_list"),a[b+"_embed_attribute_list"]=[{token:"meta.tag",merge:!0,regex:"/?>",next:c},{token:"keyword.operator",regex:"="},{token:"entity.other.attribute-name",regex:"[-_a-zA-Z0-9:]+"},{token:"constant.numeric",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:"text",regex:"\\s+"}].concat(g(b))}}),define("ace/mode/behaviour/xml",["require","exports","module","ace/lib/oop","ace/mode/behaviour","ace/mode/behaviour/cstyle"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../behaviour").Behaviour,f=a("./cstyle").CstyleBehaviour,g=function(){this.inherit(f,["string_dquotes"]),this.add("brackets","insertion",function(a,b,c,d,e){if(e=="<"){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?!1:{text:"<>",selection:[1,1]}}if(e==">"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j==">")return{text:"",selection:[1,1]}}else if(e=="\n"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),k=i.substring(h.column,h.column+2);if(k=="</"){var l=this.$getIndent(d.doc.getLine(h.row))+d.getTabString(),m=this.$getIndent(d.doc.getLine(h.row));return{text:"\n"+l+"\n"+m,selection:[1,l.length,1,l.length]}}}})};d.inherits(g,e),b.XmlBehaviour=g}),define("ace/mode/behaviour/cstyle",["require","exports","module","ace/lib/oop","ace/mode/behaviour"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../behaviour").Behaviour,f=function(){this.add("braces","insertion",function(a,b,c,d,e){if(e=="{"){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"{"+g+"}",selection:!1}:{text:"{}",selection:[1,1]}}if(e=="}"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var k=d.$findOpeningBracket("}",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}else if(e=="\n"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var l=d.findMatchingBracket({row:h.row,column:h.column+1});if(!l)return null;var m=this.getNextLineIndent(a,i.substring(0,i.length-1),d.getTabString()),n=this.$getIndent(d.doc.getLine(l.row));return{text:"\n"+m+"\n"+n,selection:[1,m.length,1,m.length]}}}}),this.add("braces","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="{"){var g=d.doc.getLine(e.start.row),h=g.substring(e.end.column,e.end.column+1);if(h=="}")return e.end.column++,e}}),this.add("parens","insertion",function(a,b,c,d,e){if(e=="("){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"("+g+")",selection:!1}:{text:"()",selection:[1,1]}}if(e==")"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j==")"){var k=d.$findOpeningBracket(")",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}}),this.add("parens","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="("){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h==")")return e.end.column++,e}}),this.add("string_dquotes","insertion",function(a,b,c,d,e){if(e=='"'||e=="'"){var f=e,g=c.getSelectionRange(),h=d.doc.getTextRange(g);if(h!=="")return{text:f+h+f,selection:!1};var i=c.getCursorPosition(),j=d.doc.getLine(i.row),k=j.substring(i.column-1,i.column);if(k=="\\")return null;var l=d.getTokens(g.start.row,g.start.row)[0].tokens,m=0,n,o=-1;for(var p=0;p<l.length;p++){n=l[p],n.type=="string"?o=-1:o<0&&(o=n.value.indexOf(f));if(n.value.length+m>g.start.column)break;m+=l[p].value.length}if(!n||o<0&&n.type!=="comment"&&(n.type!=="string"||g.start.column!==n.value.length+m-1&&n.value.lastIndexOf(f)===n.value.length-1))return{text:f+f,selection:[1,1]};if(n&&n.type==="string"){var q=j.substring(i.column,i.column+1);if(q==f)return{text:"",selection:[1,1]}}}}),this.add("string_dquotes","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&(f=='"'||f=="'")){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h=='"')return e.end.column++,e}})};d.inherits(f,e),b.CstyleBehaviour=f}),define("ace/mode/folding/xml",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/range","ace/mode/folding/fold_mode","ace/token_iterator"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../../lib/lang"),f=a("../../range").Range,g=a("./fold_mode").FoldMode,h=a("../../token_iterator").TokenIterator,i=b.FoldMode=function(a){g.call(this),this.voidElements=a||{}};d.inherits(i,g),function(){this.getFoldWidget=function(a,b,c){var d=this._getFirstTagInLine(a,c);return d.closing?b=="markbeginend"?"end":"":!d.tagName||this.voidElements[d.tagName.toLowerCase()]?"":d.selfClosing?"":d.value.indexOf("/"+d.tagName)!==-1?"":"start"},this._getFirstTagInLine=function(a,b){var c=a.getTokens(b,b)[0].tokens,d="";for(var f=0;f<c.length;f++){var g=c[f];g.type.indexOf("meta.tag")===0?d+=g.value:d+=e.stringRepeat(" ",g.value.length)}return this._parseTag(d)},this.tagRe=/^(\s*)(<?(\/?)([-_a-zA-Z0-9:!]*)\s*(\/?)>?)/,this._parseTag=function(a){var b=this.tagRe.exec(a),c=this.tagRe.lastIndex||0;return this.tagRe.lastIndex=0,{value:a,match:b?b[2]:"",closing:b?!!b[3]:!1,selfClosing:b?!!b[5]||b[2]=="/>":!1,tagName:b?b[4]:"",column:b[1]?c+b[1].length:c}},this._readTagForward=function(a){var b=a.getCurrentToken();if(!b)return null;var c="",d;do if(b.type.indexOf("meta.tag")===0){if(!d)var d={row:a.getCurrentTokenRow(),column:a.getCurrentTokenColumn()};c+=b.value;if(c.indexOf(">")!==-1){var e=this._parseTag(c);return e.start=d,e.end={row:a.getCurrentTokenRow(),column:a.getCurrentTokenColumn()+b.value.length},a.stepForward(),e}}while(b=a.stepForward());return null},this._readTagBackward=function(a){var b=a.getCurrentToken();if(!b)return null;var c="",d;do if(b.type.indexOf("meta.tag")===0){d||(d={row:a.getCurrentTokenRow(),column:a.getCurrentTokenColumn()+b.value.length}),c=b.value+c;if(c.indexOf("<")!==-1){var e=this._parseTag(c);return e.end=d,e.start={row:a.getCurrentTokenRow(),column:a.getCurrentTokenColumn()},a.stepBackward(),e}}while(b=a.stepBackward());return null},this._pop=function(a,b){while(a.length){var c=a[a.length-1];if(!b||c.tagName==b.tagName)return a.pop();if(this.voidElements[b.tagName])return;if(this.voidElements[c.tagName]){a.pop();continue}return null}},this.getFoldWidgetRange=function(a,b,c){var d=this._getFirstTagInLine(a,c);if(!d.match)return null;var e=d.closing||d.selfClosing,g=[],i;if(!e){var j=new h(a,c,d.column),k={row:c,column:d.column+d.tagName.length+2};while(i=this._readTagForward(j)){if(i.selfClosing){if(!g.length)return i.start.column+=i.tagName.length+2,i.end.column-=2,f.fromPoints(i.start,i.end);continue}if(i.closing){this._pop(g,i);if(g.length==0)return f.fromPoints(k,i.start)}else g.push(i)}}else{var j=new h(a,c,d.column+d.match.length),l={row:c,column:d.column};while(i=this._readTagBackward(j)){if(i.selfClosing){if(!g.length)return i.start.column+=i.tagName.length+2,i.end.column-=2,f.fromPoints(i.start,i.end);continue}if(!i.closing){this._pop(g,i);if(g.length==0)return i.start.column+=i.tagName.length+2,f.fromPoints(i.start,l)}else g.push(i)}}}}.call(i.prototype)}),define("ace/mode/folding/fold_mode",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../../range").Range,e=b.FoldMode=function(){};(function(){this.foldingStartMarker=null,this.foldingStopMarker=null,this.getFoldWidget=function(a,b,c){var d=a.getLine(c);return this.foldingStartMarker.test(d)?"start":b=="markbeginend"&&this.foldingStopMarker&&this.foldingStopMarker.test(d)?"end":""},this.getFoldWidgetRange=function(a,b,c){return null},this.indentationBlock=function(a,b,c){var e=/^\s*/,f=b,g=b,h=a.getLine(b),i=c||h.length,j=h.match(e)[0].length,k=a.getLength();while(++b<k){h=a.getLine(b);var l=h.match(e)[0].length;if(l==h.length)continue;if(l<=j)break;g=b}if(g>f){var m=a.getLine(g).length;return new d(f,i,g,m)}},this.openingBracketBlock=function(a,b,c,e){var f={row:c,column:e+1},g=a.$findClosingBracket(b,f);if(!g)return;var h=a.foldWidgets[g.row];return h==null&&(h=this.getFoldWidget(a,g.row)),h=="start"&&(g.row--,g.column=a.getLine(g.row).length),d.fromPoints(f,g)}}).call(e.prototype)}),define("ace/mode/javascript",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/javascript_highlight_rules","ace/mode/matching_brace_outdent","ace/range","ace/worker/worker_client","ace/mode/behaviour/cstyle","ace/mode/folding/cstyle"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./javascript_highlight_rules").JavaScriptHighlightRules,h=a("./matching_brace_outdent").MatchingBraceOutdent,i=a("../range").Range,j=a("../worker/worker_client").WorkerClient,k=a("./behaviour/cstyle").CstyleBehaviour,l=a("./folding/cstyle").FoldMode,m=function(){this.$tokenizer=new f((new g).getRules()),this.$outdent=new h,this.$behaviour=new k,this.foldingRules=new l};d.inherits(m,e),function(){this.toggleCommentLines=function(a,b,c,d){var e=!0,f=/^(\s*)\/\//;for(var g=c;g<=d;g++)if(!f.test(b.getLine(g))){e=!1;break}if(e){var h=new i(0,0,0,0);for(var g=c;g<=d;g++){var j=b.getLine(g),k=j.match(f);h.start.row=g,h.end.row=g,h.end.column=k[0].length,b.replace(h,k[1])}}else b.indentRows(c,d,"//")},this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a),f=e.tokens,g=e.state;if(f.length&&f[f.length-1].type=="comment")return d;if(a=="start"||a=="regex_allowed"){var h=b.match(/^.*(?:\bcase\b.*\:|[\{\(\[])\s*$/);h&&(d+=c)}else if(a=="doc-start"){if(g=="start"||a=="regex_allowed")return"";var h=b.match(/^\s*(\/?)\*/);h&&(h[1]&&(d+=" "),d+="* ")}return d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)},this.createWorker=function(a){var b=new j(["ace"],"worker-javascript.js","ace/mode/javascript_worker","JavaScriptWorker");return b.attachToDocument(a.getDocument()),b.on("jslint",function(b){var c=[];for(var d=0;d<b.data.length;d++){var e=b.data[d];e&&c.push({row:e.line-1,column:e.character-1,text:e.reason,type:"warning",lint:e})}a.setAnnotations(c)}),b.on("narcissus",function(b){a.setAnnotations([b.data])}),b.on("terminate",function(){a.clearAnnotations()}),b}}.call(m.prototype),b.Mode=m}),define("ace/mode/javascript_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/unicode","ace/mode/doc_comment_highlight_rules","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("../unicode"),g=a("./doc_comment_highlight_rules").DocCommentHighlightRules,h=a("./text_highlight_rules").TextHighlightRules,i=function(){var a=e.arrayToMap("Array|Boolean|Date|Function|Iterator|Number|Object|RegExp|String|Proxy|Namespace|QName|XML|XMLList|ArrayBuffer|Float32Array|Float64Array|Int16Array|Int32Array|Int8Array|Uint16Array|Uint32Array|Uint8Array|Uint8ClampedArray|Error|EvalError|InternalError|RangeError|ReferenceError|StopIteration|SyntaxError|TypeError|URIError|decodeURI|decodeURIComponent|encodeURI|encodeURIComponent|eval|isFinite|isNaN|parseFloat|parseInt|JSON|Math|this|arguments|prototype|window|document".split("|")),b=e.arrayToMap("break|case|catch|continue|default|delete|do|else|finally|for|function|if|in|instanceof|new|return|switch|throw|try|typeof|let|var|while|with|const|yield|import|get|set".split("|")),c="case|do|else|finally|in|instanceof|return|throw|try|typeof|yield",d=e.arrayToMap("__parent__|__count__|escape|unescape|with|__proto__".split("|")),h=e.arrayToMap("const|let|var|function".split("|")),i=e.arrayToMap("null|Infinity|NaN|undefined".split("|")),j=e.arrayToMap("class|enum|extends|super|export|implements|private|public|interface|package|protected|static".split("|")),k="["+f.packages.L+"\\$_]["+f.packages.L+f.packages.Mn+f.packages.Mc+f.packages.Nd+f.packages.Pc+"\\$_]*\\b",l="\\\\(?:x[0-9a-fA-F]{2}|u[0-9a-fA-F]{4}|[0-2][0-7]{0,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.)";this.$rules={start:[{token:"comment",regex:/\/\/.*$/},(new g).getStartRule("doc-start"),{token:"comment",merge:!0,regex:/\/\*/,next:"comment"},{token:"string",regex:"'",next:"qstring"},{token:"string",regex:'"',next:"qqstring"},{token:"constant.numeric",regex:/0[xX][0-9a-fA-F]+\b/},{token:"constant.numeric",regex:/[+-]?\d+(?:(?:\.\d*)?(?:[eE][+-]?\d+)?)?\b/},{token:["storage.type","punctuation.operator","support.function","punctuation.operator","entity.name.function","text","keyword.operator","text","storage.type","text","paren.lparen","variable.parameter","paren.rparen"],regex:"("+k+")(\\.)(prototype)(\\.)("+k+")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"},{token:["storage.type","punctuation.operator","support.function","punctuation.operator","entity.name.function","text","keyword.operator","text"],regex:"("+k+")(\\.)(prototype)(\\.)("+k+")(\\s*)(=)(\\s*)"},{token:["storage.type","punctuation.operator","entity.name.function","text","keyword.operator","text","storage.type","text","paren.lparen","variable.parameter","paren.rparen"],regex:"("+k+")(\\.)("+k+")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"},{token:["entity.name.function","text","keyword.operator","text","storage.type","text","paren.lparen","variable.parameter","paren.rparen"],regex:"("+k+")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"},{token:["storage.type","text","entity.name.function","text","paren.lparen","variable.parameter","paren.rparen"],regex:"(function)(\\s+)("+k+")(\\s*)(\\()(.*?)(\\))"},{token:["entity.name.function","text","punctuation.operator","text","storage.type","text","paren.lparen","variable.parameter","paren.rparen"],regex:"("+k+")(\\s*)(:)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"},{token:["text","text","storage.type","text","paren.lparen","variable.parameter","paren.rparen"],regex:"(:)(\\s*)(function)?(\\s*)(\\()([^)]*)(\\))"},{token:"constant.language.boolean",regex:/(?:true|false)\b/},{token:"keyword",regex:"(?:"+c+")\\b",next:"regex_allowed"},{token:["punctuation.operator","support.function"],regex:/(\.)(s(?:h(?:ift|ow(?:Mod(?:elessDialog|alDialog)|Help))|croll(?:X|By(?:Pages|Lines)?|Y|To)?|t(?:opzzzz|rike)|i(?:n|zeToContent|debar|gnText)|ort|u(?:p|b(?:str(?:ing)?)?)|pli(?:ce|t)|e(?:nd|t(?:Re(?:sizable|questHeader)|M(?:i(?:nutes|lliseconds)|onth)|Seconds|Ho(?:tKeys|urs)|Year|Cursor|Time(?:out)?|Interval|ZOptions|Date|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Date|FullYear)|FullYear|Active)|arch)|qrt|lice|avePreferences|mall)|h(?:ome|andleEvent)|navigate|c(?:har(?:CodeAt|At)|o(?:s|n(?:cat|textual|firm)|mpile)|eil|lear(?:Timeout|Interval)?|a(?:ptureEvents|ll)|reate(?:StyleSheet|Popup|EventObject))|t(?:o(?:GMTString|S(?:tring|ource)|U(?:TCString|pperCase)|Lo(?:caleString|werCase))|est|a(?:n|int(?:Enabled)?))|i(?:s(?:NaN|Finite)|ndexOf|talics)|d(?:isableExternalCapture|ump|etachEvent)|u(?:n(?:shift|taint|escape|watch)|pdateCommands)|j(?:oin|avaEnabled)|p(?:o(?:p|w)|ush|lugins.refresh|a(?:ddings|rse(?:Int|Float)?)|r(?:int|ompt|eference))|e(?:scape|nableExternalCapture|val|lementFromPoint|x(?:p|ec(?:Script|Command)?))|valueOf|UTC|queryCommand(?:State|Indeterm|Enabled|Value)|f(?:i(?:nd|le(?:ModifiedDate|Size|CreatedDate|UpdatedDate)|xed)|o(?:nt(?:size|color)|rward)|loor|romCharCode)|watch|l(?:ink|o(?:ad|g)|astIndexOf)|a(?:sin|nchor|cos|t(?:tachEvent|ob|an(?:2)?)|pply|lert|b(?:s|ort))|r(?:ou(?:nd|teEvents)|e(?:size(?:By|To)|calc|turnValue|place|verse|l(?:oad|ease(?:Capture|Events)))|andom)|g(?:o|et(?:ResponseHeader|M(?:i(?:nutes|lliseconds)|onth)|Se(?:conds|lection)|Hours|Year|Time(?:zoneOffset)?|Da(?:y|te)|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Da(?:y|te)|FullYear)|FullYear|A(?:ttention|llResponseHeaders)))|m(?:in|ove(?:B(?:y|elow)|To(?:Absolute)?|Above)|ergeAttributes|a(?:tch|rgins|x))|b(?:toa|ig|o(?:ld|rderWidths)|link|ack))\b(?=\()/},{token:["punctuation.operator","support.function.dom"],regex:/(\.)(s(?:ub(?:stringData|mit)|plitText|e(?:t(?:NamedItem|Attribute(?:Node)?)|lect))|has(?:ChildNodes|Feature)|namedItem|c(?:l(?:ick|o(?:se|neNode))|reate(?:C(?:omment|DATASection|aption)|T(?:Head|extNode|Foot)|DocumentFragment|ProcessingInstruction|E(?:ntityReference|lement)|Attribute))|tabIndex|i(?:nsert(?:Row|Before|Cell|Data)|tem)|open|delete(?:Row|C(?:ell|aption)|T(?:Head|Foot)|Data)|focus|write(?:ln)?|a(?:dd|ppend(?:Child|Data))|re(?:set|place(?:Child|Data)|move(?:NamedItem|Child|Attribute(?:Node)?)?)|get(?:NamedItem|Element(?:sBy(?:Name|TagName)|ById)|Attribute(?:Node)?)|blur)\b(?=\()/},{token:["punctuation.operator","support.constant"],regex:/(\.)(s(?:ystemLanguage|cr(?:ipts|ollbars|een(?:X|Y|Top|Left))|t(?:yle(?:Sheets)?|atus(?:Text|bar)?)|ibling(?:Below|Above)|ource|uffixes|e(?:curity(?:Policy)?|l(?:ection|f)))|h(?:istory|ost(?:name)?|as(?:h|Focus))|y|X(?:MLDocument|SLDocument)|n(?:ext|ame(?:space(?:s|URI)|Prop))|M(?:IN_VALUE|AX_VALUE)|c(?:haracterSet|o(?:n(?:structor|trollers)|okieEnabled|lorDepth|mp(?:onents|lete))|urrent|puClass|l(?:i(?:p(?:boardData)?|entInformation)|osed|asses)|alle(?:e|r)|rypto)|t(?:o(?:olbar|p)|ext(?:Transform|Indent|Decoration|Align)|ags)|SQRT(?:1_2|2)|i(?:n(?:ner(?:Height|Width)|put)|ds|gnoreCase)|zIndex|o(?:scpu|n(?:readystatechange|Line)|uter(?:Height|Width)|p(?:sProfile|ener)|ffscreenBuffering)|NEGATIVE_INFINITY|d(?:i(?:splay|alog(?:Height|Top|Width|Left|Arguments)|rectories)|e(?:scription|fault(?:Status|Ch(?:ecked|arset)|View)))|u(?:ser(?:Profile|Language|Agent)|n(?:iqueID|defined)|pdateInterval)|_content|p(?:ixelDepth|ort|ersonalbar|kcs11|l(?:ugins|atform)|a(?:thname|dding(?:Right|Bottom|Top|Left)|rent(?:Window|Layer)?|ge(?:X(?:Offset)?|Y(?:Offset)?))|r(?:o(?:to(?:col|type)|duct(?:Sub)?|mpter)|e(?:vious|fix)))|e(?:n(?:coding|abledPlugin)|x(?:ternal|pando)|mbeds)|v(?:isibility|endor(?:Sub)?|Linkcolor)|URLUnencoded|P(?:I|OSITIVE_INFINITY)|f(?:ilename|o(?:nt(?:Size|Family|Weight)|rmName)|rame(?:s|Element)|gColor)|E|whiteSpace|l(?:i(?:stStyleType|n(?:eHeight|kColor))|o(?:ca(?:tion(?:bar)?|lName)|wsrc)|e(?:ngth|ft(?:Context)?)|a(?:st(?:M(?:odified|atch)|Index|Paren)|yer(?:s|X)|nguage))|a(?:pp(?:MinorVersion|Name|Co(?:deName|re)|Version)|vail(?:Height|Top|Width|Left)|ll|r(?:ity|guments)|Linkcolor|bove)|r(?:ight(?:Context)?|e(?:sponse(?:XML|Text)|adyState))|global|x|m(?:imeTypes|ultiline|enubar|argin(?:Right|Bottom|Top|Left))|L(?:N(?:10|2)|OG(?:10E|2E))|b(?:o(?:ttom|rder(?:Width|RightWidth|BottomWidth|Style|Color|TopWidth|LeftWidth))|ufferDepth|elow|ackground(?:Color|Image)))\b/},{token:["storage.type","punctuation.operator","support.function.firebug"],regex:/(console)(\.)(warn|info|log|error|time|timeEnd|assert)\b/},{token:function(c){return a.hasOwnProperty(c)?"variable.language":d.hasOwnProperty(c)?"invalid.deprecated":h.hasOwnProperty(c)?"storage.type":b.hasOwnProperty(c)?"keyword":i.hasOwnProperty(c)?"constant.language":j.hasOwnProperty(c)?"invalid.illegal":c=="debugger"?"invalid.deprecated":"identifier"},regex:k},{token:"keyword.operator",regex:/!|\$|%|&|\*|\-\-|\-|\+\+|\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\|\||\?\:|\*=|%=|\+=|\-=|&=|\^=|\b(?:in|instanceof|new|delete|typeof|void)/,next:"regex_allowed"},{token:"punctuation.operator",regex:/\?|\:|\,|\;|\./,next:"regex_allowed"},{token:"paren.lparen",regex:/[\[({]/,next:"regex_allowed"},{token:"paren.rparen",regex:/[\])}]/},{token:"keyword.operator",regex:/\/=?/,next:"regex_allowed"},{token:"comment",regex:/^#!.*$/},{token:"text",regex:/\s+/}],regex_allowed:[{token:"comment",merge:!0,regex:"\\/\\*",next:"comment_regex_allowed"},{token:"comment",regex:"\\/\\/.*$"},{token:"string.regexp",regex:"\\/",next:"regex",merge:!0},{token:"text",regex:"\\s+"},{token:"empty",regex:"",next:"start"}],regex:[{token:"regexp.keyword.operator",regex:"\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",next:"regex"},{token:"string.regexp",regex:"/\\w*",next:"start",merge:!0},{token:"string.regexp",regex:"[^\\\\/\\[]+",next:"regex",merge:!0},{token:"string.regexp.charachterclass",regex:"\\[",next:"regex_character_class",merge:!0},{token:"empty",regex:"",next:"start"}],regex_character_class:[{token:"regexp.keyword.operator",regex:"\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",next:"regex_character_class"},{token:"string.regexp.charachterclass",regex:"]",next:"regex",merge:!0},{token:"string.regexp.charachterclass",regex:"[^\\\\\\]]+",next:"regex_character_class",merge:!0},{token:"empty",regex:"",next:"start"}],comment_regex_allowed:[{token:"comment",regex:".*?\\*\\/",merge:!0,next:"regex_allowed"},{token:"comment",merge:!0,regex:".+"}],comment:[{token:"comment",regex:".*?\\*\\/",merge:!0,next:"start"},{token:"comment",merge:!0,regex:".+"}],qqstring:[{token:"constant.language.escape",regex:l},{token:"string",regex:'[^"\\\\]+'},{token:"string",regex:'"',next:"start"}],qstring:[{token:"constant.language.escape",regex:l},{token:"string",regex:"[^'\\\\]+"},{token:"string",regex:"'",next:"start"}]},this.embedRules(g,"doc-",[(new g).getEndRule("start")])};d.inherits(i,h),b.JavaScriptHighlightRules=i}),define("ace/mode/doc_comment_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text_highlight_rules").TextHighlightRules,f=function(){this.$rules={start:[{token:"comment.doc.tag",regex:"@[\\w\\d_]+"},{token:"comment.doc",merge:!0,regex:"\\s+"},{token:"comment.doc",merge:!0,regex:"TODO"},{token:"comment.doc",merge:!0,regex:"[^@\\*]+"},{token:"comment.doc",merge:!0,regex:"."}]}};d.inherits(f,e),function(){this.getStartRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\/\\*(?=\\*)",next:a}},this.getEndRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\*\\/",next:a}}}.call(f.prototype),b.DocCommentHighlightRules=f}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../range").Range,e=function(){};(function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}}).call(e.prototype),b.MatchingBraceOutdent=e}),define("ace/mode/folding/cstyle",["require","exports","module","ace/lib/oop","ace/range","ace/mode/folding/fold_mode"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../../range").Range,f=a("./fold_mode").FoldMode,g=b.FoldMode=function(){};d.inherits(g,f),function(){this.foldingStartMarker=/(\{|\[)[^\}\]]*$|^\s*(\/\*)/,this.foldingStopMarker=/^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/,this.getFoldWidgetRange=function(a,b,c){var d=a.getLine(c),f=d.match(this.foldingStartMarker);if(f){var g=f.index;if(f[1])return this.openingBracketBlock(a,f[1],c,g);var h=a.getCommentFoldRange(c,g+f[0].length);return h.end.column-=2,h}if(b!=="markbeginend")return;var f=d.match(this.foldingStopMarker);if(f){var g=f.index+f[0].length;if(f[2]){var h=a.getCommentFoldRange(c,g);return h.end.column-=2,h}var i={row:c,column:g},j=a.$findOpeningBracket(f[1],i);if(!j)return;return j.column++,i.column--,e.fromPoints(j,i)}}}.call(g.prototype)}),define("ace/mode/css",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/css_highlight_rules","ace/mode/matching_brace_outdent","ace/worker/worker_client","ace/mode/folding/cstyle"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./css_highlight_rules").CssHighlightRules,h=a("./matching_brace_outdent").MatchingBraceOutdent,i=a("../worker/worker_client").WorkerClient,j=a("./folding/cstyle").FoldMode,k=function(){this.$tokenizer=new f((new g).getRules(),"i"),this.$outdent=new h,this.foldingRules=new j};d.inherits(k,e),function(){this.foldingRules="cStyle",this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a).tokens;if(e.length&&e[e.length-1].type=="comment")return d;var f=b.match(/^.*\{\s*$/);return f&&(d+=c),d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)},this.createWorker=function(a){var b=new i(["ace"],"worker-css.js","ace/mode/css_worker","Worker");return b.attachToDocument(a.getDocument()),b.on("csslint",function(b){var c=[];b.data.forEach(function(a){c.push({row:a.line-1,column:a.col-1,text:a.message,type:a.type,lint:a})}),a.setAnnotations(c)}),b}}.call(k.prototype),b.Mode=k}),define("ace/mode/css_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("./text_highlight_rules").TextHighlightRules,g=function(){var a=e.arrayToMap("animation-fill-mode|alignment-adjust|alignment-baseline|animation-delay|animation-direction|animation-duration|animation-iteration-count|animation-name|animation-play-state|animation-timing-function|animation|appearance|azimuth|backface-visibility|background-attachment|background-break|background-clip|background-color|background-image|background-origin|background-position|background-repeat|background-size|background|baseline-shift|binding|bleed|bookmark-label|bookmark-level|bookmark-state|bookmark-target|border-bottom|border-bottom-color|border-bottom-left-radius|border-bottom-right-radius|border-bottom-style|border-bottom-width|border-collapse|border-color|border-image|border-image-outset|border-image-repeat|border-image-slice|border-image-source|border-image-width|border-left|border-left-color|border-left-style|border-left-width|border-radius|border-right|border-right-color|border-right-style|border-right-width|border-spacing|border-style|border-top|border-top-color|border-top-left-radius|border-top-right-radius|border-top-style|border-top-width|border-width|border|bottom|box-align|box-decoration-break|box-direction|box-flex-group|box-flex|box-lines|box-ordinal-group|box-orient|box-pack|box-shadow|box-sizing|break-after|break-before|break-inside|caption-side|clear|clip|color-profile|color|column-count|column-fill|column-gap|column-rule|column-rule-color|column-rule-style|column-rule-width|column-span|column-width|columns|content|counter-increment|counter-reset|crop|cue-after|cue-before|cue|cursor|direction|display|dominant-baseline|drop-initial-after-adjust|drop-initial-after-align|drop-initial-before-adjust|drop-initial-before-align|drop-initial-size|drop-initial-value|elevation|empty-cells|fit|fit-position|float-offset|float|font-family|font-size|font-size-adjust|font-stretch|font-style|font-variant|font-weight|font|grid-columns|grid-rows|hanging-punctuation|height|hyphenate-after|hyphenate-before|hyphenate-character|hyphenate-lines|hyphenate-resource|hyphens|icon|image-orientation|image-rendering|image-resolution|inline-box-align|left|letter-spacing|line-height|line-stacking-ruby|line-stacking-shift|line-stacking-strategy|line-stacking|list-style-image|list-style-position|list-style-type|list-style|margin-bottom|margin-left|margin-right|margin-top|margin|mark-after|mark-before|mark|marks|marquee-direction|marquee-play-count|marquee-speed|marquee-style|max-height|max-width|min-height|min-width|move-to|nav-down|nav-index|nav-left|nav-right|nav-up|opacity|orphans|outline-color|outline-offset|outline-style|outline-width|outline|overflow-style|overflow-x|overflow-y|overflow|padding-bottom|padding-left|padding-right|padding-top|padding|page-break-after|page-break-before|page-break-inside|page-policy|page|pause-after|pause-before|pause|perspective-origin|perspective|phonemes|pitch-range|pitch|play-during|position|presentation-level|punctuation-trim|quotes|rendering-intent|resize|rest-after|rest-before|rest|richness|right|rotation-point|rotation|ruby-align|ruby-overhang|ruby-position|ruby-span|size|speak-header|speak-numeral|speak-punctuation|speak|speech-rate|stress|string-set|table-layout|target-name|target-new|target-position|target|text-align-last|text-align|text-decoration|text-emphasis|text-height|text-indent|text-justify|text-outline|text-shadow|text-transform|text-wrap|top|transform-origin|transform-style|transform|transition-delay|transition-duration|transition-property|transition-timing-function|transition|unicode-bidi|vertical-align|visibility|voice-balance|voice-duration|voice-family|voice-pitch-range|voice-pitch|voice-rate|voice-stress|voice-volume|volume|white-space-collapse|white-space|widows|width|word-break|word-spacing|word-wrap|z-index".split("|")),b=e.arrayToMap("rgb|rgba|url|attr|counter|counters".split("|")),c=e.arrayToMap("absolute|after-edge|after|all-scroll|all|alphabetic|always|antialiased|armenian|auto|avoid-column|avoid-page|avoid|balance|baseline|before-edge|before|below|bidi-override|block-line-height|block|bold|bolder|border-box|both|bottom|box|break-all|break-word|capitalize|caps-height|caption|center|central|char|circle|cjk-ideographic|clone|close-quote|col-resize|collapse|column|consider-shifts|contain|content-box|cover|crosshair|cubic-bezier|dashed|decimal-leading-zero|decimal|default|disabled|disc|disregard-shifts|distribute-all-lines|distribute-letter|distribute-space|distribute|dotted|double|e-resize|ease-in|ease-in-out|ease-out|ease|ellipsis|end|exclude-ruby|fill|fixed|font-size|font|georgian|glyphs|grid-height|groove|hand|hanging|hebrew|help|hidden|hiragana-iroha|hiragana|horizontal|icon|ideograph-alpha|ideograph-numeric|ideograph-parenthesis|ideograph-space|ideographic|inactive|include-ruby|inherit|initial|inline-block|inline-box|inline-line-height|inline-table|inline|inset|inside|inter-ideograph|inter-word|invert|italic|justify|katakana-iroha|katakana|keep-all|last|left|lighter|line-edge|line-through|line|linear|list-item|local|loose|lower-alpha|lower-greek|lower-latin|lower-roman|lowercase|lr-tb|ltr|mathematical|max-height|max-size|medium|menu|message-box|middle|move|n-resize|ne-resize|newspaper|no-change|no-close-quote|no-drop|no-open-quote|no-repeat|none|normal|not-allowed|nowrap|nw-resize|oblique|open-quote|outset|outside|overline|padding-box|page|pointer|pre-line|pre-wrap|pre|preserve-3d|progress|relative|repeat-x|repeat-y|repeat|replaced|reset-size|ridge|right|round|row-resize|rtl|s-resize|scroll|se-resize|separate|slice|small-caps|small-caption|solid|space|square|start|static|status-bar|step-end|step-start|steps|stretch|strict|sub|super|sw-resize|table-caption|table-cell|table-column-group|table-column|table-footer-group|table-header-group|table-row-group|table-row|table|tb-rl|text-after-edge|text-before-edge|text-bottom|text-size|text-top|text|thick|thin|top|transparent|underline|upper-alpha|upper-latin|upper-roman|uppercase|use-script|vertical-ideographic|vertical-text|visible|w-resize|wait|whitespace|z-index|zero".split("|")),d=e.arrayToMap("aqua|black|blue|fuchsia|gray|green|lime|maroon|navy|olive|orange|purple|red|silver|teal|white|yellow".split("|")),f=e.arrayToMap("arial|century|comic|courier|garamond|georgia|helvetica|impact|lucida|symbol|system|tahoma|times|trebuchet|utopia|verdana|webdings|sans-serif|serif|monospace".split("|")),g="\\-?(?:(?:[0-9]+)|(?:[0-9]*\\.[0-9]+))",h="(\\:+)\\b(after|before|first-letter|first-line|moz-selection|selection)\\b",i="(:)\\b(active|checked|disabled|empty|enabled|first-child|first-of-type|focus|hover|indeterminate|invalid|last-child|last-of-type|link|not|nth-child|nth-last-child|nth-last-of-type|nth-of-type|only-child|only-of-type|required|root|target|valid|visited)\\b",j=[{token:"comment",merge:!0,regex:"\\/\\*",next:"ruleset_comment"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:["constant.numeric","keyword"],regex:"("+g+")(ch|cm|deg|em|ex|fr|gd|grad|Hz|in|kHz|mm|ms|pc|pt|px|rad|rem|s|turn|vh|vm|vw|%)"},{token:["constant.numeric"],regex:"([0-9]+)"},{token:"constant.numeric",regex:"#[a-f0-9]{6}"},{token:"constant.numeric",regex:"#[a-f0-9]{3}"},{token:["punctuation","entity.other.attribute-name.pseudo-element.css"],regex:h},{token:["punctuation","entity.other.attribute-name.pseudo-class.css"],regex:i},{token:function(e){return a.hasOwnProperty(e.toLowerCase())?"support.type":b.hasOwnProperty(e.toLowerCase())?"support.function":c.hasOwnProperty(e.toLowerCase())?"support.constant":d.hasOwnProperty(e.toLowerCase())?"support.constant.color":f.hasOwnProperty(e.toLowerCase())?"support.constant.fonts":"text"},regex:"\\-?[a-zA-Z_][a-zA-Z0-9_\\-]*"}],k=e.copyArray(j);k.unshift({token:"paren.rparen",regex:"\\}",next:"start"});var l=e.copyArray(j);l.unshift({token:"paren.rparen",regex:"\\}",next:"media"});var m=[{token:"comment",merge:!0,regex:".+"}],n=e.copyArray(m);n.unshift({token:"comment",regex:".*?\\*\\/",next:"start"});var o=e.copyArray(m);o.unshift({token:"comment",regex:".*?\\*\\/",next:"media"});var p=e.copyArray(m);p.unshift({token:"comment",regex:".*?\\*\\/",next:"ruleset"}),this.$rules={start:[{token:"comment",merge:!0,regex:"\\/\\*",next:"comment"},{token:"paren.lparen",regex:"\\{",next:"ruleset"},{token:"string",regex:"@.*?{",next:"media"},{token:"keyword",regex:"#[a-z0-9-_]+"},{token:"variable",regex:"\\.[a-z0-9-_]+"},{token:"string",regex:":[a-z0-9-_]+"},{token:"constant",regex:"[a-z0-9-_]+"}],media:[{token:"comment",merge:!0,regex:"\\/\\*",next:"media_comment"},{token:"paren.lparen",regex:"\\{",next:"media_ruleset"},{token:"string",regex:"\\}",next:"start"},{token:"keyword",regex:"#[a-z0-9-_]+"},{token:"variable",regex:"\\.[a-z0-9-_]+"},{token:"string",regex:":[a-z0-9-_]+"},{token:"constant",regex:"[a-z0-9-_]+"}],comment:n,ruleset:k,ruleset_comment:p,media_ruleset:l,media_comment:o}};d.inherits(g,f),b.CssHighlightRules=g}),define("ace/mode/coldfusion_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/css_highlight_rules","ace/mode/javascript_highlight_rules","ace/mode/text_highlight_rules","ace/mode/xml_util"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./css_highlight_rules").CssHighlightRules,f=a("./javascript_highlight_rules").JavaScriptHighlightRules,g=a("./text_highlight_rules").TextHighlightRules,h=a("./xml_util"),i=function(){this.$rules={start:[{token:"text",merge:!0,regex:"<\\!\\[CDATA\\[",next:"cdata"},{token:"xml_pe",regex:"<\\?.*?\\?>"},{token:"comment",merge:!0,regex:"<\\!--",next:"comment"},{token:"meta.tag",regex:"<(?=s*script)",next:"script"},{token:"meta.tag",regex:"<(?=s*style)",next:"style"},{token:"meta.tag",regex:"<\\/?",next:"tag"},{token:"text",regex:"\\s+"},{token:"text",regex:"[^<]+"}],cdata:[{token:"text",regex:"\\]\\]>",next:"start"},{token:"text",merge:!0,regex:"\\s+"},{token:"text",merge:!0,regex:".+"}],comment:[{token:"comment",regex:".*?-->",next:"start"},{token:"comment",merge:!0,regex:".+"}]},h.tag(this.$rules,"tag","start"),h.tag(this.$rules,"style","css-start"),h.tag(this.$rules,"script","js-start"),this.embedRules(f,"js-",[{token:"comment",regex:"\\/\\/.*(?=<\\/script>)",next:"tag"},{token:"meta.tag",regex:"<\\/(?=script)",next:"tag"}]),this.embedRules(e,"css-",[{token:"meta.tag",regex:"<\\/(?=style)",next:"tag"}])};d.inherits(i,g),b.ColdfusionHighlightRules=i})
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-csharp-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-csharp-uncompressed.js
deleted file mode 100644
index 3e83d27d72..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-csharp-uncompressed.js
+++ /dev/null
@@ -1,770 +0,0 @@
-define('ace/mode/csharp', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/csharp_highlight_rules', 'ace/mode/matching_brace_outdent', 'ace/mode/behaviour/cstyle', 'ace/mode/folding/cstyle'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
-var CSharpHighlightRules = require("./csharp_highlight_rules").CSharpHighlightRules;
-var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
-var CstyleBehaviour = require("./behaviour/cstyle").CstyleBehaviour;
-var CStyleFoldMode = require("./folding/cstyle").FoldMode;
-
-var Mode = function() {
-    this.$tokenizer = new Tokenizer(new CSharpHighlightRules().getRules());
-    this.$outdent = new MatchingBraceOutdent();
-    this.$behaviour = new CstyleBehaviour();
-    this.foldingRules = new CStyleFoldMode();
-};
-oop.inherits(Mode, TextMode);
-
-(function() {
-    
-    this.getNextLineIndent = function(state, line, tab) {
-        var indent = this.$getIndent(line);
-  
-        var tokenizedLine = this.$tokenizer.getLineTokens(line, state);
-        var tokens = tokenizedLine.tokens;
-  
-        if (tokens.length && tokens[tokens.length-1].type == "comment") {
-            return indent;
-        }
-    
-        if (state == "start") {
-            var match = line.match(/^.*[\{\(\[]\s*$/);
-            if (match) {
-                indent += tab;
-            }
-        }
-  
-        return indent;
-    };
-
-    this.checkOutdent = function(state, line, input) {
-        return this.$outdent.checkOutdent(line, input);
-    };
-  
-    this.autoOutdent = function(state, doc, row) {
-        this.$outdent.autoOutdent(doc, row);
-    };
-
-
-    this.createWorker = function(session) {
-        return null;
-    };
-
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-});
-define('ace/mode/csharp_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/mode/doc_comment_highlight_rules', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var lang = require("../lib/lang");
-var DocCommentHighlightRules = require("./doc_comment_highlight_rules").DocCommentHighlightRules;
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var CSharpHighlightRules = function() {
-    
-    var keywords = lang.arrayToMap(
-    ("abstract|event|new|struct|as|explicit|null|switch|base|extern|object|this|bool|false|operator|throw|break|finally|out|true|byte|fixed|override|try|case|float|params|typeof|catch|for|private|uint|char|foreach|protected|ulong|checked|goto|public|unchecked|class|if|readonly|unsafe|const|implicit|ref|ushort|continue|in|return|using|decimal|int|sbyte|virtual|default|interface|sealed|volatile|delegate|internal|short|void|do|is|sizeof|while|double|lock|stackalloc|else|long|static|enum|namespace|string|var|dynamic").split("|")
-    );
-
-    var buildinConstants = lang.arrayToMap(
-        ("null|true|false").split("|")
-    );
-
-
-    // regexp must not have capturing parentheses. Use (?:) instead.
-    // regexps are ordered -> the first match is used
-
-    this.$rules = {
-        "start" : [
-            {
-                token : "comment",
-                regex : "\\/\\/.*$"
-            },
-            new DocCommentHighlightRules().getStartRule("doc-start"),
-            {
-                token : "comment", // multi line comment
-                regex : "\\/\\*",
-                merge : true,
-                next : "comment"
-            }, {
-                token : "string.regexp",
-                regex : "[/](?:(?:\\[(?:\\\\]|[^\\]])+\\])|(?:\\\\/|[^\\]/]))*[/]\\w*\\s*(?=[).,;]|$)"
-            }, {
-                token : "string", // single line
-                regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
-            }, {
-                token : "string", // single line
-                regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"
-            }, {
-                token : "constant.numeric", // hex
-                regex : "0[xX][0-9a-fA-F]+\\b"
-            }, {
-                token : "constant.numeric", // float
-                regex : "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"
-            }, {
-                token : "constant.language.boolean",
-                regex : "(?:true|false)\\b"
-            }, {
-                token : function(value) {
-                    if (value == "this")
-                        return "variable.language";
-                    else if (keywords.hasOwnProperty(value))
-                        return "keyword";
-                    else if (buildinConstants.hasOwnProperty(value))
-                        return "constant.language";
-                    else
-                        return "identifier";
-                },
-                // TODO: Unicode escape sequences
-                // TODO: Unicode identifiers
-                regex : "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
-            }, {
-                token : "keyword.operator",
-                regex : "!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)"
-            }, {
-                token : "punctuation.operator",
-                regex : "\\?|\\:|\\,|\\;|\\."
-            }, {
-                token : "paren.lparen",
-                regex : "[[({]"
-            }, {
-                token : "paren.rparen",
-                regex : "[\\])}]"
-            }, {
-                token : "text",
-                regex : "\\s+"
-            }
-        ],
-        "comment" : [
-            {
-                token : "comment", // closing comment
-                regex : ".*?\\*\\/",
-                next : "start"
-            }, {
-                token : "comment", // comment spanning whole line
-                merge : true,
-                regex : ".+"
-            }
-        ]
-    };
-    
-    this.embedRules(DocCommentHighlightRules, "doc-",
-        [ new DocCommentHighlightRules().getEndRule("start") ]);
-};
-
-oop.inherits(CSharpHighlightRules, TextHighlightRules);
-
-exports.CSharpHighlightRules = CSharpHighlightRules;
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/doc_comment_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var DocCommentHighlightRules = function() {
-
-    this.$rules = {
-        "start" : [ {
-            token : "comment.doc.tag",
-            regex : "@[\\w\\d_]+" // TODO: fix email addresses
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "\\s+"
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "TODO"
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "[^@\\*]+"
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "."
-        }]
-    };
-};
-
-oop.inherits(DocCommentHighlightRules, TextHighlightRules);
-
-(function() {
-
-    this.getStartRule = function(start) {
-        return {
-            token : "comment.doc", // doc comment
-            merge : true,
-            regex : "\\/\\*(?=\\*)",
-            next  : start
-        };
-    };
-    
-    this.getEndRule = function (start) {
-        return {
-            token : "comment.doc", // closing comment
-            merge : true,
-            regex : "\\*\\/",
-            next  : start
-        };
-    };
-
-}).call(DocCommentHighlightRules.prototype);
-
-exports.DocCommentHighlightRules = DocCommentHighlightRules;
-
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/matching_brace_outdent', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../range").Range;
-
-var MatchingBraceOutdent = function() {};
-
-(function() {
-
-    this.checkOutdent = function(line, input) {
-        if (! /^\s+$/.test(line))
-            return false;
-
-        return /^\s*\}/.test(input);
-    };
-
-    this.autoOutdent = function(doc, row) {
-        var line = doc.getLine(row);
-        var match = line.match(/^(\s*\})/);
-
-        if (!match) return 0;
-
-        var column = match[1].length;
-        var openBracePos = doc.findMatchingBracket({row: row, column: column});
-
-        if (!openBracePos || openBracePos.row == row) return 0;
-
-        var indent = this.$getIndent(doc.getLine(openBracePos.row));
-        doc.replace(new Range(row, 0, row, column-1), indent);
-    };
-
-    this.$getIndent = function(line) {
-        var match = line.match(/^(\s+)/);
-        if (match) {
-            return match[1];
-        }
-
-        return "";
-    };
-
-}).call(MatchingBraceOutdent.prototype);
-
-exports.MatchingBraceOutdent = MatchingBraceOutdent;
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Chris Spencer <chris.ag.spencer AT googlemail DOT com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/behaviour/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/behaviour'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var Behaviour = require('../behaviour').Behaviour;
-
-var CstyleBehaviour = function () {
-
-    this.add("braces", "insertion", function (state, action, editor, session, text) {
-        if (text == '{') {
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: '{' + selected + '}',
-                    selection: false
-                };
-            } else {
-                return {
-                    text: '{}',
-                    selection: [1, 1]
-                };
-            }
-        } else if (text == '}') {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == '}') {
-                var matching = session.$findOpeningBracket('}', {column: cursor.column + 1, row: cursor.row});
-                if (matching !== null) {
-                    return {
-                        text: '',
-                        selection: [1, 1]
-                    };
-                }
-            }
-        } else if (text == "\n") {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == '}') {
-                var openBracePos = session.findMatchingBracket({row: cursor.row, column: cursor.column + 1});
-                if (!openBracePos)
-                     return null;
-
-                var indent = this.getNextLineIndent(state, line.substring(0, line.length - 1), session.getTabString());
-                var next_indent = this.$getIndent(session.doc.getLine(openBracePos.row));
-
-                return {
-                    text: '\n' + indent + '\n' + next_indent,
-                    selection: [1, indent.length, 1, indent.length]
-                };
-            }
-        }
-    });
-
-    this.add("braces", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && selected == '{') {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.end.column, range.end.column + 1);
-            if (rightChar == '}') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-    this.add("parens", "insertion", function (state, action, editor, session, text) {
-        if (text == '(') {
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: '(' + selected + ')',
-                    selection: false
-                };
-            } else {
-                return {
-                    text: '()',
-                    selection: [1, 1]
-                };
-            }
-        } else if (text == ')') {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == ')') {
-                var matching = session.$findOpeningBracket(')', {column: cursor.column + 1, row: cursor.row});
-                if (matching !== null) {
-                    return {
-                        text: '',
-                        selection: [1, 1]
-                    };
-                }
-            }
-        }
-    });
-
-    this.add("parens", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && selected == '(') {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
-            if (rightChar == ')') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-    this.add("string_dquotes", "insertion", function (state, action, editor, session, text) {
-        if (text == '"' || text == "'") {
-            var quote = text;
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: quote + selected + quote,
-                    selection: false
-                };
-            } else {
-                var cursor = editor.getCursorPosition();
-                var line = session.doc.getLine(cursor.row);
-                var leftChar = line.substring(cursor.column-1, cursor.column);
-
-                // We're escaped.
-                if (leftChar == '\\') {
-                    return null;
-                }
-
-                // Find what token we're inside.
-                var tokens = session.getTokens(selection.start.row, selection.start.row)[0].tokens;
-                var col = 0, token;
-                var quotepos = -1; // Track whether we're inside an open quote.
-
-                for (var x = 0; x < tokens.length; x++) {
-                    token = tokens[x];
-                    if (token.type == "string") {
-                      quotepos = -1;
-                    } else if (quotepos < 0) {
-                      quotepos = token.value.indexOf(quote);
-                    }
-                    if ((token.value.length + col) > selection.start.column) {
-                        break;
-                    }
-                    col += tokens[x].value.length;
-                }
-
-                // Try and be smart about when we auto insert.
-                if (!token || (quotepos < 0 && token.type !== "comment" && (token.type !== "string" || ((selection.start.column !== token.value.length+col-1) && token.value.lastIndexOf(quote) === token.value.length-1)))) {
-                    return {
-                        text: quote + quote,
-                        selection: [1,1]
-                    };
-                } else if (token && token.type === "string") {
-                    // Ignore input and move right one if we're typing over the closing quote.
-                    var rightChar = line.substring(cursor.column, cursor.column + 1);
-                    if (rightChar == quote) {
-                        return {
-                            text: '',
-                            selection: [1, 1]
-                        };
-                    }
-                }
-            }
-        }
-    });
-
-    this.add("string_dquotes", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && (selected == '"' || selected == "'")) {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
-            if (rightChar == '"') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-};
-
-oop.inherits(CstyleBehaviour, Behaviour);
-
-exports.CstyleBehaviour = CstyleBehaviour;
-});/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/folding/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/range', 'ace/mode/folding/fold_mode'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var Range = require("../../range").Range;
-var BaseFoldMode = require("./fold_mode").FoldMode;
-
-var FoldMode = exports.FoldMode = function() {};
-oop.inherits(FoldMode, BaseFoldMode);
-
-(function() {
-
-    this.foldingStartMarker = /(\{|\[)[^\}\]]*$|^\s*(\/\*)/;
-    this.foldingStopMarker = /^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/;
-    
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        var line = session.getLine(row);
-        var match = line.match(this.foldingStartMarker);
-        if (match) {
-            var i = match.index;
-
-            if (match[1])
-                return this.openingBracketBlock(session, match[1], row, i);
-
-            var range = session.getCommentFoldRange(row, i + match[0].length);
-            range.end.column -= 2;
-            return range;
-        }
-
-        if (foldStyle !== "markbeginend")
-            return;
-            
-        var match = line.match(this.foldingStopMarker);
-        if (match) {
-            var i = match.index + match[0].length;
-
-            if (match[2]) {
-                var range = session.getCommentFoldRange(row, i);
-                range.end.column -= 2;
-                return range;
-            }
-
-            var end = {row: row, column: i};
-            var start = session.$findOpeningBracket(match[1], end);
-            
-            if (!start)
-                return;
-
-            start.column++;
-            end.column--;
-
-            return  Range.fromPoints(start, end);
-        }
-    };
-    
-}).call(FoldMode.prototype);
-
-});/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/folding/fold_mode', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../../range").Range;
-
-var FoldMode = exports.FoldMode = function() {};
-
-(function() {
-
-    this.foldingStartMarker = null;
-    this.foldingStopMarker = null;
-
-    // must return "" if there's no fold, to enable caching
-    this.getFoldWidget = function(session, foldStyle, row) {
-        var line = session.getLine(row);
-        if (this.foldingStartMarker.test(line))
-            return "start";
-        if (foldStyle == "markbeginend"
-                && this.foldingStopMarker
-                && this.foldingStopMarker.test(line))
-            return "end";
-        return "";
-    };
-    
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        return null;
-    };
-
-    this.indentationBlock = function(session, row, column) {
-        var re = /^\s*/;
-        var startRow = row;
-        var endRow = row;
-        var line = session.getLine(row);
-        var startColumn = column || line.length;
-        var startLevel = line.match(re)[0].length;
-        var maxRow = session.getLength()
-        
-        while (++row < maxRow) {
-            line = session.getLine(row);
-            var level = line.match(re)[0].length;
-
-            if (level == line.length)
-                continue;
-
-            if (level <= startLevel)
-                break;
-
-            endRow = row;
-        }
-
-        if (endRow > startRow) {
-            var endColumn = session.getLine(endRow).length;
-            return new Range(startRow, startColumn, endRow, endColumn);
-        }
-    };
-
-    this.openingBracketBlock = function(session, bracket, row, column) {
-        var start = {row: row, column: column + 1};
-        var end = session.$findClosingBracket(bracket, start);
-        if (!end)
-            return;
-
-        var fw = session.foldWidgets[end.row];
-        if (fw == null)
-            fw = this.getFoldWidget(session, end.row);
-
-        if (fw == "start") {
-            end.row --;
-            end.column = session.getLine(end.row).length;
-        }
-        return Range.fromPoints(start, end);
-    };
-
-}).call(FoldMode.prototype);
-
-});
diff --git a/apps/files_texteditor/js/aceeditor/mode-csharp.js b/apps/files_texteditor/js/aceeditor/mode-csharp.js
deleted file mode 100644
index 642ee6e7b1..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-csharp.js
+++ /dev/null
@@ -1 +0,0 @@
-define("ace/mode/csharp",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/csharp_highlight_rules","ace/mode/matching_brace_outdent","ace/mode/behaviour/cstyle","ace/mode/folding/cstyle"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./csharp_highlight_rules").CSharpHighlightRules,h=a("./matching_brace_outdent").MatchingBraceOutdent,i=a("./behaviour/cstyle").CstyleBehaviour,j=a("./folding/cstyle").FoldMode,k=function(){this.$tokenizer=new f((new g).getRules()),this.$outdent=new h,this.$behaviour=new i,this.foldingRules=new j};d.inherits(k,e),function(){this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a),f=e.tokens;if(f.length&&f[f.length-1].type=="comment")return d;if(a=="start"){var g=b.match(/^.*[\{\(\[]\s*$/);g&&(d+=c)}return d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)},this.createWorker=function(a){return null}}.call(k.prototype),b.Mode=k}),define("ace/mode/csharp_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/doc_comment_highlight_rules","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("./doc_comment_highlight_rules").DocCommentHighlightRules,g=a("./text_highlight_rules").TextHighlightRules,h=function(){var a=e.arrayToMap("abstract|event|new|struct|as|explicit|null|switch|base|extern|object|this|bool|false|operator|throw|break|finally|out|true|byte|fixed|override|try|case|float|params|typeof|catch|for|private|uint|char|foreach|protected|ulong|checked|goto|public|unchecked|class|if|readonly|unsafe|const|implicit|ref|ushort|continue|in|return|using|decimal|int|sbyte|virtual|default|interface|sealed|volatile|delegate|internal|short|void|do|is|sizeof|while|double|lock|stackalloc|else|long|static|enum|namespace|string|var|dynamic".split("|")),b=e.arrayToMap("null|true|false".split("|"));this.$rules={start:[{token:"comment",regex:"\\/\\/.*$"},(new f).getStartRule("doc-start"),{token:"comment",regex:"\\/\\*",merge:!0,next:"comment"},{token:"string.regexp",regex:"[/](?:(?:\\[(?:\\\\]|[^\\]])+\\])|(?:\\\\/|[^\\]/]))*[/]\\w*\\s*(?=[).,;]|$)"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:"constant.numeric",regex:"0[xX][0-9a-fA-F]+\\b"},{token:"constant.numeric",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:"constant.language.boolean",regex:"(?:true|false)\\b"},{token:function(c){return c=="this"?"variable.language":a.hasOwnProperty(c)?"keyword":b.hasOwnProperty(c)?"constant.language":"identifier"},regex:"[a-zA-Z_$][a-zA-Z0-9_$]*\\b"},{token:"keyword.operator",regex:"!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)"},{token:"punctuation.operator",regex:"\\?|\\:|\\,|\\;|\\."},{token:"paren.lparen",regex:"[[({]"},{token:"paren.rparen",regex:"[\\])}]"},{token:"text",regex:"\\s+"}],comment:[{token:"comment",regex:".*?\\*\\/",next:"start"},{token:"comment",merge:!0,regex:".+"}]},this.embedRules(f,"doc-",[(new f).getEndRule("start")])};d.inherits(h,g),b.CSharpHighlightRules=h}),define("ace/mode/doc_comment_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text_highlight_rules").TextHighlightRules,f=function(){this.$rules={start:[{token:"comment.doc.tag",regex:"@[\\w\\d_]+"},{token:"comment.doc",merge:!0,regex:"\\s+"},{token:"comment.doc",merge:!0,regex:"TODO"},{token:"comment.doc",merge:!0,regex:"[^@\\*]+"},{token:"comment.doc",merge:!0,regex:"."}]}};d.inherits(f,e),function(){this.getStartRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\/\\*(?=\\*)",next:a}},this.getEndRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\*\\/",next:a}}}.call(f.prototype),b.DocCommentHighlightRules=f}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../range").Range,e=function(){};(function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}}).call(e.prototype),b.MatchingBraceOutdent=e}),define("ace/mode/behaviour/cstyle",["require","exports","module","ace/lib/oop","ace/mode/behaviour"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../behaviour").Behaviour,f=function(){this.add("braces","insertion",function(a,b,c,d,e){if(e=="{"){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"{"+g+"}",selection:!1}:{text:"{}",selection:[1,1]}}if(e=="}"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var k=d.$findOpeningBracket("}",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}else if(e=="\n"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var l=d.findMatchingBracket({row:h.row,column:h.column+1});if(!l)return null;var m=this.getNextLineIndent(a,i.substring(0,i.length-1),d.getTabString()),n=this.$getIndent(d.doc.getLine(l.row));return{text:"\n"+m+"\n"+n,selection:[1,m.length,1,m.length]}}}}),this.add("braces","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="{"){var g=d.doc.getLine(e.start.row),h=g.substring(e.end.column,e.end.column+1);if(h=="}")return e.end.column++,e}}),this.add("parens","insertion",function(a,b,c,d,e){if(e=="("){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"("+g+")",selection:!1}:{text:"()",selection:[1,1]}}if(e==")"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j==")"){var k=d.$findOpeningBracket(")",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}}),this.add("parens","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="("){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h==")")return e.end.column++,e}}),this.add("string_dquotes","insertion",function(a,b,c,d,e){if(e=='"'||e=="'"){var f=e,g=c.getSelectionRange(),h=d.doc.getTextRange(g);if(h!=="")return{text:f+h+f,selection:!1};var i=c.getCursorPosition(),j=d.doc.getLine(i.row),k=j.substring(i.column-1,i.column);if(k=="\\")return null;var l=d.getTokens(g.start.row,g.start.row)[0].tokens,m=0,n,o=-1;for(var p=0;p<l.length;p++){n=l[p],n.type=="string"?o=-1:o<0&&(o=n.value.indexOf(f));if(n.value.length+m>g.start.column)break;m+=l[p].value.length}if(!n||o<0&&n.type!=="comment"&&(n.type!=="string"||g.start.column!==n.value.length+m-1&&n.value.lastIndexOf(f)===n.value.length-1))return{text:f+f,selection:[1,1]};if(n&&n.type==="string"){var q=j.substring(i.column,i.column+1);if(q==f)return{text:"",selection:[1,1]}}}}),this.add("string_dquotes","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&(f=='"'||f=="'")){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h=='"')return e.end.column++,e}})};d.inherits(f,e),b.CstyleBehaviour=f}),define("ace/mode/folding/cstyle",["require","exports","module","ace/lib/oop","ace/range","ace/mode/folding/fold_mode"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../../range").Range,f=a("./fold_mode").FoldMode,g=b.FoldMode=function(){};d.inherits(g,f),function(){this.foldingStartMarker=/(\{|\[)[^\}\]]*$|^\s*(\/\*)/,this.foldingStopMarker=/^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/,this.getFoldWidgetRange=function(a,b,c){var d=a.getLine(c),f=d.match(this.foldingStartMarker);if(f){var g=f.index;if(f[1])return this.openingBracketBlock(a,f[1],c,g);var h=a.getCommentFoldRange(c,g+f[0].length);return h.end.column-=2,h}if(b!=="markbeginend")return;var f=d.match(this.foldingStopMarker);if(f){var g=f.index+f[0].length;if(f[2]){var h=a.getCommentFoldRange(c,g);return h.end.column-=2,h}var i={row:c,column:g},j=a.$findOpeningBracket(f[1],i);if(!j)return;return j.column++,i.column--,e.fromPoints(j,i)}}}.call(g.prototype)}),define("ace/mode/folding/fold_mode",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../../range").Range,e=b.FoldMode=function(){};(function(){this.foldingStartMarker=null,this.foldingStopMarker=null,this.getFoldWidget=function(a,b,c){var d=a.getLine(c);return this.foldingStartMarker.test(d)?"start":b=="markbeginend"&&this.foldingStopMarker&&this.foldingStopMarker.test(d)?"end":""},this.getFoldWidgetRange=function(a,b,c){return null},this.indentationBlock=function(a,b,c){var e=/^\s*/,f=b,g=b,h=a.getLine(b),i=c||h.length,j=h.match(e)[0].length,k=a.getLength();while(++b<k){h=a.getLine(b);var l=h.match(e)[0].length;if(l==h.length)continue;if(l<=j)break;g=b}if(g>f){var m=a.getLine(g).length;return new d(f,i,g,m)}},this.openingBracketBlock=function(a,b,c,e){var f={row:c,column:e+1},g=a.$findClosingBracket(b,f);if(!g)return;var h=a.foldWidgets[g.row];return h==null&&(h=this.getFoldWidget(a,g.row)),h=="start"&&(g.row--,g.column=a.getLine(g.row).length),d.fromPoints(f,g)}}).call(e.prototype)})
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-css-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-css-uncompressed.js
deleted file mode 100644
index 44505d19b6..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-css-uncompressed.js
+++ /dev/null
@@ -1,640 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/css', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/css_highlight_rules', 'ace/mode/matching_brace_outdent', 'ace/worker/worker_client', 'ace/mode/folding/cstyle'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
-var CssHighlightRules = require("./css_highlight_rules").CssHighlightRules;
-var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
-var WorkerClient = require("../worker/worker_client").WorkerClient;
-var CStyleFoldMode = require("./folding/cstyle").FoldMode;
-
-var Mode = function() {
-    this.$tokenizer = new Tokenizer(new CssHighlightRules().getRules(), "i");
-    this.$outdent = new MatchingBraceOutdent();
-    this.foldingRules = new CStyleFoldMode();
-};
-oop.inherits(Mode, TextMode);
-
-(function() {
-
-    this.foldingRules = "cStyle";
-
-    this.getNextLineIndent = function(state, line, tab) {
-        var indent = this.$getIndent(line);
-
-        // ignore braces in comments
-        var tokens = this.$tokenizer.getLineTokens(line, state).tokens;
-        if (tokens.length && tokens[tokens.length-1].type == "comment") {
-            return indent;
-        }
-
-        var match = line.match(/^.*\{\s*$/);
-        if (match) {
-            indent += tab;
-        }
-
-        return indent;
-    };
-
-    this.checkOutdent = function(state, line, input) {
-        return this.$outdent.checkOutdent(line, input);
-    };
-
-    this.autoOutdent = function(state, doc, row) {
-        this.$outdent.autoOutdent(doc, row);
-    };
-    
-    this.createWorker = function(session) {
-        var worker = new WorkerClient(["ace"], "worker-css.js", "ace/mode/css_worker", "Worker");
-        worker.attachToDocument(session.getDocument());
-        
-        worker.on("csslint", function(e) {
-            var errors = [];
-            e.data.forEach(function(message) {
-                errors.push({
-                    row: message.line - 1,
-                    column: message.col - 1,
-                    text: message.message,
-                    type: message.type,
-                    lint: message
-                });
-            });
-            
-            session.setAnnotations(errors);
-        });
-        return worker;
-    };
-
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/css_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var lang = require("../lib/lang");
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var CssHighlightRules = function() {
-
-    var properties = lang.arrayToMap(
-        ("animation-fill-mode|alignment-adjust|alignment-baseline|animation-delay|animation-direction|animation-duration|animation-iteration-count|animation-name|animation-play-state|animation-timing-function|animation|appearance|azimuth|backface-visibility|background-attachment|background-break|background-clip|background-color|background-image|background-origin|background-position|background-repeat|background-size|background|baseline-shift|binding|bleed|bookmark-label|bookmark-level|bookmark-state|bookmark-target|border-bottom|border-bottom-color|border-bottom-left-radius|border-bottom-right-radius|border-bottom-style|border-bottom-width|border-collapse|border-color|border-image|border-image-outset|border-image-repeat|border-image-slice|border-image-source|border-image-width|border-left|border-left-color|border-left-style|border-left-width|border-radius|border-right|border-right-color|border-right-style|border-right-width|border-spacing|border-style|border-top|border-top-color|border-top-left-radius|border-top-right-radius|border-top-style|border-top-width|border-width|border|bottom|box-align|box-decoration-break|box-direction|box-flex-group|box-flex|box-lines|box-ordinal-group|box-orient|box-pack|box-shadow|box-sizing|break-after|break-before|break-inside|caption-side|clear|clip|color-profile|color|column-count|column-fill|column-gap|column-rule|column-rule-color|column-rule-style|column-rule-width|column-span|column-width|columns|content|counter-increment|counter-reset|crop|cue-after|cue-before|cue|cursor|direction|display|dominant-baseline|drop-initial-after-adjust|drop-initial-after-align|drop-initial-before-adjust|drop-initial-before-align|drop-initial-size|drop-initial-value|elevation|empty-cells|fit|fit-position|float-offset|float|font-family|font-size|font-size-adjust|font-stretch|font-style|font-variant|font-weight|font|grid-columns|grid-rows|hanging-punctuation|height|hyphenate-after|hyphenate-before|hyphenate-character|hyphenate-lines|hyphenate-resource|hyphens|icon|image-orientation|image-rendering|image-resolution|inline-box-align|left|letter-spacing|line-height|line-stacking-ruby|line-stacking-shift|line-stacking-strategy|line-stacking|list-style-image|list-style-position|list-style-type|list-style|margin-bottom|margin-left|margin-right|margin-top|margin|mark-after|mark-before|mark|marks|marquee-direction|marquee-play-count|marquee-speed|marquee-style|max-height|max-width|min-height|min-width|move-to|nav-down|nav-index|nav-left|nav-right|nav-up|opacity|orphans|outline-color|outline-offset|outline-style|outline-width|outline|overflow-style|overflow-x|overflow-y|overflow|padding-bottom|padding-left|padding-right|padding-top|padding|page-break-after|page-break-before|page-break-inside|page-policy|page|pause-after|pause-before|pause|perspective-origin|perspective|phonemes|pitch-range|pitch|play-during|position|presentation-level|punctuation-trim|quotes|rendering-intent|resize|rest-after|rest-before|rest|richness|right|rotation-point|rotation|ruby-align|ruby-overhang|ruby-position|ruby-span|size|speak-header|speak-numeral|speak-punctuation|speak|speech-rate|stress|string-set|table-layout|target-name|target-new|target-position|target|text-align-last|text-align|text-decoration|text-emphasis|text-height|text-indent|text-justify|text-outline|text-shadow|text-transform|text-wrap|top|transform-origin|transform-style|transform|transition-delay|transition-duration|transition-property|transition-timing-function|transition|unicode-bidi|vertical-align|visibility|voice-balance|voice-duration|voice-family|voice-pitch-range|voice-pitch|voice-rate|voice-stress|voice-volume|volume|white-space-collapse|white-space|widows|width|word-break|word-spacing|word-wrap|z-index").split("|")
-    );
-
-    var functions = lang.arrayToMap(
-        ("rgb|rgba|url|attr|counter|counters").split("|")
-    );
-
-    var constants = lang.arrayToMap(
-        ("absolute|after-edge|after|all-scroll|all|alphabetic|always|antialiased|armenian|auto|avoid-column|avoid-page|avoid|balance|baseline|before-edge|before|below|bidi-override|block-line-height|block|bold|bolder|border-box|both|bottom|box|break-all|break-word|capitalize|caps-height|caption|center|central|char|circle|cjk-ideographic|clone|close-quote|col-resize|collapse|column|consider-shifts|contain|content-box|cover|crosshair|cubic-bezier|dashed|decimal-leading-zero|decimal|default|disabled|disc|disregard-shifts|distribute-all-lines|distribute-letter|distribute-space|distribute|dotted|double|e-resize|ease-in|ease-in-out|ease-out|ease|ellipsis|end|exclude-ruby|fill|fixed|font-size|font|georgian|glyphs|grid-height|groove|hand|hanging|hebrew|help|hidden|hiragana-iroha|hiragana|horizontal|icon|ideograph-alpha|ideograph-numeric|ideograph-parenthesis|ideograph-space|ideographic|inactive|include-ruby|inherit|initial|inline-block|inline-box|inline-line-height|inline-table|inline|inset|inside|inter-ideograph|inter-word|invert|italic|justify|katakana-iroha|katakana|keep-all|last|left|lighter|line-edge|line-through|line|linear|list-item|local|loose|lower-alpha|lower-greek|lower-latin|lower-roman|lowercase|lr-tb|ltr|mathematical|max-height|max-size|medium|menu|message-box|middle|move|n-resize|ne-resize|newspaper|no-change|no-close-quote|no-drop|no-open-quote|no-repeat|none|normal|not-allowed|nowrap|nw-resize|oblique|open-quote|outset|outside|overline|padding-box|page|pointer|pre-line|pre-wrap|pre|preserve-3d|progress|relative|repeat-x|repeat-y|repeat|replaced|reset-size|ridge|right|round|row-resize|rtl|s-resize|scroll|se-resize|separate|slice|small-caps|small-caption|solid|space|square|start|static|status-bar|step-end|step-start|steps|stretch|strict|sub|super|sw-resize|table-caption|table-cell|table-column-group|table-column|table-footer-group|table-header-group|table-row-group|table-row|table|tb-rl|text-after-edge|text-before-edge|text-bottom|text-size|text-top|text|thick|thin|top|transparent|underline|upper-alpha|upper-latin|upper-roman|uppercase|use-script|vertical-ideographic|vertical-text|visible|w-resize|wait|whitespace|z-index|zero").split("|")
-    );
-
-    var colors = lang.arrayToMap(
-        ("aqua|black|blue|fuchsia|gray|green|lime|maroon|navy|olive|orange|" +
-        "purple|red|silver|teal|white|yellow").split("|")
-    );
-
-    var fonts = lang.arrayToMap(
-        ("arial|century|comic|courier|garamond|georgia|helvetica|impact|lucida|" +
-        "symbol|system|tahoma|times|trebuchet|utopia|verdana|webdings|sans-serif|" +
-        "serif|monospace").split("|")
-    );
-    
-    // regexp must not have capturing parentheses. Use (?:) instead.
-    // regexps are ordered -> the first match is used
-
-    var numRe = "\\-?(?:(?:[0-9]+)|(?:[0-9]*\\.[0-9]+))";
-    var pseudoElements = "(\\:+)\\b(after|before|first-letter|first-line|moz-selection|selection)\\b";
-    var pseudoClasses = "(:)\\b(active|checked|disabled|empty|enabled|first-child|first-of-type|focus|hover|indeterminate|invalid|last-child|last-of-type|link|not|nth-child|nth-last-child|nth-last-of-type|nth-of-type|only-child|only-of-type|required|root|target|valid|visited)\\b";
-    
-    var base_ruleset = [
-        {
-            token : "comment", // multi line comment
-            merge : true,
-            regex : "\\/\\*",
-            next : "ruleset_comment"
-        }, {
-            token : "string", // single line
-            regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
-        }, {
-            token : "string", // single line
-            regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"
-        }, {
-            token : ["constant.numeric", "keyword"],
-            regex : "(" + numRe + ")(ch|cm|deg|em|ex|fr|gd|grad|Hz|in|kHz|mm|ms|pc|pt|px|rad|rem|s|turn|vh|vm|vw|%)"
-        }, {
-            token : ["constant.numeric"],
-            regex : "([0-9]+)"
-        }, {
-            token : "constant.numeric",  // hex6 color
-            regex : "#[a-f0-9]{6}"
-        }, {
-            token : "constant.numeric", // hex3 color
-            regex : "#[a-f0-9]{3}"
-        }, {
-            token : ["punctuation", "entity.other.attribute-name.pseudo-element.css"], 
-            regex : pseudoElements
-        }, {
-            token : ["punctuation", "entity.other.attribute-name.pseudo-class.css"], 
-            regex : pseudoClasses
-        }, {
-            token : function(value) {
-                if (properties.hasOwnProperty(value.toLowerCase())) {
-                    return "support.type";
-                }
-                else if (functions.hasOwnProperty(value.toLowerCase())) {
-                    return "support.function";
-                }
-                else if (constants.hasOwnProperty(value.toLowerCase())) {
-                    return "support.constant";
-                }
-                else if (colors.hasOwnProperty(value.toLowerCase())) {
-                    return "support.constant.color";
-                }
-                else if (fonts.hasOwnProperty(value.toLowerCase())) {
-                    return "support.constant.fonts";
-                }
-                else {
-                    return "text";
-                }
-            },
-            regex : "\\-?[a-zA-Z_][a-zA-Z0-9_\\-]*"
-        } 
-      ];
-
-    var ruleset = lang.copyArray(base_ruleset);
-    ruleset.unshift({
-        token : "paren.rparen",
-        regex : "\\}",
-        next:   "start"
-    });
-
-    var media_ruleset = lang.copyArray( base_ruleset );
-    media_ruleset.unshift({
-        token : "paren.rparen",
-        regex : "\\}",
-        next:   "media"
-    });
-
-    var base_comment = [{
-          token : "comment", // comment spanning whole line
-          merge : true,
-          regex : ".+"
-    }];
-
-    var comment = lang.copyArray(base_comment);
-    comment.unshift({
-          token : "comment", // closing comment
-          regex : ".*?\\*\\/",
-          next : "start"
-    });
-
-    var media_comment = lang.copyArray(base_comment);
-    media_comment.unshift({
-          token : "comment", // closing comment
-          regex : ".*?\\*\\/",
-          next : "media"
-    });
-
-    var ruleset_comment = lang.copyArray(base_comment);
-    ruleset_comment.unshift({
-          token : "comment", // closing comment
-          regex : ".*?\\*\\/",
-          next : "ruleset"
-    });
-
-    this.$rules = {
-        "start" : [{
-            token : "comment", // multi line comment
-            merge : true,
-            regex : "\\/\\*",
-            next : "comment"
-        }, {
-            token: "paren.lparen",
-            regex: "\\{",
-            next:  "ruleset"
-        }, {
-            token: "string",
-            regex: "@.*?{",
-            next:  "media"
-        },{
-            token: "keyword",
-            regex: "#[a-z0-9-_]+"
-        },{
-            token: "variable",
-            regex: "\\.[a-z0-9-_]+"
-        },{
-            token: "string",
-            regex: ":[a-z0-9-_]+"
-        },{
-            token: "constant",
-            regex: "[a-z0-9-_]+"
-        }],
-
-        "media" : [ {
-            token : "comment", // multi line comment
-            merge : true,
-            regex : "\\/\\*",
-            next : "media_comment"
-        }, {
-            token: "paren.lparen",
-            regex: "\\{",
-            next:  "media_ruleset"
-        },{
-            token: "string",
-            regex: "\\}",
-            next:  "start"
-        },{
-            token: "keyword",
-            regex: "#[a-z0-9-_]+"
-        },{
-            token: "variable",
-            regex: "\\.[a-z0-9-_]+"
-        },{
-            token: "string",
-            regex: ":[a-z0-9-_]+"
-        },{
-            token: "constant",
-            regex: "[a-z0-9-_]+"
-        }],
-
-        "comment" : comment,
-
-        "ruleset" : ruleset,
-        "ruleset_comment" : ruleset_comment,
-
-        "media_ruleset" : media_ruleset,
-        "media_comment" : media_comment
-    };
-};
-
-oop.inherits(CssHighlightRules, TextHighlightRules);
-
-exports.CssHighlightRules = CssHighlightRules;
-
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/matching_brace_outdent', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../range").Range;
-
-var MatchingBraceOutdent = function() {};
-
-(function() {
-
-    this.checkOutdent = function(line, input) {
-        if (! /^\s+$/.test(line))
-            return false;
-
-        return /^\s*\}/.test(input);
-    };
-
-    this.autoOutdent = function(doc, row) {
-        var line = doc.getLine(row);
-        var match = line.match(/^(\s*\})/);
-
-        if (!match) return 0;
-
-        var column = match[1].length;
-        var openBracePos = doc.findMatchingBracket({row: row, column: column});
-
-        if (!openBracePos || openBracePos.row == row) return 0;
-
-        var indent = this.$getIndent(doc.getLine(openBracePos.row));
-        doc.replace(new Range(row, 0, row, column-1), indent);
-    };
-
-    this.$getIndent = function(line) {
-        var match = line.match(/^(\s+)/);
-        if (match) {
-            return match[1];
-        }
-
-        return "";
-    };
-
-}).call(MatchingBraceOutdent.prototype);
-
-exports.MatchingBraceOutdent = MatchingBraceOutdent;
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/folding/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/range', 'ace/mode/folding/fold_mode'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var Range = require("../../range").Range;
-var BaseFoldMode = require("./fold_mode").FoldMode;
-
-var FoldMode = exports.FoldMode = function() {};
-oop.inherits(FoldMode, BaseFoldMode);
-
-(function() {
-
-    this.foldingStartMarker = /(\{|\[)[^\}\]]*$|^\s*(\/\*)/;
-    this.foldingStopMarker = /^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/;
-    
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        var line = session.getLine(row);
-        var match = line.match(this.foldingStartMarker);
-        if (match) {
-            var i = match.index;
-
-            if (match[1])
-                return this.openingBracketBlock(session, match[1], row, i);
-
-            var range = session.getCommentFoldRange(row, i + match[0].length);
-            range.end.column -= 2;
-            return range;
-        }
-
-        if (foldStyle !== "markbeginend")
-            return;
-            
-        var match = line.match(this.foldingStopMarker);
-        if (match) {
-            var i = match.index + match[0].length;
-
-            if (match[2]) {
-                var range = session.getCommentFoldRange(row, i);
-                range.end.column -= 2;
-                return range;
-            }
-
-            var end = {row: row, column: i};
-            var start = session.$findOpeningBracket(match[1], end);
-            
-            if (!start)
-                return;
-
-            start.column++;
-            end.column--;
-
-            return  Range.fromPoints(start, end);
-        }
-    };
-    
-}).call(FoldMode.prototype);
-
-});/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/folding/fold_mode', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../../range").Range;
-
-var FoldMode = exports.FoldMode = function() {};
-
-(function() {
-
-    this.foldingStartMarker = null;
-    this.foldingStopMarker = null;
-
-    // must return "" if there's no fold, to enable caching
-    this.getFoldWidget = function(session, foldStyle, row) {
-        var line = session.getLine(row);
-        if (this.foldingStartMarker.test(line))
-            return "start";
-        if (foldStyle == "markbeginend"
-                && this.foldingStopMarker
-                && this.foldingStopMarker.test(line))
-            return "end";
-        return "";
-    };
-    
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        return null;
-    };
-
-    this.indentationBlock = function(session, row, column) {
-        var re = /^\s*/;
-        var startRow = row;
-        var endRow = row;
-        var line = session.getLine(row);
-        var startColumn = column || line.length;
-        var startLevel = line.match(re)[0].length;
-        var maxRow = session.getLength()
-        
-        while (++row < maxRow) {
-            line = session.getLine(row);
-            var level = line.match(re)[0].length;
-
-            if (level == line.length)
-                continue;
-
-            if (level <= startLevel)
-                break;
-
-            endRow = row;
-        }
-
-        if (endRow > startRow) {
-            var endColumn = session.getLine(endRow).length;
-            return new Range(startRow, startColumn, endRow, endColumn);
-        }
-    };
-
-    this.openingBracketBlock = function(session, bracket, row, column) {
-        var start = {row: row, column: column + 1};
-        var end = session.$findClosingBracket(bracket, start);
-        if (!end)
-            return;
-
-        var fw = session.foldWidgets[end.row];
-        if (fw == null)
-            fw = this.getFoldWidget(session, end.row);
-
-        if (fw == "start") {
-            end.row --;
-            end.column = session.getLine(end.row).length;
-        }
-        return Range.fromPoints(start, end);
-    };
-
-}).call(FoldMode.prototype);
-
-});
diff --git a/apps/files_texteditor/js/aceeditor/mode-css.js b/apps/files_texteditor/js/aceeditor/mode-css.js
deleted file mode 100644
index 16e482516e..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-css.js
+++ /dev/null
@@ -1 +0,0 @@
-define("ace/mode/css",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/css_highlight_rules","ace/mode/matching_brace_outdent","ace/worker/worker_client","ace/mode/folding/cstyle"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./css_highlight_rules").CssHighlightRules,h=a("./matching_brace_outdent").MatchingBraceOutdent,i=a("../worker/worker_client").WorkerClient,j=a("./folding/cstyle").FoldMode,k=function(){this.$tokenizer=new f((new g).getRules(),"i"),this.$outdent=new h,this.foldingRules=new j};d.inherits(k,e),function(){this.foldingRules="cStyle",this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a).tokens;if(e.length&&e[e.length-1].type=="comment")return d;var f=b.match(/^.*\{\s*$/);return f&&(d+=c),d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)},this.createWorker=function(a){var b=new i(["ace"],"worker-css.js","ace/mode/css_worker","Worker");return b.attachToDocument(a.getDocument()),b.on("csslint",function(b){var c=[];b.data.forEach(function(a){c.push({row:a.line-1,column:a.col-1,text:a.message,type:a.type,lint:a})}),a.setAnnotations(c)}),b}}.call(k.prototype),b.Mode=k}),define("ace/mode/css_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("./text_highlight_rules").TextHighlightRules,g=function(){var a=e.arrayToMap("animation-fill-mode|alignment-adjust|alignment-baseline|animation-delay|animation-direction|animation-duration|animation-iteration-count|animation-name|animation-play-state|animation-timing-function|animation|appearance|azimuth|backface-visibility|background-attachment|background-break|background-clip|background-color|background-image|background-origin|background-position|background-repeat|background-size|background|baseline-shift|binding|bleed|bookmark-label|bookmark-level|bookmark-state|bookmark-target|border-bottom|border-bottom-color|border-bottom-left-radius|border-bottom-right-radius|border-bottom-style|border-bottom-width|border-collapse|border-color|border-image|border-image-outset|border-image-repeat|border-image-slice|border-image-source|border-image-width|border-left|border-left-color|border-left-style|border-left-width|border-radius|border-right|border-right-color|border-right-style|border-right-width|border-spacing|border-style|border-top|border-top-color|border-top-left-radius|border-top-right-radius|border-top-style|border-top-width|border-width|border|bottom|box-align|box-decoration-break|box-direction|box-flex-group|box-flex|box-lines|box-ordinal-group|box-orient|box-pack|box-shadow|box-sizing|break-after|break-before|break-inside|caption-side|clear|clip|color-profile|color|column-count|column-fill|column-gap|column-rule|column-rule-color|column-rule-style|column-rule-width|column-span|column-width|columns|content|counter-increment|counter-reset|crop|cue-after|cue-before|cue|cursor|direction|display|dominant-baseline|drop-initial-after-adjust|drop-initial-after-align|drop-initial-before-adjust|drop-initial-before-align|drop-initial-size|drop-initial-value|elevation|empty-cells|fit|fit-position|float-offset|float|font-family|font-size|font-size-adjust|font-stretch|font-style|font-variant|font-weight|font|grid-columns|grid-rows|hanging-punctuation|height|hyphenate-after|hyphenate-before|hyphenate-character|hyphenate-lines|hyphenate-resource|hyphens|icon|image-orientation|image-rendering|image-resolution|inline-box-align|left|letter-spacing|line-height|line-stacking-ruby|line-stacking-shift|line-stacking-strategy|line-stacking|list-style-image|list-style-position|list-style-type|list-style|margin-bottom|margin-left|margin-right|margin-top|margin|mark-after|mark-before|mark|marks|marquee-direction|marquee-play-count|marquee-speed|marquee-style|max-height|max-width|min-height|min-width|move-to|nav-down|nav-index|nav-left|nav-right|nav-up|opacity|orphans|outline-color|outline-offset|outline-style|outline-width|outline|overflow-style|overflow-x|overflow-y|overflow|padding-bottom|padding-left|padding-right|padding-top|padding|page-break-after|page-break-before|page-break-inside|page-policy|page|pause-after|pause-before|pause|perspective-origin|perspective|phonemes|pitch-range|pitch|play-during|position|presentation-level|punctuation-trim|quotes|rendering-intent|resize|rest-after|rest-before|rest|richness|right|rotation-point|rotation|ruby-align|ruby-overhang|ruby-position|ruby-span|size|speak-header|speak-numeral|speak-punctuation|speak|speech-rate|stress|string-set|table-layout|target-name|target-new|target-position|target|text-align-last|text-align|text-decoration|text-emphasis|text-height|text-indent|text-justify|text-outline|text-shadow|text-transform|text-wrap|top|transform-origin|transform-style|transform|transition-delay|transition-duration|transition-property|transition-timing-function|transition|unicode-bidi|vertical-align|visibility|voice-balance|voice-duration|voice-family|voice-pitch-range|voice-pitch|voice-rate|voice-stress|voice-volume|volume|white-space-collapse|white-space|widows|width|word-break|word-spacing|word-wrap|z-index".split("|")),b=e.arrayToMap("rgb|rgba|url|attr|counter|counters".split("|")),c=e.arrayToMap("absolute|after-edge|after|all-scroll|all|alphabetic|always|antialiased|armenian|auto|avoid-column|avoid-page|avoid|balance|baseline|before-edge|before|below|bidi-override|block-line-height|block|bold|bolder|border-box|both|bottom|box|break-all|break-word|capitalize|caps-height|caption|center|central|char|circle|cjk-ideographic|clone|close-quote|col-resize|collapse|column|consider-shifts|contain|content-box|cover|crosshair|cubic-bezier|dashed|decimal-leading-zero|decimal|default|disabled|disc|disregard-shifts|distribute-all-lines|distribute-letter|distribute-space|distribute|dotted|double|e-resize|ease-in|ease-in-out|ease-out|ease|ellipsis|end|exclude-ruby|fill|fixed|font-size|font|georgian|glyphs|grid-height|groove|hand|hanging|hebrew|help|hidden|hiragana-iroha|hiragana|horizontal|icon|ideograph-alpha|ideograph-numeric|ideograph-parenthesis|ideograph-space|ideographic|inactive|include-ruby|inherit|initial|inline-block|inline-box|inline-line-height|inline-table|inline|inset|inside|inter-ideograph|inter-word|invert|italic|justify|katakana-iroha|katakana|keep-all|last|left|lighter|line-edge|line-through|line|linear|list-item|local|loose|lower-alpha|lower-greek|lower-latin|lower-roman|lowercase|lr-tb|ltr|mathematical|max-height|max-size|medium|menu|message-box|middle|move|n-resize|ne-resize|newspaper|no-change|no-close-quote|no-drop|no-open-quote|no-repeat|none|normal|not-allowed|nowrap|nw-resize|oblique|open-quote|outset|outside|overline|padding-box|page|pointer|pre-line|pre-wrap|pre|preserve-3d|progress|relative|repeat-x|repeat-y|repeat|replaced|reset-size|ridge|right|round|row-resize|rtl|s-resize|scroll|se-resize|separate|slice|small-caps|small-caption|solid|space|square|start|static|status-bar|step-end|step-start|steps|stretch|strict|sub|super|sw-resize|table-caption|table-cell|table-column-group|table-column|table-footer-group|table-header-group|table-row-group|table-row|table|tb-rl|text-after-edge|text-before-edge|text-bottom|text-size|text-top|text|thick|thin|top|transparent|underline|upper-alpha|upper-latin|upper-roman|uppercase|use-script|vertical-ideographic|vertical-text|visible|w-resize|wait|whitespace|z-index|zero".split("|")),d=e.arrayToMap("aqua|black|blue|fuchsia|gray|green|lime|maroon|navy|olive|orange|purple|red|silver|teal|white|yellow".split("|")),f=e.arrayToMap("arial|century|comic|courier|garamond|georgia|helvetica|impact|lucida|symbol|system|tahoma|times|trebuchet|utopia|verdana|webdings|sans-serif|serif|monospace".split("|")),g="\\-?(?:(?:[0-9]+)|(?:[0-9]*\\.[0-9]+))",h="(\\:+)\\b(after|before|first-letter|first-line|moz-selection|selection)\\b",i="(:)\\b(active|checked|disabled|empty|enabled|first-child|first-of-type|focus|hover|indeterminate|invalid|last-child|last-of-type|link|not|nth-child|nth-last-child|nth-last-of-type|nth-of-type|only-child|only-of-type|required|root|target|valid|visited)\\b",j=[{token:"comment",merge:!0,regex:"\\/\\*",next:"ruleset_comment"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:["constant.numeric","keyword"],regex:"("+g+")(ch|cm|deg|em|ex|fr|gd|grad|Hz|in|kHz|mm|ms|pc|pt|px|rad|rem|s|turn|vh|vm|vw|%)"},{token:["constant.numeric"],regex:"([0-9]+)"},{token:"constant.numeric",regex:"#[a-f0-9]{6}"},{token:"constant.numeric",regex:"#[a-f0-9]{3}"},{token:["punctuation","entity.other.attribute-name.pseudo-element.css"],regex:h},{token:["punctuation","entity.other.attribute-name.pseudo-class.css"],regex:i},{token:function(e){return a.hasOwnProperty(e.toLowerCase())?"support.type":b.hasOwnProperty(e.toLowerCase())?"support.function":c.hasOwnProperty(e.toLowerCase())?"support.constant":d.hasOwnProperty(e.toLowerCase())?"support.constant.color":f.hasOwnProperty(e.toLowerCase())?"support.constant.fonts":"text"},regex:"\\-?[a-zA-Z_][a-zA-Z0-9_\\-]*"}],k=e.copyArray(j);k.unshift({token:"paren.rparen",regex:"\\}",next:"start"});var l=e.copyArray(j);l.unshift({token:"paren.rparen",regex:"\\}",next:"media"});var m=[{token:"comment",merge:!0,regex:".+"}],n=e.copyArray(m);n.unshift({token:"comment",regex:".*?\\*\\/",next:"start"});var o=e.copyArray(m);o.unshift({token:"comment",regex:".*?\\*\\/",next:"media"});var p=e.copyArray(m);p.unshift({token:"comment",regex:".*?\\*\\/",next:"ruleset"}),this.$rules={start:[{token:"comment",merge:!0,regex:"\\/\\*",next:"comment"},{token:"paren.lparen",regex:"\\{",next:"ruleset"},{token:"string",regex:"@.*?{",next:"media"},{token:"keyword",regex:"#[a-z0-9-_]+"},{token:"variable",regex:"\\.[a-z0-9-_]+"},{token:"string",regex:":[a-z0-9-_]+"},{token:"constant",regex:"[a-z0-9-_]+"}],media:[{token:"comment",merge:!0,regex:"\\/\\*",next:"media_comment"},{token:"paren.lparen",regex:"\\{",next:"media_ruleset"},{token:"string",regex:"\\}",next:"start"},{token:"keyword",regex:"#[a-z0-9-_]+"},{token:"variable",regex:"\\.[a-z0-9-_]+"},{token:"string",regex:":[a-z0-9-_]+"},{token:"constant",regex:"[a-z0-9-_]+"}],comment:n,ruleset:k,ruleset_comment:p,media_ruleset:l,media_comment:o}};d.inherits(g,f),b.CssHighlightRules=g}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../range").Range,e=function(){};(function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}}).call(e.prototype),b.MatchingBraceOutdent=e}),define("ace/mode/folding/cstyle",["require","exports","module","ace/lib/oop","ace/range","ace/mode/folding/fold_mode"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../../range").Range,f=a("./fold_mode").FoldMode,g=b.FoldMode=function(){};d.inherits(g,f),function(){this.foldingStartMarker=/(\{|\[)[^\}\]]*$|^\s*(\/\*)/,this.foldingStopMarker=/^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/,this.getFoldWidgetRange=function(a,b,c){var d=a.getLine(c),f=d.match(this.foldingStartMarker);if(f){var g=f.index;if(f[1])return this.openingBracketBlock(a,f[1],c,g);var h=a.getCommentFoldRange(c,g+f[0].length);return h.end.column-=2,h}if(b!=="markbeginend")return;var f=d.match(this.foldingStopMarker);if(f){var g=f.index+f[0].length;if(f[2]){var h=a.getCommentFoldRange(c,g);return h.end.column-=2,h}var i={row:c,column:g},j=a.$findOpeningBracket(f[1],i);if(!j)return;return j.column++,i.column--,e.fromPoints(j,i)}}}.call(g.prototype)}),define("ace/mode/folding/fold_mode",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../../range").Range,e=b.FoldMode=function(){};(function(){this.foldingStartMarker=null,this.foldingStopMarker=null,this.getFoldWidget=function(a,b,c){var d=a.getLine(c);return this.foldingStartMarker.test(d)?"start":b=="markbeginend"&&this.foldingStopMarker&&this.foldingStopMarker.test(d)?"end":""},this.getFoldWidgetRange=function(a,b,c){return null},this.indentationBlock=function(a,b,c){var e=/^\s*/,f=b,g=b,h=a.getLine(b),i=c||h.length,j=h.match(e)[0].length,k=a.getLength();while(++b<k){h=a.getLine(b);var l=h.match(e)[0].length;if(l==h.length)continue;if(l<=j)break;g=b}if(g>f){var m=a.getLine(g).length;return new d(f,i,g,m)}},this.openingBracketBlock=function(a,b,c,e){var f={row:c,column:e+1},g=a.$findClosingBracket(b,f);if(!g)return;var h=a.foldWidgets[g.row];return h==null&&(h=this.getFoldWidget(a,g.row)),h=="start"&&(g.row--,g.column=a.getLine(g.row).length),d.fromPoints(f,g)}}).call(e.prototype)})
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-groovy-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-groovy-uncompressed.js
deleted file mode 100644
index 8fc01d4054..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-groovy-uncompressed.js
+++ /dev/null
@@ -1,1370 +0,0 @@
-define('ace/mode/groovy', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/javascript', 'ace/tokenizer', 'ace/mode/groovy_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var JavaScriptMode = require("./javascript").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
-var GroovyHighlightRules = require("./groovy_highlight_rules").GroovyHighlightRules;
-
-var Mode = function() {
-    JavaScriptMode.call(this);
-    this.$tokenizer = new Tokenizer(new GroovyHighlightRules().getRules());
-};
-oop.inherits(Mode, JavaScriptMode);
-
-(function() {
-
-    this.createWorker = function(session) {
-        return null;
-    };
-
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/javascript', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/javascript_highlight_rules', 'ace/mode/matching_brace_outdent', 'ace/range', 'ace/worker/worker_client', 'ace/mode/behaviour/cstyle', 'ace/mode/folding/cstyle'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
-var JavaScriptHighlightRules = require("./javascript_highlight_rules").JavaScriptHighlightRules;
-var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
-var Range = require("../range").Range;
-var WorkerClient = require("../worker/worker_client").WorkerClient;
-var CstyleBehaviour = require("./behaviour/cstyle").CstyleBehaviour;
-var CStyleFoldMode = require("./folding/cstyle").FoldMode;
-
-var Mode = function() {
-    this.$tokenizer = new Tokenizer(new JavaScriptHighlightRules().getRules());
-    this.$outdent = new MatchingBraceOutdent();
-    this.$behaviour = new CstyleBehaviour();
-    this.foldingRules = new CStyleFoldMode();
-};
-oop.inherits(Mode, TextMode);
-
-(function() {
-
-
-    this.toggleCommentLines = function(state, doc, startRow, endRow) {
-        var outdent = true;
-        var re = /^(\s*)\/\//;
-
-        for (var i=startRow; i<= endRow; i++) {
-            if (!re.test(doc.getLine(i))) {
-                outdent = false;
-                break;
-            }
-        }
-
-        if (outdent) {
-            var deleteRange = new Range(0, 0, 0, 0);
-            for (var i=startRow; i<= endRow; i++)
-            {
-                var line = doc.getLine(i);
-                var m = line.match(re);
-                deleteRange.start.row = i;
-                deleteRange.end.row = i;
-                deleteRange.end.column = m[0].length;
-                doc.replace(deleteRange, m[1]);
-            }
-        }
-        else {
-            doc.indentRows(startRow, endRow, "//");
-        }
-    };
-
-    this.getNextLineIndent = function(state, line, tab) {
-        var indent = this.$getIndent(line);
-
-        var tokenizedLine = this.$tokenizer.getLineTokens(line, state);
-        var tokens = tokenizedLine.tokens;
-        var endState = tokenizedLine.state;
-
-        if (tokens.length && tokens[tokens.length-1].type == "comment") {
-            return indent;
-        }
-        
-        if (state == "start" || state == "regex_allowed") {
-            var match = line.match(/^.*(?:\bcase\b.*\:|[\{\(\[])\s*$/);
-            if (match) {
-                indent += tab;
-            }
-        } else if (state == "doc-start") {
-            if (endState == "start" || state == "regex_allowed") {
-                return "";
-            }
-            var match = line.match(/^\s*(\/?)\*/);
-            if (match) {
-                if (match[1]) {
-                    indent += " ";
-                }
-                indent += "* ";
-            }
-        }
-
-        return indent;
-    };
-
-    this.checkOutdent = function(state, line, input) {
-        return this.$outdent.checkOutdent(line, input);
-    };
-
-    this.autoOutdent = function(state, doc, row) {
-        this.$outdent.autoOutdent(doc, row);
-    };
-    
-    this.createWorker = function(session) {
-        var worker = new WorkerClient(["ace"], "worker-javascript.js", "ace/mode/javascript_worker", "JavaScriptWorker");
-        worker.attachToDocument(session.getDocument());
-            
-        worker.on("jslint", function(results) {
-            var errors = [];
-            for (var i=0; i<results.data.length; i++) {
-                var error = results.data[i];
-                if (error)
-                    errors.push({
-                        row: error.line-1,
-                        column: error.character-1,
-                        text: error.reason,
-                        type: "warning",
-                        lint: error
-                    });
-            }
-            session.setAnnotations(errors);
-        });
-        
-        worker.on("narcissus", function(e) {
-            session.setAnnotations([e.data]);
-        });
-        
-        worker.on("terminate", function() {
-            session.clearAnnotations();
-        });
-        
-        return worker;
-    };
-
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Mihai Sucan <mihai DOT sucan AT gmail DOT com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/javascript_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/unicode', 'ace/mode/doc_comment_highlight_rules', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var lang = require("../lib/lang");
-var unicode = require("../unicode");
-var DocCommentHighlightRules = require("./doc_comment_highlight_rules").DocCommentHighlightRules;
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var JavaScriptHighlightRules = function() {
-
-    // see: https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects
-    var globals = lang.arrayToMap(
-      // Constructors
-        ("Array|Boolean|Date|Function|Iterator|Number|Object|RegExp|String|Proxy|" +
-      // E4X
-         "Namespace|QName|XML|XMLList|" +
-         "ArrayBuffer|Float32Array|Float64Array|Int16Array|Int32Array|Int8Array|" +
-         "Uint16Array|Uint32Array|Uint8Array|Uint8ClampedArray|" +
-      // Errors
-        "Error|EvalError|InternalError|RangeError|ReferenceError|StopIteration|" +
-        "SyntaxError|TypeError|URIError|" +
-      //  Non-constructor functions
-        "decodeURI|decodeURIComponent|encodeURI|encodeURIComponent|eval|isFinite|" +
-        "isNaN|parseFloat|parseInt|" +
-      // Other
-        "JSON|Math|" +
-      // Pseudo
-        "this|arguments|prototype|window|document"
-      ).split("|")
-    );
-
-    var keywords = lang.arrayToMap(
-        ("break|case|catch|continue|default|delete|do|else|finally|for|function|" +
-        "if|in|instanceof|new|return|switch|throw|try|typeof|let|var|while|with|" +
-        "const|yield|import|get|set").split("|")
-    );
-
-    // keywords which can be followed by regular expressions
-    var kwBeforeRe = "case|do|else|finally|in|instanceof|return|throw|try|typeof|yield";
-
-    var deprecated = lang.arrayToMap(
-        ("__parent__|__count__|escape|unescape|with|__proto__").split("|")
-    );
-
-    var definitions = lang.arrayToMap(("const|let|var|function").split("|"));
-
-    var buildinConstants = lang.arrayToMap(
-        ("null|Infinity|NaN|undefined").split("|")
-    );
-
-    var futureReserved = lang.arrayToMap(
-        ("class|enum|extends|super|export|implements|private|" +
-        "public|interface|package|protected|static").split("|")
-    );
-
-    // TODO: Unicode escape sequences
-    var identifierRe = "[" + unicode.packages.L + "\\$_]["
-        + unicode.packages.L
-        + unicode.packages.Mn + unicode.packages.Mc
-        + unicode.packages.Nd
-        + unicode.packages.Pc + "\\$_]*\\b";
-
-    var escapedRe = "\\\\(?:x[0-9a-fA-F]{2}|" + // hex
-        "u[0-9a-fA-F]{4}|" + // unicode
-        "[0-2][0-7]{0,2}|" + // oct
-        "3[0-6][0-7]?|" + // oct
-        "37[0-7]?|" + // oct
-        "[4-7][0-7]?|" + //oct
-        ".)";
-
-    // regexp must not have capturing parentheses. Use (?:) instead.
-    // regexps are ordered -> the first match is used
-
-    this.$rules = {
-        "start" : [
-            {
-                token : "comment",
-                regex : /\/\/.*$/
-            },
-            new DocCommentHighlightRules().getStartRule("doc-start"),
-            {
-                token : "comment", // multi line comment
-                merge : true,
-                regex : /\/\*/,
-                next : "comment"
-            }, {
-                token : "string",
-                regex : "'",
-                next  : "qstring"
-            }, {
-                token : "string",
-                regex : '"',
-                next  : "qqstring"
-            }, {
-                token : "constant.numeric", // hex
-                regex : /0[xX][0-9a-fA-F]+\b/
-            }, {
-                token : "constant.numeric", // float
-                regex : /[+-]?\d+(?:(?:\.\d*)?(?:[eE][+-]?\d+)?)?\b/
-            }, { // match stuff like: Sound.prototype.play = function() { }
-                token : [
-                    "storage.type",
-                    "punctuation.operator",
-                    "support.function",
-                    "punctuation.operator",
-                    "entity.name.function",
-                    "text",
-                    "keyword.operator",
-                    "text",
-                    "storage.type",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(" + identifierRe + ")(\\.)(prototype)(\\.)(" + identifierRe +")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"
-            }, { // match stuff like: Sound.prototype.play = myfunc
-                token : [
-                    "storage.type",
-                    "punctuation.operator",
-                    "support.function",
-                    "punctuation.operator",
-                    "entity.name.function",
-                    "text",
-                    "keyword.operator",
-                    "text"
-                ],
-                regex : "(" + identifierRe + ")(\\.)(prototype)(\\.)(" + identifierRe +")(\\s*)(=)(\\s*)"
-            }, { // match stuff like: Sound.play = function() {  }
-                token : [
-                    "storage.type",
-                    "punctuation.operator",
-                    "entity.name.function",
-                    "text",
-                    "keyword.operator",
-                    "text",
-                    "storage.type",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(" + identifierRe + ")(\\.)(" + identifierRe +")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"
-            }, { // match stuff like: play = function() {  }
-                token : [
-                    "entity.name.function",
-                    "text",
-                    "keyword.operator",
-                    "text",
-                    "storage.type",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(" + identifierRe +")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"
-            }, { // match regular function like: function myFunc(arg) { }
-                token : [
-                    "storage.type",
-                    "text",
-                    "entity.name.function",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(function)(\\s+)(" + identifierRe + ")(\\s*)(\\()(.*?)(\\))"
-            }, { // match stuff like: foobar: function() { }
-                token : [
-                    "entity.name.function",
-                    "text",
-                    "punctuation.operator",
-                    "text",
-                    "storage.type",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(" + identifierRe + ")(\\s*)(:)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"
-            }, { // Attempt to match : function() { } (this is for issues with 'foo': function() { })
-                token : [
-                    "text",
-                    "text",
-                    "storage.type",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(:)(\\s*)(function)?(\\s*)(\\()([^)]*)(\\))"
-            }, {
-                token : "constant.language.boolean",
-                regex : /(?:true|false)\b/
-            }, {
-                token : "keyword",
-                regex : "(?:" + kwBeforeRe + ")\\b",
-                next : "regex_allowed"
-            }, {
-                token : ["punctuation.operator", "support.function"],
-                regex : /(\.)(s(?:h(?:ift|ow(?:Mod(?:elessDialog|alDialog)|Help))|croll(?:X|By(?:Pages|Lines)?|Y|To)?|t(?:opzzzz|rike)|i(?:n|zeToContent|debar|gnText)|ort|u(?:p|b(?:str(?:ing)?)?)|pli(?:ce|t)|e(?:nd|t(?:Re(?:sizable|questHeader)|M(?:i(?:nutes|lliseconds)|onth)|Seconds|Ho(?:tKeys|urs)|Year|Cursor|Time(?:out)?|Interval|ZOptions|Date|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Date|FullYear)|FullYear|Active)|arch)|qrt|lice|avePreferences|mall)|h(?:ome|andleEvent)|navigate|c(?:har(?:CodeAt|At)|o(?:s|n(?:cat|textual|firm)|mpile)|eil|lear(?:Timeout|Interval)?|a(?:ptureEvents|ll)|reate(?:StyleSheet|Popup|EventObject))|t(?:o(?:GMTString|S(?:tring|ource)|U(?:TCString|pperCase)|Lo(?:caleString|werCase))|est|a(?:n|int(?:Enabled)?))|i(?:s(?:NaN|Finite)|ndexOf|talics)|d(?:isableExternalCapture|ump|etachEvent)|u(?:n(?:shift|taint|escape|watch)|pdateCommands)|j(?:oin|avaEnabled)|p(?:o(?:p|w)|ush|lugins.refresh|a(?:ddings|rse(?:Int|Float)?)|r(?:int|ompt|eference))|e(?:scape|nableExternalCapture|val|lementFromPoint|x(?:p|ec(?:Script|Command)?))|valueOf|UTC|queryCommand(?:State|Indeterm|Enabled|Value)|f(?:i(?:nd|le(?:ModifiedDate|Size|CreatedDate|UpdatedDate)|xed)|o(?:nt(?:size|color)|rward)|loor|romCharCode)|watch|l(?:ink|o(?:ad|g)|astIndexOf)|a(?:sin|nchor|cos|t(?:tachEvent|ob|an(?:2)?)|pply|lert|b(?:s|ort))|r(?:ou(?:nd|teEvents)|e(?:size(?:By|To)|calc|turnValue|place|verse|l(?:oad|ease(?:Capture|Events)))|andom)|g(?:o|et(?:ResponseHeader|M(?:i(?:nutes|lliseconds)|onth)|Se(?:conds|lection)|Hours|Year|Time(?:zoneOffset)?|Da(?:y|te)|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Da(?:y|te)|FullYear)|FullYear|A(?:ttention|llResponseHeaders)))|m(?:in|ove(?:B(?:y|elow)|To(?:Absolute)?|Above)|ergeAttributes|a(?:tch|rgins|x))|b(?:toa|ig|o(?:ld|rderWidths)|link|ack))\b(?=\()/
-            }, {
-                token : ["punctuation.operator", "support.function.dom"],
-                regex : /(\.)(s(?:ub(?:stringData|mit)|plitText|e(?:t(?:NamedItem|Attribute(?:Node)?)|lect))|has(?:ChildNodes|Feature)|namedItem|c(?:l(?:ick|o(?:se|neNode))|reate(?:C(?:omment|DATASection|aption)|T(?:Head|extNode|Foot)|DocumentFragment|ProcessingInstruction|E(?:ntityReference|lement)|Attribute))|tabIndex|i(?:nsert(?:Row|Before|Cell|Data)|tem)|open|delete(?:Row|C(?:ell|aption)|T(?:Head|Foot)|Data)|focus|write(?:ln)?|a(?:dd|ppend(?:Child|Data))|re(?:set|place(?:Child|Data)|move(?:NamedItem|Child|Attribute(?:Node)?)?)|get(?:NamedItem|Element(?:sBy(?:Name|TagName)|ById)|Attribute(?:Node)?)|blur)\b(?=\()/
-            }, {
-                token : ["punctuation.operator", "support.constant"],
-                regex : /(\.)(s(?:ystemLanguage|cr(?:ipts|ollbars|een(?:X|Y|Top|Left))|t(?:yle(?:Sheets)?|atus(?:Text|bar)?)|ibling(?:Below|Above)|ource|uffixes|e(?:curity(?:Policy)?|l(?:ection|f)))|h(?:istory|ost(?:name)?|as(?:h|Focus))|y|X(?:MLDocument|SLDocument)|n(?:ext|ame(?:space(?:s|URI)|Prop))|M(?:IN_VALUE|AX_VALUE)|c(?:haracterSet|o(?:n(?:structor|trollers)|okieEnabled|lorDepth|mp(?:onents|lete))|urrent|puClass|l(?:i(?:p(?:boardData)?|entInformation)|osed|asses)|alle(?:e|r)|rypto)|t(?:o(?:olbar|p)|ext(?:Transform|Indent|Decoration|Align)|ags)|SQRT(?:1_2|2)|i(?:n(?:ner(?:Height|Width)|put)|ds|gnoreCase)|zIndex|o(?:scpu|n(?:readystatechange|Line)|uter(?:Height|Width)|p(?:sProfile|ener)|ffscreenBuffering)|NEGATIVE_INFINITY|d(?:i(?:splay|alog(?:Height|Top|Width|Left|Arguments)|rectories)|e(?:scription|fault(?:Status|Ch(?:ecked|arset)|View)))|u(?:ser(?:Profile|Language|Agent)|n(?:iqueID|defined)|pdateInterval)|_content|p(?:ixelDepth|ort|ersonalbar|kcs11|l(?:ugins|atform)|a(?:thname|dding(?:Right|Bottom|Top|Left)|rent(?:Window|Layer)?|ge(?:X(?:Offset)?|Y(?:Offset)?))|r(?:o(?:to(?:col|type)|duct(?:Sub)?|mpter)|e(?:vious|fix)))|e(?:n(?:coding|abledPlugin)|x(?:ternal|pando)|mbeds)|v(?:isibility|endor(?:Sub)?|Linkcolor)|URLUnencoded|P(?:I|OSITIVE_INFINITY)|f(?:ilename|o(?:nt(?:Size|Family|Weight)|rmName)|rame(?:s|Element)|gColor)|E|whiteSpace|l(?:i(?:stStyleType|n(?:eHeight|kColor))|o(?:ca(?:tion(?:bar)?|lName)|wsrc)|e(?:ngth|ft(?:Context)?)|a(?:st(?:M(?:odified|atch)|Index|Paren)|yer(?:s|X)|nguage))|a(?:pp(?:MinorVersion|Name|Co(?:deName|re)|Version)|vail(?:Height|Top|Width|Left)|ll|r(?:ity|guments)|Linkcolor|bove)|r(?:ight(?:Context)?|e(?:sponse(?:XML|Text)|adyState))|global|x|m(?:imeTypes|ultiline|enubar|argin(?:Right|Bottom|Top|Left))|L(?:N(?:10|2)|OG(?:10E|2E))|b(?:o(?:ttom|rder(?:Width|RightWidth|BottomWidth|Style|Color|TopWidth|LeftWidth))|ufferDepth|elow|ackground(?:Color|Image)))\b/
-            }, {
-                token : ["storage.type", "punctuation.operator", "support.function.firebug"],
-                regex : /(console)(\.)(warn|info|log|error|time|timeEnd|assert)\b/
-            }, {
-                token : function(value) {
-                    if (globals.hasOwnProperty(value))
-                        return "variable.language";
-                    else if (deprecated.hasOwnProperty(value))
-                        return "invalid.deprecated";
-                    else if (definitions.hasOwnProperty(value))
-                        return "storage.type";
-                    else if (keywords.hasOwnProperty(value))
-                        return "keyword";
-                    else if (buildinConstants.hasOwnProperty(value))
-                        return "constant.language";
-                    else if (futureReserved.hasOwnProperty(value))
-                        return "invalid.illegal";
-                    else if (value == "debugger")
-                        return "invalid.deprecated";
-                    else
-                        return "identifier";
-                },
-                regex : identifierRe
-            }, {
-                token : "keyword.operator",
-                regex : /!|\$|%|&|\*|\-\-|\-|\+\+|\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\|\||\?\:|\*=|%=|\+=|\-=|&=|\^=|\b(?:in|instanceof|new|delete|typeof|void)/,
-                next  : "regex_allowed"
-            }, {
-                token : "punctuation.operator",
-                regex : /\?|\:|\,|\;|\./,
-                next  : "regex_allowed"
-            }, {
-                token : "paren.lparen",
-                regex : /[\[({]/,
-                next  : "regex_allowed"
-            }, {
-                token : "paren.rparen",
-                regex : /[\])}]/
-            }, {
-                token : "keyword.operator",
-                regex : /\/=?/,
-                next  : "regex_allowed"
-            }, {
-                token: "comment",
-                regex: /^#!.*$/
-            }, {
-                token : "text",
-                regex : /\s+/
-            }
-        ],
-        // regular expressions are only allowed after certain tokens. This
-        // makes sure we don't mix up regexps with the divison operator
-        "regex_allowed": [
-            {
-                token : "comment", // multi line comment
-                merge : true,
-                regex : "\\/\\*",
-                next : "comment_regex_allowed"
-            }, {
-                token : "comment",
-                regex : "\\/\\/.*$"
-            }, {
-                token: "string.regexp",
-                regex: "\\/",
-                next: "regex",
-                merge: true
-            }, {
-                token : "text",
-                regex : "\\s+"
-            }, {
-                // immediately return to the start mode without matching
-                // anything
-                token: "empty",
-                regex: "",
-                next: "start"
-            }
-        ],
-        "regex": [
-            {
-                token: "regexp.keyword.operator",
-                regex: "\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",
-                next: "regex"
-            }, {
-				// flag
-                token: "string.regexp",
-                regex: "/\\w*",
-                next: "start",
-                merge: true
-            }, {
-                token: "string.regexp",
-                regex: "[^\\\\/\\[]+",
-                next: "regex",
-                merge: true
-            }, {
-                token: "string.regexp.charachterclass",
-                regex: "\\[",
-                next: "regex_character_class",
-                merge: true
-            }, {
-                token: "empty",
-                regex: "",
-                next: "start"
-            }
-        ],
-        "regex_character_class": [
-            {
-                token: "regexp.keyword.operator",
-                regex: "\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",
-                next: "regex_character_class"
-            }, {
-                token: "string.regexp.charachterclass",
-                regex: "]",
-                next: "regex",
-                merge: true
-            }, {
-                token: "string.regexp.charachterclass",
-                regex: "[^\\\\\\]]+",
-                next: "regex_character_class",
-                merge: true
-            }, {
-                token: "empty",
-                regex: "",
-                next: "start"
-            }
-        ],
-        "comment_regex_allowed" : [
-            {
-                token : "comment", // closing comment
-                regex : ".*?\\*\\/",
-                merge : true,
-                next : "regex_allowed"
-            }, {
-                token : "comment", // comment spanning whole line
-                merge : true,
-                regex : ".+"
-            }
-        ],
-        "comment" : [
-            {
-                token : "comment", // closing comment
-                regex : ".*?\\*\\/",
-                merge : true,
-                next : "start"
-            }, {
-                token : "comment", // comment spanning whole line
-                merge : true,
-                regex : ".+"
-            }
-        ],
-        "qqstring" : [
-            {
-                token : "constant.language.escape",
-                regex : escapedRe
-            }, {
-                token : "string",
-                regex : '[^"\\\\]+'
-            }, {
-                token : "string",
-                regex : '"',
-                next  : "start"
-            }
-        ],
-        "qstring" : [
-            {
-                token : "constant.language.escape",
-                regex : escapedRe
-            }, {
-                token : "string",
-                regex : "[^'\\\\]+"
-            }, {
-                token : "string",
-                regex : "'",
-                next  : "start"
-            }
-        ]
-    };
-
-    this.embedRules(DocCommentHighlightRules, "doc-",
-        [ new DocCommentHighlightRules().getEndRule("start") ]);
-};
-
-oop.inherits(JavaScriptHighlightRules, TextHighlightRules);
-
-exports.JavaScriptHighlightRules = JavaScriptHighlightRules;
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/doc_comment_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var DocCommentHighlightRules = function() {
-
-    this.$rules = {
-        "start" : [ {
-            token : "comment.doc.tag",
-            regex : "@[\\w\\d_]+" // TODO: fix email addresses
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "\\s+"
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "TODO"
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "[^@\\*]+"
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "."
-        }]
-    };
-};
-
-oop.inherits(DocCommentHighlightRules, TextHighlightRules);
-
-(function() {
-
-    this.getStartRule = function(start) {
-        return {
-            token : "comment.doc", // doc comment
-            merge : true,
-            regex : "\\/\\*(?=\\*)",
-            next  : start
-        };
-    };
-    
-    this.getEndRule = function (start) {
-        return {
-            token : "comment.doc", // closing comment
-            merge : true,
-            regex : "\\*\\/",
-            next  : start
-        };
-    };
-
-}).call(DocCommentHighlightRules.prototype);
-
-exports.DocCommentHighlightRules = DocCommentHighlightRules;
-
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/matching_brace_outdent', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../range").Range;
-
-var MatchingBraceOutdent = function() {};
-
-(function() {
-
-    this.checkOutdent = function(line, input) {
-        if (! /^\s+$/.test(line))
-            return false;
-
-        return /^\s*\}/.test(input);
-    };
-
-    this.autoOutdent = function(doc, row) {
-        var line = doc.getLine(row);
-        var match = line.match(/^(\s*\})/);
-
-        if (!match) return 0;
-
-        var column = match[1].length;
-        var openBracePos = doc.findMatchingBracket({row: row, column: column});
-
-        if (!openBracePos || openBracePos.row == row) return 0;
-
-        var indent = this.$getIndent(doc.getLine(openBracePos.row));
-        doc.replace(new Range(row, 0, row, column-1), indent);
-    };
-
-    this.$getIndent = function(line) {
-        var match = line.match(/^(\s+)/);
-        if (match) {
-            return match[1];
-        }
-
-        return "";
-    };
-
-}).call(MatchingBraceOutdent.prototype);
-
-exports.MatchingBraceOutdent = MatchingBraceOutdent;
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Chris Spencer <chris.ag.spencer AT googlemail DOT com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/behaviour/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/behaviour'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var Behaviour = require('../behaviour').Behaviour;
-
-var CstyleBehaviour = function () {
-
-    this.add("braces", "insertion", function (state, action, editor, session, text) {
-        if (text == '{') {
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: '{' + selected + '}',
-                    selection: false
-                };
-            } else {
-                return {
-                    text: '{}',
-                    selection: [1, 1]
-                };
-            }
-        } else if (text == '}') {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == '}') {
-                var matching = session.$findOpeningBracket('}', {column: cursor.column + 1, row: cursor.row});
-                if (matching !== null) {
-                    return {
-                        text: '',
-                        selection: [1, 1]
-                    };
-                }
-            }
-        } else if (text == "\n") {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == '}') {
-                var openBracePos = session.findMatchingBracket({row: cursor.row, column: cursor.column + 1});
-                if (!openBracePos)
-                     return null;
-
-                var indent = this.getNextLineIndent(state, line.substring(0, line.length - 1), session.getTabString());
-                var next_indent = this.$getIndent(session.doc.getLine(openBracePos.row));
-
-                return {
-                    text: '\n' + indent + '\n' + next_indent,
-                    selection: [1, indent.length, 1, indent.length]
-                };
-            }
-        }
-    });
-
-    this.add("braces", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && selected == '{') {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.end.column, range.end.column + 1);
-            if (rightChar == '}') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-    this.add("parens", "insertion", function (state, action, editor, session, text) {
-        if (text == '(') {
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: '(' + selected + ')',
-                    selection: false
-                };
-            } else {
-                return {
-                    text: '()',
-                    selection: [1, 1]
-                };
-            }
-        } else if (text == ')') {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == ')') {
-                var matching = session.$findOpeningBracket(')', {column: cursor.column + 1, row: cursor.row});
-                if (matching !== null) {
-                    return {
-                        text: '',
-                        selection: [1, 1]
-                    };
-                }
-            }
-        }
-    });
-
-    this.add("parens", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && selected == '(') {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
-            if (rightChar == ')') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-    this.add("string_dquotes", "insertion", function (state, action, editor, session, text) {
-        if (text == '"' || text == "'") {
-            var quote = text;
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: quote + selected + quote,
-                    selection: false
-                };
-            } else {
-                var cursor = editor.getCursorPosition();
-                var line = session.doc.getLine(cursor.row);
-                var leftChar = line.substring(cursor.column-1, cursor.column);
-
-                // We're escaped.
-                if (leftChar == '\\') {
-                    return null;
-                }
-
-                // Find what token we're inside.
-                var tokens = session.getTokens(selection.start.row, selection.start.row)[0].tokens;
-                var col = 0, token;
-                var quotepos = -1; // Track whether we're inside an open quote.
-
-                for (var x = 0; x < tokens.length; x++) {
-                    token = tokens[x];
-                    if (token.type == "string") {
-                      quotepos = -1;
-                    } else if (quotepos < 0) {
-                      quotepos = token.value.indexOf(quote);
-                    }
-                    if ((token.value.length + col) > selection.start.column) {
-                        break;
-                    }
-                    col += tokens[x].value.length;
-                }
-
-                // Try and be smart about when we auto insert.
-                if (!token || (quotepos < 0 && token.type !== "comment" && (token.type !== "string" || ((selection.start.column !== token.value.length+col-1) && token.value.lastIndexOf(quote) === token.value.length-1)))) {
-                    return {
-                        text: quote + quote,
-                        selection: [1,1]
-                    };
-                } else if (token && token.type === "string") {
-                    // Ignore input and move right one if we're typing over the closing quote.
-                    var rightChar = line.substring(cursor.column, cursor.column + 1);
-                    if (rightChar == quote) {
-                        return {
-                            text: '',
-                            selection: [1, 1]
-                        };
-                    }
-                }
-            }
-        }
-    });
-
-    this.add("string_dquotes", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && (selected == '"' || selected == "'")) {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
-            if (rightChar == '"') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-};
-
-oop.inherits(CstyleBehaviour, Behaviour);
-
-exports.CstyleBehaviour = CstyleBehaviour;
-});/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/folding/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/range', 'ace/mode/folding/fold_mode'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var Range = require("../../range").Range;
-var BaseFoldMode = require("./fold_mode").FoldMode;
-
-var FoldMode = exports.FoldMode = function() {};
-oop.inherits(FoldMode, BaseFoldMode);
-
-(function() {
-
-    this.foldingStartMarker = /(\{|\[)[^\}\]]*$|^\s*(\/\*)/;
-    this.foldingStopMarker = /^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/;
-    
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        var line = session.getLine(row);
-        var match = line.match(this.foldingStartMarker);
-        if (match) {
-            var i = match.index;
-
-            if (match[1])
-                return this.openingBracketBlock(session, match[1], row, i);
-
-            var range = session.getCommentFoldRange(row, i + match[0].length);
-            range.end.column -= 2;
-            return range;
-        }
-
-        if (foldStyle !== "markbeginend")
-            return;
-            
-        var match = line.match(this.foldingStopMarker);
-        if (match) {
-            var i = match.index + match[0].length;
-
-            if (match[2]) {
-                var range = session.getCommentFoldRange(row, i);
-                range.end.column -= 2;
-                return range;
-            }
-
-            var end = {row: row, column: i};
-            var start = session.$findOpeningBracket(match[1], end);
-            
-            if (!start)
-                return;
-
-            start.column++;
-            end.column--;
-
-            return  Range.fromPoints(start, end);
-        }
-    };
-    
-}).call(FoldMode.prototype);
-
-});/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/folding/fold_mode', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../../range").Range;
-
-var FoldMode = exports.FoldMode = function() {};
-
-(function() {
-
-    this.foldingStartMarker = null;
-    this.foldingStopMarker = null;
-
-    // must return "" if there's no fold, to enable caching
-    this.getFoldWidget = function(session, foldStyle, row) {
-        var line = session.getLine(row);
-        if (this.foldingStartMarker.test(line))
-            return "start";
-        if (foldStyle == "markbeginend"
-                && this.foldingStopMarker
-                && this.foldingStopMarker.test(line))
-            return "end";
-        return "";
-    };
-    
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        return null;
-    };
-
-    this.indentationBlock = function(session, row, column) {
-        var re = /^\s*/;
-        var startRow = row;
-        var endRow = row;
-        var line = session.getLine(row);
-        var startColumn = column || line.length;
-        var startLevel = line.match(re)[0].length;
-        var maxRow = session.getLength()
-        
-        while (++row < maxRow) {
-            line = session.getLine(row);
-            var level = line.match(re)[0].length;
-
-            if (level == line.length)
-                continue;
-
-            if (level <= startLevel)
-                break;
-
-            endRow = row;
-        }
-
-        if (endRow > startRow) {
-            var endColumn = session.getLine(endRow).length;
-            return new Range(startRow, startColumn, endRow, endColumn);
-        }
-    };
-
-    this.openingBracketBlock = function(session, bracket, row, column) {
-        var start = {row: row, column: column + 1};
-        var end = session.$findClosingBracket(bracket, start);
-        if (!end)
-            return;
-
-        var fw = session.foldWidgets[end.row];
-        if (fw == null)
-            fw = this.getFoldWidget(session, end.row);
-
-        if (fw == "start") {
-            end.row --;
-            end.column = session.getLine(end.row).length;
-        }
-        return Range.fromPoints(start, end);
-    };
-
-}).call(FoldMode.prototype);
-
-});
-define('ace/mode/groovy_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/mode/doc_comment_highlight_rules', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var lang = require("../lib/lang");
-var DocCommentHighlightRules = require("./doc_comment_highlight_rules").DocCommentHighlightRules;
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var GroovyHighlightRules = function() {
-
-    var keywords = lang.arrayToMap(
-    ("assert|with|abstract|continue|for|new|switch|" +
-    "assert|default|goto|package|synchronized|" +
-    "boolean|do|if|private|this|" +
-    "break|double|implements|protected|throw|" +
-    "byte|else|import|public|throws|" +
-    "case|enum|instanceof|return|transient|" +
-    "catch|extends|int|short|try|" +
-    "char|final|interface|static|void|" +
-    "class|finally|long|strictfp|volatile|" +
-    "def|float|native|super|while").split("|")
-    );
-
-    var buildinConstants = lang.arrayToMap(
-        ("null|Infinity|NaN|undefined").split("|")
-    );
-
-    var langClasses = lang.arrayToMap(
-        ("AbstractMethodError|AssertionError|ClassCircularityError|"+
-        "ClassFormatError|Deprecated|EnumConstantNotPresentException|"+
-        "ExceptionInInitializerError|IllegalAccessError|"+
-        "IllegalThreadStateException|InstantiationError|InternalError|"+
-        "NegativeArraySizeException|NoSuchFieldError|Override|Process|"+
-        "ProcessBuilder|SecurityManager|StringIndexOutOfBoundsException|"+
-        "SuppressWarnings|TypeNotPresentException|UnknownError|"+
-        "UnsatisfiedLinkError|UnsupportedClassVersionError|VerifyError|"+
-        "InstantiationException|IndexOutOfBoundsException|"+
-        "ArrayIndexOutOfBoundsException|CloneNotSupportedException|"+
-        "NoSuchFieldException|IllegalArgumentException|NumberFormatException|"+
-        "SecurityException|Void|InheritableThreadLocal|IllegalStateException|"+
-        "InterruptedException|NoSuchMethodException|IllegalAccessException|"+
-        "UnsupportedOperationException|Enum|StrictMath|Package|Compiler|"+
-        "Readable|Runtime|StringBuilder|Math|IncompatibleClassChangeError|"+
-        "NoSuchMethodError|ThreadLocal|RuntimePermission|ArithmeticException|"+
-        "NullPointerException|Long|Integer|Short|Byte|Double|Number|Float|"+
-        "Character|Boolean|StackTraceElement|Appendable|StringBuffer|"+
-        "Iterable|ThreadGroup|Runnable|Thread|IllegalMonitorStateException|"+
-        "StackOverflowError|OutOfMemoryError|VirtualMachineError|"+
-        "ArrayStoreException|ClassCastException|LinkageError|"+
-        "NoClassDefFoundError|ClassNotFoundException|RuntimeException|"+
-        "Exception|ThreadDeath|Error|Throwable|System|ClassLoader|"+
-        "Cloneable|Class|CharSequence|Comparable|String|Object").split("|")
-    );
-    
-    var importClasses = lang.arrayToMap(
-        ("").split("|")
-    );
-    // regexp must not have capturing parentheses. Use (?:) instead.
-    // regexps are ordered -> the first match is used
-
-    this.$rules = {
-        "start" : [
-            {
-                token : "comment",
-                regex : "\\/\\/.*$"
-            },
-            new DocCommentHighlightRules().getStartRule("doc-start"),
-            {
-                token : "comment", // multi line comment
-                merge : true,
-                regex : "\\/\\*",
-                next : "comment"
-            }, {
-                token : "string.regexp",
-                regex : "[/](?:(?:\\[(?:\\\\]|[^\\]])+\\])|(?:\\\\/|[^\\]/]))*[/]\\w*\\s*(?=[).,;]|$)"
-            }, {
-                token : "string", // single line
-                regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
-            }, {
-                token : "string", // single line
-                regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"
-            }, {
-                token : "constant.numeric", // hex
-                regex : "0[xX][0-9a-fA-F]+\\b"
-            }, {
-                token : "constant.numeric", // float
-                regex : "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"
-            }, {
-                token : "constant.language.boolean",
-                regex : "(?:true|false)\\b"
-            }, {
-                token : function(value) {
-                    if (value == "this")
-                        return "variable.language";
-                    else if (keywords.hasOwnProperty(value))
-                        return "keyword";
-                    else if (langClasses.hasOwnProperty(value))
-                        return "support.function";
-                    else if (importClasses.hasOwnProperty(value))
-                        return "support.function";
-                    else if (buildinConstants.hasOwnProperty(value))
-                        return "constant.language";
-                    else
-                        return "identifier";
-                },
-                // TODO: Unicode escape sequences
-                // TODO: Unicode identifiers
-                regex : "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
-            }, {
-                token : "keyword.operator",
-                regex : "\\?:|\\?\\.|\\*\\.|<=>|=~|==~|\\.@|\\*\\.@|\\.&|as|in|is|!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)"
-            }, {
-                token : "lparen",
-                regex : "[[({]"
-            }, {
-                token : "rparen",
-                regex : "[\\])}]"
-            }, {
-                token : "text",
-                regex : "\\s+"
-            }
-        ],
-        "comment" : [
-            {
-                token : "comment", // closing comment
-                regex : ".*?\\*\\/",
-                next : "start"
-            }, {
-                token : "comment", // comment spanning whole line
-                merge : true,
-                regex : ".+"
-            }
-        ]
-    };
-    
-    this.embedRules(DocCommentHighlightRules, "doc-",
-        [ new DocCommentHighlightRules().getEndRule("start") ]);
-};
-
-oop.inherits(GroovyHighlightRules, TextHighlightRules);
-
-exports.GroovyHighlightRules = GroovyHighlightRules;
-});
diff --git a/apps/files_texteditor/js/aceeditor/mode-groovy.js b/apps/files_texteditor/js/aceeditor/mode-groovy.js
deleted file mode 100644
index 1a036a462c..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-groovy.js
+++ /dev/null
@@ -1 +0,0 @@
-define("ace/mode/groovy",["require","exports","module","ace/lib/oop","ace/mode/javascript","ace/tokenizer","ace/mode/groovy_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./javascript").Mode,f=a("../tokenizer").Tokenizer,g=a("./groovy_highlight_rules").GroovyHighlightRules,h=function(){e.call(this),this.$tokenizer=new f((new g).getRules())};d.inherits(h,e),function(){this.createWorker=function(a){return null}}.call(h.prototype),b.Mode=h}),define("ace/mode/javascript",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/javascript_highlight_rules","ace/mode/matching_brace_outdent","ace/range","ace/worker/worker_client","ace/mode/behaviour/cstyle","ace/mode/folding/cstyle"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./javascript_highlight_rules").JavaScriptHighlightRules,h=a("./matching_brace_outdent").MatchingBraceOutdent,i=a("../range").Range,j=a("../worker/worker_client").WorkerClient,k=a("./behaviour/cstyle").CstyleBehaviour,l=a("./folding/cstyle").FoldMode,m=function(){this.$tokenizer=new f((new g).getRules()),this.$outdent=new h,this.$behaviour=new k,this.foldingRules=new l};d.inherits(m,e),function(){this.toggleCommentLines=function(a,b,c,d){var e=!0,f=/^(\s*)\/\//;for(var g=c;g<=d;g++)if(!f.test(b.getLine(g))){e=!1;break}if(e){var h=new i(0,0,0,0);for(var g=c;g<=d;g++){var j=b.getLine(g),k=j.match(f);h.start.row=g,h.end.row=g,h.end.column=k[0].length,b.replace(h,k[1])}}else b.indentRows(c,d,"//")},this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a),f=e.tokens,g=e.state;if(f.length&&f[f.length-1].type=="comment")return d;if(a=="start"||a=="regex_allowed"){var h=b.match(/^.*(?:\bcase\b.*\:|[\{\(\[])\s*$/);h&&(d+=c)}else if(a=="doc-start"){if(g=="start"||a=="regex_allowed")return"";var h=b.match(/^\s*(\/?)\*/);h&&(h[1]&&(d+=" "),d+="* ")}return d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)},this.createWorker=function(a){var b=new j(["ace"],"worker-javascript.js","ace/mode/javascript_worker","JavaScriptWorker");return b.attachToDocument(a.getDocument()),b.on("jslint",function(b){var c=[];for(var d=0;d<b.data.length;d++){var e=b.data[d];e&&c.push({row:e.line-1,column:e.character-1,text:e.reason,type:"warning",lint:e})}a.setAnnotations(c)}),b.on("narcissus",function(b){a.setAnnotations([b.data])}),b.on("terminate",function(){a.clearAnnotations()}),b}}.call(m.prototype),b.Mode=m}),define("ace/mode/javascript_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/unicode","ace/mode/doc_comment_highlight_rules","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("../unicode"),g=a("./doc_comment_highlight_rules").DocCommentHighlightRules,h=a("./text_highlight_rules").TextHighlightRules,i=function(){var a=e.arrayToMap("Array|Boolean|Date|Function|Iterator|Number|Object|RegExp|String|Proxy|Namespace|QName|XML|XMLList|ArrayBuffer|Float32Array|Float64Array|Int16Array|Int32Array|Int8Array|Uint16Array|Uint32Array|Uint8Array|Uint8ClampedArray|Error|EvalError|InternalError|RangeError|ReferenceError|StopIteration|SyntaxError|TypeError|URIError|decodeURI|decodeURIComponent|encodeURI|encodeURIComponent|eval|isFinite|isNaN|parseFloat|parseInt|JSON|Math|this|arguments|prototype|window|document".split("|")),b=e.arrayToMap("break|case|catch|continue|default|delete|do|else|finally|for|function|if|in|instanceof|new|return|switch|throw|try|typeof|let|var|while|with|const|yield|import|get|set".split("|")),c="case|do|else|finally|in|instanceof|return|throw|try|typeof|yield",d=e.arrayToMap("__parent__|__count__|escape|unescape|with|__proto__".split("|")),h=e.arrayToMap("const|let|var|function".split("|")),i=e.arrayToMap("null|Infinity|NaN|undefined".split("|")),j=e.arrayToMap("class|enum|extends|super|export|implements|private|public|interface|package|protected|static".split("|")),k="["+f.packages.L+"\\$_]["+f.packages.L+f.packages.Mn+f.packages.Mc+f.packages.Nd+f.packages.Pc+"\\$_]*\\b",l="\\\\(?:x[0-9a-fA-F]{2}|u[0-9a-fA-F]{4}|[0-2][0-7]{0,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.)";this.$rules={start:[{token:"comment",regex:/\/\/.*$/},(new g).getStartRule("doc-start"),{token:"comment",merge:!0,regex:/\/\*/,next:"comment"},{token:"string",regex:"'",next:"qstring"},{token:"string",regex:'"',next:"qqstring"},{token:"constant.numeric",regex:/0[xX][0-9a-fA-F]+\b/},{token:"constant.numeric",regex:/[+-]?\d+(?:(?:\.\d*)?(?:[eE][+-]?\d+)?)?\b/},{token:["storage.type","punctuation.operator","support.function","punctuation.operator","entity.name.function","text","keyword.operator","text","storage.type","text","paren.lparen","variable.parameter","paren.rparen"],regex:"("+k+")(\\.)(prototype)(\\.)("+k+")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"},{token:["storage.type","punctuation.operator","support.function","punctuation.operator","entity.name.function","text","keyword.operator","text"],regex:"("+k+")(\\.)(prototype)(\\.)("+k+")(\\s*)(=)(\\s*)"},{token:["storage.type","punctuation.operator","entity.name.function","text","keyword.operator","text","storage.type","text","paren.lparen","variable.parameter","paren.rparen"],regex:"("+k+")(\\.)("+k+")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"},{token:["entity.name.function","text","keyword.operator","text","storage.type","text","paren.lparen","variable.parameter","paren.rparen"],regex:"("+k+")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"},{token:["storage.type","text","entity.name.function","text","paren.lparen","variable.parameter","paren.rparen"],regex:"(function)(\\s+)("+k+")(\\s*)(\\()(.*?)(\\))"},{token:["entity.name.function","text","punctuation.operator","text","storage.type","text","paren.lparen","variable.parameter","paren.rparen"],regex:"("+k+")(\\s*)(:)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"},{token:["text","text","storage.type","text","paren.lparen","variable.parameter","paren.rparen"],regex:"(:)(\\s*)(function)?(\\s*)(\\()([^)]*)(\\))"},{token:"constant.language.boolean",regex:/(?:true|false)\b/},{token:"keyword",regex:"(?:"+c+")\\b",next:"regex_allowed"},{token:["punctuation.operator","support.function"],regex:/(\.)(s(?:h(?:ift|ow(?:Mod(?:elessDialog|alDialog)|Help))|croll(?:X|By(?:Pages|Lines)?|Y|To)?|t(?:opzzzz|rike)|i(?:n|zeToContent|debar|gnText)|ort|u(?:p|b(?:str(?:ing)?)?)|pli(?:ce|t)|e(?:nd|t(?:Re(?:sizable|questHeader)|M(?:i(?:nutes|lliseconds)|onth)|Seconds|Ho(?:tKeys|urs)|Year|Cursor|Time(?:out)?|Interval|ZOptions|Date|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Date|FullYear)|FullYear|Active)|arch)|qrt|lice|avePreferences|mall)|h(?:ome|andleEvent)|navigate|c(?:har(?:CodeAt|At)|o(?:s|n(?:cat|textual|firm)|mpile)|eil|lear(?:Timeout|Interval)?|a(?:ptureEvents|ll)|reate(?:StyleSheet|Popup|EventObject))|t(?:o(?:GMTString|S(?:tring|ource)|U(?:TCString|pperCase)|Lo(?:caleString|werCase))|est|a(?:n|int(?:Enabled)?))|i(?:s(?:NaN|Finite)|ndexOf|talics)|d(?:isableExternalCapture|ump|etachEvent)|u(?:n(?:shift|taint|escape|watch)|pdateCommands)|j(?:oin|avaEnabled)|p(?:o(?:p|w)|ush|lugins.refresh|a(?:ddings|rse(?:Int|Float)?)|r(?:int|ompt|eference))|e(?:scape|nableExternalCapture|val|lementFromPoint|x(?:p|ec(?:Script|Command)?))|valueOf|UTC|queryCommand(?:State|Indeterm|Enabled|Value)|f(?:i(?:nd|le(?:ModifiedDate|Size|CreatedDate|UpdatedDate)|xed)|o(?:nt(?:size|color)|rward)|loor|romCharCode)|watch|l(?:ink|o(?:ad|g)|astIndexOf)|a(?:sin|nchor|cos|t(?:tachEvent|ob|an(?:2)?)|pply|lert|b(?:s|ort))|r(?:ou(?:nd|teEvents)|e(?:size(?:By|To)|calc|turnValue|place|verse|l(?:oad|ease(?:Capture|Events)))|andom)|g(?:o|et(?:ResponseHeader|M(?:i(?:nutes|lliseconds)|onth)|Se(?:conds|lection)|Hours|Year|Time(?:zoneOffset)?|Da(?:y|te)|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Da(?:y|te)|FullYear)|FullYear|A(?:ttention|llResponseHeaders)))|m(?:in|ove(?:B(?:y|elow)|To(?:Absolute)?|Above)|ergeAttributes|a(?:tch|rgins|x))|b(?:toa|ig|o(?:ld|rderWidths)|link|ack))\b(?=\()/},{token:["punctuation.operator","support.function.dom"],regex:/(\.)(s(?:ub(?:stringData|mit)|plitText|e(?:t(?:NamedItem|Attribute(?:Node)?)|lect))|has(?:ChildNodes|Feature)|namedItem|c(?:l(?:ick|o(?:se|neNode))|reate(?:C(?:omment|DATASection|aption)|T(?:Head|extNode|Foot)|DocumentFragment|ProcessingInstruction|E(?:ntityReference|lement)|Attribute))|tabIndex|i(?:nsert(?:Row|Before|Cell|Data)|tem)|open|delete(?:Row|C(?:ell|aption)|T(?:Head|Foot)|Data)|focus|write(?:ln)?|a(?:dd|ppend(?:Child|Data))|re(?:set|place(?:Child|Data)|move(?:NamedItem|Child|Attribute(?:Node)?)?)|get(?:NamedItem|Element(?:sBy(?:Name|TagName)|ById)|Attribute(?:Node)?)|blur)\b(?=\()/},{token:["punctuation.operator","support.constant"],regex:/(\.)(s(?:ystemLanguage|cr(?:ipts|ollbars|een(?:X|Y|Top|Left))|t(?:yle(?:Sheets)?|atus(?:Text|bar)?)|ibling(?:Below|Above)|ource|uffixes|e(?:curity(?:Policy)?|l(?:ection|f)))|h(?:istory|ost(?:name)?|as(?:h|Focus))|y|X(?:MLDocument|SLDocument)|n(?:ext|ame(?:space(?:s|URI)|Prop))|M(?:IN_VALUE|AX_VALUE)|c(?:haracterSet|o(?:n(?:structor|trollers)|okieEnabled|lorDepth|mp(?:onents|lete))|urrent|puClass|l(?:i(?:p(?:boardData)?|entInformation)|osed|asses)|alle(?:e|r)|rypto)|t(?:o(?:olbar|p)|ext(?:Transform|Indent|Decoration|Align)|ags)|SQRT(?:1_2|2)|i(?:n(?:ner(?:Height|Width)|put)|ds|gnoreCase)|zIndex|o(?:scpu|n(?:readystatechange|Line)|uter(?:Height|Width)|p(?:sProfile|ener)|ffscreenBuffering)|NEGATIVE_INFINITY|d(?:i(?:splay|alog(?:Height|Top|Width|Left|Arguments)|rectories)|e(?:scription|fault(?:Status|Ch(?:ecked|arset)|View)))|u(?:ser(?:Profile|Language|Agent)|n(?:iqueID|defined)|pdateInterval)|_content|p(?:ixelDepth|ort|ersonalbar|kcs11|l(?:ugins|atform)|a(?:thname|dding(?:Right|Bottom|Top|Left)|rent(?:Window|Layer)?|ge(?:X(?:Offset)?|Y(?:Offset)?))|r(?:o(?:to(?:col|type)|duct(?:Sub)?|mpter)|e(?:vious|fix)))|e(?:n(?:coding|abledPlugin)|x(?:ternal|pando)|mbeds)|v(?:isibility|endor(?:Sub)?|Linkcolor)|URLUnencoded|P(?:I|OSITIVE_INFINITY)|f(?:ilename|o(?:nt(?:Size|Family|Weight)|rmName)|rame(?:s|Element)|gColor)|E|whiteSpace|l(?:i(?:stStyleType|n(?:eHeight|kColor))|o(?:ca(?:tion(?:bar)?|lName)|wsrc)|e(?:ngth|ft(?:Context)?)|a(?:st(?:M(?:odified|atch)|Index|Paren)|yer(?:s|X)|nguage))|a(?:pp(?:MinorVersion|Name|Co(?:deName|re)|Version)|vail(?:Height|Top|Width|Left)|ll|r(?:ity|guments)|Linkcolor|bove)|r(?:ight(?:Context)?|e(?:sponse(?:XML|Text)|adyState))|global|x|m(?:imeTypes|ultiline|enubar|argin(?:Right|Bottom|Top|Left))|L(?:N(?:10|2)|OG(?:10E|2E))|b(?:o(?:ttom|rder(?:Width|RightWidth|BottomWidth|Style|Color|TopWidth|LeftWidth))|ufferDepth|elow|ackground(?:Color|Image)))\b/},{token:["storage.type","punctuation.operator","support.function.firebug"],regex:/(console)(\.)(warn|info|log|error|time|timeEnd|assert)\b/},{token:function(c){return a.hasOwnProperty(c)?"variable.language":d.hasOwnProperty(c)?"invalid.deprecated":h.hasOwnProperty(c)?"storage.type":b.hasOwnProperty(c)?"keyword":i.hasOwnProperty(c)?"constant.language":j.hasOwnProperty(c)?"invalid.illegal":c=="debugger"?"invalid.deprecated":"identifier"},regex:k},{token:"keyword.operator",regex:/!|\$|%|&|\*|\-\-|\-|\+\+|\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\|\||\?\:|\*=|%=|\+=|\-=|&=|\^=|\b(?:in|instanceof|new|delete|typeof|void)/,next:"regex_allowed"},{token:"punctuation.operator",regex:/\?|\:|\,|\;|\./,next:"regex_allowed"},{token:"paren.lparen",regex:/[\[({]/,next:"regex_allowed"},{token:"paren.rparen",regex:/[\])}]/},{token:"keyword.operator",regex:/\/=?/,next:"regex_allowed"},{token:"comment",regex:/^#!.*$/},{token:"text",regex:/\s+/}],regex_allowed:[{token:"comment",merge:!0,regex:"\\/\\*",next:"comment_regex_allowed"},{token:"comment",regex:"\\/\\/.*$"},{token:"string.regexp",regex:"\\/",next:"regex",merge:!0},{token:"text",regex:"\\s+"},{token:"empty",regex:"",next:"start"}],regex:[{token:"regexp.keyword.operator",regex:"\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",next:"regex"},{token:"string.regexp",regex:"/\\w*",next:"start",merge:!0},{token:"string.regexp",regex:"[^\\\\/\\[]+",next:"regex",merge:!0},{token:"string.regexp.charachterclass",regex:"\\[",next:"regex_character_class",merge:!0},{token:"empty",regex:"",next:"start"}],regex_character_class:[{token:"regexp.keyword.operator",regex:"\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",next:"regex_character_class"},{token:"string.regexp.charachterclass",regex:"]",next:"regex",merge:!0},{token:"string.regexp.charachterclass",regex:"[^\\\\\\]]+",next:"regex_character_class",merge:!0},{token:"empty",regex:"",next:"start"}],comment_regex_allowed:[{token:"comment",regex:".*?\\*\\/",merge:!0,next:"regex_allowed"},{token:"comment",merge:!0,regex:".+"}],comment:[{token:"comment",regex:".*?\\*\\/",merge:!0,next:"start"},{token:"comment",merge:!0,regex:".+"}],qqstring:[{token:"constant.language.escape",regex:l},{token:"string",regex:'[^"\\\\]+'},{token:"string",regex:'"',next:"start"}],qstring:[{token:"constant.language.escape",regex:l},{token:"string",regex:"[^'\\\\]+"},{token:"string",regex:"'",next:"start"}]},this.embedRules(g,"doc-",[(new g).getEndRule("start")])};d.inherits(i,h),b.JavaScriptHighlightRules=i}),define("ace/mode/doc_comment_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text_highlight_rules").TextHighlightRules,f=function(){this.$rules={start:[{token:"comment.doc.tag",regex:"@[\\w\\d_]+"},{token:"comment.doc",merge:!0,regex:"\\s+"},{token:"comment.doc",merge:!0,regex:"TODO"},{token:"comment.doc",merge:!0,regex:"[^@\\*]+"},{token:"comment.doc",merge:!0,regex:"."}]}};d.inherits(f,e),function(){this.getStartRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\/\\*(?=\\*)",next:a}},this.getEndRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\*\\/",next:a}}}.call(f.prototype),b.DocCommentHighlightRules=f}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../range").Range,e=function(){};(function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}}).call(e.prototype),b.MatchingBraceOutdent=e}),define("ace/mode/behaviour/cstyle",["require","exports","module","ace/lib/oop","ace/mode/behaviour"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../behaviour").Behaviour,f=function(){this.add("braces","insertion",function(a,b,c,d,e){if(e=="{"){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"{"+g+"}",selection:!1}:{text:"{}",selection:[1,1]}}if(e=="}"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var k=d.$findOpeningBracket("}",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}else if(e=="\n"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var l=d.findMatchingBracket({row:h.row,column:h.column+1});if(!l)return null;var m=this.getNextLineIndent(a,i.substring(0,i.length-1),d.getTabString()),n=this.$getIndent(d.doc.getLine(l.row));return{text:"\n"+m+"\n"+n,selection:[1,m.length,1,m.length]}}}}),this.add("braces","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="{"){var g=d.doc.getLine(e.start.row),h=g.substring(e.end.column,e.end.column+1);if(h=="}")return e.end.column++,e}}),this.add("parens","insertion",function(a,b,c,d,e){if(e=="("){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"("+g+")",selection:!1}:{text:"()",selection:[1,1]}}if(e==")"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j==")"){var k=d.$findOpeningBracket(")",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}}),this.add("parens","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="("){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h==")")return e.end.column++,e}}),this.add("string_dquotes","insertion",function(a,b,c,d,e){if(e=='"'||e=="'"){var f=e,g=c.getSelectionRange(),h=d.doc.getTextRange(g);if(h!=="")return{text:f+h+f,selection:!1};var i=c.getCursorPosition(),j=d.doc.getLine(i.row),k=j.substring(i.column-1,i.column);if(k=="\\")return null;var l=d.getTokens(g.start.row,g.start.row)[0].tokens,m=0,n,o=-1;for(var p=0;p<l.length;p++){n=l[p],n.type=="string"?o=-1:o<0&&(o=n.value.indexOf(f));if(n.value.length+m>g.start.column)break;m+=l[p].value.length}if(!n||o<0&&n.type!=="comment"&&(n.type!=="string"||g.start.column!==n.value.length+m-1&&n.value.lastIndexOf(f)===n.value.length-1))return{text:f+f,selection:[1,1]};if(n&&n.type==="string"){var q=j.substring(i.column,i.column+1);if(q==f)return{text:"",selection:[1,1]}}}}),this.add("string_dquotes","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&(f=='"'||f=="'")){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h=='"')return e.end.column++,e}})};d.inherits(f,e),b.CstyleBehaviour=f}),define("ace/mode/folding/cstyle",["require","exports","module","ace/lib/oop","ace/range","ace/mode/folding/fold_mode"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../../range").Range,f=a("./fold_mode").FoldMode,g=b.FoldMode=function(){};d.inherits(g,f),function(){this.foldingStartMarker=/(\{|\[)[^\}\]]*$|^\s*(\/\*)/,this.foldingStopMarker=/^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/,this.getFoldWidgetRange=function(a,b,c){var d=a.getLine(c),f=d.match(this.foldingStartMarker);if(f){var g=f.index;if(f[1])return this.openingBracketBlock(a,f[1],c,g);var h=a.getCommentFoldRange(c,g+f[0].length);return h.end.column-=2,h}if(b!=="markbeginend")return;var f=d.match(this.foldingStopMarker);if(f){var g=f.index+f[0].length;if(f[2]){var h=a.getCommentFoldRange(c,g);return h.end.column-=2,h}var i={row:c,column:g},j=a.$findOpeningBracket(f[1],i);if(!j)return;return j.column++,i.column--,e.fromPoints(j,i)}}}.call(g.prototype)}),define("ace/mode/folding/fold_mode",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../../range").Range,e=b.FoldMode=function(){};(function(){this.foldingStartMarker=null,this.foldingStopMarker=null,this.getFoldWidget=function(a,b,c){var d=a.getLine(c);return this.foldingStartMarker.test(d)?"start":b=="markbeginend"&&this.foldingStopMarker&&this.foldingStopMarker.test(d)?"end":""},this.getFoldWidgetRange=function(a,b,c){return null},this.indentationBlock=function(a,b,c){var e=/^\s*/,f=b,g=b,h=a.getLine(b),i=c||h.length,j=h.match(e)[0].length,k=a.getLength();while(++b<k){h=a.getLine(b);var l=h.match(e)[0].length;if(l==h.length)continue;if(l<=j)break;g=b}if(g>f){var m=a.getLine(g).length;return new d(f,i,g,m)}},this.openingBracketBlock=function(a,b,c,e){var f={row:c,column:e+1},g=a.$findClosingBracket(b,f);if(!g)return;var h=a.foldWidgets[g.row];return h==null&&(h=this.getFoldWidget(a,g.row)),h=="start"&&(g.row--,g.column=a.getLine(g.row).length),d.fromPoints(f,g)}}).call(e.prototype)}),define("ace/mode/groovy_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/doc_comment_highlight_rules","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("./doc_comment_highlight_rules").DocCommentHighlightRules,g=a("./text_highlight_rules").TextHighlightRules,h=function(){var a=e.arrayToMap("assert|with|abstract|continue|for|new|switch|assert|default|goto|package|synchronized|boolean|do|if|private|this|break|double|implements|protected|throw|byte|else|import|public|throws|case|enum|instanceof|return|transient|catch|extends|int|short|try|char|final|interface|static|void|class|finally|long|strictfp|volatile|def|float|native|super|while".split("|")),b=e.arrayToMap("null|Infinity|NaN|undefined".split("|")),c=e.arrayToMap("AbstractMethodError|AssertionError|ClassCircularityError|ClassFormatError|Deprecated|EnumConstantNotPresentException|ExceptionInInitializerError|IllegalAccessError|IllegalThreadStateException|InstantiationError|InternalError|NegativeArraySizeException|NoSuchFieldError|Override|Process|ProcessBuilder|SecurityManager|StringIndexOutOfBoundsException|SuppressWarnings|TypeNotPresentException|UnknownError|UnsatisfiedLinkError|UnsupportedClassVersionError|VerifyError|InstantiationException|IndexOutOfBoundsException|ArrayIndexOutOfBoundsException|CloneNotSupportedException|NoSuchFieldException|IllegalArgumentException|NumberFormatException|SecurityException|Void|InheritableThreadLocal|IllegalStateException|InterruptedException|NoSuchMethodException|IllegalAccessException|UnsupportedOperationException|Enum|StrictMath|Package|Compiler|Readable|Runtime|StringBuilder|Math|IncompatibleClassChangeError|NoSuchMethodError|ThreadLocal|RuntimePermission|ArithmeticException|NullPointerException|Long|Integer|Short|Byte|Double|Number|Float|Character|Boolean|StackTraceElement|Appendable|StringBuffer|Iterable|ThreadGroup|Runnable|Thread|IllegalMonitorStateException|StackOverflowError|OutOfMemoryError|VirtualMachineError|ArrayStoreException|ClassCastException|LinkageError|NoClassDefFoundError|ClassNotFoundException|RuntimeException|Exception|ThreadDeath|Error|Throwable|System|ClassLoader|Cloneable|Class|CharSequence|Comparable|String|Object".split("|")),d=e.arrayToMap("".split("|"));this.$rules={start:[{token:"comment",regex:"\\/\\/.*$"},(new f).getStartRule("doc-start"),{token:"comment",merge:!0,regex:"\\/\\*",next:"comment"},{token:"string.regexp",regex:"[/](?:(?:\\[(?:\\\\]|[^\\]])+\\])|(?:\\\\/|[^\\]/]))*[/]\\w*\\s*(?=[).,;]|$)"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:"constant.numeric",regex:"0[xX][0-9a-fA-F]+\\b"},{token:"constant.numeric",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:"constant.language.boolean",regex:"(?:true|false)\\b"},{token:function(e){return e=="this"?"variable.language":a.hasOwnProperty(e)?"keyword":c.hasOwnProperty(e)?"support.function":d.hasOwnProperty(e)?"support.function":b.hasOwnProperty(e)?"constant.language":"identifier"},regex:"[a-zA-Z_$][a-zA-Z0-9_$]*\\b"},{token:"keyword.operator",regex:"\\?:|\\?\\.|\\*\\.|<=>|=~|==~|\\.@|\\*\\.@|\\.&|as|in|is|!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)"},{token:"lparen",regex:"[[({]"},{token:"rparen",regex:"[\\])}]"},{token:"text",regex:"\\s+"}],comment:[{token:"comment",regex:".*?\\*\\/",next:"start"},{token:"comment",merge:!0,regex:".+"}]},this.embedRules(f,"doc-",[(new f).getEndRule("start")])};d.inherits(h,g),b.GroovyHighlightRules=h})
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-haxe-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-haxe-uncompressed.js
deleted file mode 100644
index 7efa04c5f6..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-haxe-uncompressed.js
+++ /dev/null
@@ -1,770 +0,0 @@
-define('ace/mode/haxe', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/haxe_highlight_rules', 'ace/mode/matching_brace_outdent', 'ace/mode/behaviour/cstyle', 'ace/mode/folding/cstyle'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
-var HaxeHighlightRules = require("./haxe_highlight_rules").HaxeHighlightRules;
-var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
-var CstyleBehaviour = require("./behaviour/cstyle").CstyleBehaviour;
-var CStyleFoldMode = require("./folding/cstyle").FoldMode;
-
-var Mode = function() {
-    this.$tokenizer = new Tokenizer(new HaxeHighlightRules().getRules());
-    this.$outdent = new MatchingBraceOutdent();
-    this.$behaviour = new CstyleBehaviour();
-    this.foldingRules = new CStyleFoldMode();
-};
-oop.inherits(Mode, TextMode);
-
-(function() {
-
-      this.getNextLineIndent = function(state, line, tab) {
-          var indent = this.$getIndent(line);
-
-          var tokenizedLine = this.$tokenizer.getLineTokens(line, state);
-          var tokens = tokenizedLine.tokens;
-
-          if (tokens.length && tokens[tokens.length-1].type == "comment") {
-              return indent;
-          }
-
-          if (state == "start") {
-              var match = line.match(/^.*[\{\(\[]\s*$/);
-              if (match) {
-                  indent += tab;
-              }
-          }
-
-          return indent;
-      };
-
-      this.checkOutdent = function(state, line, input) {
-          return this.$outdent.checkOutdent(line, input);
-      };
-
-      this.autoOutdent = function(state, doc, row) {
-          this.$outdent.autoOutdent(doc, row);
-      };
-
-
-    this.createWorker = function(session) {
-        return null;
-    };
-
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-});
-define('ace/mode/haxe_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/mode/doc_comment_highlight_rules', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var lang = require("../lib/lang");
-var DocCommentHighlightRules = require("./doc_comment_highlight_rules").DocCommentHighlightRules;
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var HaxeHighlightRules = function() {
-
-    var keywords = lang.arrayToMap(
-        ("break|case|cast|catch|class|continue|default|else|enum|extends|for|function|if|implements|import|in|inline|interface|new|override|package|private|public|return|static|super|switch|this|throw|trace|try|typedef|untyped|var|while|Array|Void|Bool|Int|UInt|Float|Dynamic|String|List|Hash|IntHash|Error|Unknown|Type|Std").split("|")
-    );
-
-    var buildinConstants = lang.arrayToMap(
-        ("null|true|false").split("|")
-    );
-
-
-    // regexp must not have capturing parentheses. Use (?:) instead.
-    // regexps are ordered -> the first match is used
-
-    this.$rules = {
-        "start" : [
-            {
-                token : "comment",
-                regex : "\\/\\/.*$"
-            },
-            new DocCommentHighlightRules().getStartRule("doc-start"),
-            {
-                token : "comment", // multi line comment
-                regex : "\\/\\*",
-                merge : true,
-                next : "comment"
-            }, {
-                token : "string.regexp",
-                regex : "[/](?:(?:\\[(?:\\\\]|[^\\]])+\\])|(?:\\\\/|[^\\]/]))*[/]\\w*\\s*(?=[).,;]|$)"
-            }, {
-                token : "string", // single line
-                regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
-            }, {
-                token : "string", // single line
-                regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"
-            }, {
-                token : "constant.numeric", // hex
-                regex : "0[xX][0-9a-fA-F]+\\b"
-            }, {
-                token : "constant.numeric", // float
-                regex : "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"
-            }, {
-                token : "constant.language.boolean",
-                regex : "(?:true|false)\\b"
-            }, {
-                token : function(value) {
-                    if (value == "this")
-                        return "variable.language";
-                    else if (keywords.hasOwnProperty(value))
-                        return "keyword";
-                    else if (buildinConstants.hasOwnProperty(value))
-                        return "constant.language";
-                    else
-                        return "identifier";
-                },
-                // TODO: Unicode escape sequences
-                // TODO: Unicode identifiers
-                regex : "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
-            }, {
-                token : "keyword.operator",
-                regex : "!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)"
-            }, {
-                token : "punctuation.operator",
-                regex : "\\?|\\:|\\,|\\;|\\."
-            }, {
-                token : "paren.lparen",
-                regex : "[[({<]"
-            }, {
-                token : "paren.rparen",
-                regex : "[\\])}>]"
-            }, {
-                token : "text",
-                regex : "\\s+"
-            }
-        ],
-        "comment" : [
-            {
-                token : "comment", // closing comment
-                regex : ".*?\\*\\/",
-                next : "start"
-            }, {
-                token : "comment", // comment spanning whole line
-                merge : true,
-                regex : ".+"
-            }
-        ]
-    };
-
-    this.embedRules(DocCommentHighlightRules, "doc-",
-        [ new DocCommentHighlightRules().getEndRule("start") ]);
-};
-
-oop.inherits(HaxeHighlightRules, TextHighlightRules);
-
-exports.HaxeHighlightRules = HaxeHighlightRules;
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/doc_comment_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var DocCommentHighlightRules = function() {
-
-    this.$rules = {
-        "start" : [ {
-            token : "comment.doc.tag",
-            regex : "@[\\w\\d_]+" // TODO: fix email addresses
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "\\s+"
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "TODO"
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "[^@\\*]+"
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "."
-        }]
-    };
-};
-
-oop.inherits(DocCommentHighlightRules, TextHighlightRules);
-
-(function() {
-
-    this.getStartRule = function(start) {
-        return {
-            token : "comment.doc", // doc comment
-            merge : true,
-            regex : "\\/\\*(?=\\*)",
-            next  : start
-        };
-    };
-    
-    this.getEndRule = function (start) {
-        return {
-            token : "comment.doc", // closing comment
-            merge : true,
-            regex : "\\*\\/",
-            next  : start
-        };
-    };
-
-}).call(DocCommentHighlightRules.prototype);
-
-exports.DocCommentHighlightRules = DocCommentHighlightRules;
-
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/matching_brace_outdent', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../range").Range;
-
-var MatchingBraceOutdent = function() {};
-
-(function() {
-
-    this.checkOutdent = function(line, input) {
-        if (! /^\s+$/.test(line))
-            return false;
-
-        return /^\s*\}/.test(input);
-    };
-
-    this.autoOutdent = function(doc, row) {
-        var line = doc.getLine(row);
-        var match = line.match(/^(\s*\})/);
-
-        if (!match) return 0;
-
-        var column = match[1].length;
-        var openBracePos = doc.findMatchingBracket({row: row, column: column});
-
-        if (!openBracePos || openBracePos.row == row) return 0;
-
-        var indent = this.$getIndent(doc.getLine(openBracePos.row));
-        doc.replace(new Range(row, 0, row, column-1), indent);
-    };
-
-    this.$getIndent = function(line) {
-        var match = line.match(/^(\s+)/);
-        if (match) {
-            return match[1];
-        }
-
-        return "";
-    };
-
-}).call(MatchingBraceOutdent.prototype);
-
-exports.MatchingBraceOutdent = MatchingBraceOutdent;
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Chris Spencer <chris.ag.spencer AT googlemail DOT com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/behaviour/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/behaviour'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var Behaviour = require('../behaviour').Behaviour;
-
-var CstyleBehaviour = function () {
-
-    this.add("braces", "insertion", function (state, action, editor, session, text) {
-        if (text == '{') {
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: '{' + selected + '}',
-                    selection: false
-                };
-            } else {
-                return {
-                    text: '{}',
-                    selection: [1, 1]
-                };
-            }
-        } else if (text == '}') {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == '}') {
-                var matching = session.$findOpeningBracket('}', {column: cursor.column + 1, row: cursor.row});
-                if (matching !== null) {
-                    return {
-                        text: '',
-                        selection: [1, 1]
-                    };
-                }
-            }
-        } else if (text == "\n") {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == '}') {
-                var openBracePos = session.findMatchingBracket({row: cursor.row, column: cursor.column + 1});
-                if (!openBracePos)
-                     return null;
-
-                var indent = this.getNextLineIndent(state, line.substring(0, line.length - 1), session.getTabString());
-                var next_indent = this.$getIndent(session.doc.getLine(openBracePos.row));
-
-                return {
-                    text: '\n' + indent + '\n' + next_indent,
-                    selection: [1, indent.length, 1, indent.length]
-                };
-            }
-        }
-    });
-
-    this.add("braces", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && selected == '{') {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.end.column, range.end.column + 1);
-            if (rightChar == '}') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-    this.add("parens", "insertion", function (state, action, editor, session, text) {
-        if (text == '(') {
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: '(' + selected + ')',
-                    selection: false
-                };
-            } else {
-                return {
-                    text: '()',
-                    selection: [1, 1]
-                };
-            }
-        } else if (text == ')') {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == ')') {
-                var matching = session.$findOpeningBracket(')', {column: cursor.column + 1, row: cursor.row});
-                if (matching !== null) {
-                    return {
-                        text: '',
-                        selection: [1, 1]
-                    };
-                }
-            }
-        }
-    });
-
-    this.add("parens", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && selected == '(') {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
-            if (rightChar == ')') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-    this.add("string_dquotes", "insertion", function (state, action, editor, session, text) {
-        if (text == '"' || text == "'") {
-            var quote = text;
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: quote + selected + quote,
-                    selection: false
-                };
-            } else {
-                var cursor = editor.getCursorPosition();
-                var line = session.doc.getLine(cursor.row);
-                var leftChar = line.substring(cursor.column-1, cursor.column);
-
-                // We're escaped.
-                if (leftChar == '\\') {
-                    return null;
-                }
-
-                // Find what token we're inside.
-                var tokens = session.getTokens(selection.start.row, selection.start.row)[0].tokens;
-                var col = 0, token;
-                var quotepos = -1; // Track whether we're inside an open quote.
-
-                for (var x = 0; x < tokens.length; x++) {
-                    token = tokens[x];
-                    if (token.type == "string") {
-                      quotepos = -1;
-                    } else if (quotepos < 0) {
-                      quotepos = token.value.indexOf(quote);
-                    }
-                    if ((token.value.length + col) > selection.start.column) {
-                        break;
-                    }
-                    col += tokens[x].value.length;
-                }
-
-                // Try and be smart about when we auto insert.
-                if (!token || (quotepos < 0 && token.type !== "comment" && (token.type !== "string" || ((selection.start.column !== token.value.length+col-1) && token.value.lastIndexOf(quote) === token.value.length-1)))) {
-                    return {
-                        text: quote + quote,
-                        selection: [1,1]
-                    };
-                } else if (token && token.type === "string") {
-                    // Ignore input and move right one if we're typing over the closing quote.
-                    var rightChar = line.substring(cursor.column, cursor.column + 1);
-                    if (rightChar == quote) {
-                        return {
-                            text: '',
-                            selection: [1, 1]
-                        };
-                    }
-                }
-            }
-        }
-    });
-
-    this.add("string_dquotes", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && (selected == '"' || selected == "'")) {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
-            if (rightChar == '"') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-};
-
-oop.inherits(CstyleBehaviour, Behaviour);
-
-exports.CstyleBehaviour = CstyleBehaviour;
-});/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/folding/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/range', 'ace/mode/folding/fold_mode'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var Range = require("../../range").Range;
-var BaseFoldMode = require("./fold_mode").FoldMode;
-
-var FoldMode = exports.FoldMode = function() {};
-oop.inherits(FoldMode, BaseFoldMode);
-
-(function() {
-
-    this.foldingStartMarker = /(\{|\[)[^\}\]]*$|^\s*(\/\*)/;
-    this.foldingStopMarker = /^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/;
-    
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        var line = session.getLine(row);
-        var match = line.match(this.foldingStartMarker);
-        if (match) {
-            var i = match.index;
-
-            if (match[1])
-                return this.openingBracketBlock(session, match[1], row, i);
-
-            var range = session.getCommentFoldRange(row, i + match[0].length);
-            range.end.column -= 2;
-            return range;
-        }
-
-        if (foldStyle !== "markbeginend")
-            return;
-            
-        var match = line.match(this.foldingStopMarker);
-        if (match) {
-            var i = match.index + match[0].length;
-
-            if (match[2]) {
-                var range = session.getCommentFoldRange(row, i);
-                range.end.column -= 2;
-                return range;
-            }
-
-            var end = {row: row, column: i};
-            var start = session.$findOpeningBracket(match[1], end);
-            
-            if (!start)
-                return;
-
-            start.column++;
-            end.column--;
-
-            return  Range.fromPoints(start, end);
-        }
-    };
-    
-}).call(FoldMode.prototype);
-
-});/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/folding/fold_mode', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../../range").Range;
-
-var FoldMode = exports.FoldMode = function() {};
-
-(function() {
-
-    this.foldingStartMarker = null;
-    this.foldingStopMarker = null;
-
-    // must return "" if there's no fold, to enable caching
-    this.getFoldWidget = function(session, foldStyle, row) {
-        var line = session.getLine(row);
-        if (this.foldingStartMarker.test(line))
-            return "start";
-        if (foldStyle == "markbeginend"
-                && this.foldingStopMarker
-                && this.foldingStopMarker.test(line))
-            return "end";
-        return "";
-    };
-    
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        return null;
-    };
-
-    this.indentationBlock = function(session, row, column) {
-        var re = /^\s*/;
-        var startRow = row;
-        var endRow = row;
-        var line = session.getLine(row);
-        var startColumn = column || line.length;
-        var startLevel = line.match(re)[0].length;
-        var maxRow = session.getLength()
-        
-        while (++row < maxRow) {
-            line = session.getLine(row);
-            var level = line.match(re)[0].length;
-
-            if (level == line.length)
-                continue;
-
-            if (level <= startLevel)
-                break;
-
-            endRow = row;
-        }
-
-        if (endRow > startRow) {
-            var endColumn = session.getLine(endRow).length;
-            return new Range(startRow, startColumn, endRow, endColumn);
-        }
-    };
-
-    this.openingBracketBlock = function(session, bracket, row, column) {
-        var start = {row: row, column: column + 1};
-        var end = session.$findClosingBracket(bracket, start);
-        if (!end)
-            return;
-
-        var fw = session.foldWidgets[end.row];
-        if (fw == null)
-            fw = this.getFoldWidget(session, end.row);
-
-        if (fw == "start") {
-            end.row --;
-            end.column = session.getLine(end.row).length;
-        }
-        return Range.fromPoints(start, end);
-    };
-
-}).call(FoldMode.prototype);
-
-});
diff --git a/apps/files_texteditor/js/aceeditor/mode-haxe.js b/apps/files_texteditor/js/aceeditor/mode-haxe.js
deleted file mode 100644
index 0c0d15f393..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-haxe.js
+++ /dev/null
@@ -1 +0,0 @@
-define("ace/mode/haxe",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/haxe_highlight_rules","ace/mode/matching_brace_outdent","ace/mode/behaviour/cstyle","ace/mode/folding/cstyle"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./haxe_highlight_rules").HaxeHighlightRules,h=a("./matching_brace_outdent").MatchingBraceOutdent,i=a("./behaviour/cstyle").CstyleBehaviour,j=a("./folding/cstyle").FoldMode,k=function(){this.$tokenizer=new f((new g).getRules()),this.$outdent=new h,this.$behaviour=new i,this.foldingRules=new j};d.inherits(k,e),function(){this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a),f=e.tokens;if(f.length&&f[f.length-1].type=="comment")return d;if(a=="start"){var g=b.match(/^.*[\{\(\[]\s*$/);g&&(d+=c)}return d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)},this.createWorker=function(a){return null}}.call(k.prototype),b.Mode=k}),define("ace/mode/haxe_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/doc_comment_highlight_rules","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("./doc_comment_highlight_rules").DocCommentHighlightRules,g=a("./text_highlight_rules").TextHighlightRules,h=function(){var a=e.arrayToMap("break|case|cast|catch|class|continue|default|else|enum|extends|for|function|if|implements|import|in|inline|interface|new|override|package|private|public|return|static|super|switch|this|throw|trace|try|typedef|untyped|var|while|Array|Void|Bool|Int|UInt|Float|Dynamic|String|List|Hash|IntHash|Error|Unknown|Type|Std".split("|")),b=e.arrayToMap("null|true|false".split("|"));this.$rules={start:[{token:"comment",regex:"\\/\\/.*$"},(new f).getStartRule("doc-start"),{token:"comment",regex:"\\/\\*",merge:!0,next:"comment"},{token:"string.regexp",regex:"[/](?:(?:\\[(?:\\\\]|[^\\]])+\\])|(?:\\\\/|[^\\]/]))*[/]\\w*\\s*(?=[).,;]|$)"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:"constant.numeric",regex:"0[xX][0-9a-fA-F]+\\b"},{token:"constant.numeric",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:"constant.language.boolean",regex:"(?:true|false)\\b"},{token:function(c){return c=="this"?"variable.language":a.hasOwnProperty(c)?"keyword":b.hasOwnProperty(c)?"constant.language":"identifier"},regex:"[a-zA-Z_$][a-zA-Z0-9_$]*\\b"},{token:"keyword.operator",regex:"!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)"},{token:"punctuation.operator",regex:"\\?|\\:|\\,|\\;|\\."},{token:"paren.lparen",regex:"[[({<]"},{token:"paren.rparen",regex:"[\\])}>]"},{token:"text",regex:"\\s+"}],comment:[{token:"comment",regex:".*?\\*\\/",next:"start"},{token:"comment",merge:!0,regex:".+"}]},this.embedRules(f,"doc-",[(new f).getEndRule("start")])};d.inherits(h,g),b.HaxeHighlightRules=h}),define("ace/mode/doc_comment_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text_highlight_rules").TextHighlightRules,f=function(){this.$rules={start:[{token:"comment.doc.tag",regex:"@[\\w\\d_]+"},{token:"comment.doc",merge:!0,regex:"\\s+"},{token:"comment.doc",merge:!0,regex:"TODO"},{token:"comment.doc",merge:!0,regex:"[^@\\*]+"},{token:"comment.doc",merge:!0,regex:"."}]}};d.inherits(f,e),function(){this.getStartRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\/\\*(?=\\*)",next:a}},this.getEndRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\*\\/",next:a}}}.call(f.prototype),b.DocCommentHighlightRules=f}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../range").Range,e=function(){};(function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}}).call(e.prototype),b.MatchingBraceOutdent=e}),define("ace/mode/behaviour/cstyle",["require","exports","module","ace/lib/oop","ace/mode/behaviour"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../behaviour").Behaviour,f=function(){this.add("braces","insertion",function(a,b,c,d,e){if(e=="{"){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"{"+g+"}",selection:!1}:{text:"{}",selection:[1,1]}}if(e=="}"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var k=d.$findOpeningBracket("}",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}else if(e=="\n"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var l=d.findMatchingBracket({row:h.row,column:h.column+1});if(!l)return null;var m=this.getNextLineIndent(a,i.substring(0,i.length-1),d.getTabString()),n=this.$getIndent(d.doc.getLine(l.row));return{text:"\n"+m+"\n"+n,selection:[1,m.length,1,m.length]}}}}),this.add("braces","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="{"){var g=d.doc.getLine(e.start.row),h=g.substring(e.end.column,e.end.column+1);if(h=="}")return e.end.column++,e}}),this.add("parens","insertion",function(a,b,c,d,e){if(e=="("){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"("+g+")",selection:!1}:{text:"()",selection:[1,1]}}if(e==")"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j==")"){var k=d.$findOpeningBracket(")",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}}),this.add("parens","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="("){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h==")")return e.end.column++,e}}),this.add("string_dquotes","insertion",function(a,b,c,d,e){if(e=='"'||e=="'"){var f=e,g=c.getSelectionRange(),h=d.doc.getTextRange(g);if(h!=="")return{text:f+h+f,selection:!1};var i=c.getCursorPosition(),j=d.doc.getLine(i.row),k=j.substring(i.column-1,i.column);if(k=="\\")return null;var l=d.getTokens(g.start.row,g.start.row)[0].tokens,m=0,n,o=-1;for(var p=0;p<l.length;p++){n=l[p],n.type=="string"?o=-1:o<0&&(o=n.value.indexOf(f));if(n.value.length+m>g.start.column)break;m+=l[p].value.length}if(!n||o<0&&n.type!=="comment"&&(n.type!=="string"||g.start.column!==n.value.length+m-1&&n.value.lastIndexOf(f)===n.value.length-1))return{text:f+f,selection:[1,1]};if(n&&n.type==="string"){var q=j.substring(i.column,i.column+1);if(q==f)return{text:"",selection:[1,1]}}}}),this.add("string_dquotes","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&(f=='"'||f=="'")){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h=='"')return e.end.column++,e}})};d.inherits(f,e),b.CstyleBehaviour=f}),define("ace/mode/folding/cstyle",["require","exports","module","ace/lib/oop","ace/range","ace/mode/folding/fold_mode"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../../range").Range,f=a("./fold_mode").FoldMode,g=b.FoldMode=function(){};d.inherits(g,f),function(){this.foldingStartMarker=/(\{|\[)[^\}\]]*$|^\s*(\/\*)/,this.foldingStopMarker=/^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/,this.getFoldWidgetRange=function(a,b,c){var d=a.getLine(c),f=d.match(this.foldingStartMarker);if(f){var g=f.index;if(f[1])return this.openingBracketBlock(a,f[1],c,g);var h=a.getCommentFoldRange(c,g+f[0].length);return h.end.column-=2,h}if(b!=="markbeginend")return;var f=d.match(this.foldingStopMarker);if(f){var g=f.index+f[0].length;if(f[2]){var h=a.getCommentFoldRange(c,g);return h.end.column-=2,h}var i={row:c,column:g},j=a.$findOpeningBracket(f[1],i);if(!j)return;return j.column++,i.column--,e.fromPoints(j,i)}}}.call(g.prototype)}),define("ace/mode/folding/fold_mode",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../../range").Range,e=b.FoldMode=function(){};(function(){this.foldingStartMarker=null,this.foldingStopMarker=null,this.getFoldWidget=function(a,b,c){var d=a.getLine(c);return this.foldingStartMarker.test(d)?"start":b=="markbeginend"&&this.foldingStopMarker&&this.foldingStopMarker.test(d)?"end":""},this.getFoldWidgetRange=function(a,b,c){return null},this.indentationBlock=function(a,b,c){var e=/^\s*/,f=b,g=b,h=a.getLine(b),i=c||h.length,j=h.match(e)[0].length,k=a.getLength();while(++b<k){h=a.getLine(b);var l=h.match(e)[0].length;if(l==h.length)continue;if(l<=j)break;g=b}if(g>f){var m=a.getLine(g).length;return new d(f,i,g,m)}},this.openingBracketBlock=function(a,b,c,e){var f={row:c,column:e+1},g=a.$findClosingBracket(b,f);if(!g)return;var h=a.foldWidgets[g.row];return h==null&&(h=this.getFoldWidget(a,g.row)),h=="start"&&(g.row--,g.column=a.getLine(g.row).length),d.fromPoints(f,g)}}).call(e.prototype)})
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-html-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-html-uncompressed.js
deleted file mode 100644
index 62d0ce1439..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-html-uncompressed.js
+++ /dev/null
@@ -1,2449 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/html', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/mode/javascript', 'ace/mode/css', 'ace/tokenizer', 'ace/mode/html_highlight_rules', 'ace/mode/behaviour/xml', 'ace/mode/folding/html'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextMode = require("./text").Mode;
-var JavaScriptMode = require("./javascript").Mode;
-var CssMode = require("./css").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
-var HtmlHighlightRules = require("./html_highlight_rules").HtmlHighlightRules;
-var XmlBehaviour = require("./behaviour/xml").XmlBehaviour;
-var HtmlFoldMode = require("./folding/html").FoldMode;
-
-var Mode = function() {
-    var highlighter = new HtmlHighlightRules();
-    this.$tokenizer = new Tokenizer(highlighter.getRules());
-    this.$behaviour = new XmlBehaviour();
-    
-    this.$embeds = highlighter.getEmbeds();
-    this.createModeDelegates({
-        "js-": JavaScriptMode,
-        "css-": CssMode
-    });
-    
-    this.foldingRules = new HtmlFoldMode();
-};
-oop.inherits(Mode, TextMode);
-
-(function() {
-
-    
-    this.toggleCommentLines = function(state, doc, startRow, endRow) {
-        return 0;
-    };
-
-    this.getNextLineIndent = function(state, line, tab) {
-        return this.$getIndent(line);
-    };
-
-    this.checkOutdent = function(state, line, input) {
-        return false;
-    };
-
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/javascript', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/javascript_highlight_rules', 'ace/mode/matching_brace_outdent', 'ace/range', 'ace/worker/worker_client', 'ace/mode/behaviour/cstyle', 'ace/mode/folding/cstyle'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
-var JavaScriptHighlightRules = require("./javascript_highlight_rules").JavaScriptHighlightRules;
-var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
-var Range = require("../range").Range;
-var WorkerClient = require("../worker/worker_client").WorkerClient;
-var CstyleBehaviour = require("./behaviour/cstyle").CstyleBehaviour;
-var CStyleFoldMode = require("./folding/cstyle").FoldMode;
-
-var Mode = function() {
-    this.$tokenizer = new Tokenizer(new JavaScriptHighlightRules().getRules());
-    this.$outdent = new MatchingBraceOutdent();
-    this.$behaviour = new CstyleBehaviour();
-    this.foldingRules = new CStyleFoldMode();
-};
-oop.inherits(Mode, TextMode);
-
-(function() {
-
-
-    this.toggleCommentLines = function(state, doc, startRow, endRow) {
-        var outdent = true;
-        var re = /^(\s*)\/\//;
-
-        for (var i=startRow; i<= endRow; i++) {
-            if (!re.test(doc.getLine(i))) {
-                outdent = false;
-                break;
-            }
-        }
-
-        if (outdent) {
-            var deleteRange = new Range(0, 0, 0, 0);
-            for (var i=startRow; i<= endRow; i++)
-            {
-                var line = doc.getLine(i);
-                var m = line.match(re);
-                deleteRange.start.row = i;
-                deleteRange.end.row = i;
-                deleteRange.end.column = m[0].length;
-                doc.replace(deleteRange, m[1]);
-            }
-        }
-        else {
-            doc.indentRows(startRow, endRow, "//");
-        }
-    };
-
-    this.getNextLineIndent = function(state, line, tab) {
-        var indent = this.$getIndent(line);
-
-        var tokenizedLine = this.$tokenizer.getLineTokens(line, state);
-        var tokens = tokenizedLine.tokens;
-        var endState = tokenizedLine.state;
-
-        if (tokens.length && tokens[tokens.length-1].type == "comment") {
-            return indent;
-        }
-        
-        if (state == "start" || state == "regex_allowed") {
-            var match = line.match(/^.*(?:\bcase\b.*\:|[\{\(\[])\s*$/);
-            if (match) {
-                indent += tab;
-            }
-        } else if (state == "doc-start") {
-            if (endState == "start" || state == "regex_allowed") {
-                return "";
-            }
-            var match = line.match(/^\s*(\/?)\*/);
-            if (match) {
-                if (match[1]) {
-                    indent += " ";
-                }
-                indent += "* ";
-            }
-        }
-
-        return indent;
-    };
-
-    this.checkOutdent = function(state, line, input) {
-        return this.$outdent.checkOutdent(line, input);
-    };
-
-    this.autoOutdent = function(state, doc, row) {
-        this.$outdent.autoOutdent(doc, row);
-    };
-    
-    this.createWorker = function(session) {
-        var worker = new WorkerClient(["ace"], "worker-javascript.js", "ace/mode/javascript_worker", "JavaScriptWorker");
-        worker.attachToDocument(session.getDocument());
-            
-        worker.on("jslint", function(results) {
-            var errors = [];
-            for (var i=0; i<results.data.length; i++) {
-                var error = results.data[i];
-                if (error)
-                    errors.push({
-                        row: error.line-1,
-                        column: error.character-1,
-                        text: error.reason,
-                        type: "warning",
-                        lint: error
-                    });
-            }
-            session.setAnnotations(errors);
-        });
-        
-        worker.on("narcissus", function(e) {
-            session.setAnnotations([e.data]);
-        });
-        
-        worker.on("terminate", function() {
-            session.clearAnnotations();
-        });
-        
-        return worker;
-    };
-
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Mihai Sucan <mihai DOT sucan AT gmail DOT com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/javascript_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/unicode', 'ace/mode/doc_comment_highlight_rules', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var lang = require("../lib/lang");
-var unicode = require("../unicode");
-var DocCommentHighlightRules = require("./doc_comment_highlight_rules").DocCommentHighlightRules;
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var JavaScriptHighlightRules = function() {
-
-    // see: https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects
-    var globals = lang.arrayToMap(
-      // Constructors
-        ("Array|Boolean|Date|Function|Iterator|Number|Object|RegExp|String|Proxy|" +
-      // E4X
-         "Namespace|QName|XML|XMLList|" +
-         "ArrayBuffer|Float32Array|Float64Array|Int16Array|Int32Array|Int8Array|" +
-         "Uint16Array|Uint32Array|Uint8Array|Uint8ClampedArray|" +
-      // Errors
-        "Error|EvalError|InternalError|RangeError|ReferenceError|StopIteration|" +
-        "SyntaxError|TypeError|URIError|" +
-      //  Non-constructor functions
-        "decodeURI|decodeURIComponent|encodeURI|encodeURIComponent|eval|isFinite|" +
-        "isNaN|parseFloat|parseInt|" +
-      // Other
-        "JSON|Math|" +
-      // Pseudo
-        "this|arguments|prototype|window|document"
-      ).split("|")
-    );
-
-    var keywords = lang.arrayToMap(
-        ("break|case|catch|continue|default|delete|do|else|finally|for|function|" +
-        "if|in|instanceof|new|return|switch|throw|try|typeof|let|var|while|with|" +
-        "const|yield|import|get|set").split("|")
-    );
-
-    // keywords which can be followed by regular expressions
-    var kwBeforeRe = "case|do|else|finally|in|instanceof|return|throw|try|typeof|yield";
-
-    var deprecated = lang.arrayToMap(
-        ("__parent__|__count__|escape|unescape|with|__proto__").split("|")
-    );
-
-    var definitions = lang.arrayToMap(("const|let|var|function").split("|"));
-
-    var buildinConstants = lang.arrayToMap(
-        ("null|Infinity|NaN|undefined").split("|")
-    );
-
-    var futureReserved = lang.arrayToMap(
-        ("class|enum|extends|super|export|implements|private|" +
-        "public|interface|package|protected|static").split("|")
-    );
-
-    // TODO: Unicode escape sequences
-    var identifierRe = "[" + unicode.packages.L + "\\$_]["
-        + unicode.packages.L
-        + unicode.packages.Mn + unicode.packages.Mc
-        + unicode.packages.Nd
-        + unicode.packages.Pc + "\\$_]*\\b";
-
-    var escapedRe = "\\\\(?:x[0-9a-fA-F]{2}|" + // hex
-        "u[0-9a-fA-F]{4}|" + // unicode
-        "[0-2][0-7]{0,2}|" + // oct
-        "3[0-6][0-7]?|" + // oct
-        "37[0-7]?|" + // oct
-        "[4-7][0-7]?|" + //oct
-        ".)";
-
-    // regexp must not have capturing parentheses. Use (?:) instead.
-    // regexps are ordered -> the first match is used
-
-    this.$rules = {
-        "start" : [
-            {
-                token : "comment",
-                regex : /\/\/.*$/
-            },
-            new DocCommentHighlightRules().getStartRule("doc-start"),
-            {
-                token : "comment", // multi line comment
-                merge : true,
-                regex : /\/\*/,
-                next : "comment"
-            }, {
-                token : "string",
-                regex : "'",
-                next  : "qstring"
-            }, {
-                token : "string",
-                regex : '"',
-                next  : "qqstring"
-            }, {
-                token : "constant.numeric", // hex
-                regex : /0[xX][0-9a-fA-F]+\b/
-            }, {
-                token : "constant.numeric", // float
-                regex : /[+-]?\d+(?:(?:\.\d*)?(?:[eE][+-]?\d+)?)?\b/
-            }, { // match stuff like: Sound.prototype.play = function() { }
-                token : [
-                    "storage.type",
-                    "punctuation.operator",
-                    "support.function",
-                    "punctuation.operator",
-                    "entity.name.function",
-                    "text",
-                    "keyword.operator",
-                    "text",
-                    "storage.type",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(" + identifierRe + ")(\\.)(prototype)(\\.)(" + identifierRe +")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"
-            }, { // match stuff like: Sound.prototype.play = myfunc
-                token : [
-                    "storage.type",
-                    "punctuation.operator",
-                    "support.function",
-                    "punctuation.operator",
-                    "entity.name.function",
-                    "text",
-                    "keyword.operator",
-                    "text"
-                ],
-                regex : "(" + identifierRe + ")(\\.)(prototype)(\\.)(" + identifierRe +")(\\s*)(=)(\\s*)"
-            }, { // match stuff like: Sound.play = function() {  }
-                token : [
-                    "storage.type",
-                    "punctuation.operator",
-                    "entity.name.function",
-                    "text",
-                    "keyword.operator",
-                    "text",
-                    "storage.type",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(" + identifierRe + ")(\\.)(" + identifierRe +")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"
-            }, { // match stuff like: play = function() {  }
-                token : [
-                    "entity.name.function",
-                    "text",
-                    "keyword.operator",
-                    "text",
-                    "storage.type",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(" + identifierRe +")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"
-            }, { // match regular function like: function myFunc(arg) { }
-                token : [
-                    "storage.type",
-                    "text",
-                    "entity.name.function",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(function)(\\s+)(" + identifierRe + ")(\\s*)(\\()(.*?)(\\))"
-            }, { // match stuff like: foobar: function() { }
-                token : [
-                    "entity.name.function",
-                    "text",
-                    "punctuation.operator",
-                    "text",
-                    "storage.type",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(" + identifierRe + ")(\\s*)(:)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"
-            }, { // Attempt to match : function() { } (this is for issues with 'foo': function() { })
-                token : [
-                    "text",
-                    "text",
-                    "storage.type",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(:)(\\s*)(function)?(\\s*)(\\()([^)]*)(\\))"
-            }, {
-                token : "constant.language.boolean",
-                regex : /(?:true|false)\b/
-            }, {
-                token : "keyword",
-                regex : "(?:" + kwBeforeRe + ")\\b",
-                next : "regex_allowed"
-            }, {
-                token : ["punctuation.operator", "support.function"],
-                regex : /(\.)(s(?:h(?:ift|ow(?:Mod(?:elessDialog|alDialog)|Help))|croll(?:X|By(?:Pages|Lines)?|Y|To)?|t(?:opzzzz|rike)|i(?:n|zeToContent|debar|gnText)|ort|u(?:p|b(?:str(?:ing)?)?)|pli(?:ce|t)|e(?:nd|t(?:Re(?:sizable|questHeader)|M(?:i(?:nutes|lliseconds)|onth)|Seconds|Ho(?:tKeys|urs)|Year|Cursor|Time(?:out)?|Interval|ZOptions|Date|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Date|FullYear)|FullYear|Active)|arch)|qrt|lice|avePreferences|mall)|h(?:ome|andleEvent)|navigate|c(?:har(?:CodeAt|At)|o(?:s|n(?:cat|textual|firm)|mpile)|eil|lear(?:Timeout|Interval)?|a(?:ptureEvents|ll)|reate(?:StyleSheet|Popup|EventObject))|t(?:o(?:GMTString|S(?:tring|ource)|U(?:TCString|pperCase)|Lo(?:caleString|werCase))|est|a(?:n|int(?:Enabled)?))|i(?:s(?:NaN|Finite)|ndexOf|talics)|d(?:isableExternalCapture|ump|etachEvent)|u(?:n(?:shift|taint|escape|watch)|pdateCommands)|j(?:oin|avaEnabled)|p(?:o(?:p|w)|ush|lugins.refresh|a(?:ddings|rse(?:Int|Float)?)|r(?:int|ompt|eference))|e(?:scape|nableExternalCapture|val|lementFromPoint|x(?:p|ec(?:Script|Command)?))|valueOf|UTC|queryCommand(?:State|Indeterm|Enabled|Value)|f(?:i(?:nd|le(?:ModifiedDate|Size|CreatedDate|UpdatedDate)|xed)|o(?:nt(?:size|color)|rward)|loor|romCharCode)|watch|l(?:ink|o(?:ad|g)|astIndexOf)|a(?:sin|nchor|cos|t(?:tachEvent|ob|an(?:2)?)|pply|lert|b(?:s|ort))|r(?:ou(?:nd|teEvents)|e(?:size(?:By|To)|calc|turnValue|place|verse|l(?:oad|ease(?:Capture|Events)))|andom)|g(?:o|et(?:ResponseHeader|M(?:i(?:nutes|lliseconds)|onth)|Se(?:conds|lection)|Hours|Year|Time(?:zoneOffset)?|Da(?:y|te)|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Da(?:y|te)|FullYear)|FullYear|A(?:ttention|llResponseHeaders)))|m(?:in|ove(?:B(?:y|elow)|To(?:Absolute)?|Above)|ergeAttributes|a(?:tch|rgins|x))|b(?:toa|ig|o(?:ld|rderWidths)|link|ack))\b(?=\()/
-            }, {
-                token : ["punctuation.operator", "support.function.dom"],
-                regex : /(\.)(s(?:ub(?:stringData|mit)|plitText|e(?:t(?:NamedItem|Attribute(?:Node)?)|lect))|has(?:ChildNodes|Feature)|namedItem|c(?:l(?:ick|o(?:se|neNode))|reate(?:C(?:omment|DATASection|aption)|T(?:Head|extNode|Foot)|DocumentFragment|ProcessingInstruction|E(?:ntityReference|lement)|Attribute))|tabIndex|i(?:nsert(?:Row|Before|Cell|Data)|tem)|open|delete(?:Row|C(?:ell|aption)|T(?:Head|Foot)|Data)|focus|write(?:ln)?|a(?:dd|ppend(?:Child|Data))|re(?:set|place(?:Child|Data)|move(?:NamedItem|Child|Attribute(?:Node)?)?)|get(?:NamedItem|Element(?:sBy(?:Name|TagName)|ById)|Attribute(?:Node)?)|blur)\b(?=\()/
-            }, {
-                token : ["punctuation.operator", "support.constant"],
-                regex : /(\.)(s(?:ystemLanguage|cr(?:ipts|ollbars|een(?:X|Y|Top|Left))|t(?:yle(?:Sheets)?|atus(?:Text|bar)?)|ibling(?:Below|Above)|ource|uffixes|e(?:curity(?:Policy)?|l(?:ection|f)))|h(?:istory|ost(?:name)?|as(?:h|Focus))|y|X(?:MLDocument|SLDocument)|n(?:ext|ame(?:space(?:s|URI)|Prop))|M(?:IN_VALUE|AX_VALUE)|c(?:haracterSet|o(?:n(?:structor|trollers)|okieEnabled|lorDepth|mp(?:onents|lete))|urrent|puClass|l(?:i(?:p(?:boardData)?|entInformation)|osed|asses)|alle(?:e|r)|rypto)|t(?:o(?:olbar|p)|ext(?:Transform|Indent|Decoration|Align)|ags)|SQRT(?:1_2|2)|i(?:n(?:ner(?:Height|Width)|put)|ds|gnoreCase)|zIndex|o(?:scpu|n(?:readystatechange|Line)|uter(?:Height|Width)|p(?:sProfile|ener)|ffscreenBuffering)|NEGATIVE_INFINITY|d(?:i(?:splay|alog(?:Height|Top|Width|Left|Arguments)|rectories)|e(?:scription|fault(?:Status|Ch(?:ecked|arset)|View)))|u(?:ser(?:Profile|Language|Agent)|n(?:iqueID|defined)|pdateInterval)|_content|p(?:ixelDepth|ort|ersonalbar|kcs11|l(?:ugins|atform)|a(?:thname|dding(?:Right|Bottom|Top|Left)|rent(?:Window|Layer)?|ge(?:X(?:Offset)?|Y(?:Offset)?))|r(?:o(?:to(?:col|type)|duct(?:Sub)?|mpter)|e(?:vious|fix)))|e(?:n(?:coding|abledPlugin)|x(?:ternal|pando)|mbeds)|v(?:isibility|endor(?:Sub)?|Linkcolor)|URLUnencoded|P(?:I|OSITIVE_INFINITY)|f(?:ilename|o(?:nt(?:Size|Family|Weight)|rmName)|rame(?:s|Element)|gColor)|E|whiteSpace|l(?:i(?:stStyleType|n(?:eHeight|kColor))|o(?:ca(?:tion(?:bar)?|lName)|wsrc)|e(?:ngth|ft(?:Context)?)|a(?:st(?:M(?:odified|atch)|Index|Paren)|yer(?:s|X)|nguage))|a(?:pp(?:MinorVersion|Name|Co(?:deName|re)|Version)|vail(?:Height|Top|Width|Left)|ll|r(?:ity|guments)|Linkcolor|bove)|r(?:ight(?:Context)?|e(?:sponse(?:XML|Text)|adyState))|global|x|m(?:imeTypes|ultiline|enubar|argin(?:Right|Bottom|Top|Left))|L(?:N(?:10|2)|OG(?:10E|2E))|b(?:o(?:ttom|rder(?:Width|RightWidth|BottomWidth|Style|Color|TopWidth|LeftWidth))|ufferDepth|elow|ackground(?:Color|Image)))\b/
-            }, {
-                token : ["storage.type", "punctuation.operator", "support.function.firebug"],
-                regex : /(console)(\.)(warn|info|log|error|time|timeEnd|assert)\b/
-            }, {
-                token : function(value) {
-                    if (globals.hasOwnProperty(value))
-                        return "variable.language";
-                    else if (deprecated.hasOwnProperty(value))
-                        return "invalid.deprecated";
-                    else if (definitions.hasOwnProperty(value))
-                        return "storage.type";
-                    else if (keywords.hasOwnProperty(value))
-                        return "keyword";
-                    else if (buildinConstants.hasOwnProperty(value))
-                        return "constant.language";
-                    else if (futureReserved.hasOwnProperty(value))
-                        return "invalid.illegal";
-                    else if (value == "debugger")
-                        return "invalid.deprecated";
-                    else
-                        return "identifier";
-                },
-                regex : identifierRe
-            }, {
-                token : "keyword.operator",
-                regex : /!|\$|%|&|\*|\-\-|\-|\+\+|\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\|\||\?\:|\*=|%=|\+=|\-=|&=|\^=|\b(?:in|instanceof|new|delete|typeof|void)/,
-                next  : "regex_allowed"
-            }, {
-                token : "punctuation.operator",
-                regex : /\?|\:|\,|\;|\./,
-                next  : "regex_allowed"
-            }, {
-                token : "paren.lparen",
-                regex : /[\[({]/,
-                next  : "regex_allowed"
-            }, {
-                token : "paren.rparen",
-                regex : /[\])}]/
-            }, {
-                token : "keyword.operator",
-                regex : /\/=?/,
-                next  : "regex_allowed"
-            }, {
-                token: "comment",
-                regex: /^#!.*$/
-            }, {
-                token : "text",
-                regex : /\s+/
-            }
-        ],
-        // regular expressions are only allowed after certain tokens. This
-        // makes sure we don't mix up regexps with the divison operator
-        "regex_allowed": [
-            {
-                token : "comment", // multi line comment
-                merge : true,
-                regex : "\\/\\*",
-                next : "comment_regex_allowed"
-            }, {
-                token : "comment",
-                regex : "\\/\\/.*$"
-            }, {
-                token: "string.regexp",
-                regex: "\\/",
-                next: "regex",
-                merge: true
-            }, {
-                token : "text",
-                regex : "\\s+"
-            }, {
-                // immediately return to the start mode without matching
-                // anything
-                token: "empty",
-                regex: "",
-                next: "start"
-            }
-        ],
-        "regex": [
-            {
-                token: "regexp.keyword.operator",
-                regex: "\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",
-                next: "regex"
-            }, {
-				// flag
-                token: "string.regexp",
-                regex: "/\\w*",
-                next: "start",
-                merge: true
-            }, {
-                token: "string.regexp",
-                regex: "[^\\\\/\\[]+",
-                next: "regex",
-                merge: true
-            }, {
-                token: "string.regexp.charachterclass",
-                regex: "\\[",
-                next: "regex_character_class",
-                merge: true
-            }, {
-                token: "empty",
-                regex: "",
-                next: "start"
-            }
-        ],
-        "regex_character_class": [
-            {
-                token: "regexp.keyword.operator",
-                regex: "\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",
-                next: "regex_character_class"
-            }, {
-                token: "string.regexp.charachterclass",
-                regex: "]",
-                next: "regex",
-                merge: true
-            }, {
-                token: "string.regexp.charachterclass",
-                regex: "[^\\\\\\]]+",
-                next: "regex_character_class",
-                merge: true
-            }, {
-                token: "empty",
-                regex: "",
-                next: "start"
-            }
-        ],
-        "comment_regex_allowed" : [
-            {
-                token : "comment", // closing comment
-                regex : ".*?\\*\\/",
-                merge : true,
-                next : "regex_allowed"
-            }, {
-                token : "comment", // comment spanning whole line
-                merge : true,
-                regex : ".+"
-            }
-        ],
-        "comment" : [
-            {
-                token : "comment", // closing comment
-                regex : ".*?\\*\\/",
-                merge : true,
-                next : "start"
-            }, {
-                token : "comment", // comment spanning whole line
-                merge : true,
-                regex : ".+"
-            }
-        ],
-        "qqstring" : [
-            {
-                token : "constant.language.escape",
-                regex : escapedRe
-            }, {
-                token : "string",
-                regex : '[^"\\\\]+'
-            }, {
-                token : "string",
-                regex : '"',
-                next  : "start"
-            }
-        ],
-        "qstring" : [
-            {
-                token : "constant.language.escape",
-                regex : escapedRe
-            }, {
-                token : "string",
-                regex : "[^'\\\\]+"
-            }, {
-                token : "string",
-                regex : "'",
-                next  : "start"
-            }
-        ]
-    };
-
-    this.embedRules(DocCommentHighlightRules, "doc-",
-        [ new DocCommentHighlightRules().getEndRule("start") ]);
-};
-
-oop.inherits(JavaScriptHighlightRules, TextHighlightRules);
-
-exports.JavaScriptHighlightRules = JavaScriptHighlightRules;
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/doc_comment_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var DocCommentHighlightRules = function() {
-
-    this.$rules = {
-        "start" : [ {
-            token : "comment.doc.tag",
-            regex : "@[\\w\\d_]+" // TODO: fix email addresses
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "\\s+"
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "TODO"
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "[^@\\*]+"
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "."
-        }]
-    };
-};
-
-oop.inherits(DocCommentHighlightRules, TextHighlightRules);
-
-(function() {
-
-    this.getStartRule = function(start) {
-        return {
-            token : "comment.doc", // doc comment
-            merge : true,
-            regex : "\\/\\*(?=\\*)",
-            next  : start
-        };
-    };
-    
-    this.getEndRule = function (start) {
-        return {
-            token : "comment.doc", // closing comment
-            merge : true,
-            regex : "\\*\\/",
-            next  : start
-        };
-    };
-
-}).call(DocCommentHighlightRules.prototype);
-
-exports.DocCommentHighlightRules = DocCommentHighlightRules;
-
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/matching_brace_outdent', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../range").Range;
-
-var MatchingBraceOutdent = function() {};
-
-(function() {
-
-    this.checkOutdent = function(line, input) {
-        if (! /^\s+$/.test(line))
-            return false;
-
-        return /^\s*\}/.test(input);
-    };
-
-    this.autoOutdent = function(doc, row) {
-        var line = doc.getLine(row);
-        var match = line.match(/^(\s*\})/);
-
-        if (!match) return 0;
-
-        var column = match[1].length;
-        var openBracePos = doc.findMatchingBracket({row: row, column: column});
-
-        if (!openBracePos || openBracePos.row == row) return 0;
-
-        var indent = this.$getIndent(doc.getLine(openBracePos.row));
-        doc.replace(new Range(row, 0, row, column-1), indent);
-    };
-
-    this.$getIndent = function(line) {
-        var match = line.match(/^(\s+)/);
-        if (match) {
-            return match[1];
-        }
-
-        return "";
-    };
-
-}).call(MatchingBraceOutdent.prototype);
-
-exports.MatchingBraceOutdent = MatchingBraceOutdent;
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Chris Spencer <chris.ag.spencer AT googlemail DOT com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/behaviour/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/behaviour'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var Behaviour = require('../behaviour').Behaviour;
-
-var CstyleBehaviour = function () {
-
-    this.add("braces", "insertion", function (state, action, editor, session, text) {
-        if (text == '{') {
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: '{' + selected + '}',
-                    selection: false
-                };
-            } else {
-                return {
-                    text: '{}',
-                    selection: [1, 1]
-                };
-            }
-        } else if (text == '}') {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == '}') {
-                var matching = session.$findOpeningBracket('}', {column: cursor.column + 1, row: cursor.row});
-                if (matching !== null) {
-                    return {
-                        text: '',
-                        selection: [1, 1]
-                    };
-                }
-            }
-        } else if (text == "\n") {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == '}') {
-                var openBracePos = session.findMatchingBracket({row: cursor.row, column: cursor.column + 1});
-                if (!openBracePos)
-                     return null;
-
-                var indent = this.getNextLineIndent(state, line.substring(0, line.length - 1), session.getTabString());
-                var next_indent = this.$getIndent(session.doc.getLine(openBracePos.row));
-
-                return {
-                    text: '\n' + indent + '\n' + next_indent,
-                    selection: [1, indent.length, 1, indent.length]
-                };
-            }
-        }
-    });
-
-    this.add("braces", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && selected == '{') {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.end.column, range.end.column + 1);
-            if (rightChar == '}') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-    this.add("parens", "insertion", function (state, action, editor, session, text) {
-        if (text == '(') {
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: '(' + selected + ')',
-                    selection: false
-                };
-            } else {
-                return {
-                    text: '()',
-                    selection: [1, 1]
-                };
-            }
-        } else if (text == ')') {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == ')') {
-                var matching = session.$findOpeningBracket(')', {column: cursor.column + 1, row: cursor.row});
-                if (matching !== null) {
-                    return {
-                        text: '',
-                        selection: [1, 1]
-                    };
-                }
-            }
-        }
-    });
-
-    this.add("parens", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && selected == '(') {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
-            if (rightChar == ')') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-    this.add("string_dquotes", "insertion", function (state, action, editor, session, text) {
-        if (text == '"' || text == "'") {
-            var quote = text;
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: quote + selected + quote,
-                    selection: false
-                };
-            } else {
-                var cursor = editor.getCursorPosition();
-                var line = session.doc.getLine(cursor.row);
-                var leftChar = line.substring(cursor.column-1, cursor.column);
-
-                // We're escaped.
-                if (leftChar == '\\') {
-                    return null;
-                }
-
-                // Find what token we're inside.
-                var tokens = session.getTokens(selection.start.row, selection.start.row)[0].tokens;
-                var col = 0, token;
-                var quotepos = -1; // Track whether we're inside an open quote.
-
-                for (var x = 0; x < tokens.length; x++) {
-                    token = tokens[x];
-                    if (token.type == "string") {
-                      quotepos = -1;
-                    } else if (quotepos < 0) {
-                      quotepos = token.value.indexOf(quote);
-                    }
-                    if ((token.value.length + col) > selection.start.column) {
-                        break;
-                    }
-                    col += tokens[x].value.length;
-                }
-
-                // Try and be smart about when we auto insert.
-                if (!token || (quotepos < 0 && token.type !== "comment" && (token.type !== "string" || ((selection.start.column !== token.value.length+col-1) && token.value.lastIndexOf(quote) === token.value.length-1)))) {
-                    return {
-                        text: quote + quote,
-                        selection: [1,1]
-                    };
-                } else if (token && token.type === "string") {
-                    // Ignore input and move right one if we're typing over the closing quote.
-                    var rightChar = line.substring(cursor.column, cursor.column + 1);
-                    if (rightChar == quote) {
-                        return {
-                            text: '',
-                            selection: [1, 1]
-                        };
-                    }
-                }
-            }
-        }
-    });
-
-    this.add("string_dquotes", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && (selected == '"' || selected == "'")) {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
-            if (rightChar == '"') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-};
-
-oop.inherits(CstyleBehaviour, Behaviour);
-
-exports.CstyleBehaviour = CstyleBehaviour;
-});/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/folding/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/range', 'ace/mode/folding/fold_mode'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var Range = require("../../range").Range;
-var BaseFoldMode = require("./fold_mode").FoldMode;
-
-var FoldMode = exports.FoldMode = function() {};
-oop.inherits(FoldMode, BaseFoldMode);
-
-(function() {
-
-    this.foldingStartMarker = /(\{|\[)[^\}\]]*$|^\s*(\/\*)/;
-    this.foldingStopMarker = /^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/;
-    
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        var line = session.getLine(row);
-        var match = line.match(this.foldingStartMarker);
-        if (match) {
-            var i = match.index;
-
-            if (match[1])
-                return this.openingBracketBlock(session, match[1], row, i);
-
-            var range = session.getCommentFoldRange(row, i + match[0].length);
-            range.end.column -= 2;
-            return range;
-        }
-
-        if (foldStyle !== "markbeginend")
-            return;
-            
-        var match = line.match(this.foldingStopMarker);
-        if (match) {
-            var i = match.index + match[0].length;
-
-            if (match[2]) {
-                var range = session.getCommentFoldRange(row, i);
-                range.end.column -= 2;
-                return range;
-            }
-
-            var end = {row: row, column: i};
-            var start = session.$findOpeningBracket(match[1], end);
-            
-            if (!start)
-                return;
-
-            start.column++;
-            end.column--;
-
-            return  Range.fromPoints(start, end);
-        }
-    };
-    
-}).call(FoldMode.prototype);
-
-});/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/folding/fold_mode', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../../range").Range;
-
-var FoldMode = exports.FoldMode = function() {};
-
-(function() {
-
-    this.foldingStartMarker = null;
-    this.foldingStopMarker = null;
-
-    // must return "" if there's no fold, to enable caching
-    this.getFoldWidget = function(session, foldStyle, row) {
-        var line = session.getLine(row);
-        if (this.foldingStartMarker.test(line))
-            return "start";
-        if (foldStyle == "markbeginend"
-                && this.foldingStopMarker
-                && this.foldingStopMarker.test(line))
-            return "end";
-        return "";
-    };
-    
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        return null;
-    };
-
-    this.indentationBlock = function(session, row, column) {
-        var re = /^\s*/;
-        var startRow = row;
-        var endRow = row;
-        var line = session.getLine(row);
-        var startColumn = column || line.length;
-        var startLevel = line.match(re)[0].length;
-        var maxRow = session.getLength()
-        
-        while (++row < maxRow) {
-            line = session.getLine(row);
-            var level = line.match(re)[0].length;
-
-            if (level == line.length)
-                continue;
-
-            if (level <= startLevel)
-                break;
-
-            endRow = row;
-        }
-
-        if (endRow > startRow) {
-            var endColumn = session.getLine(endRow).length;
-            return new Range(startRow, startColumn, endRow, endColumn);
-        }
-    };
-
-    this.openingBracketBlock = function(session, bracket, row, column) {
-        var start = {row: row, column: column + 1};
-        var end = session.$findClosingBracket(bracket, start);
-        if (!end)
-            return;
-
-        var fw = session.foldWidgets[end.row];
-        if (fw == null)
-            fw = this.getFoldWidget(session, end.row);
-
-        if (fw == "start") {
-            end.row --;
-            end.column = session.getLine(end.row).length;
-        }
-        return Range.fromPoints(start, end);
-    };
-
-}).call(FoldMode.prototype);
-
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/css', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/css_highlight_rules', 'ace/mode/matching_brace_outdent', 'ace/worker/worker_client', 'ace/mode/folding/cstyle'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
-var CssHighlightRules = require("./css_highlight_rules").CssHighlightRules;
-var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
-var WorkerClient = require("../worker/worker_client").WorkerClient;
-var CStyleFoldMode = require("./folding/cstyle").FoldMode;
-
-var Mode = function() {
-    this.$tokenizer = new Tokenizer(new CssHighlightRules().getRules(), "i");
-    this.$outdent = new MatchingBraceOutdent();
-    this.foldingRules = new CStyleFoldMode();
-};
-oop.inherits(Mode, TextMode);
-
-(function() {
-
-    this.foldingRules = "cStyle";
-
-    this.getNextLineIndent = function(state, line, tab) {
-        var indent = this.$getIndent(line);
-
-        // ignore braces in comments
-        var tokens = this.$tokenizer.getLineTokens(line, state).tokens;
-        if (tokens.length && tokens[tokens.length-1].type == "comment") {
-            return indent;
-        }
-
-        var match = line.match(/^.*\{\s*$/);
-        if (match) {
-            indent += tab;
-        }
-
-        return indent;
-    };
-
-    this.checkOutdent = function(state, line, input) {
-        return this.$outdent.checkOutdent(line, input);
-    };
-
-    this.autoOutdent = function(state, doc, row) {
-        this.$outdent.autoOutdent(doc, row);
-    };
-    
-    this.createWorker = function(session) {
-        var worker = new WorkerClient(["ace"], "worker-css.js", "ace/mode/css_worker", "Worker");
-        worker.attachToDocument(session.getDocument());
-        
-        worker.on("csslint", function(e) {
-            var errors = [];
-            e.data.forEach(function(message) {
-                errors.push({
-                    row: message.line - 1,
-                    column: message.col - 1,
-                    text: message.message,
-                    type: message.type,
-                    lint: message
-                });
-            });
-            
-            session.setAnnotations(errors);
-        });
-        return worker;
-    };
-
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/css_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var lang = require("../lib/lang");
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var CssHighlightRules = function() {
-
-    var properties = lang.arrayToMap(
-        ("animation-fill-mode|alignment-adjust|alignment-baseline|animation-delay|animation-direction|animation-duration|animation-iteration-count|animation-name|animation-play-state|animation-timing-function|animation|appearance|azimuth|backface-visibility|background-attachment|background-break|background-clip|background-color|background-image|background-origin|background-position|background-repeat|background-size|background|baseline-shift|binding|bleed|bookmark-label|bookmark-level|bookmark-state|bookmark-target|border-bottom|border-bottom-color|border-bottom-left-radius|border-bottom-right-radius|border-bottom-style|border-bottom-width|border-collapse|border-color|border-image|border-image-outset|border-image-repeat|border-image-slice|border-image-source|border-image-width|border-left|border-left-color|border-left-style|border-left-width|border-radius|border-right|border-right-color|border-right-style|border-right-width|border-spacing|border-style|border-top|border-top-color|border-top-left-radius|border-top-right-radius|border-top-style|border-top-width|border-width|border|bottom|box-align|box-decoration-break|box-direction|box-flex-group|box-flex|box-lines|box-ordinal-group|box-orient|box-pack|box-shadow|box-sizing|break-after|break-before|break-inside|caption-side|clear|clip|color-profile|color|column-count|column-fill|column-gap|column-rule|column-rule-color|column-rule-style|column-rule-width|column-span|column-width|columns|content|counter-increment|counter-reset|crop|cue-after|cue-before|cue|cursor|direction|display|dominant-baseline|drop-initial-after-adjust|drop-initial-after-align|drop-initial-before-adjust|drop-initial-before-align|drop-initial-size|drop-initial-value|elevation|empty-cells|fit|fit-position|float-offset|float|font-family|font-size|font-size-adjust|font-stretch|font-style|font-variant|font-weight|font|grid-columns|grid-rows|hanging-punctuation|height|hyphenate-after|hyphenate-before|hyphenate-character|hyphenate-lines|hyphenate-resource|hyphens|icon|image-orientation|image-rendering|image-resolution|inline-box-align|left|letter-spacing|line-height|line-stacking-ruby|line-stacking-shift|line-stacking-strategy|line-stacking|list-style-image|list-style-position|list-style-type|list-style|margin-bottom|margin-left|margin-right|margin-top|margin|mark-after|mark-before|mark|marks|marquee-direction|marquee-play-count|marquee-speed|marquee-style|max-height|max-width|min-height|min-width|move-to|nav-down|nav-index|nav-left|nav-right|nav-up|opacity|orphans|outline-color|outline-offset|outline-style|outline-width|outline|overflow-style|overflow-x|overflow-y|overflow|padding-bottom|padding-left|padding-right|padding-top|padding|page-break-after|page-break-before|page-break-inside|page-policy|page|pause-after|pause-before|pause|perspective-origin|perspective|phonemes|pitch-range|pitch|play-during|position|presentation-level|punctuation-trim|quotes|rendering-intent|resize|rest-after|rest-before|rest|richness|right|rotation-point|rotation|ruby-align|ruby-overhang|ruby-position|ruby-span|size|speak-header|speak-numeral|speak-punctuation|speak|speech-rate|stress|string-set|table-layout|target-name|target-new|target-position|target|text-align-last|text-align|text-decoration|text-emphasis|text-height|text-indent|text-justify|text-outline|text-shadow|text-transform|text-wrap|top|transform-origin|transform-style|transform|transition-delay|transition-duration|transition-property|transition-timing-function|transition|unicode-bidi|vertical-align|visibility|voice-balance|voice-duration|voice-family|voice-pitch-range|voice-pitch|voice-rate|voice-stress|voice-volume|volume|white-space-collapse|white-space|widows|width|word-break|word-spacing|word-wrap|z-index").split("|")
-    );
-
-    var functions = lang.arrayToMap(
-        ("rgb|rgba|url|attr|counter|counters").split("|")
-    );
-
-    var constants = lang.arrayToMap(
-        ("absolute|after-edge|after|all-scroll|all|alphabetic|always|antialiased|armenian|auto|avoid-column|avoid-page|avoid|balance|baseline|before-edge|before|below|bidi-override|block-line-height|block|bold|bolder|border-box|both|bottom|box|break-all|break-word|capitalize|caps-height|caption|center|central|char|circle|cjk-ideographic|clone|close-quote|col-resize|collapse|column|consider-shifts|contain|content-box|cover|crosshair|cubic-bezier|dashed|decimal-leading-zero|decimal|default|disabled|disc|disregard-shifts|distribute-all-lines|distribute-letter|distribute-space|distribute|dotted|double|e-resize|ease-in|ease-in-out|ease-out|ease|ellipsis|end|exclude-ruby|fill|fixed|font-size|font|georgian|glyphs|grid-height|groove|hand|hanging|hebrew|help|hidden|hiragana-iroha|hiragana|horizontal|icon|ideograph-alpha|ideograph-numeric|ideograph-parenthesis|ideograph-space|ideographic|inactive|include-ruby|inherit|initial|inline-block|inline-box|inline-line-height|inline-table|inline|inset|inside|inter-ideograph|inter-word|invert|italic|justify|katakana-iroha|katakana|keep-all|last|left|lighter|line-edge|line-through|line|linear|list-item|local|loose|lower-alpha|lower-greek|lower-latin|lower-roman|lowercase|lr-tb|ltr|mathematical|max-height|max-size|medium|menu|message-box|middle|move|n-resize|ne-resize|newspaper|no-change|no-close-quote|no-drop|no-open-quote|no-repeat|none|normal|not-allowed|nowrap|nw-resize|oblique|open-quote|outset|outside|overline|padding-box|page|pointer|pre-line|pre-wrap|pre|preserve-3d|progress|relative|repeat-x|repeat-y|repeat|replaced|reset-size|ridge|right|round|row-resize|rtl|s-resize|scroll|se-resize|separate|slice|small-caps|small-caption|solid|space|square|start|static|status-bar|step-end|step-start|steps|stretch|strict|sub|super|sw-resize|table-caption|table-cell|table-column-group|table-column|table-footer-group|table-header-group|table-row-group|table-row|table|tb-rl|text-after-edge|text-before-edge|text-bottom|text-size|text-top|text|thick|thin|top|transparent|underline|upper-alpha|upper-latin|upper-roman|uppercase|use-script|vertical-ideographic|vertical-text|visible|w-resize|wait|whitespace|z-index|zero").split("|")
-    );
-
-    var colors = lang.arrayToMap(
-        ("aqua|black|blue|fuchsia|gray|green|lime|maroon|navy|olive|orange|" +
-        "purple|red|silver|teal|white|yellow").split("|")
-    );
-
-    var fonts = lang.arrayToMap(
-        ("arial|century|comic|courier|garamond|georgia|helvetica|impact|lucida|" +
-        "symbol|system|tahoma|times|trebuchet|utopia|verdana|webdings|sans-serif|" +
-        "serif|monospace").split("|")
-    );
-    
-    // regexp must not have capturing parentheses. Use (?:) instead.
-    // regexps are ordered -> the first match is used
-
-    var numRe = "\\-?(?:(?:[0-9]+)|(?:[0-9]*\\.[0-9]+))";
-    var pseudoElements = "(\\:+)\\b(after|before|first-letter|first-line|moz-selection|selection)\\b";
-    var pseudoClasses = "(:)\\b(active|checked|disabled|empty|enabled|first-child|first-of-type|focus|hover|indeterminate|invalid|last-child|last-of-type|link|not|nth-child|nth-last-child|nth-last-of-type|nth-of-type|only-child|only-of-type|required|root|target|valid|visited)\\b";
-    
-    var base_ruleset = [
-        {
-            token : "comment", // multi line comment
-            merge : true,
-            regex : "\\/\\*",
-            next : "ruleset_comment"
-        }, {
-            token : "string", // single line
-            regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
-        }, {
-            token : "string", // single line
-            regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"
-        }, {
-            token : ["constant.numeric", "keyword"],
-            regex : "(" + numRe + ")(ch|cm|deg|em|ex|fr|gd|grad|Hz|in|kHz|mm|ms|pc|pt|px|rad|rem|s|turn|vh|vm|vw|%)"
-        }, {
-            token : ["constant.numeric"],
-            regex : "([0-9]+)"
-        }, {
-            token : "constant.numeric",  // hex6 color
-            regex : "#[a-f0-9]{6}"
-        }, {
-            token : "constant.numeric", // hex3 color
-            regex : "#[a-f0-9]{3}"
-        }, {
-            token : ["punctuation", "entity.other.attribute-name.pseudo-element.css"], 
-            regex : pseudoElements
-        }, {
-            token : ["punctuation", "entity.other.attribute-name.pseudo-class.css"], 
-            regex : pseudoClasses
-        }, {
-            token : function(value) {
-                if (properties.hasOwnProperty(value.toLowerCase())) {
-                    return "support.type";
-                }
-                else if (functions.hasOwnProperty(value.toLowerCase())) {
-                    return "support.function";
-                }
-                else if (constants.hasOwnProperty(value.toLowerCase())) {
-                    return "support.constant";
-                }
-                else if (colors.hasOwnProperty(value.toLowerCase())) {
-                    return "support.constant.color";
-                }
-                else if (fonts.hasOwnProperty(value.toLowerCase())) {
-                    return "support.constant.fonts";
-                }
-                else {
-                    return "text";
-                }
-            },
-            regex : "\\-?[a-zA-Z_][a-zA-Z0-9_\\-]*"
-        } 
-      ];
-
-    var ruleset = lang.copyArray(base_ruleset);
-    ruleset.unshift({
-        token : "paren.rparen",
-        regex : "\\}",
-        next:   "start"
-    });
-
-    var media_ruleset = lang.copyArray( base_ruleset );
-    media_ruleset.unshift({
-        token : "paren.rparen",
-        regex : "\\}",
-        next:   "media"
-    });
-
-    var base_comment = [{
-          token : "comment", // comment spanning whole line
-          merge : true,
-          regex : ".+"
-    }];
-
-    var comment = lang.copyArray(base_comment);
-    comment.unshift({
-          token : "comment", // closing comment
-          regex : ".*?\\*\\/",
-          next : "start"
-    });
-
-    var media_comment = lang.copyArray(base_comment);
-    media_comment.unshift({
-          token : "comment", // closing comment
-          regex : ".*?\\*\\/",
-          next : "media"
-    });
-
-    var ruleset_comment = lang.copyArray(base_comment);
-    ruleset_comment.unshift({
-          token : "comment", // closing comment
-          regex : ".*?\\*\\/",
-          next : "ruleset"
-    });
-
-    this.$rules = {
-        "start" : [{
-            token : "comment", // multi line comment
-            merge : true,
-            regex : "\\/\\*",
-            next : "comment"
-        }, {
-            token: "paren.lparen",
-            regex: "\\{",
-            next:  "ruleset"
-        }, {
-            token: "string",
-            regex: "@.*?{",
-            next:  "media"
-        },{
-            token: "keyword",
-            regex: "#[a-z0-9-_]+"
-        },{
-            token: "variable",
-            regex: "\\.[a-z0-9-_]+"
-        },{
-            token: "string",
-            regex: ":[a-z0-9-_]+"
-        },{
-            token: "constant",
-            regex: "[a-z0-9-_]+"
-        }],
-
-        "media" : [ {
-            token : "comment", // multi line comment
-            merge : true,
-            regex : "\\/\\*",
-            next : "media_comment"
-        }, {
-            token: "paren.lparen",
-            regex: "\\{",
-            next:  "media_ruleset"
-        },{
-            token: "string",
-            regex: "\\}",
-            next:  "start"
-        },{
-            token: "keyword",
-            regex: "#[a-z0-9-_]+"
-        },{
-            token: "variable",
-            regex: "\\.[a-z0-9-_]+"
-        },{
-            token: "string",
-            regex: ":[a-z0-9-_]+"
-        },{
-            token: "constant",
-            regex: "[a-z0-9-_]+"
-        }],
-
-        "comment" : comment,
-
-        "ruleset" : ruleset,
-        "ruleset_comment" : ruleset_comment,
-
-        "media_ruleset" : media_ruleset,
-        "media_comment" : media_comment
-    };
-};
-
-oop.inherits(CssHighlightRules, TextHighlightRules);
-
-exports.CssHighlightRules = CssHighlightRules;
-
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/html_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/css_highlight_rules', 'ace/mode/javascript_highlight_rules', 'ace/mode/xml_util', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var CssHighlightRules = require("./css_highlight_rules").CssHighlightRules;
-var JavaScriptHighlightRules = require("./javascript_highlight_rules").JavaScriptHighlightRules;
-var xmlUtil = require("./xml_util");
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var HtmlHighlightRules = function() {
-
-    // regexp must not have capturing parentheses
-    // regexps are ordered -> the first match is used
-    this.$rules = {
-        start : [{
-            token : "text",
-            merge : true,
-            regex : "<\\!\\[CDATA\\[",
-            next : "cdata"
-        }, {
-            token : "xml_pe",
-            regex : "<\\?.*?\\?>"
-        }, {
-            token : "comment",
-            merge : true,
-            regex : "<\\!--",
-            next : "comment"
-        }, {
-            token : "xml_pe",
-            regex : "<\\!.*?>"
-        }, {
-            token : "meta.tag",
-            regex : "<(?=\s*script\\b)",
-            next : "script"
-        }, {
-            token : "meta.tag",
-            regex : "<(?=\s*style\\b)",
-            next : "style"
-        }, {
-            token : "meta.tag", // opening tag
-            regex : "<\\/?",
-            next : "tag"
-        }, {
-            token : "text",
-            regex : "\\s+"
-        }, {
-            token : "constant.character.entity",
-            regex : "(?:&#[0-9]+;)|(?:&#x[0-9a-fA-F]+;)|(?:&[a-zA-Z0-9_:\\.-]+;)"
-        }, {
-            token : "text",
-            regex : "[^<]+"
-        } ],
-    
-        cdata : [ {
-            token : "text",
-            regex : "\\]\\]>",
-            next : "start"
-        }, {
-            token : "text",
-            merge : true,
-            regex : "\\s+"
-        }, {
-            token : "text",
-            merge : true,
-            regex : ".+"
-        } ],
-
-        comment : [ {
-            token : "comment",
-            regex : ".*?-->",
-            next : "start"
-        }, {
-            token : "comment",
-            merge : true,
-            regex : ".+"
-        } ]
-    };
-    
-    xmlUtil.tag(this.$rules, "tag", "start");
-    xmlUtil.tag(this.$rules, "style", "css-start");
-    xmlUtil.tag(this.$rules, "script", "js-start");
-    
-    this.embedRules(JavaScriptHighlightRules, "js-", [{
-        token: "comment",
-        regex: "\\/\\/.*(?=<\\/script>)",
-        next: "tag"
-    }, {
-        token: "meta.tag",
-        regex: "<\\/(?=script)",
-        next: "tag"
-    }]);
-    
-    this.embedRules(CssHighlightRules, "css-", [{
-        token: "meta.tag",
-        regex: "<\\/(?=style)",
-        next: "tag"
-    }]);
-};
-
-oop.inherits(HtmlHighlightRules, TextHighlightRules);
-
-exports.HtmlHighlightRules = HtmlHighlightRules;
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/xml_util', ['require', 'exports', 'module' , 'ace/lib/lang'], function(require, exports, module) {
-"use strict";
-
-var lang = require("../lib/lang");
-
-var formTags = lang.arrayToMap(
-    ("button|form|input|label|select|textarea").split("|")
-);
-
-var tableTags = lang.arrayToMap(
-    ("table|tbody|td|tfoot|th|tr").split("|")
-);
-
-function string(state) {
-    return [{
-        token : "string",
-        regex : '".*?"'
-    }, {
-        token : "string", // multi line string start
-        merge : true,
-        regex : '["].*',
-        next : state + "_qqstring"
-    }, {
-        token : "string",
-        regex : "'.*?'"
-    }, {
-        token : "string", // multi line string start
-        merge : true,
-        regex : "['].*",
-        next : state + "_qstring"
-    }];
-}
-
-function multiLineString(quote, state) {
-    return [{
-        token : "string",
-        merge : true,
-        regex : ".*?" + quote,
-        next : state
-    }, {
-        token : "string",
-        merge : true,
-        regex : '.+'
-    }];
-}
-
-exports.tag = function(states, name, nextState) {
-    states[name] = [{
-        token : "text",
-        regex : "\\s+"
-    }, {
-        //token : "meta.tag",
-        
-    token : function(value) {
-            if ( value==='a' ) {
-                return "meta.tag.anchor";
-            }
-            else if ( value==='img' ) {
-                return "meta.tag.image";
-            }
-            else if ( value==='script' ) {
-                return "meta.tag.script";
-            }
-            else if ( value==='style' ) {
-                return "meta.tag.style";
-            }
-            else if (formTags.hasOwnProperty(value.toLowerCase())) {
-                return "meta.tag.form";
-            }
-            else if (tableTags.hasOwnProperty(value.toLowerCase())) {
-                return "meta.tag.table";
-            }
-            else {
-                return "meta.tag";
-            }
-        },        
-        merge : true,
-        regex : "[-_a-zA-Z0-9:]+",
-        next : name + "_embed_attribute_list" 
-    }, {
-        token: "empty",
-        regex: "",
-        next : name + "_embed_attribute_list"
-    }];
-
-    states[name + "_qstring"] = multiLineString("'", name + "_embed_attribute_list");
-    states[name + "_qqstring"] = multiLineString("\"", name + "_embed_attribute_list");
-    
-    states[name + "_embed_attribute_list"] = [{
-        token : "meta.tag",
-        merge : true,
-        regex : "\/?>",
-        next : nextState
-    }, {
-        token : "keyword.operator",
-        regex : "="
-    }, {
-        token : "entity.other.attribute-name",
-        regex : "[-_a-zA-Z0-9:]+"
-    }, {
-        token : "constant.numeric", // float
-        regex : "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"
-    }, {
-        token : "text",
-        regex : "\\s+"
-    }].concat(string(name));
-};
-
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Chris Spencer <chris.ag.spencer AT googlemail DOT com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/behaviour/xml', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/behaviour', 'ace/mode/behaviour/cstyle'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var Behaviour = require("../behaviour").Behaviour;
-var CstyleBehaviour = require("./cstyle").CstyleBehaviour;
-
-var XmlBehaviour = function () {
-    
-    this.inherit(CstyleBehaviour, ["string_dquotes"]); // Get string behaviour
-    
-    this.add("brackets", "insertion", function (state, action, editor, session, text) {
-        if (text == '<') {
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return false;
-            } else {
-                return {
-                    text: '<>',
-                    selection: [1, 1]
-                }
-            }
-        } else if (text == '>') {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == '>') { // need some kind of matching check here
-                return {
-                    text: '',
-                    selection: [1, 1]
-                }
-            }
-        } else if (text == "\n") {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChars = line.substring(cursor.column, cursor.column + 2);
-            if (rightChars == '</') {
-                var indent = this.$getIndent(session.doc.getLine(cursor.row)) + session.getTabString();
-                var next_indent = this.$getIndent(session.doc.getLine(cursor.row));
-
-                return {
-                    text: '\n' + indent + '\n' + next_indent,
-                    selection: [1, indent.length, 1, indent.length]
-                }
-            }
-        }
-    });
-    
-}
-oop.inherits(XmlBehaviour, Behaviour);
-
-exports.XmlBehaviour = XmlBehaviour;
-});/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/folding/html', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/folding/mixed', 'ace/mode/folding/xml', 'ace/mode/folding/cstyle'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var MixedFoldMode = require("./mixed").FoldMode;
-var XmlFoldMode = require("./xml").FoldMode;
-var CStyleFoldMode = require("./cstyle").FoldMode;
-
-var FoldMode = exports.FoldMode = function() {
-    MixedFoldMode.call(this, new XmlFoldMode({
-        // void elements
-        "area": 1,
-        "base": 1,
-        "br": 1,
-        "col": 1,
-        "command": 1,
-        "embed": 1,
-        "hr": 1,
-        "img": 1,
-        "input": 1,
-        "keygen": 1,
-        "link": 1,
-        "meta": 1,
-        "param": 1,
-        "source": 1,
-        "track": 1,
-        "wbr": 1,
-        
-        // optional tags 
-        "li": 1,
-        "dt": 1,
-        "dd": 1,
-        "p": 1,
-        "rt": 1,
-        "rp": 1,
-        "optgroup": 1,
-        "option": 1,
-        "colgroup": 1,
-        "td": 1,
-        "th": 1
-    }), {
-        "js-": new CStyleFoldMode(),
-        "css-": new CStyleFoldMode()
-    });
-};
-
-oop.inherits(FoldMode, MixedFoldMode);
-
-});/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/folding/mixed', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/folding/fold_mode'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var BaseFoldMode = require("./fold_mode").FoldMode;
-
-var FoldMode = exports.FoldMode = function(defaultMode, subModes) {
-    this.defaultMode = defaultMode;
-    this.subModes = subModes;
-};
-oop.inherits(FoldMode, BaseFoldMode);
-
-(function() {
-
-
-    this.$getMode = function(state) {
-        for (var key in this.subModes) {
-            if (state.indexOf(key) === 0)
-                return this.subModes[key];
-        }
-        return null;
-    };
-    
-    this.$tryMode = function(state, session, foldStyle, row) {
-        var mode = this.$getMode(state);
-        return (mode ? mode.getFoldWidget(session, foldStyle, row) : "");
-    };
-
-    this.getFoldWidget = function(session, foldStyle, row) {
-        return (
-            this.$tryMode(session.getState(row-1), session, foldStyle, row) ||
-            this.$tryMode(session.getState(row), session, foldStyle, row) ||
-            this.defaultMode.getFoldWidget(session, foldStyle, row)
-        );
-    };
-
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        var mode = this.$getMode(session.getState(row-1));
-        
-        if (!mode || !mode.getFoldWidget(session, foldStyle, row))
-            mode = this.$getMode(session.getState(row));
-        
-        if (!mode || !mode.getFoldWidget(session, foldStyle, row))
-            mode = this.defaultMode;
-        
-        return mode.getFoldWidgetRange(session, foldStyle, row);
-    };
-
-}).call(FoldMode.prototype);
-
-});/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/folding/xml', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/range', 'ace/mode/folding/fold_mode', 'ace/token_iterator'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var lang = require("../../lib/lang");
-var Range = require("../../range").Range;
-var BaseFoldMode = require("./fold_mode").FoldMode;
-var TokenIterator = require("../../token_iterator").TokenIterator;
-
-var FoldMode = exports.FoldMode = function(voidElements) {
-    BaseFoldMode.call(this);
-    this.voidElements = voidElements || {};
-};
-oop.inherits(FoldMode, BaseFoldMode);
-
-(function() {
-
-    this.getFoldWidget = function(session, foldStyle, row) {
-        var tag = this._getFirstTagInLine(session, row);
-
-        if (tag.closing)
-            return foldStyle == "markbeginend" ? "end" : "";
-
-        if (!tag.tagName || this.voidElements[tag.tagName.toLowerCase()])
-            return "";
-
-        if (tag.selfClosing)
-            return "";
-
-        if (tag.value.indexOf("/" + tag.tagName) !== -1)
-            return "";
-
-        return "start";
-    };
-    
-    this._getFirstTagInLine = function(session, row) {
-        var tokens = session.getTokens(row, row)[0].tokens;
-        var value = "";
-        for (var i = 0; i < tokens.length; i++) {
-            var token = tokens[i];
-            if (token.type.indexOf("meta.tag") === 0)
-                value += token.value;
-            else
-                value += lang.stringRepeat(" ", token.value.length);
-        }
-        
-        return this._parseTag(value);
-    };
-
-    this.tagRe = /^(\s*)(<?(\/?)([-_a-zA-Z0-9:!]*)\s*(\/?)>?)/;
-    this._parseTag = function(tag) {
-        
-        var match = this.tagRe.exec(tag);
-        var column = this.tagRe.lastIndex || 0;
-        this.tagRe.lastIndex = 0;
-
-        return {
-            value: tag,
-            match: match ? match[2] : "",
-            closing: match ? !!match[3] : false,
-            selfClosing: match ? !!match[5] || match[2] == "/>" : false,
-            tagName: match ? match[4] : "",
-            column: match[1] ? column + match[1].length : column
-        };
-    };
-    
-    /**
-     * reads a full tag and places the iterator after the tag
-     */
-    this._readTagForward = function(iterator) {
-        var token = iterator.getCurrentToken();
-        if (!token)
-            return null;
-            
-        var value = "";
-        var start;
-        
-        do {
-            if (token.type.indexOf("meta.tag") === 0) {
-                if (!start) {
-                    var start = {
-                        row: iterator.getCurrentTokenRow(),
-                        column: iterator.getCurrentTokenColumn()
-                    };
-                }
-                value += token.value;
-                if (value.indexOf(">") !== -1) {
-                    var tag = this._parseTag(value);
-                    tag.start = start;
-                    tag.end = {
-                        row: iterator.getCurrentTokenRow(),
-                        column: iterator.getCurrentTokenColumn() + token.value.length
-                    };
-                    iterator.stepForward();
-                    return tag;
-                }
-            }
-        } while(token = iterator.stepForward());
-        
-        return null;
-    };
-    
-    this._readTagBackward = function(iterator) {
-        var token = iterator.getCurrentToken();
-        if (!token)
-            return null;
-            
-        var value = "";
-        var end;
-
-        do {
-            if (token.type.indexOf("meta.tag") === 0) {
-                if (!end) {
-                    end = {
-                        row: iterator.getCurrentTokenRow(),
-                        column: iterator.getCurrentTokenColumn() + token.value.length
-                    };
-                }
-                value = token.value + value;
-                if (value.indexOf("<") !== -1) {
-                    var tag = this._parseTag(value);
-                    tag.end = end;
-                    tag.start = {
-                        row: iterator.getCurrentTokenRow(),
-                        column: iterator.getCurrentTokenColumn()
-                    };
-                    iterator.stepBackward();
-                    return tag;
-                }
-            }
-        } while(token = iterator.stepBackward());
-        
-        return null;
-    };
-    
-    this._pop = function(stack, tag) {
-        while (stack.length) {
-            
-            var top = stack[stack.length-1];
-            if (!tag || top.tagName == tag.tagName) {
-                return stack.pop();
-            }
-            else if (this.voidElements[tag.tagName]) {
-                return;
-            }
-            else if (this.voidElements[top.tagName]) {
-                stack.pop();
-                continue;
-            } else {
-                return null;
-            }
-        }
-    };
-    
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        var firstTag = this._getFirstTagInLine(session, row);
-        
-        if (!firstTag.match)
-            return null;
-        
-        var isBackward = firstTag.closing || firstTag.selfClosing;
-        var stack = [];
-        var tag;
-        
-        if (!isBackward) {
-            var iterator = new TokenIterator(session, row, firstTag.column);
-            var start = {
-                row: row,
-                column: firstTag.column + firstTag.tagName.length + 2
-            };
-            while (tag = this._readTagForward(iterator)) {
-                if (tag.selfClosing) {
-                    if (!stack.length) {
-                        tag.start.column += tag.tagName.length + 2;
-                        tag.end.column -= 2;
-                        return Range.fromPoints(tag.start, tag.end);
-                    } else
-                        continue;
-                }
-                
-                if (tag.closing) {
-                    this._pop(stack, tag);
-                    if (stack.length == 0)
-                        return Range.fromPoints(start, tag.start);
-                }
-                else {
-                    stack.push(tag)
-                }
-            }
-        }
-        else {
-            var iterator = new TokenIterator(session, row, firstTag.column + firstTag.match.length);
-            var end = {
-                row: row,
-                column: firstTag.column
-            };
-            
-            while (tag = this._readTagBackward(iterator)) {
-                if (tag.selfClosing) {
-                    if (!stack.length) {
-                        tag.start.column += tag.tagName.length + 2;
-                        tag.end.column -= 2;
-                        return Range.fromPoints(tag.start, tag.end);
-                    } else
-                        continue;
-                }
-                
-                if (!tag.closing) {
-                    this._pop(stack, tag);
-                    if (stack.length == 0) {
-                        tag.start.column += tag.tagName.length + 2;
-                        return Range.fromPoints(tag.start, end);
-                    }
-                }
-                else {
-                    stack.push(tag)
-                }
-            }
-        }
-        
-    };
-
-}).call(FoldMode.prototype);
-
-});
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-html.js b/apps/files_texteditor/js/aceeditor/mode-html.js
deleted file mode 100644
index 78701813b2..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-html.js
+++ /dev/null
@@ -1 +0,0 @@
-define("ace/mode/html",["require","exports","module","ace/lib/oop","ace/mode/text","ace/mode/javascript","ace/mode/css","ace/tokenizer","ace/mode/html_highlight_rules","ace/mode/behaviour/xml","ace/mode/folding/html"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("./javascript").Mode,g=a("./css").Mode,h=a("../tokenizer").Tokenizer,i=a("./html_highlight_rules").HtmlHighlightRules,j=a("./behaviour/xml").XmlBehaviour,k=a("./folding/html").FoldMode,l=function(){var a=new i;this.$tokenizer=new h(a.getRules()),this.$behaviour=new j,this.$embeds=a.getEmbeds(),this.createModeDelegates({"js-":f,"css-":g}),this.foldingRules=new k};d.inherits(l,e),function(){this.toggleCommentLines=function(a,b,c,d){return 0},this.getNextLineIndent=function(a,b,c){return this.$getIndent(b)},this.checkOutdent=function(a,b,c){return!1}}.call(l.prototype),b.Mode=l}),define("ace/mode/javascript",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/javascript_highlight_rules","ace/mode/matching_brace_outdent","ace/range","ace/worker/worker_client","ace/mode/behaviour/cstyle","ace/mode/folding/cstyle"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./javascript_highlight_rules").JavaScriptHighlightRules,h=a("./matching_brace_outdent").MatchingBraceOutdent,i=a("../range").Range,j=a("../worker/worker_client").WorkerClient,k=a("./behaviour/cstyle").CstyleBehaviour,l=a("./folding/cstyle").FoldMode,m=function(){this.$tokenizer=new f((new g).getRules()),this.$outdent=new h,this.$behaviour=new k,this.foldingRules=new l};d.inherits(m,e),function(){this.toggleCommentLines=function(a,b,c,d){var e=!0,f=/^(\s*)\/\//;for(var g=c;g<=d;g++)if(!f.test(b.getLine(g))){e=!1;break}if(e){var h=new i(0,0,0,0);for(var g=c;g<=d;g++){var j=b.getLine(g),k=j.match(f);h.start.row=g,h.end.row=g,h.end.column=k[0].length,b.replace(h,k[1])}}else b.indentRows(c,d,"//")},this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a),f=e.tokens,g=e.state;if(f.length&&f[f.length-1].type=="comment")return d;if(a=="start"||a=="regex_allowed"){var h=b.match(/^.*(?:\bcase\b.*\:|[\{\(\[])\s*$/);h&&(d+=c)}else if(a=="doc-start"){if(g=="start"||a=="regex_allowed")return"";var h=b.match(/^\s*(\/?)\*/);h&&(h[1]&&(d+=" "),d+="* ")}return d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)},this.createWorker=function(a){var b=new j(["ace"],"worker-javascript.js","ace/mode/javascript_worker","JavaScriptWorker");return b.attachToDocument(a.getDocument()),b.on("jslint",function(b){var c=[];for(var d=0;d<b.data.length;d++){var e=b.data[d];e&&c.push({row:e.line-1,column:e.character-1,text:e.reason,type:"warning",lint:e})}a.setAnnotations(c)}),b.on("narcissus",function(b){a.setAnnotations([b.data])}),b.on("terminate",function(){a.clearAnnotations()}),b}}.call(m.prototype),b.Mode=m}),define("ace/mode/javascript_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/unicode","ace/mode/doc_comment_highlight_rules","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("../unicode"),g=a("./doc_comment_highlight_rules").DocCommentHighlightRules,h=a("./text_highlight_rules").TextHighlightRules,i=function(){var a=e.arrayToMap("Array|Boolean|Date|Function|Iterator|Number|Object|RegExp|String|Proxy|Namespace|QName|XML|XMLList|ArrayBuffer|Float32Array|Float64Array|Int16Array|Int32Array|Int8Array|Uint16Array|Uint32Array|Uint8Array|Uint8ClampedArray|Error|EvalError|InternalError|RangeError|ReferenceError|StopIteration|SyntaxError|TypeError|URIError|decodeURI|decodeURIComponent|encodeURI|encodeURIComponent|eval|isFinite|isNaN|parseFloat|parseInt|JSON|Math|this|arguments|prototype|window|document".split("|")),b=e.arrayToMap("break|case|catch|continue|default|delete|do|else|finally|for|function|if|in|instanceof|new|return|switch|throw|try|typeof|let|var|while|with|const|yield|import|get|set".split("|")),c="case|do|else|finally|in|instanceof|return|throw|try|typeof|yield",d=e.arrayToMap("__parent__|__count__|escape|unescape|with|__proto__".split("|")),h=e.arrayToMap("const|let|var|function".split("|")),i=e.arrayToMap("null|Infinity|NaN|undefined".split("|")),j=e.arrayToMap("class|enum|extends|super|export|implements|private|public|interface|package|protected|static".split("|")),k="["+f.packages.L+"\\$_]["+f.packages.L+f.packages.Mn+f.packages.Mc+f.packages.Nd+f.packages.Pc+"\\$_]*\\b",l="\\\\(?:x[0-9a-fA-F]{2}|u[0-9a-fA-F]{4}|[0-2][0-7]{0,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.)";this.$rules={start:[{token:"comment",regex:/\/\/.*$/},(new g).getStartRule("doc-start"),{token:"comment",merge:!0,regex:/\/\*/,next:"comment"},{token:"string",regex:"'",next:"qstring"},{token:"string",regex:'"',next:"qqstring"},{token:"constant.numeric",regex:/0[xX][0-9a-fA-F]+\b/},{token:"constant.numeric",regex:/[+-]?\d+(?:(?:\.\d*)?(?:[eE][+-]?\d+)?)?\b/},{token:["storage.type","punctuation.operator","support.function","punctuation.operator","entity.name.function","text","keyword.operator","text","storage.type","text","paren.lparen","variable.parameter","paren.rparen"],regex:"("+k+")(\\.)(prototype)(\\.)("+k+")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"},{token:["storage.type","punctuation.operator","support.function","punctuation.operator","entity.name.function","text","keyword.operator","text"],regex:"("+k+")(\\.)(prototype)(\\.)("+k+")(\\s*)(=)(\\s*)"},{token:["storage.type","punctuation.operator","entity.name.function","text","keyword.operator","text","storage.type","text","paren.lparen","variable.parameter","paren.rparen"],regex:"("+k+")(\\.)("+k+")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"},{token:["entity.name.function","text","keyword.operator","text","storage.type","text","paren.lparen","variable.parameter","paren.rparen"],regex:"("+k+")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"},{token:["storage.type","text","entity.name.function","text","paren.lparen","variable.parameter","paren.rparen"],regex:"(function)(\\s+)("+k+")(\\s*)(\\()(.*?)(\\))"},{token:["entity.name.function","text","punctuation.operator","text","storage.type","text","paren.lparen","variable.parameter","paren.rparen"],regex:"("+k+")(\\s*)(:)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"},{token:["text","text","storage.type","text","paren.lparen","variable.parameter","paren.rparen"],regex:"(:)(\\s*)(function)?(\\s*)(\\()([^)]*)(\\))"},{token:"constant.language.boolean",regex:/(?:true|false)\b/},{token:"keyword",regex:"(?:"+c+")\\b",next:"regex_allowed"},{token:["punctuation.operator","support.function"],regex:/(\.)(s(?:h(?:ift|ow(?:Mod(?:elessDialog|alDialog)|Help))|croll(?:X|By(?:Pages|Lines)?|Y|To)?|t(?:opzzzz|rike)|i(?:n|zeToContent|debar|gnText)|ort|u(?:p|b(?:str(?:ing)?)?)|pli(?:ce|t)|e(?:nd|t(?:Re(?:sizable|questHeader)|M(?:i(?:nutes|lliseconds)|onth)|Seconds|Ho(?:tKeys|urs)|Year|Cursor|Time(?:out)?|Interval|ZOptions|Date|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Date|FullYear)|FullYear|Active)|arch)|qrt|lice|avePreferences|mall)|h(?:ome|andleEvent)|navigate|c(?:har(?:CodeAt|At)|o(?:s|n(?:cat|textual|firm)|mpile)|eil|lear(?:Timeout|Interval)?|a(?:ptureEvents|ll)|reate(?:StyleSheet|Popup|EventObject))|t(?:o(?:GMTString|S(?:tring|ource)|U(?:TCString|pperCase)|Lo(?:caleString|werCase))|est|a(?:n|int(?:Enabled)?))|i(?:s(?:NaN|Finite)|ndexOf|talics)|d(?:isableExternalCapture|ump|etachEvent)|u(?:n(?:shift|taint|escape|watch)|pdateCommands)|j(?:oin|avaEnabled)|p(?:o(?:p|w)|ush|lugins.refresh|a(?:ddings|rse(?:Int|Float)?)|r(?:int|ompt|eference))|e(?:scape|nableExternalCapture|val|lementFromPoint|x(?:p|ec(?:Script|Command)?))|valueOf|UTC|queryCommand(?:State|Indeterm|Enabled|Value)|f(?:i(?:nd|le(?:ModifiedDate|Size|CreatedDate|UpdatedDate)|xed)|o(?:nt(?:size|color)|rward)|loor|romCharCode)|watch|l(?:ink|o(?:ad|g)|astIndexOf)|a(?:sin|nchor|cos|t(?:tachEvent|ob|an(?:2)?)|pply|lert|b(?:s|ort))|r(?:ou(?:nd|teEvents)|e(?:size(?:By|To)|calc|turnValue|place|verse|l(?:oad|ease(?:Capture|Events)))|andom)|g(?:o|et(?:ResponseHeader|M(?:i(?:nutes|lliseconds)|onth)|Se(?:conds|lection)|Hours|Year|Time(?:zoneOffset)?|Da(?:y|te)|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Da(?:y|te)|FullYear)|FullYear|A(?:ttention|llResponseHeaders)))|m(?:in|ove(?:B(?:y|elow)|To(?:Absolute)?|Above)|ergeAttributes|a(?:tch|rgins|x))|b(?:toa|ig|o(?:ld|rderWidths)|link|ack))\b(?=\()/},{token:["punctuation.operator","support.function.dom"],regex:/(\.)(s(?:ub(?:stringData|mit)|plitText|e(?:t(?:NamedItem|Attribute(?:Node)?)|lect))|has(?:ChildNodes|Feature)|namedItem|c(?:l(?:ick|o(?:se|neNode))|reate(?:C(?:omment|DATASection|aption)|T(?:Head|extNode|Foot)|DocumentFragment|ProcessingInstruction|E(?:ntityReference|lement)|Attribute))|tabIndex|i(?:nsert(?:Row|Before|Cell|Data)|tem)|open|delete(?:Row|C(?:ell|aption)|T(?:Head|Foot)|Data)|focus|write(?:ln)?|a(?:dd|ppend(?:Child|Data))|re(?:set|place(?:Child|Data)|move(?:NamedItem|Child|Attribute(?:Node)?)?)|get(?:NamedItem|Element(?:sBy(?:Name|TagName)|ById)|Attribute(?:Node)?)|blur)\b(?=\()/},{token:["punctuation.operator","support.constant"],regex:/(\.)(s(?:ystemLanguage|cr(?:ipts|ollbars|een(?:X|Y|Top|Left))|t(?:yle(?:Sheets)?|atus(?:Text|bar)?)|ibling(?:Below|Above)|ource|uffixes|e(?:curity(?:Policy)?|l(?:ection|f)))|h(?:istory|ost(?:name)?|as(?:h|Focus))|y|X(?:MLDocument|SLDocument)|n(?:ext|ame(?:space(?:s|URI)|Prop))|M(?:IN_VALUE|AX_VALUE)|c(?:haracterSet|o(?:n(?:structor|trollers)|okieEnabled|lorDepth|mp(?:onents|lete))|urrent|puClass|l(?:i(?:p(?:boardData)?|entInformation)|osed|asses)|alle(?:e|r)|rypto)|t(?:o(?:olbar|p)|ext(?:Transform|Indent|Decoration|Align)|ags)|SQRT(?:1_2|2)|i(?:n(?:ner(?:Height|Width)|put)|ds|gnoreCase)|zIndex|o(?:scpu|n(?:readystatechange|Line)|uter(?:Height|Width)|p(?:sProfile|ener)|ffscreenBuffering)|NEGATIVE_INFINITY|d(?:i(?:splay|alog(?:Height|Top|Width|Left|Arguments)|rectories)|e(?:scription|fault(?:Status|Ch(?:ecked|arset)|View)))|u(?:ser(?:Profile|Language|Agent)|n(?:iqueID|defined)|pdateInterval)|_content|p(?:ixelDepth|ort|ersonalbar|kcs11|l(?:ugins|atform)|a(?:thname|dding(?:Right|Bottom|Top|Left)|rent(?:Window|Layer)?|ge(?:X(?:Offset)?|Y(?:Offset)?))|r(?:o(?:to(?:col|type)|duct(?:Sub)?|mpter)|e(?:vious|fix)))|e(?:n(?:coding|abledPlugin)|x(?:ternal|pando)|mbeds)|v(?:isibility|endor(?:Sub)?|Linkcolor)|URLUnencoded|P(?:I|OSITIVE_INFINITY)|f(?:ilename|o(?:nt(?:Size|Family|Weight)|rmName)|rame(?:s|Element)|gColor)|E|whiteSpace|l(?:i(?:stStyleType|n(?:eHeight|kColor))|o(?:ca(?:tion(?:bar)?|lName)|wsrc)|e(?:ngth|ft(?:Context)?)|a(?:st(?:M(?:odified|atch)|Index|Paren)|yer(?:s|X)|nguage))|a(?:pp(?:MinorVersion|Name|Co(?:deName|re)|Version)|vail(?:Height|Top|Width|Left)|ll|r(?:ity|guments)|Linkcolor|bove)|r(?:ight(?:Context)?|e(?:sponse(?:XML|Text)|adyState))|global|x|m(?:imeTypes|ultiline|enubar|argin(?:Right|Bottom|Top|Left))|L(?:N(?:10|2)|OG(?:10E|2E))|b(?:o(?:ttom|rder(?:Width|RightWidth|BottomWidth|Style|Color|TopWidth|LeftWidth))|ufferDepth|elow|ackground(?:Color|Image)))\b/},{token:["storage.type","punctuation.operator","support.function.firebug"],regex:/(console)(\.)(warn|info|log|error|time|timeEnd|assert)\b/},{token:function(c){return a.hasOwnProperty(c)?"variable.language":d.hasOwnProperty(c)?"invalid.deprecated":h.hasOwnProperty(c)?"storage.type":b.hasOwnProperty(c)?"keyword":i.hasOwnProperty(c)?"constant.language":j.hasOwnProperty(c)?"invalid.illegal":c=="debugger"?"invalid.deprecated":"identifier"},regex:k},{token:"keyword.operator",regex:/!|\$|%|&|\*|\-\-|\-|\+\+|\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\|\||\?\:|\*=|%=|\+=|\-=|&=|\^=|\b(?:in|instanceof|new|delete|typeof|void)/,next:"regex_allowed"},{token:"punctuation.operator",regex:/\?|\:|\,|\;|\./,next:"regex_allowed"},{token:"paren.lparen",regex:/[\[({]/,next:"regex_allowed"},{token:"paren.rparen",regex:/[\])}]/},{token:"keyword.operator",regex:/\/=?/,next:"regex_allowed"},{token:"comment",regex:/^#!.*$/},{token:"text",regex:/\s+/}],regex_allowed:[{token:"comment",merge:!0,regex:"\\/\\*",next:"comment_regex_allowed"},{token:"comment",regex:"\\/\\/.*$"},{token:"string.regexp",regex:"\\/",next:"regex",merge:!0},{token:"text",regex:"\\s+"},{token:"empty",regex:"",next:"start"}],regex:[{token:"regexp.keyword.operator",regex:"\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",next:"regex"},{token:"string.regexp",regex:"/\\w*",next:"start",merge:!0},{token:"string.regexp",regex:"[^\\\\/\\[]+",next:"regex",merge:!0},{token:"string.regexp.charachterclass",regex:"\\[",next:"regex_character_class",merge:!0},{token:"empty",regex:"",next:"start"}],regex_character_class:[{token:"regexp.keyword.operator",regex:"\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",next:"regex_character_class"},{token:"string.regexp.charachterclass",regex:"]",next:"regex",merge:!0},{token:"string.regexp.charachterclass",regex:"[^\\\\\\]]+",next:"regex_character_class",merge:!0},{token:"empty",regex:"",next:"start"}],comment_regex_allowed:[{token:"comment",regex:".*?\\*\\/",merge:!0,next:"regex_allowed"},{token:"comment",merge:!0,regex:".+"}],comment:[{token:"comment",regex:".*?\\*\\/",merge:!0,next:"start"},{token:"comment",merge:!0,regex:".+"}],qqstring:[{token:"constant.language.escape",regex:l},{token:"string",regex:'[^"\\\\]+'},{token:"string",regex:'"',next:"start"}],qstring:[{token:"constant.language.escape",regex:l},{token:"string",regex:"[^'\\\\]+"},{token:"string",regex:"'",next:"start"}]},this.embedRules(g,"doc-",[(new g).getEndRule("start")])};d.inherits(i,h),b.JavaScriptHighlightRules=i}),define("ace/mode/doc_comment_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text_highlight_rules").TextHighlightRules,f=function(){this.$rules={start:[{token:"comment.doc.tag",regex:"@[\\w\\d_]+"},{token:"comment.doc",merge:!0,regex:"\\s+"},{token:"comment.doc",merge:!0,regex:"TODO"},{token:"comment.doc",merge:!0,regex:"[^@\\*]+"},{token:"comment.doc",merge:!0,regex:"."}]}};d.inherits(f,e),function(){this.getStartRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\/\\*(?=\\*)",next:a}},this.getEndRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\*\\/",next:a}}}.call(f.prototype),b.DocCommentHighlightRules=f}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../range").Range,e=function(){};(function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}}).call(e.prototype),b.MatchingBraceOutdent=e}),define("ace/mode/behaviour/cstyle",["require","exports","module","ace/lib/oop","ace/mode/behaviour"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../behaviour").Behaviour,f=function(){this.add("braces","insertion",function(a,b,c,d,e){if(e=="{"){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"{"+g+"}",selection:!1}:{text:"{}",selection:[1,1]}}if(e=="}"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var k=d.$findOpeningBracket("}",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}else if(e=="\n"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var l=d.findMatchingBracket({row:h.row,column:h.column+1});if(!l)return null;var m=this.getNextLineIndent(a,i.substring(0,i.length-1),d.getTabString()),n=this.$getIndent(d.doc.getLine(l.row));return{text:"\n"+m+"\n"+n,selection:[1,m.length,1,m.length]}}}}),this.add("braces","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="{"){var g=d.doc.getLine(e.start.row),h=g.substring(e.end.column,e.end.column+1);if(h=="}")return e.end.column++,e}}),this.add("parens","insertion",function(a,b,c,d,e){if(e=="("){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"("+g+")",selection:!1}:{text:"()",selection:[1,1]}}if(e==")"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j==")"){var k=d.$findOpeningBracket(")",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}}),this.add("parens","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="("){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h==")")return e.end.column++,e}}),this.add("string_dquotes","insertion",function(a,b,c,d,e){if(e=='"'||e=="'"){var f=e,g=c.getSelectionRange(),h=d.doc.getTextRange(g);if(h!=="")return{text:f+h+f,selection:!1};var i=c.getCursorPosition(),j=d.doc.getLine(i.row),k=j.substring(i.column-1,i.column);if(k=="\\")return null;var l=d.getTokens(g.start.row,g.start.row)[0].tokens,m=0,n,o=-1;for(var p=0;p<l.length;p++){n=l[p],n.type=="string"?o=-1:o<0&&(o=n.value.indexOf(f));if(n.value.length+m>g.start.column)break;m+=l[p].value.length}if(!n||o<0&&n.type!=="comment"&&(n.type!=="string"||g.start.column!==n.value.length+m-1&&n.value.lastIndexOf(f)===n.value.length-1))return{text:f+f,selection:[1,1]};if(n&&n.type==="string"){var q=j.substring(i.column,i.column+1);if(q==f)return{text:"",selection:[1,1]}}}}),this.add("string_dquotes","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&(f=='"'||f=="'")){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h=='"')return e.end.column++,e}})};d.inherits(f,e),b.CstyleBehaviour=f}),define("ace/mode/folding/cstyle",["require","exports","module","ace/lib/oop","ace/range","ace/mode/folding/fold_mode"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../../range").Range,f=a("./fold_mode").FoldMode,g=b.FoldMode=function(){};d.inherits(g,f),function(){this.foldingStartMarker=/(\{|\[)[^\}\]]*$|^\s*(\/\*)/,this.foldingStopMarker=/^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/,this.getFoldWidgetRange=function(a,b,c){var d=a.getLine(c),f=d.match(this.foldingStartMarker);if(f){var g=f.index;if(f[1])return this.openingBracketBlock(a,f[1],c,g);var h=a.getCommentFoldRange(c,g+f[0].length);return h.end.column-=2,h}if(b!=="markbeginend")return;var f=d.match(this.foldingStopMarker);if(f){var g=f.index+f[0].length;if(f[2]){var h=a.getCommentFoldRange(c,g);return h.end.column-=2,h}var i={row:c,column:g},j=a.$findOpeningBracket(f[1],i);if(!j)return;return j.column++,i.column--,e.fromPoints(j,i)}}}.call(g.prototype)}),define("ace/mode/folding/fold_mode",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../../range").Range,e=b.FoldMode=function(){};(function(){this.foldingStartMarker=null,this.foldingStopMarker=null,this.getFoldWidget=function(a,b,c){var d=a.getLine(c);return this.foldingStartMarker.test(d)?"start":b=="markbeginend"&&this.foldingStopMarker&&this.foldingStopMarker.test(d)?"end":""},this.getFoldWidgetRange=function(a,b,c){return null},this.indentationBlock=function(a,b,c){var e=/^\s*/,f=b,g=b,h=a.getLine(b),i=c||h.length,j=h.match(e)[0].length,k=a.getLength();while(++b<k){h=a.getLine(b);var l=h.match(e)[0].length;if(l==h.length)continue;if(l<=j)break;g=b}if(g>f){var m=a.getLine(g).length;return new d(f,i,g,m)}},this.openingBracketBlock=function(a,b,c,e){var f={row:c,column:e+1},g=a.$findClosingBracket(b,f);if(!g)return;var h=a.foldWidgets[g.row];return h==null&&(h=this.getFoldWidget(a,g.row)),h=="start"&&(g.row--,g.column=a.getLine(g.row).length),d.fromPoints(f,g)}}).call(e.prototype)}),define("ace/mode/css",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/css_highlight_rules","ace/mode/matching_brace_outdent","ace/worker/worker_client","ace/mode/folding/cstyle"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./css_highlight_rules").CssHighlightRules,h=a("./matching_brace_outdent").MatchingBraceOutdent,i=a("../worker/worker_client").WorkerClient,j=a("./folding/cstyle").FoldMode,k=function(){this.$tokenizer=new f((new g).getRules(),"i"),this.$outdent=new h,this.foldingRules=new j};d.inherits(k,e),function(){this.foldingRules="cStyle",this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a).tokens;if(e.length&&e[e.length-1].type=="comment")return d;var f=b.match(/^.*\{\s*$/);return f&&(d+=c),d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)},this.createWorker=function(a){var b=new i(["ace"],"worker-css.js","ace/mode/css_worker","Worker");return b.attachToDocument(a.getDocument()),b.on("csslint",function(b){var c=[];b.data.forEach(function(a){c.push({row:a.line-1,column:a.col-1,text:a.message,type:a.type,lint:a})}),a.setAnnotations(c)}),b}}.call(k.prototype),b.Mode=k}),define("ace/mode/css_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("./text_highlight_rules").TextHighlightRules,g=function(){var a=e.arrayToMap("animation-fill-mode|alignment-adjust|alignment-baseline|animation-delay|animation-direction|animation-duration|animation-iteration-count|animation-name|animation-play-state|animation-timing-function|animation|appearance|azimuth|backface-visibility|background-attachment|background-break|background-clip|background-color|background-image|background-origin|background-position|background-repeat|background-size|background|baseline-shift|binding|bleed|bookmark-label|bookmark-level|bookmark-state|bookmark-target|border-bottom|border-bottom-color|border-bottom-left-radius|border-bottom-right-radius|border-bottom-style|border-bottom-width|border-collapse|border-color|border-image|border-image-outset|border-image-repeat|border-image-slice|border-image-source|border-image-width|border-left|border-left-color|border-left-style|border-left-width|border-radius|border-right|border-right-color|border-right-style|border-right-width|border-spacing|border-style|border-top|border-top-color|border-top-left-radius|border-top-right-radius|border-top-style|border-top-width|border-width|border|bottom|box-align|box-decoration-break|box-direction|box-flex-group|box-flex|box-lines|box-ordinal-group|box-orient|box-pack|box-shadow|box-sizing|break-after|break-before|break-inside|caption-side|clear|clip|color-profile|color|column-count|column-fill|column-gap|column-rule|column-rule-color|column-rule-style|column-rule-width|column-span|column-width|columns|content|counter-increment|counter-reset|crop|cue-after|cue-before|cue|cursor|direction|display|dominant-baseline|drop-initial-after-adjust|drop-initial-after-align|drop-initial-before-adjust|drop-initial-before-align|drop-initial-size|drop-initial-value|elevation|empty-cells|fit|fit-position|float-offset|float|font-family|font-size|font-size-adjust|font-stretch|font-style|font-variant|font-weight|font|grid-columns|grid-rows|hanging-punctuation|height|hyphenate-after|hyphenate-before|hyphenate-character|hyphenate-lines|hyphenate-resource|hyphens|icon|image-orientation|image-rendering|image-resolution|inline-box-align|left|letter-spacing|line-height|line-stacking-ruby|line-stacking-shift|line-stacking-strategy|line-stacking|list-style-image|list-style-position|list-style-type|list-style|margin-bottom|margin-left|margin-right|margin-top|margin|mark-after|mark-before|mark|marks|marquee-direction|marquee-play-count|marquee-speed|marquee-style|max-height|max-width|min-height|min-width|move-to|nav-down|nav-index|nav-left|nav-right|nav-up|opacity|orphans|outline-color|outline-offset|outline-style|outline-width|outline|overflow-style|overflow-x|overflow-y|overflow|padding-bottom|padding-left|padding-right|padding-top|padding|page-break-after|page-break-before|page-break-inside|page-policy|page|pause-after|pause-before|pause|perspective-origin|perspective|phonemes|pitch-range|pitch|play-during|position|presentation-level|punctuation-trim|quotes|rendering-intent|resize|rest-after|rest-before|rest|richness|right|rotation-point|rotation|ruby-align|ruby-overhang|ruby-position|ruby-span|size|speak-header|speak-numeral|speak-punctuation|speak|speech-rate|stress|string-set|table-layout|target-name|target-new|target-position|target|text-align-last|text-align|text-decoration|text-emphasis|text-height|text-indent|text-justify|text-outline|text-shadow|text-transform|text-wrap|top|transform-origin|transform-style|transform|transition-delay|transition-duration|transition-property|transition-timing-function|transition|unicode-bidi|vertical-align|visibility|voice-balance|voice-duration|voice-family|voice-pitch-range|voice-pitch|voice-rate|voice-stress|voice-volume|volume|white-space-collapse|white-space|widows|width|word-break|word-spacing|word-wrap|z-index".split("|")),b=e.arrayToMap("rgb|rgba|url|attr|counter|counters".split("|")),c=e.arrayToMap("absolute|after-edge|after|all-scroll|all|alphabetic|always|antialiased|armenian|auto|avoid-column|avoid-page|avoid|balance|baseline|before-edge|before|below|bidi-override|block-line-height|block|bold|bolder|border-box|both|bottom|box|break-all|break-word|capitalize|caps-height|caption|center|central|char|circle|cjk-ideographic|clone|close-quote|col-resize|collapse|column|consider-shifts|contain|content-box|cover|crosshair|cubic-bezier|dashed|decimal-leading-zero|decimal|default|disabled|disc|disregard-shifts|distribute-all-lines|distribute-letter|distribute-space|distribute|dotted|double|e-resize|ease-in|ease-in-out|ease-out|ease|ellipsis|end|exclude-ruby|fill|fixed|font-size|font|georgian|glyphs|grid-height|groove|hand|hanging|hebrew|help|hidden|hiragana-iroha|hiragana|horizontal|icon|ideograph-alpha|ideograph-numeric|ideograph-parenthesis|ideograph-space|ideographic|inactive|include-ruby|inherit|initial|inline-block|inline-box|inline-line-height|inline-table|inline|inset|inside|inter-ideograph|inter-word|invert|italic|justify|katakana-iroha|katakana|keep-all|last|left|lighter|line-edge|line-through|line|linear|list-item|local|loose|lower-alpha|lower-greek|lower-latin|lower-roman|lowercase|lr-tb|ltr|mathematical|max-height|max-size|medium|menu|message-box|middle|move|n-resize|ne-resize|newspaper|no-change|no-close-quote|no-drop|no-open-quote|no-repeat|none|normal|not-allowed|nowrap|nw-resize|oblique|open-quote|outset|outside|overline|padding-box|page|pointer|pre-line|pre-wrap|pre|preserve-3d|progress|relative|repeat-x|repeat-y|repeat|replaced|reset-size|ridge|right|round|row-resize|rtl|s-resize|scroll|se-resize|separate|slice|small-caps|small-caption|solid|space|square|start|static|status-bar|step-end|step-start|steps|stretch|strict|sub|super|sw-resize|table-caption|table-cell|table-column-group|table-column|table-footer-group|table-header-group|table-row-group|table-row|table|tb-rl|text-after-edge|text-before-edge|text-bottom|text-size|text-top|text|thick|thin|top|transparent|underline|upper-alpha|upper-latin|upper-roman|uppercase|use-script|vertical-ideographic|vertical-text|visible|w-resize|wait|whitespace|z-index|zero".split("|")),d=e.arrayToMap("aqua|black|blue|fuchsia|gray|green|lime|maroon|navy|olive|orange|purple|red|silver|teal|white|yellow".split("|")),f=e.arrayToMap("arial|century|comic|courier|garamond|georgia|helvetica|impact|lucida|symbol|system|tahoma|times|trebuchet|utopia|verdana|webdings|sans-serif|serif|monospace".split("|")),g="\\-?(?:(?:[0-9]+)|(?:[0-9]*\\.[0-9]+))",h="(\\:+)\\b(after|before|first-letter|first-line|moz-selection|selection)\\b",i="(:)\\b(active|checked|disabled|empty|enabled|first-child|first-of-type|focus|hover|indeterminate|invalid|last-child|last-of-type|link|not|nth-child|nth-last-child|nth-last-of-type|nth-of-type|only-child|only-of-type|required|root|target|valid|visited)\\b",j=[{token:"comment",merge:!0,regex:"\\/\\*",next:"ruleset_comment"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:["constant.numeric","keyword"],regex:"("+g+")(ch|cm|deg|em|ex|fr|gd|grad|Hz|in|kHz|mm|ms|pc|pt|px|rad|rem|s|turn|vh|vm|vw|%)"},{token:["constant.numeric"],regex:"([0-9]+)"},{token:"constant.numeric",regex:"#[a-f0-9]{6}"},{token:"constant.numeric",regex:"#[a-f0-9]{3}"},{token:["punctuation","entity.other.attribute-name.pseudo-element.css"],regex:h},{token:["punctuation","entity.other.attribute-name.pseudo-class.css"],regex:i},{token:function(e){return a.hasOwnProperty(e.toLowerCase())?"support.type":b.hasOwnProperty(e.toLowerCase())?"support.function":c.hasOwnProperty(e.toLowerCase())?"support.constant":d.hasOwnProperty(e.toLowerCase())?"support.constant.color":f.hasOwnProperty(e.toLowerCase())?"support.constant.fonts":"text"},regex:"\\-?[a-zA-Z_][a-zA-Z0-9_\\-]*"}],k=e.copyArray(j);k.unshift({token:"paren.rparen",regex:"\\}",next:"start"});var l=e.copyArray(j);l.unshift({token:"paren.rparen",regex:"\\}",next:"media"});var m=[{token:"comment",merge:!0,regex:".+"}],n=e.copyArray(m);n.unshift({token:"comment",regex:".*?\\*\\/",next:"start"});var o=e.copyArray(m);o.unshift({token:"comment",regex:".*?\\*\\/",next:"media"});var p=e.copyArray(m);p.unshift({token:"comment",regex:".*?\\*\\/",next:"ruleset"}),this.$rules={start:[{token:"comment",merge:!0,regex:"\\/\\*",next:"comment"},{token:"paren.lparen",regex:"\\{",next:"ruleset"},{token:"string",regex:"@.*?{",next:"media"},{token:"keyword",regex:"#[a-z0-9-_]+"},{token:"variable",regex:"\\.[a-z0-9-_]+"},{token:"string",regex:":[a-z0-9-_]+"},{token:"constant",regex:"[a-z0-9-_]+"}],media:[{token:"comment",merge:!0,regex:"\\/\\*",next:"media_comment"},{token:"paren.lparen",regex:"\\{",next:"media_ruleset"},{token:"string",regex:"\\}",next:"start"},{token:"keyword",regex:"#[a-z0-9-_]+"},{token:"variable",regex:"\\.[a-z0-9-_]+"},{token:"string",regex:":[a-z0-9-_]+"},{token:"constant",regex:"[a-z0-9-_]+"}],comment:n,ruleset:k,ruleset_comment:p,media_ruleset:l,media_comment:o}};d.inherits(g,f),b.CssHighlightRules=g}),define("ace/mode/html_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/css_highlight_rules","ace/mode/javascript_highlight_rules","ace/mode/xml_util","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./css_highlight_rules").CssHighlightRules,f=a("./javascript_highlight_rules").JavaScriptHighlightRules,g=a("./xml_util"),h=a("./text_highlight_rules").TextHighlightRules,i=function(){this.$rules={start:[{token:"text",merge:!0,regex:"<\\!\\[CDATA\\[",next:"cdata"},{token:"xml_pe",regex:"<\\?.*?\\?>"},{token:"comment",merge:!0,regex:"<\\!--",next:"comment"},{token:"xml_pe",regex:"<\\!.*?>"},{token:"meta.tag",regex:"<(?=s*script\\b)",next:"script"},{token:"meta.tag",regex:"<(?=s*style\\b)",next:"style"},{token:"meta.tag",regex:"<\\/?",next:"tag"},{token:"text",regex:"\\s+"},{token:"constant.character.entity",regex:"(?:&#[0-9]+;)|(?:&#x[0-9a-fA-F]+;)|(?:&[a-zA-Z0-9_:\\.-]+;)"},{token:"text",regex:"[^<]+"}],cdata:[{token:"text",regex:"\\]\\]>",next:"start"},{token:"text",merge:!0,regex:"\\s+"},{token:"text",merge:!0,regex:".+"}],comment:[{token:"comment",regex:".*?-->",next:"start"},{token:"comment",merge:!0,regex:".+"}]},g.tag(this.$rules,"tag","start"),g.tag(this.$rules,"style","css-start"),g.tag(this.$rules,"script","js-start"),this.embedRules(f,"js-",[{token:"comment",regex:"\\/\\/.*(?=<\\/script>)",next:"tag"},{token:"meta.tag",regex:"<\\/(?=script)",next:"tag"}]),this.embedRules(e,"css-",[{token:"meta.tag",regex:"<\\/(?=style)",next:"tag"}])};d.inherits(i,h),b.HtmlHighlightRules=i}),define("ace/mode/xml_util",["require","exports","module","ace/lib/lang"],function(a,b,c){function g(a){return[{token:"string",regex:'".*?"'},{token:"string",merge:!0,regex:'["].*',next:a+"_qqstring"},{token:"string",regex:"'.*?'"},{token:"string",merge:!0,regex:"['].*",next:a+"_qstring"}]}function h(a,b){return[{token:"string",merge:!0,regex:".*?"+a,next:b},{token:"string",merge:!0,regex:".+"}]}"use strict";var d=a("../lib/lang"),e=d.arrayToMap("button|form|input|label|select|textarea".split("|")),f=d.arrayToMap("table|tbody|td|tfoot|th|tr".split("|"));b.tag=function(a,b,c){a[b]=[{token:"text",regex:"\\s+"},{token:function(a){return a==="a"?"meta.tag.anchor":a==="img"?"meta.tag.image":a==="script"?"meta.tag.script":a==="style"?"meta.tag.style":e.hasOwnProperty(a.toLowerCase())?"meta.tag.form":f.hasOwnProperty(a.toLowerCase())?"meta.tag.table":"meta.tag"},merge:!0,regex:"[-_a-zA-Z0-9:]+",next:b+"_embed_attribute_list"},{token:"empty",regex:"",next:b+"_embed_attribute_list"}],a[b+"_qstring"]=h("'",b+"_embed_attribute_list"),a[b+"_qqstring"]=h('"',b+"_embed_attribute_list"),a[b+"_embed_attribute_list"]=[{token:"meta.tag",merge:!0,regex:"/?>",next:c},{token:"keyword.operator",regex:"="},{token:"entity.other.attribute-name",regex:"[-_a-zA-Z0-9:]+"},{token:"constant.numeric",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:"text",regex:"\\s+"}].concat(g(b))}}),define("ace/mode/behaviour/xml",["require","exports","module","ace/lib/oop","ace/mode/behaviour","ace/mode/behaviour/cstyle"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../behaviour").Behaviour,f=a("./cstyle").CstyleBehaviour,g=function(){this.inherit(f,["string_dquotes"]),this.add("brackets","insertion",function(a,b,c,d,e){if(e=="<"){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?!1:{text:"<>",selection:[1,1]}}if(e==">"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j==">")return{text:"",selection:[1,1]}}else if(e=="\n"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),k=i.substring(h.column,h.column+2);if(k=="</"){var l=this.$getIndent(d.doc.getLine(h.row))+d.getTabString(),m=this.$getIndent(d.doc.getLine(h.row));return{text:"\n"+l+"\n"+m,selection:[1,l.length,1,l.length]}}}})};d.inherits(g,e),b.XmlBehaviour=g}),define("ace/mode/folding/html",["require","exports","module","ace/lib/oop","ace/mode/folding/mixed","ace/mode/folding/xml","ace/mode/folding/cstyle"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("./mixed").FoldMode,f=a("./xml").FoldMode,g=a("./cstyle").FoldMode,h=b.FoldMode=function(){e.call(this,new f({area:1,base:1,br:1,col:1,command:1,embed:1,hr:1,img:1,input:1,keygen:1,link:1,meta:1,param:1,source:1,track:1,wbr:1,li:1,dt:1,dd:1,p:1,rt:1,rp:1,optgroup:1,option:1,colgroup:1,td:1,th:1}),{"js-":new g,"css-":new g})};d.inherits(h,e)}),define("ace/mode/folding/mixed",["require","exports","module","ace/lib/oop","ace/mode/folding/fold_mode"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("./fold_mode").FoldMode,f=b.FoldMode=function(a,b){this.defaultMode=a,this.subModes=b};d.inherits(f,e),function(){this.$getMode=function(a){for(var b in this.subModes)if(a.indexOf(b)===0)return this.subModes[b];return null},this.$tryMode=function(a,b,c,d){var e=this.$getMode(a);return e?e.getFoldWidget(b,c,d):""},this.getFoldWidget=function(a,b,c){return this.$tryMode(a.getState(c-1),a,b,c)||this.$tryMode(a.getState(c),a,b,c)||this.defaultMode.getFoldWidget(a,b,c)},this.getFoldWidgetRange=function(a,b,c){var d=this.$getMode(a.getState(c-1));if(!d||!d.getFoldWidget(a,b,c))d=this.$getMode(a.getState(c));if(!d||!d.getFoldWidget(a,b,c))d=this.defaultMode;return d.getFoldWidgetRange(a,b,c)}}.call(f.prototype)}),define("ace/mode/folding/xml",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/range","ace/mode/folding/fold_mode","ace/token_iterator"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../../lib/lang"),f=a("../../range").Range,g=a("./fold_mode").FoldMode,h=a("../../token_iterator").TokenIterator,i=b.FoldMode=function(a){g.call(this),this.voidElements=a||{}};d.inherits(i,g),function(){this.getFoldWidget=function(a,b,c){var d=this._getFirstTagInLine(a,c);return d.closing?b=="markbeginend"?"end":"":!d.tagName||this.voidElements[d.tagName.toLowerCase()]?"":d.selfClosing?"":d.value.indexOf("/"+d.tagName)!==-1?"":"start"},this._getFirstTagInLine=function(a,b){var c=a.getTokens(b,b)[0].tokens,d="";for(var f=0;f<c.length;f++){var g=c[f];g.type.indexOf("meta.tag")===0?d+=g.value:d+=e.stringRepeat(" ",g.value.length)}return this._parseTag(d)},this.tagRe=/^(\s*)(<?(\/?)([-_a-zA-Z0-9:!]*)\s*(\/?)>?)/,this._parseTag=function(a){var b=this.tagRe.exec(a),c=this.tagRe.lastIndex||0;return this.tagRe.lastIndex=0,{value:a,match:b?b[2]:"",closing:b?!!b[3]:!1,selfClosing:b?!!b[5]||b[2]=="/>":!1,tagName:b?b[4]:"",column:b[1]?c+b[1].length:c}},this._readTagForward=function(a){var b=a.getCurrentToken();if(!b)return null;var c="",d;do if(b.type.indexOf("meta.tag")===0){if(!d)var d={row:a.getCurrentTokenRow(),column:a.getCurrentTokenColumn()};c+=b.value;if(c.indexOf(">")!==-1){var e=this._parseTag(c);return e.start=d,e.end={row:a.getCurrentTokenRow(),column:a.getCurrentTokenColumn()+b.value.length},a.stepForward(),e}}while(b=a.stepForward());return null},this._readTagBackward=function(a){var b=a.getCurrentToken();if(!b)return null;var c="",d;do if(b.type.indexOf("meta.tag")===0){d||(d={row:a.getCurrentTokenRow(),column:a.getCurrentTokenColumn()+b.value.length}),c=b.value+c;if(c.indexOf("<")!==-1){var e=this._parseTag(c);return e.end=d,e.start={row:a.getCurrentTokenRow(),column:a.getCurrentTokenColumn()},a.stepBackward(),e}}while(b=a.stepBackward());return null},this._pop=function(a,b){while(a.length){var c=a[a.length-1];if(!b||c.tagName==b.tagName)return a.pop();if(this.voidElements[b.tagName])return;if(this.voidElements[c.tagName]){a.pop();continue}return null}},this.getFoldWidgetRange=function(a,b,c){var d=this._getFirstTagInLine(a,c);if(!d.match)return null;var e=d.closing||d.selfClosing,g=[],i;if(!e){var j=new h(a,c,d.column),k={row:c,column:d.column+d.tagName.length+2};while(i=this._readTagForward(j)){if(i.selfClosing){if(!g.length)return i.start.column+=i.tagName.length+2,i.end.column-=2,f.fromPoints(i.start,i.end);continue}if(i.closing){this._pop(g,i);if(g.length==0)return f.fromPoints(k,i.start)}else g.push(i)}}else{var j=new h(a,c,d.column+d.match.length),l={row:c,column:d.column};while(i=this._readTagBackward(j)){if(i.selfClosing){if(!g.length)return i.start.column+=i.tagName.length+2,i.end.column-=2,f.fromPoints(i.start,i.end);continue}if(!i.closing){this._pop(g,i);if(g.length==0)return i.start.column+=i.tagName.length+2,f.fromPoints(i.start,l)}else g.push(i)}}}}.call(i.prototype)})
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-java-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-java-uncompressed.js
deleted file mode 100644
index f241de365d..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-java-uncompressed.js
+++ /dev/null
@@ -1,1372 +0,0 @@
-define('ace/mode/java', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/javascript', 'ace/tokenizer', 'ace/mode/java_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var JavaScriptMode = require("./javascript").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
-var JavaHighlightRules = require("./java_highlight_rules").JavaHighlightRules;
-
-var Mode = function() {
-    JavaScriptMode.call(this);
-    
-    this.$tokenizer = new Tokenizer(new JavaHighlightRules().getRules());
-};
-oop.inherits(Mode, JavaScriptMode);
-
-(function() {
-    
-    this.createWorker = function(session) {
-        return null;
-    };
-
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/javascript', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/javascript_highlight_rules', 'ace/mode/matching_brace_outdent', 'ace/range', 'ace/worker/worker_client', 'ace/mode/behaviour/cstyle', 'ace/mode/folding/cstyle'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
-var JavaScriptHighlightRules = require("./javascript_highlight_rules").JavaScriptHighlightRules;
-var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
-var Range = require("../range").Range;
-var WorkerClient = require("../worker/worker_client").WorkerClient;
-var CstyleBehaviour = require("./behaviour/cstyle").CstyleBehaviour;
-var CStyleFoldMode = require("./folding/cstyle").FoldMode;
-
-var Mode = function() {
-    this.$tokenizer = new Tokenizer(new JavaScriptHighlightRules().getRules());
-    this.$outdent = new MatchingBraceOutdent();
-    this.$behaviour = new CstyleBehaviour();
-    this.foldingRules = new CStyleFoldMode();
-};
-oop.inherits(Mode, TextMode);
-
-(function() {
-
-
-    this.toggleCommentLines = function(state, doc, startRow, endRow) {
-        var outdent = true;
-        var re = /^(\s*)\/\//;
-
-        for (var i=startRow; i<= endRow; i++) {
-            if (!re.test(doc.getLine(i))) {
-                outdent = false;
-                break;
-            }
-        }
-
-        if (outdent) {
-            var deleteRange = new Range(0, 0, 0, 0);
-            for (var i=startRow; i<= endRow; i++)
-            {
-                var line = doc.getLine(i);
-                var m = line.match(re);
-                deleteRange.start.row = i;
-                deleteRange.end.row = i;
-                deleteRange.end.column = m[0].length;
-                doc.replace(deleteRange, m[1]);
-            }
-        }
-        else {
-            doc.indentRows(startRow, endRow, "//");
-        }
-    };
-
-    this.getNextLineIndent = function(state, line, tab) {
-        var indent = this.$getIndent(line);
-
-        var tokenizedLine = this.$tokenizer.getLineTokens(line, state);
-        var tokens = tokenizedLine.tokens;
-        var endState = tokenizedLine.state;
-
-        if (tokens.length && tokens[tokens.length-1].type == "comment") {
-            return indent;
-        }
-        
-        if (state == "start" || state == "regex_allowed") {
-            var match = line.match(/^.*(?:\bcase\b.*\:|[\{\(\[])\s*$/);
-            if (match) {
-                indent += tab;
-            }
-        } else if (state == "doc-start") {
-            if (endState == "start" || state == "regex_allowed") {
-                return "";
-            }
-            var match = line.match(/^\s*(\/?)\*/);
-            if (match) {
-                if (match[1]) {
-                    indent += " ";
-                }
-                indent += "* ";
-            }
-        }
-
-        return indent;
-    };
-
-    this.checkOutdent = function(state, line, input) {
-        return this.$outdent.checkOutdent(line, input);
-    };
-
-    this.autoOutdent = function(state, doc, row) {
-        this.$outdent.autoOutdent(doc, row);
-    };
-    
-    this.createWorker = function(session) {
-        var worker = new WorkerClient(["ace"], "worker-javascript.js", "ace/mode/javascript_worker", "JavaScriptWorker");
-        worker.attachToDocument(session.getDocument());
-            
-        worker.on("jslint", function(results) {
-            var errors = [];
-            for (var i=0; i<results.data.length; i++) {
-                var error = results.data[i];
-                if (error)
-                    errors.push({
-                        row: error.line-1,
-                        column: error.character-1,
-                        text: error.reason,
-                        type: "warning",
-                        lint: error
-                    });
-            }
-            session.setAnnotations(errors);
-        });
-        
-        worker.on("narcissus", function(e) {
-            session.setAnnotations([e.data]);
-        });
-        
-        worker.on("terminate", function() {
-            session.clearAnnotations();
-        });
-        
-        return worker;
-    };
-
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Mihai Sucan <mihai DOT sucan AT gmail DOT com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/javascript_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/unicode', 'ace/mode/doc_comment_highlight_rules', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var lang = require("../lib/lang");
-var unicode = require("../unicode");
-var DocCommentHighlightRules = require("./doc_comment_highlight_rules").DocCommentHighlightRules;
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var JavaScriptHighlightRules = function() {
-
-    // see: https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects
-    var globals = lang.arrayToMap(
-      // Constructors
-        ("Array|Boolean|Date|Function|Iterator|Number|Object|RegExp|String|Proxy|" +
-      // E4X
-         "Namespace|QName|XML|XMLList|" +
-         "ArrayBuffer|Float32Array|Float64Array|Int16Array|Int32Array|Int8Array|" +
-         "Uint16Array|Uint32Array|Uint8Array|Uint8ClampedArray|" +
-      // Errors
-        "Error|EvalError|InternalError|RangeError|ReferenceError|StopIteration|" +
-        "SyntaxError|TypeError|URIError|" +
-      //  Non-constructor functions
-        "decodeURI|decodeURIComponent|encodeURI|encodeURIComponent|eval|isFinite|" +
-        "isNaN|parseFloat|parseInt|" +
-      // Other
-        "JSON|Math|" +
-      // Pseudo
-        "this|arguments|prototype|window|document"
-      ).split("|")
-    );
-
-    var keywords = lang.arrayToMap(
-        ("break|case|catch|continue|default|delete|do|else|finally|for|function|" +
-        "if|in|instanceof|new|return|switch|throw|try|typeof|let|var|while|with|" +
-        "const|yield|import|get|set").split("|")
-    );
-
-    // keywords which can be followed by regular expressions
-    var kwBeforeRe = "case|do|else|finally|in|instanceof|return|throw|try|typeof|yield";
-
-    var deprecated = lang.arrayToMap(
-        ("__parent__|__count__|escape|unescape|with|__proto__").split("|")
-    );
-
-    var definitions = lang.arrayToMap(("const|let|var|function").split("|"));
-
-    var buildinConstants = lang.arrayToMap(
-        ("null|Infinity|NaN|undefined").split("|")
-    );
-
-    var futureReserved = lang.arrayToMap(
-        ("class|enum|extends|super|export|implements|private|" +
-        "public|interface|package|protected|static").split("|")
-    );
-
-    // TODO: Unicode escape sequences
-    var identifierRe = "[" + unicode.packages.L + "\\$_]["
-        + unicode.packages.L
-        + unicode.packages.Mn + unicode.packages.Mc
-        + unicode.packages.Nd
-        + unicode.packages.Pc + "\\$_]*\\b";
-
-    var escapedRe = "\\\\(?:x[0-9a-fA-F]{2}|" + // hex
-        "u[0-9a-fA-F]{4}|" + // unicode
-        "[0-2][0-7]{0,2}|" + // oct
-        "3[0-6][0-7]?|" + // oct
-        "37[0-7]?|" + // oct
-        "[4-7][0-7]?|" + //oct
-        ".)";
-
-    // regexp must not have capturing parentheses. Use (?:) instead.
-    // regexps are ordered -> the first match is used
-
-    this.$rules = {
-        "start" : [
-            {
-                token : "comment",
-                regex : /\/\/.*$/
-            },
-            new DocCommentHighlightRules().getStartRule("doc-start"),
-            {
-                token : "comment", // multi line comment
-                merge : true,
-                regex : /\/\*/,
-                next : "comment"
-            }, {
-                token : "string",
-                regex : "'",
-                next  : "qstring"
-            }, {
-                token : "string",
-                regex : '"',
-                next  : "qqstring"
-            }, {
-                token : "constant.numeric", // hex
-                regex : /0[xX][0-9a-fA-F]+\b/
-            }, {
-                token : "constant.numeric", // float
-                regex : /[+-]?\d+(?:(?:\.\d*)?(?:[eE][+-]?\d+)?)?\b/
-            }, { // match stuff like: Sound.prototype.play = function() { }
-                token : [
-                    "storage.type",
-                    "punctuation.operator",
-                    "support.function",
-                    "punctuation.operator",
-                    "entity.name.function",
-                    "text",
-                    "keyword.operator",
-                    "text",
-                    "storage.type",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(" + identifierRe + ")(\\.)(prototype)(\\.)(" + identifierRe +")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"
-            }, { // match stuff like: Sound.prototype.play = myfunc
-                token : [
-                    "storage.type",
-                    "punctuation.operator",
-                    "support.function",
-                    "punctuation.operator",
-                    "entity.name.function",
-                    "text",
-                    "keyword.operator",
-                    "text"
-                ],
-                regex : "(" + identifierRe + ")(\\.)(prototype)(\\.)(" + identifierRe +")(\\s*)(=)(\\s*)"
-            }, { // match stuff like: Sound.play = function() {  }
-                token : [
-                    "storage.type",
-                    "punctuation.operator",
-                    "entity.name.function",
-                    "text",
-                    "keyword.operator",
-                    "text",
-                    "storage.type",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(" + identifierRe + ")(\\.)(" + identifierRe +")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"
-            }, { // match stuff like: play = function() {  }
-                token : [
-                    "entity.name.function",
-                    "text",
-                    "keyword.operator",
-                    "text",
-                    "storage.type",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(" + identifierRe +")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"
-            }, { // match regular function like: function myFunc(arg) { }
-                token : [
-                    "storage.type",
-                    "text",
-                    "entity.name.function",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(function)(\\s+)(" + identifierRe + ")(\\s*)(\\()(.*?)(\\))"
-            }, { // match stuff like: foobar: function() { }
-                token : [
-                    "entity.name.function",
-                    "text",
-                    "punctuation.operator",
-                    "text",
-                    "storage.type",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(" + identifierRe + ")(\\s*)(:)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"
-            }, { // Attempt to match : function() { } (this is for issues with 'foo': function() { })
-                token : [
-                    "text",
-                    "text",
-                    "storage.type",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(:)(\\s*)(function)?(\\s*)(\\()([^)]*)(\\))"
-            }, {
-                token : "constant.language.boolean",
-                regex : /(?:true|false)\b/
-            }, {
-                token : "keyword",
-                regex : "(?:" + kwBeforeRe + ")\\b",
-                next : "regex_allowed"
-            }, {
-                token : ["punctuation.operator", "support.function"],
-                regex : /(\.)(s(?:h(?:ift|ow(?:Mod(?:elessDialog|alDialog)|Help))|croll(?:X|By(?:Pages|Lines)?|Y|To)?|t(?:opzzzz|rike)|i(?:n|zeToContent|debar|gnText)|ort|u(?:p|b(?:str(?:ing)?)?)|pli(?:ce|t)|e(?:nd|t(?:Re(?:sizable|questHeader)|M(?:i(?:nutes|lliseconds)|onth)|Seconds|Ho(?:tKeys|urs)|Year|Cursor|Time(?:out)?|Interval|ZOptions|Date|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Date|FullYear)|FullYear|Active)|arch)|qrt|lice|avePreferences|mall)|h(?:ome|andleEvent)|navigate|c(?:har(?:CodeAt|At)|o(?:s|n(?:cat|textual|firm)|mpile)|eil|lear(?:Timeout|Interval)?|a(?:ptureEvents|ll)|reate(?:StyleSheet|Popup|EventObject))|t(?:o(?:GMTString|S(?:tring|ource)|U(?:TCString|pperCase)|Lo(?:caleString|werCase))|est|a(?:n|int(?:Enabled)?))|i(?:s(?:NaN|Finite)|ndexOf|talics)|d(?:isableExternalCapture|ump|etachEvent)|u(?:n(?:shift|taint|escape|watch)|pdateCommands)|j(?:oin|avaEnabled)|p(?:o(?:p|w)|ush|lugins.refresh|a(?:ddings|rse(?:Int|Float)?)|r(?:int|ompt|eference))|e(?:scape|nableExternalCapture|val|lementFromPoint|x(?:p|ec(?:Script|Command)?))|valueOf|UTC|queryCommand(?:State|Indeterm|Enabled|Value)|f(?:i(?:nd|le(?:ModifiedDate|Size|CreatedDate|UpdatedDate)|xed)|o(?:nt(?:size|color)|rward)|loor|romCharCode)|watch|l(?:ink|o(?:ad|g)|astIndexOf)|a(?:sin|nchor|cos|t(?:tachEvent|ob|an(?:2)?)|pply|lert|b(?:s|ort))|r(?:ou(?:nd|teEvents)|e(?:size(?:By|To)|calc|turnValue|place|verse|l(?:oad|ease(?:Capture|Events)))|andom)|g(?:o|et(?:ResponseHeader|M(?:i(?:nutes|lliseconds)|onth)|Se(?:conds|lection)|Hours|Year|Time(?:zoneOffset)?|Da(?:y|te)|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Da(?:y|te)|FullYear)|FullYear|A(?:ttention|llResponseHeaders)))|m(?:in|ove(?:B(?:y|elow)|To(?:Absolute)?|Above)|ergeAttributes|a(?:tch|rgins|x))|b(?:toa|ig|o(?:ld|rderWidths)|link|ack))\b(?=\()/
-            }, {
-                token : ["punctuation.operator", "support.function.dom"],
-                regex : /(\.)(s(?:ub(?:stringData|mit)|plitText|e(?:t(?:NamedItem|Attribute(?:Node)?)|lect))|has(?:ChildNodes|Feature)|namedItem|c(?:l(?:ick|o(?:se|neNode))|reate(?:C(?:omment|DATASection|aption)|T(?:Head|extNode|Foot)|DocumentFragment|ProcessingInstruction|E(?:ntityReference|lement)|Attribute))|tabIndex|i(?:nsert(?:Row|Before|Cell|Data)|tem)|open|delete(?:Row|C(?:ell|aption)|T(?:Head|Foot)|Data)|focus|write(?:ln)?|a(?:dd|ppend(?:Child|Data))|re(?:set|place(?:Child|Data)|move(?:NamedItem|Child|Attribute(?:Node)?)?)|get(?:NamedItem|Element(?:sBy(?:Name|TagName)|ById)|Attribute(?:Node)?)|blur)\b(?=\()/
-            }, {
-                token : ["punctuation.operator", "support.constant"],
-                regex : /(\.)(s(?:ystemLanguage|cr(?:ipts|ollbars|een(?:X|Y|Top|Left))|t(?:yle(?:Sheets)?|atus(?:Text|bar)?)|ibling(?:Below|Above)|ource|uffixes|e(?:curity(?:Policy)?|l(?:ection|f)))|h(?:istory|ost(?:name)?|as(?:h|Focus))|y|X(?:MLDocument|SLDocument)|n(?:ext|ame(?:space(?:s|URI)|Prop))|M(?:IN_VALUE|AX_VALUE)|c(?:haracterSet|o(?:n(?:structor|trollers)|okieEnabled|lorDepth|mp(?:onents|lete))|urrent|puClass|l(?:i(?:p(?:boardData)?|entInformation)|osed|asses)|alle(?:e|r)|rypto)|t(?:o(?:olbar|p)|ext(?:Transform|Indent|Decoration|Align)|ags)|SQRT(?:1_2|2)|i(?:n(?:ner(?:Height|Width)|put)|ds|gnoreCase)|zIndex|o(?:scpu|n(?:readystatechange|Line)|uter(?:Height|Width)|p(?:sProfile|ener)|ffscreenBuffering)|NEGATIVE_INFINITY|d(?:i(?:splay|alog(?:Height|Top|Width|Left|Arguments)|rectories)|e(?:scription|fault(?:Status|Ch(?:ecked|arset)|View)))|u(?:ser(?:Profile|Language|Agent)|n(?:iqueID|defined)|pdateInterval)|_content|p(?:ixelDepth|ort|ersonalbar|kcs11|l(?:ugins|atform)|a(?:thname|dding(?:Right|Bottom|Top|Left)|rent(?:Window|Layer)?|ge(?:X(?:Offset)?|Y(?:Offset)?))|r(?:o(?:to(?:col|type)|duct(?:Sub)?|mpter)|e(?:vious|fix)))|e(?:n(?:coding|abledPlugin)|x(?:ternal|pando)|mbeds)|v(?:isibility|endor(?:Sub)?|Linkcolor)|URLUnencoded|P(?:I|OSITIVE_INFINITY)|f(?:ilename|o(?:nt(?:Size|Family|Weight)|rmName)|rame(?:s|Element)|gColor)|E|whiteSpace|l(?:i(?:stStyleType|n(?:eHeight|kColor))|o(?:ca(?:tion(?:bar)?|lName)|wsrc)|e(?:ngth|ft(?:Context)?)|a(?:st(?:M(?:odified|atch)|Index|Paren)|yer(?:s|X)|nguage))|a(?:pp(?:MinorVersion|Name|Co(?:deName|re)|Version)|vail(?:Height|Top|Width|Left)|ll|r(?:ity|guments)|Linkcolor|bove)|r(?:ight(?:Context)?|e(?:sponse(?:XML|Text)|adyState))|global|x|m(?:imeTypes|ultiline|enubar|argin(?:Right|Bottom|Top|Left))|L(?:N(?:10|2)|OG(?:10E|2E))|b(?:o(?:ttom|rder(?:Width|RightWidth|BottomWidth|Style|Color|TopWidth|LeftWidth))|ufferDepth|elow|ackground(?:Color|Image)))\b/
-            }, {
-                token : ["storage.type", "punctuation.operator", "support.function.firebug"],
-                regex : /(console)(\.)(warn|info|log|error|time|timeEnd|assert)\b/
-            }, {
-                token : function(value) {
-                    if (globals.hasOwnProperty(value))
-                        return "variable.language";
-                    else if (deprecated.hasOwnProperty(value))
-                        return "invalid.deprecated";
-                    else if (definitions.hasOwnProperty(value))
-                        return "storage.type";
-                    else if (keywords.hasOwnProperty(value))
-                        return "keyword";
-                    else if (buildinConstants.hasOwnProperty(value))
-                        return "constant.language";
-                    else if (futureReserved.hasOwnProperty(value))
-                        return "invalid.illegal";
-                    else if (value == "debugger")
-                        return "invalid.deprecated";
-                    else
-                        return "identifier";
-                },
-                regex : identifierRe
-            }, {
-                token : "keyword.operator",
-                regex : /!|\$|%|&|\*|\-\-|\-|\+\+|\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\|\||\?\:|\*=|%=|\+=|\-=|&=|\^=|\b(?:in|instanceof|new|delete|typeof|void)/,
-                next  : "regex_allowed"
-            }, {
-                token : "punctuation.operator",
-                regex : /\?|\:|\,|\;|\./,
-                next  : "regex_allowed"
-            }, {
-                token : "paren.lparen",
-                regex : /[\[({]/,
-                next  : "regex_allowed"
-            }, {
-                token : "paren.rparen",
-                regex : /[\])}]/
-            }, {
-                token : "keyword.operator",
-                regex : /\/=?/,
-                next  : "regex_allowed"
-            }, {
-                token: "comment",
-                regex: /^#!.*$/
-            }, {
-                token : "text",
-                regex : /\s+/
-            }
-        ],
-        // regular expressions are only allowed after certain tokens. This
-        // makes sure we don't mix up regexps with the divison operator
-        "regex_allowed": [
-            {
-                token : "comment", // multi line comment
-                merge : true,
-                regex : "\\/\\*",
-                next : "comment_regex_allowed"
-            }, {
-                token : "comment",
-                regex : "\\/\\/.*$"
-            }, {
-                token: "string.regexp",
-                regex: "\\/",
-                next: "regex",
-                merge: true
-            }, {
-                token : "text",
-                regex : "\\s+"
-            }, {
-                // immediately return to the start mode without matching
-                // anything
-                token: "empty",
-                regex: "",
-                next: "start"
-            }
-        ],
-        "regex": [
-            {
-                token: "regexp.keyword.operator",
-                regex: "\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",
-                next: "regex"
-            }, {
-				// flag
-                token: "string.regexp",
-                regex: "/\\w*",
-                next: "start",
-                merge: true
-            }, {
-                token: "string.regexp",
-                regex: "[^\\\\/\\[]+",
-                next: "regex",
-                merge: true
-            }, {
-                token: "string.regexp.charachterclass",
-                regex: "\\[",
-                next: "regex_character_class",
-                merge: true
-            }, {
-                token: "empty",
-                regex: "",
-                next: "start"
-            }
-        ],
-        "regex_character_class": [
-            {
-                token: "regexp.keyword.operator",
-                regex: "\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",
-                next: "regex_character_class"
-            }, {
-                token: "string.regexp.charachterclass",
-                regex: "]",
-                next: "regex",
-                merge: true
-            }, {
-                token: "string.regexp.charachterclass",
-                regex: "[^\\\\\\]]+",
-                next: "regex_character_class",
-                merge: true
-            }, {
-                token: "empty",
-                regex: "",
-                next: "start"
-            }
-        ],
-        "comment_regex_allowed" : [
-            {
-                token : "comment", // closing comment
-                regex : ".*?\\*\\/",
-                merge : true,
-                next : "regex_allowed"
-            }, {
-                token : "comment", // comment spanning whole line
-                merge : true,
-                regex : ".+"
-            }
-        ],
-        "comment" : [
-            {
-                token : "comment", // closing comment
-                regex : ".*?\\*\\/",
-                merge : true,
-                next : "start"
-            }, {
-                token : "comment", // comment spanning whole line
-                merge : true,
-                regex : ".+"
-            }
-        ],
-        "qqstring" : [
-            {
-                token : "constant.language.escape",
-                regex : escapedRe
-            }, {
-                token : "string",
-                regex : '[^"\\\\]+'
-            }, {
-                token : "string",
-                regex : '"',
-                next  : "start"
-            }
-        ],
-        "qstring" : [
-            {
-                token : "constant.language.escape",
-                regex : escapedRe
-            }, {
-                token : "string",
-                regex : "[^'\\\\]+"
-            }, {
-                token : "string",
-                regex : "'",
-                next  : "start"
-            }
-        ]
-    };
-
-    this.embedRules(DocCommentHighlightRules, "doc-",
-        [ new DocCommentHighlightRules().getEndRule("start") ]);
-};
-
-oop.inherits(JavaScriptHighlightRules, TextHighlightRules);
-
-exports.JavaScriptHighlightRules = JavaScriptHighlightRules;
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/doc_comment_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var DocCommentHighlightRules = function() {
-
-    this.$rules = {
-        "start" : [ {
-            token : "comment.doc.tag",
-            regex : "@[\\w\\d_]+" // TODO: fix email addresses
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "\\s+"
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "TODO"
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "[^@\\*]+"
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "."
-        }]
-    };
-};
-
-oop.inherits(DocCommentHighlightRules, TextHighlightRules);
-
-(function() {
-
-    this.getStartRule = function(start) {
-        return {
-            token : "comment.doc", // doc comment
-            merge : true,
-            regex : "\\/\\*(?=\\*)",
-            next  : start
-        };
-    };
-    
-    this.getEndRule = function (start) {
-        return {
-            token : "comment.doc", // closing comment
-            merge : true,
-            regex : "\\*\\/",
-            next  : start
-        };
-    };
-
-}).call(DocCommentHighlightRules.prototype);
-
-exports.DocCommentHighlightRules = DocCommentHighlightRules;
-
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/matching_brace_outdent', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../range").Range;
-
-var MatchingBraceOutdent = function() {};
-
-(function() {
-
-    this.checkOutdent = function(line, input) {
-        if (! /^\s+$/.test(line))
-            return false;
-
-        return /^\s*\}/.test(input);
-    };
-
-    this.autoOutdent = function(doc, row) {
-        var line = doc.getLine(row);
-        var match = line.match(/^(\s*\})/);
-
-        if (!match) return 0;
-
-        var column = match[1].length;
-        var openBracePos = doc.findMatchingBracket({row: row, column: column});
-
-        if (!openBracePos || openBracePos.row == row) return 0;
-
-        var indent = this.$getIndent(doc.getLine(openBracePos.row));
-        doc.replace(new Range(row, 0, row, column-1), indent);
-    };
-
-    this.$getIndent = function(line) {
-        var match = line.match(/^(\s+)/);
-        if (match) {
-            return match[1];
-        }
-
-        return "";
-    };
-
-}).call(MatchingBraceOutdent.prototype);
-
-exports.MatchingBraceOutdent = MatchingBraceOutdent;
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Chris Spencer <chris.ag.spencer AT googlemail DOT com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/behaviour/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/behaviour'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var Behaviour = require('../behaviour').Behaviour;
-
-var CstyleBehaviour = function () {
-
-    this.add("braces", "insertion", function (state, action, editor, session, text) {
-        if (text == '{') {
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: '{' + selected + '}',
-                    selection: false
-                };
-            } else {
-                return {
-                    text: '{}',
-                    selection: [1, 1]
-                };
-            }
-        } else if (text == '}') {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == '}') {
-                var matching = session.$findOpeningBracket('}', {column: cursor.column + 1, row: cursor.row});
-                if (matching !== null) {
-                    return {
-                        text: '',
-                        selection: [1, 1]
-                    };
-                }
-            }
-        } else if (text == "\n") {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == '}') {
-                var openBracePos = session.findMatchingBracket({row: cursor.row, column: cursor.column + 1});
-                if (!openBracePos)
-                     return null;
-
-                var indent = this.getNextLineIndent(state, line.substring(0, line.length - 1), session.getTabString());
-                var next_indent = this.$getIndent(session.doc.getLine(openBracePos.row));
-
-                return {
-                    text: '\n' + indent + '\n' + next_indent,
-                    selection: [1, indent.length, 1, indent.length]
-                };
-            }
-        }
-    });
-
-    this.add("braces", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && selected == '{') {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.end.column, range.end.column + 1);
-            if (rightChar == '}') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-    this.add("parens", "insertion", function (state, action, editor, session, text) {
-        if (text == '(') {
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: '(' + selected + ')',
-                    selection: false
-                };
-            } else {
-                return {
-                    text: '()',
-                    selection: [1, 1]
-                };
-            }
-        } else if (text == ')') {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == ')') {
-                var matching = session.$findOpeningBracket(')', {column: cursor.column + 1, row: cursor.row});
-                if (matching !== null) {
-                    return {
-                        text: '',
-                        selection: [1, 1]
-                    };
-                }
-            }
-        }
-    });
-
-    this.add("parens", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && selected == '(') {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
-            if (rightChar == ')') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-    this.add("string_dquotes", "insertion", function (state, action, editor, session, text) {
-        if (text == '"' || text == "'") {
-            var quote = text;
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: quote + selected + quote,
-                    selection: false
-                };
-            } else {
-                var cursor = editor.getCursorPosition();
-                var line = session.doc.getLine(cursor.row);
-                var leftChar = line.substring(cursor.column-1, cursor.column);
-
-                // We're escaped.
-                if (leftChar == '\\') {
-                    return null;
-                }
-
-                // Find what token we're inside.
-                var tokens = session.getTokens(selection.start.row, selection.start.row)[0].tokens;
-                var col = 0, token;
-                var quotepos = -1; // Track whether we're inside an open quote.
-
-                for (var x = 0; x < tokens.length; x++) {
-                    token = tokens[x];
-                    if (token.type == "string") {
-                      quotepos = -1;
-                    } else if (quotepos < 0) {
-                      quotepos = token.value.indexOf(quote);
-                    }
-                    if ((token.value.length + col) > selection.start.column) {
-                        break;
-                    }
-                    col += tokens[x].value.length;
-                }
-
-                // Try and be smart about when we auto insert.
-                if (!token || (quotepos < 0 && token.type !== "comment" && (token.type !== "string" || ((selection.start.column !== token.value.length+col-1) && token.value.lastIndexOf(quote) === token.value.length-1)))) {
-                    return {
-                        text: quote + quote,
-                        selection: [1,1]
-                    };
-                } else if (token && token.type === "string") {
-                    // Ignore input and move right one if we're typing over the closing quote.
-                    var rightChar = line.substring(cursor.column, cursor.column + 1);
-                    if (rightChar == quote) {
-                        return {
-                            text: '',
-                            selection: [1, 1]
-                        };
-                    }
-                }
-            }
-        }
-    });
-
-    this.add("string_dquotes", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && (selected == '"' || selected == "'")) {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
-            if (rightChar == '"') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-};
-
-oop.inherits(CstyleBehaviour, Behaviour);
-
-exports.CstyleBehaviour = CstyleBehaviour;
-});/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/folding/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/range', 'ace/mode/folding/fold_mode'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var Range = require("../../range").Range;
-var BaseFoldMode = require("./fold_mode").FoldMode;
-
-var FoldMode = exports.FoldMode = function() {};
-oop.inherits(FoldMode, BaseFoldMode);
-
-(function() {
-
-    this.foldingStartMarker = /(\{|\[)[^\}\]]*$|^\s*(\/\*)/;
-    this.foldingStopMarker = /^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/;
-    
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        var line = session.getLine(row);
-        var match = line.match(this.foldingStartMarker);
-        if (match) {
-            var i = match.index;
-
-            if (match[1])
-                return this.openingBracketBlock(session, match[1], row, i);
-
-            var range = session.getCommentFoldRange(row, i + match[0].length);
-            range.end.column -= 2;
-            return range;
-        }
-
-        if (foldStyle !== "markbeginend")
-            return;
-            
-        var match = line.match(this.foldingStopMarker);
-        if (match) {
-            var i = match.index + match[0].length;
-
-            if (match[2]) {
-                var range = session.getCommentFoldRange(row, i);
-                range.end.column -= 2;
-                return range;
-            }
-
-            var end = {row: row, column: i};
-            var start = session.$findOpeningBracket(match[1], end);
-            
-            if (!start)
-                return;
-
-            start.column++;
-            end.column--;
-
-            return  Range.fromPoints(start, end);
-        }
-    };
-    
-}).call(FoldMode.prototype);
-
-});/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/folding/fold_mode', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../../range").Range;
-
-var FoldMode = exports.FoldMode = function() {};
-
-(function() {
-
-    this.foldingStartMarker = null;
-    this.foldingStopMarker = null;
-
-    // must return "" if there's no fold, to enable caching
-    this.getFoldWidget = function(session, foldStyle, row) {
-        var line = session.getLine(row);
-        if (this.foldingStartMarker.test(line))
-            return "start";
-        if (foldStyle == "markbeginend"
-                && this.foldingStopMarker
-                && this.foldingStopMarker.test(line))
-            return "end";
-        return "";
-    };
-    
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        return null;
-    };
-
-    this.indentationBlock = function(session, row, column) {
-        var re = /^\s*/;
-        var startRow = row;
-        var endRow = row;
-        var line = session.getLine(row);
-        var startColumn = column || line.length;
-        var startLevel = line.match(re)[0].length;
-        var maxRow = session.getLength()
-        
-        while (++row < maxRow) {
-            line = session.getLine(row);
-            var level = line.match(re)[0].length;
-
-            if (level == line.length)
-                continue;
-
-            if (level <= startLevel)
-                break;
-
-            endRow = row;
-        }
-
-        if (endRow > startRow) {
-            var endColumn = session.getLine(endRow).length;
-            return new Range(startRow, startColumn, endRow, endColumn);
-        }
-    };
-
-    this.openingBracketBlock = function(session, bracket, row, column) {
-        var start = {row: row, column: column + 1};
-        var end = session.$findClosingBracket(bracket, start);
-        if (!end)
-            return;
-
-        var fw = session.foldWidgets[end.row];
-        if (fw == null)
-            fw = this.getFoldWidget(session, end.row);
-
-        if (fw == "start") {
-            end.row --;
-            end.column = session.getLine(end.row).length;
-        }
-        return Range.fromPoints(start, end);
-    };
-
-}).call(FoldMode.prototype);
-
-});
-define('ace/mode/java_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/mode/doc_comment_highlight_rules', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var lang = require("../lib/lang");
-var DocCommentHighlightRules = require("./doc_comment_highlight_rules").DocCommentHighlightRules;
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var JavaHighlightRules = function() {
-
-    // taken from http://download.oracle.com/javase/tutorial/java/nutsandbolts/_keywords.html
-    var keywords = lang.arrayToMap(
-    ("abstract|continue|for|new|switch|" +
-    "assert|default|goto|package|synchronized|" +
-    "boolean|do|if|private|this|" +
-    "break|double|implements|protected|throw|" +
-    "byte|else|import|public|throws|" +
-    "case|enum|instanceof|return|transient|" +
-    "catch|extends|int|short|try|" +
-    "char|final|interface|static|void|" +
-    "class|finally|long|strictfp|volatile|" +
-    "const|float|native|super|while").split("|")
-    );
-
-    var buildinConstants = lang.arrayToMap(
-        ("null|Infinity|NaN|undefined").split("|")
-    );
-
-    var langClasses = lang.arrayToMap(
-        ("AbstractMethodError|AssertionError|ClassCircularityError|"+
-        "ClassFormatError|Deprecated|EnumConstantNotPresentException|"+
-        "ExceptionInInitializerError|IllegalAccessError|"+
-        "IllegalThreadStateException|InstantiationError|InternalError|"+
-        "NegativeArraySizeException|NoSuchFieldError|Override|Process|"+
-        "ProcessBuilder|SecurityManager|StringIndexOutOfBoundsException|"+
-        "SuppressWarnings|TypeNotPresentException|UnknownError|"+
-        "UnsatisfiedLinkError|UnsupportedClassVersionError|VerifyError|"+
-        "InstantiationException|IndexOutOfBoundsException|"+
-        "ArrayIndexOutOfBoundsException|CloneNotSupportedException|"+
-        "NoSuchFieldException|IllegalArgumentException|NumberFormatException|"+
-        "SecurityException|Void|InheritableThreadLocal|IllegalStateException|"+
-        "InterruptedException|NoSuchMethodException|IllegalAccessException|"+
-        "UnsupportedOperationException|Enum|StrictMath|Package|Compiler|"+
-        "Readable|Runtime|StringBuilder|Math|IncompatibleClassChangeError|"+
-        "NoSuchMethodError|ThreadLocal|RuntimePermission|ArithmeticException|"+
-        "NullPointerException|Long|Integer|Short|Byte|Double|Number|Float|"+
-        "Character|Boolean|StackTraceElement|Appendable|StringBuffer|"+
-        "Iterable|ThreadGroup|Runnable|Thread|IllegalMonitorStateException|"+
-        "StackOverflowError|OutOfMemoryError|VirtualMachineError|"+
-        "ArrayStoreException|ClassCastException|LinkageError|"+
-        "NoClassDefFoundError|ClassNotFoundException|RuntimeException|"+
-        "Exception|ThreadDeath|Error|Throwable|System|ClassLoader|"+
-        "Cloneable|Class|CharSequence|Comparable|String|Object").split("|")
-    );
-    
-    var importClasses = lang.arrayToMap(
-        ("").split("|")
-    );
-    // regexp must not have capturing parentheses. Use (?:) instead.
-    // regexps are ordered -> the first match is used
-
-    this.$rules = {
-        "start" : [
-            {
-                token : "comment",
-                regex : "\\/\\/.*$"
-            },
-            new DocCommentHighlightRules().getStartRule("doc-start"),
-            {
-                token : "comment", // multi line comment
-                merge : true,
-                regex : "\\/\\*",
-                next : "comment"
-            }, {
-                token : "string.regexp",
-                regex : "[/](?:(?:\\[(?:\\\\]|[^\\]])+\\])|(?:\\\\/|[^\\]/]))*[/]\\w*\\s*(?=[).,;]|$)"
-            }, {
-                token : "string", // single line
-                regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
-            }, {
-                token : "string", // single line
-                regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"
-            }, {
-                token : "constant.numeric", // hex
-                regex : "0[xX][0-9a-fA-F]+\\b"
-            }, {
-                token : "constant.numeric", // float
-                regex : "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"
-            }, {
-                token : "constant.language.boolean",
-                regex : "(?:true|false)\\b"
-            }, {
-                token : function(value) {
-                    if (value == "this")
-                        return "variable.language";
-                    else if (keywords.hasOwnProperty(value))
-                        return "keyword";
-                    else if (langClasses.hasOwnProperty(value))
-                        return "support.function";
-                    else if (importClasses.hasOwnProperty(value))
-                        return "support.function";
-                    else if (buildinConstants.hasOwnProperty(value))
-                        return "constant.language";
-                    else
-                        return "identifier";
-                },
-                // TODO: Unicode escape sequences
-                // TODO: Unicode identifiers
-                regex : "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
-            }, {
-                token : "keyword.operator",
-                regex : "!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)"
-            }, {
-                token : "lparen",
-                regex : "[[({]"
-            }, {
-                token : "rparen",
-                regex : "[\\])}]"
-            }, {
-                token : "text",
-                regex : "\\s+"
-            }
-        ],
-        "comment" : [
-            {
-                token : "comment", // closing comment
-                regex : ".*?\\*\\/",
-                next : "start"
-            }, {
-                token : "comment", // comment spanning whole line
-                merge : true,
-                regex : ".+"
-            }
-        ]
-    };
-    
-    this.embedRules(DocCommentHighlightRules, "doc-",
-        [ new DocCommentHighlightRules().getEndRule("start") ]);
-};
-
-oop.inherits(JavaHighlightRules, TextHighlightRules);
-
-exports.JavaHighlightRules = JavaHighlightRules;
-});
diff --git a/apps/files_texteditor/js/aceeditor/mode-java.js b/apps/files_texteditor/js/aceeditor/mode-java.js
deleted file mode 100644
index 9398464a18..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-java.js
+++ /dev/null
@@ -1 +0,0 @@
-define("ace/mode/java",["require","exports","module","ace/lib/oop","ace/mode/javascript","ace/tokenizer","ace/mode/java_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./javascript").Mode,f=a("../tokenizer").Tokenizer,g=a("./java_highlight_rules").JavaHighlightRules,h=function(){e.call(this),this.$tokenizer=new f((new g).getRules())};d.inherits(h,e),function(){this.createWorker=function(a){return null}}.call(h.prototype),b.Mode=h}),define("ace/mode/javascript",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/javascript_highlight_rules","ace/mode/matching_brace_outdent","ace/range","ace/worker/worker_client","ace/mode/behaviour/cstyle","ace/mode/folding/cstyle"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./javascript_highlight_rules").JavaScriptHighlightRules,h=a("./matching_brace_outdent").MatchingBraceOutdent,i=a("../range").Range,j=a("../worker/worker_client").WorkerClient,k=a("./behaviour/cstyle").CstyleBehaviour,l=a("./folding/cstyle").FoldMode,m=function(){this.$tokenizer=new f((new g).getRules()),this.$outdent=new h,this.$behaviour=new k,this.foldingRules=new l};d.inherits(m,e),function(){this.toggleCommentLines=function(a,b,c,d){var e=!0,f=/^(\s*)\/\//;for(var g=c;g<=d;g++)if(!f.test(b.getLine(g))){e=!1;break}if(e){var h=new i(0,0,0,0);for(var g=c;g<=d;g++){var j=b.getLine(g),k=j.match(f);h.start.row=g,h.end.row=g,h.end.column=k[0].length,b.replace(h,k[1])}}else b.indentRows(c,d,"//")},this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a),f=e.tokens,g=e.state;if(f.length&&f[f.length-1].type=="comment")return d;if(a=="start"||a=="regex_allowed"){var h=b.match(/^.*(?:\bcase\b.*\:|[\{\(\[])\s*$/);h&&(d+=c)}else if(a=="doc-start"){if(g=="start"||a=="regex_allowed")return"";var h=b.match(/^\s*(\/?)\*/);h&&(h[1]&&(d+=" "),d+="* ")}return d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)},this.createWorker=function(a){var b=new j(["ace"],"worker-javascript.js","ace/mode/javascript_worker","JavaScriptWorker");return b.attachToDocument(a.getDocument()),b.on("jslint",function(b){var c=[];for(var d=0;d<b.data.length;d++){var e=b.data[d];e&&c.push({row:e.line-1,column:e.character-1,text:e.reason,type:"warning",lint:e})}a.setAnnotations(c)}),b.on("narcissus",function(b){a.setAnnotations([b.data])}),b.on("terminate",function(){a.clearAnnotations()}),b}}.call(m.prototype),b.Mode=m}),define("ace/mode/javascript_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/unicode","ace/mode/doc_comment_highlight_rules","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("../unicode"),g=a("./doc_comment_highlight_rules").DocCommentHighlightRules,h=a("./text_highlight_rules").TextHighlightRules,i=function(){var a=e.arrayToMap("Array|Boolean|Date|Function|Iterator|Number|Object|RegExp|String|Proxy|Namespace|QName|XML|XMLList|ArrayBuffer|Float32Array|Float64Array|Int16Array|Int32Array|Int8Array|Uint16Array|Uint32Array|Uint8Array|Uint8ClampedArray|Error|EvalError|InternalError|RangeError|ReferenceError|StopIteration|SyntaxError|TypeError|URIError|decodeURI|decodeURIComponent|encodeURI|encodeURIComponent|eval|isFinite|isNaN|parseFloat|parseInt|JSON|Math|this|arguments|prototype|window|document".split("|")),b=e.arrayToMap("break|case|catch|continue|default|delete|do|else|finally|for|function|if|in|instanceof|new|return|switch|throw|try|typeof|let|var|while|with|const|yield|import|get|set".split("|")),c="case|do|else|finally|in|instanceof|return|throw|try|typeof|yield",d=e.arrayToMap("__parent__|__count__|escape|unescape|with|__proto__".split("|")),h=e.arrayToMap("const|let|var|function".split("|")),i=e.arrayToMap("null|Infinity|NaN|undefined".split("|")),j=e.arrayToMap("class|enum|extends|super|export|implements|private|public|interface|package|protected|static".split("|")),k="["+f.packages.L+"\\$_]["+f.packages.L+f.packages.Mn+f.packages.Mc+f.packages.Nd+f.packages.Pc+"\\$_]*\\b",l="\\\\(?:x[0-9a-fA-F]{2}|u[0-9a-fA-F]{4}|[0-2][0-7]{0,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.)";this.$rules={start:[{token:"comment",regex:/\/\/.*$/},(new g).getStartRule("doc-start"),{token:"comment",merge:!0,regex:/\/\*/,next:"comment"},{token:"string",regex:"'",next:"qstring"},{token:"string",regex:'"',next:"qqstring"},{token:"constant.numeric",regex:/0[xX][0-9a-fA-F]+\b/},{token:"constant.numeric",regex:/[+-]?\d+(?:(?:\.\d*)?(?:[eE][+-]?\d+)?)?\b/},{token:["storage.type","punctuation.operator","support.function","punctuation.operator","entity.name.function","text","keyword.operator","text","storage.type","text","paren.lparen","variable.parameter","paren.rparen"],regex:"("+k+")(\\.)(prototype)(\\.)("+k+")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"},{token:["storage.type","punctuation.operator","support.function","punctuation.operator","entity.name.function","text","keyword.operator","text"],regex:"("+k+")(\\.)(prototype)(\\.)("+k+")(\\s*)(=)(\\s*)"},{token:["storage.type","punctuation.operator","entity.name.function","text","keyword.operator","text","storage.type","text","paren.lparen","variable.parameter","paren.rparen"],regex:"("+k+")(\\.)("+k+")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"},{token:["entity.name.function","text","keyword.operator","text","storage.type","text","paren.lparen","variable.parameter","paren.rparen"],regex:"("+k+")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"},{token:["storage.type","text","entity.name.function","text","paren.lparen","variable.parameter","paren.rparen"],regex:"(function)(\\s+)("+k+")(\\s*)(\\()(.*?)(\\))"},{token:["entity.name.function","text","punctuation.operator","text","storage.type","text","paren.lparen","variable.parameter","paren.rparen"],regex:"("+k+")(\\s*)(:)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"},{token:["text","text","storage.type","text","paren.lparen","variable.parameter","paren.rparen"],regex:"(:)(\\s*)(function)?(\\s*)(\\()([^)]*)(\\))"},{token:"constant.language.boolean",regex:/(?:true|false)\b/},{token:"keyword",regex:"(?:"+c+")\\b",next:"regex_allowed"},{token:["punctuation.operator","support.function"],regex:/(\.)(s(?:h(?:ift|ow(?:Mod(?:elessDialog|alDialog)|Help))|croll(?:X|By(?:Pages|Lines)?|Y|To)?|t(?:opzzzz|rike)|i(?:n|zeToContent|debar|gnText)|ort|u(?:p|b(?:str(?:ing)?)?)|pli(?:ce|t)|e(?:nd|t(?:Re(?:sizable|questHeader)|M(?:i(?:nutes|lliseconds)|onth)|Seconds|Ho(?:tKeys|urs)|Year|Cursor|Time(?:out)?|Interval|ZOptions|Date|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Date|FullYear)|FullYear|Active)|arch)|qrt|lice|avePreferences|mall)|h(?:ome|andleEvent)|navigate|c(?:har(?:CodeAt|At)|o(?:s|n(?:cat|textual|firm)|mpile)|eil|lear(?:Timeout|Interval)?|a(?:ptureEvents|ll)|reate(?:StyleSheet|Popup|EventObject))|t(?:o(?:GMTString|S(?:tring|ource)|U(?:TCString|pperCase)|Lo(?:caleString|werCase))|est|a(?:n|int(?:Enabled)?))|i(?:s(?:NaN|Finite)|ndexOf|talics)|d(?:isableExternalCapture|ump|etachEvent)|u(?:n(?:shift|taint|escape|watch)|pdateCommands)|j(?:oin|avaEnabled)|p(?:o(?:p|w)|ush|lugins.refresh|a(?:ddings|rse(?:Int|Float)?)|r(?:int|ompt|eference))|e(?:scape|nableExternalCapture|val|lementFromPoint|x(?:p|ec(?:Script|Command)?))|valueOf|UTC|queryCommand(?:State|Indeterm|Enabled|Value)|f(?:i(?:nd|le(?:ModifiedDate|Size|CreatedDate|UpdatedDate)|xed)|o(?:nt(?:size|color)|rward)|loor|romCharCode)|watch|l(?:ink|o(?:ad|g)|astIndexOf)|a(?:sin|nchor|cos|t(?:tachEvent|ob|an(?:2)?)|pply|lert|b(?:s|ort))|r(?:ou(?:nd|teEvents)|e(?:size(?:By|To)|calc|turnValue|place|verse|l(?:oad|ease(?:Capture|Events)))|andom)|g(?:o|et(?:ResponseHeader|M(?:i(?:nutes|lliseconds)|onth)|Se(?:conds|lection)|Hours|Year|Time(?:zoneOffset)?|Da(?:y|te)|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Da(?:y|te)|FullYear)|FullYear|A(?:ttention|llResponseHeaders)))|m(?:in|ove(?:B(?:y|elow)|To(?:Absolute)?|Above)|ergeAttributes|a(?:tch|rgins|x))|b(?:toa|ig|o(?:ld|rderWidths)|link|ack))\b(?=\()/},{token:["punctuation.operator","support.function.dom"],regex:/(\.)(s(?:ub(?:stringData|mit)|plitText|e(?:t(?:NamedItem|Attribute(?:Node)?)|lect))|has(?:ChildNodes|Feature)|namedItem|c(?:l(?:ick|o(?:se|neNode))|reate(?:C(?:omment|DATASection|aption)|T(?:Head|extNode|Foot)|DocumentFragment|ProcessingInstruction|E(?:ntityReference|lement)|Attribute))|tabIndex|i(?:nsert(?:Row|Before|Cell|Data)|tem)|open|delete(?:Row|C(?:ell|aption)|T(?:Head|Foot)|Data)|focus|write(?:ln)?|a(?:dd|ppend(?:Child|Data))|re(?:set|place(?:Child|Data)|move(?:NamedItem|Child|Attribute(?:Node)?)?)|get(?:NamedItem|Element(?:sBy(?:Name|TagName)|ById)|Attribute(?:Node)?)|blur)\b(?=\()/},{token:["punctuation.operator","support.constant"],regex:/(\.)(s(?:ystemLanguage|cr(?:ipts|ollbars|een(?:X|Y|Top|Left))|t(?:yle(?:Sheets)?|atus(?:Text|bar)?)|ibling(?:Below|Above)|ource|uffixes|e(?:curity(?:Policy)?|l(?:ection|f)))|h(?:istory|ost(?:name)?|as(?:h|Focus))|y|X(?:MLDocument|SLDocument)|n(?:ext|ame(?:space(?:s|URI)|Prop))|M(?:IN_VALUE|AX_VALUE)|c(?:haracterSet|o(?:n(?:structor|trollers)|okieEnabled|lorDepth|mp(?:onents|lete))|urrent|puClass|l(?:i(?:p(?:boardData)?|entInformation)|osed|asses)|alle(?:e|r)|rypto)|t(?:o(?:olbar|p)|ext(?:Transform|Indent|Decoration|Align)|ags)|SQRT(?:1_2|2)|i(?:n(?:ner(?:Height|Width)|put)|ds|gnoreCase)|zIndex|o(?:scpu|n(?:readystatechange|Line)|uter(?:Height|Width)|p(?:sProfile|ener)|ffscreenBuffering)|NEGATIVE_INFINITY|d(?:i(?:splay|alog(?:Height|Top|Width|Left|Arguments)|rectories)|e(?:scription|fault(?:Status|Ch(?:ecked|arset)|View)))|u(?:ser(?:Profile|Language|Agent)|n(?:iqueID|defined)|pdateInterval)|_content|p(?:ixelDepth|ort|ersonalbar|kcs11|l(?:ugins|atform)|a(?:thname|dding(?:Right|Bottom|Top|Left)|rent(?:Window|Layer)?|ge(?:X(?:Offset)?|Y(?:Offset)?))|r(?:o(?:to(?:col|type)|duct(?:Sub)?|mpter)|e(?:vious|fix)))|e(?:n(?:coding|abledPlugin)|x(?:ternal|pando)|mbeds)|v(?:isibility|endor(?:Sub)?|Linkcolor)|URLUnencoded|P(?:I|OSITIVE_INFINITY)|f(?:ilename|o(?:nt(?:Size|Family|Weight)|rmName)|rame(?:s|Element)|gColor)|E|whiteSpace|l(?:i(?:stStyleType|n(?:eHeight|kColor))|o(?:ca(?:tion(?:bar)?|lName)|wsrc)|e(?:ngth|ft(?:Context)?)|a(?:st(?:M(?:odified|atch)|Index|Paren)|yer(?:s|X)|nguage))|a(?:pp(?:MinorVersion|Name|Co(?:deName|re)|Version)|vail(?:Height|Top|Width|Left)|ll|r(?:ity|guments)|Linkcolor|bove)|r(?:ight(?:Context)?|e(?:sponse(?:XML|Text)|adyState))|global|x|m(?:imeTypes|ultiline|enubar|argin(?:Right|Bottom|Top|Left))|L(?:N(?:10|2)|OG(?:10E|2E))|b(?:o(?:ttom|rder(?:Width|RightWidth|BottomWidth|Style|Color|TopWidth|LeftWidth))|ufferDepth|elow|ackground(?:Color|Image)))\b/},{token:["storage.type","punctuation.operator","support.function.firebug"],regex:/(console)(\.)(warn|info|log|error|time|timeEnd|assert)\b/},{token:function(c){return a.hasOwnProperty(c)?"variable.language":d.hasOwnProperty(c)?"invalid.deprecated":h.hasOwnProperty(c)?"storage.type":b.hasOwnProperty(c)?"keyword":i.hasOwnProperty(c)?"constant.language":j.hasOwnProperty(c)?"invalid.illegal":c=="debugger"?"invalid.deprecated":"identifier"},regex:k},{token:"keyword.operator",regex:/!|\$|%|&|\*|\-\-|\-|\+\+|\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\|\||\?\:|\*=|%=|\+=|\-=|&=|\^=|\b(?:in|instanceof|new|delete|typeof|void)/,next:"regex_allowed"},{token:"punctuation.operator",regex:/\?|\:|\,|\;|\./,next:"regex_allowed"},{token:"paren.lparen",regex:/[\[({]/,next:"regex_allowed"},{token:"paren.rparen",regex:/[\])}]/},{token:"keyword.operator",regex:/\/=?/,next:"regex_allowed"},{token:"comment",regex:/^#!.*$/},{token:"text",regex:/\s+/}],regex_allowed:[{token:"comment",merge:!0,regex:"\\/\\*",next:"comment_regex_allowed"},{token:"comment",regex:"\\/\\/.*$"},{token:"string.regexp",regex:"\\/",next:"regex",merge:!0},{token:"text",regex:"\\s+"},{token:"empty",regex:"",next:"start"}],regex:[{token:"regexp.keyword.operator",regex:"\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",next:"regex"},{token:"string.regexp",regex:"/\\w*",next:"start",merge:!0},{token:"string.regexp",regex:"[^\\\\/\\[]+",next:"regex",merge:!0},{token:"string.regexp.charachterclass",regex:"\\[",next:"regex_character_class",merge:!0},{token:"empty",regex:"",next:"start"}],regex_character_class:[{token:"regexp.keyword.operator",regex:"\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",next:"regex_character_class"},{token:"string.regexp.charachterclass",regex:"]",next:"regex",merge:!0},{token:"string.regexp.charachterclass",regex:"[^\\\\\\]]+",next:"regex_character_class",merge:!0},{token:"empty",regex:"",next:"start"}],comment_regex_allowed:[{token:"comment",regex:".*?\\*\\/",merge:!0,next:"regex_allowed"},{token:"comment",merge:!0,regex:".+"}],comment:[{token:"comment",regex:".*?\\*\\/",merge:!0,next:"start"},{token:"comment",merge:!0,regex:".+"}],qqstring:[{token:"constant.language.escape",regex:l},{token:"string",regex:'[^"\\\\]+'},{token:"string",regex:'"',next:"start"}],qstring:[{token:"constant.language.escape",regex:l},{token:"string",regex:"[^'\\\\]+"},{token:"string",regex:"'",next:"start"}]},this.embedRules(g,"doc-",[(new g).getEndRule("start")])};d.inherits(i,h),b.JavaScriptHighlightRules=i}),define("ace/mode/doc_comment_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text_highlight_rules").TextHighlightRules,f=function(){this.$rules={start:[{token:"comment.doc.tag",regex:"@[\\w\\d_]+"},{token:"comment.doc",merge:!0,regex:"\\s+"},{token:"comment.doc",merge:!0,regex:"TODO"},{token:"comment.doc",merge:!0,regex:"[^@\\*]+"},{token:"comment.doc",merge:!0,regex:"."}]}};d.inherits(f,e),function(){this.getStartRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\/\\*(?=\\*)",next:a}},this.getEndRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\*\\/",next:a}}}.call(f.prototype),b.DocCommentHighlightRules=f}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../range").Range,e=function(){};(function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}}).call(e.prototype),b.MatchingBraceOutdent=e}),define("ace/mode/behaviour/cstyle",["require","exports","module","ace/lib/oop","ace/mode/behaviour"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../behaviour").Behaviour,f=function(){this.add("braces","insertion",function(a,b,c,d,e){if(e=="{"){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"{"+g+"}",selection:!1}:{text:"{}",selection:[1,1]}}if(e=="}"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var k=d.$findOpeningBracket("}",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}else if(e=="\n"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var l=d.findMatchingBracket({row:h.row,column:h.column+1});if(!l)return null;var m=this.getNextLineIndent(a,i.substring(0,i.length-1),d.getTabString()),n=this.$getIndent(d.doc.getLine(l.row));return{text:"\n"+m+"\n"+n,selection:[1,m.length,1,m.length]}}}}),this.add("braces","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="{"){var g=d.doc.getLine(e.start.row),h=g.substring(e.end.column,e.end.column+1);if(h=="}")return e.end.column++,e}}),this.add("parens","insertion",function(a,b,c,d,e){if(e=="("){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"("+g+")",selection:!1}:{text:"()",selection:[1,1]}}if(e==")"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j==")"){var k=d.$findOpeningBracket(")",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}}),this.add("parens","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="("){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h==")")return e.end.column++,e}}),this.add("string_dquotes","insertion",function(a,b,c,d,e){if(e=='"'||e=="'"){var f=e,g=c.getSelectionRange(),h=d.doc.getTextRange(g);if(h!=="")return{text:f+h+f,selection:!1};var i=c.getCursorPosition(),j=d.doc.getLine(i.row),k=j.substring(i.column-1,i.column);if(k=="\\")return null;var l=d.getTokens(g.start.row,g.start.row)[0].tokens,m=0,n,o=-1;for(var p=0;p<l.length;p++){n=l[p],n.type=="string"?o=-1:o<0&&(o=n.value.indexOf(f));if(n.value.length+m>g.start.column)break;m+=l[p].value.length}if(!n||o<0&&n.type!=="comment"&&(n.type!=="string"||g.start.column!==n.value.length+m-1&&n.value.lastIndexOf(f)===n.value.length-1))return{text:f+f,selection:[1,1]};if(n&&n.type==="string"){var q=j.substring(i.column,i.column+1);if(q==f)return{text:"",selection:[1,1]}}}}),this.add("string_dquotes","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&(f=='"'||f=="'")){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h=='"')return e.end.column++,e}})};d.inherits(f,e),b.CstyleBehaviour=f}),define("ace/mode/folding/cstyle",["require","exports","module","ace/lib/oop","ace/range","ace/mode/folding/fold_mode"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../../range").Range,f=a("./fold_mode").FoldMode,g=b.FoldMode=function(){};d.inherits(g,f),function(){this.foldingStartMarker=/(\{|\[)[^\}\]]*$|^\s*(\/\*)/,this.foldingStopMarker=/^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/,this.getFoldWidgetRange=function(a,b,c){var d=a.getLine(c),f=d.match(this.foldingStartMarker);if(f){var g=f.index;if(f[1])return this.openingBracketBlock(a,f[1],c,g);var h=a.getCommentFoldRange(c,g+f[0].length);return h.end.column-=2,h}if(b!=="markbeginend")return;var f=d.match(this.foldingStopMarker);if(f){var g=f.index+f[0].length;if(f[2]){var h=a.getCommentFoldRange(c,g);return h.end.column-=2,h}var i={row:c,column:g},j=a.$findOpeningBracket(f[1],i);if(!j)return;return j.column++,i.column--,e.fromPoints(j,i)}}}.call(g.prototype)}),define("ace/mode/folding/fold_mode",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../../range").Range,e=b.FoldMode=function(){};(function(){this.foldingStartMarker=null,this.foldingStopMarker=null,this.getFoldWidget=function(a,b,c){var d=a.getLine(c);return this.foldingStartMarker.test(d)?"start":b=="markbeginend"&&this.foldingStopMarker&&this.foldingStopMarker.test(d)?"end":""},this.getFoldWidgetRange=function(a,b,c){return null},this.indentationBlock=function(a,b,c){var e=/^\s*/,f=b,g=b,h=a.getLine(b),i=c||h.length,j=h.match(e)[0].length,k=a.getLength();while(++b<k){h=a.getLine(b);var l=h.match(e)[0].length;if(l==h.length)continue;if(l<=j)break;g=b}if(g>f){var m=a.getLine(g).length;return new d(f,i,g,m)}},this.openingBracketBlock=function(a,b,c,e){var f={row:c,column:e+1},g=a.$findClosingBracket(b,f);if(!g)return;var h=a.foldWidgets[g.row];return h==null&&(h=this.getFoldWidget(a,g.row)),h=="start"&&(g.row--,g.column=a.getLine(g.row).length),d.fromPoints(f,g)}}).call(e.prototype)}),define("ace/mode/java_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/doc_comment_highlight_rules","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("./doc_comment_highlight_rules").DocCommentHighlightRules,g=a("./text_highlight_rules").TextHighlightRules,h=function(){var a=e.arrayToMap("abstract|continue|for|new|switch|assert|default|goto|package|synchronized|boolean|do|if|private|this|break|double|implements|protected|throw|byte|else|import|public|throws|case|enum|instanceof|return|transient|catch|extends|int|short|try|char|final|interface|static|void|class|finally|long|strictfp|volatile|const|float|native|super|while".split("|")),b=e.arrayToMap("null|Infinity|NaN|undefined".split("|")),c=e.arrayToMap("AbstractMethodError|AssertionError|ClassCircularityError|ClassFormatError|Deprecated|EnumConstantNotPresentException|ExceptionInInitializerError|IllegalAccessError|IllegalThreadStateException|InstantiationError|InternalError|NegativeArraySizeException|NoSuchFieldError|Override|Process|ProcessBuilder|SecurityManager|StringIndexOutOfBoundsException|SuppressWarnings|TypeNotPresentException|UnknownError|UnsatisfiedLinkError|UnsupportedClassVersionError|VerifyError|InstantiationException|IndexOutOfBoundsException|ArrayIndexOutOfBoundsException|CloneNotSupportedException|NoSuchFieldException|IllegalArgumentException|NumberFormatException|SecurityException|Void|InheritableThreadLocal|IllegalStateException|InterruptedException|NoSuchMethodException|IllegalAccessException|UnsupportedOperationException|Enum|StrictMath|Package|Compiler|Readable|Runtime|StringBuilder|Math|IncompatibleClassChangeError|NoSuchMethodError|ThreadLocal|RuntimePermission|ArithmeticException|NullPointerException|Long|Integer|Short|Byte|Double|Number|Float|Character|Boolean|StackTraceElement|Appendable|StringBuffer|Iterable|ThreadGroup|Runnable|Thread|IllegalMonitorStateException|StackOverflowError|OutOfMemoryError|VirtualMachineError|ArrayStoreException|ClassCastException|LinkageError|NoClassDefFoundError|ClassNotFoundException|RuntimeException|Exception|ThreadDeath|Error|Throwable|System|ClassLoader|Cloneable|Class|CharSequence|Comparable|String|Object".split("|")),d=e.arrayToMap("".split("|"));this.$rules={start:[{token:"comment",regex:"\\/\\/.*$"},(new f).getStartRule("doc-start"),{token:"comment",merge:!0,regex:"\\/\\*",next:"comment"},{token:"string.regexp",regex:"[/](?:(?:\\[(?:\\\\]|[^\\]])+\\])|(?:\\\\/|[^\\]/]))*[/]\\w*\\s*(?=[).,;]|$)"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:"constant.numeric",regex:"0[xX][0-9a-fA-F]+\\b"},{token:"constant.numeric",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:"constant.language.boolean",regex:"(?:true|false)\\b"},{token:function(e){return e=="this"?"variable.language":a.hasOwnProperty(e)?"keyword":c.hasOwnProperty(e)?"support.function":d.hasOwnProperty(e)?"support.function":b.hasOwnProperty(e)?"constant.language":"identifier"},regex:"[a-zA-Z_$][a-zA-Z0-9_$]*\\b"},{token:"keyword.operator",regex:"!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)"},{token:"lparen",regex:"[[({]"},{token:"rparen",regex:"[\\])}]"},{token:"text",regex:"\\s+"}],comment:[{token:"comment",regex:".*?\\*\\/",next:"start"},{token:"comment",merge:!0,regex:".+"}]},this.embedRules(f,"doc-",[(new f).getEndRule("start")])};d.inherits(h,g),b.JavaHighlightRules=h})
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-javascript-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-javascript-uncompressed.js
deleted file mode 100644
index 8afe93503a..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-javascript-uncompressed.js
+++ /dev/null
@@ -1,1203 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/javascript', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/javascript_highlight_rules', 'ace/mode/matching_brace_outdent', 'ace/range', 'ace/worker/worker_client', 'ace/mode/behaviour/cstyle', 'ace/mode/folding/cstyle'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
-var JavaScriptHighlightRules = require("./javascript_highlight_rules").JavaScriptHighlightRules;
-var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
-var Range = require("../range").Range;
-var WorkerClient = require("../worker/worker_client").WorkerClient;
-var CstyleBehaviour = require("./behaviour/cstyle").CstyleBehaviour;
-var CStyleFoldMode = require("./folding/cstyle").FoldMode;
-
-var Mode = function() {
-    this.$tokenizer = new Tokenizer(new JavaScriptHighlightRules().getRules());
-    this.$outdent = new MatchingBraceOutdent();
-    this.$behaviour = new CstyleBehaviour();
-    this.foldingRules = new CStyleFoldMode();
-};
-oop.inherits(Mode, TextMode);
-
-(function() {
-
-
-    this.toggleCommentLines = function(state, doc, startRow, endRow) {
-        var outdent = true;
-        var re = /^(\s*)\/\//;
-
-        for (var i=startRow; i<= endRow; i++) {
-            if (!re.test(doc.getLine(i))) {
-                outdent = false;
-                break;
-            }
-        }
-
-        if (outdent) {
-            var deleteRange = new Range(0, 0, 0, 0);
-            for (var i=startRow; i<= endRow; i++)
-            {
-                var line = doc.getLine(i);
-                var m = line.match(re);
-                deleteRange.start.row = i;
-                deleteRange.end.row = i;
-                deleteRange.end.column = m[0].length;
-                doc.replace(deleteRange, m[1]);
-            }
-        }
-        else {
-            doc.indentRows(startRow, endRow, "//");
-        }
-    };
-
-    this.getNextLineIndent = function(state, line, tab) {
-        var indent = this.$getIndent(line);
-
-        var tokenizedLine = this.$tokenizer.getLineTokens(line, state);
-        var tokens = tokenizedLine.tokens;
-        var endState = tokenizedLine.state;
-
-        if (tokens.length && tokens[tokens.length-1].type == "comment") {
-            return indent;
-        }
-        
-        if (state == "start" || state == "regex_allowed") {
-            var match = line.match(/^.*(?:\bcase\b.*\:|[\{\(\[])\s*$/);
-            if (match) {
-                indent += tab;
-            }
-        } else if (state == "doc-start") {
-            if (endState == "start" || state == "regex_allowed") {
-                return "";
-            }
-            var match = line.match(/^\s*(\/?)\*/);
-            if (match) {
-                if (match[1]) {
-                    indent += " ";
-                }
-                indent += "* ";
-            }
-        }
-
-        return indent;
-    };
-
-    this.checkOutdent = function(state, line, input) {
-        return this.$outdent.checkOutdent(line, input);
-    };
-
-    this.autoOutdent = function(state, doc, row) {
-        this.$outdent.autoOutdent(doc, row);
-    };
-    
-    this.createWorker = function(session) {
-        var worker = new WorkerClient(["ace"], "worker-javascript.js", "ace/mode/javascript_worker", "JavaScriptWorker");
-        worker.attachToDocument(session.getDocument());
-            
-        worker.on("jslint", function(results) {
-            var errors = [];
-            for (var i=0; i<results.data.length; i++) {
-                var error = results.data[i];
-                if (error)
-                    errors.push({
-                        row: error.line-1,
-                        column: error.character-1,
-                        text: error.reason,
-                        type: "warning",
-                        lint: error
-                    });
-            }
-            session.setAnnotations(errors);
-        });
-        
-        worker.on("narcissus", function(e) {
-            session.setAnnotations([e.data]);
-        });
-        
-        worker.on("terminate", function() {
-            session.clearAnnotations();
-        });
-        
-        return worker;
-    };
-
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Mihai Sucan <mihai DOT sucan AT gmail DOT com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/javascript_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/unicode', 'ace/mode/doc_comment_highlight_rules', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var lang = require("../lib/lang");
-var unicode = require("../unicode");
-var DocCommentHighlightRules = require("./doc_comment_highlight_rules").DocCommentHighlightRules;
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var JavaScriptHighlightRules = function() {
-
-    // see: https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects
-    var globals = lang.arrayToMap(
-      // Constructors
-        ("Array|Boolean|Date|Function|Iterator|Number|Object|RegExp|String|Proxy|" +
-      // E4X
-         "Namespace|QName|XML|XMLList|" +
-         "ArrayBuffer|Float32Array|Float64Array|Int16Array|Int32Array|Int8Array|" +
-         "Uint16Array|Uint32Array|Uint8Array|Uint8ClampedArray|" +
-      // Errors
-        "Error|EvalError|InternalError|RangeError|ReferenceError|StopIteration|" +
-        "SyntaxError|TypeError|URIError|" +
-      //  Non-constructor functions
-        "decodeURI|decodeURIComponent|encodeURI|encodeURIComponent|eval|isFinite|" +
-        "isNaN|parseFloat|parseInt|" +
-      // Other
-        "JSON|Math|" +
-      // Pseudo
-        "this|arguments|prototype|window|document"
-      ).split("|")
-    );
-
-    var keywords = lang.arrayToMap(
-        ("break|case|catch|continue|default|delete|do|else|finally|for|function|" +
-        "if|in|instanceof|new|return|switch|throw|try|typeof|let|var|while|with|" +
-        "const|yield|import|get|set").split("|")
-    );
-
-    // keywords which can be followed by regular expressions
-    var kwBeforeRe = "case|do|else|finally|in|instanceof|return|throw|try|typeof|yield";
-
-    var deprecated = lang.arrayToMap(
-        ("__parent__|__count__|escape|unescape|with|__proto__").split("|")
-    );
-
-    var definitions = lang.arrayToMap(("const|let|var|function").split("|"));
-
-    var buildinConstants = lang.arrayToMap(
-        ("null|Infinity|NaN|undefined").split("|")
-    );
-
-    var futureReserved = lang.arrayToMap(
-        ("class|enum|extends|super|export|implements|private|" +
-        "public|interface|package|protected|static").split("|")
-    );
-
-    // TODO: Unicode escape sequences
-    var identifierRe = "[" + unicode.packages.L + "\\$_]["
-        + unicode.packages.L
-        + unicode.packages.Mn + unicode.packages.Mc
-        + unicode.packages.Nd
-        + unicode.packages.Pc + "\\$_]*\\b";
-
-    var escapedRe = "\\\\(?:x[0-9a-fA-F]{2}|" + // hex
-        "u[0-9a-fA-F]{4}|" + // unicode
-        "[0-2][0-7]{0,2}|" + // oct
-        "3[0-6][0-7]?|" + // oct
-        "37[0-7]?|" + // oct
-        "[4-7][0-7]?|" + //oct
-        ".)";
-
-    // regexp must not have capturing parentheses. Use (?:) instead.
-    // regexps are ordered -> the first match is used
-
-    this.$rules = {
-        "start" : [
-            {
-                token : "comment",
-                regex : /\/\/.*$/
-            },
-            new DocCommentHighlightRules().getStartRule("doc-start"),
-            {
-                token : "comment", // multi line comment
-                merge : true,
-                regex : /\/\*/,
-                next : "comment"
-            }, {
-                token : "string",
-                regex : "'",
-                next  : "qstring"
-            }, {
-                token : "string",
-                regex : '"',
-                next  : "qqstring"
-            }, {
-                token : "constant.numeric", // hex
-                regex : /0[xX][0-9a-fA-F]+\b/
-            }, {
-                token : "constant.numeric", // float
-                regex : /[+-]?\d+(?:(?:\.\d*)?(?:[eE][+-]?\d+)?)?\b/
-            }, { // match stuff like: Sound.prototype.play = function() { }
-                token : [
-                    "storage.type",
-                    "punctuation.operator",
-                    "support.function",
-                    "punctuation.operator",
-                    "entity.name.function",
-                    "text",
-                    "keyword.operator",
-                    "text",
-                    "storage.type",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(" + identifierRe + ")(\\.)(prototype)(\\.)(" + identifierRe +")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"
-            }, { // match stuff like: Sound.prototype.play = myfunc
-                token : [
-                    "storage.type",
-                    "punctuation.operator",
-                    "support.function",
-                    "punctuation.operator",
-                    "entity.name.function",
-                    "text",
-                    "keyword.operator",
-                    "text"
-                ],
-                regex : "(" + identifierRe + ")(\\.)(prototype)(\\.)(" + identifierRe +")(\\s*)(=)(\\s*)"
-            }, { // match stuff like: Sound.play = function() {  }
-                token : [
-                    "storage.type",
-                    "punctuation.operator",
-                    "entity.name.function",
-                    "text",
-                    "keyword.operator",
-                    "text",
-                    "storage.type",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(" + identifierRe + ")(\\.)(" + identifierRe +")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"
-            }, { // match stuff like: play = function() {  }
-                token : [
-                    "entity.name.function",
-                    "text",
-                    "keyword.operator",
-                    "text",
-                    "storage.type",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(" + identifierRe +")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"
-            }, { // match regular function like: function myFunc(arg) { }
-                token : [
-                    "storage.type",
-                    "text",
-                    "entity.name.function",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(function)(\\s+)(" + identifierRe + ")(\\s*)(\\()(.*?)(\\))"
-            }, { // match stuff like: foobar: function() { }
-                token : [
-                    "entity.name.function",
-                    "text",
-                    "punctuation.operator",
-                    "text",
-                    "storage.type",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(" + identifierRe + ")(\\s*)(:)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"
-            }, { // Attempt to match : function() { } (this is for issues with 'foo': function() { })
-                token : [
-                    "text",
-                    "text",
-                    "storage.type",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(:)(\\s*)(function)?(\\s*)(\\()([^)]*)(\\))"
-            }, {
-                token : "constant.language.boolean",
-                regex : /(?:true|false)\b/
-            }, {
-                token : "keyword",
-                regex : "(?:" + kwBeforeRe + ")\\b",
-                next : "regex_allowed"
-            }, {
-                token : ["punctuation.operator", "support.function"],
-                regex : /(\.)(s(?:h(?:ift|ow(?:Mod(?:elessDialog|alDialog)|Help))|croll(?:X|By(?:Pages|Lines)?|Y|To)?|t(?:opzzzz|rike)|i(?:n|zeToContent|debar|gnText)|ort|u(?:p|b(?:str(?:ing)?)?)|pli(?:ce|t)|e(?:nd|t(?:Re(?:sizable|questHeader)|M(?:i(?:nutes|lliseconds)|onth)|Seconds|Ho(?:tKeys|urs)|Year|Cursor|Time(?:out)?|Interval|ZOptions|Date|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Date|FullYear)|FullYear|Active)|arch)|qrt|lice|avePreferences|mall)|h(?:ome|andleEvent)|navigate|c(?:har(?:CodeAt|At)|o(?:s|n(?:cat|textual|firm)|mpile)|eil|lear(?:Timeout|Interval)?|a(?:ptureEvents|ll)|reate(?:StyleSheet|Popup|EventObject))|t(?:o(?:GMTString|S(?:tring|ource)|U(?:TCString|pperCase)|Lo(?:caleString|werCase))|est|a(?:n|int(?:Enabled)?))|i(?:s(?:NaN|Finite)|ndexOf|talics)|d(?:isableExternalCapture|ump|etachEvent)|u(?:n(?:shift|taint|escape|watch)|pdateCommands)|j(?:oin|avaEnabled)|p(?:o(?:p|w)|ush|lugins.refresh|a(?:ddings|rse(?:Int|Float)?)|r(?:int|ompt|eference))|e(?:scape|nableExternalCapture|val|lementFromPoint|x(?:p|ec(?:Script|Command)?))|valueOf|UTC|queryCommand(?:State|Indeterm|Enabled|Value)|f(?:i(?:nd|le(?:ModifiedDate|Size|CreatedDate|UpdatedDate)|xed)|o(?:nt(?:size|color)|rward)|loor|romCharCode)|watch|l(?:ink|o(?:ad|g)|astIndexOf)|a(?:sin|nchor|cos|t(?:tachEvent|ob|an(?:2)?)|pply|lert|b(?:s|ort))|r(?:ou(?:nd|teEvents)|e(?:size(?:By|To)|calc|turnValue|place|verse|l(?:oad|ease(?:Capture|Events)))|andom)|g(?:o|et(?:ResponseHeader|M(?:i(?:nutes|lliseconds)|onth)|Se(?:conds|lection)|Hours|Year|Time(?:zoneOffset)?|Da(?:y|te)|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Da(?:y|te)|FullYear)|FullYear|A(?:ttention|llResponseHeaders)))|m(?:in|ove(?:B(?:y|elow)|To(?:Absolute)?|Above)|ergeAttributes|a(?:tch|rgins|x))|b(?:toa|ig|o(?:ld|rderWidths)|link|ack))\b(?=\()/
-            }, {
-                token : ["punctuation.operator", "support.function.dom"],
-                regex : /(\.)(s(?:ub(?:stringData|mit)|plitText|e(?:t(?:NamedItem|Attribute(?:Node)?)|lect))|has(?:ChildNodes|Feature)|namedItem|c(?:l(?:ick|o(?:se|neNode))|reate(?:C(?:omment|DATASection|aption)|T(?:Head|extNode|Foot)|DocumentFragment|ProcessingInstruction|E(?:ntityReference|lement)|Attribute))|tabIndex|i(?:nsert(?:Row|Before|Cell|Data)|tem)|open|delete(?:Row|C(?:ell|aption)|T(?:Head|Foot)|Data)|focus|write(?:ln)?|a(?:dd|ppend(?:Child|Data))|re(?:set|place(?:Child|Data)|move(?:NamedItem|Child|Attribute(?:Node)?)?)|get(?:NamedItem|Element(?:sBy(?:Name|TagName)|ById)|Attribute(?:Node)?)|blur)\b(?=\()/
-            }, {
-                token : ["punctuation.operator", "support.constant"],
-                regex : /(\.)(s(?:ystemLanguage|cr(?:ipts|ollbars|een(?:X|Y|Top|Left))|t(?:yle(?:Sheets)?|atus(?:Text|bar)?)|ibling(?:Below|Above)|ource|uffixes|e(?:curity(?:Policy)?|l(?:ection|f)))|h(?:istory|ost(?:name)?|as(?:h|Focus))|y|X(?:MLDocument|SLDocument)|n(?:ext|ame(?:space(?:s|URI)|Prop))|M(?:IN_VALUE|AX_VALUE)|c(?:haracterSet|o(?:n(?:structor|trollers)|okieEnabled|lorDepth|mp(?:onents|lete))|urrent|puClass|l(?:i(?:p(?:boardData)?|entInformation)|osed|asses)|alle(?:e|r)|rypto)|t(?:o(?:olbar|p)|ext(?:Transform|Indent|Decoration|Align)|ags)|SQRT(?:1_2|2)|i(?:n(?:ner(?:Height|Width)|put)|ds|gnoreCase)|zIndex|o(?:scpu|n(?:readystatechange|Line)|uter(?:Height|Width)|p(?:sProfile|ener)|ffscreenBuffering)|NEGATIVE_INFINITY|d(?:i(?:splay|alog(?:Height|Top|Width|Left|Arguments)|rectories)|e(?:scription|fault(?:Status|Ch(?:ecked|arset)|View)))|u(?:ser(?:Profile|Language|Agent)|n(?:iqueID|defined)|pdateInterval)|_content|p(?:ixelDepth|ort|ersonalbar|kcs11|l(?:ugins|atform)|a(?:thname|dding(?:Right|Bottom|Top|Left)|rent(?:Window|Layer)?|ge(?:X(?:Offset)?|Y(?:Offset)?))|r(?:o(?:to(?:col|type)|duct(?:Sub)?|mpter)|e(?:vious|fix)))|e(?:n(?:coding|abledPlugin)|x(?:ternal|pando)|mbeds)|v(?:isibility|endor(?:Sub)?|Linkcolor)|URLUnencoded|P(?:I|OSITIVE_INFINITY)|f(?:ilename|o(?:nt(?:Size|Family|Weight)|rmName)|rame(?:s|Element)|gColor)|E|whiteSpace|l(?:i(?:stStyleType|n(?:eHeight|kColor))|o(?:ca(?:tion(?:bar)?|lName)|wsrc)|e(?:ngth|ft(?:Context)?)|a(?:st(?:M(?:odified|atch)|Index|Paren)|yer(?:s|X)|nguage))|a(?:pp(?:MinorVersion|Name|Co(?:deName|re)|Version)|vail(?:Height|Top|Width|Left)|ll|r(?:ity|guments)|Linkcolor|bove)|r(?:ight(?:Context)?|e(?:sponse(?:XML|Text)|adyState))|global|x|m(?:imeTypes|ultiline|enubar|argin(?:Right|Bottom|Top|Left))|L(?:N(?:10|2)|OG(?:10E|2E))|b(?:o(?:ttom|rder(?:Width|RightWidth|BottomWidth|Style|Color|TopWidth|LeftWidth))|ufferDepth|elow|ackground(?:Color|Image)))\b/
-            }, {
-                token : ["storage.type", "punctuation.operator", "support.function.firebug"],
-                regex : /(console)(\.)(warn|info|log|error|time|timeEnd|assert)\b/
-            }, {
-                token : function(value) {
-                    if (globals.hasOwnProperty(value))
-                        return "variable.language";
-                    else if (deprecated.hasOwnProperty(value))
-                        return "invalid.deprecated";
-                    else if (definitions.hasOwnProperty(value))
-                        return "storage.type";
-                    else if (keywords.hasOwnProperty(value))
-                        return "keyword";
-                    else if (buildinConstants.hasOwnProperty(value))
-                        return "constant.language";
-                    else if (futureReserved.hasOwnProperty(value))
-                        return "invalid.illegal";
-                    else if (value == "debugger")
-                        return "invalid.deprecated";
-                    else
-                        return "identifier";
-                },
-                regex : identifierRe
-            }, {
-                token : "keyword.operator",
-                regex : /!|\$|%|&|\*|\-\-|\-|\+\+|\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\|\||\?\:|\*=|%=|\+=|\-=|&=|\^=|\b(?:in|instanceof|new|delete|typeof|void)/,
-                next  : "regex_allowed"
-            }, {
-                token : "punctuation.operator",
-                regex : /\?|\:|\,|\;|\./,
-                next  : "regex_allowed"
-            }, {
-                token : "paren.lparen",
-                regex : /[\[({]/,
-                next  : "regex_allowed"
-            }, {
-                token : "paren.rparen",
-                regex : /[\])}]/
-            }, {
-                token : "keyword.operator",
-                regex : /\/=?/,
-                next  : "regex_allowed"
-            }, {
-                token: "comment",
-                regex: /^#!.*$/
-            }, {
-                token : "text",
-                regex : /\s+/
-            }
-        ],
-        // regular expressions are only allowed after certain tokens. This
-        // makes sure we don't mix up regexps with the divison operator
-        "regex_allowed": [
-            {
-                token : "comment", // multi line comment
-                merge : true,
-                regex : "\\/\\*",
-                next : "comment_regex_allowed"
-            }, {
-                token : "comment",
-                regex : "\\/\\/.*$"
-            }, {
-                token: "string.regexp",
-                regex: "\\/",
-                next: "regex",
-                merge: true
-            }, {
-                token : "text",
-                regex : "\\s+"
-            }, {
-                // immediately return to the start mode without matching
-                // anything
-                token: "empty",
-                regex: "",
-                next: "start"
-            }
-        ],
-        "regex": [
-            {
-                token: "regexp.keyword.operator",
-                regex: "\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",
-                next: "regex"
-            }, {
-				// flag
-                token: "string.regexp",
-                regex: "/\\w*",
-                next: "start",
-                merge: true
-            }, {
-                token: "string.regexp",
-                regex: "[^\\\\/\\[]+",
-                next: "regex",
-                merge: true
-            }, {
-                token: "string.regexp.charachterclass",
-                regex: "\\[",
-                next: "regex_character_class",
-                merge: true
-            }, {
-                token: "empty",
-                regex: "",
-                next: "start"
-            }
-        ],
-        "regex_character_class": [
-            {
-                token: "regexp.keyword.operator",
-                regex: "\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",
-                next: "regex_character_class"
-            }, {
-                token: "string.regexp.charachterclass",
-                regex: "]",
-                next: "regex",
-                merge: true
-            }, {
-                token: "string.regexp.charachterclass",
-                regex: "[^\\\\\\]]+",
-                next: "regex_character_class",
-                merge: true
-            }, {
-                token: "empty",
-                regex: "",
-                next: "start"
-            }
-        ],
-        "comment_regex_allowed" : [
-            {
-                token : "comment", // closing comment
-                regex : ".*?\\*\\/",
-                merge : true,
-                next : "regex_allowed"
-            }, {
-                token : "comment", // comment spanning whole line
-                merge : true,
-                regex : ".+"
-            }
-        ],
-        "comment" : [
-            {
-                token : "comment", // closing comment
-                regex : ".*?\\*\\/",
-                merge : true,
-                next : "start"
-            }, {
-                token : "comment", // comment spanning whole line
-                merge : true,
-                regex : ".+"
-            }
-        ],
-        "qqstring" : [
-            {
-                token : "constant.language.escape",
-                regex : escapedRe
-            }, {
-                token : "string",
-                regex : '[^"\\\\]+'
-            }, {
-                token : "string",
-                regex : '"',
-                next  : "start"
-            }
-        ],
-        "qstring" : [
-            {
-                token : "constant.language.escape",
-                regex : escapedRe
-            }, {
-                token : "string",
-                regex : "[^'\\\\]+"
-            }, {
-                token : "string",
-                regex : "'",
-                next  : "start"
-            }
-        ]
-    };
-
-    this.embedRules(DocCommentHighlightRules, "doc-",
-        [ new DocCommentHighlightRules().getEndRule("start") ]);
-};
-
-oop.inherits(JavaScriptHighlightRules, TextHighlightRules);
-
-exports.JavaScriptHighlightRules = JavaScriptHighlightRules;
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/doc_comment_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var DocCommentHighlightRules = function() {
-
-    this.$rules = {
-        "start" : [ {
-            token : "comment.doc.tag",
-            regex : "@[\\w\\d_]+" // TODO: fix email addresses
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "\\s+"
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "TODO"
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "[^@\\*]+"
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "."
-        }]
-    };
-};
-
-oop.inherits(DocCommentHighlightRules, TextHighlightRules);
-
-(function() {
-
-    this.getStartRule = function(start) {
-        return {
-            token : "comment.doc", // doc comment
-            merge : true,
-            regex : "\\/\\*(?=\\*)",
-            next  : start
-        };
-    };
-    
-    this.getEndRule = function (start) {
-        return {
-            token : "comment.doc", // closing comment
-            merge : true,
-            regex : "\\*\\/",
-            next  : start
-        };
-    };
-
-}).call(DocCommentHighlightRules.prototype);
-
-exports.DocCommentHighlightRules = DocCommentHighlightRules;
-
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/matching_brace_outdent', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../range").Range;
-
-var MatchingBraceOutdent = function() {};
-
-(function() {
-
-    this.checkOutdent = function(line, input) {
-        if (! /^\s+$/.test(line))
-            return false;
-
-        return /^\s*\}/.test(input);
-    };
-
-    this.autoOutdent = function(doc, row) {
-        var line = doc.getLine(row);
-        var match = line.match(/^(\s*\})/);
-
-        if (!match) return 0;
-
-        var column = match[1].length;
-        var openBracePos = doc.findMatchingBracket({row: row, column: column});
-
-        if (!openBracePos || openBracePos.row == row) return 0;
-
-        var indent = this.$getIndent(doc.getLine(openBracePos.row));
-        doc.replace(new Range(row, 0, row, column-1), indent);
-    };
-
-    this.$getIndent = function(line) {
-        var match = line.match(/^(\s+)/);
-        if (match) {
-            return match[1];
-        }
-
-        return "";
-    };
-
-}).call(MatchingBraceOutdent.prototype);
-
-exports.MatchingBraceOutdent = MatchingBraceOutdent;
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Chris Spencer <chris.ag.spencer AT googlemail DOT com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/behaviour/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/behaviour'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var Behaviour = require('../behaviour').Behaviour;
-
-var CstyleBehaviour = function () {
-
-    this.add("braces", "insertion", function (state, action, editor, session, text) {
-        if (text == '{') {
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: '{' + selected + '}',
-                    selection: false
-                };
-            } else {
-                return {
-                    text: '{}',
-                    selection: [1, 1]
-                };
-            }
-        } else if (text == '}') {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == '}') {
-                var matching = session.$findOpeningBracket('}', {column: cursor.column + 1, row: cursor.row});
-                if (matching !== null) {
-                    return {
-                        text: '',
-                        selection: [1, 1]
-                    };
-                }
-            }
-        } else if (text == "\n") {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == '}') {
-                var openBracePos = session.findMatchingBracket({row: cursor.row, column: cursor.column + 1});
-                if (!openBracePos)
-                     return null;
-
-                var indent = this.getNextLineIndent(state, line.substring(0, line.length - 1), session.getTabString());
-                var next_indent = this.$getIndent(session.doc.getLine(openBracePos.row));
-
-                return {
-                    text: '\n' + indent + '\n' + next_indent,
-                    selection: [1, indent.length, 1, indent.length]
-                };
-            }
-        }
-    });
-
-    this.add("braces", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && selected == '{') {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.end.column, range.end.column + 1);
-            if (rightChar == '}') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-    this.add("parens", "insertion", function (state, action, editor, session, text) {
-        if (text == '(') {
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: '(' + selected + ')',
-                    selection: false
-                };
-            } else {
-                return {
-                    text: '()',
-                    selection: [1, 1]
-                };
-            }
-        } else if (text == ')') {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == ')') {
-                var matching = session.$findOpeningBracket(')', {column: cursor.column + 1, row: cursor.row});
-                if (matching !== null) {
-                    return {
-                        text: '',
-                        selection: [1, 1]
-                    };
-                }
-            }
-        }
-    });
-
-    this.add("parens", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && selected == '(') {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
-            if (rightChar == ')') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-    this.add("string_dquotes", "insertion", function (state, action, editor, session, text) {
-        if (text == '"' || text == "'") {
-            var quote = text;
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: quote + selected + quote,
-                    selection: false
-                };
-            } else {
-                var cursor = editor.getCursorPosition();
-                var line = session.doc.getLine(cursor.row);
-                var leftChar = line.substring(cursor.column-1, cursor.column);
-
-                // We're escaped.
-                if (leftChar == '\\') {
-                    return null;
-                }
-
-                // Find what token we're inside.
-                var tokens = session.getTokens(selection.start.row, selection.start.row)[0].tokens;
-                var col = 0, token;
-                var quotepos = -1; // Track whether we're inside an open quote.
-
-                for (var x = 0; x < tokens.length; x++) {
-                    token = tokens[x];
-                    if (token.type == "string") {
-                      quotepos = -1;
-                    } else if (quotepos < 0) {
-                      quotepos = token.value.indexOf(quote);
-                    }
-                    if ((token.value.length + col) > selection.start.column) {
-                        break;
-                    }
-                    col += tokens[x].value.length;
-                }
-
-                // Try and be smart about when we auto insert.
-                if (!token || (quotepos < 0 && token.type !== "comment" && (token.type !== "string" || ((selection.start.column !== token.value.length+col-1) && token.value.lastIndexOf(quote) === token.value.length-1)))) {
-                    return {
-                        text: quote + quote,
-                        selection: [1,1]
-                    };
-                } else if (token && token.type === "string") {
-                    // Ignore input and move right one if we're typing over the closing quote.
-                    var rightChar = line.substring(cursor.column, cursor.column + 1);
-                    if (rightChar == quote) {
-                        return {
-                            text: '',
-                            selection: [1, 1]
-                        };
-                    }
-                }
-            }
-        }
-    });
-
-    this.add("string_dquotes", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && (selected == '"' || selected == "'")) {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
-            if (rightChar == '"') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-};
-
-oop.inherits(CstyleBehaviour, Behaviour);
-
-exports.CstyleBehaviour = CstyleBehaviour;
-});/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/folding/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/range', 'ace/mode/folding/fold_mode'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var Range = require("../../range").Range;
-var BaseFoldMode = require("./fold_mode").FoldMode;
-
-var FoldMode = exports.FoldMode = function() {};
-oop.inherits(FoldMode, BaseFoldMode);
-
-(function() {
-
-    this.foldingStartMarker = /(\{|\[)[^\}\]]*$|^\s*(\/\*)/;
-    this.foldingStopMarker = /^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/;
-    
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        var line = session.getLine(row);
-        var match = line.match(this.foldingStartMarker);
-        if (match) {
-            var i = match.index;
-
-            if (match[1])
-                return this.openingBracketBlock(session, match[1], row, i);
-
-            var range = session.getCommentFoldRange(row, i + match[0].length);
-            range.end.column -= 2;
-            return range;
-        }
-
-        if (foldStyle !== "markbeginend")
-            return;
-            
-        var match = line.match(this.foldingStopMarker);
-        if (match) {
-            var i = match.index + match[0].length;
-
-            if (match[2]) {
-                var range = session.getCommentFoldRange(row, i);
-                range.end.column -= 2;
-                return range;
-            }
-
-            var end = {row: row, column: i};
-            var start = session.$findOpeningBracket(match[1], end);
-            
-            if (!start)
-                return;
-
-            start.column++;
-            end.column--;
-
-            return  Range.fromPoints(start, end);
-        }
-    };
-    
-}).call(FoldMode.prototype);
-
-});/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/folding/fold_mode', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../../range").Range;
-
-var FoldMode = exports.FoldMode = function() {};
-
-(function() {
-
-    this.foldingStartMarker = null;
-    this.foldingStopMarker = null;
-
-    // must return "" if there's no fold, to enable caching
-    this.getFoldWidget = function(session, foldStyle, row) {
-        var line = session.getLine(row);
-        if (this.foldingStartMarker.test(line))
-            return "start";
-        if (foldStyle == "markbeginend"
-                && this.foldingStopMarker
-                && this.foldingStopMarker.test(line))
-            return "end";
-        return "";
-    };
-    
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        return null;
-    };
-
-    this.indentationBlock = function(session, row, column) {
-        var re = /^\s*/;
-        var startRow = row;
-        var endRow = row;
-        var line = session.getLine(row);
-        var startColumn = column || line.length;
-        var startLevel = line.match(re)[0].length;
-        var maxRow = session.getLength()
-        
-        while (++row < maxRow) {
-            line = session.getLine(row);
-            var level = line.match(re)[0].length;
-
-            if (level == line.length)
-                continue;
-
-            if (level <= startLevel)
-                break;
-
-            endRow = row;
-        }
-
-        if (endRow > startRow) {
-            var endColumn = session.getLine(endRow).length;
-            return new Range(startRow, startColumn, endRow, endColumn);
-        }
-    };
-
-    this.openingBracketBlock = function(session, bracket, row, column) {
-        var start = {row: row, column: column + 1};
-        var end = session.$findClosingBracket(bracket, start);
-        if (!end)
-            return;
-
-        var fw = session.foldWidgets[end.row];
-        if (fw == null)
-            fw = this.getFoldWidget(session, end.row);
-
-        if (fw == "start") {
-            end.row --;
-            end.column = session.getLine(end.row).length;
-        }
-        return Range.fromPoints(start, end);
-    };
-
-}).call(FoldMode.prototype);
-
-});
diff --git a/apps/files_texteditor/js/aceeditor/mode-javascript.js b/apps/files_texteditor/js/aceeditor/mode-javascript.js
deleted file mode 100644
index a456dad386..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-javascript.js
+++ /dev/null
@@ -1 +0,0 @@
-define("ace/mode/javascript",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/javascript_highlight_rules","ace/mode/matching_brace_outdent","ace/range","ace/worker/worker_client","ace/mode/behaviour/cstyle","ace/mode/folding/cstyle"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./javascript_highlight_rules").JavaScriptHighlightRules,h=a("./matching_brace_outdent").MatchingBraceOutdent,i=a("../range").Range,j=a("../worker/worker_client").WorkerClient,k=a("./behaviour/cstyle").CstyleBehaviour,l=a("./folding/cstyle").FoldMode,m=function(){this.$tokenizer=new f((new g).getRules()),this.$outdent=new h,this.$behaviour=new k,this.foldingRules=new l};d.inherits(m,e),function(){this.toggleCommentLines=function(a,b,c,d){var e=!0,f=/^(\s*)\/\//;for(var g=c;g<=d;g++)if(!f.test(b.getLine(g))){e=!1;break}if(e){var h=new i(0,0,0,0);for(var g=c;g<=d;g++){var j=b.getLine(g),k=j.match(f);h.start.row=g,h.end.row=g,h.end.column=k[0].length,b.replace(h,k[1])}}else b.indentRows(c,d,"//")},this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a),f=e.tokens,g=e.state;if(f.length&&f[f.length-1].type=="comment")return d;if(a=="start"||a=="regex_allowed"){var h=b.match(/^.*(?:\bcase\b.*\:|[\{\(\[])\s*$/);h&&(d+=c)}else if(a=="doc-start"){if(g=="start"||a=="regex_allowed")return"";var h=b.match(/^\s*(\/?)\*/);h&&(h[1]&&(d+=" "),d+="* ")}return d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)},this.createWorker=function(a){var b=new j(["ace"],"worker-javascript.js","ace/mode/javascript_worker","JavaScriptWorker");return b.attachToDocument(a.getDocument()),b.on("jslint",function(b){var c=[];for(var d=0;d<b.data.length;d++){var e=b.data[d];e&&c.push({row:e.line-1,column:e.character-1,text:e.reason,type:"warning",lint:e})}a.setAnnotations(c)}),b.on("narcissus",function(b){a.setAnnotations([b.data])}),b.on("terminate",function(){a.clearAnnotations()}),b}}.call(m.prototype),b.Mode=m}),define("ace/mode/javascript_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/unicode","ace/mode/doc_comment_highlight_rules","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("../unicode"),g=a("./doc_comment_highlight_rules").DocCommentHighlightRules,h=a("./text_highlight_rules").TextHighlightRules,i=function(){var a=e.arrayToMap("Array|Boolean|Date|Function|Iterator|Number|Object|RegExp|String|Proxy|Namespace|QName|XML|XMLList|ArrayBuffer|Float32Array|Float64Array|Int16Array|Int32Array|Int8Array|Uint16Array|Uint32Array|Uint8Array|Uint8ClampedArray|Error|EvalError|InternalError|RangeError|ReferenceError|StopIteration|SyntaxError|TypeError|URIError|decodeURI|decodeURIComponent|encodeURI|encodeURIComponent|eval|isFinite|isNaN|parseFloat|parseInt|JSON|Math|this|arguments|prototype|window|document".split("|")),b=e.arrayToMap("break|case|catch|continue|default|delete|do|else|finally|for|function|if|in|instanceof|new|return|switch|throw|try|typeof|let|var|while|with|const|yield|import|get|set".split("|")),c="case|do|else|finally|in|instanceof|return|throw|try|typeof|yield",d=e.arrayToMap("__parent__|__count__|escape|unescape|with|__proto__".split("|")),h=e.arrayToMap("const|let|var|function".split("|")),i=e.arrayToMap("null|Infinity|NaN|undefined".split("|")),j=e.arrayToMap("class|enum|extends|super|export|implements|private|public|interface|package|protected|static".split("|")),k="["+f.packages.L+"\\$_]["+f.packages.L+f.packages.Mn+f.packages.Mc+f.packages.Nd+f.packages.Pc+"\\$_]*\\b",l="\\\\(?:x[0-9a-fA-F]{2}|u[0-9a-fA-F]{4}|[0-2][0-7]{0,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.)";this.$rules={start:[{token:"comment",regex:/\/\/.*$/},(new g).getStartRule("doc-start"),{token:"comment",merge:!0,regex:/\/\*/,next:"comment"},{token:"string",regex:"'",next:"qstring"},{token:"string",regex:'"',next:"qqstring"},{token:"constant.numeric",regex:/0[xX][0-9a-fA-F]+\b/},{token:"constant.numeric",regex:/[+-]?\d+(?:(?:\.\d*)?(?:[eE][+-]?\d+)?)?\b/},{token:["storage.type","punctuation.operator","support.function","punctuation.operator","entity.name.function","text","keyword.operator","text","storage.type","text","paren.lparen","variable.parameter","paren.rparen"],regex:"("+k+")(\\.)(prototype)(\\.)("+k+")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"},{token:["storage.type","punctuation.operator","support.function","punctuation.operator","entity.name.function","text","keyword.operator","text"],regex:"("+k+")(\\.)(prototype)(\\.)("+k+")(\\s*)(=)(\\s*)"},{token:["storage.type","punctuation.operator","entity.name.function","text","keyword.operator","text","storage.type","text","paren.lparen","variable.parameter","paren.rparen"],regex:"("+k+")(\\.)("+k+")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"},{token:["entity.name.function","text","keyword.operator","text","storage.type","text","paren.lparen","variable.parameter","paren.rparen"],regex:"("+k+")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"},{token:["storage.type","text","entity.name.function","text","paren.lparen","variable.parameter","paren.rparen"],regex:"(function)(\\s+)("+k+")(\\s*)(\\()(.*?)(\\))"},{token:["entity.name.function","text","punctuation.operator","text","storage.type","text","paren.lparen","variable.parameter","paren.rparen"],regex:"("+k+")(\\s*)(:)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"},{token:["text","text","storage.type","text","paren.lparen","variable.parameter","paren.rparen"],regex:"(:)(\\s*)(function)?(\\s*)(\\()([^)]*)(\\))"},{token:"constant.language.boolean",regex:/(?:true|false)\b/},{token:"keyword",regex:"(?:"+c+")\\b",next:"regex_allowed"},{token:["punctuation.operator","support.function"],regex:/(\.)(s(?:h(?:ift|ow(?:Mod(?:elessDialog|alDialog)|Help))|croll(?:X|By(?:Pages|Lines)?|Y|To)?|t(?:opzzzz|rike)|i(?:n|zeToContent|debar|gnText)|ort|u(?:p|b(?:str(?:ing)?)?)|pli(?:ce|t)|e(?:nd|t(?:Re(?:sizable|questHeader)|M(?:i(?:nutes|lliseconds)|onth)|Seconds|Ho(?:tKeys|urs)|Year|Cursor|Time(?:out)?|Interval|ZOptions|Date|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Date|FullYear)|FullYear|Active)|arch)|qrt|lice|avePreferences|mall)|h(?:ome|andleEvent)|navigate|c(?:har(?:CodeAt|At)|o(?:s|n(?:cat|textual|firm)|mpile)|eil|lear(?:Timeout|Interval)?|a(?:ptureEvents|ll)|reate(?:StyleSheet|Popup|EventObject))|t(?:o(?:GMTString|S(?:tring|ource)|U(?:TCString|pperCase)|Lo(?:caleString|werCase))|est|a(?:n|int(?:Enabled)?))|i(?:s(?:NaN|Finite)|ndexOf|talics)|d(?:isableExternalCapture|ump|etachEvent)|u(?:n(?:shift|taint|escape|watch)|pdateCommands)|j(?:oin|avaEnabled)|p(?:o(?:p|w)|ush|lugins.refresh|a(?:ddings|rse(?:Int|Float)?)|r(?:int|ompt|eference))|e(?:scape|nableExternalCapture|val|lementFromPoint|x(?:p|ec(?:Script|Command)?))|valueOf|UTC|queryCommand(?:State|Indeterm|Enabled|Value)|f(?:i(?:nd|le(?:ModifiedDate|Size|CreatedDate|UpdatedDate)|xed)|o(?:nt(?:size|color)|rward)|loor|romCharCode)|watch|l(?:ink|o(?:ad|g)|astIndexOf)|a(?:sin|nchor|cos|t(?:tachEvent|ob|an(?:2)?)|pply|lert|b(?:s|ort))|r(?:ou(?:nd|teEvents)|e(?:size(?:By|To)|calc|turnValue|place|verse|l(?:oad|ease(?:Capture|Events)))|andom)|g(?:o|et(?:ResponseHeader|M(?:i(?:nutes|lliseconds)|onth)|Se(?:conds|lection)|Hours|Year|Time(?:zoneOffset)?|Da(?:y|te)|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Da(?:y|te)|FullYear)|FullYear|A(?:ttention|llResponseHeaders)))|m(?:in|ove(?:B(?:y|elow)|To(?:Absolute)?|Above)|ergeAttributes|a(?:tch|rgins|x))|b(?:toa|ig|o(?:ld|rderWidths)|link|ack))\b(?=\()/},{token:["punctuation.operator","support.function.dom"],regex:/(\.)(s(?:ub(?:stringData|mit)|plitText|e(?:t(?:NamedItem|Attribute(?:Node)?)|lect))|has(?:ChildNodes|Feature)|namedItem|c(?:l(?:ick|o(?:se|neNode))|reate(?:C(?:omment|DATASection|aption)|T(?:Head|extNode|Foot)|DocumentFragment|ProcessingInstruction|E(?:ntityReference|lement)|Attribute))|tabIndex|i(?:nsert(?:Row|Before|Cell|Data)|tem)|open|delete(?:Row|C(?:ell|aption)|T(?:Head|Foot)|Data)|focus|write(?:ln)?|a(?:dd|ppend(?:Child|Data))|re(?:set|place(?:Child|Data)|move(?:NamedItem|Child|Attribute(?:Node)?)?)|get(?:NamedItem|Element(?:sBy(?:Name|TagName)|ById)|Attribute(?:Node)?)|blur)\b(?=\()/},{token:["punctuation.operator","support.constant"],regex:/(\.)(s(?:ystemLanguage|cr(?:ipts|ollbars|een(?:X|Y|Top|Left))|t(?:yle(?:Sheets)?|atus(?:Text|bar)?)|ibling(?:Below|Above)|ource|uffixes|e(?:curity(?:Policy)?|l(?:ection|f)))|h(?:istory|ost(?:name)?|as(?:h|Focus))|y|X(?:MLDocument|SLDocument)|n(?:ext|ame(?:space(?:s|URI)|Prop))|M(?:IN_VALUE|AX_VALUE)|c(?:haracterSet|o(?:n(?:structor|trollers)|okieEnabled|lorDepth|mp(?:onents|lete))|urrent|puClass|l(?:i(?:p(?:boardData)?|entInformation)|osed|asses)|alle(?:e|r)|rypto)|t(?:o(?:olbar|p)|ext(?:Transform|Indent|Decoration|Align)|ags)|SQRT(?:1_2|2)|i(?:n(?:ner(?:Height|Width)|put)|ds|gnoreCase)|zIndex|o(?:scpu|n(?:readystatechange|Line)|uter(?:Height|Width)|p(?:sProfile|ener)|ffscreenBuffering)|NEGATIVE_INFINITY|d(?:i(?:splay|alog(?:Height|Top|Width|Left|Arguments)|rectories)|e(?:scription|fault(?:Status|Ch(?:ecked|arset)|View)))|u(?:ser(?:Profile|Language|Agent)|n(?:iqueID|defined)|pdateInterval)|_content|p(?:ixelDepth|ort|ersonalbar|kcs11|l(?:ugins|atform)|a(?:thname|dding(?:Right|Bottom|Top|Left)|rent(?:Window|Layer)?|ge(?:X(?:Offset)?|Y(?:Offset)?))|r(?:o(?:to(?:col|type)|duct(?:Sub)?|mpter)|e(?:vious|fix)))|e(?:n(?:coding|abledPlugin)|x(?:ternal|pando)|mbeds)|v(?:isibility|endor(?:Sub)?|Linkcolor)|URLUnencoded|P(?:I|OSITIVE_INFINITY)|f(?:ilename|o(?:nt(?:Size|Family|Weight)|rmName)|rame(?:s|Element)|gColor)|E|whiteSpace|l(?:i(?:stStyleType|n(?:eHeight|kColor))|o(?:ca(?:tion(?:bar)?|lName)|wsrc)|e(?:ngth|ft(?:Context)?)|a(?:st(?:M(?:odified|atch)|Index|Paren)|yer(?:s|X)|nguage))|a(?:pp(?:MinorVersion|Name|Co(?:deName|re)|Version)|vail(?:Height|Top|Width|Left)|ll|r(?:ity|guments)|Linkcolor|bove)|r(?:ight(?:Context)?|e(?:sponse(?:XML|Text)|adyState))|global|x|m(?:imeTypes|ultiline|enubar|argin(?:Right|Bottom|Top|Left))|L(?:N(?:10|2)|OG(?:10E|2E))|b(?:o(?:ttom|rder(?:Width|RightWidth|BottomWidth|Style|Color|TopWidth|LeftWidth))|ufferDepth|elow|ackground(?:Color|Image)))\b/},{token:["storage.type","punctuation.operator","support.function.firebug"],regex:/(console)(\.)(warn|info|log|error|time|timeEnd|assert)\b/},{token:function(c){return a.hasOwnProperty(c)?"variable.language":d.hasOwnProperty(c)?"invalid.deprecated":h.hasOwnProperty(c)?"storage.type":b.hasOwnProperty(c)?"keyword":i.hasOwnProperty(c)?"constant.language":j.hasOwnProperty(c)?"invalid.illegal":c=="debugger"?"invalid.deprecated":"identifier"},regex:k},{token:"keyword.operator",regex:/!|\$|%|&|\*|\-\-|\-|\+\+|\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\|\||\?\:|\*=|%=|\+=|\-=|&=|\^=|\b(?:in|instanceof|new|delete|typeof|void)/,next:"regex_allowed"},{token:"punctuation.operator",regex:/\?|\:|\,|\;|\./,next:"regex_allowed"},{token:"paren.lparen",regex:/[\[({]/,next:"regex_allowed"},{token:"paren.rparen",regex:/[\])}]/},{token:"keyword.operator",regex:/\/=?/,next:"regex_allowed"},{token:"comment",regex:/^#!.*$/},{token:"text",regex:/\s+/}],regex_allowed:[{token:"comment",merge:!0,regex:"\\/\\*",next:"comment_regex_allowed"},{token:"comment",regex:"\\/\\/.*$"},{token:"string.regexp",regex:"\\/",next:"regex",merge:!0},{token:"text",regex:"\\s+"},{token:"empty",regex:"",next:"start"}],regex:[{token:"regexp.keyword.operator",regex:"\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",next:"regex"},{token:"string.regexp",regex:"/\\w*",next:"start",merge:!0},{token:"string.regexp",regex:"[^\\\\/\\[]+",next:"regex",merge:!0},{token:"string.regexp.charachterclass",regex:"\\[",next:"regex_character_class",merge:!0},{token:"empty",regex:"",next:"start"}],regex_character_class:[{token:"regexp.keyword.operator",regex:"\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",next:"regex_character_class"},{token:"string.regexp.charachterclass",regex:"]",next:"regex",merge:!0},{token:"string.regexp.charachterclass",regex:"[^\\\\\\]]+",next:"regex_character_class",merge:!0},{token:"empty",regex:"",next:"start"}],comment_regex_allowed:[{token:"comment",regex:".*?\\*\\/",merge:!0,next:"regex_allowed"},{token:"comment",merge:!0,regex:".+"}],comment:[{token:"comment",regex:".*?\\*\\/",merge:!0,next:"start"},{token:"comment",merge:!0,regex:".+"}],qqstring:[{token:"constant.language.escape",regex:l},{token:"string",regex:'[^"\\\\]+'},{token:"string",regex:'"',next:"start"}],qstring:[{token:"constant.language.escape",regex:l},{token:"string",regex:"[^'\\\\]+"},{token:"string",regex:"'",next:"start"}]},this.embedRules(g,"doc-",[(new g).getEndRule("start")])};d.inherits(i,h),b.JavaScriptHighlightRules=i}),define("ace/mode/doc_comment_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text_highlight_rules").TextHighlightRules,f=function(){this.$rules={start:[{token:"comment.doc.tag",regex:"@[\\w\\d_]+"},{token:"comment.doc",merge:!0,regex:"\\s+"},{token:"comment.doc",merge:!0,regex:"TODO"},{token:"comment.doc",merge:!0,regex:"[^@\\*]+"},{token:"comment.doc",merge:!0,regex:"."}]}};d.inherits(f,e),function(){this.getStartRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\/\\*(?=\\*)",next:a}},this.getEndRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\*\\/",next:a}}}.call(f.prototype),b.DocCommentHighlightRules=f}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../range").Range,e=function(){};(function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}}).call(e.prototype),b.MatchingBraceOutdent=e}),define("ace/mode/behaviour/cstyle",["require","exports","module","ace/lib/oop","ace/mode/behaviour"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../behaviour").Behaviour,f=function(){this.add("braces","insertion",function(a,b,c,d,e){if(e=="{"){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"{"+g+"}",selection:!1}:{text:"{}",selection:[1,1]}}if(e=="}"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var k=d.$findOpeningBracket("}",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}else if(e=="\n"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var l=d.findMatchingBracket({row:h.row,column:h.column+1});if(!l)return null;var m=this.getNextLineIndent(a,i.substring(0,i.length-1),d.getTabString()),n=this.$getIndent(d.doc.getLine(l.row));return{text:"\n"+m+"\n"+n,selection:[1,m.length,1,m.length]}}}}),this.add("braces","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="{"){var g=d.doc.getLine(e.start.row),h=g.substring(e.end.column,e.end.column+1);if(h=="}")return e.end.column++,e}}),this.add("parens","insertion",function(a,b,c,d,e){if(e=="("){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"("+g+")",selection:!1}:{text:"()",selection:[1,1]}}if(e==")"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j==")"){var k=d.$findOpeningBracket(")",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}}),this.add("parens","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="("){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h==")")return e.end.column++,e}}),this.add("string_dquotes","insertion",function(a,b,c,d,e){if(e=='"'||e=="'"){var f=e,g=c.getSelectionRange(),h=d.doc.getTextRange(g);if(h!=="")return{text:f+h+f,selection:!1};var i=c.getCursorPosition(),j=d.doc.getLine(i.row),k=j.substring(i.column-1,i.column);if(k=="\\")return null;var l=d.getTokens(g.start.row,g.start.row)[0].tokens,m=0,n,o=-1;for(var p=0;p<l.length;p++){n=l[p],n.type=="string"?o=-1:o<0&&(o=n.value.indexOf(f));if(n.value.length+m>g.start.column)break;m+=l[p].value.length}if(!n||o<0&&n.type!=="comment"&&(n.type!=="string"||g.start.column!==n.value.length+m-1&&n.value.lastIndexOf(f)===n.value.length-1))return{text:f+f,selection:[1,1]};if(n&&n.type==="string"){var q=j.substring(i.column,i.column+1);if(q==f)return{text:"",selection:[1,1]}}}}),this.add("string_dquotes","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&(f=='"'||f=="'")){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h=='"')return e.end.column++,e}})};d.inherits(f,e),b.CstyleBehaviour=f}),define("ace/mode/folding/cstyle",["require","exports","module","ace/lib/oop","ace/range","ace/mode/folding/fold_mode"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../../range").Range,f=a("./fold_mode").FoldMode,g=b.FoldMode=function(){};d.inherits(g,f),function(){this.foldingStartMarker=/(\{|\[)[^\}\]]*$|^\s*(\/\*)/,this.foldingStopMarker=/^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/,this.getFoldWidgetRange=function(a,b,c){var d=a.getLine(c),f=d.match(this.foldingStartMarker);if(f){var g=f.index;if(f[1])return this.openingBracketBlock(a,f[1],c,g);var h=a.getCommentFoldRange(c,g+f[0].length);return h.end.column-=2,h}if(b!=="markbeginend")return;var f=d.match(this.foldingStopMarker);if(f){var g=f.index+f[0].length;if(f[2]){var h=a.getCommentFoldRange(c,g);return h.end.column-=2,h}var i={row:c,column:g},j=a.$findOpeningBracket(f[1],i);if(!j)return;return j.column++,i.column--,e.fromPoints(j,i)}}}.call(g.prototype)}),define("ace/mode/folding/fold_mode",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../../range").Range,e=b.FoldMode=function(){};(function(){this.foldingStartMarker=null,this.foldingStopMarker=null,this.getFoldWidget=function(a,b,c){var d=a.getLine(c);return this.foldingStartMarker.test(d)?"start":b=="markbeginend"&&this.foldingStopMarker&&this.foldingStopMarker.test(d)?"end":""},this.getFoldWidgetRange=function(a,b,c){return null},this.indentationBlock=function(a,b,c){var e=/^\s*/,f=b,g=b,h=a.getLine(b),i=c||h.length,j=h.match(e)[0].length,k=a.getLength();while(++b<k){h=a.getLine(b);var l=h.match(e)[0].length;if(l==h.length)continue;if(l<=j)break;g=b}if(g>f){var m=a.getLine(g).length;return new d(f,i,g,m)}},this.openingBracketBlock=function(a,b,c,e){var f={row:c,column:e+1},g=a.$findClosingBracket(b,f);if(!g)return;var h=a.foldWidgets[g.row];return h==null&&(h=this.getFoldWidget(a,g.row)),h=="start"&&(g.row--,g.column=a.getLine(g.row).length),d.fromPoints(f,g)}}).call(e.prototype)})
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-json-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-json-uncompressed.js
deleted file mode 100644
index 22399889f3..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-json-uncompressed.js
+++ /dev/null
@@ -1,698 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/json', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/json_highlight_rules', 'ace/mode/matching_brace_outdent', 'ace/mode/behaviour/cstyle', 'ace/mode/folding/cstyle', 'ace/worker/worker_client'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
-var HighlightRules = require("./json_highlight_rules").JsonHighlightRules;
-var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
-var CstyleBehaviour = require("./behaviour/cstyle").CstyleBehaviour;
-var CStyleFoldMode = require("./folding/cstyle").FoldMode;
-var WorkerClient = require("../worker/worker_client").WorkerClient;
-
-var Mode = function() {
-    this.$tokenizer = new Tokenizer(new HighlightRules().getRules());
-    this.$outdent = new MatchingBraceOutdent();
-    this.$behaviour = new CstyleBehaviour();
-    this.foldingRules = new CStyleFoldMode();
-};
-oop.inherits(Mode, TextMode);
-
-(function() {
-
-    this.getNextLineIndent = function(state, line, tab) {
-        var indent = this.$getIndent(line);
-
-        if (state == "start") {
-            var match = line.match(/^.*[\{\(\[]\s*$/);
-            if (match) {
-                indent += tab;
-            }
-        }
-
-        return indent;
-    };
-
-    this.checkOutdent = function(state, line, input) {
-        return this.$outdent.checkOutdent(line, input);
-    };
-
-    this.autoOutdent = function(state, doc, row) {
-        this.$outdent.autoOutdent(doc, row);
-    };
-
-    this.createWorker = function(session) {
-        var worker = new WorkerClient(["ace"], "worker-json.js", "ace/mode/json_worker", "JsonWorker");
-        worker.attachToDocument(session.getDocument());
-
-        worker.on("error", function(e) {
-            session.setAnnotations([e.data]);
-        });
-
-        worker.on("ok", function() {
-            session.clearAnnotations();
-        });
-
-        return worker;
-    };
-
-
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-});/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Mihai Sucan <mihai DOT sucan AT gmail DOT com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/json_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var JsonHighlightRules = function() {
-
-    // regexp must not have capturing parentheses. Use (?:) instead.
-    // regexps are ordered -> the first match is used
-    this.$rules = {
-        "start" : [
-            {
-                token : "string", // single line
-                regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
-            }, {
-                token : "constant.numeric", // hex
-                regex : "0[xX][0-9a-fA-F]+\\b"
-            }, {
-                token : "constant.numeric", // float
-                regex : "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"
-            }, {
-                token : "constant.language.boolean",
-                regex : "(?:true|false)\\b"
-            }, {
-                token : "invalid.illegal", // single quoted strings are not allowed
-                regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"
-            }, {
-                token : "invalid.illegal", // comments are not allowed
-                regex : "\\/\\/.*$"
-            }, {
-                token : "paren.lparen",
-                regex : "[[({]"
-            }, {
-                token : "paren.rparen",
-                regex : "[\\])}]"
-            }, {
-                token : "text",
-                regex : "\\s+"
-            }
-        ]
-    };
-    
-};
-
-oop.inherits(JsonHighlightRules, TextHighlightRules);
-
-exports.JsonHighlightRules = JsonHighlightRules;
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/matching_brace_outdent', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../range").Range;
-
-var MatchingBraceOutdent = function() {};
-
-(function() {
-
-    this.checkOutdent = function(line, input) {
-        if (! /^\s+$/.test(line))
-            return false;
-
-        return /^\s*\}/.test(input);
-    };
-
-    this.autoOutdent = function(doc, row) {
-        var line = doc.getLine(row);
-        var match = line.match(/^(\s*\})/);
-
-        if (!match) return 0;
-
-        var column = match[1].length;
-        var openBracePos = doc.findMatchingBracket({row: row, column: column});
-
-        if (!openBracePos || openBracePos.row == row) return 0;
-
-        var indent = this.$getIndent(doc.getLine(openBracePos.row));
-        doc.replace(new Range(row, 0, row, column-1), indent);
-    };
-
-    this.$getIndent = function(line) {
-        var match = line.match(/^(\s+)/);
-        if (match) {
-            return match[1];
-        }
-
-        return "";
-    };
-
-}).call(MatchingBraceOutdent.prototype);
-
-exports.MatchingBraceOutdent = MatchingBraceOutdent;
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Chris Spencer <chris.ag.spencer AT googlemail DOT com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/behaviour/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/behaviour'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var Behaviour = require('../behaviour').Behaviour;
-
-var CstyleBehaviour = function () {
-
-    this.add("braces", "insertion", function (state, action, editor, session, text) {
-        if (text == '{') {
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: '{' + selected + '}',
-                    selection: false
-                };
-            } else {
-                return {
-                    text: '{}',
-                    selection: [1, 1]
-                };
-            }
-        } else if (text == '}') {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == '}') {
-                var matching = session.$findOpeningBracket('}', {column: cursor.column + 1, row: cursor.row});
-                if (matching !== null) {
-                    return {
-                        text: '',
-                        selection: [1, 1]
-                    };
-                }
-            }
-        } else if (text == "\n") {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == '}') {
-                var openBracePos = session.findMatchingBracket({row: cursor.row, column: cursor.column + 1});
-                if (!openBracePos)
-                     return null;
-
-                var indent = this.getNextLineIndent(state, line.substring(0, line.length - 1), session.getTabString());
-                var next_indent = this.$getIndent(session.doc.getLine(openBracePos.row));
-
-                return {
-                    text: '\n' + indent + '\n' + next_indent,
-                    selection: [1, indent.length, 1, indent.length]
-                };
-            }
-        }
-    });
-
-    this.add("braces", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && selected == '{') {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.end.column, range.end.column + 1);
-            if (rightChar == '}') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-    this.add("parens", "insertion", function (state, action, editor, session, text) {
-        if (text == '(') {
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: '(' + selected + ')',
-                    selection: false
-                };
-            } else {
-                return {
-                    text: '()',
-                    selection: [1, 1]
-                };
-            }
-        } else if (text == ')') {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == ')') {
-                var matching = session.$findOpeningBracket(')', {column: cursor.column + 1, row: cursor.row});
-                if (matching !== null) {
-                    return {
-                        text: '',
-                        selection: [1, 1]
-                    };
-                }
-            }
-        }
-    });
-
-    this.add("parens", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && selected == '(') {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
-            if (rightChar == ')') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-    this.add("string_dquotes", "insertion", function (state, action, editor, session, text) {
-        if (text == '"' || text == "'") {
-            var quote = text;
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: quote + selected + quote,
-                    selection: false
-                };
-            } else {
-                var cursor = editor.getCursorPosition();
-                var line = session.doc.getLine(cursor.row);
-                var leftChar = line.substring(cursor.column-1, cursor.column);
-
-                // We're escaped.
-                if (leftChar == '\\') {
-                    return null;
-                }
-
-                // Find what token we're inside.
-                var tokens = session.getTokens(selection.start.row, selection.start.row)[0].tokens;
-                var col = 0, token;
-                var quotepos = -1; // Track whether we're inside an open quote.
-
-                for (var x = 0; x < tokens.length; x++) {
-                    token = tokens[x];
-                    if (token.type == "string") {
-                      quotepos = -1;
-                    } else if (quotepos < 0) {
-                      quotepos = token.value.indexOf(quote);
-                    }
-                    if ((token.value.length + col) > selection.start.column) {
-                        break;
-                    }
-                    col += tokens[x].value.length;
-                }
-
-                // Try and be smart about when we auto insert.
-                if (!token || (quotepos < 0 && token.type !== "comment" && (token.type !== "string" || ((selection.start.column !== token.value.length+col-1) && token.value.lastIndexOf(quote) === token.value.length-1)))) {
-                    return {
-                        text: quote + quote,
-                        selection: [1,1]
-                    };
-                } else if (token && token.type === "string") {
-                    // Ignore input and move right one if we're typing over the closing quote.
-                    var rightChar = line.substring(cursor.column, cursor.column + 1);
-                    if (rightChar == quote) {
-                        return {
-                            text: '',
-                            selection: [1, 1]
-                        };
-                    }
-                }
-            }
-        }
-    });
-
-    this.add("string_dquotes", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && (selected == '"' || selected == "'")) {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
-            if (rightChar == '"') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-};
-
-oop.inherits(CstyleBehaviour, Behaviour);
-
-exports.CstyleBehaviour = CstyleBehaviour;
-});/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/folding/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/range', 'ace/mode/folding/fold_mode'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var Range = require("../../range").Range;
-var BaseFoldMode = require("./fold_mode").FoldMode;
-
-var FoldMode = exports.FoldMode = function() {};
-oop.inherits(FoldMode, BaseFoldMode);
-
-(function() {
-
-    this.foldingStartMarker = /(\{|\[)[^\}\]]*$|^\s*(\/\*)/;
-    this.foldingStopMarker = /^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/;
-    
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        var line = session.getLine(row);
-        var match = line.match(this.foldingStartMarker);
-        if (match) {
-            var i = match.index;
-
-            if (match[1])
-                return this.openingBracketBlock(session, match[1], row, i);
-
-            var range = session.getCommentFoldRange(row, i + match[0].length);
-            range.end.column -= 2;
-            return range;
-        }
-
-        if (foldStyle !== "markbeginend")
-            return;
-            
-        var match = line.match(this.foldingStopMarker);
-        if (match) {
-            var i = match.index + match[0].length;
-
-            if (match[2]) {
-                var range = session.getCommentFoldRange(row, i);
-                range.end.column -= 2;
-                return range;
-            }
-
-            var end = {row: row, column: i};
-            var start = session.$findOpeningBracket(match[1], end);
-            
-            if (!start)
-                return;
-
-            start.column++;
-            end.column--;
-
-            return  Range.fromPoints(start, end);
-        }
-    };
-    
-}).call(FoldMode.prototype);
-
-});/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/folding/fold_mode', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../../range").Range;
-
-var FoldMode = exports.FoldMode = function() {};
-
-(function() {
-
-    this.foldingStartMarker = null;
-    this.foldingStopMarker = null;
-
-    // must return "" if there's no fold, to enable caching
-    this.getFoldWidget = function(session, foldStyle, row) {
-        var line = session.getLine(row);
-        if (this.foldingStartMarker.test(line))
-            return "start";
-        if (foldStyle == "markbeginend"
-                && this.foldingStopMarker
-                && this.foldingStopMarker.test(line))
-            return "end";
-        return "";
-    };
-    
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        return null;
-    };
-
-    this.indentationBlock = function(session, row, column) {
-        var re = /^\s*/;
-        var startRow = row;
-        var endRow = row;
-        var line = session.getLine(row);
-        var startColumn = column || line.length;
-        var startLevel = line.match(re)[0].length;
-        var maxRow = session.getLength()
-        
-        while (++row < maxRow) {
-            line = session.getLine(row);
-            var level = line.match(re)[0].length;
-
-            if (level == line.length)
-                continue;
-
-            if (level <= startLevel)
-                break;
-
-            endRow = row;
-        }
-
-        if (endRow > startRow) {
-            var endColumn = session.getLine(endRow).length;
-            return new Range(startRow, startColumn, endRow, endColumn);
-        }
-    };
-
-    this.openingBracketBlock = function(session, bracket, row, column) {
-        var start = {row: row, column: column + 1};
-        var end = session.$findClosingBracket(bracket, start);
-        if (!end)
-            return;
-
-        var fw = session.foldWidgets[end.row];
-        if (fw == null)
-            fw = this.getFoldWidget(session, end.row);
-
-        if (fw == "start") {
-            end.row --;
-            end.column = session.getLine(end.row).length;
-        }
-        return Range.fromPoints(start, end);
-    };
-
-}).call(FoldMode.prototype);
-
-});
diff --git a/apps/files_texteditor/js/aceeditor/mode-json.js b/apps/files_texteditor/js/aceeditor/mode-json.js
deleted file mode 100644
index 05729db5e6..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-json.js
+++ /dev/null
@@ -1 +0,0 @@
-define("ace/mode/json",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/json_highlight_rules","ace/mode/matching_brace_outdent","ace/mode/behaviour/cstyle","ace/mode/folding/cstyle","ace/worker/worker_client"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./json_highlight_rules").JsonHighlightRules,h=a("./matching_brace_outdent").MatchingBraceOutdent,i=a("./behaviour/cstyle").CstyleBehaviour,j=a("./folding/cstyle").FoldMode,k=a("../worker/worker_client").WorkerClient,l=function(){this.$tokenizer=new f((new g).getRules()),this.$outdent=new h,this.$behaviour=new i,this.foldingRules=new j};d.inherits(l,e),function(){this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b);if(a=="start"){var e=b.match(/^.*[\{\(\[]\s*$/);e&&(d+=c)}return d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)},this.createWorker=function(a){var b=new k(["ace"],"worker-json.js","ace/mode/json_worker","JsonWorker");return b.attachToDocument(a.getDocument()),b.on("error",function(b){a.setAnnotations([b.data])}),b.on("ok",function(){a.clearAnnotations()}),b}}.call(l.prototype),b.Mode=l}),define("ace/mode/json_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text_highlight_rules").TextHighlightRules,f=function(){this.$rules={start:[{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"constant.numeric",regex:"0[xX][0-9a-fA-F]+\\b"},{token:"constant.numeric",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:"constant.language.boolean",regex:"(?:true|false)\\b"},{token:"invalid.illegal",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:"invalid.illegal",regex:"\\/\\/.*$"},{token:"paren.lparen",regex:"[[({]"},{token:"paren.rparen",regex:"[\\])}]"},{token:"text",regex:"\\s+"}]}};d.inherits(f,e),b.JsonHighlightRules=f}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../range").Range,e=function(){};(function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}}).call(e.prototype),b.MatchingBraceOutdent=e}),define("ace/mode/behaviour/cstyle",["require","exports","module","ace/lib/oop","ace/mode/behaviour"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../behaviour").Behaviour,f=function(){this.add("braces","insertion",function(a,b,c,d,e){if(e=="{"){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"{"+g+"}",selection:!1}:{text:"{}",selection:[1,1]}}if(e=="}"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var k=d.$findOpeningBracket("}",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}else if(e=="\n"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var l=d.findMatchingBracket({row:h.row,column:h.column+1});if(!l)return null;var m=this.getNextLineIndent(a,i.substring(0,i.length-1),d.getTabString()),n=this.$getIndent(d.doc.getLine(l.row));return{text:"\n"+m+"\n"+n,selection:[1,m.length,1,m.length]}}}}),this.add("braces","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="{"){var g=d.doc.getLine(e.start.row),h=g.substring(e.end.column,e.end.column+1);if(h=="}")return e.end.column++,e}}),this.add("parens","insertion",function(a,b,c,d,e){if(e=="("){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"("+g+")",selection:!1}:{text:"()",selection:[1,1]}}if(e==")"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j==")"){var k=d.$findOpeningBracket(")",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}}),this.add("parens","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="("){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h==")")return e.end.column++,e}}),this.add("string_dquotes","insertion",function(a,b,c,d,e){if(e=='"'||e=="'"){var f=e,g=c.getSelectionRange(),h=d.doc.getTextRange(g);if(h!=="")return{text:f+h+f,selection:!1};var i=c.getCursorPosition(),j=d.doc.getLine(i.row),k=j.substring(i.column-1,i.column);if(k=="\\")return null;var l=d.getTokens(g.start.row,g.start.row)[0].tokens,m=0,n,o=-1;for(var p=0;p<l.length;p++){n=l[p],n.type=="string"?o=-1:o<0&&(o=n.value.indexOf(f));if(n.value.length+m>g.start.column)break;m+=l[p].value.length}if(!n||o<0&&n.type!=="comment"&&(n.type!=="string"||g.start.column!==n.value.length+m-1&&n.value.lastIndexOf(f)===n.value.length-1))return{text:f+f,selection:[1,1]};if(n&&n.type==="string"){var q=j.substring(i.column,i.column+1);if(q==f)return{text:"",selection:[1,1]}}}}),this.add("string_dquotes","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&(f=='"'||f=="'")){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h=='"')return e.end.column++,e}})};d.inherits(f,e),b.CstyleBehaviour=f}),define("ace/mode/folding/cstyle",["require","exports","module","ace/lib/oop","ace/range","ace/mode/folding/fold_mode"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../../range").Range,f=a("./fold_mode").FoldMode,g=b.FoldMode=function(){};d.inherits(g,f),function(){this.foldingStartMarker=/(\{|\[)[^\}\]]*$|^\s*(\/\*)/,this.foldingStopMarker=/^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/,this.getFoldWidgetRange=function(a,b,c){var d=a.getLine(c),f=d.match(this.foldingStartMarker);if(f){var g=f.index;if(f[1])return this.openingBracketBlock(a,f[1],c,g);var h=a.getCommentFoldRange(c,g+f[0].length);return h.end.column-=2,h}if(b!=="markbeginend")return;var f=d.match(this.foldingStopMarker);if(f){var g=f.index+f[0].length;if(f[2]){var h=a.getCommentFoldRange(c,g);return h.end.column-=2,h}var i={row:c,column:g},j=a.$findOpeningBracket(f[1],i);if(!j)return;return j.column++,i.column--,e.fromPoints(j,i)}}}.call(g.prototype)}),define("ace/mode/folding/fold_mode",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../../range").Range,e=b.FoldMode=function(){};(function(){this.foldingStartMarker=null,this.foldingStopMarker=null,this.getFoldWidget=function(a,b,c){var d=a.getLine(c);return this.foldingStartMarker.test(d)?"start":b=="markbeginend"&&this.foldingStopMarker&&this.foldingStopMarker.test(d)?"end":""},this.getFoldWidgetRange=function(a,b,c){return null},this.indentationBlock=function(a,b,c){var e=/^\s*/,f=b,g=b,h=a.getLine(b),i=c||h.length,j=h.match(e)[0].length,k=a.getLength();while(++b<k){h=a.getLine(b);var l=h.match(e)[0].length;if(l==h.length)continue;if(l<=j)break;g=b}if(g>f){var m=a.getLine(g).length;return new d(f,i,g,m)}},this.openingBracketBlock=function(a,b,c,e){var f={row:c,column:e+1},g=a.$findClosingBracket(b,f);if(!g)return;var h=a.foldWidgets[g.row];return h==null&&(h=this.getFoldWidget(a,g.row)),h=="start"&&(g.row--,g.column=a.getLine(g.row).length),d.fromPoints(f,g)}}).call(e.prototype)})
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-latex-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-latex-uncompressed.js
deleted file mode 100644
index 77c42ab3f9..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-latex-uncompressed.js
+++ /dev/null
@@ -1,95 +0,0 @@
-define('ace/mode/latex', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/latex_highlight_rules', 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
-var LatexHighlightRules = require("./latex_highlight_rules").LatexHighlightRules;
-var Range = require("../range").Range;
-
-var Mode = function()
-{
-    this.$tokenizer = new Tokenizer(new LatexHighlightRules().getRules());
-};
-oop.inherits(Mode, TextMode);
-
-(function() {
-    this.toggleCommentLines = function(state, doc, startRow, endRow) {
-        // This code is adapted from ruby.js
-        var outdent = true;
-        
-        // LaTeX comments begin with % and go to the end of the line
-        var commentRegEx = /^(\s*)\%/;
-
-        for (var i = startRow; i <= endRow; i++) {
-            if (!commentRegEx.test(doc.getLine(i))) {
-                outdent = false;
-                break;
-            }
-        }
-
-        if (outdent) {
-            var deleteRange = new Range(0, 0, 0, 0);
-            for (var i = startRow; i <= endRow; i++) {
-                var line = doc.getLine(i);
-                var m = line.match(commentRegEx);
-                deleteRange.start.row = i;
-                deleteRange.end.row = i;
-                deleteRange.end.column = m[0].length;
-                doc.replace(deleteRange, m[1]);
-            }
-        }
-        else {
-            doc.indentRows(startRow, endRow, "%");
-        }
-    };
-    
-    // There is no universally accepted way of indenting a tex document
-    // so just maintain the indentation of the previous line
-    this.getNextLineIndent = function(state, line, tab) {
-        return this.$getIndent(line);
-    };
-    
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-
-});
-define('ace/mode/latex_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var LatexHighlightRules = function() {   
-    this.$rules = {
-        "start" : [{
-            // A tex command e.g. \foo
-            token : "keyword",
-            regex : "\\\\(?:[^a-zA-Z]|[a-zA-Z]+)",
-        }, {
-            // Curly and square braces
-            token : "lparen",
-            regex : "[[({]"
-        }, {
-            // Curly and square braces
-            token : "rparen",
-            regex : "[\\])}]"
-        }, {
-            // Inline math between two $ symbols
-            token : "string",
-            regex : "\\$(?:(?:\\\\.)|(?:[^\\$\\\\]))*?\\$"
-        }, {
-            // A comment. Tex comments start with % and go to 
-            // the end of the line
-            token : "comment",
-            regex : "%.*$"
-        }]
-    };
-};
-
-oop.inherits(LatexHighlightRules, TextHighlightRules);
-
-exports.LatexHighlightRules = LatexHighlightRules;
-
-});
diff --git a/apps/files_texteditor/js/aceeditor/mode-latex.js b/apps/files_texteditor/js/aceeditor/mode-latex.js
deleted file mode 100644
index e6cfb7cc2f..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-latex.js
+++ /dev/null
@@ -1 +0,0 @@
-define("ace/mode/latex",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/latex_highlight_rules","ace/range"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./latex_highlight_rules").LatexHighlightRules,h=a("../range").Range,i=function(){this.$tokenizer=new f((new g).getRules())};d.inherits(i,e),function(){this.toggleCommentLines=function(a,b,c,d){var e=!0,f=/^(\s*)\%/;for(var g=c;g<=d;g++)if(!f.test(b.getLine(g))){e=!1;break}if(e){var i=new h(0,0,0,0);for(var g=c;g<=d;g++){var j=b.getLine(g),k=j.match(f);i.start.row=g,i.end.row=g,i.end.column=k[0].length,b.replace(i,k[1])}}else b.indentRows(c,d,"%")},this.getNextLineIndent=function(a,b,c){return this.$getIndent(b)}}.call(i.prototype),b.Mode=i}),define("ace/mode/latex_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text_highlight_rules").TextHighlightRules,f=function(){this.$rules={start:[{token:"keyword",regex:"\\\\(?:[^a-zA-Z]|[a-zA-Z]+)"},{token:"lparen",regex:"[[({]"},{token:"rparen",regex:"[\\])}]"},{token:"string",regex:"\\$(?:(?:\\\\.)|(?:[^\\$\\\\]))*?\\$"},{token:"comment",regex:"%.*$"}]}};d.inherits(f,e),b.LatexHighlightRules=f})
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-less-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-less-uncompressed.js
deleted file mode 100644
index b59684dd28..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-less-uncompressed.js
+++ /dev/null
@@ -1,654 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      John Roepke <john AT justjohn DOT us>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/less', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/less_highlight_rules', 'ace/mode/matching_brace_outdent', 'ace/mode/folding/cstyle'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
-var LessHighlightRules = require("./less_highlight_rules").LessHighlightRules;
-var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
-var CStyleFoldMode = require("./folding/cstyle").FoldMode;
-
-var Mode = function() {
-    this.$tokenizer = new Tokenizer(new LessHighlightRules().getRules(), "i");
-    this.$outdent = new MatchingBraceOutdent();
-    this.foldingRules = new CStyleFoldMode();
-};
-oop.inherits(Mode, TextMode);
-
-(function() {
-    
-    this.getNextLineIndent = function(state, line, tab) {
-        var indent = this.$getIndent(line);
-
-        // ignore braces in comments
-        var tokens = this.$tokenizer.getLineTokens(line, state).tokens;
-        if (tokens.length && tokens[tokens.length-1].type == "comment") {
-            return indent;
-        }
-
-        var match = line.match(/^.*\{\s*$/);
-        if (match) {
-            indent += tab;
-        }
-
-        return indent;
-    };
-
-    this.checkOutdent = function(state, line, input) {
-        return this.$outdent.checkOutdent(line, input);
-    };
-
-    this.autoOutdent = function(state, doc, row) {
-        this.$outdent.autoOutdent(doc, row);
-    };
-
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      John Roepke <john AT justjohn DOT us>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/less_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var lang = require("../lib/lang");
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var LessHighlightRules = function() {
-    
-    var properties = lang.arrayToMap( (function () {
-
-        var browserPrefix = ("-webkit-|-moz-|-o-|-ms-|-svg-|-pie-|-khtml-").split("|");
-        
-        var prefixProperties = ("appearance|background-clip|background-inline-policy|background-origin|" + 
-             "background-size|binding|border-bottom-colors|border-left-colors|" + 
-             "border-right-colors|border-top-colors|border-end|border-end-color|" + 
-             "border-end-style|border-end-width|border-image|border-start|" + 
-             "border-start-color|border-start-style|border-start-width|box-align|" + 
-             "box-direction|box-flex|box-flexgroup|box-ordinal-group|box-orient|" + 
-             "box-pack|box-sizing|column-count|column-gap|column-width|column-rule|" + 
-             "column-rule-width|column-rule-style|column-rule-color|float-edge|" + 
-             "font-feature-settings|font-language-override|force-broken-image-icon|" + 
-             "image-region|margin-end|margin-start|opacity|outline|outline-color|" + 
-             "outline-offset|outline-radius|outline-radius-bottomleft|" + 
-             "outline-radius-bottomright|outline-radius-topleft|outline-radius-topright|" + 
-             "outline-style|outline-width|padding-end|padding-start|stack-sizing|" + 
-             "tab-size|text-blink|text-decoration-color|text-decoration-line|" + 
-             "text-decoration-style|transform|transform-origin|transition|" + 
-             "transition-delay|transition-duration|transition-property|" + 
-             "transition-timing-function|user-focus|user-input|user-modify|user-select|" +
-             "window-shadow|border-radius").split("|");
-        
-        var properties = ("azimuth|background-attachment|background-color|background-image|" +
-            "background-position|background-repeat|background|border-bottom-color|" +
-            "border-bottom-style|border-bottom-width|border-bottom|border-collapse|" +
-            "border-color|border-left-color|border-left-style|border-left-width|" +
-            "border-left|border-right-color|border-right-style|border-right-width|" +
-            "border-right|border-spacing|border-style|border-top-color|" +
-            "border-top-style|border-top-width|border-top|border-width|border|" +
-            "bottom|box-sizing|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-adjust|font-size|" +
-            "font-stretch|font-style|font-variant|font-weight|font|height|left|" +
-            "letter-spacing|line-height|list-style-image|list-style-position|" +
-            "list-style-type|list-style|margin-bottom|margin-left|margin-right|" +
-            "margin-top|marker-offset|margin|marks|max-height|max-width|min-height|" +
-            "min-width|opacity|orphans|outline-color|" +
-            "outline-style|outline-width|outline|overflow|overflow-x|overflow-y|padding-bottom|" +
-            "padding-left|padding-right|padding-top|padding|page-break-after|" +
-            "page-break-before|page-break-inside|page|pause-after|pause-before|" +
-            "pause|pitch-range|pitch|play-during|position|quotes|richness|right|" +
-            "size|speak-header|speak-numeral|speak-punctuation|speech-rate|speak|" +
-            "stress|table-layout|text-align|text-decoration|text-indent|" +
-            "text-shadow|text-transform|top|unicode-bidi|vertical-align|" +
-            "visibility|voice-family|volume|white-space|widows|width|word-spacing|" +
-            "z-index").split("|");
-          
-        //The return array     
-        var ret = [];
-        
-        //All prefixProperties will get the browserPrefix in
-        //the begning by join the prefixProperties array with the value of browserPrefix
-        for (var i=0, ln=browserPrefix.length; i<ln; i++) {
-            Array.prototype.push.apply(
-                ret,
-                (( browserPrefix[i] + prefixProperties.join("|" + browserPrefix[i]) ).split("|"))
-            );
-        }
-        
-        //Add also prefixProperties and properties without any browser prefix
-        Array.prototype.push.apply(ret, prefixProperties);
-        Array.prototype.push.apply(ret, properties);
-        
-        return ret;
-        
-    })() );
-    
-
-
-    var functions = lang.arrayToMap(
-        ("hsl|hsla|rgb|rgba|url|attr|counter|counters|lighten|darken|saturate|" +
-        "desaturate|fadein|fadeout|fade|spin|mix|hue|saturation|lightness|" +
-        "alpha|round|ceil|floor|percentage|color|iscolor|isnumber|isstring|" +
-        "iskeyword|isurl|ispixel|ispercentage|isem").split("|")
-    );
-
-    var constants = lang.arrayToMap(
-        ("absolute|all-scroll|always|armenian|auto|baseline|below|bidi-override|" +
-        "block|bold|bolder|border-box|both|bottom|break-all|break-word|capitalize|center|" +
-        "char|circle|cjk-ideographic|col-resize|collapse|content-box|crosshair|dashed|" +
-        "decimal-leading-zero|decimal|default|disabled|disc|" +
-        "distribute-all-lines|distribute-letter|distribute-space|" +
-        "distribute|dotted|double|e-resize|ellipsis|fixed|georgian|groove|" +
-        "hand|hebrew|help|hidden|hiragana-iroha|hiragana|horizontal|" +
-        "ideograph-alpha|ideograph-numeric|ideograph-parenthesis|" +
-        "ideograph-space|inactive|inherit|inline-block|inline|inset|inside|" +
-        "inter-ideograph|inter-word|italic|justify|katakana-iroha|katakana|" +
-        "keep-all|left|lighter|line-edge|line-through|line|list-item|loose|" +
-        "lower-alpha|lower-greek|lower-latin|lower-roman|lowercase|lr-tb|ltr|" +
-        "medium|middle|move|n-resize|ne-resize|newspaper|no-drop|no-repeat|" +
-        "nw-resize|none|normal|not-allowed|nowrap|oblique|outset|outside|" +
-        "overline|pointer|progress|relative|repeat-x|repeat-y|repeat|right|" +
-        "ridge|row-resize|rtl|s-resize|scroll|se-resize|separate|small-caps|" +
-        "solid|square|static|strict|super|sw-resize|table-footer-group|" +
-        "table-header-group|tb-rl|text-bottom|text-top|text|thick|thin|top|" +
-        "transparent|underline|upper-alpha|upper-latin|upper-roman|uppercase|" +
-        "vertical-ideographic|vertical-text|visible|w-resize|wait|whitespace|" +
-        "zero").split("|")
-    );
-
-    var colors = lang.arrayToMap(
-        ("aqua|black|blue|fuchsia|gray|green|lime|maroon|navy|olive|orange|" +
-        "purple|red|silver|teal|white|yellow").split("|")
-    );
-    
-    var keywords = lang.arrayToMap(
-        ("@mixin|@extend|@include|@import|@media|@debug|@warn|@if|@for|@each|" +
-        "@while|@else|@font-face|@-webkit-keyframes|if|and|!default|module|" +
-        "def|end|declare|when|not|and").split("|")
-    );
-    
-    var tags = lang.arrayToMap(
-        ("a|abbr|acronym|address|applet|area|article|aside|audio|b|base|basefont|bdo|" + 
-         "big|blockquote|body|br|button|canvas|caption|center|cite|code|col|colgroup|" + 
-         "command|datalist|dd|del|details|dfn|dir|div|dl|dt|em|embed|fieldset|" + 
-         "figcaption|figure|font|footer|form|frame|frameset|h1|h2|h3|h4|h5|h6|head|" + 
-         "header|hgroup|hr|html|i|iframe|img|input|ins|keygen|kbd|label|legend|li|" + 
-         "link|map|mark|menu|meta|meter|nav|noframes|noscript|object|ol|optgroup|" + 
-         "option|output|p|param|pre|progress|q|rp|rt|ruby|s|samp|script|section|select|" + 
-         "small|source|span|strike|strong|style|sub|summary|sup|table|tbody|td|" + 
-         "textarea|tfoot|th|thead|time|title|tr|tt|u|ul|var|video|wbr|xmp").split("|")
-    );
-
-    // regexp must not have capturing parentheses. Use (?:) instead.
-    // regexps are ordered -> the first match is used
-
-    var numRe = "\\-?(?:(?:[0-9]+)|(?:[0-9]*\\.[0-9]+))";
-
-    // regexp must not have capturing parentheses. Use (?:) instead.
-    // regexps are ordered -> the first match is used
-
-    this.$rules = {
-        "start" : [
-            {
-                token : "comment",
-                regex : "\\/\\/.*$"
-            },
-            {
-                token : "comment", // multi line comment
-                merge : true,
-                regex : "\\/\\*",
-                next : "comment"
-            }, {
-                token : "string", // single line
-                regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
-            }, {
-                token : "string", // single line
-                regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"
-            }, {
-                token : "constant.numeric",
-                regex : numRe + "(?:em|ex|px|cm|mm|in|pt|pc|deg|rad|grad|ms|s|hz|khz|%)"
-            }, {
-                token : "constant.numeric", // hex6 color
-                regex : "#[a-f0-9]{6}"
-            }, {
-                token : "constant.numeric", // hex3 color
-                regex : "#[a-f0-9]{3}"
-            }, {
-                token : "constant.numeric",
-                regex : numRe
-            }, {
-                token : function(value) {
-                    if (keywords.hasOwnProperty(value))
-                        return "keyword";
-                    else
-                        return "variable";
-                },
-                regex : "@[a-z0-9_\\-@]*\\b"
-            }, {
-                token : function(value) {
-                    if (properties.hasOwnProperty(value.toLowerCase()))
-                        return "support.type";
-                    else if (keywords.hasOwnProperty(value))
-                        return "keyword";
-                    else if (constants.hasOwnProperty(value))
-                        return "constant.language";
-                    else if (functions.hasOwnProperty(value))
-                        return "support.function";
-                    else if (colors.hasOwnProperty(value.toLowerCase()))
-                        return "support.constant.color";
-                    else if (tags.hasOwnProperty(value.toLowerCase()))
-                        return "variable.language";
-                    else
-                        return "text";
-                },
-                regex : "\\-?[@a-z_][@a-z0-9_\\-]*"
-            }, {
-                token: "variable.language",
-                regex: "#[a-z0-9-_]+"
-            }, {
-                token: "variable.language",
-                regex: "\\.[a-z0-9-_]+"
-            }, {
-                token: "variable.language",
-                regex: ":[a-z0-9-_]+"
-            }, {
-                token: "constant",
-                regex: "[a-z0-9-_]+"
-            }, {
-                token : "keyword.operator",
-                regex : "<|>|<=|>=|==|!=|-|%|#|\\+|\\$|\\+|\\*"
-            }, {
-                token : "paren.lparen",
-                regex : "[[({]"
-            }, {
-                token : "paren.rparen",
-                regex : "[\\])}]"
-            }, {
-                token : "text",
-                regex : "\\s+"
-            }
-        ],
-        "comment" : [
-            {
-                token : "comment", // closing comment
-                regex : ".*?\\*\\/",
-                next : "start"
-            }, {
-                token : "comment", // comment spanning whole line
-                merge : true,
-                regex : ".+"
-            }
-        ]
-    };
-};
-
-oop.inherits(LessHighlightRules, TextHighlightRules);
-
-exports.LessHighlightRules = LessHighlightRules;
-
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/matching_brace_outdent', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../range").Range;
-
-var MatchingBraceOutdent = function() {};
-
-(function() {
-
-    this.checkOutdent = function(line, input) {
-        if (! /^\s+$/.test(line))
-            return false;
-
-        return /^\s*\}/.test(input);
-    };
-
-    this.autoOutdent = function(doc, row) {
-        var line = doc.getLine(row);
-        var match = line.match(/^(\s*\})/);
-
-        if (!match) return 0;
-
-        var column = match[1].length;
-        var openBracePos = doc.findMatchingBracket({row: row, column: column});
-
-        if (!openBracePos || openBracePos.row == row) return 0;
-
-        var indent = this.$getIndent(doc.getLine(openBracePos.row));
-        doc.replace(new Range(row, 0, row, column-1), indent);
-    };
-
-    this.$getIndent = function(line) {
-        var match = line.match(/^(\s+)/);
-        if (match) {
-            return match[1];
-        }
-
-        return "";
-    };
-
-}).call(MatchingBraceOutdent.prototype);
-
-exports.MatchingBraceOutdent = MatchingBraceOutdent;
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/folding/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/range', 'ace/mode/folding/fold_mode'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var Range = require("../../range").Range;
-var BaseFoldMode = require("./fold_mode").FoldMode;
-
-var FoldMode = exports.FoldMode = function() {};
-oop.inherits(FoldMode, BaseFoldMode);
-
-(function() {
-
-    this.foldingStartMarker = /(\{|\[)[^\}\]]*$|^\s*(\/\*)/;
-    this.foldingStopMarker = /^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/;
-    
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        var line = session.getLine(row);
-        var match = line.match(this.foldingStartMarker);
-        if (match) {
-            var i = match.index;
-
-            if (match[1])
-                return this.openingBracketBlock(session, match[1], row, i);
-
-            var range = session.getCommentFoldRange(row, i + match[0].length);
-            range.end.column -= 2;
-            return range;
-        }
-
-        if (foldStyle !== "markbeginend")
-            return;
-            
-        var match = line.match(this.foldingStopMarker);
-        if (match) {
-            var i = match.index + match[0].length;
-
-            if (match[2]) {
-                var range = session.getCommentFoldRange(row, i);
-                range.end.column -= 2;
-                return range;
-            }
-
-            var end = {row: row, column: i};
-            var start = session.$findOpeningBracket(match[1], end);
-            
-            if (!start)
-                return;
-
-            start.column++;
-            end.column--;
-
-            return  Range.fromPoints(start, end);
-        }
-    };
-    
-}).call(FoldMode.prototype);
-
-});/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/folding/fold_mode', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../../range").Range;
-
-var FoldMode = exports.FoldMode = function() {};
-
-(function() {
-
-    this.foldingStartMarker = null;
-    this.foldingStopMarker = null;
-
-    // must return "" if there's no fold, to enable caching
-    this.getFoldWidget = function(session, foldStyle, row) {
-        var line = session.getLine(row);
-        if (this.foldingStartMarker.test(line))
-            return "start";
-        if (foldStyle == "markbeginend"
-                && this.foldingStopMarker
-                && this.foldingStopMarker.test(line))
-            return "end";
-        return "";
-    };
-    
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        return null;
-    };
-
-    this.indentationBlock = function(session, row, column) {
-        var re = /^\s*/;
-        var startRow = row;
-        var endRow = row;
-        var line = session.getLine(row);
-        var startColumn = column || line.length;
-        var startLevel = line.match(re)[0].length;
-        var maxRow = session.getLength()
-        
-        while (++row < maxRow) {
-            line = session.getLine(row);
-            var level = line.match(re)[0].length;
-
-            if (level == line.length)
-                continue;
-
-            if (level <= startLevel)
-                break;
-
-            endRow = row;
-        }
-
-        if (endRow > startRow) {
-            var endColumn = session.getLine(endRow).length;
-            return new Range(startRow, startColumn, endRow, endColumn);
-        }
-    };
-
-    this.openingBracketBlock = function(session, bracket, row, column) {
-        var start = {row: row, column: column + 1};
-        var end = session.$findClosingBracket(bracket, start);
-        if (!end)
-            return;
-
-        var fw = session.foldWidgets[end.row];
-        if (fw == null)
-            fw = this.getFoldWidget(session, end.row);
-
-        if (fw == "start") {
-            end.row --;
-            end.column = session.getLine(end.row).length;
-        }
-        return Range.fromPoints(start, end);
-    };
-
-}).call(FoldMode.prototype);
-
-});
diff --git a/apps/files_texteditor/js/aceeditor/mode-less.js b/apps/files_texteditor/js/aceeditor/mode-less.js
deleted file mode 100644
index 8ecd9aad97..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-less.js
+++ /dev/null
@@ -1 +0,0 @@
-define("ace/mode/less",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/less_highlight_rules","ace/mode/matching_brace_outdent","ace/mode/folding/cstyle"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./less_highlight_rules").LessHighlightRules,h=a("./matching_brace_outdent").MatchingBraceOutdent,i=a("./folding/cstyle").FoldMode,j=function(){this.$tokenizer=new f((new g).getRules(),"i"),this.$outdent=new h,this.foldingRules=new i};d.inherits(j,e),function(){this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a).tokens;if(e.length&&e[e.length-1].type=="comment")return d;var f=b.match(/^.*\{\s*$/);return f&&(d+=c),d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)}}.call(j.prototype),b.Mode=j}),define("ace/mode/less_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("./text_highlight_rules").TextHighlightRules,g=function(){var a=e.arrayToMap(function(){var a="-webkit-|-moz-|-o-|-ms-|-svg-|-pie-|-khtml-".split("|"),b="appearance|background-clip|background-inline-policy|background-origin|background-size|binding|border-bottom-colors|border-left-colors|border-right-colors|border-top-colors|border-end|border-end-color|border-end-style|border-end-width|border-image|border-start|border-start-color|border-start-style|border-start-width|box-align|box-direction|box-flex|box-flexgroup|box-ordinal-group|box-orient|box-pack|box-sizing|column-count|column-gap|column-width|column-rule|column-rule-width|column-rule-style|column-rule-color|float-edge|font-feature-settings|font-language-override|force-broken-image-icon|image-region|margin-end|margin-start|opacity|outline|outline-color|outline-offset|outline-radius|outline-radius-bottomleft|outline-radius-bottomright|outline-radius-topleft|outline-radius-topright|outline-style|outline-width|padding-end|padding-start|stack-sizing|tab-size|text-blink|text-decoration-color|text-decoration-line|text-decoration-style|transform|transform-origin|transition|transition-delay|transition-duration|transition-property|transition-timing-function|user-focus|user-input|user-modify|user-select|window-shadow|border-radius".split("|"),c="azimuth|background-attachment|background-color|background-image|background-position|background-repeat|background|border-bottom-color|border-bottom-style|border-bottom-width|border-bottom|border-collapse|border-color|border-left-color|border-left-style|border-left-width|border-left|border-right-color|border-right-style|border-right-width|border-right|border-spacing|border-style|border-top-color|border-top-style|border-top-width|border-top|border-width|border|bottom|box-sizing|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-adjust|font-size|font-stretch|font-style|font-variant|font-weight|font|height|left|letter-spacing|line-height|list-style-image|list-style-position|list-style-type|list-style|margin-bottom|margin-left|margin-right|margin-top|marker-offset|margin|marks|max-height|max-width|min-height|min-width|opacity|orphans|outline-color|outline-style|outline-width|outline|overflow|overflow-x|overflow-y|padding-bottom|padding-left|padding-right|padding-top|padding|page-break-after|page-break-before|page-break-inside|page|pause-after|pause-before|pause|pitch-range|pitch|play-during|position|quotes|richness|right|size|speak-header|speak-numeral|speak-punctuation|speech-rate|speak|stress|table-layout|text-align|text-decoration|text-indent|text-shadow|text-transform|top|unicode-bidi|vertical-align|visibility|voice-family|volume|white-space|widows|width|word-spacing|z-index".split("|"),d=[];for(var e=0,f=a.length;e<f;e++)Array.prototype.push.apply(d,(a[e]+b.join("|"+a[e])).split("|"));return Array.prototype.push.apply(d,b),Array.prototype.push.apply(d,c),d}()),b=e.arrayToMap("hsl|hsla|rgb|rgba|url|attr|counter|counters|lighten|darken|saturate|desaturate|fadein|fadeout|fade|spin|mix|hue|saturation|lightness|alpha|round|ceil|floor|percentage|color|iscolor|isnumber|isstring|iskeyword|isurl|ispixel|ispercentage|isem".split("|")),c=e.arrayToMap("absolute|all-scroll|always|armenian|auto|baseline|below|bidi-override|block|bold|bolder|border-box|both|bottom|break-all|break-word|capitalize|center|char|circle|cjk-ideographic|col-resize|collapse|content-box|crosshair|dashed|decimal-leading-zero|decimal|default|disabled|disc|distribute-all-lines|distribute-letter|distribute-space|distribute|dotted|double|e-resize|ellipsis|fixed|georgian|groove|hand|hebrew|help|hidden|hiragana-iroha|hiragana|horizontal|ideograph-alpha|ideograph-numeric|ideograph-parenthesis|ideograph-space|inactive|inherit|inline-block|inline|inset|inside|inter-ideograph|inter-word|italic|justify|katakana-iroha|katakana|keep-all|left|lighter|line-edge|line-through|line|list-item|loose|lower-alpha|lower-greek|lower-latin|lower-roman|lowercase|lr-tb|ltr|medium|middle|move|n-resize|ne-resize|newspaper|no-drop|no-repeat|nw-resize|none|normal|not-allowed|nowrap|oblique|outset|outside|overline|pointer|progress|relative|repeat-x|repeat-y|repeat|right|ridge|row-resize|rtl|s-resize|scroll|se-resize|separate|small-caps|solid|square|static|strict|super|sw-resize|table-footer-group|table-header-group|tb-rl|text-bottom|text-top|text|thick|thin|top|transparent|underline|upper-alpha|upper-latin|upper-roman|uppercase|vertical-ideographic|vertical-text|visible|w-resize|wait|whitespace|zero".split("|")),d=e.arrayToMap("aqua|black|blue|fuchsia|gray|green|lime|maroon|navy|olive|orange|purple|red|silver|teal|white|yellow".split("|")),f=e.arrayToMap("@mixin|@extend|@include|@import|@media|@debug|@warn|@if|@for|@each|@while|@else|@font-face|@-webkit-keyframes|if|and|!default|module|def|end|declare|when|not|and".split("|")),g=e.arrayToMap("a|abbr|acronym|address|applet|area|article|aside|audio|b|base|basefont|bdo|big|blockquote|body|br|button|canvas|caption|center|cite|code|col|colgroup|command|datalist|dd|del|details|dfn|dir|div|dl|dt|em|embed|fieldset|figcaption|figure|font|footer|form|frame|frameset|h1|h2|h3|h4|h5|h6|head|header|hgroup|hr|html|i|iframe|img|input|ins|keygen|kbd|label|legend|li|link|map|mark|menu|meta|meter|nav|noframes|noscript|object|ol|optgroup|option|output|p|param|pre|progress|q|rp|rt|ruby|s|samp|script|section|select|small|source|span|strike|strong|style|sub|summary|sup|table|tbody|td|textarea|tfoot|th|thead|time|title|tr|tt|u|ul|var|video|wbr|xmp".split("|")),h="\\-?(?:(?:[0-9]+)|(?:[0-9]*\\.[0-9]+))";this.$rules={start:[{token:"comment",regex:"\\/\\/.*$"},{token:"comment",merge:!0,regex:"\\/\\*",next:"comment"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:"constant.numeric",regex:h+"(?:em|ex|px|cm|mm|in|pt|pc|deg|rad|grad|ms|s|hz|khz|%)"},{token:"constant.numeric",regex:"#[a-f0-9]{6}"},{token:"constant.numeric",regex:"#[a-f0-9]{3}"},{token:"constant.numeric",regex:h},{token:function(a){return f.hasOwnProperty(a)?"keyword":"variable"},regex:"@[a-z0-9_\\-@]*\\b"},{token:function(e){return a.hasOwnProperty(e.toLowerCase())?"support.type":f.hasOwnProperty(e)?"keyword":c.hasOwnProperty(e)?"constant.language":b.hasOwnProperty(e)?"support.function":d.hasOwnProperty(e.toLowerCase())?"support.constant.color":g.hasOwnProperty(e.toLowerCase())?"variable.language":"text"},regex:"\\-?[@a-z_][@a-z0-9_\\-]*"},{token:"variable.language",regex:"#[a-z0-9-_]+"},{token:"variable.language",regex:"\\.[a-z0-9-_]+"},{token:"variable.language",regex:":[a-z0-9-_]+"},{token:"constant",regex:"[a-z0-9-_]+"},{token:"keyword.operator",regex:"<|>|<=|>=|==|!=|-|%|#|\\+|\\$|\\+|\\*"},{token:"paren.lparen",regex:"[[({]"},{token:"paren.rparen",regex:"[\\])}]"},{token:"text",regex:"\\s+"}],comment:[{token:"comment",regex:".*?\\*\\/",next:"start"},{token:"comment",merge:!0,regex:".+"}]}};d.inherits(g,f),b.LessHighlightRules=g}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../range").Range,e=function(){};(function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}}).call(e.prototype),b.MatchingBraceOutdent=e}),define("ace/mode/folding/cstyle",["require","exports","module","ace/lib/oop","ace/range","ace/mode/folding/fold_mode"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../../range").Range,f=a("./fold_mode").FoldMode,g=b.FoldMode=function(){};d.inherits(g,f),function(){this.foldingStartMarker=/(\{|\[)[^\}\]]*$|^\s*(\/\*)/,this.foldingStopMarker=/^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/,this.getFoldWidgetRange=function(a,b,c){var d=a.getLine(c),f=d.match(this.foldingStartMarker);if(f){var g=f.index;if(f[1])return this.openingBracketBlock(a,f[1],c,g);var h=a.getCommentFoldRange(c,g+f[0].length);return h.end.column-=2,h}if(b!=="markbeginend")return;var f=d.match(this.foldingStopMarker);if(f){var g=f.index+f[0].length;if(f[2]){var h=a.getCommentFoldRange(c,g);return h.end.column-=2,h}var i={row:c,column:g},j=a.$findOpeningBracket(f[1],i);if(!j)return;return j.column++,i.column--,e.fromPoints(j,i)}}}.call(g.prototype)}),define("ace/mode/folding/fold_mode",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../../range").Range,e=b.FoldMode=function(){};(function(){this.foldingStartMarker=null,this.foldingStopMarker=null,this.getFoldWidget=function(a,b,c){var d=a.getLine(c);return this.foldingStartMarker.test(d)?"start":b=="markbeginend"&&this.foldingStopMarker&&this.foldingStopMarker.test(d)?"end":""},this.getFoldWidgetRange=function(a,b,c){return null},this.indentationBlock=function(a,b,c){var e=/^\s*/,f=b,g=b,h=a.getLine(b),i=c||h.length,j=h.match(e)[0].length,k=a.getLength();while(++b<k){h=a.getLine(b);var l=h.match(e)[0].length;if(l==h.length)continue;if(l<=j)break;g=b}if(g>f){var m=a.getLine(g).length;return new d(f,i,g,m)}},this.openingBracketBlock=function(a,b,c,e){var f={row:c,column:e+1},g=a.$findClosingBracket(b,f);if(!g)return;var h=a.foldWidgets[g.row];return h==null&&(h=this.getFoldWidget(a,g.row)),h=="start"&&(g.row--,g.column=a.getLine(g.row).length),d.fromPoints(f,g)}}).call(e.prototype)})
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-liquid-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-liquid-uncompressed.js
deleted file mode 100644
index 6e9b689e85..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-liquid-uncompressed.js
+++ /dev/null
@@ -1,1332 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/liquid', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/liquid_highlight_rules', 'ace/mode/matching_brace_outdent', 'ace/range'], function(require, exports, module) {
-
-var oop = require("../lib/oop");
-var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
-var LiquidHighlightRules = require("./liquid_highlight_rules").LiquidHighlightRules;
-var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
-var Range = require("../range").Range;
-
-var Mode = function() {
-    this.$tokenizer = new Tokenizer(new LiquidHighlightRules().getRules());
-    this.$outdent = new MatchingBraceOutdent();
-};
-oop.inherits(Mode, TextMode);
-
-(function() {
-
-    this.toggleCommentLines = function(state, doc, startRow, endRow) {
-        var outdent = true;
-        var outentedRows = [];
-        var re = /^(\s*)#/;
-
-        for (var i=startRow; i<= endRow; i++) {
-            if (!re.test(doc.getLine(i))) {
-                outdent = false;
-                break;
-            }
-        }
-
-        if (outdent) {
-            var deleteRange = new Range(0, 0, 0, 0);
-            for (var i=startRow; i<= endRow; i++)
-            {
-                var line = doc.getLine(i);
-                var m = line.match(re);
-                deleteRange.start.row = i;
-                deleteRange.end.row = i;
-                deleteRange.end.column = m[0].length;
-                doc.replace(deleteRange, m[1]);
-            }
-        }
-        else {
-            doc.indentRows(startRow, endRow, "#");
-        }
-    };
-
-    this.getNextLineIndent = function(state, line, tab) {
-        var indent = this.$getIndent(line);
-
-        var tokenizedLine = this.$tokenizer.getLineTokens(line, state);
-        var tokens = tokenizedLine.tokens;
-        var endState = tokenizedLine.state;
-
-        if (tokens.length && tokens[tokens.length-1].type == "comment") {
-            return indent;
-        }
-
-        if (state == "start") {
-            var match = line.match(/^.*[\{\(\[]\s*$/);
-            if (match) {
-                indent += tab;
-            }
-        }
-
-        return indent;
-    };
-
-    this.checkOutdent = function(state, line, input) {
-        return this.$outdent.checkOutdent(line, input);
-    };
-
-    this.autoOutdent = function(state, doc, row) {
-        this.$outdent.autoOutdent(doc, row);
-    };
-
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/liquid_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/css_highlight_rules', 'ace/mode/javascript_highlight_rules', 'ace/lib/lang', 'ace/mode/xml_util', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var CssHighlightRules = require("./css_highlight_rules").CssHighlightRules;
-var JavaScriptHighlightRules = require("./javascript_highlight_rules").JavaScriptHighlightRules;
-var lang = require("../lib/lang");
-var xmlUtil = require("./xml_util");
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var LiquidHighlightRules = function() {
-
-    // see: https://developer.mozilla.org/en/Liquid/Reference/Global_Objects
-    var functions = lang.arrayToMap(
-      // Standard Filters
-        ("date|capitalize|downcase|upcase|first|last|join|sort|map|size|escape|" +
-         "escape_once|strip_html|strip_newlines|newline_to_br|replace|replace_first|" +
-         "truncate|truncatewords|prepend|append|minus|plus|times|divided_by|split"
-      ).split("|")
-    );
-
-    var keywords = lang.arrayToMap(
-      // Standard Tags
-        ("capture|endcapture|case|endcase|when|comment|endcomment|" +
-        "cycle|for|endfor|in|reversed|if|endif|else|elsif|include|endinclude|unless|endunless|" +
-     // Commonly used tags
-        "style|text|image|widget|plugin|marker|endmarker|tablerow|endtablerow").split("|")
-    );
-
-    var builtinVariables = lang.arrayToMap(
-        ['forloop']
-        // ("forloop\\.(length|index|index0|rindex|rindex0|first|last)|limit|offset|range" +
-        // "tablerowloop\\.(length|index|index0|rindex|rindex0|first|last|col|col0|"+
-        // "col_first|col_last)").split("|")
-    );
-
-    var definitions = lang.arrayToMap(("assign").split("|"));
-
-    // regexp must not have capturing parentheses. Use (?:) instead.
-    // regexps are ordered -> the first match is used
-
-    this.$rules = {
-            start : [{
-                token : "variable",
-                regex : "{%",
-                next : "liquid_start"
-            }, {
-                token : "variable",
-                regex : "{{",
-                next : "liquid_start"
-            }, {
-                token : "meta.tag",
-                merge : true,
-                regex : "<\\!\\[CDATA\\[",
-                next : "cdata"
-            }, {
-                token : "xml_pe",
-                regex : "<\\?.*?\\?>"
-            }, {
-                token : "comment",
-                merge : true,
-                regex : "<\\!--",
-                next : "comment"
-            }, {
-                token : "meta.tag",
-                regex : "<(?=\\s*script\\b)",
-                next : "script"
-            }, {
-                token : "meta.tag",
-                regex : "<(?=\\s*style\\b)",
-                next : "style"
-            }, {
-                token : "meta.tag", // opening tag
-                regex : "<\\/?",
-                next : "tag"
-            }, {
-                token : "text",
-                regex : "\\s+"
-            }, {
-                token : "text",
-                regex : "[^<]+"
-            } ],
-
-            cdata : [ {
-                token : "text",
-                regex : "\\]\\]>",
-                next : "start"
-            }, {
-                token : "text",
-                merge : true,
-                regex : "\\s+"
-            }, {
-                token : "text",
-                merge : true,
-                regex : ".+"
-            } ],
-
-            comment : [ {
-                token : "comment",
-                regex : ".*?-->",
-                next : "start"
-            }, {
-                token : "comment",
-                merge : true,
-                regex : ".+"
-            } ] ,
-
-            liquid_start : [{
-                token: "variable",
-                regex: "}}",
-                next: "start"
-            }, {
-                token: "variable",
-                regex: "%}",
-                next: "start"
-            }, {
-                token : "string", // single line
-                regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
-            }, {
-                token : "string", // single line
-                regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"
-            }, {
-                token : "constant.numeric", // hex
-                regex : "0[xX][0-9a-fA-F]+\\b"
-            }, {
-                token : "constant.numeric", // float
-                regex : "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"
-            }, {
-                token : "constant.language.boolean",
-                regex : "(?:true|false)\\b"
-            }, {
-                token : function(value) {
-                    if (functions.hasOwnProperty(value))
-                        return "support.function";
-                    else if (keywords.hasOwnProperty(value))
-                        return "keyword";
-                    else if (builtinVariables.hasOwnProperty(value))
-                        return "variable.language";
-                    else if (definitions.hasOwnProperty(value))
-                        return "keyword.definition";
-                    else
-                        return "identifier";
-                },
-                regex : "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
-            }, {
-                token : "keyword.operator",
-                regex : "\/|\\*|\\-|\\+|=|!=|\\?\\:"
-            }, {
-                token : "paren.lparen",
-                regex : /[\[\({]/
-            }, {
-                token : "paren.rparen",
-                regex : /[\])}]/
-            }, {
-                token : "text",
-                regex : "\\s+"
-            }]
-    };
-
-    xmlUtil.tag(this.$rules, "tag", "start");
-    xmlUtil.tag(this.$rules, "style", "css-start");
-    xmlUtil.tag(this.$rules, "script", "js-start");
-
-    this.embedRules(JavaScriptHighlightRules, "js-", [{
-        token: "comment",
-        regex: "\\/\\/.*(?=<\\/script>)",
-        next: "tag"
-    }, {
-        token: "meta.tag",
-        regex: "<\\/(?=script)",
-        next: "tag"
-    }]);
-
-    this.embedRules(CssHighlightRules, "css-", [{
-        token: "meta.tag",
-        regex: "<\\/(?=style)",
-        next: "tag"
-    }]);
-};
-oop.inherits(LiquidHighlightRules, TextHighlightRules);
-
-exports.LiquidHighlightRules = LiquidHighlightRules;
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/css_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var lang = require("../lib/lang");
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var CssHighlightRules = function() {
-
-    var properties = lang.arrayToMap(
-        ("animation-fill-mode|alignment-adjust|alignment-baseline|animation-delay|animation-direction|animation-duration|animation-iteration-count|animation-name|animation-play-state|animation-timing-function|animation|appearance|azimuth|backface-visibility|background-attachment|background-break|background-clip|background-color|background-image|background-origin|background-position|background-repeat|background-size|background|baseline-shift|binding|bleed|bookmark-label|bookmark-level|bookmark-state|bookmark-target|border-bottom|border-bottom-color|border-bottom-left-radius|border-bottom-right-radius|border-bottom-style|border-bottom-width|border-collapse|border-color|border-image|border-image-outset|border-image-repeat|border-image-slice|border-image-source|border-image-width|border-left|border-left-color|border-left-style|border-left-width|border-radius|border-right|border-right-color|border-right-style|border-right-width|border-spacing|border-style|border-top|border-top-color|border-top-left-radius|border-top-right-radius|border-top-style|border-top-width|border-width|border|bottom|box-align|box-decoration-break|box-direction|box-flex-group|box-flex|box-lines|box-ordinal-group|box-orient|box-pack|box-shadow|box-sizing|break-after|break-before|break-inside|caption-side|clear|clip|color-profile|color|column-count|column-fill|column-gap|column-rule|column-rule-color|column-rule-style|column-rule-width|column-span|column-width|columns|content|counter-increment|counter-reset|crop|cue-after|cue-before|cue|cursor|direction|display|dominant-baseline|drop-initial-after-adjust|drop-initial-after-align|drop-initial-before-adjust|drop-initial-before-align|drop-initial-size|drop-initial-value|elevation|empty-cells|fit|fit-position|float-offset|float|font-family|font-size|font-size-adjust|font-stretch|font-style|font-variant|font-weight|font|grid-columns|grid-rows|hanging-punctuation|height|hyphenate-after|hyphenate-before|hyphenate-character|hyphenate-lines|hyphenate-resource|hyphens|icon|image-orientation|image-rendering|image-resolution|inline-box-align|left|letter-spacing|line-height|line-stacking-ruby|line-stacking-shift|line-stacking-strategy|line-stacking|list-style-image|list-style-position|list-style-type|list-style|margin-bottom|margin-left|margin-right|margin-top|margin|mark-after|mark-before|mark|marks|marquee-direction|marquee-play-count|marquee-speed|marquee-style|max-height|max-width|min-height|min-width|move-to|nav-down|nav-index|nav-left|nav-right|nav-up|opacity|orphans|outline-color|outline-offset|outline-style|outline-width|outline|overflow-style|overflow-x|overflow-y|overflow|padding-bottom|padding-left|padding-right|padding-top|padding|page-break-after|page-break-before|page-break-inside|page-policy|page|pause-after|pause-before|pause|perspective-origin|perspective|phonemes|pitch-range|pitch|play-during|position|presentation-level|punctuation-trim|quotes|rendering-intent|resize|rest-after|rest-before|rest|richness|right|rotation-point|rotation|ruby-align|ruby-overhang|ruby-position|ruby-span|size|speak-header|speak-numeral|speak-punctuation|speak|speech-rate|stress|string-set|table-layout|target-name|target-new|target-position|target|text-align-last|text-align|text-decoration|text-emphasis|text-height|text-indent|text-justify|text-outline|text-shadow|text-transform|text-wrap|top|transform-origin|transform-style|transform|transition-delay|transition-duration|transition-property|transition-timing-function|transition|unicode-bidi|vertical-align|visibility|voice-balance|voice-duration|voice-family|voice-pitch-range|voice-pitch|voice-rate|voice-stress|voice-volume|volume|white-space-collapse|white-space|widows|width|word-break|word-spacing|word-wrap|z-index").split("|")
-    );
-
-    var functions = lang.arrayToMap(
-        ("rgb|rgba|url|attr|counter|counters").split("|")
-    );
-
-    var constants = lang.arrayToMap(
-        ("absolute|after-edge|after|all-scroll|all|alphabetic|always|antialiased|armenian|auto|avoid-column|avoid-page|avoid|balance|baseline|before-edge|before|below|bidi-override|block-line-height|block|bold|bolder|border-box|both|bottom|box|break-all|break-word|capitalize|caps-height|caption|center|central|char|circle|cjk-ideographic|clone|close-quote|col-resize|collapse|column|consider-shifts|contain|content-box|cover|crosshair|cubic-bezier|dashed|decimal-leading-zero|decimal|default|disabled|disc|disregard-shifts|distribute-all-lines|distribute-letter|distribute-space|distribute|dotted|double|e-resize|ease-in|ease-in-out|ease-out|ease|ellipsis|end|exclude-ruby|fill|fixed|font-size|font|georgian|glyphs|grid-height|groove|hand|hanging|hebrew|help|hidden|hiragana-iroha|hiragana|horizontal|icon|ideograph-alpha|ideograph-numeric|ideograph-parenthesis|ideograph-space|ideographic|inactive|include-ruby|inherit|initial|inline-block|inline-box|inline-line-height|inline-table|inline|inset|inside|inter-ideograph|inter-word|invert|italic|justify|katakana-iroha|katakana|keep-all|last|left|lighter|line-edge|line-through|line|linear|list-item|local|loose|lower-alpha|lower-greek|lower-latin|lower-roman|lowercase|lr-tb|ltr|mathematical|max-height|max-size|medium|menu|message-box|middle|move|n-resize|ne-resize|newspaper|no-change|no-close-quote|no-drop|no-open-quote|no-repeat|none|normal|not-allowed|nowrap|nw-resize|oblique|open-quote|outset|outside|overline|padding-box|page|pointer|pre-line|pre-wrap|pre|preserve-3d|progress|relative|repeat-x|repeat-y|repeat|replaced|reset-size|ridge|right|round|row-resize|rtl|s-resize|scroll|se-resize|separate|slice|small-caps|small-caption|solid|space|square|start|static|status-bar|step-end|step-start|steps|stretch|strict|sub|super|sw-resize|table-caption|table-cell|table-column-group|table-column|table-footer-group|table-header-group|table-row-group|table-row|table|tb-rl|text-after-edge|text-before-edge|text-bottom|text-size|text-top|text|thick|thin|top|transparent|underline|upper-alpha|upper-latin|upper-roman|uppercase|use-script|vertical-ideographic|vertical-text|visible|w-resize|wait|whitespace|z-index|zero").split("|")
-    );
-
-    var colors = lang.arrayToMap(
-        ("aqua|black|blue|fuchsia|gray|green|lime|maroon|navy|olive|orange|" +
-        "purple|red|silver|teal|white|yellow").split("|")
-    );
-
-    var fonts = lang.arrayToMap(
-        ("arial|century|comic|courier|garamond|georgia|helvetica|impact|lucida|" +
-        "symbol|system|tahoma|times|trebuchet|utopia|verdana|webdings|sans-serif|" +
-        "serif|monospace").split("|")
-    );
-    
-    // regexp must not have capturing parentheses. Use (?:) instead.
-    // regexps are ordered -> the first match is used
-
-    var numRe = "\\-?(?:(?:[0-9]+)|(?:[0-9]*\\.[0-9]+))";
-    var pseudoElements = "(\\:+)\\b(after|before|first-letter|first-line|moz-selection|selection)\\b";
-    var pseudoClasses = "(:)\\b(active|checked|disabled|empty|enabled|first-child|first-of-type|focus|hover|indeterminate|invalid|last-child|last-of-type|link|not|nth-child|nth-last-child|nth-last-of-type|nth-of-type|only-child|only-of-type|required|root|target|valid|visited)\\b";
-    
-    var base_ruleset = [
-        {
-            token : "comment", // multi line comment
-            merge : true,
-            regex : "\\/\\*",
-            next : "ruleset_comment"
-        }, {
-            token : "string", // single line
-            regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
-        }, {
-            token : "string", // single line
-            regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"
-        }, {
-            token : ["constant.numeric", "keyword"],
-            regex : "(" + numRe + ")(ch|cm|deg|em|ex|fr|gd|grad|Hz|in|kHz|mm|ms|pc|pt|px|rad|rem|s|turn|vh|vm|vw|%)"
-        }, {
-            token : ["constant.numeric"],
-            regex : "([0-9]+)"
-        }, {
-            token : "constant.numeric",  // hex6 color
-            regex : "#[a-f0-9]{6}"
-        }, {
-            token : "constant.numeric", // hex3 color
-            regex : "#[a-f0-9]{3}"
-        }, {
-            token : ["punctuation", "entity.other.attribute-name.pseudo-element.css"], 
-            regex : pseudoElements
-        }, {
-            token : ["punctuation", "entity.other.attribute-name.pseudo-class.css"], 
-            regex : pseudoClasses
-        }, {
-            token : function(value) {
-                if (properties.hasOwnProperty(value.toLowerCase())) {
-                    return "support.type";
-                }
-                else if (functions.hasOwnProperty(value.toLowerCase())) {
-                    return "support.function";
-                }
-                else if (constants.hasOwnProperty(value.toLowerCase())) {
-                    return "support.constant";
-                }
-                else if (colors.hasOwnProperty(value.toLowerCase())) {
-                    return "support.constant.color";
-                }
-                else if (fonts.hasOwnProperty(value.toLowerCase())) {
-                    return "support.constant.fonts";
-                }
-                else {
-                    return "text";
-                }
-            },
-            regex : "\\-?[a-zA-Z_][a-zA-Z0-9_\\-]*"
-        } 
-      ];
-
-    var ruleset = lang.copyArray(base_ruleset);
-    ruleset.unshift({
-        token : "paren.rparen",
-        regex : "\\}",
-        next:   "start"
-    });
-
-    var media_ruleset = lang.copyArray( base_ruleset );
-    media_ruleset.unshift({
-        token : "paren.rparen",
-        regex : "\\}",
-        next:   "media"
-    });
-
-    var base_comment = [{
-          token : "comment", // comment spanning whole line
-          merge : true,
-          regex : ".+"
-    }];
-
-    var comment = lang.copyArray(base_comment);
-    comment.unshift({
-          token : "comment", // closing comment
-          regex : ".*?\\*\\/",
-          next : "start"
-    });
-
-    var media_comment = lang.copyArray(base_comment);
-    media_comment.unshift({
-          token : "comment", // closing comment
-          regex : ".*?\\*\\/",
-          next : "media"
-    });
-
-    var ruleset_comment = lang.copyArray(base_comment);
-    ruleset_comment.unshift({
-          token : "comment", // closing comment
-          regex : ".*?\\*\\/",
-          next : "ruleset"
-    });
-
-    this.$rules = {
-        "start" : [{
-            token : "comment", // multi line comment
-            merge : true,
-            regex : "\\/\\*",
-            next : "comment"
-        }, {
-            token: "paren.lparen",
-            regex: "\\{",
-            next:  "ruleset"
-        }, {
-            token: "string",
-            regex: "@.*?{",
-            next:  "media"
-        },{
-            token: "keyword",
-            regex: "#[a-z0-9-_]+"
-        },{
-            token: "variable",
-            regex: "\\.[a-z0-9-_]+"
-        },{
-            token: "string",
-            regex: ":[a-z0-9-_]+"
-        },{
-            token: "constant",
-            regex: "[a-z0-9-_]+"
-        }],
-
-        "media" : [ {
-            token : "comment", // multi line comment
-            merge : true,
-            regex : "\\/\\*",
-            next : "media_comment"
-        }, {
-            token: "paren.lparen",
-            regex: "\\{",
-            next:  "media_ruleset"
-        },{
-            token: "string",
-            regex: "\\}",
-            next:  "start"
-        },{
-            token: "keyword",
-            regex: "#[a-z0-9-_]+"
-        },{
-            token: "variable",
-            regex: "\\.[a-z0-9-_]+"
-        },{
-            token: "string",
-            regex: ":[a-z0-9-_]+"
-        },{
-            token: "constant",
-            regex: "[a-z0-9-_]+"
-        }],
-
-        "comment" : comment,
-
-        "ruleset" : ruleset,
-        "ruleset_comment" : ruleset_comment,
-
-        "media_ruleset" : media_ruleset,
-        "media_comment" : media_comment
-    };
-};
-
-oop.inherits(CssHighlightRules, TextHighlightRules);
-
-exports.CssHighlightRules = CssHighlightRules;
-
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Mihai Sucan <mihai DOT sucan AT gmail DOT com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/javascript_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/unicode', 'ace/mode/doc_comment_highlight_rules', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var lang = require("../lib/lang");
-var unicode = require("../unicode");
-var DocCommentHighlightRules = require("./doc_comment_highlight_rules").DocCommentHighlightRules;
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var JavaScriptHighlightRules = function() {
-
-    // see: https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects
-    var globals = lang.arrayToMap(
-      // Constructors
-        ("Array|Boolean|Date|Function|Iterator|Number|Object|RegExp|String|Proxy|" +
-      // E4X
-         "Namespace|QName|XML|XMLList|" +
-         "ArrayBuffer|Float32Array|Float64Array|Int16Array|Int32Array|Int8Array|" +
-         "Uint16Array|Uint32Array|Uint8Array|Uint8ClampedArray|" +
-      // Errors
-        "Error|EvalError|InternalError|RangeError|ReferenceError|StopIteration|" +
-        "SyntaxError|TypeError|URIError|" +
-      //  Non-constructor functions
-        "decodeURI|decodeURIComponent|encodeURI|encodeURIComponent|eval|isFinite|" +
-        "isNaN|parseFloat|parseInt|" +
-      // Other
-        "JSON|Math|" +
-      // Pseudo
-        "this|arguments|prototype|window|document"
-      ).split("|")
-    );
-
-    var keywords = lang.arrayToMap(
-        ("break|case|catch|continue|default|delete|do|else|finally|for|function|" +
-        "if|in|instanceof|new|return|switch|throw|try|typeof|let|var|while|with|" +
-        "const|yield|import|get|set").split("|")
-    );
-
-    // keywords which can be followed by regular expressions
-    var kwBeforeRe = "case|do|else|finally|in|instanceof|return|throw|try|typeof|yield";
-
-    var deprecated = lang.arrayToMap(
-        ("__parent__|__count__|escape|unescape|with|__proto__").split("|")
-    );
-
-    var definitions = lang.arrayToMap(("const|let|var|function").split("|"));
-
-    var buildinConstants = lang.arrayToMap(
-        ("null|Infinity|NaN|undefined").split("|")
-    );
-
-    var futureReserved = lang.arrayToMap(
-        ("class|enum|extends|super|export|implements|private|" +
-        "public|interface|package|protected|static").split("|")
-    );
-
-    // TODO: Unicode escape sequences
-    var identifierRe = "[" + unicode.packages.L + "\\$_]["
-        + unicode.packages.L
-        + unicode.packages.Mn + unicode.packages.Mc
-        + unicode.packages.Nd
-        + unicode.packages.Pc + "\\$_]*\\b";
-
-    var escapedRe = "\\\\(?:x[0-9a-fA-F]{2}|" + // hex
-        "u[0-9a-fA-F]{4}|" + // unicode
-        "[0-2][0-7]{0,2}|" + // oct
-        "3[0-6][0-7]?|" + // oct
-        "37[0-7]?|" + // oct
-        "[4-7][0-7]?|" + //oct
-        ".)";
-
-    // regexp must not have capturing parentheses. Use (?:) instead.
-    // regexps are ordered -> the first match is used
-
-    this.$rules = {
-        "start" : [
-            {
-                token : "comment",
-                regex : /\/\/.*$/
-            },
-            new DocCommentHighlightRules().getStartRule("doc-start"),
-            {
-                token : "comment", // multi line comment
-                merge : true,
-                regex : /\/\*/,
-                next : "comment"
-            }, {
-                token : "string",
-                regex : "'",
-                next  : "qstring"
-            }, {
-                token : "string",
-                regex : '"',
-                next  : "qqstring"
-            }, {
-                token : "constant.numeric", // hex
-                regex : /0[xX][0-9a-fA-F]+\b/
-            }, {
-                token : "constant.numeric", // float
-                regex : /[+-]?\d+(?:(?:\.\d*)?(?:[eE][+-]?\d+)?)?\b/
-            }, { // match stuff like: Sound.prototype.play = function() { }
-                token : [
-                    "storage.type",
-                    "punctuation.operator",
-                    "support.function",
-                    "punctuation.operator",
-                    "entity.name.function",
-                    "text",
-                    "keyword.operator",
-                    "text",
-                    "storage.type",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(" + identifierRe + ")(\\.)(prototype)(\\.)(" + identifierRe +")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"
-            }, { // match stuff like: Sound.prototype.play = myfunc
-                token : [
-                    "storage.type",
-                    "punctuation.operator",
-                    "support.function",
-                    "punctuation.operator",
-                    "entity.name.function",
-                    "text",
-                    "keyword.operator",
-                    "text"
-                ],
-                regex : "(" + identifierRe + ")(\\.)(prototype)(\\.)(" + identifierRe +")(\\s*)(=)(\\s*)"
-            }, { // match stuff like: Sound.play = function() {  }
-                token : [
-                    "storage.type",
-                    "punctuation.operator",
-                    "entity.name.function",
-                    "text",
-                    "keyword.operator",
-                    "text",
-                    "storage.type",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(" + identifierRe + ")(\\.)(" + identifierRe +")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"
-            }, { // match stuff like: play = function() {  }
-                token : [
-                    "entity.name.function",
-                    "text",
-                    "keyword.operator",
-                    "text",
-                    "storage.type",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(" + identifierRe +")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"
-            }, { // match regular function like: function myFunc(arg) { }
-                token : [
-                    "storage.type",
-                    "text",
-                    "entity.name.function",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(function)(\\s+)(" + identifierRe + ")(\\s*)(\\()(.*?)(\\))"
-            }, { // match stuff like: foobar: function() { }
-                token : [
-                    "entity.name.function",
-                    "text",
-                    "punctuation.operator",
-                    "text",
-                    "storage.type",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(" + identifierRe + ")(\\s*)(:)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"
-            }, { // Attempt to match : function() { } (this is for issues with 'foo': function() { })
-                token : [
-                    "text",
-                    "text",
-                    "storage.type",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(:)(\\s*)(function)?(\\s*)(\\()([^)]*)(\\))"
-            }, {
-                token : "constant.language.boolean",
-                regex : /(?:true|false)\b/
-            }, {
-                token : "keyword",
-                regex : "(?:" + kwBeforeRe + ")\\b",
-                next : "regex_allowed"
-            }, {
-                token : ["punctuation.operator", "support.function"],
-                regex : /(\.)(s(?:h(?:ift|ow(?:Mod(?:elessDialog|alDialog)|Help))|croll(?:X|By(?:Pages|Lines)?|Y|To)?|t(?:opzzzz|rike)|i(?:n|zeToContent|debar|gnText)|ort|u(?:p|b(?:str(?:ing)?)?)|pli(?:ce|t)|e(?:nd|t(?:Re(?:sizable|questHeader)|M(?:i(?:nutes|lliseconds)|onth)|Seconds|Ho(?:tKeys|urs)|Year|Cursor|Time(?:out)?|Interval|ZOptions|Date|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Date|FullYear)|FullYear|Active)|arch)|qrt|lice|avePreferences|mall)|h(?:ome|andleEvent)|navigate|c(?:har(?:CodeAt|At)|o(?:s|n(?:cat|textual|firm)|mpile)|eil|lear(?:Timeout|Interval)?|a(?:ptureEvents|ll)|reate(?:StyleSheet|Popup|EventObject))|t(?:o(?:GMTString|S(?:tring|ource)|U(?:TCString|pperCase)|Lo(?:caleString|werCase))|est|a(?:n|int(?:Enabled)?))|i(?:s(?:NaN|Finite)|ndexOf|talics)|d(?:isableExternalCapture|ump|etachEvent)|u(?:n(?:shift|taint|escape|watch)|pdateCommands)|j(?:oin|avaEnabled)|p(?:o(?:p|w)|ush|lugins.refresh|a(?:ddings|rse(?:Int|Float)?)|r(?:int|ompt|eference))|e(?:scape|nableExternalCapture|val|lementFromPoint|x(?:p|ec(?:Script|Command)?))|valueOf|UTC|queryCommand(?:State|Indeterm|Enabled|Value)|f(?:i(?:nd|le(?:ModifiedDate|Size|CreatedDate|UpdatedDate)|xed)|o(?:nt(?:size|color)|rward)|loor|romCharCode)|watch|l(?:ink|o(?:ad|g)|astIndexOf)|a(?:sin|nchor|cos|t(?:tachEvent|ob|an(?:2)?)|pply|lert|b(?:s|ort))|r(?:ou(?:nd|teEvents)|e(?:size(?:By|To)|calc|turnValue|place|verse|l(?:oad|ease(?:Capture|Events)))|andom)|g(?:o|et(?:ResponseHeader|M(?:i(?:nutes|lliseconds)|onth)|Se(?:conds|lection)|Hours|Year|Time(?:zoneOffset)?|Da(?:y|te)|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Da(?:y|te)|FullYear)|FullYear|A(?:ttention|llResponseHeaders)))|m(?:in|ove(?:B(?:y|elow)|To(?:Absolute)?|Above)|ergeAttributes|a(?:tch|rgins|x))|b(?:toa|ig|o(?:ld|rderWidths)|link|ack))\b(?=\()/
-            }, {
-                token : ["punctuation.operator", "support.function.dom"],
-                regex : /(\.)(s(?:ub(?:stringData|mit)|plitText|e(?:t(?:NamedItem|Attribute(?:Node)?)|lect))|has(?:ChildNodes|Feature)|namedItem|c(?:l(?:ick|o(?:se|neNode))|reate(?:C(?:omment|DATASection|aption)|T(?:Head|extNode|Foot)|DocumentFragment|ProcessingInstruction|E(?:ntityReference|lement)|Attribute))|tabIndex|i(?:nsert(?:Row|Before|Cell|Data)|tem)|open|delete(?:Row|C(?:ell|aption)|T(?:Head|Foot)|Data)|focus|write(?:ln)?|a(?:dd|ppend(?:Child|Data))|re(?:set|place(?:Child|Data)|move(?:NamedItem|Child|Attribute(?:Node)?)?)|get(?:NamedItem|Element(?:sBy(?:Name|TagName)|ById)|Attribute(?:Node)?)|blur)\b(?=\()/
-            }, {
-                token : ["punctuation.operator", "support.constant"],
-                regex : /(\.)(s(?:ystemLanguage|cr(?:ipts|ollbars|een(?:X|Y|Top|Left))|t(?:yle(?:Sheets)?|atus(?:Text|bar)?)|ibling(?:Below|Above)|ource|uffixes|e(?:curity(?:Policy)?|l(?:ection|f)))|h(?:istory|ost(?:name)?|as(?:h|Focus))|y|X(?:MLDocument|SLDocument)|n(?:ext|ame(?:space(?:s|URI)|Prop))|M(?:IN_VALUE|AX_VALUE)|c(?:haracterSet|o(?:n(?:structor|trollers)|okieEnabled|lorDepth|mp(?:onents|lete))|urrent|puClass|l(?:i(?:p(?:boardData)?|entInformation)|osed|asses)|alle(?:e|r)|rypto)|t(?:o(?:olbar|p)|ext(?:Transform|Indent|Decoration|Align)|ags)|SQRT(?:1_2|2)|i(?:n(?:ner(?:Height|Width)|put)|ds|gnoreCase)|zIndex|o(?:scpu|n(?:readystatechange|Line)|uter(?:Height|Width)|p(?:sProfile|ener)|ffscreenBuffering)|NEGATIVE_INFINITY|d(?:i(?:splay|alog(?:Height|Top|Width|Left|Arguments)|rectories)|e(?:scription|fault(?:Status|Ch(?:ecked|arset)|View)))|u(?:ser(?:Profile|Language|Agent)|n(?:iqueID|defined)|pdateInterval)|_content|p(?:ixelDepth|ort|ersonalbar|kcs11|l(?:ugins|atform)|a(?:thname|dding(?:Right|Bottom|Top|Left)|rent(?:Window|Layer)?|ge(?:X(?:Offset)?|Y(?:Offset)?))|r(?:o(?:to(?:col|type)|duct(?:Sub)?|mpter)|e(?:vious|fix)))|e(?:n(?:coding|abledPlugin)|x(?:ternal|pando)|mbeds)|v(?:isibility|endor(?:Sub)?|Linkcolor)|URLUnencoded|P(?:I|OSITIVE_INFINITY)|f(?:ilename|o(?:nt(?:Size|Family|Weight)|rmName)|rame(?:s|Element)|gColor)|E|whiteSpace|l(?:i(?:stStyleType|n(?:eHeight|kColor))|o(?:ca(?:tion(?:bar)?|lName)|wsrc)|e(?:ngth|ft(?:Context)?)|a(?:st(?:M(?:odified|atch)|Index|Paren)|yer(?:s|X)|nguage))|a(?:pp(?:MinorVersion|Name|Co(?:deName|re)|Version)|vail(?:Height|Top|Width|Left)|ll|r(?:ity|guments)|Linkcolor|bove)|r(?:ight(?:Context)?|e(?:sponse(?:XML|Text)|adyState))|global|x|m(?:imeTypes|ultiline|enubar|argin(?:Right|Bottom|Top|Left))|L(?:N(?:10|2)|OG(?:10E|2E))|b(?:o(?:ttom|rder(?:Width|RightWidth|BottomWidth|Style|Color|TopWidth|LeftWidth))|ufferDepth|elow|ackground(?:Color|Image)))\b/
-            }, {
-                token : ["storage.type", "punctuation.operator", "support.function.firebug"],
-                regex : /(console)(\.)(warn|info|log|error|time|timeEnd|assert)\b/
-            }, {
-                token : function(value) {
-                    if (globals.hasOwnProperty(value))
-                        return "variable.language";
-                    else if (deprecated.hasOwnProperty(value))
-                        return "invalid.deprecated";
-                    else if (definitions.hasOwnProperty(value))
-                        return "storage.type";
-                    else if (keywords.hasOwnProperty(value))
-                        return "keyword";
-                    else if (buildinConstants.hasOwnProperty(value))
-                        return "constant.language";
-                    else if (futureReserved.hasOwnProperty(value))
-                        return "invalid.illegal";
-                    else if (value == "debugger")
-                        return "invalid.deprecated";
-                    else
-                        return "identifier";
-                },
-                regex : identifierRe
-            }, {
-                token : "keyword.operator",
-                regex : /!|\$|%|&|\*|\-\-|\-|\+\+|\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\|\||\?\:|\*=|%=|\+=|\-=|&=|\^=|\b(?:in|instanceof|new|delete|typeof|void)/,
-                next  : "regex_allowed"
-            }, {
-                token : "punctuation.operator",
-                regex : /\?|\:|\,|\;|\./,
-                next  : "regex_allowed"
-            }, {
-                token : "paren.lparen",
-                regex : /[\[({]/,
-                next  : "regex_allowed"
-            }, {
-                token : "paren.rparen",
-                regex : /[\])}]/
-            }, {
-                token : "keyword.operator",
-                regex : /\/=?/,
-                next  : "regex_allowed"
-            }, {
-                token: "comment",
-                regex: /^#!.*$/
-            }, {
-                token : "text",
-                regex : /\s+/
-            }
-        ],
-        // regular expressions are only allowed after certain tokens. This
-        // makes sure we don't mix up regexps with the divison operator
-        "regex_allowed": [
-            {
-                token : "comment", // multi line comment
-                merge : true,
-                regex : "\\/\\*",
-                next : "comment_regex_allowed"
-            }, {
-                token : "comment",
-                regex : "\\/\\/.*$"
-            }, {
-                token: "string.regexp",
-                regex: "\\/",
-                next: "regex",
-                merge: true
-            }, {
-                token : "text",
-                regex : "\\s+"
-            }, {
-                // immediately return to the start mode without matching
-                // anything
-                token: "empty",
-                regex: "",
-                next: "start"
-            }
-        ],
-        "regex": [
-            {
-                token: "regexp.keyword.operator",
-                regex: "\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",
-                next: "regex"
-            }, {
-				// flag
-                token: "string.regexp",
-                regex: "/\\w*",
-                next: "start",
-                merge: true
-            }, {
-                token: "string.regexp",
-                regex: "[^\\\\/\\[]+",
-                next: "regex",
-                merge: true
-            }, {
-                token: "string.regexp.charachterclass",
-                regex: "\\[",
-                next: "regex_character_class",
-                merge: true
-            }, {
-                token: "empty",
-                regex: "",
-                next: "start"
-            }
-        ],
-        "regex_character_class": [
-            {
-                token: "regexp.keyword.operator",
-                regex: "\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",
-                next: "regex_character_class"
-            }, {
-                token: "string.regexp.charachterclass",
-                regex: "]",
-                next: "regex",
-                merge: true
-            }, {
-                token: "string.regexp.charachterclass",
-                regex: "[^\\\\\\]]+",
-                next: "regex_character_class",
-                merge: true
-            }, {
-                token: "empty",
-                regex: "",
-                next: "start"
-            }
-        ],
-        "comment_regex_allowed" : [
-            {
-                token : "comment", // closing comment
-                regex : ".*?\\*\\/",
-                merge : true,
-                next : "regex_allowed"
-            }, {
-                token : "comment", // comment spanning whole line
-                merge : true,
-                regex : ".+"
-            }
-        ],
-        "comment" : [
-            {
-                token : "comment", // closing comment
-                regex : ".*?\\*\\/",
-                merge : true,
-                next : "start"
-            }, {
-                token : "comment", // comment spanning whole line
-                merge : true,
-                regex : ".+"
-            }
-        ],
-        "qqstring" : [
-            {
-                token : "constant.language.escape",
-                regex : escapedRe
-            }, {
-                token : "string",
-                regex : '[^"\\\\]+'
-            }, {
-                token : "string",
-                regex : '"',
-                next  : "start"
-            }
-        ],
-        "qstring" : [
-            {
-                token : "constant.language.escape",
-                regex : escapedRe
-            }, {
-                token : "string",
-                regex : "[^'\\\\]+"
-            }, {
-                token : "string",
-                regex : "'",
-                next  : "start"
-            }
-        ]
-    };
-
-    this.embedRules(DocCommentHighlightRules, "doc-",
-        [ new DocCommentHighlightRules().getEndRule("start") ]);
-};
-
-oop.inherits(JavaScriptHighlightRules, TextHighlightRules);
-
-exports.JavaScriptHighlightRules = JavaScriptHighlightRules;
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/doc_comment_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var DocCommentHighlightRules = function() {
-
-    this.$rules = {
-        "start" : [ {
-            token : "comment.doc.tag",
-            regex : "@[\\w\\d_]+" // TODO: fix email addresses
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "\\s+"
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "TODO"
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "[^@\\*]+"
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "."
-        }]
-    };
-};
-
-oop.inherits(DocCommentHighlightRules, TextHighlightRules);
-
-(function() {
-
-    this.getStartRule = function(start) {
-        return {
-            token : "comment.doc", // doc comment
-            merge : true,
-            regex : "\\/\\*(?=\\*)",
-            next  : start
-        };
-    };
-    
-    this.getEndRule = function (start) {
-        return {
-            token : "comment.doc", // closing comment
-            merge : true,
-            regex : "\\*\\/",
-            next  : start
-        };
-    };
-
-}).call(DocCommentHighlightRules.prototype);
-
-exports.DocCommentHighlightRules = DocCommentHighlightRules;
-
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/xml_util', ['require', 'exports', 'module' , 'ace/lib/lang'], function(require, exports, module) {
-"use strict";
-
-var lang = require("../lib/lang");
-
-var formTags = lang.arrayToMap(
-    ("button|form|input|label|select|textarea").split("|")
-);
-
-var tableTags = lang.arrayToMap(
-    ("table|tbody|td|tfoot|th|tr").split("|")
-);
-
-function string(state) {
-    return [{
-        token : "string",
-        regex : '".*?"'
-    }, {
-        token : "string", // multi line string start
-        merge : true,
-        regex : '["].*',
-        next : state + "_qqstring"
-    }, {
-        token : "string",
-        regex : "'.*?'"
-    }, {
-        token : "string", // multi line string start
-        merge : true,
-        regex : "['].*",
-        next : state + "_qstring"
-    }];
-}
-
-function multiLineString(quote, state) {
-    return [{
-        token : "string",
-        merge : true,
-        regex : ".*?" + quote,
-        next : state
-    }, {
-        token : "string",
-        merge : true,
-        regex : '.+'
-    }];
-}
-
-exports.tag = function(states, name, nextState) {
-    states[name] = [{
-        token : "text",
-        regex : "\\s+"
-    }, {
-        //token : "meta.tag",
-        
-    token : function(value) {
-            if ( value==='a' ) {
-                return "meta.tag.anchor";
-            }
-            else if ( value==='img' ) {
-                return "meta.tag.image";
-            }
-            else if ( value==='script' ) {
-                return "meta.tag.script";
-            }
-            else if ( value==='style' ) {
-                return "meta.tag.style";
-            }
-            else if (formTags.hasOwnProperty(value.toLowerCase())) {
-                return "meta.tag.form";
-            }
-            else if (tableTags.hasOwnProperty(value.toLowerCase())) {
-                return "meta.tag.table";
-            }
-            else {
-                return "meta.tag";
-            }
-        },        
-        merge : true,
-        regex : "[-_a-zA-Z0-9:]+",
-        next : name + "_embed_attribute_list" 
-    }, {
-        token: "empty",
-        regex: "",
-        next : name + "_embed_attribute_list"
-    }];
-
-    states[name + "_qstring"] = multiLineString("'", name + "_embed_attribute_list");
-    states[name + "_qqstring"] = multiLineString("\"", name + "_embed_attribute_list");
-    
-    states[name + "_embed_attribute_list"] = [{
-        token : "meta.tag",
-        merge : true,
-        regex : "\/?>",
-        next : nextState
-    }, {
-        token : "keyword.operator",
-        regex : "="
-    }, {
-        token : "entity.other.attribute-name",
-        regex : "[-_a-zA-Z0-9:]+"
-    }, {
-        token : "constant.numeric", // float
-        regex : "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"
-    }, {
-        token : "text",
-        regex : "\\s+"
-    }].concat(string(name));
-};
-
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/matching_brace_outdent', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../range").Range;
-
-var MatchingBraceOutdent = function() {};
-
-(function() {
-
-    this.checkOutdent = function(line, input) {
-        if (! /^\s+$/.test(line))
-            return false;
-
-        return /^\s*\}/.test(input);
-    };
-
-    this.autoOutdent = function(doc, row) {
-        var line = doc.getLine(row);
-        var match = line.match(/^(\s*\})/);
-
-        if (!match) return 0;
-
-        var column = match[1].length;
-        var openBracePos = doc.findMatchingBracket({row: row, column: column});
-
-        if (!openBracePos || openBracePos.row == row) return 0;
-
-        var indent = this.$getIndent(doc.getLine(openBracePos.row));
-        doc.replace(new Range(row, 0, row, column-1), indent);
-    };
-
-    this.$getIndent = function(line) {
-        var match = line.match(/^(\s+)/);
-        if (match) {
-            return match[1];
-        }
-
-        return "";
-    };
-
-}).call(MatchingBraceOutdent.prototype);
-
-exports.MatchingBraceOutdent = MatchingBraceOutdent;
-});
diff --git a/apps/files_texteditor/js/aceeditor/mode-liquid.js b/apps/files_texteditor/js/aceeditor/mode-liquid.js
deleted file mode 100644
index 1a23cc53ab..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-liquid.js
+++ /dev/null
@@ -1 +0,0 @@
-define("ace/mode/liquid",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/liquid_highlight_rules","ace/mode/matching_brace_outdent","ace/range"],function(a,b,c){var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./liquid_highlight_rules").LiquidHighlightRules,h=a("./matching_brace_outdent").MatchingBraceOutdent,i=a("../range").Range,j=function(){this.$tokenizer=new f((new g).getRules()),this.$outdent=new h};d.inherits(j,e),function(){this.toggleCommentLines=function(a,b,c,d){var e=!0,f=[],g=/^(\s*)#/;for(var h=c;h<=d;h++)if(!g.test(b.getLine(h))){e=!1;break}if(e){var j=new i(0,0,0,0);for(var h=c;h<=d;h++){var k=b.getLine(h),l=k.match(g);j.start.row=h,j.end.row=h,j.end.column=l[0].length,b.replace(j,l[1])}}else b.indentRows(c,d,"#")},this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a),f=e.tokens,g=e.state;if(f.length&&f[f.length-1].type=="comment")return d;if(a=="start"){var h=b.match(/^.*[\{\(\[]\s*$/);h&&(d+=c)}return d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)}}.call(j.prototype),b.Mode=j}),define("ace/mode/liquid_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/css_highlight_rules","ace/mode/javascript_highlight_rules","ace/lib/lang","ace/mode/xml_util","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./css_highlight_rules").CssHighlightRules,f=a("./javascript_highlight_rules").JavaScriptHighlightRules,g=a("../lib/lang"),h=a("./xml_util"),i=a("./text_highlight_rules").TextHighlightRules,j=function(){var a=g.arrayToMap("date|capitalize|downcase|upcase|first|last|join|sort|map|size|escape|escape_once|strip_html|strip_newlines|newline_to_br|replace|replace_first|truncate|truncatewords|prepend|append|minus|plus|times|divided_by|split".split("|")),b=g.arrayToMap("capture|endcapture|case|endcase|when|comment|endcomment|cycle|for|endfor|in|reversed|if|endif|else|elsif|include|endinclude|unless|endunless|style|text|image|widget|plugin|marker|endmarker|tablerow|endtablerow".split("|")),c=g.arrayToMap(["forloop"]),d=g.arrayToMap("assign".split("|"));this.$rules={start:[{token:"variable",regex:"{%",next:"liquid_start"},{token:"variable",regex:"{{",next:"liquid_start"},{token:"meta.tag",merge:!0,regex:"<\\!\\[CDATA\\[",next:"cdata"},{token:"xml_pe",regex:"<\\?.*?\\?>"},{token:"comment",merge:!0,regex:"<\\!--",next:"comment"},{token:"meta.tag",regex:"<(?=\\s*script\\b)",next:"script"},{token:"meta.tag",regex:"<(?=\\s*style\\b)",next:"style"},{token:"meta.tag",regex:"<\\/?",next:"tag"},{token:"text",regex:"\\s+"},{token:"text",regex:"[^<]+"}],cdata:[{token:"text",regex:"\\]\\]>",next:"start"},{token:"text",merge:!0,regex:"\\s+"},{token:"text",merge:!0,regex:".+"}],comment:[{token:"comment",regex:".*?-->",next:"start"},{token:"comment",merge:!0,regex:".+"}],liquid_start:[{token:"variable",regex:"}}",next:"start"},{token:"variable",regex:"%}",next:"start"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:"constant.numeric",regex:"0[xX][0-9a-fA-F]+\\b"},{token:"constant.numeric",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:"constant.language.boolean",regex:"(?:true|false)\\b"},{token:function(e){return a.hasOwnProperty(e)?"support.function":b.hasOwnProperty(e)?"keyword":c.hasOwnProperty(e)?"variable.language":d.hasOwnProperty(e)?"keyword.definition":"identifier"},regex:"[a-zA-Z_$][a-zA-Z0-9_$]*\\b"},{token:"keyword.operator",regex:"/|\\*|\\-|\\+|=|!=|\\?\\:"},{token:"paren.lparen",regex:/[\[\({]/},{token:"paren.rparen",regex:/[\])}]/},{token:"text",regex:"\\s+"}]},h.tag(this.$rules,"tag","start"),h.tag(this.$rules,"style","css-start"),h.tag(this.$rules,"script","js-start"),this.embedRules(f,"js-",[{token:"comment",regex:"\\/\\/.*(?=<\\/script>)",next:"tag"},{token:"meta.tag",regex:"<\\/(?=script)",next:"tag"}]),this.embedRules(e,"css-",[{token:"meta.tag",regex:"<\\/(?=style)",next:"tag"}])};d.inherits(j,i),b.LiquidHighlightRules=j}),define("ace/mode/css_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("./text_highlight_rules").TextHighlightRules,g=function(){var a=e.arrayToMap("animation-fill-mode|alignment-adjust|alignment-baseline|animation-delay|animation-direction|animation-duration|animation-iteration-count|animation-name|animation-play-state|animation-timing-function|animation|appearance|azimuth|backface-visibility|background-attachment|background-break|background-clip|background-color|background-image|background-origin|background-position|background-repeat|background-size|background|baseline-shift|binding|bleed|bookmark-label|bookmark-level|bookmark-state|bookmark-target|border-bottom|border-bottom-color|border-bottom-left-radius|border-bottom-right-radius|border-bottom-style|border-bottom-width|border-collapse|border-color|border-image|border-image-outset|border-image-repeat|border-image-slice|border-image-source|border-image-width|border-left|border-left-color|border-left-style|border-left-width|border-radius|border-right|border-right-color|border-right-style|border-right-width|border-spacing|border-style|border-top|border-top-color|border-top-left-radius|border-top-right-radius|border-top-style|border-top-width|border-width|border|bottom|box-align|box-decoration-break|box-direction|box-flex-group|box-flex|box-lines|box-ordinal-group|box-orient|box-pack|box-shadow|box-sizing|break-after|break-before|break-inside|caption-side|clear|clip|color-profile|color|column-count|column-fill|column-gap|column-rule|column-rule-color|column-rule-style|column-rule-width|column-span|column-width|columns|content|counter-increment|counter-reset|crop|cue-after|cue-before|cue|cursor|direction|display|dominant-baseline|drop-initial-after-adjust|drop-initial-after-align|drop-initial-before-adjust|drop-initial-before-align|drop-initial-size|drop-initial-value|elevation|empty-cells|fit|fit-position|float-offset|float|font-family|font-size|font-size-adjust|font-stretch|font-style|font-variant|font-weight|font|grid-columns|grid-rows|hanging-punctuation|height|hyphenate-after|hyphenate-before|hyphenate-character|hyphenate-lines|hyphenate-resource|hyphens|icon|image-orientation|image-rendering|image-resolution|inline-box-align|left|letter-spacing|line-height|line-stacking-ruby|line-stacking-shift|line-stacking-strategy|line-stacking|list-style-image|list-style-position|list-style-type|list-style|margin-bottom|margin-left|margin-right|margin-top|margin|mark-after|mark-before|mark|marks|marquee-direction|marquee-play-count|marquee-speed|marquee-style|max-height|max-width|min-height|min-width|move-to|nav-down|nav-index|nav-left|nav-right|nav-up|opacity|orphans|outline-color|outline-offset|outline-style|outline-width|outline|overflow-style|overflow-x|overflow-y|overflow|padding-bottom|padding-left|padding-right|padding-top|padding|page-break-after|page-break-before|page-break-inside|page-policy|page|pause-after|pause-before|pause|perspective-origin|perspective|phonemes|pitch-range|pitch|play-during|position|presentation-level|punctuation-trim|quotes|rendering-intent|resize|rest-after|rest-before|rest|richness|right|rotation-point|rotation|ruby-align|ruby-overhang|ruby-position|ruby-span|size|speak-header|speak-numeral|speak-punctuation|speak|speech-rate|stress|string-set|table-layout|target-name|target-new|target-position|target|text-align-last|text-align|text-decoration|text-emphasis|text-height|text-indent|text-justify|text-outline|text-shadow|text-transform|text-wrap|top|transform-origin|transform-style|transform|transition-delay|transition-duration|transition-property|transition-timing-function|transition|unicode-bidi|vertical-align|visibility|voice-balance|voice-duration|voice-family|voice-pitch-range|voice-pitch|voice-rate|voice-stress|voice-volume|volume|white-space-collapse|white-space|widows|width|word-break|word-spacing|word-wrap|z-index".split("|")),b=e.arrayToMap("rgb|rgba|url|attr|counter|counters".split("|")),c=e.arrayToMap("absolute|after-edge|after|all-scroll|all|alphabetic|always|antialiased|armenian|auto|avoid-column|avoid-page|avoid|balance|baseline|before-edge|before|below|bidi-override|block-line-height|block|bold|bolder|border-box|both|bottom|box|break-all|break-word|capitalize|caps-height|caption|center|central|char|circle|cjk-ideographic|clone|close-quote|col-resize|collapse|column|consider-shifts|contain|content-box|cover|crosshair|cubic-bezier|dashed|decimal-leading-zero|decimal|default|disabled|disc|disregard-shifts|distribute-all-lines|distribute-letter|distribute-space|distribute|dotted|double|e-resize|ease-in|ease-in-out|ease-out|ease|ellipsis|end|exclude-ruby|fill|fixed|font-size|font|georgian|glyphs|grid-height|groove|hand|hanging|hebrew|help|hidden|hiragana-iroha|hiragana|horizontal|icon|ideograph-alpha|ideograph-numeric|ideograph-parenthesis|ideograph-space|ideographic|inactive|include-ruby|inherit|initial|inline-block|inline-box|inline-line-height|inline-table|inline|inset|inside|inter-ideograph|inter-word|invert|italic|justify|katakana-iroha|katakana|keep-all|last|left|lighter|line-edge|line-through|line|linear|list-item|local|loose|lower-alpha|lower-greek|lower-latin|lower-roman|lowercase|lr-tb|ltr|mathematical|max-height|max-size|medium|menu|message-box|middle|move|n-resize|ne-resize|newspaper|no-change|no-close-quote|no-drop|no-open-quote|no-repeat|none|normal|not-allowed|nowrap|nw-resize|oblique|open-quote|outset|outside|overline|padding-box|page|pointer|pre-line|pre-wrap|pre|preserve-3d|progress|relative|repeat-x|repeat-y|repeat|replaced|reset-size|ridge|right|round|row-resize|rtl|s-resize|scroll|se-resize|separate|slice|small-caps|small-caption|solid|space|square|start|static|status-bar|step-end|step-start|steps|stretch|strict|sub|super|sw-resize|table-caption|table-cell|table-column-group|table-column|table-footer-group|table-header-group|table-row-group|table-row|table|tb-rl|text-after-edge|text-before-edge|text-bottom|text-size|text-top|text|thick|thin|top|transparent|underline|upper-alpha|upper-latin|upper-roman|uppercase|use-script|vertical-ideographic|vertical-text|visible|w-resize|wait|whitespace|z-index|zero".split("|")),d=e.arrayToMap("aqua|black|blue|fuchsia|gray|green|lime|maroon|navy|olive|orange|purple|red|silver|teal|white|yellow".split("|")),f=e.arrayToMap("arial|century|comic|courier|garamond|georgia|helvetica|impact|lucida|symbol|system|tahoma|times|trebuchet|utopia|verdana|webdings|sans-serif|serif|monospace".split("|")),g="\\-?(?:(?:[0-9]+)|(?:[0-9]*\\.[0-9]+))",h="(\\:+)\\b(after|before|first-letter|first-line|moz-selection|selection)\\b",i="(:)\\b(active|checked|disabled|empty|enabled|first-child|first-of-type|focus|hover|indeterminate|invalid|last-child|last-of-type|link|not|nth-child|nth-last-child|nth-last-of-type|nth-of-type|only-child|only-of-type|required|root|target|valid|visited)\\b",j=[{token:"comment",merge:!0,regex:"\\/\\*",next:"ruleset_comment"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:["constant.numeric","keyword"],regex:"("+g+")(ch|cm|deg|em|ex|fr|gd|grad|Hz|in|kHz|mm|ms|pc|pt|px|rad|rem|s|turn|vh|vm|vw|%)"},{token:["constant.numeric"],regex:"([0-9]+)"},{token:"constant.numeric",regex:"#[a-f0-9]{6}"},{token:"constant.numeric",regex:"#[a-f0-9]{3}"},{token:["punctuation","entity.other.attribute-name.pseudo-element.css"],regex:h},{token:["punctuation","entity.other.attribute-name.pseudo-class.css"],regex:i},{token:function(e){return a.hasOwnProperty(e.toLowerCase())?"support.type":b.hasOwnProperty(e.toLowerCase())?"support.function":c.hasOwnProperty(e.toLowerCase())?"support.constant":d.hasOwnProperty(e.toLowerCase())?"support.constant.color":f.hasOwnProperty(e.toLowerCase())?"support.constant.fonts":"text"},regex:"\\-?[a-zA-Z_][a-zA-Z0-9_\\-]*"}],k=e.copyArray(j);k.unshift({token:"paren.rparen",regex:"\\}",next:"start"});var l=e.copyArray(j);l.unshift({token:"paren.rparen",regex:"\\}",next:"media"});var m=[{token:"comment",merge:!0,regex:".+"}],n=e.copyArray(m);n.unshift({token:"comment",regex:".*?\\*\\/",next:"start"});var o=e.copyArray(m);o.unshift({token:"comment",regex:".*?\\*\\/",next:"media"});var p=e.copyArray(m);p.unshift({token:"comment",regex:".*?\\*\\/",next:"ruleset"}),this.$rules={start:[{token:"comment",merge:!0,regex:"\\/\\*",next:"comment"},{token:"paren.lparen",regex:"\\{",next:"ruleset"},{token:"string",regex:"@.*?{",next:"media"},{token:"keyword",regex:"#[a-z0-9-_]+"},{token:"variable",regex:"\\.[a-z0-9-_]+"},{token:"string",regex:":[a-z0-9-_]+"},{token:"constant",regex:"[a-z0-9-_]+"}],media:[{token:"comment",merge:!0,regex:"\\/\\*",next:"media_comment"},{token:"paren.lparen",regex:"\\{",next:"media_ruleset"},{token:"string",regex:"\\}",next:"start"},{token:"keyword",regex:"#[a-z0-9-_]+"},{token:"variable",regex:"\\.[a-z0-9-_]+"},{token:"string",regex:":[a-z0-9-_]+"},{token:"constant",regex:"[a-z0-9-_]+"}],comment:n,ruleset:k,ruleset_comment:p,media_ruleset:l,media_comment:o}};d.inherits(g,f),b.CssHighlightRules=g}),define("ace/mode/javascript_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/unicode","ace/mode/doc_comment_highlight_rules","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("../unicode"),g=a("./doc_comment_highlight_rules").DocCommentHighlightRules,h=a("./text_highlight_rules").TextHighlightRules,i=function(){var a=e.arrayToMap("Array|Boolean|Date|Function|Iterator|Number|Object|RegExp|String|Proxy|Namespace|QName|XML|XMLList|ArrayBuffer|Float32Array|Float64Array|Int16Array|Int32Array|Int8Array|Uint16Array|Uint32Array|Uint8Array|Uint8ClampedArray|Error|EvalError|InternalError|RangeError|ReferenceError|StopIteration|SyntaxError|TypeError|URIError|decodeURI|decodeURIComponent|encodeURI|encodeURIComponent|eval|isFinite|isNaN|parseFloat|parseInt|JSON|Math|this|arguments|prototype|window|document".split("|")),b=e.arrayToMap("break|case|catch|continue|default|delete|do|else|finally|for|function|if|in|instanceof|new|return|switch|throw|try|typeof|let|var|while|with|const|yield|import|get|set".split("|")),c="case|do|else|finally|in|instanceof|return|throw|try|typeof|yield",d=e.arrayToMap("__parent__|__count__|escape|unescape|with|__proto__".split("|")),h=e.arrayToMap("const|let|var|function".split("|")),i=e.arrayToMap("null|Infinity|NaN|undefined".split("|")),j=e.arrayToMap("class|enum|extends|super|export|implements|private|public|interface|package|protected|static".split("|")),k="["+f.packages.L+"\\$_]["+f.packages.L+f.packages.Mn+f.packages.Mc+f.packages.Nd+f.packages.Pc+"\\$_]*\\b",l="\\\\(?:x[0-9a-fA-F]{2}|u[0-9a-fA-F]{4}|[0-2][0-7]{0,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.)";this.$rules={start:[{token:"comment",regex:/\/\/.*$/},(new g).getStartRule("doc-start"),{token:"comment",merge:!0,regex:/\/\*/,next:"comment"},{token:"string",regex:"'",next:"qstring"},{token:"string",regex:'"',next:"qqstring"},{token:"constant.numeric",regex:/0[xX][0-9a-fA-F]+\b/},{token:"constant.numeric",regex:/[+-]?\d+(?:(?:\.\d*)?(?:[eE][+-]?\d+)?)?\b/},{token:["storage.type","punctuation.operator","support.function","punctuation.operator","entity.name.function","text","keyword.operator","text","storage.type","text","paren.lparen","variable.parameter","paren.rparen"],regex:"("+k+")(\\.)(prototype)(\\.)("+k+")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"},{token:["storage.type","punctuation.operator","support.function","punctuation.operator","entity.name.function","text","keyword.operator","text"],regex:"("+k+")(\\.)(prototype)(\\.)("+k+")(\\s*)(=)(\\s*)"},{token:["storage.type","punctuation.operator","entity.name.function","text","keyword.operator","text","storage.type","text","paren.lparen","variable.parameter","paren.rparen"],regex:"("+k+")(\\.)("+k+")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"},{token:["entity.name.function","text","keyword.operator","text","storage.type","text","paren.lparen","variable.parameter","paren.rparen"],regex:"("+k+")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"},{token:["storage.type","text","entity.name.function","text","paren.lparen","variable.parameter","paren.rparen"],regex:"(function)(\\s+)("+k+")(\\s*)(\\()(.*?)(\\))"},{token:["entity.name.function","text","punctuation.operator","text","storage.type","text","paren.lparen","variable.parameter","paren.rparen"],regex:"("+k+")(\\s*)(:)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"},{token:["text","text","storage.type","text","paren.lparen","variable.parameter","paren.rparen"],regex:"(:)(\\s*)(function)?(\\s*)(\\()([^)]*)(\\))"},{token:"constant.language.boolean",regex:/(?:true|false)\b/},{token:"keyword",regex:"(?:"+c+")\\b",next:"regex_allowed"},{token:["punctuation.operator","support.function"],regex:/(\.)(s(?:h(?:ift|ow(?:Mod(?:elessDialog|alDialog)|Help))|croll(?:X|By(?:Pages|Lines)?|Y|To)?|t(?:opzzzz|rike)|i(?:n|zeToContent|debar|gnText)|ort|u(?:p|b(?:str(?:ing)?)?)|pli(?:ce|t)|e(?:nd|t(?:Re(?:sizable|questHeader)|M(?:i(?:nutes|lliseconds)|onth)|Seconds|Ho(?:tKeys|urs)|Year|Cursor|Time(?:out)?|Interval|ZOptions|Date|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Date|FullYear)|FullYear|Active)|arch)|qrt|lice|avePreferences|mall)|h(?:ome|andleEvent)|navigate|c(?:har(?:CodeAt|At)|o(?:s|n(?:cat|textual|firm)|mpile)|eil|lear(?:Timeout|Interval)?|a(?:ptureEvents|ll)|reate(?:StyleSheet|Popup|EventObject))|t(?:o(?:GMTString|S(?:tring|ource)|U(?:TCString|pperCase)|Lo(?:caleString|werCase))|est|a(?:n|int(?:Enabled)?))|i(?:s(?:NaN|Finite)|ndexOf|talics)|d(?:isableExternalCapture|ump|etachEvent)|u(?:n(?:shift|taint|escape|watch)|pdateCommands)|j(?:oin|avaEnabled)|p(?:o(?:p|w)|ush|lugins.refresh|a(?:ddings|rse(?:Int|Float)?)|r(?:int|ompt|eference))|e(?:scape|nableExternalCapture|val|lementFromPoint|x(?:p|ec(?:Script|Command)?))|valueOf|UTC|queryCommand(?:State|Indeterm|Enabled|Value)|f(?:i(?:nd|le(?:ModifiedDate|Size|CreatedDate|UpdatedDate)|xed)|o(?:nt(?:size|color)|rward)|loor|romCharCode)|watch|l(?:ink|o(?:ad|g)|astIndexOf)|a(?:sin|nchor|cos|t(?:tachEvent|ob|an(?:2)?)|pply|lert|b(?:s|ort))|r(?:ou(?:nd|teEvents)|e(?:size(?:By|To)|calc|turnValue|place|verse|l(?:oad|ease(?:Capture|Events)))|andom)|g(?:o|et(?:ResponseHeader|M(?:i(?:nutes|lliseconds)|onth)|Se(?:conds|lection)|Hours|Year|Time(?:zoneOffset)?|Da(?:y|te)|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Da(?:y|te)|FullYear)|FullYear|A(?:ttention|llResponseHeaders)))|m(?:in|ove(?:B(?:y|elow)|To(?:Absolute)?|Above)|ergeAttributes|a(?:tch|rgins|x))|b(?:toa|ig|o(?:ld|rderWidths)|link|ack))\b(?=\()/},{token:["punctuation.operator","support.function.dom"],regex:/(\.)(s(?:ub(?:stringData|mit)|plitText|e(?:t(?:NamedItem|Attribute(?:Node)?)|lect))|has(?:ChildNodes|Feature)|namedItem|c(?:l(?:ick|o(?:se|neNode))|reate(?:C(?:omment|DATASection|aption)|T(?:Head|extNode|Foot)|DocumentFragment|ProcessingInstruction|E(?:ntityReference|lement)|Attribute))|tabIndex|i(?:nsert(?:Row|Before|Cell|Data)|tem)|open|delete(?:Row|C(?:ell|aption)|T(?:Head|Foot)|Data)|focus|write(?:ln)?|a(?:dd|ppend(?:Child|Data))|re(?:set|place(?:Child|Data)|move(?:NamedItem|Child|Attribute(?:Node)?)?)|get(?:NamedItem|Element(?:sBy(?:Name|TagName)|ById)|Attribute(?:Node)?)|blur)\b(?=\()/},{token:["punctuation.operator","support.constant"],regex:/(\.)(s(?:ystemLanguage|cr(?:ipts|ollbars|een(?:X|Y|Top|Left))|t(?:yle(?:Sheets)?|atus(?:Text|bar)?)|ibling(?:Below|Above)|ource|uffixes|e(?:curity(?:Policy)?|l(?:ection|f)))|h(?:istory|ost(?:name)?|as(?:h|Focus))|y|X(?:MLDocument|SLDocument)|n(?:ext|ame(?:space(?:s|URI)|Prop))|M(?:IN_VALUE|AX_VALUE)|c(?:haracterSet|o(?:n(?:structor|trollers)|okieEnabled|lorDepth|mp(?:onents|lete))|urrent|puClass|l(?:i(?:p(?:boardData)?|entInformation)|osed|asses)|alle(?:e|r)|rypto)|t(?:o(?:olbar|p)|ext(?:Transform|Indent|Decoration|Align)|ags)|SQRT(?:1_2|2)|i(?:n(?:ner(?:Height|Width)|put)|ds|gnoreCase)|zIndex|o(?:scpu|n(?:readystatechange|Line)|uter(?:Height|Width)|p(?:sProfile|ener)|ffscreenBuffering)|NEGATIVE_INFINITY|d(?:i(?:splay|alog(?:Height|Top|Width|Left|Arguments)|rectories)|e(?:scription|fault(?:Status|Ch(?:ecked|arset)|View)))|u(?:ser(?:Profile|Language|Agent)|n(?:iqueID|defined)|pdateInterval)|_content|p(?:ixelDepth|ort|ersonalbar|kcs11|l(?:ugins|atform)|a(?:thname|dding(?:Right|Bottom|Top|Left)|rent(?:Window|Layer)?|ge(?:X(?:Offset)?|Y(?:Offset)?))|r(?:o(?:to(?:col|type)|duct(?:Sub)?|mpter)|e(?:vious|fix)))|e(?:n(?:coding|abledPlugin)|x(?:ternal|pando)|mbeds)|v(?:isibility|endor(?:Sub)?|Linkcolor)|URLUnencoded|P(?:I|OSITIVE_INFINITY)|f(?:ilename|o(?:nt(?:Size|Family|Weight)|rmName)|rame(?:s|Element)|gColor)|E|whiteSpace|l(?:i(?:stStyleType|n(?:eHeight|kColor))|o(?:ca(?:tion(?:bar)?|lName)|wsrc)|e(?:ngth|ft(?:Context)?)|a(?:st(?:M(?:odified|atch)|Index|Paren)|yer(?:s|X)|nguage))|a(?:pp(?:MinorVersion|Name|Co(?:deName|re)|Version)|vail(?:Height|Top|Width|Left)|ll|r(?:ity|guments)|Linkcolor|bove)|r(?:ight(?:Context)?|e(?:sponse(?:XML|Text)|adyState))|global|x|m(?:imeTypes|ultiline|enubar|argin(?:Right|Bottom|Top|Left))|L(?:N(?:10|2)|OG(?:10E|2E))|b(?:o(?:ttom|rder(?:Width|RightWidth|BottomWidth|Style|Color|TopWidth|LeftWidth))|ufferDepth|elow|ackground(?:Color|Image)))\b/},{token:["storage.type","punctuation.operator","support.function.firebug"],regex:/(console)(\.)(warn|info|log|error|time|timeEnd|assert)\b/},{token:function(c){return a.hasOwnProperty(c)?"variable.language":d.hasOwnProperty(c)?"invalid.deprecated":h.hasOwnProperty(c)?"storage.type":b.hasOwnProperty(c)?"keyword":i.hasOwnProperty(c)?"constant.language":j.hasOwnProperty(c)?"invalid.illegal":c=="debugger"?"invalid.deprecated":"identifier"},regex:k},{token:"keyword.operator",regex:/!|\$|%|&|\*|\-\-|\-|\+\+|\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\|\||\?\:|\*=|%=|\+=|\-=|&=|\^=|\b(?:in|instanceof|new|delete|typeof|void)/,next:"regex_allowed"},{token:"punctuation.operator",regex:/\?|\:|\,|\;|\./,next:"regex_allowed"},{token:"paren.lparen",regex:/[\[({]/,next:"regex_allowed"},{token:"paren.rparen",regex:/[\])}]/},{token:"keyword.operator",regex:/\/=?/,next:"regex_allowed"},{token:"comment",regex:/^#!.*$/},{token:"text",regex:/\s+/}],regex_allowed:[{token:"comment",merge:!0,regex:"\\/\\*",next:"comment_regex_allowed"},{token:"comment",regex:"\\/\\/.*$"},{token:"string.regexp",regex:"\\/",next:"regex",merge:!0},{token:"text",regex:"\\s+"},{token:"empty",regex:"",next:"start"}],regex:[{token:"regexp.keyword.operator",regex:"\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",next:"regex"},{token:"string.regexp",regex:"/\\w*",next:"start",merge:!0},{token:"string.regexp",regex:"[^\\\\/\\[]+",next:"regex",merge:!0},{token:"string.regexp.charachterclass",regex:"\\[",next:"regex_character_class",merge:!0},{token:"empty",regex:"",next:"start"}],regex_character_class:[{token:"regexp.keyword.operator",regex:"\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",next:"regex_character_class"},{token:"string.regexp.charachterclass",regex:"]",next:"regex",merge:!0},{token:"string.regexp.charachterclass",regex:"[^\\\\\\]]+",next:"regex_character_class",merge:!0},{token:"empty",regex:"",next:"start"}],comment_regex_allowed:[{token:"comment",regex:".*?\\*\\/",merge:!0,next:"regex_allowed"},{token:"comment",merge:!0,regex:".+"}],comment:[{token:"comment",regex:".*?\\*\\/",merge:!0,next:"start"},{token:"comment",merge:!0,regex:".+"}],qqstring:[{token:"constant.language.escape",regex:l},{token:"string",regex:'[^"\\\\]+'},{token:"string",regex:'"',next:"start"}],qstring:[{token:"constant.language.escape",regex:l},{token:"string",regex:"[^'\\\\]+"},{token:"string",regex:"'",next:"start"}]},this.embedRules(g,"doc-",[(new g).getEndRule("start")])};d.inherits(i,h),b.JavaScriptHighlightRules=i}),define("ace/mode/doc_comment_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text_highlight_rules").TextHighlightRules,f=function(){this.$rules={start:[{token:"comment.doc.tag",regex:"@[\\w\\d_]+"},{token:"comment.doc",merge:!0,regex:"\\s+"},{token:"comment.doc",merge:!0,regex:"TODO"},{token:"comment.doc",merge:!0,regex:"[^@\\*]+"},{token:"comment.doc",merge:!0,regex:"."}]}};d.inherits(f,e),function(){this.getStartRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\/\\*(?=\\*)",next:a}},this.getEndRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\*\\/",next:a}}}.call(f.prototype),b.DocCommentHighlightRules=f}),define("ace/mode/xml_util",["require","exports","module","ace/lib/lang"],function(a,b,c){function g(a){return[{token:"string",regex:'".*?"'},{token:"string",merge:!0,regex:'["].*',next:a+"_qqstring"},{token:"string",regex:"'.*?'"},{token:"string",merge:!0,regex:"['].*",next:a+"_qstring"}]}function h(a,b){return[{token:"string",merge:!0,regex:".*?"+a,next:b},{token:"string",merge:!0,regex:".+"}]}"use strict";var d=a("../lib/lang"),e=d.arrayToMap("button|form|input|label|select|textarea".split("|")),f=d.arrayToMap("table|tbody|td|tfoot|th|tr".split("|"));b.tag=function(a,b,c){a[b]=[{token:"text",regex:"\\s+"},{token:function(a){return a==="a"?"meta.tag.anchor":a==="img"?"meta.tag.image":a==="script"?"meta.tag.script":a==="style"?"meta.tag.style":e.hasOwnProperty(a.toLowerCase())?"meta.tag.form":f.hasOwnProperty(a.toLowerCase())?"meta.tag.table":"meta.tag"},merge:!0,regex:"[-_a-zA-Z0-9:]+",next:b+"_embed_attribute_list"},{token:"empty",regex:"",next:b+"_embed_attribute_list"}],a[b+"_qstring"]=h("'",b+"_embed_attribute_list"),a[b+"_qqstring"]=h('"',b+"_embed_attribute_list"),a[b+"_embed_attribute_list"]=[{token:"meta.tag",merge:!0,regex:"/?>",next:c},{token:"keyword.operator",regex:"="},{token:"entity.other.attribute-name",regex:"[-_a-zA-Z0-9:]+"},{token:"constant.numeric",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:"text",regex:"\\s+"}].concat(g(b))}}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../range").Range,e=function(){};(function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}}).call(e.prototype),b.MatchingBraceOutdent=e})
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-lua-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-lua-uncompressed.js
deleted file mode 100644
index c3f875475e..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-lua-uncompressed.js
+++ /dev/null
@@ -1,523 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
-* Version: MPL 1.1/GPL 2.0/LGPL 2.1
-*
-* The contents of this file are subject to the Mozilla Public License Version
-* 1.1 (the "License"); you may not use this file except in compliance with
-* the License. You may obtain a copy of the License at
-* http://www.mozilla.org/MPL/
-*
-* Software distributed under the License is distributed on an "AS IS" basis,
-* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-* for the specific language governing rights and limitations under the
-* License.
-*
-* The Original Code is Ajax.org Code Editor (ACE).
-*
-* The Initial Developer of the Original Code is
-* Ajax.org B.V.
-* Portions created by the Initial Developer are Copyright (C) 2010
-* the Initial Developer. All Rights Reserved.
-*
-* Contributor(s):
-*      Fabian Jakobs <fabian AT ajax DOT org>
-*      Colin Gourlay <colin DOT j DOT gourlay AT gmail DOT com>
-*      Lee Gao
-*
-* Alternatively, the contents of this file may be used under the terms of
-* either the GNU General Public License Version 2 or later (the "GPL"), or
-* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-* in which case the provisions of the GPL or the LGPL are applicable instead
-* of those above. If you wish to allow use of your version of this file only
-* under the terms of either the GPL or the LGPL, and not to allow others to
-* use your version of this file under the terms of the MPL, indicate your
-* decision by deleting the provisions above and replace them with the notice
-* and other provisions required by the GPL or the LGPL. If you do not delete
-* the provisions above, a recipient may use your version of this file under
-* the terms of any one of the MPL, the GPL or the LGPL.
-*
-* ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/lua', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/lua_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
-var LuaHighlightRules = require("./lua_highlight_rules").LuaHighlightRules;
-
-var Mode = function() {
-    this.$tokenizer = new Tokenizer(new LuaHighlightRules().getRules());
-};
-oop.inherits(Mode, TextMode);
-
-(function() {
-    this.getNextLineIndent = function(state, line, tab) {
-        var indent = this.$getIndent(line);
-
-        var tokenizedLine = this.$tokenizer.getLineTokens(line, state);
-        var tokens = tokenizedLine.tokens;
-	
-        var chunks = ["function", "then", "do", "repeat"];
-        
-        if (state == "start") {
-            var match = line.match(/^.*[\{\(\[]\s*$/);
-            if (match) {
-                indent += tab;
-            } else {
-                for (var i in tokens){
-                    var token = tokens[i];
-                    if (token.type != "keyword") continue;
-                    var chunk_i = chunks.indexOf(token.value);
-                    if (chunk_i != -1){
-                        indent += tab;
-                        break;
-                    }
-                }
-            }
-        } 
-
-        return indent;
-    };
-    
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-});
-
-
-/* ***** BEGIN LICENSE BLOCK *****
-* Version: MPL 1.1/GPL 2.0/LGPL 2.1
-*
-* The contents of this file are subject to the Mozilla Public License Version
-* 1.1 (the "License"); you may not use this file except in compliance with
-* the License. You may obtain a copy of the License at
-* http://www.mozilla.org/MPL/
-*
-* Software distributed under the License is distributed on an "AS IS" basis,
-* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-* for the specific language governing rights and limitations under the
-* License.
-*
-* The Original Code is Ajax.org Code Editor (ACE).
-*
-* The Initial Developer of the Original Code is
-* Ajax.org B.V.
-* Portions created by the Initial Developer are Copyright (C) 2010
-* the Initial Developer. All Rights Reserved.
-*
-* Contributor(s):
-*      Fabian Jakobs <fabian AT ajax DOT org>
-*      Colin Gourlay <colin DOT j DOT gourlay AT gmail DOT com>
-*      Lee Gao
-*
-* Alternatively, the contents of this file may be used under the terms of
-* either the GNU General Public License Version 2 or later (the "GPL"), or
-* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-* in which case the provisions of the GPL or the LGPL are applicable instead
-* of those above. If you wish to allow use of your version of this file only
-* under the terms of either the GPL or the LGPL, and not to allow others to
-* use your version of this file under the terms of the MPL, indicate your
-* decision by deleting the provisions above and replace them with the notice
-* and other provisions required by the GPL or the LGPL. If you do not delete
-* the provisions above, a recipient may use your version of this file under
-* the terms of any one of the MPL, the GPL or the LGPL.
-*
-* ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/lua_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var lang = require("../lib/lang");
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var LuaHighlightRules = function() {
-
-    var keywords = lang.arrayToMap(
-        ("break|do|else|elseif|end|for|function|if|in|local|repeat|"+
-         "return|then|until|while|or|and|not").split("|")
-    );
-
-    var builtinConstants = lang.arrayToMap(
-        ("true|false|nil|_G|_VERSION").split("|")
-    );
-
-    var builtinFunctions = lang.arrayToMap(
-        ("string|xpcall|package|tostring|print|os|unpack|require|"+
-        "getfenv|setmetatable|next|assert|tonumber|io|rawequal|"+
-        "collectgarbage|getmetatable|module|rawset|math|debug|"+
-        "pcall|table|newproxy|type|coroutine|_G|select|gcinfo|"+
-        "pairs|rawget|loadstring|ipairs|_VERSION|dofile|setfenv|"+
-        "load|error|loadfile|"+
-
-        "sub|upper|len|gfind|rep|find|match|char|dump|gmatch|"+
-        "reverse|byte|format|gsub|lower|preload|loadlib|loaded|"+
-        "loaders|cpath|config|path|seeall|exit|setlocale|date|"+
-        "getenv|difftime|remove|time|clock|tmpname|rename|execute|"+
-        "lines|write|close|flush|open|output|type|read|stderr|"+
-        "stdin|input|stdout|popen|tmpfile|log|max|acos|huge|"+
-        "ldexp|pi|cos|tanh|pow|deg|tan|cosh|sinh|random|randomseed|"+
-        "frexp|ceil|floor|rad|abs|sqrt|modf|asin|min|mod|fmod|log10|"+
-        "atan2|exp|sin|atan|getupvalue|debug|sethook|getmetatable|"+
-        "gethook|setmetatable|setlocal|traceback|setfenv|getinfo|"+
-        "setupvalue|getlocal|getregistry|getfenv|setn|insert|getn|"+
-        "foreachi|maxn|foreach|concat|sort|remove|resume|yield|"+
-        "status|wrap|create|running").split("|")
-    );
-    
-    var stdLibaries = lang.arrayToMap(
-        ("string|package|os|io|math|debug|table|coroutine").split("|")
-    );
-    
-    var metatableMethods = lang.arrayToMap(
-        ("__add|__sub|__mod|__unm|__concat|__lt|__index|__call|__gc|__metatable|"+
-         "__mul|__div|__pow|__len|__eq|__le|__newindex|__tostring|__mode|__tonumber").split("|")
-    );
-
-    var futureReserved = lang.arrayToMap(
-        ("").split("|")
-    );
-    
-    var deprecatedIn5152 = lang.arrayToMap(
-        ("setn|foreach|foreachi|gcinfo|log10|maxn").split("|")
-    );
-
-    var strPre = "";
-
-    var decimalInteger = "(?:(?:[1-9]\\d*)|(?:0))";
-    var hexInteger = "(?:0[xX][\\dA-Fa-f]+)";
-    var integer = "(?:" + decimalInteger + "|" + hexInteger + ")";
-
-    var fraction = "(?:\\.\\d+)";
-    var intPart = "(?:\\d+)";
-    var pointFloat = "(?:(?:" + intPart + "?" + fraction + ")|(?:" + intPart + "\\.))";
-    var floatNumber = "(?:" + pointFloat + ")";
-    
-    var comment_stack = [];
-    
-    this.$rules = {
-        "start" : 
-
-		
-        // bracketed comments
-        [{
-            token : "comment",           // --[[ comment
-            regex : strPre + '\\-\\-\\[\\[.*\\]\\]'
-        }, {
-            token : "comment",           // --[=[ comment
-            regex : strPre + '\\-\\-\\[\\=\\[.*\\]\\=\\]'
-        }, {
-            token : "comment",           // --[==[ comment
-            regex : strPre + '\\-\\-\\[\\={2}\\[.*\\]\\={2}\\]'
-        }, {
-            token : "comment",           // --[===[ comment
-            regex : strPre + '\\-\\-\\[\\={3}\\[.*\\]\\={3}\\]'
-        }, {
-            token : "comment",           // --[====[ comment
-            regex : strPre + '\\-\\-\\[\\={4}\\[.*\\]\\={4}\\]'
-        }, {
-            token : "comment",           // --[====+[ comment
-            regex : strPre + '\\-\\-\\[\\={5}\\=*\\[.*\\]\\={5}\\=*\\]'
-        },
-		
-		// multiline bracketed comments
-		{
-            token : "comment",           // --[[ comment
-            regex : strPre + '\\-\\-\\[\\[.*$',
-            merge : true,
-            next  : "qcomment"
-        }, {
-            token : "comment",           // --[=[ comment
-            regex : strPre + '\\-\\-\\[\\=\\[.*$',
-            merge : true,
-            next  : "qcomment1"
-        }, {
-            token : "comment",           // --[==[ comment
-            regex : strPre + '\\-\\-\\[\\={2}\\[.*$',
-            merge : true,
-            next  : "qcomment2"
-        }, {
-            token : "comment",           // --[===[ comment
-            regex : strPre + '\\-\\-\\[\\={3}\\[.*$',
-            merge : true,
-            next  : "qcomment3"
-        }, {
-            token : "comment",           // --[====[ comment
-            regex : strPre + '\\-\\-\\[\\={4}\\[.*$',
-            merge : true,
-            next  : "qcomment4"
-        }, {
-            token : function(value){     // --[====+[ comment
-                // WARNING: EXTREMELY SLOW, but this is the only way to circumvent the
-                // limits imposed by the current automaton.
-                // I've never personally seen any practical code where 5 or more '='s are
-                // used for string or commenting, so this will rarely be invoked.
-                var pattern = /\-\-\[(\=+)\[/, match;
-                // you can never be too paranoid ;)
-                if ((match = pattern.exec(value)) != null && (match = match[1]) != undefined)
-                    comment_stack.push(match.length);
-                
-                return "comment";
-            },
-            regex : strPre + '\\-\\-\\[\\={5}\\=*\\[.*$',
-            merge : true,
-            next  : "qcomment5"
-        },
-        
-        // single line comments
-        {
-            token : "comment",
-            regex : "\\-\\-.*$"
-        }, 
-        
-        // bracketed strings
-		{
-            token : "string",           // [[ string
-            regex : strPre + '\\[\\[.*\\]\\]'
-        }, {
-            token : "string",           // [=[ string
-            regex : strPre + '\\[\\=\\[.*\\]\\=\\]'
-        }, {
-            token : "string",           // [==[ string
-            regex : strPre + '\\[\\={2}\\[.*\\]\\={2}\\]'
-        }, {
-            token : "string",           // [===[ string
-            regex : strPre + '\\[\\={3}\\[.*\\]\\={3}\\]'
-        }, {
-            token : "string",           // [====[ string
-            regex : strPre + '\\[\\={4}\\[.*\\]\\={4}\\]'
-        }, {
-            token : "string",           // [====+[ string
-            regex : strPre + '\\[\\={5}\\=*\\[.*\\]\\={5}\\=*\\]'
-        },
-		
-		// multiline bracketed strings
-        {
-            token : "string",           // [[ string
-            regex : strPre + '\\[\\[.*$',
-            merge : true,
-            next  : "qstring"
-        }, {
-            token : "string",           // [=[ string
-            regex : strPre + '\\[\\=\\[.*$',
-            merge : true,
-            next  : "qstring1"
-        }, {
-            token : "string",           // [==[ string
-            regex : strPre + '\\[\\={2}\\[.*$',
-            merge : true,
-            next  : "qstring2"
-        }, {
-            token : "string",           // [===[ string
-            regex : strPre + '\\[\\={3}\\[.*$',
-            merge : true,
-            next  : "qstring3"
-        }, {
-            token : "string",           // [====[ string
-            regex : strPre + '\\[\\={4}\\[.*$',
-            merge : true,
-            next  : "qstring4"
-        }, {
-            token : function(value){     // --[====+[ string
-                // WARNING: EXTREMELY SLOW, see above.
-                var pattern = /\[(\=+)\[/, match;
-                if ((match = pattern.exec(value)) != null && (match = match[1]) != undefined)
-                    comment_stack.push(match.length);
-                
-                return "string";
-            },
-            regex : strPre + '\\[\\={5}\\=*\\[.*$',
-            merge : true,
-            next  : "qstring5"
-        }, 
-        
-        {
-            token : "string",           // " string
-            regex : strPre + '"(?:[^\\\\]|\\\\.)*?"'
-        }, {
-            token : "string",           // ' string
-            regex : strPre + "'(?:[^\\\\]|\\\\.)*?'"
-        }, {
-            token : "constant.numeric", // float
-            regex : floatNumber
-        }, {
-            token : "constant.numeric", // integer
-            regex : integer + "\\b"
-        }, {
-            token : function(value) {
-                if (keywords.hasOwnProperty(value))
-                    return "keyword";
-                else if (builtinConstants.hasOwnProperty(value))
-                    return "constant.language";
-                else if (futureReserved.hasOwnProperty(value))
-                    return "invalid.illegal";
-                else if (stdLibaries.hasOwnProperty(value))
-                    return "constant.library";
-                else if (deprecatedIn5152.hasOwnProperty(value))
-                    return "invalid.deprecated";
-                else if (builtinFunctions.hasOwnProperty(value))
-                    return "support.function";
-                else if (metatableMethods.hasOwnProperty(value))
-                    return "support.function";
-                else
-                    return "identifier";
-            },
-            regex : "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
-        }, {
-            token : "keyword.operator",
-            regex : "\\+|\\-|\\*|\\/|%|\\#|\\^|~|<|>|<=|=>|==|~=|=|\\:|\\.\\.\\.|\\.\\."
-        }, {
-            token : "paren.lparen",
-            regex : "[\\[\\(\\{]"
-        }, {
-            token : "paren.rparen",
-            regex : "[\\]\\)\\}]"
-        }, {
-            token : "text",
-            regex : "\\s+"
-        } ],
-        
-        "qcomment": [ {
-            token : "comment",
-            regex : "(?:[^\\\\]|\\\\.)*?\\]\\]",
-            next  : "start"
-        }, {
-            token : "comment",
-            merge : true,
-            regex : '.+'
-        } ],
-        "qcomment1": [ {
-            token : "comment",
-            regex : "(?:[^\\\\]|\\\\.)*?\\]\\=\\]",
-            next  : "start"
-        }, {
-            token : "comment",
-            merge : true,
-            regex : '.+'
-        } ],
-        "qcomment2": [ {
-            token : "comment",
-            regex : "(?:[^\\\\]|\\\\.)*?\\]\\={2}\\]",
-            next  : "start"
-        }, {
-            token : "comment",
-            merge : true,
-            regex : '.+'
-        } ],
-        "qcomment3": [ {
-            token : "comment",
-            regex : "(?:[^\\\\]|\\\\.)*?\\]\\={3}\\]",
-            next  : "start"
-        }, {
-            token : "comment",
-            merge : true,
-            regex : '.+'
-        } ],
-        "qcomment4": [ {
-            token : "comment",
-            regex : "(?:[^\\\\]|\\\\.)*?\\]\\={4}\\]",
-            next  : "start"
-        }, {
-            token : "comment",
-            merge : true,
-            regex : '.+'
-        } ],
-        "qcomment5": [ {
-            token : function(value){ 
-                // very hackish, mutates the qcomment5 field on the fly.
-                var pattern = /\](\=+)\]/, rule = this.rules.qcomment5[0], match;
-                rule.next = "start";
-                if ((match = pattern.exec(value)) != null && (match = match[1]) != undefined){
-                    var found = match.length, expected;
-                    if ((expected = comment_stack.pop()) != found){
-                        comment_stack.push(expected);
-                        rule.next = "qcomment5";
-                    }
-                }
-                
-                return "comment";
-            },
-            regex : "(?:[^\\\\]|\\\\.)*?\\]\\={5}\\=*\\]",
-            next  : "start"
-        }, {
-            token : "comment",
-            merge : true,
-            regex : '.+'
-        } ],
-        
-        "qstring": [ {
-            token : "string",
-            regex : "(?:[^\\\\]|\\\\.)*?\\]\\]",
-            next  : "start"
-        }, {
-            token : "string",
-            merge : true,
-            regex : '.+'
-        } ],
-        "qstring1": [ {
-            token : "string",
-            regex : "(?:[^\\\\]|\\\\.)*?\\]\\=\\]",
-            next  : "start"
-        }, {
-            token : "string",
-            merge : true,
-            regex : '.+'
-        } ],
-        "qstring2": [ {
-            token : "string",
-            regex : "(?:[^\\\\]|\\\\.)*?\\]\\={2}\\]",
-            next  : "start"
-        }, {
-            token : "string",
-            merge : true,
-            regex : '.+'
-        } ],
-        "qstring3": [ {
-            token : "string",
-            regex : "(?:[^\\\\]|\\\\.)*?\\]\\={3}\\]",
-            next  : "start"
-        }, {
-            token : "string",
-            merge : true,
-            regex : '.+'
-        } ],
-        "qstring4": [ {
-            token : "string",
-            regex : "(?:[^\\\\]|\\\\.)*?\\]\\={4}\\]",
-            next  : "start"
-        }, {
-            token : "string",
-            merge : true,
-            regex : '.+'
-        } ],
-        "qstring5": [ {
-            token : function(value){ 
-                // very hackish, mutates the qstring5 field on the fly.
-                var pattern = /\](\=+)\]/, rule = this.rules.qstring5[0], match;
-                rule.next = "start";
-                if ((match = pattern.exec(value)) != null && (match = match[1]) != undefined){
-                    var found = match.length, expected;
-                    if ((expected = comment_stack.pop()) != found){
-                        comment_stack.push(expected);
-                        rule.next = "qstring5";
-                    }
-                }
-                
-                return "string";
-            },
-            regex : "(?:[^\\\\]|\\\\.)*?\\]\\={5}\\=*\\]",
-            next  : "start"
-        }, {
-            token : "string",
-            merge : true,
-            regex : '.+'
-        } ]
-        
-    };
-
-}
-
-oop.inherits(LuaHighlightRules, TextHighlightRules);
-
-exports.LuaHighlightRules = LuaHighlightRules;
-});
diff --git a/apps/files_texteditor/js/aceeditor/mode-lua.js b/apps/files_texteditor/js/aceeditor/mode-lua.js
deleted file mode 100644
index 8f7471e7bf..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-lua.js
+++ /dev/null
@@ -1 +0,0 @@
-define("ace/mode/lua",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/lua_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./lua_highlight_rules").LuaHighlightRules,h=function(){this.$tokenizer=new f((new g).getRules())};d.inherits(h,e),function(){this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a),f=e.tokens,g=["function","then","do","repeat"];if(a=="start"){var h=b.match(/^.*[\{\(\[]\s*$/);if(h)d+=c;else for(var i in f){var j=f[i];if(j.type!="keyword")continue;var k=g.indexOf(j.value);if(k!=-1){d+=c;break}}}return d}}.call(h.prototype),b.Mode=h}),define("ace/mode/lua_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("./text_highlight_rules").TextHighlightRules,g=function(){var a=e.arrayToMap("break|do|else|elseif|end|for|function|if|in|local|repeat|return|then|until|while|or|and|not".split("|")),b=e.arrayToMap("true|false|nil|_G|_VERSION".split("|")),c=e.arrayToMap("string|xpcall|package|tostring|print|os|unpack|require|getfenv|setmetatable|next|assert|tonumber|io|rawequal|collectgarbage|getmetatable|module|rawset|math|debug|pcall|table|newproxy|type|coroutine|_G|select|gcinfo|pairs|rawget|loadstring|ipairs|_VERSION|dofile|setfenv|load|error|loadfile|sub|upper|len|gfind|rep|find|match|char|dump|gmatch|reverse|byte|format|gsub|lower|preload|loadlib|loaded|loaders|cpath|config|path|seeall|exit|setlocale|date|getenv|difftime|remove|time|clock|tmpname|rename|execute|lines|write|close|flush|open|output|type|read|stderr|stdin|input|stdout|popen|tmpfile|log|max|acos|huge|ldexp|pi|cos|tanh|pow|deg|tan|cosh|sinh|random|randomseed|frexp|ceil|floor|rad|abs|sqrt|modf|asin|min|mod|fmod|log10|atan2|exp|sin|atan|getupvalue|debug|sethook|getmetatable|gethook|setmetatable|setlocal|traceback|setfenv|getinfo|setupvalue|getlocal|getregistry|getfenv|setn|insert|getn|foreachi|maxn|foreach|concat|sort|remove|resume|yield|status|wrap|create|running".split("|")),d=e.arrayToMap("string|package|os|io|math|debug|table|coroutine".split("|")),f=e.arrayToMap("__add|__sub|__mod|__unm|__concat|__lt|__index|__call|__gc|__metatable|__mul|__div|__pow|__len|__eq|__le|__newindex|__tostring|__mode|__tonumber".split("|")),g=e.arrayToMap("".split("|")),h=e.arrayToMap("setn|foreach|foreachi|gcinfo|log10|maxn".split("|")),i="",j="(?:(?:[1-9]\\d*)|(?:0))",k="(?:0[xX][\\dA-Fa-f]+)",l="(?:"+j+"|"+k+")",m="(?:\\.\\d+)",n="(?:\\d+)",o="(?:(?:"+n+"?"+m+")|(?:"+n+"\\.))",p="(?:"+o+")",q=[];this.$rules={start:[{token:"comment",regex:i+"\\-\\-\\[\\[.*\\]\\]"},{token:"comment",regex:i+"\\-\\-\\[\\=\\[.*\\]\\=\\]"},{token:"comment",regex:i+"\\-\\-\\[\\={2}\\[.*\\]\\={2}\\]"},{token:"comment",regex:i+"\\-\\-\\[\\={3}\\[.*\\]\\={3}\\]"},{token:"comment",regex:i+"\\-\\-\\[\\={4}\\[.*\\]\\={4}\\]"},{token:"comment",regex:i+"\\-\\-\\[\\={5}\\=*\\[.*\\]\\={5}\\=*\\]"},{token:"comment",regex:i+"\\-\\-\\[\\[.*$",merge:!0,next:"qcomment"},{token:"comment",regex:i+"\\-\\-\\[\\=\\[.*$",merge:!0,next:"qcomment1"},{token:"comment",regex:i+"\\-\\-\\[\\={2}\\[.*$",merge:!0,next:"qcomment2"},{token:"comment",regex:i+"\\-\\-\\[\\={3}\\[.*$",merge:!0,next:"qcomment3"},{token:"comment",regex:i+"\\-\\-\\[\\={4}\\[.*$",merge:!0,next:"qcomment4"},{token:function(a){var b=/\-\-\[(\=+)\[/,c;return(c=b.exec(a))!=null&&(c=c[1])!=undefined&&q.push(c.length),"comment"},regex:i+"\\-\\-\\[\\={5}\\=*\\[.*$",merge:!0,next:"qcomment5"},{token:"comment",regex:"\\-\\-.*$"},{token:"string",regex:i+"\\[\\[.*\\]\\]"},{token:"string",regex:i+"\\[\\=\\[.*\\]\\=\\]"},{token:"string",regex:i+"\\[\\={2}\\[.*\\]\\={2}\\]"},{token:"string",regex:i+"\\[\\={3}\\[.*\\]\\={3}\\]"},{token:"string",regex:i+"\\[\\={4}\\[.*\\]\\={4}\\]"},{token:"string",regex:i+"\\[\\={5}\\=*\\[.*\\]\\={5}\\=*\\]"},{token:"string",regex:i+"\\[\\[.*$",merge:!0,next:"qstring"},{token:"string",regex:i+"\\[\\=\\[.*$",merge:!0,next:"qstring1"},{token:"string",regex:i+"\\[\\={2}\\[.*$",merge:!0,next:"qstring2"},{token:"string",regex:i+"\\[\\={3}\\[.*$",merge:!0,next:"qstring3"},{token:"string",regex:i+"\\[\\={4}\\[.*$",merge:!0,next:"qstring4"},{token:function(a){var b=/\[(\=+)\[/,c;return(c=b.exec(a))!=null&&(c=c[1])!=undefined&&q.push(c.length),"string"},regex:i+"\\[\\={5}\\=*\\[.*$",merge:!0,next:"qstring5"},{token:"string",regex:i+'"(?:[^\\\\]|\\\\.)*?"'},{token:"string",regex:i+"'(?:[^\\\\]|\\\\.)*?'"},{token:"constant.numeric",regex:p},{token:"constant.numeric",regex:l+"\\b"},{token:function(e){return a.hasOwnProperty(e)?"keyword":b.hasOwnProperty(e)?"constant.language":g.hasOwnProperty(e)?"invalid.illegal":d.hasOwnProperty(e)?"constant.library":h.hasOwnProperty(e)?"invalid.deprecated":c.hasOwnProperty(e)?"support.function":f.hasOwnProperty(e)?"support.function":"identifier"},regex:"[a-zA-Z_$][a-zA-Z0-9_$]*\\b"},{token:"keyword.operator",regex:"\\+|\\-|\\*|\\/|%|\\#|\\^|~|<|>|<=|=>|==|~=|=|\\:|\\.\\.\\.|\\.\\."},{token:"paren.lparen",regex:"[\\[\\(\\{]"},{token:"paren.rparen",regex:"[\\]\\)\\}]"},{token:"text",regex:"\\s+"}],qcomment:[{token:"comment",regex:"(?:[^\\\\]|\\\\.)*?\\]\\]",next:"start"},{token:"comment",merge:!0,regex:".+"}],qcomment1:[{token:"comment",regex:"(?:[^\\\\]|\\\\.)*?\\]\\=\\]",next:"start"},{token:"comment",merge:!0,regex:".+"}],qcomment2:[{token:"comment",regex:"(?:[^\\\\]|\\\\.)*?\\]\\={2}\\]",next:"start"},{token:"comment",merge:!0,regex:".+"}],qcomment3:[{token:"comment",regex:"(?:[^\\\\]|\\\\.)*?\\]\\={3}\\]",next:"start"},{token:"comment",merge:!0,regex:".+"}],qcomment4:[{token:"comment",regex:"(?:[^\\\\]|\\\\.)*?\\]\\={4}\\]",next:"start"},{token:"comment",merge:!0,regex:".+"}],qcomment5:[{token:function(a){var b=/\](\=+)\]/,c=this.rules.qcomment5[0],d;c.next="start";if((d=b.exec(a))!=null&&(d=d[1])!=undefined){var e=d.length,f;(f=q.pop())!=e&&(q.push(f),c.next="qcomment5")}return"comment"},regex:"(?:[^\\\\]|\\\\.)*?\\]\\={5}\\=*\\]",next:"start"},{token:"comment",merge:!0,regex:".+"}],qstring:[{token:"string",regex:"(?:[^\\\\]|\\\\.)*?\\]\\]",next:"start"},{token:"string",merge:!0,regex:".+"}],qstring1:[{token:"string",regex:"(?:[^\\\\]|\\\\.)*?\\]\\=\\]",next:"start"},{token:"string",merge:!0,regex:".+"}],qstring2:[{token:"string",regex:"(?:[^\\\\]|\\\\.)*?\\]\\={2}\\]",next:"start"},{token:"string",merge:!0,regex:".+"}],qstring3:[{token:"string",regex:"(?:[^\\\\]|\\\\.)*?\\]\\={3}\\]",next:"start"},{token:"string",merge:!0,regex:".+"}],qstring4:[{token:"string",regex:"(?:[^\\\\]|\\\\.)*?\\]\\={4}\\]",next:"start"},{token:"string",merge:!0,regex:".+"}],qstring5:[{token:function(a){var b=/\](\=+)\]/,c=this.rules.qstring5[0],d;c.next="start";if((d=b.exec(a))!=null&&(d=d[1])!=undefined){var e=d.length,f;(f=q.pop())!=e&&(q.push(f),c.next="qstring5")}return"string"},regex:"(?:[^\\\\]|\\\\.)*?\\]\\={5}\\=*\\]",next:"start"},{token:"string",merge:!0,regex:".+"}]}};d.inherits(g,f),b.LuaHighlightRules=g})
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-markdown-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-markdown-uncompressed.js
deleted file mode 100644
index a8edaafeef..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-markdown-uncompressed.js
+++ /dev/null
@@ -1,2897 +0,0 @@
-/* vim:ts=4:sts=4:sw=4:
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Mihai Sucan <mihai DOT sucan AT gmail DOT com>
- *      Chris Spencer <chris.ag.spencer AT googlemail DOT com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/markdown', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/mode/javascript', 'ace/mode/xml', 'ace/mode/html', 'ace/tokenizer', 'ace/mode/markdown_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextMode = require("./text").Mode;
-var JavaScriptMode = require("./javascript").Mode;
-var XmlMode = require("./xml").Mode;
-var HtmlMode = require("./html").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
-var MarkdownHighlightRules = require("./markdown_highlight_rules").MarkdownHighlightRules;
-
-var Mode = function() {
-    var highlighter = new MarkdownHighlightRules();
-    
-    this.$tokenizer = new Tokenizer(highlighter.getRules());
-    this.$embeds = highlighter.getEmbeds();
-    this.createModeDelegates({
-      "js-": JavaScriptMode,
-      "xml-": XmlMode,
-      "html-": HtmlMode
-    });
-};
-oop.inherits(Mode, TextMode);
-
-(function() {
-    this.getNextLineIndent = function(state, line, tab) {
-        if (state == "listblock") {
-            var match = /^((?:.+)?)([-+*][ ]+)/.exec(line);
-            if (match) {
-                return new Array(match[1].length + 1).join(" ") + match[2];
-            } else {
-                return "";
-            }
-        } else {
-            return this.$getIndent(line);
-        }
-    };
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-});/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/javascript', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/javascript_highlight_rules', 'ace/mode/matching_brace_outdent', 'ace/range', 'ace/worker/worker_client', 'ace/mode/behaviour/cstyle', 'ace/mode/folding/cstyle'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
-var JavaScriptHighlightRules = require("./javascript_highlight_rules").JavaScriptHighlightRules;
-var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
-var Range = require("../range").Range;
-var WorkerClient = require("../worker/worker_client").WorkerClient;
-var CstyleBehaviour = require("./behaviour/cstyle").CstyleBehaviour;
-var CStyleFoldMode = require("./folding/cstyle").FoldMode;
-
-var Mode = function() {
-    this.$tokenizer = new Tokenizer(new JavaScriptHighlightRules().getRules());
-    this.$outdent = new MatchingBraceOutdent();
-    this.$behaviour = new CstyleBehaviour();
-    this.foldingRules = new CStyleFoldMode();
-};
-oop.inherits(Mode, TextMode);
-
-(function() {
-
-
-    this.toggleCommentLines = function(state, doc, startRow, endRow) {
-        var outdent = true;
-        var re = /^(\s*)\/\//;
-
-        for (var i=startRow; i<= endRow; i++) {
-            if (!re.test(doc.getLine(i))) {
-                outdent = false;
-                break;
-            }
-        }
-
-        if (outdent) {
-            var deleteRange = new Range(0, 0, 0, 0);
-            for (var i=startRow; i<= endRow; i++)
-            {
-                var line = doc.getLine(i);
-                var m = line.match(re);
-                deleteRange.start.row = i;
-                deleteRange.end.row = i;
-                deleteRange.end.column = m[0].length;
-                doc.replace(deleteRange, m[1]);
-            }
-        }
-        else {
-            doc.indentRows(startRow, endRow, "//");
-        }
-    };
-
-    this.getNextLineIndent = function(state, line, tab) {
-        var indent = this.$getIndent(line);
-
-        var tokenizedLine = this.$tokenizer.getLineTokens(line, state);
-        var tokens = tokenizedLine.tokens;
-        var endState = tokenizedLine.state;
-
-        if (tokens.length && tokens[tokens.length-1].type == "comment") {
-            return indent;
-        }
-        
-        if (state == "start" || state == "regex_allowed") {
-            var match = line.match(/^.*(?:\bcase\b.*\:|[\{\(\[])\s*$/);
-            if (match) {
-                indent += tab;
-            }
-        } else if (state == "doc-start") {
-            if (endState == "start" || state == "regex_allowed") {
-                return "";
-            }
-            var match = line.match(/^\s*(\/?)\*/);
-            if (match) {
-                if (match[1]) {
-                    indent += " ";
-                }
-                indent += "* ";
-            }
-        }
-
-        return indent;
-    };
-
-    this.checkOutdent = function(state, line, input) {
-        return this.$outdent.checkOutdent(line, input);
-    };
-
-    this.autoOutdent = function(state, doc, row) {
-        this.$outdent.autoOutdent(doc, row);
-    };
-    
-    this.createWorker = function(session) {
-        var worker = new WorkerClient(["ace"], "worker-javascript.js", "ace/mode/javascript_worker", "JavaScriptWorker");
-        worker.attachToDocument(session.getDocument());
-            
-        worker.on("jslint", function(results) {
-            var errors = [];
-            for (var i=0; i<results.data.length; i++) {
-                var error = results.data[i];
-                if (error)
-                    errors.push({
-                        row: error.line-1,
-                        column: error.character-1,
-                        text: error.reason,
-                        type: "warning",
-                        lint: error
-                    });
-            }
-            session.setAnnotations(errors);
-        });
-        
-        worker.on("narcissus", function(e) {
-            session.setAnnotations([e.data]);
-        });
-        
-        worker.on("terminate", function() {
-            session.clearAnnotations();
-        });
-        
-        return worker;
-    };
-
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Mihai Sucan <mihai DOT sucan AT gmail DOT com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/javascript_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/unicode', 'ace/mode/doc_comment_highlight_rules', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var lang = require("../lib/lang");
-var unicode = require("../unicode");
-var DocCommentHighlightRules = require("./doc_comment_highlight_rules").DocCommentHighlightRules;
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var JavaScriptHighlightRules = function() {
-
-    // see: https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects
-    var globals = lang.arrayToMap(
-      // Constructors
-        ("Array|Boolean|Date|Function|Iterator|Number|Object|RegExp|String|Proxy|" +
-      // E4X
-         "Namespace|QName|XML|XMLList|" +
-         "ArrayBuffer|Float32Array|Float64Array|Int16Array|Int32Array|Int8Array|" +
-         "Uint16Array|Uint32Array|Uint8Array|Uint8ClampedArray|" +
-      // Errors
-        "Error|EvalError|InternalError|RangeError|ReferenceError|StopIteration|" +
-        "SyntaxError|TypeError|URIError|" +
-      //  Non-constructor functions
-        "decodeURI|decodeURIComponent|encodeURI|encodeURIComponent|eval|isFinite|" +
-        "isNaN|parseFloat|parseInt|" +
-      // Other
-        "JSON|Math|" +
-      // Pseudo
-        "this|arguments|prototype|window|document"
-      ).split("|")
-    );
-
-    var keywords = lang.arrayToMap(
-        ("break|case|catch|continue|default|delete|do|else|finally|for|function|" +
-        "if|in|instanceof|new|return|switch|throw|try|typeof|let|var|while|with|" +
-        "const|yield|import|get|set").split("|")
-    );
-
-    // keywords which can be followed by regular expressions
-    var kwBeforeRe = "case|do|else|finally|in|instanceof|return|throw|try|typeof|yield";
-
-    var deprecated = lang.arrayToMap(
-        ("__parent__|__count__|escape|unescape|with|__proto__").split("|")
-    );
-
-    var definitions = lang.arrayToMap(("const|let|var|function").split("|"));
-
-    var buildinConstants = lang.arrayToMap(
-        ("null|Infinity|NaN|undefined").split("|")
-    );
-
-    var futureReserved = lang.arrayToMap(
-        ("class|enum|extends|super|export|implements|private|" +
-        "public|interface|package|protected|static").split("|")
-    );
-
-    // TODO: Unicode escape sequences
-    var identifierRe = "[" + unicode.packages.L + "\\$_]["
-        + unicode.packages.L
-        + unicode.packages.Mn + unicode.packages.Mc
-        + unicode.packages.Nd
-        + unicode.packages.Pc + "\\$_]*\\b";
-
-    var escapedRe = "\\\\(?:x[0-9a-fA-F]{2}|" + // hex
-        "u[0-9a-fA-F]{4}|" + // unicode
-        "[0-2][0-7]{0,2}|" + // oct
-        "3[0-6][0-7]?|" + // oct
-        "37[0-7]?|" + // oct
-        "[4-7][0-7]?|" + //oct
-        ".)";
-
-    // regexp must not have capturing parentheses. Use (?:) instead.
-    // regexps are ordered -> the first match is used
-
-    this.$rules = {
-        "start" : [
-            {
-                token : "comment",
-                regex : /\/\/.*$/
-            },
-            new DocCommentHighlightRules().getStartRule("doc-start"),
-            {
-                token : "comment", // multi line comment
-                merge : true,
-                regex : /\/\*/,
-                next : "comment"
-            }, {
-                token : "string",
-                regex : "'",
-                next  : "qstring"
-            }, {
-                token : "string",
-                regex : '"',
-                next  : "qqstring"
-            }, {
-                token : "constant.numeric", // hex
-                regex : /0[xX][0-9a-fA-F]+\b/
-            }, {
-                token : "constant.numeric", // float
-                regex : /[+-]?\d+(?:(?:\.\d*)?(?:[eE][+-]?\d+)?)?\b/
-            }, { // match stuff like: Sound.prototype.play = function() { }
-                token : [
-                    "storage.type",
-                    "punctuation.operator",
-                    "support.function",
-                    "punctuation.operator",
-                    "entity.name.function",
-                    "text",
-                    "keyword.operator",
-                    "text",
-                    "storage.type",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(" + identifierRe + ")(\\.)(prototype)(\\.)(" + identifierRe +")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"
-            }, { // match stuff like: Sound.prototype.play = myfunc
-                token : [
-                    "storage.type",
-                    "punctuation.operator",
-                    "support.function",
-                    "punctuation.operator",
-                    "entity.name.function",
-                    "text",
-                    "keyword.operator",
-                    "text"
-                ],
-                regex : "(" + identifierRe + ")(\\.)(prototype)(\\.)(" + identifierRe +")(\\s*)(=)(\\s*)"
-            }, { // match stuff like: Sound.play = function() {  }
-                token : [
-                    "storage.type",
-                    "punctuation.operator",
-                    "entity.name.function",
-                    "text",
-                    "keyword.operator",
-                    "text",
-                    "storage.type",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(" + identifierRe + ")(\\.)(" + identifierRe +")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"
-            }, { // match stuff like: play = function() {  }
-                token : [
-                    "entity.name.function",
-                    "text",
-                    "keyword.operator",
-                    "text",
-                    "storage.type",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(" + identifierRe +")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"
-            }, { // match regular function like: function myFunc(arg) { }
-                token : [
-                    "storage.type",
-                    "text",
-                    "entity.name.function",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(function)(\\s+)(" + identifierRe + ")(\\s*)(\\()(.*?)(\\))"
-            }, { // match stuff like: foobar: function() { }
-                token : [
-                    "entity.name.function",
-                    "text",
-                    "punctuation.operator",
-                    "text",
-                    "storage.type",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(" + identifierRe + ")(\\s*)(:)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"
-            }, { // Attempt to match : function() { } (this is for issues with 'foo': function() { })
-                token : [
-                    "text",
-                    "text",
-                    "storage.type",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(:)(\\s*)(function)?(\\s*)(\\()([^)]*)(\\))"
-            }, {
-                token : "constant.language.boolean",
-                regex : /(?:true|false)\b/
-            }, {
-                token : "keyword",
-                regex : "(?:" + kwBeforeRe + ")\\b",
-                next : "regex_allowed"
-            }, {
-                token : ["punctuation.operator", "support.function"],
-                regex : /(\.)(s(?:h(?:ift|ow(?:Mod(?:elessDialog|alDialog)|Help))|croll(?:X|By(?:Pages|Lines)?|Y|To)?|t(?:opzzzz|rike)|i(?:n|zeToContent|debar|gnText)|ort|u(?:p|b(?:str(?:ing)?)?)|pli(?:ce|t)|e(?:nd|t(?:Re(?:sizable|questHeader)|M(?:i(?:nutes|lliseconds)|onth)|Seconds|Ho(?:tKeys|urs)|Year|Cursor|Time(?:out)?|Interval|ZOptions|Date|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Date|FullYear)|FullYear|Active)|arch)|qrt|lice|avePreferences|mall)|h(?:ome|andleEvent)|navigate|c(?:har(?:CodeAt|At)|o(?:s|n(?:cat|textual|firm)|mpile)|eil|lear(?:Timeout|Interval)?|a(?:ptureEvents|ll)|reate(?:StyleSheet|Popup|EventObject))|t(?:o(?:GMTString|S(?:tring|ource)|U(?:TCString|pperCase)|Lo(?:caleString|werCase))|est|a(?:n|int(?:Enabled)?))|i(?:s(?:NaN|Finite)|ndexOf|talics)|d(?:isableExternalCapture|ump|etachEvent)|u(?:n(?:shift|taint|escape|watch)|pdateCommands)|j(?:oin|avaEnabled)|p(?:o(?:p|w)|ush|lugins.refresh|a(?:ddings|rse(?:Int|Float)?)|r(?:int|ompt|eference))|e(?:scape|nableExternalCapture|val|lementFromPoint|x(?:p|ec(?:Script|Command)?))|valueOf|UTC|queryCommand(?:State|Indeterm|Enabled|Value)|f(?:i(?:nd|le(?:ModifiedDate|Size|CreatedDate|UpdatedDate)|xed)|o(?:nt(?:size|color)|rward)|loor|romCharCode)|watch|l(?:ink|o(?:ad|g)|astIndexOf)|a(?:sin|nchor|cos|t(?:tachEvent|ob|an(?:2)?)|pply|lert|b(?:s|ort))|r(?:ou(?:nd|teEvents)|e(?:size(?:By|To)|calc|turnValue|place|verse|l(?:oad|ease(?:Capture|Events)))|andom)|g(?:o|et(?:ResponseHeader|M(?:i(?:nutes|lliseconds)|onth)|Se(?:conds|lection)|Hours|Year|Time(?:zoneOffset)?|Da(?:y|te)|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Da(?:y|te)|FullYear)|FullYear|A(?:ttention|llResponseHeaders)))|m(?:in|ove(?:B(?:y|elow)|To(?:Absolute)?|Above)|ergeAttributes|a(?:tch|rgins|x))|b(?:toa|ig|o(?:ld|rderWidths)|link|ack))\b(?=\()/
-            }, {
-                token : ["punctuation.operator", "support.function.dom"],
-                regex : /(\.)(s(?:ub(?:stringData|mit)|plitText|e(?:t(?:NamedItem|Attribute(?:Node)?)|lect))|has(?:ChildNodes|Feature)|namedItem|c(?:l(?:ick|o(?:se|neNode))|reate(?:C(?:omment|DATASection|aption)|T(?:Head|extNode|Foot)|DocumentFragment|ProcessingInstruction|E(?:ntityReference|lement)|Attribute))|tabIndex|i(?:nsert(?:Row|Before|Cell|Data)|tem)|open|delete(?:Row|C(?:ell|aption)|T(?:Head|Foot)|Data)|focus|write(?:ln)?|a(?:dd|ppend(?:Child|Data))|re(?:set|place(?:Child|Data)|move(?:NamedItem|Child|Attribute(?:Node)?)?)|get(?:NamedItem|Element(?:sBy(?:Name|TagName)|ById)|Attribute(?:Node)?)|blur)\b(?=\()/
-            }, {
-                token : ["punctuation.operator", "support.constant"],
-                regex : /(\.)(s(?:ystemLanguage|cr(?:ipts|ollbars|een(?:X|Y|Top|Left))|t(?:yle(?:Sheets)?|atus(?:Text|bar)?)|ibling(?:Below|Above)|ource|uffixes|e(?:curity(?:Policy)?|l(?:ection|f)))|h(?:istory|ost(?:name)?|as(?:h|Focus))|y|X(?:MLDocument|SLDocument)|n(?:ext|ame(?:space(?:s|URI)|Prop))|M(?:IN_VALUE|AX_VALUE)|c(?:haracterSet|o(?:n(?:structor|trollers)|okieEnabled|lorDepth|mp(?:onents|lete))|urrent|puClass|l(?:i(?:p(?:boardData)?|entInformation)|osed|asses)|alle(?:e|r)|rypto)|t(?:o(?:olbar|p)|ext(?:Transform|Indent|Decoration|Align)|ags)|SQRT(?:1_2|2)|i(?:n(?:ner(?:Height|Width)|put)|ds|gnoreCase)|zIndex|o(?:scpu|n(?:readystatechange|Line)|uter(?:Height|Width)|p(?:sProfile|ener)|ffscreenBuffering)|NEGATIVE_INFINITY|d(?:i(?:splay|alog(?:Height|Top|Width|Left|Arguments)|rectories)|e(?:scription|fault(?:Status|Ch(?:ecked|arset)|View)))|u(?:ser(?:Profile|Language|Agent)|n(?:iqueID|defined)|pdateInterval)|_content|p(?:ixelDepth|ort|ersonalbar|kcs11|l(?:ugins|atform)|a(?:thname|dding(?:Right|Bottom|Top|Left)|rent(?:Window|Layer)?|ge(?:X(?:Offset)?|Y(?:Offset)?))|r(?:o(?:to(?:col|type)|duct(?:Sub)?|mpter)|e(?:vious|fix)))|e(?:n(?:coding|abledPlugin)|x(?:ternal|pando)|mbeds)|v(?:isibility|endor(?:Sub)?|Linkcolor)|URLUnencoded|P(?:I|OSITIVE_INFINITY)|f(?:ilename|o(?:nt(?:Size|Family|Weight)|rmName)|rame(?:s|Element)|gColor)|E|whiteSpace|l(?:i(?:stStyleType|n(?:eHeight|kColor))|o(?:ca(?:tion(?:bar)?|lName)|wsrc)|e(?:ngth|ft(?:Context)?)|a(?:st(?:M(?:odified|atch)|Index|Paren)|yer(?:s|X)|nguage))|a(?:pp(?:MinorVersion|Name|Co(?:deName|re)|Version)|vail(?:Height|Top|Width|Left)|ll|r(?:ity|guments)|Linkcolor|bove)|r(?:ight(?:Context)?|e(?:sponse(?:XML|Text)|adyState))|global|x|m(?:imeTypes|ultiline|enubar|argin(?:Right|Bottom|Top|Left))|L(?:N(?:10|2)|OG(?:10E|2E))|b(?:o(?:ttom|rder(?:Width|RightWidth|BottomWidth|Style|Color|TopWidth|LeftWidth))|ufferDepth|elow|ackground(?:Color|Image)))\b/
-            }, {
-                token : ["storage.type", "punctuation.operator", "support.function.firebug"],
-                regex : /(console)(\.)(warn|info|log|error|time|timeEnd|assert)\b/
-            }, {
-                token : function(value) {
-                    if (globals.hasOwnProperty(value))
-                        return "variable.language";
-                    else if (deprecated.hasOwnProperty(value))
-                        return "invalid.deprecated";
-                    else if (definitions.hasOwnProperty(value))
-                        return "storage.type";
-                    else if (keywords.hasOwnProperty(value))
-                        return "keyword";
-                    else if (buildinConstants.hasOwnProperty(value))
-                        return "constant.language";
-                    else if (futureReserved.hasOwnProperty(value))
-                        return "invalid.illegal";
-                    else if (value == "debugger")
-                        return "invalid.deprecated";
-                    else
-                        return "identifier";
-                },
-                regex : identifierRe
-            }, {
-                token : "keyword.operator",
-                regex : /!|\$|%|&|\*|\-\-|\-|\+\+|\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\|\||\?\:|\*=|%=|\+=|\-=|&=|\^=|\b(?:in|instanceof|new|delete|typeof|void)/,
-                next  : "regex_allowed"
-            }, {
-                token : "punctuation.operator",
-                regex : /\?|\:|\,|\;|\./,
-                next  : "regex_allowed"
-            }, {
-                token : "paren.lparen",
-                regex : /[\[({]/,
-                next  : "regex_allowed"
-            }, {
-                token : "paren.rparen",
-                regex : /[\])}]/
-            }, {
-                token : "keyword.operator",
-                regex : /\/=?/,
-                next  : "regex_allowed"
-            }, {
-                token: "comment",
-                regex: /^#!.*$/
-            }, {
-                token : "text",
-                regex : /\s+/
-            }
-        ],
-        // regular expressions are only allowed after certain tokens. This
-        // makes sure we don't mix up regexps with the divison operator
-        "regex_allowed": [
-            {
-                token : "comment", // multi line comment
-                merge : true,
-                regex : "\\/\\*",
-                next : "comment_regex_allowed"
-            }, {
-                token : "comment",
-                regex : "\\/\\/.*$"
-            }, {
-                token: "string.regexp",
-                regex: "\\/",
-                next: "regex",
-                merge: true
-            }, {
-                token : "text",
-                regex : "\\s+"
-            }, {
-                // immediately return to the start mode without matching
-                // anything
-                token: "empty",
-                regex: "",
-                next: "start"
-            }
-        ],
-        "regex": [
-            {
-                token: "regexp.keyword.operator",
-                regex: "\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",
-                next: "regex"
-            }, {
-				// flag
-                token: "string.regexp",
-                regex: "/\\w*",
-                next: "start",
-                merge: true
-            }, {
-                token: "string.regexp",
-                regex: "[^\\\\/\\[]+",
-                next: "regex",
-                merge: true
-            }, {
-                token: "string.regexp.charachterclass",
-                regex: "\\[",
-                next: "regex_character_class",
-                merge: true
-            }, {
-                token: "empty",
-                regex: "",
-                next: "start"
-            }
-        ],
-        "regex_character_class": [
-            {
-                token: "regexp.keyword.operator",
-                regex: "\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",
-                next: "regex_character_class"
-            }, {
-                token: "string.regexp.charachterclass",
-                regex: "]",
-                next: "regex",
-                merge: true
-            }, {
-                token: "string.regexp.charachterclass",
-                regex: "[^\\\\\\]]+",
-                next: "regex_character_class",
-                merge: true
-            }, {
-                token: "empty",
-                regex: "",
-                next: "start"
-            }
-        ],
-        "comment_regex_allowed" : [
-            {
-                token : "comment", // closing comment
-                regex : ".*?\\*\\/",
-                merge : true,
-                next : "regex_allowed"
-            }, {
-                token : "comment", // comment spanning whole line
-                merge : true,
-                regex : ".+"
-            }
-        ],
-        "comment" : [
-            {
-                token : "comment", // closing comment
-                regex : ".*?\\*\\/",
-                merge : true,
-                next : "start"
-            }, {
-                token : "comment", // comment spanning whole line
-                merge : true,
-                regex : ".+"
-            }
-        ],
-        "qqstring" : [
-            {
-                token : "constant.language.escape",
-                regex : escapedRe
-            }, {
-                token : "string",
-                regex : '[^"\\\\]+'
-            }, {
-                token : "string",
-                regex : '"',
-                next  : "start"
-            }
-        ],
-        "qstring" : [
-            {
-                token : "constant.language.escape",
-                regex : escapedRe
-            }, {
-                token : "string",
-                regex : "[^'\\\\]+"
-            }, {
-                token : "string",
-                regex : "'",
-                next  : "start"
-            }
-        ]
-    };
-
-    this.embedRules(DocCommentHighlightRules, "doc-",
-        [ new DocCommentHighlightRules().getEndRule("start") ]);
-};
-
-oop.inherits(JavaScriptHighlightRules, TextHighlightRules);
-
-exports.JavaScriptHighlightRules = JavaScriptHighlightRules;
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/doc_comment_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var DocCommentHighlightRules = function() {
-
-    this.$rules = {
-        "start" : [ {
-            token : "comment.doc.tag",
-            regex : "@[\\w\\d_]+" // TODO: fix email addresses
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "\\s+"
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "TODO"
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "[^@\\*]+"
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "."
-        }]
-    };
-};
-
-oop.inherits(DocCommentHighlightRules, TextHighlightRules);
-
-(function() {
-
-    this.getStartRule = function(start) {
-        return {
-            token : "comment.doc", // doc comment
-            merge : true,
-            regex : "\\/\\*(?=\\*)",
-            next  : start
-        };
-    };
-    
-    this.getEndRule = function (start) {
-        return {
-            token : "comment.doc", // closing comment
-            merge : true,
-            regex : "\\*\\/",
-            next  : start
-        };
-    };
-
-}).call(DocCommentHighlightRules.prototype);
-
-exports.DocCommentHighlightRules = DocCommentHighlightRules;
-
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/matching_brace_outdent', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../range").Range;
-
-var MatchingBraceOutdent = function() {};
-
-(function() {
-
-    this.checkOutdent = function(line, input) {
-        if (! /^\s+$/.test(line))
-            return false;
-
-        return /^\s*\}/.test(input);
-    };
-
-    this.autoOutdent = function(doc, row) {
-        var line = doc.getLine(row);
-        var match = line.match(/^(\s*\})/);
-
-        if (!match) return 0;
-
-        var column = match[1].length;
-        var openBracePos = doc.findMatchingBracket({row: row, column: column});
-
-        if (!openBracePos || openBracePos.row == row) return 0;
-
-        var indent = this.$getIndent(doc.getLine(openBracePos.row));
-        doc.replace(new Range(row, 0, row, column-1), indent);
-    };
-
-    this.$getIndent = function(line) {
-        var match = line.match(/^(\s+)/);
-        if (match) {
-            return match[1];
-        }
-
-        return "";
-    };
-
-}).call(MatchingBraceOutdent.prototype);
-
-exports.MatchingBraceOutdent = MatchingBraceOutdent;
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Chris Spencer <chris.ag.spencer AT googlemail DOT com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/behaviour/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/behaviour'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var Behaviour = require('../behaviour').Behaviour;
-
-var CstyleBehaviour = function () {
-
-    this.add("braces", "insertion", function (state, action, editor, session, text) {
-        if (text == '{') {
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: '{' + selected + '}',
-                    selection: false
-                };
-            } else {
-                return {
-                    text: '{}',
-                    selection: [1, 1]
-                };
-            }
-        } else if (text == '}') {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == '}') {
-                var matching = session.$findOpeningBracket('}', {column: cursor.column + 1, row: cursor.row});
-                if (matching !== null) {
-                    return {
-                        text: '',
-                        selection: [1, 1]
-                    };
-                }
-            }
-        } else if (text == "\n") {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == '}') {
-                var openBracePos = session.findMatchingBracket({row: cursor.row, column: cursor.column + 1});
-                if (!openBracePos)
-                     return null;
-
-                var indent = this.getNextLineIndent(state, line.substring(0, line.length - 1), session.getTabString());
-                var next_indent = this.$getIndent(session.doc.getLine(openBracePos.row));
-
-                return {
-                    text: '\n' + indent + '\n' + next_indent,
-                    selection: [1, indent.length, 1, indent.length]
-                };
-            }
-        }
-    });
-
-    this.add("braces", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && selected == '{') {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.end.column, range.end.column + 1);
-            if (rightChar == '}') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-    this.add("parens", "insertion", function (state, action, editor, session, text) {
-        if (text == '(') {
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: '(' + selected + ')',
-                    selection: false
-                };
-            } else {
-                return {
-                    text: '()',
-                    selection: [1, 1]
-                };
-            }
-        } else if (text == ')') {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == ')') {
-                var matching = session.$findOpeningBracket(')', {column: cursor.column + 1, row: cursor.row});
-                if (matching !== null) {
-                    return {
-                        text: '',
-                        selection: [1, 1]
-                    };
-                }
-            }
-        }
-    });
-
-    this.add("parens", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && selected == '(') {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
-            if (rightChar == ')') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-    this.add("string_dquotes", "insertion", function (state, action, editor, session, text) {
-        if (text == '"' || text == "'") {
-            var quote = text;
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: quote + selected + quote,
-                    selection: false
-                };
-            } else {
-                var cursor = editor.getCursorPosition();
-                var line = session.doc.getLine(cursor.row);
-                var leftChar = line.substring(cursor.column-1, cursor.column);
-
-                // We're escaped.
-                if (leftChar == '\\') {
-                    return null;
-                }
-
-                // Find what token we're inside.
-                var tokens = session.getTokens(selection.start.row, selection.start.row)[0].tokens;
-                var col = 0, token;
-                var quotepos = -1; // Track whether we're inside an open quote.
-
-                for (var x = 0; x < tokens.length; x++) {
-                    token = tokens[x];
-                    if (token.type == "string") {
-                      quotepos = -1;
-                    } else if (quotepos < 0) {
-                      quotepos = token.value.indexOf(quote);
-                    }
-                    if ((token.value.length + col) > selection.start.column) {
-                        break;
-                    }
-                    col += tokens[x].value.length;
-                }
-
-                // Try and be smart about when we auto insert.
-                if (!token || (quotepos < 0 && token.type !== "comment" && (token.type !== "string" || ((selection.start.column !== token.value.length+col-1) && token.value.lastIndexOf(quote) === token.value.length-1)))) {
-                    return {
-                        text: quote + quote,
-                        selection: [1,1]
-                    };
-                } else if (token && token.type === "string") {
-                    // Ignore input and move right one if we're typing over the closing quote.
-                    var rightChar = line.substring(cursor.column, cursor.column + 1);
-                    if (rightChar == quote) {
-                        return {
-                            text: '',
-                            selection: [1, 1]
-                        };
-                    }
-                }
-            }
-        }
-    });
-
-    this.add("string_dquotes", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && (selected == '"' || selected == "'")) {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
-            if (rightChar == '"') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-};
-
-oop.inherits(CstyleBehaviour, Behaviour);
-
-exports.CstyleBehaviour = CstyleBehaviour;
-});/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/folding/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/range', 'ace/mode/folding/fold_mode'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var Range = require("../../range").Range;
-var BaseFoldMode = require("./fold_mode").FoldMode;
-
-var FoldMode = exports.FoldMode = function() {};
-oop.inherits(FoldMode, BaseFoldMode);
-
-(function() {
-
-    this.foldingStartMarker = /(\{|\[)[^\}\]]*$|^\s*(\/\*)/;
-    this.foldingStopMarker = /^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/;
-    
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        var line = session.getLine(row);
-        var match = line.match(this.foldingStartMarker);
-        if (match) {
-            var i = match.index;
-
-            if (match[1])
-                return this.openingBracketBlock(session, match[1], row, i);
-
-            var range = session.getCommentFoldRange(row, i + match[0].length);
-            range.end.column -= 2;
-            return range;
-        }
-
-        if (foldStyle !== "markbeginend")
-            return;
-            
-        var match = line.match(this.foldingStopMarker);
-        if (match) {
-            var i = match.index + match[0].length;
-
-            if (match[2]) {
-                var range = session.getCommentFoldRange(row, i);
-                range.end.column -= 2;
-                return range;
-            }
-
-            var end = {row: row, column: i};
-            var start = session.$findOpeningBracket(match[1], end);
-            
-            if (!start)
-                return;
-
-            start.column++;
-            end.column--;
-
-            return  Range.fromPoints(start, end);
-        }
-    };
-    
-}).call(FoldMode.prototype);
-
-});/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/folding/fold_mode', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../../range").Range;
-
-var FoldMode = exports.FoldMode = function() {};
-
-(function() {
-
-    this.foldingStartMarker = null;
-    this.foldingStopMarker = null;
-
-    // must return "" if there's no fold, to enable caching
-    this.getFoldWidget = function(session, foldStyle, row) {
-        var line = session.getLine(row);
-        if (this.foldingStartMarker.test(line))
-            return "start";
-        if (foldStyle == "markbeginend"
-                && this.foldingStopMarker
-                && this.foldingStopMarker.test(line))
-            return "end";
-        return "";
-    };
-    
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        return null;
-    };
-
-    this.indentationBlock = function(session, row, column) {
-        var re = /^\s*/;
-        var startRow = row;
-        var endRow = row;
-        var line = session.getLine(row);
-        var startColumn = column || line.length;
-        var startLevel = line.match(re)[0].length;
-        var maxRow = session.getLength()
-        
-        while (++row < maxRow) {
-            line = session.getLine(row);
-            var level = line.match(re)[0].length;
-
-            if (level == line.length)
-                continue;
-
-            if (level <= startLevel)
-                break;
-
-            endRow = row;
-        }
-
-        if (endRow > startRow) {
-            var endColumn = session.getLine(endRow).length;
-            return new Range(startRow, startColumn, endRow, endColumn);
-        }
-    };
-
-    this.openingBracketBlock = function(session, bracket, row, column) {
-        var start = {row: row, column: column + 1};
-        var end = session.$findClosingBracket(bracket, start);
-        if (!end)
-            return;
-
-        var fw = session.foldWidgets[end.row];
-        if (fw == null)
-            fw = this.getFoldWidget(session, end.row);
-
-        if (fw == "start") {
-            end.row --;
-            end.column = session.getLine(end.row).length;
-        }
-        return Range.fromPoints(start, end);
-    };
-
-}).call(FoldMode.prototype);
-
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/xml', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/xml_highlight_rules', 'ace/mode/behaviour/xml', 'ace/mode/folding/xml'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
-var XmlHighlightRules = require("./xml_highlight_rules").XmlHighlightRules;
-var XmlBehaviour = require("./behaviour/xml").XmlBehaviour;
-var XmlFoldMode = require("./folding/xml").FoldMode;
-
-var Mode = function() {
-    this.$tokenizer = new Tokenizer(new XmlHighlightRules().getRules());
-    this.$behaviour = new XmlBehaviour();
-    this.foldingRules = new XmlFoldMode();
-};
-
-oop.inherits(Mode, TextMode);
-
-(function() {
-    
-    this.getNextLineIndent = function(state, line, tab) {
-        return this.$getIndent(line);
-    };
-
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/xml_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/xml_util', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var xmlUtil = require("./xml_util");
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var XmlHighlightRules = function() {
-
-    // regexp must not have capturing parentheses
-    // regexps are ordered -> the first match is used
-    this.$rules = {
-        start : [{
-            token : "text",
-            regex : "<\\!\\[CDATA\\[",
-            next : "cdata"
-        }, {
-            token : "xml_pe",
-            regex : "<\\?.*?\\?>"
-        }, {
-            token : "comment",
-            merge : true,
-            regex : "<\\!--",
-            next : "comment"
-        }, {
-            token : "xml_pe",
-            regex : "<\\!.*?>"
-        }, {
-            token : "meta.tag", // opening tag
-            regex : "<\\/?",
-            next : "tag"
-        }, {
-            token : "text",
-            regex : "\\s+"
-        }, {
-            token : "constant.character.entity",
-            regex : "(?:&#[0-9]+;)|(?:&#x[0-9a-fA-F]+;)|(?:&[a-zA-Z0-9_:\\.-]+;)"
-        }, {
-            token : "text",
-            regex : "[^<]+"
-        }],
-        
-        cdata : [{
-            token : "text",
-            regex : "\\]\\]>",
-            next : "start"
-        }, {
-            token : "text",
-            regex : "\\s+"
-        }, {
-            token : "text",
-            regex : "(?:[^\\]]|\\](?!\\]>))+"
-        }],
-
-        comment : [{
-            token : "comment",
-            regex : ".*?-->",
-            next : "start"
-        }, {
-            token : "comment",
-            merge : true,
-            regex : ".+"
-        }]
-    };
-    
-    xmlUtil.tag(this.$rules, "tag", "start");
-};
-
-oop.inherits(XmlHighlightRules, TextHighlightRules);
-
-exports.XmlHighlightRules = XmlHighlightRules;
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/xml_util', ['require', 'exports', 'module' , 'ace/lib/lang'], function(require, exports, module) {
-"use strict";
-
-var lang = require("../lib/lang");
-
-var formTags = lang.arrayToMap(
-    ("button|form|input|label|select|textarea").split("|")
-);
-
-var tableTags = lang.arrayToMap(
-    ("table|tbody|td|tfoot|th|tr").split("|")
-);
-
-function string(state) {
-    return [{
-        token : "string",
-        regex : '".*?"'
-    }, {
-        token : "string", // multi line string start
-        merge : true,
-        regex : '["].*',
-        next : state + "_qqstring"
-    }, {
-        token : "string",
-        regex : "'.*?'"
-    }, {
-        token : "string", // multi line string start
-        merge : true,
-        regex : "['].*",
-        next : state + "_qstring"
-    }];
-}
-
-function multiLineString(quote, state) {
-    return [{
-        token : "string",
-        merge : true,
-        regex : ".*?" + quote,
-        next : state
-    }, {
-        token : "string",
-        merge : true,
-        regex : '.+'
-    }];
-}
-
-exports.tag = function(states, name, nextState) {
-    states[name] = [{
-        token : "text",
-        regex : "\\s+"
-    }, {
-        //token : "meta.tag",
-        
-    token : function(value) {
-            if ( value==='a' ) {
-                return "meta.tag.anchor";
-            }
-            else if ( value==='img' ) {
-                return "meta.tag.image";
-            }
-            else if ( value==='script' ) {
-                return "meta.tag.script";
-            }
-            else if ( value==='style' ) {
-                return "meta.tag.style";
-            }
-            else if (formTags.hasOwnProperty(value.toLowerCase())) {
-                return "meta.tag.form";
-            }
-            else if (tableTags.hasOwnProperty(value.toLowerCase())) {
-                return "meta.tag.table";
-            }
-            else {
-                return "meta.tag";
-            }
-        },        
-        merge : true,
-        regex : "[-_a-zA-Z0-9:]+",
-        next : name + "_embed_attribute_list" 
-    }, {
-        token: "empty",
-        regex: "",
-        next : name + "_embed_attribute_list"
-    }];
-
-    states[name + "_qstring"] = multiLineString("'", name + "_embed_attribute_list");
-    states[name + "_qqstring"] = multiLineString("\"", name + "_embed_attribute_list");
-    
-    states[name + "_embed_attribute_list"] = [{
-        token : "meta.tag",
-        merge : true,
-        regex : "\/?>",
-        next : nextState
-    }, {
-        token : "keyword.operator",
-        regex : "="
-    }, {
-        token : "entity.other.attribute-name",
-        regex : "[-_a-zA-Z0-9:]+"
-    }, {
-        token : "constant.numeric", // float
-        regex : "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"
-    }, {
-        token : "text",
-        regex : "\\s+"
-    }].concat(string(name));
-};
-
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Chris Spencer <chris.ag.spencer AT googlemail DOT com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/behaviour/xml', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/behaviour', 'ace/mode/behaviour/cstyle'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var Behaviour = require("../behaviour").Behaviour;
-var CstyleBehaviour = require("./cstyle").CstyleBehaviour;
-
-var XmlBehaviour = function () {
-    
-    this.inherit(CstyleBehaviour, ["string_dquotes"]); // Get string behaviour
-    
-    this.add("brackets", "insertion", function (state, action, editor, session, text) {
-        if (text == '<') {
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return false;
-            } else {
-                return {
-                    text: '<>',
-                    selection: [1, 1]
-                }
-            }
-        } else if (text == '>') {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == '>') { // need some kind of matching check here
-                return {
-                    text: '',
-                    selection: [1, 1]
-                }
-            }
-        } else if (text == "\n") {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChars = line.substring(cursor.column, cursor.column + 2);
-            if (rightChars == '</') {
-                var indent = this.$getIndent(session.doc.getLine(cursor.row)) + session.getTabString();
-                var next_indent = this.$getIndent(session.doc.getLine(cursor.row));
-
-                return {
-                    text: '\n' + indent + '\n' + next_indent,
-                    selection: [1, indent.length, 1, indent.length]
-                }
-            }
-        }
-    });
-    
-}
-oop.inherits(XmlBehaviour, Behaviour);
-
-exports.XmlBehaviour = XmlBehaviour;
-});/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/folding/xml', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/range', 'ace/mode/folding/fold_mode', 'ace/token_iterator'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var lang = require("../../lib/lang");
-var Range = require("../../range").Range;
-var BaseFoldMode = require("./fold_mode").FoldMode;
-var TokenIterator = require("../../token_iterator").TokenIterator;
-
-var FoldMode = exports.FoldMode = function(voidElements) {
-    BaseFoldMode.call(this);
-    this.voidElements = voidElements || {};
-};
-oop.inherits(FoldMode, BaseFoldMode);
-
-(function() {
-
-    this.getFoldWidget = function(session, foldStyle, row) {
-        var tag = this._getFirstTagInLine(session, row);
-
-        if (tag.closing)
-            return foldStyle == "markbeginend" ? "end" : "";
-
-        if (!tag.tagName || this.voidElements[tag.tagName.toLowerCase()])
-            return "";
-
-        if (tag.selfClosing)
-            return "";
-
-        if (tag.value.indexOf("/" + tag.tagName) !== -1)
-            return "";
-
-        return "start";
-    };
-    
-    this._getFirstTagInLine = function(session, row) {
-        var tokens = session.getTokens(row, row)[0].tokens;
-        var value = "";
-        for (var i = 0; i < tokens.length; i++) {
-            var token = tokens[i];
-            if (token.type.indexOf("meta.tag") === 0)
-                value += token.value;
-            else
-                value += lang.stringRepeat(" ", token.value.length);
-        }
-        
-        return this._parseTag(value);
-    };
-
-    this.tagRe = /^(\s*)(<?(\/?)([-_a-zA-Z0-9:!]*)\s*(\/?)>?)/;
-    this._parseTag = function(tag) {
-        
-        var match = this.tagRe.exec(tag);
-        var column = this.tagRe.lastIndex || 0;
-        this.tagRe.lastIndex = 0;
-
-        return {
-            value: tag,
-            match: match ? match[2] : "",
-            closing: match ? !!match[3] : false,
-            selfClosing: match ? !!match[5] || match[2] == "/>" : false,
-            tagName: match ? match[4] : "",
-            column: match[1] ? column + match[1].length : column
-        };
-    };
-    
-    /**
-     * reads a full tag and places the iterator after the tag
-     */
-    this._readTagForward = function(iterator) {
-        var token = iterator.getCurrentToken();
-        if (!token)
-            return null;
-            
-        var value = "";
-        var start;
-        
-        do {
-            if (token.type.indexOf("meta.tag") === 0) {
-                if (!start) {
-                    var start = {
-                        row: iterator.getCurrentTokenRow(),
-                        column: iterator.getCurrentTokenColumn()
-                    };
-                }
-                value += token.value;
-                if (value.indexOf(">") !== -1) {
-                    var tag = this._parseTag(value);
-                    tag.start = start;
-                    tag.end = {
-                        row: iterator.getCurrentTokenRow(),
-                        column: iterator.getCurrentTokenColumn() + token.value.length
-                    };
-                    iterator.stepForward();
-                    return tag;
-                }
-            }
-        } while(token = iterator.stepForward());
-        
-        return null;
-    };
-    
-    this._readTagBackward = function(iterator) {
-        var token = iterator.getCurrentToken();
-        if (!token)
-            return null;
-            
-        var value = "";
-        var end;
-
-        do {
-            if (token.type.indexOf("meta.tag") === 0) {
-                if (!end) {
-                    end = {
-                        row: iterator.getCurrentTokenRow(),
-                        column: iterator.getCurrentTokenColumn() + token.value.length
-                    };
-                }
-                value = token.value + value;
-                if (value.indexOf("<") !== -1) {
-                    var tag = this._parseTag(value);
-                    tag.end = end;
-                    tag.start = {
-                        row: iterator.getCurrentTokenRow(),
-                        column: iterator.getCurrentTokenColumn()
-                    };
-                    iterator.stepBackward();
-                    return tag;
-                }
-            }
-        } while(token = iterator.stepBackward());
-        
-        return null;
-    };
-    
-    this._pop = function(stack, tag) {
-        while (stack.length) {
-            
-            var top = stack[stack.length-1];
-            if (!tag || top.tagName == tag.tagName) {
-                return stack.pop();
-            }
-            else if (this.voidElements[tag.tagName]) {
-                return;
-            }
-            else if (this.voidElements[top.tagName]) {
-                stack.pop();
-                continue;
-            } else {
-                return null;
-            }
-        }
-    };
-    
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        var firstTag = this._getFirstTagInLine(session, row);
-        
-        if (!firstTag.match)
-            return null;
-        
-        var isBackward = firstTag.closing || firstTag.selfClosing;
-        var stack = [];
-        var tag;
-        
-        if (!isBackward) {
-            var iterator = new TokenIterator(session, row, firstTag.column);
-            var start = {
-                row: row,
-                column: firstTag.column + firstTag.tagName.length + 2
-            };
-            while (tag = this._readTagForward(iterator)) {
-                if (tag.selfClosing) {
-                    if (!stack.length) {
-                        tag.start.column += tag.tagName.length + 2;
-                        tag.end.column -= 2;
-                        return Range.fromPoints(tag.start, tag.end);
-                    } else
-                        continue;
-                }
-                
-                if (tag.closing) {
-                    this._pop(stack, tag);
-                    if (stack.length == 0)
-                        return Range.fromPoints(start, tag.start);
-                }
-                else {
-                    stack.push(tag)
-                }
-            }
-        }
-        else {
-            var iterator = new TokenIterator(session, row, firstTag.column + firstTag.match.length);
-            var end = {
-                row: row,
-                column: firstTag.column
-            };
-            
-            while (tag = this._readTagBackward(iterator)) {
-                if (tag.selfClosing) {
-                    if (!stack.length) {
-                        tag.start.column += tag.tagName.length + 2;
-                        tag.end.column -= 2;
-                        return Range.fromPoints(tag.start, tag.end);
-                    } else
-                        continue;
-                }
-                
-                if (!tag.closing) {
-                    this._pop(stack, tag);
-                    if (stack.length == 0) {
-                        tag.start.column += tag.tagName.length + 2;
-                        return Range.fromPoints(tag.start, end);
-                    }
-                }
-                else {
-                    stack.push(tag)
-                }
-            }
-        }
-        
-    };
-
-}).call(FoldMode.prototype);
-
-});/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/html', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/mode/javascript', 'ace/mode/css', 'ace/tokenizer', 'ace/mode/html_highlight_rules', 'ace/mode/behaviour/xml', 'ace/mode/folding/html'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextMode = require("./text").Mode;
-var JavaScriptMode = require("./javascript").Mode;
-var CssMode = require("./css").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
-var HtmlHighlightRules = require("./html_highlight_rules").HtmlHighlightRules;
-var XmlBehaviour = require("./behaviour/xml").XmlBehaviour;
-var HtmlFoldMode = require("./folding/html").FoldMode;
-
-var Mode = function() {
-    var highlighter = new HtmlHighlightRules();
-    this.$tokenizer = new Tokenizer(highlighter.getRules());
-    this.$behaviour = new XmlBehaviour();
-    
-    this.$embeds = highlighter.getEmbeds();
-    this.createModeDelegates({
-        "js-": JavaScriptMode,
-        "css-": CssMode
-    });
-    
-    this.foldingRules = new HtmlFoldMode();
-};
-oop.inherits(Mode, TextMode);
-
-(function() {
-
-    
-    this.toggleCommentLines = function(state, doc, startRow, endRow) {
-        return 0;
-    };
-
-    this.getNextLineIndent = function(state, line, tab) {
-        return this.$getIndent(line);
-    };
-
-    this.checkOutdent = function(state, line, input) {
-        return false;
-    };
-
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/css', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/css_highlight_rules', 'ace/mode/matching_brace_outdent', 'ace/worker/worker_client', 'ace/mode/folding/cstyle'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
-var CssHighlightRules = require("./css_highlight_rules").CssHighlightRules;
-var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
-var WorkerClient = require("../worker/worker_client").WorkerClient;
-var CStyleFoldMode = require("./folding/cstyle").FoldMode;
-
-var Mode = function() {
-    this.$tokenizer = new Tokenizer(new CssHighlightRules().getRules(), "i");
-    this.$outdent = new MatchingBraceOutdent();
-    this.foldingRules = new CStyleFoldMode();
-};
-oop.inherits(Mode, TextMode);
-
-(function() {
-
-    this.foldingRules = "cStyle";
-
-    this.getNextLineIndent = function(state, line, tab) {
-        var indent = this.$getIndent(line);
-
-        // ignore braces in comments
-        var tokens = this.$tokenizer.getLineTokens(line, state).tokens;
-        if (tokens.length && tokens[tokens.length-1].type == "comment") {
-            return indent;
-        }
-
-        var match = line.match(/^.*\{\s*$/);
-        if (match) {
-            indent += tab;
-        }
-
-        return indent;
-    };
-
-    this.checkOutdent = function(state, line, input) {
-        return this.$outdent.checkOutdent(line, input);
-    };
-
-    this.autoOutdent = function(state, doc, row) {
-        this.$outdent.autoOutdent(doc, row);
-    };
-    
-    this.createWorker = function(session) {
-        var worker = new WorkerClient(["ace"], "worker-css.js", "ace/mode/css_worker", "Worker");
-        worker.attachToDocument(session.getDocument());
-        
-        worker.on("csslint", function(e) {
-            var errors = [];
-            e.data.forEach(function(message) {
-                errors.push({
-                    row: message.line - 1,
-                    column: message.col - 1,
-                    text: message.message,
-                    type: message.type,
-                    lint: message
-                });
-            });
-            
-            session.setAnnotations(errors);
-        });
-        return worker;
-    };
-
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/css_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var lang = require("../lib/lang");
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var CssHighlightRules = function() {
-
-    var properties = lang.arrayToMap(
-        ("animation-fill-mode|alignment-adjust|alignment-baseline|animation-delay|animation-direction|animation-duration|animation-iteration-count|animation-name|animation-play-state|animation-timing-function|animation|appearance|azimuth|backface-visibility|background-attachment|background-break|background-clip|background-color|background-image|background-origin|background-position|background-repeat|background-size|background|baseline-shift|binding|bleed|bookmark-label|bookmark-level|bookmark-state|bookmark-target|border-bottom|border-bottom-color|border-bottom-left-radius|border-bottom-right-radius|border-bottom-style|border-bottom-width|border-collapse|border-color|border-image|border-image-outset|border-image-repeat|border-image-slice|border-image-source|border-image-width|border-left|border-left-color|border-left-style|border-left-width|border-radius|border-right|border-right-color|border-right-style|border-right-width|border-spacing|border-style|border-top|border-top-color|border-top-left-radius|border-top-right-radius|border-top-style|border-top-width|border-width|border|bottom|box-align|box-decoration-break|box-direction|box-flex-group|box-flex|box-lines|box-ordinal-group|box-orient|box-pack|box-shadow|box-sizing|break-after|break-before|break-inside|caption-side|clear|clip|color-profile|color|column-count|column-fill|column-gap|column-rule|column-rule-color|column-rule-style|column-rule-width|column-span|column-width|columns|content|counter-increment|counter-reset|crop|cue-after|cue-before|cue|cursor|direction|display|dominant-baseline|drop-initial-after-adjust|drop-initial-after-align|drop-initial-before-adjust|drop-initial-before-align|drop-initial-size|drop-initial-value|elevation|empty-cells|fit|fit-position|float-offset|float|font-family|font-size|font-size-adjust|font-stretch|font-style|font-variant|font-weight|font|grid-columns|grid-rows|hanging-punctuation|height|hyphenate-after|hyphenate-before|hyphenate-character|hyphenate-lines|hyphenate-resource|hyphens|icon|image-orientation|image-rendering|image-resolution|inline-box-align|left|letter-spacing|line-height|line-stacking-ruby|line-stacking-shift|line-stacking-strategy|line-stacking|list-style-image|list-style-position|list-style-type|list-style|margin-bottom|margin-left|margin-right|margin-top|margin|mark-after|mark-before|mark|marks|marquee-direction|marquee-play-count|marquee-speed|marquee-style|max-height|max-width|min-height|min-width|move-to|nav-down|nav-index|nav-left|nav-right|nav-up|opacity|orphans|outline-color|outline-offset|outline-style|outline-width|outline|overflow-style|overflow-x|overflow-y|overflow|padding-bottom|padding-left|padding-right|padding-top|padding|page-break-after|page-break-before|page-break-inside|page-policy|page|pause-after|pause-before|pause|perspective-origin|perspective|phonemes|pitch-range|pitch|play-during|position|presentation-level|punctuation-trim|quotes|rendering-intent|resize|rest-after|rest-before|rest|richness|right|rotation-point|rotation|ruby-align|ruby-overhang|ruby-position|ruby-span|size|speak-header|speak-numeral|speak-punctuation|speak|speech-rate|stress|string-set|table-layout|target-name|target-new|target-position|target|text-align-last|text-align|text-decoration|text-emphasis|text-height|text-indent|text-justify|text-outline|text-shadow|text-transform|text-wrap|top|transform-origin|transform-style|transform|transition-delay|transition-duration|transition-property|transition-timing-function|transition|unicode-bidi|vertical-align|visibility|voice-balance|voice-duration|voice-family|voice-pitch-range|voice-pitch|voice-rate|voice-stress|voice-volume|volume|white-space-collapse|white-space|widows|width|word-break|word-spacing|word-wrap|z-index").split("|")
-    );
-
-    var functions = lang.arrayToMap(
-        ("rgb|rgba|url|attr|counter|counters").split("|")
-    );
-
-    var constants = lang.arrayToMap(
-        ("absolute|after-edge|after|all-scroll|all|alphabetic|always|antialiased|armenian|auto|avoid-column|avoid-page|avoid|balance|baseline|before-edge|before|below|bidi-override|block-line-height|block|bold|bolder|border-box|both|bottom|box|break-all|break-word|capitalize|caps-height|caption|center|central|char|circle|cjk-ideographic|clone|close-quote|col-resize|collapse|column|consider-shifts|contain|content-box|cover|crosshair|cubic-bezier|dashed|decimal-leading-zero|decimal|default|disabled|disc|disregard-shifts|distribute-all-lines|distribute-letter|distribute-space|distribute|dotted|double|e-resize|ease-in|ease-in-out|ease-out|ease|ellipsis|end|exclude-ruby|fill|fixed|font-size|font|georgian|glyphs|grid-height|groove|hand|hanging|hebrew|help|hidden|hiragana-iroha|hiragana|horizontal|icon|ideograph-alpha|ideograph-numeric|ideograph-parenthesis|ideograph-space|ideographic|inactive|include-ruby|inherit|initial|inline-block|inline-box|inline-line-height|inline-table|inline|inset|inside|inter-ideograph|inter-word|invert|italic|justify|katakana-iroha|katakana|keep-all|last|left|lighter|line-edge|line-through|line|linear|list-item|local|loose|lower-alpha|lower-greek|lower-latin|lower-roman|lowercase|lr-tb|ltr|mathematical|max-height|max-size|medium|menu|message-box|middle|move|n-resize|ne-resize|newspaper|no-change|no-close-quote|no-drop|no-open-quote|no-repeat|none|normal|not-allowed|nowrap|nw-resize|oblique|open-quote|outset|outside|overline|padding-box|page|pointer|pre-line|pre-wrap|pre|preserve-3d|progress|relative|repeat-x|repeat-y|repeat|replaced|reset-size|ridge|right|round|row-resize|rtl|s-resize|scroll|se-resize|separate|slice|small-caps|small-caption|solid|space|square|start|static|status-bar|step-end|step-start|steps|stretch|strict|sub|super|sw-resize|table-caption|table-cell|table-column-group|table-column|table-footer-group|table-header-group|table-row-group|table-row|table|tb-rl|text-after-edge|text-before-edge|text-bottom|text-size|text-top|text|thick|thin|top|transparent|underline|upper-alpha|upper-latin|upper-roman|uppercase|use-script|vertical-ideographic|vertical-text|visible|w-resize|wait|whitespace|z-index|zero").split("|")
-    );
-
-    var colors = lang.arrayToMap(
-        ("aqua|black|blue|fuchsia|gray|green|lime|maroon|navy|olive|orange|" +
-        "purple|red|silver|teal|white|yellow").split("|")
-    );
-
-    var fonts = lang.arrayToMap(
-        ("arial|century|comic|courier|garamond|georgia|helvetica|impact|lucida|" +
-        "symbol|system|tahoma|times|trebuchet|utopia|verdana|webdings|sans-serif|" +
-        "serif|monospace").split("|")
-    );
-    
-    // regexp must not have capturing parentheses. Use (?:) instead.
-    // regexps are ordered -> the first match is used
-
-    var numRe = "\\-?(?:(?:[0-9]+)|(?:[0-9]*\\.[0-9]+))";
-    var pseudoElements = "(\\:+)\\b(after|before|first-letter|first-line|moz-selection|selection)\\b";
-    var pseudoClasses = "(:)\\b(active|checked|disabled|empty|enabled|first-child|first-of-type|focus|hover|indeterminate|invalid|last-child|last-of-type|link|not|nth-child|nth-last-child|nth-last-of-type|nth-of-type|only-child|only-of-type|required|root|target|valid|visited)\\b";
-    
-    var base_ruleset = [
-        {
-            token : "comment", // multi line comment
-            merge : true,
-            regex : "\\/\\*",
-            next : "ruleset_comment"
-        }, {
-            token : "string", // single line
-            regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
-        }, {
-            token : "string", // single line
-            regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"
-        }, {
-            token : ["constant.numeric", "keyword"],
-            regex : "(" + numRe + ")(ch|cm|deg|em|ex|fr|gd|grad|Hz|in|kHz|mm|ms|pc|pt|px|rad|rem|s|turn|vh|vm|vw|%)"
-        }, {
-            token : ["constant.numeric"],
-            regex : "([0-9]+)"
-        }, {
-            token : "constant.numeric",  // hex6 color
-            regex : "#[a-f0-9]{6}"
-        }, {
-            token : "constant.numeric", // hex3 color
-            regex : "#[a-f0-9]{3}"
-        }, {
-            token : ["punctuation", "entity.other.attribute-name.pseudo-element.css"], 
-            regex : pseudoElements
-        }, {
-            token : ["punctuation", "entity.other.attribute-name.pseudo-class.css"], 
-            regex : pseudoClasses
-        }, {
-            token : function(value) {
-                if (properties.hasOwnProperty(value.toLowerCase())) {
-                    return "support.type";
-                }
-                else if (functions.hasOwnProperty(value.toLowerCase())) {
-                    return "support.function";
-                }
-                else if (constants.hasOwnProperty(value.toLowerCase())) {
-                    return "support.constant";
-                }
-                else if (colors.hasOwnProperty(value.toLowerCase())) {
-                    return "support.constant.color";
-                }
-                else if (fonts.hasOwnProperty(value.toLowerCase())) {
-                    return "support.constant.fonts";
-                }
-                else {
-                    return "text";
-                }
-            },
-            regex : "\\-?[a-zA-Z_][a-zA-Z0-9_\\-]*"
-        } 
-      ];
-
-    var ruleset = lang.copyArray(base_ruleset);
-    ruleset.unshift({
-        token : "paren.rparen",
-        regex : "\\}",
-        next:   "start"
-    });
-
-    var media_ruleset = lang.copyArray( base_ruleset );
-    media_ruleset.unshift({
-        token : "paren.rparen",
-        regex : "\\}",
-        next:   "media"
-    });
-
-    var base_comment = [{
-          token : "comment", // comment spanning whole line
-          merge : true,
-          regex : ".+"
-    }];
-
-    var comment = lang.copyArray(base_comment);
-    comment.unshift({
-          token : "comment", // closing comment
-          regex : ".*?\\*\\/",
-          next : "start"
-    });
-
-    var media_comment = lang.copyArray(base_comment);
-    media_comment.unshift({
-          token : "comment", // closing comment
-          regex : ".*?\\*\\/",
-          next : "media"
-    });
-
-    var ruleset_comment = lang.copyArray(base_comment);
-    ruleset_comment.unshift({
-          token : "comment", // closing comment
-          regex : ".*?\\*\\/",
-          next : "ruleset"
-    });
-
-    this.$rules = {
-        "start" : [{
-            token : "comment", // multi line comment
-            merge : true,
-            regex : "\\/\\*",
-            next : "comment"
-        }, {
-            token: "paren.lparen",
-            regex: "\\{",
-            next:  "ruleset"
-        }, {
-            token: "string",
-            regex: "@.*?{",
-            next:  "media"
-        },{
-            token: "keyword",
-            regex: "#[a-z0-9-_]+"
-        },{
-            token: "variable",
-            regex: "\\.[a-z0-9-_]+"
-        },{
-            token: "string",
-            regex: ":[a-z0-9-_]+"
-        },{
-            token: "constant",
-            regex: "[a-z0-9-_]+"
-        }],
-
-        "media" : [ {
-            token : "comment", // multi line comment
-            merge : true,
-            regex : "\\/\\*",
-            next : "media_comment"
-        }, {
-            token: "paren.lparen",
-            regex: "\\{",
-            next:  "media_ruleset"
-        },{
-            token: "string",
-            regex: "\\}",
-            next:  "start"
-        },{
-            token: "keyword",
-            regex: "#[a-z0-9-_]+"
-        },{
-            token: "variable",
-            regex: "\\.[a-z0-9-_]+"
-        },{
-            token: "string",
-            regex: ":[a-z0-9-_]+"
-        },{
-            token: "constant",
-            regex: "[a-z0-9-_]+"
-        }],
-
-        "comment" : comment,
-
-        "ruleset" : ruleset,
-        "ruleset_comment" : ruleset_comment,
-
-        "media_ruleset" : media_ruleset,
-        "media_comment" : media_comment
-    };
-};
-
-oop.inherits(CssHighlightRules, TextHighlightRules);
-
-exports.CssHighlightRules = CssHighlightRules;
-
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/html_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/css_highlight_rules', 'ace/mode/javascript_highlight_rules', 'ace/mode/xml_util', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var CssHighlightRules = require("./css_highlight_rules").CssHighlightRules;
-var JavaScriptHighlightRules = require("./javascript_highlight_rules").JavaScriptHighlightRules;
-var xmlUtil = require("./xml_util");
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var HtmlHighlightRules = function() {
-
-    // regexp must not have capturing parentheses
-    // regexps are ordered -> the first match is used
-    this.$rules = {
-        start : [{
-            token : "text",
-            merge : true,
-            regex : "<\\!\\[CDATA\\[",
-            next : "cdata"
-        }, {
-            token : "xml_pe",
-            regex : "<\\?.*?\\?>"
-        }, {
-            token : "comment",
-            merge : true,
-            regex : "<\\!--",
-            next : "comment"
-        }, {
-            token : "xml_pe",
-            regex : "<\\!.*?>"
-        }, {
-            token : "meta.tag",
-            regex : "<(?=\s*script\\b)",
-            next : "script"
-        }, {
-            token : "meta.tag",
-            regex : "<(?=\s*style\\b)",
-            next : "style"
-        }, {
-            token : "meta.tag", // opening tag
-            regex : "<\\/?",
-            next : "tag"
-        }, {
-            token : "text",
-            regex : "\\s+"
-        }, {
-            token : "constant.character.entity",
-            regex : "(?:&#[0-9]+;)|(?:&#x[0-9a-fA-F]+;)|(?:&[a-zA-Z0-9_:\\.-]+;)"
-        }, {
-            token : "text",
-            regex : "[^<]+"
-        } ],
-    
-        cdata : [ {
-            token : "text",
-            regex : "\\]\\]>",
-            next : "start"
-        }, {
-            token : "text",
-            merge : true,
-            regex : "\\s+"
-        }, {
-            token : "text",
-            merge : true,
-            regex : ".+"
-        } ],
-
-        comment : [ {
-            token : "comment",
-            regex : ".*?-->",
-            next : "start"
-        }, {
-            token : "comment",
-            merge : true,
-            regex : ".+"
-        } ]
-    };
-    
-    xmlUtil.tag(this.$rules, "tag", "start");
-    xmlUtil.tag(this.$rules, "style", "css-start");
-    xmlUtil.tag(this.$rules, "script", "js-start");
-    
-    this.embedRules(JavaScriptHighlightRules, "js-", [{
-        token: "comment",
-        regex: "\\/\\/.*(?=<\\/script>)",
-        next: "tag"
-    }, {
-        token: "meta.tag",
-        regex: "<\\/(?=script)",
-        next: "tag"
-    }]);
-    
-    this.embedRules(CssHighlightRules, "css-", [{
-        token: "meta.tag",
-        regex: "<\\/(?=style)",
-        next: "tag"
-    }]);
-};
-
-oop.inherits(HtmlHighlightRules, TextHighlightRules);
-
-exports.HtmlHighlightRules = HtmlHighlightRules;
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/folding/html', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/folding/mixed', 'ace/mode/folding/xml', 'ace/mode/folding/cstyle'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var MixedFoldMode = require("./mixed").FoldMode;
-var XmlFoldMode = require("./xml").FoldMode;
-var CStyleFoldMode = require("./cstyle").FoldMode;
-
-var FoldMode = exports.FoldMode = function() {
-    MixedFoldMode.call(this, new XmlFoldMode({
-        // void elements
-        "area": 1,
-        "base": 1,
-        "br": 1,
-        "col": 1,
-        "command": 1,
-        "embed": 1,
-        "hr": 1,
-        "img": 1,
-        "input": 1,
-        "keygen": 1,
-        "link": 1,
-        "meta": 1,
-        "param": 1,
-        "source": 1,
-        "track": 1,
-        "wbr": 1,
-        
-        // optional tags 
-        "li": 1,
-        "dt": 1,
-        "dd": 1,
-        "p": 1,
-        "rt": 1,
-        "rp": 1,
-        "optgroup": 1,
-        "option": 1,
-        "colgroup": 1,
-        "td": 1,
-        "th": 1
-    }), {
-        "js-": new CStyleFoldMode(),
-        "css-": new CStyleFoldMode()
-    });
-};
-
-oop.inherits(FoldMode, MixedFoldMode);
-
-});/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/folding/mixed', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/folding/fold_mode'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var BaseFoldMode = require("./fold_mode").FoldMode;
-
-var FoldMode = exports.FoldMode = function(defaultMode, subModes) {
-    this.defaultMode = defaultMode;
-    this.subModes = subModes;
-};
-oop.inherits(FoldMode, BaseFoldMode);
-
-(function() {
-
-
-    this.$getMode = function(state) {
-        for (var key in this.subModes) {
-            if (state.indexOf(key) === 0)
-                return this.subModes[key];
-        }
-        return null;
-    };
-    
-    this.$tryMode = function(state, session, foldStyle, row) {
-        var mode = this.$getMode(state);
-        return (mode ? mode.getFoldWidget(session, foldStyle, row) : "");
-    };
-
-    this.getFoldWidget = function(session, foldStyle, row) {
-        return (
-            this.$tryMode(session.getState(row-1), session, foldStyle, row) ||
-            this.$tryMode(session.getState(row), session, foldStyle, row) ||
-            this.defaultMode.getFoldWidget(session, foldStyle, row)
-        );
-    };
-
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        var mode = this.$getMode(session.getState(row-1));
-        
-        if (!mode || !mode.getFoldWidget(session, foldStyle, row))
-            mode = this.$getMode(session.getState(row));
-        
-        if (!mode || !mode.getFoldWidget(session, foldStyle, row))
-            mode = this.defaultMode;
-        
-        return mode.getFoldWidgetRange(session, foldStyle, row);
-    };
-
-}).call(FoldMode.prototype);
-
-});/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Chris Spencer <chris.ag.spencer AT googlemail DOT com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/markdown_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text_highlight_rules', 'ace/mode/javascript_highlight_rules', 'ace/mode/xml_highlight_rules', 'ace/mode/html_highlight_rules', 'ace/mode/css_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-var JavaScriptHighlightRules = require("./javascript_highlight_rules").JavaScriptHighlightRules;
-var XmlHighlightRules = require("./xml_highlight_rules").XmlHighlightRules;
-var HtmlHighlightRules = require("./html_highlight_rules").HtmlHighlightRules;
-var CssHighlightRules = require("./css_highlight_rules").CssHighlightRules;
-
-function github_embed(tag, prefix) {
-    return { // Github style block
-        token : "support.function",
-        regex : "^```" + tag + "\\s*$",
-        next  : prefix + "start"
-    };
-}
-
-var MarkdownHighlightRules = function() {
-
-    // regexp must not have capturing parentheses
-    // regexps are ordered -> the first match is used
-
-    this.$rules = {
-        "start" : [ {
-            token : "empty_line",
-            regex : '^$'
-        }, { // code span `
-            token : ["support.function", "support.function", "support.function"],
-            regex : "(`+)([^\\r]*?[^`])(\\1)"
-        }, { // code block
-            token : "support.function",
-            regex : "^[ ]{4}.+"
-        }, { // h1
-            token: "markup.heading.1",
-            regex: "^=+(?=\\s*$)"
-        }, { // h2
-            token: "markup.heading.1",
-            regex: "^\\-+(?=\\s*$)"
-        }, { // header
-            token : function(value) {
-                return "markup.heading." + value.length;
-            },
-            regex : "^#{1,6}"
-        }, github_embed("javascript", "js-"),
-           github_embed("xml", "xml-"),
-           github_embed("html", "html-"),
-           github_embed("css", "css-"),
-        { // Github style block
-            token : "support.function",
-            regex : "^```[a-zA-Z]+\\s*$",
-            next  : "githubblock"
-        }, { // block quote
-            token : "string",
-            regex : "^>[ ].+$",
-            next  : "blockquote"
-        }, { // reference
-            token : ["text", "constant", "text", "url", "string", "text"],
-            regex : "^([ ]{0,3}\\[)([^\\]]+)(\\]:\\s*)([^ ]+)(\\s*(?:[\"][^\"]+[\"])?(\\s*))$"
-        }, { // link by reference
-            token : ["text", "string", "text", "constant", "text"],
-            regex : "(\\[)((?:[[^\\]]*\\]|[^\\[\\]])*)(\\][ ]?(?:\\n[ ]*)?\\[)(.*?)(\\])"
-        }, { // link by url
-            token : ["text", "string", "text", "markup.underline", "string", "text"],
-            regex : "(\\[)"+
-                    "(\\[[^\\]]*\\]|[^\\[\\]]*)"+
-                    "(\\]\\([ \\t]*)"+
-                    "(<?(?:(?:[^\\(]*?\\([^\\)]*?\\)\\S*?)|(?:.*?))>?)"+
-                    "((?:[ \t]*\"(?:.*?)\"[ \\t]*)?)"+
-                    "(\\))"
-        }, { // HR *
-            token : "constant",
-            regex : "^[ ]{0,2}(?:[ ]?\\*[ ]?){3,}\\s*$"
-        }, { // HR -
-            token : "constant",
-            regex : "^[ ]{0,2}(?:[ ]?\\-[ ]?){3,}\\s*$"
-        }, { // HR _
-            token : "constant",
-            regex : "^[ ]{0,2}(?:[ ]?\\_[ ]?){3,}\\s*$"
-        }, { // list
-            token : "markup.list",
-            regex : "^\\s{0,3}(?:[*+-]|\\d+\\.)\\s+",
-            next  : "listblock"
-        }, { // strong ** __
-            token : ["string", "string", "string"],
-            regex : "([*]{2}|[_]{2}(?=\\S))([^\\r]*?\\S[*_]*)(\\1)"
-        }, { // emphasis * _
-            token : ["string", "string", "string"],
-            regex : "([*]|[_](?=\\S))([^\\r]*?\\S[*_]*)(\\1)"
-        }, { // 
-            token : ["text", "url", "text"],
-            regex : "(<)("+
-                      "(?:https?|ftp|dict):[^'\">\\s]+"+
-                      "|"+
-                      "(?:mailto:)?[-.\\w]+\\@[-a-z0-9]+(?:\\.[-a-z0-9]+)*\\.[a-z]+"+
-                    ")(>)"
-        }, {
-            token : "text",
-            regex : "[^\\*_%$`\\[#<>]+"
-        } ],
-        
-        "listblock" : [ { // Lists only escape on completely blank lines.
-            token : "empty_line",
-            regex : "^$",
-            next  : "start"
-        }, {
-            token : "markup.list",
-            regex : ".+"
-        } ],
-        
-        "blockquote" : [ { // BLockquotes only escape on blank lines.
-            token : "empty_line",
-            regex : "^\\s*$",
-            next  : "start"
-        }, {
-            token : "string",
-            regex : ".+"
-        } ],
-        
-        "githubblock" : [ {
-            token : "support.function",
-            regex : "^```",
-            next  : "start"
-        }, {
-            token : "support.function",
-            regex : ".+"
-        } ]
-    };
-    
-    this.embedRules(JavaScriptHighlightRules, "js-", [{
-       token : "support.function",
-       regex : "^```",
-       next  : "start"
-    }]);
-    
-    this.embedRules(HtmlHighlightRules, "html-", [{
-       token : "support.function",
-       regex : "^```",
-       next  : "start"
-    }]);
-    
-    this.embedRules(CssHighlightRules, "css-", [{
-       token : "support.function",
-       regex : "^```",
-       next  : "start"
-    }]);
-    
-    this.embedRules(XmlHighlightRules, "xml-", [{
-       token : "support.function",
-       regex : "^```",
-       next  : "start"
-    }]);
-};
-oop.inherits(MarkdownHighlightRules, TextHighlightRules);
-
-exports.MarkdownHighlightRules = MarkdownHighlightRules;
-});
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-markdown.js b/apps/files_texteditor/js/aceeditor/mode-markdown.js
deleted file mode 100644
index a45debe044..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-markdown.js
+++ /dev/null
@@ -1 +0,0 @@
-define("ace/mode/markdown",["require","exports","module","ace/lib/oop","ace/mode/text","ace/mode/javascript","ace/mode/xml","ace/mode/html","ace/tokenizer","ace/mode/markdown_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("./javascript").Mode,g=a("./xml").Mode,h=a("./html").Mode,i=a("../tokenizer").Tokenizer,j=a("./markdown_highlight_rules").MarkdownHighlightRules,k=function(){var a=new j;this.$tokenizer=new i(a.getRules()),this.$embeds=a.getEmbeds(),this.createModeDelegates({"js-":f,"xml-":g,"html-":h})};d.inherits(k,e),function(){this.getNextLineIndent=function(a,b,c){if(a=="listblock"){var d=/^((?:.+)?)([-+*][ ]+)/.exec(b);return d?(new Array(d[1].length+1)).join(" ")+d[2]:""}return this.$getIndent(b)}}.call(k.prototype),b.Mode=k}),define("ace/mode/javascript",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/javascript_highlight_rules","ace/mode/matching_brace_outdent","ace/range","ace/worker/worker_client","ace/mode/behaviour/cstyle","ace/mode/folding/cstyle"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./javascript_highlight_rules").JavaScriptHighlightRules,h=a("./matching_brace_outdent").MatchingBraceOutdent,i=a("../range").Range,j=a("../worker/worker_client").WorkerClient,k=a("./behaviour/cstyle").CstyleBehaviour,l=a("./folding/cstyle").FoldMode,m=function(){this.$tokenizer=new f((new g).getRules()),this.$outdent=new h,this.$behaviour=new k,this.foldingRules=new l};d.inherits(m,e),function(){this.toggleCommentLines=function(a,b,c,d){var e=!0,f=/^(\s*)\/\//;for(var g=c;g<=d;g++)if(!f.test(b.getLine(g))){e=!1;break}if(e){var h=new i(0,0,0,0);for(var g=c;g<=d;g++){var j=b.getLine(g),k=j.match(f);h.start.row=g,h.end.row=g,h.end.column=k[0].length,b.replace(h,k[1])}}else b.indentRows(c,d,"//")},this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a),f=e.tokens,g=e.state;if(f.length&&f[f.length-1].type=="comment")return d;if(a=="start"||a=="regex_allowed"){var h=b.match(/^.*(?:\bcase\b.*\:|[\{\(\[])\s*$/);h&&(d+=c)}else if(a=="doc-start"){if(g=="start"||a=="regex_allowed")return"";var h=b.match(/^\s*(\/?)\*/);h&&(h[1]&&(d+=" "),d+="* ")}return d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)},this.createWorker=function(a){var b=new j(["ace"],"worker-javascript.js","ace/mode/javascript_worker","JavaScriptWorker");return b.attachToDocument(a.getDocument()),b.on("jslint",function(b){var c=[];for(var d=0;d<b.data.length;d++){var e=b.data[d];e&&c.push({row:e.line-1,column:e.character-1,text:e.reason,type:"warning",lint:e})}a.setAnnotations(c)}),b.on("narcissus",function(b){a.setAnnotations([b.data])}),b.on("terminate",function(){a.clearAnnotations()}),b}}.call(m.prototype),b.Mode=m}),define("ace/mode/javascript_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/unicode","ace/mode/doc_comment_highlight_rules","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("../unicode"),g=a("./doc_comment_highlight_rules").DocCommentHighlightRules,h=a("./text_highlight_rules").TextHighlightRules,i=function(){var a=e.arrayToMap("Array|Boolean|Date|Function|Iterator|Number|Object|RegExp|String|Proxy|Namespace|QName|XML|XMLList|ArrayBuffer|Float32Array|Float64Array|Int16Array|Int32Array|Int8Array|Uint16Array|Uint32Array|Uint8Array|Uint8ClampedArray|Error|EvalError|InternalError|RangeError|ReferenceError|StopIteration|SyntaxError|TypeError|URIError|decodeURI|decodeURIComponent|encodeURI|encodeURIComponent|eval|isFinite|isNaN|parseFloat|parseInt|JSON|Math|this|arguments|prototype|window|document".split("|")),b=e.arrayToMap("break|case|catch|continue|default|delete|do|else|finally|for|function|if|in|instanceof|new|return|switch|throw|try|typeof|let|var|while|with|const|yield|import|get|set".split("|")),c="case|do|else|finally|in|instanceof|return|throw|try|typeof|yield",d=e.arrayToMap("__parent__|__count__|escape|unescape|with|__proto__".split("|")),h=e.arrayToMap("const|let|var|function".split("|")),i=e.arrayToMap("null|Infinity|NaN|undefined".split("|")),j=e.arrayToMap("class|enum|extends|super|export|implements|private|public|interface|package|protected|static".split("|")),k="["+f.packages.L+"\\$_]["+f.packages.L+f.packages.Mn+f.packages.Mc+f.packages.Nd+f.packages.Pc+"\\$_]*\\b",l="\\\\(?:x[0-9a-fA-F]{2}|u[0-9a-fA-F]{4}|[0-2][0-7]{0,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.)";this.$rules={start:[{token:"comment",regex:/\/\/.*$/},(new g).getStartRule("doc-start"),{token:"comment",merge:!0,regex:/\/\*/,next:"comment"},{token:"string",regex:"'",next:"qstring"},{token:"string",regex:'"',next:"qqstring"},{token:"constant.numeric",regex:/0[xX][0-9a-fA-F]+\b/},{token:"constant.numeric",regex:/[+-]?\d+(?:(?:\.\d*)?(?:[eE][+-]?\d+)?)?\b/},{token:["storage.type","punctuation.operator","support.function","punctuation.operator","entity.name.function","text","keyword.operator","text","storage.type","text","paren.lparen","variable.parameter","paren.rparen"],regex:"("+k+")(\\.)(prototype)(\\.)("+k+")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"},{token:["storage.type","punctuation.operator","support.function","punctuation.operator","entity.name.function","text","keyword.operator","text"],regex:"("+k+")(\\.)(prototype)(\\.)("+k+")(\\s*)(=)(\\s*)"},{token:["storage.type","punctuation.operator","entity.name.function","text","keyword.operator","text","storage.type","text","paren.lparen","variable.parameter","paren.rparen"],regex:"("+k+")(\\.)("+k+")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"},{token:["entity.name.function","text","keyword.operator","text","storage.type","text","paren.lparen","variable.parameter","paren.rparen"],regex:"("+k+")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"},{token:["storage.type","text","entity.name.function","text","paren.lparen","variable.parameter","paren.rparen"],regex:"(function)(\\s+)("+k+")(\\s*)(\\()(.*?)(\\))"},{token:["entity.name.function","text","punctuation.operator","text","storage.type","text","paren.lparen","variable.parameter","paren.rparen"],regex:"("+k+")(\\s*)(:)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"},{token:["text","text","storage.type","text","paren.lparen","variable.parameter","paren.rparen"],regex:"(:)(\\s*)(function)?(\\s*)(\\()([^)]*)(\\))"},{token:"constant.language.boolean",regex:/(?:true|false)\b/},{token:"keyword",regex:"(?:"+c+")\\b",next:"regex_allowed"},{token:["punctuation.operator","support.function"],regex:/(\.)(s(?:h(?:ift|ow(?:Mod(?:elessDialog|alDialog)|Help))|croll(?:X|By(?:Pages|Lines)?|Y|To)?|t(?:opzzzz|rike)|i(?:n|zeToContent|debar|gnText)|ort|u(?:p|b(?:str(?:ing)?)?)|pli(?:ce|t)|e(?:nd|t(?:Re(?:sizable|questHeader)|M(?:i(?:nutes|lliseconds)|onth)|Seconds|Ho(?:tKeys|urs)|Year|Cursor|Time(?:out)?|Interval|ZOptions|Date|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Date|FullYear)|FullYear|Active)|arch)|qrt|lice|avePreferences|mall)|h(?:ome|andleEvent)|navigate|c(?:har(?:CodeAt|At)|o(?:s|n(?:cat|textual|firm)|mpile)|eil|lear(?:Timeout|Interval)?|a(?:ptureEvents|ll)|reate(?:StyleSheet|Popup|EventObject))|t(?:o(?:GMTString|S(?:tring|ource)|U(?:TCString|pperCase)|Lo(?:caleString|werCase))|est|a(?:n|int(?:Enabled)?))|i(?:s(?:NaN|Finite)|ndexOf|talics)|d(?:isableExternalCapture|ump|etachEvent)|u(?:n(?:shift|taint|escape|watch)|pdateCommands)|j(?:oin|avaEnabled)|p(?:o(?:p|w)|ush|lugins.refresh|a(?:ddings|rse(?:Int|Float)?)|r(?:int|ompt|eference))|e(?:scape|nableExternalCapture|val|lementFromPoint|x(?:p|ec(?:Script|Command)?))|valueOf|UTC|queryCommand(?:State|Indeterm|Enabled|Value)|f(?:i(?:nd|le(?:ModifiedDate|Size|CreatedDate|UpdatedDate)|xed)|o(?:nt(?:size|color)|rward)|loor|romCharCode)|watch|l(?:ink|o(?:ad|g)|astIndexOf)|a(?:sin|nchor|cos|t(?:tachEvent|ob|an(?:2)?)|pply|lert|b(?:s|ort))|r(?:ou(?:nd|teEvents)|e(?:size(?:By|To)|calc|turnValue|place|verse|l(?:oad|ease(?:Capture|Events)))|andom)|g(?:o|et(?:ResponseHeader|M(?:i(?:nutes|lliseconds)|onth)|Se(?:conds|lection)|Hours|Year|Time(?:zoneOffset)?|Da(?:y|te)|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Da(?:y|te)|FullYear)|FullYear|A(?:ttention|llResponseHeaders)))|m(?:in|ove(?:B(?:y|elow)|To(?:Absolute)?|Above)|ergeAttributes|a(?:tch|rgins|x))|b(?:toa|ig|o(?:ld|rderWidths)|link|ack))\b(?=\()/},{token:["punctuation.operator","support.function.dom"],regex:/(\.)(s(?:ub(?:stringData|mit)|plitText|e(?:t(?:NamedItem|Attribute(?:Node)?)|lect))|has(?:ChildNodes|Feature)|namedItem|c(?:l(?:ick|o(?:se|neNode))|reate(?:C(?:omment|DATASection|aption)|T(?:Head|extNode|Foot)|DocumentFragment|ProcessingInstruction|E(?:ntityReference|lement)|Attribute))|tabIndex|i(?:nsert(?:Row|Before|Cell|Data)|tem)|open|delete(?:Row|C(?:ell|aption)|T(?:Head|Foot)|Data)|focus|write(?:ln)?|a(?:dd|ppend(?:Child|Data))|re(?:set|place(?:Child|Data)|move(?:NamedItem|Child|Attribute(?:Node)?)?)|get(?:NamedItem|Element(?:sBy(?:Name|TagName)|ById)|Attribute(?:Node)?)|blur)\b(?=\()/},{token:["punctuation.operator","support.constant"],regex:/(\.)(s(?:ystemLanguage|cr(?:ipts|ollbars|een(?:X|Y|Top|Left))|t(?:yle(?:Sheets)?|atus(?:Text|bar)?)|ibling(?:Below|Above)|ource|uffixes|e(?:curity(?:Policy)?|l(?:ection|f)))|h(?:istory|ost(?:name)?|as(?:h|Focus))|y|X(?:MLDocument|SLDocument)|n(?:ext|ame(?:space(?:s|URI)|Prop))|M(?:IN_VALUE|AX_VALUE)|c(?:haracterSet|o(?:n(?:structor|trollers)|okieEnabled|lorDepth|mp(?:onents|lete))|urrent|puClass|l(?:i(?:p(?:boardData)?|entInformation)|osed|asses)|alle(?:e|r)|rypto)|t(?:o(?:olbar|p)|ext(?:Transform|Indent|Decoration|Align)|ags)|SQRT(?:1_2|2)|i(?:n(?:ner(?:Height|Width)|put)|ds|gnoreCase)|zIndex|o(?:scpu|n(?:readystatechange|Line)|uter(?:Height|Width)|p(?:sProfile|ener)|ffscreenBuffering)|NEGATIVE_INFINITY|d(?:i(?:splay|alog(?:Height|Top|Width|Left|Arguments)|rectories)|e(?:scription|fault(?:Status|Ch(?:ecked|arset)|View)))|u(?:ser(?:Profile|Language|Agent)|n(?:iqueID|defined)|pdateInterval)|_content|p(?:ixelDepth|ort|ersonalbar|kcs11|l(?:ugins|atform)|a(?:thname|dding(?:Right|Bottom|Top|Left)|rent(?:Window|Layer)?|ge(?:X(?:Offset)?|Y(?:Offset)?))|r(?:o(?:to(?:col|type)|duct(?:Sub)?|mpter)|e(?:vious|fix)))|e(?:n(?:coding|abledPlugin)|x(?:ternal|pando)|mbeds)|v(?:isibility|endor(?:Sub)?|Linkcolor)|URLUnencoded|P(?:I|OSITIVE_INFINITY)|f(?:ilename|o(?:nt(?:Size|Family|Weight)|rmName)|rame(?:s|Element)|gColor)|E|whiteSpace|l(?:i(?:stStyleType|n(?:eHeight|kColor))|o(?:ca(?:tion(?:bar)?|lName)|wsrc)|e(?:ngth|ft(?:Context)?)|a(?:st(?:M(?:odified|atch)|Index|Paren)|yer(?:s|X)|nguage))|a(?:pp(?:MinorVersion|Name|Co(?:deName|re)|Version)|vail(?:Height|Top|Width|Left)|ll|r(?:ity|guments)|Linkcolor|bove)|r(?:ight(?:Context)?|e(?:sponse(?:XML|Text)|adyState))|global|x|m(?:imeTypes|ultiline|enubar|argin(?:Right|Bottom|Top|Left))|L(?:N(?:10|2)|OG(?:10E|2E))|b(?:o(?:ttom|rder(?:Width|RightWidth|BottomWidth|Style|Color|TopWidth|LeftWidth))|ufferDepth|elow|ackground(?:Color|Image)))\b/},{token:["storage.type","punctuation.operator","support.function.firebug"],regex:/(console)(\.)(warn|info|log|error|time|timeEnd|assert)\b/},{token:function(c){return a.hasOwnProperty(c)?"variable.language":d.hasOwnProperty(c)?"invalid.deprecated":h.hasOwnProperty(c)?"storage.type":b.hasOwnProperty(c)?"keyword":i.hasOwnProperty(c)?"constant.language":j.hasOwnProperty(c)?"invalid.illegal":c=="debugger"?"invalid.deprecated":"identifier"},regex:k},{token:"keyword.operator",regex:/!|\$|%|&|\*|\-\-|\-|\+\+|\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\|\||\?\:|\*=|%=|\+=|\-=|&=|\^=|\b(?:in|instanceof|new|delete|typeof|void)/,next:"regex_allowed"},{token:"punctuation.operator",regex:/\?|\:|\,|\;|\./,next:"regex_allowed"},{token:"paren.lparen",regex:/[\[({]/,next:"regex_allowed"},{token:"paren.rparen",regex:/[\])}]/},{token:"keyword.operator",regex:/\/=?/,next:"regex_allowed"},{token:"comment",regex:/^#!.*$/},{token:"text",regex:/\s+/}],regex_allowed:[{token:"comment",merge:!0,regex:"\\/\\*",next:"comment_regex_allowed"},{token:"comment",regex:"\\/\\/.*$"},{token:"string.regexp",regex:"\\/",next:"regex",merge:!0},{token:"text",regex:"\\s+"},{token:"empty",regex:"",next:"start"}],regex:[{token:"regexp.keyword.operator",regex:"\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",next:"regex"},{token:"string.regexp",regex:"/\\w*",next:"start",merge:!0},{token:"string.regexp",regex:"[^\\\\/\\[]+",next:"regex",merge:!0},{token:"string.regexp.charachterclass",regex:"\\[",next:"regex_character_class",merge:!0},{token:"empty",regex:"",next:"start"}],regex_character_class:[{token:"regexp.keyword.operator",regex:"\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",next:"regex_character_class"},{token:"string.regexp.charachterclass",regex:"]",next:"regex",merge:!0},{token:"string.regexp.charachterclass",regex:"[^\\\\\\]]+",next:"regex_character_class",merge:!0},{token:"empty",regex:"",next:"start"}],comment_regex_allowed:[{token:"comment",regex:".*?\\*\\/",merge:!0,next:"regex_allowed"},{token:"comment",merge:!0,regex:".+"}],comment:[{token:"comment",regex:".*?\\*\\/",merge:!0,next:"start"},{token:"comment",merge:!0,regex:".+"}],qqstring:[{token:"constant.language.escape",regex:l},{token:"string",regex:'[^"\\\\]+'},{token:"string",regex:'"',next:"start"}],qstring:[{token:"constant.language.escape",regex:l},{token:"string",regex:"[^'\\\\]+"},{token:"string",regex:"'",next:"start"}]},this.embedRules(g,"doc-",[(new g).getEndRule("start")])};d.inherits(i,h),b.JavaScriptHighlightRules=i}),define("ace/mode/doc_comment_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text_highlight_rules").TextHighlightRules,f=function(){this.$rules={start:[{token:"comment.doc.tag",regex:"@[\\w\\d_]+"},{token:"comment.doc",merge:!0,regex:"\\s+"},{token:"comment.doc",merge:!0,regex:"TODO"},{token:"comment.doc",merge:!0,regex:"[^@\\*]+"},{token:"comment.doc",merge:!0,regex:"."}]}};d.inherits(f,e),function(){this.getStartRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\/\\*(?=\\*)",next:a}},this.getEndRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\*\\/",next:a}}}.call(f.prototype),b.DocCommentHighlightRules=f}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../range").Range,e=function(){};(function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}}).call(e.prototype),b.MatchingBraceOutdent=e}),define("ace/mode/behaviour/cstyle",["require","exports","module","ace/lib/oop","ace/mode/behaviour"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../behaviour").Behaviour,f=function(){this.add("braces","insertion",function(a,b,c,d,e){if(e=="{"){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"{"+g+"}",selection:!1}:{text:"{}",selection:[1,1]}}if(e=="}"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var k=d.$findOpeningBracket("}",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}else if(e=="\n"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var l=d.findMatchingBracket({row:h.row,column:h.column+1});if(!l)return null;var m=this.getNextLineIndent(a,i.substring(0,i.length-1),d.getTabString()),n=this.$getIndent(d.doc.getLine(l.row));return{text:"\n"+m+"\n"+n,selection:[1,m.length,1,m.length]}}}}),this.add("braces","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="{"){var g=d.doc.getLine(e.start.row),h=g.substring(e.end.column,e.end.column+1);if(h=="}")return e.end.column++,e}}),this.add("parens","insertion",function(a,b,c,d,e){if(e=="("){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"("+g+")",selection:!1}:{text:"()",selection:[1,1]}}if(e==")"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j==")"){var k=d.$findOpeningBracket(")",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}}),this.add("parens","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="("){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h==")")return e.end.column++,e}}),this.add("string_dquotes","insertion",function(a,b,c,d,e){if(e=='"'||e=="'"){var f=e,g=c.getSelectionRange(),h=d.doc.getTextRange(g);if(h!=="")return{text:f+h+f,selection:!1};var i=c.getCursorPosition(),j=d.doc.getLine(i.row),k=j.substring(i.column-1,i.column);if(k=="\\")return null;var l=d.getTokens(g.start.row,g.start.row)[0].tokens,m=0,n,o=-1;for(var p=0;p<l.length;p++){n=l[p],n.type=="string"?o=-1:o<0&&(o=n.value.indexOf(f));if(n.value.length+m>g.start.column)break;m+=l[p].value.length}if(!n||o<0&&n.type!=="comment"&&(n.type!=="string"||g.start.column!==n.value.length+m-1&&n.value.lastIndexOf(f)===n.value.length-1))return{text:f+f,selection:[1,1]};if(n&&n.type==="string"){var q=j.substring(i.column,i.column+1);if(q==f)return{text:"",selection:[1,1]}}}}),this.add("string_dquotes","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&(f=='"'||f=="'")){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h=='"')return e.end.column++,e}})};d.inherits(f,e),b.CstyleBehaviour=f}),define("ace/mode/folding/cstyle",["require","exports","module","ace/lib/oop","ace/range","ace/mode/folding/fold_mode"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../../range").Range,f=a("./fold_mode").FoldMode,g=b.FoldMode=function(){};d.inherits(g,f),function(){this.foldingStartMarker=/(\{|\[)[^\}\]]*$|^\s*(\/\*)/,this.foldingStopMarker=/^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/,this.getFoldWidgetRange=function(a,b,c){var d=a.getLine(c),f=d.match(this.foldingStartMarker);if(f){var g=f.index;if(f[1])return this.openingBracketBlock(a,f[1],c,g);var h=a.getCommentFoldRange(c,g+f[0].length);return h.end.column-=2,h}if(b!=="markbeginend")return;var f=d.match(this.foldingStopMarker);if(f){var g=f.index+f[0].length;if(f[2]){var h=a.getCommentFoldRange(c,g);return h.end.column-=2,h}var i={row:c,column:g},j=a.$findOpeningBracket(f[1],i);if(!j)return;return j.column++,i.column--,e.fromPoints(j,i)}}}.call(g.prototype)}),define("ace/mode/folding/fold_mode",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../../range").Range,e=b.FoldMode=function(){};(function(){this.foldingStartMarker=null,this.foldingStopMarker=null,this.getFoldWidget=function(a,b,c){var d=a.getLine(c);return this.foldingStartMarker.test(d)?"start":b=="markbeginend"&&this.foldingStopMarker&&this.foldingStopMarker.test(d)?"end":""},this.getFoldWidgetRange=function(a,b,c){return null},this.indentationBlock=function(a,b,c){var e=/^\s*/,f=b,g=b,h=a.getLine(b),i=c||h.length,j=h.match(e)[0].length,k=a.getLength();while(++b<k){h=a.getLine(b);var l=h.match(e)[0].length;if(l==h.length)continue;if(l<=j)break;g=b}if(g>f){var m=a.getLine(g).length;return new d(f,i,g,m)}},this.openingBracketBlock=function(a,b,c,e){var f={row:c,column:e+1},g=a.$findClosingBracket(b,f);if(!g)return;var h=a.foldWidgets[g.row];return h==null&&(h=this.getFoldWidget(a,g.row)),h=="start"&&(g.row--,g.column=a.getLine(g.row).length),d.fromPoints(f,g)}}).call(e.prototype)}),define("ace/mode/xml",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/xml_highlight_rules","ace/mode/behaviour/xml","ace/mode/folding/xml"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./xml_highlight_rules").XmlHighlightRules,h=a("./behaviour/xml").XmlBehaviour,i=a("./folding/xml").FoldMode,j=function(){this.$tokenizer=new f((new g).getRules()),this.$behaviour=new h,this.foldingRules=new i};d.inherits(j,e),function(){this.getNextLineIndent=function(a,b,c){return this.$getIndent(b)}}.call(j.prototype),b.Mode=j}),define("ace/mode/xml_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/xml_util","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./xml_util"),f=a("./text_highlight_rules").TextHighlightRules,g=function(){this.$rules={start:[{token:"text",regex:"<\\!\\[CDATA\\[",next:"cdata"},{token:"xml_pe",regex:"<\\?.*?\\?>"},{token:"comment",merge:!0,regex:"<\\!--",next:"comment"},{token:"xml_pe",regex:"<\\!.*?>"},{token:"meta.tag",regex:"<\\/?",next:"tag"},{token:"text",regex:"\\s+"},{token:"constant.character.entity",regex:"(?:&#[0-9]+;)|(?:&#x[0-9a-fA-F]+;)|(?:&[a-zA-Z0-9_:\\.-]+;)"},{token:"text",regex:"[^<]+"}],cdata:[{token:"text",regex:"\\]\\]>",next:"start"},{token:"text",regex:"\\s+"},{token:"text",regex:"(?:[^\\]]|\\](?!\\]>))+"}],comment:[{token:"comment",regex:".*?-->",next:"start"},{token:"comment",merge:!0,regex:".+"}]},e.tag(this.$rules,"tag","start")};d.inherits(g,f),b.XmlHighlightRules=g}),define("ace/mode/xml_util",["require","exports","module","ace/lib/lang"],function(a,b,c){function g(a){return[{token:"string",regex:'".*?"'},{token:"string",merge:!0,regex:'["].*',next:a+"_qqstring"},{token:"string",regex:"'.*?'"},{token:"string",merge:!0,regex:"['].*",next:a+"_qstring"}]}function h(a,b){return[{token:"string",merge:!0,regex:".*?"+a,next:b},{token:"string",merge:!0,regex:".+"}]}"use strict";var d=a("../lib/lang"),e=d.arrayToMap("button|form|input|label|select|textarea".split("|")),f=d.arrayToMap("table|tbody|td|tfoot|th|tr".split("|"));b.tag=function(a,b,c){a[b]=[{token:"text",regex:"\\s+"},{token:function(a){return a==="a"?"meta.tag.anchor":a==="img"?"meta.tag.image":a==="script"?"meta.tag.script":a==="style"?"meta.tag.style":e.hasOwnProperty(a.toLowerCase())?"meta.tag.form":f.hasOwnProperty(a.toLowerCase())?"meta.tag.table":"meta.tag"},merge:!0,regex:"[-_a-zA-Z0-9:]+",next:b+"_embed_attribute_list"},{token:"empty",regex:"",next:b+"_embed_attribute_list"}],a[b+"_qstring"]=h("'",b+"_embed_attribute_list"),a[b+"_qqstring"]=h('"',b+"_embed_attribute_list"),a[b+"_embed_attribute_list"]=[{token:"meta.tag",merge:!0,regex:"/?>",next:c},{token:"keyword.operator",regex:"="},{token:"entity.other.attribute-name",regex:"[-_a-zA-Z0-9:]+"},{token:"constant.numeric",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:"text",regex:"\\s+"}].concat(g(b))}}),define("ace/mode/behaviour/xml",["require","exports","module","ace/lib/oop","ace/mode/behaviour","ace/mode/behaviour/cstyle"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../behaviour").Behaviour,f=a("./cstyle").CstyleBehaviour,g=function(){this.inherit(f,["string_dquotes"]),this.add("brackets","insertion",function(a,b,c,d,e){if(e=="<"){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?!1:{text:"<>",selection:[1,1]}}if(e==">"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j==">")return{text:"",selection:[1,1]}}else if(e=="\n"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),k=i.substring(h.column,h.column+2);if(k=="</"){var l=this.$getIndent(d.doc.getLine(h.row))+d.getTabString(),m=this.$getIndent(d.doc.getLine(h.row));return{text:"\n"+l+"\n"+m,selection:[1,l.length,1,l.length]}}}})};d.inherits(g,e),b.XmlBehaviour=g}),define("ace/mode/folding/xml",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/range","ace/mode/folding/fold_mode","ace/token_iterator"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../../lib/lang"),f=a("../../range").Range,g=a("./fold_mode").FoldMode,h=a("../../token_iterator").TokenIterator,i=b.FoldMode=function(a){g.call(this),this.voidElements=a||{}};d.inherits(i,g),function(){this.getFoldWidget=function(a,b,c){var d=this._getFirstTagInLine(a,c);return d.closing?b=="markbeginend"?"end":"":!d.tagName||this.voidElements[d.tagName.toLowerCase()]?"":d.selfClosing?"":d.value.indexOf("/"+d.tagName)!==-1?"":"start"},this._getFirstTagInLine=function(a,b){var c=a.getTokens(b,b)[0].tokens,d="";for(var f=0;f<c.length;f++){var g=c[f];g.type.indexOf("meta.tag")===0?d+=g.value:d+=e.stringRepeat(" ",g.value.length)}return this._parseTag(d)},this.tagRe=/^(\s*)(<?(\/?)([-_a-zA-Z0-9:!]*)\s*(\/?)>?)/,this._parseTag=function(a){var b=this.tagRe.exec(a),c=this.tagRe.lastIndex||0;return this.tagRe.lastIndex=0,{value:a,match:b?b[2]:"",closing:b?!!b[3]:!1,selfClosing:b?!!b[5]||b[2]=="/>":!1,tagName:b?b[4]:"",column:b[1]?c+b[1].length:c}},this._readTagForward=function(a){var b=a.getCurrentToken();if(!b)return null;var c="",d;do if(b.type.indexOf("meta.tag")===0){if(!d)var d={row:a.getCurrentTokenRow(),column:a.getCurrentTokenColumn()};c+=b.value;if(c.indexOf(">")!==-1){var e=this._parseTag(c);return e.start=d,e.end={row:a.getCurrentTokenRow(),column:a.getCurrentTokenColumn()+b.value.length},a.stepForward(),e}}while(b=a.stepForward());return null},this._readTagBackward=function(a){var b=a.getCurrentToken();if(!b)return null;var c="",d;do if(b.type.indexOf("meta.tag")===0){d||(d={row:a.getCurrentTokenRow(),column:a.getCurrentTokenColumn()+b.value.length}),c=b.value+c;if(c.indexOf("<")!==-1){var e=this._parseTag(c);return e.end=d,e.start={row:a.getCurrentTokenRow(),column:a.getCurrentTokenColumn()},a.stepBackward(),e}}while(b=a.stepBackward());return null},this._pop=function(a,b){while(a.length){var c=a[a.length-1];if(!b||c.tagName==b.tagName)return a.pop();if(this.voidElements[b.tagName])return;if(this.voidElements[c.tagName]){a.pop();continue}return null}},this.getFoldWidgetRange=function(a,b,c){var d=this._getFirstTagInLine(a,c);if(!d.match)return null;var e=d.closing||d.selfClosing,g=[],i;if(!e){var j=new h(a,c,d.column),k={row:c,column:d.column+d.tagName.length+2};while(i=this._readTagForward(j)){if(i.selfClosing){if(!g.length)return i.start.column+=i.tagName.length+2,i.end.column-=2,f.fromPoints(i.start,i.end);continue}if(i.closing){this._pop(g,i);if(g.length==0)return f.fromPoints(k,i.start)}else g.push(i)}}else{var j=new h(a,c,d.column+d.match.length),l={row:c,column:d.column};while(i=this._readTagBackward(j)){if(i.selfClosing){if(!g.length)return i.start.column+=i.tagName.length+2,i.end.column-=2,f.fromPoints(i.start,i.end);continue}if(!i.closing){this._pop(g,i);if(g.length==0)return i.start.column+=i.tagName.length+2,f.fromPoints(i.start,l)}else g.push(i)}}}}.call(i.prototype)}),define("ace/mode/html",["require","exports","module","ace/lib/oop","ace/mode/text","ace/mode/javascript","ace/mode/css","ace/tokenizer","ace/mode/html_highlight_rules","ace/mode/behaviour/xml","ace/mode/folding/html"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("./javascript").Mode,g=a("./css").Mode,h=a("../tokenizer").Tokenizer,i=a("./html_highlight_rules").HtmlHighlightRules,j=a("./behaviour/xml").XmlBehaviour,k=a("./folding/html").FoldMode,l=function(){var a=new i;this.$tokenizer=new h(a.getRules()),this.$behaviour=new j,this.$embeds=a.getEmbeds(),this.createModeDelegates({"js-":f,"css-":g}),this.foldingRules=new k};d.inherits(l,e),function(){this.toggleCommentLines=function(a,b,c,d){return 0},this.getNextLineIndent=function(a,b,c){return this.$getIndent(b)},this.checkOutdent=function(a,b,c){return!1}}.call(l.prototype),b.Mode=l}),define("ace/mode/css",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/css_highlight_rules","ace/mode/matching_brace_outdent","ace/worker/worker_client","ace/mode/folding/cstyle"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./css_highlight_rules").CssHighlightRules,h=a("./matching_brace_outdent").MatchingBraceOutdent,i=a("../worker/worker_client").WorkerClient,j=a("./folding/cstyle").FoldMode,k=function(){this.$tokenizer=new f((new g).getRules(),"i"),this.$outdent=new h,this.foldingRules=new j};d.inherits(k,e),function(){this.foldingRules="cStyle",this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a).tokens;if(e.length&&e[e.length-1].type=="comment")return d;var f=b.match(/^.*\{\s*$/);return f&&(d+=c),d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)},this.createWorker=function(a){var b=new i(["ace"],"worker-css.js","ace/mode/css_worker","Worker");return b.attachToDocument(a.getDocument()),b.on("csslint",function(b){var c=[];b.data.forEach(function(a){c.push({row:a.line-1,column:a.col-1,text:a.message,type:a.type,lint:a})}),a.setAnnotations(c)}),b}}.call(k.prototype),b.Mode=k}),define("ace/mode/css_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("./text_highlight_rules").TextHighlightRules,g=function(){var a=e.arrayToMap("animation-fill-mode|alignment-adjust|alignment-baseline|animation-delay|animation-direction|animation-duration|animation-iteration-count|animation-name|animation-play-state|animation-timing-function|animation|appearance|azimuth|backface-visibility|background-attachment|background-break|background-clip|background-color|background-image|background-origin|background-position|background-repeat|background-size|background|baseline-shift|binding|bleed|bookmark-label|bookmark-level|bookmark-state|bookmark-target|border-bottom|border-bottom-color|border-bottom-left-radius|border-bottom-right-radius|border-bottom-style|border-bottom-width|border-collapse|border-color|border-image|border-image-outset|border-image-repeat|border-image-slice|border-image-source|border-image-width|border-left|border-left-color|border-left-style|border-left-width|border-radius|border-right|border-right-color|border-right-style|border-right-width|border-spacing|border-style|border-top|border-top-color|border-top-left-radius|border-top-right-radius|border-top-style|border-top-width|border-width|border|bottom|box-align|box-decoration-break|box-direction|box-flex-group|box-flex|box-lines|box-ordinal-group|box-orient|box-pack|box-shadow|box-sizing|break-after|break-before|break-inside|caption-side|clear|clip|color-profile|color|column-count|column-fill|column-gap|column-rule|column-rule-color|column-rule-style|column-rule-width|column-span|column-width|columns|content|counter-increment|counter-reset|crop|cue-after|cue-before|cue|cursor|direction|display|dominant-baseline|drop-initial-after-adjust|drop-initial-after-align|drop-initial-before-adjust|drop-initial-before-align|drop-initial-size|drop-initial-value|elevation|empty-cells|fit|fit-position|float-offset|float|font-family|font-size|font-size-adjust|font-stretch|font-style|font-variant|font-weight|font|grid-columns|grid-rows|hanging-punctuation|height|hyphenate-after|hyphenate-before|hyphenate-character|hyphenate-lines|hyphenate-resource|hyphens|icon|image-orientation|image-rendering|image-resolution|inline-box-align|left|letter-spacing|line-height|line-stacking-ruby|line-stacking-shift|line-stacking-strategy|line-stacking|list-style-image|list-style-position|list-style-type|list-style|margin-bottom|margin-left|margin-right|margin-top|margin|mark-after|mark-before|mark|marks|marquee-direction|marquee-play-count|marquee-speed|marquee-style|max-height|max-width|min-height|min-width|move-to|nav-down|nav-index|nav-left|nav-right|nav-up|opacity|orphans|outline-color|outline-offset|outline-style|outline-width|outline|overflow-style|overflow-x|overflow-y|overflow|padding-bottom|padding-left|padding-right|padding-top|padding|page-break-after|page-break-before|page-break-inside|page-policy|page|pause-after|pause-before|pause|perspective-origin|perspective|phonemes|pitch-range|pitch|play-during|position|presentation-level|punctuation-trim|quotes|rendering-intent|resize|rest-after|rest-before|rest|richness|right|rotation-point|rotation|ruby-align|ruby-overhang|ruby-position|ruby-span|size|speak-header|speak-numeral|speak-punctuation|speak|speech-rate|stress|string-set|table-layout|target-name|target-new|target-position|target|text-align-last|text-align|text-decoration|text-emphasis|text-height|text-indent|text-justify|text-outline|text-shadow|text-transform|text-wrap|top|transform-origin|transform-style|transform|transition-delay|transition-duration|transition-property|transition-timing-function|transition|unicode-bidi|vertical-align|visibility|voice-balance|voice-duration|voice-family|voice-pitch-range|voice-pitch|voice-rate|voice-stress|voice-volume|volume|white-space-collapse|white-space|widows|width|word-break|word-spacing|word-wrap|z-index".split("|")),b=e.arrayToMap("rgb|rgba|url|attr|counter|counters".split("|")),c=e.arrayToMap("absolute|after-edge|after|all-scroll|all|alphabetic|always|antialiased|armenian|auto|avoid-column|avoid-page|avoid|balance|baseline|before-edge|before|below|bidi-override|block-line-height|block|bold|bolder|border-box|both|bottom|box|break-all|break-word|capitalize|caps-height|caption|center|central|char|circle|cjk-ideographic|clone|close-quote|col-resize|collapse|column|consider-shifts|contain|content-box|cover|crosshair|cubic-bezier|dashed|decimal-leading-zero|decimal|default|disabled|disc|disregard-shifts|distribute-all-lines|distribute-letter|distribute-space|distribute|dotted|double|e-resize|ease-in|ease-in-out|ease-out|ease|ellipsis|end|exclude-ruby|fill|fixed|font-size|font|georgian|glyphs|grid-height|groove|hand|hanging|hebrew|help|hidden|hiragana-iroha|hiragana|horizontal|icon|ideograph-alpha|ideograph-numeric|ideograph-parenthesis|ideograph-space|ideographic|inactive|include-ruby|inherit|initial|inline-block|inline-box|inline-line-height|inline-table|inline|inset|inside|inter-ideograph|inter-word|invert|italic|justify|katakana-iroha|katakana|keep-all|last|left|lighter|line-edge|line-through|line|linear|list-item|local|loose|lower-alpha|lower-greek|lower-latin|lower-roman|lowercase|lr-tb|ltr|mathematical|max-height|max-size|medium|menu|message-box|middle|move|n-resize|ne-resize|newspaper|no-change|no-close-quote|no-drop|no-open-quote|no-repeat|none|normal|not-allowed|nowrap|nw-resize|oblique|open-quote|outset|outside|overline|padding-box|page|pointer|pre-line|pre-wrap|pre|preserve-3d|progress|relative|repeat-x|repeat-y|repeat|replaced|reset-size|ridge|right|round|row-resize|rtl|s-resize|scroll|se-resize|separate|slice|small-caps|small-caption|solid|space|square|start|static|status-bar|step-end|step-start|steps|stretch|strict|sub|super|sw-resize|table-caption|table-cell|table-column-group|table-column|table-footer-group|table-header-group|table-row-group|table-row|table|tb-rl|text-after-edge|text-before-edge|text-bottom|text-size|text-top|text|thick|thin|top|transparent|underline|upper-alpha|upper-latin|upper-roman|uppercase|use-script|vertical-ideographic|vertical-text|visible|w-resize|wait|whitespace|z-index|zero".split("|")),d=e.arrayToMap("aqua|black|blue|fuchsia|gray|green|lime|maroon|navy|olive|orange|purple|red|silver|teal|white|yellow".split("|")),f=e.arrayToMap("arial|century|comic|courier|garamond|georgia|helvetica|impact|lucida|symbol|system|tahoma|times|trebuchet|utopia|verdana|webdings|sans-serif|serif|monospace".split("|")),g="\\-?(?:(?:[0-9]+)|(?:[0-9]*\\.[0-9]+))",h="(\\:+)\\b(after|before|first-letter|first-line|moz-selection|selection)\\b",i="(:)\\b(active|checked|disabled|empty|enabled|first-child|first-of-type|focus|hover|indeterminate|invalid|last-child|last-of-type|link|not|nth-child|nth-last-child|nth-last-of-type|nth-of-type|only-child|only-of-type|required|root|target|valid|visited)\\b",j=[{token:"comment",merge:!0,regex:"\\/\\*",next:"ruleset_comment"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:["constant.numeric","keyword"],regex:"("+g+")(ch|cm|deg|em|ex|fr|gd|grad|Hz|in|kHz|mm|ms|pc|pt|px|rad|rem|s|turn|vh|vm|vw|%)"},{token:["constant.numeric"],regex:"([0-9]+)"},{token:"constant.numeric",regex:"#[a-f0-9]{6}"},{token:"constant.numeric",regex:"#[a-f0-9]{3}"},{token:["punctuation","entity.other.attribute-name.pseudo-element.css"],regex:h},{token:["punctuation","entity.other.attribute-name.pseudo-class.css"],regex:i},{token:function(e){return a.hasOwnProperty(e.toLowerCase())?"support.type":b.hasOwnProperty(e.toLowerCase())?"support.function":c.hasOwnProperty(e.toLowerCase())?"support.constant":d.hasOwnProperty(e.toLowerCase())?"support.constant.color":f.hasOwnProperty(e.toLowerCase())?"support.constant.fonts":"text"},regex:"\\-?[a-zA-Z_][a-zA-Z0-9_\\-]*"}],k=e.copyArray(j);k.unshift({token:"paren.rparen",regex:"\\}",next:"start"});var l=e.copyArray(j);l.unshift({token:"paren.rparen",regex:"\\}",next:"media"});var m=[{token:"comment",merge:!0,regex:".+"}],n=e.copyArray(m);n.unshift({token:"comment",regex:".*?\\*\\/",next:"start"});var o=e.copyArray(m);o.unshift({token:"comment",regex:".*?\\*\\/",next:"media"});var p=e.copyArray(m);p.unshift({token:"comment",regex:".*?\\*\\/",next:"ruleset"}),this.$rules={start:[{token:"comment",merge:!0,regex:"\\/\\*",next:"comment"},{token:"paren.lparen",regex:"\\{",next:"ruleset"},{token:"string",regex:"@.*?{",next:"media"},{token:"keyword",regex:"#[a-z0-9-_]+"},{token:"variable",regex:"\\.[a-z0-9-_]+"},{token:"string",regex:":[a-z0-9-_]+"},{token:"constant",regex:"[a-z0-9-_]+"}],media:[{token:"comment",merge:!0,regex:"\\/\\*",next:"media_comment"},{token:"paren.lparen",regex:"\\{",next:"media_ruleset"},{token:"string",regex:"\\}",next:"start"},{token:"keyword",regex:"#[a-z0-9-_]+"},{token:"variable",regex:"\\.[a-z0-9-_]+"},{token:"string",regex:":[a-z0-9-_]+"},{token:"constant",regex:"[a-z0-9-_]+"}],comment:n,ruleset:k,ruleset_comment:p,media_ruleset:l,media_comment:o}};d.inherits(g,f),b.CssHighlightRules=g}),define("ace/mode/html_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/css_highlight_rules","ace/mode/javascript_highlight_rules","ace/mode/xml_util","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./css_highlight_rules").CssHighlightRules,f=a("./javascript_highlight_rules").JavaScriptHighlightRules,g=a("./xml_util"),h=a("./text_highlight_rules").TextHighlightRules,i=function(){this.$rules={start:[{token:"text",merge:!0,regex:"<\\!\\[CDATA\\[",next:"cdata"},{token:"xml_pe",regex:"<\\?.*?\\?>"},{token:"comment",merge:!0,regex:"<\\!--",next:"comment"},{token:"xml_pe",regex:"<\\!.*?>"},{token:"meta.tag",regex:"<(?=s*script\\b)",next:"script"},{token:"meta.tag",regex:"<(?=s*style\\b)",next:"style"},{token:"meta.tag",regex:"<\\/?",next:"tag"},{token:"text",regex:"\\s+"},{token:"constant.character.entity",regex:"(?:&#[0-9]+;)|(?:&#x[0-9a-fA-F]+;)|(?:&[a-zA-Z0-9_:\\.-]+;)"},{token:"text",regex:"[^<]+"}],cdata:[{token:"text",regex:"\\]\\]>",next:"start"},{token:"text",merge:!0,regex:"\\s+"},{token:"text",merge:!0,regex:".+"}],comment:[{token:"comment",regex:".*?-->",next:"start"},{token:"comment",merge:!0,regex:".+"}]},g.tag(this.$rules,"tag","start"),g.tag(this.$rules,"style","css-start"),g.tag(this.$rules,"script","js-start"),this.embedRules(f,"js-",[{token:"comment",regex:"\\/\\/.*(?=<\\/script>)",next:"tag"},{token:"meta.tag",regex:"<\\/(?=script)",next:"tag"}]),this.embedRules(e,"css-",[{token:"meta.tag",regex:"<\\/(?=style)",next:"tag"}])};d.inherits(i,h),b.HtmlHighlightRules=i}),define("ace/mode/folding/html",["require","exports","module","ace/lib/oop","ace/mode/folding/mixed","ace/mode/folding/xml","ace/mode/folding/cstyle"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("./mixed").FoldMode,f=a("./xml").FoldMode,g=a("./cstyle").FoldMode,h=b.FoldMode=function(){e.call(this,new f({area:1,base:1,br:1,col:1,command:1,embed:1,hr:1,img:1,input:1,keygen:1,link:1,meta:1,param:1,source:1,track:1,wbr:1,li:1,dt:1,dd:1,p:1,rt:1,rp:1,optgroup:1,option:1,colgroup:1,td:1,th:1}),{"js-":new g,"css-":new g})};d.inherits(h,e)}),define("ace/mode/folding/mixed",["require","exports","module","ace/lib/oop","ace/mode/folding/fold_mode"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("./fold_mode").FoldMode,f=b.FoldMode=function(a,b){this.defaultMode=a,this.subModes=b};d.inherits(f,e),function(){this.$getMode=function(a){for(var b in this.subModes)if(a.indexOf(b)===0)return this.subModes[b];return null},this.$tryMode=function(a,b,c,d){var e=this.$getMode(a);return e?e.getFoldWidget(b,c,d):""},this.getFoldWidget=function(a,b,c){return this.$tryMode(a.getState(c-1),a,b,c)||this.$tryMode(a.getState(c),a,b,c)||this.defaultMode.getFoldWidget(a,b,c)},this.getFoldWidgetRange=function(a,b,c){var d=this.$getMode(a.getState(c-1));if(!d||!d.getFoldWidget(a,b,c))d=this.$getMode(a.getState(c));if(!d||!d.getFoldWidget(a,b,c))d=this.defaultMode;return d.getFoldWidgetRange(a,b,c)}}.call(f.prototype)}),define("ace/mode/markdown_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules","ace/mode/javascript_highlight_rules","ace/mode/xml_highlight_rules","ace/mode/html_highlight_rules","ace/mode/css_highlight_rules"],function(a,b,c){function j(a,b){return{token:"support.function",regex:"^```"+a+"\\s*$",next:b+"start"}}"use strict";var d=a("../lib/oop"),e=a("./text_highlight_rules").TextHighlightRules,f=a("./javascript_highlight_rules").JavaScriptHighlightRules,g=a("./xml_highlight_rules").XmlHighlightRules,h=a("./html_highlight_rules").HtmlHighlightRules,i=a("./css_highlight_rules").CssHighlightRules,k=function(){this.$rules={start:[{token:"empty_line",regex:"^$"},{token:["support.function","support.function","support.function"],regex:"(`+)([^\\r]*?[^`])(\\1)"},{token:"support.function",regex:"^[ ]{4}.+"},{token:"markup.heading.1",regex:"^=+(?=\\s*$)"},{token:"markup.heading.1",regex:"^\\-+(?=\\s*$)"},{token:function(a){return"markup.heading."+a.length},regex:"^#{1,6}"},j("javascript","js-"),j("xml","xml-"),j("html","html-"),j("css","css-"),{token:"support.function",regex:"^```[a-zA-Z]+\\s*$",next:"githubblock"},{token:"string",regex:"^>[ ].+$",next:"blockquote"},{token:["text","constant","text","url","string","text"],regex:'^([ ]{0,3}\\[)([^\\]]+)(\\]:\\s*)([^ ]+)(\\s*(?:["][^"]+["])?(\\s*))$'},{token:["text","string","text","constant","text"],regex:"(\\[)((?:[[^\\]]*\\]|[^\\[\\]])*)(\\][ ]?(?:\\n[ ]*)?\\[)(.*?)(\\])"},{token:["text","string","text","markup.underline","string","text"],regex:'(\\[)(\\[[^\\]]*\\]|[^\\[\\]]*)(\\]\\([ \\t]*)(<?(?:(?:[^\\(]*?\\([^\\)]*?\\)\\S*?)|(?:.*?))>?)((?:[ 	]*"(?:.*?)"[ \\t]*)?)(\\))'},{token:"constant",regex:"^[ ]{0,2}(?:[ ]?\\*[ ]?){3,}\\s*$"},{token:"constant",regex:"^[ ]{0,2}(?:[ ]?\\-[ ]?){3,}\\s*$"},{token:"constant",regex:"^[ ]{0,2}(?:[ ]?\\_[ ]?){3,}\\s*$"},{token:"markup.list",regex:"^\\s{0,3}(?:[*+-]|\\d+\\.)\\s+",next:"listblock"},{token:["string","string","string"],regex:"([*]{2}|[_]{2}(?=\\S))([^\\r]*?\\S[*_]*)(\\1)"},{token:["string","string","string"],regex:"([*]|[_](?=\\S))([^\\r]*?\\S[*_]*)(\\1)"},{token:["text","url","text"],regex:"(<)((?:https?|ftp|dict):[^'\">\\s]+|(?:mailto:)?[-.\\w]+\\@[-a-z0-9]+(?:\\.[-a-z0-9]+)*\\.[a-z]+)(>)"},{token:"text",regex:"[^\\*_%$`\\[#<>]+"}],listblock:[{token:"empty_line",regex:"^$",next:"start"},{token:"markup.list",regex:".+"}],blockquote:[{token:"empty_line",regex:"^\\s*$",next:"start"},{token:"string",regex:".+"}],githubblock:[{token:"support.function",regex:"^```",next:"start"},{token:"support.function",regex:".+"}]},this.embedRules(f,"js-",[{token:"support.function",regex:"^```",next:"start"}]),this.embedRules(h,"html-",[{token:"support.function",regex:"^```",next:"start"}]),this.embedRules(i,"css-",[{token:"support.function",regex:"^```",next:"start"}]),this.embedRules(g,"xml-",[{token:"support.function",regex:"^```",next:"start"}])};d.inherits(k,e),b.MarkdownHighlightRules=k})
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-ocaml-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-ocaml-uncompressed.js
deleted file mode 100644
index c268a4f8ca..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-ocaml-uncompressed.js
+++ /dev/null
@@ -1,539 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Sergi Mansilla <sergi AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/ocaml', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/ocaml_highlight_rules', 'ace/mode/matching_brace_outdent', 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
-var OcamlHighlightRules = require("./ocaml_highlight_rules").OcamlHighlightRules;
-var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
-var Range = require("../range").Range;
-
-var Mode = function() {
-    this.$tokenizer = new Tokenizer(new OcamlHighlightRules().getRules());
-    this.$outdent   = new MatchingBraceOutdent();
-};
-oop.inherits(Mode, TextMode);
-
-var indenter = /(?:[({[=:]|[-=]>|\b(?:else|try|with))\s*$/;
-
-(function() {
-
-    this.toggleCommentLines = function(state, doc, startRow, endRow) {
-        var i, line;
-        var outdent = true;
-        var re = /^\s*\(\*(.*)\*\)/;
-
-        for (i=startRow; i<= endRow; i++) {
-            if (!re.test(doc.getLine(i))) {
-                outdent = false;
-                break;
-            }
-        }
-
-        var range = new Range(0, 0, 0, 0);
-        for (i=startRow; i<= endRow; i++) {
-            line = doc.getLine(i);
-            range.start.row  = i;
-            range.end.row    = i;
-            range.end.column = line.length;
-
-            doc.replace(range, outdent ? line.match(re)[1] : "(*" + line + "*)");
-        }
-    };
-
-    this.getNextLineIndent = function(state, line, tab) {
-        var indent = this.$getIndent(line);
-        var tokens = this.$tokenizer.getLineTokens(line, state).tokens;
-
-        if (!(tokens.length && tokens[tokens.length - 1].type === 'comment') &&
-            state === 'start' && indenter.test(line))
-            indent += tab;
-        return indent;
-    };
-
-    this.checkOutdent = function(state, line, input) {
-        return this.$outdent.checkOutdent(line, input);
-    };
-
-    this.autoOutdent = function(state, doc, row) {
-        this.$outdent.autoOutdent(doc, row);
-    };
-
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-});
-
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Sergi Mansilla <sergi AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK *****
- *
- */
-
-define('ace/mode/ocaml_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var lang = require("../lib/lang");
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var OcamlHighlightRules = function() {
-
-    var keywords = lang.arrayToMap((
-        "and|as|assert|begin|class|constraint|do|done|downto|else|end|"  +
-        "exception|external|for|fun|function|functor|if|in|include|"     +
-        "inherit|initializer|lazy|let|match|method|module|mutable|new|"  +
-        "object|of|open|or|private|rec|sig|struct|then|to|try|type|val|" +
-        "virtual|when|while|with").split("|")
-    );
-
-    var builtinConstants = lang.arrayToMap(
-        ("true|false").split("|")
-    );
-
-    var builtinFunctions = lang.arrayToMap((
-        "abs|abs_big_int|abs_float|abs_num|abstract_tag|accept|access|acos|add|" +
-        "add_available_units|add_big_int|add_buffer|add_channel|add_char|" +
-        "add_initializer|add_int_big_int|add_interfaces|add_num|add_string|" +
-        "add_substitute|add_substring|alarm|allocated_bytes|allow_only|" +
-        "allow_unsafe_modules|always|append|appname_get|appname_set|" +
-        "approx_num_exp|approx_num_fix|arg|argv|arith_status|array|" +
-        "array1_of_genarray|array2_of_genarray|array3_of_genarray|asin|asr|" +
-        "assoc|assq|at_exit|atan|atan2|auto_synchronize|background|basename|" +
-        "beginning_of_input|big_int_of_int|big_int_of_num|big_int_of_string|bind|" +
-        "bind_class|bind_tag|bits|bits_of_float|black|blit|blit_image|blue|bool|" +
-        "bool_of_string|bounded_full_split|bounded_split|bounded_split_delim|" +
-        "bprintf|break|broadcast|bscanf|button_down|c_layout|capitalize|cardinal|" +
-        "cardinal|catch|catch_break|ceil|ceiling_num|channel|char|char_of_int|" +
-        "chdir|check|check_suffix|chmod|choose|chop_extension|chop_suffix|chown|" +
-        "chown|chr|chroot|classify_float|clear|clear_available_units|" +
-        "clear_close_on_exec|clear_graph|clear_nonblock|clear_parser|" +
-        "close|close|closeTk|close_box|close_graph|close_in|close_in_noerr|" +
-        "close_out|close_out_noerr|close_process|close_process|" +
-        "close_process_full|close_process_in|close_process_out|close_subwindow|" +
-        "close_tag|close_tbox|closedir|closedir|closure_tag|code|combine|" +
-        "combine|combine|command|compact|compare|compare_big_int|compare_num|" +
-        "complex32|complex64|concat|conj|connect|contains|contains_from|contents|" +
-        "copy|cos|cosh|count|count|counters|create|create_alarm|create_image|" +
-        "create_matrix|create_matrix|create_matrix|create_object|" +
-        "create_object_and_run_initializers|create_object_opt|create_process|" +
-        "create_process|create_process_env|create_process_env|create_table|" +
-        "current|current_dir_name|current_point|current_x|current_y|curveto|" +
-        "custom_tag|cyan|data_size|decr|decr_num|default_available_units|delay|" +
-        "delete_alarm|descr_of_in_channel|descr_of_out_channel|destroy|diff|dim|" +
-        "dim1|dim2|dim3|dims|dirname|display_mode|div|div_big_int|div_num|" +
-        "double_array_tag|double_tag|draw_arc|draw_char|draw_circle|draw_ellipse|" +
-        "draw_image|draw_poly|draw_poly_line|draw_rect|draw_segments|draw_string|" +
-        "dummy_pos|dummy_table|dump_image|dup|dup2|elements|empty|end_of_input|" +
-        "environment|eprintf|epsilon_float|eq_big_int|eq_num|equal|err_formatter|" +
-        "error_message|escaped|establish_server|executable_name|execv|execve|execvp|" +
-        "execvpe|exists|exists2|exit|exp|failwith|fast_sort|fchmod|fchown|field|" +
-        "file|file_exists|fill|fill_arc|fill_circle|fill_ellipse|fill_poly|fill_rect|" +
-        "filter|final_tag|finalise|find|find_all|first_chars|firstkey|flatten|" +
-        "float|float32|float64|float_of_big_int|float_of_bits|float_of_int|" +
-        "float_of_num|float_of_string|floor|floor_num|flush|flush_all|flush_input|" +
-        "flush_str_formatter|fold|fold_left|fold_left2|fold_right|fold_right2|" +
-        "for_all|for_all2|force|force_newline|force_val|foreground|fork|" +
-        "format_of_string|formatter_of_buffer|formatter_of_out_channel|" +
-        "fortran_layout|forward_tag|fprintf|frexp|from|from_channel|from_file|" +
-        "from_file_bin|from_function|from_string|fscanf|fst|fstat|ftruncate|" +
-        "full_init|full_major|full_split|gcd_big_int|ge_big_int|ge_num|" +
-        "genarray_of_array1|genarray_of_array2|genarray_of_array3|get|" +
-        "get_all_formatter_output_functions|get_approx_printing|get_copy|" +
-        "get_ellipsis_text|get_error_when_null_denominator|get_floating_precision|" +
-        "get_formatter_output_functions|get_formatter_tag_functions|get_image|" +
-        "get_margin|get_mark_tags|get_max_boxes|get_max_indent|get_method|" +
-        "get_method_label|get_normalize_ratio|get_normalize_ratio_when_printing|" +
-        "get_print_tags|get_state|get_variable|getcwd|getegid|getegid|getenv|" +
-        "getenv|getenv|geteuid|geteuid|getgid|getgid|getgrgid|getgrgid|getgrnam|" +
-        "getgrnam|getgroups|gethostbyaddr|gethostbyname|gethostname|getitimer|" +
-        "getlogin|getpeername|getpid|getppid|getprotobyname|getprotobynumber|" +
-        "getpwnam|getpwuid|getservbyname|getservbyport|getsockname|getsockopt|" +
-        "getsockopt_float|getsockopt_int|getsockopt_optint|gettimeofday|getuid|" +
-        "global_replace|global_substitute|gmtime|green|grid|group_beginning|" +
-        "group_end|gt_big_int|gt_num|guard|handle_unix_error|hash|hash_param|" +
-        "hd|header_size|i|id|ignore|in_channel_length|in_channel_of_descr|incr|" +
-        "incr_num|index|index_from|inet_addr_any|inet_addr_of_string|infinity|" +
-        "infix_tag|init|init_class|input|input_binary_int|input_byte|input_char|" +
-        "input_line|input_value|int|int16_signed|int16_unsigned|int32|int64|" +
-        "int8_signed|int8_unsigned|int_of_big_int|int_of_char|int_of_float|" +
-        "int_of_num|int_of_string|integer_num|inter|interactive|inv|invalid_arg|" +
-        "is_block|is_empty|is_implicit|is_int|is_int_big_int|is_integer_num|" +
-        "is_relative|iter|iter2|iteri|join|junk|key_pressed|kill|kind|kprintf|" +
-        "kscanf|land|last_chars|layout|lazy_from_fun|lazy_from_val|lazy_is_val|" +
-        "lazy_tag|ldexp|le_big_int|le_num|length|lexeme|lexeme_char|lexeme_end|" +
-        "lexeme_end_p|lexeme_start|lexeme_start_p|lineto|link|list|listen|lnot|" +
-        "loadfile|loadfile_private|localtime|lock|lockf|log|log10|logand|lognot|" +
-        "logor|logxor|lor|lower_window|lowercase|lseek|lsl|lsr|lstat|lt_big_int|" +
-        "lt_num|lxor|magenta|magic|mainLoop|major|major_slice|make|make_formatter|" +
-        "make_image|make_lexer|make_matrix|make_self_init|map|map2|map_file|mapi|" +
-        "marshal|match_beginning|match_end|matched_group|matched_string|max|" +
-        "max_array_length|max_big_int|max_elt|max_float|max_int|max_num|" +
-        "max_string_length|mem|mem_assoc|mem_assq|memq|merge|min|min_big_int|" +
-        "min_elt|min_float|min_int|min_num|minor|minus_big_int|minus_num|" +
-        "minus_one|mkdir|mkfifo|mktime|mod|mod_big_int|mod_float|mod_num|modf|" +
-        "mouse_pos|moveto|mul|mult_big_int|mult_int_big_int|mult_num|nan|narrow|" +
-        "nat_of_num|nativeint|neg|neg_infinity|new_block|new_channel|new_method|" +
-        "new_variable|next|nextkey|nice|nice|no_scan_tag|norm|norm2|not|npeek|" +
-        "nth|nth_dim|num_digits_big_int|num_dims|num_of_big_int|num_of_int|" +
-        "num_of_nat|num_of_ratio|num_of_string|O|obj|object_tag|ocaml_version|" +
-        "of_array|of_channel|of_float|of_int|of_int32|of_list|of_nativeint|" +
-        "of_string|one|openTk|open_box|open_connection|open_graph|open_hbox|" +
-        "open_hovbox|open_hvbox|open_in|open_in_bin|open_in_gen|open_out|" +
-        "open_out_bin|open_out_gen|open_process|open_process_full|open_process_in|" +
-        "open_process_out|open_subwindow|open_tag|open_tbox|open_temp_file|" +
-        "open_vbox|opendbm|opendir|openfile|or|os_type|out_channel_length|" +
-        "out_channel_of_descr|output|output_binary_int|output_buffer|output_byte|" +
-        "output_char|output_string|output_value|over_max_boxes|pack|params|" +
-        "parent_dir_name|parse|parse_argv|partition|pause|peek|pipe|pixels|" +
-        "place|plot|plots|point_color|polar|poll|pop|pos_in|pos_out|pow|" +
-        "power_big_int_positive_big_int|power_big_int_positive_int|" +
-        "power_int_positive_big_int|power_int_positive_int|power_num|" +
-        "pp_close_box|pp_close_tag|pp_close_tbox|pp_force_newline|" +
-        "pp_get_all_formatter_output_functions|pp_get_ellipsis_text|" +
-        "pp_get_formatter_output_functions|pp_get_formatter_tag_functions|" +
-        "pp_get_margin|pp_get_mark_tags|pp_get_max_boxes|pp_get_max_indent|" +
-        "pp_get_print_tags|pp_open_box|pp_open_hbox|pp_open_hovbox|pp_open_hvbox|" +
-        "pp_open_tag|pp_open_tbox|pp_open_vbox|pp_over_max_boxes|pp_print_as|" +
-        "pp_print_bool|pp_print_break|pp_print_char|pp_print_cut|pp_print_float|" +
-        "pp_print_flush|pp_print_if_newline|pp_print_int|pp_print_newline|" +
-        "pp_print_space|pp_print_string|pp_print_tab|pp_print_tbreak|" +
-        "pp_set_all_formatter_output_functions|pp_set_ellipsis_text|" +
-        "pp_set_formatter_out_channel|pp_set_formatter_output_functions|" +
-        "pp_set_formatter_tag_functions|pp_set_margin|pp_set_mark_tags|" +
-        "pp_set_max_boxes|pp_set_max_indent|pp_set_print_tags|pp_set_tab|" +
-        "pp_set_tags|pred|pred_big_int|pred_num|prerr_char|prerr_endline|" +
-        "prerr_float|prerr_int|prerr_newline|prerr_string|print|print_as|" +
-        "print_bool|print_break|print_char|print_cut|print_endline|print_float|" +
-        "print_flush|print_if_newline|print_int|print_newline|print_space|" +
-        "print_stat|print_string|print_tab|print_tbreak|printf|prohibit|" +
-        "public_method_label|push|putenv|quo_num|quomod_big_int|quote|raise|" +
-        "raise_window|ratio_of_num|rcontains_from|read|read_float|read_int|" +
-        "read_key|read_line|readdir|readdir|readlink|really_input|receive|recv|" +
-        "recvfrom|red|ref|regexp|regexp_case_fold|regexp_string|" +
-        "regexp_string_case_fold|register|register_exception|rem|remember_mode|" +
-        "remove|remove_assoc|remove_assq|rename|replace|replace_first|" +
-        "replace_matched|repr|reset|reshape|reshape_1|reshape_2|reshape_3|rev|" +
-        "rev_append|rev_map|rev_map2|rewinddir|rgb|rhs_end|rhs_end_pos|rhs_start|" +
-        "rhs_start_pos|rindex|rindex_from|rlineto|rmdir|rmoveto|round_num|" +
-        "run_initializers|run_initializers_opt|scanf|search_backward|" +
-        "search_forward|seek_in|seek_out|select|self|self_init|send|sendto|set|" +
-        "set_all_formatter_output_functions|set_approx_printing|" +
-        "set_binary_mode_in|set_binary_mode_out|set_close_on_exec|" +
-        "set_close_on_exec|set_color|set_ellipsis_text|" +
-        "set_error_when_null_denominator|set_field|set_floating_precision|" +
-        "set_font|set_formatter_out_channel|set_formatter_output_functions|" +
-        "set_formatter_tag_functions|set_line_width|set_margin|set_mark_tags|" +
-        "set_max_boxes|set_max_indent|set_method|set_nonblock|set_nonblock|" +
-        "set_normalize_ratio|set_normalize_ratio_when_printing|set_print_tags|" +
-        "set_signal|set_state|set_tab|set_tag|set_tags|set_text_size|" +
-        "set_window_title|setgid|setgid|setitimer|setitimer|setsid|setsid|" +
-        "setsockopt|setsockopt|setsockopt_float|setsockopt_float|setsockopt_int|" +
-        "setsockopt_int|setsockopt_optint|setsockopt_optint|setuid|setuid|" +
-        "shift_left|shift_left|shift_left|shift_right|shift_right|shift_right|" +
-        "shift_right_logical|shift_right_logical|shift_right_logical|show_buckets|" +
-        "shutdown|shutdown|shutdown_connection|shutdown_connection|sigabrt|" +
-        "sigalrm|sigchld|sigcont|sigfpe|sighup|sigill|sigint|sigkill|sign_big_int|" +
-        "sign_num|signal|signal|sigpending|sigpending|sigpipe|sigprocmask|" +
-        "sigprocmask|sigprof|sigquit|sigsegv|sigstop|sigsuspend|sigsuspend|" +
-        "sigterm|sigtstp|sigttin|sigttou|sigusr1|sigusr2|sigvtalrm|sin|singleton|" +
-        "sinh|size|size|size_x|size_y|sleep|sleep|sleep|slice_left|slice_left|" +
-        "slice_left_1|slice_left_2|slice_right|slice_right|slice_right_1|" +
-        "slice_right_2|snd|socket|socket|socket|socketpair|socketpair|sort|sound|" +
-        "split|split_delim|sprintf|sprintf|sqrt|sqrt|sqrt_big_int|square_big_int|" +
-        "square_num|sscanf|stable_sort|stable_sort|stable_sort|stable_sort|stable_sort|" +
-        "stable_sort|stat|stat|stat|stat|stat|stats|stats|std_formatter|stdbuf|" +
-        "stderr|stderr|stderr|stdib|stdin|stdin|stdin|stdout|stdout|stdout|" +
-        "str_formatter|string|string_after|string_before|string_match|" +
-        "string_of_big_int|string_of_bool|string_of_float|string_of_format|" +
-        "string_of_inet_addr|string_of_inet_addr|string_of_int|string_of_num|" +
-        "string_partial_match|string_tag|sub|sub|sub_big_int|sub_left|sub_num|" +
-        "sub_right|subset|subset|substitute_first|substring|succ|succ|" +
-        "succ|succ|succ_big_int|succ_num|symbol_end|symbol_end_pos|symbol_start|" +
-        "symbol_start_pos|symlink|symlink|sync|synchronize|system|system|system|" +
-        "tag|take|tan|tanh|tcdrain|tcdrain|tcflow|tcflow|tcflush|tcflush|" +
-        "tcgetattr|tcgetattr|tcsendbreak|tcsendbreak|tcsetattr|tcsetattr|" +
-        "temp_file|text_size|time|time|time|timed_read|timed_write|times|times|" +
-        "tl|tl|tl|to_buffer|to_channel|to_float|to_hex|to_int|to_int32|to_list|" +
-        "to_list|to_list|to_nativeint|to_string|to_string|to_string|to_string|" +
-        "to_string|top|top|total_size|transfer|transp|truncate|truncate|truncate|" +
-        "truncate|truncate|truncate|try_lock|umask|umask|uncapitalize|uncapitalize|" +
-        "uncapitalize|union|union|unit_big_int|unlink|unlink|unlock|unmarshal|" +
-        "unsafe_blit|unsafe_fill|unsafe_get|unsafe_get|unsafe_set|unsafe_set|" +
-        "update|uppercase|uppercase|uppercase|uppercase|usage|utimes|utimes|wait|" +
-        "wait|wait|wait|wait_next_event|wait_pid|wait_read|wait_signal|" +
-        "wait_timed_read|wait_timed_write|wait_write|waitpid|white|" +
-        "widen|window_id|word_size|wrap|wrap_abort|write|yellow|yield|zero|zero_big_int|" +
-
-        "Arg|Arith_status|Array|Array1|Array2|Array3|ArrayLabels|Big_int|Bigarray|" +
-        "Buffer|Callback|CamlinternalOO|Char|Complex|Condition|Dbm|Digest|Dynlink|" +
-        "Event|Filename|Format|Gc|Genarray|Genlex|Graphics|GraphicsX11|Hashtbl|" +
-        "Int32|Int64|LargeFile|Lazy|Lexing|List|ListLabels|Make|Map|Marshal|" +
-        "MoreLabels|Mutex|Nativeint|Num|Obj|Oo|Parsing|Pervasives|Printexc|" +
-        "Printf|Queue|Random|Scanf|Scanning|Set|Sort|Stack|State|StdLabels|Str|" +
-        "Stream|String|StringLabels|Sys|Thread|ThreadUnix|Tk|Unix|UnixLabels|Weak"
-    ).split("|"));
-
-    var decimalInteger = "(?:(?:[1-9]\\d*)|(?:0))";
-    var octInteger = "(?:0[oO]?[0-7]+)";
-    var hexInteger = "(?:0[xX][\\dA-Fa-f]+)";
-    var binInteger = "(?:0[bB][01]+)";
-    var integer = "(?:" + decimalInteger + "|" + octInteger + "|" + hexInteger + "|" + binInteger + ")";
-
-    var exponent = "(?:[eE][+-]?\\d+)";
-    var fraction = "(?:\\.\\d+)";
-    var intPart = "(?:\\d+)";
-    var pointFloat = "(?:(?:" + intPart + "?" + fraction + ")|(?:" + intPart + "\\.))";
-    var exponentFloat = "(?:(?:" + pointFloat + "|" +  intPart + ")" + exponent + ")";
-    var floatNumber = "(?:" + exponentFloat + "|" + pointFloat + ")";
-
-    this.$rules = {
-        "start" : [
-            {
-                token : "comment",
-                regex : '\\(\\*.*?\\*\\)\\s*?$'
-            },
-            {
-                token : "comment",
-                merge : true,
-                regex : '\\(\\*.*',
-                next : "comment"
-            },
-            {
-                token : "string", // single line
-                regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
-            },
-            {
-                token : "string", // single char
-                regex : "'.'"
-            },
-            {
-                token : "string", // " string
-                merge : true,
-                regex : '"',
-                next  : "qstring"
-            },
-            {
-                token : "constant.numeric", // imaginary
-                regex : "(?:" + floatNumber + "|\\d+)[jJ]\\b"
-            },
-            {
-                token : "constant.numeric", // float
-                regex : floatNumber
-            },
-            {
-                token : "constant.numeric", // integer
-                regex : integer + "\\b"
-            },
-            {
-                token : function(value) {
-                    if (keywords.hasOwnProperty(value))
-                        return "keyword";
-                    else if (builtinConstants.hasOwnProperty(value))
-                        return "constant.language";
-                    else if (builtinFunctions.hasOwnProperty(value))
-                        return "support.function";
-                    else
-                        return "identifier";
-                },
-                regex : "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
-            },
-            {
-                token : "keyword.operator",
-                regex : "\\+\\.|\\-\\.|\\*\\.|\\/\\.|#|;;|\\+|\\-|\\*|\\*\\*\\/|\\/\\/|%|<<|>>|&|\\||\\^|~|<|>|<=|=>|==|!=|<>|<-|="
-            },
-            {
-                token : "paren.lparen",
-                regex : "[[({]"
-            },
-            {
-                token : "paren.rparen",
-                regex : "[\\])}]"
-            },
-            {
-                token : "text",
-                regex : "\\s+"
-            }
-        ],
-        "comment" : [
-            {
-                token : "comment", // closing comment
-                regex : ".*?\\*\\)",
-                next : "start"
-            },
-            {
-                token : "comment", // comment spanning whole line
-                merge : true,
-                regex : ".+"
-            }
-        ],
-
-        "qstring" : [
-            {
-                token : "string",
-                regex : '"',
-                next : "start"
-            }, {
-                token : "string",
-                merge : true,
-                regex : '.+'
-            }
-        ]
-    };
-};
-
-oop.inherits(OcamlHighlightRules, TextHighlightRules);
-
-exports.OcamlHighlightRules = OcamlHighlightRules;
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/matching_brace_outdent', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../range").Range;
-
-var MatchingBraceOutdent = function() {};
-
-(function() {
-
-    this.checkOutdent = function(line, input) {
-        if (! /^\s+$/.test(line))
-            return false;
-
-        return /^\s*\}/.test(input);
-    };
-
-    this.autoOutdent = function(doc, row) {
-        var line = doc.getLine(row);
-        var match = line.match(/^(\s*\})/);
-
-        if (!match) return 0;
-
-        var column = match[1].length;
-        var openBracePos = doc.findMatchingBracket({row: row, column: column});
-
-        if (!openBracePos || openBracePos.row == row) return 0;
-
-        var indent = this.$getIndent(doc.getLine(openBracePos.row));
-        doc.replace(new Range(row, 0, row, column-1), indent);
-    };
-
-    this.$getIndent = function(line) {
-        var match = line.match(/^(\s+)/);
-        if (match) {
-            return match[1];
-        }
-
-        return "";
-    };
-
-}).call(MatchingBraceOutdent.prototype);
-
-exports.MatchingBraceOutdent = MatchingBraceOutdent;
-});
diff --git a/apps/files_texteditor/js/aceeditor/mode-ocaml.js b/apps/files_texteditor/js/aceeditor/mode-ocaml.js
deleted file mode 100644
index 622f817e30..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-ocaml.js
+++ /dev/null
@@ -1 +0,0 @@
-define("ace/mode/ocaml",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/ocaml_highlight_rules","ace/mode/matching_brace_outdent","ace/range"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./ocaml_highlight_rules").OcamlHighlightRules,h=a("./matching_brace_outdent").MatchingBraceOutdent,i=a("../range").Range,j=function(){this.$tokenizer=new f((new g).getRules()),this.$outdent=new h};d.inherits(j,e);var k=/(?:[({[=:]|[-=]>|\b(?:else|try|with))\s*$/;(function(){this.toggleCommentLines=function(a,b,c,d){var e,f,g=!0,h=/^\s*\(\*(.*)\*\)/;for(e=c;e<=d;e++)if(!h.test(b.getLine(e))){g=!1;break}var j=new i(0,0,0,0);for(e=c;e<=d;e++)f=b.getLine(e),j.start.row=e,j.end.row=e,j.end.column=f.length,b.replace(j,g?f.match(h)[1]:"(*"+f+"*)")},this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a).tokens;return(!e.length||e[e.length-1].type!=="comment")&&a==="start"&&k.test(b)&&(d+=c),d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)}}).call(j.prototype),b.Mode=j}),define("ace/mode/ocaml_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("./text_highlight_rules").TextHighlightRules,g=function(){var a=e.arrayToMap("and|as|assert|begin|class|constraint|do|done|downto|else|end|exception|external|for|fun|function|functor|if|in|include|inherit|initializer|lazy|let|match|method|module|mutable|new|object|of|open|or|private|rec|sig|struct|then|to|try|type|val|virtual|when|while|with".split("|")),b=e.arrayToMap("true|false".split("|")),c=e.arrayToMap("abs|abs_big_int|abs_float|abs_num|abstract_tag|accept|access|acos|add|add_available_units|add_big_int|add_buffer|add_channel|add_char|add_initializer|add_int_big_int|add_interfaces|add_num|add_string|add_substitute|add_substring|alarm|allocated_bytes|allow_only|allow_unsafe_modules|always|append|appname_get|appname_set|approx_num_exp|approx_num_fix|arg|argv|arith_status|array|array1_of_genarray|array2_of_genarray|array3_of_genarray|asin|asr|assoc|assq|at_exit|atan|atan2|auto_synchronize|background|basename|beginning_of_input|big_int_of_int|big_int_of_num|big_int_of_string|bind|bind_class|bind_tag|bits|bits_of_float|black|blit|blit_image|blue|bool|bool_of_string|bounded_full_split|bounded_split|bounded_split_delim|bprintf|break|broadcast|bscanf|button_down|c_layout|capitalize|cardinal|cardinal|catch|catch_break|ceil|ceiling_num|channel|char|char_of_int|chdir|check|check_suffix|chmod|choose|chop_extension|chop_suffix|chown|chown|chr|chroot|classify_float|clear|clear_available_units|clear_close_on_exec|clear_graph|clear_nonblock|clear_parser|close|close|closeTk|close_box|close_graph|close_in|close_in_noerr|close_out|close_out_noerr|close_process|close_process|close_process_full|close_process_in|close_process_out|close_subwindow|close_tag|close_tbox|closedir|closedir|closure_tag|code|combine|combine|combine|command|compact|compare|compare_big_int|compare_num|complex32|complex64|concat|conj|connect|contains|contains_from|contents|copy|cos|cosh|count|count|counters|create|create_alarm|create_image|create_matrix|create_matrix|create_matrix|create_object|create_object_and_run_initializers|create_object_opt|create_process|create_process|create_process_env|create_process_env|create_table|current|current_dir_name|current_point|current_x|current_y|curveto|custom_tag|cyan|data_size|decr|decr_num|default_available_units|delay|delete_alarm|descr_of_in_channel|descr_of_out_channel|destroy|diff|dim|dim1|dim2|dim3|dims|dirname|display_mode|div|div_big_int|div_num|double_array_tag|double_tag|draw_arc|draw_char|draw_circle|draw_ellipse|draw_image|draw_poly|draw_poly_line|draw_rect|draw_segments|draw_string|dummy_pos|dummy_table|dump_image|dup|dup2|elements|empty|end_of_input|environment|eprintf|epsilon_float|eq_big_int|eq_num|equal|err_formatter|error_message|escaped|establish_server|executable_name|execv|execve|execvp|execvpe|exists|exists2|exit|exp|failwith|fast_sort|fchmod|fchown|field|file|file_exists|fill|fill_arc|fill_circle|fill_ellipse|fill_poly|fill_rect|filter|final_tag|finalise|find|find_all|first_chars|firstkey|flatten|float|float32|float64|float_of_big_int|float_of_bits|float_of_int|float_of_num|float_of_string|floor|floor_num|flush|flush_all|flush_input|flush_str_formatter|fold|fold_left|fold_left2|fold_right|fold_right2|for_all|for_all2|force|force_newline|force_val|foreground|fork|format_of_string|formatter_of_buffer|formatter_of_out_channel|fortran_layout|forward_tag|fprintf|frexp|from|from_channel|from_file|from_file_bin|from_function|from_string|fscanf|fst|fstat|ftruncate|full_init|full_major|full_split|gcd_big_int|ge_big_int|ge_num|genarray_of_array1|genarray_of_array2|genarray_of_array3|get|get_all_formatter_output_functions|get_approx_printing|get_copy|get_ellipsis_text|get_error_when_null_denominator|get_floating_precision|get_formatter_output_functions|get_formatter_tag_functions|get_image|get_margin|get_mark_tags|get_max_boxes|get_max_indent|get_method|get_method_label|get_normalize_ratio|get_normalize_ratio_when_printing|get_print_tags|get_state|get_variable|getcwd|getegid|getegid|getenv|getenv|getenv|geteuid|geteuid|getgid|getgid|getgrgid|getgrgid|getgrnam|getgrnam|getgroups|gethostbyaddr|gethostbyname|gethostname|getitimer|getlogin|getpeername|getpid|getppid|getprotobyname|getprotobynumber|getpwnam|getpwuid|getservbyname|getservbyport|getsockname|getsockopt|getsockopt_float|getsockopt_int|getsockopt_optint|gettimeofday|getuid|global_replace|global_substitute|gmtime|green|grid|group_beginning|group_end|gt_big_int|gt_num|guard|handle_unix_error|hash|hash_param|hd|header_size|i|id|ignore|in_channel_length|in_channel_of_descr|incr|incr_num|index|index_from|inet_addr_any|inet_addr_of_string|infinity|infix_tag|init|init_class|input|input_binary_int|input_byte|input_char|input_line|input_value|int|int16_signed|int16_unsigned|int32|int64|int8_signed|int8_unsigned|int_of_big_int|int_of_char|int_of_float|int_of_num|int_of_string|integer_num|inter|interactive|inv|invalid_arg|is_block|is_empty|is_implicit|is_int|is_int_big_int|is_integer_num|is_relative|iter|iter2|iteri|join|junk|key_pressed|kill|kind|kprintf|kscanf|land|last_chars|layout|lazy_from_fun|lazy_from_val|lazy_is_val|lazy_tag|ldexp|le_big_int|le_num|length|lexeme|lexeme_char|lexeme_end|lexeme_end_p|lexeme_start|lexeme_start_p|lineto|link|list|listen|lnot|loadfile|loadfile_private|localtime|lock|lockf|log|log10|logand|lognot|logor|logxor|lor|lower_window|lowercase|lseek|lsl|lsr|lstat|lt_big_int|lt_num|lxor|magenta|magic|mainLoop|major|major_slice|make|make_formatter|make_image|make_lexer|make_matrix|make_self_init|map|map2|map_file|mapi|marshal|match_beginning|match_end|matched_group|matched_string|max|max_array_length|max_big_int|max_elt|max_float|max_int|max_num|max_string_length|mem|mem_assoc|mem_assq|memq|merge|min|min_big_int|min_elt|min_float|min_int|min_num|minor|minus_big_int|minus_num|minus_one|mkdir|mkfifo|mktime|mod|mod_big_int|mod_float|mod_num|modf|mouse_pos|moveto|mul|mult_big_int|mult_int_big_int|mult_num|nan|narrow|nat_of_num|nativeint|neg|neg_infinity|new_block|new_channel|new_method|new_variable|next|nextkey|nice|nice|no_scan_tag|norm|norm2|not|npeek|nth|nth_dim|num_digits_big_int|num_dims|num_of_big_int|num_of_int|num_of_nat|num_of_ratio|num_of_string|O|obj|object_tag|ocaml_version|of_array|of_channel|of_float|of_int|of_int32|of_list|of_nativeint|of_string|one|openTk|open_box|open_connection|open_graph|open_hbox|open_hovbox|open_hvbox|open_in|open_in_bin|open_in_gen|open_out|open_out_bin|open_out_gen|open_process|open_process_full|open_process_in|open_process_out|open_subwindow|open_tag|open_tbox|open_temp_file|open_vbox|opendbm|opendir|openfile|or|os_type|out_channel_length|out_channel_of_descr|output|output_binary_int|output_buffer|output_byte|output_char|output_string|output_value|over_max_boxes|pack|params|parent_dir_name|parse|parse_argv|partition|pause|peek|pipe|pixels|place|plot|plots|point_color|polar|poll|pop|pos_in|pos_out|pow|power_big_int_positive_big_int|power_big_int_positive_int|power_int_positive_big_int|power_int_positive_int|power_num|pp_close_box|pp_close_tag|pp_close_tbox|pp_force_newline|pp_get_all_formatter_output_functions|pp_get_ellipsis_text|pp_get_formatter_output_functions|pp_get_formatter_tag_functions|pp_get_margin|pp_get_mark_tags|pp_get_max_boxes|pp_get_max_indent|pp_get_print_tags|pp_open_box|pp_open_hbox|pp_open_hovbox|pp_open_hvbox|pp_open_tag|pp_open_tbox|pp_open_vbox|pp_over_max_boxes|pp_print_as|pp_print_bool|pp_print_break|pp_print_char|pp_print_cut|pp_print_float|pp_print_flush|pp_print_if_newline|pp_print_int|pp_print_newline|pp_print_space|pp_print_string|pp_print_tab|pp_print_tbreak|pp_set_all_formatter_output_functions|pp_set_ellipsis_text|pp_set_formatter_out_channel|pp_set_formatter_output_functions|pp_set_formatter_tag_functions|pp_set_margin|pp_set_mark_tags|pp_set_max_boxes|pp_set_max_indent|pp_set_print_tags|pp_set_tab|pp_set_tags|pred|pred_big_int|pred_num|prerr_char|prerr_endline|prerr_float|prerr_int|prerr_newline|prerr_string|print|print_as|print_bool|print_break|print_char|print_cut|print_endline|print_float|print_flush|print_if_newline|print_int|print_newline|print_space|print_stat|print_string|print_tab|print_tbreak|printf|prohibit|public_method_label|push|putenv|quo_num|quomod_big_int|quote|raise|raise_window|ratio_of_num|rcontains_from|read|read_float|read_int|read_key|read_line|readdir|readdir|readlink|really_input|receive|recv|recvfrom|red|ref|regexp|regexp_case_fold|regexp_string|regexp_string_case_fold|register|register_exception|rem|remember_mode|remove|remove_assoc|remove_assq|rename|replace|replace_first|replace_matched|repr|reset|reshape|reshape_1|reshape_2|reshape_3|rev|rev_append|rev_map|rev_map2|rewinddir|rgb|rhs_end|rhs_end_pos|rhs_start|rhs_start_pos|rindex|rindex_from|rlineto|rmdir|rmoveto|round_num|run_initializers|run_initializers_opt|scanf|search_backward|search_forward|seek_in|seek_out|select|self|self_init|send|sendto|set|set_all_formatter_output_functions|set_approx_printing|set_binary_mode_in|set_binary_mode_out|set_close_on_exec|set_close_on_exec|set_color|set_ellipsis_text|set_error_when_null_denominator|set_field|set_floating_precision|set_font|set_formatter_out_channel|set_formatter_output_functions|set_formatter_tag_functions|set_line_width|set_margin|set_mark_tags|set_max_boxes|set_max_indent|set_method|set_nonblock|set_nonblock|set_normalize_ratio|set_normalize_ratio_when_printing|set_print_tags|set_signal|set_state|set_tab|set_tag|set_tags|set_text_size|set_window_title|setgid|setgid|setitimer|setitimer|setsid|setsid|setsockopt|setsockopt|setsockopt_float|setsockopt_float|setsockopt_int|setsockopt_int|setsockopt_optint|setsockopt_optint|setuid|setuid|shift_left|shift_left|shift_left|shift_right|shift_right|shift_right|shift_right_logical|shift_right_logical|shift_right_logical|show_buckets|shutdown|shutdown|shutdown_connection|shutdown_connection|sigabrt|sigalrm|sigchld|sigcont|sigfpe|sighup|sigill|sigint|sigkill|sign_big_int|sign_num|signal|signal|sigpending|sigpending|sigpipe|sigprocmask|sigprocmask|sigprof|sigquit|sigsegv|sigstop|sigsuspend|sigsuspend|sigterm|sigtstp|sigttin|sigttou|sigusr1|sigusr2|sigvtalrm|sin|singleton|sinh|size|size|size_x|size_y|sleep|sleep|sleep|slice_left|slice_left|slice_left_1|slice_left_2|slice_right|slice_right|slice_right_1|slice_right_2|snd|socket|socket|socket|socketpair|socketpair|sort|sound|split|split_delim|sprintf|sprintf|sqrt|sqrt|sqrt_big_int|square_big_int|square_num|sscanf|stable_sort|stable_sort|stable_sort|stable_sort|stable_sort|stable_sort|stat|stat|stat|stat|stat|stats|stats|std_formatter|stdbuf|stderr|stderr|stderr|stdib|stdin|stdin|stdin|stdout|stdout|stdout|str_formatter|string|string_after|string_before|string_match|string_of_big_int|string_of_bool|string_of_float|string_of_format|string_of_inet_addr|string_of_inet_addr|string_of_int|string_of_num|string_partial_match|string_tag|sub|sub|sub_big_int|sub_left|sub_num|sub_right|subset|subset|substitute_first|substring|succ|succ|succ|succ|succ_big_int|succ_num|symbol_end|symbol_end_pos|symbol_start|symbol_start_pos|symlink|symlink|sync|synchronize|system|system|system|tag|take|tan|tanh|tcdrain|tcdrain|tcflow|tcflow|tcflush|tcflush|tcgetattr|tcgetattr|tcsendbreak|tcsendbreak|tcsetattr|tcsetattr|temp_file|text_size|time|time|time|timed_read|timed_write|times|times|tl|tl|tl|to_buffer|to_channel|to_float|to_hex|to_int|to_int32|to_list|to_list|to_list|to_nativeint|to_string|to_string|to_string|to_string|to_string|top|top|total_size|transfer|transp|truncate|truncate|truncate|truncate|truncate|truncate|try_lock|umask|umask|uncapitalize|uncapitalize|uncapitalize|union|union|unit_big_int|unlink|unlink|unlock|unmarshal|unsafe_blit|unsafe_fill|unsafe_get|unsafe_get|unsafe_set|unsafe_set|update|uppercase|uppercase|uppercase|uppercase|usage|utimes|utimes|wait|wait|wait|wait|wait_next_event|wait_pid|wait_read|wait_signal|wait_timed_read|wait_timed_write|wait_write|waitpid|white|widen|window_id|word_size|wrap|wrap_abort|write|yellow|yield|zero|zero_big_int|Arg|Arith_status|Array|Array1|Array2|Array3|ArrayLabels|Big_int|Bigarray|Buffer|Callback|CamlinternalOO|Char|Complex|Condition|Dbm|Digest|Dynlink|Event|Filename|Format|Gc|Genarray|Genlex|Graphics|GraphicsX11|Hashtbl|Int32|Int64|LargeFile|Lazy|Lexing|List|ListLabels|Make|Map|Marshal|MoreLabels|Mutex|Nativeint|Num|Obj|Oo|Parsing|Pervasives|Printexc|Printf|Queue|Random|Scanf|Scanning|Set|Sort|Stack|State|StdLabels|Str|Stream|String|StringLabels|Sys|Thread|ThreadUnix|Tk|Unix|UnixLabels|Weak".split("|")),d="(?:(?:[1-9]\\d*)|(?:0))",f="(?:0[oO]?[0-7]+)",g="(?:0[xX][\\dA-Fa-f]+)",h="(?:0[bB][01]+)",i="(?:"+d+"|"+f+"|"+g+"|"+h+")",j="(?:[eE][+-]?\\d+)",k="(?:\\.\\d+)",l="(?:\\d+)",m="(?:(?:"+l+"?"+k+")|(?:"+l+"\\.))",n="(?:(?:"+m+"|"+l+")"+j+")",o="(?:"+n+"|"+m+")";this.$rules={start:[{token:"comment",regex:"\\(\\*.*?\\*\\)\\s*?$"},{token:"comment",merge:!0,regex:"\\(\\*.*",next:"comment"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",regex:"'.'"},{token:"string",merge:!0,regex:'"',next:"qstring"},{token:"constant.numeric",regex:"(?:"+o+"|\\d+)[jJ]\\b"},{token:"constant.numeric",regex:o},{token:"constant.numeric",regex:i+"\\b"},{token:function(d){return a.hasOwnProperty(d)?"keyword":b.hasOwnProperty(d)?"constant.language":c.hasOwnProperty(d)?"support.function":"identifier"},regex:"[a-zA-Z_$][a-zA-Z0-9_$]*\\b"},{token:"keyword.operator",regex:"\\+\\.|\\-\\.|\\*\\.|\\/\\.|#|;;|\\+|\\-|\\*|\\*\\*\\/|\\/\\/|%|<<|>>|&|\\||\\^|~|<|>|<=|=>|==|!=|<>|<-|="},{token:"paren.lparen",regex:"[[({]"},{token:"paren.rparen",regex:"[\\])}]"},{token:"text",regex:"\\s+"}],comment:[{token:"comment",regex:".*?\\*\\)",next:"start"},{token:"comment",merge:!0,regex:".+"}],qstring:[{token:"string",regex:'"',next:"start"},{token:"string",merge:!0,regex:".+"}]}};d.inherits(g,f),b.OcamlHighlightRules=g}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../range").Range,e=function(){};(function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}}).call(e.prototype),b.MatchingBraceOutdent=e})
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-perl-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-perl-uncompressed.js
deleted file mode 100644
index 04796f61ae..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-perl-uncompressed.js
+++ /dev/null
@@ -1,573 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Panagiotis Astithas <pastith AT gmail DOT com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/perl', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/perl_highlight_rules', 'ace/mode/matching_brace_outdent', 'ace/range', 'ace/mode/folding/cstyle'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
-var PerlHighlightRules = require("./perl_highlight_rules").PerlHighlightRules;
-var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
-var Range = require("../range").Range;
-var CStyleFoldMode = require("./folding/cstyle").FoldMode;
-
-var Mode = function() {
-    this.$tokenizer = new Tokenizer(new PerlHighlightRules().getRules());
-    this.$outdent = new MatchingBraceOutdent();
-    this.foldingRules = new CStyleFoldMode();
-};
-oop.inherits(Mode, TextMode);
-
-(function() {
-
-    this.toggleCommentLines = function(state, doc, startRow, endRow) {
-        var outdent = true;
-        var re = /^(\s*)#/;
-
-        for (var i=startRow; i<= endRow; i++) {
-            if (!re.test(doc.getLine(i))) {
-                outdent = false;
-                break;
-            }
-        }
-
-        if (outdent) {
-            var deleteRange = new Range(0, 0, 0, 0);
-            for (var i=startRow; i<= endRow; i++)
-            {
-                var line = doc.getLine(i);
-                var m = line.match(re);
-                deleteRange.start.row = i;
-                deleteRange.end.row = i;
-                deleteRange.end.column = m[0].length;
-                doc.replace(deleteRange, m[1]);
-            }
-        }
-        else {
-            doc.indentRows(startRow, endRow, "#");
-        }
-    };
-
-    this.getNextLineIndent = function(state, line, tab) {
-        var indent = this.$getIndent(line);
-
-        var tokenizedLine = this.$tokenizer.getLineTokens(line, state);
-        var tokens = tokenizedLine.tokens;
-
-        if (tokens.length && tokens[tokens.length-1].type == "comment") {
-            return indent;
-        }
-
-        if (state == "start") {
-            var match = line.match(/^.*[\{\(\[\:]\s*$/);
-            if (match) {
-                indent += tab;
-            }
-        }
-
-        return indent;
-    };
-
-    this.checkOutdent = function(state, line, input) {
-        return this.$outdent.checkOutdent(line, input);
-    };
-
-    this.autoOutdent = function(state, doc, row) {
-        this.$outdent.autoOutdent(doc, row);
-    };
-
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Panagiotis Astithas <pastith AT gmail DOT com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/perl_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var lang = require("../lib/lang");
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var PerlHighlightRules = function() {
-
-    var keywords = lang.arrayToMap(
-        ("base|constant|continue|else|elsif|for|foreach|format|goto|if|last|local|my|next|" +
-         "no|package|parent|redo|require|scalar|sub|unless|until|while|use|vars").split("|")
-    );
-
-    var buildinConstants = lang.arrayToMap(
-        ("ARGV|ENV|INC|SIG").split("|")
-    );
-
-    var builtinFunctions = lang.arrayToMap(
-        ("getprotobynumber|getprotobyname|getservbyname|gethostbyaddr|" +
-         "gethostbyname|getservbyport|getnetbyaddr|getnetbyname|getsockname|" +
-         "getpeername|setpriority|getprotoent|setprotoent|getpriority|" +
-         "endprotoent|getservent|setservent|endservent|sethostent|socketpair|" +
-         "getsockopt|gethostent|endhostent|setsockopt|setnetent|quotemeta|" +
-         "localtime|prototype|getnetent|endnetent|rewinddir|wantarray|getpwuid|" +
-         "closedir|getlogin|readlink|endgrent|getgrgid|getgrnam|shmwrite|" +
-         "shutdown|readline|endpwent|setgrent|readpipe|formline|truncate|" +
-         "dbmclose|syswrite|setpwent|getpwnam|getgrent|getpwent|ucfirst|sysread|" +
-         "setpgrp|shmread|sysseek|sysopen|telldir|defined|opendir|connect|" +
-         "lcfirst|getppid|binmode|syscall|sprintf|getpgrp|readdir|seekdir|" +
-         "waitpid|reverse|unshift|symlink|dbmopen|semget|msgrcv|rename|listen|" +
-         "chroot|msgsnd|shmctl|accept|unpack|exists|fileno|shmget|system|" +
-         "unlink|printf|gmtime|msgctl|semctl|values|rindex|substr|splice|" +
-         "length|msgget|select|socket|return|caller|delete|alarm|ioctl|index|" +
-         "undef|lstat|times|srand|chown|fcntl|close|write|umask|rmdir|study|" +
-         "sleep|chomp|untie|print|utime|mkdir|atan2|split|crypt|flock|chmod|" +
-         "BEGIN|bless|chdir|semop|shift|reset|link|stat|chop|grep|fork|dump|" +
-         "join|open|tell|pipe|exit|glob|warn|each|bind|sort|pack|eval|push|" +
-         "keys|getc|kill|seek|sqrt|send|wait|rand|tied|read|time|exec|recv|" +
-         "eof|chr|int|ord|exp|pos|pop|sin|log|abs|oct|hex|tie|cos|vec|END|ref|" +
-         "map|die|uc|lc|do").split("|")
-    );
-
-    // regexp must not have capturing parentheses. Use (?:) instead.
-    // regexps are ordered -> the first match is used
-
-    this.$rules = {
-        "start" : [
-            {
-                token : "comment",
-                regex : "#.*$"
-            }, {
-                token : "string.regexp",
-                regex : "[/](?:(?:\\[(?:\\\\]|[^\\]])+\\])|(?:\\\\/|[^\\]/]))*[/]\\w*\\s*(?=[).,;]|$)"
-            }, {
-                token : "string", // single line
-                regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
-            }, {
-                token : "string", // multi line string start
-                merge : true,
-                regex : '["].*\\\\$',
-                next : "qqstring"
-            }, {
-                token : "string", // single line
-                regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"
-            }, {
-                token : "string", // multi line string start
-                merge : true,
-                regex : "['].*\\\\$",
-                next : "qstring"
-            }, {
-                token : "constant.numeric", // hex
-                regex : "0x[0-9a-fA-F]+\\b"
-            }, {
-                token : "constant.numeric", // float
-                regex : "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"
-            }, {
-                token : function(value) {
-                    if (keywords.hasOwnProperty(value))
-                        return "keyword";
-                    else if (buildinConstants.hasOwnProperty(value))
-                        return "constant.language";
-                    else if (builtinFunctions.hasOwnProperty(value))
-                        return "support.function";
-                    else
-                        return "identifier";
-                },
-                regex : "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
-            }, {
-                token : "keyword.operator",
-                regex : "\\.\\.\\.|\\|\\|=|>>=|<<=|<=>|&&=|=>|!~|\\^=|&=|\\|=|\\.=|x=|%=|\\/=|\\*=|\\-=|\\+=|=~|\\*\\*|\\-\\-|\\.\\.|\\|\\||&&|\\+\\+|\\->|!=|==|>=|<=|>>|<<|,|=|\\?\\:|\\^|\\||x|%|\\/|\\*|<|&|\\\\|~|!|>|\\.|\\-|\\+|\\-C|\\-b|\\-S|\\-u|\\-t|\\-p|\\-l|\\-d|\\-f|\\-g|\\-s|\\-z|\\-k|\\-e|\\-O|\\-T|\\-B|\\-M|\\-A|\\-X|\\-W|\\-c|\\-R|\\-o|\\-x|\\-w|\\-r|\\b(?:and|cmp|eq|ge|gt|le|lt|ne|not|or|xor)"
-            }, {
-                token : "lparen",
-                regex : "[[({]"
-            }, {
-                token : "rparen",
-                regex : "[\\])}]"
-            }, {
-                token : "text",
-                regex : "\\s+"
-            }
-        ],
-        "qqstring" : [
-            {
-                token : "string",
-                regex : '(?:(?:\\\\.)|(?:[^"\\\\]))*?"',
-                next : "start"
-            }, {
-                token : "string",
-                merge : true,
-                regex : '.+'
-            }
-        ],
-        "qstring" : [
-            {
-                token : "string",
-                regex : "(?:(?:\\\\.)|(?:[^'\\\\]))*?'",
-                next : "start"
-            }, {
-                token : "string",
-                merge : true,
-                regex : '.+'
-            }
-        ]
-    };
-};
-
-oop.inherits(PerlHighlightRules, TextHighlightRules);
-
-exports.PerlHighlightRules = PerlHighlightRules;
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/matching_brace_outdent', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../range").Range;
-
-var MatchingBraceOutdent = function() {};
-
-(function() {
-
-    this.checkOutdent = function(line, input) {
-        if (! /^\s+$/.test(line))
-            return false;
-
-        return /^\s*\}/.test(input);
-    };
-
-    this.autoOutdent = function(doc, row) {
-        var line = doc.getLine(row);
-        var match = line.match(/^(\s*\})/);
-
-        if (!match) return 0;
-
-        var column = match[1].length;
-        var openBracePos = doc.findMatchingBracket({row: row, column: column});
-
-        if (!openBracePos || openBracePos.row == row) return 0;
-
-        var indent = this.$getIndent(doc.getLine(openBracePos.row));
-        doc.replace(new Range(row, 0, row, column-1), indent);
-    };
-
-    this.$getIndent = function(line) {
-        var match = line.match(/^(\s+)/);
-        if (match) {
-            return match[1];
-        }
-
-        return "";
-    };
-
-}).call(MatchingBraceOutdent.prototype);
-
-exports.MatchingBraceOutdent = MatchingBraceOutdent;
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/folding/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/range', 'ace/mode/folding/fold_mode'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var Range = require("../../range").Range;
-var BaseFoldMode = require("./fold_mode").FoldMode;
-
-var FoldMode = exports.FoldMode = function() {};
-oop.inherits(FoldMode, BaseFoldMode);
-
-(function() {
-
-    this.foldingStartMarker = /(\{|\[)[^\}\]]*$|^\s*(\/\*)/;
-    this.foldingStopMarker = /^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/;
-    
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        var line = session.getLine(row);
-        var match = line.match(this.foldingStartMarker);
-        if (match) {
-            var i = match.index;
-
-            if (match[1])
-                return this.openingBracketBlock(session, match[1], row, i);
-
-            var range = session.getCommentFoldRange(row, i + match[0].length);
-            range.end.column -= 2;
-            return range;
-        }
-
-        if (foldStyle !== "markbeginend")
-            return;
-            
-        var match = line.match(this.foldingStopMarker);
-        if (match) {
-            var i = match.index + match[0].length;
-
-            if (match[2]) {
-                var range = session.getCommentFoldRange(row, i);
-                range.end.column -= 2;
-                return range;
-            }
-
-            var end = {row: row, column: i};
-            var start = session.$findOpeningBracket(match[1], end);
-            
-            if (!start)
-                return;
-
-            start.column++;
-            end.column--;
-
-            return  Range.fromPoints(start, end);
-        }
-    };
-    
-}).call(FoldMode.prototype);
-
-});/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/folding/fold_mode', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../../range").Range;
-
-var FoldMode = exports.FoldMode = function() {};
-
-(function() {
-
-    this.foldingStartMarker = null;
-    this.foldingStopMarker = null;
-
-    // must return "" if there's no fold, to enable caching
-    this.getFoldWidget = function(session, foldStyle, row) {
-        var line = session.getLine(row);
-        if (this.foldingStartMarker.test(line))
-            return "start";
-        if (foldStyle == "markbeginend"
-                && this.foldingStopMarker
-                && this.foldingStopMarker.test(line))
-            return "end";
-        return "";
-    };
-    
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        return null;
-    };
-
-    this.indentationBlock = function(session, row, column) {
-        var re = /^\s*/;
-        var startRow = row;
-        var endRow = row;
-        var line = session.getLine(row);
-        var startColumn = column || line.length;
-        var startLevel = line.match(re)[0].length;
-        var maxRow = session.getLength()
-        
-        while (++row < maxRow) {
-            line = session.getLine(row);
-            var level = line.match(re)[0].length;
-
-            if (level == line.length)
-                continue;
-
-            if (level <= startLevel)
-                break;
-
-            endRow = row;
-        }
-
-        if (endRow > startRow) {
-            var endColumn = session.getLine(endRow).length;
-            return new Range(startRow, startColumn, endRow, endColumn);
-        }
-    };
-
-    this.openingBracketBlock = function(session, bracket, row, column) {
-        var start = {row: row, column: column + 1};
-        var end = session.$findClosingBracket(bracket, start);
-        if (!end)
-            return;
-
-        var fw = session.foldWidgets[end.row];
-        if (fw == null)
-            fw = this.getFoldWidget(session, end.row);
-
-        if (fw == "start") {
-            end.row --;
-            end.column = session.getLine(end.row).length;
-        }
-        return Range.fromPoints(start, end);
-    };
-
-}).call(FoldMode.prototype);
-
-});
diff --git a/apps/files_texteditor/js/aceeditor/mode-perl.js b/apps/files_texteditor/js/aceeditor/mode-perl.js
deleted file mode 100644
index 909781418b..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-perl.js
+++ /dev/null
@@ -1 +0,0 @@
-define("ace/mode/perl",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/perl_highlight_rules","ace/mode/matching_brace_outdent","ace/range","ace/mode/folding/cstyle"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./perl_highlight_rules").PerlHighlightRules,h=a("./matching_brace_outdent").MatchingBraceOutdent,i=a("../range").Range,j=a("./folding/cstyle").FoldMode,k=function(){this.$tokenizer=new f((new g).getRules()),this.$outdent=new h,this.foldingRules=new j};d.inherits(k,e),function(){this.toggleCommentLines=function(a,b,c,d){var e=!0,f=/^(\s*)#/;for(var g=c;g<=d;g++)if(!f.test(b.getLine(g))){e=!1;break}if(e){var h=new i(0,0,0,0);for(var g=c;g<=d;g++){var j=b.getLine(g),k=j.match(f);h.start.row=g,h.end.row=g,h.end.column=k[0].length,b.replace(h,k[1])}}else b.indentRows(c,d,"#")},this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a),f=e.tokens;if(f.length&&f[f.length-1].type=="comment")return d;if(a=="start"){var g=b.match(/^.*[\{\(\[\:]\s*$/);g&&(d+=c)}return d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)}}.call(k.prototype),b.Mode=k}),define("ace/mode/perl_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("./text_highlight_rules").TextHighlightRules,g=function(){var a=e.arrayToMap("base|constant|continue|else|elsif|for|foreach|format|goto|if|last|local|my|next|no|package|parent|redo|require|scalar|sub|unless|until|while|use|vars".split("|")),b=e.arrayToMap("ARGV|ENV|INC|SIG".split("|")),c=e.arrayToMap("getprotobynumber|getprotobyname|getservbyname|gethostbyaddr|gethostbyname|getservbyport|getnetbyaddr|getnetbyname|getsockname|getpeername|setpriority|getprotoent|setprotoent|getpriority|endprotoent|getservent|setservent|endservent|sethostent|socketpair|getsockopt|gethostent|endhostent|setsockopt|setnetent|quotemeta|localtime|prototype|getnetent|endnetent|rewinddir|wantarray|getpwuid|closedir|getlogin|readlink|endgrent|getgrgid|getgrnam|shmwrite|shutdown|readline|endpwent|setgrent|readpipe|formline|truncate|dbmclose|syswrite|setpwent|getpwnam|getgrent|getpwent|ucfirst|sysread|setpgrp|shmread|sysseek|sysopen|telldir|defined|opendir|connect|lcfirst|getppid|binmode|syscall|sprintf|getpgrp|readdir|seekdir|waitpid|reverse|unshift|symlink|dbmopen|semget|msgrcv|rename|listen|chroot|msgsnd|shmctl|accept|unpack|exists|fileno|shmget|system|unlink|printf|gmtime|msgctl|semctl|values|rindex|substr|splice|length|msgget|select|socket|return|caller|delete|alarm|ioctl|index|undef|lstat|times|srand|chown|fcntl|close|write|umask|rmdir|study|sleep|chomp|untie|print|utime|mkdir|atan2|split|crypt|flock|chmod|BEGIN|bless|chdir|semop|shift|reset|link|stat|chop|grep|fork|dump|join|open|tell|pipe|exit|glob|warn|each|bind|sort|pack|eval|push|keys|getc|kill|seek|sqrt|send|wait|rand|tied|read|time|exec|recv|eof|chr|int|ord|exp|pos|pop|sin|log|abs|oct|hex|tie|cos|vec|END|ref|map|die|uc|lc|do".split("|"));this.$rules={start:[{token:"comment",regex:"#.*$"},{token:"string.regexp",regex:"[/](?:(?:\\[(?:\\\\]|[^\\]])+\\])|(?:\\\\/|[^\\]/]))*[/]\\w*\\s*(?=[).,;]|$)"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",merge:!0,regex:'["].*\\\\$',next:"qqstring"},{token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:"string",merge:!0,regex:"['].*\\\\$",next:"qstring"},{token:"constant.numeric",regex:"0x[0-9a-fA-F]+\\b"},{token:"constant.numeric",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:function(d){return a.hasOwnProperty(d)?"keyword":b.hasOwnProperty(d)?"constant.language":c.hasOwnProperty(d)?"support.function":"identifier"},regex:"[a-zA-Z_$][a-zA-Z0-9_$]*\\b"},{token:"keyword.operator",regex:"\\.\\.\\.|\\|\\|=|>>=|<<=|<=>|&&=|=>|!~|\\^=|&=|\\|=|\\.=|x=|%=|\\/=|\\*=|\\-=|\\+=|=~|\\*\\*|\\-\\-|\\.\\.|\\|\\||&&|\\+\\+|\\->|!=|==|>=|<=|>>|<<|,|=|\\?\\:|\\^|\\||x|%|\\/|\\*|<|&|\\\\|~|!|>|\\.|\\-|\\+|\\-C|\\-b|\\-S|\\-u|\\-t|\\-p|\\-l|\\-d|\\-f|\\-g|\\-s|\\-z|\\-k|\\-e|\\-O|\\-T|\\-B|\\-M|\\-A|\\-X|\\-W|\\-c|\\-R|\\-o|\\-x|\\-w|\\-r|\\b(?:and|cmp|eq|ge|gt|le|lt|ne|not|or|xor)"},{token:"lparen",regex:"[[({]"},{token:"rparen",regex:"[\\])}]"},{token:"text",regex:"\\s+"}],qqstring:[{token:"string",regex:'(?:(?:\\\\.)|(?:[^"\\\\]))*?"',next:"start"},{token:"string",merge:!0,regex:".+"}],qstring:[{token:"string",regex:"(?:(?:\\\\.)|(?:[^'\\\\]))*?'",next:"start"},{token:"string",merge:!0,regex:".+"}]}};d.inherits(g,f),b.PerlHighlightRules=g}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../range").Range,e=function(){};(function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}}).call(e.prototype),b.MatchingBraceOutdent=e}),define("ace/mode/folding/cstyle",["require","exports","module","ace/lib/oop","ace/range","ace/mode/folding/fold_mode"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../../range").Range,f=a("./fold_mode").FoldMode,g=b.FoldMode=function(){};d.inherits(g,f),function(){this.foldingStartMarker=/(\{|\[)[^\}\]]*$|^\s*(\/\*)/,this.foldingStopMarker=/^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/,this.getFoldWidgetRange=function(a,b,c){var d=a.getLine(c),f=d.match(this.foldingStartMarker);if(f){var g=f.index;if(f[1])return this.openingBracketBlock(a,f[1],c,g);var h=a.getCommentFoldRange(c,g+f[0].length);return h.end.column-=2,h}if(b!=="markbeginend")return;var f=d.match(this.foldingStopMarker);if(f){var g=f.index+f[0].length;if(f[2]){var h=a.getCommentFoldRange(c,g);return h.end.column-=2,h}var i={row:c,column:g},j=a.$findOpeningBracket(f[1],i);if(!j)return;return j.column++,i.column--,e.fromPoints(j,i)}}}.call(g.prototype)}),define("ace/mode/folding/fold_mode",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../../range").Range,e=b.FoldMode=function(){};(function(){this.foldingStartMarker=null,this.foldingStopMarker=null,this.getFoldWidget=function(a,b,c){var d=a.getLine(c);return this.foldingStartMarker.test(d)?"start":b=="markbeginend"&&this.foldingStopMarker&&this.foldingStopMarker.test(d)?"end":""},this.getFoldWidgetRange=function(a,b,c){return null},this.indentationBlock=function(a,b,c){var e=/^\s*/,f=b,g=b,h=a.getLine(b),i=c||h.length,j=h.match(e)[0].length,k=a.getLength();while(++b<k){h=a.getLine(b);var l=h.match(e)[0].length;if(l==h.length)continue;if(l<=j)break;g=b}if(g>f){var m=a.getLine(g).length;return new d(f,i,g,m)}},this.openingBracketBlock=function(a,b,c,e){var f={row:c,column:e+1},g=a.$findClosingBracket(b,f);if(!g)return;var h=a.foldWidgets[g.row];return h==null&&(h=this.getFoldWidget(a,g.row)),h=="start"&&(g.row--,g.column=a.getLine(g.row).length),d.fromPoints(f,g)}}).call(e.prototype)})
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-pgsql-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-pgsql-uncompressed.js
deleted file mode 100644
index 344647c792..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-pgsql-uncompressed.js
+++ /dev/null
@@ -1,1107 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
-* The Original Code is Ajax.org Code Editor (ACE).
-*
-* Contributor(s):
-*      Jonathan Camile <jonathan.camile AT gmail DOT com>
-*
-* Alternatively, the contents of this file may be used under the terms of
-* either the GNU General Public License Version 2 or later (the "GPL"), or
-* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-* in which case the provisions of the GPL or the LGPL are applicable instead
-* of those above. If you wish to allow use of your version of this file only
-* under the terms of either the GPL or the LGPL, and not to allow others to
-* use your version of this file under the terms of the MPL, indicate your
-* decision by deleting the provisions above and replace them with the notice
-* and other provisions required by the GPL or the LGPL. If you do not delete
-* the provisions above, a recipient may use your version of this file under
-* the terms of any one of the MPL, the GPL or the LGPL.
-*
-* ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/pgsql', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/pgsql_highlight_rules', 'ace/range'], function(require, exports, module) {
-
-    var oop = require("ace/lib/oop");
-    var TextMode = require("ace/mode/text").Mode;
-    var Tokenizer = require("ace/tokenizer").Tokenizer;
-    var PgsqlHighlightRules = require("ace/mode/pgsql_highlight_rules").PgsqlHighlightRules;
-    var Range = require("ace/range").Range;
-    // var EditSession = require("ace/edit_session").EditSession;
-
-    var Mode = function() {
-        this.$tokenizer = new Tokenizer(new PgsqlHighlightRules().getRules());
-    };
-    oop.inherits(Mode, TextMode);
-
-    (function() {
-
-        this.toggleCommentLines = function(state, doc, startRow, endRow) {
-            var outdent = true;
-            // var outentedRows = [];
-            var re = /^(\s*)--/;
-
-            for (var i=startRow; i<= endRow; i++) {
-                if (!re.test(doc.getLine(i))) {
-                    outdent = false;
-                    break;
-                }
-            }
-
-            if (outdent) {
-                var deleteRange = new Range(0, 0, 0, 0);
-                for (var i=startRow; i<= endRow; i++)
-                {
-                    var line = doc.getLine(i);
-                    var m = line.match(re);
-                    deleteRange.start.row = i;
-                    deleteRange.end.row = i;
-                    deleteRange.end.column = m[0].length;
-                    doc.replace(deleteRange, m[1]);
-                }
-            }
-            else {
-                doc.indentRows(startRow, endRow, "--");
-            }
-        };
-
-
-        this.getNextLineIndent = function(state, line, tab) { 
-            if (state == "start" || state == "keyword.statementEnd") {
-                return "";
-            } else {
-                return this.$getIndent(line); // Keep whatever indent the previous line has
-            }
-        }
-
-    }).call(Mode.prototype);
-
-    exports.Mode = Mode;
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * Contributor(s):
- *      John DeSoi, Ph.D. <desoi AT pgedit DOT com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK *****
- *
- */
-
-
-define('ace/mode/pgsql_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/mode/doc_comment_highlight_rules', 'ace/mode/text_highlight_rules', 'ace/mode/perl_highlight_rules', 'ace/mode/python_highlight_rules'], function(require, exports, module) {
-
-var oop = require("ace/lib/oop");
-var lang = require("ace/lib/lang");
-var DocCommentHighlightRules = require("./doc_comment_highlight_rules").DocCommentHighlightRules;
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-// Supporting perl and python for now -- both in pg core and ace
-var PerlHighlightRules = require("./perl_highlight_rules").PerlHighlightRules;
-var PythonHighlightRules = require("./python_highlight_rules").PythonHighlightRules;
-
-var PgsqlHighlightRules = function() {
-    
-    // Keywords, functions, operators last updated for pg 9.1.
-    var keywords = lang.arrayToMap(
-        ("abort|absolute|abstime|access|aclitem|action|add|admin|after|aggregate|all|also|alter|always|" +
-        "analyse|analyze|and|any|anyarray|anyelement|anyenum|anynonarray|array|as|asc|assertion|" +
-        "assignment|asymmetric|at|attribute|authorization|backward|before|begin|between|bigint|" +
-        "binary|bit|bool|boolean|both|box|bpchar|by|bytea|cache|called|cascade|cascaded|case|cast|" +
-        "catalog|chain|char|character|characteristics|check|checkpoint|cid|cidr|circle|class|close|" +
-        "cluster|coalesce|collate|collation|column|comment|comments|commit|committed|concurrently|" +
-        "configuration|connection|constraint|constraints|content|continue|conversion|copy|cost|" +
-        "create|cross|cstring|csv|current|current_catalog|current_date|current_role|" +
-        "current_schema|current_time|current_timestamp|current_user|cursor|cycle|data|database|" +
-        "date|day|deallocate|dec|decimal|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|enum|escape|except|exclude|excluding|exclusive|" +
-        "execute|exists|explain|extension|external|extract|false|family|fdw_handler|fetch|first|" +
-        "float|float4|float8|following|for|force|foreign|forward|freeze|from|full|function|functions|" +
-        "global|grant|granted|greatest|group|gtsvector|handler|having|header|hold|hour|identity|if|" +
-        "ilike|immediate|immutable|implicit|in|including|increment|index|indexes|inet|inherit|" +
-        "inherits|initially|inline|inner|inout|input|insensitive|insert|instead|int|int2|int2vector|" +
-        "int4|int8|integer|internal|intersect|interval|into|invoker|is|isnull|isolation|join|key|label|" +
-        "language|language_handler|large|last|lc_collate|lc_ctype|leading|least|left|level|like|" +
-        "limit|line|listen|load|local|localtime|localtimestamp|location|lock|lseg|macaddr|mapping|" +
-        "match|maxvalue|minute|minvalue|mode|money|month|move|name|names|national|natural|nchar|next|no|" +
-        "none|not|nothing|notify|notnull|nowait|null|nullif|nulls|numeric|object|of|off|offset|oid|oids|" +
-        "oidvector|on|only|opaque|operator|option|options|or|order|out|outer|over|overlaps|overlay|" +
-        "owned|owner|parser|partial|partition|passing|password|path|pg_attribute|pg_auth_members|" +
-        "pg_authid|pg_class|pg_database|pg_node_tree|pg_proc|pg_type|placing|plans|point|polygon|" +
-        "position|preceding|precision|prepare|prepared|preserve|primary|prior|privileges|" +
-        "procedural|procedure|quote|range|read|real|reassign|recheck|record|recursive|ref|refcursor|" +
-        "references|regclass|regconfig|regdictionary|regoper|regoperator|regproc|regprocedure|" +
-        "regtype|reindex|relative|release|reltime|rename|repeatable|replace|replica|reset|restart|" +
-        "restrict|returning|returns|revoke|right|role|rollback|row|rows|rule|savepoint|schema|scroll|" +
-        "search|second|security|select|sequence|sequences|serializable|server|session|session_user|" +
-        "set|setof|share|show|similar|simple|smallint|smgr|some|stable|standalone|start|statement|" +
-        "statistics|stdin|stdout|storage|strict|strip|substring|symmetric|sysid|system|table|tables|" +
-        "tablespace|temp|template|temporary|text|then|tid|time|timestamp|timestamptz|timetz|" +
-        "tinterval|to|trailing|transaction|treat|trigger|trim|true|truncate|trusted|tsquery|tsvector|" +
-        "txid_snapshot|type|unbounded|uncommitted|unencrypted|union|unique|unknown|unlisten|" +
-        "unlogged|until|update|user|using|uuid|vacuum|valid|validate|validator|value|values|varbit|" +
-        "varchar|variadic|varying|verbose|version|view|void|volatile|when|where|whitespace|window|" +
-        "with|without|work|wrapper|write|xid|xml|xmlattributes|xmlconcat|xmlelement|xmlexists|" +
-        "xmlforest|xmlparse|xmlpi|xmlroot|xmlserialize|year|yes|zone").split("|")
-    );
-    
-    
-    var builtinFunctions = lang.arrayToMap(
-        ("RI_FKey_cascade_del|RI_FKey_cascade_upd|RI_FKey_check_ins|RI_FKey_check_upd|" +
-        "RI_FKey_noaction_del|RI_FKey_noaction_upd|RI_FKey_restrict_del|RI_FKey_restrict_upd|" +
-        "RI_FKey_setdefault_del|RI_FKey_setdefault_upd|RI_FKey_setnull_del|" +
-        "RI_FKey_setnull_upd|abbrev|abs|abstime|abstimeeq|abstimege|abstimegt|abstimein|abstimele|" +
-        "abstimelt|abstimene|abstimeout|abstimerecv|abstimesend|aclcontains|aclexplode|aclinsert|" +
-        "aclitemeq|aclitemin|aclitemout|aclremove|acos|age|any_in|any_out|anyarray_in|anyarray_out|" +
-        "anyarray_recv|anyarray_send|anyelement_in|anyelement_out|anyenum_in|anyenum_out|" +
-        "anynonarray_in|anynonarray_out|anytextcat|area|areajoinsel|areasel|array_agg|" +
-        "array_agg_finalfn|array_agg_transfn|array_append|array_cat|array_dims|array_eq|" +
-        "array_fill|array_ge|array_gt|array_in|array_larger|array_le|array_length|array_lower|" +
-        "array_lt|array_ndims|array_ne|array_out|array_prepend|array_recv|array_send|" +
-        "array_smaller|array_to_string|array_upper|arraycontained|arraycontains|arrayoverlap|" +
-        "ascii|ascii_to_mic|ascii_to_utf8|asin|atan|atan2|avg|big5_to_euc_tw|big5_to_mic|" +
-        "big5_to_utf8|bit_and|bit_in|bit_length|bit_or|bit_out|bit_recv|bit_send|bitand|bitcat|" +
-        "bitcmp|biteq|bitge|bitgt|bitle|bitlt|bitne|bitnot|bitor|bitshiftleft|bitshiftright|" +
-        "bittypmodin|bittypmodout|bitxor|bool|bool_and|bool_or|booland_statefunc|booleq|boolge|" +
-        "boolgt|boolin|boolle|boollt|boolne|boolor_statefunc|boolout|boolrecv|boolsend|box|" +
-        "box_above|box_above_eq|box_add|box_below|box_below_eq|box_center|box_contain|" +
-        "box_contain_pt|box_contained|box_distance|box_div|box_eq|box_ge|box_gt|box_in|" +
-        "box_intersect|box_le|box_left|box_lt|box_mul|box_out|box_overabove|box_overbelow|" +
-        "box_overlap|box_overleft|box_overright|box_recv|box_right|box_same|box_send|box_sub|" +
-        "bpchar_larger|bpchar_pattern_ge|bpchar_pattern_gt|bpchar_pattern_le|" +
-        "bpchar_pattern_lt|bpchar_smaller|bpcharcmp|bpchareq|bpcharge|bpchargt|bpchariclike|" +
-        "bpcharicnlike|bpcharicregexeq|bpcharicregexne|bpcharin|bpcharle|bpcharlike|bpcharlt|" +
-        "bpcharne|bpcharnlike|bpcharout|bpcharrecv|bpcharregexeq|bpcharregexne|bpcharsend|" +
-        "bpchartypmodin|bpchartypmodout|broadcast|btabstimecmp|btarraycmp|btbeginscan|btboolcmp|" +
-        "btbpchar_pattern_cmp|btbuild|btbuildempty|btbulkdelete|btcharcmp|btcostestimate|" +
-        "btendscan|btfloat48cmp|btfloat4cmp|btfloat84cmp|btfloat8cmp|btgetbitmap|btgettuple|" +
-        "btinsert|btint24cmp|btint28cmp|btint2cmp|btint42cmp|btint48cmp|btint4cmp|btint82cmp|" +
-        "btint84cmp|btint8cmp|btmarkpos|btnamecmp|btoidcmp|btoidvectorcmp|btoptions|btrecordcmp|" +
-        "btreltimecmp|btrescan|btrestrpos|btrim|bttext_pattern_cmp|bttextcmp|bttidcmp|" +
-        "bttintervalcmp|btvacuumcleanup|byteacat|byteacmp|byteaeq|byteage|byteagt|byteain|byteale|" +
-        "bytealike|bytealt|byteane|byteanlike|byteaout|bytearecv|byteasend|cash_cmp|cash_div_cash|" +
-        "cash_div_flt4|cash_div_flt8|cash_div_int2|cash_div_int4|cash_eq|cash_ge|cash_gt|cash_in|" +
-        "cash_le|cash_lt|cash_mi|cash_mul_flt4|cash_mul_flt8|cash_mul_int2|cash_mul_int4|cash_ne|" +
-        "cash_out|cash_pl|cash_recv|cash_send|cash_words|cashlarger|cashsmaller|cbrt|ceil|ceiling|" +
-        "center|char|char_length|character_length|chareq|charge|chargt|charin|charle|charlt|charne|" +
-        "charout|charrecv|charsend|chr|cideq|cidin|cidout|cidr|cidr_in|cidr_out|cidr_recv|cidr_send|" +
-        "cidrecv|cidsend|circle|circle_above|circle_add_pt|circle_below|circle_center|" +
-        "circle_contain|circle_contain_pt|circle_contained|circle_distance|circle_div_pt|" +
-        "circle_eq|circle_ge|circle_gt|circle_in|circle_le|circle_left|circle_lt|circle_mul_pt|" +
-        "circle_ne|circle_out|circle_overabove|circle_overbelow|circle_overlap|circle_overleft|" +
-        "circle_overright|circle_recv|circle_right|circle_same|circle_send|circle_sub_pt|" +
-        "clock_timestamp|close_lb|close_ls|close_lseg|close_pb|close_pl|close_ps|close_sb|" +
-        "close_sl|col_description|concat|concat_ws|contjoinsel|contsel|convert|convert_from|" +
-        "convert_to|corr|cos|cot|count|covar_pop|covar_samp|cstring_in|cstring_out|cstring_recv|" +
-        "cstring_send|cume_dist|current_database|current_query|current_schema|current_schemas|" +
-        "current_setting|current_user|currtid|currtid2|currval|cursor_to_xml|" +
-        "cursor_to_xmlschema|database_to_xml|database_to_xml_and_xmlschema|" +
-        "database_to_xmlschema|date|date_cmp|date_cmp_timestamp|date_cmp_timestamptz|date_eq|" +
-        "date_eq_timestamp|date_eq_timestamptz|date_ge|date_ge_timestamp|date_ge_timestamptz|" +
-        "date_gt|date_gt_timestamp|date_gt_timestamptz|date_in|date_larger|date_le|" +
-        "date_le_timestamp|date_le_timestamptz|date_lt|date_lt_timestamp|date_lt_timestamptz|" +
-        "date_mi|date_mi_interval|date_mii|date_ne|date_ne_timestamp|date_ne_timestamptz|" +
-        "date_out|date_part|date_pl_interval|date_pli|date_recv|date_send|date_smaller|" +
-        "date_trunc|datetime_pl|datetimetz_pl|dcbrt|decode|degrees|dense_rank|dexp|diagonal|" +
-        "diameter|dispell_init|dispell_lexize|dist_cpoly|dist_lb|dist_pb|dist_pc|dist_pl|" +
-        "dist_ppath|dist_ps|dist_sb|dist_sl|div|dlog1|dlog10|domain_in|domain_recv|dpow|dround|" +
-        "dsimple_init|dsimple_lexize|dsnowball_init|dsnowball_lexize|dsqrt|dsynonym_init|" +
-        "dsynonym_lexize|dtrunc|encode|enum_cmp|enum_eq|enum_first|enum_ge|enum_gt|enum_in|" +
-        "enum_larger|enum_last|enum_le|enum_lt|enum_ne|enum_out|enum_range|enum_recv|enum_send|" +
-        "enum_smaller|eqjoinsel|eqsel|euc_cn_to_mic|euc_cn_to_utf8|" +
-        "euc_jis_2004_to_shift_jis_2004|euc_jis_2004_to_utf8|euc_jp_to_mic|euc_jp_to_sjis|" +
-        "euc_jp_to_utf8|euc_kr_to_mic|euc_kr_to_utf8|euc_tw_to_big5|euc_tw_to_mic|" +
-        "euc_tw_to_utf8|every|exp|factorial|family|fdw_handler_in|fdw_handler_out|first_value|" +
-        "float4|float48div|float48eq|float48ge|float48gt|float48le|float48lt|float48mi|float48mul|" +
-        "float48ne|float48pl|float4_accum|float4abs|float4div|float4eq|float4ge|float4gt|float4in|" +
-        "float4larger|float4le|float4lt|float4mi|float4mul|float4ne|float4out|float4pl|float4recv|" +
-        "float4send|float4smaller|float4um|float4up|float8|float84div|float84eq|float84ge|" +
-        "float84gt|float84le|float84lt|float84mi|float84mul|float84ne|float84pl|float8_accum|" +
-        "float8_avg|float8_corr|float8_covar_pop|float8_covar_samp|float8_regr_accum|" +
-        "float8_regr_avgx|float8_regr_avgy|float8_regr_intercept|float8_regr_r2|" +
-        "float8_regr_slope|float8_regr_sxx|float8_regr_sxy|float8_regr_syy|float8_stddev_pop|" +
-        "float8_stddev_samp|float8_var_pop|float8_var_samp|float8abs|float8div|float8eq|" +
-        "float8ge|float8gt|float8in|float8larger|float8le|float8lt|float8mi|float8mul|float8ne|" +
-        "float8out|float8pl|float8recv|float8send|float8smaller|float8um|float8up|floor|" +
-        "flt4_mul_cash|flt8_mul_cash|fmgr_c_validator|fmgr_internal_validator|" +
-        "fmgr_sql_validator|format|format_type|gb18030_to_utf8|gbk_to_utf8|generate_series|" +
-        "generate_subscripts|get_bit|get_byte|get_current_ts_config|getdatabaseencoding|" +
-        "getpgusername|gin_cmp_prefix|gin_cmp_tslexeme|gin_extract_tsquery|" +
-        "gin_extract_tsvector|gin_tsquery_consistent|ginarrayconsistent|ginarrayextract|" +
-        "ginbeginscan|ginbuild|ginbuildempty|ginbulkdelete|gincostestimate|ginendscan|" +
-        "gingetbitmap|gininsert|ginmarkpos|ginoptions|ginqueryarrayextract|ginrescan|" +
-        "ginrestrpos|ginvacuumcleanup|gist_box_compress|gist_box_consistent|" +
-        "gist_box_decompress|gist_box_penalty|gist_box_picksplit|gist_box_same|gist_box_union|" +
-        "gist_circle_compress|gist_circle_consistent|gist_point_compress|" +
-        "gist_point_consistent|gist_point_distance|gist_poly_compress|gist_poly_consistent|" +
-        "gistbeginscan|gistbuild|gistbuildempty|gistbulkdelete|gistcostestimate|gistendscan|" +
-        "gistgetbitmap|gistgettuple|gistinsert|gistmarkpos|gistoptions|gistrescan|gistrestrpos|" +
-        "gistvacuumcleanup|gtsquery_compress|gtsquery_consistent|gtsquery_decompress|" +
-        "gtsquery_penalty|gtsquery_picksplit|gtsquery_same|gtsquery_union|gtsvector_compress|" +
-        "gtsvector_consistent|gtsvector_decompress|gtsvector_penalty|gtsvector_picksplit|" +
-        "gtsvector_same|gtsvector_union|gtsvectorin|gtsvectorout|has_any_column_privilege|" +
-        "has_column_privilege|has_database_privilege|has_foreign_data_wrapper_privilege|" +
-        "has_function_privilege|has_language_privilege|has_schema_privilege|" +
-        "has_sequence_privilege|has_server_privilege|has_table_privilege|" +
-        "has_tablespace_privilege|hash_aclitem|hash_array|hash_numeric|hashbeginscan|" +
-        "hashbpchar|hashbuild|hashbuildempty|hashbulkdelete|hashchar|hashcostestimate|" +
-        "hashendscan|hashenum|hashfloat4|hashfloat8|hashgetbitmap|hashgettuple|hashinet|" +
-        "hashinsert|hashint2|hashint2vector|hashint4|hashint8|hashmacaddr|hashmarkpos|hashname|" +
-        "hashoid|hashoidvector|hashoptions|hashrescan|hashrestrpos|hashtext|hashvacuumcleanup|" +
-        "hashvarlena|height|host|hostmask|iclikejoinsel|iclikesel|icnlikejoinsel|icnlikesel|" +
-        "icregexeqjoinsel|icregexeqsel|icregexnejoinsel|icregexnesel|inet_client_addr|" +
-        "inet_client_port|inet_in|inet_out|inet_recv|inet_send|inet_server_addr|" +
-        "inet_server_port|inetand|inetmi|inetmi_int8|inetnot|inetor|inetpl|initcap|int2|int24div|" +
-        "int24eq|int24ge|int24gt|int24le|int24lt|int24mi|int24mul|int24ne|int24pl|int28div|int28eq|" +
-        "int28ge|int28gt|int28le|int28lt|int28mi|int28mul|int28ne|int28pl|int2_accum|" +
-        "int2_avg_accum|int2_mul_cash|int2_sum|int2abs|int2and|int2div|int2eq|int2ge|int2gt|int2in|" +
-        "int2larger|int2le|int2lt|int2mi|int2mod|int2mul|int2ne|int2not|int2or|int2out|int2pl|" +
-        "int2recv|int2send|int2shl|int2shr|int2smaller|int2um|int2up|int2vectoreq|int2vectorin|" +
-        "int2vectorout|int2vectorrecv|int2vectorsend|int2xor|int4|int42div|int42eq|int42ge|" +
-        "int42gt|int42le|int42lt|int42mi|int42mul|int42ne|int42pl|int48div|int48eq|int48ge|int48gt|" +
-        "int48le|int48lt|int48mi|int48mul|int48ne|int48pl|int4_accum|int4_avg_accum|int4_mul_cash|" +
-        "int4_sum|int4abs|int4and|int4div|int4eq|int4ge|int4gt|int4in|int4inc|int4larger|int4le|" +
-        "int4lt|int4mi|int4mod|int4mul|int4ne|int4not|int4or|int4out|int4pl|int4recv|int4send|" +
-        "int4shl|int4shr|int4smaller|int4um|int4up|int4xor|int8|int82div|int82eq|int82ge|int82gt|" +
-        "int82le|int82lt|int82mi|int82mul|int82ne|int82pl|int84div|int84eq|int84ge|int84gt|int84le|" +
-        "int84lt|int84mi|int84mul|int84ne|int84pl|int8_accum|int8_avg|int8_avg_accum|int8_sum|" +
-        "int8abs|int8and|int8div|int8eq|int8ge|int8gt|int8in|int8inc|int8inc_any|" +
-        "int8inc_float8_float8|int8larger|int8le|int8lt|int8mi|int8mod|int8mul|int8ne|int8not|" +
-        "int8or|int8out|int8pl|int8pl_inet|int8recv|int8send|int8shl|int8shr|int8smaller|int8um|" +
-        "int8up|int8xor|integer_pl_date|inter_lb|inter_sb|inter_sl|internal_in|internal_out|" +
-        "interval_accum|interval_avg|interval_cmp|interval_div|interval_eq|interval_ge|" +
-        "interval_gt|interval_hash|interval_in|interval_larger|interval_le|interval_lt|" +
-        "interval_mi|interval_mul|interval_ne|interval_out|interval_pl|interval_pl_date|" +
-        "interval_pl_time|interval_pl_timestamp|interval_pl_timestamptz|interval_pl_timetz|" +
-        "interval_recv|interval_send|interval_smaller|interval_um|intervaltypmodin|" +
-        "intervaltypmodout|intinterval|isclosed|isfinite|ishorizontal|iso8859_1_to_utf8|" +
-        "iso8859_to_utf8|iso_to_koi8r|iso_to_mic|iso_to_win1251|iso_to_win866|isopen|isparallel|" +
-        "isperp|isvertical|johab_to_utf8|justify_days|justify_hours|justify_interval|" +
-        "koi8r_to_iso|koi8r_to_mic|koi8r_to_utf8|koi8r_to_win1251|koi8r_to_win866|" +
-        "koi8u_to_utf8|lag|language_handler_in|language_handler_out|last_value|lastval|" +
-        "latin1_to_mic|latin2_to_mic|latin2_to_win1250|latin3_to_mic|latin4_to_mic|lead|left|" +
-        "length|like|like_escape|likejoinsel|likesel|line|line_distance|line_eq|line_horizontal|" +
-        "line_in|line_interpt|line_intersect|line_out|line_parallel|line_perp|line_recv|" +
-        "line_send|line_vertical|ln|lo_close|lo_creat|lo_create|lo_export|lo_import|lo_lseek|" +
-        "lo_open|lo_tell|lo_truncate|lo_unlink|log|loread|lower|lowrite|lpad|lseg|lseg_center|" +
-        "lseg_distance|lseg_eq|lseg_ge|lseg_gt|lseg_horizontal|lseg_in|lseg_interpt|" +
-        "lseg_intersect|lseg_le|lseg_length|lseg_lt|lseg_ne|lseg_out|lseg_parallel|lseg_perp|" +
-        "lseg_recv|lseg_send|lseg_vertical|ltrim|macaddr_cmp|macaddr_eq|macaddr_ge|macaddr_gt|" +
-        "macaddr_in|macaddr_le|macaddr_lt|macaddr_ne|macaddr_out|macaddr_recv|macaddr_send|" +
-        "makeaclitem|masklen|max|md5|mic_to_ascii|mic_to_big5|mic_to_euc_cn|mic_to_euc_jp|" +
-        "mic_to_euc_kr|mic_to_euc_tw|mic_to_iso|mic_to_koi8r|mic_to_latin1|mic_to_latin2|" +
-        "mic_to_latin3|mic_to_latin4|mic_to_sjis|mic_to_win1250|mic_to_win1251|mic_to_win866|" +
-        "min|mktinterval|mod|money|mul_d_interval|name|nameeq|namege|namegt|nameiclike|nameicnlike|" +
-        "nameicregexeq|nameicregexne|namein|namele|namelike|namelt|namene|namenlike|nameout|" +
-        "namerecv|nameregexeq|nameregexne|namesend|neqjoinsel|neqsel|netmask|network|network_cmp|" +
-        "network_eq|network_ge|network_gt|network_le|network_lt|network_ne|network_sub|" +
-        "network_subeq|network_sup|network_supeq|nextval|nlikejoinsel|nlikesel|notlike|now|" +
-        "npoints|nth_value|ntile|numeric_abs|numeric_accum|numeric_add|numeric_avg|" +
-        "numeric_avg_accum|numeric_cmp|numeric_div|numeric_div_trunc|numeric_eq|numeric_exp|" +
-        "numeric_fac|numeric_ge|numeric_gt|numeric_in|numeric_inc|numeric_larger|numeric_le|" +
-        "numeric_ln|numeric_log|numeric_lt|numeric_mod|numeric_mul|numeric_ne|numeric_out|" +
-        "numeric_power|numeric_recv|numeric_send|numeric_smaller|numeric_sqrt|" +
-        "numeric_stddev_pop|numeric_stddev_samp|numeric_sub|numeric_uminus|numeric_uplus|" +
-        "numeric_var_pop|numeric_var_samp|numerictypmodin|numerictypmodout|numnode|" +
-        "obj_description|octet_length|oid|oideq|oidge|oidgt|oidin|oidlarger|oidle|oidlt|oidne|oidout|" +
-        "oidrecv|oidsend|oidsmaller|oidvectoreq|oidvectorge|oidvectorgt|oidvectorin|oidvectorle|" +
-        "oidvectorlt|oidvectorne|oidvectorout|oidvectorrecv|oidvectorsend|oidvectortypes|on_pb|" +
-        "on_pl|on_ppath|on_ps|on_sb|on_sl|opaque_in|opaque_out|overlaps|overlay|path|path_add|" +
-        "path_add_pt|path_center|path_contain_pt|path_distance|path_div_pt|path_in|path_inter|" +
-        "path_length|path_mul_pt|path_n_eq|path_n_ge|path_n_gt|path_n_le|path_n_lt|path_npoints|" +
-        "path_out|path_recv|path_send|path_sub_pt|pclose|percent_rank|pg_advisory_lock|" +
-        "pg_advisory_lock_shared|pg_advisory_unlock|pg_advisory_unlock_all|" +
-        "pg_advisory_unlock_shared|pg_advisory_xact_lock|pg_advisory_xact_lock_shared|" +
-        "pg_available_extension_versions|pg_available_extensions|pg_backend_pid|" +
-        "pg_cancel_backend|pg_char_to_encoding|pg_client_encoding|pg_collation_is_visible|" +
-        "pg_column_size|pg_conf_load_time|pg_conversion_is_visible|pg_create_restore_point|" +
-        "pg_current_xlog_insert_location|pg_current_xlog_location|pg_cursor|pg_database_size|" +
-        "pg_describe_object|pg_encoding_max_length|pg_encoding_to_char|" +
-        "pg_extension_config_dump|pg_extension_update_paths|pg_function_is_visible|" +
-        "pg_get_constraintdef|pg_get_expr|pg_get_function_arguments|" +
-        "pg_get_function_identity_arguments|pg_get_function_result|pg_get_functiondef|" +
-        "pg_get_indexdef|pg_get_keywords|pg_get_ruledef|pg_get_serial_sequence|" +
-        "pg_get_triggerdef|pg_get_userbyid|pg_get_viewdef|pg_has_role|pg_indexes_size|" +
-        "pg_is_in_recovery|pg_is_other_temp_schema|pg_is_xlog_replay_paused|" +
-        "pg_last_xact_replay_timestamp|pg_last_xlog_receive_location|" +
-        "pg_last_xlog_replay_location|pg_listening_channels|pg_lock_status|pg_ls_dir|" +
-        "pg_my_temp_schema|pg_node_tree_in|pg_node_tree_out|pg_node_tree_recv|" +
-        "pg_node_tree_send|pg_notify|pg_opclass_is_visible|pg_operator_is_visible|" +
-        "pg_options_to_table|pg_postmaster_start_time|pg_prepared_statement|pg_prepared_xact|" +
-        "pg_read_binary_file|pg_read_file|pg_relation_filenode|pg_relation_filepath|" +
-        "pg_relation_size|pg_reload_conf|pg_rotate_logfile|pg_sequence_parameters|" +
-        "pg_show_all_settings|pg_size_pretty|pg_sleep|pg_start_backup|pg_stat_clear_snapshot|" +
-        "pg_stat_file|pg_stat_get_activity|pg_stat_get_analyze_count|" +
-        "pg_stat_get_autoanalyze_count|pg_stat_get_autovacuum_count|" +
-        "pg_stat_get_backend_activity|pg_stat_get_backend_activity_start|" +
-        "pg_stat_get_backend_client_addr|pg_stat_get_backend_client_port|" +
-        "pg_stat_get_backend_dbid|pg_stat_get_backend_idset|pg_stat_get_backend_pid|" +
-        "pg_stat_get_backend_start|pg_stat_get_backend_userid|pg_stat_get_backend_waiting|" +
-        "pg_stat_get_backend_xact_start|pg_stat_get_bgwriter_buf_written_checkpoints|" +
-        "pg_stat_get_bgwriter_buf_written_clean|pg_stat_get_bgwriter_maxwritten_clean|" +
-        "pg_stat_get_bgwriter_requested_checkpoints|pg_stat_get_bgwriter_stat_reset_time|" +
-        "pg_stat_get_bgwriter_timed_checkpoints|pg_stat_get_blocks_fetched|" +
-        "pg_stat_get_blocks_hit|pg_stat_get_buf_alloc|pg_stat_get_buf_fsync_backend|" +
-        "pg_stat_get_buf_written_backend|pg_stat_get_db_blocks_fetched|" +
-        "pg_stat_get_db_blocks_hit|pg_stat_get_db_conflict_all|" +
-        "pg_stat_get_db_conflict_bufferpin|pg_stat_get_db_conflict_lock|" +
-        "pg_stat_get_db_conflict_snapshot|pg_stat_get_db_conflict_startup_deadlock|" +
-        "pg_stat_get_db_conflict_tablespace|pg_stat_get_db_numbackends|" +
-        "pg_stat_get_db_stat_reset_time|pg_stat_get_db_tuples_deleted|" +
-        "pg_stat_get_db_tuples_fetched|pg_stat_get_db_tuples_inserted|" +
-        "pg_stat_get_db_tuples_returned|pg_stat_get_db_tuples_updated|" +
-        "pg_stat_get_db_xact_commit|pg_stat_get_db_xact_rollback|pg_stat_get_dead_tuples|" +
-        "pg_stat_get_function_calls|pg_stat_get_function_self_time|" +
-        "pg_stat_get_function_time|pg_stat_get_last_analyze_time|" +
-        "pg_stat_get_last_autoanalyze_time|pg_stat_get_last_autovacuum_time|" +
-        "pg_stat_get_last_vacuum_time|pg_stat_get_live_tuples|pg_stat_get_numscans|" +
-        "pg_stat_get_tuples_deleted|pg_stat_get_tuples_fetched|" +
-        "pg_stat_get_tuples_hot_updated|pg_stat_get_tuples_inserted|" +
-        "pg_stat_get_tuples_returned|pg_stat_get_tuples_updated|pg_stat_get_vacuum_count|" +
-        "pg_stat_get_wal_senders|pg_stat_get_xact_blocks_fetched|" +
-        "pg_stat_get_xact_blocks_hit|pg_stat_get_xact_function_calls|" +
-        "pg_stat_get_xact_function_self_time|pg_stat_get_xact_function_time|" +
-        "pg_stat_get_xact_numscans|pg_stat_get_xact_tuples_deleted|" +
-        "pg_stat_get_xact_tuples_fetched|pg_stat_get_xact_tuples_hot_updated|" +
-        "pg_stat_get_xact_tuples_inserted|pg_stat_get_xact_tuples_returned|" +
-        "pg_stat_get_xact_tuples_updated|pg_stat_reset|pg_stat_reset_shared|" +
-        "pg_stat_reset_single_function_counters|pg_stat_reset_single_table_counters|" +
-        "pg_stop_backup|pg_switch_xlog|pg_table_is_visible|pg_table_size|" +
-        "pg_tablespace_databases|pg_tablespace_size|pg_terminate_backend|pg_timezone_abbrevs|" +
-        "pg_timezone_names|pg_total_relation_size|pg_try_advisory_lock|" +
-        "pg_try_advisory_lock_shared|pg_try_advisory_xact_lock|" +
-        "pg_try_advisory_xact_lock_shared|pg_ts_config_is_visible|pg_ts_dict_is_visible|" +
-        "pg_ts_parser_is_visible|pg_ts_template_is_visible|pg_type_is_visible|pg_typeof|" +
-        "pg_xlog_replay_pause|pg_xlog_replay_resume|pg_xlogfile_name|pg_xlogfile_name_offset|" +
-        "pi|plainto_tsquery|plpgsql_call_handler|plpgsql_inline_handler|plpgsql_validator|" +
-        "point|point_above|point_add|point_below|point_distance|point_div|point_eq|point_horiz|" +
-        "point_in|point_left|point_mul|point_ne|point_out|point_recv|point_right|point_send|" +
-        "point_sub|point_vert|poly_above|poly_below|poly_center|poly_contain|poly_contain_pt|" +
-        "poly_contained|poly_distance|poly_in|poly_left|poly_npoints|poly_out|poly_overabove|" +
-        "poly_overbelow|poly_overlap|poly_overleft|poly_overright|poly_recv|poly_right|" +
-        "poly_same|poly_send|polygon|popen|position|positionjoinsel|positionsel|" +
-        "postgresql_fdw_validator|pow|power|prsd_end|prsd_headline|prsd_lextype|prsd_nexttoken|" +
-        "prsd_start|pt_contained_circle|pt_contained_poly|query_to_xml|" +
-        "query_to_xml_and_xmlschema|query_to_xmlschema|querytree|quote_ident|quote_literal|" +
-        "quote_nullable|radians|radius|random|rank|record_eq|record_ge|record_gt|record_in|" +
-        "record_le|record_lt|record_ne|record_out|record_recv|record_send|regclass|regclassin|" +
-        "regclassout|regclassrecv|regclasssend|regconfigin|regconfigout|regconfigrecv|" +
-        "regconfigsend|regdictionaryin|regdictionaryout|regdictionaryrecv|regdictionarysend|" +
-        "regexeqjoinsel|regexeqsel|regexnejoinsel|regexnesel|regexp_matches|regexp_replace|" +
-        "regexp_split_to_array|regexp_split_to_table|regoperatorin|regoperatorout|" +
-        "regoperatorrecv|regoperatorsend|regoperin|regoperout|regoperrecv|regopersend|" +
-        "regprocedurein|regprocedureout|regprocedurerecv|regproceduresend|regprocin|regprocout|" +
-        "regprocrecv|regprocsend|regr_avgx|regr_avgy|regr_count|regr_intercept|regr_r2|" +
-        "regr_slope|regr_sxx|regr_sxy|regr_syy|regtypein|regtypeout|regtyperecv|regtypesend|" +
-        "reltime|reltimeeq|reltimege|reltimegt|reltimein|reltimele|reltimelt|reltimene|reltimeout|" +
-        "reltimerecv|reltimesend|repeat|replace|reverse|right|round|row_number|rpad|rtrim|" +
-        "scalargtjoinsel|scalargtsel|scalarltjoinsel|scalarltsel|schema_to_xml|" +
-        "schema_to_xml_and_xmlschema|schema_to_xmlschema|session_user|set_bit|set_byte|" +
-        "set_config|set_masklen|setseed|setval|setweight|shell_in|shell_out|" +
-        "shift_jis_2004_to_euc_jis_2004|shift_jis_2004_to_utf8|shobj_description|sign|" +
-        "similar_escape|sin|sjis_to_euc_jp|sjis_to_mic|sjis_to_utf8|slope|smgreq|smgrin|smgrne|" +
-        "smgrout|split_part|sqrt|statement_timestamp|stddev|stddev_pop|stddev_samp|string_agg|" +
-        "string_agg_finalfn|string_agg_transfn|string_to_array|strip|strpos|substr|substring|sum|" +
-        "suppress_redundant_updates_trigger|table_to_xml|table_to_xml_and_xmlschema|" +
-        "table_to_xmlschema|tan|text|text_ge|text_gt|text_larger|text_le|text_lt|text_pattern_ge|" +
-        "text_pattern_gt|text_pattern_le|text_pattern_lt|text_smaller|textanycat|textcat|texteq|" +
-        "texticlike|texticnlike|texticregexeq|texticregexne|textin|textlen|textlike|textne|" +
-        "textnlike|textout|textrecv|textregexeq|textregexne|textsend|thesaurus_init|" +
-        "thesaurus_lexize|tideq|tidge|tidgt|tidin|tidlarger|tidle|tidlt|tidne|tidout|tidrecv|tidsend|" +
-        "tidsmaller|time_cmp|time_eq|time_ge|time_gt|time_hash|time_in|time_larger|time_le|time_lt|" +
-        "time_mi_interval|time_mi_time|time_ne|time_out|time_pl_interval|time_recv|time_send|" +
-        "time_smaller|timedate_pl|timemi|timenow|timeofday|timepl|timestamp_cmp|" +
-        "timestamp_cmp_date|timestamp_cmp_timestamptz|timestamp_eq|timestamp_eq_date|" +
-        "timestamp_eq_timestamptz|timestamp_ge|timestamp_ge_date|timestamp_ge_timestamptz|" +
-        "timestamp_gt|timestamp_gt_date|timestamp_gt_timestamptz|timestamp_hash|timestamp_in|" +
-        "timestamp_larger|timestamp_le|timestamp_le_date|timestamp_le_timestamptz|" +
-        "timestamp_lt|timestamp_lt_date|timestamp_lt_timestamptz|timestamp_mi|" +
-        "timestamp_mi_interval|timestamp_ne|timestamp_ne_date|timestamp_ne_timestamptz|" +
-        "timestamp_out|timestamp_pl_interval|timestamp_recv|timestamp_send|timestamp_smaller|" +
-        "timestamptypmodin|timestamptypmodout|timestamptz_cmp|timestamptz_cmp_date|" +
-        "timestamptz_cmp_timestamp|timestamptz_eq|timestamptz_eq_date|" +
-        "timestamptz_eq_timestamp|timestamptz_ge|timestamptz_ge_date|" +
-        "timestamptz_ge_timestamp|timestamptz_gt|timestamptz_gt_date|" +
-        "timestamptz_gt_timestamp|timestamptz_in|timestamptz_larger|timestamptz_le|" +
-        "timestamptz_le_date|timestamptz_le_timestamp|timestamptz_lt|timestamptz_lt_date|" +
-        "timestamptz_lt_timestamp|timestamptz_mi|timestamptz_mi_interval|timestamptz_ne|" +
-        "timestamptz_ne_date|timestamptz_ne_timestamp|timestamptz_out|" +
-        "timestamptz_pl_interval|timestamptz_recv|timestamptz_send|timestamptz_smaller|" +
-        "timestamptztypmodin|timestamptztypmodout|timetypmodin|timetypmodout|timetz_cmp|" +
-        "timetz_eq|timetz_ge|timetz_gt|timetz_hash|timetz_in|timetz_larger|timetz_le|timetz_lt|" +
-        "timetz_mi_interval|timetz_ne|timetz_out|timetz_pl_interval|timetz_recv|timetz_send|" +
-        "timetz_smaller|timetzdate_pl|timetztypmodin|timetztypmodout|timezone|tinterval|" +
-        "tintervalct|tintervalend|tintervaleq|tintervalge|tintervalgt|tintervalin|tintervalle|" +
-        "tintervalleneq|tintervallenge|tintervallengt|tintervallenle|tintervallenlt|" +
-        "tintervallenne|tintervallt|tintervalne|tintervalout|tintervalov|tintervalrecv|" +
-        "tintervalrel|tintervalsame|tintervalsend|tintervalstart|to_ascii|to_char|to_date|to_hex|" +
-        "to_number|to_timestamp|to_tsquery|to_tsvector|transaction_timestamp|translate|" +
-        "trigger_in|trigger_out|trunc|ts_debug|ts_headline|ts_lexize|ts_match_qv|ts_match_tq|" +
-        "ts_match_tt|ts_match_vq|ts_parse|ts_rank|ts_rank_cd|ts_rewrite|ts_stat|ts_token_type|" +
-        "ts_typanalyze|tsmatchjoinsel|tsmatchsel|tsq_mcontained|tsq_mcontains|tsquery_and|" +
-        "tsquery_cmp|tsquery_eq|tsquery_ge|tsquery_gt|tsquery_le|tsquery_lt|tsquery_ne|" +
-        "tsquery_not|tsquery_or|tsqueryin|tsqueryout|tsqueryrecv|tsquerysend|tsvector_cmp|" +
-        "tsvector_concat|tsvector_eq|tsvector_ge|tsvector_gt|tsvector_le|tsvector_lt|" +
-        "tsvector_ne|tsvector_update_trigger|tsvector_update_trigger_column|tsvectorin|" +
-        "tsvectorout|tsvectorrecv|tsvectorsend|txid_current|txid_current_snapshot|" +
-        "txid_snapshot_in|txid_snapshot_out|txid_snapshot_recv|txid_snapshot_send|" +
-        "txid_snapshot_xip|txid_snapshot_xmax|txid_snapshot_xmin|txid_visible_in_snapshot|" +
-        "uhc_to_utf8|unique_key_recheck|unknownin|unknownout|unknownrecv|unknownsend|unnest|" +
-        "upper|utf8_to_ascii|utf8_to_big5|utf8_to_euc_cn|utf8_to_euc_jis_2004|utf8_to_euc_jp|" +
-        "utf8_to_euc_kr|utf8_to_euc_tw|utf8_to_gb18030|utf8_to_gbk|utf8_to_iso8859|" +
-        "utf8_to_iso8859_1|utf8_to_johab|utf8_to_koi8r|utf8_to_koi8u|utf8_to_shift_jis_2004|" +
-        "utf8_to_sjis|utf8_to_uhc|utf8_to_win|uuid_cmp|uuid_eq|uuid_ge|uuid_gt|uuid_hash|uuid_in|" +
-        "uuid_le|uuid_lt|uuid_ne|uuid_out|uuid_recv|uuid_send|var_pop|var_samp|varbit_in|" +
-        "varbit_out|varbit_recv|varbit_send|varbitcmp|varbiteq|varbitge|varbitgt|varbitle|" +
-        "varbitlt|varbitne|varbittypmodin|varbittypmodout|varcharin|varcharout|varcharrecv|" +
-        "varcharsend|varchartypmodin|varchartypmodout|variance|version|void_in|void_out|" +
-        "void_recv|void_send|width|width_bucket|win1250_to_latin2|win1250_to_mic|win1251_to_iso|" +
-        "win1251_to_koi8r|win1251_to_mic|win1251_to_win866|win866_to_iso|win866_to_koi8r|" +
-        "win866_to_mic|win866_to_win1251|win_to_utf8|xideq|xideqint4|xidin|xidout|xidrecv|xidsend|" +
-        "xml|xml_in|xml_is_well_formed|xml_is_well_formed_content|xml_is_well_formed_document|" +
-        "xml_out|xml_recv|xml_send|xmlagg|xmlcomment|xmlconcat2|xmlexists|xmlvalidate|xpath|" +
-        "xpath_exists").split("|")
-    );
-    
-    var sqlRules = [
-        {
-            token : "string", // single line string -- assume dollar strings if multi-line for now
-            regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"
-        }, {
-            token : "variable.language", // pg identifier
-            regex : '".*?"'
-        }, {
-            token : "constant.numeric", // float
-            regex : "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"
-        }, {
-            token : function(value) {
-                value = value.toLowerCase();
-                if (keywords.hasOwnProperty(value)) {
-                    return "keyword";
-                } else if (builtinFunctions.hasOwnProperty(value)) {
-                    return "support.function";
-                } else {
-                    return "identifier";
-                }
-              },
-              regex : "[a-zA-Z_][a-zA-Z0-9_$]*\\b" // TODO - Unicode in identifiers
-          }, {
-              token : "keyword.operator",
-              regex : "!|!!|!~|!~\\*|!~~|!~~\\*|#|##|#<|#<=|#<>|#=|#>|#>=|%|\\&|\\&\\&|\\&<|\\&<\\||\\&>|\\*|\\+|" +
-                      "\\-|/|<|<#>|<\\->|<<|<<=|<<\\||<=|<>|<\\?>|<@|<\\^|=|>|>=|>>|>>=|>\\^|\\?#|\\?\\-|\\?\\-\\||" +
-                      "\\?\\||\\?\\|\\||@|@\\-@|@>|@@|@@@|\\^|\\||\\|\\&>|\\|/|\\|>>|\\|\\||\\|\\|/|~|~\\*|~<=~|~<~|" +
-                      "~=|~>=~|~>~|~~|~~\\*"
-          }, {
-              token : "lparen.paren",
-              regex : "[\\(]"
-          }, {
-              token : "paren.rparen",
-              regex : "[\\)]"
-          }, {
-              token : "text",
-              regex : "\\s+"
-          }
-    ];
-           
-
-    this.$rules = {
-        "start" : [
-            {
-                token : "comment",
-                regex : "--.*$"
-            }, 
-            new DocCommentHighlightRules().getStartRule("doc-start"),
-            {
-                token : "comment", // multi-line comment
-                merge : true,
-                regex : "\\/\\*",
-                next : "comment"
-            },{
-                token : "keyword.statementBegin",
-                regex : "^[a-zA-Z]+", // Could enumerate starting keywords but this allows things to work when new statements are added.
-                next : "statement"
-            },{
-                token : "support.buildin", // psql directive
-                regex : "^\\\\[\\S]+.*$"
-            }
-        ],
-        
-        "statement" : [
-            {
-                token : "comment",
-                regex : "--.*$"
-            }, {
-                token : "comment", // multi-line comment
-                merge : true,
-                regex : "\\/\\*",
-                next : "commentStatement"
-            }, {
-                token : "statementEnd",
-                regex : ";",
-                next : "start"
-            }, {
-                token : "string", // perl, python, tcl are in the pg default dist (no tcl highlighter)
-                regex : "\\$perl\\$",
-                next : "perl-start"
-            }, {
-                token : "string",
-                regex : "\\$python\\$",
-                next : "python-start"
-            },{
-                token : "string",
-                regex : "\\$[\\w_0-9]*\\$$", // dollar quote at the end of a line
-                next : "dollarSql"
-            }, {
-                token : "string",
-                regex : "\\$[\\w_0-9]*\\$",
-                next : "dollarStatementString"
-            }
-        ].concat(sqlRules),
-        
-        "dollarSql" : [
-            {
-                token : "comment",
-                regex : "--.*$"
-            }, {
-                token : "comment", // multi-line comment
-                merge : true,
-                regex : "\\/\\*",
-                next : "commentDollarSql"
-            }, {
-                token : "string", // end quoting with dollar at the start of a line
-                regex : "^\\$[\\w_0-9]*\\$",
-                next : "statement"
-            }, {
-                token : "string",
-                regex : "\\$[\\w_0-9]*\\$",
-                next : "dollarSqlString"
-            }
-        ].concat(sqlRules),
-        
-        "comment" : [
-            {
-                token : "comment", // closing comment
-                regex : ".*?\\*\\/",
-                next : "start"
-            }, {
-                token : "comment", // comment spanning whole line
-                merge : true,
-                regex : ".+"
-            }
-        ],
-        
-        "commentStatement" : [
-            {
-                token : "comment", // closing comment
-                regex : ".*?\\*\\/",
-                next : "statement"
-            }, {
-                token : "comment", // comment spanning whole line
-                merge : true,
-                regex : ".+"
-            }
-        ],
-        
-        "commentDollarSql" : [
-            {
-                token : "comment", // closing comment
-                regex : ".*?\\*\\/",
-                next : "dollarSql"
-            }, {
-                token : "comment", // comment spanning whole line
-                merge : true,
-                regex : ".+"
-            }
-        ],
-        
-        "dollarStatementString" : [
-            {
-                token : "string", // closing dollarstring
-                regex : ".*?\\$[\\w_0-9]*\\$",
-                next : "statement"
-            }, {
-                token : "string", // dollarstring spanning whole line
-                merge : true,
-                regex : ".+"
-            }
-        ],
-        
-        "dollarSqlString" : [
-            {
-                token : "string", // closing dollarstring
-                regex : ".*?\\$[\\w_0-9]*\\$",
-                next : "dollarSql"
-            }, {
-                token : "string", // dollarstring spanning whole line
-                merge : true,
-                regex : ".+"
-            }
-        ]
-    };
-    
-    this.embedRules(DocCommentHighlightRules, "doc-", [ new DocCommentHighlightRules().getEndRule("start") ]);
-    this.embedRules(PerlHighlightRules, "perl-", [{token : "string", regex : "\\$perl\\$", next : "statement"}]);
-    this.embedRules(PythonHighlightRules, "python-", [{token : "string", regex : "\\$python\\$", next : "statement"}]);
-};
-
-oop.inherits(PgsqlHighlightRules, TextHighlightRules);
-
-exports.PgsqlHighlightRules = PgsqlHighlightRules;
-});
-
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/doc_comment_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var DocCommentHighlightRules = function() {
-
-    this.$rules = {
-        "start" : [ {
-            token : "comment.doc.tag",
-            regex : "@[\\w\\d_]+" // TODO: fix email addresses
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "\\s+"
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "TODO"
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "[^@\\*]+"
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "."
-        }]
-    };
-};
-
-oop.inherits(DocCommentHighlightRules, TextHighlightRules);
-
-(function() {
-
-    this.getStartRule = function(start) {
-        return {
-            token : "comment.doc", // doc comment
-            merge : true,
-            regex : "\\/\\*(?=\\*)",
-            next  : start
-        };
-    };
-    
-    this.getEndRule = function (start) {
-        return {
-            token : "comment.doc", // closing comment
-            merge : true,
-            regex : "\\*\\/",
-            next  : start
-        };
-    };
-
-}).call(DocCommentHighlightRules.prototype);
-
-exports.DocCommentHighlightRules = DocCommentHighlightRules;
-
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Panagiotis Astithas <pastith AT gmail DOT com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/perl_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var lang = require("../lib/lang");
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var PerlHighlightRules = function() {
-
-    var keywords = lang.arrayToMap(
-        ("base|constant|continue|else|elsif|for|foreach|format|goto|if|last|local|my|next|" +
-         "no|package|parent|redo|require|scalar|sub|unless|until|while|use|vars").split("|")
-    );
-
-    var buildinConstants = lang.arrayToMap(
-        ("ARGV|ENV|INC|SIG").split("|")
-    );
-
-    var builtinFunctions = lang.arrayToMap(
-        ("getprotobynumber|getprotobyname|getservbyname|gethostbyaddr|" +
-         "gethostbyname|getservbyport|getnetbyaddr|getnetbyname|getsockname|" +
-         "getpeername|setpriority|getprotoent|setprotoent|getpriority|" +
-         "endprotoent|getservent|setservent|endservent|sethostent|socketpair|" +
-         "getsockopt|gethostent|endhostent|setsockopt|setnetent|quotemeta|" +
-         "localtime|prototype|getnetent|endnetent|rewinddir|wantarray|getpwuid|" +
-         "closedir|getlogin|readlink|endgrent|getgrgid|getgrnam|shmwrite|" +
-         "shutdown|readline|endpwent|setgrent|readpipe|formline|truncate|" +
-         "dbmclose|syswrite|setpwent|getpwnam|getgrent|getpwent|ucfirst|sysread|" +
-         "setpgrp|shmread|sysseek|sysopen|telldir|defined|opendir|connect|" +
-         "lcfirst|getppid|binmode|syscall|sprintf|getpgrp|readdir|seekdir|" +
-         "waitpid|reverse|unshift|symlink|dbmopen|semget|msgrcv|rename|listen|" +
-         "chroot|msgsnd|shmctl|accept|unpack|exists|fileno|shmget|system|" +
-         "unlink|printf|gmtime|msgctl|semctl|values|rindex|substr|splice|" +
-         "length|msgget|select|socket|return|caller|delete|alarm|ioctl|index|" +
-         "undef|lstat|times|srand|chown|fcntl|close|write|umask|rmdir|study|" +
-         "sleep|chomp|untie|print|utime|mkdir|atan2|split|crypt|flock|chmod|" +
-         "BEGIN|bless|chdir|semop|shift|reset|link|stat|chop|grep|fork|dump|" +
-         "join|open|tell|pipe|exit|glob|warn|each|bind|sort|pack|eval|push|" +
-         "keys|getc|kill|seek|sqrt|send|wait|rand|tied|read|time|exec|recv|" +
-         "eof|chr|int|ord|exp|pos|pop|sin|log|abs|oct|hex|tie|cos|vec|END|ref|" +
-         "map|die|uc|lc|do").split("|")
-    );
-
-    // regexp must not have capturing parentheses. Use (?:) instead.
-    // regexps are ordered -> the first match is used
-
-    this.$rules = {
-        "start" : [
-            {
-                token : "comment",
-                regex : "#.*$"
-            }, {
-                token : "string.regexp",
-                regex : "[/](?:(?:\\[(?:\\\\]|[^\\]])+\\])|(?:\\\\/|[^\\]/]))*[/]\\w*\\s*(?=[).,;]|$)"
-            }, {
-                token : "string", // single line
-                regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
-            }, {
-                token : "string", // multi line string start
-                merge : true,
-                regex : '["].*\\\\$',
-                next : "qqstring"
-            }, {
-                token : "string", // single line
-                regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"
-            }, {
-                token : "string", // multi line string start
-                merge : true,
-                regex : "['].*\\\\$",
-                next : "qstring"
-            }, {
-                token : "constant.numeric", // hex
-                regex : "0x[0-9a-fA-F]+\\b"
-            }, {
-                token : "constant.numeric", // float
-                regex : "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"
-            }, {
-                token : function(value) {
-                    if (keywords.hasOwnProperty(value))
-                        return "keyword";
-                    else if (buildinConstants.hasOwnProperty(value))
-                        return "constant.language";
-                    else if (builtinFunctions.hasOwnProperty(value))
-                        return "support.function";
-                    else
-                        return "identifier";
-                },
-                regex : "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
-            }, {
-                token : "keyword.operator",
-                regex : "\\.\\.\\.|\\|\\|=|>>=|<<=|<=>|&&=|=>|!~|\\^=|&=|\\|=|\\.=|x=|%=|\\/=|\\*=|\\-=|\\+=|=~|\\*\\*|\\-\\-|\\.\\.|\\|\\||&&|\\+\\+|\\->|!=|==|>=|<=|>>|<<|,|=|\\?\\:|\\^|\\||x|%|\\/|\\*|<|&|\\\\|~|!|>|\\.|\\-|\\+|\\-C|\\-b|\\-S|\\-u|\\-t|\\-p|\\-l|\\-d|\\-f|\\-g|\\-s|\\-z|\\-k|\\-e|\\-O|\\-T|\\-B|\\-M|\\-A|\\-X|\\-W|\\-c|\\-R|\\-o|\\-x|\\-w|\\-r|\\b(?:and|cmp|eq|ge|gt|le|lt|ne|not|or|xor)"
-            }, {
-                token : "lparen",
-                regex : "[[({]"
-            }, {
-                token : "rparen",
-                regex : "[\\])}]"
-            }, {
-                token : "text",
-                regex : "\\s+"
-            }
-        ],
-        "qqstring" : [
-            {
-                token : "string",
-                regex : '(?:(?:\\\\.)|(?:[^"\\\\]))*?"',
-                next : "start"
-            }, {
-                token : "string",
-                merge : true,
-                regex : '.+'
-            }
-        ],
-        "qstring" : [
-            {
-                token : "string",
-                regex : "(?:(?:\\\\.)|(?:[^'\\\\]))*?'",
-                next : "start"
-            }, {
-                token : "string",
-                merge : true,
-                regex : '.+'
-            }
-        ]
-    };
-};
-
-oop.inherits(PerlHighlightRules, TextHighlightRules);
-
-exports.PerlHighlightRules = PerlHighlightRules;
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Colin Gourlay <colin DOT j DOT gourlay AT gmail DOT com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK *****
- *
- * TODO: python delimiters
- */
-
-define('ace/mode/python_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var lang = require("../lib/lang");
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var PythonHighlightRules = function() {
-
-    var keywords = lang.arrayToMap(
-        ("and|as|assert|break|class|continue|def|del|elif|else|except|exec|" +
-        "finally|for|from|global|if|import|in|is|lambda|not|or|pass|print|" +
-        "raise|return|try|while|with|yield").split("|")
-    );
-
-    var builtinConstants = lang.arrayToMap(
-        ("True|False|None|NotImplemented|Ellipsis|__debug__").split("|")
-    );
-
-    var builtinFunctions = lang.arrayToMap(
-        ("abs|divmod|input|open|staticmethod|all|enumerate|int|ord|str|any|" +
-        "eval|isinstance|pow|sum|basestring|execfile|issubclass|print|super|" +
-        "binfile|iter|property|tuple|bool|filter|len|range|type|bytearray|" +
-        "float|list|raw_input|unichr|callable|format|locals|reduce|unicode|" +
-        "chr|frozenset|long|reload|vars|classmethod|getattr|map|repr|xrange|" +
-        "cmp|globals|max|reversed|zip|compile|hasattr|memoryview|round|" +
-        "__import__|complex|hash|min|set|apply|delattr|help|next|setattr|" +
-        "buffer|dict|hex|object|slice|coerce|dir|id|oct|sorted|intern").split("|")
-    );
-
-    var futureReserved = lang.arrayToMap(
-        ("").split("|")
-    );
-
-    var strPre = "(?:r|u|ur|R|U|UR|Ur|uR)?";
-
-    var decimalInteger = "(?:(?:[1-9]\\d*)|(?:0))";
-    var octInteger = "(?:0[oO]?[0-7]+)";
-    var hexInteger = "(?:0[xX][\\dA-Fa-f]+)";
-    var binInteger = "(?:0[bB][01]+)";
-    var integer = "(?:" + decimalInteger + "|" + octInteger + "|" + hexInteger + "|" + binInteger + ")";
-
-    var exponent = "(?:[eE][+-]?\\d+)";
-    var fraction = "(?:\\.\\d+)";
-    var intPart = "(?:\\d+)";
-    var pointFloat = "(?:(?:" + intPart + "?" + fraction + ")|(?:" + intPart + "\\.))";
-    var exponentFloat = "(?:(?:" + pointFloat + "|" +  intPart + ")" + exponent + ")";
-    var floatNumber = "(?:" + exponentFloat + "|" + pointFloat + ")";
-
-    this.$rules = {
-        "start" : [ {
-            token : "comment",
-            regex : "#.*$"
-        }, {
-            token : "string",           // """ string
-            regex : strPre + '"{3}(?:[^\\\\]|\\\\.)*?"{3}'
-        }, {
-            token : "string",           // multi line """ string start
-            merge : true,
-            regex : strPre + '"{3}.*$',
-            next : "qqstring"
-        }, {
-            token : "string",           // " string
-            regex : strPre + '"(?:[^\\\\]|\\\\.)*?"'
-        }, {
-            token : "string",           // ''' string
-            regex : strPre + "'{3}(?:[^\\\\]|\\\\.)*?'{3}"
-        }, {
-            token : "string",           // multi line ''' string start
-            merge : true,
-            regex : strPre + "'{3}.*$",
-            next : "qstring"
-        }, {
-            token : "string",           // ' string
-            regex : strPre + "'(?:[^\\\\]|\\\\.)*?'"
-        }, {
-            token : "constant.numeric", // imaginary
-            regex : "(?:" + floatNumber + "|\\d+)[jJ]\\b"
-        }, {
-            token : "constant.numeric", // float
-            regex : floatNumber
-        }, {
-            token : "constant.numeric", // long integer
-            regex : integer + "[lL]\\b"
-        }, {
-            token : "constant.numeric", // integer
-            regex : integer + "\\b"
-        }, {
-            token : function(value) {
-                if (keywords.hasOwnProperty(value))
-                    return "keyword";
-                else if (builtinConstants.hasOwnProperty(value))
-                    return "constant.language";
-                else if (futureReserved.hasOwnProperty(value))
-                    return "invalid.illegal";
-                else if (builtinFunctions.hasOwnProperty(value))
-                    return "support.function";
-                else if (value == "debugger")
-                    return "invalid.deprecated";
-                else
-                    return "identifier";
-            },
-            regex : "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
-        }, {
-            token : "keyword.operator",
-            regex : "\\+|\\-|\\*|\\*\\*|\\/|\\/\\/|%|<<|>>|&|\\||\\^|~|<|>|<=|=>|==|!=|<>|="
-        }, {
-            token : "lparen.paren",
-            regex : "[\\[\\(\\{]"
-        }, {
-            token : "paren.rparen",
-            regex : "[\\]\\)\\}]"
-        }, {
-            token : "text",
-            regex : "\\s+"
-        } ],
-        "qqstring" : [ {
-            token : "string", // multi line """ string end
-            regex : '(?:[^\\\\]|\\\\.)*?"{3}',
-            next : "start"
-        }, {
-            token : "string",
-            merge : true,
-            regex : '.+'
-        } ],
-        "qstring" : [ {
-            token : "string",  // multi line ''' string end
-            regex : "(?:[^\\\\]|\\\\.)*?'{3}",
-            next : "start"
-        }, {
-            token : "string",
-            merge : true,
-            regex : '.+'
-        } ]
-    };
-};
-
-oop.inherits(PythonHighlightRules, TextHighlightRules);
-
-exports.PythonHighlightRules = PythonHighlightRules;
-});
diff --git a/apps/files_texteditor/js/aceeditor/mode-pgsql.js b/apps/files_texteditor/js/aceeditor/mode-pgsql.js
deleted file mode 100644
index 12a02277af..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-pgsql.js
+++ /dev/null
@@ -1 +0,0 @@
-define("ace/mode/pgsql",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/pgsql_highlight_rules","ace/range"],function(a,b,c){var d=a("ace/lib/oop"),e=a("ace/mode/text").Mode,f=a("ace/tokenizer").Tokenizer,g=a("ace/mode/pgsql_highlight_rules").PgsqlHighlightRules,h=a("ace/range").Range,i=function(){this.$tokenizer=new f((new g).getRules())};d.inherits(i,e),function(){this.toggleCommentLines=function(a,b,c,d){var e=!0,f=/^(\s*)--/;for(var g=c;g<=d;g++)if(!f.test(b.getLine(g))){e=!1;break}if(e){var i=new h(0,0,0,0);for(var g=c;g<=d;g++){var j=b.getLine(g),k=j.match(f);i.start.row=g,i.end.row=g,i.end.column=k[0].length,b.replace(i,k[1])}}else b.indentRows(c,d,"--")},this.getNextLineIndent=function(a,b,c){return a=="start"||a=="keyword.statementEnd"?"":this.$getIndent(b)}}.call(i.prototype),b.Mode=i}),define("ace/mode/pgsql_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/doc_comment_highlight_rules","ace/mode/text_highlight_rules","ace/mode/perl_highlight_rules","ace/mode/python_highlight_rules"],function(a,b,c){var d=a("ace/lib/oop"),e=a("ace/lib/lang"),f=a("./doc_comment_highlight_rules").DocCommentHighlightRules,g=a("./text_highlight_rules").TextHighlightRules,h=a("./perl_highlight_rules").PerlHighlightRules,i=a("./python_highlight_rules").PythonHighlightRules,j=function(){var a=e.arrayToMap("abort|absolute|abstime|access|aclitem|action|add|admin|after|aggregate|all|also|alter|always|analyse|analyze|and|any|anyarray|anyelement|anyenum|anynonarray|array|as|asc|assertion|assignment|asymmetric|at|attribute|authorization|backward|before|begin|between|bigint|binary|bit|bool|boolean|both|box|bpchar|by|bytea|cache|called|cascade|cascaded|case|cast|catalog|chain|char|character|characteristics|check|checkpoint|cid|cidr|circle|class|close|cluster|coalesce|collate|collation|column|comment|comments|commit|committed|concurrently|configuration|connection|constraint|constraints|content|continue|conversion|copy|cost|create|cross|cstring|csv|current|current_catalog|current_date|current_role|current_schema|current_time|current_timestamp|current_user|cursor|cycle|data|database|date|day|deallocate|dec|decimal|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|enum|escape|except|exclude|excluding|exclusive|execute|exists|explain|extension|external|extract|false|family|fdw_handler|fetch|first|float|float4|float8|following|for|force|foreign|forward|freeze|from|full|function|functions|global|grant|granted|greatest|group|gtsvector|handler|having|header|hold|hour|identity|if|ilike|immediate|immutable|implicit|in|including|increment|index|indexes|inet|inherit|inherits|initially|inline|inner|inout|input|insensitive|insert|instead|int|int2|int2vector|int4|int8|integer|internal|intersect|interval|into|invoker|is|isnull|isolation|join|key|label|language|language_handler|large|last|lc_collate|lc_ctype|leading|least|left|level|like|limit|line|listen|load|local|localtime|localtimestamp|location|lock|lseg|macaddr|mapping|match|maxvalue|minute|minvalue|mode|money|month|move|name|names|national|natural|nchar|next|no|none|not|nothing|notify|notnull|nowait|null|nullif|nulls|numeric|object|of|off|offset|oid|oids|oidvector|on|only|opaque|operator|option|options|or|order|out|outer|over|overlaps|overlay|owned|owner|parser|partial|partition|passing|password|path|pg_attribute|pg_auth_members|pg_authid|pg_class|pg_database|pg_node_tree|pg_proc|pg_type|placing|plans|point|polygon|position|preceding|precision|prepare|prepared|preserve|primary|prior|privileges|procedural|procedure|quote|range|read|real|reassign|recheck|record|recursive|ref|refcursor|references|regclass|regconfig|regdictionary|regoper|regoperator|regproc|regprocedure|regtype|reindex|relative|release|reltime|rename|repeatable|replace|replica|reset|restart|restrict|returning|returns|revoke|right|role|rollback|row|rows|rule|savepoint|schema|scroll|search|second|security|select|sequence|sequences|serializable|server|session|session_user|set|setof|share|show|similar|simple|smallint|smgr|some|stable|standalone|start|statement|statistics|stdin|stdout|storage|strict|strip|substring|symmetric|sysid|system|table|tables|tablespace|temp|template|temporary|text|then|tid|time|timestamp|timestamptz|timetz|tinterval|to|trailing|transaction|treat|trigger|trim|true|truncate|trusted|tsquery|tsvector|txid_snapshot|type|unbounded|uncommitted|unencrypted|union|unique|unknown|unlisten|unlogged|until|update|user|using|uuid|vacuum|valid|validate|validator|value|values|varbit|varchar|variadic|varying|verbose|version|view|void|volatile|when|where|whitespace|window|with|without|work|wrapper|write|xid|xml|xmlattributes|xmlconcat|xmlelement|xmlexists|xmlforest|xmlparse|xmlpi|xmlroot|xmlserialize|year|yes|zone".split("|")),b=e.arrayToMap("RI_FKey_cascade_del|RI_FKey_cascade_upd|RI_FKey_check_ins|RI_FKey_check_upd|RI_FKey_noaction_del|RI_FKey_noaction_upd|RI_FKey_restrict_del|RI_FKey_restrict_upd|RI_FKey_setdefault_del|RI_FKey_setdefault_upd|RI_FKey_setnull_del|RI_FKey_setnull_upd|abbrev|abs|abstime|abstimeeq|abstimege|abstimegt|abstimein|abstimele|abstimelt|abstimene|abstimeout|abstimerecv|abstimesend|aclcontains|aclexplode|aclinsert|aclitemeq|aclitemin|aclitemout|aclremove|acos|age|any_in|any_out|anyarray_in|anyarray_out|anyarray_recv|anyarray_send|anyelement_in|anyelement_out|anyenum_in|anyenum_out|anynonarray_in|anynonarray_out|anytextcat|area|areajoinsel|areasel|array_agg|array_agg_finalfn|array_agg_transfn|array_append|array_cat|array_dims|array_eq|array_fill|array_ge|array_gt|array_in|array_larger|array_le|array_length|array_lower|array_lt|array_ndims|array_ne|array_out|array_prepend|array_recv|array_send|array_smaller|array_to_string|array_upper|arraycontained|arraycontains|arrayoverlap|ascii|ascii_to_mic|ascii_to_utf8|asin|atan|atan2|avg|big5_to_euc_tw|big5_to_mic|big5_to_utf8|bit_and|bit_in|bit_length|bit_or|bit_out|bit_recv|bit_send|bitand|bitcat|bitcmp|biteq|bitge|bitgt|bitle|bitlt|bitne|bitnot|bitor|bitshiftleft|bitshiftright|bittypmodin|bittypmodout|bitxor|bool|bool_and|bool_or|booland_statefunc|booleq|boolge|boolgt|boolin|boolle|boollt|boolne|boolor_statefunc|boolout|boolrecv|boolsend|box|box_above|box_above_eq|box_add|box_below|box_below_eq|box_center|box_contain|box_contain_pt|box_contained|box_distance|box_div|box_eq|box_ge|box_gt|box_in|box_intersect|box_le|box_left|box_lt|box_mul|box_out|box_overabove|box_overbelow|box_overlap|box_overleft|box_overright|box_recv|box_right|box_same|box_send|box_sub|bpchar_larger|bpchar_pattern_ge|bpchar_pattern_gt|bpchar_pattern_le|bpchar_pattern_lt|bpchar_smaller|bpcharcmp|bpchareq|bpcharge|bpchargt|bpchariclike|bpcharicnlike|bpcharicregexeq|bpcharicregexne|bpcharin|bpcharle|bpcharlike|bpcharlt|bpcharne|bpcharnlike|bpcharout|bpcharrecv|bpcharregexeq|bpcharregexne|bpcharsend|bpchartypmodin|bpchartypmodout|broadcast|btabstimecmp|btarraycmp|btbeginscan|btboolcmp|btbpchar_pattern_cmp|btbuild|btbuildempty|btbulkdelete|btcharcmp|btcostestimate|btendscan|btfloat48cmp|btfloat4cmp|btfloat84cmp|btfloat8cmp|btgetbitmap|btgettuple|btinsert|btint24cmp|btint28cmp|btint2cmp|btint42cmp|btint48cmp|btint4cmp|btint82cmp|btint84cmp|btint8cmp|btmarkpos|btnamecmp|btoidcmp|btoidvectorcmp|btoptions|btrecordcmp|btreltimecmp|btrescan|btrestrpos|btrim|bttext_pattern_cmp|bttextcmp|bttidcmp|bttintervalcmp|btvacuumcleanup|byteacat|byteacmp|byteaeq|byteage|byteagt|byteain|byteale|bytealike|bytealt|byteane|byteanlike|byteaout|bytearecv|byteasend|cash_cmp|cash_div_cash|cash_div_flt4|cash_div_flt8|cash_div_int2|cash_div_int4|cash_eq|cash_ge|cash_gt|cash_in|cash_le|cash_lt|cash_mi|cash_mul_flt4|cash_mul_flt8|cash_mul_int2|cash_mul_int4|cash_ne|cash_out|cash_pl|cash_recv|cash_send|cash_words|cashlarger|cashsmaller|cbrt|ceil|ceiling|center|char|char_length|character_length|chareq|charge|chargt|charin|charle|charlt|charne|charout|charrecv|charsend|chr|cideq|cidin|cidout|cidr|cidr_in|cidr_out|cidr_recv|cidr_send|cidrecv|cidsend|circle|circle_above|circle_add_pt|circle_below|circle_center|circle_contain|circle_contain_pt|circle_contained|circle_distance|circle_div_pt|circle_eq|circle_ge|circle_gt|circle_in|circle_le|circle_left|circle_lt|circle_mul_pt|circle_ne|circle_out|circle_overabove|circle_overbelow|circle_overlap|circle_overleft|circle_overright|circle_recv|circle_right|circle_same|circle_send|circle_sub_pt|clock_timestamp|close_lb|close_ls|close_lseg|close_pb|close_pl|close_ps|close_sb|close_sl|col_description|concat|concat_ws|contjoinsel|contsel|convert|convert_from|convert_to|corr|cos|cot|count|covar_pop|covar_samp|cstring_in|cstring_out|cstring_recv|cstring_send|cume_dist|current_database|current_query|current_schema|current_schemas|current_setting|current_user|currtid|currtid2|currval|cursor_to_xml|cursor_to_xmlschema|database_to_xml|database_to_xml_and_xmlschema|database_to_xmlschema|date|date_cmp|date_cmp_timestamp|date_cmp_timestamptz|date_eq|date_eq_timestamp|date_eq_timestamptz|date_ge|date_ge_timestamp|date_ge_timestamptz|date_gt|date_gt_timestamp|date_gt_timestamptz|date_in|date_larger|date_le|date_le_timestamp|date_le_timestamptz|date_lt|date_lt_timestamp|date_lt_timestamptz|date_mi|date_mi_interval|date_mii|date_ne|date_ne_timestamp|date_ne_timestamptz|date_out|date_part|date_pl_interval|date_pli|date_recv|date_send|date_smaller|date_trunc|datetime_pl|datetimetz_pl|dcbrt|decode|degrees|dense_rank|dexp|diagonal|diameter|dispell_init|dispell_lexize|dist_cpoly|dist_lb|dist_pb|dist_pc|dist_pl|dist_ppath|dist_ps|dist_sb|dist_sl|div|dlog1|dlog10|domain_in|domain_recv|dpow|dround|dsimple_init|dsimple_lexize|dsnowball_init|dsnowball_lexize|dsqrt|dsynonym_init|dsynonym_lexize|dtrunc|encode|enum_cmp|enum_eq|enum_first|enum_ge|enum_gt|enum_in|enum_larger|enum_last|enum_le|enum_lt|enum_ne|enum_out|enum_range|enum_recv|enum_send|enum_smaller|eqjoinsel|eqsel|euc_cn_to_mic|euc_cn_to_utf8|euc_jis_2004_to_shift_jis_2004|euc_jis_2004_to_utf8|euc_jp_to_mic|euc_jp_to_sjis|euc_jp_to_utf8|euc_kr_to_mic|euc_kr_to_utf8|euc_tw_to_big5|euc_tw_to_mic|euc_tw_to_utf8|every|exp|factorial|family|fdw_handler_in|fdw_handler_out|first_value|float4|float48div|float48eq|float48ge|float48gt|float48le|float48lt|float48mi|float48mul|float48ne|float48pl|float4_accum|float4abs|float4div|float4eq|float4ge|float4gt|float4in|float4larger|float4le|float4lt|float4mi|float4mul|float4ne|float4out|float4pl|float4recv|float4send|float4smaller|float4um|float4up|float8|float84div|float84eq|float84ge|float84gt|float84le|float84lt|float84mi|float84mul|float84ne|float84pl|float8_accum|float8_avg|float8_corr|float8_covar_pop|float8_covar_samp|float8_regr_accum|float8_regr_avgx|float8_regr_avgy|float8_regr_intercept|float8_regr_r2|float8_regr_slope|float8_regr_sxx|float8_regr_sxy|float8_regr_syy|float8_stddev_pop|float8_stddev_samp|float8_var_pop|float8_var_samp|float8abs|float8div|float8eq|float8ge|float8gt|float8in|float8larger|float8le|float8lt|float8mi|float8mul|float8ne|float8out|float8pl|float8recv|float8send|float8smaller|float8um|float8up|floor|flt4_mul_cash|flt8_mul_cash|fmgr_c_validator|fmgr_internal_validator|fmgr_sql_validator|format|format_type|gb18030_to_utf8|gbk_to_utf8|generate_series|generate_subscripts|get_bit|get_byte|get_current_ts_config|getdatabaseencoding|getpgusername|gin_cmp_prefix|gin_cmp_tslexeme|gin_extract_tsquery|gin_extract_tsvector|gin_tsquery_consistent|ginarrayconsistent|ginarrayextract|ginbeginscan|ginbuild|ginbuildempty|ginbulkdelete|gincostestimate|ginendscan|gingetbitmap|gininsert|ginmarkpos|ginoptions|ginqueryarrayextract|ginrescan|ginrestrpos|ginvacuumcleanup|gist_box_compress|gist_box_consistent|gist_box_decompress|gist_box_penalty|gist_box_picksplit|gist_box_same|gist_box_union|gist_circle_compress|gist_circle_consistent|gist_point_compress|gist_point_consistent|gist_point_distance|gist_poly_compress|gist_poly_consistent|gistbeginscan|gistbuild|gistbuildempty|gistbulkdelete|gistcostestimate|gistendscan|gistgetbitmap|gistgettuple|gistinsert|gistmarkpos|gistoptions|gistrescan|gistrestrpos|gistvacuumcleanup|gtsquery_compress|gtsquery_consistent|gtsquery_decompress|gtsquery_penalty|gtsquery_picksplit|gtsquery_same|gtsquery_union|gtsvector_compress|gtsvector_consistent|gtsvector_decompress|gtsvector_penalty|gtsvector_picksplit|gtsvector_same|gtsvector_union|gtsvectorin|gtsvectorout|has_any_column_privilege|has_column_privilege|has_database_privilege|has_foreign_data_wrapper_privilege|has_function_privilege|has_language_privilege|has_schema_privilege|has_sequence_privilege|has_server_privilege|has_table_privilege|has_tablespace_privilege|hash_aclitem|hash_array|hash_numeric|hashbeginscan|hashbpchar|hashbuild|hashbuildempty|hashbulkdelete|hashchar|hashcostestimate|hashendscan|hashenum|hashfloat4|hashfloat8|hashgetbitmap|hashgettuple|hashinet|hashinsert|hashint2|hashint2vector|hashint4|hashint8|hashmacaddr|hashmarkpos|hashname|hashoid|hashoidvector|hashoptions|hashrescan|hashrestrpos|hashtext|hashvacuumcleanup|hashvarlena|height|host|hostmask|iclikejoinsel|iclikesel|icnlikejoinsel|icnlikesel|icregexeqjoinsel|icregexeqsel|icregexnejoinsel|icregexnesel|inet_client_addr|inet_client_port|inet_in|inet_out|inet_recv|inet_send|inet_server_addr|inet_server_port|inetand|inetmi|inetmi_int8|inetnot|inetor|inetpl|initcap|int2|int24div|int24eq|int24ge|int24gt|int24le|int24lt|int24mi|int24mul|int24ne|int24pl|int28div|int28eq|int28ge|int28gt|int28le|int28lt|int28mi|int28mul|int28ne|int28pl|int2_accum|int2_avg_accum|int2_mul_cash|int2_sum|int2abs|int2and|int2div|int2eq|int2ge|int2gt|int2in|int2larger|int2le|int2lt|int2mi|int2mod|int2mul|int2ne|int2not|int2or|int2out|int2pl|int2recv|int2send|int2shl|int2shr|int2smaller|int2um|int2up|int2vectoreq|int2vectorin|int2vectorout|int2vectorrecv|int2vectorsend|int2xor|int4|int42div|int42eq|int42ge|int42gt|int42le|int42lt|int42mi|int42mul|int42ne|int42pl|int48div|int48eq|int48ge|int48gt|int48le|int48lt|int48mi|int48mul|int48ne|int48pl|int4_accum|int4_avg_accum|int4_mul_cash|int4_sum|int4abs|int4and|int4div|int4eq|int4ge|int4gt|int4in|int4inc|int4larger|int4le|int4lt|int4mi|int4mod|int4mul|int4ne|int4not|int4or|int4out|int4pl|int4recv|int4send|int4shl|int4shr|int4smaller|int4um|int4up|int4xor|int8|int82div|int82eq|int82ge|int82gt|int82le|int82lt|int82mi|int82mul|int82ne|int82pl|int84div|int84eq|int84ge|int84gt|int84le|int84lt|int84mi|int84mul|int84ne|int84pl|int8_accum|int8_avg|int8_avg_accum|int8_sum|int8abs|int8and|int8div|int8eq|int8ge|int8gt|int8in|int8inc|int8inc_any|int8inc_float8_float8|int8larger|int8le|int8lt|int8mi|int8mod|int8mul|int8ne|int8not|int8or|int8out|int8pl|int8pl_inet|int8recv|int8send|int8shl|int8shr|int8smaller|int8um|int8up|int8xor|integer_pl_date|inter_lb|inter_sb|inter_sl|internal_in|internal_out|interval_accum|interval_avg|interval_cmp|interval_div|interval_eq|interval_ge|interval_gt|interval_hash|interval_in|interval_larger|interval_le|interval_lt|interval_mi|interval_mul|interval_ne|interval_out|interval_pl|interval_pl_date|interval_pl_time|interval_pl_timestamp|interval_pl_timestamptz|interval_pl_timetz|interval_recv|interval_send|interval_smaller|interval_um|intervaltypmodin|intervaltypmodout|intinterval|isclosed|isfinite|ishorizontal|iso8859_1_to_utf8|iso8859_to_utf8|iso_to_koi8r|iso_to_mic|iso_to_win1251|iso_to_win866|isopen|isparallel|isperp|isvertical|johab_to_utf8|justify_days|justify_hours|justify_interval|koi8r_to_iso|koi8r_to_mic|koi8r_to_utf8|koi8r_to_win1251|koi8r_to_win866|koi8u_to_utf8|lag|language_handler_in|language_handler_out|last_value|lastval|latin1_to_mic|latin2_to_mic|latin2_to_win1250|latin3_to_mic|latin4_to_mic|lead|left|length|like|like_escape|likejoinsel|likesel|line|line_distance|line_eq|line_horizontal|line_in|line_interpt|line_intersect|line_out|line_parallel|line_perp|line_recv|line_send|line_vertical|ln|lo_close|lo_creat|lo_create|lo_export|lo_import|lo_lseek|lo_open|lo_tell|lo_truncate|lo_unlink|log|loread|lower|lowrite|lpad|lseg|lseg_center|lseg_distance|lseg_eq|lseg_ge|lseg_gt|lseg_horizontal|lseg_in|lseg_interpt|lseg_intersect|lseg_le|lseg_length|lseg_lt|lseg_ne|lseg_out|lseg_parallel|lseg_perp|lseg_recv|lseg_send|lseg_vertical|ltrim|macaddr_cmp|macaddr_eq|macaddr_ge|macaddr_gt|macaddr_in|macaddr_le|macaddr_lt|macaddr_ne|macaddr_out|macaddr_recv|macaddr_send|makeaclitem|masklen|max|md5|mic_to_ascii|mic_to_big5|mic_to_euc_cn|mic_to_euc_jp|mic_to_euc_kr|mic_to_euc_tw|mic_to_iso|mic_to_koi8r|mic_to_latin1|mic_to_latin2|mic_to_latin3|mic_to_latin4|mic_to_sjis|mic_to_win1250|mic_to_win1251|mic_to_win866|min|mktinterval|mod|money|mul_d_interval|name|nameeq|namege|namegt|nameiclike|nameicnlike|nameicregexeq|nameicregexne|namein|namele|namelike|namelt|namene|namenlike|nameout|namerecv|nameregexeq|nameregexne|namesend|neqjoinsel|neqsel|netmask|network|network_cmp|network_eq|network_ge|network_gt|network_le|network_lt|network_ne|network_sub|network_subeq|network_sup|network_supeq|nextval|nlikejoinsel|nlikesel|notlike|now|npoints|nth_value|ntile|numeric_abs|numeric_accum|numeric_add|numeric_avg|numeric_avg_accum|numeric_cmp|numeric_div|numeric_div_trunc|numeric_eq|numeric_exp|numeric_fac|numeric_ge|numeric_gt|numeric_in|numeric_inc|numeric_larger|numeric_le|numeric_ln|numeric_log|numeric_lt|numeric_mod|numeric_mul|numeric_ne|numeric_out|numeric_power|numeric_recv|numeric_send|numeric_smaller|numeric_sqrt|numeric_stddev_pop|numeric_stddev_samp|numeric_sub|numeric_uminus|numeric_uplus|numeric_var_pop|numeric_var_samp|numerictypmodin|numerictypmodout|numnode|obj_description|octet_length|oid|oideq|oidge|oidgt|oidin|oidlarger|oidle|oidlt|oidne|oidout|oidrecv|oidsend|oidsmaller|oidvectoreq|oidvectorge|oidvectorgt|oidvectorin|oidvectorle|oidvectorlt|oidvectorne|oidvectorout|oidvectorrecv|oidvectorsend|oidvectortypes|on_pb|on_pl|on_ppath|on_ps|on_sb|on_sl|opaque_in|opaque_out|overlaps|overlay|path|path_add|path_add_pt|path_center|path_contain_pt|path_distance|path_div_pt|path_in|path_inter|path_length|path_mul_pt|path_n_eq|path_n_ge|path_n_gt|path_n_le|path_n_lt|path_npoints|path_out|path_recv|path_send|path_sub_pt|pclose|percent_rank|pg_advisory_lock|pg_advisory_lock_shared|pg_advisory_unlock|pg_advisory_unlock_all|pg_advisory_unlock_shared|pg_advisory_xact_lock|pg_advisory_xact_lock_shared|pg_available_extension_versions|pg_available_extensions|pg_backend_pid|pg_cancel_backend|pg_char_to_encoding|pg_client_encoding|pg_collation_is_visible|pg_column_size|pg_conf_load_time|pg_conversion_is_visible|pg_create_restore_point|pg_current_xlog_insert_location|pg_current_xlog_location|pg_cursor|pg_database_size|pg_describe_object|pg_encoding_max_length|pg_encoding_to_char|pg_extension_config_dump|pg_extension_update_paths|pg_function_is_visible|pg_get_constraintdef|pg_get_expr|pg_get_function_arguments|pg_get_function_identity_arguments|pg_get_function_result|pg_get_functiondef|pg_get_indexdef|pg_get_keywords|pg_get_ruledef|pg_get_serial_sequence|pg_get_triggerdef|pg_get_userbyid|pg_get_viewdef|pg_has_role|pg_indexes_size|pg_is_in_recovery|pg_is_other_temp_schema|pg_is_xlog_replay_paused|pg_last_xact_replay_timestamp|pg_last_xlog_receive_location|pg_last_xlog_replay_location|pg_listening_channels|pg_lock_status|pg_ls_dir|pg_my_temp_schema|pg_node_tree_in|pg_node_tree_out|pg_node_tree_recv|pg_node_tree_send|pg_notify|pg_opclass_is_visible|pg_operator_is_visible|pg_options_to_table|pg_postmaster_start_time|pg_prepared_statement|pg_prepared_xact|pg_read_binary_file|pg_read_file|pg_relation_filenode|pg_relation_filepath|pg_relation_size|pg_reload_conf|pg_rotate_logfile|pg_sequence_parameters|pg_show_all_settings|pg_size_pretty|pg_sleep|pg_start_backup|pg_stat_clear_snapshot|pg_stat_file|pg_stat_get_activity|pg_stat_get_analyze_count|pg_stat_get_autoanalyze_count|pg_stat_get_autovacuum_count|pg_stat_get_backend_activity|pg_stat_get_backend_activity_start|pg_stat_get_backend_client_addr|pg_stat_get_backend_client_port|pg_stat_get_backend_dbid|pg_stat_get_backend_idset|pg_stat_get_backend_pid|pg_stat_get_backend_start|pg_stat_get_backend_userid|pg_stat_get_backend_waiting|pg_stat_get_backend_xact_start|pg_stat_get_bgwriter_buf_written_checkpoints|pg_stat_get_bgwriter_buf_written_clean|pg_stat_get_bgwriter_maxwritten_clean|pg_stat_get_bgwriter_requested_checkpoints|pg_stat_get_bgwriter_stat_reset_time|pg_stat_get_bgwriter_timed_checkpoints|pg_stat_get_blocks_fetched|pg_stat_get_blocks_hit|pg_stat_get_buf_alloc|pg_stat_get_buf_fsync_backend|pg_stat_get_buf_written_backend|pg_stat_get_db_blocks_fetched|pg_stat_get_db_blocks_hit|pg_stat_get_db_conflict_all|pg_stat_get_db_conflict_bufferpin|pg_stat_get_db_conflict_lock|pg_stat_get_db_conflict_snapshot|pg_stat_get_db_conflict_startup_deadlock|pg_stat_get_db_conflict_tablespace|pg_stat_get_db_numbackends|pg_stat_get_db_stat_reset_time|pg_stat_get_db_tuples_deleted|pg_stat_get_db_tuples_fetched|pg_stat_get_db_tuples_inserted|pg_stat_get_db_tuples_returned|pg_stat_get_db_tuples_updated|pg_stat_get_db_xact_commit|pg_stat_get_db_xact_rollback|pg_stat_get_dead_tuples|pg_stat_get_function_calls|pg_stat_get_function_self_time|pg_stat_get_function_time|pg_stat_get_last_analyze_time|pg_stat_get_last_autoanalyze_time|pg_stat_get_last_autovacuum_time|pg_stat_get_last_vacuum_time|pg_stat_get_live_tuples|pg_stat_get_numscans|pg_stat_get_tuples_deleted|pg_stat_get_tuples_fetched|pg_stat_get_tuples_hot_updated|pg_stat_get_tuples_inserted|pg_stat_get_tuples_returned|pg_stat_get_tuples_updated|pg_stat_get_vacuum_count|pg_stat_get_wal_senders|pg_stat_get_xact_blocks_fetched|pg_stat_get_xact_blocks_hit|pg_stat_get_xact_function_calls|pg_stat_get_xact_function_self_time|pg_stat_get_xact_function_time|pg_stat_get_xact_numscans|pg_stat_get_xact_tuples_deleted|pg_stat_get_xact_tuples_fetched|pg_stat_get_xact_tuples_hot_updated|pg_stat_get_xact_tuples_inserted|pg_stat_get_xact_tuples_returned|pg_stat_get_xact_tuples_updated|pg_stat_reset|pg_stat_reset_shared|pg_stat_reset_single_function_counters|pg_stat_reset_single_table_counters|pg_stop_backup|pg_switch_xlog|pg_table_is_visible|pg_table_size|pg_tablespace_databases|pg_tablespace_size|pg_terminate_backend|pg_timezone_abbrevs|pg_timezone_names|pg_total_relation_size|pg_try_advisory_lock|pg_try_advisory_lock_shared|pg_try_advisory_xact_lock|pg_try_advisory_xact_lock_shared|pg_ts_config_is_visible|pg_ts_dict_is_visible|pg_ts_parser_is_visible|pg_ts_template_is_visible|pg_type_is_visible|pg_typeof|pg_xlog_replay_pause|pg_xlog_replay_resume|pg_xlogfile_name|pg_xlogfile_name_offset|pi|plainto_tsquery|plpgsql_call_handler|plpgsql_inline_handler|plpgsql_validator|point|point_above|point_add|point_below|point_distance|point_div|point_eq|point_horiz|point_in|point_left|point_mul|point_ne|point_out|point_recv|point_right|point_send|point_sub|point_vert|poly_above|poly_below|poly_center|poly_contain|poly_contain_pt|poly_contained|poly_distance|poly_in|poly_left|poly_npoints|poly_out|poly_overabove|poly_overbelow|poly_overlap|poly_overleft|poly_overright|poly_recv|poly_right|poly_same|poly_send|polygon|popen|position|positionjoinsel|positionsel|postgresql_fdw_validator|pow|power|prsd_end|prsd_headline|prsd_lextype|prsd_nexttoken|prsd_start|pt_contained_circle|pt_contained_poly|query_to_xml|query_to_xml_and_xmlschema|query_to_xmlschema|querytree|quote_ident|quote_literal|quote_nullable|radians|radius|random|rank|record_eq|record_ge|record_gt|record_in|record_le|record_lt|record_ne|record_out|record_recv|record_send|regclass|regclassin|regclassout|regclassrecv|regclasssend|regconfigin|regconfigout|regconfigrecv|regconfigsend|regdictionaryin|regdictionaryout|regdictionaryrecv|regdictionarysend|regexeqjoinsel|regexeqsel|regexnejoinsel|regexnesel|regexp_matches|regexp_replace|regexp_split_to_array|regexp_split_to_table|regoperatorin|regoperatorout|regoperatorrecv|regoperatorsend|regoperin|regoperout|regoperrecv|regopersend|regprocedurein|regprocedureout|regprocedurerecv|regproceduresend|regprocin|regprocout|regprocrecv|regprocsend|regr_avgx|regr_avgy|regr_count|regr_intercept|regr_r2|regr_slope|regr_sxx|regr_sxy|regr_syy|regtypein|regtypeout|regtyperecv|regtypesend|reltime|reltimeeq|reltimege|reltimegt|reltimein|reltimele|reltimelt|reltimene|reltimeout|reltimerecv|reltimesend|repeat|replace|reverse|right|round|row_number|rpad|rtrim|scalargtjoinsel|scalargtsel|scalarltjoinsel|scalarltsel|schema_to_xml|schema_to_xml_and_xmlschema|schema_to_xmlschema|session_user|set_bit|set_byte|set_config|set_masklen|setseed|setval|setweight|shell_in|shell_out|shift_jis_2004_to_euc_jis_2004|shift_jis_2004_to_utf8|shobj_description|sign|similar_escape|sin|sjis_to_euc_jp|sjis_to_mic|sjis_to_utf8|slope|smgreq|smgrin|smgrne|smgrout|split_part|sqrt|statement_timestamp|stddev|stddev_pop|stddev_samp|string_agg|string_agg_finalfn|string_agg_transfn|string_to_array|strip|strpos|substr|substring|sum|suppress_redundant_updates_trigger|table_to_xml|table_to_xml_and_xmlschema|table_to_xmlschema|tan|text|text_ge|text_gt|text_larger|text_le|text_lt|text_pattern_ge|text_pattern_gt|text_pattern_le|text_pattern_lt|text_smaller|textanycat|textcat|texteq|texticlike|texticnlike|texticregexeq|texticregexne|textin|textlen|textlike|textne|textnlike|textout|textrecv|textregexeq|textregexne|textsend|thesaurus_init|thesaurus_lexize|tideq|tidge|tidgt|tidin|tidlarger|tidle|tidlt|tidne|tidout|tidrecv|tidsend|tidsmaller|time_cmp|time_eq|time_ge|time_gt|time_hash|time_in|time_larger|time_le|time_lt|time_mi_interval|time_mi_time|time_ne|time_out|time_pl_interval|time_recv|time_send|time_smaller|timedate_pl|timemi|timenow|timeofday|timepl|timestamp_cmp|timestamp_cmp_date|timestamp_cmp_timestamptz|timestamp_eq|timestamp_eq_date|timestamp_eq_timestamptz|timestamp_ge|timestamp_ge_date|timestamp_ge_timestamptz|timestamp_gt|timestamp_gt_date|timestamp_gt_timestamptz|timestamp_hash|timestamp_in|timestamp_larger|timestamp_le|timestamp_le_date|timestamp_le_timestamptz|timestamp_lt|timestamp_lt_date|timestamp_lt_timestamptz|timestamp_mi|timestamp_mi_interval|timestamp_ne|timestamp_ne_date|timestamp_ne_timestamptz|timestamp_out|timestamp_pl_interval|timestamp_recv|timestamp_send|timestamp_smaller|timestamptypmodin|timestamptypmodout|timestamptz_cmp|timestamptz_cmp_date|timestamptz_cmp_timestamp|timestamptz_eq|timestamptz_eq_date|timestamptz_eq_timestamp|timestamptz_ge|timestamptz_ge_date|timestamptz_ge_timestamp|timestamptz_gt|timestamptz_gt_date|timestamptz_gt_timestamp|timestamptz_in|timestamptz_larger|timestamptz_le|timestamptz_le_date|timestamptz_le_timestamp|timestamptz_lt|timestamptz_lt_date|timestamptz_lt_timestamp|timestamptz_mi|timestamptz_mi_interval|timestamptz_ne|timestamptz_ne_date|timestamptz_ne_timestamp|timestamptz_out|timestamptz_pl_interval|timestamptz_recv|timestamptz_send|timestamptz_smaller|timestamptztypmodin|timestamptztypmodout|timetypmodin|timetypmodout|timetz_cmp|timetz_eq|timetz_ge|timetz_gt|timetz_hash|timetz_in|timetz_larger|timetz_le|timetz_lt|timetz_mi_interval|timetz_ne|timetz_out|timetz_pl_interval|timetz_recv|timetz_send|timetz_smaller|timetzdate_pl|timetztypmodin|timetztypmodout|timezone|tinterval|tintervalct|tintervalend|tintervaleq|tintervalge|tintervalgt|tintervalin|tintervalle|tintervalleneq|tintervallenge|tintervallengt|tintervallenle|tintervallenlt|tintervallenne|tintervallt|tintervalne|tintervalout|tintervalov|tintervalrecv|tintervalrel|tintervalsame|tintervalsend|tintervalstart|to_ascii|to_char|to_date|to_hex|to_number|to_timestamp|to_tsquery|to_tsvector|transaction_timestamp|translate|trigger_in|trigger_out|trunc|ts_debug|ts_headline|ts_lexize|ts_match_qv|ts_match_tq|ts_match_tt|ts_match_vq|ts_parse|ts_rank|ts_rank_cd|ts_rewrite|ts_stat|ts_token_type|ts_typanalyze|tsmatchjoinsel|tsmatchsel|tsq_mcontained|tsq_mcontains|tsquery_and|tsquery_cmp|tsquery_eq|tsquery_ge|tsquery_gt|tsquery_le|tsquery_lt|tsquery_ne|tsquery_not|tsquery_or|tsqueryin|tsqueryout|tsqueryrecv|tsquerysend|tsvector_cmp|tsvector_concat|tsvector_eq|tsvector_ge|tsvector_gt|tsvector_le|tsvector_lt|tsvector_ne|tsvector_update_trigger|tsvector_update_trigger_column|tsvectorin|tsvectorout|tsvectorrecv|tsvectorsend|txid_current|txid_current_snapshot|txid_snapshot_in|txid_snapshot_out|txid_snapshot_recv|txid_snapshot_send|txid_snapshot_xip|txid_snapshot_xmax|txid_snapshot_xmin|txid_visible_in_snapshot|uhc_to_utf8|unique_key_recheck|unknownin|unknownout|unknownrecv|unknownsend|unnest|upper|utf8_to_ascii|utf8_to_big5|utf8_to_euc_cn|utf8_to_euc_jis_2004|utf8_to_euc_jp|utf8_to_euc_kr|utf8_to_euc_tw|utf8_to_gb18030|utf8_to_gbk|utf8_to_iso8859|utf8_to_iso8859_1|utf8_to_johab|utf8_to_koi8r|utf8_to_koi8u|utf8_to_shift_jis_2004|utf8_to_sjis|utf8_to_uhc|utf8_to_win|uuid_cmp|uuid_eq|uuid_ge|uuid_gt|uuid_hash|uuid_in|uuid_le|uuid_lt|uuid_ne|uuid_out|uuid_recv|uuid_send|var_pop|var_samp|varbit_in|varbit_out|varbit_recv|varbit_send|varbitcmp|varbiteq|varbitge|varbitgt|varbitle|varbitlt|varbitne|varbittypmodin|varbittypmodout|varcharin|varcharout|varcharrecv|varcharsend|varchartypmodin|varchartypmodout|variance|version|void_in|void_out|void_recv|void_send|width|width_bucket|win1250_to_latin2|win1250_to_mic|win1251_to_iso|win1251_to_koi8r|win1251_to_mic|win1251_to_win866|win866_to_iso|win866_to_koi8r|win866_to_mic|win866_to_win1251|win_to_utf8|xideq|xideqint4|xidin|xidout|xidrecv|xidsend|xml|xml_in|xml_is_well_formed|xml_is_well_formed_content|xml_is_well_formed_document|xml_out|xml_recv|xml_send|xmlagg|xmlcomment|xmlconcat2|xmlexists|xmlvalidate|xpath|xpath_exists".split("|")),c=[{token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:"variable.language",regex:'".*?"'},{token:"constant.numeric",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:function(c){return c=c.toLowerCase(),a.hasOwnProperty(c)?"keyword":b.hasOwnProperty(c)?"support.function":"identifier"},regex:"[a-zA-Z_][a-zA-Z0-9_$]*\\b"},{token:"keyword.operator",regex:"!|!!|!~|!~\\*|!~~|!~~\\*|#|##|#<|#<=|#<>|#=|#>|#>=|%|\\&|\\&\\&|\\&<|\\&<\\||\\&>|\\*|\\+|\\-|/|<|<#>|<\\->|<<|<<=|<<\\||<=|<>|<\\?>|<@|<\\^|=|>|>=|>>|>>=|>\\^|\\?#|\\?\\-|\\?\\-\\||\\?\\||\\?\\|\\||@|@\\-@|@>|@@|@@@|\\^|\\||\\|\\&>|\\|/|\\|>>|\\|\\||\\|\\|/|~|~\\*|~<=~|~<~|~=|~>=~|~>~|~~|~~\\*"},{token:"lparen.paren",regex:"[\\(]"},{token:"paren.rparen",regex:"[\\)]"},{token:"text",regex:"\\s+"}];this.$rules={start:[{token:"comment",regex:"--.*$"},(new f).getStartRule("doc-start"),{token:"comment",merge:!0,regex:"\\/\\*",next:"comment"},{token:"keyword.statementBegin",regex:"^[a-zA-Z]+",next:"statement"},{token:"support.buildin",regex:"^\\\\[\\S]+.*$"}],statement:[{token:"comment",regex:"--.*$"},{token:"comment",merge:!0,regex:"\\/\\*",next:"commentStatement"},{token:"statementEnd",regex:";",next:"start"},{token:"string",regex:"\\$perl\\$",next:"perl-start"},{token:"string",regex:"\\$python\\$",next:"python-start"},{token:"string",regex:"\\$[\\w_0-9]*\\$$",next:"dollarSql"},{token:"string",regex:"\\$[\\w_0-9]*\\$",next:"dollarStatementString"}].concat(c),dollarSql:[{token:"comment",regex:"--.*$"},{token:"comment",merge:!0,regex:"\\/\\*",next:"commentDollarSql"},{token:"string",regex:"^\\$[\\w_0-9]*\\$",next:"statement"},{token:"string",regex:"\\$[\\w_0-9]*\\$",next:"dollarSqlString"}].concat(c),comment:[{token:"comment",regex:".*?\\*\\/",next:"start"},{token:"comment",merge:!0,regex:".+"}],commentStatement:[{token:"comment",regex:".*?\\*\\/",next:"statement"},{token:"comment",merge:!0,regex:".+"}],commentDollarSql:[{token:"comment",regex:".*?\\*\\/",next:"dollarSql"},{token:"comment",merge:!0,regex:".+"}],dollarStatementString:[{token:"string",regex:".*?\\$[\\w_0-9]*\\$",next:"statement"},{token:"string",merge:!0,regex:".+"}],dollarSqlString:[{token:"string",regex:".*?\\$[\\w_0-9]*\\$",next:"dollarSql"},{token:"string",merge:!0,regex:".+"}]},this.embedRules(f,"doc-",[(new f).getEndRule("start")]),this.embedRules(h,"perl-",[{token:"string",regex:"\\$perl\\$",next:"statement"}]),this.embedRules(i,"python-",[{token:"string",regex:"\\$python\\$",next:"statement"}])};d.inherits(j,g),b.PgsqlHighlightRules=j}),define("ace/mode/doc_comment_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text_highlight_rules").TextHighlightRules,f=function(){this.$rules={start:[{token:"comment.doc.tag",regex:"@[\\w\\d_]+"},{token:"comment.doc",merge:!0,regex:"\\s+"},{token:"comment.doc",merge:!0,regex:"TODO"},{token:"comment.doc",merge:!0,regex:"[^@\\*]+"},{token:"comment.doc",merge:!0,regex:"."}]}};d.inherits(f,e),function(){this.getStartRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\/\\*(?=\\*)",next:a}},this.getEndRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\*\\/",next:a}}}.call(f.prototype),b.DocCommentHighlightRules=f}),define("ace/mode/perl_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("./text_highlight_rules").TextHighlightRules,g=function(){var a=e.arrayToMap("base|constant|continue|else|elsif|for|foreach|format|goto|if|last|local|my|next|no|package|parent|redo|require|scalar|sub|unless|until|while|use|vars".split("|")),b=e.arrayToMap("ARGV|ENV|INC|SIG".split("|")),c=e.arrayToMap("getprotobynumber|getprotobyname|getservbyname|gethostbyaddr|gethostbyname|getservbyport|getnetbyaddr|getnetbyname|getsockname|getpeername|setpriority|getprotoent|setprotoent|getpriority|endprotoent|getservent|setservent|endservent|sethostent|socketpair|getsockopt|gethostent|endhostent|setsockopt|setnetent|quotemeta|localtime|prototype|getnetent|endnetent|rewinddir|wantarray|getpwuid|closedir|getlogin|readlink|endgrent|getgrgid|getgrnam|shmwrite|shutdown|readline|endpwent|setgrent|readpipe|formline|truncate|dbmclose|syswrite|setpwent|getpwnam|getgrent|getpwent|ucfirst|sysread|setpgrp|shmread|sysseek|sysopen|telldir|defined|opendir|connect|lcfirst|getppid|binmode|syscall|sprintf|getpgrp|readdir|seekdir|waitpid|reverse|unshift|symlink|dbmopen|semget|msgrcv|rename|listen|chroot|msgsnd|shmctl|accept|unpack|exists|fileno|shmget|system|unlink|printf|gmtime|msgctl|semctl|values|rindex|substr|splice|length|msgget|select|socket|return|caller|delete|alarm|ioctl|index|undef|lstat|times|srand|chown|fcntl|close|write|umask|rmdir|study|sleep|chomp|untie|print|utime|mkdir|atan2|split|crypt|flock|chmod|BEGIN|bless|chdir|semop|shift|reset|link|stat|chop|grep|fork|dump|join|open|tell|pipe|exit|glob|warn|each|bind|sort|pack|eval|push|keys|getc|kill|seek|sqrt|send|wait|rand|tied|read|time|exec|recv|eof|chr|int|ord|exp|pos|pop|sin|log|abs|oct|hex|tie|cos|vec|END|ref|map|die|uc|lc|do".split("|"));this.$rules={start:[{token:"comment",regex:"#.*$"},{token:"string.regexp",regex:"[/](?:(?:\\[(?:\\\\]|[^\\]])+\\])|(?:\\\\/|[^\\]/]))*[/]\\w*\\s*(?=[).,;]|$)"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",merge:!0,regex:'["].*\\\\$',next:"qqstring"},{token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:"string",merge:!0,regex:"['].*\\\\$",next:"qstring"},{token:"constant.numeric",regex:"0x[0-9a-fA-F]+\\b"},{token:"constant.numeric",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:function(d){return a.hasOwnProperty(d)?"keyword":b.hasOwnProperty(d)?"constant.language":c.hasOwnProperty(d)?"support.function":"identifier"},regex:"[a-zA-Z_$][a-zA-Z0-9_$]*\\b"},{token:"keyword.operator",regex:"\\.\\.\\.|\\|\\|=|>>=|<<=|<=>|&&=|=>|!~|\\^=|&=|\\|=|\\.=|x=|%=|\\/=|\\*=|\\-=|\\+=|=~|\\*\\*|\\-\\-|\\.\\.|\\|\\||&&|\\+\\+|\\->|!=|==|>=|<=|>>|<<|,|=|\\?\\:|\\^|\\||x|%|\\/|\\*|<|&|\\\\|~|!|>|\\.|\\-|\\+|\\-C|\\-b|\\-S|\\-u|\\-t|\\-p|\\-l|\\-d|\\-f|\\-g|\\-s|\\-z|\\-k|\\-e|\\-O|\\-T|\\-B|\\-M|\\-A|\\-X|\\-W|\\-c|\\-R|\\-o|\\-x|\\-w|\\-r|\\b(?:and|cmp|eq|ge|gt|le|lt|ne|not|or|xor)"},{token:"lparen",regex:"[[({]"},{token:"rparen",regex:"[\\])}]"},{token:"text",regex:"\\s+"}],qqstring:[{token:"string",regex:'(?:(?:\\\\.)|(?:[^"\\\\]))*?"',next:"start"},{token:"string",merge:!0,regex:".+"}],qstring:[{token:"string",regex:"(?:(?:\\\\.)|(?:[^'\\\\]))*?'",next:"start"},{token:"string",merge:!0,regex:".+"}]}};d.inherits(g,f),b.PerlHighlightRules=g}),define("ace/mode/python_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("./text_highlight_rules").TextHighlightRules,g=function(){var a=e.arrayToMap("and|as|assert|break|class|continue|def|del|elif|else|except|exec|finally|for|from|global|if|import|in|is|lambda|not|or|pass|print|raise|return|try|while|with|yield".split("|")),b=e.arrayToMap("True|False|None|NotImplemented|Ellipsis|__debug__".split("|")),c=e.arrayToMap("abs|divmod|input|open|staticmethod|all|enumerate|int|ord|str|any|eval|isinstance|pow|sum|basestring|execfile|issubclass|print|super|binfile|iter|property|tuple|bool|filter|len|range|type|bytearray|float|list|raw_input|unichr|callable|format|locals|reduce|unicode|chr|frozenset|long|reload|vars|classmethod|getattr|map|repr|xrange|cmp|globals|max|reversed|zip|compile|hasattr|memoryview|round|__import__|complex|hash|min|set|apply|delattr|help|next|setattr|buffer|dict|hex|object|slice|coerce|dir|id|oct|sorted|intern".split("|")),d=e.arrayToMap("".split("|")),f="(?:r|u|ur|R|U|UR|Ur|uR)?",g="(?:(?:[1-9]\\d*)|(?:0))",h="(?:0[oO]?[0-7]+)",i="(?:0[xX][\\dA-Fa-f]+)",j="(?:0[bB][01]+)",k="(?:"+g+"|"+h+"|"+i+"|"+j+")",l="(?:[eE][+-]?\\d+)",m="(?:\\.\\d+)",n="(?:\\d+)",o="(?:(?:"+n+"?"+m+")|(?:"+n+"\\.))",p="(?:(?:"+o+"|"+n+")"+l+")",q="(?:"+p+"|"+o+")";this.$rules={start:[{token:"comment",regex:"#.*$"},{token:"string",regex:f+'"{3}(?:[^\\\\]|\\\\.)*?"{3}'},{token:"string",merge:!0,regex:f+'"{3}.*$',next:"qqstring"},{token:"string",regex:f+'"(?:[^\\\\]|\\\\.)*?"'},{token:"string",regex:f+"'{3}(?:[^\\\\]|\\\\.)*?'{3}"},{token:"string",merge:!0,regex:f+"'{3}.*$",next:"qstring"},{token:"string",regex:f+"'(?:[^\\\\]|\\\\.)*?'"},{token:"constant.numeric",regex:"(?:"+q+"|\\d+)[jJ]\\b"},{token:"constant.numeric",regex:q},{token:"constant.numeric",regex:k+"[lL]\\b"},{token:"constant.numeric",regex:k+"\\b"},{token:function(e){return a.hasOwnProperty(e)?"keyword":b.hasOwnProperty(e)?"constant.language":d.hasOwnProperty(e)?"invalid.illegal":c.hasOwnProperty(e)?"support.function":e=="debugger"?"invalid.deprecated":"identifier"},regex:"[a-zA-Z_$][a-zA-Z0-9_$]*\\b"},{token:"keyword.operator",regex:"\\+|\\-|\\*|\\*\\*|\\/|\\/\\/|%|<<|>>|&|\\||\\^|~|<|>|<=|=>|==|!=|<>|="},{token:"lparen.paren",regex:"[\\[\\(\\{]"},{token:"paren.rparen",regex:"[\\]\\)\\}]"},{token:"text",regex:"\\s+"}],qqstring:[{token:"string",regex:'(?:[^\\\\]|\\\\.)*?"{3}',next:"start"},{token:"string",merge:!0,regex:".+"}],qstring:[{token:"string",regex:"(?:[^\\\\]|\\\\.)*?'{3}",next:"start"},{token:"string",merge:!0,regex:".+"}]}};d.inherits(g,f),b.PythonHighlightRules=g})
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-php-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-php-uncompressed.js
deleted file mode 100644
index 3b0c2f8de1..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-php-uncompressed.js
+++ /dev/null
@@ -1,1886 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
-* Version: MPL 1.1/GPL 2.0/LGPL 2.1
-*
-* The contents of this file are subject to the Mozilla Public License Version
-* 1.1 (the "License"); you may not use this file except in compliance with
-* the License. You may obtain a copy of the License at
-* http://www.mozilla.org/MPL/
-*
-* Software distributed under the License is distributed on an "AS IS" basis,
-* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-* for the specific language governing rights and limitations under the
-* License.
-*
-* The Original Code is Ajax.org Code Editor (ACE).
-*
-* The Initial Developer of the Original Code is
-* Ajax.org B.V.
-* Portions created by the Initial Developer are Copyright (C) 2010
-* the Initial Developer. All Rights Reserved.
-*
-* Contributor(s):
-*      André Fiedler <fiedler dot andre a t gmail dot com>
-*
-* Alternatively, the contents of this file may be used under the terms of
-* either the GNU General Public License Version 2 or later (the "GPL"), or
-* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-* in which case the provisions of the GPL or the LGPL are applicable instead
-* of those above. If you wish to allow use of your version of this file only
-* under the terms of either the GPL or the LGPL, and not to allow others to
-* use your version of this file under the terms of the MPL, indicate your
-* decision by deleting the provisions above and replace them with the notice
-* and other provisions required by the GPL or the LGPL. If you do not delete
-* the provisions above, a recipient may use your version of this file under
-* the terms of any one of the MPL, the GPL or the LGPL.
-*
-* ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/php', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/php_highlight_rules', 'ace/mode/matching_brace_outdent', 'ace/range', 'ace/mode/behaviour/cstyle', 'ace/mode/folding/cstyle'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
-var PhpHighlightRules = require("./php_highlight_rules").PhpHighlightRules;
-var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
-var Range = require("../range").Range;
-var CstyleBehaviour = require("./behaviour/cstyle").CstyleBehaviour;
-var CStyleFoldMode = require("./folding/cstyle").FoldMode;
-
-var Mode = function() {
-    this.$tokenizer = new Tokenizer(new PhpHighlightRules().getRules());
-    this.$outdent = new MatchingBraceOutdent();
-    this.$behaviour = new CstyleBehaviour();
-    this.foldingRules = new CStyleFoldMode();
-};
-oop.inherits(Mode, TextMode);
-
-(function() {
-
-    this.toggleCommentLines = function(state, doc, startRow, endRow) {
-        var outdent = true;
-        var re = /^(\s*)#/;
-
-        for (var i=startRow; i<= endRow; i++) {
-            if (!re.test(doc.getLine(i))) {
-                outdent = false;
-                break;
-            }
-        }
-
-        if (outdent) {
-            var deleteRange = new Range(0, 0, 0, 0);
-            for (var i=startRow; i<= endRow; i++)
-            {
-                var line = doc.getLine(i);
-                var m = line.match(re);
-                deleteRange.start.row = i;
-                deleteRange.end.row = i;
-                deleteRange.end.column = m[0].length;
-                doc.replace(deleteRange, m[1]);
-            }
-        }
-        else {
-            doc.indentRows(startRow, endRow, "#");
-        }
-    };
-
-    this.getNextLineIndent = function(state, line, tab) {
-        var indent = this.$getIndent(line);
-
-        var tokenizedLine = this.$tokenizer.getLineTokens(line, state);
-        var tokens = tokenizedLine.tokens;
-
-        if (tokens.length && tokens[tokens.length-1].type == "comment") {
-            return indent;
-        }
-
-        if (state == "start") {
-            var match = line.match(/^.*[\{\(\[\:]\s*$/);
-            if (match) {
-                indent += tab;
-            }
-        }
-
-        return indent;
-    };
-
-    this.checkOutdent = function(state, line, input) {
-        return this.$outdent.checkOutdent(line, input);
-    };
-
-    this.autoOutdent = function(state, doc, row) {
-        this.$outdent.autoOutdent(doc, row);
-    };
-
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      André Fiedler <fiedler dot andre a t gmail dot com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK *****
- */
-
-define('ace/mode/php_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/mode/doc_comment_highlight_rules', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var lang = require("../lib/lang");
-var DocCommentHighlightRules = require("./doc_comment_highlight_rules").DocCommentHighlightRules;
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var PhpHighlightRules = function() {
-    var docComment = new DocCommentHighlightRules();
-    // http://php.net/quickref.php
-    var builtinFunctions = lang.arrayToMap(
-        ('abs|acos|acosh|addcslashes|addslashes|aggregate|aggregate_info|aggregate_methods|aggregate_methods_by_list|aggregate_methods_by_regexp|' +
-        'aggregate_properties|aggregate_properties_by_list|aggregate_properties_by_regexp|aggregation_info|amqpconnection|amqpexchange|amqpqueue|' +
-        'apache_child_terminate|apache_get_modules|apache_get_version|apache_getenv|apache_lookup_uri|apache_note|apache_request_headers|' +
-        'apache_reset_timeout|apache_response_headers|apache_setenv|apc_add|apc_bin_dump|apc_bin_dumpfile|apc_bin_load|apc_bin_loadfile|' +
-        'apc_cache_info|apc_cas|apc_clear_cache|apc_compile_file|apc_dec|apc_define_constants|apc_delete|apc_delete_file|apc_exists|apc_fetch|' +
-        'apc_inc|apc_load_constants|apc_sma_info|apc_store|apciterator|apd_breakpoint|apd_callstack|apd_clunk|apd_continue|apd_croak|' +
-        'apd_dump_function_table|apd_dump_persistent_resources|apd_dump_regular_resources|apd_echo|apd_get_active_symbols|apd_set_pprof_trace|' +
-        'apd_set_session|apd_set_session_trace|apd_set_session_trace_socket|appenditerator|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_replace|array_replace_recursive|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|arrayaccess|arrayiterator|arrayobject|arsort|asin|asinh|asort|assert|assert_options|atan|' +
-        'atan2|atanh|audioproperties|badfunctioncallexception|badmethodcallexception|base64_decode|base64_encode|base_convert|basename|' +
-        'bbcode_add_element|bbcode_add_smiley|bbcode_create|bbcode_destroy|bbcode_parse|bbcode_set_arg_parser|bbcode_set_flags|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|bind_textdomain_codeset|bindec|' +
-        'bindtextdomain|bson_decode|bson_encode|bumpValue|bzclose|bzcompress|bzdecompress|bzerrno|bzerror|bzerrstr|bzflush|bzopen|bzread|bzwrite|' +
-        'cachingiterator|cairo|cairo_create|cairo_font_face_get_type|cairo_font_face_status|cairo_font_options_create|cairo_font_options_equal|' +
-        'cairo_font_options_get_antialias|cairo_font_options_get_hint_metrics|cairo_font_options_get_hint_style|' +
-        'cairo_font_options_get_subpixel_order|cairo_font_options_hash|cairo_font_options_merge|cairo_font_options_set_antialias|' +
-        'cairo_font_options_set_hint_metrics|cairo_font_options_set_hint_style|cairo_font_options_set_subpixel_order|cairo_font_options_status|' +
-        'cairo_format_stride_for_width|cairo_image_surface_create|cairo_image_surface_create_for_data|cairo_image_surface_create_from_png|' +
-        'cairo_image_surface_get_data|cairo_image_surface_get_format|cairo_image_surface_get_height|cairo_image_surface_get_stride|' +
-        'cairo_image_surface_get_width|cairo_matrix_create_scale|cairo_matrix_create_translate|cairo_matrix_invert|cairo_matrix_multiply|' +
-        'cairo_matrix_rotate|cairo_matrix_transform_distance|cairo_matrix_transform_point|cairo_matrix_translate|cairo_pattern_add_color_stop_rgb|' +
-        'cairo_pattern_add_color_stop_rgba|cairo_pattern_create_for_surface|cairo_pattern_create_linear|cairo_pattern_create_radial|' +
-        'cairo_pattern_create_rgb|cairo_pattern_create_rgba|cairo_pattern_get_color_stop_count|cairo_pattern_get_color_stop_rgba|' +
-        'cairo_pattern_get_extend|cairo_pattern_get_filter|cairo_pattern_get_linear_points|cairo_pattern_get_matrix|' +
-        'cairo_pattern_get_radial_circles|cairo_pattern_get_rgba|cairo_pattern_get_surface|cairo_pattern_get_type|cairo_pattern_set_extend|' +
-        'cairo_pattern_set_filter|cairo_pattern_set_matrix|cairo_pattern_status|cairo_pdf_surface_create|cairo_pdf_surface_set_size|' +
-        'cairo_ps_get_levels|cairo_ps_level_to_string|cairo_ps_surface_create|cairo_ps_surface_dsc_begin_page_setup|' +
-        'cairo_ps_surface_dsc_begin_setup|cairo_ps_surface_dsc_comment|cairo_ps_surface_get_eps|cairo_ps_surface_restrict_to_level|' +
-        'cairo_ps_surface_set_eps|cairo_ps_surface_set_size|cairo_scaled_font_create|cairo_scaled_font_extents|cairo_scaled_font_get_ctm|' +
-        'cairo_scaled_font_get_font_face|cairo_scaled_font_get_font_matrix|cairo_scaled_font_get_font_options|cairo_scaled_font_get_scale_matrix|' +
-        'cairo_scaled_font_get_type|cairo_scaled_font_glyph_extents|cairo_scaled_font_status|cairo_scaled_font_text_extents|' +
-        'cairo_surface_copy_page|cairo_surface_create_similar|cairo_surface_finish|cairo_surface_flush|cairo_surface_get_content|' +
-        'cairo_surface_get_device_offset|cairo_surface_get_font_options|cairo_surface_get_type|cairo_surface_mark_dirty|' +
-        'cairo_surface_mark_dirty_rectangle|cairo_surface_set_device_offset|cairo_surface_set_fallback_resolution|cairo_surface_show_page|' +
-        'cairo_surface_status|cairo_surface_write_to_png|cairo_svg_surface_create|cairo_svg_surface_restrict_to_version|' +
-        'cairo_svg_version_to_string|cairoantialias|cairocontent|cairocontext|cairoexception|cairoextend|cairofillrule|cairofilter|cairofontface|' +
-        'cairofontoptions|cairofontslant|cairofonttype|cairofontweight|cairoformat|cairogradientpattern|cairohintmetrics|cairohintstyle|' +
-        'cairoimagesurface|cairolineargradient|cairolinecap|cairolinejoin|cairomatrix|cairooperator|cairopath|cairopattern|cairopatterntype|' +
-        'cairopdfsurface|cairopslevel|cairopssurface|cairoradialgradient|cairoscaledfont|cairosolidpattern|cairostatus|cairosubpixelorder|' +
-        'cairosurface|cairosurfacepattern|cairosurfacetype|cairosvgsurface|cairosvgversion|cairotoyfontface|cal_days_in_month|cal_from_jd|cal_info|' +
-        'cal_to_jd|calcul_hmac|calculhmac|call_user_func|call_user_func_array|call_user_method|call_user_method_array|callbackfilteriterator|ceil|' +
-        'chdb|chdb_create|chdir|checkdate|checkdnsrr|chgrp|chmod|chop|chown|chr|chroot|chunk_split|class_alias|class_exists|class_implements|' +
-        'class_parents|classkit_import|classkit_method_add|classkit_method_copy|classkit_method_redefine|classkit_method_remove|' +
-        'classkit_method_rename|clearstatcache|clone|closedir|closelog|collator|com|com_addref|com_create_guid|com_event_sink|com_get|' +
-        'com_get_active_object|com_invoke|com_isenum|com_load|com_load_typelib|com_message_pump|com_print_typeinfo|com_propget|com_propput|' +
-        'com_propset|com_release|com_set|compact|connection_aborted|connection_status|connection_timeout|constant|construct|construct|construct|' +
-        'convert_cyr_string|convert_uudecode|convert_uuencode|copy|cos|cosh|count|count_chars|countable|counter_bump|counter_bump_value|' +
-        'counter_create|counter_get|counter_get_meta|counter_get_named|counter_get_value|counter_reset|counter_reset_value|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|cubrid_affected_rows|cubrid_bind|' +
-        'cubrid_client_encoding|cubrid_close|cubrid_close_prepare|cubrid_close_request|cubrid_col_get|cubrid_col_size|cubrid_column_names|' +
-        'cubrid_column_types|cubrid_commit|cubrid_connect|cubrid_connect_with_url|cubrid_current_oid|cubrid_data_seek|cubrid_db_name|' +
-        'cubrid_disconnect|cubrid_drop|cubrid_errno|cubrid_error|cubrid_error_code|cubrid_error_code_facility|cubrid_error_msg|cubrid_execute|' +
-        'cubrid_fetch|cubrid_fetch_array|cubrid_fetch_assoc|cubrid_fetch_field|cubrid_fetch_lengths|cubrid_fetch_object|cubrid_fetch_row|' +
-        'cubrid_field_flags|cubrid_field_len|cubrid_field_name|cubrid_field_seek|cubrid_field_table|cubrid_field_type|cubrid_free_result|' +
-        'cubrid_get|cubrid_get_autocommit|cubrid_get_charset|cubrid_get_class_name|cubrid_get_client_info|cubrid_get_db_parameter|' +
-        'cubrid_get_server_info|cubrid_insert_id|cubrid_is_instance|cubrid_list_dbs|cubrid_load_from_glo|cubrid_lob_close|cubrid_lob_export|' +
-        'cubrid_lob_get|cubrid_lob_send|cubrid_lob_size|cubrid_lock_read|cubrid_lock_write|cubrid_move_cursor|cubrid_new_glo|cubrid_next_result|' +
-        'cubrid_num_cols|cubrid_num_fields|cubrid_num_rows|cubrid_ping|cubrid_prepare|cubrid_put|cubrid_query|cubrid_real_escape_string|' +
-        'cubrid_result|cubrid_rollback|cubrid_save_to_glo|cubrid_schema|cubrid_send_glo|cubrid_seq_drop|cubrid_seq_insert|cubrid_seq_put|' +
-        'cubrid_set_add|cubrid_set_autocommit|cubrid_set_db_parameter|cubrid_set_drop|cubrid_unbuffered_query|cubrid_version|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|cyrus_authenticate|cyrus_bind|cyrus_close|cyrus_connect|cyrus_query|cyrus_unbind|date|date_add|date_create|' +
-        'date_create_from_format|date_date_set|date_default_timezone_get|date_default_timezone_set|date_diff|date_format|date_get_last_errors|' +
-        'date_interval_create_from_date_string|date_interval_format|date_isodate_set|date_modify|date_offset_get|date_parse|date_parse_from_format|' +
-        'date_sub|date_sun_info|date_sunrise|date_sunset|date_time_set|date_timestamp_get|date_timestamp_set|date_timezone_get|date_timezone_set|' +
-        'dateinterval|dateperiod|datetime|datetimezone|db2_autocommit|db2_bind_param|db2_client_info|db2_close|db2_column_privileges|db2_columns|' +
-        'db2_commit|db2_conn_error|db2_conn_errormsg|db2_connect|db2_cursor_type|db2_escape_string|db2_exec|db2_execute|db2_fetch_array|' +
-        'db2_fetch_assoc|db2_fetch_both|db2_fetch_object|db2_fetch_row|db2_field_display_size|db2_field_name|db2_field_num|db2_field_precision|' +
-        'db2_field_scale|db2_field_type|db2_field_width|db2_foreign_keys|db2_free_result|db2_free_stmt|db2_get_option|db2_last_insert_id|' +
-        'db2_lob_read|db2_next_result|db2_num_fields|db2_num_rows|db2_pclose|db2_pconnect|db2_prepare|db2_primary_keys|db2_procedure_columns|' +
-        'db2_procedures|db2_result|db2_rollback|db2_server_info|db2_set_option|db2_special_columns|db2_statistics|db2_stmt_error|db2_stmt_errormsg|' +
-        'db2_table_privileges|db2_tables|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|dbplus_add|dbplus_aql|dbplus_chdir|dbplus_close|dbplus_curr|dbplus_errcode|dbplus_errno|dbplus_find|dbplus_first|' +
-        'dbplus_flush|dbplus_freealllocks|dbplus_freelock|dbplus_freerlocks|dbplus_getlock|dbplus_getunique|dbplus_info|dbplus_last|dbplus_lockrel|' +
-        'dbplus_next|dbplus_open|dbplus_prev|dbplus_rchperm|dbplus_rcreate|dbplus_rcrtexact|dbplus_rcrtlike|dbplus_resolve|dbplus_restorepos|' +
-        'dbplus_rkeys|dbplus_ropen|dbplus_rquery|dbplus_rrename|dbplus_rsecindex|dbplus_runlink|dbplus_rzap|dbplus_savepos|dbplus_setindex|' +
-        'dbplus_setindexbynumber|dbplus_sql|dbplus_tcl|dbplus_tremove|dbplus_undo|dbplus_undoprepare|dbplus_unlockrel|dbplus_unselect|' +
-        'dbplus_update|dbplus_xlockrel|dbplus_xunlockrel|dbx_close|dbx_compare|dbx_connect|dbx_error|dbx_escape_string|dbx_fetch_row|dbx_query|' +
-        'dbx_sort|dcgettext|dcngettext|deaggregate|debug_backtrace|debug_print_backtrace|debug_zval_dump|decbin|dechex|decoct|define|' +
-        'define_syslog_variables|defined|deg2rad|delete|dgettext|die|dio_close|dio_fcntl|dio_open|dio_read|dio_seek|dio_stat|dio_tcsetattr|' +
-        'dio_truncate|dio_write|dir|directoryiterator|dirname|disk_free_space|disk_total_space|diskfreespace|dl|dngettext|dns_check_record|' +
-        'dns_get_mx|dns_get_record|dom_import_simplexml|domainexception|domattr|domattribute_name|domattribute_set_value|domattribute_specified|' +
-        'domattribute_value|domcharacterdata|domcomment|domdocument|domdocument_add_root|domdocument_create_attribute|' +
-        'domdocument_create_cdata_section|domdocument_create_comment|domdocument_create_element|domdocument_create_element_ns|' +
-        'domdocument_create_entity_reference|domdocument_create_processing_instruction|domdocument_create_text_node|domdocument_doctype|' +
-        'domdocument_document_element|domdocument_dump_file|domdocument_dump_mem|domdocument_get_element_by_id|domdocument_get_elements_by_tagname|' +
-        'domdocument_html_dump_mem|domdocument_xinclude|domdocumentfragment|domdocumenttype|domdocumenttype_entities|' +
-        'domdocumenttype_internal_subset|domdocumenttype_name|domdocumenttype_notations|domdocumenttype_public_id|domdocumenttype_system_id|' +
-        'domelement|domelement_get_attribute|domelement_get_attribute_node|domelement_get_elements_by_tagname|domelement_has_attribute|' +
-        'domelement_remove_attribute|domelement_set_attribute|domelement_set_attribute_node|domelement_tagname|domentity|domentityreference|' +
-        'domexception|domimplementation|domnamednodemap|domnode|domnode_add_namespace|domnode_append_child|domnode_append_sibling|' +
-        'domnode_attributes|domnode_child_nodes|domnode_clone_node|domnode_dump_node|domnode_first_child|domnode_get_content|' +
-        'domnode_has_attributes|domnode_has_child_nodes|domnode_insert_before|domnode_is_blank_node|domnode_last_child|domnode_next_sibling|' +
-        'domnode_node_name|domnode_node_type|domnode_node_value|domnode_owner_document|domnode_parent_node|domnode_prefix|domnode_previous_sibling|' +
-        'domnode_remove_child|domnode_replace_child|domnode_replace_node|domnode_set_content|domnode_set_name|domnode_set_namespace|' +
-        'domnode_unlink_node|domnodelist|domnotation|domprocessinginstruction|domprocessinginstruction_data|domprocessinginstruction_target|' +
-        'domtext|domxml_new_doc|domxml_open_file|domxml_open_mem|domxml_version|domxml_xmltree|domxml_xslt_stylesheet|domxml_xslt_stylesheet_doc|' +
-        'domxml_xslt_stylesheet_file|domxml_xslt_version|domxpath|domxsltstylesheet_process|domxsltstylesheet_result_dump_file|' +
-        'domxsltstylesheet_result_dump_mem|dotnet|dotnet_load|doubleval|each|easter_date|easter_days|echo|empty|emptyiterator|' +
-        'enchant_broker_describe|enchant_broker_dict_exists|enchant_broker_free|enchant_broker_free_dict|enchant_broker_get_error|' +
-        'enchant_broker_init|enchant_broker_list_dicts|enchant_broker_request_dict|enchant_broker_request_pwl_dict|enchant_broker_set_ordering|' +
-        'enchant_dict_add_to_personal|enchant_dict_add_to_session|enchant_dict_check|enchant_dict_describe|enchant_dict_get_error|' +
-        'enchant_dict_is_in_session|enchant_dict_quick_check|enchant_dict_store_replacement|enchant_dict_suggest|end|ereg|ereg_replace|eregi|' +
-        'eregi_replace|error_get_last|error_log|error_reporting|errorexception|escapeshellarg|escapeshellcmd|eval|event_add|event_base_free|' +
-        'event_base_loop|event_base_loopbreak|event_base_loopexit|event_base_new|event_base_priority_init|event_base_set|event_buffer_base_set|' +
-        'event_buffer_disable|event_buffer_enable|event_buffer_fd_set|event_buffer_free|event_buffer_new|event_buffer_priority_set|' +
-        'event_buffer_read|event_buffer_set_callback|event_buffer_timeout_set|event_buffer_watermark_set|event_buffer_write|event_del|event_free|' +
-        'event_new|event_set|exception|exec|exif_imagetype|exif_read_data|exif_tagname|exif_thumbnail|exit|exp|expect_expectl|expect_popen|explode|' +
-        'expm1|export|export|extension_loaded|extract|ezmlm_hash|fam_cancel_monitor|fam_close|fam_monitor_collection|fam_monitor_directory|' +
-        'fam_monitor_file|fam_next_event|fam_open|fam_pending|fam_resume_monitor|fam_suspend_monitor|fbsql_affected_rows|fbsql_autocommit|' +
-        'fbsql_blob_size|fbsql_change_user|fbsql_clob_size|fbsql_close|fbsql_commit|fbsql_connect|fbsql_create_blob|fbsql_create_clob|' +
-        'fbsql_create_db|fbsql_data_seek|fbsql_database|fbsql_database_password|fbsql_db_query|fbsql_db_status|fbsql_drop_db|fbsql_errno|' +
-        'fbsql_error|fbsql_fetch_array|fbsql_fetch_assoc|fbsql_fetch_field|fbsql_fetch_lengths|fbsql_fetch_object|fbsql_fetch_row|' +
-        'fbsql_field_flags|fbsql_field_len|fbsql_field_name|fbsql_field_seek|fbsql_field_table|fbsql_field_type|fbsql_free_result|' +
-        'fbsql_get_autostart_info|fbsql_hostname|fbsql_insert_id|fbsql_list_dbs|fbsql_list_fields|fbsql_list_tables|fbsql_next_result|' +
-        'fbsql_num_fields|fbsql_num_rows|fbsql_password|fbsql_pconnect|fbsql_query|fbsql_read_blob|fbsql_read_clob|fbsql_result|fbsql_rollback|' +
-        'fbsql_rows_fetched|fbsql_select_db|fbsql_set_characterset|fbsql_set_lob_mode|fbsql_set_password|fbsql_set_transaction|fbsql_start_db|' +
-        'fbsql_stop_db|fbsql_table_name|fbsql_tablename|fbsql_username|fbsql_warnings|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|filesystemiterator|' +
-        'filetype|filter_has_var|filter_id|filter_input|filter_input_array|filter_list|filter_var|filter_var_array|filteriterator|finfo_buffer|' +
-        'finfo_close|finfo_file|finfo_open|finfo_set_flags|floatval|flock|floor|flush|fmod|fnmatch|fopen|forward_static_call|' +
-        'forward_static_call_array|fpassthru|fprintf|fputcsv|fputs|fread|frenchtojd|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|func_get_arg|func_get_args|' +
-        'func_num_args|function_exists|fwrite|gc_collect_cycles|gc_disable|gc_enable|gc_enabled|gd_info|gearmanclient|gearmanjob|gearmantask|' +
-        'gearmanworker|geoip_continent_code_by_name|geoip_country_code3_by_name|geoip_country_code_by_name|geoip_country_name_by_name|' +
-        'geoip_database_info|geoip_db_avail|geoip_db_filename|geoip_db_get_all_info|geoip_id_by_name|geoip_isp_by_name|geoip_org_by_name|' +
-        'geoip_record_by_name|geoip_region_by_name|geoip_region_name_by_code|geoip_time_zone_by_country_and_region|getMeta|getNamed|getValue|' +
-        'get_browser|get_called_class|get_cfg_var|get_class|get_class_methods|get_class_vars|get_current_user|get_declared_classes|' +
-        'get_declared_interfaces|get_defined_constants|get_defined_functions|get_defined_vars|get_extension_funcs|get_headers|' +
-        'get_html_translation_table|get_include_path|get_included_files|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|getallheaders|getconstant|getconstants|getconstructor|' +
-        'getcwd|getdate|getdefaultproperties|getdoccomment|getendline|getenv|getextension|getextensionname|getfilename|gethostbyaddr|gethostbyname|' +
-        'gethostbynamel|gethostname|getimagesize|getinterfacenames|getinterfaces|getlastmod|getmethod|getmethods|getmodifiers|getmxrr|getmygid|' +
-        'getmyinode|getmypid|getmyuid|getname|getnamespacename|getopt|getparentclass|getproperties|getproperty|getprotobyname|getprotobynumber|' +
-        'getrandmax|getrusage|getservbyname|getservbyport|getshortname|getstartline|getstaticproperties|getstaticpropertyvalue|gettext|' +
-        'gettimeofday|gettype|glob|globiterator|gmagick|gmagickdraw|gmagickpixel|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_testbit|gmp_xor|gmstrftime|' +
-        'gnupg_adddecryptkey|gnupg_addencryptkey|gnupg_addsignkey|gnupg_cleardecryptkeys|gnupg_clearencryptkeys|gnupg_clearsignkeys|gnupg_decrypt|' +
-        'gnupg_decryptverify|gnupg_encrypt|gnupg_encryptsign|gnupg_export|gnupg_geterror|gnupg_getprotocol|gnupg_import|gnupg_init|gnupg_keyinfo|' +
-        'gnupg_setarmor|gnupg_seterrormode|gnupg_setsignmode|gnupg_sign|gnupg_verify|gopher_parsedir|grapheme_extract|grapheme_stripos|' +
-        'grapheme_stristr|grapheme_strlen|grapheme_strpos|grapheme_strripos|grapheme_strrpos|grapheme_strstr|grapheme_substr|gregoriantojd|' +
-        'gupnp_context_get_host_ip|gupnp_context_get_port|gupnp_context_get_subscription_timeout|gupnp_context_host_path|gupnp_context_new|' +
-        'gupnp_context_set_subscription_timeout|gupnp_context_timeout_add|gupnp_context_unhost_path|gupnp_control_point_browse_start|' +
-        'gupnp_control_point_browse_stop|gupnp_control_point_callback_set|gupnp_control_point_new|gupnp_device_action_callback_set|' +
-        'gupnp_device_info_get|gupnp_device_info_get_service|gupnp_root_device_get_available|gupnp_root_device_get_relative_location|' +
-        'gupnp_root_device_new|gupnp_root_device_set_available|gupnp_root_device_start|gupnp_root_device_stop|gupnp_service_action_get|' +
-        'gupnp_service_action_return|gupnp_service_action_return_error|gupnp_service_action_set|gupnp_service_freeze_notify|gupnp_service_info_get|' +
-        'gupnp_service_info_get_introspection|gupnp_service_introspection_get_state_variable|gupnp_service_notify|gupnp_service_proxy_action_get|' +
-        'gupnp_service_proxy_action_set|gupnp_service_proxy_add_notify|gupnp_service_proxy_callback_set|gupnp_service_proxy_get_subscribed|' +
-        'gupnp_service_proxy_remove_notify|gupnp_service_proxy_set_subscribed|gupnp_service_thaw_notify|gzclose|gzcompress|gzdecode|gzdeflate|' +
-        'gzencode|gzeof|gzfile|gzgetc|gzgets|gzgetss|gzinflate|gzopen|gzpassthru|gzputs|gzread|gzrewind|gzseek|gztell|gzuncompress|gzwrite|' +
-        'halt_compiler|haruannotation|haruannotation_setborderstyle|haruannotation_sethighlightmode|haruannotation_seticon|' +
-        'haruannotation_setopened|harudestination|harudestination_setfit|harudestination_setfitb|harudestination_setfitbh|harudestination_setfitbv|' +
-        'harudestination_setfith|harudestination_setfitr|harudestination_setfitv|harudestination_setxyz|harudoc|harudoc_addpage|' +
-        'harudoc_addpagelabel|harudoc_construct|harudoc_createoutline|harudoc_getcurrentencoder|harudoc_getcurrentpage|harudoc_getencoder|' +
-        'harudoc_getfont|harudoc_getinfoattr|harudoc_getpagelayout|harudoc_getpagemode|harudoc_getstreamsize|harudoc_insertpage|harudoc_loadjpeg|' +
-        'harudoc_loadpng|harudoc_loadraw|harudoc_loadttc|harudoc_loadttf|harudoc_loadtype1|harudoc_output|harudoc_readfromstream|' +
-        'harudoc_reseterror|harudoc_resetstream|harudoc_save|harudoc_savetostream|harudoc_setcompressionmode|harudoc_setcurrentencoder|' +
-        'harudoc_setencryptionmode|harudoc_setinfoattr|harudoc_setinfodateattr|harudoc_setopenaction|harudoc_setpagelayout|harudoc_setpagemode|' +
-        'harudoc_setpagesconfiguration|harudoc_setpassword|harudoc_setpermission|harudoc_usecnsencodings|harudoc_usecnsfonts|' +
-        'harudoc_usecntencodings|harudoc_usecntfonts|harudoc_usejpencodings|harudoc_usejpfonts|harudoc_usekrencodings|harudoc_usekrfonts|' +
-        'haruencoder|haruencoder_getbytetype|haruencoder_gettype|haruencoder_getunicode|haruencoder_getwritingmode|haruexception|harufont|' +
-        'harufont_getascent|harufont_getcapheight|harufont_getdescent|harufont_getencodingname|harufont_getfontname|harufont_gettextwidth|' +
-        'harufont_getunicodewidth|harufont_getxheight|harufont_measuretext|haruimage|haruimage_getbitspercomponent|haruimage_getcolorspace|' +
-        'haruimage_getheight|haruimage_getsize|haruimage_getwidth|haruimage_setcolormask|haruimage_setmaskimage|haruoutline|' +
-        'haruoutline_setdestination|haruoutline_setopened|harupage|harupage_arc|harupage_begintext|harupage_circle|harupage_closepath|' +
-        'harupage_concat|harupage_createdestination|harupage_createlinkannotation|harupage_createtextannotation|harupage_createurlannotation|' +
-        'harupage_curveto|harupage_curveto2|harupage_curveto3|harupage_drawimage|harupage_ellipse|harupage_endpath|harupage_endtext|' +
-        'harupage_eofill|harupage_eofillstroke|harupage_fill|harupage_fillstroke|harupage_getcharspace|harupage_getcmykfill|harupage_getcmykstroke|' +
-        'harupage_getcurrentfont|harupage_getcurrentfontsize|harupage_getcurrentpos|harupage_getcurrenttextpos|harupage_getdash|' +
-        'harupage_getfillingcolorspace|harupage_getflatness|harupage_getgmode|harupage_getgrayfill|harupage_getgraystroke|harupage_getheight|' +
-        'harupage_gethorizontalscaling|harupage_getlinecap|harupage_getlinejoin|harupage_getlinewidth|harupage_getmiterlimit|harupage_getrgbfill|' +
-        'harupage_getrgbstroke|harupage_getstrokingcolorspace|harupage_gettextleading|harupage_gettextmatrix|harupage_gettextrenderingmode|' +
-        'harupage_gettextrise|harupage_gettextwidth|harupage_gettransmatrix|harupage_getwidth|harupage_getwordspace|harupage_lineto|' +
-        'harupage_measuretext|harupage_movetextpos|harupage_moveto|harupage_movetonextline|harupage_rectangle|harupage_setcharspace|' +
-        'harupage_setcmykfill|harupage_setcmykstroke|harupage_setdash|harupage_setflatness|harupage_setfontandsize|harupage_setgrayfill|' +
-        'harupage_setgraystroke|harupage_setheight|harupage_sethorizontalscaling|harupage_setlinecap|harupage_setlinejoin|harupage_setlinewidth|' +
-        'harupage_setmiterlimit|harupage_setrgbfill|harupage_setrgbstroke|harupage_setrotate|harupage_setsize|harupage_setslideshow|' +
-        'harupage_settextleading|harupage_settextmatrix|harupage_settextrenderingmode|harupage_settextrise|harupage_setwidth|harupage_setwordspace|' +
-        'harupage_showtext|harupage_showtextnextline|harupage_stroke|harupage_textout|harupage_textrect|hasconstant|hash|hash_algos|hash_copy|' +
-        'hash_file|hash_final|hash_hmac|hash_hmac_file|hash_init|hash_update|hash_update_file|hash_update_stream|hasmethod|hasproperty|header|' +
-        'header_register_callback|header_remove|headers_list|headers_sent|hebrev|hebrevc|hex2bin|hexdec|highlight_file|highlight_string|' +
-        '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_response_code|' +
-        '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|httpdeflatestream|httpdeflatestream_construct|httpdeflatestream_factory|' +
-        'httpdeflatestream_finish|httpdeflatestream_flush|httpdeflatestream_update|httpinflatestream|httpinflatestream_construct|' +
-        'httpinflatestream_factory|httpinflatestream_finish|httpinflatestream_flush|httpinflatestream_update|httpmessage|httpmessage_addheaders|' +
-        'httpmessage_construct|httpmessage_detach|httpmessage_factory|httpmessage_fromenv|httpmessage_fromstring|httpmessage_getbody|' +
-        'httpmessage_getheader|httpmessage_getheaders|httpmessage_gethttpversion|httpmessage_getparentmessage|httpmessage_getrequestmethod|' +
-        'httpmessage_getrequesturl|httpmessage_getresponsecode|httpmessage_getresponsestatus|httpmessage_gettype|httpmessage_guesscontenttype|' +
-        'httpmessage_prepend|httpmessage_reverse|httpmessage_send|httpmessage_setbody|httpmessage_setheaders|httpmessage_sethttpversion|' +
-        'httpmessage_setrequestmethod|httpmessage_setrequesturl|httpmessage_setresponsecode|httpmessage_setresponsestatus|httpmessage_settype|' +
-        'httpmessage_tomessagetypeobject|httpmessage_tostring|httpquerystring|httpquerystring_construct|httpquerystring_get|httpquerystring_mod|' +
-        'httpquerystring_set|httpquerystring_singleton|httpquerystring_toarray|httpquerystring_tostring|httpquerystring_xlate|httprequest|' +
-        'httprequest_addcookies|httprequest_addheaders|httprequest_addpostfields|httprequest_addpostfile|httprequest_addputdata|' +
-        'httprequest_addquerydata|httprequest_addrawpostdata|httprequest_addssloptions|httprequest_clearhistory|httprequest_construct|' +
-        'httprequest_enablecookies|httprequest_getcontenttype|httprequest_getcookies|httprequest_getheaders|httprequest_gethistory|' +
-        'httprequest_getmethod|httprequest_getoptions|httprequest_getpostfields|httprequest_getpostfiles|httprequest_getputdata|' +
-        'httprequest_getputfile|httprequest_getquerydata|httprequest_getrawpostdata|httprequest_getrawrequestmessage|' +
-        'httprequest_getrawresponsemessage|httprequest_getrequestmessage|httprequest_getresponsebody|httprequest_getresponsecode|' +
-        'httprequest_getresponsecookies|httprequest_getresponsedata|httprequest_getresponseheader|httprequest_getresponseinfo|' +
-        'httprequest_getresponsemessage|httprequest_getresponsestatus|httprequest_getssloptions|httprequest_geturl|httprequest_resetcookies|' +
-        'httprequest_send|httprequest_setcontenttype|httprequest_setcookies|httprequest_setheaders|httprequest_setmethod|httprequest_setoptions|' +
-        'httprequest_setpostfields|httprequest_setpostfiles|httprequest_setputdata|httprequest_setputfile|httprequest_setquerydata|' +
-        'httprequest_setrawpostdata|httprequest_setssloptions|httprequest_seturl|httprequestpool|httprequestpool_attach|httprequestpool_construct|' +
-        'httprequestpool_destruct|httprequestpool_detach|httprequestpool_getattachedrequests|httprequestpool_getfinishedrequests|' +
-        'httprequestpool_reset|httprequestpool_send|httprequestpool_socketperform|httprequestpool_socketselect|httpresponse|httpresponse_capture|' +
-        'httpresponse_getbuffersize|httpresponse_getcache|httpresponse_getcachecontrol|httpresponse_getcontentdisposition|' +
-        'httpresponse_getcontenttype|httpresponse_getdata|httpresponse_getetag|httpresponse_getfile|httpresponse_getgzip|httpresponse_getheader|' +
-        'httpresponse_getlastmodified|httpresponse_getrequestbody|httpresponse_getrequestbodystream|httpresponse_getrequestheaders|' +
-        'httpresponse_getstream|httpresponse_getthrottledelay|httpresponse_guesscontenttype|httpresponse_redirect|httpresponse_send|' +
-        'httpresponse_setbuffersize|httpresponse_setcache|httpresponse_setcachecontrol|httpresponse_setcontentdisposition|' +
-        'httpresponse_setcontenttype|httpresponse_setdata|httpresponse_setetag|httpresponse_setfile|httpresponse_setgzip|httpresponse_setheader|' +
-        'httpresponse_setlastmodified|httpresponse_setstream|httpresponse_setthrottledelay|httpresponse_status|hw_array2objrec|hw_changeobject|' +
-        'hw_children|hw_childrenobj|hw_close|hw_connect|hw_connection_info|hw_cp|hw_deleteobject|hw_docbyanchor|hw_docbyanchorobj|' +
-        'hw_document_attributes|hw_document_bodytag|hw_document_content|hw_document_setcontent|hw_document_size|hw_dummy|hw_edittext|hw_error|' +
-        'hw_errormsg|hw_free_document|hw_getanchors|hw_getanchorsobj|hw_getandlock|hw_getchildcoll|hw_getchildcollobj|hw_getchilddoccoll|' +
-        'hw_getchilddoccollobj|hw_getobject|hw_getobjectbyquery|hw_getobjectbyquerycoll|hw_getobjectbyquerycollobj|hw_getobjectbyqueryobj|' +
-        'hw_getparents|hw_getparentsobj|hw_getrellink|hw_getremote|hw_getremotechildren|hw_getsrcbydestobj|hw_gettext|hw_getusername|hw_identify|' +
-        'hw_incollections|hw_info|hw_inscoll|hw_insdoc|hw_insertanchors|hw_insertdocument|hw_insertobject|hw_mapid|hw_modifyobject|hw_mv|' +
-        'hw_new_document|hw_objrec2array|hw_output_document|hw_pconnect|hw_pipedocument|hw_root|hw_setlinkroot|hw_stat|hw_unlock|hw_who|' +
-        'hwapi_attribute|hwapi_attribute_key|hwapi_attribute_langdepvalue|hwapi_attribute_value|hwapi_attribute_values|hwapi_checkin|' +
-        'hwapi_checkout|hwapi_children|hwapi_content|hwapi_content_mimetype|hwapi_content_read|hwapi_copy|hwapi_dbstat|hwapi_dcstat|' +
-        'hwapi_dstanchors|hwapi_dstofsrcanchor|hwapi_error_count|hwapi_error_reason|hwapi_find|hwapi_ftstat|hwapi_hgcsp|hwapi_hwstat|' +
-        'hwapi_identify|hwapi_info|hwapi_insert|hwapi_insertanchor|hwapi_insertcollection|hwapi_insertdocument|hwapi_link|hwapi_lock|hwapi_move|' +
-        'hwapi_new_content|hwapi_object|hwapi_object_assign|hwapi_object_attreditable|hwapi_object_count|hwapi_object_insert|hwapi_object_new|' +
-        'hwapi_object_remove|hwapi_object_title|hwapi_object_value|hwapi_objectbyanchor|hwapi_parents|hwapi_reason_description|hwapi_reason_type|' +
-        'hwapi_remove|hwapi_replace|hwapi_setcommittedversion|hwapi_srcanchors|hwapi_srcsofdst|hwapi_unlock|hwapi_user|hwapi_userlist|hypot|' +
-        '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_timefmt|' +
-        '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|id3v2attachedpictureframe|id3v2frame|id3v2tag|idate|' +
-        'idn_to_ascii|idn_to_unicode|idn_to_utf8|ifx_affected_rows|ifx_blobinfile_mode|ifx_byteasvarchar|ifx_close|ifx_connect|ifx_copy_blob|' +
-        'ifx_create_blob|ifx_create_char|ifx_do|ifx_error|ifx_errormsg|ifx_fetch_row|ifx_fieldproperties|ifx_fieldtypes|ifx_free_blob|' +
-        'ifx_free_char|ifx_free_result|ifx_get_blob|ifx_get_char|ifx_getsqlca|ifx_htmltbl_result|ifx_nullformat|ifx_num_fields|ifx_num_rows|' +
-        'ifx_pconnect|ifx_prepare|ifx_query|ifx_textasvarchar|ifx_update_blob|ifx_update_char|ifxus_close_slob|ifxus_create_slob|ifxus_free_slob|' +
-        'ifxus_open_slob|ifxus_read_slob|ifxus_seek_slob|ifxus_tell_slob|ifxus_write_slob|ignore_user_abort|iis_add_server|iis_get_dir_security|' +
-        'iis_get_script_map|iis_get_server_by_comment|iis_get_server_by_path|iis_get_server_rights|iis_get_service_state|iis_remove_server|' +
-        'iis_set_app_settings|iis_set_dir_security|iis_set_script_map|iis_set_server_rights|iis_start_server|iis_start_service|iis_stop_server|' +
-        'iis_stop_service|image2wbmp|image_type_to_extension|image_type_to_mime_type|imagealphablending|imageantialias|imagearc|imagechar|' +
-        'imagecharup|imagecolorallocate|imagecolorallocatealpha|imagecolorat|imagecolorclosest|imagecolorclosestalpha|imagecolorclosesthwb|' +
-        '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|imagecreatefromxpm|' +
-        '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|imagick|' +
-        'imagick_adaptiveblurimage|imagick_adaptiveresizeimage|imagick_adaptivesharpenimage|imagick_adaptivethresholdimage|imagick_addimage|' +
-        'imagick_addnoiseimage|imagick_affinetransformimage|imagick_animateimages|imagick_annotateimage|imagick_appendimages|imagick_averageimages|' +
-        'imagick_blackthresholdimage|imagick_blurimage|imagick_borderimage|imagick_charcoalimage|imagick_chopimage|imagick_clear|imagick_clipimage|' +
-        'imagick_clippathimage|imagick_clone|imagick_clutimage|imagick_coalesceimages|imagick_colorfloodfillimage|imagick_colorizeimage|' +
-        'imagick_combineimages|imagick_commentimage|imagick_compareimagechannels|imagick_compareimagelayers|imagick_compareimages|' +
-        'imagick_compositeimage|imagick_construct|imagick_contrastimage|imagick_contraststretchimage|imagick_convolveimage|imagick_cropimage|' +
-        'imagick_cropthumbnailimage|imagick_current|imagick_cyclecolormapimage|imagick_decipherimage|imagick_deconstructimages|' +
-        'imagick_deleteimageartifact|imagick_despeckleimage|imagick_destroy|imagick_displayimage|imagick_displayimages|imagick_distortimage|' +
-        'imagick_drawimage|imagick_edgeimage|imagick_embossimage|imagick_encipherimage|imagick_enhanceimage|imagick_equalizeimage|' +
-        'imagick_evaluateimage|imagick_extentimage|imagick_flattenimages|imagick_flipimage|imagick_floodfillpaintimage|imagick_flopimage|' +
-        'imagick_frameimage|imagick_fximage|imagick_gammaimage|imagick_gaussianblurimage|imagick_getcolorspace|imagick_getcompression|' +
-        'imagick_getcompressionquality|imagick_getcopyright|imagick_getfilename|imagick_getfont|imagick_getformat|imagick_getgravity|' +
-        'imagick_gethomeurl|imagick_getimage|imagick_getimagealphachannel|imagick_getimageartifact|imagick_getimagebackgroundcolor|' +
-        'imagick_getimageblob|imagick_getimageblueprimary|imagick_getimagebordercolor|imagick_getimagechanneldepth|' +
-        'imagick_getimagechanneldistortion|imagick_getimagechanneldistortions|imagick_getimagechannelextrema|imagick_getimagechannelmean|' +
-        'imagick_getimagechannelrange|imagick_getimagechannelstatistics|imagick_getimageclipmask|imagick_getimagecolormapcolor|' +
-        'imagick_getimagecolors|imagick_getimagecolorspace|imagick_getimagecompose|imagick_getimagecompression|imagick_getimagecompressionquality|' +
-        'imagick_getimagedelay|imagick_getimagedepth|imagick_getimagedispose|imagick_getimagedistortion|imagick_getimageextrema|' +
-        'imagick_getimagefilename|imagick_getimageformat|imagick_getimagegamma|imagick_getimagegeometry|imagick_getimagegravity|' +
-        'imagick_getimagegreenprimary|imagick_getimageheight|imagick_getimagehistogram|imagick_getimageindex|imagick_getimageinterlacescheme|' +
-        'imagick_getimageinterpolatemethod|imagick_getimageiterations|imagick_getimagelength|imagick_getimagemagicklicense|imagick_getimagematte|' +
-        'imagick_getimagemattecolor|imagick_getimageorientation|imagick_getimagepage|imagick_getimagepixelcolor|imagick_getimageprofile|' +
-        'imagick_getimageprofiles|imagick_getimageproperties|imagick_getimageproperty|imagick_getimageredprimary|imagick_getimageregion|' +
-        'imagick_getimagerenderingintent|imagick_getimageresolution|imagick_getimagesblob|imagick_getimagescene|imagick_getimagesignature|' +
-        'imagick_getimagesize|imagick_getimagetickspersecond|imagick_getimagetotalinkdensity|imagick_getimagetype|imagick_getimageunits|' +
-        'imagick_getimagevirtualpixelmethod|imagick_getimagewhitepoint|imagick_getimagewidth|imagick_getinterlacescheme|imagick_getiteratorindex|' +
-        'imagick_getnumberimages|imagick_getoption|imagick_getpackagename|imagick_getpage|imagick_getpixeliterator|imagick_getpixelregioniterator|' +
-        'imagick_getpointsize|imagick_getquantumdepth|imagick_getquantumrange|imagick_getreleasedate|imagick_getresource|imagick_getresourcelimit|' +
-        'imagick_getsamplingfactors|imagick_getsize|imagick_getsizeoffset|imagick_getversion|imagick_hasnextimage|imagick_haspreviousimage|' +
-        'imagick_identifyimage|imagick_implodeimage|imagick_labelimage|imagick_levelimage|imagick_linearstretchimage|imagick_liquidrescaleimage|' +
-        'imagick_magnifyimage|imagick_mapimage|imagick_mattefloodfillimage|imagick_medianfilterimage|imagick_mergeimagelayers|imagick_minifyimage|' +
-        'imagick_modulateimage|imagick_montageimage|imagick_morphimages|imagick_mosaicimages|imagick_motionblurimage|imagick_negateimage|' +
-        'imagick_newimage|imagick_newpseudoimage|imagick_nextimage|imagick_normalizeimage|imagick_oilpaintimage|imagick_opaquepaintimage|' +
-        'imagick_optimizeimagelayers|imagick_orderedposterizeimage|imagick_paintfloodfillimage|imagick_paintopaqueimage|' +
-        'imagick_painttransparentimage|imagick_pingimage|imagick_pingimageblob|imagick_pingimagefile|imagick_polaroidimage|imagick_posterizeimage|' +
-        'imagick_previewimages|imagick_previousimage|imagick_profileimage|imagick_quantizeimage|imagick_quantizeimages|imagick_queryfontmetrics|' +
-        'imagick_queryfonts|imagick_queryformats|imagick_radialblurimage|imagick_raiseimage|imagick_randomthresholdimage|imagick_readimage|' +
-        'imagick_readimageblob|imagick_readimagefile|imagick_recolorimage|imagick_reducenoiseimage|imagick_removeimage|imagick_removeimageprofile|' +
-        'imagick_render|imagick_resampleimage|imagick_resetimagepage|imagick_resizeimage|imagick_rollimage|imagick_rotateimage|' +
-        'imagick_roundcorners|imagick_sampleimage|imagick_scaleimage|imagick_separateimagechannel|imagick_sepiatoneimage|' +
-        'imagick_setbackgroundcolor|imagick_setcolorspace|imagick_setcompression|imagick_setcompressionquality|imagick_setfilename|' +
-        'imagick_setfirstiterator|imagick_setfont|imagick_setformat|imagick_setgravity|imagick_setimage|imagick_setimagealphachannel|' +
-        'imagick_setimageartifact|imagick_setimagebackgroundcolor|imagick_setimagebias|imagick_setimageblueprimary|imagick_setimagebordercolor|' +
-        'imagick_setimagechanneldepth|imagick_setimageclipmask|imagick_setimagecolormapcolor|imagick_setimagecolorspace|imagick_setimagecompose|' +
-        'imagick_setimagecompression|imagick_setimagecompressionquality|imagick_setimagedelay|imagick_setimagedepth|imagick_setimagedispose|' +
-        'imagick_setimageextent|imagick_setimagefilename|imagick_setimageformat|imagick_setimagegamma|imagick_setimagegravity|' +
-        'imagick_setimagegreenprimary|imagick_setimageindex|imagick_setimageinterlacescheme|imagick_setimageinterpolatemethod|' +
-        'imagick_setimageiterations|imagick_setimagematte|imagick_setimagemattecolor|imagick_setimageopacity|imagick_setimageorientation|' +
-        'imagick_setimagepage|imagick_setimageprofile|imagick_setimageproperty|imagick_setimageredprimary|imagick_setimagerenderingintent|' +
-        'imagick_setimageresolution|imagick_setimagescene|imagick_setimagetickspersecond|imagick_setimagetype|imagick_setimageunits|' +
-        'imagick_setimagevirtualpixelmethod|imagick_setimagewhitepoint|imagick_setinterlacescheme|imagick_setiteratorindex|imagick_setlastiterator|' +
-        'imagick_setoption|imagick_setpage|imagick_setpointsize|imagick_setresolution|imagick_setresourcelimit|imagick_setsamplingfactors|' +
-        'imagick_setsize|imagick_setsizeoffset|imagick_settype|imagick_shadeimage|imagick_shadowimage|imagick_sharpenimage|imagick_shaveimage|' +
-        'imagick_shearimage|imagick_sigmoidalcontrastimage|imagick_sketchimage|imagick_solarizeimage|imagick_spliceimage|imagick_spreadimage|' +
-        'imagick_steganoimage|imagick_stereoimage|imagick_stripimage|imagick_swirlimage|imagick_textureimage|imagick_thresholdimage|' +
-        'imagick_thumbnailimage|imagick_tintimage|imagick_transformimage|imagick_transparentpaintimage|imagick_transposeimage|' +
-        'imagick_transverseimage|imagick_trimimage|imagick_uniqueimagecolors|imagick_unsharpmaskimage|imagick_valid|imagick_vignetteimage|' +
-        'imagick_waveimage|imagick_whitethresholdimage|imagick_writeimage|imagick_writeimagefile|imagick_writeimages|imagick_writeimagesfile|' +
-        'imagickdraw|imagickdraw_affine|imagickdraw_annotation|imagickdraw_arc|imagickdraw_bezier|imagickdraw_circle|imagickdraw_clear|' +
-        'imagickdraw_clone|imagickdraw_color|imagickdraw_comment|imagickdraw_composite|imagickdraw_construct|imagickdraw_destroy|' +
-        'imagickdraw_ellipse|imagickdraw_getclippath|imagickdraw_getcliprule|imagickdraw_getclipunits|imagickdraw_getfillcolor|' +
-        'imagickdraw_getfillopacity|imagickdraw_getfillrule|imagickdraw_getfont|imagickdraw_getfontfamily|imagickdraw_getfontsize|' +
-        'imagickdraw_getfontstyle|imagickdraw_getfontweight|imagickdraw_getgravity|imagickdraw_getstrokeantialias|imagickdraw_getstrokecolor|' +
-        'imagickdraw_getstrokedasharray|imagickdraw_getstrokedashoffset|imagickdraw_getstrokelinecap|imagickdraw_getstrokelinejoin|' +
-        'imagickdraw_getstrokemiterlimit|imagickdraw_getstrokeopacity|imagickdraw_getstrokewidth|imagickdraw_gettextalignment|' +
-        'imagickdraw_gettextantialias|imagickdraw_gettextdecoration|imagickdraw_gettextencoding|imagickdraw_gettextundercolor|' +
-        'imagickdraw_getvectorgraphics|imagickdraw_line|imagickdraw_matte|imagickdraw_pathclose|imagickdraw_pathcurvetoabsolute|' +
-        'imagickdraw_pathcurvetoquadraticbezierabsolute|imagickdraw_pathcurvetoquadraticbezierrelative|' +
-        'imagickdraw_pathcurvetoquadraticbeziersmoothabsolute|imagickdraw_pathcurvetoquadraticbeziersmoothrelative|imagickdraw_pathcurvetorelative|' +
-        'imagickdraw_pathcurvetosmoothabsolute|imagickdraw_pathcurvetosmoothrelative|imagickdraw_pathellipticarcabsolute|' +
-        'imagickdraw_pathellipticarcrelative|imagickdraw_pathfinish|imagickdraw_pathlinetoabsolute|imagickdraw_pathlinetohorizontalabsolute|' +
-        'imagickdraw_pathlinetohorizontalrelative|imagickdraw_pathlinetorelative|imagickdraw_pathlinetoverticalabsolute|' +
-        'imagickdraw_pathlinetoverticalrelative|imagickdraw_pathmovetoabsolute|imagickdraw_pathmovetorelative|imagickdraw_pathstart|' +
-        'imagickdraw_point|imagickdraw_polygon|imagickdraw_polyline|imagickdraw_pop|imagickdraw_popclippath|imagickdraw_popdefs|' +
-        'imagickdraw_poppattern|imagickdraw_push|imagickdraw_pushclippath|imagickdraw_pushdefs|imagickdraw_pushpattern|imagickdraw_rectangle|' +
-        'imagickdraw_render|imagickdraw_rotate|imagickdraw_roundrectangle|imagickdraw_scale|imagickdraw_setclippath|imagickdraw_setcliprule|' +
-        'imagickdraw_setclipunits|imagickdraw_setfillalpha|imagickdraw_setfillcolor|imagickdraw_setfillopacity|imagickdraw_setfillpatternurl|' +
-        'imagickdraw_setfillrule|imagickdraw_setfont|imagickdraw_setfontfamily|imagickdraw_setfontsize|imagickdraw_setfontstretch|' +
-        'imagickdraw_setfontstyle|imagickdraw_setfontweight|imagickdraw_setgravity|imagickdraw_setstrokealpha|imagickdraw_setstrokeantialias|' +
-        'imagickdraw_setstrokecolor|imagickdraw_setstrokedasharray|imagickdraw_setstrokedashoffset|imagickdraw_setstrokelinecap|' +
-        'imagickdraw_setstrokelinejoin|imagickdraw_setstrokemiterlimit|imagickdraw_setstrokeopacity|imagickdraw_setstrokepatternurl|' +
-        'imagickdraw_setstrokewidth|imagickdraw_settextalignment|imagickdraw_settextantialias|imagickdraw_settextdecoration|' +
-        'imagickdraw_settextencoding|imagickdraw_settextundercolor|imagickdraw_setvectorgraphics|imagickdraw_setviewbox|imagickdraw_skewx|' +
-        'imagickdraw_skewy|imagickdraw_translate|imagickpixel|imagickpixel_clear|imagickpixel_construct|imagickpixel_destroy|imagickpixel_getcolor|' +
-        'imagickpixel_getcolorasstring|imagickpixel_getcolorcount|imagickpixel_getcolorvalue|imagickpixel_gethsl|imagickpixel_issimilar|' +
-        'imagickpixel_setcolor|imagickpixel_setcolorvalue|imagickpixel_sethsl|imagickpixeliterator|imagickpixeliterator_clear|' +
-        'imagickpixeliterator_construct|imagickpixeliterator_destroy|imagickpixeliterator_getcurrentiteratorrow|' +
-        'imagickpixeliterator_getiteratorrow|imagickpixeliterator_getnextiteratorrow|imagickpixeliterator_getpreviousiteratorrow|' +
-        'imagickpixeliterator_newpixeliterator|imagickpixeliterator_newpixelregioniterator|imagickpixeliterator_resetiterator|' +
-        'imagickpixeliterator_setiteratorfirstrow|imagickpixeliterator_setiteratorlastrow|imagickpixeliterator_setiteratorrow|' +
-        'imagickpixeliterator_synciterator|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_fetchmime|imap_fetchstructure|imap_fetchtext|imap_gc|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_listscan|' +
-        '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|implementsinterface|implode|import_request_variables|in_array|include|' +
-        'include_once|inclued_get_data|inet_ntop|inet_pton|infiniteiterator|ingres_autocommit|ingres_autocommit_state|ingres_charset|ingres_close|' +
-        'ingres_commit|ingres_connect|ingres_cursor|ingres_errno|ingres_error|ingres_errsqlstate|ingres_escape_string|ingres_execute|' +
-        'ingres_fetch_array|ingres_fetch_assoc|ingres_fetch_object|ingres_fetch_proc_return|ingres_fetch_row|ingres_field_length|ingres_field_name|' +
-        'ingres_field_nullable|ingres_field_precision|ingres_field_scale|ingres_field_type|ingres_free_result|ingres_next_error|ingres_num_fields|' +
-        'ingres_num_rows|ingres_pconnect|ingres_prepare|ingres_query|ingres_result_seek|ingres_rollback|ingres_set_environment|' +
-        'ingres_unbuffered_query|ini_alter|ini_get|ini_get_all|ini_restore|ini_set|innamespace|inotify_add_watch|inotify_init|inotify_queue_len|' +
-        'inotify_read|inotify_rm_watch|interface_exists|intl_error_name|intl_get_error_code|intl_get_error_message|intl_is_failure|' +
-        'intldateformatter|intval|invalidargumentexception|invoke|invokeargs|ip2long|iptcembed|iptcparse|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|isabstract|' +
-        'iscloneable|isdisabled|isfinal|isinstance|isinstantiable|isinterface|isinternal|isiterateable|isset|issubclassof|isuserdefined|iterator|' +
-        'iterator_apply|iterator_count|iterator_to_array|iteratoraggregate|iteratoriterator|java_last_exception_clear|java_last_exception_get|' +
-        'jddayofweek|jdmonthname|jdtofrench|jdtogregorian|jdtojewish|jdtojulian|jdtounix|jewishtojd|join|jpeg2wbmp|json_decode|json_encode|' +
-        'json_last_error|jsonserializable|judy|judy_type|judy_version|juliantojd|kadm5_chpass_principal|kadm5_create_principal|' +
-        'kadm5_delete_principal|kadm5_destroy|kadm5_flush|kadm5_get_policies|kadm5_get_principal|kadm5_get_principals|kadm5_init_with_password|' +
-        'kadm5_modify_principal|key|krsort|ksort|lcfirst|lcg_value|lchgrp|lchown|ldap_8859_to_t61|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_sasl_bind|ldap_search|ldap_set_option|' +
-        'ldap_set_rebind_proc|ldap_sort|ldap_start_tls|ldap_t61_to_8859|ldap_unbind|lengthexception|levenshtein|libxml_clear_errors|' +
-        'libxml_disable_entity_loader|libxml_get_errors|libxml_get_last_error|libxml_set_streams_context|libxml_use_internal_errors|libxmlerror|' +
-        'limititerator|link|linkinfo|list|locale|localeconv|localtime|log|log10|log1p|logicexception|long2ip|lstat|ltrim|lzf_compress|' +
-        'lzf_decompress|lzf_optimized_for|m_checkstatus|m_completeauthorizations|m_connect|m_connectionerror|m_deletetrans|m_destroyconn|' +
-        'm_destroyengine|m_getcell|m_getcellbynum|m_getcommadelimited|m_getheader|m_initconn|m_initengine|m_iscommadelimited|m_maxconntimeout|' +
-        'm_monitor|m_numcolumns|m_numrows|m_parsecommadelimited|m_responsekeys|m_responseparam|m_returnstatus|m_setblocking|m_setdropfile|m_setip|' +
-        'm_setssl|m_setssl_cafile|m_setssl_files|m_settimeout|m_sslcert_gen_hash|m_transactionssent|m_transinqueue|m_transkeyval|m_transnew|' +
-        'm_transsend|m_uwait|m_validateidentifier|m_verifyconnection|m_verifysslcert|magic_quotes_runtime|mail|' +
-        'mailparse_determine_best_xfer_encoding|mailparse_msg_create|mailparse_msg_extract_part|mailparse_msg_extract_part_file|' +
-        'mailparse_msg_extract_whole_part_file|mailparse_msg_free|mailparse_msg_get_part|mailparse_msg_get_part_data|mailparse_msg_get_structure|' +
-        'mailparse_msg_parse|mailparse_msg_parse_file|mailparse_rfc822_parse_addresses|mailparse_stream_encode|mailparse_uudecode_all|main|max|' +
-        'maxdb_affected_rows|maxdb_autocommit|maxdb_bind_param|maxdb_bind_result|maxdb_change_user|maxdb_character_set_name|maxdb_client_encoding|' +
-        'maxdb_close|maxdb_close_long_data|maxdb_commit|maxdb_connect|maxdb_connect_errno|maxdb_connect_error|maxdb_data_seek|maxdb_debug|' +
-        'maxdb_disable_reads_from_master|maxdb_disable_rpl_parse|maxdb_dump_debug_info|maxdb_embedded_connect|maxdb_enable_reads_from_master|' +
-        'maxdb_enable_rpl_parse|maxdb_errno|maxdb_error|maxdb_escape_string|maxdb_execute|maxdb_fetch|maxdb_fetch_array|maxdb_fetch_assoc|' +
-        'maxdb_fetch_field|maxdb_fetch_field_direct|maxdb_fetch_fields|maxdb_fetch_lengths|maxdb_fetch_object|maxdb_fetch_row|maxdb_field_count|' +
-        'maxdb_field_seek|maxdb_field_tell|maxdb_free_result|maxdb_get_client_info|maxdb_get_client_version|maxdb_get_host_info|maxdb_get_metadata|' +
-        'maxdb_get_proto_info|maxdb_get_server_info|maxdb_get_server_version|maxdb_info|maxdb_init|maxdb_insert_id|maxdb_kill|maxdb_master_query|' +
-        'maxdb_more_results|maxdb_multi_query|maxdb_next_result|maxdb_num_fields|maxdb_num_rows|maxdb_options|maxdb_param_count|maxdb_ping|' +
-        'maxdb_prepare|maxdb_query|maxdb_real_connect|maxdb_real_escape_string|maxdb_real_query|maxdb_report|maxdb_rollback|' +
-        'maxdb_rpl_parse_enabled|maxdb_rpl_probe|maxdb_rpl_query_type|maxdb_select_db|maxdb_send_long_data|maxdb_send_query|maxdb_server_end|' +
-        'maxdb_server_init|maxdb_set_opt|maxdb_sqlstate|maxdb_ssl_set|maxdb_stat|maxdb_stmt_affected_rows|maxdb_stmt_bind_param|' +
-        'maxdb_stmt_bind_result|maxdb_stmt_close|maxdb_stmt_close_long_data|maxdb_stmt_data_seek|maxdb_stmt_errno|maxdb_stmt_error|' +
-        'maxdb_stmt_execute|maxdb_stmt_fetch|maxdb_stmt_free_result|maxdb_stmt_init|maxdb_stmt_num_rows|maxdb_stmt_param_count|maxdb_stmt_prepare|' +
-        'maxdb_stmt_reset|maxdb_stmt_result_metadata|maxdb_stmt_send_long_data|maxdb_stmt_sqlstate|maxdb_stmt_store_result|maxdb_store_result|' +
-        'maxdb_thread_id|maxdb_thread_safe|maxdb_use_result|maxdb_warning_count|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_encoding_aliases|mb_ereg|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_eregi|mb_eregi_replace|' +
-        '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|memcache_debug|memcached|memory_get_peak_usage|memory_get_usage|messageformatter|metaphone|method_exists|mhash|' +
-        'mhash_count|mhash_get_block_size|mhash_get_hash_name|mhash_keygen_s2k|microtime|mime_content_type|min|ming_keypress|' +
-        'ming_setcubicthreshold|ming_setscale|ming_setswfcompression|ming_useconstants|ming_useswfversion|mkdir|mktime|money_format|mongo|' +
-        'mongobindata|mongocode|mongocollection|mongoconnectionexception|mongocursor|mongocursorexception|mongocursortimeoutexception|mongodate|' +
-        'mongodb|mongodbref|mongoexception|mongogridfs|mongogridfscursor|mongogridfsexception|mongogridfsfile|mongoid|mongoint32|mongoint64|' +
-        'mongomaxkey|mongominkey|mongoregex|mongotimestamp|move_uploaded_file|mpegfile|mqseries_back|mqseries_begin|mqseries_close|mqseries_cmit|' +
-        'mqseries_conn|mqseries_connx|mqseries_disc|mqseries_get|mqseries_inq|mqseries_open|mqseries_put|mqseries_put1|mqseries_set|' +
-        'mqseries_strerror|msession_connect|msession_count|msession_create|msession_destroy|msession_disconnect|msession_find|msession_get|' +
-        'msession_get_array|msession_get_data|msession_inc|msession_list|msession_listvar|msession_lock|msession_plugin|msession_randstr|' +
-        'msession_set|msession_set_array|msession_set_data|msession_timeout|msession_uniq|msession_unlock|msg_get_queue|msg_queue_exists|' +
-        'msg_receive|msg_remove_queue|msg_send|msg_set_queue|msg_stat_queue|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_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_list_dbs|msql_list_fields|msql_list_tables|' +
-        'msql_num_fields|msql_num_rows|msql_numfields|msql_numrows|msql_pconnect|msql_query|msql_regcase|msql_result|msql_select_db|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|multipleiterator|mysql_affected_rows|mysql_client_encoding|mysql_close|mysql_connect|' +
-        'mysql_create_db|mysql_data_seek|mysql_db_name|mysql_db_query|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_field_flags|mysql_field_len|' +
-        'mysql_field_name|mysql_field_seek|mysql_field_table|mysql_field_type|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_list_dbs|mysql_list_fields|mysql_list_processes|' +
-        'mysql_list_tables|mysql_num_fields|mysql_num_rows|mysql_pconnect|mysql_ping|mysql_query|mysql_real_escape_string|mysql_result|' +
-        'mysql_select_db|mysql_set_charset|mysql_stat|mysql_tablename|mysql_thread_id|mysql_unbuffered_query|mysqli|mysqli_bind_param|' +
-        'mysqli_bind_result|mysqli_client_encoding|mysqli_connect|mysqli_disable_reads_from_master|mysqli_disable_rpl_parse|mysqli_driver|' +
-        'mysqli_enable_reads_from_master|mysqli_enable_rpl_parse|mysqli_escape_string|mysqli_execute|mysqli_fetch|mysqli_get_metadata|' +
-        'mysqli_master_query|mysqli_param_count|mysqli_report|mysqli_result|mysqli_rpl_parse_enabled|mysqli_rpl_probe|mysqli_rpl_query_type|' +
-        'mysqli_send_long_data|mysqli_send_query|mysqli_set_opt|mysqli_slave_query|mysqli_stmt|mysqli_warning|mysqlnd_ms_get_stats|' +
-        'mysqlnd_ms_query_is_select|mysqlnd_ms_set_user_pick_server|mysqlnd_qc_change_handler|mysqlnd_qc_clear_cache|mysqlnd_qc_get_cache_info|' +
-        'mysqlnd_qc_get_core_stats|mysqlnd_qc_get_handler|mysqlnd_qc_get_query_trace_log|mysqlnd_qc_set_user_handlers|natcasesort|natsort|' +
-        'ncurses_addch|ncurses_addchnstr|ncurses_addchstr|ncurses_addnstr|ncurses_addstr|ncurses_assume_default_colors|ncurses_attroff|' +
-        'ncurses_attron|ncurses_attrset|ncurses_baudrate|ncurses_beep|ncurses_bkgd|ncurses_bkgdset|ncurses_border|ncurses_bottom_panel|' +
-        'ncurses_can_change_color|ncurses_cbreak|ncurses_clear|ncurses_clrtobot|ncurses_clrtoeol|ncurses_color_content|ncurses_color_set|' +
-        'ncurses_curs_set|ncurses_def_prog_mode|ncurses_def_shell_mode|ncurses_define_key|ncurses_del_panel|ncurses_delay_output|ncurses_delch|' +
-        'ncurses_deleteln|ncurses_delwin|ncurses_doupdate|ncurses_echo|ncurses_echochar|ncurses_end|ncurses_erase|ncurses_erasechar|ncurses_filter|' +
-        'ncurses_flash|ncurses_flushinp|ncurses_getch|ncurses_getmaxyx|ncurses_getmouse|ncurses_getyx|ncurses_halfdelay|ncurses_has_colors|' +
-        'ncurses_has_ic|ncurses_has_il|ncurses_has_key|ncurses_hide_panel|ncurses_hline|ncurses_inch|ncurses_init|ncurses_init_color|' +
-        'ncurses_init_pair|ncurses_insch|ncurses_insdelln|ncurses_insertln|ncurses_insstr|ncurses_instr|ncurses_isendwin|ncurses_keyok|' +
-        'ncurses_keypad|ncurses_killchar|ncurses_longname|ncurses_meta|ncurses_mouse_trafo|ncurses_mouseinterval|ncurses_mousemask|ncurses_move|' +
-        'ncurses_move_panel|ncurses_mvaddch|ncurses_mvaddchnstr|ncurses_mvaddchstr|ncurses_mvaddnstr|ncurses_mvaddstr|ncurses_mvcur|' +
-        'ncurses_mvdelch|ncurses_mvgetch|ncurses_mvhline|ncurses_mvinch|ncurses_mvvline|ncurses_mvwaddstr|ncurses_napms|ncurses_new_panel|' +
-        'ncurses_newpad|ncurses_newwin|ncurses_nl|ncurses_nocbreak|ncurses_noecho|ncurses_nonl|ncurses_noqiflush|ncurses_noraw|' +
-        'ncurses_pair_content|ncurses_panel_above|ncurses_panel_below|ncurses_panel_window|ncurses_pnoutrefresh|ncurses_prefresh|ncurses_putp|' +
-        'ncurses_qiflush|ncurses_raw|ncurses_refresh|ncurses_replace_panel|ncurses_reset_prog_mode|ncurses_reset_shell_mode|ncurses_resetty|' +
-        'ncurses_savetty|ncurses_scr_dump|ncurses_scr_init|ncurses_scr_restore|ncurses_scr_set|ncurses_scrl|ncurses_show_panel|ncurses_slk_attr|' +
-        'ncurses_slk_attroff|ncurses_slk_attron|ncurses_slk_attrset|ncurses_slk_clear|ncurses_slk_color|ncurses_slk_init|ncurses_slk_noutrefresh|' +
-        'ncurses_slk_refresh|ncurses_slk_restore|ncurses_slk_set|ncurses_slk_touch|ncurses_standend|ncurses_standout|ncurses_start_color|' +
-        'ncurses_termattrs|ncurses_termname|ncurses_timeout|ncurses_top_panel|ncurses_typeahead|ncurses_ungetch|ncurses_ungetmouse|' +
-        'ncurses_update_panels|ncurses_use_default_colors|ncurses_use_env|ncurses_use_extended_names|ncurses_vidattr|ncurses_vline|ncurses_waddch|' +
-        'ncurses_waddstr|ncurses_wattroff|ncurses_wattron|ncurses_wattrset|ncurses_wborder|ncurses_wclear|ncurses_wcolor_set|ncurses_werase|' +
-        'ncurses_wgetch|ncurses_whline|ncurses_wmouse_trafo|ncurses_wmove|ncurses_wnoutrefresh|ncurses_wrefresh|ncurses_wstandend|' +
-        'ncurses_wstandout|ncurses_wvline|newinstance|newinstanceargs|newt_bell|newt_button|newt_button_bar|newt_centered_window|newt_checkbox|' +
-        'newt_checkbox_get_value|newt_checkbox_set_flags|newt_checkbox_set_value|newt_checkbox_tree|newt_checkbox_tree_add_item|' +
-        'newt_checkbox_tree_find_item|newt_checkbox_tree_get_current|newt_checkbox_tree_get_entry_value|newt_checkbox_tree_get_multi_selection|' +
-        'newt_checkbox_tree_get_selection|newt_checkbox_tree_multi|newt_checkbox_tree_set_current|newt_checkbox_tree_set_entry|' +
-        'newt_checkbox_tree_set_entry_value|newt_checkbox_tree_set_width|newt_clear_key_buffer|newt_cls|newt_compact_button|' +
-        'newt_component_add_callback|newt_component_takes_focus|newt_create_grid|newt_cursor_off|newt_cursor_on|newt_delay|newt_draw_form|' +
-        'newt_draw_root_text|newt_entry|newt_entry_get_value|newt_entry_set|newt_entry_set_filter|newt_entry_set_flags|newt_finished|newt_form|' +
-        'newt_form_add_component|newt_form_add_components|newt_form_add_hot_key|newt_form_destroy|newt_form_get_current|newt_form_run|' +
-        'newt_form_set_background|newt_form_set_height|newt_form_set_size|newt_form_set_timer|newt_form_set_width|newt_form_watch_fd|' +
-        'newt_get_screen_size|newt_grid_add_components_to_form|newt_grid_basic_window|newt_grid_free|newt_grid_get_size|newt_grid_h_close_stacked|' +
-        'newt_grid_h_stacked|newt_grid_place|newt_grid_set_field|newt_grid_simple_window|newt_grid_v_close_stacked|newt_grid_v_stacked|' +
-        'newt_grid_wrapped_window|newt_grid_wrapped_window_at|newt_init|newt_label|newt_label_set_text|newt_listbox|newt_listbox_append_entry|' +
-        'newt_listbox_clear|newt_listbox_clear_selection|newt_listbox_delete_entry|newt_listbox_get_current|newt_listbox_get_selection|' +
-        'newt_listbox_insert_entry|newt_listbox_item_count|newt_listbox_select_item|newt_listbox_set_current|newt_listbox_set_current_by_key|' +
-        'newt_listbox_set_data|newt_listbox_set_entry|newt_listbox_set_width|newt_listitem|newt_listitem_get_data|newt_listitem_set|' +
-        'newt_open_window|newt_pop_help_line|newt_pop_window|newt_push_help_line|newt_radio_get_current|newt_radiobutton|newt_redraw_help_line|' +
-        'newt_reflow_text|newt_refresh|newt_resize_screen|newt_resume|newt_run_form|newt_scale|newt_scale_set|newt_scrollbar_set|' +
-        'newt_set_help_callback|newt_set_suspend_callback|newt_suspend|newt_textbox|newt_textbox_get_num_lines|newt_textbox_reflowed|' +
-        'newt_textbox_set_height|newt_textbox_set_text|newt_vertical_scrollbar|newt_wait_for_key|newt_win_choice|newt_win_entries|newt_win_menu|' +
-        'newt_win_message|newt_win_messagev|newt_win_ternary|next|ngettext|nl2br|nl_langinfo|norewinditerator|normalizer|notes_body|notes_copy_db|' +
-        'notes_create_db|notes_create_note|notes_drop_db|notes_find_note|notes_header_info|notes_list_msgs|notes_mark_read|notes_mark_unread|' +
-        'notes_nav_create|notes_search|notes_unread|notes_version|nsapi_request_headers|nsapi_response_headers|nsapi_virtual|nthmac|number_format|' +
-        'numberformatter|oauth|oauth_get_sbs|oauth_urlencode|oauthexception|oauthprovider|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|oci_bind_array_by_name|oci_bind_by_name|oci_cancel|' +
-        'oci_client_version|oci_close|oci_collection_append|oci_collection_assign|oci_collection_element_assign|oci_collection_element_get|' +
-        'oci_collection_free|oci_collection_max|oci_collection_size|oci_collection_trim|oci_commit|oci_connect|oci_define_by_name|oci_error|' +
-        'oci_execute|oci_fetch|oci_fetch_all|oci_fetch_array|oci_fetch_assoc|oci_fetch_object|oci_fetch_row|oci_field_is_null|oci_field_name|' +
-        'oci_field_precision|oci_field_scale|oci_field_size|oci_field_type|oci_field_type_raw|oci_free_statement|oci_internal_debug|oci_lob_append|' +
-        'oci_lob_close|oci_lob_copy|oci_lob_eof|oci_lob_erase|oci_lob_export|oci_lob_flush|oci_lob_free|oci_lob_getbuffering|oci_lob_import|' +
-        'oci_lob_is_equal|oci_lob_load|oci_lob_read|oci_lob_rewind|oci_lob_save|oci_lob_savefile|oci_lob_seek|oci_lob_setbuffering|oci_lob_size|' +
-        'oci_lob_tell|oci_lob_truncate|oci_lob_write|oci_lob_writetemporary|oci_lob_writetofile|oci_new_collection|oci_new_connect|oci_new_cursor|' +
-        'oci_new_descriptor|oci_num_fields|oci_num_rows|oci_parse|oci_password_change|oci_pconnect|oci_result|oci_rollback|oci_server_version|' +
-        'oci_set_action|oci_set_client_identifier|oci_set_client_info|oci_set_edition|oci_set_module_name|oci_set_prefetch|oci_statement_type|' +
-        'ocibindbyname|ocicancel|ocicloselob|ocicollappend|ocicollassign|ocicollassignelem|ocicollgetelem|ocicollmax|ocicollsize|ocicolltrim|' +
-        'ocicolumnisnull|ocicolumnname|ocicolumnprecision|ocicolumnscale|ocicolumnsize|ocicolumntype|ocicolumntyperaw|ocicommit|ocidefinebyname|' +
-        'ocierror|ociexecute|ocifetch|ocifetchinto|ocifetchstatement|ocifreecollection|ocifreecursor|ocifreedesc|ocifreestatement|ociinternaldebug|' +
-        'ociloadlob|ocilogoff|ocilogon|ocinewcollection|ocinewcursor|ocinewdescriptor|ocinlogon|ocinumcols|ociparse|ociplogon|ociresult|' +
-        'ocirollback|ocirowcount|ocisavelob|ocisavelobfile|ociserverversion|ocisetprefetch|ocistatementtype|ociwritelobtofile|ociwritetemporarylob|' +
-        '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|openal_buffer_create|openal_buffer_data|openal_buffer_destroy|openal_buffer_get|' +
-        'openal_buffer_loadwav|openal_context_create|openal_context_current|openal_context_destroy|openal_context_process|openal_context_suspend|' +
-        'openal_device_close|openal_device_open|openal_listener_get|openal_listener_set|openal_source_create|openal_source_destroy|' +
-        'openal_source_get|openal_source_pause|openal_source_play|openal_source_rewind|openal_source_set|openal_source_stop|openal_stream|opendir|' +
-        'openlog|openssl_cipher_iv_length|openssl_csr_export|openssl_csr_export_to_file|openssl_csr_get_public_key|openssl_csr_get_subject|' +
-        'openssl_csr_new|openssl_csr_sign|openssl_decrypt|openssl_dh_compute_key|openssl_digest|openssl_encrypt|openssl_error_string|' +
-        'openssl_free_key|openssl_get_cipher_methods|openssl_get_md_methods|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_random_pseudo_bytes|openssl_seal|openssl_sign|openssl_verify|openssl_x509_check_private_key|openssl_x509_checkpurpose|' +
-        'openssl_x509_export|openssl_x509_export_to_file|openssl_x509_free|openssl_x509_parse|openssl_x509_read|ord|outeriterator|' +
-        'outofboundsexception|outofrangeexception|output_add_rewrite_var|output_reset_rewrite_vars|overflowexception|overload|override_function|' +
-        'ovrimos_close|ovrimos_commit|ovrimos_connect|ovrimos_cursor|ovrimos_exec|ovrimos_execute|ovrimos_fetch_into|ovrimos_fetch_row|' +
-        'ovrimos_field_len|ovrimos_field_name|ovrimos_field_num|ovrimos_field_type|ovrimos_free_result|ovrimos_longreadlen|ovrimos_num_fields|' +
-        'ovrimos_num_rows|ovrimos_prepare|ovrimos_result|ovrimos_result_all|ovrimos_rollback|pack|parentiterator|parse_ini_file|parse_ini_string|' +
-        'parse_str|parse_url|parsekit_compile_file|parsekit_compile_string|parsekit_func_arginfo|passthru|pathinfo|pclose|pcntl_alarm|pcntl_exec|' +
-        'pcntl_fork|pcntl_getpriority|pcntl_setpriority|pcntl_signal|pcntl_signal_dispatch|pcntl_sigprocmask|pcntl_sigtimedwait|pcntl_sigwaitinfo|' +
-        'pcntl_wait|pcntl_waitpid|pcntl_wexitstatus|pcntl_wifexited|pcntl_wifsignaled|pcntl_wifstopped|pcntl_wstopsig|pcntl_wtermsig|' +
-        'pdf_activate_item|pdf_add_annotation|pdf_add_bookmark|pdf_add_launchlink|pdf_add_locallink|pdf_add_nameddest|pdf_add_note|pdf_add_outline|' +
-        'pdf_add_pdflink|pdf_add_table_cell|pdf_add_textflow|pdf_add_thumbnail|pdf_add_weblink|pdf_arc|pdf_arcn|pdf_attach_file|pdf_begin_document|' +
-        'pdf_begin_font|pdf_begin_glyph|pdf_begin_item|pdf_begin_layer|pdf_begin_page|pdf_begin_page_ext|pdf_begin_pattern|pdf_begin_template|' +
-        'pdf_begin_template_ext|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_3dview|pdf_create_action|pdf_create_annotation|' +
-        'pdf_create_bookmark|pdf_create_field|pdf_create_fieldgroup|pdf_create_gstate|pdf_create_pvf|pdf_create_textflow|pdf_curveto|' +
-        'pdf_define_layer|pdf_delete|pdf_delete_pvf|pdf_delete_table|pdf_delete_textflow|pdf_encoding_set_char|pdf_end_document|pdf_end_font|' +
-        'pdf_end_glyph|pdf_end_item|pdf_end_layer|pdf_end_page|pdf_end_page_ext|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_table|' +
-        'pdf_fit_textflow|pdf_fit_textline|pdf_get_apiname|pdf_get_buffer|pdf_get_errmsg|pdf_get_errnum|pdf_get_font|pdf_get_fontname|' +
-        'pdf_get_fontsize|pdf_get_image_height|pdf_get_image_width|pdf_get_majorversion|pdf_get_minorversion|pdf_get_parameter|' +
-        'pdf_get_pdi_parameter|pdf_get_pdi_value|pdf_get_value|pdf_info_font|pdf_info_matchbox|pdf_info_table|pdf_info_textflow|pdf_info_textline|' +
-        'pdf_initgraphics|pdf_lineto|pdf_load_3ddata|pdf_load_font|pdf_load_iccprofile|pdf_load_image|pdf_makespotcolor|pdf_moveto|pdf_new|' +
-        'pdf_open_ccitt|pdf_open_file|pdf_open_gif|pdf_open_image|pdf_open_image_file|pdf_open_jpeg|pdf_open_memory_image|pdf_open_pdi|' +
-        'pdf_open_pdi_document|pdf_open_pdi_page|pdf_open_tiff|pdf_pcos_get_number|pdf_pcos_get_stream|pdf_pcos_get_string|pdf_place_image|' +
-        'pdf_place_pdi_page|pdf_process_pdi|pdf_rect|pdf_restore|pdf_resume_page|pdf_rotate|pdf_save|pdf_scale|pdf_set_border_color|' +
-        'pdf_set_border_dash|pdf_set_border_style|pdf_set_char_spacing|pdf_set_duration|pdf_set_gstate|pdf_set_horiz_scaling|pdf_set_info|' +
-        'pdf_set_info_author|pdf_set_info_creator|pdf_set_info_keywords|pdf_set_info_subject|pdf_set_info_title|pdf_set_layer_dependency|' +
-        'pdf_set_leading|pdf_set_parameter|pdf_set_text_matrix|pdf_set_text_pos|pdf_set_text_rendering|pdf_set_text_rise|pdf_set_value|' +
-        'pdf_set_word_spacing|pdf_setcolor|pdf_setdash|pdf_setdashpattern|pdf_setflat|pdf_setfont|pdf_setgray|pdf_setgray_fill|pdf_setgray_stroke|' +
-        'pdf_setlinecap|pdf_setlinejoin|pdf_setlinewidth|pdf_setmatrix|pdf_setmiterlimit|pdf_setpolydash|pdf_setrgbcolor|pdf_setrgbcolor_fill|' +
-        'pdf_setrgbcolor_stroke|pdf_shading|pdf_shading_pattern|pdf_shfill|pdf_show|pdf_show_boxed|pdf_show_xy|pdf_skew|pdf_stringwidth|pdf_stroke|' +
-        'pdf_suspend_page|pdf_translate|pdf_utf16_to_utf8|pdf_utf32_to_utf16|pdf_utf8_to_utf16|pdo|pdo_cubrid_schema|pdo_pgsqllobcreate|' +
-        'pdo_pgsqllobopen|pdo_pgsqllobunlink|pdo_sqlitecreateaggregate|pdo_sqlitecreatefunction|pdoexception|pdostatement|pfsockopen|' +
-        'pg_affected_rows|pg_cancel_query|pg_client_encoding|pg_close|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_escape_bytea|pg_escape_string|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_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_get_notify|pg_get_pid|' +
-        'pg_get_result|pg_host|pg_insert|pg_last_error|pg_last_notice|pg_last_oid|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_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_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_trace|pg_transaction_status|pg_tty|pg_unescape_bytea|pg_untrace|pg_update|pg_version|php_check_syntax|' +
-        'php_ini_loaded_file|php_ini_scanned_files|php_logo_guid|php_sapi_name|php_strip_whitespace|php_uname|phpcredits|phpinfo|phpversion|pi|' +
-        'png2wbmp|popen|pos|posix_access|posix_ctermid|posix_errno|posix_get_last_error|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_initgroups|posix_isatty|posix_kill|posix_mkfifo|posix_mknod|posix_setegid|' +
-        'posix_seteuid|posix_setgid|posix_setpgid|posix_setsid|posix_setuid|posix_strerror|posix_times|posix_ttyname|posix_uname|pow|preg_filter|' +
-        'preg_grep|preg_last_error|preg_match|preg_match_all|preg_quote|preg_replace|preg_replace_callback|preg_split|prev|print|print_r|' +
-        'printer_abort|printer_close|printer_create_brush|printer_create_dc|printer_create_font|printer_create_pen|printer_delete_brush|' +
-        'printer_delete_dc|printer_delete_font|printer_delete_pen|printer_draw_bmp|printer_draw_chord|printer_draw_elipse|printer_draw_line|' +
-        'printer_draw_pie|printer_draw_rectangle|printer_draw_roundrect|printer_draw_text|printer_end_doc|printer_end_page|printer_get_option|' +
-        'printer_list|printer_logical_fontheight|printer_open|printer_select_brush|printer_select_font|printer_select_pen|printer_set_option|' +
-        'printer_start_doc|printer_start_page|printer_write|printf|proc_close|proc_get_status|proc_nice|proc_open|proc_terminate|property_exists|' +
-        'ps_add_bookmark|ps_add_launchlink|ps_add_locallink|ps_add_note|ps_add_pdflink|ps_add_weblink|ps_arc|ps_arcn|ps_begin_page|' +
-        'ps_begin_pattern|ps_begin_template|ps_circle|ps_clip|ps_close|ps_close_image|ps_closepath|ps_closepath_stroke|ps_continue_text|ps_curveto|' +
-        'ps_delete|ps_end_page|ps_end_pattern|ps_end_template|ps_fill|ps_fill_stroke|ps_findfont|ps_get_buffer|ps_get_parameter|ps_get_value|' +
-        'ps_hyphenate|ps_include_file|ps_lineto|ps_makespotcolor|ps_moveto|ps_new|ps_open_file|ps_open_image|ps_open_image_file|' +
-        'ps_open_memory_image|ps_place_image|ps_rect|ps_restore|ps_rotate|ps_save|ps_scale|ps_set_border_color|ps_set_border_dash|' +
-        'ps_set_border_style|ps_set_info|ps_set_parameter|ps_set_text_pos|ps_set_value|ps_setcolor|ps_setdash|ps_setflat|ps_setfont|ps_setgray|' +
-        'ps_setlinecap|ps_setlinejoin|ps_setlinewidth|ps_setmiterlimit|ps_setoverprintmode|ps_setpolydash|ps_shading|ps_shading_pattern|ps_shfill|' +
-        'ps_show|ps_show2|ps_show_boxed|ps_show_xy|ps_show_xy2|ps_string_geometry|ps_stringwidth|ps_stroke|ps_symbol|ps_symbol_name|' +
-        'ps_symbol_width|ps_translate|pspell_add_to_personal|pspell_add_to_session|pspell_check|pspell_clear_session|pspell_config_create|' +
-        'pspell_config_data_dir|pspell_config_dict_dir|pspell_config_ignore|pspell_config_mode|pspell_config_personal|pspell_config_repl|' +
-        'pspell_config_runtogether|pspell_config_save_repl|pspell_new|pspell_new_config|pspell_new_personal|pspell_save_wordlist|' +
-        'pspell_store_replacement|pspell_suggest|putenv|px_close|px_create_fp|px_date2string|px_delete|px_delete_record|px_get_field|px_get_info|' +
-        'px_get_parameter|px_get_record|px_get_schema|px_get_value|px_insert_record|px_new|px_numfields|px_numrecords|px_open_fp|px_put_record|' +
-        'px_retrieve_record|px_set_blob_file|px_set_parameter|px_set_tablename|px_set_targetencoding|px_set_value|px_timestamp2string|' +
-        'px_update_record|qdom_error|qdom_tree|quoted_printable_decode|quoted_printable_encode|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|rangeexception|rar_wrapper_cache_stats|' +
-        'rararchive|rarentry|rarexception|rawurldecode|rawurlencode|read_exif_data|readdir|readfile|readgzfile|readline|readline_add_history|' +
-        'readline_callback_handler_install|readline_callback_handler_remove|readline_callback_read_char|readline_clear_history|' +
-        'readline_completion_function|readline_info|readline_list_history|readline_on_new_line|readline_read_history|readline_redisplay|' +
-        'readline_write_history|readlink|realpath|realpath_cache_get|realpath_cache_size|recode|recode_file|recode_string|recursivearrayiterator|' +
-        'recursivecachingiterator|recursivecallbackfilteriterator|recursivedirectoryiterator|recursivefilteriterator|recursiveiterator|' +
-        'recursiveiteratoriterator|recursiveregexiterator|recursivetreeiterator|reflection|reflectionclass|reflectionexception|reflectionextension|' +
-        'reflectionfunction|reflectionfunctionabstract|reflectionmethod|reflectionobject|reflectionparameter|reflectionproperty|reflector|' +
-        'regexiterator|register_shutdown_function|register_tick_function|rename|rename_function|require|require_once|reset|resetValue|' +
-        'resourcebundle|restore_error_handler|restore_exception_handler|restore_include_path|return|rewind|rewinddir|rmdir|round|rpm_close|' +
-        'rpm_get_tag|rpm_is_valid|rpm_open|rpm_version|rrd_create|rrd_error|rrd_fetch|rrd_first|rrd_graph|rrd_info|rrd_last|rrd_lastupdate|' +
-        'rrd_restore|rrd_tune|rrd_update|rrd_xport|rrdcreator|rrdgraph|rrdupdater|rsort|rtrim|runkit_class_adopt|runkit_class_emancipate|' +
-        'runkit_constant_add|runkit_constant_redefine|runkit_constant_remove|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_return_value_used|runkit_sandbox_output_handler|' +
-        'runkit_superglobals|runtimeexception|samconnection_commit|samconnection_connect|samconnection_constructor|samconnection_disconnect|' +
-        'samconnection_errno|samconnection_error|samconnection_isconnected|samconnection_peek|samconnection_peekall|samconnection_receive|' +
-        'samconnection_remove|samconnection_rollback|samconnection_send|samconnection_setDebug|samconnection_subscribe|samconnection_unsubscribe|' +
-        'sammessage_body|sammessage_constructor|sammessage_header|sca_createdataobject|sca_getservice|sca_localproxy_createdataobject|' +
-        'sca_soapproxy_createdataobject|scandir|sdo_das_changesummary_beginlogging|sdo_das_changesummary_endlogging|' +
-        'sdo_das_changesummary_getchangeddataobjects|sdo_das_changesummary_getchangetype|sdo_das_changesummary_getoldcontainer|' +
-        'sdo_das_changesummary_getoldvalues|sdo_das_changesummary_islogging|sdo_das_datafactory_addpropertytotype|sdo_das_datafactory_addtype|' +
-        'sdo_das_datafactory_getdatafactory|sdo_das_dataobject_getchangesummary|sdo_das_relational_applychanges|sdo_das_relational_construct|' +
-        'sdo_das_relational_createrootdataobject|sdo_das_relational_executepreparedquery|sdo_das_relational_executequery|' +
-        'sdo_das_setting_getlistindex|sdo_das_setting_getpropertyindex|sdo_das_setting_getpropertyname|sdo_das_setting_getvalue|' +
-        'sdo_das_setting_isset|sdo_das_xml_addtypes|sdo_das_xml_create|sdo_das_xml_createdataobject|sdo_das_xml_createdocument|' +
-        'sdo_das_xml_document_getrootdataobject|sdo_das_xml_document_getrootelementname|sdo_das_xml_document_getrootelementuri|' +
-        'sdo_das_xml_document_setencoding|sdo_das_xml_document_setxmldeclaration|sdo_das_xml_document_setxmlversion|sdo_das_xml_loadfile|' +
-        'sdo_das_xml_loadstring|sdo_das_xml_savefile|sdo_das_xml_savestring|sdo_datafactory_create|sdo_dataobject_clear|' +
-        'sdo_dataobject_createdataobject|sdo_dataobject_getcontainer|sdo_dataobject_getsequence|sdo_dataobject_gettypename|' +
-        'sdo_dataobject_gettypenamespaceuri|sdo_exception_getcause|sdo_list_insert|sdo_model_property_getcontainingtype|' +
-        'sdo_model_property_getdefault|sdo_model_property_getname|sdo_model_property_gettype|sdo_model_property_iscontainment|' +
-        'sdo_model_property_ismany|sdo_model_reflectiondataobject_construct|sdo_model_reflectiondataobject_export|' +
-        'sdo_model_reflectiondataobject_getcontainmentproperty|sdo_model_reflectiondataobject_getinstanceproperties|' +
-        'sdo_model_reflectiondataobject_gettype|sdo_model_type_getbasetype|sdo_model_type_getname|sdo_model_type_getnamespaceuri|' +
-        'sdo_model_type_getproperties|sdo_model_type_getproperty|sdo_model_type_isabstracttype|sdo_model_type_isdatatype|sdo_model_type_isinstance|' +
-        'sdo_model_type_isopentype|sdo_model_type_issequencedtype|sdo_sequence_getproperty|sdo_sequence_insert|sdo_sequence_move|seekableiterator|' +
-        'sem_acquire|sem_get|sem_release|sem_remove|serializable|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_pgsql_add_error|session_pgsql_get_error|session_pgsql_get_field|session_pgsql_reset|session_pgsql_set_field|session_pgsql_status|' +
-        '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|setCounterClass|set_error_handler|set_exception_handler|set_file_buffer|' +
-        'set_include_path|set_magic_quotes_runtime|set_socket_blocking|set_time_limit|setcookie|setlocale|setproctitle|setrawcookie|' +
-        'setstaticpropertyvalue|setthreadtitle|settype|sha1|sha1_file|shell_exec|shm_attach|shm_detach|shm_get_var|shm_has_var|shm_put_var|' +
-        'shm_remove|shm_remove_var|shmop_close|shmop_delete|shmop_open|shmop_read|shmop_size|shmop_write|show_source|shuffle|signeurlpaiement|' +
-        'similar_text|simplexml_import_dom|simplexml_load_file|simplexml_load_string|simplexmlelement|simplexmliterator|sin|sinh|sizeof|sleep|snmp|' +
-        'snmp2_get|snmp2_getnext|snmp2_real_walk|snmp2_set|snmp2_walk|snmp3_get|snmp3_getnext|snmp3_real_walk|snmp3_set|snmp3_walk|' +
-        'snmp_get_quick_print|snmp_get_valueretrieval|snmp_read_mib|snmp_set_enum_print|snmp_set_oid_numeric_print|snmp_set_oid_output_format|' +
-        'snmp_set_quick_print|snmp_set_valueretrieval|snmpget|snmpgetnext|snmprealwalk|snmpset|snmpwalk|snmpwalkoid|soapclient|soapfault|' +
-        'soapheader|soapparam|soapserver|soapvar|socket_accept|socket_bind|socket_clear_error|socket_close|socket_connect|socket_create|' +
-        'socket_create_listen|socket_create_pair|socket_get_option|socket_get_status|socket_getpeername|socket_getsockname|socket_last_error|' +
-        'socket_listen|socket_read|socket_recv|socket_recvfrom|socket_select|socket_send|socket_sendto|socket_set_block|socket_set_blocking|' +
-        'socket_set_nonblock|socket_set_option|socket_set_timeout|socket_shutdown|socket_strerror|socket_write|solr_get_version|solrclient|' +
-        'solrclientexception|solrdocument|solrdocumentfield|solrexception|solrgenericresponse|solrillegalargumentexception|' +
-        'solrillegaloperationexception|solrinputdocument|solrmodifiableparams|solrobject|solrparams|solrpingresponse|solrquery|solrqueryresponse|' +
-        'solrresponse|solrupdateresponse|solrutils|sort|soundex|sphinxclient|spl_autoload|spl_autoload_call|spl_autoload_extensions|' +
-        'spl_autoload_functions|spl_autoload_register|spl_autoload_unregister|spl_classes|spl_object_hash|splbool|spldoublylinkedlist|splenum|' +
-        'splfileinfo|splfileobject|splfixedarray|splfloat|splheap|splint|split|spliti|splmaxheap|splminheap|splobjectstorage|splobserver|' +
-        'splpriorityqueue|splqueue|splstack|splstring|splsubject|spltempfileobject|spoofchecker|sprintf|sql_regcase|sqlite3|sqlite3result|' +
-        'sqlite3stmt|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_key|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|ssdeep_fuzzy_compare|' +
-        'ssdeep_fuzzy_hash|ssdeep_fuzzy_hash_filename|ssh2_auth_hostbased_file|ssh2_auth_none|ssh2_auth_password|ssh2_auth_pubkey_file|' +
-        'ssh2_connect|ssh2_exec|ssh2_fetch_stream|ssh2_fingerprint|ssh2_methods_negotiated|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_poisson|stats_cdf_t|stats_cdf_uniform|stats_cdf_weibull|stats_covariance|stats_den_uniform|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_negative_binomial|stats_dens_normal|stats_dens_pmf_binomial|stats_dens_pmf_hypergeometric|stats_dens_pmf_poisson|stats_dens_t|' +
-        '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_ibinomial|stats_rand_gen_ibinomial_negative|' +
-        'stats_rand_gen_int|stats_rand_gen_ipoisson|stats_rand_gen_iuniform|stats_rand_gen_noncenral_chisquare|stats_rand_gen_noncentral_f|' +
-        'stats_rand_gen_noncentral_t|stats_rand_gen_normal|stats_rand_gen_t|stats_rand_get_seeds|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_gennch|' +
-        'stats_stat_independent_t|stats_stat_innerproduct|stats_stat_noncentral_t|stats_stat_paired_t|stats_stat_percentile|stats_stat_powersum|' +
-        'stats_variance|stomp|stomp_connect_error|stomp_version|stompexception|stompframe|str_getcsv|str_ireplace|str_pad|str_repeat|str_replace|' +
-        'str_rot13|str_shuffle|str_split|str_word_count|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_get_params|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_read_buffer|' +
-        '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|streamwrapper|strftime|strip_tags|stripcslashes|stripos|' +
-        'stripslashes|stristr|strlen|strnatcasecmp|strnatcmp|strncasecmp|strncmp|strpbrk|strpos|strptime|strrchr|strrev|strripos|strrpos|strspn|' +
-        'strstr|strtok|strtolower|strtotime|strtoupper|strtr|strval|substr|substr_compare|substr_count|substr_replace|svm|svmmodel|svn_add|' +
-        'svn_auth_get_parameter|svn_auth_set_parameter|svn_blame|svn_cat|svn_checkout|svn_cleanup|svn_client_version|svn_commit|svn_delete|' +
-        '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_log|svn_ls|svn_mkdir|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_revert|svn_status|svn_update|swf_actiongeturl|' +
-        'swf_actiongotoframe|swf_actiongotolabel|swf_actionnextframe|swf_actionplay|swf_actionprevframe|swf_actionsettarget|swf_actionstop|' +
-        'swf_actiontogglequality|swf_actionwaitforframe|swf_addbuttonrecord|swf_addcolor|swf_closefile|swf_definebitmap|swf_definefont|' +
-        'swf_defineline|swf_definepoly|swf_definerect|swf_definetext|swf_endbutton|swf_enddoaction|swf_endshape|swf_endsymbol|swf_fontsize|' +
-        'swf_fontslant|swf_fonttracking|swf_getbitmapinfo|swf_getfontinfo|swf_getframe|swf_labelframe|swf_lookat|swf_modifyobject|swf_mulcolor|' +
-        'swf_nextid|swf_oncondition|swf_openfile|swf_ortho|swf_ortho2|swf_perspective|swf_placeobject|swf_polarview|swf_popmatrix|swf_posround|' +
-        'swf_pushmatrix|swf_removeobject|swf_rotate|swf_scale|swf_setfont|swf_setframe|swf_shapearc|swf_shapecurveto|swf_shapecurveto3|' +
-        'swf_shapefillbitmapclip|swf_shapefillbitmaptile|swf_shapefilloff|swf_shapefillsolid|swf_shapelinesolid|swf_shapelineto|swf_shapemoveto|' +
-        'swf_showframe|swf_startbutton|swf_startdoaction|swf_startshape|swf_startsymbol|swf_textwidth|swf_translate|swf_viewport|swfaction|' +
-        'swfbitmap|swfbutton|swfdisplayitem|swffill|swffont|swffontchar|swfgradient|swfmorph|swfmovie|swfprebuiltclip|swfshape|swfsound|' +
-        'swfsoundinstance|swfsprite|swftext|swftextfield|swfvideostream|swish_construct|swish_getmetalist|swish_getpropertylist|swish_prepare|' +
-        'swish_query|swishresult_getmetalist|swishresult_stem|swishresults_getparsedwords|swishresults_getremovedstopwords|swishresults_nextresult|' +
-        'swishresults_seekresult|swishsearch_execute|swishsearch_resetlimit|swishsearch_setlimit|swishsearch_setphrasedelimiter|' +
-        'swishsearch_setsort|swishsearch_setstructure|sybase_affected_rows|sybase_close|sybase_connect|sybase_data_seek|' +
-        'sybase_deadlock_retry_count|sybase_fetch_array|sybase_fetch_assoc|sybase_fetch_field|sybase_fetch_object|sybase_fetch_row|' +
-        'sybase_field_seek|sybase_free_result|sybase_get_last_message|sybase_min_client_severity|sybase_min_error_severity|' +
-        'sybase_min_message_severity|sybase_min_server_severity|sybase_num_fields|sybase_num_rows|sybase_pconnect|sybase_query|sybase_result|' +
-        'sybase_select_db|sybase_set_message_handler|sybase_unbuffered_query|symlink|sys_get_temp_dir|sys_getloadavg|syslog|system|tag|tan|tanh|' +
-        'tcpwrap_check|tempnam|textdomain|tidy|tidy_access_count|tidy_config_count|tidy_diagnose|tidy_error_count|tidy_get_error_buffer|' +
-        'tidy_get_output|tidy_load_config|tidy_reset_config|tidy_save_config|tidy_set_encoding|tidy_setopt|tidy_warning_count|tidynode|time|' +
-        'time_nanosleep|time_sleep_until|timezone_abbreviations_list|timezone_identifiers_list|timezone_location_get|timezone_name_from_abbr|' +
-        'timezone_name_get|timezone_offset_get|timezone_open|timezone_transitions_get|timezone_version_get|tmpfile|token_get_all|token_name|' +
-        'tokyotyrant|tokyotyrantquery|tokyotyranttable|tostring|tostring|touch|transliterator|traversable|trigger_error|trim|uasort|ucfirst|' +
-        'ucwords|udm_add_search_limit|udm_alloc_agent|udm_alloc_agent_array|udm_api_version|udm_cat_list|udm_cat_path|udm_check_charset|' +
-        'udm_check_stored|udm_clear_search_limits|udm_close_stored|udm_crc32|udm_errno|udm_error|udm_find|udm_free_agent|udm_free_ispell_data|' +
-        'udm_free_res|udm_get_doc_count|udm_get_res_field|udm_get_res_param|udm_hash32|udm_load_ispell_data|udm_open_stored|udm_set_agent_param|' +
-        'uksort|umask|underflowexception|unexpectedvalueexception|uniqid|unixtojd|unlink|unpack|unregister_tick_function|unserialize|unset|' +
-        'urldecode|urlencode|use_soap_error_handler|user_error|usleep|usort|utf8_decode|utf8_encode|v8js|v8jsexception|var_dump|var_export|variant|' +
-        '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|vfprintf|virtual|' +
-        'vpopmail_add_alias_domain|vpopmail_add_alias_domain_ex|vpopmail_add_domain|vpopmail_add_domain_ex|vpopmail_add_user|vpopmail_alias_add|' +
-        'vpopmail_alias_del|vpopmail_alias_del_domain|vpopmail_alias_get|vpopmail_alias_get_all|vpopmail_auth_user|vpopmail_del_domain|' +
-        'vpopmail_del_domain_ex|vpopmail_del_user|vpopmail_error|vpopmail_passwd|vpopmail_set_user_quota|vprintf|vsprintf|w32api_deftype|' +
-        'w32api_init_dtype|w32api_invoke_function|w32api_register_function|w32api_set_call_method|wddx_add_vars|wddx_deserialize|wddx_packet_end|' +
-        'wddx_packet_start|wddx_serialize_value|wddx_serialize_vars|win32_continue_service|win32_create_service|win32_delete_service|' +
-        'win32_get_last_control_message|win32_pause_service|win32_ps_list_procs|win32_ps_stat_mem|win32_ps_stat_proc|win32_query_service_status|' +
-        'win32_set_service_status|win32_start_service|win32_start_service_ctrl_dispatcher|win32_stop_service|wincache_fcache_fileinfo|' +
-        'wincache_fcache_meminfo|wincache_lock|wincache_ocache_fileinfo|wincache_ocache_meminfo|wincache_refresh_if_changed|' +
-        'wincache_rplist_fileinfo|wincache_rplist_meminfo|wincache_scache_info|wincache_scache_meminfo|wincache_ucache_add|wincache_ucache_cas|' +
-        'wincache_ucache_clear|wincache_ucache_dec|wincache_ucache_delete|wincache_ucache_exists|wincache_ucache_get|wincache_ucache_inc|' +
-        'wincache_ucache_info|wincache_ucache_meminfo|wincache_ucache_set|wincache_unlock|wordwrap|xattr_get|xattr_list|xattr_remove|xattr_set|' +
-        'xattr_supported|xdiff_file_bdiff|xdiff_file_bdiff_size|xdiff_file_bpatch|xdiff_file_diff|xdiff_file_diff_binary|xdiff_file_merge3|' +
-        'xdiff_file_patch|xdiff_file_patch_binary|xdiff_file_rabdiff|xdiff_string_bdiff|xdiff_string_bdiff_size|xdiff_string_bpatch|' +
-        'xdiff_string_diff|xdiff_string_diff_binary|xdiff_string_merge3|xdiff_string_patch|xdiff_string_patch_binary|xdiff_string_rabdiff|' +
-        'xhprof_disable|xhprof_enable|xhprof_sample_disable|xhprof_sample_enable|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_parse_into_struct|xml_parser_create|' +
-        'xml_parser_create_ns|xml_parser_free|xml_parser_get_option|xml_parser_set_option|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|xmlreader|' +
-        '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|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|xslt_backend_info|xslt_backend_name|xslt_backend_version|xslt_create|xslt_errno|' +
-        'xslt_error|xslt_free|xslt_getopt|xslt_process|xslt_set_base|xslt_set_encoding|xslt_set_error_handler|xslt_set_log|xslt_set_object|' +
-        'xslt_set_sax_handler|xslt_set_sax_handlers|xslt_set_scheme_handler|xslt_set_scheme_handlers|xslt_setopt|xsltprocessor|yaml_emit|' +
-        'yaml_emit_file|yaml_parse|yaml_parse_file|yaml_parse_url|yaz_addinfo|yaz_ccl_conf|yaz_ccl_parse|yaz_close|yaz_connect|yaz_database|' +
-        'yaz_element|yaz_errno|yaz_error|yaz_es|yaz_es_result|yaz_get_option|yaz_hits|yaz_itemorder|yaz_present|yaz_range|yaz_record|yaz_scan|' +
-        'yaz_scan_result|yaz_schema|yaz_search|yaz_set_option|yaz_sort|yaz_syntax|yaz_wait|yp_all|yp_cat|yp_err_string|yp_errno|yp_first|' +
-        'yp_get_default_domain|yp_master|yp_match|yp_next|yp_order|zend_logo_guid|zend_thread_id|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|' +
-        'ziparchive|ziparchive_addemptydir|ziparchive_addfile|ziparchive_addfromstring|ziparchive_close|ziparchive_deleteindex|' +
-        'ziparchive_deletename|ziparchive_extractto|ziparchive_getarchivecomment|ziparchive_getcommentindex|ziparchive_getcommentname|' +
-        'ziparchive_getfromindex|ziparchive_getfromname|ziparchive_getnameindex|ziparchive_getstatusstring|ziparchive_getstream|' +
-        'ziparchive_locatename|ziparchive_open|ziparchive_renameindex|ziparchive_renamename|ziparchive_setCommentName|ziparchive_setarchivecomment|' +
-        'ziparchive_setcommentindex|ziparchive_statindex|ziparchive_statname|ziparchive_unchangeall|ziparchive_unchangearchive|' +
-        'ziparchive_unchangeindex|ziparchive_unchangename|zlib_get_coding_type').split('|')
-    );
-
-    // http://php.net/manual/en/reserved.keywords.php
-    var keywords = lang.arrayToMap(
-        ('abstract|and|array|as|break|case|catch|class|clone|const|continue|declare|default|do|else|elseif|enddeclare|endfor|endforeach|endif|' +
-        'endswitch|endwhile|extends|final|for|foreach|function|global|goto|if|implements|interface|instanceof|namespace|new|or|private|protected|' +
-        'public|static|switch|throw|try|use|var|while|xor').split('|')
-    );
-
-    // http://php.net/manual/en/reserved.keywords.php
-    var languageConstructs = lang.arrayToMap(
-        ('die|echo|empty|exit|eval|include|include_once|isset|list|require|require_once|return|print|unset').split('|')
-    );
-
-    var builtinConstants = lang.arrayToMap(
-        ('true|false|null|__CLASS__|__DIR__|__FILE__|__LINE__|__METHOD__|__FUNCTION__|__NAMESPACE__').split('|')
-    );
-
-    var builtinVariables = lang.arrayToMap(
-        ('$GLOBALS|$_SERVER|$_GET|$_POST|$_FILES|$_REQUEST|$_SESSION|$_ENV|$_COOKIE|$php_errormsg|$HTTP_RAW_POST_DATA|' +
-        '$http_response_header|$argc|$argv').split('|')
-    );
-
-    // Discovery done by downloading 'Many HTML files' from:  http://php.net/download-docs.php
-    // Then search for files containing 'deprecated' (case-insensitive) and look at each file that turns up.
-    var builtinFunctionsDeprecated = lang.arrayToMap(
-        ('key_exists|cairo_matrix_create_scale|cairo_matrix_create_translate|call_user_method|call_user_method_array|com_addref|com_get|' +
-        'com_invoke|com_isenum|com_load|com_release|com_set|connection_timeout|cubrid_load_from_glo|cubrid_new_glo|cubrid_save_to_glo|' +
-        'cubrid_send_glo|define_syslog_variables|dl|ereg|ereg_replace|eregi|eregi_replace|hw_documentattributes|hw_documentbodytag|' +
-        'hw_documentsize|hw_outputdocument|imagedashedline|maxdb_bind_param|maxdb_bind_result|maxdb_client_encoding|maxdb_close_long_data|' +
-        'maxdb_execute|maxdb_fetch|maxdb_get_metadata|maxdb_param_count|maxdb_send_long_data|mcrypt_ecb|mcrypt_generic_end|mime_content_type|' +
-        'mysql_createdb|mysql_dbname|mysql_db_query|mysql_drop_db|mysql_dropdb|mysql_escape_string|mysql_fieldflags|mysql_fieldflags|' +
-        'mysql_fieldname|mysql_fieldtable|mysql_fieldtype|mysql_freeresult|mysql_listdbs|mysql_list_fields|mysql_listfields|mysql_list_tables|' +
-        'mysql_listtables|mysql_numfields|mysql_numrows|mysql_selectdb|mysql_tablename|mysqli_bind_param|mysqli_bind_result|' +
-        'mysqli_disable_reads_from_master|mysqli_disable_rpl_parse|mysqli_enable_reads_from_master|mysqli_enable_rpl_parse|mysqli_execute|' +
-        'mysqli_fetch|mysqli_get_metadata|mysqli_master_query|mysqli_param_count|mysqli_rpl_parse_enabled|mysqli_rpl_probe|mysqli_rpl_query_type|' +
-        'mysqli_send_long_data|mysqli_send_query|mysqli_slave_query|ocibindbyname|ocicancel|ocicloselob|ocicollappend|ocicollassign|' +
-        'ocicollassignelem|ocicollgetelem|ocicollmax|ocicollsize|ocicolltrim|ocicolumnisnull|ocicolumnname|ocicolumnprecision|ocicolumnscale|' +
-        'ocicolumnsize|ocicolumntype|ocicolumntyperaw|ocicommit|ocidefinebyname|ocierror|ociexecute|ocifetch|ocifetchinto|ocifetchstatement|' +
-        'ocifreecollection|ocifreecursor|ocifreedesc|ocifreestatement|ociinternaldebug|ociloadlob|ocilogoff|ocilogon|ocinewcollection|' +
-        'ocinewcursor|ocinewdescriptor|ocinlogon|ocinumcols|ociparse|ociplogon|ociresult|ocirollback|ocirowcount|ocisavelob|ocisavelobfile|' +
-        'ociserverversion|ocisetprefetch|ocistatementtype|ociwritelobtofile|ociwritetemporarylob|PDF_add_annotation|PDF_add_bookmark|' +
-        'PDF_add_launchlink|PDF_add_locallink|PDF_add_note|PDF_add_outline|PDF_add_pdflink|PDF_add_weblink|PDF_attach_file|PDF_begin_page|' +
-        'PDF_begin_template|PDF_close_pdi|PDF_close|PDF_findfont|PDF_get_font|PDF_get_fontname|PDF_get_fontsize|PDF_get_image_height|' +
-        'PDF_get_image_width|PDF_get_majorversion|PDF_get_minorversion|PDF_get_pdi_parameter|PDF_get_pdi_value|PDF_open_ccitt|PDF_open_file|' +
-        'PDF_open_gif|PDF_open_image_file|PDF_open_image|PDF_open_jpeg|PDF_open_pdi|PDF_open_tiff|PDF_place_image|PDF_place_pdi_page|' +
-        'PDF_set_border_color|PDF_set_border_dash|PDF_set_border_style|PDF_set_char_spacing|PDF_set_duration|PDF_set_horiz_scaling|' +
-        'PDF_set_info_author|PDF_set_info_creator|PDF_set_info_keywords|PDF_set_info_subject|PDF_set_info_title|PDF_set_leading|' +
-        'PDF_set_text_matrix|PDF_set_text_rendering|PDF_set_text_rise|PDF_set_word_spacing|PDF_setgray_fill|PDF_setgray_stroke|PDF_setgray|' +
-        'PDF_setpolydash|PDF_setrgbcolor_fill|PDF_setrgbcolor_stroke|PDF_setrgbcolor|PDF_show_boxed|php_check_syntax|px_set_tablename|' +
-        'px_set_targetencoding|runkit_sandbox_output_handler|session_is_registered|session_register|session_unregister' +
-        'set_magic_quotes_runtime|magic_quotes_runtime|set_socket_blocking|socket_set_blocking|set_socket_timeout|socket_set_timeout|split|spliti|' +
-        'sql_regcase').split('|')
-    );
-
-    var keywordsDeprecated = lang.arrayToMap(
-        ('cfunction|old_function').split('|')
-    );
-
-    var futureReserved = lang.arrayToMap([]);
-
-    // regexp must not have capturing parentheses. Use (?:) instead.
-    // regexps are ordered -> the first match is used
-
-    this.$rules = {
-        "start" : [
-            {
-                token : "support.php_tag", // php open tag
-                regex : "<\\?(?:php|\\=)"
-            },
-            {
-                token : "support.php_tag", // php close tag
-                regex : "\\?>"
-            },
-            {
-                token : "comment",
-                regex : "<\\!--",
-                next : "htmlcomment"
-            }, 
-            {
-                token : "meta.tag",
-                regex : "<style",
-                next : "css"
-            },
-            {
-                token : "meta.tag", // opening tag
-                regex : "<\\/?[-_a-zA-Z0-9:]+",
-                next : "htmltag"
-            },
-            {
-                token : 'meta.tag',
-                regex : '<\!DOCTYPE.*?>'
-            },
-            {
-                token : "comment",
-                regex : "\\/\\/.*$"
-            },
-            {
-               token : "comment",
-               regex : "#.*$"
-            },
-            docComment.getStartRule("doc-start"),
-            {
-                token : "comment", // multi line comment
-                regex : "\\/\\*",
-                next : "comment"
-            }, {
-                token : "string.regexp",
-                regex : "[/](?:(?:\\[(?:\\\\]|[^\\]])+\\])|(?:\\\\/|[^\\]/]))*[/][gimy]*\\s*(?=[).,;]|$)"
-            }, {
-                token : "string", // single line
-                regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
-            }, {
-                token : "string", // multi line string start
-                regex : '["][\\s\\S]*',
-                next : "qqstring"
-            }, {
-                token : "string", // single line
-                regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"
-            }, {
-                token : "string", // multi line string start
-                regex : "['][\\s\\S]+",
-                next : "qstring"
-            }, {
-                token : "constant.numeric", // hex
-                regex : "0[xX][0-9a-fA-F]+\\b"
-            }, {
-                token : "constant.numeric", // float
-                regex : "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"
-            }, {
-                token : "constant.language", // constants
-                regex : "\\b(?:DEFAULT_INCLUDE_PATH|E_(?:ALL|CO(?:MPILE_(?:ERROR|WARNING)|RE_(?:ERROR|WARNING))|" +
-                        "ERROR|NOTICE|PARSE|STRICT|USER_(?:ERROR|NOTICE|WARNING)|WARNING)|P(?:EAR_(?:EXTENSION_DIR|INSTALL_DIR)|" +
-                        "HP_(?:BINDIR|CONFIG_FILE_(?:PATH|SCAN_DIR)|DATADIR|E(?:OL|XTENSION_DIR)|INT_(?:MAX|SIZE)|" +
-                        "L(?:IBDIR|OCALSTATEDIR)|O(?:S|UTPUT_HANDLER_(?:CONT|END|START))|PREFIX|S(?:API|HLIB_SUFFIX|YSCONFDIR)|" +
-                        "VERSION))|__COMPILER_HALT_OFFSET__)\\b"
-            }, {
-                token : "constant.language", // constants
-                regex : "\\b(?:A(?:B(?:DAY_(?:1|2|3|4|5|6|7)|MON_(?:1(?:0|1|2|)|2|3|4|5|6|7|8|9))|LT_DIGITS|M_STR|" +
-                        "SSERT_(?:ACTIVE|BAIL|CALLBACK|QUIET_EVAL|WARNING))|C(?:ASE_(?:LOWER|UPPER)|HAR_MAX|" +
-                        "O(?:DESET|NNECTION_(?:ABORTED|NORMAL|TIMEOUT)|UNT_(?:NORMAL|RECURSIVE))|" +
-                        "R(?:EDITS_(?:ALL|DOCS|FULLPAGE|G(?:ENERAL|ROUP)|MODULES|QA|SAPI)|NCYSTR|" +
-                        "YPT_(?:BLOWFISH|EXT_DES|MD5|S(?:ALT_LENGTH|TD_DES)))|URRENCY_SYMBOL)|D(?:AY_(?:1|2|3|4|5|6|7)|" +
-                        "ECIMAL_POINT|IRECTORY_SEPARATOR|_(?:FMT|T_FMT))|E(?:NT_(?:COMPAT|NOQUOTES|QUOTES)|RA(?:_(?:D_(?:FMT|T_FMT)|" +
-                        "T_FMT|YEAR)|)|XTR_(?:IF_EXISTS|OVERWRITE|PREFIX_(?:ALL|I(?:F_EXISTS|NVALID)|SAME)|SKIP))|FRAC_DIGITS|GROUPING|" +
-                        "HTML_(?:ENTITIES|SPECIALCHARS)|IN(?:FO_(?:ALL|C(?:ONFIGURATION|REDITS)|ENVIRONMENT|GENERAL|LICENSE|MODULES|VARIABLES)|" +
-                        "I_(?:ALL|PERDIR|SYSTEM|USER)|T_(?:CURR_SYMBOL|FRAC_DIGITS))|L(?:C_(?:ALL|C(?:OLLATE|TYPE)|M(?:ESSAGES|ONETARY)|NUMERIC|TIME)|" +
-                        "O(?:CK_(?:EX|NB|SH|UN)|G_(?:A(?:LERT|UTH(?:PRIV|))|C(?:ONS|R(?:IT|ON))|D(?:AEMON|EBUG)|E(?:MERG|RR)|INFO|KERN|" +
-                        "L(?:OCAL(?:0|1|2|3|4|5|6|7)|PR)|MAIL|N(?:DELAY|EWS|O(?:TICE|WAIT))|ODELAY|P(?:ERROR|ID)|SYSLOG|U(?:SER|UCP)|WARNING)))|" +
-                        "M(?:ON_(?:1(?:0|1|2|)|2|3|4|5|6|7|8|9|DECIMAL_POINT|GROUPING|THOUSANDS_SEP)|_(?:1_PI|2_(?:PI|SQRTPI)|E|L(?:N(?:10|2)|" +
-                        "OG(?:10E|2E))|PI(?:_(?:2|4)|)|SQRT(?:1_2|2)))|N(?:EGATIVE_SIGN|O(?:EXPR|STR)|_(?:CS_PRECEDES|S(?:EP_BY_SPACE|IGN_POSN)))|" +
-                        "P(?:ATH(?:INFO_(?:BASENAME|DIRNAME|EXTENSION)|_SEPARATOR)|M_STR|OSITIVE_SIGN|_(?:CS_PRECEDES|S(?:EP_BY_SPACE|IGN_POSN)))|" +
-                        "RADIXCHAR|S(?:EEK_(?:CUR|END|SET)|ORT_(?:ASC|DESC|NUMERIC|REGULAR|STRING)|TR_PAD_(?:BOTH|LEFT|RIGHT))|" +
-                        "T(?:HOUS(?:ANDS_SEP|EP)|_FMT(?:_AMPM|))|YES(?:EXPR|STR)|STD(?:IN|OUT|ERR))\\b"
-            }, {
-                token : function(value) {
-                    if (keywords.hasOwnProperty(value))
-                        return "keyword";
-                    else if (builtinConstants.hasOwnProperty(value))
-                        return "constant.language";
-                    else if (builtinVariables.hasOwnProperty(value))
-                        return "variable.language";
-                    else if (futureReserved.hasOwnProperty(value))
-                        return "invalid.illegal";
-                    else if (builtinFunctions.hasOwnProperty(value))
-                        return "support.function";
-                    else if (value == "debugger")
-                        return "invalid.deprecated";
-                    else
-                        if(value.match(/^(\$[a-zA-Z][a-zA-Z0-9_]*|self|parent)$/))
-                            return "variable";
-                        return "identifier";
-                },
-                // TODO: Unicode escape sequences
-                // TODO: Unicode identifiers
-                regex : "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
-            }, {
-                token : "keyword.operator",
-                regex : "!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)"
-            }, {
-                token : "lparen",
-                regex : "[[({]"
-            }, {
-                token : "rparen",
-                regex : "[\\])}]"
-            }, {
-                token : "text",
-                regex : "\\s+"
-            }
-        ],
-        "comment" : [
-            {
-                token : "comment", // closing comment
-                regex : ".*?\\*\\/",
-                next : "start"
-            }, {
-                token : "comment", // comment spanning whole line
-                regex : ".+"
-            }
-        ],
-        "qqstring" : [
-            {
-                token : "string",
-                regex : '"',
-                next : "start"
-            }, {
-                token : "string",
-                regex : '[^"]+'
-            }
-        ],
-        "qstring" : [
-            {
-                token : "string",
-                regex : "'",
-                next : "start"
-            }, {
-                token : "string",
-                regex : "[^']+"
-            }
-        ],
-        "htmlcomment" : [
-             {
-                 token : "comment",
-                 regex : ".*?-->",
-                 next : "start"
-             }, {
-                 token : "comment",
-                 regex : ".+"
-             } 
-         ],
-         "htmltag" : [ 
-             {
-                 token : "meta.tag",
-                 regex : ">",
-                 next : "start"
-             }, {
-                 token : "text",
-                 regex : "[-_a-zA-Z0-9:]+"
-             }, {
-                 token : "text",
-                 regex : "\\s+"
-             }, {
-                 token : "string",
-                 regex : '".*?"'
-             }, {
-                 token : "string",
-                 regex : "'.*?'"
-             } 
-         ],
-        "css" : [ 
-             {
-                 token : "meta.tag",
-                 regex : "<\/style>",
-                 next : "htmltag"
-             }, {
-                 token : "meta.tag",
-                 regex : ">"
-             }, {
-                 token : 'text',
-                 regex : "(?:media|type|href)"
-             }, {
-                 token : 'string',
-                 regex : '=".*?"'
-             }, {
-                 token : "paren.lparen",
-                 regex : "\{",
-                 next : "cssdeclaration"
-             }, {
-                 token : "keyword",
-                 regex : "#[A-Za-z0-9\-\_\.]+"
-             }, {
-                 token : "variable",
-                 regex : "\\.[A-Za-z0-9\-\_\.]+"
-             }, {
-                 token : "constant",
-                 regex : "[A-Za-z0-9]+"
-             }
-         ],
-         "cssdeclaration" : [
-             {
-                 token : "support.type",
-                 regex : "[\-a-zA-Z]+",
-                 next  : "cssvalue"
-             }, 
-             {
-                 token : "paren.rparen",
-                 regex : '\}',
-                 next : "css"
-             }
-         ],
-         "cssvalue" : [
-               {
-                   token : "text",
-                   regex : "\:"
-               }, 
-               {
-                   token : "constant",
-                   regex : "#[0-9a-zA-Z]+"
-               },
-               {
-                   token : "text",
-                   regex : "[\-\_0-9a-zA-Z\"' ,%]+"
-               },
-               {
-                   token : "text",
-                   regex : ";",
-                   next : "cssdeclaration"
-               }
-         ]
-    };
-
-    this.embedRules(DocCommentHighlightRules, "doc-",
-        [ new DocCommentHighlightRules().getEndRule("start") ]);
-};
-
-oop.inherits(PhpHighlightRules, TextHighlightRules);
-
-exports.PhpHighlightRules = PhpHighlightRules;
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/doc_comment_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var DocCommentHighlightRules = function() {
-
-    this.$rules = {
-        "start" : [ {
-            token : "comment.doc.tag",
-            regex : "@[\\w\\d_]+" // TODO: fix email addresses
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "\\s+"
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "TODO"
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "[^@\\*]+"
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "."
-        }]
-    };
-};
-
-oop.inherits(DocCommentHighlightRules, TextHighlightRules);
-
-(function() {
-
-    this.getStartRule = function(start) {
-        return {
-            token : "comment.doc", // doc comment
-            merge : true,
-            regex : "\\/\\*(?=\\*)",
-            next  : start
-        };
-    };
-    
-    this.getEndRule = function (start) {
-        return {
-            token : "comment.doc", // closing comment
-            merge : true,
-            regex : "\\*\\/",
-            next  : start
-        };
-    };
-
-}).call(DocCommentHighlightRules.prototype);
-
-exports.DocCommentHighlightRules = DocCommentHighlightRules;
-
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/matching_brace_outdent', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../range").Range;
-
-var MatchingBraceOutdent = function() {};
-
-(function() {
-
-    this.checkOutdent = function(line, input) {
-        if (! /^\s+$/.test(line))
-            return false;
-
-        return /^\s*\}/.test(input);
-    };
-
-    this.autoOutdent = function(doc, row) {
-        var line = doc.getLine(row);
-        var match = line.match(/^(\s*\})/);
-
-        if (!match) return 0;
-
-        var column = match[1].length;
-        var openBracePos = doc.findMatchingBracket({row: row, column: column});
-
-        if (!openBracePos || openBracePos.row == row) return 0;
-
-        var indent = this.$getIndent(doc.getLine(openBracePos.row));
-        doc.replace(new Range(row, 0, row, column-1), indent);
-    };
-
-    this.$getIndent = function(line) {
-        var match = line.match(/^(\s+)/);
-        if (match) {
-            return match[1];
-        }
-
-        return "";
-    };
-
-}).call(MatchingBraceOutdent.prototype);
-
-exports.MatchingBraceOutdent = MatchingBraceOutdent;
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Chris Spencer <chris.ag.spencer AT googlemail DOT com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/behaviour/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/behaviour'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var Behaviour = require('../behaviour').Behaviour;
-
-var CstyleBehaviour = function () {
-
-    this.add("braces", "insertion", function (state, action, editor, session, text) {
-        if (text == '{') {
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: '{' + selected + '}',
-                    selection: false
-                };
-            } else {
-                return {
-                    text: '{}',
-                    selection: [1, 1]
-                };
-            }
-        } else if (text == '}') {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == '}') {
-                var matching = session.$findOpeningBracket('}', {column: cursor.column + 1, row: cursor.row});
-                if (matching !== null) {
-                    return {
-                        text: '',
-                        selection: [1, 1]
-                    };
-                }
-            }
-        } else if (text == "\n") {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == '}') {
-                var openBracePos = session.findMatchingBracket({row: cursor.row, column: cursor.column + 1});
-                if (!openBracePos)
-                     return null;
-
-                var indent = this.getNextLineIndent(state, line.substring(0, line.length - 1), session.getTabString());
-                var next_indent = this.$getIndent(session.doc.getLine(openBracePos.row));
-
-                return {
-                    text: '\n' + indent + '\n' + next_indent,
-                    selection: [1, indent.length, 1, indent.length]
-                };
-            }
-        }
-    });
-
-    this.add("braces", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && selected == '{') {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.end.column, range.end.column + 1);
-            if (rightChar == '}') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-    this.add("parens", "insertion", function (state, action, editor, session, text) {
-        if (text == '(') {
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: '(' + selected + ')',
-                    selection: false
-                };
-            } else {
-                return {
-                    text: '()',
-                    selection: [1, 1]
-                };
-            }
-        } else if (text == ')') {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == ')') {
-                var matching = session.$findOpeningBracket(')', {column: cursor.column + 1, row: cursor.row});
-                if (matching !== null) {
-                    return {
-                        text: '',
-                        selection: [1, 1]
-                    };
-                }
-            }
-        }
-    });
-
-    this.add("parens", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && selected == '(') {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
-            if (rightChar == ')') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-    this.add("string_dquotes", "insertion", function (state, action, editor, session, text) {
-        if (text == '"' || text == "'") {
-            var quote = text;
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: quote + selected + quote,
-                    selection: false
-                };
-            } else {
-                var cursor = editor.getCursorPosition();
-                var line = session.doc.getLine(cursor.row);
-                var leftChar = line.substring(cursor.column-1, cursor.column);
-
-                // We're escaped.
-                if (leftChar == '\\') {
-                    return null;
-                }
-
-                // Find what token we're inside.
-                var tokens = session.getTokens(selection.start.row, selection.start.row)[0].tokens;
-                var col = 0, token;
-                var quotepos = -1; // Track whether we're inside an open quote.
-
-                for (var x = 0; x < tokens.length; x++) {
-                    token = tokens[x];
-                    if (token.type == "string") {
-                      quotepos = -1;
-                    } else if (quotepos < 0) {
-                      quotepos = token.value.indexOf(quote);
-                    }
-                    if ((token.value.length + col) > selection.start.column) {
-                        break;
-                    }
-                    col += tokens[x].value.length;
-                }
-
-                // Try and be smart about when we auto insert.
-                if (!token || (quotepos < 0 && token.type !== "comment" && (token.type !== "string" || ((selection.start.column !== token.value.length+col-1) && token.value.lastIndexOf(quote) === token.value.length-1)))) {
-                    return {
-                        text: quote + quote,
-                        selection: [1,1]
-                    };
-                } else if (token && token.type === "string") {
-                    // Ignore input and move right one if we're typing over the closing quote.
-                    var rightChar = line.substring(cursor.column, cursor.column + 1);
-                    if (rightChar == quote) {
-                        return {
-                            text: '',
-                            selection: [1, 1]
-                        };
-                    }
-                }
-            }
-        }
-    });
-
-    this.add("string_dquotes", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && (selected == '"' || selected == "'")) {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
-            if (rightChar == '"') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-};
-
-oop.inherits(CstyleBehaviour, Behaviour);
-
-exports.CstyleBehaviour = CstyleBehaviour;
-});/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/folding/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/range', 'ace/mode/folding/fold_mode'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var Range = require("../../range").Range;
-var BaseFoldMode = require("./fold_mode").FoldMode;
-
-var FoldMode = exports.FoldMode = function() {};
-oop.inherits(FoldMode, BaseFoldMode);
-
-(function() {
-
-    this.foldingStartMarker = /(\{|\[)[^\}\]]*$|^\s*(\/\*)/;
-    this.foldingStopMarker = /^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/;
-    
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        var line = session.getLine(row);
-        var match = line.match(this.foldingStartMarker);
-        if (match) {
-            var i = match.index;
-
-            if (match[1])
-                return this.openingBracketBlock(session, match[1], row, i);
-
-            var range = session.getCommentFoldRange(row, i + match[0].length);
-            range.end.column -= 2;
-            return range;
-        }
-
-        if (foldStyle !== "markbeginend")
-            return;
-            
-        var match = line.match(this.foldingStopMarker);
-        if (match) {
-            var i = match.index + match[0].length;
-
-            if (match[2]) {
-                var range = session.getCommentFoldRange(row, i);
-                range.end.column -= 2;
-                return range;
-            }
-
-            var end = {row: row, column: i};
-            var start = session.$findOpeningBracket(match[1], end);
-            
-            if (!start)
-                return;
-
-            start.column++;
-            end.column--;
-
-            return  Range.fromPoints(start, end);
-        }
-    };
-    
-}).call(FoldMode.prototype);
-
-});/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/folding/fold_mode', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../../range").Range;
-
-var FoldMode = exports.FoldMode = function() {};
-
-(function() {
-
-    this.foldingStartMarker = null;
-    this.foldingStopMarker = null;
-
-    // must return "" if there's no fold, to enable caching
-    this.getFoldWidget = function(session, foldStyle, row) {
-        var line = session.getLine(row);
-        if (this.foldingStartMarker.test(line))
-            return "start";
-        if (foldStyle == "markbeginend"
-                && this.foldingStopMarker
-                && this.foldingStopMarker.test(line))
-            return "end";
-        return "";
-    };
-    
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        return null;
-    };
-
-    this.indentationBlock = function(session, row, column) {
-        var re = /^\s*/;
-        var startRow = row;
-        var endRow = row;
-        var line = session.getLine(row);
-        var startColumn = column || line.length;
-        var startLevel = line.match(re)[0].length;
-        var maxRow = session.getLength()
-        
-        while (++row < maxRow) {
-            line = session.getLine(row);
-            var level = line.match(re)[0].length;
-
-            if (level == line.length)
-                continue;
-
-            if (level <= startLevel)
-                break;
-
-            endRow = row;
-        }
-
-        if (endRow > startRow) {
-            var endColumn = session.getLine(endRow).length;
-            return new Range(startRow, startColumn, endRow, endColumn);
-        }
-    };
-
-    this.openingBracketBlock = function(session, bracket, row, column) {
-        var start = {row: row, column: column + 1};
-        var end = session.$findClosingBracket(bracket, start);
-        if (!end)
-            return;
-
-        var fw = session.foldWidgets[end.row];
-        if (fw == null)
-            fw = this.getFoldWidget(session, end.row);
-
-        if (fw == "start") {
-            end.row --;
-            end.column = session.getLine(end.row).length;
-        }
-        return Range.fromPoints(start, end);
-    };
-
-}).call(FoldMode.prototype);
-
-});
diff --git a/apps/files_texteditor/js/aceeditor/mode-php.js b/apps/files_texteditor/js/aceeditor/mode-php.js
deleted file mode 100644
index 8b156ab98b..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-php.js
+++ /dev/null
@@ -1 +0,0 @@
-define("ace/mode/php",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/php_highlight_rules","ace/mode/matching_brace_outdent","ace/range","ace/mode/behaviour/cstyle","ace/mode/folding/cstyle"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./php_highlight_rules").PhpHighlightRules,h=a("./matching_brace_outdent").MatchingBraceOutdent,i=a("../range").Range,j=a("./behaviour/cstyle").CstyleBehaviour,k=a("./folding/cstyle").FoldMode,l=function(){this.$tokenizer=new f((new g).getRules()),this.$outdent=new h,this.$behaviour=new j,this.foldingRules=new k};d.inherits(l,e),function(){this.toggleCommentLines=function(a,b,c,d){var e=!0,f=/^(\s*)#/;for(var g=c;g<=d;g++)if(!f.test(b.getLine(g))){e=!1;break}if(e){var h=new i(0,0,0,0);for(var g=c;g<=d;g++){var j=b.getLine(g),k=j.match(f);h.start.row=g,h.end.row=g,h.end.column=k[0].length,b.replace(h,k[1])}}else b.indentRows(c,d,"#")},this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a),f=e.tokens;if(f.length&&f[f.length-1].type=="comment")return d;if(a=="start"){var g=b.match(/^.*[\{\(\[\:]\s*$/);g&&(d+=c)}return d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)}}.call(l.prototype),b.Mode=l}),define("ace/mode/php_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/doc_comment_highlight_rules","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("./doc_comment_highlight_rules").DocCommentHighlightRules,g=a("./text_highlight_rules").TextHighlightRules,h=function(){var a=new f,b=e.arrayToMap("abs|acos|acosh|addcslashes|addslashes|aggregate|aggregate_info|aggregate_methods|aggregate_methods_by_list|aggregate_methods_by_regexp|aggregate_properties|aggregate_properties_by_list|aggregate_properties_by_regexp|aggregation_info|amqpconnection|amqpexchange|amqpqueue|apache_child_terminate|apache_get_modules|apache_get_version|apache_getenv|apache_lookup_uri|apache_note|apache_request_headers|apache_reset_timeout|apache_response_headers|apache_setenv|apc_add|apc_bin_dump|apc_bin_dumpfile|apc_bin_load|apc_bin_loadfile|apc_cache_info|apc_cas|apc_clear_cache|apc_compile_file|apc_dec|apc_define_constants|apc_delete|apc_delete_file|apc_exists|apc_fetch|apc_inc|apc_load_constants|apc_sma_info|apc_store|apciterator|apd_breakpoint|apd_callstack|apd_clunk|apd_continue|apd_croak|apd_dump_function_table|apd_dump_persistent_resources|apd_dump_regular_resources|apd_echo|apd_get_active_symbols|apd_set_pprof_trace|apd_set_session|apd_set_session_trace|apd_set_session_trace_socket|appenditerator|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_replace|array_replace_recursive|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|arrayaccess|arrayiterator|arrayobject|arsort|asin|asinh|asort|assert|assert_options|atan|atan2|atanh|audioproperties|badfunctioncallexception|badmethodcallexception|base64_decode|base64_encode|base_convert|basename|bbcode_add_element|bbcode_add_smiley|bbcode_create|bbcode_destroy|bbcode_parse|bbcode_set_arg_parser|bbcode_set_flags|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|bind_textdomain_codeset|bindec|bindtextdomain|bson_decode|bson_encode|bumpValue|bzclose|bzcompress|bzdecompress|bzerrno|bzerror|bzerrstr|bzflush|bzopen|bzread|bzwrite|cachingiterator|cairo|cairo_create|cairo_font_face_get_type|cairo_font_face_status|cairo_font_options_create|cairo_font_options_equal|cairo_font_options_get_antialias|cairo_font_options_get_hint_metrics|cairo_font_options_get_hint_style|cairo_font_options_get_subpixel_order|cairo_font_options_hash|cairo_font_options_merge|cairo_font_options_set_antialias|cairo_font_options_set_hint_metrics|cairo_font_options_set_hint_style|cairo_font_options_set_subpixel_order|cairo_font_options_status|cairo_format_stride_for_width|cairo_image_surface_create|cairo_image_surface_create_for_data|cairo_image_surface_create_from_png|cairo_image_surface_get_data|cairo_image_surface_get_format|cairo_image_surface_get_height|cairo_image_surface_get_stride|cairo_image_surface_get_width|cairo_matrix_create_scale|cairo_matrix_create_translate|cairo_matrix_invert|cairo_matrix_multiply|cairo_matrix_rotate|cairo_matrix_transform_distance|cairo_matrix_transform_point|cairo_matrix_translate|cairo_pattern_add_color_stop_rgb|cairo_pattern_add_color_stop_rgba|cairo_pattern_create_for_surface|cairo_pattern_create_linear|cairo_pattern_create_radial|cairo_pattern_create_rgb|cairo_pattern_create_rgba|cairo_pattern_get_color_stop_count|cairo_pattern_get_color_stop_rgba|cairo_pattern_get_extend|cairo_pattern_get_filter|cairo_pattern_get_linear_points|cairo_pattern_get_matrix|cairo_pattern_get_radial_circles|cairo_pattern_get_rgba|cairo_pattern_get_surface|cairo_pattern_get_type|cairo_pattern_set_extend|cairo_pattern_set_filter|cairo_pattern_set_matrix|cairo_pattern_status|cairo_pdf_surface_create|cairo_pdf_surface_set_size|cairo_ps_get_levels|cairo_ps_level_to_string|cairo_ps_surface_create|cairo_ps_surface_dsc_begin_page_setup|cairo_ps_surface_dsc_begin_setup|cairo_ps_surface_dsc_comment|cairo_ps_surface_get_eps|cairo_ps_surface_restrict_to_level|cairo_ps_surface_set_eps|cairo_ps_surface_set_size|cairo_scaled_font_create|cairo_scaled_font_extents|cairo_scaled_font_get_ctm|cairo_scaled_font_get_font_face|cairo_scaled_font_get_font_matrix|cairo_scaled_font_get_font_options|cairo_scaled_font_get_scale_matrix|cairo_scaled_font_get_type|cairo_scaled_font_glyph_extents|cairo_scaled_font_status|cairo_scaled_font_text_extents|cairo_surface_copy_page|cairo_surface_create_similar|cairo_surface_finish|cairo_surface_flush|cairo_surface_get_content|cairo_surface_get_device_offset|cairo_surface_get_font_options|cairo_surface_get_type|cairo_surface_mark_dirty|cairo_surface_mark_dirty_rectangle|cairo_surface_set_device_offset|cairo_surface_set_fallback_resolution|cairo_surface_show_page|cairo_surface_status|cairo_surface_write_to_png|cairo_svg_surface_create|cairo_svg_surface_restrict_to_version|cairo_svg_version_to_string|cairoantialias|cairocontent|cairocontext|cairoexception|cairoextend|cairofillrule|cairofilter|cairofontface|cairofontoptions|cairofontslant|cairofonttype|cairofontweight|cairoformat|cairogradientpattern|cairohintmetrics|cairohintstyle|cairoimagesurface|cairolineargradient|cairolinecap|cairolinejoin|cairomatrix|cairooperator|cairopath|cairopattern|cairopatterntype|cairopdfsurface|cairopslevel|cairopssurface|cairoradialgradient|cairoscaledfont|cairosolidpattern|cairostatus|cairosubpixelorder|cairosurface|cairosurfacepattern|cairosurfacetype|cairosvgsurface|cairosvgversion|cairotoyfontface|cal_days_in_month|cal_from_jd|cal_info|cal_to_jd|calcul_hmac|calculhmac|call_user_func|call_user_func_array|call_user_method|call_user_method_array|callbackfilteriterator|ceil|chdb|chdb_create|chdir|checkdate|checkdnsrr|chgrp|chmod|chop|chown|chr|chroot|chunk_split|class_alias|class_exists|class_implements|class_parents|classkit_import|classkit_method_add|classkit_method_copy|classkit_method_redefine|classkit_method_remove|classkit_method_rename|clearstatcache|clone|closedir|closelog|collator|com|com_addref|com_create_guid|com_event_sink|com_get|com_get_active_object|com_invoke|com_isenum|com_load|com_load_typelib|com_message_pump|com_print_typeinfo|com_propget|com_propput|com_propset|com_release|com_set|compact|connection_aborted|connection_status|connection_timeout|constant|construct|construct|construct|convert_cyr_string|convert_uudecode|convert_uuencode|copy|cos|cosh|count|count_chars|countable|counter_bump|counter_bump_value|counter_create|counter_get|counter_get_meta|counter_get_named|counter_get_value|counter_reset|counter_reset_value|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|cubrid_affected_rows|cubrid_bind|cubrid_client_encoding|cubrid_close|cubrid_close_prepare|cubrid_close_request|cubrid_col_get|cubrid_col_size|cubrid_column_names|cubrid_column_types|cubrid_commit|cubrid_connect|cubrid_connect_with_url|cubrid_current_oid|cubrid_data_seek|cubrid_db_name|cubrid_disconnect|cubrid_drop|cubrid_errno|cubrid_error|cubrid_error_code|cubrid_error_code_facility|cubrid_error_msg|cubrid_execute|cubrid_fetch|cubrid_fetch_array|cubrid_fetch_assoc|cubrid_fetch_field|cubrid_fetch_lengths|cubrid_fetch_object|cubrid_fetch_row|cubrid_field_flags|cubrid_field_len|cubrid_field_name|cubrid_field_seek|cubrid_field_table|cubrid_field_type|cubrid_free_result|cubrid_get|cubrid_get_autocommit|cubrid_get_charset|cubrid_get_class_name|cubrid_get_client_info|cubrid_get_db_parameter|cubrid_get_server_info|cubrid_insert_id|cubrid_is_instance|cubrid_list_dbs|cubrid_load_from_glo|cubrid_lob_close|cubrid_lob_export|cubrid_lob_get|cubrid_lob_send|cubrid_lob_size|cubrid_lock_read|cubrid_lock_write|cubrid_move_cursor|cubrid_new_glo|cubrid_next_result|cubrid_num_cols|cubrid_num_fields|cubrid_num_rows|cubrid_ping|cubrid_prepare|cubrid_put|cubrid_query|cubrid_real_escape_string|cubrid_result|cubrid_rollback|cubrid_save_to_glo|cubrid_schema|cubrid_send_glo|cubrid_seq_drop|cubrid_seq_insert|cubrid_seq_put|cubrid_set_add|cubrid_set_autocommit|cubrid_set_db_parameter|cubrid_set_drop|cubrid_unbuffered_query|cubrid_version|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|cyrus_authenticate|cyrus_bind|cyrus_close|cyrus_connect|cyrus_query|cyrus_unbind|date|date_add|date_create|date_create_from_format|date_date_set|date_default_timezone_get|date_default_timezone_set|date_diff|date_format|date_get_last_errors|date_interval_create_from_date_string|date_interval_format|date_isodate_set|date_modify|date_offset_get|date_parse|date_parse_from_format|date_sub|date_sun_info|date_sunrise|date_sunset|date_time_set|date_timestamp_get|date_timestamp_set|date_timezone_get|date_timezone_set|dateinterval|dateperiod|datetime|datetimezone|db2_autocommit|db2_bind_param|db2_client_info|db2_close|db2_column_privileges|db2_columns|db2_commit|db2_conn_error|db2_conn_errormsg|db2_connect|db2_cursor_type|db2_escape_string|db2_exec|db2_execute|db2_fetch_array|db2_fetch_assoc|db2_fetch_both|db2_fetch_object|db2_fetch_row|db2_field_display_size|db2_field_name|db2_field_num|db2_field_precision|db2_field_scale|db2_field_type|db2_field_width|db2_foreign_keys|db2_free_result|db2_free_stmt|db2_get_option|db2_last_insert_id|db2_lob_read|db2_next_result|db2_num_fields|db2_num_rows|db2_pclose|db2_pconnect|db2_prepare|db2_primary_keys|db2_procedure_columns|db2_procedures|db2_result|db2_rollback|db2_server_info|db2_set_option|db2_special_columns|db2_statistics|db2_stmt_error|db2_stmt_errormsg|db2_table_privileges|db2_tables|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|dbplus_add|dbplus_aql|dbplus_chdir|dbplus_close|dbplus_curr|dbplus_errcode|dbplus_errno|dbplus_find|dbplus_first|dbplus_flush|dbplus_freealllocks|dbplus_freelock|dbplus_freerlocks|dbplus_getlock|dbplus_getunique|dbplus_info|dbplus_last|dbplus_lockrel|dbplus_next|dbplus_open|dbplus_prev|dbplus_rchperm|dbplus_rcreate|dbplus_rcrtexact|dbplus_rcrtlike|dbplus_resolve|dbplus_restorepos|dbplus_rkeys|dbplus_ropen|dbplus_rquery|dbplus_rrename|dbplus_rsecindex|dbplus_runlink|dbplus_rzap|dbplus_savepos|dbplus_setindex|dbplus_setindexbynumber|dbplus_sql|dbplus_tcl|dbplus_tremove|dbplus_undo|dbplus_undoprepare|dbplus_unlockrel|dbplus_unselect|dbplus_update|dbplus_xlockrel|dbplus_xunlockrel|dbx_close|dbx_compare|dbx_connect|dbx_error|dbx_escape_string|dbx_fetch_row|dbx_query|dbx_sort|dcgettext|dcngettext|deaggregate|debug_backtrace|debug_print_backtrace|debug_zval_dump|decbin|dechex|decoct|define|define_syslog_variables|defined|deg2rad|delete|dgettext|die|dio_close|dio_fcntl|dio_open|dio_read|dio_seek|dio_stat|dio_tcsetattr|dio_truncate|dio_write|dir|directoryiterator|dirname|disk_free_space|disk_total_space|diskfreespace|dl|dngettext|dns_check_record|dns_get_mx|dns_get_record|dom_import_simplexml|domainexception|domattr|domattribute_name|domattribute_set_value|domattribute_specified|domattribute_value|domcharacterdata|domcomment|domdocument|domdocument_add_root|domdocument_create_attribute|domdocument_create_cdata_section|domdocument_create_comment|domdocument_create_element|domdocument_create_element_ns|domdocument_create_entity_reference|domdocument_create_processing_instruction|domdocument_create_text_node|domdocument_doctype|domdocument_document_element|domdocument_dump_file|domdocument_dump_mem|domdocument_get_element_by_id|domdocument_get_elements_by_tagname|domdocument_html_dump_mem|domdocument_xinclude|domdocumentfragment|domdocumenttype|domdocumenttype_entities|domdocumenttype_internal_subset|domdocumenttype_name|domdocumenttype_notations|domdocumenttype_public_id|domdocumenttype_system_id|domelement|domelement_get_attribute|domelement_get_attribute_node|domelement_get_elements_by_tagname|domelement_has_attribute|domelement_remove_attribute|domelement_set_attribute|domelement_set_attribute_node|domelement_tagname|domentity|domentityreference|domexception|domimplementation|domnamednodemap|domnode|domnode_add_namespace|domnode_append_child|domnode_append_sibling|domnode_attributes|domnode_child_nodes|domnode_clone_node|domnode_dump_node|domnode_first_child|domnode_get_content|domnode_has_attributes|domnode_has_child_nodes|domnode_insert_before|domnode_is_blank_node|domnode_last_child|domnode_next_sibling|domnode_node_name|domnode_node_type|domnode_node_value|domnode_owner_document|domnode_parent_node|domnode_prefix|domnode_previous_sibling|domnode_remove_child|domnode_replace_child|domnode_replace_node|domnode_set_content|domnode_set_name|domnode_set_namespace|domnode_unlink_node|domnodelist|domnotation|domprocessinginstruction|domprocessinginstruction_data|domprocessinginstruction_target|domtext|domxml_new_doc|domxml_open_file|domxml_open_mem|domxml_version|domxml_xmltree|domxml_xslt_stylesheet|domxml_xslt_stylesheet_doc|domxml_xslt_stylesheet_file|domxml_xslt_version|domxpath|domxsltstylesheet_process|domxsltstylesheet_result_dump_file|domxsltstylesheet_result_dump_mem|dotnet|dotnet_load|doubleval|each|easter_date|easter_days|echo|empty|emptyiterator|enchant_broker_describe|enchant_broker_dict_exists|enchant_broker_free|enchant_broker_free_dict|enchant_broker_get_error|enchant_broker_init|enchant_broker_list_dicts|enchant_broker_request_dict|enchant_broker_request_pwl_dict|enchant_broker_set_ordering|enchant_dict_add_to_personal|enchant_dict_add_to_session|enchant_dict_check|enchant_dict_describe|enchant_dict_get_error|enchant_dict_is_in_session|enchant_dict_quick_check|enchant_dict_store_replacement|enchant_dict_suggest|end|ereg|ereg_replace|eregi|eregi_replace|error_get_last|error_log|error_reporting|errorexception|escapeshellarg|escapeshellcmd|eval|event_add|event_base_free|event_base_loop|event_base_loopbreak|event_base_loopexit|event_base_new|event_base_priority_init|event_base_set|event_buffer_base_set|event_buffer_disable|event_buffer_enable|event_buffer_fd_set|event_buffer_free|event_buffer_new|event_buffer_priority_set|event_buffer_read|event_buffer_set_callback|event_buffer_timeout_set|event_buffer_watermark_set|event_buffer_write|event_del|event_free|event_new|event_set|exception|exec|exif_imagetype|exif_read_data|exif_tagname|exif_thumbnail|exit|exp|expect_expectl|expect_popen|explode|expm1|export|export|extension_loaded|extract|ezmlm_hash|fam_cancel_monitor|fam_close|fam_monitor_collection|fam_monitor_directory|fam_monitor_file|fam_next_event|fam_open|fam_pending|fam_resume_monitor|fam_suspend_monitor|fbsql_affected_rows|fbsql_autocommit|fbsql_blob_size|fbsql_change_user|fbsql_clob_size|fbsql_close|fbsql_commit|fbsql_connect|fbsql_create_blob|fbsql_create_clob|fbsql_create_db|fbsql_data_seek|fbsql_database|fbsql_database_password|fbsql_db_query|fbsql_db_status|fbsql_drop_db|fbsql_errno|fbsql_error|fbsql_fetch_array|fbsql_fetch_assoc|fbsql_fetch_field|fbsql_fetch_lengths|fbsql_fetch_object|fbsql_fetch_row|fbsql_field_flags|fbsql_field_len|fbsql_field_name|fbsql_field_seek|fbsql_field_table|fbsql_field_type|fbsql_free_result|fbsql_get_autostart_info|fbsql_hostname|fbsql_insert_id|fbsql_list_dbs|fbsql_list_fields|fbsql_list_tables|fbsql_next_result|fbsql_num_fields|fbsql_num_rows|fbsql_password|fbsql_pconnect|fbsql_query|fbsql_read_blob|fbsql_read_clob|fbsql_result|fbsql_rollback|fbsql_rows_fetched|fbsql_select_db|fbsql_set_characterset|fbsql_set_lob_mode|fbsql_set_password|fbsql_set_transaction|fbsql_start_db|fbsql_stop_db|fbsql_table_name|fbsql_tablename|fbsql_username|fbsql_warnings|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|filesystemiterator|filetype|filter_has_var|filter_id|filter_input|filter_input_array|filter_list|filter_var|filter_var_array|filteriterator|finfo_buffer|finfo_close|finfo_file|finfo_open|finfo_set_flags|floatval|flock|floor|flush|fmod|fnmatch|fopen|forward_static_call|forward_static_call_array|fpassthru|fprintf|fputcsv|fputs|fread|frenchtojd|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|func_get_arg|func_get_args|func_num_args|function_exists|fwrite|gc_collect_cycles|gc_disable|gc_enable|gc_enabled|gd_info|gearmanclient|gearmanjob|gearmantask|gearmanworker|geoip_continent_code_by_name|geoip_country_code3_by_name|geoip_country_code_by_name|geoip_country_name_by_name|geoip_database_info|geoip_db_avail|geoip_db_filename|geoip_db_get_all_info|geoip_id_by_name|geoip_isp_by_name|geoip_org_by_name|geoip_record_by_name|geoip_region_by_name|geoip_region_name_by_code|geoip_time_zone_by_country_and_region|getMeta|getNamed|getValue|get_browser|get_called_class|get_cfg_var|get_class|get_class_methods|get_class_vars|get_current_user|get_declared_classes|get_declared_interfaces|get_defined_constants|get_defined_functions|get_defined_vars|get_extension_funcs|get_headers|get_html_translation_table|get_include_path|get_included_files|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|getallheaders|getconstant|getconstants|getconstructor|getcwd|getdate|getdefaultproperties|getdoccomment|getendline|getenv|getextension|getextensionname|getfilename|gethostbyaddr|gethostbyname|gethostbynamel|gethostname|getimagesize|getinterfacenames|getinterfaces|getlastmod|getmethod|getmethods|getmodifiers|getmxrr|getmygid|getmyinode|getmypid|getmyuid|getname|getnamespacename|getopt|getparentclass|getproperties|getproperty|getprotobyname|getprotobynumber|getrandmax|getrusage|getservbyname|getservbyport|getshortname|getstartline|getstaticproperties|getstaticpropertyvalue|gettext|gettimeofday|gettype|glob|globiterator|gmagick|gmagickdraw|gmagickpixel|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_testbit|gmp_xor|gmstrftime|gnupg_adddecryptkey|gnupg_addencryptkey|gnupg_addsignkey|gnupg_cleardecryptkeys|gnupg_clearencryptkeys|gnupg_clearsignkeys|gnupg_decrypt|gnupg_decryptverify|gnupg_encrypt|gnupg_encryptsign|gnupg_export|gnupg_geterror|gnupg_getprotocol|gnupg_import|gnupg_init|gnupg_keyinfo|gnupg_setarmor|gnupg_seterrormode|gnupg_setsignmode|gnupg_sign|gnupg_verify|gopher_parsedir|grapheme_extract|grapheme_stripos|grapheme_stristr|grapheme_strlen|grapheme_strpos|grapheme_strripos|grapheme_strrpos|grapheme_strstr|grapheme_substr|gregoriantojd|gupnp_context_get_host_ip|gupnp_context_get_port|gupnp_context_get_subscription_timeout|gupnp_context_host_path|gupnp_context_new|gupnp_context_set_subscription_timeout|gupnp_context_timeout_add|gupnp_context_unhost_path|gupnp_control_point_browse_start|gupnp_control_point_browse_stop|gupnp_control_point_callback_set|gupnp_control_point_new|gupnp_device_action_callback_set|gupnp_device_info_get|gupnp_device_info_get_service|gupnp_root_device_get_available|gupnp_root_device_get_relative_location|gupnp_root_device_new|gupnp_root_device_set_available|gupnp_root_device_start|gupnp_root_device_stop|gupnp_service_action_get|gupnp_service_action_return|gupnp_service_action_return_error|gupnp_service_action_set|gupnp_service_freeze_notify|gupnp_service_info_get|gupnp_service_info_get_introspection|gupnp_service_introspection_get_state_variable|gupnp_service_notify|gupnp_service_proxy_action_get|gupnp_service_proxy_action_set|gupnp_service_proxy_add_notify|gupnp_service_proxy_callback_set|gupnp_service_proxy_get_subscribed|gupnp_service_proxy_remove_notify|gupnp_service_proxy_set_subscribed|gupnp_service_thaw_notify|gzclose|gzcompress|gzdecode|gzdeflate|gzencode|gzeof|gzfile|gzgetc|gzgets|gzgetss|gzinflate|gzopen|gzpassthru|gzputs|gzread|gzrewind|gzseek|gztell|gzuncompress|gzwrite|halt_compiler|haruannotation|haruannotation_setborderstyle|haruannotation_sethighlightmode|haruannotation_seticon|haruannotation_setopened|harudestination|harudestination_setfit|harudestination_setfitb|harudestination_setfitbh|harudestination_setfitbv|harudestination_setfith|harudestination_setfitr|harudestination_setfitv|harudestination_setxyz|harudoc|harudoc_addpage|harudoc_addpagelabel|harudoc_construct|harudoc_createoutline|harudoc_getcurrentencoder|harudoc_getcurrentpage|harudoc_getencoder|harudoc_getfont|harudoc_getinfoattr|harudoc_getpagelayout|harudoc_getpagemode|harudoc_getstreamsize|harudoc_insertpage|harudoc_loadjpeg|harudoc_loadpng|harudoc_loadraw|harudoc_loadttc|harudoc_loadttf|harudoc_loadtype1|harudoc_output|harudoc_readfromstream|harudoc_reseterror|harudoc_resetstream|harudoc_save|harudoc_savetostream|harudoc_setcompressionmode|harudoc_setcurrentencoder|harudoc_setencryptionmode|harudoc_setinfoattr|harudoc_setinfodateattr|harudoc_setopenaction|harudoc_setpagelayout|harudoc_setpagemode|harudoc_setpagesconfiguration|harudoc_setpassword|harudoc_setpermission|harudoc_usecnsencodings|harudoc_usecnsfonts|harudoc_usecntencodings|harudoc_usecntfonts|harudoc_usejpencodings|harudoc_usejpfonts|harudoc_usekrencodings|harudoc_usekrfonts|haruencoder|haruencoder_getbytetype|haruencoder_gettype|haruencoder_getunicode|haruencoder_getwritingmode|haruexception|harufont|harufont_getascent|harufont_getcapheight|harufont_getdescent|harufont_getencodingname|harufont_getfontname|harufont_gettextwidth|harufont_getunicodewidth|harufont_getxheight|harufont_measuretext|haruimage|haruimage_getbitspercomponent|haruimage_getcolorspace|haruimage_getheight|haruimage_getsize|haruimage_getwidth|haruimage_setcolormask|haruimage_setmaskimage|haruoutline|haruoutline_setdestination|haruoutline_setopened|harupage|harupage_arc|harupage_begintext|harupage_circle|harupage_closepath|harupage_concat|harupage_createdestination|harupage_createlinkannotation|harupage_createtextannotation|harupage_createurlannotation|harupage_curveto|harupage_curveto2|harupage_curveto3|harupage_drawimage|harupage_ellipse|harupage_endpath|harupage_endtext|harupage_eofill|harupage_eofillstroke|harupage_fill|harupage_fillstroke|harupage_getcharspace|harupage_getcmykfill|harupage_getcmykstroke|harupage_getcurrentfont|harupage_getcurrentfontsize|harupage_getcurrentpos|harupage_getcurrenttextpos|harupage_getdash|harupage_getfillingcolorspace|harupage_getflatness|harupage_getgmode|harupage_getgrayfill|harupage_getgraystroke|harupage_getheight|harupage_gethorizontalscaling|harupage_getlinecap|harupage_getlinejoin|harupage_getlinewidth|harupage_getmiterlimit|harupage_getrgbfill|harupage_getrgbstroke|harupage_getstrokingcolorspace|harupage_gettextleading|harupage_gettextmatrix|harupage_gettextrenderingmode|harupage_gettextrise|harupage_gettextwidth|harupage_gettransmatrix|harupage_getwidth|harupage_getwordspace|harupage_lineto|harupage_measuretext|harupage_movetextpos|harupage_moveto|harupage_movetonextline|harupage_rectangle|harupage_setcharspace|harupage_setcmykfill|harupage_setcmykstroke|harupage_setdash|harupage_setflatness|harupage_setfontandsize|harupage_setgrayfill|harupage_setgraystroke|harupage_setheight|harupage_sethorizontalscaling|harupage_setlinecap|harupage_setlinejoin|harupage_setlinewidth|harupage_setmiterlimit|harupage_setrgbfill|harupage_setrgbstroke|harupage_setrotate|harupage_setsize|harupage_setslideshow|harupage_settextleading|harupage_settextmatrix|harupage_settextrenderingmode|harupage_settextrise|harupage_setwidth|harupage_setwordspace|harupage_showtext|harupage_showtextnextline|harupage_stroke|harupage_textout|harupage_textrect|hasconstant|hash|hash_algos|hash_copy|hash_file|hash_final|hash_hmac|hash_hmac_file|hash_init|hash_update|hash_update_file|hash_update_stream|hasmethod|hasproperty|header|header_register_callback|header_remove|headers_list|headers_sent|hebrev|hebrevc|hex2bin|hexdec|highlight_file|highlight_string|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_response_code|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|httpdeflatestream|httpdeflatestream_construct|httpdeflatestream_factory|httpdeflatestream_finish|httpdeflatestream_flush|httpdeflatestream_update|httpinflatestream|httpinflatestream_construct|httpinflatestream_factory|httpinflatestream_finish|httpinflatestream_flush|httpinflatestream_update|httpmessage|httpmessage_addheaders|httpmessage_construct|httpmessage_detach|httpmessage_factory|httpmessage_fromenv|httpmessage_fromstring|httpmessage_getbody|httpmessage_getheader|httpmessage_getheaders|httpmessage_gethttpversion|httpmessage_getparentmessage|httpmessage_getrequestmethod|httpmessage_getrequesturl|httpmessage_getresponsecode|httpmessage_getresponsestatus|httpmessage_gettype|httpmessage_guesscontenttype|httpmessage_prepend|httpmessage_reverse|httpmessage_send|httpmessage_setbody|httpmessage_setheaders|httpmessage_sethttpversion|httpmessage_setrequestmethod|httpmessage_setrequesturl|httpmessage_setresponsecode|httpmessage_setresponsestatus|httpmessage_settype|httpmessage_tomessagetypeobject|httpmessage_tostring|httpquerystring|httpquerystring_construct|httpquerystring_get|httpquerystring_mod|httpquerystring_set|httpquerystring_singleton|httpquerystring_toarray|httpquerystring_tostring|httpquerystring_xlate|httprequest|httprequest_addcookies|httprequest_addheaders|httprequest_addpostfields|httprequest_addpostfile|httprequest_addputdata|httprequest_addquerydata|httprequest_addrawpostdata|httprequest_addssloptions|httprequest_clearhistory|httprequest_construct|httprequest_enablecookies|httprequest_getcontenttype|httprequest_getcookies|httprequest_getheaders|httprequest_gethistory|httprequest_getmethod|httprequest_getoptions|httprequest_getpostfields|httprequest_getpostfiles|httprequest_getputdata|httprequest_getputfile|httprequest_getquerydata|httprequest_getrawpostdata|httprequest_getrawrequestmessage|httprequest_getrawresponsemessage|httprequest_getrequestmessage|httprequest_getresponsebody|httprequest_getresponsecode|httprequest_getresponsecookies|httprequest_getresponsedata|httprequest_getresponseheader|httprequest_getresponseinfo|httprequest_getresponsemessage|httprequest_getresponsestatus|httprequest_getssloptions|httprequest_geturl|httprequest_resetcookies|httprequest_send|httprequest_setcontenttype|httprequest_setcookies|httprequest_setheaders|httprequest_setmethod|httprequest_setoptions|httprequest_setpostfields|httprequest_setpostfiles|httprequest_setputdata|httprequest_setputfile|httprequest_setquerydata|httprequest_setrawpostdata|httprequest_setssloptions|httprequest_seturl|httprequestpool|httprequestpool_attach|httprequestpool_construct|httprequestpool_destruct|httprequestpool_detach|httprequestpool_getattachedrequests|httprequestpool_getfinishedrequests|httprequestpool_reset|httprequestpool_send|httprequestpool_socketperform|httprequestpool_socketselect|httpresponse|httpresponse_capture|httpresponse_getbuffersize|httpresponse_getcache|httpresponse_getcachecontrol|httpresponse_getcontentdisposition|httpresponse_getcontenttype|httpresponse_getdata|httpresponse_getetag|httpresponse_getfile|httpresponse_getgzip|httpresponse_getheader|httpresponse_getlastmodified|httpresponse_getrequestbody|httpresponse_getrequestbodystream|httpresponse_getrequestheaders|httpresponse_getstream|httpresponse_getthrottledelay|httpresponse_guesscontenttype|httpresponse_redirect|httpresponse_send|httpresponse_setbuffersize|httpresponse_setcache|httpresponse_setcachecontrol|httpresponse_setcontentdisposition|httpresponse_setcontenttype|httpresponse_setdata|httpresponse_setetag|httpresponse_setfile|httpresponse_setgzip|httpresponse_setheader|httpresponse_setlastmodified|httpresponse_setstream|httpresponse_setthrottledelay|httpresponse_status|hw_array2objrec|hw_changeobject|hw_children|hw_childrenobj|hw_close|hw_connect|hw_connection_info|hw_cp|hw_deleteobject|hw_docbyanchor|hw_docbyanchorobj|hw_document_attributes|hw_document_bodytag|hw_document_content|hw_document_setcontent|hw_document_size|hw_dummy|hw_edittext|hw_error|hw_errormsg|hw_free_document|hw_getanchors|hw_getanchorsobj|hw_getandlock|hw_getchildcoll|hw_getchildcollobj|hw_getchilddoccoll|hw_getchilddoccollobj|hw_getobject|hw_getobjectbyquery|hw_getobjectbyquerycoll|hw_getobjectbyquerycollobj|hw_getobjectbyqueryobj|hw_getparents|hw_getparentsobj|hw_getrellink|hw_getremote|hw_getremotechildren|hw_getsrcbydestobj|hw_gettext|hw_getusername|hw_identify|hw_incollections|hw_info|hw_inscoll|hw_insdoc|hw_insertanchors|hw_insertdocument|hw_insertobject|hw_mapid|hw_modifyobject|hw_mv|hw_new_document|hw_objrec2array|hw_output_document|hw_pconnect|hw_pipedocument|hw_root|hw_setlinkroot|hw_stat|hw_unlock|hw_who|hwapi_attribute|hwapi_attribute_key|hwapi_attribute_langdepvalue|hwapi_attribute_value|hwapi_attribute_values|hwapi_checkin|hwapi_checkout|hwapi_children|hwapi_content|hwapi_content_mimetype|hwapi_content_read|hwapi_copy|hwapi_dbstat|hwapi_dcstat|hwapi_dstanchors|hwapi_dstofsrcanchor|hwapi_error_count|hwapi_error_reason|hwapi_find|hwapi_ftstat|hwapi_hgcsp|hwapi_hwstat|hwapi_identify|hwapi_info|hwapi_insert|hwapi_insertanchor|hwapi_insertcollection|hwapi_insertdocument|hwapi_link|hwapi_lock|hwapi_move|hwapi_new_content|hwapi_object|hwapi_object_assign|hwapi_object_attreditable|hwapi_object_count|hwapi_object_insert|hwapi_object_new|hwapi_object_remove|hwapi_object_title|hwapi_object_value|hwapi_objectbyanchor|hwapi_parents|hwapi_reason_description|hwapi_reason_type|hwapi_remove|hwapi_replace|hwapi_setcommittedversion|hwapi_srcanchors|hwapi_srcsofdst|hwapi_unlock|hwapi_user|hwapi_userlist|hypot|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_timefmt|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|id3v2attachedpictureframe|id3v2frame|id3v2tag|idate|idn_to_ascii|idn_to_unicode|idn_to_utf8|ifx_affected_rows|ifx_blobinfile_mode|ifx_byteasvarchar|ifx_close|ifx_connect|ifx_copy_blob|ifx_create_blob|ifx_create_char|ifx_do|ifx_error|ifx_errormsg|ifx_fetch_row|ifx_fieldproperties|ifx_fieldtypes|ifx_free_blob|ifx_free_char|ifx_free_result|ifx_get_blob|ifx_get_char|ifx_getsqlca|ifx_htmltbl_result|ifx_nullformat|ifx_num_fields|ifx_num_rows|ifx_pconnect|ifx_prepare|ifx_query|ifx_textasvarchar|ifx_update_blob|ifx_update_char|ifxus_close_slob|ifxus_create_slob|ifxus_free_slob|ifxus_open_slob|ifxus_read_slob|ifxus_seek_slob|ifxus_tell_slob|ifxus_write_slob|ignore_user_abort|iis_add_server|iis_get_dir_security|iis_get_script_map|iis_get_server_by_comment|iis_get_server_by_path|iis_get_server_rights|iis_get_service_state|iis_remove_server|iis_set_app_settings|iis_set_dir_security|iis_set_script_map|iis_set_server_rights|iis_start_server|iis_start_service|iis_stop_server|iis_stop_service|image2wbmp|image_type_to_extension|image_type_to_mime_type|imagealphablending|imageantialias|imagearc|imagechar|imagecharup|imagecolorallocate|imagecolorallocatealpha|imagecolorat|imagecolorclosest|imagecolorclosestalpha|imagecolorclosesthwb|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|imagecreatefromxpm|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|imagick|imagick_adaptiveblurimage|imagick_adaptiveresizeimage|imagick_adaptivesharpenimage|imagick_adaptivethresholdimage|imagick_addimage|imagick_addnoiseimage|imagick_affinetransformimage|imagick_animateimages|imagick_annotateimage|imagick_appendimages|imagick_averageimages|imagick_blackthresholdimage|imagick_blurimage|imagick_borderimage|imagick_charcoalimage|imagick_chopimage|imagick_clear|imagick_clipimage|imagick_clippathimage|imagick_clone|imagick_clutimage|imagick_coalesceimages|imagick_colorfloodfillimage|imagick_colorizeimage|imagick_combineimages|imagick_commentimage|imagick_compareimagechannels|imagick_compareimagelayers|imagick_compareimages|imagick_compositeimage|imagick_construct|imagick_contrastimage|imagick_contraststretchimage|imagick_convolveimage|imagick_cropimage|imagick_cropthumbnailimage|imagick_current|imagick_cyclecolormapimage|imagick_decipherimage|imagick_deconstructimages|imagick_deleteimageartifact|imagick_despeckleimage|imagick_destroy|imagick_displayimage|imagick_displayimages|imagick_distortimage|imagick_drawimage|imagick_edgeimage|imagick_embossimage|imagick_encipherimage|imagick_enhanceimage|imagick_equalizeimage|imagick_evaluateimage|imagick_extentimage|imagick_flattenimages|imagick_flipimage|imagick_floodfillpaintimage|imagick_flopimage|imagick_frameimage|imagick_fximage|imagick_gammaimage|imagick_gaussianblurimage|imagick_getcolorspace|imagick_getcompression|imagick_getcompressionquality|imagick_getcopyright|imagick_getfilename|imagick_getfont|imagick_getformat|imagick_getgravity|imagick_gethomeurl|imagick_getimage|imagick_getimagealphachannel|imagick_getimageartifact|imagick_getimagebackgroundcolor|imagick_getimageblob|imagick_getimageblueprimary|imagick_getimagebordercolor|imagick_getimagechanneldepth|imagick_getimagechanneldistortion|imagick_getimagechanneldistortions|imagick_getimagechannelextrema|imagick_getimagechannelmean|imagick_getimagechannelrange|imagick_getimagechannelstatistics|imagick_getimageclipmask|imagick_getimagecolormapcolor|imagick_getimagecolors|imagick_getimagecolorspace|imagick_getimagecompose|imagick_getimagecompression|imagick_getimagecompressionquality|imagick_getimagedelay|imagick_getimagedepth|imagick_getimagedispose|imagick_getimagedistortion|imagick_getimageextrema|imagick_getimagefilename|imagick_getimageformat|imagick_getimagegamma|imagick_getimagegeometry|imagick_getimagegravity|imagick_getimagegreenprimary|imagick_getimageheight|imagick_getimagehistogram|imagick_getimageindex|imagick_getimageinterlacescheme|imagick_getimageinterpolatemethod|imagick_getimageiterations|imagick_getimagelength|imagick_getimagemagicklicense|imagick_getimagematte|imagick_getimagemattecolor|imagick_getimageorientation|imagick_getimagepage|imagick_getimagepixelcolor|imagick_getimageprofile|imagick_getimageprofiles|imagick_getimageproperties|imagick_getimageproperty|imagick_getimageredprimary|imagick_getimageregion|imagick_getimagerenderingintent|imagick_getimageresolution|imagick_getimagesblob|imagick_getimagescene|imagick_getimagesignature|imagick_getimagesize|imagick_getimagetickspersecond|imagick_getimagetotalinkdensity|imagick_getimagetype|imagick_getimageunits|imagick_getimagevirtualpixelmethod|imagick_getimagewhitepoint|imagick_getimagewidth|imagick_getinterlacescheme|imagick_getiteratorindex|imagick_getnumberimages|imagick_getoption|imagick_getpackagename|imagick_getpage|imagick_getpixeliterator|imagick_getpixelregioniterator|imagick_getpointsize|imagick_getquantumdepth|imagick_getquantumrange|imagick_getreleasedate|imagick_getresource|imagick_getresourcelimit|imagick_getsamplingfactors|imagick_getsize|imagick_getsizeoffset|imagick_getversion|imagick_hasnextimage|imagick_haspreviousimage|imagick_identifyimage|imagick_implodeimage|imagick_labelimage|imagick_levelimage|imagick_linearstretchimage|imagick_liquidrescaleimage|imagick_magnifyimage|imagick_mapimage|imagick_mattefloodfillimage|imagick_medianfilterimage|imagick_mergeimagelayers|imagick_minifyimage|imagick_modulateimage|imagick_montageimage|imagick_morphimages|imagick_mosaicimages|imagick_motionblurimage|imagick_negateimage|imagick_newimage|imagick_newpseudoimage|imagick_nextimage|imagick_normalizeimage|imagick_oilpaintimage|imagick_opaquepaintimage|imagick_optimizeimagelayers|imagick_orderedposterizeimage|imagick_paintfloodfillimage|imagick_paintopaqueimage|imagick_painttransparentimage|imagick_pingimage|imagick_pingimageblob|imagick_pingimagefile|imagick_polaroidimage|imagick_posterizeimage|imagick_previewimages|imagick_previousimage|imagick_profileimage|imagick_quantizeimage|imagick_quantizeimages|imagick_queryfontmetrics|imagick_queryfonts|imagick_queryformats|imagick_radialblurimage|imagick_raiseimage|imagick_randomthresholdimage|imagick_readimage|imagick_readimageblob|imagick_readimagefile|imagick_recolorimage|imagick_reducenoiseimage|imagick_removeimage|imagick_removeimageprofile|imagick_render|imagick_resampleimage|imagick_resetimagepage|imagick_resizeimage|imagick_rollimage|imagick_rotateimage|imagick_roundcorners|imagick_sampleimage|imagick_scaleimage|imagick_separateimagechannel|imagick_sepiatoneimage|imagick_setbackgroundcolor|imagick_setcolorspace|imagick_setcompression|imagick_setcompressionquality|imagick_setfilename|imagick_setfirstiterator|imagick_setfont|imagick_setformat|imagick_setgravity|imagick_setimage|imagick_setimagealphachannel|imagick_setimageartifact|imagick_setimagebackgroundcolor|imagick_setimagebias|imagick_setimageblueprimary|imagick_setimagebordercolor|imagick_setimagechanneldepth|imagick_setimageclipmask|imagick_setimagecolormapcolor|imagick_setimagecolorspace|imagick_setimagecompose|imagick_setimagecompression|imagick_setimagecompressionquality|imagick_setimagedelay|imagick_setimagedepth|imagick_setimagedispose|imagick_setimageextent|imagick_setimagefilename|imagick_setimageformat|imagick_setimagegamma|imagick_setimagegravity|imagick_setimagegreenprimary|imagick_setimageindex|imagick_setimageinterlacescheme|imagick_setimageinterpolatemethod|imagick_setimageiterations|imagick_setimagematte|imagick_setimagemattecolor|imagick_setimageopacity|imagick_setimageorientation|imagick_setimagepage|imagick_setimageprofile|imagick_setimageproperty|imagick_setimageredprimary|imagick_setimagerenderingintent|imagick_setimageresolution|imagick_setimagescene|imagick_setimagetickspersecond|imagick_setimagetype|imagick_setimageunits|imagick_setimagevirtualpixelmethod|imagick_setimagewhitepoint|imagick_setinterlacescheme|imagick_setiteratorindex|imagick_setlastiterator|imagick_setoption|imagick_setpage|imagick_setpointsize|imagick_setresolution|imagick_setresourcelimit|imagick_setsamplingfactors|imagick_setsize|imagick_setsizeoffset|imagick_settype|imagick_shadeimage|imagick_shadowimage|imagick_sharpenimage|imagick_shaveimage|imagick_shearimage|imagick_sigmoidalcontrastimage|imagick_sketchimage|imagick_solarizeimage|imagick_spliceimage|imagick_spreadimage|imagick_steganoimage|imagick_stereoimage|imagick_stripimage|imagick_swirlimage|imagick_textureimage|imagick_thresholdimage|imagick_thumbnailimage|imagick_tintimage|imagick_transformimage|imagick_transparentpaintimage|imagick_transposeimage|imagick_transverseimage|imagick_trimimage|imagick_uniqueimagecolors|imagick_unsharpmaskimage|imagick_valid|imagick_vignetteimage|imagick_waveimage|imagick_whitethresholdimage|imagick_writeimage|imagick_writeimagefile|imagick_writeimages|imagick_writeimagesfile|imagickdraw|imagickdraw_affine|imagickdraw_annotation|imagickdraw_arc|imagickdraw_bezier|imagickdraw_circle|imagickdraw_clear|imagickdraw_clone|imagickdraw_color|imagickdraw_comment|imagickdraw_composite|imagickdraw_construct|imagickdraw_destroy|imagickdraw_ellipse|imagickdraw_getclippath|imagickdraw_getcliprule|imagickdraw_getclipunits|imagickdraw_getfillcolor|imagickdraw_getfillopacity|imagickdraw_getfillrule|imagickdraw_getfont|imagickdraw_getfontfamily|imagickdraw_getfontsize|imagickdraw_getfontstyle|imagickdraw_getfontweight|imagickdraw_getgravity|imagickdraw_getstrokeantialias|imagickdraw_getstrokecolor|imagickdraw_getstrokedasharray|imagickdraw_getstrokedashoffset|imagickdraw_getstrokelinecap|imagickdraw_getstrokelinejoin|imagickdraw_getstrokemiterlimit|imagickdraw_getstrokeopacity|imagickdraw_getstrokewidth|imagickdraw_gettextalignment|imagickdraw_gettextantialias|imagickdraw_gettextdecoration|imagickdraw_gettextencoding|imagickdraw_gettextundercolor|imagickdraw_getvectorgraphics|imagickdraw_line|imagickdraw_matte|imagickdraw_pathclose|imagickdraw_pathcurvetoabsolute|imagickdraw_pathcurvetoquadraticbezierabsolute|imagickdraw_pathcurvetoquadraticbezierrelative|imagickdraw_pathcurvetoquadraticbeziersmoothabsolute|imagickdraw_pathcurvetoquadraticbeziersmoothrelative|imagickdraw_pathcurvetorelative|imagickdraw_pathcurvetosmoothabsolute|imagickdraw_pathcurvetosmoothrelative|imagickdraw_pathellipticarcabsolute|imagickdraw_pathellipticarcrelative|imagickdraw_pathfinish|imagickdraw_pathlinetoabsolute|imagickdraw_pathlinetohorizontalabsolute|imagickdraw_pathlinetohorizontalrelative|imagickdraw_pathlinetorelative|imagickdraw_pathlinetoverticalabsolute|imagickdraw_pathlinetoverticalrelative|imagickdraw_pathmovetoabsolute|imagickdraw_pathmovetorelative|imagickdraw_pathstart|imagickdraw_point|imagickdraw_polygon|imagickdraw_polyline|imagickdraw_pop|imagickdraw_popclippath|imagickdraw_popdefs|imagickdraw_poppattern|imagickdraw_push|imagickdraw_pushclippath|imagickdraw_pushdefs|imagickdraw_pushpattern|imagickdraw_rectangle|imagickdraw_render|imagickdraw_rotate|imagickdraw_roundrectangle|imagickdraw_scale|imagickdraw_setclippath|imagickdraw_setcliprule|imagickdraw_setclipunits|imagickdraw_setfillalpha|imagickdraw_setfillcolor|imagickdraw_setfillopacity|imagickdraw_setfillpatternurl|imagickdraw_setfillrule|imagickdraw_setfont|imagickdraw_setfontfamily|imagickdraw_setfontsize|imagickdraw_setfontstretch|imagickdraw_setfontstyle|imagickdraw_setfontweight|imagickdraw_setgravity|imagickdraw_setstrokealpha|imagickdraw_setstrokeantialias|imagickdraw_setstrokecolor|imagickdraw_setstrokedasharray|imagickdraw_setstrokedashoffset|imagickdraw_setstrokelinecap|imagickdraw_setstrokelinejoin|imagickdraw_setstrokemiterlimit|imagickdraw_setstrokeopacity|imagickdraw_setstrokepatternurl|imagickdraw_setstrokewidth|imagickdraw_settextalignment|imagickdraw_settextantialias|imagickdraw_settextdecoration|imagickdraw_settextencoding|imagickdraw_settextundercolor|imagickdraw_setvectorgraphics|imagickdraw_setviewbox|imagickdraw_skewx|imagickdraw_skewy|imagickdraw_translate|imagickpixel|imagickpixel_clear|imagickpixel_construct|imagickpixel_destroy|imagickpixel_getcolor|imagickpixel_getcolorasstring|imagickpixel_getcolorcount|imagickpixel_getcolorvalue|imagickpixel_gethsl|imagickpixel_issimilar|imagickpixel_setcolor|imagickpixel_setcolorvalue|imagickpixel_sethsl|imagickpixeliterator|imagickpixeliterator_clear|imagickpixeliterator_construct|imagickpixeliterator_destroy|imagickpixeliterator_getcurrentiteratorrow|imagickpixeliterator_getiteratorrow|imagickpixeliterator_getnextiteratorrow|imagickpixeliterator_getpreviousiteratorrow|imagickpixeliterator_newpixeliterator|imagickpixeliterator_newpixelregioniterator|imagickpixeliterator_resetiterator|imagickpixeliterator_setiteratorfirstrow|imagickpixeliterator_setiteratorlastrow|imagickpixeliterator_setiteratorrow|imagickpixeliterator_synciterator|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_fetchmime|imap_fetchstructure|imap_fetchtext|imap_gc|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_listscan|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|implementsinterface|implode|import_request_variables|in_array|include|include_once|inclued_get_data|inet_ntop|inet_pton|infiniteiterator|ingres_autocommit|ingres_autocommit_state|ingres_charset|ingres_close|ingres_commit|ingres_connect|ingres_cursor|ingres_errno|ingres_error|ingres_errsqlstate|ingres_escape_string|ingres_execute|ingres_fetch_array|ingres_fetch_assoc|ingres_fetch_object|ingres_fetch_proc_return|ingres_fetch_row|ingres_field_length|ingres_field_name|ingres_field_nullable|ingres_field_precision|ingres_field_scale|ingres_field_type|ingres_free_result|ingres_next_error|ingres_num_fields|ingres_num_rows|ingres_pconnect|ingres_prepare|ingres_query|ingres_result_seek|ingres_rollback|ingres_set_environment|ingres_unbuffered_query|ini_alter|ini_get|ini_get_all|ini_restore|ini_set|innamespace|inotify_add_watch|inotify_init|inotify_queue_len|inotify_read|inotify_rm_watch|interface_exists|intl_error_name|intl_get_error_code|intl_get_error_message|intl_is_failure|intldateformatter|intval|invalidargumentexception|invoke|invokeargs|ip2long|iptcembed|iptcparse|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|isabstract|iscloneable|isdisabled|isfinal|isinstance|isinstantiable|isinterface|isinternal|isiterateable|isset|issubclassof|isuserdefined|iterator|iterator_apply|iterator_count|iterator_to_array|iteratoraggregate|iteratoriterator|java_last_exception_clear|java_last_exception_get|jddayofweek|jdmonthname|jdtofrench|jdtogregorian|jdtojewish|jdtojulian|jdtounix|jewishtojd|join|jpeg2wbmp|json_decode|json_encode|json_last_error|jsonserializable|judy|judy_type|judy_version|juliantojd|kadm5_chpass_principal|kadm5_create_principal|kadm5_delete_principal|kadm5_destroy|kadm5_flush|kadm5_get_policies|kadm5_get_principal|kadm5_get_principals|kadm5_init_with_password|kadm5_modify_principal|key|krsort|ksort|lcfirst|lcg_value|lchgrp|lchown|ldap_8859_to_t61|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_sasl_bind|ldap_search|ldap_set_option|ldap_set_rebind_proc|ldap_sort|ldap_start_tls|ldap_t61_to_8859|ldap_unbind|lengthexception|levenshtein|libxml_clear_errors|libxml_disable_entity_loader|libxml_get_errors|libxml_get_last_error|libxml_set_streams_context|libxml_use_internal_errors|libxmlerror|limititerator|link|linkinfo|list|locale|localeconv|localtime|log|log10|log1p|logicexception|long2ip|lstat|ltrim|lzf_compress|lzf_decompress|lzf_optimized_for|m_checkstatus|m_completeauthorizations|m_connect|m_connectionerror|m_deletetrans|m_destroyconn|m_destroyengine|m_getcell|m_getcellbynum|m_getcommadelimited|m_getheader|m_initconn|m_initengine|m_iscommadelimited|m_maxconntimeout|m_monitor|m_numcolumns|m_numrows|m_parsecommadelimited|m_responsekeys|m_responseparam|m_returnstatus|m_setblocking|m_setdropfile|m_setip|m_setssl|m_setssl_cafile|m_setssl_files|m_settimeout|m_sslcert_gen_hash|m_transactionssent|m_transinqueue|m_transkeyval|m_transnew|m_transsend|m_uwait|m_validateidentifier|m_verifyconnection|m_verifysslcert|magic_quotes_runtime|mail|mailparse_determine_best_xfer_encoding|mailparse_msg_create|mailparse_msg_extract_part|mailparse_msg_extract_part_file|mailparse_msg_extract_whole_part_file|mailparse_msg_free|mailparse_msg_get_part|mailparse_msg_get_part_data|mailparse_msg_get_structure|mailparse_msg_parse|mailparse_msg_parse_file|mailparse_rfc822_parse_addresses|mailparse_stream_encode|mailparse_uudecode_all|main|max|maxdb_affected_rows|maxdb_autocommit|maxdb_bind_param|maxdb_bind_result|maxdb_change_user|maxdb_character_set_name|maxdb_client_encoding|maxdb_close|maxdb_close_long_data|maxdb_commit|maxdb_connect|maxdb_connect_errno|maxdb_connect_error|maxdb_data_seek|maxdb_debug|maxdb_disable_reads_from_master|maxdb_disable_rpl_parse|maxdb_dump_debug_info|maxdb_embedded_connect|maxdb_enable_reads_from_master|maxdb_enable_rpl_parse|maxdb_errno|maxdb_error|maxdb_escape_string|maxdb_execute|maxdb_fetch|maxdb_fetch_array|maxdb_fetch_assoc|maxdb_fetch_field|maxdb_fetch_field_direct|maxdb_fetch_fields|maxdb_fetch_lengths|maxdb_fetch_object|maxdb_fetch_row|maxdb_field_count|maxdb_field_seek|maxdb_field_tell|maxdb_free_result|maxdb_get_client_info|maxdb_get_client_version|maxdb_get_host_info|maxdb_get_metadata|maxdb_get_proto_info|maxdb_get_server_info|maxdb_get_server_version|maxdb_info|maxdb_init|maxdb_insert_id|maxdb_kill|maxdb_master_query|maxdb_more_results|maxdb_multi_query|maxdb_next_result|maxdb_num_fields|maxdb_num_rows|maxdb_options|maxdb_param_count|maxdb_ping|maxdb_prepare|maxdb_query|maxdb_real_connect|maxdb_real_escape_string|maxdb_real_query|maxdb_report|maxdb_rollback|maxdb_rpl_parse_enabled|maxdb_rpl_probe|maxdb_rpl_query_type|maxdb_select_db|maxdb_send_long_data|maxdb_send_query|maxdb_server_end|maxdb_server_init|maxdb_set_opt|maxdb_sqlstate|maxdb_ssl_set|maxdb_stat|maxdb_stmt_affected_rows|maxdb_stmt_bind_param|maxdb_stmt_bind_result|maxdb_stmt_close|maxdb_stmt_close_long_data|maxdb_stmt_data_seek|maxdb_stmt_errno|maxdb_stmt_error|maxdb_stmt_execute|maxdb_stmt_fetch|maxdb_stmt_free_result|maxdb_stmt_init|maxdb_stmt_num_rows|maxdb_stmt_param_count|maxdb_stmt_prepare|maxdb_stmt_reset|maxdb_stmt_result_metadata|maxdb_stmt_send_long_data|maxdb_stmt_sqlstate|maxdb_stmt_store_result|maxdb_store_result|maxdb_thread_id|maxdb_thread_safe|maxdb_use_result|maxdb_warning_count|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_encoding_aliases|mb_ereg|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_eregi|mb_eregi_replace|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|memcache_debug|memcached|memory_get_peak_usage|memory_get_usage|messageformatter|metaphone|method_exists|mhash|mhash_count|mhash_get_block_size|mhash_get_hash_name|mhash_keygen_s2k|microtime|mime_content_type|min|ming_keypress|ming_setcubicthreshold|ming_setscale|ming_setswfcompression|ming_useconstants|ming_useswfversion|mkdir|mktime|money_format|mongo|mongobindata|mongocode|mongocollection|mongoconnectionexception|mongocursor|mongocursorexception|mongocursortimeoutexception|mongodate|mongodb|mongodbref|mongoexception|mongogridfs|mongogridfscursor|mongogridfsexception|mongogridfsfile|mongoid|mongoint32|mongoint64|mongomaxkey|mongominkey|mongoregex|mongotimestamp|move_uploaded_file|mpegfile|mqseries_back|mqseries_begin|mqseries_close|mqseries_cmit|mqseries_conn|mqseries_connx|mqseries_disc|mqseries_get|mqseries_inq|mqseries_open|mqseries_put|mqseries_put1|mqseries_set|mqseries_strerror|msession_connect|msession_count|msession_create|msession_destroy|msession_disconnect|msession_find|msession_get|msession_get_array|msession_get_data|msession_inc|msession_list|msession_listvar|msession_lock|msession_plugin|msession_randstr|msession_set|msession_set_array|msession_set_data|msession_timeout|msession_uniq|msession_unlock|msg_get_queue|msg_queue_exists|msg_receive|msg_remove_queue|msg_send|msg_set_queue|msg_stat_queue|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_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_list_dbs|msql_list_fields|msql_list_tables|msql_num_fields|msql_num_rows|msql_numfields|msql_numrows|msql_pconnect|msql_query|msql_regcase|msql_result|msql_select_db|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|multipleiterator|mysql_affected_rows|mysql_client_encoding|mysql_close|mysql_connect|mysql_create_db|mysql_data_seek|mysql_db_name|mysql_db_query|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_field_flags|mysql_field_len|mysql_field_name|mysql_field_seek|mysql_field_table|mysql_field_type|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_list_dbs|mysql_list_fields|mysql_list_processes|mysql_list_tables|mysql_num_fields|mysql_num_rows|mysql_pconnect|mysql_ping|mysql_query|mysql_real_escape_string|mysql_result|mysql_select_db|mysql_set_charset|mysql_stat|mysql_tablename|mysql_thread_id|mysql_unbuffered_query|mysqli|mysqli_bind_param|mysqli_bind_result|mysqli_client_encoding|mysqli_connect|mysqli_disable_reads_from_master|mysqli_disable_rpl_parse|mysqli_driver|mysqli_enable_reads_from_master|mysqli_enable_rpl_parse|mysqli_escape_string|mysqli_execute|mysqli_fetch|mysqli_get_metadata|mysqli_master_query|mysqli_param_count|mysqli_report|mysqli_result|mysqli_rpl_parse_enabled|mysqli_rpl_probe|mysqli_rpl_query_type|mysqli_send_long_data|mysqli_send_query|mysqli_set_opt|mysqli_slave_query|mysqli_stmt|mysqli_warning|mysqlnd_ms_get_stats|mysqlnd_ms_query_is_select|mysqlnd_ms_set_user_pick_server|mysqlnd_qc_change_handler|mysqlnd_qc_clear_cache|mysqlnd_qc_get_cache_info|mysqlnd_qc_get_core_stats|mysqlnd_qc_get_handler|mysqlnd_qc_get_query_trace_log|mysqlnd_qc_set_user_handlers|natcasesort|natsort|ncurses_addch|ncurses_addchnstr|ncurses_addchstr|ncurses_addnstr|ncurses_addstr|ncurses_assume_default_colors|ncurses_attroff|ncurses_attron|ncurses_attrset|ncurses_baudrate|ncurses_beep|ncurses_bkgd|ncurses_bkgdset|ncurses_border|ncurses_bottom_panel|ncurses_can_change_color|ncurses_cbreak|ncurses_clear|ncurses_clrtobot|ncurses_clrtoeol|ncurses_color_content|ncurses_color_set|ncurses_curs_set|ncurses_def_prog_mode|ncurses_def_shell_mode|ncurses_define_key|ncurses_del_panel|ncurses_delay_output|ncurses_delch|ncurses_deleteln|ncurses_delwin|ncurses_doupdate|ncurses_echo|ncurses_echochar|ncurses_end|ncurses_erase|ncurses_erasechar|ncurses_filter|ncurses_flash|ncurses_flushinp|ncurses_getch|ncurses_getmaxyx|ncurses_getmouse|ncurses_getyx|ncurses_halfdelay|ncurses_has_colors|ncurses_has_ic|ncurses_has_il|ncurses_has_key|ncurses_hide_panel|ncurses_hline|ncurses_inch|ncurses_init|ncurses_init_color|ncurses_init_pair|ncurses_insch|ncurses_insdelln|ncurses_insertln|ncurses_insstr|ncurses_instr|ncurses_isendwin|ncurses_keyok|ncurses_keypad|ncurses_killchar|ncurses_longname|ncurses_meta|ncurses_mouse_trafo|ncurses_mouseinterval|ncurses_mousemask|ncurses_move|ncurses_move_panel|ncurses_mvaddch|ncurses_mvaddchnstr|ncurses_mvaddchstr|ncurses_mvaddnstr|ncurses_mvaddstr|ncurses_mvcur|ncurses_mvdelch|ncurses_mvgetch|ncurses_mvhline|ncurses_mvinch|ncurses_mvvline|ncurses_mvwaddstr|ncurses_napms|ncurses_new_panel|ncurses_newpad|ncurses_newwin|ncurses_nl|ncurses_nocbreak|ncurses_noecho|ncurses_nonl|ncurses_noqiflush|ncurses_noraw|ncurses_pair_content|ncurses_panel_above|ncurses_panel_below|ncurses_panel_window|ncurses_pnoutrefresh|ncurses_prefresh|ncurses_putp|ncurses_qiflush|ncurses_raw|ncurses_refresh|ncurses_replace_panel|ncurses_reset_prog_mode|ncurses_reset_shell_mode|ncurses_resetty|ncurses_savetty|ncurses_scr_dump|ncurses_scr_init|ncurses_scr_restore|ncurses_scr_set|ncurses_scrl|ncurses_show_panel|ncurses_slk_attr|ncurses_slk_attroff|ncurses_slk_attron|ncurses_slk_attrset|ncurses_slk_clear|ncurses_slk_color|ncurses_slk_init|ncurses_slk_noutrefresh|ncurses_slk_refresh|ncurses_slk_restore|ncurses_slk_set|ncurses_slk_touch|ncurses_standend|ncurses_standout|ncurses_start_color|ncurses_termattrs|ncurses_termname|ncurses_timeout|ncurses_top_panel|ncurses_typeahead|ncurses_ungetch|ncurses_ungetmouse|ncurses_update_panels|ncurses_use_default_colors|ncurses_use_env|ncurses_use_extended_names|ncurses_vidattr|ncurses_vline|ncurses_waddch|ncurses_waddstr|ncurses_wattroff|ncurses_wattron|ncurses_wattrset|ncurses_wborder|ncurses_wclear|ncurses_wcolor_set|ncurses_werase|ncurses_wgetch|ncurses_whline|ncurses_wmouse_trafo|ncurses_wmove|ncurses_wnoutrefresh|ncurses_wrefresh|ncurses_wstandend|ncurses_wstandout|ncurses_wvline|newinstance|newinstanceargs|newt_bell|newt_button|newt_button_bar|newt_centered_window|newt_checkbox|newt_checkbox_get_value|newt_checkbox_set_flags|newt_checkbox_set_value|newt_checkbox_tree|newt_checkbox_tree_add_item|newt_checkbox_tree_find_item|newt_checkbox_tree_get_current|newt_checkbox_tree_get_entry_value|newt_checkbox_tree_get_multi_selection|newt_checkbox_tree_get_selection|newt_checkbox_tree_multi|newt_checkbox_tree_set_current|newt_checkbox_tree_set_entry|newt_checkbox_tree_set_entry_value|newt_checkbox_tree_set_width|newt_clear_key_buffer|newt_cls|newt_compact_button|newt_component_add_callback|newt_component_takes_focus|newt_create_grid|newt_cursor_off|newt_cursor_on|newt_delay|newt_draw_form|newt_draw_root_text|newt_entry|newt_entry_get_value|newt_entry_set|newt_entry_set_filter|newt_entry_set_flags|newt_finished|newt_form|newt_form_add_component|newt_form_add_components|newt_form_add_hot_key|newt_form_destroy|newt_form_get_current|newt_form_run|newt_form_set_background|newt_form_set_height|newt_form_set_size|newt_form_set_timer|newt_form_set_width|newt_form_watch_fd|newt_get_screen_size|newt_grid_add_components_to_form|newt_grid_basic_window|newt_grid_free|newt_grid_get_size|newt_grid_h_close_stacked|newt_grid_h_stacked|newt_grid_place|newt_grid_set_field|newt_grid_simple_window|newt_grid_v_close_stacked|newt_grid_v_stacked|newt_grid_wrapped_window|newt_grid_wrapped_window_at|newt_init|newt_label|newt_label_set_text|newt_listbox|newt_listbox_append_entry|newt_listbox_clear|newt_listbox_clear_selection|newt_listbox_delete_entry|newt_listbox_get_current|newt_listbox_get_selection|newt_listbox_insert_entry|newt_listbox_item_count|newt_listbox_select_item|newt_listbox_set_current|newt_listbox_set_current_by_key|newt_listbox_set_data|newt_listbox_set_entry|newt_listbox_set_width|newt_listitem|newt_listitem_get_data|newt_listitem_set|newt_open_window|newt_pop_help_line|newt_pop_window|newt_push_help_line|newt_radio_get_current|newt_radiobutton|newt_redraw_help_line|newt_reflow_text|newt_refresh|newt_resize_screen|newt_resume|newt_run_form|newt_scale|newt_scale_set|newt_scrollbar_set|newt_set_help_callback|newt_set_suspend_callback|newt_suspend|newt_textbox|newt_textbox_get_num_lines|newt_textbox_reflowed|newt_textbox_set_height|newt_textbox_set_text|newt_vertical_scrollbar|newt_wait_for_key|newt_win_choice|newt_win_entries|newt_win_menu|newt_win_message|newt_win_messagev|newt_win_ternary|next|ngettext|nl2br|nl_langinfo|norewinditerator|normalizer|notes_body|notes_copy_db|notes_create_db|notes_create_note|notes_drop_db|notes_find_note|notes_header_info|notes_list_msgs|notes_mark_read|notes_mark_unread|notes_nav_create|notes_search|notes_unread|notes_version|nsapi_request_headers|nsapi_response_headers|nsapi_virtual|nthmac|number_format|numberformatter|oauth|oauth_get_sbs|oauth_urlencode|oauthexception|oauthprovider|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|oci_bind_array_by_name|oci_bind_by_name|oci_cancel|oci_client_version|oci_close|oci_collection_append|oci_collection_assign|oci_collection_element_assign|oci_collection_element_get|oci_collection_free|oci_collection_max|oci_collection_size|oci_collection_trim|oci_commit|oci_connect|oci_define_by_name|oci_error|oci_execute|oci_fetch|oci_fetch_all|oci_fetch_array|oci_fetch_assoc|oci_fetch_object|oci_fetch_row|oci_field_is_null|oci_field_name|oci_field_precision|oci_field_scale|oci_field_size|oci_field_type|oci_field_type_raw|oci_free_statement|oci_internal_debug|oci_lob_append|oci_lob_close|oci_lob_copy|oci_lob_eof|oci_lob_erase|oci_lob_export|oci_lob_flush|oci_lob_free|oci_lob_getbuffering|oci_lob_import|oci_lob_is_equal|oci_lob_load|oci_lob_read|oci_lob_rewind|oci_lob_save|oci_lob_savefile|oci_lob_seek|oci_lob_setbuffering|oci_lob_size|oci_lob_tell|oci_lob_truncate|oci_lob_write|oci_lob_writetemporary|oci_lob_writetofile|oci_new_collection|oci_new_connect|oci_new_cursor|oci_new_descriptor|oci_num_fields|oci_num_rows|oci_parse|oci_password_change|oci_pconnect|oci_result|oci_rollback|oci_server_version|oci_set_action|oci_set_client_identifier|oci_set_client_info|oci_set_edition|oci_set_module_name|oci_set_prefetch|oci_statement_type|ocibindbyname|ocicancel|ocicloselob|ocicollappend|ocicollassign|ocicollassignelem|ocicollgetelem|ocicollmax|ocicollsize|ocicolltrim|ocicolumnisnull|ocicolumnname|ocicolumnprecision|ocicolumnscale|ocicolumnsize|ocicolumntype|ocicolumntyperaw|ocicommit|ocidefinebyname|ocierror|ociexecute|ocifetch|ocifetchinto|ocifetchstatement|ocifreecollection|ocifreecursor|ocifreedesc|ocifreestatement|ociinternaldebug|ociloadlob|ocilogoff|ocilogon|ocinewcollection|ocinewcursor|ocinewdescriptor|ocinlogon|ocinumcols|ociparse|ociplogon|ociresult|ocirollback|ocirowcount|ocisavelob|ocisavelobfile|ociserverversion|ocisetprefetch|ocistatementtype|ociwritelobtofile|ociwritetemporarylob|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|openal_buffer_create|openal_buffer_data|openal_buffer_destroy|openal_buffer_get|openal_buffer_loadwav|openal_context_create|openal_context_current|openal_context_destroy|openal_context_process|openal_context_suspend|openal_device_close|openal_device_open|openal_listener_get|openal_listener_set|openal_source_create|openal_source_destroy|openal_source_get|openal_source_pause|openal_source_play|openal_source_rewind|openal_source_set|openal_source_stop|openal_stream|opendir|openlog|openssl_cipher_iv_length|openssl_csr_export|openssl_csr_export_to_file|openssl_csr_get_public_key|openssl_csr_get_subject|openssl_csr_new|openssl_csr_sign|openssl_decrypt|openssl_dh_compute_key|openssl_digest|openssl_encrypt|openssl_error_string|openssl_free_key|openssl_get_cipher_methods|openssl_get_md_methods|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_random_pseudo_bytes|openssl_seal|openssl_sign|openssl_verify|openssl_x509_check_private_key|openssl_x509_checkpurpose|openssl_x509_export|openssl_x509_export_to_file|openssl_x509_free|openssl_x509_parse|openssl_x509_read|ord|outeriterator|outofboundsexception|outofrangeexception|output_add_rewrite_var|output_reset_rewrite_vars|overflowexception|overload|override_function|ovrimos_close|ovrimos_commit|ovrimos_connect|ovrimos_cursor|ovrimos_exec|ovrimos_execute|ovrimos_fetch_into|ovrimos_fetch_row|ovrimos_field_len|ovrimos_field_name|ovrimos_field_num|ovrimos_field_type|ovrimos_free_result|ovrimos_longreadlen|ovrimos_num_fields|ovrimos_num_rows|ovrimos_prepare|ovrimos_result|ovrimos_result_all|ovrimos_rollback|pack|parentiterator|parse_ini_file|parse_ini_string|parse_str|parse_url|parsekit_compile_file|parsekit_compile_string|parsekit_func_arginfo|passthru|pathinfo|pclose|pcntl_alarm|pcntl_exec|pcntl_fork|pcntl_getpriority|pcntl_setpriority|pcntl_signal|pcntl_signal_dispatch|pcntl_sigprocmask|pcntl_sigtimedwait|pcntl_sigwaitinfo|pcntl_wait|pcntl_waitpid|pcntl_wexitstatus|pcntl_wifexited|pcntl_wifsignaled|pcntl_wifstopped|pcntl_wstopsig|pcntl_wtermsig|pdf_activate_item|pdf_add_annotation|pdf_add_bookmark|pdf_add_launchlink|pdf_add_locallink|pdf_add_nameddest|pdf_add_note|pdf_add_outline|pdf_add_pdflink|pdf_add_table_cell|pdf_add_textflow|pdf_add_thumbnail|pdf_add_weblink|pdf_arc|pdf_arcn|pdf_attach_file|pdf_begin_document|pdf_begin_font|pdf_begin_glyph|pdf_begin_item|pdf_begin_layer|pdf_begin_page|pdf_begin_page_ext|pdf_begin_pattern|pdf_begin_template|pdf_begin_template_ext|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_3dview|pdf_create_action|pdf_create_annotation|pdf_create_bookmark|pdf_create_field|pdf_create_fieldgroup|pdf_create_gstate|pdf_create_pvf|pdf_create_textflow|pdf_curveto|pdf_define_layer|pdf_delete|pdf_delete_pvf|pdf_delete_table|pdf_delete_textflow|pdf_encoding_set_char|pdf_end_document|pdf_end_font|pdf_end_glyph|pdf_end_item|pdf_end_layer|pdf_end_page|pdf_end_page_ext|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_table|pdf_fit_textflow|pdf_fit_textline|pdf_get_apiname|pdf_get_buffer|pdf_get_errmsg|pdf_get_errnum|pdf_get_font|pdf_get_fontname|pdf_get_fontsize|pdf_get_image_height|pdf_get_image_width|pdf_get_majorversion|pdf_get_minorversion|pdf_get_parameter|pdf_get_pdi_parameter|pdf_get_pdi_value|pdf_get_value|pdf_info_font|pdf_info_matchbox|pdf_info_table|pdf_info_textflow|pdf_info_textline|pdf_initgraphics|pdf_lineto|pdf_load_3ddata|pdf_load_font|pdf_load_iccprofile|pdf_load_image|pdf_makespotcolor|pdf_moveto|pdf_new|pdf_open_ccitt|pdf_open_file|pdf_open_gif|pdf_open_image|pdf_open_image_file|pdf_open_jpeg|pdf_open_memory_image|pdf_open_pdi|pdf_open_pdi_document|pdf_open_pdi_page|pdf_open_tiff|pdf_pcos_get_number|pdf_pcos_get_stream|pdf_pcos_get_string|pdf_place_image|pdf_place_pdi_page|pdf_process_pdi|pdf_rect|pdf_restore|pdf_resume_page|pdf_rotate|pdf_save|pdf_scale|pdf_set_border_color|pdf_set_border_dash|pdf_set_border_style|pdf_set_char_spacing|pdf_set_duration|pdf_set_gstate|pdf_set_horiz_scaling|pdf_set_info|pdf_set_info_author|pdf_set_info_creator|pdf_set_info_keywords|pdf_set_info_subject|pdf_set_info_title|pdf_set_layer_dependency|pdf_set_leading|pdf_set_parameter|pdf_set_text_matrix|pdf_set_text_pos|pdf_set_text_rendering|pdf_set_text_rise|pdf_set_value|pdf_set_word_spacing|pdf_setcolor|pdf_setdash|pdf_setdashpattern|pdf_setflat|pdf_setfont|pdf_setgray|pdf_setgray_fill|pdf_setgray_stroke|pdf_setlinecap|pdf_setlinejoin|pdf_setlinewidth|pdf_setmatrix|pdf_setmiterlimit|pdf_setpolydash|pdf_setrgbcolor|pdf_setrgbcolor_fill|pdf_setrgbcolor_stroke|pdf_shading|pdf_shading_pattern|pdf_shfill|pdf_show|pdf_show_boxed|pdf_show_xy|pdf_skew|pdf_stringwidth|pdf_stroke|pdf_suspend_page|pdf_translate|pdf_utf16_to_utf8|pdf_utf32_to_utf16|pdf_utf8_to_utf16|pdo|pdo_cubrid_schema|pdo_pgsqllobcreate|pdo_pgsqllobopen|pdo_pgsqllobunlink|pdo_sqlitecreateaggregate|pdo_sqlitecreatefunction|pdoexception|pdostatement|pfsockopen|pg_affected_rows|pg_cancel_query|pg_client_encoding|pg_close|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_escape_bytea|pg_escape_string|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_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_get_notify|pg_get_pid|pg_get_result|pg_host|pg_insert|pg_last_error|pg_last_notice|pg_last_oid|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_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_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_trace|pg_transaction_status|pg_tty|pg_unescape_bytea|pg_untrace|pg_update|pg_version|php_check_syntax|php_ini_loaded_file|php_ini_scanned_files|php_logo_guid|php_sapi_name|php_strip_whitespace|php_uname|phpcredits|phpinfo|phpversion|pi|png2wbmp|popen|pos|posix_access|posix_ctermid|posix_errno|posix_get_last_error|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_initgroups|posix_isatty|posix_kill|posix_mkfifo|posix_mknod|posix_setegid|posix_seteuid|posix_setgid|posix_setpgid|posix_setsid|posix_setuid|posix_strerror|posix_times|posix_ttyname|posix_uname|pow|preg_filter|preg_grep|preg_last_error|preg_match|preg_match_all|preg_quote|preg_replace|preg_replace_callback|preg_split|prev|print|print_r|printer_abort|printer_close|printer_create_brush|printer_create_dc|printer_create_font|printer_create_pen|printer_delete_brush|printer_delete_dc|printer_delete_font|printer_delete_pen|printer_draw_bmp|printer_draw_chord|printer_draw_elipse|printer_draw_line|printer_draw_pie|printer_draw_rectangle|printer_draw_roundrect|printer_draw_text|printer_end_doc|printer_end_page|printer_get_option|printer_list|printer_logical_fontheight|printer_open|printer_select_brush|printer_select_font|printer_select_pen|printer_set_option|printer_start_doc|printer_start_page|printer_write|printf|proc_close|proc_get_status|proc_nice|proc_open|proc_terminate|property_exists|ps_add_bookmark|ps_add_launchlink|ps_add_locallink|ps_add_note|ps_add_pdflink|ps_add_weblink|ps_arc|ps_arcn|ps_begin_page|ps_begin_pattern|ps_begin_template|ps_circle|ps_clip|ps_close|ps_close_image|ps_closepath|ps_closepath_stroke|ps_continue_text|ps_curveto|ps_delete|ps_end_page|ps_end_pattern|ps_end_template|ps_fill|ps_fill_stroke|ps_findfont|ps_get_buffer|ps_get_parameter|ps_get_value|ps_hyphenate|ps_include_file|ps_lineto|ps_makespotcolor|ps_moveto|ps_new|ps_open_file|ps_open_image|ps_open_image_file|ps_open_memory_image|ps_place_image|ps_rect|ps_restore|ps_rotate|ps_save|ps_scale|ps_set_border_color|ps_set_border_dash|ps_set_border_style|ps_set_info|ps_set_parameter|ps_set_text_pos|ps_set_value|ps_setcolor|ps_setdash|ps_setflat|ps_setfont|ps_setgray|ps_setlinecap|ps_setlinejoin|ps_setlinewidth|ps_setmiterlimit|ps_setoverprintmode|ps_setpolydash|ps_shading|ps_shading_pattern|ps_shfill|ps_show|ps_show2|ps_show_boxed|ps_show_xy|ps_show_xy2|ps_string_geometry|ps_stringwidth|ps_stroke|ps_symbol|ps_symbol_name|ps_symbol_width|ps_translate|pspell_add_to_personal|pspell_add_to_session|pspell_check|pspell_clear_session|pspell_config_create|pspell_config_data_dir|pspell_config_dict_dir|pspell_config_ignore|pspell_config_mode|pspell_config_personal|pspell_config_repl|pspell_config_runtogether|pspell_config_save_repl|pspell_new|pspell_new_config|pspell_new_personal|pspell_save_wordlist|pspell_store_replacement|pspell_suggest|putenv|px_close|px_create_fp|px_date2string|px_delete|px_delete_record|px_get_field|px_get_info|px_get_parameter|px_get_record|px_get_schema|px_get_value|px_insert_record|px_new|px_numfields|px_numrecords|px_open_fp|px_put_record|px_retrieve_record|px_set_blob_file|px_set_parameter|px_set_tablename|px_set_targetencoding|px_set_value|px_timestamp2string|px_update_record|qdom_error|qdom_tree|quoted_printable_decode|quoted_printable_encode|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|rangeexception|rar_wrapper_cache_stats|rararchive|rarentry|rarexception|rawurldecode|rawurlencode|read_exif_data|readdir|readfile|readgzfile|readline|readline_add_history|readline_callback_handler_install|readline_callback_handler_remove|readline_callback_read_char|readline_clear_history|readline_completion_function|readline_info|readline_list_history|readline_on_new_line|readline_read_history|readline_redisplay|readline_write_history|readlink|realpath|realpath_cache_get|realpath_cache_size|recode|recode_file|recode_string|recursivearrayiterator|recursivecachingiterator|recursivecallbackfilteriterator|recursivedirectoryiterator|recursivefilteriterator|recursiveiterator|recursiveiteratoriterator|recursiveregexiterator|recursivetreeiterator|reflection|reflectionclass|reflectionexception|reflectionextension|reflectionfunction|reflectionfunctionabstract|reflectionmethod|reflectionobject|reflectionparameter|reflectionproperty|reflector|regexiterator|register_shutdown_function|register_tick_function|rename|rename_function|require|require_once|reset|resetValue|resourcebundle|restore_error_handler|restore_exception_handler|restore_include_path|return|rewind|rewinddir|rmdir|round|rpm_close|rpm_get_tag|rpm_is_valid|rpm_open|rpm_version|rrd_create|rrd_error|rrd_fetch|rrd_first|rrd_graph|rrd_info|rrd_last|rrd_lastupdate|rrd_restore|rrd_tune|rrd_update|rrd_xport|rrdcreator|rrdgraph|rrdupdater|rsort|rtrim|runkit_class_adopt|runkit_class_emancipate|runkit_constant_add|runkit_constant_redefine|runkit_constant_remove|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_return_value_used|runkit_sandbox_output_handler|runkit_superglobals|runtimeexception|samconnection_commit|samconnection_connect|samconnection_constructor|samconnection_disconnect|samconnection_errno|samconnection_error|samconnection_isconnected|samconnection_peek|samconnection_peekall|samconnection_receive|samconnection_remove|samconnection_rollback|samconnection_send|samconnection_setDebug|samconnection_subscribe|samconnection_unsubscribe|sammessage_body|sammessage_constructor|sammessage_header|sca_createdataobject|sca_getservice|sca_localproxy_createdataobject|sca_soapproxy_createdataobject|scandir|sdo_das_changesummary_beginlogging|sdo_das_changesummary_endlogging|sdo_das_changesummary_getchangeddataobjects|sdo_das_changesummary_getchangetype|sdo_das_changesummary_getoldcontainer|sdo_das_changesummary_getoldvalues|sdo_das_changesummary_islogging|sdo_das_datafactory_addpropertytotype|sdo_das_datafactory_addtype|sdo_das_datafactory_getdatafactory|sdo_das_dataobject_getchangesummary|sdo_das_relational_applychanges|sdo_das_relational_construct|sdo_das_relational_createrootdataobject|sdo_das_relational_executepreparedquery|sdo_das_relational_executequery|sdo_das_setting_getlistindex|sdo_das_setting_getpropertyindex|sdo_das_setting_getpropertyname|sdo_das_setting_getvalue|sdo_das_setting_isset|sdo_das_xml_addtypes|sdo_das_xml_create|sdo_das_xml_createdataobject|sdo_das_xml_createdocument|sdo_das_xml_document_getrootdataobject|sdo_das_xml_document_getrootelementname|sdo_das_xml_document_getrootelementuri|sdo_das_xml_document_setencoding|sdo_das_xml_document_setxmldeclaration|sdo_das_xml_document_setxmlversion|sdo_das_xml_loadfile|sdo_das_xml_loadstring|sdo_das_xml_savefile|sdo_das_xml_savestring|sdo_datafactory_create|sdo_dataobject_clear|sdo_dataobject_createdataobject|sdo_dataobject_getcontainer|sdo_dataobject_getsequence|sdo_dataobject_gettypename|sdo_dataobject_gettypenamespaceuri|sdo_exception_getcause|sdo_list_insert|sdo_model_property_getcontainingtype|sdo_model_property_getdefault|sdo_model_property_getname|sdo_model_property_gettype|sdo_model_property_iscontainment|sdo_model_property_ismany|sdo_model_reflectiondataobject_construct|sdo_model_reflectiondataobject_export|sdo_model_reflectiondataobject_getcontainmentproperty|sdo_model_reflectiondataobject_getinstanceproperties|sdo_model_reflectiondataobject_gettype|sdo_model_type_getbasetype|sdo_model_type_getname|sdo_model_type_getnamespaceuri|sdo_model_type_getproperties|sdo_model_type_getproperty|sdo_model_type_isabstracttype|sdo_model_type_isdatatype|sdo_model_type_isinstance|sdo_model_type_isopentype|sdo_model_type_issequencedtype|sdo_sequence_getproperty|sdo_sequence_insert|sdo_sequence_move|seekableiterator|sem_acquire|sem_get|sem_release|sem_remove|serializable|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_pgsql_add_error|session_pgsql_get_error|session_pgsql_get_field|session_pgsql_reset|session_pgsql_set_field|session_pgsql_status|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|setCounterClass|set_error_handler|set_exception_handler|set_file_buffer|set_include_path|set_magic_quotes_runtime|set_socket_blocking|set_time_limit|setcookie|setlocale|setproctitle|setrawcookie|setstaticpropertyvalue|setthreadtitle|settype|sha1|sha1_file|shell_exec|shm_attach|shm_detach|shm_get_var|shm_has_var|shm_put_var|shm_remove|shm_remove_var|shmop_close|shmop_delete|shmop_open|shmop_read|shmop_size|shmop_write|show_source|shuffle|signeurlpaiement|similar_text|simplexml_import_dom|simplexml_load_file|simplexml_load_string|simplexmlelement|simplexmliterator|sin|sinh|sizeof|sleep|snmp|snmp2_get|snmp2_getnext|snmp2_real_walk|snmp2_set|snmp2_walk|snmp3_get|snmp3_getnext|snmp3_real_walk|snmp3_set|snmp3_walk|snmp_get_quick_print|snmp_get_valueretrieval|snmp_read_mib|snmp_set_enum_print|snmp_set_oid_numeric_print|snmp_set_oid_output_format|snmp_set_quick_print|snmp_set_valueretrieval|snmpget|snmpgetnext|snmprealwalk|snmpset|snmpwalk|snmpwalkoid|soapclient|soapfault|soapheader|soapparam|soapserver|soapvar|socket_accept|socket_bind|socket_clear_error|socket_close|socket_connect|socket_create|socket_create_listen|socket_create_pair|socket_get_option|socket_get_status|socket_getpeername|socket_getsockname|socket_last_error|socket_listen|socket_read|socket_recv|socket_recvfrom|socket_select|socket_send|socket_sendto|socket_set_block|socket_set_blocking|socket_set_nonblock|socket_set_option|socket_set_timeout|socket_shutdown|socket_strerror|socket_write|solr_get_version|solrclient|solrclientexception|solrdocument|solrdocumentfield|solrexception|solrgenericresponse|solrillegalargumentexception|solrillegaloperationexception|solrinputdocument|solrmodifiableparams|solrobject|solrparams|solrpingresponse|solrquery|solrqueryresponse|solrresponse|solrupdateresponse|solrutils|sort|soundex|sphinxclient|spl_autoload|spl_autoload_call|spl_autoload_extensions|spl_autoload_functions|spl_autoload_register|spl_autoload_unregister|spl_classes|spl_object_hash|splbool|spldoublylinkedlist|splenum|splfileinfo|splfileobject|splfixedarray|splfloat|splheap|splint|split|spliti|splmaxheap|splminheap|splobjectstorage|splobserver|splpriorityqueue|splqueue|splstack|splstring|splsubject|spltempfileobject|spoofchecker|sprintf|sql_regcase|sqlite3|sqlite3result|sqlite3stmt|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_key|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|ssdeep_fuzzy_compare|ssdeep_fuzzy_hash|ssdeep_fuzzy_hash_filename|ssh2_auth_hostbased_file|ssh2_auth_none|ssh2_auth_password|ssh2_auth_pubkey_file|ssh2_connect|ssh2_exec|ssh2_fetch_stream|ssh2_fingerprint|ssh2_methods_negotiated|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_poisson|stats_cdf_t|stats_cdf_uniform|stats_cdf_weibull|stats_covariance|stats_den_uniform|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_negative_binomial|stats_dens_normal|stats_dens_pmf_binomial|stats_dens_pmf_hypergeometric|stats_dens_pmf_poisson|stats_dens_t|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_ibinomial|stats_rand_gen_ibinomial_negative|stats_rand_gen_int|stats_rand_gen_ipoisson|stats_rand_gen_iuniform|stats_rand_gen_noncenral_chisquare|stats_rand_gen_noncentral_f|stats_rand_gen_noncentral_t|stats_rand_gen_normal|stats_rand_gen_t|stats_rand_get_seeds|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_gennch|stats_stat_independent_t|stats_stat_innerproduct|stats_stat_noncentral_t|stats_stat_paired_t|stats_stat_percentile|stats_stat_powersum|stats_variance|stomp|stomp_connect_error|stomp_version|stompexception|stompframe|str_getcsv|str_ireplace|str_pad|str_repeat|str_replace|str_rot13|str_shuffle|str_split|str_word_count|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_get_params|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_read_buffer|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|streamwrapper|strftime|strip_tags|stripcslashes|stripos|stripslashes|stristr|strlen|strnatcasecmp|strnatcmp|strncasecmp|strncmp|strpbrk|strpos|strptime|strrchr|strrev|strripos|strrpos|strspn|strstr|strtok|strtolower|strtotime|strtoupper|strtr|strval|substr|substr_compare|substr_count|substr_replace|svm|svmmodel|svn_add|svn_auth_get_parameter|svn_auth_set_parameter|svn_blame|svn_cat|svn_checkout|svn_cleanup|svn_client_version|svn_commit|svn_delete|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_log|svn_ls|svn_mkdir|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_revert|svn_status|svn_update|swf_actiongeturl|swf_actiongotoframe|swf_actiongotolabel|swf_actionnextframe|swf_actionplay|swf_actionprevframe|swf_actionsettarget|swf_actionstop|swf_actiontogglequality|swf_actionwaitforframe|swf_addbuttonrecord|swf_addcolor|swf_closefile|swf_definebitmap|swf_definefont|swf_defineline|swf_definepoly|swf_definerect|swf_definetext|swf_endbutton|swf_enddoaction|swf_endshape|swf_endsymbol|swf_fontsize|swf_fontslant|swf_fonttracking|swf_getbitmapinfo|swf_getfontinfo|swf_getframe|swf_labelframe|swf_lookat|swf_modifyobject|swf_mulcolor|swf_nextid|swf_oncondition|swf_openfile|swf_ortho|swf_ortho2|swf_perspective|swf_placeobject|swf_polarview|swf_popmatrix|swf_posround|swf_pushmatrix|swf_removeobject|swf_rotate|swf_scale|swf_setfont|swf_setframe|swf_shapearc|swf_shapecurveto|swf_shapecurveto3|swf_shapefillbitmapclip|swf_shapefillbitmaptile|swf_shapefilloff|swf_shapefillsolid|swf_shapelinesolid|swf_shapelineto|swf_shapemoveto|swf_showframe|swf_startbutton|swf_startdoaction|swf_startshape|swf_startsymbol|swf_textwidth|swf_translate|swf_viewport|swfaction|swfbitmap|swfbutton|swfdisplayitem|swffill|swffont|swffontchar|swfgradient|swfmorph|swfmovie|swfprebuiltclip|swfshape|swfsound|swfsoundinstance|swfsprite|swftext|swftextfield|swfvideostream|swish_construct|swish_getmetalist|swish_getpropertylist|swish_prepare|swish_query|swishresult_getmetalist|swishresult_stem|swishresults_getparsedwords|swishresults_getremovedstopwords|swishresults_nextresult|swishresults_seekresult|swishsearch_execute|swishsearch_resetlimit|swishsearch_setlimit|swishsearch_setphrasedelimiter|swishsearch_setsort|swishsearch_setstructure|sybase_affected_rows|sybase_close|sybase_connect|sybase_data_seek|sybase_deadlock_retry_count|sybase_fetch_array|sybase_fetch_assoc|sybase_fetch_field|sybase_fetch_object|sybase_fetch_row|sybase_field_seek|sybase_free_result|sybase_get_last_message|sybase_min_client_severity|sybase_min_error_severity|sybase_min_message_severity|sybase_min_server_severity|sybase_num_fields|sybase_num_rows|sybase_pconnect|sybase_query|sybase_result|sybase_select_db|sybase_set_message_handler|sybase_unbuffered_query|symlink|sys_get_temp_dir|sys_getloadavg|syslog|system|tag|tan|tanh|tcpwrap_check|tempnam|textdomain|tidy|tidy_access_count|tidy_config_count|tidy_diagnose|tidy_error_count|tidy_get_error_buffer|tidy_get_output|tidy_load_config|tidy_reset_config|tidy_save_config|tidy_set_encoding|tidy_setopt|tidy_warning_count|tidynode|time|time_nanosleep|time_sleep_until|timezone_abbreviations_list|timezone_identifiers_list|timezone_location_get|timezone_name_from_abbr|timezone_name_get|timezone_offset_get|timezone_open|timezone_transitions_get|timezone_version_get|tmpfile|token_get_all|token_name|tokyotyrant|tokyotyrantquery|tokyotyranttable|tostring|tostring|touch|transliterator|traversable|trigger_error|trim|uasort|ucfirst|ucwords|udm_add_search_limit|udm_alloc_agent|udm_alloc_agent_array|udm_api_version|udm_cat_list|udm_cat_path|udm_check_charset|udm_check_stored|udm_clear_search_limits|udm_close_stored|udm_crc32|udm_errno|udm_error|udm_find|udm_free_agent|udm_free_ispell_data|udm_free_res|udm_get_doc_count|udm_get_res_field|udm_get_res_param|udm_hash32|udm_load_ispell_data|udm_open_stored|udm_set_agent_param|uksort|umask|underflowexception|unexpectedvalueexception|uniqid|unixtojd|unlink|unpack|unregister_tick_function|unserialize|unset|urldecode|urlencode|use_soap_error_handler|user_error|usleep|usort|utf8_decode|utf8_encode|v8js|v8jsexception|var_dump|var_export|variant|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|vfprintf|virtual|vpopmail_add_alias_domain|vpopmail_add_alias_domain_ex|vpopmail_add_domain|vpopmail_add_domain_ex|vpopmail_add_user|vpopmail_alias_add|vpopmail_alias_del|vpopmail_alias_del_domain|vpopmail_alias_get|vpopmail_alias_get_all|vpopmail_auth_user|vpopmail_del_domain|vpopmail_del_domain_ex|vpopmail_del_user|vpopmail_error|vpopmail_passwd|vpopmail_set_user_quota|vprintf|vsprintf|w32api_deftype|w32api_init_dtype|w32api_invoke_function|w32api_register_function|w32api_set_call_method|wddx_add_vars|wddx_deserialize|wddx_packet_end|wddx_packet_start|wddx_serialize_value|wddx_serialize_vars|win32_continue_service|win32_create_service|win32_delete_service|win32_get_last_control_message|win32_pause_service|win32_ps_list_procs|win32_ps_stat_mem|win32_ps_stat_proc|win32_query_service_status|win32_set_service_status|win32_start_service|win32_start_service_ctrl_dispatcher|win32_stop_service|wincache_fcache_fileinfo|wincache_fcache_meminfo|wincache_lock|wincache_ocache_fileinfo|wincache_ocache_meminfo|wincache_refresh_if_changed|wincache_rplist_fileinfo|wincache_rplist_meminfo|wincache_scache_info|wincache_scache_meminfo|wincache_ucache_add|wincache_ucache_cas|wincache_ucache_clear|wincache_ucache_dec|wincache_ucache_delete|wincache_ucache_exists|wincache_ucache_get|wincache_ucache_inc|wincache_ucache_info|wincache_ucache_meminfo|wincache_ucache_set|wincache_unlock|wordwrap|xattr_get|xattr_list|xattr_remove|xattr_set|xattr_supported|xdiff_file_bdiff|xdiff_file_bdiff_size|xdiff_file_bpatch|xdiff_file_diff|xdiff_file_diff_binary|xdiff_file_merge3|xdiff_file_patch|xdiff_file_patch_binary|xdiff_file_rabdiff|xdiff_string_bdiff|xdiff_string_bdiff_size|xdiff_string_bpatch|xdiff_string_diff|xdiff_string_diff_binary|xdiff_string_merge3|xdiff_string_patch|xdiff_string_patch_binary|xdiff_string_rabdiff|xhprof_disable|xhprof_enable|xhprof_sample_disable|xhprof_sample_enable|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_parse_into_struct|xml_parser_create|xml_parser_create_ns|xml_parser_free|xml_parser_get_option|xml_parser_set_option|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|xmlreader|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|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|xslt_backend_info|xslt_backend_name|xslt_backend_version|xslt_create|xslt_errno|xslt_error|xslt_free|xslt_getopt|xslt_process|xslt_set_base|xslt_set_encoding|xslt_set_error_handler|xslt_set_log|xslt_set_object|xslt_set_sax_handler|xslt_set_sax_handlers|xslt_set_scheme_handler|xslt_set_scheme_handlers|xslt_setopt|xsltprocessor|yaml_emit|yaml_emit_file|yaml_parse|yaml_parse_file|yaml_parse_url|yaz_addinfo|yaz_ccl_conf|yaz_ccl_parse|yaz_close|yaz_connect|yaz_database|yaz_element|yaz_errno|yaz_error|yaz_es|yaz_es_result|yaz_get_option|yaz_hits|yaz_itemorder|yaz_present|yaz_range|yaz_record|yaz_scan|yaz_scan_result|yaz_schema|yaz_search|yaz_set_option|yaz_sort|yaz_syntax|yaz_wait|yp_all|yp_cat|yp_err_string|yp_errno|yp_first|yp_get_default_domain|yp_master|yp_match|yp_next|yp_order|zend_logo_guid|zend_thread_id|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|ziparchive|ziparchive_addemptydir|ziparchive_addfile|ziparchive_addfromstring|ziparchive_close|ziparchive_deleteindex|ziparchive_deletename|ziparchive_extractto|ziparchive_getarchivecomment|ziparchive_getcommentindex|ziparchive_getcommentname|ziparchive_getfromindex|ziparchive_getfromname|ziparchive_getnameindex|ziparchive_getstatusstring|ziparchive_getstream|ziparchive_locatename|ziparchive_open|ziparchive_renameindex|ziparchive_renamename|ziparchive_setCommentName|ziparchive_setarchivecomment|ziparchive_setcommentindex|ziparchive_statindex|ziparchive_statname|ziparchive_unchangeall|ziparchive_unchangearchive|ziparchive_unchangeindex|ziparchive_unchangename|zlib_get_coding_type".split("|")),c=e.arrayToMap("abstract|and|array|as|break|case|catch|class|clone|const|continue|declare|default|do|else|elseif|enddeclare|endfor|endforeach|endif|endswitch|endwhile|extends|final|for|foreach|function|global|goto|if|implements|interface|instanceof|namespace|new|or|private|protected|public|static|switch|throw|try|use|var|while|xor".split("|")),d=e.arrayToMap("die|echo|empty|exit|eval|include|include_once|isset|list|require|require_once|return|print|unset".split("|")),g=e.arrayToMap("true|false|null|__CLASS__|__DIR__|__FILE__|__LINE__|__METHOD__|__FUNCTION__|__NAMESPACE__".split("|")),h=e.arrayToMap("$GLOBALS|$_SERVER|$_GET|$_POST|$_FILES|$_REQUEST|$_SESSION|$_ENV|$_COOKIE|$php_errormsg|$HTTP_RAW_POST_DATA|$http_response_header|$argc|$argv".split("|")),i=e.arrayToMap("key_exists|cairo_matrix_create_scale|cairo_matrix_create_translate|call_user_method|call_user_method_array|com_addref|com_get|com_invoke|com_isenum|com_load|com_release|com_set|connection_timeout|cubrid_load_from_glo|cubrid_new_glo|cubrid_save_to_glo|cubrid_send_glo|define_syslog_variables|dl|ereg|ereg_replace|eregi|eregi_replace|hw_documentattributes|hw_documentbodytag|hw_documentsize|hw_outputdocument|imagedashedline|maxdb_bind_param|maxdb_bind_result|maxdb_client_encoding|maxdb_close_long_data|maxdb_execute|maxdb_fetch|maxdb_get_metadata|maxdb_param_count|maxdb_send_long_data|mcrypt_ecb|mcrypt_generic_end|mime_content_type|mysql_createdb|mysql_dbname|mysql_db_query|mysql_drop_db|mysql_dropdb|mysql_escape_string|mysql_fieldflags|mysql_fieldflags|mysql_fieldname|mysql_fieldtable|mysql_fieldtype|mysql_freeresult|mysql_listdbs|mysql_list_fields|mysql_listfields|mysql_list_tables|mysql_listtables|mysql_numfields|mysql_numrows|mysql_selectdb|mysql_tablename|mysqli_bind_param|mysqli_bind_result|mysqli_disable_reads_from_master|mysqli_disable_rpl_parse|mysqli_enable_reads_from_master|mysqli_enable_rpl_parse|mysqli_execute|mysqli_fetch|mysqli_get_metadata|mysqli_master_query|mysqli_param_count|mysqli_rpl_parse_enabled|mysqli_rpl_probe|mysqli_rpl_query_type|mysqli_send_long_data|mysqli_send_query|mysqli_slave_query|ocibindbyname|ocicancel|ocicloselob|ocicollappend|ocicollassign|ocicollassignelem|ocicollgetelem|ocicollmax|ocicollsize|ocicolltrim|ocicolumnisnull|ocicolumnname|ocicolumnprecision|ocicolumnscale|ocicolumnsize|ocicolumntype|ocicolumntyperaw|ocicommit|ocidefinebyname|ocierror|ociexecute|ocifetch|ocifetchinto|ocifetchstatement|ocifreecollection|ocifreecursor|ocifreedesc|ocifreestatement|ociinternaldebug|ociloadlob|ocilogoff|ocilogon|ocinewcollection|ocinewcursor|ocinewdescriptor|ocinlogon|ocinumcols|ociparse|ociplogon|ociresult|ocirollback|ocirowcount|ocisavelob|ocisavelobfile|ociserverversion|ocisetprefetch|ocistatementtype|ociwritelobtofile|ociwritetemporarylob|PDF_add_annotation|PDF_add_bookmark|PDF_add_launchlink|PDF_add_locallink|PDF_add_note|PDF_add_outline|PDF_add_pdflink|PDF_add_weblink|PDF_attach_file|PDF_begin_page|PDF_begin_template|PDF_close_pdi|PDF_close|PDF_findfont|PDF_get_font|PDF_get_fontname|PDF_get_fontsize|PDF_get_image_height|PDF_get_image_width|PDF_get_majorversion|PDF_get_minorversion|PDF_get_pdi_parameter|PDF_get_pdi_value|PDF_open_ccitt|PDF_open_file|PDF_open_gif|PDF_open_image_file|PDF_open_image|PDF_open_jpeg|PDF_open_pdi|PDF_open_tiff|PDF_place_image|PDF_place_pdi_page|PDF_set_border_color|PDF_set_border_dash|PDF_set_border_style|PDF_set_char_spacing|PDF_set_duration|PDF_set_horiz_scaling|PDF_set_info_author|PDF_set_info_creator|PDF_set_info_keywords|PDF_set_info_subject|PDF_set_info_title|PDF_set_leading|PDF_set_text_matrix|PDF_set_text_rendering|PDF_set_text_rise|PDF_set_word_spacing|PDF_setgray_fill|PDF_setgray_stroke|PDF_setgray|PDF_setpolydash|PDF_setrgbcolor_fill|PDF_setrgbcolor_stroke|PDF_setrgbcolor|PDF_show_boxed|php_check_syntax|px_set_tablename|px_set_targetencoding|runkit_sandbox_output_handler|session_is_registered|session_register|session_unregisterset_magic_quotes_runtime|magic_quotes_runtime|set_socket_blocking|socket_set_blocking|set_socket_timeout|socket_set_timeout|split|spliti|sql_regcase".split("|")),j=e.arrayToMap("cfunction|old_function".split("|")),k=e.arrayToMap([]);this.$rules={start:[{token:"support.php_tag",regex:"<\\?(?:php|\\=)"},{token:"support.php_tag",regex:"\\?>"},{token:"comment",regex:"<\\!--",next:"htmlcomment"},{token:"meta.tag",regex:"<style",next:"css"},{token:"meta.tag",regex:"<\\/?[-_a-zA-Z0-9:]+",next:"htmltag"},{token:"meta.tag",regex:"<!DOCTYPE.*?>"},{token:"comment",regex:"\\/\\/.*$"},{token:"comment",regex:"#.*$"},a.getStartRule("doc-start"),{token:"comment",regex:"\\/\\*",next:"comment"},{token:"string.regexp",regex:"[/](?:(?:\\[(?:\\\\]|[^\\]])+\\])|(?:\\\\/|[^\\]/]))*[/][gimy]*\\s*(?=[).,;]|$)"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",regex:'["][\\s\\S]*',next:"qqstring"},{token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:"string",regex:"['][\\s\\S]+",next:"qstring"},{token:"constant.numeric",regex:"0[xX][0-9a-fA-F]+\\b"},{token:"constant.numeric",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:"constant.language",regex:"\\b(?:DEFAULT_INCLUDE_PATH|E_(?:ALL|CO(?:MPILE_(?:ERROR|WARNING)|RE_(?:ERROR|WARNING))|ERROR|NOTICE|PARSE|STRICT|USER_(?:ERROR|NOTICE|WARNING)|WARNING)|P(?:EAR_(?:EXTENSION_DIR|INSTALL_DIR)|HP_(?:BINDIR|CONFIG_FILE_(?:PATH|SCAN_DIR)|DATADIR|E(?:OL|XTENSION_DIR)|INT_(?:MAX|SIZE)|L(?:IBDIR|OCALSTATEDIR)|O(?:S|UTPUT_HANDLER_(?:CONT|END|START))|PREFIX|S(?:API|HLIB_SUFFIX|YSCONFDIR)|VERSION))|__COMPILER_HALT_OFFSET__)\\b"},{token:"constant.language",regex:"\\b(?:A(?:B(?:DAY_(?:1|2|3|4|5|6|7)|MON_(?:1(?:0|1|2|)|2|3|4|5|6|7|8|9))|LT_DIGITS|M_STR|SSERT_(?:ACTIVE|BAIL|CALLBACK|QUIET_EVAL|WARNING))|C(?:ASE_(?:LOWER|UPPER)|HAR_MAX|O(?:DESET|NNECTION_(?:ABORTED|NORMAL|TIMEOUT)|UNT_(?:NORMAL|RECURSIVE))|R(?:EDITS_(?:ALL|DOCS|FULLPAGE|G(?:ENERAL|ROUP)|MODULES|QA|SAPI)|NCYSTR|YPT_(?:BLOWFISH|EXT_DES|MD5|S(?:ALT_LENGTH|TD_DES)))|URRENCY_SYMBOL)|D(?:AY_(?:1|2|3|4|5|6|7)|ECIMAL_POINT|IRECTORY_SEPARATOR|_(?:FMT|T_FMT))|E(?:NT_(?:COMPAT|NOQUOTES|QUOTES)|RA(?:_(?:D_(?:FMT|T_FMT)|T_FMT|YEAR)|)|XTR_(?:IF_EXISTS|OVERWRITE|PREFIX_(?:ALL|I(?:F_EXISTS|NVALID)|SAME)|SKIP))|FRAC_DIGITS|GROUPING|HTML_(?:ENTITIES|SPECIALCHARS)|IN(?:FO_(?:ALL|C(?:ONFIGURATION|REDITS)|ENVIRONMENT|GENERAL|LICENSE|MODULES|VARIABLES)|I_(?:ALL|PERDIR|SYSTEM|USER)|T_(?:CURR_SYMBOL|FRAC_DIGITS))|L(?:C_(?:ALL|C(?:OLLATE|TYPE)|M(?:ESSAGES|ONETARY)|NUMERIC|TIME)|O(?:CK_(?:EX|NB|SH|UN)|G_(?:A(?:LERT|UTH(?:PRIV|))|C(?:ONS|R(?:IT|ON))|D(?:AEMON|EBUG)|E(?:MERG|RR)|INFO|KERN|L(?:OCAL(?:0|1|2|3|4|5|6|7)|PR)|MAIL|N(?:DELAY|EWS|O(?:TICE|WAIT))|ODELAY|P(?:ERROR|ID)|SYSLOG|U(?:SER|UCP)|WARNING)))|M(?:ON_(?:1(?:0|1|2|)|2|3|4|5|6|7|8|9|DECIMAL_POINT|GROUPING|THOUSANDS_SEP)|_(?:1_PI|2_(?:PI|SQRTPI)|E|L(?:N(?:10|2)|OG(?:10E|2E))|PI(?:_(?:2|4)|)|SQRT(?:1_2|2)))|N(?:EGATIVE_SIGN|O(?:EXPR|STR)|_(?:CS_PRECEDES|S(?:EP_BY_SPACE|IGN_POSN)))|P(?:ATH(?:INFO_(?:BASENAME|DIRNAME|EXTENSION)|_SEPARATOR)|M_STR|OSITIVE_SIGN|_(?:CS_PRECEDES|S(?:EP_BY_SPACE|IGN_POSN)))|RADIXCHAR|S(?:EEK_(?:CUR|END|SET)|ORT_(?:ASC|DESC|NUMERIC|REGULAR|STRING)|TR_PAD_(?:BOTH|LEFT|RIGHT))|T(?:HOUS(?:ANDS_SEP|EP)|_FMT(?:_AMPM|))|YES(?:EXPR|STR)|STD(?:IN|OUT|ERR))\\b"},{token:function(a){return c.hasOwnProperty(a)?"keyword":g.hasOwnProperty(a)?"constant.language":h.hasOwnProperty(a)?"variable.language":k.hasOwnProperty(a)?"invalid.illegal":b.hasOwnProperty(a)?"support.function":a=="debugger"?"invalid.deprecated":a.match(/^(\$[a-zA-Z][a-zA-Z0-9_]*|self|parent)$/)?"variable":"identifier"},regex:"[a-zA-Z_$][a-zA-Z0-9_$]*\\b"},{token:"keyword.operator",regex:"!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)"},{token:"lparen",regex:"[[({]"},{token:"rparen",regex:"[\\])}]"},{token:"text",regex:"\\s+"}],comment:[{token:"comment",regex:".*?\\*\\/",next:"start"},{token:"comment",regex:".+"}],qqstring:[{token:"string",regex:'"',next:"start"},{token:"string",regex:'[^"]+'}],qstring:[{token:"string",regex:"'",next:"start"},{token:"string",regex:"[^']+"}],htmlcomment:[{token:"comment",regex:".*?-->",next:"start"},{token:"comment",regex:".+"}],htmltag:[{token:"meta.tag",regex:">",next:"start"},{token:"text",regex:"[-_a-zA-Z0-9:]+"},{token:"text",regex:"\\s+"},{token:"string",regex:'".*?"'},{token:"string",regex:"'.*?'"}],css:[{token:"meta.tag",regex:"</style>",next:"htmltag"},{token:"meta.tag",regex:">"},{token:"text",regex:"(?:media|type|href)"},{token:"string",regex:'=".*?"'},{token:"paren.lparen",regex:"{",next:"cssdeclaration"},{token:"keyword",regex:"#[A-Za-z0-9-_.]+"},{token:"variable",regex:"\\.[A-Za-z0-9-_.]+"},{token:"constant",regex:"[A-Za-z0-9]+"}],cssdeclaration:[{token:"support.type",regex:"[-a-zA-Z]+",next:"cssvalue"},{token:"paren.rparen",regex:"}",next:"css"}],cssvalue:[{token:"text",regex:":"},{token:"constant",regex:"#[0-9a-zA-Z]+"},{token:"text",regex:"[-_0-9a-zA-Z\"' ,%]+"},{token:"text",regex:";",next:"cssdeclaration"}]},this.embedRules(f,"doc-",[(new f).getEndRule("start")])};d.inherits(h,g),b.PhpHighlightRules=h}),define("ace/mode/doc_comment_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text_highlight_rules").TextHighlightRules,f=function(){this.$rules={start:[{token:"comment.doc.tag",regex:"@[\\w\\d_]+"},{token:"comment.doc",merge:!0,regex:"\\s+"},{token:"comment.doc",merge:!0,regex:"TODO"},{token:"comment.doc",merge:!0,regex:"[^@\\*]+"},{token:"comment.doc",merge:!0,regex:"."}]}};d.inherits(f,e),function(){this.getStartRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\/\\*(?=\\*)",next:a}},this.getEndRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\*\\/",next:a}}}.call(f.prototype),b.DocCommentHighlightRules=f}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../range").Range,e=function(){};(function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}}).call(e.prototype),b.MatchingBraceOutdent=e}),define("ace/mode/behaviour/cstyle",["require","exports","module","ace/lib/oop","ace/mode/behaviour"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../behaviour").Behaviour,f=function(){this.add("braces","insertion",function(a,b,c,d,e){if(e=="{"){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"{"+g+"}",selection:!1}:{text:"{}",selection:[1,1]}}if(e=="}"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var k=d.$findOpeningBracket("}",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}else if(e=="\n"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var l=d.findMatchingBracket({row:h.row,column:h.column+1});if(!l)return null;var m=this.getNextLineIndent(a,i.substring(0,i.length-1),d.getTabString()),n=this.$getIndent(d.doc.getLine(l.row));return{text:"\n"+m+"\n"+n,selection:[1,m.length,1,m.length]}}}}),this.add("braces","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="{"){var g=d.doc.getLine(e.start.row),h=g.substring(e.end.column,e.end.column+1);if(h=="}")return e.end.column++,e}}),this.add("parens","insertion",function(a,b,c,d,e){if(e=="("){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"("+g+")",selection:!1}:{text:"()",selection:[1,1]}}if(e==")"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j==")"){var k=d.$findOpeningBracket(")",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}}),this.add("parens","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="("){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h==")")return e.end.column++,e}}),this.add("string_dquotes","insertion",function(a,b,c,d,e){if(e=='"'||e=="'"){var f=e,g=c.getSelectionRange(),h=d.doc.getTextRange(g);if(h!=="")return{text:f+h+f,selection:!1};var i=c.getCursorPosition(),j=d.doc.getLine(i.row),k=j.substring(i.column-1,i.column);if(k=="\\")return null;var l=d.getTokens(g.start.row,g.start.row)[0].tokens,m=0,n,o=-1;for(var p=0;p<l.length;p++){n=l[p],n.type=="string"?o=-1:o<0&&(o=n.value.indexOf(f));if(n.value.length+m>g.start.column)break;m+=l[p].value.length}if(!n||o<0&&n.type!=="comment"&&(n.type!=="string"||g.start.column!==n.value.length+m-1&&n.value.lastIndexOf(f)===n.value.length-1))return{text:f+f,selection:[1,1]};if(n&&n.type==="string"){var q=j.substring(i.column,i.column+1);if(q==f)return{text:"",selection:[1,1]}}}}),this.add("string_dquotes","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&(f=='"'||f=="'")){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h=='"')return e.end.column++,e}})};d.inherits(f,e),b.CstyleBehaviour=f}),define("ace/mode/folding/cstyle",["require","exports","module","ace/lib/oop","ace/range","ace/mode/folding/fold_mode"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../../range").Range,f=a("./fold_mode").FoldMode,g=b.FoldMode=function(){};d.inherits(g,f),function(){this.foldingStartMarker=/(\{|\[)[^\}\]]*$|^\s*(\/\*)/,this.foldingStopMarker=/^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/,this.getFoldWidgetRange=function(a,b,c){var d=a.getLine(c),f=d.match(this.foldingStartMarker);if(f){var g=f.index;if(f[1])return this.openingBracketBlock(a,f[1],c,g);var h=a.getCommentFoldRange(c,g+f[0].length);return h.end.column-=2,h}if(b!=="markbeginend")return;var f=d.match(this.foldingStopMarker);if(f){var g=f.index+f[0].length;if(f[2]){var h=a.getCommentFoldRange(c,g);return h.end.column-=2,h}var i={row:c,column:g},j=a.$findOpeningBracket(f[1],i);if(!j)return;return j.column++,i.column--,e.fromPoints(j,i)}}}.call(g.prototype)}),define("ace/mode/folding/fold_mode",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../../range").Range,e=b.FoldMode=function(){};(function(){this.foldingStartMarker=null,this.foldingStopMarker=null,this.getFoldWidget=function(a,b,c){var d=a.getLine(c);return this.foldingStartMarker.test(d)?"start":b=="markbeginend"&&this.foldingStopMarker&&this.foldingStopMarker.test(d)?"end":""},this.getFoldWidgetRange=function(a,b,c){return null},this.indentationBlock=function(a,b,c){var e=/^\s*/,f=b,g=b,h=a.getLine(b),i=c||h.length,j=h.match(e)[0].length,k=a.getLength();while(++b<k){h=a.getLine(b);var l=h.match(e)[0].length;if(l==h.length)continue;if(l<=j)break;g=b}if(g>f){var m=a.getLine(g).length;return new d(f,i,g,m)}},this.openingBracketBlock=function(a,b,c,e){var f={row:c,column:e+1},g=a.$findClosingBracket(b,f);if(!g)return;var h=a.foldWidgets[g.row];return h==null&&(h=this.getFoldWidget(a,g.row)),h=="start"&&(g.row--,g.column=a.getLine(g.row).length),d.fromPoints(f,g)}}).call(e.prototype)})
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-powershell-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-powershell-uncompressed.js
deleted file mode 100644
index e6f9deea01..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-powershell-uncompressed.js
+++ /dev/null
@@ -1,708 +0,0 @@
-define('ace/mode/powershell', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/powershell_highlight_rules', 'ace/mode/matching_brace_outdent', 'ace/mode/behaviour/cstyle', 'ace/mode/folding/cstyle'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
-var PowershellHighlightRules = require("./powershell_highlight_rules").PowershellHighlightRules;
-var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
-var CstyleBehaviour = require("./behaviour/cstyle").CstyleBehaviour;
-var CStyleFoldMode = require("./folding/cstyle").FoldMode;
-
-var Mode = function() {
-    this.$tokenizer = new Tokenizer(new PowershellHighlightRules().getRules());
-    this.$outdent = new MatchingBraceOutdent();
-    this.$behaviour = new CstyleBehaviour();
-    this.foldingRules = new CStyleFoldMode();
-};
-oop.inherits(Mode, TextMode);
-
-(function() {
-
-    this.getNextLineIndent = function(state, line, tab) {
-        var indent = this.$getIndent(line);
-
-        var tokenizedLine = this.$tokenizer.getLineTokens(line, state);
-        var tokens = tokenizedLine.tokens;
-
-        if (tokens.length && tokens[tokens.length-1].type == "comment") {
-            return indent;
-        }
-      
-        if (state == "start") {
-            var match = line.match(/^.*[\{\(\[]\s*$/);
-            if (match) {
-                indent += tab;
-            }
-        }
-
-        return indent;
-    };
-
-    this.checkOutdent = function(state, line, input) {
-        return this.$outdent.checkOutdent(line, input);
-    };
-
-    this.autoOutdent = function(state, doc, row) {
-        this.$outdent.autoOutdent(doc, row);
-    };
-
-
-    this.createWorker = function(session) {
-        return null;
-    };
-
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-});
-define('ace/mode/powershell_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var lang = require("../lib/lang");
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var PowershellHighlightRules = function() {
-    
-    var keywords = lang.arrayToMap(
-      ("function|if|else|elseif|switch|while|default|for|do|until|break|continue|" + 
-       "foreach|return|filter|in|trap|throw|param|begin|process|end").split("|")
-    );
-
-    var builtinFunctions = lang.arrayToMap(
-      ("Get-Alias|Import-Alias|New-Alias|Set-Alias|Get-AuthenticodeSignature|Set-AuthenticodeSignature|" +
-       "Set-Location|Get-ChildItem|Clear-Item|Get-Command|Measure-Command|Trace-Command|" +
-       "Add-Computer|Checkpoint-Computer|Remove-Computer|Restart-Computer|Restore-Computer|Stop-Computer|" +
-       "Reset-ComputerMachinePassword|Test-ComputerSecureChannel|Add-Content|Get-Content|Set-Content|Clear-Content|" +
-       "Get-Command|Invoke-Command|Enable-ComputerRestore|Disable-ComputerRestore|Get-ComputerRestorePoint|Test-Connection|" +
-       "ConvertFrom-CSV|ConvertTo-CSV|ConvertTo-Html|ConvertTo-Xml|ConvertFrom-SecureString|ConvertTo-SecureString|" +
-       "Copy-Item|Export-Counter|Get-Counter|Import-Counter|Get-Credential|Get-Culture|" +
-       "Get-ChildItem|Get-Date|Set-Date|Remove-Item|Compare-Object|Get-Event|" +
-       "Get-WinEvent|New-Event|Remove-Event|Unregister-Event|Wait-Event|Clear-EventLog|" +
-       "Get-Eventlog|Limit-EventLog|New-Eventlog|Remove-EventLog|Show-EventLog|Write-EventLog|" +
-       "Get-EventSubscriber|Register-EngineEvent|Register-ObjectEvent|Register-WmiEvent|Get-ExecutionPolicy|Set-ExecutionPolicy|" +
-       "Export-Alias|Export-Clixml|Export-Console|Export-Csv|ForEach-Object|Format-Custom|" +
-       "Format-List|Format-Table|Format-Wide|Export-FormatData|Get-FormatData|Get-Item|" +
-       "Get-ChildItem|Get-Help|Add-History|Clear-History|Get-History|Invoke-History|" +
-       "Get-Host|Read-Host|Write-Host|Get-HotFix|Import-Clixml|Import-Csv|" +
-       "Invoke-Command|Invoke-Expression|Get-Item|Invoke-Item|New-Item|Remove-Item|" +
-       "Set-Item|Clear-ItemProperty|Copy-ItemProperty|Get-ItemProperty|Move-ItemProperty|New-ItemProperty|" +
-       "Remove-ItemProperty|Rename-ItemProperty|Set-ItemProperty|Get-Job|Receive-Job|Remove-Job|" +
-       "Start-Job|Stop-Job|Wait-Job|Stop-Process|Update-List|Get-Location|" +
-       "Pop-Location|Push-Location|Set-Location|Send-MailMessage|Add-Member|Get-Member|" +
-       "Move-Item|Compare-Object|Group-Object|Measure-Object|New-Object|Select-Object|" +
-       "Sort-Object|Where-Object|Out-Default|Out-File|Out-GridView|Out-Host|" +
-       "Out-Null|Out-Printer|Out-String|Convert-Path|Join-Path|Resolve-Path|" +
-       "Split-Path|Test-Path|Get-Pfxcertificate|Pop-Location|Push-Location|Get-Process|" +
-       "Start-Process|Stop-Process|Wait-Process|Enable-PSBreakpoint|Disable-PSBreakpoint|Get-PSBreakpoint|" +
-       "Set-PSBreakpoint|Remove-PSBreakpoint|Get-PSDrive|New-PSDrive|Remove-PSDrive|Get-PSProvider|" +
-       "Set-PSdebug|Enter-PSSession|Exit-PSSession|Export-PSSession|Get-PSSession|Import-PSSession|" +
-       "New-PSSession|Remove-PSSession|Disable-PSSessionConfiguration|Enable-PSSessionConfiguration|Get-PSSessionConfiguration|Register-PSSessionConfiguration|" +
-       "Set-PSSessionConfiguration|Unregister-PSSessionConfiguration|New-PSSessionOption|Add-PsSnapIn|Get-PsSnapin|Remove-PSSnapin|" +
-       "Get-Random|Read-Host|Remove-Item|Rename-Item|Rename-ItemProperty|Select-Object|" +
-       "Select-XML|Send-MailMessage|Get-Service|New-Service|Restart-Service|Resume-Service|" +
-       "Set-Service|Start-Service|Stop-Service|Suspend-Service|Sort-Object|Start-Sleep|" +
-       "ConvertFrom-StringData|Select-String|Tee-Object|New-Timespan|Trace-Command|Get-Tracesource|" +
-       "Set-Tracesource|Start-Transaction|Complete-Transaction|Get-Transaction|Use-Transaction|Undo-Transaction|" +
-       "Start-Transcript|Stop-Transcript|Add-Type|Update-TypeData|Get-Uiculture|Get-Unique|" +
-       "Update-Formatdata|Update-Typedata|Clear-Variable|Get-Variable|New-Variable|Remove-Variable|" +
-       "Set-Variable|New-WebServiceProxy|Where-Object|Write-Debug|Write-Error|Write-Host|" +
-       "Write-Output|Write-Progress|Write-Verbose|Write-Warning|Set-WmiInstance|Invoke-WmiMethod|" +
-       "Get-WmiObject|Remove-WmiObject|Connect-WSMan|Disconnect-WSMan|Test-WSMan|Invoke-WSManAction|" +
-       "Disable-WSManCredSSP|Enable-WSManCredSSP|Get-WSManCredSSP|New-WSManInstance|Get-WSManInstance|Set-WSManInstance|" +
-       "Remove-WSManInstance|Set-WSManQuickConfig|New-WSManSessionOption").split("|"));
-
-    var binaryOperatorsRe = "eq|ne|ge|gt|lt|le|like|notlike|match|notmatch|replace|contains|notcontains|" +
-                            "ieq|ine|ige|igt|ile|ilt|ilike|inotlike|imatch|inotmatch|ireplace|icontains|inotcontains|" +
-                            "is|isnot|as|" +
-                            "and|or|band|bor|not"; 
-
-    // regexp must not have capturing parentheses. Use (?:) instead.
-    // regexps are ordered -> the first match is used
-
-    this.$rules = {
-        "start" : [
-            {
-                token : "comment",
-                regex : "#.*$"
-            }, {
-                token : "string", // single line
-                regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
-            }, {
-                token : "string", // single line
-                regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"
-            }, {
-                token : "constant.numeric", // hex
-                regex : "0[xX][0-9a-fA-F]+\\b"
-            }, {
-                token : "constant.numeric", // float
-                regex : "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"
-            }, {
-                token : "constant.language.boolean",
-                regex : "[$](?:[Tt]rue|[Ff]alse)\\b"
-            }, {
-                token : "constant.language",
-                regex : "[$][Nn]ull\\b"
-            }, {
-                token : "variable.instance",
-                regex : "[$][a-zA-Z][a-zA-Z0-9_]*\\b"
-            }, {
-                token : function(value) {
-                    if (keywords.hasOwnProperty(value))
-                        return "keyword";
-                    else if (builtinFunctions.hasOwnProperty(value))
-                        return "support.function";
-                    else
-                        return "identifier";
-                },
-                // TODO: Unicode escape sequences
-                // TODO: Unicode identifiers
-                regex : "[a-zA-Z_$][a-zA-Z0-9_$\\-]*\\b"
-            }, {
-                token : "keyword.operator",
-                regex : "\\-(?:" + binaryOperatorsRe + ")"
-            }, {
-                token : "keyword.operator",
-                regex : "&|\\*|\\+|\\-|\\=|\\+=|\\-="
-            }, {
-                token : "lparen",
-                regex : "[[({]"
-            }, {
-                token : "rparen",
-                regex : "[\\])}]"
-            }, {
-                token : "text",
-                regex : "\\s+"
-            }
-        ],
-        "comment" : [
-            {
-                token : "comment", // closing comment
-                regex : ".*?\\*\\/",
-                next : "start"
-            }, {
-                token : "comment", // comment spanning whole line
-                merge : true,
-                regex : ".+"
-            }
-        ]
-    };
-};
-
-oop.inherits(PowershellHighlightRules, TextHighlightRules);
-
-exports.PowershellHighlightRules = PowershellHighlightRules;
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/matching_brace_outdent', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../range").Range;
-
-var MatchingBraceOutdent = function() {};
-
-(function() {
-
-    this.checkOutdent = function(line, input) {
-        if (! /^\s+$/.test(line))
-            return false;
-
-        return /^\s*\}/.test(input);
-    };
-
-    this.autoOutdent = function(doc, row) {
-        var line = doc.getLine(row);
-        var match = line.match(/^(\s*\})/);
-
-        if (!match) return 0;
-
-        var column = match[1].length;
-        var openBracePos = doc.findMatchingBracket({row: row, column: column});
-
-        if (!openBracePos || openBracePos.row == row) return 0;
-
-        var indent = this.$getIndent(doc.getLine(openBracePos.row));
-        doc.replace(new Range(row, 0, row, column-1), indent);
-    };
-
-    this.$getIndent = function(line) {
-        var match = line.match(/^(\s+)/);
-        if (match) {
-            return match[1];
-        }
-
-        return "";
-    };
-
-}).call(MatchingBraceOutdent.prototype);
-
-exports.MatchingBraceOutdent = MatchingBraceOutdent;
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Chris Spencer <chris.ag.spencer AT googlemail DOT com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/behaviour/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/behaviour'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var Behaviour = require('../behaviour').Behaviour;
-
-var CstyleBehaviour = function () {
-
-    this.add("braces", "insertion", function (state, action, editor, session, text) {
-        if (text == '{') {
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: '{' + selected + '}',
-                    selection: false
-                };
-            } else {
-                return {
-                    text: '{}',
-                    selection: [1, 1]
-                };
-            }
-        } else if (text == '}') {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == '}') {
-                var matching = session.$findOpeningBracket('}', {column: cursor.column + 1, row: cursor.row});
-                if (matching !== null) {
-                    return {
-                        text: '',
-                        selection: [1, 1]
-                    };
-                }
-            }
-        } else if (text == "\n") {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == '}') {
-                var openBracePos = session.findMatchingBracket({row: cursor.row, column: cursor.column + 1});
-                if (!openBracePos)
-                     return null;
-
-                var indent = this.getNextLineIndent(state, line.substring(0, line.length - 1), session.getTabString());
-                var next_indent = this.$getIndent(session.doc.getLine(openBracePos.row));
-
-                return {
-                    text: '\n' + indent + '\n' + next_indent,
-                    selection: [1, indent.length, 1, indent.length]
-                };
-            }
-        }
-    });
-
-    this.add("braces", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && selected == '{') {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.end.column, range.end.column + 1);
-            if (rightChar == '}') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-    this.add("parens", "insertion", function (state, action, editor, session, text) {
-        if (text == '(') {
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: '(' + selected + ')',
-                    selection: false
-                };
-            } else {
-                return {
-                    text: '()',
-                    selection: [1, 1]
-                };
-            }
-        } else if (text == ')') {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == ')') {
-                var matching = session.$findOpeningBracket(')', {column: cursor.column + 1, row: cursor.row});
-                if (matching !== null) {
-                    return {
-                        text: '',
-                        selection: [1, 1]
-                    };
-                }
-            }
-        }
-    });
-
-    this.add("parens", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && selected == '(') {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
-            if (rightChar == ')') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-    this.add("string_dquotes", "insertion", function (state, action, editor, session, text) {
-        if (text == '"' || text == "'") {
-            var quote = text;
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: quote + selected + quote,
-                    selection: false
-                };
-            } else {
-                var cursor = editor.getCursorPosition();
-                var line = session.doc.getLine(cursor.row);
-                var leftChar = line.substring(cursor.column-1, cursor.column);
-
-                // We're escaped.
-                if (leftChar == '\\') {
-                    return null;
-                }
-
-                // Find what token we're inside.
-                var tokens = session.getTokens(selection.start.row, selection.start.row)[0].tokens;
-                var col = 0, token;
-                var quotepos = -1; // Track whether we're inside an open quote.
-
-                for (var x = 0; x < tokens.length; x++) {
-                    token = tokens[x];
-                    if (token.type == "string") {
-                      quotepos = -1;
-                    } else if (quotepos < 0) {
-                      quotepos = token.value.indexOf(quote);
-                    }
-                    if ((token.value.length + col) > selection.start.column) {
-                        break;
-                    }
-                    col += tokens[x].value.length;
-                }
-
-                // Try and be smart about when we auto insert.
-                if (!token || (quotepos < 0 && token.type !== "comment" && (token.type !== "string" || ((selection.start.column !== token.value.length+col-1) && token.value.lastIndexOf(quote) === token.value.length-1)))) {
-                    return {
-                        text: quote + quote,
-                        selection: [1,1]
-                    };
-                } else if (token && token.type === "string") {
-                    // Ignore input and move right one if we're typing over the closing quote.
-                    var rightChar = line.substring(cursor.column, cursor.column + 1);
-                    if (rightChar == quote) {
-                        return {
-                            text: '',
-                            selection: [1, 1]
-                        };
-                    }
-                }
-            }
-        }
-    });
-
-    this.add("string_dquotes", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && (selected == '"' || selected == "'")) {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
-            if (rightChar == '"') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-};
-
-oop.inherits(CstyleBehaviour, Behaviour);
-
-exports.CstyleBehaviour = CstyleBehaviour;
-});/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/folding/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/range', 'ace/mode/folding/fold_mode'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var Range = require("../../range").Range;
-var BaseFoldMode = require("./fold_mode").FoldMode;
-
-var FoldMode = exports.FoldMode = function() {};
-oop.inherits(FoldMode, BaseFoldMode);
-
-(function() {
-
-    this.foldingStartMarker = /(\{|\[)[^\}\]]*$|^\s*(\/\*)/;
-    this.foldingStopMarker = /^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/;
-    
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        var line = session.getLine(row);
-        var match = line.match(this.foldingStartMarker);
-        if (match) {
-            var i = match.index;
-
-            if (match[1])
-                return this.openingBracketBlock(session, match[1], row, i);
-
-            var range = session.getCommentFoldRange(row, i + match[0].length);
-            range.end.column -= 2;
-            return range;
-        }
-
-        if (foldStyle !== "markbeginend")
-            return;
-            
-        var match = line.match(this.foldingStopMarker);
-        if (match) {
-            var i = match.index + match[0].length;
-
-            if (match[2]) {
-                var range = session.getCommentFoldRange(row, i);
-                range.end.column -= 2;
-                return range;
-            }
-
-            var end = {row: row, column: i};
-            var start = session.$findOpeningBracket(match[1], end);
-            
-            if (!start)
-                return;
-
-            start.column++;
-            end.column--;
-
-            return  Range.fromPoints(start, end);
-        }
-    };
-    
-}).call(FoldMode.prototype);
-
-});/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/folding/fold_mode', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../../range").Range;
-
-var FoldMode = exports.FoldMode = function() {};
-
-(function() {
-
-    this.foldingStartMarker = null;
-    this.foldingStopMarker = null;
-
-    // must return "" if there's no fold, to enable caching
-    this.getFoldWidget = function(session, foldStyle, row) {
-        var line = session.getLine(row);
-        if (this.foldingStartMarker.test(line))
-            return "start";
-        if (foldStyle == "markbeginend"
-                && this.foldingStopMarker
-                && this.foldingStopMarker.test(line))
-            return "end";
-        return "";
-    };
-    
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        return null;
-    };
-
-    this.indentationBlock = function(session, row, column) {
-        var re = /^\s*/;
-        var startRow = row;
-        var endRow = row;
-        var line = session.getLine(row);
-        var startColumn = column || line.length;
-        var startLevel = line.match(re)[0].length;
-        var maxRow = session.getLength()
-        
-        while (++row < maxRow) {
-            line = session.getLine(row);
-            var level = line.match(re)[0].length;
-
-            if (level == line.length)
-                continue;
-
-            if (level <= startLevel)
-                break;
-
-            endRow = row;
-        }
-
-        if (endRow > startRow) {
-            var endColumn = session.getLine(endRow).length;
-            return new Range(startRow, startColumn, endRow, endColumn);
-        }
-    };
-
-    this.openingBracketBlock = function(session, bracket, row, column) {
-        var start = {row: row, column: column + 1};
-        var end = session.$findClosingBracket(bracket, start);
-        if (!end)
-            return;
-
-        var fw = session.foldWidgets[end.row];
-        if (fw == null)
-            fw = this.getFoldWidget(session, end.row);
-
-        if (fw == "start") {
-            end.row --;
-            end.column = session.getLine(end.row).length;
-        }
-        return Range.fromPoints(start, end);
-    };
-
-}).call(FoldMode.prototype);
-
-});
diff --git a/apps/files_texteditor/js/aceeditor/mode-powershell.js b/apps/files_texteditor/js/aceeditor/mode-powershell.js
deleted file mode 100644
index 6ebaeae520..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-powershell.js
+++ /dev/null
@@ -1 +0,0 @@
-define("ace/mode/powershell",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/powershell_highlight_rules","ace/mode/matching_brace_outdent","ace/mode/behaviour/cstyle","ace/mode/folding/cstyle"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./powershell_highlight_rules").PowershellHighlightRules,h=a("./matching_brace_outdent").MatchingBraceOutdent,i=a("./behaviour/cstyle").CstyleBehaviour,j=a("./folding/cstyle").FoldMode,k=function(){this.$tokenizer=new f((new g).getRules()),this.$outdent=new h,this.$behaviour=new i,this.foldingRules=new j};d.inherits(k,e),function(){this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a),f=e.tokens;if(f.length&&f[f.length-1].type=="comment")return d;if(a=="start"){var g=b.match(/^.*[\{\(\[]\s*$/);g&&(d+=c)}return d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)},this.createWorker=function(a){return null}}.call(k.prototype),b.Mode=k}),define("ace/mode/powershell_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("./text_highlight_rules").TextHighlightRules,g=function(){var a=e.arrayToMap("function|if|else|elseif|switch|while|default|for|do|until|break|continue|foreach|return|filter|in|trap|throw|param|begin|process|end".split("|")),b=e.arrayToMap("Get-Alias|Import-Alias|New-Alias|Set-Alias|Get-AuthenticodeSignature|Set-AuthenticodeSignature|Set-Location|Get-ChildItem|Clear-Item|Get-Command|Measure-Command|Trace-Command|Add-Computer|Checkpoint-Computer|Remove-Computer|Restart-Computer|Restore-Computer|Stop-Computer|Reset-ComputerMachinePassword|Test-ComputerSecureChannel|Add-Content|Get-Content|Set-Content|Clear-Content|Get-Command|Invoke-Command|Enable-ComputerRestore|Disable-ComputerRestore|Get-ComputerRestorePoint|Test-Connection|ConvertFrom-CSV|ConvertTo-CSV|ConvertTo-Html|ConvertTo-Xml|ConvertFrom-SecureString|ConvertTo-SecureString|Copy-Item|Export-Counter|Get-Counter|Import-Counter|Get-Credential|Get-Culture|Get-ChildItem|Get-Date|Set-Date|Remove-Item|Compare-Object|Get-Event|Get-WinEvent|New-Event|Remove-Event|Unregister-Event|Wait-Event|Clear-EventLog|Get-Eventlog|Limit-EventLog|New-Eventlog|Remove-EventLog|Show-EventLog|Write-EventLog|Get-EventSubscriber|Register-EngineEvent|Register-ObjectEvent|Register-WmiEvent|Get-ExecutionPolicy|Set-ExecutionPolicy|Export-Alias|Export-Clixml|Export-Console|Export-Csv|ForEach-Object|Format-Custom|Format-List|Format-Table|Format-Wide|Export-FormatData|Get-FormatData|Get-Item|Get-ChildItem|Get-Help|Add-History|Clear-History|Get-History|Invoke-History|Get-Host|Read-Host|Write-Host|Get-HotFix|Import-Clixml|Import-Csv|Invoke-Command|Invoke-Expression|Get-Item|Invoke-Item|New-Item|Remove-Item|Set-Item|Clear-ItemProperty|Copy-ItemProperty|Get-ItemProperty|Move-ItemProperty|New-ItemProperty|Remove-ItemProperty|Rename-ItemProperty|Set-ItemProperty|Get-Job|Receive-Job|Remove-Job|Start-Job|Stop-Job|Wait-Job|Stop-Process|Update-List|Get-Location|Pop-Location|Push-Location|Set-Location|Send-MailMessage|Add-Member|Get-Member|Move-Item|Compare-Object|Group-Object|Measure-Object|New-Object|Select-Object|Sort-Object|Where-Object|Out-Default|Out-File|Out-GridView|Out-Host|Out-Null|Out-Printer|Out-String|Convert-Path|Join-Path|Resolve-Path|Split-Path|Test-Path|Get-Pfxcertificate|Pop-Location|Push-Location|Get-Process|Start-Process|Stop-Process|Wait-Process|Enable-PSBreakpoint|Disable-PSBreakpoint|Get-PSBreakpoint|Set-PSBreakpoint|Remove-PSBreakpoint|Get-PSDrive|New-PSDrive|Remove-PSDrive|Get-PSProvider|Set-PSdebug|Enter-PSSession|Exit-PSSession|Export-PSSession|Get-PSSession|Import-PSSession|New-PSSession|Remove-PSSession|Disable-PSSessionConfiguration|Enable-PSSessionConfiguration|Get-PSSessionConfiguration|Register-PSSessionConfiguration|Set-PSSessionConfiguration|Unregister-PSSessionConfiguration|New-PSSessionOption|Add-PsSnapIn|Get-PsSnapin|Remove-PSSnapin|Get-Random|Read-Host|Remove-Item|Rename-Item|Rename-ItemProperty|Select-Object|Select-XML|Send-MailMessage|Get-Service|New-Service|Restart-Service|Resume-Service|Set-Service|Start-Service|Stop-Service|Suspend-Service|Sort-Object|Start-Sleep|ConvertFrom-StringData|Select-String|Tee-Object|New-Timespan|Trace-Command|Get-Tracesource|Set-Tracesource|Start-Transaction|Complete-Transaction|Get-Transaction|Use-Transaction|Undo-Transaction|Start-Transcript|Stop-Transcript|Add-Type|Update-TypeData|Get-Uiculture|Get-Unique|Update-Formatdata|Update-Typedata|Clear-Variable|Get-Variable|New-Variable|Remove-Variable|Set-Variable|New-WebServiceProxy|Where-Object|Write-Debug|Write-Error|Write-Host|Write-Output|Write-Progress|Write-Verbose|Write-Warning|Set-WmiInstance|Invoke-WmiMethod|Get-WmiObject|Remove-WmiObject|Connect-WSMan|Disconnect-WSMan|Test-WSMan|Invoke-WSManAction|Disable-WSManCredSSP|Enable-WSManCredSSP|Get-WSManCredSSP|New-WSManInstance|Get-WSManInstance|Set-WSManInstance|Remove-WSManInstance|Set-WSManQuickConfig|New-WSManSessionOption".split("|")),c="eq|ne|ge|gt|lt|le|like|notlike|match|notmatch|replace|contains|notcontains|ieq|ine|ige|igt|ile|ilt|ilike|inotlike|imatch|inotmatch|ireplace|icontains|inotcontains|is|isnot|as|and|or|band|bor|not";this.$rules={start:[{token:"comment",regex:"#.*$"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:"constant.numeric",regex:"0[xX][0-9a-fA-F]+\\b"},{token:"constant.numeric",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:"constant.language.boolean",regex:"[$](?:[Tt]rue|[Ff]alse)\\b"},{token:"constant.language",regex:"[$][Nn]ull\\b"},{token:"variable.instance",regex:"[$][a-zA-Z][a-zA-Z0-9_]*\\b"},{token:function(c){return a.hasOwnProperty(c)?"keyword":b.hasOwnProperty(c)?"support.function":"identifier"},regex:"[a-zA-Z_$][a-zA-Z0-9_$\\-]*\\b"},{token:"keyword.operator",regex:"\\-(?:"+c+")"},{token:"keyword.operator",regex:"&|\\*|\\+|\\-|\\=|\\+=|\\-="},{token:"lparen",regex:"[[({]"},{token:"rparen",regex:"[\\])}]"},{token:"text",regex:"\\s+"}],comment:[{token:"comment",regex:".*?\\*\\/",next:"start"},{token:"comment",merge:!0,regex:".+"}]}};d.inherits(g,f),b.PowershellHighlightRules=g}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../range").Range,e=function(){};(function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}}).call(e.prototype),b.MatchingBraceOutdent=e}),define("ace/mode/behaviour/cstyle",["require","exports","module","ace/lib/oop","ace/mode/behaviour"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../behaviour").Behaviour,f=function(){this.add("braces","insertion",function(a,b,c,d,e){if(e=="{"){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"{"+g+"}",selection:!1}:{text:"{}",selection:[1,1]}}if(e=="}"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var k=d.$findOpeningBracket("}",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}else if(e=="\n"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var l=d.findMatchingBracket({row:h.row,column:h.column+1});if(!l)return null;var m=this.getNextLineIndent(a,i.substring(0,i.length-1),d.getTabString()),n=this.$getIndent(d.doc.getLine(l.row));return{text:"\n"+m+"\n"+n,selection:[1,m.length,1,m.length]}}}}),this.add("braces","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="{"){var g=d.doc.getLine(e.start.row),h=g.substring(e.end.column,e.end.column+1);if(h=="}")return e.end.column++,e}}),this.add("parens","insertion",function(a,b,c,d,e){if(e=="("){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"("+g+")",selection:!1}:{text:"()",selection:[1,1]}}if(e==")"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j==")"){var k=d.$findOpeningBracket(")",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}}),this.add("parens","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="("){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h==")")return e.end.column++,e}}),this.add("string_dquotes","insertion",function(a,b,c,d,e){if(e=='"'||e=="'"){var f=e,g=c.getSelectionRange(),h=d.doc.getTextRange(g);if(h!=="")return{text:f+h+f,selection:!1};var i=c.getCursorPosition(),j=d.doc.getLine(i.row),k=j.substring(i.column-1,i.column);if(k=="\\")return null;var l=d.getTokens(g.start.row,g.start.row)[0].tokens,m=0,n,o=-1;for(var p=0;p<l.length;p++){n=l[p],n.type=="string"?o=-1:o<0&&(o=n.value.indexOf(f));if(n.value.length+m>g.start.column)break;m+=l[p].value.length}if(!n||o<0&&n.type!=="comment"&&(n.type!=="string"||g.start.column!==n.value.length+m-1&&n.value.lastIndexOf(f)===n.value.length-1))return{text:f+f,selection:[1,1]};if(n&&n.type==="string"){var q=j.substring(i.column,i.column+1);if(q==f)return{text:"",selection:[1,1]}}}}),this.add("string_dquotes","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&(f=='"'||f=="'")){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h=='"')return e.end.column++,e}})};d.inherits(f,e),b.CstyleBehaviour=f}),define("ace/mode/folding/cstyle",["require","exports","module","ace/lib/oop","ace/range","ace/mode/folding/fold_mode"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../../range").Range,f=a("./fold_mode").FoldMode,g=b.FoldMode=function(){};d.inherits(g,f),function(){this.foldingStartMarker=/(\{|\[)[^\}\]]*$|^\s*(\/\*)/,this.foldingStopMarker=/^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/,this.getFoldWidgetRange=function(a,b,c){var d=a.getLine(c),f=d.match(this.foldingStartMarker);if(f){var g=f.index;if(f[1])return this.openingBracketBlock(a,f[1],c,g);var h=a.getCommentFoldRange(c,g+f[0].length);return h.end.column-=2,h}if(b!=="markbeginend")return;var f=d.match(this.foldingStopMarker);if(f){var g=f.index+f[0].length;if(f[2]){var h=a.getCommentFoldRange(c,g);return h.end.column-=2,h}var i={row:c,column:g},j=a.$findOpeningBracket(f[1],i);if(!j)return;return j.column++,i.column--,e.fromPoints(j,i)}}}.call(g.prototype)}),define("ace/mode/folding/fold_mode",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../../range").Range,e=b.FoldMode=function(){};(function(){this.foldingStartMarker=null,this.foldingStopMarker=null,this.getFoldWidget=function(a,b,c){var d=a.getLine(c);return this.foldingStartMarker.test(d)?"start":b=="markbeginend"&&this.foldingStopMarker&&this.foldingStopMarker.test(d)?"end":""},this.getFoldWidgetRange=function(a,b,c){return null},this.indentationBlock=function(a,b,c){var e=/^\s*/,f=b,g=b,h=a.getLine(b),i=c||h.length,j=h.match(e)[0].length,k=a.getLength();while(++b<k){h=a.getLine(b);var l=h.match(e)[0].length;if(l==h.length)continue;if(l<=j)break;g=b}if(g>f){var m=a.getLine(g).length;return new d(f,i,g,m)}},this.openingBracketBlock=function(a,b,c,e){var f={row:c,column:e+1},g=a.$findClosingBracket(b,f);if(!g)return;var h=a.foldWidgets[g.row];return h==null&&(h=this.getFoldWidget(a,g.row)),h=="start"&&(g.row--,g.column=a.getLine(g.row).length),d.fromPoints(f,g)}}).call(e.prototype)})
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-python-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-python-uncompressed.js
deleted file mode 100644
index 9a12decebd..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-python-uncompressed.js
+++ /dev/null
@@ -1,506 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
-* Version: MPL 1.1/GPL 2.0/LGPL 2.1
-*
-* The contents of this file are subject to the Mozilla Public License Version
-* 1.1 (the "License"); you may not use this file except in compliance with
-* the License. You may obtain a copy of the License at
-* http://www.mozilla.org/MPL/
-*
-* Software distributed under the License is distributed on an "AS IS" basis,
-* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-* for the specific language governing rights and limitations under the
-* License.
-*
-* The Original Code is Ajax.org Code Editor (ACE).
-*
-* The Initial Developer of the Original Code is
-* Ajax.org B.V.
-* Portions created by the Initial Developer are Copyright (C) 2010
-* the Initial Developer. All Rights Reserved.
-*
-* Contributor(s):
-*      Fabian Jakobs <fabian AT ajax DOT org>
-*      Colin Gourlay <colin DOT j DOT gourlay AT gmail DOT com>
-*
-* Alternatively, the contents of this file may be used under the terms of
-* either the GNU General Public License Version 2 or later (the "GPL"), or
-* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-* in which case the provisions of the GPL or the LGPL are applicable instead
-* of those above. If you wish to allow use of your version of this file only
-* under the terms of either the GPL or the LGPL, and not to allow others to
-* use your version of this file under the terms of the MPL, indicate your
-* decision by deleting the provisions above and replace them with the notice
-* and other provisions required by the GPL or the LGPL. If you do not delete
-* the provisions above, a recipient may use your version of this file under
-* the terms of any one of the MPL, the GPL or the LGPL.
-*
-* ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/python', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/python_highlight_rules', 'ace/mode/folding/pythonic', 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
-var PythonHighlightRules = require("./python_highlight_rules").PythonHighlightRules;
-var PythonFoldMode = require("./folding/pythonic").FoldMode;
-var Range = require("../range").Range;
-
-var Mode = function() {
-    this.$tokenizer = new Tokenizer(new PythonHighlightRules().getRules());
-    this.foldingRules = new PythonFoldMode("\\:");
-};
-oop.inherits(Mode, TextMode);
-
-(function() {
-
-    this.toggleCommentLines = function(state, doc, startRow, endRow) {
-        var outdent = true;
-        var re = /^(\s*)#/;
-
-        for (var i=startRow; i<= endRow; i++) {
-            if (!re.test(doc.getLine(i))) {
-                outdent = false;
-                break;
-            }
-        }
-
-        if (outdent) {
-            var deleteRange = new Range(0, 0, 0, 0);
-            for (var i=startRow; i<= endRow; i++)
-            {
-                var line = doc.getLine(i);
-                var m = line.match(re);
-                deleteRange.start.row = i;
-                deleteRange.end.row = i;
-                deleteRange.end.column = m[0].length;
-                doc.replace(deleteRange, m[1]);
-            }
-        }
-        else {
-            doc.indentRows(startRow, endRow, "#");
-        }
-    };
-
-    this.getNextLineIndent = function(state, line, tab) {
-        var indent = this.$getIndent(line);
-
-        var tokenizedLine = this.$tokenizer.getLineTokens(line, state);
-        var tokens = tokenizedLine.tokens;
-
-        if (tokens.length && tokens[tokens.length-1].type == "comment") {
-            return indent;
-        }
-
-        if (state == "start") {
-            var match = line.match(/^.*[\{\(\[\:]\s*$/);
-            if (match) {
-                indent += tab;
-            }
-        }
-
-        return indent;
-    };
-
-    var outdents = {
-        "pass": 1,
-        "return": 1,
-        "raise": 1,
-        "break": 1,
-        "continue": 1
-    };
-    
-    this.checkOutdent = function(state, line, input) {
-        if (input !== "\r\n" && input !== "\r" && input !== "\n")
-            return false;
-
-        var tokens = this.$tokenizer.getLineTokens(line.trim(), state).tokens;
-        
-        if (!tokens)
-            return false;
-        
-        // ignore trailing comments
-        do {
-            var last = tokens.pop();
-        } while (last && (last.type == "comment" || (last.type == "text" && last.value.match(/^\s+$/))));
-        
-        if (!last)
-            return false;
-        
-        return (last.type == "keyword" && outdents[last.value]);
-    };
-
-    this.autoOutdent = function(state, doc, row) {
-        // outdenting in python is slightly different because it always applies
-        // to the next line and only of a new line is inserted
-        
-        row += 1;
-        var indent = this.$getIndent(doc.getLine(row));
-        var tab = doc.getTabString();
-        if (indent.slice(-tab.length) == tab)
-            doc.remove(new Range(row, indent.length-tab.length, row, indent.length));
-    };
-
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Colin Gourlay <colin DOT j DOT gourlay AT gmail DOT com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK *****
- *
- * TODO: python delimiters
- */
-
-define('ace/mode/python_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var lang = require("../lib/lang");
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var PythonHighlightRules = function() {
-
-    var keywords = lang.arrayToMap(
-        ("and|as|assert|break|class|continue|def|del|elif|else|except|exec|" +
-        "finally|for|from|global|if|import|in|is|lambda|not|or|pass|print|" +
-        "raise|return|try|while|with|yield").split("|")
-    );
-
-    var builtinConstants = lang.arrayToMap(
-        ("True|False|None|NotImplemented|Ellipsis|__debug__").split("|")
-    );
-
-    var builtinFunctions = lang.arrayToMap(
-        ("abs|divmod|input|open|staticmethod|all|enumerate|int|ord|str|any|" +
-        "eval|isinstance|pow|sum|basestring|execfile|issubclass|print|super|" +
-        "binfile|iter|property|tuple|bool|filter|len|range|type|bytearray|" +
-        "float|list|raw_input|unichr|callable|format|locals|reduce|unicode|" +
-        "chr|frozenset|long|reload|vars|classmethod|getattr|map|repr|xrange|" +
-        "cmp|globals|max|reversed|zip|compile|hasattr|memoryview|round|" +
-        "__import__|complex|hash|min|set|apply|delattr|help|next|setattr|" +
-        "buffer|dict|hex|object|slice|coerce|dir|id|oct|sorted|intern").split("|")
-    );
-
-    var futureReserved = lang.arrayToMap(
-        ("").split("|")
-    );
-
-    var strPre = "(?:r|u|ur|R|U|UR|Ur|uR)?";
-
-    var decimalInteger = "(?:(?:[1-9]\\d*)|(?:0))";
-    var octInteger = "(?:0[oO]?[0-7]+)";
-    var hexInteger = "(?:0[xX][\\dA-Fa-f]+)";
-    var binInteger = "(?:0[bB][01]+)";
-    var integer = "(?:" + decimalInteger + "|" + octInteger + "|" + hexInteger + "|" + binInteger + ")";
-
-    var exponent = "(?:[eE][+-]?\\d+)";
-    var fraction = "(?:\\.\\d+)";
-    var intPart = "(?:\\d+)";
-    var pointFloat = "(?:(?:" + intPart + "?" + fraction + ")|(?:" + intPart + "\\.))";
-    var exponentFloat = "(?:(?:" + pointFloat + "|" +  intPart + ")" + exponent + ")";
-    var floatNumber = "(?:" + exponentFloat + "|" + pointFloat + ")";
-
-    this.$rules = {
-        "start" : [ {
-            token : "comment",
-            regex : "#.*$"
-        }, {
-            token : "string",           // """ string
-            regex : strPre + '"{3}(?:[^\\\\]|\\\\.)*?"{3}'
-        }, {
-            token : "string",           // multi line """ string start
-            merge : true,
-            regex : strPre + '"{3}.*$',
-            next : "qqstring"
-        }, {
-            token : "string",           // " string
-            regex : strPre + '"(?:[^\\\\]|\\\\.)*?"'
-        }, {
-            token : "string",           // ''' string
-            regex : strPre + "'{3}(?:[^\\\\]|\\\\.)*?'{3}"
-        }, {
-            token : "string",           // multi line ''' string start
-            merge : true,
-            regex : strPre + "'{3}.*$",
-            next : "qstring"
-        }, {
-            token : "string",           // ' string
-            regex : strPre + "'(?:[^\\\\]|\\\\.)*?'"
-        }, {
-            token : "constant.numeric", // imaginary
-            regex : "(?:" + floatNumber + "|\\d+)[jJ]\\b"
-        }, {
-            token : "constant.numeric", // float
-            regex : floatNumber
-        }, {
-            token : "constant.numeric", // long integer
-            regex : integer + "[lL]\\b"
-        }, {
-            token : "constant.numeric", // integer
-            regex : integer + "\\b"
-        }, {
-            token : function(value) {
-                if (keywords.hasOwnProperty(value))
-                    return "keyword";
-                else if (builtinConstants.hasOwnProperty(value))
-                    return "constant.language";
-                else if (futureReserved.hasOwnProperty(value))
-                    return "invalid.illegal";
-                else if (builtinFunctions.hasOwnProperty(value))
-                    return "support.function";
-                else if (value == "debugger")
-                    return "invalid.deprecated";
-                else
-                    return "identifier";
-            },
-            regex : "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
-        }, {
-            token : "keyword.operator",
-            regex : "\\+|\\-|\\*|\\*\\*|\\/|\\/\\/|%|<<|>>|&|\\||\\^|~|<|>|<=|=>|==|!=|<>|="
-        }, {
-            token : "lparen.paren",
-            regex : "[\\[\\(\\{]"
-        }, {
-            token : "paren.rparen",
-            regex : "[\\]\\)\\}]"
-        }, {
-            token : "text",
-            regex : "\\s+"
-        } ],
-        "qqstring" : [ {
-            token : "string", // multi line """ string end
-            regex : '(?:[^\\\\]|\\\\.)*?"{3}',
-            next : "start"
-        }, {
-            token : "string",
-            merge : true,
-            regex : '.+'
-        } ],
-        "qstring" : [ {
-            token : "string",  // multi line ''' string end
-            regex : "(?:[^\\\\]|\\\\.)*?'{3}",
-            next : "start"
-        }, {
-            token : "string",
-            merge : true,
-            regex : '.+'
-        } ]
-    };
-};
-
-oop.inherits(PythonHighlightRules, TextHighlightRules);
-
-exports.PythonHighlightRules = PythonHighlightRules;
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/folding/pythonic', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/folding/fold_mode'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var BaseFoldMode = require("./fold_mode").FoldMode;
-
-var FoldMode = exports.FoldMode = function(markers) {
-    this.foldingStartMarker = new RegExp("(?:([\\[{])|(" + markers + "))(?:\\s*)(?:#.*)?$");
-};
-oop.inherits(FoldMode, BaseFoldMode);
-
-(function() {
-
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        var line = session.getLine(row);
-        var match = line.match(this.foldingStartMarker);
-        if (match) {
-            if (match[1])
-                return this.openingBracketBlock(session, match[1], row, match.index);
-            if (match[2])
-                return this.indentationBlock(session, row, match.index + match[2].length);
-            return this.indentationBlock(session, row);
-        }
-    }
-
-}).call(FoldMode.prototype);
-
-});/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/folding/fold_mode', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../../range").Range;
-
-var FoldMode = exports.FoldMode = function() {};
-
-(function() {
-
-    this.foldingStartMarker = null;
-    this.foldingStopMarker = null;
-
-    // must return "" if there's no fold, to enable caching
-    this.getFoldWidget = function(session, foldStyle, row) {
-        var line = session.getLine(row);
-        if (this.foldingStartMarker.test(line))
-            return "start";
-        if (foldStyle == "markbeginend"
-                && this.foldingStopMarker
-                && this.foldingStopMarker.test(line))
-            return "end";
-        return "";
-    };
-    
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        return null;
-    };
-
-    this.indentationBlock = function(session, row, column) {
-        var re = /^\s*/;
-        var startRow = row;
-        var endRow = row;
-        var line = session.getLine(row);
-        var startColumn = column || line.length;
-        var startLevel = line.match(re)[0].length;
-        var maxRow = session.getLength()
-        
-        while (++row < maxRow) {
-            line = session.getLine(row);
-            var level = line.match(re)[0].length;
-
-            if (level == line.length)
-                continue;
-
-            if (level <= startLevel)
-                break;
-
-            endRow = row;
-        }
-
-        if (endRow > startRow) {
-            var endColumn = session.getLine(endRow).length;
-            return new Range(startRow, startColumn, endRow, endColumn);
-        }
-    };
-
-    this.openingBracketBlock = function(session, bracket, row, column) {
-        var start = {row: row, column: column + 1};
-        var end = session.$findClosingBracket(bracket, start);
-        if (!end)
-            return;
-
-        var fw = session.foldWidgets[end.row];
-        if (fw == null)
-            fw = this.getFoldWidget(session, end.row);
-
-        if (fw == "start") {
-            end.row --;
-            end.column = session.getLine(end.row).length;
-        }
-        return Range.fromPoints(start, end);
-    };
-
-}).call(FoldMode.prototype);
-
-});
diff --git a/apps/files_texteditor/js/aceeditor/mode-python.js b/apps/files_texteditor/js/aceeditor/mode-python.js
deleted file mode 100644
index 5401407f32..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-python.js
+++ /dev/null
@@ -1 +0,0 @@
-define("ace/mode/python",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/python_highlight_rules","ace/mode/folding/pythonic","ace/range"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./python_highlight_rules").PythonHighlightRules,h=a("./folding/pythonic").FoldMode,i=a("../range").Range,j=function(){this.$tokenizer=new f((new g).getRules()),this.foldingRules=new h("\\:")};d.inherits(j,e),function(){this.toggleCommentLines=function(a,b,c,d){var e=!0,f=/^(\s*)#/;for(var g=c;g<=d;g++)if(!f.test(b.getLine(g))){e=!1;break}if(e){var h=new i(0,0,0,0);for(var g=c;g<=d;g++){var j=b.getLine(g),k=j.match(f);h.start.row=g,h.end.row=g,h.end.column=k[0].length,b.replace(h,k[1])}}else b.indentRows(c,d,"#")},this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a),f=e.tokens;if(f.length&&f[f.length-1].type=="comment")return d;if(a=="start"){var g=b.match(/^.*[\{\(\[\:]\s*$/);g&&(d+=c)}return d};var a={pass:1,"return":1,raise:1,"break":1,"continue":1};this.checkOutdent=function(b,c,d){if(d!=="\r\n"&&d!=="\r"&&d!=="\n")return!1;var e=this.$tokenizer.getLineTokens(c.trim(),b).tokens;if(!e)return!1;do var f=e.pop();while(f&&(f.type=="comment"||f.type=="text"&&f.value.match(/^\s+$/)));return f?f.type=="keyword"&&a[f.value]:!1},this.autoOutdent=function(a,b,c){c+=1;var d=this.$getIndent(b.getLine(c)),e=b.getTabString();d.slice(-e.length)==e&&b.remove(new i(c,d.length-e.length,c,d.length))}}.call(j.prototype),b.Mode=j}),define("ace/mode/python_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("./text_highlight_rules").TextHighlightRules,g=function(){var a=e.arrayToMap("and|as|assert|break|class|continue|def|del|elif|else|except|exec|finally|for|from|global|if|import|in|is|lambda|not|or|pass|print|raise|return|try|while|with|yield".split("|")),b=e.arrayToMap("True|False|None|NotImplemented|Ellipsis|__debug__".split("|")),c=e.arrayToMap("abs|divmod|input|open|staticmethod|all|enumerate|int|ord|str|any|eval|isinstance|pow|sum|basestring|execfile|issubclass|print|super|binfile|iter|property|tuple|bool|filter|len|range|type|bytearray|float|list|raw_input|unichr|callable|format|locals|reduce|unicode|chr|frozenset|long|reload|vars|classmethod|getattr|map|repr|xrange|cmp|globals|max|reversed|zip|compile|hasattr|memoryview|round|__import__|complex|hash|min|set|apply|delattr|help|next|setattr|buffer|dict|hex|object|slice|coerce|dir|id|oct|sorted|intern".split("|")),d=e.arrayToMap("".split("|")),f="(?:r|u|ur|R|U|UR|Ur|uR)?",g="(?:(?:[1-9]\\d*)|(?:0))",h="(?:0[oO]?[0-7]+)",i="(?:0[xX][\\dA-Fa-f]+)",j="(?:0[bB][01]+)",k="(?:"+g+"|"+h+"|"+i+"|"+j+")",l="(?:[eE][+-]?\\d+)",m="(?:\\.\\d+)",n="(?:\\d+)",o="(?:(?:"+n+"?"+m+")|(?:"+n+"\\.))",p="(?:(?:"+o+"|"+n+")"+l+")",q="(?:"+p+"|"+o+")";this.$rules={start:[{token:"comment",regex:"#.*$"},{token:"string",regex:f+'"{3}(?:[^\\\\]|\\\\.)*?"{3}'},{token:"string",merge:!0,regex:f+'"{3}.*$',next:"qqstring"},{token:"string",regex:f+'"(?:[^\\\\]|\\\\.)*?"'},{token:"string",regex:f+"'{3}(?:[^\\\\]|\\\\.)*?'{3}"},{token:"string",merge:!0,regex:f+"'{3}.*$",next:"qstring"},{token:"string",regex:f+"'(?:[^\\\\]|\\\\.)*?'"},{token:"constant.numeric",regex:"(?:"+q+"|\\d+)[jJ]\\b"},{token:"constant.numeric",regex:q},{token:"constant.numeric",regex:k+"[lL]\\b"},{token:"constant.numeric",regex:k+"\\b"},{token:function(e){return a.hasOwnProperty(e)?"keyword":b.hasOwnProperty(e)?"constant.language":d.hasOwnProperty(e)?"invalid.illegal":c.hasOwnProperty(e)?"support.function":e=="debugger"?"invalid.deprecated":"identifier"},regex:"[a-zA-Z_$][a-zA-Z0-9_$]*\\b"},{token:"keyword.operator",regex:"\\+|\\-|\\*|\\*\\*|\\/|\\/\\/|%|<<|>>|&|\\||\\^|~|<|>|<=|=>|==|!=|<>|="},{token:"lparen.paren",regex:"[\\[\\(\\{]"},{token:"paren.rparen",regex:"[\\]\\)\\}]"},{token:"text",regex:"\\s+"}],qqstring:[{token:"string",regex:'(?:[^\\\\]|\\\\.)*?"{3}',next:"start"},{token:"string",merge:!0,regex:".+"}],qstring:[{token:"string",regex:"(?:[^\\\\]|\\\\.)*?'{3}",next:"start"},{token:"string",merge:!0,regex:".+"}]}};d.inherits(g,f),b.PythonHighlightRules=g}),define("ace/mode/folding/pythonic",["require","exports","module","ace/lib/oop","ace/mode/folding/fold_mode"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("./fold_mode").FoldMode,f=b.FoldMode=function(a){this.foldingStartMarker=new RegExp("(?:([\\[{])|("+a+"))(?:\\s*)(?:#.*)?$")};d.inherits(f,e),function(){this.getFoldWidgetRange=function(a,b,c){var d=a.getLine(c),e=d.match(this.foldingStartMarker);if(e)return e[1]?this.openingBracketBlock(a,e[1],c,e.index):e[2]?this.indentationBlock(a,c,e.index+e[2].length):this.indentationBlock(a,c)}}.call(f.prototype)}),define("ace/mode/folding/fold_mode",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../../range").Range,e=b.FoldMode=function(){};(function(){this.foldingStartMarker=null,this.foldingStopMarker=null,this.getFoldWidget=function(a,b,c){var d=a.getLine(c);return this.foldingStartMarker.test(d)?"start":b=="markbeginend"&&this.foldingStopMarker&&this.foldingStopMarker.test(d)?"end":""},this.getFoldWidgetRange=function(a,b,c){return null},this.indentationBlock=function(a,b,c){var e=/^\s*/,f=b,g=b,h=a.getLine(b),i=c||h.length,j=h.match(e)[0].length,k=a.getLength();while(++b<k){h=a.getLine(b);var l=h.match(e)[0].length;if(l==h.length)continue;if(l<=j)break;g=b}if(g>f){var m=a.getLine(g).length;return new d(f,i,g,m)}},this.openingBracketBlock=function(a,b,c,e){var f={row:c,column:e+1},g=a.$findClosingBracket(b,f);if(!g)return;var h=a.foldWidgets[g.row];return h==null&&(h=this.getFoldWidget(a,g.row)),h=="start"&&(g.row--,g.column=a.getLine(g.row).length),d.fromPoints(f,g)}}).call(e.prototype)})
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-ruby-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-ruby-uncompressed.js
deleted file mode 100644
index fa2e06a522..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-ruby-uncompressed.js
+++ /dev/null
@@ -1,391 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Shlomo Zalman Heigh <shlomozalmanheigh AT gmail DOT com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/ruby', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/ruby_highlight_rules', 'ace/mode/matching_brace_outdent', 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
-var RubyHighlightRules = require("./ruby_highlight_rules").RubyHighlightRules;
-var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
-var Range = require("../range").Range;
-
-var Mode = function() {
-    this.$tokenizer = new Tokenizer(new RubyHighlightRules().getRules());
-    this.$outdent = new MatchingBraceOutdent();
-};
-oop.inherits(Mode, TextMode);
-
-(function() {
-
-    this.toggleCommentLines = function(state, doc, startRow, endRow) {
-        var outdent = true;
-        var re = /^(\s*)#/;
-
-        for (var i=startRow; i<= endRow; i++) {
-            if (!re.test(doc.getLine(i))) {
-                outdent = false;
-                break;
-            }
-        }
-
-        if (outdent) {
-            var deleteRange = new Range(0, 0, 0, 0);
-            for (var i=startRow; i<= endRow; i++)
-            {
-                var line = doc.getLine(i);
-                var m = line.match(re);
-                deleteRange.start.row = i;
-                deleteRange.end.row = i;
-                deleteRange.end.column = m[0].length;
-                doc.replace(deleteRange, m[1]);
-            }
-        }
-        else {
-            doc.indentRows(startRow, endRow, "#");
-        }
-    };
-
-    this.getNextLineIndent = function(state, line, tab) {
-        var indent = this.$getIndent(line);
-
-        var tokenizedLine = this.$tokenizer.getLineTokens(line, state);
-        var tokens = tokenizedLine.tokens;
-
-        if (tokens.length && tokens[tokens.length-1].type == "comment") {
-            return indent;
-        }
-        
-        if (state == "start") {
-            var match = line.match(/^.*[\{\(\[]\s*$/);
-            if (match) {
-                indent += tab;
-            }
-        }
-
-        return indent;
-    };
-
-    this.checkOutdent = function(state, line, input) {
-        return this.$outdent.checkOutdent(line, input);
-    };
-
-    this.autoOutdent = function(state, doc, row) {
-        this.$outdent.autoOutdent(doc, row);
-    };
-
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Shlomo Zalman Heigh <shlomozalmanheigh AT gmail DOT com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/ruby_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var lang = require("../lib/lang");
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var RubyHighlightRules = function() {
-
-    var builtinFunctions = lang.arrayToMap(
-        ("abort|Array|assert|assert_equal|assert_not_equal|assert_same|assert_not_same|" +
-        "assert_nil|assert_not_nil|assert_match|assert_no_match|assert_in_delta|assert_throws|" + 
-        "assert_raise|assert_nothing_raised|assert_instance_of|assert_kind_of|assert_respond_to|" +
-        "assert_operator|assert_send|assert_difference|assert_no_difference|assert_recognizes|" +
-        "assert_generates|assert_response|assert_redirected_to|assert_template|assert_select|" +
-        "assert_select_email|assert_select_rjs|assert_select_encoded|css_select|at_exit|" +
-        "attr|attr_writer|attr_reader|attr_accessor|attr_accessible|autoload|binding|block_given?|callcc|" +
-        "caller|catch|chomp|chomp!|chop|chop!|defined?|delete_via_redirect|eval|exec|exit|" +
-        "exit!|fail|Float|flunk|follow_redirect!|fork|form_for|form_tag|format|gets|global_variables|gsub|" +
-        "gsub!|get_via_redirect|h|host!|https?|https!|include|Integer|lambda|link_to|" +
-        "link_to_unless_current|link_to_function|link_to_remote|load|local_variables|loop|open|open_session|" +
-        "p|print|printf|proc|putc|puts|post_via_redirect|put_via_redirect|raise|rand|" +
-        "raw|readline|readlines|redirect?|request_via_redirect|require|scan|select|" +
-        "set_trace_func|sleep|split|sprintf|srand|String|stylesheet_link_tag|syscall|system|sub|sub!|test|" +
-        "throw|trace_var|trap|untrace_var|atan2|cos|exp|frexp|ldexp|log|log10|sin|sqrt|tan|" +
-        "render|javascript_include_tag|csrf_meta_tag|label_tag|text_field_tag|submit_tag|check_box_tag|" +
-        "content_tag|radio_button_tag|text_area_tag|password_field_tag|hidden_field_tag|" +
-        "fields_for|select_tag|options_for_select|options_from_collection_for_select|collection_select|" +
-        "time_zone_select|select_date|select_time|select_datetime|date_select|time_select|datetime_select|" +
-        "select_year|select_month|select_day|select_hour|select_minute|select_second|file_field_tag|" +
-        "file_field|respond_to|skip_before_filter|around_filter|after_filter|verify|" +
-        "protect_from_forgery|rescue_from|helper_method|redirect_to|before_filter|" +
-        "send_data|send_file|validates_presence_of|validates_uniqueness_of|validates_length_of|" +
-        "validates_format_of|validates_acceptance_of|validates_associated|validates_exclusion_of|" +
-        "validates_inclusion_of|validates_numericality_of|validates_with|validates_each|" +
-        "authenticate_or_request_with_http_basic|authenticate_or_request_with_http_digest|" +
-        "filter_parameter_logging|match|get|post|resources|redirect|scope|assert_routing|" +
-        "translate|localize|extract_locale_from_tld|t|l|caches_page|expire_page|caches_action|expire_action|" +
-        "cache|expire_fragment|expire_cache_for|observe|cache_sweeper|" +
-        "has_many|has_one|belongs_to|has_and_belongs_to_many").split("|")
-    );
-
-    var keywords = lang.arrayToMap(
-        ("alias|and|BEGIN|begin|break|case|class|def|defined|do|else|elsif|END|end|ensure|" +
-        "__FILE__|finally|for|gem|if|in|__LINE__|module|next|not|or|private|protected|public|" + 
-        "redo|rescue|retry|return|super|then|undef|unless|until|when|while|yield").split("|")
-    );
-
-    var buildinConstants = lang.arrayToMap(
-        ("true|TRUE|false|FALSE|nil|NIL|ARGF|ARGV|DATA|ENV|RUBY_PLATFORM|RUBY_RELEASE_DATE|" +
-        "RUBY_VERSION|STDERR|STDIN|STDOUT|TOPLEVEL_BINDING").split("|")
-    );
-
-    var builtinVariables = lang.arrayToMap(
-        ("\$DEBUG|\$defout|\$FILENAME|\$LOAD_PATH|\$SAFE|\$stdin|\$stdout|\$stderr|\$VERBOSE|" +
-        "$!|root_url|flash|session|cookies|params|request|response|logger").split("|")
-    );
-
-    // regexp must not have capturing parentheses. Use (?:) instead.
-    // regexps are ordered -> the first match is used
-
-    this.$rules = {
-        "start" : [
-            {
-                token : "comment",
-                regex : "#.*$"
-            }, {
-                token : "comment", // multi line comment
-                merge : true,
-                regex : "^\=begin$",
-                next : "comment"
-            }, {
-                token : "string.regexp",
-                regex : "[/](?:(?:\\[(?:\\\\]|[^\\]])+\\])|(?:\\\\/|[^\\]/]))*[/]\\w*\\s*(?=[).,;]|$)"
-            }, {
-                token : "string", // single line
-                regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
-            }, {
-                token : "string", // single line
-                regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"
-            }, {
-                token : "string", // backtick string
-                regex : "[`](?:(?:\\\\.)|(?:[^'\\\\]))*?[`]"
-            }, {
-                token : "text", // namespaces aren't symbols
-                regex : "::"
-            }, {
-                token : "variable.instancce", // instance variable
-                regex : "@{1,2}(?:[a-zA-Z_]|\d)+"
-            }, {
-                token : "variable.class", // class name
-                regex : "[A-Z](?:[a-zA-Z_]|\d)+"
-            }, {
-                token : "string", // symbol
-                regex : "[:](?:[A-Za-z_]|[@$](?=[a-zA-Z0-9_]))[a-zA-Z0-9_]*[!=?]?"
-           }, {
-                token : "constant.numeric", // hex
-                regex : "0[xX][0-9a-fA-F](?:[0-9a-fA-F]|_(?=[0-9a-fA-F]))*\\b"
-            }, {
-                token : "constant.numeric", // float
-                regex : "[+-]?\\d(?:\\d|_(?=\\d))*(?:(?:\\.\\d(?:\\d|_(?=\\d))*)?(?:[eE][+-]?\\d+)?)?\\b"
-            }, {
-                token : "constant.language.boolean",
-                regex : "(?:true|false)\\b"
-            }, {
-                token : function(value) {
-                    if (value == "self")
-                        return "variable.language";
-                    else if (keywords.hasOwnProperty(value))
-                        return "keyword";
-                    else if (buildinConstants.hasOwnProperty(value))
-                        return "constant.language";
-                    else if (builtinVariables.hasOwnProperty(value))
-                        return "variable.language";
-                    else if (builtinFunctions.hasOwnProperty(value))
-                        return "support.function";
-                    else if (value == "debugger")
-                        return "invalid.deprecated";
-                    else
-                        return "identifier";
-                },
-                // TODO: Unicode escape sequences
-                // TODO: Unicode identifiers
-                regex : "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
-            }, {
-                token : "keyword.operator",
-                regex : "!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)"
-            }, {
-                token : "paren.lparen",
-                regex : "[[({]"
-            }, {
-                token : "paren.rparen",
-                regex : "[\\])}]"
-            }, {
-                token : "text",
-                regex : "\\s+"
-            }
-        ],
-        "comment" : [
-            {
-                token : "comment", // closing comment
-                regex : "^\=end$",
-                next : "start"
-            }, {
-                token : "comment", // comment spanning whole line
-                merge : true,
-                regex : ".+"
-            }
-        ]
-    };
-};
-
-oop.inherits(RubyHighlightRules, TextHighlightRules);
-
-exports.RubyHighlightRules = RubyHighlightRules;
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/matching_brace_outdent', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../range").Range;
-
-var MatchingBraceOutdent = function() {};
-
-(function() {
-
-    this.checkOutdent = function(line, input) {
-        if (! /^\s+$/.test(line))
-            return false;
-
-        return /^\s*\}/.test(input);
-    };
-
-    this.autoOutdent = function(doc, row) {
-        var line = doc.getLine(row);
-        var match = line.match(/^(\s*\})/);
-
-        if (!match) return 0;
-
-        var column = match[1].length;
-        var openBracePos = doc.findMatchingBracket({row: row, column: column});
-
-        if (!openBracePos || openBracePos.row == row) return 0;
-
-        var indent = this.$getIndent(doc.getLine(openBracePos.row));
-        doc.replace(new Range(row, 0, row, column-1), indent);
-    };
-
-    this.$getIndent = function(line) {
-        var match = line.match(/^(\s+)/);
-        if (match) {
-            return match[1];
-        }
-
-        return "";
-    };
-
-}).call(MatchingBraceOutdent.prototype);
-
-exports.MatchingBraceOutdent = MatchingBraceOutdent;
-});
diff --git a/apps/files_texteditor/js/aceeditor/mode-ruby.js b/apps/files_texteditor/js/aceeditor/mode-ruby.js
deleted file mode 100644
index 7b9df32177..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-ruby.js
+++ /dev/null
@@ -1 +0,0 @@
-define("ace/mode/ruby",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/ruby_highlight_rules","ace/mode/matching_brace_outdent","ace/range"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./ruby_highlight_rules").RubyHighlightRules,h=a("./matching_brace_outdent").MatchingBraceOutdent,i=a("../range").Range,j=function(){this.$tokenizer=new f((new g).getRules()),this.$outdent=new h};d.inherits(j,e),function(){this.toggleCommentLines=function(a,b,c,d){var e=!0,f=/^(\s*)#/;for(var g=c;g<=d;g++)if(!f.test(b.getLine(g))){e=!1;break}if(e){var h=new i(0,0,0,0);for(var g=c;g<=d;g++){var j=b.getLine(g),k=j.match(f);h.start.row=g,h.end.row=g,h.end.column=k[0].length,b.replace(h,k[1])}}else b.indentRows(c,d,"#")},this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a),f=e.tokens;if(f.length&&f[f.length-1].type=="comment")return d;if(a=="start"){var g=b.match(/^.*[\{\(\[]\s*$/);g&&(d+=c)}return d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)}}.call(j.prototype),b.Mode=j}),define("ace/mode/ruby_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("./text_highlight_rules").TextHighlightRules,g=function(){var a=e.arrayToMap("abort|Array|assert|assert_equal|assert_not_equal|assert_same|assert_not_same|assert_nil|assert_not_nil|assert_match|assert_no_match|assert_in_delta|assert_throws|assert_raise|assert_nothing_raised|assert_instance_of|assert_kind_of|assert_respond_to|assert_operator|assert_send|assert_difference|assert_no_difference|assert_recognizes|assert_generates|assert_response|assert_redirected_to|assert_template|assert_select|assert_select_email|assert_select_rjs|assert_select_encoded|css_select|at_exit|attr|attr_writer|attr_reader|attr_accessor|attr_accessible|autoload|binding|block_given?|callcc|caller|catch|chomp|chomp!|chop|chop!|defined?|delete_via_redirect|eval|exec|exit|exit!|fail|Float|flunk|follow_redirect!|fork|form_for|form_tag|format|gets|global_variables|gsub|gsub!|get_via_redirect|h|host!|https?|https!|include|Integer|lambda|link_to|link_to_unless_current|link_to_function|link_to_remote|load|local_variables|loop|open|open_session|p|print|printf|proc|putc|puts|post_via_redirect|put_via_redirect|raise|rand|raw|readline|readlines|redirect?|request_via_redirect|require|scan|select|set_trace_func|sleep|split|sprintf|srand|String|stylesheet_link_tag|syscall|system|sub|sub!|test|throw|trace_var|trap|untrace_var|atan2|cos|exp|frexp|ldexp|log|log10|sin|sqrt|tan|render|javascript_include_tag|csrf_meta_tag|label_tag|text_field_tag|submit_tag|check_box_tag|content_tag|radio_button_tag|text_area_tag|password_field_tag|hidden_field_tag|fields_for|select_tag|options_for_select|options_from_collection_for_select|collection_select|time_zone_select|select_date|select_time|select_datetime|date_select|time_select|datetime_select|select_year|select_month|select_day|select_hour|select_minute|select_second|file_field_tag|file_field|respond_to|skip_before_filter|around_filter|after_filter|verify|protect_from_forgery|rescue_from|helper_method|redirect_to|before_filter|send_data|send_file|validates_presence_of|validates_uniqueness_of|validates_length_of|validates_format_of|validates_acceptance_of|validates_associated|validates_exclusion_of|validates_inclusion_of|validates_numericality_of|validates_with|validates_each|authenticate_or_request_with_http_basic|authenticate_or_request_with_http_digest|filter_parameter_logging|match|get|post|resources|redirect|scope|assert_routing|translate|localize|extract_locale_from_tld|t|l|caches_page|expire_page|caches_action|expire_action|cache|expire_fragment|expire_cache_for|observe|cache_sweeper|has_many|has_one|belongs_to|has_and_belongs_to_many".split("|")),b=e.arrayToMap("alias|and|BEGIN|begin|break|case|class|def|defined|do|else|elsif|END|end|ensure|__FILE__|finally|for|gem|if|in|__LINE__|module|next|not|or|private|protected|public|redo|rescue|retry|return|super|then|undef|unless|until|when|while|yield".split("|")),c=e.arrayToMap("true|TRUE|false|FALSE|nil|NIL|ARGF|ARGV|DATA|ENV|RUBY_PLATFORM|RUBY_RELEASE_DATE|RUBY_VERSION|STDERR|STDIN|STDOUT|TOPLEVEL_BINDING".split("|")),d=e.arrayToMap("$DEBUG|$defout|$FILENAME|$LOAD_PATH|$SAFE|$stdin|$stdout|$stderr|$VERBOSE|$!|root_url|flash|session|cookies|params|request|response|logger".split("|"));this.$rules={start:[{token:"comment",regex:"#.*$"},{token:"comment",merge:!0,regex:"^=begin$",next:"comment"},{token:"string.regexp",regex:"[/](?:(?:\\[(?:\\\\]|[^\\]])+\\])|(?:\\\\/|[^\\]/]))*[/]\\w*\\s*(?=[).,;]|$)"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:"string",regex:"[`](?:(?:\\\\.)|(?:[^'\\\\]))*?[`]"},{token:"text",regex:"::"},{token:"variable.instancce",regex:"@{1,2}(?:[a-zA-Z_]|d)+"},{token:"variable.class",regex:"[A-Z](?:[a-zA-Z_]|d)+"},{token:"string",regex:"[:](?:[A-Za-z_]|[@$](?=[a-zA-Z0-9_]))[a-zA-Z0-9_]*[!=?]?"},{token:"constant.numeric",regex:"0[xX][0-9a-fA-F](?:[0-9a-fA-F]|_(?=[0-9a-fA-F]))*\\b"},{token:"constant.numeric",regex:"[+-]?\\d(?:\\d|_(?=\\d))*(?:(?:\\.\\d(?:\\d|_(?=\\d))*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:"constant.language.boolean",regex:"(?:true|false)\\b"},{token:function(e){return e=="self"?"variable.language":b.hasOwnProperty(e)?"keyword":c.hasOwnProperty(e)?"constant.language":d.hasOwnProperty(e)?"variable.language":a.hasOwnProperty(e)?"support.function":e=="debugger"?"invalid.deprecated":"identifier"},regex:"[a-zA-Z_$][a-zA-Z0-9_$]*\\b"},{token:"keyword.operator",regex:"!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)"},{token:"paren.lparen",regex:"[[({]"},{token:"paren.rparen",regex:"[\\])}]"},{token:"text",regex:"\\s+"}],comment:[{token:"comment",regex:"^=end$",next:"start"},{token:"comment",merge:!0,regex:".+"}]}};d.inherits(g,f),b.RubyHighlightRules=g}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../range").Range,e=function(){};(function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}}).call(e.prototype),b.MatchingBraceOutdent=e})
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-scad-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-scad-uncompressed.js
deleted file mode 100644
index c944ed17e1..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-scad-uncompressed.js
+++ /dev/null
@@ -1,908 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Gastón Kleiman <gaston.kleiman AT gmail DOT com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/scad', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/scad_highlight_rules', 'ace/mode/matching_brace_outdent', 'ace/range', 'ace/mode/behaviour/cstyle', 'ace/mode/folding/cstyle'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
-var scadHighlightRules = require("./scad_highlight_rules").scadHighlightRules;
-var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
-var Range = require("../range").Range;
-var CstyleBehaviour = require("./behaviour/cstyle").CstyleBehaviour;
-var CStyleFoldMode = require("./folding/cstyle").FoldMode;
-
-var Mode = function() {
-    this.$tokenizer = new Tokenizer(new scadHighlightRules().getRules());
-    this.$outdent = new MatchingBraceOutdent();
-    this.$behaviour = new CstyleBehaviour();
-    this.foldingRules = new CStyleFoldMode();
-};
-oop.inherits(Mode, TextMode);
-
-(function() {
-
-    this.toggleCommentLines = function(state, doc, startRow, endRow) {
-        var outdent = true;
-        var re = /^(\s*)\/\//;
-
-        for (var i=startRow; i<= endRow; i++) {
-            if (!re.test(doc.getLine(i))) {
-                outdent = false;
-                break;
-            }
-        }
-
-        if (outdent) {
-            var deleteRange = new Range(0, 0, 0, 0);
-            for (var i=startRow; i<= endRow; i++)
-            {
-                var line = doc.getLine(i);
-                var m = line.match(re);
-                deleteRange.start.row = i;
-                deleteRange.end.row = i;
-                deleteRange.end.column = m[0].length;
-                doc.replace(deleteRange, m[1]);
-            }
-        }
-        else {
-            doc.indentRows(startRow, endRow, "//");
-        }
-    };
-
-    this.getNextLineIndent = function(state, line, tab) {
-        var indent = this.$getIndent(line);
-
-        var tokenizedLine = this.$tokenizer.getLineTokens(line, state);
-        var tokens = tokenizedLine.tokens;
-        var endState = tokenizedLine.state;
-
-        if (tokens.length && tokens[tokens.length-1].type == "comment") {
-            return indent;
-        }
-
-        if (state == "start") {
-            var match = line.match(/^.*[\{\(\[]\s*$/);
-            if (match) {
-                indent += tab;
-            }
-        } else if (state == "doc-start") {
-            if (endState == "start") {
-                return "";
-            }
-            var match = line.match(/^\s*(\/?)\*/);
-            if (match) {
-                if (match[1]) {
-                    indent += " ";
-                }
-                indent += "* ";
-            }
-        }
-
-        return indent;
-    };
-
-    this.checkOutdent = function(state, line, input) {
-        return this.$outdent.checkOutdent(line, input);
-    };
-
-    this.autoOutdent = function(state, doc, row) {
-        this.$outdent.autoOutdent(doc, row);
-    };
-
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Gastón Kleiman <gaston.kleiman AT gmail DOT com>
- *
- * Based on Bespin's C/C++ Syntax Plugin by Marc McIntyre.
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/scad_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/mode/doc_comment_highlight_rules', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var lang = require("../lib/lang");
-var DocCommentHighlightRules = require("./doc_comment_highlight_rules").DocCommentHighlightRules;
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var scadHighlightRules = function() {
-
-    var keywords = lang.arrayToMap(
-        ("module|if|else|for").split("|")
-    );
-
-    var buildinConstants = lang.arrayToMap(
-        ("NULL").split("|")
-    );
-
-    // regexp must not have capturing parentheses. Use (?:) instead.
-    // regexps are ordered -> the first match is used
-
-    this.$rules = {
-        "start" : [
-            {
-                token : "comment",
-                regex : "\\/\\/.*$"
-            },
-            new DocCommentHighlightRules().getStartRule("start"),
-            {
-                token : "comment", // multi line comment
-                merge : true,
-                regex : "\\/\\*",
-                next : "comment"
-            }, {
-                token : "string", // single line
-                regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
-            }, {
-                token : "string", // multi line string start
-                regex : '["].*\\\\$',
-                next : "qqstring"
-            }, {
-                token : "string", // single line
-                regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"
-            }, {
-                token : "string", // multi line string start
-                regex : "['].*\\\\$",
-                next : "qstring"
-            }, {
-                token : "constant.numeric", // hex
-                regex : "0[xX][0-9a-fA-F]+\\b"
-            }, {
-                token : "constant.numeric", // float
-                regex : "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"
-            }, {
-              token : "constant", // <CONSTANT>
-              regex : "<[a-zA-Z0-9.]+>"
-            }, {
-              token : "keyword", // pre-compiler directivs
-              regex : "(?:use|include)"
-          }, {
-                token : function(value) {
-                    if (value == "this")
-                        return "variable.language";
-                    else if (keywords.hasOwnProperty(value))
-                        return "keyword";
-                    else if (buildinConstants.hasOwnProperty(value))
-                        return "constant.language";
-                    else
-                        return "identifier";
-                },
-                regex : "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
-            }, {
-                token : "keyword.operator",
-                regex : "!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|==|=|!=|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|new|delete|typeof|void)"
-            }, {
-                token : "paren.lparen",
-                regex : "[[({]"
-            }, {
-                token : "paren.rparen",
-                regex : "[\\])}]"
-            }, {
-                token : "text",
-                regex : "\\s+"
-            }
-        ],
-        "comment" : [
-            {
-                token : "comment", // closing comment
-                regex : ".*?\\*\\/",
-                next : "start"
-            }, {
-                token : "comment", // comment spanning whole line
-                merge : true,
-                regex : ".+"
-            }
-        ],
-        "qqstring" : [
-            {
-                token : "string",
-                regex : '(?:(?:\\\\.)|(?:[^"\\\\]))*?"',
-                next : "start"
-            }, {
-                token : "string",
-                merge : true,
-                regex : '.+'
-            }
-        ],
-        "qstring" : [
-            {
-                token : "string",
-                regex : "(?:(?:\\\\.)|(?:[^'\\\\]))*?'",
-                next : "start"
-            }, {
-                token : "string",
-                merge : true,
-                regex : '.+'
-            }
-        ]
-    };
-    
-    this.embedRules(DocCommentHighlightRules, "doc-",
-        [ new DocCommentHighlightRules().getEndRule("start") ]);
-};
-
-oop.inherits(scadHighlightRules, TextHighlightRules);
-
-exports.scadHighlightRules = scadHighlightRules;
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/doc_comment_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var DocCommentHighlightRules = function() {
-
-    this.$rules = {
-        "start" : [ {
-            token : "comment.doc.tag",
-            regex : "@[\\w\\d_]+" // TODO: fix email addresses
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "\\s+"
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "TODO"
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "[^@\\*]+"
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "."
-        }]
-    };
-};
-
-oop.inherits(DocCommentHighlightRules, TextHighlightRules);
-
-(function() {
-
-    this.getStartRule = function(start) {
-        return {
-            token : "comment.doc", // doc comment
-            merge : true,
-            regex : "\\/\\*(?=\\*)",
-            next  : start
-        };
-    };
-    
-    this.getEndRule = function (start) {
-        return {
-            token : "comment.doc", // closing comment
-            merge : true,
-            regex : "\\*\\/",
-            next  : start
-        };
-    };
-
-}).call(DocCommentHighlightRules.prototype);
-
-exports.DocCommentHighlightRules = DocCommentHighlightRules;
-
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/matching_brace_outdent', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../range").Range;
-
-var MatchingBraceOutdent = function() {};
-
-(function() {
-
-    this.checkOutdent = function(line, input) {
-        if (! /^\s+$/.test(line))
-            return false;
-
-        return /^\s*\}/.test(input);
-    };
-
-    this.autoOutdent = function(doc, row) {
-        var line = doc.getLine(row);
-        var match = line.match(/^(\s*\})/);
-
-        if (!match) return 0;
-
-        var column = match[1].length;
-        var openBracePos = doc.findMatchingBracket({row: row, column: column});
-
-        if (!openBracePos || openBracePos.row == row) return 0;
-
-        var indent = this.$getIndent(doc.getLine(openBracePos.row));
-        doc.replace(new Range(row, 0, row, column-1), indent);
-    };
-
-    this.$getIndent = function(line) {
-        var match = line.match(/^(\s+)/);
-        if (match) {
-            return match[1];
-        }
-
-        return "";
-    };
-
-}).call(MatchingBraceOutdent.prototype);
-
-exports.MatchingBraceOutdent = MatchingBraceOutdent;
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Chris Spencer <chris.ag.spencer AT googlemail DOT com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/behaviour/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/behaviour'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var Behaviour = require('../behaviour').Behaviour;
-
-var CstyleBehaviour = function () {
-
-    this.add("braces", "insertion", function (state, action, editor, session, text) {
-        if (text == '{') {
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: '{' + selected + '}',
-                    selection: false
-                };
-            } else {
-                return {
-                    text: '{}',
-                    selection: [1, 1]
-                };
-            }
-        } else if (text == '}') {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == '}') {
-                var matching = session.$findOpeningBracket('}', {column: cursor.column + 1, row: cursor.row});
-                if (matching !== null) {
-                    return {
-                        text: '',
-                        selection: [1, 1]
-                    };
-                }
-            }
-        } else if (text == "\n") {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == '}') {
-                var openBracePos = session.findMatchingBracket({row: cursor.row, column: cursor.column + 1});
-                if (!openBracePos)
-                     return null;
-
-                var indent = this.getNextLineIndent(state, line.substring(0, line.length - 1), session.getTabString());
-                var next_indent = this.$getIndent(session.doc.getLine(openBracePos.row));
-
-                return {
-                    text: '\n' + indent + '\n' + next_indent,
-                    selection: [1, indent.length, 1, indent.length]
-                };
-            }
-        }
-    });
-
-    this.add("braces", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && selected == '{') {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.end.column, range.end.column + 1);
-            if (rightChar == '}') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-    this.add("parens", "insertion", function (state, action, editor, session, text) {
-        if (text == '(') {
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: '(' + selected + ')',
-                    selection: false
-                };
-            } else {
-                return {
-                    text: '()',
-                    selection: [1, 1]
-                };
-            }
-        } else if (text == ')') {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == ')') {
-                var matching = session.$findOpeningBracket(')', {column: cursor.column + 1, row: cursor.row});
-                if (matching !== null) {
-                    return {
-                        text: '',
-                        selection: [1, 1]
-                    };
-                }
-            }
-        }
-    });
-
-    this.add("parens", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && selected == '(') {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
-            if (rightChar == ')') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-    this.add("string_dquotes", "insertion", function (state, action, editor, session, text) {
-        if (text == '"' || text == "'") {
-            var quote = text;
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: quote + selected + quote,
-                    selection: false
-                };
-            } else {
-                var cursor = editor.getCursorPosition();
-                var line = session.doc.getLine(cursor.row);
-                var leftChar = line.substring(cursor.column-1, cursor.column);
-
-                // We're escaped.
-                if (leftChar == '\\') {
-                    return null;
-                }
-
-                // Find what token we're inside.
-                var tokens = session.getTokens(selection.start.row, selection.start.row)[0].tokens;
-                var col = 0, token;
-                var quotepos = -1; // Track whether we're inside an open quote.
-
-                for (var x = 0; x < tokens.length; x++) {
-                    token = tokens[x];
-                    if (token.type == "string") {
-                      quotepos = -1;
-                    } else if (quotepos < 0) {
-                      quotepos = token.value.indexOf(quote);
-                    }
-                    if ((token.value.length + col) > selection.start.column) {
-                        break;
-                    }
-                    col += tokens[x].value.length;
-                }
-
-                // Try and be smart about when we auto insert.
-                if (!token || (quotepos < 0 && token.type !== "comment" && (token.type !== "string" || ((selection.start.column !== token.value.length+col-1) && token.value.lastIndexOf(quote) === token.value.length-1)))) {
-                    return {
-                        text: quote + quote,
-                        selection: [1,1]
-                    };
-                } else if (token && token.type === "string") {
-                    // Ignore input and move right one if we're typing over the closing quote.
-                    var rightChar = line.substring(cursor.column, cursor.column + 1);
-                    if (rightChar == quote) {
-                        return {
-                            text: '',
-                            selection: [1, 1]
-                        };
-                    }
-                }
-            }
-        }
-    });
-
-    this.add("string_dquotes", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && (selected == '"' || selected == "'")) {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
-            if (rightChar == '"') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-};
-
-oop.inherits(CstyleBehaviour, Behaviour);
-
-exports.CstyleBehaviour = CstyleBehaviour;
-});/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/folding/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/range', 'ace/mode/folding/fold_mode'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var Range = require("../../range").Range;
-var BaseFoldMode = require("./fold_mode").FoldMode;
-
-var FoldMode = exports.FoldMode = function() {};
-oop.inherits(FoldMode, BaseFoldMode);
-
-(function() {
-
-    this.foldingStartMarker = /(\{|\[)[^\}\]]*$|^\s*(\/\*)/;
-    this.foldingStopMarker = /^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/;
-    
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        var line = session.getLine(row);
-        var match = line.match(this.foldingStartMarker);
-        if (match) {
-            var i = match.index;
-
-            if (match[1])
-                return this.openingBracketBlock(session, match[1], row, i);
-
-            var range = session.getCommentFoldRange(row, i + match[0].length);
-            range.end.column -= 2;
-            return range;
-        }
-
-        if (foldStyle !== "markbeginend")
-            return;
-            
-        var match = line.match(this.foldingStopMarker);
-        if (match) {
-            var i = match.index + match[0].length;
-
-            if (match[2]) {
-                var range = session.getCommentFoldRange(row, i);
-                range.end.column -= 2;
-                return range;
-            }
-
-            var end = {row: row, column: i};
-            var start = session.$findOpeningBracket(match[1], end);
-            
-            if (!start)
-                return;
-
-            start.column++;
-            end.column--;
-
-            return  Range.fromPoints(start, end);
-        }
-    };
-    
-}).call(FoldMode.prototype);
-
-});/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/folding/fold_mode', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../../range").Range;
-
-var FoldMode = exports.FoldMode = function() {};
-
-(function() {
-
-    this.foldingStartMarker = null;
-    this.foldingStopMarker = null;
-
-    // must return "" if there's no fold, to enable caching
-    this.getFoldWidget = function(session, foldStyle, row) {
-        var line = session.getLine(row);
-        if (this.foldingStartMarker.test(line))
-            return "start";
-        if (foldStyle == "markbeginend"
-                && this.foldingStopMarker
-                && this.foldingStopMarker.test(line))
-            return "end";
-        return "";
-    };
-    
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        return null;
-    };
-
-    this.indentationBlock = function(session, row, column) {
-        var re = /^\s*/;
-        var startRow = row;
-        var endRow = row;
-        var line = session.getLine(row);
-        var startColumn = column || line.length;
-        var startLevel = line.match(re)[0].length;
-        var maxRow = session.getLength()
-        
-        while (++row < maxRow) {
-            line = session.getLine(row);
-            var level = line.match(re)[0].length;
-
-            if (level == line.length)
-                continue;
-
-            if (level <= startLevel)
-                break;
-
-            endRow = row;
-        }
-
-        if (endRow > startRow) {
-            var endColumn = session.getLine(endRow).length;
-            return new Range(startRow, startColumn, endRow, endColumn);
-        }
-    };
-
-    this.openingBracketBlock = function(session, bracket, row, column) {
-        var start = {row: row, column: column + 1};
-        var end = session.$findClosingBracket(bracket, start);
-        if (!end)
-            return;
-
-        var fw = session.foldWidgets[end.row];
-        if (fw == null)
-            fw = this.getFoldWidget(session, end.row);
-
-        if (fw == "start") {
-            end.row --;
-            end.column = session.getLine(end.row).length;
-        }
-        return Range.fromPoints(start, end);
-    };
-
-}).call(FoldMode.prototype);
-
-});
diff --git a/apps/files_texteditor/js/aceeditor/mode-scad.js b/apps/files_texteditor/js/aceeditor/mode-scad.js
deleted file mode 100644
index eb324e4dc7..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-scad.js
+++ /dev/null
@@ -1 +0,0 @@
-define("ace/mode/scad",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/scad_highlight_rules","ace/mode/matching_brace_outdent","ace/range","ace/mode/behaviour/cstyle","ace/mode/folding/cstyle"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./scad_highlight_rules").scadHighlightRules,h=a("./matching_brace_outdent").MatchingBraceOutdent,i=a("../range").Range,j=a("./behaviour/cstyle").CstyleBehaviour,k=a("./folding/cstyle").FoldMode,l=function(){this.$tokenizer=new f((new g).getRules()),this.$outdent=new h,this.$behaviour=new j,this.foldingRules=new k};d.inherits(l,e),function(){this.toggleCommentLines=function(a,b,c,d){var e=!0,f=/^(\s*)\/\//;for(var g=c;g<=d;g++)if(!f.test(b.getLine(g))){e=!1;break}if(e){var h=new i(0,0,0,0);for(var g=c;g<=d;g++){var j=b.getLine(g),k=j.match(f);h.start.row=g,h.end.row=g,h.end.column=k[0].length,b.replace(h,k[1])}}else b.indentRows(c,d,"//")},this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a),f=e.tokens,g=e.state;if(f.length&&f[f.length-1].type=="comment")return d;if(a=="start"){var h=b.match(/^.*[\{\(\[]\s*$/);h&&(d+=c)}else if(a=="doc-start"){if(g=="start")return"";var h=b.match(/^\s*(\/?)\*/);h&&(h[1]&&(d+=" "),d+="* ")}return d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)}}.call(l.prototype),b.Mode=l}),define("ace/mode/scad_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/doc_comment_highlight_rules","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("./doc_comment_highlight_rules").DocCommentHighlightRules,g=a("./text_highlight_rules").TextHighlightRules,h=function(){var a=e.arrayToMap("module|if|else|for".split("|")),b=e.arrayToMap("NULL".split("|"));this.$rules={start:[{token:"comment",regex:"\\/\\/.*$"},(new f).getStartRule("start"),{token:"comment",merge:!0,regex:"\\/\\*",next:"comment"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",regex:'["].*\\\\$',next:"qqstring"},{token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:"string",regex:"['].*\\\\$",next:"qstring"},{token:"constant.numeric",regex:"0[xX][0-9a-fA-F]+\\b"},{token:"constant.numeric",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:"constant",regex:"<[a-zA-Z0-9.]+>"},{token:"keyword",regex:"(?:use|include)"},{token:function(c){return c=="this"?"variable.language":a.hasOwnProperty(c)?"keyword":b.hasOwnProperty(c)?"constant.language":"identifier"},regex:"[a-zA-Z_$][a-zA-Z0-9_$]*\\b"},{token:"keyword.operator",regex:"!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|==|=|!=|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|new|delete|typeof|void)"},{token:"paren.lparen",regex:"[[({]"},{token:"paren.rparen",regex:"[\\])}]"},{token:"text",regex:"\\s+"}],comment:[{token:"comment",regex:".*?\\*\\/",next:"start"},{token:"comment",merge:!0,regex:".+"}],qqstring:[{token:"string",regex:'(?:(?:\\\\.)|(?:[^"\\\\]))*?"',next:"start"},{token:"string",merge:!0,regex:".+"}],qstring:[{token:"string",regex:"(?:(?:\\\\.)|(?:[^'\\\\]))*?'",next:"start"},{token:"string",merge:!0,regex:".+"}]},this.embedRules(f,"doc-",[(new f).getEndRule("start")])};d.inherits(h,g),b.scadHighlightRules=h}),define("ace/mode/doc_comment_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text_highlight_rules").TextHighlightRules,f=function(){this.$rules={start:[{token:"comment.doc.tag",regex:"@[\\w\\d_]+"},{token:"comment.doc",merge:!0,regex:"\\s+"},{token:"comment.doc",merge:!0,regex:"TODO"},{token:"comment.doc",merge:!0,regex:"[^@\\*]+"},{token:"comment.doc",merge:!0,regex:"."}]}};d.inherits(f,e),function(){this.getStartRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\/\\*(?=\\*)",next:a}},this.getEndRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\*\\/",next:a}}}.call(f.prototype),b.DocCommentHighlightRules=f}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../range").Range,e=function(){};(function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}}).call(e.prototype),b.MatchingBraceOutdent=e}),define("ace/mode/behaviour/cstyle",["require","exports","module","ace/lib/oop","ace/mode/behaviour"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../behaviour").Behaviour,f=function(){this.add("braces","insertion",function(a,b,c,d,e){if(e=="{"){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"{"+g+"}",selection:!1}:{text:"{}",selection:[1,1]}}if(e=="}"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var k=d.$findOpeningBracket("}",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}else if(e=="\n"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var l=d.findMatchingBracket({row:h.row,column:h.column+1});if(!l)return null;var m=this.getNextLineIndent(a,i.substring(0,i.length-1),d.getTabString()),n=this.$getIndent(d.doc.getLine(l.row));return{text:"\n"+m+"\n"+n,selection:[1,m.length,1,m.length]}}}}),this.add("braces","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="{"){var g=d.doc.getLine(e.start.row),h=g.substring(e.end.column,e.end.column+1);if(h=="}")return e.end.column++,e}}),this.add("parens","insertion",function(a,b,c,d,e){if(e=="("){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"("+g+")",selection:!1}:{text:"()",selection:[1,1]}}if(e==")"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j==")"){var k=d.$findOpeningBracket(")",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}}),this.add("parens","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="("){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h==")")return e.end.column++,e}}),this.add("string_dquotes","insertion",function(a,b,c,d,e){if(e=='"'||e=="'"){var f=e,g=c.getSelectionRange(),h=d.doc.getTextRange(g);if(h!=="")return{text:f+h+f,selection:!1};var i=c.getCursorPosition(),j=d.doc.getLine(i.row),k=j.substring(i.column-1,i.column);if(k=="\\")return null;var l=d.getTokens(g.start.row,g.start.row)[0].tokens,m=0,n,o=-1;for(var p=0;p<l.length;p++){n=l[p],n.type=="string"?o=-1:o<0&&(o=n.value.indexOf(f));if(n.value.length+m>g.start.column)break;m+=l[p].value.length}if(!n||o<0&&n.type!=="comment"&&(n.type!=="string"||g.start.column!==n.value.length+m-1&&n.value.lastIndexOf(f)===n.value.length-1))return{text:f+f,selection:[1,1]};if(n&&n.type==="string"){var q=j.substring(i.column,i.column+1);if(q==f)return{text:"",selection:[1,1]}}}}),this.add("string_dquotes","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&(f=='"'||f=="'")){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h=='"')return e.end.column++,e}})};d.inherits(f,e),b.CstyleBehaviour=f}),define("ace/mode/folding/cstyle",["require","exports","module","ace/lib/oop","ace/range","ace/mode/folding/fold_mode"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../../range").Range,f=a("./fold_mode").FoldMode,g=b.FoldMode=function(){};d.inherits(g,f),function(){this.foldingStartMarker=/(\{|\[)[^\}\]]*$|^\s*(\/\*)/,this.foldingStopMarker=/^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/,this.getFoldWidgetRange=function(a,b,c){var d=a.getLine(c),f=d.match(this.foldingStartMarker);if(f){var g=f.index;if(f[1])return this.openingBracketBlock(a,f[1],c,g);var h=a.getCommentFoldRange(c,g+f[0].length);return h.end.column-=2,h}if(b!=="markbeginend")return;var f=d.match(this.foldingStopMarker);if(f){var g=f.index+f[0].length;if(f[2]){var h=a.getCommentFoldRange(c,g);return h.end.column-=2,h}var i={row:c,column:g},j=a.$findOpeningBracket(f[1],i);if(!j)return;return j.column++,i.column--,e.fromPoints(j,i)}}}.call(g.prototype)}),define("ace/mode/folding/fold_mode",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../../range").Range,e=b.FoldMode=function(){};(function(){this.foldingStartMarker=null,this.foldingStopMarker=null,this.getFoldWidget=function(a,b,c){var d=a.getLine(c);return this.foldingStartMarker.test(d)?"start":b=="markbeginend"&&this.foldingStopMarker&&this.foldingStopMarker.test(d)?"end":""},this.getFoldWidgetRange=function(a,b,c){return null},this.indentationBlock=function(a,b,c){var e=/^\s*/,f=b,g=b,h=a.getLine(b),i=c||h.length,j=h.match(e)[0].length,k=a.getLength();while(++b<k){h=a.getLine(b);var l=h.match(e)[0].length;if(l==h.length)continue;if(l<=j)break;g=b}if(g>f){var m=a.getLine(g).length;return new d(f,i,g,m)}},this.openingBracketBlock=function(a,b,c,e){var f={row:c,column:e+1},g=a.$findClosingBracket(b,f);if(!g)return;var h=a.foldWidgets[g.row];return h==null&&(h=this.getFoldWidget(a,g.row)),h=="start"&&(g.row--,g.column=a.getLine(g.row).length),d.fromPoints(f,g)}}).call(e.prototype)})
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-scala-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-scala-uncompressed.js
deleted file mode 100644
index fb6e95f6f6..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-scala-uncompressed.js
+++ /dev/null
@@ -1,1372 +0,0 @@
-define('ace/mode/scala', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/javascript', 'ace/tokenizer', 'ace/mode/scala_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var JavaScriptMode = require("./javascript").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
-var ScalaHighlightRules = require("./scala_highlight_rules").ScalaHighlightRules;
-
-var Mode = function() {
-    JavaScriptMode.call(this);
-    
-    this.$tokenizer = new Tokenizer(new ScalaHighlightRules().getRules());
-};
-oop.inherits(Mode, JavaScriptMode);
-
-(function() {
-
-    this.createWorker = function(session) {
-        return null;
-    };
-
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/javascript', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/javascript_highlight_rules', 'ace/mode/matching_brace_outdent', 'ace/range', 'ace/worker/worker_client', 'ace/mode/behaviour/cstyle', 'ace/mode/folding/cstyle'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
-var JavaScriptHighlightRules = require("./javascript_highlight_rules").JavaScriptHighlightRules;
-var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
-var Range = require("../range").Range;
-var WorkerClient = require("../worker/worker_client").WorkerClient;
-var CstyleBehaviour = require("./behaviour/cstyle").CstyleBehaviour;
-var CStyleFoldMode = require("./folding/cstyle").FoldMode;
-
-var Mode = function() {
-    this.$tokenizer = new Tokenizer(new JavaScriptHighlightRules().getRules());
-    this.$outdent = new MatchingBraceOutdent();
-    this.$behaviour = new CstyleBehaviour();
-    this.foldingRules = new CStyleFoldMode();
-};
-oop.inherits(Mode, TextMode);
-
-(function() {
-
-
-    this.toggleCommentLines = function(state, doc, startRow, endRow) {
-        var outdent = true;
-        var re = /^(\s*)\/\//;
-
-        for (var i=startRow; i<= endRow; i++) {
-            if (!re.test(doc.getLine(i))) {
-                outdent = false;
-                break;
-            }
-        }
-
-        if (outdent) {
-            var deleteRange = new Range(0, 0, 0, 0);
-            for (var i=startRow; i<= endRow; i++)
-            {
-                var line = doc.getLine(i);
-                var m = line.match(re);
-                deleteRange.start.row = i;
-                deleteRange.end.row = i;
-                deleteRange.end.column = m[0].length;
-                doc.replace(deleteRange, m[1]);
-            }
-        }
-        else {
-            doc.indentRows(startRow, endRow, "//");
-        }
-    };
-
-    this.getNextLineIndent = function(state, line, tab) {
-        var indent = this.$getIndent(line);
-
-        var tokenizedLine = this.$tokenizer.getLineTokens(line, state);
-        var tokens = tokenizedLine.tokens;
-        var endState = tokenizedLine.state;
-
-        if (tokens.length && tokens[tokens.length-1].type == "comment") {
-            return indent;
-        }
-        
-        if (state == "start" || state == "regex_allowed") {
-            var match = line.match(/^.*(?:\bcase\b.*\:|[\{\(\[])\s*$/);
-            if (match) {
-                indent += tab;
-            }
-        } else if (state == "doc-start") {
-            if (endState == "start" || state == "regex_allowed") {
-                return "";
-            }
-            var match = line.match(/^\s*(\/?)\*/);
-            if (match) {
-                if (match[1]) {
-                    indent += " ";
-                }
-                indent += "* ";
-            }
-        }
-
-        return indent;
-    };
-
-    this.checkOutdent = function(state, line, input) {
-        return this.$outdent.checkOutdent(line, input);
-    };
-
-    this.autoOutdent = function(state, doc, row) {
-        this.$outdent.autoOutdent(doc, row);
-    };
-    
-    this.createWorker = function(session) {
-        var worker = new WorkerClient(["ace"], "worker-javascript.js", "ace/mode/javascript_worker", "JavaScriptWorker");
-        worker.attachToDocument(session.getDocument());
-            
-        worker.on("jslint", function(results) {
-            var errors = [];
-            for (var i=0; i<results.data.length; i++) {
-                var error = results.data[i];
-                if (error)
-                    errors.push({
-                        row: error.line-1,
-                        column: error.character-1,
-                        text: error.reason,
-                        type: "warning",
-                        lint: error
-                    });
-            }
-            session.setAnnotations(errors);
-        });
-        
-        worker.on("narcissus", function(e) {
-            session.setAnnotations([e.data]);
-        });
-        
-        worker.on("terminate", function() {
-            session.clearAnnotations();
-        });
-        
-        return worker;
-    };
-
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Mihai Sucan <mihai DOT sucan AT gmail DOT com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/javascript_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/unicode', 'ace/mode/doc_comment_highlight_rules', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var lang = require("../lib/lang");
-var unicode = require("../unicode");
-var DocCommentHighlightRules = require("./doc_comment_highlight_rules").DocCommentHighlightRules;
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var JavaScriptHighlightRules = function() {
-
-    // see: https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects
-    var globals = lang.arrayToMap(
-      // Constructors
-        ("Array|Boolean|Date|Function|Iterator|Number|Object|RegExp|String|Proxy|" +
-      // E4X
-         "Namespace|QName|XML|XMLList|" +
-         "ArrayBuffer|Float32Array|Float64Array|Int16Array|Int32Array|Int8Array|" +
-         "Uint16Array|Uint32Array|Uint8Array|Uint8ClampedArray|" +
-      // Errors
-        "Error|EvalError|InternalError|RangeError|ReferenceError|StopIteration|" +
-        "SyntaxError|TypeError|URIError|" +
-      //  Non-constructor functions
-        "decodeURI|decodeURIComponent|encodeURI|encodeURIComponent|eval|isFinite|" +
-        "isNaN|parseFloat|parseInt|" +
-      // Other
-        "JSON|Math|" +
-      // Pseudo
-        "this|arguments|prototype|window|document"
-      ).split("|")
-    );
-
-    var keywords = lang.arrayToMap(
-        ("break|case|catch|continue|default|delete|do|else|finally|for|function|" +
-        "if|in|instanceof|new|return|switch|throw|try|typeof|let|var|while|with|" +
-        "const|yield|import|get|set").split("|")
-    );
-
-    // keywords which can be followed by regular expressions
-    var kwBeforeRe = "case|do|else|finally|in|instanceof|return|throw|try|typeof|yield";
-
-    var deprecated = lang.arrayToMap(
-        ("__parent__|__count__|escape|unescape|with|__proto__").split("|")
-    );
-
-    var definitions = lang.arrayToMap(("const|let|var|function").split("|"));
-
-    var buildinConstants = lang.arrayToMap(
-        ("null|Infinity|NaN|undefined").split("|")
-    );
-
-    var futureReserved = lang.arrayToMap(
-        ("class|enum|extends|super|export|implements|private|" +
-        "public|interface|package|protected|static").split("|")
-    );
-
-    // TODO: Unicode escape sequences
-    var identifierRe = "[" + unicode.packages.L + "\\$_]["
-        + unicode.packages.L
-        + unicode.packages.Mn + unicode.packages.Mc
-        + unicode.packages.Nd
-        + unicode.packages.Pc + "\\$_]*\\b";
-
-    var escapedRe = "\\\\(?:x[0-9a-fA-F]{2}|" + // hex
-        "u[0-9a-fA-F]{4}|" + // unicode
-        "[0-2][0-7]{0,2}|" + // oct
-        "3[0-6][0-7]?|" + // oct
-        "37[0-7]?|" + // oct
-        "[4-7][0-7]?|" + //oct
-        ".)";
-
-    // regexp must not have capturing parentheses. Use (?:) instead.
-    // regexps are ordered -> the first match is used
-
-    this.$rules = {
-        "start" : [
-            {
-                token : "comment",
-                regex : /\/\/.*$/
-            },
-            new DocCommentHighlightRules().getStartRule("doc-start"),
-            {
-                token : "comment", // multi line comment
-                merge : true,
-                regex : /\/\*/,
-                next : "comment"
-            }, {
-                token : "string",
-                regex : "'",
-                next  : "qstring"
-            }, {
-                token : "string",
-                regex : '"',
-                next  : "qqstring"
-            }, {
-                token : "constant.numeric", // hex
-                regex : /0[xX][0-9a-fA-F]+\b/
-            }, {
-                token : "constant.numeric", // float
-                regex : /[+-]?\d+(?:(?:\.\d*)?(?:[eE][+-]?\d+)?)?\b/
-            }, { // match stuff like: Sound.prototype.play = function() { }
-                token : [
-                    "storage.type",
-                    "punctuation.operator",
-                    "support.function",
-                    "punctuation.operator",
-                    "entity.name.function",
-                    "text",
-                    "keyword.operator",
-                    "text",
-                    "storage.type",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(" + identifierRe + ")(\\.)(prototype)(\\.)(" + identifierRe +")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"
-            }, { // match stuff like: Sound.prototype.play = myfunc
-                token : [
-                    "storage.type",
-                    "punctuation.operator",
-                    "support.function",
-                    "punctuation.operator",
-                    "entity.name.function",
-                    "text",
-                    "keyword.operator",
-                    "text"
-                ],
-                regex : "(" + identifierRe + ")(\\.)(prototype)(\\.)(" + identifierRe +")(\\s*)(=)(\\s*)"
-            }, { // match stuff like: Sound.play = function() {  }
-                token : [
-                    "storage.type",
-                    "punctuation.operator",
-                    "entity.name.function",
-                    "text",
-                    "keyword.operator",
-                    "text",
-                    "storage.type",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(" + identifierRe + ")(\\.)(" + identifierRe +")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"
-            }, { // match stuff like: play = function() {  }
-                token : [
-                    "entity.name.function",
-                    "text",
-                    "keyword.operator",
-                    "text",
-                    "storage.type",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(" + identifierRe +")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"
-            }, { // match regular function like: function myFunc(arg) { }
-                token : [
-                    "storage.type",
-                    "text",
-                    "entity.name.function",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(function)(\\s+)(" + identifierRe + ")(\\s*)(\\()(.*?)(\\))"
-            }, { // match stuff like: foobar: function() { }
-                token : [
-                    "entity.name.function",
-                    "text",
-                    "punctuation.operator",
-                    "text",
-                    "storage.type",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(" + identifierRe + ")(\\s*)(:)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"
-            }, { // Attempt to match : function() { } (this is for issues with 'foo': function() { })
-                token : [
-                    "text",
-                    "text",
-                    "storage.type",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(:)(\\s*)(function)?(\\s*)(\\()([^)]*)(\\))"
-            }, {
-                token : "constant.language.boolean",
-                regex : /(?:true|false)\b/
-            }, {
-                token : "keyword",
-                regex : "(?:" + kwBeforeRe + ")\\b",
-                next : "regex_allowed"
-            }, {
-                token : ["punctuation.operator", "support.function"],
-                regex : /(\.)(s(?:h(?:ift|ow(?:Mod(?:elessDialog|alDialog)|Help))|croll(?:X|By(?:Pages|Lines)?|Y|To)?|t(?:opzzzz|rike)|i(?:n|zeToContent|debar|gnText)|ort|u(?:p|b(?:str(?:ing)?)?)|pli(?:ce|t)|e(?:nd|t(?:Re(?:sizable|questHeader)|M(?:i(?:nutes|lliseconds)|onth)|Seconds|Ho(?:tKeys|urs)|Year|Cursor|Time(?:out)?|Interval|ZOptions|Date|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Date|FullYear)|FullYear|Active)|arch)|qrt|lice|avePreferences|mall)|h(?:ome|andleEvent)|navigate|c(?:har(?:CodeAt|At)|o(?:s|n(?:cat|textual|firm)|mpile)|eil|lear(?:Timeout|Interval)?|a(?:ptureEvents|ll)|reate(?:StyleSheet|Popup|EventObject))|t(?:o(?:GMTString|S(?:tring|ource)|U(?:TCString|pperCase)|Lo(?:caleString|werCase))|est|a(?:n|int(?:Enabled)?))|i(?:s(?:NaN|Finite)|ndexOf|talics)|d(?:isableExternalCapture|ump|etachEvent)|u(?:n(?:shift|taint|escape|watch)|pdateCommands)|j(?:oin|avaEnabled)|p(?:o(?:p|w)|ush|lugins.refresh|a(?:ddings|rse(?:Int|Float)?)|r(?:int|ompt|eference))|e(?:scape|nableExternalCapture|val|lementFromPoint|x(?:p|ec(?:Script|Command)?))|valueOf|UTC|queryCommand(?:State|Indeterm|Enabled|Value)|f(?:i(?:nd|le(?:ModifiedDate|Size|CreatedDate|UpdatedDate)|xed)|o(?:nt(?:size|color)|rward)|loor|romCharCode)|watch|l(?:ink|o(?:ad|g)|astIndexOf)|a(?:sin|nchor|cos|t(?:tachEvent|ob|an(?:2)?)|pply|lert|b(?:s|ort))|r(?:ou(?:nd|teEvents)|e(?:size(?:By|To)|calc|turnValue|place|verse|l(?:oad|ease(?:Capture|Events)))|andom)|g(?:o|et(?:ResponseHeader|M(?:i(?:nutes|lliseconds)|onth)|Se(?:conds|lection)|Hours|Year|Time(?:zoneOffset)?|Da(?:y|te)|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Da(?:y|te)|FullYear)|FullYear|A(?:ttention|llResponseHeaders)))|m(?:in|ove(?:B(?:y|elow)|To(?:Absolute)?|Above)|ergeAttributes|a(?:tch|rgins|x))|b(?:toa|ig|o(?:ld|rderWidths)|link|ack))\b(?=\()/
-            }, {
-                token : ["punctuation.operator", "support.function.dom"],
-                regex : /(\.)(s(?:ub(?:stringData|mit)|plitText|e(?:t(?:NamedItem|Attribute(?:Node)?)|lect))|has(?:ChildNodes|Feature)|namedItem|c(?:l(?:ick|o(?:se|neNode))|reate(?:C(?:omment|DATASection|aption)|T(?:Head|extNode|Foot)|DocumentFragment|ProcessingInstruction|E(?:ntityReference|lement)|Attribute))|tabIndex|i(?:nsert(?:Row|Before|Cell|Data)|tem)|open|delete(?:Row|C(?:ell|aption)|T(?:Head|Foot)|Data)|focus|write(?:ln)?|a(?:dd|ppend(?:Child|Data))|re(?:set|place(?:Child|Data)|move(?:NamedItem|Child|Attribute(?:Node)?)?)|get(?:NamedItem|Element(?:sBy(?:Name|TagName)|ById)|Attribute(?:Node)?)|blur)\b(?=\()/
-            }, {
-                token : ["punctuation.operator", "support.constant"],
-                regex : /(\.)(s(?:ystemLanguage|cr(?:ipts|ollbars|een(?:X|Y|Top|Left))|t(?:yle(?:Sheets)?|atus(?:Text|bar)?)|ibling(?:Below|Above)|ource|uffixes|e(?:curity(?:Policy)?|l(?:ection|f)))|h(?:istory|ost(?:name)?|as(?:h|Focus))|y|X(?:MLDocument|SLDocument)|n(?:ext|ame(?:space(?:s|URI)|Prop))|M(?:IN_VALUE|AX_VALUE)|c(?:haracterSet|o(?:n(?:structor|trollers)|okieEnabled|lorDepth|mp(?:onents|lete))|urrent|puClass|l(?:i(?:p(?:boardData)?|entInformation)|osed|asses)|alle(?:e|r)|rypto)|t(?:o(?:olbar|p)|ext(?:Transform|Indent|Decoration|Align)|ags)|SQRT(?:1_2|2)|i(?:n(?:ner(?:Height|Width)|put)|ds|gnoreCase)|zIndex|o(?:scpu|n(?:readystatechange|Line)|uter(?:Height|Width)|p(?:sProfile|ener)|ffscreenBuffering)|NEGATIVE_INFINITY|d(?:i(?:splay|alog(?:Height|Top|Width|Left|Arguments)|rectories)|e(?:scription|fault(?:Status|Ch(?:ecked|arset)|View)))|u(?:ser(?:Profile|Language|Agent)|n(?:iqueID|defined)|pdateInterval)|_content|p(?:ixelDepth|ort|ersonalbar|kcs11|l(?:ugins|atform)|a(?:thname|dding(?:Right|Bottom|Top|Left)|rent(?:Window|Layer)?|ge(?:X(?:Offset)?|Y(?:Offset)?))|r(?:o(?:to(?:col|type)|duct(?:Sub)?|mpter)|e(?:vious|fix)))|e(?:n(?:coding|abledPlugin)|x(?:ternal|pando)|mbeds)|v(?:isibility|endor(?:Sub)?|Linkcolor)|URLUnencoded|P(?:I|OSITIVE_INFINITY)|f(?:ilename|o(?:nt(?:Size|Family|Weight)|rmName)|rame(?:s|Element)|gColor)|E|whiteSpace|l(?:i(?:stStyleType|n(?:eHeight|kColor))|o(?:ca(?:tion(?:bar)?|lName)|wsrc)|e(?:ngth|ft(?:Context)?)|a(?:st(?:M(?:odified|atch)|Index|Paren)|yer(?:s|X)|nguage))|a(?:pp(?:MinorVersion|Name|Co(?:deName|re)|Version)|vail(?:Height|Top|Width|Left)|ll|r(?:ity|guments)|Linkcolor|bove)|r(?:ight(?:Context)?|e(?:sponse(?:XML|Text)|adyState))|global|x|m(?:imeTypes|ultiline|enubar|argin(?:Right|Bottom|Top|Left))|L(?:N(?:10|2)|OG(?:10E|2E))|b(?:o(?:ttom|rder(?:Width|RightWidth|BottomWidth|Style|Color|TopWidth|LeftWidth))|ufferDepth|elow|ackground(?:Color|Image)))\b/
-            }, {
-                token : ["storage.type", "punctuation.operator", "support.function.firebug"],
-                regex : /(console)(\.)(warn|info|log|error|time|timeEnd|assert)\b/
-            }, {
-                token : function(value) {
-                    if (globals.hasOwnProperty(value))
-                        return "variable.language";
-                    else if (deprecated.hasOwnProperty(value))
-                        return "invalid.deprecated";
-                    else if (definitions.hasOwnProperty(value))
-                        return "storage.type";
-                    else if (keywords.hasOwnProperty(value))
-                        return "keyword";
-                    else if (buildinConstants.hasOwnProperty(value))
-                        return "constant.language";
-                    else if (futureReserved.hasOwnProperty(value))
-                        return "invalid.illegal";
-                    else if (value == "debugger")
-                        return "invalid.deprecated";
-                    else
-                        return "identifier";
-                },
-                regex : identifierRe
-            }, {
-                token : "keyword.operator",
-                regex : /!|\$|%|&|\*|\-\-|\-|\+\+|\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\|\||\?\:|\*=|%=|\+=|\-=|&=|\^=|\b(?:in|instanceof|new|delete|typeof|void)/,
-                next  : "regex_allowed"
-            }, {
-                token : "punctuation.operator",
-                regex : /\?|\:|\,|\;|\./,
-                next  : "regex_allowed"
-            }, {
-                token : "paren.lparen",
-                regex : /[\[({]/,
-                next  : "regex_allowed"
-            }, {
-                token : "paren.rparen",
-                regex : /[\])}]/
-            }, {
-                token : "keyword.operator",
-                regex : /\/=?/,
-                next  : "regex_allowed"
-            }, {
-                token: "comment",
-                regex: /^#!.*$/
-            }, {
-                token : "text",
-                regex : /\s+/
-            }
-        ],
-        // regular expressions are only allowed after certain tokens. This
-        // makes sure we don't mix up regexps with the divison operator
-        "regex_allowed": [
-            {
-                token : "comment", // multi line comment
-                merge : true,
-                regex : "\\/\\*",
-                next : "comment_regex_allowed"
-            }, {
-                token : "comment",
-                regex : "\\/\\/.*$"
-            }, {
-                token: "string.regexp",
-                regex: "\\/",
-                next: "regex",
-                merge: true
-            }, {
-                token : "text",
-                regex : "\\s+"
-            }, {
-                // immediately return to the start mode without matching
-                // anything
-                token: "empty",
-                regex: "",
-                next: "start"
-            }
-        ],
-        "regex": [
-            {
-                token: "regexp.keyword.operator",
-                regex: "\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",
-                next: "regex"
-            }, {
-				// flag
-                token: "string.regexp",
-                regex: "/\\w*",
-                next: "start",
-                merge: true
-            }, {
-                token: "string.regexp",
-                regex: "[^\\\\/\\[]+",
-                next: "regex",
-                merge: true
-            }, {
-                token: "string.regexp.charachterclass",
-                regex: "\\[",
-                next: "regex_character_class",
-                merge: true
-            }, {
-                token: "empty",
-                regex: "",
-                next: "start"
-            }
-        ],
-        "regex_character_class": [
-            {
-                token: "regexp.keyword.operator",
-                regex: "\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",
-                next: "regex_character_class"
-            }, {
-                token: "string.regexp.charachterclass",
-                regex: "]",
-                next: "regex",
-                merge: true
-            }, {
-                token: "string.regexp.charachterclass",
-                regex: "[^\\\\\\]]+",
-                next: "regex_character_class",
-                merge: true
-            }, {
-                token: "empty",
-                regex: "",
-                next: "start"
-            }
-        ],
-        "comment_regex_allowed" : [
-            {
-                token : "comment", // closing comment
-                regex : ".*?\\*\\/",
-                merge : true,
-                next : "regex_allowed"
-            }, {
-                token : "comment", // comment spanning whole line
-                merge : true,
-                regex : ".+"
-            }
-        ],
-        "comment" : [
-            {
-                token : "comment", // closing comment
-                regex : ".*?\\*\\/",
-                merge : true,
-                next : "start"
-            }, {
-                token : "comment", // comment spanning whole line
-                merge : true,
-                regex : ".+"
-            }
-        ],
-        "qqstring" : [
-            {
-                token : "constant.language.escape",
-                regex : escapedRe
-            }, {
-                token : "string",
-                regex : '[^"\\\\]+'
-            }, {
-                token : "string",
-                regex : '"',
-                next  : "start"
-            }
-        ],
-        "qstring" : [
-            {
-                token : "constant.language.escape",
-                regex : escapedRe
-            }, {
-                token : "string",
-                regex : "[^'\\\\]+"
-            }, {
-                token : "string",
-                regex : "'",
-                next  : "start"
-            }
-        ]
-    };
-
-    this.embedRules(DocCommentHighlightRules, "doc-",
-        [ new DocCommentHighlightRules().getEndRule("start") ]);
-};
-
-oop.inherits(JavaScriptHighlightRules, TextHighlightRules);
-
-exports.JavaScriptHighlightRules = JavaScriptHighlightRules;
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/doc_comment_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var DocCommentHighlightRules = function() {
-
-    this.$rules = {
-        "start" : [ {
-            token : "comment.doc.tag",
-            regex : "@[\\w\\d_]+" // TODO: fix email addresses
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "\\s+"
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "TODO"
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "[^@\\*]+"
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "."
-        }]
-    };
-};
-
-oop.inherits(DocCommentHighlightRules, TextHighlightRules);
-
-(function() {
-
-    this.getStartRule = function(start) {
-        return {
-            token : "comment.doc", // doc comment
-            merge : true,
-            regex : "\\/\\*(?=\\*)",
-            next  : start
-        };
-    };
-    
-    this.getEndRule = function (start) {
-        return {
-            token : "comment.doc", // closing comment
-            merge : true,
-            regex : "\\*\\/",
-            next  : start
-        };
-    };
-
-}).call(DocCommentHighlightRules.prototype);
-
-exports.DocCommentHighlightRules = DocCommentHighlightRules;
-
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/matching_brace_outdent', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../range").Range;
-
-var MatchingBraceOutdent = function() {};
-
-(function() {
-
-    this.checkOutdent = function(line, input) {
-        if (! /^\s+$/.test(line))
-            return false;
-
-        return /^\s*\}/.test(input);
-    };
-
-    this.autoOutdent = function(doc, row) {
-        var line = doc.getLine(row);
-        var match = line.match(/^(\s*\})/);
-
-        if (!match) return 0;
-
-        var column = match[1].length;
-        var openBracePos = doc.findMatchingBracket({row: row, column: column});
-
-        if (!openBracePos || openBracePos.row == row) return 0;
-
-        var indent = this.$getIndent(doc.getLine(openBracePos.row));
-        doc.replace(new Range(row, 0, row, column-1), indent);
-    };
-
-    this.$getIndent = function(line) {
-        var match = line.match(/^(\s+)/);
-        if (match) {
-            return match[1];
-        }
-
-        return "";
-    };
-
-}).call(MatchingBraceOutdent.prototype);
-
-exports.MatchingBraceOutdent = MatchingBraceOutdent;
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Chris Spencer <chris.ag.spencer AT googlemail DOT com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/behaviour/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/behaviour'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var Behaviour = require('../behaviour').Behaviour;
-
-var CstyleBehaviour = function () {
-
-    this.add("braces", "insertion", function (state, action, editor, session, text) {
-        if (text == '{') {
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: '{' + selected + '}',
-                    selection: false
-                };
-            } else {
-                return {
-                    text: '{}',
-                    selection: [1, 1]
-                };
-            }
-        } else if (text == '}') {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == '}') {
-                var matching = session.$findOpeningBracket('}', {column: cursor.column + 1, row: cursor.row});
-                if (matching !== null) {
-                    return {
-                        text: '',
-                        selection: [1, 1]
-                    };
-                }
-            }
-        } else if (text == "\n") {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == '}') {
-                var openBracePos = session.findMatchingBracket({row: cursor.row, column: cursor.column + 1});
-                if (!openBracePos)
-                     return null;
-
-                var indent = this.getNextLineIndent(state, line.substring(0, line.length - 1), session.getTabString());
-                var next_indent = this.$getIndent(session.doc.getLine(openBracePos.row));
-
-                return {
-                    text: '\n' + indent + '\n' + next_indent,
-                    selection: [1, indent.length, 1, indent.length]
-                };
-            }
-        }
-    });
-
-    this.add("braces", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && selected == '{') {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.end.column, range.end.column + 1);
-            if (rightChar == '}') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-    this.add("parens", "insertion", function (state, action, editor, session, text) {
-        if (text == '(') {
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: '(' + selected + ')',
-                    selection: false
-                };
-            } else {
-                return {
-                    text: '()',
-                    selection: [1, 1]
-                };
-            }
-        } else if (text == ')') {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == ')') {
-                var matching = session.$findOpeningBracket(')', {column: cursor.column + 1, row: cursor.row});
-                if (matching !== null) {
-                    return {
-                        text: '',
-                        selection: [1, 1]
-                    };
-                }
-            }
-        }
-    });
-
-    this.add("parens", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && selected == '(') {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
-            if (rightChar == ')') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-    this.add("string_dquotes", "insertion", function (state, action, editor, session, text) {
-        if (text == '"' || text == "'") {
-            var quote = text;
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: quote + selected + quote,
-                    selection: false
-                };
-            } else {
-                var cursor = editor.getCursorPosition();
-                var line = session.doc.getLine(cursor.row);
-                var leftChar = line.substring(cursor.column-1, cursor.column);
-
-                // We're escaped.
-                if (leftChar == '\\') {
-                    return null;
-                }
-
-                // Find what token we're inside.
-                var tokens = session.getTokens(selection.start.row, selection.start.row)[0].tokens;
-                var col = 0, token;
-                var quotepos = -1; // Track whether we're inside an open quote.
-
-                for (var x = 0; x < tokens.length; x++) {
-                    token = tokens[x];
-                    if (token.type == "string") {
-                      quotepos = -1;
-                    } else if (quotepos < 0) {
-                      quotepos = token.value.indexOf(quote);
-                    }
-                    if ((token.value.length + col) > selection.start.column) {
-                        break;
-                    }
-                    col += tokens[x].value.length;
-                }
-
-                // Try and be smart about when we auto insert.
-                if (!token || (quotepos < 0 && token.type !== "comment" && (token.type !== "string" || ((selection.start.column !== token.value.length+col-1) && token.value.lastIndexOf(quote) === token.value.length-1)))) {
-                    return {
-                        text: quote + quote,
-                        selection: [1,1]
-                    };
-                } else if (token && token.type === "string") {
-                    // Ignore input and move right one if we're typing over the closing quote.
-                    var rightChar = line.substring(cursor.column, cursor.column + 1);
-                    if (rightChar == quote) {
-                        return {
-                            text: '',
-                            selection: [1, 1]
-                        };
-                    }
-                }
-            }
-        }
-    });
-
-    this.add("string_dquotes", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && (selected == '"' || selected == "'")) {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
-            if (rightChar == '"') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-};
-
-oop.inherits(CstyleBehaviour, Behaviour);
-
-exports.CstyleBehaviour = CstyleBehaviour;
-});/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/folding/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/range', 'ace/mode/folding/fold_mode'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var Range = require("../../range").Range;
-var BaseFoldMode = require("./fold_mode").FoldMode;
-
-var FoldMode = exports.FoldMode = function() {};
-oop.inherits(FoldMode, BaseFoldMode);
-
-(function() {
-
-    this.foldingStartMarker = /(\{|\[)[^\}\]]*$|^\s*(\/\*)/;
-    this.foldingStopMarker = /^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/;
-    
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        var line = session.getLine(row);
-        var match = line.match(this.foldingStartMarker);
-        if (match) {
-            var i = match.index;
-
-            if (match[1])
-                return this.openingBracketBlock(session, match[1], row, i);
-
-            var range = session.getCommentFoldRange(row, i + match[0].length);
-            range.end.column -= 2;
-            return range;
-        }
-
-        if (foldStyle !== "markbeginend")
-            return;
-            
-        var match = line.match(this.foldingStopMarker);
-        if (match) {
-            var i = match.index + match[0].length;
-
-            if (match[2]) {
-                var range = session.getCommentFoldRange(row, i);
-                range.end.column -= 2;
-                return range;
-            }
-
-            var end = {row: row, column: i};
-            var start = session.$findOpeningBracket(match[1], end);
-            
-            if (!start)
-                return;
-
-            start.column++;
-            end.column--;
-
-            return  Range.fromPoints(start, end);
-        }
-    };
-    
-}).call(FoldMode.prototype);
-
-});/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/folding/fold_mode', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../../range").Range;
-
-var FoldMode = exports.FoldMode = function() {};
-
-(function() {
-
-    this.foldingStartMarker = null;
-    this.foldingStopMarker = null;
-
-    // must return "" if there's no fold, to enable caching
-    this.getFoldWidget = function(session, foldStyle, row) {
-        var line = session.getLine(row);
-        if (this.foldingStartMarker.test(line))
-            return "start";
-        if (foldStyle == "markbeginend"
-                && this.foldingStopMarker
-                && this.foldingStopMarker.test(line))
-            return "end";
-        return "";
-    };
-    
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        return null;
-    };
-
-    this.indentationBlock = function(session, row, column) {
-        var re = /^\s*/;
-        var startRow = row;
-        var endRow = row;
-        var line = session.getLine(row);
-        var startColumn = column || line.length;
-        var startLevel = line.match(re)[0].length;
-        var maxRow = session.getLength()
-        
-        while (++row < maxRow) {
-            line = session.getLine(row);
-            var level = line.match(re)[0].length;
-
-            if (level == line.length)
-                continue;
-
-            if (level <= startLevel)
-                break;
-
-            endRow = row;
-        }
-
-        if (endRow > startRow) {
-            var endColumn = session.getLine(endRow).length;
-            return new Range(startRow, startColumn, endRow, endColumn);
-        }
-    };
-
-    this.openingBracketBlock = function(session, bracket, row, column) {
-        var start = {row: row, column: column + 1};
-        var end = session.$findClosingBracket(bracket, start);
-        if (!end)
-            return;
-
-        var fw = session.foldWidgets[end.row];
-        if (fw == null)
-            fw = this.getFoldWidget(session, end.row);
-
-        if (fw == "start") {
-            end.row --;
-            end.column = session.getLine(end.row).length;
-        }
-        return Range.fromPoints(start, end);
-    };
-
-}).call(FoldMode.prototype);
-
-});
-define('ace/mode/scala_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/mode/doc_comment_highlight_rules', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var lang = require("../lib/lang");
-var DocCommentHighlightRules = require("./doc_comment_highlight_rules").DocCommentHighlightRules;
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var ScalaHighlightRules = function() {
-
-    // taken from http://download.oracle.com/javase/tutorial/java/nutsandbolts/_keywords.html
-    var keywords = lang.arrayToMap(
-        (
-            "case|default|do|else|for|if|match|while|throw|return|try|catch|finally|yield|" +
-            "abstract|class|def|extends|final|forSome|implicit|implicits|import|lazy|new|object|" +
-            "override|package|private|protected|sealed|super|this|trait|type|val|var|with"
-        ).split("|")
-    );
-
-    var buildinConstants = lang.arrayToMap(
-        ("true|false").split("|")
-    );
-    
-    var langClasses = lang.arrayToMap(
-        ("AbstractMethodError|AssertionError|ClassCircularityError|"+
-        "ClassFormatError|Deprecated|EnumConstantNotPresentException|"+
-        "ExceptionInInitializerError|IllegalAccessError|"+
-        "IllegalThreadStateException|InstantiationError|InternalError|"+
-
-        "NegativeArraySizeException|NoSuchFieldError|Override|Process|"+
-        "ProcessBuilder|SecurityManager|StringIndexOutOfBoundsException|"+
-        "SuppressWarnings|TypeNotPresentException|UnknownError|"+
-        "UnsatisfiedLinkError|UnsupportedClassVersionError|VerifyError|"+
-        "InstantiationException|IndexOutOfBoundsException|"+
-        "ArrayIndexOutOfBoundsException|CloneNotSupportedException|"+
-        "NoSuchFieldException|IllegalArgumentException|NumberFormatException|"+
-        "SecurityException|Void|InheritableThreadLocal|IllegalStateException|"+
-        "InterruptedException|NoSuchMethodException|IllegalAccessException|"+
-        "UnsupportedOperationException|Enum|StrictMath|Package|Compiler|"+
-        "Readable|Runtime|StringBuilder|Math|IncompatibleClassChangeError|"+
-        "NoSuchMethodError|ThreadLocal|RuntimePermission|ArithmeticException|"+
-        "NullPointerException|Long|Integer|Short|Byte|Double|Number|Float|"+
-        "Character|Boolean|StackTraceElement|Appendable|StringBuffer|"+
-        "Iterable|ThreadGroup|Runnable|Thread|IllegalMonitorStateException|"+
-        "StackOverflowError|OutOfMemoryError|VirtualMachineError|"+
-        "ArrayStoreException|ClassCastException|LinkageError|"+
-        "NoClassDefFoundError|ClassNotFoundException|RuntimeException|"+
-        "Exception|ThreadDeath|Error|Throwable|System|ClassLoader|"+
-        "Cloneable|Class|CharSequence|Comparable|String|Object|" +
-        "Unit|Any|AnyVal|AnyRef|Null|ScalaObject|Singleton|Seq|Iterable|List|" +
-        "Option|Array|Char|Byte|Short|Int|Long|Nothing"
-        
-        ).split("|")
-    );
-    
-    var importClasses = lang.arrayToMap(
-        ("").split("|")
-    );
-    // regexp must not have capturing parentheses. Use (?:) instead.
-    // regexps are ordered -> the first match is used
-
-    this.$rules = {
-        "start" : [
-            {
-                token : "comment",
-                regex : "\\/\\/.*$"
-            },
-            new DocCommentHighlightRules().getStartRule("doc-start"),
-            {
-                token : "comment", // multi line comment
-                merge : true,
-                regex : "\\/\\*",
-                next : "comment"
-            }, {
-                token : "string.regexp",
-                regex : "[/](?:(?:\\[(?:\\\\]|[^\\]])+\\])|(?:\\\\/|[^\\]/]))*[/]\\w*\\s*(?=[).,;]|$)"
-            }, {
-                token : "string", // single line
-                regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
-            }, {
-                token : "string", // single line
-                regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"
-            }, {
-                token : "constant.numeric", // hex
-                regex : "0[xX][0-9a-fA-F]+\\b"
-            }, {
-                token : "constant.numeric", // float
-                regex : "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"
-            }, {
-                token : "constant.language.boolean",
-                regex : "(?:true|false)\\b"
-            }, {
-                token : function(value) {
-                    if (value == "this")
-                        return "variable.language";
-                    else if (keywords.hasOwnProperty(value))
-                        return "keyword";
-                    else if (langClasses.hasOwnProperty(value))
-                        return "support.function";
-                    else if (importClasses.hasOwnProperty(value))
-                        return "support.function";
-                    else if (buildinConstants.hasOwnProperty(value))
-                        return "constant.language";
-                    else
-                        return "identifier";
-                },
-                // TODO: Unicode escape sequences
-                // TODO: Unicode identifiers
-                regex : "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
-            }, {
-                token : "keyword.operator",
-                regex : "!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)"
-            }, {
-                token : "paren.lparen",
-                regex : "[[({]"
-            }, {
-                token : "paren.rparen",
-                regex : "[\\])}]"
-            }, {
-                token : "text",
-                regex : "\\s+"
-            }
-        ],
-        "comment" : [
-            {
-                token : "comment", // closing comment
-                regex : ".*?\\*\\/",
-                next : "start"
-            }, {
-                token : "comment", // comment spanning whole line
-                merge : true,
-                regex : ".+"
-            }
-        ]
-    };
-    
-    this.embedRules(DocCommentHighlightRules, "doc-",
-        [ new DocCommentHighlightRules().getEndRule("start") ]);
-};
-
-oop.inherits(ScalaHighlightRules, TextHighlightRules);
-
-exports.ScalaHighlightRules = ScalaHighlightRules;
-});
diff --git a/apps/files_texteditor/js/aceeditor/mode-scala.js b/apps/files_texteditor/js/aceeditor/mode-scala.js
deleted file mode 100644
index e0ba4b537d..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-scala.js
+++ /dev/null
@@ -1 +0,0 @@
-define("ace/mode/scala",["require","exports","module","ace/lib/oop","ace/mode/javascript","ace/tokenizer","ace/mode/scala_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./javascript").Mode,f=a("../tokenizer").Tokenizer,g=a("./scala_highlight_rules").ScalaHighlightRules,h=function(){e.call(this),this.$tokenizer=new f((new g).getRules())};d.inherits(h,e),function(){this.createWorker=function(a){return null}}.call(h.prototype),b.Mode=h}),define("ace/mode/javascript",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/javascript_highlight_rules","ace/mode/matching_brace_outdent","ace/range","ace/worker/worker_client","ace/mode/behaviour/cstyle","ace/mode/folding/cstyle"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./javascript_highlight_rules").JavaScriptHighlightRules,h=a("./matching_brace_outdent").MatchingBraceOutdent,i=a("../range").Range,j=a("../worker/worker_client").WorkerClient,k=a("./behaviour/cstyle").CstyleBehaviour,l=a("./folding/cstyle").FoldMode,m=function(){this.$tokenizer=new f((new g).getRules()),this.$outdent=new h,this.$behaviour=new k,this.foldingRules=new l};d.inherits(m,e),function(){this.toggleCommentLines=function(a,b,c,d){var e=!0,f=/^(\s*)\/\//;for(var g=c;g<=d;g++)if(!f.test(b.getLine(g))){e=!1;break}if(e){var h=new i(0,0,0,0);for(var g=c;g<=d;g++){var j=b.getLine(g),k=j.match(f);h.start.row=g,h.end.row=g,h.end.column=k[0].length,b.replace(h,k[1])}}else b.indentRows(c,d,"//")},this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a),f=e.tokens,g=e.state;if(f.length&&f[f.length-1].type=="comment")return d;if(a=="start"||a=="regex_allowed"){var h=b.match(/^.*(?:\bcase\b.*\:|[\{\(\[])\s*$/);h&&(d+=c)}else if(a=="doc-start"){if(g=="start"||a=="regex_allowed")return"";var h=b.match(/^\s*(\/?)\*/);h&&(h[1]&&(d+=" "),d+="* ")}return d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)},this.createWorker=function(a){var b=new j(["ace"],"worker-javascript.js","ace/mode/javascript_worker","JavaScriptWorker");return b.attachToDocument(a.getDocument()),b.on("jslint",function(b){var c=[];for(var d=0;d<b.data.length;d++){var e=b.data[d];e&&c.push({row:e.line-1,column:e.character-1,text:e.reason,type:"warning",lint:e})}a.setAnnotations(c)}),b.on("narcissus",function(b){a.setAnnotations([b.data])}),b.on("terminate",function(){a.clearAnnotations()}),b}}.call(m.prototype),b.Mode=m}),define("ace/mode/javascript_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/unicode","ace/mode/doc_comment_highlight_rules","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("../unicode"),g=a("./doc_comment_highlight_rules").DocCommentHighlightRules,h=a("./text_highlight_rules").TextHighlightRules,i=function(){var a=e.arrayToMap("Array|Boolean|Date|Function|Iterator|Number|Object|RegExp|String|Proxy|Namespace|QName|XML|XMLList|ArrayBuffer|Float32Array|Float64Array|Int16Array|Int32Array|Int8Array|Uint16Array|Uint32Array|Uint8Array|Uint8ClampedArray|Error|EvalError|InternalError|RangeError|ReferenceError|StopIteration|SyntaxError|TypeError|URIError|decodeURI|decodeURIComponent|encodeURI|encodeURIComponent|eval|isFinite|isNaN|parseFloat|parseInt|JSON|Math|this|arguments|prototype|window|document".split("|")),b=e.arrayToMap("break|case|catch|continue|default|delete|do|else|finally|for|function|if|in|instanceof|new|return|switch|throw|try|typeof|let|var|while|with|const|yield|import|get|set".split("|")),c="case|do|else|finally|in|instanceof|return|throw|try|typeof|yield",d=e.arrayToMap("__parent__|__count__|escape|unescape|with|__proto__".split("|")),h=e.arrayToMap("const|let|var|function".split("|")),i=e.arrayToMap("null|Infinity|NaN|undefined".split("|")),j=e.arrayToMap("class|enum|extends|super|export|implements|private|public|interface|package|protected|static".split("|")),k="["+f.packages.L+"\\$_]["+f.packages.L+f.packages.Mn+f.packages.Mc+f.packages.Nd+f.packages.Pc+"\\$_]*\\b",l="\\\\(?:x[0-9a-fA-F]{2}|u[0-9a-fA-F]{4}|[0-2][0-7]{0,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.)";this.$rules={start:[{token:"comment",regex:/\/\/.*$/},(new g).getStartRule("doc-start"),{token:"comment",merge:!0,regex:/\/\*/,next:"comment"},{token:"string",regex:"'",next:"qstring"},{token:"string",regex:'"',next:"qqstring"},{token:"constant.numeric",regex:/0[xX][0-9a-fA-F]+\b/},{token:"constant.numeric",regex:/[+-]?\d+(?:(?:\.\d*)?(?:[eE][+-]?\d+)?)?\b/},{token:["storage.type","punctuation.operator","support.function","punctuation.operator","entity.name.function","text","keyword.operator","text","storage.type","text","paren.lparen","variable.parameter","paren.rparen"],regex:"("+k+")(\\.)(prototype)(\\.)("+k+")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"},{token:["storage.type","punctuation.operator","support.function","punctuation.operator","entity.name.function","text","keyword.operator","text"],regex:"("+k+")(\\.)(prototype)(\\.)("+k+")(\\s*)(=)(\\s*)"},{token:["storage.type","punctuation.operator","entity.name.function","text","keyword.operator","text","storage.type","text","paren.lparen","variable.parameter","paren.rparen"],regex:"("+k+")(\\.)("+k+")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"},{token:["entity.name.function","text","keyword.operator","text","storage.type","text","paren.lparen","variable.parameter","paren.rparen"],regex:"("+k+")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"},{token:["storage.type","text","entity.name.function","text","paren.lparen","variable.parameter","paren.rparen"],regex:"(function)(\\s+)("+k+")(\\s*)(\\()(.*?)(\\))"},{token:["entity.name.function","text","punctuation.operator","text","storage.type","text","paren.lparen","variable.parameter","paren.rparen"],regex:"("+k+")(\\s*)(:)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"},{token:["text","text","storage.type","text","paren.lparen","variable.parameter","paren.rparen"],regex:"(:)(\\s*)(function)?(\\s*)(\\()([^)]*)(\\))"},{token:"constant.language.boolean",regex:/(?:true|false)\b/},{token:"keyword",regex:"(?:"+c+")\\b",next:"regex_allowed"},{token:["punctuation.operator","support.function"],regex:/(\.)(s(?:h(?:ift|ow(?:Mod(?:elessDialog|alDialog)|Help))|croll(?:X|By(?:Pages|Lines)?|Y|To)?|t(?:opzzzz|rike)|i(?:n|zeToContent|debar|gnText)|ort|u(?:p|b(?:str(?:ing)?)?)|pli(?:ce|t)|e(?:nd|t(?:Re(?:sizable|questHeader)|M(?:i(?:nutes|lliseconds)|onth)|Seconds|Ho(?:tKeys|urs)|Year|Cursor|Time(?:out)?|Interval|ZOptions|Date|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Date|FullYear)|FullYear|Active)|arch)|qrt|lice|avePreferences|mall)|h(?:ome|andleEvent)|navigate|c(?:har(?:CodeAt|At)|o(?:s|n(?:cat|textual|firm)|mpile)|eil|lear(?:Timeout|Interval)?|a(?:ptureEvents|ll)|reate(?:StyleSheet|Popup|EventObject))|t(?:o(?:GMTString|S(?:tring|ource)|U(?:TCString|pperCase)|Lo(?:caleString|werCase))|est|a(?:n|int(?:Enabled)?))|i(?:s(?:NaN|Finite)|ndexOf|talics)|d(?:isableExternalCapture|ump|etachEvent)|u(?:n(?:shift|taint|escape|watch)|pdateCommands)|j(?:oin|avaEnabled)|p(?:o(?:p|w)|ush|lugins.refresh|a(?:ddings|rse(?:Int|Float)?)|r(?:int|ompt|eference))|e(?:scape|nableExternalCapture|val|lementFromPoint|x(?:p|ec(?:Script|Command)?))|valueOf|UTC|queryCommand(?:State|Indeterm|Enabled|Value)|f(?:i(?:nd|le(?:ModifiedDate|Size|CreatedDate|UpdatedDate)|xed)|o(?:nt(?:size|color)|rward)|loor|romCharCode)|watch|l(?:ink|o(?:ad|g)|astIndexOf)|a(?:sin|nchor|cos|t(?:tachEvent|ob|an(?:2)?)|pply|lert|b(?:s|ort))|r(?:ou(?:nd|teEvents)|e(?:size(?:By|To)|calc|turnValue|place|verse|l(?:oad|ease(?:Capture|Events)))|andom)|g(?:o|et(?:ResponseHeader|M(?:i(?:nutes|lliseconds)|onth)|Se(?:conds|lection)|Hours|Year|Time(?:zoneOffset)?|Da(?:y|te)|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Da(?:y|te)|FullYear)|FullYear|A(?:ttention|llResponseHeaders)))|m(?:in|ove(?:B(?:y|elow)|To(?:Absolute)?|Above)|ergeAttributes|a(?:tch|rgins|x))|b(?:toa|ig|o(?:ld|rderWidths)|link|ack))\b(?=\()/},{token:["punctuation.operator","support.function.dom"],regex:/(\.)(s(?:ub(?:stringData|mit)|plitText|e(?:t(?:NamedItem|Attribute(?:Node)?)|lect))|has(?:ChildNodes|Feature)|namedItem|c(?:l(?:ick|o(?:se|neNode))|reate(?:C(?:omment|DATASection|aption)|T(?:Head|extNode|Foot)|DocumentFragment|ProcessingInstruction|E(?:ntityReference|lement)|Attribute))|tabIndex|i(?:nsert(?:Row|Before|Cell|Data)|tem)|open|delete(?:Row|C(?:ell|aption)|T(?:Head|Foot)|Data)|focus|write(?:ln)?|a(?:dd|ppend(?:Child|Data))|re(?:set|place(?:Child|Data)|move(?:NamedItem|Child|Attribute(?:Node)?)?)|get(?:NamedItem|Element(?:sBy(?:Name|TagName)|ById)|Attribute(?:Node)?)|blur)\b(?=\()/},{token:["punctuation.operator","support.constant"],regex:/(\.)(s(?:ystemLanguage|cr(?:ipts|ollbars|een(?:X|Y|Top|Left))|t(?:yle(?:Sheets)?|atus(?:Text|bar)?)|ibling(?:Below|Above)|ource|uffixes|e(?:curity(?:Policy)?|l(?:ection|f)))|h(?:istory|ost(?:name)?|as(?:h|Focus))|y|X(?:MLDocument|SLDocument)|n(?:ext|ame(?:space(?:s|URI)|Prop))|M(?:IN_VALUE|AX_VALUE)|c(?:haracterSet|o(?:n(?:structor|trollers)|okieEnabled|lorDepth|mp(?:onents|lete))|urrent|puClass|l(?:i(?:p(?:boardData)?|entInformation)|osed|asses)|alle(?:e|r)|rypto)|t(?:o(?:olbar|p)|ext(?:Transform|Indent|Decoration|Align)|ags)|SQRT(?:1_2|2)|i(?:n(?:ner(?:Height|Width)|put)|ds|gnoreCase)|zIndex|o(?:scpu|n(?:readystatechange|Line)|uter(?:Height|Width)|p(?:sProfile|ener)|ffscreenBuffering)|NEGATIVE_INFINITY|d(?:i(?:splay|alog(?:Height|Top|Width|Left|Arguments)|rectories)|e(?:scription|fault(?:Status|Ch(?:ecked|arset)|View)))|u(?:ser(?:Profile|Language|Agent)|n(?:iqueID|defined)|pdateInterval)|_content|p(?:ixelDepth|ort|ersonalbar|kcs11|l(?:ugins|atform)|a(?:thname|dding(?:Right|Bottom|Top|Left)|rent(?:Window|Layer)?|ge(?:X(?:Offset)?|Y(?:Offset)?))|r(?:o(?:to(?:col|type)|duct(?:Sub)?|mpter)|e(?:vious|fix)))|e(?:n(?:coding|abledPlugin)|x(?:ternal|pando)|mbeds)|v(?:isibility|endor(?:Sub)?|Linkcolor)|URLUnencoded|P(?:I|OSITIVE_INFINITY)|f(?:ilename|o(?:nt(?:Size|Family|Weight)|rmName)|rame(?:s|Element)|gColor)|E|whiteSpace|l(?:i(?:stStyleType|n(?:eHeight|kColor))|o(?:ca(?:tion(?:bar)?|lName)|wsrc)|e(?:ngth|ft(?:Context)?)|a(?:st(?:M(?:odified|atch)|Index|Paren)|yer(?:s|X)|nguage))|a(?:pp(?:MinorVersion|Name|Co(?:deName|re)|Version)|vail(?:Height|Top|Width|Left)|ll|r(?:ity|guments)|Linkcolor|bove)|r(?:ight(?:Context)?|e(?:sponse(?:XML|Text)|adyState))|global|x|m(?:imeTypes|ultiline|enubar|argin(?:Right|Bottom|Top|Left))|L(?:N(?:10|2)|OG(?:10E|2E))|b(?:o(?:ttom|rder(?:Width|RightWidth|BottomWidth|Style|Color|TopWidth|LeftWidth))|ufferDepth|elow|ackground(?:Color|Image)))\b/},{token:["storage.type","punctuation.operator","support.function.firebug"],regex:/(console)(\.)(warn|info|log|error|time|timeEnd|assert)\b/},{token:function(c){return a.hasOwnProperty(c)?"variable.language":d.hasOwnProperty(c)?"invalid.deprecated":h.hasOwnProperty(c)?"storage.type":b.hasOwnProperty(c)?"keyword":i.hasOwnProperty(c)?"constant.language":j.hasOwnProperty(c)?"invalid.illegal":c=="debugger"?"invalid.deprecated":"identifier"},regex:k},{token:"keyword.operator",regex:/!|\$|%|&|\*|\-\-|\-|\+\+|\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\|\||\?\:|\*=|%=|\+=|\-=|&=|\^=|\b(?:in|instanceof|new|delete|typeof|void)/,next:"regex_allowed"},{token:"punctuation.operator",regex:/\?|\:|\,|\;|\./,next:"regex_allowed"},{token:"paren.lparen",regex:/[\[({]/,next:"regex_allowed"},{token:"paren.rparen",regex:/[\])}]/},{token:"keyword.operator",regex:/\/=?/,next:"regex_allowed"},{token:"comment",regex:/^#!.*$/},{token:"text",regex:/\s+/}],regex_allowed:[{token:"comment",merge:!0,regex:"\\/\\*",next:"comment_regex_allowed"},{token:"comment",regex:"\\/\\/.*$"},{token:"string.regexp",regex:"\\/",next:"regex",merge:!0},{token:"text",regex:"\\s+"},{token:"empty",regex:"",next:"start"}],regex:[{token:"regexp.keyword.operator",regex:"\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",next:"regex"},{token:"string.regexp",regex:"/\\w*",next:"start",merge:!0},{token:"string.regexp",regex:"[^\\\\/\\[]+",next:"regex",merge:!0},{token:"string.regexp.charachterclass",regex:"\\[",next:"regex_character_class",merge:!0},{token:"empty",regex:"",next:"start"}],regex_character_class:[{token:"regexp.keyword.operator",regex:"\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",next:"regex_character_class"},{token:"string.regexp.charachterclass",regex:"]",next:"regex",merge:!0},{token:"string.regexp.charachterclass",regex:"[^\\\\\\]]+",next:"regex_character_class",merge:!0},{token:"empty",regex:"",next:"start"}],comment_regex_allowed:[{token:"comment",regex:".*?\\*\\/",merge:!0,next:"regex_allowed"},{token:"comment",merge:!0,regex:".+"}],comment:[{token:"comment",regex:".*?\\*\\/",merge:!0,next:"start"},{token:"comment",merge:!0,regex:".+"}],qqstring:[{token:"constant.language.escape",regex:l},{token:"string",regex:'[^"\\\\]+'},{token:"string",regex:'"',next:"start"}],qstring:[{token:"constant.language.escape",regex:l},{token:"string",regex:"[^'\\\\]+"},{token:"string",regex:"'",next:"start"}]},this.embedRules(g,"doc-",[(new g).getEndRule("start")])};d.inherits(i,h),b.JavaScriptHighlightRules=i}),define("ace/mode/doc_comment_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text_highlight_rules").TextHighlightRules,f=function(){this.$rules={start:[{token:"comment.doc.tag",regex:"@[\\w\\d_]+"},{token:"comment.doc",merge:!0,regex:"\\s+"},{token:"comment.doc",merge:!0,regex:"TODO"},{token:"comment.doc",merge:!0,regex:"[^@\\*]+"},{token:"comment.doc",merge:!0,regex:"."}]}};d.inherits(f,e),function(){this.getStartRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\/\\*(?=\\*)",next:a}},this.getEndRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\*\\/",next:a}}}.call(f.prototype),b.DocCommentHighlightRules=f}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../range").Range,e=function(){};(function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}}).call(e.prototype),b.MatchingBraceOutdent=e}),define("ace/mode/behaviour/cstyle",["require","exports","module","ace/lib/oop","ace/mode/behaviour"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../behaviour").Behaviour,f=function(){this.add("braces","insertion",function(a,b,c,d,e){if(e=="{"){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"{"+g+"}",selection:!1}:{text:"{}",selection:[1,1]}}if(e=="}"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var k=d.$findOpeningBracket("}",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}else if(e=="\n"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var l=d.findMatchingBracket({row:h.row,column:h.column+1});if(!l)return null;var m=this.getNextLineIndent(a,i.substring(0,i.length-1),d.getTabString()),n=this.$getIndent(d.doc.getLine(l.row));return{text:"\n"+m+"\n"+n,selection:[1,m.length,1,m.length]}}}}),this.add("braces","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="{"){var g=d.doc.getLine(e.start.row),h=g.substring(e.end.column,e.end.column+1);if(h=="}")return e.end.column++,e}}),this.add("parens","insertion",function(a,b,c,d,e){if(e=="("){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"("+g+")",selection:!1}:{text:"()",selection:[1,1]}}if(e==")"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j==")"){var k=d.$findOpeningBracket(")",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}}),this.add("parens","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="("){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h==")")return e.end.column++,e}}),this.add("string_dquotes","insertion",function(a,b,c,d,e){if(e=='"'||e=="'"){var f=e,g=c.getSelectionRange(),h=d.doc.getTextRange(g);if(h!=="")return{text:f+h+f,selection:!1};var i=c.getCursorPosition(),j=d.doc.getLine(i.row),k=j.substring(i.column-1,i.column);if(k=="\\")return null;var l=d.getTokens(g.start.row,g.start.row)[0].tokens,m=0,n,o=-1;for(var p=0;p<l.length;p++){n=l[p],n.type=="string"?o=-1:o<0&&(o=n.value.indexOf(f));if(n.value.length+m>g.start.column)break;m+=l[p].value.length}if(!n||o<0&&n.type!=="comment"&&(n.type!=="string"||g.start.column!==n.value.length+m-1&&n.value.lastIndexOf(f)===n.value.length-1))return{text:f+f,selection:[1,1]};if(n&&n.type==="string"){var q=j.substring(i.column,i.column+1);if(q==f)return{text:"",selection:[1,1]}}}}),this.add("string_dquotes","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&(f=='"'||f=="'")){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h=='"')return e.end.column++,e}})};d.inherits(f,e),b.CstyleBehaviour=f}),define("ace/mode/folding/cstyle",["require","exports","module","ace/lib/oop","ace/range","ace/mode/folding/fold_mode"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../../range").Range,f=a("./fold_mode").FoldMode,g=b.FoldMode=function(){};d.inherits(g,f),function(){this.foldingStartMarker=/(\{|\[)[^\}\]]*$|^\s*(\/\*)/,this.foldingStopMarker=/^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/,this.getFoldWidgetRange=function(a,b,c){var d=a.getLine(c),f=d.match(this.foldingStartMarker);if(f){var g=f.index;if(f[1])return this.openingBracketBlock(a,f[1],c,g);var h=a.getCommentFoldRange(c,g+f[0].length);return h.end.column-=2,h}if(b!=="markbeginend")return;var f=d.match(this.foldingStopMarker);if(f){var g=f.index+f[0].length;if(f[2]){var h=a.getCommentFoldRange(c,g);return h.end.column-=2,h}var i={row:c,column:g},j=a.$findOpeningBracket(f[1],i);if(!j)return;return j.column++,i.column--,e.fromPoints(j,i)}}}.call(g.prototype)}),define("ace/mode/folding/fold_mode",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../../range").Range,e=b.FoldMode=function(){};(function(){this.foldingStartMarker=null,this.foldingStopMarker=null,this.getFoldWidget=function(a,b,c){var d=a.getLine(c);return this.foldingStartMarker.test(d)?"start":b=="markbeginend"&&this.foldingStopMarker&&this.foldingStopMarker.test(d)?"end":""},this.getFoldWidgetRange=function(a,b,c){return null},this.indentationBlock=function(a,b,c){var e=/^\s*/,f=b,g=b,h=a.getLine(b),i=c||h.length,j=h.match(e)[0].length,k=a.getLength();while(++b<k){h=a.getLine(b);var l=h.match(e)[0].length;if(l==h.length)continue;if(l<=j)break;g=b}if(g>f){var m=a.getLine(g).length;return new d(f,i,g,m)}},this.openingBracketBlock=function(a,b,c,e){var f={row:c,column:e+1},g=a.$findClosingBracket(b,f);if(!g)return;var h=a.foldWidgets[g.row];return h==null&&(h=this.getFoldWidget(a,g.row)),h=="start"&&(g.row--,g.column=a.getLine(g.row).length),d.fromPoints(f,g)}}).call(e.prototype)}),define("ace/mode/scala_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/doc_comment_highlight_rules","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("./doc_comment_highlight_rules").DocCommentHighlightRules,g=a("./text_highlight_rules").TextHighlightRules,h=function(){var a=e.arrayToMap("case|default|do|else|for|if|match|while|throw|return|try|catch|finally|yield|abstract|class|def|extends|final|forSome|implicit|implicits|import|lazy|new|object|override|package|private|protected|sealed|super|this|trait|type|val|var|with".split("|")),b=e.arrayToMap("true|false".split("|")),c=e.arrayToMap("AbstractMethodError|AssertionError|ClassCircularityError|ClassFormatError|Deprecated|EnumConstantNotPresentException|ExceptionInInitializerError|IllegalAccessError|IllegalThreadStateException|InstantiationError|InternalError|NegativeArraySizeException|NoSuchFieldError|Override|Process|ProcessBuilder|SecurityManager|StringIndexOutOfBoundsException|SuppressWarnings|TypeNotPresentException|UnknownError|UnsatisfiedLinkError|UnsupportedClassVersionError|VerifyError|InstantiationException|IndexOutOfBoundsException|ArrayIndexOutOfBoundsException|CloneNotSupportedException|NoSuchFieldException|IllegalArgumentException|NumberFormatException|SecurityException|Void|InheritableThreadLocal|IllegalStateException|InterruptedException|NoSuchMethodException|IllegalAccessException|UnsupportedOperationException|Enum|StrictMath|Package|Compiler|Readable|Runtime|StringBuilder|Math|IncompatibleClassChangeError|NoSuchMethodError|ThreadLocal|RuntimePermission|ArithmeticException|NullPointerException|Long|Integer|Short|Byte|Double|Number|Float|Character|Boolean|StackTraceElement|Appendable|StringBuffer|Iterable|ThreadGroup|Runnable|Thread|IllegalMonitorStateException|StackOverflowError|OutOfMemoryError|VirtualMachineError|ArrayStoreException|ClassCastException|LinkageError|NoClassDefFoundError|ClassNotFoundException|RuntimeException|Exception|ThreadDeath|Error|Throwable|System|ClassLoader|Cloneable|Class|CharSequence|Comparable|String|Object|Unit|Any|AnyVal|AnyRef|Null|ScalaObject|Singleton|Seq|Iterable|List|Option|Array|Char|Byte|Short|Int|Long|Nothing".split("|")),d=e.arrayToMap("".split("|"));this.$rules={start:[{token:"comment",regex:"\\/\\/.*$"},(new f).getStartRule("doc-start"),{token:"comment",merge:!0,regex:"\\/\\*",next:"comment"},{token:"string.regexp",regex:"[/](?:(?:\\[(?:\\\\]|[^\\]])+\\])|(?:\\\\/|[^\\]/]))*[/]\\w*\\s*(?=[).,;]|$)"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:"constant.numeric",regex:"0[xX][0-9a-fA-F]+\\b"},{token:"constant.numeric",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:"constant.language.boolean",regex:"(?:true|false)\\b"},{token:function(e){return e=="this"?"variable.language":a.hasOwnProperty(e)?"keyword":c.hasOwnProperty(e)?"support.function":d.hasOwnProperty(e)?"support.function":b.hasOwnProperty(e)?"constant.language":"identifier"},regex:"[a-zA-Z_$][a-zA-Z0-9_$]*\\b"},{token:"keyword.operator",regex:"!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)"},{token:"paren.lparen",regex:"[[({]"},{token:"paren.rparen",regex:"[\\])}]"},{token:"text",regex:"\\s+"}],comment:[{token:"comment",regex:".*?\\*\\/",next:"start"},{token:"comment",merge:!0,regex:".+"}]},this.embedRules(f,"doc-",[(new f).getEndRule("start")])};d.inherits(h,g),b.ScalaHighlightRules=h})
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-scss-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-scss-uncompressed.js
deleted file mode 100644
index fc6d611f26..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-scss-uncompressed.js
+++ /dev/null
@@ -1,678 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/scss', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/scss_highlight_rules', 'ace/mode/matching_brace_outdent', 'ace/mode/folding/cstyle'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
-var ScssHighlightRules = require("./scss_highlight_rules").ScssHighlightRules;
-var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
-var CStyleFoldMode = require("./folding/cstyle").FoldMode;
-
-var Mode = function() {
-    this.$tokenizer = new Tokenizer(new ScssHighlightRules().getRules(), "i");
-    this.$outdent = new MatchingBraceOutdent();
-    this.foldingRules = new CStyleFoldMode();
-};
-oop.inherits(Mode, TextMode);
-
-(function() {
-    
-    this.getNextLineIndent = function(state, line, tab) {
-        var indent = this.$getIndent(line);
-
-        // ignore braces in comments
-        var tokens = this.$tokenizer.getLineTokens(line, state).tokens;
-        if (tokens.length && tokens[tokens.length-1].type == "comment") {
-            return indent;
-        }
-
-        var match = line.match(/^.*\{\s*$/);
-        if (match) {
-            indent += tab;
-        }
-
-        return indent;
-    };
-
-    this.checkOutdent = function(state, line, input) {
-        return this.$outdent.checkOutdent(line, input);
-    };
-
-    this.autoOutdent = function(state, doc, row) {
-        this.$outdent.autoOutdent(doc, row);
-    };
-
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/scss_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var lang = require("../lib/lang");
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var ScssHighlightRules = function() {
-    
-    var properties = lang.arrayToMap( (function () {
-
-        var browserPrefix = ("-webkit-|-moz-|-o-|-ms-|-svg-|-pie-|-khtml-").split("|");
-        
-        var prefixProperties = ("appearance|background-clip|background-inline-policy|background-origin|" + 
-             "background-size|binding|border-bottom-colors|border-left-colors|" + 
-             "border-right-colors|border-top-colors|border-end|border-end-color|" + 
-             "border-end-style|border-end-width|border-image|border-start|" + 
-             "border-start-color|border-start-style|border-start-width|box-align|" + 
-             "box-direction|box-flex|box-flexgroup|box-ordinal-group|box-orient|" + 
-             "box-pack|box-sizing|column-count|column-gap|column-width|column-rule|" + 
-             "column-rule-width|column-rule-style|column-rule-color|float-edge|" + 
-             "font-feature-settings|font-language-override|force-broken-image-icon|" + 
-             "image-region|margin-end|margin-start|opacity|outline|outline-color|" + 
-             "outline-offset|outline-radius|outline-radius-bottomleft|" + 
-             "outline-radius-bottomright|outline-radius-topleft|outline-radius-topright|" + 
-             "outline-style|outline-width|padding-end|padding-start|stack-sizing|" + 
-             "tab-size|text-blink|text-decoration-color|text-decoration-line|" + 
-             "text-decoration-style|transform|transform-origin|transition|" + 
-             "transition-delay|transition-duration|transition-property|" + 
-             "transition-timing-function|user-focus|user-input|user-modify|user-select|" +
-             "window-shadow|border-radius").split("|");
-        
-        var properties = ("azimuth|background-attachment|background-color|background-image|" +
-            "background-position|background-repeat|background|border-bottom-color|" +
-            "border-bottom-style|border-bottom-width|border-bottom|border-collapse|" +
-            "border-color|border-left-color|border-left-style|border-left-width|" +
-            "border-left|border-right-color|border-right-style|border-right-width|" +
-            "border-right|border-spacing|border-style|border-top-color|" +
-            "border-top-style|border-top-width|border-top|border-width|border|" +
-            "bottom|box-sizing|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-adjust|font-size|" +
-            "font-stretch|font-style|font-variant|font-weight|font|height|left|" +
-            "letter-spacing|line-height|list-style-image|list-style-position|" +
-            "list-style-type|list-style|margin-bottom|margin-left|margin-right|" +
-            "margin-top|marker-offset|margin|marks|max-height|max-width|min-height|" +
-            "min-width|opacity|orphans|outline-color|" +
-            "outline-style|outline-width|outline|overflow|overflow-x|overflow-y|padding-bottom|" +
-            "padding-left|padding-right|padding-top|padding|page-break-after|" +
-            "page-break-before|page-break-inside|page|pause-after|pause-before|" +
-            "pause|pitch-range|pitch|play-during|position|quotes|richness|right|" +
-            "size|speak-header|speak-numeral|speak-punctuation|speech-rate|speak|" +
-            "stress|table-layout|text-align|text-decoration|text-indent|" +
-            "text-shadow|text-transform|top|unicode-bidi|vertical-align|" +
-            "visibility|voice-family|volume|white-space|widows|width|word-spacing|" +
-            "z-index").split("|");
-          
-        //The return array     
-        var ret = [];
-        
-        //All prefixProperties will get the browserPrefix in
-        //the begning by join the prefixProperties array with the value of browserPrefix
-        for (var i=0, ln=browserPrefix.length; i<ln; i++) {
-            Array.prototype.push.apply(
-                ret,
-                (( browserPrefix[i] + prefixProperties.join("|" + browserPrefix[i]) ).split("|"))
-            );
-        }
-        
-        //Add also prefixProperties and properties without any browser prefix
-        Array.prototype.push.apply(ret, prefixProperties);
-        Array.prototype.push.apply(ret, properties);
-        
-        return ret;
-        
-    })() );
-    
-
-
-    var functions = lang.arrayToMap(
-        ("hsl|hsla|rgb|rgba|url|attr|counter|counters|abs|adjust_color|adjust_hue|" +
-         "alpha|join|blue|ceil|change_color|comparable|complement|darken|desaturate|" + 
-         "floor|grayscale|green|hue|if|invert|join|length|lighten|lightness|mix|" + 
-         "nth|opacify|opacity|percentage|quote|red|round|saturate|saturation|" +
-         "scale_color|transparentize|type_of|unit|unitless|unqoute").split("|")
-    );
-
-    var constants = lang.arrayToMap(
-        ("absolute|all-scroll|always|armenian|auto|baseline|below|bidi-override|" +
-        "block|bold|bolder|border-box|both|bottom|break-all|break-word|capitalize|center|" +
-        "char|circle|cjk-ideographic|col-resize|collapse|content-box|crosshair|dashed|" +
-        "decimal-leading-zero|decimal|default|disabled|disc|" +
-        "distribute-all-lines|distribute-letter|distribute-space|" +
-        "distribute|dotted|double|e-resize|ellipsis|fixed|georgian|groove|" +
-        "hand|hebrew|help|hidden|hiragana-iroha|hiragana|horizontal|" +
-        "ideograph-alpha|ideograph-numeric|ideograph-parenthesis|" +
-        "ideograph-space|inactive|inherit|inline-block|inline|inset|inside|" +
-        "inter-ideograph|inter-word|italic|justify|katakana-iroha|katakana|" +
-        "keep-all|left|lighter|line-edge|line-through|line|list-item|loose|" +
-        "lower-alpha|lower-greek|lower-latin|lower-roman|lowercase|lr-tb|ltr|" +
-        "medium|middle|move|n-resize|ne-resize|newspaper|no-drop|no-repeat|" +
-        "nw-resize|none|normal|not-allowed|nowrap|oblique|outset|outside|" +
-        "overline|pointer|progress|relative|repeat-x|repeat-y|repeat|right|" +
-        "ridge|row-resize|rtl|s-resize|scroll|se-resize|separate|small-caps|" +
-        "solid|square|static|strict|super|sw-resize|table-footer-group|" +
-        "table-header-group|tb-rl|text-bottom|text-top|text|thick|thin|top|" +
-        "transparent|underline|upper-alpha|upper-latin|upper-roman|uppercase|" +
-        "vertical-ideographic|vertical-text|visible|w-resize|wait|whitespace|" +
-        "zero").split("|")
-    );
-
-    var colors = lang.arrayToMap(
-        ("aqua|black|blue|fuchsia|gray|green|lime|maroon|navy|olive|orange|" +
-        "purple|red|silver|teal|white|yellow").split("|")
-    );
-    
-    var keywords = lang.arrayToMap(
-        ("@mixin|@extend|@include|@import|@media|@debug|@warn|@if|@for|@each|@while|@else|@font-face|@-webkit-keyframes|if|and|!default|module|def|end|declare").split("|")
-    )
-    
-    var tags = lang.arrayToMap(
-        ("a|abbr|acronym|address|applet|area|article|aside|audio|b|base|basefont|bdo|" + 
-         "big|blockquote|body|br|button|canvas|caption|center|cite|code|col|colgroup|" + 
-         "command|datalist|dd|del|details|dfn|dir|div|dl|dt|em|embed|fieldset|" + 
-         "figcaption|figure|font|footer|form|frame|frameset|h1|h2|h3|h4|h5|h6|head|" + 
-         "header|hgroup|hr|html|i|iframe|img|input|ins|keygen|kbd|label|legend|li|" + 
-         "link|map|mark|menu|meta|meter|nav|noframes|noscript|object|ol|optgroup|" + 
-         "option|output|p|param|pre|progress|q|rp|rt|ruby|s|samp|script|section|select|" + 
-         "small|source|span|strike|strong|style|sub|summary|sup|table|tbody|td|" + 
-         "textarea|tfoot|th|thead|time|title|tr|tt|u|ul|var|video|wbr|xmp").split("|")
-    );
-
-    // regexp must not have capturing parentheses. Use (?:) instead.
-    // regexps are ordered -> the first match is used
-
-    var numRe = "\\-?(?:(?:[0-9]+)|(?:[0-9]*\\.[0-9]+))";
-
-    // regexp must not have capturing parentheses. Use (?:) instead.
-    // regexps are ordered -> the first match is used
-
-    this.$rules = {
-        "start" : [
-            {
-                token : "comment",
-                regex : "\\/\\/.*$"
-            },
-            {
-                token : "comment", // multi line comment
-                merge : true,
-                regex : "\\/\\*",
-                next : "comment"
-            }, {
-                token : "string", // single line
-                regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
-            }, {
-                token : "string", // multi line string start
-                merge : true,
-                regex : '["].*\\\\$',
-                next : "qqstring"
-            }, {
-                token : "string", // single line
-                regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"
-            }, {
-                token : "string", // multi line string start
-                merge : true,
-                regex : "['].*\\\\$",
-                next : "qstring"
-            }, {
-                token : "constant.numeric",
-                regex : numRe + "(?:em|ex|px|cm|mm|in|pt|pc|deg|rad|grad|ms|s|hz|khz|%)"
-            }, {
-                token : "constant.numeric", // hex6 color
-                regex : "#[a-f0-9]{6}"
-            }, {
-                token : "constant.numeric", // hex3 color
-                regex : "#[a-f0-9]{3}"
-            }, {
-                token : "constant.numeric",
-                regex : numRe
-            }, {
-                token : function(value) {
-                    if (properties.hasOwnProperty(value.toLowerCase()))
-                        return "support.type";
-                    if (keywords.hasOwnProperty(value))
-                        return "keyword";
-                    else if (constants.hasOwnProperty(value))
-                        return "constant.language";
-                    else if (functions.hasOwnProperty(value))
-                        return "support.function";
-                    else if (colors.hasOwnProperty(value.toLowerCase()))
-                        return "support.constant.color";
-                    else if (tags.hasOwnProperty(value.toLowerCase()))
-                        return "variable.language";
-                    else
-                        return "text";
-                },
-                regex : "\\-?[@a-z_][@a-z0-9_\\-]*"
-            }, {
-                token : "variable",
-                regex : "[a-z_\\-$][a-z0-9_\\-$]*\\b"
-            }, {
-                token: "variable.language",
-                regex: "#[a-z0-9-_]+"
-            }, {
-                token: "variable.language",
-                regex: "\\.[a-z0-9-_]+"
-            }, {
-                token: "variable.language",
-                regex: ":[a-z0-9-_]+"
-            }, {
-                token: "constant",
-                regex: "[a-z0-9-_]+"
-            }, {
-                token : "keyword.operator",
-                regex : "<|>|<=|>=|==|!=|-|%|#|\\+|\\$|\\+|\\*"
-            }, {
-                token : "paren.lparen",
-                regex : "[[({]"
-            }, {
-                token : "paren.rparen",
-                regex : "[\\])}]"
-            }, {
-                token : "text",
-                regex : "\\s+"
-            }
-        ],
-        "comment" : [
-            {
-                token : "comment", // closing comment
-                regex : ".*?\\*\\/",
-                next : "start"
-            }, {
-                token : "comment", // comment spanning whole line
-                merge : true,
-                regex : ".+"
-            }
-        ],
-        "qqstring" : [
-            {
-                token : "string",
-                regex : '(?:(?:\\\\.)|(?:[^"\\\\]))*?"',
-                next : "start"
-            }, {
-                token : "string",
-                merge : true,
-                regex : '.+'
-            }
-        ],
-        "qstring" : [
-            {
-                token : "string",
-                regex : "(?:(?:\\\\.)|(?:[^'\\\\]))*?'",
-                next : "start"
-            }, {
-                token : "string",
-                merge : true,
-                regex : '.+'
-            }
-        ]
-    };
-};
-
-oop.inherits(ScssHighlightRules, TextHighlightRules);
-
-exports.ScssHighlightRules = ScssHighlightRules;
-
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/matching_brace_outdent', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../range").Range;
-
-var MatchingBraceOutdent = function() {};
-
-(function() {
-
-    this.checkOutdent = function(line, input) {
-        if (! /^\s+$/.test(line))
-            return false;
-
-        return /^\s*\}/.test(input);
-    };
-
-    this.autoOutdent = function(doc, row) {
-        var line = doc.getLine(row);
-        var match = line.match(/^(\s*\})/);
-
-        if (!match) return 0;
-
-        var column = match[1].length;
-        var openBracePos = doc.findMatchingBracket({row: row, column: column});
-
-        if (!openBracePos || openBracePos.row == row) return 0;
-
-        var indent = this.$getIndent(doc.getLine(openBracePos.row));
-        doc.replace(new Range(row, 0, row, column-1), indent);
-    };
-
-    this.$getIndent = function(line) {
-        var match = line.match(/^(\s+)/);
-        if (match) {
-            return match[1];
-        }
-
-        return "";
-    };
-
-}).call(MatchingBraceOutdent.prototype);
-
-exports.MatchingBraceOutdent = MatchingBraceOutdent;
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/folding/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/range', 'ace/mode/folding/fold_mode'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var Range = require("../../range").Range;
-var BaseFoldMode = require("./fold_mode").FoldMode;
-
-var FoldMode = exports.FoldMode = function() {};
-oop.inherits(FoldMode, BaseFoldMode);
-
-(function() {
-
-    this.foldingStartMarker = /(\{|\[)[^\}\]]*$|^\s*(\/\*)/;
-    this.foldingStopMarker = /^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/;
-    
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        var line = session.getLine(row);
-        var match = line.match(this.foldingStartMarker);
-        if (match) {
-            var i = match.index;
-
-            if (match[1])
-                return this.openingBracketBlock(session, match[1], row, i);
-
-            var range = session.getCommentFoldRange(row, i + match[0].length);
-            range.end.column -= 2;
-            return range;
-        }
-
-        if (foldStyle !== "markbeginend")
-            return;
-            
-        var match = line.match(this.foldingStopMarker);
-        if (match) {
-            var i = match.index + match[0].length;
-
-            if (match[2]) {
-                var range = session.getCommentFoldRange(row, i);
-                range.end.column -= 2;
-                return range;
-            }
-
-            var end = {row: row, column: i};
-            var start = session.$findOpeningBracket(match[1], end);
-            
-            if (!start)
-                return;
-
-            start.column++;
-            end.column--;
-
-            return  Range.fromPoints(start, end);
-        }
-    };
-    
-}).call(FoldMode.prototype);
-
-});/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/folding/fold_mode', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../../range").Range;
-
-var FoldMode = exports.FoldMode = function() {};
-
-(function() {
-
-    this.foldingStartMarker = null;
-    this.foldingStopMarker = null;
-
-    // must return "" if there's no fold, to enable caching
-    this.getFoldWidget = function(session, foldStyle, row) {
-        var line = session.getLine(row);
-        if (this.foldingStartMarker.test(line))
-            return "start";
-        if (foldStyle == "markbeginend"
-                && this.foldingStopMarker
-                && this.foldingStopMarker.test(line))
-            return "end";
-        return "";
-    };
-    
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        return null;
-    };
-
-    this.indentationBlock = function(session, row, column) {
-        var re = /^\s*/;
-        var startRow = row;
-        var endRow = row;
-        var line = session.getLine(row);
-        var startColumn = column || line.length;
-        var startLevel = line.match(re)[0].length;
-        var maxRow = session.getLength()
-        
-        while (++row < maxRow) {
-            line = session.getLine(row);
-            var level = line.match(re)[0].length;
-
-            if (level == line.length)
-                continue;
-
-            if (level <= startLevel)
-                break;
-
-            endRow = row;
-        }
-
-        if (endRow > startRow) {
-            var endColumn = session.getLine(endRow).length;
-            return new Range(startRow, startColumn, endRow, endColumn);
-        }
-    };
-
-    this.openingBracketBlock = function(session, bracket, row, column) {
-        var start = {row: row, column: column + 1};
-        var end = session.$findClosingBracket(bracket, start);
-        if (!end)
-            return;
-
-        var fw = session.foldWidgets[end.row];
-        if (fw == null)
-            fw = this.getFoldWidget(session, end.row);
-
-        if (fw == "start") {
-            end.row --;
-            end.column = session.getLine(end.row).length;
-        }
-        return Range.fromPoints(start, end);
-    };
-
-}).call(FoldMode.prototype);
-
-});
diff --git a/apps/files_texteditor/js/aceeditor/mode-scss.js b/apps/files_texteditor/js/aceeditor/mode-scss.js
deleted file mode 100644
index 214bfe3485..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-scss.js
+++ /dev/null
@@ -1 +0,0 @@
-define("ace/mode/scss",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/scss_highlight_rules","ace/mode/matching_brace_outdent","ace/mode/folding/cstyle"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./scss_highlight_rules").ScssHighlightRules,h=a("./matching_brace_outdent").MatchingBraceOutdent,i=a("./folding/cstyle").FoldMode,j=function(){this.$tokenizer=new f((new g).getRules(),"i"),this.$outdent=new h,this.foldingRules=new i};d.inherits(j,e),function(){this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a).tokens;if(e.length&&e[e.length-1].type=="comment")return d;var f=b.match(/^.*\{\s*$/);return f&&(d+=c),d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)}}.call(j.prototype),b.Mode=j}),define("ace/mode/scss_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("./text_highlight_rules").TextHighlightRules,g=function(){var a=e.arrayToMap(function(){var a="-webkit-|-moz-|-o-|-ms-|-svg-|-pie-|-khtml-".split("|"),b="appearance|background-clip|background-inline-policy|background-origin|background-size|binding|border-bottom-colors|border-left-colors|border-right-colors|border-top-colors|border-end|border-end-color|border-end-style|border-end-width|border-image|border-start|border-start-color|border-start-style|border-start-width|box-align|box-direction|box-flex|box-flexgroup|box-ordinal-group|box-orient|box-pack|box-sizing|column-count|column-gap|column-width|column-rule|column-rule-width|column-rule-style|column-rule-color|float-edge|font-feature-settings|font-language-override|force-broken-image-icon|image-region|margin-end|margin-start|opacity|outline|outline-color|outline-offset|outline-radius|outline-radius-bottomleft|outline-radius-bottomright|outline-radius-topleft|outline-radius-topright|outline-style|outline-width|padding-end|padding-start|stack-sizing|tab-size|text-blink|text-decoration-color|text-decoration-line|text-decoration-style|transform|transform-origin|transition|transition-delay|transition-duration|transition-property|transition-timing-function|user-focus|user-input|user-modify|user-select|window-shadow|border-radius".split("|"),c="azimuth|background-attachment|background-color|background-image|background-position|background-repeat|background|border-bottom-color|border-bottom-style|border-bottom-width|border-bottom|border-collapse|border-color|border-left-color|border-left-style|border-left-width|border-left|border-right-color|border-right-style|border-right-width|border-right|border-spacing|border-style|border-top-color|border-top-style|border-top-width|border-top|border-width|border|bottom|box-sizing|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-adjust|font-size|font-stretch|font-style|font-variant|font-weight|font|height|left|letter-spacing|line-height|list-style-image|list-style-position|list-style-type|list-style|margin-bottom|margin-left|margin-right|margin-top|marker-offset|margin|marks|max-height|max-width|min-height|min-width|opacity|orphans|outline-color|outline-style|outline-width|outline|overflow|overflow-x|overflow-y|padding-bottom|padding-left|padding-right|padding-top|padding|page-break-after|page-break-before|page-break-inside|page|pause-after|pause-before|pause|pitch-range|pitch|play-during|position|quotes|richness|right|size|speak-header|speak-numeral|speak-punctuation|speech-rate|speak|stress|table-layout|text-align|text-decoration|text-indent|text-shadow|text-transform|top|unicode-bidi|vertical-align|visibility|voice-family|volume|white-space|widows|width|word-spacing|z-index".split("|"),d=[];for(var e=0,f=a.length;e<f;e++)Array.prototype.push.apply(d,(a[e]+b.join("|"+a[e])).split("|"));return Array.prototype.push.apply(d,b),Array.prototype.push.apply(d,c),d}()),b=e.arrayToMap("hsl|hsla|rgb|rgba|url|attr|counter|counters|abs|adjust_color|adjust_hue|alpha|join|blue|ceil|change_color|comparable|complement|darken|desaturate|floor|grayscale|green|hue|if|invert|join|length|lighten|lightness|mix|nth|opacify|opacity|percentage|quote|red|round|saturate|saturation|scale_color|transparentize|type_of|unit|unitless|unqoute".split("|")),c=e.arrayToMap("absolute|all-scroll|always|armenian|auto|baseline|below|bidi-override|block|bold|bolder|border-box|both|bottom|break-all|break-word|capitalize|center|char|circle|cjk-ideographic|col-resize|collapse|content-box|crosshair|dashed|decimal-leading-zero|decimal|default|disabled|disc|distribute-all-lines|distribute-letter|distribute-space|distribute|dotted|double|e-resize|ellipsis|fixed|georgian|groove|hand|hebrew|help|hidden|hiragana-iroha|hiragana|horizontal|ideograph-alpha|ideograph-numeric|ideograph-parenthesis|ideograph-space|inactive|inherit|inline-block|inline|inset|inside|inter-ideograph|inter-word|italic|justify|katakana-iroha|katakana|keep-all|left|lighter|line-edge|line-through|line|list-item|loose|lower-alpha|lower-greek|lower-latin|lower-roman|lowercase|lr-tb|ltr|medium|middle|move|n-resize|ne-resize|newspaper|no-drop|no-repeat|nw-resize|none|normal|not-allowed|nowrap|oblique|outset|outside|overline|pointer|progress|relative|repeat-x|repeat-y|repeat|right|ridge|row-resize|rtl|s-resize|scroll|se-resize|separate|small-caps|solid|square|static|strict|super|sw-resize|table-footer-group|table-header-group|tb-rl|text-bottom|text-top|text|thick|thin|top|transparent|underline|upper-alpha|upper-latin|upper-roman|uppercase|vertical-ideographic|vertical-text|visible|w-resize|wait|whitespace|zero".split("|")),d=e.arrayToMap("aqua|black|blue|fuchsia|gray|green|lime|maroon|navy|olive|orange|purple|red|silver|teal|white|yellow".split("|")),f=e.arrayToMap("@mixin|@extend|@include|@import|@media|@debug|@warn|@if|@for|@each|@while|@else|@font-face|@-webkit-keyframes|if|and|!default|module|def|end|declare".split("|")),g=e.arrayToMap("a|abbr|acronym|address|applet|area|article|aside|audio|b|base|basefont|bdo|big|blockquote|body|br|button|canvas|caption|center|cite|code|col|colgroup|command|datalist|dd|del|details|dfn|dir|div|dl|dt|em|embed|fieldset|figcaption|figure|font|footer|form|frame|frameset|h1|h2|h3|h4|h5|h6|head|header|hgroup|hr|html|i|iframe|img|input|ins|keygen|kbd|label|legend|li|link|map|mark|menu|meta|meter|nav|noframes|noscript|object|ol|optgroup|option|output|p|param|pre|progress|q|rp|rt|ruby|s|samp|script|section|select|small|source|span|strike|strong|style|sub|summary|sup|table|tbody|td|textarea|tfoot|th|thead|time|title|tr|tt|u|ul|var|video|wbr|xmp".split("|")),h="\\-?(?:(?:[0-9]+)|(?:[0-9]*\\.[0-9]+))";this.$rules={start:[{token:"comment",regex:"\\/\\/.*$"},{token:"comment",merge:!0,regex:"\\/\\*",next:"comment"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",merge:!0,regex:'["].*\\\\$',next:"qqstring"},{token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:"string",merge:!0,regex:"['].*\\\\$",next:"qstring"},{token:"constant.numeric",regex:h+"(?:em|ex|px|cm|mm|in|pt|pc|deg|rad|grad|ms|s|hz|khz|%)"},{token:"constant.numeric",regex:"#[a-f0-9]{6}"},{token:"constant.numeric",regex:"#[a-f0-9]{3}"},{token:"constant.numeric",regex:h},{token:function(e){return a.hasOwnProperty(e.toLowerCase())?"support.type":f.hasOwnProperty(e)?"keyword":c.hasOwnProperty(e)?"constant.language":b.hasOwnProperty(e)?"support.function":d.hasOwnProperty(e.toLowerCase())?"support.constant.color":g.hasOwnProperty(e.toLowerCase())?"variable.language":"text"},regex:"\\-?[@a-z_][@a-z0-9_\\-]*"},{token:"variable",regex:"[a-z_\\-$][a-z0-9_\\-$]*\\b"},{token:"variable.language",regex:"#[a-z0-9-_]+"},{token:"variable.language",regex:"\\.[a-z0-9-_]+"},{token:"variable.language",regex:":[a-z0-9-_]+"},{token:"constant",regex:"[a-z0-9-_]+"},{token:"keyword.operator",regex:"<|>|<=|>=|==|!=|-|%|#|\\+|\\$|\\+|\\*"},{token:"paren.lparen",regex:"[[({]"},{token:"paren.rparen",regex:"[\\])}]"},{token:"text",regex:"\\s+"}],comment:[{token:"comment",regex:".*?\\*\\/",next:"start"},{token:"comment",merge:!0,regex:".+"}],qqstring:[{token:"string",regex:'(?:(?:\\\\.)|(?:[^"\\\\]))*?"',next:"start"},{token:"string",merge:!0,regex:".+"}],qstring:[{token:"string",regex:"(?:(?:\\\\.)|(?:[^'\\\\]))*?'",next:"start"},{token:"string",merge:!0,regex:".+"}]}};d.inherits(g,f),b.ScssHighlightRules=g}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../range").Range,e=function(){};(function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}}).call(e.prototype),b.MatchingBraceOutdent=e}),define("ace/mode/folding/cstyle",["require","exports","module","ace/lib/oop","ace/range","ace/mode/folding/fold_mode"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../../range").Range,f=a("./fold_mode").FoldMode,g=b.FoldMode=function(){};d.inherits(g,f),function(){this.foldingStartMarker=/(\{|\[)[^\}\]]*$|^\s*(\/\*)/,this.foldingStopMarker=/^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/,this.getFoldWidgetRange=function(a,b,c){var d=a.getLine(c),f=d.match(this.foldingStartMarker);if(f){var g=f.index;if(f[1])return this.openingBracketBlock(a,f[1],c,g);var h=a.getCommentFoldRange(c,g+f[0].length);return h.end.column-=2,h}if(b!=="markbeginend")return;var f=d.match(this.foldingStopMarker);if(f){var g=f.index+f[0].length;if(f[2]){var h=a.getCommentFoldRange(c,g);return h.end.column-=2,h}var i={row:c,column:g},j=a.$findOpeningBracket(f[1],i);if(!j)return;return j.column++,i.column--,e.fromPoints(j,i)}}}.call(g.prototype)}),define("ace/mode/folding/fold_mode",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../../range").Range,e=b.FoldMode=function(){};(function(){this.foldingStartMarker=null,this.foldingStopMarker=null,this.getFoldWidget=function(a,b,c){var d=a.getLine(c);return this.foldingStartMarker.test(d)?"start":b=="markbeginend"&&this.foldingStopMarker&&this.foldingStopMarker.test(d)?"end":""},this.getFoldWidgetRange=function(a,b,c){return null},this.indentationBlock=function(a,b,c){var e=/^\s*/,f=b,g=b,h=a.getLine(b),i=c||h.length,j=h.match(e)[0].length,k=a.getLength();while(++b<k){h=a.getLine(b);var l=h.match(e)[0].length;if(l==h.length)continue;if(l<=j)break;g=b}if(g>f){var m=a.getLine(g).length;return new d(f,i,g,m)}},this.openingBracketBlock=function(a,b,c,e){var f={row:c,column:e+1},g=a.$findClosingBracket(b,f);if(!g)return;var h=a.foldWidgets[g.row];return h==null&&(h=this.getFoldWidget(a,g.row)),h=="start"&&(g.row--,g.column=a.getLine(g.row).length),d.fromPoints(f,g)}}).call(e.prototype)})
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-sh-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-sh-uncompressed.js
deleted file mode 100644
index c341067efb..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-sh-uncompressed.js
+++ /dev/null
@@ -1,281 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
-* Version: MPL 1.1/GPL 2.0/LGPL 2.1
-*
-* The contents of this file are subject to the Mozilla Public License Version
-* 1.1 (the "License"); you may not use this file except in compliance with
-* the License. You may obtain a copy of the License at
-* http://www.mozilla.org/MPL/
-*
-* Software distributed under the License is distributed on an "AS IS" basis,
-* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-* for the specific language governing rights and limitations under the
-* License.
-*
-* The Original Code is Ajax.org Code Editor (ACE).
-*
-* The Initial Developer of the Original Code is
-* Ajax.org B.V.
-* Portions created by the Initial Developer are Copyright (C) 2010
-* the Initial Developer. All Rights Reserved.
-*
-* Contributor(s):
-*      Rich Healey <richo AT psych0tik DOT net>
-*
-* Alternatively, the contents of this file may be used under the terms of
-* either the GNU General Public License Version 2 or later (the "GPL"), or
-* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-* in which case the provisions of the GPL or the LGPL are applicable instead
-* of those above. If you wish to allow use of your version of this file only
-* under the terms of either the GPL or the LGPL, and not to allow others to
-* use your version of this file under the terms of the MPL, indicate your
-* decision by deleting the provisions above and replace them with the notice
-* and other provisions required by the GPL or the LGPL. If you do not delete
-* the provisions above, a recipient may use your version of this file under
-* the terms of any one of the MPL, the GPL or the LGPL.
-*
-* ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/sh', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/sh_highlight_rules', 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
-var ShHighlightRules = require("./sh_highlight_rules").ShHighlightRules;
-var Range = require("../range").Range;
-
-var Mode = function() {
-    this.$tokenizer = new Tokenizer(new ShHighlightRules().getRules());
-};
-oop.inherits(Mode, TextMode);
-
-(function() {
-
-    this.toggleCommentLines = function(state, doc, startRow, endRow) {
-        var outdent = true;
-        var re = /^(\s*)#/;
-
-        for (var i=startRow; i<= endRow; i++) {
-            if (!re.test(doc.getLine(i))) {
-                outdent = false;
-                break;
-            }
-        }
-
-        if (outdent) {
-            var deleteRange = new Range(0, 0, 0, 0);
-            for (var i=startRow; i<= endRow; i++)
-            {
-                var line = doc.getLine(i);
-                var m = line.match(re);
-                deleteRange.start.row = i;
-                deleteRange.end.row = i;
-                deleteRange.end.column = m[0].length;
-                doc.replace(deleteRange, m[1]);
-            }
-        }
-        else {
-            doc.indentRows(startRow, endRow, "#");
-        }
-    };
-
-    this.getNextLineIndent = function(state, line, tab) {
-        var indent = this.$getIndent(line);
-
-        var tokenizedLine = this.$tokenizer.getLineTokens(line, state);
-        var tokens = tokenizedLine.tokens;
-
-        if (tokens.length && tokens[tokens.length-1].type == "comment") {
-            return indent;
-        }
-
-        if (state == "start") {
-            var match = line.match(/^.*[\{\(\[\:]\s*$/);
-            if (match) {
-                indent += tab;
-            }
-        }
-
-        return indent;
-    };
-
-    var outdents = {
-        "pass": 1,
-        "return": 1,
-        "raise": 1,
-        "break": 1,
-        "continue": 1
-    };
-
-    this.checkOutdent = function(state, line, input) {
-        if (input !== "\r\n" && input !== "\r" && input !== "\n")
-            return false;
-
-        var tokens = this.$tokenizer.getLineTokens(line.trim(), state).tokens;
-
-        if (!tokens)
-            return false;
-
-        // ignore trailing comments
-        do {
-            var last = tokens.pop();
-        } while (last && (last.type == "comment" || (last.type == "text" && last.value.match(/^\s+$/))));
-
-        if (!last)
-            return false;
-
-        return (last.type == "keyword" && outdents[last.value]);
-    };
-
-    this.autoOutdent = function(state, doc, row) {
-        // outdenting in sh is slightly different because it always applies
-        // to the next line and only of a new line is inserted
-
-        row += 1;
-        var indent = this.$getIndent(doc.getLine(row));
-        var tab = doc.getTabString();
-        if (indent.slice(-tab.length) == tab)
-            doc.remove(new Range(row, indent.length-tab.length, row, indent.length));
-    };
-
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Rich Healey <richo AT psych0tik DOT net>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK *****
- */
-define('ace/mode/sh_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var lang = require("../lib/lang");
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var ShHighlightRules = function() {
-
-    var reservedKeywords = lang.arrayToMap(
-        ('!|{|}|case|do|done|elif|else|'+
-        'esac|fi|for|if|in|then|until|while|'+
-        '&|;'
-        ).split('|')
-    );
-
-    var languageConstructs = lang.arrayToMap(
-            // TODO
-        ('echo|exit|eval|source|[|]|test|'+
-         'true|false|read'
-         ).split('|')
-    );
-
-    var integer = "(?:(?:[1-9]\\d*)|(?:0))";
-    // var integer = "(?:" + decimalInteger + ")";
-
-    var fraction = "(?:\\.\\d+)";
-    var intPart = "(?:\\d+)";
-    var pointFloat = "(?:(?:" + intPart + "?" + fraction + ")|(?:" + intPart + "\\.))";
-    var exponentFloat = "(?:(?:" + pointFloat + "|" +  intPart + ")" + ")";
-    var floatNumber = "(?:" + exponentFloat + "|" + pointFloat + ")";
-    var fileDescriptor = "(?:&" + intPart + ")";
-
-    var variableName = "[a-zA-Z][a-zA-Z0-9_]*";
-    var variable = "(?:(?:\\$" + variableName + ")|(?:" + variableName + "=))";
-
-    var builtinVariable = "(?:\\$(?:SHLVL|\\$|\\!|\\?))";
-
-    var func = "(?:" + variableName + "\\s*\\(\\))";
-
-    this.$rules = {
-        "start" : [ {
-            token : "comment",
-            regex : "#.*$"
-        }, {
-            token : "string",           // " string
-            regex : '"(?:[^\\\\]|\\\\.)*?"'
-        }, {
-            token : "variable.language",
-            regex : builtinVariable
-        }, {
-            token : "variable",
-            regex : variable
-        }, {
-            token : "support.function",
-            regex : func,
-        }, {
-            token : "support.function",
-            regex : fileDescriptor
-        }, {
-            token : "string",           // ' string
-            regex : "'(?:[^\\\\]|\\\\.)*?'"
-        }, {
-            token : "constant.numeric", // float
-            regex : floatNumber
-        }, {
-            token : "constant.numeric", // integer
-            regex : integer + "\\b"
-        }, {
-            token : function(value) {
-                if (reservedKeywords.hasOwnProperty(value))
-                    return "keyword";
-                else if (languageConstructs.hasOwnProperty(value))
-                    return "constant.language";
-                else if (value == "debugger")
-                    return "invalid.deprecated";
-                else
-                    return "identifier";
-            },
-            regex : "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
-        }, {
-            token : "keyword.operator",
-            regex : "\\+|\\-|\\*|\\*\\*|\\/|\\/\\/|~|<|>|<=|=>|=|!="
-        }, {
-            token : "lparen.paren",
-            regex : "[\\[\\(\\{]"
-        }, {
-            token : "paren.rparen",
-            regex : "[\\]\\)\\}]"
-        }, {
-            token : "text",
-            regex : "\\s+"
-        } ]
-    };
-};
-
-oop.inherits(ShHighlightRules, TextHighlightRules);
-
-exports.ShHighlightRules = ShHighlightRules;
-});
diff --git a/apps/files_texteditor/js/aceeditor/mode-sh.js b/apps/files_texteditor/js/aceeditor/mode-sh.js
deleted file mode 100644
index 272aaccc85..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-sh.js
+++ /dev/null
@@ -1 +0,0 @@
-define("ace/mode/sh",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/sh_highlight_rules","ace/range"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./sh_highlight_rules").ShHighlightRules,h=a("../range").Range,i=function(){this.$tokenizer=new f((new g).getRules())};d.inherits(i,e),function(){this.toggleCommentLines=function(a,b,c,d){var e=!0,f=/^(\s*)#/;for(var g=c;g<=d;g++)if(!f.test(b.getLine(g))){e=!1;break}if(e){var i=new h(0,0,0,0);for(var g=c;g<=d;g++){var j=b.getLine(g),k=j.match(f);i.start.row=g,i.end.row=g,i.end.column=k[0].length,b.replace(i,k[1])}}else b.indentRows(c,d,"#")},this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a),f=e.tokens;if(f.length&&f[f.length-1].type=="comment")return d;if(a=="start"){var g=b.match(/^.*[\{\(\[\:]\s*$/);g&&(d+=c)}return d};var a={pass:1,"return":1,raise:1,"break":1,"continue":1};this.checkOutdent=function(b,c,d){if(d!=="\r\n"&&d!=="\r"&&d!=="\n")return!1;var e=this.$tokenizer.getLineTokens(c.trim(),b).tokens;if(!e)return!1;do var f=e.pop();while(f&&(f.type=="comment"||f.type=="text"&&f.value.match(/^\s+$/)));return f?f.type=="keyword"&&a[f.value]:!1},this.autoOutdent=function(a,b,c){c+=1;var d=this.$getIndent(b.getLine(c)),e=b.getTabString();d.slice(-e.length)==e&&b.remove(new h(c,d.length-e.length,c,d.length))}}.call(i.prototype),b.Mode=i}),define("ace/mode/sh_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("./text_highlight_rules").TextHighlightRules,g=function(){var a=e.arrayToMap("!|{|}|case|do|done|elif|else|esac|fi|for|if|in|then|until|while|&|;".split("|")),b=e.arrayToMap("echo|exit|eval|source|[|]|test|true|false|read".split("|")),c="(?:(?:[1-9]\\d*)|(?:0))",d="(?:\\.\\d+)",f="(?:\\d+)",g="(?:(?:"+f+"?"+d+")|(?:"+f+"\\.))",h="(?:(?:"+g+"|"+f+")"+")",i="(?:"+h+"|"+g+")",j="(?:&"+f+")",k="[a-zA-Z][a-zA-Z0-9_]*",l="(?:(?:\\$"+k+")|(?:"+k+"=))",m="(?:\\$(?:SHLVL|\\$|\\!|\\?))",n="(?:"+k+"\\s*\\(\\))";this.$rules={start:[{token:"comment",regex:"#.*$"},{token:"string",regex:'"(?:[^\\\\]|\\\\.)*?"'},{token:"variable.language",regex:m},{token:"variable",regex:l},{token:"support.function",regex:n},{token:"support.function",regex:j},{token:"string",regex:"'(?:[^\\\\]|\\\\.)*?'"},{token:"constant.numeric",regex:i},{token:"constant.numeric",regex:c+"\\b"},{token:function(c){return a.hasOwnProperty(c)?"keyword":b.hasOwnProperty(c)?"constant.language":c=="debugger"?"invalid.deprecated":"identifier"},regex:"[a-zA-Z_$][a-zA-Z0-9_$]*\\b"},{token:"keyword.operator",regex:"\\+|\\-|\\*|\\*\\*|\\/|\\/\\/|~|<|>|<=|=>|=|!="},{token:"lparen.paren",regex:"[\\[\\(\\{]"},{token:"paren.rparen",regex:"[\\]\\)\\}]"},{token:"text",regex:"\\s+"}]}};d.inherits(g,f),b.ShHighlightRules=g})
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-sql-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-sql-uncompressed.js
deleted file mode 100644
index e56ac4cb11..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-sql-uncompressed.js
+++ /dev/null
@@ -1,159 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
-* The Original Code is Ajax.org Code Editor (ACE).
-*
-* Contributor(s):
-*      Jonathan Camile <jonathan.camile AT gmail DOT com>
-*
-* Alternatively, the contents of this file may be used under the terms of
-* either the GNU General Public License Version 2 or later (the "GPL"), or
-* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-* in which case the provisions of the GPL or the LGPL are applicable instead
-* of those above. If you wish to allow use of your version of this file only
-* under the terms of either the GPL or the LGPL, and not to allow others to
-* use your version of this file under the terms of the MPL, indicate your
-* decision by deleting the provisions above and replace them with the notice
-* and other provisions required by the GPL or the LGPL. If you do not delete
-* the provisions above, a recipient may use your version of this file under
-* the terms of any one of the MPL, the GPL or the LGPL.
-*
-* ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/sql', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/sql_highlight_rules', 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
-var SqlHighlightRules = require("./sql_highlight_rules").SqlHighlightRules;
-var Range = require("../range").Range;
-
-var Mode = function() {
-    this.$tokenizer = new Tokenizer(new SqlHighlightRules().getRules());
-};
-oop.inherits(Mode, TextMode);
-
-(function() {
-
-    this.toggleCommentLines = function(state, doc, startRow, endRow) {
-        var outdent = true;
-        var outentedRows = [];
-        var re = /^(\s*)--/;
-
-        for (var i=startRow; i<= endRow; i++) {
-            if (!re.test(doc.getLine(i))) {
-                outdent = false;
-                break;
-            }
-        }
-
-        if (outdent) {
-            var deleteRange = new Range(0, 0, 0, 0);
-            for (var i=startRow; i<= endRow; i++)
-            {
-                var line = doc.getLine(i);
-                var m = line.match(re);
-                deleteRange.start.row = i;
-                deleteRange.end.row = i;
-                deleteRange.end.column = m[0].length;
-                doc.replace(deleteRange, m[1]);
-            }
-        }
-        else {
-            doc.indentRows(startRow, endRow, "--");
-        }
-    };
-
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * Contributor(s):
- *      Jonathan Camile <jonathan.camile AT gmail DOT com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/sql_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var lang = require("../lib/lang");
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var SqlHighlightRules = function() {
-
-    var keywords = lang.arrayToMap(
-        ("select|from|where|and|or|group|by|order|limit|offset|having|as|case|" +
-        "when|else|end|type|left|right|join|on|outer|desc|asc").split("|")
-    );
-
-    var builtinConstants = lang.arrayToMap(
-        ("true|false|null").split("|")
-    );
-
-    var builtinFunctions = lang.arrayToMap(
-        ("count|min|max|avg|sum|rank|now|coalesce").split("|")
-    );
-
-    this.$rules = {
-        "start" : [ {
-            token : "comment",
-            regex : "--.*$"
-        }, {
-            token : "string",           // " string
-            regex : '".*"'
-        }, {
-            token : "string",           // ' string
-            regex : "'.*'"
-        }, {
-            token : "constant.numeric", // float
-            regex : "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"
-        }, {
-            token : function(value) {
-                value = value.toLowerCase();
-                if (keywords.hasOwnProperty(value))
-                    return "keyword";
-                else if (builtinConstants.hasOwnProperty(value))
-                    return "constant.language";
-                else if (builtinFunctions.hasOwnProperty(value))
-                    return "support.function";
-                else
-                    return "identifier";
-            },
-            regex : "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
-        }, {
-            token : "keyword.operator",
-            regex : "\\+|\\-|\\/|\\/\\/|%|<@>|@>|<@|&|\\^|~|<|>|<=|=>|==|!=|<>|="
-        }, {
-            token : "lparen.paren",
-            regex : "[\\(]"
-        }, {
-            token : "paren.rparen",
-            regex : "[\\)]"
-        }, {
-            token : "text",
-            regex : "\\s+"
-        } ]
-    };
-};
-
-oop.inherits(SqlHighlightRules, TextHighlightRules);
-
-exports.SqlHighlightRules = SqlHighlightRules;
-});
-
diff --git a/apps/files_texteditor/js/aceeditor/mode-sql.js b/apps/files_texteditor/js/aceeditor/mode-sql.js
deleted file mode 100644
index e81fadfb36..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-sql.js
+++ /dev/null
@@ -1 +0,0 @@
-define("ace/mode/sql",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/sql_highlight_rules","ace/range"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./sql_highlight_rules").SqlHighlightRules,h=a("../range").Range,i=function(){this.$tokenizer=new f((new g).getRules())};d.inherits(i,e),function(){this.toggleCommentLines=function(a,b,c,d){var e=!0,f=[],g=/^(\s*)--/;for(var i=c;i<=d;i++)if(!g.test(b.getLine(i))){e=!1;break}if(e){var j=new h(0,0,0,0);for(var i=c;i<=d;i++){var k=b.getLine(i),l=k.match(g);j.start.row=i,j.end.row=i,j.end.column=l[0].length,b.replace(j,l[1])}}else b.indentRows(c,d,"--")}}.call(i.prototype),b.Mode=i}),define("ace/mode/sql_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("./text_highlight_rules").TextHighlightRules,g=function(){var a=e.arrayToMap("select|from|where|and|or|group|by|order|limit|offset|having|as|case|when|else|end|type|left|right|join|on|outer|desc|asc".split("|")),b=e.arrayToMap("true|false|null".split("|")),c=e.arrayToMap("count|min|max|avg|sum|rank|now|coalesce".split("|"));this.$rules={start:[{token:"comment",regex:"--.*$"},{token:"string",regex:'".*"'},{token:"string",regex:"'.*'"},{token:"constant.numeric",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:function(d){return d=d.toLowerCase(),a.hasOwnProperty(d)?"keyword":b.hasOwnProperty(d)?"constant.language":c.hasOwnProperty(d)?"support.function":"identifier"},regex:"[a-zA-Z_$][a-zA-Z0-9_$]*\\b"},{token:"keyword.operator",regex:"\\+|\\-|\\/|\\/\\/|%|<@>|@>|<@|&|\\^|~|<|>|<=|=>|==|!=|<>|="},{token:"lparen.paren",regex:"[\\(]"},{token:"paren.rparen",regex:"[\\)]"},{token:"text",regex:"\\s+"}]}};d.inherits(g,f),b.SqlHighlightRules=g})
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-svg-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-svg-uncompressed.js
deleted file mode 100644
index 1025d99bd3..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-svg-uncompressed.js
+++ /dev/null
@@ -1,2112 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/svg', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/xml', 'ace/mode/javascript', 'ace/tokenizer', 'ace/mode/svg_highlight_rules', 'ace/mode/folding/mixed', 'ace/mode/folding/xml', 'ace/mode/folding/cstyle'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var XmlMode = require("./xml").Mode;
-var JavaScriptMode = require("./javascript").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
-var SvgHighlightRules = require("./svg_highlight_rules").SvgHighlightRules;
-var MixedFoldMode = require("./folding/mixed").FoldMode;
-var XmlFoldMode = require("./folding/xml").FoldMode;
-var CStyleFoldMode = require("./folding/cstyle").FoldMode;
-
-var Mode = function() {
-    XmlMode.call(this);
-    
-    this.highlighter = new SvgHighlightRules();
-    this.$tokenizer = new Tokenizer(this.highlighter.getRules());
-    
-    this.$embeds = this.highlighter.getEmbeds();
-    this.createModeDelegates({
-        "js-": JavaScriptMode
-    });
-    
-    this.foldingRules = new MixedFoldMode(new XmlFoldMode({}), {
-        "js-": new CStyleFoldMode()
-    });
-};
-
-oop.inherits(Mode, XmlMode);
-
-(function() {
-
-    this.getNextLineIndent = function(state, line, tab) {
-        return this.$getIndent(line);
-    };
-    
-
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/xml', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/xml_highlight_rules', 'ace/mode/behaviour/xml', 'ace/mode/folding/xml'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
-var XmlHighlightRules = require("./xml_highlight_rules").XmlHighlightRules;
-var XmlBehaviour = require("./behaviour/xml").XmlBehaviour;
-var XmlFoldMode = require("./folding/xml").FoldMode;
-
-var Mode = function() {
-    this.$tokenizer = new Tokenizer(new XmlHighlightRules().getRules());
-    this.$behaviour = new XmlBehaviour();
-    this.foldingRules = new XmlFoldMode();
-};
-
-oop.inherits(Mode, TextMode);
-
-(function() {
-    
-    this.getNextLineIndent = function(state, line, tab) {
-        return this.$getIndent(line);
-    };
-
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/xml_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/xml_util', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var xmlUtil = require("./xml_util");
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var XmlHighlightRules = function() {
-
-    // regexp must not have capturing parentheses
-    // regexps are ordered -> the first match is used
-    this.$rules = {
-        start : [{
-            token : "text",
-            regex : "<\\!\\[CDATA\\[",
-            next : "cdata"
-        }, {
-            token : "xml_pe",
-            regex : "<\\?.*?\\?>"
-        }, {
-            token : "comment",
-            merge : true,
-            regex : "<\\!--",
-            next : "comment"
-        }, {
-            token : "xml_pe",
-            regex : "<\\!.*?>"
-        }, {
-            token : "meta.tag", // opening tag
-            regex : "<\\/?",
-            next : "tag"
-        }, {
-            token : "text",
-            regex : "\\s+"
-        }, {
-            token : "constant.character.entity",
-            regex : "(?:&#[0-9]+;)|(?:&#x[0-9a-fA-F]+;)|(?:&[a-zA-Z0-9_:\\.-]+;)"
-        }, {
-            token : "text",
-            regex : "[^<]+"
-        }],
-        
-        cdata : [{
-            token : "text",
-            regex : "\\]\\]>",
-            next : "start"
-        }, {
-            token : "text",
-            regex : "\\s+"
-        }, {
-            token : "text",
-            regex : "(?:[^\\]]|\\](?!\\]>))+"
-        }],
-
-        comment : [{
-            token : "comment",
-            regex : ".*?-->",
-            next : "start"
-        }, {
-            token : "comment",
-            merge : true,
-            regex : ".+"
-        }]
-    };
-    
-    xmlUtil.tag(this.$rules, "tag", "start");
-};
-
-oop.inherits(XmlHighlightRules, TextHighlightRules);
-
-exports.XmlHighlightRules = XmlHighlightRules;
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/xml_util', ['require', 'exports', 'module' , 'ace/lib/lang'], function(require, exports, module) {
-"use strict";
-
-var lang = require("../lib/lang");
-
-var formTags = lang.arrayToMap(
-    ("button|form|input|label|select|textarea").split("|")
-);
-
-var tableTags = lang.arrayToMap(
-    ("table|tbody|td|tfoot|th|tr").split("|")
-);
-
-function string(state) {
-    return [{
-        token : "string",
-        regex : '".*?"'
-    }, {
-        token : "string", // multi line string start
-        merge : true,
-        regex : '["].*',
-        next : state + "_qqstring"
-    }, {
-        token : "string",
-        regex : "'.*?'"
-    }, {
-        token : "string", // multi line string start
-        merge : true,
-        regex : "['].*",
-        next : state + "_qstring"
-    }];
-}
-
-function multiLineString(quote, state) {
-    return [{
-        token : "string",
-        merge : true,
-        regex : ".*?" + quote,
-        next : state
-    }, {
-        token : "string",
-        merge : true,
-        regex : '.+'
-    }];
-}
-
-exports.tag = function(states, name, nextState) {
-    states[name] = [{
-        token : "text",
-        regex : "\\s+"
-    }, {
-        //token : "meta.tag",
-        
-    token : function(value) {
-            if ( value==='a' ) {
-                return "meta.tag.anchor";
-            }
-            else if ( value==='img' ) {
-                return "meta.tag.image";
-            }
-            else if ( value==='script' ) {
-                return "meta.tag.script";
-            }
-            else if ( value==='style' ) {
-                return "meta.tag.style";
-            }
-            else if (formTags.hasOwnProperty(value.toLowerCase())) {
-                return "meta.tag.form";
-            }
-            else if (tableTags.hasOwnProperty(value.toLowerCase())) {
-                return "meta.tag.table";
-            }
-            else {
-                return "meta.tag";
-            }
-        },        
-        merge : true,
-        regex : "[-_a-zA-Z0-9:]+",
-        next : name + "_embed_attribute_list" 
-    }, {
-        token: "empty",
-        regex: "",
-        next : name + "_embed_attribute_list"
-    }];
-
-    states[name + "_qstring"] = multiLineString("'", name + "_embed_attribute_list");
-    states[name + "_qqstring"] = multiLineString("\"", name + "_embed_attribute_list");
-    
-    states[name + "_embed_attribute_list"] = [{
-        token : "meta.tag",
-        merge : true,
-        regex : "\/?>",
-        next : nextState
-    }, {
-        token : "keyword.operator",
-        regex : "="
-    }, {
-        token : "entity.other.attribute-name",
-        regex : "[-_a-zA-Z0-9:]+"
-    }, {
-        token : "constant.numeric", // float
-        regex : "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"
-    }, {
-        token : "text",
-        regex : "\\s+"
-    }].concat(string(name));
-};
-
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Chris Spencer <chris.ag.spencer AT googlemail DOT com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/behaviour/xml', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/behaviour', 'ace/mode/behaviour/cstyle'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var Behaviour = require("../behaviour").Behaviour;
-var CstyleBehaviour = require("./cstyle").CstyleBehaviour;
-
-var XmlBehaviour = function () {
-    
-    this.inherit(CstyleBehaviour, ["string_dquotes"]); // Get string behaviour
-    
-    this.add("brackets", "insertion", function (state, action, editor, session, text) {
-        if (text == '<') {
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return false;
-            } else {
-                return {
-                    text: '<>',
-                    selection: [1, 1]
-                }
-            }
-        } else if (text == '>') {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == '>') { // need some kind of matching check here
-                return {
-                    text: '',
-                    selection: [1, 1]
-                }
-            }
-        } else if (text == "\n") {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChars = line.substring(cursor.column, cursor.column + 2);
-            if (rightChars == '</') {
-                var indent = this.$getIndent(session.doc.getLine(cursor.row)) + session.getTabString();
-                var next_indent = this.$getIndent(session.doc.getLine(cursor.row));
-
-                return {
-                    text: '\n' + indent + '\n' + next_indent,
-                    selection: [1, indent.length, 1, indent.length]
-                }
-            }
-        }
-    });
-    
-}
-oop.inherits(XmlBehaviour, Behaviour);
-
-exports.XmlBehaviour = XmlBehaviour;
-});/* vim:ts=4:sts=4:sw=4:
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Chris Spencer <chris.ag.spencer AT googlemail DOT com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/behaviour/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/behaviour'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var Behaviour = require('../behaviour').Behaviour;
-
-var CstyleBehaviour = function () {
-
-    this.add("braces", "insertion", function (state, action, editor, session, text) {
-        if (text == '{') {
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: '{' + selected + '}',
-                    selection: false
-                };
-            } else {
-                return {
-                    text: '{}',
-                    selection: [1, 1]
-                };
-            }
-        } else if (text == '}') {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == '}') {
-                var matching = session.$findOpeningBracket('}', {column: cursor.column + 1, row: cursor.row});
-                if (matching !== null) {
-                    return {
-                        text: '',
-                        selection: [1, 1]
-                    };
-                }
-            }
-        } else if (text == "\n") {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == '}') {
-                var openBracePos = session.findMatchingBracket({row: cursor.row, column: cursor.column + 1});
-                if (!openBracePos)
-                     return null;
-
-                var indent = this.getNextLineIndent(state, line.substring(0, line.length - 1), session.getTabString());
-                var next_indent = this.$getIndent(session.doc.getLine(openBracePos.row));
-
-                return {
-                    text: '\n' + indent + '\n' + next_indent,
-                    selection: [1, indent.length, 1, indent.length]
-                };
-            }
-        }
-    });
-
-    this.add("braces", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && selected == '{') {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.end.column, range.end.column + 1);
-            if (rightChar == '}') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-    this.add("parens", "insertion", function (state, action, editor, session, text) {
-        if (text == '(') {
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: '(' + selected + ')',
-                    selection: false
-                };
-            } else {
-                return {
-                    text: '()',
-                    selection: [1, 1]
-                };
-            }
-        } else if (text == ')') {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == ')') {
-                var matching = session.$findOpeningBracket(')', {column: cursor.column + 1, row: cursor.row});
-                if (matching !== null) {
-                    return {
-                        text: '',
-                        selection: [1, 1]
-                    };
-                }
-            }
-        }
-    });
-
-    this.add("parens", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && selected == '(') {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
-            if (rightChar == ')') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-    this.add("string_dquotes", "insertion", function (state, action, editor, session, text) {
-        if (text == '"' || text == "'") {
-            var quote = text;
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: quote + selected + quote,
-                    selection: false
-                };
-            } else {
-                var cursor = editor.getCursorPosition();
-                var line = session.doc.getLine(cursor.row);
-                var leftChar = line.substring(cursor.column-1, cursor.column);
-
-                // We're escaped.
-                if (leftChar == '\\') {
-                    return null;
-                }
-
-                // Find what token we're inside.
-                var tokens = session.getTokens(selection.start.row, selection.start.row)[0].tokens;
-                var col = 0, token;
-                var quotepos = -1; // Track whether we're inside an open quote.
-
-                for (var x = 0; x < tokens.length; x++) {
-                    token = tokens[x];
-                    if (token.type == "string") {
-                      quotepos = -1;
-                    } else if (quotepos < 0) {
-                      quotepos = token.value.indexOf(quote);
-                    }
-                    if ((token.value.length + col) > selection.start.column) {
-                        break;
-                    }
-                    col += tokens[x].value.length;
-                }
-
-                // Try and be smart about when we auto insert.
-                if (!token || (quotepos < 0 && token.type !== "comment" && (token.type !== "string" || ((selection.start.column !== token.value.length+col-1) && token.value.lastIndexOf(quote) === token.value.length-1)))) {
-                    return {
-                        text: quote + quote,
-                        selection: [1,1]
-                    };
-                } else if (token && token.type === "string") {
-                    // Ignore input and move right one if we're typing over the closing quote.
-                    var rightChar = line.substring(cursor.column, cursor.column + 1);
-                    if (rightChar == quote) {
-                        return {
-                            text: '',
-                            selection: [1, 1]
-                        };
-                    }
-                }
-            }
-        }
-    });
-
-    this.add("string_dquotes", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && (selected == '"' || selected == "'")) {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
-            if (rightChar == '"') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-};
-
-oop.inherits(CstyleBehaviour, Behaviour);
-
-exports.CstyleBehaviour = CstyleBehaviour;
-});/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/folding/xml', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/range', 'ace/mode/folding/fold_mode', 'ace/token_iterator'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var lang = require("../../lib/lang");
-var Range = require("../../range").Range;
-var BaseFoldMode = require("./fold_mode").FoldMode;
-var TokenIterator = require("../../token_iterator").TokenIterator;
-
-var FoldMode = exports.FoldMode = function(voidElements) {
-    BaseFoldMode.call(this);
-    this.voidElements = voidElements || {};
-};
-oop.inherits(FoldMode, BaseFoldMode);
-
-(function() {
-
-    this.getFoldWidget = function(session, foldStyle, row) {
-        var tag = this._getFirstTagInLine(session, row);
-
-        if (tag.closing)
-            return foldStyle == "markbeginend" ? "end" : "";
-
-        if (!tag.tagName || this.voidElements[tag.tagName.toLowerCase()])
-            return "";
-
-        if (tag.selfClosing)
-            return "";
-
-        if (tag.value.indexOf("/" + tag.tagName) !== -1)
-            return "";
-
-        return "start";
-    };
-    
-    this._getFirstTagInLine = function(session, row) {
-        var tokens = session.getTokens(row, row)[0].tokens;
-        var value = "";
-        for (var i = 0; i < tokens.length; i++) {
-            var token = tokens[i];
-            if (token.type.indexOf("meta.tag") === 0)
-                value += token.value;
-            else
-                value += lang.stringRepeat(" ", token.value.length);
-        }
-        
-        return this._parseTag(value);
-    };
-
-    this.tagRe = /^(\s*)(<?(\/?)([-_a-zA-Z0-9:!]*)\s*(\/?)>?)/;
-    this._parseTag = function(tag) {
-        
-        var match = this.tagRe.exec(tag);
-        var column = this.tagRe.lastIndex || 0;
-        this.tagRe.lastIndex = 0;
-
-        return {
-            value: tag,
-            match: match ? match[2] : "",
-            closing: match ? !!match[3] : false,
-            selfClosing: match ? !!match[5] || match[2] == "/>" : false,
-            tagName: match ? match[4] : "",
-            column: match[1] ? column + match[1].length : column
-        };
-    };
-    
-    /**
-     * reads a full tag and places the iterator after the tag
-     */
-    this._readTagForward = function(iterator) {
-        var token = iterator.getCurrentToken();
-        if (!token)
-            return null;
-            
-        var value = "";
-        var start;
-        
-        do {
-            if (token.type.indexOf("meta.tag") === 0) {
-                if (!start) {
-                    var start = {
-                        row: iterator.getCurrentTokenRow(),
-                        column: iterator.getCurrentTokenColumn()
-                    };
-                }
-                value += token.value;
-                if (value.indexOf(">") !== -1) {
-                    var tag = this._parseTag(value);
-                    tag.start = start;
-                    tag.end = {
-                        row: iterator.getCurrentTokenRow(),
-                        column: iterator.getCurrentTokenColumn() + token.value.length
-                    };
-                    iterator.stepForward();
-                    return tag;
-                }
-            }
-        } while(token = iterator.stepForward());
-        
-        return null;
-    };
-    
-    this._readTagBackward = function(iterator) {
-        var token = iterator.getCurrentToken();
-        if (!token)
-            return null;
-            
-        var value = "";
-        var end;
-
-        do {
-            if (token.type.indexOf("meta.tag") === 0) {
-                if (!end) {
-                    end = {
-                        row: iterator.getCurrentTokenRow(),
-                        column: iterator.getCurrentTokenColumn() + token.value.length
-                    };
-                }
-                value = token.value + value;
-                if (value.indexOf("<") !== -1) {
-                    var tag = this._parseTag(value);
-                    tag.end = end;
-                    tag.start = {
-                        row: iterator.getCurrentTokenRow(),
-                        column: iterator.getCurrentTokenColumn()
-                    };
-                    iterator.stepBackward();
-                    return tag;
-                }
-            }
-        } while(token = iterator.stepBackward());
-        
-        return null;
-    };
-    
-    this._pop = function(stack, tag) {
-        while (stack.length) {
-            
-            var top = stack[stack.length-1];
-            if (!tag || top.tagName == tag.tagName) {
-                return stack.pop();
-            }
-            else if (this.voidElements[tag.tagName]) {
-                return;
-            }
-            else if (this.voidElements[top.tagName]) {
-                stack.pop();
-                continue;
-            } else {
-                return null;
-            }
-        }
-    };
-    
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        var firstTag = this._getFirstTagInLine(session, row);
-        
-        if (!firstTag.match)
-            return null;
-        
-        var isBackward = firstTag.closing || firstTag.selfClosing;
-        var stack = [];
-        var tag;
-        
-        if (!isBackward) {
-            var iterator = new TokenIterator(session, row, firstTag.column);
-            var start = {
-                row: row,
-                column: firstTag.column + firstTag.tagName.length + 2
-            };
-            while (tag = this._readTagForward(iterator)) {
-                if (tag.selfClosing) {
-                    if (!stack.length) {
-                        tag.start.column += tag.tagName.length + 2;
-                        tag.end.column -= 2;
-                        return Range.fromPoints(tag.start, tag.end);
-                    } else
-                        continue;
-                }
-                
-                if (tag.closing) {
-                    this._pop(stack, tag);
-                    if (stack.length == 0)
-                        return Range.fromPoints(start, tag.start);
-                }
-                else {
-                    stack.push(tag)
-                }
-            }
-        }
-        else {
-            var iterator = new TokenIterator(session, row, firstTag.column + firstTag.match.length);
-            var end = {
-                row: row,
-                column: firstTag.column
-            };
-            
-            while (tag = this._readTagBackward(iterator)) {
-                if (tag.selfClosing) {
-                    if (!stack.length) {
-                        tag.start.column += tag.tagName.length + 2;
-                        tag.end.column -= 2;
-                        return Range.fromPoints(tag.start, tag.end);
-                    } else
-                        continue;
-                }
-                
-                if (!tag.closing) {
-                    this._pop(stack, tag);
-                    if (stack.length == 0) {
-                        tag.start.column += tag.tagName.length + 2;
-                        return Range.fromPoints(tag.start, end);
-                    }
-                }
-                else {
-                    stack.push(tag)
-                }
-            }
-        }
-        
-    };
-
-}).call(FoldMode.prototype);
-
-});/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/folding/fold_mode', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../../range").Range;
-
-var FoldMode = exports.FoldMode = function() {};
-
-(function() {
-
-    this.foldingStartMarker = null;
-    this.foldingStopMarker = null;
-
-    // must return "" if there's no fold, to enable caching
-    this.getFoldWidget = function(session, foldStyle, row) {
-        var line = session.getLine(row);
-        if (this.foldingStartMarker.test(line))
-            return "start";
-        if (foldStyle == "markbeginend"
-                && this.foldingStopMarker
-                && this.foldingStopMarker.test(line))
-            return "end";
-        return "";
-    };
-    
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        return null;
-    };
-
-    this.indentationBlock = function(session, row, column) {
-        var re = /^\s*/;
-        var startRow = row;
-        var endRow = row;
-        var line = session.getLine(row);
-        var startColumn = column || line.length;
-        var startLevel = line.match(re)[0].length;
-        var maxRow = session.getLength()
-        
-        while (++row < maxRow) {
-            line = session.getLine(row);
-            var level = line.match(re)[0].length;
-
-            if (level == line.length)
-                continue;
-
-            if (level <= startLevel)
-                break;
-
-            endRow = row;
-        }
-
-        if (endRow > startRow) {
-            var endColumn = session.getLine(endRow).length;
-            return new Range(startRow, startColumn, endRow, endColumn);
-        }
-    };
-
-    this.openingBracketBlock = function(session, bracket, row, column) {
-        var start = {row: row, column: column + 1};
-        var end = session.$findClosingBracket(bracket, start);
-        if (!end)
-            return;
-
-        var fw = session.foldWidgets[end.row];
-        if (fw == null)
-            fw = this.getFoldWidget(session, end.row);
-
-        if (fw == "start") {
-            end.row --;
-            end.column = session.getLine(end.row).length;
-        }
-        return Range.fromPoints(start, end);
-    };
-
-}).call(FoldMode.prototype);
-
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/javascript', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/javascript_highlight_rules', 'ace/mode/matching_brace_outdent', 'ace/range', 'ace/worker/worker_client', 'ace/mode/behaviour/cstyle', 'ace/mode/folding/cstyle'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
-var JavaScriptHighlightRules = require("./javascript_highlight_rules").JavaScriptHighlightRules;
-var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
-var Range = require("../range").Range;
-var WorkerClient = require("../worker/worker_client").WorkerClient;
-var CstyleBehaviour = require("./behaviour/cstyle").CstyleBehaviour;
-var CStyleFoldMode = require("./folding/cstyle").FoldMode;
-
-var Mode = function() {
-    this.$tokenizer = new Tokenizer(new JavaScriptHighlightRules().getRules());
-    this.$outdent = new MatchingBraceOutdent();
-    this.$behaviour = new CstyleBehaviour();
-    this.foldingRules = new CStyleFoldMode();
-};
-oop.inherits(Mode, TextMode);
-
-(function() {
-
-
-    this.toggleCommentLines = function(state, doc, startRow, endRow) {
-        var outdent = true;
-        var re = /^(\s*)\/\//;
-
-        for (var i=startRow; i<= endRow; i++) {
-            if (!re.test(doc.getLine(i))) {
-                outdent = false;
-                break;
-            }
-        }
-
-        if (outdent) {
-            var deleteRange = new Range(0, 0, 0, 0);
-            for (var i=startRow; i<= endRow; i++)
-            {
-                var line = doc.getLine(i);
-                var m = line.match(re);
-                deleteRange.start.row = i;
-                deleteRange.end.row = i;
-                deleteRange.end.column = m[0].length;
-                doc.replace(deleteRange, m[1]);
-            }
-        }
-        else {
-            doc.indentRows(startRow, endRow, "//");
-        }
-    };
-
-    this.getNextLineIndent = function(state, line, tab) {
-        var indent = this.$getIndent(line);
-
-        var tokenizedLine = this.$tokenizer.getLineTokens(line, state);
-        var tokens = tokenizedLine.tokens;
-        var endState = tokenizedLine.state;
-
-        if (tokens.length && tokens[tokens.length-1].type == "comment") {
-            return indent;
-        }
-        
-        if (state == "start" || state == "regex_allowed") {
-            var match = line.match(/^.*(?:\bcase\b.*\:|[\{\(\[])\s*$/);
-            if (match) {
-                indent += tab;
-            }
-        } else if (state == "doc-start") {
-            if (endState == "start" || state == "regex_allowed") {
-                return "";
-            }
-            var match = line.match(/^\s*(\/?)\*/);
-            if (match) {
-                if (match[1]) {
-                    indent += " ";
-                }
-                indent += "* ";
-            }
-        }
-
-        return indent;
-    };
-
-    this.checkOutdent = function(state, line, input) {
-        return this.$outdent.checkOutdent(line, input);
-    };
-
-    this.autoOutdent = function(state, doc, row) {
-        this.$outdent.autoOutdent(doc, row);
-    };
-    
-    this.createWorker = function(session) {
-        var worker = new WorkerClient(["ace"], "worker-javascript.js", "ace/mode/javascript_worker", "JavaScriptWorker");
-        worker.attachToDocument(session.getDocument());
-            
-        worker.on("jslint", function(results) {
-            var errors = [];
-            for (var i=0; i<results.data.length; i++) {
-                var error = results.data[i];
-                if (error)
-                    errors.push({
-                        row: error.line-1,
-                        column: error.character-1,
-                        text: error.reason,
-                        type: "warning",
-                        lint: error
-                    });
-            }
-            session.setAnnotations(errors);
-        });
-        
-        worker.on("narcissus", function(e) {
-            session.setAnnotations([e.data]);
-        });
-        
-        worker.on("terminate", function() {
-            session.clearAnnotations();
-        });
-        
-        return worker;
-    };
-
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Mihai Sucan <mihai DOT sucan AT gmail DOT com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/javascript_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/unicode', 'ace/mode/doc_comment_highlight_rules', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var lang = require("../lib/lang");
-var unicode = require("../unicode");
-var DocCommentHighlightRules = require("./doc_comment_highlight_rules").DocCommentHighlightRules;
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var JavaScriptHighlightRules = function() {
-
-    // see: https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects
-    var globals = lang.arrayToMap(
-      // Constructors
-        ("Array|Boolean|Date|Function|Iterator|Number|Object|RegExp|String|Proxy|" +
-      // E4X
-         "Namespace|QName|XML|XMLList|" +
-         "ArrayBuffer|Float32Array|Float64Array|Int16Array|Int32Array|Int8Array|" +
-         "Uint16Array|Uint32Array|Uint8Array|Uint8ClampedArray|" +
-      // Errors
-        "Error|EvalError|InternalError|RangeError|ReferenceError|StopIteration|" +
-        "SyntaxError|TypeError|URIError|" +
-      //  Non-constructor functions
-        "decodeURI|decodeURIComponent|encodeURI|encodeURIComponent|eval|isFinite|" +
-        "isNaN|parseFloat|parseInt|" +
-      // Other
-        "JSON|Math|" +
-      // Pseudo
-        "this|arguments|prototype|window|document"
-      ).split("|")
-    );
-
-    var keywords = lang.arrayToMap(
-        ("break|case|catch|continue|default|delete|do|else|finally|for|function|" +
-        "if|in|instanceof|new|return|switch|throw|try|typeof|let|var|while|with|" +
-        "const|yield|import|get|set").split("|")
-    );
-
-    // keywords which can be followed by regular expressions
-    var kwBeforeRe = "case|do|else|finally|in|instanceof|return|throw|try|typeof|yield";
-
-    var deprecated = lang.arrayToMap(
-        ("__parent__|__count__|escape|unescape|with|__proto__").split("|")
-    );
-
-    var definitions = lang.arrayToMap(("const|let|var|function").split("|"));
-
-    var buildinConstants = lang.arrayToMap(
-        ("null|Infinity|NaN|undefined").split("|")
-    );
-
-    var futureReserved = lang.arrayToMap(
-        ("class|enum|extends|super|export|implements|private|" +
-        "public|interface|package|protected|static").split("|")
-    );
-
-    // TODO: Unicode escape sequences
-    var identifierRe = "[" + unicode.packages.L + "\\$_]["
-        + unicode.packages.L
-        + unicode.packages.Mn + unicode.packages.Mc
-        + unicode.packages.Nd
-        + unicode.packages.Pc + "\\$_]*\\b";
-
-    var escapedRe = "\\\\(?:x[0-9a-fA-F]{2}|" + // hex
-        "u[0-9a-fA-F]{4}|" + // unicode
-        "[0-2][0-7]{0,2}|" + // oct
-        "3[0-6][0-7]?|" + // oct
-        "37[0-7]?|" + // oct
-        "[4-7][0-7]?|" + //oct
-        ".)";
-
-    // regexp must not have capturing parentheses. Use (?:) instead.
-    // regexps are ordered -> the first match is used
-
-    this.$rules = {
-        "start" : [
-            {
-                token : "comment",
-                regex : /\/\/.*$/
-            },
-            new DocCommentHighlightRules().getStartRule("doc-start"),
-            {
-                token : "comment", // multi line comment
-                merge : true,
-                regex : /\/\*/,
-                next : "comment"
-            }, {
-                token : "string",
-                regex : "'",
-                next  : "qstring"
-            }, {
-                token : "string",
-                regex : '"',
-                next  : "qqstring"
-            }, {
-                token : "constant.numeric", // hex
-                regex : /0[xX][0-9a-fA-F]+\b/
-            }, {
-                token : "constant.numeric", // float
-                regex : /[+-]?\d+(?:(?:\.\d*)?(?:[eE][+-]?\d+)?)?\b/
-            }, { // match stuff like: Sound.prototype.play = function() { }
-                token : [
-                    "storage.type",
-                    "punctuation.operator",
-                    "support.function",
-                    "punctuation.operator",
-                    "entity.name.function",
-                    "text",
-                    "keyword.operator",
-                    "text",
-                    "storage.type",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(" + identifierRe + ")(\\.)(prototype)(\\.)(" + identifierRe +")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"
-            }, { // match stuff like: Sound.prototype.play = myfunc
-                token : [
-                    "storage.type",
-                    "punctuation.operator",
-                    "support.function",
-                    "punctuation.operator",
-                    "entity.name.function",
-                    "text",
-                    "keyword.operator",
-                    "text"
-                ],
-                regex : "(" + identifierRe + ")(\\.)(prototype)(\\.)(" + identifierRe +")(\\s*)(=)(\\s*)"
-            }, { // match stuff like: Sound.play = function() {  }
-                token : [
-                    "storage.type",
-                    "punctuation.operator",
-                    "entity.name.function",
-                    "text",
-                    "keyword.operator",
-                    "text",
-                    "storage.type",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(" + identifierRe + ")(\\.)(" + identifierRe +")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"
-            }, { // match stuff like: play = function() {  }
-                token : [
-                    "entity.name.function",
-                    "text",
-                    "keyword.operator",
-                    "text",
-                    "storage.type",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(" + identifierRe +")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"
-            }, { // match regular function like: function myFunc(arg) { }
-                token : [
-                    "storage.type",
-                    "text",
-                    "entity.name.function",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(function)(\\s+)(" + identifierRe + ")(\\s*)(\\()(.*?)(\\))"
-            }, { // match stuff like: foobar: function() { }
-                token : [
-                    "entity.name.function",
-                    "text",
-                    "punctuation.operator",
-                    "text",
-                    "storage.type",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(" + identifierRe + ")(\\s*)(:)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"
-            }, { // Attempt to match : function() { } (this is for issues with 'foo': function() { })
-                token : [
-                    "text",
-                    "text",
-                    "storage.type",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(:)(\\s*)(function)?(\\s*)(\\()([^)]*)(\\))"
-            }, {
-                token : "constant.language.boolean",
-                regex : /(?:true|false)\b/
-            }, {
-                token : "keyword",
-                regex : "(?:" + kwBeforeRe + ")\\b",
-                next : "regex_allowed"
-            }, {
-                token : ["punctuation.operator", "support.function"],
-                regex : /(\.)(s(?:h(?:ift|ow(?:Mod(?:elessDialog|alDialog)|Help))|croll(?:X|By(?:Pages|Lines)?|Y|To)?|t(?:opzzzz|rike)|i(?:n|zeToContent|debar|gnText)|ort|u(?:p|b(?:str(?:ing)?)?)|pli(?:ce|t)|e(?:nd|t(?:Re(?:sizable|questHeader)|M(?:i(?:nutes|lliseconds)|onth)|Seconds|Ho(?:tKeys|urs)|Year|Cursor|Time(?:out)?|Interval|ZOptions|Date|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Date|FullYear)|FullYear|Active)|arch)|qrt|lice|avePreferences|mall)|h(?:ome|andleEvent)|navigate|c(?:har(?:CodeAt|At)|o(?:s|n(?:cat|textual|firm)|mpile)|eil|lear(?:Timeout|Interval)?|a(?:ptureEvents|ll)|reate(?:StyleSheet|Popup|EventObject))|t(?:o(?:GMTString|S(?:tring|ource)|U(?:TCString|pperCase)|Lo(?:caleString|werCase))|est|a(?:n|int(?:Enabled)?))|i(?:s(?:NaN|Finite)|ndexOf|talics)|d(?:isableExternalCapture|ump|etachEvent)|u(?:n(?:shift|taint|escape|watch)|pdateCommands)|j(?:oin|avaEnabled)|p(?:o(?:p|w)|ush|lugins.refresh|a(?:ddings|rse(?:Int|Float)?)|r(?:int|ompt|eference))|e(?:scape|nableExternalCapture|val|lementFromPoint|x(?:p|ec(?:Script|Command)?))|valueOf|UTC|queryCommand(?:State|Indeterm|Enabled|Value)|f(?:i(?:nd|le(?:ModifiedDate|Size|CreatedDate|UpdatedDate)|xed)|o(?:nt(?:size|color)|rward)|loor|romCharCode)|watch|l(?:ink|o(?:ad|g)|astIndexOf)|a(?:sin|nchor|cos|t(?:tachEvent|ob|an(?:2)?)|pply|lert|b(?:s|ort))|r(?:ou(?:nd|teEvents)|e(?:size(?:By|To)|calc|turnValue|place|verse|l(?:oad|ease(?:Capture|Events)))|andom)|g(?:o|et(?:ResponseHeader|M(?:i(?:nutes|lliseconds)|onth)|Se(?:conds|lection)|Hours|Year|Time(?:zoneOffset)?|Da(?:y|te)|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Da(?:y|te)|FullYear)|FullYear|A(?:ttention|llResponseHeaders)))|m(?:in|ove(?:B(?:y|elow)|To(?:Absolute)?|Above)|ergeAttributes|a(?:tch|rgins|x))|b(?:toa|ig|o(?:ld|rderWidths)|link|ack))\b(?=\()/
-            }, {
-                token : ["punctuation.operator", "support.function.dom"],
-                regex : /(\.)(s(?:ub(?:stringData|mit)|plitText|e(?:t(?:NamedItem|Attribute(?:Node)?)|lect))|has(?:ChildNodes|Feature)|namedItem|c(?:l(?:ick|o(?:se|neNode))|reate(?:C(?:omment|DATASection|aption)|T(?:Head|extNode|Foot)|DocumentFragment|ProcessingInstruction|E(?:ntityReference|lement)|Attribute))|tabIndex|i(?:nsert(?:Row|Before|Cell|Data)|tem)|open|delete(?:Row|C(?:ell|aption)|T(?:Head|Foot)|Data)|focus|write(?:ln)?|a(?:dd|ppend(?:Child|Data))|re(?:set|place(?:Child|Data)|move(?:NamedItem|Child|Attribute(?:Node)?)?)|get(?:NamedItem|Element(?:sBy(?:Name|TagName)|ById)|Attribute(?:Node)?)|blur)\b(?=\()/
-            }, {
-                token : ["punctuation.operator", "support.constant"],
-                regex : /(\.)(s(?:ystemLanguage|cr(?:ipts|ollbars|een(?:X|Y|Top|Left))|t(?:yle(?:Sheets)?|atus(?:Text|bar)?)|ibling(?:Below|Above)|ource|uffixes|e(?:curity(?:Policy)?|l(?:ection|f)))|h(?:istory|ost(?:name)?|as(?:h|Focus))|y|X(?:MLDocument|SLDocument)|n(?:ext|ame(?:space(?:s|URI)|Prop))|M(?:IN_VALUE|AX_VALUE)|c(?:haracterSet|o(?:n(?:structor|trollers)|okieEnabled|lorDepth|mp(?:onents|lete))|urrent|puClass|l(?:i(?:p(?:boardData)?|entInformation)|osed|asses)|alle(?:e|r)|rypto)|t(?:o(?:olbar|p)|ext(?:Transform|Indent|Decoration|Align)|ags)|SQRT(?:1_2|2)|i(?:n(?:ner(?:Height|Width)|put)|ds|gnoreCase)|zIndex|o(?:scpu|n(?:readystatechange|Line)|uter(?:Height|Width)|p(?:sProfile|ener)|ffscreenBuffering)|NEGATIVE_INFINITY|d(?:i(?:splay|alog(?:Height|Top|Width|Left|Arguments)|rectories)|e(?:scription|fault(?:Status|Ch(?:ecked|arset)|View)))|u(?:ser(?:Profile|Language|Agent)|n(?:iqueID|defined)|pdateInterval)|_content|p(?:ixelDepth|ort|ersonalbar|kcs11|l(?:ugins|atform)|a(?:thname|dding(?:Right|Bottom|Top|Left)|rent(?:Window|Layer)?|ge(?:X(?:Offset)?|Y(?:Offset)?))|r(?:o(?:to(?:col|type)|duct(?:Sub)?|mpter)|e(?:vious|fix)))|e(?:n(?:coding|abledPlugin)|x(?:ternal|pando)|mbeds)|v(?:isibility|endor(?:Sub)?|Linkcolor)|URLUnencoded|P(?:I|OSITIVE_INFINITY)|f(?:ilename|o(?:nt(?:Size|Family|Weight)|rmName)|rame(?:s|Element)|gColor)|E|whiteSpace|l(?:i(?:stStyleType|n(?:eHeight|kColor))|o(?:ca(?:tion(?:bar)?|lName)|wsrc)|e(?:ngth|ft(?:Context)?)|a(?:st(?:M(?:odified|atch)|Index|Paren)|yer(?:s|X)|nguage))|a(?:pp(?:MinorVersion|Name|Co(?:deName|re)|Version)|vail(?:Height|Top|Width|Left)|ll|r(?:ity|guments)|Linkcolor|bove)|r(?:ight(?:Context)?|e(?:sponse(?:XML|Text)|adyState))|global|x|m(?:imeTypes|ultiline|enubar|argin(?:Right|Bottom|Top|Left))|L(?:N(?:10|2)|OG(?:10E|2E))|b(?:o(?:ttom|rder(?:Width|RightWidth|BottomWidth|Style|Color|TopWidth|LeftWidth))|ufferDepth|elow|ackground(?:Color|Image)))\b/
-            }, {
-                token : ["storage.type", "punctuation.operator", "support.function.firebug"],
-                regex : /(console)(\.)(warn|info|log|error|time|timeEnd|assert)\b/
-            }, {
-                token : function(value) {
-                    if (globals.hasOwnProperty(value))
-                        return "variable.language";
-                    else if (deprecated.hasOwnProperty(value))
-                        return "invalid.deprecated";
-                    else if (definitions.hasOwnProperty(value))
-                        return "storage.type";
-                    else if (keywords.hasOwnProperty(value))
-                        return "keyword";
-                    else if (buildinConstants.hasOwnProperty(value))
-                        return "constant.language";
-                    else if (futureReserved.hasOwnProperty(value))
-                        return "invalid.illegal";
-                    else if (value == "debugger")
-                        return "invalid.deprecated";
-                    else
-                        return "identifier";
-                },
-                regex : identifierRe
-            }, {
-                token : "keyword.operator",
-                regex : /!|\$|%|&|\*|\-\-|\-|\+\+|\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\|\||\?\:|\*=|%=|\+=|\-=|&=|\^=|\b(?:in|instanceof|new|delete|typeof|void)/,
-                next  : "regex_allowed"
-            }, {
-                token : "punctuation.operator",
-                regex : /\?|\:|\,|\;|\./,
-                next  : "regex_allowed"
-            }, {
-                token : "paren.lparen",
-                regex : /[\[({]/,
-                next  : "regex_allowed"
-            }, {
-                token : "paren.rparen",
-                regex : /[\])}]/
-            }, {
-                token : "keyword.operator",
-                regex : /\/=?/,
-                next  : "regex_allowed"
-            }, {
-                token: "comment",
-                regex: /^#!.*$/
-            }, {
-                token : "text",
-                regex : /\s+/
-            }
-        ],
-        // regular expressions are only allowed after certain tokens. This
-        // makes sure we don't mix up regexps with the divison operator
-        "regex_allowed": [
-            {
-                token : "comment", // multi line comment
-                merge : true,
-                regex : "\\/\\*",
-                next : "comment_regex_allowed"
-            }, {
-                token : "comment",
-                regex : "\\/\\/.*$"
-            }, {
-                token: "string.regexp",
-                regex: "\\/",
-                next: "regex",
-                merge: true
-            }, {
-                token : "text",
-                regex : "\\s+"
-            }, {
-                // immediately return to the start mode without matching
-                // anything
-                token: "empty",
-                regex: "",
-                next: "start"
-            }
-        ],
-        "regex": [
-            {
-                token: "regexp.keyword.operator",
-                regex: "\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",
-                next: "regex"
-            }, {
-				// flag
-                token: "string.regexp",
-                regex: "/\\w*",
-                next: "start",
-                merge: true
-            }, {
-                token: "string.regexp",
-                regex: "[^\\\\/\\[]+",
-                next: "regex",
-                merge: true
-            }, {
-                token: "string.regexp.charachterclass",
-                regex: "\\[",
-                next: "regex_character_class",
-                merge: true
-            }, {
-                token: "empty",
-                regex: "",
-                next: "start"
-            }
-        ],
-        "regex_character_class": [
-            {
-                token: "regexp.keyword.operator",
-                regex: "\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",
-                next: "regex_character_class"
-            }, {
-                token: "string.regexp.charachterclass",
-                regex: "]",
-                next: "regex",
-                merge: true
-            }, {
-                token: "string.regexp.charachterclass",
-                regex: "[^\\\\\\]]+",
-                next: "regex_character_class",
-                merge: true
-            }, {
-                token: "empty",
-                regex: "",
-                next: "start"
-            }
-        ],
-        "comment_regex_allowed" : [
-            {
-                token : "comment", // closing comment
-                regex : ".*?\\*\\/",
-                merge : true,
-                next : "regex_allowed"
-            }, {
-                token : "comment", // comment spanning whole line
-                merge : true,
-                regex : ".+"
-            }
-        ],
-        "comment" : [
-            {
-                token : "comment", // closing comment
-                regex : ".*?\\*\\/",
-                merge : true,
-                next : "start"
-            }, {
-                token : "comment", // comment spanning whole line
-                merge : true,
-                regex : ".+"
-            }
-        ],
-        "qqstring" : [
-            {
-                token : "constant.language.escape",
-                regex : escapedRe
-            }, {
-                token : "string",
-                regex : '[^"\\\\]+'
-            }, {
-                token : "string",
-                regex : '"',
-                next  : "start"
-            }
-        ],
-        "qstring" : [
-            {
-                token : "constant.language.escape",
-                regex : escapedRe
-            }, {
-                token : "string",
-                regex : "[^'\\\\]+"
-            }, {
-                token : "string",
-                regex : "'",
-                next  : "start"
-            }
-        ]
-    };
-
-    this.embedRules(DocCommentHighlightRules, "doc-",
-        [ new DocCommentHighlightRules().getEndRule("start") ]);
-};
-
-oop.inherits(JavaScriptHighlightRules, TextHighlightRules);
-
-exports.JavaScriptHighlightRules = JavaScriptHighlightRules;
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/doc_comment_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var DocCommentHighlightRules = function() {
-
-    this.$rules = {
-        "start" : [ {
-            token : "comment.doc.tag",
-            regex : "@[\\w\\d_]+" // TODO: fix email addresses
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "\\s+"
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "TODO"
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "[^@\\*]+"
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "."
-        }]
-    };
-};
-
-oop.inherits(DocCommentHighlightRules, TextHighlightRules);
-
-(function() {
-
-    this.getStartRule = function(start) {
-        return {
-            token : "comment.doc", // doc comment
-            merge : true,
-            regex : "\\/\\*(?=\\*)",
-            next  : start
-        };
-    };
-    
-    this.getEndRule = function (start) {
-        return {
-            token : "comment.doc", // closing comment
-            merge : true,
-            regex : "\\*\\/",
-            next  : start
-        };
-    };
-
-}).call(DocCommentHighlightRules.prototype);
-
-exports.DocCommentHighlightRules = DocCommentHighlightRules;
-
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/matching_brace_outdent', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../range").Range;
-
-var MatchingBraceOutdent = function() {};
-
-(function() {
-
-    this.checkOutdent = function(line, input) {
-        if (! /^\s+$/.test(line))
-            return false;
-
-        return /^\s*\}/.test(input);
-    };
-
-    this.autoOutdent = function(doc, row) {
-        var line = doc.getLine(row);
-        var match = line.match(/^(\s*\})/);
-
-        if (!match) return 0;
-
-        var column = match[1].length;
-        var openBracePos = doc.findMatchingBracket({row: row, column: column});
-
-        if (!openBracePos || openBracePos.row == row) return 0;
-
-        var indent = this.$getIndent(doc.getLine(openBracePos.row));
-        doc.replace(new Range(row, 0, row, column-1), indent);
-    };
-
-    this.$getIndent = function(line) {
-        var match = line.match(/^(\s+)/);
-        if (match) {
-            return match[1];
-        }
-
-        return "";
-    };
-
-}).call(MatchingBraceOutdent.prototype);
-
-exports.MatchingBraceOutdent = MatchingBraceOutdent;
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/folding/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/range', 'ace/mode/folding/fold_mode'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var Range = require("../../range").Range;
-var BaseFoldMode = require("./fold_mode").FoldMode;
-
-var FoldMode = exports.FoldMode = function() {};
-oop.inherits(FoldMode, BaseFoldMode);
-
-(function() {
-
-    this.foldingStartMarker = /(\{|\[)[^\}\]]*$|^\s*(\/\*)/;
-    this.foldingStopMarker = /^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/;
-    
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        var line = session.getLine(row);
-        var match = line.match(this.foldingStartMarker);
-        if (match) {
-            var i = match.index;
-
-            if (match[1])
-                return this.openingBracketBlock(session, match[1], row, i);
-
-            var range = session.getCommentFoldRange(row, i + match[0].length);
-            range.end.column -= 2;
-            return range;
-        }
-
-        if (foldStyle !== "markbeginend")
-            return;
-            
-        var match = line.match(this.foldingStopMarker);
-        if (match) {
-            var i = match.index + match[0].length;
-
-            if (match[2]) {
-                var range = session.getCommentFoldRange(row, i);
-                range.end.column -= 2;
-                return range;
-            }
-
-            var end = {row: row, column: i};
-            var start = session.$findOpeningBracket(match[1], end);
-            
-            if (!start)
-                return;
-
-            start.column++;
-            end.column--;
-
-            return  Range.fromPoints(start, end);
-        }
-    };
-    
-}).call(FoldMode.prototype);
-
-});/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/svg_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/javascript_highlight_rules', 'ace/mode/xml_highlight_rules', 'ace/mode/xml_util'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var JavaScriptHighlightRules = require("./javascript_highlight_rules").JavaScriptHighlightRules;
-var XmlHighlightRules = require("./xml_highlight_rules").XmlHighlightRules;
-var xmlUtil = require("./xml_util");
-
-var SvgHighlightRules = function() {
-    XmlHighlightRules.call(this);
-
-    this.$rules.start.splice(3, 0, {
-        token : "meta.tag",
-        regex : "<(?=\s*script)",
-        next : "script"
-    });
-    
-    xmlUtil.tag(this.$rules, "script", "js-start");
-    
-    this.embedRules(JavaScriptHighlightRules, "js-", [{
-        token: "comment",
-        regex: "\\/\\/.*(?=<\\/script>)",
-        next: "tag"
-    }, {
-        token: "meta.tag",
-        regex: "<\\/(?=script)",
-        next: "tag"
-    }]);
-};
-
-oop.inherits(SvgHighlightRules, XmlHighlightRules);
-
-exports.SvgHighlightRules = SvgHighlightRules;
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/folding/mixed', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/folding/fold_mode'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var BaseFoldMode = require("./fold_mode").FoldMode;
-
-var FoldMode = exports.FoldMode = function(defaultMode, subModes) {
-    this.defaultMode = defaultMode;
-    this.subModes = subModes;
-};
-oop.inherits(FoldMode, BaseFoldMode);
-
-(function() {
-
-
-    this.$getMode = function(state) {
-        for (var key in this.subModes) {
-            if (state.indexOf(key) === 0)
-                return this.subModes[key];
-        }
-        return null;
-    };
-    
-    this.$tryMode = function(state, session, foldStyle, row) {
-        var mode = this.$getMode(state);
-        return (mode ? mode.getFoldWidget(session, foldStyle, row) : "");
-    };
-
-    this.getFoldWidget = function(session, foldStyle, row) {
-        return (
-            this.$tryMode(session.getState(row-1), session, foldStyle, row) ||
-            this.$tryMode(session.getState(row), session, foldStyle, row) ||
-            this.defaultMode.getFoldWidget(session, foldStyle, row)
-        );
-    };
-
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        var mode = this.$getMode(session.getState(row-1));
-        
-        if (!mode || !mode.getFoldWidget(session, foldStyle, row))
-            mode = this.$getMode(session.getState(row));
-        
-        if (!mode || !mode.getFoldWidget(session, foldStyle, row))
-            mode = this.defaultMode;
-        
-        return mode.getFoldWidgetRange(session, foldStyle, row);
-    };
-
-}).call(FoldMode.prototype);
-
-});
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-svg.js b/apps/files_texteditor/js/aceeditor/mode-svg.js
deleted file mode 100644
index e006aaaf36..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-svg.js
+++ /dev/null
@@ -1 +0,0 @@
-define("ace/mode/svg",["require","exports","module","ace/lib/oop","ace/mode/xml","ace/mode/javascript","ace/tokenizer","ace/mode/svg_highlight_rules","ace/mode/folding/mixed","ace/mode/folding/xml","ace/mode/folding/cstyle"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./xml").Mode,f=a("./javascript").Mode,g=a("../tokenizer").Tokenizer,h=a("./svg_highlight_rules").SvgHighlightRules,i=a("./folding/mixed").FoldMode,j=a("./folding/xml").FoldMode,k=a("./folding/cstyle").FoldMode,l=function(){e.call(this),this.highlighter=new h,this.$tokenizer=new g(this.highlighter.getRules()),this.$embeds=this.highlighter.getEmbeds(),this.createModeDelegates({"js-":f}),this.foldingRules=new i(new j({}),{"js-":new k})};d.inherits(l,e),function(){this.getNextLineIndent=function(a,b,c){return this.$getIndent(b)}}.call(l.prototype),b.Mode=l}),define("ace/mode/xml",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/xml_highlight_rules","ace/mode/behaviour/xml","ace/mode/folding/xml"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./xml_highlight_rules").XmlHighlightRules,h=a("./behaviour/xml").XmlBehaviour,i=a("./folding/xml").FoldMode,j=function(){this.$tokenizer=new f((new g).getRules()),this.$behaviour=new h,this.foldingRules=new i};d.inherits(j,e),function(){this.getNextLineIndent=function(a,b,c){return this.$getIndent(b)}}.call(j.prototype),b.Mode=j}),define("ace/mode/xml_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/xml_util","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./xml_util"),f=a("./text_highlight_rules").TextHighlightRules,g=function(){this.$rules={start:[{token:"text",regex:"<\\!\\[CDATA\\[",next:"cdata"},{token:"xml_pe",regex:"<\\?.*?\\?>"},{token:"comment",merge:!0,regex:"<\\!--",next:"comment"},{token:"xml_pe",regex:"<\\!.*?>"},{token:"meta.tag",regex:"<\\/?",next:"tag"},{token:"text",regex:"\\s+"},{token:"constant.character.entity",regex:"(?:&#[0-9]+;)|(?:&#x[0-9a-fA-F]+;)|(?:&[a-zA-Z0-9_:\\.-]+;)"},{token:"text",regex:"[^<]+"}],cdata:[{token:"text",regex:"\\]\\]>",next:"start"},{token:"text",regex:"\\s+"},{token:"text",regex:"(?:[^\\]]|\\](?!\\]>))+"}],comment:[{token:"comment",regex:".*?-->",next:"start"},{token:"comment",merge:!0,regex:".+"}]},e.tag(this.$rules,"tag","start")};d.inherits(g,f),b.XmlHighlightRules=g}),define("ace/mode/xml_util",["require","exports","module","ace/lib/lang"],function(a,b,c){function g(a){return[{token:"string",regex:'".*?"'},{token:"string",merge:!0,regex:'["].*',next:a+"_qqstring"},{token:"string",regex:"'.*?'"},{token:"string",merge:!0,regex:"['].*",next:a+"_qstring"}]}function h(a,b){return[{token:"string",merge:!0,regex:".*?"+a,next:b},{token:"string",merge:!0,regex:".+"}]}"use strict";var d=a("../lib/lang"),e=d.arrayToMap("button|form|input|label|select|textarea".split("|")),f=d.arrayToMap("table|tbody|td|tfoot|th|tr".split("|"));b.tag=function(a,b,c){a[b]=[{token:"text",regex:"\\s+"},{token:function(a){return a==="a"?"meta.tag.anchor":a==="img"?"meta.tag.image":a==="script"?"meta.tag.script":a==="style"?"meta.tag.style":e.hasOwnProperty(a.toLowerCase())?"meta.tag.form":f.hasOwnProperty(a.toLowerCase())?"meta.tag.table":"meta.tag"},merge:!0,regex:"[-_a-zA-Z0-9:]+",next:b+"_embed_attribute_list"},{token:"empty",regex:"",next:b+"_embed_attribute_list"}],a[b+"_qstring"]=h("'",b+"_embed_attribute_list"),a[b+"_qqstring"]=h('"',b+"_embed_attribute_list"),a[b+"_embed_attribute_list"]=[{token:"meta.tag",merge:!0,regex:"/?>",next:c},{token:"keyword.operator",regex:"="},{token:"entity.other.attribute-name",regex:"[-_a-zA-Z0-9:]+"},{token:"constant.numeric",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:"text",regex:"\\s+"}].concat(g(b))}}),define("ace/mode/behaviour/xml",["require","exports","module","ace/lib/oop","ace/mode/behaviour","ace/mode/behaviour/cstyle"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../behaviour").Behaviour,f=a("./cstyle").CstyleBehaviour,g=function(){this.inherit(f,["string_dquotes"]),this.add("brackets","insertion",function(a,b,c,d,e){if(e=="<"){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?!1:{text:"<>",selection:[1,1]}}if(e==">"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j==">")return{text:"",selection:[1,1]}}else if(e=="\n"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),k=i.substring(h.column,h.column+2);if(k=="</"){var l=this.$getIndent(d.doc.getLine(h.row))+d.getTabString(),m=this.$getIndent(d.doc.getLine(h.row));return{text:"\n"+l+"\n"+m,selection:[1,l.length,1,l.length]}}}})};d.inherits(g,e),b.XmlBehaviour=g}),define("ace/mode/behaviour/cstyle",["require","exports","module","ace/lib/oop","ace/mode/behaviour"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../behaviour").Behaviour,f=function(){this.add("braces","insertion",function(a,b,c,d,e){if(e=="{"){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"{"+g+"}",selection:!1}:{text:"{}",selection:[1,1]}}if(e=="}"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var k=d.$findOpeningBracket("}",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}else if(e=="\n"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var l=d.findMatchingBracket({row:h.row,column:h.column+1});if(!l)return null;var m=this.getNextLineIndent(a,i.substring(0,i.length-1),d.getTabString()),n=this.$getIndent(d.doc.getLine(l.row));return{text:"\n"+m+"\n"+n,selection:[1,m.length,1,m.length]}}}}),this.add("braces","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="{"){var g=d.doc.getLine(e.start.row),h=g.substring(e.end.column,e.end.column+1);if(h=="}")return e.end.column++,e}}),this.add("parens","insertion",function(a,b,c,d,e){if(e=="("){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"("+g+")",selection:!1}:{text:"()",selection:[1,1]}}if(e==")"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j==")"){var k=d.$findOpeningBracket(")",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}}),this.add("parens","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="("){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h==")")return e.end.column++,e}}),this.add("string_dquotes","insertion",function(a,b,c,d,e){if(e=='"'||e=="'"){var f=e,g=c.getSelectionRange(),h=d.doc.getTextRange(g);if(h!=="")return{text:f+h+f,selection:!1};var i=c.getCursorPosition(),j=d.doc.getLine(i.row),k=j.substring(i.column-1,i.column);if(k=="\\")return null;var l=d.getTokens(g.start.row,g.start.row)[0].tokens,m=0,n,o=-1;for(var p=0;p<l.length;p++){n=l[p],n.type=="string"?o=-1:o<0&&(o=n.value.indexOf(f));if(n.value.length+m>g.start.column)break;m+=l[p].value.length}if(!n||o<0&&n.type!=="comment"&&(n.type!=="string"||g.start.column!==n.value.length+m-1&&n.value.lastIndexOf(f)===n.value.length-1))return{text:f+f,selection:[1,1]};if(n&&n.type==="string"){var q=j.substring(i.column,i.column+1);if(q==f)return{text:"",selection:[1,1]}}}}),this.add("string_dquotes","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&(f=='"'||f=="'")){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h=='"')return e.end.column++,e}})};d.inherits(f,e),b.CstyleBehaviour=f}),define("ace/mode/folding/xml",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/range","ace/mode/folding/fold_mode","ace/token_iterator"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../../lib/lang"),f=a("../../range").Range,g=a("./fold_mode").FoldMode,h=a("../../token_iterator").TokenIterator,i=b.FoldMode=function(a){g.call(this),this.voidElements=a||{}};d.inherits(i,g),function(){this.getFoldWidget=function(a,b,c){var d=this._getFirstTagInLine(a,c);return d.closing?b=="markbeginend"?"end":"":!d.tagName||this.voidElements[d.tagName.toLowerCase()]?"":d.selfClosing?"":d.value.indexOf("/"+d.tagName)!==-1?"":"start"},this._getFirstTagInLine=function(a,b){var c=a.getTokens(b,b)[0].tokens,d="";for(var f=0;f<c.length;f++){var g=c[f];g.type.indexOf("meta.tag")===0?d+=g.value:d+=e.stringRepeat(" ",g.value.length)}return this._parseTag(d)},this.tagRe=/^(\s*)(<?(\/?)([-_a-zA-Z0-9:!]*)\s*(\/?)>?)/,this._parseTag=function(a){var b=this.tagRe.exec(a),c=this.tagRe.lastIndex||0;return this.tagRe.lastIndex=0,{value:a,match:b?b[2]:"",closing:b?!!b[3]:!1,selfClosing:b?!!b[5]||b[2]=="/>":!1,tagName:b?b[4]:"",column:b[1]?c+b[1].length:c}},this._readTagForward=function(a){var b=a.getCurrentToken();if(!b)return null;var c="",d;do if(b.type.indexOf("meta.tag")===0){if(!d)var d={row:a.getCurrentTokenRow(),column:a.getCurrentTokenColumn()};c+=b.value;if(c.indexOf(">")!==-1){var e=this._parseTag(c);return e.start=d,e.end={row:a.getCurrentTokenRow(),column:a.getCurrentTokenColumn()+b.value.length},a.stepForward(),e}}while(b=a.stepForward());return null},this._readTagBackward=function(a){var b=a.getCurrentToken();if(!b)return null;var c="",d;do if(b.type.indexOf("meta.tag")===0){d||(d={row:a.getCurrentTokenRow(),column:a.getCurrentTokenColumn()+b.value.length}),c=b.value+c;if(c.indexOf("<")!==-1){var e=this._parseTag(c);return e.end=d,e.start={row:a.getCurrentTokenRow(),column:a.getCurrentTokenColumn()},a.stepBackward(),e}}while(b=a.stepBackward());return null},this._pop=function(a,b){while(a.length){var c=a[a.length-1];if(!b||c.tagName==b.tagName)return a.pop();if(this.voidElements[b.tagName])return;if(this.voidElements[c.tagName]){a.pop();continue}return null}},this.getFoldWidgetRange=function(a,b,c){var d=this._getFirstTagInLine(a,c);if(!d.match)return null;var e=d.closing||d.selfClosing,g=[],i;if(!e){var j=new h(a,c,d.column),k={row:c,column:d.column+d.tagName.length+2};while(i=this._readTagForward(j)){if(i.selfClosing){if(!g.length)return i.start.column+=i.tagName.length+2,i.end.column-=2,f.fromPoints(i.start,i.end);continue}if(i.closing){this._pop(g,i);if(g.length==0)return f.fromPoints(k,i.start)}else g.push(i)}}else{var j=new h(a,c,d.column+d.match.length),l={row:c,column:d.column};while(i=this._readTagBackward(j)){if(i.selfClosing){if(!g.length)return i.start.column+=i.tagName.length+2,i.end.column-=2,f.fromPoints(i.start,i.end);continue}if(!i.closing){this._pop(g,i);if(g.length==0)return i.start.column+=i.tagName.length+2,f.fromPoints(i.start,l)}else g.push(i)}}}}.call(i.prototype)}),define("ace/mode/folding/fold_mode",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../../range").Range,e=b.FoldMode=function(){};(function(){this.foldingStartMarker=null,this.foldingStopMarker=null,this.getFoldWidget=function(a,b,c){var d=a.getLine(c);return this.foldingStartMarker.test(d)?"start":b=="markbeginend"&&this.foldingStopMarker&&this.foldingStopMarker.test(d)?"end":""},this.getFoldWidgetRange=function(a,b,c){return null},this.indentationBlock=function(a,b,c){var e=/^\s*/,f=b,g=b,h=a.getLine(b),i=c||h.length,j=h.match(e)[0].length,k=a.getLength();while(++b<k){h=a.getLine(b);var l=h.match(e)[0].length;if(l==h.length)continue;if(l<=j)break;g=b}if(g>f){var m=a.getLine(g).length;return new d(f,i,g,m)}},this.openingBracketBlock=function(a,b,c,e){var f={row:c,column:e+1},g=a.$findClosingBracket(b,f);if(!g)return;var h=a.foldWidgets[g.row];return h==null&&(h=this.getFoldWidget(a,g.row)),h=="start"&&(g.row--,g.column=a.getLine(g.row).length),d.fromPoints(f,g)}}).call(e.prototype)}),define("ace/mode/javascript",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/javascript_highlight_rules","ace/mode/matching_brace_outdent","ace/range","ace/worker/worker_client","ace/mode/behaviour/cstyle","ace/mode/folding/cstyle"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./javascript_highlight_rules").JavaScriptHighlightRules,h=a("./matching_brace_outdent").MatchingBraceOutdent,i=a("../range").Range,j=a("../worker/worker_client").WorkerClient,k=a("./behaviour/cstyle").CstyleBehaviour,l=a("./folding/cstyle").FoldMode,m=function(){this.$tokenizer=new f((new g).getRules()),this.$outdent=new h,this.$behaviour=new k,this.foldingRules=new l};d.inherits(m,e),function(){this.toggleCommentLines=function(a,b,c,d){var e=!0,f=/^(\s*)\/\//;for(var g=c;g<=d;g++)if(!f.test(b.getLine(g))){e=!1;break}if(e){var h=new i(0,0,0,0);for(var g=c;g<=d;g++){var j=b.getLine(g),k=j.match(f);h.start.row=g,h.end.row=g,h.end.column=k[0].length,b.replace(h,k[1])}}else b.indentRows(c,d,"//")},this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a),f=e.tokens,g=e.state;if(f.length&&f[f.length-1].type=="comment")return d;if(a=="start"||a=="regex_allowed"){var h=b.match(/^.*(?:\bcase\b.*\:|[\{\(\[])\s*$/);h&&(d+=c)}else if(a=="doc-start"){if(g=="start"||a=="regex_allowed")return"";var h=b.match(/^\s*(\/?)\*/);h&&(h[1]&&(d+=" "),d+="* ")}return d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)},this.createWorker=function(a){var b=new j(["ace"],"worker-javascript.js","ace/mode/javascript_worker","JavaScriptWorker");return b.attachToDocument(a.getDocument()),b.on("jslint",function(b){var c=[];for(var d=0;d<b.data.length;d++){var e=b.data[d];e&&c.push({row:e.line-1,column:e.character-1,text:e.reason,type:"warning",lint:e})}a.setAnnotations(c)}),b.on("narcissus",function(b){a.setAnnotations([b.data])}),b.on("terminate",function(){a.clearAnnotations()}),b}}.call(m.prototype),b.Mode=m}),define("ace/mode/javascript_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/unicode","ace/mode/doc_comment_highlight_rules","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("../unicode"),g=a("./doc_comment_highlight_rules").DocCommentHighlightRules,h=a("./text_highlight_rules").TextHighlightRules,i=function(){var a=e.arrayToMap("Array|Boolean|Date|Function|Iterator|Number|Object|RegExp|String|Proxy|Namespace|QName|XML|XMLList|ArrayBuffer|Float32Array|Float64Array|Int16Array|Int32Array|Int8Array|Uint16Array|Uint32Array|Uint8Array|Uint8ClampedArray|Error|EvalError|InternalError|RangeError|ReferenceError|StopIteration|SyntaxError|TypeError|URIError|decodeURI|decodeURIComponent|encodeURI|encodeURIComponent|eval|isFinite|isNaN|parseFloat|parseInt|JSON|Math|this|arguments|prototype|window|document".split("|")),b=e.arrayToMap("break|case|catch|continue|default|delete|do|else|finally|for|function|if|in|instanceof|new|return|switch|throw|try|typeof|let|var|while|with|const|yield|import|get|set".split("|")),c="case|do|else|finally|in|instanceof|return|throw|try|typeof|yield",d=e.arrayToMap("__parent__|__count__|escape|unescape|with|__proto__".split("|")),h=e.arrayToMap("const|let|var|function".split("|")),i=e.arrayToMap("null|Infinity|NaN|undefined".split("|")),j=e.arrayToMap("class|enum|extends|super|export|implements|private|public|interface|package|protected|static".split("|")),k="["+f.packages.L+"\\$_]["+f.packages.L+f.packages.Mn+f.packages.Mc+f.packages.Nd+f.packages.Pc+"\\$_]*\\b",l="\\\\(?:x[0-9a-fA-F]{2}|u[0-9a-fA-F]{4}|[0-2][0-7]{0,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.)";this.$rules={start:[{token:"comment",regex:/\/\/.*$/},(new g).getStartRule("doc-start"),{token:"comment",merge:!0,regex:/\/\*/,next:"comment"},{token:"string",regex:"'",next:"qstring"},{token:"string",regex:'"',next:"qqstring"},{token:"constant.numeric",regex:/0[xX][0-9a-fA-F]+\b/},{token:"constant.numeric",regex:/[+-]?\d+(?:(?:\.\d*)?(?:[eE][+-]?\d+)?)?\b/},{token:["storage.type","punctuation.operator","support.function","punctuation.operator","entity.name.function","text","keyword.operator","text","storage.type","text","paren.lparen","variable.parameter","paren.rparen"],regex:"("+k+")(\\.)(prototype)(\\.)("+k+")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"},{token:["storage.type","punctuation.operator","support.function","punctuation.operator","entity.name.function","text","keyword.operator","text"],regex:"("+k+")(\\.)(prototype)(\\.)("+k+")(\\s*)(=)(\\s*)"},{token:["storage.type","punctuation.operator","entity.name.function","text","keyword.operator","text","storage.type","text","paren.lparen","variable.parameter","paren.rparen"],regex:"("+k+")(\\.)("+k+")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"},{token:["entity.name.function","text","keyword.operator","text","storage.type","text","paren.lparen","variable.parameter","paren.rparen"],regex:"("+k+")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"},{token:["storage.type","text","entity.name.function","text","paren.lparen","variable.parameter","paren.rparen"],regex:"(function)(\\s+)("+k+")(\\s*)(\\()(.*?)(\\))"},{token:["entity.name.function","text","punctuation.operator","text","storage.type","text","paren.lparen","variable.parameter","paren.rparen"],regex:"("+k+")(\\s*)(:)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"},{token:["text","text","storage.type","text","paren.lparen","variable.parameter","paren.rparen"],regex:"(:)(\\s*)(function)?(\\s*)(\\()([^)]*)(\\))"},{token:"constant.language.boolean",regex:/(?:true|false)\b/},{token:"keyword",regex:"(?:"+c+")\\b",next:"regex_allowed"},{token:["punctuation.operator","support.function"],regex:/(\.)(s(?:h(?:ift|ow(?:Mod(?:elessDialog|alDialog)|Help))|croll(?:X|By(?:Pages|Lines)?|Y|To)?|t(?:opzzzz|rike)|i(?:n|zeToContent|debar|gnText)|ort|u(?:p|b(?:str(?:ing)?)?)|pli(?:ce|t)|e(?:nd|t(?:Re(?:sizable|questHeader)|M(?:i(?:nutes|lliseconds)|onth)|Seconds|Ho(?:tKeys|urs)|Year|Cursor|Time(?:out)?|Interval|ZOptions|Date|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Date|FullYear)|FullYear|Active)|arch)|qrt|lice|avePreferences|mall)|h(?:ome|andleEvent)|navigate|c(?:har(?:CodeAt|At)|o(?:s|n(?:cat|textual|firm)|mpile)|eil|lear(?:Timeout|Interval)?|a(?:ptureEvents|ll)|reate(?:StyleSheet|Popup|EventObject))|t(?:o(?:GMTString|S(?:tring|ource)|U(?:TCString|pperCase)|Lo(?:caleString|werCase))|est|a(?:n|int(?:Enabled)?))|i(?:s(?:NaN|Finite)|ndexOf|talics)|d(?:isableExternalCapture|ump|etachEvent)|u(?:n(?:shift|taint|escape|watch)|pdateCommands)|j(?:oin|avaEnabled)|p(?:o(?:p|w)|ush|lugins.refresh|a(?:ddings|rse(?:Int|Float)?)|r(?:int|ompt|eference))|e(?:scape|nableExternalCapture|val|lementFromPoint|x(?:p|ec(?:Script|Command)?))|valueOf|UTC|queryCommand(?:State|Indeterm|Enabled|Value)|f(?:i(?:nd|le(?:ModifiedDate|Size|CreatedDate|UpdatedDate)|xed)|o(?:nt(?:size|color)|rward)|loor|romCharCode)|watch|l(?:ink|o(?:ad|g)|astIndexOf)|a(?:sin|nchor|cos|t(?:tachEvent|ob|an(?:2)?)|pply|lert|b(?:s|ort))|r(?:ou(?:nd|teEvents)|e(?:size(?:By|To)|calc|turnValue|place|verse|l(?:oad|ease(?:Capture|Events)))|andom)|g(?:o|et(?:ResponseHeader|M(?:i(?:nutes|lliseconds)|onth)|Se(?:conds|lection)|Hours|Year|Time(?:zoneOffset)?|Da(?:y|te)|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Da(?:y|te)|FullYear)|FullYear|A(?:ttention|llResponseHeaders)))|m(?:in|ove(?:B(?:y|elow)|To(?:Absolute)?|Above)|ergeAttributes|a(?:tch|rgins|x))|b(?:toa|ig|o(?:ld|rderWidths)|link|ack))\b(?=\()/},{token:["punctuation.operator","support.function.dom"],regex:/(\.)(s(?:ub(?:stringData|mit)|plitText|e(?:t(?:NamedItem|Attribute(?:Node)?)|lect))|has(?:ChildNodes|Feature)|namedItem|c(?:l(?:ick|o(?:se|neNode))|reate(?:C(?:omment|DATASection|aption)|T(?:Head|extNode|Foot)|DocumentFragment|ProcessingInstruction|E(?:ntityReference|lement)|Attribute))|tabIndex|i(?:nsert(?:Row|Before|Cell|Data)|tem)|open|delete(?:Row|C(?:ell|aption)|T(?:Head|Foot)|Data)|focus|write(?:ln)?|a(?:dd|ppend(?:Child|Data))|re(?:set|place(?:Child|Data)|move(?:NamedItem|Child|Attribute(?:Node)?)?)|get(?:NamedItem|Element(?:sBy(?:Name|TagName)|ById)|Attribute(?:Node)?)|blur)\b(?=\()/},{token:["punctuation.operator","support.constant"],regex:/(\.)(s(?:ystemLanguage|cr(?:ipts|ollbars|een(?:X|Y|Top|Left))|t(?:yle(?:Sheets)?|atus(?:Text|bar)?)|ibling(?:Below|Above)|ource|uffixes|e(?:curity(?:Policy)?|l(?:ection|f)))|h(?:istory|ost(?:name)?|as(?:h|Focus))|y|X(?:MLDocument|SLDocument)|n(?:ext|ame(?:space(?:s|URI)|Prop))|M(?:IN_VALUE|AX_VALUE)|c(?:haracterSet|o(?:n(?:structor|trollers)|okieEnabled|lorDepth|mp(?:onents|lete))|urrent|puClass|l(?:i(?:p(?:boardData)?|entInformation)|osed|asses)|alle(?:e|r)|rypto)|t(?:o(?:olbar|p)|ext(?:Transform|Indent|Decoration|Align)|ags)|SQRT(?:1_2|2)|i(?:n(?:ner(?:Height|Width)|put)|ds|gnoreCase)|zIndex|o(?:scpu|n(?:readystatechange|Line)|uter(?:Height|Width)|p(?:sProfile|ener)|ffscreenBuffering)|NEGATIVE_INFINITY|d(?:i(?:splay|alog(?:Height|Top|Width|Left|Arguments)|rectories)|e(?:scription|fault(?:Status|Ch(?:ecked|arset)|View)))|u(?:ser(?:Profile|Language|Agent)|n(?:iqueID|defined)|pdateInterval)|_content|p(?:ixelDepth|ort|ersonalbar|kcs11|l(?:ugins|atform)|a(?:thname|dding(?:Right|Bottom|Top|Left)|rent(?:Window|Layer)?|ge(?:X(?:Offset)?|Y(?:Offset)?))|r(?:o(?:to(?:col|type)|duct(?:Sub)?|mpter)|e(?:vious|fix)))|e(?:n(?:coding|abledPlugin)|x(?:ternal|pando)|mbeds)|v(?:isibility|endor(?:Sub)?|Linkcolor)|URLUnencoded|P(?:I|OSITIVE_INFINITY)|f(?:ilename|o(?:nt(?:Size|Family|Weight)|rmName)|rame(?:s|Element)|gColor)|E|whiteSpace|l(?:i(?:stStyleType|n(?:eHeight|kColor))|o(?:ca(?:tion(?:bar)?|lName)|wsrc)|e(?:ngth|ft(?:Context)?)|a(?:st(?:M(?:odified|atch)|Index|Paren)|yer(?:s|X)|nguage))|a(?:pp(?:MinorVersion|Name|Co(?:deName|re)|Version)|vail(?:Height|Top|Width|Left)|ll|r(?:ity|guments)|Linkcolor|bove)|r(?:ight(?:Context)?|e(?:sponse(?:XML|Text)|adyState))|global|x|m(?:imeTypes|ultiline|enubar|argin(?:Right|Bottom|Top|Left))|L(?:N(?:10|2)|OG(?:10E|2E))|b(?:o(?:ttom|rder(?:Width|RightWidth|BottomWidth|Style|Color|TopWidth|LeftWidth))|ufferDepth|elow|ackground(?:Color|Image)))\b/},{token:["storage.type","punctuation.operator","support.function.firebug"],regex:/(console)(\.)(warn|info|log|error|time|timeEnd|assert)\b/},{token:function(c){return a.hasOwnProperty(c)?"variable.language":d.hasOwnProperty(c)?"invalid.deprecated":h.hasOwnProperty(c)?"storage.type":b.hasOwnProperty(c)?"keyword":i.hasOwnProperty(c)?"constant.language":j.hasOwnProperty(c)?"invalid.illegal":c=="debugger"?"invalid.deprecated":"identifier"},regex:k},{token:"keyword.operator",regex:/!|\$|%|&|\*|\-\-|\-|\+\+|\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\|\||\?\:|\*=|%=|\+=|\-=|&=|\^=|\b(?:in|instanceof|new|delete|typeof|void)/,next:"regex_allowed"},{token:"punctuation.operator",regex:/\?|\:|\,|\;|\./,next:"regex_allowed"},{token:"paren.lparen",regex:/[\[({]/,next:"regex_allowed"},{token:"paren.rparen",regex:/[\])}]/},{token:"keyword.operator",regex:/\/=?/,next:"regex_allowed"},{token:"comment",regex:/^#!.*$/},{token:"text",regex:/\s+/}],regex_allowed:[{token:"comment",merge:!0,regex:"\\/\\*",next:"comment_regex_allowed"},{token:"comment",regex:"\\/\\/.*$"},{token:"string.regexp",regex:"\\/",next:"regex",merge:!0},{token:"text",regex:"\\s+"},{token:"empty",regex:"",next:"start"}],regex:[{token:"regexp.keyword.operator",regex:"\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",next:"regex"},{token:"string.regexp",regex:"/\\w*",next:"start",merge:!0},{token:"string.regexp",regex:"[^\\\\/\\[]+",next:"regex",merge:!0},{token:"string.regexp.charachterclass",regex:"\\[",next:"regex_character_class",merge:!0},{token:"empty",regex:"",next:"start"}],regex_character_class:[{token:"regexp.keyword.operator",regex:"\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",next:"regex_character_class"},{token:"string.regexp.charachterclass",regex:"]",next:"regex",merge:!0},{token:"string.regexp.charachterclass",regex:"[^\\\\\\]]+",next:"regex_character_class",merge:!0},{token:"empty",regex:"",next:"start"}],comment_regex_allowed:[{token:"comment",regex:".*?\\*\\/",merge:!0,next:"regex_allowed"},{token:"comment",merge:!0,regex:".+"}],comment:[{token:"comment",regex:".*?\\*\\/",merge:!0,next:"start"},{token:"comment",merge:!0,regex:".+"}],qqstring:[{token:"constant.language.escape",regex:l},{token:"string",regex:'[^"\\\\]+'},{token:"string",regex:'"',next:"start"}],qstring:[{token:"constant.language.escape",regex:l},{token:"string",regex:"[^'\\\\]+"},{token:"string",regex:"'",next:"start"}]},this.embedRules(g,"doc-",[(new g).getEndRule("start")])};d.inherits(i,h),b.JavaScriptHighlightRules=i}),define("ace/mode/doc_comment_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text_highlight_rules").TextHighlightRules,f=function(){this.$rules={start:[{token:"comment.doc.tag",regex:"@[\\w\\d_]+"},{token:"comment.doc",merge:!0,regex:"\\s+"},{token:"comment.doc",merge:!0,regex:"TODO"},{token:"comment.doc",merge:!0,regex:"[^@\\*]+"},{token:"comment.doc",merge:!0,regex:"."}]}};d.inherits(f,e),function(){this.getStartRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\/\\*(?=\\*)",next:a}},this.getEndRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\*\\/",next:a}}}.call(f.prototype),b.DocCommentHighlightRules=f}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../range").Range,e=function(){};(function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}}).call(e.prototype),b.MatchingBraceOutdent=e}),define("ace/mode/folding/cstyle",["require","exports","module","ace/lib/oop","ace/range","ace/mode/folding/fold_mode"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../../range").Range,f=a("./fold_mode").FoldMode,g=b.FoldMode=function(){};d.inherits(g,f),function(){this.foldingStartMarker=/(\{|\[)[^\}\]]*$|^\s*(\/\*)/,this.foldingStopMarker=/^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/,this.getFoldWidgetRange=function(a,b,c){var d=a.getLine(c),f=d.match(this.foldingStartMarker);if(f){var g=f.index;if(f[1])return this.openingBracketBlock(a,f[1],c,g);var h=a.getCommentFoldRange(c,g+f[0].length);return h.end.column-=2,h}if(b!=="markbeginend")return;var f=d.match(this.foldingStopMarker);if(f){var g=f.index+f[0].length;if(f[2]){var h=a.getCommentFoldRange(c,g);return h.end.column-=2,h}var i={row:c,column:g},j=a.$findOpeningBracket(f[1],i);if(!j)return;return j.column++,i.column--,e.fromPoints(j,i)}}}.call(g.prototype)}),define("ace/mode/svg_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/javascript_highlight_rules","ace/mode/xml_highlight_rules","ace/mode/xml_util"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./javascript_highlight_rules").JavaScriptHighlightRules,f=a("./xml_highlight_rules").XmlHighlightRules,g=a("./xml_util"),h=function(){f.call(this),this.$rules.start.splice(3,0,{token:"meta.tag",regex:"<(?=s*script)",next:"script"}),g.tag(this.$rules,"script","js-start"),this.embedRules(e,"js-",[{token:"comment",regex:"\\/\\/.*(?=<\\/script>)",next:"tag"},{token:"meta.tag",regex:"<\\/(?=script)",next:"tag"}])};d.inherits(h,f),b.SvgHighlightRules=h}),define("ace/mode/folding/mixed",["require","exports","module","ace/lib/oop","ace/mode/folding/fold_mode"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("./fold_mode").FoldMode,f=b.FoldMode=function(a,b){this.defaultMode=a,this.subModes=b};d.inherits(f,e),function(){this.$getMode=function(a){for(var b in this.subModes)if(a.indexOf(b)===0)return this.subModes[b];return null},this.$tryMode=function(a,b,c,d){var e=this.$getMode(a);return e?e.getFoldWidget(b,c,d):""},this.getFoldWidget=function(a,b,c){return this.$tryMode(a.getState(c-1),a,b,c)||this.$tryMode(a.getState(c),a,b,c)||this.defaultMode.getFoldWidget(a,b,c)},this.getFoldWidgetRange=function(a,b,c){var d=this.$getMode(a.getState(c-1));if(!d||!d.getFoldWidget(a,b,c))d=this.$getMode(a.getState(c));if(!d||!d.getFoldWidget(a,b,c))d=this.defaultMode;return d.getFoldWidgetRange(a,b,c)}}.call(f.prototype)})
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-text-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-text-uncompressed.js
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/apps/files_texteditor/js/aceeditor/mode-text.js b/apps/files_texteditor/js/aceeditor/mode-text.js
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/apps/files_texteditor/js/aceeditor/mode-textile-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-textile-uncompressed.js
deleted file mode 100644
index 37a85c316e..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-textile-uncompressed.js
+++ /dev/null
@@ -1,254 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Kelley van Evert <kelley.vanevert@gmail.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/textile', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/textile_highlight_rules', 'ace/mode/matching_brace_outdent'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
-var TextileHighlightRules = require("./textile_highlight_rules").TextileHighlightRules;
-var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
-
-var Mode = function() {
-    this.$tokenizer = new Tokenizer(new TextileHighlightRules().getRules());
-    this.$outdent = new MatchingBraceOutdent();
-};
-oop.inherits(Mode, TextMode);
-
-(function() {
-    this.getNextLineIndent = function(state, line, tab) {
-        if (state == "intag")
-            return tab;
-        
-        return "";
-    };
-
-    this.checkOutdent = function(state, line, input) {
-        return this.$outdent.checkOutdent(line, input);
-    };
-
-    this.autoOutdent = function(state, doc, row) {
-        this.$outdent.autoOutdent(doc, row);
-    };
-    
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Kelley van Evert <kelley.vanevert@gmail.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/textile_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var TextileHighlightRules = function() {
-    this.$rules = {
-        "start" : [
-            {
-                token : function(value) {
-                    if (value.match(/^h\d$/))
-                        return "markup.heading." + value.charAt(1);
-                    else
-                        return "markup.heading";
-                },
-                regex : "h1|h2|h3|h4|h5|h6|bq|p|bc|pre",
-                next  : "blocktag"
-            },
-            {
-                token : "keyword",
-                regex : "[\\*]+|[#]+"
-            },
-            {
-                token : "text",
-                regex : ".+"
-            }
-        ],
-        "blocktag" : [
-            {
-                token : "keyword",
-                regex : "\\. ",
-                next  : "start"
-            },
-            {
-                token : "keyword",
-                regex : "\\(",
-                next  : "blocktagproperties"
-            }
-        ],
-        "blocktagproperties" : [
-            {
-                token : "keyword",
-                regex : "\\)",
-                next  : "blocktag"
-            },
-            {
-                token : "string",
-                regex : "[a-zA-Z0-9\\-_]+"
-            },
-            {
-                token : "keyword",
-                regex : "#"
-            }
-        ]
-    };
-};
-
-oop.inherits(TextileHighlightRules, TextHighlightRules);
-
-exports.TextileHighlightRules = TextileHighlightRules;
-
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/matching_brace_outdent', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../range").Range;
-
-var MatchingBraceOutdent = function() {};
-
-(function() {
-
-    this.checkOutdent = function(line, input) {
-        if (! /^\s+$/.test(line))
-            return false;
-
-        return /^\s*\}/.test(input);
-    };
-
-    this.autoOutdent = function(doc, row) {
-        var line = doc.getLine(row);
-        var match = line.match(/^(\s*\})/);
-
-        if (!match) return 0;
-
-        var column = match[1].length;
-        var openBracePos = doc.findMatchingBracket({row: row, column: column});
-
-        if (!openBracePos || openBracePos.row == row) return 0;
-
-        var indent = this.$getIndent(doc.getLine(openBracePos.row));
-        doc.replace(new Range(row, 0, row, column-1), indent);
-    };
-
-    this.$getIndent = function(line) {
-        var match = line.match(/^(\s+)/);
-        if (match) {
-            return match[1];
-        }
-
-        return "";
-    };
-
-}).call(MatchingBraceOutdent.prototype);
-
-exports.MatchingBraceOutdent = MatchingBraceOutdent;
-});
diff --git a/apps/files_texteditor/js/aceeditor/mode-textile.js b/apps/files_texteditor/js/aceeditor/mode-textile.js
deleted file mode 100644
index 3b36437c49..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-textile.js
+++ /dev/null
@@ -1 +0,0 @@
-define("ace/mode/textile",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/textile_highlight_rules","ace/mode/matching_brace_outdent"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./textile_highlight_rules").TextileHighlightRules,h=a("./matching_brace_outdent").MatchingBraceOutdent,i=function(){this.$tokenizer=new f((new g).getRules()),this.$outdent=new h};d.inherits(i,e),function(){this.getNextLineIndent=function(a,b,c){return a=="intag"?c:""},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)}}.call(i.prototype),b.Mode=i}),define("ace/mode/textile_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text_highlight_rules").TextHighlightRules,f=function(){this.$rules={start:[{token:function(a){return a.match(/^h\d$/)?"markup.heading."+a.charAt(1):"markup.heading"},regex:"h1|h2|h3|h4|h5|h6|bq|p|bc|pre",next:"blocktag"},{token:"keyword",regex:"[\\*]+|[#]+"},{token:"text",regex:".+"}],blocktag:[{token:"keyword",regex:"\\. ",next:"start"},{token:"keyword",regex:"\\(",next:"blocktagproperties"}],blocktagproperties:[{token:"keyword",regex:"\\)",next:"blocktag"},{token:"string",regex:"[a-zA-Z0-9\\-_]+"},{token:"keyword",regex:"#"}]}};d.inherits(f,e),b.TextileHighlightRules=f}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../range").Range,e=function(){};(function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}}).call(e.prototype),b.MatchingBraceOutdent=e})
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-xml-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-xml-uncompressed.js
deleted file mode 100644
index e1af69123b..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-xml-uncompressed.js
+++ /dev/null
@@ -1,1009 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/xml', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/xml_highlight_rules', 'ace/mode/behaviour/xml', 'ace/mode/folding/xml'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
-var XmlHighlightRules = require("./xml_highlight_rules").XmlHighlightRules;
-var XmlBehaviour = require("./behaviour/xml").XmlBehaviour;
-var XmlFoldMode = require("./folding/xml").FoldMode;
-
-var Mode = function() {
-    this.$tokenizer = new Tokenizer(new XmlHighlightRules().getRules());
-    this.$behaviour = new XmlBehaviour();
-    this.foldingRules = new XmlFoldMode();
-};
-
-oop.inherits(Mode, TextMode);
-
-(function() {
-    
-    this.getNextLineIndent = function(state, line, tab) {
-        return this.$getIndent(line);
-    };
-
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/xml_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/xml_util', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var xmlUtil = require("./xml_util");
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var XmlHighlightRules = function() {
-
-    // regexp must not have capturing parentheses
-    // regexps are ordered -> the first match is used
-    this.$rules = {
-        start : [{
-            token : "text",
-            regex : "<\\!\\[CDATA\\[",
-            next : "cdata"
-        }, {
-            token : "xml_pe",
-            regex : "<\\?.*?\\?>"
-        }, {
-            token : "comment",
-            merge : true,
-            regex : "<\\!--",
-            next : "comment"
-        }, {
-            token : "xml_pe",
-            regex : "<\\!.*?>"
-        }, {
-            token : "meta.tag", // opening tag
-            regex : "<\\/?",
-            next : "tag"
-        }, {
-            token : "text",
-            regex : "\\s+"
-        }, {
-            token : "constant.character.entity",
-            regex : "(?:&#[0-9]+;)|(?:&#x[0-9a-fA-F]+;)|(?:&[a-zA-Z0-9_:\\.-]+;)"
-        }, {
-            token : "text",
-            regex : "[^<]+"
-        }],
-        
-        cdata : [{
-            token : "text",
-            regex : "\\]\\]>",
-            next : "start"
-        }, {
-            token : "text",
-            regex : "\\s+"
-        }, {
-            token : "text",
-            regex : "(?:[^\\]]|\\](?!\\]>))+"
-        }],
-
-        comment : [{
-            token : "comment",
-            regex : ".*?-->",
-            next : "start"
-        }, {
-            token : "comment",
-            merge : true,
-            regex : ".+"
-        }]
-    };
-    
-    xmlUtil.tag(this.$rules, "tag", "start");
-};
-
-oop.inherits(XmlHighlightRules, TextHighlightRules);
-
-exports.XmlHighlightRules = XmlHighlightRules;
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/xml_util', ['require', 'exports', 'module' , 'ace/lib/lang'], function(require, exports, module) {
-"use strict";
-
-var lang = require("../lib/lang");
-
-var formTags = lang.arrayToMap(
-    ("button|form|input|label|select|textarea").split("|")
-);
-
-var tableTags = lang.arrayToMap(
-    ("table|tbody|td|tfoot|th|tr").split("|")
-);
-
-function string(state) {
-    return [{
-        token : "string",
-        regex : '".*?"'
-    }, {
-        token : "string", // multi line string start
-        merge : true,
-        regex : '["].*',
-        next : state + "_qqstring"
-    }, {
-        token : "string",
-        regex : "'.*?'"
-    }, {
-        token : "string", // multi line string start
-        merge : true,
-        regex : "['].*",
-        next : state + "_qstring"
-    }];
-}
-
-function multiLineString(quote, state) {
-    return [{
-        token : "string",
-        merge : true,
-        regex : ".*?" + quote,
-        next : state
-    }, {
-        token : "string",
-        merge : true,
-        regex : '.+'
-    }];
-}
-
-exports.tag = function(states, name, nextState) {
-    states[name] = [{
-        token : "text",
-        regex : "\\s+"
-    }, {
-        //token : "meta.tag",
-        
-    token : function(value) {
-            if ( value==='a' ) {
-                return "meta.tag.anchor";
-            }
-            else if ( value==='img' ) {
-                return "meta.tag.image";
-            }
-            else if ( value==='script' ) {
-                return "meta.tag.script";
-            }
-            else if ( value==='style' ) {
-                return "meta.tag.style";
-            }
-            else if (formTags.hasOwnProperty(value.toLowerCase())) {
-                return "meta.tag.form";
-            }
-            else if (tableTags.hasOwnProperty(value.toLowerCase())) {
-                return "meta.tag.table";
-            }
-            else {
-                return "meta.tag";
-            }
-        },        
-        merge : true,
-        regex : "[-_a-zA-Z0-9:]+",
-        next : name + "_embed_attribute_list" 
-    }, {
-        token: "empty",
-        regex: "",
-        next : name + "_embed_attribute_list"
-    }];
-
-    states[name + "_qstring"] = multiLineString("'", name + "_embed_attribute_list");
-    states[name + "_qqstring"] = multiLineString("\"", name + "_embed_attribute_list");
-    
-    states[name + "_embed_attribute_list"] = [{
-        token : "meta.tag",
-        merge : true,
-        regex : "\/?>",
-        next : nextState
-    }, {
-        token : "keyword.operator",
-        regex : "="
-    }, {
-        token : "entity.other.attribute-name",
-        regex : "[-_a-zA-Z0-9:]+"
-    }, {
-        token : "constant.numeric", // float
-        regex : "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"
-    }, {
-        token : "text",
-        regex : "\\s+"
-    }].concat(string(name));
-};
-
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Chris Spencer <chris.ag.spencer AT googlemail DOT com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/behaviour/xml', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/behaviour', 'ace/mode/behaviour/cstyle'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var Behaviour = require("../behaviour").Behaviour;
-var CstyleBehaviour = require("./cstyle").CstyleBehaviour;
-
-var XmlBehaviour = function () {
-    
-    this.inherit(CstyleBehaviour, ["string_dquotes"]); // Get string behaviour
-    
-    this.add("brackets", "insertion", function (state, action, editor, session, text) {
-        if (text == '<') {
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return false;
-            } else {
-                return {
-                    text: '<>',
-                    selection: [1, 1]
-                }
-            }
-        } else if (text == '>') {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == '>') { // need some kind of matching check here
-                return {
-                    text: '',
-                    selection: [1, 1]
-                }
-            }
-        } else if (text == "\n") {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChars = line.substring(cursor.column, cursor.column + 2);
-            if (rightChars == '</') {
-                var indent = this.$getIndent(session.doc.getLine(cursor.row)) + session.getTabString();
-                var next_indent = this.$getIndent(session.doc.getLine(cursor.row));
-
-                return {
-                    text: '\n' + indent + '\n' + next_indent,
-                    selection: [1, indent.length, 1, indent.length]
-                }
-            }
-        }
-    });
-    
-}
-oop.inherits(XmlBehaviour, Behaviour);
-
-exports.XmlBehaviour = XmlBehaviour;
-});/* vim:ts=4:sts=4:sw=4:
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Chris Spencer <chris.ag.spencer AT googlemail DOT com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/behaviour/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/behaviour'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var Behaviour = require('../behaviour').Behaviour;
-
-var CstyleBehaviour = function () {
-
-    this.add("braces", "insertion", function (state, action, editor, session, text) {
-        if (text == '{') {
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: '{' + selected + '}',
-                    selection: false
-                };
-            } else {
-                return {
-                    text: '{}',
-                    selection: [1, 1]
-                };
-            }
-        } else if (text == '}') {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == '}') {
-                var matching = session.$findOpeningBracket('}', {column: cursor.column + 1, row: cursor.row});
-                if (matching !== null) {
-                    return {
-                        text: '',
-                        selection: [1, 1]
-                    };
-                }
-            }
-        } else if (text == "\n") {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == '}') {
-                var openBracePos = session.findMatchingBracket({row: cursor.row, column: cursor.column + 1});
-                if (!openBracePos)
-                     return null;
-
-                var indent = this.getNextLineIndent(state, line.substring(0, line.length - 1), session.getTabString());
-                var next_indent = this.$getIndent(session.doc.getLine(openBracePos.row));
-
-                return {
-                    text: '\n' + indent + '\n' + next_indent,
-                    selection: [1, indent.length, 1, indent.length]
-                };
-            }
-        }
-    });
-
-    this.add("braces", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && selected == '{') {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.end.column, range.end.column + 1);
-            if (rightChar == '}') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-    this.add("parens", "insertion", function (state, action, editor, session, text) {
-        if (text == '(') {
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: '(' + selected + ')',
-                    selection: false
-                };
-            } else {
-                return {
-                    text: '()',
-                    selection: [1, 1]
-                };
-            }
-        } else if (text == ')') {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == ')') {
-                var matching = session.$findOpeningBracket(')', {column: cursor.column + 1, row: cursor.row});
-                if (matching !== null) {
-                    return {
-                        text: '',
-                        selection: [1, 1]
-                    };
-                }
-            }
-        }
-    });
-
-    this.add("parens", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && selected == '(') {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
-            if (rightChar == ')') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-    this.add("string_dquotes", "insertion", function (state, action, editor, session, text) {
-        if (text == '"' || text == "'") {
-            var quote = text;
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: quote + selected + quote,
-                    selection: false
-                };
-            } else {
-                var cursor = editor.getCursorPosition();
-                var line = session.doc.getLine(cursor.row);
-                var leftChar = line.substring(cursor.column-1, cursor.column);
-
-                // We're escaped.
-                if (leftChar == '\\') {
-                    return null;
-                }
-
-                // Find what token we're inside.
-                var tokens = session.getTokens(selection.start.row, selection.start.row)[0].tokens;
-                var col = 0, token;
-                var quotepos = -1; // Track whether we're inside an open quote.
-
-                for (var x = 0; x < tokens.length; x++) {
-                    token = tokens[x];
-                    if (token.type == "string") {
-                      quotepos = -1;
-                    } else if (quotepos < 0) {
-                      quotepos = token.value.indexOf(quote);
-                    }
-                    if ((token.value.length + col) > selection.start.column) {
-                        break;
-                    }
-                    col += tokens[x].value.length;
-                }
-
-                // Try and be smart about when we auto insert.
-                if (!token || (quotepos < 0 && token.type !== "comment" && (token.type !== "string" || ((selection.start.column !== token.value.length+col-1) && token.value.lastIndexOf(quote) === token.value.length-1)))) {
-                    return {
-                        text: quote + quote,
-                        selection: [1,1]
-                    };
-                } else if (token && token.type === "string") {
-                    // Ignore input and move right one if we're typing over the closing quote.
-                    var rightChar = line.substring(cursor.column, cursor.column + 1);
-                    if (rightChar == quote) {
-                        return {
-                            text: '',
-                            selection: [1, 1]
-                        };
-                    }
-                }
-            }
-        }
-    });
-
-    this.add("string_dquotes", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && (selected == '"' || selected == "'")) {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
-            if (rightChar == '"') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-};
-
-oop.inherits(CstyleBehaviour, Behaviour);
-
-exports.CstyleBehaviour = CstyleBehaviour;
-});/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/folding/xml', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/range', 'ace/mode/folding/fold_mode', 'ace/token_iterator'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var lang = require("../../lib/lang");
-var Range = require("../../range").Range;
-var BaseFoldMode = require("./fold_mode").FoldMode;
-var TokenIterator = require("../../token_iterator").TokenIterator;
-
-var FoldMode = exports.FoldMode = function(voidElements) {
-    BaseFoldMode.call(this);
-    this.voidElements = voidElements || {};
-};
-oop.inherits(FoldMode, BaseFoldMode);
-
-(function() {
-
-    this.getFoldWidget = function(session, foldStyle, row) {
-        var tag = this._getFirstTagInLine(session, row);
-
-        if (tag.closing)
-            return foldStyle == "markbeginend" ? "end" : "";
-
-        if (!tag.tagName || this.voidElements[tag.tagName.toLowerCase()])
-            return "";
-
-        if (tag.selfClosing)
-            return "";
-
-        if (tag.value.indexOf("/" + tag.tagName) !== -1)
-            return "";
-
-        return "start";
-    };
-    
-    this._getFirstTagInLine = function(session, row) {
-        var tokens = session.getTokens(row, row)[0].tokens;
-        var value = "";
-        for (var i = 0; i < tokens.length; i++) {
-            var token = tokens[i];
-            if (token.type.indexOf("meta.tag") === 0)
-                value += token.value;
-            else
-                value += lang.stringRepeat(" ", token.value.length);
-        }
-        
-        return this._parseTag(value);
-    };
-
-    this.tagRe = /^(\s*)(<?(\/?)([-_a-zA-Z0-9:!]*)\s*(\/?)>?)/;
-    this._parseTag = function(tag) {
-        
-        var match = this.tagRe.exec(tag);
-        var column = this.tagRe.lastIndex || 0;
-        this.tagRe.lastIndex = 0;
-
-        return {
-            value: tag,
-            match: match ? match[2] : "",
-            closing: match ? !!match[3] : false,
-            selfClosing: match ? !!match[5] || match[2] == "/>" : false,
-            tagName: match ? match[4] : "",
-            column: match[1] ? column + match[1].length : column
-        };
-    };
-    
-    /**
-     * reads a full tag and places the iterator after the tag
-     */
-    this._readTagForward = function(iterator) {
-        var token = iterator.getCurrentToken();
-        if (!token)
-            return null;
-            
-        var value = "";
-        var start;
-        
-        do {
-            if (token.type.indexOf("meta.tag") === 0) {
-                if (!start) {
-                    var start = {
-                        row: iterator.getCurrentTokenRow(),
-                        column: iterator.getCurrentTokenColumn()
-                    };
-                }
-                value += token.value;
-                if (value.indexOf(">") !== -1) {
-                    var tag = this._parseTag(value);
-                    tag.start = start;
-                    tag.end = {
-                        row: iterator.getCurrentTokenRow(),
-                        column: iterator.getCurrentTokenColumn() + token.value.length
-                    };
-                    iterator.stepForward();
-                    return tag;
-                }
-            }
-        } while(token = iterator.stepForward());
-        
-        return null;
-    };
-    
-    this._readTagBackward = function(iterator) {
-        var token = iterator.getCurrentToken();
-        if (!token)
-            return null;
-            
-        var value = "";
-        var end;
-
-        do {
-            if (token.type.indexOf("meta.tag") === 0) {
-                if (!end) {
-                    end = {
-                        row: iterator.getCurrentTokenRow(),
-                        column: iterator.getCurrentTokenColumn() + token.value.length
-                    };
-                }
-                value = token.value + value;
-                if (value.indexOf("<") !== -1) {
-                    var tag = this._parseTag(value);
-                    tag.end = end;
-                    tag.start = {
-                        row: iterator.getCurrentTokenRow(),
-                        column: iterator.getCurrentTokenColumn()
-                    };
-                    iterator.stepBackward();
-                    return tag;
-                }
-            }
-        } while(token = iterator.stepBackward());
-        
-        return null;
-    };
-    
-    this._pop = function(stack, tag) {
-        while (stack.length) {
-            
-            var top = stack[stack.length-1];
-            if (!tag || top.tagName == tag.tagName) {
-                return stack.pop();
-            }
-            else if (this.voidElements[tag.tagName]) {
-                return;
-            }
-            else if (this.voidElements[top.tagName]) {
-                stack.pop();
-                continue;
-            } else {
-                return null;
-            }
-        }
-    };
-    
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        var firstTag = this._getFirstTagInLine(session, row);
-        
-        if (!firstTag.match)
-            return null;
-        
-        var isBackward = firstTag.closing || firstTag.selfClosing;
-        var stack = [];
-        var tag;
-        
-        if (!isBackward) {
-            var iterator = new TokenIterator(session, row, firstTag.column);
-            var start = {
-                row: row,
-                column: firstTag.column + firstTag.tagName.length + 2
-            };
-            while (tag = this._readTagForward(iterator)) {
-                if (tag.selfClosing) {
-                    if (!stack.length) {
-                        tag.start.column += tag.tagName.length + 2;
-                        tag.end.column -= 2;
-                        return Range.fromPoints(tag.start, tag.end);
-                    } else
-                        continue;
-                }
-                
-                if (tag.closing) {
-                    this._pop(stack, tag);
-                    if (stack.length == 0)
-                        return Range.fromPoints(start, tag.start);
-                }
-                else {
-                    stack.push(tag)
-                }
-            }
-        }
-        else {
-            var iterator = new TokenIterator(session, row, firstTag.column + firstTag.match.length);
-            var end = {
-                row: row,
-                column: firstTag.column
-            };
-            
-            while (tag = this._readTagBackward(iterator)) {
-                if (tag.selfClosing) {
-                    if (!stack.length) {
-                        tag.start.column += tag.tagName.length + 2;
-                        tag.end.column -= 2;
-                        return Range.fromPoints(tag.start, tag.end);
-                    } else
-                        continue;
-                }
-                
-                if (!tag.closing) {
-                    this._pop(stack, tag);
-                    if (stack.length == 0) {
-                        tag.start.column += tag.tagName.length + 2;
-                        return Range.fromPoints(tag.start, end);
-                    }
-                }
-                else {
-                    stack.push(tag)
-                }
-            }
-        }
-        
-    };
-
-}).call(FoldMode.prototype);
-
-});/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/folding/fold_mode', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../../range").Range;
-
-var FoldMode = exports.FoldMode = function() {};
-
-(function() {
-
-    this.foldingStartMarker = null;
-    this.foldingStopMarker = null;
-
-    // must return "" if there's no fold, to enable caching
-    this.getFoldWidget = function(session, foldStyle, row) {
-        var line = session.getLine(row);
-        if (this.foldingStartMarker.test(line))
-            return "start";
-        if (foldStyle == "markbeginend"
-                && this.foldingStopMarker
-                && this.foldingStopMarker.test(line))
-            return "end";
-        return "";
-    };
-    
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        return null;
-    };
-
-    this.indentationBlock = function(session, row, column) {
-        var re = /^\s*/;
-        var startRow = row;
-        var endRow = row;
-        var line = session.getLine(row);
-        var startColumn = column || line.length;
-        var startLevel = line.match(re)[0].length;
-        var maxRow = session.getLength()
-        
-        while (++row < maxRow) {
-            line = session.getLine(row);
-            var level = line.match(re)[0].length;
-
-            if (level == line.length)
-                continue;
-
-            if (level <= startLevel)
-                break;
-
-            endRow = row;
-        }
-
-        if (endRow > startRow) {
-            var endColumn = session.getLine(endRow).length;
-            return new Range(startRow, startColumn, endRow, endColumn);
-        }
-    };
-
-    this.openingBracketBlock = function(session, bracket, row, column) {
-        var start = {row: row, column: column + 1};
-        var end = session.$findClosingBracket(bracket, start);
-        if (!end)
-            return;
-
-        var fw = session.foldWidgets[end.row];
-        if (fw == null)
-            fw = this.getFoldWidget(session, end.row);
-
-        if (fw == "start") {
-            end.row --;
-            end.column = session.getLine(end.row).length;
-        }
-        return Range.fromPoints(start, end);
-    };
-
-}).call(FoldMode.prototype);
-
-});
diff --git a/apps/files_texteditor/js/aceeditor/mode-xml.js b/apps/files_texteditor/js/aceeditor/mode-xml.js
deleted file mode 100644
index 27c038a13b..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-xml.js
+++ /dev/null
@@ -1 +0,0 @@
-define("ace/mode/xml",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/xml_highlight_rules","ace/mode/behaviour/xml","ace/mode/folding/xml"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./xml_highlight_rules").XmlHighlightRules,h=a("./behaviour/xml").XmlBehaviour,i=a("./folding/xml").FoldMode,j=function(){this.$tokenizer=new f((new g).getRules()),this.$behaviour=new h,this.foldingRules=new i};d.inherits(j,e),function(){this.getNextLineIndent=function(a,b,c){return this.$getIndent(b)}}.call(j.prototype),b.Mode=j}),define("ace/mode/xml_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/xml_util","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./xml_util"),f=a("./text_highlight_rules").TextHighlightRules,g=function(){this.$rules={start:[{token:"text",regex:"<\\!\\[CDATA\\[",next:"cdata"},{token:"xml_pe",regex:"<\\?.*?\\?>"},{token:"comment",merge:!0,regex:"<\\!--",next:"comment"},{token:"xml_pe",regex:"<\\!.*?>"},{token:"meta.tag",regex:"<\\/?",next:"tag"},{token:"text",regex:"\\s+"},{token:"constant.character.entity",regex:"(?:&#[0-9]+;)|(?:&#x[0-9a-fA-F]+;)|(?:&[a-zA-Z0-9_:\\.-]+;)"},{token:"text",regex:"[^<]+"}],cdata:[{token:"text",regex:"\\]\\]>",next:"start"},{token:"text",regex:"\\s+"},{token:"text",regex:"(?:[^\\]]|\\](?!\\]>))+"}],comment:[{token:"comment",regex:".*?-->",next:"start"},{token:"comment",merge:!0,regex:".+"}]},e.tag(this.$rules,"tag","start")};d.inherits(g,f),b.XmlHighlightRules=g}),define("ace/mode/xml_util",["require","exports","module","ace/lib/lang"],function(a,b,c){function g(a){return[{token:"string",regex:'".*?"'},{token:"string",merge:!0,regex:'["].*',next:a+"_qqstring"},{token:"string",regex:"'.*?'"},{token:"string",merge:!0,regex:"['].*",next:a+"_qstring"}]}function h(a,b){return[{token:"string",merge:!0,regex:".*?"+a,next:b},{token:"string",merge:!0,regex:".+"}]}"use strict";var d=a("../lib/lang"),e=d.arrayToMap("button|form|input|label|select|textarea".split("|")),f=d.arrayToMap("table|tbody|td|tfoot|th|tr".split("|"));b.tag=function(a,b,c){a[b]=[{token:"text",regex:"\\s+"},{token:function(a){return a==="a"?"meta.tag.anchor":a==="img"?"meta.tag.image":a==="script"?"meta.tag.script":a==="style"?"meta.tag.style":e.hasOwnProperty(a.toLowerCase())?"meta.tag.form":f.hasOwnProperty(a.toLowerCase())?"meta.tag.table":"meta.tag"},merge:!0,regex:"[-_a-zA-Z0-9:]+",next:b+"_embed_attribute_list"},{token:"empty",regex:"",next:b+"_embed_attribute_list"}],a[b+"_qstring"]=h("'",b+"_embed_attribute_list"),a[b+"_qqstring"]=h('"',b+"_embed_attribute_list"),a[b+"_embed_attribute_list"]=[{token:"meta.tag",merge:!0,regex:"/?>",next:c},{token:"keyword.operator",regex:"="},{token:"entity.other.attribute-name",regex:"[-_a-zA-Z0-9:]+"},{token:"constant.numeric",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:"text",regex:"\\s+"}].concat(g(b))}}),define("ace/mode/behaviour/xml",["require","exports","module","ace/lib/oop","ace/mode/behaviour","ace/mode/behaviour/cstyle"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../behaviour").Behaviour,f=a("./cstyle").CstyleBehaviour,g=function(){this.inherit(f,["string_dquotes"]),this.add("brackets","insertion",function(a,b,c,d,e){if(e=="<"){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?!1:{text:"<>",selection:[1,1]}}if(e==">"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j==">")return{text:"",selection:[1,1]}}else if(e=="\n"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),k=i.substring(h.column,h.column+2);if(k=="</"){var l=this.$getIndent(d.doc.getLine(h.row))+d.getTabString(),m=this.$getIndent(d.doc.getLine(h.row));return{text:"\n"+l+"\n"+m,selection:[1,l.length,1,l.length]}}}})};d.inherits(g,e),b.XmlBehaviour=g}),define("ace/mode/behaviour/cstyle",["require","exports","module","ace/lib/oop","ace/mode/behaviour"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../behaviour").Behaviour,f=function(){this.add("braces","insertion",function(a,b,c,d,e){if(e=="{"){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"{"+g+"}",selection:!1}:{text:"{}",selection:[1,1]}}if(e=="}"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var k=d.$findOpeningBracket("}",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}else if(e=="\n"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var l=d.findMatchingBracket({row:h.row,column:h.column+1});if(!l)return null;var m=this.getNextLineIndent(a,i.substring(0,i.length-1),d.getTabString()),n=this.$getIndent(d.doc.getLine(l.row));return{text:"\n"+m+"\n"+n,selection:[1,m.length,1,m.length]}}}}),this.add("braces","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="{"){var g=d.doc.getLine(e.start.row),h=g.substring(e.end.column,e.end.column+1);if(h=="}")return e.end.column++,e}}),this.add("parens","insertion",function(a,b,c,d,e){if(e=="("){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"("+g+")",selection:!1}:{text:"()",selection:[1,1]}}if(e==")"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j==")"){var k=d.$findOpeningBracket(")",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}}),this.add("parens","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="("){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h==")")return e.end.column++,e}}),this.add("string_dquotes","insertion",function(a,b,c,d,e){if(e=='"'||e=="'"){var f=e,g=c.getSelectionRange(),h=d.doc.getTextRange(g);if(h!=="")return{text:f+h+f,selection:!1};var i=c.getCursorPosition(),j=d.doc.getLine(i.row),k=j.substring(i.column-1,i.column);if(k=="\\")return null;var l=d.getTokens(g.start.row,g.start.row)[0].tokens,m=0,n,o=-1;for(var p=0;p<l.length;p++){n=l[p],n.type=="string"?o=-1:o<0&&(o=n.value.indexOf(f));if(n.value.length+m>g.start.column)break;m+=l[p].value.length}if(!n||o<0&&n.type!=="comment"&&(n.type!=="string"||g.start.column!==n.value.length+m-1&&n.value.lastIndexOf(f)===n.value.length-1))return{text:f+f,selection:[1,1]};if(n&&n.type==="string"){var q=j.substring(i.column,i.column+1);if(q==f)return{text:"",selection:[1,1]}}}}),this.add("string_dquotes","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&(f=='"'||f=="'")){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h=='"')return e.end.column++,e}})};d.inherits(f,e),b.CstyleBehaviour=f}),define("ace/mode/folding/xml",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/range","ace/mode/folding/fold_mode","ace/token_iterator"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../../lib/lang"),f=a("../../range").Range,g=a("./fold_mode").FoldMode,h=a("../../token_iterator").TokenIterator,i=b.FoldMode=function(a){g.call(this),this.voidElements=a||{}};d.inherits(i,g),function(){this.getFoldWidget=function(a,b,c){var d=this._getFirstTagInLine(a,c);return d.closing?b=="markbeginend"?"end":"":!d.tagName||this.voidElements[d.tagName.toLowerCase()]?"":d.selfClosing?"":d.value.indexOf("/"+d.tagName)!==-1?"":"start"},this._getFirstTagInLine=function(a,b){var c=a.getTokens(b,b)[0].tokens,d="";for(var f=0;f<c.length;f++){var g=c[f];g.type.indexOf("meta.tag")===0?d+=g.value:d+=e.stringRepeat(" ",g.value.length)}return this._parseTag(d)},this.tagRe=/^(\s*)(<?(\/?)([-_a-zA-Z0-9:!]*)\s*(\/?)>?)/,this._parseTag=function(a){var b=this.tagRe.exec(a),c=this.tagRe.lastIndex||0;return this.tagRe.lastIndex=0,{value:a,match:b?b[2]:"",closing:b?!!b[3]:!1,selfClosing:b?!!b[5]||b[2]=="/>":!1,tagName:b?b[4]:"",column:b[1]?c+b[1].length:c}},this._readTagForward=function(a){var b=a.getCurrentToken();if(!b)return null;var c="",d;do if(b.type.indexOf("meta.tag")===0){if(!d)var d={row:a.getCurrentTokenRow(),column:a.getCurrentTokenColumn()};c+=b.value;if(c.indexOf(">")!==-1){var e=this._parseTag(c);return e.start=d,e.end={row:a.getCurrentTokenRow(),column:a.getCurrentTokenColumn()+b.value.length},a.stepForward(),e}}while(b=a.stepForward());return null},this._readTagBackward=function(a){var b=a.getCurrentToken();if(!b)return null;var c="",d;do if(b.type.indexOf("meta.tag")===0){d||(d={row:a.getCurrentTokenRow(),column:a.getCurrentTokenColumn()+b.value.length}),c=b.value+c;if(c.indexOf("<")!==-1){var e=this._parseTag(c);return e.end=d,e.start={row:a.getCurrentTokenRow(),column:a.getCurrentTokenColumn()},a.stepBackward(),e}}while(b=a.stepBackward());return null},this._pop=function(a,b){while(a.length){var c=a[a.length-1];if(!b||c.tagName==b.tagName)return a.pop();if(this.voidElements[b.tagName])return;if(this.voidElements[c.tagName]){a.pop();continue}return null}},this.getFoldWidgetRange=function(a,b,c){var d=this._getFirstTagInLine(a,c);if(!d.match)return null;var e=d.closing||d.selfClosing,g=[],i;if(!e){var j=new h(a,c,d.column),k={row:c,column:d.column+d.tagName.length+2};while(i=this._readTagForward(j)){if(i.selfClosing){if(!g.length)return i.start.column+=i.tagName.length+2,i.end.column-=2,f.fromPoints(i.start,i.end);continue}if(i.closing){this._pop(g,i);if(g.length==0)return f.fromPoints(k,i.start)}else g.push(i)}}else{var j=new h(a,c,d.column+d.match.length),l={row:c,column:d.column};while(i=this._readTagBackward(j)){if(i.selfClosing){if(!g.length)return i.start.column+=i.tagName.length+2,i.end.column-=2,f.fromPoints(i.start,i.end);continue}if(!i.closing){this._pop(g,i);if(g.length==0)return i.start.column+=i.tagName.length+2,f.fromPoints(i.start,l)}else g.push(i)}}}}.call(i.prototype)}),define("ace/mode/folding/fold_mode",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../../range").Range,e=b.FoldMode=function(){};(function(){this.foldingStartMarker=null,this.foldingStopMarker=null,this.getFoldWidget=function(a,b,c){var d=a.getLine(c);return this.foldingStartMarker.test(d)?"start":b=="markbeginend"&&this.foldingStopMarker&&this.foldingStopMarker.test(d)?"end":""},this.getFoldWidgetRange=function(a,b,c){return null},this.indentationBlock=function(a,b,c){var e=/^\s*/,f=b,g=b,h=a.getLine(b),i=c||h.length,j=h.match(e)[0].length,k=a.getLength();while(++b<k){h=a.getLine(b);var l=h.match(e)[0].length;if(l==h.length)continue;if(l<=j)break;g=b}if(g>f){var m=a.getLine(g).length;return new d(f,i,g,m)}},this.openingBracketBlock=function(a,b,c,e){var f={row:c,column:e+1},g=a.$findClosingBracket(b,f);if(!g)return;var h=a.foldWidgets[g.row];return h==null&&(h=this.getFoldWidget(a,g.row)),h=="start"&&(g.row--,g.column=a.getLine(g.row).length),d.fromPoints(f,g)}}).call(e.prototype)})
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-xquery-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-xquery-uncompressed.js
deleted file mode 100644
index 69effad6e2..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-xquery-uncompressed.js
+++ /dev/null
@@ -1,540 +0,0 @@
-/*
- *  eXide - web-based XQuery IDE
- *  
- *  Copyright (C) 2011 Wolfgang Meier
- *
- *  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, 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/>.
- */
-define('ace/mode/xquery', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/xquery_highlight_rules', 'ace/mode/behaviour/xquery', 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
-var XQueryHighlightRules = require("./xquery_highlight_rules").XQueryHighlightRules;
-var XQueryBehaviour = require("./behaviour/xquery").XQueryBehaviour;
-var Range = require("../range").Range;
-
-var Mode = function(parent) {
-    this.$tokenizer = new Tokenizer(new XQueryHighlightRules().getRules());
-    this.$behaviour = new XQueryBehaviour(parent);
-};
-
-oop.inherits(Mode, TextMode);
-
-(function() {
-
-    this.getNextLineIndent = function(state, line, tab) {
-      var indent = this.$getIndent(line);
-      var match = line.match(/\s*(?:then|else|return|[{\(]|<\w+>)\s*$/);
-      if (match)
-        indent += tab;
-        return indent;
-    };
-    
-    this.checkOutdent = function(state, line, input) {
-      if (! /^\s+$/.test(line))
-            return false;
-
-        return /^\s*[\}\)]/.test(input);
-    };
-    
-    this.autoOutdent = function(state, doc, row) {
-      var line = doc.getLine(row);
-        var match = line.match(/^(\s*[\}\)])/);
-
-        if (!match) return 0;
-
-        var column = match[1].length;
-        var openBracePos = doc.findMatchingBracket({row: row, column: column});
-
-        if (!openBracePos || openBracePos.row == row) return 0;
-
-        var indent = this.$getIndent(doc.getLine(openBracePos.row));
-        doc.replace(new Range(row, 0, row, column-1), indent);
-    };
-
-    this.$getIndent = function(line) {
-        var match = line.match(/^(\s+)/);
-        if (match) {
-            return match[1];
-        }
-
-        return "";
-    };
-    
-    this.toggleCommentLines = function(state, doc, startRow, endRow) {
-        var i, line;
-        var outdent = true;
-        var re = /^\s*\(:(.*):\)/;
-
-        for (i=startRow; i<= endRow; i++) {
-            if (!re.test(doc.getLine(i))) {
-                outdent = false;
-                break;
-            }
-        }
-
-        var range = new Range(0, 0, 0, 0);
-        for (i=startRow; i<= endRow; i++) {
-            line = doc.getLine(i);
-            range.start.row  = i;
-            range.end.row    = i;
-            range.end.column = line.length;
-
-            doc.replace(range, outdent ? line.match(re)[1] : "(:" + line + ":)");
-        }
-    };
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-});
-/*
- *  eXide - web-based XQuery IDE
- *  
- *  Copyright (C) 2011 Wolfgang Meier
- *
- *  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, 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/>.
- */
-define('ace/mode/xquery_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var lang = require("../lib/lang");
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var XQueryHighlightRules = function() {
-
-  var keywords = lang.arrayToMap(
-    ("return|for|let|where|order|by|declare|function|variable|xquery|version|option|namespace|import|module|when|encoding|" +
-     "switch|default|try|catch|group|tumbling|sliding|window|start|end|at|only|" +
-     "using|stemming|" +
-     "while|" + 
-     "external|" +
-     "if|then|else|as|and|or|typeswitch|case|ascending|descending|empty|in|count|updating|insert|delete|replace|value|node|attribute|text|element|into|of|with|contains").split("|")
-    );
-
-    // regexp must not have capturing parentheses
-    // regexps are ordered -> the first match is used
-
-    this.$rules = {
-        start : [ {
-            token : "text",
-            regex : "<\\!\\[CDATA\\[",
-            next : "cdata"
-        }, {
-            token : "xml_pe",
-            regex : "<\\?.*?\\?>"
-        }, {
-            token : "comment",
-            regex : "<\\!--",
-            next : "comment"
-    }, {
-      token : "comment",
-      regex : "\\(:",
-      next : "comment"
-        }, {
-            token : "text", // opening tag
-            regex : "<\\/?",
-            next : "tag"
-        }, {
-            token : "constant", // number
-            regex : "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"
-    }, {
-            token : "variable", // variable
-            regex : "\\$[a-zA-Z_][a-zA-Z0-9_\\-:]*\\b"
-    }, {
-      token: "string",
-      regex : '".*?"'
-    }, {
-      token: "string",
-      regex : "'.*?'"
-        }, {
-            token : "text",
-            regex : "\\s+"
-        }, {
-            token: "support.function",
-            regex: "\\w[\\w+_\\-:]+(?=\\()"
-        }, {
-      token : function(value) {
-            if (keywords[value])
-                return "keyword";
-            else
-                return "identifier";
-      },
-      regex : "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
-    }, {
-            token: "keyword.operator",
-            regex: "\\*|=|<|>|\\-|\\+|and|or|eq|ne|lt|gt"
-        }, {
-            token: "lparen",
-            regex: "[[({]"
-        }, {
-            token: "rparen",
-            regex: "[\\])}]"
-        } ],
-
-        tag : [ {
-            token : "text",
-            regex : ">",
-            next : "start"
-        }, {
-            token : "meta.tag",
-            regex : "[-_a-zA-Z0-9:]+"
-        }, {
-            token : "text",
-            regex : "\\s+"
-        }, {
-            token : "string",
-            regex : '".*?"'
-        }, {
-            token : "string",
-            regex : "'.*?'"
-        } ],
-
-        cdata : [ {
-            token : "text",
-            regex : "\\]\\]>",
-            next : "start"
-        }, {
-            token : "text",
-            regex : "\\s+"
-        }, {
-            token : "text",
-            regex : "(?:[^\\]]|\\](?!\\]>))+"
-        } ],
-
-        comment : [ {
-            token : "comment",
-            regex : ".*?-->",
-            next : "start"
-        }, {
-      token: "comment",
-      regex : ".*:\\)",
-      next : "start"
-        }, {
-            token : "comment",
-            regex : ".+"
-    } ]
-    };
-};
-
-oop.inherits(XQueryHighlightRules, TextHighlightRules);
-
-exports.XQueryHighlightRules = XQueryHighlightRules;
-});
-/*
-*  eXide - web-based XQuery IDE
-*  
-*  Copyright (C) 2011 Wolfgang Meier
-*
-*  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, 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/>.
-*/
-define('ace/mode/behaviour/xquery', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/behaviour', 'ace/mode/behaviour/cstyle'], function(require, exports, module) {
-"use strict";
-
-  var oop = require("../../lib/oop");
-  var Behaviour = require('../behaviour').Behaviour;
-  var CstyleBehaviour = require('./cstyle').CstyleBehaviour;
-
-  var XQueryBehaviour = function (parent) {
-      
-      this.inherit(CstyleBehaviour, ["braces", "parens", "string_dquotes"]); // Get string behaviour
-      this.parent = parent;
-      
-      this.add("brackets", "insertion", function (state, action, editor, session, text) {
-          if (text == "\n") {
-              var cursor = editor.getCursorPosition();
-              var line = session.doc.getLine(cursor.row);
-              var rightChars = line.substring(cursor.column, cursor.column + 2);
-              if (rightChars == '</') {
-                  var indent = this.$getIndent(session.doc.getLine(cursor.row)) + session.getTabString();
-                  var next_indent = this.$getIndent(session.doc.getLine(cursor.row));
-
-                  return {
-                      text: '\n' + indent + '\n' + next_indent,
-                      selection: [1, indent.length, 1, indent.length]
-                  }
-              }
-          }
-          return false;
-      });
-
-      // Check for open tag if user enters / and auto-close it.
-      this.add("slash", "insertion", function (state, action, editor, session, text) {
-        if (text == "/") {
-          var cursor = editor.getCursorPosition();
-        var line = session.doc.getLine(cursor.row);
-        if (cursor.column > 0 && line.charAt(cursor.column - 1) == "<") {
-          line = line.substring(0, cursor.column) + "/" + line.substring(cursor.column);
-          var lines = session.doc.getAllLines();
-          lines[cursor.row] = line;
-          // call mode helper to close the tag if possible
-          parent.exec("closeTag", lines.join(session.doc.getNewLineCharacter()), cursor.row);
-        }
-        }
-      return false;
-      });
-  }
-  oop.inherits(XQueryBehaviour, Behaviour);
-
-  exports.XQueryBehaviour = XQueryBehaviour;
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Chris Spencer <chris.ag.spencer AT googlemail DOT com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/behaviour/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/behaviour'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var Behaviour = require('../behaviour').Behaviour;
-
-var CstyleBehaviour = function () {
-
-    this.add("braces", "insertion", function (state, action, editor, session, text) {
-        if (text == '{') {
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: '{' + selected + '}',
-                    selection: false
-                };
-            } else {
-                return {
-                    text: '{}',
-                    selection: [1, 1]
-                };
-            }
-        } else if (text == '}') {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == '}') {
-                var matching = session.$findOpeningBracket('}', {column: cursor.column + 1, row: cursor.row});
-                if (matching !== null) {
-                    return {
-                        text: '',
-                        selection: [1, 1]
-                    };
-                }
-            }
-        } else if (text == "\n") {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == '}') {
-                var openBracePos = session.findMatchingBracket({row: cursor.row, column: cursor.column + 1});
-                if (!openBracePos)
-                     return null;
-
-                var indent = this.getNextLineIndent(state, line.substring(0, line.length - 1), session.getTabString());
-                var next_indent = this.$getIndent(session.doc.getLine(openBracePos.row));
-
-                return {
-                    text: '\n' + indent + '\n' + next_indent,
-                    selection: [1, indent.length, 1, indent.length]
-                };
-            }
-        }
-    });
-
-    this.add("braces", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && selected == '{') {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.end.column, range.end.column + 1);
-            if (rightChar == '}') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-    this.add("parens", "insertion", function (state, action, editor, session, text) {
-        if (text == '(') {
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: '(' + selected + ')',
-                    selection: false
-                };
-            } else {
-                return {
-                    text: '()',
-                    selection: [1, 1]
-                };
-            }
-        } else if (text == ')') {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == ')') {
-                var matching = session.$findOpeningBracket(')', {column: cursor.column + 1, row: cursor.row});
-                if (matching !== null) {
-                    return {
-                        text: '',
-                        selection: [1, 1]
-                    };
-                }
-            }
-        }
-    });
-
-    this.add("parens", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && selected == '(') {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
-            if (rightChar == ')') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-    this.add("string_dquotes", "insertion", function (state, action, editor, session, text) {
-        if (text == '"' || text == "'") {
-            var quote = text;
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: quote + selected + quote,
-                    selection: false
-                };
-            } else {
-                var cursor = editor.getCursorPosition();
-                var line = session.doc.getLine(cursor.row);
-                var leftChar = line.substring(cursor.column-1, cursor.column);
-
-                // We're escaped.
-                if (leftChar == '\\') {
-                    return null;
-                }
-
-                // Find what token we're inside.
-                var tokens = session.getTokens(selection.start.row, selection.start.row)[0].tokens;
-                var col = 0, token;
-                var quotepos = -1; // Track whether we're inside an open quote.
-
-                for (var x = 0; x < tokens.length; x++) {
-                    token = tokens[x];
-                    if (token.type == "string") {
-                      quotepos = -1;
-                    } else if (quotepos < 0) {
-                      quotepos = token.value.indexOf(quote);
-                    }
-                    if ((token.value.length + col) > selection.start.column) {
-                        break;
-                    }
-                    col += tokens[x].value.length;
-                }
-
-                // Try and be smart about when we auto insert.
-                if (!token || (quotepos < 0 && token.type !== "comment" && (token.type !== "string" || ((selection.start.column !== token.value.length+col-1) && token.value.lastIndexOf(quote) === token.value.length-1)))) {
-                    return {
-                        text: quote + quote,
-                        selection: [1,1]
-                    };
-                } else if (token && token.type === "string") {
-                    // Ignore input and move right one if we're typing over the closing quote.
-                    var rightChar = line.substring(cursor.column, cursor.column + 1);
-                    if (rightChar == quote) {
-                        return {
-                            text: '',
-                            selection: [1, 1]
-                        };
-                    }
-                }
-            }
-        }
-    });
-
-    this.add("string_dquotes", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && (selected == '"' || selected == "'")) {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
-            if (rightChar == '"') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-};
-
-oop.inherits(CstyleBehaviour, Behaviour);
-
-exports.CstyleBehaviour = CstyleBehaviour;
-});
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-xquery.js b/apps/files_texteditor/js/aceeditor/mode-xquery.js
deleted file mode 100644
index cb6fb87cc6..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-xquery.js
+++ /dev/null
@@ -1 +0,0 @@
-define("ace/mode/xquery",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/xquery_highlight_rules","ace/mode/behaviour/xquery","ace/range"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./xquery_highlight_rules").XQueryHighlightRules,h=a("./behaviour/xquery").XQueryBehaviour,i=a("../range").Range,j=function(a){this.$tokenizer=new f((new g).getRules()),this.$behaviour=new h(a)};d.inherits(j,e),function(){this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=b.match(/\s*(?:then|else|return|[{\(]|<\w+>)\s*$/);return e&&(d+=c),d},this.checkOutdent=function(a,b,c){return/^\s+$/.test(b)?/^\s*[\}\)]/.test(c):!1},this.autoOutdent=function(a,b,c){var d=b.getLine(c),e=d.match(/^(\s*[\}\)])/);if(!e)return 0;var f=e[1].length,g=b.findMatchingBracket({row:c,column:f});if(!g||g.row==c)return 0;var h=this.$getIndent(b.getLine(g.row));b.replace(new i(c,0,c,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""},this.toggleCommentLines=function(a,b,c,d){var e,f,g=!0,h=/^\s*\(:(.*):\)/;for(e=c;e<=d;e++)if(!h.test(b.getLine(e))){g=!1;break}var j=new i(0,0,0,0);for(e=c;e<=d;e++)f=b.getLine(e),j.start.row=e,j.end.row=e,j.end.column=f.length,b.replace(j,g?f.match(h)[1]:"(:"+f+":)")}}.call(j.prototype),b.Mode=j}),define("ace/mode/xquery_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("./text_highlight_rules").TextHighlightRules,g=function(){var a=e.arrayToMap("return|for|let|where|order|by|declare|function|variable|xquery|version|option|namespace|import|module|when|encoding|switch|default|try|catch|group|tumbling|sliding|window|start|end|at|only|using|stemming|while|external|if|then|else|as|and|or|typeswitch|case|ascending|descending|empty|in|count|updating|insert|delete|replace|value|node|attribute|text|element|into|of|with|contains".split("|"));this.$rules={start:[{token:"text",regex:"<\\!\\[CDATA\\[",next:"cdata"},{token:"xml_pe",regex:"<\\?.*?\\?>"},{token:"comment",regex:"<\\!--",next:"comment"},{token:"comment",regex:"\\(:",next:"comment"},{token:"text",regex:"<\\/?",next:"tag"},{token:"constant",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:"variable",regex:"\\$[a-zA-Z_][a-zA-Z0-9_\\-:]*\\b"},{token:"string",regex:'".*?"'},{token:"string",regex:"'.*?'"},{token:"text",regex:"\\s+"},{token:"support.function",regex:"\\w[\\w+_\\-:]+(?=\\()"},{token:function(b){return a[b]?"keyword":"identifier"},regex:"[a-zA-Z_$][a-zA-Z0-9_$]*\\b"},{token:"keyword.operator",regex:"\\*|=|<|>|\\-|\\+|and|or|eq|ne|lt|gt"},{token:"lparen",regex:"[[({]"},{token:"rparen",regex:"[\\])}]"}],tag:[{token:"text",regex:">",next:"start"},{token:"meta.tag",regex:"[-_a-zA-Z0-9:]+"},{token:"text",regex:"\\s+"},{token:"string",regex:'".*?"'},{token:"string",regex:"'.*?'"}],cdata:[{token:"text",regex:"\\]\\]>",next:"start"},{token:"text",regex:"\\s+"},{token:"text",regex:"(?:[^\\]]|\\](?!\\]>))+"}],comment:[{token:"comment",regex:".*?-->",next:"start"},{token:"comment",regex:".*:\\)",next:"start"},{token:"comment",regex:".+"}]}};d.inherits(g,f),b.XQueryHighlightRules=g}),define("ace/mode/behaviour/xquery",["require","exports","module","ace/lib/oop","ace/mode/behaviour","ace/mode/behaviour/cstyle"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../behaviour").Behaviour,f=a("./cstyle").CstyleBehaviour,g=function(a){this.inherit(f,["braces","parens","string_dquotes"]),this.parent=a,this.add("brackets","insertion",function(a,b,c,d,e){if(e=="\n"){var f=c.getCursorPosition(),g=d.doc.getLine(f.row),h=g.substring(f.column,f.column+2);if(h=="</"){var i=this.$getIndent(d.doc.getLine(f.row))+d.getTabString(),j=this.$getIndent(d.doc.getLine(f.row));return{text:"\n"+i+"\n"+j,selection:[1,i.length,1,i.length]}}}return!1}),this.add("slash","insertion",function(b,c,d,e,f){if(f=="/"){var g=d.getCursorPosition(),h=e.doc.getLine(g.row);if(g.column>0&&h.charAt(g.column-1)=="<"){h=h.substring(0,g.column)+"/"+h.substring(g.column);var i=e.doc.getAllLines();i[g.row]=h,a.exec("closeTag",i.join(e.doc.getNewLineCharacter()),g.row)}}return!1})};d.inherits(g,e),b.XQueryBehaviour=g}),define("ace/mode/behaviour/cstyle",["require","exports","module","ace/lib/oop","ace/mode/behaviour"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../behaviour").Behaviour,f=function(){this.add("braces","insertion",function(a,b,c,d,e){if(e=="{"){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"{"+g+"}",selection:!1}:{text:"{}",selection:[1,1]}}if(e=="}"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var k=d.$findOpeningBracket("}",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}else if(e=="\n"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var l=d.findMatchingBracket({row:h.row,column:h.column+1});if(!l)return null;var m=this.getNextLineIndent(a,i.substring(0,i.length-1),d.getTabString()),n=this.$getIndent(d.doc.getLine(l.row));return{text:"\n"+m+"\n"+n,selection:[1,m.length,1,m.length]}}}}),this.add("braces","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="{"){var g=d.doc.getLine(e.start.row),h=g.substring(e.end.column,e.end.column+1);if(h=="}")return e.end.column++,e}}),this.add("parens","insertion",function(a,b,c,d,e){if(e=="("){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"("+g+")",selection:!1}:{text:"()",selection:[1,1]}}if(e==")"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j==")"){var k=d.$findOpeningBracket(")",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}}),this.add("parens","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="("){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h==")")return e.end.column++,e}}),this.add("string_dquotes","insertion",function(a,b,c,d,e){if(e=='"'||e=="'"){var f=e,g=c.getSelectionRange(),h=d.doc.getTextRange(g);if(h!=="")return{text:f+h+f,selection:!1};var i=c.getCursorPosition(),j=d.doc.getLine(i.row),k=j.substring(i.column-1,i.column);if(k=="\\")return null;var l=d.getTokens(g.start.row,g.start.row)[0].tokens,m=0,n,o=-1;for(var p=0;p<l.length;p++){n=l[p],n.type=="string"?o=-1:o<0&&(o=n.value.indexOf(f));if(n.value.length+m>g.start.column)break;m+=l[p].value.length}if(!n||o<0&&n.type!=="comment"&&(n.type!=="string"||g.start.column!==n.value.length+m-1&&n.value.lastIndexOf(f)===n.value.length-1))return{text:f+f,selection:[1,1]};if(n&&n.type==="string"){var q=j.substring(i.column,i.column+1);if(q==f)return{text:"",selection:[1,1]}}}}),this.add("string_dquotes","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&(f=='"'||f=="'")){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h=='"')return e.end.column++,e}})};d.inherits(f,e),b.CstyleBehaviour=f})
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/theme-clouds-uncompressed.js b/apps/files_texteditor/js/aceeditor/theme-clouds-uncompressed.js
deleted file mode 100644
index 03048077b7..0000000000
--- a/apps/files_texteditor/js/aceeditor/theme-clouds-uncompressed.js
+++ /dev/null
@@ -1,155 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/theme/clouds', ['require', 'exports', 'module' , 'ace/lib/dom'], function(require, exports, module) {
-
-exports.isDark = false;
-exports.cssClass = "ace-clouds";
-exports.cssText = "\
-.ace-clouds .ace_editor {\
-  border: 2px solid rgb(159, 159, 159);\
-}\
-\
-.ace-clouds .ace_editor.ace_focus {\
-  border: 2px solid #327fbd;\
-}\
-\
-.ace-clouds .ace_gutter {\
-  background: #e8e8e8;\
-  color: #333;\
-}\
-\
-.ace-clouds .ace_print_margin {\
-  width: 1px;\
-  background: #e8e8e8;\
-}\
-\
-.ace-clouds .ace_scroller {\
-  background-color: #FFFFFF;\
-}\
-\
-.ace-clouds .ace_text-layer {\
-  cursor: text;\
-  color: #000000;\
-}\
-\
-.ace-clouds .ace_cursor {\
-  border-left: 1px solid #000000;\
-}\
-\
-.ace-clouds .ace_cursor.ace_overwrite {\
-  border-left: 0px;\
-  border-bottom: 1px solid #000000;\
-}\
-\
-.ace-clouds .ace_marker-layer .ace_selection {\
-  background: #BDD5FC;\
-}\
-\
-.ace-clouds .ace_marker-layer .ace_step {\
-  background: rgb(198, 219, 174);\
-}\
-\
-.ace-clouds .ace_marker-layer .ace_bracket {\
-  margin: -1px 0 0 -1px;\
-  border: 1px solid #BFBFBF;\
-}\
-\
-.ace-clouds .ace_marker-layer .ace_active_line {\
-  background: #FFFBD1;\
-}\
-\
-.ace-clouds .ace_marker-layer .ace_selected_word {\
-  border: 1px solid #BDD5FC;\
-}\
-\
-.ace-clouds .ace_invisible {\
-  color: #BFBFBF;\
-}\
-\
-.ace-clouds .ace_keyword, .ace-clouds .ace_meta {\
-  color:#AF956F;\
-}\
-\
-.ace-clouds .ace_keyword.ace_operator {\
-  color:#484848;\
-}\
-\
-.ace-clouds .ace_constant.ace_language {\
-  color:#39946A;\
-}\
-\
-.ace-clouds .ace_constant.ace_numeric {\
-  color:#46A609;\
-}\
-\
-.ace-clouds .ace_invalid {\
-  background-color:#FF002A;\
-}\
-\
-.ace-clouds .ace_fold {\
-    background-color: #AF956F;\
-    border-color: #000000;\
-}\
-\
-.ace-clouds .ace_support.ace_function {\
-  color:#C52727;\
-}\
-\
-.ace-clouds .ace_storage {\
-  color:#C52727;\
-}\
-\
-.ace-clouds .ace_string {\
-  color:#5D90CD;\
-}\
-\
-.ace-clouds .ace_comment {\
-  color:#BCC8BA;\
-}\
-\
-.ace-clouds .ace_entity.ace_other.ace_attribute-name {\
-  color:#606060;\
-}\
-\
-.ace-clouds .ace_markup.ace_underline {\
-    text-decoration:underline;\
-}";
-
-    var dom = require("../lib/dom");
-    dom.importCssString(exports.cssText, exports.cssClass);
-});
diff --git a/apps/files_texteditor/js/aceeditor/theme-clouds.js b/apps/files_texteditor/js/aceeditor/theme-clouds.js
deleted file mode 100644
index de651e6c59..0000000000
--- a/apps/files_texteditor/js/aceeditor/theme-clouds.js
+++ /dev/null
@@ -1 +0,0 @@
-define("ace/theme/clouds",["require","exports","module","ace/lib/dom"],function(a,b,c){b.isDark=!1,b.cssClass="ace-clouds",b.cssText=".ace-clouds .ace_editor {  border: 2px solid rgb(159, 159, 159);}.ace-clouds .ace_editor.ace_focus {  border: 2px solid #327fbd;}.ace-clouds .ace_gutter {  background: #e8e8e8;  color: #333;}.ace-clouds .ace_print_margin {  width: 1px;  background: #e8e8e8;}.ace-clouds .ace_scroller {  background-color: #FFFFFF;}.ace-clouds .ace_text-layer {  cursor: text;  color: #000000;}.ace-clouds .ace_cursor {  border-left: 1px solid #000000;}.ace-clouds .ace_cursor.ace_overwrite {  border-left: 0px;  border-bottom: 1px solid #000000;}.ace-clouds .ace_marker-layer .ace_selection {  background: #BDD5FC;}.ace-clouds .ace_marker-layer .ace_step {  background: rgb(198, 219, 174);}.ace-clouds .ace_marker-layer .ace_bracket {  margin: -1px 0 0 -1px;  border: 1px solid #BFBFBF;}.ace-clouds .ace_marker-layer .ace_active_line {  background: #FFFBD1;}.ace-clouds .ace_marker-layer .ace_selected_word {  border: 1px solid #BDD5FC;}.ace-clouds .ace_invisible {  color: #BFBFBF;}.ace-clouds .ace_keyword, .ace-clouds .ace_meta {  color:#AF956F;}.ace-clouds .ace_keyword.ace_operator {  color:#484848;}.ace-clouds .ace_constant.ace_language {  color:#39946A;}.ace-clouds .ace_constant.ace_numeric {  color:#46A609;}.ace-clouds .ace_invalid {  background-color:#FF002A;}.ace-clouds .ace_fold {    background-color: #AF956F;    border-color: #000000;}.ace-clouds .ace_support.ace_function {  color:#C52727;}.ace-clouds .ace_storage {  color:#C52727;}.ace-clouds .ace_string {  color:#5D90CD;}.ace-clouds .ace_comment {  color:#BCC8BA;}.ace-clouds .ace_entity.ace_other.ace_attribute-name {  color:#606060;}.ace-clouds .ace_markup.ace_underline {    text-decoration:underline;}";var d=a("../lib/dom");d.importCssString(b.cssText,b.cssClass)})
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/worker-coffee.js b/apps/files_texteditor/js/aceeditor/worker-coffee.js
deleted file mode 100644
index 704ee4f322..0000000000
--- a/apps/files_texteditor/js/aceeditor/worker-coffee.js
+++ /dev/null
@@ -1,7477 +0,0 @@
-"no use strict";
-
-var console = {
-    log: function(msg) {
-        postMessage({type: "log", data: msg});
-    }
-};
-var window = {
-    console: console
-};
-
-var normalizeModule = function(parentId, moduleName) {
-    // normalize plugin requires
-    if (moduleName.indexOf("!") !== -1) {
-        var chunks = moduleName.split("!");
-        return normalizeModule(parentId, chunks[0]) + "!" + normalizeModule(parentId, chunks[1]);
-    }
-    // normalize relative requires
-    if (moduleName.charAt(0) == ".") {
-        var base = parentId.split("/").slice(0, -1).join("/");
-        var moduleName = base + "/" + moduleName;
-        
-        while(moduleName.indexOf(".") !== -1 && previous != moduleName) {
-            var previous = moduleName;
-            var moduleName = moduleName.replace(/\/\.\//, "/").replace(/[^\/]+\/\.\.\//, "");
-        }
-    }
-    
-    return moduleName;
-};
-
-var require = function(parentId, id) {
-    var id = normalizeModule(parentId, id);
-    
-    var module = require.modules[id];
-    if (module) {
-        if (!module.initialized) {
-            module.exports = module.factory().exports;
-            module.initialized = true;
-        }
-        return module.exports;
-    }
-    
-    var chunks = id.split("/");
-    chunks[0] = require.tlns[chunks[0]] || chunks[0];
-    var path = chunks.join("/") + ".js";
-    
-    require.id = id;
-    importScripts(path);
-    return require(parentId, id);    
-};
-
-require.modules = {};
-require.tlns = {};
-
-var define = function(id, deps, factory) {
-    if (arguments.length == 2) {
-        factory = deps;
-    } else if (arguments.length == 1) {
-        factory = id;
-        id = require.id;
-    }
-
-    if (id.indexOf("text!") === 0) 
-        return;
-    
-    var req = function(deps, factory) {
-        return require(id, deps, factory);
-    };
-
-    require.modules[id] = {
-        factory: function() {
-            var module = {
-                exports: {}
-            };
-            var returnExports = factory(req, module.exports, module);
-            if (returnExports)
-                module.exports = returnExports;
-            return module;
-        }
-    };
-};
-
-function initBaseUrls(topLevelNamespaces) {
-    require.tlns = topLevelNamespaces;
-}
-
-function initSender() {
-
-    var EventEmitter = require(null, "ace/lib/event_emitter").EventEmitter;
-    var oop = require(null, "ace/lib/oop");
-    
-    var Sender = function() {};
-    
-    (function() {
-        
-        oop.implement(this, EventEmitter);
-                
-        this.callback = function(data, callbackId) {
-            postMessage({
-                type: "call",
-                id: callbackId,
-                data: data
-            });
-        };
-    
-        this.emit = function(name, data) {
-            postMessage({
-                type: "event",
-                name: name,
-                data: data
-            });
-        };
-        
-    }).call(Sender.prototype);
-    
-    return new Sender();
-}
-
-var main;
-var sender;
-
-onmessage = function(e) {
-    var msg = e.data;
-    if (msg.command) {
-        main[msg.command].apply(main, msg.args);
-    }
-    else if (msg.init) {        
-        initBaseUrls(msg.tlns);
-        require(null, "ace/lib/fixoldbrowsers");
-        sender = initSender();
-        var clazz = require(null, msg.module)[msg.classname];
-        main = new clazz(sender);
-    } 
-    else if (msg.event && sender) {
-        sender._emit(msg.event, msg.data);
-    }
-};
-// vim:set ts=4 sts=4 sw=4 st:
-// -- kriskowal Kris Kowal Copyright (C) 2009-2010 MIT License
-// -- tlrobinson Tom Robinson Copyright (C) 2009-2010 MIT License (Narwhal Project)
-// -- dantman Daniel Friesen Copyright(C) 2010 XXX No License Specified
-// -- fschaefer Florian Schäfer Copyright (C) 2010 MIT License
-// -- Irakli Gozalishvili Copyright (C) 2010 MIT License
-
-/*!
-    Copyright (c) 2009, 280 North Inc. http://280north.com/
-    MIT License. http://github.com/280north/narwhal/blob/master/README.md
-*/
-
-define('ace/lib/fixoldbrowsers', ['require', 'exports', 'module' , 'ace/lib/regexp', 'ace/lib/es5-shim'], function(require, exports, module) {
-"use strict";
-
-require("./regexp");
-require("./es5-shim");
-
-});/**
- *  Based on code from:
- *
- * XRegExp 1.5.0
- * (c) 2007-2010 Steven Levithan
- * MIT License
- * <http://xregexp.com>
- * Provides an augmented, extensible, cross-browser implementation of regular expressions,
- * including support for additional syntax, flags, and methods
- */
- 
-define('ace/lib/regexp', ['require', 'exports', 'module' ], function(require, exports, module) {
-"use strict";
-
-    //---------------------------------
-    //  Private variables
-    //---------------------------------
-
-    var real = {
-            exec: RegExp.prototype.exec,
-            test: RegExp.prototype.test,
-            match: String.prototype.match,
-            replace: String.prototype.replace,
-            split: String.prototype.split
-        },
-        compliantExecNpcg = real.exec.call(/()??/, "")[1] === undefined, // check `exec` handling of nonparticipating capturing groups
-        compliantLastIndexIncrement = function () {
-            var x = /^/g;
-            real.test.call(x, "");
-            return !x.lastIndex;
-        }();
-
-    //---------------------------------
-    //  Overriden native methods
-    //---------------------------------
-
-    // Adds named capture support (with backreferences returned as `result.name`), and fixes two
-    // cross-browser issues per ES3:
-    // - Captured values for nonparticipating capturing groups should be returned as `undefined`,
-    //   rather than the empty string.
-    // - `lastIndex` should not be incremented after zero-length matches.
-    RegExp.prototype.exec = function (str) {
-        var match = real.exec.apply(this, arguments),
-            name, r2;
-        if ( typeof(str) == 'string' && match) {
-            // Fix browsers whose `exec` methods don't consistently return `undefined` for
-            // nonparticipating capturing groups
-            if (!compliantExecNpcg && match.length > 1 && indexOf(match, "") > -1) {
-                r2 = RegExp(this.source, real.replace.call(getNativeFlags(this), "g", ""));
-                // Using `str.slice(match.index)` rather than `match[0]` in case lookahead allowed
-                // matching due to characters outside the match
-                real.replace.call(str.slice(match.index), r2, function () {
-                    for (var i = 1; i < arguments.length - 2; i++) {
-                        if (arguments[i] === undefined)
-                            match[i] = undefined;
-                    }
-                });
-            }
-            // Attach named capture properties
-            if (this._xregexp && this._xregexp.captureNames) {
-                for (var i = 1; i < match.length; i++) {
-                    name = this._xregexp.captureNames[i - 1];
-                    if (name)
-                       match[name] = match[i];
-                }
-            }
-            // Fix browsers that increment `lastIndex` after zero-length matches
-            if (!compliantLastIndexIncrement && this.global && !match[0].length && (this.lastIndex > match.index))
-                this.lastIndex--;
-        }
-        return match;
-    };
-
-    // Don't override `test` if it won't change anything
-    if (!compliantLastIndexIncrement) {
-        // Fix browser bug in native method
-        RegExp.prototype.test = function (str) {
-            // Use the native `exec` to skip some processing overhead, even though the overriden
-            // `exec` would take care of the `lastIndex` fix
-            var match = real.exec.call(this, str);
-            // Fix browsers that increment `lastIndex` after zero-length matches
-            if (match && this.global && !match[0].length && (this.lastIndex > match.index))
-                this.lastIndex--;
-            return !!match;
-        };
-    }
-
-    //---------------------------------
-    //  Private helper functions
-    //---------------------------------
-
-    function getNativeFlags (regex) {
-        return (regex.global     ? "g" : "") +
-               (regex.ignoreCase ? "i" : "") +
-               (regex.multiline  ? "m" : "") +
-               (regex.extended   ? "x" : "") + // Proposed for ES4; included in AS3
-               (regex.sticky     ? "y" : "");
-    };
-
-    function indexOf (array, item, from) {
-        if (Array.prototype.indexOf) // Use the native array method if available
-            return array.indexOf(item, from);
-        for (var i = from || 0; i < array.length; i++) {
-            if (array[i] === item)
-                return i;
-        }
-        return -1;
-    };
-
-});
-// vim: ts=4 sts=4 sw=4 expandtab
-// -- kriskowal Kris Kowal Copyright (C) 2009-2011 MIT License
-// -- tlrobinson Tom Robinson Copyright (C) 2009-2010 MIT License (Narwhal Project)
-// -- dantman Daniel Friesen Copyright (C) 2010 XXX TODO License or CLA
-// -- fschaefer Florian Schäfer Copyright (C) 2010 MIT License
-// -- Gozala Irakli Gozalishvili Copyright (C) 2010 MIT License
-// -- kitcambridge Kit Cambridge Copyright (C) 2011 MIT License
-// -- kossnocorp Sasha Koss XXX TODO License or CLA
-// -- bryanforbes Bryan Forbes XXX TODO License or CLA
-// -- killdream Quildreen Motta Copyright (C) 2011 MIT Licence
-// -- michaelficarra Michael Ficarra Copyright (C) 2011 3-clause BSD License
-// -- sharkbrainguy Gerard Paapu Copyright (C) 2011 MIT License
-// -- bbqsrc Brendan Molloy (C) 2011 Creative Commons Zero (public domain)
-// -- iwyg XXX TODO License or CLA
-// -- DomenicDenicola Domenic Denicola Copyright (C) 2011 MIT License
-// -- xavierm02 Montillet Xavier XXX TODO License or CLA
-// -- Raynos Raynos XXX TODO License or CLA
-// -- samsonjs Sami Samhuri Copyright (C) 2010 MIT License
-// -- rwldrn Rick Waldron Copyright (C) 2011 MIT License
-// -- lexer Alexey Zakharov XXX TODO License or CLA
-
-/*!
-    Copyright (c) 2009, 280 North Inc. http://280north.com/
-    MIT License. http://github.com/280north/narwhal/blob/master/README.md
-*/
-
-define('ace/lib/es5-shim', ['require', 'exports', 'module' ], function(require, exports, module) {
-
-/**
- * Brings an environment as close to ECMAScript 5 compliance
- * as is possible with the facilities of erstwhile engines.
- *
- * Annotated ES5: http://es5.github.com/ (specific links below)
- * ES5 Spec: http://www.ecma-international.org/publications/files/ECMA-ST/Ecma-262.pdf
- *
- * @module
- */
-
-/*whatsupdoc*/
-
-//
-// Function
-// ========
-//
-
-// ES-5 15.3.4.5
-// http://es5.github.com/#x15.3.4.5
-
-if (!Function.prototype.bind) {
-    Function.prototype.bind = function bind(that) { // .length is 1
-        // 1. Let Target be the this value.
-        var target = this;
-        // 2. If IsCallable(Target) is false, throw a TypeError exception.
-        if (typeof target != "function")
-            throw new TypeError(); // TODO message
-        // 3. Let A be a new (possibly empty) internal list of all of the
-        //   argument values provided after thisArg (arg1, arg2 etc), in order.
-        // XXX slicedArgs will stand in for "A" if used
-        var args = slice.call(arguments, 1); // for normal call
-        // 4. Let F be a new native ECMAScript object.
-        // 11. Set the [[Prototype]] internal property of F to the standard
-        //   built-in Function prototype object as specified in 15.3.3.1.
-        // 12. Set the [[Call]] internal property of F as described in
-        //   15.3.4.5.1.
-        // 13. Set the [[Construct]] internal property of F as described in
-        //   15.3.4.5.2.
-        // 14. Set the [[HasInstance]] internal property of F as described in
-        //   15.3.4.5.3.
-        var bound = function () {
-
-            if (this instanceof bound) {
-                // 15.3.4.5.2 [[Construct]]
-                // When the [[Construct]] internal method of a function object,
-                // F that was created using the bind function is called with a
-                // list of arguments ExtraArgs, the following steps are taken:
-                // 1. Let target be the value of F's [[TargetFunction]]
-                //   internal property.
-                // 2. If target has no [[Construct]] internal method, a
-                //   TypeError exception is thrown.
-                // 3. Let boundArgs be the value of F's [[BoundArgs]] internal
-                //   property.
-                // 4. Let args be a new list containing the same values as the
-                //   list boundArgs in the same order followed by the same
-                //   values as the list ExtraArgs in the same order.
-                // 5. Return the result of calling the [[Construct]] internal 
-                //   method of target providing args as the arguments.
-
-                var F = function(){};
-                F.prototype = target.prototype;
-                var self = new F;
-
-                var result = target.apply(
-                    self,
-                    args.concat(slice.call(arguments))
-                );
-                if (result !== null && Object(result) === result)
-                    return result;
-                return self;
-
-            } else {
-                // 15.3.4.5.1 [[Call]]
-                // When the [[Call]] internal method of a function object, F,
-                // which was created using the bind function is called with a
-                // this value and a list of arguments ExtraArgs, the following
-                // steps are taken:
-                // 1. Let boundArgs be the value of F's [[BoundArgs]] internal
-                //   property.
-                // 2. Let boundThis be the value of F's [[BoundThis]] internal
-                //   property.
-                // 3. Let target be the value of F's [[TargetFunction]] internal
-                //   property.
-                // 4. Let args be a new list containing the same values as the 
-                //   list boundArgs in the same order followed by the same 
-                //   values as the list ExtraArgs in the same order.
-                // 5. Return the result of calling the [[Call]] internal method 
-                //   of target providing boundThis as the this value and 
-                //   providing args as the arguments.
-
-                // equiv: target.call(this, ...boundArgs, ...args)
-                return target.apply(
-                    that,
-                    args.concat(slice.call(arguments))
-                );
-
-            }
-
-        };
-        // XXX bound.length is never writable, so don't even try
-        //
-        // 15. If the [[Class]] internal property of Target is "Function", then
-        //     a. Let L be the length property of Target minus the length of A.
-        //     b. Set the length own property of F to either 0 or L, whichever is 
-        //       larger.
-        // 16. Else set the length own property of F to 0.
-        // 17. Set the attributes of the length own property of F to the values
-        //   specified in 15.3.5.1.
-
-        // TODO
-        // 18. Set the [[Extensible]] internal property of F to true.
-        
-        // TODO
-        // 19. Let thrower be the [[ThrowTypeError]] function Object (13.2.3).
-        // 20. Call the [[DefineOwnProperty]] internal method of F with 
-        //   arguments "caller", PropertyDescriptor {[[Get]]: thrower, [[Set]]:
-        //   thrower, [[Enumerable]]: false, [[Configurable]]: false}, and 
-        //   false.
-        // 21. Call the [[DefineOwnProperty]] internal method of F with 
-        //   arguments "arguments", PropertyDescriptor {[[Get]]: thrower, 
-        //   [[Set]]: thrower, [[Enumerable]]: false, [[Configurable]]: false},
-        //   and false.
-
-        // TODO
-        // NOTE Function objects created using Function.prototype.bind do not 
-        // have a prototype property or the [[Code]], [[FormalParameters]], and
-        // [[Scope]] internal properties.
-        // XXX can't delete prototype in pure-js.
-
-        // 22. Return F.
-        return bound;
-    };
-}
-
-// Shortcut to an often accessed properties, in order to avoid multiple
-// dereference that costs universally.
-// _Please note: Shortcuts are defined after `Function.prototype.bind` as we
-// us it in defining shortcuts.
-var call = Function.prototype.call;
-var prototypeOfArray = Array.prototype;
-var prototypeOfObject = Object.prototype;
-var slice = prototypeOfArray.slice;
-var toString = call.bind(prototypeOfObject.toString);
-var owns = call.bind(prototypeOfObject.hasOwnProperty);
-
-// If JS engine supports accessors creating shortcuts.
-var defineGetter;
-var defineSetter;
-var lookupGetter;
-var lookupSetter;
-var supportsAccessors;
-if ((supportsAccessors = owns(prototypeOfObject, "__defineGetter__"))) {
-    defineGetter = call.bind(prototypeOfObject.__defineGetter__);
-    defineSetter = call.bind(prototypeOfObject.__defineSetter__);
-    lookupGetter = call.bind(prototypeOfObject.__lookupGetter__);
-    lookupSetter = call.bind(prototypeOfObject.__lookupSetter__);
-}
-
-//
-// Array
-// =====
-//
-
-// ES5 15.4.3.2
-// http://es5.github.com/#x15.4.3.2
-// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/isArray
-if (!Array.isArray) {
-    Array.isArray = function isArray(obj) {
-        return toString(obj) == "[object Array]";
-    };
-}
-
-// The IsCallable() check in the Array functions
-// has been replaced with a strict check on the
-// internal class of the object to trap cases where
-// the provided function was actually a regular
-// expression literal, which in V8 and
-// JavaScriptCore is a typeof "function".  Only in
-// V8 are regular expression literals permitted as
-// reduce parameters, so it is desirable in the
-// general case for the shim to match the more
-// strict and common behavior of rejecting regular
-// expressions.
-
-// ES5 15.4.4.18
-// http://es5.github.com/#x15.4.4.18
-// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/array/forEach
-if (!Array.prototype.forEach) {
-    Array.prototype.forEach = function forEach(fun /*, thisp*/) {
-        var self = toObject(this),
-            thisp = arguments[1],
-            i = 0,
-            length = self.length >>> 0;
-
-        // If no callback function or if callback is not a callable function
-        if (toString(fun) != "[object Function]") {
-            throw new TypeError(); // TODO message
-        }
-
-        while (i < length) {
-            if (i in self) {
-                // Invoke the callback function with call, passing arguments:
-                // context, property value, property key, thisArg object context
-                fun.call(thisp, self[i], i, self);
-            }
-            i++;
-        }
-    };
-}
-
-// ES5 15.4.4.19
-// http://es5.github.com/#x15.4.4.19
-// https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Objects/Array/map
-if (!Array.prototype.map) {
-    Array.prototype.map = function map(fun /*, thisp*/) {
-        var self = toObject(this),
-            length = self.length >>> 0,
-            result = Array(length),
-            thisp = arguments[1];
-
-        // If no callback function or if callback is not a callable function
-        if (toString(fun) != "[object Function]") {
-            throw new TypeError(); // TODO message
-        }
-
-        for (var i = 0; i < length; i++) {
-            if (i in self)
-                result[i] = fun.call(thisp, self[i], i, self);
-        }
-        return result;
-    };
-}
-
-// ES5 15.4.4.20
-// http://es5.github.com/#x15.4.4.20
-// https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Objects/Array/filter
-if (!Array.prototype.filter) {
-    Array.prototype.filter = function filter(fun /*, thisp */) {
-        var self = toObject(this),
-            length = self.length >>> 0,
-            result = [],
-            thisp = arguments[1];
-
-        // If no callback function or if callback is not a callable function
-        if (toString(fun) != "[object Function]") {
-            throw new TypeError(); // TODO message
-        }
-
-        for (var i = 0; i < length; i++) {
-            if (i in self && fun.call(thisp, self[i], i, self))
-                result.push(self[i]);
-        }
-        return result;
-    };
-}
-
-// ES5 15.4.4.16
-// http://es5.github.com/#x15.4.4.16
-// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/every
-if (!Array.prototype.every) {
-    Array.prototype.every = function every(fun /*, thisp */) {
-        var self = toObject(this),
-            length = self.length >>> 0,
-            thisp = arguments[1];
-
-        // If no callback function or if callback is not a callable function
-        if (toString(fun) != "[object Function]") {
-            throw new TypeError(); // TODO message
-        }
-
-        for (var i = 0; i < length; i++) {
-            if (i in self && !fun.call(thisp, self[i], i, self))
-                return false;
-        }
-        return true;
-    };
-}
-
-// ES5 15.4.4.17
-// http://es5.github.com/#x15.4.4.17
-// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/some
-if (!Array.prototype.some) {
-    Array.prototype.some = function some(fun /*, thisp */) {
-        var self = toObject(this),
-            length = self.length >>> 0,
-            thisp = arguments[1];
-
-        // If no callback function or if callback is not a callable function
-        if (toString(fun) != "[object Function]") {
-            throw new TypeError(); // TODO message
-        }
-
-        for (var i = 0; i < length; i++) {
-            if (i in self && fun.call(thisp, self[i], i, self))
-                return true;
-        }
-        return false;
-    };
-}
-
-// ES5 15.4.4.21
-// http://es5.github.com/#x15.4.4.21
-// https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Objects/Array/reduce
-if (!Array.prototype.reduce) {
-    Array.prototype.reduce = function reduce(fun /*, initial*/) {
-        var self = toObject(this),
-            length = self.length >>> 0;
-
-        // If no callback function or if callback is not a callable function
-        if (toString(fun) != "[object Function]") {
-            throw new TypeError(); // TODO message
-        }
-
-        // no value to return if no initial value and an empty array
-        if (!length && arguments.length == 1)
-            throw new TypeError(); // TODO message
-
-        var i = 0;
-        var result;
-        if (arguments.length >= 2) {
-            result = arguments[1];
-        } else {
-            do {
-                if (i in self) {
-                    result = self[i++];
-                    break;
-                }
-
-                // if array contains no values, no initial value to return
-                if (++i >= length)
-                    throw new TypeError(); // TODO message
-            } while (true);
-        }
-
-        for (; i < length; i++) {
-            if (i in self)
-                result = fun.call(void 0, result, self[i], i, self);
-        }
-
-        return result;
-    };
-}
-
-// ES5 15.4.4.22
-// http://es5.github.com/#x15.4.4.22
-// https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Objects/Array/reduceRight
-if (!Array.prototype.reduceRight) {
-    Array.prototype.reduceRight = function reduceRight(fun /*, initial*/) {
-        var self = toObject(this),
-            length = self.length >>> 0;
-
-        // If no callback function or if callback is not a callable function
-        if (toString(fun) != "[object Function]") {
-            throw new TypeError(); // TODO message
-        }
-
-        // no value to return if no initial value, empty array
-        if (!length && arguments.length == 1)
-            throw new TypeError(); // TODO message
-
-        var result, i = length - 1;
-        if (arguments.length >= 2) {
-            result = arguments[1];
-        } else {
-            do {
-                if (i in self) {
-                    result = self[i--];
-                    break;
-                }
-
-                // if array contains no values, no initial value to return
-                if (--i < 0)
-                    throw new TypeError(); // TODO message
-            } while (true);
-        }
-
-        do {
-            if (i in this)
-                result = fun.call(void 0, result, self[i], i, self);
-        } while (i--);
-
-        return result;
-    };
-}
-
-// ES5 15.4.4.14
-// http://es5.github.com/#x15.4.4.14
-// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/indexOf
-if (!Array.prototype.indexOf) {
-    Array.prototype.indexOf = function indexOf(sought /*, fromIndex */ ) {
-        var self = toObject(this),
-            length = self.length >>> 0;
-
-        if (!length)
-            return -1;
-
-        var i = 0;
-        if (arguments.length > 1)
-            i = toInteger(arguments[1]);
-
-        // handle negative indices
-        i = i >= 0 ? i : Math.max(0, length + i);
-        for (; i < length; i++) {
-            if (i in self && self[i] === sought) {
-                return i;
-            }
-        }
-        return -1;
-    };
-}
-
-// ES5 15.4.4.15
-// http://es5.github.com/#x15.4.4.15
-// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/lastIndexOf
-if (!Array.prototype.lastIndexOf) {
-    Array.prototype.lastIndexOf = function lastIndexOf(sought /*, fromIndex */) {
-        var self = toObject(this),
-            length = self.length >>> 0;
-
-        if (!length)
-            return -1;
-        var i = length - 1;
-        if (arguments.length > 1)
-            i = Math.min(i, toInteger(arguments[1]));
-        // handle negative indices
-        i = i >= 0 ? i : length - Math.abs(i);
-        for (; i >= 0; i--) {
-            if (i in self && sought === self[i])
-                return i;
-        }
-        return -1;
-    };
-}
-
-//
-// Object
-// ======
-//
-
-// ES5 15.2.3.2
-// http://es5.github.com/#x15.2.3.2
-if (!Object.getPrototypeOf) {
-    // https://github.com/kriskowal/es5-shim/issues#issue/2
-    // http://ejohn.org/blog/objectgetprototypeof/
-    // recommended by fschaefer on github
-    Object.getPrototypeOf = function getPrototypeOf(object) {
-        return object.__proto__ || (
-            object.constructor ?
-            object.constructor.prototype :
-            prototypeOfObject
-        );
-    };
-}
-
-// ES5 15.2.3.3
-// http://es5.github.com/#x15.2.3.3
-if (!Object.getOwnPropertyDescriptor) {
-    var ERR_NON_OBJECT = "Object.getOwnPropertyDescriptor called on a " +
-                         "non-object: ";
-    Object.getOwnPropertyDescriptor = function getOwnPropertyDescriptor(object, property) {
-        if ((typeof object != "object" && typeof object != "function") || object === null)
-            throw new TypeError(ERR_NON_OBJECT + object);
-        // If object does not owns property return undefined immediately.
-        if (!owns(object, property))
-            return;
-
-        var descriptor, getter, setter;
-
-        // If object has a property then it's for sure both `enumerable` and
-        // `configurable`.
-        descriptor =  { enumerable: true, configurable: true };
-
-        // If JS engine supports accessor properties then property may be a
-        // getter or setter.
-        if (supportsAccessors) {
-            // Unfortunately `__lookupGetter__` will return a getter even
-            // if object has own non getter property along with a same named
-            // inherited getter. To avoid misbehavior we temporary remove
-            // `__proto__` so that `__lookupGetter__` will return getter only
-            // if it's owned by an object.
-            var prototype = object.__proto__;
-            object.__proto__ = prototypeOfObject;
-
-            var getter = lookupGetter(object, property);
-            var setter = lookupSetter(object, property);
-
-            // Once we have getter and setter we can put values back.
-            object.__proto__ = prototype;
-
-            if (getter || setter) {
-                if (getter) descriptor.get = getter;
-                if (setter) descriptor.set = setter;
-
-                // If it was accessor property we're done and return here
-                // in order to avoid adding `value` to the descriptor.
-                return descriptor;
-            }
-        }
-
-        // If we got this far we know that object has an own property that is
-        // not an accessor so we set it as a value and return descriptor.
-        descriptor.value = object[property];
-        return descriptor;
-    };
-}
-
-// ES5 15.2.3.4
-// http://es5.github.com/#x15.2.3.4
-if (!Object.getOwnPropertyNames) {
-    Object.getOwnPropertyNames = function getOwnPropertyNames(object) {
-        return Object.keys(object);
-    };
-}
-
-// ES5 15.2.3.5
-// http://es5.github.com/#x15.2.3.5
-if (!Object.create) {
-    Object.create = function create(prototype, properties) {
-        var object;
-        if (prototype === null) {
-            object = { "__proto__": null };
-        } else {
-            if (typeof prototype != "object")
-                throw new TypeError("typeof prototype["+(typeof prototype)+"] != 'object'");
-            var Type = function () {};
-            Type.prototype = prototype;
-            object = new Type();
-            // IE has no built-in implementation of `Object.getPrototypeOf`
-            // neither `__proto__`, but this manually setting `__proto__` will
-            // guarantee that `Object.getPrototypeOf` will work as expected with
-            // objects created using `Object.create`
-            object.__proto__ = prototype;
-        }
-        if (properties !== void 0)
-            Object.defineProperties(object, properties);
-        return object;
-    };
-}
-
-// ES5 15.2.3.6
-// http://es5.github.com/#x15.2.3.6
-
-// Patch for WebKit and IE8 standard mode
-// Designed by hax <hax.github.com>
-// related issue: https://github.com/kriskowal/es5-shim/issues#issue/5
-// IE8 Reference:
-//     http://msdn.microsoft.com/en-us/library/dd282900.aspx
-//     http://msdn.microsoft.com/en-us/library/dd229916.aspx
-// WebKit Bugs:
-//     https://bugs.webkit.org/show_bug.cgi?id=36423
-
-function doesDefinePropertyWork(object) {
-    try {
-        Object.defineProperty(object, "sentinel", {});
-        return "sentinel" in object;
-    } catch (exception) {
-        // returns falsy
-    }
-}
-
-// check whether defineProperty works if it's given. Otherwise,
-// shim partially.
-if (Object.defineProperty) {
-    var definePropertyWorksOnObject = doesDefinePropertyWork({});
-    var definePropertyWorksOnDom = typeof document == "undefined" ||
-        doesDefinePropertyWork(document.createElement("div"));
-    if (!definePropertyWorksOnObject || !definePropertyWorksOnDom) {
-        var definePropertyFallback = Object.defineProperty;
-    }
-}
-
-if (!Object.defineProperty || definePropertyFallback) {
-    var ERR_NON_OBJECT_DESCRIPTOR = "Property description must be an object: ";
-    var ERR_NON_OBJECT_TARGET = "Object.defineProperty called on non-object: "
-    var ERR_ACCESSORS_NOT_SUPPORTED = "getters & setters can not be defined " +
-                                      "on this javascript engine";
-
-    Object.defineProperty = function defineProperty(object, property, descriptor) {
-        if ((typeof object != "object" && typeof object != "function") || object === null)
-            throw new TypeError(ERR_NON_OBJECT_TARGET + object);
-        if ((typeof descriptor != "object" && typeof descriptor != "function") || descriptor === null)
-            throw new TypeError(ERR_NON_OBJECT_DESCRIPTOR + descriptor);
-
-        // make a valiant attempt to use the real defineProperty
-        // for I8's DOM elements.
-        if (definePropertyFallback) {
-            try {
-                return definePropertyFallback.call(Object, object, property, descriptor);
-            } catch (exception) {
-                // try the shim if the real one doesn't work
-            }
-        }
-
-        // If it's a data property.
-        if (owns(descriptor, "value")) {
-            // fail silently if "writable", "enumerable", or "configurable"
-            // are requested but not supported
-            /*
-            // alternate approach:
-            if ( // can't implement these features; allow false but not true
-                !(owns(descriptor, "writable") ? descriptor.writable : true) ||
-                !(owns(descriptor, "enumerable") ? descriptor.enumerable : true) ||
-                !(owns(descriptor, "configurable") ? descriptor.configurable : true)
-            )
-                throw new RangeError(
-                    "This implementation of Object.defineProperty does not " +
-                    "support configurable, enumerable, or writable."
-                );
-            */
-
-            if (supportsAccessors && (lookupGetter(object, property) ||
-                                      lookupSetter(object, property)))
-            {
-                // As accessors are supported only on engines implementing
-                // `__proto__` we can safely override `__proto__` while defining
-                // a property to make sure that we don't hit an inherited
-                // accessor.
-                var prototype = object.__proto__;
-                object.__proto__ = prototypeOfObject;
-                // Deleting a property anyway since getter / setter may be
-                // defined on object itself.
-                delete object[property];
-                object[property] = descriptor.value;
-                // Setting original `__proto__` back now.
-                object.__proto__ = prototype;
-            } else {
-                object[property] = descriptor.value;
-            }
-        } else {
-            if (!supportsAccessors)
-                throw new TypeError(ERR_ACCESSORS_NOT_SUPPORTED);
-            // If we got that far then getters and setters can be defined !!
-            if (owns(descriptor, "get"))
-                defineGetter(object, property, descriptor.get);
-            if (owns(descriptor, "set"))
-                defineSetter(object, property, descriptor.set);
-        }
-
-        return object;
-    };
-}
-
-// ES5 15.2.3.7
-// http://es5.github.com/#x15.2.3.7
-if (!Object.defineProperties) {
-    Object.defineProperties = function defineProperties(object, properties) {
-        for (var property in properties) {
-            if (owns(properties, property))
-                Object.defineProperty(object, property, properties[property]);
-        }
-        return object;
-    };
-}
-
-// ES5 15.2.3.8
-// http://es5.github.com/#x15.2.3.8
-if (!Object.seal) {
-    Object.seal = function seal(object) {
-        // this is misleading and breaks feature-detection, but
-        // allows "securable" code to "gracefully" degrade to working
-        // but insecure code.
-        return object;
-    };
-}
-
-// ES5 15.2.3.9
-// http://es5.github.com/#x15.2.3.9
-if (!Object.freeze) {
-    Object.freeze = function freeze(object) {
-        // this is misleading and breaks feature-detection, but
-        // allows "securable" code to "gracefully" degrade to working
-        // but insecure code.
-        return object;
-    };
-}
-
-// detect a Rhino bug and patch it
-try {
-    Object.freeze(function () {});
-} catch (exception) {
-    Object.freeze = (function freeze(freezeObject) {
-        return function freeze(object) {
-            if (typeof object == "function") {
-                return object;
-            } else {
-                return freezeObject(object);
-            }
-        };
-    })(Object.freeze);
-}
-
-// ES5 15.2.3.10
-// http://es5.github.com/#x15.2.3.10
-if (!Object.preventExtensions) {
-    Object.preventExtensions = function preventExtensions(object) {
-        // this is misleading and breaks feature-detection, but
-        // allows "securable" code to "gracefully" degrade to working
-        // but insecure code.
-        return object;
-    };
-}
-
-// ES5 15.2.3.11
-// http://es5.github.com/#x15.2.3.11
-if (!Object.isSealed) {
-    Object.isSealed = function isSealed(object) {
-        return false;
-    };
-}
-
-// ES5 15.2.3.12
-// http://es5.github.com/#x15.2.3.12
-if (!Object.isFrozen) {
-    Object.isFrozen = function isFrozen(object) {
-        return false;
-    };
-}
-
-// ES5 15.2.3.13
-// http://es5.github.com/#x15.2.3.13
-if (!Object.isExtensible) {
-    Object.isExtensible = function isExtensible(object) {
-        // 1. If Type(O) is not Object throw a TypeError exception.
-        if (Object(object) === object) {
-            throw new TypeError(); // TODO message
-        }
-        // 2. Return the Boolean value of the [[Extensible]] internal property of O.
-        var name = '';
-        while (owns(object, name)) {
-            name += '?';
-        }
-        object[name] = true;
-        var returnValue = owns(object, name);
-        delete object[name];
-        return returnValue;
-    };
-}
-
-// ES5 15.2.3.14
-// http://es5.github.com/#x15.2.3.14
-if (!Object.keys) {
-    // http://whattheheadsaid.com/2010/10/a-safer-object-keys-compatibility-implementation
-    var hasDontEnumBug = true,
-        dontEnums = [
-            "toString",
-            "toLocaleString",
-            "valueOf",
-            "hasOwnProperty",
-            "isPrototypeOf",
-            "propertyIsEnumerable",
-            "constructor"
-        ],
-        dontEnumsLength = dontEnums.length;
-
-    for (var key in {"toString": null})
-        hasDontEnumBug = false;
-
-    Object.keys = function keys(object) {
-
-        if ((typeof object != "object" && typeof object != "function") || object === null)
-            throw new TypeError("Object.keys called on a non-object");
-
-        var keys = [];
-        for (var name in object) {
-            if (owns(object, name)) {
-                keys.push(name);
-            }
-        }
-
-        if (hasDontEnumBug) {
-            for (var i = 0, ii = dontEnumsLength; i < ii; i++) {
-                var dontEnum = dontEnums[i];
-                if (owns(object, dontEnum)) {
-                    keys.push(dontEnum);
-                }
-            }
-        }
-
-        return keys;
-    };
-
-}
-
-//
-// Date
-// ====
-//
-
-// ES5 15.9.5.43
-// http://es5.github.com/#x15.9.5.43
-// This function returns a String value represent the instance in time 
-// represented by this Date object. The format of the String is the Date Time 
-// string format defined in 15.9.1.15. All fields are present in the String. 
-// The time zone is always UTC, denoted by the suffix Z. If the time value of 
-// this object is not a finite Number a RangeError exception is thrown.
-if (!Date.prototype.toISOString || (new Date(-62198755200000).toISOString().indexOf('-000001') === -1)) {
-    Date.prototype.toISOString = function toISOString() {
-        var result, length, value, year;
-        if (!isFinite(this))
-            throw new RangeError;
-
-        // the date time string format is specified in 15.9.1.15.
-        result = [this.getUTCMonth() + 1, this.getUTCDate(),
-            this.getUTCHours(), this.getUTCMinutes(), this.getUTCSeconds()];
-        year = this.getUTCFullYear();
-        year = (year < 0 ? '-' : (year > 9999 ? '+' : '')) + ('00000' + Math.abs(year)).slice(0 <= year && year <= 9999 ? -4 : -6);
-
-        length = result.length;
-        while (length--) {
-            value = result[length];
-            // pad months, days, hours, minutes, and seconds to have two digits.
-            if (value < 10)
-                result[length] = "0" + value;
-        }
-        // pad milliseconds to have three digits.
-        return year + "-" + result.slice(0, 2).join("-") + "T" + result.slice(2).join(":") + "." +
-            ("000" + this.getUTCMilliseconds()).slice(-3) + "Z";
-    }
-}
-
-// ES5 15.9.4.4
-// http://es5.github.com/#x15.9.4.4
-if (!Date.now) {
-    Date.now = function now() {
-        return new Date().getTime();
-    };
-}
-
-// ES5 15.9.5.44
-// http://es5.github.com/#x15.9.5.44
-// This function provides a String representation of a Date object for use by 
-// JSON.stringify (15.12.3).
-if (!Date.prototype.toJSON) {
-    Date.prototype.toJSON = function toJSON(key) {
-        // When the toJSON method is called with argument key, the following 
-        // steps are taken:
-
-        // 1.  Let O be the result of calling ToObject, giving it the this
-        // value as its argument.
-        // 2. Let tv be ToPrimitive(O, hint Number).
-        // 3. If tv is a Number and is not finite, return null.
-        // XXX
-        // 4. Let toISO be the result of calling the [[Get]] internal method of
-        // O with argument "toISOString".
-        // 5. If IsCallable(toISO) is false, throw a TypeError exception.
-        if (typeof this.toISOString != "function")
-            throw new TypeError(); // TODO message
-        // 6. Return the result of calling the [[Call]] internal method of
-        //  toISO with O as the this value and an empty argument list.
-        return this.toISOString();
-
-        // NOTE 1 The argument is ignored.
-
-        // NOTE 2 The toJSON function is intentionally generic; it does not
-        // require that its this value be a Date object. Therefore, it can be
-        // transferred to other kinds of objects for use as a method. However,
-        // it does require that any such object have a toISOString method. An
-        // object is free to use the argument key to filter its
-        // stringification.
-    };
-}
-
-// ES5 15.9.4.2
-// http://es5.github.com/#x15.9.4.2
-// based on work shared by Daniel Friesen (dantman)
-// http://gist.github.com/303249
-if (Date.parse("+275760-09-13T00:00:00.000Z") !== 8.64e15) {
-    // XXX global assignment won't work in embeddings that use
-    // an alternate object for the context.
-    Date = (function(NativeDate) {
-
-        // Date.length === 7
-        var Date = function Date(Y, M, D, h, m, s, ms) {
-            var length = arguments.length;
-            if (this instanceof NativeDate) {
-                var date = length == 1 && String(Y) === Y ? // isString(Y)
-                    // We explicitly pass it through parse:
-                    new NativeDate(Date.parse(Y)) :
-                    // We have to manually make calls depending on argument
-                    // length here
-                    length >= 7 ? new NativeDate(Y, M, D, h, m, s, ms) :
-                    length >= 6 ? new NativeDate(Y, M, D, h, m, s) :
-                    length >= 5 ? new NativeDate(Y, M, D, h, m) :
-                    length >= 4 ? new NativeDate(Y, M, D, h) :
-                    length >= 3 ? new NativeDate(Y, M, D) :
-                    length >= 2 ? new NativeDate(Y, M) :
-                    length >= 1 ? new NativeDate(Y) :
-                                  new NativeDate();
-                // Prevent mixups with unfixed Date object
-                date.constructor = Date;
-                return date;
-            }
-            return NativeDate.apply(this, arguments);
-        };
-
-        // 15.9.1.15 Date Time String Format.
-        var isoDateExpression = new RegExp("^" +
-            "(\\d{4}|[\+\-]\\d{6})" + // four-digit year capture or sign + 6-digit extended year
-            "(?:-(\\d{2})" + // optional month capture
-            "(?:-(\\d{2})" + // optional day capture
-            "(?:" + // capture hours:minutes:seconds.milliseconds
-                "T(\\d{2})" + // hours capture
-                ":(\\d{2})" + // minutes capture
-                "(?:" + // optional :seconds.milliseconds
-                    ":(\\d{2})" + // seconds capture
-                    "(?:\\.(\\d{3}))?" + // milliseconds capture
-                ")?" +
-            "(?:" + // capture UTC offset component
-                "Z|" + // UTC capture
-                "(?:" + // offset specifier +/-hours:minutes
-                    "([-+])" + // sign capture
-                    "(\\d{2})" + // hours offset capture
-                    ":(\\d{2})" + // minutes offset capture
-                ")" +
-            ")?)?)?)?" +
-        "$");
-
-        // Copy any custom methods a 3rd party library may have added
-        for (var key in NativeDate)
-            Date[key] = NativeDate[key];
-
-        // Copy "native" methods explicitly; they may be non-enumerable
-        Date.now = NativeDate.now;
-        Date.UTC = NativeDate.UTC;
-        Date.prototype = NativeDate.prototype;
-        Date.prototype.constructor = Date;
-
-        // Upgrade Date.parse to handle simplified ISO 8601 strings
-        Date.parse = function parse(string) {
-            var match = isoDateExpression.exec(string);
-            if (match) {
-                match.shift(); // kill match[0], the full match
-                // parse months, days, hours, minutes, seconds, and milliseconds
-                for (var i = 1; i < 7; i++) {
-                    // provide default values if necessary
-                    match[i] = +(match[i] || (i < 3 ? 1 : 0));
-                    // match[1] is the month. Months are 0-11 in JavaScript
-                    // `Date` objects, but 1-12 in ISO notation, so we
-                    // decrement.
-                    if (i == 1)
-                        match[i]--;
-                }
-
-                // parse the UTC offset component
-                var minuteOffset = +match.pop(), hourOffset = +match.pop(), sign = match.pop();
-
-                // compute the explicit time zone offset if specified
-                var offset = 0;
-                if (sign) {
-                    // detect invalid offsets and return early
-                    if (hourOffset > 23 || minuteOffset > 59)
-                        return NaN;
-
-                    // express the provided time zone offset in minutes. The offset is
-                    // negative for time zones west of UTC; positive otherwise.
-                    offset = (hourOffset * 60 + minuteOffset) * 6e4 * (sign == "+" ? -1 : 1);
-                }
-
-                // Date.UTC for years between 0 and 99 converts year to 1900 + year
-                // The Gregorian calendar has a 400-year cycle, so 
-                // to Date.UTC(year + 400, .... ) - 12622780800000 == Date.UTC(year, ...),
-                // where 12622780800000 - number of milliseconds in Gregorian calendar 400 years
-                var year = +match[0];
-                if (0 <= year && year <= 99) {
-                    match[0] = year + 400;
-                    return NativeDate.UTC.apply(this, match) + offset - 12622780800000;
-                }
-
-                // compute a new UTC date value, accounting for the optional offset
-                return NativeDate.UTC.apply(this, match) + offset;
-            }
-            return NativeDate.parse.apply(this, arguments);
-        };
-
-        return Date;
-    })(Date);
-}
-
-//
-// String
-// ======
-//
-
-// ES5 15.5.4.20
-// http://es5.github.com/#x15.5.4.20
-var ws = "\x09\x0A\x0B\x0C\x0D\x20\xA0\u1680\u180E\u2000\u2001\u2002\u2003" +
-    "\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u202F\u205F\u3000\u2028" +
-    "\u2029\uFEFF";
-if (!String.prototype.trim || ws.trim()) {
-    // http://blog.stevenlevithan.com/archives/faster-trim-javascript
-    // http://perfectionkills.com/whitespace-deviations/
-    ws = "[" + ws + "]";
-    var trimBeginRegexp = new RegExp("^" + ws + ws + "*"),
-        trimEndRegexp = new RegExp(ws + ws + "*$");
-    String.prototype.trim = function trim() {
-        return String(this).replace(trimBeginRegexp, "").replace(trimEndRegexp, "");
-    };
-}
-
-//
-// Util
-// ======
-//
-
-// ES5 9.4
-// http://es5.github.com/#x9.4
-// http://jsperf.com/to-integer
-var toInteger = function (n) {
-    n = +n;
-    if (n !== n) // isNaN
-        n = 0;
-    else if (n !== 0 && n !== (1/0) && n !== -(1/0))
-        n = (n > 0 || -1) * Math.floor(Math.abs(n));
-    return n;
-};
-
-var prepareString = "a"[0] != "a",
-    // ES5 9.9
-    // http://es5.github.com/#x9.9
-    toObject = function (o) {
-        if (o == null) { // this matches both null and undefined
-            throw new TypeError(); // TODO message
-        }
-        // If the implementation doesn't support by-index access of
-        // string characters (ex. IE < 7), split the string
-        if (prepareString && typeof o == "string" && o) {
-            return o.split("");
-        }
-        return Object(o);
-    };
-});/* vim:ts=4:sts=4:sw=4:
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Irakli Gozalishvili <rfobic@gmail.com> (http://jeditoolkit.com)
- *      Mike de Boer <mike AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/lib/event_emitter', ['require', 'exports', 'module' ], function(require, exports, module) {
-"use strict";
-
-var EventEmitter = {};
-
-EventEmitter._emit =
-EventEmitter._dispatchEvent = function(eventName, e) {
-    this._eventRegistry = this._eventRegistry || {};
-    this._defaultHandlers = this._defaultHandlers || {};
-
-    var listeners = this._eventRegistry[eventName] || [];
-    var defaultHandler = this._defaultHandlers[eventName];
-    if (!listeners.length && !defaultHandler)
-        return;
-
-    e = e || {};
-    e.type = eventName;
-    
-    if (!e.stopPropagation) {
-        e.stopPropagation = function() {
-            this.propagationStopped = true;
-        };
-    }
-    
-    if (!e.preventDefault) {
-        e.preventDefault = function() {
-            this.defaultPrevented = true;
-        };
-    }
-
-    for (var i=0; i<listeners.length; i++) {
-        listeners[i](e);
-        if (e.propagationStopped)
-            break;
-    }
-    
-    if (defaultHandler && !e.defaultPrevented)
-        defaultHandler(e);
-};
-
-EventEmitter.setDefaultHandler = function(eventName, callback) {
-    this._defaultHandlers = this._defaultHandlers || {};
-    
-    if (this._defaultHandlers[eventName])
-        throw new Error("The default handler for '" + eventName + "' is already set");
-        
-    this._defaultHandlers[eventName] = callback;
-};
-
-EventEmitter.on =
-EventEmitter.addEventListener = function(eventName, callback) {
-    this._eventRegistry = this._eventRegistry || {};
-
-    var listeners = this._eventRegistry[eventName];
-    if (!listeners)
-        var listeners = this._eventRegistry[eventName] = [];
-
-    if (listeners.indexOf(callback) == -1)
-        listeners.push(callback);
-};
-
-EventEmitter.removeListener =
-EventEmitter.removeEventListener = function(eventName, callback) {
-    this._eventRegistry = this._eventRegistry || {};
-
-    var listeners = this._eventRegistry[eventName];
-    if (!listeners)
-        return;
-
-    var index = listeners.indexOf(callback);
-    if (index !== -1)
-        listeners.splice(index, 1);
-};
-
-EventEmitter.removeAllListeners = function(eventName) {
-    if (this._eventRegistry) this._eventRegistry[eventName] = [];
-};
-
-exports.EventEmitter = EventEmitter;
-
-});/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/lib/oop', ['require', 'exports', 'module' ], function(require, exports, module) {
-"use strict";
-
-exports.inherits = (function() {
-    var tempCtor = function() {};
-    return function(ctor, superCtor) {
-        tempCtor.prototype = superCtor.prototype;
-        ctor.super_ = superCtor.prototype;
-        ctor.prototype = new tempCtor();
-        ctor.prototype.constructor = ctor;
-    };
-}());
-
-exports.mixin = function(obj, mixin) {
-    for (var key in mixin) {
-        obj[key] = mixin[key];
-    }
-};
-
-exports.implement = function(proto, mixin) {
-    exports.mixin(proto, mixin);
-};
-
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/coffee_worker', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/worker/mirror', 'ace/mode/coffee/coffee-script'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var Mirror = require("../worker/mirror").Mirror;
-var coffee = require("../mode/coffee/coffee-script");
-
-window.addEventListener = function() {};
-
-
-var Worker = exports.Worker = function(sender) {
-    Mirror.call(this, sender);
-    this.setTimeout(200);
-};
-
-oop.inherits(Worker, Mirror);
-
-(function() {
-
-    this.onUpdate = function() {
-        var value = this.doc.getValue();
-
-        try {
-            coffee.parse(value);
-        } catch(e) {
-            var m = e.message.match(/Parse error on line (\d+): (.*)/);
-            if (m) {
-                this.sender.emit("error", {
-                    row: parseInt(m[1], 10) - 1,
-                    column: null,
-                    text: m[2],
-                    type: "error"
-                });
-                return;
-            }
-
-            if (e instanceof SyntaxError) {
-                var m = e.message.match(/ on line (\d+)/);
-                if (m) {
-                    this.sender.emit("error", {
-                        row: parseInt(m[1], 10) - 1,
-                        column: null,
-                        text: e.message.replace(m[0], ""),
-                        type: "error"
-                    });
-                }
-            }
-            return;
-        }
-        this.sender.emit("ok");
-    };
-
-}).call(Worker.prototype);
-
-});define('ace/worker/mirror', ['require', 'exports', 'module' , 'ace/document', 'ace/lib/lang'], function(require, exports, module) {
-"use strict";
-
-var Document = require("../document").Document;
-var lang = require("../lib/lang");
-    
-var Mirror = exports.Mirror = function(sender) {
-    this.sender = sender;
-    var doc = this.doc = new Document("");
-    
-    var deferredUpdate = this.deferredUpdate = lang.deferredCall(this.onUpdate.bind(this));
-    
-    var _self = this;
-    sender.on("change", function(e) {
-        doc.applyDeltas([e.data]);        
-        deferredUpdate.schedule(_self.$timeout);
-    });
-};
-
-(function() {
-    
-    this.$timeout = 500;
-    
-    this.setTimeout = function(timeout) {
-        this.$timeout = timeout;
-    };
-    
-    this.setValue = function(value) {
-        this.doc.setValue(value);
-        this.deferredUpdate.schedule(this.$timeout);
-    };
-    
-    this.getValue = function(callbackId) {
-        this.sender.callback(this.doc.getValue(), callbackId);
-    };
-    
-    this.onUpdate = function() {
-        // abstract method
-    };
-    
-}).call(Mirror.prototype);
-
-});/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/document', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/event_emitter', 'ace/range', 'ace/anchor'], function(require, exports, module) {
-"use strict";
-
-var oop = require("./lib/oop");
-var EventEmitter = require("./lib/event_emitter").EventEmitter;
-var Range = require("./range").Range;
-var Anchor = require("./anchor").Anchor;
-
-var Document = function(text) {
-    this.$lines = [];
-
-    if (Array.isArray(text)) {
-        this.insertLines(0, text);
-    }
-    // There has to be one line at least in the document. If you pass an empty
-    // string to the insert function, nothing will happen. Workaround.
-    else if (text.length == 0) {
-        this.$lines = [""];
-    } else {
-        this.insert({row: 0, column:0}, text);
-    }
-};
-
-(function() {
-
-    oop.implement(this, EventEmitter);
-
-    this.setValue = function(text) {
-        var len = this.getLength();
-        this.remove(new Range(0, 0, len, this.getLine(len-1).length));
-        this.insert({row: 0, column:0}, text);
-    };
-
-    this.getValue = function() {
-        return this.getAllLines().join(this.getNewLineCharacter());
-    };
-
-    this.createAnchor = function(row, column) {
-        return new Anchor(this, row, column);
-    };
-
-    // check for IE split bug
-    if ("aaa".split(/a/).length == 0)
-        this.$split = function(text) {
-            return text.replace(/\r\n|\r/g, "\n").split("\n");
-        }
-    else
-        this.$split = function(text) {
-            return text.split(/\r\n|\r|\n/);
-        };
-
-
-    this.$detectNewLine = function(text) {
-        var match = text.match(/^.*?(\r\n|\r|\n)/m);
-        if (match) {
-            this.$autoNewLine = match[1];
-        } else {
-            this.$autoNewLine = "\n";
-        }
-    };
-
-    this.getNewLineCharacter = function() {
-      switch (this.$newLineMode) {
-          case "windows":
-              return "\r\n";
-
-          case "unix":
-              return "\n";
-
-          case "auto":
-              return this.$autoNewLine;
-      }
-    };
-
-    this.$autoNewLine = "\n";
-    this.$newLineMode = "auto";
-    this.setNewLineMode = function(newLineMode) {
-        if (this.$newLineMode === newLineMode)
-            return;
-
-        this.$newLineMode = newLineMode;
-    };
-
-    this.getNewLineMode = function() {
-        return this.$newLineMode;
-    };
-
-    this.isNewLine = function(text) {
-        return (text == "\r\n" || text == "\r" || text == "\n");
-    };
-
-    /**
-     * Get a verbatim copy of the given line as it is in the document
-     */
-    this.getLine = function(row) {
-        return this.$lines[row] || "";
-    };
-
-    this.getLines = function(firstRow, lastRow) {
-        return this.$lines.slice(firstRow, lastRow + 1);
-    };
-
-    /**
-     * Returns all lines in the document as string array. Warning: The caller
-     * should not modify this array!
-     */
-    this.getAllLines = function() {
-        return this.getLines(0, this.getLength());
-    };
-
-    this.getLength = function() {
-        return this.$lines.length;
-    };
-
-    this.getTextRange = function(range) {
-        if (range.start.row == range.end.row) {
-            return this.$lines[range.start.row].substring(range.start.column,
-                                                         range.end.column);
-        }
-        else {
-            var lines = [];
-            lines.push(this.$lines[range.start.row].substring(range.start.column));
-            lines.push.apply(lines, this.getLines(range.start.row+1, range.end.row-1));
-            lines.push(this.$lines[range.end.row].substring(0, range.end.column));
-            return lines.join(this.getNewLineCharacter());
-        }
-    };
-
-    this.$clipPosition = function(position) {
-        var length = this.getLength();
-        if (position.row >= length) {
-            position.row = Math.max(0, length - 1);
-            position.column = this.getLine(length-1).length;
-        }
-        return position;
-    };
-
-    this.insert = function(position, text) {
-        if (!text || text.length === 0)
-            return position;
-
-        position = this.$clipPosition(position);
-
-        // only detect new lines if the document has no line break yet
-        if (this.getLength() <= 1)
-            this.$detectNewLine(text);
-
-        var lines = this.$split(text);
-        var firstLine = lines.splice(0, 1)[0];
-        var lastLine = lines.length == 0 ? null : lines.splice(lines.length - 1, 1)[0];
-
-        position = this.insertInLine(position, firstLine);
-        if (lastLine !== null) {
-            position = this.insertNewLine(position); // terminate first line
-            position = this.insertLines(position.row, lines);
-            position = this.insertInLine(position, lastLine || "");
-        }
-        return position;
-    };
-
-    this.insertLines = function(row, lines) {
-        if (lines.length == 0)
-            return {row: row, column: 0};
-
-        var args = [row, 0];
-        args.push.apply(args, lines);
-        this.$lines.splice.apply(this.$lines, args);
-
-        var range = new Range(row, 0, row + lines.length, 0);
-        var delta = {
-            action: "insertLines",
-            range: range,
-            lines: lines
-        };
-        this._emit("change", { data: delta });
-        return range.end;
-    };
-
-    this.insertNewLine = function(position) {
-        position = this.$clipPosition(position);
-        var line = this.$lines[position.row] || "";
-
-        this.$lines[position.row] = line.substring(0, position.column);
-        this.$lines.splice(position.row + 1, 0, line.substring(position.column, line.length));
-
-        var end = {
-            row : position.row + 1,
-            column : 0
-        };
-
-        var delta = {
-            action: "insertText",
-            range: Range.fromPoints(position, end),
-            text: this.getNewLineCharacter()
-        };
-        this._emit("change", { data: delta });
-
-        return end;
-    };
-
-    this.insertInLine = function(position, text) {
-        if (text.length == 0)
-            return position;
-
-        var line = this.$lines[position.row] || "";
-
-        this.$lines[position.row] = line.substring(0, position.column) + text
-                + line.substring(position.column);
-
-        var end = {
-            row : position.row,
-            column : position.column + text.length
-        };
-
-        var delta = {
-            action: "insertText",
-            range: Range.fromPoints(position, end),
-            text: text
-        };
-        this._emit("change", { data: delta });
-
-        return end;
-    };
-
-    this.remove = function(range) {
-        // clip to document
-        range.start = this.$clipPosition(range.start);
-        range.end = this.$clipPosition(range.end);
-
-        if (range.isEmpty())
-            return range.start;
-
-        var firstRow = range.start.row;
-        var lastRow = range.end.row;
-
-        if (range.isMultiLine()) {
-            var firstFullRow = range.start.column == 0 ? firstRow : firstRow + 1;
-            var lastFullRow = lastRow - 1;
-
-            if (range.end.column > 0)
-                this.removeInLine(lastRow, 0, range.end.column);
-
-            if (lastFullRow >= firstFullRow)
-                this.removeLines(firstFullRow, lastFullRow);
-
-            if (firstFullRow != firstRow) {
-                this.removeInLine(firstRow, range.start.column, this.getLine(firstRow).length);
-                this.removeNewLine(range.start.row);
-            }
-        }
-        else {
-            this.removeInLine(firstRow, range.start.column, range.end.column);
-        }
-        return range.start;
-    };
-
-    this.removeInLine = function(row, startColumn, endColumn) {
-        if (startColumn == endColumn)
-            return;
-
-        var range = new Range(row, startColumn, row, endColumn);
-        var line = this.getLine(row);
-        var removed = line.substring(startColumn, endColumn);
-        var newLine = line.substring(0, startColumn) + line.substring(endColumn, line.length);
-        this.$lines.splice(row, 1, newLine);
-
-        var delta = {
-            action: "removeText",
-            range: range,
-            text: removed
-        };
-        this._emit("change", { data: delta });
-        return range.start;
-    };
-
-    /**
-     * Removes a range of full lines
-     *
-     * @param firstRow {Integer} The first row to be removed
-     * @param lastRow {Integer} The last row to be removed
-     * @return {String[]} The removed lines
-     */
-    this.removeLines = function(firstRow, lastRow) {
-        var range = new Range(firstRow, 0, lastRow + 1, 0);
-        var removed = this.$lines.splice(firstRow, lastRow - firstRow + 1);
-
-        var delta = {
-            action: "removeLines",
-            range: range,
-            nl: this.getNewLineCharacter(),
-            lines: removed
-        };
-        this._emit("change", { data: delta });
-        return removed;
-    };
-
-    this.removeNewLine = function(row) {
-        var firstLine = this.getLine(row);
-        var secondLine = this.getLine(row+1);
-
-        var range = new Range(row, firstLine.length, row+1, 0);
-        var line = firstLine + secondLine;
-
-        this.$lines.splice(row, 2, line);
-
-        var delta = {
-            action: "removeText",
-            range: range,
-            text: this.getNewLineCharacter()
-        };
-        this._emit("change", { data: delta });
-    };
-
-    this.replace = function(range, text) {
-        if (text.length == 0 && range.isEmpty())
-            return range.start;
-
-        // Shortcut: If the text we want to insert is the same as it is already
-        // in the document, we don't have to replace anything.
-        if (text == this.getTextRange(range))
-            return range.end;
-
-        this.remove(range);
-        if (text) {
-            var end = this.insert(range.start, text);
-        }
-        else {
-            end = range.start;
-        }
-
-        return end;
-    };
-
-    this.applyDeltas = function(deltas) {
-        for (var i=0; i<deltas.length; i++) {
-            var delta = deltas[i];
-            var range = Range.fromPoints(delta.range.start, delta.range.end);
-
-            if (delta.action == "insertLines")
-                this.insertLines(range.start.row, delta.lines);
-            else if (delta.action == "insertText")
-                this.insert(range.start, delta.text);
-            else if (delta.action == "removeLines")
-                this.removeLines(range.start.row, range.end.row - 1);
-            else if (delta.action == "removeText")
-                this.remove(range);
-        }
-    };
-
-    this.revertDeltas = function(deltas) {
-        for (var i=deltas.length-1; i>=0; i--) {
-            var delta = deltas[i];
-
-            var range = Range.fromPoints(delta.range.start, delta.range.end);
-
-            if (delta.action == "insertLines")
-                this.removeLines(range.start.row, range.end.row - 1);
-            else if (delta.action == "insertText")
-                this.remove(range);
-            else if (delta.action == "removeLines")
-                this.insertLines(range.start.row, delta.lines);
-            else if (delta.action == "removeText")
-                this.insert(range.start, delta.text);
-        }
-    };
-
-}).call(Document.prototype);
-
-exports.Document = Document;
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/range', ['require', 'exports', 'module' ], function(require, exports, module) {
-"use strict";
-
-var Range = function(startRow, startColumn, endRow, endColumn) {
-    this.start = {
-        row: startRow,
-        column: startColumn
-    };
-
-    this.end = {
-        row: endRow,
-        column: endColumn
-    };
-};
-
-(function() {
-    this.isEqual = function(range) {
-        return this.start.row == range.start.row &&
-            this.end.row == range.end.row &&
-            this.start.column == range.start.column &&
-            this.end.column == range.end.column
-    };
-
-    this.toString = function() {
-        return ("Range: [" + this.start.row + "/" + this.start.column +
-            "] -> [" + this.end.row + "/" + this.end.column + "]");
-    };
-
-    this.contains = function(row, column) {
-        return this.compare(row, column) == 0;
-    };
-
-    /**
-     * Compares this range (A) with another range (B), where B is the passed in
-     * range.
-     *
-     * Return values:
-     *  -2: (B) is infront of (A) and doesn't intersect with (A)
-     *  -1: (B) begins before (A) but ends inside of (A)
-     *   0: (B) is completly inside of (A) OR (A) is complety inside of (B)
-     *  +1: (B) begins inside of (A) but ends outside of (A)
-     *  +2: (B) is after (A) and doesn't intersect with (A)
-     *
-     *  42: FTW state: (B) ends in (A) but starts outside of (A)
-     */
-    this.compareRange = function(range) {
-        var cmp,
-            end = range.end,
-            start = range.start;
-
-        cmp = this.compare(end.row, end.column);
-        if (cmp == 1) {
-            cmp = this.compare(start.row, start.column);
-            if (cmp == 1) {
-                return 2;
-            } else if (cmp == 0) {
-                return 1;
-            } else {
-                return 0;
-            }
-        } else if (cmp == -1) {
-            return -2;
-        } else {
-            cmp = this.compare(start.row, start.column);
-            if (cmp == -1) {
-                return -1;
-            } else if (cmp == 1) {
-                return 42;
-            } else {
-                return 0;
-            }
-        }
-    }
-
-    this.comparePoint = function(p) {
-        return this.compare(p.row, p.column);
-    }
-
-    this.containsRange = function(range) {
-        return this.comparePoint(range.start) == 0 && this.comparePoint(range.end) == 0;
-    }
-
-    this.intersectsRange = function(range) {
-        var cmp = this.compareRange(range);
-        return (cmp == -1 || cmp == 0 || cmp == 1);
-    }
-
-    this.isEnd = function(row, column) {
-        return this.end.row == row && this.end.column == column;
-    }
-
-    this.isStart = function(row, column) {
-        return this.start.row == row && this.start.column == column;
-    }
-
-    this.setStart = function(row, column) {
-        if (typeof row == "object") {
-            this.start.column = row.column;
-            this.start.row = row.row;
-        } else {
-            this.start.row = row;
-            this.start.column = column;
-        }
-    }
-
-    this.setEnd = function(row, column) {
-        if (typeof row == "object") {
-            this.end.column = row.column;
-            this.end.row = row.row;
-        } else {
-            this.end.row = row;
-            this.end.column = column;
-        }
-    }
-
-    this.inside = function(row, column) {
-        if (this.compare(row, column) == 0) {
-            if (this.isEnd(row, column) || this.isStart(row, column)) {
-                return false;
-            } else {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    this.insideStart = function(row, column) {
-        if (this.compare(row, column) == 0) {
-            if (this.isEnd(row, column)) {
-                return false;
-            } else {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    this.insideEnd = function(row, column) {
-        if (this.compare(row, column) == 0) {
-            if (this.isStart(row, column)) {
-                return false;
-            } else {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    this.compare = function(row, column) {
-        if (!this.isMultiLine()) {
-            if (row === this.start.row) {
-                return column < this.start.column ? -1 : (column > this.end.column ? 1 : 0);
-            };
-        }
-
-        if (row < this.start.row)
-            return -1;
-
-        if (row > this.end.row)
-            return 1;
-
-        if (this.start.row === row)
-            return column >= this.start.column ? 0 : -1;
-
-        if (this.end.row === row)
-            return column <= this.end.column ? 0 : 1;
-
-        return 0;
-    };
-
-    /**
-     * Like .compare(), but if isStart is true, return -1;
-     */
-    this.compareStart = function(row, column) {
-        if (this.start.row == row && this.start.column == column) {
-            return -1;
-        } else {
-            return this.compare(row, column);
-        }
-    }
-
-    /**
-     * Like .compare(), but if isEnd is true, return 1;
-     */
-    this.compareEnd = function(row, column) {
-        if (this.end.row == row && this.end.column == column) {
-            return 1;
-        } else {
-            return this.compare(row, column);
-        }
-    }
-
-    this.compareInside = function(row, column) {
-        if (this.end.row == row && this.end.column == column) {
-            return 1;
-        } else if (this.start.row == row && this.start.column == column) {
-            return -1;
-        } else {
-            return this.compare(row, column);
-        }
-    }
-
-    this.clipRows = function(firstRow, lastRow) {
-        if (this.end.row > lastRow) {
-            var end = {
-                row: lastRow+1,
-                column: 0
-            };
-        }
-
-        if (this.start.row > lastRow) {
-            var start = {
-                row: lastRow+1,
-                column: 0
-            };
-        }
-
-        if (this.start.row < firstRow) {
-            var start = {
-                row: firstRow,
-                column: 0
-            };
-        }
-
-        if (this.end.row < firstRow) {
-            var end = {
-                row: firstRow,
-                column: 0
-            };
-        }
-        return Range.fromPoints(start || this.start, end || this.end);
-    };
-
-    this.extend = function(row, column) {
-        var cmp = this.compare(row, column);
-
-        if (cmp == 0)
-            return this;
-        else if (cmp == -1)
-            var start = {row: row, column: column};
-        else
-            var end = {row: row, column: column};
-
-        return Range.fromPoints(start || this.start, end || this.end);
-    };
-
-    this.fixOrientation = function() {
-        if (
-            this.start.row < this.end.row 
-            || (this.start.row == this.end.row && this.start.column < this.end.column)
-        ) {
-            return false;
-        }
-        
-        var temp = this.start;
-        this.end = this.start;
-        this.start = temp;
-        return true;
-    };
-
-
-    this.isEmpty = function() {
-        return (this.start.row == this.end.row && this.start.column == this.end.column);
-    };
-
-    this.isMultiLine = function() {
-        return (this.start.row !== this.end.row);
-    };
-
-    this.clone = function() {
-        return Range.fromPoints(this.start, this.end);
-    };
-
-    this.collapseRows = function() {
-        if (this.end.column == 0)
-            return new Range(this.start.row, 0, Math.max(this.start.row, this.end.row-1), 0)
-        else
-            return new Range(this.start.row, 0, this.end.row, 0)
-    };
-
-    this.toScreenRange = function(session) {
-        var screenPosStart =
-            session.documentToScreenPosition(this.start);
-        var screenPosEnd =
-            session.documentToScreenPosition(this.end);
-
-        return new Range(
-            screenPosStart.row, screenPosStart.column,
-            screenPosEnd.row, screenPosEnd.column
-        );
-    };
-
-}).call(Range.prototype);
-
-
-Range.fromPoints = function(start, end) {
-    return new Range(start.row, start.column, end.row, end.column);
-};
-
-exports.Range = Range;
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/anchor', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/event_emitter'], function(require, exports, module) {
-"use strict";
-
-var oop = require("./lib/oop");
-var EventEmitter = require("./lib/event_emitter").EventEmitter;
-
-/**
- * An Anchor is a floating pointer in the document. Whenever text is inserted or
- * deleted before the cursor, the position of the cursor is updated
- */
-var Anchor = exports.Anchor = function(doc, row, column) {
-    this.document = doc;
-    
-    if (typeof column == "undefined")
-        this.setPosition(row.row, row.column);
-    else
-        this.setPosition(row, column);
-
-    this.$onChange = this.onChange.bind(this);
-    doc.on("change", this.$onChange);
-};
-
-(function() {
-
-    oop.implement(this, EventEmitter);
-    
-    this.getPosition = function() {
-        return this.$clipPositionToDocument(this.row, this.column);
-    };
-    
-    this.getDocument = function() {
-        return this.document;
-    };
-    
-    this.onChange = function(e) {
-        var delta = e.data;
-        var range = delta.range;
-            
-        if (range.start.row == range.end.row && range.start.row != this.row)
-            return;
-            
-        if (range.start.row > this.row)
-            return;
-            
-        if (range.start.row == this.row && range.start.column > this.column)
-            return;
-    
-        var row = this.row;
-        var column = this.column;
-        
-        if (delta.action === "insertText") {
-            if (range.start.row === row && range.start.column <= column) {
-                if (range.start.row === range.end.row) {
-                    column += range.end.column - range.start.column;
-                }
-                else {
-                    column -= range.start.column;
-                    row += range.end.row - range.start.row;
-                }
-            }
-            else if (range.start.row !== range.end.row && range.start.row < row) {
-                row += range.end.row - range.start.row;
-            }
-        } else if (delta.action === "insertLines") {
-            if (range.start.row <= row) {
-                row += range.end.row - range.start.row;
-            }
-        }
-        else if (delta.action == "removeText") {
-            if (range.start.row == row && range.start.column < column) {
-                if (range.end.column >= column)
-                    column = range.start.column;
-                else
-                    column = Math.max(0, column - (range.end.column - range.start.column));
-                
-            } else if (range.start.row !== range.end.row && range.start.row < row) {
-                if (range.end.row == row) {
-                    column = Math.max(0, column - range.end.column) + range.start.column;
-                }
-                row -= (range.end.row - range.start.row);
-            }
-            else if (range.end.row == row) {
-                row -= range.end.row - range.start.row;
-                column = Math.max(0, column - range.end.column) + range.start.column;
-            }
-        } else if (delta.action == "removeLines") {
-            if (range.start.row <= row) {
-                if (range.end.row <= row)
-                    row -= range.end.row - range.start.row;
-                else {
-                    row = range.start.row;
-                    column = 0;
-                }
-            }
-        }
-
-        this.setPosition(row, column, true);
-    };
-
-    this.setPosition = function(row, column, noClip) {
-        var pos;
-        if (noClip) {
-            pos = {
-                row: row,
-                column: column
-            };
-        }
-        else {
-            pos = this.$clipPositionToDocument(row, column);
-        }
-        
-        if (this.row == pos.row && this.column == pos.column)
-            return;
-            
-        var old = {
-            row: this.row,
-            column: this.column
-        };
-        
-        this.row = pos.row;
-        this.column = pos.column;
-        this._emit("change", {
-            old: old,
-            value: pos
-        });
-    };
-    
-    this.detach = function() {
-        this.document.removeEventListener("change", this.$onChange);
-    };
-    
-    this.$clipPositionToDocument = function(row, column) {
-        var pos = {};
-    
-        if (row >= this.document.getLength()) {
-            pos.row = Math.max(0, this.document.getLength() - 1);
-            pos.column = this.document.getLine(pos.row).length;
-        }
-        else if (row < 0) {
-            pos.row = 0;
-            pos.column = 0;
-        }
-        else {
-            pos.row = row;
-            pos.column = Math.min(this.document.getLine(pos.row).length, Math.max(0, column));
-        }
-        
-        if (column < 0)
-            pos.column = 0;
-            
-        return pos;
-    };
-    
-}).call(Anchor.prototype);
-
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/lib/lang', ['require', 'exports', 'module' ], function(require, exports, module) {
-"use strict";
-
-exports.stringReverse = function(string) {
-    return string.split("").reverse().join("");
-};
-
-exports.stringRepeat = function (string, count) {
-     return new Array(count + 1).join(string);
-};
-
-var trimBeginRegexp = /^\s\s*/;
-var trimEndRegexp = /\s\s*$/;
-
-exports.stringTrimLeft = function (string) {
-    return string.replace(trimBeginRegexp, '');
-};
-
-exports.stringTrimRight = function (string) {
-    return string.replace(trimEndRegexp, '');
-};
-
-exports.copyObject = function(obj) {
-    var copy = {};
-    for (var key in obj) {
-        copy[key] = obj[key];
-    }
-    return copy;
-};
-
-exports.copyArray = function(array){
-    var copy = [];
-    for (var i=0, l=array.length; i<l; i++) {
-        if (array[i] && typeof array[i] == "object")
-            copy[i] = this.copyObject( array[i] );
-        else 
-            copy[i] = array[i];
-    }
-    return copy;
-};
-
-exports.deepCopy = function (obj) {
-    if (typeof obj != "object") {
-        return obj;
-    }
-    
-    var copy = obj.constructor();
-    for (var key in obj) {
-        if (typeof obj[key] == "object") {
-            copy[key] = this.deepCopy(obj[key]);
-        } else {
-            copy[key] = obj[key];
-        }
-    }
-    return copy;
-};
-
-exports.arrayToMap = function(arr) {
-    var map = {};
-    for (var i=0; i<arr.length; i++) {
-        map[arr[i]] = 1;
-    }
-    return map;
-
-};
-
-/**
- * splice out of 'array' anything that === 'value'
- */
-exports.arrayRemove = function(array, value) {
-  for (var i = 0; i <= array.length; i++) {
-    if (value === array[i]) {
-      array.splice(i, 1);
-    }
-  }
-};
-
-exports.escapeRegExp = function(str) {
-    return str.replace(/([.*+?^${}()|[\]\/\\])/g, '\\$1');
-};
-
-exports.deferredCall = function(fcn) {
-
-    var timer = null;
-    var callback = function() {
-        timer = null;
-        fcn();
-    };
-
-    var deferred = function(timeout) {
-        deferred.cancel();
-        timer = setTimeout(callback, timeout || 0);
-        return deferred;
-    };
-
-    deferred.schedule = deferred;
-
-    deferred.call = function() {
-        this.cancel();
-        fcn();
-        return deferred;
-    };
-
-    deferred.cancel = function() {
-        clearTimeout(timer);
-        timer = null;
-        return deferred;
-    };
-
-    return deferred;
-};
-
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
- 
-define('ace/mode/coffee/coffee-script', ['require', 'exports', 'module' , 'ace/mode/coffee/lexer', 'ace/mode/coffee/parser', 'ace/mode/coffee/nodes'], function(require, exports, module) {
-    
-    var Lexer = require("./lexer").Lexer;
-    var parser = require("./parser");
-
-    var lexer = new Lexer();
-    parser.lexer = {
-        lex: function() {
-            var tag, _ref2;
-            _ref2 = this.tokens[this.pos++] || [''], tag = _ref2[0], this.yytext = _ref2[1], this.yylineno = _ref2[2];
-            return tag;
-        },
-        setInput: function(tokens) {
-            this.tokens = tokens;
-            return this.pos = 0;
-        },
-        upcomingInput: function() {
-            return "";
-        }
-    };
-    parser.yy = require('./nodes');
-    
-    exports.parse = function(code) {
-        return parser.parse(lexer.tokenize(code));
-    };
-});/**
- * Copyright (c) 2011 Jeremy Ashkenas
- * 
- * 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.
- */
-
-define('ace/mode/coffee/lexer', ['require', 'exports', 'module' , 'ace/mode/coffee/rewriter', 'ace/mode/coffee/helpers'], function(require, exports, module) {
-// Generated by CoffeeScript 1.2.1-pre
-
-  var BOOL, CALLABLE, CODE, COFFEE_ALIASES, COFFEE_ALIAS_MAP, COFFEE_KEYWORDS, COMMENT, COMPARE, COMPOUND_ASSIGN, HEREDOC, HEREDOC_ILLEGAL, HEREDOC_INDENT, HEREGEX, HEREGEX_OMIT, IDENTIFIER, INDEXABLE, INVERSES, JSTOKEN, JS_FORBIDDEN, JS_KEYWORDS, LINE_BREAK, LINE_CONTINUER, LOGIC, Lexer, MATH, MULTILINER, MULTI_DENT, NOT_REGEX, NOT_SPACED_REGEX, NUMBER, OPERATOR, REGEX, RELATION, RESERVED, Rewriter, SHIFT, SIMPLESTR, STRICT_PROSCRIBED, TRAILING_SPACES, UNARY, WHITESPACE, compact, count, key, last, starts, _ref, _ref1,
-    __indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; };
-
-  _ref = require('./rewriter'), Rewriter = _ref.Rewriter, INVERSES = _ref.INVERSES;
-
-  _ref1 = require('./helpers'), count = _ref1.count, starts = _ref1.starts, compact = _ref1.compact, last = _ref1.last;
-
-  exports.Lexer = Lexer = (function() {
-
-    Lexer.name = 'Lexer';
-
-    function Lexer() {}
-
-    Lexer.prototype.tokenize = function(code, opts) {
-      var i, tag;
-      if (opts == null) opts = {};
-      if (WHITESPACE.test(code)) code = "\n" + code;
-      code = code.replace(/\r/g, '').replace(TRAILING_SPACES, '');
-      this.code = code;
-      this.line = opts.line || 0;
-      this.indent = 0;
-      this.indebt = 0;
-      this.outdebt = 0;
-      this.indents = [];
-      this.ends = [];
-      this.tokens = [];
-      i = 0;
-      while (this.chunk = code.slice(i)) {
-        i += this.identifierToken() || this.commentToken() || this.whitespaceToken() || this.lineToken() || this.heredocToken() || this.stringToken() || this.numberToken() || this.regexToken() || this.jsToken() || this.literalToken();
-      }
-      this.closeIndentation();
-      if (tag = this.ends.pop()) this.error("missing " + tag);
-      if (opts.rewrite === false) return this.tokens;
-      return (new Rewriter).rewrite(this.tokens);
-    };
-
-    Lexer.prototype.identifierToken = function() {
-      var colon, forcedIdentifier, id, input, match, prev, tag, _ref2, _ref3;
-      if (!(match = IDENTIFIER.exec(this.chunk))) return 0;
-      input = match[0], id = match[1], colon = match[2];
-      if (id === 'own' && this.tag() === 'FOR') {
-        this.token('OWN', id);
-        return id.length;
-      }
-      forcedIdentifier = colon || (prev = last(this.tokens)) && (((_ref2 = prev[0]) === '.' || _ref2 === '?.' || _ref2 === '::') || !prev.spaced && prev[0] === '@');
-      tag = 'IDENTIFIER';
-      if (!forcedIdentifier && (__indexOf.call(JS_KEYWORDS, id) >= 0 || __indexOf.call(COFFEE_KEYWORDS, id) >= 0)) {
-        tag = id.toUpperCase();
-        if (tag === 'WHEN' && (_ref3 = this.tag(), __indexOf.call(LINE_BREAK, _ref3) >= 0)) {
-          tag = 'LEADING_WHEN';
-        } else if (tag === 'FOR') {
-          this.seenFor = true;
-        } else if (tag === 'UNLESS') {
-          tag = 'IF';
-        } else if (__indexOf.call(UNARY, tag) >= 0) {
-          tag = 'UNARY';
-        } else if (__indexOf.call(RELATION, tag) >= 0) {
-          if (tag !== 'INSTANCEOF' && this.seenFor) {
-            tag = 'FOR' + tag;
-            this.seenFor = false;
-          } else {
-            tag = 'RELATION';
-            if (this.value() === '!') {
-              this.tokens.pop();
-              id = '!' + id;
-            }
-          }
-        }
-      }
-      if (__indexOf.call(JS_FORBIDDEN, id) >= 0) {
-        if (forcedIdentifier) {
-          tag = 'IDENTIFIER';
-          id = new String(id);
-          id.reserved = true;
-        } else if (__indexOf.call(RESERVED, id) >= 0) {
-          this.error("reserved word \"" + id + "\"");
-        }
-      }
-      if (!forcedIdentifier) {
-        if (__indexOf.call(COFFEE_ALIASES, id) >= 0) id = COFFEE_ALIAS_MAP[id];
-        tag = (function() {
-          switch (id) {
-            case '!':
-              return 'UNARY';
-            case '==':
-            case '!=':
-              return 'COMPARE';
-            case '&&':
-            case '||':
-              return 'LOGIC';
-            case 'true':
-            case 'false':
-            case 'null':
-            case 'undefined':
-              return 'BOOL';
-            case 'break':
-            case 'continue':
-              return 'STATEMENT';
-            default:
-              return tag;
-          }
-        })();
-      }
-      this.token(tag, id);
-      if (colon) this.token(':', ':');
-      return input.length;
-    };
-
-    Lexer.prototype.numberToken = function() {
-      var binaryLiteral, lexedLength, match, number, octalLiteral;
-      if (!(match = NUMBER.exec(this.chunk))) return 0;
-      number = match[0];
-      if (/E/.test(number)) {
-        this.error("exponential notation '" + number + "' must be indicated with a lowercase 'e'");
-      } else if (/[BOX]/.test(number)) {
-        this.error("radix prefix '" + number + "' must be lowercase");
-      } else if (/^0[89]/.test(number)) {
-        this.error("decimal literal '" + number + "' must not be prefixed with '0'");
-      } else if (/^0[0-7]/.test(number)) {
-        this.error("octal literal '" + number + "' must be prefixed with '0o'");
-      }
-      lexedLength = number.length;
-      if (octalLiteral = /0o([0-7]+)/.exec(number)) {
-        number = (parseInt(octalLiteral[1], 8)).toString();
-      }
-      if (binaryLiteral = /0b([01]+)/.exec(number)) {
-        number = (parseInt(binaryLiteral[1], 2)).toString();
-      }
-      this.token('NUMBER', number);
-      return lexedLength;
-    };
-
-    Lexer.prototype.stringToken = function() {
-      var match, octalEsc, string;
-      switch (this.chunk.charAt(0)) {
-        case "'":
-          if (!(match = SIMPLESTR.exec(this.chunk))) return 0;
-          this.token('STRING', (string = match[0]).replace(MULTILINER, '\\\n'));
-          break;
-        case '"':
-          if (!(string = this.balancedString(this.chunk, '"'))) return 0;
-          if (0 < string.indexOf('#{', 1)) {
-            this.interpolateString(string.slice(1, -1));
-          } else {
-            this.token('STRING', this.escapeLines(string));
-          }
-          break;
-        default:
-          return 0;
-      }
-      if (octalEsc = /^(?:\\.|[^\\])*\\[0-7]/.test(string)) {
-        this.error("octal escape sequences " + string + " are not allowed");
-      }
-      this.line += count(string, '\n');
-      return string.length;
-    };
-
-    Lexer.prototype.heredocToken = function() {
-      var doc, heredoc, match, quote;
-      if (!(match = HEREDOC.exec(this.chunk))) return 0;
-      heredoc = match[0];
-      quote = heredoc.charAt(0);
-      doc = this.sanitizeHeredoc(match[2], {
-        quote: quote,
-        indent: null
-      });
-      if (quote === '"' && 0 <= doc.indexOf('#{')) {
-        this.interpolateString(doc, {
-          heredoc: true
-        });
-      } else {
-        this.token('STRING', this.makeString(doc, quote, true));
-      }
-      this.line += count(heredoc, '\n');
-      return heredoc.length;
-    };
-
-    Lexer.prototype.commentToken = function() {
-      var comment, here, match;
-      if (!(match = this.chunk.match(COMMENT))) return 0;
-      comment = match[0], here = match[1];
-      if (here) {
-        this.token('HERECOMMENT', this.sanitizeHeredoc(here, {
-          herecomment: true,
-          indent: Array(this.indent + 1).join(' ')
-        }));
-      }
-      this.line += count(comment, '\n');
-      return comment.length;
-    };
-
-    Lexer.prototype.jsToken = function() {
-      var match, script;
-      if (!(this.chunk.charAt(0) === '`' && (match = JSTOKEN.exec(this.chunk)))) {
-        return 0;
-      }
-      this.token('JS', (script = match[0]).slice(1, -1));
-      return script.length;
-    };
-
-    Lexer.prototype.regexToken = function() {
-      var flags, length, match, prev, regex, _ref2, _ref3;
-      if (this.chunk.charAt(0) !== '/') return 0;
-      if (match = HEREGEX.exec(this.chunk)) {
-        length = this.heregexToken(match);
-        this.line += count(match[0], '\n');
-        return length;
-      }
-      prev = last(this.tokens);
-      if (prev && (_ref2 = prev[0], __indexOf.call((prev.spaced ? NOT_REGEX : NOT_SPACED_REGEX), _ref2) >= 0)) {
-        return 0;
-      }
-      if (!(match = REGEX.exec(this.chunk))) return 0;
-      _ref3 = match, match = _ref3[0], regex = _ref3[1], flags = _ref3[2];
-      if (regex.slice(0, 2) === '/*') {
-        this.error('regular expressions cannot begin with `*`');
-      }
-      if (regex === '//') regex = '/(?:)/';
-      this.token('REGEX', "" + regex + flags);
-      return match.length;
-    };
-
-    Lexer.prototype.heregexToken = function(match) {
-      var body, flags, heregex, re, tag, tokens, value, _i, _len, _ref2, _ref3, _ref4, _ref5;
-      heregex = match[0], body = match[1], flags = match[2];
-      if (0 > body.indexOf('#{')) {
-        re = body.replace(HEREGEX_OMIT, '').replace(/\//g, '\\/');
-        if (re.match(/^\*/)) {
-          this.error('regular expressions cannot begin with `*`');
-        }
-        this.token('REGEX', "/" + (re || '(?:)') + "/" + flags);
-        return heregex.length;
-      }
-      this.token('IDENTIFIER', 'RegExp');
-      this.tokens.push(['CALL_START', '(']);
-      tokens = [];
-      _ref2 = this.interpolateString(body, {
-        regex: true
-      });
-      for (_i = 0, _len = _ref2.length; _i < _len; _i++) {
-        _ref3 = _ref2[_i], tag = _ref3[0], value = _ref3[1];
-        if (tag === 'TOKENS') {
-          tokens.push.apply(tokens, value);
-        } else {
-          if (!(value = value.replace(HEREGEX_OMIT, ''))) continue;
-          value = value.replace(/\\/g, '\\\\');
-          tokens.push(['STRING', this.makeString(value, '"', true)]);
-        }
-        tokens.push(['+', '+']);
-      }
-      tokens.pop();
-      if (((_ref4 = tokens[0]) != null ? _ref4[0] : void 0) !== 'STRING') {
-        this.tokens.push(['STRING', '""'], ['+', '+']);
-      }
-      (_ref5 = this.tokens).push.apply(_ref5, tokens);
-      if (flags) this.tokens.push([',', ','], ['STRING', '"' + flags + '"']);
-      this.token(')', ')');
-      return heregex.length;
-    };
-
-    Lexer.prototype.lineToken = function() {
-      var diff, indent, match, noNewlines, prev, size;
-      if (!(match = MULTI_DENT.exec(this.chunk))) return 0;
-      indent = match[0];
-      this.line += count(indent, '\n');
-      this.seenFor = false;
-      prev = last(this.tokens, 1);
-      size = indent.length - 1 - indent.lastIndexOf('\n');
-      noNewlines = this.unfinished();
-      if (size - this.indebt === this.indent) {
-        if (noNewlines) {
-          this.suppressNewlines();
-        } else {
-          this.newlineToken();
-        }
-        return indent.length;
-      }
-      if (size > this.indent) {
-        if (noNewlines) {
-          this.indebt = size - this.indent;
-          this.suppressNewlines();
-          return indent.length;
-        }
-        diff = size - this.indent + this.outdebt;
-        this.token('INDENT', diff);
-        this.indents.push(diff);
-        this.ends.push('OUTDENT');
-        this.outdebt = this.indebt = 0;
-      } else {
-        this.indebt = 0;
-        this.outdentToken(this.indent - size, noNewlines);
-      }
-      this.indent = size;
-      return indent.length;
-    };
-
-    Lexer.prototype.outdentToken = function(moveOut, noNewlines) {
-      var dent, len;
-      while (moveOut > 0) {
-        len = this.indents.length - 1;
-        if (this.indents[len] === void 0) {
-          moveOut = 0;
-        } else if (this.indents[len] === this.outdebt) {
-          moveOut -= this.outdebt;
-          this.outdebt = 0;
-        } else if (this.indents[len] < this.outdebt) {
-          this.outdebt -= this.indents[len];
-          moveOut -= this.indents[len];
-        } else {
-          dent = this.indents.pop() - this.outdebt;
-          moveOut -= dent;
-          this.outdebt = 0;
-          this.pair('OUTDENT');
-          this.token('OUTDENT', dent);
-        }
-      }
-      if (dent) this.outdebt -= moveOut;
-      while (this.value() === ';') {
-        this.tokens.pop();
-      }
-      if (!(this.tag() === 'TERMINATOR' || noNewlines)) {
-        this.token('TERMINATOR', '\n');
-      }
-      return this;
-    };
-
-    Lexer.prototype.whitespaceToken = function() {
-      var match, nline, prev;
-      if (!((match = WHITESPACE.exec(this.chunk)) || (nline = this.chunk.charAt(0) === '\n'))) {
-        return 0;
-      }
-      prev = last(this.tokens);
-      if (prev) prev[match ? 'spaced' : 'newLine'] = true;
-      if (match) {
-        return match[0].length;
-      } else {
-        return 0;
-      }
-    };
-
-    Lexer.prototype.newlineToken = function() {
-      while (this.value() === ';') {
-        this.tokens.pop();
-      }
-      if (this.tag() !== 'TERMINATOR') this.token('TERMINATOR', '\n');
-      return this;
-    };
-
-    Lexer.prototype.suppressNewlines = function() {
-      if (this.value() === '\\') this.tokens.pop();
-      return this;
-    };
-
-    Lexer.prototype.literalToken = function() {
-      var match, prev, tag, value, _ref2, _ref3, _ref4, _ref5;
-      if (match = OPERATOR.exec(this.chunk)) {
-        value = match[0];
-        if (CODE.test(value)) this.tagParameters();
-      } else {
-        value = this.chunk.charAt(0);
-      }
-      tag = value;
-      prev = last(this.tokens);
-      if (value === '=' && prev) {
-        if (!prev[1].reserved && (_ref2 = prev[1], __indexOf.call(JS_FORBIDDEN, _ref2) >= 0)) {
-          this.error("reserved word \"" + (this.value()) + "\" can't be assigned");
-        }
-        if ((_ref3 = prev[1]) === '||' || _ref3 === '&&') {
-          prev[0] = 'COMPOUND_ASSIGN';
-          prev[1] += '=';
-          return value.length;
-        }
-      }
-      if (value === ';') {
-        this.seenFor = false;
-        tag = 'TERMINATOR';
-      } else if (__indexOf.call(MATH, value) >= 0) {
-        tag = 'MATH';
-      } else if (__indexOf.call(COMPARE, value) >= 0) {
-        tag = 'COMPARE';
-      } else if (__indexOf.call(COMPOUND_ASSIGN, value) >= 0) {
-        tag = 'COMPOUND_ASSIGN';
-      } else if (__indexOf.call(UNARY, value) >= 0) {
-        tag = 'UNARY';
-      } else if (__indexOf.call(SHIFT, value) >= 0) {
-        tag = 'SHIFT';
-      } else if (__indexOf.call(LOGIC, value) >= 0 || value === '?' && (prev != null ? prev.spaced : void 0)) {
-        tag = 'LOGIC';
-      } else if (prev && !prev.spaced) {
-        if (value === '(' && (_ref4 = prev[0], __indexOf.call(CALLABLE, _ref4) >= 0)) {
-          if (prev[0] === '?') prev[0] = 'FUNC_EXIST';
-          tag = 'CALL_START';
-        } else if (value === '[' && (_ref5 = prev[0], __indexOf.call(INDEXABLE, _ref5) >= 0)) {
-          tag = 'INDEX_START';
-          switch (prev[0]) {
-            case '?':
-              prev[0] = 'INDEX_SOAK';
-          }
-        }
-      }
-      switch (value) {
-        case '(':
-        case '{':
-        case '[':
-          this.ends.push(INVERSES[value]);
-          break;
-        case ')':
-        case '}':
-        case ']':
-          this.pair(value);
-      }
-      this.token(tag, value);
-      return value.length;
-    };
-
-    Lexer.prototype.sanitizeHeredoc = function(doc, options) {
-      var attempt, herecomment, indent, match, _ref2;
-      indent = options.indent, herecomment = options.herecomment;
-      if (herecomment) {
-        if (HEREDOC_ILLEGAL.test(doc)) {
-          this.error("block comment cannot contain \"*/\", starting");
-        }
-        if (doc.indexOf('\n') <= 0) return doc;
-      } else {
-        while (match = HEREDOC_INDENT.exec(doc)) {
-          attempt = match[1];
-          if (indent === null || (0 < (_ref2 = attempt.length) && _ref2 < indent.length)) {
-            indent = attempt;
-          }
-        }
-      }
-      if (indent) doc = doc.replace(RegExp("\\n" + indent, "g"), '\n');
-      if (!herecomment) doc = doc.replace(/^\n/, '');
-      return doc;
-    };
-
-    Lexer.prototype.tagParameters = function() {
-      var i, stack, tok, tokens;
-      if (this.tag() !== ')') return this;
-      stack = [];
-      tokens = this.tokens;
-      i = tokens.length;
-      tokens[--i][0] = 'PARAM_END';
-      while (tok = tokens[--i]) {
-        switch (tok[0]) {
-          case ')':
-            stack.push(tok);
-            break;
-          case '(':
-          case 'CALL_START':
-            if (stack.length) {
-              stack.pop();
-            } else if (tok[0] === '(') {
-              tok[0] = 'PARAM_START';
-              return this;
-            } else {
-              return this;
-            }
-        }
-      }
-      return this;
-    };
-
-    Lexer.prototype.closeIndentation = function() {
-      return this.outdentToken(this.indent);
-    };
-
-    Lexer.prototype.balancedString = function(str, end) {
-      var continueCount, i, letter, match, prev, stack, _i, _ref2;
-      continueCount = 0;
-      stack = [end];
-      for (i = _i = 1, _ref2 = str.length; 1 <= _ref2 ? _i < _ref2 : _i > _ref2; i = 1 <= _ref2 ? ++_i : --_i) {
-        if (continueCount) {
-          --continueCount;
-          continue;
-        }
-        switch (letter = str.charAt(i)) {
-          case '\\':
-            ++continueCount;
-            continue;
-          case end:
-            stack.pop();
-            if (!stack.length) return str.slice(0, i + 1 || 9e9);
-            end = stack[stack.length - 1];
-            continue;
-        }
-        if (end === '}' && (letter === '"' || letter === "'")) {
-          stack.push(end = letter);
-        } else if (end === '}' && letter === '/' && (match = HEREGEX.exec(str.slice(i)) || REGEX.exec(str.slice(i)))) {
-          continueCount += match[0].length - 1;
-        } else if (end === '}' && letter === '{') {
-          stack.push(end = '}');
-        } else if (end === '"' && prev === '#' && letter === '{') {
-          stack.push(end = '}');
-        }
-        prev = letter;
-      }
-      return this.error("missing " + (stack.pop()) + ", starting");
-    };
-
-    Lexer.prototype.interpolateString = function(str, options) {
-      var expr, heredoc, i, inner, interpolated, len, letter, nested, pi, regex, tag, tokens, value, _i, _len, _ref2, _ref3, _ref4;
-      if (options == null) options = {};
-      heredoc = options.heredoc, regex = options.regex;
-      tokens = [];
-      pi = 0;
-      i = -1;
-      while (letter = str.charAt(i += 1)) {
-        if (letter === '\\') {
-          i += 1;
-          continue;
-        }
-        if (!(letter === '#' && str.charAt(i + 1) === '{' && (expr = this.balancedString(str.slice(i + 1), '}')))) {
-          continue;
-        }
-        if (pi < i) tokens.push(['NEOSTRING', str.slice(pi, i)]);
-        inner = expr.slice(1, -1);
-        if (inner.length) {
-          nested = new Lexer().tokenize(inner, {
-            line: this.line,
-            rewrite: false
-          });
-          nested.pop();
-          if (((_ref2 = nested[0]) != null ? _ref2[0] : void 0) === 'TERMINATOR') {
-            nested.shift();
-          }
-          if (len = nested.length) {
-            if (len > 1) {
-              nested.unshift(['(', '(', this.line]);
-              nested.push([')', ')', this.line]);
-            }
-            tokens.push(['TOKENS', nested]);
-          }
-        }
-        i += expr.length;
-        pi = i + 1;
-      }
-      if ((i > pi && pi < str.length)) tokens.push(['NEOSTRING', str.slice(pi)]);
-      if (regex) return tokens;
-      if (!tokens.length) return this.token('STRING', '""');
-      if (tokens[0][0] !== 'NEOSTRING') tokens.unshift(['', '']);
-      if (interpolated = tokens.length > 1) this.token('(', '(');
-      for (i = _i = 0, _len = tokens.length; _i < _len; i = ++_i) {
-        _ref3 = tokens[i], tag = _ref3[0], value = _ref3[1];
-        if (i) this.token('+', '+');
-        if (tag === 'TOKENS') {
-          (_ref4 = this.tokens).push.apply(_ref4, value);
-        } else {
-          this.token('STRING', this.makeString(value, '"', heredoc));
-        }
-      }
-      if (interpolated) this.token(')', ')');
-      return tokens;
-    };
-
-    Lexer.prototype.pair = function(tag) {
-      var size, wanted;
-      if (tag !== (wanted = last(this.ends))) {
-        if ('OUTDENT' !== wanted) this.error("unmatched " + tag);
-        this.indent -= size = last(this.indents);
-        this.outdentToken(size, true);
-        return this.pair(tag);
-      }
-      return this.ends.pop();
-    };
-
-    Lexer.prototype.token = function(tag, value) {
-      return this.tokens.push([tag, value, this.line]);
-    };
-
-    Lexer.prototype.tag = function(index, tag) {
-      var tok;
-      return (tok = last(this.tokens, index)) && (tag ? tok[0] = tag : tok[0]);
-    };
-
-    Lexer.prototype.value = function(index, val) {
-      var tok;
-      return (tok = last(this.tokens, index)) && (val ? tok[1] = val : tok[1]);
-    };
-
-    Lexer.prototype.unfinished = function() {
-      var _ref2;
-      return LINE_CONTINUER.test(this.chunk) || ((_ref2 = this.tag()) === '\\' || _ref2 === '.' || _ref2 === '?.' || _ref2 === 'UNARY' || _ref2 === 'MATH' || _ref2 === '+' || _ref2 === '-' || _ref2 === 'SHIFT' || _ref2 === 'RELATION' || _ref2 === 'COMPARE' || _ref2 === 'LOGIC' || _ref2 === 'THROW' || _ref2 === 'EXTENDS');
-    };
-
-    Lexer.prototype.escapeLines = function(str, heredoc) {
-      return str.replace(MULTILINER, heredoc ? '\\n' : '');
-    };
-
-    Lexer.prototype.makeString = function(body, quote, heredoc) {
-      if (!body) return quote + quote;
-      body = body.replace(/\\([\s\S])/g, function(match, contents) {
-        if (contents === '\n' || contents === quote) {
-          return contents;
-        } else {
-          return match;
-        }
-      });
-      body = body.replace(RegExp("" + quote, "g"), '\\$&');
-      return quote + this.escapeLines(body, heredoc) + quote;
-    };
-
-    Lexer.prototype.error = function(message) {
-      throw SyntaxError("" + message + " on line " + (this.line + 1));
-    };
-
-    return Lexer;
-
-  })();
-
-  JS_KEYWORDS = ['true', 'false', 'null', 'this', 'new', 'delete', 'typeof', 'in', 'instanceof', 'return', 'throw', 'break', 'continue', 'debugger', 'if', 'else', 'switch', 'for', 'while', 'do', 'try', 'catch', 'finally', 'class', 'extends', 'super'];
-
-  COFFEE_KEYWORDS = ['undefined', 'then', 'unless', 'until', 'loop', 'of', 'by', 'when'];
-
-  COFFEE_ALIAS_MAP = {
-    and: '&&',
-    or: '||',
-    is: '==',
-    isnt: '!=',
-    not: '!',
-    yes: 'true',
-    no: 'false',
-    on: 'true',
-    off: 'false'
-  };
-
-  COFFEE_ALIASES = (function() {
-    var _results;
-    _results = [];
-    for (key in COFFEE_ALIAS_MAP) {
-      _results.push(key);
-    }
-    return _results;
-  })();
-
-  COFFEE_KEYWORDS = COFFEE_KEYWORDS.concat(COFFEE_ALIASES);
-
-  RESERVED = ['case', 'default', 'function', 'var', 'void', 'with', 'const', 'let', 'enum', 'export', 'import', 'native', '__hasProp', '__extends', '__slice', '__bind', '__indexOf', 'implements', 'interface', 'let', 'package', 'private', 'protected', 'public', 'static', 'yield'];
-
-  STRICT_PROSCRIBED = ['arguments', 'eval'];
-
-  JS_FORBIDDEN = JS_KEYWORDS.concat(RESERVED).concat(STRICT_PROSCRIBED);
-
-  exports.RESERVED = RESERVED.concat(JS_KEYWORDS).concat(COFFEE_KEYWORDS).concat(STRICT_PROSCRIBED);
-
-  exports.STRICT_PROSCRIBED = STRICT_PROSCRIBED;
-
-  IDENTIFIER = /^([$A-Za-z_\x7f-\uffff][$\w\x7f-\uffff]*)([^\n\S]*:(?!:))?/;
-
-  NUMBER = /^0b[01]+|^0o[0-7]+|^0x[\da-f]+|^\d*\.?\d+(?:e[+-]?\d+)?/i;
-
-  HEREDOC = /^("""|''')([\s\S]*?)(?:\n[^\n\S]*)?\1/;
-
-  OPERATOR = /^(?:[-=]>|[-+*\/%<>&|^!?=]=|>>>=?|([-+:])\1|([&|<>])\2=?|\?\.|\.{2,3})/;
-
-  WHITESPACE = /^[^\n\S]+/;
-
-  COMMENT = /^###([^#][\s\S]*?)(?:###[^\n\S]*|(?:###)?$)|^(?:\s*#(?!##[^#]).*)+/;
-
-  CODE = /^[-=]>/;
-
-  MULTI_DENT = /^(?:\n[^\n\S]*)+/;
-
-  SIMPLESTR = /^'[^\\']*(?:\\.[^\\']*)*'/;
-
-  JSTOKEN = /^`[^\\`]*(?:\\.[^\\`]*)*`/;
-
-  REGEX = /^(\/(?![\s=])[^[\/\n\\]*(?:(?:\\[\s\S]|\[[^\]\n\\]*(?:\\[\s\S][^\]\n\\]*)*])[^[\/\n\\]*)*\/)([imgy]{0,4})(?!\w)/;
-
-  HEREGEX = /^\/{3}([\s\S]+?)\/{3}([imgy]{0,4})(?!\w)/;
-
-  HEREGEX_OMIT = /\s+(?:#.*)?/g;
-
-  MULTILINER = /\n/g;
-
-  HEREDOC_INDENT = /\n+([^\n\S]*)/g;
-
-  HEREDOC_ILLEGAL = /\*\//;
-
-  LINE_CONTINUER = /^\s*(?:,|\??\.(?![.\d])|::)/;
-
-  TRAILING_SPACES = /\s+$/;
-
-  COMPOUND_ASSIGN = ['-=', '+=', '/=', '*=', '%=', '||=', '&&=', '?=', '<<=', '>>=', '>>>=', '&=', '^=', '|='];
-
-  UNARY = ['!', '~', 'NEW', 'TYPEOF', 'DELETE', 'DO'];
-
-  LOGIC = ['&&', '||', '&', '|', '^'];
-
-  SHIFT = ['<<', '>>', '>>>'];
-
-  COMPARE = ['==', '!=', '<', '>', '<=', '>='];
-
-  MATH = ['*', '/', '%'];
-
-  RELATION = ['IN', 'OF', 'INSTANCEOF'];
-
-  BOOL = ['TRUE', 'FALSE', 'NULL', 'UNDEFINED'];
-
-  NOT_REGEX = ['NUMBER', 'REGEX', 'BOOL', '++', '--', ']'];
-
-  NOT_SPACED_REGEX = NOT_REGEX.concat(')', '}', 'THIS', 'IDENTIFIER', 'STRING');
-
-  CALLABLE = ['IDENTIFIER', 'STRING', 'REGEX', ')', ']', '}', '?', '::', '@', 'THIS', 'SUPER'];
-
-  INDEXABLE = CALLABLE.concat('NUMBER', 'BOOL');
-
-  LINE_BREAK = ['INDENT', 'OUTDENT', 'TERMINATOR'];
-
-
-});/**
- * Copyright (c) 2011 Jeremy Ashkenas
- * 
- * 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.
- */
-
-define('ace/mode/coffee/rewriter', ['require', 'exports', 'module' ], function(require, exports, module) {
-// Generated by CoffeeScript 1.2.1-pre
-
-  var BALANCED_PAIRS, EXPRESSION_CLOSE, EXPRESSION_END, EXPRESSION_START, IMPLICIT_BLOCK, IMPLICIT_CALL, IMPLICIT_END, IMPLICIT_FUNC, IMPLICIT_UNSPACED_CALL, INVERSES, LINEBREAKS, SINGLE_CLOSERS, SINGLE_LINERS, left, rite, _i, _len, _ref,
-    __indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; },
-    __slice = [].slice;
-
-  exports.Rewriter = (function() {
-
-    Rewriter.name = 'Rewriter';
-
-    function Rewriter() {}
-
-    Rewriter.prototype.rewrite = function(tokens) {
-      this.tokens = tokens;
-      this.removeLeadingNewlines();
-      this.removeMidExpressionNewlines();
-      this.closeOpenCalls();
-      this.closeOpenIndexes();
-      this.addImplicitIndentation();
-      this.tagPostfixConditionals();
-      this.addImplicitBraces();
-      this.addImplicitParentheses();
-      return this.tokens;
-    };
-
-    Rewriter.prototype.scanTokens = function(block) {
-      var i, token, tokens;
-      tokens = this.tokens;
-      i = 0;
-      while (token = tokens[i]) {
-        i += block.call(this, token, i, tokens);
-      }
-      return true;
-    };
-
-    Rewriter.prototype.detectEnd = function(i, condition, action) {
-      var levels, token, tokens, _ref, _ref1;
-      tokens = this.tokens;
-      levels = 0;
-      while (token = tokens[i]) {
-        if (levels === 0 && condition.call(this, token, i)) {
-          return action.call(this, token, i);
-        }
-        if (!token || levels < 0) return action.call(this, token, i - 1);
-        if (_ref = token[0], __indexOf.call(EXPRESSION_START, _ref) >= 0) {
-          levels += 1;
-        } else if (_ref1 = token[0], __indexOf.call(EXPRESSION_END, _ref1) >= 0) {
-          levels -= 1;
-        }
-        i += 1;
-      }
-      return i - 1;
-    };
-
-    Rewriter.prototype.removeLeadingNewlines = function() {
-      var i, tag, _i, _len, _ref;
-      _ref = this.tokens;
-      for (i = _i = 0, _len = _ref.length; _i < _len; i = ++_i) {
-        tag = _ref[i][0];
-        if (tag !== 'TERMINATOR') break;
-      }
-      if (i) return this.tokens.splice(0, i);
-    };
-
-    Rewriter.prototype.removeMidExpressionNewlines = function() {
-      return this.scanTokens(function(token, i, tokens) {
-        var _ref;
-        if (!(token[0] === 'TERMINATOR' && (_ref = this.tag(i + 1), __indexOf.call(EXPRESSION_CLOSE, _ref) >= 0))) {
-          return 1;
-        }
-        tokens.splice(i, 1);
-        return 0;
-      });
-    };
-
-    Rewriter.prototype.closeOpenCalls = function() {
-      var action, condition;
-      condition = function(token, i) {
-        var _ref;
-        return ((_ref = token[0]) === ')' || _ref === 'CALL_END') || token[0] === 'OUTDENT' && this.tag(i - 1) === ')';
-      };
-      action = function(token, i) {
-        return this.tokens[token[0] === 'OUTDENT' ? i - 1 : i][0] = 'CALL_END';
-      };
-      return this.scanTokens(function(token, i) {
-        if (token[0] === 'CALL_START') this.detectEnd(i + 1, condition, action);
-        return 1;
-      });
-    };
-
-    Rewriter.prototype.closeOpenIndexes = function() {
-      var action, condition;
-      condition = function(token, i) {
-        var _ref;
-        return (_ref = token[0]) === ']' || _ref === 'INDEX_END';
-      };
-      action = function(token, i) {
-        return token[0] = 'INDEX_END';
-      };
-      return this.scanTokens(function(token, i) {
-        if (token[0] === 'INDEX_START') this.detectEnd(i + 1, condition, action);
-        return 1;
-      });
-    };
-
-    Rewriter.prototype.addImplicitBraces = function() {
-      var action, condition, sameLine, stack, start, startIndent, startsLine;
-      stack = [];
-      start = null;
-      startsLine = null;
-      sameLine = true;
-      startIndent = 0;
-      condition = function(token, i) {
-        var one, tag, three, two, _ref, _ref1;
-        _ref = this.tokens.slice(i + 1, (i + 3) + 1 || 9e9), one = _ref[0], two = _ref[1], three = _ref[2];
-        if ('HERECOMMENT' === (one != null ? one[0] : void 0)) return false;
-        tag = token[0];
-        if (__indexOf.call(LINEBREAKS, tag) >= 0) sameLine = false;
-        return (((tag === 'TERMINATOR' || tag === 'OUTDENT') || (__indexOf.call(IMPLICIT_END, tag) >= 0 && sameLine)) && ((!startsLine && this.tag(i - 1) !== ',') || !((two != null ? two[0] : void 0) === ':' || (one != null ? one[0] : void 0) === '@' && (three != null ? three[0] : void 0) === ':'))) || (tag === ',' && one && ((_ref1 = one[0]) !== 'IDENTIFIER' && _ref1 !== 'NUMBER' && _ref1 !== 'STRING' && _ref1 !== '@' && _ref1 !== 'TERMINATOR' && _ref1 !== 'OUTDENT'));
-      };
-      action = function(token, i) {
-        var tok;
-        tok = this.generate('}', '}', token[2]);
-        return this.tokens.splice(i, 0, tok);
-      };
-      return this.scanTokens(function(token, i, tokens) {
-        var ago, idx, prevTag, tag, tok, value, _ref, _ref1;
-        if (_ref = (tag = token[0]), __indexOf.call(EXPRESSION_START, _ref) >= 0) {
-          stack.push([(tag === 'INDENT' && this.tag(i - 1) === '{' ? '{' : tag), i]);
-          return 1;
-        }
-        if (__indexOf.call(EXPRESSION_END, tag) >= 0) {
-          start = stack.pop();
-          return 1;
-        }
-        if (!(tag === ':' && ((ago = this.tag(i - 2)) === ':' || ((_ref1 = stack[stack.length - 1]) != null ? _ref1[0] : void 0) !== '{'))) {
-          return 1;
-        }
-        sameLine = true;
-        stack.push(['{']);
-        idx = ago === '@' ? i - 2 : i - 1;
-        while (this.tag(idx - 2) === 'HERECOMMENT') {
-          idx -= 2;
-        }
-        prevTag = this.tag(idx - 1);
-        startsLine = !prevTag || (__indexOf.call(LINEBREAKS, prevTag) >= 0);
-        value = new String('{');
-        value.generated = true;
-        tok = this.generate('{', value, token[2]);
-        tokens.splice(idx, 0, tok);
-        this.detectEnd(i + 2, condition, action);
-        return 2;
-      });
-    };
-
-    Rewriter.prototype.addImplicitParentheses = function() {
-      var action, condition, noCall, seenControl, seenSingle;
-      noCall = seenSingle = seenControl = false;
-      condition = function(token, i) {
-        var post, tag, _ref, _ref1;
-        tag = token[0];
-        if (!seenSingle && token.fromThen) return true;
-        if (tag === 'IF' || tag === 'ELSE' || tag === 'CATCH' || tag === '->' || tag === '=>' || tag === 'CLASS') {
-          seenSingle = true;
-        }
-        if (tag === 'IF' || tag === 'ELSE' || tag === 'SWITCH' || tag === 'TRY' || tag === '=') {
-          seenControl = true;
-        }
-        if ((tag === '.' || tag === '?.' || tag === '::') && this.tag(i - 1) === 'OUTDENT') {
-          return true;
-        }
-        return !token.generated && this.tag(i - 1) !== ',' && (__indexOf.call(IMPLICIT_END, tag) >= 0 || (tag === 'INDENT' && !seenControl)) && (tag !== 'INDENT' || (((_ref = this.tag(i - 2)) !== 'CLASS' && _ref !== 'EXTENDS') && (_ref1 = this.tag(i - 1), __indexOf.call(IMPLICIT_BLOCK, _ref1) < 0) && !((post = this.tokens[i + 1]) && post.generated && post[0] === '{')));
-      };
-      action = function(token, i) {
-        return this.tokens.splice(i, 0, this.generate('CALL_END', ')', token[2]));
-      };
-      return this.scanTokens(function(token, i, tokens) {
-        var callObject, current, next, prev, tag, _ref, _ref1, _ref2;
-        tag = token[0];
-        if (tag === 'CLASS' || tag === 'IF' || tag === 'FOR' || tag === 'WHILE') {
-          noCall = true;
-        }
-        _ref = tokens.slice(i - 1, (i + 1) + 1 || 9e9), prev = _ref[0], current = _ref[1], next = _ref[2];
-        callObject = !noCall && tag === 'INDENT' && next && next.generated && next[0] === '{' && prev && (_ref1 = prev[0], __indexOf.call(IMPLICIT_FUNC, _ref1) >= 0);
-        seenSingle = false;
-        seenControl = false;
-        if (__indexOf.call(LINEBREAKS, tag) >= 0) noCall = false;
-        if (prev && !prev.spaced && tag === '?') token.call = true;
-        if (token.fromThen) return 1;
-        if (!(callObject || (prev != null ? prev.spaced : void 0) && (prev.call || (_ref2 = prev[0], __indexOf.call(IMPLICIT_FUNC, _ref2) >= 0)) && (__indexOf.call(IMPLICIT_CALL, tag) >= 0 || !(token.spaced || token.newLine) && __indexOf.call(IMPLICIT_UNSPACED_CALL, tag) >= 0))) {
-          return 1;
-        }
-        tokens.splice(i, 0, this.generate('CALL_START', '(', token[2]));
-        this.detectEnd(i + 1, condition, action);
-        if (prev[0] === '?') prev[0] = 'FUNC_EXIST';
-        return 2;
-      });
-    };
-
-    Rewriter.prototype.addImplicitIndentation = function() {
-      var action, condition, indent, outdent, starter;
-      starter = indent = outdent = null;
-      condition = function(token, i) {
-        var _ref;
-        return token[1] !== ';' && (_ref = token[0], __indexOf.call(SINGLE_CLOSERS, _ref) >= 0) && !(token[0] === 'ELSE' && (starter !== 'IF' && starter !== 'THEN'));
-      };
-      action = function(token, i) {
-        return this.tokens.splice((this.tag(i - 1) === ',' ? i - 1 : i), 0, outdent);
-      };
-      return this.scanTokens(function(token, i, tokens) {
-        var tag, _ref, _ref1;
-        tag = token[0];
-        if (tag === 'TERMINATOR' && this.tag(i + 1) === 'THEN') {
-          tokens.splice(i, 1);
-          return 0;
-        }
-        if (tag === 'ELSE' && this.tag(i - 1) !== 'OUTDENT') {
-          tokens.splice.apply(tokens, [i, 0].concat(__slice.call(this.indentation(token))));
-          return 2;
-        }
-        if (tag === 'CATCH' && ((_ref = this.tag(i + 2)) === 'OUTDENT' || _ref === 'TERMINATOR' || _ref === 'FINALLY')) {
-          tokens.splice.apply(tokens, [i + 2, 0].concat(__slice.call(this.indentation(token))));
-          return 4;
-        }
-        if (__indexOf.call(SINGLE_LINERS, tag) >= 0 && this.tag(i + 1) !== 'INDENT' && !(tag === 'ELSE' && this.tag(i + 1) === 'IF')) {
-          starter = tag;
-          _ref1 = this.indentation(token, true), indent = _ref1[0], outdent = _ref1[1];
-          if (starter === 'THEN') indent.fromThen = true;
-          tokens.splice(i + 1, 0, indent);
-          this.detectEnd(i + 2, condition, action);
-          if (tag === 'THEN') tokens.splice(i, 1);
-          return 1;
-        }
-        return 1;
-      });
-    };
-
-    Rewriter.prototype.tagPostfixConditionals = function() {
-      var action, condition, original;
-      original = null;
-      condition = function(token, i) {
-        var _ref;
-        return (_ref = token[0]) === 'TERMINATOR' || _ref === 'INDENT';
-      };
-      action = function(token, i) {
-        if (token[0] !== 'INDENT' || (token.generated && !token.fromThen)) {
-          return original[0] = 'POST_' + original[0];
-        }
-      };
-      return this.scanTokens(function(token, i) {
-        if (token[0] !== 'IF') return 1;
-        original = token;
-        this.detectEnd(i + 1, condition, action);
-        return 1;
-      });
-    };
-
-    Rewriter.prototype.indentation = function(token, implicit) {
-      var indent, outdent;
-      if (implicit == null) implicit = false;
-      indent = ['INDENT', 2, token[2]];
-      outdent = ['OUTDENT', 2, token[2]];
-      if (implicit) indent.generated = outdent.generated = true;
-      return [indent, outdent];
-    };
-
-    Rewriter.prototype.generate = function(tag, value, line) {
-      var tok;
-      tok = [tag, value, line];
-      tok.generated = true;
-      return tok;
-    };
-
-    Rewriter.prototype.tag = function(i) {
-      var _ref;
-      return (_ref = this.tokens[i]) != null ? _ref[0] : void 0;
-    };
-
-    return Rewriter;
-
-  })();
-
-  BALANCED_PAIRS = [['(', ')'], ['[', ']'], ['{', '}'], ['INDENT', 'OUTDENT'], ['CALL_START', 'CALL_END'], ['PARAM_START', 'PARAM_END'], ['INDEX_START', 'INDEX_END']];
-
-  exports.INVERSES = INVERSES = {};
-
-  EXPRESSION_START = [];
-
-  EXPRESSION_END = [];
-
-  for (_i = 0, _len = BALANCED_PAIRS.length; _i < _len; _i++) {
-    _ref = BALANCED_PAIRS[_i], left = _ref[0], rite = _ref[1];
-    EXPRESSION_START.push(INVERSES[rite] = left);
-    EXPRESSION_END.push(INVERSES[left] = rite);
-  }
-
-  EXPRESSION_CLOSE = ['CATCH', 'WHEN', 'ELSE', 'FINALLY'].concat(EXPRESSION_END);
-
-  IMPLICIT_FUNC = ['IDENTIFIER', 'SUPER', ')', 'CALL_END', ']', 'INDEX_END', '@', 'THIS'];
-
-  IMPLICIT_CALL = ['IDENTIFIER', 'NUMBER', 'STRING', 'JS', 'REGEX', 'NEW', 'PARAM_START', 'CLASS', 'IF', 'TRY', 'SWITCH', 'THIS', 'BOOL', 'UNARY', 'SUPER', '@', '->', '=>', '[', '(', '{', '--', '++'];
-
-  IMPLICIT_UNSPACED_CALL = ['+', '-'];
-
-  IMPLICIT_BLOCK = ['->', '=>', '{', '[', ','];
-
-  IMPLICIT_END = ['POST_IF', 'FOR', 'WHILE', 'UNTIL', 'WHEN', 'BY', 'LOOP', 'TERMINATOR'];
-
-  SINGLE_LINERS = ['ELSE', '->', '=>', 'TRY', 'FINALLY', 'THEN'];
-
-  SINGLE_CLOSERS = ['TERMINATOR', 'CATCH', 'FINALLY', 'ELSE', 'OUTDENT', 'LEADING_WHEN'];
-
-  LINEBREAKS = ['TERMINATOR', 'INDENT', 'OUTDENT'];
-
-
-});/**
- * Copyright (c) 2011 Jeremy Ashkenas
- * 
- * 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.
- */
-
-define('ace/mode/coffee/helpers', ['require', 'exports', 'module' ], function(require, exports, module) {
-// Generated by CoffeeScript 1.2.1-pre
-
-  var extend, flatten;
-
-  exports.starts = function(string, literal, start) {
-    return literal === string.substr(start, literal.length);
-  };
-
-  exports.ends = function(string, literal, back) {
-    var len;
-    len = literal.length;
-    return literal === string.substr(string.length - len - (back || 0), len);
-  };
-
-  exports.compact = function(array) {
-    var item, _i, _len, _results;
-    _results = [];
-    for (_i = 0, _len = array.length; _i < _len; _i++) {
-      item = array[_i];
-      if (item) _results.push(item);
-    }
-    return _results;
-  };
-
-  exports.count = function(string, substr) {
-    var num, pos;
-    num = pos = 0;
-    if (!substr.length) return 1 / 0;
-    while (pos = 1 + string.indexOf(substr, pos)) {
-      num++;
-    }
-    return num;
-  };
-
-  exports.merge = function(options, overrides) {
-    return extend(extend({}, options), overrides);
-  };
-
-  extend = exports.extend = function(object, properties) {
-    var key, val;
-    for (key in properties) {
-      val = properties[key];
-      object[key] = val;
-    }
-    return object;
-  };
-
-  exports.flatten = flatten = function(array) {
-    var element, flattened, _i, _len;
-    flattened = [];
-    for (_i = 0, _len = array.length; _i < _len; _i++) {
-      element = array[_i];
-      if (element instanceof Array) {
-        flattened = flattened.concat(flatten(element));
-      } else {
-        flattened.push(element);
-      }
-    }
-    return flattened;
-  };
-
-  exports.del = function(obj, key) {
-    var val;
-    val = obj[key];
-    delete obj[key];
-    return val;
-  };
-
-  exports.last = function(array, back) {
-    return array[array.length - (back || 0) - 1];
-  };
-
-
-});/**
- * Copyright (c) 2011 Jeremy Ashkenas
- * 
- * 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.
- */
-
-define('ace/mode/coffee/parser', ['require', 'exports', 'module' ], function(require, exports, module) {
-/* Jison generated parser */
-
-undefined
-var parser = {trace: function trace() { },
-yy: {},
-symbols_: {"error":2,"Root":3,"Body":4,"Block":5,"TERMINATOR":6,"Line":7,"Expression":8,"Statement":9,"Return":10,"Comment":11,"STATEMENT":12,"Value":13,"Invocation":14,"Code":15,"Operation":16,"Assign":17,"If":18,"Try":19,"While":20,"For":21,"Switch":22,"Class":23,"Throw":24,"INDENT":25,"OUTDENT":26,"Identifier":27,"IDENTIFIER":28,"AlphaNumeric":29,"NUMBER":30,"STRING":31,"Literal":32,"JS":33,"REGEX":34,"DEBUGGER":35,"BOOL":36,"Assignable":37,"=":38,"AssignObj":39,"ObjAssignable":40,":":41,"ThisProperty":42,"RETURN":43,"HERECOMMENT":44,"PARAM_START":45,"ParamList":46,"PARAM_END":47,"FuncGlyph":48,"->":49,"=>":50,"OptComma":51,",":52,"Param":53,"ParamVar":54,"...":55,"Array":56,"Object":57,"Splat":58,"SimpleAssignable":59,"Accessor":60,"Parenthetical":61,"Range":62,"This":63,".":64,"?.":65,"::":66,"Index":67,"INDEX_START":68,"IndexValue":69,"INDEX_END":70,"INDEX_SOAK":71,"Slice":72,"{":73,"AssignList":74,"}":75,"CLASS":76,"EXTENDS":77,"OptFuncExist":78,"Arguments":79,"SUPER":80,"FUNC_EXIST":81,"CALL_START":82,"CALL_END":83,"ArgList":84,"THIS":85,"@":86,"[":87,"]":88,"RangeDots":89,"..":90,"Arg":91,"SimpleArgs":92,"TRY":93,"Catch":94,"FINALLY":95,"CATCH":96,"THROW":97,"(":98,")":99,"WhileSource":100,"WHILE":101,"WHEN":102,"UNTIL":103,"Loop":104,"LOOP":105,"ForBody":106,"FOR":107,"ForStart":108,"ForSource":109,"ForVariables":110,"OWN":111,"ForValue":112,"FORIN":113,"FOROF":114,"BY":115,"SWITCH":116,"Whens":117,"ELSE":118,"When":119,"LEADING_WHEN":120,"IfBlock":121,"IF":122,"POST_IF":123,"UNARY":124,"-":125,"+":126,"--":127,"++":128,"?":129,"MATH":130,"SHIFT":131,"COMPARE":132,"LOGIC":133,"RELATION":134,"COMPOUND_ASSIGN":135,"$accept":0,"$end":1},
-terminals_: {2:"error",6:"TERMINATOR",12:"STATEMENT",25:"INDENT",26:"OUTDENT",28:"IDENTIFIER",30:"NUMBER",31:"STRING",33:"JS",34:"REGEX",35:"DEBUGGER",36:"BOOL",38:"=",41:":",43:"RETURN",44:"HERECOMMENT",45:"PARAM_START",47:"PARAM_END",49:"->",50:"=>",52:",",55:"...",64:".",65:"?.",66:"::",68:"INDEX_START",70:"INDEX_END",71:"INDEX_SOAK",73:"{",75:"}",76:"CLASS",77:"EXTENDS",80:"SUPER",81:"FUNC_EXIST",82:"CALL_START",83:"CALL_END",85:"THIS",86:"@",87:"[",88:"]",90:"..",93:"TRY",95:"FINALLY",96:"CATCH",97:"THROW",98:"(",99:")",101:"WHILE",102:"WHEN",103:"UNTIL",105:"LOOP",107:"FOR",111:"OWN",113:"FORIN",114:"FOROF",115:"BY",116:"SWITCH",118:"ELSE",120:"LEADING_WHEN",122:"IF",123:"POST_IF",124:"UNARY",125:"-",126:"+",127:"--",128:"++",129:"?",130:"MATH",131:"SHIFT",132:"COMPARE",133:"LOGIC",134:"RELATION",135:"COMPOUND_ASSIGN"},
-productions_: [0,[3,0],[3,1],[3,2],[4,1],[4,3],[4,2],[7,1],[7,1],[9,1],[9,1],[9,1],[8,1],[8,1],[8,1],[8,1],[8,1],[8,1],[8,1],[8,1],[8,1],[8,1],[8,1],[8,1],[5,2],[5,3],[27,1],[29,1],[29,1],[32,1],[32,1],[32,1],[32,1],[32,1],[17,3],[17,4],[17,5],[39,1],[39,3],[39,5],[39,1],[40,1],[40,1],[40,1],[10,2],[10,1],[11,1],[15,5],[15,2],[48,1],[48,1],[51,0],[51,1],[46,0],[46,1],[46,3],[53,1],[53,2],[53,3],[54,1],[54,1],[54,1],[54,1],[58,2],[59,1],[59,2],[59,2],[59,1],[37,1],[37,1],[37,1],[13,1],[13,1],[13,1],[13,1],[13,1],[60,2],[60,2],[60,2],[60,1],[60,1],[67,3],[67,2],[69,1],[69,1],[57,4],[74,0],[74,1],[74,3],[74,4],[74,6],[23,1],[23,2],[23,3],[23,4],[23,2],[23,3],[23,4],[23,5],[14,3],[14,3],[14,1],[14,2],[78,0],[78,1],[79,2],[79,4],[63,1],[63,1],[42,2],[56,2],[56,4],[89,1],[89,1],[62,5],[72,3],[72,2],[72,2],[72,1],[84,1],[84,3],[84,4],[84,4],[84,6],[91,1],[91,1],[92,1],[92,3],[19,2],[19,3],[19,4],[19,5],[94,3],[24,2],[61,3],[61,5],[100,2],[100,4],[100,2],[100,4],[20,2],[20,2],[20,2],[20,1],[104,2],[104,2],[21,2],[21,2],[21,2],[106,2],[106,2],[108,2],[108,3],[112,1],[112,1],[112,1],[110,1],[110,3],[109,2],[109,2],[109,4],[109,4],[109,4],[109,6],[109,6],[22,5],[22,7],[22,4],[22,6],[117,1],[117,2],[119,3],[119,4],[121,3],[121,5],[18,1],[18,3],[18,3],[18,3],[16,2],[16,2],[16,2],[16,2],[16,2],[16,2],[16,2],[16,2],[16,3],[16,3],[16,3],[16,3],[16,3],[16,3],[16,3],[16,3],[16,5],[16,3]],
-performAction: function anonymous(yytext,yyleng,yylineno,yy,yystate,$$,_$) {
-
-var $0 = $$.length - 1;
-switch (yystate) {
-case 1:return this.$ = new yy.Block;
-break;
-case 2:return this.$ = $$[$0];
-break;
-case 3:return this.$ = $$[$0-1];
-break;
-case 4:this.$ = yy.Block.wrap([$$[$0]]);
-break;
-case 5:this.$ = $$[$0-2].push($$[$0]);
-break;
-case 6:this.$ = $$[$0-1];
-break;
-case 7:this.$ = $$[$0];
-break;
-case 8:this.$ = $$[$0];
-break;
-case 9:this.$ = $$[$0];
-break;
-case 10:this.$ = $$[$0];
-break;
-case 11:this.$ = new yy.Literal($$[$0]);
-break;
-case 12:this.$ = $$[$0];
-break;
-case 13:this.$ = $$[$0];
-break;
-case 14:this.$ = $$[$0];
-break;
-case 15:this.$ = $$[$0];
-break;
-case 16:this.$ = $$[$0];
-break;
-case 17:this.$ = $$[$0];
-break;
-case 18:this.$ = $$[$0];
-break;
-case 19:this.$ = $$[$0];
-break;
-case 20:this.$ = $$[$0];
-break;
-case 21:this.$ = $$[$0];
-break;
-case 22:this.$ = $$[$0];
-break;
-case 23:this.$ = $$[$0];
-break;
-case 24:this.$ = new yy.Block;
-break;
-case 25:this.$ = $$[$0-1];
-break;
-case 26:this.$ = new yy.Literal($$[$0]);
-break;
-case 27:this.$ = new yy.Literal($$[$0]);
-break;
-case 28:this.$ = new yy.Literal($$[$0]);
-break;
-case 29:this.$ = $$[$0];
-break;
-case 30:this.$ = new yy.Literal($$[$0]);
-break;
-case 31:this.$ = new yy.Literal($$[$0]);
-break;
-case 32:this.$ = new yy.Literal($$[$0]);
-break;
-case 33:this.$ = (function () {
-        var val;
-        val = new yy.Literal($$[$0]);
-        if ($$[$0] === 'undefined') val.isUndefined = true;
-        return val;
-      }());
-break;
-case 34:this.$ = new yy.Assign($$[$0-2], $$[$0]);
-break;
-case 35:this.$ = new yy.Assign($$[$0-3], $$[$0]);
-break;
-case 36:this.$ = new yy.Assign($$[$0-4], $$[$0-1]);
-break;
-case 37:this.$ = new yy.Value($$[$0]);
-break;
-case 38:this.$ = new yy.Assign(new yy.Value($$[$0-2]), $$[$0], 'object');
-break;
-case 39:this.$ = new yy.Assign(new yy.Value($$[$0-4]), $$[$0-1], 'object');
-break;
-case 40:this.$ = $$[$0];
-break;
-case 41:this.$ = $$[$0];
-break;
-case 42:this.$ = $$[$0];
-break;
-case 43:this.$ = $$[$0];
-break;
-case 44:this.$ = new yy.Return($$[$0]);
-break;
-case 45:this.$ = new yy.Return;
-break;
-case 46:this.$ = new yy.Comment($$[$0]);
-break;
-case 47:this.$ = new yy.Code($$[$0-3], $$[$0], $$[$0-1]);
-break;
-case 48:this.$ = new yy.Code([], $$[$0], $$[$0-1]);
-break;
-case 49:this.$ = 'func';
-break;
-case 50:this.$ = 'boundfunc';
-break;
-case 51:this.$ = $$[$0];
-break;
-case 52:this.$ = $$[$0];
-break;
-case 53:this.$ = [];
-break;
-case 54:this.$ = [$$[$0]];
-break;
-case 55:this.$ = $$[$0-2].concat($$[$0]);
-break;
-case 56:this.$ = new yy.Param($$[$0]);
-break;
-case 57:this.$ = new yy.Param($$[$0-1], null, true);
-break;
-case 58:this.$ = new yy.Param($$[$0-2], $$[$0]);
-break;
-case 59:this.$ = $$[$0];
-break;
-case 60:this.$ = $$[$0];
-break;
-case 61:this.$ = $$[$0];
-break;
-case 62:this.$ = $$[$0];
-break;
-case 63:this.$ = new yy.Splat($$[$0-1]);
-break;
-case 64:this.$ = new yy.Value($$[$0]);
-break;
-case 65:this.$ = $$[$0-1].add($$[$0]);
-break;
-case 66:this.$ = new yy.Value($$[$0-1], [].concat($$[$0]));
-break;
-case 67:this.$ = $$[$0];
-break;
-case 68:this.$ = $$[$0];
-break;
-case 69:this.$ = new yy.Value($$[$0]);
-break;
-case 70:this.$ = new yy.Value($$[$0]);
-break;
-case 71:this.$ = $$[$0];
-break;
-case 72:this.$ = new yy.Value($$[$0]);
-break;
-case 73:this.$ = new yy.Value($$[$0]);
-break;
-case 74:this.$ = new yy.Value($$[$0]);
-break;
-case 75:this.$ = $$[$0];
-break;
-case 76:this.$ = new yy.Access($$[$0]);
-break;
-case 77:this.$ = new yy.Access($$[$0], 'soak');
-break;
-case 78:this.$ = [new yy.Access(new yy.Literal('prototype')), new yy.Access($$[$0])];
-break;
-case 79:this.$ = new yy.Access(new yy.Literal('prototype'));
-break;
-case 80:this.$ = $$[$0];
-break;
-case 81:this.$ = $$[$0-1];
-break;
-case 82:this.$ = yy.extend($$[$0], {
-          soak: true
-        });
-break;
-case 83:this.$ = new yy.Index($$[$0]);
-break;
-case 84:this.$ = new yy.Slice($$[$0]);
-break;
-case 85:this.$ = new yy.Obj($$[$0-2], $$[$0-3].generated);
-break;
-case 86:this.$ = [];
-break;
-case 87:this.$ = [$$[$0]];
-break;
-case 88:this.$ = $$[$0-2].concat($$[$0]);
-break;
-case 89:this.$ = $$[$0-3].concat($$[$0]);
-break;
-case 90:this.$ = $$[$0-5].concat($$[$0-2]);
-break;
-case 91:this.$ = new yy.Class;
-break;
-case 92:this.$ = new yy.Class(null, null, $$[$0]);
-break;
-case 93:this.$ = new yy.Class(null, $$[$0]);
-break;
-case 94:this.$ = new yy.Class(null, $$[$0-1], $$[$0]);
-break;
-case 95:this.$ = new yy.Class($$[$0]);
-break;
-case 96:this.$ = new yy.Class($$[$0-1], null, $$[$0]);
-break;
-case 97:this.$ = new yy.Class($$[$0-2], $$[$0]);
-break;
-case 98:this.$ = new yy.Class($$[$0-3], $$[$0-1], $$[$0]);
-break;
-case 99:this.$ = new yy.Call($$[$0-2], $$[$0], $$[$0-1]);
-break;
-case 100:this.$ = new yy.Call($$[$0-2], $$[$0], $$[$0-1]);
-break;
-case 101:this.$ = new yy.Call('super', [new yy.Splat(new yy.Literal('arguments'))]);
-break;
-case 102:this.$ = new yy.Call('super', $$[$0]);
-break;
-case 103:this.$ = false;
-break;
-case 104:this.$ = true;
-break;
-case 105:this.$ = [];
-break;
-case 106:this.$ = $$[$0-2];
-break;
-case 107:this.$ = new yy.Value(new yy.Literal('this'));
-break;
-case 108:this.$ = new yy.Value(new yy.Literal('this'));
-break;
-case 109:this.$ = new yy.Value(new yy.Literal('this'), [new yy.Access($$[$0])], 'this');
-break;
-case 110:this.$ = new yy.Arr([]);
-break;
-case 111:this.$ = new yy.Arr($$[$0-2]);
-break;
-case 112:this.$ = 'inclusive';
-break;
-case 113:this.$ = 'exclusive';
-break;
-case 114:this.$ = new yy.Range($$[$0-3], $$[$0-1], $$[$0-2]);
-break;
-case 115:this.$ = new yy.Range($$[$0-2], $$[$0], $$[$0-1]);
-break;
-case 116:this.$ = new yy.Range($$[$0-1], null, $$[$0]);
-break;
-case 117:this.$ = new yy.Range(null, $$[$0], $$[$0-1]);
-break;
-case 118:this.$ = new yy.Range(null, null, $$[$0]);
-break;
-case 119:this.$ = [$$[$0]];
-break;
-case 120:this.$ = $$[$0-2].concat($$[$0]);
-break;
-case 121:this.$ = $$[$0-3].concat($$[$0]);
-break;
-case 122:this.$ = $$[$0-2];
-break;
-case 123:this.$ = $$[$0-5].concat($$[$0-2]);
-break;
-case 124:this.$ = $$[$0];
-break;
-case 125:this.$ = $$[$0];
-break;
-case 126:this.$ = $$[$0];
-break;
-case 127:this.$ = [].concat($$[$0-2], $$[$0]);
-break;
-case 128:this.$ = new yy.Try($$[$0]);
-break;
-case 129:this.$ = new yy.Try($$[$0-1], $$[$0][0], $$[$0][1]);
-break;
-case 130:this.$ = new yy.Try($$[$0-2], null, null, $$[$0]);
-break;
-case 131:this.$ = new yy.Try($$[$0-3], $$[$0-2][0], $$[$0-2][1], $$[$0]);
-break;
-case 132:this.$ = [$$[$0-1], $$[$0]];
-break;
-case 133:this.$ = new yy.Throw($$[$0]);
-break;
-case 134:this.$ = new yy.Parens($$[$0-1]);
-break;
-case 135:this.$ = new yy.Parens($$[$0-2]);
-break;
-case 136:this.$ = new yy.While($$[$0]);
-break;
-case 137:this.$ = new yy.While($$[$0-2], {
-          guard: $$[$0]
-        });
-break;
-case 138:this.$ = new yy.While($$[$0], {
-          invert: true
-        });
-break;
-case 139:this.$ = new yy.While($$[$0-2], {
-          invert: true,
-          guard: $$[$0]
-        });
-break;
-case 140:this.$ = $$[$0-1].addBody($$[$0]);
-break;
-case 141:this.$ = $$[$0].addBody(yy.Block.wrap([$$[$0-1]]));
-break;
-case 142:this.$ = $$[$0].addBody(yy.Block.wrap([$$[$0-1]]));
-break;
-case 143:this.$ = $$[$0];
-break;
-case 144:this.$ = new yy.While(new yy.Literal('true')).addBody($$[$0]);
-break;
-case 145:this.$ = new yy.While(new yy.Literal('true')).addBody(yy.Block.wrap([$$[$0]]));
-break;
-case 146:this.$ = new yy.For($$[$0-1], $$[$0]);
-break;
-case 147:this.$ = new yy.For($$[$0-1], $$[$0]);
-break;
-case 148:this.$ = new yy.For($$[$0], $$[$0-1]);
-break;
-case 149:this.$ = {
-          source: new yy.Value($$[$0])
-        };
-break;
-case 150:this.$ = (function () {
-        $$[$0].own = $$[$0-1].own;
-        $$[$0].name = $$[$0-1][0];
-        $$[$0].index = $$[$0-1][1];
-        return $$[$0];
-      }());
-break;
-case 151:this.$ = $$[$0];
-break;
-case 152:this.$ = (function () {
-        $$[$0].own = true;
-        return $$[$0];
-      }());
-break;
-case 153:this.$ = $$[$0];
-break;
-case 154:this.$ = new yy.Value($$[$0]);
-break;
-case 155:this.$ = new yy.Value($$[$0]);
-break;
-case 156:this.$ = [$$[$0]];
-break;
-case 157:this.$ = [$$[$0-2], $$[$0]];
-break;
-case 158:this.$ = {
-          source: $$[$0]
-        };
-break;
-case 159:this.$ = {
-          source: $$[$0],
-          object: true
-        };
-break;
-case 160:this.$ = {
-          source: $$[$0-2],
-          guard: $$[$0]
-        };
-break;
-case 161:this.$ = {
-          source: $$[$0-2],
-          guard: $$[$0],
-          object: true
-        };
-break;
-case 162:this.$ = {
-          source: $$[$0-2],
-          step: $$[$0]
-        };
-break;
-case 163:this.$ = {
-          source: $$[$0-4],
-          guard: $$[$0-2],
-          step: $$[$0]
-        };
-break;
-case 164:this.$ = {
-          source: $$[$0-4],
-          step: $$[$0-2],
-          guard: $$[$0]
-        };
-break;
-case 165:this.$ = new yy.Switch($$[$0-3], $$[$0-1]);
-break;
-case 166:this.$ = new yy.Switch($$[$0-5], $$[$0-3], $$[$0-1]);
-break;
-case 167:this.$ = new yy.Switch(null, $$[$0-1]);
-break;
-case 168:this.$ = new yy.Switch(null, $$[$0-3], $$[$0-1]);
-break;
-case 169:this.$ = $$[$0];
-break;
-case 170:this.$ = $$[$0-1].concat($$[$0]);
-break;
-case 171:this.$ = [[$$[$0-1], $$[$0]]];
-break;
-case 172:this.$ = [[$$[$0-2], $$[$0-1]]];
-break;
-case 173:this.$ = new yy.If($$[$0-1], $$[$0], {
-          type: $$[$0-2]
-        });
-break;
-case 174:this.$ = $$[$0-4].addElse(new yy.If($$[$0-1], $$[$0], {
-          type: $$[$0-2]
-        }));
-break;
-case 175:this.$ = $$[$0];
-break;
-case 176:this.$ = $$[$0-2].addElse($$[$0]);
-break;
-case 177:this.$ = new yy.If($$[$0], yy.Block.wrap([$$[$0-2]]), {
-          type: $$[$0-1],
-          statement: true
-        });
-break;
-case 178:this.$ = new yy.If($$[$0], yy.Block.wrap([$$[$0-2]]), {
-          type: $$[$0-1],
-          statement: true
-        });
-break;
-case 179:this.$ = new yy.Op($$[$0-1], $$[$0]);
-break;
-case 180:this.$ = new yy.Op('-', $$[$0]);
-break;
-case 181:this.$ = new yy.Op('+', $$[$0]);
-break;
-case 182:this.$ = new yy.Op('--', $$[$0]);
-break;
-case 183:this.$ = new yy.Op('++', $$[$0]);
-break;
-case 184:this.$ = new yy.Op('--', $$[$0-1], null, true);
-break;
-case 185:this.$ = new yy.Op('++', $$[$0-1], null, true);
-break;
-case 186:this.$ = new yy.Existence($$[$0-1]);
-break;
-case 187:this.$ = new yy.Op('+', $$[$0-2], $$[$0]);
-break;
-case 188:this.$ = new yy.Op('-', $$[$0-2], $$[$0]);
-break;
-case 189:this.$ = new yy.Op($$[$0-1], $$[$0-2], $$[$0]);
-break;
-case 190:this.$ = new yy.Op($$[$0-1], $$[$0-2], $$[$0]);
-break;
-case 191:this.$ = new yy.Op($$[$0-1], $$[$0-2], $$[$0]);
-break;
-case 192:this.$ = new yy.Op($$[$0-1], $$[$0-2], $$[$0]);
-break;
-case 193:this.$ = (function () {
-        if ($$[$0-1].charAt(0) === '!') {
-          return new yy.Op($$[$0-1].slice(1), $$[$0-2], $$[$0]).invert();
-        } else {
-          return new yy.Op($$[$0-1], $$[$0-2], $$[$0]);
-        }
-      }());
-break;
-case 194:this.$ = new yy.Assign($$[$0-2], $$[$0], $$[$0-1]);
-break;
-case 195:this.$ = new yy.Assign($$[$0-4], $$[$0-1], $$[$0-3]);
-break;
-case 196:this.$ = new yy.Extends($$[$0-2], $$[$0]);
-break;
-}
-},
-table: [{1:[2,1],3:1,4:2,5:3,7:4,8:6,9:7,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,25:[1,5],27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{1:[3]},{1:[2,2],6:[1,72]},{6:[1,73]},{1:[2,4],6:[2,4],26:[2,4],99:[2,4]},{4:75,7:4,8:6,9:7,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,26:[1,74],27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{1:[2,7],6:[2,7],26:[2,7],99:[2,7],100:85,101:[1,63],103:[1,64],106:86,107:[1,66],108:67,123:[1,84],125:[1,78],126:[1,77],129:[1,76],130:[1,79],131:[1,80],132:[1,81],133:[1,82],134:[1,83]},{1:[2,8],6:[2,8],26:[2,8],99:[2,8],100:88,101:[1,63],103:[1,64],106:89,107:[1,66],108:67,123:[1,87]},{1:[2,12],6:[2,12],25:[2,12],26:[2,12],47:[2,12],52:[2,12],55:[2,12],60:91,64:[1,93],65:[1,94],66:[1,95],67:96,68:[1,97],70:[2,12],71:[1,98],75:[2,12],78:90,81:[1,92],82:[2,103],83:[2,12],88:[2,12],90:[2,12],99:[2,12],101:[2,12],102:[2,12],103:[2,12],107:[2,12],115:[2,12],123:[2,12],125:[2,12],126:[2,12],129:[2,12],130:[2,12],131:[2,12],132:[2,12],133:[2,12],134:[2,12]},{1:[2,13],6:[2,13],25:[2,13],26:[2,13],47:[2,13],52:[2,13],55:[2,13],60:100,64:[1,93],65:[1,94],66:[1,95],67:96,68:[1,97],70:[2,13],71:[1,98],75:[2,13],78:99,81:[1,92],82:[2,103],83:[2,13],88:[2,13],90:[2,13],99:[2,13],101:[2,13],102:[2,13],103:[2,13],107:[2,13],115:[2,13],123:[2,13],125:[2,13],126:[2,13],129:[2,13],130:[2,13],131:[2,13],132:[2,13],133:[2,13],134:[2,13]},{1:[2,14],6:[2,14],25:[2,14],26:[2,14],47:[2,14],52:[2,14],55:[2,14],70:[2,14],75:[2,14],83:[2,14],88:[2,14],90:[2,14],99:[2,14],101:[2,14],102:[2,14],103:[2,14],107:[2,14],115:[2,14],123:[2,14],125:[2,14],126:[2,14],129:[2,14],130:[2,14],131:[2,14],132:[2,14],133:[2,14],134:[2,14]},{1:[2,15],6:[2,15],25:[2,15],26:[2,15],47:[2,15],52:[2,15],55:[2,15],70:[2,15],75:[2,15],83:[2,15],88:[2,15],90:[2,15],99:[2,15],101:[2,15],102:[2,15],103:[2,15],107:[2,15],115:[2,15],123:[2,15],125:[2,15],126:[2,15],129:[2,15],130:[2,15],131:[2,15],132:[2,15],133:[2,15],134:[2,15]},{1:[2,16],6:[2,16],25:[2,16],26:[2,16],47:[2,16],52:[2,16],55:[2,16],70:[2,16],75:[2,16],83:[2,16],88:[2,16],90:[2,16],99:[2,16],101:[2,16],102:[2,16],103:[2,16],107:[2,16],115:[2,16],123:[2,16],125:[2,16],126:[2,16],129:[2,16],130:[2,16],131:[2,16],132:[2,16],133:[2,16],134:[2,16]},{1:[2,17],6:[2,17],25:[2,17],26:[2,17],47:[2,17],52:[2,17],55:[2,17],70:[2,17],75:[2,17],83:[2,17],88:[2,17],90:[2,17],99:[2,17],101:[2,17],102:[2,17],103:[2,17],107:[2,17],115:[2,17],123:[2,17],125:[2,17],126:[2,17],129:[2,17],130:[2,17],131:[2,17],132:[2,17],133:[2,17],134:[2,17]},{1:[2,18],6:[2,18],25:[2,18],26:[2,18],47:[2,18],52:[2,18],55:[2,18],70:[2,18],75:[2,18],83:[2,18],88:[2,18],90:[2,18],99:[2,18],101:[2,18],102:[2,18],103:[2,18],107:[2,18],115:[2,18],123:[2,18],125:[2,18],126:[2,18],129:[2,18],130:[2,18],131:[2,18],132:[2,18],133:[2,18],134:[2,18]},{1:[2,19],6:[2,19],25:[2,19],26:[2,19],47:[2,19],52:[2,19],55:[2,19],70:[2,19],75:[2,19],83:[2,19],88:[2,19],90:[2,19],99:[2,19],101:[2,19],102:[2,19],103:[2,19],107:[2,19],115:[2,19],123:[2,19],125:[2,19],126:[2,19],129:[2,19],130:[2,19],131:[2,19],132:[2,19],133:[2,19],134:[2,19]},{1:[2,20],6:[2,20],25:[2,20],26:[2,20],47:[2,20],52:[2,20],55:[2,20],70:[2,20],75:[2,20],83:[2,20],88:[2,20],90:[2,20],99:[2,20],101:[2,20],102:[2,20],103:[2,20],107:[2,20],115:[2,20],123:[2,20],125:[2,20],126:[2,20],129:[2,20],130:[2,20],131:[2,20],132:[2,20],133:[2,20],134:[2,20]},{1:[2,21],6:[2,21],25:[2,21],26:[2,21],47:[2,21],52:[2,21],55:[2,21],70:[2,21],75:[2,21],83:[2,21],88:[2,21],90:[2,21],99:[2,21],101:[2,21],102:[2,21],103:[2,21],107:[2,21],115:[2,21],123:[2,21],125:[2,21],126:[2,21],129:[2,21],130:[2,21],131:[2,21],132:[2,21],133:[2,21],134:[2,21]},{1:[2,22],6:[2,22],25:[2,22],26:[2,22],47:[2,22],52:[2,22],55:[2,22],70:[2,22],75:[2,22],83:[2,22],88:[2,22],90:[2,22],99:[2,22],101:[2,22],102:[2,22],103:[2,22],107:[2,22],115:[2,22],123:[2,22],125:[2,22],126:[2,22],129:[2,22],130:[2,22],131:[2,22],132:[2,22],133:[2,22],134:[2,22]},{1:[2,23],6:[2,23],25:[2,23],26:[2,23],47:[2,23],52:[2,23],55:[2,23],70:[2,23],75:[2,23],83:[2,23],88:[2,23],90:[2,23],99:[2,23],101:[2,23],102:[2,23],103:[2,23],107:[2,23],115:[2,23],123:[2,23],125:[2,23],126:[2,23],129:[2,23],130:[2,23],131:[2,23],132:[2,23],133:[2,23],134:[2,23]},{1:[2,9],6:[2,9],26:[2,9],99:[2,9],101:[2,9],103:[2,9],107:[2,9],123:[2,9]},{1:[2,10],6:[2,10],26:[2,10],99:[2,10],101:[2,10],103:[2,10],107:[2,10],123:[2,10]},{1:[2,11],6:[2,11],26:[2,11],99:[2,11],101:[2,11],103:[2,11],107:[2,11],123:[2,11]},{1:[2,71],6:[2,71],25:[2,71],26:[2,71],38:[1,101],47:[2,71],52:[2,71],55:[2,71],64:[2,71],65:[2,71],66:[2,71],68:[2,71],70:[2,71],71:[2,71],75:[2,71],81:[2,71],82:[2,71],83:[2,71],88:[2,71],90:[2,71],99:[2,71],101:[2,71],102:[2,71],103:[2,71],107:[2,71],115:[2,71],123:[2,71],125:[2,71],126:[2,71],129:[2,71],130:[2,71],131:[2,71],132:[2,71],133:[2,71],134:[2,71]},{1:[2,72],6:[2,72],25:[2,72],26:[2,72],47:[2,72],52:[2,72],55:[2,72],64:[2,72],65:[2,72],66:[2,72],68:[2,72],70:[2,72],71:[2,72],75:[2,72],81:[2,72],82:[2,72],83:[2,72],88:[2,72],90:[2,72],99:[2,72],101:[2,72],102:[2,72],103:[2,72],107:[2,72],115:[2,72],123:[2,72],125:[2,72],126:[2,72],129:[2,72],130:[2,72],131:[2,72],132:[2,72],133:[2,72],134:[2,72]},{1:[2,73],6:[2,73],25:[2,73],26:[2,73],47:[2,73],52:[2,73],55:[2,73],64:[2,73],65:[2,73],66:[2,73],68:[2,73],70:[2,73],71:[2,73],75:[2,73],81:[2,73],82:[2,73],83:[2,73],88:[2,73],90:[2,73],99:[2,73],101:[2,73],102:[2,73],103:[2,73],107:[2,73],115:[2,73],123:[2,73],125:[2,73],126:[2,73],129:[2,73],130:[2,73],131:[2,73],132:[2,73],133:[2,73],134:[2,73]},{1:[2,74],6:[2,74],25:[2,74],26:[2,74],47:[2,74],52:[2,74],55:[2,74],64:[2,74],65:[2,74],66:[2,74],68:[2,74],70:[2,74],71:[2,74],75:[2,74],81:[2,74],82:[2,74],83:[2,74],88:[2,74],90:[2,74],99:[2,74],101:[2,74],102:[2,74],103:[2,74],107:[2,74],115:[2,74],123:[2,74],125:[2,74],126:[2,74],129:[2,74],130:[2,74],131:[2,74],132:[2,74],133:[2,74],134:[2,74]},{1:[2,75],6:[2,75],25:[2,75],26:[2,75],47:[2,75],52:[2,75],55:[2,75],64:[2,75],65:[2,75],66:[2,75],68:[2,75],70:[2,75],71:[2,75],75:[2,75],81:[2,75],82:[2,75],83:[2,75],88:[2,75],90:[2,75],99:[2,75],101:[2,75],102:[2,75],103:[2,75],107:[2,75],115:[2,75],123:[2,75],125:[2,75],126:[2,75],129:[2,75],130:[2,75],131:[2,75],132:[2,75],133:[2,75],134:[2,75]},{1:[2,101],6:[2,101],25:[2,101],26:[2,101],47:[2,101],52:[2,101],55:[2,101],64:[2,101],65:[2,101],66:[2,101],68:[2,101],70:[2,101],71:[2,101],75:[2,101],79:102,81:[2,101],82:[1,103],83:[2,101],88:[2,101],90:[2,101],99:[2,101],101:[2,101],102:[2,101],103:[2,101],107:[2,101],115:[2,101],123:[2,101],125:[2,101],126:[2,101],129:[2,101],130:[2,101],131:[2,101],132:[2,101],133:[2,101],134:[2,101]},{27:107,28:[1,71],42:108,46:104,47:[2,53],52:[2,53],53:105,54:106,56:109,57:110,73:[1,68],86:[1,111],87:[1,112]},{5:113,25:[1,5]},{8:114,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{8:116,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{8:117,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{13:119,14:120,27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:121,42:61,56:47,57:48,59:118,61:25,62:26,63:27,73:[1,68],80:[1,28],85:[1,56],86:[1,57],87:[1,55],98:[1,54]},{13:119,14:120,27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:121,42:61,56:47,57:48,59:122,61:25,62:26,63:27,73:[1,68],80:[1,28],85:[1,56],86:[1,57],87:[1,55],98:[1,54]},{1:[2,68],6:[2,68],25:[2,68],26:[2,68],38:[2,68],47:[2,68],52:[2,68],55:[2,68],64:[2,68],65:[2,68],66:[2,68],68:[2,68],70:[2,68],71:[2,68],75:[2,68],77:[1,126],81:[2,68],82:[2,68],83:[2,68],88:[2,68],90:[2,68],99:[2,68],101:[2,68],102:[2,68],103:[2,68],107:[2,68],115:[2,68],123:[2,68],125:[2,68],126:[2,68],127:[1,123],128:[1,124],129:[2,68],130:[2,68],131:[2,68],132:[2,68],133:[2,68],134:[2,68],135:[1,125]},{1:[2,175],6:[2,175],25:[2,175],26:[2,175],47:[2,175],52:[2,175],55:[2,175],70:[2,175],75:[2,175],83:[2,175],88:[2,175],90:[2,175],99:[2,175],101:[2,175],102:[2,175],103:[2,175],107:[2,175],115:[2,175],118:[1,127],123:[2,175],125:[2,175],126:[2,175],129:[2,175],130:[2,175],131:[2,175],132:[2,175],133:[2,175],134:[2,175]},{5:128,25:[1,5]},{5:129,25:[1,5]},{1:[2,143],6:[2,143],25:[2,143],26:[2,143],47:[2,143],52:[2,143],55:[2,143],70:[2,143],75:[2,143],83:[2,143],88:[2,143],90:[2,143],99:[2,143],101:[2,143],102:[2,143],103:[2,143],107:[2,143],115:[2,143],123:[2,143],125:[2,143],126:[2,143],129:[2,143],130:[2,143],131:[2,143],132:[2,143],133:[2,143],134:[2,143]},{5:130,25:[1,5]},{8:131,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,25:[1,132],27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{1:[2,91],5:133,6:[2,91],13:119,14:120,25:[1,5],26:[2,91],27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:121,42:61,47:[2,91],52:[2,91],55:[2,91],56:47,57:48,59:135,61:25,62:26,63:27,70:[2,91],73:[1,68],75:[2,91],77:[1,134],80:[1,28],83:[2,91],85:[1,56],86:[1,57],87:[1,55],88:[2,91],90:[2,91],98:[1,54],99:[2,91],101:[2,91],102:[2,91],103:[2,91],107:[2,91],115:[2,91],123:[2,91],125:[2,91],126:[2,91],129:[2,91],130:[2,91],131:[2,91],132:[2,91],133:[2,91],134:[2,91]},{8:136,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{1:[2,45],6:[2,45],8:137,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,26:[2,45],27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],99:[2,45],100:39,101:[2,45],103:[2,45],104:40,105:[1,65],106:41,107:[2,45],108:67,116:[1,42],121:37,122:[1,62],123:[2,45],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{1:[2,46],6:[2,46],25:[2,46],26:[2,46],52:[2,46],75:[2,46],99:[2,46],101:[2,46],103:[2,46],107:[2,46],123:[2,46]},{1:[2,69],6:[2,69],25:[2,69],26:[2,69],38:[2,69],47:[2,69],52:[2,69],55:[2,69],64:[2,69],65:[2,69],66:[2,69],68:[2,69],70:[2,69],71:[2,69],75:[2,69],81:[2,69],82:[2,69],83:[2,69],88:[2,69],90:[2,69],99:[2,69],101:[2,69],102:[2,69],103:[2,69],107:[2,69],115:[2,69],123:[2,69],125:[2,69],126:[2,69],129:[2,69],130:[2,69],131:[2,69],132:[2,69],133:[2,69],134:[2,69]},{1:[2,70],6:[2,70],25:[2,70],26:[2,70],38:[2,70],47:[2,70],52:[2,70],55:[2,70],64:[2,70],65:[2,70],66:[2,70],68:[2,70],70:[2,70],71:[2,70],75:[2,70],81:[2,70],82:[2,70],83:[2,70],88:[2,70],90:[2,70],99:[2,70],101:[2,70],102:[2,70],103:[2,70],107:[2,70],115:[2,70],123:[2,70],125:[2,70],126:[2,70],129:[2,70],130:[2,70],131:[2,70],132:[2,70],133:[2,70],134:[2,70]},{1:[2,29],6:[2,29],25:[2,29],26:[2,29],47:[2,29],52:[2,29],55:[2,29],64:[2,29],65:[2,29],66:[2,29],68:[2,29],70:[2,29],71:[2,29],75:[2,29],81:[2,29],82:[2,29],83:[2,29],88:[2,29],90:[2,29],99:[2,29],101:[2,29],102:[2,29],103:[2,29],107:[2,29],115:[2,29],123:[2,29],125:[2,29],126:[2,29],129:[2,29],130:[2,29],131:[2,29],132:[2,29],133:[2,29],134:[2,29]},{1:[2,30],6:[2,30],25:[2,30],26:[2,30],47:[2,30],52:[2,30],55:[2,30],64:[2,30],65:[2,30],66:[2,30],68:[2,30],70:[2,30],71:[2,30],75:[2,30],81:[2,30],82:[2,30],83:[2,30],88:[2,30],90:[2,30],99:[2,30],101:[2,30],102:[2,30],103:[2,30],107:[2,30],115:[2,30],123:[2,30],125:[2,30],126:[2,30],129:[2,30],130:[2,30],131:[2,30],132:[2,30],133:[2,30],134:[2,30]},{1:[2,31],6:[2,31],25:[2,31],26:[2,31],47:[2,31],52:[2,31],55:[2,31],64:[2,31],65:[2,31],66:[2,31],68:[2,31],70:[2,31],71:[2,31],75:[2,31],81:[2,31],82:[2,31],83:[2,31],88:[2,31],90:[2,31],99:[2,31],101:[2,31],102:[2,31],103:[2,31],107:[2,31],115:[2,31],123:[2,31],125:[2,31],126:[2,31],129:[2,31],130:[2,31],131:[2,31],132:[2,31],133:[2,31],134:[2,31]},{1:[2,32],6:[2,32],25:[2,32],26:[2,32],47:[2,32],52:[2,32],55:[2,32],64:[2,32],65:[2,32],66:[2,32],68:[2,32],70:[2,32],71:[2,32],75:[2,32],81:[2,32],82:[2,32],83:[2,32],88:[2,32],90:[2,32],99:[2,32],101:[2,32],102:[2,32],103:[2,32],107:[2,32],115:[2,32],123:[2,32],125:[2,32],126:[2,32],129:[2,32],130:[2,32],131:[2,32],132:[2,32],133:[2,32],134:[2,32]},{1:[2,33],6:[2,33],25:[2,33],26:[2,33],47:[2,33],52:[2,33],55:[2,33],64:[2,33],65:[2,33],66:[2,33],68:[2,33],70:[2,33],71:[2,33],75:[2,33],81:[2,33],82:[2,33],83:[2,33],88:[2,33],90:[2,33],99:[2,33],101:[2,33],102:[2,33],103:[2,33],107:[2,33],115:[2,33],123:[2,33],125:[2,33],126:[2,33],129:[2,33],130:[2,33],131:[2,33],132:[2,33],133:[2,33],134:[2,33]},{4:138,7:4,8:6,9:7,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,25:[1,139],27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{8:140,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,25:[1,144],27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,58:145,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],84:142,85:[1,56],86:[1,57],87:[1,55],88:[1,141],91:143,93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{1:[2,107],6:[2,107],25:[2,107],26:[2,107],47:[2,107],52:[2,107],55:[2,107],64:[2,107],65:[2,107],66:[2,107],68:[2,107],70:[2,107],71:[2,107],75:[2,107],81:[2,107],82:[2,107],83:[2,107],88:[2,107],90:[2,107],99:[2,107],101:[2,107],102:[2,107],103:[2,107],107:[2,107],115:[2,107],123:[2,107],125:[2,107],126:[2,107],129:[2,107],130:[2,107],131:[2,107],132:[2,107],133:[2,107],134:[2,107]},{1:[2,108],6:[2,108],25:[2,108],26:[2,108],27:146,28:[1,71],47:[2,108],52:[2,108],55:[2,108],64:[2,108],65:[2,108],66:[2,108],68:[2,108],70:[2,108],71:[2,108],75:[2,108],81:[2,108],82:[2,108],83:[2,108],88:[2,108],90:[2,108],99:[2,108],101:[2,108],102:[2,108],103:[2,108],107:[2,108],115:[2,108],123:[2,108],125:[2,108],126:[2,108],129:[2,108],130:[2,108],131:[2,108],132:[2,108],133:[2,108],134:[2,108]},{25:[2,49]},{25:[2,50]},{1:[2,64],6:[2,64],25:[2,64],26:[2,64],38:[2,64],47:[2,64],52:[2,64],55:[2,64],64:[2,64],65:[2,64],66:[2,64],68:[2,64],70:[2,64],71:[2,64],75:[2,64],77:[2,64],81:[2,64],82:[2,64],83:[2,64],88:[2,64],90:[2,64],99:[2,64],101:[2,64],102:[2,64],103:[2,64],107:[2,64],115:[2,64],123:[2,64],125:[2,64],126:[2,64],127:[2,64],128:[2,64],129:[2,64],130:[2,64],131:[2,64],132:[2,64],133:[2,64],134:[2,64],135:[2,64]},{1:[2,67],6:[2,67],25:[2,67],26:[2,67],38:[2,67],47:[2,67],52:[2,67],55:[2,67],64:[2,67],65:[2,67],66:[2,67],68:[2,67],70:[2,67],71:[2,67],75:[2,67],77:[2,67],81:[2,67],82:[2,67],83:[2,67],88:[2,67],90:[2,67],99:[2,67],101:[2,67],102:[2,67],103:[2,67],107:[2,67],115:[2,67],123:[2,67],125:[2,67],126:[2,67],127:[2,67],128:[2,67],129:[2,67],130:[2,67],131:[2,67],132:[2,67],133:[2,67],134:[2,67],135:[2,67]},{8:147,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{8:148,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{8:149,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{5:150,8:151,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,25:[1,5],27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{27:156,28:[1,71],56:157,57:158,62:152,73:[1,68],87:[1,55],110:153,111:[1,154],112:155},{109:159,113:[1,160],114:[1,161]},{6:[2,86],11:165,25:[2,86],27:166,28:[1,71],29:167,30:[1,69],31:[1,70],39:163,40:164,42:168,44:[1,46],52:[2,86],74:162,75:[2,86],86:[1,111]},{1:[2,27],6:[2,27],25:[2,27],26:[2,27],41:[2,27],47:[2,27],52:[2,27],55:[2,27],64:[2,27],65:[2,27],66:[2,27],68:[2,27],70:[2,27],71:[2,27],75:[2,27],81:[2,27],82:[2,27],83:[2,27],88:[2,27],90:[2,27],99:[2,27],101:[2,27],102:[2,27],103:[2,27],107:[2,27],115:[2,27],123:[2,27],125:[2,27],126:[2,27],129:[2,27],130:[2,27],131:[2,27],132:[2,27],133:[2,27],134:[2,27]},{1:[2,28],6:[2,28],25:[2,28],26:[2,28],41:[2,28],47:[2,28],52:[2,28],55:[2,28],64:[2,28],65:[2,28],66:[2,28],68:[2,28],70:[2,28],71:[2,28],75:[2,28],81:[2,28],82:[2,28],83:[2,28],88:[2,28],90:[2,28],99:[2,28],101:[2,28],102:[2,28],103:[2,28],107:[2,28],115:[2,28],123:[2,28],125:[2,28],126:[2,28],129:[2,28],130:[2,28],131:[2,28],132:[2,28],133:[2,28],134:[2,28]},{1:[2,26],6:[2,26],25:[2,26],26:[2,26],38:[2,26],41:[2,26],47:[2,26],52:[2,26],55:[2,26],64:[2,26],65:[2,26],66:[2,26],68:[2,26],70:[2,26],71:[2,26],75:[2,26],77:[2,26],81:[2,26],82:[2,26],83:[2,26],88:[2,26],90:[2,26],99:[2,26],101:[2,26],102:[2,26],103:[2,26],107:[2,26],113:[2,26],114:[2,26],115:[2,26],123:[2,26],125:[2,26],126:[2,26],127:[2,26],128:[2,26],129:[2,26],130:[2,26],131:[2,26],132:[2,26],133:[2,26],134:[2,26],135:[2,26]},{1:[2,6],6:[2,6],7:169,8:6,9:7,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,26:[2,6],27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],99:[2,6],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{1:[2,3]},{1:[2,24],6:[2,24],25:[2,24],26:[2,24],47:[2,24],52:[2,24],55:[2,24],70:[2,24],75:[2,24],83:[2,24],88:[2,24],90:[2,24],95:[2,24],96:[2,24],99:[2,24],101:[2,24],102:[2,24],103:[2,24],107:[2,24],115:[2,24],118:[2,24],120:[2,24],123:[2,24],125:[2,24],126:[2,24],129:[2,24],130:[2,24],131:[2,24],132:[2,24],133:[2,24],134:[2,24]},{6:[1,72],26:[1,170]},{1:[2,186],6:[2,186],25:[2,186],26:[2,186],47:[2,186],52:[2,186],55:[2,186],70:[2,186],75:[2,186],83:[2,186],88:[2,186],90:[2,186],99:[2,186],101:[2,186],102:[2,186],103:[2,186],107:[2,186],115:[2,186],123:[2,186],125:[2,186],126:[2,186],129:[2,186],130:[2,186],131:[2,186],132:[2,186],133:[2,186],134:[2,186]},{8:171,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{8:172,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{8:173,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{8:174,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{8:175,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{8:176,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{8:177,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{8:178,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{1:[2,142],6:[2,142],25:[2,142],26:[2,142],47:[2,142],52:[2,142],55:[2,142],70:[2,142],75:[2,142],83:[2,142],88:[2,142],90:[2,142],99:[2,142],101:[2,142],102:[2,142],103:[2,142],107:[2,142],115:[2,142],123:[2,142],125:[2,142],126:[2,142],129:[2,142],130:[2,142],131:[2,142],132:[2,142],133:[2,142],134:[2,142]},{1:[2,147],6:[2,147],25:[2,147],26:[2,147],47:[2,147],52:[2,147],55:[2,147],70:[2,147],75:[2,147],83:[2,147],88:[2,147],90:[2,147],99:[2,147],101:[2,147],102:[2,147],103:[2,147],107:[2,147],115:[2,147],123:[2,147],125:[2,147],126:[2,147],129:[2,147],130:[2,147],131:[2,147],132:[2,147],133:[2,147],134:[2,147]},{8:179,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{1:[2,141],6:[2,141],25:[2,141],26:[2,141],47:[2,141],52:[2,141],55:[2,141],70:[2,141],75:[2,141],83:[2,141],88:[2,141],90:[2,141],99:[2,141],101:[2,141],102:[2,141],103:[2,141],107:[2,141],115:[2,141],123:[2,141],125:[2,141],126:[2,141],129:[2,141],130:[2,141],131:[2,141],132:[2,141],133:[2,141],134:[2,141]},{1:[2,146],6:[2,146],25:[2,146],26:[2,146],47:[2,146],52:[2,146],55:[2,146],70:[2,146],75:[2,146],83:[2,146],88:[2,146],90:[2,146],99:[2,146],101:[2,146],102:[2,146],103:[2,146],107:[2,146],115:[2,146],123:[2,146],125:[2,146],126:[2,146],129:[2,146],130:[2,146],131:[2,146],132:[2,146],133:[2,146],134:[2,146]},{79:180,82:[1,103]},{1:[2,65],6:[2,65],25:[2,65],26:[2,65],38:[2,65],47:[2,65],52:[2,65],55:[2,65],64:[2,65],65:[2,65],66:[2,65],68:[2,65],70:[2,65],71:[2,65],75:[2,65],77:[2,65],81:[2,65],82:[2,65],83:[2,65],88:[2,65],90:[2,65],99:[2,65],101:[2,65],102:[2,65],103:[2,65],107:[2,65],115:[2,65],123:[2,65],125:[2,65],126:[2,65],127:[2,65],128:[2,65],129:[2,65],130:[2,65],131:[2,65],132:[2,65],133:[2,65],134:[2,65],135:[2,65]},{82:[2,104]},{27:181,28:[1,71]},{27:182,28:[1,71]},{1:[2,79],6:[2,79],25:[2,79],26:[2,79],27:183,28:[1,71],38:[2,79],47:[2,79],52:[2,79],55:[2,79],64:[2,79],65:[2,79],66:[2,79],68:[2,79],70:[2,79],71:[2,79],75:[2,79],77:[2,79],81:[2,79],82:[2,79],83:[2,79],88:[2,79],90:[2,79],99:[2,79],101:[2,79],102:[2,79],103:[2,79],107:[2,79],115:[2,79],123:[2,79],125:[2,79],126:[2,79],127:[2,79],128:[2,79],129:[2,79],130:[2,79],131:[2,79],132:[2,79],133:[2,79],134:[2,79],135:[2,79]},{1:[2,80],6:[2,80],25:[2,80],26:[2,80],38:[2,80],47:[2,80],52:[2,80],55:[2,80],64:[2,80],65:[2,80],66:[2,80],68:[2,80],70:[2,80],71:[2,80],75:[2,80],77:[2,80],81:[2,80],82:[2,80],83:[2,80],88:[2,80],90:[2,80],99:[2,80],101:[2,80],102:[2,80],103:[2,80],107:[2,80],115:[2,80],123:[2,80],125:[2,80],126:[2,80],127:[2,80],128:[2,80],129:[2,80],130:[2,80],131:[2,80],132:[2,80],133:[2,80],134:[2,80],135:[2,80]},{8:185,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],55:[1,189],56:47,57:48,59:36,61:25,62:26,63:27,69:184,72:186,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],89:187,90:[1,188],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{67:190,68:[1,97],71:[1,98]},{79:191,82:[1,103]},{1:[2,66],6:[2,66],25:[2,66],26:[2,66],38:[2,66],47:[2,66],52:[2,66],55:[2,66],64:[2,66],65:[2,66],66:[2,66],68:[2,66],70:[2,66],71:[2,66],75:[2,66],77:[2,66],81:[2,66],82:[2,66],83:[2,66],88:[2,66],90:[2,66],99:[2,66],101:[2,66],102:[2,66],103:[2,66],107:[2,66],115:[2,66],123:[2,66],125:[2,66],126:[2,66],127:[2,66],128:[2,66],129:[2,66],130:[2,66],131:[2,66],132:[2,66],133:[2,66],134:[2,66],135:[2,66]},{6:[1,193],8:192,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,25:[1,194],27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{1:[2,102],6:[2,102],25:[2,102],26:[2,102],47:[2,102],52:[2,102],55:[2,102],64:[2,102],65:[2,102],66:[2,102],68:[2,102],70:[2,102],71:[2,102],75:[2,102],81:[2,102],82:[2,102],83:[2,102],88:[2,102],90:[2,102],99:[2,102],101:[2,102],102:[2,102],103:[2,102],107:[2,102],115:[2,102],123:[2,102],125:[2,102],126:[2,102],129:[2,102],130:[2,102],131:[2,102],132:[2,102],133:[2,102],134:[2,102]},{8:197,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,25:[1,144],27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,58:145,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],83:[1,195],84:196,85:[1,56],86:[1,57],87:[1,55],91:143,93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{47:[1,198],52:[1,199]},{47:[2,54],52:[2,54]},{38:[1,201],47:[2,56],52:[2,56],55:[1,200]},{38:[2,59],47:[2,59],52:[2,59],55:[2,59]},{38:[2,60],47:[2,60],52:[2,60],55:[2,60]},{38:[2,61],47:[2,61],52:[2,61],55:[2,61]},{38:[2,62],47:[2,62],52:[2,62],55:[2,62]},{27:146,28:[1,71]},{8:197,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,25:[1,144],27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,58:145,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],84:142,85:[1,56],86:[1,57],87:[1,55],88:[1,141],91:143,93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{1:[2,48],6:[2,48],25:[2,48],26:[2,48],47:[2,48],52:[2,48],55:[2,48],70:[2,48],75:[2,48],83:[2,48],88:[2,48],90:[2,48],99:[2,48],101:[2,48],102:[2,48],103:[2,48],107:[2,48],115:[2,48],123:[2,48],125:[2,48],126:[2,48],129:[2,48],130:[2,48],131:[2,48],132:[2,48],133:[2,48],134:[2,48]},{1:[2,179],6:[2,179],25:[2,179],26:[2,179],47:[2,179],52:[2,179],55:[2,179],70:[2,179],75:[2,179],83:[2,179],88:[2,179],90:[2,179],99:[2,179],100:85,101:[2,179],102:[2,179],103:[2,179],106:86,107:[2,179],108:67,115:[2,179],123:[2,179],125:[2,179],126:[2,179],129:[1,76],130:[2,179],131:[2,179],132:[2,179],133:[2,179],134:[2,179]},{100:88,101:[1,63],103:[1,64],106:89,107:[1,66],108:67,123:[1,87]},{1:[2,180],6:[2,180],25:[2,180],26:[2,180],47:[2,180],52:[2,180],55:[2,180],70:[2,180],75:[2,180],83:[2,180],88:[2,180],90:[2,180],99:[2,180],100:85,101:[2,180],102:[2,180],103:[2,180],106:86,107:[2,180],108:67,115:[2,180],123:[2,180],125:[2,180],126:[2,180],129:[1,76],130:[2,180],131:[2,180],132:[2,180],133:[2,180],134:[2,180]},{1:[2,181],6:[2,181],25:[2,181],26:[2,181],47:[2,181],52:[2,181],55:[2,181],70:[2,181],75:[2,181],83:[2,181],88:[2,181],90:[2,181],99:[2,181],100:85,101:[2,181],102:[2,181],103:[2,181],106:86,107:[2,181],108:67,115:[2,181],123:[2,181],125:[2,181],126:[2,181],129:[1,76],130:[2,181],131:[2,181],132:[2,181],133:[2,181],134:[2,181]},{1:[2,182],6:[2,182],25:[2,182],26:[2,182],47:[2,182],52:[2,182],55:[2,182],64:[2,68],65:[2,68],66:[2,68],68:[2,68],70:[2,182],71:[2,68],75:[2,182],81:[2,68],82:[2,68],83:[2,182],88:[2,182],90:[2,182],99:[2,182],101:[2,182],102:[2,182],103:[2,182],107:[2,182],115:[2,182],123:[2,182],125:[2,182],126:[2,182],129:[2,182],130:[2,182],131:[2,182],132:[2,182],133:[2,182],134:[2,182]},{60:91,64:[1,93],65:[1,94],66:[1,95],67:96,68:[1,97],71:[1,98],78:90,81:[1,92],82:[2,103]},{60:100,64:[1,93],65:[1,94],66:[1,95],67:96,68:[1,97],71:[1,98],78:99,81:[1,92],82:[2,103]},{64:[2,71],65:[2,71],66:[2,71],68:[2,71],71:[2,71],81:[2,71],82:[2,71]},{1:[2,183],6:[2,183],25:[2,183],26:[2,183],47:[2,183],52:[2,183],55:[2,183],64:[2,68],65:[2,68],66:[2,68],68:[2,68],70:[2,183],71:[2,68],75:[2,183],81:[2,68],82:[2,68],83:[2,183],88:[2,183],90:[2,183],99:[2,183],101:[2,183],102:[2,183],103:[2,183],107:[2,183],115:[2,183],123:[2,183],125:[2,183],126:[2,183],129:[2,183],130:[2,183],131:[2,183],132:[2,183],133:[2,183],134:[2,183]},{1:[2,184],6:[2,184],25:[2,184],26:[2,184],47:[2,184],52:[2,184],55:[2,184],70:[2,184],75:[2,184],83:[2,184],88:[2,184],90:[2,184],99:[2,184],101:[2,184],102:[2,184],103:[2,184],107:[2,184],115:[2,184],123:[2,184],125:[2,184],126:[2,184],129:[2,184],130:[2,184],131:[2,184],132:[2,184],133:[2,184],134:[2,184]},{1:[2,185],6:[2,185],25:[2,185],26:[2,185],47:[2,185],52:[2,185],55:[2,185],70:[2,185],75:[2,185],83:[2,185],88:[2,185],90:[2,185],99:[2,185],101:[2,185],102:[2,185],103:[2,185],107:[2,185],115:[2,185],123:[2,185],125:[2,185],126:[2,185],129:[2,185],130:[2,185],131:[2,185],132:[2,185],133:[2,185],134:[2,185]},{8:202,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,25:[1,203],27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{8:204,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{5:205,25:[1,5],122:[1,206]},{1:[2,128],6:[2,128],25:[2,128],26:[2,128],47:[2,128],52:[2,128],55:[2,128],70:[2,128],75:[2,128],83:[2,128],88:[2,128],90:[2,128],94:207,95:[1,208],96:[1,209],99:[2,128],101:[2,128],102:[2,128],103:[2,128],107:[2,128],115:[2,128],123:[2,128],125:[2,128],126:[2,128],129:[2,128],130:[2,128],131:[2,128],132:[2,128],133:[2,128],134:[2,128]},{1:[2,140],6:[2,140],25:[2,140],26:[2,140],47:[2,140],52:[2,140],55:[2,140],70:[2,140],75:[2,140],83:[2,140],88:[2,140],90:[2,140],99:[2,140],101:[2,140],102:[2,140],103:[2,140],107:[2,140],115:[2,140],123:[2,140],125:[2,140],126:[2,140],129:[2,140],130:[2,140],131:[2,140],132:[2,140],133:[2,140],134:[2,140]},{1:[2,148],6:[2,148],25:[2,148],26:[2,148],47:[2,148],52:[2,148],55:[2,148],70:[2,148],75:[2,148],83:[2,148],88:[2,148],90:[2,148],99:[2,148],101:[2,148],102:[2,148],103:[2,148],107:[2,148],115:[2,148],123:[2,148],125:[2,148],126:[2,148],129:[2,148],130:[2,148],131:[2,148],132:[2,148],133:[2,148],134:[2,148]},{25:[1,210],100:85,101:[1,63],103:[1,64],106:86,107:[1,66],108:67,123:[1,84],125:[1,78],126:[1,77],129:[1,76],130:[1,79],131:[1,80],132:[1,81],133:[1,82],134:[1,83]},{117:211,119:212,120:[1,213]},{1:[2,92],6:[2,92],25:[2,92],26:[2,92],47:[2,92],52:[2,92],55:[2,92],70:[2,92],75:[2,92],83:[2,92],88:[2,92],90:[2,92],99:[2,92],101:[2,92],102:[2,92],103:[2,92],107:[2,92],115:[2,92],123:[2,92],125:[2,92],126:[2,92],129:[2,92],130:[2,92],131:[2,92],132:[2,92],133:[2,92],134:[2,92]},{8:214,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{1:[2,95],5:215,6:[2,95],25:[1,5],26:[2,95],47:[2,95],52:[2,95],55:[2,95],64:[2,68],65:[2,68],66:[2,68],68:[2,68],70:[2,95],71:[2,68],75:[2,95],77:[1,216],81:[2,68],82:[2,68],83:[2,95],88:[2,95],90:[2,95],99:[2,95],101:[2,95],102:[2,95],103:[2,95],107:[2,95],115:[2,95],123:[2,95],125:[2,95],126:[2,95],129:[2,95],130:[2,95],131:[2,95],132:[2,95],133:[2,95],134:[2,95]},{1:[2,133],6:[2,133],25:[2,133],26:[2,133],47:[2,133],52:[2,133],55:[2,133],70:[2,133],75:[2,133],83:[2,133],88:[2,133],90:[2,133],99:[2,133],100:85,101:[2,133],102:[2,133],103:[2,133],106:86,107:[2,133],108:67,115:[2,133],123:[2,133],125:[1,78],126:[1,77],129:[1,76],130:[1,79],131:[1,80],132:[1,81],133:[1,82],134:[1,83]},{1:[2,44],6:[2,44],26:[2,44],99:[2,44],100:85,101:[2,44],103:[2,44],106:86,107:[2,44],108:67,123:[2,44],125:[1,78],126:[1,77],129:[1,76],130:[1,79],131:[1,80],132:[1,81],133:[1,82],134:[1,83]},{6:[1,72],99:[1,217]},{4:218,7:4,8:6,9:7,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{6:[2,124],25:[2,124],52:[2,124],55:[1,220],88:[2,124],89:219,90:[1,188],100:85,101:[1,63],103:[1,64],106:86,107:[1,66],108:67,123:[1,84],125:[1,78],126:[1,77],129:[1,76],130:[1,79],131:[1,80],132:[1,81],133:[1,82],134:[1,83]},{1:[2,110],6:[2,110],25:[2,110],26:[2,110],38:[2,110],47:[2,110],52:[2,110],55:[2,110],64:[2,110],65:[2,110],66:[2,110],68:[2,110],70:[2,110],71:[2,110],75:[2,110],81:[2,110],82:[2,110],83:[2,110],88:[2,110],90:[2,110],99:[2,110],101:[2,110],102:[2,110],103:[2,110],107:[2,110],113:[2,110],114:[2,110],115:[2,110],123:[2,110],125:[2,110],126:[2,110],129:[2,110],130:[2,110],131:[2,110],132:[2,110],133:[2,110],134:[2,110]},{6:[2,51],25:[2,51],51:221,52:[1,222],88:[2,51]},{6:[2,119],25:[2,119],26:[2,119],52:[2,119],83:[2,119],88:[2,119]},{8:197,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,25:[1,144],27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,58:145,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],84:223,85:[1,56],86:[1,57],87:[1,55],91:143,93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{6:[2,125],25:[2,125],26:[2,125],52:[2,125],83:[2,125],88:[2,125]},{1:[2,109],6:[2,109],25:[2,109],26:[2,109],38:[2,109],41:[2,109],47:[2,109],52:[2,109],55:[2,109],64:[2,109],65:[2,109],66:[2,109],68:[2,109],70:[2,109],71:[2,109],75:[2,109],77:[2,109],81:[2,109],82:[2,109],83:[2,109],88:[2,109],90:[2,109],99:[2,109],101:[2,109],102:[2,109],103:[2,109],107:[2,109],115:[2,109],123:[2,109],125:[2,109],126:[2,109],127:[2,109],128:[2,109],129:[2,109],130:[2,109],131:[2,109],132:[2,109],133:[2,109],134:[2,109],135:[2,109]},{5:224,25:[1,5],100:85,101:[1,63],103:[1,64],106:86,107:[1,66],108:67,123:[1,84],125:[1,78],126:[1,77],129:[1,76],130:[1,79],131:[1,80],132:[1,81],133:[1,82],134:[1,83]},{1:[2,136],6:[2,136],25:[2,136],26:[2,136],47:[2,136],52:[2,136],55:[2,136],70:[2,136],75:[2,136],83:[2,136],88:[2,136],90:[2,136],99:[2,136],100:85,101:[1,63],102:[1,225],103:[1,64],106:86,107:[1,66],108:67,115:[2,136],123:[2,136],125:[1,78],126:[1,77],129:[1,76],130:[1,79],131:[1,80],132:[1,81],133:[1,82],134:[1,83]},{1:[2,138],6:[2,138],25:[2,138],26:[2,138],47:[2,138],52:[2,138],55:[2,138],70:[2,138],75:[2,138],83:[2,138],88:[2,138],90:[2,138],99:[2,138],100:85,101:[1,63],102:[1,226],103:[1,64],106:86,107:[1,66],108:67,115:[2,138],123:[2,138],125:[1,78],126:[1,77],129:[1,76],130:[1,79],131:[1,80],132:[1,81],133:[1,82],134:[1,83]},{1:[2,144],6:[2,144],25:[2,144],26:[2,144],47:[2,144],52:[2,144],55:[2,144],70:[2,144],75:[2,144],83:[2,144],88:[2,144],90:[2,144],99:[2,144],101:[2,144],102:[2,144],103:[2,144],107:[2,144],115:[2,144],123:[2,144],125:[2,144],126:[2,144],129:[2,144],130:[2,144],131:[2,144],132:[2,144],133:[2,144],134:[2,144]},{1:[2,145],6:[2,145],25:[2,145],26:[2,145],47:[2,145],52:[2,145],55:[2,145],70:[2,145],75:[2,145],83:[2,145],88:[2,145],90:[2,145],99:[2,145],100:85,101:[1,63],102:[2,145],103:[1,64],106:86,107:[1,66],108:67,115:[2,145],123:[2,145],125:[1,78],126:[1,77],129:[1,76],130:[1,79],131:[1,80],132:[1,81],133:[1,82],134:[1,83]},{1:[2,149],6:[2,149],25:[2,149],26:[2,149],47:[2,149],52:[2,149],55:[2,149],70:[2,149],75:[2,149],83:[2,149],88:[2,149],90:[2,149],99:[2,149],101:[2,149],102:[2,149],103:[2,149],107:[2,149],115:[2,149],123:[2,149],125:[2,149],126:[2,149],129:[2,149],130:[2,149],131:[2,149],132:[2,149],133:[2,149],134:[2,149]},{113:[2,151],114:[2,151]},{27:156,28:[1,71],56:157,57:158,73:[1,68],87:[1,112],110:227,112:155},{52:[1,228],113:[2,156],114:[2,156]},{52:[2,153],113:[2,153],114:[2,153]},{52:[2,154],113:[2,154],114:[2,154]},{52:[2,155],113:[2,155],114:[2,155]},{1:[2,150],6:[2,150],25:[2,150],26:[2,150],47:[2,150],52:[2,150],55:[2,150],70:[2,150],75:[2,150],83:[2,150],88:[2,150],90:[2,150],99:[2,150],101:[2,150],102:[2,150],103:[2,150],107:[2,150],115:[2,150],123:[2,150],125:[2,150],126:[2,150],129:[2,150],130:[2,150],131:[2,150],132:[2,150],133:[2,150],134:[2,150]},{8:229,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{8:230,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{6:[2,51],25:[2,51],51:231,52:[1,232],75:[2,51]},{6:[2,87],25:[2,87],26:[2,87],52:[2,87],75:[2,87]},{6:[2,37],25:[2,37],26:[2,37],41:[1,233],52:[2,37],75:[2,37]},{6:[2,40],25:[2,40],26:[2,40],52:[2,40],75:[2,40]},{6:[2,41],25:[2,41],26:[2,41],41:[2,41],52:[2,41],75:[2,41]},{6:[2,42],25:[2,42],26:[2,42],41:[2,42],52:[2,42],75:[2,42]},{6:[2,43],25:[2,43],26:[2,43],41:[2,43],52:[2,43],75:[2,43]},{1:[2,5],6:[2,5],26:[2,5],99:[2,5]},{1:[2,25],6:[2,25],25:[2,25],26:[2,25],47:[2,25],52:[2,25],55:[2,25],70:[2,25],75:[2,25],83:[2,25],88:[2,25],90:[2,25],95:[2,25],96:[2,25],99:[2,25],101:[2,25],102:[2,25],103:[2,25],107:[2,25],115:[2,25],118:[2,25],120:[2,25],123:[2,25],125:[2,25],126:[2,25],129:[2,25],130:[2,25],131:[2,25],132:[2,25],133:[2,25],134:[2,25]},{1:[2,187],6:[2,187],25:[2,187],26:[2,187],47:[2,187],52:[2,187],55:[2,187],70:[2,187],75:[2,187],83:[2,187],88:[2,187],90:[2,187],99:[2,187],100:85,101:[2,187],102:[2,187],103:[2,187],106:86,107:[2,187],108:67,115:[2,187],123:[2,187],125:[2,187],126:[2,187],129:[1,76],130:[1,79],131:[2,187],132:[2,187],133:[2,187],134:[2,187]},{1:[2,188],6:[2,188],25:[2,188],26:[2,188],47:[2,188],52:[2,188],55:[2,188],70:[2,188],75:[2,188],83:[2,188],88:[2,188],90:[2,188],99:[2,188],100:85,101:[2,188],102:[2,188],103:[2,188],106:86,107:[2,188],108:67,115:[2,188],123:[2,188],125:[2,188],126:[2,188],129:[1,76],130:[1,79],131:[2,188],132:[2,188],133:[2,188],134:[2,188]},{1:[2,189],6:[2,189],25:[2,189],26:[2,189],47:[2,189],52:[2,189],55:[2,189],70:[2,189],75:[2,189],83:[2,189],88:[2,189],90:[2,189],99:[2,189],100:85,101:[2,189],102:[2,189],103:[2,189],106:86,107:[2,189],108:67,115:[2,189],123:[2,189],125:[2,189],126:[2,189],129:[1,76],130:[2,189],131:[2,189],132:[2,189],133:[2,189],134:[2,189]},{1:[2,190],6:[2,190],25:[2,190],26:[2,190],47:[2,190],52:[2,190],55:[2,190],70:[2,190],75:[2,190],83:[2,190],88:[2,190],90:[2,190],99:[2,190],100:85,101:[2,190],102:[2,190],103:[2,190],106:86,107:[2,190],108:67,115:[2,190],123:[2,190],125:[1,78],126:[1,77],129:[1,76],130:[1,79],131:[2,190],132:[2,190],133:[2,190],134:[2,190]},{1:[2,191],6:[2,191],25:[2,191],26:[2,191],47:[2,191],52:[2,191],55:[2,191],70:[2,191],75:[2,191],83:[2,191],88:[2,191],90:[2,191],99:[2,191],100:85,101:[2,191],102:[2,191],103:[2,191],106:86,107:[2,191],108:67,115:[2,191],123:[2,191],125:[1,78],126:[1,77],129:[1,76],130:[1,79],131:[1,80],132:[2,191],133:[2,191],134:[1,83]},{1:[2,192],6:[2,192],25:[2,192],26:[2,192],47:[2,192],52:[2,192],55:[2,192],70:[2,192],75:[2,192],83:[2,192],88:[2,192],90:[2,192],99:[2,192],100:85,101:[2,192],102:[2,192],103:[2,192],106:86,107:[2,192],108:67,115:[2,192],123:[2,192],125:[1,78],126:[1,77],129:[1,76],130:[1,79],131:[1,80],132:[1,81],133:[2,192],134:[1,83]},{1:[2,193],6:[2,193],25:[2,193],26:[2,193],47:[2,193],52:[2,193],55:[2,193],70:[2,193],75:[2,193],83:[2,193],88:[2,193],90:[2,193],99:[2,193],100:85,101:[2,193],102:[2,193],103:[2,193],106:86,107:[2,193],108:67,115:[2,193],123:[2,193],125:[1,78],126:[1,77],129:[1,76],130:[1,79],131:[1,80],132:[2,193],133:[2,193],134:[2,193]},{1:[2,178],6:[2,178],25:[2,178],26:[2,178],47:[2,178],52:[2,178],55:[2,178],70:[2,178],75:[2,178],83:[2,178],88:[2,178],90:[2,178],99:[2,178],100:85,101:[1,63],102:[2,178],103:[1,64],106:86,107:[1,66],108:67,115:[2,178],123:[1,84],125:[1,78],126:[1,77],129:[1,76],130:[1,79],131:[1,80],132:[1,81],133:[1,82],134:[1,83]},{1:[2,177],6:[2,177],25:[2,177],26:[2,177],47:[2,177],52:[2,177],55:[2,177],70:[2,177],75:[2,177],83:[2,177],88:[2,177],90:[2,177],99:[2,177],100:85,101:[1,63],102:[2,177],103:[1,64],106:86,107:[1,66],108:67,115:[2,177],123:[1,84],125:[1,78],126:[1,77],129:[1,76],130:[1,79],131:[1,80],132:[1,81],133:[1,82],134:[1,83]},{1:[2,99],6:[2,99],25:[2,99],26:[2,99],47:[2,99],52:[2,99],55:[2,99],64:[2,99],65:[2,99],66:[2,99],68:[2,99],70:[2,99],71:[2,99],75:[2,99],81:[2,99],82:[2,99],83:[2,99],88:[2,99],90:[2,99],99:[2,99],101:[2,99],102:[2,99],103:[2,99],107:[2,99],115:[2,99],123:[2,99],125:[2,99],126:[2,99],129:[2,99],130:[2,99],131:[2,99],132:[2,99],133:[2,99],134:[2,99]},{1:[2,76],6:[2,76],25:[2,76],26:[2,76],38:[2,76],47:[2,76],52:[2,76],55:[2,76],64:[2,76],65:[2,76],66:[2,76],68:[2,76],70:[2,76],71:[2,76],75:[2,76],77:[2,76],81:[2,76],82:[2,76],83:[2,76],88:[2,76],90:[2,76],99:[2,76],101:[2,76],102:[2,76],103:[2,76],107:[2,76],115:[2,76],123:[2,76],125:[2,76],126:[2,76],127:[2,76],128:[2,76],129:[2,76],130:[2,76],131:[2,76],132:[2,76],133:[2,76],134:[2,76],135:[2,76]},{1:[2,77],6:[2,77],25:[2,77],26:[2,77],38:[2,77],47:[2,77],52:[2,77],55:[2,77],64:[2,77],65:[2,77],66:[2,77],68:[2,77],70:[2,77],71:[2,77],75:[2,77],77:[2,77],81:[2,77],82:[2,77],83:[2,77],88:[2,77],90:[2,77],99:[2,77],101:[2,77],102:[2,77],103:[2,77],107:[2,77],115:[2,77],123:[2,77],125:[2,77],126:[2,77],127:[2,77],128:[2,77],129:[2,77],130:[2,77],131:[2,77],132:[2,77],133:[2,77],134:[2,77],135:[2,77]},{1:[2,78],6:[2,78],25:[2,78],26:[2,78],38:[2,78],47:[2,78],52:[2,78],55:[2,78],64:[2,78],65:[2,78],66:[2,78],68:[2,78],70:[2,78],71:[2,78],75:[2,78],77:[2,78],81:[2,78],82:[2,78],83:[2,78],88:[2,78],90:[2,78],99:[2,78],101:[2,78],102:[2,78],103:[2,78],107:[2,78],115:[2,78],123:[2,78],125:[2,78],126:[2,78],127:[2,78],128:[2,78],129:[2,78],130:[2,78],131:[2,78],132:[2,78],133:[2,78],134:[2,78],135:[2,78]},{70:[1,234]},{55:[1,189],70:[2,83],89:235,90:[1,188],100:85,101:[1,63],103:[1,64],106:86,107:[1,66],108:67,123:[1,84],125:[1,78],126:[1,77],129:[1,76],130:[1,79],131:[1,80],132:[1,81],133:[1,82],134:[1,83]},{70:[2,84]},{8:236,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,70:[2,118],73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{12:[2,112],28:[2,112],30:[2,112],31:[2,112],33:[2,112],34:[2,112],35:[2,112],36:[2,112],43:[2,112],44:[2,112],45:[2,112],49:[2,112],50:[2,112],70:[2,112],73:[2,112],76:[2,112],80:[2,112],85:[2,112],86:[2,112],87:[2,112],93:[2,112],97:[2,112],98:[2,112],101:[2,112],103:[2,112],105:[2,112],107:[2,112],116:[2,112],122:[2,112],124:[2,112],125:[2,112],126:[2,112],127:[2,112],128:[2,112]},{12:[2,113],28:[2,113],30:[2,113],31:[2,113],33:[2,113],34:[2,113],35:[2,113],36:[2,113],43:[2,113],44:[2,113],45:[2,113],49:[2,113],50:[2,113],70:[2,113],73:[2,113],76:[2,113],80:[2,113],85:[2,113],86:[2,113],87:[2,113],93:[2,113],97:[2,113],98:[2,113],101:[2,113],103:[2,113],105:[2,113],107:[2,113],116:[2,113],122:[2,113],124:[2,113],125:[2,113],126:[2,113],127:[2,113],128:[2,113]},{1:[2,82],6:[2,82],25:[2,82],26:[2,82],38:[2,82],47:[2,82],52:[2,82],55:[2,82],64:[2,82],65:[2,82],66:[2,82],68:[2,82],70:[2,82],71:[2,82],75:[2,82],77:[2,82],81:[2,82],82:[2,82],83:[2,82],88:[2,82],90:[2,82],99:[2,82],101:[2,82],102:[2,82],103:[2,82],107:[2,82],115:[2,82],123:[2,82],125:[2,82],126:[2,82],127:[2,82],128:[2,82],129:[2,82],130:[2,82],131:[2,82],132:[2,82],133:[2,82],134:[2,82],135:[2,82]},{1:[2,100],6:[2,100],25:[2,100],26:[2,100],47:[2,100],52:[2,100],55:[2,100],64:[2,100],65:[2,100],66:[2,100],68:[2,100],70:[2,100],71:[2,100],75:[2,100],81:[2,100],82:[2,100],83:[2,100],88:[2,100],90:[2,100],99:[2,100],101:[2,100],102:[2,100],103:[2,100],107:[2,100],115:[2,100],123:[2,100],125:[2,100],126:[2,100],129:[2,100],130:[2,100],131:[2,100],132:[2,100],133:[2,100],134:[2,100]},{1:[2,34],6:[2,34],25:[2,34],26:[2,34],47:[2,34],52:[2,34],55:[2,34],70:[2,34],75:[2,34],83:[2,34],88:[2,34],90:[2,34],99:[2,34],100:85,101:[2,34],102:[2,34],103:[2,34],106:86,107:[2,34],108:67,115:[2,34],123:[2,34],125:[1,78],126:[1,77],129:[1,76],130:[1,79],131:[1,80],132:[1,81],133:[1,82],134:[1,83]},{8:237,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{8:238,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{1:[2,105],6:[2,105],25:[2,105],26:[2,105],47:[2,105],52:[2,105],55:[2,105],64:[2,105],65:[2,105],66:[2,105],68:[2,105],70:[2,105],71:[2,105],75:[2,105],81:[2,105],82:[2,105],83:[2,105],88:[2,105],90:[2,105],99:[2,105],101:[2,105],102:[2,105],103:[2,105],107:[2,105],115:[2,105],123:[2,105],125:[2,105],126:[2,105],129:[2,105],130:[2,105],131:[2,105],132:[2,105],133:[2,105],134:[2,105]},{6:[2,51],25:[2,51],51:239,52:[1,222],83:[2,51]},{6:[2,124],25:[2,124],26:[2,124],52:[2,124],55:[1,240],83:[2,124],88:[2,124],100:85,101:[1,63],103:[1,64],106:86,107:[1,66],108:67,123:[1,84],125:[1,78],126:[1,77],129:[1,76],130:[1,79],131:[1,80],132:[1,81],133:[1,82],134:[1,83]},{48:241,49:[1,58],50:[1,59]},{27:107,28:[1,71],42:108,53:242,54:106,56:109,57:110,73:[1,68],86:[1,111],87:[1,112]},{47:[2,57],52:[2,57]},{8:243,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{1:[2,194],6:[2,194],25:[2,194],26:[2,194],47:[2,194],52:[2,194],55:[2,194],70:[2,194],75:[2,194],83:[2,194],88:[2,194],90:[2,194],99:[2,194],100:85,101:[2,194],102:[2,194],103:[2,194],106:86,107:[2,194],108:67,115:[2,194],123:[2,194],125:[1,78],126:[1,77],129:[1,76],130:[1,79],131:[1,80],132:[1,81],133:[1,82],134:[1,83]},{8:244,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{1:[2,196],6:[2,196],25:[2,196],26:[2,196],47:[2,196],52:[2,196],55:[2,196],70:[2,196],75:[2,196],83:[2,196],88:[2,196],90:[2,196],99:[2,196],100:85,101:[2,196],102:[2,196],103:[2,196],106:86,107:[2,196],108:67,115:[2,196],123:[2,196],125:[1,78],126:[1,77],129:[1,76],130:[1,79],131:[1,80],132:[1,81],133:[1,82],134:[1,83]},{1:[2,176],6:[2,176],25:[2,176],26:[2,176],47:[2,176],52:[2,176],55:[2,176],70:[2,176],75:[2,176],83:[2,176],88:[2,176],90:[2,176],99:[2,176],101:[2,176],102:[2,176],103:[2,176],107:[2,176],115:[2,176],123:[2,176],125:[2,176],126:[2,176],129:[2,176],130:[2,176],131:[2,176],132:[2,176],133:[2,176],134:[2,176]},{8:245,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{1:[2,129],6:[2,129],25:[2,129],26:[2,129],47:[2,129],52:[2,129],55:[2,129],70:[2,129],75:[2,129],83:[2,129],88:[2,129],90:[2,129],95:[1,246],99:[2,129],101:[2,129],102:[2,129],103:[2,129],107:[2,129],115:[2,129],123:[2,129],125:[2,129],126:[2,129],129:[2,129],130:[2,129],131:[2,129],132:[2,129],133:[2,129],134:[2,129]},{5:247,25:[1,5]},{27:248,28:[1,71]},{117:249,119:212,120:[1,213]},{26:[1,250],118:[1,251],119:252,120:[1,213]},{26:[2,169],118:[2,169],120:[2,169]},{8:254,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],92:253,93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{1:[2,93],5:255,6:[2,93],25:[1,5],26:[2,93],47:[2,93],52:[2,93],55:[2,93],70:[2,93],75:[2,93],83:[2,93],88:[2,93],90:[2,93],99:[2,93],100:85,101:[1,63],102:[2,93],103:[1,64],106:86,107:[1,66],108:67,115:[2,93],123:[2,93],125:[1,78],126:[1,77],129:[1,76],130:[1,79],131:[1,80],132:[1,81],133:[1,82],134:[1,83]},{1:[2,96],6:[2,96],25:[2,96],26:[2,96],47:[2,96],52:[2,96],55:[2,96],70:[2,96],75:[2,96],83:[2,96],88:[2,96],90:[2,96],99:[2,96],101:[2,96],102:[2,96],103:[2,96],107:[2,96],115:[2,96],123:[2,96],125:[2,96],126:[2,96],129:[2,96],130:[2,96],131:[2,96],132:[2,96],133:[2,96],134:[2,96]},{8:256,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{1:[2,134],6:[2,134],25:[2,134],26:[2,134],47:[2,134],52:[2,134],55:[2,134],64:[2,134],65:[2,134],66:[2,134],68:[2,134],70:[2,134],71:[2,134],75:[2,134],81:[2,134],82:[2,134],83:[2,134],88:[2,134],90:[2,134],99:[2,134],101:[2,134],102:[2,134],103:[2,134],107:[2,134],115:[2,134],123:[2,134],125:[2,134],126:[2,134],129:[2,134],130:[2,134],131:[2,134],132:[2,134],133:[2,134],134:[2,134]},{6:[1,72],26:[1,257]},{8:258,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{6:[2,63],12:[2,113],25:[2,63],28:[2,113],30:[2,113],31:[2,113],33:[2,113],34:[2,113],35:[2,113],36:[2,113],43:[2,113],44:[2,113],45:[2,113],49:[2,113],50:[2,113],52:[2,63],73:[2,113],76:[2,113],80:[2,113],85:[2,113],86:[2,113],87:[2,113],88:[2,63],93:[2,113],97:[2,113],98:[2,113],101:[2,113],103:[2,113],105:[2,113],107:[2,113],116:[2,113],122:[2,113],124:[2,113],125:[2,113],126:[2,113],127:[2,113],128:[2,113]},{6:[1,260],25:[1,261],88:[1,259]},{6:[2,52],8:197,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,25:[2,52],26:[2,52],27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,58:145,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],83:[2,52],85:[1,56],86:[1,57],87:[1,55],88:[2,52],91:262,93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{6:[2,51],25:[2,51],26:[2,51],51:263,52:[1,222]},{1:[2,173],6:[2,173],25:[2,173],26:[2,173],47:[2,173],52:[2,173],55:[2,173],70:[2,173],75:[2,173],83:[2,173],88:[2,173],90:[2,173],99:[2,173],101:[2,173],102:[2,173],103:[2,173],107:[2,173],115:[2,173],118:[2,173],123:[2,173],125:[2,173],126:[2,173],129:[2,173],130:[2,173],131:[2,173],132:[2,173],133:[2,173],134:[2,173]},{8:264,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{8:265,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{113:[2,152],114:[2,152]},{27:156,28:[1,71],56:157,57:158,73:[1,68],87:[1,112],112:266},{1:[2,158],6:[2,158],25:[2,158],26:[2,158],47:[2,158],52:[2,158],55:[2,158],70:[2,158],75:[2,158],83:[2,158],88:[2,158],90:[2,158],99:[2,158],100:85,101:[2,158],102:[1,267],103:[2,158],106:86,107:[2,158],108:67,115:[1,268],123:[2,158],125:[1,78],126:[1,77],129:[1,76],130:[1,79],131:[1,80],132:[1,81],133:[1,82],134:[1,83]},{1:[2,159],6:[2,159],25:[2,159],26:[2,159],47:[2,159],52:[2,159],55:[2,159],70:[2,159],75:[2,159],83:[2,159],88:[2,159],90:[2,159],99:[2,159],100:85,101:[2,159],102:[1,269],103:[2,159],106:86,107:[2,159],108:67,115:[2,159],123:[2,159],125:[1,78],126:[1,77],129:[1,76],130:[1,79],131:[1,80],132:[1,81],133:[1,82],134:[1,83]},{6:[1,271],25:[1,272],75:[1,270]},{6:[2,52],11:165,25:[2,52],26:[2,52],27:166,28:[1,71],29:167,30:[1,69],31:[1,70],39:273,40:164,42:168,44:[1,46],75:[2,52],86:[1,111]},{8:274,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,25:[1,275],27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{1:[2,81],6:[2,81],25:[2,81],26:[2,81],38:[2,81],47:[2,81],52:[2,81],55:[2,81],64:[2,81],65:[2,81],66:[2,81],68:[2,81],70:[2,81],71:[2,81],75:[2,81],77:[2,81],81:[2,81],82:[2,81],83:[2,81],88:[2,81],90:[2,81],99:[2,81],101:[2,81],102:[2,81],103:[2,81],107:[2,81],115:[2,81],123:[2,81],125:[2,81],126:[2,81],127:[2,81],128:[2,81],129:[2,81],130:[2,81],131:[2,81],132:[2,81],133:[2,81],134:[2,81],135:[2,81]},{8:276,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,70:[2,116],73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{70:[2,117],100:85,101:[1,63],103:[1,64],106:86,107:[1,66],108:67,123:[1,84],125:[1,78],126:[1,77],129:[1,76],130:[1,79],131:[1,80],132:[1,81],133:[1,82],134:[1,83]},{1:[2,35],6:[2,35],25:[2,35],26:[2,35],47:[2,35],52:[2,35],55:[2,35],70:[2,35],75:[2,35],83:[2,35],88:[2,35],90:[2,35],99:[2,35],100:85,101:[2,35],102:[2,35],103:[2,35],106:86,107:[2,35],108:67,115:[2,35],123:[2,35],125:[1,78],126:[1,77],129:[1,76],130:[1,79],131:[1,80],132:[1,81],133:[1,82],134:[1,83]},{26:[1,277],100:85,101:[1,63],103:[1,64],106:86,107:[1,66],108:67,123:[1,84],125:[1,78],126:[1,77],129:[1,76],130:[1,79],131:[1,80],132:[1,81],133:[1,82],134:[1,83]},{6:[1,260],25:[1,261],83:[1,278]},{6:[2,63],25:[2,63],26:[2,63],52:[2,63],83:[2,63],88:[2,63]},{5:279,25:[1,5]},{47:[2,55],52:[2,55]},{47:[2,58],52:[2,58],100:85,101:[1,63],103:[1,64],106:86,107:[1,66],108:67,123:[1,84],125:[1,78],126:[1,77],129:[1,76],130:[1,79],131:[1,80],132:[1,81],133:[1,82],134:[1,83]},{26:[1,280],100:85,101:[1,63],103:[1,64],106:86,107:[1,66],108:67,123:[1,84],125:[1,78],126:[1,77],129:[1,76],130:[1,79],131:[1,80],132:[1,81],133:[1,82],134:[1,83]},{5:281,25:[1,5],100:85,101:[1,63],103:[1,64],106:86,107:[1,66],108:67,123:[1,84],125:[1,78],126:[1,77],129:[1,76],130:[1,79],131:[1,80],132:[1,81],133:[1,82],134:[1,83]},{5:282,25:[1,5]},{1:[2,130],6:[2,130],25:[2,130],26:[2,130],47:[2,130],52:[2,130],55:[2,130],70:[2,130],75:[2,130],83:[2,130],88:[2,130],90:[2,130],99:[2,130],101:[2,130],102:[2,130],103:[2,130],107:[2,130],115:[2,130],123:[2,130],125:[2,130],126:[2,130],129:[2,130],130:[2,130],131:[2,130],132:[2,130],133:[2,130],134:[2,130]},{5:283,25:[1,5]},{26:[1,284],118:[1,285],119:252,120:[1,213]},{1:[2,167],6:[2,167],25:[2,167],26:[2,167],47:[2,167],52:[2,167],55:[2,167],70:[2,167],75:[2,167],83:[2,167],88:[2,167],90:[2,167],99:[2,167],101:[2,167],102:[2,167],103:[2,167],107:[2,167],115:[2,167],123:[2,167],125:[2,167],126:[2,167],129:[2,167],130:[2,167],131:[2,167],132:[2,167],133:[2,167],134:[2,167]},{5:286,25:[1,5]},{26:[2,170],118:[2,170],120:[2,170]},{5:287,25:[1,5],52:[1,288]},{25:[2,126],52:[2,126],100:85,101:[1,63],103:[1,64],106:86,107:[1,66],108:67,123:[1,84],125:[1,78],126:[1,77],129:[1,76],130:[1,79],131:[1,80],132:[1,81],133:[1,82],134:[1,83]},{1:[2,94],6:[2,94],25:[2,94],26:[2,94],47:[2,94],52:[2,94],55:[2,94],70:[2,94],75:[2,94],83:[2,94],88:[2,94],90:[2,94],99:[2,94],101:[2,94],102:[2,94],103:[2,94],107:[2,94],115:[2,94],123:[2,94],125:[2,94],126:[2,94],129:[2,94],130:[2,94],131:[2,94],132:[2,94],133:[2,94],134:[2,94]},{1:[2,97],5:289,6:[2,97],25:[1,5],26:[2,97],47:[2,97],52:[2,97],55:[2,97],70:[2,97],75:[2,97],83:[2,97],88:[2,97],90:[2,97],99:[2,97],100:85,101:[1,63],102:[2,97],103:[1,64],106:86,107:[1,66],108:67,115:[2,97],123:[2,97],125:[1,78],126:[1,77],129:[1,76],130:[1,79],131:[1,80],132:[1,81],133:[1,82],134:[1,83]},{99:[1,290]},{88:[1,291],100:85,101:[1,63],103:[1,64],106:86,107:[1,66],108:67,123:[1,84],125:[1,78],126:[1,77],129:[1,76],130:[1,79],131:[1,80],132:[1,81],133:[1,82],134:[1,83]},{1:[2,111],6:[2,111],25:[2,111],26:[2,111],38:[2,111],47:[2,111],52:[2,111],55:[2,111],64:[2,111],65:[2,111],66:[2,111],68:[2,111],70:[2,111],71:[2,111],75:[2,111],81:[2,111],82:[2,111],83:[2,111],88:[2,111],90:[2,111],99:[2,111],101:[2,111],102:[2,111],103:[2,111],107:[2,111],113:[2,111],114:[2,111],115:[2,111],123:[2,111],125:[2,111],126:[2,111],129:[2,111],130:[2,111],131:[2,111],132:[2,111],133:[2,111],134:[2,111]},{8:197,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,58:145,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],91:292,93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{8:197,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,25:[1,144],27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,58:145,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],84:293,85:[1,56],86:[1,57],87:[1,55],91:143,93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{6:[2,120],25:[2,120],26:[2,120],52:[2,120],83:[2,120],88:[2,120]},{6:[1,260],25:[1,261],26:[1,294]},{1:[2,137],6:[2,137],25:[2,137],26:[2,137],47:[2,137],52:[2,137],55:[2,137],70:[2,137],75:[2,137],83:[2,137],88:[2,137],90:[2,137],99:[2,137],100:85,101:[1,63],102:[2,137],103:[1,64],106:86,107:[1,66],108:67,115:[2,137],123:[2,137],125:[1,78],126:[1,77],129:[1,76],130:[1,79],131:[1,80],132:[1,81],133:[1,82],134:[1,83]},{1:[2,139],6:[2,139],25:[2,139],26:[2,139],47:[2,139],52:[2,139],55:[2,139],70:[2,139],75:[2,139],83:[2,139],88:[2,139],90:[2,139],99:[2,139],100:85,101:[1,63],102:[2,139],103:[1,64],106:86,107:[1,66],108:67,115:[2,139],123:[2,139],125:[1,78],126:[1,77],129:[1,76],130:[1,79],131:[1,80],132:[1,81],133:[1,82],134:[1,83]},{113:[2,157],114:[2,157]},{8:295,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{8:296,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{8:297,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{1:[2,85],6:[2,85],25:[2,85],26:[2,85],38:[2,85],47:[2,85],52:[2,85],55:[2,85],64:[2,85],65:[2,85],66:[2,85],68:[2,85],70:[2,85],71:[2,85],75:[2,85],81:[2,85],82:[2,85],83:[2,85],88:[2,85],90:[2,85],99:[2,85],101:[2,85],102:[2,85],103:[2,85],107:[2,85],113:[2,85],114:[2,85],115:[2,85],123:[2,85],125:[2,85],126:[2,85],129:[2,85],130:[2,85],131:[2,85],132:[2,85],133:[2,85],134:[2,85]},{11:165,27:166,28:[1,71],29:167,30:[1,69],31:[1,70],39:298,40:164,42:168,44:[1,46],86:[1,111]},{6:[2,86],11:165,25:[2,86],26:[2,86],27:166,28:[1,71],29:167,30:[1,69],31:[1,70],39:163,40:164,42:168,44:[1,46],52:[2,86],74:299,86:[1,111]},{6:[2,88],25:[2,88],26:[2,88],52:[2,88],75:[2,88]},{6:[2,38],25:[2,38],26:[2,38],52:[2,38],75:[2,38],100:85,101:[1,63],103:[1,64],106:86,107:[1,66],108:67,123:[1,84],125:[1,78],126:[1,77],129:[1,76],130:[1,79],131:[1,80],132:[1,81],133:[1,82],134:[1,83]},{8:300,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{70:[2,115],100:85,101:[1,63],103:[1,64],106:86,107:[1,66],108:67,123:[1,84],125:[1,78],126:[1,77],129:[1,76],130:[1,79],131:[1,80],132:[1,81],133:[1,82],134:[1,83]},{1:[2,36],6:[2,36],25:[2,36],26:[2,36],47:[2,36],52:[2,36],55:[2,36],70:[2,36],75:[2,36],83:[2,36],88:[2,36],90:[2,36],99:[2,36],101:[2,36],102:[2,36],103:[2,36],107:[2,36],115:[2,36],123:[2,36],125:[2,36],126:[2,36],129:[2,36],130:[2,36],131:[2,36],132:[2,36],133:[2,36],134:[2,36]},{1:[2,106],6:[2,106],25:[2,106],26:[2,106],47:[2,106],52:[2,106],55:[2,106],64:[2,106],65:[2,106],66:[2,106],68:[2,106],70:[2,106],71:[2,106],75:[2,106],81:[2,106],82:[2,106],83:[2,106],88:[2,106],90:[2,106],99:[2,106],101:[2,106],102:[2,106],103:[2,106],107:[2,106],115:[2,106],123:[2,106],125:[2,106],126:[2,106],129:[2,106],130:[2,106],131:[2,106],132:[2,106],133:[2,106],134:[2,106]},{1:[2,47],6:[2,47],25:[2,47],26:[2,47],47:[2,47],52:[2,47],55:[2,47],70:[2,47],75:[2,47],83:[2,47],88:[2,47],90:[2,47],99:[2,47],101:[2,47],102:[2,47],103:[2,47],107:[2,47],115:[2,47],123:[2,47],125:[2,47],126:[2,47],129:[2,47],130:[2,47],131:[2,47],132:[2,47],133:[2,47],134:[2,47]},{1:[2,195],6:[2,195],25:[2,195],26:[2,195],47:[2,195],52:[2,195],55:[2,195],70:[2,195],75:[2,195],83:[2,195],88:[2,195],90:[2,195],99:[2,195],101:[2,195],102:[2,195],103:[2,195],107:[2,195],115:[2,195],123:[2,195],125:[2,195],126:[2,195],129:[2,195],130:[2,195],131:[2,195],132:[2,195],133:[2,195],134:[2,195]},{1:[2,174],6:[2,174],25:[2,174],26:[2,174],47:[2,174],52:[2,174],55:[2,174],70:[2,174],75:[2,174],83:[2,174],88:[2,174],90:[2,174],99:[2,174],101:[2,174],102:[2,174],103:[2,174],107:[2,174],115:[2,174],118:[2,174],123:[2,174],125:[2,174],126:[2,174],129:[2,174],130:[2,174],131:[2,174],132:[2,174],133:[2,174],134:[2,174]},{1:[2,131],6:[2,131],25:[2,131],26:[2,131],47:[2,131],52:[2,131],55:[2,131],70:[2,131],75:[2,131],83:[2,131],88:[2,131],90:[2,131],99:[2,131],101:[2,131],102:[2,131],103:[2,131],107:[2,131],115:[2,131],123:[2,131],125:[2,131],126:[2,131],129:[2,131],130:[2,131],131:[2,131],132:[2,131],133:[2,131],134:[2,131]},{1:[2,132],6:[2,132],25:[2,132],26:[2,132],47:[2,132],52:[2,132],55:[2,132],70:[2,132],75:[2,132],83:[2,132],88:[2,132],90:[2,132],95:[2,132],99:[2,132],101:[2,132],102:[2,132],103:[2,132],107:[2,132],115:[2,132],123:[2,132],125:[2,132],126:[2,132],129:[2,132],130:[2,132],131:[2,132],132:[2,132],133:[2,132],134:[2,132]},{1:[2,165],6:[2,165],25:[2,165],26:[2,165],47:[2,165],52:[2,165],55:[2,165],70:[2,165],75:[2,165],83:[2,165],88:[2,165],90:[2,165],99:[2,165],101:[2,165],102:[2,165],103:[2,165],107:[2,165],115:[2,165],123:[2,165],125:[2,165],126:[2,165],129:[2,165],130:[2,165],131:[2,165],132:[2,165],133:[2,165],134:[2,165]},{5:301,25:[1,5]},{26:[1,302]},{6:[1,303],26:[2,171],118:[2,171],120:[2,171]},{8:304,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{1:[2,98],6:[2,98],25:[2,98],26:[2,98],47:[2,98],52:[2,98],55:[2,98],70:[2,98],75:[2,98],83:[2,98],88:[2,98],90:[2,98],99:[2,98],101:[2,98],102:[2,98],103:[2,98],107:[2,98],115:[2,98],123:[2,98],125:[2,98],126:[2,98],129:[2,98],130:[2,98],131:[2,98],132:[2,98],133:[2,98],134:[2,98]},{1:[2,135],6:[2,135],25:[2,135],26:[2,135],47:[2,135],52:[2,135],55:[2,135],64:[2,135],65:[2,135],66:[2,135],68:[2,135],70:[2,135],71:[2,135],75:[2,135],81:[2,135],82:[2,135],83:[2,135],88:[2,135],90:[2,135],99:[2,135],101:[2,135],102:[2,135],103:[2,135],107:[2,135],115:[2,135],123:[2,135],125:[2,135],126:[2,135],129:[2,135],130:[2,135],131:[2,135],132:[2,135],133:[2,135],134:[2,135]},{1:[2,114],6:[2,114],25:[2,114],26:[2,114],47:[2,114],52:[2,114],55:[2,114],64:[2,114],65:[2,114],66:[2,114],68:[2,114],70:[2,114],71:[2,114],75:[2,114],81:[2,114],82:[2,114],83:[2,114],88:[2,114],90:[2,114],99:[2,114],101:[2,114],102:[2,114],103:[2,114],107:[2,114],115:[2,114],123:[2,114],125:[2,114],126:[2,114],129:[2,114],130:[2,114],131:[2,114],132:[2,114],133:[2,114],134:[2,114]},{6:[2,121],25:[2,121],26:[2,121],52:[2,121],83:[2,121],88:[2,121]},{6:[2,51],25:[2,51],26:[2,51],51:305,52:[1,222]},{6:[2,122],25:[2,122],26:[2,122],52:[2,122],83:[2,122],88:[2,122]},{1:[2,160],6:[2,160],25:[2,160],26:[2,160],47:[2,160],52:[2,160],55:[2,160],70:[2,160],75:[2,160],83:[2,160],88:[2,160],90:[2,160],99:[2,160],100:85,101:[2,160],102:[2,160],103:[2,160],106:86,107:[2,160],108:67,115:[1,306],123:[2,160],125:[1,78],126:[1,77],129:[1,76],130:[1,79],131:[1,80],132:[1,81],133:[1,82],134:[1,83]},{1:[2,162],6:[2,162],25:[2,162],26:[2,162],47:[2,162],52:[2,162],55:[2,162],70:[2,162],75:[2,162],83:[2,162],88:[2,162],90:[2,162],99:[2,162],100:85,101:[2,162],102:[1,307],103:[2,162],106:86,107:[2,162],108:67,115:[2,162],123:[2,162],125:[1,78],126:[1,77],129:[1,76],130:[1,79],131:[1,80],132:[1,81],133:[1,82],134:[1,83]},{1:[2,161],6:[2,161],25:[2,161],26:[2,161],47:[2,161],52:[2,161],55:[2,161],70:[2,161],75:[2,161],83:[2,161],88:[2,161],90:[2,161],99:[2,161],100:85,101:[2,161],102:[2,161],103:[2,161],106:86,107:[2,161],108:67,115:[2,161],123:[2,161],125:[1,78],126:[1,77],129:[1,76],130:[1,79],131:[1,80],132:[1,81],133:[1,82],134:[1,83]},{6:[2,89],25:[2,89],26:[2,89],52:[2,89],75:[2,89]},{6:[2,51],25:[2,51],26:[2,51],51:308,52:[1,232]},{26:[1,309],100:85,101:[1,63],103:[1,64],106:86,107:[1,66],108:67,123:[1,84],125:[1,78],126:[1,77],129:[1,76],130:[1,79],131:[1,80],132:[1,81],133:[1,82],134:[1,83]},{26:[1,310]},{1:[2,168],6:[2,168],25:[2,168],26:[2,168],47:[2,168],52:[2,168],55:[2,168],70:[2,168],75:[2,168],83:[2,168],88:[2,168],90:[2,168],99:[2,168],101:[2,168],102:[2,168],103:[2,168],107:[2,168],115:[2,168],123:[2,168],125:[2,168],126:[2,168],129:[2,168],130:[2,168],131:[2,168],132:[2,168],133:[2,168],134:[2,168]},{26:[2,172],118:[2,172],120:[2,172]},{25:[2,127],52:[2,127],100:85,101:[1,63],103:[1,64],106:86,107:[1,66],108:67,123:[1,84],125:[1,78],126:[1,77],129:[1,76],130:[1,79],131:[1,80],132:[1,81],133:[1,82],134:[1,83]},{6:[1,260],25:[1,261],26:[1,311]},{8:312,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{8:313,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{6:[1,271],25:[1,272],26:[1,314]},{6:[2,39],25:[2,39],26:[2,39],52:[2,39],75:[2,39]},{1:[2,166],6:[2,166],25:[2,166],26:[2,166],47:[2,166],52:[2,166],55:[2,166],70:[2,166],75:[2,166],83:[2,166],88:[2,166],90:[2,166],99:[2,166],101:[2,166],102:[2,166],103:[2,166],107:[2,166],115:[2,166],123:[2,166],125:[2,166],126:[2,166],129:[2,166],130:[2,166],131:[2,166],132:[2,166],133:[2,166],134:[2,166]},{6:[2,123],25:[2,123],26:[2,123],52:[2,123],83:[2,123],88:[2,123]},{1:[2,163],6:[2,163],25:[2,163],26:[2,163],47:[2,163],52:[2,163],55:[2,163],70:[2,163],75:[2,163],83:[2,163],88:[2,163],90:[2,163],99:[2,163],100:85,101:[2,163],102:[2,163],103:[2,163],106:86,107:[2,163],108:67,115:[2,163],123:[2,163],125:[1,78],126:[1,77],129:[1,76],130:[1,79],131:[1,80],132:[1,81],133:[1,82],134:[1,83]},{1:[2,164],6:[2,164],25:[2,164],26:[2,164],47:[2,164],52:[2,164],55:[2,164],70:[2,164],75:[2,164],83:[2,164],88:[2,164],90:[2,164],99:[2,164],100:85,101:[2,164],102:[2,164],103:[2,164],106:86,107:[2,164],108:67,115:[2,164],123:[2,164],125:[1,78],126:[1,77],129:[1,76],130:[1,79],131:[1,80],132:[1,81],133:[1,82],134:[1,83]},{6:[2,90],25:[2,90],26:[2,90],52:[2,90],75:[2,90]}],
-defaultActions: {58:[2,49],59:[2,50],73:[2,3],92:[2,104],186:[2,84]},
-parseError: function parseError(str, hash) {
-    throw new Error(str);
-},
-parse: function parse(input) {
-    var self = this, stack = [0], vstack = [null], lstack = [], table = this.table, yytext = "", yylineno = 0, yyleng = 0, recovering = 0, TERROR = 2, EOF = 1;
-    this.lexer.setInput(input);
-    this.lexer.yy = this.yy;
-    this.yy.lexer = this.lexer;
-    if (typeof this.lexer.yylloc == "undefined")
-        this.lexer.yylloc = {};
-    var yyloc = this.lexer.yylloc;
-    lstack.push(yyloc);
-    if (typeof this.yy.parseError === "function")
-        this.parseError = this.yy.parseError;
-    function popStack(n) {
-        stack.length = stack.length - 2 * n;
-        vstack.length = vstack.length - n;
-        lstack.length = lstack.length - n;
-    }
-    function lex() {
-        var token;
-        token = self.lexer.lex() || 1;
-        if (typeof token !== "number") {
-            token = self.symbols_[token] || token;
-        }
-        return token;
-    }
-    var symbol, preErrorSymbol, state, action, a, r, yyval = {}, p, len, newState, expected;
-    while (true) {
-        state = stack[stack.length - 1];
-        if (this.defaultActions[state]) {
-            action = this.defaultActions[state];
-        } else {
-            if (symbol == null)
-                symbol = lex();
-            action = table[state] && table[state][symbol];
-        }
-        if (typeof action === "undefined" || !action.length || !action[0]) {
-            if (!recovering) {
-                expected = [];
-                for (p in table[state])
-                    if (this.terminals_[p] && p > 2) {
-                        expected.push("'" + this.terminals_[p] + "'");
-                    }
-                var errStr = "";
-                if (this.lexer.showPosition) {
-                    errStr = "Parse error on line " + (yylineno + 1) + ":\n" + this.lexer.showPosition() + "\nExpecting " + expected.join(", ") + ", got '" + this.terminals_[symbol] + "'";
-                } else {
-                    errStr = "Parse error on line " + (yylineno + 1) + ": Unexpected " + (symbol == 1?"end of input":"'" + (this.terminals_[symbol] || symbol) + "'");
-                }
-                this.parseError(errStr, {text: this.lexer.match, token: this.terminals_[symbol] || symbol, line: this.lexer.yylineno, loc: yyloc, expected: expected});
-            }
-        }
-        if (action[0] instanceof Array && action.length > 1) {
-            throw new Error("Parse Error: multiple actions possible at state: " + state + ", token: " + symbol);
-        }
-        switch (action[0]) {
-        case 1:
-            stack.push(symbol);
-            vstack.push(this.lexer.yytext);
-            lstack.push(this.lexer.yylloc);
-            stack.push(action[1]);
-            symbol = null;
-            if (!preErrorSymbol) {
-                yyleng = this.lexer.yyleng;
-                yytext = this.lexer.yytext;
-                yylineno = this.lexer.yylineno;
-                yyloc = this.lexer.yylloc;
-                if (recovering > 0)
-                    recovering--;
-            } else {
-                symbol = preErrorSymbol;
-                preErrorSymbol = null;
-            }
-            break;
-        case 2:
-            len = this.productions_[action[1]][1];
-            yyval.$ = vstack[vstack.length - len];
-            yyval._$ = {first_line: lstack[lstack.length - (len || 1)].first_line, last_line: lstack[lstack.length - 1].last_line, first_column: lstack[lstack.length - (len || 1)].first_column, last_column: lstack[lstack.length - 1].last_column};
-            r = this.performAction.call(yyval, yytext, yyleng, yylineno, this.yy, action[1], vstack, lstack);
-            if (typeof r !== "undefined") {
-                return r;
-            }
-            if (len) {
-                stack = stack.slice(0, -1 * len * 2);
-                vstack = vstack.slice(0, -1 * len);
-                lstack = lstack.slice(0, -1 * len);
-            }
-            stack.push(this.productions_[action[1]][0]);
-            vstack.push(yyval.$);
-            lstack.push(yyval._$);
-            newState = table[stack[stack.length - 2]][stack[stack.length - 1]];
-            stack.push(newState);
-            break;
-        case 3:
-            return true;
-        }
-    }
-    return true;
-}
-};
-
-module.exports = parser;
-
-
-});/**
- * Copyright (c) 2011 Jeremy Ashkenas
- * 
- * 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.
- */
-
-define('ace/mode/coffee/nodes', ['require', 'exports', 'module' , 'ace/mode/coffee/scope', 'ace/mode/coffee/lexer', 'ace/mode/coffee/helpers'], function(require, exports, module) {
-// Generated by CoffeeScript 1.2.1-pre
-
-  var Access, Arr, Assign, Base, Block, Call, Class, Closure, Code, Comment, Existence, Extends, For, IDENTIFIER, IDENTIFIER_STR, IS_STRING, If, In, Index, LEVEL_ACCESS, LEVEL_COND, LEVEL_LIST, LEVEL_OP, LEVEL_PAREN, LEVEL_TOP, Literal, METHOD_DEF, NEGATE, NO, Obj, Op, Param, Parens, RESERVED, Range, Return, SIMPLENUM, STRICT_PROSCRIBED, Scope, Slice, Splat, Switch, TAB, THIS, Throw, Try, UTILITIES, Value, While, YES, compact, del, ends, extend, flatten, last, merge, multident, starts, unfoldSoak, utility, _ref, _ref1,
-    __hasProp = {}.hasOwnProperty,
-    __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor; child.__super__ = parent.prototype; return child; },
-    __indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; };
-
-  Scope = require('./scope').Scope;
-
-  _ref = require('./lexer'), RESERVED = _ref.RESERVED, STRICT_PROSCRIBED = _ref.STRICT_PROSCRIBED;
-
-  _ref1 = require('./helpers'), compact = _ref1.compact, flatten = _ref1.flatten, extend = _ref1.extend, merge = _ref1.merge, del = _ref1.del, starts = _ref1.starts, ends = _ref1.ends, last = _ref1.last;
-
-  exports.extend = extend;
-
-  YES = function() {
-    return true;
-  };
-
-  NO = function() {
-    return false;
-  };
-
-  THIS = function() {
-    return this;
-  };
-
-  NEGATE = function() {
-    this.negated = !this.negated;
-    return this;
-  };
-
-  exports.Base = Base = (function() {
-
-    Base.name = 'Base';
-
-    function Base() {}
-
-    Base.prototype.compile = function(o, lvl) {
-      var node;
-      o = extend({}, o);
-      if (lvl) o.level = lvl;
-      node = this.unfoldSoak(o) || this;
-      node.tab = o.indent;
-      if (o.level === LEVEL_TOP || !node.isStatement(o)) {
-        return node.compileNode(o);
-      } else {
-        return node.compileClosure(o);
-      }
-    };
-
-    Base.prototype.compileClosure = function(o) {
-      if (this.jumps()) {
-        throw SyntaxError('cannot use a pure statement in an expression.');
-      }
-      o.sharedScope = true;
-      return Closure.wrap(this).compileNode(o);
-    };
-
-    Base.prototype.cache = function(o, level, reused) {
-      var ref, sub;
-      if (!this.isComplex()) {
-        ref = level ? this.compile(o, level) : this;
-        return [ref, ref];
-      } else {
-        ref = new Literal(reused || o.scope.freeVariable('ref'));
-        sub = new Assign(ref, this);
-        if (level) {
-          return [sub.compile(o, level), ref.value];
-        } else {
-          return [sub, ref];
-        }
-      }
-    };
-
-    Base.prototype.compileLoopReference = function(o, name) {
-      var src, tmp;
-      src = tmp = this.compile(o, LEVEL_LIST);
-      if (!((-Infinity < +src && +src < Infinity) || IDENTIFIER.test(src) && o.scope.check(src, true))) {
-        src = "" + (tmp = o.scope.freeVariable(name)) + " = " + src;
-      }
-      return [src, tmp];
-    };
-
-    Base.prototype.makeReturn = function(res) {
-      var me;
-      me = this.unwrapAll();
-      if (res) {
-        return new Call(new Literal("" + res + ".push"), [me]);
-      } else {
-        return new Return(me);
-      }
-    };
-
-    Base.prototype.contains = function(pred) {
-      var contains;
-      contains = false;
-      this.traverseChildren(false, function(node) {
-        if (pred(node)) {
-          contains = true;
-          return false;
-        }
-      });
-      return contains;
-    };
-
-    Base.prototype.containsType = function(type) {
-      return this instanceof type || this.contains(function(node) {
-        return node instanceof type;
-      });
-    };
-
-    Base.prototype.lastNonComment = function(list) {
-      var i;
-      i = list.length;
-      while (i--) {
-        if (!(list[i] instanceof Comment)) return list[i];
-      }
-      return null;
-    };
-
-    Base.prototype.toString = function(idt, name) {
-      var tree;
-      if (idt == null) idt = '';
-      if (name == null) name = this.constructor.name;
-      tree = '\n' + idt + name;
-      if (this.soak) tree += '?';
-      this.eachChild(function(node) {
-        return tree += node.toString(idt + TAB);
-      });
-      return tree;
-    };
-
-    Base.prototype.eachChild = function(func) {
-      var attr, child, _i, _j, _len, _len1, _ref2, _ref3;
-      if (!this.children) return this;
-      _ref2 = this.children;
-      for (_i = 0, _len = _ref2.length; _i < _len; _i++) {
-        attr = _ref2[_i];
-        if (this[attr]) {
-          _ref3 = flatten([this[attr]]);
-          for (_j = 0, _len1 = _ref3.length; _j < _len1; _j++) {
-            child = _ref3[_j];
-            if (func(child) === false) return this;
-          }
-        }
-      }
-      return this;
-    };
-
-    Base.prototype.traverseChildren = function(crossScope, func) {
-      return this.eachChild(function(child) {
-        if (func(child) === false) return false;
-        return child.traverseChildren(crossScope, func);
-      });
-    };
-
-    Base.prototype.invert = function() {
-      return new Op('!', this);
-    };
-
-    Base.prototype.unwrapAll = function() {
-      var node;
-      node = this;
-      while (node !== (node = node.unwrap())) {
-        continue;
-      }
-      return node;
-    };
-
-    Base.prototype.children = [];
-
-    Base.prototype.isStatement = NO;
-
-    Base.prototype.jumps = NO;
-
-    Base.prototype.isComplex = YES;
-
-    Base.prototype.isChainable = NO;
-
-    Base.prototype.isAssignable = NO;
-
-    Base.prototype.unwrap = THIS;
-
-    Base.prototype.unfoldSoak = NO;
-
-    Base.prototype.assigns = NO;
-
-    return Base;
-
-  })();
-
-  exports.Block = Block = (function(_super) {
-
-    __extends(Block, _super);
-
-    Block.name = 'Block';
-
-    function Block(nodes) {
-      this.expressions = compact(flatten(nodes || []));
-    }
-
-    Block.prototype.children = ['expressions'];
-
-    Block.prototype.push = function(node) {
-      this.expressions.push(node);
-      return this;
-    };
-
-    Block.prototype.pop = function() {
-      return this.expressions.pop();
-    };
-
-    Block.prototype.unshift = function(node) {
-      this.expressions.unshift(node);
-      return this;
-    };
-
-    Block.prototype.unwrap = function() {
-      if (this.expressions.length === 1) {
-        return this.expressions[0];
-      } else {
-        return this;
-      }
-    };
-
-    Block.prototype.isEmpty = function() {
-      return !this.expressions.length;
-    };
-
-    Block.prototype.isStatement = function(o) {
-      var exp, _i, _len, _ref2;
-      _ref2 = this.expressions;
-      for (_i = 0, _len = _ref2.length; _i < _len; _i++) {
-        exp = _ref2[_i];
-        if (exp.isStatement(o)) return true;
-      }
-      return false;
-    };
-
-    Block.prototype.jumps = function(o) {
-      var exp, _i, _len, _ref2;
-      _ref2 = this.expressions;
-      for (_i = 0, _len = _ref2.length; _i < _len; _i++) {
-        exp = _ref2[_i];
-        if (exp.jumps(o)) return exp;
-      }
-    };
-
-    Block.prototype.makeReturn = function(res) {
-      var expr, len;
-      len = this.expressions.length;
-      while (len--) {
-        expr = this.expressions[len];
-        if (!(expr instanceof Comment)) {
-          this.expressions[len] = expr.makeReturn(res);
-          if (expr instanceof Return && !expr.expression) {
-            this.expressions.splice(len, 1);
-          }
-          break;
-        }
-      }
-      return this;
-    };
-
-    Block.prototype.compile = function(o, level) {
-      if (o == null) o = {};
-      if (o.scope) {
-        return Block.__super__.compile.call(this, o, level);
-      } else {
-        return this.compileRoot(o);
-      }
-    };
-
-    Block.prototype.compileNode = function(o) {
-      var code, codes, node, top, _i, _len, _ref2;
-      this.tab = o.indent;
-      top = o.level === LEVEL_TOP;
-      codes = [];
-      _ref2 = this.expressions;
-      for (_i = 0, _len = _ref2.length; _i < _len; _i++) {
-        node = _ref2[_i];
-        node = node.unwrapAll();
-        node = node.unfoldSoak(o) || node;
-        if (node instanceof Block) {
-          codes.push(node.compileNode(o));
-        } else if (top) {
-          node.front = true;
-          code = node.compile(o);
-          if (!node.isStatement(o)) {
-            code = "" + this.tab + code + ";";
-            if (node instanceof Literal) code = "" + code + "\n";
-          }
-          codes.push(code);
-        } else {
-          codes.push(node.compile(o, LEVEL_LIST));
-        }
-      }
-      if (top) {
-        if (this.spaced) {
-          return "\n" + (codes.join('\n\n')) + "\n";
-        } else {
-          return codes.join('\n');
-        }
-      }
-      code = codes.join(', ') || 'void 0';
-      if (codes.length > 1 && o.level >= LEVEL_LIST) {
-        return "(" + code + ")";
-      } else {
-        return code;
-      }
-    };
-
-    Block.prototype.compileRoot = function(o) {
-      var code, exp, i, prelude, preludeExps, rest;
-      o.indent = o.bare ? '' : TAB;
-      o.scope = new Scope(null, this, null);
-      o.level = LEVEL_TOP;
-      this.spaced = true;
-      prelude = "";
-      if (!o.bare) {
-        preludeExps = (function() {
-          var _i, _len, _ref2, _results;
-          _ref2 = this.expressions;
-          _results = [];
-          for (i = _i = 0, _len = _ref2.length; _i < _len; i = ++_i) {
-            exp = _ref2[i];
-            if (!(exp.unwrap() instanceof Comment)) break;
-            _results.push(exp);
-          }
-          return _results;
-        }).call(this);
-        rest = this.expressions.slice(preludeExps.length);
-        this.expressions = preludeExps;
-        if (preludeExps.length) {
-          prelude = "" + (this.compileNode(merge(o, {
-            indent: ''
-          }))) + "\n";
-        }
-        this.expressions = rest;
-      }
-      code = this.compileWithDeclarations(o);
-      if (o.bare) return code;
-      return "" + prelude + "(function() {\n" + code + "\n}).call(this);\n";
-    };
-
-    Block.prototype.compileWithDeclarations = function(o) {
-      var assigns, code, declars, exp, i, post, rest, scope, spaced, _i, _len, _ref2, _ref3, _ref4;
-      code = post = '';
-      _ref2 = this.expressions;
-      for (i = _i = 0, _len = _ref2.length; _i < _len; i = ++_i) {
-        exp = _ref2[i];
-        exp = exp.unwrap();
-        if (!(exp instanceof Comment || exp instanceof Literal)) break;
-      }
-      o = merge(o, {
-        level: LEVEL_TOP
-      });
-      if (i) {
-        rest = this.expressions.splice(i, 9e9);
-        _ref3 = [this.spaced, false], spaced = _ref3[0], this.spaced = _ref3[1];
-        _ref4 = [this.compileNode(o), spaced], code = _ref4[0], this.spaced = _ref4[1];
-        this.expressions = rest;
-      }
-      post = this.compileNode(o);
-      scope = o.scope;
-      if (scope.expressions === this) {
-        declars = o.scope.hasDeclarations();
-        assigns = scope.hasAssignments;
-        if (declars || assigns) {
-          if (i) code += '\n';
-          code += "" + this.tab + "var ";
-          if (declars) code += scope.declaredVariables().join(', ');
-          if (assigns) {
-            if (declars) code += ",\n" + (this.tab + TAB);
-            code += scope.assignedVariables().join(",\n" + (this.tab + TAB));
-          }
-          code += ';\n';
-        }
-      }
-      return code + post;
-    };
-
-    Block.wrap = function(nodes) {
-      if (nodes.length === 1 && nodes[0] instanceof Block) return nodes[0];
-      return new Block(nodes);
-    };
-
-    return Block;
-
-  })(Base);
-
-  exports.Literal = Literal = (function(_super) {
-
-    __extends(Literal, _super);
-
-    Literal.name = 'Literal';
-
-    function Literal(value) {
-      this.value = value;
-    }
-
-    Literal.prototype.makeReturn = function() {
-      if (this.isStatement()) {
-        return this;
-      } else {
-        return Literal.__super__.makeReturn.apply(this, arguments);
-      }
-    };
-
-    Literal.prototype.isAssignable = function() {
-      return IDENTIFIER.test(this.value);
-    };
-
-    Literal.prototype.isStatement = function() {
-      var _ref2;
-      return (_ref2 = this.value) === 'break' || _ref2 === 'continue' || _ref2 === 'debugger';
-    };
-
-    Literal.prototype.isComplex = NO;
-
-    Literal.prototype.assigns = function(name) {
-      return name === this.value;
-    };
-
-    Literal.prototype.jumps = function(o) {
-      if (this.value === 'break' && !((o != null ? o.loop : void 0) || (o != null ? o.block : void 0))) {
-        return this;
-      }
-      if (this.value === 'continue' && !(o != null ? o.loop : void 0)) return this;
-    };
-
-    Literal.prototype.compileNode = function(o) {
-      var code, _ref2;
-      code = this.isUndefined ? o.level >= LEVEL_ACCESS ? '(void 0)' : 'void 0' : this.value === 'this' ? ((_ref2 = o.scope.method) != null ? _ref2.bound : void 0) ? o.scope.method.context : this.value : this.value.reserved ? "\"" + this.value + "\"" : this.value;
-      if (this.isStatement()) {
-        return "" + this.tab + code + ";";
-      } else {
-        return code;
-      }
-    };
-
-    Literal.prototype.toString = function() {
-      return ' "' + this.value + '"';
-    };
-
-    return Literal;
-
-  })(Base);
-
-  exports.Return = Return = (function(_super) {
-
-    __extends(Return, _super);
-
-    Return.name = 'Return';
-
-    function Return(expr) {
-      if (expr && !expr.unwrap().isUndefined) this.expression = expr;
-    }
-
-    Return.prototype.children = ['expression'];
-
-    Return.prototype.isStatement = YES;
-
-    Return.prototype.makeReturn = THIS;
-
-    Return.prototype.jumps = THIS;
-
-    Return.prototype.compile = function(o, level) {
-      var expr, _ref2;
-      expr = (_ref2 = this.expression) != null ? _ref2.makeReturn() : void 0;
-      if (expr && !(expr instanceof Return)) {
-        return expr.compile(o, level);
-      } else {
-        return Return.__super__.compile.call(this, o, level);
-      }
-    };
-
-    Return.prototype.compileNode = function(o) {
-      return this.tab + ("return" + [this.expression ? " " + (this.expression.compile(o, LEVEL_PAREN)) : void 0] + ";");
-    };
-
-    return Return;
-
-  })(Base);
-
-  exports.Value = Value = (function(_super) {
-
-    __extends(Value, _super);
-
-    Value.name = 'Value';
-
-    function Value(base, props, tag) {
-      if (!props && base instanceof Value) return base;
-      this.base = base;
-      this.properties = props || [];
-      if (tag) this[tag] = true;
-      return this;
-    }
-
-    Value.prototype.children = ['base', 'properties'];
-
-    Value.prototype.add = function(props) {
-      this.properties = this.properties.concat(props);
-      return this;
-    };
-
-    Value.prototype.hasProperties = function() {
-      return !!this.properties.length;
-    };
-
-    Value.prototype.isArray = function() {
-      return !this.properties.length && this.base instanceof Arr;
-    };
-
-    Value.prototype.isComplex = function() {
-      return this.hasProperties() || this.base.isComplex();
-    };
-
-    Value.prototype.isAssignable = function() {
-      return this.hasProperties() || this.base.isAssignable();
-    };
-
-    Value.prototype.isSimpleNumber = function() {
-      return this.base instanceof Literal && SIMPLENUM.test(this.base.value);
-    };
-
-    Value.prototype.isString = function() {
-      return this.base instanceof Literal && IS_STRING.test(this.base.value);
-    };
-
-    Value.prototype.isAtomic = function() {
-      var node, _i, _len, _ref2;
-      _ref2 = this.properties.concat(this.base);
-      for (_i = 0, _len = _ref2.length; _i < _len; _i++) {
-        node = _ref2[_i];
-        if (node.soak || node instanceof Call) return false;
-      }
-      return true;
-    };
-
-    Value.prototype.isStatement = function(o) {
-      return !this.properties.length && this.base.isStatement(o);
-    };
-
-    Value.prototype.assigns = function(name) {
-      return !this.properties.length && this.base.assigns(name);
-    };
-
-    Value.prototype.jumps = function(o) {
-      return !this.properties.length && this.base.jumps(o);
-    };
-
-    Value.prototype.isObject = function(onlyGenerated) {
-      if (this.properties.length) return false;
-      return (this.base instanceof Obj) && (!onlyGenerated || this.base.generated);
-    };
-
-    Value.prototype.isSplice = function() {
-      return last(this.properties) instanceof Slice;
-    };
-
-    Value.prototype.unwrap = function() {
-      if (this.properties.length) {
-        return this;
-      } else {
-        return this.base;
-      }
-    };
-
-    Value.prototype.cacheReference = function(o) {
-      var base, bref, name, nref;
-      name = last(this.properties);
-      if (this.properties.length < 2 && !this.base.isComplex() && !(name != null ? name.isComplex() : void 0)) {
-        return [this, this];
-      }
-      base = new Value(this.base, this.properties.slice(0, -1));
-      if (base.isComplex()) {
-        bref = new Literal(o.scope.freeVariable('base'));
-        base = new Value(new Parens(new Assign(bref, base)));
-      }
-      if (!name) return [base, bref];
-      if (name.isComplex()) {
-        nref = new Literal(o.scope.freeVariable('name'));
-        name = new Index(new Assign(nref, name.index));
-        nref = new Index(nref);
-      }
-      return [base.add(name), new Value(bref || base.base, [nref || name])];
-    };
-
-    Value.prototype.compileNode = function(o) {
-      var code, prop, props, _i, _len;
-      this.base.front = this.front;
-      props = this.properties;
-      code = this.base.compile(o, props.length ? LEVEL_ACCESS : null);
-      if ((this.base instanceof Parens || props.length) && SIMPLENUM.test(code)) {
-        code = "" + code + ".";
-      }
-      for (_i = 0, _len = props.length; _i < _len; _i++) {
-        prop = props[_i];
-        code += prop.compile(o);
-      }
-      return code;
-    };
-
-    Value.prototype.unfoldSoak = function(o) {
-      var result,
-        _this = this;
-      if (this.unfoldedSoak != null) return this.unfoldedSoak;
-      result = (function() {
-        var fst, i, ifn, prop, ref, snd, _i, _len, _ref2;
-        if (ifn = _this.base.unfoldSoak(o)) {
-          Array.prototype.push.apply(ifn.body.properties, _this.properties);
-          return ifn;
-        }
-        _ref2 = _this.properties;
-        for (i = _i = 0, _len = _ref2.length; _i < _len; i = ++_i) {
-          prop = _ref2[i];
-          if (!prop.soak) continue;
-          prop.soak = false;
-          fst = new Value(_this.base, _this.properties.slice(0, i));
-          snd = new Value(_this.base, _this.properties.slice(i));
-          if (fst.isComplex()) {
-            ref = new Literal(o.scope.freeVariable('ref'));
-            fst = new Parens(new Assign(ref, fst));
-            snd.base = ref;
-          }
-          return new If(new Existence(fst), snd, {
-            soak: true
-          });
-        }
-        return null;
-      })();
-      return this.unfoldedSoak = result || false;
-    };
-
-    return Value;
-
-  })(Base);
-
-  exports.Comment = Comment = (function(_super) {
-
-    __extends(Comment, _super);
-
-    Comment.name = 'Comment';
-
-    function Comment(comment) {
-      this.comment = comment;
-    }
-
-    Comment.prototype.isStatement = YES;
-
-    Comment.prototype.makeReturn = THIS;
-
-    Comment.prototype.compileNode = function(o, level) {
-      var code;
-      code = '/*' + multident(this.comment, this.tab) + ("\n" + this.tab + "*/\n");
-      if ((level || o.level) === LEVEL_TOP) code = o.indent + code;
-      return code;
-    };
-
-    return Comment;
-
-  })(Base);
-
-  exports.Call = Call = (function(_super) {
-
-    __extends(Call, _super);
-
-    Call.name = 'Call';
-
-    function Call(variable, args, soak) {
-      this.args = args != null ? args : [];
-      this.soak = soak;
-      this.isNew = false;
-      this.isSuper = variable === 'super';
-      this.variable = this.isSuper ? null : variable;
-    }
-
-    Call.prototype.children = ['variable', 'args'];
-
-    Call.prototype.newInstance = function() {
-      var base, _ref2;
-      base = ((_ref2 = this.variable) != null ? _ref2.base : void 0) || this.variable;
-      if (base instanceof Call && !base.isNew) {
-        base.newInstance();
-      } else {
-        this.isNew = true;
-      }
-      return this;
-    };
-
-    Call.prototype.superReference = function(o) {
-      var accesses, method, name;
-      method = o.scope.method;
-      if (!method) throw SyntaxError('cannot call super outside of a function.');
-      name = method.name;
-      if (name == null) {
-        throw SyntaxError('cannot call super on an anonymous function.');
-      }
-      if (method.klass) {
-        accesses = [new Access(new Literal('__super__'))];
-        if (method["static"]) {
-          accesses.push(new Access(new Literal('constructor')));
-        }
-        accesses.push(new Access(new Literal(name)));
-        return (new Value(new Literal(method.klass), accesses)).compile(o);
-      } else {
-        return "" + name + ".__super__.constructor";
-      }
-    };
-
-    Call.prototype.unfoldSoak = function(o) {
-      var call, ifn, left, list, rite, _i, _len, _ref2, _ref3;
-      if (this.soak) {
-        if (this.variable) {
-          if (ifn = unfoldSoak(o, this, 'variable')) return ifn;
-          _ref2 = new Value(this.variable).cacheReference(o), left = _ref2[0], rite = _ref2[1];
-        } else {
-          left = new Literal(this.superReference(o));
-          rite = new Value(left);
-        }
-        rite = new Call(rite, this.args);
-        rite.isNew = this.isNew;
-        left = new Literal("typeof " + (left.compile(o)) + " === \"function\"");
-        return new If(left, new Value(rite), {
-          soak: true
-        });
-      }
-      call = this;
-      list = [];
-      while (true) {
-        if (call.variable instanceof Call) {
-          list.push(call);
-          call = call.variable;
-          continue;
-        }
-        if (!(call.variable instanceof Value)) break;
-        list.push(call);
-        if (!((call = call.variable.base) instanceof Call)) break;
-      }
-      _ref3 = list.reverse();
-      for (_i = 0, _len = _ref3.length; _i < _len; _i++) {
-        call = _ref3[_i];
-        if (ifn) {
-          if (call.variable instanceof Call) {
-            call.variable = ifn;
-          } else {
-            call.variable.base = ifn;
-          }
-        }
-        ifn = unfoldSoak(o, call, 'variable');
-      }
-      return ifn;
-    };
-
-    Call.prototype.filterImplicitObjects = function(list) {
-      var node, nodes, obj, prop, properties, _i, _j, _len, _len1, _ref2;
-      nodes = [];
-      for (_i = 0, _len = list.length; _i < _len; _i++) {
-        node = list[_i];
-        if (!((typeof node.isObject === "function" ? node.isObject() : void 0) && node.base.generated)) {
-          nodes.push(node);
-          continue;
-        }
-        obj = null;
-        _ref2 = node.base.properties;
-        for (_j = 0, _len1 = _ref2.length; _j < _len1; _j++) {
-          prop = _ref2[_j];
-          if (prop instanceof Assign || prop instanceof Comment) {
-            if (!obj) nodes.push(obj = new Obj(properties = [], true));
-            properties.push(prop);
-          } else {
-            nodes.push(prop);
-            obj = null;
-          }
-        }
-      }
-      return nodes;
-    };
-
-    Call.prototype.compileNode = function(o) {
-      var arg, args, code, _ref2;
-      if ((_ref2 = this.variable) != null) _ref2.front = this.front;
-      if (code = Splat.compileSplattedArray(o, this.args, true)) {
-        return this.compileSplat(o, code);
-      }
-      args = this.filterImplicitObjects(this.args);
-      args = ((function() {
-        var _i, _len, _results;
-        _results = [];
-        for (_i = 0, _len = args.length; _i < _len; _i++) {
-          arg = args[_i];
-          _results.push(arg.compile(o, LEVEL_LIST));
-        }
-        return _results;
-      })()).join(', ');
-      if (this.isSuper) {
-        return this.superReference(o) + (".call(this" + (args && ', ' + args) + ")");
-      } else {
-        return (this.isNew ? 'new ' : '') + this.variable.compile(o, LEVEL_ACCESS) + ("(" + args + ")");
-      }
-    };
-
-    Call.prototype.compileSuper = function(args, o) {
-      return "" + (this.superReference(o)) + ".call(this" + (args.length ? ', ' : '') + args + ")";
-    };
-
-    Call.prototype.compileSplat = function(o, splatArgs) {
-      var base, fun, idt, name, ref;
-      if (this.isSuper) {
-        return "" + (this.superReference(o)) + ".apply(this, " + splatArgs + ")";
-      }
-      if (this.isNew) {
-        idt = this.tab + TAB;
-        return "(function(func, args, ctor) {\n" + idt + "ctor.prototype = func.prototype;\n" + idt + "var child = new ctor, result = func.apply(child, args), t = typeof result;\n" + idt + "return t == \"object\" || t == \"function\" ? result || child : child;\n" + this.tab + "})(" + (this.variable.compile(o, LEVEL_LIST)) + ", " + splatArgs + ", function(){})";
-      }
-      base = new Value(this.variable);
-      if ((name = base.properties.pop()) && base.isComplex()) {
-        ref = o.scope.freeVariable('ref');
-        fun = "(" + ref + " = " + (base.compile(o, LEVEL_LIST)) + ")" + (name.compile(o));
-      } else {
-        fun = base.compile(o, LEVEL_ACCESS);
-        if (SIMPLENUM.test(fun)) fun = "(" + fun + ")";
-        if (name) {
-          ref = fun;
-          fun += name.compile(o);
-        } else {
-          ref = 'null';
-        }
-      }
-      return "" + fun + ".apply(" + ref + ", " + splatArgs + ")";
-    };
-
-    return Call;
-
-  })(Base);
-
-  exports.Extends = Extends = (function(_super) {
-
-    __extends(Extends, _super);
-
-    Extends.name = 'Extends';
-
-    function Extends(child, parent) {
-      this.child = child;
-      this.parent = parent;
-    }
-
-    Extends.prototype.children = ['child', 'parent'];
-
-    Extends.prototype.compile = function(o) {
-      return new Call(new Value(new Literal(utility('extends'))), [this.child, this.parent]).compile(o);
-    };
-
-    return Extends;
-
-  })(Base);
-
-  exports.Access = Access = (function(_super) {
-
-    __extends(Access, _super);
-
-    Access.name = 'Access';
-
-    function Access(name, tag) {
-      this.name = name;
-      this.name.asKey = true;
-      this.soak = tag === 'soak';
-    }
-
-    Access.prototype.children = ['name'];
-
-    Access.prototype.compile = function(o) {
-      var name;
-      name = this.name.compile(o);
-      if (IDENTIFIER.test(name)) {
-        return "." + name;
-      } else {
-        return "[" + name + "]";
-      }
-    };
-
-    Access.prototype.isComplex = NO;
-
-    return Access;
-
-  })(Base);
-
-  exports.Index = Index = (function(_super) {
-
-    __extends(Index, _super);
-
-    Index.name = 'Index';
-
-    function Index(index) {
-      this.index = index;
-    }
-
-    Index.prototype.children = ['index'];
-
-    Index.prototype.compile = function(o) {
-      return "[" + (this.index.compile(o, LEVEL_PAREN)) + "]";
-    };
-
-    Index.prototype.isComplex = function() {
-      return this.index.isComplex();
-    };
-
-    return Index;
-
-  })(Base);
-
-  exports.Range = Range = (function(_super) {
-
-    __extends(Range, _super);
-
-    Range.name = 'Range';
-
-    Range.prototype.children = ['from', 'to'];
-
-    function Range(from, to, tag) {
-      this.from = from;
-      this.to = to;
-      this.exclusive = tag === 'exclusive';
-      this.equals = this.exclusive ? '' : '=';
-    }
-
-    Range.prototype.compileVariables = function(o) {
-      var step, _ref2, _ref3, _ref4, _ref5;
-      o = merge(o, {
-        top: true
-      });
-      _ref2 = this.from.cache(o, LEVEL_LIST), this.fromC = _ref2[0], this.fromVar = _ref2[1];
-      _ref3 = this.to.cache(o, LEVEL_LIST), this.toC = _ref3[0], this.toVar = _ref3[1];
-      if (step = del(o, 'step')) {
-        _ref4 = step.cache(o, LEVEL_LIST), this.step = _ref4[0], this.stepVar = _ref4[1];
-      }
-      _ref5 = [this.fromVar.match(SIMPLENUM), this.toVar.match(SIMPLENUM)], this.fromNum = _ref5[0], this.toNum = _ref5[1];
-      if (this.stepVar) return this.stepNum = this.stepVar.match(SIMPLENUM);
-    };
-
-    Range.prototype.compileNode = function(o) {
-      var cond, condPart, from, gt, idx, idxName, known, lt, namedIndex, stepPart, to, varPart, _ref2, _ref3;
-      if (!this.fromVar) this.compileVariables(o);
-      if (!o.index) return this.compileArray(o);
-      known = this.fromNum && this.toNum;
-      idx = del(o, 'index');
-      idxName = del(o, 'name');
-      namedIndex = idxName && idxName !== idx;
-      varPart = "" + idx + " = " + this.fromC;
-      if (this.toC !== this.toVar) varPart += ", " + this.toC;
-      if (this.step !== this.stepVar) varPart += ", " + this.step;
-      _ref2 = ["" + idx + " <" + this.equals, "" + idx + " >" + this.equals], lt = _ref2[0], gt = _ref2[1];
-      condPart = this.stepNum ? +this.stepNum > 0 ? "" + lt + " " + this.toVar : "" + gt + " " + this.toVar : known ? ((_ref3 = [+this.fromNum, +this.toNum], from = _ref3[0], to = _ref3[1], _ref3), from <= to ? "" + lt + " " + to : "" + gt + " " + to) : (cond = "" + this.fromVar + " <= " + this.toVar, "" + cond + " ? " + lt + " " + this.toVar + " : " + gt + " " + this.toVar);
-      stepPart = this.stepVar ? "" + idx + " += " + this.stepVar : known ? namedIndex ? from <= to ? "++" + idx : "--" + idx : from <= to ? "" + idx + "++" : "" + idx + "--" : namedIndex ? "" + cond + " ? ++" + idx + " : --" + idx : "" + cond + " ? " + idx + "++ : " + idx + "--";
-      if (namedIndex) varPart = "" + idxName + " = " + varPart;
-      if (namedIndex) stepPart = "" + idxName + " = " + stepPart;
-      return "" + varPart + "; " + condPart + "; " + stepPart;
-    };
-
-    Range.prototype.compileArray = function(o) {
-      var args, body, cond, hasArgs, i, idt, post, pre, range, result, vars, _i, _ref2, _ref3, _results;
-      if (this.fromNum && this.toNum && Math.abs(this.fromNum - this.toNum) <= 20) {
-        range = (function() {
-          _results = [];
-          for (var _i = _ref2 = +this.fromNum, _ref3 = +this.toNum; _ref2 <= _ref3 ? _i <= _ref3 : _i >= _ref3; _ref2 <= _ref3 ? _i++ : _i--){ _results.push(_i); }
-          return _results;
-        }).apply(this);
-        if (this.exclusive) range.pop();
-        return "[" + (range.join(', ')) + "]";
-      }
-      idt = this.tab + TAB;
-      i = o.scope.freeVariable('i');
-      result = o.scope.freeVariable('results');
-      pre = "\n" + idt + result + " = [];";
-      if (this.fromNum && this.toNum) {
-        o.index = i;
-        body = this.compileNode(o);
-      } else {
-        vars = ("" + i + " = " + this.fromC) + (this.toC !== this.toVar ? ", " + this.toC : '');
-        cond = "" + this.fromVar + " <= " + this.toVar;
-        body = "var " + vars + "; " + cond + " ? " + i + " <" + this.equals + " " + this.toVar + " : " + i + " >" + this.equals + " " + this.toVar + "; " + cond + " ? " + i + "++ : " + i + "--";
-      }
-      post = "{ " + result + ".push(" + i + "); }\n" + idt + "return " + result + ";\n" + o.indent;
-      hasArgs = function(node) {
-        return node != null ? node.contains(function(n) {
-          return n instanceof Literal && n.value === 'arguments' && !n.asKey;
-        }) : void 0;
-      };
-      if (hasArgs(this.from) || hasArgs(this.to)) args = ', arguments';
-      return "(function() {" + pre + "\n" + idt + "for (" + body + ")" + post + "}).apply(this" + (args != null ? args : '') + ")";
-    };
-
-    return Range;
-
-  })(Base);
-
-  exports.Slice = Slice = (function(_super) {
-
-    __extends(Slice, _super);
-
-    Slice.name = 'Slice';
-
-    Slice.prototype.children = ['range'];
-
-    function Slice(range) {
-      this.range = range;
-      Slice.__super__.constructor.call(this);
-    }
-
-    Slice.prototype.compileNode = function(o) {
-      var compiled, from, fromStr, to, toStr, _ref2;
-      _ref2 = this.range, to = _ref2.to, from = _ref2.from;
-      fromStr = from && from.compile(o, LEVEL_PAREN) || '0';
-      compiled = to && to.compile(o, LEVEL_PAREN);
-      if (to && !(!this.range.exclusive && +compiled === -1)) {
-        toStr = ', ' + (this.range.exclusive ? compiled : SIMPLENUM.test(compiled) ? "" + (+compiled + 1) : (compiled = to.compile(o, LEVEL_ACCESS), "" + compiled + " + 1 || 9e9"));
-      }
-      return ".slice(" + fromStr + (toStr || '') + ")";
-    };
-
-    return Slice;
-
-  })(Base);
-
-  exports.Obj = Obj = (function(_super) {
-
-    __extends(Obj, _super);
-
-    Obj.name = 'Obj';
-
-    function Obj(props, generated) {
-      this.generated = generated != null ? generated : false;
-      this.objects = this.properties = props || [];
-    }
-
-    Obj.prototype.children = ['properties'];
-
-    Obj.prototype.compileNode = function(o) {
-      var i, idt, indent, join, lastNoncom, node, obj, prop, propName, propNames, props, _i, _j, _len, _len1, _ref2;
-      props = this.properties;
-      propNames = [];
-      _ref2 = this.properties;
-      for (_i = 0, _len = _ref2.length; _i < _len; _i++) {
-        prop = _ref2[_i];
-        if (prop.isComplex()) prop = prop.variable;
-        if (prop != null) {
-          propName = prop.unwrapAll().value.toString();
-          if (__indexOf.call(propNames, propName) >= 0) {
-            throw SyntaxError("multiple object literal properties named \"" + propName + "\"");
-          }
-          propNames.push(propName);
-        }
-      }
-      if (!props.length) return (this.front ? '({})' : '{}');
-      if (this.generated) {
-        for (_j = 0, _len1 = props.length; _j < _len1; _j++) {
-          node = props[_j];
-          if (node instanceof Value) {
-            throw new Error('cannot have an implicit value in an implicit object');
-          }
-        }
-      }
-      idt = o.indent += TAB;
-      lastNoncom = this.lastNonComment(this.properties);
-      props = (function() {
-        var _k, _len2, _results;
-        _results = [];
-        for (i = _k = 0, _len2 = props.length; _k < _len2; i = ++_k) {
-          prop = props[i];
-          join = i === props.length - 1 ? '' : prop === lastNoncom || prop instanceof Comment ? '\n' : ',\n';
-          indent = prop instanceof Comment ? '' : idt;
-          if (prop instanceof Value && prop["this"]) {
-            prop = new Assign(prop.properties[0].name, prop, 'object');
-          }
-          if (!(prop instanceof Comment)) {
-            if (!(prop instanceof Assign)) prop = new Assign(prop, prop, 'object');
-            (prop.variable.base || prop.variable).asKey = true;
-          }
-          _results.push(indent + prop.compile(o, LEVEL_TOP) + join);
-        }
-        return _results;
-      })();
-      props = props.join('');
-      obj = "{" + (props && '\n' + props + '\n' + this.tab) + "}";
-      if (this.front) {
-        return "(" + obj + ")";
-      } else {
-        return obj;
-      }
-    };
-
-    Obj.prototype.assigns = function(name) {
-      var prop, _i, _len, _ref2;
-      _ref2 = this.properties;
-      for (_i = 0, _len = _ref2.length; _i < _len; _i++) {
-        prop = _ref2[_i];
-        if (prop.assigns(name)) return true;
-      }
-      return false;
-    };
-
-    return Obj;
-
-  })(Base);
-
-  exports.Arr = Arr = (function(_super) {
-
-    __extends(Arr, _super);
-
-    Arr.name = 'Arr';
-
-    function Arr(objs) {
-      this.objects = objs || [];
-    }
-
-    Arr.prototype.children = ['objects'];
-
-    Arr.prototype.filterImplicitObjects = Call.prototype.filterImplicitObjects;
-
-    Arr.prototype.compileNode = function(o) {
-      var code, obj, objs;
-      if (!this.objects.length) return '[]';
-      o.indent += TAB;
-      objs = this.filterImplicitObjects(this.objects);
-      if (code = Splat.compileSplattedArray(o, objs)) return code;
-      code = ((function() {
-        var _i, _len, _results;
-        _results = [];
-        for (_i = 0, _len = objs.length; _i < _len; _i++) {
-          obj = objs[_i];
-          _results.push(obj.compile(o, LEVEL_LIST));
-        }
-        return _results;
-      })()).join(', ');
-      if (code.indexOf('\n') >= 0) {
-        return "[\n" + o.indent + code + "\n" + this.tab + "]";
-      } else {
-        return "[" + code + "]";
-      }
-    };
-
-    Arr.prototype.assigns = function(name) {
-      var obj, _i, _len, _ref2;
-      _ref2 = this.objects;
-      for (_i = 0, _len = _ref2.length; _i < _len; _i++) {
-        obj = _ref2[_i];
-        if (obj.assigns(name)) return true;
-      }
-      return false;
-    };
-
-    return Arr;
-
-  })(Base);
-
-  exports.Class = Class = (function(_super) {
-
-    __extends(Class, _super);
-
-    Class.name = 'Class';
-
-    function Class(variable, parent, body) {
-      this.variable = variable;
-      this.parent = parent;
-      this.body = body != null ? body : new Block;
-      this.boundFuncs = [];
-      this.body.classBody = true;
-    }
-
-    Class.prototype.children = ['variable', 'parent', 'body'];
-
-    Class.prototype.determineName = function() {
-      var decl, tail;
-      if (!this.variable) return null;
-      decl = (tail = last(this.variable.properties)) ? tail instanceof Access && tail.name.value : this.variable.base.value;
-      if (__indexOf.call(STRICT_PROSCRIBED, decl) >= 0) {
-        throw SyntaxError("variable name may not be " + decl);
-      }
-      return decl && (decl = IDENTIFIER.test(decl) && decl);
-    };
-
-    Class.prototype.setContext = function(name) {
-      return this.body.traverseChildren(false, function(node) {
-        if (node.classBody) return false;
-        if (node instanceof Literal && node.value === 'this') {
-          return node.value = name;
-        } else if (node instanceof Code) {
-          node.klass = name;
-          if (node.bound) return node.context = name;
-        }
-      });
-    };
-
-    Class.prototype.addBoundFunctions = function(o) {
-      var bvar, lhs, _i, _len, _ref2, _results;
-      if (this.boundFuncs.length) {
-        _ref2 = this.boundFuncs;
-        _results = [];
-        for (_i = 0, _len = _ref2.length; _i < _len; _i++) {
-          bvar = _ref2[_i];
-          lhs = (new Value(new Literal("this"), [new Access(bvar)])).compile(o);
-          _results.push(this.ctor.body.unshift(new Literal("" + lhs + " = " + (utility('bind')) + "(" + lhs + ", this)")));
-        }
-        return _results;
-      }
-    };
-
-    Class.prototype.addProperties = function(node, name, o) {
-      var assign, base, exprs, func, props;
-      props = node.base.properties.slice(0);
-      exprs = (function() {
-        var _results;
-        _results = [];
-        while (assign = props.shift()) {
-          if (assign instanceof Assign) {
-            base = assign.variable.base;
-            delete assign.context;
-            func = assign.value;
-            if (base.value === 'constructor') {
-              if (this.ctor) {
-                throw new Error('cannot define more than one constructor in a class');
-              }
-              if (func.bound) {
-                throw new Error('cannot define a constructor as a bound function');
-              }
-              if (func instanceof Code) {
-                assign = this.ctor = func;
-              } else {
-                this.externalCtor = o.scope.freeVariable('class');
-                assign = new Assign(new Literal(this.externalCtor), func);
-              }
-            } else {
-              if (assign.variable["this"]) {
-                func["static"] = true;
-                if (func.bound) func.context = name;
-              } else {
-                assign.variable = new Value(new Literal(name), [new Access(new Literal('prototype')), new Access(base)]);
-                if (func instanceof Code && func.bound) {
-                  this.boundFuncs.push(base);
-                  func.bound = false;
-                }
-              }
-            }
-          }
-          _results.push(assign);
-        }
-        return _results;
-      }).call(this);
-      return compact(exprs);
-    };
-
-    Class.prototype.walkBody = function(name, o) {
-      var _this = this;
-      return this.traverseChildren(false, function(child) {
-        var exps, i, node, _i, _len, _ref2;
-        if (child instanceof Class) return false;
-        if (child instanceof Block) {
-          _ref2 = exps = child.expressions;
-          for (i = _i = 0, _len = _ref2.length; _i < _len; i = ++_i) {
-            node = _ref2[i];
-            if (node instanceof Value && node.isObject(true)) {
-              exps[i] = _this.addProperties(node, name, o);
-            }
-          }
-          return child.expressions = exps = flatten(exps);
-        }
-      });
-    };
-
-    Class.prototype.hoistDirectivePrologue = function() {
-      var expressions, index, node;
-      index = 0;
-      expressions = this.body.expressions;
-      while ((node = expressions[index]) && node instanceof Comment || node instanceof Value && node.isString()) {
-        ++index;
-      }
-      return this.directives = expressions.splice(0, index);
-    };
-
-    Class.prototype.ensureConstructor = function(name) {
-      if (!this.ctor) {
-        this.ctor = new Code;
-        if (this.parent) {
-          this.ctor.body.push(new Literal("" + name + ".__super__.constructor.apply(this, arguments)"));
-        }
-        if (this.externalCtor) {
-          this.ctor.body.push(new Literal("" + this.externalCtor + ".apply(this, arguments)"));
-        }
-        this.ctor.body.makeReturn();
-        this.body.expressions.unshift(this.ctor);
-      }
-      this.ctor.ctor = this.ctor.name = name;
-      this.ctor.klass = null;
-      return this.ctor.noReturn = true;
-    };
-
-    Class.prototype.compileNode = function(o) {
-      var call, decl, klass, lname, name, params, _ref2;
-      decl = this.determineName();
-      name = decl || '_Class';
-      if (name.reserved) name = "_" + name;
-      lname = new Literal(name);
-      this.hoistDirectivePrologue();
-      this.setContext(name);
-      this.walkBody(name, o);
-      this.ensureConstructor(name);
-      this.body.spaced = true;
-      if (!(this.ctor instanceof Code)) this.body.expressions.unshift(this.ctor);
-      if (decl) {
-        this.body.expressions.unshift(new Assign(new Value(new Literal(name), [new Access(new Literal('name'))]), new Literal("'" + name + "'")));
-      }
-      this.body.expressions.push(lname);
-      (_ref2 = this.body.expressions).unshift.apply(_ref2, this.directives);
-      this.addBoundFunctions(o);
-      call = Closure.wrap(this.body);
-      if (this.parent) {
-        this.superClass = new Literal(o.scope.freeVariable('super', false));
-        this.body.expressions.unshift(new Extends(lname, this.superClass));
-        call.args.push(this.parent);
-        params = call.variable.params || call.variable.base.params;
-        params.push(new Param(this.superClass));
-      }
-      klass = new Parens(call, true);
-      if (this.variable) klass = new Assign(this.variable, klass);
-      return klass.compile(o);
-    };
-
-    return Class;
-
-  })(Base);
-
-  exports.Assign = Assign = (function(_super) {
-
-    __extends(Assign, _super);
-
-    Assign.name = 'Assign';
-
-    function Assign(variable, value, context, options) {
-      var forbidden, name, _ref2;
-      this.variable = variable;
-      this.value = value;
-      this.context = context;
-      this.param = options && options.param;
-      this.subpattern = options && options.subpattern;
-      forbidden = (_ref2 = (name = this.variable.unwrapAll().value), __indexOf.call(STRICT_PROSCRIBED, _ref2) >= 0);
-      if (forbidden && this.context !== 'object') {
-        throw SyntaxError("variable name may not be \"" + name + "\"");
-      }
-    }
-
-    Assign.prototype.children = ['variable', 'value'];
-
-    Assign.prototype.isStatement = function(o) {
-      return (o != null ? o.level : void 0) === LEVEL_TOP && (this.context != null) && __indexOf.call(this.context, "?") >= 0;
-    };
-
-    Assign.prototype.assigns = function(name) {
-      return this[this.context === 'object' ? 'value' : 'variable'].assigns(name);
-    };
-
-    Assign.prototype.unfoldSoak = function(o) {
-      return unfoldSoak(o, this, 'variable');
-    };
-
-    Assign.prototype.compileNode = function(o) {
-      var isValue, match, name, val, varBase, _ref2, _ref3, _ref4, _ref5;
-      if (isValue = this.variable instanceof Value) {
-        if (this.variable.isArray() || this.variable.isObject()) {
-          return this.compilePatternMatch(o);
-        }
-        if (this.variable.isSplice()) return this.compileSplice(o);
-        if ((_ref2 = this.context) === '||=' || _ref2 === '&&=' || _ref2 === '?=') {
-          return this.compileConditional(o);
-        }
-      }
-      name = this.variable.compile(o, LEVEL_LIST);
-      if (!this.context) {
-        if (!(varBase = this.variable.unwrapAll()).isAssignable()) {
-          throw SyntaxError("\"" + (this.variable.compile(o)) + "\" cannot be assigned.");
-        }
-        if (!(typeof varBase.hasProperties === "function" ? varBase.hasProperties() : void 0)) {
-          if (this.param) {
-            o.scope.add(name, 'var');
-          } else {
-            o.scope.find(name);
-          }
-        }
-      }
-      if (this.value instanceof Code && (match = METHOD_DEF.exec(name))) {
-        if (match[1]) this.value.klass = match[1];
-        this.value.name = (_ref3 = (_ref4 = (_ref5 = match[2]) != null ? _ref5 : match[3]) != null ? _ref4 : match[4]) != null ? _ref3 : match[5];
-      }
-      val = this.value.compile(o, LEVEL_LIST);
-      if (this.context === 'object') return "" + name + ": " + val;
-      val = name + (" " + (this.context || '=') + " ") + val;
-      if (o.level <= LEVEL_LIST) {
-        return val;
-      } else {
-        return "(" + val + ")";
-      }
-    };
-
-    Assign.prototype.compilePatternMatch = function(o) {
-      var acc, assigns, code, i, idx, isObject, ivar, name, obj, objects, olen, ref, rest, splat, top, val, value, vvar, _i, _len, _ref2, _ref3, _ref4, _ref5, _ref6, _ref7, _ref8;
-      top = o.level === LEVEL_TOP;
-      value = this.value;
-      objects = this.variable.base.objects;
-      if (!(olen = objects.length)) {
-        code = value.compile(o);
-        if (o.level >= LEVEL_OP) {
-          return "(" + code + ")";
-        } else {
-          return code;
-        }
-      }
-      isObject = this.variable.isObject();
-      if (top && olen === 1 && !((obj = objects[0]) instanceof Splat)) {
-        if (obj instanceof Assign) {
-          _ref2 = obj, (_ref3 = _ref2.variable, idx = _ref3.base), obj = _ref2.value;
-        } else {
-          if (obj.base instanceof Parens) {
-            _ref4 = new Value(obj.unwrapAll()).cacheReference(o), obj = _ref4[0], idx = _ref4[1];
-          } else {
-            idx = isObject ? obj["this"] ? obj.properties[0].name : obj : new Literal(0);
-          }
-        }
-        acc = IDENTIFIER.test(idx.unwrap().value || 0);
-        value = new Value(value);
-        value.properties.push(new (acc ? Access : Index)(idx));
-        if (_ref5 = obj.unwrap().value, __indexOf.call(RESERVED, _ref5) >= 0) {
-          throw new SyntaxError("assignment to a reserved word: " + (obj.compile(o)) + " = " + (value.compile(o)));
-        }
-        return new Assign(obj, value, null, {
-          param: this.param
-        }).compile(o, LEVEL_TOP);
-      }
-      vvar = value.compile(o, LEVEL_LIST);
-      assigns = [];
-      splat = false;
-      if (!IDENTIFIER.test(vvar) || this.variable.assigns(vvar)) {
-        assigns.push("" + (ref = o.scope.freeVariable('ref')) + " = " + vvar);
-        vvar = ref;
-      }
-      for (i = _i = 0, _len = objects.length; _i < _len; i = ++_i) {
-        obj = objects[i];
-        idx = i;
-        if (isObject) {
-          if (obj instanceof Assign) {
-            _ref6 = obj, (_ref7 = _ref6.variable, idx = _ref7.base), obj = _ref6.value;
-          } else {
-            if (obj.base instanceof Parens) {
-              _ref8 = new Value(obj.unwrapAll()).cacheReference(o), obj = _ref8[0], idx = _ref8[1];
-            } else {
-              idx = obj["this"] ? obj.properties[0].name : obj;
-            }
-          }
-        }
-        if (!splat && obj instanceof Splat) {
-          name = obj.name.unwrap().value;
-          obj = obj.unwrap();
-          val = "" + olen + " <= " + vvar + ".length ? " + (utility('slice')) + ".call(" + vvar + ", " + i;
-          if (rest = olen - i - 1) {
-            ivar = o.scope.freeVariable('i');
-            val += ", " + ivar + " = " + vvar + ".length - " + rest + ") : (" + ivar + " = " + i + ", [])";
-          } else {
-            val += ") : []";
-          }
-          val = new Literal(val);
-          splat = "" + ivar + "++";
-        } else {
-          name = obj.unwrap().value;
-          if (obj instanceof Splat) {
-            obj = obj.name.compile(o);
-            throw new SyntaxError("multiple splats are disallowed in an assignment: " + obj + "...");
-          }
-          if (typeof idx === 'number') {
-            idx = new Literal(splat || idx);
-            acc = false;
-          } else {
-            acc = isObject && IDENTIFIER.test(idx.unwrap().value || 0);
-          }
-          val = new Value(new Literal(vvar), [new (acc ? Access : Index)(idx)]);
-        }
-        if ((name != null) && __indexOf.call(RESERVED, name) >= 0) {
-          throw new SyntaxError("assignment to a reserved word: " + (obj.compile(o)) + " = " + (val.compile(o)));
-        }
-        assigns.push(new Assign(obj, val, null, {
-          param: this.param,
-          subpattern: true
-        }).compile(o, LEVEL_LIST));
-      }
-      if (!(top || this.subpattern)) assigns.push(vvar);
-      code = assigns.join(', ');
-      if (o.level < LEVEL_LIST) {
-        return code;
-      } else {
-        return "(" + code + ")";
-      }
-    };
-
-    Assign.prototype.compileConditional = function(o) {
-      var left, right, _ref2;
-      _ref2 = this.variable.cacheReference(o), left = _ref2[0], right = _ref2[1];
-      if (left.base instanceof Literal && left.base.value !== "this" && !o.scope.check(left.base.value)) {
-        throw new Error("the variable \"" + left.base.value + "\" can't be assigned with " + this.context + " because it has not been defined.");
-      }
-      if (__indexOf.call(this.context, "?") >= 0) o.isExistentialEquals = true;
-      return new Op(this.context.slice(0, -1), left, new Assign(right, this.value, '=')).compile(o);
-    };
-
-    Assign.prototype.compileSplice = function(o) {
-      var code, exclusive, from, fromDecl, fromRef, name, to, valDef, valRef, _ref2, _ref3, _ref4;
-      _ref2 = this.variable.properties.pop().range, from = _ref2.from, to = _ref2.to, exclusive = _ref2.exclusive;
-      name = this.variable.compile(o);
-      _ref3 = (from != null ? from.cache(o, LEVEL_OP) : void 0) || ['0', '0'], fromDecl = _ref3[0], fromRef = _ref3[1];
-      if (to) {
-        if ((from != null ? from.isSimpleNumber() : void 0) && to.isSimpleNumber()) {
-          to = +to.compile(o) - +fromRef;
-          if (!exclusive) to += 1;
-        } else {
-          to = to.compile(o, LEVEL_ACCESS) + ' - ' + fromRef;
-          if (!exclusive) to += ' + 1';
-        }
-      } else {
-        to = "9e9";
-      }
-      _ref4 = this.value.cache(o, LEVEL_LIST), valDef = _ref4[0], valRef = _ref4[1];
-      code = "[].splice.apply(" + name + ", [" + fromDecl + ", " + to + "].concat(" + valDef + ")), " + valRef;
-      if (o.level > LEVEL_TOP) {
-        return "(" + code + ")";
-      } else {
-        return code;
-      }
-    };
-
-    return Assign;
-
-  })(Base);
-
-  exports.Code = Code = (function(_super) {
-
-    __extends(Code, _super);
-
-    Code.name = 'Code';
-
-    function Code(params, body, tag) {
-      this.params = params || [];
-      this.body = body || new Block;
-      this.bound = tag === 'boundfunc';
-      if (this.bound) this.context = '_this';
-    }
-
-    Code.prototype.children = ['params', 'body'];
-
-    Code.prototype.isStatement = function() {
-      return !!this.ctor;
-    };
-
-    Code.prototype.jumps = NO;
-
-    Code.prototype.compileNode = function(o) {
-      var code, exprs, i, idt, lit, name, p, param, params, ref, splats, uniqs, val, wasEmpty, _i, _j, _k, _l, _len, _len1, _len2, _len3, _len4, _len5, _m, _n, _ref2, _ref3, _ref4, _ref5, _ref6, _ref7, _ref8;
-      o.scope = new Scope(o.scope, this.body, this);
-      o.scope.shared = del(o, 'sharedScope');
-      o.indent += TAB;
-      delete o.bare;
-      delete o.isExistentialEquals;
-      params = [];
-      exprs = [];
-      _ref2 = this.paramNames();
-      for (_i = 0, _len = _ref2.length; _i < _len; _i++) {
-        name = _ref2[_i];
-        if (!o.scope.check(name)) o.scope.parameter(name);
-      }
-      _ref3 = this.params;
-      for (_j = 0, _len1 = _ref3.length; _j < _len1; _j++) {
-        param = _ref3[_j];
-        if (!param.splat) continue;
-        _ref4 = this.params;
-        for (_k = 0, _len2 = _ref4.length; _k < _len2; _k++) {
-          p = _ref4[_k];
-          if (p.name.value) o.scope.add(p.name.value, 'var', true);
-        }
-        splats = new Assign(new Value(new Arr((function() {
-          var _l, _len3, _ref5, _results;
-          _ref5 = this.params;
-          _results = [];
-          for (_l = 0, _len3 = _ref5.length; _l < _len3; _l++) {
-            p = _ref5[_l];
-            _results.push(p.asReference(o));
-          }
-          return _results;
-        }).call(this))), new Value(new Literal('arguments')));
-        break;
-      }
-      _ref5 = this.params;
-      for (_l = 0, _len3 = _ref5.length; _l < _len3; _l++) {
-        param = _ref5[_l];
-        if (param.isComplex()) {
-          val = ref = param.asReference(o);
-          if (param.value) val = new Op('?', ref, param.value);
-          exprs.push(new Assign(new Value(param.name), val, '=', {
-            param: true
-          }));
-        } else {
-          ref = param;
-          if (param.value) {
-            lit = new Literal(ref.name.value + ' == null');
-            val = new Assign(new Value(param.name), param.value, '=');
-            exprs.push(new If(lit, val));
-          }
-        }
-        if (!splats) params.push(ref);
-      }
-      wasEmpty = this.body.isEmpty();
-      if (splats) exprs.unshift(splats);
-      if (exprs.length) {
-        (_ref6 = this.body.expressions).unshift.apply(_ref6, exprs);
-      }
-      for (i = _m = 0, _len4 = params.length; _m < _len4; i = ++_m) {
-        p = params[i];
-        o.scope.parameter(params[i] = p.compile(o));
-      }
-      uniqs = [];
-      _ref7 = this.paramNames();
-      for (_n = 0, _len5 = _ref7.length; _n < _len5; _n++) {
-        name = _ref7[_n];
-        if (__indexOf.call(uniqs, name) >= 0) {
-          throw SyntaxError("multiple parameters named '" + name + "'");
-        }
-        uniqs.push(name);
-      }
-      if (!(wasEmpty || this.noReturn)) this.body.makeReturn();
-      if (this.bound) {
-        if ((_ref8 = o.scope.parent.method) != null ? _ref8.bound : void 0) {
-          this.bound = this.context = o.scope.parent.method.context;
-        } else if (!this["static"]) {
-          o.scope.parent.assign('_this', 'this');
-        }
-      }
-      idt = o.indent;
-      code = 'function';
-      if (this.ctor) code += ' ' + this.name;
-      code += '(' + params.join(', ') + ') {';
-      if (!this.body.isEmpty()) {
-        code += "\n" + (this.body.compileWithDeclarations(o)) + "\n" + this.tab;
-      }
-      code += '}';
-      if (this.ctor) return this.tab + code;
-      if (this.front || (o.level >= LEVEL_ACCESS)) {
-        return "(" + code + ")";
-      } else {
-        return code;
-      }
-    };
-
-    Code.prototype.paramNames = function() {
-      var names, param, _i, _len, _ref2;
-      names = [];
-      _ref2 = this.params;
-      for (_i = 0, _len = _ref2.length; _i < _len; _i++) {
-        param = _ref2[_i];
-        names.push.apply(names, param.names());
-      }
-      return names;
-    };
-
-    Code.prototype.traverseChildren = function(crossScope, func) {
-      if (crossScope) {
-        return Code.__super__.traverseChildren.call(this, crossScope, func);
-      }
-    };
-
-    return Code;
-
-  })(Base);
-
-  exports.Param = Param = (function(_super) {
-
-    __extends(Param, _super);
-
-    Param.name = 'Param';
-
-    function Param(name, value, splat) {
-      var _ref2;
-      this.name = name;
-      this.value = value;
-      this.splat = splat;
-      if (_ref2 = (name = this.name.unwrapAll().value), __indexOf.call(STRICT_PROSCRIBED, _ref2) >= 0) {
-        throw SyntaxError("parameter name \"" + name + "\" is not allowed");
-      }
-    }
-
-    Param.prototype.children = ['name', 'value'];
-
-    Param.prototype.compile = function(o) {
-      return this.name.compile(o, LEVEL_LIST);
-    };
-
-    Param.prototype.asReference = function(o) {
-      var node;
-      if (this.reference) return this.reference;
-      node = this.name;
-      if (node["this"]) {
-        node = node.properties[0].name;
-        if (node.value.reserved) {
-          node = new Literal(o.scope.freeVariable(node.value));
-        }
-      } else if (node.isComplex()) {
-        node = new Literal(o.scope.freeVariable('arg'));
-      }
-      node = new Value(node);
-      if (this.splat) node = new Splat(node);
-      return this.reference = node;
-    };
-
-    Param.prototype.isComplex = function() {
-      return this.name.isComplex();
-    };
-
-    Param.prototype.names = function(name) {
-      var atParam, names, obj, _i, _len, _ref2;
-      if (name == null) name = this.name;
-      atParam = function(obj) {
-        var value;
-        value = obj.properties[0].name.value;
-        if (value.reserved) {
-          return [];
-        } else {
-          return [value];
-        }
-      };
-      if (name instanceof Literal) return [name.value];
-      if (name instanceof Value) return atParam(name);
-      names = [];
-      _ref2 = name.objects;
-      for (_i = 0, _len = _ref2.length; _i < _len; _i++) {
-        obj = _ref2[_i];
-        if (obj instanceof Assign) {
-          names.push(obj.variable.base.value);
-        } else if (obj.isArray() || obj.isObject()) {
-          names.push.apply(names, this.names(obj.base));
-        } else if (obj["this"]) {
-          names.push.apply(names, atParam(obj));
-        } else {
-          names.push(obj.base.value);
-        }
-      }
-      return names;
-    };
-
-    return Param;
-
-  })(Base);
-
-  exports.Splat = Splat = (function(_super) {
-
-    __extends(Splat, _super);
-
-    Splat.name = 'Splat';
-
-    Splat.prototype.children = ['name'];
-
-    Splat.prototype.isAssignable = YES;
-
-    function Splat(name) {
-      this.name = name.compile ? name : new Literal(name);
-    }
-
-    Splat.prototype.assigns = function(name) {
-      return this.name.assigns(name);
-    };
-
-    Splat.prototype.compile = function(o) {
-      if (this.index != null) {
-        return this.compileParam(o);
-      } else {
-        return this.name.compile(o);
-      }
-    };
-
-    Splat.prototype.unwrap = function() {
-      return this.name;
-    };
-
-    Splat.compileSplattedArray = function(o, list, apply) {
-      var args, base, code, i, index, node, _i, _len;
-      index = -1;
-      while ((node = list[++index]) && !(node instanceof Splat)) {
-        continue;
-      }
-      if (index >= list.length) return '';
-      if (list.length === 1) {
-        code = list[0].compile(o, LEVEL_LIST);
-        if (apply) return code;
-        return "" + (utility('slice')) + ".call(" + code + ")";
-      }
-      args = list.slice(index);
-      for (i = _i = 0, _len = args.length; _i < _len; i = ++_i) {
-        node = args[i];
-        code = node.compile(o, LEVEL_LIST);
-        args[i] = node instanceof Splat ? "" + (utility('slice')) + ".call(" + code + ")" : "[" + code + "]";
-      }
-      if (index === 0) {
-        return args[0] + (".concat(" + (args.slice(1).join(', ')) + ")");
-      }
-      base = (function() {
-        var _j, _len1, _ref2, _results;
-        _ref2 = list.slice(0, index);
-        _results = [];
-        for (_j = 0, _len1 = _ref2.length; _j < _len1; _j++) {
-          node = _ref2[_j];
-          _results.push(node.compile(o, LEVEL_LIST));
-        }
-        return _results;
-      })();
-      return "[" + (base.join(', ')) + "].concat(" + (args.join(', ')) + ")";
-    };
-
-    return Splat;
-
-  })(Base);
-
-  exports.While = While = (function(_super) {
-
-    __extends(While, _super);
-
-    While.name = 'While';
-
-    function While(condition, options) {
-      this.condition = (options != null ? options.invert : void 0) ? condition.invert() : condition;
-      this.guard = options != null ? options.guard : void 0;
-    }
-
-    While.prototype.children = ['condition', 'guard', 'body'];
-
-    While.prototype.isStatement = YES;
-
-    While.prototype.makeReturn = function(res) {
-      if (res) {
-        return While.__super__.makeReturn.apply(this, arguments);
-      } else {
-        this.returns = !this.jumps({
-          loop: true
-        });
-        return this;
-      }
-    };
-
-    While.prototype.addBody = function(body) {
-      this.body = body;
-      return this;
-    };
-
-    While.prototype.jumps = function() {
-      var expressions, node, _i, _len;
-      expressions = this.body.expressions;
-      if (!expressions.length) return false;
-      for (_i = 0, _len = expressions.length; _i < _len; _i++) {
-        node = expressions[_i];
-        if (node.jumps({
-          loop: true
-        })) return node;
-      }
-      return false;
-    };
-
-    While.prototype.compileNode = function(o) {
-      var body, code, rvar, set;
-      o.indent += TAB;
-      set = '';
-      body = this.body;
-      if (body.isEmpty()) {
-        body = '';
-      } else {
-        if (this.returns) {
-          body.makeReturn(rvar = o.scope.freeVariable('results'));
-          set = "" + this.tab + rvar + " = [];\n";
-        }
-        if (this.guard) {
-          if (body.expressions.length > 1) {
-            body.expressions.unshift(new If((new Parens(this.guard)).invert(), new Literal("continue")));
-          } else {
-            if (this.guard) body = Block.wrap([new If(this.guard, body)]);
-          }
-        }
-        body = "\n" + (body.compile(o, LEVEL_TOP)) + "\n" + this.tab;
-      }
-      code = set + this.tab + ("while (" + (this.condition.compile(o, LEVEL_PAREN)) + ") {" + body + "}");
-      if (this.returns) code += "\n" + this.tab + "return " + rvar + ";";
-      return code;
-    };
-
-    return While;
-
-  })(Base);
-
-  exports.Op = Op = (function(_super) {
-    var CONVERSIONS, INVERSIONS;
-
-    __extends(Op, _super);
-
-    Op.name = 'Op';
-
-    function Op(op, first, second, flip) {
-      if (op === 'in') return new In(first, second);
-      if (op === 'do') return this.generateDo(first);
-      if (op === 'new') {
-        if (first instanceof Call && !first["do"] && !first.isNew) {
-          return first.newInstance();
-        }
-        if (first instanceof Code && first.bound || first["do"]) {
-          first = new Parens(first);
-        }
-      }
-      this.operator = CONVERSIONS[op] || op;
-      this.first = first;
-      this.second = second;
-      this.flip = !!flip;
-      return this;
-    }
-
-    CONVERSIONS = {
-      '==': '===',
-      '!=': '!==',
-      'of': 'in'
-    };
-
-    INVERSIONS = {
-      '!==': '===',
-      '===': '!=='
-    };
-
-    Op.prototype.children = ['first', 'second'];
-
-    Op.prototype.isSimpleNumber = NO;
-
-    Op.prototype.isUnary = function() {
-      return !this.second;
-    };
-
-    Op.prototype.isComplex = function() {
-      var _ref2;
-      return !(this.isUnary() && ((_ref2 = this.operator) === '+' || _ref2 === '-')) || this.first.isComplex();
-    };
-
-    Op.prototype.isChainable = function() {
-      var _ref2;
-      return (_ref2 = this.operator) === '<' || _ref2 === '>' || _ref2 === '>=' || _ref2 === '<=' || _ref2 === '===' || _ref2 === '!==';
-    };
-
-    Op.prototype.invert = function() {
-      var allInvertable, curr, fst, op, _ref2;
-      if (this.isChainable() && this.first.isChainable()) {
-        allInvertable = true;
-        curr = this;
-        while (curr && curr.operator) {
-          allInvertable && (allInvertable = curr.operator in INVERSIONS);
-          curr = curr.first;
-        }
-        if (!allInvertable) return new Parens(this).invert();
-        curr = this;
-        while (curr && curr.operator) {
-          curr.invert = !curr.invert;
-          curr.operator = INVERSIONS[curr.operator];
-          curr = curr.first;
-        }
-        return this;
-      } else if (op = INVERSIONS[this.operator]) {
-        this.operator = op;
-        if (this.first.unwrap() instanceof Op) this.first.invert();
-        return this;
-      } else if (this.second) {
-        return new Parens(this).invert();
-      } else if (this.operator === '!' && (fst = this.first.unwrap()) instanceof Op && ((_ref2 = fst.operator) === '!' || _ref2 === 'in' || _ref2 === 'instanceof')) {
-        return fst;
-      } else {
-        return new Op('!', this);
-      }
-    };
-
-    Op.prototype.unfoldSoak = function(o) {
-      var _ref2;
-      return ((_ref2 = this.operator) === '++' || _ref2 === '--' || _ref2 === 'delete') && unfoldSoak(o, this, 'first');
-    };
-
-    Op.prototype.generateDo = function(exp) {
-      var call, func, param, passedParams, ref, _i, _len, _ref2;
-      passedParams = [];
-      func = exp instanceof Assign && (ref = exp.value.unwrap()) instanceof Code ? ref : exp;
-      _ref2 = func.params || [];
-      for (_i = 0, _len = _ref2.length; _i < _len; _i++) {
-        param = _ref2[_i];
-        if (param.value) {
-          passedParams.push(param.value);
-          delete param.value;
-        } else {
-          passedParams.push(param);
-        }
-      }
-      call = new Call(exp, passedParams);
-      call["do"] = true;
-      return call;
-    };
-
-    Op.prototype.compileNode = function(o) {
-      var code, isChain, _ref2, _ref3;
-      isChain = this.isChainable() && this.first.isChainable();
-      if (!isChain) this.first.front = this.front;
-      if (this.operator === 'delete' && o.scope.check(this.first.unwrapAll().value)) {
-        throw SyntaxError('delete operand may not be argument or var');
-      }
-      if (((_ref2 = this.operator) === '--' || _ref2 === '++') && (_ref3 = this.first.unwrapAll().value, __indexOf.call(STRICT_PROSCRIBED, _ref3) >= 0)) {
-        throw SyntaxError('prefix increment/decrement may not have eval or arguments operand');
-      }
-      if (this.isUnary()) return this.compileUnary(o);
-      if (isChain) return this.compileChain(o);
-      if (this.operator === '?') return this.compileExistence(o);
-      code = this.first.compile(o, LEVEL_OP) + ' ' + this.operator + ' ' + this.second.compile(o, LEVEL_OP);
-      if (o.level <= LEVEL_OP) {
-        return code;
-      } else {
-        return "(" + code + ")";
-      }
-    };
-
-    Op.prototype.compileChain = function(o) {
-      var code, fst, shared, _ref2;
-      _ref2 = this.first.second.cache(o), this.first.second = _ref2[0], shared = _ref2[1];
-      fst = this.first.compile(o, LEVEL_OP);
-      code = "" + fst + " " + (this.invert ? '&&' : '||') + " " + (shared.compile(o)) + " " + this.operator + " " + (this.second.compile(o, LEVEL_OP));
-      return "(" + code + ")";
-    };
-
-    Op.prototype.compileExistence = function(o) {
-      var fst, ref;
-      if (this.first.isComplex() && o.level > LEVEL_TOP) {
-        ref = new Literal(o.scope.freeVariable('ref'));
-        fst = new Parens(new Assign(ref, this.first));
-      } else {
-        fst = this.first;
-        ref = fst;
-      }
-      return new If(new Existence(fst), ref, {
-        type: 'if'
-      }).addElse(this.second).compile(o);
-    };
-
-    Op.prototype.compileUnary = function(o) {
-      var op, parts, plusMinus;
-      if (o.level >= LEVEL_ACCESS) return (new Parens(this)).compile(o);
-      parts = [op = this.operator];
-      plusMinus = op === '+' || op === '-';
-      if ((op === 'new' || op === 'typeof' || op === 'delete') || plusMinus && this.first instanceof Op && this.first.operator === op) {
-        parts.push(' ');
-      }
-      if ((plusMinus && this.first instanceof Op) || (op === 'new' && this.first.isStatement(o))) {
-        this.first = new Parens(this.first);
-      }
-      parts.push(this.first.compile(o, LEVEL_OP));
-      if (this.flip) parts.reverse();
-      return parts.join('');
-    };
-
-    Op.prototype.toString = function(idt) {
-      return Op.__super__.toString.call(this, idt, this.constructor.name + ' ' + this.operator);
-    };
-
-    return Op;
-
-  })(Base);
-
-  exports.In = In = (function(_super) {
-
-    __extends(In, _super);
-
-    In.name = 'In';
-
-    function In(object, array) {
-      this.object = object;
-      this.array = array;
-    }
-
-    In.prototype.children = ['object', 'array'];
-
-    In.prototype.invert = NEGATE;
-
-    In.prototype.compileNode = function(o) {
-      var hasSplat, obj, _i, _len, _ref2;
-      if (this.array instanceof Value && this.array.isArray()) {
-        _ref2 = this.array.base.objects;
-        for (_i = 0, _len = _ref2.length; _i < _len; _i++) {
-          obj = _ref2[_i];
-          if (!(obj instanceof Splat)) continue;
-          hasSplat = true;
-          break;
-        }
-        if (!hasSplat) return this.compileOrTest(o);
-      }
-      return this.compileLoopTest(o);
-    };
-
-    In.prototype.compileOrTest = function(o) {
-      var cmp, cnj, i, item, ref, sub, tests, _ref2, _ref3;
-      if (this.array.base.objects.length === 0) return "" + (!!this.negated);
-      _ref2 = this.object.cache(o, LEVEL_OP), sub = _ref2[0], ref = _ref2[1];
-      _ref3 = this.negated ? [' !== ', ' && '] : [' === ', ' || '], cmp = _ref3[0], cnj = _ref3[1];
-      tests = (function() {
-        var _i, _len, _ref4, _results;
-        _ref4 = this.array.base.objects;
-        _results = [];
-        for (i = _i = 0, _len = _ref4.length; _i < _len; i = ++_i) {
-          item = _ref4[i];
-          _results.push((i ? ref : sub) + cmp + item.compile(o, LEVEL_ACCESS));
-        }
-        return _results;
-      }).call(this);
-      tests = tests.join(cnj);
-      if (o.level < LEVEL_OP) {
-        return tests;
-      } else {
-        return "(" + tests + ")";
-      }
-    };
-
-    In.prototype.compileLoopTest = function(o) {
-      var code, ref, sub, _ref2;
-      _ref2 = this.object.cache(o, LEVEL_LIST), sub = _ref2[0], ref = _ref2[1];
-      code = utility('indexOf') + (".call(" + (this.array.compile(o, LEVEL_LIST)) + ", " + ref + ") ") + (this.negated ? '< 0' : '>= 0');
-      if (sub === ref) return code;
-      code = sub + ', ' + code;
-      if (o.level < LEVEL_LIST) {
-        return code;
-      } else {
-        return "(" + code + ")";
-      }
-    };
-
-    In.prototype.toString = function(idt) {
-      return In.__super__.toString.call(this, idt, this.constructor.name + (this.negated ? '!' : ''));
-    };
-
-    return In;
-
-  })(Base);
-
-  exports.Try = Try = (function(_super) {
-
-    __extends(Try, _super);
-
-    Try.name = 'Try';
-
-    function Try(attempt, error, recovery, ensure) {
-      this.attempt = attempt;
-      this.error = error;
-      this.recovery = recovery;
-      this.ensure = ensure;
-    }
-
-    Try.prototype.children = ['attempt', 'recovery', 'ensure'];
-
-    Try.prototype.isStatement = YES;
-
-    Try.prototype.jumps = function(o) {
-      var _ref2;
-      return this.attempt.jumps(o) || ((_ref2 = this.recovery) != null ? _ref2.jumps(o) : void 0);
-    };
-
-    Try.prototype.makeReturn = function(res) {
-      if (this.attempt) this.attempt = this.attempt.makeReturn(res);
-      if (this.recovery) this.recovery = this.recovery.makeReturn(res);
-      return this;
-    };
-
-    Try.prototype.compileNode = function(o) {
-      var catchPart, ensurePart, errorPart, tryPart;
-      o.indent += TAB;
-      errorPart = this.error ? " (" + (this.error.compile(o)) + ") " : ' ';
-      tryPart = this.attempt.compile(o, LEVEL_TOP);
-      catchPart = (function() {
-        var _ref2;
-        if (this.recovery) {
-          if (_ref2 = this.error.value, __indexOf.call(STRICT_PROSCRIBED, _ref2) >= 0) {
-            throw SyntaxError("catch variable may not be \"" + this.error.value + "\"");
-          }
-          if (!o.scope.check(this.error.value)) {
-            o.scope.add(this.error.value, 'param');
-          }
-          return " catch" + errorPart + "{\n" + (this.recovery.compile(o, LEVEL_TOP)) + "\n" + this.tab + "}";
-        } else if (!(this.ensure || this.recovery)) {
-          return ' catch (_error) {}';
-        }
-      }).call(this);
-      ensurePart = this.ensure ? " finally {\n" + (this.ensure.compile(o, LEVEL_TOP)) + "\n" + this.tab + "}" : '';
-      return "" + this.tab + "try {\n" + tryPart + "\n" + this.tab + "}" + (catchPart || '') + ensurePart;
-    };
-
-    return Try;
-
-  })(Base);
-
-  exports.Throw = Throw = (function(_super) {
-
-    __extends(Throw, _super);
-
-    Throw.name = 'Throw';
-
-    function Throw(expression) {
-      this.expression = expression;
-    }
-
-    Throw.prototype.children = ['expression'];
-
-    Throw.prototype.isStatement = YES;
-
-    Throw.prototype.jumps = NO;
-
-    Throw.prototype.makeReturn = THIS;
-
-    Throw.prototype.compileNode = function(o) {
-      return this.tab + ("throw " + (this.expression.compile(o)) + ";");
-    };
-
-    return Throw;
-
-  })(Base);
-
-  exports.Existence = Existence = (function(_super) {
-
-    __extends(Existence, _super);
-
-    Existence.name = 'Existence';
-
-    function Existence(expression) {
-      this.expression = expression;
-    }
-
-    Existence.prototype.children = ['expression'];
-
-    Existence.prototype.invert = NEGATE;
-
-    Existence.prototype.compileNode = function(o) {
-      var cmp, cnj, code, _ref2;
-      this.expression.front = this.front;
-      code = this.expression.compile(o, LEVEL_OP);
-      if (IDENTIFIER.test(code) && !o.scope.check(code)) {
-        _ref2 = this.negated ? ['===', '||'] : ['!==', '&&'], cmp = _ref2[0], cnj = _ref2[1];
-        code = "typeof " + code + " " + cmp + " \"undefined\" " + cnj + " " + code + " " + cmp + " null";
-      } else {
-        code = "" + code + " " + (this.negated ? '==' : '!=') + " null";
-      }
-      if (o.level <= LEVEL_COND) {
-        return code;
-      } else {
-        return "(" + code + ")";
-      }
-    };
-
-    return Existence;
-
-  })(Base);
-
-  exports.Parens = Parens = (function(_super) {
-
-    __extends(Parens, _super);
-
-    Parens.name = 'Parens';
-
-    function Parens(body) {
-      this.body = body;
-    }
-
-    Parens.prototype.children = ['body'];
-
-    Parens.prototype.unwrap = function() {
-      return this.body;
-    };
-
-    Parens.prototype.isComplex = function() {
-      return this.body.isComplex();
-    };
-
-    Parens.prototype.compileNode = function(o) {
-      var bare, code, expr;
-      expr = this.body.unwrap();
-      if (expr instanceof Value && expr.isAtomic()) {
-        expr.front = this.front;
-        return expr.compile(o);
-      }
-      code = expr.compile(o, LEVEL_PAREN);
-      bare = o.level < LEVEL_OP && (expr instanceof Op || expr instanceof Call || (expr instanceof For && expr.returns));
-      if (bare) {
-        return code;
-      } else {
-        return "(" + code + ")";
-      }
-    };
-
-    return Parens;
-
-  })(Base);
-
-  exports.For = For = (function(_super) {
-
-    __extends(For, _super);
-
-    For.name = 'For';
-
-    function For(body, source) {
-      var _ref2;
-      this.source = source.source, this.guard = source.guard, this.step = source.step, this.name = source.name, this.index = source.index;
-      this.body = Block.wrap([body]);
-      this.own = !!source.own;
-      this.object = !!source.object;
-      if (this.object) {
-        _ref2 = [this.index, this.name], this.name = _ref2[0], this.index = _ref2[1];
-      }
-      if (this.index instanceof Value) {
-        throw SyntaxError('index cannot be a pattern matching expression');
-      }
-      this.range = this.source instanceof Value && this.source.base instanceof Range && !this.source.properties.length;
-      this.pattern = this.name instanceof Value;
-      if (this.range && this.index) {
-        throw SyntaxError('indexes do not apply to range loops');
-      }
-      if (this.range && this.pattern) {
-        throw SyntaxError('cannot pattern match over range loops');
-      }
-      this.returns = false;
-    }
-
-    For.prototype.children = ['body', 'source', 'guard', 'step'];
-
-    For.prototype.compileNode = function(o) {
-      var body, defPart, forPart, forVarPart, guardPart, idt1, index, ivar, kvar, kvarAssign, lastJumps, lvar, name, namePart, ref, resultPart, returnResult, rvar, scope, source, stepPart, stepvar, svar, varPart, _ref2;
-      body = Block.wrap([this.body]);
-      lastJumps = (_ref2 = last(body.expressions)) != null ? _ref2.jumps() : void 0;
-      if (lastJumps && lastJumps instanceof Return) this.returns = false;
-      source = this.range ? this.source.base : this.source;
-      scope = o.scope;
-      name = this.name && this.name.compile(o, LEVEL_LIST);
-      index = this.index && this.index.compile(o, LEVEL_LIST);
-      if (name && !this.pattern) {
-        scope.find(name, {
-          immediate: true
-        });
-      }
-      if (index) {
-        scope.find(index, {
-          immediate: true
-        });
-      }
-      if (this.returns) rvar = scope.freeVariable('results');
-      ivar = (this.object && index) || scope.freeVariable('i');
-      kvar = (this.range && name) || index || ivar;
-      kvarAssign = kvar !== ivar ? "" + kvar + " = " : "";
-      if (this.step && !this.range) stepvar = scope.freeVariable("step");
-      if (this.pattern) name = ivar;
-      varPart = '';
-      guardPart = '';
-      defPart = '';
-      idt1 = this.tab + TAB;
-      if (this.range) {
-        forPart = source.compile(merge(o, {
-          index: ivar,
-          name: name,
-          step: this.step
-        }));
-      } else {
-        svar = this.source.compile(o, LEVEL_LIST);
-        if ((name || this.own) && !IDENTIFIER.test(svar)) {
-          defPart = "" + this.tab + (ref = scope.freeVariable('ref')) + " = " + svar + ";\n";
-          svar = ref;
-        }
-        if (name && !this.pattern) {
-          namePart = "" + name + " = " + svar + "[" + kvar + "]";
-        }
-        if (!this.object) {
-          lvar = scope.freeVariable('len');
-          forVarPart = "" + kvarAssign + ivar + " = 0, " + lvar + " = " + svar + ".length";
-          if (this.step) {
-            forVarPart += ", " + stepvar + " = " + (this.step.compile(o, LEVEL_OP));
-          }
-          stepPart = "" + kvarAssign + (this.step ? "" + ivar + " += " + stepvar : (kvar !== ivar ? "++" + ivar : "" + ivar + "++"));
-          forPart = "" + forVarPart + "; " + ivar + " < " + lvar + "; " + stepPart;
-        }
-      }
-      if (this.returns) {
-        resultPart = "" + this.tab + rvar + " = [];\n";
-        returnResult = "\n" + this.tab + "return " + rvar + ";";
-        body.makeReturn(rvar);
-      }
-      if (this.guard) {
-        if (body.expressions.length > 1) {
-          body.expressions.unshift(new If((new Parens(this.guard)).invert(), new Literal("continue")));
-        } else {
-          if (this.guard) body = Block.wrap([new If(this.guard, body)]);
-        }
-      }
-      if (this.pattern) {
-        body.expressions.unshift(new Assign(this.name, new Literal("" + svar + "[" + kvar + "]")));
-      }
-      defPart += this.pluckDirectCall(o, body);
-      if (namePart) varPart = "\n" + idt1 + namePart + ";";
-      if (this.object) {
-        forPart = "" + kvar + " in " + svar;
-        if (this.own) {
-          guardPart = "\n" + idt1 + "if (!" + (utility('hasProp')) + ".call(" + svar + ", " + kvar + ")) continue;";
-        }
-      }
-      body = body.compile(merge(o, {
-        indent: idt1
-      }), LEVEL_TOP);
-      if (body) body = '\n' + body + '\n';
-      return "" + defPart + (resultPart || '') + this.tab + "for (" + forPart + ") {" + guardPart + varPart + body + this.tab + "}" + (returnResult || '');
-    };
-
-    For.prototype.pluckDirectCall = function(o, body) {
-      var base, defs, expr, fn, idx, ref, val, _i, _len, _ref2, _ref3, _ref4, _ref5, _ref6, _ref7;
-      defs = '';
-      _ref2 = body.expressions;
-      for (idx = _i = 0, _len = _ref2.length; _i < _len; idx = ++_i) {
-        expr = _ref2[idx];
-        expr = expr.unwrapAll();
-        if (!(expr instanceof Call)) continue;
-        val = expr.variable.unwrapAll();
-        if (!((val instanceof Code) || (val instanceof Value && ((_ref3 = val.base) != null ? _ref3.unwrapAll() : void 0) instanceof Code && val.properties.length === 1 && ((_ref4 = (_ref5 = val.properties[0].name) != null ? _ref5.value : void 0) === 'call' || _ref4 === 'apply')))) {
-          continue;
-        }
-        fn = ((_ref6 = val.base) != null ? _ref6.unwrapAll() : void 0) || val;
-        ref = new Literal(o.scope.freeVariable('fn'));
-        base = new Value(ref);
-        if (val.base) _ref7 = [base, val], val.base = _ref7[0], base = _ref7[1];
-        body.expressions[idx] = new Call(base, expr.args);
-        defs += this.tab + new Assign(ref, fn).compile(o, LEVEL_TOP) + ';\n';
-      }
-      return defs;
-    };
-
-    return For;
-
-  })(While);
-
-  exports.Switch = Switch = (function(_super) {
-
-    __extends(Switch, _super);
-
-    Switch.name = 'Switch';
-
-    function Switch(subject, cases, otherwise) {
-      this.subject = subject;
-      this.cases = cases;
-      this.otherwise = otherwise;
-    }
-
-    Switch.prototype.children = ['subject', 'cases', 'otherwise'];
-
-    Switch.prototype.isStatement = YES;
-
-    Switch.prototype.jumps = function(o) {
-      var block, conds, _i, _len, _ref2, _ref3, _ref4;
-      if (o == null) {
-        o = {
-          block: true
-        };
-      }
-      _ref2 = this.cases;
-      for (_i = 0, _len = _ref2.length; _i < _len; _i++) {
-        _ref3 = _ref2[_i], conds = _ref3[0], block = _ref3[1];
-        if (block.jumps(o)) return block;
-      }
-      return (_ref4 = this.otherwise) != null ? _ref4.jumps(o) : void 0;
-    };
-
-    Switch.prototype.makeReturn = function(res) {
-      var pair, _i, _len, _ref2, _ref3;
-      _ref2 = this.cases;
-      for (_i = 0, _len = _ref2.length; _i < _len; _i++) {
-        pair = _ref2[_i];
-        pair[1].makeReturn(res);
-      }
-      if (res) {
-        this.otherwise || (this.otherwise = new Block([new Literal('void 0')]));
-      }
-      if ((_ref3 = this.otherwise) != null) _ref3.makeReturn(res);
-      return this;
-    };
-
-    Switch.prototype.compileNode = function(o) {
-      var block, body, code, cond, conditions, expr, i, idt1, idt2, _i, _j, _len, _len1, _ref2, _ref3, _ref4, _ref5;
-      idt1 = o.indent + TAB;
-      idt2 = o.indent = idt1 + TAB;
-      code = this.tab + ("switch (" + (((_ref2 = this.subject) != null ? _ref2.compile(o, LEVEL_PAREN) : void 0) || false) + ") {\n");
-      _ref3 = this.cases;
-      for (i = _i = 0, _len = _ref3.length; _i < _len; i = ++_i) {
-        _ref4 = _ref3[i], conditions = _ref4[0], block = _ref4[1];
-        _ref5 = flatten([conditions]);
-        for (_j = 0, _len1 = _ref5.length; _j < _len1; _j++) {
-          cond = _ref5[_j];
-          if (!this.subject) cond = cond.invert();
-          code += idt1 + ("case " + (cond.compile(o, LEVEL_PAREN)) + ":\n");
-        }
-        if (body = block.compile(o, LEVEL_TOP)) code += body + '\n';
-        if (i === this.cases.length - 1 && !this.otherwise) break;
-        expr = this.lastNonComment(block.expressions);
-        if (expr instanceof Return || (expr instanceof Literal && expr.jumps() && expr.value !== 'debugger')) {
-          continue;
-        }
-        code += idt2 + 'break;\n';
-      }
-      if (this.otherwise && this.otherwise.expressions.length) {
-        code += idt1 + ("default:\n" + (this.otherwise.compile(o, LEVEL_TOP)) + "\n");
-      }
-      return code + this.tab + '}';
-    };
-
-    return Switch;
-
-  })(Base);
-
-  exports.If = If = (function(_super) {
-
-    __extends(If, _super);
-
-    If.name = 'If';
-
-    function If(condition, body, options) {
-      this.body = body;
-      if (options == null) options = {};
-      this.condition = options.type === 'unless' ? condition.invert() : condition;
-      this.elseBody = null;
-      this.isChain = false;
-      this.soak = options.soak;
-    }
-
-    If.prototype.children = ['condition', 'body', 'elseBody'];
-
-    If.prototype.bodyNode = function() {
-      var _ref2;
-      return (_ref2 = this.body) != null ? _ref2.unwrap() : void 0;
-    };
-
-    If.prototype.elseBodyNode = function() {
-      var _ref2;
-      return (_ref2 = this.elseBody) != null ? _ref2.unwrap() : void 0;
-    };
-
-    If.prototype.addElse = function(elseBody) {
-      if (this.isChain) {
-        this.elseBodyNode().addElse(elseBody);
-      } else {
-        this.isChain = elseBody instanceof If;
-        this.elseBody = this.ensureBlock(elseBody);
-      }
-      return this;
-    };
-
-    If.prototype.isStatement = function(o) {
-      var _ref2;
-      return (o != null ? o.level : void 0) === LEVEL_TOP || this.bodyNode().isStatement(o) || ((_ref2 = this.elseBodyNode()) != null ? _ref2.isStatement(o) : void 0);
-    };
-
-    If.prototype.jumps = function(o) {
-      var _ref2;
-      return this.body.jumps(o) || ((_ref2 = this.elseBody) != null ? _ref2.jumps(o) : void 0);
-    };
-
-    If.prototype.compileNode = function(o) {
-      if (this.isStatement(o)) {
-        return this.compileStatement(o);
-      } else {
-        return this.compileExpression(o);
-      }
-    };
-
-    If.prototype.makeReturn = function(res) {
-      if (res) {
-        this.elseBody || (this.elseBody = new Block([new Literal('void 0')]));
-      }
-      this.body && (this.body = new Block([this.body.makeReturn(res)]));
-      this.elseBody && (this.elseBody = new Block([this.elseBody.makeReturn(res)]));
-      return this;
-    };
-
-    If.prototype.ensureBlock = function(node) {
-      if (node instanceof Block) {
-        return node;
-      } else {
-        return new Block([node]);
-      }
-    };
-
-    If.prototype.compileStatement = function(o) {
-      var body, bodyc, child, cond, exeq, ifPart, _ref2;
-      child = del(o, 'chainChild');
-      exeq = del(o, 'isExistentialEquals');
-      if (exeq) {
-        return new If(this.condition.invert(), this.elseBodyNode(), {
-          type: 'if'
-        }).compile(o);
-      }
-      cond = this.condition.compile(o, LEVEL_PAREN);
-      o.indent += TAB;
-      body = this.ensureBlock(this.body);
-      bodyc = body.compile(o);
-      if (1 === ((_ref2 = body.expressions) != null ? _ref2.length : void 0) && !this.elseBody && !child && bodyc && cond && -1 === (bodyc.indexOf('\n')) && 80 > cond.length + bodyc.length) {
-        return "" + this.tab + "if (" + cond + ") " + (bodyc.replace(/^\s+/, ''));
-      }
-      if (bodyc) bodyc = "\n" + bodyc + "\n" + this.tab;
-      ifPart = "if (" + cond + ") {" + bodyc + "}";
-      if (!child) ifPart = this.tab + ifPart;
-      if (!this.elseBody) return ifPart;
-      return ifPart + ' else ' + (this.isChain ? (o.indent = this.tab, o.chainChild = true, this.elseBody.unwrap().compile(o, LEVEL_TOP)) : "{\n" + (this.elseBody.compile(o, LEVEL_TOP)) + "\n" + this.tab + "}");
-    };
-
-    If.prototype.compileExpression = function(o) {
-      var alt, body, code, cond;
-      cond = this.condition.compile(o, LEVEL_COND);
-      body = this.bodyNode().compile(o, LEVEL_LIST);
-      alt = this.elseBodyNode() ? this.elseBodyNode().compile(o, LEVEL_LIST) : 'void 0';
-      code = "" + cond + " ? " + body + " : " + alt;
-      if (o.level >= LEVEL_COND) {
-        return "(" + code + ")";
-      } else {
-        return code;
-      }
-    };
-
-    If.prototype.unfoldSoak = function() {
-      return this.soak && this;
-    };
-
-    return If;
-
-  })(Base);
-
-  Closure = {
-    wrap: function(expressions, statement, noReturn) {
-      var args, call, func, mentionsArgs, meth;
-      if (expressions.jumps()) return expressions;
-      func = new Code([], Block.wrap([expressions]));
-      args = [];
-      if ((mentionsArgs = expressions.contains(this.literalArgs)) || expressions.contains(this.literalThis)) {
-        meth = new Literal(mentionsArgs ? 'apply' : 'call');
-        args = [new Literal('this')];
-        if (mentionsArgs) args.push(new Literal('arguments'));
-        func = new Value(func, [new Access(meth)]);
-      }
-      func.noReturn = noReturn;
-      call = new Call(func, args);
-      if (statement) {
-        return Block.wrap([call]);
-      } else {
-        return call;
-      }
-    },
-    literalArgs: function(node) {
-      return node instanceof Literal && node.value === 'arguments' && !node.asKey;
-    },
-    literalThis: function(node) {
-      return (node instanceof Literal && node.value === 'this' && !node.asKey) || (node instanceof Code && node.bound);
-    }
-  };
-
-  unfoldSoak = function(o, parent, name) {
-    var ifn;
-    if (!(ifn = parent[name].unfoldSoak(o))) return;
-    parent[name] = ifn.body;
-    ifn.body = new Value(parent);
-    return ifn;
-  };
-
-  UTILITIES = {
-    "extends": function() {
-      return "function(child, parent) { for (var key in parent) { if (" + (utility('hasProp')) + ".call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor; child.__super__ = parent.prototype; return child; }";
-    },
-    bind: function() {
-      return 'function(fn, me){ return function(){ return fn.apply(me, arguments); }; }';
-    },
-    indexOf: function() {
-      return "[].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; }";
-    },
-    hasProp: function() {
-      return '{}.hasOwnProperty';
-    },
-    slice: function() {
-      return '[].slice';
-    }
-  };
-
-  LEVEL_TOP = 1;
-
-  LEVEL_PAREN = 2;
-
-  LEVEL_LIST = 3;
-
-  LEVEL_COND = 4;
-
-  LEVEL_OP = 5;
-
-  LEVEL_ACCESS = 6;
-
-  TAB = '  ';
-
-  IDENTIFIER_STR = "[$A-Za-z_\\x7f-\\uffff][$\\w\\x7f-\\uffff]*";
-
-  IDENTIFIER = RegExp("^" + IDENTIFIER_STR + "$");
-
-  SIMPLENUM = /^[+-]?\d+$/;
-
-  METHOD_DEF = RegExp("^(?:(" + IDENTIFIER_STR + ")\\.prototype(?:\\.(" + IDENTIFIER_STR + ")|\\[(\"(?:[^\\\\\"\\r\\n]|\\\\.)*\"|'(?:[^\\\\'\\r\\n]|\\\\.)*')\\]|\\[(0x[\\da-fA-F]+|\\d*\\.?\\d+(?:[eE][+-]?\\d+)?)\\]))|(" + IDENTIFIER_STR + ")$");
-
-  IS_STRING = /^['"]/;
-
-  utility = function(name) {
-    var ref;
-    ref = "__" + name;
-    Scope.root.assign(ref, UTILITIES[name]());
-    return ref;
-  };
-
-  multident = function(code, tab) {
-    code = code.replace(/\n/g, '$&' + tab);
-    return code.replace(/\s+$/, '');
-  };
-
-
-});/**
- * Copyright (c) 2011 Jeremy Ashkenas
- * 
- * 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.
- */
-
-define('ace/mode/coffee/scope', ['require', 'exports', 'module' , 'ace/mode/coffee/helpers'], function(require, exports, module) {
-// Generated by CoffeeScript 1.2.1-pre
-
-  var Scope, extend, last, _ref;
-
-  _ref = require('./helpers'), extend = _ref.extend, last = _ref.last;
-
-  exports.Scope = Scope = (function() {
-
-    Scope.name = 'Scope';
-
-    Scope.root = null;
-
-    function Scope(parent, expressions, method) {
-      this.parent = parent;
-      this.expressions = expressions;
-      this.method = method;
-      this.variables = [
-        {
-          name: 'arguments',
-          type: 'arguments'
-        }
-      ];
-      this.positions = {};
-      if (!this.parent) Scope.root = this;
-    }
-
-    Scope.prototype.add = function(name, type, immediate) {
-      if (this.shared && !immediate) return this.parent.add(name, type, immediate);
-      if (Object.prototype.hasOwnProperty.call(this.positions, name)) {
-        return this.variables[this.positions[name]].type = type;
-      } else {
-        return this.positions[name] = this.variables.push({
-          name: name,
-          type: type
-        }) - 1;
-      }
-    };
-
-    Scope.prototype.find = function(name, options) {
-      if (this.check(name, options)) return true;
-      this.add(name, 'var');
-      return false;
-    };
-
-    Scope.prototype.parameter = function(name) {
-      if (this.shared && this.parent.check(name, true)) return;
-      return this.add(name, 'param');
-    };
-
-    Scope.prototype.check = function(name, immediate) {
-      var found, _ref1;
-      found = !!this.type(name);
-      if (found || immediate) return found;
-      return !!((_ref1 = this.parent) != null ? _ref1.check(name) : void 0);
-    };
-
-    Scope.prototype.temporary = function(name, index) {
-      if (name.length > 1) {
-        return '_' + name + (index > 1 ? index - 1 : '');
-      } else {
-        return '_' + (index + parseInt(name, 36)).toString(36).replace(/\d/g, 'a');
-      }
-    };
-
-    Scope.prototype.type = function(name) {
-      var v, _i, _len, _ref1;
-      _ref1 = this.variables;
-      for (_i = 0, _len = _ref1.length; _i < _len; _i++) {
-        v = _ref1[_i];
-        if (v.name === name) return v.type;
-      }
-      return null;
-    };
-
-    Scope.prototype.freeVariable = function(name, reserve) {
-      var index, temp;
-      if (reserve == null) reserve = true;
-      index = 0;
-      while (this.check((temp = this.temporary(name, index)))) {
-        index++;
-      }
-      if (reserve) this.add(temp, 'var', true);
-      return temp;
-    };
-
-    Scope.prototype.assign = function(name, value) {
-      this.add(name, {
-        value: value,
-        assigned: true
-      }, true);
-      return this.hasAssignments = true;
-    };
-
-    Scope.prototype.hasDeclarations = function() {
-      return !!this.declaredVariables().length;
-    };
-
-    Scope.prototype.declaredVariables = function() {
-      var realVars, tempVars, v, _i, _len, _ref1;
-      realVars = [];
-      tempVars = [];
-      _ref1 = this.variables;
-      for (_i = 0, _len = _ref1.length; _i < _len; _i++) {
-        v = _ref1[_i];
-        if (v.type === 'var') {
-          (v.name.charAt(0) === '_' ? tempVars : realVars).push(v.name);
-        }
-      }
-      return realVars.sort().concat(tempVars.sort());
-    };
-
-    Scope.prototype.assignedVariables = function() {
-      var v, _i, _len, _ref1, _results;
-      _ref1 = this.variables;
-      _results = [];
-      for (_i = 0, _len = _ref1.length; _i < _len; _i++) {
-        v = _ref1[_i];
-        if (v.type.assigned) _results.push("" + v.name + " = " + v.type.value);
-      }
-      return _results;
-    };
-
-    return Scope;
-
-  })();
-
-
-});
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/worker-css.js b/apps/files_texteditor/js/aceeditor/worker-css.js
deleted file mode 100644
index 7037c9b6aa..0000000000
--- a/apps/files_texteditor/js/aceeditor/worker-css.js
+++ /dev/null
@@ -1,11714 +0,0 @@
-"no use strict";
-
-var console = {
-    log: function(msg) {
-        postMessage({type: "log", data: msg});
-    }
-};
-var window = {
-    console: console
-};
-
-var normalizeModule = function(parentId, moduleName) {
-    // normalize plugin requires
-    if (moduleName.indexOf("!") !== -1) {
-        var chunks = moduleName.split("!");
-        return normalizeModule(parentId, chunks[0]) + "!" + normalizeModule(parentId, chunks[1]);
-    }
-    // normalize relative requires
-    if (moduleName.charAt(0) == ".") {
-        var base = parentId.split("/").slice(0, -1).join("/");
-        var moduleName = base + "/" + moduleName;
-        
-        while(moduleName.indexOf(".") !== -1 && previous != moduleName) {
-            var previous = moduleName;
-            var moduleName = moduleName.replace(/\/\.\//, "/").replace(/[^\/]+\/\.\.\//, "");
-        }
-    }
-    
-    return moduleName;
-};
-
-var require = function(parentId, id) {
-    var id = normalizeModule(parentId, id);
-    
-    var module = require.modules[id];
-    if (module) {
-        if (!module.initialized) {
-            module.exports = module.factory().exports;
-            module.initialized = true;
-        }
-        return module.exports;
-    }
-    
-    var chunks = id.split("/");
-    chunks[0] = require.tlns[chunks[0]] || chunks[0];
-    var path = chunks.join("/") + ".js";
-    
-    require.id = id;
-    importScripts(path);
-    return require(parentId, id);    
-};
-
-require.modules = {};
-require.tlns = {};
-
-var define = function(id, deps, factory) {
-    if (arguments.length == 2) {
-        factory = deps;
-    } else if (arguments.length == 1) {
-        factory = id;
-        id = require.id;
-    }
-
-    if (id.indexOf("text!") === 0) 
-        return;
-    
-    var req = function(deps, factory) {
-        return require(id, deps, factory);
-    };
-
-    require.modules[id] = {
-        factory: function() {
-            var module = {
-                exports: {}
-            };
-            var returnExports = factory(req, module.exports, module);
-            if (returnExports)
-                module.exports = returnExports;
-            return module;
-        }
-    };
-};
-
-function initBaseUrls(topLevelNamespaces) {
-    require.tlns = topLevelNamespaces;
-}
-
-function initSender() {
-
-    var EventEmitter = require(null, "ace/lib/event_emitter").EventEmitter;
-    var oop = require(null, "ace/lib/oop");
-    
-    var Sender = function() {};
-    
-    (function() {
-        
-        oop.implement(this, EventEmitter);
-                
-        this.callback = function(data, callbackId) {
-            postMessage({
-                type: "call",
-                id: callbackId,
-                data: data
-            });
-        };
-    
-        this.emit = function(name, data) {
-            postMessage({
-                type: "event",
-                name: name,
-                data: data
-            });
-        };
-        
-    }).call(Sender.prototype);
-    
-    return new Sender();
-}
-
-var main;
-var sender;
-
-onmessage = function(e) {
-    var msg = e.data;
-    if (msg.command) {
-        main[msg.command].apply(main, msg.args);
-    }
-    else if (msg.init) {        
-        initBaseUrls(msg.tlns);
-        require(null, "ace/lib/fixoldbrowsers");
-        sender = initSender();
-        var clazz = require(null, msg.module)[msg.classname];
-        main = new clazz(sender);
-    } 
-    else if (msg.event && sender) {
-        sender._emit(msg.event, msg.data);
-    }
-};
-// vim:set ts=4 sts=4 sw=4 st:
-// -- kriskowal Kris Kowal Copyright (C) 2009-2010 MIT License
-// -- tlrobinson Tom Robinson Copyright (C) 2009-2010 MIT License (Narwhal Project)
-// -- dantman Daniel Friesen Copyright(C) 2010 XXX No License Specified
-// -- fschaefer Florian Schäfer Copyright (C) 2010 MIT License
-// -- Irakli Gozalishvili Copyright (C) 2010 MIT License
-
-/*!
-    Copyright (c) 2009, 280 North Inc. http://280north.com/
-    MIT License. http://github.com/280north/narwhal/blob/master/README.md
-*/
-
-define('ace/lib/fixoldbrowsers', ['require', 'exports', 'module' , 'ace/lib/regexp', 'ace/lib/es5-shim'], function(require, exports, module) {
-"use strict";
-
-require("./regexp");
-require("./es5-shim");
-
-});/**
- *  Based on code from:
- *
- * XRegExp 1.5.0
- * (c) 2007-2010 Steven Levithan
- * MIT License
- * <http://xregexp.com>
- * Provides an augmented, extensible, cross-browser implementation of regular expressions,
- * including support for additional syntax, flags, and methods
- */
- 
-define('ace/lib/regexp', ['require', 'exports', 'module' ], function(require, exports, module) {
-"use strict";
-
-    //---------------------------------
-    //  Private variables
-    //---------------------------------
-
-    var real = {
-            exec: RegExp.prototype.exec,
-            test: RegExp.prototype.test,
-            match: String.prototype.match,
-            replace: String.prototype.replace,
-            split: String.prototype.split
-        },
-        compliantExecNpcg = real.exec.call(/()??/, "")[1] === undefined, // check `exec` handling of nonparticipating capturing groups
-        compliantLastIndexIncrement = function () {
-            var x = /^/g;
-            real.test.call(x, "");
-            return !x.lastIndex;
-        }();
-
-    //---------------------------------
-    //  Overriden native methods
-    //---------------------------------
-
-    // Adds named capture support (with backreferences returned as `result.name`), and fixes two
-    // cross-browser issues per ES3:
-    // - Captured values for nonparticipating capturing groups should be returned as `undefined`,
-    //   rather than the empty string.
-    // - `lastIndex` should not be incremented after zero-length matches.
-    RegExp.prototype.exec = function (str) {
-        var match = real.exec.apply(this, arguments),
-            name, r2;
-        if ( typeof(str) == 'string' && match) {
-            // Fix browsers whose `exec` methods don't consistently return `undefined` for
-            // nonparticipating capturing groups
-            if (!compliantExecNpcg && match.length > 1 && indexOf(match, "") > -1) {
-                r2 = RegExp(this.source, real.replace.call(getNativeFlags(this), "g", ""));
-                // Using `str.slice(match.index)` rather than `match[0]` in case lookahead allowed
-                // matching due to characters outside the match
-                real.replace.call(str.slice(match.index), r2, function () {
-                    for (var i = 1; i < arguments.length - 2; i++) {
-                        if (arguments[i] === undefined)
-                            match[i] = undefined;
-                    }
-                });
-            }
-            // Attach named capture properties
-            if (this._xregexp && this._xregexp.captureNames) {
-                for (var i = 1; i < match.length; i++) {
-                    name = this._xregexp.captureNames[i - 1];
-                    if (name)
-                       match[name] = match[i];
-                }
-            }
-            // Fix browsers that increment `lastIndex` after zero-length matches
-            if (!compliantLastIndexIncrement && this.global && !match[0].length && (this.lastIndex > match.index))
-                this.lastIndex--;
-        }
-        return match;
-    };
-
-    // Don't override `test` if it won't change anything
-    if (!compliantLastIndexIncrement) {
-        // Fix browser bug in native method
-        RegExp.prototype.test = function (str) {
-            // Use the native `exec` to skip some processing overhead, even though the overriden
-            // `exec` would take care of the `lastIndex` fix
-            var match = real.exec.call(this, str);
-            // Fix browsers that increment `lastIndex` after zero-length matches
-            if (match && this.global && !match[0].length && (this.lastIndex > match.index))
-                this.lastIndex--;
-            return !!match;
-        };
-    }
-
-    //---------------------------------
-    //  Private helper functions
-    //---------------------------------
-
-    function getNativeFlags (regex) {
-        return (regex.global     ? "g" : "") +
-               (regex.ignoreCase ? "i" : "") +
-               (regex.multiline  ? "m" : "") +
-               (regex.extended   ? "x" : "") + // Proposed for ES4; included in AS3
-               (regex.sticky     ? "y" : "");
-    };
-
-    function indexOf (array, item, from) {
-        if (Array.prototype.indexOf) // Use the native array method if available
-            return array.indexOf(item, from);
-        for (var i = from || 0; i < array.length; i++) {
-            if (array[i] === item)
-                return i;
-        }
-        return -1;
-    };
-
-});
-// vim: ts=4 sts=4 sw=4 expandtab
-// -- kriskowal Kris Kowal Copyright (C) 2009-2011 MIT License
-// -- tlrobinson Tom Robinson Copyright (C) 2009-2010 MIT License (Narwhal Project)
-// -- dantman Daniel Friesen Copyright (C) 2010 XXX TODO License or CLA
-// -- fschaefer Florian Schäfer Copyright (C) 2010 MIT License
-// -- Gozala Irakli Gozalishvili Copyright (C) 2010 MIT License
-// -- kitcambridge Kit Cambridge Copyright (C) 2011 MIT License
-// -- kossnocorp Sasha Koss XXX TODO License or CLA
-// -- bryanforbes Bryan Forbes XXX TODO License or CLA
-// -- killdream Quildreen Motta Copyright (C) 2011 MIT Licence
-// -- michaelficarra Michael Ficarra Copyright (C) 2011 3-clause BSD License
-// -- sharkbrainguy Gerard Paapu Copyright (C) 2011 MIT License
-// -- bbqsrc Brendan Molloy (C) 2011 Creative Commons Zero (public domain)
-// -- iwyg XXX TODO License or CLA
-// -- DomenicDenicola Domenic Denicola Copyright (C) 2011 MIT License
-// -- xavierm02 Montillet Xavier XXX TODO License or CLA
-// -- Raynos Raynos XXX TODO License or CLA
-// -- samsonjs Sami Samhuri Copyright (C) 2010 MIT License
-// -- rwldrn Rick Waldron Copyright (C) 2011 MIT License
-// -- lexer Alexey Zakharov XXX TODO License or CLA
-
-/*!
-    Copyright (c) 2009, 280 North Inc. http://280north.com/
-    MIT License. http://github.com/280north/narwhal/blob/master/README.md
-*/
-
-define('ace/lib/es5-shim', ['require', 'exports', 'module' ], function(require, exports, module) {
-
-/**
- * Brings an environment as close to ECMAScript 5 compliance
- * as is possible with the facilities of erstwhile engines.
- *
- * Annotated ES5: http://es5.github.com/ (specific links below)
- * ES5 Spec: http://www.ecma-international.org/publications/files/ECMA-ST/Ecma-262.pdf
- *
- * @module
- */
-
-/*whatsupdoc*/
-
-//
-// Function
-// ========
-//
-
-// ES-5 15.3.4.5
-// http://es5.github.com/#x15.3.4.5
-
-if (!Function.prototype.bind) {
-    Function.prototype.bind = function bind(that) { // .length is 1
-        // 1. Let Target be the this value.
-        var target = this;
-        // 2. If IsCallable(Target) is false, throw a TypeError exception.
-        if (typeof target != "function")
-            throw new TypeError(); // TODO message
-        // 3. Let A be a new (possibly empty) internal list of all of the
-        //   argument values provided after thisArg (arg1, arg2 etc), in order.
-        // XXX slicedArgs will stand in for "A" if used
-        var args = slice.call(arguments, 1); // for normal call
-        // 4. Let F be a new native ECMAScript object.
-        // 11. Set the [[Prototype]] internal property of F to the standard
-        //   built-in Function prototype object as specified in 15.3.3.1.
-        // 12. Set the [[Call]] internal property of F as described in
-        //   15.3.4.5.1.
-        // 13. Set the [[Construct]] internal property of F as described in
-        //   15.3.4.5.2.
-        // 14. Set the [[HasInstance]] internal property of F as described in
-        //   15.3.4.5.3.
-        var bound = function () {
-
-            if (this instanceof bound) {
-                // 15.3.4.5.2 [[Construct]]
-                // When the [[Construct]] internal method of a function object,
-                // F that was created using the bind function is called with a
-                // list of arguments ExtraArgs, the following steps are taken:
-                // 1. Let target be the value of F's [[TargetFunction]]
-                //   internal property.
-                // 2. If target has no [[Construct]] internal method, a
-                //   TypeError exception is thrown.
-                // 3. Let boundArgs be the value of F's [[BoundArgs]] internal
-                //   property.
-                // 4. Let args be a new list containing the same values as the
-                //   list boundArgs in the same order followed by the same
-                //   values as the list ExtraArgs in the same order.
-                // 5. Return the result of calling the [[Construct]] internal 
-                //   method of target providing args as the arguments.
-
-                var F = function(){};
-                F.prototype = target.prototype;
-                var self = new F;
-
-                var result = target.apply(
-                    self,
-                    args.concat(slice.call(arguments))
-                );
-                if (result !== null && Object(result) === result)
-                    return result;
-                return self;
-
-            } else {
-                // 15.3.4.5.1 [[Call]]
-                // When the [[Call]] internal method of a function object, F,
-                // which was created using the bind function is called with a
-                // this value and a list of arguments ExtraArgs, the following
-                // steps are taken:
-                // 1. Let boundArgs be the value of F's [[BoundArgs]] internal
-                //   property.
-                // 2. Let boundThis be the value of F's [[BoundThis]] internal
-                //   property.
-                // 3. Let target be the value of F's [[TargetFunction]] internal
-                //   property.
-                // 4. Let args be a new list containing the same values as the 
-                //   list boundArgs in the same order followed by the same 
-                //   values as the list ExtraArgs in the same order.
-                // 5. Return the result of calling the [[Call]] internal method 
-                //   of target providing boundThis as the this value and 
-                //   providing args as the arguments.
-
-                // equiv: target.call(this, ...boundArgs, ...args)
-                return target.apply(
-                    that,
-                    args.concat(slice.call(arguments))
-                );
-
-            }
-
-        };
-        // XXX bound.length is never writable, so don't even try
-        //
-        // 15. If the [[Class]] internal property of Target is "Function", then
-        //     a. Let L be the length property of Target minus the length of A.
-        //     b. Set the length own property of F to either 0 or L, whichever is 
-        //       larger.
-        // 16. Else set the length own property of F to 0.
-        // 17. Set the attributes of the length own property of F to the values
-        //   specified in 15.3.5.1.
-
-        // TODO
-        // 18. Set the [[Extensible]] internal property of F to true.
-        
-        // TODO
-        // 19. Let thrower be the [[ThrowTypeError]] function Object (13.2.3).
-        // 20. Call the [[DefineOwnProperty]] internal method of F with 
-        //   arguments "caller", PropertyDescriptor {[[Get]]: thrower, [[Set]]:
-        //   thrower, [[Enumerable]]: false, [[Configurable]]: false}, and 
-        //   false.
-        // 21. Call the [[DefineOwnProperty]] internal method of F with 
-        //   arguments "arguments", PropertyDescriptor {[[Get]]: thrower, 
-        //   [[Set]]: thrower, [[Enumerable]]: false, [[Configurable]]: false},
-        //   and false.
-
-        // TODO
-        // NOTE Function objects created using Function.prototype.bind do not 
-        // have a prototype property or the [[Code]], [[FormalParameters]], and
-        // [[Scope]] internal properties.
-        // XXX can't delete prototype in pure-js.
-
-        // 22. Return F.
-        return bound;
-    };
-}
-
-// Shortcut to an often accessed properties, in order to avoid multiple
-// dereference that costs universally.
-// _Please note: Shortcuts are defined after `Function.prototype.bind` as we
-// us it in defining shortcuts.
-var call = Function.prototype.call;
-var prototypeOfArray = Array.prototype;
-var prototypeOfObject = Object.prototype;
-var slice = prototypeOfArray.slice;
-var toString = call.bind(prototypeOfObject.toString);
-var owns = call.bind(prototypeOfObject.hasOwnProperty);
-
-// If JS engine supports accessors creating shortcuts.
-var defineGetter;
-var defineSetter;
-var lookupGetter;
-var lookupSetter;
-var supportsAccessors;
-if ((supportsAccessors = owns(prototypeOfObject, "__defineGetter__"))) {
-    defineGetter = call.bind(prototypeOfObject.__defineGetter__);
-    defineSetter = call.bind(prototypeOfObject.__defineSetter__);
-    lookupGetter = call.bind(prototypeOfObject.__lookupGetter__);
-    lookupSetter = call.bind(prototypeOfObject.__lookupSetter__);
-}
-
-//
-// Array
-// =====
-//
-
-// ES5 15.4.3.2
-// http://es5.github.com/#x15.4.3.2
-// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/isArray
-if (!Array.isArray) {
-    Array.isArray = function isArray(obj) {
-        return toString(obj) == "[object Array]";
-    };
-}
-
-// The IsCallable() check in the Array functions
-// has been replaced with a strict check on the
-// internal class of the object to trap cases where
-// the provided function was actually a regular
-// expression literal, which in V8 and
-// JavaScriptCore is a typeof "function".  Only in
-// V8 are regular expression literals permitted as
-// reduce parameters, so it is desirable in the
-// general case for the shim to match the more
-// strict and common behavior of rejecting regular
-// expressions.
-
-// ES5 15.4.4.18
-// http://es5.github.com/#x15.4.4.18
-// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/array/forEach
-if (!Array.prototype.forEach) {
-    Array.prototype.forEach = function forEach(fun /*, thisp*/) {
-        var self = toObject(this),
-            thisp = arguments[1],
-            i = 0,
-            length = self.length >>> 0;
-
-        // If no callback function or if callback is not a callable function
-        if (toString(fun) != "[object Function]") {
-            throw new TypeError(); // TODO message
-        }
-
-        while (i < length) {
-            if (i in self) {
-                // Invoke the callback function with call, passing arguments:
-                // context, property value, property key, thisArg object context
-                fun.call(thisp, self[i], i, self);
-            }
-            i++;
-        }
-    };
-}
-
-// ES5 15.4.4.19
-// http://es5.github.com/#x15.4.4.19
-// https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Objects/Array/map
-if (!Array.prototype.map) {
-    Array.prototype.map = function map(fun /*, thisp*/) {
-        var self = toObject(this),
-            length = self.length >>> 0,
-            result = Array(length),
-            thisp = arguments[1];
-
-        // If no callback function or if callback is not a callable function
-        if (toString(fun) != "[object Function]") {
-            throw new TypeError(); // TODO message
-        }
-
-        for (var i = 0; i < length; i++) {
-            if (i in self)
-                result[i] = fun.call(thisp, self[i], i, self);
-        }
-        return result;
-    };
-}
-
-// ES5 15.4.4.20
-// http://es5.github.com/#x15.4.4.20
-// https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Objects/Array/filter
-if (!Array.prototype.filter) {
-    Array.prototype.filter = function filter(fun /*, thisp */) {
-        var self = toObject(this),
-            length = self.length >>> 0,
-            result = [],
-            thisp = arguments[1];
-
-        // If no callback function or if callback is not a callable function
-        if (toString(fun) != "[object Function]") {
-            throw new TypeError(); // TODO message
-        }
-
-        for (var i = 0; i < length; i++) {
-            if (i in self && fun.call(thisp, self[i], i, self))
-                result.push(self[i]);
-        }
-        return result;
-    };
-}
-
-// ES5 15.4.4.16
-// http://es5.github.com/#x15.4.4.16
-// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/every
-if (!Array.prototype.every) {
-    Array.prototype.every = function every(fun /*, thisp */) {
-        var self = toObject(this),
-            length = self.length >>> 0,
-            thisp = arguments[1];
-
-        // If no callback function or if callback is not a callable function
-        if (toString(fun) != "[object Function]") {
-            throw new TypeError(); // TODO message
-        }
-
-        for (var i = 0; i < length; i++) {
-            if (i in self && !fun.call(thisp, self[i], i, self))
-                return false;
-        }
-        return true;
-    };
-}
-
-// ES5 15.4.4.17
-// http://es5.github.com/#x15.4.4.17
-// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/some
-if (!Array.prototype.some) {
-    Array.prototype.some = function some(fun /*, thisp */) {
-        var self = toObject(this),
-            length = self.length >>> 0,
-            thisp = arguments[1];
-
-        // If no callback function or if callback is not a callable function
-        if (toString(fun) != "[object Function]") {
-            throw new TypeError(); // TODO message
-        }
-
-        for (var i = 0; i < length; i++) {
-            if (i in self && fun.call(thisp, self[i], i, self))
-                return true;
-        }
-        return false;
-    };
-}
-
-// ES5 15.4.4.21
-// http://es5.github.com/#x15.4.4.21
-// https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Objects/Array/reduce
-if (!Array.prototype.reduce) {
-    Array.prototype.reduce = function reduce(fun /*, initial*/) {
-        var self = toObject(this),
-            length = self.length >>> 0;
-
-        // If no callback function or if callback is not a callable function
-        if (toString(fun) != "[object Function]") {
-            throw new TypeError(); // TODO message
-        }
-
-        // no value to return if no initial value and an empty array
-        if (!length && arguments.length == 1)
-            throw new TypeError(); // TODO message
-
-        var i = 0;
-        var result;
-        if (arguments.length >= 2) {
-            result = arguments[1];
-        } else {
-            do {
-                if (i in self) {
-                    result = self[i++];
-                    break;
-                }
-
-                // if array contains no values, no initial value to return
-                if (++i >= length)
-                    throw new TypeError(); // TODO message
-            } while (true);
-        }
-
-        for (; i < length; i++) {
-            if (i in self)
-                result = fun.call(void 0, result, self[i], i, self);
-        }
-
-        return result;
-    };
-}
-
-// ES5 15.4.4.22
-// http://es5.github.com/#x15.4.4.22
-// https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Objects/Array/reduceRight
-if (!Array.prototype.reduceRight) {
-    Array.prototype.reduceRight = function reduceRight(fun /*, initial*/) {
-        var self = toObject(this),
-            length = self.length >>> 0;
-
-        // If no callback function or if callback is not a callable function
-        if (toString(fun) != "[object Function]") {
-            throw new TypeError(); // TODO message
-        }
-
-        // no value to return if no initial value, empty array
-        if (!length && arguments.length == 1)
-            throw new TypeError(); // TODO message
-
-        var result, i = length - 1;
-        if (arguments.length >= 2) {
-            result = arguments[1];
-        } else {
-            do {
-                if (i in self) {
-                    result = self[i--];
-                    break;
-                }
-
-                // if array contains no values, no initial value to return
-                if (--i < 0)
-                    throw new TypeError(); // TODO message
-            } while (true);
-        }
-
-        do {
-            if (i in this)
-                result = fun.call(void 0, result, self[i], i, self);
-        } while (i--);
-
-        return result;
-    };
-}
-
-// ES5 15.4.4.14
-// http://es5.github.com/#x15.4.4.14
-// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/indexOf
-if (!Array.prototype.indexOf) {
-    Array.prototype.indexOf = function indexOf(sought /*, fromIndex */ ) {
-        var self = toObject(this),
-            length = self.length >>> 0;
-
-        if (!length)
-            return -1;
-
-        var i = 0;
-        if (arguments.length > 1)
-            i = toInteger(arguments[1]);
-
-        // handle negative indices
-        i = i >= 0 ? i : Math.max(0, length + i);
-        for (; i < length; i++) {
-            if (i in self && self[i] === sought) {
-                return i;
-            }
-        }
-        return -1;
-    };
-}
-
-// ES5 15.4.4.15
-// http://es5.github.com/#x15.4.4.15
-// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/lastIndexOf
-if (!Array.prototype.lastIndexOf) {
-    Array.prototype.lastIndexOf = function lastIndexOf(sought /*, fromIndex */) {
-        var self = toObject(this),
-            length = self.length >>> 0;
-
-        if (!length)
-            return -1;
-        var i = length - 1;
-        if (arguments.length > 1)
-            i = Math.min(i, toInteger(arguments[1]));
-        // handle negative indices
-        i = i >= 0 ? i : length - Math.abs(i);
-        for (; i >= 0; i--) {
-            if (i in self && sought === self[i])
-                return i;
-        }
-        return -1;
-    };
-}
-
-//
-// Object
-// ======
-//
-
-// ES5 15.2.3.2
-// http://es5.github.com/#x15.2.3.2
-if (!Object.getPrototypeOf) {
-    // https://github.com/kriskowal/es5-shim/issues#issue/2
-    // http://ejohn.org/blog/objectgetprototypeof/
-    // recommended by fschaefer on github
-    Object.getPrototypeOf = function getPrototypeOf(object) {
-        return object.__proto__ || (
-            object.constructor ?
-            object.constructor.prototype :
-            prototypeOfObject
-        );
-    };
-}
-
-// ES5 15.2.3.3
-// http://es5.github.com/#x15.2.3.3
-if (!Object.getOwnPropertyDescriptor) {
-    var ERR_NON_OBJECT = "Object.getOwnPropertyDescriptor called on a " +
-                         "non-object: ";
-    Object.getOwnPropertyDescriptor = function getOwnPropertyDescriptor(object, property) {
-        if ((typeof object != "object" && typeof object != "function") || object === null)
-            throw new TypeError(ERR_NON_OBJECT + object);
-        // If object does not owns property return undefined immediately.
-        if (!owns(object, property))
-            return;
-
-        var descriptor, getter, setter;
-
-        // If object has a property then it's for sure both `enumerable` and
-        // `configurable`.
-        descriptor =  { enumerable: true, configurable: true };
-
-        // If JS engine supports accessor properties then property may be a
-        // getter or setter.
-        if (supportsAccessors) {
-            // Unfortunately `__lookupGetter__` will return a getter even
-            // if object has own non getter property along with a same named
-            // inherited getter. To avoid misbehavior we temporary remove
-            // `__proto__` so that `__lookupGetter__` will return getter only
-            // if it's owned by an object.
-            var prototype = object.__proto__;
-            object.__proto__ = prototypeOfObject;
-
-            var getter = lookupGetter(object, property);
-            var setter = lookupSetter(object, property);
-
-            // Once we have getter and setter we can put values back.
-            object.__proto__ = prototype;
-
-            if (getter || setter) {
-                if (getter) descriptor.get = getter;
-                if (setter) descriptor.set = setter;
-
-                // If it was accessor property we're done and return here
-                // in order to avoid adding `value` to the descriptor.
-                return descriptor;
-            }
-        }
-
-        // If we got this far we know that object has an own property that is
-        // not an accessor so we set it as a value and return descriptor.
-        descriptor.value = object[property];
-        return descriptor;
-    };
-}
-
-// ES5 15.2.3.4
-// http://es5.github.com/#x15.2.3.4
-if (!Object.getOwnPropertyNames) {
-    Object.getOwnPropertyNames = function getOwnPropertyNames(object) {
-        return Object.keys(object);
-    };
-}
-
-// ES5 15.2.3.5
-// http://es5.github.com/#x15.2.3.5
-if (!Object.create) {
-    Object.create = function create(prototype, properties) {
-        var object;
-        if (prototype === null) {
-            object = { "__proto__": null };
-        } else {
-            if (typeof prototype != "object")
-                throw new TypeError("typeof prototype["+(typeof prototype)+"] != 'object'");
-            var Type = function () {};
-            Type.prototype = prototype;
-            object = new Type();
-            // IE has no built-in implementation of `Object.getPrototypeOf`
-            // neither `__proto__`, but this manually setting `__proto__` will
-            // guarantee that `Object.getPrototypeOf` will work as expected with
-            // objects created using `Object.create`
-            object.__proto__ = prototype;
-        }
-        if (properties !== void 0)
-            Object.defineProperties(object, properties);
-        return object;
-    };
-}
-
-// ES5 15.2.3.6
-// http://es5.github.com/#x15.2.3.6
-
-// Patch for WebKit and IE8 standard mode
-// Designed by hax <hax.github.com>
-// related issue: https://github.com/kriskowal/es5-shim/issues#issue/5
-// IE8 Reference:
-//     http://msdn.microsoft.com/en-us/library/dd282900.aspx
-//     http://msdn.microsoft.com/en-us/library/dd229916.aspx
-// WebKit Bugs:
-//     https://bugs.webkit.org/show_bug.cgi?id=36423
-
-function doesDefinePropertyWork(object) {
-    try {
-        Object.defineProperty(object, "sentinel", {});
-        return "sentinel" in object;
-    } catch (exception) {
-        // returns falsy
-    }
-}
-
-// check whether defineProperty works if it's given. Otherwise,
-// shim partially.
-if (Object.defineProperty) {
-    var definePropertyWorksOnObject = doesDefinePropertyWork({});
-    var definePropertyWorksOnDom = typeof document == "undefined" ||
-        doesDefinePropertyWork(document.createElement("div"));
-    if (!definePropertyWorksOnObject || !definePropertyWorksOnDom) {
-        var definePropertyFallback = Object.defineProperty;
-    }
-}
-
-if (!Object.defineProperty || definePropertyFallback) {
-    var ERR_NON_OBJECT_DESCRIPTOR = "Property description must be an object: ";
-    var ERR_NON_OBJECT_TARGET = "Object.defineProperty called on non-object: "
-    var ERR_ACCESSORS_NOT_SUPPORTED = "getters & setters can not be defined " +
-                                      "on this javascript engine";
-
-    Object.defineProperty = function defineProperty(object, property, descriptor) {
-        if ((typeof object != "object" && typeof object != "function") || object === null)
-            throw new TypeError(ERR_NON_OBJECT_TARGET + object);
-        if ((typeof descriptor != "object" && typeof descriptor != "function") || descriptor === null)
-            throw new TypeError(ERR_NON_OBJECT_DESCRIPTOR + descriptor);
-
-        // make a valiant attempt to use the real defineProperty
-        // for I8's DOM elements.
-        if (definePropertyFallback) {
-            try {
-                return definePropertyFallback.call(Object, object, property, descriptor);
-            } catch (exception) {
-                // try the shim if the real one doesn't work
-            }
-        }
-
-        // If it's a data property.
-        if (owns(descriptor, "value")) {
-            // fail silently if "writable", "enumerable", or "configurable"
-            // are requested but not supported
-            /*
-            // alternate approach:
-            if ( // can't implement these features; allow false but not true
-                !(owns(descriptor, "writable") ? descriptor.writable : true) ||
-                !(owns(descriptor, "enumerable") ? descriptor.enumerable : true) ||
-                !(owns(descriptor, "configurable") ? descriptor.configurable : true)
-            )
-                throw new RangeError(
-                    "This implementation of Object.defineProperty does not " +
-                    "support configurable, enumerable, or writable."
-                );
-            */
-
-            if (supportsAccessors && (lookupGetter(object, property) ||
-                                      lookupSetter(object, property)))
-            {
-                // As accessors are supported only on engines implementing
-                // `__proto__` we can safely override `__proto__` while defining
-                // a property to make sure that we don't hit an inherited
-                // accessor.
-                var prototype = object.__proto__;
-                object.__proto__ = prototypeOfObject;
-                // Deleting a property anyway since getter / setter may be
-                // defined on object itself.
-                delete object[property];
-                object[property] = descriptor.value;
-                // Setting original `__proto__` back now.
-                object.__proto__ = prototype;
-            } else {
-                object[property] = descriptor.value;
-            }
-        } else {
-            if (!supportsAccessors)
-                throw new TypeError(ERR_ACCESSORS_NOT_SUPPORTED);
-            // If we got that far then getters and setters can be defined !!
-            if (owns(descriptor, "get"))
-                defineGetter(object, property, descriptor.get);
-            if (owns(descriptor, "set"))
-                defineSetter(object, property, descriptor.set);
-        }
-
-        return object;
-    };
-}
-
-// ES5 15.2.3.7
-// http://es5.github.com/#x15.2.3.7
-if (!Object.defineProperties) {
-    Object.defineProperties = function defineProperties(object, properties) {
-        for (var property in properties) {
-            if (owns(properties, property))
-                Object.defineProperty(object, property, properties[property]);
-        }
-        return object;
-    };
-}
-
-// ES5 15.2.3.8
-// http://es5.github.com/#x15.2.3.8
-if (!Object.seal) {
-    Object.seal = function seal(object) {
-        // this is misleading and breaks feature-detection, but
-        // allows "securable" code to "gracefully" degrade to working
-        // but insecure code.
-        return object;
-    };
-}
-
-// ES5 15.2.3.9
-// http://es5.github.com/#x15.2.3.9
-if (!Object.freeze) {
-    Object.freeze = function freeze(object) {
-        // this is misleading and breaks feature-detection, but
-        // allows "securable" code to "gracefully" degrade to working
-        // but insecure code.
-        return object;
-    };
-}
-
-// detect a Rhino bug and patch it
-try {
-    Object.freeze(function () {});
-} catch (exception) {
-    Object.freeze = (function freeze(freezeObject) {
-        return function freeze(object) {
-            if (typeof object == "function") {
-                return object;
-            } else {
-                return freezeObject(object);
-            }
-        };
-    })(Object.freeze);
-}
-
-// ES5 15.2.3.10
-// http://es5.github.com/#x15.2.3.10
-if (!Object.preventExtensions) {
-    Object.preventExtensions = function preventExtensions(object) {
-        // this is misleading and breaks feature-detection, but
-        // allows "securable" code to "gracefully" degrade to working
-        // but insecure code.
-        return object;
-    };
-}
-
-// ES5 15.2.3.11
-// http://es5.github.com/#x15.2.3.11
-if (!Object.isSealed) {
-    Object.isSealed = function isSealed(object) {
-        return false;
-    };
-}
-
-// ES5 15.2.3.12
-// http://es5.github.com/#x15.2.3.12
-if (!Object.isFrozen) {
-    Object.isFrozen = function isFrozen(object) {
-        return false;
-    };
-}
-
-// ES5 15.2.3.13
-// http://es5.github.com/#x15.2.3.13
-if (!Object.isExtensible) {
-    Object.isExtensible = function isExtensible(object) {
-        // 1. If Type(O) is not Object throw a TypeError exception.
-        if (Object(object) === object) {
-            throw new TypeError(); // TODO message
-        }
-        // 2. Return the Boolean value of the [[Extensible]] internal property of O.
-        var name = '';
-        while (owns(object, name)) {
-            name += '?';
-        }
-        object[name] = true;
-        var returnValue = owns(object, name);
-        delete object[name];
-        return returnValue;
-    };
-}
-
-// ES5 15.2.3.14
-// http://es5.github.com/#x15.2.3.14
-if (!Object.keys) {
-    // http://whattheheadsaid.com/2010/10/a-safer-object-keys-compatibility-implementation
-    var hasDontEnumBug = true,
-        dontEnums = [
-            "toString",
-            "toLocaleString",
-            "valueOf",
-            "hasOwnProperty",
-            "isPrototypeOf",
-            "propertyIsEnumerable",
-            "constructor"
-        ],
-        dontEnumsLength = dontEnums.length;
-
-    for (var key in {"toString": null})
-        hasDontEnumBug = false;
-
-    Object.keys = function keys(object) {
-
-        if ((typeof object != "object" && typeof object != "function") || object === null)
-            throw new TypeError("Object.keys called on a non-object");
-
-        var keys = [];
-        for (var name in object) {
-            if (owns(object, name)) {
-                keys.push(name);
-            }
-        }
-
-        if (hasDontEnumBug) {
-            for (var i = 0, ii = dontEnumsLength; i < ii; i++) {
-                var dontEnum = dontEnums[i];
-                if (owns(object, dontEnum)) {
-                    keys.push(dontEnum);
-                }
-            }
-        }
-
-        return keys;
-    };
-
-}
-
-//
-// Date
-// ====
-//
-
-// ES5 15.9.5.43
-// http://es5.github.com/#x15.9.5.43
-// This function returns a String value represent the instance in time 
-// represented by this Date object. The format of the String is the Date Time 
-// string format defined in 15.9.1.15. All fields are present in the String. 
-// The time zone is always UTC, denoted by the suffix Z. If the time value of 
-// this object is not a finite Number a RangeError exception is thrown.
-if (!Date.prototype.toISOString || (new Date(-62198755200000).toISOString().indexOf('-000001') === -1)) {
-    Date.prototype.toISOString = function toISOString() {
-        var result, length, value, year;
-        if (!isFinite(this))
-            throw new RangeError;
-
-        // the date time string format is specified in 15.9.1.15.
-        result = [this.getUTCMonth() + 1, this.getUTCDate(),
-            this.getUTCHours(), this.getUTCMinutes(), this.getUTCSeconds()];
-        year = this.getUTCFullYear();
-        year = (year < 0 ? '-' : (year > 9999 ? '+' : '')) + ('00000' + Math.abs(year)).slice(0 <= year && year <= 9999 ? -4 : -6);
-
-        length = result.length;
-        while (length--) {
-            value = result[length];
-            // pad months, days, hours, minutes, and seconds to have two digits.
-            if (value < 10)
-                result[length] = "0" + value;
-        }
-        // pad milliseconds to have three digits.
-        return year + "-" + result.slice(0, 2).join("-") + "T" + result.slice(2).join(":") + "." +
-            ("000" + this.getUTCMilliseconds()).slice(-3) + "Z";
-    }
-}
-
-// ES5 15.9.4.4
-// http://es5.github.com/#x15.9.4.4
-if (!Date.now) {
-    Date.now = function now() {
-        return new Date().getTime();
-    };
-}
-
-// ES5 15.9.5.44
-// http://es5.github.com/#x15.9.5.44
-// This function provides a String representation of a Date object for use by 
-// JSON.stringify (15.12.3).
-if (!Date.prototype.toJSON) {
-    Date.prototype.toJSON = function toJSON(key) {
-        // When the toJSON method is called with argument key, the following 
-        // steps are taken:
-
-        // 1.  Let O be the result of calling ToObject, giving it the this
-        // value as its argument.
-        // 2. Let tv be ToPrimitive(O, hint Number).
-        // 3. If tv is a Number and is not finite, return null.
-        // XXX
-        // 4. Let toISO be the result of calling the [[Get]] internal method of
-        // O with argument "toISOString".
-        // 5. If IsCallable(toISO) is false, throw a TypeError exception.
-        if (typeof this.toISOString != "function")
-            throw new TypeError(); // TODO message
-        // 6. Return the result of calling the [[Call]] internal method of
-        //  toISO with O as the this value and an empty argument list.
-        return this.toISOString();
-
-        // NOTE 1 The argument is ignored.
-
-        // NOTE 2 The toJSON function is intentionally generic; it does not
-        // require that its this value be a Date object. Therefore, it can be
-        // transferred to other kinds of objects for use as a method. However,
-        // it does require that any such object have a toISOString method. An
-        // object is free to use the argument key to filter its
-        // stringification.
-    };
-}
-
-// ES5 15.9.4.2
-// http://es5.github.com/#x15.9.4.2
-// based on work shared by Daniel Friesen (dantman)
-// http://gist.github.com/303249
-if (Date.parse("+275760-09-13T00:00:00.000Z") !== 8.64e15) {
-    // XXX global assignment won't work in embeddings that use
-    // an alternate object for the context.
-    Date = (function(NativeDate) {
-
-        // Date.length === 7
-        var Date = function Date(Y, M, D, h, m, s, ms) {
-            var length = arguments.length;
-            if (this instanceof NativeDate) {
-                var date = length == 1 && String(Y) === Y ? // isString(Y)
-                    // We explicitly pass it through parse:
-                    new NativeDate(Date.parse(Y)) :
-                    // We have to manually make calls depending on argument
-                    // length here
-                    length >= 7 ? new NativeDate(Y, M, D, h, m, s, ms) :
-                    length >= 6 ? new NativeDate(Y, M, D, h, m, s) :
-                    length >= 5 ? new NativeDate(Y, M, D, h, m) :
-                    length >= 4 ? new NativeDate(Y, M, D, h) :
-                    length >= 3 ? new NativeDate(Y, M, D) :
-                    length >= 2 ? new NativeDate(Y, M) :
-                    length >= 1 ? new NativeDate(Y) :
-                                  new NativeDate();
-                // Prevent mixups with unfixed Date object
-                date.constructor = Date;
-                return date;
-            }
-            return NativeDate.apply(this, arguments);
-        };
-
-        // 15.9.1.15 Date Time String Format.
-        var isoDateExpression = new RegExp("^" +
-            "(\\d{4}|[\+\-]\\d{6})" + // four-digit year capture or sign + 6-digit extended year
-            "(?:-(\\d{2})" + // optional month capture
-            "(?:-(\\d{2})" + // optional day capture
-            "(?:" + // capture hours:minutes:seconds.milliseconds
-                "T(\\d{2})" + // hours capture
-                ":(\\d{2})" + // minutes capture
-                "(?:" + // optional :seconds.milliseconds
-                    ":(\\d{2})" + // seconds capture
-                    "(?:\\.(\\d{3}))?" + // milliseconds capture
-                ")?" +
-            "(?:" + // capture UTC offset component
-                "Z|" + // UTC capture
-                "(?:" + // offset specifier +/-hours:minutes
-                    "([-+])" + // sign capture
-                    "(\\d{2})" + // hours offset capture
-                    ":(\\d{2})" + // minutes offset capture
-                ")" +
-            ")?)?)?)?" +
-        "$");
-
-        // Copy any custom methods a 3rd party library may have added
-        for (var key in NativeDate)
-            Date[key] = NativeDate[key];
-
-        // Copy "native" methods explicitly; they may be non-enumerable
-        Date.now = NativeDate.now;
-        Date.UTC = NativeDate.UTC;
-        Date.prototype = NativeDate.prototype;
-        Date.prototype.constructor = Date;
-
-        // Upgrade Date.parse to handle simplified ISO 8601 strings
-        Date.parse = function parse(string) {
-            var match = isoDateExpression.exec(string);
-            if (match) {
-                match.shift(); // kill match[0], the full match
-                // parse months, days, hours, minutes, seconds, and milliseconds
-                for (var i = 1; i < 7; i++) {
-                    // provide default values if necessary
-                    match[i] = +(match[i] || (i < 3 ? 1 : 0));
-                    // match[1] is the month. Months are 0-11 in JavaScript
-                    // `Date` objects, but 1-12 in ISO notation, so we
-                    // decrement.
-                    if (i == 1)
-                        match[i]--;
-                }
-
-                // parse the UTC offset component
-                var minuteOffset = +match.pop(), hourOffset = +match.pop(), sign = match.pop();
-
-                // compute the explicit time zone offset if specified
-                var offset = 0;
-                if (sign) {
-                    // detect invalid offsets and return early
-                    if (hourOffset > 23 || minuteOffset > 59)
-                        return NaN;
-
-                    // express the provided time zone offset in minutes. The offset is
-                    // negative for time zones west of UTC; positive otherwise.
-                    offset = (hourOffset * 60 + minuteOffset) * 6e4 * (sign == "+" ? -1 : 1);
-                }
-
-                // Date.UTC for years between 0 and 99 converts year to 1900 + year
-                // The Gregorian calendar has a 400-year cycle, so 
-                // to Date.UTC(year + 400, .... ) - 12622780800000 == Date.UTC(year, ...),
-                // where 12622780800000 - number of milliseconds in Gregorian calendar 400 years
-                var year = +match[0];
-                if (0 <= year && year <= 99) {
-                    match[0] = year + 400;
-                    return NativeDate.UTC.apply(this, match) + offset - 12622780800000;
-                }
-
-                // compute a new UTC date value, accounting for the optional offset
-                return NativeDate.UTC.apply(this, match) + offset;
-            }
-            return NativeDate.parse.apply(this, arguments);
-        };
-
-        return Date;
-    })(Date);
-}
-
-//
-// String
-// ======
-//
-
-// ES5 15.5.4.20
-// http://es5.github.com/#x15.5.4.20
-var ws = "\x09\x0A\x0B\x0C\x0D\x20\xA0\u1680\u180E\u2000\u2001\u2002\u2003" +
-    "\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u202F\u205F\u3000\u2028" +
-    "\u2029\uFEFF";
-if (!String.prototype.trim || ws.trim()) {
-    // http://blog.stevenlevithan.com/archives/faster-trim-javascript
-    // http://perfectionkills.com/whitespace-deviations/
-    ws = "[" + ws + "]";
-    var trimBeginRegexp = new RegExp("^" + ws + ws + "*"),
-        trimEndRegexp = new RegExp(ws + ws + "*$");
-    String.prototype.trim = function trim() {
-        return String(this).replace(trimBeginRegexp, "").replace(trimEndRegexp, "");
-    };
-}
-
-//
-// Util
-// ======
-//
-
-// ES5 9.4
-// http://es5.github.com/#x9.4
-// http://jsperf.com/to-integer
-var toInteger = function (n) {
-    n = +n;
-    if (n !== n) // isNaN
-        n = 0;
-    else if (n !== 0 && n !== (1/0) && n !== -(1/0))
-        n = (n > 0 || -1) * Math.floor(Math.abs(n));
-    return n;
-};
-
-var prepareString = "a"[0] != "a",
-    // ES5 9.9
-    // http://es5.github.com/#x9.9
-    toObject = function (o) {
-        if (o == null) { // this matches both null and undefined
-            throw new TypeError(); // TODO message
-        }
-        // If the implementation doesn't support by-index access of
-        // string characters (ex. IE < 7), split the string
-        if (prepareString && typeof o == "string" && o) {
-            return o.split("");
-        }
-        return Object(o);
-    };
-});/* vim:ts=4:sts=4:sw=4:
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Irakli Gozalishvili <rfobic@gmail.com> (http://jeditoolkit.com)
- *      Mike de Boer <mike AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/lib/event_emitter', ['require', 'exports', 'module' ], function(require, exports, module) {
-"use strict";
-
-var EventEmitter = {};
-
-EventEmitter._emit =
-EventEmitter._dispatchEvent = function(eventName, e) {
-    this._eventRegistry = this._eventRegistry || {};
-    this._defaultHandlers = this._defaultHandlers || {};
-
-    var listeners = this._eventRegistry[eventName] || [];
-    var defaultHandler = this._defaultHandlers[eventName];
-    if (!listeners.length && !defaultHandler)
-        return;
-
-    e = e || {};
-    e.type = eventName;
-    
-    if (!e.stopPropagation) {
-        e.stopPropagation = function() {
-            this.propagationStopped = true;
-        };
-    }
-    
-    if (!e.preventDefault) {
-        e.preventDefault = function() {
-            this.defaultPrevented = true;
-        };
-    }
-
-    for (var i=0; i<listeners.length; i++) {
-        listeners[i](e);
-        if (e.propagationStopped)
-            break;
-    }
-    
-    if (defaultHandler && !e.defaultPrevented)
-        defaultHandler(e);
-};
-
-EventEmitter.setDefaultHandler = function(eventName, callback) {
-    this._defaultHandlers = this._defaultHandlers || {};
-    
-    if (this._defaultHandlers[eventName])
-        throw new Error("The default handler for '" + eventName + "' is already set");
-        
-    this._defaultHandlers[eventName] = callback;
-};
-
-EventEmitter.on =
-EventEmitter.addEventListener = function(eventName, callback) {
-    this._eventRegistry = this._eventRegistry || {};
-
-    var listeners = this._eventRegistry[eventName];
-    if (!listeners)
-        var listeners = this._eventRegistry[eventName] = [];
-
-    if (listeners.indexOf(callback) == -1)
-        listeners.push(callback);
-};
-
-EventEmitter.removeListener =
-EventEmitter.removeEventListener = function(eventName, callback) {
-    this._eventRegistry = this._eventRegistry || {};
-
-    var listeners = this._eventRegistry[eventName];
-    if (!listeners)
-        return;
-
-    var index = listeners.indexOf(callback);
-    if (index !== -1)
-        listeners.splice(index, 1);
-};
-
-EventEmitter.removeAllListeners = function(eventName) {
-    if (this._eventRegistry) this._eventRegistry[eventName] = [];
-};
-
-exports.EventEmitter = EventEmitter;
-
-});/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/lib/oop', ['require', 'exports', 'module' ], function(require, exports, module) {
-"use strict";
-
-exports.inherits = (function() {
-    var tempCtor = function() {};
-    return function(ctor, superCtor) {
-        tempCtor.prototype = superCtor.prototype;
-        ctor.super_ = superCtor.prototype;
-        ctor.prototype = new tempCtor();
-        ctor.prototype.constructor = ctor;
-    };
-}());
-
-exports.mixin = function(obj, mixin) {
-    for (var key in mixin) {
-        obj[key] = mixin[key];
-    }
-};
-
-exports.implement = function(proto, mixin) {
-    exports.mixin(proto, mixin);
-};
-
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
- 
-define('ace/mode/css_worker', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/worker/mirror', 'ace/mode/css/csslint'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var Mirror = require("../worker/mirror").Mirror;
-var CSSLint = require("./css/csslint").CSSLint;
-
-var Worker = exports.Worker = function(sender) {
-    Mirror.call(this, sender);
-    this.setTimeout(200);
-};
-
-oop.inherits(Worker, Mirror);
-
-(function() {
-    
-    this.onUpdate = function() {
-        var value = this.doc.getValue();
-        
-        var result = CSSLint.verify(value);
-        this.sender.emit("csslint", result.messages.map(function(msg) {
-            delete msg.rule;
-            return msg;
-        }));
-    };
-    
-}).call(Worker.prototype);
-
-});define('ace/worker/mirror', ['require', 'exports', 'module' , 'ace/document', 'ace/lib/lang'], function(require, exports, module) {
-"use strict";
-
-var Document = require("../document").Document;
-var lang = require("../lib/lang");
-    
-var Mirror = exports.Mirror = function(sender) {
-    this.sender = sender;
-    var doc = this.doc = new Document("");
-    
-    var deferredUpdate = this.deferredUpdate = lang.deferredCall(this.onUpdate.bind(this));
-    
-    var _self = this;
-    sender.on("change", function(e) {
-        doc.applyDeltas([e.data]);        
-        deferredUpdate.schedule(_self.$timeout);
-    });
-};
-
-(function() {
-    
-    this.$timeout = 500;
-    
-    this.setTimeout = function(timeout) {
-        this.$timeout = timeout;
-    };
-    
-    this.setValue = function(value) {
-        this.doc.setValue(value);
-        this.deferredUpdate.schedule(this.$timeout);
-    };
-    
-    this.getValue = function(callbackId) {
-        this.sender.callback(this.doc.getValue(), callbackId);
-    };
-    
-    this.onUpdate = function() {
-        // abstract method
-    };
-    
-}).call(Mirror.prototype);
-
-});/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/document', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/event_emitter', 'ace/range', 'ace/anchor'], function(require, exports, module) {
-"use strict";
-
-var oop = require("./lib/oop");
-var EventEmitter = require("./lib/event_emitter").EventEmitter;
-var Range = require("./range").Range;
-var Anchor = require("./anchor").Anchor;
-
-var Document = function(text) {
-    this.$lines = [];
-
-    if (Array.isArray(text)) {
-        this.insertLines(0, text);
-    }
-    // There has to be one line at least in the document. If you pass an empty
-    // string to the insert function, nothing will happen. Workaround.
-    else if (text.length == 0) {
-        this.$lines = [""];
-    } else {
-        this.insert({row: 0, column:0}, text);
-    }
-};
-
-(function() {
-
-    oop.implement(this, EventEmitter);
-
-    this.setValue = function(text) {
-        var len = this.getLength();
-        this.remove(new Range(0, 0, len, this.getLine(len-1).length));
-        this.insert({row: 0, column:0}, text);
-    };
-
-    this.getValue = function() {
-        return this.getAllLines().join(this.getNewLineCharacter());
-    };
-
-    this.createAnchor = function(row, column) {
-        return new Anchor(this, row, column);
-    };
-
-    // check for IE split bug
-    if ("aaa".split(/a/).length == 0)
-        this.$split = function(text) {
-            return text.replace(/\r\n|\r/g, "\n").split("\n");
-        }
-    else
-        this.$split = function(text) {
-            return text.split(/\r\n|\r|\n/);
-        };
-
-
-    this.$detectNewLine = function(text) {
-        var match = text.match(/^.*?(\r\n|\r|\n)/m);
-        if (match) {
-            this.$autoNewLine = match[1];
-        } else {
-            this.$autoNewLine = "\n";
-        }
-    };
-
-    this.getNewLineCharacter = function() {
-      switch (this.$newLineMode) {
-          case "windows":
-              return "\r\n";
-
-          case "unix":
-              return "\n";
-
-          case "auto":
-              return this.$autoNewLine;
-      }
-    };
-
-    this.$autoNewLine = "\n";
-    this.$newLineMode = "auto";
-    this.setNewLineMode = function(newLineMode) {
-        if (this.$newLineMode === newLineMode)
-            return;
-
-        this.$newLineMode = newLineMode;
-    };
-
-    this.getNewLineMode = function() {
-        return this.$newLineMode;
-    };
-
-    this.isNewLine = function(text) {
-        return (text == "\r\n" || text == "\r" || text == "\n");
-    };
-
-    /**
-     * Get a verbatim copy of the given line as it is in the document
-     */
-    this.getLine = function(row) {
-        return this.$lines[row] || "";
-    };
-
-    this.getLines = function(firstRow, lastRow) {
-        return this.$lines.slice(firstRow, lastRow + 1);
-    };
-
-    /**
-     * Returns all lines in the document as string array. Warning: The caller
-     * should not modify this array!
-     */
-    this.getAllLines = function() {
-        return this.getLines(0, this.getLength());
-    };
-
-    this.getLength = function() {
-        return this.$lines.length;
-    };
-
-    this.getTextRange = function(range) {
-        if (range.start.row == range.end.row) {
-            return this.$lines[range.start.row].substring(range.start.column,
-                                                         range.end.column);
-        }
-        else {
-            var lines = [];
-            lines.push(this.$lines[range.start.row].substring(range.start.column));
-            lines.push.apply(lines, this.getLines(range.start.row+1, range.end.row-1));
-            lines.push(this.$lines[range.end.row].substring(0, range.end.column));
-            return lines.join(this.getNewLineCharacter());
-        }
-    };
-
-    this.$clipPosition = function(position) {
-        var length = this.getLength();
-        if (position.row >= length) {
-            position.row = Math.max(0, length - 1);
-            position.column = this.getLine(length-1).length;
-        }
-        return position;
-    };
-
-    this.insert = function(position, text) {
-        if (!text || text.length === 0)
-            return position;
-
-        position = this.$clipPosition(position);
-
-        // only detect new lines if the document has no line break yet
-        if (this.getLength() <= 1)
-            this.$detectNewLine(text);
-
-        var lines = this.$split(text);
-        var firstLine = lines.splice(0, 1)[0];
-        var lastLine = lines.length == 0 ? null : lines.splice(lines.length - 1, 1)[0];
-
-        position = this.insertInLine(position, firstLine);
-        if (lastLine !== null) {
-            position = this.insertNewLine(position); // terminate first line
-            position = this.insertLines(position.row, lines);
-            position = this.insertInLine(position, lastLine || "");
-        }
-        return position;
-    };
-
-    this.insertLines = function(row, lines) {
-        if (lines.length == 0)
-            return {row: row, column: 0};
-
-        var args = [row, 0];
-        args.push.apply(args, lines);
-        this.$lines.splice.apply(this.$lines, args);
-
-        var range = new Range(row, 0, row + lines.length, 0);
-        var delta = {
-            action: "insertLines",
-            range: range,
-            lines: lines
-        };
-        this._emit("change", { data: delta });
-        return range.end;
-    };
-
-    this.insertNewLine = function(position) {
-        position = this.$clipPosition(position);
-        var line = this.$lines[position.row] || "";
-
-        this.$lines[position.row] = line.substring(0, position.column);
-        this.$lines.splice(position.row + 1, 0, line.substring(position.column, line.length));
-
-        var end = {
-            row : position.row + 1,
-            column : 0
-        };
-
-        var delta = {
-            action: "insertText",
-            range: Range.fromPoints(position, end),
-            text: this.getNewLineCharacter()
-        };
-        this._emit("change", { data: delta });
-
-        return end;
-    };
-
-    this.insertInLine = function(position, text) {
-        if (text.length == 0)
-            return position;
-
-        var line = this.$lines[position.row] || "";
-
-        this.$lines[position.row] = line.substring(0, position.column) + text
-                + line.substring(position.column);
-
-        var end = {
-            row : position.row,
-            column : position.column + text.length
-        };
-
-        var delta = {
-            action: "insertText",
-            range: Range.fromPoints(position, end),
-            text: text
-        };
-        this._emit("change", { data: delta });
-
-        return end;
-    };
-
-    this.remove = function(range) {
-        // clip to document
-        range.start = this.$clipPosition(range.start);
-        range.end = this.$clipPosition(range.end);
-
-        if (range.isEmpty())
-            return range.start;
-
-        var firstRow = range.start.row;
-        var lastRow = range.end.row;
-
-        if (range.isMultiLine()) {
-            var firstFullRow = range.start.column == 0 ? firstRow : firstRow + 1;
-            var lastFullRow = lastRow - 1;
-
-            if (range.end.column > 0)
-                this.removeInLine(lastRow, 0, range.end.column);
-
-            if (lastFullRow >= firstFullRow)
-                this.removeLines(firstFullRow, lastFullRow);
-
-            if (firstFullRow != firstRow) {
-                this.removeInLine(firstRow, range.start.column, this.getLine(firstRow).length);
-                this.removeNewLine(range.start.row);
-            }
-        }
-        else {
-            this.removeInLine(firstRow, range.start.column, range.end.column);
-        }
-        return range.start;
-    };
-
-    this.removeInLine = function(row, startColumn, endColumn) {
-        if (startColumn == endColumn)
-            return;
-
-        var range = new Range(row, startColumn, row, endColumn);
-        var line = this.getLine(row);
-        var removed = line.substring(startColumn, endColumn);
-        var newLine = line.substring(0, startColumn) + line.substring(endColumn, line.length);
-        this.$lines.splice(row, 1, newLine);
-
-        var delta = {
-            action: "removeText",
-            range: range,
-            text: removed
-        };
-        this._emit("change", { data: delta });
-        return range.start;
-    };
-
-    /**
-     * Removes a range of full lines
-     *
-     * @param firstRow {Integer} The first row to be removed
-     * @param lastRow {Integer} The last row to be removed
-     * @return {String[]} The removed lines
-     */
-    this.removeLines = function(firstRow, lastRow) {
-        var range = new Range(firstRow, 0, lastRow + 1, 0);
-        var removed = this.$lines.splice(firstRow, lastRow - firstRow + 1);
-
-        var delta = {
-            action: "removeLines",
-            range: range,
-            nl: this.getNewLineCharacter(),
-            lines: removed
-        };
-        this._emit("change", { data: delta });
-        return removed;
-    };
-
-    this.removeNewLine = function(row) {
-        var firstLine = this.getLine(row);
-        var secondLine = this.getLine(row+1);
-
-        var range = new Range(row, firstLine.length, row+1, 0);
-        var line = firstLine + secondLine;
-
-        this.$lines.splice(row, 2, line);
-
-        var delta = {
-            action: "removeText",
-            range: range,
-            text: this.getNewLineCharacter()
-        };
-        this._emit("change", { data: delta });
-    };
-
-    this.replace = function(range, text) {
-        if (text.length == 0 && range.isEmpty())
-            return range.start;
-
-        // Shortcut: If the text we want to insert is the same as it is already
-        // in the document, we don't have to replace anything.
-        if (text == this.getTextRange(range))
-            return range.end;
-
-        this.remove(range);
-        if (text) {
-            var end = this.insert(range.start, text);
-        }
-        else {
-            end = range.start;
-        }
-
-        return end;
-    };
-
-    this.applyDeltas = function(deltas) {
-        for (var i=0; i<deltas.length; i++) {
-            var delta = deltas[i];
-            var range = Range.fromPoints(delta.range.start, delta.range.end);
-
-            if (delta.action == "insertLines")
-                this.insertLines(range.start.row, delta.lines);
-            else if (delta.action == "insertText")
-                this.insert(range.start, delta.text);
-            else if (delta.action == "removeLines")
-                this.removeLines(range.start.row, range.end.row - 1);
-            else if (delta.action == "removeText")
-                this.remove(range);
-        }
-    };
-
-    this.revertDeltas = function(deltas) {
-        for (var i=deltas.length-1; i>=0; i--) {
-            var delta = deltas[i];
-
-            var range = Range.fromPoints(delta.range.start, delta.range.end);
-
-            if (delta.action == "insertLines")
-                this.removeLines(range.start.row, range.end.row - 1);
-            else if (delta.action == "insertText")
-                this.remove(range);
-            else if (delta.action == "removeLines")
-                this.insertLines(range.start.row, delta.lines);
-            else if (delta.action == "removeText")
-                this.insert(range.start, delta.text);
-        }
-    };
-
-}).call(Document.prototype);
-
-exports.Document = Document;
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/range', ['require', 'exports', 'module' ], function(require, exports, module) {
-"use strict";
-
-var Range = function(startRow, startColumn, endRow, endColumn) {
-    this.start = {
-        row: startRow,
-        column: startColumn
-    };
-
-    this.end = {
-        row: endRow,
-        column: endColumn
-    };
-};
-
-(function() {
-    this.isEqual = function(range) {
-        return this.start.row == range.start.row &&
-            this.end.row == range.end.row &&
-            this.start.column == range.start.column &&
-            this.end.column == range.end.column
-    };
-
-    this.toString = function() {
-        return ("Range: [" + this.start.row + "/" + this.start.column +
-            "] -> [" + this.end.row + "/" + this.end.column + "]");
-    };
-
-    this.contains = function(row, column) {
-        return this.compare(row, column) == 0;
-    };
-
-    /**
-     * Compares this range (A) with another range (B), where B is the passed in
-     * range.
-     *
-     * Return values:
-     *  -2: (B) is infront of (A) and doesn't intersect with (A)
-     *  -1: (B) begins before (A) but ends inside of (A)
-     *   0: (B) is completly inside of (A) OR (A) is complety inside of (B)
-     *  +1: (B) begins inside of (A) but ends outside of (A)
-     *  +2: (B) is after (A) and doesn't intersect with (A)
-     *
-     *  42: FTW state: (B) ends in (A) but starts outside of (A)
-     */
-    this.compareRange = function(range) {
-        var cmp,
-            end = range.end,
-            start = range.start;
-
-        cmp = this.compare(end.row, end.column);
-        if (cmp == 1) {
-            cmp = this.compare(start.row, start.column);
-            if (cmp == 1) {
-                return 2;
-            } else if (cmp == 0) {
-                return 1;
-            } else {
-                return 0;
-            }
-        } else if (cmp == -1) {
-            return -2;
-        } else {
-            cmp = this.compare(start.row, start.column);
-            if (cmp == -1) {
-                return -1;
-            } else if (cmp == 1) {
-                return 42;
-            } else {
-                return 0;
-            }
-        }
-    }
-
-    this.comparePoint = function(p) {
-        return this.compare(p.row, p.column);
-    }
-
-    this.containsRange = function(range) {
-        return this.comparePoint(range.start) == 0 && this.comparePoint(range.end) == 0;
-    }
-
-    this.intersectsRange = function(range) {
-        var cmp = this.compareRange(range);
-        return (cmp == -1 || cmp == 0 || cmp == 1);
-    }
-
-    this.isEnd = function(row, column) {
-        return this.end.row == row && this.end.column == column;
-    }
-
-    this.isStart = function(row, column) {
-        return this.start.row == row && this.start.column == column;
-    }
-
-    this.setStart = function(row, column) {
-        if (typeof row == "object") {
-            this.start.column = row.column;
-            this.start.row = row.row;
-        } else {
-            this.start.row = row;
-            this.start.column = column;
-        }
-    }
-
-    this.setEnd = function(row, column) {
-        if (typeof row == "object") {
-            this.end.column = row.column;
-            this.end.row = row.row;
-        } else {
-            this.end.row = row;
-            this.end.column = column;
-        }
-    }
-
-    this.inside = function(row, column) {
-        if (this.compare(row, column) == 0) {
-            if (this.isEnd(row, column) || this.isStart(row, column)) {
-                return false;
-            } else {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    this.insideStart = function(row, column) {
-        if (this.compare(row, column) == 0) {
-            if (this.isEnd(row, column)) {
-                return false;
-            } else {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    this.insideEnd = function(row, column) {
-        if (this.compare(row, column) == 0) {
-            if (this.isStart(row, column)) {
-                return false;
-            } else {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    this.compare = function(row, column) {
-        if (!this.isMultiLine()) {
-            if (row === this.start.row) {
-                return column < this.start.column ? -1 : (column > this.end.column ? 1 : 0);
-            };
-        }
-
-        if (row < this.start.row)
-            return -1;
-
-        if (row > this.end.row)
-            return 1;
-
-        if (this.start.row === row)
-            return column >= this.start.column ? 0 : -1;
-
-        if (this.end.row === row)
-            return column <= this.end.column ? 0 : 1;
-
-        return 0;
-    };
-
-    /**
-     * Like .compare(), but if isStart is true, return -1;
-     */
-    this.compareStart = function(row, column) {
-        if (this.start.row == row && this.start.column == column) {
-            return -1;
-        } else {
-            return this.compare(row, column);
-        }
-    }
-
-    /**
-     * Like .compare(), but if isEnd is true, return 1;
-     */
-    this.compareEnd = function(row, column) {
-        if (this.end.row == row && this.end.column == column) {
-            return 1;
-        } else {
-            return this.compare(row, column);
-        }
-    }
-
-    this.compareInside = function(row, column) {
-        if (this.end.row == row && this.end.column == column) {
-            return 1;
-        } else if (this.start.row == row && this.start.column == column) {
-            return -1;
-        } else {
-            return this.compare(row, column);
-        }
-    }
-
-    this.clipRows = function(firstRow, lastRow) {
-        if (this.end.row > lastRow) {
-            var end = {
-                row: lastRow+1,
-                column: 0
-            };
-        }
-
-        if (this.start.row > lastRow) {
-            var start = {
-                row: lastRow+1,
-                column: 0
-            };
-        }
-
-        if (this.start.row < firstRow) {
-            var start = {
-                row: firstRow,
-                column: 0
-            };
-        }
-
-        if (this.end.row < firstRow) {
-            var end = {
-                row: firstRow,
-                column: 0
-            };
-        }
-        return Range.fromPoints(start || this.start, end || this.end);
-    };
-
-    this.extend = function(row, column) {
-        var cmp = this.compare(row, column);
-
-        if (cmp == 0)
-            return this;
-        else if (cmp == -1)
-            var start = {row: row, column: column};
-        else
-            var end = {row: row, column: column};
-
-        return Range.fromPoints(start || this.start, end || this.end);
-    };
-
-    this.fixOrientation = function() {
-        if (
-            this.start.row < this.end.row 
-            || (this.start.row == this.end.row && this.start.column < this.end.column)
-        ) {
-            return false;
-        }
-        
-        var temp = this.start;
-        this.end = this.start;
-        this.start = temp;
-        return true;
-    };
-
-
-    this.isEmpty = function() {
-        return (this.start.row == this.end.row && this.start.column == this.end.column);
-    };
-
-    this.isMultiLine = function() {
-        return (this.start.row !== this.end.row);
-    };
-
-    this.clone = function() {
-        return Range.fromPoints(this.start, this.end);
-    };
-
-    this.collapseRows = function() {
-        if (this.end.column == 0)
-            return new Range(this.start.row, 0, Math.max(this.start.row, this.end.row-1), 0)
-        else
-            return new Range(this.start.row, 0, this.end.row, 0)
-    };
-
-    this.toScreenRange = function(session) {
-        var screenPosStart =
-            session.documentToScreenPosition(this.start);
-        var screenPosEnd =
-            session.documentToScreenPosition(this.end);
-
-        return new Range(
-            screenPosStart.row, screenPosStart.column,
-            screenPosEnd.row, screenPosEnd.column
-        );
-    };
-
-}).call(Range.prototype);
-
-
-Range.fromPoints = function(start, end) {
-    return new Range(start.row, start.column, end.row, end.column);
-};
-
-exports.Range = Range;
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/anchor', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/event_emitter'], function(require, exports, module) {
-"use strict";
-
-var oop = require("./lib/oop");
-var EventEmitter = require("./lib/event_emitter").EventEmitter;
-
-/**
- * An Anchor is a floating pointer in the document. Whenever text is inserted or
- * deleted before the cursor, the position of the cursor is updated
- */
-var Anchor = exports.Anchor = function(doc, row, column) {
-    this.document = doc;
-    
-    if (typeof column == "undefined")
-        this.setPosition(row.row, row.column);
-    else
-        this.setPosition(row, column);
-
-    this.$onChange = this.onChange.bind(this);
-    doc.on("change", this.$onChange);
-};
-
-(function() {
-
-    oop.implement(this, EventEmitter);
-    
-    this.getPosition = function() {
-        return this.$clipPositionToDocument(this.row, this.column);
-    };
-    
-    this.getDocument = function() {
-        return this.document;
-    };
-    
-    this.onChange = function(e) {
-        var delta = e.data;
-        var range = delta.range;
-            
-        if (range.start.row == range.end.row && range.start.row != this.row)
-            return;
-            
-        if (range.start.row > this.row)
-            return;
-            
-        if (range.start.row == this.row && range.start.column > this.column)
-            return;
-    
-        var row = this.row;
-        var column = this.column;
-        
-        if (delta.action === "insertText") {
-            if (range.start.row === row && range.start.column <= column) {
-                if (range.start.row === range.end.row) {
-                    column += range.end.column - range.start.column;
-                }
-                else {
-                    column -= range.start.column;
-                    row += range.end.row - range.start.row;
-                }
-            }
-            else if (range.start.row !== range.end.row && range.start.row < row) {
-                row += range.end.row - range.start.row;
-            }
-        } else if (delta.action === "insertLines") {
-            if (range.start.row <= row) {
-                row += range.end.row - range.start.row;
-            }
-        }
-        else if (delta.action == "removeText") {
-            if (range.start.row == row && range.start.column < column) {
-                if (range.end.column >= column)
-                    column = range.start.column;
-                else
-                    column = Math.max(0, column - (range.end.column - range.start.column));
-                
-            } else if (range.start.row !== range.end.row && range.start.row < row) {
-                if (range.end.row == row) {
-                    column = Math.max(0, column - range.end.column) + range.start.column;
-                }
-                row -= (range.end.row - range.start.row);
-            }
-            else if (range.end.row == row) {
-                row -= range.end.row - range.start.row;
-                column = Math.max(0, column - range.end.column) + range.start.column;
-            }
-        } else if (delta.action == "removeLines") {
-            if (range.start.row <= row) {
-                if (range.end.row <= row)
-                    row -= range.end.row - range.start.row;
-                else {
-                    row = range.start.row;
-                    column = 0;
-                }
-            }
-        }
-
-        this.setPosition(row, column, true);
-    };
-
-    this.setPosition = function(row, column, noClip) {
-        var pos;
-        if (noClip) {
-            pos = {
-                row: row,
-                column: column
-            };
-        }
-        else {
-            pos = this.$clipPositionToDocument(row, column);
-        }
-        
-        if (this.row == pos.row && this.column == pos.column)
-            return;
-            
-        var old = {
-            row: this.row,
-            column: this.column
-        };
-        
-        this.row = pos.row;
-        this.column = pos.column;
-        this._emit("change", {
-            old: old,
-            value: pos
-        });
-    };
-    
-    this.detach = function() {
-        this.document.removeEventListener("change", this.$onChange);
-    };
-    
-    this.$clipPositionToDocument = function(row, column) {
-        var pos = {};
-    
-        if (row >= this.document.getLength()) {
-            pos.row = Math.max(0, this.document.getLength() - 1);
-            pos.column = this.document.getLine(pos.row).length;
-        }
-        else if (row < 0) {
-            pos.row = 0;
-            pos.column = 0;
-        }
-        else {
-            pos.row = row;
-            pos.column = Math.min(this.document.getLine(pos.row).length, Math.max(0, column));
-        }
-        
-        if (column < 0)
-            pos.column = 0;
-            
-        return pos;
-    };
-    
-}).call(Anchor.prototype);
-
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/lib/lang', ['require', 'exports', 'module' ], function(require, exports, module) {
-"use strict";
-
-exports.stringReverse = function(string) {
-    return string.split("").reverse().join("");
-};
-
-exports.stringRepeat = function (string, count) {
-     return new Array(count + 1).join(string);
-};
-
-var trimBeginRegexp = /^\s\s*/;
-var trimEndRegexp = /\s\s*$/;
-
-exports.stringTrimLeft = function (string) {
-    return string.replace(trimBeginRegexp, '');
-};
-
-exports.stringTrimRight = function (string) {
-    return string.replace(trimEndRegexp, '');
-};
-
-exports.copyObject = function(obj) {
-    var copy = {};
-    for (var key in obj) {
-        copy[key] = obj[key];
-    }
-    return copy;
-};
-
-exports.copyArray = function(array){
-    var copy = [];
-    for (var i=0, l=array.length; i<l; i++) {
-        if (array[i] && typeof array[i] == "object")
-            copy[i] = this.copyObject( array[i] );
-        else 
-            copy[i] = array[i];
-    }
-    return copy;
-};
-
-exports.deepCopy = function (obj) {
-    if (typeof obj != "object") {
-        return obj;
-    }
-    
-    var copy = obj.constructor();
-    for (var key in obj) {
-        if (typeof obj[key] == "object") {
-            copy[key] = this.deepCopy(obj[key]);
-        } else {
-            copy[key] = obj[key];
-        }
-    }
-    return copy;
-};
-
-exports.arrayToMap = function(arr) {
-    var map = {};
-    for (var i=0; i<arr.length; i++) {
-        map[arr[i]] = 1;
-    }
-    return map;
-
-};
-
-/**
- * splice out of 'array' anything that === 'value'
- */
-exports.arrayRemove = function(array, value) {
-  for (var i = 0; i <= array.length; i++) {
-    if (value === array[i]) {
-      array.splice(i, 1);
-    }
-  }
-};
-
-exports.escapeRegExp = function(str) {
-    return str.replace(/([.*+?^${}()|[\]\/\\])/g, '\\$1');
-};
-
-exports.deferredCall = function(fcn) {
-
-    var timer = null;
-    var callback = function() {
-        timer = null;
-        fcn();
-    };
-
-    var deferred = function(timeout) {
-        deferred.cancel();
-        timer = setTimeout(callback, timeout || 0);
-        return deferred;
-    };
-
-    deferred.schedule = deferred;
-
-    deferred.call = function() {
-        this.cancel();
-        fcn();
-        return deferred;
-    };
-
-    deferred.cancel = function() {
-        clearTimeout(timer);
-        timer = null;
-        return deferred;
-    };
-
-    return deferred;
-};
-
-});
-define('ace/mode/css/csslint', ['require', 'exports', 'module' ], function(require, exports, module) {
-/*!
-CSSLint
-Copyright (c) 2011 Nicole Sullivan and Nicholas C. Zakas. All rights reserved.
-
-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.
-
-*/
-/* Build time: 2-March-2012 02:47:11 */
-
-/*!
-Parser-Lib
-Copyright (c) 2009-2011 Nicholas C. Zakas. All rights reserved.
-
-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.
-
-*/
-/* Version v0.1.6, Build time: 2-March-2012 02:44:32 */
-var parserlib = {};
-(function(){
-
-
-/**
- * A generic base to inherit from for any object
- * that needs event handling.
- * @class EventTarget
- * @constructor
- */
-function EventTarget(){
-
-    /**
-     * The array of listeners for various events.
-     * @type Object
-     * @property _listeners
-     * @private
-     */
-    this._listeners = {};    
-}
-
-EventTarget.prototype = {
-
-    //restore constructor
-    constructor: EventTarget,
-
-    /**
-     * Adds a listener for a given event type.
-     * @param {String} type The type of event to add a listener for.
-     * @param {Function} listener The function to call when the event occurs.
-     * @return {void}
-     * @method addListener
-     */
-    addListener: function(type, listener){
-        if (!this._listeners[type]){
-            this._listeners[type] = [];
-        }
-
-        this._listeners[type].push(listener);
-    },
-    
-    /**
-     * Fires an event based on the passed-in object.
-     * @param {Object|String} event An object with at least a 'type' attribute
-     *      or a string indicating the event name.
-     * @return {void}
-     * @method fire
-     */    
-    fire: function(event){
-        if (typeof event == "string"){
-            event = { type: event };
-        }
-        if (typeof event.target != "undefined"){
-            event.target = this;
-        }
-        
-        if (typeof event.type == "undefined"){
-            throw new Error("Event object missing 'type' property.");
-        }
-        
-        if (this._listeners[event.type]){
-        
-            //create a copy of the array and use that so listeners can't chane
-            var listeners = this._listeners[event.type].concat();
-            for (var i=0, len=listeners.length; i < len; i++){
-                listeners[i].call(this, event);
-            }
-        }            
-    },
-
-    /**
-     * Removes a listener for a given event type.
-     * @param {String} type The type of event to remove a listener from.
-     * @param {Function} listener The function to remove from the event.
-     * @return {void}
-     * @method removeListener
-     */
-    removeListener: function(type, listener){
-        if (this._listeners[type]){
-            var listeners = this._listeners[type];
-            for (var i=0, len=listeners.length; i < len; i++){
-                if (listeners[i] === listener){
-                    listeners.splice(i, 1);
-                    break;
-                }
-            }
-            
-            
-        }            
-    }
-};
-/**
- * Convenient way to read through strings.
- * @namespace parserlib.util
- * @class StringReader
- * @constructor
- * @param {String} text The text to read.
- */
-function StringReader(text){
-
-    /**
-     * The input text with line endings normalized.
-     * @property _input
-     * @type String
-     * @private
-     */
-    this._input = text.replace(/\n\r?/g, "\n");
-
-
-    /**
-     * The row for the character to be read next.
-     * @property _line
-     * @type int
-     * @private
-     */
-    this._line = 1;
-
-
-    /**
-     * The column for the character to be read next.
-     * @property _col
-     * @type int
-     * @private
-     */
-    this._col = 1;
-
-    /**
-     * The index of the character in the input to be read next.
-     * @property _cursor
-     * @type int
-     * @private
-     */
-    this._cursor = 0;
-}
-
-StringReader.prototype = {
-
-    //restore constructor
-    constructor: StringReader,
-
-    //-------------------------------------------------------------------------
-    // Position info
-    //-------------------------------------------------------------------------
-
-    /**
-     * Returns the column of the character to be read next.
-     * @return {int} The column of the character to be read next.
-     * @method getCol
-     */
-    getCol: function(){
-        return this._col;
-    },
-
-    /**
-     * Returns the row of the character to be read next.
-     * @return {int} The row of the character to be read next.
-     * @method getLine
-     */
-    getLine: function(){
-        return this._line ;
-    },
-
-    /**
-     * Determines if you're at the end of the input.
-     * @return {Boolean} True if there's no more input, false otherwise.
-     * @method eof
-     */
-    eof: function(){
-        return (this._cursor == this._input.length);
-    },
-
-    //-------------------------------------------------------------------------
-    // Basic reading
-    //-------------------------------------------------------------------------
-
-    /**
-     * Reads the next character without advancing the cursor.
-     * @param {int} count How many characters to look ahead (default is 1).
-     * @return {String} The next character or null if there is no next character.
-     * @method peek
-     */
-    peek: function(count){
-        var c = null;
-        count = (typeof count == "undefined" ? 1 : count);
-
-        //if we're not at the end of the input...
-        if (this._cursor < this._input.length){
-
-            //get character and increment cursor and column
-            c = this._input.charAt(this._cursor + count - 1);
-        }
-
-        return c;
-    },
-
-    /**
-     * Reads the next character from the input and adjusts the row and column
-     * accordingly.
-     * @return {String} The next character or null if there is no next character.
-     * @method read
-     */
-    read: function(){
-        var c = null;
-
-        //if we're not at the end of the input...
-        if (this._cursor < this._input.length){
-
-            //if the last character was a newline, increment row count
-            //and reset column count
-            if (this._input.charAt(this._cursor) == "\n"){
-                this._line++;
-                this._col=1;
-            } else {
-                this._col++;
-            }
-
-            //get character and increment cursor and column
-            c = this._input.charAt(this._cursor++);
-        }
-
-        return c;
-    },
-
-    //-------------------------------------------------------------------------
-    // Misc
-    //-------------------------------------------------------------------------
-
-    /**
-     * Saves the current location so it can be returned to later.
-     * @method mark
-     * @return {void}
-     */
-    mark: function(){
-        this._bookmark = {
-            cursor: this._cursor,
-            line:   this._line,
-            col:    this._col
-        };
-    },
-
-    reset: function(){
-        if (this._bookmark){
-            this._cursor = this._bookmark.cursor;
-            this._line = this._bookmark.line;
-            this._col = this._bookmark.col;
-            delete this._bookmark;
-        }
-    },
-
-    //-------------------------------------------------------------------------
-    // Advanced reading
-    //-------------------------------------------------------------------------
-
-    /**
-     * Reads up to and including the given string. Throws an error if that
-     * string is not found.
-     * @param {String} pattern The string to read.
-     * @return {String} The string when it is found.
-     * @throws Error when the string pattern is not found.
-     * @method readTo
-     */
-    readTo: function(pattern){
-
-        var buffer = "",
-            c;
-
-        /*
-         * First, buffer must be the same length as the pattern.
-         * Then, buffer must end with the pattern or else reach the
-         * end of the input.
-         */
-        while (buffer.length < pattern.length || buffer.lastIndexOf(pattern) != buffer.length - pattern.length){
-            c = this.read();
-            if (c){
-                buffer += c;
-            } else {
-                throw new Error("Expected \"" + pattern + "\" at line " + this._line  + ", col " + this._col + ".");
-            }
-        }
-
-        return buffer;
-
-    },
-
-    /**
-     * Reads characters while each character causes the given
-     * filter function to return true. The function is passed
-     * in each character and either returns true to continue
-     * reading or false to stop.
-     * @param {Function} filter The function to read on each character.
-     * @return {String} The string made up of all characters that passed the
-     *      filter check.
-     * @method readWhile
-     */
-    readWhile: function(filter){
-
-        var buffer = "",
-            c = this.read();
-
-        while(c !== null && filter(c)){
-            buffer += c;
-            c = this.read();
-        }
-
-        return buffer;
-
-    },
-
-    /**
-     * Reads characters that match either text or a regular expression and
-     * returns those characters. If a match is found, the row and column
-     * are adjusted; if no match is found, the reader's state is unchanged.
-     * reading or false to stop.
-     * @param {String|RegExp} matchter If a string, then the literal string
-     *      value is searched for. If a regular expression, then any string
-     *      matching the pattern is search for.
-     * @return {String} The string made up of all characters that matched or
-     *      null if there was no match.
-     * @method readMatch
-     */
-    readMatch: function(matcher){
-
-        var source = this._input.substring(this._cursor),
-            value = null;
-
-        //if it's a string, just do a straight match
-        if (typeof matcher == "string"){
-            if (source.indexOf(matcher) === 0){
-                value = this.readCount(matcher.length);
-            }
-        } else if (matcher instanceof RegExp){
-            if (matcher.test(source)){
-                value = this.readCount(RegExp.lastMatch.length);
-            }
-        }
-
-        return value;
-    },
-
-
-    /**
-     * Reads a given number of characters. If the end of the input is reached,
-     * it reads only the remaining characters and does not throw an error.
-     * @param {int} count The number of characters to read.
-     * @return {String} The string made up the read characters.
-     * @method readCount
-     */
-    readCount: function(count){
-        var buffer = "";
-
-        while(count--){
-            buffer += this.read();
-        }
-
-        return buffer;
-    }
-
-};
-/**
- * Type to use when a syntax error occurs.
- * @class SyntaxError
- * @namespace parserlib.util
- * @constructor
- * @param {String} message The error message.
- * @param {int} line The line at which the error occurred.
- * @param {int} col The column at which the error occurred.
- */
-function SyntaxError(message, line, col){
-
-    /**
-     * The column at which the error occurred.
-     * @type int
-     * @property col
-     */
-    this.col = col;
-
-    /**
-     * The line at which the error occurred.
-     * @type int
-     * @property line
-     */
-    this.line = line;
-
-    /**
-     * The text representation of the unit.
-     * @type String
-     * @property text
-     */
-    this.message = message;
-
-}
-
-//inherit from Error
-SyntaxError.prototype = new Error();
-/**
- * Base type to represent a single syntactic unit.
- * @class SyntaxUnit
- * @namespace parserlib.util
- * @constructor
- * @param {String} text The text of the unit.
- * @param {int} line The line of text on which the unit resides.
- * @param {int} col The column of text on which the unit resides.
- */
-function SyntaxUnit(text, line, col, type){
-
-
-    /**
-     * The column of text on which the unit resides.
-     * @type int
-     * @property col
-     */
-    this.col = col;
-
-    /**
-     * The line of text on which the unit resides.
-     * @type int
-     * @property line
-     */
-    this.line = line;
-
-    /**
-     * The text representation of the unit.
-     * @type String
-     * @property text
-     */
-    this.text = text;
-
-    /**
-     * The type of syntax unit.
-     * @type int
-     * @property type
-     */
-    this.type = type;
-}
-
-/**
- * Create a new syntax unit based solely on the given token.
- * Convenience method for creating a new syntax unit when
- * it represents a single token instead of multiple.
- * @param {Object} token The token object to represent.
- * @return {parserlib.util.SyntaxUnit} The object representing the token.
- * @static
- * @method fromToken
- */
-SyntaxUnit.fromToken = function(token){
-    return new SyntaxUnit(token.value, token.startLine, token.startCol);
-};
-
-SyntaxUnit.prototype = {
-
-    //restore constructor
-    constructor: SyntaxUnit,
-    
-    /**
-     * Returns the text representation of the unit.
-     * @return {String} The text representation of the unit.
-     * @method valueOf
-     */
-    valueOf: function(){
-        return this.toString();
-    },
-    
-    /**
-     * Returns the text representation of the unit.
-     * @return {String} The text representation of the unit.
-     * @method toString
-     */
-    toString: function(){
-        return this.text;
-    }
-
-};
-/*global StringReader, SyntaxError*/
-
-/**
- * Generic TokenStream providing base functionality.
- * @class TokenStreamBase
- * @namespace parserlib.util
- * @constructor
- * @param {String|StringReader} input The text to tokenize or a reader from 
- *      which to read the input.
- */
-function TokenStreamBase(input, tokenData){
-
-    /**
-     * The string reader for easy access to the text.
-     * @type StringReader
-     * @property _reader
-     * @private
-     */
-    this._reader = input ? new StringReader(input.toString()) : null;
-    
-    /**
-     * Token object for the last consumed token.
-     * @type Token
-     * @property _token
-     * @private
-     */
-    this._token = null;    
-    
-    /**
-     * The array of token information.
-     * @type Array
-     * @property _tokenData
-     * @private
-     */
-    this._tokenData = tokenData;
-    
-    /**
-     * Lookahead token buffer.
-     * @type Array
-     * @property _lt
-     * @private
-     */
-    this._lt = [];
-    
-    /**
-     * Lookahead token buffer index.
-     * @type int
-     * @property _ltIndex
-     * @private
-     */
-    this._ltIndex = 0;
-    
-    this._ltIndexCache = [];
-}
-
-/**
- * Accepts an array of token information and outputs
- * an array of token data containing key-value mappings
- * and matching functions that the TokenStream needs.
- * @param {Array} tokens An array of token descriptors.
- * @return {Array} An array of processed token data.
- * @method createTokenData
- * @static
- */
-TokenStreamBase.createTokenData = function(tokens){
-
-    var nameMap     = [],
-        typeMap     = {},
-        tokenData     = tokens.concat([]),
-        i            = 0,
-        len            = tokenData.length+1;
-    
-    tokenData.UNKNOWN = -1;
-    tokenData.unshift({name:"EOF"});
-
-    for (; i < len; i++){
-        nameMap.push(tokenData[i].name);
-        tokenData[tokenData[i].name] = i;
-        if (tokenData[i].text){
-            typeMap[tokenData[i].text] = i;
-        }
-    }
-    
-    tokenData.name = function(tt){
-        return nameMap[tt];
-    };
-    
-    tokenData.type = function(c){
-        return typeMap[c];
-    };
-    
-    return tokenData;
-};
-
-TokenStreamBase.prototype = {
-
-    //restore constructor
-    constructor: TokenStreamBase,    
-    
-    //-------------------------------------------------------------------------
-    // Matching methods
-    //-------------------------------------------------------------------------
-    
-    /**
-     * Determines if the next token matches the given token type.
-     * If so, that token is consumed; if not, the token is placed
-     * back onto the token stream. You can pass in any number of
-     * token types and this will return true if any of the token
-     * types is found.
-     * @param {int|int[]} tokenTypes Either a single token type or an array of
-     *      token types that the next token might be. If an array is passed,
-     *      it's assumed that the token can be any of these.
-     * @param {variant} channel (Optional) The channel to read from. If not
-     *      provided, reads from the default (unnamed) channel.
-     * @return {Boolean} True if the token type matches, false if not.
-     * @method match
-     */
-    match: function(tokenTypes, channel){
-    
-        //always convert to an array, makes things easier
-        if (!(tokenTypes instanceof Array)){
-            tokenTypes = [tokenTypes];
-        }
-                
-        var tt  = this.get(channel),
-            i   = 0,
-            len = tokenTypes.length;
-            
-        while(i < len){
-            if (tt == tokenTypes[i++]){
-                return true;
-            }
-        }
-        
-        //no match found, put the token back
-        this.unget();
-        return false;
-    },    
-    
-    /**
-     * Determines if the next token matches the given token type.
-     * If so, that token is consumed; if not, an error is thrown.
-     * @param {int|int[]} tokenTypes Either a single token type or an array of
-     *      token types that the next token should be. If an array is passed,
-     *      it's assumed that the token must be one of these.
-     * @param {variant} channel (Optional) The channel to read from. If not
-     *      provided, reads from the default (unnamed) channel.
-     * @return {void}
-     * @method mustMatch
-     */    
-    mustMatch: function(tokenTypes, channel){
-
-        var token;
-
-        //always convert to an array, makes things easier
-        if (!(tokenTypes instanceof Array)){
-            tokenTypes = [tokenTypes];
-        }
-
-        if (!this.match.apply(this, arguments)){    
-            token = this.LT(1);
-            throw new SyntaxError("Expected " + this._tokenData[tokenTypes[0]].name + 
-                " at line " + token.startLine + ", col " + token.startCol + ".", token.startLine, token.startCol);
-        }
-    },
-    
-    //-------------------------------------------------------------------------
-    // Consuming methods
-    //-------------------------------------------------------------------------
-    
-    /**
-     * Keeps reading from the token stream until either one of the specified
-     * token types is found or until the end of the input is reached.
-     * @param {int|int[]} tokenTypes Either a single token type or an array of
-     *      token types that the next token should be. If an array is passed,
-     *      it's assumed that the token must be one of these.
-     * @param {variant} channel (Optional) The channel to read from. If not
-     *      provided, reads from the default (unnamed) channel.
-     * @return {void}
-     * @method advance
-     */
-    advance: function(tokenTypes, channel){
-        
-        while(this.LA(0) !== 0 && !this.match(tokenTypes, channel)){
-            this.get();
-        }
-
-        return this.LA(0);    
-    },
-    
-    /**
-     * Consumes the next token from the token stream. 
-     * @return {int} The token type of the token that was just consumed.
-     * @method get
-     */      
-    get: function(channel){
-    
-        var tokenInfo   = this._tokenData,
-            reader      = this._reader,
-            value,
-            i           =0,
-            len         = tokenInfo.length,
-            found       = false,
-            token,
-            info;
-            
-        //check the lookahead buffer first
-        if (this._lt.length && this._ltIndex >= 0 && this._ltIndex < this._lt.length){  
-                           
-            i++;
-            this._token = this._lt[this._ltIndex++];
-            info = tokenInfo[this._token.type];
-            
-            //obey channels logic
-            while((info.channel !== undefined && channel !== info.channel) &&
-                    this._ltIndex < this._lt.length){
-                this._token = this._lt[this._ltIndex++];
-                info = tokenInfo[this._token.type];
-                i++;
-            }
-            
-            //here be dragons
-            if ((info.channel === undefined || channel === info.channel) &&
-                    this._ltIndex <= this._lt.length){
-                this._ltIndexCache.push(i);
-                return this._token.type;
-            }
-        }
-        
-        //call token retriever method
-        token = this._getToken();
-
-        //if it should be hidden, don't save a token
-        if (token.type > -1 && !tokenInfo[token.type].hide){
-                     
-            //apply token channel
-            token.channel = tokenInfo[token.type].channel;
-         
-            //save for later
-            this._token = token;
-            this._lt.push(token);
-
-            //save space that will be moved (must be done before array is truncated)
-            this._ltIndexCache.push(this._lt.length - this._ltIndex + i);  
-        
-            //keep the buffer under 5 items
-            if (this._lt.length > 5){
-                this._lt.shift();                
-            }
-            
-            //also keep the shift buffer under 5 items
-            if (this._ltIndexCache.length > 5){
-                this._ltIndexCache.shift();
-            }
-                
-            //update lookahead index
-            this._ltIndex = this._lt.length;
-        }
-            
-        /*
-         * Skip to the next token if:
-         * 1. The token type is marked as hidden.
-         * 2. The token type has a channel specified and it isn't the current channel.
-         */
-        info = tokenInfo[token.type];
-        if (info && 
-                (info.hide || 
-                (info.channel !== undefined && channel !== info.channel))){
-            return this.get(channel);
-        } else {
-            //return just the type
-            return token.type;
-        }
-    },
-    
-    /**
-     * Looks ahead a certain number of tokens and returns the token type at
-     * that position. This will throw an error if you lookahead past the
-     * end of input, past the size of the lookahead buffer, or back past
-     * the first token in the lookahead buffer.
-     * @param {int} The index of the token type to retrieve. 0 for the
-     *      current token, 1 for the next, -1 for the previous, etc.
-     * @return {int} The token type of the token in the given position.
-     * @method LA
-     */
-    LA: function(index){
-        var total = index,
-            tt;
-        if (index > 0){
-            //TODO: Store 5 somewhere
-            if (index > 5){
-                throw new Error("Too much lookahead.");
-            }
-        
-            //get all those tokens
-            while(total){
-                tt = this.get();   
-                total--;                            
-            }
-            
-            //unget all those tokens
-            while(total < index){
-                this.unget();
-                total++;
-            }
-        } else if (index < 0){
-        
-            if(this._lt[this._ltIndex+index]){
-                tt = this._lt[this._ltIndex+index].type;
-            } else {
-                throw new Error("Too much lookbehind.");
-            }
-        
-        } else {
-            tt = this._token.type;
-        }
-        
-        return tt;
-    
-    },
-    
-    /**
-     * Looks ahead a certain number of tokens and returns the token at
-     * that position. This will throw an error if you lookahead past the
-     * end of input, past the size of the lookahead buffer, or back past
-     * the first token in the lookahead buffer.
-     * @param {int} The index of the token type to retrieve. 0 for the
-     *      current token, 1 for the next, -1 for the previous, etc.
-     * @return {Object} The token of the token in the given position.
-     * @method LA
-     */    
-    LT: function(index){
-    
-        //lookahead first to prime the token buffer
-        this.LA(index);
-        
-        //now find the token, subtract one because _ltIndex is already at the next index
-        return this._lt[this._ltIndex+index-1];    
-    },
-    
-    /**
-     * Returns the token type for the next token in the stream without 
-     * consuming it.
-     * @return {int} The token type of the next token in the stream.
-     * @method peek
-     */
-    peek: function(){
-        return this.LA(1);
-    },
-    
-    /**
-     * Returns the actual token object for the last consumed token.
-     * @return {Token} The token object for the last consumed token.
-     * @method token
-     */
-    token: function(){
-        return this._token;
-    },
-    
-    /**
-     * Returns the name of the token for the given token type.
-     * @param {int} tokenType The type of token to get the name of.
-     * @return {String} The name of the token or "UNKNOWN_TOKEN" for any
-     *      invalid token type.
-     * @method tokenName
-     */
-    tokenName: function(tokenType){
-        if (tokenType < 0 || tokenType > this._tokenData.length){
-            return "UNKNOWN_TOKEN";
-        } else {
-            return this._tokenData[tokenType].name;
-        }
-    },
-    
-    /**
-     * Returns the token type value for the given token name.
-     * @param {String} tokenName The name of the token whose value should be returned.
-     * @return {int} The token type value for the given token name or -1
-     *      for an unknown token.
-     * @method tokenName
-     */    
-    tokenType: function(tokenName){
-        return this._tokenData[tokenName] || -1;
-    },
-    
-    /**
-     * Returns the last consumed token to the token stream.
-     * @method unget
-     */      
-    unget: function(){
-        //if (this._ltIndex > -1){
-        if (this._ltIndexCache.length){
-            this._ltIndex -= this._ltIndexCache.pop();//--;
-            this._token = this._lt[this._ltIndex - 1];
-        } else {
-            throw new Error("Too much lookahead.");
-        }
-    }
-
-};
-
-
-
-
-parserlib.util = {
-StringReader: StringReader,
-SyntaxError : SyntaxError,
-SyntaxUnit  : SyntaxUnit,
-EventTarget : EventTarget,
-TokenStreamBase : TokenStreamBase
-};
-})();
-
-
-/* 
-Parser-Lib
-Copyright (c) 2009-2011 Nicholas C. Zakas. All rights reserved.
-
-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.
-
-*/
-/* Version v0.1.6, Build time: 2-March-2012 02:44:32 */
-(function(){
-var EventTarget = parserlib.util.EventTarget,
-TokenStreamBase = parserlib.util.TokenStreamBase,
-StringReader = parserlib.util.StringReader,
-SyntaxError = parserlib.util.SyntaxError,
-SyntaxUnit  = parserlib.util.SyntaxUnit;
-
-
-var Colors = {
-    aliceblue       :"#f0f8ff",
-    antiquewhite    :"#faebd7",
-    aqua            :"#00ffff",
-    aquamarine      :"#7fffd4",
-    azure           :"#f0ffff",
-    beige           :"#f5f5dc",
-    bisque          :"#ffe4c4",
-    black           :"#000000",
-    blanchedalmond  :"#ffebcd",
-    blue            :"#0000ff",
-    blueviolet      :"#8a2be2",
-    brown           :"#a52a2a",
-    burlywood       :"#deb887",
-    cadetblue       :"#5f9ea0",
-    chartreuse      :"#7fff00",
-    chocolate       :"#d2691e",
-    coral           :"#ff7f50",
-    cornflowerblue  :"#6495ed",
-    cornsilk        :"#fff8dc",
-    crimson         :"#dc143c",
-    cyan            :"#00ffff",
-    darkblue        :"#00008b",
-    darkcyan        :"#008b8b",
-    darkgoldenrod   :"#b8860b",
-    darkgray        :"#a9a9a9",
-    darkgreen       :"#006400",
-    darkkhaki       :"#bdb76b",
-    darkmagenta     :"#8b008b",
-    darkolivegreen  :"#556b2f",
-    darkorange      :"#ff8c00",
-    darkorchid      :"#9932cc",
-    darkred         :"#8b0000",
-    darksalmon      :"#e9967a",
-    darkseagreen    :"#8fbc8f",
-    darkslateblue   :"#483d8b",
-    darkslategray   :"#2f4f4f",
-    darkturquoise   :"#00ced1",
-    darkviolet      :"#9400d3",
-    deeppink        :"#ff1493",
-    deepskyblue     :"#00bfff",
-    dimgray         :"#696969",
-    dodgerblue      :"#1e90ff",
-    firebrick       :"#b22222",
-    floralwhite     :"#fffaf0",
-    forestgreen     :"#228b22",
-    fuchsia         :"#ff00ff",
-    gainsboro       :"#dcdcdc",
-    ghostwhite      :"#f8f8ff",
-    gold            :"#ffd700",
-    goldenrod       :"#daa520",
-    gray            :"#808080",
-    green           :"#008000",
-    greenyellow     :"#adff2f",
-    honeydew        :"#f0fff0",
-    hotpink         :"#ff69b4",
-    indianred       :"#cd5c5c",
-    indigo          :"#4b0082",
-    ivory           :"#fffff0",
-    khaki           :"#f0e68c",
-    lavender        :"#e6e6fa",
-    lavenderblush   :"#fff0f5",
-    lawngreen       :"#7cfc00",
-    lemonchiffon    :"#fffacd",
-    lightblue       :"#add8e6",
-    lightcoral      :"#f08080",
-    lightcyan       :"#e0ffff",
-    lightgoldenrodyellow  :"#fafad2",
-    lightgray       :"#d3d3d3",
-    lightgreen      :"#90ee90",
-    lightpink       :"#ffb6c1",
-    lightsalmon     :"#ffa07a",
-    lightseagreen   :"#20b2aa",
-    lightskyblue    :"#87cefa",
-    lightslategray  :"#778899",
-    lightsteelblue  :"#b0c4de",
-    lightyellow     :"#ffffe0",
-    lime            :"#00ff00",
-    limegreen       :"#32cd32",
-    linen           :"#faf0e6",
-    magenta         :"#ff00ff",
-    maroon          :"#800000",
-    mediumaquamarine:"#66cdaa",
-    mediumblue      :"#0000cd",
-    mediumorchid    :"#ba55d3",
-    mediumpurple    :"#9370d8",
-    mediumseagreen  :"#3cb371",
-    mediumslateblue :"#7b68ee",
-    mediumspringgreen   :"#00fa9a",
-    mediumturquoise :"#48d1cc",
-    mediumvioletred :"#c71585",
-    midnightblue    :"#191970",
-    mintcream       :"#f5fffa",
-    mistyrose       :"#ffe4e1",
-    moccasin        :"#ffe4b5",
-    navajowhite     :"#ffdead",
-    navy            :"#000080",
-    oldlace         :"#fdf5e6",
-    olive           :"#808000",
-    olivedrab       :"#6b8e23",
-    orange          :"#ffa500",
-    orangered       :"#ff4500",
-    orchid          :"#da70d6",
-    palegoldenrod   :"#eee8aa",
-    palegreen       :"#98fb98",
-    paleturquoise   :"#afeeee",
-    palevioletred   :"#d87093",
-    papayawhip      :"#ffefd5",
-    peachpuff       :"#ffdab9",
-    peru            :"#cd853f",
-    pink            :"#ffc0cb",
-    plum            :"#dda0dd",
-    powderblue      :"#b0e0e6",
-    purple          :"#800080",
-    red             :"#ff0000",
-    rosybrown       :"#bc8f8f",
-    royalblue       :"#4169e1",
-    saddlebrown     :"#8b4513",
-    salmon          :"#fa8072",
-    sandybrown      :"#f4a460",
-    seagreen        :"#2e8b57",
-    seashell        :"#fff5ee",
-    sienna          :"#a0522d",
-    silver          :"#c0c0c0",
-    skyblue         :"#87ceeb",
-    slateblue       :"#6a5acd",
-    slategray       :"#708090",
-    snow            :"#fffafa",
-    springgreen     :"#00ff7f",
-    steelblue       :"#4682b4",
-    tan             :"#d2b48c",
-    teal            :"#008080",
-    thistle         :"#d8bfd8",
-    tomato          :"#ff6347",
-    turquoise       :"#40e0d0",
-    violet          :"#ee82ee",
-    wheat           :"#f5deb3",
-    white           :"#ffffff",
-    whitesmoke      :"#f5f5f5",
-    yellow          :"#ffff00",
-    yellowgreen     :"#9acd32"
-};
-/*global SyntaxUnit, Parser*/
-/**
- * Represents a selector combinator (whitespace, +, >).
- * @namespace parserlib.css
- * @class Combinator
- * @extends parserlib.util.SyntaxUnit
- * @constructor
- * @param {String} text The text representation of the unit. 
- * @param {int} line The line of text on which the unit resides.
- * @param {int} col The column of text on which the unit resides.
- */
-function Combinator(text, line, col){
-    
-    SyntaxUnit.call(this, text, line, col, Parser.COMBINATOR_TYPE);
-
-    /**
-     * The type of modifier.
-     * @type String
-     * @property type
-     */
-    this.type = "unknown";
-    
-    //pretty simple
-    if (/^\s+$/.test(text)){
-        this.type = "descendant";
-    } else if (text == ">"){
-        this.type = "child";
-    } else if (text == "+"){
-        this.type = "adjacent-sibling";
-    } else if (text == "~"){
-        this.type = "sibling";
-    }
-
-}
-
-Combinator.prototype = new SyntaxUnit();
-Combinator.prototype.constructor = Combinator;
-
-
-/*global SyntaxUnit, Parser*/
-/**
- * Represents a media feature, such as max-width:500.
- * @namespace parserlib.css
- * @class MediaFeature
- * @extends parserlib.util.SyntaxUnit
- * @constructor
- * @param {SyntaxUnit} name The name of the feature.
- * @param {SyntaxUnit} value The value of the feature or null if none.
- */
-function MediaFeature(name, value){
-    
-    SyntaxUnit.call(this, "(" + name + (value !== null ? ":" + value : "") + ")", name.startLine, name.startCol, Parser.MEDIA_FEATURE_TYPE);
-
-    /**
-     * The name of the media feature
-     * @type String
-     * @property name
-     */
-    this.name = name;
-
-    /**
-     * The value for the feature or null if there is none.
-     * @type SyntaxUnit
-     * @property value
-     */
-    this.value = value;
-}
-
-MediaFeature.prototype = new SyntaxUnit();
-MediaFeature.prototype.constructor = MediaFeature;
-
-
-/*global SyntaxUnit, Parser*/
-/**
- * Represents an individual media query.
- * @namespace parserlib.css
- * @class MediaQuery
- * @extends parserlib.util.SyntaxUnit
- * @constructor
- * @param {String} modifier The modifier "not" or "only" (or null).
- * @param {String} mediaType The type of media (i.e., "print").
- * @param {Array} parts Array of selectors parts making up this selector.
- * @param {int} line The line of text on which the unit resides.
- * @param {int} col The column of text on which the unit resides.
- */
-function MediaQuery(modifier, mediaType, features, line, col){
-    
-    SyntaxUnit.call(this, (modifier ? modifier + " ": "") + (mediaType ? mediaType + " " : "") + features.join(" and "), line, col, Parser.MEDIA_QUERY_TYPE);
-
-    /**
-     * The media modifier ("not" or "only")
-     * @type String
-     * @property modifier
-     */
-    this.modifier = modifier;
-
-    /**
-     * The mediaType (i.e., "print")
-     * @type String
-     * @property mediaType
-     */
-    this.mediaType = mediaType;    
-    
-    /**
-     * The parts that make up the selector.
-     * @type Array
-     * @property features
-     */
-    this.features = features;
-
-}
-
-MediaQuery.prototype = new SyntaxUnit();
-MediaQuery.prototype.constructor = MediaQuery;
-
-
-/*global Tokens, TokenStream, SyntaxError, Properties, Validation, ValidationError, SyntaxUnit,
-    PropertyValue, PropertyValuePart, SelectorPart, SelectorSubPart, Selector,
-    PropertyName, Combinator, MediaFeature, MediaQuery, EventTarget */
-
-/**
- * A CSS3 parser.
- * @namespace parserlib.css
- * @class Parser
- * @constructor
- * @param {Object} options (Optional) Various options for the parser:
- *      starHack (true|false) to allow IE6 star hack as valid,
- *      underscoreHack (true|false) to interpret leading underscores
- *      as IE6-7 targeting for known properties, ieFilters (true|false)
- *      to indicate that IE < 8 filters should be accepted and not throw
- *      syntax errors.
- */
-function Parser(options){
-
-    //inherit event functionality
-    EventTarget.call(this);
-
-
-    this.options = options || {};
-
-    this._tokenStream = null;
-}
-
-//Static constants
-Parser.DEFAULT_TYPE = 0;
-Parser.COMBINATOR_TYPE = 1;
-Parser.MEDIA_FEATURE_TYPE = 2;
-Parser.MEDIA_QUERY_TYPE = 3;
-Parser.PROPERTY_NAME_TYPE = 4;
-Parser.PROPERTY_VALUE_TYPE = 5;
-Parser.PROPERTY_VALUE_PART_TYPE = 6;
-Parser.SELECTOR_TYPE = 7;
-Parser.SELECTOR_PART_TYPE = 8;
-Parser.SELECTOR_SUB_PART_TYPE = 9;
-
-Parser.prototype = function(){
-
-    var proto = new EventTarget(),  //new prototype
-        prop,
-        additions =  {
-        
-            //restore constructor
-            constructor: Parser,
-                        
-            //instance constants - yuck
-            DEFAULT_TYPE : 0,
-            COMBINATOR_TYPE : 1,
-            MEDIA_FEATURE_TYPE : 2,
-            MEDIA_QUERY_TYPE : 3,
-            PROPERTY_NAME_TYPE : 4,
-            PROPERTY_VALUE_TYPE : 5,
-            PROPERTY_VALUE_PART_TYPE : 6,
-            SELECTOR_TYPE : 7,
-            SELECTOR_PART_TYPE : 8,
-            SELECTOR_SUB_PART_TYPE : 9,            
-        
-            //-----------------------------------------------------------------
-            // Grammar
-            //-----------------------------------------------------------------
-        
-            _stylesheet: function(){
-            
-                /*
-                 * stylesheet
-                 *  : [ CHARSET_SYM S* STRING S* ';' ]?
-                 *    [S|CDO|CDC]* [ import [S|CDO|CDC]* ]*
-                 *    [ namespace [S|CDO|CDC]* ]*
-                 *    [ [ ruleset | media | page | font_face | keyframes ] [S|CDO|CDC]* ]*
-                 *  ;
-                 */ 
-               
-                var tokenStream = this._tokenStream,
-                    charset     = null,
-                    count,
-                    token,
-                    tt;
-                    
-                this.fire("startstylesheet");
-            
-                //try to read character set
-                this._charset();
-                
-                this._skipCruft();
-
-                //try to read imports - may be more than one
-                while (tokenStream.peek() == Tokens.IMPORT_SYM){
-                    this._import();
-                    this._skipCruft();
-                }
-                
-                //try to read namespaces - may be more than one
-                while (tokenStream.peek() == Tokens.NAMESPACE_SYM){
-                    this._namespace();
-                    this._skipCruft();
-                }
-                
-                //get the next token
-                tt = tokenStream.peek();
-                
-                //try to read the rest
-                while(tt > Tokens.EOF){
-                
-                    try {
-                
-                        switch(tt){
-                            case Tokens.MEDIA_SYM:
-                                this._media();
-                                this._skipCruft();
-                                break;
-                            case Tokens.PAGE_SYM:
-                                this._page(); 
-                                this._skipCruft();
-                                break;                   
-                            case Tokens.FONT_FACE_SYM:
-                                this._font_face(); 
-                                this._skipCruft();
-                                break;  
-                            case Tokens.KEYFRAMES_SYM:
-                                this._keyframes(); 
-                                this._skipCruft();
-                                break;                                
-                            case Tokens.UNKNOWN_SYM:  //unknown @ rule
-                                tokenStream.get();
-                                if (!this.options.strict){
-                                
-                                    //fire error event
-                                    this.fire({
-                                        type:       "error",
-                                        error:      null,
-                                        message:    "Unknown @ rule: " + tokenStream.LT(0).value + ".",
-                                        line:       tokenStream.LT(0).startLine,
-                                        col:        tokenStream.LT(0).startCol
-                                    });                          
-                                    
-                                    //skip braces
-                                    count=0;
-                                    while (tokenStream.advance([Tokens.LBRACE, Tokens.RBRACE]) == Tokens.LBRACE){
-                                        count++;    //keep track of nesting depth
-                                    }
-                                    
-                                    while(count){
-                                        tokenStream.advance([Tokens.RBRACE]);
-                                        count--;
-                                    }
-                                    
-                                } else {
-                                    //not a syntax error, rethrow it
-                                    throw new SyntaxError("Unknown @ rule.", tokenStream.LT(0).startLine, tokenStream.LT(0).startCol);
-                                }                                
-                                break;
-                            case Tokens.S:
-                                this._readWhitespace();
-                                break;
-                            default:                            
-                                if(!this._ruleset()){
-                                
-                                    //error handling for known issues
-                                    switch(tt){
-                                        case Tokens.CHARSET_SYM:
-                                            token = tokenStream.LT(1);
-                                            this._charset(false);
-                                            throw new SyntaxError("@charset not allowed here.", token.startLine, token.startCol);
-                                        case Tokens.IMPORT_SYM:
-                                            token = tokenStream.LT(1);
-                                            this._import(false);
-                                            throw new SyntaxError("@import not allowed here.", token.startLine, token.startCol);
-                                        case Tokens.NAMESPACE_SYM:
-                                            token = tokenStream.LT(1);
-                                            this._namespace(false);
-                                            throw new SyntaxError("@namespace not allowed here.", token.startLine, token.startCol);
-                                        default:
-                                            tokenStream.get();  //get the last token
-                                            this._unexpectedToken(tokenStream.token());
-                                    }
-                                
-                                }
-                        }
-                    } catch(ex) {
-                        if (ex instanceof SyntaxError && !this.options.strict){
-                            this.fire({
-                                type:       "error",
-                                error:      ex,
-                                message:    ex.message,
-                                line:       ex.line,
-                                col:        ex.col
-                            });                     
-                        } else {
-                            throw ex;
-                        }
-                    }
-                    
-                    tt = tokenStream.peek();
-                }
-                
-                if (tt != Tokens.EOF){
-                    this._unexpectedToken(tokenStream.token());
-                }
-            
-                this.fire("endstylesheet");
-            },
-            
-            _charset: function(emit){
-                var tokenStream = this._tokenStream,
-                    charset,
-                    token,
-                    line,
-                    col;
-                    
-                if (tokenStream.match(Tokens.CHARSET_SYM)){
-                    line = tokenStream.token().startLine;
-                    col = tokenStream.token().startCol;
-                
-                    this._readWhitespace();
-                    tokenStream.mustMatch(Tokens.STRING);
-                    
-                    token = tokenStream.token();
-                    charset = token.value;
-                    
-                    this._readWhitespace();
-                    tokenStream.mustMatch(Tokens.SEMICOLON);
-                    
-                    if (emit !== false){
-                        this.fire({ 
-                            type:   "charset",
-                            charset:charset,
-                            line:   line,
-                            col:    col
-                        });
-                    }
-                }            
-            },
-            
-            _import: function(emit){
-                /*
-                 * import
-                 *   : IMPORT_SYM S*
-                 *    [STRING|URI] S* media_query_list? ';' S*
-                 */    
-            
-                var tokenStream = this._tokenStream,
-                    tt,
-                    uri,
-                    importToken,
-                    mediaList   = [];
-                
-                //read import symbol
-                tokenStream.mustMatch(Tokens.IMPORT_SYM);
-                importToken = tokenStream.token();
-                this._readWhitespace();
-                
-                tokenStream.mustMatch([Tokens.STRING, Tokens.URI]);
-                
-                //grab the URI value
-                uri = tokenStream.token().value.replace(/(?:url\()?["']([^"']+)["']\)?/, "$1");                
-
-                this._readWhitespace();
-                
-                mediaList = this._media_query_list();
-                
-                //must end with a semicolon
-                tokenStream.mustMatch(Tokens.SEMICOLON);
-                this._readWhitespace();
-                
-                if (emit !== false){
-                    this.fire({
-                        type:   "import",
-                        uri:    uri,
-                        media:  mediaList,
-                        line:   importToken.startLine,
-                        col:    importToken.startCol
-                    });
-                }
-        
-            },
-            
-            _namespace: function(emit){
-                /*
-                 * namespace
-                 *   : NAMESPACE_SYM S* [namespace_prefix S*]? [STRING|URI] S* ';' S*
-                 */    
-            
-                var tokenStream = this._tokenStream,
-                    line,
-                    col,
-                    prefix,
-                    uri;
-                
-                //read import symbol
-                tokenStream.mustMatch(Tokens.NAMESPACE_SYM);
-                line = tokenStream.token().startLine;
-                col = tokenStream.token().startCol;
-                this._readWhitespace();
-                
-                //it's a namespace prefix - no _namespace_prefix() method because it's just an IDENT
-                if (tokenStream.match(Tokens.IDENT)){
-                    prefix = tokenStream.token().value;
-                    this._readWhitespace();
-                }
-                
-                tokenStream.mustMatch([Tokens.STRING, Tokens.URI]);
-                /*if (!tokenStream.match(Tokens.STRING)){
-                    tokenStream.mustMatch(Tokens.URI);
-                }*/
-                
-                //grab the URI value
-                uri = tokenStream.token().value.replace(/(?:url\()?["']([^"']+)["']\)?/, "$1");                
-
-                this._readWhitespace();
-
-                //must end with a semicolon
-                tokenStream.mustMatch(Tokens.SEMICOLON);
-                this._readWhitespace();
-                
-                if (emit !== false){
-                    this.fire({
-                        type:   "namespace",
-                        prefix: prefix,
-                        uri:    uri,
-                        line:   line,
-                        col:    col
-                    });
-                }
-        
-            },            
-                       
-            _media: function(){
-                /*
-                 * media
-                 *   : MEDIA_SYM S* media_query_list S* '{' S* ruleset* '}' S*
-                 *   ;
-                 */
-                var tokenStream     = this._tokenStream,
-                    line,
-                    col,
-                    mediaList;//       = [];
-                
-                //look for @media
-                tokenStream.mustMatch(Tokens.MEDIA_SYM);
-                line = tokenStream.token().startLine;
-                col = tokenStream.token().startCol;
-                
-                this._readWhitespace();               
-
-                mediaList = this._media_query_list();
-
-                tokenStream.mustMatch(Tokens.LBRACE);
-                this._readWhitespace();
-                
-                this.fire({
-                    type:   "startmedia",
-                    media:  mediaList,
-                    line:   line,
-                    col:    col
-                });
-                
-                while(true) {
-                    if (tokenStream.peek() == Tokens.PAGE_SYM){
-                        this._page();
-                    } else if (!this._ruleset()){
-                        break;
-                    }                
-                }
-                
-                tokenStream.mustMatch(Tokens.RBRACE);
-                this._readWhitespace();
-        
-                this.fire({
-                    type:   "endmedia",
-                    media:  mediaList,
-                    line:   line,
-                    col:    col
-                });
-            },                           
-        
-
-            //CSS3 Media Queries
-            _media_query_list: function(){
-                /*
-                 * media_query_list
-                 *   : S* [media_query [ ',' S* media_query ]* ]?
-                 *   ;
-                 */
-                var tokenStream = this._tokenStream,
-                    mediaList   = [];
-                
-                
-                this._readWhitespace();
-                
-                if (tokenStream.peek() == Tokens.IDENT || tokenStream.peek() == Tokens.LPAREN){
-                    mediaList.push(this._media_query());
-                }
-                
-                while(tokenStream.match(Tokens.COMMA)){
-                    this._readWhitespace();
-                    mediaList.push(this._media_query());
-                }
-                
-                return mediaList;
-            },
-            
-            /*
-             * Note: "expression" in the grammar maps to the _media_expression
-             * method.
-             
-             */
-            _media_query: function(){
-                /*
-                 * media_query
-                 *   : [ONLY | NOT]? S* media_type S* [ AND S* expression ]*
-                 *   | expression [ AND S* expression ]*
-                 *   ;
-                 */
-                var tokenStream = this._tokenStream,
-                    type        = null,
-                    ident       = null,
-                    token       = null,
-                    expressions = [];
-                    
-                if (tokenStream.match(Tokens.IDENT)){
-                    ident = tokenStream.token().value.toLowerCase();
-                    
-                    //since there's no custom tokens for these, need to manually check
-                    if (ident != "only" && ident != "not"){
-                        tokenStream.unget();
-                        ident = null;
-                    } else {
-                        token = tokenStream.token();
-                    }
-                }
-                                
-                this._readWhitespace();
-                
-                if (tokenStream.peek() == Tokens.IDENT){
-                    type = this._media_type();
-                    if (token === null){
-                        token = tokenStream.token();
-                    }
-                } else if (tokenStream.peek() == Tokens.LPAREN){
-                    if (token === null){
-                        token = tokenStream.LT(1);
-                    }
-                    expressions.push(this._media_expression());
-                }                               
-                
-                if (type === null && expressions.length === 0){
-                    return null;
-                } else {                
-                    this._readWhitespace();
-                    while (tokenStream.match(Tokens.IDENT)){
-                        if (tokenStream.token().value.toLowerCase() != "and"){
-                            this._unexpectedToken(tokenStream.token());
-                        }
-                        
-                        this._readWhitespace();
-                        expressions.push(this._media_expression());
-                    }
-                }
-
-                return new MediaQuery(ident, type, expressions, token.startLine, token.startCol);
-            },
-
-            //CSS3 Media Queries
-            _media_type: function(){
-                /*
-                 * media_type
-                 *   : IDENT
-                 *   ;
-                 */
-                return this._media_feature();           
-            },
-
-            /**
-             * Note: in CSS3 Media Queries, this is called "expression".
-             * Renamed here to avoid conflict with CSS3 Selectors
-             * definition of "expression". Also note that "expr" in the
-             * grammar now maps to "expression" from CSS3 selectors.
-             * @method _media_expression
-             * @private
-             */
-            _media_expression: function(){
-                /*
-                 * expression
-                 *  : '(' S* media_feature S* [ ':' S* expr ]? ')' S*
-                 *  ;
-                 */
-                var tokenStream = this._tokenStream,
-                    feature     = null,
-                    token,
-                    expression  = null;
-                
-                tokenStream.mustMatch(Tokens.LPAREN);
-                
-                feature = this._media_feature();
-                this._readWhitespace();
-                
-                if (tokenStream.match(Tokens.COLON)){
-                    this._readWhitespace();
-                    token = tokenStream.LT(1);
-                    expression = this._expression();
-                }
-                
-                tokenStream.mustMatch(Tokens.RPAREN);
-                this._readWhitespace();
-
-                return new MediaFeature(feature, (expression ? new SyntaxUnit(expression, token.startLine, token.startCol) : null));            
-            },
-
-            //CSS3 Media Queries
-            _media_feature: function(){
-                /*
-                 * media_feature
-                 *   : IDENT
-                 *   ;
-                 */
-                var tokenStream = this._tokenStream;
-                    
-                tokenStream.mustMatch(Tokens.IDENT);
-                
-                return SyntaxUnit.fromToken(tokenStream.token());            
-            },
-            
-            //CSS3 Paged Media
-            _page: function(){
-                /*
-                 * page:
-                 *    PAGE_SYM S* IDENT? pseudo_page? S* 
-                 *    '{' S* [ declaration | margin ]? [ ';' S* [ declaration | margin ]? ]* '}' S*
-                 *    ;
-                 */            
-                var tokenStream = this._tokenStream,
-                    line,
-                    col,
-                    identifier  = null,
-                    pseudoPage  = null;
-                
-                //look for @page
-                tokenStream.mustMatch(Tokens.PAGE_SYM);
-                line = tokenStream.token().startLine;
-                col = tokenStream.token().startCol;
-                
-                this._readWhitespace();
-                
-                if (tokenStream.match(Tokens.IDENT)){
-                    identifier = tokenStream.token().value;
-
-                    //The value 'auto' may not be used as a page name and MUST be treated as a syntax error.
-                    if (identifier.toLowerCase() === "auto"){
-                        this._unexpectedToken(tokenStream.token());
-                    }
-                }                
-                
-                //see if there's a colon upcoming
-                if (tokenStream.peek() == Tokens.COLON){
-                    pseudoPage = this._pseudo_page();
-                }
-            
-                this._readWhitespace();
-                
-                this.fire({
-                    type:   "startpage",
-                    id:     identifier,
-                    pseudo: pseudoPage,
-                    line:   line,
-                    col:    col
-                });                   
-
-                this._readDeclarations(true, true);                
-                
-                this.fire({
-                    type:   "endpage",
-                    id:     identifier,
-                    pseudo: pseudoPage,
-                    line:   line,
-                    col:    col
-                });             
-            
-            },
-            
-            //CSS3 Paged Media
-            _margin: function(){
-                /*
-                 * margin :
-                 *    margin_sym S* '{' declaration [ ';' S* declaration? ]* '}' S*
-                 *    ;
-                 */
-                var tokenStream = this._tokenStream,
-                    line,
-                    col,
-                    marginSym   = this._margin_sym();
-
-                if (marginSym){
-                    line = tokenStream.token().startLine;
-                    col = tokenStream.token().startCol;
-                
-                    this.fire({
-                        type: "startpagemargin",
-                        margin: marginSym,
-                        line:   line,
-                        col:    col
-                    });    
-                    
-                    this._readDeclarations(true);
-
-                    this.fire({
-                        type: "endpagemargin",
-                        margin: marginSym,
-                        line:   line,
-                        col:    col
-                    });    
-                    return true;
-                } else {
-                    return false;
-                }
-            },
-
-            //CSS3 Paged Media
-            _margin_sym: function(){
-            
-                /*
-                 * margin_sym :
-                 *    TOPLEFTCORNER_SYM | 
-                 *    TOPLEFT_SYM | 
-                 *    TOPCENTER_SYM | 
-                 *    TOPRIGHT_SYM | 
-                 *    TOPRIGHTCORNER_SYM |
-                 *    BOTTOMLEFTCORNER_SYM | 
-                 *    BOTTOMLEFT_SYM | 
-                 *    BOTTOMCENTER_SYM | 
-                 *    BOTTOMRIGHT_SYM |
-                 *    BOTTOMRIGHTCORNER_SYM |
-                 *    LEFTTOP_SYM |
-                 *    LEFTMIDDLE_SYM |
-                 *    LEFTBOTTOM_SYM |
-                 *    RIGHTTOP_SYM |
-                 *    RIGHTMIDDLE_SYM |
-                 *    RIGHTBOTTOM_SYM 
-                 *    ;
-                 */
-            
-                var tokenStream = this._tokenStream;
-            
-                if(tokenStream.match([Tokens.TOPLEFTCORNER_SYM, Tokens.TOPLEFT_SYM,
-                        Tokens.TOPCENTER_SYM, Tokens.TOPRIGHT_SYM, Tokens.TOPRIGHTCORNER_SYM,
-                        Tokens.BOTTOMLEFTCORNER_SYM, Tokens.BOTTOMLEFT_SYM, 
-                        Tokens.BOTTOMCENTER_SYM, Tokens.BOTTOMRIGHT_SYM,
-                        Tokens.BOTTOMRIGHTCORNER_SYM, Tokens.LEFTTOP_SYM, 
-                        Tokens.LEFTMIDDLE_SYM, Tokens.LEFTBOTTOM_SYM, Tokens.RIGHTTOP_SYM,
-                        Tokens.RIGHTMIDDLE_SYM, Tokens.RIGHTBOTTOM_SYM]))
-                {
-                    return SyntaxUnit.fromToken(tokenStream.token());                
-                } else {
-                    return null;
-                }
-            
-            },
-            
-            _pseudo_page: function(){
-                /*
-                 * pseudo_page
-                 *   : ':' IDENT
-                 *   ;    
-                 */
-        
-                var tokenStream = this._tokenStream;
-                
-                tokenStream.mustMatch(Tokens.COLON);
-                tokenStream.mustMatch(Tokens.IDENT);
-                
-                //TODO: CSS3 Paged Media says only "left", "center", and "right" are allowed
-                
-                return tokenStream.token().value;
-            },
-            
-            _font_face: function(){
-                /*
-                 * font_face
-                 *   : FONT_FACE_SYM S* 
-                 *     '{' S* declaration [ ';' S* declaration ]* '}' S*
-                 *   ;
-                 */     
-                var tokenStream = this._tokenStream,
-                    line,
-                    col;
-                
-                //look for @page
-                tokenStream.mustMatch(Tokens.FONT_FACE_SYM);
-                line = tokenStream.token().startLine;
-                col = tokenStream.token().startCol;
-                
-                this._readWhitespace();
-
-                this.fire({
-                    type:   "startfontface",
-                    line:   line,
-                    col:    col
-                });                    
-                
-                this._readDeclarations(true);
-                
-                this.fire({
-                    type:   "endfontface",
-                    line:   line,
-                    col:    col
-                });              
-            },
-
-            _operator: function(){
-            
-                /*
-                 * operator
-                 *  : '/' S* | ',' S* | /( empty )/
-                 *  ;
-                 */    
-                 
-                var tokenStream = this._tokenStream,
-                    token       = null;
-                
-                if (tokenStream.match([Tokens.SLASH, Tokens.COMMA])){
-                    token =  tokenStream.token();
-                    this._readWhitespace();
-                } 
-                return token ? PropertyValuePart.fromToken(token) : null;
-                
-            },
-            
-            _combinator: function(){
-            
-                /*
-                 * combinator
-                 *  : PLUS S* | GREATER S* | TILDE S* | S+
-                 *  ;
-                 */    
-                 
-                var tokenStream = this._tokenStream,
-                    value       = null,
-                    token;
-                
-                if(tokenStream.match([Tokens.PLUS, Tokens.GREATER, Tokens.TILDE])){                
-                    token = tokenStream.token();
-                    value = new Combinator(token.value, token.startLine, token.startCol);
-                    this._readWhitespace();
-                }
-                
-                return value;
-            },
-            
-            _unary_operator: function(){
-            
-                /*
-                 * unary_operator
-                 *  : '-' | '+'
-                 *  ;
-                 */
-                 
-                var tokenStream = this._tokenStream;
-                
-                if (tokenStream.match([Tokens.MINUS, Tokens.PLUS])){
-                    return tokenStream.token().value;
-                } else {
-                    return null;
-                }         
-            },
-            
-            _property: function(){
-            
-                /*
-                 * property
-                 *   : IDENT S*
-                 *   ;        
-                 */
-                 
-                var tokenStream = this._tokenStream,
-                    value       = null,
-                    hack        = null,
-                    tokenValue,
-                    token,
-                    line,
-                    col;
-                    
-                //check for star hack - throws error if not allowed
-                if (tokenStream.peek() == Tokens.STAR && this.options.starHack){
-                    tokenStream.get();
-                    token = tokenStream.token();
-                    hack = token.value;
-                    line = token.startLine;
-                    col = token.startCol;
-                }
-                
-                if(tokenStream.match(Tokens.IDENT)){
-                    token = tokenStream.token();
-                    tokenValue = token.value;
-                    
-                    //check for underscore hack - no error if not allowed because it's valid CSS syntax
-                    if (tokenValue.charAt(0) == "_" && this.options.underscoreHack){
-                        hack = "_";
-                        tokenValue = tokenValue.substring(1);
-                    }
-                    
-                    value = new PropertyName(tokenValue, hack, (line||token.startLine), (col||token.startCol));
-                    this._readWhitespace();
-                }
-                
-                return value;
-            },
-        
-            //Augmented with CSS3 Selectors
-            _ruleset: function(){
-                /*
-                 * ruleset
-                 *   : selectors_group
-                 *     '{' S* declaration? [ ';' S* declaration? ]* '}' S*
-                 *   ;    
-                 */    
-                 
-                var tokenStream = this._tokenStream,
-                    tt,
-                    selectors;
-
-
-                /*
-                 * Error Recovery: If even a single selector fails to parse,
-                 * then the entire ruleset should be thrown away.
-                 */
-                try {
-                    selectors = this._selectors_group();
-                } catch (ex){
-                    if (ex instanceof SyntaxError && !this.options.strict){
-                    
-                        //fire error event
-                        this.fire({
-                            type:       "error",
-                            error:      ex,
-                            message:    ex.message,
-                            line:       ex.line,
-                            col:        ex.col
-                        });                          
-                        
-                        //skip over everything until closing brace
-                        tt = tokenStream.advance([Tokens.RBRACE]);
-                        if (tt == Tokens.RBRACE){
-                            //if there's a right brace, the rule is finished so don't do anything
-                        } else {
-                            //otherwise, rethrow the error because it wasn't handled properly
-                            throw ex;
-                        }                        
-                        
-                    } else {
-                        //not a syntax error, rethrow it
-                        throw ex;
-                    }                
-                
-                    //trigger parser to continue
-                    return true;
-                }
-                
-                //if it got here, all selectors parsed
-                if (selectors){ 
-                                    
-                    this.fire({
-                        type:       "startrule",
-                        selectors:  selectors,
-                        line:       selectors[0].line,
-                        col:        selectors[0].col
-                    });                
-                    
-                    this._readDeclarations(true);                
-                    
-                    this.fire({
-                        type:       "endrule",
-                        selectors:  selectors,
-                        line:       selectors[0].line,
-                        col:        selectors[0].col
-                    });  
-                    
-                }
-                
-                return selectors;
-                
-            },
-
-            //CSS3 Selectors
-            _selectors_group: function(){
-            
-                /*            
-                 * selectors_group
-                 *   : selector [ COMMA S* selector ]*
-                 *   ;
-                 */           
-                var tokenStream = this._tokenStream,
-                    selectors   = [],
-                    selector;
-                    
-                selector = this._selector();
-                if (selector !== null){
-                
-                    selectors.push(selector);
-                    while(tokenStream.match(Tokens.COMMA)){
-                        this._readWhitespace();
-                        selector = this._selector();
-                        if (selector !== null){
-                            selectors.push(selector);
-                        } else {
-                            this._unexpectedToken(tokenStream.LT(1));
-                        }
-                    }
-                }
-
-                return selectors.length ? selectors : null;
-            },
-                
-            //CSS3 Selectors
-            _selector: function(){
-                /*
-                 * selector
-                 *   : simple_selector_sequence [ combinator simple_selector_sequence ]*
-                 *   ;    
-                 */
-                 
-                var tokenStream = this._tokenStream,
-                    selector    = [],
-                    nextSelector = null,
-                    combinator  = null,
-                    ws          = null;
-                
-                //if there's no simple selector, then there's no selector
-                nextSelector = this._simple_selector_sequence();
-                if (nextSelector === null){
-                    return null;
-                }
-                
-                selector.push(nextSelector);
-                
-                do {
-                    
-                    //look for a combinator
-                    combinator = this._combinator();
-                    
-                    if (combinator !== null){
-                        selector.push(combinator);
-                        nextSelector = this._simple_selector_sequence();
-                        
-                        //there must be a next selector
-                        if (nextSelector === null){
-                            this._unexpectedToken(this.LT(1));
-                        } else {
-                        
-                            //nextSelector is an instance of SelectorPart
-                            selector.push(nextSelector);
-                        }
-                    } else {
-                        
-                        //if there's not whitespace, we're done
-                        if (this._readWhitespace()){           
-        
-                            //add whitespace separator
-                            ws = new Combinator(tokenStream.token().value, tokenStream.token().startLine, tokenStream.token().startCol);
-                            
-                            //combinator is not required
-                            combinator = this._combinator();
-                            
-                            //selector is required if there's a combinator
-                            nextSelector = this._simple_selector_sequence();
-                            if (nextSelector === null){                        
-                                if (combinator !== null){
-                                    this._unexpectedToken(tokenStream.LT(1));
-                                }
-                            } else {
-                                
-                                if (combinator !== null){
-                                    selector.push(combinator);
-                                } else {
-                                    selector.push(ws);
-                                }
-                                
-                                selector.push(nextSelector);
-                            }     
-                        } else {
-                            break;
-                        }               
-                    
-                    }
-                } while(true);
-                
-                return new Selector(selector, selector[0].line, selector[0].col);
-            },
-            
-            //CSS3 Selectors
-            _simple_selector_sequence: function(){
-                /*
-                 * simple_selector_sequence
-                 *   : [ type_selector | universal ]
-                 *     [ HASH | class | attrib | pseudo | negation ]*
-                 *   | [ HASH | class | attrib | pseudo | negation ]+
-                 *   ;
-                 */
-                 
-                var tokenStream = this._tokenStream,
-                
-                    //parts of a simple selector
-                    elementName = null,
-                    modifiers   = [],
-                    
-                    //complete selector text
-                    selectorText= "",
-
-                    //the different parts after the element name to search for
-                    components  = [
-                        //HASH
-                        function(){
-                            return tokenStream.match(Tokens.HASH) ?
-                                    new SelectorSubPart(tokenStream.token().value, "id", tokenStream.token().startLine, tokenStream.token().startCol) :
-                                    null;
-                        },
-                        this._class,
-                        this._attrib,
-                        this._pseudo,
-                        this._negation
-                    ],
-                    i           = 0,
-                    len         = components.length,
-                    component   = null,
-                    found       = false,
-                    line,
-                    col;
-                    
-                    
-                //get starting line and column for the selector
-                line = tokenStream.LT(1).startLine;
-                col = tokenStream.LT(1).startCol;
-                                        
-                elementName = this._type_selector();
-                if (!elementName){
-                    elementName = this._universal();
-                }
-                
-                if (elementName !== null){
-                    selectorText += elementName;
-                }                
-                
-                while(true){
-
-                    //whitespace means we're done
-                    if (tokenStream.peek() === Tokens.S){
-                        break;
-                    }
-                
-                    //check for each component
-                    while(i < len && component === null){
-                        component = components[i++].call(this);
-                    }
-        
-                    if (component === null){
-                    
-                        //we don't have a selector
-                        if (selectorText === ""){
-                            return null;
-                        } else {
-                            break;
-                        }
-                    } else {
-                        i = 0;
-                        modifiers.push(component);
-                        selectorText += component.toString(); 
-                        component = null;
-                    }
-                }
-
-                 
-                return selectorText !== "" ?
-                        new SelectorPart(elementName, modifiers, selectorText, line, col) :
-                        null;
-            },            
-            
-            //CSS3 Selectors
-            _type_selector: function(){
-                /*
-                 * type_selector
-                 *   : [ namespace_prefix ]? element_name
-                 *   ;
-                 */
-                 
-                var tokenStream = this._tokenStream,
-                    ns          = this._namespace_prefix(),
-                    elementName = this._element_name();
-                    
-                if (!elementName){                    
-                    /*
-                     * Need to back out the namespace that was read due to both
-                     * type_selector and universal reading namespace_prefix
-                     * first. Kind of hacky, but only way I can figure out
-                     * right now how to not change the grammar.
-                     */
-                    if (ns){
-                        tokenStream.unget();
-                        if (ns.length > 1){
-                            tokenStream.unget();
-                        }
-                    }
-                
-                    return null;
-                } else {     
-                    if (ns){
-                        elementName.text = ns + elementName.text;
-                        elementName.col -= ns.length;
-                    }
-                    return elementName;
-                }
-            },
-            
-            //CSS3 Selectors
-            _class: function(){
-                /*
-                 * class
-                 *   : '.' IDENT
-                 *   ;
-                 */    
-                 
-                var tokenStream = this._tokenStream,
-                    token;
-                
-                if (tokenStream.match(Tokens.DOT)){
-                    tokenStream.mustMatch(Tokens.IDENT);    
-                    token = tokenStream.token();
-                    return new SelectorSubPart("." + token.value, "class", token.startLine, token.startCol - 1);        
-                } else {
-                    return null;
-                }
-        
-            },
-            
-            //CSS3 Selectors
-            _element_name: function(){
-                /*
-                 * element_name
-                 *   : IDENT
-                 *   ;
-                 */    
-                
-                var tokenStream = this._tokenStream,
-                    token;
-                
-                if (tokenStream.match(Tokens.IDENT)){
-                    token = tokenStream.token();
-                    return new SelectorSubPart(token.value, "elementName", token.startLine, token.startCol);        
-                
-                } else {
-                    return null;
-                }
-            },
-            
-            //CSS3 Selectors
-            _namespace_prefix: function(){
-                /*            
-                 * namespace_prefix
-                 *   : [ IDENT | '*' ]? '|'
-                 *   ;
-                 */
-                var tokenStream = this._tokenStream,
-                    value       = "";
-                    
-                //verify that this is a namespace prefix
-                if (tokenStream.LA(1) === Tokens.PIPE || tokenStream.LA(2) === Tokens.PIPE){
-                        
-                    if(tokenStream.match([Tokens.IDENT, Tokens.STAR])){
-                        value += tokenStream.token().value;
-                    }
-                    
-                    tokenStream.mustMatch(Tokens.PIPE);
-                    value += "|";
-                    
-                }
-                
-                return value.length ? value : null;                
-            },
-            
-            //CSS3 Selectors
-            _universal: function(){
-                /*
-                 * universal
-                 *   : [ namespace_prefix ]? '*'
-                 *   ;            
-                 */
-                var tokenStream = this._tokenStream,
-                    value       = "",
-                    ns;
-                    
-                ns = this._namespace_prefix();
-                if(ns){
-                    value += ns;
-                }
-                
-                if(tokenStream.match(Tokens.STAR)){
-                    value += "*";
-                }
-                
-                return value.length ? value : null;
-                
-           },
-            
-            //CSS3 Selectors
-            _attrib: function(){
-                /*
-                 * attrib
-                 *   : '[' S* [ namespace_prefix ]? IDENT S*
-                 *         [ [ PREFIXMATCH |
-                 *             SUFFIXMATCH |
-                 *             SUBSTRINGMATCH |
-                 *             '=' |
-                 *             INCLUDES |
-                 *             DASHMATCH ] S* [ IDENT | STRING ] S*
-                 *         ]? ']'
-                 *   ;    
-                 */
-                 
-                var tokenStream = this._tokenStream,
-                    value       = null,
-                    ns,
-                    token;
-                
-                if (tokenStream.match(Tokens.LBRACKET)){
-                    token = tokenStream.token();
-                    value = token.value;
-                    value += this._readWhitespace();
-                    
-                    ns = this._namespace_prefix();
-                    
-                    if (ns){
-                        value += ns;
-                    }
-                                        
-                    tokenStream.mustMatch(Tokens.IDENT);
-                    value += tokenStream.token().value;                    
-                    value += this._readWhitespace();
-                    
-                    if(tokenStream.match([Tokens.PREFIXMATCH, Tokens.SUFFIXMATCH, Tokens.SUBSTRINGMATCH,
-                            Tokens.EQUALS, Tokens.INCLUDES, Tokens.DASHMATCH])){
-                    
-                        value += tokenStream.token().value;                    
-                        value += this._readWhitespace();
-                        
-                        tokenStream.mustMatch([Tokens.IDENT, Tokens.STRING]);
-                        value += tokenStream.token().value;                    
-                        value += this._readWhitespace();
-                    }
-                    
-                    tokenStream.mustMatch(Tokens.RBRACKET);
-                                        
-                    return new SelectorSubPart(value + "]", "attribute", token.startLine, token.startCol);
-                } else {
-                    return null;
-                }
-            },
-            
-            //CSS3 Selectors
-            _pseudo: function(){
-            
-                /*
-                 * pseudo
-                 *   : ':' ':'? [ IDENT | functional_pseudo ]
-                 *   ;    
-                 */   
-            
-                var tokenStream = this._tokenStream,
-                    pseudo      = null,
-                    colons      = ":",
-                    line,
-                    col;
-                
-                if (tokenStream.match(Tokens.COLON)){
-                
-                    if (tokenStream.match(Tokens.COLON)){
-                        colons += ":";
-                    }
-                
-                    if (tokenStream.match(Tokens.IDENT)){
-                        pseudo = tokenStream.token().value;
-                        line = tokenStream.token().startLine;
-                        col = tokenStream.token().startCol - colons.length;
-                    } else if (tokenStream.peek() == Tokens.FUNCTION){
-                        line = tokenStream.LT(1).startLine;
-                        col = tokenStream.LT(1).startCol - colons.length;
-                        pseudo = this._functional_pseudo();
-                    }
-                    
-                    if (pseudo){
-                        pseudo = new SelectorSubPart(colons + pseudo, "pseudo", line, col);
-                    }
-                }
-        
-                return pseudo;
-            },
-            
-            //CSS3 Selectors
-            _functional_pseudo: function(){
-                /*
-                 * functional_pseudo
-                 *   : FUNCTION S* expression ')'
-                 *   ;
-                */            
-                
-                var tokenStream = this._tokenStream,
-                    value = null;
-                
-                if(tokenStream.match(Tokens.FUNCTION)){
-                    value = tokenStream.token().value;
-                    value += this._readWhitespace();
-                    value += this._expression();
-                    tokenStream.mustMatch(Tokens.RPAREN);
-                    value += ")";
-                }
-                
-                return value;
-            },
-            
-            //CSS3 Selectors
-            _expression: function(){
-                /*
-                 * expression
-                 *   : [ [ PLUS | '-' | DIMENSION | NUMBER | STRING | IDENT ] S* ]+
-                 *   ;
-                 */
-                 
-                var tokenStream = this._tokenStream,
-                    value       = "";
-                    
-                while(tokenStream.match([Tokens.PLUS, Tokens.MINUS, Tokens.DIMENSION,
-                        Tokens.NUMBER, Tokens.STRING, Tokens.IDENT, Tokens.LENGTH,
-                        Tokens.FREQ, Tokens.ANGLE, Tokens.TIME,
-                        Tokens.RESOLUTION])){
-                    
-                    value += tokenStream.token().value;
-                    value += this._readWhitespace();                        
-                }
-                
-                return value.length ? value : null;
-                
-            },
-
-            //CSS3 Selectors
-            _negation: function(){
-                /*            
-                 * negation
-                 *   : NOT S* negation_arg S* ')'
-                 *   ;
-                 */
-
-                var tokenStream = this._tokenStream,
-                    line,
-                    col,
-                    value       = "",
-                    arg,
-                    subpart     = null;
-                    
-                if (tokenStream.match(Tokens.NOT)){
-                    value = tokenStream.token().value;
-                    line = tokenStream.token().startLine;
-                    col = tokenStream.token().startCol;
-                    value += this._readWhitespace();
-                    arg = this._negation_arg();
-                    value += arg;
-                    value += this._readWhitespace();
-                    tokenStream.match(Tokens.RPAREN);
-                    value += tokenStream.token().value;
-                    
-                    subpart = new SelectorSubPart(value, "not", line, col);
-                    subpart.args.push(arg);
-                }
-                
-                return subpart;
-            },
-            
-            //CSS3 Selectors
-            _negation_arg: function(){            
-                /*
-                 * negation_arg
-                 *   : type_selector | universal | HASH | class | attrib | pseudo
-                 *   ;            
-                 */           
-                 
-                var tokenStream = this._tokenStream,
-                    args        = [
-                        this._type_selector,
-                        this._universal,
-                        function(){
-                            return tokenStream.match(Tokens.HASH) ?
-                                    new SelectorSubPart(tokenStream.token().value, "id", tokenStream.token().startLine, tokenStream.token().startCol) :
-                                    null;                        
-                        },
-                        this._class,
-                        this._attrib,
-                        this._pseudo                    
-                    ],
-                    arg         = null,
-                    i           = 0,
-                    len         = args.length,
-                    elementName,
-                    line,
-                    col,
-                    part;
-                    
-                line = tokenStream.LT(1).startLine;
-                col = tokenStream.LT(1).startCol;
-                
-                while(i < len && arg === null){
-                    
-                    arg = args[i].call(this);
-                    i++;
-                }
-                
-                //must be a negation arg
-                if (arg === null){
-                    this._unexpectedToken(tokenStream.LT(1));
-                }
- 
-                //it's an element name
-                if (arg.type == "elementName"){
-                    part = new SelectorPart(arg, [], arg.toString(), line, col);
-                } else {
-                    part = new SelectorPart(null, [arg], arg.toString(), line, col);
-                }
-                
-                return part;                
-            },
-            
-            _declaration: function(){
-            
-                /*
-                 * declaration
-                 *   : property ':' S* expr prio?
-                 *   | /( empty )/
-                 *   ;     
-                 */    
-            
-                var tokenStream = this._tokenStream,
-                    property    = null,
-                    expr        = null,
-                    prio        = null,
-                    error       = null,
-                    invalid     = null;
-                
-                property = this._property();
-                if (property !== null){
-
-                    tokenStream.mustMatch(Tokens.COLON);
-                    this._readWhitespace();
-                    
-                    expr = this._expr();
-                    
-                    //if there's no parts for the value, it's an error
-                    if (!expr || expr.length === 0){
-                        this._unexpectedToken(tokenStream.LT(1));
-                    }
-                    
-                    prio = this._prio();
-                    
-                    try {
-                        this._validateProperty(property, expr);
-                    } catch (ex) {
-                        invalid = ex;
-                    }
-                    
-                    this.fire({
-                        type:       "property",
-                        property:   property,
-                        value:      expr,
-                        important:  prio,
-                        line:       property.line,
-                        col:        property.col,
-                        invalid:    invalid
-                    });                      
-                    
-                    return true;
-                } else {
-                    return false;
-                }
-            },
-            
-            _prio: function(){
-                /*
-                 * prio
-                 *   : IMPORTANT_SYM S*
-                 *   ;    
-                 */
-                 
-                var tokenStream = this._tokenStream,
-                    result      = tokenStream.match(Tokens.IMPORTANT_SYM);
-                    
-                this._readWhitespace();
-                return result;
-            },
-            
-            _expr: function(){
-                /*
-                 * expr
-                 *   : term [ operator term ]*
-                 *   ;
-                 */
-        
-                var tokenStream = this._tokenStream,
-                    values      = [],
-					//valueParts	= [],
-                    value       = null,
-                    operator    = null;
-                    
-                value = this._term();
-                if (value !== null){
-                
-                    values.push(value);
-                    
-                    do {
-                        operator = this._operator();
-        
-                        //if there's an operator, keep building up the value parts
-                        if (operator){
-                            values.push(operator);
-                        } /*else {
-                            //if there's not an operator, you have a full value
-							values.push(new PropertyValue(valueParts, valueParts[0].line, valueParts[0].col));
-							valueParts = [];
-						}*/
-                        
-                        value = this._term();
-                        
-                        if (value === null){
-                            break;
-                        } else {
-                            values.push(value);
-                        }
-                    } while(true);
-                }
-				
-				//cleanup
-                /*if (valueParts.length){
-                    values.push(new PropertyValue(valueParts, valueParts[0].line, valueParts[0].col));
-                }*/
-        
-                return values.length > 0 ? new PropertyValue(values, values[0].line, values[0].col) : null;
-            },
-            
-            _term: function(){                       
-            
-                /*
-                 * term
-                 *   : unary_operator?
-                 *     [ NUMBER S* | PERCENTAGE S* | LENGTH S* | ANGLE S* |
-                 *       TIME S* | FREQ S* | function | ie_function ]
-                 *   | STRING S* | IDENT S* | URI S* | UNICODERANGE S* | hexcolor
-                 *   ;
-                 */    
-        
-                var tokenStream = this._tokenStream,
-                    unary       = null,
-                    value       = null,
-                    token,
-                    line,
-                    col;
-                    
-                //returns the operator or null
-                unary = this._unary_operator();
-                if (unary !== null){
-                    line = tokenStream.token().startLine;
-                    col = tokenStream.token().startCol;
-                }                
-               
-                //exception for IE filters
-                if (tokenStream.peek() == Tokens.IE_FUNCTION && this.options.ieFilters){
-                
-                    value = this._ie_function();
-                    if (unary === null){
-                        line = tokenStream.token().startLine;
-                        col = tokenStream.token().startCol;
-                    }
-                
-                //see if there's a simple match
-                } else if (tokenStream.match([Tokens.NUMBER, Tokens.PERCENTAGE, Tokens.LENGTH,
-                        Tokens.ANGLE, Tokens.TIME,
-                        Tokens.FREQ, Tokens.STRING, Tokens.IDENT, Tokens.URI, Tokens.UNICODE_RANGE])){
-                 
-                    value = tokenStream.token().value;
-                    if (unary === null){
-                        line = tokenStream.token().startLine;
-                        col = tokenStream.token().startCol;
-                    }
-                    this._readWhitespace();
-                } else {
-                
-                    //see if it's a color
-                    token = this._hexcolor();
-                    if (token === null){
-                    
-                        //if there's no unary, get the start of the next token for line/col info
-                        if (unary === null){
-                            line = tokenStream.LT(1).startLine;
-                            col = tokenStream.LT(1).startCol;
-                        }                    
-                    
-                        //has to be a function
-                        if (value === null){
-                            
-                            /*
-                             * This checks for alpha(opacity=0) style of IE
-                             * functions. IE_FUNCTION only presents progid: style.
-                             */
-                            if (tokenStream.LA(3) == Tokens.EQUALS && this.options.ieFilters){
-                                value = this._ie_function();
-                            } else {
-                                value = this._function();
-                            }
-                        }
-
-                        /*if (value === null){
-                            return null;
-                            //throw new Error("Expected identifier at line " + tokenStream.token().startLine + ", character " +  tokenStream.token().startCol + ".");
-                        }*/
-                    
-                    } else {
-                        value = token.value;
-                        if (unary === null){
-                            line = token.startLine;
-                            col = token.startCol;
-                        }                    
-                    }
-                
-                }                
-                
-                return value !== null ?
-                        new PropertyValuePart(unary !== null ? unary + value : value, line, col) :
-                        null;
-        
-            },
-            
-            _function: function(){
-            
-                /*
-                 * function
-                 *   : FUNCTION S* expr ')' S*
-                 *   ;
-                 */
-                 
-                var tokenStream = this._tokenStream,
-                    functionText = null,
-                    expr        = null,
-                    lt;
-                    
-                if (tokenStream.match(Tokens.FUNCTION)){
-                    functionText = tokenStream.token().value;
-                    this._readWhitespace();
-                    expr = this._expr();
-                    functionText += expr;
-                    
-                    //START: Horrible hack in case it's an IE filter
-                    if (this.options.ieFilters && tokenStream.peek() == Tokens.EQUALS){
-                        do {
-                        
-                            if (this._readWhitespace()){
-                                functionText += tokenStream.token().value;
-                            }
-                            
-                            //might be second time in the loop
-                            if (tokenStream.LA(0) == Tokens.COMMA){
-                                functionText += tokenStream.token().value;
-                            }
-                        
-                            tokenStream.match(Tokens.IDENT);
-                            functionText += tokenStream.token().value;
-                            
-                            tokenStream.match(Tokens.EQUALS);
-                            functionText += tokenStream.token().value;
-                            
-                            //functionText += this._term();
-                            lt = tokenStream.peek();
-                            while(lt != Tokens.COMMA && lt != Tokens.S && lt != Tokens.RPAREN){
-                                tokenStream.get();
-                                functionText += tokenStream.token().value;
-                                lt = tokenStream.peek();
-                            }
-                        } while(tokenStream.match([Tokens.COMMA, Tokens.S]));
-                    }
-
-                    //END: Horrible Hack
-                    
-                    tokenStream.match(Tokens.RPAREN);    
-                    functionText += ")";
-                    this._readWhitespace();
-                }                
-                
-                return functionText;
-            }, 
-            
-            _ie_function: function(){
-            
-                /* (My own extension)
-                 * ie_function
-                 *   : IE_FUNCTION S* IDENT '=' term [S* ','? IDENT '=' term]+ ')' S*
-                 *   ;
-                 */
-                 
-                var tokenStream = this._tokenStream,
-                    functionText = null,
-                    expr        = null,
-                    lt;
-                    
-                //IE function can begin like a regular function, too
-                if (tokenStream.match([Tokens.IE_FUNCTION, Tokens.FUNCTION])){
-                    functionText = tokenStream.token().value;
-                    
-                    do {
-                    
-                        if (this._readWhitespace()){
-                            functionText += tokenStream.token().value;
-                        }
-                        
-                        //might be second time in the loop
-                        if (tokenStream.LA(0) == Tokens.COMMA){
-                            functionText += tokenStream.token().value;
-                        }
-                    
-                        tokenStream.match(Tokens.IDENT);
-                        functionText += tokenStream.token().value;
-                        
-                        tokenStream.match(Tokens.EQUALS);
-                        functionText += tokenStream.token().value;
-                        
-                        //functionText += this._term();
-                        lt = tokenStream.peek();
-                        while(lt != Tokens.COMMA && lt != Tokens.S && lt != Tokens.RPAREN){
-                            tokenStream.get();
-                            functionText += tokenStream.token().value;
-                            lt = tokenStream.peek();
-                        }
-                    } while(tokenStream.match([Tokens.COMMA, Tokens.S]));                    
-                    
-                    tokenStream.match(Tokens.RPAREN);    
-                    functionText += ")";
-                    this._readWhitespace();
-                }                
-                
-                return functionText;
-            }, 
-            
-            _hexcolor: function(){
-                /*
-                 * There is a constraint on the color that it must
-                 * have either 3 or 6 hex-digits (i.e., [0-9a-fA-F])
-                 * after the "#"; e.g., "#000" is OK, but "#abcd" is not.
-                 *
-                 * hexcolor
-                 *   : HASH S*
-                 *   ;
-                 */
-                 
-                var tokenStream = this._tokenStream,
-                    token = null,
-                    color;
-                    
-                if(tokenStream.match(Tokens.HASH)){
-                
-                    //need to do some validation here
-                    
-                    token = tokenStream.token();
-                    color = token.value;
-                    if (!/#[a-f0-9]{3,6}/i.test(color)){
-                        throw new SyntaxError("Expected a hex color but found '" + color + "' at line " + token.startLine + ", col " + token.startCol + ".", token.startLine, token.startCol);
-                    }
-                    this._readWhitespace();
-                }
-                
-                return token;
-            },
-            
-            //-----------------------------------------------------------------
-            // Animations methods
-            //-----------------------------------------------------------------
-            
-            _keyframes: function(){
-            
-                /*
-                 * keyframes:
-                 *   : KEYFRAMES_SYM S* keyframe_name S* '{' S* keyframe_rule* '}' {
-                 *   ;
-                 */
-                var tokenStream = this._tokenStream,
-                    token,
-                    tt,
-                    name;            
-                    
-                tokenStream.mustMatch(Tokens.KEYFRAMES_SYM);
-                this._readWhitespace();
-                name = this._keyframe_name();
-                
-                this._readWhitespace();
-                tokenStream.mustMatch(Tokens.LBRACE);
-                    
-                this.fire({
-                    type:   "startkeyframes",
-                    name:   name,
-                    line:   name.line,
-                    col:    name.col
-                });                
-                
-                this._readWhitespace();
-                tt = tokenStream.peek();
-                
-                //check for key
-                while(tt == Tokens.IDENT || tt == Tokens.PERCENTAGE) {
-                    this._keyframe_rule();
-                    this._readWhitespace();
-                    tt = tokenStream.peek();
-                }           
-                
-                this.fire({
-                    type:   "endkeyframes",
-                    name:   name,
-                    line:   name.line,
-                    col:    name.col
-                });                      
-                    
-                this._readWhitespace();
-                tokenStream.mustMatch(Tokens.RBRACE);                    
-                
-            },
-            
-            _keyframe_name: function(){
-            
-                /*
-                 * keyframe_name:
-                 *   : IDENT
-                 *   | STRING
-                 *   ;
-                 */
-                var tokenStream = this._tokenStream,
-                    token;
-
-                tokenStream.mustMatch([Tokens.IDENT, Tokens.STRING]);
-                return SyntaxUnit.fromToken(tokenStream.token());            
-            },
-            
-            _keyframe_rule: function(){
-            
-                /*
-                 * keyframe_rule:
-                 *   : key_list S* 
-                 *     '{' S* declaration [ ';' S* declaration ]* '}' S*
-                 *   ;
-                 */
-                var tokenStream = this._tokenStream,
-                    token,
-                    keyList = this._key_list();
-                                    
-                this.fire({
-                    type:   "startkeyframerule",
-                    keys:   keyList,
-                    line:   keyList[0].line,
-                    col:    keyList[0].col
-                });                
-                
-                this._readDeclarations(true);                
-                
-                this.fire({
-                    type:   "endkeyframerule",
-                    keys:   keyList,
-                    line:   keyList[0].line,
-                    col:    keyList[0].col
-                });  
-                
-            },
-            
-            _key_list: function(){
-            
-                /*
-                 * key_list:
-                 *   : key [ S* ',' S* key]*
-                 *   ;
-                 */
-                var tokenStream = this._tokenStream,
-                    token,
-                    key,
-                    keyList = [];
-                    
-                //must be least one key
-                keyList.push(this._key());
-                    
-                this._readWhitespace();
-                    
-                while(tokenStream.match(Tokens.COMMA)){
-                    this._readWhitespace();
-                    keyList.push(this._key());
-                    this._readWhitespace();
-                }
-
-                return keyList;
-            },
-                        
-            _key: function(){
-                /*
-                 * There is a restriction that IDENT can be only "from" or "to".
-                 *
-                 * key
-                 *   : PERCENTAGE
-                 *   | IDENT
-                 *   ;
-                 */
-                 
-                var tokenStream = this._tokenStream,
-                    token;
-                    
-                if (tokenStream.match(Tokens.PERCENTAGE)){
-                    return SyntaxUnit.fromToken(tokenStream.token());
-                } else if (tokenStream.match(Tokens.IDENT)){
-                    token = tokenStream.token();                    
-                    
-                    if (/from|to/i.test(token.value)){
-                        return SyntaxUnit.fromToken(token);
-                    }
-                    
-                    tokenStream.unget();
-                }
-                
-                //if it gets here, there wasn't a valid token, so time to explode
-                this._unexpectedToken(tokenStream.LT(1));
-            },
-            
-            //-----------------------------------------------------------------
-            // Helper methods
-            //-----------------------------------------------------------------
-            
-            /**
-             * Not part of CSS grammar, but useful for skipping over
-             * combination of white space and HTML-style comments.
-             * @return {void}
-             * @method _skipCruft
-             * @private
-             */
-            _skipCruft: function(){
-                while(this._tokenStream.match([Tokens.S, Tokens.CDO, Tokens.CDC])){
-                    //noop
-                }
-            },
-
-            /**
-             * Not part of CSS grammar, but this pattern occurs frequently
-             * in the official CSS grammar. Split out here to eliminate
-             * duplicate code.
-             * @param {Boolean} checkStart Indicates if the rule should check
-             *      for the left brace at the beginning.
-             * @param {Boolean} readMargins Indicates if the rule should check
-             *      for margin patterns.
-             * @return {void}
-             * @method _readDeclarations
-             * @private
-             */
-            _readDeclarations: function(checkStart, readMargins){
-                /*
-                 * Reads the pattern
-                 * S* '{' S* declaration [ ';' S* declaration ]* '}' S*
-                 * or
-                 * S* '{' S* [ declaration | margin ]? [ ';' S* [ declaration | margin ]? ]* '}' S*
-                 * Note that this is how it is described in CSS3 Paged Media, but is actually incorrect.
-                 * A semicolon is only necessary following a delcaration is there's another declaration
-                 * or margin afterwards. 
-                 */
-                var tokenStream = this._tokenStream,
-                    tt;
-                       
-
-                this._readWhitespace();
-                
-                if (checkStart){
-                    tokenStream.mustMatch(Tokens.LBRACE);            
-                }
-                
-                this._readWhitespace();
-
-                try {
-                    
-                    while(true){
-                    
-                        if (tokenStream.match(Tokens.SEMICOLON) || (readMargins && this._margin())){
-                            //noop
-                        } else if (this._declaration()){
-                            if (!tokenStream.match(Tokens.SEMICOLON)){
-                                break;
-                            }
-                        } else {
-                            break;
-                        }
-                    
-                        //if ((!this._margin() && !this._declaration()) || !tokenStream.match(Tokens.SEMICOLON)){
-                        //    break;
-                        //}
-                        this._readWhitespace();
-                    }
-                    
-                    tokenStream.mustMatch(Tokens.RBRACE);
-                    this._readWhitespace();
-                    
-                } catch (ex) {
-                    if (ex instanceof SyntaxError && !this.options.strict){
-                    
-                        //fire error event
-                        this.fire({
-                            type:       "error",
-                            error:      ex,
-                            message:    ex.message,
-                            line:       ex.line,
-                            col:        ex.col
-                        });                          
-                        
-                        //see if there's another declaration
-                        tt = tokenStream.advance([Tokens.SEMICOLON, Tokens.RBRACE]);
-                        if (tt == Tokens.SEMICOLON){
-                            //if there's a semicolon, then there might be another declaration
-                            this._readDeclarations(false, readMargins);                            
-                        } else if (tt != Tokens.RBRACE){
-                            //if there's a right brace, the rule is finished so don't do anything
-                            //otherwise, rethrow the error because it wasn't handled properly
-                            throw ex;
-                        }                        
-                        
-                    } else {
-                        //not a syntax error, rethrow it
-                        throw ex;
-                    }
-                }    
-            
-            },      
-            
-            /**
-             * In some cases, you can end up with two white space tokens in a
-             * row. Instead of making a change in every function that looks for
-             * white space, this function is used to match as much white space
-             * as necessary.
-             * @method _readWhitespace
-             * @return {String} The white space if found, empty string if not.
-             * @private
-             */
-            _readWhitespace: function(){
-            
-                var tokenStream = this._tokenStream,
-                    ws = "";
-                    
-                while(tokenStream.match(Tokens.S)){
-                    ws += tokenStream.token().value;
-                }
-                
-                return ws;
-            },
-          
-
-            /**
-             * Throws an error when an unexpected token is found.
-             * @param {Object} token The token that was found.
-             * @method _unexpectedToken
-             * @return {void}
-             * @private
-             */
-            _unexpectedToken: function(token){
-                throw new SyntaxError("Unexpected token '" + token.value + "' at line " + token.startLine + ", col " + token.startCol + ".", token.startLine, token.startCol);
-            },
-            
-            /**
-             * Helper method used for parsing subparts of a style sheet.
-             * @return {void}
-             * @method _verifyEnd
-             * @private
-             */
-            _verifyEnd: function(){
-                if (this._tokenStream.LA(1) != Tokens.EOF){
-                    this._unexpectedToken(this._tokenStream.LT(1));
-                }            
-            },
-            
-            //-----------------------------------------------------------------
-            // Validation methods
-            //-----------------------------------------------------------------
-            _validateProperty: function(property, value){
-                Validation.validate(property, value);
-            },
-            
-            //-----------------------------------------------------------------
-            // Parsing methods
-            //-----------------------------------------------------------------
-            
-            parse: function(input){    
-                this._tokenStream = new TokenStream(input, Tokens);
-                this._stylesheet();
-            },
-            
-            parseStyleSheet: function(input){
-                //just passthrough
-                return this.parse(input);
-            },
-            
-            parseMediaQuery: function(input){
-                this._tokenStream = new TokenStream(input, Tokens);
-                var result = this._media_query();
-                
-                //if there's anything more, then it's an invalid selector
-                this._verifyEnd();
-                
-                //otherwise return result
-                return result;            
-            },
-            
-            /**
-             * Parses a property value (everything after the semicolon).
-             * @return {parserlib.css.PropertyValue} The property value.
-             * @throws parserlib.util.SyntaxError If an unexpected token is found.
-             * @method parserPropertyValue
-             */             
-            parsePropertyValue: function(input){
-            
-                this._tokenStream = new TokenStream(input, Tokens);
-                this._readWhitespace();
-                
-                var result = this._expr();
-                
-                //okay to have a trailing white space
-                this._readWhitespace();
-                
-                //if there's anything more, then it's an invalid selector
-                this._verifyEnd();
-                
-                //otherwise return result
-                return result;
-            },
-            
-            /**
-             * Parses a complete CSS rule, including selectors and
-             * properties.
-             * @param {String} input The text to parser.
-             * @return {Boolean} True if the parse completed successfully, false if not.
-             * @method parseRule
-             */
-            parseRule: function(input){
-                this._tokenStream = new TokenStream(input, Tokens);
-                
-                //skip any leading white space
-                this._readWhitespace();
-                
-                var result = this._ruleset();
-                
-                //skip any trailing white space
-                this._readWhitespace();
-
-                //if there's anything more, then it's an invalid selector
-                this._verifyEnd();
-                
-                //otherwise return result
-                return result;            
-            },
-            
-            /**
-             * Parses a single CSS selector (no comma)
-             * @param {String} input The text to parse as a CSS selector.
-             * @return {Selector} An object representing the selector.
-             * @throws parserlib.util.SyntaxError If an unexpected token is found.
-             * @method parseSelector
-             */
-            parseSelector: function(input){
-            
-                this._tokenStream = new TokenStream(input, Tokens);
-                
-                //skip any leading white space
-                this._readWhitespace();
-                
-                var result = this._selector();
-                
-                //skip any trailing white space
-                this._readWhitespace();
-
-                //if there's anything more, then it's an invalid selector
-                this._verifyEnd();
-                
-                //otherwise return result
-                return result;
-            },
-
-            /**
-             * Parses an HTML style attribute: a set of CSS declarations 
-             * separated by semicolons.
-             * @param {String} input The text to parse as a style attribute
-             * @return {void} 
-             * @method parseStyleAttribute
-             */
-            parseStyleAttribute: function(input){
-                input += "}"; // for error recovery in _readDeclarations()
-                this._tokenStream = new TokenStream(input, Tokens);
-                this._readDeclarations();
-            }
-        };
-        
-    //copy over onto prototype
-    for (prop in additions){
-        if (additions.hasOwnProperty(prop)){
-            proto[prop] = additions[prop];
-        }
-    }   
-    
-    return proto;
-}();
-
-
-/*
-nth
-  : S* [ ['-'|'+']? INTEGER? {N} [ S* ['-'|'+'] S* INTEGER ]? |
-         ['-'|'+']? INTEGER | {O}{D}{D} | {E}{V}{E}{N} ] S*
-  ;
-*/
-/*global Validation, ValidationTypes, ValidationError*/
-var Properties = {
-
-    //A
-    "alignment-adjust"              : "auto | baseline | before-edge | text-before-edge | middle | central | after-edge | text-after-edge | ideographic | alphabetic | hanging | mathematical | <percentage> | <length>",
-    "alignment-baseline"            : "baseline | use-script | before-edge | text-before-edge | after-edge | text-after-edge | central | middle | ideographic | alphabetic | hanging | mathematical",
-    "animation"                     : 1,
-    "animation-delay"               : { multi: "<time>", comma: true },
-    "animation-direction"           : { multi: "normal | alternate", comma: true },
-    "animation-duration"            : { multi: "<time>", comma: true },
-    "animation-iteration-count"     : { multi: "<number> | infinite", comma: true },
-    "animation-name"                : { multi: "none | <ident>", comma: true },
-    "animation-play-state"          : { multi: "running | paused", comma: true },
-    "animation-timing-function"     : 1,
-    
-    //vendor prefixed
-    "-moz-animation-delay"               : { multi: "<time>", comma: true },
-    "-moz-animation-direction"           : { multi: "normal | alternate", comma: true },
-    "-moz-animation-duration"            : { multi: "<time>", comma: true },
-    "-moz-animation-iteration-count"     : { multi: "<number> | infinite", comma: true },
-    "-moz-animation-name"                : { multi: "none | <ident>", comma: true },
-    "-moz-animation-play-state"          : { multi: "running | paused", comma: true },
-    
-    "-ms-animation-delay"               : { multi: "<time>", comma: true },
-    "-ms-animation-direction"           : { multi: "normal | alternate", comma: true },
-    "-ms-animation-duration"            : { multi: "<time>", comma: true },
-    "-ms-animation-iteration-count"     : { multi: "<number> | infinite", comma: true },
-    "-ms-animation-name"                : { multi: "none | <ident>", comma: true },
-    "-ms-animation-play-state"          : { multi: "running | paused", comma: true },
-    
-    "-webkit-animation-delay"               : { multi: "<time>", comma: true },
-    "-webkit-animation-direction"           : { multi: "normal | alternate", comma: true },
-    "-webkit-animation-duration"            : { multi: "<time>", comma: true },
-    "-webkit-animation-iteration-count"     : { multi: "<number> | infinite", comma: true },
-    "-webkit-animation-name"                : { multi: "none | <ident>", comma: true },
-    "-webkit-animation-play-state"          : { multi: "running | paused", comma: true },
-    
-    "-o-animation-delay"               : { multi: "<time>", comma: true },
-    "-o-animation-direction"           : { multi: "normal | alternate", comma: true },
-    "-o-animation-duration"            : { multi: "<time>", comma: true },
-    "-o-animation-iteration-count"     : { multi: "<number> | infinite", comma: true },
-    "-o-animation-name"                : { multi: "none | <ident>", comma: true },
-    "-o-animation-play-state"          : { multi: "running | paused", comma: true },        
-    
-    "appearance"                    : "icon | window | desktop | workspace | document | tooltip | dialog | button | push-button | hyperlink | radio-button | checkbox | menu-item | tab | menu | menubar | pull-down-menu | pop-up-menu | list-menu | radio-group | checkbox-group | outline-tree | range | field | combo-box | signature | password | normal | inherit",
-    "azimuth"                       : function (expression) {
-        var simple      = "<angle> | leftwards | rightwards | inherit",
-            direction   = "left-side | far-left | left | center-left | center | center-right | right | far-right | right-side",
-            behind      = false,
-            valid       = false,
-            part;
-        
-        if (!ValidationTypes.isAny(expression, simple)) {
-            if (ValidationTypes.isAny(expression, "behind")) {
-                behind = true;
-                valid = true;
-            }
-            
-            if (ValidationTypes.isAny(expression, direction)) {
-                valid = true;
-                if (!behind) {
-                    ValidationTypes.isAny(expression, "behind");
-                }
-            }
-        }
-        
-        if (expression.hasNext()) {
-            part = expression.next();
-            if (valid) {
-                throw new ValidationError("Expected end of value but found '" + part + "'.", part.line, part.col);
-            } else {
-                throw new ValidationError("Expected (<'azimuth'>) but found '" + part + "'.", part.line, part.col);
-            }
-        }        
-    },
-    
-    //B
-    "backface-visibility"           : "visible | hidden",
-    "background"                    : 1,
-    "background-attachment"         : { multi: "<attachment>", comma: true },
-    "background-clip"               : { multi: "<box>", comma: true },
-    "background-color"              : "<color> | inherit",
-    "background-image"              : { multi: "<bg-image>", comma: true },
-    "background-origin"             : { multi: "<box>", comma: true },
-    "background-position"           : { multi: "<bg-position>", comma: true },
-    "background-repeat"             : { multi: "<repeat-style>" },
-    "background-size"               : { multi: "<bg-size>", comma: true },
-    "baseline-shift"                : "baseline | sub | super | <percentage> | <length>",
-    "binding"                       : 1,
-    "bleed"                         : "<length>",
-    "bookmark-label"                : "<content> | <attr> | <string>",
-    "bookmark-level"                : "none | <integer>",
-    "bookmark-state"                : "open | closed",
-    "bookmark-target"               : "none | <uri> | <attr>",
-    "border"                        : "<border-width> || <border-style> || <color>",
-    "border-bottom"                 : "<border-width> || <border-style> || <color>",
-    "border-bottom-color"           : "<color>",
-    "border-bottom-left-radius"     :  "<x-one-radius>",
-    "border-bottom-right-radius"    :  "<x-one-radius>",
-    "border-bottom-style"           : "<border-style>",
-    "border-bottom-width"           : "<border-width>",
-    "border-collapse"               : "collapse | separate | inherit",
-    "border-color"                  : { multi: "<color> | inherit", max: 4 },
-    "border-image"                  : 1,
-    "border-image-outset"           : { multi: "<length> | <number>", max: 4 },
-    "border-image-repeat"           : { multi: "stretch | repeat | round", max: 2 },
-    "border-image-slice"            : function(expression) {
-        
-        var valid   = false,
-            numeric = "<number> | <percentage>",
-            fill    = false,
-            count   = 0,
-            max     = 4,
-            part;
-        
-        if (ValidationTypes.isAny(expression, "fill")) {
-            fill = true;
-            valid = true;
-        }
-        
-        while (expression.hasNext() && count < max) {
-            valid = ValidationTypes.isAny(expression, numeric);
-            if (!valid) {
-                break;
-            }
-            count++;
-        }
-        
-        
-        if (!fill) {
-            ValidationTypes.isAny(expression, "fill");
-        } else {
-            valid = true;
-        }
-        
-        if (expression.hasNext()) {
-            part = expression.next();
-            if (valid) {
-                throw new ValidationError("Expected end of value but found '" + part + "'.", part.line, part.col);
-            } else {
-                throw new ValidationError("Expected ([<number> | <percentage>]{1,4} && fill?) but found '" + part + "'.", part.line, part.col);
-            }
-        }         
-    },
-    "border-image-source"           : "<image> | none",
-    "border-image-width"            : { multi: "<length> | <percentage> | <number> | auto", max: 4 },
-    "border-left"                   : "<border-width> || <border-style> || <color>",
-    "border-left-color"             : "<color> | inherit",
-    "border-left-style"             : "<border-style>",
-    "border-left-width"             : "<border-width>",
-    "border-radius"                 : function(expression) {
-        
-        var valid   = false,
-            numeric = "<length> | <percentage>",
-            slash   = false,
-            fill    = false,
-            count   = 0,
-            max     = 8,
-            part;
-
-        while (expression.hasNext() && count < max) {
-            valid = ValidationTypes.isAny(expression, numeric);
-            if (!valid) {
-            
-                if (expression.peek() == "/" && count > 1 && !slash) {
-                    slash = true;
-                    max = count + 5;
-                    expression.next();
-                } else {
-                    break;
-                }
-            }
-            count++;
-        }
-        
-        if (expression.hasNext()) {
-            part = expression.next();
-            if (valid) {
-                throw new ValidationError("Expected end of value but found '" + part + "'.", part.line, part.col);
-            } else {
-                throw new ValidationError("Expected (<'border-radius'>) but found '" + part + "'.", part.line, part.col);
-            }
-        }         
-    },
-    "border-right"                  : "<border-width> || <border-style> || <color>",
-    "border-right-color"            : "<color> | inherit",
-    "border-right-style"            : "<border-style>",
-    "border-right-width"            : "<border-width>",
-    "border-spacing"                : { multi: "<length> | inherit", max: 2 },
-    "border-style"                  : { multi: "<border-style>", max: 4 },
-    "border-top"                    : "<border-width> || <border-style> || <color>",
-    "border-top-color"              : "<color> | inherit",
-    "border-top-left-radius"        : "<x-one-radius>",
-    "border-top-right-radius"       : "<x-one-radius>",
-    "border-top-style"              : "<border-style>",
-    "border-top-width"              : "<border-width>",
-    "border-width"                  : { multi: "<border-width>", max: 4 },
-    "bottom"                        : "<margin-width> | inherit", 
-    "box-align"                     : "start | end | center | baseline | stretch",        //http://www.w3.org/TR/2009/WD-css3-flexbox-20090723/
-    "box-decoration-break"          : "slice |clone",
-    "box-direction"                 : "normal | reverse | inherit",
-    "box-flex"                      : "<number>",
-    "box-flex-group"                : "<integer>",
-    "box-lines"                     : "single | multiple",
-    "box-ordinal-group"             : "<integer>",
-    "box-orient"                    : "horizontal | vertical | inline-axis | block-axis | inherit",
-    "box-pack"                      : "start | end | center | justify",
-    "box-shadow"                    : function (expression) {
-        var result      = false,
-            part;
-
-        if (!ValidationTypes.isAny(expression, "none")) {
-            Validation.multiProperty("<shadow>", expression, true, Infinity);                       
-        } else {
-            if (expression.hasNext()) {
-                part = expression.next();
-                throw new ValidationError("Expected end of value but found '" + part + "'.", part.line, part.col);
-            }   
-        }
-    },
-    "box-sizing"                    : "content-box | border-box | inherit",
-    "break-after"                   : "auto | always | avoid | left | right | page | column | avoid-page | avoid-column",
-    "break-before"                  : "auto | always | avoid | left | right | page | column | avoid-page | avoid-column",
-    "break-inside"                  : "auto | avoid | avoid-page | avoid-column",
-    
-    //C
-    "caption-side"                  : "top | bottom | inherit",
-    "clear"                         : "none | right | left | both | inherit",
-    "clip"                          : 1,
-    "color"                         : "<color> | inherit",
-    "color-profile"                 : 1,
-    "column-count"                  : "<integer> | auto",                      //http://www.w3.org/TR/css3-multicol/
-    "column-fill"                   : "auto | balance",
-    "column-gap"                    : "<length> | normal",
-    "column-rule"                   : "<border-width> || <border-style> || <color>",
-    "column-rule-color"             : "<color>",
-    "column-rule-style"             : "<border-style>",
-    "column-rule-width"             : "<border-width>",
-    "column-span"                   : "none | all",
-    "column-width"                  : "<length> | auto",
-    "columns"                       : 1,
-    "content"                       : 1,
-    "counter-increment"             : 1,
-    "counter-reset"                 : 1,
-    "crop"                          : "<shape> | auto",
-    "cue"                           : "cue-after | cue-before | inherit",
-    "cue-after"                     : 1,
-    "cue-before"                    : 1,
-    "cursor"                        : 1,
-    
-    //D
-    "direction"                     : "ltr | rtl | inherit",
-    "display"                       : "inline | block | list-item | inline-block | table | inline-table | table-row-group | table-header-group | table-footer-group | table-row | table-column-group | table-column | table-cell | table-caption | box | inline-box | grid | inline-grid | none | inherit",
-    "dominant-baseline"             : 1,
-    "drop-initial-after-adjust"     : "central | middle | after-edge | text-after-edge | ideographic | alphabetic | mathematical | <percentage> | <length>",
-    "drop-initial-after-align"      : "baseline | use-script | before-edge | text-before-edge | after-edge | text-after-edge | central | middle | ideographic | alphabetic | hanging | mathematical",
-    "drop-initial-before-adjust"    : "before-edge | text-before-edge | central | middle | hanging | mathematical | <percentage> | <length>",
-    "drop-initial-before-align"     : "caps-height | baseline | use-script | before-edge | text-before-edge | after-edge | text-after-edge | central | middle | ideographic | alphabetic | hanging | mathematical",
-    "drop-initial-size"             : "auto | line | <length> | <percentage>",
-    "drop-initial-value"            : "initial | <integer>",
-    
-    //E
-    "elevation"                     : "<angle> | below | level | above | higher | lower | inherit",
-    "empty-cells"                   : "show | hide | inherit",
-    
-    //F
-    "filter"                        : 1,
-    "fit"                           : "fill | hidden | meet | slice",
-    "fit-position"                  : 1,
-    "float"                         : "left | right | none | inherit",    
-    "float-offset"                  : 1,
-    "font"                          : 1,
-    "font-family"                   : 1,
-    "font-size"                     : "<absolute-size> | <relative-size> | <length> | <percentage> | inherit",
-    "font-size-adjust"              : "<number> | none | inherit",
-    "font-stretch"                  : "normal | ultra-condensed | extra-condensed | condensed | semi-condensed | semi-expanded | expanded | extra-expanded | ultra-expanded | inherit",
-    "font-style"                    : "normal | italic | oblique | inherit",
-    "font-variant"                  : "normal | small-caps | inherit",
-    "font-weight"                   : "normal | bold | bolder | lighter | 100 | 200 | 300 | 400 | 500 | 600 | 700 | 800 | 900 | inherit",
-    
-    //G
-    "grid-cell-stacking"            : "columns | rows | layer",
-    "grid-column"                   : 1,
-    "grid-columns"                  : 1,
-    "grid-column-align"             : "start | end | center | stretch",
-    "grid-column-sizing"            : 1,
-    "grid-column-span"              : "<integer>",
-    "grid-flow"                     : "none | rows | columns",
-    "grid-layer"                    : "<integer>",
-    "grid-row"                      : 1,
-    "grid-rows"                     : 1,
-    "grid-row-align"                : "start | end | center | stretch",
-    "grid-row-span"                 : "<integer>",
-    "grid-row-sizing"               : 1,
-    
-    //H
-    "hanging-punctuation"           : 1,
-    "height"                        : "<margin-width> | inherit",
-    "hyphenate-after"               : "<integer> | auto",
-    "hyphenate-before"              : "<integer> | auto",
-    "hyphenate-character"           : "<string> | auto",
-    "hyphenate-lines"               : "no-limit | <integer>",
-    "hyphenate-resource"            : 1,
-    "hyphens"                       : "none | manual | auto",
-    
-    //I
-    "icon"                          : 1,
-    "image-orientation"             : "angle | auto",
-    "image-rendering"               : 1,
-    "image-resolution"              : 1,
-    "inline-box-align"              : "initial | last | <integer>",
-    
-    //L
-    "left"                          : "<margin-width> | inherit",
-    "letter-spacing"                : "<length> | normal | inherit",
-    "line-height"                   : "<number> | <length> | <percentage> | normal | inherit",
-    "line-break"                    : "auto | loose | normal | strict",
-    "line-stacking"                 : 1,
-    "line-stacking-ruby"            : "exclude-ruby | include-ruby",
-    "line-stacking-shift"           : "consider-shifts | disregard-shifts",
-    "line-stacking-strategy"        : "inline-line-height | block-line-height | max-height | grid-height",
-    "list-style"                    : 1,
-    "list-style-image"              : "<uri> | none | inherit",
-    "list-style-position"           : "inside | outside | inherit",
-    "list-style-type"               : "disc | circle | square | decimal | decimal-leading-zero | lower-roman | upper-roman | lower-greek | lower-latin | upper-latin | armenian | georgian | lower-alpha | upper-alpha | none | inherit",
-    
-    //M
-    "margin"                        : { multi: "<margin-width> | inherit", max: 4 },
-    "margin-bottom"                 : "<margin-width> | inherit",
-    "margin-left"                   : "<margin-width> | inherit",
-    "margin-right"                  : "<margin-width> | inherit",
-    "margin-top"                    : "<margin-width> | inherit",
-    "mark"                          : 1,
-    "mark-after"                    : 1,
-    "mark-before"                   : 1,
-    "marks"                         : 1,
-    "marquee-direction"             : 1,
-    "marquee-play-count"            : 1,
-    "marquee-speed"                 : 1,
-    "marquee-style"                 : 1,
-    "max-height"                    : "<length> | <percentage> | none | inherit",
-    "max-width"                     : "<length> | <percentage> | none | inherit",
-    "min-height"                    : "<length> | <percentage> | inherit",
-    "min-width"                     : "<length> | <percentage> | inherit",
-    "move-to"                       : 1,
-    
-    //N
-    "nav-down"                      : 1,
-    "nav-index"                     : 1,
-    "nav-left"                      : 1,
-    "nav-right"                     : 1,
-    "nav-up"                        : 1,
-    
-    //O
-    "opacity"                       : "<number> | inherit",
-    "orphans"                       : "<integer> | inherit",
-    "outline"                       : 1,
-    "outline-color"                 : "<color> | invert | inherit",
-    "outline-offset"                : 1,
-    "outline-style"                 : "<border-style> | inherit",
-    "outline-width"                 : "<border-width> | inherit",
-    "overflow"                      : "visible | hidden | scroll | auto | inherit",
-    "overflow-style"                : 1,
-    "overflow-x"                    : 1,
-    "overflow-y"                    : 1,
-    
-    //P
-    "padding"                       : { multi: "<padding-width> | inherit", max: 4 },
-    "padding-bottom"                : "<padding-width> | inherit",
-    "padding-left"                  : "<padding-width> | inherit",
-    "padding-right"                 : "<padding-width> | inherit",
-    "padding-top"                   : "<padding-width> | inherit",
-    "page"                          : 1,
-    "page-break-after"              : "auto | always | avoid | left | right | inherit",
-    "page-break-before"             : "auto | always | avoid | left | right | inherit",
-    "page-break-inside"             : "auto | avoid | inherit",
-    "page-policy"                   : 1,
-    "pause"                         : 1,
-    "pause-after"                   : 1,
-    "pause-before"                  : 1,
-    "perspective"                   : 1,
-    "perspective-origin"            : 1,
-    "phonemes"                      : 1,
-    "pitch"                         : 1,
-    "pitch-range"                   : 1,
-    "play-during"                   : 1,
-    "position"                      : "static | relative | absolute | fixed | inherit",
-    "presentation-level"            : 1,
-    "punctuation-trim"              : 1,
-    
-    //Q
-    "quotes"                        : 1,
-    
-    //R
-    "rendering-intent"              : 1,
-    "resize"                        : 1,
-    "rest"                          : 1,
-    "rest-after"                    : 1,
-    "rest-before"                   : 1,
-    "richness"                      : 1,
-    "right"                         : "<margin-width> | inherit",
-    "rotation"                      : 1,
-    "rotation-point"                : 1,
-    "ruby-align"                    : 1,
-    "ruby-overhang"                 : 1,
-    "ruby-position"                 : 1,
-    "ruby-span"                     : 1,
-    
-    //S
-    "size"                          : 1,
-    "speak"                         : "normal | none | spell-out | inherit",
-    "speak-header"                  : "once | always | inherit",
-    "speak-numeral"                 : "digits | continuous | inherit",
-    "speak-punctuation"             : "code | none | inherit",
-    "speech-rate"                   : 1,
-    "src"                           : 1,
-    "stress"                        : 1,
-    "string-set"                    : 1,
-    
-    "table-layout"                  : "auto | fixed | inherit",
-    "tab-size"                      : "<integer> | <length>",
-    "target"                        : 1,
-    "target-name"                   : 1,
-    "target-new"                    : 1,
-    "target-position"               : 1,
-    "text-align"                    : "left | right | center | justify | inherit" ,
-    "text-align-last"               : 1,
-    "text-decoration"               : 1,
-    "text-emphasis"                 : 1,
-    "text-height"                   : 1,
-    "text-indent"                   : "<length> | <percentage> | inherit",
-    "text-justify"                  : "auto | none | inter-word | inter-ideograph | inter-cluster | distribute | kashida",
-    "text-outline"                  : 1,
-    "text-overflow"                 : 1,
-    "text-shadow"                   : 1,
-    "text-transform"                : "capitalize | uppercase | lowercase | none | inherit",
-    "text-wrap"                     : "normal | none | avoid",
-    "top"                           : "<margin-width> | inherit",
-    "transform"                     : 1,
-    "transform-origin"              : 1,
-    "transform-style"               : 1,
-    "transition"                    : 1,
-    "transition-delay"              : 1,
-    "transition-duration"           : 1,
-    "transition-property"           : 1,
-    "transition-timing-function"    : 1,
-    
-    //U
-    "unicode-bidi"                  : "normal | embed | bidi-override | inherit",
-    "user-modify"                   : "read-only | read-write | write-only | inherit",
-    "user-select"                   : "none | text | toggle | element | elements | all | inherit",
-    
-    //V
-    "vertical-align"                : "<percentage> | <length> | baseline | sub | super | top | text-top | middle | bottom | text-bottom | inherit",
-    "visibility"                    : "visible | hidden | collapse | inherit",
-    "voice-balance"                 : 1,
-    "voice-duration"                : 1,
-    "voice-family"                  : 1,
-    "voice-pitch"                   : 1,
-    "voice-pitch-range"             : 1,
-    "voice-rate"                    : 1,
-    "voice-stress"                  : 1,
-    "voice-volume"                  : 1,
-    "volume"                        : 1,
-    
-    //W
-    "white-space"                   : "normal | pre | nowrap | pre-wrap | pre-line | inherit",
-    "white-space-collapse"          : 1,
-    "widows"                        : "<integer> | inherit",
-    "width"                         : "<length> | <percentage> | auto | inherit" ,
-    "word-break"                    : "normal | keep-all | break-all",
-    "word-spacing"                  : "<length> | normal | inherit",
-    "word-wrap"                     : 1,
-    
-    //Z
-    "z-index"                       : "<integer> | auto | inherit",
-    "zoom"                          : "<number> | <percentage> | normal"
-};
-/*global SyntaxUnit, Parser*/
-/**
- * Represents a selector combinator (whitespace, +, >).
- * @namespace parserlib.css
- * @class PropertyName
- * @extends parserlib.util.SyntaxUnit
- * @constructor
- * @param {String} text The text representation of the unit. 
- * @param {String} hack The type of IE hack applied ("*", "_", or null).
- * @param {int} line The line of text on which the unit resides.
- * @param {int} col The column of text on which the unit resides.
- */
-function PropertyName(text, hack, line, col){
-    
-    SyntaxUnit.call(this, text, line, col, Parser.PROPERTY_NAME_TYPE);
-
-    /**
-     * The type of IE hack applied ("*", "_", or null).
-     * @type String
-     * @property hack
-     */
-    this.hack = hack;
-
-}
-
-PropertyName.prototype = new SyntaxUnit();
-PropertyName.prototype.constructor = PropertyName;
-PropertyName.prototype.toString = function(){
-    return (this.hack ? this.hack : "") + this.text;
-};
-
-/*global SyntaxUnit, Parser*/
-/**
- * Represents a single part of a CSS property value, meaning that it represents
- * just everything single part between ":" and ";". If there are multiple values
- * separated by commas, this type represents just one of the values.
- * @param {String[]} parts An array of value parts making up this value.
- * @param {int} line The line of text on which the unit resides.
- * @param {int} col The column of text on which the unit resides.
- * @namespace parserlib.css
- * @class PropertyValue
- * @extends parserlib.util.SyntaxUnit
- * @constructor
- */
-function PropertyValue(parts, line, col){
-
-    SyntaxUnit.call(this, parts.join(" "), line, col, Parser.PROPERTY_VALUE_TYPE);
-    
-    /**
-     * The parts that make up the selector.
-     * @type Array
-     * @property parts
-     */
-    this.parts = parts;
-    
-}
-
-PropertyValue.prototype = new SyntaxUnit();
-PropertyValue.prototype.constructor = PropertyValue;
-
-
-/*global SyntaxUnit, Parser*/
-/**
- * A utility class that allows for easy iteration over the various parts of a
- * property value.
- * @param {parserlib.css.PropertyValue} value The property value to iterate over.
- * @namespace parserlib.css
- * @class PropertyValueIterator
- * @constructor
- */
-function PropertyValueIterator(value){
-
-    /** 
-     * Iterator value
-     * @type int
-     * @property _i
-     * @private
-     */
-    this._i = 0;
-    
-    /**
-     * The parts that make up the value.
-     * @type Array
-     * @property _parts
-     * @private
-     */
-    this._parts = value.parts;
-    
-    /**
-     * Keeps track of bookmarks along the way.
-     * @type Array
-     * @property _marks
-     * @private
-     */
-    this._marks = [];
-    
-    /**
-     * Holds the original property value.
-     * @type parserlib.css.PropertyValue
-     * @property value
-     */
-    this.value = value;
-    
-}
-
-/**
- * Returns the total number of parts in the value.
- * @return {int} The total number of parts in the value.
- * @method count
- */
-PropertyValueIterator.prototype.count = function(){
-    return this._parts.length;
-};
-
-/**
- * Indicates if the iterator is positioned at the first item.
- * @return {Boolean} True if positioned at first item, false if not.
- * @method isFirst
- */
-PropertyValueIterator.prototype.isFirst = function(){
-    return this._i === 0;
-};
-
-/**
- * Indicates if there are more parts of the property value.
- * @return {Boolean} True if there are more parts, false if not.
- * @method hasNext
- */
-PropertyValueIterator.prototype.hasNext = function(){
-    return (this._i < this._parts.length);
-};
-
-/**
- * Marks the current spot in the iteration so it can be restored to
- * later on.
- * @return {void}
- * @method mark
- */
-PropertyValueIterator.prototype.mark = function(){
-    this._marks.push(this._i);
-};
-
-/**
- * Returns the next part of the property value or null if there is no next
- * part. Does not move the internal counter forward.
- * @return {parserlib.css.PropertyValuePart} The next part of the property value or null if there is no next
- * part.
- * @method peek
- */
-PropertyValueIterator.prototype.peek = function(count){
-    return this.hasNext() ? this._parts[this._i + (count || 0)] : null;
-};
-
-/**
- * Returns the next part of the property value or null if there is no next
- * part.
- * @return {parserlib.css.PropertyValuePart} The next part of the property value or null if there is no next
- * part.
- * @method next
- */
-PropertyValueIterator.prototype.next = function(){
-    return this.hasNext() ? this._parts[this._i++] : null;
-};
-
-/**
- * Returns the previous part of the property value or null if there is no
- * previous part.
- * @return {parserlib.css.PropertyValuePart} The previous part of the 
- * property value or null if there is no next part.
- * @method previous
- */
-PropertyValueIterator.prototype.previous = function(){
-    return this._i > 0 ? this._parts[--this._i] : null;
-};
-
-/**
- * Restores the last saved bookmark.
- * @return {void}
- * @method restore
- */
-PropertyValueIterator.prototype.restore = function(){
-    if (this._marks.length){
-        this._i = this._marks.pop();
-    }
-};
-
-
-/*global SyntaxUnit, Parser, Colors*/
-/**
- * Represents a single part of a CSS property value, meaning that it represents
- * just one part of the data between ":" and ";".
- * @param {String} text The text representation of the unit.
- * @param {int} line The line of text on which the unit resides.
- * @param {int} col The column of text on which the unit resides.
- * @namespace parserlib.css
- * @class PropertyValuePart
- * @extends parserlib.util.SyntaxUnit
- * @constructor
- */
-function PropertyValuePart(text, line, col){
-
-    SyntaxUnit.call(this, text, line, col, Parser.PROPERTY_VALUE_PART_TYPE);
-    
-    /**
-     * Indicates the type of value unit.
-     * @type String
-     * @property type
-     */
-    this.type = "unknown";
-
-    //figure out what type of data it is
-    
-    var temp;
-    
-    //it is a measurement?
-    if (/^([+\-]?[\d\.]+)([a-z]+)$/i.test(text)){  //dimension
-        this.type = "dimension";
-        this.value = +RegExp.$1;
-        this.units = RegExp.$2;
-        
-        //try to narrow down
-        switch(this.units.toLowerCase()){
-        
-            case "em":
-            case "rem":
-            case "ex":
-            case "px":
-            case "cm":
-            case "mm":
-            case "in":
-            case "pt":
-            case "pc":
-            case "ch":
-                this.type = "length";
-                break;
-                
-            case "deg":
-            case "rad":
-            case "grad":
-                this.type = "angle";
-                break;
-            
-            case "ms":
-            case "s":
-                this.type = "time";
-                break;
-            
-            case "hz":
-            case "khz":
-                this.type = "frequency";
-                break;
-            
-            case "dpi":
-            case "dpcm":
-                this.type = "resolution";
-                break;
-                
-            //default
-                
-        }
-        
-    } else if (/^([+\-]?[\d\.]+)%$/i.test(text)){  //percentage
-        this.type = "percentage";
-        this.value = +RegExp.$1;
-    } else if (/^([+\-]?[\d\.]+)%$/i.test(text)){  //percentage
-        this.type = "percentage";
-        this.value = +RegExp.$1;
-    } else if (/^([+\-]?\d+)$/i.test(text)){  //integer
-        this.type = "integer";
-        this.value = +RegExp.$1;
-    } else if (/^([+\-]?[\d\.]+)$/i.test(text)){  //number
-        this.type = "number";
-        this.value = +RegExp.$1;
-    
-    } else if (/^#([a-f0-9]{3,6})/i.test(text)){  //hexcolor
-        this.type = "color";
-        temp = RegExp.$1;
-        if (temp.length == 3){
-            this.red    = parseInt(temp.charAt(0)+temp.charAt(0),16);
-            this.green  = parseInt(temp.charAt(1)+temp.charAt(1),16);
-            this.blue   = parseInt(temp.charAt(2)+temp.charAt(2),16);            
-        } else {
-            this.red    = parseInt(temp.substring(0,2),16);
-            this.green  = parseInt(temp.substring(2,4),16);
-            this.blue   = parseInt(temp.substring(4,6),16);            
-        }
-    } else if (/^rgb\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*\)/i.test(text)){ //rgb() color with absolute numbers
-        this.type   = "color";
-        this.red    = +RegExp.$1;
-        this.green  = +RegExp.$2;
-        this.blue   = +RegExp.$3;
-    } else if (/^rgb\(\s*(\d+)%\s*,\s*(\d+)%\s*,\s*(\d+)%\s*\)/i.test(text)){ //rgb() color with percentages
-        this.type   = "color";
-        this.red    = +RegExp.$1 * 255 / 100;
-        this.green  = +RegExp.$2 * 255 / 100;
-        this.blue   = +RegExp.$3 * 255 / 100;
-    } else if (/^rgba\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*,\s*([\d\.]+)\s*\)/i.test(text)){ //rgba() color with absolute numbers
-        this.type   = "color";
-        this.red    = +RegExp.$1;
-        this.green  = +RegExp.$2;
-        this.blue   = +RegExp.$3;
-        this.alpha  = +RegExp.$4;
-    } else if (/^rgba\(\s*(\d+)%\s*,\s*(\d+)%\s*,\s*(\d+)%\s*,\s*([\d\.]+)\s*\)/i.test(text)){ //rgba() color with percentages
-        this.type   = "color";
-        this.red    = +RegExp.$1 * 255 / 100;
-        this.green  = +RegExp.$2 * 255 / 100;
-        this.blue   = +RegExp.$3 * 255 / 100;
-        this.alpha  = +RegExp.$4;        
-    } else if (/^hsl\(\s*(\d+)\s*,\s*(\d+)%\s*,\s*(\d+)%\s*\)/i.test(text)){ //hsl()
-        this.type   = "color";
-        this.hue    = +RegExp.$1;
-        this.saturation = +RegExp.$2 / 100;
-        this.lightness  = +RegExp.$3 / 100;        
-    } else if (/^hsla\(\s*(\d+)\s*,\s*(\d+)%\s*,\s*(\d+)%\s*,\s*([\d\.]+)\s*\)/i.test(text)){ //hsla() color with percentages
-        this.type   = "color";
-        this.hue    = +RegExp.$1;
-        this.saturation = +RegExp.$2 / 100;
-        this.lightness  = +RegExp.$3 / 100;        
-        this.alpha  = +RegExp.$4;        
-    } else if (/^url\(["']?([^\)"']+)["']?\)/i.test(text)){ //URI
-        this.type   = "uri";
-        this.uri    = RegExp.$1;
-    } else if (/^([^\(]+)\(/i.test(text)){
-        this.type   = "function";
-        this.name   = RegExp.$1;
-        this.value  = text;
-    } else if (/^["'][^"']*["']/.test(text)){    //string
-        this.type   = "string";
-        this.value  = eval(text);
-    } else if (Colors[text.toLowerCase()]){  //named color
-        this.type   = "color";
-        temp        = Colors[text.toLowerCase()].substring(1);
-        this.red    = parseInt(temp.substring(0,2),16);
-        this.green  = parseInt(temp.substring(2,4),16);
-        this.blue   = parseInt(temp.substring(4,6),16);         
-    } else if (/^[\,\/]$/.test(text)){
-        this.type   = "operator";
-        this.value  = text;
-    } else if (/^[a-z\-\u0080-\uFFFF][a-z0-9\-\u0080-\uFFFF]*$/i.test(text)){
-        this.type   = "identifier";
-        this.value  = text;
-    }
-
-}
-
-PropertyValuePart.prototype = new SyntaxUnit();
-PropertyValuePart.prototype.constructor = PropertyValuePart;
-
-/**
- * Create a new syntax unit based solely on the given token.
- * Convenience method for creating a new syntax unit when
- * it represents a single token instead of multiple.
- * @param {Object} token The token object to represent.
- * @return {parserlib.css.PropertyValuePart} The object representing the token.
- * @static
- * @method fromToken
- */
-PropertyValuePart.fromToken = function(token){
-    return new PropertyValuePart(token.value, token.startLine, token.startCol);
-};
-var Pseudos = {
-    ":first-letter": 1,
-    ":first-line":   1,
-    ":before":       1,
-    ":after":        1
-};
-
-Pseudos.ELEMENT = 1;
-Pseudos.CLASS = 2;
-
-Pseudos.isElement = function(pseudo){
-    return pseudo.indexOf("::") === 0 || Pseudos[pseudo.toLowerCase()] == Pseudos.ELEMENT;
-};
-/*global SyntaxUnit, Parser, Specificity*/
-/**
- * Represents an entire single selector, including all parts but not
- * including multiple selectors (those separated by commas).
- * @namespace parserlib.css
- * @class Selector
- * @extends parserlib.util.SyntaxUnit
- * @constructor
- * @param {Array} parts Array of selectors parts making up this selector.
- * @param {int} line The line of text on which the unit resides.
- * @param {int} col The column of text on which the unit resides.
- */
-function Selector(parts, line, col){
-    
-    SyntaxUnit.call(this, parts.join(" "), line, col, Parser.SELECTOR_TYPE);
-    
-    /**
-     * The parts that make up the selector.
-     * @type Array
-     * @property parts
-     */
-    this.parts = parts;
-    
-    /**
-     * The specificity of the selector.
-     * @type parserlib.css.Specificity
-     * @property specificity
-     */
-    this.specificity = Specificity.calculate(this);
-
-}
-
-Selector.prototype = new SyntaxUnit();
-Selector.prototype.constructor = Selector;
-
-
-/*global SyntaxUnit, Parser*/
-/**
- * Represents a single part of a selector string, meaning a single set of
- * element name and modifiers. This does not include combinators such as
- * spaces, +, >, etc.
- * @namespace parserlib.css
- * @class SelectorPart
- * @extends parserlib.util.SyntaxUnit
- * @constructor
- * @param {String} elementName The element name in the selector or null
- *      if there is no element name.
- * @param {Array} modifiers Array of individual modifiers for the element.
- *      May be empty if there are none.
- * @param {String} text The text representation of the unit. 
- * @param {int} line The line of text on which the unit resides.
- * @param {int} col The column of text on which the unit resides.
- */
-function SelectorPart(elementName, modifiers, text, line, col){
-    
-    SyntaxUnit.call(this, text, line, col, Parser.SELECTOR_PART_TYPE);
-
-    /**
-     * The tag name of the element to which this part
-     * of the selector affects.
-     * @type String
-     * @property elementName
-     */
-    this.elementName = elementName;
-    
-    /**
-     * The parts that come after the element name, such as class names, IDs,
-     * pseudo classes/elements, etc.
-     * @type Array
-     * @property modifiers
-     */
-    this.modifiers = modifiers;
-
-}
-
-SelectorPart.prototype = new SyntaxUnit();
-SelectorPart.prototype.constructor = SelectorPart;
-
-
-/*global SyntaxUnit, Parser*/
-/**
- * Represents a selector modifier string, meaning a class name, element name,
- * element ID, pseudo rule, etc.
- * @namespace parserlib.css
- * @class SelectorSubPart
- * @extends parserlib.util.SyntaxUnit
- * @constructor
- * @param {String} text The text representation of the unit. 
- * @param {String} type The type of selector modifier.
- * @param {int} line The line of text on which the unit resides.
- * @param {int} col The column of text on which the unit resides.
- */
-function SelectorSubPart(text, type, line, col){
-    
-    SyntaxUnit.call(this, text, line, col, Parser.SELECTOR_SUB_PART_TYPE);
-
-    /**
-     * The type of modifier.
-     * @type String
-     * @property type
-     */
-    this.type = type;
-    
-    /**
-     * Some subparts have arguments, this represents them.
-     * @type Array
-     * @property args
-     */
-    this.args = [];
-
-}
-
-SelectorSubPart.prototype = new SyntaxUnit();
-SelectorSubPart.prototype.constructor = SelectorSubPart;
-
-
-/*global Pseudos, SelectorPart*/
-/**
- * Represents a selector's specificity.
- * @namespace parserlib.css
- * @class Specificity
- * @constructor
- * @param {int} a Should be 1 for inline styles, zero for stylesheet styles
- * @param {int} b Number of ID selectors
- * @param {int} c Number of classes and pseudo classes
- * @param {int} d Number of element names and pseudo elements
- */
-function Specificity(a, b, c, d){
-    this.a = a;
-    this.b = b;
-    this.c = c;
-    this.d = d;
-}
-
-Specificity.prototype = {
-    constructor: Specificity,
-    
-    /**
-     * Compare this specificity to another.
-     * @param {Specificity} other The other specificity to compare to.
-     * @return {int} -1 if the other specificity is larger, 1 if smaller, 0 if equal.
-     * @method compare
-     */
-    compare: function(other){
-        var comps = ["a", "b", "c", "d"],
-            i, len;
-            
-        for (i=0, len=comps.length; i < len; i++){
-            if (this[comps[i]] < other[comps[i]]){
-                return -1;
-            } else if (this[comps[i]] > other[comps[i]]){
-                return 1;
-            }
-        }
-        
-        return 0;
-    },
-    
-    /**
-     * Creates a numeric value for the specificity.
-     * @return {int} The numeric value for the specificity.
-     * @method valueOf
-     */
-    valueOf: function(){
-        return (this.a * 1000) + (this.b * 100) + (this.c * 10) + this.d;
-    },
-    
-    /**
-     * Returns a string representation for specificity.
-     * @return {String} The string representation of specificity.
-     * @method toString
-     */
-    toString: function(){
-        return this.a + "," + this.b + "," + this.c + "," + this.d;
-    }
-
-};
-
-/**
- * Calculates the specificity of the given selector.
- * @param {parserlib.css.Selector} The selector to calculate specificity for.
- * @return {parserlib.css.Specificity} The specificity of the selector.
- * @static
- * @method calculate
- */
-Specificity.calculate = function(selector){
-
-    var i, len,
-        part,
-        b=0, c=0, d=0;
-        
-    function updateValues(part){
-    
-        var i, j, len, num,
-            elementName = part.elementName ? part.elementName.text : "",
-            modifier;
-    
-        if (elementName && elementName.charAt(elementName.length-1) != "*") {
-            d++;
-        }    
-    
-        for (i=0, len=part.modifiers.length; i < len; i++){
-            modifier = part.modifiers[i];
-            switch(modifier.type){
-                case "class":
-                case "attribute":
-                    c++;
-                    break;
-                    
-                case "id":
-                    b++;
-                    break;
-                    
-                case "pseudo":
-                    if (Pseudos.isElement(modifier.text)){
-                        d++;
-                    } else {
-                        c++;
-                    }                    
-                    break;
-                    
-                case "not":
-                    for (j=0, num=modifier.args.length; j < num; j++){
-                        updateValues(modifier.args[j]);
-                    }
-            }    
-         }
-    }
-    
-    for (i=0, len=selector.parts.length; i < len; i++){
-        part = selector.parts[i];
-        
-        if (part instanceof SelectorPart){
-            updateValues(part);                
-        }
-    }
-    
-    return new Specificity(0, b, c, d);
-};
-
-/*global Tokens, TokenStreamBase*/
-
-var h = /^[0-9a-fA-F]$/,
-    nonascii = /^[\u0080-\uFFFF]$/,
-    nl = /\n|\r\n|\r|\f/;
-
-//-----------------------------------------------------------------------------
-// Helper functions
-//-----------------------------------------------------------------------------
-
-
-function isHexDigit(c){
-    return c !== null && h.test(c);
-}
-
-function isDigit(c){
-    return c !== null && /\d/.test(c);
-}
-
-function isWhitespace(c){
-    return c !== null && /\s/.test(c);
-}
-
-function isNewLine(c){
-    return c !== null && nl.test(c);
-}
-
-function isNameStart(c){
-    return c !== null && (/[a-z_\u0080-\uFFFF\\]/i.test(c));
-}
-
-function isNameChar(c){
-    return c !== null && (isNameStart(c) || /[0-9\-\\]/.test(c));
-}
-
-function isIdentStart(c){
-    return c !== null && (isNameStart(c) || /\-\\/.test(c));
-}
-
-function mix(receiver, supplier){
-	for (var prop in supplier){
-		if (supplier.hasOwnProperty(prop)){
-			receiver[prop] = supplier[prop];
-		}
-	}
-	return receiver;
-}
-
-//-----------------------------------------------------------------------------
-// CSS Token Stream
-//-----------------------------------------------------------------------------
-
-
-/**
- * A token stream that produces CSS tokens.
- * @param {String|Reader} input The source of text to tokenize.
- * @constructor
- * @class TokenStream
- * @namespace parserlib.css
- */
-function TokenStream(input){
-	TokenStreamBase.call(this, input, Tokens);
-}
-
-TokenStream.prototype = mix(new TokenStreamBase(), {
-
-    /**
-     * Overrides the TokenStreamBase method of the same name
-     * to produce CSS tokens.
-     * @param {variant} channel The name of the channel to use
-     *      for the next token.
-     * @return {Object} A token object representing the next token.
-     * @method _getToken
-     * @private
-     */
-    _getToken: function(channel){
-
-        var c,
-            reader = this._reader,
-            token   = null,
-            startLine   = reader.getLine(),
-            startCol    = reader.getCol();
-
-        c = reader.read();
-
-
-        while(c){
-            switch(c){
-
-                /*
-                 * Potential tokens:
-                 * - COMMENT
-                 * - SLASH
-                 * - CHAR
-                 */
-                case "/":
-
-                    if(reader.peek() == "*"){
-                        token = this.commentToken(c, startLine, startCol);
-                    } else {
-                        token = this.charToken(c, startLine, startCol);
-                    }
-                    break;
-
-                /*
-                 * Potential tokens:
-                 * - DASHMATCH
-                 * - INCLUDES
-                 * - PREFIXMATCH
-                 * - SUFFIXMATCH
-                 * - SUBSTRINGMATCH
-                 * - CHAR
-                 */
-                case "|":
-                case "~":
-                case "^":
-                case "$":
-                case "*":
-                    if(reader.peek() == "="){
-                        token = this.comparisonToken(c, startLine, startCol);
-                    } else {
-                        token = this.charToken(c, startLine, startCol);
-                    }
-                    break;
-
-                /*
-                 * Potential tokens:
-                 * - STRING
-                 * - INVALID
-                 */
-                case "\"":
-                case "'":
-                    token = this.stringToken(c, startLine, startCol);
-                    break;
-
-                /*
-                 * Potential tokens:
-                 * - HASH
-                 * - CHAR
-                 */
-                case "#":
-                    if (isNameChar(reader.peek())){
-                        token = this.hashToken(c, startLine, startCol);
-                    } else {
-                        token = this.charToken(c, startLine, startCol);
-                    }
-                    break;
-
-                /*
-                 * Potential tokens:
-                 * - DOT
-                 * - NUMBER
-                 * - DIMENSION
-                 * - PERCENTAGE
-                 */
-                case ".":
-                    if (isDigit(reader.peek())){
-                        token = this.numberToken(c, startLine, startCol);
-                    } else {
-                        token = this.charToken(c, startLine, startCol);
-                    }
-                    break;
-
-                /*
-                 * Potential tokens:
-                 * - CDC
-                 * - MINUS
-                 * - NUMBER
-                 * - DIMENSION
-                 * - PERCENTAGE
-                 */
-                case "-":
-                    if (reader.peek() == "-"){  //could be closing HTML-style comment
-                        token = this.htmlCommentEndToken(c, startLine, startCol);
-                    } else if (isNameStart(reader.peek())){
-                        token = this.identOrFunctionToken(c, startLine, startCol);
-                    } else {
-                        token = this.charToken(c, startLine, startCol);
-                    }
-                    break;
-
-                /*
-                 * Potential tokens:
-                 * - IMPORTANT_SYM
-                 * - CHAR
-                 */
-                case "!":
-                    token = this.importantToken(c, startLine, startCol);
-                    break;
-
-                /*
-                 * Any at-keyword or CHAR
-                 */
-                case "@":
-                    token = this.atRuleToken(c, startLine, startCol);
-                    break;
-
-                /*
-                 * Potential tokens:
-                 * - NOT
-                 * - CHAR
-                 */
-                case ":":
-                    token = this.notToken(c, startLine, startCol);
-                    break;
-
-                /*
-                 * Potential tokens:
-                 * - CDO
-                 * - CHAR
-                 */
-                case "<":
-                    token = this.htmlCommentStartToken(c, startLine, startCol);
-                    break;
-
-                /*
-                 * Potential tokens:
-                 * - UNICODE_RANGE
-                 * - URL
-                 * - CHAR
-                 */
-                case "U":
-                case "u":
-                    if (reader.peek() == "+"){
-                        token = this.unicodeRangeToken(c, startLine, startCol);
-                        break;
-                    }
-                    /* falls through */
-                default:
-
-                    /*
-                     * Potential tokens:
-                     * - NUMBER
-                     * - DIMENSION
-                     * - LENGTH
-                     * - FREQ
-                     * - TIME
-                     * - EMS
-                     * - EXS
-                     * - ANGLE
-                     */
-                    if (isDigit(c)){
-                        token = this.numberToken(c, startLine, startCol);
-                    } else
-
-                    /*
-                     * Potential tokens:
-                     * - S
-                     */
-                    if (isWhitespace(c)){
-                        token = this.whitespaceToken(c, startLine, startCol);
-                    } else
-
-                    /*
-                     * Potential tokens:
-                     * - IDENT
-                     */
-                    if (isIdentStart(c)){
-                        token = this.identOrFunctionToken(c, startLine, startCol);
-                    } else
-
-                    /*
-                     * Potential tokens:
-                     * - CHAR
-                     * - PLUS
-                     */
-                    {
-                        token = this.charToken(c, startLine, startCol);
-                    }
-
-
-
-
-
-
-            }
-
-            //make sure this token is wanted
-            //TODO: check channel
-            break;
-        }
-
-        if (!token && c === null){
-            token = this.createToken(Tokens.EOF,null,startLine,startCol);
-        }
-
-        return token;
-    },
-
-    //-------------------------------------------------------------------------
-    // Methods to create tokens
-    //-------------------------------------------------------------------------
-
-    /**
-     * Produces a token based on available data and the current
-     * reader position information. This method is called by other
-     * private methods to create tokens and is never called directly.
-     * @param {int} tt The token type.
-     * @param {String} value The text value of the token.
-     * @param {int} startLine The beginning line for the character.
-     * @param {int} startCol The beginning column for the character.
-     * @param {Object} options (Optional) Specifies a channel property
-     *      to indicate that a different channel should be scanned
-     *      and/or a hide property indicating that the token should
-     *      be hidden.
-     * @return {Object} A token object.
-     * @method createToken
-     */
-    createToken: function(tt, value, startLine, startCol, options){
-        var reader = this._reader;
-        options = options || {};
-
-        return {
-            value:      value,
-            type:       tt,
-            channel:    options.channel,
-            hide:       options.hide || false,
-            startLine:  startLine,
-            startCol:   startCol,
-            endLine:    reader.getLine(),
-            endCol:     reader.getCol()
-        };
-    },
-
-    //-------------------------------------------------------------------------
-    // Methods to create specific tokens
-    //-------------------------------------------------------------------------
-
-    /**
-     * Produces a token for any at-rule. If the at-rule is unknown, then
-     * the token is for a single "@" character.
-     * @param {String} first The first character for the token.
-     * @param {int} startLine The beginning line for the character.
-     * @param {int} startCol The beginning column for the character.
-     * @return {Object} A token object.
-     * @method atRuleToken
-     */
-    atRuleToken: function(first, startLine, startCol){
-        var rule    = first,
-            reader  = this._reader,
-            tt      = Tokens.CHAR,
-            valid   = false,
-            ident,
-            c;
-
-        /*
-         * First, mark where we are. There are only four @ rules,
-         * so anything else is really just an invalid token.
-         * Basically, if this doesn't match one of the known @
-         * rules, just return '@' as an unknown token and allow
-         * parsing to continue after that point.
-         */
-        reader.mark();
-
-        //try to find the at-keyword
-        ident = this.readName();
-        rule = first + ident;
-        tt = Tokens.type(rule.toLowerCase());
-
-        //if it's not valid, use the first character only and reset the reader
-        if (tt == Tokens.CHAR || tt == Tokens.UNKNOWN){
-            if (rule.length > 1){
-                tt = Tokens.UNKNOWN_SYM;                
-            } else {
-                tt = Tokens.CHAR;
-                rule = first;
-                reader.reset();
-            }
-        }
-
-        return this.createToken(tt, rule, startLine, startCol);
-    },
-
-    /**
-     * Produces a character token based on the given character
-     * and location in the stream. If there's a special (non-standard)
-     * token name, this is used; otherwise CHAR is used.
-     * @param {String} c The character for the token.
-     * @param {int} startLine The beginning line for the character.
-     * @param {int} startCol The beginning column for the character.
-     * @return {Object} A token object.
-     * @method charToken
-     */
-    charToken: function(c, startLine, startCol){
-        var tt = Tokens.type(c);
-
-        if (tt == -1){
-            tt = Tokens.CHAR;
-        }
-
-        return this.createToken(tt, c, startLine, startCol);
-    },
-
-    /**
-     * Produces a character token based on the given character
-     * and location in the stream. If there's a special (non-standard)
-     * token name, this is used; otherwise CHAR is used.
-     * @param {String} first The first character for the token.
-     * @param {int} startLine The beginning line for the character.
-     * @param {int} startCol The beginning column for the character.
-     * @return {Object} A token object.
-     * @method commentToken
-     */
-    commentToken: function(first, startLine, startCol){
-        var reader  = this._reader,
-            comment = this.readComment(first);
-
-        return this.createToken(Tokens.COMMENT, comment, startLine, startCol);
-    },
-
-    /**
-     * Produces a comparison token based on the given character
-     * and location in the stream. The next character must be
-     * read and is already known to be an equals sign.
-     * @param {String} c The character for the token.
-     * @param {int} startLine The beginning line for the character.
-     * @param {int} startCol The beginning column for the character.
-     * @return {Object} A token object.
-     * @method comparisonToken
-     */
-    comparisonToken: function(c, startLine, startCol){
-        var reader  = this._reader,
-            comparison  = c + reader.read(),
-            tt      = Tokens.type(comparison) || Tokens.CHAR;
-
-        return this.createToken(tt, comparison, startLine, startCol);
-    },
-
-    /**
-     * Produces a hash token based on the specified information. The
-     * first character provided is the pound sign (#) and then this
-     * method reads a name afterward.
-     * @param {String} first The first character (#) in the hash name.
-     * @param {int} startLine The beginning line for the character.
-     * @param {int} startCol The beginning column for the character.
-     * @return {Object} A token object.
-     * @method hashToken
-     */
-    hashToken: function(first, startLine, startCol){
-        var reader  = this._reader,
-            name    = this.readName(first);
-
-        return this.createToken(Tokens.HASH, name, startLine, startCol);
-    },
-
-    /**
-     * Produces a CDO or CHAR token based on the specified information. The
-     * first character is provided and the rest is read by the function to determine
-     * the correct token to create.
-     * @param {String} first The first character in the token.
-     * @param {int} startLine The beginning line for the character.
-     * @param {int} startCol The beginning column for the character.
-     * @return {Object} A token object.
-     * @method htmlCommentStartToken
-     */
-    htmlCommentStartToken: function(first, startLine, startCol){
-        var reader      = this._reader,
-            text        = first;
-
-        reader.mark();
-        text += reader.readCount(3);
-
-        if (text == "<!--"){
-            return this.createToken(Tokens.CDO, text, startLine, startCol);
-        } else {
-            reader.reset();
-            return this.charToken(first, startLine, startCol);
-        }
-    },
-
-    /**
-     * Produces a CDC or CHAR token based on the specified information. The
-     * first character is provided and the rest is read by the function to determine
-     * the correct token to create.
-     * @param {String} first The first character in the token.
-     * @param {int} startLine The beginning line for the character.
-     * @param {int} startCol The beginning column for the character.
-     * @return {Object} A token object.
-     * @method htmlCommentEndToken
-     */
-    htmlCommentEndToken: function(first, startLine, startCol){
-        var reader      = this._reader,
-            text        = first;
-
-        reader.mark();
-        text += reader.readCount(2);
-
-        if (text == "-->"){
-            return this.createToken(Tokens.CDC, text, startLine, startCol);
-        } else {
-            reader.reset();
-            return this.charToken(first, startLine, startCol);
-        }
-    },
-
-    /**
-     * Produces an IDENT or FUNCTION token based on the specified information. The
-     * first character is provided and the rest is read by the function to determine
-     * the correct token to create.
-     * @param {String} first The first character in the identifier.
-     * @param {int} startLine The beginning line for the character.
-     * @param {int} startCol The beginning column for the character.
-     * @return {Object} A token object.
-     * @method identOrFunctionToken
-     */
-    identOrFunctionToken: function(first, startLine, startCol){
-        var reader  = this._reader,
-            ident   = this.readName(first),
-            tt      = Tokens.IDENT;
-
-        //if there's a left paren immediately after, it's a URI or function
-        if (reader.peek() == "("){
-            ident += reader.read();
-            if (ident.toLowerCase() == "url("){
-                tt = Tokens.URI;
-                ident = this.readURI(ident);
-
-                //didn't find a valid URL or there's no closing paren
-                if (ident.toLowerCase() == "url("){
-                    tt = Tokens.FUNCTION;
-                }
-            } else {
-                tt = Tokens.FUNCTION;
-            }
-        } else if (reader.peek() == ":"){  //might be an IE function
-
-            //IE-specific functions always being with progid:
-            if (ident.toLowerCase() == "progid"){
-                ident += reader.readTo("(");
-                tt = Tokens.IE_FUNCTION;
-            }
-        }
-
-        return this.createToken(tt, ident, startLine, startCol);
-    },
-
-    /**
-     * Produces an IMPORTANT_SYM or CHAR token based on the specified information. The
-     * first character is provided and the rest is read by the function to determine
-     * the correct token to create.
-     * @param {String} first The first character in the token.
-     * @param {int} startLine The beginning line for the character.
-     * @param {int} startCol The beginning column for the character.
-     * @return {Object} A token object.
-     * @method importantToken
-     */
-    importantToken: function(first, startLine, startCol){
-        var reader      = this._reader,
-            important   = first,
-            tt          = Tokens.CHAR,
-            temp,
-            c;
-
-        reader.mark();
-        c = reader.read();
-
-        while(c){
-
-            //there can be a comment in here
-            if (c == "/"){
-
-                //if the next character isn't a star, then this isn't a valid !important token
-                if (reader.peek() != "*"){
-                    break;
-                } else {
-                    temp = this.readComment(c);
-                    if (temp === ""){    //broken!
-                        break;
-                    }
-                }
-            } else if (isWhitespace(c)){
-                important += c + this.readWhitespace();
-            } else if (/i/i.test(c)){
-                temp = reader.readCount(8);
-                if (/mportant/i.test(temp)){
-                    important += c + temp;
-                    tt = Tokens.IMPORTANT_SYM;
-
-                }
-                break;  //we're done
-            } else {
-                break;
-            }
-
-            c = reader.read();
-        }
-
-        if (tt == Tokens.CHAR){
-            reader.reset();
-            return this.charToken(first, startLine, startCol);
-        } else {
-            return this.createToken(tt, important, startLine, startCol);
-        }
-
-
-    },
-
-    /**
-     * Produces a NOT or CHAR token based on the specified information. The
-     * first character is provided and the rest is read by the function to determine
-     * the correct token to create.
-     * @param {String} first The first character in the token.
-     * @param {int} startLine The beginning line for the character.
-     * @param {int} startCol The beginning column for the character.
-     * @return {Object} A token object.
-     * @method notToken
-     */
-    notToken: function(first, startLine, startCol){
-        var reader      = this._reader,
-            text        = first;
-
-        reader.mark();
-        text += reader.readCount(4);
-
-        if (text.toLowerCase() == ":not("){
-            return this.createToken(Tokens.NOT, text, startLine, startCol);
-        } else {
-            reader.reset();
-            return this.charToken(first, startLine, startCol);
-        }
-    },
-
-    /**
-     * Produces a number token based on the given character
-     * and location in the stream. This may return a token of
-     * NUMBER, EMS, EXS, LENGTH, ANGLE, TIME, FREQ, DIMENSION,
-     * or PERCENTAGE.
-     * @param {String} first The first character for the token.
-     * @param {int} startLine The beginning line for the character.
-     * @param {int} startCol The beginning column for the character.
-     * @return {Object} A token object.
-     * @method numberToken
-     */
-    numberToken: function(first, startLine, startCol){
-        var reader  = this._reader,
-            value   = this.readNumber(first),
-            ident,
-            tt      = Tokens.NUMBER,
-            c       = reader.peek();
-
-        if (isIdentStart(c)){
-            ident = this.readName(reader.read());
-            value += ident;
-
-            if (/^em$|^ex$|^px$|^gd$|^rem$|^vw$|^vh$|^vm$|^ch$|^cm$|^mm$|^in$|^pt$|^pc$/i.test(ident)){
-                tt = Tokens.LENGTH;
-            } else if (/^deg|^rad$|^grad$/i.test(ident)){
-                tt = Tokens.ANGLE;
-            } else if (/^ms$|^s$/i.test(ident)){
-                tt = Tokens.TIME;
-            } else if (/^hz$|^khz$/i.test(ident)){
-                tt = Tokens.FREQ;
-            } else if (/^dpi$|^dpcm$/i.test(ident)){
-                tt = Tokens.RESOLUTION;
-            } else {
-                tt = Tokens.DIMENSION;
-            }
-
-        } else if (c == "%"){
-            value += reader.read();
-            tt = Tokens.PERCENTAGE;
-        }
-
-        return this.createToken(tt, value, startLine, startCol);
-    },
-
-    /**
-     * Produces a string token based on the given character
-     * and location in the stream. Since strings may be indicated
-     * by single or double quotes, a failure to match starting
-     * and ending quotes results in an INVALID token being generated.
-     * The first character in the string is passed in and then
-     * the rest are read up to and including the final quotation mark.
-     * @param {String} first The first character in the string.
-     * @param {int} startLine The beginning line for the character.
-     * @param {int} startCol The beginning column for the character.
-     * @return {Object} A token object.
-     * @method stringToken
-     */
-    stringToken: function(first, startLine, startCol){
-        var delim   = first,
-            string  = first,
-            reader  = this._reader,
-            prev    = first,
-            tt      = Tokens.STRING,
-            c       = reader.read();
-
-        while(c){
-            string += c;
-
-            //if the delimiter is found with an escapement, we're done.
-            if (c == delim && prev != "\\"){
-                break;
-            }
-
-            //if there's a newline without an escapement, it's an invalid string
-            if (isNewLine(reader.peek()) && c != "\\"){
-                tt = Tokens.INVALID;
-                break;
-            }
-
-            //save previous and get next
-            prev = c;
-            c = reader.read();
-        }
-
-        //if c is null, that means we're out of input and the string was never closed
-        if (c === null){
-            tt = Tokens.INVALID;
-        }
-
-        return this.createToken(tt, string, startLine, startCol);
-    },
-
-    unicodeRangeToken: function(first, startLine, startCol){
-        var reader  = this._reader,
-            value   = first,
-            temp,
-            tt      = Tokens.CHAR;
-
-        //then it should be a unicode range
-        if (reader.peek() == "+"){
-            reader.mark();
-            value += reader.read();
-            value += this.readUnicodeRangePart(true);
-
-            //ensure there's an actual unicode range here
-            if (value.length == 2){
-                reader.reset();
-            } else {
-
-                tt = Tokens.UNICODE_RANGE;
-
-                //if there's a ? in the first part, there can't be a second part
-                if (value.indexOf("?") == -1){
-
-                    if (reader.peek() == "-"){
-                        reader.mark();
-                        temp = reader.read();
-                        temp += this.readUnicodeRangePart(false);
-
-                        //if there's not another value, back up and just take the first
-                        if (temp.length == 1){
-                            reader.reset();
-                        } else {
-                            value += temp;
-                        }
-                    }
-
-                }
-            }
-        }
-
-        return this.createToken(tt, value, startLine, startCol);
-    },
-
-    /**
-     * Produces a S token based on the specified information. Since whitespace
-     * may have multiple characters, this consumes all whitespace characters
-     * into a single token.
-     * @param {String} first The first character in the token.
-     * @param {int} startLine The beginning line for the character.
-     * @param {int} startCol The beginning column for the character.
-     * @return {Object} A token object.
-     * @method whitespaceToken
-     */
-    whitespaceToken: function(first, startLine, startCol){
-        var reader  = this._reader,
-            value   = first + this.readWhitespace();
-        return this.createToken(Tokens.S, value, startLine, startCol);
-    },
-
-
-
-
-    //-------------------------------------------------------------------------
-    // Methods to read values from the string stream
-    //-------------------------------------------------------------------------
-
-    readUnicodeRangePart: function(allowQuestionMark){
-        var reader  = this._reader,
-            part = "",
-            c       = reader.peek();
-
-        //first read hex digits
-        while(isHexDigit(c) && part.length < 6){
-            reader.read();
-            part += c;
-            c = reader.peek();
-        }
-
-        //then read question marks if allowed
-        if (allowQuestionMark){
-            while(c == "?" && part.length < 6){
-                reader.read();
-                part += c;
-                c = reader.peek();
-            }
-        }
-
-        //there can't be any other characters after this point
-
-        return part;
-    },
-
-    readWhitespace: function(){
-        var reader  = this._reader,
-            whitespace = "",
-            c       = reader.peek();
-
-        while(isWhitespace(c)){
-            reader.read();
-            whitespace += c;
-            c = reader.peek();
-        }
-
-        return whitespace;
-    },
-    readNumber: function(first){
-        var reader  = this._reader,
-            number  = first,
-            hasDot  = (first == "."),
-            c       = reader.peek();
-
-
-        while(c){
-            if (isDigit(c)){
-                number += reader.read();
-            } else if (c == "."){
-                if (hasDot){
-                    break;
-                } else {
-                    hasDot = true;
-                    number += reader.read();
-                }
-            } else {
-                break;
-            }
-
-            c = reader.peek();
-        }
-
-        return number;
-    },
-    readString: function(){
-        var reader  = this._reader,
-            delim   = reader.read(),
-            string  = delim,
-            prev    = delim,
-            c       = reader.peek();
-
-        while(c){
-            c = reader.read();
-            string += c;
-
-            //if the delimiter is found with an escapement, we're done.
-            if (c == delim && prev != "\\"){
-                break;
-            }
-
-            //if there's a newline without an escapement, it's an invalid string
-            if (isNewLine(reader.peek()) && c != "\\"){
-                string = "";
-                break;
-            }
-
-            //save previous and get next
-            prev = c;
-            c = reader.peek();
-        }
-
-        //if c is null, that means we're out of input and the string was never closed
-        if (c === null){
-            string = "";
-        }
-
-        return string;
-    },
-    readURI: function(first){
-        var reader  = this._reader,
-            uri     = first,
-            inner   = "",
-            c       = reader.peek();
-
-        reader.mark();
-
-        //skip whitespace before
-        while(c && isWhitespace(c)){
-            reader.read();
-            c = reader.peek();
-        }
-
-        //it's a string
-        if (c == "'" || c == "\""){
-            inner = this.readString();
-        } else {
-            inner = this.readURL();
-        }
-
-        c = reader.peek();
-
-        //skip whitespace after
-        while(c && isWhitespace(c)){
-            reader.read();
-            c = reader.peek();
-        }
-
-        //if there was no inner value or the next character isn't closing paren, it's not a URI
-        if (inner === "" || c != ")"){
-            uri = first;
-            reader.reset();
-        } else {
-            uri += inner + reader.read();
-        }
-
-        return uri;
-    },
-    readURL: function(){
-        var reader  = this._reader,
-            url     = "",
-            c       = reader.peek();
-
-        //TODO: Check for escape and nonascii
-        while (/^[!#$%&\\*-~]$/.test(c)){
-            url += reader.read();
-            c = reader.peek();
-        }
-
-        return url;
-
-    },
-    readName: function(first){
-        var reader  = this._reader,
-            ident   = first || "",
-            c       = reader.peek();
-
-        while(true){
-            if (c == "\\"){
-                ident += this.readEscape(reader.read());
-                c = reader.peek();
-            } else if(c && isNameChar(c)){
-                ident += reader.read();
-                c = reader.peek();
-            } else {
-                break;
-            }
-        }
-
-        return ident;
-    },
-    
-    readEscape: function(first){
-        var reader  = this._reader,
-            cssEscape = first || "",
-            i       = 0,
-            c       = reader.peek();    
-    
-        if (isHexDigit(c)){
-            do {
-                cssEscape += reader.read();
-                c = reader.peek();
-            } while(c && isHexDigit(c) && ++i < 6);
-        }
-        
-        if (cssEscape.length == 3 && /\s/.test(c) ||
-            cssEscape.length == 7 || cssEscape.length == 1){
-                reader.read();
-        } else {
-            c = "";
-        }
-        
-        return cssEscape + c;
-    },
-    
-    readComment: function(first){
-        var reader  = this._reader,
-            comment = first || "",
-            c       = reader.read();
-
-        if (c == "*"){
-            while(c){
-                comment += c;
-
-                //look for end of comment
-                if (comment.length > 2 && c == "*" && reader.peek() == "/"){
-                    comment += reader.read();
-                    break;
-                }
-
-                c = reader.read();
-            }
-
-            return comment;
-        } else {
-            return "";
-        }
-
-    }
-});
-
-
-var Tokens  = [
-
-    /*
-     * The following token names are defined in CSS3 Grammar: http://www.w3.org/TR/css3-syntax/#lexical
-     */
-     
-    //HTML-style comments
-    { name: "CDO"},
-    { name: "CDC"},
-
-    //ignorables
-    { name: "S", whitespace: true/*, channel: "ws"*/},
-    { name: "COMMENT", comment: true, hide: true, channel: "comment" },
-        
-    //attribute equality
-    { name: "INCLUDES", text: "~="},
-    { name: "DASHMATCH", text: "|="},
-    { name: "PREFIXMATCH", text: "^="},
-    { name: "SUFFIXMATCH", text: "$="},
-    { name: "SUBSTRINGMATCH", text: "*="},
-        
-    //identifier types
-    { name: "STRING"},     
-    { name: "IDENT"},
-    { name: "HASH"},
-
-    //at-keywords
-    { name: "IMPORT_SYM", text: "@import"},
-    { name: "PAGE_SYM", text: "@page"},
-    { name: "MEDIA_SYM", text: "@media"},
-    { name: "FONT_FACE_SYM", text: "@font-face"},
-    { name: "CHARSET_SYM", text: "@charset"},
-    { name: "NAMESPACE_SYM", text: "@namespace"},
-    { name: "UNKNOWN_SYM" },
-    //{ name: "ATKEYWORD"},
-    
-    //CSS3 animations
-    { name: "KEYFRAMES_SYM", text: [ "@keyframes", "@-webkit-keyframes", "@-moz-keyframes", "@-ms-keyframes" ] },
-
-    //important symbol
-    { name: "IMPORTANT_SYM"},
-
-    //measurements
-    { name: "LENGTH"},
-    { name: "ANGLE"},
-    { name: "TIME"},
-    { name: "FREQ"},
-    { name: "DIMENSION"},
-    { name: "PERCENTAGE"},
-    { name: "NUMBER"},
-    
-    //functions
-    { name: "URI"},
-    { name: "FUNCTION"},
-    
-    //Unicode ranges
-    { name: "UNICODE_RANGE"},
-    
-    /*
-     * The following token names are defined in CSS3 Selectors: http://www.w3.org/TR/css3-selectors/#selector-syntax
-     */    
-    
-    //invalid string
-    { name: "INVALID"},
-    
-    //combinators
-    { name: "PLUS", text: "+" },
-    { name: "GREATER", text: ">"},
-    { name: "COMMA", text: ","},
-    { name: "TILDE", text: "~"},
-    
-    //modifier
-    { name: "NOT"},        
-    
-    /*
-     * Defined in CSS3 Paged Media
-     */
-    { name: "TOPLEFTCORNER_SYM", text: "@top-left-corner"},
-    { name: "TOPLEFT_SYM", text: "@top-left"},
-    { name: "TOPCENTER_SYM", text: "@top-center"},
-    { name: "TOPRIGHT_SYM", text: "@top-right"},
-    { name: "TOPRIGHTCORNER_SYM", text: "@top-right-corner"},
-    { name: "BOTTOMLEFTCORNER_SYM", text: "@bottom-left-corner"},
-    { name: "BOTTOMLEFT_SYM", text: "@bottom-left"},
-    { name: "BOTTOMCENTER_SYM", text: "@bottom-center"},
-    { name: "BOTTOMRIGHT_SYM", text: "@bottom-right"},
-    { name: "BOTTOMRIGHTCORNER_SYM", text: "@bottom-right-corner"},
-    { name: "LEFTTOP_SYM", text: "@left-top"},
-    { name: "LEFTMIDDLE_SYM", text: "@left-middle"},
-    { name: "LEFTBOTTOM_SYM", text: "@left-bottom"},
-    { name: "RIGHTTOP_SYM", text: "@right-top"},
-    { name: "RIGHTMIDDLE_SYM", text: "@right-middle"},
-    { name: "RIGHTBOTTOM_SYM", text: "@right-bottom"},
-
-    /*
-     * The following token names are defined in CSS3 Media Queries: http://www.w3.org/TR/css3-mediaqueries/#syntax
-     */
-    /*{ name: "MEDIA_ONLY", state: "media"},
-    { name: "MEDIA_NOT", state: "media"},
-    { name: "MEDIA_AND", state: "media"},*/
-    { name: "RESOLUTION", state: "media"},
-
-    /*
-     * The following token names are not defined in any CSS specification but are used by the lexer.
-     */
-    
-    //not a real token, but useful for stupid IE filters
-    { name: "IE_FUNCTION" },
-
-    //part of CSS3 grammar but not the Flex code
-    { name: "CHAR" },
-    
-    //TODO: Needed?
-    //Not defined as tokens, but might as well be
-    {
-        name: "PIPE",
-        text: "|"
-    },
-    {
-        name: "SLASH",
-        text: "/"
-    },
-    {
-        name: "MINUS",
-        text: "-"
-    },
-    {
-        name: "STAR",
-        text: "*"
-    },
-
-    {
-        name: "LBRACE",
-        text: "{"
-    },   
-    {
-        name: "RBRACE",
-        text: "}"
-    },      
-    {
-        name: "LBRACKET",
-        text: "["
-    },   
-    {
-        name: "RBRACKET",
-        text: "]"
-    },    
-    {
-        name: "EQUALS",
-        text: "="
-    },
-    {
-        name: "COLON",
-        text: ":"
-    },    
-    {
-        name: "SEMICOLON",
-        text: ";"
-    },    
- 
-    {
-        name: "LPAREN",
-        text: "("
-    },   
-    {
-        name: "RPAREN",
-        text: ")"
-    },     
-    {
-        name: "DOT",
-        text: "."
-    }
-];
-
-(function(){
-
-    var nameMap = [],
-        typeMap = {};
-    
-    Tokens.UNKNOWN = -1;
-    Tokens.unshift({name:"EOF"});
-    for (var i=0, len = Tokens.length; i < len; i++){
-        nameMap.push(Tokens[i].name);
-        Tokens[Tokens[i].name] = i;
-        if (Tokens[i].text){
-            if (Tokens[i].text instanceof Array){
-                for (var j=0; j < Tokens[i].text.length; j++){
-                    typeMap[Tokens[i].text[j]] = i;
-                }
-            } else {
-                typeMap[Tokens[i].text] = i;
-            }
-        }
-    }
-    
-    Tokens.name = function(tt){
-        return nameMap[tt];
-    };
-    
-    Tokens.type = function(c){
-        return typeMap[c] || -1;
-    };
-
-})();
-
-
-
-
-//This file will likely change a lot! Very experimental!
-/*global Properties, ValidationTypes, ValidationError, PropertyValueIterator */
-var Validation = {
-
-    validate: function(property, value){
-    
-        //normalize name
-        var name        = property.toString().toLowerCase(),
-            parts       = value.parts,
-            expression  = new PropertyValueIterator(value),
-            spec        = Properties[name],
-            part,
-            valid,            
-            j, count,
-            msg,
-            types,
-            last,
-            literals,
-            max, multi, group;
-            
-        if (!spec) {
-            if (name.indexOf("-") !== 0){    //vendor prefixed are ok
-                throw new ValidationError("Unknown property '" + property + "'.", property.line, property.col);
-            }
-        } else if (typeof spec != "number"){
-        
-            //initialization
-            if (typeof spec == "string"){
-                if (spec.indexOf("||") > -1) {
-                    this.groupProperty(spec, expression);
-                } else {
-                    this.singleProperty(spec, expression, 1);
-                }
-
-            } else if (spec.multi) {
-                this.multiProperty(spec.multi, expression, spec.comma, spec.max || Infinity);
-            } else if (typeof spec == "function") {
-                spec(expression);
-            }
-
-        }
-
-    },
-    
-    singleProperty: function(types, expression, max, partial) {
-
-        var result      = false,
-            value       = expression.value,
-            count       = 0,
-            part;
-         
-        while (expression.hasNext() && count < max) {
-            result = ValidationTypes.isAny(expression, types);
-            if (!result) {
-                break;
-            }
-            count++;
-        }
-        
-        if (!result) {
-            if (expression.hasNext() && !expression.isFirst()) {
-                part = expression.peek();
-                throw new ValidationError("Expected end of value but found '" + part + "'.", part.line, part.col);
-            } else {
-                 throw new ValidationError("Expected (" + types + ") but found '" + value + "'.", value.line, value.col);
-            }        
-        } else if (expression.hasNext()) {
-            part = expression.next();
-            throw new ValidationError("Expected end of value but found '" + part + "'.", part.line, part.col);
-        }          
-                 
-    },    
-    
-    multiProperty: function (types, expression, comma, max) {
-
-        var result      = false,
-            value       = expression.value,
-            count       = 0,
-            sep         = false,
-            part;
-            
-        while(expression.hasNext() && !result && count < max) {
-            if (ValidationTypes.isAny(expression, types)) {
-                count++;
-                if (!expression.hasNext()) {
-                    result = true;
-
-                } else if (comma) {
-                    if (expression.peek() == ",") {
-                        part = expression.next();
-                    } else {
-                        break;
-                    }
-                }
-            } else {
-                break;
-
-            }
-        }
-        
-        if (!result) {
-            if (expression.hasNext() && !expression.isFirst()) {
-                part = expression.peek();
-                throw new ValidationError("Expected end of value but found '" + part + "'.", part.line, part.col);
-            } else {
-                part = expression.previous();
-                if (comma && part == ",") {
-                    throw new ValidationError("Expected end of value but found '" + part + "'.", part.line, part.col); 
-                } else {
-                    throw new ValidationError("Expected (" + types + ") but found '" + value + "'.", value.line, value.col);
-                }
-            }
-        
-        } else if (expression.hasNext()) {
-            part = expression.next();
-            throw new ValidationError("Expected end of value but found '" + part + "'.", part.line, part.col);
-        }  
-
-    },
-    
-    groupProperty: function (types, expression, comma) {
-
-        var result      = false,
-            value       = expression.value,
-            typeCount   = types.split("||").length,
-            groups      = { count: 0 },
-            partial     = false,
-            name,
-            part;
-            
-        while(expression.hasNext() && !result) {
-            name = ValidationTypes.isAnyOfGroup(expression, types);
-            if (name) {
-            
-                //no dupes
-                if (groups[name]) {
-                    break;
-                } else {
-                    groups[name] = 1;
-                    groups.count++;
-                    partial = true;
-                    
-                    if (groups.count == typeCount || !expression.hasNext()) {
-                        result = true;
-                    }
-                }
-            } else {
-                break;
-            }
-        }
-        
-        if (!result) {        
-            if (partial && expression.hasNext()) {
-                    part = expression.peek();
-                    throw new ValidationError("Expected end of value but found '" + part + "'.", part.line, part.col);
-            } else {
-                throw new ValidationError("Expected (" + types + ") but found '" + value + "'.", value.line, value.col);
-            }
-        } else if (expression.hasNext()) {
-            part = expression.next();
-            throw new ValidationError("Expected end of value but found '" + part + "'.", part.line, part.col);
-        }           
-    }
-
-    
-
-};
-/**
- * Type to use when a validation error occurs.
- * @class ValidationError
- * @namespace parserlib.util
- * @constructor
- * @param {String} message The error message.
- * @param {int} line The line at which the error occurred.
- * @param {int} col The column at which the error occurred.
- */
-function ValidationError(message, line, col){
-
-    /**
-     * The column at which the error occurred.
-     * @type int
-     * @property col
-     */
-    this.col = col;
-
-    /**
-     * The line at which the error occurred.
-     * @type int
-     * @property line
-     */
-    this.line = line;
-
-    /**
-     * The text representation of the unit.
-     * @type String
-     * @property text
-     */
-    this.message = message;
-
-}
-
-//inherit from Error
-ValidationError.prototype = new Error();
-//This file will likely change a lot! Very experimental!
-/*global Properties, Validation, ValidationError, PropertyValueIterator, console*/
-var ValidationTypes = {
-
-    isLiteral: function (part, literals) {
-        var text = part.text.toString().toLowerCase(),
-            args = literals.split(" | "),
-            i, len, found = false;
-        
-        for (i=0,len=args.length; i < len && !found; i++){
-            if (text == args[i]){
-                found = true;
-            }
-        }
-        
-        return found;    
-    },
-    
-    isSimple: function(type) {
-        return !!this.simple[type];
-    },
-    
-    isComplex: function(type) {
-        return !!this.complex[type];
-    },
-    
-    /**
-     * Determines if the next part(s) of the given expression
-     * are any of the given types.
-     */
-    isAny: function (expression, types) {
-        var args = types.split(" | "),
-            i, len, found = false;
-        
-        for (i=0,len=args.length; i < len && !found && expression.hasNext(); i++){
-            found = this.isType(expression, args[i]);
-        }
-        
-        return found;    
-    },
-    
-    /**
-     * Determines if the next part(s) of the given expresion
-     * are one of a group.
-     */
-    isAnyOfGroup: function(expression, types) {
-        var args = types.split(" || "),
-            i, len, found = false;
-        
-        for (i=0,len=args.length; i < len && !found; i++){
-            found = this.isType(expression, args[i]);
-        }
-        
-        return found ? args[i-1] : false;
-    },
-    
-    /**
-     * Determines if the next part(s) of the given expression
-     * are of a given type.
-     */
-    isType: function (expression, type) {
-        var part = expression.peek(),
-            result = false;
-            
-        if (type.charAt(0) != "<") {
-            result = this.isLiteral(part, type);
-            if (result) {
-                expression.next();
-            }
-        } else if (this.simple[type]) {
-            result = this.simple[type](part);
-            if (result) {
-                expression.next();
-            }
-        } else {
-            result = this.complex[type](expression);
-        }
-        
-        return result;
-    },
-    
-    
-    
-    simple: {
-
-        "<absolute-size>": function(part){
-            return ValidationTypes.isLiteral(part, "xx-small | x-small | small | medium | large | x-large | xx-large");
-        },
-        
-        "<attachment>": function(part){
-            return ValidationTypes.isLiteral(part, "scroll | fixed | local");
-        },
-        
-        "<attr>": function(part){
-            return part.type == "function" && part.name == "attr";
-        },
-                
-        "<bg-image>": function(part){
-            return this["<image>"](part) || this["<gradient>"](part) ||  part == "none";
-        },        
-        
-        "<gradient>": function(part) {
-            return part.type == "function" && /^(?:\-(?:ms|moz|o|webkit)\-)?(?:repeating\-)?(?:radial|linear)\-gradient/i.test(part);
-        },
-        
-        "<box>": function(part){
-            return ValidationTypes.isLiteral(part, "padding-box | border-box | content-box");
-        },
-        
-        "<content>": function(part){
-            return part.type == "function" && part.name == "content";
-        },        
-        
-        "<relative-size>": function(part){
-            return ValidationTypes.isLiteral(part, "smaller | larger");
-        },
-        
-        //any identifier
-        "<ident>": function(part){
-            return part.type == "identifier";
-        },
-        
-        "<length>": function(part){
-            return part.type == "length" || part.type == "number" || part.type == "integer" || part == "0";
-        },
-        
-        "<color>": function(part){
-            return part.type == "color" || part == "transparent";
-        },
-        
-        "<number>": function(part){
-            return part.type == "number" || this["<integer>"](part);
-        },
-        
-        "<integer>": function(part){
-            return part.type == "integer";
-        },
-        
-        "<line>": function(part){
-            return part.type == "integer";
-        },
-        
-        "<angle>": function(part){
-            return part.type == "angle";
-        },        
-        
-        "<uri>": function(part){
-            return part.type == "uri";
-        },
-        
-        "<image>": function(part){
-            return this["<uri>"](part);
-        },
-        
-        "<percentage>": function(part){
-            return part.type == "percentage" || part == "0";
-        },
-
-        "<border-width>": function(part){
-            return this["<length>"](part) || ValidationTypes.isLiteral(part, "thin | medium | thick");
-        },
-        
-        "<border-style>": function(part){
-            return ValidationTypes.isLiteral(part, "none | hidden | dotted | dashed | solid | double | groove | ridge | inset | outset");
-        },
-        
-        "<margin-width>": function(part){
-            return this["<length>"](part) || this["<percentage>"](part) || ValidationTypes.isLiteral(part, "auto");
-        },
-        
-        "<padding-width>": function(part){
-            return this["<length>"](part) || this["<percentage>"](part);
-        },
-        
-        "<shape>": function(part){
-            return part.type == "function" && (part.name == "rect" || part.name == "inset-rect");
-        },
-        
-        "<time>": function(part) {
-            return part.type == "time";
-        }
-    },
-    
-    complex: {
-
-        "<bg-position>": function(expression){
-            var types   = this,
-                result  = false,
-                numeric = "<percentage> | <length>",
-                xDir    = "left | center | right",
-                yDir    = "top | center | bottom",
-                part,
-                i, len;
-            
-                
-            if (ValidationTypes.isAny(expression, "top | bottom")) {
-                result = true;
-            } else {
-                
-                //must be two-part
-                if (ValidationTypes.isAny(expression, numeric)){
-                    if (expression.hasNext()){
-                        result = ValidationTypes.isAny(expression, numeric + " | " + yDir);
-                    }
-                } else if (ValidationTypes.isAny(expression, xDir)){
-                    if (expression.hasNext()){
-                        
-                        //two- or three-part
-                        if (ValidationTypes.isAny(expression, yDir)){
-                            result = true;
-                      
-                            ValidationTypes.isAny(expression, numeric);
-                            
-                        } else if (ValidationTypes.isAny(expression, numeric)){
-                        
-                            //could also be two-part, so check the next part
-                            if (ValidationTypes.isAny(expression, yDir)){                                    
-                                ValidationTypes.isAny(expression, numeric);                               
-                            }
-                            
-                            result = true;
-                        }
-                    }
-                }                                 
-            }            
-
-            
-            return result;
-        },
-
-        "<bg-size>": function(expression){
-            //<bg-size> = [ <length> | <percentage> | auto ]{1,2} | cover | contain
-            var types   = this,
-                result  = false,
-                numeric = "<percentage> | <length> | auto",
-                part,
-                i, len;      
-      
-            if (ValidationTypes.isAny(expression, "cover | contain")) {
-                result = true;
-            } else if (ValidationTypes.isAny(expression, numeric)) {
-                result = true;                
-                ValidationTypes.isAny(expression, numeric);
-            }
-            
-            return result;
-        },
-        
-        "<repeat-style>": function(expression){
-            //repeat-x | repeat-y | [repeat | space | round | no-repeat]{1,2}
-            var result  = false,
-                values  = "repeat | space | round | no-repeat",
-                part;
-            
-            if (expression.hasNext()){
-                part = expression.next();
-                
-                if (ValidationTypes.isLiteral(part, "repeat-x | repeat-y")) {
-                    result = true;                    
-                } else if (ValidationTypes.isLiteral(part, values)) {
-                    result = true;
-
-                    if (expression.hasNext() && ValidationTypes.isLiteral(expression.peek(), values)) {
-                        expression.next();
-                    }
-                }
-            }
-            
-            return result;
-            
-        },
-        
-        "<shadow>": function(expression) {
-            //inset? && [ <length>{2,4} && <color>? ]
-            var result  = false,
-                count   = 0,
-                inset   = false,
-                color   = false,
-                part;
-                
-            if (expression.hasNext()) {            
-                
-                if (ValidationTypes.isAny(expression, "inset")){
-                    inset = true;
-                }
-                
-                if (ValidationTypes.isAny(expression, "<color>")) {
-                    color = true;
-                }                
-                
-                while (ValidationTypes.isAny(expression, "<length>") && count < 4) {
-                    count++;
-                }
-                
-                
-                if (expression.hasNext()) {
-                    if (!color) {
-                        ValidationTypes.isAny(expression, "<color>");
-                    }
-                    
-                    if (!inset) {
-                        ValidationTypes.isAny(expression, "inset");
-                    }
-
-                }
-                
-                result = (count >= 2 && count <= 4);
-            
-            }
-            
-            return result;
-        },
-        
-        "<x-one-radius>": function(expression) {
-            //[ <length> | <percentage> ] [ <length> | <percentage> ]?
-            var result  = false,
-                count   = 0,
-                numeric = "<length> | <percentage>",
-                part;
-                
-            if (ValidationTypes.isAny(expression, numeric)){
-                result = true;
-                
-                ValidationTypes.isAny(expression, numeric);
-            }                
-            
-            return result;
-        }
-    }
-};
-
-
-parserlib.css = {
-Colors              :Colors,    
-Combinator          :Combinator,                
-Parser              :Parser,
-PropertyName        :PropertyName,
-PropertyValue       :PropertyValue,
-PropertyValuePart   :PropertyValuePart,
-MediaFeature        :MediaFeature,
-MediaQuery          :MediaQuery,
-Selector            :Selector,
-SelectorPart        :SelectorPart,
-SelectorSubPart     :SelectorSubPart,
-Specificity         :Specificity,
-TokenStream         :TokenStream,
-Tokens              :Tokens,
-ValidationError     :ValidationError
-};
-})();
-
-
-
-/**
- * Main CSSLint object.
- * @class CSSLint
- * @static
- * @extends parserlib.util.EventTarget
- */
-/*global parserlib, Reporter*/
-var CSSLint = (function(){
-
-    var rules      = [],
-        formatters = [],
-        api        = new parserlib.util.EventTarget();
-        
-    api.version = "0.9.7";
-
-    //-------------------------------------------------------------------------
-    // Rule Management
-    //-------------------------------------------------------------------------
-
-    /**
-     * Adds a new rule to the engine.
-     * @param {Object} rule The rule to add.
-     * @method addRule
-     */
-    api.addRule = function(rule){
-        rules.push(rule);
-        rules[rule.id] = rule;
-    };
-
-    /**
-     * Clears all rule from the engine.
-     * @method clearRules
-     */
-    api.clearRules = function(){
-        rules = [];
-    };
-    
-    /**
-     * Returns the rule objects.
-     * @return An array of rule objects.
-     * @method getRules
-     */
-    api.getRules = function(){
-        return [].concat(rules).sort(function(a,b){ 
-            return a.id > b.id ? 1 : 0;
-        });
-    };
-
-    //-------------------------------------------------------------------------
-    // Formatters
-    //-------------------------------------------------------------------------
-
-    /**
-     * Adds a new formatter to the engine.
-     * @param {Object} formatter The formatter to add.
-     * @method addFormatter
-     */
-    api.addFormatter = function(formatter) {
-        // formatters.push(formatter);
-        formatters[formatter.id] = formatter;
-    };
-    
-    /**
-     * Retrieves a formatter for use.
-     * @param {String} formatId The name of the format to retrieve.
-     * @return {Object} The formatter or undefined.
-     * @method getFormatter
-     */
-    api.getFormatter = function(formatId){
-        return formatters[formatId];
-    };
-    
-    /**
-     * Formats the results in a particular format for a single file.
-     * @param {Object} result The results returned from CSSLint.verify().
-     * @param {String} filename The filename for which the results apply.
-     * @param {String} formatId The name of the formatter to use.
-     * @param {Object} options (Optional) for special output handling.
-     * @return {String} A formatted string for the results.
-     * @method format
-     */
-    api.format = function(results, filename, formatId, options) {
-        var formatter = this.getFormatter(formatId),
-            result = null;
-            
-        if (formatter){
-            result = formatter.startFormat();
-            result += formatter.formatResults(results, filename, options || {});
-            result += formatter.endFormat();
-        }
-        
-        return result;
-    };
-    
-    /**
-     * Indicates if the given format is supported.
-     * @param {String} formatId The ID of the format to check.
-     * @return {Boolean} True if the format exists, false if not.
-     * @method hasFormat
-     */
-    api.hasFormat = function(formatId){
-        return formatters.hasOwnProperty(formatId);
-    };
-
-    //-------------------------------------------------------------------------
-    // Verification
-    //-------------------------------------------------------------------------
-
-    /**
-     * Starts the verification process for the given CSS text.
-     * @param {String} text The CSS text to verify.
-     * @param {Object} ruleset (Optional) List of rules to apply. If null, then
-     *      all rules are used. If a rule has a value of 1 then it's a warning,
-     *      a value of 2 means it's an error.
-     * @return {Object} Results of the verification.
-     * @method verify
-     */
-    api.verify = function(text, ruleset){
-
-        var i       = 0,
-            len     = rules.length,
-            reporter,
-            lines,
-            report,
-            parser = new parserlib.css.Parser({ starHack: true, ieFilters: true,
-                                                underscoreHack: true, strict: false });
-
-        lines = text.replace(/\n\r?/g, "$split$").split('$split$');
-        
-        if (!ruleset){
-            ruleset = {};
-            while (i < len){
-                ruleset[rules[i++].id] = 1;    //by default, everything is a warning
-            }
-        }
-        
-        reporter = new Reporter(lines, ruleset);
-        
-        ruleset.errors = 2;       //always report parsing errors as errors
-        for (i in ruleset){
-            if(ruleset.hasOwnProperty(i)){
-                if (rules[i]){
-                    rules[i].init(parser, reporter);
-                }
-            }
-        }
-
-
-        //capture most horrible error type
-        try {
-            parser.parse(text);
-        } catch (ex) {
-            reporter.error("Fatal error, cannot continue: " + ex.message, ex.line, ex.col, {});
-        }
-
-        report = {
-            messages    : reporter.messages,
-            stats       : reporter.stats
-        };
-        
-        //sort by line numbers, rollups at the bottom
-        report.messages.sort(function (a, b){
-            if (a.rollup && !b.rollup){
-                return 1;
-            } else if (!a.rollup && b.rollup){
-                return -1;
-            } else {
-                return a.line - b.line;
-            }
-        });        
-        
-        return report;
-    };
-
-    //-------------------------------------------------------------------------
-    // Publish the API
-    //-------------------------------------------------------------------------
-
-    return api;
-
-})();
-
-/*global CSSLint*/
-/**
- * An instance of Report is used to report results of the
- * verification back to the main API.
- * @class Reporter
- * @constructor
- * @param {String[]} lines The text lines of the source.
- * @param {Object} ruleset The set of rules to work with, including if
- *      they are errors or warnings.
- */
-function Reporter(lines, ruleset){
-
-    /**
-     * List of messages being reported.
-     * @property messages
-     * @type String[]
-     */
-    this.messages = [];
-
-    /**
-     * List of statistics being reported.
-     * @property stats
-     * @type String[]
-     */
-    this.stats = [];
-
-    /**
-     * Lines of code being reported on. Used to provide contextual information
-     * for messages.
-     * @property lines
-     * @type String[]
-     */
-    this.lines = lines;
-    
-    /**
-     * Information about the rules. Used to determine whether an issue is an
-     * error or warning.
-     * @property ruleset
-     * @type Object
-     */
-    this.ruleset = ruleset;
-}
-
-Reporter.prototype = {
-
-    //restore constructor
-    constructor: Reporter,
-
-    /**
-     * Report an error.
-     * @param {String} message The message to store.
-     * @param {int} line The line number.
-     * @param {int} col The column number.
-     * @param {Object} rule The rule this message relates to.
-     * @method error
-     */
-    error: function(message, line, col, rule){
-        this.messages.push({
-            type    : "error",
-            line    : line,
-            col     : col,
-            message : message,
-            evidence: this.lines[line-1],
-            rule    : rule || {}
-        });
-    },
-
-    /**
-     * Report an warning.
-     * @param {String} message The message to store.
-     * @param {int} line The line number.
-     * @param {int} col The column number.
-     * @param {Object} rule The rule this message relates to.
-     * @method warn
-     * @deprecated Use report instead.
-     */
-    warn: function(message, line, col, rule){
-        this.report(message, line, col, rule);
-    },
-
-    /**
-     * Report an issue.
-     * @param {String} message The message to store.
-     * @param {int} line The line number.
-     * @param {int} col The column number.
-     * @param {Object} rule The rule this message relates to.
-     * @method report
-     */
-    report: function(message, line, col, rule){
-        this.messages.push({
-            type    : this.ruleset[rule.id] == 2 ? "error" : "warning",
-            line    : line,
-            col     : col,
-            message : message,
-            evidence: this.lines[line-1],
-            rule    : rule
-        });
-    },
-
-    /**
-     * Report some informational text.
-     * @param {String} message The message to store.
-     * @param {int} line The line number.
-     * @param {int} col The column number.
-     * @param {Object} rule The rule this message relates to.
-     * @method info
-     */
-    info: function(message, line, col, rule){
-        this.messages.push({
-            type    : "info",
-            line    : line,
-            col     : col,
-            message : message,
-            evidence: this.lines[line-1],
-            rule    : rule
-        });
-    },
-
-    /**
-     * Report some rollup error information.
-     * @param {String} message The message to store.
-     * @param {Object} rule The rule this message relates to.
-     * @method rollupError
-     */
-    rollupError: function(message, rule){
-        this.messages.push({
-            type    : "error",
-            rollup  : true,
-            message : message,
-            rule    : rule
-        });
-    },
-
-    /**
-     * Report some rollup warning information.
-     * @param {String} message The message to store.
-     * @param {Object} rule The rule this message relates to.
-     * @method rollupWarn
-     */
-    rollupWarn: function(message, rule){
-        this.messages.push({
-            type    : "warning",
-            rollup  : true,
-            message : message,
-            rule    : rule
-        });
-    },
-
-    /**
-     * Report a statistic.
-     * @param {String} name The name of the stat to store.
-     * @param {Variant} value The value of the stat.
-     * @method stat
-     */
-    stat: function(name, value){
-        this.stats[name] = value;
-    }
-};
-
-//expose for testing purposes
-CSSLint._Reporter = Reporter;
-
-/*global CSSLint*/
-
-/*
- * Utility functions that make life easier.
- */
-CSSLint.Util = {
-    /*
-     * Adds all properties from supplier onto receiver,
-     * overwriting if the same name already exists on
-     * reciever.
-     * @param {Object} The object to receive the properties.
-     * @param {Object} The object to provide the properties.
-     * @return {Object} The receiver
-     */
-    mix: function(receiver, supplier){
-        var prop;
-
-        for (prop in supplier){
-            if (supplier.hasOwnProperty(prop)){
-                receiver[prop] = supplier[prop];
-            }
-        }
-
-        return prop;
-    },
-
-    /*
-     * Polyfill for array indexOf() method.
-     * @param {Array} values The array to search.
-     * @param {Variant} value The value to search for.
-     * @return {int} The index of the value if found, -1 if not.
-     */
-    indexOf: function(values, value){
-        if (values.indexOf){
-            return values.indexOf(value);
-        } else {
-            for (var i=0, len=values.length; i < len; i++){
-                if (values[i] === value){
-                    return i;
-                }
-            }
-            return -1;
-        }
-    },
-
-    /*
-     * Polyfill for array forEach() method.
-     * @param {Array} values The array to operate on.
-     * @param {Function} func The function to call on each item.
-     * @return {void}
-     */
-    forEach: function(values, func) {
-        if (values.forEach){
-            return values.forEach(func);
-        } else {
-            for (var i=0, len=values.length; i < len; i++){
-                func(values[i], i, values);
-            }
-        }
-    }
-};
-/*global CSSLint*/
-/*
- * Rule: Don't use adjoining classes (.foo.bar).
- */
-CSSLint.addRule({
-
-    //rule information
-    id: "adjoining-classes",
-    name: "Disallow adjoining classes",
-    desc: "Don't use adjoining classes.",
-    browsers: "IE6",
-
-    //initialization
-    init: function(parser, reporter){
-        var rule = this;
-        parser.addListener("startrule", function(event){
-            var selectors = event.selectors,
-                selector,
-                part,
-                modifier,
-                classCount,
-                i, j, k;
-
-            for (i=0; i < selectors.length; i++){
-                selector = selectors[i];
-                for (j=0; j < selector.parts.length; j++){
-                    part = selector.parts[j];
-                    if (part.type == parser.SELECTOR_PART_TYPE){
-                        classCount = 0;
-                        for (k=0; k < part.modifiers.length; k++){
-                            modifier = part.modifiers[k];
-                            if (modifier.type == "class"){
-                                classCount++;
-                            }
-                            if (classCount > 1){
-                                reporter.report("Don't use adjoining classes.", part.line, part.col, rule);
-                            }
-                        }
-                    }
-                }
-            }
-        });
-    }
-
-});
-/*global CSSLint*/
-
-/*
- * Rule: Don't use width or height when using padding or border. 
- */
-CSSLint.addRule({
-
-    //rule information
-    id: "box-model",
-    name: "Beware of broken box size",
-    desc: "Don't use width or height when using padding or border.",
-    browsers: "All",
-
-    //initialization
-    init: function(parser, reporter){
-        var rule = this,
-            widthProperties = {
-                border: 1,
-                "border-left": 1,
-                "border-right": 1,
-                padding: 1,
-                "padding-left": 1,
-                "padding-right": 1
-            },
-            heightProperties = {
-                border: 1,
-                "border-bottom": 1,
-                "border-top": 1,
-                padding: 1,
-                "padding-bottom": 1,
-                "padding-top": 1
-            },
-            properties;
-
-        function startRule(){
-            properties = {};
-        }
-
-        function endRule(){
-            var prop;
-            if (properties.height){
-                for (prop in heightProperties){
-                    if (heightProperties.hasOwnProperty(prop) && properties[prop]){
-                    
-                        //special case for padding
-                        if (!(prop == "padding" && properties[prop].value.parts.length === 2 && properties[prop].value.parts[0].value === 0)){
-                            reporter.report("Using height with " + prop + " can sometimes make elements larger than you expect.", properties[prop].line, properties[prop].col, rule);
-                        }
-                    }
-                }
-            }
-
-            if (properties.width){
-                for (prop in widthProperties){
-                    if (widthProperties.hasOwnProperty(prop) && properties[prop]){
-
-                        if (!(prop == "padding" && properties[prop].value.parts.length === 2 && properties[prop].value.parts[1].value === 0)){
-                            reporter.report("Using width with " + prop + " can sometimes make elements larger than you expect.", properties[prop].line, properties[prop].col, rule);
-                        }
-                    }
-                }
-            }        
-        }
-
-        parser.addListener("startrule", startRule);
-        parser.addListener("startfontface", startRule);
-        parser.addListener("startpage", startRule);
-        parser.addListener("startpagemargin", startRule);
-        parser.addListener("startkeyframerule", startRule); 
-
-        parser.addListener("property", function(event){
-            var name = event.property.text.toLowerCase();
-            
-            if (heightProperties[name] || widthProperties[name]){
-                if (!/^0\S*$/.test(event.value) && !(name == "border" && event.value == "none")){
-                    properties[name] = { line: event.property.line, col: event.property.col, value: event.value };
-                }
-            } else {
-                if (name == "width" || name == "height"){
-                    properties[name] = 1;
-                }
-            }
-            
-        });
-
-        parser.addListener("endrule", endRule);
-        parser.addListener("endfontface", endRule);
-        parser.addListener("endpage", endRule);
-        parser.addListener("endpagemargin", endRule);
-        parser.addListener("endkeyframerule", endRule);         
-    }
-
-});
-/*global CSSLint*/
-
-/*
- * Rule: box-sizing doesn't work in IE6 and IE7.
- */
-CSSLint.addRule({
-
-    //rule information
-    id: "box-sizing",
-    name: "Disallow use of box-sizing",
-    desc: "The box-sizing properties isn't supported in IE6 and IE7.",
-    browsers: "IE6, IE7",
-    tags: ["Compatibility"],
-
-    //initialization
-    init: function(parser, reporter){
-        var rule = this;
-
-        parser.addListener("property", function(event){
-            var name = event.property.text.toLowerCase();
-   
-            if (name == "box-sizing"){
-                reporter.report("The box-sizing property isn't supported in IE6 and IE7.", event.line, event.col, rule);
-            }
-        });       
-    }
-
-});
-/*
- * Rule: Include all compatible vendor prefixes to reach a wider
- * range of users.
- */
-/*global CSSLint*/ 
-CSSLint.addRule({
-
-    //rule information
-    id: "compatible-vendor-prefixes",
-    name: "Require compatible vendor prefixes",
-    desc: "Include all compatible vendor prefixes to reach a wider range of users.",
-    browsers: "All",
-
-    //initialization
-    init: function (parser, reporter) {
-        var rule = this,
-            compatiblePrefixes,
-            properties,
-            prop,
-            variations,
-            prefixed,
-            i,
-            len,
-            arrayPush = Array.prototype.push,
-            applyTo = [];
-
-        // See http://peter.sh/experiments/vendor-prefixed-css-property-overview/ for details
-        compatiblePrefixes = {
-            "animation"                  : "webkit moz ms",
-            "animation-delay"            : "webkit moz ms",
-            "animation-direction"        : "webkit moz ms",
-            "animation-duration"         : "webkit moz ms",
-            "animation-fill-mode"        : "webkit moz ms",
-            "animation-iteration-count"  : "webkit moz ms",
-            "animation-name"             : "webkit moz ms",
-            "animation-play-state"       : "webkit moz ms",
-            "animation-timing-function"  : "webkit moz ms",
-            "appearance"                 : "webkit moz",
-            "border-end"                 : "webkit moz",
-            "border-end-color"           : "webkit moz",
-            "border-end-style"           : "webkit moz",
-            "border-end-width"           : "webkit moz",
-            "border-image"               : "webkit moz o",
-            "border-radius"              : "webkit moz",
-            "border-start"               : "webkit moz",
-            "border-start-color"         : "webkit moz",
-            "border-start-style"         : "webkit moz",
-            "border-start-width"         : "webkit moz",
-            "box-align"                  : "webkit moz ms",
-            "box-direction"              : "webkit moz ms",
-            "box-flex"                   : "webkit moz ms",
-            "box-lines"                  : "webkit ms",
-            "box-ordinal-group"          : "webkit moz ms",
-            "box-orient"                 : "webkit moz ms",
-            "box-pack"                   : "webkit moz ms",
-            "box-sizing"                 : "webkit moz",
-            "box-shadow"                 : "webkit moz",
-            "column-count"               : "webkit moz ms",
-            "column-gap"                 : "webkit moz ms",
-            "column-rule"                : "webkit moz ms",
-            "column-rule-color"          : "webkit moz ms",
-            "column-rule-style"          : "webkit moz ms",
-            "column-rule-width"          : "webkit moz ms",
-            "column-width"               : "webkit moz ms",
-            "hyphens"                    : "epub moz",
-            "line-break"                 : "webkit ms",
-            "margin-end"                 : "webkit moz",
-            "margin-start"               : "webkit moz",
-            "marquee-speed"              : "webkit wap",
-            "marquee-style"              : "webkit wap",
-            "padding-end"                : "webkit moz",
-            "padding-start"              : "webkit moz",
-            "tab-size"                   : "moz o",
-            "text-size-adjust"           : "webkit ms",
-            "transform"                  : "webkit moz ms o",
-            "transform-origin"           : "webkit moz ms o",
-            "transition"                 : "webkit moz o ms",
-            "transition-delay"           : "webkit moz o ms",
-            "transition-duration"        : "webkit moz o ms",
-            "transition-property"        : "webkit moz o ms",
-            "transition-timing-function" : "webkit moz o ms",
-            "user-modify"                : "webkit moz",
-            "user-select"                : "webkit moz ms",
-            "word-break"                 : "epub ms",
-            "writing-mode"               : "epub ms"
-        };
-
-
-        for (prop in compatiblePrefixes) {
-            if (compatiblePrefixes.hasOwnProperty(prop)) {
-                variations = [];
-                prefixed = compatiblePrefixes[prop].split(' ');
-                for (i = 0, len = prefixed.length; i < len; i++) {
-                    variations.push('-' + prefixed[i] + '-' + prop);
-                }
-                compatiblePrefixes[prop] = variations;
-                arrayPush.apply(applyTo, variations);
-            }
-        }
-        parser.addListener("startrule", function () {
-            properties = [];
-        });
-
-        parser.addListener("property", function (event) {
-            var name = event.property;
-            if (CSSLint.Util.indexOf(applyTo, name.text) > -1) {
-                properties.push(name);
-            }
-        });
-
-        parser.addListener("endrule", function (event) {
-            if (!properties.length) {
-                return;
-            }
-
-            var propertyGroups = {},
-                i,
-                len,
-                name,
-                prop,
-                variations,
-                value,
-                full,
-                actual,
-                item,
-                propertiesSpecified;
-
-            for (i = 0, len = properties.length; i < len; i++) {
-                name = properties[i];
-
-                for (prop in compatiblePrefixes) {
-                    if (compatiblePrefixes.hasOwnProperty(prop)) {
-                        variations = compatiblePrefixes[prop];
-                        if (CSSLint.Util.indexOf(variations, name.text) > -1) {
-                            if (!propertyGroups[prop]) {
-                                propertyGroups[prop] = {
-                                    full : variations.slice(0),
-                                    actual : [],
-                                    actualNodes: []
-                                };
-                            }
-                            if (CSSLint.Util.indexOf(propertyGroups[prop].actual, name.text) === -1) {
-                                propertyGroups[prop].actual.push(name.text);
-                                propertyGroups[prop].actualNodes.push(name);
-                            }
-                        }
-                    }
-                }
-            }
-
-            for (prop in propertyGroups) {
-                if (propertyGroups.hasOwnProperty(prop)) {
-                    value = propertyGroups[prop];
-                    full = value.full;
-                    actual = value.actual;
-
-                    if (full.length > actual.length) {
-                        for (i = 0, len = full.length; i < len; i++) {
-                            item = full[i];
-                            if (CSSLint.Util.indexOf(actual, item) === -1) {
-                                propertiesSpecified = (actual.length === 1) ? actual[0] : (actual.length == 2) ? actual.join(" and ") : actual.join(", ");
-                                reporter.report("The property " + item + " is compatible with " + propertiesSpecified + " and should be included as well.", value.actualNodes[0].line, value.actualNodes[0].col, rule); 
-                            }
-                        }
-
-                    }
-                }
-            }
-        });
-    }
-});
-/*
- * Rule: Certain properties don't play well with certain display values. 
- * - float should not be used with inline-block
- * - height, width, margin-top, margin-bottom, float should not be used with inline
- * - vertical-align should not be used with block
- * - margin, float should not be used with table-*
- */
-/*global CSSLint*/
-CSSLint.addRule({
-
-    //rule information
-    id: "display-property-grouping",
-    name: "Require properties appropriate for display",
-    desc: "Certain properties shouldn't be used with certain display property values.",
-    browsers: "All",
-
-    //initialization
-    init: function(parser, reporter){
-        var rule = this;
-
-        var propertiesToCheck = {
-                display: 1,
-                "float": "none",
-                height: 1,
-                width: 1,
-                margin: 1,
-                "margin-left": 1,
-                "margin-right": 1,
-                "margin-bottom": 1,
-                "margin-top": 1,
-                padding: 1,
-                "padding-left": 1,
-                "padding-right": 1,
-                "padding-bottom": 1,
-                "padding-top": 1,
-                "vertical-align": 1
-            },
-            properties;
-
-        function reportProperty(name, display, msg){
-            if (properties[name]){
-                if (typeof propertiesToCheck[name] != "string" || properties[name].value.toLowerCase() != propertiesToCheck[name]){
-                    reporter.report(msg || name + " can't be used with display: " + display + ".", properties[name].line, properties[name].col, rule);
-                }
-            }
-        }
-        
-        function startRule(){
-            properties = {};
-        }
-
-        function endRule(){
-
-            var display = properties.display ? properties.display.value : null;
-            if (display){
-                switch(display){
-
-                    case "inline":
-                        //height, width, margin-top, margin-bottom, float should not be used with inline
-                        reportProperty("height", display);
-                        reportProperty("width", display);
-                        reportProperty("margin", display);
-                        reportProperty("margin-top", display);
-                        reportProperty("margin-bottom", display);              
-                        reportProperty("float", display, "display:inline has no effect on floated elements (but may be used to fix the IE6 double-margin bug).");
-                        break;
-
-                    case "block":
-                        //vertical-align should not be used with block
-                        reportProperty("vertical-align", display);
-                        break;
-
-                    case "inline-block":
-                        //float should not be used with inline-block
-                        reportProperty("float", display);
-                        break;
-
-                    default:
-                        //margin, float should not be used with table
-                        if (display.indexOf("table-") === 0){
-                            reportProperty("margin", display);
-                            reportProperty("margin-left", display);
-                            reportProperty("margin-right", display);
-                            reportProperty("margin-top", display);
-                            reportProperty("margin-bottom", display);
-                            reportProperty("float", display);
-                        }
-
-                        //otherwise do nothing
-                }
-            }
-          
-        }
-
-        parser.addListener("startrule", startRule);
-        parser.addListener("startfontface", startRule);
-        parser.addListener("startkeyframerule", startRule);
-        parser.addListener("startpagemargin", startRule);
-        parser.addListener("startpage", startRule);
-
-        parser.addListener("property", function(event){
-            var name = event.property.text.toLowerCase();
-
-            if (propertiesToCheck[name]){
-                properties[name] = { value: event.value.text, line: event.property.line, col: event.property.col };                    
-            }
-        });
-
-        parser.addListener("endrule", endRule);
-        parser.addListener("endfontface", endRule);
-        parser.addListener("endkeyframerule", endRule);
-        parser.addListener("endpagemargin", endRule);
-        parser.addListener("endpage", endRule);
-
-    }
-
-});
-/*
- * Rule: Disallow duplicate background-images (using url).
- */
-/*global CSSLint*/
-CSSLint.addRule({
-
-    //rule information
-    id: "duplicate-background-images",
-    name: "Disallow duplicate background images",
-    desc: "Every background-image should be unique. Use a common class for e.g. sprites.",
-    browsers: "All",
-
-    //initialization
-    init: function(parser, reporter){
-        var rule = this,
-            stack = {};
-
-        parser.addListener("property", function(event){
-            var name = event.property.text,
-                value = event.value,
-                i, len;
-
-            if (name.match(/background/i)) {
-                for (i=0, len=value.parts.length; i < len; i++) {
-                    if (value.parts[i].type == 'uri') {
-                        if (typeof stack[value.parts[i].uri] === 'undefined') {
-                            stack[value.parts[i].uri] = event;
-                        }
-                        else {
-                            reporter.report("Background image '" + value.parts[i].uri + "' was used multiple times, first declared at line " + stack[value.parts[i].uri].line + ", col " + stack[value.parts[i].uri].col + ".", event.line, event.col, rule);
-                        }
-                    }
-                }
-            }
-        });
-    }
-});
-/*
- * Rule: Duplicate properties must appear one after the other. If an already-defined
- * property appears somewhere else in the rule, then it's likely an error.
- */
-/*global CSSLint*/
-CSSLint.addRule({
-
-    //rule information
-    id: "duplicate-properties",
-    name: "Disallow duplicate properties",
-    desc: "Duplicate properties must appear one after the other.",
-    browsers: "All",
-
-    //initialization
-    init: function(parser, reporter){
-        var rule = this,
-            properties,
-            lastProperty;            
-            
-        function startRule(event){
-            properties = {};        
-        }
-        
-        parser.addListener("startrule", startRule);
-        parser.addListener("startfontface", startRule);
-        parser.addListener("startpage", startRule);
-        parser.addListener("startpagemargin", startRule);
-        parser.addListener("startkeyframerule", startRule);        
-        
-        parser.addListener("property", function(event){
-            var property = event.property,
-                name = property.text.toLowerCase();
-            
-            if (properties[name] && (lastProperty != name || properties[name] == event.value.text)){
-                reporter.report("Duplicate property '" + event.property + "' found.", event.line, event.col, rule);
-            }
-            
-            properties[name] = event.value.text;
-            lastProperty = name;
-                        
-        });
-            
-        
-    }
-
-});
-/*
- * Rule: Style rules without any properties defined should be removed.
- */
-/*global CSSLint*/
-CSSLint.addRule({
-
-    //rule information
-    id: "empty-rules",
-    name: "Disallow empty rules",
-    desc: "Rules without any properties specified should be removed.",
-    browsers: "All",
-
-    //initialization
-    init: function(parser, reporter){
-        var rule = this,
-            count = 0;
-
-        parser.addListener("startrule", function(){
-            count=0;
-        });
-
-        parser.addListener("property", function(){
-            count++;
-        });
-
-        parser.addListener("endrule", function(event){
-            var selectors = event.selectors;
-            if (count === 0){
-                reporter.report("Rule is empty.", selectors[0].line, selectors[0].col, rule);
-            }
-        });
-    }
-
-});
-/*
- * Rule: There should be no syntax errors. (Duh.)
- */
-/*global CSSLint*/
-CSSLint.addRule({
-
-    //rule information
-    id: "errors",
-    name: "Parsing Errors",
-    desc: "This rule looks for recoverable syntax errors.",
-    browsers: "All",
-
-    //initialization
-    init: function(parser, reporter){
-        var rule = this;
-
-        parser.addListener("error", function(event){
-            reporter.error(event.message, event.line, event.col, rule);
-        });
-
-    }
-
-});
-
-/*global CSSLint*/
-CSSLint.addRule({
-
-    //rule information
-    id: "fallback-colors",
-    name: "Require fallback colors",
-    desc: "For older browsers that don't support RGBA, HSL, or HSLA, provide a fallback color.",
-    browsers: "IE6,IE7,IE8",
-
-    //initialization
-    init: function(parser, reporter){
-        var rule = this,
-            lastProperty,
-            propertiesToCheck = {
-                color: 1,
-                background: 1,
-                "background-color": 1                
-            },
-            properties;
-        
-        function startRule(event){
-            properties = {};    
-            lastProperty = null;    
-        }
-        
-        parser.addListener("startrule", startRule);
-        parser.addListener("startfontface", startRule);
-        parser.addListener("startpage", startRule);
-        parser.addListener("startpagemargin", startRule);
-        parser.addListener("startkeyframerule", startRule);        
-        
-        parser.addListener("property", function(event){
-            var property = event.property,
-                name = property.text.toLowerCase(),
-                parts = event.value.parts,
-                i = 0, 
-                colorType = "",
-                len = parts.length;                
-                        
-            if(propertiesToCheck[name]){
-                while(i < len){
-                    if (parts[i].type == "color"){
-                        if ("alpha" in parts[i] || "hue" in parts[i]){
-                            
-                            if (/([^\)]+)\(/.test(parts[i])){
-                                colorType = RegExp.$1.toUpperCase();
-                            }
-                            
-                            if (!lastProperty || (lastProperty.property.text.toLowerCase() != name || lastProperty.colorType != "compat")){
-                                reporter.report("Fallback " + name + " (hex or RGB) should precede " + colorType + " " + name + ".", event.line, event.col, rule);
-                            }
-                        } else {
-                            event.colorType = "compat";
-                        }
-                    }
-                    
-                    i++;
-                }
-            }
-
-            lastProperty = event;
-        });        
-         
-    }
-
-});
-/*
- * Rule: You shouldn't use more than 10 floats. If you do, there's probably
- * room for some abstraction.
- */
-/*global CSSLint*/
-CSSLint.addRule({
-
-    //rule information
-    id: "floats",
-    name: "Disallow too many floats",
-    desc: "This rule tests if the float property is used too many times",
-    browsers: "All",
-
-    //initialization
-    init: function(parser, reporter){
-        var rule = this;
-        var count = 0;
-
-        //count how many times "float" is used
-        parser.addListener("property", function(event){
-            if (event.property.text.toLowerCase() == "float" &&
-                    event.value.text.toLowerCase() != "none"){
-                count++;
-            }
-        });
-
-        //report the results
-        parser.addListener("endstylesheet", function(){
-            reporter.stat("floats", count);
-            if (count >= 10){
-                reporter.rollupWarn("Too many floats (" + count + "), you're probably using them for layout. Consider using a grid system instead.", rule);
-            }
-        });
-    }
-
-});
-/*
- * Rule: Avoid too many @font-face declarations in the same stylesheet.
- */
-/*global CSSLint*/
-CSSLint.addRule({
-
-    //rule information
-    id: "font-faces",
-    name: "Don't use too many web fonts",
-    desc: "Too many different web fonts in the same stylesheet.",
-    browsers: "All",
-
-    //initialization
-    init: function(parser, reporter){
-        var rule = this,
-            count = 0;
-
-
-        parser.addListener("startfontface", function(){
-            count++;
-        });
-
-        parser.addListener("endstylesheet", function(){
-            if (count > 5){
-                reporter.rollupWarn("Too many @font-face declarations (" + count + ").", rule);
-            }
-        });
-    }
-
-});
-/*
- * Rule: You shouldn't need more than 9 font-size declarations.
- */
-
-/*global CSSLint*/
-CSSLint.addRule({
-
-    //rule information
-    id: "font-sizes",
-    name: "Disallow too many font sizes",
-    desc: "Checks the number of font-size declarations.",
-    browsers: "All",
-
-    //initialization
-    init: function(parser, reporter){
-        var rule = this,
-            count = 0;
-
-        //check for use of "font-size"
-        parser.addListener("property", function(event){
-            if (event.property == "font-size"){
-                count++;
-            }
-        });
-
-        //report the results
-        parser.addListener("endstylesheet", function(){
-            reporter.stat("font-sizes", count);
-            if (count >= 10){
-                reporter.rollupWarn("Too many font-size declarations (" + count + "), abstraction needed.", rule);
-            }
-        });
-    }
-
-});
-/*
- * Rule: When using a vendor-prefixed gradient, make sure to use them all.
- */
-/*global CSSLint*/
-CSSLint.addRule({
-
-    //rule information
-    id: "gradients",
-    name: "Require all gradient definitions",
-    desc: "When using a vendor-prefixed gradient, make sure to use them all.",
-    browsers: "All",
-
-    //initialization
-    init: function(parser, reporter){
-        var rule = this,
-            gradients;
-
-        parser.addListener("startrule", function(){
-            gradients = {
-                moz: 0,
-                webkit: 0,
-                oldWebkit: 0,
-                ms: 0,
-                o: 0
-            };
-        });
-
-        parser.addListener("property", function(event){
-
-            if (/\-(moz|ms|o|webkit)(?:\-(?:linear|radial))\-gradient/i.test(event.value)){
-                gradients[RegExp.$1] = 1;
-            } else if (/\-webkit\-gradient/i.test(event.value)){
-                gradients.oldWebkit = 1;
-            }
-
-        });
-
-        parser.addListener("endrule", function(event){
-            var missing = [];
-
-            if (!gradients.moz){
-                missing.push("Firefox 3.6+");
-            }
-
-            if (!gradients.webkit){
-                missing.push("Webkit (Safari 5+, Chrome)");
-            }
-            
-            if (!gradients.oldWebkit){
-                missing.push("Old Webkit (Safari 4+, Chrome)");
-            }
-
-            if (!gradients.ms){
-                missing.push("Internet Explorer 10+");
-            }
-
-            if (!gradients.o){
-                missing.push("Opera 11.1+");
-            }
-
-            if (missing.length && missing.length < 5){            
-                reporter.report("Missing vendor-prefixed CSS gradients for " + missing.join(", ") + ".", event.selectors[0].line, event.selectors[0].col, rule); 
-            }
-
-        });
-
-    }
-
-});
-/*
- * Rule: Don't use IDs for selectors.
- */
-/*global CSSLint*/
-CSSLint.addRule({
-
-    //rule information
-    id: "ids",
-    name: "Disallow IDs in selectors",
-    desc: "Selectors should not contain IDs.",
-    browsers: "All",
-
-    //initialization
-    init: function(parser, reporter){
-        var rule = this;
-        parser.addListener("startrule", function(event){
-            var selectors = event.selectors,
-                selector,
-                part,
-                modifier,
-                idCount,
-                i, j, k;
-
-            for (i=0; i < selectors.length; i++){
-                selector = selectors[i];
-                idCount = 0;
-
-                for (j=0; j < selector.parts.length; j++){
-                    part = selector.parts[j];
-                    if (part.type == parser.SELECTOR_PART_TYPE){
-                        for (k=0; k < part.modifiers.length; k++){
-                            modifier = part.modifiers[k];
-                            if (modifier.type == "id"){
-                                idCount++;
-                            }
-                        }
-                    }
-                }
-
-                if (idCount == 1){
-                    reporter.report("Don't use IDs in selectors.", selector.line, selector.col, rule);
-                } else if (idCount > 1){
-                    reporter.report(idCount + " IDs in the selector, really?", selector.line, selector.col, rule);
-                }
-            }
-
-        });
-    }
-
-});
-/*
- * Rule: Don't use @import, use <link> instead.
- */
-/*global CSSLint*/
-CSSLint.addRule({
-
-    //rule information
-    id: "import",
-    name: "Disallow @import",
-    desc: "Don't use @import, use <link> instead.",
-    browsers: "All",
-
-    //initialization
-    init: function(parser, reporter){
-        var rule = this;
-        
-        parser.addListener("import", function(event){        
-            reporter.report("@import prevents parallel downloads, use <link> instead.", event.line, event.col, rule);
-        });
-
-    }
-
-});
-/*
- * Rule: Make sure !important is not overused, this could lead to specificity
- * war. Display a warning on !important declarations, an error if it's
- * used more at least 10 times.
- */
-/*global CSSLint*/
-CSSLint.addRule({
-
-    //rule information
-    id: "important",
-    name: "Disallow !important",
-    desc: "Be careful when using !important declaration",
-    browsers: "All",
-
-    //initialization
-    init: function(parser, reporter){
-        var rule = this,
-            count = 0;
-
-        //warn that important is used and increment the declaration counter
-        parser.addListener("property", function(event){
-            if (event.important === true){
-                count++;
-                reporter.report("Use of !important", event.line, event.col, rule);
-            }
-        });
-
-        //if there are more than 10, show an error
-        parser.addListener("endstylesheet", function(){
-            reporter.stat("important", count);
-            if (count >= 10){
-                reporter.rollupWarn("Too many !important declarations (" + count + "), try to use less than 10 to avoid specifity issues.", rule);
-            }
-        });
-    }
-
-});
-/*
- * Rule: Properties should be known (listed in CSS3 specification) or
- * be a vendor-prefixed property.
- */
-/*global CSSLint*/
-CSSLint.addRule({
-
-    //rule information
-    id: "known-properties",
-    name: "Require use of known properties",
-    desc: "Properties should be known (listed in CSS specification) or be a vendor-prefixed property.",
-    browsers: "All",
-
-    //initialization
-    init: function(parser, reporter){
-        var rule = this,
-            properties = {
-
-                "alignment-adjust": 1,
-                "alignment-baseline": 1,
-                "animation": 1,
-                "animation-delay": 1,
-                "animation-direction": 1,
-                "animation-duration": 1,
-                "animation-fill-mode": 1,
-                "animation-iteration-count": 1,
-                "animation-name": 1,
-                "animation-play-state": 1,
-                "animation-timing-function": 1,
-                "appearance": 1,
-                "azimuth": 1,
-                "backface-visibility": 1,
-                "background": 1,
-                "background-attachment": 1,
-                "background-break": 1,
-                "background-clip": 1,
-                "background-color": 1,
-                "background-image": 1,
-                "background-origin": 1,
-                "background-position": 1,
-                "background-repeat": 1,
-                "background-size": 1,
-                "baseline-shift": 1,
-                "binding": 1,
-                "bleed": 1,
-                "bookmark-label": 1,
-                "bookmark-level": 1,
-                "bookmark-state": 1,
-                "bookmark-target": 1,
-                "border": 1,
-                "border-bottom": 1,
-                "border-bottom-color": 1,
-                "border-bottom-left-radius": 1,
-                "border-bottom-right-radius": 1,
-                "border-bottom-style": 1,
-                "border-bottom-width": 1,
-                "border-collapse": 1,
-                "border-color": 1,
-                "border-image": 1,
-                "border-image-outset": 1,
-                "border-image-repeat": 1,
-                "border-image-slice": 1,
-                "border-image-source": 1,
-                "border-image-width": 1,
-                "border-left": 1,
-                "border-left-color": 1,
-                "border-left-style": 1,
-                "border-left-width": 1,
-                "border-radius": 1,
-                "border-right": 1,
-                "border-right-color": 1,
-                "border-right-style": 1,
-                "border-right-width": 1,
-                "border-spacing": 1,
-                "border-style": 1,
-                "border-top": 1,
-                "border-top-color": 1,
-                "border-top-left-radius": 1,
-                "border-top-right-radius": 1,
-                "border-top-style": 1,
-                "border-top-width": 1,
-                "border-width": 1,
-                "bottom": 1, 
-                "box-align": 1,
-                "box-decoration-break": 1,
-                "box-direction": 1,
-                "box-flex": 1,
-                "box-flex-group": 1,
-                "box-lines": 1,
-                "box-ordinal-group": 1,
-                "box-orient": 1,
-                "box-pack": 1,
-                "box-shadow": 1,
-                "box-sizing": 1,
-                "break-after": 1,
-                "break-before": 1,
-                "break-inside": 1,
-                "caption-side": 1,
-                "clear": 1,
-                "clip": 1,
-                "color": 1,
-                "color-profile": 1,
-                "column-count": 1,
-                "column-fill": 1,
-                "column-gap": 1,
-                "column-rule": 1,
-                "column-rule-color": 1,
-                "column-rule-style": 1,
-                "column-rule-width": 1,
-                "column-span": 1,
-                "column-width": 1,
-                "columns": 1,
-                "content": 1,
-                "counter-increment": 1,
-                "counter-reset": 1,
-                "crop": 1,
-                "cue": 1,
-                "cue-after": 1,
-                "cue-before": 1,
-                "cursor": 1,
-                "direction": 1,
-                "display": 1,
-                "dominant-baseline": 1,
-                "drop-initial-after-adjust": 1,
-                "drop-initial-after-align": 1,
-                "drop-initial-before-adjust": 1,
-                "drop-initial-before-align": 1,
-                "drop-initial-size": 1,
-                "drop-initial-value": 1,
-                "elevation": 1,
-                "empty-cells": 1,
-                "fit": 1,
-                "fit-position": 1,
-                "float": 1,                
-                "float-offset": 1,
-                "font": 1,
-                "font-family": 1,
-                "font-size": 1,
-                "font-size-adjust": 1,
-                "font-stretch": 1,
-                "font-style": 1,
-                "font-variant": 1,
-                "font-weight": 1,
-                "grid-columns": 1,
-                "grid-rows": 1,
-                "hanging-punctuation": 1,
-                "height": 1,
-                "hyphenate-after": 1,
-                "hyphenate-before": 1,
-                "hyphenate-character": 1,
-                "hyphenate-lines": 1,
-                "hyphenate-resource": 1,
-                "hyphens": 1,
-                "icon": 1,
-                "image-orientation": 1,
-                "image-rendering": 1,
-                "image-resolution": 1,
-                "inline-box-align": 1,
-                "left": 1,
-                "letter-spacing": 1,
-                "line-height": 1,
-                "line-stacking": 1,
-                "line-stacking-ruby": 1,
-                "line-stacking-shift": 1,
-                "line-stacking-strategy": 1,
-                "list-style": 1,
-                "list-style-image": 1,
-                "list-style-position": 1,
-                "list-style-type": 1,
-                "margin": 1,
-                "margin-bottom": 1,
-                "margin-left": 1,
-                "margin-right": 1,
-                "margin-top": 1,
-                "mark": 1,
-                "mark-after": 1,
-                "mark-before": 1,
-                "marks": 1,
-                "marquee-direction": 1,
-                "marquee-play-count": 1,
-                "marquee-speed": 1,
-                "marquee-style": 1,
-                "max-height": 1,
-                "max-width": 1,
-                "min-height": 1,
-                "min-width": 1,
-                "move-to": 1,
-                "nav-down": 1,
-                "nav-index": 1,
-                "nav-left": 1,
-                "nav-right": 1,
-                "nav-up": 1,
-                "opacity": 1,
-                "orphans": 1,
-                "outline": 1,
-                "outline-color": 1,
-                "outline-offset": 1,
-                "outline-style": 1,
-                "outline-width": 1,
-                "overflow": 1,
-                "overflow-style": 1,
-                "overflow-x": 1,
-                "overflow-y": 1,
-                "padding": 1,
-                "padding-bottom": 1,
-                "padding-left": 1,
-                "padding-right": 1,
-                "padding-top": 1,
-                "page": 1,
-                "page-break-after": 1,
-                "page-break-before": 1,
-                "page-break-inside": 1,
-                "page-policy": 1,
-                "pause": 1,
-                "pause-after": 1,
-                "pause-before": 1,
-                "perspective": 1,
-                "perspective-origin": 1,
-                "phonemes": 1,
-                "pitch": 1,
-                "pitch-range": 1,
-                "play-during": 1,
-                "position": 1,
-                "presentation-level": 1,
-                "punctuation-trim": 1,
-                "quotes": 1,
-                "rendering-intent": 1,
-                "resize": 1,
-                "rest": 1,
-                "rest-after": 1,
-                "rest-before": 1,
-                "richness": 1,
-                "right": 1,
-                "rotation": 1,
-                "rotation-point": 1,
-                "ruby-align": 1,
-                "ruby-overhang": 1,
-                "ruby-position": 1,
-                "ruby-span": 1,
-                "size": 1,
-                "speak": 1,
-                "speak-header": 1,
-                "speak-numeral": 1,
-                "speak-punctuation": 1,
-                "speech-rate": 1,
-                "stress": 1,
-                "string-set": 1,
-                "table-layout": 1,
-                "target": 1,
-                "target-name": 1,
-                "target-new": 1,
-                "target-position": 1,
-                "text-align": 1,
-                "text-align-last": 1,
-                "text-decoration": 1,
-                "text-emphasis": 1,
-                "text-height": 1,
-                "text-indent": 1,
-                "text-justify": 1,
-                "text-outline": 1,
-                "text-shadow": 1,
-                "text-transform": 1,
-                "text-wrap": 1,
-                "top": 1,
-                "transform": 1,
-                "transform-origin": 1,
-                "transform-style": 1,
-                "transition": 1,
-                "transition-delay": 1,
-                "transition-duration": 1,
-                "transition-property": 1,
-                "transition-timing-function": 1,
-                "unicode-bidi": 1,
-                "user-modify": 1,
-                "user-select": 1,
-                "vertical-align": 1,
-                "visibility": 1,
-                "voice-balance": 1,
-                "voice-duration": 1,
-                "voice-family": 1,
-                "voice-pitch": 1,
-                "voice-pitch-range": 1,
-                "voice-rate": 1,
-                "voice-stress": 1,
-                "voice-volume": 1,
-                "volume": 1,
-                "white-space": 1,
-                "white-space-collapse": 1,
-                "widows": 1,
-                "width": 1,
-                "word-break": 1,
-                "word-spacing": 1,
-                "word-wrap": 1,
-                "z-index": 1,
-                
-                //IE
-                "filter": 1,
-                "zoom": 1,
-                
-                //@font-face
-                "src": 1
-            };
-
-        parser.addListener("property", function(event){
-            var name = event.property.text.toLowerCase();
-
-            if (event.invalid) {
-                reporter.report(event.invalid.message, event.line, event.col, rule);
-            }
-            //if (!properties[name] && name.charAt(0) != "-"){
-            //    reporter.error("Unknown property '" + event.property + "'.", event.line, event.col, rule);
-            //}
-
-        });
-    }
-
-});
-/*
- * Rule: outline: none or outline: 0 should only be used in a :focus rule
- *       and only if there are other properties in the same rule.
- */
-/*global CSSLint*/
-CSSLint.addRule({
-
-    //rule information
-    id: "outline-none",
-    name: "Disallow outline: none",
-    desc: "Use of outline: none or outline: 0 should be limited to :focus rules.",
-    browsers: "All",
-    tags: ["Accessibility"],
-
-    //initialization
-    init: function(parser, reporter){
-        var rule = this,
-            lastRule;
-
-        function startRule(event){
-            if (event.selectors){
-                lastRule = {
-                    line: event.line,
-                    col: event.col,
-                    selectors: event.selectors,
-                    propCount: 0,
-                    outline: false
-                };
-            } else {
-                lastRule = null;
-            }
-        }
-        
-        function endRule(event){
-            if (lastRule){
-                if (lastRule.outline){
-                    if (lastRule.selectors.toString().toLowerCase().indexOf(":focus") == -1){
-                        reporter.report("Outlines should only be modified using :focus.", lastRule.line, lastRule.col, rule);
-                    } else if (lastRule.propCount == 1) {
-                        reporter.report("Outlines shouldn't be hidden unless other visual changes are made.", lastRule.line, lastRule.col, rule);                        
-                    }
-                }
-            }
-        }
-
-        parser.addListener("startrule", startRule);
-        parser.addListener("startfontface", startRule);
-        parser.addListener("startpage", startRule);
-        parser.addListener("startpagemargin", startRule);
-        parser.addListener("startkeyframerule", startRule); 
-
-        parser.addListener("property", function(event){
-            var name = event.property.text.toLowerCase(),
-                value = event.value;                
-                
-            if (lastRule){
-                lastRule.propCount++;
-                if (name == "outline" && (value == "none" || value == "0")){
-                    lastRule.outline = true;
-                }            
-            }
-            
-        });
-        
-        parser.addListener("endrule", endRule);
-        parser.addListener("endfontface", endRule);
-        parser.addListener("endpage", endRule);
-        parser.addListener("endpagemargin", endRule);
-        parser.addListener("endkeyframerule", endRule); 
-
-    }
-
-});
-/*
- * Rule: Don't use classes or IDs with elements (a.foo or a#foo).
- */
-/*global CSSLint*/
-CSSLint.addRule({
-
-    //rule information
-    id: "overqualified-elements",
-    name: "Disallow overqualified elements",
-    desc: "Don't use classes or IDs with elements (a.foo or a#foo).",
-    browsers: "All",
-
-    //initialization
-    init: function(parser, reporter){
-        var rule = this,
-            classes = {};
-            
-        parser.addListener("startrule", function(event){
-            var selectors = event.selectors,
-                selector,
-                part,
-                modifier,
-                i, j, k;
-
-            for (i=0; i < selectors.length; i++){
-                selector = selectors[i];
-
-                for (j=0; j < selector.parts.length; j++){
-                    part = selector.parts[j];
-                    if (part.type == parser.SELECTOR_PART_TYPE){
-                        for (k=0; k < part.modifiers.length; k++){
-                            modifier = part.modifiers[k];
-                            if (part.elementName && modifier.type == "id"){
-                                reporter.report("Element (" + part + ") is overqualified, just use " + modifier + " without element name.", part.line, part.col, rule);
-                            } else if (modifier.type == "class"){
-                                
-                                if (!classes[modifier]){
-                                    classes[modifier] = [];
-                                }
-                                classes[modifier].push({ modifier: modifier, part: part });
-                            }
-                        }
-                    }
-                }
-            }
-        });
-        
-        parser.addListener("endstylesheet", function(){
-        
-            var prop;
-            for (prop in classes){
-                if (classes.hasOwnProperty(prop)){
-                
-                    //one use means that this is overqualified
-                    if (classes[prop].length == 1 && classes[prop][0].part.elementName){
-                        reporter.report("Element (" + classes[prop][0].part + ") is overqualified, just use " + classes[prop][0].modifier + " without element name.", classes[prop][0].part.line, classes[prop][0].part.col, rule);
-                    }
-                }
-            }        
-        });
-    }
-
-});
-/*
- * Rule: Headings (h1-h6) should not be qualified (namespaced).
- */
-/*global CSSLint*/
-CSSLint.addRule({
-
-    //rule information
-    id: "qualified-headings",
-    name: "Disallow qualified headings",
-    desc: "Headings should not be qualified (namespaced).",
-    browsers: "All",
-
-    //initialization
-    init: function(parser, reporter){
-        var rule = this;
-
-        parser.addListener("startrule", function(event){
-            var selectors = event.selectors,
-                selector,
-                part,
-                i, j;
-
-            for (i=0; i < selectors.length; i++){
-                selector = selectors[i];
-
-                for (j=0; j < selector.parts.length; j++){
-                    part = selector.parts[j];
-                    if (part.type == parser.SELECTOR_PART_TYPE){
-                        if (part.elementName && /h[1-6]/.test(part.elementName.toString()) && j > 0){
-                            reporter.report("Heading (" + part.elementName + ") should not be qualified.", part.line, part.col, rule);
-                        }
-                    }
-                }
-            }
-        });
-    }
-
-});
-/*
- * Rule: Selectors that look like regular expressions are slow and should be avoided.
- */
-/*global CSSLint*/
-CSSLint.addRule({
-
-    //rule information
-    id: "regex-selectors",
-    name: "Disallow selectors that look like regexs",
-    desc: "Selectors that look like regular expressions are slow and should be avoided.",
-    browsers: "All",
-
-    //initialization
-    init: function(parser, reporter){
-        var rule = this;
-
-        parser.addListener("startrule", function(event){
-            var selectors = event.selectors,
-                selector,
-                part,
-                modifier,
-                i, j, k;
-
-            for (i=0; i < selectors.length; i++){
-                selector = selectors[i];
-                for (j=0; j < selector.parts.length; j++){
-                    part = selector.parts[j];
-                    if (part.type == parser.SELECTOR_PART_TYPE){
-                        for (k=0; k < part.modifiers.length; k++){
-                            modifier = part.modifiers[k];
-                            if (modifier.type == "attribute"){
-                                if (/([\~\|\^\$\*]=)/.test(modifier)){
-                                    reporter.report("Attribute selectors with " + RegExp.$1 + " are slow!", modifier.line, modifier.col, rule);
-                                }
-                            }
-
-                        }
-                    }
-                }
-            }
-        });
-    }
-
-});
-/*
- * Rule: Total number of rules should not exceed x.
- */
-/*global CSSLint*/
-CSSLint.addRule({
-
-    //rule information
-    id: "rules-count",
-    name: "Rules Count",
-    desc: "Track how many rules there are.",
-    browsers: "All",
-
-    //initialization
-    init: function(parser, reporter){
-        var rule = this,
-            count = 0;
-
-        //count each rule
-        parser.addListener("startrule", function(){
-            count++;
-        });
-
-        parser.addListener("endstylesheet", function(){
-            reporter.stat("rule-count", count);
-        });
-    }
-
-});
-/*
- * Rule: Use shorthand properties where possible.
- * 
- */
-/*global CSSLint*/
-CSSLint.addRule({
-
-    //rule information
-    id: "shorthand",
-    name: "Require shorthand properties",
-    desc: "Use shorthand properties where possible.",
-    browsers: "All",
-    
-    //initialization
-    init: function(parser, reporter){
-        var rule = this,
-            prop, i, len,
-            propertiesToCheck = {},
-            properties,
-            mapping = {
-                "margin": [
-                    "margin-top",
-                    "margin-bottom",
-                    "margin-left",
-                    "margin-right"
-                ],
-                "padding": [
-                    "padding-top",
-                    "padding-bottom",
-                    "padding-left",
-                    "padding-right"
-                ]              
-            };
-            
-        //initialize propertiesToCheck 
-        for (prop in mapping){
-            if (mapping.hasOwnProperty(prop)){
-                for (i=0, len=mapping[prop].length; i < len; i++){
-                    propertiesToCheck[mapping[prop][i]] = prop;
-                }
-            }
-        }
-            
-        function startRule(event){
-            properties = {};
-        }
-        
-        //event handler for end of rules
-        function endRule(event){
-            
-            var prop, i, len, total;
-            
-            //check which properties this rule has
-            for (prop in mapping){
-                if (mapping.hasOwnProperty(prop)){
-                    total=0;
-                    
-                    for (i=0, len=mapping[prop].length; i < len; i++){
-                        total += properties[mapping[prop][i]] ? 1 : 0;
-                    }
-                    
-                    if (total == mapping[prop].length){
-                        reporter.report("The properties " + mapping[prop].join(", ") + " can be replaced by " + prop + ".", event.line, event.col, rule);
-                    }
-                }
-            }
-        }        
-        
-        parser.addListener("startrule", startRule);
-        parser.addListener("startfontface", startRule);
-    
-        //check for use of "font-size"
-        parser.addListener("property", function(event){
-            var name = event.property.toString().toLowerCase(),
-                value = event.value.parts[0].value;
-
-            if (propertiesToCheck[name]){
-                properties[name] = 1;
-            }
-        });
-
-        parser.addListener("endrule", endRule);
-        parser.addListener("endfontface", endRule);     
-
-    }
-
-});
-/*
- * Rule: Don't use text-indent for image replacement if you need to support rtl. 
- * 
- */
-/*global CSSLint*/
-CSSLint.addRule({
-
-    //rule information
-    id: "text-indent",
-    name: "Disallow negative text-indent",
-    desc: "Checks for text indent less than -99px",
-    browsers: "All",
-    
-    //initialization
-    init: function(parser, reporter){
-        var rule = this,
-            textIndent = false;
-            
-            
-        function startRule(event){
-            textIndent = false;
-        }
-        
-        //event handler for end of rules
-        function endRule(event){
-            if (textIndent){
-                reporter.report("Negative text-indent doesn't work well with RTL. If you use text-indent for image replacement explicitly set direction for that item to ltr.", textIndent.line, textIndent.col, rule);
-            }
-        }        
-        
-        parser.addListener("startrule", startRule);
-        parser.addListener("startfontface", startRule);
-    
-        //check for use of "font-size"
-        parser.addListener("property", function(event){
-            var name = event.property.toString().toLowerCase(),
-                value = event.value;
-
-            if (name == "text-indent" && value.parts[0].value < -99){
-                textIndent = event.property;
-            } else if (name == "direction" && value == "ltr"){
-                textIndent = false;
-            }
-        });
-
-        parser.addListener("endrule", endRule);
-        parser.addListener("endfontface", endRule);     
-
-    }
-
-});
-/*
- * Rule: Headings (h1-h6) should be defined only once.
- */
-/*global CSSLint*/
-CSSLint.addRule({
-
-    //rule information
-    id: "unique-headings",
-    name: "Headings should only be defined once",
-    desc: "Headings should be defined only once.",
-    browsers: "All",
-
-    //initialization
-    init: function(parser, reporter){
-        var rule = this;
-
-        var headings =  {
-                h1: 0,
-                h2: 0,
-                h3: 0,
-                h4: 0,
-                h5: 0,
-                h6: 0
-            };
-
-        parser.addListener("startrule", function(event){
-            var selectors = event.selectors,
-                selector,
-                part,
-                pseudo,
-                i, j;
-
-            for (i=0; i < selectors.length; i++){
-                selector = selectors[i];
-                part = selector.parts[selector.parts.length-1];
-
-                if (part.elementName && /(h[1-6])/i.test(part.elementName.toString())){
-                    
-                    for (j=0; j < part.modifiers.length; j++){
-                        if (part.modifiers[j].type == "pseudo"){
-                            pseudo = true;
-                            break;
-                        }
-                    }
-                
-                    if (!pseudo){
-                        headings[RegExp.$1]++;
-                        if (headings[RegExp.$1] > 1) {
-                            reporter.report("Heading (" + part.elementName + ") has already been defined.", part.line, part.col, rule);
-                        }
-                    }
-                }
-            }
-        });
-        
-        parser.addListener("endstylesheet", function(event){
-            var prop,
-                messages = [];
-                
-            for (prop in headings){
-                if (headings.hasOwnProperty(prop)){
-                    if (headings[prop] > 1){
-                        messages.push(headings[prop] + " " + prop + "s");
-                    }
-                }
-            }
-            
-            if (messages.length){
-                reporter.rollupWarn("You have " + messages.join(", ") + " defined in this stylesheet.", rule);
-            }
-        });        
-    }
-
-});
-/*
- * Rule: Don't use universal selector because it's slow.
- */
-/*global CSSLint*/
-CSSLint.addRule({
-
-    //rule information
-    id: "universal-selector",
-    name: "Disallow universal selector",
-    desc: "The universal selector (*) is known to be slow.",
-    browsers: "All",
-
-    //initialization
-    init: function(parser, reporter){
-        var rule = this;
-
-        parser.addListener("startrule", function(event){
-            var selectors = event.selectors,
-                selector,
-                part,
-                modifier,
-                i, j, k;
-
-            for (i=0; i < selectors.length; i++){
-                selector = selectors[i];
-                
-                part = selector.parts[selector.parts.length-1];
-                if (part.elementName == "*"){
-                    reporter.report(rule.desc, part.line, part.col, rule);
-                }
-            }
-        });
-    }
-
-});
-/*
- * Rule: Don't use unqualified attribute selectors because they're just like universal selectors.
- */
-/*global CSSLint*/
-CSSLint.addRule({
-
-    //rule information
-    id: "unqualified-attributes",
-    name: "Disallow unqualified attribute selectors",
-    desc: "Unqualified attribute selectors are known to be slow.",
-    browsers: "All",
-
-    //initialization
-    init: function(parser, reporter){
-        var rule = this;
-
-        parser.addListener("startrule", function(event){
-            
-            var selectors = event.selectors,
-                selector,
-                part,
-                modifier,
-                i, j, k;
-
-            for (i=0; i < selectors.length; i++){
-                selector = selectors[i];
-                
-                part = selector.parts[selector.parts.length-1];
-                if (part.type == parser.SELECTOR_PART_TYPE){
-                    for (k=0; k < part.modifiers.length; k++){
-                        modifier = part.modifiers[k];
-                        if (modifier.type == "attribute" && (!part.elementName || part.elementName == "*")){
-                            reporter.report(rule.desc, part.line, part.col, rule);                               
-                        }
-                    }
-                }
-                
-            }            
-        });
-    }
-
-});
-/*
- * Rule: When using a vendor-prefixed property, make sure to
- * include the standard one.
- */
-/*global CSSLint*/
-CSSLint.addRule({
-
-    //rule information
-    id: "vendor-prefix",
-    name: "Require standard property with vendor prefix",
-    desc: "When using a vendor-prefixed property, make sure to include the standard one.",
-    browsers: "All",
-
-    //initialization
-    init: function(parser, reporter){
-        var rule = this,
-            properties,
-            num,
-            propertiesToCheck = {
-                "-webkit-border-radius": "border-radius",
-                "-webkit-border-top-left-radius": "border-top-left-radius",
-                "-webkit-border-top-right-radius": "border-top-right-radius",
-                "-webkit-border-bottom-left-radius": "border-bottom-left-radius",
-                "-webkit-border-bottom-right-radius": "border-bottom-right-radius",
-                
-                "-o-border-radius": "border-radius",
-                "-o-border-top-left-radius": "border-top-left-radius",
-                "-o-border-top-right-radius": "border-top-right-radius",
-                "-o-border-bottom-left-radius": "border-bottom-left-radius",
-                "-o-border-bottom-right-radius": "border-bottom-right-radius",
-                
-                "-moz-border-radius": "border-radius",
-                "-moz-border-radius-topleft": "border-top-left-radius",
-                "-moz-border-radius-topright": "border-top-right-radius",
-                "-moz-border-radius-bottomleft": "border-bottom-left-radius",
-                "-moz-border-radius-bottomright": "border-bottom-right-radius",                
-                
-                "-moz-column-count": "column-count",
-                "-webkit-column-count": "column-count",
-                
-                "-moz-column-gap": "column-gap",
-                "-webkit-column-gap": "column-gap",
-                
-                "-moz-column-rule": "column-rule",
-                "-webkit-column-rule": "column-rule",
-                
-                "-moz-column-rule-style": "column-rule-style",
-                "-webkit-column-rule-style": "column-rule-style",
-                
-                "-moz-column-rule-color": "column-rule-color",
-                "-webkit-column-rule-color": "column-rule-color",
-                
-                "-moz-column-rule-width": "column-rule-width",
-                "-webkit-column-rule-width": "column-rule-width",
-                
-                "-moz-column-width": "column-width",
-                "-webkit-column-width": "column-width",
-                
-                "-webkit-column-span": "column-span",
-                "-webkit-columns": "columns",
-                
-                "-moz-box-shadow": "box-shadow",
-                "-webkit-box-shadow": "box-shadow",
-                
-                "-moz-transform" : "transform",
-                "-webkit-transform" : "transform",
-                "-o-transform" : "transform",
-                "-ms-transform" : "transform",
-                
-                "-moz-transform-origin" : "transform-origin",
-                "-webkit-transform-origin" : "transform-origin",
-                "-o-transform-origin" : "transform-origin",
-                "-ms-transform-origin" : "transform-origin",
-                
-                "-moz-box-sizing" : "box-sizing",
-                "-webkit-box-sizing" : "box-sizing",
-                
-                "-moz-user-select" : "user-select",
-                "-khtml-user-select" : "user-select",
-                "-webkit-user-select" : "user-select"                
-            };
-
-        //event handler for beginning of rules
-        function startRule(){
-            properties = {};
-            num=1;        
-        }
-        
-        //event handler for end of rules
-        function endRule(event){
-            var prop,
-                i, len,
-                standard,
-                needed,
-                actual,
-                needsStandard = [];
-
-            for (prop in properties){
-                if (propertiesToCheck[prop]){
-                    needsStandard.push({ actual: prop, needed: propertiesToCheck[prop]});
-                }
-            }
-
-            for (i=0, len=needsStandard.length; i < len; i++){
-                needed = needsStandard[i].needed;
-                actual = needsStandard[i].actual;
-
-                if (!properties[needed]){               
-                    reporter.report("Missing standard property '" + needed + "' to go along with '" + actual + "'.", properties[actual][0].name.line, properties[actual][0].name.col, rule);
-                } else {
-                    //make sure standard property is last
-                    if (properties[needed][0].pos < properties[actual][0].pos){
-                        reporter.report("Standard property '" + needed + "' should come after vendor-prefixed property '" + actual + "'.", properties[actual][0].name.line, properties[actual][0].name.col, rule);
-                    }
-                }
-            }
-
-        }        
-        
-        parser.addListener("startrule", startRule);
-        parser.addListener("startfontface", startRule);
-        parser.addListener("startpage", startRule);
-        parser.addListener("startpagemargin", startRule);
-        parser.addListener("startkeyframerule", startRule);         
-
-        parser.addListener("property", function(event){
-            var name = event.property.text.toLowerCase();
-
-            if (!properties[name]){
-                properties[name] = [];
-            }
-
-            properties[name].push({ name: event.property, value : event.value, pos:num++ });
-        });
-
-        parser.addListener("endrule", endRule);
-        parser.addListener("endfontface", endRule);
-        parser.addListener("endpage", endRule);
-        parser.addListener("endpagemargin", endRule);
-        parser.addListener("endkeyframerule", endRule);         
-    }
-
-});
-/*
- * Rule: You don't need to specify units when a value is 0.
- */
-/*global CSSLint*/
-CSSLint.addRule({
-
-    //rule information
-    id: "zero-units",
-    name: "Disallow units for 0 values",
-    desc: "You don't need to specify units when a value is 0.",
-    browsers: "All",
-
-    //initialization
-    init: function(parser, reporter){
-        var rule = this;
-
-        //count how many times "float" is used
-        parser.addListener("property", function(event){
-            var parts = event.value.parts,
-                i = 0, 
-                len = parts.length;
-
-            while(i < len){
-                if ((parts[i].units || parts[i].type == "percentage") && parts[i].value === 0 && parts[i].type != "time"){
-                    reporter.report("Values of 0 shouldn't have units specified.", parts[i].line, parts[i].col, rule);
-                }
-                i++;
-            }
-
-        });
-
-    }
-
-});
-/*global CSSLint*/
-CSSLint.addFormatter({
-    //format information
-    id: "checkstyle-xml",
-    name: "Checkstyle XML format",
-
-    /**
-     * Return opening root XML tag.
-     * @return {String} to prepend before all results
-     */
-    startFormat: function(){
-        return "<?xml version=\"1.0\" encoding=\"utf-8\"?><checkstyle>";
-    },
-
-    /**
-     * Return closing root XML tag.
-     * @return {String} to append after all results
-     */
-    endFormat: function(){
-        return "</checkstyle>";
-    },
-
-    /**
-     * Given CSS Lint results for a file, return output for this format.
-     * @param results {Object} with error and warning messages
-     * @param filename {String} relative file path
-     * @param options {Object} (UNUSED for now) specifies special handling of output
-     * @return {String} output for results
-     */
-    formatResults: function(results, filename, options) {
-        var messages = results.messages,
-            output = [];
-
-        /**
-         * Generate a source string for a rule.
-         * Checkstyle source strings usually resemble Java class names e.g
-         * net.csslint.SomeRuleName
-         * @param {Object} rule
-         * @return rule source as {String}
-         */
-        var generateSource = function(rule) {
-            if (!rule || !('name' in rule)) {
-                return "";
-            }
-            return 'net.csslint.' + rule.name.replace(/\s/g,'');
-        };
-
-        /**
-         * Replace special characters before write to output.
-         *
-         * Rules:
-         *  - single quotes is the escape sequence for double-quotes
-         *  - &lt; is the escape sequence for <
-         *  - &gt; is the escape sequence for >
-         *
-         * @param {String} message to escape
-         * @return escaped message as {String}
-         */
-        var escapeSpecialCharacters = function(str) {
-            if (!str || str.constructor !== String) {
-                return "";
-            }
-            return str.replace(/\"/g, "'").replace(/</g, "&lt;").replace(/>/g, "&gt;");
-        };
-
-        if (messages.length > 0) {
-            output.push("<file name=\""+filename+"\">");
-            CSSLint.Util.forEach(messages, function (message, i) {
-                //ignore rollups for now
-                if (!message.rollup) {
-                  output.push("<error line=\"" + message.line + "\" column=\"" + message.col + "\" severity=\"" + message.type + "\"" +
-                      " message=\"" + escapeSpecialCharacters(message.message) + "\" source=\"" + generateSource(message.rule) +"\"/>");
-                }
-            });
-            output.push("</file>");
-        }
-
-        return output.join("");
-    }
-});
-/*global CSSLint*/
-CSSLint.addFormatter({
-    //format information
-    id: "compact",
-    name: "Compact, 'porcelain' format",
-
-    /**
-     * Return content to be printed before all file results.
-     * @return {String} to prepend before all results
-     */
-    startFormat: function() {
-        return "";
-    },
-
-    /**
-     * Return content to be printed after all file results.
-     * @return {String} to append after all results
-     */
-    endFormat: function() {
-        return "";
-    },
-
-    /**
-     * Given CSS Lint results for a file, return output for this format.
-     * @param results {Object} with error and warning messages
-     * @param filename {String} relative file path
-     * @param options {Object} (Optional) specifies special handling of output
-     * @return {String} output for results
-     */
-    formatResults: function(results, filename, options) {
-        var messages = results.messages,
-            output = "";
-        options = options || {};
-
-        /**
-         * Capitalize and return given string.
-         * @param str {String} to capitalize
-         * @return {String} capitalized
-         */
-        var capitalize = function(str) {
-            return str.charAt(0).toUpperCase() + str.slice(1);
-        };
-
-        if (messages.length === 0) {
-            return options.quiet ? "" : filename + ": Lint Free!";
-        }
-
-        CSSLint.Util.forEach(messages, function(message, i) {
-            if (message.rollup) {
-                output += filename + ": " + capitalize(message.type) + " - " + message.message + "\n";
-            } else {
-                output += filename + ": " + "line " + message.line + 
-                    ", col " + message.col + ", " + capitalize(message.type) + " - " + message.message + "\n";
-            }
-        });
-    
-        return output;
-    }
-});
-/*global CSSLint*/
-CSSLint.addFormatter({
-    //format information
-    id: "csslint-xml",
-    name: "CSSLint XML format",
-
-    /**
-     * Return opening root XML tag.
-     * @return {String} to prepend before all results
-     */
-    startFormat: function(){
-        return "<?xml version=\"1.0\" encoding=\"utf-8\"?><csslint>";
-    },
-
-    /**
-     * Return closing root XML tag.
-     * @return {String} to append after all results
-     */
-    endFormat: function(){
-        return "</csslint>";
-    },
-
-    /**
-     * Given CSS Lint results for a file, return output for this format.
-     * @param results {Object} with error and warning messages
-     * @param filename {String} relative file path
-     * @param options {Object} (UNUSED for now) specifies special handling of output
-     * @return {String} output for results
-     */
-    formatResults: function(results, filename, options) {
-        var messages = results.messages,
-            output = [];
-
-        /**
-         * Replace special characters before write to output.
-         *
-         * Rules:
-         *  - single quotes is the escape sequence for double-quotes
-         *  - &lt; is the escape sequence for <
-         *  - &gt; is the escape sequence for >
-         * 
-         * @param {String} message to escape
-         * @return escaped message as {String}
-         */
-        var escapeSpecialCharacters = function(str) {
-            if (!str || str.constructor !== String) {
-                return "";
-            }
-            return str.replace(/\"/g, "'").replace(/</g, "&lt;").replace(/>/g, "&gt;");
-        };
-
-        if (messages.length > 0) {
-            output.push("<file name=\""+filename+"\">");
-            CSSLint.Util.forEach(messages, function (message, i) {
-                if (message.rollup) {
-                    output.push("<issue severity=\"" + message.type + "\" reason=\"" + escapeSpecialCharacters(message.message) + "\" evidence=\"" + escapeSpecialCharacters(message.evidence) + "\"/>");
-                } else {
-                    output.push("<issue line=\"" + message.line + "\" char=\"" + message.col + "\" severity=\"" + message.type + "\"" +
-                        " reason=\"" + escapeSpecialCharacters(message.message) + "\" evidence=\"" + escapeSpecialCharacters(message.evidence) + "\"/>");
-                }
-            });
-            output.push("</file>");
-        }
-
-        return output.join("");
-    }
-});
-/*global CSSLint*/
-CSSLint.addFormatter({
-    //format information
-    id: "lint-xml",
-    name: "Lint XML format",
-
-    /**
-     * Return opening root XML tag.
-     * @return {String} to prepend before all results
-     */
-    startFormat: function(){
-        return "<?xml version=\"1.0\" encoding=\"utf-8\"?><lint>";
-    },
-
-    /**
-     * Return closing root XML tag.
-     * @return {String} to append after all results
-     */
-    endFormat: function(){
-        return "</lint>";
-    },
-
-    /**
-     * Given CSS Lint results for a file, return output for this format.
-     * @param results {Object} with error and warning messages
-     * @param filename {String} relative file path
-     * @param options {Object} (UNUSED for now) specifies special handling of output
-     * @return {String} output for results
-     */
-    formatResults: function(results, filename, options) {
-        var messages = results.messages,
-            output = [];
-
-        /**
-         * Replace special characters before write to output.
-         *
-         * Rules:
-         *  - single quotes is the escape sequence for double-quotes
-         *  - &lt; is the escape sequence for <
-         *  - &gt; is the escape sequence for >
-         * 
-         * @param {String} message to escape
-         * @return escaped message as {String}
-         */
-        var escapeSpecialCharacters = function(str) {
-            if (!str || str.constructor !== String) {
-                return "";
-            }
-            return str.replace(/\"/g, "'").replace(/</g, "&lt;").replace(/>/g, "&gt;");
-        };
-
-        if (messages.length > 0) {
-        
-            output.push("<file name=\""+filename+"\">");
-            CSSLint.Util.forEach(messages, function (message, i) {
-                if (message.rollup) {
-                    output.push("<issue severity=\"" + message.type + "\" reason=\"" + escapeSpecialCharacters(message.message) + "\" evidence=\"" + escapeSpecialCharacters(message.evidence) + "\"/>");
-                } else {
-                    output.push("<issue line=\"" + message.line + "\" char=\"" + message.col + "\" severity=\"" + message.type + "\"" +
-                        " reason=\"" + escapeSpecialCharacters(message.message) + "\" evidence=\"" + escapeSpecialCharacters(message.evidence) + "\"/>");
-                }
-            });
-            output.push("</file>");
-        }
-
-        return output.join("");
-    }
-});
-/*global CSSLint*/
-CSSLint.addFormatter({
-    //format information
-    id: "text",
-    name: "Plain Text",
-
-    /**
-     * Return content to be printed before all file results.
-     * @return {String} to prepend before all results
-     */
-    startFormat: function() {
-        return "";
-    },
-
-    /**
-     * Return content to be printed after all file results.
-     * @return {String} to append after all results
-     */
-    endFormat: function() {
-        return "";
-    },
-
-    /**
-     * Given CSS Lint results for a file, return output for this format.
-     * @param results {Object} with error and warning messages
-     * @param filename {String} relative file path
-     * @param options {Object} (Optional) specifies special handling of output
-     * @return {String} output for results
-     */
-    formatResults: function(results, filename, options) {
-        var messages = results.messages,
-            output = "";
-        options = options || {};
-
-        if (messages.length === 0) {
-            return options.quiet ? "" : "\n\ncsslint: No errors in " + filename + ".";
-        }
-
-        output = "\n\ncsslint: There are " + messages.length  +  " problems in " + filename + ".";
-        var pos = filename.lastIndexOf("/"),
-            shortFilename = filename;
-
-        if (pos === -1){
-            pos = filename.lastIndexOf("\\");       
-        }
-        if (pos > -1){
-            shortFilename = filename.substring(pos+1);
-        }
-
-        CSSLint.Util.forEach(messages, function (message, i) {
-            output = output + "\n\n" + shortFilename;
-            if (message.rollup) {
-                output += "\n" + (i+1) + ": " + message.type;
-                output += "\n" + message.message;
-            } else {
-                output += "\n" + (i+1) + ": " + message.type + " at line " + message.line + ", col " + message.col;
-                output += "\n" + message.message;
-                output += "\n" + message.evidence;
-            }
-        });
-    
-        return output;
-    }
-});
-
-
-exports.CSSLint = CSSLint;
-
-
-});
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/worker-javascript.js b/apps/files_texteditor/js/aceeditor/worker-javascript.js
deleted file mode 100644
index 179228493c..0000000000
--- a/apps/files_texteditor/js/aceeditor/worker-javascript.js
+++ /dev/null
@@ -1,10614 +0,0 @@
-"no use strict";
-
-var console = {
-    log: function(msg) {
-        postMessage({type: "log", data: msg});
-    }
-};
-var window = {
-    console: console
-};
-
-var normalizeModule = function(parentId, moduleName) {
-    // normalize plugin requires
-    if (moduleName.indexOf("!") !== -1) {
-        var chunks = moduleName.split("!");
-        return normalizeModule(parentId, chunks[0]) + "!" + normalizeModule(parentId, chunks[1]);
-    }
-    // normalize relative requires
-    if (moduleName.charAt(0) == ".") {
-        var base = parentId.split("/").slice(0, -1).join("/");
-        var moduleName = base + "/" + moduleName;
-        
-        while(moduleName.indexOf(".") !== -1 && previous != moduleName) {
-            var previous = moduleName;
-            var moduleName = moduleName.replace(/\/\.\//, "/").replace(/[^\/]+\/\.\.\//, "");
-        }
-    }
-    
-    return moduleName;
-};
-
-var require = function(parentId, id) {
-    var id = normalizeModule(parentId, id);
-    
-    var module = require.modules[id];
-    if (module) {
-        if (!module.initialized) {
-            module.exports = module.factory().exports;
-            module.initialized = true;
-        }
-        return module.exports;
-    }
-    
-    var chunks = id.split("/");
-    chunks[0] = require.tlns[chunks[0]] || chunks[0];
-    var path = chunks.join("/") + ".js";
-    
-    require.id = id;
-    importScripts(path);
-    return require(parentId, id);    
-};
-
-require.modules = {};
-require.tlns = {};
-
-var define = function(id, deps, factory) {
-    if (arguments.length == 2) {
-        factory = deps;
-    } else if (arguments.length == 1) {
-        factory = id;
-        id = require.id;
-    }
-
-    if (id.indexOf("text!") === 0) 
-        return;
-    
-    var req = function(deps, factory) {
-        return require(id, deps, factory);
-    };
-
-    require.modules[id] = {
-        factory: function() {
-            var module = {
-                exports: {}
-            };
-            var returnExports = factory(req, module.exports, module);
-            if (returnExports)
-                module.exports = returnExports;
-            return module;
-        }
-    };
-};
-
-function initBaseUrls(topLevelNamespaces) {
-    require.tlns = topLevelNamespaces;
-}
-
-function initSender() {
-
-    var EventEmitter = require(null, "ace/lib/event_emitter").EventEmitter;
-    var oop = require(null, "ace/lib/oop");
-    
-    var Sender = function() {};
-    
-    (function() {
-        
-        oop.implement(this, EventEmitter);
-                
-        this.callback = function(data, callbackId) {
-            postMessage({
-                type: "call",
-                id: callbackId,
-                data: data
-            });
-        };
-    
-        this.emit = function(name, data) {
-            postMessage({
-                type: "event",
-                name: name,
-                data: data
-            });
-        };
-        
-    }).call(Sender.prototype);
-    
-    return new Sender();
-}
-
-var main;
-var sender;
-
-onmessage = function(e) {
-    var msg = e.data;
-    if (msg.command) {
-        main[msg.command].apply(main, msg.args);
-    }
-    else if (msg.init) {        
-        initBaseUrls(msg.tlns);
-        require(null, "ace/lib/fixoldbrowsers");
-        sender = initSender();
-        var clazz = require(null, msg.module)[msg.classname];
-        main = new clazz(sender);
-    } 
-    else if (msg.event && sender) {
-        sender._emit(msg.event, msg.data);
-    }
-};
-// vim:set ts=4 sts=4 sw=4 st:
-// -- kriskowal Kris Kowal Copyright (C) 2009-2010 MIT License
-// -- tlrobinson Tom Robinson Copyright (C) 2009-2010 MIT License (Narwhal Project)
-// -- dantman Daniel Friesen Copyright(C) 2010 XXX No License Specified
-// -- fschaefer Florian Schäfer Copyright (C) 2010 MIT License
-// -- Irakli Gozalishvili Copyright (C) 2010 MIT License
-
-/*!
-    Copyright (c) 2009, 280 North Inc. http://280north.com/
-    MIT License. http://github.com/280north/narwhal/blob/master/README.md
-*/
-
-define('ace/lib/fixoldbrowsers', ['require', 'exports', 'module' , 'ace/lib/regexp', 'ace/lib/es5-shim'], function(require, exports, module) {
-"use strict";
-
-require("./regexp");
-require("./es5-shim");
-
-});/**
- *  Based on code from:
- *
- * XRegExp 1.5.0
- * (c) 2007-2010 Steven Levithan
- * MIT License
- * <http://xregexp.com>
- * Provides an augmented, extensible, cross-browser implementation of regular expressions,
- * including support for additional syntax, flags, and methods
- */
- 
-define('ace/lib/regexp', ['require', 'exports', 'module' ], function(require, exports, module) {
-"use strict";
-
-    //---------------------------------
-    //  Private variables
-    //---------------------------------
-
-    var real = {
-            exec: RegExp.prototype.exec,
-            test: RegExp.prototype.test,
-            match: String.prototype.match,
-            replace: String.prototype.replace,
-            split: String.prototype.split
-        },
-        compliantExecNpcg = real.exec.call(/()??/, "")[1] === undefined, // check `exec` handling of nonparticipating capturing groups
-        compliantLastIndexIncrement = function () {
-            var x = /^/g;
-            real.test.call(x, "");
-            return !x.lastIndex;
-        }();
-
-    //---------------------------------
-    //  Overriden native methods
-    //---------------------------------
-
-    // Adds named capture support (with backreferences returned as `result.name`), and fixes two
-    // cross-browser issues per ES3:
-    // - Captured values for nonparticipating capturing groups should be returned as `undefined`,
-    //   rather than the empty string.
-    // - `lastIndex` should not be incremented after zero-length matches.
-    RegExp.prototype.exec = function (str) {
-        var match = real.exec.apply(this, arguments),
-            name, r2;
-        if ( typeof(str) == 'string' && match) {
-            // Fix browsers whose `exec` methods don't consistently return `undefined` for
-            // nonparticipating capturing groups
-            if (!compliantExecNpcg && match.length > 1 && indexOf(match, "") > -1) {
-                r2 = RegExp(this.source, real.replace.call(getNativeFlags(this), "g", ""));
-                // Using `str.slice(match.index)` rather than `match[0]` in case lookahead allowed
-                // matching due to characters outside the match
-                real.replace.call(str.slice(match.index), r2, function () {
-                    for (var i = 1; i < arguments.length - 2; i++) {
-                        if (arguments[i] === undefined)
-                            match[i] = undefined;
-                    }
-                });
-            }
-            // Attach named capture properties
-            if (this._xregexp && this._xregexp.captureNames) {
-                for (var i = 1; i < match.length; i++) {
-                    name = this._xregexp.captureNames[i - 1];
-                    if (name)
-                       match[name] = match[i];
-                }
-            }
-            // Fix browsers that increment `lastIndex` after zero-length matches
-            if (!compliantLastIndexIncrement && this.global && !match[0].length && (this.lastIndex > match.index))
-                this.lastIndex--;
-        }
-        return match;
-    };
-
-    // Don't override `test` if it won't change anything
-    if (!compliantLastIndexIncrement) {
-        // Fix browser bug in native method
-        RegExp.prototype.test = function (str) {
-            // Use the native `exec` to skip some processing overhead, even though the overriden
-            // `exec` would take care of the `lastIndex` fix
-            var match = real.exec.call(this, str);
-            // Fix browsers that increment `lastIndex` after zero-length matches
-            if (match && this.global && !match[0].length && (this.lastIndex > match.index))
-                this.lastIndex--;
-            return !!match;
-        };
-    }
-
-    //---------------------------------
-    //  Private helper functions
-    //---------------------------------
-
-    function getNativeFlags (regex) {
-        return (regex.global     ? "g" : "") +
-               (regex.ignoreCase ? "i" : "") +
-               (regex.multiline  ? "m" : "") +
-               (regex.extended   ? "x" : "") + // Proposed for ES4; included in AS3
-               (regex.sticky     ? "y" : "");
-    };
-
-    function indexOf (array, item, from) {
-        if (Array.prototype.indexOf) // Use the native array method if available
-            return array.indexOf(item, from);
-        for (var i = from || 0; i < array.length; i++) {
-            if (array[i] === item)
-                return i;
-        }
-        return -1;
-    };
-
-});
-// vim: ts=4 sts=4 sw=4 expandtab
-// -- kriskowal Kris Kowal Copyright (C) 2009-2011 MIT License
-// -- tlrobinson Tom Robinson Copyright (C) 2009-2010 MIT License (Narwhal Project)
-// -- dantman Daniel Friesen Copyright (C) 2010 XXX TODO License or CLA
-// -- fschaefer Florian Schäfer Copyright (C) 2010 MIT License
-// -- Gozala Irakli Gozalishvili Copyright (C) 2010 MIT License
-// -- kitcambridge Kit Cambridge Copyright (C) 2011 MIT License
-// -- kossnocorp Sasha Koss XXX TODO License or CLA
-// -- bryanforbes Bryan Forbes XXX TODO License or CLA
-// -- killdream Quildreen Motta Copyright (C) 2011 MIT Licence
-// -- michaelficarra Michael Ficarra Copyright (C) 2011 3-clause BSD License
-// -- sharkbrainguy Gerard Paapu Copyright (C) 2011 MIT License
-// -- bbqsrc Brendan Molloy (C) 2011 Creative Commons Zero (public domain)
-// -- iwyg XXX TODO License or CLA
-// -- DomenicDenicola Domenic Denicola Copyright (C) 2011 MIT License
-// -- xavierm02 Montillet Xavier XXX TODO License or CLA
-// -- Raynos Raynos XXX TODO License or CLA
-// -- samsonjs Sami Samhuri Copyright (C) 2010 MIT License
-// -- rwldrn Rick Waldron Copyright (C) 2011 MIT License
-// -- lexer Alexey Zakharov XXX TODO License or CLA
-
-/*!
-    Copyright (c) 2009, 280 North Inc. http://280north.com/
-    MIT License. http://github.com/280north/narwhal/blob/master/README.md
-*/
-
-define('ace/lib/es5-shim', ['require', 'exports', 'module' ], function(require, exports, module) {
-
-/**
- * Brings an environment as close to ECMAScript 5 compliance
- * as is possible with the facilities of erstwhile engines.
- *
- * Annotated ES5: http://es5.github.com/ (specific links below)
- * ES5 Spec: http://www.ecma-international.org/publications/files/ECMA-ST/Ecma-262.pdf
- *
- * @module
- */
-
-/*whatsupdoc*/
-
-//
-// Function
-// ========
-//
-
-// ES-5 15.3.4.5
-// http://es5.github.com/#x15.3.4.5
-
-if (!Function.prototype.bind) {
-    Function.prototype.bind = function bind(that) { // .length is 1
-        // 1. Let Target be the this value.
-        var target = this;
-        // 2. If IsCallable(Target) is false, throw a TypeError exception.
-        if (typeof target != "function")
-            throw new TypeError(); // TODO message
-        // 3. Let A be a new (possibly empty) internal list of all of the
-        //   argument values provided after thisArg (arg1, arg2 etc), in order.
-        // XXX slicedArgs will stand in for "A" if used
-        var args = slice.call(arguments, 1); // for normal call
-        // 4. Let F be a new native ECMAScript object.
-        // 11. Set the [[Prototype]] internal property of F to the standard
-        //   built-in Function prototype object as specified in 15.3.3.1.
-        // 12. Set the [[Call]] internal property of F as described in
-        //   15.3.4.5.1.
-        // 13. Set the [[Construct]] internal property of F as described in
-        //   15.3.4.5.2.
-        // 14. Set the [[HasInstance]] internal property of F as described in
-        //   15.3.4.5.3.
-        var bound = function () {
-
-            if (this instanceof bound) {
-                // 15.3.4.5.2 [[Construct]]
-                // When the [[Construct]] internal method of a function object,
-                // F that was created using the bind function is called with a
-                // list of arguments ExtraArgs, the following steps are taken:
-                // 1. Let target be the value of F's [[TargetFunction]]
-                //   internal property.
-                // 2. If target has no [[Construct]] internal method, a
-                //   TypeError exception is thrown.
-                // 3. Let boundArgs be the value of F's [[BoundArgs]] internal
-                //   property.
-                // 4. Let args be a new list containing the same values as the
-                //   list boundArgs in the same order followed by the same
-                //   values as the list ExtraArgs in the same order.
-                // 5. Return the result of calling the [[Construct]] internal 
-                //   method of target providing args as the arguments.
-
-                var F = function(){};
-                F.prototype = target.prototype;
-                var self = new F;
-
-                var result = target.apply(
-                    self,
-                    args.concat(slice.call(arguments))
-                );
-                if (result !== null && Object(result) === result)
-                    return result;
-                return self;
-
-            } else {
-                // 15.3.4.5.1 [[Call]]
-                // When the [[Call]] internal method of a function object, F,
-                // which was created using the bind function is called with a
-                // this value and a list of arguments ExtraArgs, the following
-                // steps are taken:
-                // 1. Let boundArgs be the value of F's [[BoundArgs]] internal
-                //   property.
-                // 2. Let boundThis be the value of F's [[BoundThis]] internal
-                //   property.
-                // 3. Let target be the value of F's [[TargetFunction]] internal
-                //   property.
-                // 4. Let args be a new list containing the same values as the 
-                //   list boundArgs in the same order followed by the same 
-                //   values as the list ExtraArgs in the same order.
-                // 5. Return the result of calling the [[Call]] internal method 
-                //   of target providing boundThis as the this value and 
-                //   providing args as the arguments.
-
-                // equiv: target.call(this, ...boundArgs, ...args)
-                return target.apply(
-                    that,
-                    args.concat(slice.call(arguments))
-                );
-
-            }
-
-        };
-        // XXX bound.length is never writable, so don't even try
-        //
-        // 15. If the [[Class]] internal property of Target is "Function", then
-        //     a. Let L be the length property of Target minus the length of A.
-        //     b. Set the length own property of F to either 0 or L, whichever is 
-        //       larger.
-        // 16. Else set the length own property of F to 0.
-        // 17. Set the attributes of the length own property of F to the values
-        //   specified in 15.3.5.1.
-
-        // TODO
-        // 18. Set the [[Extensible]] internal property of F to true.
-        
-        // TODO
-        // 19. Let thrower be the [[ThrowTypeError]] function Object (13.2.3).
-        // 20. Call the [[DefineOwnProperty]] internal method of F with 
-        //   arguments "caller", PropertyDescriptor {[[Get]]: thrower, [[Set]]:
-        //   thrower, [[Enumerable]]: false, [[Configurable]]: false}, and 
-        //   false.
-        // 21. Call the [[DefineOwnProperty]] internal method of F with 
-        //   arguments "arguments", PropertyDescriptor {[[Get]]: thrower, 
-        //   [[Set]]: thrower, [[Enumerable]]: false, [[Configurable]]: false},
-        //   and false.
-
-        // TODO
-        // NOTE Function objects created using Function.prototype.bind do not 
-        // have a prototype property or the [[Code]], [[FormalParameters]], and
-        // [[Scope]] internal properties.
-        // XXX can't delete prototype in pure-js.
-
-        // 22. Return F.
-        return bound;
-    };
-}
-
-// Shortcut to an often accessed properties, in order to avoid multiple
-// dereference that costs universally.
-// _Please note: Shortcuts are defined after `Function.prototype.bind` as we
-// us it in defining shortcuts.
-var call = Function.prototype.call;
-var prototypeOfArray = Array.prototype;
-var prototypeOfObject = Object.prototype;
-var slice = prototypeOfArray.slice;
-var toString = call.bind(prototypeOfObject.toString);
-var owns = call.bind(prototypeOfObject.hasOwnProperty);
-
-// If JS engine supports accessors creating shortcuts.
-var defineGetter;
-var defineSetter;
-var lookupGetter;
-var lookupSetter;
-var supportsAccessors;
-if ((supportsAccessors = owns(prototypeOfObject, "__defineGetter__"))) {
-    defineGetter = call.bind(prototypeOfObject.__defineGetter__);
-    defineSetter = call.bind(prototypeOfObject.__defineSetter__);
-    lookupGetter = call.bind(prototypeOfObject.__lookupGetter__);
-    lookupSetter = call.bind(prototypeOfObject.__lookupSetter__);
-}
-
-//
-// Array
-// =====
-//
-
-// ES5 15.4.3.2
-// http://es5.github.com/#x15.4.3.2
-// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/isArray
-if (!Array.isArray) {
-    Array.isArray = function isArray(obj) {
-        return toString(obj) == "[object Array]";
-    };
-}
-
-// The IsCallable() check in the Array functions
-// has been replaced with a strict check on the
-// internal class of the object to trap cases where
-// the provided function was actually a regular
-// expression literal, which in V8 and
-// JavaScriptCore is a typeof "function".  Only in
-// V8 are regular expression literals permitted as
-// reduce parameters, so it is desirable in the
-// general case for the shim to match the more
-// strict and common behavior of rejecting regular
-// expressions.
-
-// ES5 15.4.4.18
-// http://es5.github.com/#x15.4.4.18
-// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/array/forEach
-if (!Array.prototype.forEach) {
-    Array.prototype.forEach = function forEach(fun /*, thisp*/) {
-        var self = toObject(this),
-            thisp = arguments[1],
-            i = 0,
-            length = self.length >>> 0;
-
-        // If no callback function or if callback is not a callable function
-        if (toString(fun) != "[object Function]") {
-            throw new TypeError(); // TODO message
-        }
-
-        while (i < length) {
-            if (i in self) {
-                // Invoke the callback function with call, passing arguments:
-                // context, property value, property key, thisArg object context
-                fun.call(thisp, self[i], i, self);
-            }
-            i++;
-        }
-    };
-}
-
-// ES5 15.4.4.19
-// http://es5.github.com/#x15.4.4.19
-// https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Objects/Array/map
-if (!Array.prototype.map) {
-    Array.prototype.map = function map(fun /*, thisp*/) {
-        var self = toObject(this),
-            length = self.length >>> 0,
-            result = Array(length),
-            thisp = arguments[1];
-
-        // If no callback function or if callback is not a callable function
-        if (toString(fun) != "[object Function]") {
-            throw new TypeError(); // TODO message
-        }
-
-        for (var i = 0; i < length; i++) {
-            if (i in self)
-                result[i] = fun.call(thisp, self[i], i, self);
-        }
-        return result;
-    };
-}
-
-// ES5 15.4.4.20
-// http://es5.github.com/#x15.4.4.20
-// https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Objects/Array/filter
-if (!Array.prototype.filter) {
-    Array.prototype.filter = function filter(fun /*, thisp */) {
-        var self = toObject(this),
-            length = self.length >>> 0,
-            result = [],
-            thisp = arguments[1];
-
-        // If no callback function or if callback is not a callable function
-        if (toString(fun) != "[object Function]") {
-            throw new TypeError(); // TODO message
-        }
-
-        for (var i = 0; i < length; i++) {
-            if (i in self && fun.call(thisp, self[i], i, self))
-                result.push(self[i]);
-        }
-        return result;
-    };
-}
-
-// ES5 15.4.4.16
-// http://es5.github.com/#x15.4.4.16
-// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/every
-if (!Array.prototype.every) {
-    Array.prototype.every = function every(fun /*, thisp */) {
-        var self = toObject(this),
-            length = self.length >>> 0,
-            thisp = arguments[1];
-
-        // If no callback function or if callback is not a callable function
-        if (toString(fun) != "[object Function]") {
-            throw new TypeError(); // TODO message
-        }
-
-        for (var i = 0; i < length; i++) {
-            if (i in self && !fun.call(thisp, self[i], i, self))
-                return false;
-        }
-        return true;
-    };
-}
-
-// ES5 15.4.4.17
-// http://es5.github.com/#x15.4.4.17
-// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/some
-if (!Array.prototype.some) {
-    Array.prototype.some = function some(fun /*, thisp */) {
-        var self = toObject(this),
-            length = self.length >>> 0,
-            thisp = arguments[1];
-
-        // If no callback function or if callback is not a callable function
-        if (toString(fun) != "[object Function]") {
-            throw new TypeError(); // TODO message
-        }
-
-        for (var i = 0; i < length; i++) {
-            if (i in self && fun.call(thisp, self[i], i, self))
-                return true;
-        }
-        return false;
-    };
-}
-
-// ES5 15.4.4.21
-// http://es5.github.com/#x15.4.4.21
-// https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Objects/Array/reduce
-if (!Array.prototype.reduce) {
-    Array.prototype.reduce = function reduce(fun /*, initial*/) {
-        var self = toObject(this),
-            length = self.length >>> 0;
-
-        // If no callback function or if callback is not a callable function
-        if (toString(fun) != "[object Function]") {
-            throw new TypeError(); // TODO message
-        }
-
-        // no value to return if no initial value and an empty array
-        if (!length && arguments.length == 1)
-            throw new TypeError(); // TODO message
-
-        var i = 0;
-        var result;
-        if (arguments.length >= 2) {
-            result = arguments[1];
-        } else {
-            do {
-                if (i in self) {
-                    result = self[i++];
-                    break;
-                }
-
-                // if array contains no values, no initial value to return
-                if (++i >= length)
-                    throw new TypeError(); // TODO message
-            } while (true);
-        }
-
-        for (; i < length; i++) {
-            if (i in self)
-                result = fun.call(void 0, result, self[i], i, self);
-        }
-
-        return result;
-    };
-}
-
-// ES5 15.4.4.22
-// http://es5.github.com/#x15.4.4.22
-// https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Objects/Array/reduceRight
-if (!Array.prototype.reduceRight) {
-    Array.prototype.reduceRight = function reduceRight(fun /*, initial*/) {
-        var self = toObject(this),
-            length = self.length >>> 0;
-
-        // If no callback function or if callback is not a callable function
-        if (toString(fun) != "[object Function]") {
-            throw new TypeError(); // TODO message
-        }
-
-        // no value to return if no initial value, empty array
-        if (!length && arguments.length == 1)
-            throw new TypeError(); // TODO message
-
-        var result, i = length - 1;
-        if (arguments.length >= 2) {
-            result = arguments[1];
-        } else {
-            do {
-                if (i in self) {
-                    result = self[i--];
-                    break;
-                }
-
-                // if array contains no values, no initial value to return
-                if (--i < 0)
-                    throw new TypeError(); // TODO message
-            } while (true);
-        }
-
-        do {
-            if (i in this)
-                result = fun.call(void 0, result, self[i], i, self);
-        } while (i--);
-
-        return result;
-    };
-}
-
-// ES5 15.4.4.14
-// http://es5.github.com/#x15.4.4.14
-// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/indexOf
-if (!Array.prototype.indexOf) {
-    Array.prototype.indexOf = function indexOf(sought /*, fromIndex */ ) {
-        var self = toObject(this),
-            length = self.length >>> 0;
-
-        if (!length)
-            return -1;
-
-        var i = 0;
-        if (arguments.length > 1)
-            i = toInteger(arguments[1]);
-
-        // handle negative indices
-        i = i >= 0 ? i : Math.max(0, length + i);
-        for (; i < length; i++) {
-            if (i in self && self[i] === sought) {
-                return i;
-            }
-        }
-        return -1;
-    };
-}
-
-// ES5 15.4.4.15
-// http://es5.github.com/#x15.4.4.15
-// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/lastIndexOf
-if (!Array.prototype.lastIndexOf) {
-    Array.prototype.lastIndexOf = function lastIndexOf(sought /*, fromIndex */) {
-        var self = toObject(this),
-            length = self.length >>> 0;
-
-        if (!length)
-            return -1;
-        var i = length - 1;
-        if (arguments.length > 1)
-            i = Math.min(i, toInteger(arguments[1]));
-        // handle negative indices
-        i = i >= 0 ? i : length - Math.abs(i);
-        for (; i >= 0; i--) {
-            if (i in self && sought === self[i])
-                return i;
-        }
-        return -1;
-    };
-}
-
-//
-// Object
-// ======
-//
-
-// ES5 15.2.3.2
-// http://es5.github.com/#x15.2.3.2
-if (!Object.getPrototypeOf) {
-    // https://github.com/kriskowal/es5-shim/issues#issue/2
-    // http://ejohn.org/blog/objectgetprototypeof/
-    // recommended by fschaefer on github
-    Object.getPrototypeOf = function getPrototypeOf(object) {
-        return object.__proto__ || (
-            object.constructor ?
-            object.constructor.prototype :
-            prototypeOfObject
-        );
-    };
-}
-
-// ES5 15.2.3.3
-// http://es5.github.com/#x15.2.3.3
-if (!Object.getOwnPropertyDescriptor) {
-    var ERR_NON_OBJECT = "Object.getOwnPropertyDescriptor called on a " +
-                         "non-object: ";
-    Object.getOwnPropertyDescriptor = function getOwnPropertyDescriptor(object, property) {
-        if ((typeof object != "object" && typeof object != "function") || object === null)
-            throw new TypeError(ERR_NON_OBJECT + object);
-        // If object does not owns property return undefined immediately.
-        if (!owns(object, property))
-            return;
-
-        var descriptor, getter, setter;
-
-        // If object has a property then it's for sure both `enumerable` and
-        // `configurable`.
-        descriptor =  { enumerable: true, configurable: true };
-
-        // If JS engine supports accessor properties then property may be a
-        // getter or setter.
-        if (supportsAccessors) {
-            // Unfortunately `__lookupGetter__` will return a getter even
-            // if object has own non getter property along with a same named
-            // inherited getter. To avoid misbehavior we temporary remove
-            // `__proto__` so that `__lookupGetter__` will return getter only
-            // if it's owned by an object.
-            var prototype = object.__proto__;
-            object.__proto__ = prototypeOfObject;
-
-            var getter = lookupGetter(object, property);
-            var setter = lookupSetter(object, property);
-
-            // Once we have getter and setter we can put values back.
-            object.__proto__ = prototype;
-
-            if (getter || setter) {
-                if (getter) descriptor.get = getter;
-                if (setter) descriptor.set = setter;
-
-                // If it was accessor property we're done and return here
-                // in order to avoid adding `value` to the descriptor.
-                return descriptor;
-            }
-        }
-
-        // If we got this far we know that object has an own property that is
-        // not an accessor so we set it as a value and return descriptor.
-        descriptor.value = object[property];
-        return descriptor;
-    };
-}
-
-// ES5 15.2.3.4
-// http://es5.github.com/#x15.2.3.4
-if (!Object.getOwnPropertyNames) {
-    Object.getOwnPropertyNames = function getOwnPropertyNames(object) {
-        return Object.keys(object);
-    };
-}
-
-// ES5 15.2.3.5
-// http://es5.github.com/#x15.2.3.5
-if (!Object.create) {
-    Object.create = function create(prototype, properties) {
-        var object;
-        if (prototype === null) {
-            object = { "__proto__": null };
-        } else {
-            if (typeof prototype != "object")
-                throw new TypeError("typeof prototype["+(typeof prototype)+"] != 'object'");
-            var Type = function () {};
-            Type.prototype = prototype;
-            object = new Type();
-            // IE has no built-in implementation of `Object.getPrototypeOf`
-            // neither `__proto__`, but this manually setting `__proto__` will
-            // guarantee that `Object.getPrototypeOf` will work as expected with
-            // objects created using `Object.create`
-            object.__proto__ = prototype;
-        }
-        if (properties !== void 0)
-            Object.defineProperties(object, properties);
-        return object;
-    };
-}
-
-// ES5 15.2.3.6
-// http://es5.github.com/#x15.2.3.6
-
-// Patch for WebKit and IE8 standard mode
-// Designed by hax <hax.github.com>
-// related issue: https://github.com/kriskowal/es5-shim/issues#issue/5
-// IE8 Reference:
-//     http://msdn.microsoft.com/en-us/library/dd282900.aspx
-//     http://msdn.microsoft.com/en-us/library/dd229916.aspx
-// WebKit Bugs:
-//     https://bugs.webkit.org/show_bug.cgi?id=36423
-
-function doesDefinePropertyWork(object) {
-    try {
-        Object.defineProperty(object, "sentinel", {});
-        return "sentinel" in object;
-    } catch (exception) {
-        // returns falsy
-    }
-}
-
-// check whether defineProperty works if it's given. Otherwise,
-// shim partially.
-if (Object.defineProperty) {
-    var definePropertyWorksOnObject = doesDefinePropertyWork({});
-    var definePropertyWorksOnDom = typeof document == "undefined" ||
-        doesDefinePropertyWork(document.createElement("div"));
-    if (!definePropertyWorksOnObject || !definePropertyWorksOnDom) {
-        var definePropertyFallback = Object.defineProperty;
-    }
-}
-
-if (!Object.defineProperty || definePropertyFallback) {
-    var ERR_NON_OBJECT_DESCRIPTOR = "Property description must be an object: ";
-    var ERR_NON_OBJECT_TARGET = "Object.defineProperty called on non-object: "
-    var ERR_ACCESSORS_NOT_SUPPORTED = "getters & setters can not be defined " +
-                                      "on this javascript engine";
-
-    Object.defineProperty = function defineProperty(object, property, descriptor) {
-        if ((typeof object != "object" && typeof object != "function") || object === null)
-            throw new TypeError(ERR_NON_OBJECT_TARGET + object);
-        if ((typeof descriptor != "object" && typeof descriptor != "function") || descriptor === null)
-            throw new TypeError(ERR_NON_OBJECT_DESCRIPTOR + descriptor);
-
-        // make a valiant attempt to use the real defineProperty
-        // for I8's DOM elements.
-        if (definePropertyFallback) {
-            try {
-                return definePropertyFallback.call(Object, object, property, descriptor);
-            } catch (exception) {
-                // try the shim if the real one doesn't work
-            }
-        }
-
-        // If it's a data property.
-        if (owns(descriptor, "value")) {
-            // fail silently if "writable", "enumerable", or "configurable"
-            // are requested but not supported
-            /*
-            // alternate approach:
-            if ( // can't implement these features; allow false but not true
-                !(owns(descriptor, "writable") ? descriptor.writable : true) ||
-                !(owns(descriptor, "enumerable") ? descriptor.enumerable : true) ||
-                !(owns(descriptor, "configurable") ? descriptor.configurable : true)
-            )
-                throw new RangeError(
-                    "This implementation of Object.defineProperty does not " +
-                    "support configurable, enumerable, or writable."
-                );
-            */
-
-            if (supportsAccessors && (lookupGetter(object, property) ||
-                                      lookupSetter(object, property)))
-            {
-                // As accessors are supported only on engines implementing
-                // `__proto__` we can safely override `__proto__` while defining
-                // a property to make sure that we don't hit an inherited
-                // accessor.
-                var prototype = object.__proto__;
-                object.__proto__ = prototypeOfObject;
-                // Deleting a property anyway since getter / setter may be
-                // defined on object itself.
-                delete object[property];
-                object[property] = descriptor.value;
-                // Setting original `__proto__` back now.
-                object.__proto__ = prototype;
-            } else {
-                object[property] = descriptor.value;
-            }
-        } else {
-            if (!supportsAccessors)
-                throw new TypeError(ERR_ACCESSORS_NOT_SUPPORTED);
-            // If we got that far then getters and setters can be defined !!
-            if (owns(descriptor, "get"))
-                defineGetter(object, property, descriptor.get);
-            if (owns(descriptor, "set"))
-                defineSetter(object, property, descriptor.set);
-        }
-
-        return object;
-    };
-}
-
-// ES5 15.2.3.7
-// http://es5.github.com/#x15.2.3.7
-if (!Object.defineProperties) {
-    Object.defineProperties = function defineProperties(object, properties) {
-        for (var property in properties) {
-            if (owns(properties, property))
-                Object.defineProperty(object, property, properties[property]);
-        }
-        return object;
-    };
-}
-
-// ES5 15.2.3.8
-// http://es5.github.com/#x15.2.3.8
-if (!Object.seal) {
-    Object.seal = function seal(object) {
-        // this is misleading and breaks feature-detection, but
-        // allows "securable" code to "gracefully" degrade to working
-        // but insecure code.
-        return object;
-    };
-}
-
-// ES5 15.2.3.9
-// http://es5.github.com/#x15.2.3.9
-if (!Object.freeze) {
-    Object.freeze = function freeze(object) {
-        // this is misleading and breaks feature-detection, but
-        // allows "securable" code to "gracefully" degrade to working
-        // but insecure code.
-        return object;
-    };
-}
-
-// detect a Rhino bug and patch it
-try {
-    Object.freeze(function () {});
-} catch (exception) {
-    Object.freeze = (function freeze(freezeObject) {
-        return function freeze(object) {
-            if (typeof object == "function") {
-                return object;
-            } else {
-                return freezeObject(object);
-            }
-        };
-    })(Object.freeze);
-}
-
-// ES5 15.2.3.10
-// http://es5.github.com/#x15.2.3.10
-if (!Object.preventExtensions) {
-    Object.preventExtensions = function preventExtensions(object) {
-        // this is misleading and breaks feature-detection, but
-        // allows "securable" code to "gracefully" degrade to working
-        // but insecure code.
-        return object;
-    };
-}
-
-// ES5 15.2.3.11
-// http://es5.github.com/#x15.2.3.11
-if (!Object.isSealed) {
-    Object.isSealed = function isSealed(object) {
-        return false;
-    };
-}
-
-// ES5 15.2.3.12
-// http://es5.github.com/#x15.2.3.12
-if (!Object.isFrozen) {
-    Object.isFrozen = function isFrozen(object) {
-        return false;
-    };
-}
-
-// ES5 15.2.3.13
-// http://es5.github.com/#x15.2.3.13
-if (!Object.isExtensible) {
-    Object.isExtensible = function isExtensible(object) {
-        // 1. If Type(O) is not Object throw a TypeError exception.
-        if (Object(object) === object) {
-            throw new TypeError(); // TODO message
-        }
-        // 2. Return the Boolean value of the [[Extensible]] internal property of O.
-        var name = '';
-        while (owns(object, name)) {
-            name += '?';
-        }
-        object[name] = true;
-        var returnValue = owns(object, name);
-        delete object[name];
-        return returnValue;
-    };
-}
-
-// ES5 15.2.3.14
-// http://es5.github.com/#x15.2.3.14
-if (!Object.keys) {
-    // http://whattheheadsaid.com/2010/10/a-safer-object-keys-compatibility-implementation
-    var hasDontEnumBug = true,
-        dontEnums = [
-            "toString",
-            "toLocaleString",
-            "valueOf",
-            "hasOwnProperty",
-            "isPrototypeOf",
-            "propertyIsEnumerable",
-            "constructor"
-        ],
-        dontEnumsLength = dontEnums.length;
-
-    for (var key in {"toString": null})
-        hasDontEnumBug = false;
-
-    Object.keys = function keys(object) {
-
-        if ((typeof object != "object" && typeof object != "function") || object === null)
-            throw new TypeError("Object.keys called on a non-object");
-
-        var keys = [];
-        for (var name in object) {
-            if (owns(object, name)) {
-                keys.push(name);
-            }
-        }
-
-        if (hasDontEnumBug) {
-            for (var i = 0, ii = dontEnumsLength; i < ii; i++) {
-                var dontEnum = dontEnums[i];
-                if (owns(object, dontEnum)) {
-                    keys.push(dontEnum);
-                }
-            }
-        }
-
-        return keys;
-    };
-
-}
-
-//
-// Date
-// ====
-//
-
-// ES5 15.9.5.43
-// http://es5.github.com/#x15.9.5.43
-// This function returns a String value represent the instance in time 
-// represented by this Date object. The format of the String is the Date Time 
-// string format defined in 15.9.1.15. All fields are present in the String. 
-// The time zone is always UTC, denoted by the suffix Z. If the time value of 
-// this object is not a finite Number a RangeError exception is thrown.
-if (!Date.prototype.toISOString || (new Date(-62198755200000).toISOString().indexOf('-000001') === -1)) {
-    Date.prototype.toISOString = function toISOString() {
-        var result, length, value, year;
-        if (!isFinite(this))
-            throw new RangeError;
-
-        // the date time string format is specified in 15.9.1.15.
-        result = [this.getUTCMonth() + 1, this.getUTCDate(),
-            this.getUTCHours(), this.getUTCMinutes(), this.getUTCSeconds()];
-        year = this.getUTCFullYear();
-        year = (year < 0 ? '-' : (year > 9999 ? '+' : '')) + ('00000' + Math.abs(year)).slice(0 <= year && year <= 9999 ? -4 : -6);
-
-        length = result.length;
-        while (length--) {
-            value = result[length];
-            // pad months, days, hours, minutes, and seconds to have two digits.
-            if (value < 10)
-                result[length] = "0" + value;
-        }
-        // pad milliseconds to have three digits.
-        return year + "-" + result.slice(0, 2).join("-") + "T" + result.slice(2).join(":") + "." +
-            ("000" + this.getUTCMilliseconds()).slice(-3) + "Z";
-    }
-}
-
-// ES5 15.9.4.4
-// http://es5.github.com/#x15.9.4.4
-if (!Date.now) {
-    Date.now = function now() {
-        return new Date().getTime();
-    };
-}
-
-// ES5 15.9.5.44
-// http://es5.github.com/#x15.9.5.44
-// This function provides a String representation of a Date object for use by 
-// JSON.stringify (15.12.3).
-if (!Date.prototype.toJSON) {
-    Date.prototype.toJSON = function toJSON(key) {
-        // When the toJSON method is called with argument key, the following 
-        // steps are taken:
-
-        // 1.  Let O be the result of calling ToObject, giving it the this
-        // value as its argument.
-        // 2. Let tv be ToPrimitive(O, hint Number).
-        // 3. If tv is a Number and is not finite, return null.
-        // XXX
-        // 4. Let toISO be the result of calling the [[Get]] internal method of
-        // O with argument "toISOString".
-        // 5. If IsCallable(toISO) is false, throw a TypeError exception.
-        if (typeof this.toISOString != "function")
-            throw new TypeError(); // TODO message
-        // 6. Return the result of calling the [[Call]] internal method of
-        //  toISO with O as the this value and an empty argument list.
-        return this.toISOString();
-
-        // NOTE 1 The argument is ignored.
-
-        // NOTE 2 The toJSON function is intentionally generic; it does not
-        // require that its this value be a Date object. Therefore, it can be
-        // transferred to other kinds of objects for use as a method. However,
-        // it does require that any such object have a toISOString method. An
-        // object is free to use the argument key to filter its
-        // stringification.
-    };
-}
-
-// ES5 15.9.4.2
-// http://es5.github.com/#x15.9.4.2
-// based on work shared by Daniel Friesen (dantman)
-// http://gist.github.com/303249
-if (Date.parse("+275760-09-13T00:00:00.000Z") !== 8.64e15) {
-    // XXX global assignment won't work in embeddings that use
-    // an alternate object for the context.
-    Date = (function(NativeDate) {
-
-        // Date.length === 7
-        var Date = function Date(Y, M, D, h, m, s, ms) {
-            var length = arguments.length;
-            if (this instanceof NativeDate) {
-                var date = length == 1 && String(Y) === Y ? // isString(Y)
-                    // We explicitly pass it through parse:
-                    new NativeDate(Date.parse(Y)) :
-                    // We have to manually make calls depending on argument
-                    // length here
-                    length >= 7 ? new NativeDate(Y, M, D, h, m, s, ms) :
-                    length >= 6 ? new NativeDate(Y, M, D, h, m, s) :
-                    length >= 5 ? new NativeDate(Y, M, D, h, m) :
-                    length >= 4 ? new NativeDate(Y, M, D, h) :
-                    length >= 3 ? new NativeDate(Y, M, D) :
-                    length >= 2 ? new NativeDate(Y, M) :
-                    length >= 1 ? new NativeDate(Y) :
-                                  new NativeDate();
-                // Prevent mixups with unfixed Date object
-                date.constructor = Date;
-                return date;
-            }
-            return NativeDate.apply(this, arguments);
-        };
-
-        // 15.9.1.15 Date Time String Format.
-        var isoDateExpression = new RegExp("^" +
-            "(\\d{4}|[\+\-]\\d{6})" + // four-digit year capture or sign + 6-digit extended year
-            "(?:-(\\d{2})" + // optional month capture
-            "(?:-(\\d{2})" + // optional day capture
-            "(?:" + // capture hours:minutes:seconds.milliseconds
-                "T(\\d{2})" + // hours capture
-                ":(\\d{2})" + // minutes capture
-                "(?:" + // optional :seconds.milliseconds
-                    ":(\\d{2})" + // seconds capture
-                    "(?:\\.(\\d{3}))?" + // milliseconds capture
-                ")?" +
-            "(?:" + // capture UTC offset component
-                "Z|" + // UTC capture
-                "(?:" + // offset specifier +/-hours:minutes
-                    "([-+])" + // sign capture
-                    "(\\d{2})" + // hours offset capture
-                    ":(\\d{2})" + // minutes offset capture
-                ")" +
-            ")?)?)?)?" +
-        "$");
-
-        // Copy any custom methods a 3rd party library may have added
-        for (var key in NativeDate)
-            Date[key] = NativeDate[key];
-
-        // Copy "native" methods explicitly; they may be non-enumerable
-        Date.now = NativeDate.now;
-        Date.UTC = NativeDate.UTC;
-        Date.prototype = NativeDate.prototype;
-        Date.prototype.constructor = Date;
-
-        // Upgrade Date.parse to handle simplified ISO 8601 strings
-        Date.parse = function parse(string) {
-            var match = isoDateExpression.exec(string);
-            if (match) {
-                match.shift(); // kill match[0], the full match
-                // parse months, days, hours, minutes, seconds, and milliseconds
-                for (var i = 1; i < 7; i++) {
-                    // provide default values if necessary
-                    match[i] = +(match[i] || (i < 3 ? 1 : 0));
-                    // match[1] is the month. Months are 0-11 in JavaScript
-                    // `Date` objects, but 1-12 in ISO notation, so we
-                    // decrement.
-                    if (i == 1)
-                        match[i]--;
-                }
-
-                // parse the UTC offset component
-                var minuteOffset = +match.pop(), hourOffset = +match.pop(), sign = match.pop();
-
-                // compute the explicit time zone offset if specified
-                var offset = 0;
-                if (sign) {
-                    // detect invalid offsets and return early
-                    if (hourOffset > 23 || minuteOffset > 59)
-                        return NaN;
-
-                    // express the provided time zone offset in minutes. The offset is
-                    // negative for time zones west of UTC; positive otherwise.
-                    offset = (hourOffset * 60 + minuteOffset) * 6e4 * (sign == "+" ? -1 : 1);
-                }
-
-                // Date.UTC for years between 0 and 99 converts year to 1900 + year
-                // The Gregorian calendar has a 400-year cycle, so 
-                // to Date.UTC(year + 400, .... ) - 12622780800000 == Date.UTC(year, ...),
-                // where 12622780800000 - number of milliseconds in Gregorian calendar 400 years
-                var year = +match[0];
-                if (0 <= year && year <= 99) {
-                    match[0] = year + 400;
-                    return NativeDate.UTC.apply(this, match) + offset - 12622780800000;
-                }
-
-                // compute a new UTC date value, accounting for the optional offset
-                return NativeDate.UTC.apply(this, match) + offset;
-            }
-            return NativeDate.parse.apply(this, arguments);
-        };
-
-        return Date;
-    })(Date);
-}
-
-//
-// String
-// ======
-//
-
-// ES5 15.5.4.20
-// http://es5.github.com/#x15.5.4.20
-var ws = "\x09\x0A\x0B\x0C\x0D\x20\xA0\u1680\u180E\u2000\u2001\u2002\u2003" +
-    "\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u202F\u205F\u3000\u2028" +
-    "\u2029\uFEFF";
-if (!String.prototype.trim || ws.trim()) {
-    // http://blog.stevenlevithan.com/archives/faster-trim-javascript
-    // http://perfectionkills.com/whitespace-deviations/
-    ws = "[" + ws + "]";
-    var trimBeginRegexp = new RegExp("^" + ws + ws + "*"),
-        trimEndRegexp = new RegExp(ws + ws + "*$");
-    String.prototype.trim = function trim() {
-        return String(this).replace(trimBeginRegexp, "").replace(trimEndRegexp, "");
-    };
-}
-
-//
-// Util
-// ======
-//
-
-// ES5 9.4
-// http://es5.github.com/#x9.4
-// http://jsperf.com/to-integer
-var toInteger = function (n) {
-    n = +n;
-    if (n !== n) // isNaN
-        n = 0;
-    else if (n !== 0 && n !== (1/0) && n !== -(1/0))
-        n = (n > 0 || -1) * Math.floor(Math.abs(n));
-    return n;
-};
-
-var prepareString = "a"[0] != "a",
-    // ES5 9.9
-    // http://es5.github.com/#x9.9
-    toObject = function (o) {
-        if (o == null) { // this matches both null and undefined
-            throw new TypeError(); // TODO message
-        }
-        // If the implementation doesn't support by-index access of
-        // string characters (ex. IE < 7), split the string
-        if (prepareString && typeof o == "string" && o) {
-            return o.split("");
-        }
-        return Object(o);
-    };
-});/* vim:ts=4:sts=4:sw=4:
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Irakli Gozalishvili <rfobic@gmail.com> (http://jeditoolkit.com)
- *      Mike de Boer <mike AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/lib/event_emitter', ['require', 'exports', 'module' ], function(require, exports, module) {
-"use strict";
-
-var EventEmitter = {};
-
-EventEmitter._emit =
-EventEmitter._dispatchEvent = function(eventName, e) {
-    this._eventRegistry = this._eventRegistry || {};
-    this._defaultHandlers = this._defaultHandlers || {};
-
-    var listeners = this._eventRegistry[eventName] || [];
-    var defaultHandler = this._defaultHandlers[eventName];
-    if (!listeners.length && !defaultHandler)
-        return;
-
-    e = e || {};
-    e.type = eventName;
-    
-    if (!e.stopPropagation) {
-        e.stopPropagation = function() {
-            this.propagationStopped = true;
-        };
-    }
-    
-    if (!e.preventDefault) {
-        e.preventDefault = function() {
-            this.defaultPrevented = true;
-        };
-    }
-
-    for (var i=0; i<listeners.length; i++) {
-        listeners[i](e);
-        if (e.propagationStopped)
-            break;
-    }
-    
-    if (defaultHandler && !e.defaultPrevented)
-        defaultHandler(e);
-};
-
-EventEmitter.setDefaultHandler = function(eventName, callback) {
-    this._defaultHandlers = this._defaultHandlers || {};
-    
-    if (this._defaultHandlers[eventName])
-        throw new Error("The default handler for '" + eventName + "' is already set");
-        
-    this._defaultHandlers[eventName] = callback;
-};
-
-EventEmitter.on =
-EventEmitter.addEventListener = function(eventName, callback) {
-    this._eventRegistry = this._eventRegistry || {};
-
-    var listeners = this._eventRegistry[eventName];
-    if (!listeners)
-        var listeners = this._eventRegistry[eventName] = [];
-
-    if (listeners.indexOf(callback) == -1)
-        listeners.push(callback);
-};
-
-EventEmitter.removeListener =
-EventEmitter.removeEventListener = function(eventName, callback) {
-    this._eventRegistry = this._eventRegistry || {};
-
-    var listeners = this._eventRegistry[eventName];
-    if (!listeners)
-        return;
-
-    var index = listeners.indexOf(callback);
-    if (index !== -1)
-        listeners.splice(index, 1);
-};
-
-EventEmitter.removeAllListeners = function(eventName) {
-    if (this._eventRegistry) this._eventRegistry[eventName] = [];
-};
-
-exports.EventEmitter = EventEmitter;
-
-});/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/lib/oop', ['require', 'exports', 'module' ], function(require, exports, module) {
-"use strict";
-
-exports.inherits = (function() {
-    var tempCtor = function() {};
-    return function(ctor, superCtor) {
-        tempCtor.prototype = superCtor.prototype;
-        ctor.super_ = superCtor.prototype;
-        ctor.prototype = new tempCtor();
-        ctor.prototype.constructor = ctor;
-    };
-}());
-
-exports.mixin = function(obj, mixin) {
-    for (var key in mixin) {
-        obj[key] = mixin[key];
-    }
-};
-
-exports.implement = function(proto, mixin) {
-    exports.mixin(proto, mixin);
-};
-
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
- 
-define('ace/mode/javascript_worker', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/worker/mirror', 'ace/worker/jshint', 'ace/narcissus/parser'], function(require, exports, module) {
-"use strict";
-    
-var oop = require("../lib/oop");
-var Mirror = require("../worker/mirror").Mirror;
-var lint = require("../worker/jshint").JSHINT;
-var parser = require("../narcissus/parser");
-    
-var JavaScriptWorker = exports.JavaScriptWorker = function(sender) {
-    Mirror.call(this, sender);
-    this.setTimeout(500);
-};
-
-oop.inherits(JavaScriptWorker, Mirror);
-
-(function() {
-    
-    this.onUpdate = function() {
-        var value = this.doc.getValue();
-        value = value.replace(/^#!.*\n/, "\n");
-        
-//        var start = new Date();
-        try {
-            parser.parse(value);
-        } catch(e) {
-//            console.log("narcissus")
-//            console.log(e);
-            var chunks = e.message.split(":")
-            var message = chunks.pop().trim();
-            var lineNumber = parseInt(chunks.pop().trim()) - 1;
-            this.sender.emit("narcissus", {
-                row: lineNumber,
-                column: null, // TODO convert e.cursor
-                text: message,
-                type: "error"
-            });
-            return;
-        } finally {
-//            console.log("parse time: " + (new Date() - start));
-        }
-        
-//        var start = new Date();
-//        console.log("jslint")
-        lint(value, {undef: false, onevar: false, passfail: false});
-        this.sender.emit("jslint", lint.errors);        
-//        console.log("lint time: " + (new Date() - start));
-    }
-    
-}).call(JavaScriptWorker.prototype);
-
-});define('ace/worker/mirror', ['require', 'exports', 'module' , 'ace/document', 'ace/lib/lang'], function(require, exports, module) {
-"use strict";
-
-var Document = require("../document").Document;
-var lang = require("../lib/lang");
-    
-var Mirror = exports.Mirror = function(sender) {
-    this.sender = sender;
-    var doc = this.doc = new Document("");
-    
-    var deferredUpdate = this.deferredUpdate = lang.deferredCall(this.onUpdate.bind(this));
-    
-    var _self = this;
-    sender.on("change", function(e) {
-        doc.applyDeltas([e.data]);        
-        deferredUpdate.schedule(_self.$timeout);
-    });
-};
-
-(function() {
-    
-    this.$timeout = 500;
-    
-    this.setTimeout = function(timeout) {
-        this.$timeout = timeout;
-    };
-    
-    this.setValue = function(value) {
-        this.doc.setValue(value);
-        this.deferredUpdate.schedule(this.$timeout);
-    };
-    
-    this.getValue = function(callbackId) {
-        this.sender.callback(this.doc.getValue(), callbackId);
-    };
-    
-    this.onUpdate = function() {
-        // abstract method
-    };
-    
-}).call(Mirror.prototype);
-
-});/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/document', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/event_emitter', 'ace/range', 'ace/anchor'], function(require, exports, module) {
-"use strict";
-
-var oop = require("./lib/oop");
-var EventEmitter = require("./lib/event_emitter").EventEmitter;
-var Range = require("./range").Range;
-var Anchor = require("./anchor").Anchor;
-
-var Document = function(text) {
-    this.$lines = [];
-
-    if (Array.isArray(text)) {
-        this.insertLines(0, text);
-    }
-    // There has to be one line at least in the document. If you pass an empty
-    // string to the insert function, nothing will happen. Workaround.
-    else if (text.length == 0) {
-        this.$lines = [""];
-    } else {
-        this.insert({row: 0, column:0}, text);
-    }
-};
-
-(function() {
-
-    oop.implement(this, EventEmitter);
-
-    this.setValue = function(text) {
-        var len = this.getLength();
-        this.remove(new Range(0, 0, len, this.getLine(len-1).length));
-        this.insert({row: 0, column:0}, text);
-    };
-
-    this.getValue = function() {
-        return this.getAllLines().join(this.getNewLineCharacter());
-    };
-
-    this.createAnchor = function(row, column) {
-        return new Anchor(this, row, column);
-    };
-
-    // check for IE split bug
-    if ("aaa".split(/a/).length == 0)
-        this.$split = function(text) {
-            return text.replace(/\r\n|\r/g, "\n").split("\n");
-        }
-    else
-        this.$split = function(text) {
-            return text.split(/\r\n|\r|\n/);
-        };
-
-
-    this.$detectNewLine = function(text) {
-        var match = text.match(/^.*?(\r\n|\r|\n)/m);
-        if (match) {
-            this.$autoNewLine = match[1];
-        } else {
-            this.$autoNewLine = "\n";
-        }
-    };
-
-    this.getNewLineCharacter = function() {
-      switch (this.$newLineMode) {
-          case "windows":
-              return "\r\n";
-
-          case "unix":
-              return "\n";
-
-          case "auto":
-              return this.$autoNewLine;
-      }
-    };
-
-    this.$autoNewLine = "\n";
-    this.$newLineMode = "auto";
-    this.setNewLineMode = function(newLineMode) {
-        if (this.$newLineMode === newLineMode)
-            return;
-
-        this.$newLineMode = newLineMode;
-    };
-
-    this.getNewLineMode = function() {
-        return this.$newLineMode;
-    };
-
-    this.isNewLine = function(text) {
-        return (text == "\r\n" || text == "\r" || text == "\n");
-    };
-
-    /**
-     * Get a verbatim copy of the given line as it is in the document
-     */
-    this.getLine = function(row) {
-        return this.$lines[row] || "";
-    };
-
-    this.getLines = function(firstRow, lastRow) {
-        return this.$lines.slice(firstRow, lastRow + 1);
-    };
-
-    /**
-     * Returns all lines in the document as string array. Warning: The caller
-     * should not modify this array!
-     */
-    this.getAllLines = function() {
-        return this.getLines(0, this.getLength());
-    };
-
-    this.getLength = function() {
-        return this.$lines.length;
-    };
-
-    this.getTextRange = function(range) {
-        if (range.start.row == range.end.row) {
-            return this.$lines[range.start.row].substring(range.start.column,
-                                                         range.end.column);
-        }
-        else {
-            var lines = [];
-            lines.push(this.$lines[range.start.row].substring(range.start.column));
-            lines.push.apply(lines, this.getLines(range.start.row+1, range.end.row-1));
-            lines.push(this.$lines[range.end.row].substring(0, range.end.column));
-            return lines.join(this.getNewLineCharacter());
-        }
-    };
-
-    this.$clipPosition = function(position) {
-        var length = this.getLength();
-        if (position.row >= length) {
-            position.row = Math.max(0, length - 1);
-            position.column = this.getLine(length-1).length;
-        }
-        return position;
-    };
-
-    this.insert = function(position, text) {
-        if (!text || text.length === 0)
-            return position;
-
-        position = this.$clipPosition(position);
-
-        // only detect new lines if the document has no line break yet
-        if (this.getLength() <= 1)
-            this.$detectNewLine(text);
-
-        var lines = this.$split(text);
-        var firstLine = lines.splice(0, 1)[0];
-        var lastLine = lines.length == 0 ? null : lines.splice(lines.length - 1, 1)[0];
-
-        position = this.insertInLine(position, firstLine);
-        if (lastLine !== null) {
-            position = this.insertNewLine(position); // terminate first line
-            position = this.insertLines(position.row, lines);
-            position = this.insertInLine(position, lastLine || "");
-        }
-        return position;
-    };
-
-    this.insertLines = function(row, lines) {
-        if (lines.length == 0)
-            return {row: row, column: 0};
-
-        var args = [row, 0];
-        args.push.apply(args, lines);
-        this.$lines.splice.apply(this.$lines, args);
-
-        var range = new Range(row, 0, row + lines.length, 0);
-        var delta = {
-            action: "insertLines",
-            range: range,
-            lines: lines
-        };
-        this._emit("change", { data: delta });
-        return range.end;
-    };
-
-    this.insertNewLine = function(position) {
-        position = this.$clipPosition(position);
-        var line = this.$lines[position.row] || "";
-
-        this.$lines[position.row] = line.substring(0, position.column);
-        this.$lines.splice(position.row + 1, 0, line.substring(position.column, line.length));
-
-        var end = {
-            row : position.row + 1,
-            column : 0
-        };
-
-        var delta = {
-            action: "insertText",
-            range: Range.fromPoints(position, end),
-            text: this.getNewLineCharacter()
-        };
-        this._emit("change", { data: delta });
-
-        return end;
-    };
-
-    this.insertInLine = function(position, text) {
-        if (text.length == 0)
-            return position;
-
-        var line = this.$lines[position.row] || "";
-
-        this.$lines[position.row] = line.substring(0, position.column) + text
-                + line.substring(position.column);
-
-        var end = {
-            row : position.row,
-            column : position.column + text.length
-        };
-
-        var delta = {
-            action: "insertText",
-            range: Range.fromPoints(position, end),
-            text: text
-        };
-        this._emit("change", { data: delta });
-
-        return end;
-    };
-
-    this.remove = function(range) {
-        // clip to document
-        range.start = this.$clipPosition(range.start);
-        range.end = this.$clipPosition(range.end);
-
-        if (range.isEmpty())
-            return range.start;
-
-        var firstRow = range.start.row;
-        var lastRow = range.end.row;
-
-        if (range.isMultiLine()) {
-            var firstFullRow = range.start.column == 0 ? firstRow : firstRow + 1;
-            var lastFullRow = lastRow - 1;
-
-            if (range.end.column > 0)
-                this.removeInLine(lastRow, 0, range.end.column);
-
-            if (lastFullRow >= firstFullRow)
-                this.removeLines(firstFullRow, lastFullRow);
-
-            if (firstFullRow != firstRow) {
-                this.removeInLine(firstRow, range.start.column, this.getLine(firstRow).length);
-                this.removeNewLine(range.start.row);
-            }
-        }
-        else {
-            this.removeInLine(firstRow, range.start.column, range.end.column);
-        }
-        return range.start;
-    };
-
-    this.removeInLine = function(row, startColumn, endColumn) {
-        if (startColumn == endColumn)
-            return;
-
-        var range = new Range(row, startColumn, row, endColumn);
-        var line = this.getLine(row);
-        var removed = line.substring(startColumn, endColumn);
-        var newLine = line.substring(0, startColumn) + line.substring(endColumn, line.length);
-        this.$lines.splice(row, 1, newLine);
-
-        var delta = {
-            action: "removeText",
-            range: range,
-            text: removed
-        };
-        this._emit("change", { data: delta });
-        return range.start;
-    };
-
-    /**
-     * Removes a range of full lines
-     *
-     * @param firstRow {Integer} The first row to be removed
-     * @param lastRow {Integer} The last row to be removed
-     * @return {String[]} The removed lines
-     */
-    this.removeLines = function(firstRow, lastRow) {
-        var range = new Range(firstRow, 0, lastRow + 1, 0);
-        var removed = this.$lines.splice(firstRow, lastRow - firstRow + 1);
-
-        var delta = {
-            action: "removeLines",
-            range: range,
-            nl: this.getNewLineCharacter(),
-            lines: removed
-        };
-        this._emit("change", { data: delta });
-        return removed;
-    };
-
-    this.removeNewLine = function(row) {
-        var firstLine = this.getLine(row);
-        var secondLine = this.getLine(row+1);
-
-        var range = new Range(row, firstLine.length, row+1, 0);
-        var line = firstLine + secondLine;
-
-        this.$lines.splice(row, 2, line);
-
-        var delta = {
-            action: "removeText",
-            range: range,
-            text: this.getNewLineCharacter()
-        };
-        this._emit("change", { data: delta });
-    };
-
-    this.replace = function(range, text) {
-        if (text.length == 0 && range.isEmpty())
-            return range.start;
-
-        // Shortcut: If the text we want to insert is the same as it is already
-        // in the document, we don't have to replace anything.
-        if (text == this.getTextRange(range))
-            return range.end;
-
-        this.remove(range);
-        if (text) {
-            var end = this.insert(range.start, text);
-        }
-        else {
-            end = range.start;
-        }
-
-        return end;
-    };
-
-    this.applyDeltas = function(deltas) {
-        for (var i=0; i<deltas.length; i++) {
-            var delta = deltas[i];
-            var range = Range.fromPoints(delta.range.start, delta.range.end);
-
-            if (delta.action == "insertLines")
-                this.insertLines(range.start.row, delta.lines);
-            else if (delta.action == "insertText")
-                this.insert(range.start, delta.text);
-            else if (delta.action == "removeLines")
-                this.removeLines(range.start.row, range.end.row - 1);
-            else if (delta.action == "removeText")
-                this.remove(range);
-        }
-    };
-
-    this.revertDeltas = function(deltas) {
-        for (var i=deltas.length-1; i>=0; i--) {
-            var delta = deltas[i];
-
-            var range = Range.fromPoints(delta.range.start, delta.range.end);
-
-            if (delta.action == "insertLines")
-                this.removeLines(range.start.row, range.end.row - 1);
-            else if (delta.action == "insertText")
-                this.remove(range);
-            else if (delta.action == "removeLines")
-                this.insertLines(range.start.row, delta.lines);
-            else if (delta.action == "removeText")
-                this.insert(range.start, delta.text);
-        }
-    };
-
-}).call(Document.prototype);
-
-exports.Document = Document;
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/range', ['require', 'exports', 'module' ], function(require, exports, module) {
-"use strict";
-
-var Range = function(startRow, startColumn, endRow, endColumn) {
-    this.start = {
-        row: startRow,
-        column: startColumn
-    };
-
-    this.end = {
-        row: endRow,
-        column: endColumn
-    };
-};
-
-(function() {
-    this.isEqual = function(range) {
-        return this.start.row == range.start.row &&
-            this.end.row == range.end.row &&
-            this.start.column == range.start.column &&
-            this.end.column == range.end.column
-    };
-
-    this.toString = function() {
-        return ("Range: [" + this.start.row + "/" + this.start.column +
-            "] -> [" + this.end.row + "/" + this.end.column + "]");
-    };
-
-    this.contains = function(row, column) {
-        return this.compare(row, column) == 0;
-    };
-
-    /**
-     * Compares this range (A) with another range (B), where B is the passed in
-     * range.
-     *
-     * Return values:
-     *  -2: (B) is infront of (A) and doesn't intersect with (A)
-     *  -1: (B) begins before (A) but ends inside of (A)
-     *   0: (B) is completly inside of (A) OR (A) is complety inside of (B)
-     *  +1: (B) begins inside of (A) but ends outside of (A)
-     *  +2: (B) is after (A) and doesn't intersect with (A)
-     *
-     *  42: FTW state: (B) ends in (A) but starts outside of (A)
-     */
-    this.compareRange = function(range) {
-        var cmp,
-            end = range.end,
-            start = range.start;
-
-        cmp = this.compare(end.row, end.column);
-        if (cmp == 1) {
-            cmp = this.compare(start.row, start.column);
-            if (cmp == 1) {
-                return 2;
-            } else if (cmp == 0) {
-                return 1;
-            } else {
-                return 0;
-            }
-        } else if (cmp == -1) {
-            return -2;
-        } else {
-            cmp = this.compare(start.row, start.column);
-            if (cmp == -1) {
-                return -1;
-            } else if (cmp == 1) {
-                return 42;
-            } else {
-                return 0;
-            }
-        }
-    }
-
-    this.comparePoint = function(p) {
-        return this.compare(p.row, p.column);
-    }
-
-    this.containsRange = function(range) {
-        return this.comparePoint(range.start) == 0 && this.comparePoint(range.end) == 0;
-    }
-
-    this.intersectsRange = function(range) {
-        var cmp = this.compareRange(range);
-        return (cmp == -1 || cmp == 0 || cmp == 1);
-    }
-
-    this.isEnd = function(row, column) {
-        return this.end.row == row && this.end.column == column;
-    }
-
-    this.isStart = function(row, column) {
-        return this.start.row == row && this.start.column == column;
-    }
-
-    this.setStart = function(row, column) {
-        if (typeof row == "object") {
-            this.start.column = row.column;
-            this.start.row = row.row;
-        } else {
-            this.start.row = row;
-            this.start.column = column;
-        }
-    }
-
-    this.setEnd = function(row, column) {
-        if (typeof row == "object") {
-            this.end.column = row.column;
-            this.end.row = row.row;
-        } else {
-            this.end.row = row;
-            this.end.column = column;
-        }
-    }
-
-    this.inside = function(row, column) {
-        if (this.compare(row, column) == 0) {
-            if (this.isEnd(row, column) || this.isStart(row, column)) {
-                return false;
-            } else {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    this.insideStart = function(row, column) {
-        if (this.compare(row, column) == 0) {
-            if (this.isEnd(row, column)) {
-                return false;
-            } else {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    this.insideEnd = function(row, column) {
-        if (this.compare(row, column) == 0) {
-            if (this.isStart(row, column)) {
-                return false;
-            } else {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    this.compare = function(row, column) {
-        if (!this.isMultiLine()) {
-            if (row === this.start.row) {
-                return column < this.start.column ? -1 : (column > this.end.column ? 1 : 0);
-            };
-        }
-
-        if (row < this.start.row)
-            return -1;
-
-        if (row > this.end.row)
-            return 1;
-
-        if (this.start.row === row)
-            return column >= this.start.column ? 0 : -1;
-
-        if (this.end.row === row)
-            return column <= this.end.column ? 0 : 1;
-
-        return 0;
-    };
-
-    /**
-     * Like .compare(), but if isStart is true, return -1;
-     */
-    this.compareStart = function(row, column) {
-        if (this.start.row == row && this.start.column == column) {
-            return -1;
-        } else {
-            return this.compare(row, column);
-        }
-    }
-
-    /**
-     * Like .compare(), but if isEnd is true, return 1;
-     */
-    this.compareEnd = function(row, column) {
-        if (this.end.row == row && this.end.column == column) {
-            return 1;
-        } else {
-            return this.compare(row, column);
-        }
-    }
-
-    this.compareInside = function(row, column) {
-        if (this.end.row == row && this.end.column == column) {
-            return 1;
-        } else if (this.start.row == row && this.start.column == column) {
-            return -1;
-        } else {
-            return this.compare(row, column);
-        }
-    }
-
-    this.clipRows = function(firstRow, lastRow) {
-        if (this.end.row > lastRow) {
-            var end = {
-                row: lastRow+1,
-                column: 0
-            };
-        }
-
-        if (this.start.row > lastRow) {
-            var start = {
-                row: lastRow+1,
-                column: 0
-            };
-        }
-
-        if (this.start.row < firstRow) {
-            var start = {
-                row: firstRow,
-                column: 0
-            };
-        }
-
-        if (this.end.row < firstRow) {
-            var end = {
-                row: firstRow,
-                column: 0
-            };
-        }
-        return Range.fromPoints(start || this.start, end || this.end);
-    };
-
-    this.extend = function(row, column) {
-        var cmp = this.compare(row, column);
-
-        if (cmp == 0)
-            return this;
-        else if (cmp == -1)
-            var start = {row: row, column: column};
-        else
-            var end = {row: row, column: column};
-
-        return Range.fromPoints(start || this.start, end || this.end);
-    };
-
-    this.fixOrientation = function() {
-        if (
-            this.start.row < this.end.row 
-            || (this.start.row == this.end.row && this.start.column < this.end.column)
-        ) {
-            return false;
-        }
-        
-        var temp = this.start;
-        this.end = this.start;
-        this.start = temp;
-        return true;
-    };
-
-
-    this.isEmpty = function() {
-        return (this.start.row == this.end.row && this.start.column == this.end.column);
-    };
-
-    this.isMultiLine = function() {
-        return (this.start.row !== this.end.row);
-    };
-
-    this.clone = function() {
-        return Range.fromPoints(this.start, this.end);
-    };
-
-    this.collapseRows = function() {
-        if (this.end.column == 0)
-            return new Range(this.start.row, 0, Math.max(this.start.row, this.end.row-1), 0)
-        else
-            return new Range(this.start.row, 0, this.end.row, 0)
-    };
-
-    this.toScreenRange = function(session) {
-        var screenPosStart =
-            session.documentToScreenPosition(this.start);
-        var screenPosEnd =
-            session.documentToScreenPosition(this.end);
-
-        return new Range(
-            screenPosStart.row, screenPosStart.column,
-            screenPosEnd.row, screenPosEnd.column
-        );
-    };
-
-}).call(Range.prototype);
-
-
-Range.fromPoints = function(start, end) {
-    return new Range(start.row, start.column, end.row, end.column);
-};
-
-exports.Range = Range;
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/anchor', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/event_emitter'], function(require, exports, module) {
-"use strict";
-
-var oop = require("./lib/oop");
-var EventEmitter = require("./lib/event_emitter").EventEmitter;
-
-/**
- * An Anchor is a floating pointer in the document. Whenever text is inserted or
- * deleted before the cursor, the position of the cursor is updated
- */
-var Anchor = exports.Anchor = function(doc, row, column) {
-    this.document = doc;
-    
-    if (typeof column == "undefined")
-        this.setPosition(row.row, row.column);
-    else
-        this.setPosition(row, column);
-
-    this.$onChange = this.onChange.bind(this);
-    doc.on("change", this.$onChange);
-};
-
-(function() {
-
-    oop.implement(this, EventEmitter);
-    
-    this.getPosition = function() {
-        return this.$clipPositionToDocument(this.row, this.column);
-    };
-    
-    this.getDocument = function() {
-        return this.document;
-    };
-    
-    this.onChange = function(e) {
-        var delta = e.data;
-        var range = delta.range;
-            
-        if (range.start.row == range.end.row && range.start.row != this.row)
-            return;
-            
-        if (range.start.row > this.row)
-            return;
-            
-        if (range.start.row == this.row && range.start.column > this.column)
-            return;
-    
-        var row = this.row;
-        var column = this.column;
-        
-        if (delta.action === "insertText") {
-            if (range.start.row === row && range.start.column <= column) {
-                if (range.start.row === range.end.row) {
-                    column += range.end.column - range.start.column;
-                }
-                else {
-                    column -= range.start.column;
-                    row += range.end.row - range.start.row;
-                }
-            }
-            else if (range.start.row !== range.end.row && range.start.row < row) {
-                row += range.end.row - range.start.row;
-            }
-        } else if (delta.action === "insertLines") {
-            if (range.start.row <= row) {
-                row += range.end.row - range.start.row;
-            }
-        }
-        else if (delta.action == "removeText") {
-            if (range.start.row == row && range.start.column < column) {
-                if (range.end.column >= column)
-                    column = range.start.column;
-                else
-                    column = Math.max(0, column - (range.end.column - range.start.column));
-                
-            } else if (range.start.row !== range.end.row && range.start.row < row) {
-                if (range.end.row == row) {
-                    column = Math.max(0, column - range.end.column) + range.start.column;
-                }
-                row -= (range.end.row - range.start.row);
-            }
-            else if (range.end.row == row) {
-                row -= range.end.row - range.start.row;
-                column = Math.max(0, column - range.end.column) + range.start.column;
-            }
-        } else if (delta.action == "removeLines") {
-            if (range.start.row <= row) {
-                if (range.end.row <= row)
-                    row -= range.end.row - range.start.row;
-                else {
-                    row = range.start.row;
-                    column = 0;
-                }
-            }
-        }
-
-        this.setPosition(row, column, true);
-    };
-
-    this.setPosition = function(row, column, noClip) {
-        var pos;
-        if (noClip) {
-            pos = {
-                row: row,
-                column: column
-            };
-        }
-        else {
-            pos = this.$clipPositionToDocument(row, column);
-        }
-        
-        if (this.row == pos.row && this.column == pos.column)
-            return;
-            
-        var old = {
-            row: this.row,
-            column: this.column
-        };
-        
-        this.row = pos.row;
-        this.column = pos.column;
-        this._emit("change", {
-            old: old,
-            value: pos
-        });
-    };
-    
-    this.detach = function() {
-        this.document.removeEventListener("change", this.$onChange);
-    };
-    
-    this.$clipPositionToDocument = function(row, column) {
-        var pos = {};
-    
-        if (row >= this.document.getLength()) {
-            pos.row = Math.max(0, this.document.getLength() - 1);
-            pos.column = this.document.getLine(pos.row).length;
-        }
-        else if (row < 0) {
-            pos.row = 0;
-            pos.column = 0;
-        }
-        else {
-            pos.row = row;
-            pos.column = Math.min(this.document.getLine(pos.row).length, Math.max(0, column));
-        }
-        
-        if (column < 0)
-            pos.column = 0;
-            
-        return pos;
-    };
-    
-}).call(Anchor.prototype);
-
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/lib/lang', ['require', 'exports', 'module' ], function(require, exports, module) {
-"use strict";
-
-exports.stringReverse = function(string) {
-    return string.split("").reverse().join("");
-};
-
-exports.stringRepeat = function (string, count) {
-     return new Array(count + 1).join(string);
-};
-
-var trimBeginRegexp = /^\s\s*/;
-var trimEndRegexp = /\s\s*$/;
-
-exports.stringTrimLeft = function (string) {
-    return string.replace(trimBeginRegexp, '');
-};
-
-exports.stringTrimRight = function (string) {
-    return string.replace(trimEndRegexp, '');
-};
-
-exports.copyObject = function(obj) {
-    var copy = {};
-    for (var key in obj) {
-        copy[key] = obj[key];
-    }
-    return copy;
-};
-
-exports.copyArray = function(array){
-    var copy = [];
-    for (var i=0, l=array.length; i<l; i++) {
-        if (array[i] && typeof array[i] == "object")
-            copy[i] = this.copyObject( array[i] );
-        else 
-            copy[i] = array[i];
-    }
-    return copy;
-};
-
-exports.deepCopy = function (obj) {
-    if (typeof obj != "object") {
-        return obj;
-    }
-    
-    var copy = obj.constructor();
-    for (var key in obj) {
-        if (typeof obj[key] == "object") {
-            copy[key] = this.deepCopy(obj[key]);
-        } else {
-            copy[key] = obj[key];
-        }
-    }
-    return copy;
-};
-
-exports.arrayToMap = function(arr) {
-    var map = {};
-    for (var i=0; i<arr.length; i++) {
-        map[arr[i]] = 1;
-    }
-    return map;
-
-};
-
-/**
- * splice out of 'array' anything that === 'value'
- */
-exports.arrayRemove = function(array, value) {
-  for (var i = 0; i <= array.length; i++) {
-    if (value === array[i]) {
-      array.splice(i, 1);
-    }
-  }
-};
-
-exports.escapeRegExp = function(str) {
-    return str.replace(/([.*+?^${}()|[\]\/\\])/g, '\\$1');
-};
-
-exports.deferredCall = function(fcn) {
-
-    var timer = null;
-    var callback = function() {
-        timer = null;
-        fcn();
-    };
-
-    var deferred = function(timeout) {
-        deferred.cancel();
-        timer = setTimeout(callback, timeout || 0);
-        return deferred;
-    };
-
-    deferred.schedule = deferred;
-
-    deferred.call = function() {
-        this.cancel();
-        fcn();
-        return deferred;
-    };
-
-    deferred.cancel = function() {
-        clearTimeout(timer);
-        timer = null;
-        return deferred;
-    };
-
-    return deferred;
-};
-
-});
-define('ace/worker/jshint', ['require', 'exports', 'module' ], function(require, exports, module) {
-/*!
- * JSHint, by JSHint Community.
- *
- * Licensed under the same slightly modified MIT license that JSLint is.
- * It stops evil-doers everywhere.
- *
- * JSHint is a derivative work of JSLint:
- *
- *   Copyright (c) 2002 Douglas Crockford  (www.JSLint.com)
- *
- *   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 shall be used for Good, not Evil.
- *
- *   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.
- *
- * JSHint was forked from 2010-12-16 edition of JSLint.
- *
- */
-
-/*
- JSHINT is a global function. It takes two parameters.
-
-     var myResult = JSHINT(source, option);
-
- The first parameter is either a string or an array of strings. If it is a
- string, it will be split on '\n' or '\r'. If it is an array of strings, it
- is assumed that each string represents one line. The source can be a
- JavaScript text or a JSON text.
-
- The second parameter is an optional object of options which control the
- operation of JSHINT. Most of the options are booleans: They are all
- optional and have a default value of false. One of the options, predef,
- can be an array of names, which will be used to declare global variables,
- or an object whose keys are used as global names, with a boolean value
- that determines if they are assignable.
-
- If it checks out, JSHINT returns true. Otherwise, it returns false.
-
- If false, you can inspect JSHINT.errors to find out the problems.
- JSHINT.errors is an array of objects containing these members:
-
- {
-     line      : The line (relative to 0) at which the lint was found
-     character : The character (relative to 0) at which the lint was found
-     reason    : The problem
-     evidence  : The text line in which the problem occurred
-     raw       : The raw message before the details were inserted
-     a         : The first detail
-     b         : The second detail
-     c         : The third detail
-     d         : The fourth detail
- }
-
- If a fatal error was found, a null will be the last element of the
- JSHINT.errors array.
-
- You can request a Function Report, which shows all of the functions
- and the parameters and vars that they use. This can be used to find
- implied global variables and other problems. The report is in HTML and
- can be inserted in an HTML <body>.
-
-     var myReport = JSHINT.report(limited);
-
- If limited is true, then the report will be limited to only errors.
-
- You can request a data structure which contains JSHint's results.
-
-     var myData = JSHINT.data();
-
- It returns a structure with this form:
-
- {
-     errors: [
-         {
-             line: NUMBER,
-             character: NUMBER,
-             reason: STRING,
-             evidence: STRING
-         }
-     ],
-     functions: [
-         name: STRING,
-         line: NUMBER,
-         last: NUMBER,
-         param: [
-             STRING
-         ],
-         closure: [
-             STRING
-         ],
-         var: [
-             STRING
-         ],
-         exception: [
-             STRING
-         ],
-         outer: [
-             STRING
-         ],
-         unused: [
-             STRING
-         ],
-         global: [
-             STRING
-         ],
-         label: [
-             STRING
-         ]
-     ],
-     globals: [
-         STRING
-     ],
-     member: {
-         STRING: NUMBER
-     },
-     unused: [
-         {
-             name: STRING,
-             line: NUMBER
-         }
-     ],
-     implieds: [
-         {
-             name: STRING,
-             line: NUMBER
-         }
-     ],
-     urls: [
-         STRING
-     ],
-     json: BOOLEAN
- }
-
- Empty arrays will not be included.
-
-*/
-
-/*jshint
- evil: true, nomen: false, onevar: false, regexp: false, strict: true, boss: true,
- undef: true, maxlen: 100, indent:4
-*/
-
-/*members "\b", "\t", "\n", "\f", "\r", "!=", "!==", "\"", "%", "(begin)",
- "(breakage)", "(context)", "(error)", "(global)", "(identifier)", "(last)",
- "(line)", "(loopage)", "(name)", "(onevar)", "(params)", "(scope)",
- "(statement)", "(verb)", "*", "+", "++", "-", "--", "\/", "<", "<=", "==",
- "===", ">", ">=", $, $$, $A, $F, $H, $R, $break, $continue, $w, Abstract, Ajax,
- __filename, __dirname, ActiveXObject, Array, ArrayBuffer, ArrayBufferView, Audio,
- Autocompleter, Assets, Boolean, Builder, Buffer, Browser, COM, CScript, Canvas,
- CustomAnimation, Class, Control, Chain, Color, Cookie, Core, DataView, Date,
- Debug, Draggable, Draggables, Droppables, Document, DomReady, DOMReady, DOMParser, Drag,
- E, Enumerator, Enumerable, Element, Elements, Error, Effect, EvalError, Event,
- Events, FadeAnimation, Field, Flash, Float32Array, Float64Array, Form,
- FormField, Frame, FormData, Function, Fx, GetObject, Group, Hash, HotKey,
- HTMLElement, HTMLAnchorElement, HTMLBaseElement, HTMLBlockquoteElement,
- HTMLBodyElement, HTMLBRElement, HTMLButtonElement, HTMLCanvasElement, HTMLDirectoryElement,
- HTMLDivElement, HTMLDListElement, HTMLFieldSetElement,
- HTMLFontElement, HTMLFormElement, HTMLFrameElement, HTMLFrameSetElement,
- HTMLHeadElement, HTMLHeadingElement, HTMLHRElement, HTMLHtmlElement,
- HTMLIFrameElement, HTMLImageElement, HTMLInputElement, HTMLIsIndexElement,
- HTMLLabelElement, HTMLLayerElement, HTMLLegendElement, HTMLLIElement,
- HTMLLinkElement, HTMLMapElement, HTMLMenuElement, HTMLMetaElement,
- HTMLModElement, HTMLObjectElement, HTMLOListElement, HTMLOptGroupElement,
- HTMLOptionElement, HTMLParagraphElement, HTMLParamElement, HTMLPreElement,
- HTMLQuoteElement, HTMLScriptElement, HTMLSelectElement, HTMLStyleElement,
- HtmlTable, HTMLTableCaptionElement, HTMLTableCellElement, HTMLTableColElement,
- HTMLTableElement, HTMLTableRowElement, HTMLTableSectionElement,
- HTMLTextAreaElement, HTMLTitleElement, HTMLUListElement, HTMLVideoElement,
- Iframe, IframeShim, Image, Int16Array, Int32Array, Int8Array,
- Insertion, InputValidator, JSON, Keyboard, Locale, LN10, LN2, LOG10E, LOG2E,
- MAX_VALUE, MIN_VALUE, Mask, Math, MenuItem, MessageChannel, MessageEvent, MessagePort,
- MoveAnimation, MooTools, Native, NEGATIVE_INFINITY, Number, Object, ObjectRange, Option,
- Options, OverText, PI, POSITIVE_INFINITY, PeriodicalExecuter, Point, Position, Prototype,
- RangeError, Rectangle, ReferenceError, RegExp, ResizeAnimation, Request, RotateAnimation,
- SQRT1_2, SQRT2, ScrollBar, ScriptEngine, ScriptEngineBuildVersion,
- ScriptEngineMajorVersion, ScriptEngineMinorVersion, Scriptaculous, Scroller,
- Slick, Slider, Selector, SharedWorker, String, Style, SyntaxError, Sortable, Sortables,
- SortableObserver, Sound, Spinner, System, Swiff, Text, TextArea, Template,
- Timer, Tips, Type, TypeError, Toggle, Try, "use strict", unescape, URI, URIError, URL,
- VBArray, WSH, WScript, XDomainRequest, Web, Window, XMLDOM, XMLHttpRequest, XMLSerializer,
- XPathEvaluator, XPathException, XPathExpression, XPathNamespace, XPathNSResolver, XPathResult,
- "\\", a, addEventListener, address, alert, apply, applicationCache, arguments, arity, asi, atob,
- b, basic, basicToken, bitwise, block, blur, boolOptions, boss, browser, btoa, c, call, callee,
- caller, cases, charAt, charCodeAt, character, clearInterval, clearTimeout,
- close, closed, closure, comment, condition, confirm, console, constructor,
- content, couch, create, css, curly, d, data, datalist, dd, debug, decodeURI,
- decodeURIComponent, defaultStatus, defineClass, deserialize, devel, document,
- dojo, dijit, dojox, define, else, emit, encodeURI, encodeURIComponent,
- entityify, eqeqeq, eqnull, errors, es5, escape, esnext, eval, event, evidence, evil,
- ex, exception, exec, exps, expr, exports, FileReader, first, floor, focus,
- forin, fragment, frames, from, fromCharCode, fud, funcscope, funct, function, functions,
- g, gc, getComputedStyle, getRow, getter, getterToken, GLOBAL, global, globals, globalstrict,
- hasOwnProperty, help, history, i, id, identifier, immed, implieds, importPackage, include,
- indent, indexOf, init, ins, instanceOf, isAlpha, isApplicationRunning, isArray,
- isDigit, isFinite, isNaN, iterator, java, join, jshint,
- JSHINT, json, jquery, jQuery, keys, label, labelled, last, lastsemic, laxbreak, laxcomma,
- latedef, lbp, led, left, length, line, load, loadClass, localStorage, location,
- log, loopfunc, m, match, maxerr, maxlen, member,message, meta, module, moveBy,
- moveTo, mootools, multistr, name, navigator, new, newcap, noarg, node, noempty, nomen,
- nonew, nonstandard, nud, onbeforeunload, onblur, onerror, onevar, onecase, onfocus,
- onload, onresize, onunload, open, openDatabase, openURL, opener, opera, options, outer, param,
- parent, parseFloat, parseInt, passfail, plusplus, predef, print, process, prompt,
- proto, prototype, prototypejs, provides, push, quit, range, raw, reach, reason, regexp,
- readFile, readUrl, regexdash, removeEventListener, replace, report, require,
- reserved, resizeBy, resizeTo, resolvePath, resumeUpdates, respond, rhino, right,
- runCommand, scroll, screen, scripturl, scrollBy, scrollTo, scrollbar, search, seal,
- send, serialize, sessionStorage, setInterval, setTimeout, setter, setterToken, shift, slice,
- smarttabs, sort, spawn, split, stack, status, start, strict, sub, substr, supernew, shadow,
- supplant, sum, sync, test, toLowerCase, toString, toUpperCase, toint32, token, top, trailing,
- type, typeOf, Uint16Array, Uint32Array, Uint8Array, undef, undefs, unused, urls, validthis,
- value, valueOf, var, version, WebSocket, withstmt, white, window, Worker, wsh*/
-
-/*global exports: false */
-
-// We build the application inside a function so that we produce only a single
-// global variable. That function will be invoked immediately, and its return
-// value is the JSHINT function itself.
-
-var JSHINT = (function () {
-    "use strict";
-
-    var anonname,       // The guessed name for anonymous functions.
-
-// These are operators that should not be used with the ! operator.
-
-        bang = {
-            '<'  : true,
-            '<=' : true,
-            '==' : true,
-            '===': true,
-            '!==': true,
-            '!=' : true,
-            '>'  : true,
-            '>=' : true,
-            '+'  : true,
-            '-'  : true,
-            '*'  : true,
-            '/'  : true,
-            '%'  : true
-        },
-
-        // These are the JSHint boolean options.
-        boolOptions = {
-            asi         : true, // if automatic semicolon insertion should be tolerated
-            bitwise     : true, // if bitwise operators should not be allowed
-            boss        : true, // if advanced usage of assignments should be allowed
-            browser     : true, // if the standard browser globals should be predefined
-            couch       : true, // if CouchDB globals should be predefined
-            curly       : true, // if curly braces around all blocks should be required
-            debug       : true, // if debugger statements should be allowed
-            devel       : true, // if logging globals should be predefined (console,
-                                // alert, etc.)
-            dojo        : true, // if Dojo Toolkit globals should be predefined
-            eqeqeq      : true, // if === should be required
-            eqnull      : true, // if == null comparisons should be tolerated
-            es5         : true, // if ES5 syntax should be allowed
-            esnext      : true, // if es.next specific syntax should be allowed
-            evil        : true, // if eval should be allowed
-            expr        : true, // if ExpressionStatement should be allowed as Programs
-            forin       : true, // if for in statements must filter
-            funcscope   : true, // if only function scope should be used for scope tests
-            globalstrict: true, // if global "use strict"; should be allowed (also
-                                // enables 'strict')
-            immed       : true, // if immediate invocations must be wrapped in parens
-            iterator    : true, // if the `__iterator__` property should be allowed
-            jquery      : true, // if jQuery globals should be predefined
-            lastsemic   : true, // if semicolons may be ommitted for the trailing
-                                // statements inside of a one-line blocks.
-            latedef     : true, // if the use before definition should not be tolerated
-            laxbreak    : true, // if line breaks should not be checked
-            laxcomma    : true, // if line breaks should not be checked around commas
-            loopfunc    : true, // if functions should be allowed to be defined within
-                                // loops
-            mootools    : true, // if MooTools globals should be predefined
-            multistr    : true, // allow multiline strings
-            newcap      : true, // if constructor names must be capitalized
-            noarg       : true, // if arguments.caller and arguments.callee should be
-                                // disallowed
-            node        : true, // if the Node.js environment globals should be
-                                // predefined
-            noempty     : true, // if empty blocks should be disallowed
-            nonew       : true, // if using `new` for side-effects should be disallowed
-            nonstandard : true, // if non-standard (but widely adopted) globals should
-                                // be predefined
-            nomen       : true, // if names should be checked
-            onevar      : true, // if only one var statement per function should be
-                                // allowed
-            onecase     : true, // if one case switch statements should be allowed
-            passfail    : true, // if the scan should stop on first error
-            plusplus    : true, // if increment/decrement should not be allowed
-            proto       : true, // if the `__proto__` property should be allowed
-            prototypejs : true, // if Prototype and Scriptaculous globals should be
-                                // predefined
-            regexdash   : true, // if unescaped first/last dash (-) inside brackets
-                                // should be tolerated
-            regexp      : true, // if the . should not be allowed in regexp literals
-            rhino       : true, // if the Rhino environment globals should be predefined
-            undef       : true, // if variables should be declared before used
-            scripturl   : true, // if script-targeted URLs should be tolerated
-            shadow      : true, // if variable shadowing should be tolerated
-            smarttabs   : true, // if smarttabs should be tolerated
-                                // (http://www.emacswiki.org/emacs/SmartTabs)
-            strict      : true, // require the "use strict"; pragma
-            sub         : true, // if all forms of subscript notation are tolerated
-            supernew    : true, // if `new function () { ... };` and `new Object;`
-                                // should be tolerated
-            trailing    : true, // if trailing whitespace rules apply
-            validthis   : true, // if 'this' inside a non-constructor function is valid.
-                                // This is a function scoped option only.
-            withstmt    : true, // if with statements should be allowed
-            white       : true, // if strict whitespace rules apply
-            wsh         : true  // if the Windows Scripting Host environment globals
-                                // should be predefined
-        },
-
-        // These are the JSHint options that can take any value
-        // (we use this object to detect invalid options)
-        valOptions = {
-            maxlen: false,
-            indent: false,
-            maxerr: false,
-            predef: false
-        },
-
-
-        // browser contains a set of global names which are commonly provided by a
-        // web browser environment.
-        browser = {
-            ArrayBuffer              :  false,
-            ArrayBufferView          :  false,
-            Audio                    :  false,
-            addEventListener         :  false,
-            applicationCache         :  false,
-            atob                     :  false,
-            blur                     :  false,
-            btoa                     :  false,
-            clearInterval            :  false,
-            clearTimeout             :  false,
-            close                    :  false,
-            closed                   :  false,
-            DataView                 :  false,
-            DOMParser                :  false,
-            defaultStatus            :  false,
-            document                 :  false,
-            event                    :  false,
-            FileReader               :  false,
-            Float32Array             :  false,
-            Float64Array             :  false,
-            FormData                 :  false,
-            focus                    :  false,
-            frames                   :  false,
-            getComputedStyle         :  false,
-            HTMLElement              :  false,
-            HTMLAnchorElement        :  false,
-            HTMLBaseElement          :  false,
-            HTMLBlockquoteElement    :  false,
-            HTMLBodyElement          :  false,
-            HTMLBRElement            :  false,
-            HTMLButtonElement        :  false,
-            HTMLCanvasElement        :  false,
-            HTMLDirectoryElement     :  false,
-            HTMLDivElement           :  false,
-            HTMLDListElement         :  false,
-            HTMLFieldSetElement      :  false,
-            HTMLFontElement          :  false,
-            HTMLFormElement          :  false,
-            HTMLFrameElement         :  false,
-            HTMLFrameSetElement      :  false,
-            HTMLHeadElement          :  false,
-            HTMLHeadingElement       :  false,
-            HTMLHRElement            :  false,
-            HTMLHtmlElement          :  false,
-            HTMLIFrameElement        :  false,
-            HTMLImageElement         :  false,
-            HTMLInputElement         :  false,
-            HTMLIsIndexElement       :  false,
-            HTMLLabelElement         :  false,
-            HTMLLayerElement         :  false,
-            HTMLLegendElement        :  false,
-            HTMLLIElement            :  false,
-            HTMLLinkElement          :  false,
-            HTMLMapElement           :  false,
-            HTMLMenuElement          :  false,
-            HTMLMetaElement          :  false,
-            HTMLModElement           :  false,
-            HTMLObjectElement        :  false,
-            HTMLOListElement         :  false,
-            HTMLOptGroupElement      :  false,
-            HTMLOptionElement        :  false,
-            HTMLParagraphElement     :  false,
-            HTMLParamElement         :  false,
-            HTMLPreElement           :  false,
-            HTMLQuoteElement         :  false,
-            HTMLScriptElement        :  false,
-            HTMLSelectElement        :  false,
-            HTMLStyleElement         :  false,
-            HTMLTableCaptionElement  :  false,
-            HTMLTableCellElement     :  false,
-            HTMLTableColElement      :  false,
-            HTMLTableElement         :  false,
-            HTMLTableRowElement      :  false,
-            HTMLTableSectionElement  :  false,
-            HTMLTextAreaElement      :  false,
-            HTMLTitleElement         :  false,
-            HTMLUListElement         :  false,
-            HTMLVideoElement         :  false,
-            history                  :  false,
-            Int16Array               :  false,
-            Int32Array               :  false,
-            Int8Array                :  false,
-            Image                    :  false,
-            length                   :  false,
-            localStorage             :  false,
-            location                 :  false,
-            MessageChannel           :  false,
-            MessageEvent             :  false,
-            MessagePort              :  false,
-            moveBy                   :  false,
-            moveTo                   :  false,
-            name                     :  false,
-            navigator                :  false,
-            onbeforeunload           :  true,
-            onblur                   :  true,
-            onerror                  :  true,
-            onfocus                  :  true,
-            onload                   :  true,
-            onresize                 :  true,
-            onunload                 :  true,
-            open                     :  false,
-            openDatabase             :  false,
-            opener                   :  false,
-            Option                   :  false,
-            parent                   :  false,
-            print                    :  false,
-            removeEventListener      :  false,
-            resizeBy                 :  false,
-            resizeTo                 :  false,
-            screen                   :  false,
-            scroll                   :  false,
-            scrollBy                 :  false,
-            scrollTo                 :  false,
-            sessionStorage           :  false,
-            setInterval              :  false,
-            setTimeout               :  false,
-            SharedWorker             :  false,
-            status                   :  false,
-            top                      :  false,
-            Uint16Array              :  false,
-            Uint32Array              :  false,
-            Uint8Array               :  false,
-            WebSocket                :  false,
-            window                   :  false,
-            Worker                   :  false,
-            XMLHttpRequest           :  false,
-            XMLSerializer            :  false,
-            XPathEvaluator           :  false,
-            XPathException           :  false,
-            XPathExpression          :  false,
-            XPathNamespace           :  false,
-            XPathNSResolver          :  false,
-            XPathResult              :  false
-        },
-
-        couch = {
-            "require" : false,
-            respond   : false,
-            getRow    : false,
-            emit      : false,
-            send      : false,
-            start     : false,
-            sum       : false,
-            log       : false,
-            exports   : false,
-            module    : false,
-            provides  : false
-        },
-
-        devel = {
-            alert   : false,
-            confirm : false,
-            console : false,
-            Debug   : false,
-            opera   : false,
-            prompt  : false
-        },
-
-        dojo = {
-            dojo      : false,
-            dijit     : false,
-            dojox     : false,
-            define    : false,
-            "require" : false
-        },
-
-        escapes = {
-            '\b': '\\b',
-            '\t': '\\t',
-            '\n': '\\n',
-            '\f': '\\f',
-            '\r': '\\r',
-            '"' : '\\"',
-            '/' : '\\/',
-            '\\': '\\\\'
-        },
-
-        funct,          // The current function
-
-        functionicity = [
-            'closure', 'exception', 'global', 'label',
-            'outer', 'unused', 'var'
-        ],
-
-        functions,      // All of the functions
-
-        global,         // The global scope
-        implied,        // Implied globals
-        inblock,
-        indent,
-        jsonmode,
-
-        jquery = {
-            '$'    : false,
-            jQuery : false
-        },
-
-        lines,
-        lookahead,
-        member,
-        membersOnly,
-
-        mootools = {
-            '$'             : false,
-            '$$'            : false,
-            Assets          : false,
-            Browser         : false,
-            Chain           : false,
-            Class           : false,
-            Color           : false,
-            Cookie          : false,
-            Core            : false,
-            Document        : false,
-            DomReady        : false,
-            DOMReady        : false,
-            Drag            : false,
-            Element         : false,
-            Elements        : false,
-            Event           : false,
-            Events          : false,
-            Fx              : false,
-            Group           : false,
-            Hash            : false,
-            HtmlTable       : false,
-            Iframe          : false,
-            IframeShim      : false,
-            InputValidator  : false,
-            instanceOf      : false,
-            Keyboard        : false,
-            Locale          : false,
-            Mask            : false,
-            MooTools        : false,
-            Native          : false,
-            Options         : false,
-            OverText        : false,
-            Request         : false,
-            Scroller        : false,
-            Slick           : false,
-            Slider          : false,
-            Sortables       : false,
-            Spinner         : false,
-            Swiff           : false,
-            Tips            : false,
-            Type            : false,
-            typeOf          : false,
-            URI             : false,
-            Window          : false
-        },
-
-        nexttoken,
-
-        node = {
-            __filename    : false,
-            __dirname     : false,
-            Buffer        : false,
-            console       : false,
-            exports       : false,
-            GLOBAL        : false,
-            global        : false,
-            module        : false,
-            process       : false,
-            require       : false,
-            setTimeout    : false,
-            clearTimeout  : false,
-            setInterval   : false,
-            clearInterval : false
-        },
-
-        noreach,
-        option,
-        predefined,     // Global variables defined by option
-        prereg,
-        prevtoken,
-
-        prototypejs = {
-            '$'               : false,
-            '$$'              : false,
-            '$A'              : false,
-            '$F'              : false,
-            '$H'              : false,
-            '$R'              : false,
-            '$break'          : false,
-            '$continue'       : false,
-            '$w'              : false,
-            Abstract          : false,
-            Ajax              : false,
-            Class             : false,
-            Enumerable        : false,
-            Element           : false,
-            Event             : false,
-            Field             : false,
-            Form              : false,
-            Hash              : false,
-            Insertion         : false,
-            ObjectRange       : false,
-            PeriodicalExecuter: false,
-            Position          : false,
-            Prototype         : false,
-            Selector          : false,
-            Template          : false,
-            Toggle            : false,
-            Try               : false,
-            Autocompleter     : false,
-            Builder           : false,
-            Control           : false,
-            Draggable         : false,
-            Draggables        : false,
-            Droppables        : false,
-            Effect            : false,
-            Sortable          : false,
-            SortableObserver  : false,
-            Sound             : false,
-            Scriptaculous     : false
-        },
-
-        rhino = {
-            defineClass  : false,
-            deserialize  : false,
-            gc           : false,
-            help         : false,
-            importPackage: false,
-            "java"       : false,
-            load         : false,
-            loadClass    : false,
-            print        : false,
-            quit         : false,
-            readFile     : false,
-            readUrl      : false,
-            runCommand   : false,
-            seal         : false,
-            serialize    : false,
-            spawn        : false,
-            sync         : false,
-            toint32      : false,
-            version      : false
-        },
-
-        scope,      // The current scope
-        stack,
-
-        // standard contains the global names that are provided by the
-        // ECMAScript standard.
-        standard = {
-            Array               : false,
-            Boolean             : false,
-            Date                : false,
-            decodeURI           : false,
-            decodeURIComponent  : false,
-            encodeURI           : false,
-            encodeURIComponent  : false,
-            Error               : false,
-            'eval'              : false,
-            EvalError           : false,
-            Function            : false,
-            hasOwnProperty      : false,
-            isFinite            : false,
-            isNaN               : false,
-            JSON                : false,
-            Math                : false,
-            Number              : false,
-            Object              : false,
-            parseInt            : false,
-            parseFloat          : false,
-            RangeError          : false,
-            ReferenceError      : false,
-            RegExp              : false,
-            String              : false,
-            SyntaxError         : false,
-            TypeError           : false,
-            URIError            : false
-        },
-
-        // widely adopted global names that are not part of ECMAScript standard
-        nonstandard = {
-            escape              : false,
-            unescape            : false
-        },
-
-        standard_member = {
-            E                   : true,
-            LN2                 : true,
-            LN10                : true,
-            LOG2E               : true,
-            LOG10E              : true,
-            MAX_VALUE           : true,
-            MIN_VALUE           : true,
-            NEGATIVE_INFINITY   : true,
-            PI                  : true,
-            POSITIVE_INFINITY   : true,
-            SQRT1_2             : true,
-            SQRT2               : true
-        },
-
-        directive,
-        syntax = {},
-        tab,
-        token,
-        urls,
-        useESNextSyntax,
-        warnings,
-
-        wsh = {
-            ActiveXObject             : true,
-            Enumerator                : true,
-            GetObject                 : true,
-            ScriptEngine              : true,
-            ScriptEngineBuildVersion  : true,
-            ScriptEngineMajorVersion  : true,
-            ScriptEngineMinorVersion  : true,
-            VBArray                   : true,
-            WSH                       : true,
-            WScript                   : true,
-            XDomainRequest            : true
-        };
-
-    // Regular expressions. Some of these are stupidly long.
-    var ax, cx, tx, nx, nxg, lx, ix, jx, ft;
-    (function () {
-        /*jshint maxlen:300 */
-
-        // unsafe comment or string
-        ax = /@cc|<\/?|script|\]\s*\]|<\s*!|&lt/i;
-
-        // unsafe characters that are silently deleted by one or more browsers
-        cx = /[\u0000-\u001f\u007f-\u009f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/;
-
-        // token
-        tx = /^\s*([(){}\[.,:;'"~\?\]#@]|==?=?|\/(\*(jshint|jslint|members?|global)?|=|\/)?|\*[\/=]?|\+(?:=|\++)?|-(?:=|-+)?|%=?|&[&=]?|\|[|=]?|>>?>?=?|<([\/=!]|\!(\[|--)?|<=?)?|\^=?|\!=?=?|[a-zA-Z_$][a-zA-Z0-9_$]*|[0-9]+([xX][0-9a-fA-F]+|\.[0-9]*)?([eE][+\-]?[0-9]+)?)/;
-
-        // characters in strings that need escapement
-        nx = /[\u0000-\u001f&<"\/\\\u007f-\u009f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/;
-        nxg = /[\u0000-\u001f&<"\/\\\u007f-\u009f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g;
-
-        // star slash
-        lx = /\*\/|\/\*/;
-
-        // identifier
-        ix = /^([a-zA-Z_$][a-zA-Z0-9_$]*)$/;
-
-        // javascript url
-        jx = /^(?:javascript|jscript|ecmascript|vbscript|mocha|livescript)\s*:/i;
-
-        // catches /* falls through */ comments
-        ft = /^\s*\/\*\s*falls\sthrough\s*\*\/\s*$/;
-    }());
-
-    function F() {}     // Used by Object.create
-
-    function is_own(object, name) {
-
-// The object.hasOwnProperty method fails when the property under consideration
-// is named 'hasOwnProperty'. So we have to use this more convoluted form.
-
-        return Object.prototype.hasOwnProperty.call(object, name);
-    }
-
-    function checkOption(name, t) {
-        if (valOptions[name] === undefined && boolOptions[name] === undefined) {
-            warning("Bad option: '" + name + "'.", t);
-        }
-    }
-
-// Provide critical ES5 functions to ES3.
-
-    if (typeof Array.isArray !== 'function') {
-        Array.isArray = function (o) {
-            return Object.prototype.toString.apply(o) === '[object Array]';
-        };
-    }
-
-    if (typeof Object.create !== 'function') {
-        Object.create = function (o) {
-            F.prototype = o;
-            return new F();
-        };
-    }
-
-    if (typeof Object.keys !== 'function') {
-        Object.keys = function (o) {
-            var a = [], k;
-            for (k in o) {
-                if (is_own(o, k)) {
-                    a.push(k);
-                }
-            }
-            return a;
-        };
-    }
-
-// Non standard methods
-
-    if (typeof String.prototype.entityify !== 'function') {
-        String.prototype.entityify = function () {
-            return this
-                .replace(/&/g, '&amp;')
-                .replace(/</g, '&lt;')
-                .replace(/>/g, '&gt;');
-        };
-    }
-
-    if (typeof String.prototype.isAlpha !== 'function') {
-        String.prototype.isAlpha = function () {
-            return (this >= 'a' && this <= 'z\uffff') ||
-                (this >= 'A' && this <= 'Z\uffff');
-        };
-    }
-
-    if (typeof String.prototype.isDigit !== 'function') {
-        String.prototype.isDigit = function () {
-            return (this >= '0' && this <= '9');
-        };
-    }
-
-    if (typeof String.prototype.supplant !== 'function') {
-        String.prototype.supplant = function (o) {
-            return this.replace(/\{([^{}]*)\}/g, function (a, b) {
-                var r = o[b];
-                return typeof r === 'string' || typeof r === 'number' ? r : a;
-            });
-        };
-    }
-
-    if (typeof String.prototype.name !== 'function') {
-        String.prototype.name = function () {
-
-// If the string looks like an identifier, then we can return it as is.
-// If the string contains no control characters, no quote characters, and no
-// backslash characters, then we can simply slap some quotes around it.
-// Otherwise we must also replace the offending characters with safe
-// sequences.
-
-            if (ix.test(this)) {
-                return this;
-            }
-            if (nx.test(this)) {
-                return '"' + this.replace(nxg, function (a) {
-                    var c = escapes[a];
-                    if (c) {
-                        return c;
-                    }
-                    return '\\u' + ('0000' + a.charCodeAt().toString(16)).slice(-4);
-                }) + '"';
-            }
-            return '"' + this + '"';
-        };
-    }
-
-
-    function combine(t, o) {
-        var n;
-        for (n in o) {
-            if (is_own(o, n)) {
-                t[n] = o[n];
-            }
-        }
-    }
-
-    function assume() {
-        if (option.couch) {
-            combine(predefined, couch);
-        }
-
-        if (option.rhino) {
-            combine(predefined, rhino);
-        }
-
-        if (option.prototypejs) {
-            combine(predefined, prototypejs);
-        }
-
-        if (option.node) {
-            combine(predefined, node);
-            option.globalstrict = true;
-        }
-
-        if (option.devel) {
-            combine(predefined, devel);
-        }
-
-        if (option.dojo) {
-            combine(predefined, dojo);
-        }
-
-        if (option.browser) {
-            combine(predefined, browser);
-        }
-
-        if (option.nonstandard) {
-            combine(predefined, nonstandard);
-        }
-
-        if (option.jquery) {
-            combine(predefined, jquery);
-        }
-
-        if (option.mootools) {
-            combine(predefined, mootools);
-        }
-
-        if (option.wsh) {
-            combine(predefined, wsh);
-        }
-
-        if (option.esnext) {
-            useESNextSyntax();
-        }
-
-        if (option.globalstrict && option.strict !== false) {
-            option.strict = true;
-        }
-    }
-
-
-    // Produce an error warning.
-    function quit(message, line, chr) {
-        var percentage = Math.floor((line / lines.length) * 100);
-
-        throw {
-            name: 'JSHintError',
-            line: line,
-            character: chr,
-            message: message + " (" + percentage + "% scanned).",
-            raw: message
-        };
-    }
-
-    function isundef(scope, m, t, a) {
-        return JSHINT.undefs.push([scope, m, t, a]);
-    }
-
-    function warning(m, t, a, b, c, d) {
-        var ch, l, w;
-        t = t || nexttoken;
-        if (t.id === '(end)') {  // `~
-            t = token;
-        }
-        l = t.line || 0;
-        ch = t.from || 0;
-        w = {
-            id: '(error)',
-            raw: m,
-            evidence: lines[l - 1] || '',
-            line: l,
-            character: ch,
-            a: a,
-            b: b,
-            c: c,
-            d: d
-        };
-        w.reason = m.supplant(w);
-        JSHINT.errors.push(w);
-        if (option.passfail) {
-            quit('Stopping. ', l, ch);
-        }
-        warnings += 1;
-        if (warnings >= option.maxerr) {
-            quit("Too many errors.", l, ch);
-        }
-        return w;
-    }
-
-    function warningAt(m, l, ch, a, b, c, d) {
-        return warning(m, {
-            line: l,
-            from: ch
-        }, a, b, c, d);
-    }
-
-    function error(m, t, a, b, c, d) {
-        var w = warning(m, t, a, b, c, d);
-    }
-
-    function errorAt(m, l, ch, a, b, c, d) {
-        return error(m, {
-            line: l,
-            from: ch
-        }, a, b, c, d);
-    }
-
-
-
-// lexical analysis and token construction
-
-    var lex = (function lex() {
-        var character, from, line, s;
-
-// Private lex methods
-
-        function nextLine() {
-            var at,
-                tw; // trailing whitespace check
-
-            if (line >= lines.length)
-                return false;
-
-            character = 1;
-            s = lines[line];
-            line += 1;
-
-            // If smarttabs option is used check for spaces followed by tabs only.
-            // Otherwise check for any occurence of mixed tabs and spaces.
-            if (option.smarttabs)
-                at = s.search(/ \t/);
-            else
-                at = s.search(/ \t|\t /);
-
-            if (at >= 0)
-                warningAt("Mixed spaces and tabs.", line, at + 1);
-
-            s = s.replace(/\t/g, tab);
-            at = s.search(cx);
-
-            if (at >= 0)
-                warningAt("Unsafe character.", line, at);
-
-            if (option.maxlen && option.maxlen < s.length)
-                warningAt("Line too long.", line, s.length);
-
-            // Check for trailing whitespaces
-            tw = option.trailing && s.match(/^(.*?)\s+$/);
-            if (tw && !/^\s+$/.test(s)) {
-                warningAt("Trailing whitespace.", line, tw[1].length + 1);
-            }
-            return true;
-        }
-
-// Produce a token object.  The token inherits from a syntax symbol.
-
-        function it(type, value) {
-            var i, t;
-            if (type === '(color)' || type === '(range)') {
-                t = {type: type};
-            } else if (type === '(punctuator)' ||
-                    (type === '(identifier)' && is_own(syntax, value))) {
-                t = syntax[value] || syntax['(error)'];
-            } else {
-                t = syntax[type];
-            }
-            t = Object.create(t);
-            if (type === '(string)' || type === '(range)') {
-                if (!option.scripturl && jx.test(value)) {
-                    warningAt("Script URL.", line, from);
-                }
-            }
-            if (type === '(identifier)') {
-                t.identifier = true;
-                if (value === '__proto__' && !option.proto) {
-                    warningAt("The '{a}' property is deprecated.",
-                        line, from, value);
-                } else if (value === '__iterator__' && !option.iterator) {
-                    warningAt("'{a}' is only available in JavaScript 1.7.",
-                        line, from, value);
-                } else if (option.nomen && (value.charAt(0) === '_' ||
-                         value.charAt(value.length - 1) === '_')) {
-                    if (!option.node || token.id === '.' ||
-                            (value !== '__dirname' && value !== '__filename')) {
-                        warningAt("Unexpected {a} in '{b}'.", line, from, "dangling '_'", value);
-                    }
-                }
-            }
-            t.value = value;
-            t.line = line;
-            t.character = character;
-            t.from = from;
-            i = t.id;
-            if (i !== '(endline)') {
-                prereg = i &&
-                    (('(,=:[!&|?{};'.indexOf(i.charAt(i.length - 1)) >= 0) ||
-                    i === 'return' ||
-                    i === 'case');
-            }
-            return t;
-        }
-
-        // Public lex methods
-        return {
-            init: function (source) {
-                if (typeof source === 'string') {
-                    lines = source
-                        .replace(/\r\n/g, '\n')
-                        .replace(/\r/g, '\n')
-                        .split('\n');
-                } else {
-                    lines = source;
-                }
-
-                // If the first line is a shebang (#!), make it a blank and move on.
-                // Shebangs are used by Node scripts.
-                if (lines[0] && lines[0].substr(0, 2) === '#!')
-                    lines[0] = '';
-
-                line = 0;
-                nextLine();
-                from = 1;
-            },
-
-            range: function (begin, end) {
-                var c, value = '';
-                from = character;
-                if (s.charAt(0) !== begin) {
-                    errorAt("Expected '{a}' and instead saw '{b}'.",
-                            line, character, begin, s.charAt(0));
-                }
-                for (;;) {
-                    s = s.slice(1);
-                    character += 1;
-                    c = s.charAt(0);
-                    switch (c) {
-                    case '':
-                        errorAt("Missing '{a}'.", line, character, c);
-                        break;
-                    case end:
-                        s = s.slice(1);
-                        character += 1;
-                        return it('(range)', value);
-                    case '\\':
-                        warningAt("Unexpected '{a}'.", line, character, c);
-                    }
-                    value += c;
-                }
-
-            },
-
-
-            // token -- this is called by advance to get the next token
-            token: function () {
-                var b, c, captures, d, depth, high, i, l, low, q, t, isLiteral, isInRange, n;
-
-                function match(x) {
-                    var r = x.exec(s), r1;
-                    if (r) {
-                        l = r[0].length;
-                        r1 = r[1];
-                        c = r1.charAt(0);
-                        s = s.substr(l);
-                        from = character + l - r1.length;
-                        character += l;
-                        return r1;
-                    }
-                }
-
-                function string(x) {
-                    var c, j, r = '', allowNewLine = false;
-
-                    if (jsonmode && x !== '"') {
-                        warningAt("Strings must use doublequote.",
-                                line, character);
-                    }
-
-                    function esc(n) {
-                        var i = parseInt(s.substr(j + 1, n), 16);
-                        j += n;
-                        if (i >= 32 && i <= 126 &&
-                                i !== 34 && i !== 92 && i !== 39) {
-                            warningAt("Unnecessary escapement.", line, character);
-                        }
-                        character += n;
-                        c = String.fromCharCode(i);
-                    }
-                    j = 0;
-unclosedString:     for (;;) {
-                        while (j >= s.length) {
-                            j = 0;
-
-                            var cl = line, cf = from;
-                            if (!nextLine()) {
-                                errorAt("Unclosed string.", cl, cf);
-                                break unclosedString;
-                            }
-
-                            if (allowNewLine) {
-                                allowNewLine = false;
-                            } else {
-                                warningAt("Unclosed string.", cl, cf);
-                            }
-                        }
-                        c = s.charAt(j);
-                        if (c === x) {
-                            character += 1;
-                            s = s.substr(j + 1);
-                            return it('(string)', r, x);
-                        }
-                        if (c < ' ') {
-                            if (c === '\n' || c === '\r') {
-                                break;
-                            }
-                            warningAt("Control character in string: {a}.",
-                                    line, character + j, s.slice(0, j));
-                        } else if (c === '\\') {
-                            j += 1;
-                            character += 1;
-                            c = s.charAt(j);
-                            n = s.charAt(j + 1);
-                            switch (c) {
-                            case '\\':
-                            case '"':
-                            case '/':
-                                break;
-                            case '\'':
-                                if (jsonmode) {
-                                    warningAt("Avoid \\'.", line, character);
-                                }
-                                break;
-                            case 'b':
-                                c = '\b';
-                                break;
-                            case 'f':
-                                c = '\f';
-                                break;
-                            case 'n':
-                                c = '\n';
-                                break;
-                            case 'r':
-                                c = '\r';
-                                break;
-                            case 't':
-                                c = '\t';
-                                break;
-                            case '0':
-                                c = '\0';
-                                // Octal literals fail in strict mode
-                                // check if the number is between 00 and 07
-                                // where 'n' is the token next to 'c'
-                                if (n >= 0 && n <= 7 && directive["use strict"]) {
-                                    warningAt(
-                                    "Octal literals are not allowed in strict mode.",
-                                    line, character);
-                                }
-                                break;
-                            case 'u':
-                                esc(4);
-                                break;
-                            case 'v':
-                                if (jsonmode) {
-                                    warningAt("Avoid \\v.", line, character);
-                                }
-                                c = '\v';
-                                break;
-                            case 'x':
-                                if (jsonmode) {
-                                    warningAt("Avoid \\x-.", line, character);
-                                }
-                                esc(2);
-                                break;
-                            case '':
-                                // last character is escape character
-                                // always allow new line if escaped, but show
-                                // warning if option is not set
-                                allowNewLine = true;
-                                if (option.multistr) {
-                                    if (jsonmode) {
-                                        warningAt("Avoid EOL escapement.", line, character);
-                                    }
-                                    c = '';
-                                    character -= 1;
-                                    break;
-                                }
-                                warningAt("Bad escapement of EOL. Use option multistr if needed.",
-                                    line, character);
-                                break;
-                            default:
-                                warningAt("Bad escapement.", line, character);
-                            }
-                        }
-                        r += c;
-                        character += 1;
-                        j += 1;
-                    }
-                }
-
-                for (;;) {
-                    if (!s) {
-                        return it(nextLine() ? '(endline)' : '(end)', '');
-                    }
-                    t = match(tx);
-                    if (!t) {
-                        t = '';
-                        c = '';
-                        while (s && s < '!') {
-                            s = s.substr(1);
-                        }
-                        if (s) {
-                            errorAt("Unexpected '{a}'.", line, character, s.substr(0, 1));
-                            s = '';
-                        }
-                    } else {
-
-    //      identifier
-
-                        if (c.isAlpha() || c === '_' || c === '$') {
-                            return it('(identifier)', t);
-                        }
-
-    //      number
-
-                        if (c.isDigit()) {
-                            if (!isFinite(Number(t))) {
-                                warningAt("Bad number '{a}'.",
-                                    line, character, t);
-                            }
-                            if (s.substr(0, 1).isAlpha()) {
-                                warningAt("Missing space after '{a}'.",
-                                        line, character, t);
-                            }
-                            if (c === '0') {
-                                d = t.substr(1, 1);
-                                if (d.isDigit()) {
-                                    if (token.id !== '.') {
-                                        warningAt("Don't use extra leading zeros '{a}'.",
-                                            line, character, t);
-                                    }
-                                } else if (jsonmode && (d === 'x' || d === 'X')) {
-                                    warningAt("Avoid 0x-. '{a}'.",
-                                            line, character, t);
-                                }
-                            }
-                            if (t.substr(t.length - 1) === '.') {
-                                warningAt(
-"A trailing decimal point can be confused with a dot '{a}'.", line, character, t);
-                            }
-                            return it('(number)', t);
-                        }
-                        switch (t) {
-
-    //      string
-
-                        case '"':
-                        case "'":
-                            return string(t);
-
-    //      // comment
-
-                        case '//':
-                            s = '';
-                            token.comment = true;
-                            break;
-
-    //      /* comment
-
-                        case '/*':
-                            for (;;) {
-                                i = s.search(lx);
-                                if (i >= 0) {
-                                    break;
-                                }
-                                if (!nextLine()) {
-                                    errorAt("Unclosed comment.", line, character);
-                                }
-                            }
-                            character += i + 2;
-                            if (s.substr(i, 1) === '/') {
-                                errorAt("Nested comment.", line, character);
-                            }
-                            s = s.substr(i + 2);
-                            token.comment = true;
-                            break;
-
-    //      /*members /*jshint /*global
-
-                        case '/*members':
-                        case '/*member':
-                        case '/*jshint':
-                        case '/*jslint':
-                        case '/*global':
-                        case '*/':
-                            return {
-                                value: t,
-                                type: 'special',
-                                line: line,
-                                character: character,
-                                from: from
-                            };
-
-                        case '':
-                            break;
-    //      /
-                        case '/':
-                            if (token.id === '/=') {
-                                errorAt("A regular expression literal can be confused with '/='.",
-                                    line, from);
-                            }
-                            if (prereg) {
-                                depth = 0;
-                                captures = 0;
-                                l = 0;
-                                for (;;) {
-                                    b = true;
-                                    c = s.charAt(l);
-                                    l += 1;
-                                    switch (c) {
-                                    case '':
-                                        errorAt("Unclosed regular expression.", line, from);
-                                        return quit('Stopping.', line, from);
-                                    case '/':
-                                        if (depth > 0) {
-                                            warningAt("{a} unterminated regular expression " +
-                                                "group(s).", line, from + l, depth);
-                                        }
-                                        c = s.substr(0, l - 1);
-                                        q = {
-                                            g: true,
-                                            i: true,
-                                            m: true
-                                        };
-                                        while (q[s.charAt(l)] === true) {
-                                            q[s.charAt(l)] = false;
-                                            l += 1;
-                                        }
-                                        character += l;
-                                        s = s.substr(l);
-                                        q = s.charAt(0);
-                                        if (q === '/' || q === '*') {
-                                            errorAt("Confusing regular expression.",
-                                                    line, from);
-                                        }
-                                        return it('(regexp)', c);
-                                    case '\\':
-                                        c = s.charAt(l);
-                                        if (c < ' ') {
-                                            warningAt(
-"Unexpected control character in regular expression.", line, from + l);
-                                        } else if (c === '<') {
-                                            warningAt(
-"Unexpected escaped character '{a}' in regular expression.", line, from + l, c);
-                                        }
-                                        l += 1;
-                                        break;
-                                    case '(':
-                                        depth += 1;
-                                        b = false;
-                                        if (s.charAt(l) === '?') {
-                                            l += 1;
-                                            switch (s.charAt(l)) {
-                                            case ':':
-                                            case '=':
-                                            case '!':
-                                                l += 1;
-                                                break;
-                                            default:
-                                                warningAt(
-"Expected '{a}' and instead saw '{b}'.", line, from + l, ':', s.charAt(l));
-                                            }
-                                        } else {
-                                            captures += 1;
-                                        }
-                                        break;
-                                    case '|':
-                                        b = false;
-                                        break;
-                                    case ')':
-                                        if (depth === 0) {
-                                            warningAt("Unescaped '{a}'.",
-                                                    line, from + l, ')');
-                                        } else {
-                                            depth -= 1;
-                                        }
-                                        break;
-                                    case ' ':
-                                        q = 1;
-                                        while (s.charAt(l) === ' ') {
-                                            l += 1;
-                                            q += 1;
-                                        }
-                                        if (q > 1) {
-                                            warningAt(
-"Spaces are hard to count. Use {{a}}.", line, from + l, q);
-                                        }
-                                        break;
-                                    case '[':
-                                        c = s.charAt(l);
-                                        if (c === '^') {
-                                            l += 1;
-                                            if (option.regexp) {
-                                                warningAt("Insecure '{a}'.",
-                                                        line, from + l, c);
-                                            } else if (s.charAt(l) === ']') {
-                                                errorAt("Unescaped '{a}'.",
-                                                    line, from + l, '^');
-                                            }
-                                        }
-                                        if (c === ']') {
-                                            warningAt("Empty class.", line,
-                                                    from + l - 1);
-                                        }
-                                        isLiteral = false;
-                                        isInRange = false;
-klass:                                  do {
-                                            c = s.charAt(l);
-                                            l += 1;
-                                            switch (c) {
-                                            case '[':
-                                            case '^':
-                                                warningAt("Unescaped '{a}'.",
-                                                        line, from + l, c);
-                                                if (isInRange) {
-                                                    isInRange = false;
-                                                } else {
-                                                    isLiteral = true;
-                                                }
-                                                break;
-                                            case '-':
-                                                if (isLiteral && !isInRange) {
-                                                    isLiteral = false;
-                                                    isInRange = true;
-                                                } else if (isInRange) {
-                                                    isInRange = false;
-                                                } else if (s.charAt(l) === ']') {
-                                                    isInRange = true;
-                                                } else {
-                                                    if (option.regexdash !== (l === 2 || (l === 3 &&
-                                                        s.charAt(1) === '^'))) {
-                                                        warningAt("Unescaped '{a}'.",
-                                                            line, from + l - 1, '-');
-                                                    }
-                                                    isLiteral = true;
-                                                }
-                                                break;
-                                            case ']':
-                                                if (isInRange && !option.regexdash) {
-                                                    warningAt("Unescaped '{a}'.",
-                                                            line, from + l - 1, '-');
-                                                }
-                                                break klass;
-                                            case '\\':
-                                                c = s.charAt(l);
-                                                if (c < ' ') {
-                                                    warningAt(
-"Unexpected control character in regular expression.", line, from + l);
-                                                } else if (c === '<') {
-                                                    warningAt(
-"Unexpected escaped character '{a}' in regular expression.", line, from + l, c);
-                                                }
-                                                l += 1;
-
-                                                // \w, \s and \d are never part of a character range
-                                                if (/[wsd]/i.test(c)) {
-                                                    if (isInRange) {
-                                                        warningAt("Unescaped '{a}'.",
-                                                            line, from + l, '-');
-                                                        isInRange = false;
-                                                    }
-                                                    isLiteral = false;
-                                                } else if (isInRange) {
-                                                    isInRange = false;
-                                                } else {
-                                                    isLiteral = true;
-                                                }
-                                                break;
-                                            case '/':
-                                                warningAt("Unescaped '{a}'.",
-                                                        line, from + l - 1, '/');
-
-                                                if (isInRange) {
-                                                    isInRange = false;
-                                                } else {
-                                                    isLiteral = true;
-                                                }
-                                                break;
-                                            case '<':
-                                                if (isInRange) {
-                                                    isInRange = false;
-                                                } else {
-                                                    isLiteral = true;
-                                                }
-                                                break;
-                                            default:
-                                                if (isInRange) {
-                                                    isInRange = false;
-                                                } else {
-                                                    isLiteral = true;
-                                                }
-                                            }
-                                        } while (c);
-                                        break;
-                                    case '.':
-                                        if (option.regexp) {
-                                            warningAt("Insecure '{a}'.", line,
-                                                    from + l, c);
-                                        }
-                                        break;
-                                    case ']':
-                                    case '?':
-                                    case '{':
-                                    case '}':
-                                    case '+':
-                                    case '*':
-                                        warningAt("Unescaped '{a}'.", line,
-                                                from + l, c);
-                                    }
-                                    if (b) {
-                                        switch (s.charAt(l)) {
-                                        case '?':
-                                        case '+':
-                                        case '*':
-                                            l += 1;
-                                            if (s.charAt(l) === '?') {
-                                                l += 1;
-                                            }
-                                            break;
-                                        case '{':
-                                            l += 1;
-                                            c = s.charAt(l);
-                                            if (c < '0' || c > '9') {
-                                                warningAt(
-"Expected a number and instead saw '{a}'.", line, from + l, c);
-                                            }
-                                            l += 1;
-                                            low = +c;
-                                            for (;;) {
-                                                c = s.charAt(l);
-                                                if (c < '0' || c > '9') {
-                                                    break;
-                                                }
-                                                l += 1;
-                                                low = +c + (low * 10);
-                                            }
-                                            high = low;
-                                            if (c === ',') {
-                                                l += 1;
-                                                high = Infinity;
-                                                c = s.charAt(l);
-                                                if (c >= '0' && c <= '9') {
-                                                    l += 1;
-                                                    high = +c;
-                                                    for (;;) {
-                                                        c = s.charAt(l);
-                                                        if (c < '0' || c > '9') {
-                                                            break;
-                                                        }
-                                                        l += 1;
-                                                        high = +c + (high * 10);
-                                                    }
-                                                }
-                                            }
-                                            if (s.charAt(l) !== '}') {
-                                                warningAt(
-"Expected '{a}' and instead saw '{b}'.", line, from + l, '}', c);
-                                            } else {
-                                                l += 1;
-                                            }
-                                            if (s.charAt(l) === '?') {
-                                                l += 1;
-                                            }
-                                            if (low > high) {
-                                                warningAt(
-"'{a}' should not be greater than '{b}'.", line, from + l, low, high);
-                                            }
-                                        }
-                                    }
-                                }
-                                c = s.substr(0, l - 1);
-                                character += l;
-                                s = s.substr(l);
-                                return it('(regexp)', c);
-                            }
-                            return it('(punctuator)', t);
-
-    //      punctuator
-
-                        case '#':
-                            return it('(punctuator)', t);
-                        default:
-                            return it('(punctuator)', t);
-                        }
-                    }
-                }
-            }
-        };
-    }());
-
-
-    function addlabel(t, type) {
-
-        if (t === 'hasOwnProperty') {
-            warning("'hasOwnProperty' is a really bad name.");
-        }
-
-// Define t in the current function in the current scope.
-        if (is_own(funct, t) && !funct['(global)']) {
-            if (funct[t] === true) {
-                if (option.latedef)
-                    warning("'{a}' was used before it was defined.", nexttoken, t);
-            } else {
-                if (!option.shadow && type !== "exception")
-                    warning("'{a}' is already defined.", nexttoken, t);
-            }
-        }
-
-        funct[t] = type;
-        if (funct['(global)']) {
-            global[t] = funct;
-            if (is_own(implied, t)) {
-                if (option.latedef)
-                    warning("'{a}' was used before it was defined.", nexttoken, t);
-                delete implied[t];
-            }
-        } else {
-            scope[t] = funct;
-        }
-    }
-
-
-    function doOption() {
-        var b, obj, filter, o = nexttoken.value, t, v;
-
-        switch (o) {
-        case '*/':
-            error("Unbegun comment.");
-            break;
-        case '/*members':
-        case '/*member':
-            o = '/*members';
-            if (!membersOnly) {
-                membersOnly = {};
-            }
-            obj = membersOnly;
-            break;
-        case '/*jshint':
-        case '/*jslint':
-            obj = option;
-            filter = boolOptions;
-            break;
-        case '/*global':
-            obj = predefined;
-            break;
-        default:
-            error("What?");
-        }
-
-        t = lex.token();
-loop:   for (;;) {
-            for (;;) {
-                if (t.type === 'special' && t.value === '*/') {
-                    break loop;
-                }
-                if (t.id !== '(endline)' && t.id !== ',') {
-                    break;
-                }
-                t = lex.token();
-            }
-            if (t.type !== '(string)' && t.type !== '(identifier)' &&
-                    o !== '/*members') {
-                error("Bad option.", t);
-            }
-
-            v = lex.token();
-            if (v.id === ':') {
-                v = lex.token();
-
-                if (obj === membersOnly) {
-                    error("Expected '{a}' and instead saw '{b}'.",
-                            t, '*/', ':');
-                }
-
-                if (o === '/*jshint') {
-                    checkOption(t.value, t);
-                }
-
-                if (t.value === 'indent' && (o === '/*jshint' || o === '/*jslint')) {
-                    b = +v.value;
-                    if (typeof b !== 'number' || !isFinite(b) || b <= 0 ||
-                            Math.floor(b) !== b) {
-                        error("Expected a small integer and instead saw '{a}'.",
-                                v, v.value);
-                    }
-                    obj.white = true;
-                    obj.indent = b;
-                } else if (t.value === 'maxerr' && (o === '/*jshint' || o === '/*jslint')) {
-                    b = +v.value;
-                    if (typeof b !== 'number' || !isFinite(b) || b <= 0 ||
-                            Math.floor(b) !== b) {
-                        error("Expected a small integer and instead saw '{a}'.",
-                                v, v.value);
-                    }
-                    obj.maxerr = b;
-                } else if (t.value === 'maxlen' && (o === '/*jshint' || o === '/*jslint')) {
-                    b = +v.value;
-                    if (typeof b !== 'number' || !isFinite(b) || b <= 0 ||
-                            Math.floor(b) !== b) {
-                        error("Expected a small integer and instead saw '{a}'.",
-                                v, v.value);
-                    }
-                    obj.maxlen = b;
-                } else if (t.value === 'validthis') {
-                    if (funct['(global)']) {
-                        error("Option 'validthis' can't be used in a global scope.");
-                    } else {
-                        if (v.value === 'true' || v.value === 'false')
-                            obj[t.value] = v.value === 'true';
-                        else
-                            error("Bad option value.", v);
-                    }
-                } else if (v.value === 'true') {
-                    obj[t.value] = true;
-                } else if (v.value === 'false') {
-                    obj[t.value] = false;
-                } else {
-                    error("Bad option value.", v);
-                }
-                t = lex.token();
-            } else {
-                if (o === '/*jshint' || o === '/*jslint') {
-                    error("Missing option value.", t);
-                }
-                obj[t.value] = false;
-                t = v;
-            }
-        }
-        if (filter) {
-            assume();
-        }
-    }
-
-
-// We need a peek function. If it has an argument, it peeks that much farther
-// ahead. It is used to distinguish
-//     for ( var i in ...
-// from
-//     for ( var i = ...
-
-    function peek(p) {
-        var i = p || 0, j = 0, t;
-
-        while (j <= i) {
-            t = lookahead[j];
-            if (!t) {
-                t = lookahead[j] = lex.token();
-            }
-            j += 1;
-        }
-        return t;
-    }
-
-
-
-// Produce the next token. It looks for programming errors.
-
-    function advance(id, t) {
-        switch (token.id) {
-        case '(number)':
-            if (nexttoken.id === '.') {
-                warning("A dot following a number can be confused with a decimal point.", token);
-            }
-            break;
-        case '-':
-            if (nexttoken.id === '-' || nexttoken.id === '--') {
-                warning("Confusing minusses.");
-            }
-            break;
-        case '+':
-            if (nexttoken.id === '+' || nexttoken.id === '++') {
-                warning("Confusing plusses.");
-            }
-            break;
-        }
-
-        if (token.type === '(string)' || token.identifier) {
-            anonname = token.value;
-        }
-
-        if (id && nexttoken.id !== id) {
-            if (t) {
-                if (nexttoken.id === '(end)') {
-                    warning("Unmatched '{a}'.", t, t.id);
-                } else {
-                    warning("Expected '{a}' to match '{b}' from line {c} and instead saw '{d}'.",
-                            nexttoken, id, t.id, t.line, nexttoken.value);
-                }
-            } else if (nexttoken.type !== '(identifier)' ||
-                            nexttoken.value !== id) {
-                warning("Expected '{a}' and instead saw '{b}'.",
-                        nexttoken, id, nexttoken.value);
-            }
-        }
-
-        prevtoken = token;
-        token = nexttoken;
-        for (;;) {
-            nexttoken = lookahead.shift() || lex.token();
-            if (nexttoken.id === '(end)' || nexttoken.id === '(error)') {
-                return;
-            }
-            if (nexttoken.type === 'special') {
-                doOption();
-            } else {
-                if (nexttoken.id !== '(endline)') {
-                    break;
-                }
-            }
-        }
-    }
-
-
-// This is the heart of JSHINT, the Pratt parser. In addition to parsing, it
-// is looking for ad hoc lint patterns. We add .fud to Pratt's model, which is
-// like .nud except that it is only used on the first token of a statement.
-// Having .fud makes it much easier to define statement-oriented languages like
-// JavaScript. I retained Pratt's nomenclature.
-
-// .nud     Null denotation
-// .fud     First null denotation
-// .led     Left denotation
-//  lbp     Left binding power
-//  rbp     Right binding power
-
-// They are elements of the parsing method called Top Down Operator Precedence.
-
-    function expression(rbp, initial) {
-        var left, isArray = false, isObject = false;
-
-        if (nexttoken.id === '(end)')
-            error("Unexpected early end of program.", token);
-
-        advance();
-        if (initial) {
-            anonname = 'anonymous';
-            funct['(verb)'] = token.value;
-        }
-        if (initial === true && token.fud) {
-            left = token.fud();
-        } else {
-            if (token.nud) {
-                left = token.nud();
-            } else {
-                if (nexttoken.type === '(number)' && token.id === '.') {
-                    warning("A leading decimal point can be confused with a dot: '.{a}'.",
-                            token, nexttoken.value);
-                    advance();
-                    return token;
-                } else {
-                    error("Expected an identifier and instead saw '{a}'.",
-                            token, token.id);
-                }
-            }
-            while (rbp < nexttoken.lbp) {
-                isArray = token.value === 'Array';
-                isObject = token.value === 'Object';
-                advance();
-                if (isArray && token.id === '(' && nexttoken.id === ')')
-                    warning("Use the array literal notation [].", token);
-                if (isObject && token.id === '(' && nexttoken.id === ')')
-                    warning("Use the object literal notation {}.", token);
-                if (token.led) {
-                    left = token.led(left);
-                } else {
-                    error("Expected an operator and instead saw '{a}'.",
-                        token, token.id);
-                }
-            }
-        }
-        return left;
-    }
-
-
-// Functions for conformance of style.
-
-    function adjacent(left, right) {
-        left = left || token;
-        right = right || nexttoken;
-        if (option.white) {
-            if (left.character !== right.from && left.line === right.line) {
-                left.from += (left.character - left.from);
-                warning("Unexpected space after '{a}'.", left, left.value);
-            }
-        }
-    }
-
-    function nobreak(left, right) {
-        left = left || token;
-        right = right || nexttoken;
-        if (option.white && (left.character !== right.from || left.line !== right.line)) {
-            warning("Unexpected space before '{a}'.", right, right.value);
-        }
-    }
-
-    function nospace(left, right) {
-        left = left || token;
-        right = right || nexttoken;
-        if (option.white && !left.comment) {
-            if (left.line === right.line) {
-                adjacent(left, right);
-            }
-        }
-    }
-
-    function nonadjacent(left, right) {
-        if (option.white) {
-            left = left || token;
-            right = right || nexttoken;
-            if (left.line === right.line && left.character === right.from) {
-                left.from += (left.character - left.from);
-                warning("Missing space after '{a}'.",
-                        left, left.value);
-            }
-        }
-    }
-
-    function nobreaknonadjacent(left, right) {
-        left = left || token;
-        right = right || nexttoken;
-        if (!option.laxbreak && left.line !== right.line) {
-            warning("Bad line breaking before '{a}'.", right, right.id);
-        } else if (option.white) {
-            left = left || token;
-            right = right || nexttoken;
-            if (left.character === right.from) {
-                left.from += (left.character - left.from);
-                warning("Missing space after '{a}'.",
-                        left, left.value);
-            }
-        }
-    }
-
-    function indentation(bias) {
-        var i;
-        if (option.white && nexttoken.id !== '(end)') {
-            i = indent + (bias || 0);
-            if (nexttoken.from !== i) {
-                warning(
-"Expected '{a}' to have an indentation at {b} instead at {c}.",
-                        nexttoken, nexttoken.value, i, nexttoken.from);
-            }
-        }
-    }
-
-    function nolinebreak(t) {
-        t = t || token;
-        if (t.line !== nexttoken.line) {
-            warning("Line breaking error '{a}'.", t, t.value);
-        }
-    }
-
-
-    function comma() {
-        if (token.line !== nexttoken.line) {
-            if (!option.laxcomma) {
-                if (comma.first) {
-                    warning("Comma warnings can be turned off with 'laxcomma'");
-                    comma.first = false;
-                }
-                warning("Bad line breaking before '{a}'.", token, nexttoken.id);
-            }
-        } else if (!token.comment && token.character !== nexttoken.from && option.white) {
-            token.from += (token.character - token.from);
-            warning("Unexpected space after '{a}'.", token, token.value);
-        }
-        advance(',');
-        nonadjacent(token, nexttoken);
-    }
-
-
-// Functional constructors for making the symbols that will be inherited by
-// tokens.
-
-    function symbol(s, p) {
-        var x = syntax[s];
-        if (!x || typeof x !== 'object') {
-            syntax[s] = x = {
-                id: s,
-                lbp: p,
-                value: s
-            };
-        }
-        return x;
-    }
-
-
-    function delim(s) {
-        return symbol(s, 0);
-    }
-
-
-    function stmt(s, f) {
-        var x = delim(s);
-        x.identifier = x.reserved = true;
-        x.fud = f;
-        return x;
-    }
-
-
-    function blockstmt(s, f) {
-        var x = stmt(s, f);
-        x.block = true;
-        return x;
-    }
-
-
-    function reserveName(x) {
-        var c = x.id.charAt(0);
-        if ((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z')) {
-            x.identifier = x.reserved = true;
-        }
-        return x;
-    }
-
-
-    function prefix(s, f) {
-        var x = symbol(s, 150);
-        reserveName(x);
-        x.nud = (typeof f === 'function') ? f : function () {
-            this.right = expression(150);
-            this.arity = 'unary';
-            if (this.id === '++' || this.id === '--') {
-                if (option.plusplus) {
-                    warning("Unexpected use of '{a}'.", this, this.id);
-                } else if ((!this.right.identifier || this.right.reserved) &&
-                        this.right.id !== '.' && this.right.id !== '[') {
-                    warning("Bad operand.", this);
-                }
-            }
-            return this;
-        };
-        return x;
-    }
-
-
-    function type(s, f) {
-        var x = delim(s);
-        x.type = s;
-        x.nud = f;
-        return x;
-    }
-
-
-    function reserve(s, f) {
-        var x = type(s, f);
-        x.identifier = x.reserved = true;
-        return x;
-    }
-
-
-    function reservevar(s, v) {
-        return reserve(s, function () {
-            if (typeof v === 'function') {
-                v(this);
-            }
-            return this;
-        });
-    }
-
-
-    function infix(s, f, p, w) {
-        var x = symbol(s, p);
-        reserveName(x);
-        x.led = function (left) {
-            if (!w) {
-                nobreaknonadjacent(prevtoken, token);
-                nonadjacent(token, nexttoken);
-            }
-            if (s === "in" && left.id === "!") {
-                warning("Confusing use of '{a}'.", left, '!');
-            }
-            if (typeof f === 'function') {
-                return f(left, this);
-            } else {
-                this.left = left;
-                this.right = expression(p);
-                return this;
-            }
-        };
-        return x;
-    }
-
-
-    function relation(s, f) {
-        var x = symbol(s, 100);
-        x.led = function (left) {
-            nobreaknonadjacent(prevtoken, token);
-            nonadjacent(token, nexttoken);
-            var right = expression(100);
-            if ((left && left.id === 'NaN') || (right && right.id === 'NaN')) {
-                warning("Use the isNaN function to compare with NaN.", this);
-            } else if (f) {
-                f.apply(this, [left, right]);
-            }
-            if (left.id === '!') {
-                warning("Confusing use of '{a}'.", left, '!');
-            }
-            if (right.id === '!') {
-                warning("Confusing use of '{a}'.", right, '!');
-            }
-            this.left = left;
-            this.right = right;
-            return this;
-        };
-        return x;
-    }
-
-
-    function isPoorRelation(node) {
-        return node &&
-              ((node.type === '(number)' && +node.value === 0) ||
-               (node.type === '(string)' && node.value === '') ||
-               (node.type === 'null' && !option.eqnull) ||
-                node.type === 'true' ||
-                node.type === 'false' ||
-                node.type === 'undefined');
-    }
-
-
-    function assignop(s, f) {
-        symbol(s, 20).exps = true;
-        return infix(s, function (left, that) {
-            var l;
-            that.left = left;
-            if (predefined[left.value] === false &&
-                    scope[left.value]['(global)'] === true) {
-                warning("Read only.", left);
-            } else if (left['function']) {
-                warning("'{a}' is a function.", left, left.value);
-            }
-            if (left) {
-                if (option.esnext && funct[left.value] === 'const') {
-                    warning("Attempting to override '{a}' which is a constant", left, left.value);
-                }
-                if (left.id === '.' || left.id === '[') {
-                    if (!left.left || left.left.value === 'arguments') {
-                        warning('Bad assignment.', that);
-                    }
-                    that.right = expression(19);
-                    return that;
-                } else if (left.identifier && !left.reserved) {
-                    if (funct[left.value] === 'exception') {
-                        warning("Do not assign to the exception parameter.", left);
-                    }
-                    that.right = expression(19);
-                    return that;
-                }
-                if (left === syntax['function']) {
-                    warning(
-"Expected an identifier in an assignment and instead saw a function invocation.",
-                                token);
-                }
-            }
-            error("Bad assignment.", that);
-        }, 20);
-    }
-
-
-    function bitwise(s, f, p) {
-        var x = symbol(s, p);
-        reserveName(x);
-        x.led = (typeof f === 'function') ? f : function (left) {
-            if (option.bitwise) {
-                warning("Unexpected use of '{a}'.", this, this.id);
-            }
-            this.left = left;
-            this.right = expression(p);
-            return this;
-        };
-        return x;
-    }
-
-
-    function bitwiseassignop(s) {
-        symbol(s, 20).exps = true;
-        return infix(s, function (left, that) {
-            if (option.bitwise) {
-                warning("Unexpected use of '{a}'.", that, that.id);
-            }
-            nonadjacent(prevtoken, token);
-            nonadjacent(token, nexttoken);
-            if (left) {
-                if (left.id === '.' || left.id === '[' ||
-                        (left.identifier && !left.reserved)) {
-                    expression(19);
-                    return that;
-                }
-                if (left === syntax['function']) {
-                    warning(
-"Expected an identifier in an assignment, and instead saw a function invocation.",
-                                token);
-                }
-                return that;
-            }
-            error("Bad assignment.", that);
-        }, 20);
-    }
-
-
-    function suffix(s, f) {
-        var x = symbol(s, 150);
-        x.led = function (left) {
-            if (option.plusplus) {
-                warning("Unexpected use of '{a}'.", this, this.id);
-            } else if ((!left.identifier || left.reserved) &&
-                    left.id !== '.' && left.id !== '[') {
-                warning("Bad operand.", this);
-            }
-            this.left = left;
-            return this;
-        };
-        return x;
-    }
-
-
-    // fnparam means that this identifier is being defined as a function
-    // argument (see identifier())
-    function optionalidentifier(fnparam) {
-        if (nexttoken.identifier) {
-            advance();
-            if (token.reserved && !option.es5) {
-                // `undefined` as a function param is a common pattern to protect
-                // against the case when somebody does `undefined = true` and
-                // help with minification. More info: https://gist.github.com/315916
-                if (!fnparam || token.value !== 'undefined') {
-                    warning("Expected an identifier and instead saw '{a}' (a reserved word).",
-                            token, token.id);
-                }
-            }
-            return token.value;
-        }
-    }
-
-    // fnparam means that this identifier is being defined as a function
-    // argument
-    function identifier(fnparam) {
-        var i = optionalidentifier(fnparam);
-        if (i) {
-            return i;
-        }
-        if (token.id === 'function' && nexttoken.id === '(') {
-            warning("Missing name in function declaration.");
-        } else {
-            error("Expected an identifier and instead saw '{a}'.",
-                    nexttoken, nexttoken.value);
-        }
-    }
-
-
-    function reachable(s) {
-        var i = 0, t;
-        if (nexttoken.id !== ';' || noreach) {
-            return;
-        }
-        for (;;) {
-            t = peek(i);
-            if (t.reach) {
-                return;
-            }
-            if (t.id !== '(endline)') {
-                if (t.id === 'function') {
-                    if (!option.latedef) {
-                        break;
-                    }
-                    warning(
-"Inner functions should be listed at the top of the outer function.", t);
-                    break;
-                }
-                warning("Unreachable '{a}' after '{b}'.", t, t.value, s);
-                break;
-            }
-            i += 1;
-        }
-    }
-
-
-    function statement(noindent) {
-        var i = indent, r, s = scope, t = nexttoken;
-
-        if (t.id === ";") {
-            advance(";");
-            return;
-        }
-
-// Is this a labelled statement?
-
-        if (t.identifier && !t.reserved && peek().id === ':') {
-            advance();
-            advance(':');
-            scope = Object.create(s);
-            addlabel(t.value, 'label');
-            if (!nexttoken.labelled) {
-                warning("Label '{a}' on {b} statement.",
-                        nexttoken, t.value, nexttoken.value);
-            }
-            if (jx.test(t.value + ':')) {
-                warning("Label '{a}' looks like a javascript url.",
-                        t, t.value);
-            }
-            nexttoken.label = t.value;
-            t = nexttoken;
-        }
-
-// Parse the statement.
-
-        if (!noindent) {
-            indentation();
-        }
-        r = expression(0, true);
-
-        // Look for the final semicolon.
-        if (!t.block) {
-            if (!option.expr && (!r || !r.exps)) {
-                warning("Expected an assignment or function call and instead saw an expression.",
-                    token);
-            } else if (option.nonew && r.id === '(' && r.left.id === 'new') {
-                warning("Do not use 'new' for side effects.");
-            }
-
-            if (nexttoken.id === ',') {
-                return comma();
-            }
-
-            if (nexttoken.id !== ';') {
-                if (!option.asi) {
-                    // If this is the last statement in a block that ends on
-                    // the same line *and* option lastsemic is on, ignore the warning.
-                    // Otherwise, complain about missing semicolon.
-                    if (!option.lastsemic || nexttoken.id !== '}' ||
-                            nexttoken.line !== token.line) {
-                        warningAt("Missing semicolon.", token.line, token.character);
-                    }
-                }
-            } else {
-                adjacent(token, nexttoken);
-                advance(';');
-                nonadjacent(token, nexttoken);
-            }
-        }
-
-// Restore the indentation.
-
-        indent = i;
-        scope = s;
-        return r;
-    }
-
-
-    function statements(startLine) {
-        var a = [], f, p;
-
-        while (!nexttoken.reach && nexttoken.id !== '(end)') {
-            if (nexttoken.id === ';') {
-                p = peek();
-                if (!p || p.id !== "(") {
-                    warning("Unnecessary semicolon.");
-                }
-                advance(';');
-            } else {
-                a.push(statement(startLine === nexttoken.line));
-            }
-        }
-        return a;
-    }
-
-
-    /*
-     * read all directives
-     * recognizes a simple form of asi, but always
-     * warns, if it is used
-     */
-    function directives() {
-        var i, p, pn;
-
-        for (;;) {
-            if (nexttoken.id === "(string)") {
-                p = peek(0);
-                if (p.id === "(endline)") {
-                    i = 1;
-                    do {
-                        pn = peek(i);
-                        i = i + 1;
-                    } while (pn.id === "(endline)");
-
-                    if (pn.id !== ";") {
-                        if (pn.id !== "(string)" && pn.id !== "(number)" &&
-                            pn.id !== "(regexp)" && pn.identifier !== true &&
-                            pn.id !== "}") {
-                            break;
-                        }
-                        warning("Missing semicolon.", nexttoken);
-                    } else {
-                        p = pn;
-                    }
-                } else if (p.id === "}") {
-                    // directive with no other statements, warn about missing semicolon
-                    warning("Missing semicolon.", p);
-                } else if (p.id !== ";") {
-                    break;
-                }
-
-                indentation();
-                advance();
-                if (directive[token.value]) {
-                    warning("Unnecessary directive \"{a}\".", token, token.value);
-                }
-
-                if (token.value === "use strict") {
-                    option.newcap = true;
-                    option.undef = true;
-                }
-
-                // there's no directive negation, so always set to true
-                directive[token.value] = true;
-
-                if (p.id === ";") {
-                    advance(";");
-                }
-                continue;
-            }
-            break;
-        }
-    }
-
-
-    /*
-     * Parses a single block. A block is a sequence of statements wrapped in
-     * braces.
-     *
-     * ordinary - true for everything but function bodies and try blocks.
-     * stmt     - true if block can be a single statement (e.g. in if/for/while).
-     * isfunc   - true if block is a function body
-     */
-    function block(ordinary, stmt, isfunc) {
-        var a,
-            b = inblock,
-            old_indent = indent,
-            m,
-            s = scope,
-            t,
-            line,
-            d;
-
-        inblock = ordinary;
-        if (!ordinary || !option.funcscope) scope = Object.create(scope);
-        nonadjacent(token, nexttoken);
-        t = nexttoken;
-
-        if (nexttoken.id === '{') {
-            advance('{');
-            line = token.line;
-            if (nexttoken.id !== '}') {
-                indent += option.indent;
-                while (!ordinary && nexttoken.from > indent) {
-                    indent += option.indent;
-                }
-
-                if (isfunc) {
-                    m = {};
-                    for (d in directive) {
-                        if (is_own(directive, d)) {
-                            m[d] = directive[d];
-                        }
-                    }
-                    directives();
-
-                    if (option.strict && funct['(context)']['(global)']) {
-                        if (!m["use strict"] && !directive["use strict"]) {
-                            warning("Missing \"use strict\" statement.");
-                        }
-                    }
-                }
-
-                a = statements(line);
-
-                if (isfunc) {
-                    directive = m;
-                }
-
-                indent -= option.indent;
-                if (line !== nexttoken.line) {
-                    indentation();
-                }
-            } else if (line !== nexttoken.line) {
-                indentation();
-            }
-            advance('}', t);
-            indent = old_indent;
-        } else if (!ordinary) {
-            error("Expected '{a}' and instead saw '{b}'.",
-                  nexttoken, '{', nexttoken.value);
-        } else {
-            if (!stmt || option.curly)
-                warning("Expected '{a}' and instead saw '{b}'.",
-                        nexttoken, '{', nexttoken.value);
-
-            noreach = true;
-            indent += option.indent;
-            // test indentation only if statement is in new line
-            a = [statement(nexttoken.line === token.line)];
-            indent -= option.indent;
-            noreach = false;
-        }
-        funct['(verb)'] = null;
-        if (!ordinary || !option.funcscope) scope = s;
-        inblock = b;
-        if (ordinary && option.noempty && (!a || a.length === 0)) {
-            warning("Empty block.");
-        }
-        return a;
-    }
-
-
-    function countMember(m) {
-        if (membersOnly && typeof membersOnly[m] !== 'boolean') {
-            warning("Unexpected /*member '{a}'.", token, m);
-        }
-        if (typeof member[m] === 'number') {
-            member[m] += 1;
-        } else {
-            member[m] = 1;
-        }
-    }
-
-
-    function note_implied(token) {
-        var name = token.value, line = token.line, a = implied[name];
-        if (typeof a === 'function') {
-            a = false;
-        }
-
-        if (!a) {
-            a = [line];
-            implied[name] = a;
-        } else if (a[a.length - 1] !== line) {
-            a.push(line);
-        }
-    }
-
-
-    // Build the syntax table by declaring the syntactic elements of the language.
-
-    type('(number)', function () {
-        return this;
-    });
-
-    type('(string)', function () {
-        return this;
-    });
-
-    syntax['(identifier)'] = {
-        type: '(identifier)',
-        lbp: 0,
-        identifier: true,
-        nud: function () {
-            var v = this.value,
-                s = scope[v],
-                f;
-
-            if (typeof s === 'function') {
-                // Protection against accidental inheritance.
-                s = undefined;
-            } else if (typeof s === 'boolean') {
-                f = funct;
-                funct = functions[0];
-                addlabel(v, 'var');
-                s = funct;
-                funct = f;
-            }
-
-            // The name is in scope and defined in the current function.
-            if (funct === s) {
-                // Change 'unused' to 'var', and reject labels.
-                switch (funct[v]) {
-                case 'unused':
-                    funct[v] = 'var';
-                    break;
-                case 'unction':
-                    funct[v] = 'function';
-                    this['function'] = true;
-                    break;
-                case 'function':
-                    this['function'] = true;
-                    break;
-                case 'label':
-                    warning("'{a}' is a statement label.", token, v);
-                    break;
-                }
-            } else if (funct['(global)']) {
-                // The name is not defined in the function.  If we are in the global
-                // scope, then we have an undefined variable.
-                //
-                // Operators typeof and delete do not raise runtime errors even if
-                // the base object of a reference is null so no need to display warning
-                // if we're inside of typeof or delete.
-
-                if (option.undef && typeof predefined[v] !== 'boolean') {
-                    // Attempting to subscript a null reference will throw an
-                    // error, even within the typeof and delete operators
-                    if (!(anonname === 'typeof' || anonname === 'delete') ||
-                        (nexttoken && (nexttoken.value === '.' || nexttoken.value === '['))) {
-
-                        isundef(funct, "'{a}' is not defined.", token, v);
-                    }
-                }
-                note_implied(token);
-            } else {
-                // If the name is already defined in the current
-                // function, but not as outer, then there is a scope error.
-
-                switch (funct[v]) {
-                case 'closure':
-                case 'function':
-                case 'var':
-                case 'unused':
-                    warning("'{a}' used out of scope.", token, v);
-                    break;
-                case 'label':
-                    warning("'{a}' is a statement label.", token, v);
-                    break;
-                case 'outer':
-                case 'global':
-                    break;
-                default:
-                    // If the name is defined in an outer function, make an outer entry,
-                    // and if it was unused, make it var.
-                    if (s === true) {
-                        funct[v] = true;
-                    } else if (s === null) {
-                        warning("'{a}' is not allowed.", token, v);
-                        note_implied(token);
-                    } else if (typeof s !== 'object') {
-                        // Operators typeof and delete do not raise runtime errors even
-                        // if the base object of a reference is null so no need to
-                        // display warning if we're inside of typeof or delete.
-                        if (option.undef) {
-                            // Attempting to subscript a null reference will throw an
-                            // error, even within the typeof and delete operators
-                            if (!(anonname === 'typeof' || anonname === 'delete') ||
-                                (nexttoken &&
-                                    (nexttoken.value === '.' || nexttoken.value === '['))) {
-
-                                isundef(funct, "'{a}' is not defined.", token, v);
-                            }
-                        }
-                        funct[v] = true;
-                        note_implied(token);
-                    } else {
-                        switch (s[v]) {
-                        case 'function':
-                        case 'unction':
-                            this['function'] = true;
-                            s[v] = 'closure';
-                            funct[v] = s['(global)'] ? 'global' : 'outer';
-                            break;
-                        case 'var':
-                        case 'unused':
-                            s[v] = 'closure';
-                            funct[v] = s['(global)'] ? 'global' : 'outer';
-                            break;
-                        case 'closure':
-                        case 'parameter':
-                            funct[v] = s['(global)'] ? 'global' : 'outer';
-                            break;
-                        case 'label':
-                            warning("'{a}' is a statement label.", token, v);
-                        }
-                    }
-                }
-            }
-            return this;
-        },
-        led: function () {
-            error("Expected an operator and instead saw '{a}'.",
-                nexttoken, nexttoken.value);
-        }
-    };
-
-    type('(regexp)', function () {
-        return this;
-    });
-
-
-// ECMAScript parser
-
-    delim('(endline)');
-    delim('(begin)');
-    delim('(end)').reach = true;
-    delim('</').reach = true;
-    delim('<!');
-    delim('<!--');
-    delim('-->');
-    delim('(error)').reach = true;
-    delim('}').reach = true;
-    delim(')');
-    delim(']');
-    delim('"').reach = true;
-    delim("'").reach = true;
-    delim(';');
-    delim(':').reach = true;
-    delim(',');
-    delim('#');
-    delim('@');
-    reserve('else');
-    reserve('case').reach = true;
-    reserve('catch');
-    reserve('default').reach = true;
-    reserve('finally');
-    reservevar('arguments', function (x) {
-        if (directive['use strict'] && funct['(global)']) {
-            warning("Strict violation.", x);
-        }
-    });
-    reservevar('eval');
-    reservevar('false');
-    reservevar('Infinity');
-    reservevar('NaN');
-    reservevar('null');
-    reservevar('this', function (x) {
-        if (directive['use strict'] && !option.validthis && ((funct['(statement)'] &&
-                funct['(name)'].charAt(0) > 'Z') || funct['(global)'])) {
-            warning("Possible strict violation.", x);
-        }
-    });
-    reservevar('true');
-    reservevar('undefined');
-    assignop('=', 'assign', 20);
-    assignop('+=', 'assignadd', 20);
-    assignop('-=', 'assignsub', 20);
-    assignop('*=', 'assignmult', 20);
-    assignop('/=', 'assigndiv', 20).nud = function () {
-        error("A regular expression literal can be confused with '/='.");
-    };
-    assignop('%=', 'assignmod', 20);
-    bitwiseassignop('&=', 'assignbitand', 20);
-    bitwiseassignop('|=', 'assignbitor', 20);
-    bitwiseassignop('^=', 'assignbitxor', 20);
-    bitwiseassignop('<<=', 'assignshiftleft', 20);
-    bitwiseassignop('>>=', 'assignshiftright', 20);
-    bitwiseassignop('>>>=', 'assignshiftrightunsigned', 20);
-    infix('?', function (left, that) {
-        that.left = left;
-        that.right = expression(10);
-        advance(':');
-        that['else'] = expression(10);
-        return that;
-    }, 30);
-
-    infix('||', 'or', 40);
-    infix('&&', 'and', 50);
-    bitwise('|', 'bitor', 70);
-    bitwise('^', 'bitxor', 80);
-    bitwise('&', 'bitand', 90);
-    relation('==', function (left, right) {
-        var eqnull = option.eqnull && (left.value === 'null' || right.value === 'null');
-
-        if (!eqnull && option.eqeqeq)
-            warning("Expected '{a}' and instead saw '{b}'.", this, '===', '==');
-        else if (isPoorRelation(left))
-            warning("Use '{a}' to compare with '{b}'.", this, '===', left.value);
-        else if (isPoorRelation(right))
-            warning("Use '{a}' to compare with '{b}'.", this, '===', right.value);
-
-        return this;
-    });
-    relation('===');
-    relation('!=', function (left, right) {
-        var eqnull = option.eqnull &&
-                (left.value === 'null' || right.value === 'null');
-
-        if (!eqnull && option.eqeqeq) {
-            warning("Expected '{a}' and instead saw '{b}'.",
-                    this, '!==', '!=');
-        } else if (isPoorRelation(left)) {
-            warning("Use '{a}' to compare with '{b}'.",
-                    this, '!==', left.value);
-        } else if (isPoorRelation(right)) {
-            warning("Use '{a}' to compare with '{b}'.",
-                    this, '!==', right.value);
-        }
-        return this;
-    });
-    relation('!==');
-    relation('<');
-    relation('>');
-    relation('<=');
-    relation('>=');
-    bitwise('<<', 'shiftleft', 120);
-    bitwise('>>', 'shiftright', 120);
-    bitwise('>>>', 'shiftrightunsigned', 120);
-    infix('in', 'in', 120);
-    infix('instanceof', 'instanceof', 120);
-    infix('+', function (left, that) {
-        var right = expression(130);
-        if (left && right && left.id === '(string)' && right.id === '(string)') {
-            left.value += right.value;
-            left.character = right.character;
-            if (!option.scripturl && jx.test(left.value)) {
-                warning("JavaScript URL.", left);
-            }
-            return left;
-        }
-        that.left = left;
-        that.right = right;
-        return that;
-    }, 130);
-    prefix('+', 'num');
-    prefix('+++', function () {
-        warning("Confusing pluses.");
-        this.right = expression(150);
-        this.arity = 'unary';
-        return this;
-    });
-    infix('+++', function (left) {
-        warning("Confusing pluses.");
-        this.left = left;
-        this.right = expression(130);
-        return this;
-    }, 130);
-    infix('-', 'sub', 130);
-    prefix('-', 'neg');
-    prefix('---', function () {
-        warning("Confusing minuses.");
-        this.right = expression(150);
-        this.arity = 'unary';
-        return this;
-    });
-    infix('---', function (left) {
-        warning("Confusing minuses.");
-        this.left = left;
-        this.right = expression(130);
-        return this;
-    }, 130);
-    infix('*', 'mult', 140);
-    infix('/', 'div', 140);
-    infix('%', 'mod', 140);
-
-    suffix('++', 'postinc');
-    prefix('++', 'preinc');
-    syntax['++'].exps = true;
-
-    suffix('--', 'postdec');
-    prefix('--', 'predec');
-    syntax['--'].exps = true;
-    prefix('delete', function () {
-        var p = expression(0);
-        if (!p || (p.id !== '.' && p.id !== '[')) {
-            warning("Variables should not be deleted.");
-        }
-        this.first = p;
-        return this;
-    }).exps = true;
-
-    prefix('~', function () {
-        if (option.bitwise) {
-            warning("Unexpected '{a}'.", this, '~');
-        }
-        expression(150);
-        return this;
-    });
-
-    prefix('!', function () {
-        this.right = expression(150);
-        this.arity = 'unary';
-        if (bang[this.right.id] === true) {
-            warning("Confusing use of '{a}'.", this, '!');
-        }
-        return this;
-    });
-    prefix('typeof', 'typeof');
-    prefix('new', function () {
-        var c = expression(155), i;
-        if (c && c.id !== 'function') {
-            if (c.identifier) {
-                c['new'] = true;
-                switch (c.value) {
-                case 'Number':
-                case 'String':
-                case 'Boolean':
-                case 'Math':
-                case 'JSON':
-                    warning("Do not use {a} as a constructor.", token, c.value);
-                    break;
-                case 'Function':
-                    if (!option.evil) {
-                        warning("The Function constructor is eval.");
-                    }
-                    break;
-                case 'Date':
-                case 'RegExp':
-                    break;
-                default:
-                    if (c.id !== 'function') {
-                        i = c.value.substr(0, 1);
-                        if (option.newcap && (i < 'A' || i > 'Z')) {
-                            warning("A constructor name should start with an uppercase letter.",
-                                token);
-                        }
-                    }
-                }
-            } else {
-                if (c.id !== '.' && c.id !== '[' && c.id !== '(') {
-                    warning("Bad constructor.", token);
-                }
-            }
-        } else {
-            if (!option.supernew)
-                warning("Weird construction. Delete 'new'.", this);
-        }
-        adjacent(token, nexttoken);
-        if (nexttoken.id !== '(' && !option.supernew) {
-            warning("Missing '()' invoking a constructor.");
-        }
-        this.first = c;
-        return this;
-    });
-    syntax['new'].exps = true;
-
-    prefix('void').exps = true;
-
-    infix('.', function (left, that) {
-        adjacent(prevtoken, token);
-        nobreak();
-        var m = identifier();
-        if (typeof m === 'string') {
-            countMember(m);
-        }
-        that.left = left;
-        that.right = m;
-        if (left && left.value === 'arguments' && (m === 'callee' || m === 'caller')) {
-            if (option.noarg)
-                warning("Avoid arguments.{a}.", left, m);
-            else if (directive['use strict'])
-                error('Strict violation.');
-        } else if (!option.evil && left && left.value === 'document' &&
-                (m === 'write' || m === 'writeln')) {
-            warning("document.write can be a form of eval.", left);
-        }
-        if (!option.evil && (m === 'eval' || m === 'execScript')) {
-            warning('eval is evil.');
-        }
-        return that;
-    }, 160, true);
-
-    infix('(', function (left, that) {
-        if (prevtoken.id !== '}' && prevtoken.id !== ')') {
-            nobreak(prevtoken, token);
-        }
-        nospace();
-        if (option.immed && !left.immed && left.id === 'function') {
-            warning("Wrap an immediate function invocation in parentheses " +
-                "to assist the reader in understanding that the expression " +
-                "is the result of a function, and not the function itself.");
-        }
-        var n = 0,
-            p = [];
-        if (left) {
-            if (left.type === '(identifier)') {
-                if (left.value.match(/^[A-Z]([A-Z0-9_$]*[a-z][A-Za-z0-9_$]*)?$/)) {
-                    if (left.value !== 'Number' && left.value !== 'String' &&
-                            left.value !== 'Boolean' &&
-                            left.value !== 'Date') {
-                        if (left.value === 'Math') {
-                            warning("Math is not a function.", left);
-                        } else if (option.newcap) {
-                            warning(
-"Missing 'new' prefix when invoking a constructor.", left);
-                        }
-                    }
-                }
-            }
-        }
-        if (nexttoken.id !== ')') {
-            for (;;) {
-                p[p.length] = expression(10);
-                n += 1;
-                if (nexttoken.id !== ',') {
-                    break;
-                }
-                comma();
-            }
-        }
-        advance(')');
-        nospace(prevtoken, token);
-        if (typeof left === 'object') {
-            if (left.value === 'parseInt' && n === 1) {
-                warning("Missing radix parameter.", left);
-            }
-            if (!option.evil) {
-                if (left.value === 'eval' || left.value === 'Function' ||
-                        left.value === 'execScript') {
-                    warning("eval is evil.", left);
-                } else if (p[0] && p[0].id === '(string)' &&
-                       (left.value === 'setTimeout' ||
-                        left.value === 'setInterval')) {
-                    warning(
-    "Implied eval is evil. Pass a function instead of a string.", left);
-                }
-            }
-            if (!left.identifier && left.id !== '.' && left.id !== '[' &&
-                    left.id !== '(' && left.id !== '&&' && left.id !== '||' &&
-                    left.id !== '?') {
-                warning("Bad invocation.", left);
-            }
-        }
-        that.left = left;
-        return that;
-    }, 155, true).exps = true;
-
-    prefix('(', function () {
-        nospace();
-        if (nexttoken.id === 'function') {
-            nexttoken.immed = true;
-        }
-        var v = expression(0);
-        advance(')', this);
-        nospace(prevtoken, token);
-        if (option.immed && v.id === 'function') {
-            if (nexttoken.id === '(' ||
-              (nexttoken.id === '.' && (peek().value === 'call' || peek().value === 'apply'))) {
-                warning(
-"Move the invocation into the parens that contain the function.", nexttoken);
-            } else {
-                warning(
-"Do not wrap function literals in parens unless they are to be immediately invoked.",
-                        this);
-            }
-        }
-        return v;
-    });
-
-    infix('[', function (left, that) {
-        nobreak(prevtoken, token);
-        nospace();
-        var e = expression(0), s;
-        if (e && e.type === '(string)') {
-            if (!option.evil && (e.value === 'eval' || e.value === 'execScript')) {
-                warning("eval is evil.", that);
-            }
-            countMember(e.value);
-            if (!option.sub && ix.test(e.value)) {
-                s = syntax[e.value];
-                if (!s || !s.reserved) {
-                    warning("['{a}'] is better written in dot notation.",
-                            e, e.value);
-                }
-            }
-        }
-        advance(']', that);
-        nospace(prevtoken, token);
-        that.left = left;
-        that.right = e;
-        return that;
-    }, 160, true);
-
-    prefix('[', function () {
-        var b = token.line !== nexttoken.line;
-        this.first = [];
-        if (b) {
-            indent += option.indent;
-            if (nexttoken.from === indent + option.indent) {
-                indent += option.indent;
-            }
-        }
-        while (nexttoken.id !== '(end)') {
-            while (nexttoken.id === ',') {
-                warning("Extra comma.");
-                advance(',');
-            }
-            if (nexttoken.id === ']') {
-                break;
-            }
-            if (b && token.line !== nexttoken.line) {
-                indentation();
-            }
-            this.first.push(expression(10));
-            if (nexttoken.id === ',') {
-                comma();
-                if (nexttoken.id === ']' && !option.es5) {
-                    warning("Extra comma.", token);
-                    break;
-                }
-            } else {
-                break;
-            }
-        }
-        if (b) {
-            indent -= option.indent;
-            indentation();
-        }
-        advance(']', this);
-        return this;
-    }, 160);
-
-
-    function property_name() {
-        var id = optionalidentifier(true);
-        if (!id) {
-            if (nexttoken.id === '(string)') {
-                id = nexttoken.value;
-                advance();
-            } else if (nexttoken.id === '(number)') {
-                id = nexttoken.value.toString();
-                advance();
-            }
-        }
-        return id;
-    }
-
-
-    function functionparams() {
-        var i, t = nexttoken, p = [];
-        advance('(');
-        nospace();
-        if (nexttoken.id === ')') {
-            advance(')');
-            return;
-        }
-        for (;;) {
-            i = identifier(true);
-            p.push(i);
-            addlabel(i, 'parameter');
-            if (nexttoken.id === ',') {
-                comma();
-            } else {
-                advance(')', t);
-                nospace(prevtoken, token);
-                return p;
-            }
-        }
-    }
-
-
-    function doFunction(i, statement) {
-        var f,
-            oldOption = option,
-            oldScope  = scope;
-
-        option = Object.create(option);
-        scope = Object.create(scope);
-
-        funct = {
-            '(name)'     : i || '"' + anonname + '"',
-            '(line)'     : nexttoken.line,
-            '(context)'  : funct,
-            '(breakage)' : 0,
-            '(loopage)'  : 0,
-            '(scope)'    : scope,
-            '(statement)': statement
-        };
-        f = funct;
-        token.funct = funct;
-        functions.push(funct);
-        if (i) {
-            addlabel(i, 'function');
-        }
-        funct['(params)'] = functionparams();
-
-        block(false, false, true);
-        scope = oldScope;
-        option = oldOption;
-        funct['(last)'] = token.line;
-        funct = funct['(context)'];
-        return f;
-    }
-
-
-    (function (x) {
-        x.nud = function () {
-            var b, f, i, j, p, t;
-            var props = {}; // All properties, including accessors
-
-            function saveProperty(name, token) {
-                if (props[name] && is_own(props, name))
-                    warning("Duplicate member '{a}'.", nexttoken, i);
-                else
-                    props[name] = {};
-
-                props[name].basic = true;
-                props[name].basicToken = token;
-            }
-
-            function saveSetter(name, token) {
-                if (props[name] && is_own(props, name)) {
-                    if (props[name].basic || props[name].setter)
-                        warning("Duplicate member '{a}'.", nexttoken, i);
-                } else {
-                    props[name] = {};
-                }
-
-                props[name].setter = true;
-                props[name].setterToken = token;
-            }
-
-            function saveGetter(name) {
-                if (props[name] && is_own(props, name)) {
-                    if (props[name].basic || props[name].getter)
-                        warning("Duplicate member '{a}'.", nexttoken, i);
-                } else {
-                    props[name] = {};
-                }
-
-                props[name].getter = true;
-                props[name].getterToken = token;
-            }
-
-            b = token.line !== nexttoken.line;
-            if (b) {
-                indent += option.indent;
-                if (nexttoken.from === indent + option.indent) {
-                    indent += option.indent;
-                }
-            }
-            for (;;) {
-                if (nexttoken.id === '}') {
-                    break;
-                }
-                if (b) {
-                    indentation();
-                }
-                if (nexttoken.value === 'get' && peek().id !== ':') {
-                    advance('get');
-                    if (!option.es5) {
-                        error("get/set are ES5 features.");
-                    }
-                    i = property_name();
-                    if (!i) {
-                        error("Missing property name.");
-                    }
-                    saveGetter(i);
-                    t = nexttoken;
-                    adjacent(token, nexttoken);
-                    f = doFunction();
-                    p = f['(params)'];
-                    if (p) {
-                        warning("Unexpected parameter '{a}' in get {b} function.", t, p[0], i);
-                    }
-                    adjacent(token, nexttoken);
-                } else if (nexttoken.value === 'set' && peek().id !== ':') {
-                    advance('set');
-                    if (!option.es5) {
-                        error("get/set are ES5 features.");
-                    }
-                    i = property_name();
-                    if (!i) {
-                        error("Missing property name.");
-                    }
-                    saveSetter(i, nexttoken);
-                    t = nexttoken;
-                    adjacent(token, nexttoken);
-                    f = doFunction();
-                    p = f['(params)'];
-                    if (!p || p.length !== 1) {
-                        warning("Expected a single parameter in set {a} function.", t, i);
-                    }
-                } else {
-                    i = property_name();
-                    saveProperty(i, nexttoken);
-                    if (typeof i !== 'string') {
-                        break;
-                    }
-                    advance(':');
-                    nonadjacent(token, nexttoken);
-                    expression(10);
-                }
-
-                countMember(i);
-                if (nexttoken.id === ',') {
-                    comma();
-                    if (nexttoken.id === ',') {
-                        warning("Extra comma.", token);
-                    } else if (nexttoken.id === '}' && !option.es5) {
-                        warning("Extra comma.", token);
-                    }
-                } else {
-                    break;
-                }
-            }
-            if (b) {
-                indent -= option.indent;
-                indentation();
-            }
-            advance('}', this);
-
-            // Check for lonely setters if in the ES5 mode.
-            if (option.es5) {
-                for (var name in props) {
-                    if (is_own(props, name) && props[name].setter && !props[name].getter) {
-                        warning("Setter is defined without getter.", props[name].setterToken);
-                    }
-                }
-            }
-            return this;
-        };
-        x.fud = function () {
-            error("Expected to see a statement and instead saw a block.", token);
-        };
-    }(delim('{')));
-
-// This Function is called when esnext option is set to true
-// it adds the `const` statement to JSHINT
-
-    useESNextSyntax = function () {
-        var conststatement = stmt('const', function (prefix) {
-            var id, name, value;
-
-            this.first = [];
-            for (;;) {
-                nonadjacent(token, nexttoken);
-                id = identifier();
-                if (funct[id] === "const") {
-                    warning("const '" + id + "' has already been declared");
-                }
-                if (funct['(global)'] && predefined[id] === false) {
-                    warning("Redefinition of '{a}'.", token, id);
-                }
-                addlabel(id, 'const');
-                if (prefix) {
-                    break;
-                }
-                name = token;
-                this.first.push(token);
-
-                if (nexttoken.id !== "=") {
-                    warning("const " +
-                      "'{a}' is initialized to 'undefined'.", token, id);
-                }
-
-                if (nexttoken.id === '=') {
-                    nonadjacent(token, nexttoken);
-                    advance('=');
-                    nonadjacent(token, nexttoken);
-                    if (nexttoken.id === 'undefined') {
-                        warning("It is not necessary to initialize " +
-                          "'{a}' to 'undefined'.", token, id);
-                    }
-                    if (peek(0).id === '=' && nexttoken.identifier) {
-                        error("Constant {a} was not declared correctly.",
-                                nexttoken, nexttoken.value);
-                    }
-                    value = expression(0);
-                    name.first = value;
-                }
-
-                if (nexttoken.id !== ',') {
-                    break;
-                }
-                comma();
-            }
-            return this;
-        });
-        conststatement.exps = true;
-    };
-
-    var varstatement = stmt('var', function (prefix) {
-        // JavaScript does not have block scope. It only has function scope. So,
-        // declaring a variable in a block can have unexpected consequences.
-        var id, name, value;
-
-        if (funct['(onevar)'] && option.onevar) {
-            warning("Too many var statements.");
-        } else if (!funct['(global)']) {
-            funct['(onevar)'] = true;
-        }
-        this.first = [];
-        for (;;) {
-            nonadjacent(token, nexttoken);
-            id = identifier();
-            if (option.esnext && funct[id] === "const") {
-                warning("const '" + id + "' has already been declared");
-            }
-            if (funct['(global)'] && predefined[id] === false) {
-                warning("Redefinition of '{a}'.", token, id);
-            }
-            addlabel(id, 'unused');
-            if (prefix) {
-                break;
-            }
-            name = token;
-            this.first.push(token);
-            if (nexttoken.id === '=') {
-                nonadjacent(token, nexttoken);
-                advance('=');
-                nonadjacent(token, nexttoken);
-                if (nexttoken.id === 'undefined') {
-                    warning("It is not necessary to initialize '{a}' to 'undefined'.", token, id);
-                }
-                if (peek(0).id === '=' && nexttoken.identifier) {
-                    error("Variable {a} was not declared correctly.",
-                            nexttoken, nexttoken.value);
-                }
-                value = expression(0);
-                name.first = value;
-            }
-            if (nexttoken.id !== ',') {
-                break;
-            }
-            comma();
-        }
-        return this;
-    });
-    varstatement.exps = true;
-
-    blockstmt('function', function () {
-        if (inblock) {
-            warning("Function declarations should not be placed in blocks. " +
-                "Use a function expression or move the statement to the top of " +
-                "the outer function.", token);
-
-        }
-        var i = identifier();
-        if (option.esnext && funct[i] === "const") {
-            warning("const '" + i + "' has already been declared");
-        }
-        adjacent(token, nexttoken);
-        addlabel(i, 'unction');
-        doFunction(i, true);
-        if (nexttoken.id === '(' && nexttoken.line === token.line) {
-            error(
-"Function declarations are not invocable. Wrap the whole function invocation in parens.");
-        }
-        return this;
-    });
-
-    prefix('function', function () {
-        var i = optionalidentifier();
-        if (i) {
-            adjacent(token, nexttoken);
-        } else {
-            nonadjacent(token, nexttoken);
-        }
-        doFunction(i);
-        if (!option.loopfunc && funct['(loopage)']) {
-            warning("Don't make functions within a loop.");
-        }
-        return this;
-    });
-
-    blockstmt('if', function () {
-        var t = nexttoken;
-        advance('(');
-        nonadjacent(this, t);
-        nospace();
-        expression(20);
-        if (nexttoken.id === '=') {
-            if (!option.boss)
-                warning("Expected a conditional expression and instead saw an assignment.");
-            advance('=');
-            expression(20);
-        }
-        advance(')', t);
-        nospace(prevtoken, token);
-        block(true, true);
-        if (nexttoken.id === 'else') {
-            nonadjacent(token, nexttoken);
-            advance('else');
-            if (nexttoken.id === 'if' || nexttoken.id === 'switch') {
-                statement(true);
-            } else {
-                block(true, true);
-            }
-        }
-        return this;
-    });
-
-    blockstmt('try', function () {
-        var b, e, s;
-
-        block(false);
-        if (nexttoken.id === 'catch') {
-            advance('catch');
-            nonadjacent(token, nexttoken);
-            advance('(');
-            s = scope;
-            scope = Object.create(s);
-            e = nexttoken.value;
-            if (nexttoken.type !== '(identifier)') {
-                warning("Expected an identifier and instead saw '{a}'.",
-                    nexttoken, e);
-            } else {
-                addlabel(e, 'exception');
-            }
-            advance();
-            advance(')');
-            block(false);
-            b = true;
-            scope = s;
-        }
-        if (nexttoken.id === 'finally') {
-            advance('finally');
-            block(false);
-            return;
-        } else if (!b) {
-            error("Expected '{a}' and instead saw '{b}'.",
-                    nexttoken, 'catch', nexttoken.value);
-        }
-        return this;
-    });
-
-    blockstmt('while', function () {
-        var t = nexttoken;
-        funct['(breakage)'] += 1;
-        funct['(loopage)'] += 1;
-        advance('(');
-        nonadjacent(this, t);
-        nospace();
-        expression(20);
-        if (nexttoken.id === '=') {
-            if (!option.boss)
-                warning("Expected a conditional expression and instead saw an assignment.");
-            advance('=');
-            expression(20);
-        }
-        advance(')', t);
-        nospace(prevtoken, token);
-        block(true, true);
-        funct['(breakage)'] -= 1;
-        funct['(loopage)'] -= 1;
-        return this;
-    }).labelled = true;
-
-    blockstmt('with', function () {
-        var t = nexttoken;
-        if (directive['use strict']) {
-            error("'with' is not allowed in strict mode.", token);
-        } else if (!option.withstmt) {
-            warning("Don't use 'with'.", token);
-        }
-
-        advance('(');
-        nonadjacent(this, t);
-        nospace();
-        expression(0);
-        advance(')', t);
-        nospace(prevtoken, token);
-        block(true, true);
-
-        return this;
-    });
-
-    blockstmt('switch', function () {
-        var t = nexttoken,
-            g = false;
-        funct['(breakage)'] += 1;
-        advance('(');
-        nonadjacent(this, t);
-        nospace();
-        this.condition = expression(20);
-        advance(')', t);
-        nospace(prevtoken, token);
-        nonadjacent(token, nexttoken);
-        t = nexttoken;
-        advance('{');
-        nonadjacent(token, nexttoken);
-        indent += option.indent;
-        this.cases = [];
-        for (;;) {
-            switch (nexttoken.id) {
-            case 'case':
-                switch (funct['(verb)']) {
-                case 'break':
-                case 'case':
-                case 'continue':
-                case 'return':
-                case 'switch':
-                case 'throw':
-                    break;
-                default:
-                    // You can tell JSHint that you don't use break intentionally by
-                    // adding a comment /* falls through */ on a line just before
-                    // the next `case`.
-                    if (!ft.test(lines[nexttoken.line - 2])) {
-                        warning(
-                            "Expected a 'break' statement before 'case'.",
-                            token);
-                    }
-                }
-                indentation(-option.indent);
-                advance('case');
-                this.cases.push(expression(20));
-                g = true;
-                advance(':');
-                funct['(verb)'] = 'case';
-                break;
-            case 'default':
-                switch (funct['(verb)']) {
-                case 'break':
-                case 'continue':
-                case 'return':
-                case 'throw':
-                    break;
-                default:
-                    if (!ft.test(lines[nexttoken.line - 2])) {
-                        warning(
-                            "Expected a 'break' statement before 'default'.",
-                            token);
-                    }
-                }
-                indentation(-option.indent);
-                advance('default');
-                g = true;
-                advance(':');
-                break;
-            case '}':
-                indent -= option.indent;
-                indentation();
-                advance('}', t);
-                if (this.cases.length === 1 || this.condition.id === 'true' ||
-                        this.condition.id === 'false') {
-                    if (!option.onecase)
-                        warning("This 'switch' should be an 'if'.", this);
-                }
-                funct['(breakage)'] -= 1;
-                funct['(verb)'] = undefined;
-                return;
-            case '(end)':
-                error("Missing '{a}'.", nexttoken, '}');
-                return;
-            default:
-                if (g) {
-                    switch (token.id) {
-                    case ',':
-                        error("Each value should have its own case label.");
-                        return;
-                    case ':':
-                        g = false;
-                        statements();
-                        break;
-                    default:
-                        error("Missing ':' on a case clause.", token);
-                        return;
-                    }
-                } else {
-                    if (token.id === ':') {
-                        advance(':');
-                        error("Unexpected '{a}'.", token, ':');
-                        statements();
-                    } else {
-                        error("Expected '{a}' and instead saw '{b}'.",
-                            nexttoken, 'case', nexttoken.value);
-                        return;
-                    }
-                }
-            }
-        }
-    }).labelled = true;
-
-    stmt('debugger', function () {
-        if (!option.debug) {
-            warning("All 'debugger' statements should be removed.");
-        }
-        return this;
-    }).exps = true;
-
-    (function () {
-        var x = stmt('do', function () {
-            funct['(breakage)'] += 1;
-            funct['(loopage)'] += 1;
-            this.first = block(true);
-            advance('while');
-            var t = nexttoken;
-            nonadjacent(token, t);
-            advance('(');
-            nospace();
-            expression(20);
-            if (nexttoken.id === '=') {
-                if (!option.boss)
-                    warning("Expected a conditional expression and instead saw an assignment.");
-                advance('=');
-                expression(20);
-            }
-            advance(')', t);
-            nospace(prevtoken, token);
-            funct['(breakage)'] -= 1;
-            funct['(loopage)'] -= 1;
-            return this;
-        });
-        x.labelled = true;
-        x.exps = true;
-    }());
-
-    blockstmt('for', function () {
-        var s, t = nexttoken;
-        funct['(breakage)'] += 1;
-        funct['(loopage)'] += 1;
-        advance('(');
-        nonadjacent(this, t);
-        nospace();
-        if (peek(nexttoken.id === 'var' ? 1 : 0).id === 'in') {
-            if (nexttoken.id === 'var') {
-                advance('var');
-                varstatement.fud.call(varstatement, true);
-            } else {
-                switch (funct[nexttoken.value]) {
-                case 'unused':
-                    funct[nexttoken.value] = 'var';
-                    break;
-                case 'var':
-                    break;
-                default:
-                    warning("Bad for in variable '{a}'.",
-                            nexttoken, nexttoken.value);
-                }
-                advance();
-            }
-            advance('in');
-            expression(20);
-            advance(')', t);
-            s = block(true, true);
-            if (option.forin && s && (s.length > 1 || typeof s[0] !== 'object' ||
-                    s[0].value !== 'if')) {
-                warning("The body of a for in should be wrapped in an if statement to filter " +
-                        "unwanted properties from the prototype.", this);
-            }
-            funct['(breakage)'] -= 1;
-            funct['(loopage)'] -= 1;
-            return this;
-        } else {
-            if (nexttoken.id !== ';') {
-                if (nexttoken.id === 'var') {
-                    advance('var');
-                    varstatement.fud.call(varstatement);
-                } else {
-                    for (;;) {
-                        expression(0, 'for');
-                        if (nexttoken.id !== ',') {
-                            break;
-                        }
-                        comma();
-                    }
-                }
-            }
-            nolinebreak(token);
-            advance(';');
-            if (nexttoken.id !== ';') {
-                expression(20);
-                if (nexttoken.id === '=') {
-                    if (!option.boss)
-                        warning("Expected a conditional expression and instead saw an assignment.");
-                    advance('=');
-                    expression(20);
-                }
-            }
-            nolinebreak(token);
-            advance(';');
-            if (nexttoken.id === ';') {
-                error("Expected '{a}' and instead saw '{b}'.",
-                        nexttoken, ')', ';');
-            }
-            if (nexttoken.id !== ')') {
-                for (;;) {
-                    expression(0, 'for');
-                    if (nexttoken.id !== ',') {
-                        break;
-                    }
-                    comma();
-                }
-            }
-            advance(')', t);
-            nospace(prevtoken, token);
-            block(true, true);
-            funct['(breakage)'] -= 1;
-            funct['(loopage)'] -= 1;
-            return this;
-        }
-    }).labelled = true;
-
-
-    stmt('break', function () {
-        var v = nexttoken.value;
-
-        if (funct['(breakage)'] === 0)
-            warning("Unexpected '{a}'.", nexttoken, this.value);
-
-        if (!option.asi)
-            nolinebreak(this);
-
-        if (nexttoken.id !== ';') {
-            if (token.line === nexttoken.line) {
-                if (funct[v] !== 'label') {
-                    warning("'{a}' is not a statement label.", nexttoken, v);
-                } else if (scope[v] !== funct) {
-                    warning("'{a}' is out of scope.", nexttoken, v);
-                }
-                this.first = nexttoken;
-                advance();
-            }
-        }
-        reachable('break');
-        return this;
-    }).exps = true;
-
-
-    stmt('continue', function () {
-        var v = nexttoken.value;
-
-        if (funct['(breakage)'] === 0)
-            warning("Unexpected '{a}'.", nexttoken, this.value);
-
-        if (!option.asi)
-            nolinebreak(this);
-
-        if (nexttoken.id !== ';') {
-            if (token.line === nexttoken.line) {
-                if (funct[v] !== 'label') {
-                    warning("'{a}' is not a statement label.", nexttoken, v);
-                } else if (scope[v] !== funct) {
-                    warning("'{a}' is out of scope.", nexttoken, v);
-                }
-                this.first = nexttoken;
-                advance();
-            }
-        } else if (!funct['(loopage)']) {
-            warning("Unexpected '{a}'.", nexttoken, this.value);
-        }
-        reachable('continue');
-        return this;
-    }).exps = true;
-
-
-    stmt('return', function () {
-        if (this.line === nexttoken.line) {
-            if (nexttoken.id === '(regexp)')
-                warning("Wrap the /regexp/ literal in parens to disambiguate the slash operator.");
-
-            if (nexttoken.id !== ';' && !nexttoken.reach) {
-                nonadjacent(token, nexttoken);
-                if (peek().value === "=" && !option.boss) {
-                    warningAt("Did you mean to return a conditional instead of an assignment?",
-                              token.line, token.character + 1);
-                }
-                this.first = expression(0);
-            }
-        } else if (!option.asi) {
-            nolinebreak(this); // always warn (Line breaking error)
-        }
-        reachable('return');
-        return this;
-    }).exps = true;
-
-
-    stmt('throw', function () {
-        nolinebreak(this);
-        nonadjacent(token, nexttoken);
-        this.first = expression(20);
-        reachable('throw');
-        return this;
-    }).exps = true;
-
-//  Superfluous reserved words
-
-    reserve('class');
-    reserve('const');
-    reserve('enum');
-    reserve('export');
-    reserve('extends');
-    reserve('import');
-    reserve('super');
-
-    reserve('let');
-    reserve('yield');
-    reserve('implements');
-    reserve('interface');
-    reserve('package');
-    reserve('private');
-    reserve('protected');
-    reserve('public');
-    reserve('static');
-
-
-// Parse JSON
-
-    function jsonValue() {
-
-        function jsonObject() {
-            var o = {}, t = nexttoken;
-            advance('{');
-            if (nexttoken.id !== '}') {
-                for (;;) {
-                    if (nexttoken.id === '(end)') {
-                        error("Missing '}' to match '{' from line {a}.",
-                                nexttoken, t.line);
-                    } else if (nexttoken.id === '}') {
-                        warning("Unexpected comma.", token);
-                        break;
-                    } else if (nexttoken.id === ',') {
-                        error("Unexpected comma.", nexttoken);
-                    } else if (nexttoken.id !== '(string)') {
-                        warning("Expected a string and instead saw {a}.",
-                                nexttoken, nexttoken.value);
-                    }
-                    if (o[nexttoken.value] === true) {
-                        warning("Duplicate key '{a}'.",
-                                nexttoken, nexttoken.value);
-                    } else if ((nexttoken.value === '__proto__' &&
-                        !option.proto) || (nexttoken.value === '__iterator__' &&
-                        !option.iterator)) {
-                        warning("The '{a}' key may produce unexpected results.",
-                            nexttoken, nexttoken.value);
-                    } else {
-                        o[nexttoken.value] = true;
-                    }
-                    advance();
-                    advance(':');
-                    jsonValue();
-                    if (nexttoken.id !== ',') {
-                        break;
-                    }
-                    advance(',');
-                }
-            }
-            advance('}');
-        }
-
-        function jsonArray() {
-            var t = nexttoken;
-            advance('[');
-            if (nexttoken.id !== ']') {
-                for (;;) {
-                    if (nexttoken.id === '(end)') {
-                        error("Missing ']' to match '[' from line {a}.",
-                                nexttoken, t.line);
-                    } else if (nexttoken.id === ']') {
-                        warning("Unexpected comma.", token);
-                        break;
-                    } else if (nexttoken.id === ',') {
-                        error("Unexpected comma.", nexttoken);
-                    }
-                    jsonValue();
-                    if (nexttoken.id !== ',') {
-                        break;
-                    }
-                    advance(',');
-                }
-            }
-            advance(']');
-        }
-
-        switch (nexttoken.id) {
-        case '{':
-            jsonObject();
-            break;
-        case '[':
-            jsonArray();
-            break;
-        case 'true':
-        case 'false':
-        case 'null':
-        case '(number)':
-        case '(string)':
-            advance();
-            break;
-        case '-':
-            advance('-');
-            if (token.character !== nexttoken.from) {
-                warning("Unexpected space after '-'.", token);
-            }
-            adjacent(token, nexttoken);
-            advance('(number)');
-            break;
-        default:
-            error("Expected a JSON value.", nexttoken);
-        }
-    }
-
-
-// The actual JSHINT function itself.
-
-    var itself = function (s, o, g) {
-        var a, i, k;
-        JSHINT.errors = [];
-        JSHINT.undefs = [];
-        predefined = Object.create(standard);
-        combine(predefined, g || {});
-        if (o) {
-            a = o.predef;
-            if (a) {
-                if (Array.isArray(a)) {
-                    for (i = 0; i < a.length; i += 1) {
-                        predefined[a[i]] = true;
-                    }
-                } else if (typeof a === 'object') {
-                    k = Object.keys(a);
-                    for (i = 0; i < k.length; i += 1) {
-                        predefined[k[i]] = !!a[k[i]];
-                    }
-                }
-            }
-            option = o;
-        } else {
-            option = {};
-        }
-        option.indent = option.indent || 4;
-        option.maxerr = option.maxerr || 50;
-
-        tab = '';
-        for (i = 0; i < option.indent; i += 1) {
-            tab += ' ';
-        }
-        indent = 1;
-        global = Object.create(predefined);
-        scope = global;
-        funct = {
-            '(global)': true,
-            '(name)': '(global)',
-            '(scope)': scope,
-            '(breakage)': 0,
-            '(loopage)': 0
-        };
-        functions = [funct];
-        urls = [];
-        stack = null;
-        member = {};
-        membersOnly = null;
-        implied = {};
-        inblock = false;
-        lookahead = [];
-        jsonmode = false;
-        warnings = 0;
-        lex.init(s);
-        prereg = true;
-        directive = {};
-
-        prevtoken = token = nexttoken = syntax['(begin)'];
-
-        // Check options
-        for (var name in o) {
-            if (is_own(o, name)) {
-                checkOption(name, token);
-            }
-        }
-
-        assume();
-
-        // combine the passed globals after we've assumed all our options
-        combine(predefined, g || {});
-
-        //reset values
-        comma.first = true;
-
-        try {
-            advance();
-            switch (nexttoken.id) {
-            case '{':
-            case '[':
-                option.laxbreak = true;
-                jsonmode = true;
-                jsonValue();
-                break;
-            default:
-                directives();
-                if (directive["use strict"] && !option.globalstrict) {
-                    warning("Use the function form of \"use strict\".", prevtoken);
-                }
-
-                statements();
-            }
-            advance('(end)');
-
-            var markDefined = function (name, context) {
-                do {
-                    if (typeof context[name] === 'string') {
-                        // JSHINT marks unused variables as 'unused' and
-                        // unused function declaration as 'unction'. This
-                        // code changes such instances back 'var' and
-                        // 'closure' so that the code in JSHINT.data()
-                        // doesn't think they're unused.
-
-                        if (context[name] === 'unused')
-                            context[name] = 'var';
-                        else if (context[name] === 'unction')
-                            context[name] = 'closure';
-
-                        return true;
-                    }
-
-                    context = context['(context)'];
-                } while (context);
-
-                return false;
-            };
-
-            var clearImplied = function (name, line) {
-                if (!implied[name])
-                    return;
-
-                var newImplied = [];
-                for (var i = 0; i < implied[name].length; i += 1) {
-                    if (implied[name][i] !== line)
-                        newImplied.push(implied[name][i]);
-                }
-
-                if (newImplied.length === 0)
-                    delete implied[name];
-                else
-                    implied[name] = newImplied;
-            };
-
-            // Check queued 'x is not defined' instances to see if they're still undefined.
-            for (i = 0; i < JSHINT.undefs.length; i += 1) {
-                k = JSHINT.undefs[i].slice(0);
-
-                if (markDefined(k[2].value, k[0])) {
-                    clearImplied(k[2].value, k[2].line);
-                } else {
-                    warning.apply(warning, k.slice(1));
-                }
-            }
-        } catch (e) {
-            if (e) {
-                var nt = nexttoken || {};
-                JSHINT.errors.push({
-                    raw       : e.raw,
-                    reason    : e.message,
-                    line      : e.line || nt.line,
-                    character : e.character || nt.from
-                }, null);
-            }
-        }
-
-        return JSHINT.errors.length === 0;
-    };
-
-    // Data summary.
-    itself.data = function () {
-
-        var data = { functions: [], options: option }, fu, globals, implieds = [], f, i, j,
-            members = [], n, unused = [], v;
-        if (itself.errors.length) {
-            data.errors = itself.errors;
-        }
-
-        if (jsonmode) {
-            data.json = true;
-        }
-
-        for (n in implied) {
-            if (is_own(implied, n)) {
-                implieds.push({
-                    name: n,
-                    line: implied[n]
-                });
-            }
-        }
-        if (implieds.length > 0) {
-            data.implieds = implieds;
-        }
-
-        if (urls.length > 0) {
-            data.urls = urls;
-        }
-
-        globals = Object.keys(scope);
-        if (globals.length > 0) {
-            data.globals = globals;
-        }
-        for (i = 1; i < functions.length; i += 1) {
-            f = functions[i];
-            fu = {};
-            for (j = 0; j < functionicity.length; j += 1) {
-                fu[functionicity[j]] = [];
-            }
-            for (n in f) {
-                if (is_own(f, n) && n.charAt(0) !== '(') {
-                    v = f[n];
-                    if (v === 'unction') {
-                        v = 'unused';
-                    }
-                    if (Array.isArray(fu[v])) {
-                        fu[v].push(n);
-                        if (v === 'unused') {
-                            unused.push({
-                                name: n,
-                                line: f['(line)'],
-                                'function': f['(name)']
-                            });
-                        }
-                    }
-                }
-            }
-            for (j = 0; j < functionicity.length; j += 1) {
-                if (fu[functionicity[j]].length === 0) {
-                    delete fu[functionicity[j]];
-                }
-            }
-            fu.name = f['(name)'];
-            fu.param = f['(params)'];
-            fu.line = f['(line)'];
-            fu.last = f['(last)'];
-            data.functions.push(fu);
-        }
-
-        if (unused.length > 0) {
-            data.unused = unused;
-        }
-
-        members = [];
-        for (n in member) {
-            if (typeof member[n] === 'number') {
-                data.member = member;
-                break;
-            }
-        }
-
-        return data;
-    };
-
-    itself.report = function (option) {
-        var data = itself.data();
-
-        var a = [], c, e, err, f, i, k, l, m = '', n, o = [], s;
-
-        function detail(h, array) {
-            var b, i, singularity;
-            if (array) {
-                o.push('<div><i>' + h + '</i> ');
-                array = array.sort();
-                for (i = 0; i < array.length; i += 1) {
-                    if (array[i] !== singularity) {
-                        singularity = array[i];
-                        o.push((b ? ', ' : '') + singularity);
-                        b = true;
-                    }
-                }
-                o.push('</div>');
-            }
-        }
-
-
-        if (data.errors || data.implieds || data.unused) {
-            err = true;
-            o.push('<div id=errors><i>Error:</i>');
-            if (data.errors) {
-                for (i = 0; i < data.errors.length; i += 1) {
-                    c = data.errors[i];
-                    if (c) {
-                        e = c.evidence || '';
-                        o.push('<p>Problem' + (isFinite(c.line) ? ' at line ' +
-                                c.line + ' character ' + c.character : '') +
-                                ': ' + c.reason.entityify() +
-                                '</p><p class=evidence>' +
-                                (e && (e.length > 80 ? e.slice(0, 77) + '...' :
-                                e).entityify()) + '</p>');
-                    }
-                }
-            }
-
-            if (data.implieds) {
-                s = [];
-                for (i = 0; i < data.implieds.length; i += 1) {
-                    s[i] = '<code>' + data.implieds[i].name + '</code>&nbsp;<i>' +
-                        data.implieds[i].line + '</i>';
-                }
-                o.push('<p><i>Implied global:</i> ' + s.join(', ') + '</p>');
-            }
-
-            if (data.unused) {
-                s = [];
-                for (i = 0; i < data.unused.length; i += 1) {
-                    s[i] = '<code><u>' + data.unused[i].name + '</u></code>&nbsp;<i>' +
-                        data.unused[i].line + '</i> <code>' +
-                        data.unused[i]['function'] + '</code>';
-                }
-                o.push('<p><i>Unused variable:</i> ' + s.join(', ') + '</p>');
-            }
-            if (data.json) {
-                o.push('<p>JSON: bad.</p>');
-            }
-            o.push('</div>');
-        }
-
-        if (!option) {
-
-            o.push('<br><div id=functions>');
-
-            if (data.urls) {
-                detail("URLs<br>", data.urls, '<br>');
-            }
-
-            if (data.json && !err) {
-                o.push('<p>JSON: good.</p>');
-            } else if (data.globals) {
-                o.push('<div><i>Global</i> ' +
-                        data.globals.sort().join(', ') + '</div>');
-            } else {
-                o.push('<div><i>No new global variables introduced.</i></div>');
-            }
-
-            for (i = 0; i < data.functions.length; i += 1) {
-                f = data.functions[i];
-
-                o.push('<br><div class=function><i>' + f.line + '-' +
-                        f.last + '</i> ' + (f.name || '') + '(' +
-                        (f.param ? f.param.join(', ') : '') + ')</div>');
-                detail('<big><b>Unused</b></big>', f.unused);
-                detail('Closure', f.closure);
-                detail('Variable', f['var']);
-                detail('Exception', f.exception);
-                detail('Outer', f.outer);
-                detail('Global', f.global);
-                detail('Label', f.label);
-            }
-
-            if (data.member) {
-                a = Object.keys(data.member);
-                if (a.length) {
-                    a = a.sort();
-                    m = '<br><pre id=members>/*members ';
-                    l = 10;
-                    for (i = 0; i < a.length; i += 1) {
-                        k = a[i];
-                        n = k.name();
-                        if (l + n.length > 72) {
-                            o.push(m + '<br>');
-                            m = '    ';
-                            l = 1;
-                        }
-                        l += n.length + 2;
-                        if (data.member[k] === 1) {
-                            n = '<i>' + n + '</i>';
-                        }
-                        if (i < a.length - 1) {
-                            n += ', ';
-                        }
-                        m += n;
-                    }
-                    o.push(m + '<br>*/</pre>');
-                }
-                o.push('</div>');
-            }
-        }
-        return o.join('');
-    };
-
-    itself.jshint = itself;
-
-    return itself;
-}());
-
-// Make JSHINT a Node module, if possible.
-if (typeof exports === 'object' && exports)
-    exports.JSHINT = JSHINT;
-
-});/* -*- Mode: JS; tab-width: 4; indent-tabs-mode: nil; -*-
- * vim: set sw=4 ts=4 et tw=78:
- * ***** BEGIN LICENSE BLOCK *****
- *
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Narcissus JavaScript engine.
- *
- * The Initial Developer of the Original Code is
- * Brendan Eich <brendan@mozilla.org>.
- * Portions created by the Initial Developer are Copyright (C) 2004
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Tom Austin <taustin@ucsc.edu>
- *   Brendan Eich <brendan@mozilla.org>
- *   Shu-Yu Guo <shu@rfrn.org>
- *   Dave Herman <dherman@mozilla.com>
- *   Dimitris Vardoulakis <dimvar@ccs.neu.edu>
- *   Patrick Walton <pcwalton@mozilla.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * Narcissus - JS implemented in JS.
- *
- * Parser.
- */
-
-define('ace/narcissus/parser', ['require', 'exports', 'module' , 'ace/narcissus/lexer', 'ace/narcissus/definitions', 'ace/narcissus/options'], function(require, exports, module) {
-
-var lexer = require('./lexer');
-var definitions = require('./definitions');
-var options = require('./options');
-var Tokenizer = lexer.Tokenizer;
-
-var Dict = definitions.Dict;
-var Stack = definitions.Stack;
-
-// Set constants in the local scope.
-eval(definitions.consts);
-
-/*
- * pushDestructuringVarDecls :: (node, hoisting node) -> void
- *
- * Recursively add all destructured declarations to varDecls.
- */
-function pushDestructuringVarDecls(n, s) {
-    for (var i in n) {
-        var sub = n[i];
-        if (sub.type === IDENTIFIER) {
-            s.varDecls.push(sub);
-        } else {
-            pushDestructuringVarDecls(sub, s);
-        }
-    }
-}
-
-function Parser(tokenizer) {
-    tokenizer.parser = this;
-    this.t = tokenizer;
-    this.x = null;
-    this.unexpectedEOF = false;
-    options.mozillaMode && (this.mozillaMode = true);
-    options.parenFreeMode && (this.parenFreeMode = true);
-}
-
-function StaticContext(parentScript, parentBlock, inModule, inFunction, strictMode) {
-    this.parentScript = parentScript;
-    this.parentBlock = parentBlock || parentScript;
-    this.inModule = inModule || false;
-    this.inFunction = inFunction || false;
-    this.inForLoopInit = false;
-    this.topLevel = true;
-    this.allLabels = new Stack();
-    this.currentLabels = new Stack();
-    this.labeledTargets = new Stack();
-    this.defaultLoopTarget = null;
-    this.defaultTarget = null;
-    this.strictMode = strictMode;
-}
-
-StaticContext.prototype = {
-    // non-destructive update via prototype extension
-    update: function(ext) {
-        var desc = {};
-        for (var key in ext) {
-            desc[key] = {
-                value: ext[key],
-                writable: true,
-                enumerable: true,
-                configurable: true
-            }
-        }
-        return Object.create(this, desc);
-    },
-    pushLabel: function(label) {
-        return this.update({ currentLabels: this.currentLabels.push(label),
-                             allLabels: this.allLabels.push(label) });
-    },
-    pushTarget: function(target) {
-        var isDefaultLoopTarget = target.isLoop;
-        var isDefaultTarget = isDefaultLoopTarget || target.type === SWITCH;
-
-        if (this.currentLabels.isEmpty()) {
-            if (isDefaultLoopTarget) this.update({ defaultLoopTarget: target });
-            if (isDefaultTarget) this.update({ defaultTarget: target });
-            return this;
-        }
-
-        target.labels = new Dict();
-        this.currentLabels.forEach(function(label) {
-            target.labels.set(label, true);
-        });
-        return this.update({ currentLabels: new Stack(),
-                             labeledTargets: this.labeledTargets.push(target),
-                             defaultLoopTarget: isDefaultLoopTarget
-                             ? target
-                             : this.defaultLoopTarget,
-                             defaultTarget: isDefaultTarget
-                             ? target
-                             : this.defaultTarget });
-    },
-    nest: function() {
-        return this.topLevel ? this.update({ topLevel: false }) : this;
-    },
-    canImport: function() {
-        return this.topLevel && !this.inFunction;
-    },
-    canExport: function() {
-        return this.inModule && this.topLevel && !this.inFunction;
-    },
-    banWith: function() {
-        return this.strictMode || this.inModule;
-    },
-    modulesAllowed: function() {
-        return this.topLevel && !this.inFunction;
-    }
-};
-
-var Pp = Parser.prototype;
-
-Pp.mozillaMode = false;
-
-Pp.parenFreeMode = false;
-
-Pp.withContext = function(x, f) {
-    var x0 = this.x;
-    this.x = x;
-    var result = f.call(this);
-    // NB: we don't bother with finally, since exceptions trash the parser
-    this.x = x0;
-    return result;
-};
-
-Pp.newNode = function newNode(opts) {
-    return new Node(this.t, opts);
-};
-
-Pp.fail = function fail(msg) {
-    throw this.t.newSyntaxError(msg);
-};
-
-Pp.match = function match(tt, scanOperand, keywordIsName) {
-    return this.t.match(tt, scanOperand, keywordIsName);
-};
-
-Pp.mustMatch = function mustMatch(tt, keywordIsName) {
-    return this.t.mustMatch(tt, keywordIsName);
-};
-
-Pp.peek = function peek(scanOperand) {
-    return this.t.peek(scanOperand);
-};
-
-Pp.peekOnSameLine = function peekOnSameLine(scanOperand) {
-    return this.t.peekOnSameLine(scanOperand);
-};
-
-Pp.done = function done() {
-    return this.t.done;
-};
-
-/*
- * Script :: (boolean, boolean, boolean) -> node
- *
- * Parses the toplevel and module/function bodies.
- */
-Pp.Script = function Script(inModule, inFunction, expectEnd) {
-    var node = this.newNode(scriptInit());
-    var x2 = new StaticContext(node, node, inModule, inFunction);
-    this.withContext(x2, function() {
-        this.Statements(node, true);
-    });
-    if (expectEnd && !this.done())
-        this.fail("expected end of input");
-    return node;
-};
-
-/*
- * Pragma :: (expression statement node) -> boolean
- *
- * Checks whether a node is a pragma and annotates it.
- */
-function Pragma(n) {
-    if (n.type === SEMICOLON) {
-        var e = n.expression;
-        if (e.type === STRING && e.value === "use strict") {
-            n.pragma = "strict";
-            return true;
-        }
-    }
-    return false;
-}
-
-/*
- * Node :: (tokenizer, optional init object) -> node
- */
-function Node(t, init) {
-    var token = t.token;
-    if (token) {
-        // If init.type exists it will override token.type.
-        this.type = token.type;
-        this.value = token.value;
-        this.lineno = token.lineno;
-
-        // Start and end are file positions for error handling.
-        this.start = token.start;
-        this.end = token.end;
-    } else {
-        this.lineno = t.lineno;
-    }
-
-    this.filename = t.filename;
-    this.children = [];
-
-    for (var prop in init)
-        this[prop] = init[prop];
-}
-
-/*
- * SyntheticNode :: (optional init object) -> node
- */
-function SyntheticNode(init) {
-    this.children = [];
-    for (var prop in init)
-        this[prop] = init[prop];
-    this.synthetic = true;
-}
-
-var Np = Node.prototype = SyntheticNode.prototype = {};
-Np.constructor = Node;
-
-var TO_SOURCE_SKIP = {
-    type: true,
-    value: true,
-    lineno: true,
-    start: true,
-    end: true,
-    tokenizer: true,
-    assignOp: true
-};
-function unevalableConst(code) {
-    var token = definitions.tokens[code];
-    var constName = definitions.opTypeNames.hasOwnProperty(token)
-        ? definitions.opTypeNames[token]
-        : token in definitions.keywords
-        ? token.toUpperCase()
-        : token;
-    return { toSource: function() { return constName } };
-}
-Np.toSource = function toSource() {
-    var mock = {};
-    var self = this;
-    mock.type = unevalableConst(this.type);
-    // avoid infinite recursion in case of back-links
-    if (this.generatingSource)
-        return mock.toSource();
-    this.generatingSource = true;
-    if ("value" in this)
-        mock.value = this.value;
-    if ("lineno" in this)
-        mock.lineno = this.lineno;
-    if ("start" in this)
-        mock.start = this.start;
-    if ("end" in this)
-        mock.end = this.end;
-    if (this.assignOp)
-        mock.assignOp = unevalableConst(this.assignOp);
-    for (var key in this) {
-        if (this.hasOwnProperty(key) && !(key in TO_SOURCE_SKIP))
-            mock[key] = this[key];
-    }
-    try {
-        return mock.toSource();
-    } finally {
-        delete this.generatingSource;
-    }
-};
-
-// Always use push to add operands to an expression, to update start and end.
-Np.push = function (kid) {
-    // kid can be null e.g. [1, , 2].
-    if (kid !== null) {
-        if (kid.start < this.start)
-            this.start = kid.start;
-        if (this.end < kid.end)
-            this.end = kid.end;
-    }
-    return this.children.push(kid);
-}
-
-Node.indentLevel = 0;
-
-function tokenString(tt) {
-    var t = definitions.tokens[tt];
-    return /^\W/.test(t) ? definitions.opTypeNames[t] : t.toUpperCase();
-}
-
-Np.toString = function () {
-    var a = [];
-    for (var i in this) {
-        if (this.hasOwnProperty(i) && i !== 'type' && i !== 'target')
-            a.push({id: i, value: this[i]});
-    }
-    a.sort(function (a,b) { return (a.id < b.id) ? -1 : 1; });
-    var INDENTATION = "    ";
-    var n = ++Node.indentLevel;
-    var s = "{\n" + INDENTATION.repeat(n) + "type: " + tokenString(this.type);
-    for (i = 0; i < a.length; i++)
-        s += ",\n" + INDENTATION.repeat(n) + a[i].id + ": " + a[i].value;
-    n = --Node.indentLevel;
-    s += "\n" + INDENTATION.repeat(n) + "}";
-    return s;
-}
-
-Np.synth = function(init) {
-    var node = new SyntheticNode(init);
-    node.filename = this.filename;
-    node.lineno = this.lineno;
-    node.start = this.start;
-    node.end = this.end;
-    return node;
-};
-
-/*
- * Helper init objects for common nodes.
- */
-
-var LOOP_INIT = { isLoop: true };
-
-function blockInit() {
-    return { type: BLOCK, varDecls: [] };
-}
-
-function scriptInit() {
-    return { type: SCRIPT,
-             funDecls: [],
-             varDecls: [],
-             modDefns: new Dict(),
-             modAssns: new Dict(),
-             modDecls: new Dict(),
-             modLoads: new Dict(),
-             impDecls: [],
-             expDecls: [],
-             exports: new Dict(),
-             hasEmptyReturn: false,
-             hasReturnWithValue: false,
-             hasYield: false };
-}
-
-definitions.defineGetter(Np, "length",
-                         function() {
-                             throw new Error("Node.prototype.length is gone; " +
-                                             "use n.children.length instead");
-                         });
-
-definitions.defineProperty(String.prototype, "repeat",
-                           function(n) {
-                               var s = "", t = this + s;
-                               while (--n >= 0)
-                                   s += t;
-                               return s;
-                           }, false, false, true);
-
-Pp.MaybeLeftParen = function MaybeLeftParen() {
-    if (this.parenFreeMode)
-        return this.match(LEFT_PAREN) ? LEFT_PAREN : END;
-    return this.mustMatch(LEFT_PAREN).type;
-};
-
-Pp.MaybeRightParen = function MaybeRightParen(p) {
-    if (p === LEFT_PAREN)
-        this.mustMatch(RIGHT_PAREN);
-}
-
-/*
- * Statements :: (node[, boolean]) -> void
- *
- * Parses a sequence of Statements.
- */
-Pp.Statements = function Statements(n, topLevel) {
-    var prologue = !!topLevel;
-    try {
-        while (!this.done() && this.peek(true) !== RIGHT_CURLY) {
-            var n2 = this.Statement();
-            n.push(n2);
-            if (prologue && Pragma(n2)) {
-                this.x.strictMode = true;
-                n.strict = true;
-            } else {
-                prologue = false;
-            }
-        }
-    } catch (e) {
-        try {
-            if (this.done())
-                this.unexpectedEOF = true;
-        } catch(e) {}
-        throw e;
-    }
-}
-
-Pp.Block = function Block() {
-    this.mustMatch(LEFT_CURLY);
-    var n = this.newNode(blockInit());
-    var x2 = this.x.update({ parentBlock: n }).pushTarget(n);
-    this.withContext(x2, function() {
-        this.Statements(n);
-    });
-    this.mustMatch(RIGHT_CURLY);
-    return n;
-}
-
-var DECLARED_FORM = 0, EXPRESSED_FORM = 1, STATEMENT_FORM = 2;
-
-/*
- * Export :: (binding node, boolean) -> Export
- *
- * Static semantic representation of a module export.
- */
-function Export(node, isDefinition) {
-    this.node = node;                 // the AST node declaring this individual export
-    this.isDefinition = isDefinition; // is the node an 'export'-annotated definition?
-    this.resolved = null;             // resolved pointer to the target of this export
-}
-
-/*
- * registerExport :: (Dict, EXPORT node) -> void
- */
-function registerExport(exports, decl) {
-    function register(name, exp) {
-        if (exports.has(name))
-            throw new SyntaxError("multiple exports of " + name);
-        exports.set(name, exp);
-    }
-
-    switch (decl.type) {
-      case MODULE:
-      case FUNCTION:
-        register(decl.name, new Export(decl, true));
-        break;
-
-      case VAR:
-        for (var i = 0; i < decl.children.length; i++)
-            register(decl.children[i].name, new Export(decl.children[i], true));
-        break;
-
-      case LET:
-      case CONST:
-        throw new Error("NYI: " + definitions.tokens[decl.type]);
-
-      case EXPORT:
-        for (var i = 0; i < decl.pathList.length; i++) {
-            var path = decl.pathList[i];
-            switch (path.type) {
-              case OBJECT_INIT:
-                for (var j = 0; j < path.children.length; j++) {
-                    // init :: IDENTIFIER | PROPERTY_INIT
-                    var init = path.children[j];
-                    if (init.type === IDENTIFIER)
-                        register(init.value, new Export(init, false));
-                    else
-                        register(init.children[0].value, new Export(init.children[1], false));
-                }
-                break;
-
-              case DOT:
-                register(path.children[1].value, new Export(path, false));
-                break;
-
-              case IDENTIFIER:
-                register(path.value, new Export(path, false));
-                break;
-
-              default:
-                throw new Error("unexpected export path: " + definitions.tokens[path.type]);
-            }
-        }
-        break;
-
-      default:
-        throw new Error("unexpected export decl: " + definitions.tokens[exp.type]);
-    }
-}
-
-/*
- * Module :: (node) -> Module
- *
- * Static semantic representation of a module.
- */
-function Module(node) {
-    var exports = node.body.exports;
-    var modDefns = node.body.modDefns;
-
-    var exportedModules = new Dict();
-
-    exports.forEach(function(name, exp) {
-        var node = exp.node;
-        if (node.type === MODULE) {
-            exportedModules.set(name, node);
-        } else if (!exp.isDefinition && node.type === IDENTIFIER && modDefns.has(node.value)) {
-            var mod = modDefns.get(node.value);
-            exportedModules.set(name, mod);
-        }
-    });
-
-    this.node = node;
-    this.exports = exports;
-    this.exportedModules = exportedModules;
-}
-
-/*
- * Statement :: () -> node
- *
- * Parses a Statement.
- */
-Pp.Statement = function Statement() {
-    var i, label, n, n2, p, c, ss, tt = this.t.get(true), tt2, x0, x2, x3;
-
-    var comments = this.t.blockComments;
-
-    // Cases for statements ending in a right curly return early, avoiding the
-    // common semicolon insertion magic after this switch.
-    switch (tt) {
-      case IMPORT:
-        if (!this.x.canImport())
-            this.fail("illegal context for import statement");
-        n = this.newNode();
-        n.pathList = this.ImportPathList();
-        this.x.parentScript.impDecls.push(n);
-        break;
-
-      case EXPORT:
-        if (!this.x.canExport())
-            this.fail("export statement not in module top level");
-        switch (this.peek()) {
-          case MODULE:
-          case FUNCTION:
-          case LET:
-          case VAR:
-          case CONST:
-            n = this.Statement();
-            n.blockComments = comments;
-            n.exported = true;
-            this.x.parentScript.expDecls.push(n);
-            registerExport(this.x.parentScript.exports, n);
-            return n;
-        }
-        n = this.newNode();
-        n.pathList = this.ExportPathList();
-        this.x.parentScript.expDecls.push(n);
-        registerExport(this.x.parentScript.exports, n);
-        break;
-
-      case FUNCTION:
-        // DECLARED_FORM extends funDecls of x, STATEMENT_FORM doesn't.
-        return this.FunctionDefinition(true, this.x.topLevel ? DECLARED_FORM : STATEMENT_FORM, comments);
-
-      case LEFT_CURLY:
-        n = this.newNode(blockInit());
-        x2 = this.x.update({ parentBlock: n }).pushTarget(n).nest();
-        this.withContext(x2, function() {
-            this.Statements(n);
-        });
-        this.mustMatch(RIGHT_CURLY);
-        return n;
-
-      case IF:
-        n = this.newNode();
-        n.condition = this.HeadExpression();
-        x2 = this.x.pushTarget(n).nest();
-        this.withContext(x2, function() {
-            n.thenPart = this.Statement();
-            n.elsePart = this.match(ELSE, true) ? this.Statement() : null;
-        });
-        return n;
-
-      case SWITCH:
-        // This allows CASEs after a DEFAULT, which is in the standard.
-        n = this.newNode({ cases: [], defaultIndex: -1 });
-        n.discriminant = this.HeadExpression();
-        x2 = this.x.pushTarget(n).nest();
-        this.withContext(x2, function() {
-            this.mustMatch(LEFT_CURLY);
-            while ((tt = this.t.get()) !== RIGHT_CURLY) {
-                switch (tt) {
-                  case DEFAULT:
-                    if (n.defaultIndex >= 0)
-                        this.fail("More than one switch default");
-                    // FALL THROUGH
-                  case CASE:
-                    n2 = this.newNode();
-                    if (tt === DEFAULT)
-                        n.defaultIndex = n.cases.length;
-                    else
-                        n2.caseLabel = this.Expression(COLON);
-                    break;
-
-                  default:
-                    this.fail("Invalid switch case");
-                }
-                this.mustMatch(COLON);
-                n2.statements = this.newNode(blockInit());
-                while ((tt=this.peek(true)) !== CASE && tt !== DEFAULT &&
-                       tt !== RIGHT_CURLY)
-                    n2.statements.push(this.Statement());
-                n.cases.push(n2);
-            }
-        });
-        return n;
-
-      case FOR:
-        n = this.newNode(LOOP_INIT);
-        n.blockComments = comments;
-        if (this.match(IDENTIFIER)) {
-            if (this.t.token.value === "each")
-                n.isEach = true;
-            else
-                this.t.unget();
-        }
-        if (!this.parenFreeMode)
-            this.mustMatch(LEFT_PAREN);
-        x2 = this.x.pushTarget(n).nest();
-        x3 = this.x.update({ inForLoopInit: true });
-        n2 = null;
-        if ((tt = this.peek(true)) !== SEMICOLON) {
-            this.withContext(x3, function() {
-                if (tt === VAR || tt === CONST) {
-                    this.t.get();
-                    n2 = this.Variables();
-                } else if (tt === LET) {
-                    this.t.get();
-                    if (this.peek() === LEFT_PAREN) {
-                        n2 = this.LetBlock(false);
-                    } else {
-                        // Let in for head, we need to add an implicit block
-                        // around the rest of the for.
-                        this.x.parentBlock = n;
-                        n.varDecls = [];
-                        n2 = this.Variables();
-                    }
-                } else {
-                    n2 = this.Expression();
-                }
-            });
-        }
-        if (n2 && this.match(IN)) {
-            n.type = FOR_IN;
-            this.withContext(x3, function() {
-                n.object = this.Expression();
-                if (n2.type === VAR || n2.type === LET) {
-                    c = n2.children;
-
-                    // Destructuring turns one decl into multiples, so either
-                    // there must be only one destructuring or only one
-                    // decl.
-                    if (c.length !== 1 && n2.destructurings.length !== 1) {
-                        // FIXME: this.fail ?
-                        throw new SyntaxError("Invalid for..in left-hand side",
-                                              this.filename, n2.lineno);
-                    }
-                    if (n2.destructurings.length > 0) {
-                        n.iterator = n2.destructurings[0];
-                    } else {
-                        n.iterator = c[0];
-                    }
-                    n.varDecl = n2;
-                } else {
-                    if (n2.type === ARRAY_INIT || n2.type === OBJECT_INIT) {
-                        n2.destructuredNames = this.checkDestructuring(n2);
-                    }
-                    n.iterator = n2;
-                }
-            });
-        } else {
-            x3.inForLoopInit = false;
-            n.setup = n2;
-            this.mustMatch(SEMICOLON);
-            if (n.isEach)
-                this.fail("Invalid for each..in loop");
-            this.withContext(x3, function() {
-                n.condition = (this.peek(true) === SEMICOLON)
-                    ? null
-                    : this.Expression();
-                this.mustMatch(SEMICOLON);
-                tt2 = this.peek(true);
-                n.update = (this.parenFreeMode
-                            ? tt2 === LEFT_CURLY || definitions.isStatementStartCode[tt2]
-                            : tt2 === RIGHT_PAREN)
-                    ? null
-                    : this.Expression();
-            });
-        }
-        if (!this.parenFreeMode)
-            this.mustMatch(RIGHT_PAREN);
-        this.withContext(x2, function() {
-            n.body = this.Statement();
-        });
-        return n;
-
-      case WHILE:
-        n = this.newNode({ isLoop: true });
-        n.blockComments = comments;
-        n.condition = this.HeadExpression();
-        x2 = this.x.pushTarget(n).nest();
-        this.withContext(x2, function() {
-            n.body = this.Statement();
-        });
-        return n;
-
-      case DO:
-        n = this.newNode({ isLoop: true });
-        n.blockComments = comments;
-        x2 = this.x.pushTarget(n).next();
-        this.withContext(x2, function() {
-            n.body = this.Statement();
-        });
-        this.mustMatch(WHILE);
-        n.condition = this.HeadExpression();
-        // <script language="JavaScript"> (without version hints) may need
-        // automatic semicolon insertion without a newline after do-while.
-        // See http://bugzilla.mozilla.org/show_bug.cgi?id=238945.
-        this.match(SEMICOLON);
-        return n;
-
-      case BREAK:
-      case CONTINUE:
-        n = this.newNode();
-        n.blockComments = comments;
-
-        // handle the |foo: break foo;| corner case
-        x2 = this.x.pushTarget(n);
-
-        if (this.peekOnSameLine() === IDENTIFIER) {
-            this.t.get();
-            n.label = this.t.token.value;
-        }
-
-        if (n.label) {
-            n.target = x2.labeledTargets.find(function(target) {
-                return target.labels.has(n.label)
-            });
-        } else if (tt === CONTINUE) {
-            n.target = x2.defaultLoopTarget;
-        } else {
-            n.target = x2.defaultTarget;
-        }
-
-        if (!n.target)
-            this.fail("Invalid " + ((tt === BREAK) ? "break" : "continue"));
-        if (!n.target.isLoop && tt === CONTINUE)
-            this.fail("Invalid continue");
-
-        break;
-
-      case TRY:
-        n = this.newNode({ catchClauses: [] });
-        n.blockComments = comments;
-        n.tryBlock = this.Block();
-        while (this.match(CATCH)) {
-            n2 = this.newNode();
-            p = this.MaybeLeftParen();
-            switch (this.t.get()) {
-              case LEFT_BRACKET:
-              case LEFT_CURLY:
-                // Destructured catch identifiers.
-                this.t.unget();
-                n2.varName = this.DestructuringExpression(true);
-                break;
-              case IDENTIFIER:
-                n2.varName = this.t.token.value;
-                break;
-              default:
-                this.fail("missing identifier in catch");
-                break;
-            }
-            if (this.match(IF)) {
-                if (!this.mozillaMode)
-                    this.fail("Illegal catch guard");
-                if (n.catchClauses.length && !n.catchClauses.top().guard)
-                    this.fail("Guarded catch after unguarded");
-                n2.guard = this.Expression();
-            }
-            this.MaybeRightParen(p);
-            n2.block = this.Block();
-            n.catchClauses.push(n2);
-        }
-        if (this.match(FINALLY))
-            n.finallyBlock = this.Block();
-        if (!n.catchClauses.length && !n.finallyBlock)
-            this.fail("Invalid try statement");
-        return n;
-
-      case CATCH:
-      case FINALLY:
-        this.fail(definitions.tokens[tt] + " without preceding try");
-
-      case THROW:
-        n = this.newNode();
-        n.exception = this.Expression();
-        break;
-
-      case RETURN:
-        n = this.ReturnOrYield();
-        break;
-
-      case WITH:
-        if (this.x.banWith())
-            this.fail("with statements not allowed in strict code or modules");
-        n = this.newNode();
-        n.blockComments = comments;
-        n.object = this.HeadExpression();
-        x2 = this.x.pushTarget(n).next();
-        this.withContext(x2, function() {
-            n.body = this.Statement();
-        });
-        return n;
-
-      case VAR:
-      case CONST:
-        n = this.Variables();
-        break;
-
-      case LET:
-        if (this.peek() === LEFT_PAREN) {
-            n = this.LetBlock(true);
-            return n;
-        }
-        n = this.Variables();
-        break;
-
-      case DEBUGGER:
-        n = this.newNode();
-        break;
-
-      case NEWLINE:
-      case SEMICOLON:
-        n = this.newNode({ type: SEMICOLON });
-        n.blockComments = comments;
-        n.expression = null;
-        return n;
-
-      case IDENTIFIER:
-      case USE:
-      case MODULE:
-        switch (this.t.token.value) {
-          case "use":
-            if (!isPragmaToken(this.peekOnSameLine())) {
-                this.t.unget();
-                break;
-            }
-            return this.newNode({ type: USE, params: this.Pragmas() });
-
-          case "module":
-            if (!this.x.modulesAllowed())
-                this.fail("module declaration not at top level");
-            this.x.parentScript.hasModules = true;
-            tt = this.peekOnSameLine();
-            if (tt !== IDENTIFIER && tt !== LEFT_CURLY) {
-                this.t.unget();
-                break;
-            }
-            n = this.newNode({ type: MODULE });
-            n.blockComments = comments;
-            this.mustMatch(IDENTIFIER);
-            label = this.t.token.value;
-
-            if (this.match(LEFT_CURLY)) {
-                n.name = label;
-                n.body = this.Script(true, false);
-                n.module = new Module(n);
-                this.mustMatch(RIGHT_CURLY);
-                this.x.parentScript.modDefns.set(n.name, n);
-                return n;
-            }
-
-            this.t.unget();
-            this.ModuleVariables(n);
-            return n;
-
-          default:
-            tt = this.peek();
-            // Labeled statement.
-            if (tt === COLON) {
-                label = this.t.token.value;
-                if (this.x.allLabels.has(label))
-                    this.fail("Duplicate label: " + label);
-                this.t.get();
-                n = this.newNode({ type: LABEL, label: label });
-                n.blockComments = comments;
-                x2 = this.x.pushLabel(label).nest();
-                this.withContext(x2, function() {
-                    n.statement = this.Statement();
-                });
-                n.target = (n.statement.type === LABEL) ? n.statement.target : n.statement;
-                return n;
-            }
-            // FALL THROUGH
-        }
-        // FALL THROUGH
-
-      default:
-        // Expression statement.
-        // We unget the current token to parse the expression as a whole.
-        n = this.newNode({ type: SEMICOLON });
-        this.t.unget();
-        n.blockComments = comments;
-        n.expression = this.Expression();
-        n.end = n.expression.end;
-        break;
-    }
-
-    n.blockComments = comments;
-    this.MagicalSemicolon();
-    return n;
-}
-
-/*
- * isPragmaToken :: (number) -> boolean
- */
-function isPragmaToken(tt) {
-    switch (tt) {
-      case IDENTIFIER:
-      case STRING:
-      case NUMBER:
-      case NULL:
-      case TRUE:
-      case FALSE:
-        return true;
-    }
-    return false;
-}
-
-/*
- * Pragmas :: () -> Array[Array[token]]
- */
-Pp.Pragmas = function Pragmas() {
-    var pragmas = [];
-    do {
-        pragmas.push(this.Pragma());
-    } while (this.match(COMMA));
-    this.MagicalSemicolon();
-    return pragmas;
-}
-
-/*
- * Pragmas :: () -> Array[token]
- */
-Pp.Pragma = function Pragma() {
-    var items = [];
-    var tt;
-    do {
-        tt = this.t.get(true);
-        items.push(this.t.token);
-    } while (isPragmaToken(this.peek()));
-    return items;
-}
-
-/*
- * MagicalSemicolon :: () -> void
- */
-Pp.MagicalSemicolon = function MagicalSemicolon() {
-    var tt;
-    if (this.t.lineno === this.t.token.lineno) {
-        tt = this.peekOnSameLine();
-        if (tt !== END && tt !== NEWLINE && tt !== SEMICOLON && tt !== RIGHT_CURLY)
-            this.fail("missing ; before statement");
-    }
-    this.match(SEMICOLON);
-}
-
-/*
- * ReturnOrYield :: () -> (RETURN | YIELD) node
- */
-Pp.ReturnOrYield = function ReturnOrYield() {
-    var n, b, tt = this.t.token.type, tt2;
-
-    var parentScript = this.x.parentScript;
-
-    if (tt === RETURN) {
-        if (!this.x.inFunction)
-            this.fail("Return not in function");
-    } else /* if (tt === YIELD) */ {
-        if (!this.x.inFunction)
-            this.fail("Yield not in function");
-        parentScript.hasYield = true;
-    }
-    n = this.newNode({ value: undefined });
-
-    tt2 = (tt === RETURN) ? this.peekOnSameLine(true) : this.peek(true);
-    if (tt2 !== END && tt2 !== NEWLINE &&
-        tt2 !== SEMICOLON && tt2 !== RIGHT_CURLY
-        && (tt !== YIELD ||
-            (tt2 !== tt && tt2 !== RIGHT_BRACKET && tt2 !== RIGHT_PAREN &&
-             tt2 !== COLON && tt2 !== COMMA))) {
-        if (tt === RETURN) {
-            n.value = this.Expression();
-            parentScript.hasReturnWithValue = true;
-        } else {
-            n.value = this.AssignExpression();
-        }
-    } else if (tt === RETURN) {
-        parentScript.hasEmptyReturn = true;
-    }
-
-    return n;
-}
-
-/*
- * ModuleExpression :: () -> (STRING | IDENTIFIER | DOT) node
- */
-Pp.ModuleExpression = function ModuleExpression() {
-    return this.match(STRING) ? this.newNode() : this.QualifiedPath();
-}
-
-/*
- * ImportPathList :: () -> Array[DOT node]
- */
-Pp.ImportPathList = function ImportPathList() {
-    var a = [];
-    do {
-        a.push(this.ImportPath());
-    } while (this.match(COMMA));
-    return a;
-}
-
-/*
- * ImportPath :: () -> DOT node
- */
-Pp.ImportPath = function ImportPath() {
-    var n = this.QualifiedPath();
-    if (!this.match(DOT)) {
-        if (n.type === IDENTIFIER)
-            this.fail("cannot import local variable");
-        return n;
-    }
-
-    var n2 = this.newNode();
-    n2.push(n);
-    n2.push(this.ImportSpecifierSet());
-    return n2;
-}
-
-/*
- * ExplicitSpecifierSet :: (() -> node) -> OBJECT_INIT node
- */
-Pp.ExplicitSpecifierSet = function ExplicitSpecifierSet(SpecifierRHS) {
-    var n, n2, id, tt;
-
-    n = this.newNode({ type: OBJECT_INIT });
-    this.mustMatch(LEFT_CURLY);
-
-    if (!this.match(RIGHT_CURLY)) {
-        do {
-            id = this.Identifier();
-            if (this.match(COLON)) {
-                n2 = this.newNode({ type: PROPERTY_INIT });
-                n2.push(id);
-                n2.push(SpecifierRHS());
-                n.push(n2);
-            } else {
-                n.push(id);
-            }
-        } while (!this.match(RIGHT_CURLY) && this.mustMatch(COMMA));
-    }
-
-    return n;
-}
-
-/*
- * ImportSpecifierSet :: () -> (IDENTIFIER | OBJECT_INIT) node
- */
-Pp.ImportSpecifierSet = function ImportSpecifierSet() {
-    var self = this;
-    return this.match(MUL)
-        ? this.newNode({ type: IDENTIFIER, name: "*" })
-    : ExplicitSpecifierSet(function() { return self.Identifier() });
-}
-
-/*
- * Identifier :: () -> IDENTIFIER node
- */
-Pp.Identifier = function Identifier() {
-    this.mustMatch(IDENTIFIER);
-    return this.newNode({ type: IDENTIFIER });
-}
-
-/*
- * IdentifierName :: () -> IDENTIFIER node
- */
-Pp.IdentifierName = function IdentifierName() {
-    this.mustMatch(IDENTIFIER, true);
-    return this.newNode({ type: IDENTIFIER });
-}
-
-/*
- * QualifiedPath :: () -> (IDENTIFIER | DOT) node
- */
-Pp.QualifiedPath = function QualifiedPath() {
-    var n, n2;
-
-    n = this.Identifier();
-
-    while (this.match(DOT)) {
-        if (this.peek() !== IDENTIFIER) {
-            // Unget the '.' token, which isn't part of the QualifiedPath.
-            this.t.unget();
-            break;
-        }
-        n2 = this.newNode();
-        n2.push(n);
-        n2.push(this.Identifier());
-        n = n2;
-    }
-
-    return n;
-}
-
-/*
- * ExportPath :: () -> (IDENTIFIER | DOT | OBJECT_INIT) node
- */
-Pp.ExportPath = function ExportPath() {
-    var self = this;
-    if (this.peek() === LEFT_CURLY)
-        return this.ExplicitSpecifierSet(function() { return self.QualifiedPath() });
-    return this.QualifiedPath();
-}
-
-/*
- * ExportPathList :: () -> Array[(IDENTIFIER | DOT | OBJECT_INIT) node]
- */
-Pp.ExportPathList = function ExportPathList() {
-    var a = [];
-    do {
-        a.push(this.ExportPath());
-    } while (this.match(COMMA));
-    return a;
-}
-
-/*
- * FunctionDefinition :: (boolean,
- *                        DECLARED_FORM or EXPRESSED_FORM or STATEMENT_FORM,
- *                        [string] or null or undefined)
- *                    -> node
- */
-Pp.FunctionDefinition = function FunctionDefinition(requireName, functionForm, comments) {
-    var tt;
-    var f = this.newNode({ params: [], paramComments: [] });
-    if (typeof comments === "undefined")
-        comments = null;
-    f.blockComments = comments;
-    if (f.type !== FUNCTION)
-        f.type = (f.value === "get") ? GETTER : SETTER;
-    if (this.match(MUL))
-        f.isExplicitGenerator = true;
-    if (this.match(IDENTIFIER, false, true))
-        f.name = this.t.token.value;
-    else if (requireName)
-        this.fail("missing function identifier");
-
-    var inModule = this.x.inModule;
-    x2 = new StaticContext(null, null, inModule, true, this.x.strictMode);
-    this.withContext(x2, function() {
-        this.mustMatch(LEFT_PAREN);
-        if (!this.match(RIGHT_PAREN)) {
-            do {
-                tt = this.t.get();
-                f.paramComments.push(this.t.lastBlockComment());
-                switch (tt) {
-                  case LEFT_BRACKET:
-                  case LEFT_CURLY:
-                    // Destructured formal parameters.
-                    this.t.unget();
-                    f.params.push(this.DestructuringExpression());
-                    break;
-                  case IDENTIFIER:
-                    f.params.push(this.t.token.value);
-                    break;
-                  default:
-                    this.fail("missing formal parameter");
-                }
-            } while (this.match(COMMA));
-            this.mustMatch(RIGHT_PAREN);
-        }
-
-        // Do we have an expression closure or a normal body?
-        tt = this.t.get(true);
-        if (tt !== LEFT_CURLY)
-            this.t.unget();
-
-        if (tt !== LEFT_CURLY) {
-            f.body = this.AssignExpression();
-        } else {
-            f.body = this.Script(inModule, true);
-        }
-    });
-
-    if (tt === LEFT_CURLY)
-        this.mustMatch(RIGHT_CURLY);
-
-    f.end = this.t.token.end;
-    f.functionForm = functionForm;
-    if (functionForm === DECLARED_FORM)
-        this.x.parentScript.funDecls.push(f);
-
-    if (this.x.inModule && !f.isExplicitGenerator && f.body.hasYield)
-        this.fail("yield in non-generator function");
-
-    if (f.isExplicitGenerator || f.body.hasYield)
-        f.body = this.newNode({ type: GENERATOR, body: f.body });
-
-    return f;
-}
-
-/*
- * ModuleVariables :: (MODULE node) -> void
- *
- * Parses a comma-separated list of module declarations (and maybe
- * initializations).
- */
-Pp.ModuleVariables = function ModuleVariables(n) {
-    var n1, n2;
-    do {
-        n1 = this.Identifier();
-        if (this.match(ASSIGN)) {
-            n2 = this.ModuleExpression();
-            n1.initializer = n2;
-            if (n2.type === STRING)
-                this.x.parentScript.modLoads.set(n1.value, n2.value);
-            else
-                this.x.parentScript.modAssns.set(n1.value, n1);
-        }
-        n.push(n1);
-    } while (this.match(COMMA));
-}
-
-/*
- * Variables :: () -> node
- *
- * Parses a comma-separated list of var declarations (and maybe
- * initializations).
- */
-Pp.Variables = function Variables(letBlock) {
-    var n, n2, ss, i, s, tt;
-
-    tt = this.t.token.type;
-    switch (tt) {
-      case VAR:
-      case CONST:
-        s = this.x.parentScript;
-        break;
-      case LET:
-        s = this.x.parentBlock;
-        break;
-      case LEFT_PAREN:
-        tt = LET;
-        s = letBlock;
-        break;
-    }
-
-    n = this.newNode({ type: tt, destructurings: [] });
-
-    do {
-        tt = this.t.get();
-        if (tt === LEFT_BRACKET || tt === LEFT_CURLY) {
-            // Need to unget to parse the full destructured expression.
-            this.t.unget();
-
-            var dexp = this.DestructuringExpression(true);
-
-            n2 = this.newNode({ type: IDENTIFIER,
-                                name: dexp,
-                                readOnly: n.type === CONST });
-            n.push(n2);
-            pushDestructuringVarDecls(n2.name.destructuredNames, s);
-            n.destructurings.push({ exp: dexp, decl: n2 });
-
-            if (this.x.inForLoopInit && this.peek() === IN) {
-                continue;
-            }
-
-            this.mustMatch(ASSIGN);
-            if (this.t.token.assignOp)
-                this.fail("Invalid variable initialization");
-
-            n2.blockComment = this.t.lastBlockComment();
-            n2.initializer = this.AssignExpression();
-
-            continue;
-        }
-
-        if (tt !== IDENTIFIER)
-            this.fail("missing variable name");
-
-        n2 = this.newNode({ type: IDENTIFIER,
-                            name: this.t.token.value,
-                            readOnly: n.type === CONST });
-        n.push(n2);
-        s.varDecls.push(n2);
-
-        if (this.match(ASSIGN)) {
-            var comment = this.t.lastBlockComment();
-            if (this.t.token.assignOp)
-                this.fail("Invalid variable initialization");
-
-            n2.initializer = this.AssignExpression();
-        } else {
-            var comment = this.t.lastBlockComment();
-        }
-        n2.blockComment = comment;
-    } while (this.match(COMMA));
-
-    return n;
-}
-
-/*
- * LetBlock :: (boolean) -> node
- *
- * Does not handle let inside of for loop init.
- */
-Pp.LetBlock = function LetBlock(isStatement) {
-    var n, n2;
-
-    // t.token.type must be LET
-    n = this.newNode({ type: LET_BLOCK, varDecls: [] });
-    this.mustMatch(LEFT_PAREN);
-    n.variables = this.Variables(n);
-    this.mustMatch(RIGHT_PAREN);
-
-    if (isStatement && this.peek() !== LEFT_CURLY) {
-        /*
-         * If this is really an expression in let statement guise, then we
-         * need to wrap the LET_BLOCK node in a SEMICOLON node so that we pop
-         * the return value of the expression.
-         */
-        n2 = this.newNode({ type: SEMICOLON, expression: n });
-        isStatement = false;
-    }
-
-    if (isStatement)
-        n.block = this.Block();
-    else
-        n.expression = this.AssignExpression();
-
-    return n;
-}
-
-Pp.checkDestructuring = function checkDestructuring(n, simpleNamesOnly) {
-    if (n.type === ARRAY_COMP)
-        this.fail("Invalid array comprehension left-hand side");
-    if (n.type !== ARRAY_INIT && n.type !== OBJECT_INIT)
-        return;
-
-    var lhss = {};
-    var nn, n2, idx, sub, cc, c = n.children;
-    for (var i = 0, j = c.length; i < j; i++) {
-        if (!(nn = c[i]))
-            continue;
-        if (nn.type === PROPERTY_INIT) {
-            cc = nn.children;
-            sub = cc[1];
-            idx = cc[0].value;
-        } else if (n.type === OBJECT_INIT) {
-            // Do we have destructuring shorthand {foo, bar}?
-            sub = nn;
-            idx = nn.value;
-        } else {
-            sub = nn;
-            idx = i;
-        }
-
-        if (sub.type === ARRAY_INIT || sub.type === OBJECT_INIT) {
-            lhss[idx] = this.checkDestructuring(sub, simpleNamesOnly);
-        } else {
-            if (simpleNamesOnly && sub.type !== IDENTIFIER) {
-                // In declarations, lhs must be simple names
-                this.fail("missing name in pattern");
-            }
-
-            lhss[idx] = sub;
-        }
-    }
-
-    return lhss;
-}
-
-Pp.DestructuringExpression = function DestructuringExpression(simpleNamesOnly) {
-    var n = this.PrimaryExpression();
-    // Keep the list of lefthand sides for varDecls
-    n.destructuredNames = this.checkDestructuring(n, simpleNamesOnly);
-    return n;
-}
-
-Pp.GeneratorExpression = function GeneratorExpression(e) {
-    return this.newNode({ type: GENERATOR,
-                          expression: e,
-                          tail: this.ComprehensionTail() });
-}
-
-Pp.ComprehensionTail = function ComprehensionTail() {
-    var body, n, n2, n3, p;
-
-    // t.token.type must be FOR
-    body = this.newNode({ type: COMP_TAIL });
-
-    do {
-        // Comprehension tails are always for..in loops.
-        n = this.newNode({ type: FOR_IN, isLoop: true });
-        if (this.match(IDENTIFIER)) {
-            // But sometimes they're for each..in.
-            if (this.mozillaMode && this.t.token.value === "each")
-                n.isEach = true;
-            else
-                this.t.unget();
-        }
-        p = this.MaybeLeftParen();
-        switch(this.t.get()) {
-          case LEFT_BRACKET:
-          case LEFT_CURLY:
-            this.t.unget();
-            // Destructured left side of for in comprehension tails.
-            n.iterator = this.DestructuringExpression();
-            break;
-
-          case IDENTIFIER:
-            n.iterator = n3 = this.newNode({ type: IDENTIFIER });
-            n3.name = n3.value;
-            n.varDecl = n2 = this.newNode({ type: VAR });
-            n2.push(n3);
-            this.x.parentScript.varDecls.push(n3);
-            // Don't add to varDecls since the semantics of comprehensions is
-            // such that the variables are in their own function when
-            // desugared.
-            break;
-
-          default:
-            this.fail("missing identifier");
-        }
-        this.mustMatch(IN);
-        n.object = this.Expression();
-        this.MaybeRightParen(p);
-        body.push(n);
-    } while (this.match(FOR));
-
-    // Optional guard.
-    if (this.match(IF))
-        body.guard = this.HeadExpression();
-
-    return body;
-}
-
-Pp.HeadExpression = function HeadExpression() {
-    var p = this.MaybeLeftParen();
-    var n = this.ParenExpression();
-    this.MaybeRightParen(p);
-    if (p === END && !n.parenthesized) {
-        var tt = this.peek();
-        if (tt !== LEFT_CURLY && !definitions.isStatementStartCode[tt])
-            this.fail("Unparenthesized head followed by unbraced body");
-    }
-    return n;
-}
-
-Pp.ParenExpression = function ParenExpression() {
-    // Always accept the 'in' operator in a parenthesized expression,
-    // where it's unambiguous, even if we might be parsing the init of a
-    // for statement.
-    var x2 = this.x.update({
-        inForLoopInit: this.x.inForLoopInit && (this.t.token.type === LEFT_PAREN)
-    });
-    var n = this.withContext(x2, function() {
-        return this.Expression();
-    });
-    if (this.match(FOR)) {
-        if (n.type === YIELD && !n.parenthesized)
-            this.fail("Yield expression must be parenthesized");
-        if (n.type === COMMA && !n.parenthesized)
-            this.fail("Generator expression must be parenthesized");
-        n = this.GeneratorExpression(n);
-    }
-
-    return n;
-}
-
-/*
- * Expression :: () -> node
- *
- * Top-down expression parser matched against SpiderMonkey.
- */
-Pp.Expression = function Expression() {
-    var n, n2;
-
-    n = this.AssignExpression();
-    if (this.match(COMMA)) {
-        n2 = this.newNode({ type: COMMA });
-        n2.push(n);
-        n = n2;
-        do {
-            n2 = n.children[n.children.length-1];
-            if (n2.type === YIELD && !n2.parenthesized)
-                this.fail("Yield expression must be parenthesized");
-            n.push(this.AssignExpression());
-        } while (this.match(COMMA));
-    }
-
-    return n;
-}
-
-Pp.AssignExpression = function AssignExpression() {
-    var n, lhs;
-
-    // Have to treat yield like an operand because it could be the leftmost
-    // operand of the expression.
-    if (this.match(YIELD, true))
-        return this.ReturnOrYield();
-
-    n = this.newNode({ type: ASSIGN });
-    lhs = this.ConditionalExpression();
-
-    if (!this.match(ASSIGN)) {
-        return lhs;
-    }
-
-    n.blockComment = this.t.lastBlockComment();
-
-    switch (lhs.type) {
-      case OBJECT_INIT:
-      case ARRAY_INIT:
-        lhs.destructuredNames = this.checkDestructuring(lhs);
-        // FALL THROUGH
-      case IDENTIFIER: case DOT: case INDEX: case CALL:
-        break;
-      default:
-        this.fail("Bad left-hand side of assignment");
-        break;
-    }
-
-    n.assignOp = lhs.assignOp = this.t.token.assignOp;
-    n.push(lhs);
-    n.push(this.AssignExpression());
-
-    return n;
-}
-
-Pp.ConditionalExpression = function ConditionalExpression() {
-    var n, n2;
-
-    n = this.OrExpression();
-    if (this.match(HOOK)) {
-        n2 = n;
-        n = this.newNode({ type: HOOK });
-        n.push(n2);
-        /*
-         * Always accept the 'in' operator in the middle clause of a ternary,
-         * where it's unambiguous, even if we might be parsing the init of a
-         * for statement.
-         */
-        var x2 = this.x.update({ inForLoopInit: false });
-        this.withContext(x2, function() {
-            n.push(this.AssignExpression());
-        });
-        if (!this.match(COLON))
-            this.fail("missing : after ?");
-        n.push(this.AssignExpression());
-    }
-
-    return n;
-}
-
-Pp.OrExpression = function OrExpression() {
-    var n, n2;
-
-    n = this.AndExpression();
-    while (this.match(OR)) {
-        n2 = this.newNode();
-        n2.push(n);
-        n2.push(this.AndExpression());
-        n = n2;
-    }
-
-    return n;
-}
-
-Pp.AndExpression = function AndExpression() {
-    var n, n2;
-
-    n = this.BitwiseOrExpression();
-    while (this.match(AND)) {
-        n2 = this.newNode();
-        n2.push(n);
-        n2.push(this.BitwiseOrExpression());
-        n = n2;
-    }
-
-    return n;
-}
-
-Pp.BitwiseOrExpression = function BitwiseOrExpression() {
-    var n, n2;
-
-    n = this.BitwiseXorExpression();
-    while (this.match(BITWISE_OR)) {
-        n2 = this.newNode();
-        n2.push(n);
-        n2.push(this.BitwiseXorExpression());
-        n = n2;
-    }
-
-    return n;
-}
-
-Pp.BitwiseXorExpression = function BitwiseXorExpression() {
-    var n, n2;
-
-    n = this.BitwiseAndExpression();
-    while (this.match(BITWISE_XOR)) {
-        n2 = this.newNode();
-        n2.push(n);
-        n2.push(this.BitwiseAndExpression());
-        n = n2;
-    }
-
-    return n;
-}
-
-Pp.BitwiseAndExpression = function BitwiseAndExpression() {
-    var n, n2;
-
-    n = this.EqualityExpression();
-    while (this.match(BITWISE_AND)) {
-        n2 = this.newNode();
-        n2.push(n);
-        n2.push(this.EqualityExpression());
-        n = n2;
-    }
-
-    return n;
-}
-
-Pp.EqualityExpression = function EqualityExpression() {
-    var n, n2;
-
-    n = this.RelationalExpression();
-    while (this.match(EQ) || this.match(NE) ||
-           this.match(STRICT_EQ) || this.match(STRICT_NE)) {
-        n2 = this.newNode();
-        n2.push(n);
-        n2.push(this.RelationalExpression());
-        n = n2;
-    }
-
-    return n;
-}
-
-Pp.RelationalExpression = function RelationalExpression() {
-    var n, n2;
-
-    /*
-     * Uses of the in operator in shiftExprs are always unambiguous,
-     * so unset the flag that prohibits recognizing it.
-     */
-    var x2 = this.x.update({ inForLoopInit: false });
-    this.withContext(x2, function() {
-        n = this.ShiftExpression();
-        while ((this.match(LT) || this.match(LE) || this.match(GE) || this.match(GT) ||
-                (!this.x.inForLoopInit && this.match(IN)) ||
-                this.match(INSTANCEOF))) {
-            n2 = this.newNode();
-            n2.push(n);
-            n2.push(this.ShiftExpression());
-            n = n2;
-        }
-    });
-
-    return n;
-}
-
-Pp.ShiftExpression = function ShiftExpression() {
-    var n, n2;
-
-    n = this.AddExpression();
-    while (this.match(LSH) || this.match(RSH) || this.match(URSH)) {
-        n2 = this.newNode();
-        n2.push(n);
-        n2.push(this.AddExpression());
-        n = n2;
-    }
-
-    return n;
-}
-
-Pp.AddExpression = function AddExpression() {
-    var n, n2;
-
-    n = this.MultiplyExpression();
-    while (this.match(PLUS) || this.match(MINUS)) {
-        n2 = this.newNode();
-        n2.push(n);
-        n2.push(this.MultiplyExpression());
-        n = n2;
-    }
-
-    return n;
-}
-
-Pp.MultiplyExpression = function MultiplyExpression() {
-    var n, n2;
-
-    n = this.UnaryExpression();
-    while (this.match(MUL) || this.match(DIV) || this.match(MOD)) {
-        n2 = this.newNode();
-        n2.push(n);
-        n2.push(this.UnaryExpression());
-        n = n2;
-    }
-
-    return n;
-}
-
-Pp.UnaryExpression = function UnaryExpression() {
-    var n, n2, tt;
-
-    switch (tt = this.t.get(true)) {
-      case DELETE: case VOID: case TYPEOF:
-      case NOT: case BITWISE_NOT: case PLUS: case MINUS:
-        if (tt === PLUS)
-            n = this.newNode({ type: UNARY_PLUS });
-        else if (tt === MINUS)
-            n = this.newNode({ type: UNARY_MINUS });
-        else
-            n = this.newNode();
-        n.push(this.UnaryExpression());
-        break;
-
-      case INCREMENT:
-      case DECREMENT:
-        // Prefix increment/decrement.
-        n = this.newNode();
-        n.push(this.MemberExpression(true));
-        break;
-
-      default:
-        this.t.unget();
-        n = this.MemberExpression(true);
-
-        // Don't look across a newline boundary for a postfix {in,de}crement.
-        if (this.t.tokens[(this.t.tokenIndex + this.t.lookahead - 1) & 3].lineno ===
-            this.t.lineno) {
-            if (this.match(INCREMENT) || this.match(DECREMENT)) {
-                n2 = this.newNode({ postfix: true });
-                n2.push(n);
-                n = n2;
-            }
-        }
-        break;
-    }
-
-    return n;
-}
-
-Pp.MemberExpression = function MemberExpression(allowCallSyntax) {
-    var n, n2, name, tt;
-
-    if (this.match(NEW)) {
-        n = this.newNode();
-        n.push(this.MemberExpression(false));
-        if (this.match(LEFT_PAREN)) {
-            n.type = NEW_WITH_ARGS;
-            n.push(this.ArgumentList());
-        }
-    } else {
-        n = this.PrimaryExpression();
-    }
-
-    while ((tt = this.t.get()) !== END) {
-        switch (tt) {
-          case DOT:
-            n2 = this.newNode();
-            n2.push(n);
-            n2.push(this.IdentifierName());
-            break;
-
-          case LEFT_BRACKET:
-            n2 = this.newNode({ type: INDEX });
-            n2.push(n);
-            n2.push(this.Expression());
-            this.mustMatch(RIGHT_BRACKET);
-            break;
-
-          case LEFT_PAREN:
-            if (allowCallSyntax) {
-                n2 = this.newNode({ type: CALL });
-                n2.push(n);
-                n2.push(this.ArgumentList());
-                break;
-            }
-
-            // FALL THROUGH
-          default:
-            this.t.unget();
-            return n;
-        }
-
-        n = n2;
-    }
-
-    return n;
-}
-
-Pp.ArgumentList = function ArgumentList() {
-    var n, n2;
-
-    n = this.newNode({ type: LIST });
-    if (this.match(RIGHT_PAREN, true))
-        return n;
-    do {
-        n2 = this.AssignExpression();
-        if (n2.type === YIELD && !n2.parenthesized && this.peek() === COMMA)
-            this.fail("Yield expression must be parenthesized");
-        if (this.match(FOR)) {
-            n2 = this.GeneratorExpression(n2);
-            if (n.children.length > 1 || this.peek(true) === COMMA)
-                this.fail("Generator expression must be parenthesized");
-        }
-        n.push(n2);
-    } while (this.match(COMMA));
-    this.mustMatch(RIGHT_PAREN);
-
-    return n;
-}
-
-Pp.PrimaryExpression = function PrimaryExpression() {
-    var n, n2, tt = this.t.get(true);
-
-    switch (tt) {
-      case FUNCTION:
-        n = this.FunctionDefinition(false, EXPRESSED_FORM);
-        break;
-
-      case LEFT_BRACKET:
-        n = this.newNode({ type: ARRAY_INIT });
-        while ((tt = this.peek(true)) !== RIGHT_BRACKET) {
-            if (tt === COMMA) {
-                this.t.get();
-                n.push(null);
-                continue;
-            }
-            n.push(this.AssignExpression());
-            if (tt !== COMMA && !this.match(COMMA))
-                break;
-        }
-
-        // If we matched exactly one element and got a FOR, we have an
-        // array comprehension.
-        if (n.children.length === 1 && this.match(FOR)) {
-            n2 = this.newNode({ type: ARRAY_COMP,
-                                expression: n.children[0],
-                                tail: this.ComprehensionTail() });
-            n = n2;
-        }
-        this.mustMatch(RIGHT_BRACKET);
-        break;
-
-      case LEFT_CURLY:
-        var id, fd;
-        n = this.newNode({ type: OBJECT_INIT });
-
-        object_init:
-        if (!this.match(RIGHT_CURLY)) {
-            do {
-                tt = this.t.get();
-                if ((this.t.token.value === "get" || this.t.token.value === "set") &&
-                    this.peek() === IDENTIFIER) {
-                    n.push(this.FunctionDefinition(true, EXPRESSED_FORM));
-                } else {
-                    var comments = this.t.blockComments;
-                    switch (tt) {
-                      case IDENTIFIER: case NUMBER: case STRING:
-                        id = this.newNode({ type: IDENTIFIER });
-                        break;
-                      case RIGHT_CURLY:
-                        break object_init;
-                      default:
-                        if (this.t.token.value in definitions.keywords) {
-                            id = this.newNode({ type: IDENTIFIER });
-                            break;
-                        }
-                        this.fail("Invalid property name");
-                    }
-                    if (this.match(COLON)) {
-                        n2 = this.newNode({ type: PROPERTY_INIT });
-                        n2.push(id);
-                        n2.push(this.AssignExpression());
-                        n2.blockComments = comments;
-                        n.push(n2);
-                    } else {
-                        // Support, e.g., |var {x, y} = o| as destructuring shorthand
-                        // for |var {x: x, y: y} = o|, per proposed JS2/ES4 for JS1.8.
-                        if (this.peek() !== COMMA && this.peek() !== RIGHT_CURLY)
-                            this.fail("missing : after property");
-                        n.push(id);
-                    }
-                }
-            } while (this.match(COMMA));
-            this.mustMatch(RIGHT_CURLY);
-        }
-        break;
-
-      case LEFT_PAREN:
-        n = this.ParenExpression();
-        this.mustMatch(RIGHT_PAREN);
-        n.parenthesized = true;
-        break;
-
-      case LET:
-        n = this.LetBlock(false);
-        break;
-
-      case NULL: case THIS: case TRUE: case FALSE:
-      case IDENTIFIER: case NUMBER: case STRING: case REGEXP:
-        n = this.newNode();
-        break;
-
-      default:
-        this.fail("missing operand; found " + definitions.tokens[tt]);
-        break;
-    }
-
-    return n;
-}
-
-/*
- * parse :: (source, filename, line number) -> node
- */
-function parse(s, f, l) {
-    var t = new Tokenizer(s, f, l, options.allowHTMLComments);
-    var p = new Parser(t);
-    return p.Script(false, false, true);
-}
-
-/*
- * parseFunction :: (source, boolean,
- *                   DECLARED_FORM or EXPRESSED_FORM or STATEMENT_FORM,
- *                   filename, line number)
- *               -> node
- */
-function parseFunction(s, requireName, form, f, l) {
-    var t = new Tokenizer(s, f, l);
-    var p = new Parser(t);
-    p.x = new StaticContext(null, null, false, false, false);
-    return p.FunctionDefinition(requireName, form);
-}
-
-/*
- * parseStdin :: (source, {line number}, string, (string) -> boolean) -> program node
- */
-function parseStdin(s, ln, prefix, isCommand) {
-    // the special .begin command is only recognized at the beginning
-    if (s.match(/^[\s]*\.begin[\s]*$/)) {
-        ++ln.value;
-        return parseMultiline(ln, prefix);
-    }
-
-    // commands at the beginning are treated as the entire input
-    if (isCommand(s.trim()))
-        s = "";
-
-    for (;;) {
-        try {
-            var t = new Tokenizer(s, "stdin", ln.value, false);
-            var p = new Parser(t);
-            var n = p.Script(false, false);
-            ln.value = t.lineno;
-            return n;
-        } catch (e) {
-            if (!p.unexpectedEOF)
-                throw e;
-
-            // commands in the middle are not treated as part of the input
-            var more;
-            do {
-                if (prefix)
-                    putstr(prefix);
-                more = readline();
-                if (!more)
-                    throw e;
-            } while (isCommand(more.trim()));
-
-            s += "\n" + more;
-        }
-    }
-}
-
-/*
- * parseMultiline :: ({line number}, string | null) -> program node
- */
-function parseMultiline(ln, prefix) {
-    var s = "";
-    for (;;) {
-        if (prefix)
-            putstr(prefix);
-        var more = readline();
-        if (more === null)
-            return null;
-        // the only command recognized in multiline mode is .end
-        if (more.match(/^[\s]*\.end[\s]*$/))
-            break;
-        s += "\n" + more;
-    }
-    var t = new Tokenizer(s, "stdin", ln.value, false);
-    var p = new Parser(t);
-    var n = p.Script(false, false);
-    ln.value = t.lineno;
-    return n;
-}
-
-exports.parse = parse;
-exports.parseStdin = parseStdin;
-exports.parseFunction = parseFunction;
-exports.Node = Node;
-exports.DECLARED_FORM = DECLARED_FORM;
-exports.EXPRESSED_FORM = EXPRESSED_FORM;
-exports.STATEMENT_FORM = STATEMENT_FORM;
-exports.Tokenizer = Tokenizer;
-exports.Parser = Parser;
-exports.Module = Module;
-exports.Export = Export;
-
-});/* vim: set sw=4 ts=4 et tw=78: */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Narcissus JavaScript engine.
- *
- * The Initial Developer of the Original Code is
- * Brendan Eich <brendan@mozilla.org>.
- * Portions created by the Initial Developer are Copyright (C) 2004
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Tom Austin <taustin@ucsc.edu>
- *   Brendan Eich <brendan@mozilla.org>
- *   Shu-Yu Guo <shu@rfrn.org>
- *   Stephan Herhut <stephan.a.herhut@intel.com>
- *   Dave Herman <dherman@mozilla.com>
- *   Dimitris Vardoulakis <dimvar@ccs.neu.edu>
- *   Patrick Walton <pcwalton@mozilla.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * Narcissus - JS implemented in JS.
- *
- * Lexical scanner.
- */
-
- define('ace/narcissus/lexer', ['require', 'exports', 'module' , 'ace/narcissus/definitions'], function(require, exports, module) {
-
-var definitions = require('./definitions');
-
-// Set constants in the local scope.
-eval(definitions.consts);
-
-// Build up a trie of operator tokens.
-var opTokens = {};
-for (var op in definitions.opTypeNames) {
-    if (op === '\n' || op === '.')
-        continue;
-
-    var node = opTokens;
-    for (var i = 0; i < op.length; i++) {
-        var ch = op[i];
-        if (!(ch in node))
-            node[ch] = {};
-        node = node[ch];
-        node.op = op;
-    }
-}
-
-/*
- * Since JavaScript provides no convenient way to determine if a
- * character is in a particular Unicode category, we use
- * metacircularity to accomplish this (oh yeaaaah!)
- */
-function isValidIdentifierChar(ch, first) {
-    // check directly for ASCII
-    if (ch <= "\u007F") {
-        if ((ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z') || ch === '$' || ch === '_' ||
-            (!first && (ch >= '0' && ch <= '9'))) {
-            return true;
-        }
-        return false;
-    }
-
-    // create an object to test this in
-    var x = {};
-    x["x"+ch] = true;
-    x[ch] = true;
-
-    // then use eval to determine if it's a valid character
-    var valid = false;
-    try {
-        valid = (Function("x", "return (x." + (first?"":"x") + ch + ");")(x) === true);
-    } catch (ex) {}
-
-    return valid;
-}
-
-function isIdentifier(str) {
-    if (typeof str !== "string")
-        return false;
-
-    if (str.length === 0)
-        return false;
-
-    if (!isValidIdentifierChar(str[0], true))
-        return false;
-
-    for (var i = 1; i < str.length; i++) {
-        if (!isValidIdentifierChar(str[i], false))
-            return false;
-    }
-
-    return true;
-}
-
-/*
- * Tokenizer :: (source, filename, line number, boolean) -> Tokenizer
- */
-function Tokenizer(s, f, l, allowHTMLComments) {
-    this.cursor = 0;
-    this.source = String(s);
-    this.tokens = [];
-    this.tokenIndex = 0;
-    this.lookahead = 0;
-    this.scanNewlines = false;
-    this.filename = f || "";
-    this.lineno = l || 1;
-    this.allowHTMLComments = allowHTMLComments;
-    this.blockComments = null;
-}
-
-Tokenizer.prototype = {
-    get done() {
-        // We need to set scanOperand to true here because the first thing
-        // might be a regexp.
-        return this.peek(true) === END;
-    },
-
-    get token() {
-        return this.tokens[this.tokenIndex];
-    },
-
-    match: function (tt, scanOperand, keywordIsName) {
-        return this.get(scanOperand, keywordIsName) === tt || this.unget();
-    },
-
-    mustMatch: function (tt, keywordIsName) {
-        if (!this.match(tt, false, keywordIsName)) {
-            throw this.newSyntaxError("Missing " +
-                                      definitions.tokens[tt].toLowerCase());
-        }
-        return this.token;
-    },
-
-    peek: function (scanOperand) {
-        var tt, next;
-        if (this.lookahead) {
-            next = this.tokens[(this.tokenIndex + this.lookahead) & 3];
-            tt = (this.scanNewlines && next.lineno !== this.lineno)
-                ? NEWLINE
-                : next.type;
-        } else {
-            tt = this.get(scanOperand);
-            this.unget();
-        }
-        return tt;
-    },
-
-    peekOnSameLine: function (scanOperand) {
-        this.scanNewlines = true;
-        var tt = this.peek(scanOperand);
-        this.scanNewlines = false;
-        return tt;
-    },
-
-    lastBlockComment: function() {
-        var length = this.blockComments.length;
-        return length ? this.blockComments[length - 1] : null;
-    },
-
-    // Eat comments and whitespace.
-    skip: function () {
-        var input = this.source;
-        this.blockComments = [];
-        for (;;) {
-            var ch = input[this.cursor++];
-            var next = input[this.cursor];
-            // handle \r, \r\n and (always preferable) \n
-            if (ch === '\r') {
-                // if the next character is \n, we don't care about this at all
-                if (next === '\n') continue;
-
-                // otherwise, we want to consider this as a newline
-                ch = '\n';
-            }
-
-            if (ch === '\n' && !this.scanNewlines) {
-                this.lineno++;
-            } else if (ch === '/' && next === '*') {
-                var commentStart = ++this.cursor;
-                for (;;) {
-                    ch = input[this.cursor++];
-                    if (ch === undefined)
-                        throw this.newSyntaxError("Unterminated comment");
-
-                    if (ch === '*') {
-                        next = input[this.cursor];
-                        if (next === '/') {
-                            var commentEnd = this.cursor - 1;
-                            this.cursor++;
-                            break;
-                        }
-                    } else if (ch === '\n') {
-                        this.lineno++;
-                    }
-                }
-                this.blockComments.push(input.substring(commentStart, commentEnd));
-            } else if ((ch === '/' && next === '/') ||
-                       (this.allowHTMLComments && ch === '<' && next === '!' &&
-                        input[this.cursor + 1] === '-' && input[this.cursor + 2] === '-' &&
-                        (this.cursor += 2))) {
-                this.cursor++;
-                for (;;) {
-                    ch = input[this.cursor++];
-                    next = input[this.cursor];
-                    if (ch === undefined)
-                        return;
-
-                    if (ch === '\r') {
-                        // check for \r\n
-                        if (next !== '\n') ch = '\n';
-                    }
-
-                    if (ch === '\n') {
-                        if (this.scanNewlines) {
-                            this.cursor--;
-                        } else {
-                            this.lineno++;
-                        }
-                        break;
-                    }
-                }
-            } else if (!(ch in definitions.whitespace)) {
-                this.cursor--;
-                return;
-            }
-        }
-    },
-
-    // Lex the exponential part of a number, if present. Return true iff an
-    // exponential part was found.
-    lexExponent: function() {
-        var input = this.source;
-        var next = input[this.cursor];
-        if (next === 'e' || next === 'E') {
-            this.cursor++;
-            ch = input[this.cursor++];
-            if (ch === '+' || ch === '-')
-                ch = input[this.cursor++];
-
-            if (ch < '0' || ch > '9')
-                throw this.newSyntaxError("Missing exponent");
-
-            do {
-                ch = input[this.cursor++];
-            } while (ch >= '0' && ch <= '9');
-            this.cursor--;
-
-            return true;
-        }
-
-        return false;
-    },
-
-    lexZeroNumber: function (ch) {
-        var token = this.token, input = this.source;
-        token.type = NUMBER;
-
-        ch = input[this.cursor++];
-        if (ch === '.') {
-            do {
-                ch = input[this.cursor++];
-            } while (ch >= '0' && ch <= '9');
-            this.cursor--;
-
-            this.lexExponent();
-            token.value = parseFloat(
-                input.substring(token.start, this.cursor));
-        } else if (ch === 'x' || ch === 'X') {
-            do {
-                ch = input[this.cursor++];
-            } while ((ch >= '0' && ch <= '9') || (ch >= 'a' && ch <= 'f') ||
-                     (ch >= 'A' && ch <= 'F'));
-            this.cursor--;
-
-            token.value = parseInt(input.substring(token.start, this.cursor));
-        } else if (ch >= '0' && ch <= '7') {
-            do {
-                ch = input[this.cursor++];
-            } while (ch >= '0' && ch <= '7');
-            this.cursor--;
-
-            token.value = parseInt(input.substring(token.start, this.cursor));
-        } else {
-            this.cursor--;
-            this.lexExponent();     // 0E1, &c.
-            token.value = 0;
-        }
-    },
-
-    lexNumber: function (ch) {
-        var token = this.token, input = this.source;
-        token.type = NUMBER;
-
-        var floating = false;
-        do {
-            ch = input[this.cursor++];
-            if (ch === '.' && !floating) {
-                floating = true;
-                ch = input[this.cursor++];
-            }
-        } while (ch >= '0' && ch <= '9');
-
-        this.cursor--;
-
-        var exponent = this.lexExponent();
-        floating = floating || exponent;
-
-        var str = input.substring(token.start, this.cursor);
-        token.value = floating ? parseFloat(str) : parseInt(str);
-    },
-
-    lexDot: function (ch) {
-        var token = this.token, input = this.source;
-        var next = input[this.cursor];
-        if (next >= '0' && next <= '9') {
-            do {
-                ch = input[this.cursor++];
-            } while (ch >= '0' && ch <= '9');
-            this.cursor--;
-
-            this.lexExponent();
-
-            token.type = NUMBER;
-            token.value = parseFloat(
-                input.substring(token.start, this.cursor));
-        } else {
-            token.type = DOT;
-            token.assignOp = null;
-            token.value = '.';
-        }
-    },
-
-    lexString: function (ch) {
-        var token = this.token, input = this.source;
-        token.type = STRING;
-
-        var hasEscapes = false;
-        var delim = ch;
-        if (input.length <= this.cursor)
-            throw this.newSyntaxError("Unterminated string literal");
-        while ((ch = input[this.cursor++]) !== delim) {
-            if (ch == '\n' || ch == '\r')
-                throw this.newSyntaxError("Unterminated string literal");
-            if (this.cursor == input.length)
-                throw this.newSyntaxError("Unterminated string literal");
-            if (ch === '\\') {
-                hasEscapes = true;
-                if (++this.cursor == input.length)
-                    throw this.newSyntaxError("Unterminated string literal");
-            }
-        }
-
-        token.value = hasEscapes
-            ? eval(input.substring(token.start, this.cursor))
-            : input.substring(token.start + 1, this.cursor - 1);
-    },
-
-    lexRegExp: function (ch) {
-        var token = this.token, input = this.source;
-        token.type = REGEXP;
-
-        do {
-            ch = input[this.cursor++];
-            if (ch === '\\') {
-                this.cursor++;
-            } else if (ch === '[') {
-                do {
-                    if (ch === undefined)
-                        throw this.newSyntaxError("Unterminated character class");
-
-                    if (ch === '\\')
-                        this.cursor++;
-
-                    ch = input[this.cursor++];
-                } while (ch !== ']');
-            } else if (ch === undefined) {
-                throw this.newSyntaxError("Unterminated regex");
-            }
-        } while (ch !== '/');
-
-        do {
-            ch = input[this.cursor++];
-        } while (ch >= 'a' && ch <= 'z');
-
-        this.cursor--;
-
-        token.value = eval(input.substring(token.start, this.cursor));
-    },
-
-    lexOp: function (ch) {
-        var token = this.token, input = this.source;
-
-        // A bit ugly, but it seems wasteful to write a trie lookup routine
-        // for only 3 characters...
-        var node = opTokens[ch];
-        var next = input[this.cursor];
-        if (next in node) {
-            node = node[next];
-            this.cursor++;
-            next = input[this.cursor];
-            if (next in node) {
-                node = node[next];
-                this.cursor++;
-                next = input[this.cursor];
-            }
-        }
-
-        var op = node.op;
-        if (definitions.assignOps[op] && input[this.cursor] === '=') {
-            this.cursor++;
-            token.type = ASSIGN;
-            token.assignOp = definitions.tokenIds[definitions.opTypeNames[op]];
-            op += '=';
-        } else {
-            token.type = definitions.tokenIds[definitions.opTypeNames[op]];
-            token.assignOp = null;
-        }
-
-        token.value = op;
-    },
-
-    // FIXME: Unicode escape sequences
-    lexIdent: function (ch, keywordIsName) {
-        var token = this.token;
-        var id = ch;
-
-        while ((ch = this.getValidIdentifierChar(false)) !== null) {
-            id += ch;
-        }
-
-        token.type = IDENTIFIER;
-        token.value = id;
-
-        if (keywordIsName)
-            return;
-
-        var kw;
-
-        if (this.parser.mozillaMode) {
-            kw = definitions.mozillaKeywords[id];
-            if (kw) {
-                token.type = kw;
-                return;
-            }
-        }
-
-        if (this.parser.x.strictMode) {
-            kw = definitions.strictKeywords[id];
-            if (kw) {
-                token.type = kw;
-                return;
-            }
-        }
-
-        kw = definitions.keywords[id];
-        if (kw)
-            token.type = kw;
-    },
-
-    /*
-     * Tokenizer.get :: ([boolean[, boolean]]) -> token type
-     *
-     * Consume input *only* if there is no lookahead.
-     * Dispatch to the appropriate lexing function depending on the input.
-     */
-    get: function (scanOperand, keywordIsName) {
-        var token;
-        while (this.lookahead) {
-            --this.lookahead;
-            this.tokenIndex = (this.tokenIndex + 1) & 3;
-            token = this.tokens[this.tokenIndex];
-            if (token.type !== NEWLINE || this.scanNewlines)
-                return token.type;
-        }
-
-        this.skip();
-
-        this.tokenIndex = (this.tokenIndex + 1) & 3;
-        token = this.tokens[this.tokenIndex];
-        if (!token)
-            this.tokens[this.tokenIndex] = token = {};
-
-        var input = this.source;
-        if (this.cursor >= input.length)
-            return token.type = END;
-
-        token.start = this.cursor;
-        token.lineno = this.lineno;
-
-        var ich = this.getValidIdentifierChar(true);
-        var ch = (ich === null) ? input[this.cursor++] : null;
-        if (ich !== null) {
-            this.lexIdent(ich, keywordIsName);
-        } else if (scanOperand && ch === '/') {
-            this.lexRegExp(ch);
-        } else if (ch in opTokens) {
-            this.lexOp(ch);
-        } else if (ch === '.') {
-            this.lexDot(ch);
-        } else if (ch >= '1' && ch <= '9') {
-            this.lexNumber(ch);
-        } else if (ch === '0') {
-            this.lexZeroNumber(ch);
-        } else if (ch === '"' || ch === "'") {
-            this.lexString(ch);
-        } else if (this.scanNewlines && (ch === '\n' || ch === '\r')) {
-            // if this was a \r, look for \r\n
-            if (ch === '\r' && input[this.cursor] === '\n') this.cursor++;
-            token.type = NEWLINE;
-            token.value = '\n';
-            this.lineno++;
-        } else {
-            throw this.newSyntaxError("Illegal token");
-        }
-
-        token.end = this.cursor;
-        return token.type;
-    },
-
-    /*
-     * Tokenizer.unget :: void -> undefined
-     *
-     * Match depends on unget returning undefined.
-     */
-    unget: function () {
-        if (++this.lookahead === 4) throw "PANIC: too much lookahead!";
-        this.tokenIndex = (this.tokenIndex - 1) & 3;
-    },
-
-    newSyntaxError: function (m) {
-        m = (this.filename ? this.filename + ":" : "") + this.lineno + ": " + m;
-        var e = new SyntaxError(m, this.filename, this.lineno);
-        e.source = this.source;
-        e.cursor = this.lookahead
-            ? this.tokens[(this.tokenIndex + this.lookahead) & 3].start
-            : this.cursor;
-        return e;
-    },
-
-
-    /* Gets a single valid identifier char from the input stream, or null
-     * if there is none.
-     */
-    getValidIdentifierChar: function(first) {
-        var input = this.source;
-        if (this.cursor >= input.length) return null;
-        var ch = input[this.cursor];
-
-        // first check for \u escapes
-        if (ch === '\\' && input[this.cursor+1] === 'u') {
-            // get the character value
-            try {
-                ch = String.fromCharCode(parseInt(
-                    input.substring(this.cursor + 2, this.cursor + 6),
-                    16));
-            } catch (ex) {
-                return null;
-            }
-            this.cursor += 5;
-        }
-
-        var valid = isValidIdentifierChar(ch, first);
-        if (valid) this.cursor++;
-        return (valid ? ch : null);
-    },
-};
-
-
-exports.isIdentifier = isIdentifier;
-exports.Tokenizer = Tokenizer;
-
-});/* vim: set sw=4 ts=4 et tw=78: */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Narcissus JavaScript engine.
- *
- * The Initial Developer of the Original Code is
- * Brendan Eich <brendan@mozilla.org>.
- * Portions created by the Initial Developer are Copyright (C) 2004
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Tom Austin <taustin@ucsc.edu>
- *   Brendan Eich <brendan@mozilla.org>
- *   Shu-Yu Guo <shu@rfrn.org>
- *   Dave Herman <dherman@mozilla.com>
- *   Dimitris Vardoulakis <dimvar@ccs.neu.edu>
- *   Patrick Walton <pcwalton@mozilla.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * Narcissus - JS implemented in JS.
- *
- * Well-known constants and lookup tables.  Many consts are generated from the
- * tokens table via eval to minimize redundancy, so consumers must be compiled
- * separately to take advantage of the simple switch-case constant propagation
- * done by SpiderMonkey.
- */
-
-define('ace/narcissus/definitions', ['require', 'exports', 'module' ], function(require, exports, module) {
-
-var tokens = [
-    // End of source.
-    "END",
-
-    // Operators and punctuators.  Some pair-wise order matters, e.g. (+, -)
-    // and (UNARY_PLUS, UNARY_MINUS).
-    "\n", ";",
-    ",",
-    "=",
-    "?", ":", "CONDITIONAL",
-    "||",
-    "&&",
-    "|",
-    "^",
-    "&",
-    "==", "!=", "===", "!==",
-    "<", "<=", ">=", ">",
-    "<<", ">>", ">>>",
-    "+", "-",
-    "*", "/", "%",
-    "!", "~", "UNARY_PLUS", "UNARY_MINUS",
-    "++", "--",
-    ".",
-    "[", "]",
-    "{", "}",
-    "(", ")",
-
-    // Nonterminal tree node type codes.
-    "SCRIPT", "BLOCK", "LABEL", "FOR_IN", "CALL", "NEW_WITH_ARGS", "INDEX",
-    "ARRAY_INIT", "OBJECT_INIT", "PROPERTY_INIT", "GETTER", "SETTER",
-    "GROUP", "LIST", "LET_BLOCK", "ARRAY_COMP", "GENERATOR", "COMP_TAIL",
-
-    // Contextual keywords.
-    "IMPLEMENTS", "INTERFACE", "LET", "MODULE", "PACKAGE", "PRIVATE",
-    "PROTECTED", "PUBLIC", "STATIC", "USE", "YIELD",
-
-    // Terminals.
-    "IDENTIFIER", "NUMBER", "STRING", "REGEXP",
-
-    // Keywords.
-    "break",
-    "case", "catch", "const", "continue",
-    "debugger", "default", "delete", "do",
-    "else", "export",
-    "false", "finally", "for", "function",
-    "if", "import", "in", "instanceof",
-    "new", "null",
-    "return",
-    "switch",
-    "this", "throw", "true", "try", "typeof",
-    "var", "void",
-    "while", "with",
-];
-
-var strictKeywords = {
-    __proto__: null,
-    "implements": true,
-    "interface": true,
-    "let": true,
-    //"module": true,
-    "package": true,
-    "private": true,
-    "protected": true,
-    "public": true,
-    "static": true,
-    "use": true,
-    "yield": true
-};
-
-var statementStartTokens = [
-    "break",
-    "const", "continue",
-    "debugger", "do",
-    "for",
-    "if",
-    "let",
-    "return",
-    "switch",
-    "throw", "try",
-    "var",
-    "yield",
-    "while", "with",
-];
-
-// Whitespace characters (see ECMA-262 7.2)
-var whitespaceChars = [
-    // normal whitespace:
-    "\u0009", "\u000B", "\u000C", "\u0020", "\u00A0", "\uFEFF",
-
-    // high-Unicode whitespace:
-    "\u1680", "\u180E",
-    "\u2000", "\u2001", "\u2002", "\u2003", "\u2004", "\u2005", "\u2006",
-    "\u2007", "\u2008", "\u2009", "\u200A",
-    "\u202F", "\u205F", "\u3000"
-];
-
-var whitespace = {};
-for (var i = 0; i < whitespaceChars.length; i++) {
-    whitespace[whitespaceChars[i]] = true;
-}
-
-// Operator and punctuator mapping from token to tree node type name.
-// NB: because the lexer doesn't backtrack, all token prefixes must themselves
-// be valid tokens (e.g. !== is acceptable because its prefixes are the valid
-// tokens != and !).
-var opTypeNames = {
-    '\n':   "NEWLINE",
-    ';':    "SEMICOLON",
-    ',':    "COMMA",
-    '?':    "HOOK",
-    ':':    "COLON",
-    '||':   "OR",
-    '&&':   "AND",
-    '|':    "BITWISE_OR",
-    '^':    "BITWISE_XOR",
-    '&':    "BITWISE_AND",
-    '===':  "STRICT_EQ",
-    '==':   "EQ",
-    '=':    "ASSIGN",
-    '!==':  "STRICT_NE",
-    '!=':   "NE",
-    '<<':   "LSH",
-    '<=':   "LE",
-    '<':    "LT",
-    '>>>':  "URSH",
-    '>>':   "RSH",
-    '>=':   "GE",
-    '>':    "GT",
-    '++':   "INCREMENT",
-    '--':   "DECREMENT",
-    '+':    "PLUS",
-    '-':    "MINUS",
-    '*':    "MUL",
-    '/':    "DIV",
-    '%':    "MOD",
-    '!':    "NOT",
-    '~':    "BITWISE_NOT",
-    '.':    "DOT",
-    '[':    "LEFT_BRACKET",
-    ']':    "RIGHT_BRACKET",
-    '{':    "LEFT_CURLY",
-    '}':    "RIGHT_CURLY",
-    '(':    "LEFT_PAREN",
-    ')':    "RIGHT_PAREN"
-};
-
-// Hash of keyword identifier to tokens index.  NB: we must null __proto__ to
-// avoid toString, etc. namespace pollution.
-var keywords = {__proto__: null};
-var mozillaKeywords = {__proto__: null};
-
-// Define const END, etc., based on the token names.  Also map name to index.
-var tokenIds = {};
-
-var hostSupportsEvalConst = (function() {
-    try {
-        return eval("(function(s) { eval(s); return x })('const x = true;')");
-    } catch (e) {
-        return false;
-    }
-})();
-
-// Building up a string to be eval'd in different contexts.
-var consts = hostSupportsEvalConst ? "const " : "var ";
-for (var i = 0, j = tokens.length; i < j; i++) {
-    if (i > 0)
-        consts += ", ";
-    var t = tokens[i];
-    var name;
-    if (/^[a-z]/.test(t)) {
-        name = t.toUpperCase();
-        if (name === "LET" || name === "YIELD")
-            mozillaKeywords[name] = i;
-        if (strictKeywords[name])
-            strictKeywords[name] = i;
-        keywords[t] = i;
-    } else {
-        name = (/^\W/.test(t) ? opTypeNames[t] : t);
-    }
-    consts += name + " = " + i;
-    tokenIds[name] = i;
-    tokens[t] = i;
-}
-consts += ";";
-
-var isStatementStartCode = {__proto__: null};
-for (i = 0, j = statementStartTokens.length; i < j; i++)
-    isStatementStartCode[keywords[statementStartTokens[i]]] = true;
-
-// Map assignment operators to their indexes in the tokens array.
-var assignOps = ['|', '^', '&', '<<', '>>', '>>>', '+', '-', '*', '/', '%'];
-
-for (i = 0, j = assignOps.length; i < j; i++) {
-    t = assignOps[i];
-    assignOps[t] = tokens[t];
-}
-
-function defineGetter(obj, prop, fn, dontDelete, dontEnum) {
-    Object.defineProperty(obj, prop,
-                          { get: fn, configurable: !dontDelete, enumerable: !dontEnum });
-}
-
-function defineGetterSetter(obj, prop, getter, setter, dontDelete, dontEnum) {
-    Object.defineProperty(obj, prop, {
-        get: getter,
-        set: setter,
-        configurable: !dontDelete,
-        enumerable: !dontEnum
-    });
-}
-
-function defineMemoGetter(obj, prop, fn, dontDelete, dontEnum) {
-    Object.defineProperty(obj, prop, {
-        get: function() {
-            var val = fn();
-            defineProperty(obj, prop, val, dontDelete, true, dontEnum);
-            return val;
-        },
-        configurable: true,
-        enumerable: !dontEnum
-    });
-}
-
-function defineProperty(obj, prop, val, dontDelete, readOnly, dontEnum) {
-    Object.defineProperty(obj, prop,
-                          { value: val, writable: !readOnly, configurable: !dontDelete,
-                            enumerable: !dontEnum });
-}
-
-// Returns true if fn is a native function.  (Note: SpiderMonkey specific.)
-function isNativeCode(fn) {
-    // Relies on the toString method to identify native code.
-    return ((typeof fn) === "function") && fn.toString().match(/\[native code\]/);
-}
-
-var Fpapply = Function.prototype.apply;
-
-function apply(f, o, a) {
-    return Fpapply.call(f, [o].concat(a));
-}
-
-var applyNew;
-
-// ES5's bind is a simpler way to implement applyNew
-if (Function.prototype.bind) {
-    applyNew = function applyNew(f, a) {
-        return new (f.bind.apply(f, [,].concat(Array.prototype.slice.call(a))))();
-    };
-} else {
-    applyNew = function applyNew(f, a) {
-        switch (a.length) {
-          case 0:
-            return new f();
-          case 1:
-            return new f(a[0]);
-          case 2:
-            return new f(a[0], a[1]);
-          case 3:
-            return new f(a[0], a[1], a[2]);
-          default:
-            var argStr = "a[0]";
-            for (var i = 1, n = a.length; i < n; i++)
-                argStr += ",a[" + i + "]";
-            return eval("new f(" + argStr + ")");
-        }
-    };
-}
-
-function getPropertyDescriptor(obj, name) {
-    while (obj) {
-        if (({}).hasOwnProperty.call(obj, name))
-            return Object.getOwnPropertyDescriptor(obj, name);
-        obj = Object.getPrototypeOf(obj);
-    }
-}
-
-function getPropertyNames(obj) {
-    var table = Object.create(null, {});
-    while (obj) {
-        var names = Object.getOwnPropertyNames(obj);
-        for (var i = 0, n = names.length; i < n; i++)
-            table[names[i]] = true;
-        obj = Object.getPrototypeOf(obj);
-    }
-    return Object.keys(table);
-}
-
-function getOwnProperties(obj) {
-    var map = {};
-    for (var name in Object.getOwnPropertyNames(obj))
-        map[name] = Object.getOwnPropertyDescriptor(obj, name);
-    return map;
-}
-
-function blacklistHandler(target, blacklist) {
-    var mask = Object.create(null, {});
-    var redirect = Dict.create(blacklist).mapObject(function(name) { return mask; });
-    return mixinHandler(redirect, target);
-}
-
-function whitelistHandler(target, whitelist) {
-    var catchall = Object.create(null, {});
-    var redirect = Dict.create(whitelist).mapObject(function(name) { return target; });
-    return mixinHandler(redirect, catchall);
-}
-
-/*
- * Mixin proxies break the single-inheritance model of prototypes, so
- * the handler treats all properties as own-properties:
- *
- *                  X
- *                  |
- *     +------------+------------+
- *     |                 O       |
- *     |                 |       |
- *     |  O         O    O       |
- *     |  |         |    |       |
- *     |  O    O    O    O       |
- *     |  |    |    |    |       |
- *     |  O    O    O    O    O  |
- *     |  |    |    |    |    |  |
- *     +-(*)--(w)--(x)--(y)--(z)-+
- */
-
-function mixinHandler(redirect, catchall) {
-    function targetFor(name) {
-        return hasOwn(redirect, name) ? redirect[name] : catchall;
-    }
-
-    function getMuxPropertyDescriptor(name) {
-        var desc = getPropertyDescriptor(targetFor(name), name);
-        if (desc)
-            desc.configurable = true;
-        return desc;
-    }
-
-    function getMuxPropertyNames() {
-        var names1 = Object.getOwnPropertyNames(redirect).filter(function(name) {
-            return name in redirect[name];
-        });
-        var names2 = getPropertyNames(catchall).filter(function(name) {
-            return !hasOwn(redirect, name);
-        });
-        return names1.concat(names2);
-    }
-
-    function enumerateMux() {
-        var result = Object.getOwnPropertyNames(redirect).filter(function(name) {
-            return name in redirect[name];
-        });
-        for (name in catchall) {
-            if (!hasOwn(redirect, name))
-                result.push(name);
-        };
-        return result;
-    }
-
-    function hasMux(name) {
-        return name in targetFor(name);
-    }
-
-    return {
-        getOwnPropertyDescriptor: getMuxPropertyDescriptor,
-        getPropertyDescriptor: getMuxPropertyDescriptor,
-        getOwnPropertyNames: getMuxPropertyNames,
-        defineProperty: function(name, desc) {
-            Object.defineProperty(targetFor(name), name, desc);
-        },
-        "delete": function(name) {
-            var target = targetFor(name);
-            return delete target[name];
-        },
-        // FIXME: ha ha ha
-        fix: function() { },
-        has: hasMux,
-        hasOwn: hasMux,
-        get: function(receiver, name) {
-            var target = targetFor(name);
-            return target[name];
-        },
-        set: function(receiver, name, val) {
-            var target = targetFor(name);
-            target[name] = val;
-            return true;
-        },
-        enumerate: enumerateMux,
-        keys: enumerateMux
-    };
-}
-
-function makePassthruHandler(obj) {
-    // Handler copied from
-    // http://wiki.ecmascript.org/doku.php?id=harmony:proxies&s=proxy%20object#examplea_no-op_forwarding_proxy
-    return {
-        getOwnPropertyDescriptor: function(name) {
-            var desc = Object.getOwnPropertyDescriptor(obj, name);
-
-            // a trapping proxy's properties must always be configurable
-            desc.configurable = true;
-            return desc;
-        },
-        getPropertyDescriptor: function(name) {
-            var desc = getPropertyDescriptor(obj, name);
-
-            // a trapping proxy's properties must always be configurable
-            desc.configurable = true;
-            return desc;
-        },
-        getOwnPropertyNames: function() {
-            return Object.getOwnPropertyNames(obj);
-        },
-        defineProperty: function(name, desc) {
-            Object.defineProperty(obj, name, desc);
-        },
-        "delete": function(name) { return delete obj[name]; },
-        fix: function() {
-            if (Object.isFrozen(obj)) {
-                return getOwnProperties(obj);
-            }
-
-            // As long as obj is not frozen, the proxy won't allow itself to be fixed.
-            return undefined; // will cause a TypeError to be thrown
-        },
-
-        has: function(name) { return name in obj; },
-        hasOwn: function(name) { return ({}).hasOwnProperty.call(obj, name); },
-        get: function(receiver, name) { return obj[name]; },
-
-        // bad behavior when set fails in non-strict mode
-        set: function(receiver, name, val) { obj[name] = val; return true; },
-        enumerate: function() {
-            var result = [];
-            for (name in obj) { result.push(name); };
-            return result;
-        },
-        keys: function() { return Object.keys(obj); }
-    };
-}
-
-var hasOwnProperty = ({}).hasOwnProperty;
-
-function hasOwn(obj, name) {
-    return hasOwnProperty.call(obj, name);
-}
-
-function Dict(table, size) {
-    this.table = table || Object.create(null, {});
-    this.size = size || 0;
-}
-
-Dict.create = function(table) {
-    var init = Object.create(null, {});
-    var size = 0;
-    var names = Object.getOwnPropertyNames(table);
-    for (var i = 0, n = names.length; i < n; i++) {
-        var name = names[i];
-        init[name] = table[name];
-        size++;
-    }
-    return new Dict(init, size);
-};
-
-Dict.prototype = {
-    has: function(x) { return hasOwnProperty.call(this.table, x); },
-    set: function(x, v) {
-        if (!hasOwnProperty.call(this.table, x))
-            this.size++;
-        this.table[x] = v;
-    },
-    get: function(x) { return this.table[x]; },
-    getDef: function(x, thunk) {
-        if (!hasOwnProperty.call(this.table, x)) {
-            this.size++;
-            this.table[x] = thunk();
-        }
-        return this.table[x];
-    },
-    forEach: function(f) {
-        var table = this.table;
-        for (var key in table)
-            f.call(this, key, table[key]);
-    },
-    map: function(f) {
-        var table1 = this.table;
-        var table2 = Object.create(null, {});
-        this.forEach(function(key, val) {
-            table2[key] = f.call(this, val, key);
-        });
-        return new Dict(table2, this.size);
-    },
-    mapObject: function(f) {
-        var table1 = this.table;
-        var table2 = Object.create(null, {});
-        this.forEach(function(key, val) {
-            table2[key] = f.call(this, val, key);
-        });
-        return table2;
-    },
-    toObject: function() {
-        return this.mapObject(function(val) { return val; });
-    },
-    choose: function() {
-        return Object.getOwnPropertyNames(this.table)[0];
-    },
-    remove: function(x) {
-        if (hasOwnProperty.call(this.table, x)) {
-            this.size--;
-            delete this.table[x];
-        }
-    },
-    copy: function() {
-        var table = Object.create(null, {});
-        for (var key in this.table)
-            table[key] = this.table[key];
-        return new Dict(table, this.size);
-    },
-    keys: function() {
-        return Object.keys(this.table);
-    },
-    toString: function() { return "[object Dict]" }
-};
-
-var _WeakMap = typeof WeakMap === "function" ? WeakMap : (function() {
-    // shim for ES6 WeakMap with poor asymptotics
-    function WeakMap(array) {
-        this.array = array || [];
-    }
-
-    function searchMap(map, key, found, notFound) {
-        var a = map.array;
-        for (var i = 0, n = a.length; i < n; i++) {
-            var pair = a[i];
-            if (pair.key === key)
-                return found(pair, i);
-        }
-        return notFound();
-    }
-
-    WeakMap.prototype = {
-        has: function(x) {
-            return searchMap(this, x, function() { return true }, function() { return false });
-        },
-        set: function(x, v) {
-            var a = this.array;
-            searchMap(this, x,
-                      function(pair) { pair.value = v },
-                      function() { a.push({ key: x, value: v }) });
-        },
-        get: function(x) {
-            return searchMap(this, x,
-                             function(pair) { return pair.value },
-                             function() { return null });
-        },
-        "delete": function(x) {
-            var a = this.array;
-            searchMap(this, x,
-                      function(pair, i) { a.splice(i, 1) },
-                      function() { });
-        },
-        toString: function() { return "[object WeakMap]" }
-    };
-
-    return WeakMap;
-})();
-
-// non-destructive stack
-function Stack(elts) {
-    this.elts = elts || null;
-}
-
-Stack.prototype = {
-    push: function(x) {
-        return new Stack({ top: x, rest: this.elts });
-    },
-    top: function() {
-        if (!this.elts)
-            throw new Error("empty stack");
-        return this.elts.top;
-    },
-    isEmpty: function() {
-        return this.top === null;
-    },
-    find: function(test) {
-        for (var elts = this.elts; elts; elts = elts.rest) {
-            if (test(elts.top))
-                return elts.top;
-        }
-        return null;
-    },
-    has: function(x) {
-        return Boolean(this.find(function(elt) { return elt === x }));
-    },
-    forEach: function(f) {
-        for (var elts = this.elts; elts; elts = elts.rest) {
-            f(elts.top);
-        }
-    }
-};
-
-if (!Array.prototype.copy) {
-    defineProperty(Array.prototype, "copy",
-                   function() {
-                       var result = [];
-                       for (var i = 0, n = this.length; i < n; i++)
-                           result[i] = this[i];
-                       return result;
-                   }, false, false, true);
-}
-
-if (!Array.prototype.top) {
-    defineProperty(Array.prototype, "top",
-                   function() {
-                       return this.length && this[this.length-1];
-                   }, false, false, true);
-}
-
-exports.tokens = tokens;
-exports.whitespace = whitespace;
-exports.opTypeNames = opTypeNames;
-exports.keywords = keywords;
-exports.mozillaKeywords = mozillaKeywords;
-exports.strictKeywords = strictKeywords;
-exports.isStatementStartCode = isStatementStartCode;
-exports.tokenIds = tokenIds;
-exports.consts = consts;
-exports.assignOps = assignOps;
-exports.defineGetter = defineGetter;
-exports.defineGetterSetter = defineGetterSetter;
-exports.defineMemoGetter = defineMemoGetter;
-exports.defineProperty = defineProperty;
-exports.isNativeCode = isNativeCode;
-exports.apply = apply;
-exports.applyNew = applyNew;
-exports.mixinHandler = mixinHandler;
-exports.whitelistHandler = whitelistHandler;
-exports.blacklistHandler = blacklistHandler;
-exports.makePassthruHandler = makePassthruHandler;
-exports.Dict = Dict;
-exports.WeakMap = _WeakMap;
-exports.Stack = Stack;
-
-});/* vim: set sw=4 ts=4 et tw=78: */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Narcissus JavaScript engine.
- *
- * The Initial Developer of the Original Code is
- * Brendan Eich <brendan@mozilla.org>.
- * Portions created by the Initial Developer are Copyright (C) 2004
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Tom Austin <taustin@ucsc.edu>
- *   Brendan Eich <brendan@mozilla.org>
- *   Shu-Yu Guo <shu@rfrn.org>
- *   Dave Herman <dherman@mozilla.com>
- *   Dimitris Vardoulakis <dimvar@ccs.neu.edu>
- *   Patrick Walton <pcwalton@mozilla.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/narcissus/options', ['require', 'exports', 'module' ], function(require, exports, module) {
-
-// Global variables to hide from the interpreter
-exports.hiddenHostGlobals = { Narcissus: true };
-
-// Desugar SpiderMonkey language extensions?
-exports.desugarExtensions = false;
-
-// Allow HTML comments?
-exports.allowHTMLComments = false;
-
-// Allow non-standard Mozilla extensions?
-exports.mozillaMode = true;
-
-// Allow experimental paren-free mode?
-exports.parenFreeMode = false;
-
-});
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/worker-json.js b/apps/files_texteditor/js/aceeditor/worker-json.js
deleted file mode 100644
index 80757ef64b..0000000000
--- a/apps/files_texteditor/js/aceeditor/worker-json.js
+++ /dev/null
@@ -1,3083 +0,0 @@
-"no use strict";
-
-var console = {
-    log: function(msg) {
-        postMessage({type: "log", data: msg});
-    }
-};
-var window = {
-    console: console
-};
-
-var normalizeModule = function(parentId, moduleName) {
-    // normalize plugin requires
-    if (moduleName.indexOf("!") !== -1) {
-        var chunks = moduleName.split("!");
-        return normalizeModule(parentId, chunks[0]) + "!" + normalizeModule(parentId, chunks[1]);
-    }
-    // normalize relative requires
-    if (moduleName.charAt(0) == ".") {
-        var base = parentId.split("/").slice(0, -1).join("/");
-        var moduleName = base + "/" + moduleName;
-        
-        while(moduleName.indexOf(".") !== -1 && previous != moduleName) {
-            var previous = moduleName;
-            var moduleName = moduleName.replace(/\/\.\//, "/").replace(/[^\/]+\/\.\.\//, "");
-        }
-    }
-    
-    return moduleName;
-};
-
-var require = function(parentId, id) {
-    var id = normalizeModule(parentId, id);
-    
-    var module = require.modules[id];
-    if (module) {
-        if (!module.initialized) {
-            module.exports = module.factory().exports;
-            module.initialized = true;
-        }
-        return module.exports;
-    }
-    
-    var chunks = id.split("/");
-    chunks[0] = require.tlns[chunks[0]] || chunks[0];
-    var path = chunks.join("/") + ".js";
-    
-    require.id = id;
-    importScripts(path);
-    return require(parentId, id);    
-};
-
-require.modules = {};
-require.tlns = {};
-
-var define = function(id, deps, factory) {
-    if (arguments.length == 2) {
-        factory = deps;
-    } else if (arguments.length == 1) {
-        factory = id;
-        id = require.id;
-    }
-
-    if (id.indexOf("text!") === 0) 
-        return;
-    
-    var req = function(deps, factory) {
-        return require(id, deps, factory);
-    };
-
-    require.modules[id] = {
-        factory: function() {
-            var module = {
-                exports: {}
-            };
-            var returnExports = factory(req, module.exports, module);
-            if (returnExports)
-                module.exports = returnExports;
-            return module;
-        }
-    };
-};
-
-function initBaseUrls(topLevelNamespaces) {
-    require.tlns = topLevelNamespaces;
-}
-
-function initSender() {
-
-    var EventEmitter = require(null, "ace/lib/event_emitter").EventEmitter;
-    var oop = require(null, "ace/lib/oop");
-    
-    var Sender = function() {};
-    
-    (function() {
-        
-        oop.implement(this, EventEmitter);
-                
-        this.callback = function(data, callbackId) {
-            postMessage({
-                type: "call",
-                id: callbackId,
-                data: data
-            });
-        };
-    
-        this.emit = function(name, data) {
-            postMessage({
-                type: "event",
-                name: name,
-                data: data
-            });
-        };
-        
-    }).call(Sender.prototype);
-    
-    return new Sender();
-}
-
-var main;
-var sender;
-
-onmessage = function(e) {
-    var msg = e.data;
-    if (msg.command) {
-        main[msg.command].apply(main, msg.args);
-    }
-    else if (msg.init) {        
-        initBaseUrls(msg.tlns);
-        require(null, "ace/lib/fixoldbrowsers");
-        sender = initSender();
-        var clazz = require(null, msg.module)[msg.classname];
-        main = new clazz(sender);
-    } 
-    else if (msg.event && sender) {
-        sender._emit(msg.event, msg.data);
-    }
-};
-// vim:set ts=4 sts=4 sw=4 st:
-// -- kriskowal Kris Kowal Copyright (C) 2009-2010 MIT License
-// -- tlrobinson Tom Robinson Copyright (C) 2009-2010 MIT License (Narwhal Project)
-// -- dantman Daniel Friesen Copyright(C) 2010 XXX No License Specified
-// -- fschaefer Florian Schäfer Copyright (C) 2010 MIT License
-// -- Irakli Gozalishvili Copyright (C) 2010 MIT License
-
-/*!
-    Copyright (c) 2009, 280 North Inc. http://280north.com/
-    MIT License. http://github.com/280north/narwhal/blob/master/README.md
-*/
-
-define('ace/lib/fixoldbrowsers', ['require', 'exports', 'module' , 'ace/lib/regexp', 'ace/lib/es5-shim'], function(require, exports, module) {
-"use strict";
-
-require("./regexp");
-require("./es5-shim");
-
-});/**
- *  Based on code from:
- *
- * XRegExp 1.5.0
- * (c) 2007-2010 Steven Levithan
- * MIT License
- * <http://xregexp.com>
- * Provides an augmented, extensible, cross-browser implementation of regular expressions,
- * including support for additional syntax, flags, and methods
- */
- 
-define('ace/lib/regexp', ['require', 'exports', 'module' ], function(require, exports, module) {
-"use strict";
-
-    //---------------------------------
-    //  Private variables
-    //---------------------------------
-
-    var real = {
-            exec: RegExp.prototype.exec,
-            test: RegExp.prototype.test,
-            match: String.prototype.match,
-            replace: String.prototype.replace,
-            split: String.prototype.split
-        },
-        compliantExecNpcg = real.exec.call(/()??/, "")[1] === undefined, // check `exec` handling of nonparticipating capturing groups
-        compliantLastIndexIncrement = function () {
-            var x = /^/g;
-            real.test.call(x, "");
-            return !x.lastIndex;
-        }();
-
-    //---------------------------------
-    //  Overriden native methods
-    //---------------------------------
-
-    // Adds named capture support (with backreferences returned as `result.name`), and fixes two
-    // cross-browser issues per ES3:
-    // - Captured values for nonparticipating capturing groups should be returned as `undefined`,
-    //   rather than the empty string.
-    // - `lastIndex` should not be incremented after zero-length matches.
-    RegExp.prototype.exec = function (str) {
-        var match = real.exec.apply(this, arguments),
-            name, r2;
-        if ( typeof(str) == 'string' && match) {
-            // Fix browsers whose `exec` methods don't consistently return `undefined` for
-            // nonparticipating capturing groups
-            if (!compliantExecNpcg && match.length > 1 && indexOf(match, "") > -1) {
-                r2 = RegExp(this.source, real.replace.call(getNativeFlags(this), "g", ""));
-                // Using `str.slice(match.index)` rather than `match[0]` in case lookahead allowed
-                // matching due to characters outside the match
-                real.replace.call(str.slice(match.index), r2, function () {
-                    for (var i = 1; i < arguments.length - 2; i++) {
-                        if (arguments[i] === undefined)
-                            match[i] = undefined;
-                    }
-                });
-            }
-            // Attach named capture properties
-            if (this._xregexp && this._xregexp.captureNames) {
-                for (var i = 1; i < match.length; i++) {
-                    name = this._xregexp.captureNames[i - 1];
-                    if (name)
-                       match[name] = match[i];
-                }
-            }
-            // Fix browsers that increment `lastIndex` after zero-length matches
-            if (!compliantLastIndexIncrement && this.global && !match[0].length && (this.lastIndex > match.index))
-                this.lastIndex--;
-        }
-        return match;
-    };
-
-    // Don't override `test` if it won't change anything
-    if (!compliantLastIndexIncrement) {
-        // Fix browser bug in native method
-        RegExp.prototype.test = function (str) {
-            // Use the native `exec` to skip some processing overhead, even though the overriden
-            // `exec` would take care of the `lastIndex` fix
-            var match = real.exec.call(this, str);
-            // Fix browsers that increment `lastIndex` after zero-length matches
-            if (match && this.global && !match[0].length && (this.lastIndex > match.index))
-                this.lastIndex--;
-            return !!match;
-        };
-    }
-
-    //---------------------------------
-    //  Private helper functions
-    //---------------------------------
-
-    function getNativeFlags (regex) {
-        return (regex.global     ? "g" : "") +
-               (regex.ignoreCase ? "i" : "") +
-               (regex.multiline  ? "m" : "") +
-               (regex.extended   ? "x" : "") + // Proposed for ES4; included in AS3
-               (regex.sticky     ? "y" : "");
-    };
-
-    function indexOf (array, item, from) {
-        if (Array.prototype.indexOf) // Use the native array method if available
-            return array.indexOf(item, from);
-        for (var i = from || 0; i < array.length; i++) {
-            if (array[i] === item)
-                return i;
-        }
-        return -1;
-    };
-
-});
-// vim: ts=4 sts=4 sw=4 expandtab
-// -- kriskowal Kris Kowal Copyright (C) 2009-2011 MIT License
-// -- tlrobinson Tom Robinson Copyright (C) 2009-2010 MIT License (Narwhal Project)
-// -- dantman Daniel Friesen Copyright (C) 2010 XXX TODO License or CLA
-// -- fschaefer Florian Schäfer Copyright (C) 2010 MIT License
-// -- Gozala Irakli Gozalishvili Copyright (C) 2010 MIT License
-// -- kitcambridge Kit Cambridge Copyright (C) 2011 MIT License
-// -- kossnocorp Sasha Koss XXX TODO License or CLA
-// -- bryanforbes Bryan Forbes XXX TODO License or CLA
-// -- killdream Quildreen Motta Copyright (C) 2011 MIT Licence
-// -- michaelficarra Michael Ficarra Copyright (C) 2011 3-clause BSD License
-// -- sharkbrainguy Gerard Paapu Copyright (C) 2011 MIT License
-// -- bbqsrc Brendan Molloy (C) 2011 Creative Commons Zero (public domain)
-// -- iwyg XXX TODO License or CLA
-// -- DomenicDenicola Domenic Denicola Copyright (C) 2011 MIT License
-// -- xavierm02 Montillet Xavier XXX TODO License or CLA
-// -- Raynos Raynos XXX TODO License or CLA
-// -- samsonjs Sami Samhuri Copyright (C) 2010 MIT License
-// -- rwldrn Rick Waldron Copyright (C) 2011 MIT License
-// -- lexer Alexey Zakharov XXX TODO License or CLA
-
-/*!
-    Copyright (c) 2009, 280 North Inc. http://280north.com/
-    MIT License. http://github.com/280north/narwhal/blob/master/README.md
-*/
-
-define('ace/lib/es5-shim', ['require', 'exports', 'module' ], function(require, exports, module) {
-
-/**
- * Brings an environment as close to ECMAScript 5 compliance
- * as is possible with the facilities of erstwhile engines.
- *
- * Annotated ES5: http://es5.github.com/ (specific links below)
- * ES5 Spec: http://www.ecma-international.org/publications/files/ECMA-ST/Ecma-262.pdf
- *
- * @module
- */
-
-/*whatsupdoc*/
-
-//
-// Function
-// ========
-//
-
-// ES-5 15.3.4.5
-// http://es5.github.com/#x15.3.4.5
-
-if (!Function.prototype.bind) {
-    Function.prototype.bind = function bind(that) { // .length is 1
-        // 1. Let Target be the this value.
-        var target = this;
-        // 2. If IsCallable(Target) is false, throw a TypeError exception.
-        if (typeof target != "function")
-            throw new TypeError(); // TODO message
-        // 3. Let A be a new (possibly empty) internal list of all of the
-        //   argument values provided after thisArg (arg1, arg2 etc), in order.
-        // XXX slicedArgs will stand in for "A" if used
-        var args = slice.call(arguments, 1); // for normal call
-        // 4. Let F be a new native ECMAScript object.
-        // 11. Set the [[Prototype]] internal property of F to the standard
-        //   built-in Function prototype object as specified in 15.3.3.1.
-        // 12. Set the [[Call]] internal property of F as described in
-        //   15.3.4.5.1.
-        // 13. Set the [[Construct]] internal property of F as described in
-        //   15.3.4.5.2.
-        // 14. Set the [[HasInstance]] internal property of F as described in
-        //   15.3.4.5.3.
-        var bound = function () {
-
-            if (this instanceof bound) {
-                // 15.3.4.5.2 [[Construct]]
-                // When the [[Construct]] internal method of a function object,
-                // F that was created using the bind function is called with a
-                // list of arguments ExtraArgs, the following steps are taken:
-                // 1. Let target be the value of F's [[TargetFunction]]
-                //   internal property.
-                // 2. If target has no [[Construct]] internal method, a
-                //   TypeError exception is thrown.
-                // 3. Let boundArgs be the value of F's [[BoundArgs]] internal
-                //   property.
-                // 4. Let args be a new list containing the same values as the
-                //   list boundArgs in the same order followed by the same
-                //   values as the list ExtraArgs in the same order.
-                // 5. Return the result of calling the [[Construct]] internal 
-                //   method of target providing args as the arguments.
-
-                var F = function(){};
-                F.prototype = target.prototype;
-                var self = new F;
-
-                var result = target.apply(
-                    self,
-                    args.concat(slice.call(arguments))
-                );
-                if (result !== null && Object(result) === result)
-                    return result;
-                return self;
-
-            } else {
-                // 15.3.4.5.1 [[Call]]
-                // When the [[Call]] internal method of a function object, F,
-                // which was created using the bind function is called with a
-                // this value and a list of arguments ExtraArgs, the following
-                // steps are taken:
-                // 1. Let boundArgs be the value of F's [[BoundArgs]] internal
-                //   property.
-                // 2. Let boundThis be the value of F's [[BoundThis]] internal
-                //   property.
-                // 3. Let target be the value of F's [[TargetFunction]] internal
-                //   property.
-                // 4. Let args be a new list containing the same values as the 
-                //   list boundArgs in the same order followed by the same 
-                //   values as the list ExtraArgs in the same order.
-                // 5. Return the result of calling the [[Call]] internal method 
-                //   of target providing boundThis as the this value and 
-                //   providing args as the arguments.
-
-                // equiv: target.call(this, ...boundArgs, ...args)
-                return target.apply(
-                    that,
-                    args.concat(slice.call(arguments))
-                );
-
-            }
-
-        };
-        // XXX bound.length is never writable, so don't even try
-        //
-        // 15. If the [[Class]] internal property of Target is "Function", then
-        //     a. Let L be the length property of Target minus the length of A.
-        //     b. Set the length own property of F to either 0 or L, whichever is 
-        //       larger.
-        // 16. Else set the length own property of F to 0.
-        // 17. Set the attributes of the length own property of F to the values
-        //   specified in 15.3.5.1.
-
-        // TODO
-        // 18. Set the [[Extensible]] internal property of F to true.
-        
-        // TODO
-        // 19. Let thrower be the [[ThrowTypeError]] function Object (13.2.3).
-        // 20. Call the [[DefineOwnProperty]] internal method of F with 
-        //   arguments "caller", PropertyDescriptor {[[Get]]: thrower, [[Set]]:
-        //   thrower, [[Enumerable]]: false, [[Configurable]]: false}, and 
-        //   false.
-        // 21. Call the [[DefineOwnProperty]] internal method of F with 
-        //   arguments "arguments", PropertyDescriptor {[[Get]]: thrower, 
-        //   [[Set]]: thrower, [[Enumerable]]: false, [[Configurable]]: false},
-        //   and false.
-
-        // TODO
-        // NOTE Function objects created using Function.prototype.bind do not 
-        // have a prototype property or the [[Code]], [[FormalParameters]], and
-        // [[Scope]] internal properties.
-        // XXX can't delete prototype in pure-js.
-
-        // 22. Return F.
-        return bound;
-    };
-}
-
-// Shortcut to an often accessed properties, in order to avoid multiple
-// dereference that costs universally.
-// _Please note: Shortcuts are defined after `Function.prototype.bind` as we
-// us it in defining shortcuts.
-var call = Function.prototype.call;
-var prototypeOfArray = Array.prototype;
-var prototypeOfObject = Object.prototype;
-var slice = prototypeOfArray.slice;
-var toString = call.bind(prototypeOfObject.toString);
-var owns = call.bind(prototypeOfObject.hasOwnProperty);
-
-// If JS engine supports accessors creating shortcuts.
-var defineGetter;
-var defineSetter;
-var lookupGetter;
-var lookupSetter;
-var supportsAccessors;
-if ((supportsAccessors = owns(prototypeOfObject, "__defineGetter__"))) {
-    defineGetter = call.bind(prototypeOfObject.__defineGetter__);
-    defineSetter = call.bind(prototypeOfObject.__defineSetter__);
-    lookupGetter = call.bind(prototypeOfObject.__lookupGetter__);
-    lookupSetter = call.bind(prototypeOfObject.__lookupSetter__);
-}
-
-//
-// Array
-// =====
-//
-
-// ES5 15.4.3.2
-// http://es5.github.com/#x15.4.3.2
-// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/isArray
-if (!Array.isArray) {
-    Array.isArray = function isArray(obj) {
-        return toString(obj) == "[object Array]";
-    };
-}
-
-// The IsCallable() check in the Array functions
-// has been replaced with a strict check on the
-// internal class of the object to trap cases where
-// the provided function was actually a regular
-// expression literal, which in V8 and
-// JavaScriptCore is a typeof "function".  Only in
-// V8 are regular expression literals permitted as
-// reduce parameters, so it is desirable in the
-// general case for the shim to match the more
-// strict and common behavior of rejecting regular
-// expressions.
-
-// ES5 15.4.4.18
-// http://es5.github.com/#x15.4.4.18
-// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/array/forEach
-if (!Array.prototype.forEach) {
-    Array.prototype.forEach = function forEach(fun /*, thisp*/) {
-        var self = toObject(this),
-            thisp = arguments[1],
-            i = 0,
-            length = self.length >>> 0;
-
-        // If no callback function or if callback is not a callable function
-        if (toString(fun) != "[object Function]") {
-            throw new TypeError(); // TODO message
-        }
-
-        while (i < length) {
-            if (i in self) {
-                // Invoke the callback function with call, passing arguments:
-                // context, property value, property key, thisArg object context
-                fun.call(thisp, self[i], i, self);
-            }
-            i++;
-        }
-    };
-}
-
-// ES5 15.4.4.19
-// http://es5.github.com/#x15.4.4.19
-// https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Objects/Array/map
-if (!Array.prototype.map) {
-    Array.prototype.map = function map(fun /*, thisp*/) {
-        var self = toObject(this),
-            length = self.length >>> 0,
-            result = Array(length),
-            thisp = arguments[1];
-
-        // If no callback function or if callback is not a callable function
-        if (toString(fun) != "[object Function]") {
-            throw new TypeError(); // TODO message
-        }
-
-        for (var i = 0; i < length; i++) {
-            if (i in self)
-                result[i] = fun.call(thisp, self[i], i, self);
-        }
-        return result;
-    };
-}
-
-// ES5 15.4.4.20
-// http://es5.github.com/#x15.4.4.20
-// https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Objects/Array/filter
-if (!Array.prototype.filter) {
-    Array.prototype.filter = function filter(fun /*, thisp */) {
-        var self = toObject(this),
-            length = self.length >>> 0,
-            result = [],
-            thisp = arguments[1];
-
-        // If no callback function or if callback is not a callable function
-        if (toString(fun) != "[object Function]") {
-            throw new TypeError(); // TODO message
-        }
-
-        for (var i = 0; i < length; i++) {
-            if (i in self && fun.call(thisp, self[i], i, self))
-                result.push(self[i]);
-        }
-        return result;
-    };
-}
-
-// ES5 15.4.4.16
-// http://es5.github.com/#x15.4.4.16
-// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/every
-if (!Array.prototype.every) {
-    Array.prototype.every = function every(fun /*, thisp */) {
-        var self = toObject(this),
-            length = self.length >>> 0,
-            thisp = arguments[1];
-
-        // If no callback function or if callback is not a callable function
-        if (toString(fun) != "[object Function]") {
-            throw new TypeError(); // TODO message
-        }
-
-        for (var i = 0; i < length; i++) {
-            if (i in self && !fun.call(thisp, self[i], i, self))
-                return false;
-        }
-        return true;
-    };
-}
-
-// ES5 15.4.4.17
-// http://es5.github.com/#x15.4.4.17
-// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/some
-if (!Array.prototype.some) {
-    Array.prototype.some = function some(fun /*, thisp */) {
-        var self = toObject(this),
-            length = self.length >>> 0,
-            thisp = arguments[1];
-
-        // If no callback function or if callback is not a callable function
-        if (toString(fun) != "[object Function]") {
-            throw new TypeError(); // TODO message
-        }
-
-        for (var i = 0; i < length; i++) {
-            if (i in self && fun.call(thisp, self[i], i, self))
-                return true;
-        }
-        return false;
-    };
-}
-
-// ES5 15.4.4.21
-// http://es5.github.com/#x15.4.4.21
-// https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Objects/Array/reduce
-if (!Array.prototype.reduce) {
-    Array.prototype.reduce = function reduce(fun /*, initial*/) {
-        var self = toObject(this),
-            length = self.length >>> 0;
-
-        // If no callback function or if callback is not a callable function
-        if (toString(fun) != "[object Function]") {
-            throw new TypeError(); // TODO message
-        }
-
-        // no value to return if no initial value and an empty array
-        if (!length && arguments.length == 1)
-            throw new TypeError(); // TODO message
-
-        var i = 0;
-        var result;
-        if (arguments.length >= 2) {
-            result = arguments[1];
-        } else {
-            do {
-                if (i in self) {
-                    result = self[i++];
-                    break;
-                }
-
-                // if array contains no values, no initial value to return
-                if (++i >= length)
-                    throw new TypeError(); // TODO message
-            } while (true);
-        }
-
-        for (; i < length; i++) {
-            if (i in self)
-                result = fun.call(void 0, result, self[i], i, self);
-        }
-
-        return result;
-    };
-}
-
-// ES5 15.4.4.22
-// http://es5.github.com/#x15.4.4.22
-// https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Objects/Array/reduceRight
-if (!Array.prototype.reduceRight) {
-    Array.prototype.reduceRight = function reduceRight(fun /*, initial*/) {
-        var self = toObject(this),
-            length = self.length >>> 0;
-
-        // If no callback function or if callback is not a callable function
-        if (toString(fun) != "[object Function]") {
-            throw new TypeError(); // TODO message
-        }
-
-        // no value to return if no initial value, empty array
-        if (!length && arguments.length == 1)
-            throw new TypeError(); // TODO message
-
-        var result, i = length - 1;
-        if (arguments.length >= 2) {
-            result = arguments[1];
-        } else {
-            do {
-                if (i in self) {
-                    result = self[i--];
-                    break;
-                }
-
-                // if array contains no values, no initial value to return
-                if (--i < 0)
-                    throw new TypeError(); // TODO message
-            } while (true);
-        }
-
-        do {
-            if (i in this)
-                result = fun.call(void 0, result, self[i], i, self);
-        } while (i--);
-
-        return result;
-    };
-}
-
-// ES5 15.4.4.14
-// http://es5.github.com/#x15.4.4.14
-// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/indexOf
-if (!Array.prototype.indexOf) {
-    Array.prototype.indexOf = function indexOf(sought /*, fromIndex */ ) {
-        var self = toObject(this),
-            length = self.length >>> 0;
-
-        if (!length)
-            return -1;
-
-        var i = 0;
-        if (arguments.length > 1)
-            i = toInteger(arguments[1]);
-
-        // handle negative indices
-        i = i >= 0 ? i : Math.max(0, length + i);
-        for (; i < length; i++) {
-            if (i in self && self[i] === sought) {
-                return i;
-            }
-        }
-        return -1;
-    };
-}
-
-// ES5 15.4.4.15
-// http://es5.github.com/#x15.4.4.15
-// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/lastIndexOf
-if (!Array.prototype.lastIndexOf) {
-    Array.prototype.lastIndexOf = function lastIndexOf(sought /*, fromIndex */) {
-        var self = toObject(this),
-            length = self.length >>> 0;
-
-        if (!length)
-            return -1;
-        var i = length - 1;
-        if (arguments.length > 1)
-            i = Math.min(i, toInteger(arguments[1]));
-        // handle negative indices
-        i = i >= 0 ? i : length - Math.abs(i);
-        for (; i >= 0; i--) {
-            if (i in self && sought === self[i])
-                return i;
-        }
-        return -1;
-    };
-}
-
-//
-// Object
-// ======
-//
-
-// ES5 15.2.3.2
-// http://es5.github.com/#x15.2.3.2
-if (!Object.getPrototypeOf) {
-    // https://github.com/kriskowal/es5-shim/issues#issue/2
-    // http://ejohn.org/blog/objectgetprototypeof/
-    // recommended by fschaefer on github
-    Object.getPrototypeOf = function getPrototypeOf(object) {
-        return object.__proto__ || (
-            object.constructor ?
-            object.constructor.prototype :
-            prototypeOfObject
-        );
-    };
-}
-
-// ES5 15.2.3.3
-// http://es5.github.com/#x15.2.3.3
-if (!Object.getOwnPropertyDescriptor) {
-    var ERR_NON_OBJECT = "Object.getOwnPropertyDescriptor called on a " +
-                         "non-object: ";
-    Object.getOwnPropertyDescriptor = function getOwnPropertyDescriptor(object, property) {
-        if ((typeof object != "object" && typeof object != "function") || object === null)
-            throw new TypeError(ERR_NON_OBJECT + object);
-        // If object does not owns property return undefined immediately.
-        if (!owns(object, property))
-            return;
-
-        var descriptor, getter, setter;
-
-        // If object has a property then it's for sure both `enumerable` and
-        // `configurable`.
-        descriptor =  { enumerable: true, configurable: true };
-
-        // If JS engine supports accessor properties then property may be a
-        // getter or setter.
-        if (supportsAccessors) {
-            // Unfortunately `__lookupGetter__` will return a getter even
-            // if object has own non getter property along with a same named
-            // inherited getter. To avoid misbehavior we temporary remove
-            // `__proto__` so that `__lookupGetter__` will return getter only
-            // if it's owned by an object.
-            var prototype = object.__proto__;
-            object.__proto__ = prototypeOfObject;
-
-            var getter = lookupGetter(object, property);
-            var setter = lookupSetter(object, property);
-
-            // Once we have getter and setter we can put values back.
-            object.__proto__ = prototype;
-
-            if (getter || setter) {
-                if (getter) descriptor.get = getter;
-                if (setter) descriptor.set = setter;
-
-                // If it was accessor property we're done and return here
-                // in order to avoid adding `value` to the descriptor.
-                return descriptor;
-            }
-        }
-
-        // If we got this far we know that object has an own property that is
-        // not an accessor so we set it as a value and return descriptor.
-        descriptor.value = object[property];
-        return descriptor;
-    };
-}
-
-// ES5 15.2.3.4
-// http://es5.github.com/#x15.2.3.4
-if (!Object.getOwnPropertyNames) {
-    Object.getOwnPropertyNames = function getOwnPropertyNames(object) {
-        return Object.keys(object);
-    };
-}
-
-// ES5 15.2.3.5
-// http://es5.github.com/#x15.2.3.5
-if (!Object.create) {
-    Object.create = function create(prototype, properties) {
-        var object;
-        if (prototype === null) {
-            object = { "__proto__": null };
-        } else {
-            if (typeof prototype != "object")
-                throw new TypeError("typeof prototype["+(typeof prototype)+"] != 'object'");
-            var Type = function () {};
-            Type.prototype = prototype;
-            object = new Type();
-            // IE has no built-in implementation of `Object.getPrototypeOf`
-            // neither `__proto__`, but this manually setting `__proto__` will
-            // guarantee that `Object.getPrototypeOf` will work as expected with
-            // objects created using `Object.create`
-            object.__proto__ = prototype;
-        }
-        if (properties !== void 0)
-            Object.defineProperties(object, properties);
-        return object;
-    };
-}
-
-// ES5 15.2.3.6
-// http://es5.github.com/#x15.2.3.6
-
-// Patch for WebKit and IE8 standard mode
-// Designed by hax <hax.github.com>
-// related issue: https://github.com/kriskowal/es5-shim/issues#issue/5
-// IE8 Reference:
-//     http://msdn.microsoft.com/en-us/library/dd282900.aspx
-//     http://msdn.microsoft.com/en-us/library/dd229916.aspx
-// WebKit Bugs:
-//     https://bugs.webkit.org/show_bug.cgi?id=36423
-
-function doesDefinePropertyWork(object) {
-    try {
-        Object.defineProperty(object, "sentinel", {});
-        return "sentinel" in object;
-    } catch (exception) {
-        // returns falsy
-    }
-}
-
-// check whether defineProperty works if it's given. Otherwise,
-// shim partially.
-if (Object.defineProperty) {
-    var definePropertyWorksOnObject = doesDefinePropertyWork({});
-    var definePropertyWorksOnDom = typeof document == "undefined" ||
-        doesDefinePropertyWork(document.createElement("div"));
-    if (!definePropertyWorksOnObject || !definePropertyWorksOnDom) {
-        var definePropertyFallback = Object.defineProperty;
-    }
-}
-
-if (!Object.defineProperty || definePropertyFallback) {
-    var ERR_NON_OBJECT_DESCRIPTOR = "Property description must be an object: ";
-    var ERR_NON_OBJECT_TARGET = "Object.defineProperty called on non-object: "
-    var ERR_ACCESSORS_NOT_SUPPORTED = "getters & setters can not be defined " +
-                                      "on this javascript engine";
-
-    Object.defineProperty = function defineProperty(object, property, descriptor) {
-        if ((typeof object != "object" && typeof object != "function") || object === null)
-            throw new TypeError(ERR_NON_OBJECT_TARGET + object);
-        if ((typeof descriptor != "object" && typeof descriptor != "function") || descriptor === null)
-            throw new TypeError(ERR_NON_OBJECT_DESCRIPTOR + descriptor);
-
-        // make a valiant attempt to use the real defineProperty
-        // for I8's DOM elements.
-        if (definePropertyFallback) {
-            try {
-                return definePropertyFallback.call(Object, object, property, descriptor);
-            } catch (exception) {
-                // try the shim if the real one doesn't work
-            }
-        }
-
-        // If it's a data property.
-        if (owns(descriptor, "value")) {
-            // fail silently if "writable", "enumerable", or "configurable"
-            // are requested but not supported
-            /*
-            // alternate approach:
-            if ( // can't implement these features; allow false but not true
-                !(owns(descriptor, "writable") ? descriptor.writable : true) ||
-                !(owns(descriptor, "enumerable") ? descriptor.enumerable : true) ||
-                !(owns(descriptor, "configurable") ? descriptor.configurable : true)
-            )
-                throw new RangeError(
-                    "This implementation of Object.defineProperty does not " +
-                    "support configurable, enumerable, or writable."
-                );
-            */
-
-            if (supportsAccessors && (lookupGetter(object, property) ||
-                                      lookupSetter(object, property)))
-            {
-                // As accessors are supported only on engines implementing
-                // `__proto__` we can safely override `__proto__` while defining
-                // a property to make sure that we don't hit an inherited
-                // accessor.
-                var prototype = object.__proto__;
-                object.__proto__ = prototypeOfObject;
-                // Deleting a property anyway since getter / setter may be
-                // defined on object itself.
-                delete object[property];
-                object[property] = descriptor.value;
-                // Setting original `__proto__` back now.
-                object.__proto__ = prototype;
-            } else {
-                object[property] = descriptor.value;
-            }
-        } else {
-            if (!supportsAccessors)
-                throw new TypeError(ERR_ACCESSORS_NOT_SUPPORTED);
-            // If we got that far then getters and setters can be defined !!
-            if (owns(descriptor, "get"))
-                defineGetter(object, property, descriptor.get);
-            if (owns(descriptor, "set"))
-                defineSetter(object, property, descriptor.set);
-        }
-
-        return object;
-    };
-}
-
-// ES5 15.2.3.7
-// http://es5.github.com/#x15.2.3.7
-if (!Object.defineProperties) {
-    Object.defineProperties = function defineProperties(object, properties) {
-        for (var property in properties) {
-            if (owns(properties, property))
-                Object.defineProperty(object, property, properties[property]);
-        }
-        return object;
-    };
-}
-
-// ES5 15.2.3.8
-// http://es5.github.com/#x15.2.3.8
-if (!Object.seal) {
-    Object.seal = function seal(object) {
-        // this is misleading and breaks feature-detection, but
-        // allows "securable" code to "gracefully" degrade to working
-        // but insecure code.
-        return object;
-    };
-}
-
-// ES5 15.2.3.9
-// http://es5.github.com/#x15.2.3.9
-if (!Object.freeze) {
-    Object.freeze = function freeze(object) {
-        // this is misleading and breaks feature-detection, but
-        // allows "securable" code to "gracefully" degrade to working
-        // but insecure code.
-        return object;
-    };
-}
-
-// detect a Rhino bug and patch it
-try {
-    Object.freeze(function () {});
-} catch (exception) {
-    Object.freeze = (function freeze(freezeObject) {
-        return function freeze(object) {
-            if (typeof object == "function") {
-                return object;
-            } else {
-                return freezeObject(object);
-            }
-        };
-    })(Object.freeze);
-}
-
-// ES5 15.2.3.10
-// http://es5.github.com/#x15.2.3.10
-if (!Object.preventExtensions) {
-    Object.preventExtensions = function preventExtensions(object) {
-        // this is misleading and breaks feature-detection, but
-        // allows "securable" code to "gracefully" degrade to working
-        // but insecure code.
-        return object;
-    };
-}
-
-// ES5 15.2.3.11
-// http://es5.github.com/#x15.2.3.11
-if (!Object.isSealed) {
-    Object.isSealed = function isSealed(object) {
-        return false;
-    };
-}
-
-// ES5 15.2.3.12
-// http://es5.github.com/#x15.2.3.12
-if (!Object.isFrozen) {
-    Object.isFrozen = function isFrozen(object) {
-        return false;
-    };
-}
-
-// ES5 15.2.3.13
-// http://es5.github.com/#x15.2.3.13
-if (!Object.isExtensible) {
-    Object.isExtensible = function isExtensible(object) {
-        // 1. If Type(O) is not Object throw a TypeError exception.
-        if (Object(object) === object) {
-            throw new TypeError(); // TODO message
-        }
-        // 2. Return the Boolean value of the [[Extensible]] internal property of O.
-        var name = '';
-        while (owns(object, name)) {
-            name += '?';
-        }
-        object[name] = true;
-        var returnValue = owns(object, name);
-        delete object[name];
-        return returnValue;
-    };
-}
-
-// ES5 15.2.3.14
-// http://es5.github.com/#x15.2.3.14
-if (!Object.keys) {
-    // http://whattheheadsaid.com/2010/10/a-safer-object-keys-compatibility-implementation
-    var hasDontEnumBug = true,
-        dontEnums = [
-            "toString",
-            "toLocaleString",
-            "valueOf",
-            "hasOwnProperty",
-            "isPrototypeOf",
-            "propertyIsEnumerable",
-            "constructor"
-        ],
-        dontEnumsLength = dontEnums.length;
-
-    for (var key in {"toString": null})
-        hasDontEnumBug = false;
-
-    Object.keys = function keys(object) {
-
-        if ((typeof object != "object" && typeof object != "function") || object === null)
-            throw new TypeError("Object.keys called on a non-object");
-
-        var keys = [];
-        for (var name in object) {
-            if (owns(object, name)) {
-                keys.push(name);
-            }
-        }
-
-        if (hasDontEnumBug) {
-            for (var i = 0, ii = dontEnumsLength; i < ii; i++) {
-                var dontEnum = dontEnums[i];
-                if (owns(object, dontEnum)) {
-                    keys.push(dontEnum);
-                }
-            }
-        }
-
-        return keys;
-    };
-
-}
-
-//
-// Date
-// ====
-//
-
-// ES5 15.9.5.43
-// http://es5.github.com/#x15.9.5.43
-// This function returns a String value represent the instance in time 
-// represented by this Date object. The format of the String is the Date Time 
-// string format defined in 15.9.1.15. All fields are present in the String. 
-// The time zone is always UTC, denoted by the suffix Z. If the time value of 
-// this object is not a finite Number a RangeError exception is thrown.
-if (!Date.prototype.toISOString || (new Date(-62198755200000).toISOString().indexOf('-000001') === -1)) {
-    Date.prototype.toISOString = function toISOString() {
-        var result, length, value, year;
-        if (!isFinite(this))
-            throw new RangeError;
-
-        // the date time string format is specified in 15.9.1.15.
-        result = [this.getUTCMonth() + 1, this.getUTCDate(),
-            this.getUTCHours(), this.getUTCMinutes(), this.getUTCSeconds()];
-        year = this.getUTCFullYear();
-        year = (year < 0 ? '-' : (year > 9999 ? '+' : '')) + ('00000' + Math.abs(year)).slice(0 <= year && year <= 9999 ? -4 : -6);
-
-        length = result.length;
-        while (length--) {
-            value = result[length];
-            // pad months, days, hours, minutes, and seconds to have two digits.
-            if (value < 10)
-                result[length] = "0" + value;
-        }
-        // pad milliseconds to have three digits.
-        return year + "-" + result.slice(0, 2).join("-") + "T" + result.slice(2).join(":") + "." +
-            ("000" + this.getUTCMilliseconds()).slice(-3) + "Z";
-    }
-}
-
-// ES5 15.9.4.4
-// http://es5.github.com/#x15.9.4.4
-if (!Date.now) {
-    Date.now = function now() {
-        return new Date().getTime();
-    };
-}
-
-// ES5 15.9.5.44
-// http://es5.github.com/#x15.9.5.44
-// This function provides a String representation of a Date object for use by 
-// JSON.stringify (15.12.3).
-if (!Date.prototype.toJSON) {
-    Date.prototype.toJSON = function toJSON(key) {
-        // When the toJSON method is called with argument key, the following 
-        // steps are taken:
-
-        // 1.  Let O be the result of calling ToObject, giving it the this
-        // value as its argument.
-        // 2. Let tv be ToPrimitive(O, hint Number).
-        // 3. If tv is a Number and is not finite, return null.
-        // XXX
-        // 4. Let toISO be the result of calling the [[Get]] internal method of
-        // O with argument "toISOString".
-        // 5. If IsCallable(toISO) is false, throw a TypeError exception.
-        if (typeof this.toISOString != "function")
-            throw new TypeError(); // TODO message
-        // 6. Return the result of calling the [[Call]] internal method of
-        //  toISO with O as the this value and an empty argument list.
-        return this.toISOString();
-
-        // NOTE 1 The argument is ignored.
-
-        // NOTE 2 The toJSON function is intentionally generic; it does not
-        // require that its this value be a Date object. Therefore, it can be
-        // transferred to other kinds of objects for use as a method. However,
-        // it does require that any such object have a toISOString method. An
-        // object is free to use the argument key to filter its
-        // stringification.
-    };
-}
-
-// ES5 15.9.4.2
-// http://es5.github.com/#x15.9.4.2
-// based on work shared by Daniel Friesen (dantman)
-// http://gist.github.com/303249
-if (Date.parse("+275760-09-13T00:00:00.000Z") !== 8.64e15) {
-    // XXX global assignment won't work in embeddings that use
-    // an alternate object for the context.
-    Date = (function(NativeDate) {
-
-        // Date.length === 7
-        var Date = function Date(Y, M, D, h, m, s, ms) {
-            var length = arguments.length;
-            if (this instanceof NativeDate) {
-                var date = length == 1 && String(Y) === Y ? // isString(Y)
-                    // We explicitly pass it through parse:
-                    new NativeDate(Date.parse(Y)) :
-                    // We have to manually make calls depending on argument
-                    // length here
-                    length >= 7 ? new NativeDate(Y, M, D, h, m, s, ms) :
-                    length >= 6 ? new NativeDate(Y, M, D, h, m, s) :
-                    length >= 5 ? new NativeDate(Y, M, D, h, m) :
-                    length >= 4 ? new NativeDate(Y, M, D, h) :
-                    length >= 3 ? new NativeDate(Y, M, D) :
-                    length >= 2 ? new NativeDate(Y, M) :
-                    length >= 1 ? new NativeDate(Y) :
-                                  new NativeDate();
-                // Prevent mixups with unfixed Date object
-                date.constructor = Date;
-                return date;
-            }
-            return NativeDate.apply(this, arguments);
-        };
-
-        // 15.9.1.15 Date Time String Format.
-        var isoDateExpression = new RegExp("^" +
-            "(\\d{4}|[\+\-]\\d{6})" + // four-digit year capture or sign + 6-digit extended year
-            "(?:-(\\d{2})" + // optional month capture
-            "(?:-(\\d{2})" + // optional day capture
-            "(?:" + // capture hours:minutes:seconds.milliseconds
-                "T(\\d{2})" + // hours capture
-                ":(\\d{2})" + // minutes capture
-                "(?:" + // optional :seconds.milliseconds
-                    ":(\\d{2})" + // seconds capture
-                    "(?:\\.(\\d{3}))?" + // milliseconds capture
-                ")?" +
-            "(?:" + // capture UTC offset component
-                "Z|" + // UTC capture
-                "(?:" + // offset specifier +/-hours:minutes
-                    "([-+])" + // sign capture
-                    "(\\d{2})" + // hours offset capture
-                    ":(\\d{2})" + // minutes offset capture
-                ")" +
-            ")?)?)?)?" +
-        "$");
-
-        // Copy any custom methods a 3rd party library may have added
-        for (var key in NativeDate)
-            Date[key] = NativeDate[key];
-
-        // Copy "native" methods explicitly; they may be non-enumerable
-        Date.now = NativeDate.now;
-        Date.UTC = NativeDate.UTC;
-        Date.prototype = NativeDate.prototype;
-        Date.prototype.constructor = Date;
-
-        // Upgrade Date.parse to handle simplified ISO 8601 strings
-        Date.parse = function parse(string) {
-            var match = isoDateExpression.exec(string);
-            if (match) {
-                match.shift(); // kill match[0], the full match
-                // parse months, days, hours, minutes, seconds, and milliseconds
-                for (var i = 1; i < 7; i++) {
-                    // provide default values if necessary
-                    match[i] = +(match[i] || (i < 3 ? 1 : 0));
-                    // match[1] is the month. Months are 0-11 in JavaScript
-                    // `Date` objects, but 1-12 in ISO notation, so we
-                    // decrement.
-                    if (i == 1)
-                        match[i]--;
-                }
-
-                // parse the UTC offset component
-                var minuteOffset = +match.pop(), hourOffset = +match.pop(), sign = match.pop();
-
-                // compute the explicit time zone offset if specified
-                var offset = 0;
-                if (sign) {
-                    // detect invalid offsets and return early
-                    if (hourOffset > 23 || minuteOffset > 59)
-                        return NaN;
-
-                    // express the provided time zone offset in minutes. The offset is
-                    // negative for time zones west of UTC; positive otherwise.
-                    offset = (hourOffset * 60 + minuteOffset) * 6e4 * (sign == "+" ? -1 : 1);
-                }
-
-                // Date.UTC for years between 0 and 99 converts year to 1900 + year
-                // The Gregorian calendar has a 400-year cycle, so 
-                // to Date.UTC(year + 400, .... ) - 12622780800000 == Date.UTC(year, ...),
-                // where 12622780800000 - number of milliseconds in Gregorian calendar 400 years
-                var year = +match[0];
-                if (0 <= year && year <= 99) {
-                    match[0] = year + 400;
-                    return NativeDate.UTC.apply(this, match) + offset - 12622780800000;
-                }
-
-                // compute a new UTC date value, accounting for the optional offset
-                return NativeDate.UTC.apply(this, match) + offset;
-            }
-            return NativeDate.parse.apply(this, arguments);
-        };
-
-        return Date;
-    })(Date);
-}
-
-//
-// String
-// ======
-//
-
-// ES5 15.5.4.20
-// http://es5.github.com/#x15.5.4.20
-var ws = "\x09\x0A\x0B\x0C\x0D\x20\xA0\u1680\u180E\u2000\u2001\u2002\u2003" +
-    "\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u202F\u205F\u3000\u2028" +
-    "\u2029\uFEFF";
-if (!String.prototype.trim || ws.trim()) {
-    // http://blog.stevenlevithan.com/archives/faster-trim-javascript
-    // http://perfectionkills.com/whitespace-deviations/
-    ws = "[" + ws + "]";
-    var trimBeginRegexp = new RegExp("^" + ws + ws + "*"),
-        trimEndRegexp = new RegExp(ws + ws + "*$");
-    String.prototype.trim = function trim() {
-        return String(this).replace(trimBeginRegexp, "").replace(trimEndRegexp, "");
-    };
-}
-
-//
-// Util
-// ======
-//
-
-// ES5 9.4
-// http://es5.github.com/#x9.4
-// http://jsperf.com/to-integer
-var toInteger = function (n) {
-    n = +n;
-    if (n !== n) // isNaN
-        n = 0;
-    else if (n !== 0 && n !== (1/0) && n !== -(1/0))
-        n = (n > 0 || -1) * Math.floor(Math.abs(n));
-    return n;
-};
-
-var prepareString = "a"[0] != "a",
-    // ES5 9.9
-    // http://es5.github.com/#x9.9
-    toObject = function (o) {
-        if (o == null) { // this matches both null and undefined
-            throw new TypeError(); // TODO message
-        }
-        // If the implementation doesn't support by-index access of
-        // string characters (ex. IE < 7), split the string
-        if (prepareString && typeof o == "string" && o) {
-            return o.split("");
-        }
-        return Object(o);
-    };
-});/* vim:ts=4:sts=4:sw=4:
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Irakli Gozalishvili <rfobic@gmail.com> (http://jeditoolkit.com)
- *      Mike de Boer <mike AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/lib/event_emitter', ['require', 'exports', 'module' ], function(require, exports, module) {
-"use strict";
-
-var EventEmitter = {};
-
-EventEmitter._emit =
-EventEmitter._dispatchEvent = function(eventName, e) {
-    this._eventRegistry = this._eventRegistry || {};
-    this._defaultHandlers = this._defaultHandlers || {};
-
-    var listeners = this._eventRegistry[eventName] || [];
-    var defaultHandler = this._defaultHandlers[eventName];
-    if (!listeners.length && !defaultHandler)
-        return;
-
-    e = e || {};
-    e.type = eventName;
-    
-    if (!e.stopPropagation) {
-        e.stopPropagation = function() {
-            this.propagationStopped = true;
-        };
-    }
-    
-    if (!e.preventDefault) {
-        e.preventDefault = function() {
-            this.defaultPrevented = true;
-        };
-    }
-
-    for (var i=0; i<listeners.length; i++) {
-        listeners[i](e);
-        if (e.propagationStopped)
-            break;
-    }
-    
-    if (defaultHandler && !e.defaultPrevented)
-        defaultHandler(e);
-};
-
-EventEmitter.setDefaultHandler = function(eventName, callback) {
-    this._defaultHandlers = this._defaultHandlers || {};
-    
-    if (this._defaultHandlers[eventName])
-        throw new Error("The default handler for '" + eventName + "' is already set");
-        
-    this._defaultHandlers[eventName] = callback;
-};
-
-EventEmitter.on =
-EventEmitter.addEventListener = function(eventName, callback) {
-    this._eventRegistry = this._eventRegistry || {};
-
-    var listeners = this._eventRegistry[eventName];
-    if (!listeners)
-        var listeners = this._eventRegistry[eventName] = [];
-
-    if (listeners.indexOf(callback) == -1)
-        listeners.push(callback);
-};
-
-EventEmitter.removeListener =
-EventEmitter.removeEventListener = function(eventName, callback) {
-    this._eventRegistry = this._eventRegistry || {};
-
-    var listeners = this._eventRegistry[eventName];
-    if (!listeners)
-        return;
-
-    var index = listeners.indexOf(callback);
-    if (index !== -1)
-        listeners.splice(index, 1);
-};
-
-EventEmitter.removeAllListeners = function(eventName) {
-    if (this._eventRegistry) this._eventRegistry[eventName] = [];
-};
-
-exports.EventEmitter = EventEmitter;
-
-});/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/lib/oop', ['require', 'exports', 'module' ], function(require, exports, module) {
-"use strict";
-
-exports.inherits = (function() {
-    var tempCtor = function() {};
-    return function(ctor, superCtor) {
-        tempCtor.prototype = superCtor.prototype;
-        ctor.super_ = superCtor.prototype;
-        ctor.prototype = new tempCtor();
-        ctor.prototype.constructor = ctor;
-    };
-}());
-
-exports.mixin = function(obj, mixin) {
-    for (var key in mixin) {
-        obj[key] = mixin[key];
-    }
-};
-
-exports.implement = function(proto, mixin) {
-    exports.mixin(proto, mixin);
-};
-
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/json_worker', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/worker/mirror', 'ace/mode/json/json_parse'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var Mirror = require("../worker/mirror").Mirror;
-var parse = require("./json/json_parse");
-
-var JsonWorker = exports.JsonWorker = function(sender) {
-    Mirror.call(this, sender);
-    this.setTimeout(200);
-};
-
-oop.inherits(JsonWorker, Mirror);
-
-(function() {
-
-    this.onUpdate = function() {
-        var value = this.doc.getValue();
-
-        try {
-            var result = parse(value);
-        } catch (e) {
-            var pos = this.charToDocumentPosition(e.at-1);
-            this.sender.emit("error", {
-                row: pos.row,
-                column: pos.column,
-                text: e.message,
-                type: "error"
-            });
-            return;
-        }
-        this.sender.emit("ok");
-    };
-
-    this.charToDocumentPosition = function(charPos) {
-        var i = 0;
-        var len = this.doc.getLength();
-        var nl = this.doc.getNewLineCharacter().length;
-
-        if (!len) {
-            return { row: 0, column: 0};
-        }
-
-        var lineStart = 0;
-        while (i < len) {
-            var line = this.doc.getLine(i);
-            var lineLength = line.length + nl;
-            if (lineStart + lineLength > charPos)
-                return {
-                    row: i,
-                    column: charPos - lineStart
-                };
-
-            lineStart += lineLength;
-            i += 1;
-        }
-
-        return {
-            row: i-1,
-            column: line.length
-        };
-    };
-
-}).call(JsonWorker.prototype);
-
-});define('ace/worker/mirror', ['require', 'exports', 'module' , 'ace/document', 'ace/lib/lang'], function(require, exports, module) {
-"use strict";
-
-var Document = require("../document").Document;
-var lang = require("../lib/lang");
-    
-var Mirror = exports.Mirror = function(sender) {
-    this.sender = sender;
-    var doc = this.doc = new Document("");
-    
-    var deferredUpdate = this.deferredUpdate = lang.deferredCall(this.onUpdate.bind(this));
-    
-    var _self = this;
-    sender.on("change", function(e) {
-        doc.applyDeltas([e.data]);        
-        deferredUpdate.schedule(_self.$timeout);
-    });
-};
-
-(function() {
-    
-    this.$timeout = 500;
-    
-    this.setTimeout = function(timeout) {
-        this.$timeout = timeout;
-    };
-    
-    this.setValue = function(value) {
-        this.doc.setValue(value);
-        this.deferredUpdate.schedule(this.$timeout);
-    };
-    
-    this.getValue = function(callbackId) {
-        this.sender.callback(this.doc.getValue(), callbackId);
-    };
-    
-    this.onUpdate = function() {
-        // abstract method
-    };
-    
-}).call(Mirror.prototype);
-
-});/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/document', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/event_emitter', 'ace/range', 'ace/anchor'], function(require, exports, module) {
-"use strict";
-
-var oop = require("./lib/oop");
-var EventEmitter = require("./lib/event_emitter").EventEmitter;
-var Range = require("./range").Range;
-var Anchor = require("./anchor").Anchor;
-
-var Document = function(text) {
-    this.$lines = [];
-
-    if (Array.isArray(text)) {
-        this.insertLines(0, text);
-    }
-    // There has to be one line at least in the document. If you pass an empty
-    // string to the insert function, nothing will happen. Workaround.
-    else if (text.length == 0) {
-        this.$lines = [""];
-    } else {
-        this.insert({row: 0, column:0}, text);
-    }
-};
-
-(function() {
-
-    oop.implement(this, EventEmitter);
-
-    this.setValue = function(text) {
-        var len = this.getLength();
-        this.remove(new Range(0, 0, len, this.getLine(len-1).length));
-        this.insert({row: 0, column:0}, text);
-    };
-
-    this.getValue = function() {
-        return this.getAllLines().join(this.getNewLineCharacter());
-    };
-
-    this.createAnchor = function(row, column) {
-        return new Anchor(this, row, column);
-    };
-
-    // check for IE split bug
-    if ("aaa".split(/a/).length == 0)
-        this.$split = function(text) {
-            return text.replace(/\r\n|\r/g, "\n").split("\n");
-        }
-    else
-        this.$split = function(text) {
-            return text.split(/\r\n|\r|\n/);
-        };
-
-
-    this.$detectNewLine = function(text) {
-        var match = text.match(/^.*?(\r\n|\r|\n)/m);
-        if (match) {
-            this.$autoNewLine = match[1];
-        } else {
-            this.$autoNewLine = "\n";
-        }
-    };
-
-    this.getNewLineCharacter = function() {
-      switch (this.$newLineMode) {
-          case "windows":
-              return "\r\n";
-
-          case "unix":
-              return "\n";
-
-          case "auto":
-              return this.$autoNewLine;
-      }
-    };
-
-    this.$autoNewLine = "\n";
-    this.$newLineMode = "auto";
-    this.setNewLineMode = function(newLineMode) {
-        if (this.$newLineMode === newLineMode)
-            return;
-
-        this.$newLineMode = newLineMode;
-    };
-
-    this.getNewLineMode = function() {
-        return this.$newLineMode;
-    };
-
-    this.isNewLine = function(text) {
-        return (text == "\r\n" || text == "\r" || text == "\n");
-    };
-
-    /**
-     * Get a verbatim copy of the given line as it is in the document
-     */
-    this.getLine = function(row) {
-        return this.$lines[row] || "";
-    };
-
-    this.getLines = function(firstRow, lastRow) {
-        return this.$lines.slice(firstRow, lastRow + 1);
-    };
-
-    /**
-     * Returns all lines in the document as string array. Warning: The caller
-     * should not modify this array!
-     */
-    this.getAllLines = function() {
-        return this.getLines(0, this.getLength());
-    };
-
-    this.getLength = function() {
-        return this.$lines.length;
-    };
-
-    this.getTextRange = function(range) {
-        if (range.start.row == range.end.row) {
-            return this.$lines[range.start.row].substring(range.start.column,
-                                                         range.end.column);
-        }
-        else {
-            var lines = [];
-            lines.push(this.$lines[range.start.row].substring(range.start.column));
-            lines.push.apply(lines, this.getLines(range.start.row+1, range.end.row-1));
-            lines.push(this.$lines[range.end.row].substring(0, range.end.column));
-            return lines.join(this.getNewLineCharacter());
-        }
-    };
-
-    this.$clipPosition = function(position) {
-        var length = this.getLength();
-        if (position.row >= length) {
-            position.row = Math.max(0, length - 1);
-            position.column = this.getLine(length-1).length;
-        }
-        return position;
-    };
-
-    this.insert = function(position, text) {
-        if (!text || text.length === 0)
-            return position;
-
-        position = this.$clipPosition(position);
-
-        // only detect new lines if the document has no line break yet
-        if (this.getLength() <= 1)
-            this.$detectNewLine(text);
-
-        var lines = this.$split(text);
-        var firstLine = lines.splice(0, 1)[0];
-        var lastLine = lines.length == 0 ? null : lines.splice(lines.length - 1, 1)[0];
-
-        position = this.insertInLine(position, firstLine);
-        if (lastLine !== null) {
-            position = this.insertNewLine(position); // terminate first line
-            position = this.insertLines(position.row, lines);
-            position = this.insertInLine(position, lastLine || "");
-        }
-        return position;
-    };
-
-    this.insertLines = function(row, lines) {
-        if (lines.length == 0)
-            return {row: row, column: 0};
-
-        var args = [row, 0];
-        args.push.apply(args, lines);
-        this.$lines.splice.apply(this.$lines, args);
-
-        var range = new Range(row, 0, row + lines.length, 0);
-        var delta = {
-            action: "insertLines",
-            range: range,
-            lines: lines
-        };
-        this._emit("change", { data: delta });
-        return range.end;
-    };
-
-    this.insertNewLine = function(position) {
-        position = this.$clipPosition(position);
-        var line = this.$lines[position.row] || "";
-
-        this.$lines[position.row] = line.substring(0, position.column);
-        this.$lines.splice(position.row + 1, 0, line.substring(position.column, line.length));
-
-        var end = {
-            row : position.row + 1,
-            column : 0
-        };
-
-        var delta = {
-            action: "insertText",
-            range: Range.fromPoints(position, end),
-            text: this.getNewLineCharacter()
-        };
-        this._emit("change", { data: delta });
-
-        return end;
-    };
-
-    this.insertInLine = function(position, text) {
-        if (text.length == 0)
-            return position;
-
-        var line = this.$lines[position.row] || "";
-
-        this.$lines[position.row] = line.substring(0, position.column) + text
-                + line.substring(position.column);
-
-        var end = {
-            row : position.row,
-            column : position.column + text.length
-        };
-
-        var delta = {
-            action: "insertText",
-            range: Range.fromPoints(position, end),
-            text: text
-        };
-        this._emit("change", { data: delta });
-
-        return end;
-    };
-
-    this.remove = function(range) {
-        // clip to document
-        range.start = this.$clipPosition(range.start);
-        range.end = this.$clipPosition(range.end);
-
-        if (range.isEmpty())
-            return range.start;
-
-        var firstRow = range.start.row;
-        var lastRow = range.end.row;
-
-        if (range.isMultiLine()) {
-            var firstFullRow = range.start.column == 0 ? firstRow : firstRow + 1;
-            var lastFullRow = lastRow - 1;
-
-            if (range.end.column > 0)
-                this.removeInLine(lastRow, 0, range.end.column);
-
-            if (lastFullRow >= firstFullRow)
-                this.removeLines(firstFullRow, lastFullRow);
-
-            if (firstFullRow != firstRow) {
-                this.removeInLine(firstRow, range.start.column, this.getLine(firstRow).length);
-                this.removeNewLine(range.start.row);
-            }
-        }
-        else {
-            this.removeInLine(firstRow, range.start.column, range.end.column);
-        }
-        return range.start;
-    };
-
-    this.removeInLine = function(row, startColumn, endColumn) {
-        if (startColumn == endColumn)
-            return;
-
-        var range = new Range(row, startColumn, row, endColumn);
-        var line = this.getLine(row);
-        var removed = line.substring(startColumn, endColumn);
-        var newLine = line.substring(0, startColumn) + line.substring(endColumn, line.length);
-        this.$lines.splice(row, 1, newLine);
-
-        var delta = {
-            action: "removeText",
-            range: range,
-            text: removed
-        };
-        this._emit("change", { data: delta });
-        return range.start;
-    };
-
-    /**
-     * Removes a range of full lines
-     *
-     * @param firstRow {Integer} The first row to be removed
-     * @param lastRow {Integer} The last row to be removed
-     * @return {String[]} The removed lines
-     */
-    this.removeLines = function(firstRow, lastRow) {
-        var range = new Range(firstRow, 0, lastRow + 1, 0);
-        var removed = this.$lines.splice(firstRow, lastRow - firstRow + 1);
-
-        var delta = {
-            action: "removeLines",
-            range: range,
-            nl: this.getNewLineCharacter(),
-            lines: removed
-        };
-        this._emit("change", { data: delta });
-        return removed;
-    };
-
-    this.removeNewLine = function(row) {
-        var firstLine = this.getLine(row);
-        var secondLine = this.getLine(row+1);
-
-        var range = new Range(row, firstLine.length, row+1, 0);
-        var line = firstLine + secondLine;
-
-        this.$lines.splice(row, 2, line);
-
-        var delta = {
-            action: "removeText",
-            range: range,
-            text: this.getNewLineCharacter()
-        };
-        this._emit("change", { data: delta });
-    };
-
-    this.replace = function(range, text) {
-        if (text.length == 0 && range.isEmpty())
-            return range.start;
-
-        // Shortcut: If the text we want to insert is the same as it is already
-        // in the document, we don't have to replace anything.
-        if (text == this.getTextRange(range))
-            return range.end;
-
-        this.remove(range);
-        if (text) {
-            var end = this.insert(range.start, text);
-        }
-        else {
-            end = range.start;
-        }
-
-        return end;
-    };
-
-    this.applyDeltas = function(deltas) {
-        for (var i=0; i<deltas.length; i++) {
-            var delta = deltas[i];
-            var range = Range.fromPoints(delta.range.start, delta.range.end);
-
-            if (delta.action == "insertLines")
-                this.insertLines(range.start.row, delta.lines);
-            else if (delta.action == "insertText")
-                this.insert(range.start, delta.text);
-            else if (delta.action == "removeLines")
-                this.removeLines(range.start.row, range.end.row - 1);
-            else if (delta.action == "removeText")
-                this.remove(range);
-        }
-    };
-
-    this.revertDeltas = function(deltas) {
-        for (var i=deltas.length-1; i>=0; i--) {
-            var delta = deltas[i];
-
-            var range = Range.fromPoints(delta.range.start, delta.range.end);
-
-            if (delta.action == "insertLines")
-                this.removeLines(range.start.row, range.end.row - 1);
-            else if (delta.action == "insertText")
-                this.remove(range);
-            else if (delta.action == "removeLines")
-                this.insertLines(range.start.row, delta.lines);
-            else if (delta.action == "removeText")
-                this.insert(range.start, delta.text);
-        }
-    };
-
-}).call(Document.prototype);
-
-exports.Document = Document;
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/range', ['require', 'exports', 'module' ], function(require, exports, module) {
-"use strict";
-
-var Range = function(startRow, startColumn, endRow, endColumn) {
-    this.start = {
-        row: startRow,
-        column: startColumn
-    };
-
-    this.end = {
-        row: endRow,
-        column: endColumn
-    };
-};
-
-(function() {
-    this.isEqual = function(range) {
-        return this.start.row == range.start.row &&
-            this.end.row == range.end.row &&
-            this.start.column == range.start.column &&
-            this.end.column == range.end.column
-    };
-
-    this.toString = function() {
-        return ("Range: [" + this.start.row + "/" + this.start.column +
-            "] -> [" + this.end.row + "/" + this.end.column + "]");
-    };
-
-    this.contains = function(row, column) {
-        return this.compare(row, column) == 0;
-    };
-
-    /**
-     * Compares this range (A) with another range (B), where B is the passed in
-     * range.
-     *
-     * Return values:
-     *  -2: (B) is infront of (A) and doesn't intersect with (A)
-     *  -1: (B) begins before (A) but ends inside of (A)
-     *   0: (B) is completly inside of (A) OR (A) is complety inside of (B)
-     *  +1: (B) begins inside of (A) but ends outside of (A)
-     *  +2: (B) is after (A) and doesn't intersect with (A)
-     *
-     *  42: FTW state: (B) ends in (A) but starts outside of (A)
-     */
-    this.compareRange = function(range) {
-        var cmp,
-            end = range.end,
-            start = range.start;
-
-        cmp = this.compare(end.row, end.column);
-        if (cmp == 1) {
-            cmp = this.compare(start.row, start.column);
-            if (cmp == 1) {
-                return 2;
-            } else if (cmp == 0) {
-                return 1;
-            } else {
-                return 0;
-            }
-        } else if (cmp == -1) {
-            return -2;
-        } else {
-            cmp = this.compare(start.row, start.column);
-            if (cmp == -1) {
-                return -1;
-            } else if (cmp == 1) {
-                return 42;
-            } else {
-                return 0;
-            }
-        }
-    }
-
-    this.comparePoint = function(p) {
-        return this.compare(p.row, p.column);
-    }
-
-    this.containsRange = function(range) {
-        return this.comparePoint(range.start) == 0 && this.comparePoint(range.end) == 0;
-    }
-
-    this.intersectsRange = function(range) {
-        var cmp = this.compareRange(range);
-        return (cmp == -1 || cmp == 0 || cmp == 1);
-    }
-
-    this.isEnd = function(row, column) {
-        return this.end.row == row && this.end.column == column;
-    }
-
-    this.isStart = function(row, column) {
-        return this.start.row == row && this.start.column == column;
-    }
-
-    this.setStart = function(row, column) {
-        if (typeof row == "object") {
-            this.start.column = row.column;
-            this.start.row = row.row;
-        } else {
-            this.start.row = row;
-            this.start.column = column;
-        }
-    }
-
-    this.setEnd = function(row, column) {
-        if (typeof row == "object") {
-            this.end.column = row.column;
-            this.end.row = row.row;
-        } else {
-            this.end.row = row;
-            this.end.column = column;
-        }
-    }
-
-    this.inside = function(row, column) {
-        if (this.compare(row, column) == 0) {
-            if (this.isEnd(row, column) || this.isStart(row, column)) {
-                return false;
-            } else {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    this.insideStart = function(row, column) {
-        if (this.compare(row, column) == 0) {
-            if (this.isEnd(row, column)) {
-                return false;
-            } else {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    this.insideEnd = function(row, column) {
-        if (this.compare(row, column) == 0) {
-            if (this.isStart(row, column)) {
-                return false;
-            } else {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    this.compare = function(row, column) {
-        if (!this.isMultiLine()) {
-            if (row === this.start.row) {
-                return column < this.start.column ? -1 : (column > this.end.column ? 1 : 0);
-            };
-        }
-
-        if (row < this.start.row)
-            return -1;
-
-        if (row > this.end.row)
-            return 1;
-
-        if (this.start.row === row)
-            return column >= this.start.column ? 0 : -1;
-
-        if (this.end.row === row)
-            return column <= this.end.column ? 0 : 1;
-
-        return 0;
-    };
-
-    /**
-     * Like .compare(), but if isStart is true, return -1;
-     */
-    this.compareStart = function(row, column) {
-        if (this.start.row == row && this.start.column == column) {
-            return -1;
-        } else {
-            return this.compare(row, column);
-        }
-    }
-
-    /**
-     * Like .compare(), but if isEnd is true, return 1;
-     */
-    this.compareEnd = function(row, column) {
-        if (this.end.row == row && this.end.column == column) {
-            return 1;
-        } else {
-            return this.compare(row, column);
-        }
-    }
-
-    this.compareInside = function(row, column) {
-        if (this.end.row == row && this.end.column == column) {
-            return 1;
-        } else if (this.start.row == row && this.start.column == column) {
-            return -1;
-        } else {
-            return this.compare(row, column);
-        }
-    }
-
-    this.clipRows = function(firstRow, lastRow) {
-        if (this.end.row > lastRow) {
-            var end = {
-                row: lastRow+1,
-                column: 0
-            };
-        }
-
-        if (this.start.row > lastRow) {
-            var start = {
-                row: lastRow+1,
-                column: 0
-            };
-        }
-
-        if (this.start.row < firstRow) {
-            var start = {
-                row: firstRow,
-                column: 0
-            };
-        }
-
-        if (this.end.row < firstRow) {
-            var end = {
-                row: firstRow,
-                column: 0
-            };
-        }
-        return Range.fromPoints(start || this.start, end || this.end);
-    };
-
-    this.extend = function(row, column) {
-        var cmp = this.compare(row, column);
-
-        if (cmp == 0)
-            return this;
-        else if (cmp == -1)
-            var start = {row: row, column: column};
-        else
-            var end = {row: row, column: column};
-
-        return Range.fromPoints(start || this.start, end || this.end);
-    };
-
-    this.fixOrientation = function() {
-        if (
-            this.start.row < this.end.row 
-            || (this.start.row == this.end.row && this.start.column < this.end.column)
-        ) {
-            return false;
-        }
-        
-        var temp = this.start;
-        this.end = this.start;
-        this.start = temp;
-        return true;
-    };
-
-
-    this.isEmpty = function() {
-        return (this.start.row == this.end.row && this.start.column == this.end.column);
-    };
-
-    this.isMultiLine = function() {
-        return (this.start.row !== this.end.row);
-    };
-
-    this.clone = function() {
-        return Range.fromPoints(this.start, this.end);
-    };
-
-    this.collapseRows = function() {
-        if (this.end.column == 0)
-            return new Range(this.start.row, 0, Math.max(this.start.row, this.end.row-1), 0)
-        else
-            return new Range(this.start.row, 0, this.end.row, 0)
-    };
-
-    this.toScreenRange = function(session) {
-        var screenPosStart =
-            session.documentToScreenPosition(this.start);
-        var screenPosEnd =
-            session.documentToScreenPosition(this.end);
-
-        return new Range(
-            screenPosStart.row, screenPosStart.column,
-            screenPosEnd.row, screenPosEnd.column
-        );
-    };
-
-}).call(Range.prototype);
-
-
-Range.fromPoints = function(start, end) {
-    return new Range(start.row, start.column, end.row, end.column);
-};
-
-exports.Range = Range;
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/anchor', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/event_emitter'], function(require, exports, module) {
-"use strict";
-
-var oop = require("./lib/oop");
-var EventEmitter = require("./lib/event_emitter").EventEmitter;
-
-/**
- * An Anchor is a floating pointer in the document. Whenever text is inserted or
- * deleted before the cursor, the position of the cursor is updated
- */
-var Anchor = exports.Anchor = function(doc, row, column) {
-    this.document = doc;
-    
-    if (typeof column == "undefined")
-        this.setPosition(row.row, row.column);
-    else
-        this.setPosition(row, column);
-
-    this.$onChange = this.onChange.bind(this);
-    doc.on("change", this.$onChange);
-};
-
-(function() {
-
-    oop.implement(this, EventEmitter);
-    
-    this.getPosition = function() {
-        return this.$clipPositionToDocument(this.row, this.column);
-    };
-    
-    this.getDocument = function() {
-        return this.document;
-    };
-    
-    this.onChange = function(e) {
-        var delta = e.data;
-        var range = delta.range;
-            
-        if (range.start.row == range.end.row && range.start.row != this.row)
-            return;
-            
-        if (range.start.row > this.row)
-            return;
-            
-        if (range.start.row == this.row && range.start.column > this.column)
-            return;
-    
-        var row = this.row;
-        var column = this.column;
-        
-        if (delta.action === "insertText") {
-            if (range.start.row === row && range.start.column <= column) {
-                if (range.start.row === range.end.row) {
-                    column += range.end.column - range.start.column;
-                }
-                else {
-                    column -= range.start.column;
-                    row += range.end.row - range.start.row;
-                }
-            }
-            else if (range.start.row !== range.end.row && range.start.row < row) {
-                row += range.end.row - range.start.row;
-            }
-        } else if (delta.action === "insertLines") {
-            if (range.start.row <= row) {
-                row += range.end.row - range.start.row;
-            }
-        }
-        else if (delta.action == "removeText") {
-            if (range.start.row == row && range.start.column < column) {
-                if (range.end.column >= column)
-                    column = range.start.column;
-                else
-                    column = Math.max(0, column - (range.end.column - range.start.column));
-                
-            } else if (range.start.row !== range.end.row && range.start.row < row) {
-                if (range.end.row == row) {
-                    column = Math.max(0, column - range.end.column) + range.start.column;
-                }
-                row -= (range.end.row - range.start.row);
-            }
-            else if (range.end.row == row) {
-                row -= range.end.row - range.start.row;
-                column = Math.max(0, column - range.end.column) + range.start.column;
-            }
-        } else if (delta.action == "removeLines") {
-            if (range.start.row <= row) {
-                if (range.end.row <= row)
-                    row -= range.end.row - range.start.row;
-                else {
-                    row = range.start.row;
-                    column = 0;
-                }
-            }
-        }
-
-        this.setPosition(row, column, true);
-    };
-
-    this.setPosition = function(row, column, noClip) {
-        var pos;
-        if (noClip) {
-            pos = {
-                row: row,
-                column: column
-            };
-        }
-        else {
-            pos = this.$clipPositionToDocument(row, column);
-        }
-        
-        if (this.row == pos.row && this.column == pos.column)
-            return;
-            
-        var old = {
-            row: this.row,
-            column: this.column
-        };
-        
-        this.row = pos.row;
-        this.column = pos.column;
-        this._emit("change", {
-            old: old,
-            value: pos
-        });
-    };
-    
-    this.detach = function() {
-        this.document.removeEventListener("change", this.$onChange);
-    };
-    
-    this.$clipPositionToDocument = function(row, column) {
-        var pos = {};
-    
-        if (row >= this.document.getLength()) {
-            pos.row = Math.max(0, this.document.getLength() - 1);
-            pos.column = this.document.getLine(pos.row).length;
-        }
-        else if (row < 0) {
-            pos.row = 0;
-            pos.column = 0;
-        }
-        else {
-            pos.row = row;
-            pos.column = Math.min(this.document.getLine(pos.row).length, Math.max(0, column));
-        }
-        
-        if (column < 0)
-            pos.column = 0;
-            
-        return pos;
-    };
-    
-}).call(Anchor.prototype);
-
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/lib/lang', ['require', 'exports', 'module' ], function(require, exports, module) {
-"use strict";
-
-exports.stringReverse = function(string) {
-    return string.split("").reverse().join("");
-};
-
-exports.stringRepeat = function (string, count) {
-     return new Array(count + 1).join(string);
-};
-
-var trimBeginRegexp = /^\s\s*/;
-var trimEndRegexp = /\s\s*$/;
-
-exports.stringTrimLeft = function (string) {
-    return string.replace(trimBeginRegexp, '');
-};
-
-exports.stringTrimRight = function (string) {
-    return string.replace(trimEndRegexp, '');
-};
-
-exports.copyObject = function(obj) {
-    var copy = {};
-    for (var key in obj) {
-        copy[key] = obj[key];
-    }
-    return copy;
-};
-
-exports.copyArray = function(array){
-    var copy = [];
-    for (var i=0, l=array.length; i<l; i++) {
-        if (array[i] && typeof array[i] == "object")
-            copy[i] = this.copyObject( array[i] );
-        else 
-            copy[i] = array[i];
-    }
-    return copy;
-};
-
-exports.deepCopy = function (obj) {
-    if (typeof obj != "object") {
-        return obj;
-    }
-    
-    var copy = obj.constructor();
-    for (var key in obj) {
-        if (typeof obj[key] == "object") {
-            copy[key] = this.deepCopy(obj[key]);
-        } else {
-            copy[key] = obj[key];
-        }
-    }
-    return copy;
-};
-
-exports.arrayToMap = function(arr) {
-    var map = {};
-    for (var i=0; i<arr.length; i++) {
-        map[arr[i]] = 1;
-    }
-    return map;
-
-};
-
-/**
- * splice out of 'array' anything that === 'value'
- */
-exports.arrayRemove = function(array, value) {
-  for (var i = 0; i <= array.length; i++) {
-    if (value === array[i]) {
-      array.splice(i, 1);
-    }
-  }
-};
-
-exports.escapeRegExp = function(str) {
-    return str.replace(/([.*+?^${}()|[\]\/\\])/g, '\\$1');
-};
-
-exports.deferredCall = function(fcn) {
-
-    var timer = null;
-    var callback = function() {
-        timer = null;
-        fcn();
-    };
-
-    var deferred = function(timeout) {
-        deferred.cancel();
-        timer = setTimeout(callback, timeout || 0);
-        return deferred;
-    };
-
-    deferred.schedule = deferred;
-
-    deferred.call = function() {
-        this.cancel();
-        fcn();
-        return deferred;
-    };
-
-    deferred.cancel = function() {
-        clearTimeout(timer);
-        timer = null;
-        return deferred;
-    };
-
-    return deferred;
-};
-
-});
-/*
-    http://www.JSON.org/json_parse.js
-    2008-09-18
-
-    Public Domain.
-
-    NO WARRANTY EXPRESSED OR IMPLIED. USE AT YOUR OWN RISK.
-
-    This file creates a json_parse function.
-
-        json_parse(text, reviver)
-            This method parses a JSON text to produce an object or array.
-            It can throw a SyntaxError exception.
-
-            The optional reviver parameter is a function that can filter and
-            transform the results. It receives each of the keys and values,
-            and its return value is used instead of the original value.
-            If it returns what it received, then the structure is not modified.
-            If it returns undefined then the member is deleted.
-
-            Example:
-
-            // Parse the text. Values that look like ISO date strings will
-            // be converted to Date objects.
-
-            myData = json_parse(text, function (key, value) {
-                var a;
-                if (typeof value === 'string') {
-                    a =
-/^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2}(?:\.\d*)?)Z$/.exec(value);
-                    if (a) {
-                        return new Date(Date.UTC(+a[1], +a[2] - 1, +a[3], +a[4],
-                            +a[5], +a[6]));
-                    }
-                }
-                return value;
-            });
-
-    This is a reference implementation. You are free to copy, modify, or
-    redistribute.
-
-    This code should be minified before deployment.
-    See http://javascript.crockford.com/jsmin.html
-
-    USE YOUR OWN COPY. IT IS EXTREMELY UNWISE TO LOAD CODE FROM SERVERS YOU DO
-    NOT CONTROL.
-*/
-
-/*members "", "\"", "\/", "\\", at, b, call, charAt, f, fromCharCode,
-    hasOwnProperty, message, n, name, push, r, t, text
-*/
-
-define('ace/mode/json/json_parse', ['require', 'exports', 'module' ], function(require, exports, module) {
-"use strict";
-
-// This is a function that can parse a JSON text, producing a JavaScript
-// data structure. It is a simple, recursive descent parser. It does not use
-// eval or regular expressions, so it can be used as a model for implementing
-// a JSON parser in other languages.
-
-// We are defining the function inside of another function to avoid creating
-// global variables.
-
-    var at,     // The index of the current character
-        ch,     // The current character
-        escapee = {
-            '"':  '"',
-            '\\': '\\',
-            '/':  '/',
-            b:    '\b',
-            f:    '\f',
-            n:    '\n',
-            r:    '\r',
-            t:    '\t'
-        },
-        text,
-
-        error = function (m) {
-
-// Call error when something is wrong.
-
-            throw {
-                name:    'SyntaxError',
-                message: m,
-                at:      at,
-                text:    text
-            };
-        },
-
-        next = function (c) {
-
-// If a c parameter is provided, verify that it matches the current character.
-
-            if (c && c !== ch) {
-                error("Expected '" + c + "' instead of '" + ch + "'");
-            }
-
-// Get the next character. When there are no more characters,
-// return the empty string.
-
-            ch = text.charAt(at);
-            at += 1;
-            return ch;
-        },
-
-        number = function () {
-
-// Parse a number value.
-
-            var number,
-                string = '';
-
-            if (ch === '-') {
-                string = '-';
-                next('-');
-            }
-            while (ch >= '0' && ch <= '9') {
-                string += ch;
-                next();
-            }
-            if (ch === '.') {
-                string += '.';
-                while (next() && ch >= '0' && ch <= '9') {
-                    string += ch;
-                }
-            }
-            if (ch === 'e' || ch === 'E') {
-                string += ch;
-                next();
-                if (ch === '-' || ch === '+') {
-                    string += ch;
-                    next();
-                }
-                while (ch >= '0' && ch <= '9') {
-                    string += ch;
-                    next();
-                }
-            }
-            number = +string;
-            if (isNaN(number)) {
-                error("Bad number");
-            } else {
-                return number;
-            }
-        },
-
-        string = function () {
-
-// Parse a string value.
-
-            var hex,
-                i,
-                string = '',
-                uffff;
-
-// When parsing for string values, we must look for " and \ characters.
-
-            if (ch === '"') {
-                while (next()) {
-                    if (ch === '"') {
-                        next();
-                        return string;
-                    } else if (ch === '\\') {
-                        next();
-                        if (ch === 'u') {
-                            uffff = 0;
-                            for (i = 0; i < 4; i += 1) {
-                                hex = parseInt(next(), 16);
-                                if (!isFinite(hex)) {
-                                    break;
-                                }
-                                uffff = uffff * 16 + hex;
-                            }
-                            string += String.fromCharCode(uffff);
-                        } else if (typeof escapee[ch] === 'string') {
-                            string += escapee[ch];
-                        } else {
-                            break;
-                        }
-                    } else {
-                        string += ch;
-                    }
-                }
-            }
-            error("Bad string");
-        },
-
-        white = function () {
-
-// Skip whitespace.
-
-            while (ch && ch <= ' ') {
-                next();
-            }
-        },
-
-        word = function () {
-
-// true, false, or null.
-
-            switch (ch) {
-            case 't':
-                next('t');
-                next('r');
-                next('u');
-                next('e');
-                return true;
-            case 'f':
-                next('f');
-                next('a');
-                next('l');
-                next('s');
-                next('e');
-                return false;
-            case 'n':
-                next('n');
-                next('u');
-                next('l');
-                next('l');
-                return null;
-            }
-            error("Unexpected '" + ch + "'");
-        },
-
-        value,  // Place holder for the value function.
-
-        array = function () {
-
-// Parse an array value.
-
-            var array = [];
-
-            if (ch === '[') {
-                next('[');
-                white();
-                if (ch === ']') {
-                    next(']');
-                    return array;   // empty array
-                }
-                while (ch) {
-                    array.push(value());
-                    white();
-                    if (ch === ']') {
-                        next(']');
-                        return array;
-                    }
-                    next(',');
-                    white();
-                }
-            }
-            error("Bad array");
-        },
-
-        object = function () {
-
-// Parse an object value.
-
-            var key,
-                object = {};
-
-            if (ch === '{') {
-                next('{');
-                white();
-                if (ch === '}') {
-                    next('}');
-                    return object;   // empty object
-                }
-                while (ch) {
-                    key = string();
-                    white();
-                    next(':');
-                    if (Object.hasOwnProperty.call(object, key)) {
-                        error('Duplicate key "' + key + '"');
-                    }
-                    object[key] = value();
-                    white();
-                    if (ch === '}') {
-                        next('}');
-                        return object;
-                    }
-                    next(',');
-                    white();
-                }
-            }
-            error("Bad object");
-        };
-
-    value = function () {
-
-// Parse a JSON value. It could be an object, an array, a string, a number,
-// or a word.
-
-        white();
-        switch (ch) {
-        case '{':
-            return object();
-        case '[':
-            return array();
-        case '"':
-            return string();
-        case '-':
-            return number();
-        default:
-            return ch >= '0' && ch <= '9' ? number() : word();
-        }
-    };
-
-// Return the json_parse function. It will have access to all of the above
-// functions and variables.
-
-    return function (source, reviver) {
-        var result;
-
-        text = source;
-        at = 0;
-        ch = ' ';
-        result = value();
-        white();
-        if (ch) {
-            error("Syntax error");
-        }
-
-// If there is a reviver function, we recursively walk the new structure,
-// passing each name/value pair to the reviver function for possible
-// transformation, starting with a temporary root object that holds the result
-// in an empty key. If there is not a reviver function, we simply return the
-// result.
-
-        return typeof reviver === 'function' ? function walk(holder, key) {
-            var k, v, value = holder[key];
-            if (value && typeof value === 'object') {
-                for (k in value) {
-                    if (Object.hasOwnProperty.call(value, k)) {
-                        v = walk(value, k);
-                        if (v !== undefined) {
-                            value[k] = v;
-                        } else {
-                            delete value[k];
-                        }
-                    }
-                }
-            }
-            return reviver.call(holder, key, value);
-        }({'': result}, '') : result;
-    };
-});
\ No newline at end of file
diff --git a/apps/files_texteditor/js/editor.js b/apps/files_texteditor/js/editor.js
deleted file mode 100644
index 3784ea1032..0000000000
--- a/apps/files_texteditor/js/editor.js
+++ /dev/null
@@ -1,339 +0,0 @@
-function setEditorSize(){
-	// Sets the size of the text editor window.
-	fillWindow($('#editor'));
-}
-
-function getFileExtension(file){
-	var parts=file.split('.');
-	return parts[parts.length-1];
-}
-
-function setSyntaxMode(ext){
-	// Loads the syntax mode files and tells the editor
-	var filetype = new Array();
-	// add file extensions like this: filetype["extension"] = "filetype":
-	filetype["h"] = "c_cpp";
-	filetype["c"] = "c_cpp";
-	filetype["clj"] = "clojure";
-	filetype["coffee"] = "coffee"; // coffescript can be compiled to javascript
-	filetype["coldfusion"] = "cfc";
-	filetype["cpp"] = "c_cpp";
-	filetype["cs"] = "csharp";
-	filetype["css"] = "css";
-	filetype["groovy"] = "groovy";
-	filetype["haxe"] = "hx";
-	filetype["htm"] = "html";
-	filetype["html"] = "html";
-	filetype["java"] = "java";
-	filetype["js"] = "javascript";
-	filetype["jsm"] = "javascript";
-	filetype["json"] = "json";
-	filetype["latex"] = "latex";
-        filetype["less"] = "less";
-	filetype["ly"] = "latex";
-	filetype["ily"] = "latex";
-	filetype["lua"] = "lua";
-	filetype["markdown"] = "markdown";
-	filetype["md"] = "markdown";
-	filetype["mdown"] = "markdown";
-	filetype["mdwn"] = "markdown";
-	filetype["mkd"] = "markdown";
-	filetype["ml"] = "ocaml";
-	filetype["mli"] = "ocaml";
-	filetype["pl"] = "perl";
-	filetype["php"] = "php";
-	filetype["powershell"] = "ps1";
-	filetype["py"] = "python";
-	filetype["rb"] = "ruby";
-	filetype["scad"] = "scad"; // seems to be something like 3d model files printed with e.g. reprap
-	filetype["scala"] = "scala";
-	filetype["scss"] = "scss"; // "sassy css"
-        filetype["sh"] = "sh";
-	filetype["sql"] = "sql";
-	filetype["svg"] = "svg";
-	filetype["textile"] = "textile"; // related to markdown
-	filetype["xml"] = "xml";
-
-	if(filetype[ext]!=null){
-		// Then it must be in the array, so load the custom syntax mode
-		// Set the syntax mode
-		OC.addScript('files_texteditor','aceeditor/mode-'+filetype[ext], function(){
-			var SyntaxMode = require("ace/mode/"+filetype[ext]).Mode;
-			window.aceEditor.getSession().setMode(new SyntaxMode());
-		});
-	}
-}
-
-function showControls(filename,writeperms){
-	// Loads the control bar at the top.
-	// Load the new toolbar.
-	var editorbarhtml = '<div id="editorcontrols" style="display: none;"><div class="crumb svg last" id="breadcrumb_file" style="background-image:url(&quot;'+OC.imagePath('core','breadcrumb.png')+'&quot;)"><p>'+filename.replace(/</, "&lt;").replace(/>/, "&gt;")+'</p></div>';
-	if(writeperms=="true"){
-		editorbarhtml += '<button id="editor_save">'+t('files_texteditor','Save')+'</button><div class="separator"></div>';
-	}
-	editorbarhtml += '<label for="editorseachval">Search:</label><input type="text" name="editorsearchval" id="editorsearchval"><div class="separator"></div><button id="editor_close">'+t('files_texteditor','Close')+'</button></div>';
-	// Change breadcrumb classes
-	$('#controls .last').removeClass('last');
-	$('#controls').append(editorbarhtml);
-	$('#editorcontrols').fadeIn('slow');
-}
-
-function bindControlEvents(){
-	$("#editor_save").die('click',doFileSave).live('click',doFileSave);
-	$('#editor_close').die('click',hideFileEditor).live('click',hideFileEditor);
-	$('#editorsearchval').die('keyup', doSearch).live('keyup', doSearch);
-	$('#clearsearchbtn').die('click', resetSearch).live('click', resetSearch);
-	$('#nextsearchbtn').die('click', nextSearchResult).live('click', nextSearchResult);
-}
-
-// returns true or false if the editor is in view or not
-function editorIsShown(){
-	// Not working as intended. Always returns true.
-	return is_editor_shown;
-}
-
-//resets the search
-function resetSearch(){
-	$('#editorsearchval').val('');
-	$('#nextsearchbtn').remove();
-	$('#clearsearchbtn').remove();
-	window.aceEditor.gotoLine(0);
-}
-
-// moves the cursor to the next search resukt
-function nextSearchResult(){
-	window.aceEditor.findNext();
-}
-// Performs the initial search
-function doSearch(){
-	// check if search box empty?
-	if($('#editorsearchval').val()==''){
-		// Hide clear button
-		window.aceEditor.gotoLine(0);
-		$('#nextsearchbtn').remove();
-		$('#clearsearchbtn').remove();
-	} else {
-		// New search
-		// Reset cursor
-		window.aceEditor.gotoLine(0);
-		// Do search
-		window.aceEditor.find($('#editorsearchval').val(),{
-			backwards: false,
-			wrap: false,
-			caseSensitive: false,
-			wholeWord: false,
-			regExp: false
-		});
-		// Show next and clear buttons
-		// check if already there
-		if($('#nextsearchbtn').length==0){
-			var nextbtnhtml = '<button id="nextsearchbtn">Next</button>';
-			var clearbtnhtml = '<button id="clearsearchbtn">Clear</button>';
-			$('#editorsearchval').after(nextbtnhtml).after(clearbtnhtml);
-		}
-	}
-}
-
-// Tries to save the file.
-function doFileSave(){
-	if(editorIsShown()){
-		// Changed contents?
-		if($('#editor').attr('data-edited')=='true'){
-			// Get file path
-			var path = $('#editor').attr('data-dir')+'/'+$('#editor').attr('data-filename');
-			// Get original mtime
-			var mtime = $('#editor').attr('data-mtime');
-			// Show saving spinner
-			$("#editor_save").die('click',doFileSave);
-			$('#save_result').remove();
-			$('#editor_save').text(t('files_texteditor','Saving...'));
-			// Get the data
-			var filecontents = window.aceEditor.getSession().getValue();
-			// Send the data
-			$.post(OC.filePath('files_texteditor','ajax','savefile.php'), { filecontents: filecontents, path: path, mtime: mtime },function(jsondata){
-				if(jsondata.status!='success'){
-					// Save failed
-					$('#editor_save').text(t('files_texteditor','Save'));
-					$('#editor_save').after('<p id="save_result" style="float: left">Failed to save file</p>');
-					$("#editor_save").live('click',doFileSave);
-				} else {
-					// Save OK
-					// Update mtime
-					$('#editor').attr('data-mtime',jsondata.data.mtime);
-					$('#editor_save').text(t('files_texteditor','Save'));
-					$("#editor_save").live('click',doFileSave);
-					// Update titles
-					$('#editor').attr('data-edited', 'false');
-					$('#breadcrumb_file').text($('#editor').attr('data-filename'));
-					document.title = $('#editor').attr('data-filename')+' - ownCloud';
-				}
-			},'json');
-		}
-	}
-	giveEditorFocus();
-};
-
-// Gives the editor focus
-function giveEditorFocus(){
-	window.aceEditor.focus();
-};
-
-// Loads the file editor. Accepts two parameters, dir and filename.
-function showFileEditor(dir,filename){
-	// Delete any old editors
-	$('#editor').remove();
-	if(!editorIsShown()){
-		// Loads the file editor and display it.
-		$('#content').append('<div id="editor"></div>');
-		var data = $.getJSON(
-			OC.filePath('files_texteditor','ajax','loadfile.php'),
-			{file:filename,dir:dir},
-			function(result){
-				if(result.status == 'success'){
-					// Save mtime
-					$('#editor').attr('data-mtime', result.data.mtime);
-					// Initialise the editor
-					$('.actions,#file_action_panel').fadeOut('slow');
-					$('table').fadeOut('slow', function() {
-						// Show the control bar
-						showControls(filename,result.data.write);
-						// Update document title
-						document.title = filename+' - ownCloud';
-						$('#editor').text(result.data.filecontents);
-						$('#editor').attr('data-dir', dir);
-						$('#editor').attr('data-filename', filename);
-						$('#editor').attr('data-edited', 'false');
-						window.aceEditor = ace.edit("editor");
-						aceEditor.setShowPrintMargin(false);
-						aceEditor.getSession().setUseWrapMode(true);
-						if(result.data.write=='false'){
-							aceEditor.setReadOnly(true);
-						}
-						setEditorSize();
-						setSyntaxMode(getFileExtension(filename));
-						OC.addScript('files_texteditor','aceeditor/theme-clouds', function(){
-							window.aceEditor.setTheme("ace/theme/clouds");
-						});
-						window.aceEditor.getSession().on('change', function(){
-							if($('#editor').attr('data-edited')!='true'){
-								$('#editor').attr('data-edited', 'true');
-								$('#breadcrumb_file').text($('#breadcrumb_file').text()+' *');
-								document.title = $('#editor').attr('data-filename')+' * - ownCloud';
-							}
-						});
-						// Add the ctrl+s event
-						window.aceEditor.commands.addCommand({
-							name: "save",
-							bindKey: {
-							win: "Ctrl-S",
-							mac: "Command-S",
-							sender: "editor"
-							},
-							exec: function(){
-								doFileSave();	
-							}
-						});
-					});
-				} else {
-					// Failed to get the file.
-					OC.dialogs.alert(result.data.message, t('files_texteditor','An error occurred!'));
-				}
-			// End success
-			}
-		// End ajax
-		);
-		is_editor_shown = true;
-	}
-}
-
-// Fades out the editor.
-function hideFileEditor(){
-	if($('#editor').attr('data-edited') == 'true'){
-		// Hide, not remove
-		$('#editorcontrols').fadeOut('slow',function(){
-			// Check if there is a folder in the breadcrumb
-			if($('.crumb.ui-droppable').length){
-				$('.crumb.ui-droppable:last').addClass('last');
-			}
-		});
-		// Fade out editor
-		$('#editor').fadeOut('slow', function(){
-			// Reset document title
-			document.title = "ownCloud";
-			$('.actions,#file_access_panel').fadeIn('slow');
-			$('table').fadeIn('slow');
-		});
-		$('#notification').text(t('files_texteditor','There were unsaved changes, click here to go back'));
-		$('#notification').data('reopeneditor',true);
-		$('#notification').fadeIn();
-		is_editor_shown = false;
-	} else {
-		// Remove editor
-		$('#editorcontrols').fadeOut('slow',function(){
-			$(this).remove();
-			$(".crumb:last").addClass('last');
-		});
-		// Fade out editor
-		$('#editor').fadeOut('slow', function(){
-			$(this).remove();
-			// Reset document title
-			document.title = "ownCloud";
-			$('.actions,#file_access_panel').fadeIn('slow');
-			$('table').fadeIn('slow');
-		});
-		is_editor_shown = false;
-	}
-}
-
-// Reopens the last document
-function reopenEditor(){
-	$('.actions,#file_action_panel').fadeOut('slow');
-	$('table').fadeOut('slow', function(){
-		$('#controls .last').not('#breadcrumb_file').removeClass('last');
-		$('#editor').fadeIn('fast');
-		$('#editorcontrols').fadeIn('fast', function(){
-
-		});
-	});
-	is_editor_shown  = true;
-}
-
-// resizes the editor window
-$(window).resize(function() {
-	setEditorSize();
-});
-var is_editor_shown = false;
-$(document).ready(function(){
-	if(typeof FileActions!=='undefined'){
-		FileActions.register('text','Edit', FileActions.PERMISSION_READ, '',function(filename){
-			showFileEditor($('#dir').val(),filename);
-		});
-		FileActions.setDefault('text','Edit');
-		FileActions.register('application/xml','Edit', FileActions.PERMISSION_READ, '',function(filename){
-			showFileEditor($('#dir').val(),filename);
-		});
-		FileActions.setDefault('application/xml','Edit');
-	}
-	OC.search.customResults.Text=function(row,item){
-		var text=item.link.substr(item.link.indexOf('?file=')+6);
-		var a=row.find('a');
-		a.data('file',text);
-		a.attr('href','#');
-		a.click(function(){
-			var pos=text.lastIndexOf('/')
-			var file=text.substr(pos + 1);
-			var dir=text.substr(0,pos);
-			showFileEditor(dir,file);
-		});
-	};
-	// Binds the file save and close editor events, and gotoline button
-	bindControlEvents();
-	$('#editor').remove();
-	$('#notification').click(function(){
-		if($('#notification').data('reopeneditor'))
-		{
-			reopenEditor();
-		}
-		$('#notification').fadeOut();
-	});
-});
diff --git a/apps/files_versions/ajax/expireAll.php b/apps/files_versions/ajax/expireAll.php
index 2a678c7f0a..f76da3da98 100644
--- a/apps/files_versions/ajax/expireAll.php
+++ b/apps/files_versions/ajax/expireAll.php
@@ -32,13 +32,13 @@ OCP\JSON::callCheck();
 $versions = new OCA_Versions\Storage();
 
 if( $versions->expireAll() ){
-	
+
 	OCP\JSON::success();
 	die();
-	
+
 } else {
-	
+
 	OCP\JSON::error();
 	die();
-	
+
 }
\ No newline at end of file
diff --git a/apps/files_versions/ajax/getVersions.php b/apps/files_versions/ajax/getVersions.php
index 1a0e21732c..8476e5e8a5 100644
--- a/apps/files_versions/ajax/getVersions.php
+++ b/apps/files_versions/ajax/getVersions.php
@@ -9,19 +9,19 @@ if( OCA_Versions\Storage::isversioned( $source ) ) {
 	$count=5; //show the newest revisions
 	$versions = OCA_Versions\Storage::getVersions( $source, $count);
 	$versionsFormatted = array();
-	
+
 	foreach ( $versions AS $version ) {
 		$versionsFormatted[] = OCP\Util::formatDate( $version['version'] );
 	}
 
 	$versionsSorted = array_reverse( $versions );
-	
+
 	if ( !empty( $versionsSorted ) ) {
 		OCP\JSON::encodedPrint($versionsSorted);
 	}
-	
+
 } else {
 
 	return;
-	
+
 }
diff --git a/apps/files_versions/appinfo/api.php b/apps/files_versions/appinfo/api.php
index a7386bc2c9..3c45ff5245 100644
--- a/apps/files_versions/appinfo/api.php
+++ b/apps/files_versions/appinfo/api.php
@@ -32,5 +32,3 @@ return array(
 		)
 	)
 );
-
-?>
\ No newline at end of file
diff --git a/apps/files_versions/appinfo/update.php b/apps/files_versions/appinfo/update.php
index 9569ca1048..52a4850758 100644
--- a/apps/files_versions/appinfo/update.php
+++ b/apps/files_versions/appinfo/update.php
@@ -5,12 +5,11 @@ $installedVersion=OCP\Config::getAppValue('files_versions', 'installed_version')
 if (version_compare($installedVersion, '1.0.2', '<')) {
 	$users = \OCP\User::getUsers();
 	$datadir =  \OCP\Config::getSystemValue('datadirectory').'/';
-    foreach ($users as $user) {
-    	$oldPath = $datadir.$user.'/versions';
-    	$newPath = $datadir.$user.'/files_versions';
-    	if(is_dir($oldPath)) {
-    		rename($oldPath, $newPath);
-    	}
-    }
-	
+	foreach ($users as $user) {
+		$oldPath = $datadir.$user.'/versions';
+		$newPath = $datadir.$user.'/files_versions';
+		if(is_dir($oldPath)) {
+			rename($oldPath, $newPath);
+		}
+	}
 }
diff --git a/apps/files_versions/history.php b/apps/files_versions/history.php
index 27dc8bfc38..0ebb34f45e 100644
--- a/apps/files_versions/history.php
+++ b/apps/files_versions/history.php
@@ -5,20 +5,20 @@
  *
  * @author Frank Karlitschek
  * @copyright 2012 Frank Karlitschek frank@owncloud.org
- * 
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either 
+ * License as published by the Free Software Foundation; either
  * version 3 of the License, or any later version.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *  
- * You should have received a copy of the GNU Lesser General Public 
+ *
+ * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
- * 
+ *
  */
 
 OCP\User::checkLoggedIn( );
@@ -34,40 +34,40 @@ if ( isset( $_GET['path'] ) ) {
 
 	// roll back to old version if button clicked
         if( isset( $_GET['revert'] ) ) {
-        	
-        	if( $versions->rollback( $path, $_GET['revert'] ) ) {
-			
+
+		if( $versions->rollback( $path, $_GET['revert'] ) ) {
+
 			$tmpl->assign( 'outcome_stat', 'success' );
-			
+
 			$tmpl->assign( 'outcome_msg', "File {$_GET['path']} was reverted to version ".OCP\Util::formatDate( doubleval($_GET['revert']) ) );
-			
+
 		} else {
-		
+
 			$tmpl->assign( 'outcome_stat', 'failure' );
-		
+
 			$tmpl->assign( 'outcome_msg', "File {$_GET['path']} could not be reverted to version ".OCP\Util::formatDate( doubleval($_GET['revert']) ) );
-			
+
 		}
-		
+
 	}
 
 	// show the history only if there is something to show
         if( OCA_Versions\Storage::isversioned( $path ) ) {
-	
+
 		$count = 999; //show the newest revisions
 	        $versions = OCA_Versions\Storage::getVersions( $path, $count);
 
 		$tmpl->assign( 'versions', array_reverse( $versions ) );
-		
+
 	}else{
-		
+
 		$tmpl->assign( 'message', 'No old versions available' );
-		
+
 	}
 }else{
-	
+
 	$tmpl->assign( 'message', 'No path specified' );
-	
+
 }
 
 $tmpl->printPage( );
diff --git a/apps/files_versions/js/settings-personal.js b/apps/files_versions/js/settings-personal.js
index 6ea8c1a950..1e6b036fda 100644
--- a/apps/files_versions/js/settings-personal.js
+++ b/apps/files_versions/js/settings-personal.js
@@ -2,16 +2,16 @@
 
 $( document ).ready(function(){
 	//
-	$( '#expireAllBtn' ).click( 
-		
+	$( '#expireAllBtn' ).click(
+
 		function( event ) {
-		
+
 			// Prevent page from reloading
 			event.preventDefault();
-			
+
 			// Show loading gif
 			$('.expireAllLoading').show();
-		
+
 			$.getJSON(
 				OC.filePath('files_versions','ajax','expireAll.php'),
 				function(result){
@@ -19,20 +19,20 @@ $( document ).ready(function(){
 						$('.expireAllLoading').hide();
 						$('#expireAllBtn').html('Expiration successful');
 					} else {
-						
+
 						// Cancel loading
 						$('#expireAllBtn').html('Expiration failed');
-						
+
 						// Show Dialog
 						OC.dialogs.alert(
-							'Something went wrong, your files may not have been expired', 
-							'An error has occurred', 
-							function(){ 
-								$('#expireAllBtn').html(t('files_versions', 'Expire all versions')+'<img style="display: none;" class="loading" src="'+OC.filePath('core','img','loading.gif')+'" />'); 
-							}	
-						);		
+							'Something went wrong, your files may not have been expired',
+							'An error has occurred',
+							function(){
+								$('#expireAllBtn').html(t('files_versions', 'Expire all versions')+'<img style="display: none;" class="loading" src="'+OC.filePath('core','img','loading.gif')+'" />');
+							}
+						);
 					}
-				}	
+				}
 			);
 		}
 	);
diff --git a/apps/files_versions/js/versions.js b/apps/files_versions/js/versions.js
index c5c1553f1a..e34a6f50ca 100644
--- a/apps/files_versions/js/versions.js
+++ b/apps/files_versions/js/versions.js
@@ -14,7 +14,7 @@ $(document).ready(function(){
 		FileActions.register('file','History', FileActions.PERMISSION_UPDATE, function(){return OC.imagePath('core','actions/history')},function(filename){
 
 			if (scanFiles.scanning){return;}//workaround to prevent additional http request block scanning feedback
-			
+
 			var file = $('#dir').val()+'/'+filename;
 			// Check if drop down is already visible for a different file
 			if (($('#dropdown').length > 0)) {
@@ -35,7 +35,7 @@ $(document).ready(function(){
 function createVersionsDropdown(filename, files) {
 
 	var historyUrl = OC.linkTo('files_versions', 'history.php') + '?path='+encodeURIComponent( $( '#dir' ).val() ).replace( /%2F/g, '/' )+'/'+encodeURIComponent( filename );
-	
+
 	var html = '<div id="dropdown" class="drop" data-file="'+files+'">';
 	html += '<div id="private">';
 	html += '<select data-placeholder="Saved versions" id="found_versions" class="chzen-select" style="width:16em;">';
@@ -45,14 +45,14 @@ function createVersionsDropdown(filename, files) {
 	//html += '<input type="button" value="Revert file" onclick="revertFile()" />';
 	html += '<input type="button" value="All versions..." onclick="window.location=\''+historyUrl+'\'" name="makelink" id="makelink" />';
 	html += '<input id="link" style="display:none; width:90%;" />';
-	
+
 	if (filename) {
 		$('tr').filterAttr('data-file',filename).addClass('mouseOver');
 		$(html).appendTo($('tr').filterAttr('data-file',filename).find('td.filename'));
 	} else {
 		$(html).appendTo($('thead .share'));
 	}
-	
+
 	$.ajax({
 		type: 'GET',
 		url: OC.filePath('files_versions', 'ajax', 'getVersions.php'),
@@ -60,9 +60,9 @@ function createVersionsDropdown(filename, files) {
 		data: { source: files },
 		async: false,
 		success: function( versions ) {
-			
+
 			//alert("helo "+OC.linkTo('files_versions', 'ajax/getVersions.php'));
-			
+
 			if (versions) {
 				$.each( versions, function(index, row ) {
 					addVersion( row );
@@ -79,9 +79,9 @@ function createVersionsDropdown(filename, files) {
 			})
 		}
 	});
-	
+
 	function revertFile(file, revision) {
-		
+
 		$.ajax({
 			type: 'GET',
 			url: OC.linkTo('files_versions', 'ajax/rollbackVersion.php'),
@@ -99,16 +99,16 @@ function createVersionsDropdown(filename, files) {
 					});
 				}
 			}
-		});	
-	
+		});
+
 	}
-	
+
 	function addVersion(revision ) {
 		name=formatDate(revision.version*1000);
 		var version=$('<option/>');
 		version.attr('value',revision.version);
 		version.text(name);
-		
+
 // 		} else {
 // 			var checked = ((permissions > 0) ? 'checked="checked"' : 'style="display:none;"');
 // 			var style = ((permissions == 0) ? 'style="display:none;"' : '');
@@ -119,11 +119,11 @@ function createVersionsDropdown(filename, files) {
 // 			user += '<label for="'+uid_shared_with+'" '+style+'>can edit</label>';
 // 			user += '</li>';
 // 		}
-		
+
 		version.appendTo('#found_versions');
 	}
 
 	$('#dropdown').show('blind');
-	
-	
+
+
 }
diff --git a/apps/files_versions/l10n/es.php b/apps/files_versions/l10n/es.php
index d5be72b174..be416f5bfb 100644
--- a/apps/files_versions/l10n/es.php
+++ b/apps/files_versions/l10n/es.php
@@ -1,3 +1,4 @@
 <?php $TRANSLATIONS = array(
+"Expire all versions" => "Expirar todas las versiones",
 "Enable Files Versioning" => "Habilitar versionamiento de archivos"
 );
diff --git a/apps/files_versions/l10n/eu.php b/apps/files_versions/l10n/eu.php
new file mode 100644
index 0000000000..eacbdd0993
--- /dev/null
+++ b/apps/files_versions/l10n/eu.php
@@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"Expire all versions" => "Iraungi bertsio guztiak",
+"Enable Files Versioning" => "Gaitu fitxategien bertsioak"
+);
diff --git a/apps/files_versions/l10n/pt_BR.php b/apps/files_versions/l10n/pt_BR.php
new file mode 100644
index 0000000000..a90b48fe3a
--- /dev/null
+++ b/apps/files_versions/l10n/pt_BR.php
@@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"Expire all versions" => "Expirar todas as versões",
+"Enable Files Versioning" => "Habilitar versionamento de arquivos"
+);
diff --git a/apps/files_versions/settings-personal.php b/apps/files_versions/settings-personal.php
index db80172979..4fb866bd99 100644
--- a/apps/files_versions/settings-personal.php
+++ b/apps/files_versions/settings-personal.php
@@ -5,4 +5,3 @@ $tmpl = new OCP\Template( 'files_versions', 'settings-personal');
 OCP\Util::addscript('files_versions','settings-personal');
 
 return $tmpl->fetchPage();
-?>
\ No newline at end of file
diff --git a/apps/files_versions/templates/history.php b/apps/files_versions/templates/history.php
index 1b44255642..d4f875a36e 100644
--- a/apps/files_versions/templates/history.php
+++ b/apps/files_versions/templates/history.php
@@ -11,14 +11,14 @@ if( isset( $_['message'] ) ) {
 }else{
 
 	if( isset( $_['outcome_stat'] ) ) {
-		
+
 		echo( '<div id="feedback-messages" class="'.$_['outcome_stat'].'"><h3>'.$_['outcome_msg'] ).'</h3></div><br>';
 
 	}
 
 	echo( '<strong>Versions of '.$_['path'] ).'</strong><br>';
 	echo('<p><em>Revert a file to a previous version by clicking on its revert button</em></p><br />');
-	
+
 	foreach ( $_['versions'] as $v ) {
 		echo ' ';
 		echo OCP\Util::formatDate( doubleval($v['version']) );
diff --git a/apps/gallery/ajax/createAlbum.php b/apps/gallery/ajax/createAlbum.php
deleted file mode 100644
index 71e7fd1aa5..0000000000
--- a/apps/gallery/ajax/createAlbum.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-/**
-* ownCloud - gallery application
-*
-* @author Bartek Przybylski
-* @copyright 2012 Bartek Przybylski bart.p.pl@gmail.com
-* 
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either 
-* version 3 of the License, or any later version.
-* 
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-*  
-* You should have received a copy of the GNU Lesser General Public 
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-* 
-*/
-
- 
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('gallery');
-OCP\JSON::callCheck();
-
-OC_Gallery_Album::create(OCP\USER::getUser(), $_GET['album_name']);
-
-OCP\JSON::success(array('name' => $_GET['album_name']));
diff --git a/apps/gallery/ajax/galleryOp.php b/apps/gallery/ajax/galleryOp.php
deleted file mode 100644
index ab8c64e28a..0000000000
--- a/apps/gallery/ajax/galleryOp.php
+++ /dev/null
@@ -1,188 +0,0 @@
-<?php
-
-/**
-* ownCloud - gallery application
-*
-* @author Bartek Przybylski
-* @copyright 2012 Bartek Przybylski bart.p.pl@gmail.com
-* 
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either 
-* version 3 of the License, or any later version.
-* 
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-*  
-* You should have received a copy of the GNU Lesser General Public 
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-* 
-*/
-
-header('Content-type: text/html; charset=UTF-8') ;
- 
-
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('gallery');
-
-function handleRename($oldname, $newname) {
-  OC_Gallery_Album::rename($oldname, $newname, OCP\USER::getUser());
-  OC_Gallery_Album::changeThumbnailPath($oldname, $newname);
-}
-
-function handleRemove($name) {
-  $album_id = OC_Gallery_Album::find(OCP\USER::getUser(), $name);
-  $album_id = $album_id->fetchRow();
-  $album_id = $album_id['album_id'];
-  OC_Gallery_Album::remove(OCP\USER::getUser(), $name);
-  OC_Gallery_Photo::removeByAlbumId($album_id);
-}
-
-function handleGetThumbnails($albumname) {
-  OCP\Response::enableCaching(3600 * 24); // 24 hour
-  $view = OCP\Files::getStorage('gallery');
-  $thumbnail = $view->fopen(urldecode($albumname).'.png', 'r');
-  header('Content-Type: '.OC_Image::getMimeTypeForFile($thumbnail));
-  OCP\Response::sendFile($thumbnail);
-}
-
-function handleGalleryScanning() {
-  OCP\DB::beginTransaction();
-  set_time_limit(0);
-  OC_Gallery_Album::cleanup();
-  $eventSource = new OC_EventSource();
-  OC_Gallery_Scanner::scan($eventSource);
-  $eventSource->close();
-  OCP\DB::commit();
-}
-
-function handleFilescan($cleanup) {
-  if ($cleanup) OC_Gallery_Album::cleanup();
-  $pathlist = OC_Gallery_Scanner::find_paths();
-  sort($pathlist);
-  OCP\JSON::success(array('paths' => $pathlist));
-}
-
-function handleStoreSettings($root, $order) {
-  if (!OC_Filesystem::file_exists($root)) {
-    OCP\JSON::error(array('cause' => 'No such file or directory'));
-    return;
-  }
-  if (!OC_Filesystem::is_dir($root)) {
-    OCP\JSON::error(array('cause' => $root . ' is not a directory'));
-    return;
-  }
-
-  $current_root = OCP\Config::getUserValue(OCP\USER::getUser(),'gallery', 'root', '/');
-  $root = trim($root);
-  $root = rtrim($root, '/').'/';
-  $rescan = $current_root==$root?'no':'yes';
-  OCP\Config::setUserValue(OCP\USER::getUser(), 'gallery', 'root', $root);
-  OCP\Config::setUserValue(OCP\USER::getUser(), 'gallery', 'order', $order);
-  OCP\JSON::success(array('rescan' => $rescan));
-}
-
-function handleGetGallery($path) {
-  $a = array();
-  $root = OCP\Config::getUserValue(OCP\USER::getUser(),'gallery', 'root', '/');
-  $path = utf8_decode(rtrim($root.$path,'/'));
-  if($path == '') $path = '/';
-  $pathLen = strlen($path);
-  $result = OC_Gallery_Album::find(OCP\USER::getUser(), null, $path);
-  $album_details = $result->fetchRow();
-
-  $result = OC_Gallery_Album::find(OCP\USER::getUser(), null, null, $path);
-
-  while ($r = $result->fetchRow()) {
-    $album_name = $r['album_name'];
-    $size=OC_Gallery_Album::getAlbumSize($r['album_id']);
-    // this is a fallback mechanism and seems expensive
-    if ($size == 0) $size = OC_Gallery_Album::getIntermediateGallerySize($r['album_path']);
-
-    $a[] = array('name' => utf8_encode($album_name), 'numOfItems' => min($size, 10),'path'=>substr($r['album_path'], $pathLen));
-  }
-  
-  $result = OC_Gallery_Photo::find($album_details['album_id']);
-
-  $p = array();
-
-  while ($r = $result->fetchRow()) {
-    $p[] = utf8_encode($r['file_path']);
-  }
-
-  $r = OC_Gallery_Sharing::getEntryByAlbumId($album_details['album_id']);
-  $shared = false;
-  $recursive = false;
-  $token = '';
-  if ($row = $r->fetchRow()) {
-    $shared = true;
-    $recursive = ($row['recursive'] == 1)? true : false;
-    $token = $row['token'];
-  }
-
-  OCP\JSON::success(array('albums'=>$a, 'photos'=>$p, 'shared' => $shared, 'recursive' => $recursive, 'token' => $token));
-}
-
-function handleShare($path, $share, $recursive) {
-  $recursive = $recursive == 'true' ? 1 : 0;
-  $owner = OCP\USER::getUser();
-  $root = OCP\Config::getUserValue(OCP\USER::getUser(),'gallery', 'root', '/');
-  $path = utf8_decode(rtrim($root.$path,'/'));
-  if($path == '') $path = '/';
-  $r = OC_Gallery_Album::find($owner, null, $path);
-  if ($row = $r->fetchRow()) {
-    $albumId = $row['album_id'];
-  } else {
-    OCP\JSON::error(array('cause' => 'Couldn\'t find requested gallery'));
-    exit;
-  }
-    
-  if ($share == false) {
-      OC_Gallery_Sharing::remove($albumId);
-      OCP\JSON::success(array('sharing' => false));
-  } else { // share, yeah \o/
-    $r = OC_Gallery_Sharing::getEntryByAlbumId($albumId);
-    if (($row = $r->fetchRow())) { // update entry
-      OC_Gallery_Sharing::updateSharingByToken($row['token'], $recursive);
-      OCP\JSON::success(array('sharing' => true, 'token' => $row['token'], 'recursive' => $recursive == 1 ? true : false ));
-    } else { // and new sharing entry
-      $date = new DateTime();
-      $token = md5($owner . $date->getTimestamp());
-      OC_Gallery_Sharing::addShared($token, intval($albumId), $recursive);
-      OCP\JSON::success(array('sharing' => true, 'token' => $token, 'recursive' => $recursive == 1 ? true : false ));
-    }
-  }
-}
-
-
-if ($_GET['operation']) {
-  switch($_GET['operation']) {
-  case 'rename':
-	  handleRename($_GET['oldname'], $_GET['newname']);
-	  OCP\JSON::success(array('newname' => $_GET['newname']));
-	break;
-  case 'remove':
-	  handleRemove($_GET['name']);
-	  OCP\JSON::success();
-    break;
-  case 'get_covers':
-    handleGetThumbnails(urldecode($_GET['albumname']));
-    break;
-  case 'scan':
-    handleGalleryScanning();
-    break;
-  case 'store_settings':
-    handleStoreSettings($_GET['root'], $_GET['order']);
-    break;
-  case 'get_gallery':
-    handleGetGallery($_GET['path']);
-    break;
-  case 'share':
-    handleShare($_GET['path'], $_GET['share'] == 'true' ? true : false, $_GET['recursive']);
-    break;
-  default:
-    OCP\JSON::error(array('cause' => 'Unknown operation'));
-  }
-}
diff --git a/apps/gallery/ajax/sharing.php b/apps/gallery/ajax/sharing.php
deleted file mode 100644
index bf8169ef1e..0000000000
--- a/apps/gallery/ajax/sharing.php
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-
-/**
-* ownCloud - gallery application
-*
-* @author Bartek Przybylski
-* @copyright 2012 Bartek Przybylski bartek@alefzero.eu
-* 
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either 
-* version 3 of the License, or any later version.
-* 
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-*  
-* You should have received a copy of the GNU Lesser General Public 
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-* 
-*/
-
- 
-OCP\JSON::callCheck();
-
-if (!isset($_GET['token']) || !isset($_GET['operation'])) {
-  OCP\JSON::error(array('cause' => 'Not enought arguments'));
-  exit;
-}
-
-$operation = $_GET['operation'];
-$token = $_GET['token'];
-
-if (!OC_Gallery_Sharing::isTokenValid($token)) {
-  OCP\JSON::error(array('cause' => 'Given token is not valid'));
-  exit;
-}
-
-function handleGetGallery($token, $path) {
-  $owner = OC_Gallery_Sharing::getTokenOwner($token);
-  $apath = OC_Gallery_Sharing::getPath($token);
-
-  if ($path == false)
-    $root = $apath;
-  else
-    $root =  rtrim($apath,'/').$path;
-
-  $r = OC_Gallery_Album::find($owner, null, $root);
-  $albums = array();
-  $photos = array();
-  $albumId = -1;
-  if ($row = $r->fetchRow()) {
-    $albumId = $row['album_id'];
-  }
-  if ($albumId != -1) {
-
-    if (OC_Gallery_Sharing::isRecursive($token)) {
-      $r = OC_Gallery_Album::find($owner, null, null, $root);
-      while ($row = $r->fetchRow())
-        $albums[] = $row['album_name'];
-    }
-
-    $r = OC_Gallery_Photo::find($albumId);
-    while ($row = $r->fetchRow())
-      $photos[] = $row['file_path'];
-  }
-
-  OCP\JSON::success(array('albums' => $albums, 'photos' => $photos));
-}
-
-function handleGetThumbnail($token, $imgpath) {
-  $owner = OC_Gallery_Sharing::getTokenOwner($token);
-  $image = OC_Gallery_Photo::getThumbnail($imgpath, $owner);
-  if ($image) {
-    OCP\Response::enableCaching(3600 * 24); // 24 hour
-    $image->show();
-  }
-}
-
-function handleGetAlbumThumbnail($token, $albumname)
-{
-  $owner = OC_Gallery_Sharing::getTokenOwner($token);
-  $view = OCP\Files::getStorage('gallery');
-  $file = $view->fopen($albumname.'.png', 'r');
-  $image = new OC_Image($file);
-  if ($image->valid()) {
-    $image->centerCrop();
-    $image->resize(200);
-    $image->fixOrientation();
-    OCP\Response::enableCaching(3600 * 24); // 24 hour
-    $image->show();
-  }
-}
-
-function handleGetPhoto($token, $photo) {
-  $owner = OC_Gallery_Sharing::getTokenOwner($token);
-  $view = OCP\Files::getStorage('files');
-  $file = $view->fopen(urldecode($photo), 'r');
-  header('Content-Type: '.OC_Image::getMimeTypeForFile($file));
-  OCP\Response::sendFile($file);
-}
-
-switch ($operation) {
-  case 'get_gallery':
-    handleGetGallery($token, isset($_GET['path'])? $_GET['path'] : false);
-    break;
-  case 'get_thumbnail':
-    handleGetThumbnail($token, urldecode($_GET['img']));
-    break;
-  case 'get_album_thumbnail':
-    handleGetAlbumThumbnail($token, urldecode($_GET['albumname']));
-    break;
-  case 'get_photo':
-    handleGetPhoto($token, urldecode($_GET['photo']));
-    break;
-}
-
diff --git a/apps/gallery/ajax/thumbnail.php b/apps/gallery/ajax/thumbnail.php
deleted file mode 100644
index 5bf1d420dc..0000000000
--- a/apps/gallery/ajax/thumbnail.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/**
-* ownCloud - gallery application
-*
-* @author Bartek Przybylski
-* @copyright 2012 Bartek Przybylski bart.p.pl@gmail.com
-* 
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either 
-* version 3 of the License, or any later version.
-* 
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-*  
-* You should have received a copy of the GNU Lesser General Public 
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-* 
-*/
- 
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('gallery');
-session_write_close();
-require_once('apps/gallery/lib/managers.php');
-
-
-$img = $_GET['filepath'];
-
-$image = \OC\Pictures\ThumbnailsManager::getInstance()->getThumbnail($img);
-if ($image) {
-	OCP\Response::enableCaching(3600 * 24); // 24 hour
-	$image->show();
-}
diff --git a/apps/gallery/ajax/viewImage.php b/apps/gallery/ajax/viewImage.php
deleted file mode 100644
index daf0ab741f..0000000000
--- a/apps/gallery/ajax/viewImage.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * ownCloud - gallery application
- *
- * @author Ike Devolder
- * @copyright 2012 Ike Devolder
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either 
- * version 3 of the License, or any later version.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *  
- * You should have received a copy of the GNU Lesser General Public 
- * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
- * 
- */
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('gallery');
-
-$img = $_GET['img'];
-
-$image = OC_Gallery_Photo::getViewImage($img);
-if ($image) {
-	OCP\Response::enableCaching(3600 * 24); // 24 hour
-	$image->show();
-}
diff --git a/apps/gallery/appinfo/app.php b/apps/gallery/appinfo/app.php
deleted file mode 100644
index f26f23466b..0000000000
--- a/apps/gallery/appinfo/app.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-/**
-* ownCloud - gallery application
-*
-* @author Bartek Przybylski
-* @copyright 2012 Bartek Przybylski bart.p.pl@gmail.com
-* 
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either 
-* version 3 of the License, or any later version.
-* 
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-*  
-* You should have received a copy of the GNU Lesser General Public 
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-* 
-*/
-
-OC::$CLASSPATH['OC_Gallery_Album'] = 'gallery/lib/album.php';
-OC::$CLASSPATH['OC_Gallery_Photo'] = 'gallery/lib/photo.php';
-OC::$CLASSPATH['OC_Gallery_Scanner'] = 'gallery/lib/scanner.php';
-OC::$CLASSPATH['OC_Gallery_Sharing'] = 'gallery/lib/sharing.php';
-OC::$CLASSPATH['OC_Gallery_Hooks_Handlers'] = 'gallery/lib/hooks_handlers.php';
-OC::$CLASSPATH['Pictures_Managers'] = 'gallery/lib/managers.php';
-OC::$CLASSPATH['Pictures_Tiles'] = 'gallery/lib/tiles.php';
-OC::$CLASSPATH['OC_Share_Backend_Photo'] = 'gallery/lib/share.php';
-
-// OCP\Share::registerBackend('photo', new OC_Share_Backend_Photo());
-
-$l = OC_L10N::get('gallery');
-
-OCP\App::addNavigationEntry( array(
- 'id' => 'gallery_index',
- 'order' => 20,
- 'href' => OCP\Util::linkTo('gallery', 'index.php'),
- 'icon' => OCP\Util::imagePath('core', 'places/picture.svg'),
- 'name' => $l->t('Pictures')));
-
-class OC_GallerySearchProvider extends OC_Search_Provider{
-	function search($query){
-		$stmt = OCP\DB::prepare('SELECT * FROM `*PREFIX*gallery_albums` WHERE `uid_owner` = ? AND `album_name` LIKE ?');
-		$result = $stmt->execute(array(OCP\USER::getUser(),'%'.$query.'%'));
-		$results=array();
-		while($row=$result->fetchRow()){
-			$results[]=new OC_Search_Result($row['album_name'],'',OCP\Util::linkTo('gallery', 'index.php').'?view='.$row['album_name'],'Galleries');
-		}
-		return $results;
-	}
-}
-
-//OC_Search::registerProvider('OC_GallerySearchProvider');
-
-require_once('gallery/lib/hooks_handlers.php');
diff --git a/apps/gallery/appinfo/database.xml b/apps/gallery/appinfo/database.xml
deleted file mode 100644
index 1683e0ca2c..0000000000
--- a/apps/gallery/appinfo/database.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<database>
-	 <name>*dbname*</name>
-	 <create>true</create>
-	 <overwrite>false</overwrite>
-	 <charset>utf8</charset>
-	 <table>
-		<name>*dbprefix*pictures_images_cache</name>
-		<declaration>
-			<field>
-				<name>uid_owner</name>
-				<type>text</type>
-				<notnull>true</notnull>
-				<length>64</length>
-			</field>
-			<field>
-				<name>path</name>
-				<type>text</type>
-				<notnull>true</notnull>
-				<length>256</length>
-			</field>
-			<field>
-				<name>width</name>
-				<type>integer</type>
-				<notnull>true</notnull>
-				<length>4</length>
-			</field>
-			<field>
-				<name>height</name>
-				<type>integer</type>
-				<notnull>true</notnull>
-				<length>4</length>
-			</field>
-		</declaration>
-	</table>
-  <table>
-    <name>*dbprefix*gallery_sharing</name>
-    <declaration>
-      <field>
-        <name>token</name>
-        <type>text</type>
-        <notnull>true</notnull>
-        <length>64</length>
-      </field>
-      <field>
-        <name>gallery_id</name>
-        <type>integer</type>
-        <default>0</default>
-        <notnull>true</notnull>
-        <length>4</length>
-      </field>
-      <field>
-        <name>recursive</name>
-        <type>integer</type>
-        <notnull>true</notnull>
-        <length>1</length>
-      </field>
-    </declaration>
-  </table>
-</database>
diff --git a/apps/gallery/appinfo/info.xml b/apps/gallery/appinfo/info.xml
deleted file mode 100644
index 84f6e96099..0000000000
--- a/apps/gallery/appinfo/info.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0"?> 
-<info>
-	<id>gallery</id>
-	<name>Pictures</name>
-	<licence>AGPL</licence>
-	<author>Bartek Przybylski</author>
-	<require>4</require>
-	<shipped>true</shipped>
-	<description>Dedicated pictures application</description>
-	<standalone/>
-	<default_enable/>
-	<public>
-		<gallery>sharing.php</gallery>
-	</public>
-</info>
diff --git a/apps/gallery/appinfo/update.php b/apps/gallery/appinfo/update.php
deleted file mode 100644
index 65e7734c47..0000000000
--- a/apps/gallery/appinfo/update.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$currentVersion=OC_Appconfig::getValue('gallery', 'installed_version');
-if (version_compare($currentVersion, '0.5.0', '<')) {
-	$stmt = OCP\DB::prepare('DROP TABLE IF EXISTS `*PREFIX*gallery_photos`');
-	$stmt->execute();
-	$stmt = OCP\DB::prepare('DROP TABLE IF EXISTS `*PREFIX*gallery_albums`');
-	$stmt->execute();
-
-	\OC_DB::createDbFromStructure(OC_App::getAppPath($appid).'/appinfo/database.xml');
-}
diff --git a/apps/gallery/appinfo/version b/apps/gallery/appinfo/version
deleted file mode 100644
index 4b9fcbec10..0000000000
--- a/apps/gallery/appinfo/version
+++ /dev/null
@@ -1 +0,0 @@
-0.5.1
diff --git a/apps/gallery/css/sharing.css b/apps/gallery/css/sharing.css
deleted file mode 100644
index 4712369cc8..0000000000
--- a/apps/gallery/css/sharing.css
+++ /dev/null
@@ -1,8 +0,0 @@
-body { background-color: #eee; margin: 0; padding: 0;}
-#gallery_list { height: 100%; width: 80%; background-color: white; margin: 0 auto; box-shadow: 0 0 8px #888; }
-div.gallery_box { width: 200px; position:relative; text-align: center; border: 0; display: inline-block; margin: 5pt; vertical-align: top; padding: 5px 5px 5px 5px; position: relative; cursor: pointer; -webkit-transition: color 0.5s ease-in-out; -o-transition: color 0.5s ease-in-out; -moz-transition: color 0.5s ease-in-out;color: #BBB;}
-div.gallery_box:hover { color: black; }
-div.gallery_box h1 {font-size: 17px; font-weight: normal;}
-div#breadcrumb { border: 0; width: 70%; margin: 0 auto; padding: 25px 0; font-family: Verdana; text-align: center;}
-span.breadcrumbelement { margin: 10px; margin-right: 0; cursor: pointer;}
-span.inside { background-image: url('%appswebroot%/gallery/img/breadcrumb.png'); padding-left: 20px; background-position: left; background-repeat: no-repeat;}
diff --git a/apps/gallery/css/styles.css b/apps/gallery/css/styles.css
deleted file mode 100644
index 63f645662d..0000000000
--- a/apps/gallery/css/styles.css
+++ /dev/null
@@ -1,14 +0,0 @@
-#gallerycontent { margin-top: 2.8em; overflow: visible; }
-#g-settings {position: absolute; left: 13.5em; top: 0;}
-div#controls input[type=button] { -webkit-transition: opacity 0.5s ease-in-out; -moz-transition: opacity 0.5s ease-in-out; -o-transition: opacity 0.5s ease-in-out; opacity: 1; position:absolute; right:13.5em; top:0em; }
-input[type=button]:disabled { opacity: 0.5 }
-.ui-dialog tr {background-color: #eee;}
-.ui-dialog input {width: 90%;}
-
-div.gallery_div {position:relative; display: inline-block; height: 150px; width: 150px; margin: 5px;}
-div.miniature_border {position:absolute; height: 150px; -moz-transition-duration: 0.2s; -o-transition-duration:0.2s;  -webkit-transition-duration: .2s; background-position: 50%;}
-div.line {display:inline-block; border: 0; width: auto; height: 160px}
-div.gallery_div img{position:absolute; top: 1; left: 0; -moz-transition-duration: 0.3s; -o-transition-duration:0.3s; -webkit-transition-duration: 0.3s; height:150px; width: auto;}
-div.gallery_div img.shrinker {width:80px !important;}
-div.title { opacity: 0; text-align: center; vertical-align: middle; font-family: Arial; font-size: 12px; border: 0; position: absolute; text-overflow: ellipsis; bottom: 20px; right:-5px; height:auto; padding: 5px; width: 140px; background-color: black; color: white; -webkit-transition: opacity 0.5s;  z-index:1000; border-radius: 7px}
-div.visible { opacity: 0.8;}
diff --git a/apps/gallery/css/supersized.css b/apps/gallery/css/supersized.css
deleted file mode 100644
index 57ee7e23a5..0000000000
--- a/apps/gallery/css/supersized.css
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
-
-	Supersized - Fullscreen Slideshow jQuery Plugin
-	Version : 3.2.7
-	Site	: www.buildinternet.com/project/supersized
-	
-	Author	: Sam Dunn
-	Company : One Mighty Roar (www.onemightyroar.com)
-	License : MIT License / GPL License
-	
-*/
-#supersized-holder #supersized-loader { display:none; position:absolute; top:50%; left:50%; z-index:0; width:60px; height:60px; margin:-30px 0 0 -30px; text-indent:-999em; background:url('%appswebroot%/gallery/img/supersized/progress.gif') no-repeat center center;}
-
-#supersized-holder #supersized {  visibility:hidden; display:block; position:fixed; left:0; top:0; overflow:hidden; z-index:200; height:100%; width:100%; }
-#supersized-holder #supersized img { width:auto; height:auto; position:relative; display:none; outline:none; border:none; }
-#supersized-holder #supersized.speed img { -ms-interpolation-mode:nearest-neighbor; image-rendering: -moz-crisp-edges; }	/*Speed*/
-#supersized-holder #supersized.quality img { -ms-interpolation-mode:bicubic; image-rendering: optimizeQuality; }			/*Quality*/
-
-#supersized-holder #supersized li { display:block; list-style:none; z-index:150; position:fixed; overflow:hidden; top:0; left:0; width:100%; height:100%; background:#111; }
-#supersized-holder #supersized a { width:100%; height:100%; display:block; }
-#supersized-holder #supersized li.prevslide { z-index:160; }
-#supersized-holder #supersized li.activeslide { z-index:170; }
-#supersized-holder #supersized li.image-loading { background:#111 url('%appswebroot%/gallery/img/supersized/progress.gif') no-repeat center center; width:100%; height:100%; }
-#supersized-holder #supersized li.image-loading img{ visibility:hidden; }
-#supersized-holder #supersized li.prevslide img, #supersized-holder #supersized li.activeslide img{ display:inline; }
diff --git a/apps/gallery/css/supersized.shutter.css b/apps/gallery/css/supersized.shutter.css
deleted file mode 100644
index 428c254c3b..0000000000
--- a/apps/gallery/css/supersized.shutter.css
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
-
-	Supersized - Fullscreen Slideshow jQuery Plugin
-	Version : 3.2.7
-	Site	: www.buildinternet.com/project/supersized
-	
-	Theme 	: Shutter 1.2
-	Author	: Sam Dunn
-	Company : One Mighty Roar (www.onemightyroar.com)
-	License : MIT License / GPL License
-	
-*/
-
-/* Controls Bar
-----------------------------*/
-#slideshow-content #slideshow-controls-wrapper { margin:0 auto; height:42px; width:100%; bottom:0px; left:0; z-index:204; background:url('%appswebroot%/gallery/img/supersized/nav-bg.png') repeat-x; position:fixed; }
-#slideshow-content #slideshow-controls { overflow:hidden; height:100%; position:relative; text-align:left; z-index:205; }
-#slideshow-content #slidecounter { float:left; color:#999; font:14px "Helvetica Neue", Helvetica, Arial, sans-serif; text-shadow:#000 0 -1px 0; margin:0px 10px 0 15px; line-height:42px; }
-#slideshow-content #slidecaption { overflow:hidden; float:left; color:#FFF; font:400 14px "Helvetica Neue", Helvetica, Arial, sans-serif; text-shadow:#000 1px 1px 2px; margin:0 20px 0 0; line-height:42px; }
-
-/*#navigation { float:right; margin:0px 20px 0 0; }*/
-#slideshow-content #play-button{ float:left; margin-top:1px;border-right:1px solid #333; background:url('%appswebroot%/gallery/img/supersized/bg-hover.png') repeat-x 0 44px; }
-#slideshow-content #play-button:hover{ background-position:0 1px; cursor:pointer; }
-
-#slideshow-content #prevslide, #nextslide{ position:fixed; height:43px; width:43px; top:50%; margin-top:-21px; opacity:0.6; z-index:204; }
-#slideshow-content #prevslide{ left:10px; background:url('%appswebroot%/gallery/img/supersized/back.png'); }
-#slideshow-content #nextslide{ right:10px; background:url('%appswebroot%/gallery/img/supersized/forward.png'); }
-#slideshow-content #prevslide:active, #nextslide:active{ margin-top:-19px; }
-#slideshow-content #prevslide:hover, #nextslide:hover{ cursor:pointer; }
-
-#slideshow-content ul#slide-list{ padding:15px 0; float:left; position:absolute; left:50%; }
-#slideshow-content ul#slide-list li{ list-style:none; width:12px; height:12px; float:left; margin:0 5px 0 0; }
-#slideshow-content ul#slide-list li.current-slide a, ul#slide-list li.current-slide a:hover{ background-position:0 0px; }
-#slideshow-content ul#slide-list li a{ display:block; width:12px; height:12px; background:url('%appswebroot%/gallery/img/supersized/nav-dot.png') no-repeat 0 -24px; }
-#slideshow-content ul#slide-list li a:hover{ background-position:0 -12px; cursor:pointer; }
-
-#slideshow-content #tray-button{ float:right; margin-top:1px; border-left:1px solid #333; background:url('%appswebroot%/gallery/img/supersized/bg-hover.png') repeat-x 0 44px; }
-#slideshow-content #tray-button:hover{ background-position:0 1px; cursor:pointer; }
-
-
-/* Progress Bar
-----------------------------*/					
-#slideshow-content #progress-back{ z-index:205; position:fixed; bottom:42px; left:0; height:8px; width:100%; background:url('%appswebroot%/gallery/img/supersized/progress-back.png') repeat-x; }
-#slideshow-content #progress-bar{ position:relative; height:8px; width:100%; background:url('%appswebroot%/gallery/img/supersized/progress-bar.png') repeat-x; }
-
-
-/* Thumbnail Navigation
-----------------------------*/	
-#slideshow-content #nextthumb, #slideshow-content #prevthumb { z-index:202; display:none; position:fixed; bottom:61px; height:75px; width:100px; overflow:hidden; background:#ddd; border:1px solid #fff; -webkit-box-shadow:0 0 5px #000; }
-#slideshow-content #nextthumb { right:12px; }
-#slideshow-content #prevthumb { left:12px; }
-#slideshow-content #nextthumb img, #slideshow-content #prevthumb img { width:150px; height:auto;  }
-#slideshow-content #nextthumb:active, #slideshow-content #prevthumb:active { bottom:59px; }
-#slideshow-content #nextthumb:hover, #slideshow-content #prevthumb:hover { cursor:pointer; }
-
-
-/* Thumbnail Tray
-----------------------------*/			
-#slideshow-content #thumb-tray{ position:fixed; z-index:203; bottom:0; left:0; background:url('%appswebroot%/gallery/img/supersized/bg-black.png'); height:150px; width:100%; overflow:hidden; text-align:center; -moz-box-shadow: 0px 0px 4px #000; -webkit-box-shadow: 0px 0px 4px #000; box-shadow: 0px 0px 4px #000; }
-
-#slideshow-content #thumb-back, #slideshow-content #thumb-forward{ position:absolute; z-index:5; bottom:42px; height:108px; width:40px; }
-#slideshow-content #thumb-back{ left:0; background: url('%appswebroot%/gallery/img/supersized/thumb-back.png') no-repeat center center;}
-#slideshow-content #thumb-forward{ right:0; background:url('%appswebroot%/gallery/img/supersized/thumb-forward.png') no-repeat center center;}
-#slideshow-content #thumb-back:hover, #slideshow-content #thumb-forward:hover{ cursor:pointer; background-color:rgba(256,256,256, 0.1); }
-#slideshow-content #thumb-back:hover{ border-right:1px solid rgba(256,256,256, 0.2); }
-#slideshow-content #thumb-forward:hover{ border-left:1px solid rgba(256,256,256, 0.2); }
-
-
-#slideshow-content ul#thumb-list{ display:inline-block; list-style:none; position:relative; left:0px; padding:0 0px; }
-#slideshow-content ul#thumb-list li{ background:#111; list-style:none; display:inline; width:150px; height:108px; overflow:hidden; float:left; margin:0; }
-#slideshow-content ul#thumb-list li img { width:200px; height:auto; opacity:0.5; -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=60)"; filter:alpha(opacity=60); -webkit-transition: all 100ms ease-in-out; -moz-transition: all 100ms ease-in-out; -o-transition: all 100ms ease-in-out; -ms-transition: all 100ms ease-in-out; transition: all 100ms ease-in-out; }
-#slideshow-content ul#thumb-list li.current-thumb img, #slideshow-content ul#thumb-list li:hover img{ opacity:1; -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); }
-#slideshow-content ul#thumb-list li:hover{ cursor:pointer; }
-				
diff --git a/apps/gallery/img/breadcrumb.png b/apps/gallery/img/breadcrumb.png
deleted file mode 100644
index adbef1e576..0000000000
Binary files a/apps/gallery/img/breadcrumb.png and /dev/null differ
diff --git a/apps/gallery/img/delete.png b/apps/gallery/img/delete.png
deleted file mode 100644
index fa8e18183e..0000000000
Binary files a/apps/gallery/img/delete.png and /dev/null differ
diff --git a/apps/gallery/img/loading.gif b/apps/gallery/img/loading.gif
deleted file mode 100644
index 5b33f7e54f..0000000000
Binary files a/apps/gallery/img/loading.gif and /dev/null differ
diff --git a/apps/gallery/img/rename.png b/apps/gallery/img/rename.png
deleted file mode 100644
index 3af6840071..0000000000
Binary files a/apps/gallery/img/rename.png and /dev/null differ
diff --git a/apps/gallery/img/share.png b/apps/gallery/img/share.png
deleted file mode 100644
index 099e4d6ab3..0000000000
Binary files a/apps/gallery/img/share.png and /dev/null differ
diff --git a/apps/gallery/img/supersized/back.png b/apps/gallery/img/supersized/back.png
deleted file mode 100644
index f0e809ece0..0000000000
Binary files a/apps/gallery/img/supersized/back.png and /dev/null differ
diff --git a/apps/gallery/img/supersized/bg-black.png b/apps/gallery/img/supersized/bg-black.png
deleted file mode 100644
index e7ce54412b..0000000000
Binary files a/apps/gallery/img/supersized/bg-black.png and /dev/null differ
diff --git a/apps/gallery/img/supersized/bg-hover.png b/apps/gallery/img/supersized/bg-hover.png
deleted file mode 100644
index 1ca2022e10..0000000000
Binary files a/apps/gallery/img/supersized/bg-hover.png and /dev/null differ
diff --git a/apps/gallery/img/supersized/button-tray-down.png b/apps/gallery/img/supersized/button-tray-down.png
deleted file mode 100644
index 15645ae34e..0000000000
Binary files a/apps/gallery/img/supersized/button-tray-down.png and /dev/null differ
diff --git a/apps/gallery/img/supersized/button-tray-up.png b/apps/gallery/img/supersized/button-tray-up.png
deleted file mode 100644
index 0ee91d25ba..0000000000
Binary files a/apps/gallery/img/supersized/button-tray-up.png and /dev/null differ
diff --git a/apps/gallery/img/supersized/forward.png b/apps/gallery/img/supersized/forward.png
deleted file mode 100644
index a6408f7511..0000000000
Binary files a/apps/gallery/img/supersized/forward.png and /dev/null differ
diff --git a/apps/gallery/img/supersized/nav-bg.png b/apps/gallery/img/supersized/nav-bg.png
deleted file mode 100644
index c1a9fc170f..0000000000
Binary files a/apps/gallery/img/supersized/nav-bg.png and /dev/null differ
diff --git a/apps/gallery/img/supersized/nav-dot.png b/apps/gallery/img/supersized/nav-dot.png
deleted file mode 100644
index 4319ed0421..0000000000
Binary files a/apps/gallery/img/supersized/nav-dot.png and /dev/null differ
diff --git a/apps/gallery/img/supersized/pause.png b/apps/gallery/img/supersized/pause.png
deleted file mode 100644
index 1e81d1856b..0000000000
Binary files a/apps/gallery/img/supersized/pause.png and /dev/null differ
diff --git a/apps/gallery/img/supersized/play.png b/apps/gallery/img/supersized/play.png
deleted file mode 100644
index df94a03498..0000000000
Binary files a/apps/gallery/img/supersized/play.png and /dev/null differ
diff --git a/apps/gallery/img/supersized/progress-back.png b/apps/gallery/img/supersized/progress-back.png
deleted file mode 100644
index 95992f1410..0000000000
Binary files a/apps/gallery/img/supersized/progress-back.png and /dev/null differ
diff --git a/apps/gallery/img/supersized/progress-bar.png b/apps/gallery/img/supersized/progress-bar.png
deleted file mode 100644
index 9758d17883..0000000000
Binary files a/apps/gallery/img/supersized/progress-bar.png and /dev/null differ
diff --git a/apps/gallery/img/supersized/progress.gif b/apps/gallery/img/supersized/progress.gif
deleted file mode 100644
index f3e45e0569..0000000000
Binary files a/apps/gallery/img/supersized/progress.gif and /dev/null differ
diff --git a/apps/gallery/img/supersized/supersized-logo.png b/apps/gallery/img/supersized/supersized-logo.png
deleted file mode 100644
index cc10629329..0000000000
Binary files a/apps/gallery/img/supersized/supersized-logo.png and /dev/null differ
diff --git a/apps/gallery/img/supersized/thumb-back.png b/apps/gallery/img/supersized/thumb-back.png
deleted file mode 100644
index b86a9110ee..0000000000
Binary files a/apps/gallery/img/supersized/thumb-back.png and /dev/null differ
diff --git a/apps/gallery/img/supersized/thumb-forward.png b/apps/gallery/img/supersized/thumb-forward.png
deleted file mode 100644
index bff5ec1108..0000000000
Binary files a/apps/gallery/img/supersized/thumb-forward.png and /dev/null differ
diff --git a/apps/gallery/index.php b/apps/gallery/index.php
deleted file mode 100644
index ce79f8f878..0000000000
--- a/apps/gallery/index.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php
-
-/**
-* ownCloud - gallery application
-*
-* @author Bartek Przybylski
-* @copyright 2012 Bartek Przybylski bartek@alefzero.eu
-* 
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either 
-* version 3 of the License, or any later version.
-* 
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-*  
-* You should have received a copy of the GNU Lesser General Public 
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-* 
-*/
-
-
-
-OCP\User::checkLoggedIn();
-OCP\App::checkAppEnabled('gallery');
-OCP\App::setActiveNavigationEntry( 'gallery_index' );
-
-OCP\Util::addStyle('files', 'files');
-OCP\Util::addStyle('gallery', 'styles');
-OCP\Util::addScript('gallery', 'pictures');
-OCP\Util::addStyle( 'gallery', 'supersized' );
-OCP\Util::addStyle( 'gallery', 'supersized.shutter' );
-OCP\Util::addScript('gallery', 'slideshow');
-OCP\Util::addScript('gallery', 'jquery.easing.min');
-OCP\Util::addScript('gallery', 'supersized.3.2.7.min');
-OCP\Util::addScript('gallery', 'supersized.shutter.min');
-
-include 'gallery/lib/tiles.php';
-
-$root = !empty($_GET['root']) ? $_GET['root'] : '/';
-$images = \OC_FileCache::searchByMime('image', null, '/'.\OCP\USER::getUser().'/files'.$root);
-sort($images);
-
-$tl = new \OC\Pictures\TilesLine();
-$ts = new \OC\Pictures\TileStack(array(), '');
-$previous_element = @$images[0];
-
-$root_images = array();
-$second_level_images = array();
-
-$fallback_images = array(); // if the folder only cotains subfolders with images -> these are taken for the stack preview
-
-for($i = 0; $i < count($images); $i++) {
-	$prev_dir_arr = explode('/', $previous_element);
-	$dir_arr = explode('/', $images[$i]);
-
-	if(count($dir_arr) == 1) { // getting the images in this directory
-		$root_images[] = $root.$images[$i];
-	} else {
-		if(strcmp($prev_dir_arr[0], $dir_arr[0]) != 0) { // if we entered a new directory
-			if(count($second_level_images) == 0) { // if we don't have images in this directory
-				if(count($fallback_images) != 0) { // but have fallback_images
-					$tl->addTile(new \OC\Pictures\TileStack($fallback_images, $prev_dir_arr[0]));
-					$fallback_images = array();
-				}
-			} else { // if we collected images for this directory
-				$tl->addTile(new \OC\Pictures\TileStack($second_level_images, $prev_dir_arr[0]));
-				$fallback_images = array();
-				$second_level_images = array();
-			}
-		}
-		if (count($dir_arr) == 2) { // These are the pics in our current subdir
-			$second_level_images[] = $root.$images[$i];
-			$fallback_images = array();
-		} else { // These are images from the deeper directories
-			if(count($second_level_images) == 0) {
-				$fallback_images[] = $root.$images[$i];
-			}
-		}
-		// have us a little something to compare against
-		$previous_element = $images[$i];
-	}
-}
-
-// if last element in the directory was a directory we don't want to miss it :)
-if(count($second_level_images)>0) {
-	$tl->addTile(new \OC\Pictures\TileStack($second_level_images, $prev_dir_arr[0]));
-}
-
-// if last element in the directory was a directory with no second_level_images we also don't want to miss it ...
-if(count($fallback_images)>0) {
-	$tl->addTile(new \OC\Pictures\TileStack($fallback_images, $prev_dir_arr[0]));
-}
-
-// and finally our images actually stored in the root folder
-for($i = 0; $i<count($root_images); $i++) {
-	$tl->addTile(new \OC\Pictures\TileSingle($root_images[$i]));
-}
-
-$tmpl = new OCP\Template( 'gallery', 'index', 'user' );
-$tmpl->assign('root', $root, false);
-$tmpl->assign('tl', $tl, false);
-$tmpl->printPage();
diff --git a/apps/gallery/js/albums.js b/apps/gallery/js/albums.js
deleted file mode 100644
index 62d3f783ec..0000000000
--- a/apps/gallery/js/albums.js
+++ /dev/null
@@ -1,101 +0,0 @@
-Albums={
-	// album item in this array should look as follow
-	// {name: string,
-	//  numOfCovers: int}
-	//
-	// previews array should be an array of base64 decoded images
-	// to display to user as preview picture when scrolling throught
-	// the album cover
-	albums:new Array(),
-	photos:new Array(),
-  shared: false,
-  recursive: false,
-  token: '',
-	// add simply adds new album to internal structure
-	// however albums names must be unique so other
-	// album with the same name wont be insered,
-	// and false will be returned
-	// true on success
-	add: function(album_name, num, path) {
-		if (Albums.albums[album_name] != undefined) return false;
-		Albums.albums[album_name] = {name: album_name, numOfCovers: num, path:path};
-		return true;
-	},
-	// remove element with given name
-	// returns remove element or undefined if no such element was present
-	remove: function(name) {
-		var i = -1, tmp = 0;
-		for (var a in Albums.albums) {
-		if (a.name == name) {
-			i = tmp;
-			break;
-		}
-		tmp++;
-		}
-		if (i != -1) {
-		return Albums.albums.splice(i,1);
-		}
-		return undefined;
-	},
-	// return element which match given name
-	// of undefined if such element do not exist
-	find: function(name) {
-		return Albums.albums[name];
-	},
-	// displays gallery in linear representation
-	// on given element, and apply default styles for gallery
-	display: function(element) {
-		var displayTemplate = '<div class="gallery_box album"><div class="dummy"></div><a class="view"><div class="gallery_album_cover"></div></a><h1></h1></div>';
-		for (var i in Albums.albums) {
-			var a = Albums.albums[i];
-			var local=$(displayTemplate);
-			local.attr('title', a.name);
-			local.attr('data-path', a.path);
-			local.attr('data-album',a.name);
-			$(".gallery_album_decoration a.rename", local).bind('click', {name: a.name},function(name,event){
-				event.preventDefault();
-				event.stopPropagation();
-				galleryRename(name);
-			}.bind(null,a.name));
-			$(".gallery_album_decoration a.remove", local).bind('click', {name: a.name},function(name,event){
-				event.preventDefault();
-				event.stopPropagation();
-				galleryRemove(name);
-			}.bind(null,a.name));
-			$('h1',local).text(decodeURIComponent(escape(a.name)));
-			$(".gallery_album_cover", local).attr('title',decodeURIComponent(escape(a.name)));
-			$(".gallery_album_cover", local).css('background-repeat', 'no-repeat');
-			$(".gallery_album_cover", local).css('background-position', '0');
-			$(".gallery_album_cover", local).css('background-image','url("'+OC.filePath('gallery','ajax','galleryOp.php')+'&operation=get_covers&albumname='+escape(a.name)+'")');
-			$(".gallery_album_cover", local).mousemove(function(event) {
-				var albumMetadata = Albums.find(this.title);
-				if (albumMetadata == undefined) {
-					return;
-				}
-				var x = Math.floor(event.offsetX/(this.offsetWidth/albumMetadata.numOfCovers));
-				x *= this.offsetWidth;
-        if (x < 0 ||  isNaN(x)) x=0;
-				$(this).css('background-position', -x+'px 0');
-			});
-			element.append(local);
-		}
-        var photoDisplayTemplate = '<div class="gallery_box"><div class="dummy"></div><div><a rel="images" href="'+OC.linkTo('gallery/ajax','viewImage.php')+'?img=URLPATH"><img src="'+OC.filePath('gallery','ajax','thumbnail.php')+'?img=IMGPATH"></a></div></div>';
-		for (var i in Albums.photos) {
-			element.append(photoDisplayTemplate.replace("IMGPATH", escape(Albums.photos[i])).replace("URLPATH", escape(Albums.photos[i])));
-		}
-		$("a[rel=images]").fancybox({
-			'titlePosition': 'inside'
-		});
-	},
-	rename: function(element, new_name) {
-		if (new_name) {
-			$(element).attr("data-album", new_name);
-			$("a.view", element).attr("href", "?view="+new_name);
-			$("h1", element).text(new_name);
-		}
-	},
-	clear: function(element) {
-		Albums.albums = new Array();
-		element.innerHTML = '';
-	}
-}
diff --git a/apps/gallery/js/jquery.easing.min.js b/apps/gallery/js/jquery.easing.min.js
deleted file mode 100644
index bbf8410391..0000000000
--- a/apps/gallery/js/jquery.easing.min.js
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * jQuery Easing v1.3 - http://gsgd.co.uk/sandbox/jquery/easing/
- *
- * Uses the built in easing capabilities added In jQuery 1.1
- * to offer multiple easing options
- *
- * TERMS OF USE - jQuery Easing
- * 
- * Open source under the BSD License. 
- * 
- * Copyright � 2008 George McGinley Smith
- * 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 the author nor the names of contributors may be used to endorse 
- * or promote products derived from this software without specific prior written permission.
- * 
- * 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 OWNER 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. 
- *
-*/
-
-jQuery.easing.jswing=jQuery.easing.swing;jQuery.extend(jQuery.easing,{def:"easeOutQuad",swing:function(e,f,a,h,g){return jQuery.easing[jQuery.easing.def](e,f,a,h,g)},easeInQuad:function(e,f,a,h,g){return h*(f/=g)*f+a},easeOutQuad:function(e,f,a,h,g){return -h*(f/=g)*(f-2)+a},easeInOutQuad:function(e,f,a,h,g){if((f/=g/2)<1){return h/2*f*f+a}return -h/2*((--f)*(f-2)-1)+a},easeInCubic:function(e,f,a,h,g){return h*(f/=g)*f*f+a},easeOutCubic:function(e,f,a,h,g){return h*((f=f/g-1)*f*f+1)+a},easeInOutCubic:function(e,f,a,h,g){if((f/=g/2)<1){return h/2*f*f*f+a}return h/2*((f-=2)*f*f+2)+a},easeInQuart:function(e,f,a,h,g){return h*(f/=g)*f*f*f+a},easeOutQuart:function(e,f,a,h,g){return -h*((f=f/g-1)*f*f*f-1)+a},easeInOutQuart:function(e,f,a,h,g){if((f/=g/2)<1){return h/2*f*f*f*f+a}return -h/2*((f-=2)*f*f*f-2)+a},easeInQuint:function(e,f,a,h,g){return h*(f/=g)*f*f*f*f+a},easeOutQuint:function(e,f,a,h,g){return h*((f=f/g-1)*f*f*f*f+1)+a},easeInOutQuint:function(e,f,a,h,g){if((f/=g/2)<1){return h/2*f*f*f*f*f+a}return h/2*((f-=2)*f*f*f*f+2)+a},easeInSine:function(e,f,a,h,g){return -h*Math.cos(f/g*(Math.PI/2))+h+a},easeOutSine:function(e,f,a,h,g){return h*Math.sin(f/g*(Math.PI/2))+a},easeInOutSine:function(e,f,a,h,g){return -h/2*(Math.cos(Math.PI*f/g)-1)+a},easeInExpo:function(e,f,a,h,g){return(f==0)?a:h*Math.pow(2,10*(f/g-1))+a},easeOutExpo:function(e,f,a,h,g){return(f==g)?a+h:h*(-Math.pow(2,-10*f/g)+1)+a},easeInOutExpo:function(e,f,a,h,g){if(f==0){return a}if(f==g){return a+h}if((f/=g/2)<1){return h/2*Math.pow(2,10*(f-1))+a}return h/2*(-Math.pow(2,-10*--f)+2)+a},easeInCirc:function(e,f,a,h,g){return -h*(Math.sqrt(1-(f/=g)*f)-1)+a},easeOutCirc:function(e,f,a,h,g){return h*Math.sqrt(1-(f=f/g-1)*f)+a},easeInOutCirc:function(e,f,a,h,g){if((f/=g/2)<1){return -h/2*(Math.sqrt(1-f*f)-1)+a}return h/2*(Math.sqrt(1-(f-=2)*f)+1)+a},easeInElastic:function(f,h,e,l,k){var i=1.70158;var j=0;var g=l;if(h==0){return e}if((h/=k)==1){return e+l}if(!j){j=k*0.3}if(g<Math.abs(l)){g=l;var i=j/4}else{var i=j/(2*Math.PI)*Math.asin(l/g)}return -(g*Math.pow(2,10*(h-=1))*Math.sin((h*k-i)*(2*Math.PI)/j))+e},easeOutElastic:function(f,h,e,l,k){var i=1.70158;var j=0;var g=l;if(h==0){return e}if((h/=k)==1){return e+l}if(!j){j=k*0.3}if(g<Math.abs(l)){g=l;var i=j/4}else{var i=j/(2*Math.PI)*Math.asin(l/g)}return g*Math.pow(2,-10*h)*Math.sin((h*k-i)*(2*Math.PI)/j)+l+e},easeInOutElastic:function(f,h,e,l,k){var i=1.70158;var j=0;var g=l;if(h==0){return e}if((h/=k/2)==2){return e+l}if(!j){j=k*(0.3*1.5)}if(g<Math.abs(l)){g=l;var i=j/4}else{var i=j/(2*Math.PI)*Math.asin(l/g)}if(h<1){return -0.5*(g*Math.pow(2,10*(h-=1))*Math.sin((h*k-i)*(2*Math.PI)/j))+e}return g*Math.pow(2,-10*(h-=1))*Math.sin((h*k-i)*(2*Math.PI)/j)*0.5+l+e},easeInBack:function(e,f,a,i,h,g){if(g==undefined){g=1.70158}return i*(f/=h)*f*((g+1)*f-g)+a},easeOutBack:function(e,f,a,i,h,g){if(g==undefined){g=1.70158}return i*((f=f/h-1)*f*((g+1)*f+g)+1)+a},easeInOutBack:function(e,f,a,i,h,g){if(g==undefined){g=1.70158}if((f/=h/2)<1){return i/2*(f*f*(((g*=(1.525))+1)*f-g))+a}return i/2*((f-=2)*f*(((g*=(1.525))+1)*f+g)+2)+a},easeInBounce:function(e,f,a,h,g){return h-jQuery.easing.easeOutBounce(e,g-f,0,h,g)+a},easeOutBounce:function(e,f,a,h,g){if((f/=g)<(1/2.75)){return h*(7.5625*f*f)+a}else{if(f<(2/2.75)){return h*(7.5625*(f-=(1.5/2.75))*f+0.75)+a}else{if(f<(2.5/2.75)){return h*(7.5625*(f-=(2.25/2.75))*f+0.9375)+a}else{return h*(7.5625*(f-=(2.625/2.75))*f+0.984375)+a}}}},easeInOutBounce:function(e,f,a,h,g){if(f<g/2){return jQuery.easing.easeInBounce(e,f*2,0,h,g)*0.5+a}return jQuery.easing.easeOutBounce(e,f*2-g,0,h,g)*0.5+h*0.5+a}});
-
-/*
- *
- * TERMS OF USE - EASING EQUATIONS
- * 
- * Open source under the BSD License. 
- * 
- * Copyright � 2001 Robert Penner
- * 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 the author nor the names of contributors may be used to endorse 
- * or promote products derived from this software without specific prior written permission.
- * 
- * 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 OWNER 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. 
- *
- */
\ No newline at end of file
diff --git a/apps/gallery/js/pictures.js b/apps/gallery/js/pictures.js
deleted file mode 100644
index 47f727e0de..0000000000
--- a/apps/gallery/js/pictures.js
+++ /dev/null
@@ -1,68 +0,0 @@
-function constructSharingPath() {
-  return document.location.protocol + '//' + document.location.host + OC.linkTo('', 'public.php') + '?service=gallery&token=' + Albums.token;
-}
-
-function shareGallery() {
-  var existing_token = '';
-  //if (Albums.token)
-  //  existing_token = constructSharingPath();
-  var form_fields = [{text: 'Share', name: 'share', type: 'checkbox', value: false},
-                     {text: 'Share recursive', name: 'recursive', type: 'checkbox', value: false},
-                     {text: 'Shared gallery address', name: 'address', type: 'text', value: ''}];
-    OC.dialogs.form(form_fields, t('gallery', 'Share gallery'), function(values){
-    var p = '';
-    for (var i in paths) p += paths[i]+'/';
-    if (p == '') p = '/';
-    alert(p);
-    $.getJSON(OC.filePath('gallery', 'ajax', 'galleryOp.php'), {operation: 'share', path: p, share: values[0].value, recursive: values[1].value}, function(r) {
-      if (r.status == 'success') {
-        Albums.shared = r.sharing;
-        if (Albums.shared) {
-          Albums.token = r.token;
-          Albums.recursive = r.recursive;
-        } else {
-          Albums.token = '';
-          Albums.recursive = false;
-        }
-        var actual_addr = '';
-        if (Albums.token)
-          actual_addr = constructSharingPath();
-        $('input[name="address"]').val(actual_addr);
-      } else {
-        OC.dialogs.alert(t('gallery', 'Error: ') + r.cause, t('gallery', 'Internal error'));
-      }
-    });
-  });
-}
-
-function explode(element) {
-	$('div', element).each(function(index, elem) {
-		if ($(elem).hasClass('title')) {
-			$(elem).addClass('visible');
-		} else {
-			$(elem).css('margin-top', Math.floor(30-(Math.random()*60)) + 'px')
-			       .css('margin-left', Math.floor(30-(Math.random()*60))+ 'px')
-			       .css('z-index', '999');
-		}
-	});
-}
-
-function deplode(element) {
-	$('div', element).each(function(index, elem) {
-		if ($(elem).hasClass('title')) {
-			$(elem).removeClass('visible');
-		} else {
-			$(elem).css('margin-top', Math.floor(5-(Math.random()*10)) + 'px')
-			   .css('margin-left', Math.floor(5-(Math.random()*10))+ 'px')
-			   .css('z-index', '3');
-		}
-	});
-}
-
-function openNewGal(album_name) {
-	root = root + decodeURIComponent(album_name) + "/";
-	var url = window.location.protocol+"//"+window.location.hostname+OC.linkTo('gallery', 'index.php');
-	url = url + "?root="+encodeURIComponent(root);
-
-	window.location = url;
-}
diff --git a/apps/gallery/js/scanner.js b/apps/gallery/js/scanner.js
deleted file mode 100644
index 804ee9d229..0000000000
--- a/apps/gallery/js/scanner.js
+++ /dev/null
@@ -1,34 +0,0 @@
-Scanner={
-  albumsFound:0,
-  eventSource:null,
-  albumsScanned:0,
-  scanAlbums:function(callback){
-    $('#scanprogressbar').progressbar({value:0});
-    $('#scanprogressbar').fadeIn();
-    $('#scan input.start').hide();
-    $('#scan input.stop').show();
-    Scanner.albumsScanned=0;
-    Scanner.eventSource=new OC.EventSource(OC.linkTo('gallery', 'ajax/galleryOp.php'),{operation:'scan'});
-    Scanner.eventSource.listen('count', function(total){Scanner.albumsFound=total;});
-    Scanner.eventSource.listen('scanned', function(data) {
-      Scanner.albumsScanned++;
-      var progress=(Scanner.albumsScanned/Scanner.albumsFound)*100;
-      $('#scanprogressbar').progressbar('value',progress);
-    });
-    Scanner.eventSource.listen('done', function(count){
-			$('#scan input.start').show();
-			$('#scan input.stop').hide();
-      $('#scanprogressbar').fadeOut();
-      returnToElement(0);
-    });
-    if (callback)
-      callback();
-  },
-  stop:function() {
-    Scanner.eventSource.close();
-			$('#scan input.start').show();
-			$('#scan input.stop').hide();
-    $('#scanprogressbar').fadeOut();
-  }
-}
-
diff --git a/apps/gallery/js/sharing.js b/apps/gallery/js/sharing.js
deleted file mode 100644
index 679e39578a..0000000000
--- a/apps/gallery/js/sharing.js
+++ /dev/null
@@ -1,57 +0,0 @@
-$(document).ready(function() {
-  $.getJSON(OC.filePath('gallery', 'ajax', 'sharing.php'), {operation: 'get_gallery', token: TOKEN}, albumClickHandler);
-});
-
-var paths = [];
-var counter = 0;
-
-function returnTo(num) {
-  while (num != counter) {
-    paths.pop();
-    $('.breadcrumbelement:last').remove();
-    counter--;
-  }
-  path = '';
-  for (var e in paths) path += '/' + paths[e];
-  $.getJSON(OC.filePath('gallery', 'ajax', 'sharing.php'), {operation: 'get_gallery', token: TOKEN, path: path}, function(r) {
-    albumClickHandler(r);
-  });
-}
-
-function albumClickHandler(r) {
-  var element = $('div#gallery_list');
-  element.html('');
-  var album_template = '<div class="gallery_box"><div><a rel="images"><img src="' + OC.filePath('gallery', 'ajax', 'sharing.php') + '?token='+TOKEN+'&operation=get_album_thumbnail&albumname=IMGPATH"></a></div><h1></h1></div>';
-
-  for (var i in r.albums) {
-    var a = r.albums[i];
-    var local = $(album_template.replace('IMGPATH', encodeURIComponent(a)));
-    local.attr('title', a);
-    $('h1', local).html(a);
-    element.append(local);
-  }
-
-  $('div.gallery_box').each(function(i, element) {
-    $(element).click(function() {
-      paths.push($(this).attr('title'));
-      path = '';
-      for (var e in paths) path += '/' + paths[e];
-      $.getJSON(OC.filePath('gallery', 'ajax', 'sharing.php'), {operation: 'get_gallery', token: TOKEN, path: path}, function(r) {
-        var name = paths[paths.length-1];
-        counter++;
-        var d = '<span class="breadcrumbelement" onclick="javascript:returnTo('+counter+');return false;">'+name+'</span>';
-        d = $(d).addClass('inside');
-        $('#breadcrumb').append(d);
-        albumClickHandler(r);
-      });
-    });
-  });
-
-  var pat = '';
-  for (var a in paths) pat += '/'+paths[a];
-  var photo_template = '<div class="gallery_box"><div><a rel="images" href="*HREF*" target="_blank"><img src="' + OC.filePath('gallery', 'ajax', 'sharing.php') + '?token='+TOKEN+'&operation=get_thumbnail&img=IMGPATH"></a></div></div>';
-  for (var a in r.photos) {
-    var local = photo_template.replace('IMGPATH', encodeURIComponent(r.photos[a])).replace('*HREF*', OC.filePath('gallery', 'ajax', 'sharing.php') + '?token='+TOKEN+'&operation=get_photo&photo='+encodeURIComponent(r.photos[a]));
-    element.append(local);
-  }
-}
diff --git a/apps/gallery/js/slideshow.js b/apps/gallery/js/slideshow.js
deleted file mode 100644
index cc5dfc44a2..0000000000
--- a/apps/gallery/js/slideshow.js
+++ /dev/null
@@ -1,58 +0,0 @@
-$(document).ready(function(){
-        
-	$.endSlideshow = function () {
-		if($.supersized.vars.slideshow_interval){
-			clearInterval($.supersized.vars.slideshow_interval);
-		};
-
-		$('#supersized-holder').remove();
-		$('#slideshow-content').hide();
-		$('#thumb-list').remove();
-	}
-        
-	// add slideshow in holder div
-	$('#slideshow input.start').click(function(){
-
-		var images=[];
-		$('#gallerycontent div a').each(function(i,a){
-			images.push({image : a.href, title : a.title.replace(/</, '&lt;').replace(/>/, '&gt;'), thumb : a.children[0].src, url : 'javascript:$.endSlideshow()'});
-		});
-
-		if (images.length <= 0) {
-			return;
-		}
-
-		$('body').append("<div id='supersized-holder'></div>");
-		$('#supersized-loader').remove();
-		$('#supersized').remove();
-		$('#supersized-holder').append("<div id='supersized-loader'></div><ul id='supersized'></ul>");
-		$('#supersized').show();
-		$('#slideshow-content').show();
-
-
-		jQuery(function($){
-
-			$.supersized({
-
-				// Functionality
-				slide_interval      :   3000,		// Length between transitions
-				transition          :   1, 		// 0-None, 1-Fade, 2-Slide Top, 3-Slide Right, 4-Slide Bottom, 5-Slide Left, 6-Carousel Right, 7-Carousel Left
-				transition_speed    :   700,		// Speed of transition
-
-				// Components							
-				slide_links         :   'blank',	// Individual links for each slide (Options: false, 'num', 'name', 'blank')
-				slides              :   images		// Slideshow Images
-							    
-			});
-		});
-
-	});
-
-	//close slideshow on esc and remove holder
-	$(document).keyup(function(e) {
-		if (e.keyCode == 27) { // esc
-			$.endSlideshow();
-		}
-	});
-
-});
diff --git a/apps/gallery/js/supersized.3.2.7.js b/apps/gallery/js/supersized.3.2.7.js
deleted file mode 100644
index f5a1c0bbc2..0000000000
--- a/apps/gallery/js/supersized.3.2.7.js
+++ /dev/null
@@ -1,930 +0,0 @@
-/*
-
-	Supersized - Fullscreen Slideshow jQuery Plugin
-	Version : 3.2.7
-	Site	: www.buildinternet.com/project/supersized
-	
-	Author	: Sam Dunn
-	Company : One Mighty Roar (www.onemightyroar.com)
-	License : MIT License / GPL License
-	
-*/
-
-(function($){
-
-	/* Place Supersized Elements
-	----------------------------*/
-	$(document).ready(function() {
-		$('body').append('<div id="supersized-loader"></div><ul id="supersized"></ul>');
-	});
-    
-    
-    $.supersized = function(options){
-    	
-    	/* Variables
-		----------------------------*/
-    	var el = '#supersized',
-        	base = this;
-        // Access to jQuery and DOM versions of element
-        base.$el = $(el);
-        base.el = el;
-        vars = $.supersized.vars;
-        // Add a reverse reference to the DOM object
-        base.$el.data("supersized", base);
-        api = base.$el.data('supersized');
-		
-		base.init = function(){
-        	// Combine options and vars
-        	$.supersized.vars = $.extend($.supersized.vars, $.supersized.themeVars);
-        	$.supersized.vars.options = $.extend({},$.supersized.defaultOptions, $.supersized.themeOptions, options);
-            base.options = $.supersized.vars.options;
-            
-            base._build();
-        };
-        
-        
-        /* Build Elements
-		----------------------------*/
-        base._build = function(){
-        	// Add in slide markers
-        	var thisSlide = 0,
-        		slideSet = '',
-				markers = '',
-				markerContent,
-				thumbMarkers = '',
-				thumbImage;
-				
-			while(thisSlide <= base.options.slides.length-1){
-				//Determine slide link content
-				switch(base.options.slide_links){
-					case 'num':
-						markerContent = thisSlide;
-						break;
-					case 'name':
-						markerContent = base.options.slides[thisSlide].title;
-						break;
-					case 'blank':
-						markerContent = '';
-						break;
-				}
-				
-				slideSet = slideSet+'<li class="slide-'+thisSlide+'"></li>';
-				
-				if(thisSlide == base.options.start_slide-1){
-					// Slide links
-					if (base.options.slide_links)markers = markers+'<li class="slide-link-'+thisSlide+' current-slide"><a>'+markerContent+'</a></li>';
-					// Slide Thumbnail Links
-					if (base.options.thumb_links){
-						base.options.slides[thisSlide].thumb ? thumbImage = base.options.slides[thisSlide].thumb : thumbImage = base.options.slides[thisSlide].image;
-						thumbMarkers = thumbMarkers+'<li class="thumb'+thisSlide+' current-thumb"><img src="'+thumbImage+'"/></li>';
-					};
-				}else{
-					// Slide links
-					if (base.options.slide_links) markers = markers+'<li class="slide-link-'+thisSlide+'" ><a>'+markerContent+'</a></li>';
-					// Slide Thumbnail Links
-					if (base.options.thumb_links){
-						base.options.slides[thisSlide].thumb ? thumbImage = base.options.slides[thisSlide].thumb : thumbImage = base.options.slides[thisSlide].image;
-						thumbMarkers = thumbMarkers+'<li class="thumb'+thisSlide+'"><img src="'+thumbImage+'"/></li>';
-					};
-				}
-				thisSlide++;
-			}
-			
-			if (base.options.slide_links) $(vars.slide_list).html(markers);
-			if (base.options.thumb_links && vars.thumb_tray.length){
-				$(vars.thumb_tray).append('<ul id="'+vars.thumb_list.replace('#','')+'">'+thumbMarkers+'</ul>');
-			}
-			
-			$(base.el).append(slideSet);
-			
-			// Add in thumbnails
-			if (base.options.thumbnail_navigation){
-				// Load previous thumbnail
-				vars.current_slide - 1 < 0  ? prevThumb = base.options.slides.length - 1 : prevThumb = vars.current_slide - 1;
-				$(vars.prev_thumb).show().html($("<img/>").attr("src", base.options.slides[prevThumb].image));
-				
-				// Load next thumbnail
-				vars.current_slide == base.options.slides.length - 1 ? nextThumb = 0 : nextThumb = vars.current_slide + 1;
-				$(vars.next_thumb).show().html($("<img/>").attr("src", base.options.slides[nextThumb].image));
-			}
-			
-            base._start(); // Get things started
-        };
-        
-        
-        /* Initialize
-		----------------------------*/
-    	base._start = function(){
-			
-			// Determine if starting slide random
-			if (base.options.start_slide){
-				vars.current_slide = base.options.start_slide - 1;
-			}else{
-				vars.current_slide = Math.floor(Math.random()*base.options.slides.length);	// Generate random slide number
-			}
-			
-			// If links should open in new window
-			var linkTarget = base.options.new_window ? ' target="_blank"' : '';
-			
-			// Set slideshow quality (Supported only in FF and IE, no Webkit)
-			if (base.options.performance == 3){
-				base.$el.addClass('speed'); 		// Faster transitions
-			} else if ((base.options.performance == 1) || (base.options.performance == 2)){
-				base.$el.addClass('quality');	// Higher image quality
-			}
-						
-			// Shuffle slide order if needed		
-			if (base.options.random){
-				arr = base.options.slides;
-				for(var j, x, i = arr.length; i; j = parseInt(Math.random() * i), x = arr[--i], arr[i] = arr[j], arr[j] = x);	// Fisher-Yates shuffle algorithm (jsfromhell.com/array/shuffle)
-			    base.options.slides = arr;
-			}
-			
-			/*-----Load initial set of images-----*/
-	
-			if (base.options.slides.length > 1){
-				if(base.options.slides.length > 2){
-					// Set previous image
-					vars.current_slide - 1 < 0  ? loadPrev = base.options.slides.length - 1 : loadPrev = vars.current_slide - 1;	// If slide is 1, load last slide as previous
-					var imageLink = (base.options.slides[loadPrev].url) ? "href='" + base.options.slides[loadPrev].url + "'" : "";
-				
-					var imgPrev = $('<img src="'+base.options.slides[loadPrev].image+'"/>');
-					var slidePrev = base.el+' li:eq('+loadPrev+')';
-					imgPrev.appendTo(slidePrev).wrap('<a ' + imageLink + linkTarget + '></a>').parent().parent().addClass('image-loading prevslide');
-				
-					imgPrev.load(function(){
-						$(this).data('origWidth', $(this).width()).data('origHeight', $(this).height());
-						base.resizeNow();	// Resize background image
-					});	// End Load
-				}
-			} else {
-				// Slideshow turned off if there is only one slide
-				base.options.slideshow = 0;
-			}
-			
-			// Set current image
-			imageLink = (api.getField('url')) ? "href='" + api.getField('url') + "'" : "";
-			var img = $('<img src="'+api.getField('image')+'"/>');
-			
-			var slideCurrent= base.el+' li:eq('+vars.current_slide+')';
-			img.appendTo(slideCurrent).wrap('<a ' + imageLink + linkTarget + '></a>').parent().parent().addClass('image-loading activeslide');
-			
-			img.load(function(){
-				base._origDim($(this));
-				base.resizeNow();	// Resize background image
-				base.launch();
-				if( typeof theme != 'undefined' && typeof theme._init == "function" ) theme._init();	// Load Theme
-			});
-			
-			if (base.options.slides.length > 1){
-				// Set next image
-				vars.current_slide == base.options.slides.length - 1 ? loadNext = 0 : loadNext = vars.current_slide + 1;	// If slide is last, load first slide as next
-				imageLink = (base.options.slides[loadNext].url) ? "href='" + base.options.slides[loadNext].url + "'" : "";
-				
-				var imgNext = $('<img src="'+base.options.slides[loadNext].image+'"/>');
-				var slideNext = base.el+' li:eq('+loadNext+')';
-				imgNext.appendTo(slideNext).wrap('<a ' + imageLink + linkTarget + '></a>').parent().parent().addClass('image-loading');
-				
-				imgNext.load(function(){
-					$(this).data('origWidth', $(this).width()).data('origHeight', $(this).height());
-					base.resizeNow();	// Resize background image
-				});	// End Load
-			}
-			/*-----End load initial images-----*/
-			
-			//  Hide elements to be faded in
-			base.$el.css('visibility','hidden');
-			$('.load-item').hide();
-			
-    	};
-		
-		
-		/* Launch Supersized
-		----------------------------*/
-		base.launch = function(){
-		
-			base.$el.css('visibility','visible');
-			$('#supersized-loader').remove();		//Hide loading animation
-			
-			// Call theme function for before slide transition
-			if( typeof theme != 'undefined' && typeof theme.beforeAnimation == "function" ) theme.beforeAnimation('next');
-			$('.load-item').show();
-			
-			// Keyboard Navigation
-			if (base.options.keyboard_nav){
-				$(document.documentElement).keyup(function (event) {
-				
-					if(vars.in_animation) return false;		// Abort if currently animating
-					
-					// Left Arrow or Down Arrow
-					if ((event.keyCode == 37) || (event.keyCode == 40)) {
-						clearInterval(vars.slideshow_interval);	// Stop slideshow, prevent buildup
-						base.prevSlide();
-					
-					// Right Arrow or Up Arrow
-					} else if ((event.keyCode == 39) || (event.keyCode == 38)) {
-						clearInterval(vars.slideshow_interval);	// Stop slideshow, prevent buildup
-						base.nextSlide();
-					
-					// Spacebar	
-					} else if (event.keyCode == 32 && !vars.hover_pause) {
-						clearInterval(vars.slideshow_interval);	// Stop slideshow, prevent buildup
-						base.playToggle();
-					}
-				
-				});
-			}
-			
-			// Pause when hover on image
-			if (base.options.slideshow && base.options.pause_hover){
-				$(base.el).hover(function() {
-					if(vars.in_animation) return false;		// Abort if currently animating
-			   			vars.hover_pause = true;	// Mark slideshow paused from hover
-			   			if(!vars.is_paused){
-			   				vars.hover_pause = 'resume';	// It needs to resume afterwards
-			   				base.playToggle();
-			   			}
-			   	}, function() {
-					if(vars.hover_pause == 'resume'){
-						base.playToggle();
-						vars.hover_pause = false;
-					}
-			   	});
-			}
-			
-			if (base.options.slide_links){
-				// Slide marker clicked
-				$(vars.slide_list+'> li').click(function(){
-				
-					index = $(vars.slide_list+'> li').index(this);
-					targetSlide = index + 1;
-					
-					base.goTo(targetSlide);
-					return false;
-					
-				});
-			}
-			
-			// Thumb marker clicked
-			if (base.options.thumb_links){
-				$(vars.thumb_list+'> li').click(function(){
-				
-					index = $(vars.thumb_list+'> li').index(this);
-					targetSlide = index + 1;
-					
-					api.goTo(targetSlide);
-					return false;
-					
-				});
-			}
-			
-			// Start slideshow if enabled
-			if (base.options.slideshow && base.options.slides.length > 1){
-	    		
-	    		// Start slideshow if autoplay enabled
-	    		if (base.options.autoplay && base.options.slides.length > 1){
-	    			vars.slideshow_interval = setInterval(base.nextSlide, base.options.slide_interval);	// Initiate slide interval
-				}else{
-					vars.is_paused = true;	// Mark as paused
-				}
-				
-				//Prevent navigation items from being dragged					
-				$('.load-item img').bind("contextmenu mousedown",function(){
-					return false;
-				});
-								
-			}
-			
-			// Adjust image when browser is resized
-			$(window).resize(function(){
-	    		base.resizeNow();
-			});
-    		
-    	};
-        
-        
-        /* Resize Images
-		----------------------------*/
-		base.resizeNow = function(){
-			
-			return base.$el.each(function() {
-		  		//  Resize each image seperately
-		  		$('img', base.el).each(function(){
-		  			
-					thisSlide = $(this);
-					var ratio = (thisSlide.data('origHeight')/thisSlide.data('origWidth')).toFixed(2);	// Define image ratio
-					
-					// Gather browser size
-					var browserwidth = base.$el.width(),
-						browserheight = base.$el.height(),
-						offset;
-					
-					/*-----Resize Image-----*/
-					if (base.options.fit_always){	// Fit always is enabled
-						if ((browserheight/browserwidth) > ratio){
-							resizeWidth();
-						} else {
-							resizeHeight();
-						}
-					}else{	// Normal Resize
-						if ((browserheight <= base.options.min_height) && (browserwidth <= base.options.min_width)){	// If window smaller than minimum width and height
-						
-							if ((browserheight/browserwidth) > ratio){
-								base.options.fit_landscape && ratio < 1 ? resizeWidth(true) : resizeHeight(true);	// If landscapes are set to fit
-							} else {
-								base.options.fit_portrait && ratio >= 1 ? resizeHeight(true) : resizeWidth(true);		// If portraits are set to fit
-							}
-						
-						} else if (browserwidth <= base.options.min_width){		// If window only smaller than minimum width
-						
-							if ((browserheight/browserwidth) > ratio){
-								base.options.fit_landscape && ratio < 1 ? resizeWidth(true) : resizeHeight();	// If landscapes are set to fit
-							} else {
-								base.options.fit_portrait && ratio >= 1 ? resizeHeight() : resizeWidth(true);		// If portraits are set to fit
-							}
-							
-						} else if (browserheight <= base.options.min_height){	// If window only smaller than minimum height
-						
-							if ((browserheight/browserwidth) > ratio){
-								base.options.fit_landscape && ratio < 1 ? resizeWidth() : resizeHeight(true);	// If landscapes are set to fit
-							} else {
-								base.options.fit_portrait && ratio >= 1 ? resizeHeight(true) : resizeWidth();		// If portraits are set to fit
-							}
-						
-						} else {	// If larger than minimums
-							
-							if ((browserheight/browserwidth) > ratio){
-								base.options.fit_landscape && ratio < 1 ? resizeWidth() : resizeHeight();	// If landscapes are set to fit
-							} else {
-								base.options.fit_portrait && ratio >= 1 ? resizeHeight() : resizeWidth();		// If portraits are set to fit
-							}
-							
-						}
-					}
-					/*-----End Image Resize-----*/
-					
-					
-					/*-----Resize Functions-----*/
-					
-					function resizeWidth(minimum){
-						if (minimum){	// If minimum height needs to be considered
-							if(thisSlide.width() < browserwidth || thisSlide.width() < base.options.min_width ){
-								if (thisSlide.width() * ratio >= base.options.min_height){
-									thisSlide.width(base.options.min_width);
-						    		thisSlide.height(thisSlide.width() * ratio);
-						    	}else{
-						    		resizeHeight();
-						    	}
-						    }
-						}else{
-							if (base.options.min_height >= browserheight && !base.options.fit_landscape){	// If minimum height needs to be considered
-								if (browserwidth * ratio >= base.options.min_height || (browserwidth * ratio >= base.options.min_height && ratio <= 1)){	// If resizing would push below minimum height or image is a landscape
-									thisSlide.width(browserwidth);
-									thisSlide.height(browserwidth * ratio);
-								} else if (ratio > 1){		// Else the image is portrait
-									thisSlide.height(base.options.min_height);
-									thisSlide.width(thisSlide.height() / ratio);
-								} else if (thisSlide.width() < browserwidth) {
-									thisSlide.width(browserwidth);
-						    		thisSlide.height(thisSlide.width() * ratio);
-								}
-							}else{	// Otherwise, resize as normal
-								thisSlide.width(browserwidth);
-								thisSlide.height(browserwidth * ratio);
-							}
-						}
-					};
-					
-					function resizeHeight(minimum){
-						if (minimum){	// If minimum height needs to be considered
-							if(thisSlide.height() < browserheight){
-								if (thisSlide.height() / ratio >= base.options.min_width){
-									thisSlide.height(base.options.min_height);
-									thisSlide.width(thisSlide.height() / ratio);
-								}else{
-									resizeWidth(true);
-								}
-							}
-						}else{	// Otherwise, resized as normal
-							if (base.options.min_width >= browserwidth){	// If minimum width needs to be considered
-								if (browserheight / ratio >= base.options.min_width || ratio > 1){	// If resizing would push below minimum width or image is a portrait
-									thisSlide.height(browserheight);
-									thisSlide.width(browserheight / ratio);
-								} else if (ratio <= 1){		// Else the image is landscape
-									thisSlide.width(base.options.min_width);
-						    		thisSlide.height(thisSlide.width() * ratio);
-								}
-							}else{	// Otherwise, resize as normal
-								thisSlide.height(browserheight);
-								thisSlide.width(browserheight / ratio);
-							}
-						}
-					};
-					
-					/*-----End Resize Functions-----*/
-					
-					if (thisSlide.parents('li').hasClass('image-loading')){
-						$('.image-loading').removeClass('image-loading');
-					}
-					
-					// Horizontally Center
-					if (base.options.horizontal_center){
-						$(this).css('left', (browserwidth - $(this).width())/2);
-					}
-					
-					// Vertically Center
-					if (base.options.vertical_center){
-						$(this).css('top', (browserheight - $(this).height())/2);
-					}
-					
-				});
-				
-				// Basic image drag and right click protection
-				if (base.options.image_protect){
-					
-					$('img', base.el).bind("contextmenu mousedown",function(){
-						return false;
-					});
-				
-				}
-				
-				return false;
-				
-			});
-			
-		};
-        
-        
-        /* Next Slide
-		----------------------------*/
-		base.nextSlide = function(){
-			
-			if(vars.in_animation || !api.options.slideshow) return false;		// Abort if currently animating
-				else vars.in_animation = true;		// Otherwise set animation marker
-				
-		    clearInterval(vars.slideshow_interval);	// Stop slideshow
-		    
-		    var slides = base.options.slides,					// Pull in slides array
-				liveslide = base.$el.find('.activeslide');		// Find active slide
-				$('.prevslide').removeClass('prevslide');
-				liveslide.removeClass('activeslide').addClass('prevslide');	// Remove active class & update previous slide
-					
-			// Get the slide number of new slide
-			vars.current_slide + 1 == base.options.slides.length ? vars.current_slide = 0 : vars.current_slide++;
-			
-		    var nextslide = $(base.el+' li:eq('+vars.current_slide+')'),
-		    	prevslide = base.$el.find('.prevslide');
-			
-			// If hybrid mode is on drop quality for transition
-			if (base.options.performance == 1) base.$el.removeClass('quality').addClass('speed');	
-			
-			
-			/*-----Load Image-----*/
-			
-			loadSlide = false;
-
-			vars.current_slide == base.options.slides.length - 1 ? loadSlide = 0 : loadSlide = vars.current_slide + 1;	// Determine next slide
-
-			var targetList = base.el+' li:eq('+loadSlide+')';
-			if (!$(targetList).html()){
-				
-				// If links should open in new window
-				var linkTarget = base.options.new_window ? ' target="_blank"' : '';
-				
-				imageLink = (base.options.slides[loadSlide].url) ? "href='" + base.options.slides[loadSlide].url + "'" : "";	// If link exists, build it
-				var img = $('<img src="'+base.options.slides[loadSlide].image+'"/>'); 
-				
-				img.appendTo(targetList).wrap('<a ' + imageLink + linkTarget + '></a>').parent().parent().addClass('image-loading').css('visibility','hidden');
-				
-				img.load(function(){
-					base._origDim($(this));
-					base.resizeNow();
-				});	// End Load
-			};
-						
-			// Update thumbnails (if enabled)
-			if (base.options.thumbnail_navigation == 1){
-			
-				// Load previous thumbnail
-				vars.current_slide - 1 < 0  ? prevThumb = base.options.slides.length - 1 : prevThumb = vars.current_slide - 1;
-				$(vars.prev_thumb).html($("<img/>").attr("src", base.options.slides[prevThumb].image));
-			
-				// Load next thumbnail
-				nextThumb = loadSlide;
-				$(vars.next_thumb).html($("<img/>").attr("src", base.options.slides[nextThumb].image));
-				
-			}
-			
-			
-			
-			/*-----End Load Image-----*/
-			
-			
-			// Call theme function for before slide transition
-			if( typeof theme != 'undefined' && typeof theme.beforeAnimation == "function" ) theme.beforeAnimation('next');
-			
-			//Update slide markers
-			if (base.options.slide_links){
-				$('.current-slide').removeClass('current-slide');
-				$(vars.slide_list +'> li' ).eq(vars.current_slide).addClass('current-slide');
-			}
-		    
-		    nextslide.css('visibility','hidden').addClass('activeslide');	// Update active slide
-		    
-	    	switch(base.options.transition){
-	    		case 0: case 'none':	// No transition
-	    		    nextslide.css('visibility','visible'); vars.in_animation = false; base.afterAnimation();
-	    		    break;
-	    		case 1: case 'fade':	// Fade
-	    		    nextslide.animate({opacity : 0},0).css('visibility','visible').animate({opacity : 1, avoidTransforms : false}, base.options.transition_speed, function(){ base.afterAnimation(); });
-	    		    break;
-	    		case 2: case 'slideTop':	// Slide Top
-	    		    nextslide.animate({top : -base.$el.height()}, 0 ).css('visibility','visible').animate({ top:0, avoidTransforms : false }, base.options.transition_speed, function(){ base.afterAnimation(); });
-	    		    break;
-	    		case 3: case 'slideRight':	// Slide Right
-	    			nextslide.animate({left : base.$el.width()}, 0 ).css('visibility','visible').animate({ left:0, avoidTransforms : false }, base.options.transition_speed, function(){ base.afterAnimation(); });
-	    			break;
-	    		case 4: case 'slideBottom': // Slide Bottom
-	    			nextslide.animate({top : base.$el.height()}, 0 ).css('visibility','visible').animate({ top:0, avoidTransforms : false }, base.options.transition_speed, function(){ base.afterAnimation(); });
-	    			break;
-	    		case 5: case 'slideLeft':  // Slide Left
-	    			nextslide.animate({left : -base.$el.width()}, 0 ).css('visibility','visible').animate({ left:0, avoidTransforms : false }, base.options.transition_speed, function(){ base.afterAnimation(); });
-	    			break;
-	    		case 6: case 'carouselRight':	// Carousel Right
-	    			nextslide.animate({left : base.$el.width()}, 0 ).css('visibility','visible').animate({ left:0, avoidTransforms : false }, base.options.transition_speed, function(){ base.afterAnimation(); });
-					liveslide.animate({ left: -base.$el.width(), avoidTransforms : false }, base.options.transition_speed );
-	    			break;
-	    		case 7: case 'carouselLeft':   // Carousel Left
-	    			nextslide.animate({left : -base.$el.width()}, 0 ).css('visibility','visible').animate({ left:0, avoidTransforms : false }, base.options.transition_speed, function(){ base.afterAnimation(); });
-					liveslide.animate({ left: base.$el.width(), avoidTransforms : false }, base.options.transition_speed );
-	    			break;
-	    	}
-		    return false;	
-		};
-		
-		
-		/* Previous Slide
-		----------------------------*/
-		base.prevSlide = function(){
-		
-			if(vars.in_animation || !api.options.slideshow) return false;		// Abort if currently animating
-				else vars.in_animation = true;		// Otherwise set animation marker
-			
-			clearInterval(vars.slideshow_interval);	// Stop slideshow
-			
-			var slides = base.options.slides,					// Pull in slides array
-				liveslide = base.$el.find('.activeslide');		// Find active slide
-				$('.prevslide').removeClass('prevslide');
-				liveslide.removeClass('activeslide').addClass('prevslide');		// Remove active class & update previous slide
-			
-			// Get current slide number
-			vars.current_slide == 0 ?  vars.current_slide = base.options.slides.length - 1 : vars.current_slide-- ;
-				
-		    var nextslide =  $(base.el+' li:eq('+vars.current_slide+')'),
-		    	prevslide =  base.$el.find('.prevslide');
-			
-			// If hybrid mode is on drop quality for transition
-			if (base.options.performance == 1) base.$el.removeClass('quality').addClass('speed');	
-			
-			
-			/*-----Load Image-----*/
-			
-			loadSlide = vars.current_slide;
-			
-			var targetList = base.el+' li:eq('+loadSlide+')';
-			if (!$(targetList).html()){
-				// If links should open in new window
-				var linkTarget = base.options.new_window ? ' target="_blank"' : '';
-				imageLink = (base.options.slides[loadSlide].url) ? "href='" + base.options.slides[loadSlide].url + "'" : "";	// If link exists, build it
-				var img = $('<img src="'+base.options.slides[loadSlide].image+'"/>'); 
-				
-				img.appendTo(targetList).wrap('<a ' + imageLink + linkTarget + '></a>').parent().parent().addClass('image-loading').css('visibility','hidden');
-				
-				img.load(function(){
-					base._origDim($(this));
-					base.resizeNow();
-				});	// End Load
-			};
-			
-			// Update thumbnails (if enabled)
-			if (base.options.thumbnail_navigation == 1){
-			
-				// Load previous thumbnail
-				//prevThumb = loadSlide;
-				loadSlide == 0 ? prevThumb = base.options.slides.length - 1 : prevThumb = loadSlide - 1;
-				$(vars.prev_thumb).html($("<img/>").attr("src", base.options.slides[prevThumb].image));
-				
-				// Load next thumbnail
-				vars.current_slide == base.options.slides.length - 1 ? nextThumb = 0 : nextThumb = vars.current_slide + 1;
-				$(vars.next_thumb).html($("<img/>").attr("src", base.options.slides[nextThumb].image));
-			}
-			
-			/*-----End Load Image-----*/
-			
-			
-			// Call theme function for before slide transition
-			if( typeof theme != 'undefined' && typeof theme.beforeAnimation == "function" ) theme.beforeAnimation('prev');
-			
-			//Update slide markers
-			if (base.options.slide_links){
-				$('.current-slide').removeClass('current-slide');
-				$(vars.slide_list +'> li' ).eq(vars.current_slide).addClass('current-slide');
-			}
-			
-		    nextslide.css('visibility','hidden').addClass('activeslide');	// Update active slide
-		    
-		    switch(base.options.transition){
-	    		case 0: case 'none':	// No transition
-	    		    nextslide.css('visibility','visible'); vars.in_animation = false; base.afterAnimation();
-	    		    break;
-	    		case 1: case 'fade':	// Fade
-	    		  	nextslide.animate({opacity : 0},0).css('visibility','visible').animate({opacity : 1, avoidTransforms : false}, base.options.transition_speed, function(){ base.afterAnimation(); });
-	    		    break;
-	    		case 2: case 'slideTop':	// Slide Top (reverse)
-	    		    nextslide.animate({top : base.$el.height()}, 0 ).css('visibility','visible').animate({ top:0, avoidTransforms : false }, base.options.transition_speed, function(){ base.afterAnimation(); });
-	    		    break;
-	    		case 3: case 'slideRight':	// Slide Right (reverse)
-	    			nextslide.animate({left : -base.$el.width()}, 0 ).css('visibility','visible').animate({ left:0, avoidTransforms : false }, base.options.transition_speed, function(){ base.afterAnimation(); });
-	    			break;
-	    		case 4: case 'slideBottom': // Slide Bottom (reverse)
-	    			nextslide.animate({top : -base.$el.height()}, 0 ).css('visibility','visible').animate({ top:0, avoidTransforms : false }, base.options.transition_speed, function(){ base.afterAnimation(); });
-	    			break;
-	    		case 5: case 'slideLeft':  // Slide Left (reverse)
-	    			nextslide.animate({left : base.$el.width()}, 0 ).css('visibility','visible').animate({ left:0, avoidTransforms : false }, base.options.transition_speed, function(){ base.afterAnimation(); });
-	    			break;
-	    		case 6: case 'carouselRight':	// Carousel Right (reverse)
-	    			nextslide.animate({left : -base.$el.width()}, 0 ).css('visibility','visible').animate({ left:0, avoidTransforms : false }, base.options.transition_speed, function(){ base.afterAnimation(); });
-					liveslide.animate({left : 0}, 0 ).animate({ left: base.$el.width(), avoidTransforms : false}, base.options.transition_speed );
-	    			break;
-	    		case 7: case 'carouselLeft':   // Carousel Left (reverse)
-	    			nextslide.animate({left : base.$el.width()}, 0 ).css('visibility','visible').animate({ left:0, avoidTransforms : false }, base.options.transition_speed, function(){ base.afterAnimation(); });
-					liveslide.animate({left : 0}, 0 ).animate({ left: -base.$el.width(), avoidTransforms : false }, base.options.transition_speed );
-	    			break;
-	    	}
-		    return false;	
-		};
-		
-		
-		/* Play/Pause Toggle
-		----------------------------*/
-		base.playToggle = function(){
-		
-			if (vars.in_animation || !api.options.slideshow) return false;		// Abort if currently animating
-			
-			if (vars.is_paused){
-				
-				vars.is_paused = false;
-				
-				// Call theme function for play
-				if( typeof theme != 'undefined' && typeof theme.playToggle == "function" ) theme.playToggle('play');
-				
-				// Resume slideshow
-	        	vars.slideshow_interval = setInterval(base.nextSlide, base.options.slide_interval);
-	        	  
-        	}else{
-        		
-        		vars.is_paused = true;
-        		
-        		// Call theme function for pause
-        		if( typeof theme != 'undefined' && typeof theme.playToggle == "function" ) theme.playToggle('pause');
-        		
-        		// Stop slideshow
-        		clearInterval(vars.slideshow_interval);	
-       		
-       		}
-		    
-		    return false;
-    		
-    	};
-    	
-    	
-    	/* Go to specific slide
-		----------------------------*/
-    	base.goTo = function(targetSlide){
-			if (vars.in_animation || !api.options.slideshow) return false;		// Abort if currently animating
-			
-			var totalSlides = base.options.slides.length;
-			
-			// If target outside range
-			if(targetSlide < 0){
-				targetSlide = totalSlides;
-			}else if(targetSlide > totalSlides){
-				targetSlide = 1;
-			}
-			targetSlide = totalSlides - targetSlide + 1;
-			
-			clearInterval(vars.slideshow_interval);	// Stop slideshow, prevent buildup
-			
-			// Call theme function for goTo trigger
-			if (typeof theme != 'undefined' && typeof theme.goTo == "function" ) theme.goTo();
-			
-			if (vars.current_slide == totalSlides - targetSlide){
-				if(!(vars.is_paused)){
-					vars.slideshow_interval = setInterval(base.nextSlide, base.options.slide_interval);
-				} 
-				return false;
-			}
-			
-			// If ahead of current position
-			if(totalSlides - targetSlide > vars.current_slide ){
-				
-				// Adjust for new next slide
-				vars.current_slide = totalSlides-targetSlide-1;
-				vars.update_images = 'next';
-				base._placeSlide(vars.update_images);
-				
-			//Otherwise it's before current position
-			}else if(totalSlides - targetSlide < vars.current_slide){
-				
-				// Adjust for new prev slide
-				vars.current_slide = totalSlides-targetSlide+1;
-				vars.update_images = 'prev';
-			    base._placeSlide(vars.update_images);
-			    
-			}
-			
-			// set active markers
-			if (base.options.slide_links){
-				$(vars.slide_list +'> .current-slide').removeClass('current-slide');
-				$(vars.slide_list +'> li').eq((totalSlides-targetSlide)).addClass('current-slide');
-			}
-			
-			if (base.options.thumb_links){
-				$(vars.thumb_list +'> .current-thumb').removeClass('current-thumb');
-				$(vars.thumb_list +'> li').eq((totalSlides-targetSlide)).addClass('current-thumb');
-			}
-			
-		};
-        
-        
-        /* Place Slide
-		----------------------------*/
-        base._placeSlide = function(place){
-    			
-			// If links should open in new window
-			var linkTarget = base.options.new_window ? ' target="_blank"' : '';
-			
-			loadSlide = false;
-			
-			if (place == 'next'){
-				
-				vars.current_slide == base.options.slides.length - 1 ? loadSlide = 0 : loadSlide = vars.current_slide + 1;	// Determine next slide
-				
-				var targetList = base.el+' li:eq('+loadSlide+')';
-				
-				if (!$(targetList).html()){
-					// If links should open in new window
-					var linkTarget = base.options.new_window ? ' target="_blank"' : '';
-					
-					imageLink = (base.options.slides[loadSlide].url) ? "href='" + base.options.slides[loadSlide].url + "'" : "";	// If link exists, build it
-					var img = $('<img src="'+base.options.slides[loadSlide].image+'"/>'); 
-					
-					img.appendTo(targetList).wrap('<a ' + imageLink + linkTarget + '></a>').parent().parent().addClass('image-loading').css('visibility','hidden');
-					
-					img.load(function(){
-						base._origDim($(this));
-						base.resizeNow();
-					});	// End Load
-				};
-				
-				base.nextSlide();
-				
-			}else if (place == 'prev'){
-			
-				vars.current_slide - 1 < 0  ? loadSlide = base.options.slides.length - 1 : loadSlide = vars.current_slide - 1;	// Determine next slide
-				
-				var targetList = base.el+' li:eq('+loadSlide+')';
-				
-				if (!$(targetList).html()){
-					// If links should open in new window
-					var linkTarget = base.options.new_window ? ' target="_blank"' : '';
-					
-					imageLink = (base.options.slides[loadSlide].url) ? "href='" + base.options.slides[loadSlide].url + "'" : "";	// If link exists, build it
-					var img = $('<img src="'+base.options.slides[loadSlide].image+'"/>'); 
-					
-					img.appendTo(targetList).wrap('<a ' + imageLink + linkTarget + '></a>').parent().parent().addClass('image-loading').css('visibility','hidden');
-					
-					img.load(function(){
-						base._origDim($(this));
-						base.resizeNow();
-					});	// End Load
-				};
-				base.prevSlide();
-			}
-			
-		};
-		
-		
-		/* Get Original Dimensions
-		----------------------------*/
-		base._origDim = function(targetSlide){
-			targetSlide.data('origWidth', targetSlide.width()).data('origHeight', targetSlide.height());
-		};
-		
-		
-		/* After Slide Animation
-		----------------------------*/
-		base.afterAnimation = function(){
-			
-			// If hybrid mode is on swap back to higher image quality
-			if (base.options.performance == 1){
-		    	base.$el.removeClass('speed').addClass('quality');
-			}
-			
-			// Update previous slide
-			if (vars.update_images){
-				vars.current_slide - 1 < 0  ? setPrev = base.options.slides.length - 1 : setPrev = vars.current_slide-1;
-				vars.update_images = false;
-				$('.prevslide').removeClass('prevslide');
-				$(base.el+' li:eq('+setPrev+')').addClass('prevslide');
-			}
-			
-			vars.in_animation = false;
-			
-			// Resume slideshow
-			if (!vars.is_paused && base.options.slideshow){
-				vars.slideshow_interval = setInterval(base.nextSlide, base.options.slide_interval);
-				if (base.options.stop_loop && vars.current_slide == base.options.slides.length - 1 ) base.playToggle();
-			}
-			
-			// Call theme function for after slide transition
-			if (typeof theme != 'undefined' && typeof theme.afterAnimation == "function" ) theme.afterAnimation();
-			
-			return false;
-		
-		};
-		
-		base.getField = function(field){
-			return base.options.slides[vars.current_slide][field];
-		};
-		
-        // Make it go!
-        base.init();
-	};
-	
-	
-	/* Global Variables
-	----------------------------*/
-	$.supersized.vars = {
-	
-		// Elements							
-		thumb_tray			:	'#thumb-tray',	// Thumbnail tray
-		thumb_list			:	'#thumb-list',	// Thumbnail list
-		slide_list          :   '#slide-list',	// Slide link list
-		
-		// Internal variables
-		current_slide			:	0,			// Current slide number
-		in_animation 			:	false,		// Prevents animations from stacking
-		is_paused 				: 	false,		// Tracks paused on/off
-		hover_pause				:	false,		// If slideshow is paused from hover
-		slideshow_interval		:	false,		// Stores slideshow timer					
-		update_images 			: 	false,		// Trigger to update images after slide jump
-		options					:	{}			// Stores assembled options list
-		
-	};
-	
-	
-	/* Default Options
-	----------------------------*/
-	$.supersized.defaultOptions = {
-    
-    	// Functionality
-		slideshow               :   1,			// Slideshow on/off
-		autoplay				:	1,			// Slideshow starts playing automatically
-		start_slide             :   1,			// Start slide (0 is random)
-		stop_loop				:	0,			// Stops slideshow on last slide
-		random					: 	0,			// Randomize slide order (Ignores start slide)
-		slide_interval          :   5000,		// Length between transitions
-		transition              :   1, 			// 0-None, 1-Fade, 2-Slide Top, 3-Slide Right, 4-Slide Bottom, 5-Slide Left, 6-Carousel Right, 7-Carousel Left
-		transition_speed		:	750,		// Speed of transition
-		new_window				:	1,			// Image links open in new window/tab
-		pause_hover             :   0,			// Pause slideshow on hover
-		keyboard_nav            :   1,			// Keyboard navigation on/off
-		performance				:	1,			// 0-Normal, 1-Hybrid speed/quality, 2-Optimizes image quality, 3-Optimizes transition speed //  (Only works for Firefox/IE, not Webkit)
-		image_protect			:	1,			// Disables image dragging and right click with Javascript
-												   
-		// Size & Position
-		fit_always				:	0,			// Image will never exceed browser width or height (Ignores min. dimensions)
-		fit_landscape			:   0,			// Landscape images will not exceed browser width
-		fit_portrait         	:   1,			// Portrait images will not exceed browser height  			   
-		min_width		        :   0,			// Min width allowed (in pixels)
-		min_height		        :   0,			// Min height allowed (in pixels)
-		horizontal_center       :   1,			// Horizontally center background
-		vertical_center         :   1,			// Vertically center background
-		
-												   
-		// Components							
-		slide_links				:	1,			// Individual links for each slide (Options: false, 'num', 'name', 'blank')
-		thumb_links				:	1,			// Individual thumb links for each slide
-		thumbnail_navigation    :   0			// Thumbnail navigation
-    	
-    };
-    
-    $.fn.supersized = function(options){
-        return this.each(function(){
-            (new $.supersized(options));
-        });
-    };
-		
-})(jQuery);
-
diff --git a/apps/gallery/js/supersized.3.2.7.min.js b/apps/gallery/js/supersized.3.2.7.min.js
deleted file mode 100644
index b9cea9cee1..0000000000
--- a/apps/gallery/js/supersized.3.2.7.min.js
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
-
-	Supersized - Fullscreen Slideshow jQuery Plugin
-	Version : 3.2.7
-	Site	: www.buildinternet.com/project/supersized
-	
-	Author	: Sam Dunn
-	Company : One Mighty Roar (www.onemightyroar.com)
-	License : MIT License / GPL License
-	
-*/
-
-(function(a){a(document).ready(function(){a("body").append('<div id="supersized-loader"></div><ul id="supersized"></ul>')});a.supersized=function(b){var c="#supersized",d=this;d.$el=a(c);d.el=c;vars=a.supersized.vars;d.$el.data("supersized",d);api=d.$el.data("supersized");d.init=function(){a.supersized.vars=a.extend(a.supersized.vars,a.supersized.themeVars);a.supersized.vars.options=a.extend({},a.supersized.defaultOptions,a.supersized.themeOptions,b);d.options=a.supersized.vars.options;d._build()};d._build=function(){var g=0,e="",j="",h,f="",i;while(g<=d.options.slides.length-1){switch(d.options.slide_links){case"num":h=g;break;case"name":h=d.options.slides[g].title;break;case"blank":h="";break}e=e+'<li class="slide-'+g+'"></li>';if(g==d.options.start_slide-1){if(d.options.slide_links){j=j+'<li class="slide-link-'+g+' current-slide"><a>'+h+"</a></li>"}if(d.options.thumb_links){d.options.slides[g].thumb?i=d.options.slides[g].thumb:i=d.options.slides[g].image;f=f+'<li class="thumb'+g+' current-thumb"><img src="'+i+'"/></li>'}}else{if(d.options.slide_links){j=j+'<li class="slide-link-'+g+'" ><a>'+h+"</a></li>"}if(d.options.thumb_links){d.options.slides[g].thumb?i=d.options.slides[g].thumb:i=d.options.slides[g].image;f=f+'<li class="thumb'+g+'"><img src="'+i+'"/></li>'}}g++}if(d.options.slide_links){a(vars.slide_list).html(j)}if(d.options.thumb_links&&vars.thumb_tray.length){a(vars.thumb_tray).append('<ul id="'+vars.thumb_list.replace("#","")+'">'+f+"</ul>")}a(d.el).append(e);if(d.options.thumbnail_navigation){vars.current_slide-1<0?prevThumb=d.options.slides.length-1:prevThumb=vars.current_slide-1;a(vars.prev_thumb).show().html(a("<img/>").attr("src",d.options.slides[prevThumb].image));vars.current_slide==d.options.slides.length-1?nextThumb=0:nextThumb=vars.current_slide+1;a(vars.next_thumb).show().html(a("<img/>").attr("src",d.options.slides[nextThumb].image))}d._start()};d._start=function(){if(d.options.start_slide){vars.current_slide=d.options.start_slide-1}else{vars.current_slide=Math.floor(Math.random()*d.options.slides.length)}var o=d.options.new_window?' target="_blank"':"";if(d.options.performance==3){d.$el.addClass("speed")}else{if((d.options.performance==1)||(d.options.performance==2)){d.$el.addClass("quality")}}if(d.options.random){arr=d.options.slides;for(var h,m,k=arr.length;k;h=parseInt(Math.random()*k),m=arr[--k],arr[k]=arr[h],arr[h]=m){}d.options.slides=arr}if(d.options.slides.length>1){if(d.options.slides.length>2){vars.current_slide-1<0?loadPrev=d.options.slides.length-1:loadPrev=vars.current_slide-1;var g=(d.options.slides[loadPrev].url)?"href='"+d.options.slides[loadPrev].url+"'":"";var q=a('<img src="'+d.options.slides[loadPrev].image+'"/>');var n=d.el+" li:eq("+loadPrev+")";q.appendTo(n).wrap("<a "+g+o+"></a>").parent().parent().addClass("image-loading prevslide");q.load(function(){a(this).data("origWidth",a(this).width()).data("origHeight",a(this).height());d.resizeNow()})}}else{d.options.slideshow=0}g=(api.getField("url"))?"href='"+api.getField("url")+"'":"";var l=a('<img src="'+api.getField("image")+'"/>');var f=d.el+" li:eq("+vars.current_slide+")";l.appendTo(f).wrap("<a "+g+o+"></a>").parent().parent().addClass("image-loading activeslide");l.load(function(){d._origDim(a(this));d.resizeNow();d.launch();if(typeof theme!="undefined"&&typeof theme._init=="function"){theme._init()}});if(d.options.slides.length>1){vars.current_slide==d.options.slides.length-1?loadNext=0:loadNext=vars.current_slide+1;g=(d.options.slides[loadNext].url)?"href='"+d.options.slides[loadNext].url+"'":"";var e=a('<img src="'+d.options.slides[loadNext].image+'"/>');var p=d.el+" li:eq("+loadNext+")";e.appendTo(p).wrap("<a "+g+o+"></a>").parent().parent().addClass("image-loading");e.load(function(){a(this).data("origWidth",a(this).width()).data("origHeight",a(this).height());d.resizeNow()})}d.$el.css("visibility","hidden");a(".load-item").hide()};d.launch=function(){d.$el.css("visibility","visible");a("#supersized-loader").remove();if(typeof theme!="undefined"&&typeof theme.beforeAnimation=="function"){theme.beforeAnimation("next")}a(".load-item").show();if(d.options.keyboard_nav){a(document.documentElement).keyup(function(e){if(vars.in_animation){return false}if((e.keyCode==37)||(e.keyCode==40)){clearInterval(vars.slideshow_interval);d.prevSlide()}else{if((e.keyCode==39)||(e.keyCode==38)){clearInterval(vars.slideshow_interval);d.nextSlide()}else{if(e.keyCode==32&&!vars.hover_pause){clearInterval(vars.slideshow_interval);d.playToggle()}}}})}if(d.options.slideshow&&d.options.pause_hover){a(d.el).hover(function(){if(vars.in_animation){return false}vars.hover_pause=true;if(!vars.is_paused){vars.hover_pause="resume";d.playToggle()}},function(){if(vars.hover_pause=="resume"){d.playToggle();vars.hover_pause=false}})}if(d.options.slide_links){a(vars.slide_list+"> li").click(function(){index=a(vars.slide_list+"> li").index(this);targetSlide=index+1;d.goTo(targetSlide);return false})}if(d.options.thumb_links){a(vars.thumb_list+"> li").click(function(){index=a(vars.thumb_list+"> li").index(this);targetSlide=index+1;api.goTo(targetSlide);return false})}if(d.options.slideshow&&d.options.slides.length>1){if(d.options.autoplay&&d.options.slides.length>1){vars.slideshow_interval=setInterval(d.nextSlide,d.options.slide_interval)}else{vars.is_paused=true}a(".load-item img").bind("contextmenu mousedown",function(){return false})}a(window).resize(function(){d.resizeNow()})};d.resizeNow=function(){return d.$el.each(function(){a("img",d.el).each(function(){thisSlide=a(this);var f=(thisSlide.data("origHeight")/thisSlide.data("origWidth")).toFixed(2);var e=d.$el.width(),h=d.$el.height(),i;if(d.options.fit_always){if((h/e)>f){g()}else{j()}}else{if((h<=d.options.min_height)&&(e<=d.options.min_width)){if((h/e)>f){d.options.fit_landscape&&f<1?g(true):j(true)}else{d.options.fit_portrait&&f>=1?j(true):g(true)}}else{if(e<=d.options.min_width){if((h/e)>f){d.options.fit_landscape&&f<1?g(true):j()}else{d.options.fit_portrait&&f>=1?j():g(true)}}else{if(h<=d.options.min_height){if((h/e)>f){d.options.fit_landscape&&f<1?g():j(true)}else{d.options.fit_portrait&&f>=1?j(true):g()}}else{if((h/e)>f){d.options.fit_landscape&&f<1?g():j()}else{d.options.fit_portrait&&f>=1?j():g()}}}}}function g(k){if(k){if(thisSlide.width()<e||thisSlide.width()<d.options.min_width){if(thisSlide.width()*f>=d.options.min_height){thisSlide.width(d.options.min_width);thisSlide.height(thisSlide.width()*f)}else{j()}}}else{if(d.options.min_height>=h&&!d.options.fit_landscape){if(e*f>=d.options.min_height||(e*f>=d.options.min_height&&f<=1)){thisSlide.width(e);thisSlide.height(e*f)}else{if(f>1){thisSlide.height(d.options.min_height);thisSlide.width(thisSlide.height()/f)}else{if(thisSlide.width()<e){thisSlide.width(e);thisSlide.height(thisSlide.width()*f)}}}}else{thisSlide.width(e);thisSlide.height(e*f)}}}function j(k){if(k){if(thisSlide.height()<h){if(thisSlide.height()/f>=d.options.min_width){thisSlide.height(d.options.min_height);thisSlide.width(thisSlide.height()/f)}else{g(true)}}}else{if(d.options.min_width>=e){if(h/f>=d.options.min_width||f>1){thisSlide.height(h);thisSlide.width(h/f)}else{if(f<=1){thisSlide.width(d.options.min_width);thisSlide.height(thisSlide.width()*f)}}}else{thisSlide.height(h);thisSlide.width(h/f)}}}if(thisSlide.parents("li").hasClass("image-loading")){a(".image-loading").removeClass("image-loading")}if(d.options.horizontal_center){a(this).css("left",(e-a(this).width())/2)}if(d.options.vertical_center){a(this).css("top",(h-a(this).height())/2)}});if(d.options.image_protect){a("img",d.el).bind("contextmenu mousedown",function(){return false})}return false})};d.nextSlide=function(){if(vars.in_animation||!api.options.slideshow){return false}else{vars.in_animation=true}clearInterval(vars.slideshow_interval);var h=d.options.slides,e=d.$el.find(".activeslide");a(".prevslide").removeClass("prevslide");e.removeClass("activeslide").addClass("prevslide");vars.current_slide+1==d.options.slides.length?vars.current_slide=0:vars.current_slide++;var g=a(d.el+" li:eq("+vars.current_slide+")"),i=d.$el.find(".prevslide");if(d.options.performance==1){d.$el.removeClass("quality").addClass("speed")}loadSlide=false;vars.current_slide==d.options.slides.length-1?loadSlide=0:loadSlide=vars.current_slide+1;var k=d.el+" li:eq("+loadSlide+")";if(!a(k).html()){var j=d.options.new_window?' target="_blank"':"";imageLink=(d.options.slides[loadSlide].url)?"href='"+d.options.slides[loadSlide].url+"'":"";var f=a('<img src="'+d.options.slides[loadSlide].image+'"/>');f.appendTo(k).wrap("<a "+imageLink+j+"></a>").parent().parent().addClass("image-loading").css("visibility","hidden");f.load(function(){d._origDim(a(this));d.resizeNow()})}if(d.options.thumbnail_navigation==1){vars.current_slide-1<0?prevThumb=d.options.slides.length-1:prevThumb=vars.current_slide-1;a(vars.prev_thumb).html(a("<img/>").attr("src",d.options.slides[prevThumb].image));nextThumb=loadSlide;a(vars.next_thumb).html(a("<img/>").attr("src",d.options.slides[nextThumb].image))}if(typeof theme!="undefined"&&typeof theme.beforeAnimation=="function"){theme.beforeAnimation("next")}if(d.options.slide_links){a(".current-slide").removeClass("current-slide");a(vars.slide_list+"> li").eq(vars.current_slide).addClass("current-slide")}g.css("visibility","hidden").addClass("activeslide");switch(d.options.transition){case 0:case"none":g.css("visibility","visible");vars.in_animation=false;d.afterAnimation();break;case 1:case"fade":g.animate({opacity:0},0).css("visibility","visible").animate({opacity:1,avoidTransforms:false},d.options.transition_speed,function(){d.afterAnimation()});break;case 2:case"slideTop":g.animate({top:-d.$el.height()},0).css("visibility","visible").animate({top:0,avoidTransforms:false},d.options.transition_speed,function(){d.afterAnimation()});break;case 3:case"slideRight":g.animate({left:d.$el.width()},0).css("visibility","visible").animate({left:0,avoidTransforms:false},d.options.transition_speed,function(){d.afterAnimation()});break;case 4:case"slideBottom":g.animate({top:d.$el.height()},0).css("visibility","visible").animate({top:0,avoidTransforms:false},d.options.transition_speed,function(){d.afterAnimation()});break;case 5:case"slideLeft":g.animate({left:-d.$el.width()},0).css("visibility","visible").animate({left:0,avoidTransforms:false},d.options.transition_speed,function(){d.afterAnimation()});break;case 6:case"carouselRight":g.animate({left:d.$el.width()},0).css("visibility","visible").animate({left:0,avoidTransforms:false},d.options.transition_speed,function(){d.afterAnimation()});e.animate({left:-d.$el.width(),avoidTransforms:false},d.options.transition_speed);break;case 7:case"carouselLeft":g.animate({left:-d.$el.width()},0).css("visibility","visible").animate({left:0,avoidTransforms:false},d.options.transition_speed,function(){d.afterAnimation()});e.animate({left:d.$el.width(),avoidTransforms:false},d.options.transition_speed);break}return false};d.prevSlide=function(){if(vars.in_animation||!api.options.slideshow){return false}else{vars.in_animation=true}clearInterval(vars.slideshow_interval);var h=d.options.slides,e=d.$el.find(".activeslide");a(".prevslide").removeClass("prevslide");e.removeClass("activeslide").addClass("prevslide");vars.current_slide==0?vars.current_slide=d.options.slides.length-1:vars.current_slide--;var g=a(d.el+" li:eq("+vars.current_slide+")"),i=d.$el.find(".prevslide");if(d.options.performance==1){d.$el.removeClass("quality").addClass("speed")}loadSlide=vars.current_slide;var k=d.el+" li:eq("+loadSlide+")";if(!a(k).html()){var j=d.options.new_window?' target="_blank"':"";imageLink=(d.options.slides[loadSlide].url)?"href='"+d.options.slides[loadSlide].url+"'":"";var f=a('<img src="'+d.options.slides[loadSlide].image+'"/>');f.appendTo(k).wrap("<a "+imageLink+j+"></a>").parent().parent().addClass("image-loading").css("visibility","hidden");f.load(function(){d._origDim(a(this));d.resizeNow()})}if(d.options.thumbnail_navigation==1){loadSlide==0?prevThumb=d.options.slides.length-1:prevThumb=loadSlide-1;a(vars.prev_thumb).html(a("<img/>").attr("src",d.options.slides[prevThumb].image));vars.current_slide==d.options.slides.length-1?nextThumb=0:nextThumb=vars.current_slide+1;a(vars.next_thumb).html(a("<img/>").attr("src",d.options.slides[nextThumb].image))}if(typeof theme!="undefined"&&typeof theme.beforeAnimation=="function"){theme.beforeAnimation("prev")}if(d.options.slide_links){a(".current-slide").removeClass("current-slide");a(vars.slide_list+"> li").eq(vars.current_slide).addClass("current-slide")}g.css("visibility","hidden").addClass("activeslide");switch(d.options.transition){case 0:case"none":g.css("visibility","visible");vars.in_animation=false;d.afterAnimation();break;case 1:case"fade":g.animate({opacity:0},0).css("visibility","visible").animate({opacity:1,avoidTransforms:false},d.options.transition_speed,function(){d.afterAnimation()});break;case 2:case"slideTop":g.animate({top:d.$el.height()},0).css("visibility","visible").animate({top:0,avoidTransforms:false},d.options.transition_speed,function(){d.afterAnimation()});break;case 3:case"slideRight":g.animate({left:-d.$el.width()},0).css("visibility","visible").animate({left:0,avoidTransforms:false},d.options.transition_speed,function(){d.afterAnimation()});break;case 4:case"slideBottom":g.animate({top:-d.$el.height()},0).css("visibility","visible").animate({top:0,avoidTransforms:false},d.options.transition_speed,function(){d.afterAnimation()});break;case 5:case"slideLeft":g.animate({left:d.$el.width()},0).css("visibility","visible").animate({left:0,avoidTransforms:false},d.options.transition_speed,function(){d.afterAnimation()});break;case 6:case"carouselRight":g.animate({left:-d.$el.width()},0).css("visibility","visible").animate({left:0,avoidTransforms:false},d.options.transition_speed,function(){d.afterAnimation()});e.animate({left:0},0).animate({left:d.$el.width(),avoidTransforms:false},d.options.transition_speed);break;case 7:case"carouselLeft":g.animate({left:d.$el.width()},0).css("visibility","visible").animate({left:0,avoidTransforms:false},d.options.transition_speed,function(){d.afterAnimation()});e.animate({left:0},0).animate({left:-d.$el.width(),avoidTransforms:false},d.options.transition_speed);break}return false};d.playToggle=function(){if(vars.in_animation||!api.options.slideshow){return false}if(vars.is_paused){vars.is_paused=false;if(typeof theme!="undefined"&&typeof theme.playToggle=="function"){theme.playToggle("play")}vars.slideshow_interval=setInterval(d.nextSlide,d.options.slide_interval)}else{vars.is_paused=true;if(typeof theme!="undefined"&&typeof theme.playToggle=="function"){theme.playToggle("pause")}clearInterval(vars.slideshow_interval)}return false};d.goTo=function(f){if(vars.in_animation||!api.options.slideshow){return false}var e=d.options.slides.length;if(f<0){f=e}else{if(f>e){f=1}}f=e-f+1;clearInterval(vars.slideshow_interval);if(typeof theme!="undefined"&&typeof theme.goTo=="function"){theme.goTo()}if(vars.current_slide==e-f){if(!(vars.is_paused)){vars.slideshow_interval=setInterval(d.nextSlide,d.options.slide_interval)}return false}if(e-f>vars.current_slide){vars.current_slide=e-f-1;vars.update_images="next";d._placeSlide(vars.update_images)}else{if(e-f<vars.current_slide){vars.current_slide=e-f+1;vars.update_images="prev";d._placeSlide(vars.update_images)}}if(d.options.slide_links){a(vars.slide_list+"> .current-slide").removeClass("current-slide");a(vars.slide_list+"> li").eq((e-f)).addClass("current-slide")}if(d.options.thumb_links){a(vars.thumb_list+"> .current-thumb").removeClass("current-thumb");a(vars.thumb_list+"> li").eq((e-f)).addClass("current-thumb")}};d._placeSlide=function(e){var h=d.options.new_window?' target="_blank"':"";loadSlide=false;if(e=="next"){vars.current_slide==d.options.slides.length-1?loadSlide=0:loadSlide=vars.current_slide+1;var g=d.el+" li:eq("+loadSlide+")";if(!a(g).html()){var h=d.options.new_window?' target="_blank"':"";imageLink=(d.options.slides[loadSlide].url)?"href='"+d.options.slides[loadSlide].url+"'":"";var f=a('<img src="'+d.options.slides[loadSlide].image+'"/>');f.appendTo(g).wrap("<a "+imageLink+h+"></a>").parent().parent().addClass("image-loading").css("visibility","hidden");f.load(function(){d._origDim(a(this));d.resizeNow()})}d.nextSlide()}else{if(e=="prev"){vars.current_slide-1<0?loadSlide=d.options.slides.length-1:loadSlide=vars.current_slide-1;var g=d.el+" li:eq("+loadSlide+")";if(!a(g).html()){var h=d.options.new_window?' target="_blank"':"";imageLink=(d.options.slides[loadSlide].url)?"href='"+d.options.slides[loadSlide].url+"'":"";var f=a('<img src="'+d.options.slides[loadSlide].image+'"/>');f.appendTo(g).wrap("<a "+imageLink+h+"></a>").parent().parent().addClass("image-loading").css("visibility","hidden");f.load(function(){d._origDim(a(this));d.resizeNow()})}d.prevSlide()}}};d._origDim=function(e){e.data("origWidth",e.width()).data("origHeight",e.height())};d.afterAnimation=function(){if(d.options.performance==1){d.$el.removeClass("speed").addClass("quality")}if(vars.update_images){vars.current_slide-1<0?setPrev=d.options.slides.length-1:setPrev=vars.current_slide-1;vars.update_images=false;a(".prevslide").removeClass("prevslide");a(d.el+" li:eq("+setPrev+")").addClass("prevslide")}vars.in_animation=false;if(!vars.is_paused&&d.options.slideshow){vars.slideshow_interval=setInterval(d.nextSlide,d.options.slide_interval);if(d.options.stop_loop&&vars.current_slide==d.options.slides.length-1){d.playToggle()}}if(typeof theme!="undefined"&&typeof theme.afterAnimation=="function"){theme.afterAnimation()}return false};d.getField=function(e){return d.options.slides[vars.current_slide][e]};d.init()};a.supersized.vars={thumb_tray:"#thumb-tray",thumb_list:"#thumb-list",slide_list:"#slide-list",current_slide:0,in_animation:false,is_paused:false,hover_pause:false,slideshow_interval:false,update_images:false,options:{}};a.supersized.defaultOptions={slideshow:1,autoplay:1,start_slide:1,stop_loop:0,random:0,slide_interval:5000,transition:1,transition_speed:750,new_window:1,pause_hover:0,keyboard_nav:1,performance:1,image_protect:1,fit_always:0,fit_landscape:0,fit_portrait:1,min_width:0,min_height:0,horizontal_center:1,vertical_center:1,slide_links:1,thumb_links:1,thumbnail_navigation:0};a.fn.supersized=function(b){return this.each(function(){(new a.supersized(b))})}})(jQuery);
\ No newline at end of file
diff --git a/apps/gallery/js/supersized.shutter.js b/apps/gallery/js/supersized.shutter.js
deleted file mode 100644
index cc3025a94a..0000000000
--- a/apps/gallery/js/supersized.shutter.js
+++ /dev/null
@@ -1,337 +0,0 @@
-/*
-
-	Supersized - Fullscreen Slideshow jQuery Plugin
-	Version : 3.2.7
-	Theme 	: Shutter 1.1
-	
-	Site	: www.buildinternet.com/project/supersized
-	Author	: Sam Dunn
-	Company : One Mighty Roar (www.onemightyroar.com)
-	License : MIT License / GPL License
-
-*/
-
-(function($){
-	
-	theme = {
-	 	
-	 	
-	 	/* Initial Placement
-		----------------------------*/
-	 	_init : function(){
-	 		
-	 		// Center Slide Links
-	 		if (api.options.slide_links) $(vars.slide_list).css('margin-left', -$(vars.slide_list).width()/2);
-	 		
-			// Start progressbar if autoplay enabled
-                        if (api.options.autoplay){
-                                if (api.options.progress_bar) theme.progressBar();
-			}else{
-				if ($(vars.play_button).attr('src')) $(vars.play_button).attr("src", vars.image_path + "play.png");	// If pause play button is image, swap src
-				if (api.options.progress_bar) $(vars.progress_bar).stop().animate({left : -$(window).width()}, 0 );	//  Place progress bar
-			}
-			
-			
-			/* Thumbnail Tray
-			----------------------------*/
-			// Hide tray off screen
-			$(vars.thumb_tray).animate({bottom : -$(vars.thumb_tray).height()}, 0 );
-			
-			// Thumbnail Tray Toggle
-			$(vars.tray_button).toggle(function(){
-				$(vars.thumb_tray).stop().animate({bottom : 0, avoidTransforms : true}, 300 );
-				if ($(vars.tray_arrow).attr('src')) $(vars.tray_arrow).attr("src", vars.image_path + "button-tray-down.png");
-				return false;
-			}, function() {
-				$(vars.thumb_tray).stop().animate({bottom : -$(vars.thumb_tray).height(), avoidTransforms : true}, 300 );
-				if ($(vars.tray_arrow).attr('src')) $(vars.tray_arrow).attr("src", vars.image_path + "button-tray-up.png");
-				return false;
-			});
-			
-			// Make thumb tray proper size
-			$(vars.thumb_list).width($('> li', vars.thumb_list).length * $('> li', vars.thumb_list).outerWidth(true));	//Adjust to true width of thumb markers
-			
-			// Display total slides
-			if ($(vars.slide_total).length){
-				$(vars.slide_total).html(api.options.slides.length);
-			}
-			
-			
-			/* Thumbnail Tray Navigation
-			----------------------------*/	
-			if (api.options.thumb_links){
-				//Hide thumb arrows if not needed
-				if ($(vars.thumb_list).width() <= $(vars.thumb_tray).width()){
-					$(vars.thumb_back +','+vars.thumb_forward).fadeOut(0);
-				}
-				
-				// Thumb Intervals
-        		vars.thumb_interval = Math.floor($(vars.thumb_tray).width() / $('> li', vars.thumb_list).outerWidth(true)) * $('> li', vars.thumb_list).outerWidth(true);
-        		vars.thumb_page = 0;
-        		
-        		// Cycle thumbs forward
-        		$(vars.thumb_forward).click(function(){
-        			if (vars.thumb_page - vars.thumb_interval <= -$(vars.thumb_list).width()){
-        				vars.thumb_page = 0;
-        				$(vars.thumb_list).stop().animate({'left': vars.thumb_page}, {duration:500, easing:'easeOutExpo'});
-        			}else{
-        				vars.thumb_page = vars.thumb_page - vars.thumb_interval;
-        				$(vars.thumb_list).stop().animate({'left': vars.thumb_page}, {duration:500, easing:'easeOutExpo'});
-        			}
-        		});
-        		
-        		// Cycle thumbs backwards
-        		$(vars.thumb_back).click(function(){
-        			if (vars.thumb_page + vars.thumb_interval > 0){
-        				vars.thumb_page = Math.floor($(vars.thumb_list).width() / vars.thumb_interval) * -vars.thumb_interval;
-        				if ($(vars.thumb_list).width() <= -vars.thumb_page) vars.thumb_page = vars.thumb_page + vars.thumb_interval;
-        				$(vars.thumb_list).stop().animate({'left': vars.thumb_page}, {duration:500, easing:'easeOutExpo'});
-					}else{
-        				vars.thumb_page = vars.thumb_page + vars.thumb_interval;
-        				$(vars.thumb_list).stop().animate({'left': vars.thumb_page}, {duration:500, easing:'easeOutExpo'});
-        			}
-        		});
-				
-			}
-			
-			
-			/* Navigation Items
-			----------------------------*/
-		    $(vars.next_slide).click(function() {
-		    	api.nextSlide();
-		    });
-		    
-		    $(vars.prev_slide).click(function() {
-		    	api.prevSlide();
-		    });
-		    
-		    	// Full Opacity on Hover
-		    	if(jQuery.support.opacity){
-			    	$(vars.prev_slide +','+vars.next_slide).mouseover(function() {
-					   $(this).stop().animate({opacity:1},100);
-					}).mouseout(function(){
-					   $(this).stop().animate({opacity:0.6},100);
-					});
-				}
-			
-			if (api.options.thumbnail_navigation){
-				// Next thumbnail clicked
-				$(vars.next_thumb).click(function() {
-			    	api.nextSlide();
-			    });
-			    // Previous thumbnail clicked
-			    $(vars.prev_thumb).click(function() {
-			    	api.prevSlide();
-			    });
-			}
-			
-		    $(vars.play_button).click(function() {
-				api.playToggle();						    
-		    });
-			
-			
-			/* Thumbnail Mouse Scrub
-			----------------------------*/
-    		if (api.options.mouse_scrub){
-				$(vars.thumb_tray).mousemove(function(e) {
-					var containerWidth = $(vars.thumb_tray).width(),
-						listWidth = $(vars.thumb_list).width();
-					if (listWidth > containerWidth){
-						var mousePos = 1,
-							diff = e.pageX - mousePos;
-						if (diff > 10 || diff < -10) { 
-						    mousePos = e.pageX; 
-						    newX = (containerWidth - listWidth) * (e.pageX/containerWidth);
-						    diff = parseInt(Math.abs(parseInt($(vars.thumb_list).css('left'))-newX )).toFixed(0);
-						    $(vars.thumb_list).stop().animate({'left':newX}, {duration:diff*3, easing:'easeOutExpo'});
-						}
-					}
-				});
-			}
-			
-			
-			/* Window Resize
-			----------------------------*/
-			$(window).resize(function(){
-				
-				// Delay progress bar on resize
-				if (api.options.progress_bar && !vars.in_animation){
-					if (vars.slideshow_interval) clearInterval(vars.slideshow_interval);
-					if (api.options.slides.length - 1 > 0) clearInterval(vars.slideshow_interval);
-					
-					$(vars.progress_bar).stop().animate({left : -$(window).width()}, 0 );
-					
-					if (!vars.progressDelay && api.options.slideshow){
-						// Delay slideshow from resuming so Chrome can refocus images
-						vars.progressDelay = setTimeout(function() {
-								if (!vars.is_paused){
-									theme.progressBar();
-									vars.slideshow_interval = setInterval(api.nextSlide, api.options.slide_interval);
-								}
-								vars.progressDelay = false;
-						}, 1000);
-					}
-				}
-				
-				// Thumb Links
-				if (api.options.thumb_links && vars.thumb_tray.length){
-					// Update Thumb Interval & Page
-					vars.thumb_page = 0;	
-					vars.thumb_interval = Math.floor($(vars.thumb_tray).width() / $('> li', vars.thumb_list).outerWidth(true)) * $('> li', vars.thumb_list).outerWidth(true);
-					
-					// Adjust thumbnail markers
-					if ($(vars.thumb_list).width() > $(vars.thumb_tray).width()){
-						$(vars.thumb_back +','+vars.thumb_forward).fadeIn('fast');
-						$(vars.thumb_list).stop().animate({'left':0}, 200);
-					}else{
-						$(vars.thumb_back +','+vars.thumb_forward).fadeOut('fast');
-					}
-					
-				}
-			});	
-			
-								
-	 	},
-	 	
-	 	
-	 	/* Go To Slide
-		----------------------------*/
-	 	goTo : function(){
-	 		if (api.options.progress_bar && !vars.is_paused){
-				$(vars.progress_bar).stop().animate({left : -$(window).width()}, 0 );
-				theme.progressBar();
-			}
-		},
-	 	
-	 	/* Play & Pause Toggle
-		----------------------------*/
-	 	playToggle : function(state){
-	 		
-	 		if (state =='play'){
-	 			// If image, swap to pause
-	 			if ($(vars.play_button).attr('src')) $(vars.play_button).attr("src", vars.image_path + "pause.png");
-				if (api.options.progress_bar && !vars.is_paused) theme.progressBar();
-	 		}else if (state == 'pause'){
-	 			// If image, swap to play
-	 			if ($(vars.play_button).attr('src')) $(vars.play_button).attr("src", vars.image_path + "play.png");
-        		if (api.options.progress_bar && vars.is_paused)$(vars.progress_bar).stop().animate({left : -$(window).width()}, 0 );
-	 		}
-	 		
-	 	},
-	 	
-	 	
-	 	/* Before Slide Transition
-		----------------------------*/
-	 	beforeAnimation : function(direction){
-		    if (api.options.progress_bar && !vars.is_paused) $(vars.progress_bar).stop().animate({left : -$(window).width()}, 0 );
-		  	
-		  	/* Update Fields
-		  	----------------------------*/
-		  	// Update slide caption
-		   	if ($(vars.slide_caption).length){
-		   		(api.getField('title')) ? $(vars.slide_caption).html(api.getField('title')) : $(vars.slide_caption).html('');
-		   	}
-		    // Update slide number
-			if (vars.slide_current.length){
-			    $(vars.slide_current).html(vars.current_slide + 1);
-			}
-		    
-		    
-		    // Highlight current thumbnail and adjust row position
-		    if (api.options.thumb_links){
-		    
-				$('.current-thumb').removeClass('current-thumb');
-				$('li', vars.thumb_list).eq(vars.current_slide).addClass('current-thumb');
-				
-				// If thumb out of view
-				if ($(vars.thumb_list).width() > $(vars.thumb_tray).width()){
-					// If next slide direction
-					if (direction == 'next'){
-						if (vars.current_slide == 0){
-							vars.thumb_page = 0;
-							$(vars.thumb_list).stop().animate({'left': vars.thumb_page}, {duration:500, easing:'easeOutExpo'});
-						} else if ($('.current-thumb').offset().left - $(vars.thumb_tray).offset().left >= vars.thumb_interval){
-	        				vars.thumb_page = vars.thumb_page - vars.thumb_interval;
-	        				$(vars.thumb_list).stop().animate({'left': vars.thumb_page}, {duration:500, easing:'easeOutExpo'});
-						}
-					// If previous slide direction
-					}else if(direction == 'prev'){
-						if (vars.current_slide == api.options.slides.length - 1){
-							vars.thumb_page = Math.floor($(vars.thumb_list).width() / vars.thumb_interval) * -vars.thumb_interval;
-							if ($(vars.thumb_list).width() <= -vars.thumb_page) vars.thumb_page = vars.thumb_page + vars.thumb_interval;
-							$(vars.thumb_list).stop().animate({'left': vars.thumb_page}, {duration:500, easing:'easeOutExpo'});
-						} else if ($('.current-thumb').offset().left - $(vars.thumb_tray).offset().left < 0){
-							if (vars.thumb_page + vars.thumb_interval > 0) return false;
-	        				vars.thumb_page = vars.thumb_page + vars.thumb_interval;
-	        				$(vars.thumb_list).stop().animate({'left': vars.thumb_page}, {duration:500, easing:'easeOutExpo'});
-						}
-					}
-				}
-				
-				
-			}
-		    
-	 	},
-	 	
-	 	
-	 	/* After Slide Transition
-		----------------------------*/
-	 	afterAnimation : function(){
-	 		if (api.options.progress_bar && !vars.is_paused) theme.progressBar();	//  Start progress bar
-	 	},
-	 	
-	 	
-	 	/* Progress Bar
-		----------------------------*/
-		progressBar : function(){
-    		$(vars.progress_bar).stop().animate({left : -$(window).width()}, 0 ).animate({left:0}, api.options.slide_interval);
-    	}
-	 	
-	 
-	 };
-	 
-	 
-	 /* Theme Specific Variables
-	 ----------------------------*/
-	 $.supersized.themeVars = {
-	 	
-	 	// Internal Variables
-		progress_delay		:	false,				// Delay after resize before resuming slideshow
-		thumb_page 			: 	false,				// Thumbnail page
-		thumb_interval 		: 	false,				// Thumbnail interval
-		image_path			:	OC.webroot+"/apps/gallery/img/supersized/",				// Default image path
-													
-		// General Elements							
-		play_button			:	'#pauseplay',		// Play/Pause button
-		next_slide			:	'#nextslide',		// Next slide button
-		prev_slide			:	'#prevslide',		// Prev slide button
-		next_thumb			:	'#nextthumb',		// Next slide thumb button
-		prev_thumb			:	'#prevthumb',		// Prev slide thumb button
-		
-		slide_caption		:	'#slidecaption',	// Slide caption
-		slide_current		:	'.slidenumber',		// Current slide number
-		slide_total			:	'.totalslides',		// Total Slides
-		slide_list			:	'#slide-list',		// Slide jump list							
-		
-		thumb_tray			:	'#thumb-tray',		// Thumbnail tray
-		thumb_list			:	'#thumb-list',		// Thumbnail list
-		thumb_forward		:	'#thumb-forward',	// Cycles forward through thumbnail list
-		thumb_back			:	'#thumb-back',		// Cycles backwards through thumbnail list
-		tray_arrow			:	'#tray-arrow',		// Thumbnail tray button arrow
-		tray_button			:	'#tray-button',		// Thumbnail tray button
-		
-		progress_bar		:	'#progress-bar'		// Progress bar
-	 												
-	 };												
-	
-	 /* Theme Specific Options
-	 ----------------------------*/												
-	 $.supersized.themeOptions = {					
-	 						   
-		progress_bar		:	1,		// Timer for each slide											
-		mouse_scrub			:	0		// Thumbnails move with mouse
-		
-	 };
-	
-	
-})(jQuery);
diff --git a/apps/gallery/js/supersized.shutter.min.js b/apps/gallery/js/supersized.shutter.min.js
deleted file mode 100644
index 52ea4a3384..0000000000
--- a/apps/gallery/js/supersized.shutter.min.js
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
-
-	Supersized - Fullscreen Slideshow jQuery Plugin
-	Version : 3.2.7
-	Theme 	: Shutter 1.1
-	
-	Site	: www.buildinternet.com/project/supersized
-	Author	: Sam Dunn
-	Company : One Mighty Roar (www.onemightyroar.com)
-	License : MIT License / GPL License
-
-*/
-
-(function(a){theme={_init:function(){if(api.options.slide_links){a(vars.slide_list).css("margin-left",-a(vars.slide_list).width()/2)}if(api.options.autoplay){if(api.options.progress_bar){theme.progressBar()}}else{if(a(vars.play_button).attr("src")){a(vars.play_button).attr("src",vars.image_path+"play.png")}if(api.options.progress_bar){a(vars.progress_bar).stop().animate({left:-a(window).width()},0)}}a(vars.thumb_tray).animate({bottom:-a(vars.thumb_tray).height()},0);a(vars.tray_button).toggle(function(){a(vars.thumb_tray).stop().animate({bottom:0,avoidTransforms:true},300);if(a(vars.tray_arrow).attr("src")){a(vars.tray_arrow).attr("src",vars.image_path+"button-tray-down.png")}return false},function(){a(vars.thumb_tray).stop().animate({bottom:-a(vars.thumb_tray).height(),avoidTransforms:true},300);if(a(vars.tray_arrow).attr("src")){a(vars.tray_arrow).attr("src",vars.image_path+"button-tray-up.png")}return false});a(vars.thumb_list).width(a("> li",vars.thumb_list).length*a("> li",vars.thumb_list).outerWidth(true));if(a(vars.slide_total).length){a(vars.slide_total).html(api.options.slides.length)}if(api.options.thumb_links){if(a(vars.thumb_list).width()<=a(vars.thumb_tray).width()){a(vars.thumb_back+","+vars.thumb_forward).fadeOut(0)}vars.thumb_interval=Math.floor(a(vars.thumb_tray).width()/a("> li",vars.thumb_list).outerWidth(true))*a("> li",vars.thumb_list).outerWidth(true);vars.thumb_page=0;a(vars.thumb_forward).click(function(){if(vars.thumb_page-vars.thumb_interval<=-a(vars.thumb_list).width()){vars.thumb_page=0;a(vars.thumb_list).stop().animate({left:vars.thumb_page},{duration:500,easing:"easeOutExpo"})}else{vars.thumb_page=vars.thumb_page-vars.thumb_interval;a(vars.thumb_list).stop().animate({left:vars.thumb_page},{duration:500,easing:"easeOutExpo"})}});a(vars.thumb_back).click(function(){if(vars.thumb_page+vars.thumb_interval>0){vars.thumb_page=Math.floor(a(vars.thumb_list).width()/vars.thumb_interval)*-vars.thumb_interval;if(a(vars.thumb_list).width()<=-vars.thumb_page){vars.thumb_page=vars.thumb_page+vars.thumb_interval}a(vars.thumb_list).stop().animate({left:vars.thumb_page},{duration:500,easing:"easeOutExpo"})}else{vars.thumb_page=vars.thumb_page+vars.thumb_interval;a(vars.thumb_list).stop().animate({left:vars.thumb_page},{duration:500,easing:"easeOutExpo"})}})}a(vars.next_slide).click(function(){api.nextSlide()});a(vars.prev_slide).click(function(){api.prevSlide()});if(jQuery.support.opacity){a(vars.prev_slide+","+vars.next_slide).mouseover(function(){a(this).stop().animate({opacity:1},100)}).mouseout(function(){a(this).stop().animate({opacity:0.6},100)})}if(api.options.thumbnail_navigation){a(vars.next_thumb).click(function(){api.nextSlide()});a(vars.prev_thumb).click(function(){api.prevSlide()})}a(vars.play_button).click(function(){api.playToggle()});if(api.options.mouse_scrub){a(vars.thumb_tray).mousemove(function(f){var c=a(vars.thumb_tray).width(),g=a(vars.thumb_list).width();if(g>c){var b=1,d=f.pageX-b;if(d>10||d<-10){b=f.pageX;newX=(c-g)*(f.pageX/c);d=parseInt(Math.abs(parseInt(a(vars.thumb_list).css("left"))-newX)).toFixed(0);a(vars.thumb_list).stop().animate({left:newX},{duration:d*3,easing:"easeOutExpo"})}}})}a(window).resize(function(){if(api.options.progress_bar&&!vars.in_animation){if(vars.slideshow_interval){clearInterval(vars.slideshow_interval)}if(api.options.slides.length-1>0){clearInterval(vars.slideshow_interval)}a(vars.progress_bar).stop().animate({left:-a(window).width()},0);if(!vars.progressDelay&&api.options.slideshow){vars.progressDelay=setTimeout(function(){if(!vars.is_paused){theme.progressBar();vars.slideshow_interval=setInterval(api.nextSlide,api.options.slide_interval)}vars.progressDelay=false},1000)}}if(api.options.thumb_links&&vars.thumb_tray.length){vars.thumb_page=0;vars.thumb_interval=Math.floor(a(vars.thumb_tray).width()/a("> li",vars.thumb_list).outerWidth(true))*a("> li",vars.thumb_list).outerWidth(true);if(a(vars.thumb_list).width()>a(vars.thumb_tray).width()){a(vars.thumb_back+","+vars.thumb_forward).fadeIn("fast");a(vars.thumb_list).stop().animate({left:0},200)}else{a(vars.thumb_back+","+vars.thumb_forward).fadeOut("fast")}}})},goTo:function(b){if(api.options.progress_bar&&!vars.is_paused){a(vars.progress_bar).stop().animate({left:-a(window).width()},0);theme.progressBar()}},playToggle:function(b){if(b=="play"){if(a(vars.play_button).attr("src")){a(vars.play_button).attr("src",vars.image_path+"pause.png")}if(api.options.progress_bar&&!vars.is_paused){theme.progressBar()}}else{if(b=="pause"){if(a(vars.play_button).attr("src")){a(vars.play_button).attr("src",vars.image_path+"play.png")}if(api.options.progress_bar&&vars.is_paused){a(vars.progress_bar).stop().animate({left:-a(window).width()},0)}}}},beforeAnimation:function(b){if(api.options.progress_bar&&!vars.is_paused){a(vars.progress_bar).stop().animate({left:-a(window).width()},0)}if(a(vars.slide_caption).length){(api.getField("title"))?a(vars.slide_caption).html(api.getField("title")):a(vars.slide_caption).html("")}if(vars.slide_current.length){a(vars.slide_current).html(vars.current_slide+1)}if(api.options.thumb_links){a(".current-thumb").removeClass("current-thumb");a("li",vars.thumb_list).eq(vars.current_slide).addClass("current-thumb");if(a(vars.thumb_list).width()>a(vars.thumb_tray).width()){if(b=="next"){if(vars.current_slide==0){vars.thumb_page=0;a(vars.thumb_list).stop().animate({left:vars.thumb_page},{duration:500,easing:"easeOutExpo"})}else{if(a(".current-thumb").offset().left-a(vars.thumb_tray).offset().left>=vars.thumb_interval){vars.thumb_page=vars.thumb_page-vars.thumb_interval;a(vars.thumb_list).stop().animate({left:vars.thumb_page},{duration:500,easing:"easeOutExpo"})}}}else{if(b=="prev"){if(vars.current_slide==api.options.slides.length-1){vars.thumb_page=Math.floor(a(vars.thumb_list).width()/vars.thumb_interval)*-vars.thumb_interval;if(a(vars.thumb_list).width()<=-vars.thumb_page){vars.thumb_page=vars.thumb_page+vars.thumb_interval}a(vars.thumb_list).stop().animate({left:vars.thumb_page},{duration:500,easing:"easeOutExpo"})}else{if(a(".current-thumb").offset().left-a(vars.thumb_tray).offset().left<0){if(vars.thumb_page+vars.thumb_interval>0){return false}vars.thumb_page=vars.thumb_page+vars.thumb_interval;a(vars.thumb_list).stop().animate({left:vars.thumb_page},{duration:500,easing:"easeOutExpo"})}}}}}}},afterAnimation:function(){if(api.options.progress_bar&&!vars.is_paused){theme.progressBar()}},progressBar:function(){a(vars.progress_bar).stop().animate({left:-a(window).width()},0).animate({left:0},api.options.slide_interval)}};a.supersized.themeVars={progress_delay:false,thumb_page:false,thumb_interval:false,image_path:OC.webroot+"/apps/gallery/img/supersized/",play_button:"#pauseplay",next_slide:"#nextslide",prev_slide:"#prevslide",next_thumb:"#nextthumb",prev_thumb:"#prevthumb",slide_caption:"#slidecaption",slide_current:".slidenumber",slide_total:".totalslides",slide_list:"#slide-list",thumb_tray:"#thumb-tray",thumb_list:"#thumb-list",thumb_forward:"#thumb-forward",thumb_back:"#thumb-back",tray_arrow:"#tray-arrow",tray_button:"#tray-button",progress_bar:"#progress-bar"};a.supersized.themeOptions={progress_bar:1,mouse_scrub:0}})(jQuery);
diff --git a/apps/gallery/l10n/ar.php b/apps/gallery/l10n/ar.php
deleted file mode 100644
index 7ed0e1f57c..0000000000
--- a/apps/gallery/l10n/ar.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Rescan" => "اعادة البحث",
-"Back" => "رجوع"
-);
diff --git a/apps/gallery/l10n/ca.php b/apps/gallery/l10n/ca.php
deleted file mode 100644
index 1c5848cee2..0000000000
--- a/apps/gallery/l10n/ca.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Pictures" => "Fotos",
-"Share gallery" => "Comperteix la galeria",
-"Error: " => "Error: ",
-"Internal error" => "Error intern",
-"Slideshow" => "Passi de diapositives",
-"Back" => "Enrera",
-"Remove confirmation" => "Elimina la confirmació",
-"Do you want to remove album" => "Voleu eliminar l'àlbum",
-"Change album name" => "Canvia el nom de l'àlbum",
-"New album name" => "Nom nou de l'àlbum"
-);
diff --git a/apps/gallery/l10n/cs_CZ.php b/apps/gallery/l10n/cs_CZ.php
deleted file mode 100644
index 02d1c02d6e..0000000000
--- a/apps/gallery/l10n/cs_CZ.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Pictures" => "Obrázky",
-"Share gallery" => "Sdílet galerii",
-"Error: " => "Chyba: ",
-"Internal error" => "Vnitřní chyba",
-"Slideshow" => "Přehrávání"
-);
diff --git a/apps/gallery/l10n/da.php b/apps/gallery/l10n/da.php
deleted file mode 100644
index 172f3c95e8..0000000000
--- a/apps/gallery/l10n/da.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Pictures" => "Billeder",
-"Settings" => "Indstillinger",
-"Rescan" => "Genindlæs",
-"Stop" => "Stop",
-"Share" => "Del",
-"Back" => "Tilbage",
-"Remove confirmation" => "Fjern bekræftelse",
-"Do you want to remove album" => "Ønsker du at fjerne albummet",
-"Change album name" => "Ændre albummets navn",
-"New album name" => "Nyt album navn"
-);
diff --git a/apps/gallery/l10n/de.php b/apps/gallery/l10n/de.php
deleted file mode 100644
index cd580cf303..0000000000
--- a/apps/gallery/l10n/de.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Pictures" => "Bilder",
-"Share gallery" => "Galerie teilen",
-"Error: " => "Fehler:",
-"Internal error" => "Interner Fehler",
-"Slideshow" => "Slideshow",
-"Back" => "Zurück",
-"Remove confirmation" => "Bestätigung entfernen",
-"Do you want to remove album" => "Soll das Album entfernt werden",
-"Change album name" => "Albumname ändern",
-"New album name" => "Neuer Albumname"
-);
diff --git a/apps/gallery/l10n/el.php b/apps/gallery/l10n/el.php
deleted file mode 100644
index 47bc3af2bb..0000000000
--- a/apps/gallery/l10n/el.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Pictures" => "Εικόνες",
-"Share gallery" => "Κοινοποίηση συλλογής",
-"Error: " => "Σφάλμα: ",
-"Internal error" => "Εσωτερικό σφάλμα",
-"Slideshow" => "Προβολή Διαφανειών",
-"Back" => "Επιστροφή",
-"Remove confirmation" => "Αφαίρεση επιβεβαίωσης",
-"Do you want to remove album" => "Θέλετε να αφαιρέσετε το άλμπουμ",
-"Change album name" => "Αλλάξτε το όνομα του άλμπουμ",
-"New album name" => "Νέο όνομα άλμπουμ"
-);
diff --git a/apps/gallery/l10n/eo.php b/apps/gallery/l10n/eo.php
deleted file mode 100644
index 254010b788..0000000000
--- a/apps/gallery/l10n/eo.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Pictures" => "Bildoj",
-"Settings" => "Agordo",
-"Rescan" => "Reskani",
-"Stop" => "Halti",
-"Share" => "Kunhavigi",
-"Back" => "Antaŭen",
-"Remove confirmation" => "Forigi konfirmadon",
-"Do you want to remove album" => "Ĉu vi volas forigi la albumon?",
-"Change album name" => "Ŝanĝi albumnomon",
-"New album name" => "Nova albumnomo"
-);
diff --git a/apps/gallery/l10n/es.php b/apps/gallery/l10n/es.php
deleted file mode 100644
index aa425a0bd0..0000000000
--- a/apps/gallery/l10n/es.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Pictures" => "Imágenes",
-"Share gallery" => "Compartir galería",
-"Error: " => "Fallo ",
-"Internal error" => "Fallo interno",
-"Slideshow" => "Presentación",
-"Back" => "Atrás",
-"Remove confirmation" => "Borrar confirmación",
-"Do you want to remove album" => "¿Quieres eliminar el álbum",
-"Change album name" => "Cambiar nombre al álbum",
-"New album name" => "Nuevo nombre de álbum"
-);
diff --git a/apps/gallery/l10n/et_EE.php b/apps/gallery/l10n/et_EE.php
deleted file mode 100644
index 06bd3a5b8f..0000000000
--- a/apps/gallery/l10n/et_EE.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Pictures" => "Pildid",
-"Settings" => "Seaded",
-"Rescan" => "Skänni uuesti",
-"Stop" => "Peata",
-"Share" => "Jaga",
-"Back" => "Tagasi",
-"Remove confirmation" => "Eemaldamise kinnitus",
-"Do you want to remove album" => "Kas sa soovid albumit eemaldada",
-"Change album name" => "Muuda albumi nime",
-"New album name" => "Uue albumi nimi"
-);
diff --git a/apps/gallery/l10n/eu.php b/apps/gallery/l10n/eu.php
deleted file mode 100644
index f406730a8e..0000000000
--- a/apps/gallery/l10n/eu.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Pictures" => "Argazkiak",
-"Settings" => "Ezarpenak",
-"Rescan" => "Bireskaneatu",
-"Stop" => "Gelditu",
-"Share" => "Elkarbanatu",
-"Back" => "Atzera",
-"Remove confirmation" => "Ezabatu konfirmazioa",
-"Do you want to remove album" => "Albuma ezabatu nahi al duzu",
-"Change album name" => "Aldatu albumaren izena",
-"New album name" => "Album berriaren izena"
-);
diff --git a/apps/gallery/l10n/fa.php b/apps/gallery/l10n/fa.php
deleted file mode 100644
index 97d47047eb..0000000000
--- a/apps/gallery/l10n/fa.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Pictures" => "تصاویر",
-"Settings" => "تنظیمات",
-"Rescan" => "بازرسی دوباره",
-"Stop" => "توقف",
-"Share" => "به اشتراک گذاری",
-"Back" => "بازگشت",
-"Remove confirmation" => "پاک کردن تصدیق",
-"Do you want to remove album" => "آیا مایل به پاک کردن آلبوم هستید؟",
-"Change album name" => "تغییر نام آلبوم",
-"New album name" => "نام آلبوم جدید"
-);
diff --git a/apps/gallery/l10n/fi_FI.php b/apps/gallery/l10n/fi_FI.php
deleted file mode 100644
index 659289ae41..0000000000
--- a/apps/gallery/l10n/fi_FI.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Pictures" => "Kuvat",
-"Share gallery" => "Jaa galleria",
-"Error: " => "Virhe: ",
-"Internal error" => "Sisäinen virhe",
-"Slideshow" => "Diaesitys",
-"Back" => "Takaisin",
-"Remove confirmation" => "Poiston vahvistus",
-"Do you want to remove album" => "Tahdotko poistaa albumin",
-"Change album name" => "Muuta albumin nimeä",
-"New album name" => "Uuden albumin nimi"
-);
diff --git a/apps/gallery/l10n/fr.php b/apps/gallery/l10n/fr.php
deleted file mode 100644
index 04421236e1..0000000000
--- a/apps/gallery/l10n/fr.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Pictures" => "Images",
-"Share gallery" => "Partager la galerie",
-"Error: " => "Erreur :",
-"Internal error" => "Erreur interne",
-"Slideshow" => "Diaporama",
-"Back" => "Retour",
-"Remove confirmation" => "Enlever la confirmation",
-"Do you want to remove album" => "Voulez-vous supprimer l'album",
-"Change album name" => "Modifier le nom de l'album",
-"New album name" => "Nouveau nom de l'album"
-);
diff --git a/apps/gallery/l10n/gl.php b/apps/gallery/l10n/gl.php
deleted file mode 100644
index b7993ff5c8..0000000000
--- a/apps/gallery/l10n/gl.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Pictures" => "Fotografías",
-"Settings" => "Configuración",
-"Rescan" => "Analizar de novo",
-"Stop" => "Parar",
-"Share" => "Compartir",
-"Back" => "Atrás",
-"Remove confirmation" => "Eliminar confirmación",
-"Do you want to remove album" => "Quere eliminar o album",
-"Change album name" => "Trocar o nome do album",
-"New album name" => "Novo nome do album"
-);
diff --git a/apps/gallery/l10n/hr.php b/apps/gallery/l10n/hr.php
deleted file mode 100644
index edc11ebd9d..0000000000
--- a/apps/gallery/l10n/hr.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Pictures" => "Slike",
-"Settings" => "Postavke",
-"Rescan" => "Ponovo očitaj",
-"Stop" => "Zaustavi",
-"Share" => "Podijeli",
-"Back" => "Natrag",
-"Remove confirmation" => "Ukloni potvrdu",
-"Do you want to remove album" => "Želite li ukloniti album",
-"Change album name" => "Promijeni ime albuma",
-"New album name" => "Novo ime albuma"
-);
diff --git a/apps/gallery/l10n/hu_HU.php b/apps/gallery/l10n/hu_HU.php
deleted file mode 100644
index 34adf7719c..0000000000
--- a/apps/gallery/l10n/hu_HU.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Pictures" => "Képek",
-"Settings" => "Beállítások",
-"Rescan" => "Újravizsgálás",
-"Stop" => "Állj",
-"Share" => "Megosztás",
-"Back" => "Vissza",
-"Remove confirmation" => "Megerősítés eltávolítása",
-"Do you want to remove album" => "El akarja távolítani az albumot?",
-"Change album name" => "Albumnév megváltoztatása",
-"New album name" => "Új albumnév"
-);
diff --git a/apps/gallery/l10n/ia.php b/apps/gallery/l10n/ia.php
deleted file mode 100644
index 7ab06c3b43..0000000000
--- a/apps/gallery/l10n/ia.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Rescan" => "Rescannar",
-"Back" => "Retro"
-);
diff --git a/apps/gallery/l10n/id.php b/apps/gallery/l10n/id.php
deleted file mode 100644
index 7a977b3c9a..0000000000
--- a/apps/gallery/l10n/id.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Pictures" => "Gambar",
-"Settings" => "Setting",
-"Rescan" => "Scan ulang",
-"Stop" => "Berhenti",
-"Share" => "Bagikan",
-"Back" => "Kembali",
-"Remove confirmation" => "Hapus konfirmasi",
-"Do you want to remove album" => "Apakah anda ingin menghapus album",
-"Change album name" => "Ubah nama album",
-"New album name" => "Nama album baru"
-);
diff --git a/apps/gallery/l10n/it.php b/apps/gallery/l10n/it.php
deleted file mode 100644
index ef8d596e7e..0000000000
--- a/apps/gallery/l10n/it.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Pictures" => "Immagini",
-"Share gallery" => "Condividi la galleria",
-"Error: " => "Errore: ",
-"Internal error" => "Errore interno",
-"Slideshow" => "Presentazione",
-"Back" => "Indietro",
-"Remove confirmation" => "Rimuovi conferma",
-"Do you want to remove album" => "Vuoi rimuovere l'album",
-"Change album name" => "Cambia il nome dell'album",
-"New album name" => "Nuovo nome dell'album"
-);
diff --git a/apps/gallery/l10n/ja_JP.php b/apps/gallery/l10n/ja_JP.php
deleted file mode 100644
index 4ef4510bab..0000000000
--- a/apps/gallery/l10n/ja_JP.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Pictures" => "写真",
-"Settings" => "設定",
-"Rescan" => "再スキャン",
-"Stop" => "停止",
-"Share" => "共有",
-"Back" => "戻る",
-"Remove confirmation" => "承認を取りやめ",
-"Do you want to remove album" => "アルバムを削除しますか？",
-"Change album name" => "アルバム名を変更する",
-"New album name" => "新しいアルバム名"
-);
diff --git a/apps/gallery/l10n/ko.php b/apps/gallery/l10n/ko.php
deleted file mode 100644
index 1900049f87..0000000000
--- a/apps/gallery/l10n/ko.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Pictures" => "사진",
-"Settings" => "세팅",
-"Rescan" => "재검색",
-"Stop" => "정지",
-"Share" => "공유",
-"Back" => "뒤로",
-"Remove confirmation" => "삭제 승인",
-"Do you want to remove album" => "앨범을 삭제하시겠습니까",
-"Change album name" => "앨범 이름 변경",
-"New album name" => "새로운 앨범 이름"
-);
diff --git a/apps/gallery/l10n/lb.php b/apps/gallery/l10n/lb.php
deleted file mode 100644
index 136acedc65..0000000000
--- a/apps/gallery/l10n/lb.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Pictures" => "Fotoen",
-"Settings" => "Astellungen",
-"Rescan" => "Nei scannen",
-"Stop" => "Stop",
-"Share" => "Deelen",
-"Back" => "Zeréck",
-"Remove confirmation" => "Konfirmatioun läschen",
-"Do you want to remove album" => "Wëlls de den Album läschen",
-"Change album name" => "Album Numm änneren",
-"New album name" => "Neien Numm fir den Album"
-);
diff --git a/apps/gallery/l10n/lt_LT.php b/apps/gallery/l10n/lt_LT.php
deleted file mode 100644
index 89c1a92d0c..0000000000
--- a/apps/gallery/l10n/lt_LT.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Pictures" => "Nuotraukos",
-"Settings" => "Nustatymai",
-"Rescan" => "Atnaujinti",
-"Stop" => "Sustabdyti",
-"Share" => "Dalintis",
-"Back" => "Atgal",
-"Remove confirmation" => "Išjungti patvirtinimą",
-"Do you want to remove album" => "Ar tikrai norite pašalinti albumą",
-"Change album name" => "Keisti albumo pavadinimą",
-"New album name" => "Naujo albumo pavadinimas"
-);
diff --git a/apps/gallery/l10n/mk.php b/apps/gallery/l10n/mk.php
deleted file mode 100644
index 97f85de7ab..0000000000
--- a/apps/gallery/l10n/mk.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Pictures" => "Слики",
-"Settings" => "Параметри",
-"Rescan" => "Рескенирај",
-"Stop" => "Стоп",
-"Share" => "Сподели",
-"Back" => "Назад",
-"Remove confirmation" => "Тргни потврда",
-"Do you want to remove album" => "Дали сакате да го отстраните албумот",
-"Change album name" => "Измени име на албумот",
-"New album name" => "Ново има на албумот"
-);
diff --git a/apps/gallery/l10n/ms_MY.php b/apps/gallery/l10n/ms_MY.php
deleted file mode 100644
index a865a20a2d..0000000000
--- a/apps/gallery/l10n/ms_MY.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Rescan" => "Imbas semula",
-"Back" => "Kembali"
-);
diff --git a/apps/gallery/l10n/nb_NO.php b/apps/gallery/l10n/nb_NO.php
deleted file mode 100644
index 93dcb8372d..0000000000
--- a/apps/gallery/l10n/nb_NO.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Pictures" => "Bilder",
-"Settings" => "Innstillinger",
-"Rescan" => "Les inn på nytt",
-"Stop" => "Stopp",
-"Share" => "Del",
-"Back" => "Tilbake",
-"Remove confirmation" => "Fjern bekreftelse",
-"Do you want to remove album" => "Ønsker du å slette albumet?",
-"Change album name" => "Endre navn på album",
-"New album name" => "Nytt navn på album"
-);
diff --git a/apps/gallery/l10n/nl.php b/apps/gallery/l10n/nl.php
deleted file mode 100644
index df8fcaf72d..0000000000
--- a/apps/gallery/l10n/nl.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Pictures" => "Plaatjes",
-"Share gallery" => "Deel gallerie",
-"Error: " => "Fout:",
-"Internal error" => "Interne fout",
-"Slideshow" => "Diashow"
-);
diff --git a/apps/gallery/l10n/nn_NO.php b/apps/gallery/l10n/nn_NO.php
deleted file mode 100644
index 9caeff3306..0000000000
--- a/apps/gallery/l10n/nn_NO.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Rescan" => "Søk på nytt",
-"Back" => "Tilbake"
-);
diff --git a/apps/gallery/l10n/pl.php b/apps/gallery/l10n/pl.php
deleted file mode 100644
index 8c0bd0cb98..0000000000
--- a/apps/gallery/l10n/pl.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Pictures" => "Zdjęcia",
-"Share gallery" => "Udostępnij galerię",
-"Error: " => "Błąd: ",
-"Internal error" => "Błąd wewnętrzny",
-"Slideshow" => "Pokaz slajdów",
-"Back" => "Wróć",
-"Remove confirmation" => "Usuń potwierdzenie",
-"Do you want to remove album" => "Czy chcesz usunąć album",
-"Change album name" => "Zmień nazwę albumu",
-"New album name" => "Nowa nazwa albumu"
-);
diff --git a/apps/gallery/l10n/pt_BR.php b/apps/gallery/l10n/pt_BR.php
deleted file mode 100644
index 7b45df444e..0000000000
--- a/apps/gallery/l10n/pt_BR.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Pictures" => "Fotos",
-"Settings" => "Configuração",
-"Rescan" => "Atualizar",
-"Stop" => "Parar",
-"Share" => "Compartilhar",
-"Back" => "Voltar",
-"Remove confirmation" => "Confirmar apagar",
-"Do you want to remove album" => "Voçe dezeja remover o album",
-"Change album name" => "Mudar nome do album",
-"New album name" => "Nome do novo album"
-);
diff --git a/apps/gallery/l10n/pt_PT.php b/apps/gallery/l10n/pt_PT.php
deleted file mode 100644
index 8b7aa2a23b..0000000000
--- a/apps/gallery/l10n/pt_PT.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Pictures" => "Imagens",
-"Share gallery" => "Partilhar a galeria",
-"Error: " => "Erro: ",
-"Internal error" => "Erro interno",
-"Slideshow" => "Slideshow"
-);
diff --git a/apps/gallery/l10n/ro.php b/apps/gallery/l10n/ro.php
deleted file mode 100644
index 3537c68b17..0000000000
--- a/apps/gallery/l10n/ro.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Pictures" => "Imagini",
-"Settings" => "Setări",
-"Rescan" => "Re-scanează",
-"Stop" => "Stop",
-"Share" => "Partajează",
-"Back" => "Înapoi",
-"Remove confirmation" => "Șterge confirmarea",
-"Do you want to remove album" => "Vrei să ștergi albumul",
-"Change album name" => "Schimbă numele albumului",
-"New album name" => "Nume nou album"
-);
diff --git a/apps/gallery/l10n/ru.php b/apps/gallery/l10n/ru.php
deleted file mode 100644
index d6e33e4b01..0000000000
--- a/apps/gallery/l10n/ru.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Pictures" => "Рисунки",
-"Share gallery" => "Опубликовать",
-"Error: " => "Ошибка",
-"Internal error" => "Внутренняя ошибка",
-"Slideshow" => "Слайдшоу"
-);
diff --git a/apps/gallery/l10n/sk_SK.php b/apps/gallery/l10n/sk_SK.php
deleted file mode 100644
index e3e3be7881..0000000000
--- a/apps/gallery/l10n/sk_SK.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Pictures" => "Obrázky",
-"Settings" => "nastavenia",
-"Rescan" => "Znovu oskenovať",
-"Stop" => "Zastaviť",
-"Share" => "Zdielať",
-"Back" => "Späť",
-"Remove confirmation" => "Potvrdenie odstránenia",
-"Do you want to remove album" => "Chcete odstrániť album?",
-"Change album name" => "Zmeniť meno albumu",
-"New album name" => "Nové meno albumu"
-);
diff --git a/apps/gallery/l10n/sl.php b/apps/gallery/l10n/sl.php
deleted file mode 100644
index 8d3bb9f588..0000000000
--- a/apps/gallery/l10n/sl.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Pictures" => "Slike",
-"Share gallery" => "Daj galerijo v souporabo",
-"Error: " => "Napaka: ",
-"Internal error" => "Notranja napaka",
-"Slideshow" => "predstavitev",
-"Back" => "Nazaj",
-"Remove confirmation" => "Odstrani potrditev",
-"Do you want to remove album" => "Ali želite odstraniti album",
-"Change album name" => "Spremeni ime albuma",
-"New album name" => "Novo ime albuma"
-);
diff --git a/apps/gallery/l10n/sr.php b/apps/gallery/l10n/sr.php
deleted file mode 100644
index e3b82defa9..0000000000
--- a/apps/gallery/l10n/sr.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Rescan" => "Претражи поново",
-"Back" => "Назад"
-);
diff --git a/apps/gallery/l10n/sv.php b/apps/gallery/l10n/sv.php
deleted file mode 100644
index b63a89d90f..0000000000
--- a/apps/gallery/l10n/sv.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Pictures" => "Bilder",
-"Share gallery" => "Dela galleri",
-"Error: " => "Fel:",
-"Internal error" => "Internt fel",
-"Slideshow" => "Bildspel",
-"Back" => "Tillbaka",
-"Remove confirmation" => "Vill du säkert ta bort",
-"Do you want to remove album" => "Vill du ta bort albumet",
-"Change album name" => "Ändra albumnamnet",
-"New album name" => "Albumnamn"
-);
diff --git a/apps/gallery/l10n/th_TH.php b/apps/gallery/l10n/th_TH.php
deleted file mode 100644
index 9bb699e264..0000000000
--- a/apps/gallery/l10n/th_TH.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Pictures" => "รูปภาพ",
-"Share gallery" => "แชร์ข้อมูลแกลอรี่",
-"Error: " => "พบข้อผิดพลาด: ",
-"Internal error" => "เกิดข้อผิดพลาดภายในระบบ",
-"Slideshow" => "ภาพสไลด์โชว์"
-);
diff --git a/apps/gallery/l10n/tr.php b/apps/gallery/l10n/tr.php
deleted file mode 100644
index 7d007fa66e..0000000000
--- a/apps/gallery/l10n/tr.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Pictures" => "Resimler",
-"Share gallery" => "Galeriyi paylaş",
-"Error: " => "Hata: ",
-"Internal error" => "İç hata",
-"Slideshow" => "Slide Gösterim",
-"Back" => "Geri",
-"Remove confirmation" => "Doğrulamayı kaldır",
-"Do you want to remove album" => "Albümü silmek istiyor musunuz",
-"Change album name" => "Albüm adını değiştir",
-"New album name" => "Yeni albüm adı"
-);
diff --git a/apps/gallery/l10n/uk.php b/apps/gallery/l10n/uk.php
deleted file mode 100644
index 2544158d45..0000000000
--- a/apps/gallery/l10n/uk.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Rescan" => "Оновити",
-"Back" => "Назад"
-);
diff --git a/apps/gallery/l10n/vi.php b/apps/gallery/l10n/vi.php
deleted file mode 100644
index d1d7fc64fc..0000000000
--- a/apps/gallery/l10n/vi.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Pictures" => "Hình ảnh",
-"Share gallery" => "Chia sẻ gallery",
-"Error: " => "Lỗi :",
-"Internal error" => "Lỗi nội bộ",
-"Back" => "Trở lại",
-"Remove confirmation" => "Xóa xác nhận",
-"Do you want to remove album" => "Bạn muốn xóa album này ",
-"Change album name" => "Đổi tên album",
-"New album name" => "Tên album mới"
-);
diff --git a/apps/gallery/l10n/zh_CN.php b/apps/gallery/l10n/zh_CN.php
deleted file mode 100644
index 6aa4fc7f35..0000000000
--- a/apps/gallery/l10n/zh_CN.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Pictures" => "图片",
-"Share gallery" => "分享图库",
-"Error: " => "错误：",
-"Internal error" => "内部错误",
-"Slideshow" => "幻灯片"
-);
diff --git a/apps/gallery/l10n/zh_TW.php b/apps/gallery/l10n/zh_TW.php
deleted file mode 100644
index eb4577affc..0000000000
--- a/apps/gallery/l10n/zh_TW.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Pictures" => "圖片",
-"Settings" => "設定",
-"Rescan" => "重新掃描",
-"Stop" => "停止",
-"Share" => "分享",
-"Back" => "返回",
-"Remove confirmation" => "移除確認",
-"Do you want to remove album" => "你確定要移除相簿嗎",
-"Change album name" => "變更相簿名稱",
-"New album name" => "新相簿名稱"
-);
diff --git a/apps/gallery/lib/album.php b/apps/gallery/lib/album.php
deleted file mode 100644
index d1b29a5992..0000000000
--- a/apps/gallery/lib/album.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-
-/**
-* ownCloud - gallery application
-*
-* @author Bartek Przybylski
-* @copyright 2012 Bartek Przybylski <bartek@alefzero.eu>
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either 
-* version 3 of the License, or any later version.
-*
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-*
-* You should have received a copy of the GNU Lesser General Public 
-* License along with this library. If not, see <http://www.gnu.org/licenses/>.
-*
-*/
-
-class OC_Gallery_Album {
-	public static function create($owner, $name, $path){
-		$stmt = OCP\DB::prepare('INSERT INTO `*PREFIX*gallery_albums` (`uid_owner`, `album_name`, `album_path`, `parent_path`) ALUES (?, ?, ?, ?)');
-		$stmt->execute(array($owner, $name, $path, self::getParentPath($path)));
-	}
-
-	public static function cleanup() {
-		$albums = self::find(OCP\USER::getUser());
-		while ($r = $albums->fetchRow()) {
-			OC_Gallery_Photo::removeByAlbumId($r['album_id']);
-			self::remove(OCP\USER::getUser(), $r['album_name']);
-		}
-	}
-
-	public static function getParentPath($path) {
-		return $path === '/' ? '' : dirname($path);
-	}
-
-	public static function remove($owner, $name=null, $path=null, $parent=null) {
-		$sql = 'DELETE FROM `*PREFIX*gallery_albums` WHERE `uid_owner` LIKE ?';
-		$args = array($owner);
-		if (!is_null($name)){
-			$sql .= ' AND `album_name` LIKE ?';
-			$args[] = $name;
-		}
-		if (!is_null($path)){
-			$sql .= ' AND `album_path` LIKE ?';
-			$args[] = $path;
-		}
-		if (!is_null($parent)){
-			$sql .= ' AND `parent_path` LIKE ?';
-			$args[] = $parent;
-		}
-		$stmt = OCP\DB::prepare($sql);
-		return $stmt->execute($args);
-	}
-
-	public static function removeByName($owner, $name) { self::remove($ownmer, $name); }
-	public static function removeByPath($owner, $path) { self::remove($owner, null, $path); }
-	public static function removeByParentPath($owner, $parent) { self::remove($owner, null, null, $parent); }
-	
-	public static function find($owner, $name=null, $path=null, $parent=null){
-		$sql = 'SELECT * FROM `*PREFIX*gallery_albums` WHERE `uid_owner` = ?';
-		$args = array($owner);
-		if (!is_null($name)){
-			$sql .= ' AND `album_name` = ?';
-			$args[] = $name;
-		}
-		if (!is_null($path)){
-			$sql .= ' AND `album_path` = ?';
-			$args[] = $path;
-		}
-		if (!is_null($parent)){
-			$sql .= ' AND `parent_path` = ?';
-			$args[] = $parent;
-		}
-		$order = OCP\Config::getUserValue($owner, 'gallery', 'order', 'ASC');
-		$sql .= ' ORDER BY `album_name` ' . $order;
-
-		$stmt = OCP\DB::prepare($sql);
-		return $stmt->execute($args);
-	}
-
-	public static function changePath($oldname, $newname, $owner) {
-		$stmt = OCP\DB::prepare('UPDATE `*PREFIX*gallery_albums` SET `album_path`=? WHERE `uid_owner`=? AND `album_path`=?');
-		$stmt->execute(array($newname, $owner, $oldname));
-	}
-
-	public static function changeThumbnailPath($oldname, $newname) {
-		$view = OCP\Files::getStorage('gallery');
-		$view->rename($oldname.'.png', $newname.'.png');
-	}
-
-	public static function getAlbumSize($id){
-		$sql = 'SELECT COUNT(*) AS `size` FROM `*PREFIX*gallery_photos` WHERE `album_id` = ?';
-		$stmt = OCP\DB::prepare($sql);
-		$result=$stmt->execute(array($id))->fetchRow();
-		return $result['size'];
-	}
-
-	public static function getIntermediateGallerySize($path) {
-		$path .= '%';
-		$sql = 'SELECT COUNT(*) AS `size` FROM `*PREFIX*gallery_photos` AS `photos`, `*PREFIX*gallery_albums` AS `albums` WHERE `photos`.`album_id` = `albums`.`album_id` AND `uid_owner` = ? AND `file_path` LIKE ?';
-		$stmt = OCP\DB::prepare($sql);
-		$result = $stmt->execute(array(OCP\USER::getUser(), $path))->fetchRow();
-		return $result['size'];
-	}
-}
diff --git a/apps/gallery/lib/hooks_handlers.php b/apps/gallery/lib/hooks_handlers.php
deleted file mode 100644
index 3bafdb5cf4..0000000000
--- a/apps/gallery/lib/hooks_handlers.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-/**
-* ownCloud - gallery application
-*
-* @author Bartek Przybylski
-* @copyright 2012 Bartek Przybylski bart.p.pl@gmail.com
-* 
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either 
-* version 3 of the License, or any later version.
-* 
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
-* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-*	
-* You should have received a copy of the GNU Lesser General Public 
-* License along with this library.	If not, see <http://www.gnu.org/licenses/>.
-* 
-*/
-
-OCP\Util::connectHook('OC_Filesystem', 'delete', "OC_Gallery_Hooks_Handlers", "removePhoto");
-//OCP\Util::connectHook(OC_Filesystem::CLASSNAME, OC_Filesystem::signal_post_rename, "OC_Gallery_Hooks_Handlers", "renamePhoto");
-
-require_once(OC::$CLASSPATH['Pictures_Managers']);
-
-class OC_Gallery_Hooks_Handlers {
-
-	public static function removePhoto($params) {
-		\OC\Pictures\ThumbnailsManager::getInstance()->delete($params[OC_Filesystem::signal_param_path]);
-	}
-
-	public static function renamePhoto($params) {
-		$oldpath = $params[OC_Filesystem::signal_param_oldpath];
-		$newpath = $params[OC_Filesystem::signal_param_newpath];
-		//TODO: implement this
-	}
-}
diff --git a/apps/gallery/lib/images_utils.php b/apps/gallery/lib/images_utils.php
deleted file mode 100644
index f5e37cf1de..0000000000
--- a/apps/gallery/lib/images_utils.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-/**
-* ownCloud - gallery application
-*
-* @author Bartek Przybylski
-* @copyright 2012 Bartek Przybylski bart.p.pl@gmail.com
-* 
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either 
-* version 3 of the License, or any later version.
-* 
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-*  
-* You should have received a copy of the GNU Lesser General Public 
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-* 
-*/
-
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('gallery');
-
-function CroppedThumbnail($imgSrc,$thumbnail_width,$thumbnail_height, $tgtImg, $shift) { 
-    //getting the image dimensions
-    list($width_orig, $height_orig) = getimagesize($imgSrc); 
-    switch (strtolower(substr($imgSrc, strrpos($imgSrc, '.')+1))) {
-      case "jpeg":
-      case "jpg":
-      case "tiff":
-        $myImage = imagecreatefromjpeg($imgSrc);
-        break;
-      case "png":
-        $myImage = imagecreatefrompng($imgSrc);
-        break;
-      default:
-        exit();
-    }
-    $ratio_orig = $width_orig/$height_orig;
-    
-    if ($thumbnail_width/$thumbnail_height > $ratio_orig) {
-       $new_height = $thumbnail_width/$ratio_orig;
-       $new_width = $thumbnail_width;
-    } else {
-       $new_width = $thumbnail_height*$ratio_orig;
-       $new_height = $thumbnail_height;
-    }
-    
-    $x_mid = $new_width/2;  //horizontal middle
-    $y_mid = $new_height/2; //vertical middle
-    
-    $process = imagecreatetruecolor(round($new_width), round($new_height)); 
-
-    imagecopyresampled($process, $myImage, 0, 0, 0, 0, $new_width, $new_height, $width_orig, $height_orig);
-    imagecopyresampled($tgtImg, $process, $shift, 0, ($x_mid-($thumbnail_width/2)), ($y_mid-($thumbnail_height/2)), $thumbnail_width, $thumbnail_height, $thumbnail_width, $thumbnail_height);
-
-    imagedestroy($process);
-    imagedestroy($myImage);
-}
diff --git a/apps/gallery/lib/managers.php b/apps/gallery/lib/managers.php
deleted file mode 100644
index 666c6d6893..0000000000
--- a/apps/gallery/lib/managers.php
+++ /dev/null
@@ -1,133 +0,0 @@
-<?php
-
-namespace OC\Pictures;
-
-class DatabaseManager {        
-	private static $instance = null;
-	protected $cache = array();
-	const TAG = 'DatabaseManager';
-	
-	public static function getInstance() {
-		if (self::$instance === null)
-			self::$instance = new DatabaseManager();
-		return self::$instance;
-	}
-	
-	protected function getPathData($path) {
-		$stmt = \OCP\DB::prepare('SELECT * FROM `*PREFIX*pictures_images_cache`
-			WHERE `uid_owner` LIKE ? AND `path` LIKE ? AND `path` NOT LIKE ?');
-		$path_match = $path.'/%';
-		$path_notmatch = $path.'/%/%';
-		$result = $stmt->execute(array(\OCP\USER::getUser(), $path_match, $path_notmatch));
-		$this->cache[$path] = array();
-		while (($row = $result->fetchRow()) != false) {
-			$this->cache[$path][$row['path']] = $row;
-		}
-	}
-
-	public function setFileData($path, $width, $height) {
-		$stmt = \OCP\DB::prepare('INSERT INTO `*PREFIX*pictures_images_cache` (`uid_owner`, `path`, `width`, `height`) VALUES (?, ?, ?, ?)');
-		$stmt->execute(array(\OCP\USER::getUser(), $path, $width, $height));
-		$ret = array('path' => $path, 'width' => $width, 'height' => $height);
-		$dir = dirname($path);
-		$this->cache[$dir][$path] = $ret;
-		return $ret;
-	}
-
-	public function getFileData($path) {
-		$gallery_path = \OCP\Config::getSystemValue( 'datadirectory' ).'/'.\OC_User::getUser().'/gallery';
-		$path = $gallery_path.$path;
-		$dir = dirname($path);
-		if (!isset($this->cache[$dir])) {
-			$this->getPathData($dir);
-		}
-		if (isset($this->cache[$dir][$path])) {
-			return $this->cache[$dir][$path];
-		}
-		$image = new \OC_Image();
-		if (!$image->loadFromFile($path)) {
-			return false;
-		}
-		$ret = $this->setFileData($path, $image->width(), $image->height());
-		unset($image);
-		$this->cache[$dir][$path] = $ret;
-		return $ret;
-	}
-	
-	private function __construct() {}
-}
-
-class ThumbnailsManager {
-	
-	private static $instance = null;
-	const TAG = 'ThumbnailManager';
-        const THUMBNAIL_HEIGHT = 150;
-	
-	public static function getInstance() {
-		if (self::$instance === null)
-			self::$instance = new ThumbnailsManager();
-		return self::$instance;
-	}
-
-	public function getThumbnail($path) {
-		$gallery_storage = \OCP\Files::getStorage('gallery');
-		if ($gallery_storage->file_exists($path)) {
-			return new \OC_Image($gallery_storage->getLocalFile($path));
-		}
-		if (!\OC_Filesystem::file_exists($path)) {
-			\OC_Log::write(self::TAG, 'File '.$path.' don\'t exists', \OC_Log::WARN);
-			return false;
-		}
-		$image = new \OC_Image();
-		$image->loadFromFile(\OC_Filesystem::getLocalFile($path));
-		if (!$image->valid()) return false;
-                            
-		$image->fixOrientation();
-                
-		$ret = $image->preciseResize( floor((self::THUMBNAIL_HEIGHT*$image->width())/$image->height()), self::THUMBNAIL_HEIGHT );
-		
-		if (!$ret) {
-			\OC_Log::write(self::TAG, 'Couldn\'t resize image', \OC_Log::ERROR);
-			unset($image);
-			return false;
-		}
-		$l = $gallery_storage->getLocalFile($path);
-                
-		$image->save($l);
-		return $image;
-	}
-
-	public function getThumbnailWidth($image) {
-		return floor((self::THUMBNAIL_HEIGHT*$image->widthTopLeft())/$image->heightTopLeft());
-	}
-
-	public function getThumbnailInfo($path) {
-		$arr = DatabaseManager::getInstance()->getFileData($path);
-		if (!$arr) {
-			if (!\OC_Filesystem::file_exists($path)) {
-				\OC_Log::write(self::TAG, 'File '.$path.' don\'t exists', \OC_Log::WARN);
-				return false;
-			}
-			$image = new \OC_Image();
-			$image->loadFromFile(\OC_Filesystem::getLocalFile($path));
-			if (!$image->valid()) {
-				return false;
-			}
-			$arr = DatabaseManager::getInstance()->setFileData($path, $this->getThumbnailWidth($image), self::THUMBNAIL_HEIGHT);
-		}
-		$ret = array('filepath' => $arr['path'],
-					 'width' => $arr['width'],
-					 'height' => $arr['height']);
-		return $ret;
-	}
-	
-	public function delete($path) {
-		$thumbnail_storage = \OCP\Files::getStorage('gallery');
-		if ($thumbnail_storage->file_exists($path)) {
-			$thumbnail_storage->unlink($path);
-		}
-	}
-	
-	private function __construct() {}
-
-}
diff --git a/apps/gallery/lib/photo.php b/apps/gallery/lib/photo.php
deleted file mode 100644
index 1d304ce435..0000000000
--- a/apps/gallery/lib/photo.php
+++ /dev/null
@@ -1,136 +0,0 @@
-<?php
-
-/**
- * ownCloud - gallery application
- *
- * @author Bartek Przybylski
- * @copyright 2012 Bartek Przybylski bart.p.pl@gmail.com
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either 
- * version 3 of the License, or any later version.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *
- * You should have received a copy of the GNU Lesser General Public 
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- * 
- */
-class OC_Gallery_Photo {
-	public static function create($albumId, $img){
-		$stmt = OCP\DB::prepare('INSERT INTO `*PREFIX*gallery_photos` (`album_id`, `file_path`) VALUES (?, ?)');
-		$stmt->execute(array($albumId, $img));
-	}
-	public static function find($albumId, $img=null){
-		$sql = 'SELECT * FROM `*PREFIX*gallery_photos` WHERE `album_id` = ?';
-		$args = array($albumId);
-		if (!is_null($img)){
-			$sql .= ' AND `file_path` = ?';
-			$args[] = $img;
-		}
-		$stmt = OCP\DB::prepare($sql);
-		return $stmt->execute($args);
-	}
-
-	public static function findForAlbum($owner, $album_name) {
-		$stmt = OCP\DB::prepare('SELECT *'
-					.' FROM `*PREFIX*gallery_photos photos`,'
-						.' `*PREFIX*gallery_albums albums`'
-					.' WHERE `albums`.`uid_owner` = ?'
-						.' AND `albums`.`album_name` = ?'
-						.' AND `photos`.`album_id` = `albums`.`album_id`');
-		return $stmt->execute(array($owner, $album_name));
-	}
-
-	public static function removeByPath($path, $album_id) {
-		$stmt = OCP\DB::prepare('DELETE FROM `*PREFIX*gallery_photos` WHERE `file_path` LIKE ? AND `album_id` = ?');
-		$stmt->execute(array($path, $album_id));
-	}
-
-	public static function removeById($id) {
-		$stmt = OCP\DB::prepare('DELETE FROM `*PREFIX*gallery_photos` WHERE `photo_id` = ?');
-		$stmt->execute(array($id));
-	}
-
-	public static function removeByAlbumId($albumid) {
-		$stmt = OCP\DB::prepare('DELETE FROM `*PREFIX*gallery_photos` WHERE `album_id` = ?');
-		$stmt->execute(array($albumid));
-	}
-
-	public static function changePath($oldAlbumId, $newAlbumId, $oldpath, $newpath) {
-		$stmt = OCP\DB::prepare('UPDATE `*PREFIX*gallery_photos` SET `file_path` = ?, `album_id` = ? WHERE `album_id` = ? AND `file_path` = ?');
-		$stmt->execute(array($newpath, $newAlbumId, $oldAlbumId, $oldpath));
-	}
-
-	public static function getThumbnail($image_name, $owner = null) {
-		if (!$owner)
-			$owner = OCP\USER::getUser();
-		$view = OCP\Files::getStorage('gallery');
-		$save_dir = dirname($image_name);
-		if (!$view->is_dir($save_dir)) {
-			$view->mkdir($save_dir);
-		}
-		$view->chroot($view->getRoot() . '/' . $save_dir);
-		$thumb_file = basename($image_name);
-		if ($view->file_exists($thumb_file)) {
-			$image = new OC_Image($view->fopen($thumb_file, 'r'));
-		} else {
-			$image_path = OC_Filesystem::getLocalFile($image_name);
-			if (!file_exists($image_path)) {
-				return null;
-			}
-			$image = new OC_Image($image_path);
-			if ($image->valid()) {
-				$image->centerCrop(200);
-				$image->fixOrientation();
-				$image->save($view->getLocalFile($thumb_file));
-			}
-		}
-		if ($image->valid()) {
-			return $image;
-		} else {
-			$image->destroy();
-		}
-		return null;
-	}
-
-	public static function getViewImage($image_name, $owner = null) {
-		if (!$owner) $owner = OCP\USER::getUser();
-		$save_dir = OCP\Config::getSystemValue("datadirectory") . '/' . $owner . '/gallery';
-		$save_dir .= dirname($image_name) . '/view/';
-		$image_path = $image_name;
-		$view_file = $save_dir . basename($image_name);
-		if (!is_dir($save_dir)) {
-			mkdir($save_dir, 0777, true);
-		}
-		if (file_exists($view_file)) {
-			$image = new OC_Image($view_file);
-		} else {
-			$image_path = OC_Filesystem::getLocalFile($image_path);
-			if (!file_exists($image_path)) {
-				return null;
-			}
-			$image = new OC_Image($image_path);
-			if ($image->valid()) {
-				$image->resize(1200);
-				$image->fixOrientation();
-				$image->save($view_file);
-			}
-		}
-		if ($image->valid()) {
-			return $image;
-		} else {
-			$image->destroy();
-		}
-		return null;
-	}
-
-	public static function getGalleryRoot() {
-		return OCP\Config::getUserValue(OCP\USER::getUser(), 'gallery', 'root', '');
-	}
-
-}
diff --git a/apps/gallery/lib/scanner.php b/apps/gallery/lib/scanner.php
deleted file mode 100644
index 79b8ad4923..0000000000
--- a/apps/gallery/lib/scanner.php
+++ /dev/null
@@ -1,150 +0,0 @@
-<?php
-
-/**
-* ownCloud - gallery application
-*
-* @author Bartek Przybylski
-* @copyright 2012 Bartek Przybylski <bartek@alefzero.eu>
-* 
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either 
-* version 3 of the License, or any later version.
-* 
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-*
-* You should have received a copy of the GNU Lesser General Public 
-* License along with this library. If not, see <http://www.gnu.org/licenses/>.
-* 
-*/
-
-class OC_Gallery_Scanner {
-
-	public static function getGalleryRoot() {
-		return OCP\Config::getUserValue(OCP\USER::getUser(), 'gallery', 'root', '/');
-	}
-	public static function getScanningRoot() {
-		return OC_Filesystem::getRoot().self::getGalleryRoot();
-	}
-
-	public static function cleanUp() {
-		OC_Gallery_Album::cleanup();
-	}
-
-	public static function createName($name) {
-		$name = basename($name);
-		return $name == '.' ? '' : $name;
-	}
-
-	// Scan single dir relative to gallery root
-	public static function scan($eventSource) {
-		$paths = self::findPaths();
-		$eventSource->send('count', count($paths)+1);
-		$owner = OCP\USER::getUser();
-		foreach ($paths as $path) {
-			$name = self::createName($path);
-			$images = self::findFiles($path);
-
-			$result = OC_Gallery_Album::find($owner, null, $path);
-			// don't duplicate galleries with same path
-			if (!($albumId = $result->fetchRow())) {
-				OC_Gallery_Album::create($owner, $name, $path);
-				$result = OC_Gallery_Album::find($owner, $name, $path);
-				$albumId = $result->fetchRow();
-			}
-			$albumId = $albumId['album_id'];
-			foreach ($images as $img) {
-				$result = OC_Gallery_Photo::find($albumId, $img);
-				if (!$result->fetchRow())
-					OC_Gallery_Photo::create($albumId, $img);
-			}
-			if (count($images))
-				self::createThumbnails($name, $images);
-			$eventSource->send('scanned', '');
-		}
-		self::createIntermediateAlbums();
-		$eventSource->send('scanned', '');
-		$eventSource->send('done', 1);
-	}
-
-	public static function createThumbnails($albumName, $files) {
-		// create gallery thumbnail
-		$file_count = min(count($files), 10);
-		$thumbnail = imagecreatetruecolor($file_count*200, 200);
-		for ($i = 0; $i < $file_count; $i++) {
-			$image = OC_Gallery_Photo::getThumbnail($files[$i]);
-			if ($image && $image->valid()) {
-				imagecopyresampled($thumbnail, $image->resource(), $i*200, 0, 0, 0, 200, 200, 200, 200);
-				$image->destroy();
-			}
-		}
-		$view = OCP\Files::getStorage('gallery');
-		imagepng($thumbnail, $view->getLocalFile($albumName.'.png'));
-		imagedestroy($thumbnail);
-	}
-
-	public static function createIntermediateAlbums() {
-		$paths = self::findPaths();
-		for ($i = 1; $i < count($paths); $i++) {
-			$prevLen = strlen($paths[$i-1]);
-			if (strncmp($paths[$i-1], $paths[$i], $prevLen)==0) {
-				$s = substr($paths[$i], $prevLen);
-				if (strrpos($s, '/') != 0) {
-					$a = explode('/', trim($s, '/'));
-					$p = $paths[$i-1];
-					foreach ($a as $e) {
-						$p .= ($p == '/'?'':'/').$e;
-						OC_Gallery_Album::create(OCP\USER::getUser(), $e, $p);
-						$arr = OC_FileCache::searchByMime('image','', OC_Filesystem::getRoot().$p);
-						$step = floor(count($arr)/10);
-						if ($step == 0) $step = 1;
-						$na = array();
-						for ($j = 0; $j < count($arr); $j+=$step) {
-							$na[] = $p.$arr[$j];
-						}
-						if (count($na))
-							self::createThumbnails($e, $na);
-					}
-				}
-			} 
-		}
-	}
-
-	public static function isPhoto($filename) {
-		$ext = strtolower(substr($filename, strrpos($filename, '.')+1));
-		return $ext=='png' || $ext=='jpeg' || $ext=='jpg' || $ext=='gif';
-	}
-
-	public static function findFiles($path) {
-		$images = OC_FileCache::searchByMime('image','', OC_Filesystem::getRoot().$path);
-		$new = array();
-		foreach ($images as $i)
-			if (strpos($i, '/',1) === FALSE)
-				$new[] = $path.$i;
-		return $new;
-	}
-
-	public static function findPaths() {
-		$images=OC_FileCache::searchByMime('image','', self::getScanningRoot());
-		$paths=array();
-		foreach($images as $image){
-			$path=dirname($image);
-			$path = self::getGalleryRoot().($path=='.'?'':$path);
-			if ($path !== '/') $path=rtrim($path,'/');
-			if(array_search($path,$paths)===false){
-				$paths[]=$path;
-			}
-			// add sub path also if they don't contain images
-			while ( ($path = dirname($path)) != '/') {
-				if(array_search($path,$paths)===false){
-					$paths[]=$path;
-				}
-			}
-		}
-		sort($paths);
-		return $paths;
-	}
-}
diff --git a/apps/gallery/lib/share.php b/apps/gallery/lib/share.php
deleted file mode 100644
index d6c5f40d49..0000000000
--- a/apps/gallery/lib/share.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/**
-* ownCloud
-*
-* @author Michael Gapczynski
-* @copyright 2012 Michael Gapczynski mtgap@owncloud.com
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either
-* version 3 of the License, or any later version.
-*
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-*
-* You should have received a copy of the GNU Affero General Public
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-abstract class OC_Share_Photo_Backend implements OCP\Share_Backend {
-
-	public $dependsOn = 'file';
-	public $supportedFileExtensions = array('jpg', 'png', 'gif');
-	
-	public function getSource($item, $uid) {
-		return array('item' => 'blah.jpg', 'file' => $item);
-	}
-
-	public function generateTarget($item, $uid, $exclude = null) {
-		// TODO Make sure target path doesn't exist already
-		return $item;
-	}
-	
-	public function formatItems($items, $format, $parameters = null) {
-
-	}
-
-}
-
-?>
\ No newline at end of file
diff --git a/apps/gallery/lib/sharing.php b/apps/gallery/lib/sharing.php
deleted file mode 100644
index e79692392a..0000000000
--- a/apps/gallery/lib/sharing.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-
-/**
-* ownCloud - gallery application
-*
-* @author Bartek Przybylski
-* @copyright 2012 Bartek Przybylski bartek@alefzero.eu
-* 
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either 
-* version 3 of the License, or any later version.
-* 
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-*  
-* You should have received a copy of the GNU Lesser General Public 
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-* 
-*/
-
-class OC_Gallery_Sharing {
-  private static function getEntries($token) {
-    $sql = 'SELECT * FROM `*PREFIX*gallery_sharing` WHERE `token` = ?';
-    $stmt = OCP\DB::prepare($sql);
-    return $stmt->execute(array($token));
-  }
-
-  public static function isTokenValid($token) {
-    $r = self::getEntries($token);
-    $row = $r->fetchRow();
-    return $row != null;
-  }
-
-  public static function isRecursive($token) {
-    $r = self::getEntries($token);
-    if ($row = $r->fetchRow()) return $row['recursive'] == 1;
-    return false;
-  }
-
-  public static function getTokenOwner($token) {
-    $r = self::getEntries($token);
-    if ($row = $r->fetchRow()) {
-      $galleryId = $row['gallery_id'];
-      $sql = 'SELECT * FROM `*PREFIX*gallery_albums` WHERE `album_id` = ?';
-      $stmt = OCP\DB::prepare($sql);
-      $r = $stmt->execute(array($galleryId));
-      if ($row = $r->fetchRow())
-       return $row['uid_owner'];
-     }
-    return false;
-  }
-
-  public static function getPath($token) {
-    $r = self::getEntries($token);
-    if ($row = $r->fetchRow()) {
-      $galleryId = $row['gallery_id'];
-      $sql = 'SELECT * FROM `*PREFIX*gallery_albums` WHERE `album_id` = ?';
-      $stmt = OCP\DB::prepare($sql);
-      $r = $stmt->execute(array($galleryId));
-      if ($row = $r->fetchRow())
-        return $row['album_path'];
-    }
-  }
-
-  public static function updateSharingByToken($token, $recursive) {
-    $stmt = OCP\DB::prepare('UPDATE `*PREFIX*gallery_sharing` SET `recursive` = ? WHERE `token` = ?');
-    $stmt->execute(array($recursive, $token));
-  }
-
-  public static function getEntryByAlbumId($album_id) {
-    $stmt = OCP\DB::prepare('SELECT * FROM `*PREFIX*gallery_sharing` WHERE `gallery_id` = ?');
-    return $stmt->execute(array($album_id));
-  }
-
-  public static function addShared($token, $albumId, $recursive) {
-    $sql = 'INSERT INTO `*PREFIX*gallery_sharing` (`token`, `gallery_id`, `recursive`) VALUES (?, ?, ?)';
-    $stmt = OCP\DB::prepare($sql);
-    $stmt->execute(array($token, $albumId, $recursive));
-  }
-
-  public static function remove($albumId) {
-    $stmt = OCP\DB::prepare('DELETE FROM `*PREFIX*gallery_sharing` WHERE `gallery_id` = ?');
-    $stmt->execute(array($albumId));
-  }
-}
-
diff --git a/apps/gallery/lib/tiles.php b/apps/gallery/lib/tiles.php
deleted file mode 100644
index 54fb613a8b..0000000000
--- a/apps/gallery/lib/tiles.php
+++ /dev/null
@@ -1,174 +0,0 @@
-<?php
-
-namespace OC\Pictures;
-
-require_once('lib/base.php');
-require_once('managers.php');
-
-const TAG = 'Pictures';
-const IMAGE_WIDTH = 150;
-
-class TileBase {
-	public function getWidth() { return false; }
-
-	public function getHeight() { return IMAGE_WIDTH; }
-
-	public function getOnHoverAction() { return false; }
-	
-	public function getOnOutAction() { return false; }
-	
-	public function getOnClickAction() { return false; }
-
-	public function getDisplayedLayer() { return false; }
-
-	public function getTileProportion() { return false; }
-	
-	public function get() { return false; }
-}
-
-class TilesLine {
-
-	public function __construct() {
-		$this->tiles_array = array();
-	}
-
-	public function setAvailableSpace($space) {
-		$this->available_space = $space;
-	}
-
-	public function getTilesCount() {
-		return count($this->tiles_array);
-	}
-
-	public function addTile($tile) {
-		array_push($this->tiles_array, $tile);
-	}
-
-	public function getLeftSpace() {
-		$occupied_space = 0;
-		for ($i = 0; $i < count($this->tiles_array); $i++) {
-			$occupied_space += $this->tiles_array[$i]->getWidth();
-		}
-		return $this->available_space - $occupied_space;
-	}
-
-	public function tileWillFit($tile) {
-		return $this->getLeftSpace() > $tile->getWidth();
-	}
-	
-	public function get() {
-		$r = '<div class="line gallery_div">';
-		
-		for ($i = 0; $i < count($this->tiles_array); $i++) {
-				$img_w = $this->tiles_array[$i]->getWidth();
-				$extra = '';
-				if ($img_w != IMAGE_WIDTH) $extra = ' style="width:'.$img_w.'px"';
-				$r .= '<div class="gallery_div" '.$extra.' onmouseover="'.$this->tiles_array[$i]->getOnHoverAction().'" onmouseout="'.$this->tiles_array[$i]->getOnOutAction().'" onclick="'.$this->tiles_array[$i]->getOnClickAction().'" style="background-color:#ddd">'.$this->tiles_array[$i]->get().'</div>';
-		}
-		
-		$r .= '</div>';
-		return $r;
-	}
-
-	private $tiles_array;
-	private $available_space;
-}
-
-class TileSingle extends TileBase {
-
-	public function __construct($path) {
-		\OC_Log::write(TAG, 'Loading file from path '.$path, \OC_Log::DEBUG);
-		$this->file_path = $path;
-/*		$this->image = new \OC_Image();
-		if (!$this->image->loadFromFile($this->file_path)) {
-			\OC_Log::write(TAG, 'Loading file filed', \OC_Log::ERROR);
-			return;
-		}
-		$this->image->fixOrientation();*/
-	}
-
-	public function getWidth() {
-		$a = ThumbnailsManager::getInstance()->getThumbnailInfo($this->file_path);
-		return $a['width'];
-	}
-	
-	public function get($extra = '') {
-		return '<a rel="images" title="'.htmlentities(basename($this->getPath())).'" href="'.\OCP\Util::linkTo('gallery','ajax/viewImage.php').'?img='.urlencode($this->getPath()).'"><img rel="images" src="'.\OCP\Util::linkTo('gallery', 'ajax/thumbnail.php').'?filepath='.urlencode($this->getPath()).'" '.$extra.'></a>';
-	}
-	
-	public function getMiniatureSrc() {
-		return \OCP\Util::linkTo('gallery', 'ajax/thumbnail.php').'?filepath='.urlencode($this->getPath());
-	}
-
-	public function getPath() {
-		return $this->file_path;
-	}
-	
-	public function getOnClickAction() {
-		return '';//'javascript:openFile(\''.$this->file_path.'\');';
-	}
-
-	private $file_path;
-	private $image;
-}
-
-class TileStack extends TileBase {
-
-	const STACK_REPRESENTATIVES = 3;
-
-	public function __construct($path_array, $stack_name) {
-		$this->tiles_array = array();
-		$this->stack_name = $stack_name;
-		for ($i = 0; $i < count($path_array) && $i < self::STACK_REPRESENTATIVES; $i++) {
-			$tile = new TileSingle($path_array[$i]);
-			array_push($this->tiles_array, $tile);
-		}
-	}
-	
-	public function forceSize($width_must_fit=false) {
-		for ($i = 0; $i < count($this->tiles_array); $i++)
-			$this->tiles_array[$i]->forceSize(true);
-	}
-
-	public function getWidth() {
-		$max = 0;
-		for ($i = 0; $i < count($this->tiles_array); $i++) {
-			$max = max($max, $this->tiles_array[$i]->getWidth());
-		}
-		return min(IMAGE_WIDTH, $max);
-	}
-
-	public function get() {
-		$r = '<div class="title gallery_div">'. \OCP\Util::sanitizeHTML($this->stack_name).'</div>';
-		for ($i = 0; $i < count($this->tiles_array); $i++) {
-			$top = rand(-5, 5);
-			$left = rand(-5, 5);
-			$img_w = $this->tiles_array[$i]->getWidth();
-			$extra = '';
-			if ($img_w < IMAGE_WIDTH) {
-				$extra = 'width:'.$img_w.'px;';
-			}
-			$r .= '<div class="miniature_border gallery_div" style="background-image:url(\''.$this->tiles_array[$i]->getMiniatureSrc().'\');margin-top:'.$top.'px; margin-left:'.$left.'px;'.$extra.'"></div>';
-		}
-		return $r;
-	}
-
-	public function getOnHoverAction() {
-		return 'javascript:explode(this);return false;';
-	}
-	
-	public function getOnOutAction() {
-		return 'javascript:deplode(this);return false;';
-	}
-
-	public function getCount() {
-		return count($this->tiles_array);
-	}
-	
-	public function getOnClickAction() {
-		return 'javascript:openNewGal(\''.rawurlencode($this->stack_name).'\');';
-	}
-
-	private $tiles_array;
-	private $stack_name;
-}
diff --git a/apps/gallery/lib/tiles_test.php b/apps/gallery/lib/tiles_test.php
deleted file mode 100644
index 02d567c628..0000000000
--- a/apps/gallery/lib/tiles_test.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-$l = OC_L10N::get('gallery');
-?>
-<style>
-div.gallery_div {position:relative; display: inline-block; height: 202px; width: 200px; margin: 5px;}
-div.miniature_border {position:absolute; height: 200px; -webkit-transition-duration: .2s; background-position: 50%;}
-div.line {display:inline-block; border: 0; width: auto; height: 210px}
-div.gallery_div img{position:absolute; top: 1; left: 0; -webkit-transition-duration: 0.3s; height:200px; width: auto;}
-div.gallery_div img.shrinker {width:80px !important;}
-div.title { opacity: 0; text-align: center; vertical-align: middle; font-family: Arial; font-size: 12px; border: 0; position: absolute; text-overflow: ellipsis; bottom: 20px; left:10px; height:auto; padding: 5px; width: 170px; background-color: black; color: white; -webkit-transition: opacity 0.5s;  z-index:1000; border-radius: 7px}
-div.visible { opacity: 0.8;}
-</style>
-<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js" type="text/javascript"></script>
-<script type="text/javascript">
-function t(element) {
-	$('div', element).each(function(index, elem) {
-	 	if ($(elem).hasClass('title')) {
-		 	$(elem).addClass('visible');
-	 	} else {
-			$(elem).css('margin-top', Math.floor(30-(Math.random()*60)) + 'px')
-			       .css('margin-left', Math.floor(30-(Math.random()*60))+ 'px')
-			       .css('z-index', '999');
-		}
-	});
-}
-
-function o(element) {
-	$('div', element).each(function(index, elem) {
-	 	if ($(elem).hasClass('title')) {
-		 	$(elem).removeClass('visible');
-	 	} else {
-			$(elem).css('margin-top', Math.floor(5-(Math.random()*10)) + 'px')
-		    	   .css('margin-left', Math.floor(5-(Math.random()*10))+ 'px')
-		    	   .css('z-index', '3');
-		}
-	});
-}
-
-</script>
-
-<?php
-
-include('apps/gallery/lib/tiles.php');
-$root = empty($_GET['root'])?'/':$_GET['root'];
-
-$images = \OC_FileCache::searchByMime('image', null, '/bartek/files'.$root);
-sort($images);
-
-$arr = array();
-$tl = new \OC\Pictures\TilesLine();
-$ts = new \OC\Pictures\TileStack(array(), '');
-$previous_element = $images[0];
-for($i = 0; $i < count($images); $i++) {
-    error_log($images[$i]);
-	$prev_dir_arr = explode('/', $previous_element);
-	$dir_arr = explode('/', $images[$i]);
-
-	if (count($dir_arr)==1) {
-		$tl->addTile(new \OC\Pictures\TileSingle($images[$i]));
-		continue;
-	}
-	if (strcmp($prev_dir_arr[0], $dir_arr[0])!=0) {
-		$tl->addTile(new \OC\Pictures\TileStack($arr, $prev_dir_arr[0]));
-		$arr = array();
-	}
-	$arr[] = $root.$images[$i];
-	$previous_element = $images[$i];
-}
-
-$dir_arr = explode('/', $previous_element);
-
-if (count($dir_arr)==0) {
-	$tl->addTile(new \OC\Pictures\TileSingle($previous_element));
-} else if (count($dir_arr) && $ts->getCount() == 0){
-    $ts = new \OC\Pictures\TileStack(array($previous_element), $dir_arr[0]);
-} else {
-	$arr[] = $previous_element;
-	$ts->addTile($arr);
-}
-
-if ($ts->getCount() != 0) {
-	$tl->addTile($ts);
-}
-
-echo $tl->get();
diff --git a/apps/gallery/sharing.php b/apps/gallery/sharing.php
deleted file mode 100644
index af3e553e45..0000000000
--- a/apps/gallery/sharing.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-/**
-* ownCloud - gallery application
-*
-* @author Bartek Przybylski
-* @copyright 2012 Bartek Przybylski bartek@alefzero.eu
-* 
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either 
-* version 3 of the License, or any later version.
-* 
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-*  
-* You should have received a copy of the GNU Lesser General Public 
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-* 
-*/
-
-if (!isset($_GET['token']) || empty($_GET['token'])) {
-  exit;
-}
-
-
-
-OCP\App::checkAppEnabled('gallery');
-
-?>
-<!doctype html>
-<html>
-  <head>
-    <link rel="stylesheet" href="css/sharing.css" type="text/css"/>
-    <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js" type="text/javascript"></script>
-    <script src="js/sharing.js" type="text/javascript"></script>
-    <script>
-      var TOKEN = '<?php echo htmlentities($_GET['token']); ?>';
-    </script>
-  </head>
-  <body>
-    <div id="breadcrumb"><span class="breadcrumbelement" onclick="javascript:returnTo(0);return false;">Shared gallery</span></div>
-    <div id="gallery_list"></div>
-  </body>
-</html>
diff --git a/apps/gallery/templates/index.php b/apps/gallery/templates/index.php
deleted file mode 100644
index b0f2203603..0000000000
--- a/apps/gallery/templates/index.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<script type="text/javascript">
-
-var root = "<?php echo $_['root']; ?>";
-
-$(document).ready(function() {
-		$("a[rel=images]").fancybox({
-			'titlePosition': 'inside'
-		});
-});
-
-</script>
-
-<div id="controls"><?php
-	$sr = trim($_['root'], '/');
-	if (!empty($sr)) {
-		$paths = explode('/', $sr);
-		$path = '/';
-		for ($i = 0; $i < count($paths); $i++) {
-			$path .= urlencode($paths[$i]).'/';
-			$classess = 'crumb'.($i == count($paths)-1?' last':'');
-			echo '<div class="'.$classess.'" style="background-image:url(\''.\OCP\image_path('core','breadcrumb.png').'\')"><a href="'.\OCP\Util::linkTo('gallery', 'index.php').'?root='.$path.'">'.OCP\Util::sanitizeHTML($paths[$i]).'</a></div>';
-		}
-	}
-		
-?>
-	<div id="slideshow">
-		<input type="button" class="start" value="<?php echo $l->t('Slideshow')?>" />
-	</div>
-</div>
-<div id="gallerycontent">
-<?php
-session_write_close();
-
-echo $_['tl']->get();
-
-?>
-</div>
-
-<!-- start supersized block -->
-<div id="slideshow-content" style="display:none;">
-
-	<!--Thumbnail Navigation-->
-	<div id="prevthumb"></div>
-	<div id="nextthumb"></div>
-
-	<!--Arrow Navigation-->
-	<a id="prevslide" class="load-item"></a>
-	<a id="nextslide" class="load-item"></a>
-
-	<div id="thumb-tray" class="load-item">
-		<div id="thumb-back"></div>
-		<div id="thumb-forward"></div>
-	</div>
-
-	<!--Time Bar-->
-	<div id="progress-back" class="load-item">
-		<div id="progress-bar"></div>
-	</div>
-
-	<!--Control Bar-->
-	<div id="slideshow-controls-wrapper" class="load-item">
-		<div id="slideshow-controls">
-
-			<a id="play-button"><img id="pauseplay" src="<?php echo OCP\image_path('gallery', 'supersized/pause.png'); ?>"/></a>
-
-			<!--Slide counter-->
-			<div id="slidecounter">
-				<span class="slidenumber"></span> / <span class="totalslides"></span>
-			</div>
-
-			<!--Slide captions displayed here-->
-			<div id="slidecaption"></div>
-
-			<!--Thumb Tray button-->
-			<a id="tray-button"><img id="tray-arrow" src="<?php echo OCP\image_path('gallery', 'supersized/button-tray-up.png'); ?>"/></a>
-
-			<!--Navigation-->
-			<!--
-			<ul id="slide-list"></ul>
-			-->
-		</div>
-	</div>
-
-</div><!-- end supersized block -->
diff --git a/apps/impress/appinfo/app.php b/apps/impress/appinfo/app.php
deleted file mode 100644
index 82f098a030..0000000000
--- a/apps/impress/appinfo/app.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-/**
- * ownCloud - Impress App
- *
- * @author Frank Karlitschek
- * @copyright 2011 Frank Karlitschek karlitschek@kde.org
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either 
- * version 3 of the License, or any later version.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *  
- * You should have received a copy of the GNU Lesser General Public 
- * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
- * 
- */
-
-OCP\Util::addStyle( 'impress', 'style');
-
-OCP\App::register(array('order' => 70, 'id' => 'impress', 'name' => 'Impress'));
-
-OCP\App::addNavigationEntry(array(
-	'id' => 'impress_index', 
-	'order' => 80, 
-	'href' => OCP\Util::linkTo('impress', 'index.php'), 
-	'icon' => OCP\Util::imagePath('impress', 'impress.png'), 
-	'name' => 'Impress')
-);
-
-
-
-?>
diff --git a/apps/impress/appinfo/info.xml b/apps/impress/appinfo/info.xml
deleted file mode 100644
index 0be9c170f6..0000000000
--- a/apps/impress/appinfo/info.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<info>
-	<id>impress</id>
-	<name>Impress</name>
-	<description>A Player for impress presentations. Many thanks to Bartek Szopka for creating the wonderful impress.js library who made this app possible.</description>
-	<licence>AGPL</licence>
-	<author>Frank Karlitschek</author>
-	<require>4</require>
-	<shipped>true</shipped>
-</info>
diff --git a/apps/impress/appinfo/version b/apps/impress/appinfo/version
deleted file mode 100644
index 9f8e9b69a3..0000000000
--- a/apps/impress/appinfo/version
+++ /dev/null
@@ -1 +0,0 @@
-1.0
\ No newline at end of file
diff --git a/apps/impress/css/player.css b/apps/impress/css/player.css
deleted file mode 100644
index 0ed7130fd0..0000000000
--- a/apps/impress/css/player.css
+++ /dev/null
@@ -1,703 +0,0 @@
-/*
-    So you like the style of impress.js demo?
-    Or maybe you are just curious how it was done?
-    
-    You couldn't find a better place to find out!
-    
-    Welcome to the stylesheet impress.js demo presentation.
-    
-    Please remember that it is not meant to be a part of impress.js and is
-    not required by impress.js.
-    I expect that anyone creating a presentation for impress.js would create
-    their own set of styles.
-    
-    But feel free to read through it and learn how to get the most of what
-    impress.js provides.
-    
-    And let me be your guide.
-    
-    Shall we begin?
-*/
-
-
-/* 
-    We start with a good ol' reset.
-    That's the one by Eric Meyer http://meyerweb.com/eric/tools/css/reset/ 
-    
-    You can probably argue if it is needed here, or not, but for sure it
-    doesn't do any harm and gives us a fresh start.
-*/
-
-html, body, div, span, applet, object, iframe,
-h1, h2, h3, h4, h5, h6, p, blockquote, pre,
-a, abbr, acronym, address, big, cite, code,
-del, dfn, em, img, ins, kbd, q, s, samp,
-small, strike, strong, sub, sup, tt, var,
-b, u, i, center,
-dl, dt, dd, ol, ul, li,
-fieldset, form, label, legend,
-table, caption, tbody, tfoot, thead, tr, th, td,
-article, aside, canvas, details, embed, 
-figure, figcaption, footer, header, hgroup, 
-menu, nav, output, ruby, section, summary,
-time, mark, audio, video {
-    margin: 0;
-    padding: 0;
-    border: 0;
-    font-size: 100%;
-    font: inherit;
-    vertical-align: baseline;
-}
-
-/* HTML5 display-role reset for older browsers */
-article, aside, details, figcaption, figure, 
-footer, header, hgroup, menu, nav, section {
-    display: block;
-}
-body {
-    line-height: 1;
-}
-ol, ul {
-    list-style: none;
-}
-blockquote, q {
-    quotes: none;
-}
-blockquote:before, blockquote:after,
-q:before, q:after {
-    content: '';
-    content: none;
-}
-
-table {
-    border-collapse: collapse;
-    border-spacing: 0;
-}
-
-/*
-    Now here is when interesting things start to appear.
-    
-    We set up <body> styles with default font and nice gradient in the background.
-    And yes, there is a lot of repetition there because of -prefixes but we don't
-    want to leave anybody behind.
-*/
-body {
-    font-family: 'PT Sans', sans-serif;
-    min-height: 740px;
-    
-    background: rgb(215, 215, 215);
-    background: -webkit-gradient(radial, 50% 50%, 0, 50% 50%, 500, from(rgb(240, 240, 240)), to(rgb(190, 190, 190)));
-    background: -webkit-radial-gradient(rgb(240, 240, 240), rgb(190, 190, 190));
-    background:    -moz-radial-gradient(rgb(240, 240, 240), rgb(190, 190, 190));
-    background:     -ms-radial-gradient(rgb(240, 240, 240), rgb(190, 190, 190));
-    background:      -o-radial-gradient(rgb(240, 240, 240), rgb(190, 190, 190));
-    background:         radial-gradient(rgb(240, 240, 240), rgb(190, 190, 190));    
-}
-
-/*
-    Now let's bring some text styles back ...
-*/
-b, strong { font-weight: bold }
-i, em { font-style: italic }
-
-/*
-    ... and give links a nice look.
-*/
-a {
-    color: inherit;
-    text-decoration: none;
-    padding: 0 0.1em;
-    background: rgba(255,255,255,0.5);
-    text-shadow: -1px -1px 2px rgba(100,100,100,0.9);
-    border-radius: 0.2em;
-    
-    -webkit-transition: 0.5s;
-    -moz-transition:    0.5s;
-    -ms-transition:     0.5s;
-    -o-transition:      0.5s;
-    transition:         0.5s;
-}
-
-a:hover,
-a:focus {
-    background: rgba(255,255,255,1);
-    text-shadow: -1px -1px 2px rgba(100,100,100,0.5);
-}
-
-/*
-    Because the main point behind the impress.js demo is to demo impress.js
-    we display a fallback message for users with browsers that don't support
-    all the features required by it.
-    
-    All of the content will be still fully accessible for them, but I want
-    them to know that they are missing something - that's what the demo is
-    about, isn't it?
-    
-    And then we hide the message, when support is detected in the browser.
-*/
-
-.fallback-message {
-    font-family: sans-serif;
-    line-height: 1.3;
-    
-    width: 780px;
-    padding: 10px 10px 0;
-    margin: 20px auto;
-
-    border: 1px solid #E4C652;
-    border-radius: 10px;
-    background: #EEDC94;
-}
-
-.fallback-message p {
-    margin-bottom: 10px;
-}
-
-.impress-supported .fallback-message {
-    display: none;
-}
-
-/*
-    Now let's style the presentation steps.
-    
-    We start with basics to make sure it displays correctly in everywhere ...
-*/
-
-.step {
-    position: relative;
-    width: 900px;
-    padding: 40px;
-    margin: 20px auto;
-
-    -webkit-box-sizing: border-box;
-    -moz-box-sizing:    border-box;
-    -ms-box-sizing:     border-box;
-    -o-box-sizing:      border-box;
-    box-sizing:         border-box;
-
-    font-family: 'PT Serif', georgia, serif;
-    font-size: 48px;
-    line-height: 1.5;
-}
-
-/*
-    ... and we enhance the styles for impress.js.
-    
-    Basically we remove the margin and make inactive steps a little bit transparent.
-*/
-.impress-enabled .step {
-    margin: 0;
-    opacity: 0.3;
-
-    -webkit-transition: opacity 1s;
-    -moz-transition:    opacity 1s;
-    -ms-transition:     opacity 1s;
-    -o-transition:      opacity 1s;
-    transition:         opacity 1s;
-}
-
-.impress-enabled .step.active { opacity: 1 }
-
-/*
-    These 'slide' step styles were heavily inspired by HTML5 Slides:
-    http://html5slides.googlecode.com/svn/trunk/styles.css
-    
-    ;)
-    
-    They cover everything what you see on first three steps of the demo.
-*/
-.slide {
-    display: block;
-
-    width: 900px;
-    height: 700px;
-    padding: 40px 60px;
-
-    background-color: white;
-    border: 1px solid rgba(0, 0, 0, .3);
-    border-radius: 10px;
-    box-shadow: 0 2px 6px rgba(0, 0, 0, .1);
-
-    color: rgb(102, 102, 102);
-    text-shadow: 0 2px 2px rgba(0, 0, 0, .1);
-
-    font-family: 'Open Sans', Arial, sans-serif;
-    font-size: 30px;
-    line-height: 36px;
-    letter-spacing: -1px;
-}
-
-.slide q {
-    display: block;
-    font-size: 50px;
-    line-height: 72px;
-
-    margin-top: 100px;
-}
-
-.slide q strong {
-    white-space: nowrap;
-}
-
-/*
-    And now we start to style each step separately.
-    
-    I agree that this may be not the most efficient, object-oriented and
-    scalable way of styling, but most of steps have quite a custom look
-    and typography tricks here and there, so they had to be styles separately.
-
-    First is the title step with a big <h1> (no room for padding) and some
-    3D positioning along Z axis.
-*/
-
-#title {
-    padding: 0;
-}
-
-#title .try {
-    font-size: 64px;
-    position: absolute;
-    top: -0.5em;
-    left: 1.5em;
-    
-    -webkit-transform: translateZ(20px);
-    -moz-transform:    translateZ(20px);
-    -ms-transform:     translateZ(20px);
-    -o-transform:      translateZ(20px);
-    transform:         translateZ(20px);
-}
-
-#title h1 {
-    font-size: 190px;
-    
-    -webkit-transform: translateZ(50px);
-    -moz-transform:    translateZ(50px);
-    -ms-transform:     translateZ(50px);
-    -o-transform:      translateZ(50px);
-    transform:         translateZ(50px);
-}
-
-#title .footnote {
-    font-size: 32px;
-}
-
-/*
-    Second step is nothing special, just a text with a link, so it doesn't need
-    any special styling.
-    
-    Let's move to 'big thoughts' with centered text and custom font sizes.
-*/
-#big {
-    width: 600px;
-    text-align: center;
-    font-size: 60px;
-    line-height: 1;
-}
-
-#big b {
-    display: block;
-    font-size: 250px;
-    line-height: 250px;
-}
-
-#big .thoughts {
-    font-size: 90px;
-    line-height: 150px;
-}
-
-/*
-    'Tiny ideas' just need some tiny styling.
-*/
-#tiny {
-    width: 500px;
-    text-align: center;
-}
-
-/*
-    This step has some animated text ...
-*/
-#ing { width: 500px }
-
-/*
-    ... so we define display to `inline-block` to enable transforms and
-    transition duration to 0.5s ...
-*/
-#ing b {
-    display: inline-block;
-    -webkit-transition: 0.5s;
-    -moz-transition:    0.5s;
-    -ms-transition:     0.5s;
-    -o-transition:      0.5s;
-    transition:         0.5s;
-}
-
-/*
-    ... and we want 'positioning` word to move up a bit when the step gets
-    `present` class ...
-*/
-#ing.present .positioning {
-    -webkit-transform: translateY(-10px);
-    -moz-transform:    translateY(-10px);
-    -ms-transform:     translateY(-10px);
-    -o-transform:      translateY(-10px);
-    transform:         translateY(-10px);
-}
-
-/*
-    ... 'rotating' to rotate quater of a second later ...
-*/
-#ing.present .rotating {
-    -webkit-transform: rotate(-10deg);
-    -moz-transform:    rotate(-10deg);
-    -ms-transform:     rotate(-10deg);
-    -o-transform:      rotate(-10deg);
-    transform:         rotate(-10deg);
-
-    -webkit-transition-delay: 0.25s;
-    -moz-transition-delay:    0.25s;
-    -ms-transition-delay:     0.25s;
-    -o-transition-delay:      0.25s;
-    transition-delay:         0.25s;
-}
-
-/*
-    ... and 'scaling' to scale down after another quater of a second.
-*/
-#ing.present .scaling {
-    -webkit-transform: scale(0.7);
-    -moz-transform:    scale(0.7);
-    -ms-transform:     scale(0.7);
-    -o-transform:      scale(0.7);
-    transform:         scale(0.7);
-
-    -webkit-transition-delay: 0.5s;
-    -moz-transition-delay:    0.5s;
-    -ms-transition-delay:     0.5s;
-    -o-transition-delay:      0.5s;
-    transition-delay:         0.5s;
-}
-
-/*
-    The 'imagination' step is again some boring font-sizing.
-*/
-
-#imagination {
-    width: 600px;
-}
-
-#imagination .imagination {
-    font-size: 78px;
-}
-
-/*
-    There is nothing really special about 'use the source, Luke' step, too,
-    except maybe of the Yoda background.
-    
-    As you can see below I've 'hard-coded' it in data URL.
-    That's not the best way to serve images, but because that's just this one
-    I decided it will be OK to have it this way.
-    
-    Just make sure you don't blindly copy this approach.
-*/
-#source {
-    width: 700px;
-    padding-bottom: 300px;
-    
-    /* Yoda Icon :: Pixel Art from Star Wars http://www.pixeljoint.com/pixelart/1423.htm */
-    background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAARgAAAEYCAMAAACwUBm+AAAAAXNSR0IArs4c6QAAAKtQTFRFsAAAvbWSLUUrLEQqY1s8UYJMqJ1vNTEgOiIdIzYhjIFVLhsXZ6lgSEIsP2U8JhcCVzMsSXZEgXdOO145XJdWOl03LzAYMk4vSXNExr+hwcuxRTs1Qmk+RW9Am49eFRANQz4pUoNMQWc+OSMDTz0wLBsCNVMxa2NBOyUDUoNNSnlEWo9VRGxAVzYFl6tXCggHbLNmMUIcHhwTXkk5f3VNRT8wUT8xAAAACQocRBWFFwAAAAF0Uk5TAEDm2GYAAAPCSURBVHja7d3JctNAFIZRMwRCCGEmzPM8z/D+T8bu/ptbXXJFdij5fMt2Wuo+2UgqxVmtttq5WVotLzBgwIABAwYMGDCn0qVqbo69psPqVpWx+1XG5iaavF8wYMCAAQMGDBgwi4DJ6Y6qkxB1HNlcN3a92gbR5P2CAQMGDBgwYMCAWSxMlrU+UY5yu2l9okfV4bAxUVbf7TJnAwMGDBgwYMCAAbMLMHeqbGR82Zy+VR1Ht81nVca6R+UdTLaU24Ruzd3qM/e4yjnAgAEDBgwYMGDA7AJMd1l/3NRdVGcj3eX/2WEhCmDGxnM7yqygu8XIPjJj8iN/MGDAgAEDBgwYMAuDGb8q0RGlLCHLv1t9qDKWn3vdNHVuEI6HPaxO9Jo3GDBgwIABAwYMmIXBdC9ShGgMk+XnkXUeuGcsP/e1+lhNnZsL/G5Vs3OAAQMGDBgwYMCAWSxMR3SzOmraG5atdy9wZKzb+vg16qyqe2FltbnAgAEDBgwYMGDALAxmTJSuN3WA76rnVca6GTnemGN1WoEBAwYMGDBgwIBZGMxUomy4+xO899V4LAg5Xnc2MGDAgAEDBgwYMGA218Wq+2K1LDqvY9xZu8zN8fICdM6btYABAwYMGDBgwIABMzfH0+pGU5afze2tXebmeAfVz+p8BQYMGDBgwIABAwbMPBzZ+oWmfJrln1273FhkbHzee9WWbw7AgAEDBgwYMGDALAKm43hcdctKgblcPamOhuXnXlY5Xs6bsW4FGyQCAwYMGDBgwIABswiYMceZKgvMo+h8mrHLTdn676rj+FEFoTtHd8MwOxEYMGDAgAEDBgyYRcBM5UhXqiymW3R3c9ARhWO/OmjqfjVZy+xEYMCAAQMGDBgwYBYG073OnCV0RFNhMhaOa9WfKmOB6XjHMN1tQmaAAQMGDBgwYMCA2VWY7vXjz1U4croAzgPztwIDBgwYMGDAgAEDZhswh035NBw59Dww3RgYMGDAgAEDBgwYMJuD6f4tXT7NUqfCdBvZLkxXdgQGDBgwYMCAAQNmt2DGj8WzwAfV/w7T/aq7mxwwYMCAAQMGDBgwuwqTOo7uTwTngflSzQ3TdaJvAwEDBgwYMGDAgAED5gSvgbyo5oHZ4Pc+gwEDBgwYMGDAgAEzhOm+5G0qTGaAAQMGDBgwYMCAAXNaMOcnls3tNwWm+zRzp54NDBgwYMCAAQMGDJh5YNL36k1TLuGvVq+qnKMbS5n7tulT9asCAwYMGDBgwIABA2ZumKuztLnjgQEDBgwYMGDAgNl5mH/4/ltKA6vBNAAAAABJRU5ErkJggg==);
-    background-position: bottom right;
-    background-repeat: no-repeat;
-}
-
-#source q {
-    font-size: 60px;
-}
-
-/*
-    And the "it's in 3D" step again brings some 3D typography - just for fun.
-    
-    Because we want to position <span> elements in 3D we set transform-style to
-    `preserve-3d` on the paragraph.
-    It is not needed by webkit browsers, but it is in Firefox. It's hard to say
-    which behaviour is correct as 3D transforms spec is not very clear about it.
-*/
-#its-in-3d p {
-    -webkit-transform-style: preserve-3d;
-    -moz-transform-style:    preserve-3d; /* Y U need this Firefox?! */
-    -ms-transform-style:     preserve-3d;
-    -o-transform-style:      preserve-3d;
-    transform-style:         preserve-3d;
-}
-
-/*
-    Below we position each word separately along Z axis and we want it to transition
-    to default position in 0.5s when the step gets `present` class.
-    
-    Quite a simple idea, but lot's of styles and prefixes.
-*/
-#its-in-3d span,
-#its-in-3d b {
-    display: inline-block;
-    -webkit-transform: translateZ(40px);
-    -moz-transform:    translateZ(40px);
-    -ms-transform:     translateZ(40px);
-    -o-transform:      translateZ(40px);
-     transform:        translateZ(40px);
-            
-    -webkit-transition: 0.5s;
-    -moz-transition:    0.5s;
-    -ms-transition:     0.5s;
-    -o-transition:      0.5s;
-    transition:         0.5s;
-}
-
-#its-in-3d .have {
-    -webkit-transform: translateZ(-40px);
-    -moz-transform:    translateZ(-40px);
-    -ms-transform:     translateZ(-40px);
-    -o-transform:      translateZ(-40px);
-    transform:         translateZ(-40px);
-}
-
-#its-in-3d .you {
-    -webkit-transform: translateZ(20px);
-    -moz-transform:    translateZ(20px);
-    -ms-transform:     translateZ(20px);
-    -o-transform:      translateZ(20px);
-    transform:         translateZ(20px);
-}
-
-#its-in-3d .noticed {
-    -webkit-transform: translateZ(-40px);
-    -moz-transform:    translateZ(-40px);
-    -ms-transform:     translateZ(-40px);
-    -o-transform:      translateZ(-40px);
-    transform:         translateZ(-40px);
-}
-
-#its-in-3d .its {
-    -webkit-transform: translateZ(60px);
-    -moz-transform:    translateZ(60px);
-    -ms-transform:     translateZ(60px);
-    -o-transform:      translateZ(60px);
-    transform:         translateZ(60px);
-}
-
-#its-in-3d .in {
-    -webkit-transform: translateZ(-10px);
-    -moz-transform:    translateZ(-10px);
-    -ms-transform:     translateZ(-10px);
-    -o-transform:      translateZ(-10px);
-    transform:         translateZ(-10px);
-}
-
-#its-in-3d .footnote {
-    font-size: 32px;
-
-    -webkit-transform: translateZ(-10px);
-    -moz-transform:    translateZ(-10px);
-    -ms-transform:     translateZ(-10px);
-    -o-transform:      translateZ(-10px);
-    transform:         translateZ(-10px);
-}
-
-#its-in-3d.present span,
-#its-in-3d.present b {
-    -webkit-transform: translateZ(0px);
-    -moz-transform:    translateZ(0px);
-    -ms-transform:     translateZ(0px);
-    -o-transform:      translateZ(0px);
-    transform:         translateZ(0px);
-}
-
-/*
-    The last step is an overview.
-    There is no content in it, so we make sure it's not visible because we want
-    to be able to click on other steps.
-
-*/
-#overview { display: none }
-
-/*
-    We also make other steps visible and give them a pointer cursor using the
-    `impress-on-` class.
-*/
-.impress-on-overview .step {
-    opacity: 1;
-    cursor: pointer;
-}
-
-
-/*
-    Now, when we have all the steps styled let's give users a hint how to navigate
-    around the presentation.
-    
-    The best way to do this would be to use JavaScript, show a delayed hint for a
-    first time users, then hide it and store a status in cookie or localStorage...
-    
-    But I wanted to have some CSS fun and avoid additional scripting...
-    
-    Let me explain it first, so maybe the transition magic will be more readable
-    when you read the code.
-    
-    First of all I wanted the hint to appear only when user is idle for a while.
-    You can't detect the 'idle' state in CSS, but I delayed a appearing of the
-    hint by 5s using transition-delay.
-    
-    You also can't detect in CSS if the user is a first-time visitor, so I had to
-    make an assumption that I'll only show the hint on the first step. And when
-    the step is changed hide the hint, because I can assume that user already
-    knows how to navigate.
-    
-    To summarize it - hint is shown when the user is on the first step for longer
-    than 5 seconds.
-    
-    The other problem I had was caused by the fact that I wanted the hint to fade
-    in and out. It can be easily achieved by transitioning the opacity property.
-    But that also meant that the hint was always on the screen, even if totally 
-    transparent. It covered part of the screen and you couldn't correctly clicked
-    through it.
-    Unfortunately you cannot transition between display `block` and `none` in pure
-    CSS, so I needed a way to not only fade out the hint but also move it out of
-    the screen.
-    
-    I solved this problem by positioning the hint below the bottom of the screen
-    with CSS transform and moving it up to show it. But I also didn't want this move
-    to be visible. I wanted the hint only to fade in and out visually, so I delayed
-    the fade in transition, so it starts when the hint is already in its correct
-    position on the screen.
-    
-    I know, it sounds complicated ... maybe it would be easier with the code?
-*/
-
-.hint {
-    /*
-        We hide the hint until presentation is started and from browsers not supporting
-        impress.js, as they will have a linear scrollable view ...
-    */
-    display: none;
-    
-    /*
-        ... and give it some fixed position and nice styles.
-    */
-    position: fixed;
-    left: 0;
-    right: 0;
-    bottom: 200px;
-    
-    background: rgba(0,0,0,0.5);
-    color: #EEE;
-    text-align: center;
-    
-    font-size: 50px;
-    padding: 20px;
-    
-    z-index: 100;
-    
-    /*
-        By default we don't want the hint to be visible, so we make it transparent ...
-    */
-    opacity: 0;
-    
-    /*
-        ... and position it below the bottom of the screen (relative to it's fixed position)
-    */
-    -webkit-transform: translateY(400px);
-    -moz-transform:    translateY(400px);
-    -ms-transform:     translateY(400px);
-    -o-transform:      translateY(400px);
-    transform:         translateY(400px);
-
-    /*
-        Now let's imagine that the hint is visible and we want to fade it out and move out
-        of the screen.
-        
-        So we define the transition on the opacity property with 1s duration and another
-        transition on transform property delayed by 1s so it will happen after the fade out
-        on opacity finished.
-        
-        This way user will not see the hint moving down.
-    */
-    -webkit-transition: opacity 1s, -webkit-transform 0.5s 1s;
-    -moz-transition:    opacity 1s,    -moz-transform 0.5s 1s;
-    -ms-transition:     opacity 1s,     -ms-transform 0.5s 1s;
-    -o-transition:      opacity 1s,      -o-transform 0.5s 1s;
-    transition:         opacity 1s,         transform 0.5s 1s;
-}
-
-/*
-    Now we 'enable' the hint when presentation is initialized ...
-*/
-.impress-enabled .hint { display: block }
-
-/*
-    ... and we will show it when the first step (with id 'bored') is active.
-*/
-.impress-on-bored .hint {
-    /*
-        We remove the transparency and position the hint in its default fixed
-        position.
-    */
-    opacity: 1;
-    
-    -webkit-transform: translateY(0px);
-    -moz-transform:    translateY(0px);
-    -ms-transform:     translateY(0px);
-    -o-transform:      translateY(0px);
-    transform:         translateY(0px);
-    
-    /*
-        Now for fade in transition we have the oposite situation from the one
-        above.
-        
-        First after 4.5s delay we animate the transform property to move the hint
-        into its correct position and after that we fade it in with opacity 
-        transition.
-    */
-    -webkit-transition: opacity 1s 5s, -webkit-transform 0.5s 4.5s;
-    -moz-transition:    opacity 1s 5s,    -moz-transform 0.5s 4.5s;
-    -ms-transition:     opacity 1s 5s,     -ms-transform 0.5s 4.5s;
-    -o-transition:      opacity 1s 5s,      -o-transform 0.5s 4.5s;
-    transition:         opacity 1s 5s,         transform 0.5s 4.5s;
-}
-
-/*
-    And as the last thing there is a workaround for quite strange bug.
-    It happens a lot in Chrome. I don't remember if I've seen it in Firefox.
-    
-    Sometimes the element positioned in 3D (especially when it's moved back
-    along Z axis) is not clickable, because it falls 'behind' the <body>
-    element.
-    
-    To prevent this, I decided to make <body> non clickable by setting 
-    pointer-events property to `none` value.
-    Value if this property is inherited, so to make everything else clickable
-    I bring it back on the #impress element.
-    
-    If you want to know more about `pointer-events` here are some docs:
-    https://developer.mozilla.org/en/CSS/pointer-events
-    
-    There is one very important thing to notice about this workaround - it makes
-    everything 'unclickable' except what's in #impress element.
-    
-    So use it wisely ... or don't use at all.
-*/
-.impress-enabled          { pointer-events: none }
-.impress-enabled #impress { pointer-events: auto }
-
-/*
-    There is one funny thing I just realized.
-    
-    Thanks to this workaround above everything except #impress element is invisible
-    for click events. That means that the hint element is also not clickable.
-    So basically all of this transforms and delayed transitions trickery was probably
-    not needed at all...
-    
-    But it was fun to learn about it, wasn't it?
-*/
-
-/*
-    That's all I have for you in this file.
-    Thanks for reading. I hope you enjoyed it at least as much as I enjoyed writing it
-    for you.
-*/
diff --git a/apps/impress/css/style.css b/apps/impress/css/style.css
deleted file mode 100755
index 4c7f60ef84..0000000000
--- a/apps/impress/css/style.css
+++ /dev/null
@@ -1,14 +0,0 @@
-#emptyfolder { position:absolute; margin:10em 0 0 10em; font-size:1.5em; font-weight:bold; color:#888; text-shadow:#fff 0 1px 0; }
-
-.impresslist {  margin-top:40px; padding:5px; width:100%;}
-.impresslist tr:hover {  backgound-color:#ccc; }
-.impresslist tr td {  padding:5px; }
-
-.docu { position: absolute; right: 13.5em; top: 0em; }
-
-#documentation { margin: 20px; }
-#documentation h1 { font-size:1.8em; font-weight:bold; color:#888; }
-#documentation h2 { font-size:1.5em; font-weight:bold; color:#888; }
-#documentation h2 { font-size:1.2em; font-weight:bold; color:#888; }
-
-.examplecode { font-size:0.9em; font-family:"Courier New","Courier";  background-color:#eee; color:#333; width:90%; height:300px; padding:10px;}
\ No newline at end of file
diff --git a/apps/impress/documentation.php b/apps/impress/documentation.php
deleted file mode 100755
index 17a97432a4..0000000000
--- a/apps/impress/documentation.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/**
- * ownCloud - Impress App
- *
- * @author Frank Karlitschek
- * @copyright 2011 Frank Karlitschek karlitschek@kde.org
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either 
- * version 3 of the License, or any later version.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *  
- * You should have received a copy of the GNU Lesser General Public 
- * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
- * 
- */
-
-require_once('lib/impress.php');
-
-OCP\User::checkLoggedIn();
-OCP\App::setActiveNavigationEntry( 'impress_index' );
-
-
-
-$tmpl = new OCP\Template('impress', 'documentation', 'user');
-$tmpl->printPage();
-
-
diff --git a/apps/impress/img/impress.png b/apps/impress/img/impress.png
deleted file mode 100644
index 23e14fc623..0000000000
Binary files a/apps/impress/img/impress.png and /dev/null differ
diff --git a/apps/impress/img/impress.svg b/apps/impress/img/impress.svg
deleted file mode 100755
index af1cf89d42..0000000000
--- a/apps/impress/img/impress.svg
+++ /dev/null
@@ -1,1718 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.0"
-   width="16"
-   height="16"
-   id="svg11300"
-   inkscape:version="0.48.2 r9819"
-   sodipodi:docname="impress.svg"
-   inkscape:export-filename="/Users/karlitschek/Desktop/impress.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <metadata
-     id="metadata26">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#cccccc"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1646"
-     inkscape:window-height="1184"
-     id="namedview24"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:zoom="32.000001"
-     inkscape:cx="4.7817607"
-     inkscape:cy="8.2037781"
-     inkscape:window-x="1667"
-     inkscape:window-y="42"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="g4146">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4330"
-       empspacing="5"
-       dotted="true"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <defs
-     id="defs3">
-    <linearGradient
-       id="linearGradient4136">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;"
-         id="stop4138" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop4140" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4303">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop4305" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop4307" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4297">
-      <stop
-         id="stop4299"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4301"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4115">
-      <stop
-         id="stop4117"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4119"
-         style="stop-color:#363636;stop-opacity:0.698"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3785">
-      <stop
-         id="stop3787"
-         style="stop-color:#505050;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3789"
-         style="stop-color:#878787;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6954">
-      <stop
-         id="stop6960"
-         style="stop-color:#f5f5f5;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop6962"
-         style="stop-color:#d2d2d2;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3341">
-      <stop
-         id="stop3343"
-         style="stop-color:white;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3345"
-         style="stop-color:white;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="24.999998"
-       cy="28.659998"
-       r="16"
-       fx="24.999998"
-       fy="28.659998"
-       id="radialGradient2856"
-       xlink:href="#linearGradient6954"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.56186795,0,0,0.15787922,-6.1682604,5.3385209)" />
-    <linearGradient
-       x1="30"
-       y1="25.084745"
-       x2="30"
-       y2="45"
-       id="linearGradient2858"
-       xlink:href="#linearGradient3785"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.42808986,0,0,0.42296591,-2.823809,-3.2486024)" />
-    <radialGradient
-       cx="26.375898"
-       cy="12.31301"
-       r="8"
-       fx="26.375898"
-       fy="12.31301"
-       id="radialGradient2860"
-       xlink:href="#linearGradient6954"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.55250164,-0.0426402,0.04315608,0.50971914,-6.3026675,-1.9765067)" />
-    <linearGradient
-       x1="30"
-       y1="5"
-       x2="30"
-       y2="44.678879"
-       id="linearGradient2862"
-       xlink:href="#linearGradient3785"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33685737,0,0,0.32161283,-0.10572085,-0.29529973)" />
-    <linearGradient
-       x1="30"
-       y1="0.91818392"
-       x2="30"
-       y2="25.792814"
-       id="linearGradient2864"
-       xlink:href="#linearGradient3341"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33685737,0,0,0.32161283,-0.10572085,-0.29529973)" />
-    <linearGradient
-       x1="29.955881"
-       y1="21.86607"
-       x2="29.955881"
-       y2="43.144382"
-       id="linearGradient2866"
-       xlink:href="#linearGradient3341"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.42808986,0,0,0.42296591,-2.823809,-3.2486024)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient7308"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.54681372,0,0,0.39376081,3.7325729,-0.29182867)"
-       x1="34.992828"
-       y1="0.94087797"
-       x2="34.992828"
-       y2="33.955856" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient3796"
-       x1="8.3635759"
-       y1="15.028702"
-       x2="15.937561"
-       y2="11.00073"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient3798"
-       x1="6.9951797"
-       y1="4.7478018"
-       x2="13.00482"
-       y2="4.7478018"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient3815"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-5"
-       id="linearGradient3815-3"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-5">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-9" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-0" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-5"
-       id="linearGradient3831"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3833">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3835" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3837" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient3874"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2"
-       id="linearGradient3892-2"
-       x1="8.7094374"
-       y1="1.0035814"
-       x2="8.6826077"
-       y2="16.052532"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(0.96967712,0,0,0.96967712,0.26437941,-0.96950812)"
-       y2="16.052532"
-       x2="8.6826077"
-       y1="1.0035814"
-       x1="8.7094374"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3909"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient3984"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2-1">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1-4" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4-6" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(0.78786264,0,0,0.78786264,-1.5726929,-0.7389112)"
-       y2="16.052532"
-       x2="8.6826077"
-       y1="1.0035814"
-       x1="8.7094374"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3909-3"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-2"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2-2">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1-7" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4-5" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4115-9"
-       id="linearGradient4113-3"
-       x1="0.86849999"
-       y1="13.895414"
-       x2="0.44923753"
-       y2="28.776533"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient4115-9">
-      <stop
-         id="stop4117-5"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4119-6"
-         style="stop-color:#363636;stop-opacity:0.698"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3104"
-       id="linearGradient3815-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.23426255,0,0,0.2859159,18.734419,0.35950872)"
-       x1="-51.786404"
-       y1="50.786446"
-       x2="-51.786404"
-       y2="2.9062471" />
-    <linearGradient
-       id="linearGradient3104">
-      <stop
-         id="stop3106"
-         style="stop-color:#aaaaaa;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3108"
-         style="stop-color:#c8c8c8;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="13.138569"
-       cy="25.625349"
-       r="13.931416"
-       fx="13.138569"
-       fy="25.625349"
-       id="radialGradient2965"
-       xlink:href="#linearGradient3690-451"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0,0.92614711,-1.0546317,0,32.402583,-9.3345932)" />
-    <linearGradient
-       id="linearGradient3690-451">
-      <stop
-         id="stop2857"
-         style="stop-color:#e8e8e8;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop2859"
-         style="stop-color:#d8d8d8;stop-opacity:1"
-         offset="0.26238" />
-      <stop
-         id="stop2861"
-         style="stop-color:#c2c2c2;stop-opacity:1"
-         offset="0.66093999" />
-      <stop
-         id="stop2863"
-         style="stop-color:#a5a5a5;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="21.483376"
-       y1="36.255058"
-       x2="21.483376"
-       y2="9.5799999"
-       id="linearGradient2967"
-       xlink:href="#linearGradient3603-84"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762279)" />
-    <linearGradient
-       id="linearGradient3603-84">
-      <stop
-         id="stop2867"
-         style="stop-color:#707070;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop2869"
-         style="stop-color:#9e9e9e;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="11.566265"
-       y1="22.292103"
-       x2="15.214532"
-       y2="33.95525"
-       id="linearGradient3674-262"
-       xlink:href="#linearGradient8265-821-176-38-919-66-249-529"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4893617,0,0,0.4893617,1.7131795,22.728095)" />
-    <linearGradient
-       id="linearGradient8265-821-176-38-919-66-249-529">
-      <stop
-         id="stop2873"
-         style="stop-color:#ffffff;stop-opacity:0.27450982"
-         offset="0" />
-      <stop
-         id="stop2875"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="24.046366"
-       y1="11.673002"
-       x2="24.046366"
-       y2="34.713669"
-       id="linearGradient3677-116"
-       xlink:href="#linearGradient3642-81"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762276)" />
-    <linearGradient
-       id="linearGradient3642-81">
-      <stop
-         id="stop2879"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop2881"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="34.713669"
-       x2="24.046366"
-       y1="11.673002"
-       x1="24.046366"
-       gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762276)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3037"
-       xlink:href="#linearGradient3642-81"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3155-40"
-       id="linearGradient8639"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.415777,-0.4174938,0.518983,0.5146192,-15.747227,2.6503673)"
-       spreadMethod="pad"
-       x1="23.575972"
-       y1="25.356892"
-       x2="23.575972"
-       y2="31.210939" />
-    <linearGradient
-       id="linearGradient3155-40">
-      <stop
-         id="stop2541"
-         offset="0"
-         style="stop-color:#181818;stop-opacity:1;" />
-      <stop
-         style="stop-color:#dbdbdb;stop-opacity:1;"
-         offset="0.13482948"
-         id="stop2543" />
-      <stop
-         id="stop2545"
-         offset="0.20224422"
-         style="stop-color:#a4a4a4;stop-opacity:1;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0.26965895"
-         id="stop2547" />
-      <stop
-         id="stop2549"
-         offset="0.44650277"
-         style="stop-color:#8d8d8d;stop-opacity:1;" />
-      <stop
-         style="stop-color:#959595;stop-opacity:1;"
-         offset="0.57114136"
-         id="stop2551" />
-      <stop
-         id="stop2553"
-         offset="0.72038066"
-         style="stop-color:#cecece;stop-opacity:1;" />
-      <stop
-         id="stop2555"
-         offset="1"
-         style="stop-color:#181818;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3240-279"
-       id="linearGradient8641"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.867764,0.6930272)"
-       x1="30.037716"
-       y1="24.989594"
-       x2="30.037716"
-       y2="30.000141" />
-    <linearGradient
-       id="linearGradient3240-279">
-      <stop
-         style="stop-color:#565656;stop-opacity:1;"
-         offset="0"
-         id="stop2559" />
-      <stop
-         id="stop2561"
-         offset="0.5"
-         style="stop-color:#9a9a9a;stop-opacity:1;" />
-      <stop
-         style="stop-color:#545454;stop-opacity:1;"
-         offset="1"
-         id="stop2563" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3223-789"
-       id="linearGradient8643"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.983472,0.8092126)"
-       x1="30.037716"
-       y1="24.989594"
-       x2="30.037716"
-       y2="30.000141" />
-    <linearGradient
-       id="linearGradient3223-789">
-      <stop
-         id="stop2567"
-         offset="0"
-         style="stop-color:#b1b1b1;stop-opacity:1;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0.5"
-         id="stop2569" />
-      <stop
-         id="stop2571"
-         offset="1"
-         style="stop-color:#8f8f8f;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3240-686"
-       id="linearGradient8645"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.465684,0.2892868)"
-       x1="30.037716"
-       y1="24.989594"
-       x2="30.037716"
-       y2="30.000141" />
-    <linearGradient
-       id="linearGradient3240-686">
-      <stop
-         style="stop-color:#565656;stop-opacity:1;"
-         offset="0"
-         id="stop2575" />
-      <stop
-         id="stop2577"
-         offset="0.5"
-         style="stop-color:#9a9a9a;stop-opacity:1;" />
-      <stop
-         style="stop-color:#545454;stop-opacity:1;"
-         offset="1"
-         id="stop2579" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3223-768"
-       id="linearGradient8647"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.581392,0.4054707)"
-       x1="30.037716"
-       y1="24.989594"
-       x2="30.037716"
-       y2="30.000141" />
-    <linearGradient
-       id="linearGradient3223-768">
-      <stop
-         id="stop2583"
-         offset="0"
-         style="stop-color:#b1b1b1;stop-opacity:1;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0.5"
-         id="stop2585" />
-      <stop
-         id="stop2587"
-         offset="1"
-         style="stop-color:#8f8f8f;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3240-907"
-       id="linearGradient8649"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.061661,-0.1164056)"
-       x1="30.037716"
-       y1="24.989594"
-       x2="30.037716"
-       y2="30.000141" />
-    <linearGradient
-       id="linearGradient3240-907">
-      <stop
-         style="stop-color:#565656;stop-opacity:1;"
-         offset="0"
-         id="stop2591" />
-      <stop
-         id="stop2593"
-         offset="0.5"
-         style="stop-color:#9a9a9a;stop-opacity:1;" />
-      <stop
-         style="stop-color:#545454;stop-opacity:1;"
-         offset="1"
-         id="stop2595" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3223-699"
-       id="linearGradient8651"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.177369,-2.1969969e-4)"
-       x1="30.037716"
-       y1="24.989594"
-       x2="30.037716"
-       y2="30.000141" />
-    <linearGradient
-       id="linearGradient3223-699">
-      <stop
-         id="stop2599"
-         offset="0"
-         style="stop-color:#b1b1b1;stop-opacity:1;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0.5"
-         id="stop2601" />
-      <stop
-         id="stop2603"
-         offset="1"
-         style="stop-color:#8f8f8f;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3290-678"
-       id="linearGradient8653"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.602268,-17.636692,0.462492)"
-       x1="9"
-       y1="29.056757"
-       x2="9"
-       y2="26.02973" />
-    <linearGradient
-       id="linearGradient3290-678">
-      <stop
-         id="stop2607"
-         offset="0"
-         style="stop-color:#ece5a5;stop-opacity:1;" />
-      <stop
-         id="stop2609"
-         offset="1"
-         style="stop-color:#fcfbf2;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3191-577"
-       id="linearGradient8655"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.3763801,0.03615261,0.03669995,0.374874,-2.2182805,-1.1331002)"
-       x1="5.5178981"
-       y1="37.371799"
-       x2="9.5220556"
-       y2="41.391716" />
-    <linearGradient
-       id="linearGradient3191-577">
-      <stop
-         id="stop2613"
-         offset="0"
-         style="stop-color:#dbce48;stop-opacity:1;" />
-      <stop
-         id="stop2615"
-         offset="1"
-         style="stop-color:#c5b625;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-1-0"
-       id="linearGradient3934-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
-       x1="8.7094374"
-       y1="1.0035814"
-       x2="8.6826077"
-       y2="16.052532" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1-4-9" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4-6-0" />
-    </linearGradient>
-    <linearGradient
-       y2="16.052532"
-       x2="8.6826077"
-       y1="1.0035814"
-       x1="8.7094374"
-       gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4154-8"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1-4-9-8" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4-6-0-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9-0">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1-4-9-8-3" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4-6-0-4-8" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-3">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1-4-9-3" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4-6-0-6" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5"
-       id="linearGradient4326"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.6858824,0,0,0.68591053,-5.3691237,-18.974705)"
-       x1="14.501121"
-       y1="-1.4095211"
-       x2="14.152531"
-       y2="20.074369" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5"
-       id="linearGradient4328"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
-       x1="8.7094374"
-       y1="1.0035814"
-       x2="8.6826077"
-       y2="16.052532" />
-    <linearGradient
-       x1="-2.4040222"
-       y1="4.4573336"
-       x2="-2.4040222"
-       y2="18.967093"
-       id="linearGradient3878"
-       xlink:href="#linearGradient3587-6-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(13.927091,-3.4266134)" />
-    <linearGradient
-       id="linearGradient3587-6-5">
-      <stop
-         id="stop3589-9-2"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5"
-       id="linearGradient4357"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0344828,0,0,1.0344828,8.0707628,-14.513825)"
-       x1="0.86849999"
-       y1="13.895414"
-       x2="0.44923753"
-       y2="28.776533" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient4405"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55"
-       id="linearGradient4413-7"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-55">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-95" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-6" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2"
-       id="linearGradient4411-3"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       id="linearGradient3587-6-5-2">
-      <stop
-         id="stop3589-9-2-8"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4"
-       id="linearGradient4466-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.23426255,0,0,0.2859159,18.734419,60.359508)"
-       x1="-41.553459"
-       y1="2.2401412"
-       x2="-41.553459"
-       y2="54.703121" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4">
-      <stop
-         id="stop3589-9-2-8-7"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="54.703121"
-       x2="-41.553459"
-       y1="2.2401412"
-       x1="-41.553459"
-       gradientTransform="matrix(0.21864454,0,0,0.26685422,17.618755,60.402242)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4483-3"
-       xlink:href="#linearGradient3587-6-5-2-4-9"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-9">
-      <stop
-         id="stop3589-9-2-8-7-2"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-8"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55"
-       id="linearGradient4564"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5"
-       id="linearGradient4566"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(13.927091,16.573387)"
-       x1="-2.4040222"
-       y1="4.4573336"
-       x2="-2.4040222"
-       y2="18.967093" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2"
-       id="linearGradient4578"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55"
-       id="linearGradient4580"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3"
-       id="linearGradient4359-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99998838,0,0,0.99998838,29.038238,-21.358617)"
-       x1="8.7094374"
-       y1="1.0035814"
-       x2="8.6826077"
-       y2="16.052532" />
-    <linearGradient
-       id="linearGradient3587-6-5-3">
-      <stop
-         id="stop3589-9-2-6"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-5"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3"
-       id="linearGradient4361-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.6858824,0,0,0.68591053,25.66524,-19.333318)"
-       x1="8.7094374"
-       y1="1.0035814"
-       x2="8.6826077"
-       y2="16.052532" />
-    <linearGradient
-       id="linearGradient4597">
-      <stop
-         id="stop4599"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4601"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="16.052532"
-       x2="8.6826077"
-       y1="1.0035814"
-       x1="8.7094374"
-       gradientTransform="matrix(0.6858824,0,0,0.68591053,25.66524,-19.333318)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4610"
-       xlink:href="#linearGradient3587-6-5-3"
-       inkscape:collect="always" />
-    <linearGradient
-       x1="1.3333321"
-       y1="6.6666665"
-       x2="1.3333321"
-       y2="33.333332"
-       id="linearGradient2422"
-       xlink:href="#linearGradient3587-6-5-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4090909,0,0,0.375,7.4545459,0.5)" />
-    <linearGradient
-       id="linearGradient3587-6-5-5">
-      <stop
-         id="stop3589-9-2-4"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-3"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837"
-       id="linearGradient3189"
-       xlink:href="#linearGradient3587-6-5-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)" />
-    <linearGradient
-       id="linearGradient3587-6-5-8">
-      <stop
-         id="stop3589-9-2-67"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-2"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837"
-       id="linearGradient3203"
-       xlink:href="#linearGradient3587-6-5-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)" />
-    <linearGradient
-       id="linearGradient3120">
-      <stop
-         id="stop3122"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3124"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837"
-       id="linearGradient3207"
-       xlink:href="#linearGradient3587-6-5-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)" />
-    <linearGradient
-       id="linearGradient3127">
-      <stop
-         id="stop3129"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3131"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837"
-       id="linearGradient3211"
-       xlink:href="#linearGradient3587-6-5-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)" />
-    <linearGradient
-       id="linearGradient3134">
-      <stop
-         id="stop3136"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3138"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="11"
-       y1="6"
-       x2="11"
-       y2="17"
-       id="linearGradient2409"
-       xlink:href="#linearGradient3587-6-5-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2403101,0,0,0.8988764,10.387597,0.2247191)" />
-    <linearGradient
-       id="linearGradient3587-6-5-1">
-      <stop
-         id="stop3589-9-2-0"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-21"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="40.805084"
-       y1="5.6271191"
-       x2="40.805084"
-       y2="17.627119"
-       id="linearGradient3206"
-       xlink:href="#linearGradient3587-8-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-32.805085,-3.6271193)" />
-    <linearGradient
-       id="linearGradient3587-8-5">
-      <stop
-         id="stop3589-2-7"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-3-5"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="17.627119"
-       x2="40.805084"
-       y1="5.6271191"
-       x1="40.805084"
-       gradientTransform="translate(-32.805085,-3.6271193)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3180"
-       xlink:href="#linearGradient3587-8-5"
-       inkscape:collect="always" />
-    <linearGradient
-       x1="1.3333321"
-       y1="6.6666665"
-       x2="1.3333321"
-       y2="33.333332"
-       id="linearGradient2422-1"
-       xlink:href="#linearGradient3587-6-5-86"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2727273,0,0,0.375,9.636365,1.5)" />
-    <linearGradient
-       id="linearGradient3587-6-5-86">
-      <stop
-         id="stop3589-9-2-65"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-9"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="11"
-       y1="6"
-       x2="11"
-       y2="17"
-       id="linearGradient2427"
-       xlink:href="#linearGradient3587-6-5-86"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,1.5842703)" />
-    <linearGradient
-       id="linearGradient3207-3">
-      <stop
-         id="stop3209"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3211"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="11"
-       y1="6"
-       x2="11"
-       y2="17"
-       id="linearGradient2436"
-       xlink:href="#linearGradient3587-6-5-86"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,9.58427)" />
-    <linearGradient
-       id="linearGradient3214">
-      <stop
-         id="stop3216"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3218"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="11"
-       y1="6"
-       x2="11"
-       y2="17"
-       id="linearGradient2442"
-       xlink:href="#linearGradient3587-6-5-86"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,5.5842706)" />
-    <linearGradient
-       id="linearGradient3221">
-      <stop
-         id="stop3223"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3225"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="1.3333321"
-       y1="4.9755898"
-       x2="1.3333321"
-       y2="37.373981"
-       id="linearGradient2422-1-0"
-       xlink:href="#linearGradient3587-6-5-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.39871888,0,0,0.3091132,71.812715,15.470662)" />
-    <linearGradient
-       id="linearGradient3587-6-5-0">
-      <stop
-         id="stop3589-9-2-5"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-1"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="46.395508"
-       y1="12.707516"
-       x2="46.395508"
-       y2="38.409042"
-       id="linearGradient3795-2"
-       xlink:href="#linearGradient3587-6-5-3-5-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.4100229,0,0,0.5447147,28.02322,-5.9219706)" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-5-7">
-      <stop
-         id="stop3589-9-2-2-6-2"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-73-5-1"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3587-6-5-3-5">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-6" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-5" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-5"
-       id="linearGradient4872"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.4100229,0,0,0.5447147,19.329265,-26.729116)"
-       x1="100.77747"
-       y1="17.859186"
-       x2="100.77747"
-       y2="38.055252" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient4894"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient4900"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient4906"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient4912"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       id="linearGradient3587-6-5-8-6">
-      <stop
-         id="stop3589-9-2-67-3"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-2-3"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4935">
-      <stop
-         id="stop4937"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4939"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4942">
-      <stop
-         id="stop4944"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4946"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8-6"
-       id="linearGradient4912-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       id="linearGradient4949">
-      <stop
-         id="stop4951"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4953"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient5012"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient5015"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient5018"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient5021"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4"
-       id="linearGradient3335"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.21864454,0,0,0.26685422,18.618755,-19.597758)"
-       x1="-41.553459"
-       y1="2.2401412"
-       x2="-41.553459"
-       y2="54.703121" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4136"
-       id="linearGradient4134"
-       x1="9"
-       y1="0"
-       x2="9"
-       y2="15"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="pad" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4136"
-       id="linearGradient4150"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="pad"
-       x1="9"
-       y1="0"
-       x2="9"
-       y2="15" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4-6"
-       id="linearGradient3335-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2186487,0,0,0.26685422,76.619476,1.402242)"
-       x1="-41.553459"
-       y1="2.2401412"
-       x2="-41.755585"
-       y2="47.208389" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-6">
-      <stop
-         id="stop3589-9-2-8-7-8"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-4"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4-6-0"
-       id="linearGradient3335-7-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,0.402242)"
-       x1="-41.553459"
-       y1="2.2401412"
-       x2="-41.553459"
-       y2="54.703121" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-6-0">
-      <stop
-         id="stop3589-9-2-8-7-8-7"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-4-7"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4-6-4"
-       id="linearGradient3335-7-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,0.402242)"
-       x1="-41.553459"
-       y1="2.2401412"
-       x2="-41.553459"
-       y2="54.703121" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-6-4">
-      <stop
-         id="stop3589-9-2-8-7-8-2"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-4-2"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4-6-7"
-       id="linearGradient3335-7-3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,1.402242)"
-       x1="-41.553459"
-       y1="2.2401412"
-       x2="-41.755585"
-       y2="47.208389" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-6-7">
-      <stop
-         id="stop3589-9-2-8-7-8-4"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-4-5"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4-6-2"
-       id="linearGradient3335-7-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2186487,0,0,0.26685422,56.619476,1.4022422)"
-       x1="-39.421574"
-       y1="-5.2547116"
-       x2="-39.421574"
-       y2="47.208389" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-6-2">
-      <stop
-         id="stop3589-9-2-8-7-8-77"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-4-9"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4136-9"
-       id="linearGradient4150-0"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="pad"
-       x1="9"
-       y1="0"
-       x2="9"
-       y2="15" />
-    <linearGradient
-       id="linearGradient4136-9">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;"
-         id="stop4138-6" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop4140-3" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4136-9"
-       id="linearGradient3457"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="pad"
-       x1="9"
-       y1="0"
-       x2="9"
-       y2="15" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4-6-2-6"
-       id="linearGradient3335-7-1-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2186487,0,0,0.26685422,56.619476,1.4022422)"
-       x1="-39.421574"
-       y1="-5.2547116"
-       x2="-39.421574"
-       y2="47.208389" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-6-2-6">
-      <stop
-         id="stop3589-9-2-8-7-8-77-4"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-4-9-3"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <filter
-       inkscape:collect="always"
-       id="filter4061">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.09528843"
-         id="feGaussianBlur4063" />
-    </filter>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3785"
-       id="linearGradient4079"
-       x1="2.9539645"
-       y1="7.9553804"
-       x2="8.1727142"
-       y2="7.9553804"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <g
-     transform="matrix(0.78786264,0,0,0.78786264,-3.1483699,0.44173984)"
-     id="g3743-3"
-     style="opacity:0.6;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
-  <rect
-     style="color:#000000;fill:#ccc000;fill-opacity:0;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     id="rect3136"
-     width="163.31035"
-     height="97.986206"
-     x="-62.896553"
-     y="-32.993103" />
-  <g
-     transform="matrix(0.99998873,0,0,0.99998873,-3.996044,-20.001608)"
-     id="g3743-9-4"
-     style="opacity:0.6;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
-  <g
-     id="g4146">
-    <path
-       sodipodi:type="star"
-       style="fill:#999999;fill-opacity:1;filter:url(#filter4061)"
-       id="path3296"
-       sodipodi:sides="3"
-       sodipodi:cx="9"
-       sodipodi:cy="8"
-       sodipodi:r1="4.6360717"
-       sodipodi:r2="2.3180358"
-       sodipodi:arg1="1.0407812"
-       sodipodi:arg2="2.0879787"
-       inkscape:flatsided="false"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="M 11.343749,12 7.8538866,10.014873 4.3640238,8.0297465 7.8281252,6.0000001 11.292227,3.9702536 l 0.02576,4.0148731 z"
-       inkscape:transform-center-x="1.4833295"
-       inkscape:transform-center-y="-0.018522961"
-       transform="matrix(1.2942258,0,0,1.2453693,-0.64803223,-1.9444316)"
-       inkscape:export-filename="/Volumes/www/owncloud/owncloud/apps/impress/img/rect3288.png"
-       inkscape:export-xdpi="120.00002"
-       inkscape:export-ydpi="120.00002" />
-    <rect
-       style="fill:url(#linearGradient4079);fill-opacity:1.0"
-       id="rect3288"
-       width="5.21875"
-       height="11.999999"
-       x="2.9539645"
-       y="1.955381"
-       inkscape:export-xdpi="120.00002"
-       inkscape:export-ydpi="120.00002" />
-  </g>
-</svg>
diff --git a/apps/impress/img/impressbig.png b/apps/impress/img/impressbig.png
deleted file mode 100644
index 3c8d1632b3..0000000000
Binary files a/apps/impress/img/impressbig.png and /dev/null differ
diff --git a/apps/impress/img/impressbig.svg b/apps/impress/img/impressbig.svg
deleted file mode 100755
index a4140e4ae1..0000000000
--- a/apps/impress/img/impressbig.svg
+++ /dev/null
@@ -1,1730 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.0"
-   width="16"
-   height="16"
-   id="svg11300"
-   inkscape:version="0.48.2 r9819"
-   sodipodi:docname="impressbig.svg"
-   inkscape:export-filename="/Users/karlitschek/Desktop/impress.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <metadata
-     id="metadata26">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#cccccc"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1646"
-     inkscape:window-height="1184"
-     id="namedview24"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:zoom="45.254835"
-     inkscape:cx="8.0044836"
-     inkscape:cy="9.2830031"
-     inkscape:window-x="1497"
-     inkscape:window-y="26"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="g4146">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4330"
-       empspacing="5"
-       dotted="true"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <defs
-     id="defs3">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 8 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="16 : 8 : 1"
-       inkscape:persp3d-origin="8 : 5.3333333 : 1"
-       id="perspective4600" />
-    <linearGradient
-       id="linearGradient4136">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;"
-         id="stop4138" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop4140" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4303">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop4305" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop4307" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4297">
-      <stop
-         id="stop4299"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4301"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4115">
-      <stop
-         id="stop4117"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4119"
-         style="stop-color:#363636;stop-opacity:0.698"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3785">
-      <stop
-         id="stop3787"
-         style="stop-color:#505050;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3789"
-         style="stop-color:#878787;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6954">
-      <stop
-         id="stop6960"
-         style="stop-color:#f5f5f5;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop6962"
-         style="stop-color:#d2d2d2;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3341">
-      <stop
-         id="stop3343"
-         style="stop-color:white;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3345"
-         style="stop-color:white;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="24.999998"
-       cy="28.659998"
-       r="16"
-       fx="24.999998"
-       fy="28.659998"
-       id="radialGradient2856"
-       xlink:href="#linearGradient6954"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.56186795,0,0,0.15787922,-6.1682604,5.3385209)" />
-    <linearGradient
-       x1="30"
-       y1="25.084745"
-       x2="30"
-       y2="45"
-       id="linearGradient2858"
-       xlink:href="#linearGradient3785"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.42808986,0,0,0.42296591,-2.823809,-3.2486024)" />
-    <radialGradient
-       cx="26.375898"
-       cy="12.31301"
-       r="8"
-       fx="26.375898"
-       fy="12.31301"
-       id="radialGradient2860"
-       xlink:href="#linearGradient6954"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.55250164,-0.0426402,0.04315608,0.50971914,-6.3026675,-1.9765067)" />
-    <linearGradient
-       x1="30"
-       y1="5"
-       x2="30"
-       y2="44.678879"
-       id="linearGradient2862"
-       xlink:href="#linearGradient3785"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33685737,0,0,0.32161283,-0.10572085,-0.29529973)" />
-    <linearGradient
-       x1="30"
-       y1="0.91818392"
-       x2="30"
-       y2="25.792814"
-       id="linearGradient2864"
-       xlink:href="#linearGradient3341"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33685737,0,0,0.32161283,-0.10572085,-0.29529973)" />
-    <linearGradient
-       x1="29.955881"
-       y1="21.86607"
-       x2="29.955881"
-       y2="43.144382"
-       id="linearGradient2866"
-       xlink:href="#linearGradient3341"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.42808986,0,0,0.42296591,-2.823809,-3.2486024)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient7308"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.54681372,0,0,0.39376081,3.7325729,-0.29182867)"
-       x1="34.992828"
-       y1="0.94087797"
-       x2="34.992828"
-       y2="33.955856" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient3796"
-       x1="8.3635759"
-       y1="15.028702"
-       x2="15.937561"
-       y2="11.00073"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient3798"
-       x1="6.9951797"
-       y1="4.7478018"
-       x2="13.00482"
-       y2="4.7478018"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient3815"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-5"
-       id="linearGradient3815-3"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-5">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-9" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-0" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-5"
-       id="linearGradient3831"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3833">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3835" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3837" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient3874"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2"
-       id="linearGradient3892-2"
-       x1="8.7094374"
-       y1="1.0035814"
-       x2="8.6826077"
-       y2="16.052532"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(0.96967712,0,0,0.96967712,0.26437941,-0.96950812)"
-       y2="16.052532"
-       x2="8.6826077"
-       y1="1.0035814"
-       x1="8.7094374"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3909"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient3984"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2-1">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1-4" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4-6" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(0.78786264,0,0,0.78786264,-1.5726929,-0.7389112)"
-       y2="16.052532"
-       x2="8.6826077"
-       y1="1.0035814"
-       x1="8.7094374"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3909-3"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-2"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2-2">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1-7" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4-5" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4115-9"
-       id="linearGradient4113-3"
-       x1="0.86849999"
-       y1="13.895414"
-       x2="0.44923753"
-       y2="28.776533"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient4115-9">
-      <stop
-         id="stop4117-5"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4119-6"
-         style="stop-color:#363636;stop-opacity:0.698"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3104"
-       id="linearGradient3815-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.23426255,0,0,0.2859159,18.734419,0.35950872)"
-       x1="-51.786404"
-       y1="50.786446"
-       x2="-51.786404"
-       y2="2.9062471" />
-    <linearGradient
-       id="linearGradient3104">
-      <stop
-         id="stop3106"
-         style="stop-color:#aaaaaa;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3108"
-         style="stop-color:#c8c8c8;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="13.138569"
-       cy="25.625349"
-       r="13.931416"
-       fx="13.138569"
-       fy="25.625349"
-       id="radialGradient2965"
-       xlink:href="#linearGradient3690-451"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0,0.92614711,-1.0546317,0,32.402583,-9.3345932)" />
-    <linearGradient
-       id="linearGradient3690-451">
-      <stop
-         id="stop2857"
-         style="stop-color:#e8e8e8;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop2859"
-         style="stop-color:#d8d8d8;stop-opacity:1"
-         offset="0.26238" />
-      <stop
-         id="stop2861"
-         style="stop-color:#c2c2c2;stop-opacity:1"
-         offset="0.66093999" />
-      <stop
-         id="stop2863"
-         style="stop-color:#a5a5a5;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="21.483376"
-       y1="36.255058"
-       x2="21.483376"
-       y2="9.5799999"
-       id="linearGradient2967"
-       xlink:href="#linearGradient3603-84"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762279)" />
-    <linearGradient
-       id="linearGradient3603-84">
-      <stop
-         id="stop2867"
-         style="stop-color:#707070;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop2869"
-         style="stop-color:#9e9e9e;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="11.566265"
-       y1="22.292103"
-       x2="15.214532"
-       y2="33.95525"
-       id="linearGradient3674-262"
-       xlink:href="#linearGradient8265-821-176-38-919-66-249-529"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4893617,0,0,0.4893617,1.7131795,22.728095)" />
-    <linearGradient
-       id="linearGradient8265-821-176-38-919-66-249-529">
-      <stop
-         id="stop2873"
-         style="stop-color:#ffffff;stop-opacity:0.27450982"
-         offset="0" />
-      <stop
-         id="stop2875"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="24.046366"
-       y1="11.673002"
-       x2="24.046366"
-       y2="34.713669"
-       id="linearGradient3677-116"
-       xlink:href="#linearGradient3642-81"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762276)" />
-    <linearGradient
-       id="linearGradient3642-81">
-      <stop
-         id="stop2879"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop2881"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="34.713669"
-       x2="24.046366"
-       y1="11.673002"
-       x1="24.046366"
-       gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762276)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3037"
-       xlink:href="#linearGradient3642-81"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3155-40"
-       id="linearGradient8639"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.415777,-0.4174938,0.518983,0.5146192,-15.747227,2.6503673)"
-       spreadMethod="pad"
-       x1="23.575972"
-       y1="25.356892"
-       x2="23.575972"
-       y2="31.210939" />
-    <linearGradient
-       id="linearGradient3155-40">
-      <stop
-         id="stop2541"
-         offset="0"
-         style="stop-color:#181818;stop-opacity:1;" />
-      <stop
-         style="stop-color:#dbdbdb;stop-opacity:1;"
-         offset="0.13482948"
-         id="stop2543" />
-      <stop
-         id="stop2545"
-         offset="0.20224422"
-         style="stop-color:#a4a4a4;stop-opacity:1;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0.26965895"
-         id="stop2547" />
-      <stop
-         id="stop2549"
-         offset="0.44650277"
-         style="stop-color:#8d8d8d;stop-opacity:1;" />
-      <stop
-         style="stop-color:#959595;stop-opacity:1;"
-         offset="0.57114136"
-         id="stop2551" />
-      <stop
-         id="stop2553"
-         offset="0.72038066"
-         style="stop-color:#cecece;stop-opacity:1;" />
-      <stop
-         id="stop2555"
-         offset="1"
-         style="stop-color:#181818;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3240-279"
-       id="linearGradient8641"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.867764,0.6930272)"
-       x1="30.037716"
-       y1="24.989594"
-       x2="30.037716"
-       y2="30.000141" />
-    <linearGradient
-       id="linearGradient3240-279">
-      <stop
-         style="stop-color:#565656;stop-opacity:1;"
-         offset="0"
-         id="stop2559" />
-      <stop
-         id="stop2561"
-         offset="0.5"
-         style="stop-color:#9a9a9a;stop-opacity:1;" />
-      <stop
-         style="stop-color:#545454;stop-opacity:1;"
-         offset="1"
-         id="stop2563" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3223-789"
-       id="linearGradient8643"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.983472,0.8092126)"
-       x1="30.037716"
-       y1="24.989594"
-       x2="30.037716"
-       y2="30.000141" />
-    <linearGradient
-       id="linearGradient3223-789">
-      <stop
-         id="stop2567"
-         offset="0"
-         style="stop-color:#b1b1b1;stop-opacity:1;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0.5"
-         id="stop2569" />
-      <stop
-         id="stop2571"
-         offset="1"
-         style="stop-color:#8f8f8f;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3240-686"
-       id="linearGradient8645"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.465684,0.2892868)"
-       x1="30.037716"
-       y1="24.989594"
-       x2="30.037716"
-       y2="30.000141" />
-    <linearGradient
-       id="linearGradient3240-686">
-      <stop
-         style="stop-color:#565656;stop-opacity:1;"
-         offset="0"
-         id="stop2575" />
-      <stop
-         id="stop2577"
-         offset="0.5"
-         style="stop-color:#9a9a9a;stop-opacity:1;" />
-      <stop
-         style="stop-color:#545454;stop-opacity:1;"
-         offset="1"
-         id="stop2579" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3223-768"
-       id="linearGradient8647"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.581392,0.4054707)"
-       x1="30.037716"
-       y1="24.989594"
-       x2="30.037716"
-       y2="30.000141" />
-    <linearGradient
-       id="linearGradient3223-768">
-      <stop
-         id="stop2583"
-         offset="0"
-         style="stop-color:#b1b1b1;stop-opacity:1;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0.5"
-         id="stop2585" />
-      <stop
-         id="stop2587"
-         offset="1"
-         style="stop-color:#8f8f8f;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3240-907"
-       id="linearGradient8649"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.061661,-0.1164056)"
-       x1="30.037716"
-       y1="24.989594"
-       x2="30.037716"
-       y2="30.000141" />
-    <linearGradient
-       id="linearGradient3240-907">
-      <stop
-         style="stop-color:#565656;stop-opacity:1;"
-         offset="0"
-         id="stop2591" />
-      <stop
-         id="stop2593"
-         offset="0.5"
-         style="stop-color:#9a9a9a;stop-opacity:1;" />
-      <stop
-         style="stop-color:#545454;stop-opacity:1;"
-         offset="1"
-         id="stop2595" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3223-699"
-       id="linearGradient8651"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.177369,-2.1969969e-4)"
-       x1="30.037716"
-       y1="24.989594"
-       x2="30.037716"
-       y2="30.000141" />
-    <linearGradient
-       id="linearGradient3223-699">
-      <stop
-         id="stop2599"
-         offset="0"
-         style="stop-color:#b1b1b1;stop-opacity:1;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0.5"
-         id="stop2601" />
-      <stop
-         id="stop2603"
-         offset="1"
-         style="stop-color:#8f8f8f;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3290-678"
-       id="linearGradient8653"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.602268,-17.636692,0.462492)"
-       x1="9"
-       y1="29.056757"
-       x2="9"
-       y2="26.02973" />
-    <linearGradient
-       id="linearGradient3290-678">
-      <stop
-         id="stop2607"
-         offset="0"
-         style="stop-color:#ece5a5;stop-opacity:1;" />
-      <stop
-         id="stop2609"
-         offset="1"
-         style="stop-color:#fcfbf2;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3191-577"
-       id="linearGradient8655"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.3763801,0.03615261,0.03669995,0.374874,-2.2182805,-1.1331002)"
-       x1="5.5178981"
-       y1="37.371799"
-       x2="9.5220556"
-       y2="41.391716" />
-    <linearGradient
-       id="linearGradient3191-577">
-      <stop
-         id="stop2613"
-         offset="0"
-         style="stop-color:#dbce48;stop-opacity:1;" />
-      <stop
-         id="stop2615"
-         offset="1"
-         style="stop-color:#c5b625;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-1-0"
-       id="linearGradient3934-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
-       x1="8.7094374"
-       y1="1.0035814"
-       x2="8.6826077"
-       y2="16.052532" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1-4-9" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4-6-0" />
-    </linearGradient>
-    <linearGradient
-       y2="16.052532"
-       x2="8.6826077"
-       y1="1.0035814"
-       x1="8.7094374"
-       gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4154-8"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1-4-9-8" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4-6-0-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9-0">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1-4-9-8-3" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4-6-0-4-8" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-3">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1-4-9-3" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4-6-0-6" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5"
-       id="linearGradient4326"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.6858824,0,0,0.68591053,-5.3691237,-18.974705)"
-       x1="14.501121"
-       y1="-1.4095211"
-       x2="14.152531"
-       y2="20.074369" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5"
-       id="linearGradient4328"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
-       x1="8.7094374"
-       y1="1.0035814"
-       x2="8.6826077"
-       y2="16.052532" />
-    <linearGradient
-       x1="-2.4040222"
-       y1="4.4573336"
-       x2="-2.4040222"
-       y2="18.967093"
-       id="linearGradient3878"
-       xlink:href="#linearGradient3587-6-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(13.927091,-3.4266134)" />
-    <linearGradient
-       id="linearGradient3587-6-5">
-      <stop
-         id="stop3589-9-2"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5"
-       id="linearGradient4357"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0344828,0,0,1.0344828,8.0707628,-14.513825)"
-       x1="0.86849999"
-       y1="13.895414"
-       x2="0.44923753"
-       y2="28.776533" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient4405"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55"
-       id="linearGradient4413-7"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-55">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-95" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-6" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2"
-       id="linearGradient4411-3"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       id="linearGradient3587-6-5-2">
-      <stop
-         id="stop3589-9-2-8"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4"
-       id="linearGradient4466-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.23426255,0,0,0.2859159,18.734419,60.359508)"
-       x1="-41.553459"
-       y1="2.2401412"
-       x2="-41.553459"
-       y2="54.703121" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4">
-      <stop
-         id="stop3589-9-2-8-7"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="54.703121"
-       x2="-41.553459"
-       y1="2.2401412"
-       x1="-41.553459"
-       gradientTransform="matrix(0.21864454,0,0,0.26685422,17.618755,60.402242)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4483-3"
-       xlink:href="#linearGradient3587-6-5-2-4-9"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-9">
-      <stop
-         id="stop3589-9-2-8-7-2"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-8"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55"
-       id="linearGradient4564"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5"
-       id="linearGradient4566"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(13.927091,16.573387)"
-       x1="-2.4040222"
-       y1="4.4573336"
-       x2="-2.4040222"
-       y2="18.967093" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2"
-       id="linearGradient4578"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55"
-       id="linearGradient4580"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3"
-       id="linearGradient4359-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99998838,0,0,0.99998838,29.038238,-21.358617)"
-       x1="8.7094374"
-       y1="1.0035814"
-       x2="8.6826077"
-       y2="16.052532" />
-    <linearGradient
-       id="linearGradient3587-6-5-3">
-      <stop
-         id="stop3589-9-2-6"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-5"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3"
-       id="linearGradient4361-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.6858824,0,0,0.68591053,25.66524,-19.333318)"
-       x1="8.7094374"
-       y1="1.0035814"
-       x2="8.6826077"
-       y2="16.052532" />
-    <linearGradient
-       id="linearGradient4597">
-      <stop
-         id="stop4599"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4601"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="16.052532"
-       x2="8.6826077"
-       y1="1.0035814"
-       x1="8.7094374"
-       gradientTransform="matrix(0.6858824,0,0,0.68591053,25.66524,-19.333318)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4610"
-       xlink:href="#linearGradient3587-6-5-3"
-       inkscape:collect="always" />
-    <linearGradient
-       x1="1.3333321"
-       y1="6.6666665"
-       x2="1.3333321"
-       y2="33.333332"
-       id="linearGradient2422"
-       xlink:href="#linearGradient3587-6-5-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4090909,0,0,0.375,7.4545459,0.5)" />
-    <linearGradient
-       id="linearGradient3587-6-5-5">
-      <stop
-         id="stop3589-9-2-4"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-3"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837"
-       id="linearGradient3189"
-       xlink:href="#linearGradient3587-6-5-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)" />
-    <linearGradient
-       id="linearGradient3587-6-5-8">
-      <stop
-         id="stop3589-9-2-67"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-2"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837"
-       id="linearGradient3203"
-       xlink:href="#linearGradient3587-6-5-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)" />
-    <linearGradient
-       id="linearGradient3120">
-      <stop
-         id="stop3122"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3124"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837"
-       id="linearGradient3207"
-       xlink:href="#linearGradient3587-6-5-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)" />
-    <linearGradient
-       id="linearGradient3127">
-      <stop
-         id="stop3129"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3131"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837"
-       id="linearGradient3211"
-       xlink:href="#linearGradient3587-6-5-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)" />
-    <linearGradient
-       id="linearGradient3134">
-      <stop
-         id="stop3136"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3138"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="11"
-       y1="6"
-       x2="11"
-       y2="17"
-       id="linearGradient2409"
-       xlink:href="#linearGradient3587-6-5-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2403101,0,0,0.8988764,10.387597,0.2247191)" />
-    <linearGradient
-       id="linearGradient3587-6-5-1">
-      <stop
-         id="stop3589-9-2-0"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-21"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="40.805084"
-       y1="5.6271191"
-       x2="40.805084"
-       y2="17.627119"
-       id="linearGradient3206"
-       xlink:href="#linearGradient3587-8-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-32.805085,-3.6271193)" />
-    <linearGradient
-       id="linearGradient3587-8-5">
-      <stop
-         id="stop3589-2-7"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-3-5"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="17.627119"
-       x2="40.805084"
-       y1="5.6271191"
-       x1="40.805084"
-       gradientTransform="translate(-32.805085,-3.6271193)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3180"
-       xlink:href="#linearGradient3587-8-5"
-       inkscape:collect="always" />
-    <linearGradient
-       x1="1.3333321"
-       y1="6.6666665"
-       x2="1.3333321"
-       y2="33.333332"
-       id="linearGradient2422-1"
-       xlink:href="#linearGradient3587-6-5-86"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2727273,0,0,0.375,9.636365,1.5)" />
-    <linearGradient
-       id="linearGradient3587-6-5-86">
-      <stop
-         id="stop3589-9-2-65"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-9"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="11"
-       y1="6"
-       x2="11"
-       y2="17"
-       id="linearGradient2427"
-       xlink:href="#linearGradient3587-6-5-86"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,1.5842703)" />
-    <linearGradient
-       id="linearGradient3207-3">
-      <stop
-         id="stop3209"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3211"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="11"
-       y1="6"
-       x2="11"
-       y2="17"
-       id="linearGradient2436"
-       xlink:href="#linearGradient3587-6-5-86"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,9.58427)" />
-    <linearGradient
-       id="linearGradient3214">
-      <stop
-         id="stop3216"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3218"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="11"
-       y1="6"
-       x2="11"
-       y2="17"
-       id="linearGradient2442"
-       xlink:href="#linearGradient3587-6-5-86"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,5.5842706)" />
-    <linearGradient
-       id="linearGradient3221">
-      <stop
-         id="stop3223"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3225"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="1.3333321"
-       y1="4.9755898"
-       x2="1.3333321"
-       y2="37.373981"
-       id="linearGradient2422-1-0"
-       xlink:href="#linearGradient3587-6-5-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.39871888,0,0,0.3091132,71.812715,15.470662)" />
-    <linearGradient
-       id="linearGradient3587-6-5-0">
-      <stop
-         id="stop3589-9-2-5"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-1"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="46.395508"
-       y1="12.707516"
-       x2="46.395508"
-       y2="38.409042"
-       id="linearGradient3795-2"
-       xlink:href="#linearGradient3587-6-5-3-5-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.4100229,0,0,0.5447147,28.02322,-5.9219706)" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-5-7">
-      <stop
-         id="stop3589-9-2-2-6-2"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-73-5-1"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3587-6-5-3-5">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-6" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-5" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-5"
-       id="linearGradient4872"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.4100229,0,0,0.5447147,19.329265,-26.729116)"
-       x1="100.77747"
-       y1="17.859186"
-       x2="100.77747"
-       y2="38.055252" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient4894"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient4900"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient4906"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient4912"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       id="linearGradient3587-6-5-8-6">
-      <stop
-         id="stop3589-9-2-67-3"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-2-3"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4935">
-      <stop
-         id="stop4937"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4939"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4942">
-      <stop
-         id="stop4944"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4946"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8-6"
-       id="linearGradient4912-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       id="linearGradient4949">
-      <stop
-         id="stop4951"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4953"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient5012"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient5015"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient5018"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient5021"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4"
-       id="linearGradient3335"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.21864454,0,0,0.26685422,18.618755,-19.597758)"
-       x1="-41.553459"
-       y1="2.2401412"
-       x2="-41.553459"
-       y2="54.703121" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4136"
-       id="linearGradient4134"
-       x1="9"
-       y1="0"
-       x2="9"
-       y2="15"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="pad" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4136"
-       id="linearGradient4150"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="pad"
-       x1="9"
-       y1="0"
-       x2="9"
-       y2="15" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4-6"
-       id="linearGradient3335-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2186487,0,0,0.26685422,76.619476,1.402242)"
-       x1="-41.553459"
-       y1="2.2401412"
-       x2="-41.755585"
-       y2="47.208389" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-6">
-      <stop
-         id="stop3589-9-2-8-7-8"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-4"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4-6-0"
-       id="linearGradient3335-7-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,0.402242)"
-       x1="-41.553459"
-       y1="2.2401412"
-       x2="-41.553459"
-       y2="54.703121" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-6-0">
-      <stop
-         id="stop3589-9-2-8-7-8-7"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-4-7"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4-6-4"
-       id="linearGradient3335-7-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,0.402242)"
-       x1="-41.553459"
-       y1="2.2401412"
-       x2="-41.553459"
-       y2="54.703121" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-6-4">
-      <stop
-         id="stop3589-9-2-8-7-8-2"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-4-2"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4-6-7"
-       id="linearGradient3335-7-3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,1.402242)"
-       x1="-41.553459"
-       y1="2.2401412"
-       x2="-41.755585"
-       y2="47.208389" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-6-7">
-      <stop
-         id="stop3589-9-2-8-7-8-4"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-4-5"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4-6-2"
-       id="linearGradient3335-7-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2186487,0,0,0.26685422,56.619476,1.4022422)"
-       x1="-39.421574"
-       y1="-5.2547116"
-       x2="-39.421574"
-       y2="47.208389" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-6-2">
-      <stop
-         id="stop3589-9-2-8-7-8-77"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-4-9"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4136-9"
-       id="linearGradient4150-0"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="pad"
-       x1="9"
-       y1="0"
-       x2="9"
-       y2="15" />
-    <linearGradient
-       id="linearGradient4136-9">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;"
-         id="stop4138-6" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop4140-3" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4136-9"
-       id="linearGradient3457"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="pad"
-       x1="9"
-       y1="0"
-       x2="9"
-       y2="15" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4-6-2-6"
-       id="linearGradient3335-7-1-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2186487,0,0,0.26685422,56.619476,1.4022422)"
-       x1="-39.421574"
-       y1="-5.2547116"
-       x2="-39.421574"
-       y2="47.208389" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-6-2-6">
-      <stop
-         id="stop3589-9-2-8-7-8-77-4"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-4-9-3"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <filter
-       inkscape:collect="always"
-       id="filter4061">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.09528843"
-         id="feGaussianBlur4063" />
-    </filter>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3785"
-       id="linearGradient4079"
-       x1="2.9539645"
-       y1="7.9553804"
-       x2="8.1727142"
-       y2="7.9553804"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3191-577"
-       id="linearGradient4626"
-       x1="-1.7639756"
-       y1="2.3130295"
-       x2="2.824636"
-       y2="2.3130295"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0.70147562,-1.6260591)" />
-  </defs>
-  <g
-     transform="matrix(0.78786264,0,0,0.78786264,-3.1483699,0.44173984)"
-     id="g3743-3"
-     style="opacity:0.6;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
-  <rect
-     style="color:#000000;fill:#ccc000;fill-opacity:0;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     id="rect3136"
-     width="163.31035"
-     height="97.986206"
-     x="-62.896553"
-     y="-32.993103" />
-  <g
-     transform="matrix(0.99998873,0,0,0.99998873,-3.996044,-20.001608)"
-     id="g3743-9-4"
-     style="opacity:0.6;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
-  <g
-     id="g4146">
-    <rect
-       style="fill:#b3b3b3;fill-opacity:1;stroke:#b1b1b1;stroke-width:2.22857141;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       id="rect4632"
-       width="12"
-       height="12"
-       x="2"
-       y="2" />
-    <path
-       sodipodi:type="star"
-       style="fill:#4d4d4d;fill-opacity:1;stroke:#4e4e4e;stroke-width:0.84385167;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       id="path4634"
-       sodipodi:sides="3"
-       sodipodi:cx="6.3639607"
-       sodipodi:cy="-1.3683099"
-       sodipodi:r1="3.1380975"
-       sodipodi:r2="1.5690486"
-       sodipodi:arg1="-0.014083576"
-       sodipodi:arg2="1.033114"
-       inkscape:flatsided="false"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="M 9.5017471,-1.412504 7.1675439,-0.02065715 4.8333409,1.3711899 4.7950677,-1.3462128 4.7567943,-4.0636154 7.1292707,-2.7380596 z"
-       inkscape:transform-center-x="-0.86652303"
-       inkscape:transform-center-y="0.022845587"
-       transform="matrix(1.1322508,0,0,1.0338718,0.24163929,9.4603481)" />
-  </g>
-</svg>
diff --git a/apps/impress/index.php b/apps/impress/index.php
deleted file mode 100755
index c7213d8661..0000000000
--- a/apps/impress/index.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-/**
- * ownCloud - Impress App
- *
- * @author Frank Karlitschek
- * @copyright 2011 Frank Karlitschek karlitschek@kde.org
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either 
- * version 3 of the License, or any later version.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *  
- * You should have received a copy of the GNU Lesser General Public 
- * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
- * 
- */
-
-require_once('lib/impress.php');
-
-OCP\User::checkLoggedIn();
-OCP\App::setActiveNavigationEntry( 'impress_index' );
-
-
-
-$list=\OCA_Impress\Storage::getPresentations();
-
-$tmpl = new OCP\Template('impress', 'presentations', 'user');
-$tmpl->assign('list', $list);
-$tmpl->printPage();
-
-
diff --git a/apps/impress/js/impress.js b/apps/impress/js/impress.js
deleted file mode 100644
index 224a5e2e7e..0000000000
--- a/apps/impress/js/impress.js
+++ /dev/null
@@ -1,800 +0,0 @@
-/**
- * impress.js
- *
- * impress.js is a presentation tool based on the power of CSS3 transforms and transitions
- * in modern browsers and inspired by the idea behind prezi.com.
- *
- *
- * Copyright 2011-2012 Bartek Szopka (@bartaz)
- *
- * Released under the MIT and GPL Licenses.
- *
- * ------------------------------------------------
- *  author:  Bartek Szopka
- *  version: 0.5.3
- *  url:     http://bartaz.github.com/impress.js/
- *  source:  http://github.com/bartaz/impress.js/
- */
-
-/*jshint bitwise:true, curly:true, eqeqeq:true, forin:true, latedef:true, newcap:true,
-         noarg:true, noempty:true, undef:true, strict:true, browser:true */
-
-// You are one of those who like to know how thing work inside?
-// Let me show you the cogs that make impress.js run...
-(function ( document, window ) {
-    'use strict';
-    
-    // HELPER FUNCTIONS
-    
-    // `pfx` is a function that takes a standard CSS property name as a parameter
-    // and returns it's prefixed version valid for current browser it runs in.
-    // The code is heavily inspired by Modernizr http://www.modernizr.com/
-    var pfx = (function () {
-        
-        var style = document.createElement('dummy').style,
-            prefixes = 'Webkit Moz O ms Khtml'.split(' '),
-            memory = {};
-        
-        return function ( prop ) {
-            if ( typeof memory[ prop ] === "undefined" ) {
-                
-                var ucProp  = prop.charAt(0).toUpperCase() + prop.substr(1),
-                    props   = (prop + ' ' + prefixes.join(ucProp + ' ') + ucProp).split(' ');
-                
-                memory[ prop ] = null;
-                for ( var i in props ) {
-                    if ( style[ props[i] ] !== undefined ) {
-                        memory[ prop ] = props[i];
-                        break;
-                    }
-                }
-            
-            }
-            
-            return memory[ prop ];
-        };
-    
-    })();
-    
-    // `arraify` takes an array-like object and turns it into real Array
-    // to make all the Array.prototype goodness available.
-    var arrayify = function ( a ) {
-        return [].slice.call( a );
-    };
-    
-    // `css` function applies the styles given in `props` object to the element
-    // given as `el`. It runs all property names through `pfx` function to make
-    // sure proper prefixed version of the property is used.
-    var css = function ( el, props ) {
-        var key, pkey;
-        for ( key in props ) {
-            if ( props.hasOwnProperty(key) ) {
-                pkey = pfx(key);
-                if ( pkey !== null ) {
-                    el.style[pkey] = props[key];
-                }
-            }
-        }
-        return el;
-    };
-    
-    // `toNumber` takes a value given as `numeric` parameter and tries to turn
-    // it into a number. If it is not possible it returns 0 (or other value
-    // given as `fallback`).
-    var toNumber = function (numeric, fallback) {
-        return isNaN(numeric) ? (fallback || 0) : Number(numeric);
-    };
-    
-    // `byId` returns element with given `id` - you probably have guessed that ;)
-    var byId = function ( id ) {
-        return document.getElementById(id);
-    };
-    
-    // `$` returns first element for given CSS `selector` in the `context` of
-    // the given element or whole document.
-    var $ = function ( selector, context ) {
-        context = context || document;
-        return context.querySelector(selector);
-    };
-    
-    // `$$` return an array of elements for given CSS `selector` in the `context` of
-    // the given element or whole document.
-    var $$ = function ( selector, context ) {
-        context = context || document;
-        return arrayify( context.querySelectorAll(selector) );
-    };
-    
-    // `triggerEvent` builds a custom DOM event with given `eventName` and `detail` data
-    // and triggers it on element given as `el`.
-    var triggerEvent = function (el, eventName, detail) {
-        var event = document.createEvent("CustomEvent");
-        event.initCustomEvent(eventName, true, true, detail);
-        el.dispatchEvent(event);
-    };
-    
-    // `translate` builds a translate transform string for given data.
-    var translate = function ( t ) {
-        return " translate3d(" + t.x + "px," + t.y + "px," + t.z + "px) ";
-    };
-    
-    // `rotate` builds a rotate transform string for given data.
-    // By default the rotations are in X Y Z order that can be reverted by passing `true`
-    // as second parameter.
-    var rotate = function ( r, revert ) {
-        var rX = " rotateX(" + r.x + "deg) ",
-            rY = " rotateY(" + r.y + "deg) ",
-            rZ = " rotateZ(" + r.z + "deg) ";
-        
-        return revert ? rZ+rY+rX : rX+rY+rZ;
-    };
-    
-    // `scale` builds a scale transform string for given data.
-    var scale = function ( s ) {
-        return " scale(" + s + ") ";
-    };
-    
-    // `perspective` builds a perspective transform string for given data.
-    var perspective = function ( p ) {
-        return " perspective(" + p + "px) ";
-    };
-    
-    // `getElementFromHash` returns an element located by id from hash part of
-    // window location.
-    var getElementFromHash = function () {
-        // get id from url # by removing `#` or `#/` from the beginning,
-        // so both "fallback" `#slide-id` and "enhanced" `#/slide-id` will work
-        return byId( window.location.hash.replace(/^#\/?/,"") );
-    };
-    
-    // `computeWindowScale` counts the scale factor between window size and size
-    // defined for the presentation in the config.
-    var computeWindowScale = function ( config ) {
-        var hScale = window.innerHeight / config.height,
-            wScale = window.innerWidth / config.width,
-            scale = hScale > wScale ? wScale : hScale;
-        
-        if (config.maxScale && scale > config.maxScale) {
-            scale = config.maxScale;
-        }
-        
-        if (config.minScale && scale < config.minScale) {
-            scale = config.minScale;
-        }
-        
-        return scale;
-    };
-    
-    // CHECK SUPPORT
-    var body = document.body;
-    
-    var ua = navigator.userAgent.toLowerCase();
-    var impressSupported = 
-                          // browser should support CSS 3D transtorms 
-                           ( pfx("perspective") !== null ) &&
-                           
-                          // and `classList` and `dataset` APIs
-                           ( body.classList ) &&
-                           ( body.dataset ) &&
-                           
-                          // but some mobile devices need to be blacklisted,
-                          // because their CSS 3D support or hardware is not
-                          // good enough to run impress.js properly, sorry...
-                           ( ua.search(/(iphone)|(ipod)|(android)/) === -1 );
-    
-    if (!impressSupported) {
-        // we can't be sure that `classList` is supported
-        body.className += " impress-not-supported ";
-    } else {
-        body.classList.remove("impress-not-supported");
-        body.classList.add("impress-supported");
-    }
-    
-    // GLOBALS AND DEFAULTS
-    
-    // This is were the root elements of all impress.js instances will be kept.
-    // Yes, this means you can have more than one instance on a page, but I'm not
-    // sure if it makes any sense in practice ;)
-    var roots = {};
-    
-    // some default config values.
-    var defaults = {
-        width: 1024,
-        height: 768,
-        maxScale: 1,
-        minScale: 0,
-        
-        perspective: 1000,
-        
-        transitionDuration: 1000
-    };
-    
-    // it's just an empty function ... and a useless comment.
-    var empty = function () { return false; };
-    
-    // IMPRESS.JS API
-    
-    // And that's where interesting things will start to happen.
-    // It's the core `impress` function that returns the impress.js API
-    // for a presentation based on the element with given id ('impress'
-    // by default).
-    var impress = window.impress = function ( rootId ) {
-        
-        // If impress.js is not supported by the browser return a dummy API
-        // it may not be a perfect solution but we return early and avoid
-        // running code that may use features not implemented in the browser.
-        if (!impressSupported) {
-            return {
-                init: empty,
-                goto: empty,
-                prev: empty,
-                next: empty
-            };
-        }
-        
-        rootId = rootId || "impress";
-        
-        // if given root is already initialized just return the API
-        if (roots["impress-root-" + rootId]) {
-            return roots["impress-root-" + rootId];
-        }
-        
-        // data of all presentation steps
-        var stepsData = {};
-        
-        // element of currently active step
-        var activeStep = null;
-        
-        // current state (position, rotation and scale) of the presentation
-        var currentState = null;
-        
-        // array of step elements
-        var steps = null;
-        
-        // configuration options
-        var config = null;
-        
-        // scale factor of the browser window
-        var windowScale = null;        
-        
-        // root presentation elements
-        var root = byId( rootId );
-        var canvas = document.createElement("div");
-        
-        var initialized = false;
-        
-        // STEP EVENTS
-        //
-        // There are currently two step events triggered by impress.js
-        // `impress:stepenter` is triggered when the step is shown on the 
-        // screen (the transition from the previous one is finished) and
-        // `impress:stepleave` is triggered when the step is left (the
-        // transition to next step just starts).
-        
-        // reference to last entered step
-        var lastEntered = null;
-        
-        // `onStepEnter` is called whenever the step element is entered
-        // but the event is triggered only if the step is different than
-        // last entered step.
-        var onStepEnter = function (step) {
-            if (lastEntered !== step) {
-                triggerEvent(step, "impress:stepenter");
-                lastEntered = step;
-            }
-        };
-        
-        // `onStepLeave` is called whenever the step element is left
-        // but the event is triggered only if the step is the same as
-        // last entered step.
-        var onStepLeave = function (step) {
-            if (lastEntered === step) {
-                triggerEvent(step, "impress:stepleave");
-                lastEntered = null;
-            }
-        };
-        
-        // `initStep` initializes given step element by reading data from its
-        // data attributes and setting correct styles.
-        var initStep = function ( el, idx ) {
-            var data = el.dataset,
-                step = {
-                    translate: {
-                        x: toNumber(data.x),
-                        y: toNumber(data.y),
-                        z: toNumber(data.z)
-                    },
-                    rotate: {
-                        x: toNumber(data.rotateX),
-                        y: toNumber(data.rotateY),
-                        z: toNumber(data.rotateZ || data.rotate)
-                    },
-                    scale: toNumber(data.scale, 1),
-                    el: el
-                };
-            
-            if ( !el.id ) {
-                el.id = "step-" + (idx + 1);
-            }
-            
-            stepsData["impress-" + el.id] = step;
-            
-            css(el, {
-                position: "absolute",
-                transform: "translate(-50%,-50%)" +
-                           translate(step.translate) +
-                           rotate(step.rotate) +
-                           scale(step.scale),
-                transformStyle: "preserve-3d"
-            });
-        };
-        
-        // `init` API function that initializes (and runs) the presentation.
-        var init = function () {
-            if (initialized) { return; }
-            
-            // First we set up the viewport for mobile devices.
-            // For some reason iPad goes nuts when it is not done properly.
-            var meta = $("meta[name='viewport']") || document.createElement("meta");
-            meta.content = "width=device-width, minimum-scale=1, maximum-scale=1, user-scalable=no";
-            if (meta.parentNode !== document.head) {
-                meta.name = 'viewport';
-                document.head.appendChild(meta);
-            }
-            
-            // initialize configuration object
-            var rootData = root.dataset;
-            config = {
-                width: toNumber( rootData.width, defaults.width ),
-                height: toNumber( rootData.height, defaults.height ),
-                maxScale: toNumber( rootData.maxScale, defaults.maxScale ),
-                minScale: toNumber( rootData.minScale, defaults.minScale ),                
-                perspective: toNumber( rootData.perspective, defaults.perspective ),
-                transitionDuration: toNumber( rootData.transitionDuration, defaults.transitionDuration )
-            };
-            
-            windowScale = computeWindowScale( config );
-            
-            // wrap steps with "canvas" element
-            arrayify( root.childNodes ).forEach(function ( el ) {
-                canvas.appendChild( el );
-            });
-            root.appendChild(canvas);
-            
-            // set initial styles
-            document.documentElement.style.height = "100%";
-            
-            css(body, {
-                height: "100%",
-                overflow: "hidden"
-            });
-            
-            var rootStyles = {
-                position: "absolute",
-                transformOrigin: "top left",
-                transition: "all 0s ease-in-out",
-                transformStyle: "preserve-3d"
-            };
-            
-            css(root, rootStyles);
-            css(root, {
-                top: "50%",
-                left: "50%",
-                transform: perspective( config.perspective/windowScale ) + scale( windowScale )
-            });
-            css(canvas, rootStyles);
-            
-            body.classList.remove("impress-disabled");
-            body.classList.add("impress-enabled");
-            
-            // get and init steps
-            steps = $$(".step", root);
-            steps.forEach( initStep );
-            
-            // set a default initial state of the canvas
-            currentState = {
-                translate: { x: 0, y: 0, z: 0 },
-                rotate:    { x: 0, y: 0, z: 0 },
-                scale:     1
-            };
-            
-            initialized = true;
-            
-            triggerEvent(root, "impress:init", { api: roots[ "impress-root-" + rootId ] });
-        };
-        
-        // `getStep` is a helper function that returns a step element defined by parameter.
-        // If a number is given, step with index given by the number is returned, if a string
-        // is given step element with such id is returned, if DOM element is given it is returned
-        // if it is a correct step element.
-        var getStep = function ( step ) {
-            if (typeof step === "number") {
-                step = step < 0 ? steps[ steps.length + step] : steps[ step ];
-            } else if (typeof step === "string") {
-                step = byId(step);
-            }
-            return (step && step.id && stepsData["impress-" + step.id]) ? step : null;
-        };
-        
-        // used to reset timeout for `impress:stepenter` event
-        var stepEnterTimeout = null;
-        
-        // `goto` API function that moves to step given with `el` parameter (by index, id or element),
-        // with a transition `duration` optionally given as second parameter.
-        var goto = function ( el, duration ) {
-            
-            if ( !initialized || !(el = getStep(el)) ) {
-                // presentation not initialized or given element is not a step
-                return false;
-            }
-            
-            // Sometimes it's possible to trigger focus on first link with some keyboard action.
-            // Browser in such a case tries to scroll the page to make this element visible
-            // (even that body overflow is set to hidden) and it breaks our careful positioning.
-            //
-            // So, as a lousy (and lazy) workaround we will make the page scroll back to the top
-            // whenever slide is selected
-            //
-            // If you are reading this and know any better way to handle it, I'll be glad to hear about it!
-            window.scrollTo(0, 0);
-            
-            var step = stepsData["impress-" + el.id];
-            
-            if ( activeStep ) {
-                activeStep.classList.remove("active");
-                body.classList.remove("impress-on-" + activeStep.id);
-            }
-            el.classList.add("active");
-            
-            body.classList.add("impress-on-" + el.id);
-            
-            // compute target state of the canvas based on given step
-            var target = {
-                rotate: {
-                    x: -step.rotate.x,
-                    y: -step.rotate.y,
-                    z: -step.rotate.z
-                },
-                translate: {
-                    x: -step.translate.x,
-                    y: -step.translate.y,
-                    z: -step.translate.z
-                },
-                scale: 1 / step.scale
-            };
-            
-            // Check if the transition is zooming in or not.
-            //
-            // This information is used to alter the transition style:
-            // when we are zooming in - we start with move and rotate transition
-            // and the scaling is delayed, but when we are zooming out we start
-            // with scaling down and move and rotation are delayed.
-            var zoomin = target.scale >= currentState.scale;
-            
-            duration = toNumber(duration, config.transitionDuration);
-            var delay = (duration / 2);
-            
-            // if the same step is re-selected, force computing window scaling,
-            // because it is likely to be caused by window resize
-            if (el === activeStep) {
-                windowScale = computeWindowScale(config);
-            }
-            
-            var targetScale = target.scale * windowScale;
-            
-            // trigger leave of currently active element (if it's not the same step again)
-            if (activeStep && activeStep !== el) {
-                onStepLeave(activeStep);
-            }
-            
-            // Now we alter transforms of `root` and `canvas` to trigger transitions.
-            //
-            // And here is why there are two elements: `root` and `canvas` - they are
-            // being animated separately:
-            // `root` is used for scaling and `canvas` for translate and rotations.
-            // Transitions on them are triggered with different delays (to make
-            // visually nice and 'natural' looking transitions), so we need to know
-            // that both of them are finished.
-            css(root, {
-                // to keep the perspective look similar for different scales
-                // we need to 'scale' the perspective, too
-                transform: perspective( config.perspective / targetScale ) + scale( targetScale ),
-                transitionDuration: duration + "ms",
-                transitionDelay: (zoomin ? delay : 0) + "ms"
-            });
-            
-            css(canvas, {
-                transform: rotate(target.rotate, true) + translate(target.translate),
-                transitionDuration: duration + "ms",
-                transitionDelay: (zoomin ? 0 : delay) + "ms"
-            });
-            
-            // Here is a tricky part...
-            //
-            // If there is no change in scale or no change in rotation and translation, it means there was actually
-            // no delay - because there was no transition on `root` or `canvas` elements.
-            // We want to trigger `impress:stepenter` event in the correct moment, so here we compare the current
-            // and target values to check if delay should be taken into account.
-            //
-            // I know that this `if` statement looks scary, but it's pretty simple when you know what is going on
-            // - it's simply comparing all the values.
-            if ( currentState.scale === target.scale ||
-                (currentState.rotate.x === target.rotate.x && currentState.rotate.y === target.rotate.y &&
-                 currentState.rotate.z === target.rotate.z && currentState.translate.x === target.translate.x &&
-                 currentState.translate.y === target.translate.y && currentState.translate.z === target.translate.z) ) {
-                delay = 0;
-            }
-            
-            // store current state
-            currentState = target;
-            activeStep = el;
-            
-            // And here is where we trigger `impress:stepenter` event.
-            // We simply set up a timeout to fire it taking transition duration (and possible delay) into account.
-            //
-            // I really wanted to make it in more elegant way. The `transitionend` event seemed to be the best way
-            // to do it, but the fact that I'm using transitions on two separate elements and that the `transitionend`
-            // event is only triggered when there was a transition (change in the values) caused some bugs and 
-            // made the code really complicated, cause I had to handle all the conditions separately. And it still
-            // needed a `setTimeout` fallback for the situations when there is no transition at all.
-            // So I decided that I'd rather make the code simpler than use shiny new `transitionend`.
-            //
-            // If you want learn something interesting and see how it was done with `transitionend` go back to
-            // version 0.5.2 of impress.js: http://github.com/bartaz/impress.js/blob/0.5.2/js/impress.js
-            window.clearTimeout(stepEnterTimeout);
-            stepEnterTimeout = window.setTimeout(function() {
-                onStepEnter(activeStep);
-            }, duration + delay);
-            
-            return el;
-        };
-        
-        // `prev` API function goes to previous step (in document order)
-        var prev = function () {
-            var prev = steps.indexOf( activeStep ) - 1;
-            prev = prev >= 0 ? steps[ prev ] : steps[ steps.length-1 ];
-            
-            return goto(prev);
-        };
-        
-        // `next` API function goes to next step (in document order)
-        var next = function () {
-            var next = steps.indexOf( activeStep ) + 1;
-            next = next < steps.length ? steps[ next ] : steps[ 0 ];
-            
-            return goto(next);
-        };
-        
-        // Adding some useful classes to step elements.
-        //
-        // All the steps that have not been shown yet are given `future` class.
-        // When the step is entered the `future` class is removed and the `present`
-        // class is given. When the step is left `present` class is replaced with
-        // `past` class.
-        //
-        // So every step element is always in one of three possible states:
-        // `future`, `present` and `past`.
-        //
-        // There classes can be used in CSS to style different types of steps.
-        // For example the `present` class can be used to trigger some custom
-        // animations when step is shown.
-        root.addEventListener("impress:init", function(){
-            // STEP CLASSES
-            steps.forEach(function (step) {
-                step.classList.add("future");
-            });
-            
-            root.addEventListener("impress:stepenter", function (event) {
-                event.target.classList.remove("past");
-                event.target.classList.remove("future");
-                event.target.classList.add("present");
-            }, false);
-            
-            root.addEventListener("impress:stepleave", function (event) {
-                event.target.classList.remove("present");
-                event.target.classList.add("past");
-            }, false);
-            
-        }, false);
-        
-        // Adding hash change support.
-        root.addEventListener("impress:init", function(){
-            
-            // last hash detected
-            var lastHash = "";
-            
-            // `#/step-id` is used instead of `#step-id` to prevent default browser
-            // scrolling to element in hash.
-            //
-            // And it has to be set after animation finishes, because in Chrome it
-            // makes transtion laggy.
-            // BUG: http://code.google.com/p/chromium/issues/detail?id=62820
-            root.addEventListener("impress:stepenter", function (event) {
-                window.location.hash = lastHash = "#/" + event.target.id;
-            }, false);
-            
-            window.addEventListener("hashchange", function () {
-                // When the step is entered hash in the location is updated
-                // (just few lines above from here), so the hash change is 
-                // triggered and we would call `goto` again on the same element.
-                //
-                // To avoid this we store last entered hash and compare.
-                if (window.location.hash !== lastHash) {
-                    goto( getElementFromHash() );
-                }
-            }, false);
-            
-            // START 
-            // by selecting step defined in url or first step of the presentation
-            goto(getElementFromHash() || steps[0], 0);
-        }, false);
-        
-        body.classList.add("impress-disabled");
-        
-        // store and return API for given impress.js root element
-        return (roots[ "impress-root-" + rootId ] = {
-            init: init,
-            goto: goto,
-            next: next,
-            prev: prev
-        });
-
-    };
-    
-    // flag that can be used in JS to check if browser have passed the support test
-    impress.supported = impressSupported;
-    
-})(document, window);
-
-// NAVIGATION EVENTS
-
-// As you can see this part is separate from the impress.js core code.
-// It's because these navigation actions only need what impress.js provides with
-// its simple API.
-//
-// In future I think about moving it to make them optional, move to separate files
-// and treat more like a 'plugins'.
-(function ( document, window ) {
-    'use strict';
-    
-    // throttling function calls, by Remy Sharp
-    // http://remysharp.com/2010/07/21/throttling-function-calls/
-    var throttle = function (fn, delay) {
-        var timer = null;
-        return function () {
-            var context = this, args = arguments;
-            clearTimeout(timer);
-            timer = setTimeout(function () {
-                fn.apply(context, args);
-            }, delay);
-        };
-    };
-    
-    // wait for impress.js to be initialized
-    document.addEventListener("impress:init", function (event) {
-        // Getting API from event data.
-        // So you don't event need to know what is the id of the root element
-        // or anything. `impress:init` event data gives you everything you 
-        // need to control the presentation that was just initialized.
-        var api = event.detail.api;
-        
-        // KEYBOARD NAVIGATION HANDLERS
-        
-        // Prevent default keydown action when one of supported key is pressed.
-        document.addEventListener("keydown", function ( event ) {
-            if ( event.keyCode === 9 || ( event.keyCode >= 32 && event.keyCode <= 34 ) || (event.keyCode >= 37 && event.keyCode <= 40) ) {
-                event.preventDefault();
-            }
-        }, false);
-        
-        // Trigger impress action (next or prev) on keyup.
-        
-        // Supported keys are:
-        // [space] - quite common in presentation software to move forward
-        // [up] [right] / [down] [left] - again common and natural addition,
-        // [pgdown] / [pgup] - often triggered by remote controllers,
-        // [tab] - this one is quite controversial, but the reason it ended up on
-        //   this list is quite an interesting story... Remember that strange part
-        //   in the impress.js code where window is scrolled to 0,0 on every presentation
-        //   step, because sometimes browser scrolls viewport because of the focused element?
-        //   Well, the [tab] key by default navigates around focusable elements, so clicking
-        //   it very often caused scrolling to focused element and breaking impress.js
-        //   positioning. I didn't want to just prevent this default action, so I used [tab]
-        //   as another way to moving to next step... And yes, I know that for the sake of
-        //   consistency I should add [shift+tab] as opposite action...
-        document.addEventListener("keyup", function ( event ) {
-            if ( event.keyCode === 9 || ( event.keyCode >= 32 && event.keyCode <= 34 ) || (event.keyCode >= 37 && event.keyCode <= 40) ) {
-                switch( event.keyCode ) {
-                    case 33: // pg up
-                    case 37: // left
-                    case 38: // up
-                             api.prev();
-                             break;
-                    case 9:  // tab
-                    case 32: // space
-                    case 34: // pg down
-                    case 39: // right
-                    case 40: // down
-                             api.next();
-                             break;
-                }
-                
-                event.preventDefault();
-            }
-        }, false);
-        
-        // delegated handler for clicking on the links to presentation steps
-        document.addEventListener("click", function ( event ) {
-            // event delegation with "bubbling"
-            // check if event target (or any of its parents is a link)
-            var target = event.target;
-            while ( (target.tagName !== "A") &&
-                    (target !== document.documentElement) ) {
-                target = target.parentNode;
-            }
-            
-            if ( target.tagName === "A" ) {
-                var href = target.getAttribute("href");
-                
-                // if it's a link to presentation step, target this step
-                if ( href && href[0] === '#' ) {
-                    target = document.getElementById( href.slice(1) );
-                }
-            }
-            
-            if ( api.goto(target) ) {
-                event.stopImmediatePropagation();
-                event.preventDefault();
-            }
-        }, false);
-        
-        // delegated handler for clicking on step elements
-        document.addEventListener("click", function ( event ) {
-            var target = event.target;
-            // find closest step element that is not active
-            while ( !(target.classList.contains("step") && !target.classList.contains("active")) &&
-                    (target !== document.documentElement) ) {
-                target = target.parentNode;
-            }
-            
-            if ( api.goto(target) ) {
-                event.preventDefault();
-            }
-        }, false);
-        
-        // touch handler to detect taps on the left and right side of the screen
-        // based on awesome work of @hakimel: https://github.com/hakimel/reveal.js
-        document.addEventListener("touchstart", function ( event ) {
-            if (event.touches.length === 1) {
-                var x = event.touches[0].clientX,
-                    width = window.innerWidth * 0.3,
-                    result = null;
-                    
-                if ( x < width ) {
-                    result = api.prev();
-                } else if ( x > window.innerWidth - width ) {
-                    result = api.next();
-                }
-                
-                if (result) {
-                    event.preventDefault();
-                }
-            }
-        }, false);
-        
-        // rescale presentation when window is resized
-        window.addEventListener("resize", throttle(function () {
-            // force going to active step again, to trigger rescaling
-            api.goto( document.querySelector(".active"), 500 );
-        }, 250), false);
-        
-    }, false);
-        
-})(document, window);
-
-// THAT'S ALL FOLKS!
-//
-// Thanks for reading it all.
-// Or thanks for scrolling down and reading the last part.
-//
-// I've learnt a lot when building impress.js and I hope this code and comments
-// will help somebody learn at least some part of it.
diff --git a/apps/impress/lib/impress.php b/apps/impress/lib/impress.php
deleted file mode 100755
index ca33dbb232..0000000000
--- a/apps/impress/lib/impress.php
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-
-/**
- * ownCloud - Impress App
- *
- * @author Frank Karlitschek
- * @copyright 2012 Frank Karlitschek frank@owncloud.org
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either 
- * version 3 of the License, or any later version.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *  
- * You should have received a copy of the GNU Lesser General Public 
- * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
- * 
- */
-
-
-
-/*
-
-Todo:
-	enable fullscreen presentation
-
-*/
-
-namespace OCA_Impress;
-
-class Storage {
-
-	public static function getPresentations() {
-		$presentations=array();
-		$list=\OC_FileCache::searchByMime('text','impress' );
-		foreach($list as $l) {
-			$info=pathinfo($l);
-			$size=\OC_Filesystem::filesize($l);
-			$mtime=\OC_Filesystem::filemtime($l);
-
-			$entry=array('url'=>$l,'name'=>$info['filename'],'size'=>$size,'mtime'=>$mtime);
-			$presentations[]=$entry;
-		}
-
-	
-		return $presentations;
-	}
-	
-
-	public static function showHeader($title){
-		
-		echo('
-		
-		<!doctype html>
-		<html lang="en">
-		<head>	
-		<meta charset="utf-8" />
-	<meta name="viewport" content="width=1024" />
-	<title>'.$title.'</title>
-
-
-	<link href="http://fonts.googleapis.com/css?family=Open+Sans:regular,semibold,italic,italicsemibold|PT+Sans:400,700,400italic,700italic|PT+Serif:400,700,400italic,700italic" rel="stylesheet" />
-
-	<link href="'.\OCP\Util::linkToAbsolute('impress','css/player.css').'" rel="stylesheet" />
-    </head>
-
-<body class="impress-not-supported">
-	
-	
-	<div class="fallback-message">
-		<p>Your browser <b>does not support the features required</b> by impress.js, so you are presented with a simplified version of this presentation.</p>
-		<p>For the best experience please use the latest <b>Chrome</b>, <b>Safari</b> or <b>Firefox</b> browser.</p>
-	</div>
-	
-	
-	<div id="impress">
-		
-		
-
-		');
-			
-	}
-
-	public static function showFooter(){
-			
-		echo('
-		
-		<div class="hint">
-			<p>Make fullscreen and use a spacebar or arrow keys to navigate</p>
-		</div>
-		<script>
-		if ("ontouchstart" in document.documentElement) { 
-			document.querySelector(".hint").innerHTML = "<p>Tap on the left or right to navigate</p>";
-		}
-		</script>
-
-		<script src="'.\OCP\Util::linkToAbsolute('impress','js/impress.js').'"></script>
-		<script>impress().init();</script>
-		
-		<script>
-		
-
-			
-		</script>
-		
-		</body></html>
-		');
-				
-	}
-		
-
-}
-
-?>
diff --git a/apps/impress/player.php b/apps/impress/player.php
deleted file mode 100755
index 12497de54c..0000000000
--- a/apps/impress/player.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-/**
-* ownCloud - impress player
-*
-* @author Frank Karlitschek
-* @copyright 2012 Frank Karlitschek ink@owncloud.org
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either
-* version 3 of the License, or any later version.
-*
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-*
-* You should have received a copy of the GNU Affero General Public
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-*
-*/
-
-require_once('lib/impress.php');
-
-// Check if we are a user
-OCP\User::checkLoggedIn();
-
-$filename = strip_tags($_GET['file']);
-$title = strip_tags($_GET['name']);
-
-if(!OC_Filesystem::file_exists($filename)){
-	header("HTTP/1.0 404 Not Found");
-	$tmpl = new OCP\Template( '', '404', 'guest' );
-	$tmpl->assign('file',$filename);
-	$tmpl->printPage();
-	exit;
-}
-
-header('Content-Type: text/html',true);
-OCP\Response::disableCaching();
-header('Content-Length: '.OC_Filesystem::filesize($filename));
-
-@ob_end_clean();
-
-\OCA_Impress\Storage::showHeader($title);
-OC_Filesystem::readfile( $filename );
-\OCA_Impress\Storage::showFooter();
-
diff --git a/apps/impress/templates/documentation.php b/apps/impress/templates/documentation.php
deleted file mode 100755
index 1995bece25..0000000000
--- a/apps/impress/templates/documentation.php
+++ /dev/null
@@ -1,223 +0,0 @@
-
-
-<div id="documentation">
-
-<h1>Impress Documentation</h1>
-<br />
-
-
-<h2>What is Impress?</h2>
-Impress is an ownCloud application that can play presentation based on the amazing <a href="http://bartaz.github.com/impress.js">impress.js</a> library.
-<br /><br />
-
-<h2>How do I use it?</h2>
-You have to define your presentation by writing a HTML file manually. But there are great examples and it isn´t that difficult.
-Just put a HTML file with the file extension .impress into your ownCloud and it will show up here in the Impress app automatically.
-If you click on it it opens up in a new windows.
-<br /><br />
-
-<h2>How do I define the presentation?</h2>
-The best way to learn it is to look at the example presenation. We suggest that you copy it and place it into your ownCloud with the name demo.impress and play around with it. You can edit in ownCloud directly with the internal text editor and play it here in the Impress app.
-<br />
-
-<textarea class="examplecode">
-   <!--
-   		Each step of the presentation should be an element inside the `#impress` with a class name
-   		of `step`. These step elements are positioned, rotated and scaled by impress.js, and
-   		the 'camera' shows them on each step of the presentation.
-   
-   		Positioning information is passed through data attributes.
-   
-   		In the example below we only specify x and y position of the step element with `data-x="-1000"`
-   		and `data-y="-1500` attributes. This means that **the center** of the element (yes, the center)
-   		will be positioned in point x = -1000px and y = -1500px of the presentation 'canvas'.
-   
-   		It will not be rotated or scaled.
-   
-   	-->
-   	<div id="bored" class="step slide active present" data-x="-1000" data-y="-1500" style="position: absolute; -webkit-transform: translate(-50%, -50%) translate3d(-1000px, -1500px, 0px) rotateX(0deg) rotateY(0deg) rotateZ(0deg) scale(1); -webkit-transform-style: preserve-3d; ">
-   		<q>Aren't you just <b>bored</b> with all those slides-based presentations?</q>
-   	</div>
-   
-   	<!--
-   
-   		The `id` attribute of the step element is used to identify it in the URL, but it's optional.
-   		If it is not defined, it will get a default value of `step-N` where N is a number of slide.
-   
-   		So in the example below it'll be `step-2`.
-   
-   		The hash part of the url when this step is active will be `#/step-2`.
-   
-   		You can also use `#step-2` in a link, to point directly to this particular step.
-   
-   		Please note, that while `#/step-2` (with slash) would also work in a link it's not recommended.
-   		Using classic `id`-based links like `#step-2` makes these links usable also in fallback mode.
-   
-   	-->
-   	<div class="step slide future" data-x="0" data-y="-1500" id="step-2" style="position: absolute; -webkit-transform: translate(-50%, -50%) translate3d(0px, -1500px, 0px) rotateX(0deg) rotateY(0deg) rotateZ(0deg) scale(1); -webkit-transform-style: preserve-3d; ">
-   		<q>Don't you think that presentations given <strong>in modern browsers</strong> shouldn't <strong>copy the limits</strong> of 'classic' slide decks?</q>
-   	</div>
-   
-   	<div class="step slide future" data-x="1000" data-y="-1500" id="step-3" style="position: absolute; -webkit-transform: translate(-50%, -50%) translate3d(1000px, -1500px, 0px) rotateX(0deg) rotateY(0deg) rotateZ(0deg) scale(1); -webkit-transform-style: preserve-3d; ">
-   		<q>Would you like to <strong>impress your audience</strong> with <strong>stunning visualization</strong> of your talk?</q>
-   	</div>
-   
-   	<!--
-   
-   		This is an example of step element being scaled.
-   
-   		Again, we use a `data-` attribute, this time it's `data-scale="4"`, so it means that this
-   		element will be 4 times larger than the others.
-   		From presentation and transitions point of view it means, that it will have to be scaled
-   		down (4 times) to make it back to it's correct size.
-   
-   	-->
-   	<div id="title" class="step future" data-x="0" data-y="0" data-scale="4" style="position: absolute; -webkit-transform: translate(-50%, -50%) translate3d(0px, 0px, 0px) rotateX(0deg) rotateY(0deg) rotateZ(0deg) scale(4); -webkit-transform-style: preserve-3d; ">
-   		<span class="try">then you should try</span>
-   		<h1>impress.js<sup>*</sup></h1>
-   		<span class="footnote"><sup>*</sup> no rhyme intended</span>
-   	</div>
-   
-   	<!--
-   
-   		This element introduces rotation.
-   
-   		Notation shouldn't be a surprise. We use `data-rotate="90"` attribute, meaning that this
-   		element should be rotated by 90 degrees clockwise.
-   
-   	-->
-   	<div id="its" class="step future" data-x="850" data-y="3000" data-rotate="90" data-scale="5" style="position: absolute; -webkit-transform: translate(-50%, -50%) translate3d(850px, 3000px, 0px) rotateX(0deg) rotateY(0deg) rotateZ(90deg) scale(5); -webkit-transform-style: preserve-3d; ">
-   		<p>It's a <strong>presentation tool</strong> <br>
-   		inspired by the idea behind <a href="http://prezi.com/">prezi.com</a> <br>
-   		and based on the <strong>power of CSS3 transforms and transitions</strong> in modern browsers.</p>
-   	</div>
-   
-   	<div id="big" class="step future" data-x="3500" data-y="2100" data-rotate="180" data-scale="6" style="position: absolute; -webkit-transform: translate(-50%, -50%) translate3d(3500px, 2100px, 0px) rotateX(0deg) rotateY(0deg) rotateZ(180deg) scale(6); -webkit-transform-style: preserve-3d; ">
-   		<p>visualize your <b>big</b> <span class="thoughts">thoughts</span></p>
-   	</div>
-   
-   	<!--
-   
-   		And now it gets really exiting! We move into third dimension!
-   
-   		Along with `data-x` and `data-y`, you can define the position on third (Z) axis, with
-   		`data-z`. In the example below we use `data-z="-3000"` meaning that element should be
-   		positioned far away from us (by 3000px).
-   
-   	-->
-   	<div id="tiny" class="step future" data-x="2825" data-y="2325" data-z="-3000" data-rotate="300" data-scale="1" style="position: absolute; -webkit-transform: translate(-50%, -50%) translate3d(2825px, 2325px, -3000px) rotateX(0deg) rotateY(0deg) rotateZ(300deg) scale(1); -webkit-transform-style: preserve-3d; ">
-   		<p>and <b>tiny</b> ideas</p>
-   	</div>
-   
-   	<!--
-   
-   		This step here doesn't introduce anything new when it comes to data attributes, but you
-   		should notice in the demo that some words of this text are being animated.
-   		It's a very basic CSS transition that is applied to the elements when this step element is
-   		reached.
-   
-   		At the very beginning of the presentation all step elements are given the class of `future`.
-   		It means that they haven't been visited yet.
-   
-   		When the presentation moves to given step `future` is changed to `present` class name.
-   		That's how animation on this step works - text moves when the step has `present` class.
-   
-   		Finally when the step is left the `present` class is removed from the element and `past`
-   		class is added.
-   
-   		So basically every step element has one of three classes: `future`, `present` and `past`.
-   		Only one current step has the `present` class.
-   
-   	-->
-   	<div id="ing" class="step future" data-x="3500" data-y="-850" data-rotate="270" data-scale="6" style="position: absolute; -webkit-transform: translate(-50%, -50%) translate3d(3500px, -850px, 0px) rotateX(0deg) rotateY(0deg) rotateZ(270deg) scale(6); -webkit-transform-style: preserve-3d; ">
-   		<p>by <b class="positioning">positioning</b>, <b class="rotating">rotating</b> and <b class="scaling">scaling</b> them on an infinite canvas</p>
-   	</div>
-   
-   	<div id="imagination" class="step future" data-x="6700" data-y="-300" data-scale="6" style="position: absolute; -webkit-transform: translate(-50%, -50%) translate3d(6700px, -300px, 0px) rotateX(0deg) rotateY(0deg) rotateZ(0deg) scale(6); -webkit-transform-style: preserve-3d; ">
-   		<p>the only <b>limit</b> is your <b class="imagination">imagination</b></p>
-   	</div>
-   
-   	<div id="source" class="step future" data-x="6300" data-y="2000" data-rotate="20" data-scale="4" style="position: absolute; -webkit-transform: translate(-50%, -50%) translate3d(6300px, 2000px, 0px) rotateX(0deg) rotateY(0deg) rotateZ(20deg) scale(4); -webkit-transform-style: preserve-3d; ">
-   		<p>want to know more?</p>
-   		<q><a href="http://github.com/bartaz/impress.js">use the source</a>, Luke!</q>
-   	</div>
-   
-   	<div id="one-more-thing" class="step future" data-x="6000" data-y="4000" data-scale="2" style="position: absolute; -webkit-transform: translate(-50%, -50%) translate3d(6000px, 4000px, 0px) rotateX(0deg) rotateY(0deg) rotateZ(0deg) scale(2); -webkit-transform-style: preserve-3d; ">
-   		<p>one more thing...</p>
-   	</div>
-   
-   	<!--
-   
-   		And the last one shows full power and flexibility of impress.js.
-   
-   		You can not only position element in 3D, but also rotate it around any axis.
-   		So this one here will get rotated by -40 degrees (40 degrees anticlockwise) around X axis and
-   		10 degrees (clockwise) around Y axis.
-   
-   		You can of course rotate it around Z axis with `data-rotate-z` - it has exactly the same effect
-   		as `data-rotate` (these two are basically aliases).
-   
-   	-->
-   	<div id="its-in-3d" class="step future" data-x="6200" data-y="4300" data-z="-100" data-rotate-x="-40" data-rotate-y="10" data-scale="2" style="position: absolute; -webkit-transform: translate(-50%, -50%) translate3d(6200px, 4300px, -100px) rotateX(-40deg) rotateY(10deg) rotateZ(0deg) scale(2); -webkit-transform-style: preserve-3d; ">
-   		<p><span class="have">have</span> <span class="you">you</span> <span class="noticed">noticed</span> <span class="its">it's</span> <span class="in">in</span> <b>3D<sup>*</sup></b>?</p>
-   		<span class="footnote">* beat that, prezi ;)</span>
-   	</div>
-   
-   	<!--
-   
-   		So to make a summary of all the possible attributes used to position presentation steps, we have:
-   
-   		* `data-x`, `data-y`, `data-z` - they define the position of **the center** of step element on
-   			the canvas in pixels; their default value is 0;
-   		* `data-rotate-x`, `data-rotate-y`, 'data-rotate-z`, `data-rotate` - they define the rotation of
-   			the element around given axis in degrees; their default value is 0; `data-rotate` and `data-rotate-z`
-   			are exactly the same;
-   		* `data-scale` - defines the scale of step element; default value is 1
-   
-   		These values are used by impress.js in CSS transformation functions, so for more information consult
-   		CSS transfrom docs: https://developer.mozilla.org/en/CSS/transform
-   
-   	-->
-   	<div id="overview" class="step future" data-x="3000" data-y="1500" data-scale="10" style="position: absolute; -webkit-transform: translate(-50%, -50%) translate3d(3000px, 1500px, 0px) rotateX(0deg) rotateY(0deg) rotateZ(0deg) scale(10); -webkit-transform-style: preserve-3d; ">
-   	</div>
-   
-   </div></div>
-   
-   <!--
-   
-   	Hint is not related to impress.js in any way.
-   
-   	But it can show you how to use impress.js features in creative way.
-   
-   	When the presentation step is shown (selected) its element gets the class of "active" and the body element
-   	gets the class based on active step id `impress-on-ID` (where ID is the step's id)... It may not be
-   	so clear because of all these "ids" in previous sentence, so for example when the first step (the one with
-   	the id of `bored`) is active, body element gets a class of `impress-on-bored`.
-   
-   	This class is used by this hint below. Check CSS file to see how it's shown with delayed CSS animation when
-   	the first step of presentation is visible for a couple of seconds.
-   
-   	...
-   
-   	And when it comes to this piece of JavaScript below ... kids, don't do this at home ;)
-   	It's just a quick and dirty workaround to get different hint text for touch devices.
-   	In a real world it should be at least placed in separate JS file ... and the touch content should be
-   	probably just hidden somewhere in HTML - not hard-coded in the script.
-   
-   	Just sayin' ;)
-   
-   -->	
-</textarea>	
-
-
-<br /><br />
-
-
-
-<h2>Credits</h2>
-Many thanks to Bartek Szopka for creating the wonderful impress.js library and also the demo presentation who made this app possible.
-<br /><br />
-
-
-
-</div>
\ No newline at end of file
diff --git a/apps/impress/templates/presentations.php b/apps/impress/templates/presentations.php
deleted file mode 100755
index ab75802b35..0000000000
--- a/apps/impress/templates/presentations.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-
-
-// show toolbar
-echo('<div id="controls">	
-	<a href="'.\OCP\Util::linkToAbsolute('impress','documentation.php').'" class="button docu">'.$l->t('Documentation').'</a>
-	</div>
-');
-
-
-if(empty($_['list'])) {
-	
-    echo('<div id="emptyfolder">No Impress files are found in your ownCloud. Please upload a .impress file.</div>');
-			
-}else{
-
-	echo('<table class="impresslist" >');
-	foreach($_['list'] as $entry) {
-
-		echo('<tr><td width="1"><a target="_blank" href="'.\OCP\Util::linkToAbsolute('impress','player.php').'&file='.urlencode($entry['url']).'&name='.urlencode($entry['name']).'"><img align="left" src="'.\OCP\Util::linkToAbsolute('impress','img/impressbig.png').'"></a></td><td><a target="_blank" href="'.\OCP\Util::linkToAbsolute('impress','player.php').'&file='.urlencode($entry['url']).'&name='.urlencode($entry['name']).'">'.$entry['name'].'</a></td><td>'.\OCP\Util::formatDate($entry['mtime']).'</td><td>'.\OCP\Util::humanFileSize($entry['size']).'</td></tr>');
-
-	}
-	echo('</table>');
-	
-	
-	
-}
-
-
diff --git a/apps/media/ajax/api.php b/apps/media/ajax/api.php
deleted file mode 100644
index 7f5cdb22c1..0000000000
--- a/apps/media/ajax/api.php
+++ /dev/null
@@ -1,133 +0,0 @@
-<?php
-
-/**
-* ownCloud - media plugin
-*
-* @author Robin Appelman
-* @copyright 2010 Robin Appelman icewind1991@gmail.com
-* 
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either 
-* version 3 of the License, or any later version.
-* 
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-*  
-* You should have received a copy of the GNU Lesser General Public 
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-* 
-*/
-
-header('Content-type: text/html; charset=UTF-8') ;
-
-OCP\JSON::checkAppEnabled('media');
-
-error_reporting(E_ALL); //no script error reporting because of getID3
-
-$arguments=$_POST;
-
-if(!isset($_POST['action']) and isset($_GET['action'])){
-	$arguments=$_GET;
-}
-
-foreach($arguments as &$argument){
-	$argument=stripslashes($argument);
-}
-@ob_clean();
-if(!isset($arguments['artist'])){
-	$arguments['artist']=0;
-}
-if(!isset($arguments['album'])){
-	$arguments['album']=0;
-}
-if(!isset($arguments['search'])){
-	$arguments['search']='';
-}
-
-session_write_close();
-
-OC_MEDIA_COLLECTION::$uid=OCP\USER::getUser();
-if($arguments['action']){
-	switch($arguments['action']){
-		case 'delete':
-			$path=$arguments['path'];
-			OC_MEDIA_COLLECTION::deleteSongByPath($path);
-			$paths=explode(PATH_SEPARATOR,OCP\Config::getUserValue(OCP\USER::getUser(),'media','paths',''));
-			if(array_search($path,$paths)!==false){
-				unset($paths[array_search($path,$paths)]);
-				OCP\Config::setUserValue(OCP\USER::getUser(),'media','paths',implode(PATH_SEPARATOR,$paths));
-			}
-		case 'get_collection':
-			$data=array();
-			$data['artists']=OC_MEDIA_COLLECTION::getArtists();
-			$data['albums']=OC_MEDIA_COLLECTION::getAlbums();
-			$data['songs']=OC_MEDIA_COLLECTION::getSongs();
-			OCP\JSON::encodedPrint($data);
-			break;
-		case 'scan':
-			OCP\DB::beginTransaction();
-			set_time_limit(0); //recursive scan can take a while
-			$eventSource=new OC_EventSource();
-			OC_MEDIA_SCANNER::scanCollection($eventSource);
-			$eventSource->close();
-			OCP\DB::commit();
-			break;
-		case 'scanFile':
-			echo (OC_MEDIA_SCANNER::scanFile($arguments['path']))?'true':'false';
-			break;
-		case 'get_artists':
-			OCP\JSON::encodedPrint(OC_MEDIA_COLLECTION::getArtists($arguments['search']));
-			break;
-		case 'get_albums':
-			OCP\JSON::encodedPrint(OC_MEDIA_COLLECTION::getAlbums($arguments['artist'],$arguments['search']));
-			break;
-		case 'get_songs':
-			OCP\JSON::encodedPrint(OC_MEDIA_COLLECTION::getSongs($arguments['artist'],$arguments['album'],$arguments['search']));
-			break;
-		case 'get_path_info':
-			if(OC_Filesystem::file_exists($arguments['path'])){
-				$songId=OC_MEDIA_COLLECTION::getSongByPath($arguments['path']);
-				if($songId==0){
-					unset($_SESSION['collection']);
-					$songId= OC_MEDIA_SCANNER::scanFile($arguments['path']);
-				}
-				if($songId>0){
-					$song=OC_MEDIA_COLLECTION::getSong($songId);
-					$song['artist']=OC_MEDIA_COLLECTION::getArtistName($song['song_artist']);
-					$song['album']=OC_MEDIA_COLLECTION::getAlbumName($song['song_album']);
-					OCP\JSON::encodedPrint($song);
-				}
-			}
-			break;
-		case 'play':
-			@ob_end_clean();
-			
-			$ftype=OC_Filesystem::getMimeType( $arguments['path'] );
-			if(substr($ftype,0,5)!='audio' and $ftype!='application/ogg'){
-				echo 'Not an audio file';
-				exit();
-			}
-			
-			$songId=OC_MEDIA_COLLECTION::getSongByPath($arguments['path']);
-			OC_MEDIA_COLLECTION::registerPlay($songId);
-			
-			header('Content-Type:'.$ftype);
-			OCP\Response::enableCaching(3600 * 24); // 24 hour
-			header('Accept-Ranges: bytes');
-			header('Content-Length: '.OC_Filesystem::filesize($arguments['path']));
-			$mtime = OC_Filesystem::filemtime($arguments['path']);
-			OCP\Response::setLastModifiedHeader($mtime);
-			
-			OC_Filesystem::readfile($arguments['path']);
-			exit;
-		case 'find_music':
-			$music=OC_FileCache::searchByMime('audio');
-			$ogg=OC_FileCache::searchByMime('application','ogg');
-			$music=array_merge($music,$ogg);
-			OCP\JSON::encodedPrint($music);
-			exit;
-	}
-}
diff --git a/apps/media/ajax/autoupdate.php b/apps/media/ajax/autoupdate.php
deleted file mode 100644
index a5801f1a0e..0000000000
--- a/apps/media/ajax/autoupdate.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
-* ownCloud - media plugin
-*
-* @author Robin Appelman
-* @copyright 2010 Robin Appelman icewind1991@gmail.com
-* 
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either 
-* version 3 of the License, or any later version.
-* 
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-*  
-* You should have received a copy of the GNU Lesser General Public 
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-* 
-*/
-
-header('Content-type: text/html; charset=UTF-8') ;
-
-OCP\JSON::checkAppEnabled('media');
-
-$autoUpdate=(isset($_GET['autoupdate']) and $_GET['autoupdate']=='true');
-
-OCP\Config::setUserValue(OCP\USER::getUser(),'media','autoupdate',(integer)$autoUpdate);
-
-OCP\JSON::success(array('data' => $autoUpdate));
diff --git a/apps/media/appinfo/app.php b/apps/media/appinfo/app.php
deleted file mode 100644
index 75015d627b..0000000000
--- a/apps/media/appinfo/app.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/**
- * ownCloud - media plugin
- *
- * @author Robin Appelman
- * @copyright 2010 Robin Appelman icewind1991@gmail.com
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.  If not, see <http://www.gnu.org/
- *
- */
-
-$l=OC_L10N::get('media');
-
-OC::$CLASSPATH['OC_MEDIA'] = 'media/lib_media.php';
-OC::$CLASSPATH['OC_MediaSearchProvider'] = 'media/lib_media.php';
-OC::$CLASSPATH['OC_MEDIA_COLLECTION'] = 'media/lib_collection.php';
-OC::$CLASSPATH['OC_MEDIA_SCANNER'] = 'media/lib_scanner.php';
-
-//we need to have the sha256 hash of passwords for ampache
-OCP\Util::connectHook('OC_User','post_login','OC_MEDIA','loginListener');
-
-//connect to the filesystem for auto updating
-OCP\Util::connectHook('OC_Filesystem','post_write','OC_MEDIA','updateFile');
-
-//listen for file deletions to clean the database if a song is deleted
-OCP\Util::connectHook('OC_Filesystem','post_delete','OC_MEDIA','deleteFile');
-
-//list for file moves to update the database
-OCP\Util::connectHook('OC_Filesystem','post_rename','OC_MEDIA','moveFile');
-
-OCP\Util::addscript('media','loader');
-OCP\App::registerPersonal('media','settings');
-
-OCP\App::addNavigationEntry(array('id' => 'media_index', 'order' => 2, 'href' => OCP\Util::linkTo('media', 'index.php'), 'icon' => OCP\Util::imagePath('core', 'places/music.svg'), 'name' => $l->t('Music')));
-
-OC_Search::registerProvider('OC_MediaSearchProvider');
diff --git a/apps/media/appinfo/database.xml b/apps/media/appinfo/database.xml
deleted file mode 100644
index 067f7bc059..0000000000
--- a/apps/media/appinfo/database.xml
+++ /dev/null
@@ -1,298 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<database>
-
- <name>*dbname*</name>
- <create>true</create>
- <overwrite>false</overwrite>
-
- <charset>utf8</charset>
-
- <table>
-
-  <name>*dbprefix*media_albums</name>
-
-  <declaration>
-
-   <field>
-    <name>album_id</name>
-    <type>integer</type>
-    <default>0</default>
-    <notnull>true</notnull>
-    <autoincrement>1</autoincrement>
-    <length>4</length>
-   </field>
-
-   <field>
-    <name>album_name</name>
-    <type>text</type>
-    <default></default>
-    <notnull>true</notnull>
-    <length>200</length>
-   </field>
-
-   <field>
-    <name>album_artist</name>
-    <type>integer</type>
-    <default>0</default>
-    <notnull>true</notnull>
-    <length>4</length>
-   </field>
-
-   <field>
-    <name>album_art</name>
-    <type>text</type>
-    <default></default>
-    <notnull>true</notnull>
-    <length>200</length>
-   </field>
-   
-   <index>
-	   <name>album_name_index</name>
-	   <field>
-		   <name>album_name</name>
-		   <sorting>ascending</sorting>
-	   </field>
-   </index>
-   
-   <index>
-	   <name>album_artist_index</name>
-	   <field>
-		   <name>album_artist</name>
-		   <sorting>ascending</sorting>
-	   </field>
-   </index>
-
-  </declaration>
-
- </table>
-
- <table>
-
-  <name>*dbprefix*media_artists</name>
-
-  <declaration>
-
-   <field>
-    <name>artist_id</name>
-    <type>integer</type>
-    <default>0</default>
-    <notnull>true</notnull>
-    <autoincrement>1</autoincrement>
-    <length>4</length>
-   </field>
-
-   <field>
-    <name>artist_name</name>
-    <type>text</type>
-    <default></default>
-    <notnull>true</notnull>
-    <length>200</length>
-   </field>
-
-   <index>
-    <name>artist_name</name>
-    <unique>true</unique>
-    <field>
-     <name>artist_name</name>
-     <sorting>ascending</sorting>
-    </field>
-   </index>
-   
-  </declaration>
-
- </table>
-
- <table>
-
-  <name>*dbprefix*media_sessions</name>
-
-  <declaration>
-
-   <field>
-    <name>session_id</name>
-    <type>integer</type>
-    <default>0</default>
-    <notnull>true</notnull>
-    <autoincrement>1</autoincrement>
-    <length>4</length>
-   </field>
-
-   <field>
-    <name>token</name>
-    <type>text</type>
-    <default></default>
-    <notnull>true</notnull>
-    <length>64</length>
-   </field>
-
-   <field>
-    <name>user_id</name>
-    <type>text</type>
-    <default></default>
-    <notnull>true</notnull>
-	<length>64</length>
-   </field>
-
-   <field>
-    <name>start</name>
-    <type>timestamp</type>
-    <notnull>true</notnull>
-   </field>
-
-  </declaration>
-
- </table>
-
- <table>
-
-  <name>*dbprefix*media_songs</name>
-
-  <declaration>
-
-   <field>
-    <name>song_id</name>
-    <type>integer</type>
-    <default>0</default>
-    <notnull>true</notnull>
-    <autoincrement>1</autoincrement>
-    <length>4</length>
-   </field>
-
-   <field>
-    <name>song_name</name>
-    <type>text</type>
-    <default></default>
-    <notnull>true</notnull>
-    <length>200</length>
-   </field>
-
-   <field>
-    <name>song_artist</name>
-    <type>integer</type>
-    <default>0</default>
-    <notnull>true</notnull>
-    <length>4</length>
-   </field>
-
-   <field>
-    <name>song_album</name>
-    <type>integer</type>
-    <default>0</default>
-    <notnull>true</notnull>
-    <length>4</length>
-   </field>
-
-   <field>
-    <name>song_path</name>
-    <type>text</type>
-    <default></default>
-    <notnull>true</notnull>
-    <length>200</length>
-   </field>
-
-   <field>
-    <name>song_user</name>
-    <type>text</type>
-    <default>0</default>
-    <notnull>true</notnull>
-    <length>64</length>
-   </field>
-
-   <field>
-    <name>song_length</name>
-    <type>integer</type>
-    <default></default>
-    <notnull>true</notnull>
-    <length>4</length>
-   </field>
-
-   <field>
-    <name>song_track</name>
-    <type>integer</type>
-    <default></default>
-    <notnull>true</notnull>
-    <length>4</length>
-   </field>
-
-   <field>
-    <name>song_size</name>
-    <type>integer</type>
-    <default></default>
-    <notnull>true</notnull>
-    <length>4</length>
-   </field>
-
-   <field>
-	   <name>song_playcount</name>
-	   <type>integer</type>
-	   <default>
-	   </default>
-	   <notnull>true</notnull>
-	   <length>4</length>
-   </field>
-
-   <field>
-	   <name>song_lastplayed</name>
-	   <type>integer</type>
-	   <default>
-	   </default>
-	   <notnull>true</notnull>
-	   <length>4</length>
-   </field>
-   
-   <index>
-	   <name>song_album_index</name>
-	   <field>
-		   <name>song_album</name>
-		   <sorting>ascending</sorting>
-	   </field>
-   </index>
-   <index>
-	   <name>song_artist_index</name>
-	   <field>
-		   <name>song_artist</name>
-		   <sorting>ascending</sorting>
-	   </field>
-   </index>
-   <index>
-	   <name>song_name_index</name>
-	   <field>
-		   <name>song_name</name>
-		   <sorting>ascending</sorting>
-	   </field>
-   </index>
-   
-
-  </declaration>
-
- </table>
-
- <table>
-
-  <name>*dbprefix*media_users</name>
-
-  <declaration>
-
-   <field>
-    <name>user_id</name>
-    <type>text</type>
-    <default>0</default>
-    <notnull>true</notnull>
-    <autoincrement>1</autoincrement>
-    <length>64</length>
-   </field>
-
-   <field>
-    <name>user_password_sha256</name>
-    <type>text</type>
-    <default></default>
-    <notnull>true</notnull>
-    <length>64</length>
-   </field>
-
-  </declaration>
-
- </table>
-
-
-</database>
diff --git a/apps/media/appinfo/info.xml b/apps/media/appinfo/info.xml
deleted file mode 100644
index e2d9746708..0000000000
--- a/apps/media/appinfo/info.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0"?>
-<info>
-	<id>media</id>
-	<name>Media</name>
-	<description>Media player and server for ownCloud</description>
-	<licence>AGPL</licence>
-	<author>Robin Appelman</author>
-	<require>4</require>
-	<shipped>true</shipped>
-	<standalone/>
-	<default_enable/>
-	<remote>
-		<ampache>remote.php</ampache>
-	</remote>
-</info>
diff --git a/apps/media/appinfo/version b/apps/media/appinfo/version
deleted file mode 100644
index 44bb5d1f74..0000000000
--- a/apps/media/appinfo/version
+++ /dev/null
@@ -1 +0,0 @@
-0.4.1
\ No newline at end of file
diff --git a/apps/media/css/music.css b/apps/media/css/music.css
deleted file mode 100644
index c782e8afee..0000000000
--- a/apps/media/css/music.css
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Copyright (c) 2011, Jan-Christoph Borchardt, http://jancborchardt.net
- This file is licensed under the Affero General Public License version 3 or later.
- See the COPYING-README file. */
-
-#controls ul.jp-controls { padding:0; }
-#controls ul.jp-controls li { display:inline; }
-#controls ul.jp-controls li a { position:absolute; padding:.8em 1em .8em 0; }
-a.jp-play, a.jp-pause { left:2.5em; }
-a.jp-pause { display:none; }
-a.jp-next { left:5em; }
-
-div.jp-progress { position:absolute; overflow:hidden; top:.5em; left:8em; width:15em; height:1.2em; padding:0; }
-div.jp-seek-bar { background:#eee; width:0; height:100%; cursor:pointer; }
-div.jp-play-bar { background:#ccc; width:0; height:100%; }
-div.jp-current-time,div.jp-duration { position:absolute; font-size:.64em; font-style:oblique; top:0.9em; left:13.5em; }
-div.jp-duration { display: none }
-div.jp-current-song { left: 33em; position: absolute; top: 0.9em; }
-div.jp-duration { text-align:right; }
-
-a.jp-mute,a.jp-unmute { left:24em; }
-div.jp-volume-bar { position:absolute; overflow:hidden; background:#eee; width:4em; height:0.4em; cursor:pointer; top:1.3em; left:27em; }
-div.jp-volume-bar-value { background:#ccc; width:0; height:0.4em; }
-
-#collection { position:relative; width:100%; float:left; table-layout:fixed; }
-#collection td { overflow:hidden; text-overflow:ellipsis; white-space:nowrap; }
-#leftcontent img.remove { display:none; float:right; cursor:pointer; opacity: 0; }
-#leftcontent li:hover img.remove { display:inline; opacity: .3; }
-#leftcontent li div.label { float: left; width: 200px; overflow: hidden; text-overflow: ellipsis; }
-#rightcontent { overflow: auto; }
-#playlist li { list-style-type:none; }
-.template { display:none; }
-.collection_playing { background:#eee; font-weight: bold; }
-
-#searchresults input.play, #searchresults input.add { float:left; height:1em; width:1em; }
-#collection tr.collapsed td.album, #collection tr.collapsed td.title { color:#ddd; }
-#collection td.artist-expander, #collection td.album-expander { width:2em; text-align:center; }
-td.artist a.expander, td.album a.expander { float:right; padding:0 1em; }
-tr.active td { background-color:#eee; font-weight:bold; }
-tr td { border-bottom:1px solid #eee; height:2.2em; }
-tr .artist img { vertical-align:middle; }
-tr.album td.artist { padding-left:1em; }
-tr.song td.artist { padding-left:2em; }
-.add {margin: 0 0.5em 0 0; }
-
-#scan { position:absolute; right:13.5em; top:0em; }
-#scan .start { position:relative; display:inline; float:right; }
-#scan .stop { position:relative; display:inline; float:right; }
-#scan #scanprogressbar { position:relative; display:inline-block; width:10em; height:1.5em; top:.4em; }
diff --git a/apps/media/css/player.css b/apps/media/css/player.css
deleted file mode 100644
index 0f29748f35..0000000000
--- a/apps/media/css/player.css
+++ /dev/null
@@ -1,23 +0,0 @@
-#playercontrols{
-	display:inline;
-	margin-left:1em;
-	width:4em;
-	height:1em;
-	position:fixed;
-	top:auto;
-	left:auto;
-	background:transparent;
-	box-shadow:none;
-	-webkit-box-shadow:none;
-}
-#playercontrols li{
-	float:left;
-}
-#playercontrols a, #playercontrols li{
-	margin:0px;
-	padding:0;
-	left:0;
-	background:transparent !important;
-	border:none !important;
-	text-shadow:none;
-}
\ No newline at end of file
diff --git a/apps/media/index.php b/apps/media/index.php
deleted file mode 100644
index ae85abc8aa..0000000000
--- a/apps/media/index.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-/**
-* ownCloud - media plugin
-*
-* @author Robin Appelman
-* @copyright 2010 Robin Appelman icewind1991@gmail.com
-* 
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either 
-* version 3 of the License, or any later version.
-* 
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-*  
-* You should have received a copy of the GNU Lesser General Public 
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-* 
-*/
-
-
-
-
-// Check if we are a user
-OCP\User::checkLoggedIn();
-OCP\App::checkAppEnabled('media');
-
-OCP\Util::addscript('media','player');
-OCP\Util::addscript('media','music');
-OCP\Util::addscript('media','playlist');
-OCP\Util::addscript('media','collection');
-OCP\Util::addscript('media','scanner');
-OCP\Util::addscript('media','jquery.jplayer.min');
-OCP\Util::addStyle('media','music');
-
-OCP\App::setActiveNavigationEntry( 'media_index' );
-
-$tmpl = new OCP\Template( 'media', 'music', 'user' );
-$tmpl->printPage();
diff --git a/apps/media/js/Jplayer.swf b/apps/media/js/Jplayer.swf
deleted file mode 100644
index c213fd578e..0000000000
Binary files a/apps/media/js/Jplayer.swf and /dev/null differ
diff --git a/apps/media/js/collection.js b/apps/media/js/collection.js
deleted file mode 100644
index 161fc0c681..0000000000
--- a/apps/media/js/collection.js
+++ /dev/null
@@ -1,368 +0,0 @@
-var initScanned = false;
-
-Collection={
-	artists:[],
-	albums:[],
-	songs:[],
-	artistsById:{},
-	albumsById:{},
-	loaded:false,
-	loading:false,
-	loadedListeners:[],
-	load:function(ready){
-		if(ready){
-			Collection.loadedListeners.push(ready);
-		}
-		if(!Collection.loading){
-			Collection.loading=true;
-			Collection.artists=[];
-			Collection.albums=[];
-			Collection.songs=[];
-			Collection.artistsById={};
-			Collection.albumsById={};
-			$.ajax({
-				url: OC.linkTo('media','ajax/api.php')+'?action=get_collection',
-				dataType: 'json',
-				success: function(data){
-					//normalize the data
-					for(var i=0;i<data.artists.length;i++){
-						var artist=data.artists[i];
-						var artistData={name:artist.artist_name,songs:[],albums:[]};
-						Collection.artistsById[artist.artist_id]=artistData;
-						Collection.artists.push(artistData);
-					}
-					for(var i=0;i<data.albums.length;i++){
-						var album=data.albums[i];
-						if(Collection.artistsById[album.album_artist]){
-							var artistName=Collection.artistsById[album.album_artist].name;
-						}else{
-							var artistName='unknown';
-						}
-						var albumData={name:album.album_name,artist:artistName,songs:[]};
-						Collection.albumsById[album.album_id]=albumData;
-						Collection.albums.push(albumData);
-						if(Collection.artistsById[album.album_artist]){
-							Collection.artistsById[album.album_artist].albums.push(albumData);
-						}
-					}
-					for(var i=0;i<data.songs.length;i++){
-						var song=data.songs[i];
-						if(Collection.artistsById[song.song_artist] && Collection.albumsById[song.song_album]){
-							var songData={
-								name:song.song_name,
-								artist:Collection.artistsById[song.song_artist].name,
-								album:Collection.albumsById[song.song_album].name,
-								lastPlayed:song.song_lastplayed,
-								length:song.song_length,
-								path:song.song_path,
-								playCount:song.song_playcount,
-							};
-							Collection.songs.push(songData);
-							Collection.artistsById[song.song_artist].songs.push(songData);
-							Collection.albumsById[song.song_album].songs.push(songData);
-						}
-					}
-					
-					Collection.artists.sort(function(a,b){
-						if(!a.name){
-							return -1;
-						}
-						return a.name.localeCompare(b.name);
-					});
-					
-					Collection.loaded=true;
-					Collection.loading=false;
-					for(var i=0;i<Collection.loadedListeners.length;i++){
-						Collection.loadedListeners[i]();
-					}
-					if(data.songs.length==0 && initScanned == false){
-						$('#scan input.start').click();
-						initScanned = true;
-					}
-				}
-			});
-		}
-	},
-	display:function(){
-		if(Collection.parent){
-			Collection.parent.show();
-		}
-		if(!Collection.loaded){
-			Collection.load(Collection.display);
-		}else{
-			if(Collection.parent){
-				Collection.parent.find('tr:not(.template)').remove();
-				var template=Collection.parent.find('tr.template');
-				$.each(Collection.artists,function(i,artist){
-					if(artist.name && artist.songs.length>0){
-						var tr=template.clone().removeClass('template');
-						if(artist.songs.length>1){
-							tr.find('td.title a').html(artist.songs.length+' '+t('media','songs'));
-							tr.find('td.album a').html(artist.albums.length+' '+t('media','albums'));
-						}else{
-							tr.find('td.title a').html(artist.songs[0].name);
-							tr.find('td.album a').html(artist.albums[0].name);
-						}
-						tr.find('td.artist a').html(artist.name);
-						tr.data('artistData',artist);
-						tr.find('td.artist a').click(function(event){
-							event.preventDefault();
-							PlayList.add(artist);
-							PlayList.play(0);
-							Collection.parent.find('tr').removeClass('active');
-							$('tr[data-artist="'+artist.name+'"]').addClass('active');
-						});
-						var expander='';
-						if(artist.songs.length>1){
-							expander=$('<a class="expander">&gt;</a>');
-							expander.data('expanded',false);
-							expander.click(function(event){
-								var tr=$(this).parent().parent();
-								if(expander.data('expanded')){
-									Collection.hideArtist(tr.data('artist'));
-								}else{
-									Collection.showArtist(tr.data('artist'));
-								}
-							});
-						}
-						tr.find('td.artist').addClass('buttons');
-						Collection.addButtons(tr,artist);
-						tr.children('td.artist-expander').append(expander);
-						tr.attr('data-artist',artist.name);
-						Collection.parent.find('tbody').append(tr);
-					}
-				});
-			}
-		}
-	},
-	showArtist:function(artist){
-		var tr=Collection.parent.find('tr[data-artist="'+artist+'"]');
-		var lastRow=tr;
-		var artist=tr.data('artistData');
-		var first=true;
-		$.each(artist.albums,function(j,album){
-			$.each(album.songs,function(i,song){
-				var newRow;
-				if(first){
-					newRow=tr;
-				}else{
-					newRow=tr.clone();
-					newRow.find('td.artist').text('');
-					newRow.find('.expander').remove();
-				}
-				newRow.find('td.album-expander .expander').remove();
-				if(i==0){
-					newRow.find('td.album a').text(album.name);
-					newRow.find('td.album a').click(function(event){
-						event.preventDefault();
-						PlayList.add(album);
-						PlayList.play(0);
-						Collection.parent.find('tr').removeClass('active');
-						$('tr[data-album="'+album.name+'"]').addClass('active');
-					});
-					if(album.songs.length>1){
-						var expander=$('<a class="expander">v </a>');
-						expander.data('expanded',true);
-						expander.click(function(event){
-							var tr=$(this).parent().parent();
-							if(expander.data('expanded')) {
-								Collection.hideAlbum(tr.data('artist'),tr.data('album'));
-							} else {
-								Collection.showAlbum(tr.data('artist'),tr.data('album'));
-							}
-						});
-						newRow.children('td.album-expander').append(expander);
-					}
-					Collection.addButtons(newRow,album);
-				} else {
-					newRow.find('td.album a').text('');
-					Collection.addButtons(newRow,song);
-				}
-				newRow.find('td.title a').text(song.name);
-				newRow.find('td.title a').click(function(event){
-					event.preventDefault();
-					PlayList.add(song);
-					PlayList.play(0);
-					Collection.parent.find('tr').removeClass('active');
-					$('tr[data-title="'+song.name+'"]').addClass('active');
-				});
-				newRow.attr('data-album',album.name);
-				newRow.attr('data-title',song.name);
-				newRow.attr('data-artist',artist.name);
-				newRow.data('albumData',album);
-				if(!first){
-					lastRow.after(newRow);
-				}
-				first=false;
-				lastRow=newRow;
-			});
-		});
-		tr.removeClass('collapsed');
-		tr.find('td.artist-expander a.expander').data('expanded',true);
-		tr.find('td.artist-expander a.expander').addClass('expanded');
-		tr.find('td.artist-expander a.expander').text('v');
-	},
-	hideArtist:function(artist){
-		var tr=Collection.parent.find('tr[data-artist="'+artist+'"]');
-		var artist=tr.first().data('artistData');
-		tr.first().find('td.album a').first().text(artist.albums.length+' '+t('media','albums'));
-		tr.first().find('td.album-expander a.expander').remove();
-		tr.first().find('td.title a').text(artist.songs.length+' '+t('media','songs'));
-		tr.first().find('td.album a').unbind('click');
-		tr.first().find('td.title a').unbind('click');
-		tr.each(function(i,row){
-			if(i>0){
-				$(row).remove();
-			}
-		});
-		tr.find('td.artist-expander a.expander').data('expanded',false);
-		tr.find('td.artist-expander a.expander').removeClass('expanded');
-		tr.find('td.artist-expander a.expander').text('>');
-		Collection.addButtons(tr,artist);
-	},
-	showAlbum:function(artist,album){
-		var tr = Collection.parent.find('tr[data-artist="'+artist+'"][data-album="'+album+'"]');
-		var lastRow=tr;
-		var albumData=tr.data('albumData');
-		tr.find('td.album-expander a.expander').data('expanded',true);
-		tr.find('td.album-expander a.expander').addClass('expanded');
-		tr.find('td.album-expander a.expander').text('v');
-		$.each(albumData.songs,function(i,song){
-			var newRow;
-			if(i>0){
-				newRow=tr.clone();
-				newRow.find('a.expander').remove();
-				newRow.find('td.album a').text('');
-				newRow.find('td.artist a').text('');
-			}else{
-				newRow=tr;
-			}
-			newRow.find('td.title a').text(song.name);
-			newRow.find('td.title a').click(function(event){
-				event.preventDefault();
-				PlayList.add(song);
-				PlayList.play(0);
-				Collection.parent.find('tr').removeClass('active');
-				$('tr[data-title="'+song.name+'"]').addClass('active');
-			});
-			if(i>0){
-				lastRow.after(newRow);
-			}
-			lastRow=newRow;
-		});
-	},
-	hideAlbum:function(artist,album){
-		var tr = Collection.parent.find('tr[data-artist="'+artist+'"][data-album="'+album+'"]');
-		var albumData=tr.data('albumData');
-		tr.first().find('td.title a').text(albumData.songs.length+' '+t('media','songs'));
-		tr.find('td.album-expander a.expander').data('expanded',false);
-		tr.find('td.album-expander a.expander').removeClass('expanded');
-		tr.find('td.album-expander a.expander').text('> ');
-		tr.each(function(i,row){
-			if(i>0){
-				$(row).remove();
-			}
-		});
-	},
-	parent:null,
-	hide:function(){
-		if(Collection.parent){
-			Collection.parent.hide();
-		}
-	},
-	registerPlay:function(item){
-		if(item){
-			var song=Collection.findSong(item.artist,item.album,item.name);
-			song.song_playcount++;
-		}
-	},
-	addButtons:function(parent,data){
-		buttons = parent.find('.buttons');
-		if(buttons.find('.add').length<=0) {
-			buttons.prepend('<img class="add action" src="'+OC.imagePath('core','actions/play-add')+'" title="Add to playlist" />');
-		}
-		buttons.find('.add').unbind('click');
-		buttons.find('.add').click(function(event){
-			event.preventDefault();
-			PlayList.add(data,true);
-			PlayList.render();
-		});
-	},
-	find:function(artistName,albumName,songName){
-		if(songName){
-			return Collection.findSong(artistName,albumName,songName);
-		}else if(albumName){
-			return Collection.findAlbum(artistName,albumName);
-		}else{
-			return Collection.findArtist(artistName);
-		}
-	},
-	findArtist:function(name){
-		for(var i=0;i<Collection.artists.length;i++){
-			if(Collection.artists[i].name==name){
-				return Collection.artists[i];
-			}
-		}
-	},
-	findAlbum:function(artistName,albumName){
-		var artist=Collection.findArtist(artistName);
-		if(artist){
-			for(var i=0;i<artist.albums.length;i++){
-				if(artist.albums[i].name==albumName){
-					return artist.albums[i];
-				}
-			}
-		}
-	},
-	findSong:function(artistName,albumName,songName){
-		var album=Collection.findAlbum(artistName,albumName);
-		if(album){
-			for(var i=0;i<album.songs.length;i++){
-				if(album.songs[i].name==songName){
-					return album.songs[i];
-				}
-			}
-		}
-	},
-	addSong:function(song){
-		var artist=Collection.findArtist(song.artist);
-		if(!artist){
-			artist={name:song.artist,albums:[],songs:[]};
-			Collection.artists.push(artist);
-			Collection.artistsById[song.song_artist]=artist;
-		}
-		var album=Collection.findAlbum(song.artist,song.album);
-		if(!album){
-			album={name:song.album,artist:song.song_artist,songs:[]};
-			artist.albums.push(album);
-			Collection.albums.push(album);
-			Collection.albumsById[song.song_album]=album;
-		}
-		var songData={
-			name:song.song_name,
-			artist:Collection.artistsById[song.song_artist].name,
-			album:Collection.albumsById[song.song_album].name,
-			lastPlayed:song.song_lastplayed,
-			length:song.song_length,
-			path:song.song_path,
-			playCount:song.song_playcount,
-		};
-		album.songs.push(songData);
-		artist.songs.push(songData);
-		Collection.songs.push(songData);
-	}
-};
-
-$(document).ready(function(){
-	Collection.parent=$('#collection');
-	Collection.load();
-	Collection.parent.hide();
-	$('#scan input.start').click(function(){
-		$('#scan input.start').hide();
-		$('#scan input.stop').show();
-		$('#scan input.stop').click(function(){
-			Scanner.toggle();
-		});
-		Scanner.scanCollection();
-	});
-});
diff --git a/apps/media/js/jQuery.jPlayer.2.1.0.source/Jplayer.as b/apps/media/js/jQuery.jPlayer.2.1.0.source/Jplayer.as
deleted file mode 100644
index 1178dacc34..0000000000
--- a/apps/media/js/jQuery.jPlayer.2.1.0.source/Jplayer.as
+++ /dev/null
@@ -1,415 +0,0 @@
-/*
- * jPlayer Plugin for jQuery JavaScript Library
- * http://www.happyworm.com/jquery/jplayer
- *
- * Copyright (c) 2009 - 2011 Happyworm Ltd
- * Dual licensed under the MIT and GPL licenses.
- *  - http://www.opensource.org/licenses/mit-license.php
- *  - http://www.gnu.org/copyleft/gpl.html
- *
- * Author: Mark J Panaghiston
- * Version: 2.1.0
- * Date: 1st September 2011
- *
- * FlashVars expected: (AS3 property of: loaderInfo.parameters)
- *	id: 	(URL Encoded: String) Id of jPlayer instance
- *	vol:	(Number) Sets the initial volume
- *	muted:	(Boolean in a String) Sets the initial muted state
- *	jQuery:	(URL Encoded: String) Sets the jQuery var name. Used with: someVar = jQuery.noConflict(true);
- *
- * Compiled using: Adobe Flex Compiler (mxmlc) Version 4.5.1 build 21328
- */
-
-package {
-	import flash.system.Security;
-	import flash.external.ExternalInterface;
-
-	import flash.utils.Timer;
-	import flash.events.TimerEvent;
-	
-	import flash.text.TextField;
-	import flash.text.TextFormat;
-
-	import flash.events.KeyboardEvent;
-
-	import flash.display.Sprite;
-	import happyworm.jPlayer.*;
-
-	import flash.display.StageAlign;
-	import flash.display.StageScaleMode;
-	import flash.events.Event;
-	import flash.events.MouseEvent;
-
-	import flash.ui.ContextMenu;
-	import flash.ui.ContextMenuItem;
-	import flash.events.ContextMenuEvent;
-	import flash.net.URLRequest;
-	import flash.net.navigateToURL;
-
-	public class Jplayer extends Sprite {
-		private var jQuery:String;
-		private var sentNumberFractionDigits:uint = 2;
-
-		public var commonStatus:JplayerStatus = new JplayerStatus(); // Used for inital ready event so volume is correct.
-
-		private var myInitTimer:Timer = new Timer(100, 0);
-
-		private var myMp3Player:JplayerMp3;
-		private var myMp4Player:JplayerMp4;
-
-		private var isMp3:Boolean = false;
-		private var isVideo:Boolean = false;
-
-		private var txLog:TextField;
-		private var debug:Boolean = false; // Set debug to false for release compile!
-
-		public function Jplayer() {
-			flash.system.Security.allowDomain("*");
-
-			jQuery = loaderInfo.parameters.jQuery + "('#" + loaderInfo.parameters.id + "').jPlayer";
-			commonStatus.volume = Number(loaderInfo.parameters.vol);
-			commonStatus.muted = loaderInfo.parameters.muted == "true";
-
-			stage.scaleMode = StageScaleMode.NO_SCALE;
-			stage.align = StageAlign.TOP_LEFT;
-			stage.addEventListener(Event.RESIZE, resizeHandler);
-			stage.addEventListener(MouseEvent.CLICK, clickHandler);
-
-			var initialVolume:Number = commonStatus.volume;
-			if(commonStatus.muted) {
-				initialVolume = 0;
-			}
-			myMp3Player = new JplayerMp3(initialVolume);
-			addChild(myMp3Player);
-
-			myMp4Player = new JplayerMp4(initialVolume);
-			addChild(myMp4Player);
-
-			setupListeners(!isMp3, isMp3); // Set up the listeners to the default isMp3 state.
-
-			// The ContextMenu only partially works. The menu select events never occur.
-			// Investigated and it is something to do with the way jPlayer inserts the Flash on the page.
-			// A simple test inserting the Jplayer.swf on a page using: 1) SWFObject 2.2 works. 2) AC_FL_RunContent() works.
-			// jPlayer Flash insertion is based on SWFObject 2.2 and the resaon behind this failure is not clear. The Flash insertion HTML on the page looks similar.
-			var myContextMenu:ContextMenu = new ContextMenu();
-			myContextMenu.hideBuiltInItems();
-			var menuItem_jPlayer:ContextMenuItem = new ContextMenuItem("jPlayer " + JplayerStatus.VERSION);
-			var menuItem_happyworm:ContextMenuItem = new ContextMenuItem("© 2009-2011 Happyworm Ltd", true);
-			menuItem_jPlayer.addEventListener(ContextMenuEvent.MENU_ITEM_SELECT, menuSelectHandler_jPlayer);
-			menuItem_happyworm.addEventListener(ContextMenuEvent.MENU_ITEM_SELECT, menuSelectHandler_happyworm);
-			myContextMenu.customItems.push(menuItem_jPlayer, menuItem_happyworm);
-			contextMenu = myContextMenu;
-
-			// Log console for dev compile option: debug
-			if(debug) {
-				txLog = new TextField();
-				txLog.x = 5;
-				txLog.y = 5;
-				txLog.width = 540;
-				txLog.height = 390;
-				txLog.border = true;
-				txLog.background = true;
-				txLog.backgroundColor = 0xEEEEFF;
-				txLog.multiline = true;
-				txLog.text = "jPlayer " + JplayerStatus.VERSION;
-				txLog.visible = false;
-				this.addChild(txLog);
-				this.stage.addEventListener(KeyboardEvent.KEY_UP, keyboardHandler);
-
-				myMp3Player.addEventListener(JplayerEvent.DEBUG_MSG, debugMsgHandler);
-				myMp4Player.addEventListener(JplayerEvent.DEBUG_MSG, debugMsgHandler);
-			}
-
-			// Delay init() because Firefox 3.5.7+ developed a bug with local testing in Firebug.
-			myInitTimer.addEventListener(TimerEvent.TIMER, init);
-			myInitTimer.start();
-		}
-		
-		private function init(e:TimerEvent):void {
-			myInitTimer.stop();
-			if(ExternalInterface.available) {
-				ExternalInterface.addCallback("fl_setAudio_mp3", fl_setAudio_mp3);
-				ExternalInterface.addCallback("fl_setAudio_m4a", fl_setAudio_m4a);
-				ExternalInterface.addCallback("fl_setVideo_m4v", fl_setVideo_m4v);
-				ExternalInterface.addCallback("fl_clearMedia", fl_clearMedia);
-				ExternalInterface.addCallback("fl_load", fl_load);
-				ExternalInterface.addCallback("fl_play", fl_play);
-				ExternalInterface.addCallback("fl_pause", fl_pause);
-				ExternalInterface.addCallback("fl_play_head", fl_play_head);
-				ExternalInterface.addCallback("fl_volume", fl_volume);
-				ExternalInterface.addCallback("fl_mute", fl_mute);
-
-				ExternalInterface.call(jQuery, "jPlayerFlashEvent", JplayerEvent.JPLAYER_READY, extractStatusData(commonStatus)); // See JplayerStatus() class for version number.
-			}
-		}
-		private function setupListeners(oldMP3:Boolean, newMP3:Boolean):void {
-			if(oldMP3 != newMP3) {
-				if(newMP3) {
-					listenToMp3(true);
-					listenToMp4(false);
-				} else {
-					listenToMp3(false);
-					listenToMp4(true);
-				}
-			}
-		}
-		private function listenToMp3(active:Boolean):void {
-			if(active) {
-				myMp3Player.addEventListener(JplayerEvent.JPLAYER_ERROR, jPlayerFlashEvent);
-				myMp3Player.addEventListener(JplayerEvent.JPLAYER_PROGRESS, jPlayerFlashEvent);
-				myMp3Player.addEventListener(JplayerEvent.JPLAYER_TIMEUPDATE, jPlayerFlashEvent);
-				myMp3Player.addEventListener(JplayerEvent.JPLAYER_ENDED, jPlayerFlashEvent);
-				
-				myMp3Player.addEventListener(JplayerEvent.JPLAYER_PLAY, jPlayerFlashEvent);
-				myMp3Player.addEventListener(JplayerEvent.JPLAYER_PAUSE, jPlayerFlashEvent);
-				myMp3Player.addEventListener(JplayerEvent.JPLAYER_LOADSTART, jPlayerFlashEvent);
-
-				myMp3Player.addEventListener(JplayerEvent.JPLAYER_SEEKING, jPlayerFlashEvent);
-				myMp3Player.addEventListener(JplayerEvent.JPLAYER_SEEKED, jPlayerFlashEvent);
-			} else {
-				myMp3Player.removeEventListener(JplayerEvent.JPLAYER_ERROR, jPlayerFlashEvent);
-				myMp3Player.removeEventListener(JplayerEvent.JPLAYER_PROGRESS, jPlayerFlashEvent);
-				myMp3Player.removeEventListener(JplayerEvent.JPLAYER_TIMEUPDATE, jPlayerFlashEvent);
-				myMp3Player.removeEventListener(JplayerEvent.JPLAYER_ENDED, jPlayerFlashEvent);
-				
-				myMp3Player.removeEventListener(JplayerEvent.JPLAYER_PLAY, jPlayerFlashEvent);
-				myMp3Player.removeEventListener(JplayerEvent.JPLAYER_PAUSE, jPlayerFlashEvent);
-				myMp3Player.removeEventListener(JplayerEvent.JPLAYER_LOADSTART, jPlayerFlashEvent);
-
-				myMp3Player.removeEventListener(JplayerEvent.JPLAYER_SEEKING, jPlayerFlashEvent);
-				myMp3Player.removeEventListener(JplayerEvent.JPLAYER_SEEKED, jPlayerFlashEvent);
-			}
-		}
-		private function listenToMp4(active:Boolean):void {
-			if(active) {
-				myMp4Player.addEventListener(JplayerEvent.JPLAYER_ERROR, jPlayerFlashEvent);
-				myMp4Player.addEventListener(JplayerEvent.JPLAYER_PROGRESS, jPlayerFlashEvent);
-				myMp4Player.addEventListener(JplayerEvent.JPLAYER_TIMEUPDATE, jPlayerFlashEvent);
-				myMp4Player.addEventListener(JplayerEvent.JPLAYER_ENDED, jPlayerFlashEvent);
-
-				myMp4Player.addEventListener(JplayerEvent.JPLAYER_PLAY, jPlayerFlashEvent);
-				myMp4Player.addEventListener(JplayerEvent.JPLAYER_PAUSE, jPlayerFlashEvent);
-				myMp4Player.addEventListener(JplayerEvent.JPLAYER_LOADSTART, jPlayerFlashEvent);
-
-				myMp4Player.addEventListener(JplayerEvent.JPLAYER_SEEKING, jPlayerFlashEvent);
-				myMp4Player.addEventListener(JplayerEvent.JPLAYER_SEEKED, jPlayerFlashEvent);
-
-				myMp4Player.addEventListener(JplayerEvent.JPLAYER_LOADEDMETADATA, jPlayerMetaDataHandler); // Note the unique handler
-			} else {
-				myMp4Player.removeEventListener(JplayerEvent.JPLAYER_ERROR, jPlayerFlashEvent);
-				myMp4Player.removeEventListener(JplayerEvent.JPLAYER_PROGRESS, jPlayerFlashEvent);
-				myMp4Player.removeEventListener(JplayerEvent.JPLAYER_TIMEUPDATE, jPlayerFlashEvent);
-				myMp4Player.removeEventListener(JplayerEvent.JPLAYER_ENDED, jPlayerFlashEvent);
-
-				myMp4Player.removeEventListener(JplayerEvent.JPLAYER_PLAY, jPlayerFlashEvent);
-				myMp4Player.removeEventListener(JplayerEvent.JPLAYER_PAUSE, jPlayerFlashEvent);
-				myMp4Player.removeEventListener(JplayerEvent.JPLAYER_LOADSTART, jPlayerFlashEvent);
-
-				myMp4Player.removeEventListener(JplayerEvent.JPLAYER_SEEKING, jPlayerFlashEvent);
-				myMp4Player.removeEventListener(JplayerEvent.JPLAYER_SEEKED, jPlayerFlashEvent);
-
-				myMp4Player.removeEventListener(JplayerEvent.JPLAYER_LOADEDMETADATA, jPlayerMetaDataHandler); // Note the unique handler
-			}
-		}
-		private function fl_setAudio_mp3(src:String):Boolean {
-			if (src != null) {
-				log("fl_setAudio_mp3: "+src);
-				setupListeners(isMp3, true);
-				isMp3 = true;
-				isVideo = false;
-				myMp4Player.clearFile();
-				myMp3Player.setFile(src);
-				return true;
-			} else {
-				log("fl_setAudio_mp3: null");
-				return false;
-			}
-		}
-		private function fl_setAudio_m4a(src:String):Boolean {
-			if (src != null) {
-				log("fl_setAudio_m4a: "+src);
-				setupListeners(isMp3, false);
-				isMp3 = false;
-				isVideo = false;
-				myMp3Player.clearFile();
-				myMp4Player.setFile(src);
-				return true;
-			} else {
-				log("fl_setAudio_m4a: null");
-				return false;
-			}
-		}
-		private function fl_setVideo_m4v(src:String):Boolean {
-			if (src != null) {
-				log("fl_setVideo_m4v: "+src);
-				setupListeners(isMp3, false);
-				isMp3 = false;
-				isVideo = true;
-				myMp3Player.clearFile();
-				myMp4Player.setFile(src);
-				return true;
-			} else {
-				log("fl_setVideo_m4v: null");
-				return false;
-			}
-		}
-		private function fl_clearMedia():void {
-			log("clearMedia.");
-			myMp3Player.clearFile();
-			myMp4Player.clearFile();
-		}
-		private function fl_load():Boolean {
-			log("load.");
-			if(isMp3) {
-				return myMp3Player.load();
-			} else {
-				return myMp4Player.load();
-			}
-		}
-		private function fl_play(time:Number = NaN):Boolean {
-			log("play: time = " + time);
-			if(isMp3) {
-				return myMp3Player.play(time * 1000); // Flash uses milliseconds
-			} else {
-				return myMp4Player.play(time * 1000); // Flash uses milliseconds
-			}
-		}
-		private function fl_pause(time:Number = NaN):Boolean {
-			log("pause: time = " + time);
-			if(isMp3) {
-				return myMp3Player.pause(time * 1000); // Flash uses milliseconds
-			} else {
-				return myMp4Player.pause(time * 1000); // Flash uses milliseconds
-			}
-		}
-		private function fl_play_head(percent:Number):Boolean {
-			log("play_head: "+percent+"%");
-			if(isMp3) {
-				return myMp3Player.playHead(percent);
-			} else {
-				return myMp4Player.playHead(percent);
-			}
-		}
-		private function fl_volume(v:Number):void {
-			log("volume: "+v);
-			commonStatus.volume = v;
-			if(!commonStatus.muted) {
-				myMp3Player.setVolume(v);
-				myMp4Player.setVolume(v);
-			}
-		}
-		private function fl_mute(mute:Boolean):void {
-			log("mute: "+mute);
-			commonStatus.muted = mute;
-			if(mute) {
-				myMp3Player.setVolume(0);
-				myMp4Player.setVolume(0);
-			} else {
-				myMp3Player.setVolume(commonStatus.volume);
-				myMp4Player.setVolume(commonStatus.volume);
-			}
-		}
-		private function jPlayerFlashEvent(e:JplayerEvent):void {
-			log("jPlayer Flash Event: " + e.type + ": " + e.target);
-			if(ExternalInterface.available) {
-				ExternalInterface.call(jQuery, "jPlayerFlashEvent", e.type, extractStatusData(e.data));
-			}
-		}
-		private function extractStatusData(data:JplayerStatus):Object {
-			var myStatus:Object = {
-				version: JplayerStatus.VERSION,
-				src: data.src,
-				paused: !data.isPlaying, // Changing this name requires inverting all assignments and conditional statements.
-				srcSet: data.srcSet,
-				seekPercent: data.seekPercent,
-				currentPercentRelative: data.currentPercentRelative,
-				currentPercentAbsolute: data.currentPercentAbsolute,
-				currentTime: data.currentTime / 1000, // JavaScript uses seconds
-				duration: data.duration / 1000, // JavaScript uses seconds
-				volume: commonStatus.volume,
-				muted: commonStatus.muted
-			};
-			log("extractStatusData: sp="+myStatus.seekPercent+" cpr="+myStatus.currentPercentRelative+" cpa="+myStatus.currentPercentAbsolute+" ct="+myStatus.currentTime+" d="+myStatus.duration);
-			return myStatus;
-		}
-		private function jPlayerMetaDataHandler(e:JplayerEvent):void {
-			log("jPlayerMetaDataHandler:" + e.target);
-			if(ExternalInterface.available) {
-				resizeHandler(new Event(Event.RESIZE));
-				ExternalInterface.call(jQuery, "jPlayerFlashEvent", e.type, extractStatusData(e.data));
-			}
-		}
-		private function resizeHandler(e:Event):void {
-			log("resizeHandler: stageWidth = " + stage.stageWidth + " | stageHeight = " + stage.stageHeight);
-
-			var mediaX:Number = 0;
-			var mediaY:Number = 0;
-			var mediaWidth:Number = 0;
-			var mediaHeight:Number = 0;
-
-			if(stage.stageWidth > 0 && stage.stageHeight > 0 && myMp4Player.myVideo.width > 0 && myMp4Player.myVideo.height > 0) {
-				var aspectRatioStage:Number = stage.stageWidth / stage.stageHeight;
-				var aspectRatioVideo:Number = myMp4Player.myVideo.width / myMp4Player.myVideo.height;
-				if(aspectRatioStage < aspectRatioVideo) {
-					mediaWidth = stage.stageWidth;
-					mediaHeight = stage.stageWidth / aspectRatioVideo;
-					mediaX = 0;
-					mediaY = (stage.stageHeight - mediaHeight) / 2;
-				} else {
-					mediaWidth = stage.stageHeight * aspectRatioVideo;
-					mediaHeight = stage.stageHeight;
-					mediaX = (stage.stageWidth - mediaWidth) / 2;
-					mediaY = 0;
-				}
-				resizeEntity(myMp4Player, mediaX, mediaY, mediaWidth, mediaHeight);
-			}
-			if(debug && stage.stageWidth > 20 && stage.stageHeight > 20) {
-				txLog.width = stage.stageWidth - 10;
-				txLog.height = stage.stageHeight - 10;
-			}
-		}
-		private function resizeEntity(entity:Sprite, mediaX:Number, mediaY:Number, mediaWidth:Number, mediaHeight:Number):void {
-			entity.x = mediaX;
-			entity.y = mediaY;
-			entity.width = mediaWidth;
-			entity.height = mediaHeight;
-		}
-		private function clickHandler(e:MouseEvent):void {
-			if(isMp3) {
-				jPlayerFlashEvent(new JplayerEvent(JplayerEvent.JPLAYER_CLICK, myMp3Player.myStatus, "click"))
-			} else {
-				jPlayerFlashEvent(new JplayerEvent(JplayerEvent.JPLAYER_CLICK, myMp4Player.myStatus, "click"))
-			}
-		}
-		// This event is never called. See comments in class constructor.
-		private function menuSelectHandler_jPlayer(e:ContextMenuEvent):void {
-			navigateToURL(new URLRequest("http://jplayer.org/"), "_blank");
-		}
-		// This event is never called. See comments in class constructor.
-		private function menuSelectHandler_happyworm(e:ContextMenuEvent):void {
-			navigateToURL(new URLRequest("http://happyworm.com/"), "_blank");
-		}
-		private function log(t:String):void {
-			if(debug) {
-				txLog.text = t + "\n" + txLog.text;
-			}
-		}
-		private function debugMsgHandler(e:JplayerEvent):void {
-			log(e.msg);
-		}
-		private function keyboardHandler(e:KeyboardEvent):void {
-			log("keyboardHandler: e.keyCode = " + e.keyCode);
-			switch(e.keyCode) {
-				case 68 : // d
-					txLog.visible = !txLog.visible;
-					log("Toggled log display: " + txLog.visible);
-					break;
-				case 76 : // l
-					if(e.ctrlKey && e.shiftKey) {
-						txLog.text = "Cleared log.";
-					}
-					break;
-			}
-		}
-	}
-}
diff --git a/apps/media/js/jQuery.jPlayer.2.1.0.source/Jplayer.fla b/apps/media/js/jQuery.jPlayer.2.1.0.source/Jplayer.fla
deleted file mode 100644
index 61ae40d3ac..0000000000
Binary files a/apps/media/js/jQuery.jPlayer.2.1.0.source/Jplayer.fla and /dev/null differ
diff --git a/apps/media/js/jQuery.jPlayer.2.1.0.source/add-on/jplayer.playlist.js b/apps/media/js/jQuery.jPlayer.2.1.0.source/add-on/jplayer.playlist.js
deleted file mode 100644
index 0eaa0ddf3d..0000000000
--- a/apps/media/js/jQuery.jPlayer.2.1.0.source/add-on/jplayer.playlist.js
+++ /dev/null
@@ -1,452 +0,0 @@
-/*
- * Playlist Object for the jPlayer Plugin
- * http://www.jplayer.org
- *
- * Copyright (c) 2009 - 2011 Happyworm Ltd
- * Dual licensed under the MIT and GPL licenses.
- *  - http://www.opensource.org/licenses/mit-license.php
- *  - http://www.gnu.org/copyleft/gpl.html
- *
- * Author: Mark J Panaghiston
- * Version: 2.1.0 (jPlayer 2.1.0)
- * Date: 1st September 2011
- */
-
-/* Code verified using http://www.jshint.com/ */
-/*jshint asi:false, bitwise:false, boss:false, browser:true, curly:true, debug:false, eqeqeq:true, eqnull:false, evil:false, forin:false, immed:false, jquery:true, laxbreak:false, newcap:true, noarg:true, noempty:true, nonew:true, nomem:false, onevar:false, passfail:false, plusplus:false, regexp:false, undef:true, sub:false, strict:false, white:false */
-/*global  jPlayerPlaylist: true, jQuery:false, alert:false */
-
-(function($, undefined) {
-
-	jPlayerPlaylist = function(cssSelector, playlist, options) {
-		var self = this;
-
-		this.current = 0;
-		this.loop = false; // Flag used with the jPlayer repeat event
-		this.shuffled = false;
-		this.removing = false; // Flag is true during remove animation, disabling the remove() method until complete.
-
-		this.cssSelector = $.extend({}, this._cssSelector, cssSelector); // Object: Containing the css selectors for jPlayer and its cssSelectorAncestor
-		this.options = $.extend(true, {}, this._options, options); // Object: The jPlayer constructor options for this playlist and the playlist options
-
-		this.playlist = []; // Array of Objects: The current playlist displayed (Un-shuffled or Shuffled)
-		this.original = []; // Array of Objects: The original playlist
-
-		this._initPlaylist(playlist); // Copies playlist to this.original. Then mirrors this.original to this.playlist. Creating two arrays, where the element pointers match. (Enables pointer comparison.)
-
-		// Setup the css selectors for the extra interface items used by the playlist.
-		this.cssSelector.title = this.cssSelector.cssSelectorAncestor + " .jp-title"; // Note that the text is written to the decendant li node.
-		this.cssSelector.playlist = this.cssSelector.cssSelectorAncestor + " .jp-playlist";
-		this.cssSelector.next = this.cssSelector.cssSelectorAncestor + " .jp-next";
-		this.cssSelector.previous = this.cssSelector.cssSelectorAncestor + " .jp-previous";
-		this.cssSelector.shuffle = this.cssSelector.cssSelectorAncestor + " .jp-shuffle";
-		this.cssSelector.shuffleOff = this.cssSelector.cssSelectorAncestor + " .jp-shuffle-off";
-
-		// Override the cssSelectorAncestor given in options
-		this.options.cssSelectorAncestor = this.cssSelector.cssSelectorAncestor;
-
-		// Override the default repeat event handler
-		this.options.repeat = function(event) {
-			self.loop = event.jPlayer.options.loop;
-		};
-
-		// Create a ready event handler to initialize the playlist
-		$(this.cssSelector.jPlayer).bind($.jPlayer.event.ready, function(event) {
-			self._init();
-		});
-
-		// Create an ended event handler to move to the next item
-		$(this.cssSelector.jPlayer).bind($.jPlayer.event.ended, function(event) {
-			self.next();
-		});
-
-		// Create a play event handler to pause other instances
-		$(this.cssSelector.jPlayer).bind($.jPlayer.event.play, function(event) {
-			$(this).jPlayer("pauseOthers");
-		});
-
-		// Create a resize event handler to show the title in full screen mode.
-		$(this.cssSelector.jPlayer).bind($.jPlayer.event.resize, function(event) {
-			if(event.jPlayer.options.fullScreen) {
-				$(self.cssSelector.title).show();
-			} else {
-				$(self.cssSelector.title).hide();
-			}
-		});
-
-		// Create click handlers for the extra buttons that do playlist functions.
-		$(this.cssSelector.previous).click(function() {
-			self.previous();
-			$(this).blur();
-			return false;
-		});
-
-		$(this.cssSelector.next).click(function() {
-			self.next();
-			$(this).blur();
-			return false;
-		});
-
-		$(this.cssSelector.shuffle).click(function() {
-			self.shuffle(true);
-			return false;
-		});
-		$(this.cssSelector.shuffleOff).click(function() {
-			self.shuffle(false);
-			return false;
-		}).hide();
-
-		// Put the title in its initial display state
-		if(!this.options.fullScreen) {
-			$(this.cssSelector.title).hide();
-		}
-
-		// Remove the empty <li> from the page HTML. Allows page to be valid HTML, while not interfereing with display animations
-		$(this.cssSelector.playlist + " ul").empty();
-
-		// Create .live() handlers for the playlist items along with the free media and remove controls.
-		this._createItemHandlers();
-
-		// Instance jPlayer
-		$(this.cssSelector.jPlayer).jPlayer(this.options);
-	};
-
-	jPlayerPlaylist.prototype = {
-		_cssSelector: { // static object, instanced in constructor
-			jPlayer: "#jquery_jplayer_1",
-			cssSelectorAncestor: "#jp_container_1"
-		},
-		_options: { // static object, instanced in constructor
-			playlistOptions: {
-				autoPlay: false,
-				loopOnPrevious: false,
-				shuffleOnLoop: true,
-				enableRemoveControls: false,
-				displayTime: 'slow',
-				addTime: 'fast',
-				removeTime: 'fast',
-				shuffleTime: 'slow',
-				itemClass: "jp-playlist-item",
-				freeGroupClass: "jp-free-media",
-				freeItemClass: "jp-playlist-item-free",
-				removeItemClass: "jp-playlist-item-remove"
-			}
-		},
-		option: function(option, value) { // For changing playlist options only
-			if(value === undefined) {
-				return this.options.playlistOptions[option];
-			}
-
-			this.options.playlistOptions[option] = value;
-
-			switch(option) {
-				case "enableRemoveControls":
-					this._updateControls();
-					break;
-				case "itemClass":
-				case "freeGroupClass":
-				case "freeItemClass":
-				case "removeItemClass":
-					this._refresh(true); // Instant
-					this._createItemHandlers();
-					break;
-			}
-			return this;
-		},
-		_init: function() {
-			var self = this;
-			this._refresh(function() {
-				if(self.options.playlistOptions.autoPlay) {
-					self.play(self.current);
-				} else {
-					self.select(self.current);
-				}
-			});
-		},
-		_initPlaylist: function(playlist) {
-			this.current = 0;
-			this.shuffled = false;
-			this.removing = false;
-			this.original = $.extend(true, [], playlist); // Copy the Array of Objects
-			this._originalPlaylist();
-		},
-		_originalPlaylist: function() {
-			var self = this;
-			this.playlist = [];
-			// Make both arrays point to the same object elements. Gives us 2 different arrays, each pointing to the same actual object. ie., Not copies of the object.
-			$.each(this.original, function(i,v) {
-				self.playlist[i] = self.original[i];
-			});
-		},
-		_refresh: function(instant) {
-			/* instant: Can be undefined, true or a function.
-			 *	undefined -> use animation timings
-			 *	true -> no animation
-			 *	function -> use animation timings and excute function at half way point.
-			 */
-			var self = this;
-
-			if(instant && !$.isFunction(instant)) {
-				$(this.cssSelector.playlist + " ul").empty();
-				$.each(this.playlist, function(i,v) {
-					$(self.cssSelector.playlist + " ul").append(self._createListItem(self.playlist[i]));
-				});
-				this._updateControls();
-			} else {
-				var displayTime = $(this.cssSelector.playlist + " ul").children().length ? this.options.playlistOptions.displayTime : 0;
-
-				$(this.cssSelector.playlist + " ul").slideUp(displayTime, function() {
-					var $this = $(this);
-					$(this).empty();
-					
-					$.each(self.playlist, function(i,v) {
-						$this.append(self._createListItem(self.playlist[i]));
-					});
-					self._updateControls();
-					if($.isFunction(instant)) {
-						instant();
-					}
-					if(self.playlist.length) {
-						$(this).slideDown(self.options.playlistOptions.displayTime);
-					} else {
-						$(this).show();
-					}
-				});
-			}
-		},
-		_createListItem: function(media) {
-			var self = this;
-
-			// Wrap the <li> contents in a <div>
-			var listItem = "<li><div>";
-
-			// Create remove control
-			listItem += "<a href='javascript:;' class='" + this.options.playlistOptions.removeItemClass + "'>&times;</a>";
-
-			// Create links to free media
-			if(media.free) {
-				var first = true;
-				listItem += "<span class='" + this.options.playlistOptions.freeGroupClass + "'>(";
-				$.each(media, function(property,value) {
-					if($.jPlayer.prototype.format[property]) { // Check property is a media format.
-						if(first) {
-							first = false;
-						} else {
-							listItem += " | ";
-						}
-						listItem += "<a class='" + self.options.playlistOptions.freeItemClass + "' href='" + value + "' tabindex='1'>" + property + "</a>";
-					}
-				});
-				listItem += ")</span>";
-			}
-
-			// The title is given next in the HTML otherwise the float:right on the free media corrupts in IE6/7
-			listItem += "<a href='javascript:;' class='" + this.options.playlistOptions.itemClass + "' tabindex='1'>" + media.title + (media.artist ? " <span class='jp-artist'>by " + media.artist + "</span>" : "") + "</a>";
-			listItem += "</div></li>";
-
-			return listItem;
-		},
-		_createItemHandlers: function() {
-			var self = this;
-			// Create .live() handlers for the playlist items
-			$(this.cssSelector.playlist + " a." + this.options.playlistOptions.itemClass).die("click").live("click", function() {
-				var index = $(this).parent().parent().index();
-				if(self.current !== index) {
-					self.play(index);
-				} else {
-					$(self.cssSelector.jPlayer).jPlayer("play");
-				}
-				$(this).blur();
-				return false;
-			});
-
-			// Create .live() handlers that disable free media links to force access via right click
-			$(self.cssSelector.playlist + " a." + this.options.playlistOptions.freeItemClass).die("click").live("click", function() {
-				$(this).parent().parent().find("." + self.options.playlistOptions.itemClass).click();
-				$(this).blur();
-				return false;
-			});
-
-			// Create .live() handlers for the remove controls
-			$(self.cssSelector.playlist + " a." + this.options.playlistOptions.removeItemClass).die("click").live("click", function() {
-				var index = $(this).parent().parent().index();
-				self.remove(index);
-				$(this).blur();
-				return false;
-			});
-		},
-		_updateControls: function() {
-			if(this.options.playlistOptions.enableRemoveControls) {
-				$(this.cssSelector.playlist + " ." + this.options.playlistOptions.removeItemClass).show();
-			} else {
-				$(this.cssSelector.playlist + " ." + this.options.playlistOptions.removeItemClass).hide();
-			}
-			if(this.shuffled) {
-				$(this.cssSelector.shuffleOff).show();
-				$(this.cssSelector.shuffle).hide();
-			} else {
-				$(this.cssSelector.shuffleOff).hide();
-				$(this.cssSelector.shuffle).show();
-			}
-		},
-		_highlight: function(index) {
-			if(this.playlist.length && index !== undefined) {
-				$(this.cssSelector.playlist + " .jp-playlist-current").removeClass("jp-playlist-current");
-				$(this.cssSelector.playlist + " li:nth-child(" + (index + 1) + ")").addClass("jp-playlist-current").find(".jp-playlist-item").addClass("jp-playlist-current");
-				$(this.cssSelector.title + " li").html(this.playlist[index].title + (this.playlist[index].artist ? " <span class='jp-artist'>by " + this.playlist[index].artist + "</span>" : ""));
-			}
-		},
-		setPlaylist: function(playlist) {
-			this._initPlaylist(playlist);
-			this._init();
-		},
-		add: function(media, playNow) {
-			$(this.cssSelector.playlist + " ul").append(this._createListItem(media)).find("li:last-child").hide().slideDown(this.options.playlistOptions.addTime);
-			this._updateControls();
-			this.original.push(media);
-			this.playlist.push(media); // Both array elements share the same object pointer. Comforms with _initPlaylist(p) system.
-
-			if(playNow) {
-				this.play(this.playlist.length - 1);
-			} else {
-				if(this.original.length === 1) {
-					this.select(0);
-				}
-			}
-		},
-		remove: function(index) {
-			var self = this;
-
-			if(index === undefined) {
-				this._initPlaylist([]);
-				this._refresh(function() {
-					$(self.cssSelector.jPlayer).jPlayer("clearMedia");
-				});
-				return true;
-			} else {
-
-				if(this.removing) {
-					return false;
-				} else {
-					index = (index < 0) ? self.original.length + index : index; // Negative index relates to end of array.
-					if(0 <= index && index < this.playlist.length) {
-						this.removing = true;
-
-						$(this.cssSelector.playlist + " li:nth-child(" + (index + 1) + ")").slideUp(this.options.playlistOptions.removeTime, function() {
-							$(this).remove();
-
-							if(self.shuffled) {
-								var item = self.playlist[index];
-								$.each(self.original, function(i,v) {
-									if(self.original[i] === item) {
-										self.original.splice(i, 1);
-										return false; // Exit $.each
-									}
-								});
-								self.playlist.splice(index, 1);
-							} else {
-								self.original.splice(index, 1);
-								self.playlist.splice(index, 1);
-							}
-
-							if(self.original.length) {
-								if(index === self.current) {
-									self.current = (index < self.original.length) ? self.current : self.original.length - 1; // To cope when last element being selected when it was removed
-									self.select(self.current);
-								} else if(index < self.current) {
-									self.current--;
-								}
-							} else {
-								$(self.cssSelector.jPlayer).jPlayer("clearMedia");
-								self.current = 0;
-								self.shuffled = false;
-								self._updateControls();
-							}
-
-							self.removing = false;
-						});
-					}
-					return true;
-				}
-			}
-		},
-		select: function(index) {
-			index = (index < 0) ? this.original.length + index : index; // Negative index relates to end of array.
-			if(0 <= index && index < this.playlist.length) {
-				this.current = index;
-				this._highlight(index);
-				$(this.cssSelector.jPlayer).jPlayer("setMedia", this.playlist[this.current]);
-			} else {
-				this.current = 0;
-			}
-		},
-		play: function(index) {
-			index = (index < 0) ? this.original.length + index : index; // Negative index relates to end of array.
-			if(0 <= index && index < this.playlist.length) {
-				if(this.playlist.length) {
-					this.select(index);
-					$(this.cssSelector.jPlayer).jPlayer("play");
-				}
-			} else if(index === undefined) {
-				$(this.cssSelector.jPlayer).jPlayer("play");
-			}
-		},
-		pause: function() {
-			$(this.cssSelector.jPlayer).jPlayer("pause");
-		},
-		next: function() {
-			var index = (this.current + 1 < this.playlist.length) ? this.current + 1 : 0;
-
-			if(this.loop) {
-				// See if we need to shuffle before looping to start, and only shuffle if more than 1 item.
-				if(index === 0 && this.shuffled && this.options.playlistOptions.shuffleOnLoop && this.playlist.length > 1) {
-					this.shuffle(true, true); // playNow
-				} else {
-					this.play(index);
-				}
-			} else {
-				// The index will be zero if it just looped round
-				if(index > 0) {
-					this.play(index);
-				}
-			}
-		},
-		previous: function() {
-			var index = (this.current - 1 >= 0) ? this.current - 1 : this.playlist.length - 1;
-
-			if(this.loop && this.options.playlistOptions.loopOnPrevious || index < this.playlist.length - 1) {
-				this.play(index);
-			}
-		},
-		shuffle: function(shuffled, playNow) {
-			var self = this;
-
-			if(shuffled === undefined) {
-				shuffled = !this.shuffled;
-			}
-
-			if(shuffled || shuffled !== this.shuffled) {
-
-				$(this.cssSelector.playlist + " ul").slideUp(this.options.playlistOptions.shuffleTime, function() {
-					self.shuffled = shuffled;
-					if(shuffled) {
-						self.playlist.sort(function() {
-							return 0.5 - Math.random();
-						});
-					} else {
-						self._originalPlaylist();
-					}
-					self._refresh(true); // Instant
-
-					if(playNow || !$(self.cssSelector.jPlayer).data("jPlayer").status.paused) {
-						self.play(0);
-					} else {
-						self.select(0);
-					}
-
-					$(this).slideDown(self.options.playlistOptions.shuffleTime);
-				});
-			}
-		}
-	};
-})(jQuery);
diff --git a/apps/media/js/jQuery.jPlayer.2.1.0.source/add-on/jquery.jplayer.inspector.js b/apps/media/js/jQuery.jPlayer.2.1.0.source/add-on/jquery.jplayer.inspector.js
deleted file mode 100644
index 46c090a1b0..0000000000
--- a/apps/media/js/jQuery.jPlayer.2.1.0.source/add-on/jquery.jplayer.inspector.js
+++ /dev/null
@@ -1,331 +0,0 @@
-/*
- * jPlayerInspector Plugin for jPlayer (2.0.0+) Plugin for jQuery JavaScript Library
- * http://www.happyworm.com/jquery/jplayer
- *
- * Copyright (c) 2009 - 2011 Happyworm Ltd
- * Dual licensed under the MIT and GPL licenses.
- *  - http://www.opensource.org/licenses/mit-license.php
- *  - http://www.gnu.org/copyleft/gpl.html
- *
- * Author: Mark J Panaghiston
- * Version: 1.0.3
- * Date: 7th August 2011
- *
- * For use with jPlayer Version: 2.0.29
- *
- * Note: Declare inspector instances after jPlayer instances. ie., Otherwise the jPlayer instance is nonsense.
- */
-
-(function($, undefined) {
-	$.jPlayerInspector = {};
-	$.jPlayerInspector.i = 0;
-	$.jPlayerInspector.defaults = {
-		jPlayer: undefined, // The jQuery selector of the jPlayer instance to inspect.
-		idPrefix: "jplayer_inspector_",
-		visible: false
-	};
-	
-	var methods = {
-		init: function(options) {
-			var self = this;
-			var $this = $(this);
-			
-			var config = $.extend({}, $.jPlayerInspector.defaults, options);
-			$(this).data("jPlayerInspector", config);
-
-			config.id = $(this).attr("id");
-			config.jPlayerId = config.jPlayer.attr("id");
-
-			config.windowId = config.idPrefix + "window_" + $.jPlayerInspector.i;
-			config.statusId = config.idPrefix + "status_" + $.jPlayerInspector.i;
-			config.configId = config.idPrefix + "config_" + $.jPlayerInspector.i;
-			config.toggleId = config.idPrefix + "toggle_" + $.jPlayerInspector.i;
-			config.eventResetId = config.idPrefix + "event_reset_" + $.jPlayerInspector.i;
-			config.updateId = config.idPrefix + "update_" + $.jPlayerInspector.i;
-			config.eventWindowId = config.idPrefix + "event_window_" + $.jPlayerInspector.i;
-			
-			config.eventId = {};
-			config.eventJq = {};
-			config.eventTimeout = {};
-			config.eventOccurrence = {};
-			
-			$.each($.jPlayer.event, function(eventName,eventType) {
-				config.eventId[eventType] = config.idPrefix + "event_" + eventName + "_" + $.jPlayerInspector.i;
-				config.eventOccurrence[eventType] = 0;
-			});
-			
-			var structure = 
-				'<p><a href="#" id="' + config.toggleId + '">' + (config.visible ? "Hide" : "Show") + '</a> jPlayer Inspector</p>' 
-				+ '<div id="' + config.windowId + '">'
-					+ '<div id="' + config.statusId + '"></div>'
-					+ '<div id="' + config.eventWindowId + '" style="padding:5px 5px 0 5px;background-color:#eee;border:1px dotted #000;">'
-						+ '<p style="margin:0 0 10px 0;"><strong>jPlayer events that have occurred over the past 1 second:</strong>'
-						+ '<br />(Backgrounds: <span style="padding:0 5px;background-color:#eee;border:1px dotted #000;">Never occurred</span> <span style="padding:0 5px;background-color:#fff;border:1px dotted #000;">Occurred before</span> <span style="padding:0 5px;background-color:#9f9;border:1px dotted #000;">Occurred</span> <span style="padding:0 5px;background-color:#ff9;border:1px dotted #000;">Multiple occurrences</span> <a href="#" id="' + config.eventResetId + '">reset</a>)</p>';
-			
-			// MJP: Would use the next 3 lines for ease, but the events are just slapped on the page.
-			// $.each($.jPlayer.event, function(eventName,eventType) {
-			// 	structure += '<div id="' + config.eventId[eventType] + '" style="float:left;">' + eventName + '</div>';
-			// });
-			
-			var eventStyle = "float:left;margin:0 5px 5px 0;padding:0 5px;border:1px dotted #000;";
-			// MJP: Doing it longhand so order and layout easier to control.
-			structure +=
-						'<div id="' + config.eventId[$.jPlayer.event.ready] + '" style="' + eventStyle + '"></div>'
-						+ '<div id="' + config.eventId[$.jPlayer.event.flashreset] + '" style="' + eventStyle + '"></div>'
-						+ '<div id="' + config.eventId[$.jPlayer.event.resize] + '" style="' + eventStyle + '"></div>'
-						+ '<div id="' + config.eventId[$.jPlayer.event.repeat] + '" style="' + eventStyle + '"></div>'
-						+ '<div id="' + config.eventId[$.jPlayer.event.click] + '" style="' + eventStyle + '"></div>'
-						+ '<div id="' + config.eventId[$.jPlayer.event.error] + '" style="' + eventStyle + '"></div>'
-						+ '<div id="' + config.eventId[$.jPlayer.event.warning] + '" style="' + eventStyle + '"></div>'
-
-						+ '<div id="' + config.eventId[$.jPlayer.event.loadstart] + '" style="clear:left;' + eventStyle + '"></div>'
-						+ '<div id="' + config.eventId[$.jPlayer.event.progress] + '" style="' + eventStyle + '"></div>'
-						+ '<div id="' + config.eventId[$.jPlayer.event.timeupdate] + '" style="' + eventStyle + '"></div>'
-						+ '<div id="' + config.eventId[$.jPlayer.event.volumechange] + '" style="' + eventStyle + '"></div>'
-
-						+ '<div id="' + config.eventId[$.jPlayer.event.play] + '" style="clear:left;' + eventStyle + '"></div>'
-						+ '<div id="' + config.eventId[$.jPlayer.event.pause] + '" style="' + eventStyle + '"></div>'
-						+ '<div id="' + config.eventId[$.jPlayer.event.waiting] + '" style="' + eventStyle + '"></div>'
-						+ '<div id="' + config.eventId[$.jPlayer.event.playing] + '" style="' + eventStyle + '"></div>'
-						+ '<div id="' + config.eventId[$.jPlayer.event.seeking] + '" style="' + eventStyle + '"></div>'
-						+ '<div id="' + config.eventId[$.jPlayer.event.seeked] + '" style="' + eventStyle + '"></div>'
-						+ '<div id="' + config.eventId[$.jPlayer.event.ended] + '" style="' + eventStyle + '"></div>'
-
-						+ '<div id="' + config.eventId[$.jPlayer.event.loadeddata] + '" style="clear:left;' + eventStyle + '"></div>'
-						+ '<div id="' + config.eventId[$.jPlayer.event.loadedmetadata] + '" style="' + eventStyle + '"></div>'
-						+ '<div id="' + config.eventId[$.jPlayer.event.canplay] + '" style="' + eventStyle + '"></div>'
-						+ '<div id="' + config.eventId[$.jPlayer.event.canplaythrough] + '" style="' + eventStyle + '"></div>'
-
-						+ '<div id="' + config.eventId[$.jPlayer.event.suspend] + '" style="clear:left;' + eventStyle + '"></div>'
-						+ '<div id="' + config.eventId[$.jPlayer.event.abort] + '" style="' + eventStyle + '"></div>'
-						+ '<div id="' + config.eventId[$.jPlayer.event.emptied] + '" style="' + eventStyle + '"></div>'
-						+ '<div id="' + config.eventId[$.jPlayer.event.stalled] + '" style="' + eventStyle + '"></div>'
-						+ '<div id="' + config.eventId[$.jPlayer.event.ratechange] + '" style="' + eventStyle + '"></div>'
-						+ '<div id="' + config.eventId[$.jPlayer.event.durationchange] + '" style="' + eventStyle + '"></div>'
-
-						+ '<div style="clear:both"></div>';
-
-			// MJP: Would like a check here in case we missed an event.
-
-			// MJP: Check fails, since it is not on the page yet.
-/*			$.each($.jPlayer.event, function(eventName,eventType) {
-				if($("#" + config.eventId[eventType])[0] === undefined) {
-					structure += '<div id="' + config.eventId[eventType] + '" style="clear:left;' + eventStyle + '">' + eventName + '</div>';
-				}
-			});
-*/
-			structure +=
-					'</div>'
-					+ '<p><a href="#" id="' + config.updateId + '">Update</a> jPlayer Inspector</p>'
-					+ '<div id="' + config.configId + '"></div>'
-				+ '</div>';
-			$(this).html(structure);
-			
-			config.windowJq = $("#" + config.windowId);
-			config.statusJq = $("#" + config.statusId);
-			config.configJq = $("#" + config.configId);
-			config.toggleJq = $("#" + config.toggleId);
-			config.eventResetJq = $("#" + config.eventResetId);
-			config.updateJq = $("#" + config.updateId);
-
-			$.each($.jPlayer.event, function(eventName,eventType) {
-				config.eventJq[eventType] = $("#" + config.eventId[eventType]);
-				config.eventJq[eventType].text(eventName + " (" + config.eventOccurrence[eventType] + ")"); // Sets the text to the event name and (0);
-				
-				config.jPlayer.bind(eventType + ".jPlayerInspector", function(e) {
-					config.eventOccurrence[e.type]++;
-					if(config.eventOccurrence[e.type] > 1) {
-						config.eventJq[e.type].css("background-color","#ff9");
-					} else {
-						config.eventJq[e.type].css("background-color","#9f9");
-					}
-					config.eventJq[e.type].text(eventName + " (" + config.eventOccurrence[e.type] + ")");
-					// The timer to handle the color
-					clearTimeout(config.eventTimeout[e.type]);
-					config.eventTimeout[e.type] = setTimeout(function() {
-						config.eventJq[e.type].css("background-color","#fff");
-					}, 1000);
-					// The timer to handle the occurences.
-					setTimeout(function() {
-						config.eventOccurrence[e.type]--;
-						config.eventJq[e.type].text(eventName + " (" + config.eventOccurrence[e.type] + ")");
-					}, 1000);
-					if(config.visible) { // Update the status, if inspector open.
-						$this.jPlayerInspector("updateStatus");
-					}
-				});
-			});
-
-			config.jPlayer.bind($.jPlayer.event.ready + ".jPlayerInspector", function(e) {
-				$this.jPlayerInspector("updateConfig");
-			});
-
-			config.toggleJq.click(function() {
-				if(config.visible) {
-					$(this).text("Show");
-					config.windowJq.hide();
-					config.statusJq.empty();
-					config.configJq.empty();
-				} else {
-					$(this).text("Hide");
-					config.windowJq.show();
-					config.updateJq.click();
-				}
-				config.visible = !config.visible;
-				$(this).blur();
-				return false;
-			});
-
-			config.eventResetJq.click(function() {
-				$.each($.jPlayer.event, function(eventName,eventType) {
-					config.eventJq[eventType].css("background-color","#eee");
-				});
-				$(this).blur();
-				return false;
-			});
-
-			config.updateJq.click(function() {
-				$this.jPlayerInspector("updateStatus");
-				$this.jPlayerInspector("updateConfig");
-				return false;
-			});
-
-			if(!config.visible) {
-				config.windowJq.hide();
-			} else {
-				// config.updateJq.click();
-			}
-			
-			$.jPlayerInspector.i++;
-
-			return this;
-		},
-		destroy: function() {
-			$(this).data("jPlayerInspector") && $(this).data("jPlayerInspector").jPlayer.unbind(".jPlayerInspector");
-			$(this).empty();
-		},
-		updateConfig: function() { // This displays information about jPlayer's configuration in inspector
-		
-			var jPlayerInfo = "<p>This jPlayer instance is running in your browser where:<br />"
-
-			for(i = 0; i < $(this).data("jPlayerInspector").jPlayer.data("jPlayer").solutions.length; i++) {
-				var solution = $(this).data("jPlayerInspector").jPlayer.data("jPlayer").solutions[i];
-				jPlayerInfo += "&nbsp;jPlayer's <strong>" + solution + "</strong> solution is";				
-				if($(this).data("jPlayerInspector").jPlayer.data("jPlayer")[solution].used) {
-					jPlayerInfo += " being <strong>used</strong> and will support:<strong>";
-					for(format in $(this).data("jPlayerInspector").jPlayer.data("jPlayer")[solution].support) {
-						if($(this).data("jPlayerInspector").jPlayer.data("jPlayer")[solution].support[format]) {
-							jPlayerInfo += " " + format;
-						}
-					}
-					jPlayerInfo += "</strong><br />";
-				} else {
-					jPlayerInfo += " <strong>not required</strong><br />";
-				}
-			}
-			jPlayerInfo += "</p>";
-
-			if($(this).data("jPlayerInspector").jPlayer.data("jPlayer").html.active) {
-				if($(this).data("jPlayerInspector").jPlayer.data("jPlayer").flash.active) {
-					jPlayerInfo += "<strong>Problem with jPlayer since both HTML5 and Flash are active.</strong>";
-				} else {
-					jPlayerInfo += "The <strong>HTML5 is active</strong>.";
-				}
-			} else {
-				if($(this).data("jPlayerInspector").jPlayer.data("jPlayer").flash.active) {
-					jPlayerInfo += "The <strong>Flash is active</strong>.";
-				} else {
-					jPlayerInfo += "No solution is currently active. jPlayer needs a setMedia().";
-				}
-			}
-			jPlayerInfo += "</p>";
-
-			var formatType = $(this).data("jPlayerInspector").jPlayer.data("jPlayer").status.formatType;
-			jPlayerInfo += "<p><code>status.formatType = '" + formatType + "'</code><br />";
-			if(formatType) {
-				jPlayerInfo += "<code>Browser canPlay('" + $.jPlayer.prototype.format[formatType].codec + "')</code>";
-			} else {
-				jPlayerInfo += "</p>";
-			}
-			
-			jPlayerInfo += "<p><code>status.src = '" + $(this).data("jPlayerInspector").jPlayer.data("jPlayer").status.src + "'</code></p>";
-
-			jPlayerInfo += "<p><code>status.media = {<br />";
-			for(prop in $(this).data("jPlayerInspector").jPlayer.data("jPlayer").status.media) {
-				jPlayerInfo += "&nbsp;" + prop + ": " + $(this).data("jPlayerInspector").jPlayer.data("jPlayer").status.media[prop] + "<br />"; // Some are strings
-			}
-			jPlayerInfo += "};</code></p>"
-
-			+ "<p>Raw browser test for HTML5 support. Should equal a function if HTML5 is available.<br />";
-			if($(this).data("jPlayerInspector").jPlayer.data("jPlayer").html.audio.available) {
-				jPlayerInfo += "<code>htmlElement.audio.canPlayType = " + (typeof $(this).data("jPlayerInspector").jPlayer.data("jPlayer").htmlElement.audio.canPlayType) +"</code><br />"
-			}
-			if($(this).data("jPlayerInspector").jPlayer.data("jPlayer").html.video.available) {
-				jPlayerInfo += "<code>htmlElement.video.canPlayType = " + (typeof $(this).data("jPlayerInspector").jPlayer.data("jPlayer").htmlElement.video.canPlayType) +"</code>";
-			}
-			jPlayerInfo += "</p>";
-
-			jPlayerInfo += "<p>This instance is using the constructor options:<br />"
-			+ "<code>$('#" + $(this).data("jPlayerInspector").jPlayer.data("jPlayer").internal.self.id + "').jPlayer({<br />"
-
-			+ "&nbsp;swfPath: '" + $(this).data("jPlayerInspector").jPlayer.jPlayer("option", "swfPath") + "',<br />"
-
-			+ "&nbsp;solution: '" + $(this).data("jPlayerInspector").jPlayer.jPlayer("option", "solution") + "',<br />"
-
-			+ "&nbsp;supplied: '" + $(this).data("jPlayerInspector").jPlayer.jPlayer("option", "supplied") + "',<br />"
-
-			+ "&nbsp;preload: '" + $(this).data("jPlayerInspector").jPlayer.jPlayer("option", "preload") + "',<br />"
-			
-			+ "&nbsp;volume: " + $(this).data("jPlayerInspector").jPlayer.jPlayer("option", "volume") + ",<br />"
-			
-			+ "&nbsp;muted: " + $(this).data("jPlayerInspector").jPlayer.jPlayer("option", "muted") + ",<br />"
-
-			+ "&nbsp;backgroundColor: '" + $(this).data("jPlayerInspector").jPlayer.jPlayer("option", "backgroundColor") + "',<br />"
-
-			+ "&nbsp;cssSelectorAncestor: '" + $(this).data("jPlayerInspector").jPlayer.jPlayer("option", "cssSelectorAncestor") + "',<br />"
-
-			+ "&nbsp;cssSelector: {";
-
-			var cssSelector = $(this).data("jPlayerInspector").jPlayer.jPlayer("option", "cssSelector");
-			for(prop in cssSelector) {
-				
-				// jPlayerInfo += "<br />&nbsp;&nbsp;" + prop + ": '" + cssSelector[prop] + "'," // This works too of course, but want to use option method for deep keys.
-				jPlayerInfo += "<br />&nbsp;&nbsp;" + prop + ": '" + $(this).data("jPlayerInspector").jPlayer.jPlayer("option", "cssSelector." + prop) + "',"
-			}
-
-			jPlayerInfo = jPlayerInfo.slice(0, -1); // Because the sloppy comma was bugging me.
-
-			jPlayerInfo += "<br />&nbsp;},<br />"
-
-			+ "&nbsp;errorAlerts: " + $(this).data("jPlayerInspector").jPlayer.jPlayer("option", "errorAlerts") + ",<br />"
-			
-			+ "&nbsp;warningAlerts: " + $(this).data("jPlayerInspector").jPlayer.jPlayer("option", "warningAlerts") + "<br />"
-
-			+ "});</code></p>";
-			$(this).data("jPlayerInspector").configJq.html(jPlayerInfo);
-			return this;
-		},
-		updateStatus: function() { // This displays information about jPlayer's status in the inspector
-			$(this).data("jPlayerInspector").statusJq.html(
-				"<p>jPlayer is " +
-				($(this).data("jPlayerInspector").jPlayer.data("jPlayer").status.paused ? "paused" : "playing") +
-				" at time: " + Math.floor($(this).data("jPlayerInspector").jPlayer.data("jPlayer").status.currentTime*10)/10 + "s." +
-				" (d: " + Math.floor($(this).data("jPlayerInspector").jPlayer.data("jPlayer").status.duration*10)/10 + "s" +
-				", sp: " + Math.floor($(this).data("jPlayerInspector").jPlayer.data("jPlayer").status.seekPercent) + "%" +
-				", cpr: " + Math.floor($(this).data("jPlayerInspector").jPlayer.data("jPlayer").status.currentPercentRelative) + "%" +
-				", cpa: " + Math.floor($(this).data("jPlayerInspector").jPlayer.data("jPlayer").status.currentPercentAbsolute) + "%)</p>"
-			);
-			return this;
-		}
-	};
-	$.fn.jPlayerInspector = function( method ) {
-		// Method calling logic
-		if ( methods[method] ) {
-			return methods[ method ].apply( this, Array.prototype.slice.call( arguments, 1 ));
-		} else if ( typeof method === 'object' || ! method ) {
-			return methods.init.apply( this, arguments );
-		} else {
-			$.error( 'Method ' +  method + ' does not exist on jQuery.jPlayerInspector' );
-		}    
-	};
-})(jQuery);
diff --git a/apps/media/js/jQuery.jPlayer.2.1.0.source/happyworm/jPlayer/JplayerEvent.as b/apps/media/js/jQuery.jPlayer.2.1.0.source/happyworm/jPlayer/JplayerEvent.as
deleted file mode 100644
index addb97a7ae..0000000000
--- a/apps/media/js/jQuery.jPlayer.2.1.0.source/happyworm/jPlayer/JplayerEvent.as
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * jPlayer Plugin for jQuery JavaScript Library
- * http://www.happyworm.com/jquery/jplayer
- *
- * Copyright (c) 2009 - 2011 Happyworm Ltd
- * Dual licensed under the MIT and GPL licenses.
- *  - http://www.opensource.org/licenses/mit-license.php
- *  - http://www.gnu.org/copyleft/gpl.html
- *
- * Author: Mark J Panaghiston
- * Date: 8th August 2011
- */
-
-package happyworm.jPlayer {
-	import flash.events.Event;
-	
-	public class JplayerEvent extends Event {
-		
-		// The event strings must match those in the JavaScript's $.jPlayer.event object
-
-		public static const JPLAYER_READY:String = "jPlayer_ready";
-		public static const JPLAYER_FLASHRESET:String = "jPlayer_flashreset"; // Handled in JavaScript
-		public static const JPLAYER_RESIZE:String = "jPlayer_resize"; // Handled in JavaScript
-		public static const JPLAYER_REPEAT:String = "jPlayer_repeat"; // Handled in JavaScript
-		public static const JPLAYER_CLICK:String = "jPlayer_click";
-		public static const JPLAYER_ERROR:String = "jPlayer_error";
-		public static const JPLAYER_WARNING:String = "jPlayer_warning"; // Currently not used by the flash solution
-
-		public static const JPLAYER_LOADSTART:String = "jPlayer_loadstart";
-		public static const JPLAYER_PROGRESS:String = "jPlayer_progress";
-		public static const JPLAYER_SUSPEND:String = "jPlayer_suspend"; // Not implemented
-		public static const JPLAYER_ABORT:String = "jPlayer_abort"; // Not implemented
-		public static const JPLAYER_EMPTIED:String = "jPlayer_emptied"; // Not implemented
-		public static const JPLAYER_STALLED:String = "jPlayer_stalled"; // Not implemented
-		public static const JPLAYER_PLAY:String = "jPlayer_play";
-		public static const JPLAYER_PAUSE:String = "jPlayer_pause";
-		public static const JPLAYER_LOADEDMETADATA:String = "jPlayer_loadedmetadata"; // MP3 has no equivilent
-		public static const JPLAYER_LOADEDDATA:String = "jPlayer_loadeddata"; // Not implemented
-		public static const JPLAYER_WAITING:String = "jPlayer_waiting"; // Not implemented
-		public static const JPLAYER_PLAYING:String = "jPlayer_playing"; // Not implemented
-		public static const JPLAYER_CANPLAY:String = "jPlayer_canplay"; // Not implemented
-		public static const JPLAYER_CANPLAYTHROUGH:String = "jPlayer_canplaythrough"; // Not implemented
-		public static const JPLAYER_SEEKING:String = "jPlayer_seeking";
-		public static const JPLAYER_SEEKED:String = "jPlayer_seeked";
-		public static const JPLAYER_TIMEUPDATE:String = "jPlayer_timeupdate";
-		public static const JPLAYER_ENDED:String = "jPlayer_ended";
-		public static const JPLAYER_RATECHANGE:String = "jPlayer_ratechange"; // Not implemented
-		public static const JPLAYER_DURATIONCHANGE:String = "jPlayer_durationchange"; // Not implemented
-		public static const JPLAYER_VOLUMECHANGE:String = "jPlayer_volumechange"; // See JavaScript
-
-		// Events used internal to jPlayer's Flash.
-		public static const DEBUG_MSG:String = "debug_msg";
-
-		public var data:JplayerStatus;
-		public var msg:String = ""
-
-		public function JplayerEvent(type:String, data:JplayerStatus, msg:String = "", bubbles:Boolean = false, cancelable:Boolean = false) {
-			super(type, bubbles, cancelable);
-			this.data = data;
-			this.msg = msg;
-		}
-		public override function clone():Event {
-			return new JplayerEvent(type, data, msg, bubbles, cancelable);
-		}
-		public override function toString():String {
-			return formatToString("JplayerEvent", "type", "bubbles", "cancelable", "eventPhase", "data", "msg");
-		}
-	}
-}
\ No newline at end of file
diff --git a/apps/media/js/jQuery.jPlayer.2.1.0.source/happyworm/jPlayer/JplayerMp3.as b/apps/media/js/jQuery.jPlayer.2.1.0.source/happyworm/jPlayer/JplayerMp3.as
deleted file mode 100644
index 8c51d5b763..0000000000
--- a/apps/media/js/jQuery.jPlayer.2.1.0.source/happyworm/jPlayer/JplayerMp3.as
+++ /dev/null
@@ -1,328 +0,0 @@
-/*
- * jPlayer Plugin for jQuery JavaScript Library
- * http://www.happyworm.com/jquery/jplayer
- *
- * Copyright (c) 2009 - 2011 Happyworm Ltd
- * Dual licensed under the MIT and GPL licenses.
- *  - http://www.opensource.org/licenses/mit-license.php
- *  - http://www.gnu.org/copyleft/gpl.html
- *
- * Author: Mark J Panaghiston
- * Date: 1st September 2011
- */
-
-package happyworm.jPlayer {
-	import flash.display.Sprite;
-
-	import flash.media.Sound;
-	import flash.media.SoundChannel;
-	import flash.media.SoundLoaderContext;
-	import flash.media.SoundTransform;
-	import flash.net.URLRequest;
-	import flash.utils.Timer;
-	import flash.errors.IOError;
-	import flash.events.*;
-
-	public class JplayerMp3 extends Sprite {
-		private var mySound:Sound = new Sound();
-		private var myChannel:SoundChannel = new SoundChannel();
-		private var myContext:SoundLoaderContext = new SoundLoaderContext(3000, false);
-		private var myTransform:SoundTransform = new SoundTransform();
-		private var myRequest:URLRequest = new URLRequest();
-
-		private var timeUpdateTimer:Timer = new Timer(250, 0); // Matched to HTML event freq
-		private var progressTimer:Timer = new Timer(250, 0); // Matched to HTML event freq
-		private var seekingTimer:Timer = new Timer(100, 0); // Internal: How often seeking is checked to see if it is over.
-		
-		public var myStatus:JplayerStatus = new JplayerStatus();
-
-		public function JplayerMp3(volume:Number) {
-			timeUpdateTimer.addEventListener(TimerEvent.TIMER, timeUpdateHandler);
-			progressTimer.addEventListener(TimerEvent.TIMER, progressHandler);
-			seekingTimer.addEventListener(TimerEvent.TIMER, seekingHandler);
-			setVolume(volume);
-		}
-		public function setFile(src:String):void {
-			this.dispatchEvent(new JplayerEvent(JplayerEvent.DEBUG_MSG, myStatus, "setFile: " + src));
-			if(myStatus.isPlaying) {
-				myChannel.stop();
-				progressUpdates(false);
-				timeUpdates(false);
-			}
-			try {
-				mySound.close();
-			} catch (err:IOError) {
-				// Occurs if the file is either yet to be opened or has finished downloading.
-			}
-			mySound = null;
-			mySound = new Sound();
-			mySound.addEventListener(IOErrorEvent.IO_ERROR, errorHandler);
-			mySound.addEventListener(Event.OPEN, loadOpen);
-			mySound.addEventListener(Event.COMPLETE, loadComplete);
-			myRequest = new URLRequest(src);
-			myStatus.reset();
-			myStatus.src = src;
-			myStatus.srcSet = true;
-			timeUpdateEvent();
-		}
-		public function clearFile():void {
-			setFile("");
-			myStatus.srcSet = false;
-		}
-		private function errorHandler(err:IOErrorEvent):void {
-			// MP3 player needs to stop progress and timeupdate events as they are started before the error occurs.
-			// NB: The MP4 player works differently and the error occurs before they are started.
-			progressUpdates(false);
-			timeUpdates(false);
-			myStatus.error(); // Resets status except the src, and it sets srcError property.
-			this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_ERROR, myStatus));
-		}
-		private function loadOpen(e:Event):void {
-			this.dispatchEvent(new JplayerEvent(JplayerEvent.DEBUG_MSG, myStatus, "loadOpen:"));
-			myStatus.loading();
-			if(myStatus.playOnLoad) {
-				myStatus.playOnLoad = false; // Capture the flag
-				this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_LOADSTART, myStatus)); // So loadstart event happens before play event occurs.
-				play();
-			} else {
-				this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_LOADSTART, myStatus));
-				pause();
-			}
-			progressUpdates(true);
-		}
-		private function loadComplete(e:Event):void {
-			this.dispatchEvent(new JplayerEvent(JplayerEvent.DEBUG_MSG, myStatus, "loadComplete:"));
-			myStatus.loaded();
-			progressUpdates(false);
-			progressEvent();
-		}
-		private function soundCompleteHandler(e:Event):void {
-			myStatus.pausePosition = 0;
-			myStatus.isPlaying = false;
-			timeUpdates(false);
-			timeUpdateEvent();
-			this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_ENDED, myStatus));
-		}
-		private function progressUpdates(active:Boolean):void {
-			// Using a timer rather than Flash's load progress event, because that event gave data at about 200Hz. The 10Hz timer is closer to HTML5 norm.
-			if(active) {
-				progressTimer.start();
-			} else {
-				progressTimer.stop();
-			}
-		}
-		private function progressHandler(e:TimerEvent):void {
-			progressEvent();
-		}
-		private function progressEvent():void {
-			this.dispatchEvent(new JplayerEvent(JplayerEvent.DEBUG_MSG, myStatus, "progressEvent:"));
-			updateStatusValues();
-			this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_PROGRESS, myStatus));
-		}
-		private function timeUpdates(active:Boolean):void {
-			if(active) {
-				timeUpdateTimer.start();
-			} else {
-				timeUpdateTimer.stop();
-			}
-		}
-		private function timeUpdateHandler(e:TimerEvent):void {
-			timeUpdateEvent();
-		}
-		private function timeUpdateEvent():void {
-			updateStatusValues();
-			this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_TIMEUPDATE, myStatus));
-		}
-		private function seeking(active:Boolean):void {
-			if(active) {
-				if(!myStatus.isSeeking) {
-					seekingEvent();
-					seekingTimer.start();
-				}
-			} else {
-				seekingTimer.stop();
-			}
-		}
-		private function seekingHandler(e:TimerEvent):void {
-			if(myStatus.pausePosition <= getDuration()) {
-				seekedEvent();
-				seeking(false);
-				if(myStatus.playOnSeek) {
-					myStatus.playOnSeek = false; // Capture the flag.
-					play();
-				}
-			} else if(myStatus.isLoaded && (myStatus.pausePosition > getDuration())) {
-				// Illegal seek time
-				seeking(false);
-				seekedEvent();
-				pause(0);
-			}
-		}
-		private function seekingEvent():void {
-			myStatus.isSeeking = true;
-			updateStatusValues();
-			this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_SEEKING, myStatus));
-		}
-		private function seekedEvent():void {
-			myStatus.isSeeking = false;
-			updateStatusValues();
-			this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_SEEKED, myStatus));
-		}
-		public function load():Boolean {
-			if(myStatus.loadRequired()) {
-				myStatus.startingDownload();
-				mySound.load(myRequest, myContext);
-				return true;
-			} else {
-				return false;
-			}
-		}
-		public function play(time:Number = NaN):Boolean {
-			var wasPlaying:Boolean = myStatus.isPlaying;
-
-			if(!isNaN(time) && myStatus.srcSet) {
-				if(myStatus.isPlaying) {
-					myChannel.stop();
-					myStatus.isPlaying = false;
-				}
-				myStatus.pausePosition = time;
-			}
-
-			if(myStatus.isStartingDownload) {
-				myStatus.playOnLoad = true; // Raise flag, captured in loadOpen()
-				return true;
-			} else if(myStatus.loadRequired()) {
-				myStatus.playOnLoad = true; // Raise flag, captured in loadOpen()
-				return load();
-			} else if((myStatus.isLoading || myStatus.isLoaded) && !myStatus.isPlaying) {
-				if(myStatus.isLoaded && myStatus.pausePosition > getDuration()) { // The time is invalid, ie., past the end.
-					myStatus.pausePosition = 0;
-					timeUpdates(false);
-					timeUpdateEvent();
-					if(wasPlaying) { // For when playing and then get a play(huge)
-						this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_PAUSE, myStatus));
-					}
-				} else if(myStatus.pausePosition > getDuration()) {
-					myStatus.playOnSeek = true;
-					seeking(true);
-				} else {
-					myStatus.isPlaying = true; // Set immediately before playing. Could affects events.
-					myChannel = mySound.play(myStatus.pausePosition);
-					myChannel.soundTransform = myTransform;
-					myChannel.addEventListener(Event.SOUND_COMPLETE, soundCompleteHandler);
-					timeUpdates(true);
-					if(!wasPlaying) {
-						this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_PLAY, myStatus));
-					}
-				}
-				return true;
-			} else {
-				return false;
-			}
-		}
-		public function pause(time:Number = NaN):Boolean {
-			myStatus.playOnLoad = false; // Reset flag in case load/play issued immediately before this command, ie., before loadOpen() event.
-			myStatus.playOnSeek = false; // Reset flag in case play(time) issued before the command and is still seeking to time set.
-
-			var wasPlaying:Boolean = myStatus.isPlaying;
-
-			// To avoid possible loops with timeupdate and pause(time). A pause() does not have the problem.
-			var alreadyPausedAtTime:Boolean = false;
-			if(!isNaN(time) && myStatus.pausePosition == time) {
-				alreadyPausedAtTime = true;
-			}
-
-			if(myStatus.isPlaying) {
-				myStatus.isPlaying = false;
-				myChannel.stop();
-				if(myChannel.position > 0) { // Required otherwise a fast play then pause causes myChannel.position to equal zero and not the correct value. ie., When it happens leave pausePosition alone.
-					myStatus.pausePosition = myChannel.position;
-				}
-			}
-
-			if(!isNaN(time) && myStatus.srcSet) {
-				myStatus.pausePosition = time;
-			}
-
-			if(wasPlaying) {
-				this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_PAUSE, myStatus));
-			}
-			
-			if(myStatus.isStartingDownload) {
-				return true;
-			} else if(myStatus.loadRequired()) {
-				if(time > 0) { // We do not want the stop() command, which does pause(0), causing a load operation.
-					return load();
-				} else {
-					return true; // Technically the pause(0) succeeded. ie., It did nothing, since nothing was required.
-				}
-			} else if(myStatus.isLoading || myStatus.isLoaded) {
-				if(myStatus.isLoaded && myStatus.pausePosition > getDuration()) { // The time is invalid, ie., past the end.
-					myStatus.pausePosition = 0;
-				} else if(myStatus.pausePosition > getDuration()) {
-					seeking(true);
-				}
-				timeUpdates(false);
-				// Need to be careful with timeupdate event, otherwise a pause in a timeupdate event can cause a loop.
-				// Neither pause() nor pause(time) will cause a timeupdate loop.
-				if(wasPlaying || !isNaN(time) && !alreadyPausedAtTime) {
-					timeUpdateEvent();
-				}
-				return true;
-			} else {
-				return false;
-			}
-		}
-		public function playHead(percent:Number):Boolean {
-			var time:Number = percent * getDuration() / 100;
-			if(myStatus.isPlaying || myStatus.playOnLoad || myStatus.playOnSeek) {
-				return play(time);
-			} else {
-				return pause(time);
-			}
-		}
-		public function setVolume(v:Number):void {
-			myStatus.volume = v;
-			myTransform.volume = v;
-			myChannel.soundTransform = myTransform;
-		}
-		private function updateStatusValues():void {
-			myStatus.seekPercent = 100 * getLoadRatio();
-			myStatus.currentTime = getCurrentTime();
-			myStatus.currentPercentRelative = 100 * getCurrentRatioRel();
-			myStatus.currentPercentAbsolute = 100 * getCurrentRatioAbs();
-			myStatus.duration = getDuration();
-		}
-		public function getLoadRatio():Number {
-			if((myStatus.isLoading || myStatus.isLoaded) && mySound.bytesTotal > 0) {
-				return mySound.bytesLoaded / mySound.bytesTotal;
-			} else {
-				return 0;
-			}
-		}
-		public function getDuration():Number {
-			if(mySound.length > 0) {
-				return mySound.length;
-			} else {
-				return 0;
-			}
-		}
-		public function getCurrentTime():Number {
-			if(myStatus.isPlaying) {
-				return myChannel.position;
-			} else {
-				return myStatus.pausePosition;
-			}
-		}
-		public function getCurrentRatioRel():Number {
-			if((getDuration() > 0) && (getCurrentTime() <= getDuration())) {
-				return getCurrentTime() / getDuration();
-			} else {
-				return 0;
-			}
-		}
-		public function getCurrentRatioAbs():Number {
-			return getCurrentRatioRel() * getLoadRatio();
-		}
-	}
-}
diff --git a/apps/media/js/jQuery.jPlayer.2.1.0.source/happyworm/jPlayer/JplayerMp4.as b/apps/media/js/jQuery.jPlayer.2.1.0.source/happyworm/jPlayer/JplayerMp4.as
deleted file mode 100644
index dcdc0655d0..0000000000
--- a/apps/media/js/jQuery.jPlayer.2.1.0.source/happyworm/jPlayer/JplayerMp4.as
+++ /dev/null
@@ -1,413 +0,0 @@
-/*
- * jPlayer Plugin for jQuery JavaScript Library
- * http://www.happyworm.com/jquery/jplayer
- *
- * Copyright (c) 2009 - 2011 Happyworm Ltd
- * Dual licensed under the MIT and GPL licenses.
- *  - http://www.opensource.org/licenses/mit-license.php
- *  - http://www.gnu.org/copyleft/gpl.html
- *
- * Author: Mark J Panaghiston
- * Date: 7th August 2011
- */
-
-package happyworm.jPlayer {
-	import flash.display.Sprite;
-
-	import flash.media.Video;
-	import flash.media.SoundTransform;
-
-	import flash.net.NetConnection;
-	import flash.net.NetStream;
-
-	import flash.utils.Timer;
-
-	import flash.events.NetStatusEvent;
-	import flash.events.SecurityErrorEvent;
-	import flash.events.TimerEvent;
-
-	public class JplayerMp4 extends Sprite {
-		
-		public var myVideo:Video = new Video();
-		private var myConnection:NetConnection;
-		private var myStream:NetStream;
-		
-		private var myTransform:SoundTransform = new SoundTransform();
-
-		public var myStatus:JplayerStatus = new JplayerStatus();
-		
-		private var timeUpdateTimer:Timer = new Timer(250, 0); // Matched to HTML event freq
-		private var progressTimer:Timer = new Timer(250, 0); // Matched to HTML event freq
-		private var seekingTimer:Timer = new Timer(100, 0); // Internal: How often seeking is checked to see if it is over.
-
-		public function JplayerMp4(volume:Number) {
-			myConnection = new NetConnection();
-			myConnection.addEventListener(NetStatusEvent.NET_STATUS, netStatusHandler);
-			myConnection.addEventListener(SecurityErrorEvent.SECURITY_ERROR, securityErrorHandler);
-			myVideo.smoothing = true;
-			this.addChild(myVideo);
-			
-			timeUpdateTimer.addEventListener(TimerEvent.TIMER, timeUpdateHandler);
-			progressTimer.addEventListener(TimerEvent.TIMER, progressHandler);
-			seekingTimer.addEventListener(TimerEvent.TIMER, seekingHandler);
-
-			myStatus.volume = volume;
-		}
-		private function progressUpdates(active:Boolean):void {
-			if(active) {
-				progressTimer.start();
-			} else {
-				progressTimer.stop();
-			}
-		}
-		private function progressHandler(e:TimerEvent):void {
-			if(myStatus.isLoading) {
-				if(getLoadRatio() == 1) { // Close as can get to a loadComplete event since client.onPlayStatus only works with FMS
-					this.dispatchEvent(new JplayerEvent(JplayerEvent.DEBUG_MSG, myStatus, "progressHandler: loadComplete"));
-					myStatus.loaded();
-					progressUpdates(false);
-				}
-			}
-			progressEvent();
-		}
-		private function progressEvent():void {
-			this.dispatchEvent(new JplayerEvent(JplayerEvent.DEBUG_MSG, myStatus, "progressEvent:"));
-			updateStatusValues();
-			this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_PROGRESS, myStatus));
-		}
-		private function timeUpdates(active:Boolean):void {
-			if(active) {
-				timeUpdateTimer.start();
-			} else {
-				timeUpdateTimer.stop();
-			}
-		}
-		private function timeUpdateHandler(e:TimerEvent):void {
-			timeUpdateEvent();
-		}
-		private function timeUpdateEvent():void {
-			updateStatusValues();
-			this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_TIMEUPDATE, myStatus));
-		}
-		private function seeking(active:Boolean):void {
-			if(active) {
-				if(!myStatus.isSeeking) {
-					seekingEvent();
-				}
-				seekingTimer.start();
-			} else {
-				if(myStatus.isSeeking) {
-					seekedEvent();
-				}
-				seekingTimer.stop();
-			}
-		}
-		private function seekingHandler(e:TimerEvent):void {
-			if(getSeekTimeRatio() <= getLoadRatio()) {
-				seeking(false);
-				if(myStatus.playOnSeek) {
-					myStatus.playOnSeek = false; // Capture the flag.
-					play(myStatus.pausePosition); // Must pass time or the seek time is never set.
-				} else {
-					pause(myStatus.pausePosition); // Must pass time or the stream.time is read.
-				}
-			} else if(myStatus.metaDataReady && myStatus.pausePosition > myStatus.duration) {
-				// Illegal seek time
-				seeking(false);
-				pause(0);
-			}
-		}
-		private function seekingEvent():void {
-			myStatus.isSeeking = true;
-			updateStatusValues();
-			this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_SEEKING, myStatus));
-		}
-		private function seekedEvent():void {
-			myStatus.isSeeking = false;
-			updateStatusValues();
-			this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_SEEKED, myStatus));
-		}
-		private function netStatusHandler(e:NetStatusEvent):void {
-			this.dispatchEvent(new JplayerEvent(JplayerEvent.DEBUG_MSG, myStatus, "netStatusHandler: '" + e.info.code + "'"));
-			switch(e.info.code) {
-				case "NetConnection.Connect.Success":
-					connectStream();
-					break;
-				case "NetStream.Play.Start":
-					// This event code occurs once, when the media is opened. Equiv to loadOpen() in mp3 player.
-					myStatus.loading();
-					this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_LOADSTART, myStatus));
-					progressUpdates(true);
-					// See onMetaDataHandler() for other condition, since duration is vital.
-					break;
-				case "NetStream.Play.Stop":
-					this.dispatchEvent(new JplayerEvent(JplayerEvent.DEBUG_MSG, myStatus, "NetStream.Play.Stop: getDuration() - getCurrentTime() = " + (getDuration() - getCurrentTime())));
-
-					// Check if media is at the end (or close) otherwise this was due to download bandwidth stopping playback. ie., Download is not fast enough.
-					if(Math.abs(getDuration() - getCurrentTime()) < 150) { // Testing found 150ms worked best for M4A files, where playHead(99.9) caused a stuck state due to firing with ~116ms left to play.
-						endedEvent();
-					}
-					break;
-				case "NetStream.Seek.InvalidTime":
-					// Used for capturing invalid set times and clicks on the end of the progress bar.
-					endedEvent();
-					break;
-				case "NetStream.Play.StreamNotFound":
-					myStatus.error(); // Resets status except the src, and it sets srcError property.
-					this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_ERROR, myStatus));
-					break;
-			}
-			// "NetStream.Seek.Notify" event code is not very useful. It occurs after every seek(t) command issued and does not appear to wait for the media to be ready.
-		}
-		private function endedEvent():void {
-			var wasPlaying:Boolean = myStatus.isPlaying;
-			pause(0);
-			timeUpdates(false);
-			timeUpdateEvent();
-			if(wasPlaying) {
-				this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_ENDED, myStatus));
-			}
-		}
-		private function securityErrorHandler(event:SecurityErrorEvent):void {
-			this.dispatchEvent(new JplayerEvent(JplayerEvent.DEBUG_MSG, myStatus, "securityErrorHandler."));
-		}
-		private function connectStream():void {
-			this.dispatchEvent(new JplayerEvent(JplayerEvent.DEBUG_MSG, myStatus, "connectStream."));
-			var customClient:Object = new Object();
-			customClient.onMetaData = onMetaDataHandler;
-			// customClient.onPlayStatus = onPlayStatusHandler; // According to the forums and my tests, onPlayStatus only works with FMS (Flash Media Server).
-			myStream = null;
-			myStream = new NetStream(myConnection);
-			myStream.addEventListener(NetStatusEvent.NET_STATUS, netStatusHandler);
-			myStream.client = customClient;
-			myVideo.attachNetStream(myStream);
-			setVolume(myStatus.volume);
-			myStream.play(myStatus.src);
-		}
-		public function setFile(src:String):void {
-			if(myStream != null) {
-				myStream.close();
-			}
-			myVideo.clear();
-			progressUpdates(false);
-			timeUpdates(false);
-
-			myStatus.reset();
-			myStatus.src = src;
-			myStatus.srcSet = true;
-			timeUpdateEvent();
-		}
-		public function clearFile():void {
-			setFile("");
-			myStatus.srcSet = false;
-		}
-		public function load():Boolean {
-			if(myStatus.loadRequired()) {
-				myStatus.startingDownload();
-				myConnection.connect(null);
-				return true;
-			} else {
-				return false;
-			}
-		}
-		public function play(time:Number = NaN):Boolean {
-			var wasPlaying:Boolean = myStatus.isPlaying;
-
-			if(!isNaN(time) && myStatus.srcSet) {
-				if(myStatus.isPlaying) {
-					myStream.pause();
-					myStatus.isPlaying = false;
-				}
-				myStatus.pausePosition = time;
-			}
-
-			if(myStatus.isStartingDownload) {
-				myStatus.playOnLoad = true; // Raise flag, captured in onMetaDataHandler()
-				return true;
-			} else if(myStatus.loadRequired()) {
-				myStatus.playOnLoad = true; // Raise flag, captured in onMetaDataHandler()
-				return load();
-			} else if((myStatus.isLoading || myStatus.isLoaded) && !myStatus.isPlaying) {
-				if(myStatus.metaDataReady && myStatus.pausePosition > myStatus.duration) { // The time is invalid, ie., past the end.
-					myStream.pause(); // Since it is playing by default at this point.
-					myStatus.pausePosition = 0;
-					myStream.seek(0);
-					timeUpdates(false);
-					timeUpdateEvent();
-					if(wasPlaying) { // For when playing and then get a play(huge)
-						this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_PAUSE, myStatus));
-					}
-				} else if(getSeekTimeRatio() > getLoadRatio()) { // Use an estimate based on the downloaded amount
-					myStatus.playOnSeek = true;
-					seeking(true);
-					myStream.pause(); // Since it is playing by default at this point.
-				} else {
-					if(!isNaN(time)) { // Avoid using seek() when it is already correct.
-						myStream.seek(myStatus.pausePosition/1000); // Since time is in ms and seek() takes seconds
-					}
-					myStatus.isPlaying = true; // Set immediately before playing. Could affects events.
-					myStream.resume();
-					timeUpdates(true);
-					if(!wasPlaying) {
-						this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_PLAY, myStatus));
-					}
-				}
-				return true;
-			} else {
-				return false;
-			}
-		}
-		public function pause(time:Number = NaN):Boolean {
-			myStatus.playOnLoad = false; // Reset flag in case load/play issued immediately before this command, ie., before onMetadata() event.
-			myStatus.playOnSeek = false; // Reset flag in case play(time) issued before the command and is still seeking to time set.
-
-			var wasPlaying:Boolean = myStatus.isPlaying;
-
-			// To avoid possible loops with timeupdate and pause(time). A pause() does not have the problem.
-			var alreadyPausedAtTime:Boolean = false;
-			if(!isNaN(time) && myStatus.pausePosition == time) {
-				alreadyPausedAtTime = true;
-			}
-
-			// Need to wait for metadata to load before ever issuing a pause. The metadata handler will call this function if needed, when ready.
-			if(myStream != null && myStatus.metaDataReady) { // myStream is a null until the 1st media is loaded. ie., The 1st ever setMedia being followed by a pause() or pause(t).
-				myStream.pause();
-			}
-			if(myStatus.isPlaying) {
-				myStatus.isPlaying = false;
-				myStatus.pausePosition = myStream.time * 1000;
-			}
-			
-			if(!isNaN(time) && myStatus.srcSet) {
-				myStatus.pausePosition = time;
-			}
-
-			if(wasPlaying) {
-				this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_PAUSE, myStatus));
-			}
-
-			if(myStatus.isStartingDownload) {
-				return true;
-			} else if(myStatus.loadRequired()) {
-				if(time > 0) { // We do not want the stop() command, which does pause(0), causing a load operation.
-					return load();
-				} else {
-					return true; // Technically the pause(0) succeeded. ie., It did nothing, since nothing was required.
-				}
-			} else if(myStatus.isLoading || myStatus.isLoaded) {
-				if(myStatus.metaDataReady && myStatus.pausePosition > myStatus.duration) { // The time is invalid, ie., past the end.
-					myStatus.pausePosition = 0;
-					myStream.seek(0);
-					seekedEvent(); // Deals with seeking effect when using setMedia() then pause(huge). NB: There is no preceeding seeking event.
-				} else if(!isNaN(time)) {
-					if(getSeekTimeRatio() > getLoadRatio()) { // Use an estimate based on the downloaded amount
-						seeking(true);
-					} else {
-						if(myStatus.metaDataReady) { // Otherwise seek(0) will stop the metadata loading.
-							myStream.seek(myStatus.pausePosition/1000);
-						}
-					}
-				}
-				timeUpdates(false);
-				// Need to be careful with timeupdate event, otherwise a pause in a timeupdate event can cause a loop.
-				// Neither pause() nor pause(time) will cause a timeupdate loop.
-				if(wasPlaying || !isNaN(time) && !alreadyPausedAtTime) {
-					timeUpdateEvent();
-				}
-				return true;
-			} else {
-				return false;
-			}
-		}
-		public function playHead(percent:Number):Boolean {
-			var time:Number = percent * getDuration() * getLoadRatio() / 100;
-			if(myStatus.isPlaying || myStatus.playOnLoad || myStatus.playOnSeek) {
-				return play(time);
-			} else {
-				return pause(time);
-			}
-		}
-		public function setVolume(v:Number):void {
-			myStatus.volume = v;
-			myTransform.volume = v;
-			if(myStream != null) {
-				myStream.soundTransform = myTransform;
-			}
-		}
-		private function updateStatusValues():void {
-			myStatus.seekPercent = 100 * getLoadRatio();
-			myStatus.currentTime = getCurrentTime();
-			myStatus.currentPercentRelative = 100 * getCurrentRatioRel();
-			myStatus.currentPercentAbsolute = 100 * getCurrentRatioAbs();
-			myStatus.duration = getDuration();
-		}
-		public function getLoadRatio():Number {
-			if((myStatus.isLoading || myStatus.isLoaded) && myStream.bytesTotal > 0) {
-				return myStream.bytesLoaded / myStream.bytesTotal;
-			} else {
-				return 0;
-			}
-		}
-		public function getDuration():Number {
-			return myStatus.duration; // Set from meta data.
-		}
-		public function getCurrentTime():Number {
-			if(myStatus.isPlaying) {
-				return myStream.time * 1000;
-			} else {
-				return myStatus.pausePosition;
-			}
-		}
-		public function getCurrentRatioRel():Number {
-			if((getLoadRatio() > 0) && (getCurrentRatioAbs() <= getLoadRatio())) {
-				return getCurrentRatioAbs() / getLoadRatio();
-			} else {
-				return 0;
-			}
-		}
-		public function getCurrentRatioAbs():Number {
-			if(getDuration() > 0) {
-				return getCurrentTime() / getDuration();
-			} else {
-				return 0;
-			}
-		}
-		public function getSeekTimeRatio():Number {
-			if(getDuration() > 0) {
-				return myStatus.pausePosition / getDuration();
-			} else {
-				return 1;
-			}
-		}
-		public function onMetaDataHandler(info:Object):void { // Used in connectStream() in myStream.client object.
-			// This event occurs when jumping to the start of static files! ie., seek(0) will cause this event to occur.
-			if(!myStatus.metaDataReady) {
-				this.dispatchEvent(new JplayerEvent(JplayerEvent.DEBUG_MSG, myStatus, "onMetaDataHandler: " + info.duration + " | " + info.width + "x" + info.height));
-
-				myStatus.metaDataReady = true; // Set flag so that this event only effects jPlayer the 1st time.
-				myStatus.metaData = info;
-				myStatus.duration = info.duration * 1000; // Only available via Meta Data.
-				if(info.width != undefined) {
-					myVideo.width = info.width;
-				}
-				if(info.height != undefined) {
-					myVideo.height = info.height;
-				}
-
-				if(myStatus.playOnLoad) {
-					myStatus.playOnLoad = false; // Capture the flag
-					if(myStatus.pausePosition > 0 ) { // Important for setMedia followed by play(time).
-						play(myStatus.pausePosition);
-					} else {
-						play(); // Not always sending pausePosition avoids the extra seek(0) for a normal play() command.
-					}
-				} else {
-					pause(myStatus.pausePosition); // Always send the pausePosition. Important for setMedia() followed by pause(time). Deals with not reading stream.time with setMedia() and play() immediately followed by stop() or pause(0)
-				}
-				this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_LOADEDMETADATA, myStatus));
-			} else {
-				this.dispatchEvent(new JplayerEvent(JplayerEvent.DEBUG_MSG, myStatus, "onMetaDataHandler: Already read (NO EFFECT)"));
-			}
-		}
-	}
-}
diff --git a/apps/media/js/jQuery.jPlayer.2.1.0.source/happyworm/jPlayer/JplayerStatus.as b/apps/media/js/jQuery.jPlayer.2.1.0.source/happyworm/jPlayer/JplayerStatus.as
deleted file mode 100644
index 5cc1e1ff4b..0000000000
--- a/apps/media/js/jQuery.jPlayer.2.1.0.source/happyworm/jPlayer/JplayerStatus.as
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * jPlayer Plugin for jQuery JavaScript Library
- * http://www.happyworm.com/jquery/jplayer
- *
- * Copyright (c) 2009 - 2011 Happyworm Ltd
- * Dual licensed under the MIT and GPL licenses.
- *  - http://www.opensource.org/licenses/mit-license.php
- *  - http://www.gnu.org/copyleft/gpl.html
- *
- * Author: Mark J Panaghiston
- * Date: 1st September 2011
- */
-
-package happyworm.jPlayer {
-	public class JplayerStatus {
-
-		public static const VERSION:String = "2.1.0"; // The version of the Flash jPlayer entity.
-
-		public var volume:Number = 0.5; // Not affected by reset()
-		public var muted:Boolean = false; // Not affected by reset()
-
-		public var src:String;
-		public var srcError:Boolean;
-
-		public var srcSet:Boolean;
-		public var isPlaying:Boolean;
-		public var isSeeking:Boolean;
-
-		public var playOnLoad:Boolean;
-		public var playOnSeek:Boolean;
-
-		public var isStartingDownload:Boolean;
-		public var isLoading:Boolean;
-		public var isLoaded:Boolean;
-
-		public var pausePosition:Number;
-
-		public var seekPercent:Number;
-		public var currentTime:Number;
-		public var currentPercentRelative:Number;
-		public var currentPercentAbsolute:Number;
-		public var duration:Number;
-		
-		public var metaDataReady:Boolean;
-		public var metaData:Object;
-
-		public function JplayerStatus() {
-			reset();
-		}
-		public function reset():void {
-			src = "";
-			srcError = false;
-
-			srcSet = false;
-			isPlaying = false;
-			isSeeking = false;
-
-			playOnLoad = false;
-			playOnSeek = false;
-
-			isStartingDownload = false;
-			isLoading = false;
-			isLoaded = false;
-
-			pausePosition = 0;
-
-			seekPercent = 0;
-			currentTime = 0;
-			currentPercentRelative = 0;
-			currentPercentAbsolute = 0;
-			duration = 0;
-			
-			metaDataReady = false;
-			metaData = {};
-		}
-		public function error():void {
-			var srcSaved:String = src;
-			reset();
-			src = srcSaved;
-			srcError = true;
-		}
-		public function loadRequired():Boolean {
-			return (srcSet && !isStartingDownload && !isLoading && !isLoaded);
-		}
-		public function startingDownload():void {
-			isStartingDownload = true;
-			isLoading = false;
-			isLoaded = false;
-		}
-		public function loading():void {
-			isStartingDownload = false;
-			isLoading = true;
-			isLoaded = false;
-		}
-		public function loaded():void {
-			isStartingDownload = false;
-			isLoading = false;
-			isLoaded = true;
-		}
-	}
-}
diff --git a/apps/media/js/jQuery.jPlayer.2.1.0.source/jquery.jplayer.js b/apps/media/js/jQuery.jPlayer.2.1.0.source/jquery.jplayer.js
deleted file mode 100644
index 9d41a12ee6..0000000000
--- a/apps/media/js/jQuery.jPlayer.2.1.0.source/jquery.jplayer.js
+++ /dev/null
@@ -1,2349 +0,0 @@
-/*
- * jPlayer Plugin for jQuery JavaScript Library
- * http://www.jplayer.org
- *
- * Copyright (c) 2009 - 2011 Happyworm Ltd
- * Dual licensed under the MIT and GPL licenses.
- *  - http://www.opensource.org/licenses/mit-license.php
- *  - http://www.gnu.org/copyleft/gpl.html
- *
- * Author: Mark J Panaghiston
- * Version: 2.1.0
- * Date: 1st September 2011
- */
-
-/* Code verified using http://www.jshint.com/ */
-/*jshint asi:false, bitwise:false, boss:false, browser:true, curly:true, debug:false, eqeqeq:true, eqnull:false, evil:false, forin:false, immed:false, jquery:true, laxbreak:false, newcap:true, noarg:true, noempty:true, nonew:true, nomem:false, onevar:false, passfail:false, plusplus:false, regexp:false, undef:true, sub:false, strict:false, white:false */
-/*global jQuery:false, ActiveXObject:false, alert:false */
-
-(function($, undefined) {
-
-	// Adapted from jquery.ui.widget.js (1.8.7): $.widget.bridge
-	$.fn.jPlayer = function( options ) {
-		var name = "jPlayer";
-		var isMethodCall = typeof options === "string",
-			args = Array.prototype.slice.call( arguments, 1 ),
-			returnValue = this;
-
-		// allow multiple hashes to be passed on init
-		options = !isMethodCall && args.length ?
-			$.extend.apply( null, [ true, options ].concat(args) ) :
-			options;
-
-		// prevent calls to internal methods
-		if ( isMethodCall && options.charAt( 0 ) === "_" ) {
-			return returnValue;
-		}
-
-		if ( isMethodCall ) {
-			this.each(function() {
-				var instance = $.data( this, name ),
-					methodValue = instance && $.isFunction( instance[options] ) ?
-						instance[ options ].apply( instance, args ) :
-						instance;
-				if ( methodValue !== instance && methodValue !== undefined ) {
-					returnValue = methodValue;
-					return false;
-				}
-			});
-		} else {
-			this.each(function() {
-				var instance = $.data( this, name );
-				if ( instance ) {
-					// instance.option( options || {} )._init(); // Orig jquery.ui.widget.js code: Not recommend for jPlayer. ie., Applying new options to an existing instance (via the jPlayer constructor) and performing the _init(). The _init() is what concerns me. It would leave a lot of event handlers acting on jPlayer instance and the interface.
-					instance.option( options || {} ); // The new constructor only changes the options. Changing options only has basic support atm.
-				} else {
-					$.data( this, name, new $.jPlayer( options, this ) );
-				}
-			});
-		}
-
-		return returnValue;
-	};
-
-	$.jPlayer = function( options, element ) {
-		// allow instantiation without initializing for simple inheritance
-		if ( arguments.length ) {
-			this.element = $(element);
-			this.options = $.extend(true, {},
-				this.options,
-				options
-			);
-			var self = this;
-			this.element.bind( "remove.jPlayer", function() {
-				self.destroy();
-			});
-			this._init();
-		}
-	};
-	// End of: (Adapted from jquery.ui.widget.js (1.8.7))
-
-	// Emulated HTML5 methods and properties
-	$.jPlayer.emulateMethods = "load play pause";
-	$.jPlayer.emulateStatus = "src readyState networkState currentTime duration paused ended playbackRate";
-	$.jPlayer.emulateOptions = "muted volume";
-
-	// Reserved event names generated by jPlayer that are not part of the HTML5 Media element spec
-	$.jPlayer.reservedEvent = "ready flashreset resize repeat error warning";
-
-	// Events generated by jPlayer
-	$.jPlayer.event = {
-		ready: "jPlayer_ready",
-		flashreset: "jPlayer_flashreset", // Similar to the ready event if the Flash solution is set to display:none and then shown again or if it's reloaded for another reason by the browser. For example, using CSS position:fixed on Firefox for the full screen feature.
-		resize: "jPlayer_resize", // Occurs when the size changes through a full/restore screen operation or if the size/sizeFull options are changed.
-		repeat: "jPlayer_repeat", // Occurs when the repeat status changes. Usually through clicks on the repeat button of the interface.
-		click: "jPlayer_click", // Occurs when the user clicks on one of the following: poster image, html video, flash video.
-		error: "jPlayer_error", // Event error code in event.jPlayer.error.type. See $.jPlayer.error
-		warning: "jPlayer_warning", // Event warning code in event.jPlayer.warning.type. See $.jPlayer.warning
-
-		// Other events match HTML5 spec.
-		loadstart: "jPlayer_loadstart",
-		progress: "jPlayer_progress",
-		suspend: "jPlayer_suspend",
-		abort: "jPlayer_abort",
-		emptied: "jPlayer_emptied",
-		stalled: "jPlayer_stalled",
-		play: "jPlayer_play",
-		pause: "jPlayer_pause",
-		loadedmetadata: "jPlayer_loadedmetadata",
-		loadeddata: "jPlayer_loadeddata",
-		waiting: "jPlayer_waiting",
-		playing: "jPlayer_playing",
-		canplay: "jPlayer_canplay",
-		canplaythrough: "jPlayer_canplaythrough",
-		seeking: "jPlayer_seeking",
-		seeked: "jPlayer_seeked",
-		timeupdate: "jPlayer_timeupdate",
-		ended: "jPlayer_ended",
-		ratechange: "jPlayer_ratechange",
-		durationchange: "jPlayer_durationchange",
-		volumechange: "jPlayer_volumechange"
-	};
-
-	$.jPlayer.htmlEvent = [ // These HTML events are bubbled through to the jPlayer event, without any internal action.
-		"loadstart",
-		// "progress", // jPlayer uses internally before bubbling.
-		// "suspend", // jPlayer uses internally before bubbling.
-		"abort",
-		// "error", // jPlayer uses internally before bubbling.
-		"emptied",
-		"stalled",
-		// "play", // jPlayer uses internally before bubbling.
-		// "pause", // jPlayer uses internally before bubbling.
-		"loadedmetadata",
-		"loadeddata",
-		// "waiting", // jPlayer uses internally before bubbling.
-		// "playing", // jPlayer uses internally before bubbling.
-		"canplay",
-		"canplaythrough",
-		// "seeking", // jPlayer uses internally before bubbling.
-		// "seeked", // jPlayer uses internally before bubbling.
-		// "timeupdate", // jPlayer uses internally before bubbling.
-		// "ended", // jPlayer uses internally before bubbling.
-		"ratechange"
-		// "durationchange" // jPlayer uses internally before bubbling.
-		// "volumechange" // jPlayer uses internally before bubbling.
-	];
-
-	$.jPlayer.pause = function() {
-		$.each($.jPlayer.prototype.instances, function(i, element) {
-			if(element.data("jPlayer").status.srcSet) { // Check that media is set otherwise would cause error event.
-				element.jPlayer("pause");
-			}
-		});
-	};
-	
-	$.jPlayer.timeFormat = {
-		showHour: false,
-		showMin: true,
-		showSec: true,
-		padHour: false,
-		padMin: true,
-		padSec: true,
-		sepHour: ":",
-		sepMin: ":",
-		sepSec: ""
-	};
-
-	$.jPlayer.convertTime = function(s) {
-		var myTime = new Date(s * 1000);
-		var hour = myTime.getUTCHours();
-		var min = myTime.getUTCMinutes();
-		var sec = myTime.getUTCSeconds();
-		var strHour = ($.jPlayer.timeFormat.padHour && hour < 10) ? "0" + hour : hour;
-		var strMin = ($.jPlayer.timeFormat.padMin && min < 10) ? "0" + min : min;
-		var strSec = ($.jPlayer.timeFormat.padSec && sec < 10) ? "0" + sec : sec;
-		return (($.jPlayer.timeFormat.showHour) ? strHour + $.jPlayer.timeFormat.sepHour : "") + (($.jPlayer.timeFormat.showMin) ? strMin + $.jPlayer.timeFormat.sepMin : "") + (($.jPlayer.timeFormat.showSec) ? strSec + $.jPlayer.timeFormat.sepSec : "");
-	};
-
-	// Adapting jQuery 1.4.4 code for jQuery.browser. Required since jQuery 1.3.2 does not detect Chrome as webkit.
-	$.jPlayer.uaBrowser = function( userAgent ) {
-		var ua = userAgent.toLowerCase();
-
-		// Useragent RegExp
-		var rwebkit = /(webkit)[ \/]([\w.]+)/;
-		var ropera = /(opera)(?:.*version)?[ \/]([\w.]+)/;
-		var rmsie = /(msie) ([\w.]+)/;
-		var rmozilla = /(mozilla)(?:.*? rv:([\w.]+))?/;
-
-		var match = rwebkit.exec( ua ) ||
-			ropera.exec( ua ) ||
-			rmsie.exec( ua ) ||
-			ua.indexOf("compatible") < 0 && rmozilla.exec( ua ) ||
-			[];
-
-		return { browser: match[1] || "", version: match[2] || "0" };
-	};
-
-	// Platform sniffer for detecting mobile devices
-	$.jPlayer.uaPlatform = function( userAgent ) {
-		var ua = userAgent.toLowerCase();
-
-		// Useragent RegExp
-		var rplatform = /(ipad|iphone|ipod|android|blackberry|playbook|windows ce|webos)/;
-		var rtablet = /(ipad|playbook)/;
-		var randroid = /(android)/;
-		var rmobile = /(mobile)/;
-
-		var platform = rplatform.exec( ua ) || [];
-		var tablet = rtablet.exec( ua ) ||
-			!rmobile.exec( ua ) && randroid.exec( ua ) ||
-			[];
-
-		if(platform[1]) {
-			platform[1] = platform[1].replace(/\s/g, "_"); // Change whitespace to underscore. Enables dot notation.
-		}
-
-		return { platform: platform[1] || "", tablet: tablet[1] || "" };
-	};
-
-	$.jPlayer.browser = {
-	};
-	$.jPlayer.platform = {
-	};
-
-	var browserMatch = $.jPlayer.uaBrowser(navigator.userAgent);
-	if ( browserMatch.browser ) {
-		$.jPlayer.browser[ browserMatch.browser ] = true;
-		$.jPlayer.browser.version = browserMatch.version;
-	}
-	var platformMatch = $.jPlayer.uaPlatform(navigator.userAgent);
-	if ( platformMatch.platform ) {
-		$.jPlayer.platform[ platformMatch.platform ] = true;
-		$.jPlayer.platform.mobile = !platformMatch.tablet;
-		$.jPlayer.platform.tablet = !!platformMatch.tablet;
-	}
-
-	$.jPlayer.prototype = {
-		count: 0, // Static Variable: Change it via prototype.
-		version: { // Static Object
-			script: "2.1.0",
-			needFlash: "2.1.0",
-			flash: "unknown"
-		},
-		options: { // Instanced in $.jPlayer() constructor
-			swfPath: "js", // Path to Jplayer.swf. Can be relative, absolute or server root relative.
-			solution: "html, flash", // Valid solutions: html, flash. Order defines priority. 1st is highest,
-			supplied: "mp3", // Defines which formats jPlayer will try and support and the priority by the order. 1st is highest,
-			preload: 'metadata',  // HTML5 Spec values: none, metadata, auto.
-			volume: 0.8, // The volume. Number 0 to 1.
-			muted: false,
-			wmode: "opaque", // Valid wmode: window, transparent, opaque, direct, gpu. 
-			backgroundColor: "#000000", // To define the jPlayer div and Flash background color.
-			cssSelectorAncestor: "#jp_container_1",
-			cssSelector: { // * denotes properties that should only be required when video media type required. _cssSelector() would require changes to enable splitting these into Audio and Video defaults.
-				videoPlay: ".jp-video-play", // *
-				play: ".jp-play",
-				pause: ".jp-pause",
-				stop: ".jp-stop",
-				seekBar: ".jp-seek-bar",
-				playBar: ".jp-play-bar",
-				mute: ".jp-mute",
-				unmute: ".jp-unmute",
-				volumeBar: ".jp-volume-bar",
-				volumeBarValue: ".jp-volume-bar-value",
-				volumeMax: ".jp-volume-max",
-				currentTime: ".jp-current-time",
-				duration: ".jp-duration",
-				fullScreen: ".jp-full-screen", // *
-				restoreScreen: ".jp-restore-screen", // *
-				repeat: ".jp-repeat",
-				repeatOff: ".jp-repeat-off",
-				gui: ".jp-gui", // The interface used with autohide feature.
-				noSolution: ".jp-no-solution" // For error feedback when jPlayer cannot find a solution.
-			},
-			fullScreen: false,
-			autohide: {
-				restored: false, // Controls the interface autohide feature.
-				full: true, // Controls the interface autohide feature.
-				fadeIn: 200, // Milliseconds. The period of the fadeIn anim.
-				fadeOut: 600, // Milliseconds. The period of the fadeOut anim.
-				hold: 1000 // Milliseconds. The period of the pause before autohide beings.
-			},
-			loop: false,
-			repeat: function(event) { // The default jPlayer repeat event handler
-				if(event.jPlayer.options.loop) {
-					$(this).unbind(".jPlayerRepeat").bind($.jPlayer.event.ended + ".jPlayer.jPlayerRepeat", function() {
-						$(this).jPlayer("play");
-					});
-				} else {
-					$(this).unbind(".jPlayerRepeat");
-				}
-			},
-			nativeVideoControls: {
-				// Works well on standard browsers.
-				// Phone and tablet browsers can have problems with the controls disappearing.
-			},
-			noFullScreen: {
-				msie: /msie [0-6]/,
-				ipad: /ipad.*?os [0-4]/,
-				iphone: /iphone/,
-				ipod: /ipod/,
-				android_pad: /android [0-3](?!.*?mobile)/,
-				android_phone: /android.*?mobile/,
-				blackberry: /blackberry/,
-				windows_ce: /windows ce/,
-				webos: /webos/
-			},
-			noVolume: {
-				ipad: /ipad/,
-				iphone: /iphone/,
-				ipod: /ipod/,
-				android_pad: /android(?!.*?mobile)/,
-				android_phone: /android.*?mobile/,
-				blackberry: /blackberry/,
-				windows_ce: /windows ce/,
-				webos: /webos/,
-				playbook: /playbook/
-			},
-			verticalVolume: false, // Calculate volume from the bottom of the volume bar. Default is from the left. Also volume affects either width or height.
-			// globalVolume: false, // Not implemented: Set to make volume changes affect all jPlayer instances
-			// globalMute: false, // Not implemented: Set to make mute changes affect all jPlayer instances
-			idPrefix: "jp", // Prefix for the ids of html elements created by jPlayer. For flash, this must not include characters: . - + * / \
-			noConflict: "jQuery",
-			emulateHtml: false, // Emulates the HTML5 Media element on the jPlayer element.
-			errorAlerts: false,
-			warningAlerts: false
-		},
-		optionsAudio: {
-			size: {
-				width: "0px",
-				height: "0px",
-				cssClass: ""
-			},
-			sizeFull: {
-				width: "0px",
-				height: "0px",
-				cssClass: ""
-			}
-		},
-		optionsVideo: {
-			size: {
-				width: "480px",
-				height: "270px",
-				cssClass: "jp-video-270p"
-			},
-			sizeFull: {
-				width: "100%",
-				height: "100%",
-				cssClass: "jp-video-full"
-			}
-		},
-		instances: {}, // Static Object
-		status: { // Instanced in _init()
-			src: "",
-			media: {},
-			paused: true,
-			format: {},
-			formatType: "",
-			waitForPlay: true, // Same as waitForLoad except in case where preloading.
-			waitForLoad: true,
-			srcSet: false,
-			video: false, // True if playing a video
-			seekPercent: 0,
-			currentPercentRelative: 0,
-			currentPercentAbsolute: 0,
-			currentTime: 0,
-			duration: 0,
-			readyState: 0,
-			networkState: 0,
-			playbackRate: 1,
-			ended: 0
-
-/*		Persistant status properties created dynamically at _init():
-			width
-			height
-			cssClass
-			nativeVideoControls
-			noFullScreen
-			noVolume
-*/
-		},
-
-		internal: { // Instanced in _init()
-			ready: false
-			// instance: undefined
-			// domNode: undefined
-			// htmlDlyCmdId: undefined
-			// autohideId: undefined
-		},
-		solution: { // Static Object: Defines the solutions built in jPlayer.
-			html: true,
-			flash: true
-		},
-		// 'MPEG-4 support' : canPlayType('video/mp4; codecs="mp4v.20.8"')
-		format: { // Static Object
-			mp3: {
-				codec: 'audio/mpeg; codecs="mp3"',
-				flashCanPlay: true,
-				media: 'audio'
-			},
-			m4a: { // AAC / MP4
-				codec: 'audio/mp4; codecs="mp4a.40.2"',
-				flashCanPlay: true,
-				media: 'audio'
-			},
-			oga: { // OGG
-				codec: 'audio/ogg; codecs="vorbis"',
-				flashCanPlay: false,
-				media: 'audio'
-			},
-			wav: { // PCM
-				codec: 'audio/wav; codecs="1"',
-				flashCanPlay: false,
-				media: 'audio'
-			},
-			webma: { // WEBM
-				codec: 'audio/webm; codecs="vorbis"',
-				flashCanPlay: false,
-				media: 'audio'
-			},
-			fla: { // FLV / F4A
-				codec: 'audio/x-flv',
-				flashCanPlay: true,
-				media: 'audio'
-			},
-			m4v: { // H.264 / MP4
-				codec: 'video/mp4; codecs="avc1.42E01E, mp4a.40.2"',
-				flashCanPlay: true,
-				media: 'video'
-			},
-			ogv: { // OGG
-				codec: 'video/ogg; codecs="theora, vorbis"',
-				flashCanPlay: false,
-				media: 'video'
-			},
-			webmv: { // WEBM
-				codec: 'video/webm; codecs="vorbis, vp8"',
-				flashCanPlay: false,
-				media: 'video'
-			},
-			flv: { // FLV / F4V
-				codec: 'video/x-flv',
-				flashCanPlay: true,
-				media: 'video'
-			}
-		},
-		_init: function() {
-			var self = this;
-			
-			this.element.empty();
-			
-			this.status = $.extend({}, this.status); // Copy static to unique instance.
-			this.internal = $.extend({}, this.internal); // Copy static to unique instance.
-
-			this.internal.domNode = this.element.get(0);
-
-			this.formats = []; // Array based on supplied string option. Order defines priority.
-			this.solutions = []; // Array based on solution string option. Order defines priority.
-			this.require = {}; // Which media types are required: video, audio.
-			
-			this.htmlElement = {}; // DOM elements created by jPlayer
-			this.html = {}; // In _init()'s this.desired code and setmedia(): Accessed via this[solution], where solution from this.solutions array.
-			this.html.audio = {};
-			this.html.video = {};
-			this.flash = {}; // In _init()'s this.desired code and setmedia(): Accessed via this[solution], where solution from this.solutions array.
-			
-			this.css = {};
-			this.css.cs = {}; // Holds the css selector strings
-			this.css.jq = {}; // Holds jQuery selectors. ie., $(css.cs.method)
-
-			this.ancestorJq = []; // Holds jQuery selector of cssSelectorAncestor. Init would use $() instead of [], but it is only 1.4+
-
-			this.options.volume = this._limitValue(this.options.volume, 0, 1); // Limit volume value's bounds.
-
-			// Create the formats array, with prority based on the order of the supplied formats string
-			$.each(this.options.supplied.toLowerCase().split(","), function(index1, value1) {
-				var format = value1.replace(/^\s+|\s+$/g, ""); //trim
-				if(self.format[format]) { // Check format is valid.
-					var dupFound = false;
-					$.each(self.formats, function(index2, value2) { // Check for duplicates
-						if(format === value2) {
-							dupFound = true;
-							return false;
-						}
-					});
-					if(!dupFound) {
-						self.formats.push(format);
-					}
-				}
-			});
-
-			// Create the solutions array, with prority based on the order of the solution string
-			$.each(this.options.solution.toLowerCase().split(","), function(index1, value1) {
-				var solution = value1.replace(/^\s+|\s+$/g, ""); //trim
-				if(self.solution[solution]) { // Check solution is valid.
-					var dupFound = false;
-					$.each(self.solutions, function(index2, value2) { // Check for duplicates
-						if(solution === value2) {
-							dupFound = true;
-							return false;
-						}
-					});
-					if(!dupFound) {
-						self.solutions.push(solution);
-					}
-				}
-			});
-
-			this.internal.instance = "jp_" + this.count;
-			this.instances[this.internal.instance] = this.element;
-
-			// Check the jPlayer div has an id and create one if required. Important for Flash to know the unique id for comms.
-			if(!this.element.attr("id")) {
-				this.element.attr("id", this.options.idPrefix + "_jplayer_" + this.count);
-			}
-
-			this.internal.self = $.extend({}, {
-				id: this.element.attr("id"),
-				jq: this.element
-			});
-			this.internal.audio = $.extend({}, {
-				id: this.options.idPrefix + "_audio_" + this.count,
-				jq: undefined
-			});
-			this.internal.video = $.extend({}, {
-				id: this.options.idPrefix + "_video_" + this.count,
-				jq: undefined
-			});
-			this.internal.flash = $.extend({}, {
-				id: this.options.idPrefix + "_flash_" + this.count,
-				jq: undefined,
-				swf: this.options.swfPath + (this.options.swfPath.toLowerCase().slice(-4) !== ".swf" ? (this.options.swfPath && this.options.swfPath.slice(-1) !== "/" ? "/" : "") + "Jplayer.swf" : "")
-			});
-			this.internal.poster = $.extend({}, {
-				id: this.options.idPrefix + "_poster_" + this.count,
-				jq: undefined
-			});
-
-			// Register listeners defined in the constructor
-			$.each($.jPlayer.event, function(eventName,eventType) {
-				if(self.options[eventName] !== undefined) {
-					self.element.bind(eventType + ".jPlayer", self.options[eventName]); // With .jPlayer namespace.
-					self.options[eventName] = undefined; // Destroy the handler pointer copy on the options. Reason, events can be added/removed in other ways so this could be obsolete and misleading.
-				}
-			});
-
-			// Determine if we require solutions for audio, video or both media types.
-			this.require.audio = false;
-			this.require.video = false;
-			$.each(this.formats, function(priority, format) {
-				self.require[self.format[format].media] = true;
-			});
-
-			// Now required types are known, finish the options default settings.
-			if(this.require.video) {
-				this.options = $.extend(true, {},
-					this.optionsVideo,
-					this.options
-				);
-			} else {
-				this.options = $.extend(true, {},
-					this.optionsAudio,
-					this.options
-				);
-			}
-			this._setSize(); // update status and jPlayer element size
-
-			// Determine the status for Blocklisted options.
-			this.status.nativeVideoControls = this._uaBlocklist(this.options.nativeVideoControls);
-			this.status.noFullScreen = this._uaBlocklist(this.options.noFullScreen);
-			this.status.noVolume = this._uaBlocklist(this.options.noVolume);
-
-			// The native controls are only for video and are disabled when audio is also used.
-			this._restrictNativeVideoControls();
-
-			// Create the poster image.
-			this.htmlElement.poster = document.createElement('img');
-			this.htmlElement.poster.id = this.internal.poster.id;
-			this.htmlElement.poster.onload = function() { // Note that this did not work on Firefox 3.6: poster.addEventListener("onload", function() {}, false); Did not investigate x-browser.
-				if(!self.status.video || self.status.waitForPlay) {
-					self.internal.poster.jq.show();
-				}
-			};
-			this.element.append(this.htmlElement.poster);
-			this.internal.poster.jq = $("#" + this.internal.poster.id);
-			this.internal.poster.jq.css({'width': this.status.width, 'height': this.status.height});
-			this.internal.poster.jq.hide();
-			this.internal.poster.jq.bind("click.jPlayer", function() {
-				self._trigger($.jPlayer.event.click);
-			});
-			
-			// Generate the required media elements
-			this.html.audio.available = false;
-			if(this.require.audio) { // If a supplied format is audio
-				this.htmlElement.audio = document.createElement('audio');
-				this.htmlElement.audio.id = this.internal.audio.id;
-				this.html.audio.available = !!this.htmlElement.audio.canPlayType && this._testCanPlayType(this.htmlElement.audio); // Test is for IE9 on Win Server 2008.
-			}
-			this.html.video.available = false;
-			if(this.require.video) { // If a supplied format is video
-				this.htmlElement.video = document.createElement('video');
-				this.htmlElement.video.id = this.internal.video.id;
-				this.html.video.available = !!this.htmlElement.video.canPlayType && this._testCanPlayType(this.htmlElement.video); // Test is for IE9 on Win Server 2008.
-			}
-
-			this.flash.available = this._checkForFlash(10);
-
-			this.html.canPlay = {};
-			this.flash.canPlay = {};
-			$.each(this.formats, function(priority, format) {
-				self.html.canPlay[format] = self.html[self.format[format].media].available && "" !== self.htmlElement[self.format[format].media].canPlayType(self.format[format].codec);
-				self.flash.canPlay[format] = self.format[format].flashCanPlay && self.flash.available;
-			});
-			this.html.desired = false;
-			this.flash.desired = false;
-			$.each(this.solutions, function(solutionPriority, solution) {
-				if(solutionPriority === 0) {
-					self[solution].desired = true;
-				} else {
-					var audioCanPlay = false;
-					var videoCanPlay = false;
-					$.each(self.formats, function(formatPriority, format) {
-						if(self[self.solutions[0]].canPlay[format]) { // The other solution can play
-							if(self.format[format].media === 'video') {
-								videoCanPlay = true;
-							} else {
-								audioCanPlay = true;
-							}
-						}
-					});
-					self[solution].desired = (self.require.audio && !audioCanPlay) || (self.require.video && !videoCanPlay);
-				}
-			});
-			// This is what jPlayer will support, based on solution and supplied.
-			this.html.support = {};
-			this.flash.support = {};
-			$.each(this.formats, function(priority, format) {
-				self.html.support[format] = self.html.canPlay[format] && self.html.desired;
-				self.flash.support[format] = self.flash.canPlay[format] && self.flash.desired;
-			});
-			// If jPlayer is supporting any format in a solution, then the solution is used.
-			this.html.used = false;
-			this.flash.used = false;
-			$.each(this.solutions, function(solutionPriority, solution) {
-				$.each(self.formats, function(formatPriority, format) {
-					if(self[solution].support[format]) {
-						self[solution].used = true;
-						return false;
-					}
-				});
-			});
-
-			// Init solution active state and the event gates to false.
-			this._resetActive();
-			this._resetGate();
-
-			// Set up the css selectors for the control and feedback entities.
-			this._cssSelectorAncestor(this.options.cssSelectorAncestor);
-			
-			// If neither html nor flash are being used by this browser, then media playback is not possible. Trigger an error event.
-			if(!(this.html.used || this.flash.used)) {
-				this._error( {
-					type: $.jPlayer.error.NO_SOLUTION, 
-					context: "{solution:'" + this.options.solution + "', supplied:'" + this.options.supplied + "'}",
-					message: $.jPlayer.errorMsg.NO_SOLUTION,
-					hint: $.jPlayer.errorHint.NO_SOLUTION
-				});
-				if(this.css.jq.noSolution.length) {
-					this.css.jq.noSolution.show();
-				}
-			} else {
-				if(this.css.jq.noSolution.length) {
-					this.css.jq.noSolution.hide();
-				}
-			}
-
-			// Add the flash solution if it is being used.
-			if(this.flash.used) {
-				var htmlObj,
-				flashVars = 'jQuery=' + encodeURI(this.options.noConflict) + '&id=' + encodeURI(this.internal.self.id) + '&vol=' + this.options.volume + '&muted=' + this.options.muted;
-
-				// Code influenced by SWFObject 2.2: http://code.google.com/p/swfobject/
-				// Non IE browsers have an initial Flash size of 1 by 1 otherwise the wmode affected the Flash ready event. 
-
-				if($.browser.msie && Number($.browser.version) <= 8) {
-					var objStr = '<object id="' + this.internal.flash.id + '" classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" width="0" height="0"></object>';
-
-					var paramStr = [
-						'<param name="movie" value="' + this.internal.flash.swf + '" />',
-						'<param name="FlashVars" value="' + flashVars + '" />',
-						'<param name="allowScriptAccess" value="always" />',
-						'<param name="bgcolor" value="' + this.options.backgroundColor + '" />',
-						'<param name="wmode" value="' + this.options.wmode + '" />'
-					];
-
-					htmlObj = document.createElement(objStr);
-					for(var i=0; i < paramStr.length; i++) {
-						htmlObj.appendChild(document.createElement(paramStr[i]));
-					}
-				} else {
-					var createParam = function(el, n, v) {
-						var p = document.createElement("param");
-						p.setAttribute("name", n);	
-						p.setAttribute("value", v);
-						el.appendChild(p);
-					};
-
-					htmlObj = document.createElement("object");
-					htmlObj.setAttribute("id", this.internal.flash.id);
-					htmlObj.setAttribute("data", this.internal.flash.swf);
-					htmlObj.setAttribute("type", "application/x-shockwave-flash");
-					htmlObj.setAttribute("width", "1"); // Non-zero
-					htmlObj.setAttribute("height", "1"); // Non-zero
-					createParam(htmlObj, "flashvars", flashVars);
-					createParam(htmlObj, "allowscriptaccess", "always");
-					createParam(htmlObj, "bgcolor", this.options.backgroundColor);
-					createParam(htmlObj, "wmode", this.options.wmode);
-				}
-
-				this.element.append(htmlObj);
-				this.internal.flash.jq = $(htmlObj);
-			}
-			
-			// Add the HTML solution if being used.
-			if(this.html.used) {
-
-				// The HTML Audio handlers
-				if(this.html.audio.available) {
-					this._addHtmlEventListeners(this.htmlElement.audio, this.html.audio);
-					this.element.append(this.htmlElement.audio);
-					this.internal.audio.jq = $("#" + this.internal.audio.id);
-				}
-
-				// The HTML Video handlers
-				if(this.html.video.available) {
-					this._addHtmlEventListeners(this.htmlElement.video, this.html.video);
-					this.element.append(this.htmlElement.video);
-					this.internal.video.jq = $("#" + this.internal.video.id);
-					if(this.status.nativeVideoControls) {
-						this.internal.video.jq.css({'width': this.status.width, 'height': this.status.height});
-					} else {
-						this.internal.video.jq.css({'width':'0px', 'height':'0px'}); // Using size 0x0 since a .hide() causes issues in iOS
-					}
-					this.internal.video.jq.bind("click.jPlayer", function() {
-						self._trigger($.jPlayer.event.click);
-					});
-				}
-			}
-
-			// Create the bridge that emulates the HTML Media element on the jPlayer DIV
-			if( this.options.emulateHtml ) {
-				this._emulateHtmlBridge();
-			}
-
-			if(this.html.used && !this.flash.used) { // If only HTML, then emulate flash ready() call after 100ms.
-				setTimeout( function() {
-					self.internal.ready = true;
-					self.version.flash = "n/a";
-					self._trigger($.jPlayer.event.repeat); // Trigger the repeat event so its handler can initialize itself with the loop option.
-					self._trigger($.jPlayer.event.ready);
-				}, 100);
-			}
-
-			// Initialize the interface components with the options.
-			this._updateNativeVideoControls(); // Must do this first, otherwise there is a bizarre bug in iOS 4.3.2, where the native controls are not shown. Fails in iOS if called after _updateButtons() below. Works if called later in setMedia too, so it odd.
-			this._updateInterface();
-			this._updateButtons(false);
-			this._updateAutohide();
-			this._updateVolume(this.options.volume);
-			this._updateMute(this.options.muted);
-			if(this.css.jq.videoPlay.length) {
-				this.css.jq.videoPlay.hide();
-			}
-
-			$.jPlayer.prototype.count++; // Change static variable via prototype.
-		},
-		destroy: function() {
-			// MJP: The background change remains. Would need to store the original to restore it correctly.
-			// MJP: The jPlayer element's size change remains.
-
-			// Clear the media to reset the GUI and stop any downloads. Streams on some browsers had persited. (Chrome)
-			this.clearMedia();
-			// Remove the size/sizeFull cssClass from the cssSelectorAncestor
-			this._removeUiClass();
-			// Remove the times from the GUI
-			if(this.css.jq.currentTime.length) {
-				this.css.jq.currentTime.text("");
-			}
-			if(this.css.jq.duration.length) {
-				this.css.jq.duration.text("");
-			}
-			// Remove any bindings from the interface controls.
-			$.each(this.css.jq, function(fn, jq) {
-				// Check selector is valid before trying to execute method.
-				if(jq.length) {
-					jq.unbind(".jPlayer");
-				}
-			});
-			// Remove the click handlers for $.jPlayer.event.click
-			this.internal.poster.jq.unbind(".jPlayer");
-			if(this.internal.video.jq) {
-				this.internal.video.jq.unbind(".jPlayer");
-			}
-			// Destroy the HTML bridge.
-			if(this.options.emulateHtml) {
-				this._destroyHtmlBridge();
-			}
-			this.element.removeData("jPlayer"); // Remove jPlayer data
-			this.element.unbind(".jPlayer"); // Remove all event handlers created by the jPlayer constructor
-			this.element.empty(); // Remove the inserted child elements
-			
-			delete this.instances[this.internal.instance]; // Clear the instance on the static instance object
-		},
-		enable: function() { // Plan to implement
-			// options.disabled = false
-		},
-		disable: function () { // Plan to implement
-			// options.disabled = true
-		},
-		_testCanPlayType: function(elem) {
-			// IE9 on Win Server 2008 did not implement canPlayType(), but it has the property.
-			try {
-				elem.canPlayType(this.format.mp3.codec); // The type is irrelevant.
-				return true;
-			} catch(err) {
-				return false;
-			}
-		},
-		_uaBlocklist: function(list) {
-			// list : object with properties that are all regular expressions. Property names are irrelevant.
-			// Returns true if the user agent is matched in list.
-			var	ua = navigator.userAgent.toLowerCase(),
-				block = false;
-
-			$.each(list, function(p, re) {
-				if(re && re.test(ua)) {
-					block = true;
-					return false; // exit $.each.
-				}
-			});
-			return block;
-		},
-		_restrictNativeVideoControls: function() {
-			// Fallback to noFullScreen when nativeVideoControls is true and audio media is being used. Affects when both media types are used.
-			if(this.require.audio) {
-				if(this.status.nativeVideoControls) {
-					this.status.nativeVideoControls = false;
-					this.status.noFullScreen = true;
-				}
-			}
-		},
-		_updateNativeVideoControls: function() {
-			if(this.html.video.available && this.html.used) {
-				// Turn the HTML Video controls on/off
-				this.htmlElement.video.controls = this.status.nativeVideoControls;
-				// Show/hide the jPlayer GUI.
-				this._updateAutohide();
-				// For when option changed. The poster image is not updated, as it is dealt with in setMedia(). Acceptable degradation since seriously doubt these options will change on the fly. Can again review later.
-				if(this.status.nativeVideoControls && this.require.video) {
-					this.internal.poster.jq.hide();
-					this.internal.video.jq.css({'width': this.status.width, 'height': this.status.height});
-				} else if(this.status.waitForPlay && this.status.video) {
-					this.internal.poster.jq.show();
-					this.internal.video.jq.css({'width': '0px', 'height': '0px'});
-				}
-			}
-		},
-		_addHtmlEventListeners: function(mediaElement, entity) {
-			var self = this;
-			mediaElement.preload = this.options.preload;
-			mediaElement.muted = this.options.muted;
-			mediaElement.volume = this.options.volume;
-
-			// Create the event listeners
-			// Only want the active entity to affect jPlayer and bubble events.
-			// Using entity.gate so that object is referenced and gate property always current
-			
-			mediaElement.addEventListener("progress", function() {
-				if(entity.gate) {
-					self._getHtmlStatus(mediaElement);
-					self._updateInterface();
-					self._trigger($.jPlayer.event.progress);
-				}
-			}, false);
-			mediaElement.addEventListener("timeupdate", function() {
-				if(entity.gate) {
-					self._getHtmlStatus(mediaElement);
-					self._updateInterface();
-					self._trigger($.jPlayer.event.timeupdate);
-				}
-			}, false);
-			mediaElement.addEventListener("durationchange", function() {
-				if(entity.gate) {
-					self.status.duration = this.duration;
-					self._getHtmlStatus(mediaElement);
-					self._updateInterface();
-					self._trigger($.jPlayer.event.durationchange);
-				}
-			}, false);
-			mediaElement.addEventListener("play", function() {
-				if(entity.gate) {
-					self._updateButtons(true);
-					self._html_checkWaitForPlay(); // So the native controls update this variable and puts the hidden interface in the correct state. Affects toggling native controls.
-					self._trigger($.jPlayer.event.play);
-				}
-			}, false);
-			mediaElement.addEventListener("playing", function() {
-				if(entity.gate) {
-					self._updateButtons(true);
-					self._seeked();
-					self._trigger($.jPlayer.event.playing);
-				}
-			}, false);
-			mediaElement.addEventListener("pause", function() {
-				if(entity.gate) {
-					self._updateButtons(false);
-					self._trigger($.jPlayer.event.pause);
-				}
-			}, false);
-			mediaElement.addEventListener("waiting", function() {
-				if(entity.gate) {
-					self._seeking();
-					self._trigger($.jPlayer.event.waiting);
-				}
-			}, false);
-			mediaElement.addEventListener("seeking", function() {
-				if(entity.gate) {
-					self._seeking();
-					self._trigger($.jPlayer.event.seeking);
-				}
-			}, false);
-			mediaElement.addEventListener("seeked", function() {
-				if(entity.gate) {
-					self._seeked();
-					self._trigger($.jPlayer.event.seeked);
-				}
-			}, false);
-			mediaElement.addEventListener("volumechange", function() {
-				if(entity.gate) {
-					// Read the values back from the element as the Blackberry PlayBook shares the volume with the physical buttons master volume control.
-					// However, when tested 6th July 2011, those buttons do not generate an event. The physical play/pause button does though.
-					self.options.volume = mediaElement.volume;
-					self.options.muted = mediaElement.muted;
-					self._updateMute();
-					self._updateVolume();
-					self._trigger($.jPlayer.event.volumechange);
-				}
-			}, false);
-			mediaElement.addEventListener("suspend", function() { // Seems to be the only way of capturing that the iOS4 browser did not actually play the media from the page code. ie., It needs a user gesture.
-				if(entity.gate) {
-					self._seeked();
-					self._trigger($.jPlayer.event.suspend);
-				}
-			}, false);
-			mediaElement.addEventListener("ended", function() {
-				if(entity.gate) {
-					// Order of the next few commands are important. Change the time and then pause.
-					// Solves a bug in Firefox, where issuing pause 1st causes the media to play from the start. ie., The pause is ignored.
-					if(!$.jPlayer.browser.webkit) { // Chrome crashes if you do this in conjunction with a setMedia command in an ended event handler. ie., The playlist demo.
-						self.htmlElement.media.currentTime = 0; // Safari does not care about this command. ie., It works with or without this line. (Both Safari and Chrome are Webkit.)
-					}
-					self.htmlElement.media.pause(); // Pause otherwise a click on the progress bar will play from that point, when it shouldn't, since it stopped playback.
-					self._updateButtons(false);
-					self._getHtmlStatus(mediaElement, true); // With override true. Otherwise Chrome leaves progress at full.
-					self._updateInterface();
-					self._trigger($.jPlayer.event.ended);
-				}
-			}, false);
-			mediaElement.addEventListener("error", function() {
-				if(entity.gate) {
-					self._updateButtons(false);
-					self._seeked();
-					if(self.status.srcSet) { // Deals with case of clearMedia() causing an error event.
-						clearTimeout(self.internal.htmlDlyCmdId); // Clears any delayed commands used in the HTML solution.
-						self.status.waitForLoad = true; // Allows the load operation to try again.
-						self.status.waitForPlay = true; // Reset since a play was captured.
-						if(self.status.video && !self.status.nativeVideoControls) {
-							self.internal.video.jq.css({'width':'0px', 'height':'0px'});
-						}
-						if(self._validString(self.status.media.poster) && !self.status.nativeVideoControls) {
-							self.internal.poster.jq.show();
-						}
-						if(self.css.jq.videoPlay.length) {
-							self.css.jq.videoPlay.show();
-						}
-						self._error( {
-							type: $.jPlayer.error.URL,
-							context: self.status.src, // this.src shows absolute urls. Want context to show the url given.
-							message: $.jPlayer.errorMsg.URL,
-							hint: $.jPlayer.errorHint.URL
-						});
-					}
-				}
-			}, false);
-			// Create all the other event listeners that bubble up to a jPlayer event from html, without being used by jPlayer.
-			$.each($.jPlayer.htmlEvent, function(i, eventType) {
-				mediaElement.addEventListener(this, function() {
-					if(entity.gate) {
-						self._trigger($.jPlayer.event[eventType]);
-					}
-				}, false);
-			});
-		},
-		_getHtmlStatus: function(media, override) {
-			var ct = 0, d = 0, cpa = 0, sp = 0, cpr = 0;
-
-			if(media.duration) { // Fixes the duration bug in iOS, where the durationchange event occurs when media.duration is not always correct.
-				this.status.duration = media.duration;
-			}
-			ct = media.currentTime;
-			cpa = (this.status.duration > 0) ? 100 * ct / this.status.duration : 0;
-			if((typeof media.seekable === "object") && (media.seekable.length > 0)) {
-				sp = (this.status.duration > 0) ? 100 * media.seekable.end(media.seekable.length-1) / this.status.duration : 100;
-				cpr = 100 * media.currentTime / media.seekable.end(media.seekable.length-1);
-			} else {
-				sp = 100;
-				cpr = cpa;
-			}
-			
-			if(override) {
-				ct = 0;
-				cpr = 0;
-				cpa = 0;
-			}
-
-			this.status.seekPercent = sp;
-			this.status.currentPercentRelative = cpr;
-			this.status.currentPercentAbsolute = cpa;
-			this.status.currentTime = ct;
-
-			this.status.readyState = media.readyState;
-			this.status.networkState = media.networkState;
-			this.status.playbackRate = media.playbackRate;
-			this.status.ended = media.ended;
-		},
-		_resetStatus: function() {
-			this.status = $.extend({}, this.status, $.jPlayer.prototype.status); // Maintains the status properties that persist through a reset.
-		},
-		_trigger: function(eventType, error, warning) { // eventType always valid as called using $.jPlayer.event.eventType
-			var event = $.Event(eventType);
-			event.jPlayer = {};
-			event.jPlayer.version = $.extend({}, this.version);
-			event.jPlayer.options = $.extend(true, {}, this.options); // Deep copy
-			event.jPlayer.status = $.extend(true, {}, this.status); // Deep copy
-			event.jPlayer.html = $.extend(true, {}, this.html); // Deep copy
-			event.jPlayer.flash = $.extend(true, {}, this.flash); // Deep copy
-			if(error) {
-				event.jPlayer.error = $.extend({}, error);
-			}
-			if(warning) {
-				event.jPlayer.warning = $.extend({}, warning);
-			}
-			this.element.trigger(event);
-		},
-		jPlayerFlashEvent: function(eventType, status) { // Called from Flash
-			if(eventType === $.jPlayer.event.ready) {
-				if(!this.internal.ready) {
-					this.internal.ready = true;
-					this.internal.flash.jq.css({'width':'0px', 'height':'0px'}); // Once Flash generates the ready event, minimise to zero as it is not affected by wmode anymore.
-
-					this.version.flash = status.version;
-					if(this.version.needFlash !== this.version.flash) {
-						this._error( {
-							type: $.jPlayer.error.VERSION,
-							context: this.version.flash,
-							message: $.jPlayer.errorMsg.VERSION + this.version.flash,
-							hint: $.jPlayer.errorHint.VERSION
-						});
-					}
-					this._trigger($.jPlayer.event.repeat); // Trigger the repeat event so its handler can initialize itself with the loop option.
-					this._trigger(eventType);
-				} else {
-					// This condition occurs if the Flash is hidden and then shown again.
-					// Firefox also reloads the Flash if the CSS position changes. position:fixed is used for full screen.
-
-					// Only do this if the Flash is the solution being used at the moment. Affects Media players where both solution may be being used.
-					if(this.flash.gate) {
-
-						// Send the current status to the Flash now that it is ready (available) again.
-						if(this.status.srcSet) {
-
-							// Need to read original status before issuing the setMedia command.
-							var	currentTime = this.status.currentTime,
-								paused = this.status.paused; 
-
-							this.setMedia(this.status.media);
-							if(currentTime > 0) {
-								if(paused) {
-									this.pause(currentTime);
-								} else {
-									this.play(currentTime);
-								}
-							}
-						}
-						this._trigger($.jPlayer.event.flashreset);
-					}
-				}
-			}
-			if(this.flash.gate) {
-				switch(eventType) {
-					case $.jPlayer.event.progress:
-						this._getFlashStatus(status);
-						this._updateInterface();
-						this._trigger(eventType);
-						break;
-					case $.jPlayer.event.timeupdate:
-						this._getFlashStatus(status);
-						this._updateInterface();
-						this._trigger(eventType);
-						break;
-					case $.jPlayer.event.play:
-						this._seeked();
-						this._updateButtons(true);
-						this._trigger(eventType);
-						break;
-					case $.jPlayer.event.pause:
-						this._updateButtons(false);
-						this._trigger(eventType);
-						break;
-					case $.jPlayer.event.ended:
-						this._updateButtons(false);
-						this._trigger(eventType);
-						break;
-					case $.jPlayer.event.click:
-						this._trigger(eventType); // This could be dealt with by the default
-						break;
-					case $.jPlayer.event.error:
-						this.status.waitForLoad = true; // Allows the load operation to try again.
-						this.status.waitForPlay = true; // Reset since a play was captured.
-						if(this.status.video) {
-							this.internal.flash.jq.css({'width':'0px', 'height':'0px'});
-						}
-						if(this._validString(this.status.media.poster)) {
-							this.internal.poster.jq.show();
-						}
-						if(this.css.jq.videoPlay.length && this.status.video) {
-							this.css.jq.videoPlay.show();
-						}
-						if(this.status.video) { // Set up for another try. Execute before error event.
-							this._flash_setVideo(this.status.media);
-						} else {
-							this._flash_setAudio(this.status.media);
-						}
-						this._updateButtons(false);
-						this._error( {
-							type: $.jPlayer.error.URL,
-							context:status.src,
-							message: $.jPlayer.errorMsg.URL,
-							hint: $.jPlayer.errorHint.URL
-						});
-						break;
-					case $.jPlayer.event.seeking:
-						this._seeking();
-						this._trigger(eventType);
-						break;
-					case $.jPlayer.event.seeked:
-						this._seeked();
-						this._trigger(eventType);
-						break;
-					case $.jPlayer.event.ready:
-						// The ready event is handled outside the switch statement.
-						// Captured here otherwise 2 ready events would be generated if the ready event handler used setMedia.
-						break;
-					default:
-						this._trigger(eventType);
-				}
-			}
-			return false;
-		},
-		_getFlashStatus: function(status) {
-			this.status.seekPercent = status.seekPercent;
-			this.status.currentPercentRelative = status.currentPercentRelative;
-			this.status.currentPercentAbsolute = status.currentPercentAbsolute;
-			this.status.currentTime = status.currentTime;
-			this.status.duration = status.duration;
-
-			// The Flash does not generate this information in this release
-			this.status.readyState = 4; // status.readyState;
-			this.status.networkState = 0; // status.networkState;
-			this.status.playbackRate = 1; // status.playbackRate;
-			this.status.ended = false; // status.ended;
-		},
-		_updateButtons: function(playing) {
-			if(playing !== undefined) {
-				this.status.paused = !playing;
-				if(this.css.jq.play.length && this.css.jq.pause.length) {
-					if(playing) {
-						this.css.jq.play.hide();
-						this.css.jq.pause.show();
-					} else {
-						this.css.jq.play.show();
-						this.css.jq.pause.hide();
-					}
-				}
-			}
-			if(this.css.jq.restoreScreen.length && this.css.jq.fullScreen.length) {
-				if(this.status.noFullScreen) {
-					this.css.jq.fullScreen.hide();
-					this.css.jq.restoreScreen.hide();
-				} else if(this.options.fullScreen) {
-					this.css.jq.fullScreen.hide();
-					this.css.jq.restoreScreen.show();
-				} else {
-					this.css.jq.fullScreen.show();
-					this.css.jq.restoreScreen.hide();
-				}
-			}
-			if(this.css.jq.repeat.length && this.css.jq.repeatOff.length) {
-				if(this.options.loop) {
-					this.css.jq.repeat.hide();
-					this.css.jq.repeatOff.show();
-				} else {
-					this.css.jq.repeat.show();
-					this.css.jq.repeatOff.hide();
-				}
-			}
-		},
-		_updateInterface: function() {
-			if(this.css.jq.seekBar.length) {
-				this.css.jq.seekBar.width(this.status.seekPercent+"%");
-			}
-			if(this.css.jq.playBar.length) {
-				this.css.jq.playBar.width(this.status.currentPercentRelative+"%");
-			}
-			if(this.css.jq.currentTime.length) {
-				this.css.jq.currentTime.text($.jPlayer.convertTime(this.status.currentTime));
-			}
-			if(this.css.jq.duration.length) {
-				this.css.jq.duration.text($.jPlayer.convertTime(this.status.duration));
-			}
-		},
-		_seeking: function() {
-			if(this.css.jq.seekBar.length) {
-				this.css.jq.seekBar.addClass("jp-seeking-bg");
-			}
-		},
-		_seeked: function() {
-			if(this.css.jq.seekBar.length) {
-				this.css.jq.seekBar.removeClass("jp-seeking-bg");
-			}
-		},
-		_resetGate: function() {
-			this.html.audio.gate = false;
-			this.html.video.gate = false;
-			this.flash.gate = false;
-		},
-		_resetActive: function() {
-			this.html.active = false;
-			this.flash.active = false;
-		},
-		setMedia: function(media) {
-		
-			/*	media[format] = String: URL of format. Must contain all of the supplied option's video or audio formats.
-			 *	media.poster = String: Video poster URL.
-			 *	media.subtitles = String: * NOT IMPLEMENTED * URL of subtitles SRT file
-			 *	media.chapters = String: * NOT IMPLEMENTED * URL of chapters SRT file
-			 *	media.stream = Boolean: * NOT IMPLEMENTED * Designating actual media streams. ie., "false/undefined" for files. Plan to refresh the flash every so often.
-			 */
-
-			var	self = this,
-				supported = false,
-				posterChanged = this.status.media.poster !== media.poster; // Compare before reset. Important for OSX Safari as this.htmlElement.poster.src is absolute, even if original poster URL was relative.
-
-			this._resetMedia();
-			this._resetGate();
-			this._resetActive();
-
-			$.each(this.formats, function(formatPriority, format) {
-				var isVideo = self.format[format].media === 'video';
-				$.each(self.solutions, function(solutionPriority, solution) {
-					if(self[solution].support[format] && self._validString(media[format])) { // Format supported in solution and url given for format.
-						var isHtml = solution === 'html';
-
-						if(isVideo) {
-							if(isHtml) {
-								self.html.video.gate = true;
-								self._html_setVideo(media);
-								self.html.active = true;
-							} else {
-								self.flash.gate = true;
-								self._flash_setVideo(media);
-								self.flash.active = true;
-							}
-							if(self.css.jq.videoPlay.length) {
-								self.css.jq.videoPlay.show();
-							}
-							self.status.video = true;
-						} else {
-							if(isHtml) {
-								self.html.audio.gate = true;
-								self._html_setAudio(media);
-								self.html.active = true;
-							} else {
-								self.flash.gate = true;
-								self._flash_setAudio(media);
-								self.flash.active = true;
-							}
-							if(self.css.jq.videoPlay.length) {
-								self.css.jq.videoPlay.hide();
-							}
-							self.status.video = false;
-						}
-						
-						supported = true;
-						return false; // Exit $.each
-					}
-				});
-				if(supported) {
-					return false; // Exit $.each
-				}
-			});
-
-			if(supported) {
-				if(!(this.status.nativeVideoControls && this.html.video.gate)) {
-					// Set poster IMG if native video controls are not being used
-					// Note: With IE the IMG onload event occurs immediately when cached.
-					// Note: Poster hidden by default in _resetMedia()
-					if(this._validString(media.poster)) {
-						if(posterChanged) { // Since some browsers do not generate img onload event.
-							this.htmlElement.poster.src = media.poster;
-						} else {
-							this.internal.poster.jq.show();
-						}
-					}
-				}
-				this.status.srcSet = true;
-				this.status.media = $.extend({}, media);
-				this._updateButtons(false);
-				this._updateInterface();
-			} else { // jPlayer cannot support any formats provided in this browser
-				// Send an error event
-				this._error( {
-					type: $.jPlayer.error.NO_SUPPORT,
-					context: "{supplied:'" + this.options.supplied + "'}",
-					message: $.jPlayer.errorMsg.NO_SUPPORT,
-					hint: $.jPlayer.errorHint.NO_SUPPORT
-				});
-			}
-		},
-		_resetMedia: function() {
-			this._resetStatus();
-			this._updateButtons(false);
-			this._updateInterface();
-			this._seeked();
-			this.internal.poster.jq.hide();
-
-			clearTimeout(this.internal.htmlDlyCmdId);
-
-			if(this.html.active) {
-				this._html_resetMedia();
-			} else if(this.flash.active) {
-				this._flash_resetMedia();
-			}
-		},
-		clearMedia: function() {
-			this._resetMedia();
-
-			if(this.html.active) {
-				this._html_clearMedia();
-			} else if(this.flash.active) {
-				this._flash_clearMedia();
-			}
-
-			this._resetGate();
-			this._resetActive();
-		},
-		load: function() {
-			if(this.status.srcSet) {
-				if(this.html.active) {
-					this._html_load();
-				} else if(this.flash.active) {
-					this._flash_load();
-				}
-			} else {
-				this._urlNotSetError("load");
-			}
-		},
-		play: function(time) {
-			time = (typeof time === "number") ? time : NaN; // Remove jQuery event from click handler
-			if(this.status.srcSet) {
-				if(this.html.active) {
-					this._html_play(time);
-				} else if(this.flash.active) {
-					this._flash_play(time);
-				}
-			} else {
-				this._urlNotSetError("play");
-			}
-		},
-		videoPlay: function(e) { // Handles clicks on the play button over the video poster
-			this.play();
-		},
-		pause: function(time) {
-			time = (typeof time === "number") ? time : NaN; // Remove jQuery event from click handler
-			if(this.status.srcSet) {
-				if(this.html.active) {
-					this._html_pause(time);
-				} else if(this.flash.active) {
-					this._flash_pause(time);
-				}
-			} else {
-				this._urlNotSetError("pause");
-			}
-		},
-		pauseOthers: function() {
-			var self = this;
-			$.each(this.instances, function(i, element) {
-				if(self.element !== element) { // Do not this instance.
-					if(element.data("jPlayer").status.srcSet) { // Check that media is set otherwise would cause error event.
-						element.jPlayer("pause");
-					}
-				}
-			});
-		},
-		stop: function() {
-			if(this.status.srcSet) {
-				if(this.html.active) {
-					this._html_pause(0);
-				} else if(this.flash.active) {
-					this._flash_pause(0);
-				}
-			} else {
-				this._urlNotSetError("stop");
-			}
-		},
-		playHead: function(p) {
-			p = this._limitValue(p, 0, 100);
-			if(this.status.srcSet) {
-				if(this.html.active) {
-					this._html_playHead(p);
-				} else if(this.flash.active) {
-					this._flash_playHead(p);
-				}
-			} else {
-				this._urlNotSetError("playHead");
-			}
-		},
-		_muted: function(muted) {
-			this.options.muted = muted;
-			if(this.html.used) {
-				this._html_mute(muted);
-			}
-			if(this.flash.used) {
-				this._flash_mute(muted);
-			}
-
-			// The HTML solution generates this event from the media element itself.
-			if(!this.html.video.gate && !this.html.audio.gate) {
-				this._updateMute(muted);
-				this._updateVolume(this.options.volume);
-				this._trigger($.jPlayer.event.volumechange);
-			}
-		},
-		mute: function(mute) { // mute is either: undefined (true), an event object (true) or a boolean (muted).
-			mute = mute === undefined ? true : !!mute;
-			this._muted(mute);
-		},
-		unmute: function(unmute) { // unmute is either: undefined (true), an event object (true) or a boolean (!muted).
-			unmute = unmute === undefined ? true : !!unmute;
-			this._muted(!unmute);
-		},
-		_updateMute: function(mute) {
-			if(mute === undefined) {
-				mute = this.options.muted;
-			}
-			if(this.css.jq.mute.length && this.css.jq.unmute.length) {
-				if(this.status.noVolume) {
-					this.css.jq.mute.hide();
-					this.css.jq.unmute.hide();
-				} else if(mute) {
-					this.css.jq.mute.hide();
-					this.css.jq.unmute.show();
-				} else {
-					this.css.jq.mute.show();
-					this.css.jq.unmute.hide();
-				}
-			}
-		},
-		volume: function(v) {
-			v = this._limitValue(v, 0, 1);
-			this.options.volume = v;
-
-			if(this.html.used) {
-				this._html_volume(v);
-			}
-			if(this.flash.used) {
-				this._flash_volume(v);
-			}
-
-			// The HTML solution generates this event from the media element itself.
-			if(!this.html.video.gate && !this.html.audio.gate) {
-				this._updateVolume(v);
-				this._trigger($.jPlayer.event.volumechange);
-			}
-		},
-		volumeBar: function(e) { // Handles clicks on the volumeBar
-			if(this.css.jq.volumeBar.length) {
-				var	offset = this.css.jq.volumeBar.offset(),
-					x = e.pageX - offset.left,
-					w = this.css.jq.volumeBar.width(),
-					y = this.css.jq.volumeBar.height() - e.pageY + offset.top,
-					h = this.css.jq.volumeBar.height();
-
-				if(this.options.verticalVolume) {
-					this.volume(y/h);
-				} else {
-					this.volume(x/w);
-				}
-			}
-			if(this.options.muted) {
-				this._muted(false);
-			}
-		},
-		volumeBarValue: function(e) { // Handles clicks on the volumeBarValue
-			this.volumeBar(e);
-		},
-		_updateVolume: function(v) {
-			if(v === undefined) {
-				v = this.options.volume;
-			}
-			v = this.options.muted ? 0 : v;
-
-			if(this.status.noVolume) {
-				if(this.css.jq.volumeBar.length) {
-					this.css.jq.volumeBar.hide();
-				}
-				if(this.css.jq.volumeBarValue.length) {
-					this.css.jq.volumeBarValue.hide();
-				}
-				if(this.css.jq.volumeMax.length) {
-					this.css.jq.volumeMax.hide();
-				}
-			} else {
-				if(this.css.jq.volumeBar.length) {
-					this.css.jq.volumeBar.show();
-				}
-				if(this.css.jq.volumeBarValue.length) {
-					this.css.jq.volumeBarValue.show();
-					this.css.jq.volumeBarValue[this.options.verticalVolume ? "height" : "width"]((v*100)+"%");
-				}
-				if(this.css.jq.volumeMax.length) {
-					this.css.jq.volumeMax.show();
-				}
-			}
-		},
-		volumeMax: function() { // Handles clicks on the volume max
-			this.volume(1);
-			if(this.options.muted) {
-				this._muted(false);
-			}
-		},
-		_cssSelectorAncestor: function(ancestor) {
-			var self = this;
-			this.options.cssSelectorAncestor = ancestor;
-			this._removeUiClass();
-			this.ancestorJq = ancestor ? $(ancestor) : []; // Would use $() instead of [], but it is only 1.4+
-			if(ancestor && this.ancestorJq.length !== 1) { // So empty strings do not generate the warning.
-				this._warning( {
-					type: $.jPlayer.warning.CSS_SELECTOR_COUNT,
-					context: ancestor,
-					message: $.jPlayer.warningMsg.CSS_SELECTOR_COUNT + this.ancestorJq.length + " found for cssSelectorAncestor.",
-					hint: $.jPlayer.warningHint.CSS_SELECTOR_COUNT
-				});
-			}
-			this._addUiClass();
-			$.each(this.options.cssSelector, function(fn, cssSel) {
-				self._cssSelector(fn, cssSel);
-			});
-		},
-		_cssSelector: function(fn, cssSel) {
-			var self = this;
-			if(typeof cssSel === 'string') {
-				if($.jPlayer.prototype.options.cssSelector[fn]) {
-					if(this.css.jq[fn] && this.css.jq[fn].length) {
-						this.css.jq[fn].unbind(".jPlayer");
-					}
-					this.options.cssSelector[fn] = cssSel;
-					this.css.cs[fn] = this.options.cssSelectorAncestor + " " + cssSel;
-
-					if(cssSel) { // Checks for empty string
-						this.css.jq[fn] = $(this.css.cs[fn]);
-					} else {
-						this.css.jq[fn] = []; // To comply with the css.jq[fn].length check before its use. As of jQuery 1.4 could have used $() for an empty set. 
-					}
-
-					if(this.css.jq[fn].length) {
-						var handler = function(e) {
-							self[fn](e);
-							$(this).blur();
-							return false;
-						};
-						this.css.jq[fn].bind("click.jPlayer", handler); // Using jPlayer namespace
-					}
-
-					if(cssSel && this.css.jq[fn].length !== 1) { // So empty strings do not generate the warning. ie., they just remove the old one.
-						this._warning( {
-							type: $.jPlayer.warning.CSS_SELECTOR_COUNT,
-							context: this.css.cs[fn],
-							message: $.jPlayer.warningMsg.CSS_SELECTOR_COUNT + this.css.jq[fn].length + " found for " + fn + " method.",
-							hint: $.jPlayer.warningHint.CSS_SELECTOR_COUNT
-						});
-					}
-				} else {
-					this._warning( {
-						type: $.jPlayer.warning.CSS_SELECTOR_METHOD,
-						context: fn,
-						message: $.jPlayer.warningMsg.CSS_SELECTOR_METHOD,
-						hint: $.jPlayer.warningHint.CSS_SELECTOR_METHOD
-					});
-				}
-			} else {
-				this._warning( {
-					type: $.jPlayer.warning.CSS_SELECTOR_STRING,
-					context: cssSel,
-					message: $.jPlayer.warningMsg.CSS_SELECTOR_STRING,
-					hint: $.jPlayer.warningHint.CSS_SELECTOR_STRING
-				});
-			}
-		},
-		seekBar: function(e) { // Handles clicks on the seekBar
-			if(this.css.jq.seekBar) {
-				var offset = this.css.jq.seekBar.offset();
-				var x = e.pageX - offset.left;
-				var w = this.css.jq.seekBar.width();
-				var p = 100*x/w;
-				this.playHead(p);
-			}
-		},
-		playBar: function(e) { // Handles clicks on the playBar
-			this.seekBar(e);
-		},
-		repeat: function() { // Handle clicks on the repeat button
-			this._loop(true);
-		},
-		repeatOff: function() { // Handle clicks on the repeatOff button
-			this._loop(false);
-		},
-		_loop: function(loop) {
-			if(this.options.loop !== loop) {
-				this.options.loop = loop;
-				this._updateButtons();
-				this._trigger($.jPlayer.event.repeat);
-			}
-		},
-
-		// Plan to review the cssSelector method to cope with missing associated functions accordingly.
-
-		currentTime: function(e) { // Handles clicks on the text
-			// Added to avoid errors using cssSelector system for the text
-		},
-		duration: function(e) { // Handles clicks on the text
-			// Added to avoid errors using cssSelector system for the text
-		},
-		gui: function(e) { // Handles clicks on the gui
-			// Added to avoid errors using cssSelector system for the gui
-		},
-		noSolution: function(e) { // Handles clicks on the error message
-			// Added to avoid errors using cssSelector system for no-solution
-		},
-
-		// Options code adapted from ui.widget.js (1.8.7).  Made changes so the key can use dot notation. To match previous getData solution in jPlayer 1.
-		option: function(key, value) {
-			var options = key;
-
-			 // Enables use: options().  Returns a copy of options object
-			if ( arguments.length === 0 ) {
-				return $.extend( true, {}, this.options );
-			}
-
-			if(typeof key === "string") {
-				var keys = key.split(".");
-
-				 // Enables use: options("someOption")  Returns a copy of the option. Supports dot notation.
-				if(value === undefined) {
-
-					var opt = $.extend(true, {}, this.options);
-					for(var i = 0; i < keys.length; i++) {
-						if(opt[keys[i]] !== undefined) {
-							opt = opt[keys[i]];
-						} else {
-							this._warning( {
-								type: $.jPlayer.warning.OPTION_KEY,
-								context: key,
-								message: $.jPlayer.warningMsg.OPTION_KEY,
-								hint: $.jPlayer.warningHint.OPTION_KEY
-							});
-							return undefined;
-						}
-					}
-					return opt;
-				}
-
-				 // Enables use: options("someOptionObject", someObject}).  Creates: {someOptionObject:someObject}
-				 // Enables use: options("someOption", someValue).  Creates: {someOption:someValue}
-				 // Enables use: options("someOptionObject.someOption", someValue).  Creates: {someOptionObject:{someOption:someValue}}
-
-				options = {};
-				var opts = options;
-
-				for(var j = 0; j < keys.length; j++) {
-					if(j < keys.length - 1) {
-						opts[keys[j]] = {};
-						opts = opts[keys[j]];
-					} else {
-						opts[keys[j]] = value;
-					}
-				}
-			}
-
-			 // Otherwise enables use: options(optionObject).  Uses original object (the key)
-
-			this._setOptions(options);
-
-			return this;
-		},
-		_setOptions: function(options) {
-			var self = this;
-			$.each(options, function(key, value) { // This supports the 2 level depth that the options of jPlayer has. Would review if we ever need more depth.
-				self._setOption(key, value);
-			});
-
-			return this;
-		},
-		_setOption: function(key, value) {
-			var self = this;
-
-			// The ability to set options is limited at this time.
-
-			switch(key) {
-				case "volume" :
-					this.volume(value);
-					break;
-				case "muted" :
-					this._muted(value);
-					break;
-				case "cssSelectorAncestor" :
-					this._cssSelectorAncestor(value); // Set and refresh all associations for the new ancestor.
-					break;
-				case "cssSelector" :
-					$.each(value, function(fn, cssSel) {
-						self._cssSelector(fn, cssSel); // NB: The option is set inside this function, after further validity checks.
-					});
-					break;
-				case "fullScreen" :
-					if(this.options[key] !== value) { // if changed
-						this._removeUiClass();
-						this.options[key] = value;
-						this._refreshSize();
-					}
-					break;
-				case "size" :
-					if(!this.options.fullScreen && this.options[key].cssClass !== value.cssClass) {
-						this._removeUiClass();
-					}
-					this.options[key] = $.extend({}, this.options[key], value); // store a merged copy of it, incase not all properties changed.
-					this._refreshSize();
-					break;
-				case "sizeFull" :
-					if(this.options.fullScreen && this.options[key].cssClass !== value.cssClass) {
-						this._removeUiClass();
-					}
-					this.options[key] = $.extend({}, this.options[key], value); // store a merged copy of it, incase not all properties changed.
-					this._refreshSize();
-					break;
-				case "autohide" :
-					this.options[key] = $.extend({}, this.options[key], value); // store a merged copy of it, incase not all properties changed.
-					this._updateAutohide();
-					break;
-				case "loop" :
-					this._loop(value);
-					break;
-				case "nativeVideoControls" :
-					this.options[key] = $.extend({}, this.options[key], value); // store a merged copy of it, incase not all properties changed.
-					this.status.nativeVideoControls = this._uaBlocklist(this.options.nativeVideoControls);
-					this._restrictNativeVideoControls();
-					this._updateNativeVideoControls();
-					break;
-				case "noFullScreen" :
-					this.options[key] = $.extend({}, this.options[key], value); // store a merged copy of it, incase not all properties changed.
-					this.status.nativeVideoControls = this._uaBlocklist(this.options.nativeVideoControls); // Need to check again as noFullScreen can depend on this flag and the restrict() can override it.
-					this.status.noFullScreen = this._uaBlocklist(this.options.noFullScreen);
-					this._restrictNativeVideoControls();
-					this._updateButtons();
-					break;
-				case "noVolume" :
-					this.options[key] = $.extend({}, this.options[key], value); // store a merged copy of it, incase not all properties changed.
-					this.status.noVolume = this._uaBlocklist(this.options.noVolume);
-					this._updateVolume();
-					this._updateMute();
-					break;
-				case "emulateHtml" :
-					if(this.options[key] !== value) { // To avoid multiple event handlers being created, if true already.
-						this.options[key] = value;
-						if(value) {
-							this._emulateHtmlBridge();
-						} else {
-							this._destroyHtmlBridge();
-						}
-					}
-					break;
-			}
-
-			return this;
-		},
-		// End of: (Options code adapted from ui.widget.js)
-
-		_refreshSize: function() {
-			this._setSize(); // update status and jPlayer element size
-			this._addUiClass(); // update the ui class
-			this._updateSize(); // update internal sizes
-			this._updateButtons();
-			this._updateAutohide();
-			this._trigger($.jPlayer.event.resize);
-		},
-		_setSize: function() {
-			// Determine the current size from the options
-			if(this.options.fullScreen) {
-				this.status.width = this.options.sizeFull.width;
-				this.status.height = this.options.sizeFull.height;
-				this.status.cssClass = this.options.sizeFull.cssClass;
-			} else {
-				this.status.width = this.options.size.width;
-				this.status.height = this.options.size.height;
-				this.status.cssClass = this.options.size.cssClass;
-			}
-
-			// Set the size of the jPlayer area.
-			this.element.css({'width': this.status.width, 'height': this.status.height});
-		},
-		_addUiClass: function() {
-			if(this.ancestorJq.length) {
-				this.ancestorJq.addClass(this.status.cssClass);
-			}
-		},
-		_removeUiClass: function() {
-			if(this.ancestorJq.length) {
-				this.ancestorJq.removeClass(this.status.cssClass);
-			}
-		},
-		_updateSize: function() {
-			// The poster uses show/hide so can simply resize it.
-			this.internal.poster.jq.css({'width': this.status.width, 'height': this.status.height});
-
-			// Video html or flash resized if necessary at this time, or if native video controls being used.
-			if(!this.status.waitForPlay && this.html.active && this.status.video || this.html.video.available && this.html.used && this.status.nativeVideoControls) {
-				this.internal.video.jq.css({'width': this.status.width, 'height': this.status.height});
-			}
-			else if(!this.status.waitForPlay && this.flash.active && this.status.video) {
-				this.internal.flash.jq.css({'width': this.status.width, 'height': this.status.height});
-			}
-		},
-		_updateAutohide: function() {
-			var	self = this,
-				event = "mousemove.jPlayer",
-				namespace = ".jPlayerAutohide",
-				eventType = event + namespace,
-				handler = function() {
-					self.css.jq.gui.fadeIn(self.options.autohide.fadeIn, function() {
-						clearTimeout(self.internal.autohideId);
-						self.internal.autohideId = setTimeout( function() {
-							self.css.jq.gui.fadeOut(self.options.autohide.fadeOut);
-						}, self.options.autohide.hold);
-					});
-				};
-
-			if(this.css.jq.gui.length) {
-
-				// End animations first so that its callback is executed now.
-				// Otherwise an in progress fadeIn animation still has the callback to fadeOut again.
-				this.css.jq.gui.stop(true, true);
-
-				// Removes the fadeOut operation from the fadeIn callback.
-				clearTimeout(this.internal.autohideId);
-
-				this.element.unbind(namespace);
-				this.css.jq.gui.unbind(namespace);
-
-				if(!this.status.nativeVideoControls) {
-					if(this.options.fullScreen && this.options.autohide.full || !this.options.fullScreen && this.options.autohide.restored) {
-						this.element.bind(eventType, handler);
-						this.css.jq.gui.bind(eventType, handler);
-						this.css.jq.gui.hide();
-					} else {
-						this.css.jq.gui.show();
-					}
-				} else {
-					this.css.jq.gui.hide();
-				}
-			}
-		},
-		fullScreen: function() {
-			this._setOption("fullScreen", true);
-		},
-		restoreScreen: function() {
-			this._setOption("fullScreen", false);
-		},
-		_html_initMedia: function() {
-			this.htmlElement.media.src = this.status.src;
-
-			if(this.options.preload !== 'none') {
-				this._html_load(); // See function for comments
-			}
-			this._trigger($.jPlayer.event.timeupdate); // The flash generates this event for its solution.
-		},
-		_html_setAudio: function(media) {
-			var self = this;
-			// Always finds a format due to checks in setMedia()
-			$.each(this.formats, function(priority, format) {
-				if(self.html.support[format] && media[format]) {
-					self.status.src = media[format];
-					self.status.format[format] = true;
-					self.status.formatType = format;
-					return false;
-				}
-			});
-			this.htmlElement.media = this.htmlElement.audio;
-			this._html_initMedia();
-		},
-		_html_setVideo: function(media) {
-			var self = this;
-			// Always finds a format due to checks in setMedia()
-			$.each(this.formats, function(priority, format) {
-				if(self.html.support[format] && media[format]) {
-					self.status.src = media[format];
-					self.status.format[format] = true;
-					self.status.formatType = format;
-					return false;
-				}
-			});
-			if(this.status.nativeVideoControls) {
-				this.htmlElement.video.poster = this._validString(media.poster) ? media.poster : "";
-			}
-			this.htmlElement.media = this.htmlElement.video;
-			this._html_initMedia();
-		},
-		_html_resetMedia: function() {
-			if(this.htmlElement.media) {
-				if(this.htmlElement.media.id === this.internal.video.id && !this.status.nativeVideoControls) {
-					this.internal.video.jq.css({'width':'0px', 'height':'0px'});
-				}
-				this.htmlElement.media.pause();
-			}
-		},
-		_html_clearMedia: function() {
-			if(this.htmlElement.media) {
-				this.htmlElement.media.src = "";
-				this.htmlElement.media.load(); // Stops an old, "in progress" download from continuing the download. Triggers the loadstart, error and emptied events, due to the empty src. Also an abort event if a download was in progress.
-			}
-		},
-		_html_load: function() {
-			// This function remains to allow the early HTML5 browsers to work, such as Firefox 3.6
-			// A change in the W3C spec for the media.load() command means that this is no longer necessary.
-			// This command should be removed and actually causes minor undesirable effects on some browsers. Such as loading the whole file and not only the metadata.
-			if(this.status.waitForLoad) {
-				this.status.waitForLoad = false;
-				this.htmlElement.media.load();
-			}
-			clearTimeout(this.internal.htmlDlyCmdId);
-		},
-		_html_play: function(time) {
-			var self = this;
-			this._html_load(); // Loads if required and clears any delayed commands.
-
-			this.htmlElement.media.play(); // Before currentTime attempt otherwise Firefox 4 Beta never loads.
-
-			if(!isNaN(time)) {
-				try {
-					this.htmlElement.media.currentTime = time;
-				} catch(err) {
-					this.internal.htmlDlyCmdId = setTimeout(function() {
-						self.play(time);
-					}, 100);
-					return; // Cancel execution and wait for the delayed command.
-				}
-			}
-			this._html_checkWaitForPlay();
-		},
-		_html_pause: function(time) {
-			var self = this;
-			
-			if(time > 0) { // We do not want the stop() command, which does pause(0), causing a load operation.
-				this._html_load(); // Loads if required and clears any delayed commands.
-			} else {
-				clearTimeout(this.internal.htmlDlyCmdId);
-			}
-
-			// Order of these commands is important for Safari (Win) and IE9. Pause then change currentTime.
-			this.htmlElement.media.pause();
-
-			if(!isNaN(time)) {
-				try {
-					this.htmlElement.media.currentTime = time;
-				} catch(err) {
-					this.internal.htmlDlyCmdId = setTimeout(function() {
-						self.pause(time);
-					}, 100);
-					return; // Cancel execution and wait for the delayed command.
-				}
-			}
-			if(time > 0) { // Avoids a setMedia() followed by stop() or pause(0) hiding the video play button.
-				this._html_checkWaitForPlay();
-			}
-		},
-		_html_playHead: function(percent) {
-			var self = this;
-			this._html_load(); // Loads if required and clears any delayed commands.
-			try {
-				if((typeof this.htmlElement.media.seekable === "object") && (this.htmlElement.media.seekable.length > 0)) {
-					this.htmlElement.media.currentTime = percent * this.htmlElement.media.seekable.end(this.htmlElement.media.seekable.length-1) / 100;
-				} else if(this.htmlElement.media.duration > 0 && !isNaN(this.htmlElement.media.duration)) {
-					this.htmlElement.media.currentTime = percent * this.htmlElement.media.duration / 100;
-				} else {
-					throw "e";
-				}
-			} catch(err) {
-				this.internal.htmlDlyCmdId = setTimeout(function() {
-					self.playHead(percent);
-				}, 100);
-				return; // Cancel execution and wait for the delayed command.
-			}
-			if(!this.status.waitForLoad) {
-				this._html_checkWaitForPlay();
-			}
-		},
-		_html_checkWaitForPlay: function() {
-			if(this.status.waitForPlay) {
-				this.status.waitForPlay = false;
-				if(this.css.jq.videoPlay.length) {
-					this.css.jq.videoPlay.hide();
-				}
-				if(this.status.video) {
-					this.internal.poster.jq.hide();
-					this.internal.video.jq.css({'width': this.status.width, 'height': this.status.height});
-				}
-			}
-		},
-		_html_volume: function(v) {
-			if(this.html.audio.available) {
-				this.htmlElement.audio.volume = v;
-			}
-			if(this.html.video.available) {
-				this.htmlElement.video.volume = v;
-			}
-		},
-		_html_mute: function(m) {
-			if(this.html.audio.available) {
-				this.htmlElement.audio.muted = m;
-			}
-			if(this.html.video.available) {
-				this.htmlElement.video.muted = m;
-			}
-		},
-		_flash_setAudio: function(media) {
-			var self = this;
-			try {
-				// Always finds a format due to checks in setMedia()
-				$.each(this.formats, function(priority, format) {
-					if(self.flash.support[format] && media[format]) {
-						switch (format) {
-							case "m4a" :
-							case "fla" :
-								self._getMovie().fl_setAudio_m4a(media[format]);
-								break;
-							case "mp3" :
-								self._getMovie().fl_setAudio_mp3(media[format]);
-								break;
-						}
-						self.status.src = media[format];
-						self.status.format[format] = true;
-						self.status.formatType = format;
-						return false;
-					}
-				});
-
-				if(this.options.preload === 'auto') {
-					this._flash_load();
-					this.status.waitForLoad = false;
-				}
-			} catch(err) { this._flashError(err); }
-		},
-		_flash_setVideo: function(media) {
-			var self = this;
-			try {
-				// Always finds a format due to checks in setMedia()
-				$.each(this.formats, function(priority, format) {
-					if(self.flash.support[format] && media[format]) {
-						switch (format) {
-							case "m4v" :
-							case "flv" :
-								self._getMovie().fl_setVideo_m4v(media[format]);
-								break;
-						}
-						self.status.src = media[format];
-						self.status.format[format] = true;
-						self.status.formatType = format;
-						return false;
-					}
-				});
-
-				if(this.options.preload === 'auto') {
-					this._flash_load();
-					this.status.waitForLoad = false;
-				}
-			} catch(err) { this._flashError(err); }
-		},
-		_flash_resetMedia: function() {
-			this.internal.flash.jq.css({'width':'0px', 'height':'0px'}); // Must do via CSS as setting attr() to zero causes a jQuery error in IE.
-			this._flash_pause(NaN);
-		},
-		_flash_clearMedia: function() {
-			try {
-				this._getMovie().fl_clearMedia();
-			} catch(err) { this._flashError(err); }
-		},
-		_flash_load: function() {
-			try {
-				this._getMovie().fl_load();
-			} catch(err) { this._flashError(err); }
-			this.status.waitForLoad = false;
-		},
-		_flash_play: function(time) {
-			try {
-				this._getMovie().fl_play(time);
-			} catch(err) { this._flashError(err); }
-			this.status.waitForLoad = false;
-			this._flash_checkWaitForPlay();
-		},
-		_flash_pause: function(time) {
-			try {
-				this._getMovie().fl_pause(time);
-			} catch(err) { this._flashError(err); }
-			if(time > 0) { // Avoids a setMedia() followed by stop() or pause(0) hiding the video play button.
-				this.status.waitForLoad = false;
-				this._flash_checkWaitForPlay();
-			}
-		},
-		_flash_playHead: function(p) {
-			try {
-				this._getMovie().fl_play_head(p);
-			} catch(err) { this._flashError(err); }
-			if(!this.status.waitForLoad) {
-				this._flash_checkWaitForPlay();
-			}
-		},
-		_flash_checkWaitForPlay: function() {
-			if(this.status.waitForPlay) {
-				this.status.waitForPlay = false;
-				if(this.css.jq.videoPlay.length) {
-					this.css.jq.videoPlay.hide();
-				}
-				if(this.status.video) {
-					this.internal.poster.jq.hide();
-					this.internal.flash.jq.css({'width': this.status.width, 'height': this.status.height});
-				}
-			}
-		},
-		_flash_volume: function(v) {
-			try {
-				this._getMovie().fl_volume(v);
-			} catch(err) { this._flashError(err); }
-		},
-		_flash_mute: function(m) {
-			try {
-				this._getMovie().fl_mute(m);
-			} catch(err) { this._flashError(err); }
-		},
-		_getMovie: function() {
-			return document[this.internal.flash.id];
-		},
-		_checkForFlash: function (version) {
-			// Function checkForFlash adapted from FlashReplace by Robert Nyman
-			// http://code.google.com/p/flashreplace/
-			var flashIsInstalled = false;
-			var flash;
-			if(window.ActiveXObject){
-				try{
-					flash = new ActiveXObject(("ShockwaveFlash.ShockwaveFlash." + version));
-					flashIsInstalled = true;
-				}
-				catch(e){
-					// Throws an error if the version isn't available			
-				}
-			}
-			else if(navigator.plugins && navigator.mimeTypes.length > 0){
-				flash = navigator.plugins["Shockwave Flash"];
-				if(flash){
-					var flashVersion = navigator.plugins["Shockwave Flash"].description.replace(/.*\s(\d+\.\d+).*/, "$1");
-					if(flashVersion >= version){
-						flashIsInstalled = true;
-					}
-				}
-			}
-			return flashIsInstalled;
-		},
-		_validString: function(url) {
-			return (url && typeof url === "string"); // Empty strings return false
-		},
-		_limitValue: function(value, min, max) {
-			return (value < min) ? min : ((value > max) ? max : value);
-		},
-		_urlNotSetError: function(context) {
-			this._error( {
-				type: $.jPlayer.error.URL_NOT_SET,
-				context: context,
-				message: $.jPlayer.errorMsg.URL_NOT_SET,
-				hint: $.jPlayer.errorHint.URL_NOT_SET
-			});
-		},
-		_flashError: function(error) {
-			var errorType;
-			if(!this.internal.ready) {
-				errorType = "FLASH";
-			} else {
-				errorType = "FLASH_DISABLED";
-			}
-			this._error( {
-				type: $.jPlayer.error[errorType],
-				context: this.internal.flash.swf,
-				message: $.jPlayer.errorMsg[errorType] + error.message,
-				hint: $.jPlayer.errorHint[errorType]
-			});
-			// Allow the audio player to recover if display:none and then shown again, or with position:fixed on Firefox.
-			// This really only affects audio in a media player, as an audio player could easily move the jPlayer element away from such issues.
-			this.internal.flash.jq.css({'width':'1px', 'height':'1px'});
-		},
-		_error: function(error) {
-			this._trigger($.jPlayer.event.error, error);
-			if(this.options.errorAlerts) {
-				this._alert("Error!" + (error.message ? "\n\n" + error.message : "") + (error.hint ? "\n\n" + error.hint : "") + "\n\nContext: " + error.context);
-			}
-		},
-		_warning: function(warning) {
-			this._trigger($.jPlayer.event.warning, undefined, warning);
-			if(this.options.warningAlerts) {
-				this._alert("Warning!" + (warning.message ? "\n\n" + warning.message : "") + (warning.hint ? "\n\n" + warning.hint : "") + "\n\nContext: " + warning.context);
-			}
-		},
-		_alert: function(message) {
-			alert("jPlayer " + this.version.script + " : id='" + this.internal.self.id +"' : " + message);
-		},
-		_emulateHtmlBridge: function() {
-			var self = this,
-			methods = $.jPlayer.emulateMethods;
-
-			// Emulate methods on jPlayer's DOM element.
-			$.each( $.jPlayer.emulateMethods.split(/\s+/g), function(i, name) {
-				self.internal.domNode[name] = function(arg) {
-					self[name](arg);
-				};
-
-			});
-
-			// Bubble jPlayer events to its DOM element.
-			$.each($.jPlayer.event, function(eventName,eventType) {
-				var nativeEvent = true;
-				$.each( $.jPlayer.reservedEvent.split(/\s+/g), function(i, name) {
-					if(name === eventName) {
-						nativeEvent = false;
-						return false;
-					}
-				});
-				if(nativeEvent) {
-					self.element.bind(eventType + ".jPlayer.jPlayerHtml", function() { // With .jPlayer & .jPlayerHtml namespaces.
-						self._emulateHtmlUpdate();
-						var domEvent = document.createEvent("Event");
-						domEvent.initEvent(eventName, false, true);
-						self.internal.domNode.dispatchEvent(domEvent);
-					});
-				}
-				// The error event would require a special case
-			});
-
-			// IE9 has a readyState property on all elements. The document should have it, but all (except media) elements inherit it in IE9. This conflicts with Popcorn, which polls the readyState.
-		},
-		_emulateHtmlUpdate: function() {
-			var self = this;
-
-			$.each( $.jPlayer.emulateStatus.split(/\s+/g), function(i, name) {
-				self.internal.domNode[name] = self.status[name];
-			});
-			$.each( $.jPlayer.emulateOptions.split(/\s+/g), function(i, name) {
-				self.internal.domNode[name] = self.options[name];
-			});
-		},
-		_destroyHtmlBridge: function() {
-			var self = this;
-
-			// Bridge event handlers are also removed by destroy() through .jPlayer namespace.
-			this.element.unbind(".jPlayerHtml"); // Remove all event handlers created by the jPlayer bridge. So you can change the emulateHtml option.
-
-			// Remove the methods and properties
-			var emulated = $.jPlayer.emulateMethods + " " + $.jPlayer.emulateStatus + " " + $.jPlayer.emulateOptions;
-			$.each( emulated.split(/\s+/g), function(i, name) {
-				delete self.internal.domNode[name];
-			});
-		}
-	};
-
-	$.jPlayer.error = {
-		FLASH: "e_flash",
-		FLASH_DISABLED: "e_flash_disabled",
-		NO_SOLUTION: "e_no_solution",
-		NO_SUPPORT: "e_no_support",
-		URL: "e_url",
-		URL_NOT_SET: "e_url_not_set",
-		VERSION: "e_version"
-	};
-
-	$.jPlayer.errorMsg = {
-		FLASH: "jPlayer's Flash fallback is not configured correctly, or a command was issued before the jPlayer Ready event. Details: ", // Used in: _flashError()
-		FLASH_DISABLED: "jPlayer's Flash fallback has been disabled by the browser due to the CSS rules you have used. Details: ", // Used in: _flashError()
-		NO_SOLUTION: "No solution can be found by jPlayer in this browser. Neither HTML nor Flash can be used.", // Used in: _init()
-		NO_SUPPORT: "It is not possible to play any media format provided in setMedia() on this browser using your current options.", // Used in: setMedia()
-		URL: "Media URL could not be loaded.", // Used in: jPlayerFlashEvent() and _addHtmlEventListeners()
-		URL_NOT_SET: "Attempt to issue media playback commands, while no media url is set.", // Used in: load(), play(), pause(), stop() and playHead()
-		VERSION: "jPlayer " + $.jPlayer.prototype.version.script + " needs Jplayer.swf version " + $.jPlayer.prototype.version.needFlash + " but found " // Used in: jPlayerReady()
-	};
-
-	$.jPlayer.errorHint = {
-		FLASH: "Check your swfPath option and that Jplayer.swf is there.",
-		FLASH_DISABLED: "Check that you have not display:none; the jPlayer entity or any ancestor.",
-		NO_SOLUTION: "Review the jPlayer options: support and supplied.",
-		NO_SUPPORT: "Video or audio formats defined in the supplied option are missing.",
-		URL: "Check media URL is valid.",
-		URL_NOT_SET: "Use setMedia() to set the media URL.",
-		VERSION: "Update jPlayer files."
-	};
-
-	$.jPlayer.warning = {
-		CSS_SELECTOR_COUNT: "e_css_selector_count",
-		CSS_SELECTOR_METHOD: "e_css_selector_method",
-		CSS_SELECTOR_STRING: "e_css_selector_string",
-		OPTION_KEY: "e_option_key"
-	};
-
-	$.jPlayer.warningMsg = {
-		CSS_SELECTOR_COUNT: "The number of css selectors found did not equal one: ",
-		CSS_SELECTOR_METHOD: "The methodName given in jPlayer('cssSelector') is not a valid jPlayer method.",
-		CSS_SELECTOR_STRING: "The methodCssSelector given in jPlayer('cssSelector') is not a String or is empty.",
-		OPTION_KEY: "The option requested in jPlayer('option') is undefined."
-	};
-
-	$.jPlayer.warningHint = {
-		CSS_SELECTOR_COUNT: "Check your css selector and the ancestor.",
-		CSS_SELECTOR_METHOD: "Check your method name.",
-		CSS_SELECTOR_STRING: "Check your css selector is a string.",
-		OPTION_KEY: "Check your option name."
-	};
-})(jQuery);
diff --git a/apps/media/js/jquery.jplayer.min.js b/apps/media/js/jquery.jplayer.min.js
deleted file mode 100644
index 9ba8b0c45c..0000000000
--- a/apps/media/js/jquery.jplayer.min.js
+++ /dev/null
@@ -1,2 +0,0 @@
-
-(function($,undefined){$.fn.jPlayer=function(options){var name="jPlayer",isMethodCall=typeof options==="string",args=Array.prototype.slice.call(arguments,1),returnValue=this;options=!isMethodCall&&args.length?$.extend.apply(null,[true,options].concat(args)):options;if(isMethodCall&&options.charAt(0)==="_")return returnValue;if(isMethodCall){this.each(function(){var instance=$.data(this,name),methodValue=instance&&$.isFunction(instance[options])?instance[options].apply(instance,args):instance;if(methodValue!==instance&&methodValue!==undefined){returnValue=methodValue;return false}})}else this.each(function(){var instance=$.data(this,name);if(instance){instance.option(options||{})}else $.data(this,name,new $.jPlayer(options,this))});return returnValue};$.jPlayer=function(options,element){if(arguments.length){this.element=$(element);this.options=$.extend(true,{},this.options,options);var self=this;this.element.bind("remove.jPlayer",function(){self.destroy()});this._init()}};$.jPlayer.emulateMethods="load play pause";$.jPlayer.emulateStatus="src readyState networkState currentTime duration paused ended playbackRate";$.jPlayer.emulateOptions="muted volume";$.jPlayer.reservedEvent="ready flashreset resize repeat error warning";$.jPlayer.event={ready:"jPlayer_ready",flashreset:"jPlayer_flashreset",resize:"jPlayer_resize",repeat:"jPlayer_repeat",error:"jPlayer_error",warning:"jPlayer_warning",loadstart:"jPlayer_loadstart",progress:"jPlayer_progress",suspend:"jPlayer_suspend",abort:"jPlayer_abort",emptied:"jPlayer_emptied",stalled:"jPlayer_stalled",play:"jPlayer_play",pause:"jPlayer_pause",loadedmetadata:"jPlayer_loadedmetadata",loadeddata:"jPlayer_loadeddata",waiting:"jPlayer_waiting",playing:"jPlayer_playing",canplay:"jPlayer_canplay",canplaythrough:"jPlayer_canplaythrough",seeking:"jPlayer_seeking",seeked:"jPlayer_seeked",timeupdate:"jPlayer_timeupdate",ended:"jPlayer_ended",ratechange:"jPlayer_ratechange",durationchange:"jPlayer_durationchange",volumechange:"jPlayer_volumechange"};$.jPlayer.htmlEvent=["loadstart","abort","emptied","stalled","loadedmetadata","loadeddata","canplay","canplaythrough","ratechange"];$.jPlayer.pause=function(){$.each($.jPlayer.prototype.instances,function(i,element){if(element.data("jPlayer").status.srcSet)element.jPlayer("pause")})};$.jPlayer.timeFormat={showHour:false,showMin:true,showSec:true,padHour:false,padMin:true,padSec:true,sepHour:":",sepMin:":",sepSec:""};$.jPlayer.convertTime=function(s){var myTime=new Date(s*1e3),hour=myTime.getUTCHours(),min=myTime.getUTCMinutes(),sec=myTime.getUTCSeconds(),strHour=($.jPlayer.timeFormat.padHour&&hour<10)?"0"+hour:hour,strMin=($.jPlayer.timeFormat.padMin&&min<10)?"0"+min:min,strSec=($.jPlayer.timeFormat.padSec&&sec<10)?"0"+sec:sec;return(($.jPlayer.timeFormat.showHour)?strHour+$.jPlayer.timeFormat.sepHour:"")+(($.jPlayer.timeFormat.showMin)?strMin+$.jPlayer.timeFormat.sepMin:"")+(($.jPlayer.timeFormat.showSec)?strSec+$.jPlayer.timeFormat.sepSec:"")};$.jPlayer.uaBrowser=function(userAgent){var ua=userAgent.toLowerCase(),rwebkit=/(webkit)[ \/]([\w.]+)/,ropera=/(opera)(?:.*version)?[ \/]([\w.]+)/,rmsie=/(msie) ([\w.]+)/,rmozilla=/(mozilla)(?:.*? rv:([\w.]+))?/,match=rwebkit.exec(ua)||ropera.exec(ua)||rmsie.exec(ua)||ua.indexOf("compatible")<0&&rmozilla.exec(ua)||[];return{browser:match[1]||"",version:match[2]||"0"}};$.jPlayer.uaPlatform=function(userAgent){var ua=userAgent.toLowerCase(),rplatform=/(ipad|iphone|ipod|android|blackberry|playbook|windows ce|webos)/,rtablet=/(ipad|playbook)/,randroid=/(android)/,rmobile=/(mobile)/,platform=rplatform.exec(ua)||[],tablet=rtablet.exec(ua)||!rmobile.exec(ua)&&randroid.exec(ua)||[];return{platform:platform[1]||"",tablet:tablet[1]||""}};$.jPlayer.browser={};$.jPlayer.platform={};var browserMatch=$.jPlayer.uaBrowser(navigator.userAgent);if(browserMatch.browser){$.jPlayer.browser[browserMatch.browser]=true;$.jPlayer.browser.version=browserMatch.version};var platformMatch=$.jPlayer.uaPlatform(navigator.userAgent);if(platformMatch.platform){$.jPlayer.platform[platformMatch.platform]=true;$.jPlayer.platform.mobile=!platformMatch.tablet;$.jPlayer.platform.tablet=!!platformMatch.tablet};$.jPlayer.prototype={count:0,version:{script:"2.0.23",needFlash:"2.0.9",flash:"unknown"},options:{swfPath:"js",solution:"html, flash",supplied:"mp3",preload:'metadata',volume:0.8,muted:false,wmode:"opaque",backgroundColor:"#000000",cssSelectorAncestor:"#jp_container_1",cssSelector:{videoPlay:".jp-video-play",play:".jp-play",pause:".jp-pause",stop:".jp-stop",seekBar:".jp-seek-bar",playBar:".jp-play-bar",mute:".jp-mute",unmute:".jp-unmute",volumeBar:".jp-volume-bar",volumeBarValue:".jp-volume-bar-value",volumeMax:".jp-volume-max",currentTime:".jp-current-time",duration:".jp-duration",fullScreen:".jp-full-screen",restoreScreen:".jp-restore-screen",repeat:".jp-repeat",repeatOff:".jp-repeat-off",gui:".jp-gui"},fullScreen:false,autohide:{restored:false,full:true,fadeIn:200,fadeOut:600,hold:1e3},loop:false,repeat:function(event){if(event.jPlayer.options.loop){$(this).unbind(".jPlayerRepeat").bind($.jPlayer.event.ended+".jPlayer.jPlayerRepeat",function(){$(this).jPlayer("play")})}else $(this).unbind(".jPlayerRepeat")},idPrefix:"jp",noConflict:"jQuery",emulateHtml:false,errorAlerts:false,warningAlerts:false},optionsAudio:{size:{width:"0px",height:"0px",cssClass:""},sizeFull:{width:"0px",height:"0px",cssClass:""}},optionsVideo:{size:{width:"480px",height:"270px",cssClass:"jp-video-270p"},sizeFull:{width:"100%",height:"100%",cssClass:"jp-video-full"}},instances:{},status:{src:"",media:{},paused:true,format:{},formatType:"",waitForPlay:true,waitForLoad:true,srcSet:false,video:false,seekPercent:0,currentPercentRelative:0,currentPercentAbsolute:0,currentTime:0,duration:0,readyState:0,networkState:0,playbackRate:1,ended:0},internal:{ready:false},solution:{html:true,flash:true},format:{mp3:{codec:'audio/mpeg; codecs="mp3"',flashCanPlay:true,media:'audio'},m4a:{codec:'audio/mp4; codecs="mp4a.40.2"',flashCanPlay:true,media:'audio'},oga:{codec:'audio/ogg; codecs="vorbis"',flashCanPlay:false,media:'audio'},wav:{codec:'audio/wav; codecs="1"',flashCanPlay:false,media:'audio'},webma:{codec:'audio/webm; codecs="vorbis"',flashCanPlay:false,media:'audio'},fla:{codec:'audio/x-flv',flashCanPlay:true,media:'audio'},m4v:{codec:'video/mp4; codecs="avc1.42E01E, mp4a.40.2"',flashCanPlay:true,media:'video'},ogv:{codec:'video/ogg; codecs="theora, vorbis"',flashCanPlay:false,media:'video'},webmv:{codec:'video/webm; codecs="vorbis, vp8"',flashCanPlay:false,media:'video'},flv:{codec:'video/x-flv',flashCanPlay:true,media:'video'}},_init:function(){var self=this;this.element.empty();this.status=$.extend({},this.status);this.internal=$.extend({},this.internal);this.internal.domNode=this.element.get(0);this.formats=[];this.solutions=[];this.require={};this.htmlElement={};this.html={};this.html.audio={};this.html.video={};this.flash={};this.css={};this.css.cs={};this.css.jq={};this.ancestorJq=[];this.options.volume=this._limitValue(this.options.volume,0,1);$.each(this.options.supplied.toLowerCase().split(","),function(index1,value1){var format=value1.replace(/^\s+|\s+$/g,"");if(self.format[format]){var dupFound=false;$.each(self.formats,function(index2,value2){if(format===value2){dupFound=true;return false}});if(!dupFound)self.formats.push(format)}});$.each(this.options.solution.toLowerCase().split(","),function(index1,value1){var solution=value1.replace(/^\s+|\s+$/g,"");if(self.solution[solution]){var dupFound=false;$.each(self.solutions,function(index2,value2){if(solution===value2){dupFound=true;return false}});if(!dupFound)self.solutions.push(solution)}});this.internal.instance="jp_"+this.count;this.instances[this.internal.instance]=this.element;if(!this.element.attr("id"))this.element.attr("id",this.options.idPrefix+"_jplayer_"+this.count);this.internal.self=$.extend({},{id:this.element.attr("id"),jq:this.element});this.internal.audio=$.extend({},{id:this.options.idPrefix+"_audio_"+this.count,jq:undefined});this.internal.video=$.extend({},{id:this.options.idPrefix+"_video_"+this.count,jq:undefined});this.internal.flash=$.extend({},{id:this.options.idPrefix+"_flash_"+this.count,jq:undefined,swf:this.options.swfPath+((this.options.swfPath!==""&&this.options.swfPath.slice(-1)!=="/")?"/":"")+"Jplayer.swf"});this.internal.poster=$.extend({},{id:this.options.idPrefix+"_poster_"+this.count,jq:undefined});$.each($.jPlayer.event,function(eventName,eventType){if(self.options[eventName]!==undefined){self.element.bind(eventType+".jPlayer",self.options[eventName]);self.options[eventName]=undefined}});this.require.audio=false;this.require.video=false;$.each(this.formats,function(priority,format){self.require[self.format[format].media]=true});if(this.require.video){this.options=$.extend(true,{},this.optionsVideo,this.options)}else this.options=$.extend(true,{},this.optionsAudio,this.options);this._setSize();this.htmlElement.poster=document.createElement('img');this.htmlElement.poster.id=this.internal.poster.id;this.htmlElement.poster.onload=function(){if(!self.status.video||self.status.waitForPlay)self.internal.poster.jq.show()};this.element.append(this.htmlElement.poster);this.internal.poster.jq=$("#"+this.internal.poster.id);this.internal.poster.jq.css({width:this.status.width,height:this.status.height});this.internal.poster.jq.hide();this.html.audio.available=false;if(this.require.audio){this.htmlElement.audio=document.createElement('audio');this.htmlElement.audio.id=this.internal.audio.id;this.html.audio.available=!!this.htmlElement.audio.canPlayType};this.html.video.available=false;if(this.require.video){this.htmlElement.video=document.createElement('video');this.htmlElement.video.id=this.internal.video.id;this.html.video.available=!!this.htmlElement.video.canPlayType};this.flash.available=this._checkForFlash(10);this.html.canPlay={};this.flash.canPlay={};$.each(this.formats,function(priority,format){self.html.canPlay[format]=self.html[self.format[format].media].available&&""!==self.htmlElement[self.format[format].media].canPlayType(self.format[format].codec);self.flash.canPlay[format]=self.format[format].flashCanPlay&&self.flash.available});this.html.desired=false;this.flash.desired=false;$.each(this.solutions,function(solutionPriority,solution){if(solutionPriority===0){self[solution].desired=true}else{var audioCanPlay=false,videoCanPlay=false;$.each(self.formats,function(formatPriority,format){if(self[self.solutions[0]].canPlay[format])if(self.format[format].media==='video'){videoCanPlay=true}else audioCanPlay=true});self[solution].desired=(self.require.audio&&!audioCanPlay)||(self.require.video&&!videoCanPlay)}});this.html.support={};this.flash.support={};$.each(this.formats,function(priority,format){self.html.support[format]=self.html.canPlay[format]&&self.html.desired;self.flash.support[format]=self.flash.canPlay[format]&&self.flash.desired});this.html.used=false;this.flash.used=false;$.each(this.solutions,function(solutionPriority,solution){$.each(self.formats,function(formatPriority,format){if(self[solution].support[format]){self[solution].used=true;return false}})});this.html.active=false;this.html.audio.gate=false;this.html.video.gate=false;this.flash.active=false;this.flash.gate=false;this._cssSelectorAncestor(this.options.cssSelectorAncestor);if(!(this.html.used||this.flash.used))this._error({type:$.jPlayer.error.NO_SOLUTION,context:"{solution:'"+this.options.solution+"', supplied:'"+this.options.supplied+"'}",message:$.jPlayer.errorMsg.NO_SOLUTION,hint:$.jPlayer.errorHint.NO_SOLUTION});if(this.flash.used){var htmlObj,flashVars='jQuery='+encodeURI(this.options.noConflict)+'&id='+encodeURI(this.internal.self.id)+'&vol='+this.options.volume+'&muted='+this.options.muted;if($.browser.msie&&Number($.browser.version)<=8){var objStr='<object id="'+this.internal.flash.id+'" classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" width="0" height="0"></object>',paramStr=['<param name="movie" value="'+this.internal.flash.swf+'" />','<param name="FlashVars" value="'+flashVars+'" />','<param name="allowScriptAccess" value="always" />','<param name="bgcolor" value="'+this.options.backgroundColor+'" />','<param name="wmode" value="'+this.options.wmode+'" />'];htmlObj=document.createElement(objStr);for(var i=0;i<paramStr.length;i++)htmlObj.appendChild(document.createElement(paramStr[i]))}else{var createParam=function(el,n,v){var p=document.createElement("param");p.setAttribute("name",n);p.setAttribute("value",v);el.appendChild(p)};htmlObj=document.createElement("object");htmlObj.setAttribute("id",this.internal.flash.id);htmlObj.setAttribute("data",this.internal.flash.swf);htmlObj.setAttribute("type","application/x-shockwave-flash");htmlObj.setAttribute("width","1");htmlObj.setAttribute("height","1");createParam(htmlObj,"flashvars",flashVars);createParam(htmlObj,"allowscriptaccess","always");createParam(htmlObj,"bgcolor",this.options.backgroundColor);createParam(htmlObj,"wmode",this.options.wmode)};this.element.append(htmlObj);this.internal.flash.jq=$(htmlObj)};if(this.html.used){if(this.html.audio.available){this._addHtmlEventListeners(this.htmlElement.audio,this.html.audio);this.element.append(this.htmlElement.audio);this.internal.audio.jq=$("#"+this.internal.audio.id)};if(this.html.video.available){this._addHtmlEventListeners(this.htmlElement.video,this.html.video);this.element.append(this.htmlElement.video);this.internal.video.jq=$("#"+this.internal.video.id);this.internal.video.jq.css({width:'0px',height:'0px'})}};if(this.options.emulateHtml)this._emulateHtmlBridge();if(this.html.used&&!this.flash.used)setTimeout(function(){self.internal.ready=true;self.version.flash="n/a";self._trigger($.jPlayer.event.repeat);self._trigger($.jPlayer.event.ready)},100);this._updateInterface();this._updateButtons(false);this._updateAutohide();this._updateVolume(this.options.volume);this._updateMute(this.options.muted);if(this.css.jq.videoPlay.length)this.css.jq.videoPlay.hide();$.jPlayer.prototype.count++},destroy:function(){this._resetStatus();this._updateInterface();this._seeked();if(this.css.jq.currentTime.length)this.css.jq.currentTime.text("");if(this.css.jq.duration.length)this.css.jq.duration.text("");if(this.status.srcSet)this.pause();$.each(this.css.jq,function(fn,jq){if(jq.length)jq.unbind(".jPlayer")});if(this.options.emulateHtml)this._destroyHtmlBridge();this.element.removeData("jPlayer");this.element.unbind(".jPlayer");this.element.empty();delete this.instances[this.internal.instance]},enable:function(){},disable:function(){},_addHtmlEventListeners:function(mediaElement,entity){var self=this;mediaElement.preload=this.options.preload;mediaElement.muted=this.options.muted;mediaElement.volume=this.options.volume;mediaElement.addEventListener("progress",function(){if(entity.gate&&!self.status.waitForLoad){self._getHtmlStatus(mediaElement);self._updateInterface();self._trigger($.jPlayer.event.progress)}},false);mediaElement.addEventListener("timeupdate",function(){if(entity.gate&&!self.status.waitForLoad){self._getHtmlStatus(mediaElement);self._updateInterface();self._trigger($.jPlayer.event.timeupdate)}},false);mediaElement.addEventListener("durationchange",function(){if(entity.gate&&!self.status.waitForLoad){self.status.duration=this.duration;self._getHtmlStatus(mediaElement);self._updateInterface();self._trigger($.jPlayer.event.durationchange)}},false);mediaElement.addEventListener("play",function(){if(entity.gate&&!self.status.waitForLoad){self._updateButtons(true);self._trigger($.jPlayer.event.play)}},false);mediaElement.addEventListener("playing",function(){if(entity.gate&&!self.status.waitForLoad){self._updateButtons(true);self._seeked();self._trigger($.jPlayer.event.playing)}},false);mediaElement.addEventListener("pause",function(){if(entity.gate&&!self.status.waitForLoad){self._updateButtons(false);self._trigger($.jPlayer.event.pause)}},false);mediaElement.addEventListener("waiting",function(){if(entity.gate&&!self.status.waitForLoad){self._seeking();self._trigger($.jPlayer.event.waiting)}},false);mediaElement.addEventListener("seeking",function(){if(entity.gate&&!self.status.waitForLoad){self._seeking();self._trigger($.jPlayer.event.seeking)}},false);mediaElement.addEventListener("seeked",function(){if(entity.gate&&!self.status.waitForLoad){self._seeked();self._trigger($.jPlayer.event.seeked)}},false);mediaElement.addEventListener("volumechange",function(){if(entity.gate&&!self.status.waitForLoad){self.options.volume=mediaElement.volume;self.options.muted=mediaElement.muted;self._updateMute();self._updateVolume();self._trigger($.jPlayer.event.volumechange)}},false);mediaElement.addEventListener("suspend",function(){if(entity.gate&&!self.status.waitForLoad){self._seeked();self._trigger($.jPlayer.event.suspend)}},false);mediaElement.addEventListener("ended",function(){if(entity.gate&&!self.status.waitForLoad){if(!$.jPlayer.browser.webkit)self.htmlElement.media.currentTime=0;self.htmlElement.media.pause();self._updateButtons(false);self._getHtmlStatus(mediaElement,true);self._updateInterface();self._trigger($.jPlayer.event.ended)}},false);mediaElement.addEventListener("error",function(){if(entity.gate&&!self.status.waitForLoad){self._updateButtons(false);self._seeked();if(self.status.srcSet){clearTimeout(self.internal.htmlDlyCmdId);self.status.waitForLoad=true;self.status.waitForPlay=true;if(self.status.video)self.internal.video.jq.css({width:'0px',height:'0px'});if(self._validString(self.status.media.poster))self.internal.poster.jq.show();if(self.css.jq.videoPlay.length)self.css.jq.videoPlay.show();self._error({type:$.jPlayer.error.URL,context:self.status.src,message:$.jPlayer.errorMsg.URL,hint:$.jPlayer.errorHint.URL})}}},false);$.each($.jPlayer.htmlEvent,function(i,eventType){mediaElement.addEventListener(this,function(){if(entity.gate&&!self.status.waitForLoad)self._trigger($.jPlayer.event[eventType])},false)})},_getHtmlStatus:function(media,override){var ct=0,d=0,cpa=0,sp=0,cpr=0;if(media.duration)this.status.duration=media.duration;ct=media.currentTime;cpa=(this.status.duration>0)?100*ct/this.status.duration:0;if((typeof media.seekable==="object")&&(media.seekable.length>0)){sp=(this.status.duration>0)?100*media.seekable.end(media.seekable.length-1)/this.status.duration:100;cpr=100*media.currentTime/media.seekable.end(media.seekable.length-1)}else{sp=100;cpr=cpa};if(override){ct=0;cpr=0;cpa=0};this.status.seekPercent=sp;this.status.currentPercentRelative=cpr;this.status.currentPercentAbsolute=cpa;this.status.currentTime=ct;this.status.readyState=media.readyState;this.status.networkState=media.networkState;this.status.playbackRate=media.playbackRate;this.status.ended=media.ended},_resetStatus:function(){this.status=$.extend({},this.status,$.jPlayer.prototype.status)},_trigger:function(eventType,error,warning){var event=$.Event(eventType);event.jPlayer={};event.jPlayer.version=$.extend({},this.version);event.jPlayer.options=$.extend(true,{},this.options);event.jPlayer.status=$.extend(true,{},this.status);event.jPlayer.html=$.extend(true,{},this.html);event.jPlayer.flash=$.extend(true,{},this.flash);if(error)event.jPlayer.error=$.extend({},error);if(warning)event.jPlayer.warning=$.extend({},warning);this.element.trigger(event)},jPlayerFlashEvent:function(eventType,status){if(eventType===$.jPlayer.event.ready)if(!this.internal.ready){this.internal.ready=true;this.internal.flash.jq.css({width:'0px',height:'0px'});this.version.flash=status.version;if(this.version.needFlash!==this.version.flash)this._error({type:$.jPlayer.error.VERSION,context:this.version.flash,message:$.jPlayer.errorMsg.VERSION+this.version.flash,hint:$.jPlayer.errorHint.VERSION});this._trigger($.jPlayer.event.repeat);this._trigger(eventType)}else if(this.flash.gate){if(this.status.srcSet){var currentTime=this.status.currentTime,paused=this.status.paused;this.setMedia(this.status.media);if(currentTime>0)if(paused){this.pause(currentTime)}else this.play(currentTime)};this._trigger($.jPlayer.event.flashreset)};if(this.flash.gate)switch(eventType){case $.jPlayer.event.progress:this._getFlashStatus(status);this._updateInterface();this._trigger(eventType);break;case $.jPlayer.event.timeupdate:this._getFlashStatus(status);this._updateInterface();this._trigger(eventType);break;case $.jPlayer.event.play:this._seeked();this._updateButtons(true);this._trigger(eventType);break;case $.jPlayer.event.pause:this._updateButtons(false);this._trigger(eventType);break;case $.jPlayer.event.ended:this._updateButtons(false);this._trigger(eventType);break;case $.jPlayer.event.error:this.status.waitForLoad=true;this.status.waitForPlay=true;if(this.status.video)this.internal.flash.jq.css({width:'0px',height:'0px'});if(this._validString(this.status.media.poster))this.internal.poster.jq.show();if(this.css.jq.videoPlay.length)this.css.jq.videoPlay.show();if(this.status.video){this._flash_setVideo(this.status.media)}else this._flash_setAudio(this.status.media);this._error({type:$.jPlayer.error.URL,context:status.src,message:$.jPlayer.errorMsg.URL,hint:$.jPlayer.errorHint.URL});break;case $.jPlayer.event.seeking:this._seeking();this._trigger(eventType);break;case $.jPlayer.event.seeked:this._seeked();this._trigger(eventType);break;case $.jPlayer.event.ready:break;default:this._trigger(eventType)};return false},_getFlashStatus:function(status){this.status.seekPercent=status.seekPercent;this.status.currentPercentRelative=status.currentPercentRelative;this.status.currentPercentAbsolute=status.currentPercentAbsolute;this.status.currentTime=status.currentTime;this.status.duration=status.duration;this.status.readyState=4;this.status.networkState=0;this.status.playbackRate=1;this.status.ended=false},_updateButtons:function(playing){if(playing!==undefined){this.status.paused=!playing;if(this.css.jq.play.length&&this.css.jq.pause.length)if(playing){this.css.jq.play.hide();this.css.jq.pause.show()}else{this.css.jq.play.show();this.css.jq.pause.hide()}};if(this.css.jq.restoreScreen.length&&this.css.jq.fullScreen.length)if(this.options.fullScreen){this.css.jq.fullScreen.hide();this.css.jq.restoreScreen.show()}else{this.css.jq.fullScreen.show();this.css.jq.restoreScreen.hide()};if(this.css.jq.repeat.length&&this.css.jq.repeatOff.length)if(this.options.loop){this.css.jq.repeat.hide();this.css.jq.repeatOff.show()}else{this.css.jq.repeat.show();this.css.jq.repeatOff.hide()}},_updateInterface:function(){if(this.css.jq.seekBar.length)this.css.jq.seekBar.width(this.status.seekPercent+"%");if(this.css.jq.playBar.length)this.css.jq.playBar.width(this.status.currentPercentRelative+"%");if(this.css.jq.currentTime.length)this.css.jq.currentTime.text($.jPlayer.convertTime(this.status.currentTime));if(this.css.jq.duration.length)this.css.jq.duration.text($.jPlayer.convertTime(this.status.duration))},_seeking:function(){if(this.css.jq.seekBar.length)this.css.jq.seekBar.addClass("jp-seeking-bg")},_seeked:function(){if(this.css.jq.seekBar.length)this.css.jq.seekBar.removeClass("jp-seeking-bg")},setMedia:function(media){var self=this;this._seeked();clearTimeout(this.internal.htmlDlyCmdId);var audioGate=this.html.audio.gate,videoGate=this.html.video.gate,supported=false;$.each(this.formats,function(formatPriority,format){var isVideo=self.format[format].media==='video';$.each(self.solutions,function(solutionPriority,solution){if(self[solution].support[format]&&self._validString(media[format])){var isHtml=solution==='html';if(isVideo){if(isHtml){self.html.audio.gate=false;self.html.video.gate=true;self.flash.gate=false}else{self.html.audio.gate=false;self.html.video.gate=false;self.flash.gate=true}}else if(isHtml){self.html.audio.gate=true;self.html.video.gate=false;self.flash.gate=false}else{self.html.audio.gate=false;self.html.video.gate=false;self.flash.gate=true};if(self.flash.active||(self.html.active&&self.flash.gate)||(audioGate===self.html.audio.gate&&videoGate===self.html.video.gate)){self.clearMedia()}else if(audioGate!==self.html.audio.gate&&videoGate!==self.html.video.gate){self._html_pause();if(self.status.video)self.internal.video.jq.css({width:'0px',height:'0px'});self._resetStatus()};if(isVideo){if(isHtml){self._html_setVideo(media);self.html.active=true;self.flash.active=false}else{self._flash_setVideo(media);self.html.active=false;self.flash.active=true};if(self.css.jq.videoPlay.length)self.css.jq.videoPlay.show();self.status.video=true}else{if(isHtml){self._html_setAudio(media);self.html.active=true;self.flash.active=false}else{self._flash_setAudio(media);self.html.active=false;self.flash.active=true};if(self.css.jq.videoPlay.length)self.css.jq.videoPlay.hide();self.status.video=false};supported=true;return false}});if(supported)return false});if(supported){if(this._validString(media.poster)){if(this.htmlElement.poster.src!==media.poster){this.htmlElement.poster.src=media.poster}else this.internal.poster.jq.show()}else this.internal.poster.jq.hide();this.status.srcSet=true;this.status.media=$.extend({},media);this._updateButtons(false);this._updateInterface()}else{if(this.status.srcSet&&!this.status.waitForPlay)this.pause();this.html.audio.gate=false;this.html.video.gate=false;this.flash.gate=false;this.html.active=false;this.flash.active=false;this._resetStatus();this._updateInterface();this._updateButtons(false);this.internal.poster.jq.hide();if(this.html.used&&this.require.video)this.internal.video.jq.css({width:'0px',height:'0px'});if(this.flash.used)this.internal.flash.jq.css({width:'0px',height:'0px'});this._error({type:$.jPlayer.error.NO_SUPPORT,context:"{supplied:'"+this.options.supplied+"'}",message:$.jPlayer.errorMsg.NO_SUPPORT,hint:$.jPlayer.errorHint.NO_SUPPORT})}},clearMedia:function(){this._resetStatus();this._updateButtons(false);this.internal.poster.jq.hide();clearTimeout(this.internal.htmlDlyCmdId);if(this.html.active){this._html_clearMedia()}else if(this.flash.active)this._flash_clearMedia()},load:function(){if(this.status.srcSet){if(this.html.active){this._html_load()}else if(this.flash.active)this._flash_load()}else this._urlNotSetError("load")},play:function(time){time=(typeof time==="number")?time:NaN;if(this.status.srcSet){if(this.html.active){this._html_play(time)}else if(this.flash.active)this._flash_play(time)}else this._urlNotSetError("play")},videoPlay:function(e){this.play()},pause:function(time){time=(typeof time==="number")?time:NaN;if(this.status.srcSet){if(this.html.active){this._html_pause(time)}else if(this.flash.active)this._flash_pause(time)}else this._urlNotSetError("pause")},pauseOthers:function(){var self=this;$.each(this.instances,function(i,element){if(self.element!==element)if(element.data("jPlayer").status.srcSet)element.jPlayer("pause")})},stop:function(){if(this.status.srcSet){if(this.html.active){this._html_pause(0)}else if(this.flash.active)this._flash_pause(0)}else this._urlNotSetError("stop")},playHead:function(p){p=this._limitValue(p,0,100);if(this.status.srcSet){if(this.html.active){this._html_playHead(p)}else if(this.flash.active)this._flash_playHead(p)}else this._urlNotSetError("playHead")},_muted:function(muted){this.options.muted=muted;if(this.html.used)this._html_mute(muted);if(this.flash.used)this._flash_mute(muted);if(this.flash.gate){this._updateMute(muted);this._updateVolume(this.options.volume);this._trigger($.jPlayer.event.volumechange)}},mute:function(mute){mute=mute===undefined?true:!!mute;this._muted(mute)},unmute:function(unmute){unmute=unmute===undefined?true:!!unmute;this._muted(!unmute)},_updateMute:function(mute){if(mute===undefined)mute=this.options.muted;if(this.css.jq.mute.length&&this.css.jq.unmute.length)if(mute){this.css.jq.mute.hide();this.css.jq.unmute.show()}else{this.css.jq.mute.show();this.css.jq.unmute.hide()}},volume:function(v){v=this._limitValue(v,0,1);this.options.volume=v;if(this.html.used)this._html_volume(v);if(this.flash.used)this._flash_volume(v);if(this.flash.gate){this._updateVolume(v);this._trigger($.jPlayer.event.volumechange)}},volumeBar:function(e){if(this.css.jq.volumeBar.length){var offset=this.css.jq.volumeBar.offset(),x=e.pageX-offset.left,w=this.css.jq.volumeBar.width(),v=x/w;this.volume(v)};if(this.options.muted)this._muted(false)},volumeBarValue:function(e){this.volumeBar(e)},_updateVolume:function(v){if(v===undefined)v=this.options.volume;v=this.options.muted?0:v;if(this.css.jq.volumeBarValue.length)this.css.jq.volumeBarValue.width((v*100)+"%")},volumeMax:function(){this.volume(1);if(this.options.muted)this._muted(false)},_cssSelectorAncestor:function(ancestor){var self=this;this.options.cssSelectorAncestor=ancestor;this._removeUiClass();this.ancestorJq=ancestor?$(ancestor):[];if(ancestor&&this.ancestorJq.length!==1)this._warning({type:$.jPlayer.warning.CSS_SELECTOR_COUNT,context:ancestor,message:$.jPlayer.warningMsg.CSS_SELECTOR_COUNT+this.ancestorJq.length+" found for cssSelectorAncestor.",hint:$.jPlayer.warningHint.CSS_SELECTOR_COUNT});this._addUiClass();$.each(this.options.cssSelector,function(fn,cssSel){self._cssSelector(fn,cssSel)})},_cssSelector:function(fn,cssSel){var self=this;if(typeof cssSel==='string'){if($.jPlayer.prototype.options.cssSelector[fn]){if(this.css.jq[fn]&&this.css.jq[fn].length)this.css.jq[fn].unbind(".jPlayer");this.options.cssSelector[fn]=cssSel;this.css.cs[fn]=this.options.cssSelectorAncestor+" "+cssSel;if(cssSel){this.css.jq[fn]=$(this.css.cs[fn])}else this.css.jq[fn]=[];if(this.css.jq[fn].length){var handler=function(e){self[fn](e);$(this).blur();return false};this.css.jq[fn].bind("click.jPlayer",handler)};if(cssSel&&this.css.jq[fn].length!==1)this._warning({type:$.jPlayer.warning.CSS_SELECTOR_COUNT,context:this.css.cs[fn],message:$.jPlayer.warningMsg.CSS_SELECTOR_COUNT+this.css.jq[fn].length+" found for "+fn+" method.",hint:$.jPlayer.warningHint.CSS_SELECTOR_COUNT})}else this._warning({type:$.jPlayer.warning.CSS_SELECTOR_METHOD,context:fn,message:$.jPlayer.warningMsg.CSS_SELECTOR_METHOD,hint:$.jPlayer.warningHint.CSS_SELECTOR_METHOD})}else this._warning({type:$.jPlayer.warning.CSS_SELECTOR_STRING,context:cssSel,message:$.jPlayer.warningMsg.CSS_SELECTOR_STRING,hint:$.jPlayer.warningHint.CSS_SELECTOR_STRING})},seekBar:function(e){if(this.css.jq.seekBar){var offset=this.css.jq.seekBar.offset(),x=e.pageX-offset.left,w=this.css.jq.seekBar.width(),p=100*x/w;this.playHead(p)}},playBar:function(e){this.seekBar(e)},repeat:function(){this._loop(true)},repeatOff:function(){this._loop(false)},_loop:function(loop){if(this.options.loop!==loop){this.options.loop=loop;this._updateButtons();this._trigger($.jPlayer.event.repeat)}},currentTime:function(e){},duration:function(e){},gui:function(e){},option:function(key,value){var options=key;if(arguments.length===0)return $.extend(true,{},this.options);if(typeof key==="string"){var keys=key.split(".");if(value===undefined){var opt=$.extend(true,{},this.options);for(var i=0;i<keys.length;i++)if(opt[keys[i]]!==undefined){opt=opt[keys[i]]}else{this._warning({type:$.jPlayer.warning.OPTION_KEY,context:key,message:$.jPlayer.warningMsg.OPTION_KEY,hint:$.jPlayer.warningHint.OPTION_KEY});return undefined};return opt};options={};var opts=options;for(var j=0;j<keys.length;j++)if(j<keys.length-1){opts[keys[j]]={};opts=opts[keys[j]]}else opts[keys[j]]=value};this._setOptions(options);return this},_setOptions:function(options){var self=this;$.each(options,function(key,value){self._setOption(key,value)});return this},_setOption:function(key,value){var self=this;switch(key){case"volume":this.volume(value);break;case"muted":this._muted(value);break;case"cssSelectorAncestor":this._cssSelectorAncestor(value);break;case"cssSelector":$.each(value,function(fn,cssSel){self._cssSelector(fn,cssSel)});break;case"fullScreen":if(this.options[key]!==value){this._removeUiClass();this.options[key]=value;this._refreshSize()};break;case"size":if(!this.options.fullScreen&&this.options[key].cssClass!==value.cssClass)this._removeUiClass();this.options[key]=$.extend({},this.options[key],value);this._refreshSize();break;case"sizeFull":if(this.options.fullScreen&&this.options[key].cssClass!==value.cssClass)this._removeUiClass();this.options[key]=$.extend({},this.options[key],value);this._refreshSize();break;case"autohide":this.options[key]=$.extend({},this.options[key],value);this._updateAutohide();break;case"loop":this._loop(value);break;case"emulateHtml":if(this.options[key]!==value){this.options[key]=value;if(value){this._emulateHtmlBridge()}else this._destroyHtmlBridge()};break};return this},_refreshSize:function(){this._setSize();this._addUiClass();this._updateSize();this._updateButtons();this._updateAutohide();this._trigger($.jPlayer.event.resize)},_setSize:function(){if(this.options.fullScreen){this.status.width=this.options.sizeFull.width;this.status.height=this.options.sizeFull.height;this.status.cssClass=this.options.sizeFull.cssClass}else{this.status.width=this.options.size.width;this.status.height=this.options.size.height;this.status.cssClass=this.options.size.cssClass};this.element.css({width:this.status.width,height:this.status.height})},_addUiClass:function(){if(this.ancestorJq.length)this.ancestorJq.addClass(this.status.cssClass)},_removeUiClass:function(){if(this.ancestorJq.length)this.ancestorJq.removeClass(this.status.cssClass)},_updateSize:function(){this.internal.poster.jq.css({width:this.status.width,height:this.status.height});if(!this.status.waitForPlay)if(this.html.active&&this.status.video){this.internal.video.jq.css({width:this.status.width,height:this.status.height})}else if(this.flash.active)this.internal.flash.jq.css({width:this.status.width,height:this.status.height})},_updateAutohide:function(){var self=this,event="mousemove.jPlayer",namespace=".jPlayerAutohide",eventType=event+namespace,handler=function(){self.css.jq.gui.fadeIn(self.options.autohide.fadeIn,function(){clearTimeout(self.internal.autohideId);self.internal.autohideId=setTimeout(function(){self.css.jq.gui.fadeOut(self.options.autohide.fadeOut)},self.options.autohide.hold)})};clearTimeout(this.internal.autohideId);this.element.unbind(namespace);if(this.css.jq.gui.length){this.css.jq.gui.unbind(namespace);if(this.options.fullScreen&&this.options.autohide.full||!this.options.fullScreen&&this.options.autohide.restored){this.element.bind(eventType,handler);this.css.jq.gui.bind(eventType,handler);this.css.jq.gui.hide()}else this.css.jq.gui.stop(true,true).show()}},fullScreen:function(){this._setOption("fullScreen",true)},restoreScreen:function(){this._setOption("fullScreen",false)},_html_initMedia:function(){if(this.status.srcSet&&!this.status.waitForPlay)this.htmlElement.media.pause();if(this.options.preload!=='none')this._html_load();this._trigger($.jPlayer.event.timeupdate)},_html_setAudio:function(media){var self=this;$.each(this.formats,function(priority,format){if(self.html.support[format]&&media[format]){self.status.src=media[format];self.status.format[format]=true;self.status.formatType=format;return false}});this.htmlElement.media=this.htmlElement.audio;this._html_initMedia()},_html_setVideo:function(media){var self=this;$.each(this.formats,function(priority,format){if(self.html.support[format]&&media[format]){self.status.src=media[format];self.status.format[format]=true;self.status.formatType=format;return false}});this.htmlElement.media=this.htmlElement.video;this._html_initMedia()},_html_clearMedia:function(){if(this.htmlElement.media){if(this.htmlElement.media.id===this.internal.video.id)this.internal.video.jq.css({width:'0px',height:'0px'});this.htmlElement.media.pause();this.htmlElement.media.src="";this.htmlElement.media.load()}},_html_load:function(){if(this.status.waitForLoad){this.status.waitForLoad=false;this.htmlElement.media.src=this.status.src;this.htmlElement.media.load()};clearTimeout(this.internal.htmlDlyCmdId)},_html_play:function(time){var self=this;this._html_load();this.htmlElement.media.play();if(!isNaN(time))try{this.htmlElement.media.currentTime=time}catch(err){this.internal.htmlDlyCmdId=setTimeout(function(){self.play(time)},100);return};this._html_checkWaitForPlay()},_html_pause:function(time){var self=this;if(time>0){this._html_load()}else clearTimeout(this.internal.htmlDlyCmdId);this.htmlElement.media.pause();if(!isNaN(time))try{this.htmlElement.media.currentTime=time}catch(err){this.internal.htmlDlyCmdId=setTimeout(function(){self.pause(time)},100);return};if(time>0)this._html_checkWaitForPlay()},_html_playHead:function(percent){var self=this;this._html_load();try{if((typeof this.htmlElement.media.seekable==="object")&&(this.htmlElement.media.seekable.length>0)){this.htmlElement.media.currentTime=percent*this.htmlElement.media.seekable.end(this.htmlElement.media.seekable.length-1)/100}else if(this.htmlElement.media.duration>0&&!isNaN(this.htmlElement.media.duration)){this.htmlElement.media.currentTime=percent*this.htmlElement.media.duration/100}else throw"e"}catch(err){this.internal.htmlDlyCmdId=setTimeout(function(){self.playHead(percent)},100);return};if(!this.status.waitForLoad)this._html_checkWaitForPlay()},_html_checkWaitForPlay:function(){if(this.status.waitForPlay){this.status.waitForPlay=false;if(this.css.jq.videoPlay.length)this.css.jq.videoPlay.hide();if(this.status.video){this.internal.poster.jq.hide();this.internal.video.jq.css({width:this.status.width,height:this.status.height})}}},_html_volume:function(v){if(this.html.audio.available)this.htmlElement.audio.volume=v;if(this.html.video.available)this.htmlElement.video.volume=v},_html_mute:function(m){if(this.html.audio.available)this.htmlElement.audio.muted=m;if(this.html.video.available)this.htmlElement.video.muted=m},_flash_setAudio:function(media){var self=this;try{$.each(this.formats,function(priority,format){if(self.flash.support[format]&&media[format]){switch(format){case"m4a":case"fla":self._getMovie().fl_setAudio_m4a(media[format]);break;case"mp3":self._getMovie().fl_setAudio_mp3(media[format]);break};self.status.src=media[format];self.status.format[format]=true;self.status.formatType=format;return false}});if(this.options.preload==='auto'){this._flash_load();this.status.waitForLoad=false}}catch(err){this._flashError(err)}},_flash_setVideo:function(media){var self=this;try{$.each(this.formats,function(priority,format){if(self.flash.support[format]&&media[format]){switch(format){case"m4v":case"flv":self._getMovie().fl_setVideo_m4v(media[format]);break};self.status.src=media[format];self.status.format[format]=true;self.status.formatType=format;return false}});if(this.options.preload==='auto'){this._flash_load();this.status.waitForLoad=false}}catch(err){this._flashError(err)}},_flash_clearMedia:function(){this.internal.flash.jq.css({width:'0px',height:'0px'});try{this._getMovie().fl_clearMedia()}catch(err){this._flashError(err)}},_flash_load:function(){try{this._getMovie().fl_load()}catch(err){this._flashError(err)};this.status.waitForLoad=false},_flash_play:function(time){try{this._getMovie().fl_play(time)}catch(err){this._flashError(err)};this.status.waitForLoad=false;this._flash_checkWaitForPlay()},_flash_pause:function(time){try{this._getMovie().fl_pause(time)}catch(err){this._flashError(err)};if(time>0){this.status.waitForLoad=false;this._flash_checkWaitForPlay()}},_flash_playHead:function(p){try{this._getMovie().fl_play_head(p)}catch(err){this._flashError(err)};if(!this.status.waitForLoad)this._flash_checkWaitForPlay()},_flash_checkWaitForPlay:function(){if(this.status.waitForPlay){this.status.waitForPlay=false;if(this.css.jq.videoPlay.length)this.css.jq.videoPlay.hide();if(this.status.video){this.internal.poster.jq.hide();this.internal.flash.jq.css({width:this.status.width,height:this.status.height})}}},_flash_volume:function(v){try{this._getMovie().fl_volume(v)}catch(err){this._flashError(err)}},_flash_mute:function(m){try{this._getMovie().fl_mute(m)}catch(err){this._flashError(err)}},_getMovie:function(){return document[this.internal.flash.id]},_checkForFlash:function(version){var flashIsInstalled=false,flash;if(window.ActiveXObject){try{flash=new ActiveXObject(("ShockwaveFlash.ShockwaveFlash."+version));flashIsInstalled=true}catch(e){}}else if(navigator.plugins&&navigator.mimeTypes.length>0){flash=navigator.plugins["Shockwave Flash"];if(flash){var flashVersion=navigator.plugins["Shockwave Flash"].description.replace(/.*\s(\d+\.\d+).*/,"$1");if(flashVersion>=version)flashIsInstalled=true}};return flashIsInstalled},_validString:function(url){return(url&&typeof url==="string")},_limitValue:function(value,min,max){return(value<min)?min:((value>max)?max:value)},_urlNotSetError:function(context){this._error({type:$.jPlayer.error.URL_NOT_SET,context:context,message:$.jPlayer.errorMsg.URL_NOT_SET,hint:$.jPlayer.errorHint.URL_NOT_SET})},_flashError:function(error){var errorType;if(!this.internal.ready){errorType="FLASH"}else errorType="FLASH_DISABLED";this._error({type:$.jPlayer.error[errorType],context:this.internal.flash.swf,message:$.jPlayer.errorMsg[errorType]+error.message,hint:$.jPlayer.errorHint[errorType]})},_error:function(error){this._trigger($.jPlayer.event.error,error);if(this.options.errorAlerts)this._alert("Error!"+(error.message?"\n\n"+error.message:"")+(error.hint?"\n\n"+error.hint:"")+"\n\nContext: "+error.context)},_warning:function(warning){this._trigger($.jPlayer.event.warning,undefined,warning);if(this.options.warningAlerts)this._alert("Warning!"+(warning.message?"\n\n"+warning.message:"")+(warning.hint?"\n\n"+warning.hint:"")+"\n\nContext: "+warning.context)},_alert:function(message){alert("jPlayer "+this.version.script+" : id='"+this.internal.self.id+"' : "+message)},_emulateHtmlBridge:function(){var self=this,methods=$.jPlayer.emulateMethods;$.each($.jPlayer.emulateMethods.split(/\s+/g),function(i,name){self.internal.domNode[name]=function(arg){self[name](arg)}});$.each($.jPlayer.event,function(eventName,eventType){var nativeEvent=true;$.each($.jPlayer.reservedEvent.split(/\s+/g),function(i,name){if(name===eventName){nativeEvent=false;return false}});if(nativeEvent)self.element.bind(eventType+".jPlayer.jPlayerHtml",function(){self._emulateHtmlUpdate();var domEvent=document.createEvent("Event");domEvent.initEvent(eventName,false,true);self.internal.domNode.dispatchEvent(domEvent)})})},_emulateHtmlUpdate:function(){var self=this;$.each($.jPlayer.emulateStatus.split(/\s+/g),function(i,name){self.internal.domNode[name]=self.status[name]});$.each($.jPlayer.emulateOptions.split(/\s+/g),function(i,name){self.internal.domNode[name]=self.options[name]})},_destroyHtmlBridge:function(){var self=this;this.element.unbind(".jPlayerHtml");var emulated=$.jPlayer.emulateMethods+" "+$.jPlayer.emulateStatus+" "+$.jPlayer.emulateOptions;$.each(emulated.split(/\s+/g),function(i,name){delete self.internal.domNode[name]})}};$.jPlayer.error={FLASH:"e_flash",FLASH_DISABLED:"e_flash_disabled",NO_SOLUTION:"e_no_solution",NO_SUPPORT:"e_no_support",URL:"e_url",URL_NOT_SET:"e_url_not_set",VERSION:"e_version"};$.jPlayer.errorMsg={FLASH:"jPlayer's Flash fallback is not configured correctly, or a command was issued before the jPlayer Ready event. Details: ",FLASH_DISABLED:"jPlayer's Flash fallback has been disabled by the browser due to the CSS rules you have used. Details: ",NO_SOLUTION:"No solution can be found by jPlayer in this browser. Neither HTML nor Flash can be used.",NO_SUPPORT:"It is not possible to play any media format provided in setMedia() on this browser using your current options.",URL:"Media URL could not be loaded.",URL_NOT_SET:"Attempt to issue media playback commands, while no media url is set.",VERSION:"jPlayer "+$.jPlayer.prototype.version.script+" needs Jplayer.swf version "+$.jPlayer.prototype.version.needFlash+" but found "};$.jPlayer.errorHint={FLASH:"Check your swfPath option and that Jplayer.swf is there.",FLASH_DISABLED:"Check that you have not display:none; the jPlayer entity or any ancestor.",NO_SOLUTION:"Review the jPlayer options: support and supplied.",NO_SUPPORT:"Video or audio formats defined in the supplied option are missing.",URL:"Check media URL is valid.",URL_NOT_SET:"Use setMedia() to set the media URL.",VERSION:"Update jPlayer files."};$.jPlayer.warning={CSS_SELECTOR_COUNT:"e_css_selector_count",CSS_SELECTOR_METHOD:"e_css_selector_method",CSS_SELECTOR_STRING:"e_css_selector_string",OPTION_KEY:"e_option_key"};$.jPlayer.warningMsg={CSS_SELECTOR_COUNT:"The number of css selectors found did not equal one: ",CSS_SELECTOR_METHOD:"The methodName given in jPlayer('cssSelector') is not a valid jPlayer method.",CSS_SELECTOR_STRING:"The methodCssSelector given in jPlayer('cssSelector') is not a String or is empty.",OPTION_KEY:"The option requested in jPlayer('option') is undefined."};$.jPlayer.warningHint={CSS_SELECTOR_COUNT:"Check your css selector and the ancestor.",CSS_SELECTOR_METHOD:"Check your method name.",CSS_SELECTOR_STRING:"Check your css selector is a string.",OPTION_KEY:"Check your option name."}})(jQuery)
diff --git a/apps/media/js/loader.js b/apps/media/js/loader.js
deleted file mode 100644
index ffe9c1cdd6..0000000000
--- a/apps/media/js/loader.js
+++ /dev/null
@@ -1,59 +0,0 @@
-function musicTypeFromFile(file){
-	var extension=file.substr(file.indexOf('.')+1).toLowerCase();
-	if(extension=='ogg'){
-		return 'oga';
-	}
-	//TODO check for more specific cases
-	return extension;
-}
-
-function playAudio(filename){
-	loadPlayer(musicTypeFromFile(filename),function(){
-		PlayList.add($('#dir').val()+'/'+filename);
-		PlayList.play(PlayList.items.length-1);
-	});
-}
-
-function addAudio(filename){
-	loadPlayer(musicTypeFromFile(filename),function(){
-		PlayList.add($('#dir').val()+'/'+filename);
-	});
-}
-
-function loadPlayer(type,ready){
-	if(!loadPlayer.done){
-		loadPlayer.done=true;
-		OC.addStyle('media','player');
-		OC.addScript('media','jquery.jplayer.min',function(){
-			OC.addScript('media','player',function(){
-				var navItem=$('#apps a[href="'+OC.linkTo('media','index.php')+'"]');
-				navItem.height(navItem.height());
-				navItem.load(OC.filePath('media','templates','player.php'),function(){
-					PlayList.init(type,ready);
-				});
-			});
-		});
-	}else{
-		ready();
-	}
-}
-
-$(document).ready(function() {
-	loadPlayer.done=false;
-
-// 	FileActions.register('audio','Add to playlist','',addAudio);
-// 	FileActions.register('application/ogg','Add to playlist','',addAudio);
-
-	if(typeof FileActions!=='undefined'){
-		FileActions.register('audio','Play', FileActions.PERMISSION_READ, '',playAudio);
-		FileActions.register('application/ogg', FileActions.PERMISSION_READ, '','Play',playAudio);
-		FileActions.setDefault('audio','Play');
-		FileActions.setDefault('application/ogg','Play');
-	}
-	var oc_current_user=OC.currentUser;
-	if(typeof PlayList==='undefined'){
-		if(OC.localStorage.getItem('playlist_items') && OC.localStorage.getItem('playlist_items').length && OC.localStorage.getItem('playlist_active')!=true){
-			loadPlayer();
-		}
-	}
-});
diff --git a/apps/media/js/music.js b/apps/media/js/music.js
deleted file mode 100644
index db12922762..0000000000
--- a/apps/media/js/music.js
+++ /dev/null
@@ -1,57 +0,0 @@
-$(document).ready(function(){
-	OC.search.customResults.Music=function(row,item){
-		var parts=item.link.substr(item.link.indexOf('#')+1).split('&');
-		var data={};
-		for(var i=0;i<parts.length;i++){
-			var itemParts=parts[i].split('=');
-			data[itemParts[0]]=itemParts[1].replace(/\+/g,' ');
-		}
-		var media=Collection.find(data.artist,data.album,data.song);
-		var a=row.find('a');
-		a.attr('href','#');
-		a.click(function(){
-			var oldSize=PlayList.items.length;
-			PlayList.add(media);
-			PlayList.play(oldSize);
-			PlayList.render();
-		});
-		var button=$('<input type="button" title="'+t('media','Add album to playlist')+'" class="add"></input>');
-		button.css('background-image','url('+OC.imagePath('core','actions/play-add')+')');
-		button.click(function(event){
-			event.stopPropagation();
-			PlayList.add(media);
-			PlayList.render();
-		});
-		row.find('div.name').append(button);
-		button.tipsy({gravity:'n', fade:true, delayIn: 400, live:true});
-	};
-	Collection.display();
-
-	Collection.load(function(){
-		var urlVars=getUrlVars();
-		if(urlVars.artist){
-			var song=Collection.find(urlVars.artist,urlVars.album,urlVars.song);
-			PlayList.add(song);
-			PlayList.play(0);
-		}
-	});
-});
-
-function getUrlVars(){
-	var vars = {}, hash;
-	var hashes = window.location.hash.substr(1).split('&');
-	for(var i = 0; i < hashes.length; i++){
-		hash = hashes[i].split('=');
-		vars[hash[0]] = decodeURIComponent(hash[1]).replace(/\+/g,' ');
-	}
-	return vars;
-}
-
-function musicTypeFromFile(file){
-	var extension=file.split('.').pop().toLowerCase();
-	if(extension=='ogg'){
-		return 'oga';
-	}
-	//TODO check for more specific cases
-	return extension;
-}
diff --git a/apps/media/js/player.js b/apps/media/js/player.js
deleted file mode 100644
index 867ea80236..0000000000
--- a/apps/media/js/player.js
+++ /dev/null
@@ -1,214 +0,0 @@
-var PlayList={
-	urlBase:OC.linkTo('media','ajax/api.php')+'?action=play&path=',
-	current:-1,
-	items:[],
-	player:null,
-	volume:0.8,
-	active:false,
-	next:function(){
-		var items=PlayList.items;
-		var next=PlayList.current+1;
-		if(next>=items.length){
-			next=0;
-		}
-		PlayList.play(next);
-		PlayList.render();
-	},
-	previous:function(){
-		var items=PlayList.items;
-		var next=PlayList.current-1;
-		if(next<0){
-			next=items.length-1;
-		}
-		PlayList.play(next);
-		PlayList.render();
-	},
-	play:function(index,time,ready){
-		var items=PlayList.items;
-		if(index==null){
-			index=PlayList.current;
-		}
-		PlayList.save();
-		if(index>-1 && index<items.length){
-			PlayList.current=index;
-			if(PlayList.player){
-				if(PlayList.player.data('jPlayer').options.supplied!=items[index].type){//the the audio type changes we need to reinitialize jplayer
-					PlayList.player.jPlayer("play",time);
-					OC.localStorage.setItem('playlist_time',time);
-					PlayList.player.jPlayer("destroy");
-// 					PlayList.save(); // so that the init don't lose the playlist
-					PlayList.init(items[index].type,null); // init calls load that calls play
-				}else{
-					PlayList.player.jPlayer("setMedia", items[PlayList.current]);
-					$(".jp-current-song").html(items[PlayList.current].name);
-					items[index].playcount++;
-					PlayList.player.jPlayer("play",time);
-					if(index>0){
-						var previous=index-1;
-					}else{
-						var previous=items.length-1;
-					}
-					if(index+1<items.length){
-						var next=index+1;
-					}else{
-						var next=0;
-					}
-					$('.jp-next').attr('title',items[next].name);
-					$('.jp-previous').attr('title',items[previous].name);
-					if (typeof Collection !== 'undefined') {
-						Collection.registerPlay();
-					}
-					PlayList.render();
-					if(ready){
-						ready();
-					}
-				}
-			}else{
-				OC.localStorage.setItem('playlist_time',time);
-				OC.localStorage.setItem('playlist_playing',true);
-				PlayList.init(items[index].type,null); // init calls load that calls play
-			}
-		}
-		$(".song").removeClass("collection_playing");
-		$(".jp-playlist-" + index).addClass("collection_playing");
-	},
-	init:function(type,ready){
-		if(!PlayList.player){
-			$(".jp-previous").click(function() {
-				PlayList.previous();
-				$(this).blur();
-				PlayList.render();
-				return false;
-			});
-			$(".jp-next").click(function() {
-				PlayList.next();
-				$(this).blur();
-				PlayList.render();
-				return false;
-			});
-			PlayList.player=$('#jp-player');
-		}
-		$(PlayList.player).jPlayer({
-			ended:PlayList.next,
-			pause:function(){
-				OC.localStorage.setItem('playlist_playing',false);
-				document.title = "ownCloud";
-			},
-			play:function(event){
-				OC.localStorage.setItem('playlist_playing',true);
-				document.title = "\u25b8 " + event.jPlayer.status.media.name + " - " + event.jPlayer.status.media.artist + " - ownCloud";
-			},
-			supplied:type,
-			ready:function(){
-				PlayList.load();
-				if(ready){
-					ready();
-				}
-			},
-			volume:PlayList.volume,
-			cssSelectorAncestor:'.player-controls',
-			swfPath:OC.linkTo('media','js'),
-		});
-	},
-	add:function(song,dontReset){
-		if(!dontReset){
-			PlayList.items=[];//clear the playlist
-		}
-		if(!song){
-			return;
-		}
-		if(song.substr){//we are passed a string, asume it's a url to a song
-			PlayList.addFile(song,true);
-		}
-		if(song.albums){//a artist object was passed, add all albums inside it
-			$.each(song.albums,function(index,album){
-				PlayList.add(album,true);
-			});
-		} else if(song.songs){//a album object was passed, add all songs inside it
-			$.each(song.songs,function(index,song){
-				PlayList.add(song,true);
-			});
-		}
-		if(song.path){
-			var type=musicTypeFromFile(song.path);
-			var item={name:song.name,type:type,artist:song.artist,album:song.album,length:song.length,playcount:song.playCount};
-			item[type]=PlayList.urlBase+encodeURIComponent(song.path);
-			PlayList.items.push(item);
-		}
-	},
-	addFile:function(path){
-		var type=musicTypeFromFile(path);
-		var item={name:'unknown',artist:'unknown',album:'unknwon',type:type};
-		$.getJSON(OC.filePath('media','ajax','api.php')+'?action=get_path_info&path='+encodeURIComponent(path),function(song){
-			item.name=song.song_name;
-			item.artist=song.artist;
-			item.album=song.album;
-		});
-		item[type]=PlayList.urlBase+encodeURIComponent(path);
-		PlayList.items.push(item);
-	},
-	remove:function(index){
-		PlayList.items.splice(index,1);
-		PlayList.render();
-	},
-	render:function(){},
-	playing:function(){
-		if(!PlayList.player){
-			return false;
-		}else{
-			return !PlayList.player.data("jPlayer").status.paused;
-		}
-	},
-	save:function(){
-		OC.localStorage.setItem('playlist_items',PlayList.items);
-		OC.localStorage.setItem('playlist_current',PlayList.current);
-		if(PlayList.player) {
-			if(PlayList.player.data('jPlayer')) {
-				var time=Math.round(PlayList.player.data('jPlayer').status.currentTime);
-				OC.localStorage.setItem('playlist_time',time);
-				var volume=PlayList.player.data('jPlayer').options.volume*100;
-				OC.localStorage.setItem('playlist_volume',volume);
-			}
-		}
-		OC.localStorage.setItem('playlist_active',true);
-	},
-	load:function(){
-		PlayList.active=true;
-		OC.localStorage.setItem('playlist_active',true);
-		if(OC.localStorage.hasItem('playlist_items')){
-			PlayList.items=OC.localStorage.getItem('playlist_items');
-			if(PlayList.items && PlayList.items.length>0){
-				PlayList.current=OC.localStorage.getItem('playlist_current');
-				var time=OC.localStorage.getItem('playlist_time');
-				if(OC.localStorage.hasItem('playlist_volume')){
-					var volume=OC.localStorage.getItem('playlist_volume');
-					PlayList.volume=volume/100;
-					$('.jp-volume-bar-value').css('width',volume+'%');
-					if(PlayList.player.data('jPlayer')){
-						PlayList.player.jPlayer("option",'volume',volume/100);
-					}
-				}
-				if(OC.localStorage.getItem('playlist_playing')){
-					PlayList.play(null,time);
-				}else{
-					PlayList.play(null,time,function(){
-						PlayList.player.jPlayer("pause");
-					});
-				}
-				PlayList.render();
-			}
-		}
-	}
-}
-
-$(document).ready(function(){
-	$(window).bind('beforeunload', function (){
-		PlayList.save();
-		if(PlayList.active){
-			OC.localStorage.setItem('playlist_active',false);
-		}
-	});
-
-	$('jp-previous').tipsy({gravity:'n', fade:true, live:true});
-	$('jp-next').tipsy({gravity:'n', fade:true, live:true});
-})
diff --git a/apps/media/js/playlist.js b/apps/media/js/playlist.js
deleted file mode 100644
index 8e9e2a9153..0000000000
--- a/apps/media/js/playlist.js
+++ /dev/null
@@ -1,57 +0,0 @@
-PlayList.render=function(){
-	$('#playlist').show();
-
-	/*
-	 * We should not empty() PlayList.parent() but thorougly manage its
-	 * elements instead because some code might be attached to those.
-	 * JQuery tipsies are one of them. The following line make sure they
-	 * are all removed before we delete the associated <li/>.
-	 */
-	$(".tipsy").remove();
-
-	PlayList.parent.empty();
-	for(var i=0;i<PlayList.items.length;i++){
-		var item=PlayList.items[i];
-		var li=$('<li/>');
-		li.attr('class', 'jp-playlist-' + i);
-		li.attr('title', item.artist + ' - ' + item.name + '<br/>(' + item.album + ')');
-		var div = $('<div class="label">' + item.name + '</div>');
-		li.append(div);
-		$('.jp-playlist-' + i).tipsy({gravity:'w', fade:true, live:true, html:true});
-		var img=$('<img class="remove svg action" src="'+OC.imagePath('core','actions/delete')+'"/>');
-		img.click(function(event){
-			event.stopPropagation();
-			PlayList.remove($(this).parent().data('index'));
-		});
-		li.click(function(event){
-			PlayList.play($(this).data('index'));
-		});
-		li.append(img);
-		li.data('index',i);
-		li.addClass('song');
-		PlayList.parent.append(li);
-	}
-        $(".jp-playlist-" + PlayList.current).addClass("collection_playing");
-};
-PlayList.getSelected=function(){
-	return $('tbody td.name input:checkbox:checked').parent().parent();
-};
-PlayList.hide=function(){
-	$('#playlist').hide();
-};
-
-$(document).ready(function(){
-	PlayList.parent=$('#leftcontent');
-	PlayList.init();
-	$('#selectAll').click(function(){
-		if($(this).attr('checked')){
-			// Check all
-			$('#leftcontent li.song input:checkbox').attr('checked', true);
-			$('#leftcontent li.song input:checkbox').parent().addClass('selected');
-		}else{
-			// Uncheck all
-			$('#leftcontent li.song input:checkbox').attr('checked', false);
-			$('#leftcontent li.song input:checkbox').parent().removeClass('selected');
-		}
-	});
-});
diff --git a/apps/media/js/scanner.js b/apps/media/js/scanner.js
deleted file mode 100644
index a9321f9996..0000000000
--- a/apps/media/js/scanner.js
+++ /dev/null
@@ -1,44 +0,0 @@
-Scanner={
-	songsFound:0,
-	eventSource:null,
-	songsScanned:0,
-	findSongs:function(ready){
-		$.getJSON(OC.linkTo('media','ajax/api.php')+'?action=find_music',function(songs){
-			Scanner.songsFound=songs.length;
-			if(ready){
-				ready(songs);
-			}
-		});
-	},
-	scanCollection:function(ready){
-		$('#scanprogressbar').progressbar({
-			value:0,
-		});
-		$('#scanprogressbar').show();
-		Scanner.songsScanned=0;
-		Scanner.eventSource=new OC.EventSource(OC.linkTo('media','ajax/api.php'),{action:'scan'});
-		Scanner.eventSource.listen('count',function(total){
-			Scanner.songsFound=total;
-		});
-		Scanner.eventSource.listen('scanned',function(data){
-			Scanner.songsScanned=data.count;
-			$('#scan span.songCount').text(Scanner.songsScanned);
-			var progress=(Scanner.songsScanned/Scanner.songsFound)*100;
-			$('#scanprogressbar').progressbar('value',progress);
-		});
-		Scanner.eventSource.listen('done',function(count){
-			$('#scan input.start').show();
-			$('#scan input.stop').hide();
-			$('#scanprogressbar').hide();
-			Collection.load(Collection.display);
-			if(ready){
-				ready();
-			}
-		});
-		$('#scancount').show();
-	},
-	stop:function(){
-		Scanner.eventSource.close();
-	},
-
-};
diff --git a/apps/media/l10n/ar.php b/apps/media/l10n/ar.php
deleted file mode 100644
index 655589df8a..0000000000
--- a/apps/media/l10n/ar.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Music" => "الموسيقى",
-"Add album to playlist" => "أضف الالبوم الى القائمه",
-"Play" => "إلعب",
-"Pause" => "تجميد",
-"Previous" => "السابق",
-"Next" => "التالي",
-"Mute" => "إلغاء الصوت",
-"Unmute" => "تشغيل الصوت",
-"Rescan Collection" => "إعادة البحث عن ملفات الموسيقى",
-"Artist" => "الفنان",
-"Album" => "الألبوم",
-"Title" => "العنوان"
-);
diff --git a/apps/media/l10n/bg_BG.php b/apps/media/l10n/bg_BG.php
deleted file mode 100644
index e6c3c02d17..0000000000
--- a/apps/media/l10n/bg_BG.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Music" => "Музика",
-"Add album to playlist" => "Добавяне на албума към списъка за изпълнение",
-"Play" => "Пусни",
-"Pause" => "Пауза",
-"Previous" => "Предишна",
-"Next" => "Следваща",
-"Mute" => "Отнеми",
-"Unmute" => "Върни",
-"Rescan Collection" => "Повторно сканиране",
-"Artist" => "Артист",
-"Album" => "Албум",
-"Title" => "Заглавие"
-);
diff --git a/apps/media/l10n/ca.php b/apps/media/l10n/ca.php
deleted file mode 100644
index 6c0a1855f3..0000000000
--- a/apps/media/l10n/ca.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Music" => "Música",
-"Play" => "Reprodueix",
-"Pause" => "Pausa",
-"Previous" => "Anterior",
-"Next" => "Següent",
-"Mute" => "Mut",
-"Unmute" => "Activa el so",
-"Rescan Collection" => "Explora de nou la col·lecció",
-"Artist" => "Artista",
-"Album" => "Àlbum",
-"Title" => "Títol"
-);
diff --git a/apps/media/l10n/cs_CZ.php b/apps/media/l10n/cs_CZ.php
deleted file mode 100644
index badec7b62f..0000000000
--- a/apps/media/l10n/cs_CZ.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Music" => "Hudba",
-"Play" => "Přehrát",
-"Pause" => "Pauza",
-"Previous" => "Předchozí",
-"Next" => "Další",
-"Mute" => "Vypnout zvuk",
-"Unmute" => "Zapnout zvuk",
-"Rescan Collection" => "Znovu prohledat ",
-"Artist" => "Umělec",
-"Album" => "Album",
-"Title" => "Název"
-);
diff --git a/apps/media/l10n/da.php b/apps/media/l10n/da.php
deleted file mode 100644
index 776081842c..0000000000
--- a/apps/media/l10n/da.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Music" => "Musik",
-"Play" => "Afspil",
-"Pause" => "Pause",
-"Previous" => "Forrige",
-"Next" => "Næste",
-"Mute" => "Lydløs",
-"Unmute" => "Lyd til",
-"Rescan Collection" => "Genskan Samling",
-"Artist" => "Kunstner",
-"Album" => "Album",
-"Title" => "Titel"
-);
diff --git a/apps/media/l10n/de.php b/apps/media/l10n/de.php
deleted file mode 100644
index d3d288dc6f..0000000000
--- a/apps/media/l10n/de.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Music" => "Musik",
-"Play" => "Abspielen",
-"Pause" => "Pause",
-"Previous" => "Vorheriges",
-"Next" => "Nächstes",
-"Mute" => "Ton aus",
-"Unmute" => "Ton an",
-"Rescan Collection" => "Sammlung erneut scannen",
-"Artist" => "Künstler",
-"Album" => "Album",
-"Title" => "Titel"
-);
diff --git a/apps/media/l10n/el.php b/apps/media/l10n/el.php
deleted file mode 100644
index 9996180c03..0000000000
--- a/apps/media/l10n/el.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Music" => "Μουσική",
-"Play" => "Αναπαραγωγή",
-"Pause" => "Παύση",
-"Previous" => "Προηγούμενο",
-"Next" => "Επόμενο",
-"Mute" => "Σίγαση",
-"Unmute" => "Επαναφορά ήχου",
-"Rescan Collection" => "Επανασάρωση συλλογής",
-"Artist" => "Καλλιτέχνης",
-"Album" => "Άλμπουμ",
-"Title" => "Τίτλος"
-);
diff --git a/apps/media/l10n/eo.php b/apps/media/l10n/eo.php
deleted file mode 100644
index 084dbaa480..0000000000
--- a/apps/media/l10n/eo.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Music" => "Muziko",
-"Add album to playlist" => "Aldoni albumon al ludlisto",
-"Play" => "Ludi",
-"Pause" => "Paŭzigi",
-"Previous" => "Maljena",
-"Next" => "Jena",
-"Mute" => "Silentigi",
-"Unmute" => "Malsilentigi",
-"Rescan Collection" => "Reskani la aron",
-"Artist" => "Artisto",
-"Album" => "Albumo",
-"Title" => "Titolo"
-);
diff --git a/apps/media/l10n/es.php b/apps/media/l10n/es.php
deleted file mode 100644
index 100ab6a7a7..0000000000
--- a/apps/media/l10n/es.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Music" => "Música",
-"Play" => "Reproducir",
-"Pause" => "Pausa",
-"Previous" => "Anterior",
-"Next" => "Siguiente",
-"Mute" => "Silenciar",
-"Unmute" => "Quitar silencio",
-"Rescan Collection" => "Buscar canciones nuevas",
-"Artist" => "Artista",
-"Album" => "Álbum",
-"Title" => "Título"
-);
diff --git a/apps/media/l10n/et_EE.php b/apps/media/l10n/et_EE.php
deleted file mode 100644
index 4133cb84a9..0000000000
--- a/apps/media/l10n/et_EE.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Music" => "Muusika",
-"Play" => "Esita",
-"Pause" => "Paus",
-"Previous" => "Eelmine",
-"Next" => "Järgmine",
-"Mute" => "Vaikseks",
-"Unmute" => "Hääl tagasi",
-"Rescan Collection" => "Skänni kollekttsiooni uuesti",
-"Artist" => "Esitaja",
-"Album" => "Album",
-"Title" => "Pealkiri"
-);
diff --git a/apps/media/l10n/eu.php b/apps/media/l10n/eu.php
deleted file mode 100644
index d30e351916..0000000000
--- a/apps/media/l10n/eu.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Music" => "Musika",
-"Play" => "Erreproduzitu",
-"Pause" => "Pausarazi",
-"Previous" => "Aurrekoa",
-"Next" => "Hurrengoa",
-"Mute" => "Mututu",
-"Unmute" => "Ez Mututu",
-"Rescan Collection" => "Bireskaneatu Bilduma",
-"Artist" => "Artista",
-"Album" => "Albuma",
-"Title" => "Izenburua"
-);
diff --git a/apps/media/l10n/fa.php b/apps/media/l10n/fa.php
deleted file mode 100644
index 3bccdb0c50..0000000000
--- a/apps/media/l10n/fa.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Music" => "موسیقی",
-"Play" => "پخش کردن",
-"Pause" => "توقف کوتاه",
-"Previous" => "قبلی",
-"Next" => "بعدی",
-"Mute" => "خفه کردن",
-"Unmute" => "باز گشایی صدا",
-"Rescan Collection" => "دوباره بازرسی مجموعه ها",
-"Artist" => "هنرمند",
-"Album" => "آلبوم",
-"Title" => "عنوان"
-);
diff --git a/apps/media/l10n/fi_FI.php b/apps/media/l10n/fi_FI.php
deleted file mode 100644
index 2426f6a220..0000000000
--- a/apps/media/l10n/fi_FI.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Music" => "Musiikki",
-"Play" => "Toista",
-"Pause" => "Tauko",
-"Previous" => "Edellinen",
-"Next" => "Seuraava",
-"Mute" => "Mykistä",
-"Unmute" => "Palauta äänet",
-"Rescan Collection" => "Etsi uusia kappaleita",
-"Artist" => "Esittäjä",
-"Album" => "Albumi",
-"Title" => "Nimi"
-);
diff --git a/apps/media/l10n/fr.php b/apps/media/l10n/fr.php
deleted file mode 100644
index 313a918d02..0000000000
--- a/apps/media/l10n/fr.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Music" => "Musique",
-"Add album to playlist" => "Ajouter l'album à la playlist",
-"Play" => "Lire",
-"Pause" => "Pause",
-"Previous" => "Précédent",
-"Next" => "Suivant",
-"Mute" => "Muet",
-"Unmute" => "Audible",
-"Rescan Collection" => "Réanalyser la Collection",
-"Artist" => "Artiste",
-"Album" => "Album",
-"Title" => "Titre"
-);
diff --git a/apps/media/l10n/gl.php b/apps/media/l10n/gl.php
deleted file mode 100644
index 69037b7d1f..0000000000
--- a/apps/media/l10n/gl.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Music" => "Música",
-"Play" => "Reproducir",
-"Pause" => "Pausar",
-"Previous" => "Anterior",
-"Next" => "Seguinte",
-"Mute" => "Silenciar",
-"Unmute" => "Restaurar volume",
-"Rescan Collection" => "Analizar a colección de novo",
-"Artist" => "Artista",
-"Album" => "Álbun",
-"Title" => "Título"
-);
diff --git a/apps/media/l10n/he.php b/apps/media/l10n/he.php
deleted file mode 100644
index 772bfb9028..0000000000
--- a/apps/media/l10n/he.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Music" => "מוזיקה",
-"Play" => "נגן",
-"Pause" => "השהה",
-"Previous" => "קודם",
-"Next" => "הבא",
-"Mute" => "השתק",
-"Unmute" => "בטל השתקה",
-"Rescan Collection" => "סריקת אוסף מחדש",
-"Artist" => "מבצע",
-"Album" => "אלבום",
-"Title" => "כותרת"
-);
diff --git a/apps/media/l10n/hr.php b/apps/media/l10n/hr.php
deleted file mode 100644
index bab149743c..0000000000
--- a/apps/media/l10n/hr.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Music" => "Glazba",
-"Play" => "Reprodukcija",
-"Pause" => "Pauza",
-"Previous" => "Prethodna",
-"Next" => "Sljedeća",
-"Mute" => "Utišaj zvuk",
-"Unmute" => "Uključi zvuk",
-"Rescan Collection" => "Ponovi skeniranje kolekcije",
-"Artist" => "Izvođač",
-"Album" => "Album",
-"Title" => "Naslov"
-);
diff --git a/apps/media/l10n/hu_HU.php b/apps/media/l10n/hu_HU.php
deleted file mode 100644
index 299e0af028..0000000000
--- a/apps/media/l10n/hu_HU.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Music" => "Zene",
-"Play" => "Lejátszás",
-"Pause" => "Szünet",
-"Previous" => "Előző",
-"Next" => "Következő",
-"Mute" => "Némítás",
-"Unmute" => "Némítás megszüntetése",
-"Rescan Collection" => "Gyűjtemény újraolvasása",
-"Artist" => "Előadó",
-"Album" => "Album",
-"Title" => "Cím"
-);
diff --git a/apps/media/l10n/ia.php b/apps/media/l10n/ia.php
deleted file mode 100644
index 597b36e10f..0000000000
--- a/apps/media/l10n/ia.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Music" => "Musica",
-"Play" => "Reproducer",
-"Pause" => "Pausa",
-"Previous" => "Previe",
-"Next" => "Proxime",
-"Mute" => "Mute",
-"Unmute" => "Con sono",
-"Rescan Collection" => "Rescannar collection",
-"Artist" => "Artista",
-"Album" => "Album",
-"Title" => "Titulo"
-);
diff --git a/apps/media/l10n/id.php b/apps/media/l10n/id.php
deleted file mode 100644
index 52b0bae0ee..0000000000
--- a/apps/media/l10n/id.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Music" => "Musik",
-"Play" => "Mainkan",
-"Pause" => "Jeda",
-"Previous" => "Sebelumnya",
-"Next" => "Selanjutnya",
-"Mute" => "Nonaktifkan suara",
-"Unmute" => "Aktifkan suara",
-"Rescan Collection" => "Pindai ulang Koleksi",
-"Artist" => "Artis",
-"Album" => "Album",
-"Title" => "Judul"
-);
diff --git a/apps/media/l10n/it.php b/apps/media/l10n/it.php
deleted file mode 100644
index 757392bcbd..0000000000
--- a/apps/media/l10n/it.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Music" => "Musica",
-"Play" => "Riproduci",
-"Pause" => "Pausa",
-"Previous" => "Precedente",
-"Next" => "Successivo",
-"Mute" => "Disattiva audio",
-"Unmute" => "Riattiva audio",
-"Rescan Collection" => "Nuova scansione collezione",
-"Artist" => "Artista",
-"Album" => "Album",
-"Title" => "Titolo"
-);
diff --git a/apps/media/l10n/ja_JP.php b/apps/media/l10n/ja_JP.php
deleted file mode 100644
index 7faa098250..0000000000
--- a/apps/media/l10n/ja_JP.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Music" => "ミュージック",
-"Play" => "再生",
-"Pause" => "一時停止",
-"Previous" => "前",
-"Next" => "次",
-"Mute" => "ミュート",
-"Unmute" => "ミュート解除",
-"Rescan Collection" => "コレクションの再スキャン",
-"Artist" => "アーティスト",
-"Album" => "アルバム",
-"Title" => "曲名"
-);
diff --git a/apps/media/l10n/ko.php b/apps/media/l10n/ko.php
deleted file mode 100644
index 844d9c3e08..0000000000
--- a/apps/media/l10n/ko.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Music" => "음악",
-"Play" => "재생",
-"Pause" => "일시 정지",
-"Previous" => "이전",
-"Next" => "다음",
-"Mute" => "음소거",
-"Unmute" => "음소거 해제",
-"Rescan Collection" => "모음집 재검색",
-"Artist" => "음악가",
-"Album" => "앨범",
-"Title" => "제목"
-);
diff --git a/apps/media/l10n/lb.php b/apps/media/l10n/lb.php
deleted file mode 100644
index 4a2727fcb1..0000000000
--- a/apps/media/l10n/lb.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Music" => "Musek",
-"Play" => "Ofspillen",
-"Pause" => "Paus",
-"Previous" => "Zeréck",
-"Next" => "Weider",
-"Mute" => "Toun ausmaachen",
-"Unmute" => "Toun umaachen",
-"Rescan Collection" => "Kollektioun nei scannen",
-"Artist" => "Artist",
-"Album" => "Album",
-"Title" => "Titel"
-);
diff --git a/apps/media/l10n/lt_LT.php b/apps/media/l10n/lt_LT.php
deleted file mode 100644
index 1761ffdc3b..0000000000
--- a/apps/media/l10n/lt_LT.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Music" => "Muzika",
-"Play" => "Groti",
-"Pause" => "Pristabdyti",
-"Previous" => "Atgal",
-"Next" => "Kitas",
-"Mute" => "Nutildyti",
-"Unmute" => "Įjungti garsą",
-"Rescan Collection" => "Atnaujinti kolekciją",
-"Artist" => "Atlikėjas",
-"Album" => "Albumas",
-"Title" => "Pavadinimas"
-);
diff --git a/apps/media/l10n/mk.php b/apps/media/l10n/mk.php
deleted file mode 100644
index 17816be751..0000000000
--- a/apps/media/l10n/mk.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Music" => "Музика",
-"Play" => "Пушти",
-"Pause" => "Пауза",
-"Previous" => "Претходно",
-"Next" => "Следно",
-"Mute" => "Занеми",
-"Unmute" => "Пушти глас",
-"Rescan Collection" => "Рескенирај ја колекцијата",
-"Artist" => "Изведувач",
-"Album" => "Албум",
-"Title" => "Наслов"
-);
diff --git a/apps/media/l10n/ms_MY.php b/apps/media/l10n/ms_MY.php
deleted file mode 100644
index aaa1c3edfb..0000000000
--- a/apps/media/l10n/ms_MY.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Music" => "Muzik",
-"Play" => "Main",
-"Pause" => "Jeda",
-"Previous" => "Sebelum",
-"Next" => "Seterus",
-"Mute" => "Bisu",
-"Unmute" => "Nyahbisu",
-"Rescan Collection" => "Imbas semula koleksi",
-"Artist" => "Artis",
-"Album" => "Album",
-"Title" => "Judul"
-);
diff --git a/apps/media/l10n/nb_NO.php b/apps/media/l10n/nb_NO.php
deleted file mode 100644
index dbed1526b7..0000000000
--- a/apps/media/l10n/nb_NO.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Music" => "Musikk",
-"Play" => "Spill",
-"Pause" => "Pause",
-"Previous" => "Forrige",
-"Next" => "Neste",
-"Mute" => "Demp",
-"Unmute" => "Skru på lyd",
-"Rescan Collection" => "Skan samling på nytt",
-"Artist" => "Artist",
-"Album" => "Album",
-"Title" => "Tittel"
-);
diff --git a/apps/media/l10n/nl.php b/apps/media/l10n/nl.php
deleted file mode 100644
index 705bf2a613..0000000000
--- a/apps/media/l10n/nl.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Music" => "Muziek",
-"Play" => "Afspelen",
-"Pause" => "Pauzeer",
-"Previous" => "Vorige",
-"Next" => "Volgende",
-"Mute" => "Dempen",
-"Unmute" => "Dempen uit",
-"Rescan Collection" => "Collectie opnieuw scannen",
-"Artist" => "Artiest",
-"Album" => "Album",
-"Title" => "Titel"
-);
diff --git a/apps/media/l10n/nn_NO.php b/apps/media/l10n/nn_NO.php
deleted file mode 100644
index 2579c7b6ba..0000000000
--- a/apps/media/l10n/nn_NO.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Music" => "Musikk",
-"Play" => "Spel",
-"Pause" => "Pause",
-"Previous" => "Førre",
-"Next" => "Neste",
-"Mute" => "Demp",
-"Unmute" => "Skru på lyd",
-"Rescan Collection" => "Skann samlinga på nytt",
-"Artist" => "Artist",
-"Album" => "Album",
-"Title" => "Tittel"
-);
diff --git a/apps/media/l10n/pl.php b/apps/media/l10n/pl.php
deleted file mode 100644
index 15a1ceca6d..0000000000
--- a/apps/media/l10n/pl.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Music" => "Muzyka",
-"Play" => "Odtwarzaj",
-"Pause" => "Wstrzymaj",
-"Previous" => "Poprzedni",
-"Next" => "Następny",
-"Mute" => "Wycisz",
-"Unmute" => "Wyłącz wyciszenie",
-"Rescan Collection" => "Przeszukaj kolekcję",
-"Artist" => "Wykonawca",
-"Album" => "Album",
-"Title" => "Tytuł"
-);
diff --git a/apps/media/l10n/pt_BR.php b/apps/media/l10n/pt_BR.php
deleted file mode 100644
index 6a1289cfa8..0000000000
--- a/apps/media/l10n/pt_BR.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Music" => "Música",
-"Play" => "Tocar",
-"Pause" => "Pausa",
-"Previous" => "Anterior",
-"Next" => "Próximo",
-"Mute" => "Mudo",
-"Unmute" => "Não Mudo",
-"Rescan Collection" => "Atualizar a Coleção",
-"Artist" => "Artista",
-"Album" => "Álbum",
-"Title" => "Título"
-);
diff --git a/apps/media/l10n/pt_PT.php b/apps/media/l10n/pt_PT.php
deleted file mode 100644
index e143c74d45..0000000000
--- a/apps/media/l10n/pt_PT.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Music" => "Musica",
-"Play" => "Reproduzir",
-"Pause" => "Pausa",
-"Previous" => "Anterior",
-"Next" => "Próximo",
-"Mute" => "Mudo",
-"Unmute" => "Som",
-"Rescan Collection" => "Reverificar coleção",
-"Artist" => "Artista",
-"Album" => "Álbum",
-"Title" => "Título"
-);
diff --git a/apps/media/l10n/ro.php b/apps/media/l10n/ro.php
deleted file mode 100644
index e356b376ba..0000000000
--- a/apps/media/l10n/ro.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Music" => "Muzică",
-"Play" => "Redă",
-"Pause" => "Pauză",
-"Previous" => "Precedent",
-"Next" => "Următor",
-"Mute" => "Fără sonor",
-"Unmute" => "Cu sonor",
-"Rescan Collection" => "Rescanează colecția",
-"Artist" => "Artist",
-"Album" => "Album",
-"Title" => "Titlu"
-);
diff --git a/apps/media/l10n/ru.php b/apps/media/l10n/ru.php
deleted file mode 100644
index 5426332a1b..0000000000
--- a/apps/media/l10n/ru.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Music" => "Музыка",
-"Play" => "Проиграть",
-"Pause" => "Пауза",
-"Previous" => "Предыдущий",
-"Next" => "Следующий",
-"Mute" => "Отключить звук",
-"Unmute" => "Включить звук",
-"Rescan Collection" => "Пересканировать коллекцию",
-"Artist" => "Исполнитель",
-"Album" => "Альбом",
-"Title" => "Название"
-);
diff --git a/apps/media/l10n/sk_SK.php b/apps/media/l10n/sk_SK.php
deleted file mode 100644
index cf0b5319e9..0000000000
--- a/apps/media/l10n/sk_SK.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Music" => "Hudba",
-"Play" => "Prehrať",
-"Pause" => "Pauza",
-"Previous" => "Predchádzajúce",
-"Next" => "Ďalšie",
-"Mute" => "Stlmiť",
-"Unmute" => "Nahlas",
-"Rescan Collection" => "Znovu skenovať zbierku",
-"Artist" => "Umelec",
-"Album" => "Album",
-"Title" => "Názov"
-);
diff --git a/apps/media/l10n/sl.php b/apps/media/l10n/sl.php
deleted file mode 100644
index 38fc1f2a1e..0000000000
--- a/apps/media/l10n/sl.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Music" => "Glasba",
-"Play" => "Predvajaj",
-"Pause" => "Premor",
-"Previous" => "Prejšnja",
-"Next" => "Naslednja",
-"Mute" => "Utišaj",
-"Unmute" => "Povrni glasnost",
-"Rescan Collection" => "Ponovno preišči zbirko",
-"Artist" => "Izvajalec",
-"Album" => "Album",
-"Title" => "Naslov"
-);
diff --git a/apps/media/l10n/sr.php b/apps/media/l10n/sr.php
deleted file mode 100644
index dff0daf435..0000000000
--- a/apps/media/l10n/sr.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Music" => "Музика",
-"Play" => "Пусти",
-"Pause" => "Паузирај",
-"Previous" => "Претходна",
-"Next" => "Следећа",
-"Mute" => "Искључи звук",
-"Unmute" => "Укључи звук",
-"Rescan Collection" => "Поново претражи збирку",
-"Artist" => "Извођач",
-"Album" => "Албум",
-"Title" => "Наслов"
-);
diff --git a/apps/media/l10n/sr@latin.php b/apps/media/l10n/sr@latin.php
deleted file mode 100644
index 6476898387..0000000000
--- a/apps/media/l10n/sr@latin.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Music" => "Muzika",
-"Play" => "Pusti",
-"Pause" => "Pauziraj",
-"Previous" => "Prethodna",
-"Next" => "Sledeća",
-"Mute" => "Isključi zvuk",
-"Unmute" => "Uključi zvuk",
-"Rescan Collection" => "Ponovo pretraži zbirku",
-"Artist" => "Izvođač",
-"Album" => "Album",
-"Title" => "Naslov"
-);
diff --git a/apps/media/l10n/sv.php b/apps/media/l10n/sv.php
deleted file mode 100644
index 1cf5497e7e..0000000000
--- a/apps/media/l10n/sv.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Music" => "Musik",
-"Add album to playlist" => "Lägg till album till spellistan",
-"Play" => "Spela",
-"Pause" => "Paus",
-"Previous" => "Föregående",
-"Next" => "Nästa",
-"Mute" => "Ljudlös",
-"Unmute" => "Ljud på",
-"Rescan Collection" => "Sök igenom samlingen",
-"Artist" => "Artist",
-"Album" => "Album",
-"Title" => "Titel"
-);
diff --git a/apps/media/l10n/th_TH.php b/apps/media/l10n/th_TH.php
deleted file mode 100644
index dc448b3268..0000000000
--- a/apps/media/l10n/th_TH.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Music" => "เพลง",
-"Play" => "เล่น",
-"Pause" => "หยุดชั่วคราว",
-"Previous" => "ก่อนหน้า",
-"Next" => "ถัดไป",
-"Mute" => "ปิดเสียง",
-"Unmute" => "เปิดเสียง",
-"Rescan Collection" => "ตรวจสอบไฟล์ที่เก็บไว้อีกครั้ง",
-"Artist" => "ศิลปิน",
-"Album" => "อัลบั้ม",
-"Title" => "ชื่อ"
-);
diff --git a/apps/media/l10n/tr.php b/apps/media/l10n/tr.php
deleted file mode 100644
index 1eaf98145a..0000000000
--- a/apps/media/l10n/tr.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Music" => "Müzik",
-"Play" => "Oynat",
-"Pause" => "Beklet",
-"Previous" => "Önceki",
-"Next" => "Sonraki",
-"Mute" => "Sesi kapat",
-"Unmute" => "Sesi aç",
-"Rescan Collection" => "Koleksiyonu Tara",
-"Artist" => "Sanatç",
-"Album" => "Albüm",
-"Title" => "Başlık"
-);
diff --git a/apps/media/l10n/uk.php b/apps/media/l10n/uk.php
deleted file mode 100644
index 4ac7abbf2b..0000000000
--- a/apps/media/l10n/uk.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Music" => "Музика",
-"Add album to playlist" => "Додати альбом до плейлиста",
-"Play" => "Грати",
-"Pause" => "Пауза",
-"Previous" => "Попередній",
-"Next" => "Наступний",
-"Mute" => "Звук вкл.",
-"Unmute" => "Звук викл.",
-"Rescan Collection" => "Повторне сканування колекції",
-"Artist" => "Виконавець",
-"Album" => "Альбом",
-"Title" => "Заголовок"
-);
diff --git a/apps/media/l10n/vi.php b/apps/media/l10n/vi.php
deleted file mode 100644
index 01942ba173..0000000000
--- a/apps/media/l10n/vi.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Music" => "Âm nhạc",
-"Add album to playlist" => "Thêm album vào playlist",
-"Play" => "Play",
-"Pause" => "Tạm dừng",
-"Previous" => "Trang trước",
-"Next" => "Tiếp theo",
-"Mute" => "Tắt",
-"Unmute" => "Bật",
-"Rescan Collection" => "Quét lại bộ sưu tập",
-"Artist" => "Nghệ sỹ",
-"Album" => "Album",
-"Title" => "Tiêu đề"
-);
diff --git a/apps/media/l10n/xgettextfiles b/apps/media/l10n/xgettextfiles
deleted file mode 100644
index 39a310a453..0000000000
--- a/apps/media/l10n/xgettextfiles
+++ /dev/null
@@ -1,6 +0,0 @@
-../appinfo/app.php
-../templates/music.php
-../js/scanner.js
-../js/collection.js
-../js/music.js
-../js/playlist.js
diff --git a/apps/media/l10n/zh_CN.GB2312.php b/apps/media/l10n/zh_CN.GB2312.php
deleted file mode 100644
index de7e98acd9..0000000000
--- a/apps/media/l10n/zh_CN.GB2312.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Music" => "音乐",
-"Add album to playlist" => "添加专辑到播放列表",
-"Play" => "播放",
-"Pause" => "暂停",
-"Previous" => "前面的",
-"Next" => "下一个",
-"Mute" => "静音",
-"Unmute" => "取消静音",
-"Rescan Collection" => "重新扫描收藏",
-"Artist" => "艺术家",
-"Album" => "专辑",
-"Title" => "标题"
-);
diff --git a/apps/media/l10n/zh_CN.php b/apps/media/l10n/zh_CN.php
deleted file mode 100644
index 0b24cf3fe0..0000000000
--- a/apps/media/l10n/zh_CN.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Music" => "音乐",
-"Play" => "播放",
-"Pause" => "暂停",
-"Previous" => "前一首",
-"Next" => "后一首",
-"Mute" => "静音",
-"Unmute" => "取消静音",
-"Rescan Collection" => "重新扫描收藏",
-"Artist" => "艺术家",
-"Album" => "专辑",
-"Title" => "标题"
-);
diff --git a/apps/media/l10n/zh_TW.php b/apps/media/l10n/zh_TW.php
deleted file mode 100644
index cd90300bb4..0000000000
--- a/apps/media/l10n/zh_TW.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Music" => "音樂",
-"Play" => "播放",
-"Pause" => "暫停",
-"Previous" => "上一首",
-"Next" => "下一首",
-"Mute" => "靜音",
-"Unmute" => "取消靜音",
-"Rescan Collection" => "重新掃描收藏",
-"Artist" => "藝人",
-"Album" => "專輯",
-"Title" => "標題"
-);
diff --git a/apps/media/lib/share/album.php b/apps/media/lib/share/album.php
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/apps/media/lib/share/artist.php b/apps/media/lib/share/artist.php
deleted file mode 100644
index d08a53da2a..0000000000
--- a/apps/media/lib/share/artist.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-/**
-* ownCloud
-*
-* @author Michael Gapczynski
-* @copyright 2012 Michael Gapczynski mtgap@owncloud.com
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either
-* version 3 of the License, or any later version.
-*
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-*
-* You should have received a copy of the GNU Affero General Public
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-class OC_Share_Backend_Artist extends OCP\Share_Backend {
-
-	public function getSource($item, $uid) {
-		$query = OCP\DB::prepare('SELECT `artist_id` FROM `*PREFIX*media_artists` WHERE `artist_id` = ? AND `song_user` = ?');
-		$result = $query->execute(array($item, $uid))->fetchRow();
-		if (is_array($result)) {
-			return array('item' => $item, 'file' => $result['song_path']);
-		}
-		return false;
-	}
-
-	public function generateTarget($item, $uid, $exclude = null) {
-		// TODO Make sure target path doesn't exist already
-		return '/Shared'.$item;
-	}
-
-	public function formatItems($items, $format) {
-		$ids = array();
-		foreach ($items as $id => $info) {
-			$ids[] = $id;
-		}
-		$ids = "'".implode("','", $ids)."'";
-		switch ($format) {
-			case self::FORMAT_SOURCE_PATH:
-				$query = OCP\DB::prepare('SELECT `path` FROM `*PREFIX*fscache` WHERE `id` IN ('.$ids.')');
-				return $query->execute()->fetchAll();
-			case self::FORMAT_FILE_APP:
-				$query = OCP\DB::prepare('SELECT `id`, `path`, `name`, `ctime`, `mtime`, `mimetype`, `size`, `encrypted`, `versioned`, `writable` FROM `*PREFIX*fscache` WHERE `id` IN ('.$ids.')');
-				$result = $query->execute();
-				$files = array();
-				while ($file = $result->fetchRow()) {
-					// Set target path
-					$file['path'] = $items[$file['id']]['item_target'];
-					$file['name'] = basename($file['path']);
-					// TODO Set permissions: $file['writable']
-					$files[] = $file;
-				}
-				return $files;
-		}
-	}
-
-}
-
-?>
\ No newline at end of file
diff --git a/apps/media/lib/share/song.php b/apps/media/lib/share/song.php
deleted file mode 100644
index 6594858173..0000000000
--- a/apps/media/lib/share/song.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-/**
-* ownCloud
-*
-* @author Michael Gapczynski
-* @copyright 2012 Michael Gapczynski mtgap@owncloud.com
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either
-* version 3 of the License, or any later version.
-*
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-*
-* You should have received a copy of the GNU Affero General Public
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-class OC_Share_Backend_Song extends OCP\Share_Backend {
-
-	public function getSource($item, $uid) {
-		$query = OCP\DB::prepare('SELECT `song_path` FROM `*PREFIX*media_songs` WHERE `song_id` = ? AND `song_user` = ?');
-		$result = $query->execute(array($item, $uid))->fetchRow();
-		if (is_array($result)) {
-			return array('item' => $item, 'file' => $result['song_path']);
-		}
-		return false;
-	}
-
-	public function generateTarget($item, $uid, $exclude = null) {
-		// TODO Make sure target path doesn't exist already
-		return '/Shared'.$item;
-	}
-
-	public function formatItems($items, $format) {
-		$ids = array();
-		foreach ($items as $id => $info) {
-			$ids[] = $id;
-		}
-		$ids = "'".implode("','", $ids)."'";
-		switch ($format) {
-			case self::FORMAT_SOURCE_PATH:
-				$query = OCP\DB::prepare('SELECT `path` FROM `*PREFIX*fscache` WHERE `id` IN ('.$ids.')');
-				return $query->execute()->fetchAll();
-			case self::FORMAT_FILE_APP:
-				$query = OCP\DB::prepare('SELECT `id`, `path`, `name`, `ctime`, `mtime`, `mimetype`, `size`, `encrypted`, `versioned`, `writable` FROM `*PREFIX*fscache` WHERE `id` IN ('.$ids.')');
-				$result = $query->execute();
-				$files = array();
-				while ($file = $result->fetchRow()) {
-					// Set target path
-					$file['path'] = $items[$file['id']]['item_target'];
-					$file['name'] = basename($file['path']);
-					// TODO Set permissions: $file['writable']
-					$files[] = $file;
-				}
-				return $files;
-		}
-	}
-
-}
-
-?>
\ No newline at end of file
diff --git a/apps/media/lib_ampache.php b/apps/media/lib_ampache.php
deleted file mode 100644
index 807d94bcde..0000000000
--- a/apps/media/lib_ampache.php
+++ /dev/null
@@ -1,421 +0,0 @@
-<?php
-
-/**
-* ownCloud - media plugin
-*
-* @author Robin Appelman
-* @copyright 2010 Robin Appelman icewind1991@gmail.com
-* 
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either 
-* version 3 of the License, or any later version.
-* 
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-*  
-* You should have received a copy of the GNU Lesser General Public 
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-* 
-*/
-
-//implementation of ampache's xml api
-class OC_MEDIA_AMPACHE{
-	
-	/**
-	* fix the string to be XML compatible
-	* @param string name
-	* @return string
-	*/
-	
-	/* this is an ugly hack(tm), this should be: */
-	/* htmlentities($name, ENT_XML1, 'UTF-8');   */
-	/* with PHP 5.4 and later		     */
-	public static function fixXmlString($name){
-	       $result=str_replace("&", "&amp;", $name);
-	       $result=str_replace("'", "&apos;", $result);
-	       $result=str_replace("<", "&lt;", $result);
-	       $result=str_replace(">", "&gt;", $result);
-	       $result=str_replace("\"", "&quot;", $result);
-       	       $result=str_replace("Ä", "&#196;", $result);
-       	       $result=str_replace("Ö", "&#214;", $result);
-       	       $result=str_replace("Ü", "&#220;", $result);
-       	       $result=str_replace("ä", "&#228;", $result);
-       	       $result=str_replace("ö", "&#246;", $result);
-       	       $result=str_replace("ü", "&#252;", $result);
-       	       $result=str_replace("ß", "&#223;", $result);
-	       return $result;
-	}
-	
-	/**
-	* do the initial handshake
-	* @param array params
-	*/
-	public static function handshake($params){
-		$auth=(isset($params['auth']))?$params['auth']:false;
-		$user=(isset($params['user']))?$params['user']:false;
-		$time=(isset($params['timestamp']))?$params['timestamp']:false;
-		$now=time();
-		if($now-$time>(10*60)){
-			echo('<?xml version="1.0" encoding="UTF-8"?>');
-			echo("<root>
-	<error code='400'>timestamp is more then 10 minutes old</error>
-</root>");
-		}
-		if($auth and $user and $time){
-			$query=OCP\DB::prepare("SELECT `user_id`, `user_password_sha256` FROM `*PREFIX*media_users` WHERE `user_id`=?");
-			$users=$query->execute(array($user))->fetchAll();
-			if(count($users)>0){
-				$pass=$users[0]['user_password_sha256'];
-				$key=hash('sha256',$time.$pass);
-				if($key==$auth){
-					$token=hash('sha256','oc_media_'.$key);
-					OC_MEDIA_COLLECTION::$uid=$users[0]['user_id'];
-					$date=date('c');//todo proper update/add/clean dates
-					$songs=OC_MEDIA_COLLECTION::getSongCount();
-					$artists=OC_MEDIA_COLLECTION::getArtistCount();
-					$albums=OC_MEDIA_COLLECTION::getAlbumCount();
-					$query=OCP\DB::prepare("INSERT INTO `*PREFIX*media_sessions` (`token`, `user_id`, `start`) VALUES (?, ?, now());");
-					$query->execute(array($token,$user));
-					$expire=date('c',time()+600);
-					echo('<?xml version="1.0" encoding="UTF-8"?>');
-					echo("<root>
-	<auth>$token</auth>
-	<version>350001</version>
-	<update>$date</update>
-	<add>$date</add>
-	<clean>$date</clean>
-	<songs>$songs</songs>
-	<artists>$artists</artists>
-	<albums>$albums</albums>\
-	<session_length>600</session_length>
-	<session_expire>$expire</session_expire>
-	<tags>0</tags>
-	<videos>0</videos>
-</root>");
-					return;
-				}
-			}
-			echo('<?xml version="1.0" encoding="UTF-8"?>');
-			echo("<root>
-	<error code='400'>Invalid login</error>
-</root>");
-		}else{
-			echo('<?xml version="1.0" encoding="UTF-8"?>');
-			echo("<root>
-	<error code='400'>Missing arguments</error>
-</root>");
-		}
-	}
-	
-	public static function ping($params){
-		if(isset($params['auth'])){
-			if(self::checkAuth($params['auth'])){
-				self::updateAuth($params['auth']);
-			}else{
-				echo('<?xml version="1.0" encoding="UTF-8"?>');
-				echo("<root>
-	<error code='400'>Invalid login</error>
-</root>");
-				return;
-			}
-		}
-		echo('<?xml version="1.0" encoding="UTF-8"?>');
-		echo('<root>');
-		echo('<version>350001</version>');
-		echo('</root>');
-	}
-	
-	public static function checkAuth($auth){
-		if(is_array($auth)){
-			if(isset($auth['auth'])){
-				$auth=$auth['auth'];
-			}else{
-				return false;
-			}
-		}
-		$CONFIG_DBTYPE = OCP\Config::getSystemValue( "dbtype", "sqlite" );
-		if($CONFIG_DBTYPE == 'psql'){
-			$interval = ' \'600s\'::interval ';
-		}else {
-			$interval = '600';
-		}
-		//remove old sessions
-		$query=OCP\DB::prepare("DELETE FROM `*PREFIX*media_sessions` WHERE `start`<(NOW() - ".$interval.")");
-		$query->execute();
-		
-		$query=OCP\DB::prepare("SELECT `user_id` FROM `*PREFIX*media_sessions` WHERE `token`=?");
-		$users=$query->execute(array($auth))->fetchAll();
-		if(count($users)>0){
-			OC_MEDIA_COLLECTION::$uid=$users[0]['user_id'];
-			OC_User::setUserId($users[0]['user_id']);
-			return $users[0]['user_id'];
-		}else{
-			return false;
-		}
-	}
-	
-	public static function updateAuth($auth){
-		$query=OCP\DB::prepare("UPDATE `*PREFIX*media_sessions` SET `start`=CURRENT_TIMESTAMP WHERE `token`=?");
-		$query->execute(array($auth));
-	}
-	
-	private static function printArtist($artist){
-		$albums=count(OC_MEDIA_COLLECTION::getAlbums($artist['artist_id']));
-		$songs=count(OC_MEDIA_COLLECTION::getSongs($artist['artist_id']));
-		$id=$artist['artist_id'];
-		$name=self::fixXmlString($artist['artist_name']);
-		echo("\t<artist id='$id'>\n");
-		echo("\t\t<name>$name</name>\n");
-		echo("\t\t<albums>$albums</albums>\n");
-		echo("\t\t<songs>$songs</songs>\n");
-		echo("\t\t<rating>0</rating>\n");
-		echo("\t\t<preciserating>0</preciserating>\n");
-		echo("\t</artist>\n");
-	}
-	
-	private static function printAlbum($album,$artistName=false){
-		if(!$artistName){
-			$artistName=OC_MEDIA_COLLECTION::getArtistName($album['album_artist']);
-		}
-		$artistName=self::fixXmlString($artistName);
-		$songs=count(OC_MEDIA_COLLECTION::getSongs($album['album_artist'],$album['album_id']));
-		$id=$album['album_id'];
-		$name=self::fixXmlString($album['album_name']);
-		$artist=$album['album_artist'];
-		echo("\t<album id='$id'>\n");
-		echo("\t\t<name>$name</name>\n");
-		echo("\t\t<artist id='$artist'>$artistName</artist>\n");
-		echo("\t\t<tracks>$songs</tracks>\n");
-		echo("\t\t<rating>0</rating>\n");
-		echo("\t\t<year>0</year>\n"); /* make Viridian happy */
-		echo("\t\t<disk>1</disk>\n"); /* make Viridian happy */
-		echo("\t\t<art> </art>\n"); /* single space to make quickplay happy enough */
-		echo("\t\t<preciserating>0</preciserating>\n");
-		echo("\t</album>\n");
-	}
-	
-	private static function printSong($song,$artistName=false,$albumName=false){
-		if(!$artistName){
-			$artistName=OC_MEDIA_COLLECTION::getArtistName($song['song_artist']);
-		}
-		if(!$albumName){
-			$albumName=OC_MEDIA_COLLECTION::getAlbumName($song['song_album']);
-		}
-		$artistName=self::fixXmlString($artistName);
-		$albumName=self::fixXmlString($albumName);
-		$id=$song['song_id'];
-		$name=self::fixXmlString($song['song_name']);
-		$artist=$song['song_artist'];
-		$album=$song['song_album'];
-		echo("\t<song id='$id'>\n");
-		echo("\t\t<title>$name</title>\n");
-		echo("\t\t<artist id='$artist'>$artistName</artist>\n");
-		echo("\t\t<album id='$album'>$albumName</album>\n");
-		$url=OCP\Util::linkToRemote('ampache')."server/xml.server.php/?action=play&song=$id&auth={$_GET['auth']}";
-		$url=self::fixXmlString($url);
-		echo("\t\t<url>$url</url>\n");
-		echo("\t\t<time>{$song['song_length']}</time>\n");
-		echo("\t\t<track>{$song['song_track']}</track>\n");
-		echo("\t\t<size>{$song['song_size']}</size>\n");
-		echo("\t\t<art> </art>\n"); /* single space to make Viridian happy enough */
-		echo("\t\t<rating>0</rating>\n");
-		echo("\t\t<preciserating>0</preciserating>\n");
-		echo("\t</song>\n");
-	}
-	
-	public static function artists($params){
-		if(!self::checkAuth($params)){
-			echo('<?xml version="1.0" encoding="UTF-8"?>');
-			echo("<root>
-	<error code='400'>Invalid login</error>
-</root>");
-			return;
-		}
-		$filter=isset($params['filter'])?$params['filter']:'';
-		$exact=isset($params['exact'])?($params['exact']=='true'):false;
-		$artists=OC_MEDIA_COLLECTION::getArtists($filter,$exact);
-		echo('<?xml version="1.0" encoding="UTF-8"?>');
-		echo('<root>');
-		foreach($artists as $artist){
-			self::printArtist($artist);
-		}
-		echo('</root>');
-	}
-	
-	public static function artist_songs($params){
-		if(!self::checkAuth($params)){
-			echo('<?xml version="1.0" encoding="UTF-8"?>');
-			echo("<root>
-	<error code='400'>Invalid login</error>
-</root>");
-			return;
-		}
-		$filter=isset($params['filter'])?$params['filter']:'';
-		$songs=OC_MEDIA_COLLECTION::getSongs($filter);
-		$artist=OC_MEDIA_COLLECTION::getArtistName($filter);
-		echo('<?xml version="1.0" encoding="UTF-8"?>');
-		echo('<root>');
-		foreach($songs as $song){
-			self::printSong($song,$artist);
-		}
-		echo('</root>');
-	}
-	
-	public static function artist_albums($params){
-		if(!self::checkAuth($params)){
-			echo('<?xml version="1.0" encoding="UTF-8"?>');
-			echo("<root>
-	<error code='400'>Invalid login</error>
-</root>");
-			return;
-		}
-		$filter = isset($params['filter']) ? $params['filter'] : '';
-		$albums=OC_MEDIA_COLLECTION::getAlbums($filter);
-		$artist=OC_MEDIA_COLLECTION::getArtistName($filter);
-		echo('<?xml version="1.0" encoding="UTF-8"?>');
-		echo('<root>');
-		foreach($albums as $album){
-			self::printAlbum($album,$artist);
-		}
-		echo('</root>');
-	}
-	
-	public static function albums($params){
-		if(!self::checkAuth($params)){
-			echo('<?xml version="1.0" encoding="UTF-8"?>');
-			echo("<root>
-	<error code='400'>Invalid login</error>
-</root>");
-			return;
-		}
-		$filter=isset($params['filter'])?$params['filter']:'';
-		$exact=isset($params['exact'])?($params['exact']=='true'):false;
-		$albums=OC_MEDIA_COLLECTION::getAlbums(0,$filter,$exact);
-		echo('<?xml version="1.0" encoding="UTF-8"?>');	
-		echo('<root>');
-		foreach($albums as $album){
-			self::printAlbum($album,false);
-		}
-		echo('</root>');
-	}
-	
-	public static function album_songs($params){
-		if(!self::checkAuth($params)){
-			echo('<?xml version="1.0" encoding="UTF-8"?>');
-			echo("<root>
-	<error code='400'>Invalid login</error>
-</root>");
-			return;
-		}
-		$songs=OC_MEDIA_COLLECTION::getSongs(0,$params['filter']);
-		if(count($songs)>0){
-			$artist=OC_MEDIA_COLLECTION::getArtistName($songs[0]['song_artist']);
-		}
-		echo('<?xml version="1.0" encoding="UTF-8"?>');
-		echo('<root>');
-		foreach($songs as $song){
-			self::printSong($song,$artist);
-		}
-		echo('</root>');
-	}
-	
-	public static function songs($params){
-		if(!self::checkAuth($params)){
-			echo('<?xml version="1.0" encoding="UTF-8"?>');
-			echo("<root>
-	<error code='400'>Invalid login</error>
-</root>");
-			return;
-		}
-		$filter=isset($params['filter'])?$params['filter']:'';
-		$exact=isset($params['exact'])?($params['exact']=='true'):false;
-		$songs=OC_MEDIA_COLLECTION::getSongs(0,0,$filter,$exact);
-		echo('<?xml version="1.0" encoding="UTF-8"?>');
-		echo('<root>');
-		foreach($songs as $song){
-			self::printSong($song);
-		}
-		echo('</root>');
-	}
-	
-	public static function song($params){
-		if(!self::checkAuth($params)){
-			echo('<?xml version="1.0" encoding="UTF-8"?>');
-			echo("<root>
-	<error code='400'>Invalid login</error>
-</root>");
-			return;
-		}
-		if($song=OC_MEDIA_COLLECTION::getSong($params['filter'])){
-			echo('<?xml version="1.0" encoding="UTF-8"?>');
-			echo('<root>');
-			self::printSong($song);
-			echo('</root>');
-		}
-	}
-	
-	public static function play($params){
-		$username=!self::checkAuth($params);
-		if($username){
-			echo('<?xml version="1.0" encoding="UTF-8"?>');
-			echo("<root>
-	<error code='400'>Invalid login</error>
-</root>");
-			return;
-		}
-		if($song=OC_MEDIA_COLLECTION::getSong($params['song'])){
-			OC_Util::setupFS($song["song_user"]);
-
-			header('Content-type: '.OC_Filesystem::getMimeType($song['song_path']));
-			header('Content-Length: '.$song['song_size']);
-			OC_Filesystem::readfile($song['song_path']);
-		}
-	}
-	
-	public static function url_to_song($params){
-		if(!self::checkAuth($params)){
-			echo('<?xml version="1.0" encoding="UTF-8"?>');
-			echo("<root>
-	<error code='400'>Invalid login</error>
-</root>");
-			return;
-		}
-		$url=$params['url'];
-		$songId=substr($url,strrpos($url,'song=')+5);
-		if($song=OC_MEDIA_COLLECTION::getSong($songId)){
-			echo('<?xml version="1.0" encoding="UTF-8"?>');
-			echo('<root>');
-			self::printSong($song);
-			echo('</root>');
-		}
-	}
-	
-	public static function search_songs($params){
-		if(!self::checkAuth($params)){
-			echo('<?xml version="1.0" encoding="UTF-8"?>');
-			echo("<root>
-	<error code='400'>Invalid login</error>
-</root>");
-			return;
-		}
-		$filter = isset($params['filter']) ? $params['filter'] : '';
-		$artists=OC_MEDIA_COLLECTION::getArtists($filter);
-		$albums=OC_MEDIA_COLLECTION::getAlbums(0,$filter);
-		$songs=OC_MEDIA_COLLECTION::getSongs(0,0,$filter);
-		foreach($artists as $artist){
-			$songs=array_merge($songs,OC_MEDIA_COLLECTION::getSongs($artist['artist_id']));
-		}
-		foreach($albums as $album){
-			$songs=array_merge($songs,OC_MEDIA_COLLECTION::getSongs($album['album_artist'],$album['album_id']));
-		}
-		echo('<?xml version="1.0" encoding="UTF-8"?>');
-		echo('<root>');
-		foreach($songs as $song){
-			self::printSong($song);
-		}
-		echo('</root>');
-	}
-}
diff --git a/apps/media/lib_collection.php b/apps/media/lib_collection.php
deleted file mode 100644
index c7265caaec..0000000000
--- a/apps/media/lib_collection.php
+++ /dev/null
@@ -1,388 +0,0 @@
-<?php
-
-/**
-* ownCloud - media plugin
-*
-* @author Robin Appelman
-* @copyright 2010 Robin Appelman icewind1991@gmail.com
-* 
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either 
-* version 3 of the License, or any later version.
-* 
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-*  
-* You should have received a copy of the GNU Lesser General Public 
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-* 
-*/
-
-
-//class for managing a music collection
-class OC_MEDIA_COLLECTION{
-	public static $uid;
-	private static $artistIdCache=array();
-	private static $albumIdCache=array();
-	private static $queries=array();
-	
-	/**
-	* get the id of an artist (case-insensitive)
-	* @param string name
-	* @return int
-	*/
-	public static function getArtistId($name){
-		if(empty($name)){
-			return 0;
-		}
-		$name=strtolower($name);
-		if(isset(self::$artistIdCache[$name])){
-			return self::$artistIdCache[$name];
-		}else{
-			$query=OCP\DB::prepare("SELECT `artist_id` FROM `*PREFIX*media_artists` WHERE lower(`artist_name`) LIKE ?");
-			$artists=$query->execute(array($name))->fetchAll();
-			if(is_array($artists) and isset($artists[0])){
-				self::$artistIdCache[$name]=$artists[0]['artist_id'];
-				return $artists[0]['artist_id'];
-			}else{
-				return 0;
-			}
-		}
-	}
-
-	/**
-	* get the id of an album (case-insensitive)
-	* @param string name
-	* @param int artistId
-	* @return int
-	*/
-	public static function getAlbumId($name,$artistId){
-		if(empty($name)){
-			return 0;
-		}
-		$name=strtolower($name);
-		if(!isset(self::$albumIdCache[$artistId])){
-			self::$albumIdCache[$artistId]=array();
-		}
-		if(isset(self::$albumIdCache[$artistId][$name])){
-			return self::$albumIdCache[$artistId][$name];
-		}else{
-			$query=OCP\DB::prepare("SELECT `album_id` FROM `*PREFIX*media_albums` WHERE lower(`album_name`) LIKE ? AND `album_artist`=?");
-			$albums=$query->execute(array($name,$artistId))->fetchAll();
-			if(is_array($albums) and isset($albums[0])){
-				self::$albumIdCache[$artistId][$name]=$albums[0]['album_id'];
-				return $albums[0]['album_id'];
-			}else{
-				return 0;
-			}
-		}
-	}
-
-	/**
-	* get the id of an song (case-insensitive)
-	* @param string name
-	* @param int artistId
-	* @param int albumId
-	* @return int
-	*/
-	public static function getSongId($name,$artistId,$albumId){
-		if(empty($name)){
-			return 0;
-		}
-		$name=strtolower($name);
-		if(!isset(self::$albumIdCache[$artistId])){
-			self::$albumIdCache[$artistId]=array();
-		}
-		if(!isset(self::$albumIdCache[$artistId][$albumId])){
-			self::$albumIdCache[$artistId][$albumId]=array();
-		}
-		if(isset(self::$albumIdCache[$artistId][$albumId][$name])){
-			return self::$albumIdCache[$artistId][$albumId][$name];
-		}else{
-			$uid=$_SESSION['user_id'];
-			$query=OCP\DB::prepare("SELECT `song_id` FROM `*PREFIX*media_songs` WHERE `song_user`=? AND lower(`song_name`) LIKE ? AND `song_artist`=? AND `song_album`=?");
-			$songs=$query->execute(array($uid,$name,$artistId,$albumId))->fetchAll();
-			if(is_array($songs) and isset($songs[0])){
-				self::$albumIdCache[$artistId][$albumId][$name]=$songs[0]['song_id'];
-				return $songs[0]['song_id'];
-			}else{
-				return 0;
-			}
-		}
-	}
-	
-	/**
-	* Get the list of artists that (optionally) match a search string
-	* @param string search optional
-	* @return array the list of artists found
-	*/
-	static public function getArtists($search='%',$exact=false){
-		$uid=self::$uid;
-		if(empty($uid)){
-			$uid=self::$uid=$_SESSION['user_id'];
-		}
-		if(!$exact and $search!='%'){
-			$search="%$search%";
-		}elseif($search==''){
-			$search='%';
-		}
-		$query=OCP\DB::prepare("SELECT DISTINCT `artist_name`, `artist_id` FROM `*PREFIX*media_artists`
-			INNER JOIN `*PREFIX*media_songs` ON `artist_id`=`song_artist` WHERE `artist_name` LIKE ? AND `song_user`=? ORDER BY `artist_name`");
-		$result=$query->execute(array($search,self::$uid));
-		return $result->fetchAll();
-	}
-	
-	/**
-	* Add an artists to the database
-	* @param string name
-	* @return integer the artist_id of the added artist
-	*/
-	static public function addArtist($name){
-		$name=trim($name);
-		if($name==''){
-			return 0;
-		}
-		//check if the artist is already in the database
-		$artistId=self::getArtistId($name);
-		if($artistId!=0){
-			return $artistId;
-		}else{
-			$query=OCP\DB::prepare("INSERT INTO `*PREFIX*media_artists` (`artist_name`) VALUES (?)");
-			$query->execute(array($name));
-			return self::getArtistId($name);;
-		}
-	}
-	
-	/**
-	* Get the list of albums that (optionally) match an artist and/or search string
-	* @param integer artist optional
-	* @param string search optional
-	* @return array the list of albums found
-	*/
-	static public function getAlbums($artist=0,$search='%',$exact=false){
-		$uid=self::$uid;
-		if(empty($uid)){
-			$uid=self::$uid=$_SESSION['user_id'];
-		}
-		$cmd="SELECT DISTINCT `album_name`, `album_artist`, `album_id`
-			FROM `*PREFIX*media_albums` INNER JOIN `*PREFIX*media_songs` ON `album_id`=`song_album` WHERE `song_user`=? ";
-		$params=array(self::$uid);
-		if($artist!=0){
-			$cmd.="AND `album_artist` = ? ";
-			array_push($params,$artist);
-		}
-		if($search!='%'){
-			$cmd.="AND `album_name` LIKE ? ";
-			if(!$exact){
-				$search="%$search%";
-			}
-			array_push($params,$search);
-		}
-		$cmd.=' ORDER BY `album_name`';
-		$query=OCP\DB::prepare($cmd);
-		return $query->execute($params)->fetchAll();
-	}
-	
-	/**
-	* Add an album to the database
-	* @param string name
-	* @param integer artist
-	* @return integer the album_id of the added artist
-	*/
-	static public function addAlbum($name,$artist){
-		$name=trim($name);
-		if($name==''){
-			return 0;
-		}
-		//check if the album is already in the database
-		$albumId=self::getAlbumId($name,$artist);
-		if($albumId!=0){
-			return $albumId;
-		}else{
-			$query=OCP\DB::prepare("INSERT INTO  `*PREFIX*media_albums` (`album_name` ,`album_artist`) VALUES ( ?, ?)");
-			$query->execute(array($name,$artist));
-			return self::getAlbumId($name,$artist);
-		}
-	}
-	
-	/**
-	* Get the list of songs that (optionally) match an artist and/or album and/or search string
-	* @param integer artist optional
-	* @param integer album optional
-	* @param string search optional
-	* @return array the list of songs found
-	*/
-	static public function getSongs($artist=0,$album=0,$search='',$exact=false){
-		$uid=self::$uid;
-		if(empty($uid)){
-			$uid=self::$uid=$_SESSION['user_id'];
-		}
-		$params=array($uid);
-		if($artist!=0){
-			$artistString="AND `song_artist` = ?";
-			array_push($params,$artist);
-		}else{
-			$artistString='';
-		}
-		if($album!=0){
-			$albumString="AND `song_album` = ?";
-			array_push($params,$album);
-		}else{
-			$albumString='';
-		}
-		if($search){
-			if(!$exact){
-				$search="%$search%";
-			}
-			$searchString ="AND `song_name` LIKE ?";
-			array_push($params,$search);
-		}else{
-			$searchString='';
-		}
-		$query=OCP\DB::prepare("SELECT * FROM `*PREFIX*media_songs` WHERE `song_user`=? $artistString $albumString $searchString ORDER BY `song_track`, `song_name`, `song_path`");
-		return $query->execute($params)->fetchAll();
-	}
-	
-	/**
-	* Add an song to the database
-	* @param string name
-	* @param string path
-	* @param integer artist
-	* @param integer album
-	* @return integer the song_id of the added artist
-	*/
-	static public function addSong($name,$path,$artist,$album,$length,$track,$size){
-		$name=trim($name);
-		$path=trim($path);
-		if($name=='' or $path==''){
-			return 0;
-		}
-		$uid=OCP\USER::getUser();
-		//check if the song is already in the database
-		$songId=self::getSongId($name,$artist,$album);
-		if($songId!=0){
-			$songInfo=self::getSong($songId);
-			self::moveSong($songInfo['song_path'],$path);
-			return $songId;
-		}else{
-			if(!isset(self::$queries['addsong'])){
-				$query=OCP\DB::prepare("INSERT INTO  `*PREFIX*media_songs` (`song_name` ,`song_artist` ,`song_album` ,`song_path` ,`song_user`,`song_length`,`song_track`,`song_size`,`song_playcount`,`song_lastplayed`)
-				VALUES (?, ?, ?, ?,?,?,?,?,0,0)");
-				self::$queries['addsong']=$query;
-			}else{
-				$query=self::$queries['addsong'];
-			}
-			$query->execute(array($name,$artist,$album,$path,$uid,$length,$track,$size));
-			$songId=OCP\DB::insertid('*PREFIX*media_songs_song');
-// 			self::setLastUpdated();
-			return self::getSongId($name,$artist,$album);
-		}
-	}
-	
-	public static function getSongCount(){
-		$query=OCP\DB::prepare("SELECT COUNT(`song_id`) AS `count` FROM `*PREFIX*media_songs`");
-		$result=$query->execute()->fetchAll();
-		return $result[0]['count'];
-	}
-	
-	public static function getArtistCount(){
-		$query=OCP\DB::prepare("SELECT COUNT(`artist_id`) AS `count` FROM `*PREFIX*media_artists`");
-		$result=$query->execute()->fetchAll();
-		return $result[0]['count'];
-	}
-	
-	public static function getAlbumCount(){
-		$query=OCP\DB::prepare("SELECT COUNT(`album_id`) AS `count` FROM `*PREFIX*media_albums`");
-		$result=$query->execute()->fetchAll();
-		return $result[0]['count'];
-	}
-	
-	public static function getArtistName($artistId){
-		$query=OCP\DB::prepare("SELECT `artist_name` FROM `*PREFIX*media_artists` WHERE `artist_id`=?");
-		$artist=$query->execute(array($artistId))->fetchAll();
-		if(count($artist)>0){
-			return $artist[0]['artist_name'];
-		}else{
-			return '';
-		}
-	}
-	
-	public static function getAlbumName($albumId){
-		$query=OCP\DB::prepare("SELECT `album_name` FROM `*PREFIX*media_albums` WHERE `album_id`=?");
-		$album=$query->execute(array($albumId))->fetchAll();
-		if(count($album)>0){
-			return $album[0]['album_name'];
-		}else{
-			return '';
-		}
-	}
-	
-	public static function getSong($id){
-		$query=OCP\DB::prepare("SELECT * FROM `*PREFIX*media_songs` WHERE `song_id`=?");
-		$song=$query->execute(array($id))->fetchAll();
-		if(count($song)>0){
-			return $song[0];
-		}else{
-			return '';
-		}
-	}
-	
-	/**
-	 * get the number of songs in a directory
-	 * @param string $path
-	 */
-	public static function getSongCountByPath($path){
-		$query=OCP\DB::prepare("SELECT COUNT(`song_id`) AS `count` FROM `*PREFIX*media_songs` WHERE `song_path` LIKE ?");
-		$result=$query->execute(array("$path%"))->fetchAll();
-		return $result[0]['count'];
-	}
-
-	/**
-	 * remove a song from the database by path
-	 * @param string $path the path of the song
-	 *
-	 * if a path of a folder is passed, all songs stored in the folder will be removed from the database
-	 */
-	public static function deleteSongByPath($path){
-		$query=OCP\DB::prepare("DELETE FROM `*PREFIX*media_songs` WHERE `song_path` LIKE ?");
-		$query->execute(array("$path%"));
-	}
-
-	/**
-	 * increase the play count of a song
-	 * @param int songId
-	 */
-	public static function registerPlay($songId){
-		$now=time();
-		$query=OCP\DB::prepare('UPDATE `*PREFIX*media_songs` SET `song_playcount`=`song_playcount`+1, `song_lastplayed`=? WHERE `song_id`=? AND `song_lastplayed`<?');
-		$query->execute(array($now,$songId,$now-60));
-	}
-
-	/**
-	 * get the id of the song by path
-	 * @param string $path
-	 * @return int
-	 */
-	public static function getSongByPath($path){
-		$query=OCP\DB::prepare("SELECT `song_id` FROM `*PREFIX*media_songs` WHERE `song_path` = ?");
-		$result=$query->execute(array($path));
-		if($row=$result->fetchRow()){
-			return $row['song_id'];
-		}else{
-			return 0;
-		}
-	}
-	
-	/**
-	 * set the path of a song
-	 * @param string $oldPath
-	 * @param string $newPath
-	 */
-	public static function moveSong($oldPath,$newPath){
-		$query=OCP\DB::prepare("UPDATE `*PREFIX*media_songs` SET `song_path` = ? WHERE `song_path` = ?");
-		$query->execute(array($newPath,$oldPath));
-	}
-}
diff --git a/apps/media/lib_media.php b/apps/media/lib_media.php
deleted file mode 100644
index ff58e4e735..0000000000
--- a/apps/media/lib_media.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-
-/**
-* ownCloud - media plugin
-*
-* @author Robin Appelman
-* @copyright 2010 Robin Appelman icewind1991@gmail.com
-* 
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either 
-* version 3 of the License, or any later version.
-* 
-* This library is diconnectstributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-*  
-* You should have received a copy of the GNU Lesser General Public 
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-* 
-*/
-
-class OC_MEDIA{
-	/**
-	 * get the sha256 hash of the password needed for ampache
-	 * @param array $params, parameters passed from OC_Hook
-	 */
-	public static function loginListener($params){
-		if(isset($params['uid']) and $params['password']){
-			$name=$params['uid'];
-			$query=OCP\DB::prepare("SELECT `user_id` from `*PREFIX*media_users` WHERE `user_id` LIKE ?");
-			$uid=$query->execute(array($name))->fetchAll();
-			if(count($uid)==0){
-				$password=hash('sha256',$_POST['password']);
-				$query=OCP\DB::prepare("INSERT INTO `*PREFIX*media_users` (`user_id`, `user_password_sha256`) VALUES (?, ?);");
-				$query->execute(array($name,$password));
-			}
-		}
-	}
-	
-	/**
-	 *
-	 */
-	public static function updateFile($params){
-		$path=$params['path'];
-		if(!$path) return;
-		require_once 'lib_scanner.php';
-		require_once 'lib_collection.php';
-		//fix a bug where there were multiply '/' in front of the path, it should only be one
-		while($path[0]=='/'){
-			$path=substr($path,1);
-		}
-		$path='/'.$path;
-		OC_MEDIA_SCANNER::scanFile($path);
-	}
-
-	/**
-	 *
-	 */
-	public static function deleteFile($params){
-		$path=$params['path'];
-		require_once 'lib_collection.php';
-		OC_MEDIA_COLLECTION::deleteSongByPath($path);
-	}
-
-	public static function moveFile($params){
-		require_once 'lib_collection.php';
-		OC_MEDIA_COLLECTION::moveSong($params['oldpath'],$params['newpath']);
-	}
-}
-
-class OC_MediaSearchProvider extends OC_Search_Provider{
-	function search($query){
-		require_once('lib_collection.php');
-		$artists=OC_MEDIA_COLLECTION::getArtists($query);
-		$albums=OC_MEDIA_COLLECTION::getAlbums(0,$query);
-		$songs=OC_MEDIA_COLLECTION::getSongs(0,0,$query);
-		$results=array();
-		foreach($artists as $artist){
-			$results[]=new OC_Search_Result($artist['artist_name'],'',OCP\Util::linkTo( 'media', 'index.php').'#artist='.urlencode($artist['artist_name']),'Music');
-		}
-		foreach($albums as $album){
-			$artist=OC_MEDIA_COLLECTION::getArtistName($album['album_artist']);
-			$results[]=new OC_Search_Result($album['album_name'],'by '.$artist,OCP\Util::linkTo( 'media', 'index.php').'#artist='.urlencode($artist).'&album='.urlencode($album['album_name']),'Music');
-		}
-		foreach($songs as $song){
-			$minutes=floor($song['song_length']/60);
-			$secconds=$song['song_length']%60;
-			$artist=OC_MEDIA_COLLECTION::getArtistName($song['song_artist']);
-			$album=OC_MEDIA_COLLECTION::getalbumName($song['song_album']);
-			$results[]=new OC_Search_Result($song['song_name'],"by $artist, in $album $minutes:$secconds",OCP\Util::linkTo( 'media', 'index.php').'#artist='.urlencode($artist).'&album='.urlencode($album).'&song='.urlencode($song['song_name']),'Music');
-		}
-		return $results;
-	}
-}
-
diff --git a/apps/media/lib_scanner.php b/apps/media/lib_scanner.php
deleted file mode 100644
index 3c32879eee..0000000000
--- a/apps/media/lib_scanner.php
+++ /dev/null
@@ -1,138 +0,0 @@
-<?php
-
-/**
-* ownCloud - media plugin
-*
-* @author Robin Appelman
-* @copyright 2010 Robin Appelman icewind1991@gmail.com
-* 
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either 
-* version 3 of the License, or any later version.
-* 
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-*  
-* You should have received a copy of the GNU Lesser General Public 
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-* 
-*/
-
-require_once('getid3/getid3.php');
-
-//class for scanning directories for music
-class OC_MEDIA_SCANNER{
-	static private $getID3=false;
-	
-	//these are used to store which artists and albums we found, it can save a lot of addArtist/addAlbum calls
-	static private $artists=array();
-	static private $albums=array();//stored as "$artist/$album" to allow albums with the same name from different artists
-	
-	/**
-	 * scan a folder for music
-	 * @param OC_EventSource eventSource (optional)
-	 * @return int the number of songs found
-	 */
-	public static function scanCollection($eventSource=null){
-		$music=OC_FileCache::searchByMime('audio');
-		$ogg=OC_FileCache::searchByMime('application','ogg');
-		$music=array_merge($music,$ogg);
-		$eventSource->send('count',count($music));
-		$songs=0;
-		foreach($music as $file){
-			self::scanFile($file);
-			$songs++;
-			if($eventSource){
-				$eventSource->send('scanned',array('file'=>$file,'count'=>$songs));
-			}
-		}
-		if($eventSource){
-			$eventSource->send('done',$songs);
-		}
-		return $songs;
-	}
-
-	/**
-	 * scan a file for music
-	 * @param string $path
-	 * @return boolean
-	 */
-	public static function scanFile($path){
-		if(!self::isMusic($path)){
-			return;
-		}
-		if(!self::$getID3){
-			self::$getID3=@new getID3();
-			self::$getID3->encoding='UTF-8';
-		}
-		$file=OC_Filesystem::getLocalFile($path);
-		$data=@self::$getID3->analyze($file);
-		getid3_lib::CopyTagsToComments($data);
-		if(!isset($data['comments'])){
-			OCP\Util::writeLog('media',"error reading id3 tags in '$file'",OCP\Util::WARN);
-			return;
-		}
-		if(!isset($data['comments']['artist'])){
-			OCP\Util::writeLog('media',"error reading artist tag in '$file'",OCP\Util::WARN);
-			$artist='unknown';
-		}else{
-			$artist=OCP\Util::sanitizeHTML(stripslashes($data['comments']['artist'][0]));
-		}
-		if(!isset($data['comments']['album'])){
-			OCP\Util::writeLog('media',"error reading album tag in '$file'",OCP\Util::WARN);
-			$album='unknown';
-		}else{
-			$album=OCP\Util::sanitizeHTML(stripslashes($data['comments']['album'][0]));
-		}
-		if(!isset($data['comments']['title'])){
-			OCP\Util::writeLog('media',"error reading title tag in '$file'",OCP\Util::WARN);
-			$title='unknown';
-		}else{
-			$title=OCP\Util::sanitizeHTML(stripslashes($data['comments']['title'][0]));
-		}
-		$size=$data['filesize'];
-		if (isset($data['comments']['track']))
-		{
-			$track = $data['comments']['track'][0];
-		}
-		else if (isset($data['comments']['track_number']))
-		{
-			$track = $data['comments']['track_number'][0];
-			$track = explode('/',$track);
-			$track = $track[0];
-		}
-		else
-		{
-			$track = 0;
-		}
-		$length=isset($data['playtime_seconds'])?round($data['playtime_seconds']):0;
-
-		if(!isset(self::$artists[$artist])){
-			$artistId=OC_MEDIA_COLLECTION::addArtist($artist);
-			self::$artists[$artist]=$artistId;
-		}else{
-			$artistId=self::$artists[$artist];
-		}
-		if(!isset(self::$albums[$artist.'/'.$album])){
-			$albumId=OC_MEDIA_COLLECTION::addAlbum($album,$artistId);
-			self::$albums[$artist.'/'.$album]=$albumId;
-		}else{
-			$albumId=self::$albums[$artist.'/'.$album];
-		}
-		$songId=OC_MEDIA_COLLECTION::addSong($title,$path,$artistId,$albumId,$length,$track,$size);
-		return (!($title=='unkown' && $artist=='unkown' && $album=='unkown'))?$songId:0;
-	}
-
-	/**
-	 * quick check if a song is a music file by checking the extension, not as good as a proper mimetype check but way faster
-	 * @param string $filename
-	 * @return bool
-	 */
-	public static function isMusic($filename){
-		$ext=strtolower(substr($filename,strrpos($filename,'.')+1));
-		return $ext=='mp3' || $ext=='flac' || $ext=='m4a' || $ext=='ogg' || $ext=='oga';
-	}
-}
diff --git a/apps/media/remote.php b/apps/media/remote.php
deleted file mode 100644
index 0535077cef..0000000000
--- a/apps/media/remote.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-// only need filesystem apps
-$RUNTIME_APPTYPES=array('filesystem','authentication');
-OC_App::loadApps($RUNTIME_APPTYPES);
-
-if($path_info == '/ampache' || $path_info == '/ampache/'){
-	require_once(OC_App::getAppPath('media').'/index.php');
-}else{
-	require_once(OC_App::getAppPath('media').'/server/xml.server.php');
-}
diff --git a/apps/media/server/xml.server.php b/apps/media/server/xml.server.php
deleted file mode 100644
index 796da130a4..0000000000
--- a/apps/media/server/xml.server.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-
-/**
-* ownCloud - media plugin
-*
-* @author Robin Appelman
-* @copyright 2010 Robin Appelman icewind1991@gmail.com
-* 
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either 
-* version 3 of the License, or any later version.
-* 
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-*  
-* You should have received a copy of the GNU Lesser General Public 
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-* 
-*/
-
-OCP\App::checkAppEnabled('media');
- require_once(OC_App::getAppPath('media').'/lib_collection.php');
- require_once(OC_App::getAppPath('media').'/lib_ampache.php');
-
-$arguments=$_POST;
-if(!isset($_POST['action']) and isset($_GET['action'])){
-	$arguments=$_GET;
-}
-
-foreach($arguments as &$argument){
-	$argument=stripslashes($argument);
-}
-@ob_clean();
-if(isset($arguments['action'])){
-	OCP\Util::writeLog('media','ampache '.$arguments['action'].' request', OCP\Util::DEBUG);
-	switch($arguments['action']){
-		case 'songs':
-			OC_MEDIA_AMPACHE::songs($arguments);
-			break;
-		case 'url_to_song':
-			OC_MEDIA_AMPACHE::url_to_song($arguments);
-			break;
-		case 'play':
-			OC_MEDIA_AMPACHE::play($arguments);
-			break;
-		case 'handshake':
-			OC_MEDIA_AMPACHE::handshake($arguments);
-			break;
-		case 'ping':
-			OC_MEDIA_AMPACHE::ping($arguments);
-			break;
-		case 'artists':
-			OC_MEDIA_AMPACHE::artists($arguments);
-			break;
-		case 'artist_songs':
-			OC_MEDIA_AMPACHE::artist_songs($arguments);
-			break;
-		case 'artist_albums':
-			OC_MEDIA_AMPACHE::artist_albums($arguments);
-			break;
-		case 'albums':
-			OC_MEDIA_AMPACHE::albums($arguments);
-			break;
-		case 'album_songs':
-			OC_MEDIA_AMPACHE::album_songs($arguments);
-			break;
-		case 'search_songs':
-			OC_MEDIA_AMPACHE::search_songs($arguments);
-			break;
-		case 'song':
-			OC_MEDIA_AMPACHE::song($arguments);
-			break;
-	}
-}
-
-?> 
diff --git a/apps/media/settings.php b/apps/media/settings.php
deleted file mode 100644
index 53738f02f9..0000000000
--- a/apps/media/settings.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-$tmpl = new OCP\Template( 'media', 'settings');
-
-return $tmpl->fetchPage();
diff --git a/apps/media/templates/music.php b/apps/media/templates/music.php
deleted file mode 100644
index 589d6b5247..0000000000
--- a/apps/media/templates/music.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<div class='player-controls' id="controls">
-	<ul class="jp-controls">
-		<li><a href="#" class="jp-play action"><img class="svg" alt="<?php echo $l->t('Play');?>" src="<?php echo OCP\image_path('core', 'actions/play-big.svg'); ?>" /></a></li>
-		<li><a href="#" class="jp-pause action"><img class="svg" alt="<?php echo $l->t('Pause');?>" src="<?php echo OCP\image_path('core', 'actions/pause-big.svg'); ?>" /></a></li>
-		<li><a href="#" class="jp-previous action"><img class="svg" alt="<?php echo $l->t('Previous');?>" src="<?php echo OCP\image_path('core', 'actions/play-previous.svg'); ?>" /></a></li>
-		<li><a href="#" class="jp-next action"><img class="svg" alt="<?php echo $l->t('Next');?>" src="<?php echo OCP\image_path('core', 'actions/play-next.svg'); ?>" /></a></li>
-		<li><a href="#" class="jp-mute action"><img class="svg" alt="<?php echo $l->t('Mute');?>" src="<?php echo OCP\image_path('core', 'actions/sound.svg'); ?>" /></a></li>
-		<li><a href="#" class="jp-unmute action"><img class="svg" alt="<?php echo $l->t('Unmute');?>" src="<?php echo OCP\image_path('core', 'actions/sound-off.svg'); ?>" /></a></li>
-	</ul>
-	<div class="jp-progress">
-		<div class="jp-seek-bar">
-			<div class="jp-play-bar"></div>
-		</div>
-	</div>
-	<div class="jp-current-time"></div>
-	<div class="jp-duration"></div>
-	<div class="jp-volume-bar">
-		<div class="jp-volume-bar-value"></div>
-	</div>
-        <div class="jp-current-song"></div>
-
-	<div class="player" id="jp-player"></div>
-
-	<div id="scan">
-		<input type="button" class="start" value="<?php echo $l->t('Rescan Collection')?>" />
-		<input type="button" class="stop" style="display:none" value="<?php echo $l->t('Pause')?>" />
-		<div id="scanprogressbar"></div>
-	</div>
-</div>
-
-<ul id="leftcontent"></ul>
-
-<div id="rightcontent">
-<table id="collection">
-	<thead>
-		<tr>
-			<th><?php echo $l->t('Artist')?></th>
-			<th><?php echo $l->t('Album')?></th>
-			<th><?php echo $l->t('Title')?></th>
-		</tr>
-	</thead>
-	<tbody>
-		<tr class="template">
-			<td class="artist"><a></a></td>
-			<td class="artist-expander"><a></a></td>
-			<td class="album"><a></a></td>
-			<td class="album-expander"><a></a></td>
-			<td class="title"><a></a></td>
-		</tr>
-	</tbody>
-</table>
-</div>
diff --git a/apps/media/templates/player.php b/apps/media/templates/player.php
deleted file mode 100644
index 6c14006f83..0000000000
--- a/apps/media/templates/player.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-if(!isset($_)){//allow the template to be loaded standalone
-	$tmpl = new OCP\Template( 'media', 'player');
-	$tmpl->printPage();
-	exit;
-}
-?>
-<?php echo $l->t('Music');?>
-<div class='player-controls' id="playercontrols">
-	<div class="player" id="jp-player"></div>
-	<ul class="jp-controls">
-		<li><a href="#" class="jp-play action"><img class="svg" alt="<?php echo $l->t('Play');?>" src="<?php echo OCP\image_path('core', 'actions/play.svg'); ?>" /></a></li>
-		<li><a href="#" class="jp-pause action"><img class="svg" alt="<?php echo $l->t('Pause');?>" src="<?php echo OCP\image_path('core', 'actions/pause.svg'); ?>" /></a></li>
-		<li><a href="#" class="jp-next action"><img class="svg" alt="<?php echo $l->t('Next');?>" src="<?php echo OCP\image_path('core', 'actions/play-next.svg'); ?>" /></a></li>
-	</ul>
-</div>
\ No newline at end of file
diff --git a/apps/media/templates/settings.php b/apps/media/templates/settings.php
deleted file mode 100644
index a7dc0775c4..0000000000
--- a/apps/media/templates/settings.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<form id="mediaform">
-	<fieldset class="personalblock">
-		<strong>Media</strong><br />
-		Ampache address: 
-		<code><?php echo OCP\Util::linkToRemote('ampache'); ?></code><br />
-	</fieldset>
-</form>
diff --git a/apps/remoteStorage/BearerAuth.php b/apps/remoteStorage/BearerAuth.php
deleted file mode 100644
index ebcf189dfb..0000000000
--- a/apps/remoteStorage/BearerAuth.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-/**
- * HTTP Bearer Authentication handler
- *
- * Use this class for easy http authentication setup
- * 
- * @package Sabre
- * @subpackage HTTP 
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_HTTP_BearerAuth extends Sabre_HTTP_AbstractAuth {
-
-    /**
-     * Returns the supplied username and password.
-     *
-     * The returned array has two values:
-     *   * 0 - username
-     *   * 1 - password
-     *
-     * If nothing was supplied, 'false' will be returned
-     *
-     * @return mixed 
-     */
-    public function getUserPass() {
-
-        // Apache and mod_php
-        if (($user = $this->httpRequest->getRawServerValue('PHP_AUTH_USER')) && ($pass = $this->httpRequest->getRawServerValue('PHP_AUTH_PW'))) {
-
-            return array($user,$pass);
-
-        }
-
-        // Most other webservers 
-        $auth = $this->httpRequest->getHeader('Authorization');
-
-        if (!$auth) return false;
-
-        if (strpos(strtolower($auth),'bearer')!==0) return false; 
-
-        return explode(':', base64_decode(substr($auth, 7)));
-
-    }
-
-    /**
-     * Returns an HTTP 401 header, forcing login
-     *
-     * This should be called when username and password are incorrect, or not supplied at all
-     *
-     * @return void
-     */
-    public function requireLogin() {
-
-        $this->httpResponse->setHeader('WWW-Authenticate','Basic realm="' . $this->realm . '"');
-        $this->httpResponse->sendStatus(401);
-
-    }
-
-}
diff --git a/apps/remoteStorage/appinfo/app.php b/apps/remoteStorage/appinfo/app.php
deleted file mode 100644
index c278fd7305..0000000000
--- a/apps/remoteStorage/appinfo/app.php
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-OCP\App::registerPersonal('remoteStorage','settings');
diff --git a/apps/remoteStorage/appinfo/database.xml b/apps/remoteStorage/appinfo/database.xml
deleted file mode 100644
index d48f9f747b..0000000000
--- a/apps/remoteStorage/appinfo/database.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<database>
-	 <name>*dbname*</name>
-	 <create>true</create>
-	 <overwrite>false</overwrite>
-	 <charset>utf8</charset>
-	 <table>
-		<name>*dbprefix*authtoken</name>
-		<declaration>
-			<field>
-				<name>token</name>
-				<type>text</type>
-				<default></default>
-				<notnull>true</notnull>
-				<length>40</length>
-			</field>
-			<field>
-				<name>appUrl</name>
-				<type>text</type>
-				<default></default>
-				<notnull>true</notnull>
-				<length>128</length>
-			</field>
-			<field>
-				<name>user</name>
-				<type>text</type>
-				<default></default>
-				<notnull>true</notnull>
-				<length>64</length>
-			 </field>
-			<field>
-				<name>category</name>
-				<type>text</type>
-				<default></default>
-				<notnull>true</notnull>
-				<length>64</length>
-			 </field>
-			<index>
-				<name>a_app_remotestorage_user</name>
-				<unique>true</unique>
-				<field>
-					<name>user</name>
-					<sorting>ascending</sorting>
-				</field>
-				<field>
-					<name>token</name>
-					<sorting>ascending</sorting>
-				</field>
-			</index>
-		</declaration>
-	</table>
-</database>
diff --git a/apps/remoteStorage/appinfo/info.xml b/apps/remoteStorage/appinfo/info.xml
deleted file mode 100644
index 1388ad9c31..0000000000
--- a/apps/remoteStorage/appinfo/info.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-<info>
-	<id>remoteStorage</id>
-	<name>remoteStorage compatibility</name>
-	<description>Enables you to use ownCloud as their remote storage for unhosted applications. This app requires the Webfinger app to be installed and enabled correctly. More info on <a href="http://unhosted.org">the website of the unhosted movement</a>.</description>
-	<licence>AGPL or MIT</licence>
-	<author>Michiel de Jong</author>
-	<require>4</require>
-	<shipped>true</shipped>
-	<remote>
-		<remoteStorage>webdav.php</remoteStorage>
-	</remote>
-</info>
diff --git a/apps/remoteStorage/appinfo/version b/apps/remoteStorage/appinfo/version
deleted file mode 100644
index 0e2c93950b..0000000000
--- a/apps/remoteStorage/appinfo/version
+++ /dev/null
@@ -1 +0,0 @@
-0.7
\ No newline at end of file
diff --git a/apps/remoteStorage/appinfo/webfinger.php b/apps/remoteStorage/appinfo/webfinger.php
deleted file mode 100644
index e8b237628c..0000000000
--- a/apps/remoteStorage/appinfo/webfinger.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php if(OC_User::userExists(WF_USER)): ?>
-    {
-        "rel":"remoteStorage",
-        "template":"<?php echo WF_BASEURL; ?>/remote.php/remoteStorage/<?php echo WF_USER; ?>/remoteStorage/{category}/",
-        "api":"WebDAV",
-        "auth":"<?php echo WF_BASEURL; ?>/?app=remoteStorage&getfile=auth.php&userid=<?php echo WF_USER; ?>"
-    }
-<?php endif ?>
diff --git a/apps/remoteStorage/auth.php b/apps/remoteStorage/auth.php
deleted file mode 100644
index 91ca43ea07..0000000000
--- a/apps/remoteStorage/auth.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-
-/**
-* ownCloud
-*
-* Original:
-* @author Frank Karlitschek
-* @copyright 2012 Frank Karlitschek frank@owncloud.org
-* 
-* Adapted:
-* @author Michiel de Jong, 2012
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either
-* version 3 of the License, or any later version.
-*
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
-* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-*
-* You should have received a copy of the GNU Affero General Public
-* License along with this library.	If not, see <http://www.gnu.org/licenses/>.
-*
-*/
-
-header("X-Frame-Options: Sameorigin");
-
-OCP\App::checkAppEnabled('remoteStorage');
-require_once('Sabre/autoload.php');
-require_once('lib_remoteStorage.php');
-require_once('oauth_ro_auth.php');
-
-ini_set('default_charset', 'UTF-8');
-#ini_set('error_reporting', '');
-@ob_clean();
-
-foreach($_GET as $k => $v) {
-  if($k=='userid'){
-    $userId=$v;
-  } else if($k=='redirect_uri'){
-    $appUrlParts=explode('/', $v);
-    $appUrl = htmlentities($appUrlParts[2]);//TODO: check if this is equal to client_id
-  } else if($k=='scope'){
-    $categories=htmlentities($v);
-  }
-}
-$currUser = OCP\USER::getUser();
-if($userId && $appUrl && $categories) {
-  if($currUser == $userId) {
-    if(isset($_POST['allow'])) {
-      //TODO: check if this can be faked by editing the cookie in firebug!
-      $token=OC_remoteStorage::createCategories($appUrl, $categories);
-      header('Location: '.$_GET['redirect_uri'].'#access_token='.$token.'&token_type=bearer');
-    } else if($existingToken = OC_remoteStorage::getTokenFor($appUrl, $categories)) {
-      header('Location: '.$_GET['redirect_uri'].'#access_token='.$existingToken.'&token_type=bearer');
-    } else {
-      //params ok, logged in ok, but need to click Allow still:
-	$appUrlParts = explode('/', $_GET['redirect_uri']);
-	$host = $appUrlParts[2];
-	$categories = explode(',', $_GET['scope']);
-	OCP\Util::addStyle('', 'auth');
-	OCP\Template::printGuestPage('remoteStorage', 'auth', array(
-		'host' => $host,
-		'categories' => $categories,
-	));
-	}//end 'need to click Allow still'
-	} else {//login not ok
-		if($currUser) {
-			die('You are logged in as '.$currUser.' instead of '.htmlentities($userId));
-		} else {
-			// this will display the login page for us
-			OCP\Util::checkLoggedIn();
-		}
-	}
-} else {//params not ok
-	die('please use e.g. '.OCP\Util::linkTo('remoteStorage', 'auth.php').'?userid=admin&redirect_uri=http://host/path&scope=...');
-}
diff --git a/apps/remoteStorage/img/remoteStorage.png b/apps/remoteStorage/img/remoteStorage.png
deleted file mode 100644
index 10c2be243c..0000000000
Binary files a/apps/remoteStorage/img/remoteStorage.png and /dev/null differ
diff --git a/apps/remoteStorage/lib_remoteStorage.php b/apps/remoteStorage/lib_remoteStorage.php
deleted file mode 100644
index b9e2368003..0000000000
--- a/apps/remoteStorage/lib_remoteStorage.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-
-class OC_remoteStorage {
-	public static function getValidTokens($ownCloudUser, $category) {
-		$stmt=OCP\DB::prepare("SELECT `token`,`appUrl`,`category` FROM `*PREFIX*authtoken` WHERE `user`=?",100);
-		$result=$stmt->execute(array($ownCloudUser));
-		$ret = array();
-		while($row=$result->fetchRow()){
-			if(in_array($category, explode(',', $row['category']))) {
-				$ret[$row['token']]=true;
-			}
-		}
-		return $ret;
-	}
-
-  public static function getTokenFor($appUrl, $categories) {
-		$user=OCP\USER::getUser();
-		$stmt=OCP\DB::prepare("SELECT `token` FROM `*PREFIX*authtoken` WHERE `user`=? AND `appUrl`=? AND `category`=?",1);
-		$result=$stmt->execute(array($user, $appUrl, $categories));
-		if($row=$result->fetchRow()) {
-			return base64_encode('remoteStorage:'.$row['token']);
-		} else {
-			return false;
-		}
-	}
-
-	public static function getAllTokens() {
-		$user=OCP\USER::getUser();
-		$stmt=OCP\DB::prepare("SELECT `token`,`appUrl`,`category` FROM `*PREFIX*authtoken` WHERE `user`=?",100);
-		$result=$stmt->execute(array($user));
-		$ret = array();
-		while($row=$result->fetchRow()){
-			$ret[$row['token']] = array(
-				'appUrl' => $row['appUrl'],
-				'categories' => $row['category'],
-			);
-		}
-		return $ret;
-	}
-
-	public static function deleteToken($token) {
-		$user=OCP\USER::getUser();
-		$stmt=OCP\DB::prepare("DELETE FROM `*PREFIX*authtoken` WHERE `token`=? AND `user`=?");
-		$stmt->execute(array($token,$user));
-		return 'unknown';//how can we see if any rows were affected?
-	}
-	private static function addToken($token, $appUrl, $categories){
-		$user=OCP\USER::getUser();
-		$stmt=OCP\DB::prepare("INSERT INTO `*PREFIX*authtoken` (`token`,`appUrl`,`user`,`category`) VALUES(?,?,?,?)");
-		$stmt->execute(array($token,$appUrl,$user,$categories));
-	}
-	public static function createCategories($appUrl, $categories) {
-		$token=uniqid();
-		OC_Util::setupFS(OCP\USER::getUser());
-		self::addToken($token, $appUrl, $categories);
-		foreach(explode(',', $categories) as $category) {
-			//TODO: input checking on $category
-			$scopePathParts = array('remoteStorage', $category);
-			for($i=0;$i<=count($scopePathParts);$i++){
-				$thisPath = '/'.implode('/', array_slice($scopePathParts, 0, $i));
-				if(!OC_Filesystem::file_exists($thisPath)) {
-					OC_Filesystem::mkdir($thisPath);
-				}
-			}
-		}
-		return base64_encode('remoteStorage:'.$token);
-	}
-}
diff --git a/apps/remoteStorage/oauth_ro_auth.php b/apps/remoteStorage/oauth_ro_auth.php
deleted file mode 100644
index bed3093c3b..0000000000
--- a/apps/remoteStorage/oauth_ro_auth.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011, 2012 Michiel de Jong <michiel@unhosted.org>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-
-class OC_Connector_Sabre_Auth_ro_oauth extends Sabre_DAV_Auth_Backend_AbstractBasic {
-	private $validTokens;
-	private $category;
-	public function __construct($validTokensArg, $categoryArg) {
-		$this->validTokens = $validTokensArg;
-		$this->category = $categoryArg;
-	}
-
-	/**
-	 * Validates a username and password
-	 *
-	 * This method should return true or false depending on if login
-	 * succeeded.
-	 *
-	 * @return bool
-	 */
-	protected function validateUserPass($username, $password){
-		//always give read-only:
-		if(($_SERVER['REQUEST_METHOD'] == 'OPTIONS')
-		    || (isset($this->validTokens[$password]))
-			|| (($_SERVER['REQUEST_METHOD'] == 'GET') && ($this->category == 'public'))
-		) {
-			OC_Util::setUpFS();
-			return true;
-		} else {
-			//var_export($_SERVER);
-			//var_export($this->validTokens);
-			//die('not getting in with "'.$username.'"/"'.$password.'"!');
-			return false;	
-		}
-	}
-
-	//overwriting this to make it not automatically fail if no auth header is found:
-	public function authenticate(Sabre_DAV_Server $server,$realm) {
-		$auth = new Sabre_HTTP_BearerAuth();
-		$auth->setHTTPRequest($server->httpRequest);
-		$auth->setHTTPResponse($server->httpResponse);
-		$auth->setRealm($realm);
-		$userpass = $auth->getUserPass();
-		if (!$userpass) {
-			if(($_SERVER['REQUEST_METHOD'] == 'OPTIONS')
-				||(($_SERVER['REQUEST_METHOD'] == 'GET') && ($this->category == 'public'))
-			) {
-				$userpass = array('', '');
-			} else {
-				$auth->requireLogin();
-				throw new Sabre_DAV_Exception_NotAuthenticated('No basic authentication headers were found');
-			}
-		}
-
-		// Authenticates the user
-		if (!$this->validateUserPass($userpass[0],$userpass[1])) {
-			$auth->requireLogin();
-			throw new Sabre_DAV_Exception_NotAuthenticated('Username or password does not match');
-		}
-		$this->currentUser = $userpass[0];
-		return true;
-	}
-
-} 
-
diff --git a/apps/remoteStorage/settings.php b/apps/remoteStorage/settings.php
deleted file mode 100644
index 3be8b0984d..0000000000
--- a/apps/remoteStorage/settings.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-require_once('lib_remoteStorage.php');
-$tmpl = new OCP\Template( 'remoteStorage', 'settings');
-
-return $tmpl->fetchPage();
diff --git a/apps/remoteStorage/templates/auth.php b/apps/remoteStorage/templates/auth.php
deleted file mode 100644
index 6a7054eabb..0000000000
--- a/apps/remoteStorage/templates/auth.php
+++ /dev/null
@@ -1,28 +0,0 @@
-		<section id="main">
-		<div id="oauth">
-			<h2><img src="<?php echo image_path('', 'remoteStorage-big.png'); ?>" alt="remoteStorage" /></h2>
-			<p><strong><?php echo $_['host'] ?></strong>
-			requests read &amp; write access to your 
-			<?php
-				$categories = $_['categories'];
-				if(!count($categories)) {
-					echo $categories[0];
-				} else {
-					echo '<em>'.$categories[0].'</em>';
-					if(count($categories)==2) {
-						echo ' and <em>'.$categories[1].'</em>';
-					} else if(count($categories)>2) {
-						for($i=1; $i<count($categories)-1; $i++) {
-							echo ', <em>'.$categories[$i].'</em>';
-						}
-						echo ', and <em>'.$categories[$i].'</em>';
-					}
-				}
-			?>.
-			</p>
-			<form accept-charset="UTF-8" method="post">
-				<input id="allow-auth" name="allow" type="submit" value="Allow" />
-				<input id="deny-auth" name="deny" type="submit" value="Deny" />
-			</form>
-		</div>
-		</section>
diff --git a/apps/remoteStorage/templates/settings.php b/apps/remoteStorage/templates/settings.php
deleted file mode 100644
index 1d2a188f52..0000000000
--- a/apps/remoteStorage/templates/settings.php
+++ /dev/null
@@ -1,22 +0,0 @@
-	<fieldset class="personalblock">
-		<img src="<?php echo image_path('remoteStorage', 'remoteStorage.png') ?>" style="width:16px">
-		<strong><?php echo $l->t('remoteStorage') ?></strong> user address: <?php echo OCP\USER::getUser().'@'.$_SERVER['SERVER_NAME'] ?> (<a href="http://unhosted.org/">more info</a>)
-		<p><em>Apps that currently have access to your ownCloud:</em></p>
-		<script>
-			function revokeToken(token) {
-				var xhr = new XMLHttpRequest();
-				xhr.open('POST', '/apps/remoteStorage/ajax/revokeToken.php', true);
-				xhr.send(token);
-			}
-		</script>
-		<ul>
-		<?php foreach(OC_remoteStorage::getAllTokens() as $token => $details) { ?>
-			<li onmouseover="$('#revoke_<?php echo $token ?>').show();" onmouseout="$('#revoke_<?php echo $token ?>').hide();">
-				<strong><?php echo $details['appUrl'] ?></strong>: <?php echo $details['categories'] ?>
-				<a href="#" title="Revoke" class="action" style="display:none" id="revoke_<?php echo $token ?>" onclick="revokeToken('<?php echo $token ?>');$(this).hide();">
-					<img src="<?php echo OCP\Util::imagePath('core', 'actions/delete.svg') ?>">
-				</a>
-			</li>
-		<?php } ?>
-		</ul>
-	</fieldset>
diff --git a/apps/remoteStorage/webdav.php b/apps/remoteStorage/webdav.php
deleted file mode 100644
index 8d8ec6a45a..0000000000
--- a/apps/remoteStorage/webdav.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-
-/**
-* ownCloud
-*
-* Original:
-* @author Frank Karlitschek
-* @copyright 2012 Frank Karlitschek frank@owncloud.org
-* 
-* Adapted:
-* @author Michiel de Jong, 2011
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either
-* version 3 of the License, or any later version.
-*
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-*
-* You should have received a copy of the GNU Affero General Public
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-*
-*/
-
-OC_App::loadApps(array('filesystem','authentication'));
-
-OCP\App::checkAppEnabled('remoteStorage');
-require_once('lib_remoteStorage.php');
-require_once('BearerAuth.php');
-require_once('oauth_ro_auth.php');
-
-ini_set('default_charset', 'UTF-8');
-#ini_set('error_reporting', '');
-@ob_clean();
-
-//allow use as remote storage for other websites
-if(isset($_SERVER['HTTP_ORIGIN'])) {
-	header('Access-Control-Allow-Origin: ' . $_SERVER['HTTP_ORIGIN']);
-	header('Access-Control-Max-Age: 3600');
-	header('Access-Control-Allow-Methods: OPTIONS, GET, PUT, DELETE, PROPFIND');
-  	header('Access-Control-Allow-Headers: Authorization, Content-Type');
-} else {
-	header('Access-Control-Allow-Origin: *');
-}
-
-$path = substr($_SERVER["REQUEST_URI"], strlen($baseuri));
-
-$pathParts =  explode('/', $path);
-// for webdav:
-//      0       /   1    /   2...
-//  $ownCloudUser/remoteStorage/$category/
-
-if(count($pathParts) >= 2) {
-	list($ownCloudUser, $dummy2, $category) = $pathParts;
-
-	OC_Util::setupFS($ownCloudUser);
-
-	// Create ownCloud Dir
-	$publicDir = new OC_Connector_Sabre_Directory('');
-	$server = new Sabre_DAV_Server($publicDir);
-
-	// Path to our script
-	$server->setBaseUri($baseuri.$ownCloudUser);
-
-	// Auth backend
-	$authBackend = new OC_Connector_Sabre_Auth_ro_oauth(
-		OC_remoteStorage::getValidTokens($ownCloudUser, $category),
-		$category
-	);
-
-	$authPlugin = new Sabre_DAV_Auth_Plugin($authBackend,'ownCloud');//should use $validTokens here
-	$server->addPlugin($authPlugin);
-
-	// Also make sure there is a 'data' directory, writable by the server. This directory is used to store information about locks
-	$lockBackend = new OC_Connector_Sabre_Locks();
-	$lockPlugin = new Sabre_DAV_Locks_Plugin($lockBackend);
-	$server->addPlugin($lockPlugin);
-
-	// And off we go!
-	$server->exec();
-} else {
-	//die('not the right address format '.var_export($pathParts, true));
-	die('not the right address format');
-}
diff --git a/apps/tasks/ajax/addtask.php b/apps/tasks/ajax/addtask.php
deleted file mode 100644
index d98fdbf388..0000000000
--- a/apps/tasks/ajax/addtask.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-// Init owncloud
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('tasks');
-OCP\JSON::callCheck();
-
-$calendars = OC_Calendar_Calendar::allCalendars(OCP\User::getUser(), true);
-$first_calendar = reset($calendars);
-$cid = $first_calendar['id'];
-
-$input = $_POST['text'];
-$request = array();
-$request['summary'] = $input;
-$request["categories"] = null;
-$request['priority'] = null;
-$request['percent_complete'] = null;
-$request['completed'] = null;
-$request['location'] = null;
-$request['due'] = null;
-$request['description'] = null;
-$vcalendar = OC_Task_App::createVCalendarFromRequest($request);
-$id = OC_Calendar_Object::add($cid, $vcalendar->serialize());
-
-$user_timezone = OC_Calendar_App::getTimezone();
-$task = OC_Task_App::arrayForJSON($id, $vcalendar->VTODO, $user_timezone);
-
-OCP\JSON::success(array('task' => $task));
diff --git a/apps/tasks/ajax/delete.php b/apps/tasks/ajax/delete.php
deleted file mode 100644
index cc22c3e387..0000000000
--- a/apps/tasks/ajax/delete.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * ownCloud - Addressbook
- *
- * @author Jakob Sack
- * @copyright 2011 Jakob Sack mail@jakobsack.de
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *
- * You should have received a copy of the GNU Affero General Public
- * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-// Init owncloud
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('tasks');
-OCP\JSON::callCheck();
-
-$id = $_POST['id'];
-$task = OC_Calendar_App::getEventObject( $id );
-
-OC_Calendar_Object::delete($id);
-OCP\JSON::success(array('data' => array( 'id' => $id )));
diff --git a/apps/tasks/ajax/gettasks.php b/apps/tasks/ajax/gettasks.php
deleted file mode 100644
index b6183d9cb6..0000000000
--- a/apps/tasks/ajax/gettasks.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011 Georg Ehrke <ownclouddev at georgswebsite dot de>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-// Init owncloud
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('tasks');
-
-$calendars = OC_Calendar_Calendar::allCalendars(OCP\User::getUser(), true);
-$user_timezone = OC_Calendar_App::getTimezone();
-
-$tasks = array();
-foreach( $calendars as $calendar ){
-        $calendar_tasks = OC_Calendar_Object::all($calendar['id']);
-        foreach( $calendar_tasks as $task ){
-                if($task['objecttype']!='VTODO'){
-                        continue;
-                }
-                if(is_null($task['summary'])){
-                        continue;
-                }
-		$object = OC_VObject::parse($task['calendardata']);
-		$vtodo = $object->VTODO;
-		try {
-			$tasks[] = OC_Task_App::arrayForJSON($task['id'], $vtodo, $user_timezone);
-		} catch(Exception $e) {
-                        OCP\Util::writeLog('tasks', $e->getMessage(), OCP\Util::ERROR);
-                }
-        }
-}
-
-OCP\JSON::encodedPrint($tasks);
diff --git a/apps/tasks/ajax/update_property.php b/apps/tasks/ajax/update_property.php
deleted file mode 100644
index 679cfdefe4..0000000000
--- a/apps/tasks/ajax/update_property.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Bart Visscher <bartv@thisnet.nl>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-// Init owncloud
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('tasks');
-OCP\JSON::callCheck();
-
-$id = $_POST['id'];
-$property = $_POST['type'];
-$vcalendar = OC_Calendar_App::getVCalendar( $id );
-
-$vtodo = $vcalendar->VTODO;
-switch($property) {
-	case 'summary':
-		$summary = $_POST['summary'];
-		$vtodo->setString('SUMMARY', $summary);
-		break;
-	case 'description':
-		$description = $_POST['description'];
-		$vtodo->setString('DESCRIPTION', $description);
-		break;
-	case 'location':
-		$location = $_POST['location'];
-		$vtodo->setString('LOCATION', $location);
-		break;
-	case 'categories':
-		$categories = $_POST['categories'];
-		$vtodo->setString('CATEGORIES', $categories);
-		break;
-	case 'due':
-		$due = $_POST['due'];
-		$due_date_only = $_POST['date'];
-		$type = null;
-		if ($due != 'false') {
-			try {
-				$timezone = OC_Calendar_App::getTimezone();
-				$timezone = new DateTimeZone($timezone);
-				$due = new DateTime('@'.$due);
-				$due->setTimezone($timezone);
-				$type = Sabre_VObject_Element_DateTime::LOCALTZ;
-				if ($due_date_only) {
-					$type = Sabre_VObject_Element_DateTime::DATE;
-				}
-			} catch (Exception $e) {
-				OCP\JSON::error(array('data'=>array('message'=>OC_Task_App::$l10n->t('Invalid date/time'))));
-				exit();
-			}
-		}
-		$vtodo->setDateTime('DUE', $due, $type);
-		break;
-	case 'complete':
-		$checked = $_POST['checked'];
-		OC_Task_App::setComplete($vtodo, $checked ? '100' : '0', null);
-		break;
-	default:
-		OCP\JSON::error(array('data'=>array('message'=>'Unknown type')));
-		exit();
-}
-OC_Calendar_Object::edit($id, $vcalendar->serialize());
-
-$user_timezone = OC_Calendar_App::getTimezone();
-$task_info = OC_Task_App::arrayForJSON($id, $vtodo, $user_timezone);
-OCP\JSON::success(array('data' => $task_info));
diff --git a/apps/tasks/appinfo/app.php b/apps/tasks/appinfo/app.php
deleted file mode 100644
index e7c82d6f24..0000000000
--- a/apps/tasks/appinfo/app.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-$l=new OC_L10N('tasks');
-OC::$CLASSPATH['OC_Calendar_Calendar'] = 'apps/calendar/lib/calendar.php';
-OC::$CLASSPATH['OC_Task_App'] = 'apps/tasks/lib/app.php';
-
-OCP\App::addNavigationEntry( array(
-  'id' => 'tasks_index',
-  'order' => 11,
-  'href' => OCP\Util::linkTo( 'tasks', 'index.php' ),
-  'icon' => OCP\Util::imagePath( 'tasks', 'icon.png' ),
-  'name' => $l->t('Tasks')));
diff --git a/apps/tasks/appinfo/info.xml b/apps/tasks/appinfo/info.xml
deleted file mode 100644
index 736fc23244..0000000000
--- a/apps/tasks/appinfo/info.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<info>
-	<id>tasks</id>
-	<name>Tasks</name>
-	<version>0.1</version>
-	<licence>AGPL</licence>
-	<author>Bart Visscher</author>
-	<require>4</require>
-	<shipped>true</shipped>
-	<description>Tasks view from calendar</description>
-</info>
diff --git a/apps/tasks/css/style.css b/apps/tasks/css/style.css
deleted file mode 100644
index 80b6e777b5..0000000000
--- a/apps/tasks/css/style.css
+++ /dev/null
@@ -1,62 +0,0 @@
-#tasks_list p.loading{margin:15px;}
-#tasks_lists .done{color:#C7C7C7;}
-#task_details{position:absolute;left:63em;top:6.4em;}
-#task_details th{padding:2px;text-align:right;vertical-align:top; }
-#task_details td{padding:2px;text-align:left;vertical-align:top; }
-.error_msg{color:red;}
-.error{border-color:red;border-width:2px;}
-#tasks_lists div{position:relative;padding:0.5em 1em;}
-#tasks_lists .active{font-weight:bold;}
-#tasks_list h1{background-color:#1D2D44;color:white;font-size:120%;padding:0 0.5em;}
-
-.task{border-radius:0.4em;position:relative;padding:0.4em 1em;}
-.task:nth-child(odd){background-color:#F4F4F4;}
-.task:hover {background-color:#DDDDDD;}
-
-.task_actions{display:none;position:absolute;left:30em;top:0.2em;}
-.task:hover .task_actions {display:block}
-.task_actions img{vertical-align:middle;}
-.task_actions span{cursor:pointer;}
-
-.task .priority{background-color:black;color:white;position:absolute;top:0.5em}
-.task .priority-n{height:2.66ex;width:0.6em;}
-.task .priority-1{background:rgb(255,0,0);}
-.task .priority-2{background:rgb(200,0,0);}
-.task .priority-3{background:rgb(150,0,0);}
-.task .priority-4{background:rgb(100,0,0);}
-.task .priority-5{background:rgb(255,255,0);color:black;}
-.task .priority-6{background:rgb(192,255,0);color:black;}
-.task .priority-7{background:rgb(128,255,0);color:black;}
-.task .priority-8{background:rgb(64,255,0);color:black;}
-.task .priority-9{background:rgb(0,255,0);color:black;}
-
-.task .completed {position:absolute;left:3em;top:0.3em;}
-
-.task .summary{padding-left:4em;height:2em;}
-.task .summary input{position:absolute;left:5em;top:0;}
-.task.done .summary{text-decoration:line-through;}
-
-.task .tag{border-radius:0.4em;display:inline-block;opacity:0.2;margin:0 0.2em;border:1px solid transparent;padding:0 0.4em;cursor:pointer;}
-.task .tag.active{border-color:black;opacity:0.6;}
-.task .tag.active:hover{opacity:1;}
-.task:hover .tag{opacity:0.5}
-.task:hover .tag:hover{opacity:0.8;}
-
-.task .categories{position:absolute;right:12em;text-align:right;top:0.5em}
-.task .categories a{background-color:#1d2d44;color:white;}
-.task .categories .tag.active{display:none;}
-.task input.categories{display:none;top:0;text-align:left;}
-
-.task .location{background-color:#442d44;color:white;position:absolute;right:0.6em;width:9.2em;text-align:left;top:0.5em}
-.task input.location{display:none;top:0;text-align:left;right:0.3em;background-color:white;color:#333333;}
-
-.task .more{display:none;margin-top:0.5em;}
-.task_less{display:none;}
-
-.task .description{position:relative;left:4em;}
-.task textarea.description{width:35em;height:4em;}
-.task .due{position:absolute;right:0.3em;}
-.task .due .date{width:6em;}
-.task .due .time{width:6em;}
-
-.task_delete{position:absolute;bottom:2px;right:5px}
diff --git a/apps/tasks/img/icon.png b/apps/tasks/img/icon.png
deleted file mode 100644
index e2802ae938..0000000000
Binary files a/apps/tasks/img/icon.png and /dev/null differ
diff --git a/apps/tasks/img/icon.svg b/apps/tasks/img/icon.svg
deleted file mode 100644
index d46ebab865..0000000000
--- a/apps/tasks/img/icon.svg
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16"
-   height="16"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.2 r9819"
-   sodipodi:docname="New document 1">
-  <defs
-     id="defs4">
-    <marker
-       style="overflow:visible"
-       inkscape:stockid="InfiniteLineStart"
-       id="InfiniteLineStart"
-       refX="0"
-       refY="0"
-       orient="auto">
-      <g
-         id="g4011"
-         transform="translate(-13,0)">
-        <circle
-           d="M 3.8,0 C 3.8,0.44182781 3.4418278,0.80000001 3,0.80000001 2.5581722,0.80000001 2.2,0.44182781 2.2,0 c 0,-0.44182781 0.3581722,-0.80000001 0.8,-0.80000001 0.4418278,0 0.8,0.3581722 0.8,0.80000001 z"
-           id="circle4013"
-           r="0.8"
-           cy="0"
-           cx="3" />
-        <circle
-           d="M 7.3,0 C 7.3,0.44182781 6.9418278,0.80000001 6.5,0.80000001 6.0581722,0.80000001 5.7,0.44182781 5.7,0 c 0,-0.44182781 0.3581722,-0.80000001 0.8,-0.80000001 0.4418278,0 0.8,0.3581722 0.8,0.80000001 z"
-           id="circle4015"
-           r="0.8"
-           cy="0"
-           cx="6.5" />
-        <circle
-           d="M 10.8,0 C 10.8,0.44182781 10.441828,0.80000001 10,0.80000001 9.5581722,0.80000001 9.2,0.44182781 9.2,0 c 0,-0.44182781 0.3581722,-0.80000001 0.8,-0.80000001 0.441828,0 0.8,0.3581722 0.8,0.80000001 z"
-           id="circle4017"
-           r="0.8"
-           cy="0"
-           cx="10" />
-      </g>
-    </marker>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="21.051806"
-     inkscape:cy="18.371489"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     showborder="false"
-     inkscape:showpageshadow="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="1004"
-     inkscape:window-x="1278"
-     inkscape:window-y="-3"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1036.3622)">
-    <rect
-       style="fill:none;stroke:#000000;stroke-width:1.00000012;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       id="rect4398"
-       width="9"
-       height="9"
-       x="3.4999998"
-       y="1040.8619" />
-    <path
-       style="fill:none;stroke:#808080;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:none"
-       d="m 3.971,1040.0481 c 3.3062306,2.8933 3.3751101,6.5431 3.3751101,6.5431 0,0 3.8228259,-5.3027 6.2336249,-6.3371"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccc" />
-  </g>
-</svg>
diff --git a/apps/tasks/index.php b/apps/tasks/index.php
deleted file mode 100644
index f1c4d1e765..0000000000
--- a/apps/tasks/index.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/*************************************************
- * ownCloud - Tasks Plugin                        *
- *                                                *
- * (c) Copyright 2011 Bart Visscher               *
- * This file is licensed under the Affero General *
- * Public License version 3 or later.             *
- * See the COPYING-README file.                   *
- *************************************************/
-
-OCP\User::checkLoggedIn();
-OCP\App::checkAppEnabled('tasks');
-
-$calendars = OC_Calendar_Calendar::allCalendars(OCP\User::getUser(), true);
-if( count($calendars) == 0 ) {
-	header('Location: ' . OCP\Util::linkTo('calendar', 'index.php'));
-	exit;
-}
-
-OCP\Util::addScript('3rdparty/timepicker', 'jquery.ui.timepicker');
-OCP\Util::addStyle('3rdparty/timepicker', 'jquery.ui.timepicker');
-OCP\Util::addScript('tasks', 'tasks');
-OCP\Util::addStyle('tasks', 'style');
-OCP\Util::addScript('contacts', 'jquery.multi-autocomplete');
-OCP\Util::addScript('', 'oc-vcategories');
-OCP\App::setActiveNavigationEntry('tasks_index');
-
-$categories = OC_Calendar_App::getCategoryOptions();
-$priority_options = OC_Task_App::getPriorityOptions();
-$output = new OCP\Template('tasks', 'tasks', 'user');
-$output->assign('priority_options', $priority_options);
-$output->assign('categories', $categories);
-$output -> printPage();
diff --git a/apps/tasks/js/tasks.js b/apps/tasks/js/tasks.js
deleted file mode 100644
index de62792750..0000000000
--- a/apps/tasks/js/tasks.js
+++ /dev/null
@@ -1,473 +0,0 @@
-OC.Tasks = {
-	bool_string_cmp:function(a, b) {
-		if (a === b) {
-			return 0;
-		}
-		if (a === false) {
-			return -1;
-		}
-		if (b === false) {
-			return 1;
-		}
-		return a.localeCompare(b);
-	},
-	create_task_div:function(task) {
-		var actions = $('#task_actions_template');
-		var summary_container = $('<p class="summary">')
-				.attr('title', task.description)
-				;
-		OC.Tasks.setSummary(summary_container, task);
-		var task_container = $('<div>')
-			.addClass('task')
-			.data('task', task)
-			.data('show_count', 0)
-			.attr('data-id', task.id)
-			.append(summary_container)
-			.append(actions.clone().removeAttr('id'))
-			;
-		task_container.find('.summary a').click(OC.Tasks.summaryClickHandler);
-		var checkbox = $('<input type="checkbox">')
-			.click(OC.Tasks.complete_task);
-		if (task.completed) {
-			checkbox.attr('checked', 'checked');
-			task_container.addClass('done');
-		}
-		$('<div>')
-			.addClass('completed')
-			.append(checkbox)
-			.prependTo(task_container);
-		var priority = task.priority;
-		$('<div>')
-			.addClass('tag')
-			.addClass('priority')
-			.addClass('priority-'+(priority?priority:'n'))
-			.text(priority)
-			.prependTo(task_container);
-		if (task.location) {
-			$('<div>')
-				.addClass('tag')
-				.addClass('location')
-				.text(task.location)
-				.appendTo(task_container);
-		}
-		var $categories = $('<div>')
-				.addClass('categories')
-				.appendTo(task_container);
-		$(task.categories).each(function(i, category){
-				$categories.append($('<a>')
-					.addClass('tag')
-					.text(category)
-				);
-		});
-		task_container.find('.task_more').click(OC.Tasks.moreClickHandler);
-		task_container.find('.task_less').click(OC.Tasks.lessClickHandler);
-		var description = $('<textarea>')
-			.addClass('description')
-			.blur(function(){
-				var task = $(this).closest('.task').data('task');
-				var description = $(this).val();
-				$.post(OC.filePath('tasks', 'ajax', 'update_property.php'), {id:task.id, type:'description', description:description}, function(jsondata){
-					if(jsondata.status == 'success') {
-						task.description = description;
-					}
-				});
-			})
-			.text(task.description);
-		var due = $('<span>')
-			.addClass('due')
-			.append(t('tasks', 'Due'));
-		due
-			.append($('<input type="date">')
-					.addClass('date')
-					.datepicker({
-						dateFormat: 'dd-mm-yy',
-						onClose: OC.Tasks.dueUpdateHandler
-					}),
-				$('<input type="time">')
-					.addClass('time')
-					.timepicker({
-						showPeriodLabels:false,
-						onClose: OC.Tasks.dueUpdateHandler
-					})
-			);
-		if (task.due){
-			var date = new Date(parseInt(task.due)*1000);
-			due.find('.date').datepicker('setDate', date);
-			if (!task.due_date_only) {
-				due.find('.time').timepicker('setTime', date.getHours()+':'+date.getMinutes());
-			}
-		}
-		var delete_action = task_container.find('.task_delete').click(OC.Tasks.deleteClickHandler);
-		$('<div>')
-			.addClass('more')
-			.append(delete_action)
-			.append(description)
-			.append(due)
-			.appendTo(task_container);
-		$('<input placeholder="'+t('tasks', 'List')+'">')
-			.addClass('categories')
-			.multiple_autocomplete({source: categories})
-			.val(task.categories)
-			.blur(function(){
-				var task = $(this).closest('.task').data('task');
-				var categories = $(this).val();
-				$.post(OC.filePath('tasks', 'ajax', 'update_property.php'), {id:task.id, type:'categories', categories:categories}, function(jsondata){
-					if(jsondata.status == 'success') {
-						task.categories = categories.split(',');
-						$categories.empty();
-						$(task.categories).each(function(i, category){
-							$categories.append($('<a>')
-								.addClass('tag')
-								.text(category)
-								);
-							});
-					}
-				});
-			})
-			.appendTo(task_container);
-		$('<input placeholder="'+t('tasks', 'Location')+'">')
-			.addClass('location')
-			.val(task.location)
-			.blur(function(){
-				var task = $(this).closest('.task').data('task');
-				var location = $(this).val();
-				$.post(OC.filePath('tasks', 'ajax', 'update_property.php'), {id:task.id, type:'location', location:location}, function(jsondata){
-					if(jsondata.status == 'success') {
-						task.location = location;
-						task_container.find('.location').text(location);
-					}
-				});
-			})
-			.appendTo(task_container);
-		return task_container;
-	},
-	filter:function(tag, find_filter) {
-		var tag_text = $(tag).text();
-		var filter = !$(tag).hasClass('active');
-		OC.Tasks.filterUpdate(filter, function(task_container){
-			var found = 0;
-			task_container.find(find_filter).each(function(){
-				if ($(this).text() == tag_text) {
-					$(this).toggleClass('active');
-					found = 1;
-				}
-			});
-			return found;
-		});
-	},
-	filterUpdate:function(filter, find_filter) {
-		var show_count = $('#tasks_list').data('show_count');
-		show_count += filter ? +1 : -1;
-		$('#tasks_list').data('show_count', show_count);
-		$('#tasks_lists .task, #tasks_list .task').each(function(i, task_container){
-			task_container = $(task_container);
-			var task = task_container.data('task');
-			var found = find_filter(task_container);
-			var hide_count = task_container.data('show_count');
-			if (!filter) {
-				hide_count-=found;
-			}
-			else {
-				hide_count+=found;
-			}
-			if (hide_count == show_count) {
-				task_container.show();
-			}
-			else {
-				task_container.hide();
-			}
-			task_container.data('show_count', hide_count);
-		});
-	},
-	order:function(sort, get_property, empty_label) {
-		var tasks = $('#tasks_list .task').not('.clone');
-		tasks.sort(sort);
-		var current = null;
-		tasks.detach();
-		var $tasks = $('#tasks_list').empty();
-		var container = $tasks;
-		tasks.each(function(){
-			if (get_property) {
-				var label = get_property($(this).data('task'));
-				if(label != current) {
-					current = label;
-					container = $('<div>').appendTo($tasks);
-					if (label == '' && empty_label) {
-						label = empty_label;
-					}
-					$('<h1>').text(label).appendTo(container);
-				}
-			}
-			container.append(this);
-		});
-	},
-	setSummary:function(summary_container, task){
-		var summary = $('<a href="index.php?id='+task.id+'">')
-			.text(task.summary)
-			.click(OC.Tasks.summaryClickHandler);
-		summary_container.html(summary);
-	},
-	summaryClickHandler:function(event){
-		event.preventDefault();
-		//event.stopPropagation();
-		var task = $(this).closest('.task').data('task');
-		var summary_container = $(this).parent();
-		var input = $('<input>').val($(this).text()).blur(function(){
-			var old_summary = task.summary;
-			task.summary = $(this).val();
-			OC.Tasks.setSummary(summary_container, task);
-			$.post(OC.filePath('tasks', 'ajax', 'update_property.php'), {id:task.id, type:'summary', summary:task.summary}, function(jsondata){
-				if(jsondata.status != 'success') {
-					task.summary = old_summary;
-					OC.Tasks.setSummary(summary_container, task);
-				}
-			});
-		});
-		summary_container.empty().append(input);
-		input.focus();
-		return false;
-	},
-	dueUpdateHandler:function(){
-		var task = $(this).closest('.task').data('task');
-		var old_due = task.due;
-		var $date = $(this).parent().children('.date');
-		var $time = $(this).parent().children('.time');
-		var date = $date.datepicker('getDate');
-		var time = $time.val().split(':');
-		var due, date_only = false;
-		if (!date){
-			due = false;
-		} else {
-			if (time.length==2){
-				date.setHours(time[0]);
-				date.setMinutes(time[1]);
-			}
-			else {
-				date_only = true;
-			}
-			due = date.getTime()/1000;
-		}
-		$.post(OC.filePath('tasks', 'ajax', 'update_property.php'), {id:task.id, type:'due', due:due, date:date_only?1:0}, function(jsondata){
-			if(jsondata.status != 'success') {
-				task.due = old_due;
-			}
-		});
-	},
-	moreClickHandler:function(event){
-		var $task = $(this).closest('.task'),
-			task = $task.data('task');
-		$task.find('.more').show();
-		$task.find('.task_more').hide();
-		$task.find('.task_less').show();
-		$task.find('div.categories').hide();
-		$task.find('input.categories').show();
-		$task.find('div.location').hide();
-		$task.find('input.location').show();
-	},
-	lessClickHandler:function(event){
-		var $task = $(this).closest('.task'),
-			task = $task.data('task');
-		$task.find('.more').hide();
-		$task.find('.task_more').show();
-		$task.find('.task_less').hide();
-		$task.find('div.categories').show();
-		$task.find('input.categories').hide();
-		$task.find('div.location').show();
-		$task.find('input.location').hide();
-	},
-	deleteClickHandler:function(event){
-		var $task = $(this).closest('.task'),
-			task = $task.data('task');
-		$.post(OC.filePath('tasks', 'ajax', 'delete.php'),{'id':task.id},function(jsondata){
-			if(jsondata.status == 'success'){
-				$task.remove();
-			}
-			else{
-				alert(jsondata.data.message);
-			}
-		});
-		return false;
-	},
-	complete_task:function() {
-		var $task = $(this).closest('.task'),
-			task = $task.data('task'),
-			checked = $(this).is(':checked');
-		$.post(OC.filePath('tasks', 'ajax', 'update_property.php'), {id:task.id, type:'complete', checked:checked?1:0}, function(jsondata){
-			if(jsondata.status == 'success') {
-				task = jsondata.data;
-				$task.data('task', task)
-				if (task.completed) {
-					$task.addClass('done');
-				}
-				else {
-					$task.removeClass('done');
-				}
-			}
-			else{
-				alert(jsondata.data.message);
-			}
-		}, 'json');
-	},
-	categoriesChanged:function(newcategories){
-		categories = $.map(newcategories, function(v) {return v;});
-		console.log('Task categories changed to: ' + categories);
-		$('input.categories').multiple_autocomplete('option', 'source', categories);
-	},
-	List: {
-		create_list_div:function(category){
-			return $('<div>').text(category)
-				.click(function(){
-					OC.Tasks.filter(this, 'div.categories .tag');
-					$(this).toggleClass('active');
-				});
-		}
-	}
-};
-
-$(document).ready(function(){
-	$(window).resize(function () {
-		fillHeight($('#tasks_lists'));
-		fillWindow($('#tasks_list'));
-	});
-	$(window).trigger('resize');
-
-	/*-------------------------------------------------------------------------
-	 * Actions for startup
-	 *-----------------------------------------------------------------------*/
-	$.getJSON(OC.filePath('tasks', 'ajax', 'gettasks.php'), function(jsondata) {
-		var tasks = $('#tasks_list').empty().data('show_count', 0);
-		$(jsondata).each(function(i, task) {
-			tasks.append(OC.Tasks.create_task_div(task));
-		});
-		if( $('#tasks_list div').length > 0 ){
-			$('#tasks_list div').first().addClass('active');
-		}
-		$(categories).each(function(i, category) {
-			$('#tasks_lists .all').after(OC.Tasks.List.create_list_div(category));
-		});
-		$('#tasks_lists .all').click(function(){
-			$('#tasks_lists .active').click();
-		});
-		$('#tasks_lists .done').click(function(){
-			var filter = !$(this).hasClass('active');
-			OC.Tasks.filterUpdate(filter, function(task_container){
-				return task_container.hasClass('done');
-			});
-			$(this).toggleClass('active');
-		});
-		OCCategories.changed = OC.Tasks.categoriesChanged;
-		OCCategories.app = 'calendar';
-	});
-
-	/*-------------------------------------------------------------------------
-	 * Event handlers
-	 *-----------------------------------------------------------------------*/
-	$('#tasks_list div.categories .tag').live('click',function(){
-		OC.Tasks.filter(this, 'div.categories .tag');
-		var tag_text = $(this).text();
-		$('#tasks_lists div:not(".all"):not(".done")').each(function(){
-			if ($(this).text() == tag_text) {
-				$(this).toggleClass('active');
-			}
-		});
-	});
-
-	$('#tasks_list .priority.tag').live('click',function(){
-		OC.Tasks.filter(this, '.priority.tag');
-	});
-
-	$('#tasks_list .location.tag').live('click',function(){
-		OC.Tasks.filter(this, '.location.tag');
-	});
-
-	$('#tasks_order_category').click(function(){
-		var tasks = $('#tasks_list .task').not('.clone');
-		var collection = {};
-		tasks.each(function(i, task) {
-			var categories = $(task).data('task').categories;
-			$(categories).each(function() {
-				if (!collection.hasOwnProperty(this)) {
-					collection[this] = [];
-				}
-				collection[this].push(task);
-				if (categories.length > 1) {
-					task = $(task).clone(true).addClass('clone').get(0);
-				}
-			});
-			if (categories.length == 0) {
-				if (!collection.hasOwnProperty('')) {
-					collection[''] = [];
-				}
-				collection[''].push(task);
-			}
-		});
-		var labels = [];
-		for (var label in collection) {
-			labels.push(label);
-		}
-		labels.sort();
-		tasks.detach();
-		var $tasks = $('#tasks_list').empty();
-		for (var index in labels) {
-			var label = labels[index];
-			var container = $('<div>').appendTo($tasks);
-			if (label == '') {
-				label = t('tasks', 'No category');
-			}
-			$('<h1>').text(label).appendTo(container);
-			container.append(collection[labels[index]]);
-		}
-	});
-
-	$('#tasks_order_due').click(function(){
-		OC.Tasks.order(function(a, b){
-			a = $(a).data('task').due;
-			b = $(b).data('task').due;
-			return OC.Tasks.bool_string_cmp(a, b);
-		});
-	});
-
-	$('#tasks_order_complete').click(function(){
-		OC.Tasks.order(function(a, b){
-			return ($(a).data('task').complete - $(b).data('task').complete) ||
-				OC.Tasks.bool_string_cmp($(a).data('task').completed, $(b).data('task').completed);
-		});
-	});
-
-	$('#tasks_order_location').click(function(){
-		OC.Tasks.order(function(a, b){
-			a = $(a).data('task').location;
-			b = $(b).data('task').location;
-			return OC.Tasks.bool_string_cmp(a, b);
-		});
-	});
-
-	$('#tasks_order_prio').click(function(){
-		OC.Tasks.order(function(a, b){
-			return $(a).data('task').priority
-			     - $(b).data('task').priority;
-		});
-	});
-
-	$('#tasks_order_label').click(function(){
-		OC.Tasks.order(function(a, b){
-			return $(a).data('task').summary.localeCompare(
-			       $(b).data('task').summary);
-		});
-	});
-
-	$('#tasks_addtask').click(function(){
-		var input = $('#tasks_newtask').val();
-		$.post(OC.filePath('tasks', 'ajax', 'addtask.php'),{text:input},function(jsondata){
-			if(jsondata.status == 'success'){
-				$('#tasks_list').append(OC.Tasks.create_task_div(jsondata.task));
-			}
-			else{
-				alert(jsondata.data.message);
-			}
-		});
-		return false;
-	});
-
-	OCCategories.app = 'calendar';
-});
diff --git a/apps/tasks/l10n/.gitkeep b/apps/tasks/l10n/.gitkeep
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/apps/tasks/l10n/ca.php b/apps/tasks/l10n/ca.php
deleted file mode 100644
index 2608d8b9b1..0000000000
--- a/apps/tasks/l10n/ca.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Invalid date/time" => "data/hora incorrecta",
-"Tasks" => "Tasques",
-"No category" => "Cap categoria",
-"Unspecified" => "Sense especificar",
-"1=highest" => "1=major",
-"5=medium" => "5=mitjana",
-"9=lowest" => "9=inferior",
-"Empty Summary" => "Elimina el resum",
-"Invalid percent complete" => "Percentatge completat no vàlid",
-"Invalid priority" => "Prioritat no vàlida",
-"Add Task" => "Afegeix una tasca",
-"Order Due" => "Ordena per",
-"Order List" => "Ordena per llista",
-"Order Complete" => "Ordena els complets",
-"Order Location" => "Ordena per ubicació",
-"Order Priority" => "Ordena per prioritat",
-"Order Label" => "Ordena per etiqueta",
-"Loading tasks..." => "Carregant les tasques...",
-"Important" => "Important",
-"More" => "Més",
-"Less" => "Menys",
-"Delete" => "Elimina"
-);
diff --git a/apps/tasks/l10n/cs_CZ.php b/apps/tasks/l10n/cs_CZ.php
deleted file mode 100644
index 9da5f7ab60..0000000000
--- a/apps/tasks/l10n/cs_CZ.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Invalid date/time" => "Neplatné datum/čas",
-"Tasks" => "Úkoly",
-"No category" => "Bez kategorie",
-"1=highest" => "1=nejvyšší",
-"5=medium" => "5=střední",
-"9=lowest" => "9=nejnižší",
-"Invalid priority" => "Neplatná priorita",
-"Add Task" => "Přidat úkol",
-"Loading tasks..." => "Načítám úkoly...",
-"Important" => "Důležité",
-"More" => "Více",
-"Less" => "Méně",
-"Delete" => "Smazat"
-);
diff --git a/apps/tasks/l10n/da.php b/apps/tasks/l10n/da.php
deleted file mode 100644
index a413f22d17..0000000000
--- a/apps/tasks/l10n/da.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Invalid date/time" => "Ugyldig dato/tid",
-"Tasks" => "Opgaver",
-"No category" => "Ingen kategori",
-"Unspecified" => "Uspecificeret",
-"1=highest" => "1=højeste",
-"5=medium" => "5=mellem",
-"9=lowest" => "9=laveste",
-"Empty Summary" => "Tom beskrivelse",
-"Add Task" => "Tilføj opgave",
-"Loading tasks..." => "Indlæser opgaver...",
-"Important" => "vigtigt",
-"More" => "Mere",
-"Less" => "Mindre",
-"Delete" => "Slet"
-);
diff --git a/apps/tasks/l10n/de.php b/apps/tasks/l10n/de.php
deleted file mode 100644
index 29b9bf41ec..0000000000
--- a/apps/tasks/l10n/de.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Invalid date/time" => "Datum/Uhrzeit ungültig",
-"Tasks" => "Aufgaben",
-"No category" => "Keine Kategorie",
-"Unspecified" => "Nicht angegeben",
-"1=highest" => "1 = am höchsten",
-"5=medium" => "5 = Durchschnitt",
-"9=lowest" => "9 = am niedrigsten",
-"Empty Summary" => "Leere Zusammenfassung",
-"Invalid percent complete" => "Ungültige Prozent abgeschlossen",
-"Invalid priority" => "Falsche Priorität",
-"Add Task" => "Aufgabe hinzufügen",
-"Order Due" => "Nach Fälligkeit sortieren",
-"Order List" => "Nach Kategorie sortieren ",
-"Order Complete" => "Nach Fertigstellung sortieren",
-"Order Location" => "Nach Ort sortieren",
-"Order Priority" => "Nach Priorität sortieren",
-"Order Label" => "Nach Label sortieren",
-"Loading tasks..." => "Lade Aufgaben ...",
-"Important" => "Wichtig",
-"More" => "Mehr",
-"Less" => "Weniger",
-"Delete" => "Löschen"
-);
diff --git a/apps/tasks/l10n/el.php b/apps/tasks/l10n/el.php
deleted file mode 100644
index cdf2f609e5..0000000000
--- a/apps/tasks/l10n/el.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Invalid date/time" => "Μην έγκυρη ημερομηνία / ώρα",
-"Tasks" => "Εργασίες",
-"No category" => "Χωρίς κατηγορία",
-"Unspecified" => "Μη ορισμένο",
-"1=highest" => "1=υψηλότερο",
-"5=medium" => "5=μέτριο",
-"9=lowest" => "9=χαμηλότερο",
-"Empty Summary" => "Άδεια περίληψη",
-"Invalid percent complete" => "Μη έγκυρο ποσοστό ολοκλήρωσης",
-"Invalid priority" => "Μη έγκυρη προτεραιότητα ",
-"Add Task" => "Προσθήκη εργασίας",
-"Loading tasks..." => "Φόρτωση εργασιών...",
-"Important" => "Σημαντικό ",
-"More" => "Περισσότερα",
-"Less" => "Λιγότερα",
-"Delete" => "Διαγραφή"
-);
diff --git a/apps/tasks/l10n/eo.php b/apps/tasks/l10n/eo.php
deleted file mode 100644
index 9919a6ea63..0000000000
--- a/apps/tasks/l10n/eo.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Invalid date/time" => "Nevalida dato/horo",
-"Tasks" => "Taskoj",
-"No category" => "Neniu kategorio",
-"Unspecified" => "Nespecifita",
-"1=highest" => "1=plej alta",
-"5=medium" => "5=meza",
-"9=lowest" => "9=plej malalta",
-"Empty Summary" => "Malplena resumo",
-"Invalid percent complete" => "Nevalida plenuma elcento",
-"Invalid priority" => "Nevalida pligravo",
-"Add Task" => "Aldoni taskon",
-"Order Due" => "Ordigi laŭ limdato",
-"Order List" => "Ordigi laŭ listo",
-"Order Complete" => "Ordigi laŭ plenumo",
-"Order Location" => "Ordigi laŭ loko",
-"Order Priority" => "Ordigi laŭ pligravo",
-"Order Label" => "Ordigi laŭ etikedo",
-"Loading tasks..." => "Ŝargante taskojn...",
-"Important" => "Grava",
-"More" => "Pli",
-"Less" => "Malpli",
-"Delete" => "Forigi"
-);
diff --git a/apps/tasks/l10n/es.php b/apps/tasks/l10n/es.php
deleted file mode 100644
index e5f0981de5..0000000000
--- a/apps/tasks/l10n/es.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Invalid date/time" => "Fecha/hora inválida",
-"Tasks" => "Tareas",
-"No category" => "Sin categoría",
-"Unspecified" => "Sin especificar",
-"1=highest" => "1=mayor",
-"5=medium" => "5=media",
-"9=lowest" => "9=menor",
-"Empty Summary" => "Resumen vacío",
-"Invalid percent complete" => "Porcentaje completado inválido",
-"Invalid priority" => "Prioridad inválida",
-"Add Task" => "Agregar tarea",
-"Order Due" => "Ordenar por",
-"Order List" => "Ordenar por lista",
-"Order Complete" => "Ordenar por completadas",
-"Order Location" => "Ordenar por ubicación",
-"Order Priority" => "Ordenar por prioridad",
-"Order Label" => "Ordenar por etiqueta",
-"Loading tasks..." => "Cargando tareas...",
-"Important" => "Importante",
-"More" => "Más",
-"Less" => "Menos",
-"Delete" => "Borrar"
-);
diff --git a/apps/tasks/l10n/et_EE.php b/apps/tasks/l10n/et_EE.php
deleted file mode 100644
index 56db6ee032..0000000000
--- a/apps/tasks/l10n/et_EE.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Invalid date/time" => "Vigane kuupäev/kellaaeg",
-"Tasks" => "Ülesanded",
-"No category" => "Kategooriat pole",
-"Unspecified" => "Määramata",
-"1=highest" => "1=kõrgeim",
-"5=medium" => "5=keskmine",
-"9=lowest" => "9=madalaim",
-"Empty Summary" => "Tühi kokkuvõte",
-"Invalid percent complete" => "Vigane edenemise protsent",
-"Invalid priority" => "Vigane tähtsus",
-"Add Task" => "Lisa ülesanne",
-"Order Due" => "Tähtaja järgi",
-"Order List" => "Nimekirja järgi",
-"Order Complete" => "Edenemise järgi",
-"Order Location" => "Asukoha järgi",
-"Order Priority" => "Tähtsuse järjekorras",
-"Order Label" => "Sildi järgi",
-"Loading tasks..." => "Ülesannete laadimine...",
-"Important" => "Tähtis",
-"More" => "Rohkem",
-"Less" => "Vähem",
-"Delete" => "Kustuta"
-);
diff --git a/apps/tasks/l10n/fa.php b/apps/tasks/l10n/fa.php
deleted file mode 100644
index 40b5b610f4..0000000000
--- a/apps/tasks/l10n/fa.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Tasks" => "وظایف",
-"1=highest" => "1=بیش‌ترین",
-"5=medium" => "5=متوسط",
-"9=lowest" => "9=کم‌ترین",
-"Loading tasks..." => "درحال بارگزاری وظایف",
-"Important" => "مهم",
-"More" => "بیش‌تر",
-"Less" => "کم‌تر",
-"Delete" => "حذف"
-);
diff --git a/apps/tasks/l10n/fi_FI.php b/apps/tasks/l10n/fi_FI.php
deleted file mode 100644
index 7948e712e9..0000000000
--- a/apps/tasks/l10n/fi_FI.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Invalid date/time" => "Virheellinen päivä tai aika",
-"Tasks" => "Tehtävät",
-"No category" => "Ei luokkaa",
-"Unspecified" => "Määrittelemätön",
-"1=highest" => "1=korkein",
-"5=medium" => "5=keskitaso",
-"9=lowest" => "9=matalin",
-"Empty Summary" => "Tyhjä yhteenveto",
-"Invalid priority" => "Virheellinen prioriteetti",
-"Add Task" => "Lisää tehtävä",
-"Loading tasks..." => "Ladataan tehtäviä...",
-"Important" => "Tärkeä",
-"More" => "Enemmän",
-"Less" => "Vähemmän",
-"Delete" => "Poista"
-);
diff --git a/apps/tasks/l10n/fr.php b/apps/tasks/l10n/fr.php
deleted file mode 100644
index 5b0a0321a8..0000000000
--- a/apps/tasks/l10n/fr.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Invalid date/time" => "date/heure invalide",
-"Tasks" => "Tâches",
-"No category" => "Sans catégorie",
-"Unspecified" => "Non spécifié",
-"1=highest" => "1=le plus important",
-"5=medium" => "5=importance moyenne",
-"9=lowest" => "9=le moins important",
-"Empty Summary" => "Résumé vide",
-"Invalid percent complete" => "Pourcentage d'achèvement invalide",
-"Invalid priority" => "Priorité invalide",
-"Add Task" => "Ajouter une tâche",
-"Order Due" => "Echéance tâche",
-"Order List" => "Liste tâche",
-"Order Complete" => "Tâche réalisée",
-"Order Location" => "Lieu",
-"Order Priority" => "Priorité",
-"Order Label" => "Etiquette tâche",
-"Loading tasks..." => "Chargement des tâches…",
-"Important" => "Important",
-"More" => "Plus",
-"Less" => "Moins",
-"Delete" => "Supprimer"
-);
diff --git a/apps/tasks/l10n/it.php b/apps/tasks/l10n/it.php
deleted file mode 100644
index 1aac8aac88..0000000000
--- a/apps/tasks/l10n/it.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Invalid date/time" => "Ora/Data non valida",
-"Tasks" => "Attività",
-"No category" => "Nessuna categoria",
-"Unspecified" => "Non specificata",
-"1=highest" => "1=massima",
-"5=medium" => "5=media",
-"9=lowest" => "9=minima",
-"Empty Summary" => "Riepilogo vuoto",
-"Invalid percent complete" => "Percentuale di completamento non valida",
-"Invalid priority" => "Priorità non valida",
-"Add Task" => "Aggiungi attività",
-"Order Due" => "Ordina per scadenza",
-"Order List" => "Ordina per elenco",
-"Order Complete" => "Ordina per completamento",
-"Order Location" => "Ordina per posizione",
-"Order Priority" => "Ordina per priorità",
-"Order Label" => "Ordina per etichetta",
-"Loading tasks..." => "Caricamento attività in corso...",
-"Important" => "Importante",
-"More" => "Più",
-"Less" => "Meno",
-"Delete" => "Elimina"
-);
diff --git a/apps/tasks/l10n/ja_JP.php b/apps/tasks/l10n/ja_JP.php
deleted file mode 100644
index b5b526c595..0000000000
--- a/apps/tasks/l10n/ja_JP.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Invalid date/time" => "無効な日付／時刻",
-"Tasks" => "タスク",
-"No category" => "カテゴリ無し",
-"Unspecified" => "未指定",
-"1=highest" => "1=高",
-"5=medium" => "5=中",
-"9=lowest" => "9=低",
-"Empty Summary" => "要旨が未記入",
-"Invalid percent complete" => "進捗％が不正",
-"Invalid priority" => "無効な優先度",
-"Add Task" => "タスクを追加",
-"Order Due" => "期日で並べ替え",
-"Order List" => "リストで並び替え",
-"Order Complete" => "完了で並べ替え",
-"Order Location" => "場所で並べ替え",
-"Order Priority" => "優先度で並べ替え",
-"Order Label" => "ラベルで並べ替え",
-"Loading tasks..." => "タスクをロード中...",
-"Important" => "重要",
-"More" => "詳細",
-"Less" => "閉じる",
-"Delete" => "削除"
-);
diff --git a/apps/tasks/l10n/lt_LT.php b/apps/tasks/l10n/lt_LT.php
deleted file mode 100644
index 7c17fc2224..0000000000
--- a/apps/tasks/l10n/lt_LT.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Invalid date/time" => "Netinkama data/laikas",
-"No category" => "Be kategorijos",
-"Empty Summary" => "Tuščias aprašymas",
-"Invalid percent complete" => "Netinkamas baigimo procentas",
-"Important" => "Svarbūs",
-"More" => "Daugiau",
-"Less" => "Mažiau",
-"Delete" => "Ištrinti"
-);
diff --git a/apps/tasks/l10n/nb_NO.php b/apps/tasks/l10n/nb_NO.php
deleted file mode 100644
index a6b398857b..0000000000
--- a/apps/tasks/l10n/nb_NO.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Invalid date/time" => "feil i dato/klokkeslett",
-"Tasks" => "Oppgaver",
-"No category" => "Ingen kategori",
-"Unspecified" => "Uspesifisert",
-"1=highest" => "1=høyest",
-"5=medium" => "5=middels",
-"9=lowest" => "9=lavest",
-"Invalid percent complete" => "Feil i prosent fullført",
-"Invalid priority" => "Ulovlig prioritet",
-"Add Task" => "Legg til oppgave",
-"Loading tasks..." => "Henter oppgaver...",
-"Important" => "Viktig",
-"More" => "Mer",
-"Less" => "Mindre",
-"Delete" => "Slett"
-);
diff --git a/apps/tasks/l10n/pl.php b/apps/tasks/l10n/pl.php
deleted file mode 100644
index 4879628486..0000000000
--- a/apps/tasks/l10n/pl.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Invalid date/time" => "Zła data/czas",
-"Tasks" => "Zadania",
-"No category" => "Brak kategorii",
-"Unspecified" => "Nieokreślona",
-"1=highest" => "1=najwyższy",
-"5=medium" => "5=średni",
-"9=lowest" => "9=mało ważny ",
-"Empty Summary" => "Podsumowanie puste",
-"Invalid percent complete" => "Nieprawidłowy procent wykonania",
-"Invalid priority" => "Nieprawidłowy priorytet",
-"Add Task" => "Dodaj zadanie",
-"Order Due" => "Kolejność - domyślna",
-"Order List" => "Kolejność - wg lista",
-"Order Complete" => "Kolejność - wg kompletności",
-"Order Location" => "Kolejność - wg lokalizacja",
-"Order Priority" => "Kolejność - wg priorytetu",
-"Order Label" => "Kolejność - wg nazywy",
-"Loading tasks..." => "Ładuję zadania",
-"Important" => "Ważne",
-"More" => "Więcej",
-"Less" => "Mniej",
-"Delete" => "Usuń"
-);
diff --git a/apps/tasks/l10n/ro.php b/apps/tasks/l10n/ro.php
deleted file mode 100644
index 54958582f5..0000000000
--- a/apps/tasks/l10n/ro.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Invalid date/time" => "Data/timpul invalid",
-"Tasks" => "Sarcini",
-"No category" => "Fără categorie",
-"Unspecified" => "Nespecificat",
-"1=highest" => "1=cel mai înalt",
-"5=medium" => "5=mediu",
-"9=lowest" => "9=cel mai jos",
-"Empty Summary" => "Rezumat gol",
-"Invalid percent complete" => "Completare procentuală greșită",
-"Invalid priority" => "Prioritare greșită",
-"Add Task" => "Adaugă sarcină",
-"Order Due" => "Comandă până la",
-"Order List" => "Lista de comenzi",
-"Order Complete" => "Comandă executată",
-"Order Location" => "Locația comenzii",
-"Order Priority" => "Prioritarea comenzii",
-"Order Label" => "Eticheta comenzii",
-"Loading tasks..." => "Încărcare sarcini",
-"Important" => "Important",
-"More" => "Mai mult",
-"Less" => "Mai puțin",
-"Delete" => "Șterge"
-);
diff --git a/apps/tasks/l10n/ru.php b/apps/tasks/l10n/ru.php
deleted file mode 100644
index ce208cb071..0000000000
--- a/apps/tasks/l10n/ru.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Invalid date/time" => "Неверные дата/время",
-"Tasks" => "Задачи",
-"No category" => "Нет категории",
-"Unspecified" => "Не указан",
-"1=highest" => "1=наибольший",
-"5=medium" => "5=средний",
-"9=lowest" => "9=наименьший",
-"Empty Summary" => "Пустая сводка",
-"Invalid percent complete" => "Неверный процент завершения",
-"Invalid priority" => "Неверный приоритет",
-"Add Task" => "Добавить задачу",
-"Order Due" => "Срок заказа",
-"Order List" => "Order List",
-"Order Complete" => "Заказ выполнен",
-"Order Location" => "Местонахождение заказа",
-"Order Priority" => "Приоритет заказа",
-"Order Label" => "Метка заказа",
-"Loading tasks..." => "Загрузка задач...",
-"Important" => "Важный",
-"More" => "Больше",
-"Less" => "Меньше",
-"Delete" => "Удалить"
-);
diff --git a/apps/tasks/l10n/sl.php b/apps/tasks/l10n/sl.php
deleted file mode 100644
index c235ff0bc4..0000000000
--- a/apps/tasks/l10n/sl.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Invalid date/time" => "Neveljaven datum/čas",
-"Tasks" => "Opravila",
-"No category" => "Ni kategorije",
-"Unspecified" => "Nedoločen",
-"1=highest" => "1=najvišje",
-"5=medium" => "5=srednje",
-"9=lowest" => "9=najnižje",
-"Empty Summary" => "Prazen povzetek",
-"Invalid percent complete" => "Neveljaven odstotek dokončanja",
-"Invalid priority" => "Neveljavna prednost",
-"Add Task" => "Dodaj opravilo",
-"Order Due" => "Razvrsti po roku",
-"Order List" => "Razvrsti v seznam",
-"Order Complete" => "Razvrsti po zaključenosti",
-"Order Location" => "Razvrsti po lokacijah",
-"Order Priority" => "Razvrsti po prednosti",
-"Order Label" => "Razvrsti po oznakah",
-"Loading tasks..." => "Nalagam opravila...",
-"Important" => "Pomembno",
-"More" => "Več",
-"Less" => "Manj",
-"Delete" => "Izbriši"
-);
diff --git a/apps/tasks/l10n/sv.php b/apps/tasks/l10n/sv.php
deleted file mode 100644
index 33bab14448..0000000000
--- a/apps/tasks/l10n/sv.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Invalid date/time" => "Felaktigt datum/tid",
-"Tasks" => "Uppgifter",
-"No category" => "Ingen kategori",
-"Unspecified" => "Ospecificerad ",
-"1=highest" => "1=högsta",
-"5=medium" => "5=mellan",
-"9=lowest" => "9=lägsta",
-"Empty Summary" => "Tom sammanfattning",
-"Invalid percent complete" => "Ogiltig andel procent klar",
-"Invalid priority" => "Felaktig prioritet",
-"Add Task" => "Lägg till uppgift",
-"Order Due" => "Förfaller",
-"Order List" => "Kategori",
-"Order Complete" => "Slutförd",
-"Order Location" => "Plats",
-"Order Priority" => "Prioritet",
-"Order Label" => "Etikett",
-"Loading tasks..." => "Laddar uppgifter...",
-"Important" => "Viktigt",
-"More" => "Mer",
-"Less" => "Mindre",
-"Delete" => "Radera"
-);
diff --git a/apps/tasks/l10n/th_TH.php b/apps/tasks/l10n/th_TH.php
deleted file mode 100644
index e4212bf291..0000000000
--- a/apps/tasks/l10n/th_TH.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Invalid date/time" => "วันที่ / เวลา ไม่ถูกต้อง",
-"Tasks" => "งาน",
-"No category" => "ไม่มีหมวดหมู่",
-"Unspecified" => "ยังไม่ได้ระบุ",
-"1=highest" => "1=สูงสุด",
-"5=medium" => "5=ปานกลาง",
-"9=lowest" => "9=ต่ำสุด",
-"Empty Summary" => "ข้อมูลสรุปยังว่างอยู่",
-"Invalid percent complete" => "สัดส่วนเปอร์เซ็นต์ความสมบูรณ์ไม่ถูกต้อง",
-"Invalid priority" => "ความสำคัญไม่ถูกต้อง",
-"Add Task" => "เพิ่มงานใหม่",
-"Order Due" => "จัดเรียงตามกำหนดเวลา",
-"Order List" => "จัดเรียงตามรายชื่อ",
-"Order Complete" => "จัดเรียงตามความสมบูรณ์",
-"Order Location" => "จัดเรียงตามตำแหน่งที่อยู่",
-"Order Priority" => "จัดเรียงตามระดับความสำคัญ",
-"Order Label" => "จัดเรียงตามป้ายชื่อ",
-"Loading tasks..." => "กำลังโหลดข้อมูลงาน...",
-"Important" => "สำคัญ",
-"More" => "มาก",
-"Less" => "น้อย",
-"Delete" => "ลบ"
-);
diff --git a/apps/tasks/lib/app.php b/apps/tasks/lib/app.php
deleted file mode 100644
index a97c6b95d1..0000000000
--- a/apps/tasks/lib/app.php
+++ /dev/null
@@ -1,188 +0,0 @@
-<?php
-/**
- * ownCloud - Calendar
- *
- * @author Bart Visscher
- * @copyright 2011 Bart Visscher bartv@thisnet.nl
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *
- * You should have received a copy of the GNU Affero General Public
- * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-/**
- * This class manages our tasks
- */
-OC_Task_App::$l10n = new OC_L10N('tasks');
-class OC_Task_App {
-	public static $l10n;
-
-	public static function getPriorityOptions()
-	{
-		return array(
-			''  => self::$l10n->t('Unspecified'),
-			'1' => self::$l10n->t('1=highest'),
-			'2' => '2',
-			'3' => '3',
-			'4' => '4',
-			'5' => self::$l10n->t('5=medium'),
-			'6' => '6',
-			'7' => '7',
-			'8' => '8',
-			'9' => self::$l10n->t('9=lowest'),
-		);
-	}
-
-	public static function arrayForJSON($id, $vtodo, $user_timezone)
-	{
-                $task = array( 'id' => $id );
-		$task['summary'] = $vtodo->getAsString('SUMMARY');
-		$task['description'] = $vtodo->getAsString('DESCRIPTION');
-		$task['location'] = $vtodo->getAsString('LOCATION');
-		$task['categories'] = $vtodo->getAsArray('CATEGORIES');
-		$due = $vtodo->DUE;
-		if ($due) {
-			$task['due_date_only'] = $due->getDateType() == Sabre_VObject_Element_DateTime::DATE;
-			$due = $due->getDateTime();
-			$due->setTimezone(new DateTimeZone($user_timezone));
-			$task['due'] = $due->format('U');
-		}
-		else {
-			$task['due'] = false;
-		}
-		$task['priority'] = $vtodo->getAsString('PRIORITY');
-		$completed = $vtodo->COMPLETED;
-		if ($completed) {
-			$completed = $completed->getDateTime();
-			$completed->setTimezone(new DateTimeZone($user_timezone));
-			$task['completed'] = $completed->format('Y-m-d H:i:s');
-		}
-		else {
-			$task['completed'] = false;
-		}
-		$task['complete'] = $vtodo->getAsString('PERCENT-COMPLETE');
-		return $task;
-	}
-
-	public static function validateRequest($request)
-	{
-		$errors = array();
-		if($request['summary'] == '') {
-			$errors['summary'] = self::$l10n->t('Empty Summary');
-		}
-
-		try {
-			$timezone = OC_Calendar_App::getTimezone();
-			$timezone = new DateTimeZone($timezone);
-			new DateTime($request['due'], $timezone);
-		} catch (Exception $e) {
-			$errors['due'] = self::$l10n->t('Invalid date/time');
-		}
-
-		if ($request['percent_complete'] < 0 || $request['percent_complete'] > 100) {
-			$errors['percent_complete'] = self::$l10n->t('Invalid percent complete');
-		}
-		if ($request['percent_complete'] == 100 && !empty($request['completed'])) {
-			try {
-				$timezone = OC_Calendar_App::getTimezone();
-				$timezone = new DateTimeZone($timezone);
-				new DateTime($request['completed'], $timezone);
-			} catch (Exception $e) {
-				$errors['completed'] = self::$l10n->t('Invalid date/time');
-			}
-		}
-
-		$priority_options = self::getPriorityOptions();
-		if (!in_array($request['priority'], array_keys($priority_options))) {
-			$errors['priority'] = self::$l10n->t('Invalid priority');
-		}
-		return $errors;
-	}
-
-	public static function createVCalendarFromRequest($request)
-	{
-		$vcalendar = new OC_VObject('VCALENDAR');
-		$vcalendar->add('PRODID', 'ownCloud Calendar');
-		$vcalendar->add('VERSION', '2.0');
-
-		$vtodo = new OC_VObject('VTODO');
-		$vcalendar->add($vtodo);
-
-		$vtodo->setDateTime('CREATED', 'now', Sabre_VObject_Element_DateTime::UTC);
-
-		$vtodo->setUID();
-		return self::updateVCalendarFromRequest($request, $vcalendar);
-	}
-
-	public static function updateVCalendarFromRequest($request, $vcalendar)
-	{
-		$summary = $request['summary'];
-		$categories = $request["categories"];
-		$priority = $request['priority'];
-		$percent_complete = $request['percent_complete'];
-		$completed = $request['completed'];
-		$location = $request['location'];
-		$due = $request['due'];
-		$description = $request['description'];
-
-		$vtodo = $vcalendar->VTODO;
-
-		$vtodo->setDateTime('LAST-MODIFIED', 'now', Sabre_VObject_Element_DateTime::UTC);
-		$vtodo->setDateTime('DTSTAMP', 'now', Sabre_VObject_Element_DateTime::UTC);
-		$vtodo->setString('SUMMARY', $summary);
-
-		$vtodo->setString('LOCATION', $location);
-		$vtodo->setString('DESCRIPTION', $description);
-		$vtodo->setString('CATEGORIES', $categories);
-		$vtodo->setString('PRIORITY', $priority);
-
-		if ($due) {
-			$timezone = OC_Calendar_App::getTimezone();
-			$timezone = new DateTimeZone($timezone);
-			$due = new DateTime($due, $timezone);
-			$vtodo->setDateTime('DUE', $due);
-		} else {
-			unset($vtodo->DUE);
-		}
-
-		self::setComplete($vtodo, $percent_complete, $completed);
-
-		return $vcalendar;
-	}
-
-	public static function setComplete($vtodo, $percent_complete, $completed)
-	{
-		if (!empty($percent_complete)) {
-			$vtodo->setString('PERCENT-COMPLETE', $percent_complete);
-		}else{
-			$vtodo->__unset('PERCENT-COMPLETE');
-		}
-
-		if ($percent_complete == 100) {
-			if (!$completed) {
-				$completed = 'now';
-			}
-		} else {
-			$completed = null;
-		}
-		if ($completed) {
-			$timezone = OC_Calendar_App::getTimezone();
-			$timezone = new DateTimeZone($timezone);
-			$completed = new DateTime($completed, $timezone);
-			$vtodo->setDateTime('COMPLETED', $completed);
-			OCP\Util::emitHook('OC_Task', 'taskCompleted', $vtodo);
-		} else {
-			unset($vtodo->COMPLETED);
-		}
-	}
-}
diff --git a/apps/tasks/lib/vtodo.php b/apps/tasks/lib/vtodo.php
deleted file mode 100644
index dc2bfaf964..0000000000
--- a/apps/tasks/lib/vtodo.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-/**
- * ownCloud - Calendar
- *
- * @author Bart Visscher
- * @copyright 2011 Bart Visscher bartv@thisnet.nl
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *
- * You should have received a copy of the GNU Affero General Public
- * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-/**
- * This class manages our tasks
- */
-class OC_Task_VTodo extends OC_Calendar_Object{
-}
diff --git a/apps/tasks/templates/tasks.php b/apps/tasks/templates/tasks.php
deleted file mode 100644
index 8c0c89e497..0000000000
--- a/apps/tasks/templates/tasks.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<div id="controls">
-	<input type="text" id="tasks_newtask">
-	<input type="button" id="tasks_addtask" value="<?php echo $l->t('Add Task'); ?>">
-	<input type="button" id="tasks_order_due" value="<?php echo $l->t('Order Due'); ?>">
-	<input type="button" id="tasks_order_category" value="<?php echo $l->t('Order List'); ?>">
-	<input type="button" id="tasks_order_complete" value="<?php echo $l->t('Order Complete'); ?>">
-	<input type="button" id="tasks_order_location" value="<?php echo $l->t('Order Location'); ?>">
-	<input type="button" id="tasks_order_prio" value="<?php echo $l->t('Order Priority'); ?>">
-	<input type="button" id="tasks_order_label" value="<?php echo $l->t('Order Label'); ?>">
-</div>
-<div id="tasks_lists" class="leftcontent">
-	<div class="all">All</div>
-	<div class="done">Done</div>
-</div>
-<div id="tasks_list" class="rightcontent">
-<p class="loading"><?php echo $l->t('Loading tasks...') ?></p>
-</div>
-<p id="task_actions_template" class="task_actions">
-	<!-- span class="task_star">
-		<img title="<?php echo $l->t('Important') ?>" src="<?php echo OCP\image_path('core', 'actions/add.svg') ?>" class="svg"><?php echo $l->t('Important') ?>
-	</span -->
-	<span class="task_more">
-		<img title="<?php echo $l->t('More') ?>" src="<?php echo OCP\image_path('core', 'actions/triangle-s.svg') ?>" class="svg"><?php echo $l->t('More') ?>
-	</span>
-	<span class="task_less">
-		<img title="<?php echo $l->t('Less') ?>" src="<?php echo OCP\image_path('core', 'actions/triangle-n.svg') ?>" class="svg"><?php echo $l->t('Less') ?>
-	</span>
-	<span class="task_delete">
-		<img title="<?php echo $l->t('Delete') ?>" src="<?php echo OCP\image_path('core', 'actions/delete.svg') ?>" class="svg"><?php echo $l->t('Delete') ?>
-	</span>
-</p>
-<script type='text/javascript'>
-var categories = <?php echo json_encode($_['categories']); ?>;
-</script>
diff --git a/apps/user_external/appinfo/app.php b/apps/user_external/appinfo/app.php
deleted file mode 100644
index c7408ec30d..0000000000
--- a/apps/user_external/appinfo/app.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-OC::$CLASSPATH['OC_User_IMAP']='apps/user_external/lib/imap.php';
-OC::$CLASSPATH['OC_User_SMB']='apps/user_external/lib/smb.php';
-OC::$CLASSPATH['OC_User_FTP']='apps/user_external/lib/ftp.php';
diff --git a/apps/user_external/appinfo/info.xml b/apps/user_external/appinfo/info.xml
deleted file mode 100644
index 1d1dcee540..0000000000
--- a/apps/user_external/appinfo/info.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-<info>
-	<id>user_external</id>
-	<name>External user support</name>
-	<description>Use external user authentication methods</description>
-	<licence>AGPL</licence>
-	<author>Robin Appelman</author>
-	<require>4</require>
-	<shipped>true</shipped>
-	<types>
-		<authentication/>
-	</types>
-</info>
diff --git a/apps/user_external/appinfo/version b/apps/user_external/appinfo/version
deleted file mode 100644
index ceab6e11ec..0000000000
--- a/apps/user_external/appinfo/version
+++ /dev/null
@@ -1 +0,0 @@
-0.1
\ No newline at end of file
diff --git a/apps/user_external/lib/ftp.php b/apps/user_external/lib/ftp.php
deleted file mode 100644
index e03e17d2b6..0000000000
--- a/apps/user_external/lib/ftp.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Robin Appelman <icewind@owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-class OC_User_FTP extends OC_User_Backend{
-	private $host;
-	private $secure;
-	private $protocol;
-
-	public function __construct($host,$secure=false){
-		$this->host=$host;
-		$this->secure=$secure;
-		$this->protocol='ftp';
-		if($this->secure){
-			$this->protocol.='s';
-		}
-		$this->protocol.='://';
-	}
-
-	/**
-	 * @brief Check if the password is correct
-	 * @param $uid The username
-	 * @param $password The password
-	 * @returns true/false
-	 *
-	 * Check if the password is correct without logging in the user
-	 */
-	public function checkPassword($uid, $password){
-		$url=$this->protocol.$uid.':'.$password.'@'.$this->host.'/';
-		$result=@opendir($url);
-		if(is_resource($result)){
-			return $uid;
-		}else{
-			return false;
-		}
-	}
-
-	public function userExists($uid){
-		return true;
-	}
-}
diff --git a/apps/user_external/lib/imap.php b/apps/user_external/lib/imap.php
deleted file mode 100644
index 584e9804b1..0000000000
--- a/apps/user_external/lib/imap.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Robin Appelman <icewind@owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-class OC_User_IMAP extends OC_User_Backend{
-	private $mailbox;
-	
-	public function __construct($mailbox){
-		$this->mailbox=$mailbox;
-	}
-	
-	/**
-	 * @brief Check if the password is correct
-	 * @param $uid The username
-	 * @param $password The password
-	 * @returns true/false
-	 *
-	 * Check if the password is correct without logging in the user
-	 */
-	public function checkPassword($uid, $password){
-		$mbox = @imap_open($this->mailbox, $uid, $password);
-		imap_errors();
-		imap_alerts();
-		if($mbox){
-			imap_close($mbox);
-			return $uid;
-		}else{
-			return false;
-		}
-	}
-
-	public function userExists($uid){
-		return true;
-	}
-}
-
diff --git a/apps/user_external/lib/smb.php b/apps/user_external/lib/smb.php
deleted file mode 100644
index 44d2b7903d..0000000000
--- a/apps/user_external/lib/smb.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Robin Appelman <icewind@owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-class OC_User_SMB extends OC_User_Backend{
-	private $host;
-
-	const smbclient='smbclient';
-	const loginError='NT_STATUS_LOGON_FAILURE';
-	
-	public function __construct($host){
-		$this->host=$host;
-	}
-	
-	/**
-	 * @brief Check if the password is correct
-	 * @param $uid The username
-	 * @param $password The password
-	 * @returns true/false
-	 *
-	 * Check if the password is correct without logging in the user
-	 */
-	public function checkPassword($uid, $password){
-		$uidEscaped=escapeshellarg($uid);
-		$password=escapeshellarg($password);
-		$result=array();
-		$command=self::smbclient.' //'.$this->host.'/dummy -U'.$uidEscaped.'%'.$password;
-		$result=exec($command,$result);
-		if(substr($result,-strlen(self::loginError))==self::loginError){
-			return false;
-		}else{
-			return $uid;
-		}
-	}
-	
-	public function userExists($uid){
-		return true;
-	}
-}
\ No newline at end of file
diff --git a/apps/user_external/tests/config.php b/apps/user_external/tests/config.php
deleted file mode 100644
index 64ee141d32..0000000000
--- a/apps/user_external/tests/config.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Robin Appelman <icewind@owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-return array(
-	'imap'=>array(
-		'run'=>false,
-		'mailbox'=>'{imap.gmail.com:993/imap/ssl}INBOX', //see http://php.net/manual/en/function.imap-open.php
-		'user'=>'foo',//valid username/password combination
-		'password'=>'bar',
-	),
-	'smb'=>array(
-		'run'=>false,
-		'host'=>'localhost',
-		'user'=>'test',//valid username/password combination
-		'password'=>'test',
-	),
-	'ftp'=>array(
-		'run'=>false,
-		'host'=>'localhost',
-		'user'=>'test',//valid username/password combination
-		'password'=>'test',
-	),
-);
diff --git a/apps/user_external/tests/ftp.php b/apps/user_external/tests/ftp.php
deleted file mode 100644
index 0cf7565f9c..0000000000
--- a/apps/user_external/tests/ftp.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Robin Appelman <icewind@owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-class Test_User_FTP extends UnitTestCase{
-	/**
-	 * @var OC_User_IMAP $instance
-	 */
-	private $instance;
-	
-	private function getConfig(){
-		return include(__DIR__.'/config.php');
-	}
-	
-	function skip(){
-		$config=$this->getConfig();
-		$this->skipUnless($config['ftp']['run']);
-	}
-	
-	function setUp(){
-		$config=$this->getConfig();
-		$this->instance=new OC_User_FTP($config['ftp']['host']);
-	}
-	
-	function testLogin(){
-		$config=$this->getConfig();
-		$this->assertEqual($config['ftp']['user'],$this->instance->checkPassword($config['ftp']['user'],$config['ftp']['password']));
-		$this->assertFalse($this->instance->checkPassword($config['ftp']['user'],$config['ftp']['password'].'foo'));
-	}
-}
diff --git a/apps/user_external/tests/imap.php b/apps/user_external/tests/imap.php
deleted file mode 100644
index c703b32107..0000000000
--- a/apps/user_external/tests/imap.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Robin Appelman <icewind@owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-class Test_User_Imap extends UnitTestCase{
-	/**
-	 * @var OC_User_IMAP $instance
-	 */
-	private $instance;
-
-	private function getConfig(){
-		return include(__DIR__.'/config.php');
-	}
-
-	function skip(){
-		$config=$this->getConfig();
-		$this->skipUnless($config['imap']['run']);
-	} 
-
-	function setUp(){
-		$config=$this->getConfig();
-		$this->instance=new OC_User_IMAP($config['imap']['mailbox']);
-	}
-	
-	function testLogin(){
-		$config=$this->getConfig();
-		$this->assertEqual($config['imap']['user'],$this->instance->checkPassword($config['imap']['user'],$config['imap']['password']));
-		$this->assertFalse($this->instance->checkPassword($config['imap']['user'],$config['imap']['password'].'foo'));
-	}
-}
diff --git a/apps/user_external/tests/smb.php b/apps/user_external/tests/smb.php
deleted file mode 100644
index 1ed7eb934b..0000000000
--- a/apps/user_external/tests/smb.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Robin Appelman <icewind@owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-class Test_User_SMB extends UnitTestCase{
-	/**
-	 * @var OC_User_IMAP $instance
-	 */
-	private $instance;
-	
-	private function getConfig(){
-		return include(__DIR__.'/config.php');
-	}
-	
-	function skip(){
-		$config=$this->getConfig();
-		$this->skipUnless($config['smb']['run']);
-	}
-	
-	function setUp(){
-		$config=$this->getConfig();
-		$this->instance=new OC_User_SMB($config['smb']['host']);
-	}
-	
-	function testLogin(){
-		$config=$this->getConfig();
-		$this->assertEqual($config['smb']['user'],$this->instance->checkPassword($config['smb']['user'],$config['smb']['password']));
-		$this->assertFalse($this->instance->checkPassword($config['smb']['user'],$config['smb']['password'].'foo'));
-	}
-}
diff --git a/apps/user_ldap/group_ldap.php b/apps/user_ldap/group_ldap.php
index b29ebe30c5..aac3ed7891 100644
--- a/apps/user_ldap/group_ldap.php
+++ b/apps/user_ldap/group_ldap.php
@@ -232,7 +232,26 @@ class GROUP_LDAP extends lib\Access implements \OCP\GroupInterface {
 	 * @return bool
 	 */
 	public function groupExists($gid){
-		return in_array($gid, $this->getGroups());
+		if($this->connection->isCached('groupExists'.$gid)) {
+			return $this->connection->getFromCache('groupExists'.$gid);
+		}
+
+		//getting dn, if false the group does not exist. If dn, it may be mapped only, requires more checking.
+		$dn = $this->username2dn($gid);
+		if(!$dn) {
+			$this->connection->writeToCache('groupExists'.$gid, false);
+			return false;
+		}
+
+		//if group really still exists, we will be able to read its objectclass
+		$objcs = $this->readAttribute($dn, 'objectclass');
+		if(!$objcs || empty($objcs)) {
+			$this->connection->writeToCache('groupExists'.$gid, false);
+			return false;
+		}
+
+		$this->connection->writeToCache('groupExists'.$gid, true);
+		return true;
 	}
 
 	/**
diff --git a/apps/user_ldap/l10n/et_EE.php b/apps/user_ldap/l10n/et_EE.php
new file mode 100644
index 0000000000..d62e1212dc
--- /dev/null
+++ b/apps/user_ldap/l10n/et_EE.php
@@ -0,0 +1,9 @@
+<?php $TRANSLATIONS = array(
+"Host" => "Host",
+"Password" => "Parool",
+"Group Filter" => "Grupi filter",
+"Port" => "Port",
+"Use TLS" => "Kasutaja TLS",
+"in bytes" => "baitides",
+"Help" => "Abiinfo"
+);
diff --git a/apps/user_ldap/l10n/eu.php b/apps/user_ldap/l10n/eu.php
new file mode 100644
index 0000000000..cc042b1389
--- /dev/null
+++ b/apps/user_ldap/l10n/eu.php
@@ -0,0 +1,36 @@
+<?php $TRANSLATIONS = array(
+"Host" => "Hostalaria",
+"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Protokoloa ez da beharrezkoa, SSL behar baldin ez baduzu. Honela bada hasi ldaps://",
+"Base DN" => "Oinarrizko DN",
+"You can specify Base DN for users and groups in the Advanced tab" => "Erabiltzaile eta taldeentzako Oinarrizko DN zehaztu dezakezu Aurreratu fitxan",
+"User DN" => "Erabiltzaile DN",
+"The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." => "Lotura egingo den bezero erabiltzailearen DNa, adb. uid=agent,dc=example,dc=com. Sarrera anonimoak gaitzeko utzi DN eta Pasahitza hutsik.",
+"Password" => "Pasahitza",
+"For anonymous access, leave DN and Password empty." => "Sarrera anonimoak gaitzeko utzi DN eta Pasahitza hutsik.",
+"User Login Filter" => "Erabiltzaileen saioa hasteko iragazkia",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Saioa hastean erabiliko den iragazkia zehazten du. %%uid-ek erabiltzaile izena ordezkatzen du saioa hasterakoan.",
+"use %%uid placeholder, e.g. \"uid=%%uid\"" => "erabili %%uid txantiloia, adb. \"uid=%%uid\"",
+"User List Filter" => "Erabiltzaile zerrendaren Iragazkia",
+"Defines the filter to apply, when retrieving users." => "Erabiltzaileak jasotzen direnean ezarriko den iragazkia zehazten du.",
+"without any placeholder, e.g. \"objectClass=person\"." => "txantiloirik gabe, adb. \"objectClass=person\".",
+"Group Filter" => "Taldeen iragazkia",
+"Defines the filter to apply, when retrieving groups." => "Taldeak jasotzen direnean ezarriko den iragazkia zehazten du.",
+"without any placeholder, e.g. \"objectClass=posixGroup\"." => "txantiloirik gabe, adb. \"objectClass=posixGroup\".",
+"Port" => "Portua",
+"Base User Tree" => "Oinarrizko Erabiltzaile Zuhaitza",
+"Base Group Tree" => "Oinarrizko Talde Zuhaitza",
+"Group-Member association" => "Talde-Kide elkarketak",
+"Use TLS" => "Erabili TLS",
+"Do not use it for SSL connections, it will fail." => "Ez erabili SSL konexioetan, huts egingo du.",
+"Case insensitve LDAP server (Windows)" => "Maiuskulak eta minuskulak ezberditzen ez dituen LDAP zerbitzaria (windows)",
+"Turn off SSL certificate validation." => "Ezgaitu SSL ziurtagirien egiaztapena.",
+"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Konexioa aukera hau ezinbestekoa badu, inportatu LDAP zerbitzariaren SSL ziurtagiria zure ownCloud zerbitzarian.",
+"Not recommended, use for testing only." => "Ez da aholkatzen, erabili bakarrik frogak egiteko.",
+"User Display Name Field" => "Erabiltzaileen bistaratzeko izena duen eremua",
+"The LDAP attribute to use to generate the user`s ownCloud name." => "ownCloud erabiltzailearen izena sortzeko erabiliko den LDAP atributua",
+"Group Display Name Field" => "Taldeen bistaratzeko izena duen eremua",
+"The LDAP attribute to use to generate the groups`s ownCloud name." => "ownCloud taldearen izena sortzeko erabiliko den LDAP atributua",
+"in bytes" => "bytetan",
+"in seconds. A change empties the cache." => "segundutan. Aldaketak katxea husten du.",
+"Help" => "Laguntza"
+);
diff --git a/apps/user_ldap/l10n/fa.php b/apps/user_ldap/l10n/fa.php
new file mode 100644
index 0000000000..4432422116
--- /dev/null
+++ b/apps/user_ldap/l10n/fa.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"Host" => "میزبانی",
+"Password" => "رمز عبور",
+"Help" => "راه‌نما"
+);
diff --git a/apps/user_ldap/l10n/fr.php b/apps/user_ldap/l10n/fr.php
index 64edf3b468..0754aa01de 100644
--- a/apps/user_ldap/l10n/fr.php
+++ b/apps/user_ldap/l10n/fr.php
@@ -1,14 +1,14 @@
 <?php $TRANSLATIONS = array(
 "Host" => "Hôte",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Vous pouvez omettre le protocole, sauf si vous avez besoin de SSL. Dans ce cas préfixez avec ldaps://",
-"Base DN" => "DN de base",
-"You can specify Base DN for users and groups in the Advanced tab" => "Vous pouvez spécifier le DN de base pour les utilisateurs et les groupes dans l'onglet Avancé",
-"User DN" => "DN Utilisateur",
+"Base DN" => "DN Racine",
+"You can specify Base DN for users and groups in the Advanced tab" => "Vous pouvez détailler les DN Racines de vos utilisateurs et groupes dans l'onglet Avancé",
+"User DN" => "DN Utilisateur (Autorisé à consulter l'annuaire)",
 "The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." => "Le DN de l'utilisateur client avec lequel la liaison doit se faire, par exemple uid=agent,dc=example,dc=com. Pour l'accès anonyme, laisser le DN et le mot de passe vides.",
 "Password" => "Mot de passe",
-"For anonymous access, leave DN and Password empty." => "Pour l'accès anonyme, laisser le DN et le mot de passe vides.",
-"User Login Filter" => "Filtre d'identifiants utilisateur",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Définit le filtre à appliquer lors d'une tentative de connexion. %%uid remplace le nom d'utilisateur lors de la connexion.",
+"For anonymous access, leave DN and Password empty." => "Pour un accès anonyme, laisser le DN Utilisateur et le mot de passe vides.",
+"User Login Filter" => "Modèle d'authentification utilisateurs",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Définit le motif à appliquer, lors d'une tentative de connexion. %%uid est remplacé par le nom d'utilisateur lors de la connexion.",
 "use %%uid placeholder, e.g. \"uid=%%uid\"" => "veuillez utiliser le champ %%uid , ex.: \"uid=%%uid\"",
 "User List Filter" => "Filtre d'utilisateurs",
 "Defines the filter to apply, when retrieving users." => "Définit le filtre à appliquer lors de la récupération des utilisateurs.",
@@ -17,15 +17,19 @@
 "Defines the filter to apply, when retrieving groups." => "Définit le filtre à appliquer lors de la récupération des groupes.",
 "without any placeholder, e.g. \"objectClass=posixGroup\"." => "sans élément de substitution, par exemple \"objectClass=posixGroup\".",
 "Port" => "Port",
+"Base User Tree" => "DN racine de l'arbre utilisateurs",
+"Base Group Tree" => "DN racine de l'arbre groupes",
 "Group-Member association" => "Association groupe-membre",
 "Use TLS" => "Utiliser TLS",
 "Do not use it for SSL connections, it will fail." => "Ne pas utiliser pour les connexions SSL, car cela échouera.",
 "Case insensitve LDAP server (Windows)" => "Serveur LDAP insensible à la casse (Windows)",
-"Turn off SSL certificate validation." => "Désactiver la validation du certificat SSL",
+"Turn off SSL certificate validation." => "Désactiver la validation du certificat SSL.",
 "If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Si la connexion ne fonctionne qu'avec cette option, importez le certificat SSL du serveur LDAP dans le serveur ownCloud.",
-"Not recommended, use for testing only." => "Non recommendé, utilisation pour tests uniquement.",
-"The LDAP attribute to use to generate the user`s ownCloud name." => "L'attribut LDAP utilisé pour générer les noms d'utilisateurs d'ownCloud",
-"The LDAP attribute to use to generate the groups`s ownCloud name." => "L'attribut LDAP utilisé pour générer les noms de groupes d'ownCloud",
+"Not recommended, use for testing only." => "Non recommandé, utilisation pour tests uniquement.",
+"User Display Name Field" => "Champ \"nom d'affichage\" de l'utilisateur",
+"The LDAP attribute to use to generate the user`s ownCloud name." => "L'attribut LDAP utilisé pour générer les noms d'utilisateurs d'ownCloud.",
+"Group Display Name Field" => "Champ \"nom d'affichage\" du groupe",
+"The LDAP attribute to use to generate the groups`s ownCloud name." => "L'attribut LDAP utilisé pour générer les noms de groupes d'ownCloud.",
 "in bytes" => "en octets",
 "in seconds. A change empties the cache." => "en secondes. Tout changement vide le cache.",
 "Help" => "Aide"
diff --git a/apps/user_ldap/l10n/ru.php b/apps/user_ldap/l10n/ru.php
index fc89d99806..65ef8f47f4 100644
--- a/apps/user_ldap/l10n/ru.php
+++ b/apps/user_ldap/l10n/ru.php
@@ -15,11 +15,21 @@
 "without any placeholder, e.g. \"objectClass=person\"." => "без заполнителя, например: \"objectClass=person\".",
 "Group Filter" => "Фильтр группы",
 "Defines the filter to apply, when retrieving groups." => "Определяет фильтр для применения при получении группы.",
+"without any placeholder, e.g. \"objectClass=posixGroup\"." => "без заполнения, например \"objectClass=posixGroup\".",
 "Port" => "Порт",
+"Base User Tree" => "База пользовательского дерева",
+"Base Group Tree" => "База группового дерева",
+"Group-Member association" => "Ассоциация Группа-Участник",
 "Use TLS" => "Использовать TLS",
 "Do not use it for SSL connections, it will fail." => "Не используйте для соединений SSL",
+"Case insensitve LDAP server (Windows)" => "Нечувствительный к регистру сервер LDAP (Windows)",
 "Turn off SSL certificate validation." => "Отключить проверку сертификата SSL.",
+"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Если соединение работает только с этой опцией, импортируйте на ваш сервер ownCloud сертификат SSL сервера LDAP.",
 "Not recommended, use for testing only." => "Не рекомендуется, используйте только для тестирования.",
+"User Display Name Field" => "Поле отображаемого имени пользователя",
+"The LDAP attribute to use to generate the user`s ownCloud name." => "Атрибут LDAP для генерации имени пользователя ownCloud.",
+"Group Display Name Field" => "Поле отображаемого имени группы",
+"The LDAP attribute to use to generate the groups`s ownCloud name." => "Атрибут LDAP для генерации имени группы ownCloud.",
 "in bytes" => "в байтах",
 "in seconds. A change empties the cache." => "в секундах. Изменение очистит кэш.",
 "Help" => "Помощь"
diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php
index ec3b526491..089548a69b 100644
--- a/apps/user_ldap/lib/access.php
+++ b/apps/user_ldap/lib/access.php
@@ -137,17 +137,6 @@ abstract class Access {
 		$dn = $this->ocname2dn($name, true);
 		if($dn) {
 			return $dn;
-		} else {
-			//fallback: user is not mapped
-			$filter = $this->combineFilterWithAnd(array(
-				$this->connection->ldapUserFilter,
-				$this->connection->ldapUserDisplayName . '=' . $name,
-			));
-			$result = $this->searchUsers($filter, 'dn');
-			if(isset($result[0]['dn'])) {
-				$this->mapComponent($result[0], $name, true);
-				return $result[0];
-			}
 		}
 
 		return false;
@@ -265,18 +254,23 @@ abstract class Access {
 		$ldapname = $this->sanitizeUsername($ldapname);
 
 		//a new user/group! Then let's try to add it. We're shooting into the blue with the user/group name, assuming that in most cases there will not be a conflict. Otherwise an error will occur and we will continue with our second shot.
-		if($this->mapComponent($dn, $ldapname, $isUser)) {
-			return $ldapname;
+		if(($isUser && !\OCP\User::userExists($ldapname)) || (!$isUser && !\OC_Group::groupExists($ldapname))) {
+			if($this->mapComponent($dn, $ldapname, $isUser)) {
+				return $ldapname;
+			}
 		}
 
 		//doh! There is a conflict. We need to distinguish between users/groups. Adding indexes is an idea, but not much of a help for the user. The DN is ugly, but for now the only reasonable way. But we transform it to a readable format and remove the first part to only give the path where this object is located.
 		$oc_name = $this->alternateOwnCloudName($ldapname, $dn);
-		if($this->mapComponent($dn, $oc_name, $isUser)) {
-			return $oc_name;
+		if(($isUser && !\OCP\User::userExists($oc_name)) || (!$isUser && !\OC_Group::groupExists($oc_name))) {
+			if($this->mapComponent($dn, $oc_name, $isUser)) {
+				return $oc_name;
+			}
 		}
 
 		//if everything else did not help..
 		\OCP\Util::writeLog('user_ldap', 'Could not create unique ownCloud name for '.$dn.'.', \OCP\Util::INFO);
+		return false;
 	}
 
 	/**
@@ -320,28 +314,11 @@ abstract class Access {
 				continue;
 			}
 
-			//we do not take empty usernames
-			if(!isset($ldapObject[$nameAttribute]) || empty($ldapObject[$nameAttribute])) {
-				\OCP\Util::writeLog('user_ldap', 'No or empty name for '.$ldapObject['dn'].', skipping.', \OCP\Util::INFO);
-				continue;
-			}
-
-			//a new group! Then let's try to add it. We're shooting into the blue with the group name, assuming that in most cases there will not be a conflict. But first make sure, that the display name contains only allowed characters.
-			$ocname = $this->sanitizeUsername($ldapObject[$nameAttribute]);
-			if($this->mapComponent($ldapObject['dn'], $ocname, $isUsers)) {
+			$ocname = $this->dn2ocname($ldapObject['dn'], $ldapObject[$nameAttribute], $isUsers);
+			if($ocname) {
 				$ownCloudNames[] = $ocname;
-				continue;
 			}
-
-			//doh! There is a conflict. We need to distinguish between groups. Adding indexes is an idea, but not much of a help for the user. The DN is ugly, but for now the only reasonable way. But we transform it to a readable format and remove the first part to only give the path where this entry is located.
-			$ocname = $this->alternateOwnCloudName($ocname, $ldapObject['dn']);
-			if($this->mapComponent($ldapObject['dn'], $ocname, $isUsers)) {
-				$ownCloudNames[] = $ocname;
-				continue;
-			}
-
-			//if everything else did not help..
-			\OCP\Util::writeLog('user_ldap', 'Could not create unique ownCloud name for '.$ldapObject['dn'].', skipping.', \OCP\Util::INFO);
+			continue;
 		}
 		return $ownCloudNames;
 	}
@@ -564,6 +541,10 @@ abstract class Access {
 			return $name;
 		}
 
+		// Translitaration
+		//latin characters to ASCII
+		$name = iconv('UTF-8', 'ASCII//TRANSLIT', $name);
+
 		//REPLACEMENTS
 		$name = \OCP\Util::mb_str_replace(' ', '_', $name, 'UTF-8');
 
diff --git a/apps/user_ldap/lib/connection.php b/apps/user_ldap/lib/connection.php
index dc160a1642..1922e7ff1f 100644
--- a/apps/user_ldap/lib/connection.php
+++ b/apps/user_ldap/lib/connection.php
@@ -55,6 +55,7 @@ class Connection {
 		'ldapCacheTTL' => null,
 		'ldapUuidAttribute' => null,
 		'ldapOverrideUuidAttribute' => null,
+		'homeFolderNamingRule' => null,
 	);
 
 	public function __construct($configID = 'user_ldap') {
@@ -200,6 +201,7 @@ class Connection {
 			$this->config['ldapCacheTTL']          = \OCP\Config::getAppValue($this->configID, 'ldap_cache_ttl', 10*60);
 			$this->config['ldapUuidAttribute']     = \OCP\Config::getAppValue($this->configID, 'ldap_uuid_attribute', 'auto');
 			$this->config['ldapOverrideUuidAttribute'] = \OCP\Config::getAppValue($this->configID, 'ldap_override_uuid_attribute', 0);
+			$this->config['homeFolderNamingRule']  = \OCP\Config::getAppValue($this->configID, 'home_folder_naming_rule', 'opt:username');
 
 			$this->configured = $this->validateConfiguration();
 		}
@@ -218,7 +220,7 @@ class Connection {
 
 		$params = array('ldap_host'=>'ldapHost', 'ldap_port'=>'ldapPort', 'ldap_dn'=>'ldapAgentName', 'ldap_agent_password'=>'ldapAgentPassword', 'ldap_base'=>'ldapBase', 'ldap_base_users'=>'ldapBaseUsers', 'ldap_base_groups'=>'ldapBaseGroups', 'ldap_userlist_filter'=>'ldapUserFilter', 'ldap_login_filter'=>'ldapLoginFilter', 'ldap_group_filter'=>'ldapGroupFilter', 'ldap_display_name'=>'ldapUserDisplayName', 'ldap_group_display_name'=>'ldapGroupDisplayName',
 
-		'ldap_tls'=>'ldapTLS', 'ldap_nocase'=>'ldapNoCase', 'ldap_quota_def'=>'ldapQuotaDefault', 'ldap_quota_attr'=>'ldapQuotaAttribute', 'ldap_email_attr'=>'ldapEmailAttribute', 'ldap_group_member_assoc_attribute'=>'ldapGroupMemberAssocAttr', 'ldap_cache_ttl'=>'ldapCacheTTL');
+		'ldap_tls'=>'ldapTLS', 'ldap_nocase'=>'ldapNoCase', 'ldap_quota_def'=>'ldapQuotaDefault', 'ldap_quota_attr'=>'ldapQuotaAttribute', 'ldap_email_attr'=>'ldapEmailAttribute', 'ldap_group_member_assoc_attribute'=>'ldapGroupMemberAssocAttr', 'ldap_cache_ttl'=>'ldapCacheTTL', 'home_folder_naming_rule' => 'homeFolderNamingRule');
 
 		foreach($config as $parameter => $value) {
 		    if(isset($this->config[$parameter])) {
diff --git a/apps/user_ldap/lib/jobs.php b/apps/user_ldap/lib/jobs.php
index 4224ee9d7e..aff519226c 100644
--- a/apps/user_ldap/lib/jobs.php
+++ b/apps/user_ldap/lib/jobs.php
@@ -113,7 +113,7 @@ class Jobs {
 			WHERE `owncloudname` = ?
 		');
 		foreach($removedGroups as $removedGroup) {
-			\OCP\Util::writeLog('user_ldap', 'bgJ "updateGroups" – group "'.$createdGroup.'" was removed.', \OCP\Util::INFO);
+			\OCP\Util::writeLog('user_ldap', 'bgJ "updateGroups" – group "'.$removedGroup.'" was removed.', \OCP\Util::INFO);
 		    $query->execute(array($removedGroup));
 		}
 		\OCP\Util::writeLog('user_ldap', 'bgJ "updateGroups" – FINISHED dealing with removed groups.', \OCP\Util::DEBUG);
diff --git a/apps/user_ldap/settings.php b/apps/user_ldap/settings.php
index 39aa329626..23018890ea 100644
--- a/apps/user_ldap/settings.php
+++ b/apps/user_ldap/settings.php
@@ -20,7 +20,7 @@
  * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-$params = array('ldap_host', 'ldap_port', 'ldap_dn', 'ldap_agent_password', 'ldap_base', 'ldap_base_users', 'ldap_base_groups', 'ldap_userlist_filter', 'ldap_login_filter', 'ldap_group_filter', 'ldap_display_name', 'ldap_group_display_name', 'ldap_tls', 'ldap_turn_off_cert_check', 'ldap_nocase', 'ldap_quota_def', 'ldap_quota_attr', 'ldap_email_attr', 'ldap_group_member_assoc_attribute', 'ldap_cache_ttl');
+$params = array('ldap_host', 'ldap_port', 'ldap_dn', 'ldap_agent_password', 'ldap_base', 'ldap_base_users', 'ldap_base_groups', 'ldap_userlist_filter', 'ldap_login_filter', 'ldap_group_filter', 'ldap_display_name', 'ldap_group_display_name', 'ldap_tls', 'ldap_turn_off_cert_check', 'ldap_nocase', 'ldap_quota_def', 'ldap_quota_attr', 'ldap_email_attr', 'ldap_group_member_assoc_attribute', 'ldap_cache_ttl', 'home_folder_naming_rule');
 
 OCP\Util::addscript('user_ldap', 'settings');
 OCP\Util::addstyle('user_ldap', 'settings');
@@ -36,6 +36,9 @@ if ($_POST) {
 					$ldap->clearCache();
 					OCP\Config::setAppValue('user_ldap', $param, $_POST[$param]);
 				}
+			} elseif('home_folder_naming_rule' == $param) {
+				$value = empty($_POST[$param]) ? 'opt:username' : 'attr:'.$_POST[$param];
+				OCP\Config::setAppValue('user_ldap', $param, $value);
 			} else {
 				OCP\Config::setAppValue('user_ldap', $param, $_POST[$param]);
 			}
@@ -67,5 +70,8 @@ $tmpl->assign( 'ldap_group_display_name', OCP\Config::getAppValue('user_ldap', '
 $tmpl->assign( 'ldap_group_member_assoc_attribute', OCP\Config::getAppValue('user_ldap', 'ldap_group_member_assoc_attribute', 'uniqueMember'));
 $tmpl->assign( 'ldap_agent_password', base64_decode(OCP\Config::getAppValue('user_ldap', 'ldap_agent_password')));
 $tmpl->assign( 'ldap_cache_ttl', OCP\Config::getAppValue('user_ldap', 'ldap_cache_ttl', '600'));
+$hfnr = OCP\Config::getAppValue('user_ldap', 'home_folder_naming_rule', 'opt:username');
+$hfnr = ($hfnr == 'opt:username') ? '' : substr($hfnr, strlen('attr:'));
+$tmpl->assign( 'home_folder_naming_rule', $hfnr, '');
 
 return $tmpl->fetchPage();
diff --git a/apps/user_ldap/templates/settings.php b/apps/user_ldap/templates/settings.php
index 861c9ba605..d1aaeedbdf 100644
--- a/apps/user_ldap/templates/settings.php
+++ b/apps/user_ldap/templates/settings.php
@@ -27,6 +27,7 @@
 		<label for="ldap_quota_def">Quota Default</label><input type="text" id="ldap_quota_def" name="ldap_quota_def" value="<?php if (isset($_['ldap_quota_def'])) echo $_['ldap_quota_def']; ?>" title="<?php echo $l->t('in bytes');?>" /></p>
 		<p><label for="ldap_email_attr">Email Field</label><input type="text" id="ldap_email_attr" name="ldap_email_attr" value="<?php echo $_['ldap_email_attr']; ?>" /></p>
 		<p><label for="ldap_cache_ttl">Cache Time-To-Live</label><input type="text" id="ldap_cache_ttl" name="ldap_cache_ttl" value="<?php echo $_['ldap_cache_ttl']; ?>" title="<?php echo $l->t('in seconds. A change empties the cache.');?>" /></p>
+		<p><label for="home_folder_naming_rule">User Home Folder Naming Rule</label><input type="text" id="home_folder_naming_rule" name="home_folder_naming_rule" value="<?php echo $_['home_folder_naming_rule']; ?>" title="<?php echo $l->t('Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute.');?>" /></p>
 	</fieldset>
 	<input type="submit" value="Save" /> <button id="ldap_action_test_connection" name="ldap_action_test_connection">Test Configuration</button> <a href="http://owncloud.org/support/ldap-backend/" target="_blank"><img src="<?php echo OCP\Util::imagePath('','actions/info.png'); ?>" style="height:1.75ex" /> <?php echo $l->t('Help');?></a>
 	</div>
diff --git a/apps/user_ldap/tests/group_ldap.php b/apps/user_ldap/tests/group_ldap.php
index 106459580f..ac66a608b7 100644
--- a/apps/user_ldap/tests/group_ldap.php
+++ b/apps/user_ldap/tests/group_ldap.php
@@ -29,7 +29,7 @@ class Test_Group_Ldap extends UnitTestCase {
 		OC_Group::useBackend(new OCA\user_ldap\GROUP_LDAP());
 		$group_ldap = new OCA\user_ldap\GROUP_LDAP();
 
- 		$this->assertIsA(OC_Group::getGroups(),gettype(array()));
+		$this->assertIsA(OC_Group::getGroups(),gettype(array()));
 		$this->assertIsA($group_ldap->getGroups(),gettype(array()));
 
 		$this->assertFalse(OC_Group::inGroup('john','dosers'),gettype(false));
diff --git a/apps/user_ldap/user_ldap.php b/apps/user_ldap/user_ldap.php
index a97df7b4fd..d297374600 100644
--- a/apps/user_ldap/user_ldap.php
+++ b/apps/user_ldap/user_ldap.php
@@ -161,6 +161,44 @@ class USER_LDAP extends lib\Access implements \OCP\UserInterface {
 	}
 
 	/**
+	* @brief determine the user's home directory
+	* @param string $uid the owncloud username
+	* @return boolean
+	*/
+	private function determineHomeDir($uid) {
+		if(strpos($this->connection->homeFolderNamingRule, 'attr:') === 0) {
+			$attr = substr($this->connection->homeFolderNamingRule, strlen('attr:'));
+			$homedir = $this->readAttribute($this->username2dn($uid), $attr);
+			if($homedir) {
+				$homedir = \OCP\Config::getSystemValue( "datadirectory", \OC::$SERVERROOT."/data" ) . '/' . $homedir[0];
+				\OCP\Config::setUserValue($uid, 'user_ldap', 'homedir', $homedir);
+				return $homedir;
+			}
+		}
+
+		//fallback and default: username
+		$homedir = \OCP\Config::getSystemValue( "datadirectory", \OC::$SERVERROOT."/data" ) . '/' . $uid;
+		\OCP\Config::setUserValue($uid, 'user_ldap', 'homedir', $homedir);
+		return $homedir;
+	}
+
+	/**
+	* @brief get the user's home directory
+	* @param string $uid the username
+	* @return boolean
+	*/
+	public function getHome($uid){
+		if($this->userExists($uid)) {
+			$homedir = \OCP\Config::getUserValue($uid, 'user_ldap', 'homedir', false);
+			if(!$homedir) {
+				$homedir = $this->determineHomeDir($uid);
+			}
+			return $homedir;
+		}
+		return false;
+	}
+
+		/**
 	* @brief Check if backend implements actions
 	* @param $actions bitwise-or'ed actions
 	* @returns boolean
@@ -169,7 +207,7 @@ class USER_LDAP extends lib\Access implements \OCP\UserInterface {
 	* compared with OC_USER_BACKEND_CREATE_USER etc.
 	*/
 	public function implementsActions($actions) {
-		return (bool)(OC_USER_BACKEND_CHECK_PASSWORD & $actions);
+		return (bool)((OC_USER_BACKEND_CHECK_PASSWORD | OC_USER_BACKEND_GET_HOME) & $actions);
 	}
 
 }
\ No newline at end of file
diff --git a/apps/user_migrate/ajax/export.php b/apps/user_migrate/ajax/export.php
deleted file mode 100644
index 07c35c7347..0000000000
--- a/apps/user_migrate/ajax/export.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-/**
- * ownCloud - user_migrate
- *
- * @author Tom Needham
- * @copyright 2012 Tom Needham tom@owncloud.com
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *
- * You should have received a copy of the GNU Affero General Public
- * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-// Init owncloud
- 
-
-// Check if we are a user
-OCP\JSON::checkLoggedIn();
-OCP\App::checkAppEnabled('user_migrate');
-// Which operation
-if( $_GET['operation']=='create' ){
-	$uid = !empty( $_POST['uid'] ) ? $_POST['uid'] :  OCP\USER::getUser();
-	if( $uid != OCP\USER::getUser() ){
-	    // Needs to be admin to export someone elses account
-		OCP\JSON::error();	
-		die();
-	}
-	// Create the export zip
-	$response = json_decode( OC_Migrate::export( $uid ) );
-	if( !$response->success ){
-		// Error
-		OCP\JSON::error();
-		die();
-	} else {
-		// Save path in session
-		$_SESSION['ocuserexportpath'] = $response->data;
-	}
-	OCP\JSON::success();
-	die();
-} else if( $_GET['operation']=='download' ){
-	// Download the export
-	$path = isset( $_SESSION['ocuserexportpath'] ) ? $_SESSION['ocuserexportpath'] : false;
-	if( !$path ){
-		OCP\JSON::error();	
-	}
-	header("Content-Type: application/zip");
-	header("Content-Disposition: attachment; filename=" . basename($path));
-	header("Content-Length: " . filesize($path));
-	@ob_end_clean();
-	readfile($path);
-	unlink( $path );
-	$_SESSION['ocuserexportpath'] = '';	
-}
diff --git a/apps/user_migrate/appinfo/app.php b/apps/user_migrate/appinfo/app.php
deleted file mode 100644
index 366c400493..0000000000
--- a/apps/user_migrate/appinfo/app.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-/**
-* ownCloud - user_migrate
-*
-* @author Tom Needham
-* @copyright 2012 Tom Needham tom@owncloud.com
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either
-* version 3 of the License, or any later version.
-*
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-*
-* You should have received a copy of the GNU Affero General Public
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-*
-*/
-
-OCP\App::registerPersonal( 'user_migrate', 'settings' );
-OCP\Util::addscript( 'user_migrate', 'export');
-
-// add settings page to navigation
-$entry = array(
-	'id' => "user_migrate_settings",
-	'order'=>1,
-	'href' => OCP\Util::linkTo( "user_migrate", "admin.php" ),
-	'name' => 'Import'
-);
diff --git a/apps/user_migrate/appinfo/info.xml b/apps/user_migrate/appinfo/info.xml
deleted file mode 100644
index a128742480..0000000000
--- a/apps/user_migrate/appinfo/info.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<info>
-	<id>user_migrate</id>
-	<name>User Account Migration</name>
-	<description>Migrate your user accounts</description>
-	<licence>AGPL</licence>
-	<author>Tom Needham</author>
-	<require>4</require>
-	<shipped>true</shipped>
-	<default_enable/>
-</info>
diff --git a/apps/user_migrate/appinfo/version b/apps/user_migrate/appinfo/version
deleted file mode 100644
index ceab6e11ec..0000000000
--- a/apps/user_migrate/appinfo/version
+++ /dev/null
@@ -1 +0,0 @@
-0.1
\ No newline at end of file
diff --git a/apps/user_migrate/js/export.js b/apps/user_migrate/js/export.js
deleted file mode 100644
index aef45c45a7..0000000000
--- a/apps/user_migrate/js/export.js
+++ /dev/null
@@ -1,27 +0,0 @@
-$(document).ready(function(){
-    // Do the export
-	$('#exportbtn').click(function(){
-		// Show loader
-		$('.loading').show();
-		$.getJSON(
-			OC.filePath('user_migrate','ajax','export.php'),
-			{operation:'create'},
-			function(result){
-				if(result.status == 'success'){
-					// Download the file
-					window.location = OC.linkTo('user_migrate','ajax/export.php') + '?operation=download';
-					$('.loading').hide();
-					$('#exportbtn').val(t('user_migrate', 'Export'));
-				} else {
-					// Cancel loading
-					$('#exportbtn').html('Failed');
-					// Show Dialog	
-					OC.dialogs.alert(t('user_migrate', 'Something went wrong while the export file was being generated'), t('user_migrate', 'An error has occurred'), function(){ 
-						$('#exportbtn').html(t('user_migrate', 'Export')+'<img style="display: none;" class="loading" src="'+OC.filePath('core','img','loading.gif')+'" />'); 
-					});
-				}
-			}
-		// End ajax
-		);
-	});
-});
\ No newline at end of file
diff --git a/apps/user_migrate/l10n/.gitkeep b/apps/user_migrate/l10n/.gitkeep
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/apps/user_migrate/l10n/ca.php b/apps/user_migrate/l10n/ca.php
deleted file mode 100644
index 6e423c01b0..0000000000
--- a/apps/user_migrate/l10n/ca.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Export" => "Exporta",
-"Something went wrong while the export file was being generated" => "Alguna cosa ha anat malament en generar el fitxer d'exportació",
-"An error has occurred" => "S'ha produït un error",
-"Export your user account" => "Exportar el compte d'usuari",
-"This will create a compressed file that contains your ownCloud account." => "Això crearà un fitxer comprimit que conté el vostre compte ownCloud.",
-"Import user account" => "Importar el compte d'usuari",
-"ownCloud User Zip" => "zip d'usuari ownCloud",
-"Import" => "Importa"
-);
diff --git a/apps/user_migrate/l10n/cs_CZ.php b/apps/user_migrate/l10n/cs_CZ.php
deleted file mode 100644
index 81a5a45d97..0000000000
--- a/apps/user_migrate/l10n/cs_CZ.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Export" => "Export",
-"Something went wrong while the export file was being generated" => "Během vytváření souboru exportu došlo k chybě",
-"An error has occurred" => "Nastala chyba",
-"Export your user account" => "Export Vašeho uživatelského účtu",
-"This will create a compressed file that contains your ownCloud account." => "Bude vytvořen komprimovaný soubor, obsahující Váš ownCloud účet.",
-"Import user account" => "Import uživatelského účtu",
-"ownCloud User Zip" => "Zip soubor uživatele ownCloud",
-"Import" => "Import"
-);
diff --git a/apps/user_migrate/l10n/de.php b/apps/user_migrate/l10n/de.php
deleted file mode 100644
index 928a211dd4..0000000000
--- a/apps/user_migrate/l10n/de.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Export" => "Export",
-"Something went wrong while the export file was being generated" => "Beim Export der Datei ist etwas schiefgegangen.",
-"An error has occurred" => "Es ist ein Fehler aufgetreten.",
-"Export your user account" => "Ihr Konto exportieren",
-"This will create a compressed file that contains your ownCloud account." => "Eine komprimierte Datei wird erzeugt, die Ihr ownCloud-Konto enthält.",
-"Import user account" => "Konto importieren",
-"ownCloud User Zip" => "Zip-Archiv mit Benutzerdaten",
-"Import" => "Importieren"
-);
diff --git a/apps/user_migrate/l10n/el.php b/apps/user_migrate/l10n/el.php
deleted file mode 100644
index 5b57e69a63..0000000000
--- a/apps/user_migrate/l10n/el.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Export" => "Εξαγωγή",
-"An error has occurred" => "Παρουσιάστηκε σφάλμα",
-"Export your user account" => "Εξαγωγή του λογαριασμού χρήστη σας",
-"This will create a compressed file that contains your ownCloud account." => "Αυτό θα δημιουργήσει ένα συμπιεσμένο αρχείο που θα περιέχει τον λογαριασμό σας ownCloud.",
-"Import user account" => "Εισαγωγή λογαριασμού χρήστη",
-"Import" => "Εισαγωγή"
-);
diff --git a/apps/user_migrate/l10n/eo.php b/apps/user_migrate/l10n/eo.php
deleted file mode 100644
index ca91806169..0000000000
--- a/apps/user_migrate/l10n/eo.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Export" => "Malenporti",
-"Something went wrong while the export file was being generated" => "Io malsukcesis dum la enportota dosiero generiĝis",
-"An error has occurred" => "Eraro okazis",
-"Export your user account" => "Malenporti vian uzantokonton",
-"This will create a compressed file that contains your ownCloud account." => "Ĉi tio kreos densigitan dosieron, kiu enhavas vian konton de ownCloud.",
-"Import user account" => "Enporti uzantokonton",
-"ownCloud User Zip" => "ZIP-dosiero de uzanto de ownCloud",
-"Import" => "Enporti"
-);
diff --git a/apps/user_migrate/l10n/es.php b/apps/user_migrate/l10n/es.php
deleted file mode 100644
index 6a0551fe23..0000000000
--- a/apps/user_migrate/l10n/es.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Export" => "Exportar",
-"ownCloud User Zip" => "Zip de usuario de ownCloud",
-"Import" => "Importar"
-);
diff --git a/apps/user_migrate/l10n/fi_FI.php b/apps/user_migrate/l10n/fi_FI.php
deleted file mode 100644
index 2616bee6f2..0000000000
--- a/apps/user_migrate/l10n/fi_FI.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Export" => "Vie",
-"Something went wrong while the export file was being generated" => "Jokin meni pieleen vientiä suorittaessa",
-"An error has occurred" => "Tapahtui virhe",
-"Export your user account" => "Vie käyttäjätilisi",
-"This will create a compressed file that contains your ownCloud account." => "Tämä luo ownCloud-käyttäjätilisi sisältävän pakatun tiedoston.",
-"Import user account" => "Tuo käyttäjätili",
-"Import" => "Tuo"
-);
diff --git a/apps/user_migrate/l10n/fr.php b/apps/user_migrate/l10n/fr.php
deleted file mode 100644
index 70ab2f8f22..0000000000
--- a/apps/user_migrate/l10n/fr.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Export" => "Exporter",
-"Something went wrong while the export file was being generated" => "Une erreur s'est produite pendant la génération du fichier d'export",
-"An error has occurred" => "Une erreur s'est produite",
-"Export your user account" => "Exportez votre compte utilisateur",
-"This will create a compressed file that contains your ownCloud account." => "Cette action va créer une archive compressée qui contiendra les données de votre compte ownCloud.",
-"Import user account" => "Importer un compte utilisateur",
-"ownCloud User Zip" => "Archive Zip de l'utilisateur",
-"Import" => "Importer"
-);
diff --git a/apps/user_migrate/l10n/it.php b/apps/user_migrate/l10n/it.php
deleted file mode 100644
index f3eeb15dab..0000000000
--- a/apps/user_migrate/l10n/it.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Export" => "Esporta",
-"Something went wrong while the export file was being generated" => "Si è verificato un errore durante la creazione del file di esportazione",
-"An error has occurred" => "Si è verificato un errore",
-"Export your user account" => "Esporta il tuo account utente",
-"This will create a compressed file that contains your ownCloud account." => "Questa operazione creerà un file compresso che contiene il tuo account ownCloud.",
-"Import user account" => "Importa account utente",
-"ownCloud User Zip" => "Zip account utente",
-"Import" => "Importa"
-);
diff --git a/apps/user_migrate/l10n/ja_JP.php b/apps/user_migrate/l10n/ja_JP.php
deleted file mode 100644
index 86c66e6319..0000000000
--- a/apps/user_migrate/l10n/ja_JP.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Export" => "エクスポート",
-"Something went wrong while the export file was being generated" => "エクスポートファイルの生成時に何か不具合が発生しました。",
-"An error has occurred" => "エラーが発生しました",
-"Export your user account" => "ユーザアカウントのエクスポート",
-"This will create a compressed file that contains your ownCloud account." => "あなたのownCloudアカウントを含む圧縮ファイルを生成します。",
-"Import user account" => "ユーザアカウントをインポート",
-"ownCloud User Zip" => "ownCloudユーザZip",
-"Import" => "インポート"
-);
diff --git a/apps/user_migrate/l10n/lt_LT.php b/apps/user_migrate/l10n/lt_LT.php
deleted file mode 100644
index 20add8037b..0000000000
--- a/apps/user_migrate/l10n/lt_LT.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Export" => "Eksportuoti",
-"Something went wrong while the export file was being generated" => "Įvyko klaida kuriant eksportuojamą failą",
-"An error has occurred" => "Įvyko klaida",
-"Export your user account" => "Eksportuoti jūsų vartotojo paskyrą",
-"This will create a compressed file that contains your ownCloud account." => "Bus sukurtas suglaudintas failas su jūsų ownCloud vartotojo paskyra.",
-"Import user account" => "Importuoti vartotojo paskyrą",
-"ownCloud User Zip" => "ownCloud vartotojo paskyros Zip archyvas",
-"Import" => "Importuoti"
-);
diff --git a/apps/user_migrate/l10n/pl.php b/apps/user_migrate/l10n/pl.php
deleted file mode 100644
index c3a6332578..0000000000
--- a/apps/user_migrate/l10n/pl.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Export" => "Eksport",
-"Something went wrong while the export file was being generated" => "Coś poszło źle, podczas generowania pliku eksportu",
-"An error has occurred" => "Wystąpił błąd",
-"Export your user account" => "Eksportuj konto użytkownika",
-"This will create a compressed file that contains your ownCloud account." => "Spowoduje to utworzenie pliku skompresowanego, który zawiera konto ownCloud.",
-"Import user account" => "Importuj konto użytkownika",
-"ownCloud User Zip" => "paczka Zip użytkownika ownCloud",
-"Import" => "Importuj"
-);
diff --git a/apps/user_migrate/l10n/ru.php b/apps/user_migrate/l10n/ru.php
deleted file mode 100644
index c8889ad021..0000000000
--- a/apps/user_migrate/l10n/ru.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Export" => "Экспорт",
-"Something went wrong while the export file was being generated" => "В процессе создания файла экспорта что-то пошло не так",
-"An error has occurred" => "Произошла ошибка",
-"Export your user account" => "Экспортировать ваш аккаунт пользователя",
-"This will create a compressed file that contains your ownCloud account." => "Будет создан сжатый файл, содержащий ваш аккаунт ownCloud",
-"Import user account" => "Импортировать аккаунт пользователя",
-"ownCloud User Zip" => "Архив пользователя ownCloud",
-"Import" => "Импорт"
-);
diff --git a/apps/user_migrate/l10n/sl.php b/apps/user_migrate/l10n/sl.php
deleted file mode 100644
index c14bca0f70..0000000000
--- a/apps/user_migrate/l10n/sl.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Export" => "Izvozi",
-"Something went wrong while the export file was being generated" => "Med ustvarjanjem datoteke za izvoz je prišlo do napake",
-"An error has occurred" => "Prišlo je do napake",
-"Export your user account" => "Izvozi vaš uporabniški račun",
-"This will create a compressed file that contains your ownCloud account." => "Ustvarjena bo stisnjena datoteka z vašim ownCloud računom.",
-"Import user account" => "Uvozi uporabniški račun",
-"ownCloud User Zip" => "Zip datoteka ownCloud uporabnika",
-"Import" => "Uvozi"
-);
diff --git a/apps/user_migrate/l10n/sv.php b/apps/user_migrate/l10n/sv.php
deleted file mode 100644
index 98e649632b..0000000000
--- a/apps/user_migrate/l10n/sv.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Export" => "Exportera",
-"Something went wrong while the export file was being generated" => "Något gick fel när exportfilen skulle genereras",
-"An error has occurred" => "Ett fel har uppstått",
-"Export your user account" => "Exportera ditt användarkonto",
-"This will create a compressed file that contains your ownCloud account." => "Detta vill skapa en komprimerad fil som innehåller ditt ownCloud-konto.",
-"Import user account" => "Importera ett användarkonto",
-"ownCloud User Zip" => "ownCloud  Zip-fil",
-"Import" => "Importera"
-);
diff --git a/apps/user_migrate/l10n/th_TH.php b/apps/user_migrate/l10n/th_TH.php
deleted file mode 100644
index d2c36bb4ed..0000000000
--- a/apps/user_migrate/l10n/th_TH.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Export" => "ส่งออก",
-"Something went wrong while the export file was being generated" => "เกิดข้อผิดพลาดบางประการในระหว่างการส่งออกไฟล์",
-"An error has occurred" => "เกิดข้อผิดพลาดบางประการ",
-"Export your user account" => "ส่งออกบัญชีผู้ใช้งานของคุณ",
-"This will create a compressed file that contains your ownCloud account." => "ส่วนนี้จะเป็นการสร้างไฟล์บีบอัดที่บรรจุข้อมูลบัญชีผู้ใช้งาน ownCloud ของคุณ",
-"Import user account" => "นำเข้าบัญชีผู้ใช้งาน",
-"ownCloud User Zip" => "ไฟล์ Zip ผู้ใช้งาน ownCloud",
-"Import" => "นำเข้า"
-);
diff --git a/apps/user_migrate/settings.php b/apps/user_migrate/settings.php
deleted file mode 100644
index 098927fa17..0000000000
--- a/apps/user_migrate/settings.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-
-/**
- * ownCloud - user_migrate
- *
- * @author Thomas Schmidt
- * @copyright 2011 Thomas Schmidt tom@opensuse.org
- * @author Tom Needham
- * @copyright 2012 Tom Needham tom@owncloud.com
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *
- * You should have received a copy of the GNU Affero General Public
- * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-OCP\App::checkAppEnabled('user_migrate');
-if (isset($_POST['user_import'])) {
-	$root = OC::$SERVERROOT . "/";
-	$importname = "owncloud_import_" . date("y-m-d_H-i-s");
-	
-	// Save data dir for later
-	$datadir = OCP\Config::getSystemValue( 'datadirectory' );
-	
-	// Copy the uploaded file
-	$from = $_FILES['owncloud_import']['tmp_name'];
-	$to = get_temp_dir().'/'.$importname.'.zip';
-	if( !move_uploaded_file( $from, $to ) ){
-
-		$error = array('error'=>'Failed to move the uploaded file','hint'=>'Try checking the permissions of the '.get_temp_dir().' dir.');
-		OCP\Util::writeLog( 'user_migrate', "Failed to copy the uploaded file", OCP\Util::ERROR );
-		$tmpl = new OCP\Template('user_migrate', 'settings');
-		$tmpl->assign('error',$error);
-    	//return $tmpl->fetchPage();
-	}
-		
-
-	$response = json_decode( OC_Migrate::import( $to, 'user' ) );
-	if( !$response->success ){
-		$error = array('error'=>'There was an error while importing the user!','hint'=>'Please check the logs for a more detailed explaination');
-		$tmpl = new OCP\Template('user_migrate', 'settings');
-		$tmpl->assign('error',$error);
-    	//return $tmpl->fetchPage();	
-	} else {
-		// Check import status
-		foreach( $response->data as $app => $status ){
-			if( $status != 'true' ){
-				// It failed for some reason
-				if( $status == 'notsupported' ){
-					$notsupported[] = $app;	
-				} else if( !$status ){
-					$failed[] = $app;
-				}
-			}	
-		}
-		// Any problems?
-		if( isset( $notsupported ) || isset( $failed ) ){
-			if( count( $failed ) > 0 ){
-				$error = array('error'=>'Some app data failed to import','hint'=>'App data for: '.implode(', ', $failed).' failed to import.');
-				$tmpl = new OCP\Template('user_migrate', 'settings');
-				$tmpl->assign('error',$error);
-    			//return $tmpl->fetchPage();	
-			} else if( count( $notsupported ) > 0 ){
-				$error = array('error'=>'Some app data could not be imported, as the apps are not installed on this instance','hint'=>'App data for: '.implode(', ', $notsupported).' failed to import as they were not found. Please install the apps and try again');
-				$tmpl = new OCP\Template('user_migrate', 'settings');
-				$tmpl->assign('error',$error);
-    			//return $tmpl->fetchPage();	
-			}
-		} else {
-			// Went swimmingly!
-			$tmpl = new OCP\Template('user_migrate', 'settings');
-    		//return $tmpl->fetchPage();	
-		}
-
-	}
-		
-} else {
-	// fill template
-	$tmpl = new OCP\Template('user_migrate', 'settings');
-	return $tmpl->fetchPage();
-}
\ No newline at end of file
diff --git a/apps/user_migrate/templates/settings.php b/apps/user_migrate/templates/settings.php
deleted file mode 100644
index d6f3e2f8f6..0000000000
--- a/apps/user_migrate/templates/settings.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<fieldset class="personalblock">
-	<legend><strong><?php echo $l->t('Export your user account');?></strong></legend>
-	<p><?php echo $l->t('This will create a compressed file that contains your ownCloud account.');?>
-	</p>
-	<button id="exportbtn">Export<img style="display: none;" class="loading" src="<?php echo OCP\Util::imagePath('core', 'loading.gif'); ?>" /></button>
-</fieldset>
-<form id="import" action="#" method="post" enctype="multipart/form-data">
-    <fieldset class="personalblock">
-		<?php if(isset($_['error'])){ ?>
-		<h3><?php echo $_['error']['error']; ?></h3>
-		<p><?php echo $_['error']['hint']; ?></p>
-		<?php } ?>
-        <legend><strong><?php echo $l->t('Import user account');?></strong></legend>
-        </p>
-        <p><input type="file" id="owncloud_import" name="owncloud_import" style="width:280px;"><label for="owncloud_import"> <?php echo $l->t('ownCloud User Zip');?></label>
-        </p>
-        <input type="submit" name="user_import" value="<?php echo $l->t('Import'); ?>" />
-    </fieldset>
-</form>
diff --git a/apps/user_openid/appinfo/app.php b/apps/user_openid/appinfo/app.php
deleted file mode 100644
index fe57b189fa..0000000000
--- a/apps/user_openid/appinfo/app.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-//check if curl extension installed
-if (!in_array ('curl', get_loaded_extensions())){
-	return;
-}
-
-$userName='';
-if(strpos($_SERVER["REQUEST_URI"],'?') and !strpos($_SERVER["REQUEST_URI"],'=')){
-	if(strpos($_SERVER["REQUEST_URI"],'/?')){
-		$userName=substr($_SERVER["REQUEST_URI"],strpos($_SERVER["REQUEST_URI"],'/?')+2);
-	}elseif(strpos($_SERVER["REQUEST_URI"],'.php?')){
-		$userName=substr($_SERVER["REQUEST_URI"],strpos($_SERVER["REQUEST_URI"],'.php?')+5);
-	}
-}
-
-OCP\Util::addHeader('link',array('rel'=>'openid.server', 'href'=>OCP\Util::linkToAbsolute( "user_openid", "user.php" ).'/'.$userName));
-OCP\Util::addHeader('link',array('rel'=>'openid.delegate', 'href'=>OCP\Util::linkToAbsolute( "user_openid", "user.php" ).'/'.$userName));
-
-OCP\App::registerPersonal('user_openid','settings');
-
-require_once 'apps/user_openid/user_openid.php';
-
-//active the openid backend
-OC_User::useBackend('openid');
-
-//check for results from openid requests
-if(isset($_GET['openid_mode']) and $_GET['openid_mode'] == 'id_res'){
-	OCP\Util::writeLog('user_openid','openid retured',OCP\Util::DEBUG);
-	$openid = new SimpleOpenID();
-	$openid->SetIdentity($_GET['openid_identity']);
-	$openid_validation_result = $openid->ValidateWithServer();
-	if ($openid_validation_result == true){         // OK HERE KEY IS VALID
-		OCP\Util::writeLog('user_openid','auth sucessfull',OCP\Util::DEBUG);
-		$identity=$openid->GetIdentity();
-		OCP\Util::writeLog('user_openid','auth as '.$identity,OCP\Util::DEBUG);
-		$user=OC_USER_OPENID::findUserForIdentity($identity);
-		if($user){
-			$_SESSION['user_id']=$user;
-			header("Location: ".OC::$WEBROOT);
-		}
-	}else if($openid->IsError() == true){            // ON THE WAY, WE GOT SOME ERROR
-		$error = $openid->GetError();
-		OCP\Util::writeLog('user_openid','ERROR CODE: '. $error['code'],OCP\Util::ERROR);
-		OCP\Util::writeLog('user_openid','ERROR DESCRIPTION: '. $error['description'],OCP\Util::ERROR);
-	}else{                                            // Signature Verification Failed
-		OCP\Util::writeLog('user_openid','INVALID AUTHORIZATION',OCP\Util::ERROR);
-	}
-}else if (isset($_GET['openid_mode']) and $_GET['openid_mode'] == 'cancel'){ // User Canceled your Request
-	OCP\Util::writeLog('user_openid','USER CANCELED REQUEST',OCP\Util::DEBUG);
-	return false;
-}
diff --git a/apps/user_openid/appinfo/info.xml b/apps/user_openid/appinfo/info.xml
deleted file mode 100644
index 7aae4271fa..0000000000
--- a/apps/user_openid/appinfo/info.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<info>
-	<id>user_openid</id>
-	<name>OpenID user backend</name>
-	<description>Allow login through OpenID</description>
-	<licence>AGPL</licence>
-	<author>Robin Appelman</author>
-	<require>4</require>
-	<shipped>true</shipped>
-	<types>
-		<prelogin/>
-		<authentication/>
-	</types>
-</info>
diff --git a/apps/user_openid/appinfo/version b/apps/user_openid/appinfo/version
deleted file mode 100644
index d917d3e26a..0000000000
--- a/apps/user_openid/appinfo/version
+++ /dev/null
@@ -1 +0,0 @@
-0.1.2
diff --git a/apps/user_openid/js/settings.js b/apps/user_openid/js/settings.js
deleted file mode 100644
index 83170e6b84..0000000000
--- a/apps/user_openid/js/settings.js
+++ /dev/null
@@ -1,10 +0,0 @@
-$(document).ready(function(){
-	$('#openidform #identity').blur(function(event){
-		event.preventDefault();
-		OC.msg.startSaving('#openidform .msg');
-		var post = $( "#openidform" ).serialize();
-		$.post( 'ajax/openid.php', post, function(data){
-			OC.msg.finishedSaving('#openidform .msg', data);
-		});
-	});
-});
diff --git a/apps/user_openid/l10n/.gitkeep b/apps/user_openid/l10n/.gitkeep
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/apps/user_openid/l10n/ca.php b/apps/user_openid/l10n/ca.php
deleted file mode 100644
index d203bfb4d9..0000000000
--- a/apps/user_openid/l10n/ca.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php $TRANSLATIONS = array(
-"This is an OpenID server endpoint. For more information, see " => "Això és un punt final de servidor OpenID. Per més informació consulteu",
-"Identity: <b>" => "Identitat:<b>",
-"Realm: <b>" => "Domini:<b>",
-"User: <b>" => "Usuari:<b>",
-"Login" => "Inici de sessió",
-"Error: <b>No user Selected" => "Error:<b>No heu seleccionat cap usuari",
-"you can authenticate to other sites with this address" => "podeu autenticar altres llocs web amb aquesta adreça",
-"Authorized OpenID provider" => "Servidor OpenID autoritzat",
-"Your address at Wordpress, Identi.ca, &hellip;" => "La vostra adreça a Wordpress, Identi.ca &hellip;"
-);
diff --git a/apps/user_openid/l10n/cs_CZ.php b/apps/user_openid/l10n/cs_CZ.php
deleted file mode 100644
index 9c041a89a6..0000000000
--- a/apps/user_openid/l10n/cs_CZ.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php $TRANSLATIONS = array(
-"This is an OpenID server endpoint. For more information, see " => "Toto je OpenID server endpoint. Více informací na",
-"Identity: <b>" => "Identita: <b>",
-"Realm: <b>" => "Oblast: <b>",
-"User: <b>" => "Uživatel: <b>",
-"Login" => "Login",
-"Error: <b>No user Selected" => "Chyba: <b>Uživatel není zvolen",
-"you can authenticate to other sites with this address" => "s touto adresou se můžete autrorizovat na další strany",
-"Authorized OpenID provider" => "Autorizovaný OpenID poskytovatel",
-"Your address at Wordpress, Identi.ca, &hellip;" => "Vaše adresa na Wordpressu, Identi.ca, &hellip;"
-);
diff --git a/apps/user_openid/l10n/de.php b/apps/user_openid/l10n/de.php
deleted file mode 100644
index 7bfe678574..0000000000
--- a/apps/user_openid/l10n/de.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php $TRANSLATIONS = array(
-"This is an OpenID server endpoint. For more information, see " => "Dies ist ein OpenID-Server-Endpunkt. Weitere Informationen finden Sie unter:",
-"Identity: <b>" => "Identität: <b>",
-"Realm: <b>" => "Bereich: <b>",
-"User: <b>" => "Benutzer: <b>",
-"Login" => "Anmelden",
-"Error: <b>No user Selected" => "Fehler: <b> Kein Benutzer ausgewählt",
-"you can authenticate to other sites with this address" => "Sie können sich auf anderen Seiten mit dieser Adresse authentifizieren.",
-"Authorized OpenID provider" => "Authorisierter OpenID-Anbieter",
-"Your address at Wordpress, Identi.ca, &hellip;" => "Ihre Adresse bei Wordpress, Identi.ca, &hellip;"
-);
diff --git a/apps/user_openid/l10n/el.php b/apps/user_openid/l10n/el.php
deleted file mode 100644
index a80f5bdb24..0000000000
--- a/apps/user_openid/l10n/el.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Identity: <b>" => "Ταυτότητα: <b>",
-"User: <b>" => "Χρήστης: <b>",
-"Login" => "Σύνδεση",
-"Error: <b>No user Selected" => "Σφάλμα: <b> Δεν έχει επιλεχθεί κάποιος χρήστης",
-"Authorized OpenID provider" => "Εξουσιοδοτημένος παροχέας OpenID",
-"Your address at Wordpress, Identi.ca, &hellip;" => "Η διευθυνσή σας σε Wordpress, Identi.ca, &hellip;"
-);
diff --git a/apps/user_openid/l10n/eo.php b/apps/user_openid/l10n/eo.php
deleted file mode 100644
index 665d199094..0000000000
--- a/apps/user_openid/l10n/eo.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php $TRANSLATIONS = array(
-"This is an OpenID server endpoint. For more information, see " => "Ĉi tio estas finpunkto de OpenID-servilo. Por pli da informo, vidu",
-"Identity: <b>" => "Idento: <b>",
-"Realm: <b>" => "Regno: <b>",
-"User: <b>" => "Uzanto: <b>",
-"Login" => "Ensaluti",
-"Error: <b>No user Selected" => "Eraro: <b>neniu uzanto estas elektita",
-"you can authenticate to other sites with this address" => "Vi povas ensaluti en aliaj ejoj per tiu ĉi adreso",
-"Authorized OpenID provider" => "Rajtigita OpenID-provizanto",
-"Your address at Wordpress, Identi.ca, &hellip;" => "Via adreso ĉe Wordpress, Identi.ca&hellip;"
-);
diff --git a/apps/user_openid/l10n/es.php b/apps/user_openid/l10n/es.php
deleted file mode 100644
index 048336d3db..0000000000
--- a/apps/user_openid/l10n/es.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Identity: <b>" => "Identidad: <b>",
-"User: <b>" => "Usuario: <b>",
-"Login" => "Iniciar sesión"
-);
diff --git a/apps/user_openid/l10n/et_EE.php b/apps/user_openid/l10n/et_EE.php
deleted file mode 100644
index f04bcafb24..0000000000
--- a/apps/user_openid/l10n/et_EE.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php $TRANSLATIONS = array(
-"This is an OpenID server endpoint. For more information, see " => "See on OpenID serveri lõpp-punkt. Lisainfot vaata",
-"Identity: <b>" => "Identiteet: <b>",
-"Realm: <b>" => "Tsoon: <b>"
-);
diff --git a/apps/user_openid/l10n/fi_FI.php b/apps/user_openid/l10n/fi_FI.php
deleted file mode 100644
index 1cde4ae660..0000000000
--- a/apps/user_openid/l10n/fi_FI.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Identity: <b>" => "Identiteetti: <b>",
-"Realm: <b>" => "Alue: <b>",
-"User: <b>" => "Käyttäjä: <b>",
-"Login" => "Kirjaudu",
-"Error: <b>No user Selected" => "Virhe: <b>Käyttäjää ei valittu"
-);
diff --git a/apps/user_openid/l10n/fr.php b/apps/user_openid/l10n/fr.php
deleted file mode 100644
index ec3d00853d..0000000000
--- a/apps/user_openid/l10n/fr.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php $TRANSLATIONS = array(
-"This is an OpenID server endpoint. For more information, see " => "Ce serveur est un point d'accès OpenID. Pour plus d'informations, veuillez consulter",
-"Identity: <b>" => "Identité : <b>",
-"Realm: <b>" => "Domaine : <b>",
-"User: <b>" => "Utilisateur : <b>",
-"Login" => "Connexion",
-"Error: <b>No user Selected" => "Erreur : <b>Aucun nom d'utilisateur n'a été saisi",
-"you can authenticate to other sites with this address" => "vous pouvez vous authentifier sur d'autres sites grâce à cette adresse",
-"Authorized OpenID provider" => "Fournisseur d'identité OpenID autorisé",
-"Your address at Wordpress, Identi.ca, &hellip;" => "Votre adresse Wordpress, Identi.ca, &hellip;"
-);
diff --git a/apps/user_openid/l10n/it.php b/apps/user_openid/l10n/it.php
deleted file mode 100644
index 0a9dd951b5..0000000000
--- a/apps/user_openid/l10n/it.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php $TRANSLATIONS = array(
-"This is an OpenID server endpoint. For more information, see " => "Questo è un server OpenID. Per ulteriori informazioni, vedi ",
-"Identity: <b>" => "Identità: <b>",
-"Realm: <b>" => "Dominio: <b>",
-"User: <b>" => "Utente: <b>",
-"Login" => "Accesso",
-"Error: <b>No user Selected" => "Errore: <b>nessun utente selezionato",
-"you can authenticate to other sites with this address" => "puoi autenticarti ad altri siti con questo indirizzo",
-"Authorized OpenID provider" => "Fornitore OpenID autorizzato",
-"Your address at Wordpress, Identi.ca, &hellip;" => "Il tuo indirizzo su Wordpress, Identi.ca, &hellip;"
-);
diff --git a/apps/user_openid/l10n/ja_JP.php b/apps/user_openid/l10n/ja_JP.php
deleted file mode 100644
index 12a2692cb6..0000000000
--- a/apps/user_openid/l10n/ja_JP.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php $TRANSLATIONS = array(
-"This is an OpenID server endpoint. For more information, see " => "これはOpenIDサーバのエンドポイントです。詳細は下記をチェックしてください。",
-"Identity: <b>" => "識別子: <b>",
-"Realm: <b>" => "レルム: <b>",
-"User: <b>" => "ユーザ: <b>",
-"Login" => "ログイン",
-"Error: <b>No user Selected" => "エラー: <b>ユーザが選択されていません",
-"you can authenticate to other sites with this address" => "他のサイトにこのアドレスで認証することができます",
-"Authorized OpenID provider" => "認証されたOpenIDプロバイダ",
-"Your address at Wordpress, Identi.ca, &hellip;" => "Wordpressのアドレス、Identi.ca、&hellip;"
-);
diff --git a/apps/user_openid/l10n/nl.php b/apps/user_openid/l10n/nl.php
deleted file mode 100644
index 5b07c6108a..0000000000
--- a/apps/user_openid/l10n/nl.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php $TRANSLATIONS = array(
-"This is an OpenID server endpoint. For more information, see " => "Dit is een OpenID server.  Voor meer informatie, zie",
-"Identity: <b>" => "Identiteit: <b>",
-"Realm: <b>" => "Realm: <b>",
-"User: <b>" => "Gebruiker: <b>",
-"Login" => "Login",
-"Error: <b>No user Selected" => "Fout: <b>Geen gebruiker geselecteerd",
-"you can authenticate to other sites with this address" => "u kan met dit adres bij andere sites authenticeren",
-"Authorized OpenID provider" => "Geautoriseerde OpenID provider",
-"Your address at Wordpress, Identi.ca, &hellip;" => "Uw adres bij Wordpress, Identi.ca, &hellip;"
-);
diff --git a/apps/user_openid/l10n/pl.php b/apps/user_openid/l10n/pl.php
deleted file mode 100644
index c9572851e3..0000000000
--- a/apps/user_openid/l10n/pl.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php $TRANSLATIONS = array(
-"This is an OpenID server endpoint. For more information, see " => "To jest punkt końcowy serwera OpenID. Aby uzyskać więcej informacji zobacz",
-"Identity: <b>" => "Tożsamość: <b>",
-"Realm: <b>" => "Obszar: <b>",
-"User: <b>" => "Użytkownik: <b>",
-"Login" => "Login",
-"Error: <b>No user Selected" => "Błąd:<b>Nie wybrano użytkownika",
-"you can authenticate to other sites with this address" => "można uwierzytelniać do innych witryn z tego adresu",
-"Authorized OpenID provider" => "Autoryzowani dostawcy OpenID",
-"Your address at Wordpress, Identi.ca, &hellip;" => "Twój adres na Wordpress, Identi.ca, &hellip;"
-);
diff --git a/apps/user_openid/l10n/ru.php b/apps/user_openid/l10n/ru.php
deleted file mode 100644
index 09855c35b7..0000000000
--- a/apps/user_openid/l10n/ru.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php $TRANSLATIONS = array(
-"This is an OpenID server endpoint. For more information, see " => "Это точка подключения сервера OpenID. Для информации смотрите",
-"Identity: <b>" => "Личность: <b>",
-"Realm: <b>" => "Realm: <b>",
-"User: <b>" => "Пользователь: <b>",
-"Login" => "Логин",
-"Error: <b>No user Selected" => "Ошибка: <b>Пользователь не выбран",
-"you can authenticate to other sites with this address" => "вы можете аутентифицироваться на других сайтах с этим адресом",
-"Authorized OpenID provider" => "Авторизованный провайдер OpenID",
-"Your address at Wordpress, Identi.ca, &hellip;" => "Ваш адрес в Wordpress, Identi.ca, &hellip;"
-);
diff --git a/apps/user_openid/l10n/sl.php b/apps/user_openid/l10n/sl.php
deleted file mode 100644
index 0464214a42..0000000000
--- a/apps/user_openid/l10n/sl.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php $TRANSLATIONS = array(
-"This is an OpenID server endpoint. For more information, see " => "To je OpenID strežniška končna točka. Za več informacij si oglejte",
-"Identity: <b>" => "Identiteta: <b>",
-"Realm: <b>" => "Področje: <b>",
-"User: <b>" => "Uporabnik:",
-"Login" => "Prijava",
-"Error: <b>No user Selected" => "Napaka: <b>Uporabnik ni bil izbran",
-"you can authenticate to other sites with this address" => "s tem naslovom se lahko overite tudi na drugih straneh",
-"Authorized OpenID provider" => "Odobren ponudnik OpenID",
-"Your address at Wordpress, Identi.ca, &hellip;" => "Vaš naslov pri Wordpress, Identi.ca, &hellip;"
-);
diff --git a/apps/user_openid/l10n/sv.php b/apps/user_openid/l10n/sv.php
deleted file mode 100644
index fb2c4e2ff7..0000000000
--- a/apps/user_openid/l10n/sv.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php $TRANSLATIONS = array(
-"This is an OpenID server endpoint. For more information, see " => "Detta är en OpenID-server slutpunkt. För mer information, se",
-"Identity: <b>" => "Identitet: <b>",
-"Realm: <b>" => "Realm: <b>",
-"User: <b>" => "Användare: <b>",
-"Login" => "Logga in",
-"Error: <b>No user Selected" => "Fel: <b>Ingen användare vald",
-"you can authenticate to other sites with this address" => "du kan autentisera till andra webbplatser med denna adress",
-"Authorized OpenID provider" => "Godkänd openID leverantör",
-"Your address at Wordpress, Identi.ca, &hellip;" => "Din adress på Wordpress, Identi.ca, &hellip;"
-);
diff --git a/apps/user_openid/l10n/th_TH.php b/apps/user_openid/l10n/th_TH.php
deleted file mode 100644
index fbf0bbc60a..0000000000
--- a/apps/user_openid/l10n/th_TH.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php $TRANSLATIONS = array(
-"This is an OpenID server endpoint. For more information, see " => "นี่คือปลายทางของเซิร์ฟเวอร์ OpenID สำหรับรายละเอียดเพิ่มเติม, กรุณาดูที่",
-"Identity: <b>" => "ข้อมูลประจำตัว <b>",
-"Realm: <b>" => "ขอบเขตพื้นที่ <b>",
-"User: <b>" => "ผู้ใช้งาน: <b>",
-"Login" => "เข้าสู่ระบบ",
-"Error: <b>No user Selected" => "พบข้อผิดพลาด <b> ยังไม่ได้เลือกชื่อผู้ใช้งาน",
-"you can authenticate to other sites with this address" => "คุณสามารถได้รับสิทธิ์เพื่อเข้าใช้งานเว็บไซต์อื่นๆโดยใช้ที่อยู่นี้",
-"Authorized OpenID provider" => "ผู้ให้บริการ OpenID ที่ได้รับอนุญาต",
-"Your address at Wordpress, Identi.ca, &hellip;" => "ที่อยู่ของคุณที่ Wordpress, Identi.ca, &hellip;"
-);
diff --git a/apps/user_openid/settings.php b/apps/user_openid/settings.php
deleted file mode 100644
index 062322f6fe..0000000000
--- a/apps/user_openid/settings.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-$tmpl = new OCP\Template( 'user_openid', 'settings');
-$identity=OCP\Config::getUserValue(OCP\USER::getUser(),'user_openid','identity','');
-$tmpl->assign('identity',htmlentities($identity));
-
-OCP\Util::addscript('user_openid','settings');
-
-return $tmpl->fetchPage();
-?>
\ No newline at end of file
diff --git a/apps/user_openid/templates/nomode.php b/apps/user_openid/templates/nomode.php
deleted file mode 100644
index 8952b542f0..0000000000
--- a/apps/user_openid/templates/nomode.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-global $profile;
-
-?>
-
-<div id="login">
-	<img src="<?php echo OCP\image_path("", "logo.png"); ?>" alt="ownCloud" />
-	<ul>
-		<li class='error'>
-			<div id="setup_form">
-				<p><?php echo($l->t('This is an OpenID server endpoint. For more information, see '));?><a href='http://openid.net/' title='openid.net'>http://openid.net/</a></p>
-				<?php if($_['user']):?>
-					<p><?php echo($l->t('Identity: <b>').$profile['idp_url']); ?></b></p>
-					<p><?php echo($l->t('Realm: <b>').$profile['php_realm']); ?></b></p>
-					<p><?php echo($l->t('User: <b>').$_['user']); ?></b>
-					<p><a href="<?php echo($profile['idp_url']); ?>?openid.mode=login"><?php echo($l->t('Login')); ?></a>
-					<?php if($profile['allow_test'] === true): ?>
-						<a href="<?php echo($profile['idp_url']); ?>?openid.mode=test">Test</a>
-					<?php endif; ?>
-				<?php else: ?>
-					<p><?php echo($l->t('Error: <b>No user Selected')); ?></p>
-				<?php endif; ?>
-			</div>
-		</li>
-	</ul>
-</div>
-
diff --git a/apps/user_openid/templates/settings.php b/apps/user_openid/templates/settings.php
deleted file mode 100644
index b2bbe5a46a..0000000000
--- a/apps/user_openid/templates/settings.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<form id="openidform">
-	<fieldset class="personalblock">
-		<strong>OpenID</strong>
-		<?php echo (OCP\Util::getServerProtocol()).'://'.OCP\Util::getServerHost().OC::$WEBROOT.'/?'; echo OCP\USER::getUser(); ?><br /><em><?php echo $l->t('you can authenticate to other sites with this address');?></em><br />
-		<label for="identity"><?php echo $l->t('Authorized OpenID provider');?></label>
-		<input type="text" name="identity" id="identity" value="<?php echo $_['identity']; ?>" placeholder="<?php echo $l->t('Your address at Wordpress, Identi.ca, &hellip;');?>" /><span class="msg"></span>
-	</fieldset>
-</form>
diff --git a/apps/user_openid/user.php b/apps/user_openid/user.php
deleted file mode 100644
index 88571ba618..0000000000
--- a/apps/user_openid/user.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-/**
-* ownCloud
-*
-* @author Robin Appelman
-* @copyright 2011 Robin Appelman icewind1991@gmail.com
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either
-* version 3 of the License, or any later version.
-*
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-*
-* You should have received a copy of the GNU Affero General Public
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-*
-*/
-
-$USERNAME=substr($_SERVER["REQUEST_URI"],strpos($_SERVER["REQUEST_URI"],'.php/')+5);
-if(strpos($USERNAME,'?')!==false){
-	$USERNAME=substr($USERNAME,0,strpos($USERNAME,'?'));
-}
-if(substr($USERNAME,-1,1)=='/'){//openid sometimes add slashes to the username
-	$USERNAME=substr($USERNAME,0,-1);
-}
-
-
-if($USERNAME=='' and isset($_SERVER['PHP_AUTH_USER'])){
-	$USERNAME=$_SERVER['PHP_AUTH_USER'];
-}
-
-$RUNTIME_NOAPPS=true;
-$RUNTIME_NOAPPS=false;
-OCP\App::checkAppEnabled('user_openid');
-
-if(!OCP\User::userExists($USERNAME)){
-	OCP\Util::writeLog('user_openid',$USERNAME.' doesn\'t exist',OCP\Util::WARN);
-	$USERNAME='';
-}
-$IDENTITY=OCP\Util::linkToAbsolute( "user_openid", "user.php" ).'/'.$USERNAME;
-
-require_once 'openid/phpmyid.php';
diff --git a/apps/user_openid/user_openid.php b/apps/user_openid/user_openid.php
deleted file mode 100644
index 9654001cbc..0000000000
--- a/apps/user_openid/user_openid.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-
-/**
- * ownCloud
- *
- * @author Robin Appelman
- * @copyright 2011 Robin Appelman icewind1991gmailc.om
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *
- * You should have received a copy of the GNU Affero General Public
- * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-require_once('openid/class.openid.v3.php');
-
-/**
- * Class for user OpenId backend
- */
-class OC_USER_OPENID extends OC_User_Backend {
-	/**
-	 * @brief Check if the password is correct
-	 * @param $uid The username
-	 * @param $password The password
-	 * @returns true/false
-	 *
-	 * Check if the password is correct without logging in the user
-	 */
-	public function checkPassword( $uid, $password ){
-		// Get identity from user and redirect browser to OpenID Server
-		$openid = new SimpleOpenID();
-		$openid->SetIdentity($uid);
-		$openid->SetTrustRoot('http://' . OCP\Util::getServerHost());
-		if ($openid->GetOpenIDServer()){
-			$openid->SetApprovedURL('http://' . OCP\Util::getServerHost() . OC::$WEBROOT);      // Send Response from OpenID server to this script
-			$openid->Redirect();     // This will redirect user to OpenID Server
-			exit;
-		}else{
-			return false;
-		}
-		exit;
-	}
-	
-	/**
-	 * find the user that can be authenticated with an openid identity
-	 */
-	public static function findUserForIdentity($identity){
-		$query=OCP\DB::prepare('SELECT `userid` FROM `*PREFIX*preferences` WHERE `appid`=? AND `configkey`=? AND `configvalue`=?');
-		$result=$query->execute(array('user_openid','identity',$identity))->fetchAll();
-		if(count($result)>0){
-			return $result[0]['userid'];
-		}else{
-			return false;
-		}
-	}
-}
diff --git a/apps/remoteStorage/ajax/revokeToken.php b/apps/user_webdavauth/appinfo/app.php
old mode 100644
new mode 100755
similarity index 64%
rename from apps/remoteStorage/ajax/revokeToken.php
rename to apps/user_webdavauth/appinfo/app.php
index e6a6818994..ebadcf30b6
--- a/apps/remoteStorage/ajax/revokeToken.php
+++ b/apps/user_webdavauth/appinfo/app.php
@@ -1,14 +1,10 @@
 <?php
 
 /**
-* ownCloud
+* ownCloud - user_webdavauth
 *
-* Original:
 * @author Frank Karlitschek
 * @copyright 2012 Frank Karlitschek frank@owncloud.org
-* 
-* Adapted:
-* @author Michiel de Jong, 2012
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
@@ -25,11 +21,17 @@
 *
 */
 
-OCP\App::checkAppEnabled('remoteStorage');
-require_once('remoteStorage/lib_remoteStorage.php');
+require_once('apps/user_webdavauth/user_webdavauth.php');
 
-ini_set('default_charset', 'UTF-8');
-#ini_set('error_reporting', '');
-@ob_clean();
+OC_APP::registerAdmin('user_webdavauth','settings');
 
-echo OC_remoteStorage::deleteToken(file_get_contents("php://input"));
+OC_User::registerBackend("WEBDAVAUTH");
+OC_User::useBackend( "WEBDAVAUTH" );
+
+// add settings page to navigation
+$entry = array(
+	'id' => "user_webdavauth_settings",
+	'order'=>1,
+	'href' => OC_Helper::linkTo( "user_webdavauth", "settings.php" ),
+	'name' => 'WEBDAVAUTH'
+);
diff --git a/apps/user_webdavauth/appinfo/info.xml b/apps/user_webdavauth/appinfo/info.xml
new file mode 100755
index 0000000000..dc555739f4
--- /dev/null
+++ b/apps/user_webdavauth/appinfo/info.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<info>
+	<id>user_webdavauth</id>
+	<name>WebDAV user backend</name>
+	<description>Authenticate Users by a WebDAV call</description>
+	<version>1.0</version>
+	<licence>AGPL</licence>
+	<author>Frank Karlitschek</author>
+	<require>3</require>
+	<shipped>true</shipped>
+</info>
diff --git a/apps/contacts/ajax/loadintro.php b/apps/user_webdavauth/settings.php
old mode 100644
new mode 100755
similarity index 60%
rename from apps/contacts/ajax/loadintro.php
rename to apps/user_webdavauth/settings.php
index 1da08950ca..1b80b1bba3
--- a/apps/contacts/ajax/loadintro.php
+++ b/apps/user_webdavauth/settings.php
@@ -1,9 +1,10 @@
 <?php
+
 /**
- * ownCloud - Addressbook
+ * ownCloud - user_webdavauth
  *
- * @author Thomas Tanghus
- * @copyright 2012 Thomas Tanghus <thomas@tanghus.net>
+ * @author Frank Karlitschek
+ * @copyright 2012 Frank Karlitschek frank@owncloud.org
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
@@ -20,12 +21,16 @@
  *
  */
 
-// Check if we are a user
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('contacts');
+print_r($_POST);
+if($_POST){
 
+		if(isset($_POST['webdav_url'])){
+			OC_CONFIG::setValue('user_webdavauth_url', strip_tags($_POST['webdav_url']));
+		}
+}
 
-$tmpl = new OCP\Template('contacts', 'part.no_contacts');
-$page = $tmpl->fetchPage();
+// fill template
+$tmpl = new OC_Template( 'user_webdavauth', 'settings');
+$tmpl->assign( 'webdav_url', OC_Config::getValue( "user_webdavauth_url" ));
 
-OCP\JSON::success(array('data' => array( 'page' => $page )));
+return $tmpl->fetchPage();
diff --git a/apps/user_webdavauth/templates/settings.php b/apps/user_webdavauth/templates/settings.php
new file mode 100755
index 0000000000..c00c199632
--- /dev/null
+++ b/apps/user_webdavauth/templates/settings.php
@@ -0,0 +1,7 @@
+<form id="webdavauth" action="#" method="post">
+	<fieldset class="personalblock">
+		<legend><strong>WebDAV Authentication</strong></legend>
+		<p><label for="webdav_url"><?php echo $l->t('webdav_url');?><input type="text" id="webdav_url" name="webdav_url" value="<?php echo $_['webdav_url']; ?>"></label>
+		<input type="submit" value="Save" />
+	</fieldset>
+</form>
diff --git a/apps/user_webdavauth/user_webdavauth.php b/apps/user_webdavauth/user_webdavauth.php
new file mode 100755
index 0000000000..571aca2f70
--- /dev/null
+++ b/apps/user_webdavauth/user_webdavauth.php
@@ -0,0 +1,83 @@
+<?php
+
+/**
+ * ownCloud
+ *
+ * @author Frank Karlitschek
+ * @copyright 2012 Frank Karlitschek frank@owncloud.org
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+class OC_USER_WEBDAVAUTH extends OC_User_Backend {
+	protected $webdavauth_url;
+
+	public function __construct() {
+		$this->webdavauth_url = OC_Config::getValue( "user_webdavauth_url" );
+	}
+
+	public function createUser() {
+		// Can't create user
+		OC_Log::write('OC_USER_WEBDAVAUTH', 'Not possible to create users from web frontend using WebDAV user backend',3);
+		return false;
+	}
+
+	public function deleteUser() {
+		// Can't delete user
+		OC_Log::write('OC_USER_WEBDAVAUTH', 'Not possible to delete users from web frontend using WebDAV user backend',3);
+		return false;
+	}
+
+	public function setPassword ( $uid, $password ) {
+		// We can't change user password
+		OC_Log::write('OC_USER_WEBDAVAUTH', 'Not possible to change password for users from web frontend using WebDAV user backend',3);
+		return false;
+	}
+
+	public function checkPassword( $uid, $password ) {
+
+		$url= 'http://'.urlencode($uid).':'.urlencode($password).'@'.$this->webdavauth_url;
+		$headers = get_headers($url);
+		if($headers==false){
+			OC_Log::write('OC_USER_WEBDAVAUTH', 'Not possible to connect to WebDAV Url: "'.$this->webdavauth_url.'" ' ,3);
+			return false;
+
+		}
+		$returncode= substr($headers[0], 9, 3);
+
+		if($returncode=='401') {
+			return false;
+		}else{
+			return true;
+		}
+
+	}
+
+	/*
+	* we don´t know if a user exists without the password. so we have to return false all the time
+	*/
+	public function userExists( $uid ){
+		return false;
+	}
+
+	/*
+	* we don´t know the users so all we can do it return an empty array here
+	*/
+	public function getUsers(){
+		$returnArray = array();
+
+		return $returnArray;
+	}
+}
diff --git a/apps/user_webfinger/.htaccess b/apps/user_webfinger/.htaccess
deleted file mode 100644
index 1b13cf788f..0000000000
--- a/apps/user_webfinger/.htaccess
+++ /dev/null
@@ -1,5 +0,0 @@
-<IfModule mod_rewrite.c>
-RewriteEngine on
-RewriteRule .* - [env=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
-RewriteRule ^host-meta host-meta.php [QSA,L]
-</IfModule>
diff --git a/apps/user_webfinger/appinfo/app.php b/apps/user_webfinger/appinfo/app.php
deleted file mode 100644
index b3d9bbc7f3..0000000000
--- a/apps/user_webfinger/appinfo/app.php
+++ /dev/null
@@ -1 +0,0 @@
-<?php
diff --git a/apps/user_webfinger/appinfo/info.xml b/apps/user_webfinger/appinfo/info.xml
deleted file mode 100644
index f74e5d3f93..0000000000
--- a/apps/user_webfinger/appinfo/info.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<info>
-	<id>user_webfinger</id>
-	<name>Webfinger</name>
-	<description>Provide WebFinger for all users so they get a user address like user@owncloudinstance which can be used for external applications. Other apps can provide information for webfinger requests, such as remoteStorage compatibility.</description>
-	<licence>AGPL or MIT</licence>
-	<author>Michiel de Jong, Florian Hülsmann</author>
-	<require>4</require>
-	<shipped>true</shipped>
-	<public>
-		<host-meta>host-meta.php</host-meta>
-		<webfinger>webfinger.php</webfinger>
-	</public>
-</info>
diff --git a/apps/user_webfinger/appinfo/version b/apps/user_webfinger/appinfo/version
deleted file mode 100644
index a2268e2de4..0000000000
--- a/apps/user_webfinger/appinfo/version
+++ /dev/null
@@ -1 +0,0 @@
-0.3.1
\ No newline at end of file
diff --git a/apps/user_webfinger/host-meta.php b/apps/user_webfinger/host-meta.php
deleted file mode 100644
index 6f6ac46eb9..0000000000
--- a/apps/user_webfinger/host-meta.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-if (!OCP\App::isEnabled("user_webfinger")) {
-	return;
-}
-
-if(class_exists('OC')){
-	$WEBROOT=OC::$WEBROOT;
-}else{//not called trough remote.php try to guess the webroot the best we can from here
-	// calculate the root directories
-	$SERVERROOT=str_replace("\\",'/',substr(__FILE__,0,-strlen('apps/user_webfinger/host-meta.php')));
-	$WEBROOT=substr($SERVERROOT,strlen(realpath($_SERVER['DOCUMENT_ROOT'])));
-
-	if($WEBROOT!='' and $WEBROOT[0]!=='/'){
-		$WEBROOT='/'.$WEBROOT;
-	}
-}
-
-if(substr($WEBROOT,-1)==='/'){
-	$WEBROOT=substr($WEBROOT,0,-1);
-}
-
-$hostMetaHeader = array(
-	'Access-Control-Allow-Origin' => '*',
-	'Content-Type' => 'application/xrd+json'
-);
-$serverName = $_SERVER['SERVER_NAME'];
-$hostMetaContents = '{"links":[{"rel":"lrdd","template":"http'.(isset($_SERVER['HTTPS'])?'s':'').'://'.$serverName.$WEBROOT.'/public.php?service=webfinger&q={uri}"}]}';
-foreach($hostMetaHeader as $header => $value) {
-	header($header . ": " . $value);
-}
-echo $hostMetaContents;
diff --git a/apps/user_webfinger/webfinger.php b/apps/user_webfinger/webfinger.php
deleted file mode 100644
index b725937948..0000000000
--- a/apps/user_webfinger/webfinger.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-if (!OCP\App::isEnabled("user_webfinger")) {
-	return;
-}
-
-header("Access-Control-Allow-Origin: *");
-header("Content-Type: application/xrd+json");
-
-/**
- * To include your app in the webfinger JSON, add a new script with file name
- * 'webfinger.php' to /apps/yourapp/appinfo/, which prints out the XML parts
- * to be included. That script can make use of the constants WF_USER (e. g.
- * "user"), WF_ID (user@host) and WF_BASEURL (e. g. https://host/owncloud).
- * An example could look like this:
- * 
- * {
- * 	"rel":"myProfile",
- * 	"type":"text/html",
- * 	"href":"<?php echo WF_BASEURL; ?>/apps/myApp/profile.php?user=<?php echo WF_USER; ?>"
- * }
- *
- * but can also use complex database queries to generate the webfinger result
- **/
-
-$userName = '';
-$hostName = '';
-$request = strip_tags(urldecode($_GET['q']));
-if($_GET['q']) {
-	$reqParts = explode('@', $request);
-	if(count($reqParts)==2) {
-		$userName = $reqParts[0];
-		$hostName = $reqParts[1];
-	}
-}
-if(substr($userName, 0, 5) == 'acct:') {
-	$userName = substr($userName, 5);
-}
-if($userName == "") {
-	$id = "";
-} else {
-	$id = $userName . '@' . $hostName;
-}
-if(isset($_SERVER['HTTPS'])) {
-	$baseAddress = 'https://';
-} else {
-	$baseAddress = 'http://';
-}
-$baseAddress .= $_SERVER['SERVER_NAME'].OC::$WEBROOT;
-if(empty($id)) {
-	header("HTTP/1.0 400 Bad Request");
-}
-define('WF_USER', $userName);
-define('WF_ID', $id);
-define('WF_BASEURL', $baseAddress);
-echo "{\"links\":[";
-$apps = OC_Appconfig::getApps();
-foreach($apps as $app) {
-	if(OCP\App::isEnabled($app)) {
-		if(is_file(OC_App::getAppPath($app). '/appinfo/webfinger.php')) {
-			require($app . '/appinfo/webfinger.php');
-		}
-	}
-}
-echo "]}";
diff --git a/core/ajax/share.php b/core/ajax/share.php
index 806ca9fb98..debdf612c0 100644
--- a/core/ajax/share.php
+++ b/core/ajax/share.php
@@ -26,8 +26,12 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
 		case 'share':
 			if (isset($_POST['shareType']) && isset($_POST['shareWith']) && isset($_POST['permissions'])) {
 				try {
-					OCP\Share::shareItem($_POST['itemType'], $_POST['itemSource'], (int)$_POST['shareType'], $_POST['shareWith'], $_POST['permissions']);
-					// TODO May need to return private link
+					if ((int)$_POST['shareType'] === OCP\Share::SHARE_TYPE_LINK && $_POST['shareWith'] == '') {
+						$shareWith = null;
+					} else {
+						$shareWith = $_POST['shareWith'];
+					}
+					OCP\Share::shareItem($_POST['itemType'], $_POST['itemSource'], (int)$_POST['shareType'], $shareWith, $_POST['permissions']);
 					OC_JSON::success();
 				} catch (Exception $exception) {
 					OC_JSON::error(array('data' => array('message' => $exception->getMessage())));
@@ -36,7 +40,12 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
 			break;
 		case 'unshare':
 			if (isset($_POST['shareType']) && isset($_POST['shareWith'])) {
-				$return = OCP\Share::unshare($_POST['itemType'], $_POST['itemSource'], $_POST['shareType'], $_POST['shareWith']);
+				if ((int)$_POST['shareType'] === OCP\Share::SHARE_TYPE_LINK && $_POST['shareWith'] == '') {
+					$shareWith = null;
+				} else {
+					$shareWith = $_POST['shareWith'];
+				}
+				$return = OCP\Share::unshare($_POST['itemType'], $_POST['itemSource'], $_POST['shareType'], $shareWith);
 				($return) ? OC_JSON::success() : OC_JSON::error();
 			}
 			break;
diff --git a/core/css/share.css b/core/css/share.css
index e4b4870dd1..abaeb07dd8 100644
--- a/core/css/share.css
+++ b/core/css/share.css
@@ -15,4 +15,6 @@ a.showCruds { display:inline; opacity:.5; }
 a.showCruds:hover { opacity:1; }
 a.unshare { float:right; display:inline; padding:.3em 0 0 .3em !important; opacity:.5; }
 a.unshare:hover { opacity:1; }
-#privateLink { border-top:1px solid #ddd; padding-top:0.5em; }
\ No newline at end of file
+#link { border-top:1px solid #ddd; padding-top:0.5em; }
+input[type="text"], input[type="password"] { width:90%; }
+#linkText, #linkPass { display:none; }
diff --git a/core/css/styles.css b/core/css/styles.css
index dd6f9d4675..488ac48e4b 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -95,7 +95,7 @@ label.infield { cursor: text !important; }
 
 /* NAVIGATION ------------------------------------------------------------- */
 #navigation { position:fixed; top:3.5em; float:left; width:12.5em; padding:0; z-index:75; height:100%; background:#eee; border-right: 1px #ccc solid; -moz-box-shadow: -3px 0 7px #000; -webkit-box-shadow: -3px 0 7px #000; box-shadow: -3px 0 7px #000; overflow:hidden;}
-#navigation a { display:block; padding:.6em .5em .4em 2.5em; background:#eee 1em center no-repeat; border-bottom:1px solid #ddd; border-top:1px solid #fff; text-decoration:none; font-size:1.2em; color:#666; text-shadow:#f8f8f8 0 1px 0; -webkit-transition:background 300ms; -moz-transition:background 300ms; -o-transition:background 300ms; transition:background 300ms; }
+#navigation a { display:block; padding:.6em .5em .4em 2.5em; background:#eee 1em center no-repeat; border-bottom:1px solid #ddd; border-top:1px solid #fff; text-decoration:none; font-size:1.2em; color:#666; text-shadow:#f8f8f8 0 1px 0; }
 #navigation a.active, #navigation a:hover, #navigation a:focus { background-color:#dbdbdb; border-top:1px solid #d4d4d4; border-bottom:1px solid #ccc; color:#333; }
 #navigation a.active { background-color:#ddd; }
 #navigation #settings { position:absolute; bottom:3.5em; width:100%; }
diff --git a/apps/contacts/js/LICENSE.jquery.inview b/core/js/LICENSE.jquery.inview
similarity index 100%
rename from apps/contacts/js/LICENSE.jquery.inview
rename to core/js/LICENSE.jquery.inview
diff --git a/apps/contacts/js/jquery.inview.js b/core/js/jquery.inview.js
similarity index 100%
rename from apps/contacts/js/jquery.inview.js
rename to core/js/jquery.inview.js
diff --git a/apps/contacts/js/jquery.inview.txt b/core/js/jquery.inview.txt
similarity index 100%
rename from apps/contacts/js/jquery.inview.txt
rename to core/js/jquery.inview.txt
diff --git a/core/js/js.js b/core/js/js.js
index e50b407bac..f1ed6070c3 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -29,6 +29,16 @@ function t(app,text){
 }
 t.cache={};
 
+/**
+* Get the path to download a file
+* @param file The filename
+* @param dir The directory the file is in - e.g. $('#dir').val()
+* @return string
+*/
+function fileDownloadPath(dir, file) {
+	return OC.filePath('files', 'ajax', 'download.php')+encodeURIComponent('?files='+encodeURIComponent(file)+'&dir='+encodeURIComponent(dir));
+}
+
 OC={
 	webroot:oc_webroot,
 	appswebroots:oc_appswebroots,
@@ -110,18 +120,19 @@ OC={
 	 */
 	addScript:function(app,script,ready){
 		var path=OC.filePath(app,'js',script+'.js');
-		if(OC.addScript.loaded.indexOf(path)==-1){
-			OC.addScript.loaded.push(path);
+		if(!OC.addScript.loaded[path]){
 			if(ready){
-				$.getScript(path,ready);
+				var deferred=$.getScript(path,ready);
 			}else{
-				$.getScript(path);
+				var deferred=$.getScript(path);
 			}
+			OC.addScript.loaded[path]=deferred;
 		}else{
 			if(ready){
 				ready();
 			}
 		}
+		return OC.addScript.loaded[path];
 	},
 	/**
 	 * load a css file and load it
diff --git a/core/js/share.js b/core/js/share.js
index 3db69dc690..8bfbdd36e1 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -1,7 +1,7 @@
 OC.Share={
 	SHARE_TYPE_USER:0,
 	SHARE_TYPE_GROUP:1,
-	SHARE_TYPE_PRIVATE_LINK:3,
+	SHARE_TYPE_LINK:3,
 	SHARE_TYPE_EMAIL:4,
 	PERMISSION_CREATE:4,
 	PERMISSION_READ:1,
@@ -118,7 +118,7 @@ OC.Share={
 			}
 		});
 	},
-	showDropDown:function(itemType, itemSource, appendTo, privateLink, possiblePermissions) {
+	showDropDown:function(itemType, itemSource, appendTo, link, possiblePermissions) {
 		var data = OC.Share.loadItem(itemType, itemSource);
 		var html = '<div id="dropdown" class="drop" data-item-type="'+itemType+'" data-item-source="'+itemSource+'">';
 		if (data.reshare) {
@@ -130,14 +130,19 @@ OC.Share={
 			html += '<br />';
 		}
 		if (possiblePermissions & OC.Share.PERMISSION_SHARE) {
-			html += '<input id="shareWith" type="text" placeholder="Share with" style="width:90%;"/>';
+			html += '<input id="shareWith" type="text" placeholder="Share with" />';
 			html += '<ul id="shareWithList">';
 			html += '</ul>';
-			if (privateLink) {
-				html += '<div id="privateLink">';
-				html += '<input type="checkbox" name="privateLinkCheckbox" id="privateLinkCheckbox" value="1" /><label for="privateLinkCheckbox">Share with private link</label>';
+			if (link) {
+				html += '<div id="link">';
+				html += '<input type="checkbox" name="linkCheckbox" id="linkCheckbox" value="1" /><label for="linkCheckbox">Share with link</label>';
+				// TODO Change to lock/unlock icon?
+				html += '<a href="#" id="showPassword" style="display:none;"><img class="svg" alt="Password protect" src="'+OC.imagePath('core', 'actions/triangle-n')+'"/></a>';
 				html += '<br />';
-				html += '<input id="privateLinkText" style="display:none; width:90%;" readonly="readonly" />';
+				html += '<input id="linkText" type="text" readonly="readonly" />';
+				html += '<div id="linkPass">';
+				html += '<input id="linkPassText" type="password" placeholder="Password" />';
+				html += '</div>'
 				html += '</div>';
 			}
 			html += '</div>';
@@ -146,8 +151,8 @@ OC.Share={
 			OC.Share.itemShares = [];
 			if (data.shares) {
 				$.each(data.shares, function(index, share) {
-					if (share.share_type == OC.Share.SHARE_TYPE_PRIVATE_LINK) {
-						OC.Share.showPrivateLink(item, share.share_with);
+					if (share.share_type == OC.Share.SHARE_TYPE_LINK) {
+						OC.Share.showLink(itemSource, share.share_with);
 					} else {
 						OC.Share.addShareWith(share.share_type, share.share_with, share.permissions, possiblePermissions);
 					}
@@ -264,36 +269,28 @@ OC.Share={
 		$(html).appendTo('#shareWithList');
 
 	},
-	showPrivateLink:function(item, token) {
-		$('#privateLinkCheckbox').attr('checked', true);
-		var link = parent.location.protocol+'//'+location.host+OC.linkTo('', 'public.php')+'?service=files&token='+token;
-		if (token.indexOf('&path=') == -1) {
-			link += '&file=' + encodeURIComponent(item).replace(/%2F/g, '/');
+	showLink:function(itemSource, password) {
+		$('#linkCheckbox').attr('checked', true);
+		var filename = $('tr').filterAttr('data-id', String(itemSource)).data('file');
+		if ($('#dir').val() == '/') {
+			var file = $('#dir').val() + filename;
 		} else {
-			// Disable checkbox if inside a shared parent folder
-			$('#privateLinkCheckbox').attr('disabled', 'true');
+			var file = $('#dir').val() + '/' + filename;
+		}
+		file = '/'+OC.currentUser+'/files'+file;
+		var link = parent.location.protocol+'//'+location.host+OC.linkTo('', 'public.php')+'?service=files&file='+file;
+		$('#linkText').val(link);
+		$('#linkText').show('blind');
+		$('#showPassword').show();
+		if (password.length > 0) {
+			$('#linkPass').show('blind');
+			$('#linkPassText').attr('placeholder', 'Password protected');
 		}
-		$('#privateLinkText').val(link);
-		$('#privateLinkText').show('blind', function() {
-			$('#privateLinkText').after('<br id="emailBreak" />');
-			$('#email').show();
-			$('#emailButton').show();
-		});
 	},
-	hidePrivateLink:function() {
-		$('#privateLinkText').hide('blind');
-		$('#emailBreak').remove();
-		$('#email').hide();
-		$('#emailButton').hide();
-	},
-	emailPrivateLink:function() {
-		var link = $('#privateLinkText').val();
-		var file = link.substr(link.lastIndexOf('/') + 1).replace(/%20/g, ' ');
-		$.post(OC.filePath('files_sharing', 'ajax', 'email.php'), { toaddress: $('#email').val(), link: link, file: file } );
-		$('#email').css('font-weight', 'bold');
-		$('#email').animate({ fontWeight: 'normal' }, 2000, function() {
-			$(this).val('');
-		}).val('Email sent');
+	hideLink:function() {
+		$('#linkText').hide('blind');
+		$('#showPassword').hide();
+		$('#linkPass').hide();
 	},
 	dirname:function(path) {
 		return path.replace(/\\/g,'/').replace(/\/[^\/]*$/, '');
@@ -308,21 +305,21 @@ $(document).ready(function() {
 			var itemType = $(this).data('item-type');
 			var itemSource = $(this).data('item');
 			var appendTo = $(this).parent().parent();
-			var privateLink = false;
+			var link = false;
 			var possiblePermissions = $(this).data('possible-permissions');
-			if ($(this).data('private-link') !== undefined && $(this).data('private-link') == true) {
-				privateLink = true;
+			if ($(this).data('link') !== undefined && $(this).data('link') == true) {
+				link = true;
 			}
 			if (OC.Share.droppedDown) {
 				if (itemSource != $('#dropdown').data('item')) {
 					OC.Share.hideDropDown(function () {
-						OC.Share.showDropDown(itemType, itemSource, appendTo, privateLink, possiblePermissions);
+						OC.Share.showDropDown(itemType, itemSource, appendTo, link, possiblePermissions);
 					});
 				} else {
 					OC.Share.hideDropDown();
 				}
 			} else {
-				OC.Share.showDropDown(itemType, itemSource, appendTo, privateLink, possiblePermissions);
+				OC.Share.showDropDown(itemType, itemSource, appendTo, link, possiblePermissions);
 			}
 		}
 	});
@@ -396,36 +393,40 @@ $(document).ready(function() {
 		OC.Share.setPermissions($('#dropdown').data('item-type'), $('#dropdown').data('item-source'), $(li).data('share-type'), $(li).data('share-with'), permissions);
 	});
 
-	$('#privateLinkCheckbox').live('change', function() {
+	$('#linkCheckbox').live('change', function() {
 		var itemType = $('#dropdown').data('item-type');
-		var item = $('#dropdown').data('item');
+		var itemSource = $('#dropdown').data('item-source');
 		if (this.checked) {
-			// Create a private link
-			OC.Share.share(itemType, item, OC.Share.SHARE_TYPE_PRIVATE_LINK, 0, 0, function(token) {
-				OC.Share.showPrivateLink(item, 'foo');
-				// Change icon
-				OC.Share.icons[item] = OC.imagePath('core', 'actions/public');
+			// Create a link
+			OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '', OC.Share.PERMISSION_READ, function() {
+				OC.Share.showLink(itemSource);
+				// TODO Change icon
 			});
 		} else {
 			// Delete private link
-			OC.Share.unshare(item, 'public', function() {
-				OC.Share.hidePrivateLink();
-				// Change icon
-				if (OC.Share.itemUsers || OC.Share.itemGroups) {
-					OC.Share.icons[item] = OC.imagePath('core', 'actions/shared');
-				} else {
-					OC.Share.icons[item] = OC.imagePath('core', 'actions/share');
-				}
+			OC.Share.unshare(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '', function() {
+				OC.Share.hideLink();
 			});
 		}
 	});
 
-	$('#privateLinkText').live('click', function() {
+	$('#linkText').live('click', function() {
 		$(this).focus();
 		$(this).select();
 	});
 
-	$('#emailPrivateLink').live('submit', function() {
-		OC.Share.emailPrivateLink();
+	$('#showPassword').live('click', function() {
+		$('#linkPass').toggle('blind');
+	});
+
+	$('#linkPassText').live('keyup', function(event) {
+		if (event.keyCode == 13) {
+			var itemType = $('#dropdown').data('item-type');
+			var itemSource = $('#dropdown').data('item-source');
+			OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, $(this).val(), OC.Share.PERMISSION_READ, function() {
+				$('#linkPassText').val('');
+				$('#linkPassText').attr('placeholder', 'Password protected');
+			});
+		}
 	});
 });
diff --git a/core/l10n/hi.php b/core/l10n/hi.php
new file mode 100644
index 0000000000..cc9cbdb22f
--- /dev/null
+++ b/core/l10n/hi.php
@@ -0,0 +1,14 @@
+<?php $TRANSLATIONS = array(
+"Username" => "प्रयोक्ता का नाम",
+"Cloud not found" => "क्लौड नहीं मिला ",
+"Create an <strong>admin account</strong>" => "व्यवस्थापक खाता बनाएँ",
+"Password" => "पासवर्ड",
+"Advanced" => "उन्नत",
+"Configure the database" => "डेटाबेस कॉन्फ़िगर करें ",
+"Database user" => "डेटाबेस उपयोगकर्ता",
+"Database password" => "डेटाबेस पासवर्ड",
+"Finish setup" => "सेटअप समाप्त करे",
+"You are logged out." => "आप लोग आउट  कर दिए गए हैं.",
+"prev" => "पिछला",
+"next" => "अगला"
+);
diff --git a/core/l10n/id.php b/core/l10n/id.php
index 296e2d62a4..47758f8861 100644
--- a/core/l10n/id.php
+++ b/core/l10n/id.php
@@ -3,6 +3,23 @@
 "No category to add?" => "Tidak ada kategori yang akan ditambahkan?",
 "This category already exists: " => "Kategori ini sudah ada:",
 "Settings" => "Setelan",
+"January" => "Januari",
+"February" => "Februari",
+"March" => "Maret",
+"April" => "April",
+"May" => "Mei",
+"June" => "Juni",
+"July" => "Juli",
+"August" => "Agustus",
+"September" => "September",
+"October" => "Oktober",
+"November" => "Nopember",
+"December" => "Desember",
+"Cancel" => "Batalkan",
+"No" => "Tidak",
+"Yes" => "Ya",
+"Ok" => "Oke",
+"No categories selected for deletion." => "Tidak ada kategori terpilih untuk penghapusan.",
 "ownCloud password reset" => "reset password ownCloud",
 "Use the following link to reset your password: {link}" => "Gunakan tautan berikut untuk mereset password anda: {link}",
 "You will receive a link to reset your password via Email." => "Anda akan mendapatkan link untuk mereset password anda lewat Email.",
diff --git a/core/l10n/it.php b/core/l10n/it.php
index 1c0bf94ca7..ca80770a3c 100644
--- a/core/l10n/it.php
+++ b/core/l10n/it.php
@@ -39,7 +39,7 @@
 "Admin" => "Admin",
 "Help" => "Aiuto",
 "Access forbidden" => "Accesso negato",
-"Cloud not found" => "Cloud non trovata",
+"Cloud not found" => "Nuvola non trovata",
 "Edit categories" => "Modifica le categorie",
 "Add" => "Aggiungi",
 "Create an <strong>admin account</strong>" => "Crea un <strong>account amministratore</strong>",
@@ -47,7 +47,7 @@
 "Advanced" => "Avanzate",
 "Data folder" => "Cartella dati",
 "Configure the database" => "Configura il database",
-"will be used" => "sarà usato",
+"will be used" => "sarà utilizzato",
 "Database user" => "Utente del database",
 "Database password" => "Password del database",
 "Database name" => "Nome del database",
diff --git a/core/l10n/nb_NO.php b/core/l10n/nb_NO.php
index a8bfebb8a5..d30823b59f 100644
--- a/core/l10n/nb_NO.php
+++ b/core/l10n/nb_NO.php
@@ -2,6 +2,7 @@
 "Application name not provided." => "Applikasjonsnavn ikke angitt.",
 "No category to add?" => "Ingen kategorier å legge til?",
 "This category already exists: " => "Denne kategorien finnes allerede:",
+"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
 "Settings" => "Innstillinger",
 "January" => "Januar",
 "February" => "Februar",
diff --git a/core/templates/layout.base.php b/core/templates/layout.base.php
new file mode 100644
index 0000000000..bfd23a9ce9
--- /dev/null
+++ b/core/templates/layout.base.php
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<title>ownCloud</title>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+		<link rel="shortcut icon" href="<?php echo image_path('', 'favicon.png'); ?>" /><link rel="apple-touch-icon-precomposed" href="<?php echo image_path('', 'favicon-touch.png'); ?>" />
+		<?php if (!empty(OC_Util::$core_styles)): ?>
+			<link rel="stylesheet" href="<?php echo OC_Helper::linkToRemote('core.css', false) ?>" type="text/css" media="screen" />
+		<?php endif ?>
+		<?php foreach ($_['cssfiles'] as $cssfile): ?>
+			<link rel="stylesheet" href="<?php echo $cssfile; ?>" type="text/css" media="screen" />
+		<?php endforeach; ?>
+		<script type="text/javascript">
+			var oc_webroot = '<?php echo OC::$WEBROOT; ?>';
+			var oc_appswebroots = <?php echo $_['apps_paths'] ?>;
+		</script>
+		<?php if (!empty(OC_Util::$core_scripts)): ?>
+			<script type="text/javascript" src="<?php echo OC_Helper::linkToRemote('core.js', false) ?>"></script>
+		<?php endif ?>
+		<?php foreach ($_['jsfiles'] as $jsfile): ?>
+			<script type="text/javascript" src="<?php echo $jsfile; ?>"></script>
+		<?php endforeach; ?>
+		<?php foreach ($_['headers'] as $header): ?>
+			<?php
+				echo '<'.$header['tag'].' ';
+				foreach ($header['attributes'] as $name => $value) {
+					echo "$name='$value' ";
+				};
+				echo '/>';
+			?>
+		<?php endforeach; ?>
+	</head>
+
+	<body>
+		<?php echo $_['content']; ?>
+	</body>
+</html>
diff --git a/db_structure.xml b/db_structure.xml
index 7e4c0bd203..e42dc894e8 100644
--- a/db_structure.xml
+++ b/db_structure.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <database>
 
  <name>*dbname*</name>
@@ -33,6 +33,7 @@
     <name>configvalue</name>
     <type>text</type>
     <notnull>true</notnull>
+    <length>255</length>
    </field>
 
 
@@ -369,63 +370,6 @@
 
  </table>
 
- <table>
-
-  <name>*dbprefix*log</name>
-
-  <declaration>
-
-   <field>
-    <name>id</name>
-    <type>integer</type>
-    <default>0</default>
-    <notnull>true</notnull>
-    <autoincrement>1</autoincrement>
-    <unsigned>true</unsigned>
-    <length>4</length>
-   </field>
-
-   <field>
-    <name>moment</name>
-    <type>timestamp</type>
-    <default>CURRENT_TIMESTAMP</default>
-    <notnull>true</notnull>
-   </field>
-
-   <field>
-    <name>appid</name>
-    <type>text</type>
-    <default></default>
-    <notnull>true</notnull>
-    <length>255</length>
-   </field>
-
-   <field>
-    <name>user</name>
-    <type>text</type>
-    <default></default>
-    <notnull>true</notnull>
-    <length>255</length>
-   </field>
-
-   <field>
-    <name>action</name>
-    <type>text</type>
-    <default></default>
-    <notnull>true</notnull>
-    <length>255</length>
-   </field>
-
-   <field>
-    <name>info</name>
-    <type>text</type>
-    <notnull>true</notnull>
-   </field>
-
-  </declaration>
-
- </table>
-
  <table>
 
   <name>*dbprefix*preferences</name>
@@ -460,6 +404,7 @@
     <name>configvalue</name>
     <type>text</type>
     <notnull>true</notnull>
+    <length>255</length>
    </field>
 
   </declaration>
@@ -500,6 +445,7 @@
     <name>propertyvalue</name>
     <type>text</type>
     <notnull>true</notnull>
+    <length>255</length>
    </field>
 
   </declaration>
@@ -533,7 +479,7 @@
     <name>share_with</name>
     <type>text</type>
     <default></default>
-    <notnull>true</notnull>
+    <notnull>false</notnull>
     <length>255</length>
    </field>
    
@@ -665,6 +611,7 @@
     <name>parameters</name>
     <type>text</type>
     <notnull>true</notnull>
+    <length>255</length>
    </field>
 
 
diff --git a/l10n/.tx/config b/l10n/.tx/config
index db4df85793..cd29b6ae77 100644
--- a/l10n/.tx/config
+++ b/l10n/.tx/config
@@ -6,60 +6,22 @@ file_filter = <lang>/core.po
 source_file = templates/core.pot
 source_lang = en
 
-[owncloud.calendar]
-file_filter = <lang>/calendar.po
-source_file = templates/calendar.pot
-source_lang = en
-
-[owncloud.contacts]
-file_filter = <lang>/contacts.po
-source_file = templates/contacts.pot
-source_lang = en
-
 [owncloud.files]
 file_filter = <lang>/files.po
 source_file = templates/files.pot
 source_lang = en
 
-[owncloud.media]
-file_filter = <lang>/media.po
-source_file = templates/media.pot
-source_lang = en
-
 [owncloud.settings]
 file_filter = <lang>/settings.po
 source_file = templates/settings.pot
 source_lang = en
 
-[owncloud.gallery]
-file_filter = <lang>/gallery.po
-source_file = templates/gallery.pot
-source_lang = en
-
-[owncloud.bookmarks]
-file_filter = <lang>/bookmarks.po
-source_file = templates/bookmarks.pot
-source_lang = en
-type = PO
-
 [owncloud.lib]
 file_filter = <lang>/lib.po
 source_file = templates/lib.pot
 source_lang = en
 type = PO
 
-[owncloud.admin_dependencies_chk]
-file_filter = <lang>/admin_dependencies_chk.po
-source_file = templates/admin_dependencies_chk.pot
-source_lang = en
-type = PO
-
-[owncloud.admin_migrate]
-file_filter = <lang>/admin_migrate.po
-source_file = templates/admin_migrate.pot
-source_lang = en
-type = PO
-
 [owncloud.files_encryption]
 file_filter = <lang>/files_encryption.po
 source_file = templates/files_encryption.pot
@@ -84,27 +46,9 @@ source_file = templates/files_versions.pot
 source_lang = en
 type = PO
 
-[owncloud.tasks]
-file_filter = <lang>/tasks.po
-source_file = templates/tasks.pot
-source_lang = en
-type = PO
-
 [owncloud.user_ldap]
 file_filter = <lang>/user_ldap.po
 source_file = templates/user_ldap.pot
 source_lang = en
 type = PO
 
-[owncloud.user_migrate]
-file_filter = <lang>/user_migrate.po
-source_file = templates/user_migrate.pot
-source_lang = en
-type = PO
-
-[owncloud.user_openid]
-file_filter = <lang>/user_openid.po
-source_file = templates/user_openid.pot
-source_lang = en
-type = PO
-
diff --git a/l10n/af/core.po b/l10n/af/core.po
index 88fb86a58a..1a1940f9e9 100644
--- a/l10n/af/core.po
+++ b/l10n/af/core.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Afrikaans (http://www.transifex.com/projects/p/owncloud/language/af/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -33,55 +33,55 @@ msgstr ""
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "January"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "February"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "March"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "April"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "May"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "June"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "July"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "August"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "September"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "October"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "November"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "December"
 msgstr ""
 
@@ -129,7 +129,7 @@ msgstr ""
 msgid "Login failed!"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr ""
@@ -190,48 +190,52 @@ msgstr ""
 msgid "Add"
 msgstr ""
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr ""
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr ""
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr ""
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr ""
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr ""
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr ""
 
diff --git a/l10n/af/files_odfviewer.po b/l10n/af/files_odfviewer.po
new file mode 100644
index 0000000000..ec66648874
--- /dev/null
+++ b/l10n/af/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Afrikaans (http://www.transifex.com/projects/p/owncloud/language/af/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: af\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/af/files_pdfviewer.po b/l10n/af/files_pdfviewer.po
new file mode 100644
index 0000000000..142a114dc5
--- /dev/null
+++ b/l10n/af/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Afrikaans (http://www.transifex.com/projects/p/owncloud/language/af/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: af\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/af/files_sharing.po b/l10n/af/files_sharing.po
index 7ca711a252..b45ee8f65a 100644
--- a/l10n/af/files_sharing.po
+++ b/l10n/af/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Afrikaans (http://www.transifex.com/projects/p/owncloud/language/af/)\n"
 "MIME-Version: 1.0\n"
@@ -17,18 +17,10 @@ msgstr ""
 "Language: af\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: templates/get.php:4
-msgid "Size"
+#: templates/authenticate.php:4
+msgid "Password"
 msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete"
+#: templates/authenticate.php:6
+msgid "Submit"
 msgstr ""
diff --git a/l10n/af/files_texteditor.po b/l10n/af/files_texteditor.po
new file mode 100644
index 0000000000..167f825358
--- /dev/null
+++ b/l10n/af/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Afrikaans (http://www.transifex.com/projects/p/owncloud/language/af/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: af\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/af/impress.po b/l10n/af/impress.po
new file mode 100644
index 0000000000..ad04eff39f
--- /dev/null
+++ b/l10n/af/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Afrikaans (http://www.transifex.com/projects/p/owncloud/language/af/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: af\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/af/settings.po b/l10n/af/settings.po
index 1d213427bc..da858b04af 100644
--- a/l10n/af/settings.po
+++ b/l10n/af/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-18 02:01+0200\n"
-"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Afrikaans (http://www.transifex.com/projects/p/owncloud/language/af/)\n"
 "MIME-Version: 1.0\n"
@@ -86,10 +86,46 @@ msgid "use systems cron service"
 msgstr ""
 
 #: templates/admin.php:39
-msgid "Log"
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
 msgstr ""
 
 #: templates/admin.php:67
+msgid "Log"
+msgstr ""
+
+#: templates/admin.php:95
 msgid "More"
 msgstr ""
 
diff --git a/l10n/af/user_ldap.po b/l10n/af/user_ldap.po
index 7abe79a5a8..37f2c1ae38 100644
--- a/l10n/af/user_ldap.po
+++ b/l10n/af/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Afrikaans (http://www.transifex.com/projects/p/owncloud/language/af/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -159,6 +159,12 @@ msgstr ""
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr ""
diff --git a/l10n/ar/core.po b/l10n/ar/core.po
index a4cc8c065a..4c37f9bfd9 100644
--- a/l10n/ar/core.po
+++ b/l10n/ar/core.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -34,55 +34,55 @@ msgstr ""
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "تعديلات"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "January"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "February"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "March"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "April"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "May"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "June"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "July"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "August"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "September"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "October"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "November"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "December"
 msgstr ""
 
@@ -130,7 +130,7 @@ msgstr "تم طلب"
 msgid "Login failed!"
 msgstr "محاولة دخول فاشلة!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "إسم المستخدم"
@@ -191,48 +191,52 @@ msgstr ""
 msgid "Add"
 msgstr ""
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr "أضف </strong>مستخدم رئيسي <strong>"
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "كلمة السر"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr "خيارات متقدمة"
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "مجلد المعلومات"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "أسس قاعدة البيانات"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "سيتم استخدمه"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "مستخدم قاعدة البيانات"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "كلمة سر مستخدم قاعدة البيانات"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "إسم قاعدة البيانات"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "خادم قاعدة البيانات"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "انهاء التعديلات"
 
diff --git a/l10n/ar/files_odfviewer.po b/l10n/ar/files_odfviewer.po
new file mode 100644
index 0000000000..75c766b017
--- /dev/null
+++ b/l10n/ar/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ar\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
+
+#: js/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/ar/files_pdfviewer.po b/l10n/ar/files_pdfviewer.po
new file mode 100644
index 0000000000..91492d720c
--- /dev/null
+++ b/l10n/ar/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ar\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
+
+#: js/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/ar/files_sharing.po b/l10n/ar/files_sharing.po
index f3922ed92a..c4b91a2774 100644
--- a/l10n/ar/files_sharing.po
+++ b/l10n/ar/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -17,18 +17,10 @@ msgstr ""
 "Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
 
-#: templates/get.php:4
-msgid "Size"
+#: templates/authenticate.php:4
+msgid "Password"
 msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete"
+#: templates/authenticate.php:6
+msgid "Submit"
 msgstr ""
diff --git a/l10n/ar/files_texteditor.po b/l10n/ar/files_texteditor.po
new file mode 100644
index 0000000000..ed1f96fd6c
--- /dev/null
+++ b/l10n/ar/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ar\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
+
+#: js/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/ar/impress.po b/l10n/ar/impress.po
new file mode 100644
index 0000000000..5bbc9f2fbc
--- /dev/null
+++ b/l10n/ar/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ar\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
+
+#: templates/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/ar/settings.po b/l10n/ar/settings.po
index 0f13d4ebb2..8c02341755 100644
--- a/l10n/ar/settings.po
+++ b/l10n/ar/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-18 02:01+0200\n"
-"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -88,10 +88,46 @@ msgid "use systems cron service"
 msgstr ""
 
 #: templates/admin.php:39
-msgid "Log"
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
 msgstr ""
 
 #: templates/admin.php:67
+msgid "Log"
+msgstr ""
+
+#: templates/admin.php:95
 msgid "More"
 msgstr ""
 
diff --git a/l10n/ar/user_ldap.po b/l10n/ar/user_ldap.po
index fc34568956..51ea5c8216 100644
--- a/l10n/ar/user_ldap.po
+++ b/l10n/ar/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -159,6 +159,12 @@ msgstr ""
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr ""
diff --git a/l10n/ar_SA/core.po b/l10n/ar_SA/core.po
index 7f31f831b3..af7cb8d90c 100644
--- a/l10n/ar_SA/core.po
+++ b/l10n/ar_SA/core.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Arabic (Saudi Arabia) (http://www.transifex.com/projects/p/owncloud/language/ar_SA/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -33,55 +33,55 @@ msgstr ""
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "January"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "February"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "March"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "April"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "May"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "June"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "July"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "August"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "September"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "October"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "November"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "December"
 msgstr ""
 
@@ -129,7 +129,7 @@ msgstr ""
 msgid "Login failed!"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr ""
@@ -190,48 +190,52 @@ msgstr ""
 msgid "Add"
 msgstr ""
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr ""
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr ""
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr ""
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr ""
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr ""
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr ""
 
diff --git a/l10n/ar_SA/files_odfviewer.po b/l10n/ar_SA/files_odfviewer.po
new file mode 100644
index 0000000000..abff78f829
--- /dev/null
+++ b/l10n/ar_SA/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Arabic (Saudi Arabia) (http://www.transifex.com/projects/p/owncloud/language/ar_SA/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ar_SA\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/ar_SA/files_pdfviewer.po b/l10n/ar_SA/files_pdfviewer.po
new file mode 100644
index 0000000000..8a2c2b3fff
--- /dev/null
+++ b/l10n/ar_SA/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Arabic (Saudi Arabia) (http://www.transifex.com/projects/p/owncloud/language/ar_SA/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ar_SA\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/ar_SA/files_sharing.po b/l10n/ar_SA/files_sharing.po
index c240873407..b459097ebc 100644
--- a/l10n/ar_SA/files_sharing.po
+++ b/l10n/ar_SA/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Arabic (Saudi Arabia) (http://www.transifex.com/projects/p/owncloud/language/ar_SA/)\n"
 "MIME-Version: 1.0\n"
@@ -17,18 +17,10 @@ msgstr ""
 "Language: ar_SA\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: templates/get.php:4
-msgid "Size"
+#: templates/authenticate.php:4
+msgid "Password"
 msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete"
+#: templates/authenticate.php:6
+msgid "Submit"
 msgstr ""
diff --git a/l10n/ar_SA/files_texteditor.po b/l10n/ar_SA/files_texteditor.po
new file mode 100644
index 0000000000..384e4edc4d
--- /dev/null
+++ b/l10n/ar_SA/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Arabic (Saudi Arabia) (http://www.transifex.com/projects/p/owncloud/language/ar_SA/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ar_SA\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/ar_SA/impress.po b/l10n/ar_SA/impress.po
new file mode 100644
index 0000000000..5c3c10d5df
--- /dev/null
+++ b/l10n/ar_SA/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Arabic (Saudi Arabia) (http://www.transifex.com/projects/p/owncloud/language/ar_SA/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ar_SA\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/ar_SA/settings.po b/l10n/ar_SA/settings.po
index 803e9d5953..065806d42b 100644
--- a/l10n/ar_SA/settings.po
+++ b/l10n/ar_SA/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-18 02:01+0200\n"
-"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Arabic (Saudi Arabia) (http://www.transifex.com/projects/p/owncloud/language/ar_SA/)\n"
 "MIME-Version: 1.0\n"
@@ -86,10 +86,46 @@ msgid "use systems cron service"
 msgstr ""
 
 #: templates/admin.php:39
-msgid "Log"
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
 msgstr ""
 
 #: templates/admin.php:67
+msgid "Log"
+msgstr ""
+
+#: templates/admin.php:95
 msgid "More"
 msgstr ""
 
diff --git a/l10n/ar_SA/user_ldap.po b/l10n/ar_SA/user_ldap.po
index 92a90a4f3b..2345855a17 100644
--- a/l10n/ar_SA/user_ldap.po
+++ b/l10n/ar_SA/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Arabic (Saudi Arabia) (http://www.transifex.com/projects/p/owncloud/language/ar_SA/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -159,6 +159,12 @@ msgstr ""
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr ""
diff --git a/l10n/bg_BG/core.po b/l10n/bg_BG/core.po
index 5cb2d7ef8a..a4caad873f 100644
--- a/l10n/bg_BG/core.po
+++ b/l10n/bg_BG/core.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -37,55 +37,55 @@ msgstr "Категорията вече съществува:"
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "Настройки"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "January"
 msgstr "Януари"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "February"
 msgstr "Февруари"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "March"
 msgstr "Март"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "April"
 msgstr "Април"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "May"
 msgstr "Май"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "June"
 msgstr "Юни"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "July"
 msgstr "Юли"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "August"
 msgstr "Август"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "September"
 msgstr "Септември"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "October"
 msgstr "Октомври"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "November"
 msgstr "Ноември"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "December"
 msgstr "Декември"
 
@@ -133,7 +133,7 @@ msgstr "Заявено"
 msgid "Login failed!"
 msgstr "Входа пропадна!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "Потребител"
@@ -194,48 +194,52 @@ msgstr "Редактиране на категориите"
 msgid "Add"
 msgstr "Добавяне"
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr "Създаване на <strong>админ профил</strong>"
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "Парола"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr "Разширено"
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "Директория за данни"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "Конфигуриране на базата"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "ще се ползва"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "Потребител за базата"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "Парола за базата"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "Име на базата"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "Хост за базата"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "Завършване на настройките"
 
diff --git a/l10n/bg_BG/files_odfviewer.po b/l10n/bg_BG/files_odfviewer.po
new file mode 100644
index 0000000000..255b592f49
--- /dev/null
+++ b/l10n/bg_BG/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: bg_BG\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/bg_BG/files_pdfviewer.po b/l10n/bg_BG/files_pdfviewer.po
new file mode 100644
index 0000000000..e38e0c3fcb
--- /dev/null
+++ b/l10n/bg_BG/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: bg_BG\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/bg_BG/files_sharing.po b/l10n/bg_BG/files_sharing.po
index f03989ba48..d1afae484c 100644
--- a/l10n/bg_BG/files_sharing.po
+++ b/l10n/bg_BG/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -17,18 +17,10 @@ msgstr ""
 "Language: bg_BG\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: templates/get.php:4
-msgid "Size"
+#: templates/authenticate.php:4
+msgid "Password"
 msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete"
+#: templates/authenticate.php:6
+msgid "Submit"
 msgstr ""
diff --git a/l10n/bg_BG/files_texteditor.po b/l10n/bg_BG/files_texteditor.po
new file mode 100644
index 0000000000..17803a5774
--- /dev/null
+++ b/l10n/bg_BG/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: bg_BG\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/bg_BG/impress.po b/l10n/bg_BG/impress.po
new file mode 100644
index 0000000000..35269e2e70
--- /dev/null
+++ b/l10n/bg_BG/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: bg_BG\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/bg_BG/settings.po b/l10n/bg_BG/settings.po
index e7697bb27e..c1d39344f7 100644
--- a/l10n/bg_BG/settings.po
+++ b/l10n/bg_BG/settings.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-18 02:01+0200\n"
-"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -89,10 +89,46 @@ msgid "use systems cron service"
 msgstr ""
 
 #: templates/admin.php:39
-msgid "Log"
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
 msgstr ""
 
 #: templates/admin.php:67
+msgid "Log"
+msgstr ""
+
+#: templates/admin.php:95
 msgid "More"
 msgstr ""
 
diff --git a/l10n/bg_BG/user_ldap.po b/l10n/bg_BG/user_ldap.po
index 8b8f5723ce..23f9ad3829 100644
--- a/l10n/bg_BG/user_ldap.po
+++ b/l10n/bg_BG/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -159,6 +159,12 @@ msgstr ""
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr ""
diff --git a/l10n/ca/core.po b/l10n/ca/core.po
index 4d26bb008c..ce3b9f19f2 100644
--- a/l10n/ca/core.po
+++ b/l10n/ca/core.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -35,55 +35,55 @@ msgstr "Aquesta categoria ja existeix:"
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 
-#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "Arranjament"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "January"
 msgstr "Gener"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "February"
 msgstr "Febrer"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "March"
 msgstr "Març"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "April"
 msgstr "Abril"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "May"
 msgstr "Maig"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "June"
 msgstr "Juny"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "July"
 msgstr "Juliol"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "August"
 msgstr "Agost"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "September"
 msgstr "Setembre"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "October"
 msgstr "Octubre"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "November"
 msgstr "Novembre"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "December"
 msgstr "Desembre"
 
@@ -131,7 +131,7 @@ msgstr "Sol·licitat"
 msgid "Login failed!"
 msgstr "No s'ha pogut iniciar la sessió"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "Nom d'usuari"
@@ -192,48 +192,52 @@ msgstr "Edita les categories"
 msgid "Add"
 msgstr "Afegeix"
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr "Crea un <strong>compte d'administrador</strong>"
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "Contrasenya"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr "Avançat"
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "Carpeta de dades"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "Configura la base de dades"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "s'usarà"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "Usuari de la base de dades"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "Contrasenya de la base de dades"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "Nom de la base de dades"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "Ordinador central de la base de dades"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "Acaba la configuració"
 
diff --git a/l10n/ca/files_odfviewer.po b/l10n/ca/files_odfviewer.po
new file mode 100644
index 0000000000..e41b59b03c
--- /dev/null
+++ b/l10n/ca/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ca\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/ca/files_pdfviewer.po b/l10n/ca/files_pdfviewer.po
new file mode 100644
index 0000000000..9645c269dd
--- /dev/null
+++ b/l10n/ca/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ca\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/ca/files_sharing.po b/l10n/ca/files_sharing.po
index bc5fa18cf2..9edec9f6b5 100644
--- a/l10n/ca/files_sharing.po
+++ b/l10n/ca/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -18,18 +18,10 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: templates/get.php:4
-msgid "Size"
-msgstr "Mida"
+#: templates/authenticate.php:4
+msgid "Password"
+msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr "Modificat"
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr "Esborra-ho tot"
-
-#: templates/get.php:5
-msgid "Delete"
-msgstr "Elimina"
+#: templates/authenticate.php:6
+msgid "Submit"
+msgstr ""
diff --git a/l10n/ca/files_texteditor.po b/l10n/ca/files_texteditor.po
new file mode 100644
index 0000000000..9e62b3f7a2
--- /dev/null
+++ b/l10n/ca/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ca\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/ca/impress.po b/l10n/ca/impress.po
new file mode 100644
index 0000000000..198ff99c6d
--- /dev/null
+++ b/l10n/ca/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ca\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/ca/settings.po b/l10n/ca/settings.po
index dfacbada2c..3b453b4c42 100644
--- a/l10n/ca/settings.po
+++ b/l10n/ca/settings.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-20 07:27+0000\n"
-"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -88,10 +88,46 @@ msgid "use systems cron service"
 msgstr "usa el servei cron del sistema"
 
 #: templates/admin.php:39
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:67
 msgid "Log"
 msgstr "Registre"
 
-#: templates/admin.php:67
+#: templates/admin.php:95
 msgid "More"
 msgstr "Més"
 
diff --git a/l10n/ca/user_ldap.po b/l10n/ca/user_ldap.po
index 9261cd06e5..82824c9ad3 100644
--- a/l10n/ca/user_ldap.po
+++ b/l10n/ca/user_ldap.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-13 18:54+0000\n"
-"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -160,6 +160,12 @@ msgstr "en bytes"
 msgid "in seconds. A change empties the cache."
 msgstr "en segons. Un canvi buidarà la memòria de cau."
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr "Ajuda"
diff --git a/l10n/cs_CZ/core.po b/l10n/cs_CZ/core.po
index ebca07a442..6b09c23711 100644
--- a/l10n/cs_CZ/core.po
+++ b/l10n/cs_CZ/core.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -36,55 +36,55 @@ msgstr "Tato kategorie již existuje:"
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 
-#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "Nastavení"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "January"
 msgstr "Leden"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "February"
 msgstr "Únor"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "March"
 msgstr "Březen"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "April"
 msgstr "Duben"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "May"
 msgstr "Květen"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "June"
 msgstr "Červen"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "July"
 msgstr "Červenec"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "August"
 msgstr "Srpen"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "September"
 msgstr "Září"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "October"
 msgstr "Říjen"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "November"
 msgstr "Listopad"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "December"
 msgstr "Prosinec"
 
@@ -132,7 +132,7 @@ msgstr "Požadováno"
 msgid "Login failed!"
 msgstr "Přihlášení selhalo"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "Uživatelské jméno"
@@ -193,48 +193,52 @@ msgstr "Upravit kategorie"
 msgid "Add"
 msgstr "Přidat"
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr "Vytvořit <strong>účet správce</strong>"
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "Heslo"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr "Rozšířené volby"
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "Datový adresář"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "Konfigurace databáze"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "bude použito"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "Uživatel databáze"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "Heslo k databázi"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "Název databáze"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "Hostitel databáze"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "Dokončit instalaci"
 
diff --git a/l10n/cs_CZ/files_external.po b/l10n/cs_CZ/files_external.po
index 1c175fb4db..8c21e14483 100644
--- a/l10n/cs_CZ/files_external.po
+++ b/l10n/cs_CZ/files_external.po
@@ -4,14 +4,15 @@
 # 
 # Translators:
 # Jan Krejci <krejca85@gmail.com>, 2012.
+# Martin  <fireball@atlas.cz>, 2012.
 # Michal Hrušecký <Michal@hrusecky.net>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-24 02:02+0200\n"
-"PO-Revision-Date: 2012-08-23 23:53+0000\n"
-"Last-Translator: Jan Krejci <krejca85@gmail.com>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-28 19:11+0000\n"
+"Last-Translator: Martin <fireball@atlas.cz>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -29,7 +30,7 @@ msgstr "Přípojný bod"
 
 #: templates/settings.php:8
 msgid "Backend"
-msgstr ""
+msgstr "Končící"
 
 #: templates/settings.php:9
 msgid "Configuration"
@@ -41,7 +42,7 @@ msgstr "Nastavení"
 
 #: templates/settings.php:11
 msgid "Applicable"
-msgstr ""
+msgstr "Platný"
 
 #: templates/settings.php:23
 msgid "Add mount point"
@@ -49,7 +50,7 @@ msgstr "Přidat přípojný bod"
 
 #: templates/settings.php:54 templates/settings.php:62
 msgid "None set"
-msgstr ""
+msgstr "Nenastaveno"
 
 #: templates/settings.php:63
 msgid "All Users"
@@ -69,11 +70,11 @@ msgstr "Smazat"
 
 #: templates/settings.php:88
 msgid "SSL root certificates"
-msgstr ""
+msgstr "Kořenové SSL certifikáty"
 
 #: templates/settings.php:102
 msgid "Import Root Certificate"
-msgstr ""
+msgstr "Import kořenového certifikátu"
 
 #: templates/settings.php:108
 msgid "Enable User External Storage"
diff --git a/l10n/cs_CZ/files_odfviewer.po b/l10n/cs_CZ/files_odfviewer.po
new file mode 100644
index 0000000000..68d6062835
--- /dev/null
+++ b/l10n/cs_CZ/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs_CZ\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+
+#: js/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/cs_CZ/files_pdfviewer.po b/l10n/cs_CZ/files_pdfviewer.po
new file mode 100644
index 0000000000..87f8e0f3ff
--- /dev/null
+++ b/l10n/cs_CZ/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs_CZ\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+
+#: js/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/cs_CZ/files_sharing.po b/l10n/cs_CZ/files_sharing.po
index 232114a8e6..0d2d55dcc9 100644
--- a/l10n/cs_CZ/files_sharing.po
+++ b/l10n/cs_CZ/files_sharing.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-24 02:02+0200\n"
-"PO-Revision-Date: 2012-08-23 19:58+0000\n"
-"Last-Translator: Michal Hrušecký <Michal@hrusecky.net>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,18 +19,10 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
 
-#: templates/get.php:4
-msgid "Size"
-msgstr "Velikost"
+#: templates/authenticate.php:4
+msgid "Password"
+msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr "Upraveno"
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr "Smazat vše"
-
-#: templates/get.php:5
-msgid "Delete"
-msgstr "Smazat"
+#: templates/authenticate.php:6
+msgid "Submit"
+msgstr ""
diff --git a/l10n/cs_CZ/files_texteditor.po b/l10n/cs_CZ/files_texteditor.po
new file mode 100644
index 0000000000..6c9ac9a372
--- /dev/null
+++ b/l10n/cs_CZ/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs_CZ\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+
+#: js/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/cs_CZ/impress.po b/l10n/cs_CZ/impress.po
new file mode 100644
index 0000000000..0b19a018bc
--- /dev/null
+++ b/l10n/cs_CZ/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs_CZ\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+
+#: templates/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/cs_CZ/settings.po b/l10n/cs_CZ/settings.po
index 64ed6cf955..56df4dcffe 100644
--- a/l10n/cs_CZ/settings.po
+++ b/l10n/cs_CZ/settings.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-18 02:01+0200\n"
-"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -91,10 +91,46 @@ msgid "use systems cron service"
 msgstr "použijte systémovou službu cron"
 
 #: templates/admin.php:39
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:67
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:67
+#: templates/admin.php:95
 msgid "More"
 msgstr "Více"
 
diff --git a/l10n/cs_CZ/user_ldap.po b/l10n/cs_CZ/user_ldap.po
index 25f623c83b..9f1f90c4d4 100644
--- a/l10n/cs_CZ/user_ldap.po
+++ b/l10n/cs_CZ/user_ldap.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-18 02:01+0200\n"
-"PO-Revision-Date: 2012-08-17 16:01+0000\n"
-"Last-Translator: Martin <fireball@atlas.cz>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -160,6 +160,12 @@ msgstr "v bytech"
 msgid "in seconds. A change empties the cache."
 msgstr "ve vteřinách. Změna vyprázdní dočasnou paměť."
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr "Nápověda"
diff --git a/l10n/da/core.po b/l10n/da/core.po
index c2a6184506..782c53cf39 100644
--- a/l10n/da/core.po
+++ b/l10n/da/core.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -38,55 +38,55 @@ msgstr "Denne kategori eksisterer allerede: "
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 
-#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "Indstillinger"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "January"
 msgstr "Januar"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "February"
 msgstr "Februar"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "March"
 msgstr "Marts"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "April"
 msgstr "April"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "May"
 msgstr "Maj"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "June"
 msgstr "Juni"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "July"
 msgstr "Juli"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "August"
 msgstr "August"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "September"
 msgstr "September"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "October"
 msgstr "Oktober"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "November"
 msgstr "November"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "December"
 msgstr "December"
 
@@ -134,7 +134,7 @@ msgstr "Forespugt"
 msgid "Login failed!"
 msgstr "Login fejlede!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "Brugernavn"
@@ -195,48 +195,52 @@ msgstr "Rediger kategorier"
 msgid "Add"
 msgstr "Tilføj"
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr "Opret en <strong>administratorkonto</strong>"
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "Kodeord"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr "Avanceret"
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "Datamappe"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "Konfigurer databasen"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "vil blive brugt"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "Databasebruger"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "Databasekodeord"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "Navn på database"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "Databasehost"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "Afslut opsætning"
 
diff --git a/l10n/da/files_odfviewer.po b/l10n/da/files_odfviewer.po
new file mode 100644
index 0000000000..755f4010e9
--- /dev/null
+++ b/l10n/da/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: da\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/da/files_pdfviewer.po b/l10n/da/files_pdfviewer.po
new file mode 100644
index 0000000000..781bfdac2e
--- /dev/null
+++ b/l10n/da/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: da\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/da/files_sharing.po b/l10n/da/files_sharing.po
index 7ed986fd02..7af7f3cce6 100644
--- a/l10n/da/files_sharing.po
+++ b/l10n/da/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
@@ -17,18 +17,10 @@ msgstr ""
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: templates/get.php:4
-msgid "Size"
+#: templates/authenticate.php:4
+msgid "Password"
 msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete"
+#: templates/authenticate.php:6
+msgid "Submit"
 msgstr ""
diff --git a/l10n/da/files_texteditor.po b/l10n/da/files_texteditor.po
new file mode 100644
index 0000000000..cb994d6b92
--- /dev/null
+++ b/l10n/da/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: da\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/da/impress.po b/l10n/da/impress.po
new file mode 100644
index 0000000000..80c9eb2ed8
--- /dev/null
+++ b/l10n/da/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: da\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/da/settings.po b/l10n/da/settings.po
index 5254803303..132eb0965d 100644
--- a/l10n/da/settings.po
+++ b/l10n/da/settings.po
@@ -14,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-20 14:35+0000\n"
-"Last-Translator: ressel <sr@ybnet.dk>\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -93,10 +93,46 @@ msgid "use systems cron service"
 msgstr ""
 
 #: templates/admin.php:39
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:67
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:67
+#: templates/admin.php:95
 msgid "More"
 msgstr "Mere"
 
diff --git a/l10n/da/user_ldap.po b/l10n/da/user_ldap.po
index 5103ecf98c..1d87e55405 100644
--- a/l10n/da/user_ldap.po
+++ b/l10n/da/user_ldap.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-20 14:58+0000\n"
-"Last-Translator: ressel <sr@ybnet.dk>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -160,6 +160,12 @@ msgstr ""
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr "Hjælp"
diff --git a/l10n/de/core.po b/l10n/de/core.po
index fc4db2d98b..7fd2379895 100644
--- a/l10n/de/core.po
+++ b/l10n/de/core.po
@@ -6,6 +6,7 @@
 #   <admin@s-goecker.de>, 2011, 2012.
 #   <alex.hotz@gmail.com>, 2011.
 #   <georg.stefan.germany@googlemail.com>, 2011.
+# I Robot <thomas.mueller@tmit.eu>, 2012.
 # Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
 # Marcel Kühlhorn <susefan93@gmx.de>, 2012.
 #   <m.fresel@sysangels.com>, 2012.
@@ -17,9 +18,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-24 02:02+0200\n"
-"PO-Revision-Date: 2012-08-23 20:44+0000\n"
-"Last-Translator: JamFX <niko@nik-o-mat.de>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -43,55 +44,55 @@ msgstr "Kategorie existiert bereits:"
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 
-#: js/js.js:190 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "January"
 msgstr "Januar"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "February"
 msgstr "Februar"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "March"
 msgstr "März"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "April"
 msgstr "April"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "May"
 msgstr "Mai"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "June"
 msgstr "Juni"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "July"
 msgstr "Juli"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "August"
 msgstr "August"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "September"
 msgstr "September"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "October"
 msgstr "Oktober"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "November"
 msgstr "November"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "December"
 msgstr "Dezember"
 
@@ -139,7 +140,7 @@ msgstr "Angefragt"
 msgid "Login failed!"
 msgstr "Login fehlgeschlagen!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "Benutzername"
@@ -200,48 +201,52 @@ msgstr "Kategorien bearbeiten"
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr "<strong>Administrator-Konto</strong> anlegen"
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "Passwort"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr "Erweitert"
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "Datenverzeichnis"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "Datenbank einrichten"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "wird genutzt"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "Datenbank-Benutzer"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "Datenbank-Passwort"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "Datenbank-Name"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "Datenbank-Host"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "Installation abschließen"
 
diff --git a/l10n/de/files_odfviewer.po b/l10n/de/files_odfviewer.po
new file mode 100644
index 0000000000..8d81b0d266
--- /dev/null
+++ b/l10n/de/files_odfviewer.po
@@ -0,0 +1,23 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# I Robot <thomas.mueller@tmit.eu>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:21+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/viewer.js:9
+msgid "Close"
+msgstr "Schliessen"
diff --git a/l10n/de/files_pdfviewer.po b/l10n/de/files_pdfviewer.po
new file mode 100644
index 0000000000..a792a00b21
--- /dev/null
+++ b/l10n/de/files_pdfviewer.po
@@ -0,0 +1,43 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# I Robot <thomas.mueller@tmit.eu>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:21+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/viewer.js:22
+msgid "Previous"
+msgstr "Zurück"
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr "Weiter"
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/de/files_sharing.po b/l10n/de/files_sharing.po
index 8f7dfd3059..c9da23c62a 100644
--- a/l10n/de/files_sharing.po
+++ b/l10n/de/files_sharing.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -20,18 +20,10 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: templates/get.php:4
-msgid "Size"
-msgstr "Größe"
+#: templates/authenticate.php:4
+msgid "Password"
+msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr "Geändert"
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr "Alle löschen"
-
-#: templates/get.php:5
-msgid "Delete"
-msgstr "Löschen"
+#: templates/authenticate.php:6
+msgid "Submit"
+msgstr ""
diff --git a/l10n/de/files_texteditor.po b/l10n/de/files_texteditor.po
new file mode 100644
index 0000000000..ec62682751
--- /dev/null
+++ b/l10n/de/files_texteditor.po
@@ -0,0 +1,45 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# I Robot <thomas.mueller@tmit.eu>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:01+0200\n"
+"PO-Revision-Date: 2012-08-25 23:26+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr "Regulärer Ausdruck"
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr "Speichern"
+
+#: js/editor.js:74
+msgid "Close"
+msgstr "Schliessen"
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr "Speichern..."
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr "Ein Fehler ist aufgetreten"
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr "Einige Änderungen wurde noch nicht gespeichert; klicken Sie hier um zurückzukehren."
diff --git a/l10n/de/impress.po b/l10n/de/impress.po
new file mode 100644
index 0000000000..bdf9e101c8
--- /dev/null
+++ b/l10n/de/impress.po
@@ -0,0 +1,23 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# I Robot <thomas.mueller@tmit.eu>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:01+0200\n"
+"PO-Revision-Date: 2012-08-25 23:27+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/presentations.php:7
+msgid "Documentation"
+msgstr "Dokumentation"
diff --git a/l10n/de/settings.po b/l10n/de/settings.po
index 29ec31c8a5..932008355a 100644
--- a/l10n/de/settings.po
+++ b/l10n/de/settings.po
@@ -16,9 +16,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-24 02:02+0200\n"
-"PO-Revision-Date: 2012-08-23 09:08+0000\n"
-"Last-Translator: traductor <transifex.3.mensaje@spamgourmet.com>\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -95,10 +95,46 @@ msgid "use systems cron service"
 msgstr "Nutze System-Cron-Service"
 
 #: templates/admin.php:39
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:67
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:67
+#: templates/admin.php:95
 msgid "More"
 msgstr "Mehr"
 
diff --git a/l10n/de/user_ldap.po b/l10n/de/user_ldap.po
index 5cd6c4762f..6f9cced66a 100644
--- a/l10n/de/user_ldap.po
+++ b/l10n/de/user_ldap.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-24 02:02+0200\n"
-"PO-Revision-Date: 2012-08-23 10:14+0000\n"
-"Last-Translator: traductor <transifex.3.mensaje@spamgourmet.com>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -164,6 +164,12 @@ msgstr "in Bytes"
 msgid "in seconds. A change empties the cache."
 msgstr "in Sekunden. Eine Änderung leert den Cache."
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr "Hilfe"
diff --git a/l10n/el/core.po b/l10n/el/core.po
index 5f3262deb6..8de9d580dc 100644
--- a/l10n/el/core.po
+++ b/l10n/el/core.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -37,55 +37,55 @@ msgstr "Αυτή η κατηγορία υπάρχει ήδη"
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 
-#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "Ρυθμίσεις"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "January"
 msgstr "Ιανουάριος"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "February"
 msgstr "Φεβρουάριος"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "March"
 msgstr "Μάρτιος"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "April"
 msgstr "Απρίλιος"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "May"
 msgstr "Μάϊος"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "June"
 msgstr "Ιούνιος"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "July"
 msgstr "Ιούλιος"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "August"
 msgstr "Αύγουστος"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "September"
 msgstr "Σεπτέμβριος"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "October"
 msgstr "Οκτώβριος"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "November"
 msgstr "Νοέμβριος"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "December"
 msgstr "Δεκέμβριος"
 
@@ -133,7 +133,7 @@ msgstr "Ζητήθησαν"
 msgid "Login failed!"
 msgstr "Η σύνδεση απέτυχε!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "Όνομα Χρήστη"
@@ -194,48 +194,52 @@ msgstr "Επεξεργασία κατηγορίας"
 msgid "Add"
 msgstr "Προσθήκη"
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr "Δημιουργήστε έναν <strong>λογαριασμό διαχειριστή</strong>"
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "Κωδικός"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr "Για προχωρημένους"
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "Φάκελος δεδομένων"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "Διαμόρφωση της βάσης δεδομένων"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "θα χρησιμοποιηθούν"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "Χρήστης της βάσης δεδομένων"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "Κωδικός πρόσβασης βάσης δεδομένων"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "Όνομα βάσης δεδομένων"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "Διακομιστής βάσης δεδομένων"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "Ολοκλήρωση εγκατάστασης"
 
diff --git a/l10n/el/files_external.po b/l10n/el/files_external.po
index d33fba1ab4..d11daf7f32 100644
--- a/l10n/el/files_external.po
+++ b/l10n/el/files_external.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # Nisok Kosin <nikos.efthimiou@gmail.com>, 2012.
+# Petros Kyladitis <petros.kyladitis@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-24 02:02+0200\n"
-"PO-Revision-Date: 2012-08-23 08:59+0000\n"
-"Last-Translator: Nisok Kosin <nikos.efthimiou@gmail.com>\n"
+"POT-Creation-Date: 2012-08-27 02:01+0200\n"
+"PO-Revision-Date: 2012-08-26 21:45+0000\n"
+"Last-Translator: Petros Kyladitis <petros.kyladitis@gmail.com>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,7 +25,7 @@ msgstr "Εξωτερική αποθήκευση"
 
 #: templates/settings.php:7 templates/settings.php:19
 msgid "Mount point"
-msgstr ""
+msgstr "Σημείο προσάρτησης"
 
 #: templates/settings.php:8
 msgid "Backend"
diff --git a/l10n/el/files_odfviewer.po b/l10n/el/files_odfviewer.po
new file mode 100644
index 0000000000..5e6d54efe4
--- /dev/null
+++ b/l10n/el/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: el\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/el/files_pdfviewer.po b/l10n/el/files_pdfviewer.po
new file mode 100644
index 0000000000..ccc6193a0b
--- /dev/null
+++ b/l10n/el/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: el\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/el/files_sharing.po b/l10n/el/files_sharing.po
index 32f11e9f2c..3683b27656 100644
--- a/l10n/el/files_sharing.po
+++ b/l10n/el/files_sharing.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-24 02:02+0200\n"
-"PO-Revision-Date: 2012-08-23 08:57+0000\n"
-"Last-Translator: Nisok Kosin <nikos.efthimiou@gmail.com>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,18 +18,10 @@ msgstr ""
 "Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: templates/get.php:4
-msgid "Size"
-msgstr "Μέγεθος"
+#: templates/authenticate.php:4
+msgid "Password"
+msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr "Τροποποιήθηκε"
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr "Διαγραφή όλων"
-
-#: templates/get.php:5
-msgid "Delete"
-msgstr "Διαγραφή"
+#: templates/authenticate.php:6
+msgid "Submit"
+msgstr ""
diff --git a/l10n/el/files_texteditor.po b/l10n/el/files_texteditor.po
new file mode 100644
index 0000000000..c449b11184
--- /dev/null
+++ b/l10n/el/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: el\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/el/impress.po b/l10n/el/impress.po
new file mode 100644
index 0000000000..f6cd715453
--- /dev/null
+++ b/l10n/el/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: el\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/el/settings.po b/l10n/el/settings.po
index 6d7243e05b..0e099d8938 100644
--- a/l10n/el/settings.po
+++ b/l10n/el/settings.po
@@ -14,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-24 02:02+0200\n"
-"PO-Revision-Date: 2012-08-23 08:43+0000\n"
-"Last-Translator: Nisok Kosin <nikos.efthimiou@gmail.com>\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -93,10 +93,46 @@ msgid "use systems cron service"
 msgstr "Χρήση της υπηρεσίας cron του συστήματος"
 
 #: templates/admin.php:39
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:67
 msgid "Log"
 msgstr "Αρχείο καταγραφής"
 
-#: templates/admin.php:67
+#: templates/admin.php:95
 msgid "More"
 msgstr "Περισσότερο"
 
diff --git a/l10n/el/user_ldap.po b/l10n/el/user_ldap.po
index cfea140f22..3752a64b5d 100644
--- a/l10n/el/user_ldap.po
+++ b/l10n/el/user_ldap.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-24 02:02+0200\n"
-"PO-Revision-Date: 2012-08-23 13:38+0000\n"
-"Last-Translator: Efstathios Iosifidis <diamond_gr@freemail.gr>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -160,6 +160,12 @@ msgstr "σε bytes"
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr "Βοήθεια"
diff --git a/l10n/eo/core.po b/l10n/eo/core.po
index fbea58f5dd..d3bc69aa6b 100644
--- a/l10n/eo/core.po
+++ b/l10n/eo/core.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-19 02:02+0200\n"
-"PO-Revision-Date: 2012-08-18 16:36+0000\n"
-"Last-Translator: Mariano <mstreet@kde.org.ar>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -36,55 +36,55 @@ msgstr "Ĉi tiu kategorio jam ekzistas: "
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 
-#: js/js.js:190 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "Agordo"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "January"
 msgstr "Januaro"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "February"
 msgstr "Februaro"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "March"
 msgstr "Marto"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "April"
 msgstr "Aprilo"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "May"
 msgstr "Majo"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "June"
 msgstr "Junio"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "July"
 msgstr "Julio"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "August"
 msgstr "Aŭgusto"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "September"
 msgstr "Septembro"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "October"
 msgstr "Oktobro"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "November"
 msgstr "Novembro"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "December"
 msgstr "Decembro"
 
@@ -132,7 +132,7 @@ msgstr "Petita"
 msgid "Login failed!"
 msgstr "Ensaluto malsukcesis!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "Uzantonomo"
@@ -193,48 +193,52 @@ msgstr "Redakti kategoriojn"
 msgid "Add"
 msgstr "Aldoni"
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr "Krei <strong>administran konton</strong>"
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "Pasvorto"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr "Progresinta"
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "Datuma dosierujo"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "Agordi la datumbazon"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "estos uzata"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "Datumbaza uzanto"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "Datumbaza pasvorto"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "Datumbaza nomo"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "Datumbaza gastigo"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "Fini la instalon"
 
diff --git a/l10n/eo/files_odfviewer.po b/l10n/eo/files_odfviewer.po
new file mode 100644
index 0000000000..ebc4993230
--- /dev/null
+++ b/l10n/eo/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eo\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/eo/files_pdfviewer.po b/l10n/eo/files_pdfviewer.po
new file mode 100644
index 0000000000..14fae82ce8
--- /dev/null
+++ b/l10n/eo/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eo\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/eo/files_sharing.po b/l10n/eo/files_sharing.po
index f1afe86872..fd8cae3168 100644
--- a/l10n/eo/files_sharing.po
+++ b/l10n/eo/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -18,18 +18,10 @@ msgstr ""
 "Language: eo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: templates/get.php:4
-msgid "Size"
+#: templates/authenticate.php:4
+msgid "Password"
 msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
+#: templates/authenticate.php:6
+msgid "Submit"
 msgstr ""
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete"
-msgstr "Forigi"
diff --git a/l10n/eo/files_texteditor.po b/l10n/eo/files_texteditor.po
new file mode 100644
index 0000000000..6571503162
--- /dev/null
+++ b/l10n/eo/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eo\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/eo/impress.po b/l10n/eo/impress.po
new file mode 100644
index 0000000000..930ca99a87
--- /dev/null
+++ b/l10n/eo/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eo\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/eo/settings.po b/l10n/eo/settings.po
index 15e0d6d85a..1a916d2039 100644
--- a/l10n/eo/settings.po
+++ b/l10n/eo/settings.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-19 02:02+0200\n"
-"PO-Revision-Date: 2012-08-18 17:13+0000\n"
-"Last-Translator: Mariano <mstreet@kde.org.ar>\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -88,10 +88,46 @@ msgid "use systems cron service"
 msgstr "uzi la cron-servon de la sistemo"
 
 #: templates/admin.php:39
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:67
 msgid "Log"
 msgstr "Protokolo"
 
-#: templates/admin.php:67
+#: templates/admin.php:95
 msgid "More"
 msgstr "Pli"
 
diff --git a/l10n/eo/user_ldap.po b/l10n/eo/user_ldap.po
index d83f307fe2..9e4a9947c2 100644
--- a/l10n/eo/user_ldap.po
+++ b/l10n/eo/user_ldap.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-19 02:02+0200\n"
-"PO-Revision-Date: 2012-08-18 14:28+0000\n"
-"Last-Translator: Mariano <mstreet@kde.org.ar>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -160,6 +160,12 @@ msgstr "duumoke"
 msgid "in seconds. A change empties the cache."
 msgstr "sekunde. Ajna ŝanĝo malplenigas la kaŝmemoron."
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr "Helpo"
diff --git a/l10n/es/core.po b/l10n/es/core.po
index 5139dfe014..34fc1ff54a 100644
--- a/l10n/es/core.po
+++ b/l10n/es/core.po
@@ -6,6 +6,7 @@
 # Javier Llorente <javier@opensuse.org>, 2012.
 #   <juanma@kde.org.ar>, 2011, 2012.
 # oSiNaReF  <>, 2012.
+# Raul Fernandez Garcia <raulfg3@gmail.com>, 2012.
 #   <rodrigo.calvo@gmail.com>, 2012.
 #   <rom1dep@gmail.com>, 2011.
 #   <sergioballesterossolanas@gmail.com>, 2011, 2012.
@@ -13,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-24 02:02+0200\n"
-"PO-Revision-Date: 2012-08-23 09:17+0000\n"
-"Last-Translator: Javier Llorente <javier@opensuse.org>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -39,55 +40,55 @@ msgstr "Esta categoría ya existe: "
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 
-#: js/js.js:190 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "Ajustes"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "January"
 msgstr "Enero"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "February"
 msgstr "Febrero"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "March"
 msgstr "Marzo"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "April"
 msgstr "Abril"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "May"
 msgstr "Mayo"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "June"
 msgstr "Junio"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "July"
 msgstr "Julio"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "August"
 msgstr "Agosto"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "September"
 msgstr "Septiembre"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "October"
 msgstr "Octubre"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "November"
 msgstr "Noviembre"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "December"
 msgstr "Diciembre"
 
@@ -135,7 +136,7 @@ msgstr "Pedido"
 msgid "Login failed!"
 msgstr "¡Fallo al iniciar sesión!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "Nombre de usuario"
@@ -196,48 +197,52 @@ msgstr "Editar categorías"
 msgid "Add"
 msgstr "Añadir"
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr "Crea una <strong>cuenta de administrador</strong>"
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "Contraseña"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr "Avanzado"
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "Directorio de almacenamiento"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "Configurar la base de datos"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "se utilizarán"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "Usuario de la base de datos"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "Contraseña de la base de datos"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "Nombre de la base de datos"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "Host de la base de datos"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "Completar la instalación"
 
diff --git a/l10n/es/files_encryption.po b/l10n/es/files_encryption.po
index 4c88d29c38..9b75acf31d 100644
--- a/l10n/es/files_encryption.po
+++ b/l10n/es/files_encryption.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-22 21:47+0000\n"
+"POT-Creation-Date: 2012-08-28 02:01+0200\n"
+"PO-Revision-Date: 2012-08-27 05:27+0000\n"
 "Last-Translator: juanman <juanma@kde.org.ar>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -24,12 +24,12 @@ msgstr "Cifrado"
 
 #: templates/settings.php:4
 msgid "Exclude the following file types from encryption"
-msgstr ""
+msgstr "Excluir del cifrado los siguientes tipos de archivo"
 
 #: templates/settings.php:5
 msgid "None"
-msgstr ""
+msgstr "Ninguno"
 
 #: templates/settings.php:10
 msgid "Enable Encryption"
-msgstr ""
+msgstr "Habilitar cifrado"
diff --git a/l10n/es/files_odfviewer.po b/l10n/es/files_odfviewer.po
new file mode 100644
index 0000000000..aaf62e020a
--- /dev/null
+++ b/l10n/es/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/es/files_pdfviewer.po b/l10n/es/files_pdfviewer.po
new file mode 100644
index 0000000000..1b4c74ef32
--- /dev/null
+++ b/l10n/es/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/es/files_sharing.po b/l10n/es/files_sharing.po
index e53147b10f..ccb836d0dc 100644
--- a/l10n/es/files_sharing.po
+++ b/l10n/es/files_sharing.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-24 02:02+0200\n"
-"PO-Revision-Date: 2012-08-23 09:11+0000\n"
-"Last-Translator: Javier Llorente <javier@opensuse.org>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,18 +18,10 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: templates/get.php:4
-msgid "Size"
-msgstr "Tamaño"
+#: templates/authenticate.php:4
+msgid "Password"
+msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr "Modificado"
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr "Eliminar todo"
-
-#: templates/get.php:5
-msgid "Delete"
-msgstr "Eliminar"
+#: templates/authenticate.php:6
+msgid "Submit"
+msgstr ""
diff --git a/l10n/es/files_texteditor.po b/l10n/es/files_texteditor.po
new file mode 100644
index 0000000000..51dd6d7810
--- /dev/null
+++ b/l10n/es/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/es/files_versions.po b/l10n/es/files_versions.po
index 0b5cfbe22c..544b3a53b0 100644
--- a/l10n/es/files_versions.po
+++ b/l10n/es/files_versions.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # Javier Llorente <javier@opensuse.org>, 2012.
+#   <juanma@kde.org.ar>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-24 02:02+0200\n"
-"PO-Revision-Date: 2012-08-23 09:28+0000\n"
-"Last-Translator: Javier Llorente <javier@opensuse.org>\n"
+"POT-Creation-Date: 2012-08-28 02:01+0200\n"
+"PO-Revision-Date: 2012-08-27 05:54+0000\n"
+"Last-Translator: juanman <juanma@kde.org.ar>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,7 +21,7 @@ msgstr ""
 
 #: js/settings-personal.js:31
 msgid "Expire all versions"
-msgstr ""
+msgstr "Expirar todas las versiones"
 
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
diff --git a/l10n/es/impress.po b/l10n/es/impress.po
new file mode 100644
index 0000000000..45ece5e5e6
--- /dev/null
+++ b/l10n/es/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/es/settings.po b/l10n/es/settings.po
index 4fadce58dc..e1085bc4ca 100644
--- a/l10n/es/settings.po
+++ b/l10n/es/settings.po
@@ -15,9 +15,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-24 02:02+0200\n"
-"PO-Revision-Date: 2012-08-23 09:14+0000\n"
-"Last-Translator: Javier Llorente <javier@opensuse.org>\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -94,10 +94,46 @@ msgid "use systems cron service"
 msgstr "usar servicio cron del sistema"
 
 #: templates/admin.php:39
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:67
 msgid "Log"
 msgstr "Registro"
 
-#: templates/admin.php:67
+#: templates/admin.php:95
 msgid "More"
 msgstr "Más"
 
diff --git a/l10n/es/user_ldap.po b/l10n/es/user_ldap.po
index 11d0ce6c53..49025f4606 100644
--- a/l10n/es/user_ldap.po
+++ b/l10n/es/user_ldap.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-24 02:02+0200\n"
-"PO-Revision-Date: 2012-08-23 09:28+0000\n"
-"Last-Translator: Javier Llorente <javier@opensuse.org>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -160,6 +160,12 @@ msgstr "en bytes"
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr "Ayuda"
diff --git a/l10n/et_EE/core.po b/l10n/et_EE/core.po
index 8e0bb95d9f..b5d1fc5cc4 100644
--- a/l10n/et_EE/core.po
+++ b/l10n/et_EE/core.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -34,55 +34,55 @@ msgstr "See kategooria on juba olemas: "
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 
-#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "Seaded"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "January"
 msgstr "Jaanuar"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "February"
 msgstr "Veebruar"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "March"
 msgstr "Märts"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "April"
 msgstr "Aprill"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "May"
 msgstr "Mai"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "June"
 msgstr "Juuni"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "July"
 msgstr "Juuli"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "August"
 msgstr "August"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "September"
 msgstr "September"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "October"
 msgstr "Oktoober"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "November"
 msgstr "November"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "December"
 msgstr "Detsember"
 
@@ -130,7 +130,7 @@ msgstr "Kohustuslik"
 msgid "Login failed!"
 msgstr "Sisselogimine ebaõnnestus!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "Kasutajanimi"
@@ -191,48 +191,52 @@ msgstr "Muuda kategooriaid"
 msgid "Add"
 msgstr "Lisa"
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr "Loo <strong>admini konto</strong>"
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "Parool"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr "Lisavalikud"
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "Andmete kaust"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "Seadista andmebaasi"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "kasutatakse"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "Andmebaasi kasutaja"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "Andmebaasi parool"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "Andmebasi nimi"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "Andmebaasi host"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "Lõpeta seadistamine"
 
diff --git a/l10n/et_EE/files.po b/l10n/et_EE/files.po
index 5585c7eb69..d0fad31b01 100644
--- a/l10n/et_EE/files.po
+++ b/l10n/et_EE/files.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-26 19:46+0200\n"
+"PO-Revision-Date: 2012-08-26 17:20+0000\n"
+"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -52,37 +52,37 @@ msgstr "Kettale kirjutamine ebaõnnestus"
 msgid "Files"
 msgstr "Failid"
 
-#: js/fileactions.js:107 templates/index.php:56
+#: js/fileactions.js:111 templates/index.php:56
 msgid "Delete"
 msgstr "Kustuta"
 
 #: js/filelist.js:141
 msgid "already exists"
-msgstr ""
+msgstr "on juba olemas"
 
 #: js/filelist.js:141
 msgid "replace"
-msgstr ""
+msgstr "asenda"
 
 #: js/filelist.js:141
 msgid "cancel"
-msgstr ""
+msgstr "loobu"
 
 #: js/filelist.js:195
 msgid "replaced"
-msgstr ""
+msgstr "asendatud"
 
 #: js/filelist.js:195
 msgid "with"
-msgstr ""
+msgstr "millega"
 
 #: js/filelist.js:195 js/filelist.js:246
 msgid "undo"
-msgstr ""
+msgstr "tagasi"
 
 #: js/filelist.js:246
 msgid "deleted"
-msgstr ""
+msgstr "kustutatud"
 
 #: js/files.js:171
 msgid "generating ZIP-file, it may take some time."
diff --git a/l10n/et_EE/files_odfviewer.po b/l10n/et_EE/files_odfviewer.po
new file mode 100644
index 0000000000..986289e67a
--- /dev/null
+++ b/l10n/et_EE/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: et_EE\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/et_EE/files_pdfviewer.po b/l10n/et_EE/files_pdfviewer.po
new file mode 100644
index 0000000000..3354f9e2cc
--- /dev/null
+++ b/l10n/et_EE/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: et_EE\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/et_EE/files_sharing.po b/l10n/et_EE/files_sharing.po
index ebe1c5cb9b..685a455172 100644
--- a/l10n/et_EE/files_sharing.po
+++ b/l10n/et_EE/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
@@ -18,18 +18,10 @@ msgstr ""
 "Language: et_EE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: templates/get.php:4
-msgid "Size"
+#: templates/authenticate.php:4
+msgid "Password"
 msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
+#: templates/authenticate.php:6
+msgid "Submit"
 msgstr ""
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete"
-msgstr "Kustutamine"
diff --git a/l10n/et_EE/files_texteditor.po b/l10n/et_EE/files_texteditor.po
new file mode 100644
index 0000000000..1349624339
--- /dev/null
+++ b/l10n/et_EE/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: et_EE\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/et_EE/impress.po b/l10n/et_EE/impress.po
new file mode 100644
index 0000000000..85746c6484
--- /dev/null
+++ b/l10n/et_EE/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: et_EE\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/et_EE/settings.po b/l10n/et_EE/settings.po
index c41361db04..da5e7a6610 100644
--- a/l10n/et_EE/settings.po
+++ b/l10n/et_EE/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-18 02:01+0200\n"
-"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
@@ -21,7 +21,7 @@ msgstr ""
 
 #: ajax/apps/ocs.php:23
 msgid "Unable to load list from App Store"
-msgstr ""
+msgstr "App Sotre'i nimekirja laadimine ebaõnnestus"
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
@@ -41,7 +41,7 @@ msgstr "Vigane päring"
 
 #: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
 msgid "Authentication error"
-msgstr ""
+msgstr "Autentimise viga"
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
@@ -49,7 +49,7 @@ msgstr "Keel on muudetud"
 
 #: js/apps.js:18
 msgid "Error"
-msgstr ""
+msgstr "Viga"
 
 #: js/apps.js:39 js/apps.js:73
 msgid "Disable"
@@ -69,29 +69,65 @@ msgstr "Eesti"
 
 #: templates/admin.php:14
 msgid "Security Warning"
-msgstr ""
+msgstr "Turvahoiatus"
 
 #: templates/admin.php:29
 msgid "Cron"
-msgstr ""
+msgstr "Ajastatud töö"
 
 #: templates/admin.php:31
 msgid "execute one task with each page loaded"
-msgstr ""
+msgstr "käivita iga laetud lehe juures üks ülesanne"
 
 #: templates/admin.php:33
 msgid "cron.php is registered at a webcron service"
-msgstr ""
+msgstr "cron.php on webcron teenuses registreeritud"
 
 #: templates/admin.php:35
 msgid "use systems cron service"
-msgstr ""
+msgstr "kasuta süsteemide cron teenuseid"
 
 #: templates/admin.php:39
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:67
 msgid "Log"
 msgstr "Logi"
 
-#: templates/admin.php:67
+#: templates/admin.php:95
 msgid "More"
 msgstr "Veel"
 
@@ -229,7 +265,7 @@ msgstr "Muu"
 
 #: templates/users.php:80 templates/users.php:112
 msgid "Group Admin"
-msgstr ""
+msgstr "Grupi admin"
 
 #: templates/users.php:82
 msgid "Quota"
diff --git a/l10n/et_EE/user_ldap.po b/l10n/et_EE/user_ldap.po
index 38de7d5c10..80d9727ff0 100644
--- a/l10n/et_EE/user_ldap.po
+++ b/l10n/et_EE/user_ldap.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Rivo Zängov <eraser@eraser.ee>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,7 +20,7 @@ msgstr ""
 
 #: templates/settings.php:8
 msgid "Host"
-msgstr ""
+msgstr "Host"
 
 #: templates/settings.php:8
 msgid ""
@@ -47,7 +48,7 @@ msgstr ""
 
 #: templates/settings.php:11
 msgid "Password"
-msgstr ""
+msgstr "Parool"
 
 #: templates/settings.php:11
 msgid "For anonymous access, leave DN and Password empty."
@@ -83,7 +84,7 @@ msgstr ""
 
 #: templates/settings.php:14
 msgid "Group Filter"
-msgstr ""
+msgstr "Grupi filter"
 
 #: templates/settings.php:14
 msgid "Defines the filter to apply, when retrieving groups."
@@ -95,7 +96,7 @@ msgstr ""
 
 #: templates/settings.php:17
 msgid "Port"
-msgstr ""
+msgstr "Port"
 
 #: templates/settings.php:18
 msgid "Base User Tree"
@@ -111,7 +112,7 @@ msgstr ""
 
 #: templates/settings.php:21
 msgid "Use TLS"
-msgstr ""
+msgstr "Kasutaja TLS"
 
 #: templates/settings.php:21
 msgid "Do not use it for SSL connections, it will fail."
@@ -153,12 +154,18 @@ msgstr ""
 
 #: templates/settings.php:27
 msgid "in bytes"
-msgstr ""
+msgstr "baitides"
 
 #: templates/settings.php:29
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:31
-msgid "Help"
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
 msgstr ""
+
+#: templates/settings.php:32
+msgid "Help"
+msgstr "Abiinfo"
diff --git a/l10n/eu/core.po b/l10n/eu/core.po
index f758d66577..2e8170d6eb 100644
--- a/l10n/eu/core.po
+++ b/l10n/eu/core.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -35,55 +35,55 @@ msgstr "Kategoria hau dagoeneko existitzen da:"
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 
-#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "Ezarpenak"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "January"
 msgstr "Urtarrila"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "February"
 msgstr "Otsaila"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "March"
 msgstr "Martxoa"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "April"
 msgstr "Apirila"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "May"
 msgstr "Maiatza"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "June"
 msgstr "Ekaina"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "July"
 msgstr "Uztaila"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "August"
 msgstr "Abuztua"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "September"
 msgstr "Iraila"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "October"
 msgstr "Urria"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "November"
 msgstr "Azaroa"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "December"
 msgstr "Abendua"
 
@@ -131,7 +131,7 @@ msgstr "Eskatuta"
 msgid "Login failed!"
 msgstr "Saio hasierak huts egin du!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "Erabiltzaile izena"
@@ -192,48 +192,52 @@ msgstr "Editatu kategoriak"
 msgid "Add"
 msgstr "Gehitu"
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr "Sortu <strong>kudeatzaile kontu<strong> bat"
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "Pasahitza"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr "Aurreratua"
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "Datuen karpeta"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "Konfiguratu datu basea"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "erabiliko da"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "Datubasearen erabiltzailea"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "Datubasearen pasahitza"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "Datubasearen izena"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "Datubasearen hostalaria"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "Bukatu konfigurazioa"
 
diff --git a/l10n/eu/files_encryption.po b/l10n/eu/files_encryption.po
index 7b883fb9a8..cd97e58a49 100644
--- a/l10n/eu/files_encryption.po
+++ b/l10n/eu/files_encryption.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <asieriko@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-28 02:01+0200\n"
+"PO-Revision-Date: 2012-08-27 09:08+0000\n"
+"Last-Translator: asieriko <asieriko@gmail.com>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,16 +20,16 @@ msgstr ""
 
 #: templates/settings.php:3
 msgid "Encryption"
-msgstr ""
+msgstr "Enkriptazioa"
 
 #: templates/settings.php:4
 msgid "Exclude the following file types from encryption"
-msgstr ""
+msgstr "Ez enkriptatu hurrengo fitxategi motak"
 
 #: templates/settings.php:5
 msgid "None"
-msgstr ""
+msgstr "Bat ere ez"
 
 #: templates/settings.php:10
 msgid "Enable Encryption"
-msgstr ""
+msgstr "Gaitu enkriptazioa"
diff --git a/l10n/eu/files_external.po b/l10n/eu/files_external.po
index 488f582918..eae7996496 100644
--- a/l10n/eu/files_external.po
+++ b/l10n/eu/files_external.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <asieriko@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:34+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-28 02:01+0200\n"
+"PO-Revision-Date: 2012-08-27 09:04+0000\n"
+"Last-Translator: asieriko <asieriko@gmail.com>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,11 +20,11 @@ msgstr ""
 
 #: templates/settings.php:3
 msgid "External Storage"
-msgstr ""
+msgstr "Kanpoko Biltegiratzea"
 
 #: templates/settings.php:7 templates/settings.php:19
 msgid "Mount point"
-msgstr ""
+msgstr "Montatze puntua"
 
 #: templates/settings.php:8
 msgid "Backend"
@@ -31,11 +32,11 @@ msgstr ""
 
 #: templates/settings.php:9
 msgid "Configuration"
-msgstr ""
+msgstr "Konfigurazioa"
 
 #: templates/settings.php:10
 msgid "Options"
-msgstr ""
+msgstr "Aukerak"
 
 #: templates/settings.php:11
 msgid "Applicable"
@@ -43,40 +44,40 @@ msgstr ""
 
 #: templates/settings.php:23
 msgid "Add mount point"
-msgstr ""
+msgstr "Gehitu muntatze puntua"
 
 #: templates/settings.php:54 templates/settings.php:62
 msgid "None set"
-msgstr ""
+msgstr "Ezarri gabe"
 
 #: templates/settings.php:63
 msgid "All Users"
-msgstr ""
+msgstr "Erabiltzaile guztiak"
 
 #: templates/settings.php:64
 msgid "Groups"
-msgstr ""
+msgstr "Taldeak"
 
 #: templates/settings.php:69
 msgid "Users"
-msgstr ""
+msgstr "Erabiltzaileak"
 
 #: templates/settings.php:77 templates/settings.php:96
 msgid "Delete"
-msgstr ""
+msgstr "Ezabatu"
 
 #: templates/settings.php:88
 msgid "SSL root certificates"
-msgstr ""
+msgstr "SSL erro ziurtagiriak"
 
 #: templates/settings.php:102
 msgid "Import Root Certificate"
-msgstr ""
+msgstr "Inportatu Erro Ziurtagiria"
 
 #: templates/settings.php:108
 msgid "Enable User External Storage"
-msgstr ""
+msgstr "Gaitu erabiltzaileentzako Kanpo Biltegiratzea"
 
 #: templates/settings.php:109
 msgid "Allow users to mount their own external storage"
-msgstr ""
+msgstr "Baimendu erabiltzaileak bere kanpo biltegiratzeak muntatzen"
diff --git a/l10n/eu/files_odfviewer.po b/l10n/eu/files_odfviewer.po
new file mode 100644
index 0000000000..3f9ec980ab
--- /dev/null
+++ b/l10n/eu/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/eu/files_pdfviewer.po b/l10n/eu/files_pdfviewer.po
new file mode 100644
index 0000000000..f45d8ef655
--- /dev/null
+++ b/l10n/eu/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/eu/files_sharing.po b/l10n/eu/files_sharing.po
index d316bfa649..5dbf9d47d5 100644
--- a/l10n/eu/files_sharing.po
+++ b/l10n/eu/files_sharing.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <asieriko@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
@@ -17,18 +18,10 @@ msgstr ""
 "Language: eu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: templates/get.php:4
-msgid "Size"
+#: templates/authenticate.php:4
+msgid "Password"
 msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete"
+#: templates/authenticate.php:6
+msgid "Submit"
 msgstr ""
diff --git a/l10n/eu/files_texteditor.po b/l10n/eu/files_texteditor.po
new file mode 100644
index 0000000000..859179f561
--- /dev/null
+++ b/l10n/eu/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/eu/files_versions.po b/l10n/eu/files_versions.po
index d2da93b8df..3279db24a3 100644
--- a/l10n/eu/files_versions.po
+++ b/l10n/eu/files_versions.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <asieriko@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-28 02:01+0200\n"
+"PO-Revision-Date: 2012-08-27 08:55+0000\n"
+"Last-Translator: asieriko <asieriko@gmail.com>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,8 +20,8 @@ msgstr ""
 
 #: js/settings-personal.js:31
 msgid "Expire all versions"
-msgstr ""
+msgstr "Iraungi bertsio guztiak"
 
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
-msgstr ""
+msgstr "Gaitu fitxategien bertsioak"
diff --git a/l10n/eu/impress.po b/l10n/eu/impress.po
new file mode 100644
index 0000000000..29fd6a225e
--- /dev/null
+++ b/l10n/eu/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/eu/settings.po b/l10n/eu/settings.po
index d7ebcc2b28..2084610e4f 100644
--- a/l10n/eu/settings.po
+++ b/l10n/eu/settings.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-18 02:01+0200\n"
-"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgstr ""
 
 #: ajax/apps/ocs.php:23
 msgid "Unable to load list from App Store"
-msgstr ""
+msgstr "Ezin izan da App Dendatik zerrenda kargatu"
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
@@ -50,7 +50,7 @@ msgstr "Hizkuntza aldatuta"
 
 #: js/apps.js:18
 msgid "Error"
-msgstr ""
+msgstr "Errorea"
 
 #: js/apps.js:39 js/apps.js:73
 msgid "Disable"
@@ -74,25 +74,61 @@ msgstr "Segurtasun abisua"
 
 #: templates/admin.php:29
 msgid "Cron"
-msgstr ""
+msgstr "Cron"
 
 #: templates/admin.php:31
 msgid "execute one task with each page loaded"
-msgstr ""
+msgstr "exekutatu zeregina orri karga bakoitzean"
 
 #: templates/admin.php:33
 msgid "cron.php is registered at a webcron service"
-msgstr ""
+msgstr "cron.php webcron zerbitzu batean erregistratuta dago"
 
 #: templates/admin.php:35
 msgid "use systems cron service"
-msgstr ""
+msgstr "erabili sistemaren cron zerbitzua"
 
 #: templates/admin.php:39
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:67
 msgid "Log"
 msgstr "Egunkaria"
 
-#: templates/admin.php:67
+#: templates/admin.php:95
 msgid "More"
 msgstr "Gehiago"
 
@@ -230,7 +266,7 @@ msgstr "Besteak"
 
 #: templates/users.php:80 templates/users.php:112
 msgid "Group Admin"
-msgstr ""
+msgstr "Talde administradorea"
 
 #: templates/users.php:82
 msgid "Quota"
diff --git a/l10n/eu/user_ldap.po b/l10n/eu/user_ldap.po
index a948e44d5c..8b6abda92f 100644
--- a/l10n/eu/user_ldap.po
+++ b/l10n/eu/user_ldap.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <asieriko@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,146 +20,152 @@ msgstr ""
 
 #: templates/settings.php:8
 msgid "Host"
-msgstr ""
+msgstr "Hostalaria"
 
 #: templates/settings.php:8
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
-msgstr ""
+msgstr "Protokoloa ez da beharrezkoa, SSL behar baldin ez baduzu. Honela bada hasi ldaps://"
 
 #: templates/settings.php:9
 msgid "Base DN"
-msgstr ""
+msgstr "Oinarrizko DN"
 
 #: templates/settings.php:9
 msgid "You can specify Base DN for users and groups in the Advanced tab"
-msgstr ""
+msgstr "Erabiltzaile eta taldeentzako Oinarrizko DN zehaztu dezakezu Aurreratu fitxan"
 
 #: templates/settings.php:10
 msgid "User DN"
-msgstr ""
+msgstr "Erabiltzaile DN"
 
 #: templates/settings.php:10
 msgid ""
 "The DN of the client user with which the bind shall be done, e.g. "
 "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
 "empty."
-msgstr ""
+msgstr "Lotura egingo den bezero erabiltzailearen DNa, adb. uid=agent,dc=example,dc=com. Sarrera anonimoak gaitzeko utzi DN eta Pasahitza hutsik."
 
 #: templates/settings.php:11
 msgid "Password"
-msgstr ""
+msgstr "Pasahitza"
 
 #: templates/settings.php:11
 msgid "For anonymous access, leave DN and Password empty."
-msgstr ""
+msgstr "Sarrera anonimoak gaitzeko utzi DN eta Pasahitza hutsik."
 
 #: templates/settings.php:12
 msgid "User Login Filter"
-msgstr ""
+msgstr "Erabiltzaileen saioa hasteko iragazkia"
 
 #: templates/settings.php:12
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
-msgstr ""
+msgstr "Saioa hastean erabiliko den iragazkia zehazten du. %%uid-ek erabiltzaile izena ordezkatzen du saioa hasterakoan."
 
 #: templates/settings.php:12
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
+msgstr "erabili %%uid txantiloia, adb. \"uid=%%uid\""
 
 #: templates/settings.php:13
 msgid "User List Filter"
-msgstr ""
+msgstr "Erabiltzaile zerrendaren Iragazkia"
 
 #: templates/settings.php:13
 msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
+msgstr "Erabiltzaileak jasotzen direnean ezarriko den iragazkia zehazten du."
 
 #: templates/settings.php:13
 msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr ""
+msgstr "txantiloirik gabe, adb. \"objectClass=person\"."
 
 #: templates/settings.php:14
 msgid "Group Filter"
-msgstr ""
+msgstr "Taldeen iragazkia"
 
 #: templates/settings.php:14
 msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
+msgstr "Taldeak jasotzen direnean ezarriko den iragazkia zehazten du."
 
 #: templates/settings.php:14
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr ""
+msgstr "txantiloirik gabe, adb. \"objectClass=posixGroup\"."
 
 #: templates/settings.php:17
 msgid "Port"
-msgstr ""
+msgstr "Portua"
 
 #: templates/settings.php:18
 msgid "Base User Tree"
-msgstr ""
+msgstr "Oinarrizko Erabiltzaile Zuhaitza"
 
 #: templates/settings.php:19
 msgid "Base Group Tree"
-msgstr ""
+msgstr "Oinarrizko Talde Zuhaitza"
 
 #: templates/settings.php:20
 msgid "Group-Member association"
-msgstr ""
+msgstr "Talde-Kide elkarketak"
 
 #: templates/settings.php:21
 msgid "Use TLS"
-msgstr ""
+msgstr "Erabili TLS"
 
 #: templates/settings.php:21
 msgid "Do not use it for SSL connections, it will fail."
-msgstr ""
+msgstr "Ez erabili SSL konexioetan, huts egingo du."
 
 #: templates/settings.php:22
 msgid "Case insensitve LDAP server (Windows)"
-msgstr ""
+msgstr "Maiuskulak eta minuskulak ezberditzen ez dituen LDAP zerbitzaria (windows)"
 
 #: templates/settings.php:23
 msgid "Turn off SSL certificate validation."
-msgstr ""
+msgstr "Ezgaitu SSL ziurtagirien egiaztapena."
 
 #: templates/settings.php:23
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
-msgstr ""
+msgstr "Konexioa aukera hau ezinbestekoa badu, inportatu LDAP zerbitzariaren SSL ziurtagiria zure ownCloud zerbitzarian."
 
 #: templates/settings.php:23
 msgid "Not recommended, use for testing only."
-msgstr ""
+msgstr "Ez da aholkatzen, erabili bakarrik frogak egiteko."
 
 #: templates/settings.php:24
 msgid "User Display Name Field"
-msgstr ""
+msgstr "Erabiltzaileen bistaratzeko izena duen eremua"
 
 #: templates/settings.php:24
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
-msgstr ""
+msgstr "ownCloud erabiltzailearen izena sortzeko erabiliko den LDAP atributua"
 
 #: templates/settings.php:25
 msgid "Group Display Name Field"
-msgstr ""
+msgstr "Taldeen bistaratzeko izena duen eremua"
 
 #: templates/settings.php:25
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
-msgstr ""
+msgstr "ownCloud taldearen izena sortzeko erabiliko den LDAP atributua"
 
 #: templates/settings.php:27
 msgid "in bytes"
-msgstr ""
+msgstr "bytetan"
 
 #: templates/settings.php:29
 msgid "in seconds. A change empties the cache."
+msgstr "segundutan. Aldaketak katxea husten du."
+
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Help"
-msgstr ""
+msgstr "Laguntza"
diff --git a/l10n/eu_ES/core.po b/l10n/eu_ES/core.po
index 0a342ad7e0..8b695d7d73 100644
--- a/l10n/eu_ES/core.po
+++ b/l10n/eu_ES/core.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -33,55 +33,55 @@ msgstr ""
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "January"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "February"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "March"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "April"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "May"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "June"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "July"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "August"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "September"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "October"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "November"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "December"
 msgstr ""
 
@@ -129,7 +129,7 @@ msgstr ""
 msgid "Login failed!"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr ""
@@ -190,48 +190,52 @@ msgstr ""
 msgid "Add"
 msgstr ""
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr ""
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr ""
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr ""
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr ""
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr ""
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr ""
 
diff --git a/l10n/eu_ES/files_odfviewer.po b/l10n/eu_ES/files_odfviewer.po
new file mode 100644
index 0000000000..ae252d7f3c
--- /dev/null
+++ b/l10n/eu_ES/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eu_ES\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/eu_ES/files_pdfviewer.po b/l10n/eu_ES/files_pdfviewer.po
new file mode 100644
index 0000000000..9dace38e40
--- /dev/null
+++ b/l10n/eu_ES/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eu_ES\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/eu_ES/files_sharing.po b/l10n/eu_ES/files_sharing.po
index 0ba46e6c77..61cc77d14a 100644
--- a/l10n/eu_ES/files_sharing.po
+++ b/l10n/eu_ES/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
 "MIME-Version: 1.0\n"
@@ -17,18 +17,10 @@ msgstr ""
 "Language: eu_ES\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: templates/get.php:4
-msgid "Size"
+#: templates/authenticate.php:4
+msgid "Password"
 msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete"
+#: templates/authenticate.php:6
+msgid "Submit"
 msgstr ""
diff --git a/l10n/eu_ES/files_texteditor.po b/l10n/eu_ES/files_texteditor.po
new file mode 100644
index 0000000000..f4fbf12ae5
--- /dev/null
+++ b/l10n/eu_ES/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eu_ES\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/eu_ES/impress.po b/l10n/eu_ES/impress.po
new file mode 100644
index 0000000000..f3819cec39
--- /dev/null
+++ b/l10n/eu_ES/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eu_ES\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/eu_ES/settings.po b/l10n/eu_ES/settings.po
index 82cc89a620..f1a8e4aa08 100644
--- a/l10n/eu_ES/settings.po
+++ b/l10n/eu_ES/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-18 02:01+0200\n"
-"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
 "MIME-Version: 1.0\n"
@@ -86,10 +86,46 @@ msgid "use systems cron service"
 msgstr ""
 
 #: templates/admin.php:39
-msgid "Log"
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
 msgstr ""
 
 #: templates/admin.php:67
+msgid "Log"
+msgstr ""
+
+#: templates/admin.php:95
 msgid "More"
 msgstr ""
 
diff --git a/l10n/eu_ES/user_ldap.po b/l10n/eu_ES/user_ldap.po
index 34f25c3435..2999d7de98 100644
--- a/l10n/eu_ES/user_ldap.po
+++ b/l10n/eu_ES/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -159,6 +159,12 @@ msgstr ""
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr ""
diff --git a/l10n/fa/core.po b/l10n/fa/core.po
index 05c5ea57eb..6275a4af56 100644
--- a/l10n/fa/core.po
+++ b/l10n/fa/core.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -34,55 +34,55 @@ msgstr "این گروه از قبل اضافه شده"
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 
-#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "تنظیمات"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "January"
 msgstr "ژانویه"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "February"
 msgstr "فبریه"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "March"
 msgstr "مارس"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "April"
 msgstr "آوریل"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "May"
 msgstr "می"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "June"
 msgstr "ژوئن"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "July"
 msgstr "جولای"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "August"
 msgstr "آگوست"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "September"
 msgstr "سپتامبر"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "October"
 msgstr "اکتبر"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "November"
 msgstr "نوامبر"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "December"
 msgstr "دسامبر"
 
@@ -130,7 +130,7 @@ msgstr "درخواست"
 msgid "Login failed!"
 msgstr "ورود ناموفق بود"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "شناسه"
@@ -191,48 +191,52 @@ msgstr "ویرایش گروه ها"
 msgid "Add"
 msgstr "افزودن"
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr "لطفا یک <strong> شناسه برای مدیر</strong> بسازید"
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "گذرواژه"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr "حرفه ای"
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "پوشه اطلاعاتی"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "پایگاه داده برنامه ریزی شدند"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "استفاده خواهد شد"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "شناسه پایگاه داده"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "پسورد پایگاه داده"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "نام پایگاه داده"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "هاست پایگاه داده"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "اتمام نصب"
 
diff --git a/l10n/fa/files_odfviewer.po b/l10n/fa/files_odfviewer.po
new file mode 100644
index 0000000000..9a3288832d
--- /dev/null
+++ b/l10n/fa/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fa\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: js/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/fa/files_pdfviewer.po b/l10n/fa/files_pdfviewer.po
new file mode 100644
index 0000000000..bf8f950d5e
--- /dev/null
+++ b/l10n/fa/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fa\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: js/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/fa/files_sharing.po b/l10n/fa/files_sharing.po
index 9b11f7a5ec..9bdff0feec 100644
--- a/l10n/fa/files_sharing.po
+++ b/l10n/fa/files_sharing.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-24 02:02+0200\n"
-"PO-Revision-Date: 2012-08-23 20:07+0000\n"
-"Last-Translator: Mohammad Dashtizadeh <mohammad@dashtizadeh.net>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,18 +18,10 @@ msgstr ""
 "Language: fa\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: templates/get.php:4
-msgid "Size"
-msgstr "اندازه"
+#: templates/authenticate.php:4
+msgid "Password"
+msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr "تاریخ"
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr "حذف همه"
-
-#: templates/get.php:5
-msgid "Delete"
-msgstr "حذف"
+#: templates/authenticate.php:6
+msgid "Submit"
+msgstr ""
diff --git a/l10n/fa/files_texteditor.po b/l10n/fa/files_texteditor.po
new file mode 100644
index 0000000000..2360c9358c
--- /dev/null
+++ b/l10n/fa/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fa\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: js/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/fa/impress.po b/l10n/fa/impress.po
new file mode 100644
index 0000000000..7f9e9429ff
--- /dev/null
+++ b/l10n/fa/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fa\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/fa/settings.po b/l10n/fa/settings.po
index 38f01f759c..9ba953c9e1 100644
--- a/l10n/fa/settings.po
+++ b/l10n/fa/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-18 02:01+0200\n"
-"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
@@ -88,10 +88,46 @@ msgid "use systems cron service"
 msgstr ""
 
 #: templates/admin.php:39
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:67
 msgid "Log"
 msgstr "کارنامه"
 
-#: templates/admin.php:67
+#: templates/admin.php:95
 msgid "More"
 msgstr "بیشتر"
 
diff --git a/l10n/fa/user_ldap.po b/l10n/fa/user_ldap.po
index eb2a0fd767..4a711bf201 100644
--- a/l10n/fa/user_ldap.po
+++ b/l10n/fa/user_ldap.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Mohammad Dashtizadeh <mohammad@dashtizadeh.net>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,7 +20,7 @@ msgstr ""
 
 #: templates/settings.php:8
 msgid "Host"
-msgstr ""
+msgstr "میزبانی"
 
 #: templates/settings.php:8
 msgid ""
@@ -47,7 +48,7 @@ msgstr ""
 
 #: templates/settings.php:11
 msgid "Password"
-msgstr ""
+msgstr "رمز عبور"
 
 #: templates/settings.php:11
 msgid "For anonymous access, leave DN and Password empty."
@@ -159,6 +160,12 @@ msgstr ""
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:31
-msgid "Help"
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
 msgstr ""
+
+#: templates/settings.php:32
+msgid "Help"
+msgstr "راه‌نما"
diff --git a/l10n/fi/core.po b/l10n/fi/core.po
index 53b71a432f..50358c7b5a 100644
--- a/l10n/fi/core.po
+++ b/l10n/fi/core.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-09 02:02+0200\n"
-"PO-Revision-Date: 2011-07-25 16:05+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -33,55 +33,55 @@ msgstr ""
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:572
+#: js/js.js:586
 msgid "January"
 msgstr ""
 
-#: js/js.js:572
+#: js/js.js:586
 msgid "February"
 msgstr ""
 
-#: js/js.js:572
+#: js/js.js:586
 msgid "March"
 msgstr ""
 
-#: js/js.js:572
+#: js/js.js:586
 msgid "April"
 msgstr ""
 
-#: js/js.js:572
+#: js/js.js:586
 msgid "May"
 msgstr ""
 
-#: js/js.js:572
+#: js/js.js:586
 msgid "June"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:587
 msgid "July"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:587
 msgid "August"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:587
 msgid "September"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:587
 msgid "October"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:587
 msgid "November"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:587
 msgid "December"
 msgstr ""
 
@@ -129,7 +129,7 @@ msgstr ""
 msgid "Login failed!"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr ""
@@ -190,48 +190,52 @@ msgstr ""
 msgid "Add"
 msgstr ""
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr ""
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr ""
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr ""
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr ""
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr ""
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr ""
 
diff --git a/l10n/fi/files_odfviewer.po b/l10n/fi/files_odfviewer.po
new file mode 100644
index 0000000000..e64ad21053
--- /dev/null
+++ b/l10n/fi/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/fi/files_pdfviewer.po b/l10n/fi/files_pdfviewer.po
new file mode 100644
index 0000000000..7e2c2ec648
--- /dev/null
+++ b/l10n/fi/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/fi/files_sharing.po b/l10n/fi/files_sharing.po
index b8c06567b5..f4e463219f 100644
--- a/l10n/fi/files_sharing.po
+++ b/l10n/fi/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
 "MIME-Version: 1.0\n"
@@ -17,18 +17,10 @@ msgstr ""
 "Language: fi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: templates/get.php:4
-msgid "Size"
+#: templates/authenticate.php:4
+msgid "Password"
 msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete"
+#: templates/authenticate.php:6
+msgid "Submit"
 msgstr ""
diff --git a/l10n/fi/files_texteditor.po b/l10n/fi/files_texteditor.po
new file mode 100644
index 0000000000..07f6f6ca27
--- /dev/null
+++ b/l10n/fi/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/fi/impress.po b/l10n/fi/impress.po
new file mode 100644
index 0000000000..60c70f400f
--- /dev/null
+++ b/l10n/fi/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/fi/settings.po b/l10n/fi/settings.po
index 823276532f..ff6f704321 100644
--- a/l10n/fi/settings.po
+++ b/l10n/fi/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-18 02:01+0200\n"
-"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
 "MIME-Version: 1.0\n"
@@ -86,10 +86,46 @@ msgid "use systems cron service"
 msgstr ""
 
 #: templates/admin.php:39
-msgid "Log"
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
 msgstr ""
 
 #: templates/admin.php:67
+msgid "Log"
+msgstr ""
+
+#: templates/admin.php:95
 msgid "More"
 msgstr ""
 
diff --git a/l10n/fi/user_ldap.po b/l10n/fi/user_ldap.po
index 70707a1d17..5f8865fafa 100644
--- a/l10n/fi/user_ldap.po
+++ b/l10n/fi/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -159,6 +159,12 @@ msgstr ""
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr ""
diff --git a/l10n/fi_FI/core.po b/l10n/fi_FI/core.po
index 072f0ad9ca..5f70f5c6f9 100644
--- a/l10n/fi_FI/core.po
+++ b/l10n/fi_FI/core.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -38,55 +38,55 @@ msgstr "Tämä luokka on jo olemassa: "
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "Asetukset"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "January"
 msgstr "Tammikuu"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "February"
 msgstr "Helmikuu"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "March"
 msgstr "Maaliskuu"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "April"
 msgstr "Huhtikuu"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "May"
 msgstr "Toukokuu"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "June"
 msgstr "Kesäkuu"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "July"
 msgstr "Heinäkuu"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "August"
 msgstr "Elokuu"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "September"
 msgstr "Syyskuu"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "October"
 msgstr "Lokakuu"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "November"
 msgstr "Marraskuu"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "December"
 msgstr "Joulukuu"
 
@@ -134,7 +134,7 @@ msgstr "Tilattu"
 msgid "Login failed!"
 msgstr "Kirjautuminen epäonnistui!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "Käyttäjätunnus"
@@ -195,48 +195,52 @@ msgstr "Muokkaa luokkia"
 msgid "Add"
 msgstr "Lisää"
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr "Luo <strong>ylläpitäjän tunnus</strong>"
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "Salasana"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr "Lisäasetukset"
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "Datakansio"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "Muokkaa tietokantaa"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "käytetään"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "Tietokannan käyttäjä"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "Tietokannan salasana"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "Tietokannan nimi"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "Tietokantapalvelin"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "Viimeistele asennus"
 
diff --git a/l10n/fi_FI/files_odfviewer.po b/l10n/fi_FI/files_odfviewer.po
new file mode 100644
index 0000000000..b6ab6054fe
--- /dev/null
+++ b/l10n/fi_FI/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fi_FI\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/fi_FI/files_pdfviewer.po b/l10n/fi_FI/files_pdfviewer.po
new file mode 100644
index 0000000000..cdccaec4c7
--- /dev/null
+++ b/l10n/fi_FI/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fi_FI\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/fi_FI/files_sharing.po b/l10n/fi_FI/files_sharing.po
index dba2e1225d..8c162a1fe4 100644
--- a/l10n/fi_FI/files_sharing.po
+++ b/l10n/fi_FI/files_sharing.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-24 02:02+0200\n"
-"PO-Revision-Date: 2012-08-23 11:35+0000\n"
-"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,18 +18,10 @@ msgstr ""
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: templates/get.php:4
-msgid "Size"
-msgstr "Koko"
+#: templates/authenticate.php:4
+msgid "Password"
+msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr "Muokattu"
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr "Poista kaikki"
-
-#: templates/get.php:5
-msgid "Delete"
-msgstr "Poista"
+#: templates/authenticate.php:6
+msgid "Submit"
+msgstr ""
diff --git a/l10n/fi_FI/files_texteditor.po b/l10n/fi_FI/files_texteditor.po
new file mode 100644
index 0000000000..69c3672db6
--- /dev/null
+++ b/l10n/fi_FI/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fi_FI\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/fi_FI/impress.po b/l10n/fi_FI/impress.po
new file mode 100644
index 0000000000..ccf18fac85
--- /dev/null
+++ b/l10n/fi_FI/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fi_FI\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/fi_FI/settings.po b/l10n/fi_FI/settings.po
index f3610fa859..4baba2f56c 100644
--- a/l10n/fi_FI/settings.po
+++ b/l10n/fi_FI/settings.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-24 02:02+0200\n"
-"PO-Revision-Date: 2012-08-23 12:07+0000\n"
-"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -88,10 +88,46 @@ msgid "use systems cron service"
 msgstr "käytä järjestelmän cron-palvelua"
 
 #: templates/admin.php:39
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:67
 msgid "Log"
 msgstr "Loki"
 
-#: templates/admin.php:67
+#: templates/admin.php:95
 msgid "More"
 msgstr "Lisää"
 
diff --git a/l10n/fi_FI/user_ldap.po b/l10n/fi_FI/user_ldap.po
index a8c8f4e5c8..8d3344a831 100644
--- a/l10n/fi_FI/user_ldap.po
+++ b/l10n/fi_FI/user_ldap.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-24 02:02+0200\n"
-"PO-Revision-Date: 2012-08-23 18:00+0000\n"
-"Last-Translator: kyyberi <jarkko.moilanen@want3d.fi>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -161,6 +161,12 @@ msgstr "tavuissa"
 msgid "in seconds. A change empties the cache."
 msgstr "sekunneissa. Muutos tyhjentää välimuistin."
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr "Ohje"
diff --git a/l10n/fr/core.po b/l10n/fr/core.po
index dfb7e40edf..0229ac1e53 100644
--- a/l10n/fr/core.po
+++ b/l10n/fr/core.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -37,55 +37,55 @@ msgstr "Cette catégorie existe déjà : "
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 
-#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "Paramètres"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "January"
 msgstr "Janvier"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "February"
 msgstr "Février"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "March"
 msgstr "Mars"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "April"
 msgstr "Avril"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "May"
 msgstr "Mai"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "June"
 msgstr "Juin"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "July"
 msgstr "Juillet"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "August"
 msgstr "Août"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "September"
 msgstr "Septembre"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "October"
 msgstr "Octobre"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "November"
 msgstr "Novembre"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "December"
 msgstr "Décembre"
 
@@ -133,7 +133,7 @@ msgstr "Demande envoyée"
 msgid "Login failed!"
 msgstr "Nom d'utilisateur ou e-mail invalide"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "Nom d'utilisateur"
@@ -194,48 +194,52 @@ msgstr "Modifier les catégories"
 msgid "Add"
 msgstr "Ajouter"
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr "Créer un <strong>compte administrateur</strong>"
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "Mot de passe"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr "Avancé"
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "Répertoire des données"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "Configurer la base de données"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "sera utilisé"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "Utilisateur pour la base de données"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "Mot de passe de la base de données"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "Nom de la base de données"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "Serveur de la base de données"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "Terminer l'installation"
 
diff --git a/l10n/fr/files_odfviewer.po b/l10n/fr/files_odfviewer.po
new file mode 100644
index 0000000000..43bbf42f0f
--- /dev/null
+++ b/l10n/fr/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+
+#: js/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/fr/files_pdfviewer.po b/l10n/fr/files_pdfviewer.po
new file mode 100644
index 0000000000..ce9bb24515
--- /dev/null
+++ b/l10n/fr/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+
+#: js/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/fr/files_sharing.po b/l10n/fr/files_sharing.po
index 254df78bd1..4fcb57d414 100644
--- a/l10n/fr/files_sharing.po
+++ b/l10n/fr/files_sharing.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -19,18 +19,10 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
-#: templates/get.php:4
-msgid "Size"
-msgstr "Taille"
+#: templates/authenticate.php:4
+msgid "Password"
+msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr "Modifié"
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr "Tout effacer"
-
-#: templates/get.php:5
-msgid "Delete"
-msgstr "Effacement"
+#: templates/authenticate.php:6
+msgid "Submit"
+msgstr ""
diff --git a/l10n/fr/files_texteditor.po b/l10n/fr/files_texteditor.po
new file mode 100644
index 0000000000..3b4cb02d2c
--- /dev/null
+++ b/l10n/fr/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+
+#: js/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/fr/impress.po b/l10n/fr/impress.po
new file mode 100644
index 0000000000..3323106c6e
--- /dev/null
+++ b/l10n/fr/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+
+#: templates/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/fr/settings.po b/l10n/fr/settings.po
index c1d17de2c4..e1a896e537 100644
--- a/l10n/fr/settings.po
+++ b/l10n/fr/settings.po
@@ -16,9 +16,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-20 15:19+0000\n"
-"Last-Translator: gp4004 <gp4004@arghh.org>\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -95,10 +95,46 @@ msgid "use systems cron service"
 msgstr "utiliser le service cron du système "
 
 #: templates/admin.php:39
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:67
 msgid "Log"
 msgstr "Journaux"
 
-#: templates/admin.php:67
+#: templates/admin.php:95
 msgid "More"
 msgstr "Plus"
 
diff --git a/l10n/fr/user_ldap.po b/l10n/fr/user_ldap.po
index 1ca6075cb6..3e168eea21 100644
--- a/l10n/fr/user_ldap.po
+++ b/l10n/fr/user_ldap.po
@@ -3,15 +3,17 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Cyril Glapa <kyriog@gmail.com>, 2012.
+#   <mathieu.payrol@gmail.com>, 2012.
 # Romain DEP. <rom1dep@gmail.com>, 2012.
 #   <zrk951@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-24 02:02+0200\n"
-"PO-Revision-Date: 2012-08-23 17:01+0000\n"
-"Last-Translator: Romain DEP. <rom1dep@gmail.com>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -30,15 +32,15 @@ msgstr "Vous pouvez omettre le protocole, sauf si vous avez besoin de SSL. Dans
 
 #: templates/settings.php:9
 msgid "Base DN"
-msgstr "DN de base"
+msgstr "DN Racine"
 
 #: templates/settings.php:9
 msgid "You can specify Base DN for users and groups in the Advanced tab"
-msgstr "Vous pouvez spécifier le DN de base pour les utilisateurs et les groupes dans l'onglet Avancé"
+msgstr "Vous pouvez détailler les DN Racines de vos utilisateurs et groupes dans l'onglet Avancé"
 
 #: templates/settings.php:10
 msgid "User DN"
-msgstr "DN Utilisateur"
+msgstr "DN Utilisateur (Autorisé à consulter l'annuaire)"
 
 #: templates/settings.php:10
 msgid ""
@@ -53,18 +55,18 @@ msgstr "Mot de passe"
 
 #: templates/settings.php:11
 msgid "For anonymous access, leave DN and Password empty."
-msgstr "Pour l'accès anonyme, laisser le DN et le mot de passe vides."
+msgstr "Pour un accès anonyme, laisser le DN Utilisateur et le mot de passe vides."
 
 #: templates/settings.php:12
 msgid "User Login Filter"
-msgstr "Filtre d'identifiants utilisateur"
+msgstr "Modèle d'authentification utilisateurs"
 
 #: templates/settings.php:12
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
-msgstr "Définit le filtre à appliquer lors d'une tentative de connexion. %%uid remplace le nom d'utilisateur lors de la connexion."
+msgstr "Définit le motif à appliquer, lors d'une tentative de connexion. %%uid est remplacé par le nom d'utilisateur lors de la connexion."
 
 #: templates/settings.php:12
 #, php-format
@@ -101,11 +103,11 @@ msgstr "Port"
 
 #: templates/settings.php:18
 msgid "Base User Tree"
-msgstr ""
+msgstr "DN racine de l'arbre utilisateurs"
 
 #: templates/settings.php:19
 msgid "Base Group Tree"
-msgstr ""
+msgstr "DN racine de l'arbre groupes"
 
 #: templates/settings.php:20
 msgid "Group-Member association"
@@ -125,7 +127,7 @@ msgstr "Serveur LDAP insensible à la casse (Windows)"
 
 #: templates/settings.php:23
 msgid "Turn off SSL certificate validation."
-msgstr "Désactiver la validation du certificat SSL"
+msgstr "Désactiver la validation du certificat SSL."
 
 #: templates/settings.php:23
 msgid ""
@@ -135,23 +137,23 @@ msgstr "Si la connexion ne fonctionne qu'avec cette option, importez le certific
 
 #: templates/settings.php:23
 msgid "Not recommended, use for testing only."
-msgstr "Non recommendé, utilisation pour tests uniquement."
+msgstr "Non recommandé, utilisation pour tests uniquement."
 
 #: templates/settings.php:24
 msgid "User Display Name Field"
-msgstr ""
+msgstr "Champ \"nom d'affichage\" de l'utilisateur"
 
 #: templates/settings.php:24
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
-msgstr "L'attribut LDAP utilisé pour générer les noms d'utilisateurs d'ownCloud"
+msgstr "L'attribut LDAP utilisé pour générer les noms d'utilisateurs d'ownCloud."
 
 #: templates/settings.php:25
 msgid "Group Display Name Field"
-msgstr ""
+msgstr "Champ \"nom d'affichage\" du groupe"
 
 #: templates/settings.php:25
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
-msgstr "L'attribut LDAP utilisé pour générer les noms de groupes d'ownCloud"
+msgstr "L'attribut LDAP utilisé pour générer les noms de groupes d'ownCloud."
 
 #: templates/settings.php:27
 msgid "in bytes"
@@ -161,6 +163,12 @@ msgstr "en octets"
 msgid "in seconds. A change empties the cache."
 msgstr "en secondes. Tout changement vide le cache."
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr "Aide"
diff --git a/l10n/gl/core.po b/l10n/gl/core.po
index 892b9c977f..738fbc0ac0 100644
--- a/l10n/gl/core.po
+++ b/l10n/gl/core.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -35,55 +35,55 @@ msgstr "Esta categoría xa existe: "
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 
-#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "Preferencias"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "January"
 msgstr "Xaneiro"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "February"
 msgstr "Febreiro"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "March"
 msgstr "Marzo"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "April"
 msgstr "Abril"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "May"
 msgstr "Maio"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "June"
 msgstr "Xuño"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "July"
 msgstr "Xullo"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "August"
 msgstr "Agosto"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "September"
 msgstr "Setembro"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "October"
 msgstr "Outubro"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "November"
 msgstr "Novembro"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "December"
 msgstr "Nadal"
 
@@ -131,7 +131,7 @@ msgstr "Solicitado"
 msgid "Login failed!"
 msgstr "Fallou a conexión."
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "Nome de usuario"
@@ -192,48 +192,52 @@ msgstr "Editar categorias"
 msgid "Add"
 msgstr "Engadir"
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr "Crear unha <strong>contra de administrador</strong>"
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "Contrasinal"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr "Avanzado"
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "Cartafol de datos"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "Configurar a base de datos"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "será utilizado"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "Usuario da base de datos"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "Contrasinal da base de datos"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "Nome da base de datos"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "Servidor da base de datos"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "Rematar configuración"
 
diff --git a/l10n/gl/files_odfviewer.po b/l10n/gl/files_odfviewer.po
new file mode 100644
index 0000000000..8508ffbb8e
--- /dev/null
+++ b/l10n/gl/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: gl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/gl/files_pdfviewer.po b/l10n/gl/files_pdfviewer.po
new file mode 100644
index 0000000000..c9dc9eb36b
--- /dev/null
+++ b/l10n/gl/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: gl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/gl/files_sharing.po b/l10n/gl/files_sharing.po
index ef1d19e933..559f53be84 100644
--- a/l10n/gl/files_sharing.po
+++ b/l10n/gl/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
@@ -17,18 +17,10 @@ msgstr ""
 "Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: templates/get.php:4
-msgid "Size"
+#: templates/authenticate.php:4
+msgid "Password"
 msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete"
+#: templates/authenticate.php:6
+msgid "Submit"
 msgstr ""
diff --git a/l10n/gl/files_texteditor.po b/l10n/gl/files_texteditor.po
new file mode 100644
index 0000000000..a6074b2906
--- /dev/null
+++ b/l10n/gl/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: gl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/gl/impress.po b/l10n/gl/impress.po
new file mode 100644
index 0000000000..fe806d8cc6
--- /dev/null
+++ b/l10n/gl/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: gl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/gl/settings.po b/l10n/gl/settings.po
index 8c45f0bd13..7f4da92483 100644
--- a/l10n/gl/settings.po
+++ b/l10n/gl/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-18 02:01+0200\n"
-"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
@@ -88,10 +88,46 @@ msgid "use systems cron service"
 msgstr "utilice o servizo cron do sistema"
 
 #: templates/admin.php:39
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:67
 msgid "Log"
 msgstr "Conectar"
 
-#: templates/admin.php:67
+#: templates/admin.php:95
 msgid "More"
 msgstr "Máis"
 
diff --git a/l10n/gl/user_ldap.po b/l10n/gl/user_ldap.po
index 08efd8bd99..84304f7f0a 100644
--- a/l10n/gl/user_ldap.po
+++ b/l10n/gl/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -159,6 +159,12 @@ msgstr ""
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr ""
diff --git a/l10n/he/core.po b/l10n/he/core.po
index 9f69d80ad1..335773d0dc 100644
--- a/l10n/he/core.po
+++ b/l10n/he/core.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -36,55 +36,55 @@ msgstr "קטגוריה זאת כבר קיימת: "
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "הגדרות"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "January"
 msgstr "ינואר"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "February"
 msgstr "פברואר"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "March"
 msgstr "מרץ"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "April"
 msgstr "אפריל"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "May"
 msgstr "מאי"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "June"
 msgstr "יוני"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "July"
 msgstr "יולי"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "August"
 msgstr "אוגוסט"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "September"
 msgstr "ספטמבר"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "October"
 msgstr "אוקטובר"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "November"
 msgstr "נובמבר"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "December"
 msgstr "דצמבר"
 
@@ -132,7 +132,7 @@ msgstr "נדרש"
 msgid "Login failed!"
 msgstr "הכניסה נכשלה!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "שם משתמש"
@@ -193,48 +193,52 @@ msgstr "עריכת הקטגוריות"
 msgid "Add"
 msgstr "הוספה"
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr "יצירת <strong>חשבון מנהל</strong>"
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "ססמה"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr "מתקדם"
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "תיקיית נתונים"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "הגדרת מסד הנתונים"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "ינוצלו"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "שם משתמש במסד הנתונים"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "ססמת מסד הנתונים"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "שם מסד הנתונים"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "שרת בסיס נתונים"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "סיום התקנה"
 
diff --git a/l10n/he/files_odfviewer.po b/l10n/he/files_odfviewer.po
new file mode 100644
index 0000000000..e493bf5cb5
--- /dev/null
+++ b/l10n/he/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: he\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/he/files_pdfviewer.po b/l10n/he/files_pdfviewer.po
new file mode 100644
index 0000000000..5ae16f8b58
--- /dev/null
+++ b/l10n/he/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: he\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/he/files_sharing.po b/l10n/he/files_sharing.po
index 75c35f1462..c788cef35e 100644
--- a/l10n/he/files_sharing.po
+++ b/l10n/he/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -17,18 +17,10 @@ msgstr ""
 "Language: he\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: templates/get.php:4
-msgid "Size"
+#: templates/authenticate.php:4
+msgid "Password"
 msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete"
+#: templates/authenticate.php:6
+msgid "Submit"
 msgstr ""
diff --git a/l10n/he/files_texteditor.po b/l10n/he/files_texteditor.po
new file mode 100644
index 0000000000..1992f89c84
--- /dev/null
+++ b/l10n/he/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: he\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/he/impress.po b/l10n/he/impress.po
new file mode 100644
index 0000000000..722a7c44e1
--- /dev/null
+++ b/l10n/he/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: he\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/he/settings.po b/l10n/he/settings.po
index cd199ce76a..8d4e790e9d 100644
--- a/l10n/he/settings.po
+++ b/l10n/he/settings.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-18 02:01+0200\n"
-"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -89,10 +89,46 @@ msgid "use systems cron service"
 msgstr ""
 
 #: templates/admin.php:39
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:67
 msgid "Log"
 msgstr "יומן"
 
-#: templates/admin.php:67
+#: templates/admin.php:95
 msgid "More"
 msgstr "עוד"
 
diff --git a/l10n/he/user_ldap.po b/l10n/he/user_ldap.po
index 4dfdbd692b..8837051313 100644
--- a/l10n/he/user_ldap.po
+++ b/l10n/he/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -159,6 +159,12 @@ msgstr ""
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr ""
diff --git a/l10n/hi/core.po b/l10n/hi/core.po
new file mode 100644
index 0000000000..74c3cc9450
--- /dev/null
+++ b/l10n/hi/core.po
@@ -0,0 +1,273 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Sanjay Rabidas <rabidassanjay@gmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
+msgid "Application name not provided."
+msgstr ""
+
+#: ajax/vcategories/add.php:29
+msgid "No category to add?"
+msgstr ""
+
+#: ajax/vcategories/add.php:36
+msgid "This category already exists: "
+msgstr ""
+
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
+msgid "Settings"
+msgstr ""
+
+#: js/js.js:586
+msgid "January"
+msgstr ""
+
+#: js/js.js:586
+msgid "February"
+msgstr ""
+
+#: js/js.js:586
+msgid "March"
+msgstr ""
+
+#: js/js.js:586
+msgid "April"
+msgstr ""
+
+#: js/js.js:586
+msgid "May"
+msgstr ""
+
+#: js/js.js:586
+msgid "June"
+msgstr ""
+
+#: js/js.js:587
+msgid "July"
+msgstr ""
+
+#: js/js.js:587
+msgid "August"
+msgstr ""
+
+#: js/js.js:587
+msgid "September"
+msgstr ""
+
+#: js/js.js:587
+msgid "October"
+msgstr ""
+
+#: js/js.js:587
+msgid "November"
+msgstr ""
+
+#: js/js.js:587
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
+msgstr ""
+
+#: lostpassword/index.php:26
+msgid "ownCloud password reset"
+msgstr ""
+
+#: lostpassword/templates/email.php:1
+msgid "Use the following link to reset your password: {link}"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:3
+msgid "You will receive a link to reset your password via Email."
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:5
+msgid "Requested"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:8
+msgid "Login failed!"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
+#: templates/login.php:9
+msgid "Username"
+msgstr "प्रयोक्ता का नाम"
+
+#: lostpassword/templates/lostpassword.php:15
+msgid "Request reset"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:4
+msgid "Your password was reset"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:5
+msgid "To login page"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:8
+msgid "New password"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:11
+msgid "Reset password"
+msgstr ""
+
+#: strings.php:5
+msgid "Personal"
+msgstr ""
+
+#: strings.php:6
+msgid "Users"
+msgstr ""
+
+#: strings.php:7
+msgid "Apps"
+msgstr ""
+
+#: strings.php:8
+msgid "Admin"
+msgstr ""
+
+#: strings.php:9
+msgid "Help"
+msgstr ""
+
+#: templates/403.php:12
+msgid "Access forbidden"
+msgstr ""
+
+#: templates/404.php:12
+msgid "Cloud not found"
+msgstr "क्लौड नहीं मिला "
+
+#: templates/edit_categories_dialog.php:4
+msgid "Edit categories"
+msgstr ""
+
+#: templates/edit_categories_dialog.php:14
+msgid "Add"
+msgstr ""
+
+#: templates/installation.php:24
+msgid "Create an <strong>admin account</strong>"
+msgstr "व्यवस्थापक खाता बनाएँ"
+
+#: templates/installation.php:30 templates/login.php:13
+msgid "Password"
+msgstr "पासवर्ड"
+
+#: templates/installation.php:36
+msgid "Advanced"
+msgstr "उन्नत"
+
+#: templates/installation.php:38
+msgid "Data folder"
+msgstr ""
+
+#: templates/installation.php:45
+msgid "Configure the database"
+msgstr "डेटाबेस कॉन्फ़िगर करें "
+
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
+msgid "will be used"
+msgstr ""
+
+#: templates/installation.php:93
+msgid "Database user"
+msgstr "डेटाबेस उपयोगकर्ता"
+
+#: templates/installation.php:97
+msgid "Database password"
+msgstr "डेटाबेस पासवर्ड"
+
+#: templates/installation.php:101
+msgid "Database name"
+msgstr ""
+
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
+msgid "Database host"
+msgstr ""
+
+#: templates/installation.php:120
+msgid "Finish setup"
+msgstr "सेटअप समाप्त करे"
+
+#: templates/layout.guest.php:42
+msgid "web services under your control"
+msgstr ""
+
+#: templates/layout.user.php:49
+msgid "Log out"
+msgstr ""
+
+#: templates/login.php:6
+msgid "Lost your password?"
+msgstr ""
+
+#: templates/login.php:17
+msgid "remember"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Log in"
+msgstr ""
+
+#: templates/logout.php:1
+msgid "You are logged out."
+msgstr "आप लोग आउट  कर दिए गए हैं."
+
+#: templates/part.pagenavi.php:3
+msgid "prev"
+msgstr "पिछला"
+
+#: templates/part.pagenavi.php:20
+msgid "next"
+msgstr "अगला"
diff --git a/l10n/hi/files.po b/l10n/hi/files.po
new file mode 100644
index 0000000000..cc9a7bb222
--- /dev/null
+++ b/l10n/hi/files.po
@@ -0,0 +1,218 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2011-08-13 02:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/upload.php:20
+msgid "There is no error, the file uploaded with success"
+msgstr ""
+
+#: ajax/upload.php:21
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
+msgstr ""
+
+#: ajax/upload.php:22
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
+msgstr ""
+
+#: ajax/upload.php:23
+msgid "The uploaded file was only partially uploaded"
+msgstr ""
+
+#: ajax/upload.php:24
+msgid "No file was uploaded"
+msgstr ""
+
+#: ajax/upload.php:25
+msgid "Missing a temporary folder"
+msgstr ""
+
+#: ajax/upload.php:26
+msgid "Failed to write to disk"
+msgstr ""
+
+#: appinfo/app.php:6
+msgid "Files"
+msgstr ""
+
+#: js/fileactions.js:111 templates/index.php:56
+msgid "Delete"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "already exists"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:195 js/filelist.js:246
+msgid "undo"
+msgstr ""
+
+#: js/filelist.js:246
+msgid "deleted"
+msgstr ""
+
+#: js/files.js:171
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:200
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:200
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:228 js/files.js:319 js/files.js:348
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:333
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:457
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:703 templates/index.php:55
+msgid "Size"
+msgstr ""
+
+#: js/files.js:704 templates/index.php:56
+msgid "Modified"
+msgstr ""
+
+#: js/files.js:731
+msgid "folder"
+msgstr ""
+
+#: js/files.js:733
+msgid "folders"
+msgstr ""
+
+#: js/files.js:741
+msgid "file"
+msgstr ""
+
+#: js/files.js:743
+msgid "files"
+msgstr ""
+
+#: templates/admin.php:5
+msgid "File handling"
+msgstr ""
+
+#: templates/admin.php:7
+msgid "Maximum upload size"
+msgstr ""
+
+#: templates/admin.php:7
+msgid "max. possible: "
+msgstr ""
+
+#: templates/admin.php:9
+msgid "Needed for multi-file and folder downloads."
+msgstr ""
+
+#: templates/admin.php:9
+msgid "Enable ZIP-download"
+msgstr ""
+
+#: templates/admin.php:11
+msgid "0 is unlimited"
+msgstr ""
+
+#: templates/admin.php:12
+msgid "Maximum input size for ZIP files"
+msgstr ""
+
+#: templates/index.php:7
+msgid "New"
+msgstr ""
+
+#: templates/index.php:9
+msgid "Text file"
+msgstr ""
+
+#: templates/index.php:10
+msgid "Folder"
+msgstr ""
+
+#: templates/index.php:11
+msgid "From url"
+msgstr ""
+
+#: templates/index.php:21
+msgid "Upload"
+msgstr ""
+
+#: templates/index.php:27
+msgid "Cancel upload"
+msgstr ""
+
+#: templates/index.php:39
+msgid "Nothing in here. Upload something!"
+msgstr ""
+
+#: templates/index.php:47
+msgid "Name"
+msgstr ""
+
+#: templates/index.php:49
+msgid "Share"
+msgstr ""
+
+#: templates/index.php:51
+msgid "Download"
+msgstr ""
+
+#: templates/index.php:64
+msgid "Upload too large"
+msgstr ""
+
+#: templates/index.php:66
+msgid ""
+"The files you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: templates/index.php:71
+msgid "Files are being scanned, please wait."
+msgstr ""
+
+#: templates/index.php:74
+msgid "Current scanning"
+msgstr ""
diff --git a/l10n/hi/files_encryption.po b/l10n/hi/files_encryption.po
new file mode 100644
index 0000000000..e6ff91a68b
--- /dev/null
+++ b/l10n/hi/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/hi/files_external.po b/l10n/hi/files_external.po
new file mode 100644
index 0000000000..e27f4710d0
--- /dev/null
+++ b/l10n/hi/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/hi/files_sharing.po b/l10n/hi/files_sharing.po
new file mode 100644
index 0000000000..1aa869a155
--- /dev/null
+++ b/l10n/hi/files_sharing.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/authenticate.php:4
+msgid "Password"
+msgstr ""
+
+#: templates/authenticate.php:6
+msgid "Submit"
+msgstr ""
diff --git a/l10n/hi/files_versions.po b/l10n/hi/files_versions.po
new file mode 100644
index 0000000000..f35accb51d
--- /dev/null
+++ b/l10n/hi/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/hi/lib.po b/l10n/hi/lib.po
new file mode 100644
index 0000000000..5dabd1411d
--- /dev/null
+++ b/l10n/hi/lib.po
@@ -0,0 +1,112 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: app.php:288
+msgid "Help"
+msgstr ""
+
+#: app.php:295
+msgid "Personal"
+msgstr ""
+
+#: app.php:300
+msgid "Settings"
+msgstr ""
+
+#: app.php:305
+msgid "Users"
+msgstr ""
+
+#: app.php:312
+msgid "Apps"
+msgstr ""
+
+#: app.php:314
+msgid "Admin"
+msgstr ""
+
+#: files.php:276
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: files.php:277
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: files.php:277 files.php:302
+msgid "Back to Files"
+msgstr ""
+
+#: files.php:301
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: json.php:28
+msgid "Application is not enabled"
+msgstr ""
+
+#: json.php:39 json.php:63 json.php:75
+msgid "Authentication error"
+msgstr ""
+
+#: json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: template.php:86
+msgid "seconds ago"
+msgstr ""
+
+#: template.php:87
+msgid "1 minute ago"
+msgstr ""
+
+#: template.php:88
+#, php-format
+msgid "%d minutes ago"
+msgstr ""
+
+#: template.php:91
+msgid "today"
+msgstr ""
+
+#: template.php:92
+msgid "yesterday"
+msgstr ""
+
+#: template.php:93
+#, php-format
+msgid "%d days ago"
+msgstr ""
+
+#: template.php:94
+msgid "last month"
+msgstr ""
+
+#: template.php:95
+msgid "months ago"
+msgstr ""
+
+#: template.php:96
+msgid "last year"
+msgstr ""
+
+#: template.php:97
+msgid "years ago"
+msgstr ""
diff --git a/l10n/hi/settings.po b/l10n/hi/settings.po
new file mode 100644
index 0000000000..4dce9bbefa
--- /dev/null
+++ b/l10n/hi/settings.po
@@ -0,0 +1,274 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/apps/ocs.php:23
+msgid "Unable to load list from App Store"
+msgstr ""
+
+#: ajax/lostpassword.php:14
+msgid "Email saved"
+msgstr ""
+
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
+
+#: ajax/openid.php:16
+msgid "OpenID Changed"
+msgstr ""
+
+#: ajax/openid.php:18 ajax/setlanguage.php:20 ajax/setlanguage.php:23
+msgid "Invalid request"
+msgstr ""
+
+#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/setlanguage.php:18
+msgid "Language changed"
+msgstr ""
+
+#: js/apps.js:18
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:39 js/apps.js:73
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:39 js/apps.js:62
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:46 personal.php:47
+msgid "__language_name__"
+msgstr ""
+
+#: templates/admin.php:14
+msgid "Security Warning"
+msgstr ""
+
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:67
+msgid "Log"
+msgstr ""
+
+#: templates/admin.php:95
+msgid "More"
+msgstr ""
+
+#: templates/apps.php:10
+msgid "Add your App"
+msgstr ""
+
+#: templates/apps.php:26
+msgid "Select an App"
+msgstr ""
+
+#: templates/apps.php:29
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:30
+msgid "-licensed"
+msgstr ""
+
+#: templates/apps.php:30
+msgid "by"
+msgstr ""
+
+#: templates/help.php:8
+msgid "Documentation"
+msgstr ""
+
+#: templates/help.php:9
+msgid "Managing Big Files"
+msgstr ""
+
+#: templates/help.php:10
+msgid "Ask a question"
+msgstr ""
+
+#: templates/help.php:22
+msgid "Problems connecting to help database."
+msgstr ""
+
+#: templates/help.php:23
+msgid "Go there manually."
+msgstr ""
+
+#: templates/help.php:31
+msgid "Answer"
+msgstr ""
+
+#: templates/personal.php:8
+msgid "You use"
+msgstr ""
+
+#: templates/personal.php:8
+msgid "of the available"
+msgstr ""
+
+#: templates/personal.php:12
+msgid "Desktop and Mobile Syncing Clients"
+msgstr ""
+
+#: templates/personal.php:13
+msgid "Download"
+msgstr ""
+
+#: templates/personal.php:19
+msgid "Your password got changed"
+msgstr ""
+
+#: templates/personal.php:20
+msgid "Unable to change your password"
+msgstr ""
+
+#: templates/personal.php:21
+msgid "Current password"
+msgstr ""
+
+#: templates/personal.php:22
+msgid "New password"
+msgstr ""
+
+#: templates/personal.php:23
+msgid "show"
+msgstr ""
+
+#: templates/personal.php:24
+msgid "Change password"
+msgstr ""
+
+#: templates/personal.php:30
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:31
+msgid "Your email address"
+msgstr ""
+
+#: templates/personal.php:32
+msgid "Fill in an email address to enable password recovery"
+msgstr ""
+
+#: templates/personal.php:38 templates/personal.php:39
+msgid "Language"
+msgstr ""
+
+#: templates/personal.php:44
+msgid "Help translate"
+msgstr ""
+
+#: templates/personal.php:51
+msgid "use this address to connect to your ownCloud in your file manager"
+msgstr ""
+
+#: templates/users.php:21 templates/users.php:76
+msgid "Name"
+msgstr ""
+
+#: templates/users.php:23 templates/users.php:77
+msgid "Password"
+msgstr ""
+
+#: templates/users.php:26 templates/users.php:78 templates/users.php:98
+msgid "Groups"
+msgstr ""
+
+#: templates/users.php:32
+msgid "Create"
+msgstr ""
+
+#: templates/users.php:35
+msgid "Default Quota"
+msgstr ""
+
+#: templates/users.php:55 templates/users.php:138
+msgid "Other"
+msgstr ""
+
+#: templates/users.php:80 templates/users.php:112
+msgid "Group Admin"
+msgstr ""
+
+#: templates/users.php:82
+msgid "Quota"
+msgstr ""
+
+#: templates/users.php:146
+msgid "Delete"
+msgstr ""
diff --git a/l10n/hi/user_ldap.po b/l10n/hi/user_ldap.po
new file mode 100644
index 0000000000..1ca5b6139b
--- /dev/null
+++ b/l10n/hi/user_ldap.po
@@ -0,0 +1,170 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
+msgid "Help"
+msgstr ""
diff --git a/l10n/hr/core.po b/l10n/hr/core.po
index bfd1c9f19b..f8abf1ae89 100644
--- a/l10n/hr/core.po
+++ b/l10n/hr/core.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -36,55 +36,55 @@ msgstr "Ova kategorija već postoji: "
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 
-#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "Postavke"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "January"
 msgstr "Siječanj"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "February"
 msgstr "Veljača"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "March"
 msgstr "Ožujak"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "April"
 msgstr "Travanj"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "May"
 msgstr "Svibanj"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "June"
 msgstr "Lipanj"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "July"
 msgstr "Srpanj"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "August"
 msgstr "Kolovoz"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "September"
 msgstr "Rujan"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "October"
 msgstr "Listopad"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "November"
 msgstr "Studeni"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "December"
 msgstr "Prosinac"
 
@@ -132,7 +132,7 @@ msgstr "Zahtijevano"
 msgid "Login failed!"
 msgstr "Prijava nije uspjela!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "Korisničko ime"
@@ -193,48 +193,52 @@ msgstr "Uredi kategorije"
 msgid "Add"
 msgstr "Dodaj"
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr "Stvori <strong>administratorski račun</strong>"
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "Lozinka"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr "Dodatno"
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "Mapa baze podataka"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "Konfiguriraj bazu podataka"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "će se koristiti"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "Korisnik baze podataka"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "Lozinka baze podataka"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "Ime baze podataka"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "Poslužitelj baze podataka"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "Završi postavljanje"
 
diff --git a/l10n/hr/files.po b/l10n/hr/files.po
index b14a71388e..b68ac016d9 100644
--- a/l10n/hr/files.po
+++ b/l10n/hr/files.po
@@ -4,14 +4,15 @@
 # 
 # Translators:
 # Davor Kustec <dkustec@gmail.com>, 2011, 2012.
+#   <franz@franz-net.info>, 2012.
 # Thomas Silađi <thomas.siladi@net.hr>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-28 02:01+0200\n"
+"PO-Revision-Date: 2012-08-27 13:17+0000\n"
+"Last-Translator: fposavec <franz@franz-net.info>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -53,37 +54,37 @@ msgstr "Neuspjelo pisanje na disk"
 msgid "Files"
 msgstr "Datoteke"
 
-#: js/fileactions.js:107 templates/index.php:56
+#: js/fileactions.js:111 templates/index.php:56
 msgid "Delete"
 msgstr "Briši"
 
 #: js/filelist.js:141
 msgid "already exists"
-msgstr ""
+msgstr "već postoji"
 
 #: js/filelist.js:141
 msgid "replace"
-msgstr ""
+msgstr "zamjeni"
 
 #: js/filelist.js:141
 msgid "cancel"
-msgstr ""
+msgstr "odustani"
 
 #: js/filelist.js:195
 msgid "replaced"
-msgstr ""
+msgstr "zamjenjeno"
 
 #: js/filelist.js:195
 msgid "with"
-msgstr ""
+msgstr "sa"
 
 #: js/filelist.js:195 js/filelist.js:246
 msgid "undo"
-msgstr ""
+msgstr "vrati"
 
 #: js/filelist.js:246
 msgid "deleted"
-msgstr ""
+msgstr "izbrisano"
 
 #: js/files.js:171
 msgid "generating ZIP-file, it may take some time."
diff --git a/l10n/hr/files_odfviewer.po b/l10n/hr/files_odfviewer.po
new file mode 100644
index 0000000000..ad4066e3f6
--- /dev/null
+++ b/l10n/hr/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hr\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
+
+#: js/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/hr/files_pdfviewer.po b/l10n/hr/files_pdfviewer.po
new file mode 100644
index 0000000000..711c71bc86
--- /dev/null
+++ b/l10n/hr/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hr\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
+
+#: js/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/hr/files_sharing.po b/l10n/hr/files_sharing.po
index 902174e80e..f4796f125a 100644
--- a/l10n/hr/files_sharing.po
+++ b/l10n/hr/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -17,18 +17,10 @@ msgstr ""
 "Language: hr\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
 
-#: templates/get.php:4
-msgid "Size"
+#: templates/authenticate.php:4
+msgid "Password"
 msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete"
+#: templates/authenticate.php:6
+msgid "Submit"
 msgstr ""
diff --git a/l10n/hr/files_texteditor.po b/l10n/hr/files_texteditor.po
new file mode 100644
index 0000000000..31c7b3bc4e
--- /dev/null
+++ b/l10n/hr/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hr\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
+
+#: js/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/hr/impress.po b/l10n/hr/impress.po
new file mode 100644
index 0000000000..b66fc94ed8
--- /dev/null
+++ b/l10n/hr/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hr\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
+
+#: templates/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/hr/settings.po b/l10n/hr/settings.po
index 1d03b6f4e4..231bc8692a 100644
--- a/l10n/hr/settings.po
+++ b/l10n/hr/settings.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # Davor Kustec <dkustec@gmail.com>, 2011, 2012.
+#   <franz@franz-net.info>, 2012.
 # Thomas Silađi <thomas.siladi@net.hr>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-18 02:01+0200\n"
-"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -21,7 +22,7 @@ msgstr ""
 
 #: ajax/apps/ocs.php:23
 msgid "Unable to load list from App Store"
-msgstr ""
+msgstr "Nemogićnost učitavanja liste sa Apps Stora"
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
@@ -41,7 +42,7 @@ msgstr "Neispravan zahtjev"
 
 #: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
 msgid "Authentication error"
-msgstr ""
+msgstr "Greška kod autorizacije"
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
@@ -49,7 +50,7 @@ msgstr "Jezik promijenjen"
 
 #: js/apps.js:18
 msgid "Error"
-msgstr ""
+msgstr "Greška"
 
 #: js/apps.js:39 js/apps.js:73
 msgid "Disable"
@@ -73,7 +74,7 @@ msgstr ""
 
 #: templates/admin.php:29
 msgid "Cron"
-msgstr ""
+msgstr "Cron"
 
 #: templates/admin.php:31
 msgid "execute one task with each page loaded"
@@ -81,17 +82,53 @@ msgstr ""
 
 #: templates/admin.php:33
 msgid "cron.php is registered at a webcron service"
-msgstr ""
+msgstr "cron.php je registriran kod webcron servisa"
 
 #: templates/admin.php:35
 msgid "use systems cron service"
-msgstr ""
+msgstr "koristi sistemski cron servis"
 
 #: templates/admin.php:39
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:67
 msgid "Log"
 msgstr "dnevnik"
 
-#: templates/admin.php:67
+#: templates/admin.php:95
 msgid "More"
 msgstr "više"
 
@@ -229,7 +266,7 @@ msgstr "ostali"
 
 #: templates/users.php:80 templates/users.php:112
 msgid "Group Admin"
-msgstr ""
+msgstr "Grupa Admin"
 
 #: templates/users.php:82
 msgid "Quota"
diff --git a/l10n/hr/user_ldap.po b/l10n/hr/user_ldap.po
index 14dcd91c01..a7e026ac79 100644
--- a/l10n/hr/user_ldap.po
+++ b/l10n/hr/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -159,6 +159,12 @@ msgstr ""
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr ""
diff --git a/l10n/hu_HU/core.po b/l10n/hu_HU/core.po
index 928cb01897..1b75403809 100644
--- a/l10n/hu_HU/core.po
+++ b/l10n/hu_HU/core.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -36,55 +36,55 @@ msgstr "Ez a kategória már létezik"
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 
-#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "Beállítások"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "January"
 msgstr "Január"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "February"
 msgstr "Február"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "March"
 msgstr "Március"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "April"
 msgstr "Április"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "May"
 msgstr "Május"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "June"
 msgstr "Június"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "July"
 msgstr "Július"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "August"
 msgstr "Augusztus"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "September"
 msgstr "Szeptember"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "October"
 msgstr "Október"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "November"
 msgstr "November"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "December"
 msgstr "December"
 
@@ -132,7 +132,7 @@ msgstr "Kérés elküldve"
 msgid "Login failed!"
 msgstr "Belépés sikertelen!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "Felhasználónév"
@@ -193,48 +193,52 @@ msgstr "Kategóriák szerkesztése"
 msgid "Add"
 msgstr "Hozzáadás"
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr "<strong>Rendszergazdafiók</strong> létrehozása"
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "Jelszó"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr "Haladó"
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "Adatkönyvtár"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "Adatbázis konfigurálása"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "használva lesz"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "Adatbázis felhasználónév"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "Adatbázis jelszó"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "Adatbázis név"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "Adatbázis szerver"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "Beállítás befejezése"
 
diff --git a/l10n/hu_HU/files_encryption.po b/l10n/hu_HU/files_encryption.po
index 6b70a6b368..8fa556e471 100644
--- a/l10n/hu_HU/files_encryption.po
+++ b/l10n/hu_HU/files_encryption.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Csaba Orban <vicsabi@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-26 19:46+0200\n"
+"PO-Revision-Date: 2012-08-26 09:01+0000\n"
+"Last-Translator: Csaba Orban <vicsabi@gmail.com>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,16 +20,16 @@ msgstr ""
 
 #: templates/settings.php:3
 msgid "Encryption"
-msgstr ""
+msgstr "Titkosítás"
 
 #: templates/settings.php:4
 msgid "Exclude the following file types from encryption"
-msgstr ""
+msgstr "A következő fájl típusok kizárása a titkosításból"
 
 #: templates/settings.php:5
 msgid "None"
-msgstr ""
+msgstr "Egyik sem"
 
 #: templates/settings.php:10
 msgid "Enable Encryption"
-msgstr ""
+msgstr "Titkosítás engedélyezése"
diff --git a/l10n/hu_HU/files_odfviewer.po b/l10n/hu_HU/files_odfviewer.po
new file mode 100644
index 0000000000..159ec87452
--- /dev/null
+++ b/l10n/hu_HU/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hu_HU\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/hu_HU/files_pdfviewer.po b/l10n/hu_HU/files_pdfviewer.po
new file mode 100644
index 0000000000..1499ece9d1
--- /dev/null
+++ b/l10n/hu_HU/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hu_HU\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/hu_HU/files_sharing.po b/l10n/hu_HU/files_sharing.po
index 3b03c6a943..5c57c9e3fe 100644
--- a/l10n/hu_HU/files_sharing.po
+++ b/l10n/hu_HU/files_sharing.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Csaba Orban <vicsabi@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
@@ -17,18 +18,10 @@ msgstr ""
 "Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: templates/get.php:4
-msgid "Size"
+#: templates/authenticate.php:4
+msgid "Password"
 msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete"
+#: templates/authenticate.php:6
+msgid "Submit"
 msgstr ""
diff --git a/l10n/hu_HU/files_texteditor.po b/l10n/hu_HU/files_texteditor.po
new file mode 100644
index 0000000000..bf2f4e4b51
--- /dev/null
+++ b/l10n/hu_HU/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hu_HU\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/hu_HU/impress.po b/l10n/hu_HU/impress.po
new file mode 100644
index 0000000000..4c5473d27e
--- /dev/null
+++ b/l10n/hu_HU/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hu_HU\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/hu_HU/settings.po b/l10n/hu_HU/settings.po
index 0b5b94d6c6..dc78ebac65 100644
--- a/l10n/hu_HU/settings.po
+++ b/l10n/hu_HU/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-18 02:01+0200\n"
-"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
@@ -88,10 +88,46 @@ msgid "use systems cron service"
 msgstr ""
 
 #: templates/admin.php:39
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:67
 msgid "Log"
 msgstr "Napló"
 
-#: templates/admin.php:67
+#: templates/admin.php:95
 msgid "More"
 msgstr "Tovább"
 
diff --git a/l10n/hu_HU/user_ldap.po b/l10n/hu_HU/user_ldap.po
index 87c015d08c..cacb371b1b 100644
--- a/l10n/hu_HU/user_ldap.po
+++ b/l10n/hu_HU/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -159,6 +159,12 @@ msgstr ""
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr ""
diff --git a/l10n/hy/core.po b/l10n/hy/core.po
index bcf3a0d20c..41818fecde 100644
--- a/l10n/hy/core.po
+++ b/l10n/hy/core.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -33,55 +33,55 @@ msgstr ""
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "January"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "February"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "March"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "April"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "May"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "June"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "July"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "August"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "September"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "October"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "November"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "December"
 msgstr ""
 
@@ -129,7 +129,7 @@ msgstr ""
 msgid "Login failed!"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr ""
@@ -190,48 +190,52 @@ msgstr ""
 msgid "Add"
 msgstr ""
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr ""
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr ""
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr ""
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr ""
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr ""
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr ""
 
diff --git a/l10n/hy/files_odfviewer.po b/l10n/hy/files_odfviewer.po
new file mode 100644
index 0000000000..bdc26a3a67
--- /dev/null
+++ b/l10n/hy/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hy\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/hy/files_pdfviewer.po b/l10n/hy/files_pdfviewer.po
new file mode 100644
index 0000000000..7b725e07b8
--- /dev/null
+++ b/l10n/hy/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hy\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/hy/files_sharing.po b/l10n/hy/files_sharing.po
index d7ecd0cfa1..7adce26af9 100644
--- a/l10n/hy/files_sharing.po
+++ b/l10n/hy/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
@@ -17,18 +17,10 @@ msgstr ""
 "Language: hy\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: templates/get.php:4
-msgid "Size"
+#: templates/authenticate.php:4
+msgid "Password"
 msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete"
+#: templates/authenticate.php:6
+msgid "Submit"
 msgstr ""
diff --git a/l10n/hy/files_texteditor.po b/l10n/hy/files_texteditor.po
new file mode 100644
index 0000000000..e9e8f856c9
--- /dev/null
+++ b/l10n/hy/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hy\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/hy/impress.po b/l10n/hy/impress.po
new file mode 100644
index 0000000000..78bcd125e1
--- /dev/null
+++ b/l10n/hy/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hy\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/hy/settings.po b/l10n/hy/settings.po
index 13b4e16635..ed0acf7276 100644
--- a/l10n/hy/settings.po
+++ b/l10n/hy/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-18 02:01+0200\n"
-"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
@@ -86,10 +86,46 @@ msgid "use systems cron service"
 msgstr ""
 
 #: templates/admin.php:39
-msgid "Log"
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
 msgstr ""
 
 #: templates/admin.php:67
+msgid "Log"
+msgstr ""
+
+#: templates/admin.php:95
 msgid "More"
 msgstr ""
 
diff --git a/l10n/hy/user_ldap.po b/l10n/hy/user_ldap.po
index 78202c352c..438a2108b7 100644
--- a/l10n/hy/user_ldap.po
+++ b/l10n/hy/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -159,6 +159,12 @@ msgstr ""
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr ""
diff --git a/l10n/ia/core.po b/l10n/ia/core.po
index bd15bf5a90..3a3a12b570 100644
--- a/l10n/ia/core.po
+++ b/l10n/ia/core.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -34,55 +34,55 @@ msgstr "Iste categoria jam existe:"
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "Configurationes"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "January"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "February"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "March"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "April"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "May"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "June"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "July"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "August"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "September"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "October"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "November"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "December"
 msgstr ""
 
@@ -130,7 +130,7 @@ msgstr "Requestate"
 msgid "Login failed!"
 msgstr "Initio de session fallite!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "Nomine de usator"
@@ -191,48 +191,52 @@ msgstr "Modificar categorias"
 msgid "Add"
 msgstr "Adder"
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr "Crear un <strong>conto de administration</strong>"
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "Contrasigno"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr "Avantiate"
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "Dossier de datos"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "Configurar le base de datos"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "essera usate"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "Usator de base de datos"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "Contrasigno de base de datos"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "Nomine de base de datos"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "Hospite de base de datos"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr ""
 
diff --git a/l10n/ia/files_odfviewer.po b/l10n/ia/files_odfviewer.po
new file mode 100644
index 0000000000..566f1c5b67
--- /dev/null
+++ b/l10n/ia/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ia\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/ia/files_pdfviewer.po b/l10n/ia/files_pdfviewer.po
new file mode 100644
index 0000000000..46c46d9c81
--- /dev/null
+++ b/l10n/ia/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ia\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/ia/files_sharing.po b/l10n/ia/files_sharing.po
index 55cfbbcf2e..133cd80127 100644
--- a/l10n/ia/files_sharing.po
+++ b/l10n/ia/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -17,18 +17,10 @@ msgstr ""
 "Language: ia\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: templates/get.php:4
-msgid "Size"
+#: templates/authenticate.php:4
+msgid "Password"
 msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete"
+#: templates/authenticate.php:6
+msgid "Submit"
 msgstr ""
diff --git a/l10n/ia/files_texteditor.po b/l10n/ia/files_texteditor.po
new file mode 100644
index 0000000000..a7f1af6506
--- /dev/null
+++ b/l10n/ia/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ia\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/ia/impress.po b/l10n/ia/impress.po
new file mode 100644
index 0000000000..0f36f5ce30
--- /dev/null
+++ b/l10n/ia/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ia\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/ia/settings.po b/l10n/ia/settings.po
index fe56aae5b9..c6db8d713a 100644
--- a/l10n/ia/settings.po
+++ b/l10n/ia/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-18 02:01+0200\n"
-"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -88,10 +88,46 @@ msgid "use systems cron service"
 msgstr ""
 
 #: templates/admin.php:39
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:67
 msgid "Log"
 msgstr "Registro"
 
-#: templates/admin.php:67
+#: templates/admin.php:95
 msgid "More"
 msgstr "Plus"
 
diff --git a/l10n/ia/user_ldap.po b/l10n/ia/user_ldap.po
index f5bb1888f4..73b531764a 100644
--- a/l10n/ia/user_ldap.po
+++ b/l10n/ia/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -159,6 +159,12 @@ msgstr ""
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr ""
diff --git a/l10n/id/core.po b/l10n/id/core.po
index 6245505a80..ab4b378672 100644
--- a/l10n/id/core.po
+++ b/l10n/id/core.po
@@ -3,15 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Muhammad Fauzan <yosanpro@gmail.com>, 2012.
 # Muhammad Panji <sumodirjo@gmail.com>, 2012.
 # Muhammad Radifar <m_radifar05@yahoo.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -35,77 +36,77 @@ msgstr "Kategori ini sudah ada:"
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "Setelan"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "January"
-msgstr ""
+msgstr "Januari"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "February"
-msgstr ""
+msgstr "Februari"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "March"
-msgstr ""
+msgstr "Maret"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "April"
-msgstr ""
+msgstr "April"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "May"
-msgstr ""
+msgstr "Mei"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "June"
-msgstr ""
+msgstr "Juni"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "July"
-msgstr ""
+msgstr "Juli"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "August"
-msgstr ""
+msgstr "Agustus"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "September"
-msgstr ""
+msgstr "September"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "October"
-msgstr ""
+msgstr "Oktober"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "November"
-msgstr ""
+msgstr "Nopember"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "December"
-msgstr ""
+msgstr "Desember"
 
 #: js/oc-dialogs.js:143 js/oc-dialogs.js:163
 msgid "Cancel"
-msgstr ""
+msgstr "Batalkan"
 
 #: js/oc-dialogs.js:159
 msgid "No"
-msgstr ""
+msgstr "Tidak"
 
 #: js/oc-dialogs.js:160
 msgid "Yes"
-msgstr ""
+msgstr "Ya"
 
 #: js/oc-dialogs.js:177
 msgid "Ok"
-msgstr ""
+msgstr "Oke"
 
 #: js/oc-vcategories.js:68
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "Tidak ada kategori terpilih untuk penghapusan."
 
 #: js/oc-vcategories.js:68
 msgid "Error"
@@ -131,7 +132,7 @@ msgstr "Telah diminta"
 msgid "Login failed!"
 msgstr "Login gagal!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "Username"
@@ -192,48 +193,52 @@ msgstr "Edit kategori"
 msgid "Add"
 msgstr "Tambahkan"
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr "Buat sebuah <strong>akun admin</strong>"
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "Password"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr "Tingkat Lanjut"
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "Folder data"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "Konfigurasi database"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "akan digunakan"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "Pengguna database"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "Password database"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "Nama database"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "Host database"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "Selesaikan instalasi"
 
diff --git a/l10n/id/files.po b/l10n/id/files.po
index 3a96e71072..4531640248 100644
--- a/l10n/id/files.po
+++ b/l10n/id/files.po
@@ -3,15 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Muhammad Fauzan <yosanpro@gmail.com>, 2012.
 # Muhammad Panji <sumodirjo@gmail.com>, 2012.
 # Muhammad Radifar <m_radifar05@yahoo.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-28 12:13+0000\n"
+"Last-Translator: Muhammad Fauzan <yosanpro@gmail.com>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,13 +26,13 @@ msgstr "Tidak ada galat, berkas sukses diunggah"
 
 #: ajax/upload.php:21
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
-msgstr ""
+msgstr "File yang diunggah melampaui directive upload_max_filesize di php.ini"
 
 #: ajax/upload.php:22
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr ""
+msgstr "File yang diunggah melampaui directive MAX_FILE_SIZE yang disebutan dalam form HTML."
 
 #: ajax/upload.php:23
 msgid "The uploaded file was only partially uploaded"
@@ -53,61 +54,61 @@ msgstr "Gagal menulis ke disk"
 msgid "Files"
 msgstr "Berkas"
 
-#: js/fileactions.js:107 templates/index.php:56
+#: js/fileactions.js:111 templates/index.php:56
 msgid "Delete"
 msgstr "Hapus"
 
 #: js/filelist.js:141
 msgid "already exists"
-msgstr ""
+msgstr "sudah ada"
 
 #: js/filelist.js:141
 msgid "replace"
-msgstr ""
+msgstr "mengganti"
 
 #: js/filelist.js:141
 msgid "cancel"
-msgstr ""
+msgstr "batalkan"
 
 #: js/filelist.js:195
 msgid "replaced"
-msgstr ""
+msgstr "diganti"
 
 #: js/filelist.js:195
 msgid "with"
-msgstr ""
+msgstr "dengan"
 
 #: js/filelist.js:195 js/filelist.js:246
 msgid "undo"
-msgstr ""
+msgstr "batal dikerjakan"
 
 #: js/filelist.js:246
 msgid "deleted"
-msgstr ""
+msgstr "dihapus"
 
 #: js/files.js:171
 msgid "generating ZIP-file, it may take some time."
-msgstr ""
+msgstr "membuat berkas ZIP, ini mungkin memakan waktu."
 
 #: js/files.js:200
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr ""
+msgstr "Gagal mengunggah berkas anda karena berupa direktori atau mempunyai ukuran 0 byte"
 
 #: js/files.js:200
 msgid "Upload Error"
-msgstr ""
+msgstr "Terjadi Galat Pengunggahan"
 
 #: js/files.js:228 js/files.js:319 js/files.js:348
 msgid "Pending"
-msgstr ""
+msgstr "Menunggu"
 
 #: js/files.js:333
 msgid "Upload cancelled."
-msgstr ""
+msgstr "Pengunggahan dibatalkan."
 
 #: js/files.js:457
 msgid "Invalid name, '/' is not allowed."
-msgstr ""
+msgstr "Kesalahan nama, '/' tidak diijinkan."
 
 #: js/files.js:703 templates/index.php:55
 msgid "Size"
@@ -119,19 +120,19 @@ msgstr "Dimodifikasi"
 
 #: js/files.js:731
 msgid "folder"
-msgstr ""
+msgstr "folder"
 
 #: js/files.js:733
 msgid "folders"
-msgstr ""
+msgstr "folder-folder"
 
 #: js/files.js:741
 msgid "file"
-msgstr ""
+msgstr "berkas"
 
 #: js/files.js:743
 msgid "files"
-msgstr ""
+msgstr "berkas-berkas"
 
 #: templates/admin.php:5
 msgid "File handling"
diff --git a/l10n/id/files_odfviewer.po b/l10n/id/files_odfviewer.po
new file mode 100644
index 0000000000..7680253aef
--- /dev/null
+++ b/l10n/id/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: id\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: js/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/id/files_pdfviewer.po b/l10n/id/files_pdfviewer.po
new file mode 100644
index 0000000000..a9fc081e18
--- /dev/null
+++ b/l10n/id/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: id\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: js/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/id/files_sharing.po b/l10n/id/files_sharing.po
index 0a4a395144..93219e0d80 100644
--- a/l10n/id/files_sharing.po
+++ b/l10n/id/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -17,18 +17,10 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: templates/get.php:4
-msgid "Size"
+#: templates/authenticate.php:4
+msgid "Password"
 msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete"
+#: templates/authenticate.php:6
+msgid "Submit"
 msgstr ""
diff --git a/l10n/id/files_texteditor.po b/l10n/id/files_texteditor.po
new file mode 100644
index 0000000000..754e507299
--- /dev/null
+++ b/l10n/id/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: id\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: js/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/id/impress.po b/l10n/id/impress.po
new file mode 100644
index 0000000000..dfec96ea44
--- /dev/null
+++ b/l10n/id/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: id\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/id/settings.po b/l10n/id/settings.po
index 8b4f28abc2..f1daf56e28 100644
--- a/l10n/id/settings.po
+++ b/l10n/id/settings.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Muhammad Fauzan <yosanpro@gmail.com>, 2012.
 # Muhammad Panji <sumodirjo@gmail.com>, 2012.
 # Muhammad Radifar <m_radifar05@yahoo.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-18 02:01+0200\n"
-"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -25,11 +26,11 @@ msgstr ""
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
-msgstr ""
+msgstr "Email tersimpan"
 
 #: ajax/lostpassword.php:16
 msgid "Invalid email"
-msgstr ""
+msgstr "Email tidak sah"
 
 #: ajax/openid.php:16
 msgid "OpenID Changed"
@@ -53,15 +54,15 @@ msgstr ""
 
 #: js/apps.js:39 js/apps.js:73
 msgid "Disable"
-msgstr ""
+msgstr "NonAktifkan"
 
 #: js/apps.js:39 js/apps.js:62
 msgid "Enable"
-msgstr ""
+msgstr "Aktifkan"
 
 #: js/personal.js:69
 msgid "Saving..."
-msgstr ""
+msgstr "Menyimpan..."
 
 #: personal.php:46 personal.php:47
 msgid "__language_name__"
@@ -69,7 +70,7 @@ msgstr "__language_name__"
 
 #: templates/admin.php:14
 msgid "Security Warning"
-msgstr ""
+msgstr "Peringatan Keamanan"
 
 #: templates/admin.php:29
 msgid "Cron"
@@ -88,10 +89,46 @@ msgid "use systems cron service"
 msgstr ""
 
 #: templates/admin.php:39
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:67
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:67
+#: templates/admin.php:95
 msgid "More"
 msgstr "Lebih"
 
@@ -105,7 +142,7 @@ msgstr "Pilih satu aplikasi"
 
 #: templates/apps.php:29
 msgid "See application page at apps.owncloud.com"
-msgstr ""
+msgstr "Lihat halaman aplikasi di apps.owncloud.com"
 
 #: templates/apps.php:30
 msgid "-licensed"
@@ -229,7 +266,7 @@ msgstr "Lain-lain"
 
 #: templates/users.php:80 templates/users.php:112
 msgid "Group Admin"
-msgstr ""
+msgstr "Admin Grup"
 
 #: templates/users.php:82
 msgid "Quota"
diff --git a/l10n/id/user_ldap.po b/l10n/id/user_ldap.po
index 528094a8b2..5d7f42dc6a 100644
--- a/l10n/id/user_ldap.po
+++ b/l10n/id/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -159,6 +159,12 @@ msgstr ""
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr ""
diff --git a/l10n/id_ID/core.po b/l10n/id_ID/core.po
index 0d43d3618c..faade1ace9 100644
--- a/l10n/id_ID/core.po
+++ b/l10n/id_ID/core.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Indonesian (Indonesia) (http://www.transifex.com/projects/p/owncloud/language/id_ID/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -33,55 +33,55 @@ msgstr ""
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "January"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "February"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "March"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "April"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "May"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "June"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "July"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "August"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "September"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "October"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "November"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "December"
 msgstr ""
 
@@ -129,7 +129,7 @@ msgstr ""
 msgid "Login failed!"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr ""
@@ -190,48 +190,52 @@ msgstr ""
 msgid "Add"
 msgstr ""
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr ""
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr ""
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr ""
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr ""
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr ""
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr ""
 
diff --git a/l10n/id_ID/files_odfviewer.po b/l10n/id_ID/files_odfviewer.po
new file mode 100644
index 0000000000..0f3cc53112
--- /dev/null
+++ b/l10n/id_ID/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Indonesian (Indonesia) (http://www.transifex.com/projects/p/owncloud/language/id_ID/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: id_ID\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: js/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/id_ID/files_pdfviewer.po b/l10n/id_ID/files_pdfviewer.po
new file mode 100644
index 0000000000..395dc8b4c1
--- /dev/null
+++ b/l10n/id_ID/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Indonesian (Indonesia) (http://www.transifex.com/projects/p/owncloud/language/id_ID/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: id_ID\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: js/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/id_ID/files_sharing.po b/l10n/id_ID/files_sharing.po
index fdba039609..b1ac99e2e6 100644
--- a/l10n/id_ID/files_sharing.po
+++ b/l10n/id_ID/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Indonesian (Indonesia) (http://www.transifex.com/projects/p/owncloud/language/id_ID/)\n"
 "MIME-Version: 1.0\n"
@@ -17,18 +17,10 @@ msgstr ""
 "Language: id_ID\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: templates/get.php:4
-msgid "Size"
+#: templates/authenticate.php:4
+msgid "Password"
 msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete"
+#: templates/authenticate.php:6
+msgid "Submit"
 msgstr ""
diff --git a/l10n/id_ID/files_texteditor.po b/l10n/id_ID/files_texteditor.po
new file mode 100644
index 0000000000..a94adcdcf3
--- /dev/null
+++ b/l10n/id_ID/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Indonesian (Indonesia) (http://www.transifex.com/projects/p/owncloud/language/id_ID/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: id_ID\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: js/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/id_ID/impress.po b/l10n/id_ID/impress.po
new file mode 100644
index 0000000000..d5c0259772
--- /dev/null
+++ b/l10n/id_ID/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Indonesian (Indonesia) (http://www.transifex.com/projects/p/owncloud/language/id_ID/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: id_ID\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/id_ID/settings.po b/l10n/id_ID/settings.po
index e6873fc49b..68045a2740 100644
--- a/l10n/id_ID/settings.po
+++ b/l10n/id_ID/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-18 02:01+0200\n"
-"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Indonesian (Indonesia) (http://www.transifex.com/projects/p/owncloud/language/id_ID/)\n"
 "MIME-Version: 1.0\n"
@@ -86,10 +86,46 @@ msgid "use systems cron service"
 msgstr ""
 
 #: templates/admin.php:39
-msgid "Log"
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
 msgstr ""
 
 #: templates/admin.php:67
+msgid "Log"
+msgstr ""
+
+#: templates/admin.php:95
 msgid "More"
 msgstr ""
 
diff --git a/l10n/id_ID/user_ldap.po b/l10n/id_ID/user_ldap.po
index eb078008f5..52cb5aac1a 100644
--- a/l10n/id_ID/user_ldap.po
+++ b/l10n/id_ID/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Indonesian (Indonesia) (http://www.transifex.com/projects/p/owncloud/language/id_ID/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -159,6 +159,12 @@ msgstr ""
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr ""
diff --git a/l10n/it/core.po b/l10n/it/core.po
index 95cfeb14f4..146f6faa71 100644
--- a/l10n/it/core.po
+++ b/l10n/it/core.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -38,55 +38,55 @@ msgstr "Questa categoria esiste già: "
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 
-#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "Impostazioni"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "January"
 msgstr "Gennaio"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "February"
 msgstr "Febbraio"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "March"
 msgstr "Marzo"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "April"
 msgstr "Aprile"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "May"
 msgstr "Maggio"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "June"
 msgstr "Giugno"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "July"
 msgstr "Luglio"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "August"
 msgstr "Agosto"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "September"
 msgstr "Settembre"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "October"
 msgstr "Ottobre"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "November"
 msgstr "Novembre"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "December"
 msgstr "Dicembre"
 
@@ -134,7 +134,7 @@ msgstr "Richiesto"
 msgid "Login failed!"
 msgstr "Accesso non riuscito!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "Nome utente"
@@ -185,7 +185,7 @@ msgstr "Accesso negato"
 
 #: templates/404.php:12
 msgid "Cloud not found"
-msgstr "Cloud non trovata"
+msgstr "Nuvola non trovata"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
@@ -195,48 +195,52 @@ msgstr "Modifica le categorie"
 msgid "Add"
 msgstr "Aggiungi"
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr "Crea un <strong>account amministratore</strong>"
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "Password"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr "Avanzate"
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "Cartella dati"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "Configura il database"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
-msgstr "sarà usato"
+msgstr "sarà utilizzato"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "Utente del database"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "Password del database"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "Nome del database"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "Host del database"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "Termina la configurazione"
 
diff --git a/l10n/it/files_odfviewer.po b/l10n/it/files_odfviewer.po
new file mode 100644
index 0000000000..0fae9bc23f
--- /dev/null
+++ b/l10n/it/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: it\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/it/files_pdfviewer.po b/l10n/it/files_pdfviewer.po
new file mode 100644
index 0000000000..3f4595ffe2
--- /dev/null
+++ b/l10n/it/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: it\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/it/files_sharing.po b/l10n/it/files_sharing.po
index 94313868ad..e4afbded98 100644
--- a/l10n/it/files_sharing.po
+++ b/l10n/it/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -18,18 +18,10 @@ msgstr ""
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: templates/get.php:4
-msgid "Size"
-msgstr "Dimensione"
+#: templates/authenticate.php:4
+msgid "Password"
+msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr "Modificato"
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr "Elimina tutto"
-
-#: templates/get.php:5
-msgid "Delete"
-msgstr "Eliminazione"
+#: templates/authenticate.php:6
+msgid "Submit"
+msgstr ""
diff --git a/l10n/it/files_texteditor.po b/l10n/it/files_texteditor.po
new file mode 100644
index 0000000000..747a70244c
--- /dev/null
+++ b/l10n/it/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: it\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/it/impress.po b/l10n/it/impress.po
new file mode 100644
index 0000000000..31e6171b4d
--- /dev/null
+++ b/l10n/it/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: it\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/it/settings.po b/l10n/it/settings.po
index b14c9fcd47..5e3956fdfd 100644
--- a/l10n/it/settings.po
+++ b/l10n/it/settings.po
@@ -14,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-22 20:01+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -93,10 +93,46 @@ msgid "use systems cron service"
 msgstr "usa il servizio cron di sistema"
 
 #: templates/admin.php:39
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:67
 msgid "Log"
 msgstr "Registro"
 
-#: templates/admin.php:67
+#: templates/admin.php:95
 msgid "More"
 msgstr "Altro"
 
diff --git a/l10n/it/user_ldap.po b/l10n/it/user_ldap.po
index e99e56fc15..ea2ef09865 100644
--- a/l10n/it/user_ldap.po
+++ b/l10n/it/user_ldap.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-22 20:31+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -161,6 +161,12 @@ msgstr "in byte"
 msgid "in seconds. A change empties the cache."
 msgstr "in secondi. Il cambio svuota la cache."
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr "Aiuto"
diff --git a/l10n/ja_JP/core.po b/l10n/ja_JP/core.po
index 18c7f43a64..85eff9b29f 100644
--- a/l10n/ja_JP/core.po
+++ b/l10n/ja_JP/core.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>, 2012.
+#   <tetuyano+transi@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -34,55 +35,55 @@ msgstr "このカテゴリはすでに存在します: "
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 
-#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "設定"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "January"
 msgstr "1月"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "February"
 msgstr "2月"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "March"
 msgstr "3月"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "April"
 msgstr "4月"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "May"
 msgstr "5月"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "June"
 msgstr "6月"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "July"
 msgstr "7月"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "August"
 msgstr "8月"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "September"
 msgstr "9月"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "October"
 msgstr "10月"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "November"
 msgstr "11月"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "December"
 msgstr "12月"
 
@@ -130,7 +131,7 @@ msgstr "送信されました"
 msgid "Login failed!"
 msgstr "ログインに失敗しました！"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "ユーザ名"
@@ -191,48 +192,52 @@ msgstr "カテゴリを編集"
 msgid "Add"
 msgstr "追加"
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr "<strong>管理者アカウント</strong>を作成してください"
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "パスワード"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr "詳細設定"
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "データフォルダ"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "データベースを設定してください"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "が使用されます"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "データベースのユーザ名"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "データベースのパスワード"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "データベース名"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "データベースのホスト名"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "セットアップを完了します"
 
diff --git a/l10n/ja_JP/files_odfviewer.po b/l10n/ja_JP/files_odfviewer.po
new file mode 100644
index 0000000000..75c2c65bbf
--- /dev/null
+++ b/l10n/ja_JP/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ja_JP\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: js/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/ja_JP/files_pdfviewer.po b/l10n/ja_JP/files_pdfviewer.po
new file mode 100644
index 0000000000..910d096359
--- /dev/null
+++ b/l10n/ja_JP/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ja_JP\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: js/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/ja_JP/files_sharing.po b/l10n/ja_JP/files_sharing.po
index b76508218b..04cd99c2f3 100644
--- a/l10n/ja_JP/files_sharing.po
+++ b/l10n/ja_JP/files_sharing.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
@@ -19,18 +19,10 @@ msgstr ""
 "Language: ja_JP\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: templates/get.php:4
-msgid "Size"
-msgstr "サイズ"
+#: templates/authenticate.php:4
+msgid "Password"
+msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr "変更"
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr "すべて削除"
-
-#: templates/get.php:5
-msgid "Delete"
-msgstr "削除"
+#: templates/authenticate.php:6
+msgid "Submit"
+msgstr ""
diff --git a/l10n/ja_JP/files_texteditor.po b/l10n/ja_JP/files_texteditor.po
new file mode 100644
index 0000000000..ab61c0af52
--- /dev/null
+++ b/l10n/ja_JP/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ja_JP\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: js/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/ja_JP/impress.po b/l10n/ja_JP/impress.po
new file mode 100644
index 0000000000..360c0eca04
--- /dev/null
+++ b/l10n/ja_JP/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ja_JP\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/ja_JP/settings.po b/l10n/ja_JP/settings.po
index d269151c24..18f0f4733d 100644
--- a/l10n/ja_JP/settings.po
+++ b/l10n/ja_JP/settings.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-20 01:31+0000\n"
-"Last-Translator: Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -88,10 +88,46 @@ msgid "use systems cron service"
 msgstr "システムのcronサービスを使用"
 
 #: templates/admin.php:39
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:67
 msgid "Log"
 msgstr "ログ"
 
-#: templates/admin.php:67
+#: templates/admin.php:95
 msgid "More"
 msgstr "もっと"
 
diff --git a/l10n/ja_JP/user_ldap.po b/l10n/ja_JP/user_ldap.po
index 5c22b913b4..9b43e88d47 100644
--- a/l10n/ja_JP/user_ldap.po
+++ b/l10n/ja_JP/user_ldap.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-17 00:44+0200\n"
-"PO-Revision-Date: 2012-08-16 05:33+0000\n"
-"Last-Translator: Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -161,6 +161,12 @@ msgstr "バイト"
 msgid "in seconds. A change empties the cache."
 msgstr "秒。変更後にキャッシュがクリアされます。"
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr "ヘルプ"
diff --git a/l10n/ko/core.po b/l10n/ko/core.po
index aaed23a766..5ad977ca6b 100644
--- a/l10n/ko/core.po
+++ b/l10n/ko/core.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -35,55 +35,55 @@ msgstr "이 카테고리는 이미 존재합니다:"
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 
-#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "설정"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "January"
 msgstr "1월"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "February"
 msgstr "2월"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "March"
 msgstr "3월"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "April"
 msgstr "4월"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "May"
 msgstr "5월"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "June"
 msgstr "6월"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "July"
 msgstr "7월"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "August"
 msgstr "8월"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "September"
 msgstr "9월"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "October"
 msgstr "10월"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "November"
 msgstr "11월"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "December"
 msgstr "12월"
 
@@ -131,7 +131,7 @@ msgstr "요청함"
 msgid "Login failed!"
 msgstr "로그인 실패!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "사용자 이름"
@@ -192,48 +192,52 @@ msgstr "카테고리 편집"
 msgid "Add"
 msgstr "추가"
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr "<strong>관리자 계정</strong>을 만드십시오"
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "암호"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr "고급"
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "자료 폴더"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "데이터베이스 구성"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "사용 될 것임"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "데이터베이스 사용자"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "데이터베이스 암호"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "데이터베이스 이름"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "데이터베이스 호스트"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "설치 완료"
 
diff --git a/l10n/ko/files_odfviewer.po b/l10n/ko/files_odfviewer.po
new file mode 100644
index 0000000000..2be8c176ae
--- /dev/null
+++ b/l10n/ko/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ko\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: js/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/ko/files_pdfviewer.po b/l10n/ko/files_pdfviewer.po
new file mode 100644
index 0000000000..a29b407be8
--- /dev/null
+++ b/l10n/ko/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ko\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: js/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/ko/files_sharing.po b/l10n/ko/files_sharing.po
index 970803e48a..b8e11e75ee 100644
--- a/l10n/ko/files_sharing.po
+++ b/l10n/ko/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -17,18 +17,10 @@ msgstr ""
 "Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: templates/get.php:4
-msgid "Size"
+#: templates/authenticate.php:4
+msgid "Password"
 msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete"
+#: templates/authenticate.php:6
+msgid "Submit"
 msgstr ""
diff --git a/l10n/ko/files_texteditor.po b/l10n/ko/files_texteditor.po
new file mode 100644
index 0000000000..6beeb686b9
--- /dev/null
+++ b/l10n/ko/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ko\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: js/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/ko/impress.po b/l10n/ko/impress.po
new file mode 100644
index 0000000000..c7be0756da
--- /dev/null
+++ b/l10n/ko/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ko\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/ko/settings.po b/l10n/ko/settings.po
index a4bfa5daca..fd12d48d5e 100644
--- a/l10n/ko/settings.po
+++ b/l10n/ko/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-18 02:01+0200\n"
-"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -88,10 +88,46 @@ msgid "use systems cron service"
 msgstr ""
 
 #: templates/admin.php:39
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:67
 msgid "Log"
 msgstr "로그"
 
-#: templates/admin.php:67
+#: templates/admin.php:95
 msgid "More"
 msgstr "더"
 
diff --git a/l10n/ko/user_ldap.po b/l10n/ko/user_ldap.po
index 0cc01bfddf..cf6aa7842d 100644
--- a/l10n/ko/user_ldap.po
+++ b/l10n/ko/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -159,6 +159,12 @@ msgstr ""
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr ""
diff --git a/l10n/lb/core.po b/l10n/lb/core.po
index 992723898f..5a89733611 100644
--- a/l10n/lb/core.po
+++ b/l10n/lb/core.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -34,55 +34,55 @@ msgstr "Des Kategorie existéiert schonn:"
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "Astellungen"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "January"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "February"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "March"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "April"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "May"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "June"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "July"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "August"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "September"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "October"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "November"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "December"
 msgstr ""
 
@@ -130,7 +130,7 @@ msgstr "Gefrot"
 msgid "Login failed!"
 msgstr "Falschen Login!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "Benotzernumm"
@@ -191,48 +191,52 @@ msgstr "Kategorien editéieren"
 msgid "Add"
 msgstr "Bäisetzen"
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr "En <strong>Admin Account</strong> uleeën"
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "Passwuert"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr "Erweidert"
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "Daten Dossier"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "Datebank konfiguréieren"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "wärt benotzt ginn"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "Datebank Benotzer"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "Datebank Passwuert"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "Datebank Numm"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "Datebank Server"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "Installatioun ofschléissen"
 
diff --git a/l10n/lb/files_odfviewer.po b/l10n/lb/files_odfviewer.po
new file mode 100644
index 0000000000..1ce99cf81a
--- /dev/null
+++ b/l10n/lb/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lb\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/lb/files_pdfviewer.po b/l10n/lb/files_pdfviewer.po
new file mode 100644
index 0000000000..a7665ab24e
--- /dev/null
+++ b/l10n/lb/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lb\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/lb/files_sharing.po b/l10n/lb/files_sharing.po
index ca81053d9a..955cca498b 100644
--- a/l10n/lb/files_sharing.po
+++ b/l10n/lb/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -17,18 +17,10 @@ msgstr ""
 "Language: lb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: templates/get.php:4
-msgid "Size"
+#: templates/authenticate.php:4
+msgid "Password"
 msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete"
+#: templates/authenticate.php:6
+msgid "Submit"
 msgstr ""
diff --git a/l10n/lb/files_texteditor.po b/l10n/lb/files_texteditor.po
new file mode 100644
index 0000000000..abffc55df0
--- /dev/null
+++ b/l10n/lb/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lb\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/lb/impress.po b/l10n/lb/impress.po
new file mode 100644
index 0000000000..a03f893b0f
--- /dev/null
+++ b/l10n/lb/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lb\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/lb/settings.po b/l10n/lb/settings.po
index 6b1e939e53..696998daa2 100644
--- a/l10n/lb/settings.po
+++ b/l10n/lb/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-18 02:01+0200\n"
-"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -87,10 +87,46 @@ msgid "use systems cron service"
 msgstr ""
 
 #: templates/admin.php:39
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:67
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:67
+#: templates/admin.php:95
 msgid "More"
 msgstr "Méi"
 
diff --git a/l10n/lb/user_ldap.po b/l10n/lb/user_ldap.po
index 75252b76c9..ea1a1452c6 100644
--- a/l10n/lb/user_ldap.po
+++ b/l10n/lb/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -159,6 +159,12 @@ msgstr ""
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr ""
diff --git a/l10n/lt_LT/core.po b/l10n/lt_LT/core.po
index 60b338d51c..36a98b4d70 100644
--- a/l10n/lt_LT/core.po
+++ b/l10n/lt_LT/core.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -34,55 +34,55 @@ msgstr "Tokia kategorija jau yra:"
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 
-#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "Nustatymai"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "January"
 msgstr "Sausis"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "February"
 msgstr "Vasaris"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "March"
 msgstr "Kovas"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "April"
 msgstr "Balandis"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "May"
 msgstr "Gegužė"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "June"
 msgstr "Birželis"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "July"
 msgstr "Liepa"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "August"
 msgstr "Rugpjūtis"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "September"
 msgstr "Rugsėjis"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "October"
 msgstr "Spalis"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "November"
 msgstr "Lapkritis"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "December"
 msgstr "Gruodis"
 
@@ -130,7 +130,7 @@ msgstr "Užklausta"
 msgid "Login failed!"
 msgstr "Prisijungti nepavyko!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "Prisijungimo vardas"
@@ -191,48 +191,52 @@ msgstr "Redaguoti kategorijas"
 msgid "Add"
 msgstr "Pridėti"
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr "Sukurti <strong>administratoriaus paskyrą</strong>"
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "Slaptažodis"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr "Išplėstiniai"
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "Duomenų katalogas"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "Nustatyti duomenų bazę"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "bus naudojama"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "Duomenų bazės vartotojas"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "Duomenų bazės slaptažodis"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "Duomenų bazės pavadinimas"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "Duomenų bazės serveris"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "Baigti diegimą"
 
diff --git a/l10n/lt_LT/files_odfviewer.po b/l10n/lt_LT/files_odfviewer.po
new file mode 100644
index 0000000000..9fdcfb4a0c
--- /dev/null
+++ b/l10n/lt_LT/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lt_LT\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: js/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/lt_LT/files_pdfviewer.po b/l10n/lt_LT/files_pdfviewer.po
new file mode 100644
index 0000000000..e224f4ccb5
--- /dev/null
+++ b/l10n/lt_LT/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lt_LT\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: js/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/lt_LT/files_sharing.po b/l10n/lt_LT/files_sharing.po
index d1693bb806..342d109109 100644
--- a/l10n/lt_LT/files_sharing.po
+++ b/l10n/lt_LT/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -18,18 +18,10 @@ msgstr ""
 "Language: lt_LT\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: templates/get.php:4
-msgid "Size"
-msgstr "Dydis"
+#: templates/authenticate.php:4
+msgid "Password"
+msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr "Pakeista"
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr "Ištrinti viską"
-
-#: templates/get.php:5
-msgid "Delete"
-msgstr "Ištrinti"
+#: templates/authenticate.php:6
+msgid "Submit"
+msgstr ""
diff --git a/l10n/lt_LT/files_texteditor.po b/l10n/lt_LT/files_texteditor.po
new file mode 100644
index 0000000000..bd2a8dbff1
--- /dev/null
+++ b/l10n/lt_LT/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lt_LT\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: js/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/lt_LT/impress.po b/l10n/lt_LT/impress.po
new file mode 100644
index 0000000000..8aaf1712b0
--- /dev/null
+++ b/l10n/lt_LT/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lt_LT\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: templates/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/lt_LT/settings.po b/l10n/lt_LT/settings.po
index 8b8a184019..9ba5a73caf 100644
--- a/l10n/lt_LT/settings.po
+++ b/l10n/lt_LT/settings.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-24 02:02+0200\n"
-"PO-Revision-Date: 2012-08-23 07:15+0000\n"
-"Last-Translator: Dr. ROX <to.dr.rox@gmail.com>\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -87,10 +87,46 @@ msgid "use systems cron service"
 msgstr "naudoti sistemos cron servisą"
 
 #: templates/admin.php:39
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:67
 msgid "Log"
 msgstr "Žurnalas"
 
-#: templates/admin.php:67
+#: templates/admin.php:95
 msgid "More"
 msgstr "Daugiau"
 
diff --git a/l10n/lt_LT/user_ldap.po b/l10n/lt_LT/user_ldap.po
index d648d9ba0c..7e15e309ec 100644
--- a/l10n/lt_LT/user_ldap.po
+++ b/l10n/lt_LT/user_ldap.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-22 13:55+0000\n"
-"Last-Translator: Dr. ROX <to.dr.rox@gmail.com>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -160,6 +160,12 @@ msgstr ""
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr "Pagalba"
diff --git a/l10n/lv/core.po b/l10n/lv/core.po
index a9c0fffbec..09e8d451f5 100644
--- a/l10n/lv/core.po
+++ b/l10n/lv/core.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -34,55 +34,55 @@ msgstr ""
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "Iestatījumi"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "January"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "February"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "March"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "April"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "May"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "June"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "July"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "August"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "September"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "October"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "November"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "December"
 msgstr ""
 
@@ -130,7 +130,7 @@ msgstr "Obligāts"
 msgid "Login failed!"
 msgstr "Neizdevās ielogoties."
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "Lietotājvārds"
@@ -191,48 +191,52 @@ msgstr ""
 msgid "Add"
 msgstr ""
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "Parole"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr ""
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "Datu mape"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "Nokonfigurēt datubāzi"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "tiks izmantots"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "Datubāzes lietotājs"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "Datubāzes parole"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "Datubāzes nosaukums"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "Datubāzes mājvieta"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "Pabeigt uzstādījumus"
 
diff --git a/l10n/lv/files_odfviewer.po b/l10n/lv/files_odfviewer.po
new file mode 100644
index 0000000000..ef357e02f1
--- /dev/null
+++ b/l10n/lv/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lv\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2)\n"
+
+#: js/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/lv/files_pdfviewer.po b/l10n/lv/files_pdfviewer.po
new file mode 100644
index 0000000000..06441aecda
--- /dev/null
+++ b/l10n/lv/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lv\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2)\n"
+
+#: js/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/lv/files_sharing.po b/l10n/lv/files_sharing.po
index 4d7325ca83..4f8c4e36f3 100644
--- a/l10n/lv/files_sharing.po
+++ b/l10n/lv/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -17,18 +17,10 @@ msgstr ""
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2)\n"
 
-#: templates/get.php:4
-msgid "Size"
+#: templates/authenticate.php:4
+msgid "Password"
 msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete"
+#: templates/authenticate.php:6
+msgid "Submit"
 msgstr ""
diff --git a/l10n/lv/files_texteditor.po b/l10n/lv/files_texteditor.po
new file mode 100644
index 0000000000..e0c9f67550
--- /dev/null
+++ b/l10n/lv/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lv\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2)\n"
+
+#: js/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/lv/impress.po b/l10n/lv/impress.po
new file mode 100644
index 0000000000..1685472a3e
--- /dev/null
+++ b/l10n/lv/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lv\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2)\n"
+
+#: templates/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/lv/settings.po b/l10n/lv/settings.po
index 725d953126..369af99b7f 100644
--- a/l10n/lv/settings.po
+++ b/l10n/lv/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-18 02:01+0200\n"
-"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -20,7 +20,7 @@ msgstr ""
 
 #: ajax/apps/ocs.php:23
 msgid "Unable to load list from App Store"
-msgstr ""
+msgstr "Nebija iespējams lejuplādēt sarakstu no aplikāciju veikala"
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
@@ -40,7 +40,7 @@ msgstr "Nepareizs vaicājums"
 
 #: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
 msgid "Authentication error"
-msgstr ""
+msgstr "Ielogošanās kļūme"
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
@@ -48,7 +48,7 @@ msgstr "Valoda tika nomainīta"
 
 #: js/apps.js:18
 msgid "Error"
-msgstr ""
+msgstr "Kļūme"
 
 #: js/apps.js:39 js/apps.js:73
 msgid "Disable"
@@ -72,7 +72,7 @@ msgstr "Brīdinājums par drošību"
 
 #: templates/admin.php:29
 msgid "Cron"
-msgstr ""
+msgstr "Cron"
 
 #: templates/admin.php:31
 msgid "execute one task with each page loaded"
@@ -87,10 +87,46 @@ msgid "use systems cron service"
 msgstr ""
 
 #: templates/admin.php:39
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:67
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:67
+#: templates/admin.php:95
 msgid "More"
 msgstr "Vairāk"
 
@@ -228,7 +264,7 @@ msgstr "Cits"
 
 #: templates/users.php:80 templates/users.php:112
 msgid "Group Admin"
-msgstr ""
+msgstr "Grupas administrators"
 
 #: templates/users.php:82
 msgid "Quota"
diff --git a/l10n/lv/user_ldap.po b/l10n/lv/user_ldap.po
index 3596376f70..2ec176f928 100644
--- a/l10n/lv/user_ldap.po
+++ b/l10n/lv/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -159,6 +159,12 @@ msgstr ""
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr ""
diff --git a/l10n/mk/core.po b/l10n/mk/core.po
index 845e2aa68c..89a9f2435d 100644
--- a/l10n/mk/core.po
+++ b/l10n/mk/core.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -36,55 +36,55 @@ msgstr "Оваа категорија веќе постои:"
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 
-#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "Поставки"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "January"
 msgstr "Јануари"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "February"
 msgstr "Февруари"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "March"
 msgstr "Март"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "April"
 msgstr "Април"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "May"
 msgstr "Мај"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "June"
 msgstr "Јуни"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "July"
 msgstr "Јули"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "August"
 msgstr "Август"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "September"
 msgstr "Септември"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "October"
 msgstr "Октомври"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "November"
 msgstr "Ноември"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "December"
 msgstr "Декември"
 
@@ -132,7 +132,7 @@ msgstr "Побарано"
 msgid "Login failed!"
 msgstr "Најавата не успеа!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "Корисничко име"
@@ -193,48 +193,52 @@ msgstr "Уреди категории"
 msgid "Add"
 msgstr "Додади"
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr "Направете <strong>администраторска сметка</strong>"
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "Лозинка"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr "Напредно"
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "Фолдер со податоци"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "Конфигурирај ја базата"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "ќе биде користено"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "Корисник на база"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "Лозинка на база"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "Име на база"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "Сервер со база"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "Заврши го подесувањето"
 
diff --git a/l10n/mk/files_odfviewer.po b/l10n/mk/files_odfviewer.po
new file mode 100644
index 0000000000..77205c755f
--- /dev/null
+++ b/l10n/mk/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: mk\n"
+"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1\n"
+
+#: js/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/mk/files_pdfviewer.po b/l10n/mk/files_pdfviewer.po
new file mode 100644
index 0000000000..a6cb756a0a
--- /dev/null
+++ b/l10n/mk/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: mk\n"
+"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1\n"
+
+#: js/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/mk/files_sharing.po b/l10n/mk/files_sharing.po
index eedc221287..f8507463dd 100644
--- a/l10n/mk/files_sharing.po
+++ b/l10n/mk/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -17,18 +17,10 @@ msgstr ""
 "Language: mk\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1\n"
 
-#: templates/get.php:4
-msgid "Size"
+#: templates/authenticate.php:4
+msgid "Password"
 msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete"
+#: templates/authenticate.php:6
+msgid "Submit"
 msgstr ""
diff --git a/l10n/mk/files_texteditor.po b/l10n/mk/files_texteditor.po
new file mode 100644
index 0000000000..0164432b90
--- /dev/null
+++ b/l10n/mk/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: mk\n"
+"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1\n"
+
+#: js/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/mk/impress.po b/l10n/mk/impress.po
new file mode 100644
index 0000000000..5948fc5ec3
--- /dev/null
+++ b/l10n/mk/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: mk\n"
+"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1\n"
+
+#: templates/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/mk/settings.po b/l10n/mk/settings.po
index 6fd5df90dc..793020c8ed 100644
--- a/l10n/mk/settings.po
+++ b/l10n/mk/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-18 02:01+0200\n"
-"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -88,10 +88,46 @@ msgid "use systems cron service"
 msgstr ""
 
 #: templates/admin.php:39
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:67
 msgid "Log"
 msgstr "Записник"
 
-#: templates/admin.php:67
+#: templates/admin.php:95
 msgid "More"
 msgstr "Повеќе"
 
diff --git a/l10n/mk/user_ldap.po b/l10n/mk/user_ldap.po
index bcde61dcc6..126d33adf6 100644
--- a/l10n/mk/user_ldap.po
+++ b/l10n/mk/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -159,6 +159,12 @@ msgstr ""
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr ""
diff --git a/l10n/ms_MY/core.po b/l10n/ms_MY/core.po
index 468102d63d..19af1da5eb 100644
--- a/l10n/ms_MY/core.po
+++ b/l10n/ms_MY/core.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -36,55 +36,55 @@ msgstr "Kategori ini telah wujud"
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 
-#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "Tetapan"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "January"
 msgstr "Januari"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "February"
 msgstr "Februari"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "March"
 msgstr "Mac"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "April"
 msgstr "April"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "May"
 msgstr "Mei"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "June"
 msgstr "Jun"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "July"
 msgstr "Julai"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "August"
 msgstr "Ogos"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "September"
 msgstr "September"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "October"
 msgstr "Oktober"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "November"
 msgstr "November"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "December"
 msgstr "Disember"
 
@@ -132,7 +132,7 @@ msgstr "Meminta"
 msgid "Login failed!"
 msgstr "Log masuk gagal!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "Nama pengguna"
@@ -193,48 +193,52 @@ msgstr "Edit kategori"
 msgid "Add"
 msgstr "Tambah"
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr "buat <strong>akaun admin</strong>"
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "Kata laluan"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr "Maju"
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "Fail data"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "Konfigurasi pangkalan data"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "akan digunakan"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "Nama pengguna pangkalan data"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "Kata laluan pangkalan data"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "Nama pangkalan data"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "Hos pangkalan data"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "Setup selesai"
 
diff --git a/l10n/ms_MY/files_odfviewer.po b/l10n/ms_MY/files_odfviewer.po
new file mode 100644
index 0000000000..0aa22023e5
--- /dev/null
+++ b/l10n/ms_MY/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ms_MY\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: js/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/ms_MY/files_pdfviewer.po b/l10n/ms_MY/files_pdfviewer.po
new file mode 100644
index 0000000000..b0e03a94e5
--- /dev/null
+++ b/l10n/ms_MY/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ms_MY\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: js/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/ms_MY/files_sharing.po b/l10n/ms_MY/files_sharing.po
index ced7a00ab3..1105b791e4 100644
--- a/l10n/ms_MY/files_sharing.po
+++ b/l10n/ms_MY/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -17,18 +17,10 @@ msgstr ""
 "Language: ms_MY\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: templates/get.php:4
-msgid "Size"
+#: templates/authenticate.php:4
+msgid "Password"
 msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete"
+#: templates/authenticate.php:6
+msgid "Submit"
 msgstr ""
diff --git a/l10n/ms_MY/files_texteditor.po b/l10n/ms_MY/files_texteditor.po
new file mode 100644
index 0000000000..f254925813
--- /dev/null
+++ b/l10n/ms_MY/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ms_MY\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: js/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/ms_MY/impress.po b/l10n/ms_MY/impress.po
new file mode 100644
index 0000000000..a7a5b4117a
--- /dev/null
+++ b/l10n/ms_MY/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ms_MY\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/ms_MY/settings.po b/l10n/ms_MY/settings.po
index 07857601be..c166dfab90 100644
--- a/l10n/ms_MY/settings.po
+++ b/l10n/ms_MY/settings.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-18 02:01+0200\n"
-"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -90,10 +90,46 @@ msgid "use systems cron service"
 msgstr ""
 
 #: templates/admin.php:39
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:67
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:67
+#: templates/admin.php:95
 msgid "More"
 msgstr "Lanjutan"
 
diff --git a/l10n/ms_MY/user_ldap.po b/l10n/ms_MY/user_ldap.po
index 744d804e9c..e0ec285086 100644
--- a/l10n/ms_MY/user_ldap.po
+++ b/l10n/ms_MY/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -159,6 +159,12 @@ msgstr ""
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr ""
diff --git a/l10n/nb_NO/admin_dependencies_chk.po b/l10n/nb_NO/admin_dependencies_chk.po
index 0a6cff69a0..94de202861 100644
--- a/l10n/nb_NO/admin_dependencies_chk.po
+++ b/l10n/nb_NO/admin_dependencies_chk.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <runesudden@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 22:55+0000\n"
+"Last-Translator: runesudden <runesudden@gmail.com>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,53 +22,53 @@ msgstr ""
 msgid ""
 "The php-json module is needed by the many applications for inter "
 "communications"
-msgstr ""
+msgstr "Modulen php-jason blir benyttet til inter kommunikasjon"
 
 #: settings.php:39
 msgid ""
 "The php-curl modude is needed to fetch the page title when adding a "
 "bookmarks"
-msgstr ""
+msgstr "Modulen php-curl blir brukt til å hente sidetittelen når bokmerke blir lagt til"
 
 #: settings.php:45
 msgid "The php-gd module is needed to create thumbnails of your images"
-msgstr ""
+msgstr "Modulen php-gd blir benyttet til å lage miniatyr av bildene dine"
 
 #: settings.php:51
 msgid "The php-ldap module is needed connect to your ldap server"
-msgstr ""
+msgstr "Modulen php-ldap benyttes for å koble til din ldapserver"
 
 #: settings.php:57
 msgid "The php-zip module is needed download multiple files at once"
-msgstr ""
+msgstr "Modulen php-zup benyttes til å laste ned flere filer på en gang."
 
 #: settings.php:63
 msgid ""
 "The php-mb_multibyte module is needed to manage correctly the encoding."
-msgstr ""
+msgstr "Modulen php-mb_multibyte benyttes til å håndtere korrekt tegnkoding."
 
 #: settings.php:69
 msgid "The php-ctype module is needed validate data."
-msgstr ""
+msgstr "Modulen php-ctype benyttes til å validere data."
 
 #: settings.php:75
 msgid "The php-xml module is needed to share files with webdav."
-msgstr ""
+msgstr "Modulen php-xml benyttes til å dele filer med webdav"
 
 #: settings.php:81
 msgid ""
 "The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
 " knowledge base from OCS servers"
-msgstr ""
+msgstr "Direktivet allow_url_fopen i php.ini bør settes til 1 for å kunne hente kunnskapsbasen fra OCS-servere"
 
 #: settings.php:87
 msgid "The php-pdo module is needed to store owncloud data into a database."
-msgstr ""
+msgstr "Modulen php-pdo benyttes til å lagre ownCloud data i en database."
 
 #: templates/settings.php:2
 msgid "Dependencies status"
-msgstr ""
+msgstr "Avhengighetsstatus"
 
 #: templates/settings.php:7
 msgid "Used by :"
-msgstr ""
+msgstr "Benyttes av:"
diff --git a/l10n/nb_NO/bookmarks.po b/l10n/nb_NO/bookmarks.po
index ff93307a65..6ab8bac580 100644
--- a/l10n/nb_NO/bookmarks.po
+++ b/l10n/nb_NO/bookmarks.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # Arvid Nornes <arvid.nornes@gmail.com>, 2012.
+#   <runesudden@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-24 02:02+0200\n"
-"PO-Revision-Date: 2012-08-23 17:23+0000\n"
-"Last-Translator: Arvid Nornes <arvid.nornes@gmail.com>\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 22:58+0000\n"
+"Last-Translator: runesudden <runesudden@gmail.com>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -58,4 +59,4 @@ msgstr "Du har ingen bokmerker"
 
 #: templates/settings.php:11
 msgid "Bookmarklet <br />"
-msgstr ""
+msgstr "Bokmerke <br />"
diff --git a/l10n/nb_NO/core.po b/l10n/nb_NO/core.po
index 010ea33704..ffedfadca3 100644
--- a/l10n/nb_NO/core.po
+++ b/l10n/nb_NO/core.po
@@ -7,13 +7,14 @@
 # Christer Eriksson <post@hc3web.com>, 2012.
 # Daniel  <i18n@daniel.priv.no>, 2012.
 #   <itssmail@yahoo.no>, 2012.
+#   <runesudden@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -35,57 +36,57 @@ msgstr "Denne kategorien finnes allerede:"
 
 #: js/jquery-ui-1.8.16.custom.min.js:511
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
-msgstr ""
+msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 
-#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "Innstillinger"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "January"
 msgstr "Januar"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "February"
 msgstr "Februar"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "March"
 msgstr "Mars"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "April"
 msgstr "April"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "May"
 msgstr "Mai"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "June"
 msgstr "Juni"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "July"
 msgstr "Juli"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "August"
 msgstr "August"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "September"
 msgstr "September"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "October"
 msgstr "Oktober"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "November"
 msgstr "November"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "December"
 msgstr "Desember"
 
@@ -133,7 +134,7 @@ msgstr "Anmodning"
 msgid "Login failed!"
 msgstr "Innloggingen var ikke vellykket."
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "Brukernavn"
@@ -194,48 +195,52 @@ msgstr "Rediger kategorier"
 msgid "Add"
 msgstr "Legg til"
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr "opprett en <strong>administrator-konto</strong>"
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "Passord"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr "Avansert"
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "Datamappe"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "Konfigurer databasen"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "vil bli brukt"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "Databasebruker"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "Databasepassord"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "Databasenavn"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "Databasevert"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "Fullfør oppsetting"
 
diff --git a/l10n/nb_NO/files.po b/l10n/nb_NO/files.po
index b242837904..83cb1a6283 100644
--- a/l10n/nb_NO/files.po
+++ b/l10n/nb_NO/files.po
@@ -7,13 +7,14 @@
 # Arvid Nornes <arvid.nornes@gmail.com>, 2012.
 # Christer Eriksson <post@hc3web.com>, 2012.
 # Daniel  <i18n@daniel.priv.no>, 2012.
+#   <runesudden@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:02+0000\n"
+"Last-Translator: runesudden <runesudden@gmail.com>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -55,37 +56,37 @@ msgstr "Klarte ikke å skrive til disk"
 msgid "Files"
 msgstr "Filer"
 
-#: js/fileactions.js:107 templates/index.php:56
+#: js/fileactions.js:111 templates/index.php:56
 msgid "Delete"
 msgstr "Slett"
 
 #: js/filelist.js:141
 msgid "already exists"
-msgstr ""
+msgstr "eksisterer allerede"
 
 #: js/filelist.js:141
 msgid "replace"
-msgstr ""
+msgstr "erstatt"
 
 #: js/filelist.js:141
 msgid "cancel"
-msgstr ""
+msgstr "avbryt"
 
 #: js/filelist.js:195
 msgid "replaced"
-msgstr ""
+msgstr "erstattet"
 
 #: js/filelist.js:195
 msgid "with"
-msgstr ""
+msgstr "med"
 
 #: js/filelist.js:195 js/filelist.js:246
 msgid "undo"
-msgstr ""
+msgstr "angre"
 
 #: js/filelist.js:246
 msgid "deleted"
-msgstr ""
+msgstr "slettet"
 
 #: js/files.js:171
 msgid "generating ZIP-file, it may take some time."
@@ -93,11 +94,11 @@ msgstr "opprettet ZIP-fil, dette kan ta litt tid"
 
 #: js/files.js:200
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr ""
+msgstr "Kan ikke laste opp filen din siden det er en mappe eller den har 0 bytes"
 
 #: js/files.js:200
 msgid "Upload Error"
-msgstr ""
+msgstr "Opplasting feilet"
 
 #: js/files.js:228 js/files.js:319 js/files.js:348
 msgid "Pending"
@@ -105,11 +106,11 @@ msgstr "Ventende"
 
 #: js/files.js:333
 msgid "Upload cancelled."
-msgstr ""
+msgstr "Opplasting avbrutt."
 
 #: js/files.js:457
 msgid "Invalid name, '/' is not allowed."
-msgstr ""
+msgstr "Ugyldig navn, '/' er ikke tillatt. "
 
 #: js/files.js:703 templates/index.php:55
 msgid "Size"
diff --git a/l10n/nb_NO/files_external.po b/l10n/nb_NO/files_external.po
index 757e0be549..629e0c4d28 100644
--- a/l10n/nb_NO/files_external.po
+++ b/l10n/nb_NO/files_external.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <ajarmund@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:34+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-28 02:01+0200\n"
+"PO-Revision-Date: 2012-08-27 15:43+0000\n"
+"Last-Translator: anjar <ajarmund@gmail.com>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -31,11 +32,11 @@ msgstr ""
 
 #: templates/settings.php:9
 msgid "Configuration"
-msgstr ""
+msgstr "Konfigurasjon"
 
 #: templates/settings.php:10
 msgid "Options"
-msgstr ""
+msgstr "Innstillinger"
 
 #: templates/settings.php:11
 msgid "Applicable"
@@ -51,19 +52,19 @@ msgstr ""
 
 #: templates/settings.php:63
 msgid "All Users"
-msgstr ""
+msgstr "Alle brukere"
 
 #: templates/settings.php:64
 msgid "Groups"
-msgstr ""
+msgstr "Grupper"
 
 #: templates/settings.php:69
 msgid "Users"
-msgstr ""
+msgstr "Brukere"
 
 #: templates/settings.php:77 templates/settings.php:96
 msgid "Delete"
-msgstr ""
+msgstr "Slett"
 
 #: templates/settings.php:88
 msgid "SSL root certificates"
diff --git a/l10n/nb_NO/files_odfviewer.po b/l10n/nb_NO/files_odfviewer.po
new file mode 100644
index 0000000000..61ad61a7fe
--- /dev/null
+++ b/l10n/nb_NO/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nb_NO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/nb_NO/files_pdfviewer.po b/l10n/nb_NO/files_pdfviewer.po
new file mode 100644
index 0000000000..e036a75c1b
--- /dev/null
+++ b/l10n/nb_NO/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nb_NO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/nb_NO/files_sharing.po b/l10n/nb_NO/files_sharing.po
index f869bfc1fb..721253f761 100644
--- a/l10n/nb_NO/files_sharing.po
+++ b/l10n/nb_NO/files_sharing.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-24 02:02+0200\n"
-"PO-Revision-Date: 2012-08-23 17:27+0000\n"
-"Last-Translator: Arvid Nornes <arvid.nornes@gmail.com>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,18 +18,10 @@ msgstr ""
 "Language: nb_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: templates/get.php:4
-msgid "Size"
-msgstr "Størrelse"
+#: templates/authenticate.php:4
+msgid "Password"
+msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr "Endret"
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr "Slett alle"
-
-#: templates/get.php:5
-msgid "Delete"
-msgstr "Slett"
+#: templates/authenticate.php:6
+msgid "Submit"
+msgstr ""
diff --git a/l10n/nb_NO/files_texteditor.po b/l10n/nb_NO/files_texteditor.po
new file mode 100644
index 0000000000..0086fe9d64
--- /dev/null
+++ b/l10n/nb_NO/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nb_NO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/nb_NO/gallery.po b/l10n/nb_NO/gallery.po
index 4ebdedf453..cf8525c310 100644
--- a/l10n/nb_NO/gallery.po
+++ b/l10n/nb_NO/gallery.po
@@ -6,92 +6,37 @@
 #   <ajarmund@gmail.com>, 2012.
 # Christer Eriksson <post@hc3web.com>, 2012.
 # Daniel  <i18n@daniel.priv.no>, 2012.
+#   <runesudden@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.net/projects/p/owncloud/language/nb_NO/)\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:01+0000\n"
+"Last-Translator: runesudden <runesudden@gmail.com>\n"
+"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: nb_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:37
+#: appinfo/app.php:42
 msgid "Pictures"
 msgstr "Bilder"
 
-#: js/album_cover.js:44
+#: js/pictures.js:12
 msgid "Share gallery"
-msgstr ""
+msgstr "Del galleri"
 
-#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+#: js/pictures.js:32
 msgid "Error: "
-msgstr ""
+msgstr "Feil:"
 
-#: js/album_cover.js:64 js/album_cover.js:100
+#: js/pictures.js:32
 msgid "Internal error"
-msgstr ""
+msgstr "Intern feil"
 
-#: js/album_cover.js:114
-msgid "Scanning root"
-msgstr ""
-
-#: js/album_cover.js:115
-msgid "Default order"
-msgstr ""
-
-#: js/album_cover.js:116
-msgid "Ascending"
-msgstr ""
-
-#: js/album_cover.js:116
-msgid "Descending"
-msgstr ""
-
-#: js/album_cover.js:117 templates/index.php:19
-msgid "Settings"
-msgstr "Innstillinger"
-
-#: js/album_cover.js:122
-msgid "Scanning root cannot be empty"
-msgstr ""
-
-#: js/album_cover.js:122 js/album_cover.js:133
-msgid "Error"
-msgstr ""
-
-#: templates/index.php:16
-msgid "Rescan"
-msgstr "Les inn på nytt"
-
-#: templates/index.php:17
-msgid "Stop"
-msgstr "Stopp"
-
-#: templates/index.php:18
-msgid "Share"
-msgstr "Del"
-
-#: templates/view_album.php:19
-msgid "Back"
-msgstr "Tilbake"
-
-#: templates/view_album.php:36
-msgid "Remove confirmation"
-msgstr "Fjern bekreftelse"
-
-#: templates/view_album.php:37
-msgid "Do you want to remove album"
-msgstr "Ønsker du å slette albumet?"
-
-#: templates/view_album.php:40
-msgid "Change album name"
-msgstr "Endre navn på album"
-
-#: templates/view_album.php:43
-msgid "New album name"
-msgstr "Nytt navn på album"
+#: templates/index.php:27
+msgid "Slideshow"
+msgstr "Lysbildefremvisning"
diff --git a/l10n/nb_NO/impress.po b/l10n/nb_NO/impress.po
new file mode 100644
index 0000000000..8222542fcc
--- /dev/null
+++ b/l10n/nb_NO/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nb_NO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/nb_NO/lib.po b/l10n/nb_NO/lib.po
index 0d9ea115ad..52b02f78ee 100644
--- a/l10n/nb_NO/lib.po
+++ b/l10n/nb_NO/lib.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # Arvid Nornes <arvid.nornes@gmail.com>, 2012.
+#   <runesudden@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-24 02:02+0200\n"
-"PO-Revision-Date: 2012-08-23 17:31+0000\n"
-"Last-Translator: Arvid Nornes <arvid.nornes@gmail.com>\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 22:57+0000\n"
+"Last-Translator: runesudden <runesudden@gmail.com>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -68,7 +69,7 @@ msgstr "Autentiseringsfeil"
 
 #: json.php:51
 msgid "Token expired. Please reload page."
-msgstr ""
+msgstr "Symbol utløpt. Vennligst last inn siden på nytt."
 
 #: template.php:86
 msgid "seconds ago"
diff --git a/l10n/nb_NO/settings.po b/l10n/nb_NO/settings.po
index 551c484ea5..5636a7ccc6 100644
--- a/l10n/nb_NO/settings.po
+++ b/l10n/nb_NO/settings.po
@@ -8,12 +8,13 @@
 # Christer Eriksson <post@hc3web.com>, 2012.
 # Daniel  <i18n@daniel.priv.no>, 2012.
 #   <itssmail@yahoo.no>, 2012.
+#   <runesudden@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-18 02:01+0200\n"
-"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -24,7 +25,7 @@ msgstr ""
 
 #: ajax/apps/ocs.php:23
 msgid "Unable to load list from App Store"
-msgstr ""
+msgstr "Lasting av liste fra App Store feilet."
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
@@ -44,7 +45,7 @@ msgstr "Ugyldig forespørsel"
 
 #: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
 msgid "Authentication error"
-msgstr ""
+msgstr "Autentikasjonsfeil"
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
@@ -52,7 +53,7 @@ msgstr "Språk endret"
 
 #: js/apps.js:18
 msgid "Error"
-msgstr ""
+msgstr "Feil"
 
 #: js/apps.js:39 js/apps.js:73
 msgid "Disable"
@@ -72,29 +73,65 @@ msgstr "__language_name__"
 
 #: templates/admin.php:14
 msgid "Security Warning"
-msgstr ""
+msgstr "Sikkerhetsadvarsel"
 
 #: templates/admin.php:29
 msgid "Cron"
-msgstr ""
+msgstr "Cron"
 
 #: templates/admin.php:31
 msgid "execute one task with each page loaded"
-msgstr ""
+msgstr "utfør en oppgave med hver side som blir lastet"
 
 #: templates/admin.php:33
 msgid "cron.php is registered at a webcron service"
-msgstr ""
+msgstr "cron.php er registrert som en webcron tjeneste"
 
 #: templates/admin.php:35
 msgid "use systems cron service"
-msgstr ""
+msgstr "benytt systemets cron tjeneste"
 
 #: templates/admin.php:39
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:67
 msgid "Log"
 msgstr "Logg"
 
-#: templates/admin.php:67
+#: templates/admin.php:95
 msgid "More"
 msgstr "Mer"
 
@@ -232,7 +269,7 @@ msgstr "Annet"
 
 #: templates/users.php:80 templates/users.php:112
 msgid "Group Admin"
-msgstr ""
+msgstr "Gruppeadministrator"
 
 #: templates/users.php:82
 msgid "Quota"
diff --git a/l10n/nb_NO/user_ldap.po b/l10n/nb_NO/user_ldap.po
index 3a14ed0b28..2208bdc9ac 100644
--- a/l10n/nb_NO/user_ldap.po
+++ b/l10n/nb_NO/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -159,6 +159,12 @@ msgstr ""
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr ""
diff --git a/l10n/nl/core.po b/l10n/nl/core.po
index cdbdada846..8e55361a92 100644
--- a/l10n/nl/core.po
+++ b/l10n/nl/core.po
@@ -13,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -39,55 +39,55 @@ msgstr "De categorie bestaat al."
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "Instellingen"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "January"
 msgstr "Januari"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "February"
 msgstr "Februari"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "March"
 msgstr "Maart"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "April"
 msgstr "April"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "May"
 msgstr "Mei"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "June"
 msgstr "Juni"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "July"
 msgstr "Juli"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "August"
 msgstr "Augustus"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "September"
 msgstr "September"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "October"
 msgstr "Oktober"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "November"
 msgstr "November"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "December"
 msgstr "December"
 
@@ -135,7 +135,7 @@ msgstr "Gevraagd"
 msgid "Login failed!"
 msgstr "Login mislukt!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "Gebruikersnaam"
@@ -196,48 +196,52 @@ msgstr "Wijzigen categorieën"
 msgid "Add"
 msgstr "Toevoegen"
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr "Maak een <strong>beheerdersaccount</strong> aan"
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "Wachtwoord"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr "Geavanceerd"
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "Gegevensmap"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "Configureer de databank"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "zal gebruikt worden"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "Gebruiker databank"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "Wachtwoord databank"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "Naam databank"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "Database server"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "Installatie afronden"
 
diff --git a/l10n/nl/files_external.po b/l10n/nl/files_external.po
index c9d3312541..2256b17cd6 100644
--- a/l10n/nl/files_external.po
+++ b/l10n/nl/files_external.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Richard Bos <radoeka@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:34+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-28 02:01+0200\n"
+"PO-Revision-Date: 2012-08-27 18:45+0000\n"
+"Last-Translator: Richard Bos <radoeka@gmail.com>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,64 +20,64 @@ msgstr ""
 
 #: templates/settings.php:3
 msgid "External Storage"
-msgstr ""
+msgstr "Externe opslag"
 
 #: templates/settings.php:7 templates/settings.php:19
 msgid "Mount point"
-msgstr ""
+msgstr "Aankoppelpunt"
 
 #: templates/settings.php:8
 msgid "Backend"
-msgstr ""
+msgstr "Backend"
 
 #: templates/settings.php:9
 msgid "Configuration"
-msgstr ""
+msgstr "Configuratie"
 
 #: templates/settings.php:10
 msgid "Options"
-msgstr ""
+msgstr "Opties"
 
 #: templates/settings.php:11
 msgid "Applicable"
-msgstr ""
+msgstr "Van toepassing"
 
 #: templates/settings.php:23
 msgid "Add mount point"
-msgstr ""
+msgstr "Voeg aankoppelpunt toe"
 
 #: templates/settings.php:54 templates/settings.php:62
 msgid "None set"
-msgstr ""
+msgstr "Niets ingesteld"
 
 #: templates/settings.php:63
 msgid "All Users"
-msgstr ""
+msgstr "Alle gebruikers"
 
 #: templates/settings.php:64
 msgid "Groups"
-msgstr ""
+msgstr "Groepen"
 
 #: templates/settings.php:69
 msgid "Users"
-msgstr ""
+msgstr "Gebruikers"
 
 #: templates/settings.php:77 templates/settings.php:96
 msgid "Delete"
-msgstr ""
+msgstr "Verwijder"
 
 #: templates/settings.php:88
 msgid "SSL root certificates"
-msgstr ""
+msgstr "SSL root certificaten"
 
 #: templates/settings.php:102
 msgid "Import Root Certificate"
-msgstr ""
+msgstr "Importeer root certificaat"
 
 #: templates/settings.php:108
 msgid "Enable User External Storage"
-msgstr ""
+msgstr "Zet gebruiker's externe opslag aan"
 
 #: templates/settings.php:109
 msgid "Allow users to mount their own external storage"
-msgstr ""
+msgstr "Sta gebruikers toe om hun eigen externe opslag aan te koppelen"
diff --git a/l10n/nl/files_odfviewer.po b/l10n/nl/files_odfviewer.po
new file mode 100644
index 0000000000..5825a94a3f
--- /dev/null
+++ b/l10n/nl/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/nl/files_pdfviewer.po b/l10n/nl/files_pdfviewer.po
new file mode 100644
index 0000000000..ff6e8c5e20
--- /dev/null
+++ b/l10n/nl/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/nl/files_sharing.po b/l10n/nl/files_sharing.po
index dc30969ea7..71500980d7 100644
--- a/l10n/nl/files_sharing.po
+++ b/l10n/nl/files_sharing.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-25 02:04+0200\n"
-"PO-Revision-Date: 2012-08-24 19:16+0000\n"
-"Last-Translator: Richard Bos <radoeka@gmail.com>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,18 +18,10 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: templates/get.php:4
-msgid "Size"
-msgstr "Grootte"
+#: templates/authenticate.php:4
+msgid "Password"
+msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr "Aangepast"
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr "Verwijder alles"
-
-#: templates/get.php:5
-msgid "Delete"
-msgstr "Vewijder"
+#: templates/authenticate.php:6
+msgid "Submit"
+msgstr ""
diff --git a/l10n/nl/files_texteditor.po b/l10n/nl/files_texteditor.po
new file mode 100644
index 0000000000..c73a062cdb
--- /dev/null
+++ b/l10n/nl/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/nl/impress.po b/l10n/nl/impress.po
new file mode 100644
index 0000000000..2232e10598
--- /dev/null
+++ b/l10n/nl/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/nl/settings.po b/l10n/nl/settings.po
index 7f2741fcf9..06562d81b7 100644
--- a/l10n/nl/settings.po
+++ b/l10n/nl/settings.po
@@ -14,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-25 02:04+0200\n"
-"PO-Revision-Date: 2012-08-24 08:40+0000\n"
-"Last-Translator: Richard Bos <radoeka@gmail.com>\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -93,10 +93,46 @@ msgid "use systems cron service"
 msgstr "gebruik de systeem cron service"
 
 #: templates/admin.php:39
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:67
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:67
+#: templates/admin.php:95
 msgid "More"
 msgstr "Meer"
 
diff --git a/l10n/nl/user_ldap.po b/l10n/nl/user_ldap.po
index 89b469b7ed..e40f9e685f 100644
--- a/l10n/nl/user_ldap.po
+++ b/l10n/nl/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -159,6 +159,12 @@ msgstr ""
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr ""
diff --git a/l10n/nn_NO/core.po b/l10n/nn_NO/core.po
index 707892db95..ea511e8207 100644
--- a/l10n/nn_NO/core.po
+++ b/l10n/nn_NO/core.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -35,55 +35,55 @@ msgstr ""
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "Innstillingar"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "January"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "February"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "March"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "April"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "May"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "June"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "July"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "August"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "September"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "October"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "November"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "December"
 msgstr ""
 
@@ -131,7 +131,7 @@ msgstr "Førespurt"
 msgid "Login failed!"
 msgstr "Feil ved innlogging!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "Brukarnamn"
@@ -192,48 +192,52 @@ msgstr ""
 msgid "Add"
 msgstr ""
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr "Lag ein <strong>admin-konto</strong>"
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "Passord"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr "Avansert"
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "Datamappe"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "Konfigurer databasen"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "vil bli nytta"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "Databasebrukar"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "Databasepassord"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "Databasenamn"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "Databasetenar"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "Fullfør oppsettet"
 
diff --git a/l10n/nn_NO/files_odfviewer.po b/l10n/nn_NO/files_odfviewer.po
new file mode 100644
index 0000000000..dfc0447df6
--- /dev/null
+++ b/l10n/nn_NO/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nn_NO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/nn_NO/files_pdfviewer.po b/l10n/nn_NO/files_pdfviewer.po
new file mode 100644
index 0000000000..4933207f3a
--- /dev/null
+++ b/l10n/nn_NO/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nn_NO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/nn_NO/files_sharing.po b/l10n/nn_NO/files_sharing.po
index 1ae9969855..fb65f919f9 100644
--- a/l10n/nn_NO/files_sharing.po
+++ b/l10n/nn_NO/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -17,18 +17,10 @@ msgstr ""
 "Language: nn_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: templates/get.php:4
-msgid "Size"
+#: templates/authenticate.php:4
+msgid "Password"
 msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete"
+#: templates/authenticate.php:6
+msgid "Submit"
 msgstr ""
diff --git a/l10n/nn_NO/files_texteditor.po b/l10n/nn_NO/files_texteditor.po
new file mode 100644
index 0000000000..1b89b35f6a
--- /dev/null
+++ b/l10n/nn_NO/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nn_NO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/nn_NO/impress.po b/l10n/nn_NO/impress.po
new file mode 100644
index 0000000000..e14be1cd5b
--- /dev/null
+++ b/l10n/nn_NO/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nn_NO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/nn_NO/settings.po b/l10n/nn_NO/settings.po
index 465d4e3f60..031fc58572 100644
--- a/l10n/nn_NO/settings.po
+++ b/l10n/nn_NO/settings.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-20 06:17+0000\n"
-"Last-Translator: Alexander Stevenson <assteve@gmail.com>\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -88,10 +88,46 @@ msgid "use systems cron service"
 msgstr ""
 
 #: templates/admin.php:39
-msgid "Log"
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
 msgstr ""
 
 #: templates/admin.php:67
+msgid "Log"
+msgstr ""
+
+#: templates/admin.php:95
 msgid "More"
 msgstr ""
 
diff --git a/l10n/nn_NO/user_ldap.po b/l10n/nn_NO/user_ldap.po
index 86099dc606..2d5b008d92 100644
--- a/l10n/nn_NO/user_ldap.po
+++ b/l10n/nn_NO/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -159,6 +159,12 @@ msgstr ""
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr ""
diff --git a/l10n/pl/core.po b/l10n/pl/core.po
index ea413953c7..7a41ee9070 100644
--- a/l10n/pl/core.po
+++ b/l10n/pl/core.po
@@ -13,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -39,55 +39,55 @@ msgstr "Ta kategoria już istnieje"
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 
-#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "Ustawienia"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "January"
 msgstr "Styczeń"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "February"
 msgstr "Luty"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "March"
 msgstr "Marzec"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "April"
 msgstr "Kwiecień"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "May"
 msgstr "Maj"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "June"
 msgstr "Czerwiec"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "July"
 msgstr "Lipiec"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "August"
 msgstr "Sierpień"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "September"
 msgstr "Wrzesień"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "October"
 msgstr "Październik"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "November"
 msgstr "Listopad"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "December"
 msgstr "Grudzień"
 
@@ -135,7 +135,7 @@ msgstr "Żądane"
 msgid "Login failed!"
 msgstr "Nie udało się zalogować!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "Nazwa użytkownika"
@@ -196,48 +196,52 @@ msgstr "Edytuj kategorię"
 msgid "Add"
 msgstr "Dodaj"
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr "Tworzenie <strong>konta administratora</strong>"
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "Hasło"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr "Zaawansowane"
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "Katalog danych"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "Konfiguracja bazy danych"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "zostanie użyte"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "Użytkownik bazy danych"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "Hasło do bazy danych"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "Nazwa bazy danych"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "Komputer bazy danych"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "Zakończ konfigurowanie"
 
diff --git a/l10n/pl/files_odfviewer.po b/l10n/pl/files_odfviewer.po
new file mode 100644
index 0000000000..0c090a229f
--- /dev/null
+++ b/l10n/pl/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pl\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: js/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/pl/files_pdfviewer.po b/l10n/pl/files_pdfviewer.po
new file mode 100644
index 0000000000..00b45cf929
--- /dev/null
+++ b/l10n/pl/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pl\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: js/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/pl/files_sharing.po b/l10n/pl/files_sharing.po
index 576158713d..22865b645f 100644
--- a/l10n/pl/files_sharing.po
+++ b/l10n/pl/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -18,18 +18,10 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: templates/get.php:4
-msgid "Size"
-msgstr "Rozmiar"
+#: templates/authenticate.php:4
+msgid "Password"
+msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr "Zmodyfikowane"
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr "Usuń wszystko"
-
-#: templates/get.php:5
-msgid "Delete"
-msgstr "Usuń"
+#: templates/authenticate.php:6
+msgid "Submit"
+msgstr ""
diff --git a/l10n/pl/files_texteditor.po b/l10n/pl/files_texteditor.po
new file mode 100644
index 0000000000..039282380a
--- /dev/null
+++ b/l10n/pl/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pl\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: js/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/pl/impress.po b/l10n/pl/impress.po
new file mode 100644
index 0000000000..1321f95ef5
--- /dev/null
+++ b/l10n/pl/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pl\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: templates/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/pl/settings.po b/l10n/pl/settings.po
index b9273c4c45..f34e2e110f 100644
--- a/l10n/pl/settings.po
+++ b/l10n/pl/settings.po
@@ -14,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-20 07:48+0000\n"
-"Last-Translator: Cyryl Sochacki <>\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -93,10 +93,46 @@ msgid "use systems cron service"
 msgstr "korzystaj z usługi systemowej cron"
 
 #: templates/admin.php:39
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:67
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:67
+#: templates/admin.php:95
 msgid "More"
 msgstr "Więcej"
 
diff --git a/l10n/pl/user_ldap.po b/l10n/pl/user_ldap.po
index 8dce1f22d4..809f9c30ed 100644
--- a/l10n/pl/user_ldap.po
+++ b/l10n/pl/user_ldap.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-20 08:52+0000\n"
-"Last-Translator: Cyryl Sochacki <>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -160,6 +160,12 @@ msgstr "w bajtach"
 msgid "in seconds. A change empties the cache."
 msgstr "w sekundach. Zmiana opróżnia pamięć podręczną."
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr "Pomoc"
diff --git a/l10n/pt_BR/core.po b/l10n/pt_BR/core.po
index bdf2c828c3..f0c05cafd0 100644
--- a/l10n/pt_BR/core.po
+++ b/l10n/pt_BR/core.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -38,55 +38,55 @@ msgstr "Essa categoria já existe"
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 
-#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "Configurações"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "January"
 msgstr "Janeiro"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "February"
 msgstr "Fevereiro"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "March"
 msgstr "Março"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "April"
 msgstr "Abril"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "May"
 msgstr "Maio"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "June"
 msgstr "Junho"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "July"
 msgstr "Julho"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "August"
 msgstr "Agosto"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "September"
 msgstr "Setembro"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "October"
 msgstr "Outubro"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "November"
 msgstr "Novembro"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "December"
 msgstr "Dezembro"
 
@@ -134,7 +134,7 @@ msgstr "Solicitado"
 msgid "Login failed!"
 msgstr "Falha ao fazer o login!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "Nome de Usuário"
@@ -195,48 +195,52 @@ msgstr "Editar categorias"
 msgid "Add"
 msgstr "Adicionar"
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr "Criar uma <strong>conta</strong> de <strong>administrador</strong>"
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "Senha"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr "Avançado"
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "Pasta de dados"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "Configurar o banco de dados"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "será usado"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "Usuário de banco de dados"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "Senha do banco de dados"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "Nome do banco de dados"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "Banco de dados do host"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "Concluir configuração"
 
diff --git a/l10n/pt_BR/files_odfviewer.po b/l10n/pt_BR/files_odfviewer.po
new file mode 100644
index 0000000000..0fdf643ce9
--- /dev/null
+++ b/l10n/pt_BR/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_BR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+
+#: js/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/pt_BR/files_pdfviewer.po b/l10n/pt_BR/files_pdfviewer.po
new file mode 100644
index 0000000000..5d57e4d21e
--- /dev/null
+++ b/l10n/pt_BR/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_BR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+
+#: js/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/pt_BR/files_sharing.po b/l10n/pt_BR/files_sharing.po
index 3e73c6ab3c..f00ee26c73 100644
--- a/l10n/pt_BR/files_sharing.po
+++ b/l10n/pt_BR/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -17,18 +17,10 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
-#: templates/get.php:4
-msgid "Size"
+#: templates/authenticate.php:4
+msgid "Password"
 msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete"
+#: templates/authenticate.php:6
+msgid "Submit"
 msgstr ""
diff --git a/l10n/pt_BR/files_texteditor.po b/l10n/pt_BR/files_texteditor.po
new file mode 100644
index 0000000000..f14b622e58
--- /dev/null
+++ b/l10n/pt_BR/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_BR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+
+#: js/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/pt_BR/files_versions.po b/l10n/pt_BR/files_versions.po
index 86c54e7105..5c59fa1633 100644
--- a/l10n/pt_BR/files_versions.po
+++ b/l10n/pt_BR/files_versions.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <tbsoares@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-28 14:35+0000\n"
+"Last-Translator: tbsoares <tbsoares@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,8 +20,8 @@ msgstr ""
 
 #: js/settings-personal.js:31
 msgid "Expire all versions"
-msgstr ""
+msgstr "Expirar todas as versões"
 
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
-msgstr ""
+msgstr "Habilitar versionamento de arquivos"
diff --git a/l10n/pt_BR/impress.po b/l10n/pt_BR/impress.po
new file mode 100644
index 0000000000..d411662bd5
--- /dev/null
+++ b/l10n/pt_BR/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_BR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+
+#: templates/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/pt_BR/settings.po b/l10n/pt_BR/settings.po
index 901713f7c8..da30f5b428 100644
--- a/l10n/pt_BR/settings.po
+++ b/l10n/pt_BR/settings.po
@@ -13,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-25 02:04+0200\n"
-"PO-Revision-Date: 2012-08-24 22:19+0000\n"
-"Last-Translator: targinosilveira <targinosilveira@gmail.com>\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -92,10 +92,46 @@ msgid "use systems cron service"
 msgstr ""
 
 #: templates/admin.php:39
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:67
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:67
+#: templates/admin.php:95
 msgid "More"
 msgstr "Mais"
 
diff --git a/l10n/pt_BR/user_ldap.po b/l10n/pt_BR/user_ldap.po
index 206781082f..71b15d98cf 100644
--- a/l10n/pt_BR/user_ldap.po
+++ b/l10n/pt_BR/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -159,6 +159,12 @@ msgstr ""
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr ""
diff --git a/l10n/pt_PT/core.po b/l10n/pt_PT/core.po
index 18fae557ab..241a29410d 100644
--- a/l10n/pt_PT/core.po
+++ b/l10n/pt_PT/core.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -36,55 +36,55 @@ msgstr "Esta categoria já existe:"
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 
-#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "Definições"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "January"
 msgstr "Janeiro"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "February"
 msgstr "Fevereiro"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "March"
 msgstr "Março"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "April"
 msgstr "Abril"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "May"
 msgstr "Maio"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "June"
 msgstr "Junho"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "July"
 msgstr "Julho"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "August"
 msgstr "Agosto"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "September"
 msgstr "Setembro"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "October"
 msgstr "Outubro"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "November"
 msgstr "Novembro"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "December"
 msgstr "Dezembro"
 
@@ -132,7 +132,7 @@ msgstr "Pedido"
 msgid "Login failed!"
 msgstr "Conexão falhado!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "Utilizador"
@@ -193,48 +193,52 @@ msgstr "Editar categorias"
 msgid "Add"
 msgstr "Adicionar"
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr "Criar uma <strong>conta administrativa</strong>"
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "Palavra chave"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr "Avançado"
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "Pasta de dados"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "Configure a base de dados"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "vai ser usada"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "Utilizador da base de dados"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "Password da base de dados"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "Nome da base de dados"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "Host da base de dados"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "Acabar instalação"
 
diff --git a/l10n/pt_PT/files_odfviewer.po b/l10n/pt_PT/files_odfviewer.po
new file mode 100644
index 0000000000..01ea436b98
--- /dev/null
+++ b/l10n/pt_PT/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_PT\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/pt_PT/files_pdfviewer.po b/l10n/pt_PT/files_pdfviewer.po
new file mode 100644
index 0000000000..67aaa183ab
--- /dev/null
+++ b/l10n/pt_PT/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_PT\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/pt_PT/files_sharing.po b/l10n/pt_PT/files_sharing.po
index 3a92189327..d2225f80f1 100644
--- a/l10n/pt_PT/files_sharing.po
+++ b/l10n/pt_PT/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
@@ -17,18 +17,10 @@ msgstr ""
 "Language: pt_PT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: templates/get.php:4
-msgid "Size"
+#: templates/authenticate.php:4
+msgid "Password"
 msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete"
+#: templates/authenticate.php:6
+msgid "Submit"
 msgstr ""
diff --git a/l10n/pt_PT/files_texteditor.po b/l10n/pt_PT/files_texteditor.po
new file mode 100644
index 0000000000..1c3a291131
--- /dev/null
+++ b/l10n/pt_PT/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_PT\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/pt_PT/impress.po b/l10n/pt_PT/impress.po
new file mode 100644
index 0000000000..a3d95463c9
--- /dev/null
+++ b/l10n/pt_PT/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_PT\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/pt_PT/settings.po b/l10n/pt_PT/settings.po
index 1cc82a6ea4..83da25e2c7 100644
--- a/l10n/pt_PT/settings.po
+++ b/l10n/pt_PT/settings.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-24 02:02+0200\n"
-"PO-Revision-Date: 2012-08-23 19:46+0000\n"
-"Last-Translator: rlameiro <geral@ricardolameiro.pt>\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -89,10 +89,46 @@ msgid "use systems cron service"
 msgstr "usar o serviço cron do sistema"
 
 #: templates/admin.php:39
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:67
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:67
+#: templates/admin.php:95
 msgid "More"
 msgstr "Mais"
 
diff --git a/l10n/pt_PT/user_ldap.po b/l10n/pt_PT/user_ldap.po
index a4088cac2b..c3ee262c51 100644
--- a/l10n/pt_PT/user_ldap.po
+++ b/l10n/pt_PT/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -159,6 +159,12 @@ msgstr ""
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr ""
diff --git a/l10n/ro/core.po b/l10n/ro/core.po
index 5a733b5eb1..53f8bf1379 100644
--- a/l10n/ro/core.po
+++ b/l10n/ro/core.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -36,55 +36,55 @@ msgstr "Această categorie deja există:"
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "Configurări"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "January"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "February"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "March"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "April"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "May"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "June"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "July"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "August"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "September"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "October"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "November"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "December"
 msgstr ""
 
@@ -132,7 +132,7 @@ msgstr "Solicitat"
 msgid "Login failed!"
 msgstr "Autentificare eșuată"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "Utilizator"
@@ -193,48 +193,52 @@ msgstr "Editează categoriile"
 msgid "Add"
 msgstr "Adaugă"
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr "Crează un <strong>cont de administrator</strong>"
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "Parola"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr "Avansat"
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "Director date"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "Configurează baza de date"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "vor fi folosite"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "Utilizatorul bazei de date"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "Parola bazei de date"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "Numele bazei de date"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "Bază date"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "Finalizează instalarea"
 
diff --git a/l10n/ro/files_odfviewer.po b/l10n/ro/files_odfviewer.po
new file mode 100644
index 0000000000..3fa223c661
--- /dev/null
+++ b/l10n/ro/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1))\n"
+
+#: js/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/ro/files_pdfviewer.po b/l10n/ro/files_pdfviewer.po
new file mode 100644
index 0000000000..5425afad63
--- /dev/null
+++ b/l10n/ro/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1))\n"
+
+#: js/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/ro/files_sharing.po b/l10n/ro/files_sharing.po
index ab93603538..3d9840ba7c 100644
--- a/l10n/ro/files_sharing.po
+++ b/l10n/ro/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -17,18 +17,10 @@ msgstr ""
 "Language: ro\n"
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1))\n"
 
-#: templates/get.php:4
-msgid "Size"
+#: templates/authenticate.php:4
+msgid "Password"
 msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete"
+#: templates/authenticate.php:6
+msgid "Submit"
 msgstr ""
diff --git a/l10n/ro/files_texteditor.po b/l10n/ro/files_texteditor.po
new file mode 100644
index 0000000000..c74fb485a9
--- /dev/null
+++ b/l10n/ro/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1))\n"
+
+#: js/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/ro/impress.po b/l10n/ro/impress.po
new file mode 100644
index 0000000000..11bb267b33
--- /dev/null
+++ b/l10n/ro/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1))\n"
+
+#: templates/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/ro/settings.po b/l10n/ro/settings.po
index 736ab30fa1..09d25fbdec 100644
--- a/l10n/ro/settings.po
+++ b/l10n/ro/settings.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-18 02:01+0200\n"
-"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -90,10 +90,46 @@ msgid "use systems cron service"
 msgstr ""
 
 #: templates/admin.php:39
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:67
 msgid "Log"
 msgstr "Jurnal de activitate"
 
-#: templates/admin.php:67
+#: templates/admin.php:95
 msgid "More"
 msgstr "Mai mult"
 
diff --git a/l10n/ro/user_ldap.po b/l10n/ro/user_ldap.po
index 644c43d43d..633f14c432 100644
--- a/l10n/ro/user_ldap.po
+++ b/l10n/ro/user_ldap.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-15 02:03+0200\n"
-"PO-Revision-Date: 2012-08-14 20:24+0000\n"
-"Last-Translator: Dumitru Ursu <>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -160,6 +160,12 @@ msgstr "în octeți"
 msgid "in seconds. A change empties the cache."
 msgstr "în secunde. O schimbare curăță memoria tampon."
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr "Ajutor"
diff --git a/l10n/ru/core.po b/l10n/ru/core.po
index eb287d6988..963a3edb69 100644
--- a/l10n/ru/core.po
+++ b/l10n/ru/core.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -37,55 +37,55 @@ msgstr "Эта категория уже существует: "
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 
-#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "Настройки"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "January"
 msgstr "Январь"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "February"
 msgstr "Февраль"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "March"
 msgstr "Март"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "April"
 msgstr "Апрель"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "May"
 msgstr "Май"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "June"
 msgstr "Июнь"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "July"
 msgstr "Июль"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "August"
 msgstr "Август"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "September"
 msgstr "Сентябрь"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "October"
 msgstr "Октябрь"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "November"
 msgstr "Ноябрь"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "December"
 msgstr "Декабрь"
 
@@ -133,7 +133,7 @@ msgstr "Запрошено"
 msgid "Login failed!"
 msgstr "Не удалось войти!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "Имя пользователя"
@@ -194,48 +194,52 @@ msgstr "Редактировать категории"
 msgid "Add"
 msgstr "Добавить"
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr "Создать <strong>учётную запись администратора</strong>"
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "Пароль"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr "Дополнительно"
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "Директория с данными"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "Настройка базы данных"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "будет использовано"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "Имя пользователя для базы данных"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "Пароль для базы данных"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "Название базы данных"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "Хост базы данных"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "Завершить установку"
 
diff --git a/l10n/ru/files_odfviewer.po b/l10n/ru/files_odfviewer.po
new file mode 100644
index 0000000000..566e295112
--- /dev/null
+++ b/l10n/ru/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ru\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: js/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/ru/files_pdfviewer.po b/l10n/ru/files_pdfviewer.po
new file mode 100644
index 0000000000..48f6bdb06a
--- /dev/null
+++ b/l10n/ru/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ru\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: js/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/ru/files_sharing.po b/l10n/ru/files_sharing.po
index 39aaa41151..6114ef96d4 100644
--- a/l10n/ru/files_sharing.po
+++ b/l10n/ru/files_sharing.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-25 02:04+0200\n"
-"PO-Revision-Date: 2012-08-24 07:48+0000\n"
-"Last-Translator: Denis <reg.transifex.net@demitel.ru>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,18 +18,10 @@ msgstr ""
 "Language: ru\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: templates/get.php:4
-msgid "Size"
-msgstr "Размер"
+#: templates/authenticate.php:4
+msgid "Password"
+msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr "Изменён"
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr "Удалить все"
-
-#: templates/get.php:5
-msgid "Delete"
-msgstr "Удалить"
+#: templates/authenticate.php:6
+msgid "Submit"
+msgstr ""
diff --git a/l10n/ru/files_texteditor.po b/l10n/ru/files_texteditor.po
new file mode 100644
index 0000000000..46b235b469
--- /dev/null
+++ b/l10n/ru/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ru\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: js/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/ru/impress.po b/l10n/ru/impress.po
new file mode 100644
index 0000000000..4154c7b948
--- /dev/null
+++ b/l10n/ru/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ru\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: templates/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/ru/settings.po b/l10n/ru/settings.po
index 8dfb19bb77..c8cbb591ee 100644
--- a/l10n/ru/settings.po
+++ b/l10n/ru/settings.po
@@ -15,9 +15,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-19 02:02+0200\n"
-"PO-Revision-Date: 2012-08-18 11:59+0000\n"
-"Last-Translator: rasperepodvipodvert <rasperepodvipodvert@gmail.com>\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -94,10 +94,46 @@ msgid "use systems cron service"
 msgstr "использовать системные задания"
 
 #: templates/admin.php:39
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:67
 msgid "Log"
 msgstr "Журнал"
 
-#: templates/admin.php:67
+#: templates/admin.php:95
 msgid "More"
 msgstr "Ещё"
 
diff --git a/l10n/ru/user_ldap.po b/l10n/ru/user_ldap.po
index bb1f2d6239..3a9b203bdb 100644
--- a/l10n/ru/user_ldap.po
+++ b/l10n/ru/user_ldap.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-25 02:04+0200\n"
-"PO-Revision-Date: 2012-08-24 15:13+0000\n"
-"Last-Translator: wpns <4671992@gmail.com>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -93,7 +93,7 @@ msgstr "Определяет фильтр для применения при п
 
 #: templates/settings.php:14
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr ""
+msgstr "без заполнения, например \"objectClass=posixGroup\"."
 
 #: templates/settings.php:17
 msgid "Port"
@@ -101,15 +101,15 @@ msgstr "Порт"
 
 #: templates/settings.php:18
 msgid "Base User Tree"
-msgstr ""
+msgstr "База пользовательского дерева"
 
 #: templates/settings.php:19
 msgid "Base Group Tree"
-msgstr ""
+msgstr "База группового дерева"
 
 #: templates/settings.php:20
 msgid "Group-Member association"
-msgstr ""
+msgstr "Ассоциация Группа-Участник"
 
 #: templates/settings.php:21
 msgid "Use TLS"
@@ -121,7 +121,7 @@ msgstr "Не используйте для соединений SSL"
 
 #: templates/settings.php:22
 msgid "Case insensitve LDAP server (Windows)"
-msgstr ""
+msgstr "Нечувствительный к регистру сервер LDAP (Windows)"
 
 #: templates/settings.php:23
 msgid "Turn off SSL certificate validation."
@@ -131,7 +131,7 @@ msgstr "Отключить проверку сертификата SSL."
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
-msgstr ""
+msgstr "Если соединение работает только с этой опцией, импортируйте на ваш сервер ownCloud сертификат SSL сервера LDAP."
 
 #: templates/settings.php:23
 msgid "Not recommended, use for testing only."
@@ -139,19 +139,19 @@ msgstr "Не рекомендуется, используйте только д
 
 #: templates/settings.php:24
 msgid "User Display Name Field"
-msgstr ""
+msgstr "Поле отображаемого имени пользователя"
 
 #: templates/settings.php:24
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
-msgstr ""
+msgstr "Атрибут LDAP для генерации имени пользователя ownCloud."
 
 #: templates/settings.php:25
 msgid "Group Display Name Field"
-msgstr ""
+msgstr "Поле отображаемого имени группы"
 
 #: templates/settings.php:25
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
-msgstr ""
+msgstr "Атрибут LDAP для генерации имени группы ownCloud."
 
 #: templates/settings.php:27
 msgid "in bytes"
@@ -161,6 +161,12 @@ msgstr "в байтах"
 msgid "in seconds. A change empties the cache."
 msgstr "в секундах. Изменение очистит кэш."
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr "Помощь"
diff --git a/l10n/sk_SK/core.po b/l10n/sk_SK/core.po
index 42eb519975..c31e43e6eb 100644
--- a/l10n/sk_SK/core.po
+++ b/l10n/sk_SK/core.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -35,55 +35,55 @@ msgstr "Táto kategória už existuje:"
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 
-#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "Nastavenia"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "January"
 msgstr "Január"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "February"
 msgstr "Február"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "March"
 msgstr "Marec"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "April"
 msgstr "Apríl"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "May"
 msgstr "Máj"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "June"
 msgstr "Jún"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "July"
 msgstr "Júl"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "August"
 msgstr "August"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "September"
 msgstr "September"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "October"
 msgstr "Október"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "November"
 msgstr "November"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "December"
 msgstr "December"
 
@@ -131,7 +131,7 @@ msgstr "Požiadané"
 msgid "Login failed!"
 msgstr "Prihlásenie zlyhalo!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "Prihlasovacie meno"
@@ -192,48 +192,52 @@ msgstr "Úprava kategórií"
 msgid "Add"
 msgstr "Pridať"
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr "Vytvoriť <strong>administrátorský účet</strong>"
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "Heslo"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr "Pokročilé"
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "Priečinok dát"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "Nastaviť databázu"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "bude použité"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "Hostiteľ databázy"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "Heslo databázy"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "Meno databázy"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "Server databázy"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "Dokončiť inštaláciu"
 
diff --git a/l10n/sk_SK/files_odfviewer.po b/l10n/sk_SK/files_odfviewer.po
new file mode 100644
index 0000000000..b5e846e37f
--- /dev/null
+++ b/l10n/sk_SK/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sk_SK\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+
+#: js/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/sk_SK/files_pdfviewer.po b/l10n/sk_SK/files_pdfviewer.po
new file mode 100644
index 0000000000..aee04e4ec7
--- /dev/null
+++ b/l10n/sk_SK/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sk_SK\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+
+#: js/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/sk_SK/files_sharing.po b/l10n/sk_SK/files_sharing.po
index 3a4f00533b..9e19da94c8 100644
--- a/l10n/sk_SK/files_sharing.po
+++ b/l10n/sk_SK/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
@@ -17,18 +17,10 @@ msgstr ""
 "Language: sk_SK\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
 
-#: templates/get.php:4
-msgid "Size"
+#: templates/authenticate.php:4
+msgid "Password"
 msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete"
+#: templates/authenticate.php:6
+msgid "Submit"
 msgstr ""
diff --git a/l10n/sk_SK/files_texteditor.po b/l10n/sk_SK/files_texteditor.po
new file mode 100644
index 0000000000..af94e6a125
--- /dev/null
+++ b/l10n/sk_SK/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sk_SK\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+
+#: js/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/sk_SK/impress.po b/l10n/sk_SK/impress.po
new file mode 100644
index 0000000000..940f3f6325
--- /dev/null
+++ b/l10n/sk_SK/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sk_SK\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+
+#: templates/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/sk_SK/settings.po b/l10n/sk_SK/settings.po
index 8184b87355..77244df714 100644
--- a/l10n/sk_SK/settings.po
+++ b/l10n/sk_SK/settings.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-18 02:01+0200\n"
-"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
@@ -89,10 +89,46 @@ msgid "use systems cron service"
 msgstr ""
 
 #: templates/admin.php:39
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:67
 msgid "Log"
 msgstr "Záznam"
 
-#: templates/admin.php:67
+#: templates/admin.php:95
 msgid "More"
 msgstr "Viac"
 
diff --git a/l10n/sk_SK/user_ldap.po b/l10n/sk_SK/user_ldap.po
index 1fdd9af1e5..b0cc8b5a60 100644
--- a/l10n/sk_SK/user_ldap.po
+++ b/l10n/sk_SK/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -159,6 +159,12 @@ msgstr ""
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr ""
diff --git a/l10n/sl/core.po b/l10n/sl/core.po
index c3f2d15c36..9056484dc6 100644
--- a/l10n/sl/core.po
+++ b/l10n/sl/core.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -36,55 +36,55 @@ msgstr "Ta kategorija že obstaja:"
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 
-#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "Nastavitve"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "January"
 msgstr "januar"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "February"
 msgstr "februar"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "March"
 msgstr "marec"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "April"
 msgstr "april"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "May"
 msgstr "maj"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "June"
 msgstr "junij"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "July"
 msgstr "julij"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "August"
 msgstr "avgust"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "September"
 msgstr "september"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "October"
 msgstr "oktober"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "November"
 msgstr "november"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "December"
 msgstr "december"
 
@@ -132,7 +132,7 @@ msgstr "Zahtevano"
 msgid "Login failed!"
 msgstr "Prijava je spodletela!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "Uporabniško Ime"
@@ -193,48 +193,52 @@ msgstr "Uredi kategorije"
 msgid "Add"
 msgstr "Dodaj"
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr "Ustvari <strong>skrbniški račun</strong>"
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "Geslo"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr "Napredne možnosti"
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "Mapa s podatki"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "Nastavi podatkovno zbirko"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "bo uporabljen"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "Uporabnik zbirke"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "Geslo podatkovne zbirke"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "Ime podatkovne zbirke"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "Gostitelj podatkovne zbirke"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "Dokončaj namestitev"
 
diff --git a/l10n/sl/files_odfviewer.po b/l10n/sl/files_odfviewer.po
new file mode 100644
index 0000000000..700c0daba9
--- /dev/null
+++ b/l10n/sl/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3)\n"
+
+#: js/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/sl/files_pdfviewer.po b/l10n/sl/files_pdfviewer.po
new file mode 100644
index 0000000000..3a16e21f40
--- /dev/null
+++ b/l10n/sl/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3)\n"
+
+#: js/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/sl/files_sharing.po b/l10n/sl/files_sharing.po
index 56ed4e9046..9065df6a64 100644
--- a/l10n/sl/files_sharing.po
+++ b/l10n/sl/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -18,18 +18,10 @@ msgstr ""
 "Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3)\n"
 
-#: templates/get.php:4
-msgid "Size"
-msgstr "Velikost"
+#: templates/authenticate.php:4
+msgid "Password"
+msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr "Spremenjeno"
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr "Izbriši vse"
-
-#: templates/get.php:5
-msgid "Delete"
-msgstr "Izbris"
+#: templates/authenticate.php:6
+msgid "Submit"
+msgstr ""
diff --git a/l10n/sl/files_texteditor.po b/l10n/sl/files_texteditor.po
new file mode 100644
index 0000000000..4358bfa979
--- /dev/null
+++ b/l10n/sl/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3)\n"
+
+#: js/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/sl/impress.po b/l10n/sl/impress.po
new file mode 100644
index 0000000000..5d45e6c4fb
--- /dev/null
+++ b/l10n/sl/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3)\n"
+
+#: templates/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/sl/settings.po b/l10n/sl/settings.po
index 32ff133a37..1ee9f30e5e 100644
--- a/l10n/sl/settings.po
+++ b/l10n/sl/settings.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-19 02:02+0200\n"
-"PO-Revision-Date: 2012-08-18 13:08+0000\n"
-"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -89,10 +89,46 @@ msgid "use systems cron service"
 msgstr "uporabi sistemski servis za periodična opravila"
 
 #: templates/admin.php:39
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:67
 msgid "Log"
 msgstr "Dnevnik"
 
-#: templates/admin.php:67
+#: templates/admin.php:95
 msgid "More"
 msgstr "Več"
 
diff --git a/l10n/sl/user_ldap.po b/l10n/sl/user_ldap.po
index c405fb64d9..4a23050ed5 100644
--- a/l10n/sl/user_ldap.po
+++ b/l10n/sl/user_ldap.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-22 02:04+0200\n"
-"PO-Revision-Date: 2012-08-21 11:45+0000\n"
-"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -160,6 +160,12 @@ msgstr "v bajtih"
 msgid "in seconds. A change empties the cache."
 msgstr "v sekundah. Sprememba izprazni predpomnilnik."
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr "Pomoč"
diff --git a/l10n/so/core.po b/l10n/so/core.po
index 81021ac3e6..f0bef059c9 100644
--- a/l10n/so/core.po
+++ b/l10n/so/core.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Somali (http://www.transifex.com/projects/p/owncloud/language/so/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -33,55 +33,55 @@ msgstr ""
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "January"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "February"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "March"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "April"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "May"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "June"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "July"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "August"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "September"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "October"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "November"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "December"
 msgstr ""
 
@@ -129,7 +129,7 @@ msgstr ""
 msgid "Login failed!"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr ""
@@ -190,48 +190,52 @@ msgstr ""
 msgid "Add"
 msgstr ""
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr ""
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr ""
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr ""
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr ""
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr ""
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr ""
 
diff --git a/l10n/so/files_odfviewer.po b/l10n/so/files_odfviewer.po
new file mode 100644
index 0000000000..614758a322
--- /dev/null
+++ b/l10n/so/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Somali (http://www.transifex.com/projects/p/owncloud/language/so/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: so\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/so/files_pdfviewer.po b/l10n/so/files_pdfviewer.po
new file mode 100644
index 0000000000..05e648c741
--- /dev/null
+++ b/l10n/so/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Somali (http://www.transifex.com/projects/p/owncloud/language/so/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: so\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/so/files_sharing.po b/l10n/so/files_sharing.po
index c05e0f049b..94223b1fd3 100644
--- a/l10n/so/files_sharing.po
+++ b/l10n/so/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Somali (http://www.transifex.com/projects/p/owncloud/language/so/)\n"
 "MIME-Version: 1.0\n"
@@ -17,18 +17,10 @@ msgstr ""
 "Language: so\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: templates/get.php:4
-msgid "Size"
+#: templates/authenticate.php:4
+msgid "Password"
 msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete"
+#: templates/authenticate.php:6
+msgid "Submit"
 msgstr ""
diff --git a/l10n/so/files_texteditor.po b/l10n/so/files_texteditor.po
new file mode 100644
index 0000000000..aa6aad47d7
--- /dev/null
+++ b/l10n/so/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Somali (http://www.transifex.com/projects/p/owncloud/language/so/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: so\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/so/impress.po b/l10n/so/impress.po
new file mode 100644
index 0000000000..47c6506dae
--- /dev/null
+++ b/l10n/so/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Somali (http://www.transifex.com/projects/p/owncloud/language/so/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: so\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/so/settings.po b/l10n/so/settings.po
index bc0ef8b76c..a677a1e3bc 100644
--- a/l10n/so/settings.po
+++ b/l10n/so/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-18 02:01+0200\n"
-"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Somali (http://www.transifex.com/projects/p/owncloud/language/so/)\n"
 "MIME-Version: 1.0\n"
@@ -86,10 +86,46 @@ msgid "use systems cron service"
 msgstr ""
 
 #: templates/admin.php:39
-msgid "Log"
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
 msgstr ""
 
 #: templates/admin.php:67
+msgid "Log"
+msgstr ""
+
+#: templates/admin.php:95
 msgid "More"
 msgstr ""
 
diff --git a/l10n/so/user_ldap.po b/l10n/so/user_ldap.po
index bf35a13096..b4103a6c6d 100644
--- a/l10n/so/user_ldap.po
+++ b/l10n/so/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Somali (http://www.transifex.com/projects/p/owncloud/language/so/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -159,6 +159,12 @@ msgstr ""
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr ""
diff --git a/l10n/sr/core.po b/l10n/sr/core.po
index 58a7f8706a..814ff643d5 100644
--- a/l10n/sr/core.po
+++ b/l10n/sr/core.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -34,55 +34,55 @@ msgstr ""
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "Подешавања"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "January"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "February"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "March"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "April"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "May"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "June"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "July"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "August"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "September"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "October"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "November"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "December"
 msgstr ""
 
@@ -130,7 +130,7 @@ msgstr "Захтевано"
 msgid "Login failed!"
 msgstr "Несупела пријава!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "Корисничко име"
@@ -191,48 +191,52 @@ msgstr ""
 msgid "Add"
 msgstr ""
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr "Направи <strong>административни налог</strong>"
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "Лозинка"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr "Напредно"
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "Фацикла података"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "Подешавање базе"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "ће бити коришћен"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "Корисник базе"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "Лозинка базе"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "Име базе"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "Домаћин базе"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "Заврши подешавање"
 
diff --git a/l10n/sr/files_odfviewer.po b/l10n/sr/files_odfviewer.po
new file mode 100644
index 0000000000..9b251f5769
--- /dev/null
+++ b/l10n/sr/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sr\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: js/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/sr/files_pdfviewer.po b/l10n/sr/files_pdfviewer.po
new file mode 100644
index 0000000000..2cd94b83aa
--- /dev/null
+++ b/l10n/sr/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sr\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: js/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/sr/files_sharing.po b/l10n/sr/files_sharing.po
index b7dbb671d2..5979558f84 100644
--- a/l10n/sr/files_sharing.po
+++ b/l10n/sr/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -17,18 +17,10 @@ msgstr ""
 "Language: sr\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: templates/get.php:4
-msgid "Size"
+#: templates/authenticate.php:4
+msgid "Password"
 msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete"
+#: templates/authenticate.php:6
+msgid "Submit"
 msgstr ""
diff --git a/l10n/sr/files_texteditor.po b/l10n/sr/files_texteditor.po
new file mode 100644
index 0000000000..d7e1815f9a
--- /dev/null
+++ b/l10n/sr/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sr\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: js/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/sr/impress.po b/l10n/sr/impress.po
new file mode 100644
index 0000000000..230778dd99
--- /dev/null
+++ b/l10n/sr/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sr\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: templates/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/sr/settings.po b/l10n/sr/settings.po
index 58e3af2ba4..df8d3be27c 100644
--- a/l10n/sr/settings.po
+++ b/l10n/sr/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-18 02:01+0200\n"
-"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -87,10 +87,46 @@ msgid "use systems cron service"
 msgstr ""
 
 #: templates/admin.php:39
-msgid "Log"
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
 msgstr ""
 
 #: templates/admin.php:67
+msgid "Log"
+msgstr ""
+
+#: templates/admin.php:95
 msgid "More"
 msgstr ""
 
diff --git a/l10n/sr/user_ldap.po b/l10n/sr/user_ldap.po
index 4e3f01a3b6..eaf9622b4f 100644
--- a/l10n/sr/user_ldap.po
+++ b/l10n/sr/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -159,6 +159,12 @@ msgstr ""
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr ""
diff --git a/l10n/sr@latin/core.po b/l10n/sr@latin/core.po
index 4577fbf12d..b6526ca53b 100644
--- a/l10n/sr@latin/core.po
+++ b/l10n/sr@latin/core.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -34,55 +34,55 @@ msgstr ""
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "Podešavanja"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "January"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "February"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "March"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "April"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "May"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "June"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "July"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "August"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "September"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "October"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "November"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "December"
 msgstr ""
 
@@ -130,7 +130,7 @@ msgstr "Zahtevano"
 msgid "Login failed!"
 msgstr "Nesupela prijava!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "Korisničko ime"
@@ -191,48 +191,52 @@ msgstr ""
 msgid "Add"
 msgstr ""
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr "Napravi <strong>administrativni nalog</strong>"
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "Lozinka"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr "Napredno"
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "Facikla podataka"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "Podešavanje baze"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "će biti korišćen"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "Korisnik baze"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "Lozinka baze"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "Ime baze"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "Domaćin baze"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "Završi podešavanje"
 
diff --git a/l10n/sr@latin/files_odfviewer.po b/l10n/sr@latin/files_odfviewer.po
new file mode 100644
index 0000000000..3bd414595d
--- /dev/null
+++ b/l10n/sr@latin/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sr@latin\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: js/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/sr@latin/files_pdfviewer.po b/l10n/sr@latin/files_pdfviewer.po
new file mode 100644
index 0000000000..c63e430bcb
--- /dev/null
+++ b/l10n/sr@latin/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sr@latin\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: js/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/sr@latin/files_sharing.po b/l10n/sr@latin/files_sharing.po
index 4f3a03c203..918bd167e0 100644
--- a/l10n/sr@latin/files_sharing.po
+++ b/l10n/sr@latin/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -17,18 +17,10 @@ msgstr ""
 "Language: sr@latin\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: templates/get.php:4
-msgid "Size"
+#: templates/authenticate.php:4
+msgid "Password"
 msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete"
+#: templates/authenticate.php:6
+msgid "Submit"
 msgstr ""
diff --git a/l10n/sr@latin/files_texteditor.po b/l10n/sr@latin/files_texteditor.po
new file mode 100644
index 0000000000..a3902531ee
--- /dev/null
+++ b/l10n/sr@latin/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sr@latin\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: js/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/sr@latin/impress.po b/l10n/sr@latin/impress.po
new file mode 100644
index 0000000000..7d751ecd40
--- /dev/null
+++ b/l10n/sr@latin/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sr@latin\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: templates/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/sr@latin/settings.po b/l10n/sr@latin/settings.po
index 75b8006fa2..b5239835de 100644
--- a/l10n/sr@latin/settings.po
+++ b/l10n/sr@latin/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-18 02:01+0200\n"
-"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -87,10 +87,46 @@ msgid "use systems cron service"
 msgstr ""
 
 #: templates/admin.php:39
-msgid "Log"
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
 msgstr ""
 
 #: templates/admin.php:67
+msgid "Log"
+msgstr ""
+
+#: templates/admin.php:95
 msgid "More"
 msgstr ""
 
diff --git a/l10n/sr@latin/user_ldap.po b/l10n/sr@latin/user_ldap.po
index c37681c121..6f56c8e03d 100644
--- a/l10n/sr@latin/user_ldap.po
+++ b/l10n/sr@latin/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -159,6 +159,12 @@ msgstr ""
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr ""
diff --git a/l10n/sv/core.po b/l10n/sv/core.po
index 92631fa760..325f61911a 100644
--- a/l10n/sv/core.po
+++ b/l10n/sv/core.po
@@ -13,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-22 02:04+0200\n"
-"PO-Revision-Date: 2012-08-21 08:33+0000\n"
-"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -39,55 +39,55 @@ msgstr "Denna kategori finns redan:"
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 
-#: js/js.js:190 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "Inställningar"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "January"
 msgstr "Januari"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "February"
 msgstr "Februari"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "March"
 msgstr "Mars"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "April"
 msgstr "April"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "May"
 msgstr "Maj"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "June"
 msgstr "Juni"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "July"
 msgstr "Juli"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "August"
 msgstr "Augusti"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "September"
 msgstr "September"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "October"
 msgstr "Oktober"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "November"
 msgstr "November"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "December"
 msgstr "December"
 
@@ -135,7 +135,7 @@ msgstr "Begärd"
 msgid "Login failed!"
 msgstr "Misslyckad inloggning!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "Användarnamn"
@@ -196,48 +196,52 @@ msgstr "Redigera kategorier"
 msgid "Add"
 msgstr "Lägg till"
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr "Skapa ett <strong>administratörskonto</strong>"
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "Lösenord"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr "Avancerat"
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "Datamapp"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "Konfigurera databasen"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "kommer att användas"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "Databasanvändare"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "Lösenord till databasen"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "Databasnamn"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "Databasserver"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "Avsluta installation"
 
diff --git a/l10n/sv/files_odfviewer.po b/l10n/sv/files_odfviewer.po
new file mode 100644
index 0000000000..35b60c1eb8
--- /dev/null
+++ b/l10n/sv/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/sv/files_pdfviewer.po b/l10n/sv/files_pdfviewer.po
new file mode 100644
index 0000000000..674a9273ca
--- /dev/null
+++ b/l10n/sv/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/sv/files_sharing.po b/l10n/sv/files_sharing.po
index dada4f4e79..71f71e1dda 100644
--- a/l10n/sv/files_sharing.po
+++ b/l10n/sv/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -18,18 +18,10 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: templates/get.php:4
-msgid "Size"
-msgstr "Storlek"
+#: templates/authenticate.php:4
+msgid "Password"
+msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr "Ändrad"
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr "Radera alla"
-
-#: templates/get.php:5
-msgid "Delete"
-msgstr "Radera"
+#: templates/authenticate.php:6
+msgid "Submit"
+msgstr ""
diff --git a/l10n/sv/files_texteditor.po b/l10n/sv/files_texteditor.po
new file mode 100644
index 0000000000..e29a0d220c
--- /dev/null
+++ b/l10n/sv/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/sv/impress.po b/l10n/sv/impress.po
new file mode 100644
index 0000000000..93637c418a
--- /dev/null
+++ b/l10n/sv/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/sv/settings.po b/l10n/sv/settings.po
index f764a35f03..205f6b1314 100644
--- a/l10n/sv/settings.po
+++ b/l10n/sv/settings.po
@@ -14,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-22 06:21+0000\n"
-"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -93,10 +93,46 @@ msgid "use systems cron service"
 msgstr "använd systemets cron-tjänst"
 
 #: templates/admin.php:39
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:67
 msgid "Log"
 msgstr "Logg"
 
-#: templates/admin.php:67
+#: templates/admin.php:95
 msgid "More"
 msgstr "Mera"
 
diff --git a/l10n/sv/user_ldap.po b/l10n/sv/user_ldap.po
index 55f7bbecf9..d5691270f2 100644
--- a/l10n/sv/user_ldap.po
+++ b/l10n/sv/user_ldap.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-13 12:33+0000\n"
-"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -160,6 +160,12 @@ msgstr "i bytes"
 msgid "in seconds. A change empties the cache."
 msgstr "i sekunder. En förändring tömmer cache."
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr "Hjälp"
diff --git a/l10n/templates/admin_dependencies_chk.pot b/l10n/templates/admin_dependencies_chk.pot
deleted file mode 100644
index ae9512efe8..0000000000
--- a/l10n/templates/admin_dependencies_chk.pot
+++ /dev/null
@@ -1,71 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-25 02:04+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: settings.php:33
-msgid ""
-"The php-json module is needed by the many applications for inter "
-"communications"
-msgstr ""
-
-#: settings.php:39
-msgid ""
-"The php-curl modude is needed to fetch the page title when adding a bookmarks"
-msgstr ""
-
-#: settings.php:45
-msgid "The php-gd module is needed to create thumbnails of your images"
-msgstr ""
-
-#: settings.php:51
-msgid "The php-ldap module is needed connect to your ldap server"
-msgstr ""
-
-#: settings.php:57
-msgid "The php-zip module is needed download multiple files at once"
-msgstr ""
-
-#: settings.php:63
-msgid "The php-mb_multibyte module is needed to manage correctly the encoding."
-msgstr ""
-
-#: settings.php:69
-msgid "The php-ctype module is needed validate data."
-msgstr ""
-
-#: settings.php:75
-msgid "The php-xml module is needed to share files with webdav."
-msgstr ""
-
-#: settings.php:81
-msgid ""
-"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve "
-"knowledge base from OCS servers"
-msgstr ""
-
-#: settings.php:87
-msgid "The php-pdo module is needed to store owncloud data into a database."
-msgstr ""
-
-#: templates/settings.php:2
-msgid "Dependencies status"
-msgstr ""
-
-#: templates/settings.php:7
-msgid "Used by :"
-msgstr ""
diff --git a/l10n/templates/admin_migrate.pot b/l10n/templates/admin_migrate.pot
deleted file mode 100644
index 78b49fcdb8..0000000000
--- a/l10n/templates/admin_migrate.pot
+++ /dev/null
@@ -1,33 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-25 02:04+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: templates/settings.php:3
-msgid "Export this ownCloud instance"
-msgstr ""
-
-#: templates/settings.php:4
-msgid ""
-"This will create a compressed file that contains the data of this owncloud "
-"instance.\n"
-"            Please choose the export type:"
-msgstr ""
-
-#: templates/settings.php:12
-msgid "Export"
-msgstr ""
diff --git a/l10n/templates/bookmarks.pot b/l10n/templates/bookmarks.pot
deleted file mode 100644
index 7668869f08..0000000000
--- a/l10n/templates/bookmarks.pot
+++ /dev/null
@@ -1,60 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-25 02:04+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: appinfo/app.php:14
-msgid "Bookmarks"
-msgstr ""
-
-#: bookmarksHelper.php:99
-msgid "unnamed"
-msgstr ""
-
-#: templates/bookmarklet.php:5
-msgid ""
-"Drag this to your browser bookmarks and click it, when you want to bookmark "
-"a webpage quickly:"
-msgstr ""
-
-#: templates/bookmarklet.php:7
-msgid "Read later"
-msgstr ""
-
-#: templates/list.php:13
-msgid "Address"
-msgstr ""
-
-#: templates/list.php:14
-msgid "Title"
-msgstr ""
-
-#: templates/list.php:15
-msgid "Tags"
-msgstr ""
-
-#: templates/list.php:16
-msgid "Save bookmark"
-msgstr ""
-
-#: templates/list.php:22
-msgid "You have no bookmarks"
-msgstr ""
-
-#: templates/settings.php:11
-msgid "Bookmarklet <br />"
-msgstr ""
diff --git a/l10n/templates/calendar.pot b/l10n/templates/calendar.pot
deleted file mode 100644
index b1a31a8a73..0000000000
--- a/l10n/templates/calendar.pot
+++ /dev/null
@@ -1,813 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-25 02:04+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: ajax/cache/status.php:19
-msgid "Not all calendars are completely cached"
-msgstr ""
-
-#: ajax/cache/status.php:21
-msgid "Everything seems to be completely cached"
-msgstr ""
-
-#: ajax/categories/rescan.php:29
-msgid "No calendars found."
-msgstr ""
-
-#: ajax/categories/rescan.php:37
-msgid "No events found."
-msgstr ""
-
-#: ajax/event/edit.form.php:20
-msgid "Wrong calendar"
-msgstr ""
-
-#: ajax/import/dropimport.php:29 ajax/import/import.php:64
-msgid ""
-"The file contained either no events or all events are already saved in your "
-"calendar."
-msgstr ""
-
-#: ajax/import/dropimport.php:31 ajax/import/import.php:67
-msgid "events has been saved in the new calendar"
-msgstr ""
-
-#: ajax/import/import.php:56
-msgid "Import failed"
-msgstr ""
-
-#: ajax/import/import.php:69
-msgid "events has been saved in your calendar"
-msgstr ""
-
-#: ajax/settings/guesstimezone.php:25
-msgid "New Timezone:"
-msgstr ""
-
-#: ajax/settings/settimezone.php:23
-msgid "Timezone changed"
-msgstr ""
-
-#: ajax/settings/settimezone.php:25
-msgid "Invalid request"
-msgstr ""
-
-#: appinfo/app.php:41 templates/calendar.php:15
-#: templates/part.eventform.php:33 templates/part.showevent.php:33
-msgid "Calendar"
-msgstr ""
-
-#: js/calendar.js:832
-msgid "ddd"
-msgstr ""
-
-#: js/calendar.js:833
-msgid "ddd M/d"
-msgstr ""
-
-#: js/calendar.js:834
-msgid "dddd M/d"
-msgstr ""
-
-#: js/calendar.js:837
-msgid "MMMM yyyy"
-msgstr ""
-
-#: js/calendar.js:839
-msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
-msgstr ""
-
-#: js/calendar.js:841
-msgid "dddd, MMM d, yyyy"
-msgstr ""
-
-#: lib/app.php:121
-msgid "Birthday"
-msgstr ""
-
-#: lib/app.php:122
-msgid "Business"
-msgstr ""
-
-#: lib/app.php:123
-msgid "Call"
-msgstr ""
-
-#: lib/app.php:124
-msgid "Clients"
-msgstr ""
-
-#: lib/app.php:125
-msgid "Deliverer"
-msgstr ""
-
-#: lib/app.php:126
-msgid "Holidays"
-msgstr ""
-
-#: lib/app.php:127
-msgid "Ideas"
-msgstr ""
-
-#: lib/app.php:128
-msgid "Journey"
-msgstr ""
-
-#: lib/app.php:129
-msgid "Jubilee"
-msgstr ""
-
-#: lib/app.php:130
-msgid "Meeting"
-msgstr ""
-
-#: lib/app.php:131
-msgid "Other"
-msgstr ""
-
-#: lib/app.php:132
-msgid "Personal"
-msgstr ""
-
-#: lib/app.php:133
-msgid "Projects"
-msgstr ""
-
-#: lib/app.php:134
-msgid "Questions"
-msgstr ""
-
-#: lib/app.php:135
-msgid "Work"
-msgstr ""
-
-#: lib/app.php:351 lib/app.php:361
-msgid "by"
-msgstr ""
-
-#: lib/app.php:359 lib/app.php:399
-msgid "unnamed"
-msgstr ""
-
-#: lib/import.php:184 templates/calendar.php:12
-#: templates/part.choosecalendar.php:22
-msgid "New Calendar"
-msgstr ""
-
-#: lib/object.php:372
-msgid "Does not repeat"
-msgstr ""
-
-#: lib/object.php:373
-msgid "Daily"
-msgstr ""
-
-#: lib/object.php:374
-msgid "Weekly"
-msgstr ""
-
-#: lib/object.php:375
-msgid "Every Weekday"
-msgstr ""
-
-#: lib/object.php:376
-msgid "Bi-Weekly"
-msgstr ""
-
-#: lib/object.php:377
-msgid "Monthly"
-msgstr ""
-
-#: lib/object.php:378
-msgid "Yearly"
-msgstr ""
-
-#: lib/object.php:388
-msgid "never"
-msgstr ""
-
-#: lib/object.php:389
-msgid "by occurrences"
-msgstr ""
-
-#: lib/object.php:390
-msgid "by date"
-msgstr ""
-
-#: lib/object.php:400
-msgid "by monthday"
-msgstr ""
-
-#: lib/object.php:401
-msgid "by weekday"
-msgstr ""
-
-#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
-msgid "Monday"
-msgstr ""
-
-#: lib/object.php:412 templates/calendar.php:5
-msgid "Tuesday"
-msgstr ""
-
-#: lib/object.php:413 templates/calendar.php:5
-msgid "Wednesday"
-msgstr ""
-
-#: lib/object.php:414 templates/calendar.php:5
-msgid "Thursday"
-msgstr ""
-
-#: lib/object.php:415 templates/calendar.php:5
-msgid "Friday"
-msgstr ""
-
-#: lib/object.php:416 templates/calendar.php:5
-msgid "Saturday"
-msgstr ""
-
-#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
-msgid "Sunday"
-msgstr ""
-
-#: lib/object.php:427
-msgid "events week of month"
-msgstr ""
-
-#: lib/object.php:428
-msgid "first"
-msgstr ""
-
-#: lib/object.php:429
-msgid "second"
-msgstr ""
-
-#: lib/object.php:430
-msgid "third"
-msgstr ""
-
-#: lib/object.php:431
-msgid "fourth"
-msgstr ""
-
-#: lib/object.php:432
-msgid "fifth"
-msgstr ""
-
-#: lib/object.php:433
-msgid "last"
-msgstr ""
-
-#: lib/object.php:467 templates/calendar.php:7
-msgid "January"
-msgstr ""
-
-#: lib/object.php:468 templates/calendar.php:7
-msgid "February"
-msgstr ""
-
-#: lib/object.php:469 templates/calendar.php:7
-msgid "March"
-msgstr ""
-
-#: lib/object.php:470 templates/calendar.php:7
-msgid "April"
-msgstr ""
-
-#: lib/object.php:471 templates/calendar.php:7
-msgid "May"
-msgstr ""
-
-#: lib/object.php:472 templates/calendar.php:7
-msgid "June"
-msgstr ""
-
-#: lib/object.php:473 templates/calendar.php:7
-msgid "July"
-msgstr ""
-
-#: lib/object.php:474 templates/calendar.php:7
-msgid "August"
-msgstr ""
-
-#: lib/object.php:475 templates/calendar.php:7
-msgid "September"
-msgstr ""
-
-#: lib/object.php:476 templates/calendar.php:7
-msgid "October"
-msgstr ""
-
-#: lib/object.php:477 templates/calendar.php:7
-msgid "November"
-msgstr ""
-
-#: lib/object.php:478 templates/calendar.php:7
-msgid "December"
-msgstr ""
-
-#: lib/object.php:488
-msgid "by events date"
-msgstr ""
-
-#: lib/object.php:489
-msgid "by yearday(s)"
-msgstr ""
-
-#: lib/object.php:490
-msgid "by weeknumber(s)"
-msgstr ""
-
-#: lib/object.php:491
-msgid "by day and month"
-msgstr ""
-
-#: lib/search.php:35 lib/search.php:37 lib/search.php:40
-msgid "Date"
-msgstr ""
-
-#: lib/search.php:43
-msgid "Cal."
-msgstr ""
-
-#: templates/calendar.php:6
-msgid "Sun."
-msgstr ""
-
-#: templates/calendar.php:6
-msgid "Mon."
-msgstr ""
-
-#: templates/calendar.php:6
-msgid "Tue."
-msgstr ""
-
-#: templates/calendar.php:6
-msgid "Wed."
-msgstr ""
-
-#: templates/calendar.php:6
-msgid "Thu."
-msgstr ""
-
-#: templates/calendar.php:6
-msgid "Fri."
-msgstr ""
-
-#: templates/calendar.php:6
-msgid "Sat."
-msgstr ""
-
-#: templates/calendar.php:8
-msgid "Jan."
-msgstr ""
-
-#: templates/calendar.php:8
-msgid "Feb."
-msgstr ""
-
-#: templates/calendar.php:8
-msgid "Mar."
-msgstr ""
-
-#: templates/calendar.php:8
-msgid "Apr."
-msgstr ""
-
-#: templates/calendar.php:8
-msgid "May."
-msgstr ""
-
-#: templates/calendar.php:8
-msgid "Jun."
-msgstr ""
-
-#: templates/calendar.php:8
-msgid "Jul."
-msgstr ""
-
-#: templates/calendar.php:8
-msgid "Aug."
-msgstr ""
-
-#: templates/calendar.php:8
-msgid "Sep."
-msgstr ""
-
-#: templates/calendar.php:8
-msgid "Oct."
-msgstr ""
-
-#: templates/calendar.php:8
-msgid "Nov."
-msgstr ""
-
-#: templates/calendar.php:8
-msgid "Dec."
-msgstr ""
-
-#: templates/calendar.php:11
-msgid "All day"
-msgstr ""
-
-#: templates/calendar.php:13
-msgid "Missing fields"
-msgstr ""
-
-#: templates/calendar.php:14 templates/part.eventform.php:19
-#: templates/part.showevent.php:11
-msgid "Title"
-msgstr ""
-
-#: templates/calendar.php:16
-msgid "From Date"
-msgstr ""
-
-#: templates/calendar.php:17
-msgid "From Time"
-msgstr ""
-
-#: templates/calendar.php:18
-msgid "To Date"
-msgstr ""
-
-#: templates/calendar.php:19
-msgid "To Time"
-msgstr ""
-
-#: templates/calendar.php:20
-msgid "The event ends before it starts"
-msgstr ""
-
-#: templates/calendar.php:21
-msgid "There was a database fail"
-msgstr ""
-
-#: templates/calendar.php:39
-msgid "Week"
-msgstr ""
-
-#: templates/calendar.php:40
-msgid "Month"
-msgstr ""
-
-#: templates/calendar.php:41
-msgid "List"
-msgstr ""
-
-#: templates/calendar.php:45
-msgid "Today"
-msgstr ""
-
-#: templates/calendar.php:46 templates/calendar.php:47
-msgid "Settings"
-msgstr ""
-
-#: templates/part.choosecalendar.php:2
-msgid "Your calendars"
-msgstr ""
-
-#: templates/part.choosecalendar.php:27
-#: templates/part.choosecalendar.rowfields.php:11
-msgid "CalDav Link"
-msgstr ""
-
-#: templates/part.choosecalendar.php:31
-msgid "Shared calendars"
-msgstr ""
-
-#: templates/part.choosecalendar.php:48
-msgid "No shared calendars"
-msgstr ""
-
-#: templates/part.choosecalendar.rowfields.php:8
-msgid "Share Calendar"
-msgstr ""
-
-#: templates/part.choosecalendar.rowfields.php:14
-msgid "Download"
-msgstr ""
-
-#: templates/part.choosecalendar.rowfields.php:17
-msgid "Edit"
-msgstr ""
-
-#: templates/part.choosecalendar.rowfields.php:20
-#: templates/part.editevent.php:9
-msgid "Delete"
-msgstr ""
-
-#: templates/part.choosecalendar.rowfields.shared.php:4
-msgid "shared with you by"
-msgstr ""
-
-#: templates/part.editcalendar.php:9
-msgid "New calendar"
-msgstr ""
-
-#: templates/part.editcalendar.php:9
-msgid "Edit calendar"
-msgstr ""
-
-#: templates/part.editcalendar.php:12
-msgid "Displayname"
-msgstr ""
-
-#: templates/part.editcalendar.php:23
-msgid "Active"
-msgstr ""
-
-#: templates/part.editcalendar.php:29
-msgid "Calendar color"
-msgstr ""
-
-#: templates/part.editcalendar.php:42
-msgid "Save"
-msgstr ""
-
-#: templates/part.editcalendar.php:42 templates/part.editevent.php:8
-#: templates/part.newevent.php:6
-msgid "Submit"
-msgstr ""
-
-#: templates/part.editcalendar.php:43
-msgid "Cancel"
-msgstr ""
-
-#: templates/part.editevent.php:1
-msgid "Edit an event"
-msgstr ""
-
-#: templates/part.editevent.php:10
-msgid "Export"
-msgstr ""
-
-#: templates/part.eventform.php:8 templates/part.showevent.php:3
-msgid "Eventinfo"
-msgstr ""
-
-#: templates/part.eventform.php:9 templates/part.showevent.php:4
-msgid "Repeating"
-msgstr ""
-
-#: templates/part.eventform.php:10 templates/part.showevent.php:5
-msgid "Alarm"
-msgstr ""
-
-#: templates/part.eventform.php:11 templates/part.showevent.php:6
-msgid "Attendees"
-msgstr ""
-
-#: templates/part.eventform.php:13
-msgid "Share"
-msgstr ""
-
-#: templates/part.eventform.php:21
-msgid "Title of the Event"
-msgstr ""
-
-#: templates/part.eventform.php:27 templates/part.showevent.php:19
-msgid "Category"
-msgstr ""
-
-#: templates/part.eventform.php:29
-msgid "Separate categories with commas"
-msgstr ""
-
-#: templates/part.eventform.php:30
-msgid "Edit categories"
-msgstr ""
-
-#: templates/part.eventform.php:56 templates/part.showevent.php:52
-msgid "All Day Event"
-msgstr ""
-
-#: templates/part.eventform.php:60 templates/part.showevent.php:56
-msgid "From"
-msgstr ""
-
-#: templates/part.eventform.php:68 templates/part.showevent.php:64
-msgid "To"
-msgstr ""
-
-#: templates/part.eventform.php:76 templates/part.showevent.php:72
-msgid "Advanced options"
-msgstr ""
-
-#: templates/part.eventform.php:81 templates/part.showevent.php:77
-msgid "Location"
-msgstr ""
-
-#: templates/part.eventform.php:83
-msgid "Location of the Event"
-msgstr ""
-
-#: templates/part.eventform.php:89 templates/part.showevent.php:85
-msgid "Description"
-msgstr ""
-
-#: templates/part.eventform.php:91
-msgid "Description of the Event"
-msgstr ""
-
-#: templates/part.eventform.php:100 templates/part.showevent.php:95
-msgid "Repeat"
-msgstr ""
-
-#: templates/part.eventform.php:107 templates/part.showevent.php:102
-msgid "Advanced"
-msgstr ""
-
-#: templates/part.eventform.php:151 templates/part.showevent.php:146
-msgid "Select weekdays"
-msgstr ""
-
-#: templates/part.eventform.php:164 templates/part.eventform.php:177
-#: templates/part.showevent.php:159 templates/part.showevent.php:172
-msgid "Select days"
-msgstr ""
-
-#: templates/part.eventform.php:169 templates/part.showevent.php:164
-msgid "and the events day of year."
-msgstr ""
-
-#: templates/part.eventform.php:182 templates/part.showevent.php:177
-msgid "and the events day of month."
-msgstr ""
-
-#: templates/part.eventform.php:190 templates/part.showevent.php:185
-msgid "Select months"
-msgstr ""
-
-#: templates/part.eventform.php:203 templates/part.showevent.php:198
-msgid "Select weeks"
-msgstr ""
-
-#: templates/part.eventform.php:208 templates/part.showevent.php:203
-msgid "and the events week of year."
-msgstr ""
-
-#: templates/part.eventform.php:214 templates/part.showevent.php:209
-msgid "Interval"
-msgstr ""
-
-#: templates/part.eventform.php:220 templates/part.showevent.php:215
-msgid "End"
-msgstr ""
-
-#: templates/part.eventform.php:233 templates/part.showevent.php:228
-msgid "occurrences"
-msgstr ""
-
-#: templates/part.import.php:14
-msgid "create a new calendar"
-msgstr ""
-
-#: templates/part.import.php:17
-msgid "Import a calendar file"
-msgstr ""
-
-#: templates/part.import.php:24
-msgid "Please choose a calendar"
-msgstr ""
-
-#: templates/part.import.php:36
-msgid "Name of new calendar"
-msgstr ""
-
-#: templates/part.import.php:44
-msgid "Take an available name!"
-msgstr ""
-
-#: templates/part.import.php:45
-msgid ""
-"A Calendar with this name already exists. If you continue anyhow, these "
-"calendars will be merged."
-msgstr ""
-
-#: templates/part.import.php:47
-msgid "Import"
-msgstr ""
-
-#: templates/part.import.php:56
-msgid "Close Dialog"
-msgstr ""
-
-#: templates/part.newevent.php:1
-msgid "Create a new event"
-msgstr ""
-
-#: templates/part.showevent.php:1
-msgid "View an event"
-msgstr ""
-
-#: templates/part.showevent.php:23
-msgid "No categories selected"
-msgstr ""
-
-#: templates/part.showevent.php:37
-msgid "of"
-msgstr ""
-
-#: templates/part.showevent.php:59 templates/part.showevent.php:67
-msgid "at"
-msgstr ""
-
-#: templates/settings.php:10
-msgid "General"
-msgstr ""
-
-#: templates/settings.php:15
-msgid "Timezone"
-msgstr ""
-
-#: templates/settings.php:47
-msgid "Update timezone automatically"
-msgstr ""
-
-#: templates/settings.php:52
-msgid "Time format"
-msgstr ""
-
-#: templates/settings.php:57
-msgid "24h"
-msgstr ""
-
-#: templates/settings.php:58
-msgid "12h"
-msgstr ""
-
-#: templates/settings.php:64
-msgid "Start week on"
-msgstr ""
-
-#: templates/settings.php:76
-msgid "Cache"
-msgstr ""
-
-#: templates/settings.php:80
-msgid "Clear cache for repeating events"
-msgstr ""
-
-#: templates/settings.php:85
-msgid "URLs"
-msgstr ""
-
-#: templates/settings.php:87
-msgid "Calendar CalDAV syncing addresses"
-msgstr ""
-
-#: templates/settings.php:87
-msgid "more info"
-msgstr ""
-
-#: templates/settings.php:89
-msgid "Primary address (Kontact et al)"
-msgstr ""
-
-#: templates/settings.php:91
-msgid "iOS/OS X"
-msgstr ""
-
-#: templates/settings.php:93
-msgid "Read only iCalendar link(s)"
-msgstr ""
-
-#: templates/share.dropdown.php:20
-msgid "Users"
-msgstr ""
-
-#: templates/share.dropdown.php:21
-msgid "select users"
-msgstr ""
-
-#: templates/share.dropdown.php:36 templates/share.dropdown.php:62
-msgid "Editable"
-msgstr ""
-
-#: templates/share.dropdown.php:48
-msgid "Groups"
-msgstr ""
-
-#: templates/share.dropdown.php:49
-msgid "select groups"
-msgstr ""
-
-#: templates/share.dropdown.php:75
-msgid "make public"
-msgstr ""
diff --git a/l10n/templates/contacts.pot b/l10n/templates/contacts.pot
deleted file mode 100644
index 0166743621..0000000000
--- a/l10n/templates/contacts.pot
+++ /dev/null
@@ -1,952 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-25 02:04+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
-msgid "Error (de)activating addressbook."
-msgstr ""
-
-#: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:32
-#: ajax/contact/saveproperty.php:39
-msgid "id is not set."
-msgstr ""
-
-#: ajax/addressbook/update.php:24
-msgid "Cannot update addressbook with an empty name."
-msgstr ""
-
-#: ajax/addressbook/update.php:28
-msgid "Error updating addressbook."
-msgstr ""
-
-#: ajax/categories/categoriesfor.php:17
-msgid "No ID provided"
-msgstr ""
-
-#: ajax/categories/categoriesfor.php:34
-msgid "Error setting checksum."
-msgstr ""
-
-#: ajax/categories/delete.php:19
-msgid "No categories selected for deletion."
-msgstr ""
-
-#: ajax/categories/delete.php:26
-msgid "No address books found."
-msgstr ""
-
-#: ajax/categories/delete.php:34
-msgid "No contacts found."
-msgstr ""
-
-#: ajax/contact/add.php:47
-msgid "There was an error adding the contact."
-msgstr ""
-
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
-msgid "element name is not set."
-msgstr ""
-
-#: ajax/contact/addproperty.php:46
-msgid "Could not parse contact: "
-msgstr ""
-
-#: ajax/contact/addproperty.php:56
-msgid "Cannot add empty property."
-msgstr ""
-
-#: ajax/contact/addproperty.php:67
-msgid "At least one of the address fields has to be filled out."
-msgstr ""
-
-#: ajax/contact/addproperty.php:76
-msgid "Trying to add duplicate property: "
-msgstr ""
-
-#: ajax/contact/addproperty.php:115 ajax/contact/saveproperty.php:93
-msgid "Missing IM parameter."
-msgstr ""
-
-#: ajax/contact/addproperty.php:119 ajax/contact/saveproperty.php:97
-msgid "Unknown IM: "
-msgstr ""
-
-#: ajax/contact/deleteproperty.php:37
-msgid "Information about vCard is incorrect. Please reload the page."
-msgstr ""
-
-#: ajax/contact/details.php:31
-msgid "Missing ID"
-msgstr ""
-
-#: ajax/contact/details.php:36
-msgid "Error parsing VCard for ID: \""
-msgstr ""
-
-#: ajax/contact/saveproperty.php:42
-msgid "checksum is not set."
-msgstr ""
-
-#: ajax/contact/saveproperty.php:62
-msgid "Information about vCard is incorrect. Please reload the page: "
-msgstr ""
-
-#: ajax/contact/saveproperty.php:69
-msgid "Something went FUBAR. "
-msgstr ""
-
-#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
-#: ajax/uploadphoto.php:68
-msgid "No contact ID was submitted."
-msgstr ""
-
-#: ajax/currentphoto.php:36
-msgid "Error reading contact photo."
-msgstr ""
-
-#: ajax/currentphoto.php:48
-msgid "Error saving temporary file."
-msgstr ""
-
-#: ajax/currentphoto.php:51
-msgid "The loading photo is not valid."
-msgstr ""
-
-#: ajax/editname.php:31
-msgid "Contact ID is missing."
-msgstr ""
-
-#: ajax/oc_photo.php:32
-msgid "No photo path was submitted."
-msgstr ""
-
-#: ajax/oc_photo.php:39
-msgid "File doesn't exist:"
-msgstr ""
-
-#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
-msgid "Error loading image."
-msgstr ""
-
-#: ajax/savecrop.php:69
-msgid "Error getting contact object."
-msgstr ""
-
-#: ajax/savecrop.php:79
-msgid "Error getting PHOTO property."
-msgstr ""
-
-#: ajax/savecrop.php:98
-msgid "Error saving contact."
-msgstr ""
-
-#: ajax/savecrop.php:109
-msgid "Error resizing image"
-msgstr ""
-
-#: ajax/savecrop.php:112
-msgid "Error cropping image"
-msgstr ""
-
-#: ajax/savecrop.php:115
-msgid "Error creating temporary image"
-msgstr ""
-
-#: ajax/savecrop.php:118
-msgid "Error finding image: "
-msgstr ""
-
-#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
-msgid "Error uploading contacts to storage."
-msgstr ""
-
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
-msgid "There is no error, the file uploaded with success"
-msgstr ""
-
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
-msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
-msgstr ""
-
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
-msgid ""
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
-"the HTML form"
-msgstr ""
-
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
-msgid "The uploaded file was only partially uploaded"
-msgstr ""
-
-#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
-msgid "No file was uploaded"
-msgstr ""
-
-#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
-msgid "Missing a temporary folder"
-msgstr ""
-
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
-msgid "Couldn't save temporary image: "
-msgstr ""
-
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
-msgid "Couldn't load temporary image: "
-msgstr ""
-
-#: ajax/uploadphoto.php:71
-msgid "No file was uploaded. Unknown error"
-msgstr ""
-
-#: appinfo/app.php:25
-msgid "Contacts"
-msgstr ""
-
-#: js/contacts.js:71
-msgid "Sorry, this functionality has not been implemented yet"
-msgstr ""
-
-#: js/contacts.js:71
-msgid "Not implemented"
-msgstr ""
-
-#: js/contacts.js:76
-msgid "Couldn't get a valid address."
-msgstr ""
-
-#: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
-#: js/contacts.js:723 js/contacts.js:763 js/contacts.js:789 js/contacts.js:921
-#: js/contacts.js:927 js/contacts.js:939 js/contacts.js:976
-#: js/contacts.js:1250 js/contacts.js:1258 js/contacts.js:1267
-#: js/contacts.js:1302 js/contacts.js:1338 js/contacts.js:1353
-#: js/contacts.js:1379 js/contacts.js:1609 js/contacts.js:1644
-#: js/contacts.js:1664 js/settings.js:26 js/settings.js:43 js/settings.js:68
-msgid "Error"
-msgstr ""
-
-#: js/contacts.js:424
-msgid "You do not have permission to add contacts to "
-msgstr ""
-
-#: js/contacts.js:425
-msgid "Please select one of your own address books."
-msgstr ""
-
-#: js/contacts.js:425
-msgid "Permission error"
-msgstr ""
-
-#: js/contacts.js:763
-msgid "This property has to be non-empty."
-msgstr ""
-
-#: js/contacts.js:789
-msgid "Couldn't serialize elements."
-msgstr ""
-
-#: js/contacts.js:921 js/contacts.js:939
-msgid ""
-"'deleteProperty' called without type argument. Please report at bugs."
-"owncloud.org"
-msgstr ""
-
-#: js/contacts.js:958
-msgid "Edit name"
-msgstr ""
-
-#: js/contacts.js:1250
-msgid "No files selected for upload."
-msgstr ""
-
-#: js/contacts.js:1258
-msgid ""
-"The file you are trying to upload exceed the maximum size for file uploads "
-"on this server."
-msgstr ""
-
-#: js/contacts.js:1322
-msgid "Error loading profile picture."
-msgstr ""
-
-#: js/contacts.js:1457 js/contacts.js:1498 js/contacts.js:1517
-#: js/contacts.js:1560
-msgid "Select type"
-msgstr ""
-
-#: js/contacts.js:1578
-msgid ""
-"Some contacts are marked for deletion, but not deleted yet. Please wait for "
-"them to be deleted."
-msgstr ""
-
-#: js/contacts.js:1649
-msgid "Do you want to merge these address books?"
-msgstr ""
-
-#: js/loader.js:49
-msgid "Result: "
-msgstr ""
-
-#: js/loader.js:49
-msgid " imported, "
-msgstr ""
-
-#: js/loader.js:49
-msgid " failed."
-msgstr ""
-
-#: js/settings.js:68
-msgid "Displayname cannot be empty."
-msgstr ""
-
-#: lib/app.php:36
-msgid "Addressbook not found: "
-msgstr ""
-
-#: lib/app.php:52
-msgid "This is not your addressbook."
-msgstr ""
-
-#: lib/app.php:71
-msgid "Contact could not be found."
-msgstr ""
-
-#: lib/app.php:116
-msgid "Jabber"
-msgstr ""
-
-#: lib/app.php:121
-msgid "AIM"
-msgstr ""
-
-#: lib/app.php:126
-msgid "MSN"
-msgstr ""
-
-#: lib/app.php:131
-msgid "Twitter"
-msgstr ""
-
-#: lib/app.php:136
-msgid "GoogleTalk"
-msgstr ""
-
-#: lib/app.php:141
-msgid "Facebook"
-msgstr ""
-
-#: lib/app.php:146
-msgid "XMPP"
-msgstr ""
-
-#: lib/app.php:151
-msgid "ICQ"
-msgstr ""
-
-#: lib/app.php:156
-msgid "Yahoo"
-msgstr ""
-
-#: lib/app.php:161
-msgid "Skype"
-msgstr ""
-
-#: lib/app.php:166
-msgid "QQ"
-msgstr ""
-
-#: lib/app.php:171
-msgid "GaduGadu"
-msgstr ""
-
-#: lib/app.php:194 lib/app.php:202 lib/app.php:213 lib/app.php:266
-msgid "Work"
-msgstr ""
-
-#: lib/app.php:195 lib/app.php:200 lib/app.php:214
-msgid "Home"
-msgstr ""
-
-#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:593
-msgid "Other"
-msgstr ""
-
-#: lib/app.php:201
-msgid "Mobile"
-msgstr ""
-
-#: lib/app.php:203
-msgid "Text"
-msgstr ""
-
-#: lib/app.php:204
-msgid "Voice"
-msgstr ""
-
-#: lib/app.php:205
-msgid "Message"
-msgstr ""
-
-#: lib/app.php:206
-msgid "Fax"
-msgstr ""
-
-#: lib/app.php:207
-msgid "Video"
-msgstr ""
-
-#: lib/app.php:208
-msgid "Pager"
-msgstr ""
-
-#: lib/app.php:215
-msgid "Internet"
-msgstr ""
-
-#: lib/app.php:252 templates/part.contact.php:45
-#: templates/part.contact.php:128
-msgid "Birthday"
-msgstr ""
-
-#: lib/app.php:253
-msgid "Business"
-msgstr ""
-
-#: lib/app.php:254
-msgid "Call"
-msgstr ""
-
-#: lib/app.php:255
-msgid "Clients"
-msgstr ""
-
-#: lib/app.php:256
-msgid "Deliverer"
-msgstr ""
-
-#: lib/app.php:257
-msgid "Holidays"
-msgstr ""
-
-#: lib/app.php:258
-msgid "Ideas"
-msgstr ""
-
-#: lib/app.php:259
-msgid "Journey"
-msgstr ""
-
-#: lib/app.php:260
-msgid "Jubilee"
-msgstr ""
-
-#: lib/app.php:261
-msgid "Meeting"
-msgstr ""
-
-#: lib/app.php:263
-msgid "Personal"
-msgstr ""
-
-#: lib/app.php:264
-msgid "Projects"
-msgstr ""
-
-#: lib/app.php:265
-msgid "Questions"
-msgstr ""
-
-#: lib/hooks.php:102
-msgid "{name}'s Birthday"
-msgstr ""
-
-#: lib/search.php:15
-msgid "Contact"
-msgstr ""
-
-#: lib/vcard.php:408
-msgid "You do not have the permissions to edit this contact."
-msgstr ""
-
-#: lib/vcard.php:483
-msgid "You do not have the permissions to delete this contact."
-msgstr ""
-
-#: templates/index.php:14
-msgid "Add Contact"
-msgstr ""
-
-#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
-msgid "Import"
-msgstr ""
-
-#: templates/index.php:18
-msgid "Settings"
-msgstr ""
-
-#: templates/index.php:18 templates/settings.php:9
-msgid "Addressbooks"
-msgstr ""
-
-#: templates/index.php:36 templates/part.import.php:24
-msgid "Close"
-msgstr ""
-
-#: templates/index.php:37
-msgid "Keyboard shortcuts"
-msgstr ""
-
-#: templates/index.php:39
-msgid "Navigation"
-msgstr ""
-
-#: templates/index.php:42
-msgid "Next contact in list"
-msgstr ""
-
-#: templates/index.php:44
-msgid "Previous contact in list"
-msgstr ""
-
-#: templates/index.php:46
-msgid "Expand/collapse current addressbook"
-msgstr ""
-
-#: templates/index.php:48
-msgid "Next addressbook"
-msgstr ""
-
-#: templates/index.php:50
-msgid "Previous addressbook"
-msgstr ""
-
-#: templates/index.php:54
-msgid "Actions"
-msgstr ""
-
-#: templates/index.php:57
-msgid "Refresh contacts list"
-msgstr ""
-
-#: templates/index.php:59
-msgid "Add new contact"
-msgstr ""
-
-#: templates/index.php:61
-msgid "Add new addressbook"
-msgstr ""
-
-#: templates/index.php:63
-msgid "Delete current contact"
-msgstr ""
-
-#: templates/part.contact.php:17
-msgid "Drop photo to upload"
-msgstr ""
-
-#: templates/part.contact.php:19
-msgid "Delete current photo"
-msgstr ""
-
-#: templates/part.contact.php:20
-msgid "Edit current photo"
-msgstr ""
-
-#: templates/part.contact.php:21
-msgid "Upload new photo"
-msgstr ""
-
-#: templates/part.contact.php:22
-msgid "Select photo from ownCloud"
-msgstr ""
-
-#: templates/part.contact.php:35
-msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
-msgstr ""
-
-#: templates/part.contact.php:36
-msgid "Edit name details"
-msgstr ""
-
-#: templates/part.contact.php:39 templates/part.contact.php:40
-#: templates/part.contact.php:126
-msgid "Organization"
-msgstr ""
-
-#: templates/part.contact.php:40 templates/part.contact.php:42
-#: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:36
-msgid "Delete"
-msgstr ""
-
-#: templates/part.contact.php:41 templates/part.contact.php:127
-msgid "Nickname"
-msgstr ""
-
-#: templates/part.contact.php:42
-msgid "Enter nickname"
-msgstr ""
-
-#: templates/part.contact.php:43 templates/part.contact.php:134
-msgid "Web site"
-msgstr ""
-
-#: templates/part.contact.php:44
-msgid "http://www.somesite.com"
-msgstr ""
-
-#: templates/part.contact.php:44
-msgid "Go to web site"
-msgstr ""
-
-#: templates/part.contact.php:46
-msgid "dd-mm-yyyy"
-msgstr ""
-
-#: templates/part.contact.php:47 templates/part.contact.php:135
-msgid "Groups"
-msgstr ""
-
-#: templates/part.contact.php:49
-msgid "Separate groups with commas"
-msgstr ""
-
-#: templates/part.contact.php:50
-msgid "Edit groups"
-msgstr ""
-
-#: templates/part.contact.php:59 templates/part.contact.php:73
-#: templates/part.contact.php:98
-msgid "Preferred"
-msgstr ""
-
-#: templates/part.contact.php:60
-msgid "Please specify a valid email address."
-msgstr ""
-
-#: templates/part.contact.php:60
-msgid "Enter email address"
-msgstr ""
-
-#: templates/part.contact.php:64
-msgid "Mail to address"
-msgstr ""
-
-#: templates/part.contact.php:65
-msgid "Delete email address"
-msgstr ""
-
-#: templates/part.contact.php:75
-msgid "Enter phone number"
-msgstr ""
-
-#: templates/part.contact.php:79
-msgid "Delete phone number"
-msgstr ""
-
-#: templates/part.contact.php:100
-msgid "Instant Messenger"
-msgstr ""
-
-#: templates/part.contact.php:101
-msgid "Delete IM"
-msgstr ""
-
-#: templates/part.contact.php:110
-msgid "View on map"
-msgstr ""
-
-#: templates/part.contact.php:110
-msgid "Edit address details"
-msgstr ""
-
-#: templates/part.contact.php:116
-msgid "Add notes here."
-msgstr ""
-
-#: templates/part.contact.php:124
-msgid "Add field"
-msgstr ""
-
-#: templates/part.contact.php:129
-msgid "Phone"
-msgstr ""
-
-#: templates/part.contact.php:130
-msgid "Email"
-msgstr ""
-
-#: templates/part.contact.php:131
-msgid "Instant Messaging"
-msgstr ""
-
-#: templates/part.contact.php:132
-msgid "Address"
-msgstr ""
-
-#: templates/part.contact.php:133
-msgid "Note"
-msgstr ""
-
-#: templates/part.contact.php:138
-msgid "Download contact"
-msgstr ""
-
-#: templates/part.contact.php:139
-msgid "Delete contact"
-msgstr ""
-
-#: templates/part.cropphoto.php:65
-msgid "The temporary image has been removed from cache."
-msgstr ""
-
-#: templates/part.edit_address_dialog.php:6
-msgid "Edit address"
-msgstr ""
-
-#: templates/part.edit_address_dialog.php:10
-msgid "Type"
-msgstr ""
-
-#: templates/part.edit_address_dialog.php:18
-#: templates/part.edit_address_dialog.php:21
-msgid "PO Box"
-msgstr ""
-
-#: templates/part.edit_address_dialog.php:24
-msgid "Street address"
-msgstr ""
-
-#: templates/part.edit_address_dialog.php:27
-msgid "Street and number"
-msgstr ""
-
-#: templates/part.edit_address_dialog.php:30
-msgid "Extended"
-msgstr ""
-
-#: templates/part.edit_address_dialog.php:33
-msgid "Apartment number etc."
-msgstr ""
-
-#: templates/part.edit_address_dialog.php:36
-#: templates/part.edit_address_dialog.php:39
-msgid "City"
-msgstr ""
-
-#: templates/part.edit_address_dialog.php:42
-msgid "Region"
-msgstr ""
-
-#: templates/part.edit_address_dialog.php:45
-msgid "E.g. state or province"
-msgstr ""
-
-#: templates/part.edit_address_dialog.php:48
-msgid "Zipcode"
-msgstr ""
-
-#: templates/part.edit_address_dialog.php:51
-msgid "Postal code"
-msgstr ""
-
-#: templates/part.edit_address_dialog.php:54
-#: templates/part.edit_address_dialog.php:57
-msgid "Country"
-msgstr ""
-
-#: templates/part.edit_name_dialog.php:16
-msgid "Addressbook"
-msgstr ""
-
-#: templates/part.edit_name_dialog.php:23
-msgid "Hon. prefixes"
-msgstr ""
-
-#: templates/part.edit_name_dialog.php:27
-msgid "Miss"
-msgstr ""
-
-#: templates/part.edit_name_dialog.php:28
-msgid "Ms"
-msgstr ""
-
-#: templates/part.edit_name_dialog.php:29
-msgid "Mr"
-msgstr ""
-
-#: templates/part.edit_name_dialog.php:30
-msgid "Sir"
-msgstr ""
-
-#: templates/part.edit_name_dialog.php:31
-msgid "Mrs"
-msgstr ""
-
-#: templates/part.edit_name_dialog.php:32
-msgid "Dr"
-msgstr ""
-
-#: templates/part.edit_name_dialog.php:35
-msgid "Given name"
-msgstr ""
-
-#: templates/part.edit_name_dialog.php:37
-msgid "Additional names"
-msgstr ""
-
-#: templates/part.edit_name_dialog.php:39
-msgid "Family name"
-msgstr ""
-
-#: templates/part.edit_name_dialog.php:41
-msgid "Hon. suffixes"
-msgstr ""
-
-#: templates/part.edit_name_dialog.php:45
-msgid "J.D."
-msgstr ""
-
-#: templates/part.edit_name_dialog.php:46
-msgid "M.D."
-msgstr ""
-
-#: templates/part.edit_name_dialog.php:47
-msgid "D.O."
-msgstr ""
-
-#: templates/part.edit_name_dialog.php:48
-msgid "D.C."
-msgstr ""
-
-#: templates/part.edit_name_dialog.php:49
-msgid "Ph.D."
-msgstr ""
-
-#: templates/part.edit_name_dialog.php:50
-msgid "Esq."
-msgstr ""
-
-#: templates/part.edit_name_dialog.php:51
-msgid "Jr."
-msgstr ""
-
-#: templates/part.edit_name_dialog.php:52
-msgid "Sn."
-msgstr ""
-
-#: templates/part.import.php:1
-msgid "Import a contacts file"
-msgstr ""
-
-#: templates/part.import.php:6
-msgid "Please choose the addressbook"
-msgstr ""
-
-#: templates/part.import.php:10
-msgid "create a new addressbook"
-msgstr ""
-
-#: templates/part.import.php:15
-msgid "Name of new addressbook"
-msgstr ""
-
-#: templates/part.import.php:20
-msgid "Importing contacts"
-msgstr ""
-
-#: templates/part.no_contacts.php:3
-msgid "You have no contacts in your addressbook."
-msgstr ""
-
-#: templates/part.no_contacts.php:5
-msgid "Add contact"
-msgstr ""
-
-#: templates/part.selectaddressbook.php:1
-msgid "Select Address Books"
-msgstr ""
-
-#: templates/part.selectaddressbook.php:27
-msgid "Enter name"
-msgstr ""
-
-#: templates/part.selectaddressbook.php:29
-msgid "Enter description"
-msgstr ""
-
-#: templates/settings.php:3
-msgid "CardDAV syncing addresses"
-msgstr ""
-
-#: templates/settings.php:3
-msgid "more info"
-msgstr ""
-
-#: templates/settings.php:5
-msgid "Primary address (Kontact et al)"
-msgstr ""
-
-#: templates/settings.php:7
-msgid "iOS/OS X"
-msgstr ""
-
-#: templates/settings.php:20
-msgid "Show CardDav link"
-msgstr ""
-
-#: templates/settings.php:23
-msgid "Show read-only VCF link"
-msgstr ""
-
-#: templates/settings.php:26
-msgid "Share"
-msgstr ""
-
-#: templates/settings.php:29
-msgid "Download"
-msgstr ""
-
-#: templates/settings.php:33
-msgid "Edit"
-msgstr ""
-
-#: templates/settings.php:43
-msgid "New Address Book"
-msgstr ""
-
-#: templates/settings.php:44
-msgid "Name"
-msgstr ""
-
-#: templates/settings.php:45
-msgid "Description"
-msgstr ""
-
-#: templates/settings.php:46
-msgid "Save"
-msgstr ""
-
-#: templates/settings.php:47
-msgid "Cancel"
-msgstr ""
-
-#: templates/settings.php:52
-msgid "More..."
-msgstr ""
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index e5769a1a08..fb63cce50f 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-25 02:04+0200\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -33,55 +33,55 @@ msgstr ""
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:190 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "January"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "February"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "March"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "April"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "May"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "June"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "July"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "August"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "September"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "October"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "November"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "December"
 msgstr ""
 
@@ -129,7 +129,7 @@ msgstr ""
 msgid "Login failed!"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr ""
@@ -190,48 +190,52 @@ msgstr ""
 msgid "Add"
 msgstr ""
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr ""
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr ""
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr ""
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr ""
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr ""
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr ""
 
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 603136b53b..ab39126f39 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-25 02:04+0200\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index 4abd4bfe4a..06954d4efa 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-25 02:04+0200\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index b845f7d27d..8a89c7d214 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-25 02:04+0200\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index d95745ec23..9bded512ff 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-25 02:04+0200\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,18 +17,10 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: templates/get.php:4
-msgid "Size"
+#: templates/authenticate.php:4
+msgid "Password"
 msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete"
+#: templates/authenticate.php:6
+msgid "Submit"
 msgstr ""
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index 7a55f7e131..a04d4da157 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-25 02:04+0200\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/gallery.pot b/l10n/templates/gallery.pot
deleted file mode 100644
index f4431a9c81..0000000000
--- a/l10n/templates/gallery.pot
+++ /dev/null
@@ -1,38 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-25 02:04+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: appinfo/app.php:42
-msgid "Pictures"
-msgstr ""
-
-#: js/pictures.js:12
-msgid "Share gallery"
-msgstr ""
-
-#: js/pictures.js:32
-msgid "Error: "
-msgstr ""
-
-#: js/pictures.js:32
-msgid "Internal error"
-msgstr ""
-
-#: templates/index.php:27
-msgid "Slideshow"
-msgstr ""
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index 3f4dc1e461..27de1e0d90 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-25 02:04+0200\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/media.pot b/l10n/templates/media.pot
deleted file mode 100644
index c3946d4ab8..0000000000
--- a/l10n/templates/media.pot
+++ /dev/null
@@ -1,66 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-25 02:04+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: appinfo/app.php:45 templates/player.php:8
-msgid "Music"
-msgstr ""
-
-#: js/music.js:18
-msgid "Add album to playlist"
-msgstr ""
-
-#: templates/music.php:3 templates/player.php:12
-msgid "Play"
-msgstr ""
-
-#: templates/music.php:4 templates/music.php:26 templates/player.php:13
-msgid "Pause"
-msgstr ""
-
-#: templates/music.php:5
-msgid "Previous"
-msgstr ""
-
-#: templates/music.php:6 templates/player.php:14
-msgid "Next"
-msgstr ""
-
-#: templates/music.php:7
-msgid "Mute"
-msgstr ""
-
-#: templates/music.php:8
-msgid "Unmute"
-msgstr ""
-
-#: templates/music.php:25
-msgid "Rescan Collection"
-msgstr ""
-
-#: templates/music.php:37
-msgid "Artist"
-msgstr ""
-
-#: templates/music.php:38
-msgid "Album"
-msgstr ""
-
-#: templates/music.php:39
-msgid "Title"
-msgstr ""
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index b8338fb6fc..a848774f20 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-25 02:04+0200\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -86,10 +86,46 @@ msgid "use systems cron service"
 msgstr ""
 
 #: templates/admin.php:39
-msgid "Log"
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
 msgstr ""
 
 #: templates/admin.php:67
+msgid "Log"
+msgstr ""
+
+#: templates/admin.php:95
 msgid "More"
 msgstr ""
 
diff --git a/l10n/templates/tasks.pot b/l10n/templates/tasks.pot
deleted file mode 100644
index 5f237d3c50..0000000000
--- a/l10n/templates/tasks.pot
+++ /dev/null
@@ -1,106 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-25 02:04+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
-msgid "Invalid date/time"
-msgstr ""
-
-#: appinfo/app.php:11
-msgid "Tasks"
-msgstr ""
-
-#: js/tasks.js:415
-msgid "No category"
-msgstr ""
-
-#: lib/app.php:33
-msgid "Unspecified"
-msgstr ""
-
-#: lib/app.php:34
-msgid "1=highest"
-msgstr ""
-
-#: lib/app.php:38
-msgid "5=medium"
-msgstr ""
-
-#: lib/app.php:42
-msgid "9=lowest"
-msgstr ""
-
-#: lib/app.php:81
-msgid "Empty Summary"
-msgstr ""
-
-#: lib/app.php:93
-msgid "Invalid percent complete"
-msgstr ""
-
-#: lib/app.php:107
-msgid "Invalid priority"
-msgstr ""
-
-#: templates/tasks.php:3
-msgid "Add Task"
-msgstr ""
-
-#: templates/tasks.php:4
-msgid "Order Due"
-msgstr ""
-
-#: templates/tasks.php:5
-msgid "Order List"
-msgstr ""
-
-#: templates/tasks.php:6
-msgid "Order Complete"
-msgstr ""
-
-#: templates/tasks.php:7
-msgid "Order Location"
-msgstr ""
-
-#: templates/tasks.php:8
-msgid "Order Priority"
-msgstr ""
-
-#: templates/tasks.php:9
-msgid "Order Label"
-msgstr ""
-
-#: templates/tasks.php:16
-msgid "Loading tasks..."
-msgstr ""
-
-#: templates/tasks.php:20
-msgid "Important"
-msgstr ""
-
-#: templates/tasks.php:23
-msgid "More"
-msgstr ""
-
-#: templates/tasks.php:26
-msgid "Less"
-msgstr ""
-
-#: templates/tasks.php:29
-msgid "Delete"
-msgstr ""
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index 808b7c6d3b..afb446dd07 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-25 02:04+0200\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -158,6 +158,11 @@ msgstr ""
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr ""
diff --git a/l10n/templates/user_migrate.pot b/l10n/templates/user_migrate.pot
deleted file mode 100644
index 6a63226f92..0000000000
--- a/l10n/templates/user_migrate.pot
+++ /dev/null
@@ -1,50 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-25 02:04+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: js/export.js:14 js/export.js:20
-msgid "Export"
-msgstr ""
-
-#: js/export.js:19
-msgid "Something went wrong while the export file was being generated"
-msgstr ""
-
-#: js/export.js:19
-msgid "An error has occurred"
-msgstr ""
-
-#: templates/settings.php:2
-msgid "Export your user account"
-msgstr ""
-
-#: templates/settings.php:3
-msgid "This will create a compressed file that contains your ownCloud account."
-msgstr ""
-
-#: templates/settings.php:13
-msgid "Import user account"
-msgstr ""
-
-#: templates/settings.php:15
-msgid "ownCloud User Zip"
-msgstr ""
-
-#: templates/settings.php:17
-msgid "Import"
-msgstr ""
diff --git a/l10n/templates/user_openid.pot b/l10n/templates/user_openid.pot
deleted file mode 100644
index 144f4bece5..0000000000
--- a/l10n/templates/user_openid.pot
+++ /dev/null
@@ -1,54 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-25 02:04+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: templates/nomode.php:12
-msgid "This is an OpenID server endpoint. For more information, see "
-msgstr ""
-
-#: templates/nomode.php:14
-msgid "Identity: <b>"
-msgstr ""
-
-#: templates/nomode.php:15
-msgid "Realm: <b>"
-msgstr ""
-
-#: templates/nomode.php:16
-msgid "User: <b>"
-msgstr ""
-
-#: templates/nomode.php:17
-msgid "Login"
-msgstr ""
-
-#: templates/nomode.php:22
-msgid "Error: <b>No user Selected"
-msgstr ""
-
-#: templates/settings.php:4
-msgid "you can authenticate to other sites with this address"
-msgstr ""
-
-#: templates/settings.php:5
-msgid "Authorized OpenID provider"
-msgstr ""
-
-#: templates/settings.php:6
-msgid "Your address at Wordpress, Identi.ca, &hellip;"
-msgstr ""
diff --git a/l10n/th_TH/core.po b/l10n/th_TH/core.po
index 4a078f8330..3868f2ff31 100644
--- a/l10n/th_TH/core.po
+++ b/l10n/th_TH/core.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -35,55 +35,55 @@ msgstr "หมวดหมู่นี้มีอยู่แล้ว: "
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 
-#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "ตั้งค่า"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "January"
 msgstr "มกราคม"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "February"
 msgstr "กุมภาพันธ์"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "March"
 msgstr "มีนาคม"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "April"
 msgstr "เมษายน"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "May"
 msgstr "พฤษภาคม"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "June"
 msgstr "มิถุนายน"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "July"
 msgstr "กรกฏาคม"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "August"
 msgstr "สิงหาคม"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "September"
 msgstr "กันยายน"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "October"
 msgstr "ตุลาคม"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "November"
 msgstr "พฤศจิกายน"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "December"
 msgstr "ธันวาคม"
 
@@ -131,7 +131,7 @@ msgstr "ส่งคำร้องเรียบร้อยแล้ว"
 msgid "Login failed!"
 msgstr "ไม่สามารถเข้าสู่ระบบได้!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "ชื่อผู้ใช้งาน"
@@ -192,48 +192,52 @@ msgstr "แก้ไขหมวดหมู่"
 msgid "Add"
 msgstr "เพิ่ม"
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr "สร้าง <strong>บัญชีผู้ดูแลระบบ</strong>"
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "รหัสผ่าน"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr "ขั้นสูง"
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "โฟลเดอร์เก็บข้อมูล"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "กำหนดค่าฐานข้อมูล"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "จะถูกใช้"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "ชื่อผู้ใช้งานฐานข้อมูล"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "รหัสผ่านฐานข้อมูล"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "ชื่อฐานข้อมูล"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "Database host"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "ติดตั้งเรียบร้อยแล้ว"
 
diff --git a/l10n/th_TH/files_odfviewer.po b/l10n/th_TH/files_odfviewer.po
new file mode 100644
index 0000000000..652cc1125e
--- /dev/null
+++ b/l10n/th_TH/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: th_TH\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: js/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/th_TH/files_pdfviewer.po b/l10n/th_TH/files_pdfviewer.po
new file mode 100644
index 0000000000..354985befa
--- /dev/null
+++ b/l10n/th_TH/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: th_TH\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: js/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/th_TH/files_sharing.po b/l10n/th_TH/files_sharing.po
index 6e5fafa72c..21f2b67908 100644
--- a/l10n/th_TH/files_sharing.po
+++ b/l10n/th_TH/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
@@ -18,18 +18,10 @@ msgstr ""
 "Language: th_TH\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: templates/get.php:4
-msgid "Size"
-msgstr "ขนาด"
+#: templates/authenticate.php:4
+msgid "Password"
+msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr "แก้ไขแล้ว"
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr "ลบทั้งหมด"
-
-#: templates/get.php:5
-msgid "Delete"
-msgstr "ลบ"
+#: templates/authenticate.php:6
+msgid "Submit"
+msgstr ""
diff --git a/l10n/th_TH/files_texteditor.po b/l10n/th_TH/files_texteditor.po
new file mode 100644
index 0000000000..00accf8089
--- /dev/null
+++ b/l10n/th_TH/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: th_TH\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: js/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/th_TH/impress.po b/l10n/th_TH/impress.po
new file mode 100644
index 0000000000..e360e941e4
--- /dev/null
+++ b/l10n/th_TH/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: th_TH\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/th_TH/settings.po b/l10n/th_TH/settings.po
index f2de2ffdc5..99b1cb2ac3 100644
--- a/l10n/th_TH/settings.po
+++ b/l10n/th_TH/settings.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-20 02:01+0200\n"
-"PO-Revision-Date: 2012-08-19 15:11+0000\n"
-"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -89,10 +89,46 @@ msgid "use systems cron service"
 msgstr "ใช้บริการ cron จากระบบ"
 
 #: templates/admin.php:39
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:67
 msgid "Log"
 msgstr "บันทึกการเปลี่ยนแปลง"
 
-#: templates/admin.php:67
+#: templates/admin.php:95
 msgid "More"
 msgstr "เพิ่มเติม"
 
diff --git a/l10n/th_TH/user_ldap.po b/l10n/th_TH/user_ldap.po
index b87bd07fa5..791bc9000b 100644
--- a/l10n/th_TH/user_ldap.po
+++ b/l10n/th_TH/user_ldap.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-22 18:47+0000\n"
-"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -160,6 +160,12 @@ msgstr "ในหน่วยไบต์"
 msgid "in seconds. A change empties the cache."
 msgstr "ในอีกไม่กี่วินาที ระบบจะเปลี่ยนแปลงข้อมูลในแคชให้ว่างเปล่า"
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr "ช่วยเหลือ"
diff --git a/l10n/tr/core.po b/l10n/tr/core.po
index 06136c97ff..c965064524 100644
--- a/l10n/tr/core.po
+++ b/l10n/tr/core.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -35,55 +35,55 @@ msgstr "Bu kategori zaten mevcut: "
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 
-#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "Ayarlar"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "January"
 msgstr "Ocak"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "February"
 msgstr "Şubat"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "March"
 msgstr "Mart"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "April"
 msgstr "Nisan"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "May"
 msgstr "Mayıs"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "June"
 msgstr "Haziran"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "July"
 msgstr "Temmuz"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "August"
 msgstr "Ağustos"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "September"
 msgstr "Eylül"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "October"
 msgstr "Ekim"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "November"
 msgstr "Kasım"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "December"
 msgstr "Aralık"
 
@@ -131,7 +131,7 @@ msgstr "İstendi"
 msgid "Login failed!"
 msgstr "Giriş başarısız!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "Kullanıcı adı"
@@ -192,48 +192,52 @@ msgstr "Kategorileri düzenle"
 msgid "Add"
 msgstr "Ekle"
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr "Bir <strong>yönetici hesabı</strong> oluşturun"
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "Parola"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr "Gelişmiş"
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "Veri klasörü"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "Veritabanını ayarla"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "kullanılacak"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "Veritabanı kullanıcı adı"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "Veritabanı parolası"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "Veritabanı adı"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "Veritabanı sunucusu"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "Kurulumu tamamla"
 
diff --git a/l10n/tr/files_odfviewer.po b/l10n/tr/files_odfviewer.po
new file mode 100644
index 0000000000..81c300af47
--- /dev/null
+++ b/l10n/tr/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: tr\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: js/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/tr/files_pdfviewer.po b/l10n/tr/files_pdfviewer.po
new file mode 100644
index 0000000000..8f66b76939
--- /dev/null
+++ b/l10n/tr/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: tr\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: js/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/tr/files_sharing.po b/l10n/tr/files_sharing.po
index 3f6c26efdc..bc726f546f 100644
--- a/l10n/tr/files_sharing.po
+++ b/l10n/tr/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -17,18 +17,10 @@ msgstr ""
 "Language: tr\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: templates/get.php:4
-msgid "Size"
+#: templates/authenticate.php:4
+msgid "Password"
 msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete"
+#: templates/authenticate.php:6
+msgid "Submit"
 msgstr ""
diff --git a/l10n/tr/files_texteditor.po b/l10n/tr/files_texteditor.po
new file mode 100644
index 0000000000..d1aa8ee65a
--- /dev/null
+++ b/l10n/tr/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: tr\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: js/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/tr/impress.po b/l10n/tr/impress.po
new file mode 100644
index 0000000000..ffbe599886
--- /dev/null
+++ b/l10n/tr/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: tr\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/tr/settings.po b/l10n/tr/settings.po
index f2a34211a7..cfe4ddc892 100644
--- a/l10n/tr/settings.po
+++ b/l10n/tr/settings.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-18 02:01+0200\n"
-"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -89,10 +89,46 @@ msgid "use systems cron service"
 msgstr ""
 
 #: templates/admin.php:39
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:67
 msgid "Log"
 msgstr "Günlük"
 
-#: templates/admin.php:67
+#: templates/admin.php:95
 msgid "More"
 msgstr "Devamı"
 
diff --git a/l10n/tr/user_ldap.po b/l10n/tr/user_ldap.po
index de0cb374c3..5429c2cff8 100644
--- a/l10n/tr/user_ldap.po
+++ b/l10n/tr/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -159,6 +159,12 @@ msgstr ""
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr ""
diff --git a/l10n/uk/core.po b/l10n/uk/core.po
index 731e7d912e..7493adea34 100644
--- a/l10n/uk/core.po
+++ b/l10n/uk/core.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -35,55 +35,55 @@ msgstr ""
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "Налаштування"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "January"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "February"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "March"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "April"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "May"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "June"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "July"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "August"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "September"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "October"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "November"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "December"
 msgstr ""
 
@@ -131,7 +131,7 @@ msgstr ""
 msgid "Login failed!"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "Ім'я користувача"
@@ -192,48 +192,52 @@ msgstr ""
 msgid "Add"
 msgstr ""
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "Пароль"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr ""
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "Налаштування бази даних"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "буде використано"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "Користувач бази даних"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "Пароль для бази даних"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "Назва бази даних"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "Завершити налаштування"
 
diff --git a/l10n/uk/files_odfviewer.po b/l10n/uk/files_odfviewer.po
new file mode 100644
index 0000000000..f7dfc7c8de
--- /dev/null
+++ b/l10n/uk/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: uk\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: js/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/uk/files_pdfviewer.po b/l10n/uk/files_pdfviewer.po
new file mode 100644
index 0000000000..5fb83eac03
--- /dev/null
+++ b/l10n/uk/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: uk\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: js/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/uk/files_sharing.po b/l10n/uk/files_sharing.po
index 4786918c70..a90d76aca0 100644
--- a/l10n/uk/files_sharing.po
+++ b/l10n/uk/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -17,18 +17,10 @@ msgstr ""
 "Language: uk\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: templates/get.php:4
-msgid "Size"
+#: templates/authenticate.php:4
+msgid "Password"
 msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete"
+#: templates/authenticate.php:6
+msgid "Submit"
 msgstr ""
diff --git a/l10n/uk/files_texteditor.po b/l10n/uk/files_texteditor.po
new file mode 100644
index 0000000000..2c4cf49ae4
--- /dev/null
+++ b/l10n/uk/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: uk\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: js/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/uk/impress.po b/l10n/uk/impress.po
new file mode 100644
index 0000000000..1307d932c3
--- /dev/null
+++ b/l10n/uk/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: uk\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: templates/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/uk/settings.po b/l10n/uk/settings.po
index f32d1abccf..03945e1bfb 100644
--- a/l10n/uk/settings.po
+++ b/l10n/uk/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-18 02:01+0200\n"
-"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -87,10 +87,46 @@ msgid "use systems cron service"
 msgstr ""
 
 #: templates/admin.php:39
-msgid "Log"
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
 msgstr ""
 
 #: templates/admin.php:67
+msgid "Log"
+msgstr ""
+
+#: templates/admin.php:95
 msgid "More"
 msgstr ""
 
diff --git a/l10n/uk/user_ldap.po b/l10n/uk/user_ldap.po
index 236f6c2034..d948126316 100644
--- a/l10n/uk/user_ldap.po
+++ b/l10n/uk/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -159,6 +159,12 @@ msgstr ""
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr ""
diff --git a/l10n/vi/core.po b/l10n/vi/core.po
index 29ceebc712..ddfe09758d 100644
--- a/l10n/vi/core.po
+++ b/l10n/vi/core.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -34,55 +34,55 @@ msgstr "Danh mục này đã được tạo :"
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 
-#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "Cài đặt"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "January"
 msgstr "Tháng 1"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "February"
 msgstr "Tháng 2"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "March"
 msgstr "Tháng 3"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "April"
 msgstr "Tháng 4"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "May"
 msgstr "Tháng 5"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "June"
 msgstr "Tháng 6"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "July"
 msgstr "Tháng 7"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "August"
 msgstr "Tháng 8"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "September"
 msgstr "Tháng 9"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "October"
 msgstr "Tháng 10"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "November"
 msgstr "Tháng 11"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "December"
 msgstr "Tháng 12"
 
@@ -130,7 +130,7 @@ msgstr "Yêu cầu"
 msgid "Login failed!"
 msgstr "Bạn đã nhập sai mật khẩu hay tên người dùng !"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "Tên người dùng"
@@ -191,48 +191,52 @@ msgstr "Sửa thể loại"
 msgid "Add"
 msgstr "Thêm"
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr "Tạo một <strong>tài khoản quản trị</strong>"
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "Mật khẩu"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr "Nâng cao"
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "Thư mục dữ liệu"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "Cấu hình Cơ Sở Dữ Liệu"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "được sử dụng"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "Người dùng cơ sở dữ liệu"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "Mật khẩu cơ sở dữ liệu"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "Tên cơ sở dữ liệu"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "Database host"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "Cài đặt hoàn tất"
 
diff --git a/l10n/vi/files_odfviewer.po b/l10n/vi/files_odfviewer.po
new file mode 100644
index 0000000000..21d7de16b0
--- /dev/null
+++ b/l10n/vi/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: vi\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: js/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/vi/files_pdfviewer.po b/l10n/vi/files_pdfviewer.po
new file mode 100644
index 0000000000..f8265b4455
--- /dev/null
+++ b/l10n/vi/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: vi\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: js/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/vi/files_sharing.po b/l10n/vi/files_sharing.po
index 87e7cce9bd..fbfe460234 100644
--- a/l10n/vi/files_sharing.po
+++ b/l10n/vi/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -17,18 +17,10 @@ msgstr ""
 "Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: templates/get.php:4
-msgid "Size"
+#: templates/authenticate.php:4
+msgid "Password"
 msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete"
+#: templates/authenticate.php:6
+msgid "Submit"
 msgstr ""
diff --git a/l10n/vi/files_texteditor.po b/l10n/vi/files_texteditor.po
new file mode 100644
index 0000000000..40a7005281
--- /dev/null
+++ b/l10n/vi/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: vi\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: js/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/vi/impress.po b/l10n/vi/impress.po
new file mode 100644
index 0000000000..af17dc75c4
--- /dev/null
+++ b/l10n/vi/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: vi\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/vi/settings.po b/l10n/vi/settings.po
index 41c0adc6ef..fdbc7da0b1 100644
--- a/l10n/vi/settings.po
+++ b/l10n/vi/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-18 02:01+0200\n"
-"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -88,10 +88,46 @@ msgid "use systems cron service"
 msgstr ""
 
 #: templates/admin.php:39
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:67
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:67
+#: templates/admin.php:95
 msgid "More"
 msgstr "nhiều hơn"
 
diff --git a/l10n/vi/user_ldap.po b/l10n/vi/user_ldap.po
index 52c6146db3..6fd933c5b5 100644
--- a/l10n/vi/user_ldap.po
+++ b/l10n/vi/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -159,6 +159,12 @@ msgstr ""
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr ""
diff --git a/l10n/zh_CN.GB2312/core.po b/l10n/zh_CN.GB2312/core.po
index ea582cd1c1..5ae461a170 100644
--- a/l10n/zh_CN.GB2312/core.po
+++ b/l10n/zh_CN.GB2312/core.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 13:54+0000\n"
-"Last-Translator: bluehattree <bluehattree@126.com>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -34,55 +34,55 @@ msgstr "这个分类已经存在了:"
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 
-#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "设置"
 
-#: js/js.js:572
+#: js/js.js:586
 msgid "January"
 msgstr "一月"
 
-#: js/js.js:572
+#: js/js.js:586
 msgid "February"
 msgstr "二月"
 
-#: js/js.js:572
+#: js/js.js:586
 msgid "March"
 msgstr "三月"
 
-#: js/js.js:572
+#: js/js.js:586
 msgid "April"
 msgstr "四月"
 
-#: js/js.js:572
+#: js/js.js:586
 msgid "May"
 msgstr "五月"
 
-#: js/js.js:572
+#: js/js.js:586
 msgid "June"
 msgstr "六月"
 
-#: js/js.js:573
+#: js/js.js:587
 msgid "July"
 msgstr "七月"
 
-#: js/js.js:573
+#: js/js.js:587
 msgid "August"
 msgstr "八月"
 
-#: js/js.js:573
+#: js/js.js:587
 msgid "September"
 msgstr "九月"
 
-#: js/js.js:573
+#: js/js.js:587
 msgid "October"
 msgstr "十月"
 
-#: js/js.js:573
+#: js/js.js:587
 msgid "November"
 msgstr "十一月"
 
-#: js/js.js:573
+#: js/js.js:587
 msgid "December"
 msgstr "十二月"
 
@@ -130,7 +130,7 @@ msgstr "请求"
 msgid "Login failed!"
 msgstr "登陆失败!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "用户名"
@@ -191,48 +191,52 @@ msgstr "编辑分类"
 msgid "Add"
 msgstr "添加"
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr "建立一个 <strong>管理帐户</strong>"
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "密码"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr "进阶"
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "数据存放文件夹"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "配置数据库"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "将会使用"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "数据库用户"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "数据库密码"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "数据库用户名"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "数据库主机"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "完成安装"
 
diff --git a/l10n/zh_CN.GB2312/files_odfviewer.po b/l10n/zh_CN.GB2312/files_odfviewer.po
new file mode 100644
index 0000000000..c46ade9153
--- /dev/null
+++ b/l10n/zh_CN.GB2312/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN.GB2312\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: js/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/zh_CN.GB2312/files_pdfviewer.po b/l10n/zh_CN.GB2312/files_pdfviewer.po
new file mode 100644
index 0000000000..a8c53c751d
--- /dev/null
+++ b/l10n/zh_CN.GB2312/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN.GB2312\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: js/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/zh_CN.GB2312/files_sharing.po b/l10n/zh_CN.GB2312/files_sharing.po
index 0243a9ebaa..33a8efe467 100644
--- a/l10n/zh_CN.GB2312/files_sharing.po
+++ b/l10n/zh_CN.GB2312/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
@@ -17,18 +17,10 @@ msgstr ""
 "Language: zh_CN.GB2312\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: templates/get.php:4
-msgid "Size"
+#: templates/authenticate.php:4
+msgid "Password"
 msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete"
+#: templates/authenticate.php:6
+msgid "Submit"
 msgstr ""
diff --git a/l10n/zh_CN.GB2312/files_texteditor.po b/l10n/zh_CN.GB2312/files_texteditor.po
new file mode 100644
index 0000000000..2e1dfee3c8
--- /dev/null
+++ b/l10n/zh_CN.GB2312/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN.GB2312\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: js/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/zh_CN.GB2312/impress.po b/l10n/zh_CN.GB2312/impress.po
new file mode 100644
index 0000000000..64aa634938
--- /dev/null
+++ b/l10n/zh_CN.GB2312/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN.GB2312\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/zh_CN.GB2312/settings.po b/l10n/zh_CN.GB2312/settings.po
index 70f3d9d228..5cefbd6785 100644
--- a/l10n/zh_CN.GB2312/settings.po
+++ b/l10n/zh_CN.GB2312/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-18 02:01+0200\n"
-"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
@@ -87,10 +87,46 @@ msgid "use systems cron service"
 msgstr ""
 
 #: templates/admin.php:39
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:67
 msgid "Log"
 msgstr "日志"
 
-#: templates/admin.php:67
+#: templates/admin.php:95
 msgid "More"
 msgstr "更多"
 
diff --git a/l10n/zh_CN.GB2312/user_ldap.po b/l10n/zh_CN.GB2312/user_ldap.po
index 725d441e3c..67a667a8ee 100644
--- a/l10n/zh_CN.GB2312/user_ldap.po
+++ b/l10n/zh_CN.GB2312/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -159,6 +159,12 @@ msgstr ""
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr ""
diff --git a/l10n/zh_CN/core.po b/l10n/zh_CN/core.po
index bc2b280087..da40f7d393 100644
--- a/l10n/zh_CN/core.po
+++ b/l10n/zh_CN/core.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -35,55 +35,55 @@ msgstr "此分类已存在: "
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "设置"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "January"
 msgstr "一月"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "February"
 msgstr "二月"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "March"
 msgstr "三月"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "April"
 msgstr "四月"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "May"
 msgstr "五月"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "June"
 msgstr "六月"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "July"
 msgstr "七月"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "August"
 msgstr "八月"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "September"
 msgstr "九月"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "October"
 msgstr "十月"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "November"
 msgstr "十一月"
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "December"
 msgstr "十二月"
 
@@ -131,7 +131,7 @@ msgstr "已请求"
 msgid "Login failed!"
 msgstr "登录失败！"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "用户名"
@@ -192,48 +192,52 @@ msgstr "编辑分类"
 msgid "Add"
 msgstr "添加"
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr "创建<strong>管理员账号</strong>"
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "密码"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr "高级"
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "数据目录"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "配置数据库"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "将被使用"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "数据库用户"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "数据库密码"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "数据库名"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "数据库主机"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "安装完成"
 
diff --git a/l10n/zh_CN/files_odfviewer.po b/l10n/zh_CN/files_odfviewer.po
new file mode 100644
index 0000000000..fc8d8333ac
--- /dev/null
+++ b/l10n/zh_CN/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: js/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/zh_CN/files_pdfviewer.po b/l10n/zh_CN/files_pdfviewer.po
new file mode 100644
index 0000000000..86e0af9519
--- /dev/null
+++ b/l10n/zh_CN/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: js/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/zh_CN/files_sharing.po b/l10n/zh_CN/files_sharing.po
index 6c3271e513..cb50b796bf 100644
--- a/l10n/zh_CN/files_sharing.po
+++ b/l10n/zh_CN/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -17,18 +17,10 @@ msgstr ""
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: templates/get.php:4
-msgid "Size"
+#: templates/authenticate.php:4
+msgid "Password"
 msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete"
+#: templates/authenticate.php:6
+msgid "Submit"
 msgstr ""
diff --git a/l10n/zh_CN/files_texteditor.po b/l10n/zh_CN/files_texteditor.po
new file mode 100644
index 0000000000..dc16629c11
--- /dev/null
+++ b/l10n/zh_CN/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: js/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/zh_CN/impress.po b/l10n/zh_CN/impress.po
new file mode 100644
index 0000000000..47fab23c25
--- /dev/null
+++ b/l10n/zh_CN/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/zh_CN/settings.po b/l10n/zh_CN/settings.po
index 7dffc01ef6..30ae97464e 100644
--- a/l10n/zh_CN/settings.po
+++ b/l10n/zh_CN/settings.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <appweb.cn@gmail.com>, 2012.
 # Phoenix Nemo <>, 2012.
 #   <rainofchaos@gmail.com>, 2012.
 #   <wengxt@gmail.com>, 2011, 2012.
@@ -10,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-19 02:02+0200\n"
-"PO-Revision-Date: 2012-08-18 05:49+0000\n"
-"Last-Translator: leonfeng <rainofchaos@gmail.com>\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -82,17 +83,53 @@ msgstr "为每个装入的页面执行任务"
 
 #: templates/admin.php:33
 msgid "cron.php is registered at a webcron service"
-msgstr ""
+msgstr "crop.php 已"
 
 #: templates/admin.php:35
 msgid "use systems cron service"
 msgstr "实现系统 cron 服务"
 
 #: templates/admin.php:39
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:67
 msgid "Log"
 msgstr "日志"
 
-#: templates/admin.php:67
+#: templates/admin.php:95
 msgid "More"
 msgstr "更多"
 
diff --git a/l10n/zh_CN/user_ldap.po b/l10n/zh_CN/user_ldap.po
index 5e871541a0..a34796c9c3 100644
--- a/l10n/zh_CN/user_ldap.po
+++ b/l10n/zh_CN/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -159,6 +159,12 @@ msgstr ""
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr ""
diff --git a/l10n/zh_TW/core.po b/l10n/zh_TW/core.po
index 932959583c..8fe1a80fc5 100644
--- a/l10n/zh_TW/core.po
+++ b/l10n/zh_TW/core.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -34,55 +34,55 @@ msgstr "此分類已經存在:"
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "設定"
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "January"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "February"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "March"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "April"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "May"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:586
 msgid "June"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "July"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "August"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "September"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "October"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "November"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:587
 msgid "December"
 msgstr ""
 
@@ -130,7 +130,7 @@ msgstr "已要求"
 msgid "Login failed!"
 msgstr "登入失敗!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "使用者名稱"
@@ -191,48 +191,52 @@ msgstr "編輯分類"
 msgid "Add"
 msgstr "添加"
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr "建立一個<strong>管理者帳號</strong>"
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "密碼"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr "進階"
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "資料夾"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "設定資料庫"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "將會使用"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "資料庫使用者"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "資料庫密碼"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "資料庫名稱"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "資料庫主機"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "完成設定"
 
diff --git a/l10n/zh_TW/files_odfviewer.po b/l10n/zh_TW/files_odfviewer.po
new file mode 100644
index 0000000000..2327d1c14a
--- /dev/null
+++ b/l10n/zh_TW/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: js/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/zh_TW/files_pdfviewer.po b/l10n/zh_TW/files_pdfviewer.po
new file mode 100644
index 0000000000..9bccfd7d92
--- /dev/null
+++ b/l10n/zh_TW/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: js/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/zh_TW/files_sharing.po b/l10n/zh_TW/files_sharing.po
index 4a2aa509e9..f8438d08d7 100644
--- a/l10n/zh_TW/files_sharing.po
+++ b/l10n/zh_TW/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -17,18 +17,10 @@ msgstr ""
 "Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: templates/get.php:4
-msgid "Size"
+#: templates/authenticate.php:4
+msgid "Password"
 msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete"
+#: templates/authenticate.php:6
+msgid "Submit"
 msgstr ""
diff --git a/l10n/zh_TW/files_texteditor.po b/l10n/zh_TW/files_texteditor.po
new file mode 100644
index 0000000000..e57c25f279
--- /dev/null
+++ b/l10n/zh_TW/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: js/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/zh_TW/impress.po b/l10n/zh_TW/impress.po
new file mode 100644
index 0000000000..c7925b09e3
--- /dev/null
+++ b/l10n/zh_TW/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/zh_TW/settings.po b/l10n/zh_TW/settings.po
index d333fc726b..aaea010810 100644
--- a/l10n/zh_TW/settings.po
+++ b/l10n/zh_TW/settings.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-25 02:04+0200\n"
-"PO-Revision-Date: 2012-08-24 03:42+0000\n"
-"Last-Translator: weiyu <weiyu871@ms14.url.com.tw>\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -88,10 +88,46 @@ msgid "use systems cron service"
 msgstr ""
 
 #: templates/admin.php:39
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:67
 msgid "Log"
 msgstr "紀錄"
 
-#: templates/admin.php:67
+#: templates/admin.php:95
 msgid "More"
 msgstr "更多"
 
diff --git a/l10n/zh_TW/user_ldap.po b/l10n/zh_TW/user_ldap.po
index d84e081d11..f57f67dde9 100644
--- a/l10n/zh_TW/user_ldap.po
+++ b/l10n/zh_TW/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -159,6 +159,12 @@ msgstr ""
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr ""
diff --git a/lib/MDB2/Driver/Datatype/sqlite3.php b/lib/MDB2/Driver/Datatype/sqlite3.php
index d74badbe4f..66c68b9377 100644
--- a/lib/MDB2/Driver/Datatype/sqlite3.php
+++ b/lib/MDB2/Driver/Datatype/sqlite3.php
@@ -383,5 +383,3 @@ class MDB2_Driver_Datatype_sqlite3 extends MDB2_Driver_Datatype_Common
 
     // }}}
 }
-
-?>
\ No newline at end of file
diff --git a/lib/MDB2/Driver/Function/sqlite3.php b/lib/MDB2/Driver/Function/sqlite3.php
index 1af262fd7a..790bd0e747 100644
--- a/lib/MDB2/Driver/Function/sqlite3.php
+++ b/lib/MDB2/Driver/Function/sqlite3.php
@@ -55,12 +55,12 @@ class MDB2_Driver_Function_sqlite3 extends MDB2_Driver_Function_Common
     {
         switch ($type) {
         case 'time':
-            return 'time(\'now\')';
+            return 'CURRENT_TIME';
         case 'date':
-            return 'date(\'now\')';
+            return 'CURRENT_DATE';
         case 'timestamp':
         default:
-            return 'datetime(\'now\')';
+            return 'CURRENT_TIMESTAMP';
         }
     }
 
diff --git a/lib/MDB2/Driver/Native/sqlite3.php b/lib/MDB2/Driver/Native/sqlite3.php
index de65010723..344d523bdf 100644
--- a/lib/MDB2/Driver/Native/sqlite3.php
+++ b/lib/MDB2/Driver/Native/sqlite3.php
@@ -31,4 +31,3 @@ require_once 'MDB2/Driver/Native/Common.php';
 class MDB2_Driver_Native_sqlite extends MDB2_Driver_Native_Common
 {
 }
-?>
\ No newline at end of file
diff --git a/lib/MDB2/Driver/Reverse/sqlite3.php b/lib/MDB2/Driver/Reverse/sqlite3.php
index 33e5b59026..e5c758e350 100644
--- a/lib/MDB2/Driver/Reverse/sqlite3.php
+++ b/lib/MDB2/Driver/Reverse/sqlite3.php
@@ -584,5 +584,3 @@ class MDB2_Driver_Reverse_sqlite3 extends MDB2_Driver_Reverse_Common
            'This DBMS can not obtain tableInfo from result sets', __FUNCTION__);
     }
 }
-
-?>
\ No newline at end of file
diff --git a/lib/app.php b/lib/app.php
index 7431590346..5c0ec2f01e 100755
--- a/lib/app.php
+++ b/lib/app.php
@@ -286,7 +286,7 @@ class OC_App{
 		if(OC_Config::getValue('knowledgebaseenabled', true)==true){
 			$settings = array(
 				array( "id" => "help", "order" => 1000, "href" => OC_Helper::linkTo( "settings", "help.php" ), "name" => $l->t("Help"), "icon" => OC_Helper::imagePath( "settings", "help.svg" ))
- 			);
+			);
 		}
 
 		// if the user is logged-in
@@ -313,7 +313,7 @@ class OC_App{
 
 				$settings[]=array( "id" => "admin", "order" => 1000, "href" => OC_Helper::linkTo( "settings", "admin.php" ), "name" => $l->t("Admin"), "icon" => OC_Helper::imagePath( "settings", "admin.svg" ));
 			}
- 		}
+		}
 
 		$navigation = self::proceedNavigation($settings);
 		return $navigation;
@@ -571,7 +571,7 @@ class OC_App{
 			// check if the app is compatible with this version of ownCloud
 			$info = OC_App::getAppInfo($app);
 			if(!isset($info['require']) or ($version[0]>$info['require'])){
-				OC_Log::write('core','App "'.$info['name'].'" can\'t be used because it is not compatible with this version of ownCloud',OC_Log::ERROR);
+				OC_Log::write('core','App "'.$info['name'].'" ('.$app.') can\'t be used because it is not compatible with this version of ownCloud',OC_Log::ERROR);
 				OC_App::disable( $app );
 			}
 		}
diff --git a/lib/appconfig.php b/lib/appconfig.php
index 372cded9a5..0e608b540b 100644
--- a/lib/appconfig.php
+++ b/lib/appconfig.php
@@ -100,7 +100,7 @@ class OC_Appconfig{
 			return $default;
 		}
 	}
-	
+
 	/**
 	 * @brief check if a key is set in the appconfig
 	 * @param string $app
@@ -111,7 +111,7 @@ class OC_Appconfig{
 		$exists = self::getKeys( $app );
 		return in_array( $key, $exists );
 	}
-	
+
 	/**
 	 * @brief sets a value in the appconfig
 	 * @param $app app
@@ -163,7 +163,7 @@ class OC_Appconfig{
 
 		return true;
 	}
-	
+
 	/**
 	 * get multiply values, either the app or key can be used as wildcard by setting it to false
 	 * @param app
diff --git a/lib/archive.php b/lib/archive.php
index fabd7cc7a5..5ac4edbfd1 100644
--- a/lib/archive.php
+++ b/lib/archive.php
@@ -28,7 +28,7 @@ abstract class OC_Archive{
 				return new OC_Archive_TAR($path);
 		}
 	}
-	
+
 	abstract function __construct($source);
 	/**
 	 * add an empty folder to the archive
diff --git a/lib/archive/tar.php b/lib/archive/tar.php
index f6efd6d0ec..095362d0cd 100644
--- a/lib/archive/tar.php
+++ b/lib/archive/tar.php
@@ -14,7 +14,7 @@ class OC_Archive_TAR extends OC_Archive{
 	const BZIP=2;
 
 	private $fileList;
-	
+
 	/**
 	 * @var Archive_Tar tar
 	 */
@@ -127,7 +127,7 @@ class OC_Archive_TAR extends OC_Archive{
 		}
 		return null;
 	}
-	
+
 	/**
 	 * get the uncompressed size of a file in the archive
 	 * @param string path
@@ -254,7 +254,7 @@ class OC_Archive_TAR extends OC_Archive{
 			return false;
 		}
 	}
-	
+
 	/**
 	 * remove a file or folder from the archive
 	 * @param string path
diff --git a/lib/archive/zip.php b/lib/archive/zip.php
index c1a5c35738..396b1f6c05 100644
--- a/lib/archive/zip.php
+++ b/lib/archive/zip.php
@@ -12,7 +12,7 @@ class OC_Archive_ZIP extends OC_Archive{
 	 */
 	private $zip=null;
 	private $path;
-	
+
 	function __construct($source){
 		$this->path=$source;
 		$this->zip=new ZipArchive();
diff --git a/lib/backgroundjob/worker.php b/lib/backgroundjob/worker.php
index b4f0429b31..8684e0df11 100644
--- a/lib/backgroundjob/worker.php
+++ b/lib/backgroundjob/worker.php
@@ -22,7 +22,7 @@
 
 /**
  * This class does the dirty work.
- * 
+ *
  * TODO: locking in doAllSteps
  */
 class OC_BackgroundJob_Worker{
@@ -56,7 +56,7 @@ class OC_BackgroundJob_Worker{
 			OC_BackgroundJob_QueuedTask::delete( $task['id'] );
 			call_user_func( array( $task['klass'], $task['method'] ), $task['parameters'] );
 		}
-		
+
 		return true;
 	}
 
@@ -70,7 +70,7 @@ class OC_BackgroundJob_Worker{
 	 */
 	public static function doNextStep(){
 		$laststep = OC_Appconfig::getValue( 'core', 'backgroundjobs_step', 'regular_tasks' );
-		
+
 		if( $laststep == 'regular_tasks' ){
 			// get last app
 			$lasttask = OC_Appconfig::getValue( 'core', 'backgroundjobs_task', '' );
@@ -79,7 +79,7 @@ class OC_BackgroundJob_Worker{
 			$regular_tasks = OC_BackgroundJob_RegularTask::all();
 			ksort( $regular_tasks );
 			$done = false;
-			
+
 			// search for next background job
 			foreach( $regular_tasks as $key => $value ){
 				if( strcmp( $key, $lasttask ) > 0 ){
@@ -112,7 +112,7 @@ class OC_BackgroundJob_Worker{
 				OC_Appconfig::setValue( 'core', 'backgroundjobs_task', '' );
 			}
 		}
-		
+
 		return true;
 	}
 }
diff --git a/lib/base.php b/lib/base.php
index fb49e9e670..237b6ab708 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -246,7 +246,7 @@ class OC{
 				OC_Util::addScript( 'backgroundjobs' );
 			}
 		}
-		
+
 		OC_Util::addStyle( "styles" );
 		OC_Util::addStyle( "multiselect" );
 		OC_Util::addStyle( "jquery-ui-1.8.16.custom" );
@@ -362,6 +362,10 @@ class OC{
 			}
 		}
 
+		// register cache cleanup jobs
+		OC_BackgroundJob_RegularTask::register('OC_Cache_FileGlobal', 'gc');
+		OC_Hook::connect('OC_User', 'post_login', 'OC_Cache_File', 'loginListener');
+
 		// Check for blacklisted files
 		OC_Hook::connect('OC_Filesystem','write','OC_Filesystem','isBlacklisted');
 		OC_Hook::connect('OC_Filesystem', 'rename', 'OC_Filesystem', 'isBlacklisted');
@@ -498,7 +502,7 @@ class OC{
 		// Someone wants to log in :
 		} elseif (OC::tryFormLogin()) {
 			$error = true;
-		
+
 		// The user is already authenticated using Apaches AuthType Basic... very usable in combination with LDAP
 		} elseif (OC::tryBasicAuthLogin()) {
 			$error = true;
@@ -558,7 +562,7 @@ class OC{
 	protected static function tryBasicAuthLogin() {
 		if (!isset($_SERVER["PHP_AUTH_USER"])
 		 || !isset($_SERVER["PHP_AUTH_PW"])){
-		 	return false;
+			return false;
 		}
 		OC_App::loadApps(array('authentication'));
 		if (OC_User::login($_SERVER["PHP_AUTH_USER"],$_SERVER["PHP_AUTH_PW"]))	{
diff --git a/lib/cache.php b/lib/cache.php
index 55f189a5da..fed990b5b3 100644
--- a/lib/cache.php
+++ b/lib/cache.php
@@ -38,7 +38,7 @@ class OC_Cache {
 			if (!self::$global_cache_fast && function_exists('apc_store')) {
 				self::$global_cache_fast = new OC_Cache_APC(true);
 			}
-			
+
 			self::$global_cache = new OC_Cache_FileGlobal();
 			if (self::$global_cache_fast) {
 				self::$global_cache = new OC_Cache_Broker(self::$global_cache_fast, self::$global_cache);
@@ -67,7 +67,7 @@ class OC_Cache {
 			if (!self::$user_cache_fast && function_exists('apc_store')) {
 				self::$user_cache_fast = new OC_Cache_APC();
 			}
-			
+
 			self::$user_cache = new OC_Cache_File();
 			if (self::$user_cache_fast) {
 				self::$user_cache = new OC_Cache_Broker(self::$user_cache_fast, self::$user_cache);
diff --git a/lib/cache/file.php b/lib/cache/file.php
index 562c3d1716..b9073dee09 100644
--- a/lib/cache/file.php
+++ b/lib/cache/file.php
@@ -8,14 +8,19 @@
 
 
 class OC_Cache_File{
+	protected $storage;
 	protected function getStorage() {
+		if (isset($this->storage)) {
+			return $this->storage;
+		}
 		if(OC_User::isLoggedIn()){
 			$subdir = 'cache';
 			$view = new OC_FilesystemView('/'.OC_User::getUser());
 			if(!$view->file_exists($subdir)) {
 				$view->mkdir($subdir);
 			}
-			return new OC_FilesystemView('/'.OC_User::getUser().'/'.$subdir);
+			$this->storage = new OC_FilesystemView('/'.OC_User::getUser().'/'.$subdir);
+			return $this->storage;
 		}else{
 			OC_Log::write('core','Can\'t get cache storage, user not logged in', OC_Log::ERROR);
 			return false;
@@ -74,4 +79,25 @@ class OC_Cache_File{
 		}
 		return true;
 	}
+
+	public function gc() {
+		$storage = $this->getStorage();
+		if($storage and $storage->is_dir('/')) {
+			$now = time();
+			$dh=$storage->opendir('/');
+			while($file=readdir($dh)) {
+				if($file!='.' and $file!='..') {
+					$mtime = $storage->filemtime('/'.$file);
+					if ($mtime < $now) {
+						$storage->unlink('/'.$file);
+					}
+				}
+			}
+		}
+	}
+
+	public static function loginListener() {
+		$c = new self();
+		$c->gc();
+	}
 }
diff --git a/lib/cache/fileglobal.php b/lib/cache/fileglobal.php
index 1c2c9bdc82..d4336553c3 100644
--- a/lib/cache/fileglobal.php
+++ b/lib/cache/fileglobal.php
@@ -8,7 +8,7 @@
 
 
 class OC_Cache_FileGlobal{
-	protected function getCacheDir() {
+	static protected function getCacheDir() {
 		$cache_dir = get_temp_dir().'/owncloud-'.OC_Util::getInstanceId().'/';
 		if (!is_dir($cache_dir)) {
 			mkdir($cache_dir);
@@ -23,7 +23,7 @@ class OC_Cache_FileGlobal{
 	public function get($key) {
 		$key = $this->fixKey($key);
 		if ($this->hasKey($key)) {
-			$cache_dir = $this->getCacheDir();
+			$cache_dir = self::getCacheDir();
 			return file_get_contents($cache_dir.$key);
 		}
 		return null;
@@ -31,7 +31,7 @@ class OC_Cache_FileGlobal{
 
 	public function set($key, $value, $ttl=0) {
 		$key = $this->fixKey($key);
-		$cache_dir = $this->getCacheDir();
+		$cache_dir = self::getCacheDir();
 		if ($cache_dir and file_put_contents($cache_dir.$key, $value)) {
 			if ($ttl === 0) {
 				$ttl = 86400; // 60*60*24
@@ -43,7 +43,7 @@ class OC_Cache_FileGlobal{
 
 	public function hasKey($key) {
 		$key = $this->fixKey($key);
-		$cache_dir = $this->getCacheDir();
+		$cache_dir = self::getCacheDir();
 		if ($cache_dir && is_file($cache_dir.$key)) {
 			$mtime = filemtime($cache_dir.$key);
 			if ($mtime < time()) {
@@ -56,7 +56,7 @@ class OC_Cache_FileGlobal{
 	}
 
 	public function remove($key) {
-		$cache_dir = $this->getCacheDir();
+		$cache_dir = self::getCacheDir();
 		if(!$cache_dir){
 			return false;
 		}
@@ -65,7 +65,7 @@ class OC_Cache_FileGlobal{
 	}
 
 	public function clear(){
-		$cache_dir = $this->getCacheDir();
+		$cache_dir = self::getCacheDir();
 		if($cache_dir and is_dir($cache_dir)){
 			$dh=opendir($cache_dir);
 			while($file=readdir($dh)){
@@ -75,4 +75,26 @@ class OC_Cache_FileGlobal{
 			}
 		}
 	}
+
+	static public function gc() {
+		$last_run = OC_AppConfig::getValue('core', 'global_cache_gc_lastrun', 0);
+		$now = time();
+		if (($now - $last_run) < 300) {
+			// only do cleanup every 5 minutes
+			return;
+		}
+		OC_AppConfig::setValue('core', 'global_cache_gc_lastrun', $now);
+		$cache_dir = self::getCacheDir();
+		if($cache_dir and is_dir($cache_dir)) {
+			$dh=opendir($cache_dir);
+			while($file=readdir($dh)) {
+				if($file!='.' and $file!='..') {
+					$mtime = filemtime($cache_dir.$file);
+					if ($mtime < $now) {
+						unlink($cache_dir.$file);
+					}
+				}
+			}
+		}
+	}
 }
diff --git a/lib/connector/sabre/auth.php b/lib/connector/sabre/auth.php
index 99f696e3a0..8197571e94 100644
--- a/lib/connector/sabre/auth.php
+++ b/lib/connector/sabre/auth.php
@@ -45,4 +45,4 @@ class OC_Connector_Sabre_Auth extends Sabre_DAV_Auth_Backend_AbstractBasic {
 			}
 		}
 	}
-} 
+}
diff --git a/lib/connector/sabre/directory.php b/lib/connector/sabre/directory.php
index cd3ed60292..a750244615 100644
--- a/lib/connector/sabre/directory.php
+++ b/lib/connector/sabre/directory.php
@@ -203,4 +203,3 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node implements Sa
 		return $props;
 	}
 }
-
diff --git a/lib/connector/sabre/file.php b/lib/connector/sabre/file.php
index 9d571fceb0..5bd38240d4 100644
--- a/lib/connector/sabre/file.php
+++ b/lib/connector/sabre/file.php
@@ -126,4 +126,3 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements Sabre_D
 
 	}
 }
-
diff --git a/lib/connector/sabre/locks.php b/lib/connector/sabre/locks.php
index 0ddc8b18d2..a01653d960 100644
--- a/lib/connector/sabre/locks.php
+++ b/lib/connector/sabre/locks.php
@@ -42,7 +42,7 @@ class OC_Connector_Sabre_Locks extends Sabre_DAV_Locks_Backend_Abstract {
 		// pure sql. MySQL's non-standard string concatination prevents us
 		// from doing this though.
 		// NOTE: SQLite requires time() to be inserted directly. That's ugly
-		// but otherwise reading locks from SQLite Databases will return 
+		// but otherwise reading locks from SQLite Databases will return
 		// nothing
 		$query = 'SELECT * FROM `*PREFIX*locks` WHERE `userid` = ? AND (`created` + `timeout`) > '.time().' AND (( `uri` = ?)';
 		$params = array(OC_User::getUser(),$uri);
@@ -75,7 +75,7 @@ class OC_Connector_Sabre_Locks extends Sabre_DAV_Locks_Backend_Abstract {
 
 		$stmt = OC_DB::prepare( $query );
 		$result = $stmt->execute( $params );
-		
+
 		$lockList = array();
 		while( $row = $result->fetchRow()){
 
@@ -114,7 +114,7 @@ class OC_Connector_Sabre_Locks extends Sabre_DAV_Locks_Backend_Abstract {
 		foreach($locks as $lock) {
 			if ($lock->token == $lockInfo->token) $exists = true;
 		}
-	
+
 		if ($exists) {
 			$query = OC_DB::prepare( 'UPDATE `*PREFIX*locks` SET `owner` = ?, `timeout` = ?, `scope` = ?, `depth` = ?, `uri` = ?, `created` = ? WHERE `userid` = ? AND `token` = ?' );
 			$result = $query->execute( array($lockInfo->owner,$lockInfo->timeout,$lockInfo->scope,$lockInfo->depth,$uri,$lockInfo->created,OC_User::getUser(),$lockInfo->token));
diff --git a/lib/connector/sabre/node.php b/lib/connector/sabre/node.php
index b9bf474a04..afcabe7bef 100644
--- a/lib/connector/sabre/node.php
+++ b/lib/connector/sabre/node.php
@@ -80,9 +80,9 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr
 		$oldPath = $this->path;
 
 		OC_Filesystem::rename($this->path,$newPath);
-	
+
 		$this->path = $newPath;
-		
+
 		$query = OC_DB::prepare( 'UPDATE `*PREFIX*properties` SET `propertypath` = ? WHERE `userid` = ? AND `propertypath` = ?' );
 		$query->execute( array( $newPath,OC_User::getUser(), $oldPath ));
 
@@ -123,8 +123,8 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr
 
 	}
 
-	/** 
-	 *  sets the last modification time of the file (mtime) to the value given 
+	/**
+	 *  sets the last modification time of the file (mtime) to the value given
 	 *  in the second parameter or to now if the second param is empty.
 	 *  Even if the modification time is set to a custom value the access time is set to now.
 	 */
@@ -195,7 +195,7 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr
 		if(count($properties) == 0){
 			return $this->property_cache;
 		}
-		
+
 		$props = array();
 		foreach($properties as $property) {
 			if (isset($this->property_cache[$property])) $props[$property] = $this->property_cache[$property];
diff --git a/lib/db.php b/lib/db.php
index 5ef67202a1..de72dee255 100644
--- a/lib/db.php
+++ b/lib/db.php
@@ -27,7 +27,7 @@
 class OC_DB {
 	const BACKEND_PDO=0;
 	const BACKEND_MDB2=1;
-	
+
 	static private $connection; //the prefered connection to use, either PDO or MDB2
 	static private $backend=null;
 	static private $MDB2=false;
@@ -55,7 +55,7 @@ class OC_DB {
 		}
 		return self::BACKEND_MDB2;
 	}
-	
+
 	/**
 	 * @brief connects to the database
 	 * @returns true if connection can be established or nothing (die())
@@ -104,7 +104,7 @@ class OC_DB {
 		}
 		$opts = array();
 		$datadir=OC_Config::getValue( "datadirectory", OC::$SERVERROOT.'/data' );
-		
+
 		// do nothing if the connection already has been established
 		if(!self::$PDO){
 			// Add the dsn according to the database type
@@ -158,7 +158,7 @@ class OC_DB {
 		}
 		return true;
 	}
-	
+
 	/**
 	 * connect to the database using mdb2
 	 */
@@ -234,10 +234,10 @@ class OC_DB {
 					}
 					break;
 			}
-			
+
 			// Try to establish connection
 			self::$MDB2 = MDB2::factory( $dsn, $options );
-			
+
 			// Die if we could not connect
 			if( PEAR::isError( self::$MDB2 )){
 				echo( '<b>can not connect to database, using '.$type.'. ('.self::$MDB2->getUserInfo().')</center>');
@@ -245,11 +245,11 @@ class OC_DB {
 				OC_Log::write('core',self::$MDB2->getMessage(),OC_Log::FATAL);
 				die( $error );
 			}
-			
+
 			// We always, really always want associative arrays
 			self::$MDB2->setFetchMode(MDB2_FETCHMODE_ASSOC);
 		}
-		
+
 		// we are done. great!
 		return true;
 	}
@@ -262,7 +262,7 @@ class OC_DB {
 	 * SQL query via MDB2 prepare(), needs to be execute()'d!
 	 */
 	static public function prepare( $query , $limit=null, $offset=null ){
-		
+
 		if (!is_null($limit) && $limit != -1) {
 			if (self::$backend == self::BACKEND_MDB2) {
 				//MDB2 uses or emulates limits & offset internally
@@ -394,7 +394,7 @@ class OC_DB {
 
 		// read file
 		$content = file_get_contents( $file );
-		
+
 		// Make changes and save them to an in-memory file
 		$file2 = 'static://db_scheme';
 		$content = str_replace( '*dbname*', $CONFIG_DBNAME, $content );
@@ -414,7 +414,7 @@ class OC_DB {
 
 		// Try to create tables
 		$definition = self::$schema->parseDatabaseDefinitionFile( $file2 );
-		
+
 		//clean up memory
 		unlink( $file2 );
 
@@ -427,7 +427,7 @@ class OC_DB {
 			$oldname = $definition['name'];
 			$definition['name']=OC_Config::getValue( "dbuser", $oldname );
 		}
-		
+
 		$ret=self::$schema->createDatabase( $definition );
 
 		// Die in case something went wrong
@@ -438,7 +438,7 @@ class OC_DB {
 
 		return true;
 	}
-	
+
 	/**
 	 * @brief update the database scheme
 	 * @param $file file to read structure from
@@ -451,7 +451,7 @@ class OC_DB {
 
 		// read file
 		$content = file_get_contents( $file );
-		
+
 		$previousSchema = self::$schema->getDefinitionFromDatabase();
 		if (PEAR::isError($previousSchema)) {
 			$error = $previousSchema->getMessage();
@@ -475,10 +475,10 @@ class OC_DB {
 		 */
 		file_put_contents( $file2, $content );
 		$op = self::$schema->updateDatabase($file2, $previousSchema, array(), false);
-		
+
 		//clean up memory
 		unlink( $file2 );
-		
+
 		if (PEAR::isError($op)) {
 			$error = $op->getMessage();
 			$detail = $op->getDebugInfo();
@@ -528,16 +528,15 @@ class OC_DB {
 			self::$prefix=OC_Config::getValue( "dbtableprefix", "oc_" );
 		}
 		$prefix = self::$prefix;
-		
+
 		// differences in escaping of table names ('`' for mysql) and getting the current timestamp
 		if( $type == 'sqlite' || $type == 'sqlite3' ){
 			$query = str_replace( '`', '"', $query );
 			$query = str_replace( 'NOW()', 'datetime(\'now\')', $query );
 			$query = str_replace( 'now()', 'datetime(\'now\')', $query );
-		}elseif( $type == 'mysql' ){
-			$query = str_replace( 'NOW()', 'CURRENT_TIMESTAMP', $query );
-			$query = str_replace( 'now()', 'CURRENT_TIMESTAMP', $query );
-		}elseif( $type == 'pgsql' || $type == 'oci'  ){
+		}elseif( $type == 'pgsql' ){
+			$query = str_replace( '`', '"', $query );
+		}elseif( $type == 'oci'  ){
 			$query = str_replace( '`', '"', $query );
 			$query = str_replace( 'NOW()', 'CURRENT_TIMESTAMP', $query );
 			$query = str_replace( 'now()', 'CURRENT_TIMESTAMP', $query );
@@ -548,7 +547,7 @@ class OC_DB {
 
 		return $query;
 	}
-	
+
 	/**
 	 * @brief drop a table
 	 * @param string $tableNamme the table to drop
@@ -558,7 +557,7 @@ class OC_DB {
 		self::$MDB2->loadModule('Manager');
 		self::$MDB2->dropTable($tableName);
 	}
-	
+
 	/**
 	 * remove all tables defined in a database structure xml file
 	 * @param string $file the xml file describing the tables
@@ -579,7 +578,7 @@ class OC_DB {
 
 		// get the tables
 		$definition = self::$schema->parseDatabaseDefinitionFile( $file2 );
-		
+
 		// Delete our temporary file
 		unlink( $file2 );
 		$tables=array_keys($definition['tables']);
@@ -587,30 +586,30 @@ class OC_DB {
 			self::dropTable($table);
 		}
 	}
-	
+
 	/**
 	 * @brief replaces the owncloud tables with a new set
 	 * @param $file string path to the MDB2 xml db export file
 	 */
 	public static function replaceDB( $file ){
-	 	$apps = OC_App::getAllApps();
-	 	self::beginTransaction();
-	 	// Delete the old tables
-	 	self::removeDBStructure( OC::$SERVERROOT . '/db_structure.xml' );
-	 	
-	 	foreach($apps as $app){
-	 		$path = OC_App::getAppPath($app).'/appinfo/database.xml';
-	 		if(file_exists($path)){
-	 			self::removeDBStructure( $path );	
-	 		}
-	 	}
-	 	
-	 	// Create new tables
-	 	self::createDBFromStructure( $file );
-	 	self::commit();
-	 	
+		$apps = OC_App::getAllApps();
+		self::beginTransaction();
+		// Delete the old tables
+		self::removeDBStructure( OC::$SERVERROOT . '/db_structure.xml' );
+
+		foreach($apps as $app){
+			$path = OC_App::getAppPath($app).'/appinfo/database.xml';
+			if(file_exists($path)){
+				self::removeDBStructure( $path );
+			}
+		}
+
+		// Create new tables
+		self::createDBFromStructure( $file );
+		self::commit();
+
 	 }
-	
+
 	/**
 	 * Start a transaction
 	 */
@@ -661,7 +660,7 @@ class PDOStatementWrapper{
 	public function __construct($statement){
 		$this->statement=$statement;
 	}
-	
+
 	/**
 	 * make execute return the result instead of a bool
 	 */
@@ -678,7 +677,7 @@ class PDOStatementWrapper{
 			return false;
 		}
 	}
-	
+
 	/**
 	 * provide numRows
 	 */
@@ -691,21 +690,21 @@ class PDOStatementWrapper{
 			return $this->statement->rowCount();
 		}
 	}
-	
+
 	/**
 	 * provide an alias for fetch
 	 */
 	public function fetchRow(){
 		return $this->statement->fetch();
 	}
-	
+
 	/**
 	 * pass all other function directly to the PDOStatement
 	 */
 	public function __call($name,$arguments){
 		return call_user_func_array(array($this->statement,$name),$arguments);
 	}
-	
+
 	/**
 	 * Provide a simple fetchOne.
 	 * fetch single column from the next row
@@ -715,4 +714,3 @@ class PDOStatementWrapper{
 		return $this->statement->fetchColumn($colnum);
 	}
 }
-
diff --git a/lib/eventsource.php b/lib/eventsource.php
index 95af2e471b..45a20806b6 100644
--- a/lib/eventsource.php
+++ b/lib/eventsource.php
@@ -30,7 +30,7 @@
 class OC_EventSource{
 	private $fallback;
 	private $fallBackId=0;
-	
+
 	public function __construct(){
 		@ob_end_clean();
 		header('Cache-Control: no-cache');
diff --git a/lib/filecache.php b/lib/filecache.php
index e85d6747f9..364b908bcf 100644
--- a/lib/filecache.php
+++ b/lib/filecache.php
@@ -76,14 +76,14 @@ class OC_FileCache{
 			self::update($id,$data);
 			return;
 		}
-		
+
 		// add parent directory to the file cache if it does not exist yet.
 		if ($parent == -1 && $fullpath != $root) {
 			$parentDir = substr(dirname($path), 0, strrpos(dirname($path), DIRECTORY_SEPARATOR));
 			self::scanFile($parentDir);
 			$parent = self::getParentId($fullpath);
 		}
-		
+
 		if(!isset($data['size']) or !isset($data['mtime'])){//save incomplete data for the next time we write it
 			OC_FileCache_Cached::$savedData[$fullpath]=$data;
 			return;
@@ -136,7 +136,7 @@ class OC_FileCache{
 			$queryParts[]='`mimepart`=?';
 		}
 		$arguments[]=$id;
-		
+
 		$sql = 'UPDATE `*PREFIX*fscache` SET '.implode(' , ',$queryParts).' WHERE `id`=?';
 		$query=OC_DB::prepare($sql);
 		$result=$query->execute($arguments);
@@ -192,14 +192,14 @@ class OC_FileCache{
 		}
 		$query=OC_DB::prepare('DELETE FROM `*PREFIX*fscache` WHERE `path_hash`=?');
 		$query->execute(array(md5($root.$path)));
-		
+
 		//delete everything inside the folder
 		$query=OC_DB::prepare('DELETE FROM `*PREFIX*fscache` WHERE `path` LIKE ?');
 		$query->execute(array($root.$path.'/%'));
 
 		OC_Cache::remove('fileid/'.$root.$path);
 	}
-	
+
 	/**
 	 * return array of filenames matching the querty
 	 * @param string $query
@@ -277,14 +277,14 @@ class OC_FileCache{
 		if(($cache=OC_Cache::getUserCache(true)) && $cache->hasKey('fileid/'.$fullPath)){
 			return $cache->get('fileid/'.$fullPath);
 		}
-		
+
 		$query=OC_DB::prepare('SELECT `id` FROM `*PREFIX*fscache` WHERE `path_hash`=?');
 		$result=$query->execute(array(md5($fullPath)));
 		if(OC_DB::isError($result)){
 			OC_Log::write('files','error while getting file id of '.$path,OC_Log::ERROR);
 			return -1;
 		}
-		
+
 		$result=$result->fetchRow();
 		if(is_array($result)){
 			$id=$result['id'];
@@ -294,10 +294,10 @@ class OC_FileCache{
 		if($cache=OC_Cache::getUserCache(true)){
 			$cache->set('fileid/'.$fullPath,$id);
 		}
-		
+
 		return $id;
 	}
-	
+
 	/**
 	 * get the file path from the id, relative to the home folder of the user
 	 * @param int id
@@ -331,7 +331,7 @@ class OC_FileCache{
 			return self::getId(dirname($path),'');
 		}
 	}
-	
+
 	/**
 	 * adjust the size of the parent folders
 	 * @param string $path
@@ -390,7 +390,7 @@ class OC_FileCache{
 				}
 			}
 		}
-		
+
 		OC_FileCache_Update::cleanFolder($path,$root);
 		self::increaseSize($path,$totalSize,$root);
 	}
diff --git a/lib/filecache/cached.php b/lib/filecache/cached.php
index 95cc0ac300..505f1a5e2a 100644
--- a/lib/filecache/cached.php
+++ b/lib/filecache/cached.php
@@ -12,7 +12,7 @@
  */
 class OC_FileCache_Cached{
 	public static $savedData=array();
-	
+
 	public static function get($path,$root=false){
 		if($root===false){
 			$root=OC_Filesystem::getRoot();
diff --git a/lib/filecache/update.php b/lib/filecache/update.php
index 0b5ff8e244..7b5f18fe5c 100644
--- a/lib/filecache/update.php
+++ b/lib/filecache/update.php
@@ -42,7 +42,7 @@ class OC_FileCache_Update{
 			return true;
 		}
 	}
-	
+
 	/**
 	 * delete non existing files from the cache
 	 */
@@ -148,7 +148,7 @@ class OC_FileCache_Update{
 		}
 
 		$mimetype=$view->getMimeType($path);
-		
+
 		$size=0;
 		$cached=OC_FileCache_Cached::get($path,$root);
 		$cachedSize=isset($cached['size'])?$cached['size']:0;
diff --git a/lib/fileproxy.php b/lib/fileproxy.php
index ec04faa9bc..a1c79874bf 100644
--- a/lib/fileproxy.php
+++ b/lib/fileproxy.php
@@ -43,7 +43,7 @@
 class OC_FileProxy{
 	private static $proxies=array();
 	public static $enabled=true;
-	
+
 	/**
 	 * fallback function when a proxy operation is not implemented
 	 * @param string $function the name of the proxy operation
@@ -58,7 +58,7 @@ class OC_FileProxy{
 			return $arguments[1];
 		}
 	}
-	
+
 	/**
 	 * register a proxy to be used
 	 * @param OC_FileProxy $proxy
@@ -66,7 +66,7 @@ class OC_FileProxy{
 	public static function register($proxy){
 		self::$proxies[]=$proxy;
 	}
-	
+
 	public static function getProxies($operation){
 		$proxies=array();
 		foreach(self::$proxies as $proxy){
diff --git a/lib/fileproxy/quota.php b/lib/fileproxy/quota.php
index 7316224cc6..4c6261fc51 100644
--- a/lib/fileproxy/quota.php
+++ b/lib/fileproxy/quota.php
@@ -27,7 +27,7 @@
 
 class OC_FileProxy_Quota extends OC_FileProxy{
 	private $userQuota=-1;
-	
+
 	/**
 	 * get the quota for the current user
 	 * @return int
@@ -46,9 +46,9 @@ class OC_FileProxy_Quota extends OC_FileProxy{
 			$this->userQuota=OC_Helper::computerFileSize($userQuota);
 		}
 		return $this->userQuota;
-		
+
 	}
-	
+
 	/**
 	 * get the free space in the users home folder
 	 * @return int
@@ -69,7 +69,7 @@ class OC_FileProxy_Quota extends OC_FileProxy{
 		}
 		return $totalSpace-$usedSpace;
 	}
-	
+
 	public function postFree_space($path,$space){
 		$free=$this->getFreeSpace();
 		if($free==0){
diff --git a/lib/files.php b/lib/files.php
index 1a1fffa0a5..0c71f6e5e4 100644
--- a/lib/files.php
+++ b/lib/files.php
@@ -406,9 +406,9 @@ class OC_Files {
 		//check for write permissions
 		if(is_writable(OC::$SERVERROOT.'/.htaccess')) {
 			file_put_contents(OC::$SERVERROOT.'/.htaccess', $htaccess);
-			return OC_Helper::computerFileSize($size);	
+			return OC_Helper::computerFileSize($size);
 		} else { OC_Log::write('files','Can\'t write upload limit to '.OC::$SERVERROOT.'/.htaccess. Please check the file permissions',OC_Log::WARN); }
-		
+
 		return false;
 	}
 
diff --git a/lib/filestorage/common.php b/lib/filestorage/common.php
index c829be62f7..e2828e5617 100644
--- a/lib/filestorage/common.php
+++ b/lib/filestorage/common.php
@@ -21,11 +21,11 @@
 */
 
 /**
- * Storage backend class for providing common filesystem operation methods 
+ * Storage backend class for providing common filesystem operation methods
  * which are not storage-backend specific.
  *
  * OC_Filestorage_Common is never used directly; it is extended by all other
- * storage backends, where its methods may be overridden, and additional 
+ * storage backends, where its methods may be overridden, and additional
  * (backend-specific) methods are defined.
  *
  * Some OC_Filestorage_Common methods call functions which are first defined
@@ -115,71 +115,71 @@ abstract class OC_Filestorage_Common extends OC_Filestorage {
 	 * @param $empty Flag indicating whether directory will be emptied
 	 * @returns true/false
 	 *
-	 * @note By default the directory specified by $directory will be 
+	 * @note By default the directory specified by $directory will be
 	 * deleted together with its contents. To avoid this set $empty to true
 	 */
 	public function deleteAll( $directory, $empty = false ) {
-	
+
 		// strip leading slash
 		if( substr( $directory, 0, 1 ) == "/" ) {
-		
+
 			$directory = substr( $directory, 1 );
-			
+
 		}
-		
+
 		// strip trailing slash
 		if( substr( $directory, -1) == "/" ) {
-		
+
 			$directory = substr( $directory, 0, -1 );
-			
+
 		}
-		
+
 		if ( !$this->file_exists( \OCP\USER::getUser() . '/' . $directory ) || !$this->is_dir( \OCP\USER::getUser() . '/' . $directory ) ) {
-		
+
 			return false;
-			
+
 		} elseif( !$this->is_readable( \OCP\USER::getUser() . '/' . $directory ) ) {
-		
+
 			return false;
-			
+
 		} else {
-			
+
 			$directoryHandle = $this->opendir( \OCP\USER::getUser() . '/' . $directory );
-			
+
 			while ( $contents = readdir( $directoryHandle ) ) {
-			
+
 				if ( $contents != '.' && $contents != '..') {
-					
+
 					$path = $directory . "/" . $contents;
-				
+
 					if ( $this->is_dir( $path ) ) {
-						
+
 						deleteAll( $path );
-					
+
 					} else {
-						
+
 						$this->unlink( \OCP\USER::getUser() .'/' . $path ); // TODO: make unlink use same system path as is_dir
-					
+
 					}
 				}
-			
+
 			}
-		
+
 			//$this->closedir( $directoryHandle ); // TODO: implement closedir in OC_FSV
 
 			if ( $empty == false ) {
-			
+
 				if ( !$this->rmdir( $directory ) ) {
-				
+
 					return false;
-					
+
 				}
-				
+
 			}
-		
+
 			return true;
 		}
-		
+
 	}
 	public function getMimeType($path){
 		if(!$this->file_exists($path)){
diff --git a/lib/filestorage/commontest.php b/lib/filestorage/commontest.php
index b5126a407b..4d06e4fa32 100644
--- a/lib/filestorage/commontest.php
+++ b/lib/filestorage/commontest.php
@@ -31,11 +31,11 @@ class OC_Filestorage_CommonTest extends OC_Filestorage_Common{
 	 * @var OC_FileStorage_Local
 	 */
 	private $storage;
-	
+
 	public function __construct($params){
 		$this->storage=new OC_Filestorage_Local($params);
 	}
-	
+
 	public function mkdir($path){
 		return $this->storage->mkdir($path);
 	}
diff --git a/lib/filestorage/local.php b/lib/filestorage/local.php
index 22d17469df..b19205f45b 100644
--- a/lib/filestorage/local.php
+++ b/lib/filestorage/local.php
@@ -61,7 +61,7 @@ class OC_Filestorage_Local extends OC_Filestorage_Common{
 		return filemtime($this->datadir.$path);
 	}
 	public function touch($path, $mtime=null){
-		// sets the modification time of the file to the given value. 
+		// sets the modification time of the file to the given value.
 		// If mtime is nil the current time is set.
 		// note that the access time of the file always changes to the current time.
 		if(!is_null($mtime)){
@@ -72,7 +72,7 @@ class OC_Filestorage_Local extends OC_Filestorage_Common{
 		if( $result ) {
 			clearstatcache( true, $this->datadir.$path );
 		}
-		
+
 		return $result;
 	}
 	public function file_get_contents($path){
diff --git a/lib/filesystem.php b/lib/filesystem.php
index 82fbf11afd..327329f9d9 100644
--- a/lib/filesystem.php
+++ b/lib/filesystem.php
@@ -3,22 +3,22 @@
 /**
 * ownCloud
 *
-* @author Frank Karlitschek 
-* @copyright 2012 Frank Karlitschek frank@owncloud.org 
-* 
+* @author Frank Karlitschek
+* @copyright 2012 Frank Karlitschek frank@owncloud.org
+*
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either 
+* License as published by the Free Software Foundation; either
 * version 3 of the License, or any later version.
-* 
+*
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-*  
-* You should have received a copy of the GNU Affero General Public 
+*
+* You should have received a copy of the GNU Affero General Public
 * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-* 
+*
 */
 
 
@@ -193,7 +193,7 @@ class OC_Filesystem{
 			return OC_Filesystem::$storages[$mountpoint];
 		}
 	}
-	
+
 	static public function init($root){
 		if(self::$defaultInstance){
 			return false;
@@ -237,7 +237,7 @@ class OC_Filesystem{
 				}
 			}
 		}
-		
+
 		self::$loaded=true;
 	}
 
@@ -257,14 +257,14 @@ class OC_Filesystem{
 	static public function getView(){
 		return self::$defaultInstance;
 	}
-	
+
 	/**
 	 * tear down the filesystem, removing all storage providers
 	 */
 	static public function tearDown(){
 		self::$storages=array();
 	}
-	
+
 	/**
 	* create a new storage of a specific type
 	* @param  string  type
@@ -284,7 +284,7 @@ class OC_Filesystem{
 			return false;
 		}
 	}
-	
+
 	/**
 	* change the root to a fake root
 	* @param  string  fakeRoot
@@ -326,7 +326,7 @@ class OC_Filesystem{
 		}
 		self::$mounts[$mountpoint]=array('class'=>$class,'arguments'=>$arguments);
 	}
-	
+
 	/**
 	* return the path to a local version of the file
 	* we need this because we can't know if a file is stored local or not from outside the filestorage and for some purposes a local file is needed
@@ -343,21 +343,21 @@ class OC_Filesystem{
 	static public function getLocalFolder($path){
 		return self::$defaultInstance->getLocalFolder($path);
 	}
-	
+
 	/**
 	* return path to file which reflects one visible in browser
 	* @param string path
 	* @return string
 	*/
 	static public function getLocalPath($path) {
-		$datadir = \OCP\Config::getSystemValue('datadirectory').'/'.\OC_User::getUser().'/files';
+		$datadir = OC_User::getHome($user).'/files';
 		$newpath = $path;
 		if (strncmp($newpath, $datadir, strlen($datadir)) == 0) {
 			$newpath = substr($path, strlen($datadir));
 		}
 		return $newpath;
 	}
-	
+
 	/**
 	 * check if the requested path is valid
 	 * @param string path
@@ -372,7 +372,7 @@ class OC_Filesystem{
 		}
 		return true;
 	}
-	
+
 	/**
 	 * checks if a file is blacklsited for storage in the filesystem
 	 * Listens to write and rename hooks
@@ -392,7 +392,7 @@ class OC_Filesystem{
 			}
 		}
 	}
-	
+
 	/**
 	 * following functions are equivilent to their php buildin equivilents for arguments/return values.
 	 */
@@ -496,11 +496,11 @@ class OC_Filesystem{
 	static public function hash($type,$path, $raw = false){
 		return self::$defaultInstance->hash($type,$path, $raw);
 	}
-	
+
 	static public function free_space($path='/'){
 		return self::$defaultInstance->free_space($path);
 	}
-	
+
 	static public function search($query){
 		return OC_FileCache::search($query);
 	}
diff --git a/lib/filesystemview.php b/lib/filesystemview.php
index a888e5340e..461a026256 100644
--- a/lib/filesystemview.php
+++ b/lib/filesystemview.php
@@ -56,7 +56,7 @@ class OC_FilesystemView {
 		}
 		return $this->fakeRoot.$path;
 	}
-	
+
 	/**
 	* change the root to a fake toor
 	* @param  string  fakeRoot
@@ -325,7 +325,7 @@ class OC_FilesystemView {
 		if(OC_FileProxy::runPreProxies('rename', $absolutePath1, $absolutePath2) and OC_Filesystem::isValidPath($path2)) {
 			$path1 = $this->getRelativePath($absolutePath1);
 			$path2 = $this->getRelativePath($absolutePath2);
-			
+
 			if($path1 == null or $path2 == null) {
 				return false;
 			}
@@ -352,7 +352,7 @@ class OC_FilesystemView {
 					$storage1 = $this->getStorage($path1);
 					$storage1->unlink($this->getInternalPath($path1.$postFix1));
 					$result = $count>0;
-				} 
+				}
 				OC_Hook::emit(
 					OC_Filesystem::CLASSNAME,
 					OC_Filesystem::signal_post_rename,
@@ -373,7 +373,7 @@ class OC_FilesystemView {
 		if(OC_FileProxy::runPreProxies('copy', $absolutePath1, $absolutePath2) and OC_Filesystem::isValidPath($path2)) {
 			$path1 = $this->getRelativePath($absolutePath1);
 			$path2 = $this->getRelativePath($absolutePath2);
-			
+
 			if($path1 == null or $path2 == null) {
 				return false;
 			}
diff --git a/lib/geo.php b/lib/geo.php
index a967ab28a9..964605b1c1 100644
--- a/lib/geo.php
+++ b/lib/geo.php
@@ -12,7 +12,7 @@ class OC_Geo{
 	 * @param (string) $longitude - Longitude
 	 * @return (string) $timezone - closest timezone
 	 */
-	public static function timezone($latitude, $longitude){	
+	public static function timezone($latitude, $longitude){
 		$alltimezones = DateTimeZone::listIdentifiers();
 		$variances = array();
 		//calculate for all timezones the system know
diff --git a/lib/group.php b/lib/group.php
index 72cf5dc89a..dd70a94eb0 100644
--- a/lib/group.php
+++ b/lib/group.php
@@ -271,7 +271,7 @@ class OC_Group {
 		}
 		return $users;
 	}
-	
+
 	/**
 	 * @brief get a list of all users in several groups
 	 * @param array $gids
diff --git a/lib/helper.php b/lib/helper.php
index 3cdb3e53c2..69856085db 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -100,6 +100,17 @@ class OC_Helper {
 		return self::linkToAbsolute( '', 'remote.php') . '/' . $service . (($add_slash && $service[strlen($service)-1]!='/')?'/':'');
 	}
 
+	/**
+	 * @brief Creates an absolute url for public use
+	 * @param $service id
+	 * @returns the url
+	 *
+	 * Returns a absolute url to the given service.
+	 */
+	public static function linkToPublic($service, $add_slash = false) {
+		return self::linkToAbsolute( '', 'public.php') . '?service=' . $service . (($add_slash && $service[strlen($service)-1]!='/')?'/':'');
+	}
+
 	/**
 	 * @brief Creates path to an image
 	 * @param $app app
diff --git a/lib/hook.php b/lib/hook.php
index b53755310e..ee390d6cd5 100644
--- a/lib/hook.php
+++ b/lib/hook.php
@@ -83,4 +83,3 @@ class OC_Hook{
 		}
 	}
 }
- 
diff --git a/lib/image.php b/lib/image.php
index 90c64320a7..e87cf9e16d 100644
--- a/lib/image.php
+++ b/lib/image.php
@@ -383,7 +383,7 @@ class OC_Image {
 	/**
 	* @brief Loads an image from an open file handle.
 	* It is the responsibility of the caller to position the pointer at the correct place and to close the handle again.
-	* @param $handle 
+	* @param $handle
 	* @returns An image resource or false on error
 	*/
 	public function loadFromFileHandle($handle) {
@@ -468,7 +468,7 @@ class OC_Image {
 				break;
 			*/
 			default:
-			
+
 				// this is mostly file created from encrypted file
 				$this->resource = imagecreatefromstring(\OC_Filesystem::file_get_contents(\OC_Filesystem::getLocalPath($imagepath)));
 				$itype = IMAGETYPE_PNG;
@@ -534,7 +534,7 @@ class OC_Image {
 		$width_orig=imageSX($this->resource);
 		$height_orig=imageSY($this->resource);
 		$ratio_orig = $width_orig/$height_orig;
-		
+
 		if ($ratio_orig > 1) {
 			$new_height = round($maxsize/$ratio_orig);
 			$new_width = $maxsize;
@@ -564,7 +564,7 @@ class OC_Image {
 	public function preciseResize($width, $height) {
 		if (!$this->valid()) {
 			OC_Log::write('core',__METHOD__.'(): No image loaded', OC_Log::ERROR);
-			return false;			
+			return false;
 		}
 		$width_orig=imageSX($this->resource);
 		$height_orig=imageSY($this->resource);
diff --git a/lib/json.php b/lib/json.php
index 3d9d5c96fa..32ae734e4a 100644
--- a/lib/json.php
+++ b/lib/json.php
@@ -52,7 +52,7 @@ class OC_JSON{
 			exit();
 		}
 	}
-        
+
 	/**
 	* Check if the user is a admin, send json error msg if not
 	*/
@@ -64,7 +64,7 @@ class OC_JSON{
 			exit();
 		}
 	}
-        
+
 	/**
 	* Check if the user is a subadmin, send json error msg if not
 	*/
diff --git a/lib/l10n.php b/lib/l10n.php
index e7f5ffea0e..cfa0e26486 100644
--- a/lib/l10n.php
+++ b/lib/l10n.php
@@ -28,17 +28,17 @@ class OC_L10N{
 	 * cached instances
 	 */
 	protected static $instances=array();
-	
+
 	/**
 	 * cache
 	 */
 	protected static $cache = array();
-	
+
 	/**
 	 * The best language
 	 */
 	protected static $language = '';
-	
+
 	/**
 	 * App of this object
 	 */
@@ -53,7 +53,7 @@ class OC_L10N{
 	 * Translations
 	 */
 	private $translations = array();
-	
+
 	/**
 	 * Localization
 	 */
@@ -61,7 +61,7 @@ class OC_L10N{
 		'date' => 'd.m.Y',
 		'datetime' => 'd.m.Y H:i:s',
 		'time' => 'H:i:s');
-		
+
 	/**
 	 * get an L10N instance
 	 * @return OC_L10N
@@ -76,7 +76,7 @@ class OC_L10N{
 			return new OC_L10N($app,$lang);
 		}
 	}
-	
+
 	/**
 	 * @brief The constructor
 	 * @param $app the app requesting l10n
@@ -90,7 +90,7 @@ class OC_L10N{
 		$this->app = $app;
 		$this->lang = $lang;
 	}
-		
+
 	protected function init(){
 		if ($this->app === true) {
 			return;
@@ -119,7 +119,7 @@ class OC_L10N{
 				if(isset($TRANSLATIONS) && is_array($TRANSLATIONS)){
 					$this->translations = $TRANSLATIONS;
 				}
-			} 
+			}
 
 			if(file_exists(OC::$SERVERROOT.'/core/l10n/l10n-'.$lang.'.php')){
 				// Include the file, save the data from $CONFIG
@@ -188,7 +188,7 @@ class OC_L10N{
 	 * @returns String or false
 	 *
 	 * Returns the localized data.
-	 * 
+	 *
 	 * Implemented types:
 	 *  - date
 	 *    - Creates a date
@@ -241,7 +241,7 @@ class OC_L10N{
 	 * @returns language
 	 *
 	 * If $app is an array, ownCloud assumes that these are the available
-	 * languages. Otherwise ownCloud tries to find the files in the l10n 
+	 * languages. Otherwise ownCloud tries to find the files in the l10n
 	 * folder.
 	 *
 	 * If nothing works it returns 'en'
diff --git a/lib/l10n/nb_NO.php b/lib/l10n/nb_NO.php
index af9503b7bf..f751a41d5e 100644
--- a/lib/l10n/nb_NO.php
+++ b/lib/l10n/nb_NO.php
@@ -11,6 +11,7 @@
 "Selected files too large to generate zip file." => "De valgte filene er for store til å kunne generere ZIP-fil",
 "Application is not enabled" => "Applikasjon er ikke påslått",
 "Authentication error" => "Autentiseringsfeil",
+"Token expired. Please reload page." => "Symbol utløpt. Vennligst last inn siden på nytt.",
 "seconds ago" => "sekunder siden",
 "1 minute ago" => "1 minuitt siden",
 "%d minutes ago" => "%d minutter siden",
diff --git a/lib/mail.php b/lib/mail.php
index 0ac9a97c1b..acdadeffd3 100644
--- a/lib/mail.php
+++ b/lib/mail.php
@@ -17,7 +17,7 @@ require_once('class.phpmailer.php');
 class OC_Mail {
 
 	/**
-	 * send an email 
+	 * send an email
 	 *
 	 * @param string $toaddress
 	 * @param string $toname
@@ -31,9 +31,9 @@ class OC_Mail {
 
 		$SMTPMODE = OC_Config::getValue( 'mail_smtpmode', 'sendmail' );
 		$SMTPHOST = OC_Config::getValue( 'mail_smtphost', '127.0.0.1' );
-		$SMTPAUTH = OC_Config::getValue( 'mail_smtpauth', false ); 
-		$SMTPUSERNAME = OC_Config::getValue( 'mail_smtpname', '' ); 
-		$SMTPPASSWORD = OC_Config::getValue( 'mail_smtppassword', '' );  
+		$SMTPAUTH = OC_Config::getValue( 'mail_smtpauth', false );
+		$SMTPUSERNAME = OC_Config::getValue( 'mail_smtpname', '' );
+		$SMTPPASSWORD = OC_Config::getValue( 'mail_smtppassword', '' );
 
 
 		$mailo = new PHPMailer(true);
diff --git a/lib/migrate.php b/lib/migrate.php
index 917d77eaca..7d7169c4e4 100644
--- a/lib/migrate.php
+++ b/lib/migrate.php
@@ -141,7 +141,7 @@ class OC_Migrate{
 	 			// Export the app info
 			    $exportdata = self::exportAppData();
 				// Add the data dir to the zip
-				self::$content->addDir( $datadir . '/' . self::$uid, true, '/' );
+				self::$content->addDir(OC_User::getHome(self::$uid), true, '/' );
 	 		break;
 	 		case 'instance':
 	 			self::$content = new OC_Migration_Content( self::$zip );
@@ -159,14 +159,14 @@ class OC_Migrate{
 				self::$content->addFromString( $dbexport, "dbexport.xml" );
 				// Add user data
 				foreach(OC_User::getUsers() as $user){
-					self::$content->addDir( $datadir . '/' . $user . '/', true, "/userdata/" );
+					self::$content->addDir(OC_User::getHome($user), true, "/userdata/" );
 				}
 			break;
 			case 'userfiles':
 				self::$content = new OC_Migration_Content( self::$zip );
 				// Creates a zip with all of the users files
 				foreach(OC_User::getUsers() as $user){
-					self::$content->addDir( $datadir . '/' . $user . '/', true, "/" );
+					self::$content->addDir(OC_User::getHome($user), true, "/" );
 				}
 			break;
 			case 'system':
@@ -196,7 +196,7 @@ class OC_Migrate{
 	* @param optional $uid userid of new user
 	*/
 	public static function import( $path, $type='user', $uid=null ){
-		
+
 		$datadir = OC_Config::getValue( 'datadirectory' );
 		// Extract the zip
 		if( !$extractpath = self::extractZip( $path ) ){
@@ -222,13 +222,13 @@ class OC_Migrate{
 		if( self::$exporttype == 'user' ){
 			self::$uid = !is_null($uid) ? $uid : $currentuser;
 		}
-		
+
 		// We need to be an admin if we are not importing our own data
 		if(($type == 'user' && self::$uid != $currentuser) || $type != 'user' ){
 			if( !OC_Group::inGroup( OC_User::getUser(), 'admin' )){
 				// Naughty.
 				OC_Log::write( 'migration', 'Import not permitted.', OC_Log::ERROR );
-				return json_encode( array( 'success' => false ) ); 	
+				return json_encode( array( 'success' => false ) );
 			}
 		}
 
@@ -411,7 +411,7 @@ class OC_Migrate{
 						$success = false;
 					}
 				}
-	
+
 				// Run the export function?
 				if( $success ){
 					// Set the provider properties
@@ -421,7 +421,7 @@ class OC_Migrate{
 					$return['apps'][$provider->getID()]['success'] = false;
 					$return['apps'][$provider->getID()]['message'] = 'failed to create the app tables';
 				}
-	
+
 				// Now add some app info the the return array
 				$appinfo = OC_App::getAppInfo( $provider->getID() );
 				$return['apps'][$provider->getID()]['version'] = OC_App::getAppVersion($provider->getID());
diff --git a/lib/migration/content.php b/lib/migration/content.php
index 5c89e6bacd..e04ac224f7 100644
--- a/lib/migration/content.php
+++ b/lib/migration/content.php
@@ -25,13 +25,13 @@
  * provides methods to add and access data from the migration
  */
 class OC_Migration_Content{
-	
+
 	private $zip=false;
 	// Holds the MDB2 object
 	private $db=null;
 	// Holds an array of tmpfiles to delete after zip creation
 	private $tmpfiles=false;
-	
+
 	/**
 	* @brief sets up the
 	* @param $zip ZipArchive object
@@ -42,25 +42,25 @@ class OC_Migration_Content{
 
 		$this->zip = $zip;
 		$this->db = $db;
-		
+
 		if( !is_null( $db ) ){
 			// Get db path
 			$db = $this->db->getDatabase();
 			$this->tmpfiles[] = $db;
 		}
-		
+
 	}
-	
+
 	// @brief prepares the db
 	// @param $query the sql query to prepare
 	public function prepare( $query ){
-		
+
 		// Optimize the query
 		$query = $this->processQuery( $query );
-		
+
 		// Optimize the query
 		$query = $this->db->prepare( $query );
-		
+
 		// Die if we have an error (error means: bad query, not 0 results!)
 		if( PEAR::isError( $query ) ) {
 			$entry = 'DB Error: "'.$result->getMessage().'"<br />';
@@ -68,11 +68,11 @@ class OC_Migration_Content{
 			OC_Log::write( 'migration', $entry, OC_Log::FATAL );
 			return false;
 		} else {
-			return $query;	
+			return $query;
 		}
-		
+
 	}
-	
+
 	/**
 	* @brief processes the db query
 	* @param $query the query to process
@@ -86,7 +86,7 @@ class OC_Migration_Content{
 		$query = str_replace( '*PREFIX*', '', $query );
 		return $query;
 	}
-	
+
 	/**
 	* @brief copys rows to migration.db from the main database
 	* @param $options array of options.
@@ -94,19 +94,19 @@ class OC_Migration_Content{
 	*/
 	public function copyRows( $options ){
 		if( !array_key_exists( 'table', $options ) ){
-			return false;	
+			return false;
 		}
-		
+
 		$return = array();
-					
+
 		// Need to include 'where' in the query?
 		if( array_key_exists( 'matchval', $options ) && array_key_exists( 'matchcol', $options ) ){
-			
+
 			// If only one matchval, create an array
 			if(!is_array($options['matchval'])){
-				$options['matchval'] = array( $options['matchval'] );	
+				$options['matchval'] = array( $options['matchval'] );
 			}
-			
+
 			foreach( $options['matchval'] as $matchval ){
 				// Run the query for this match value (where x = y value)
 				$sql = 'SELECT * FROM `*PREFIX*' . $options['table'] . '` WHERE `' . $options['matchcol'] . '` LIKE ?';
@@ -122,13 +122,13 @@ class OC_Migration_Content{
 			$query = OC_DB::prepare( $sql );
 			$results = $query->execute();
 			$return = $this->insertData( $results, $options );
-	
+
 		}
-		
+
 		return $return;
-		
+
 	}
-	
+
 	/**
 	* @brief saves a sql data set into migration.db
 	* @param $data a sql data set returned from self::prepare()->query()
@@ -144,7 +144,7 @@ class OC_Migration_Content{
 				$fields[] = $field;
 				$values[] = $value;
 			}
-			
+
 			// Generate some sql
 			$sql = "INSERT INTO `" . $options['table'] . '` ( `';
 			$fieldssql = implode( '`, `', $fields );
@@ -154,7 +154,7 @@ class OC_Migration_Content{
 			// Make the query
 			$query = $this->prepare( $sql );
 			if( !$query ){
-				OC_Log::write( 'migration', 'Invalid sql produced: '.$sql, OC_Log::FATAL );	
+				OC_Log::write( 'migration', 'Invalid sql produced: '.$sql, OC_Log::FATAL );
 				return false;
 				exit();
 			} else {
@@ -162,10 +162,10 @@ class OC_Migration_Content{
 				// Do we need to return some values?
 				if( array_key_exists( 'idcol', $options ) ){
 					// Yes we do
-					$return[] = $row[$options['idcol']];	
+					$return[] = $row[$options['idcol']];
 				} else {
 					// Take a guess and return the first field :)
-					$return[] = reset($row);	
+					$return[] = reset($row);
 				}
 			}
 			$fields = '';
@@ -173,11 +173,11 @@ class OC_Migration_Content{
 		}
 		return $return;
 	}
-	
+
 	/**
 	* @brief adds a directory to the zip object
 	* @param $dir string path of the directory to add
-	* @param $recursive bool 
+	* @param $recursive bool
 	* @param $internaldir string path of folder to add dir to in zip
 	* @return bool
 	*/
@@ -186,13 +186,13 @@ class OC_Migration_Content{
 	    $this->zip->addEmptyDir($internaldir . $dirname);
 	    $internaldir.=$dirname.='/';
 		if( !file_exists( $dir ) ){
-			return false;	
+			return false;
 		}
 	    if ($dirhandle = opendir($dir)) {
 			while (false !== ( $file = readdir($dirhandle))) {
-	
+
 				if (( $file != '.' ) && ( $file != '..' )) {
-		
+
 					if (is_dir($dir . '/' . $file) && $recursive) {
 						$this->addDir($dir . '/' . $file, $recursive, $internaldir);
 					} elseif (is_file($dir . '/' . $file)) {
@@ -207,7 +207,7 @@ class OC_Migration_Content{
 	    }
 	    return true;
 	}
-	
+
 	/**
 	* @brief adds a file to the zip from a given string
 	* @param $data string of data to add
@@ -220,13 +220,13 @@ class OC_Migration_Content{
 		$this->tmpfiles[] = $file;
 		if( !file_put_contents( $file, $data ) ){
 			OC_Log::write( 'migation', 'Failed to save data to a temporary file', OC_Log::ERROR );
-			return false;	
+			return false;
 		}
 		// Add file to the zip
 		$this->zip->addFile( $file, $path );
 		return true;
 	}
-	
+
 	/**
 	* @brief closes the zip, removes temp files
 	* @return bool
@@ -234,19 +234,19 @@ class OC_Migration_Content{
 	public function finish(){
 		if( !$this->zip->close() ){
 			OC_Log::write( 'migration', 'Failed to write the zip file with error: '.$this->zip->getStatusString(), OC_Log::ERROR );
-			return false;	
+			return false;
 		}
 		$this->cleanup();
-		return true;	
-	}	
-	
+		return true;
+	}
+
 		/**
 	* @brief cleans up after the zip
 	*/
 	private function cleanup(){
 		// Delete tmp files
 		foreach($this->tmpfiles as $i){
-			unlink( $i );	
-		}	
+			unlink( $i );
+		}
 	}
 }
diff --git a/lib/migration/provider.php b/lib/migration/provider.php
index 91336f3019..259b1fe7ae 100644
--- a/lib/migration/provider.php
+++ b/lib/migration/provider.php
@@ -3,37 +3,37 @@
  * provides search functionalty
  */
 abstract class OC_Migration_Provider{
-	
+
 	protected $id=false;
-	protected $content=false; 
+	protected $content=false;
 	protected $uid=false;
 	protected $olduid=false;
 	protected $appinfo=false;
-	
+
 	public function __construct( $appid ){
 		// Set the id
 		$this->id = $appid;
 		OC_Migrate::registerProvider( $this );
 	}
-	
+
 	/**
 	 * @brief exports data for apps
 	 * @return array appdata to be exported
 	 */
 	abstract function export( );
-	
+
 	/**
 	 * @brief imports data for the app
 	 * @return void
 	 */
 	abstract function import( );
-	
+
 	/**
 	* @brief sets the OC_Migration_Content object to $this->content
 	* @param $content a OC_Migration_Content object
 	*/
 	public function setData( $uid, $content, $info=null ){
-		$this->content = $content;	
+		$this->content = $content;
 		$this->uid = $uid;
 		$id = $this->id;
 		if( !is_null( $info ) ){
@@ -41,12 +41,12 @@ abstract class OC_Migration_Provider{
 			$this->appinfo = $info->apps->$id;
 		}
 	}
-	 	
+
 	/**
 	* @brief returns the appid of the provider
 	* @return string
 	*/
 	public function getID(){
-		return $this->id;	
+		return $this->id;
 	}
 }
diff --git a/lib/ocs.php b/lib/ocs.php
index 1df08df9fa..64e89648e1 100644
--- a/lib/ocs.php
+++ b/lib/ocs.php
@@ -177,7 +177,7 @@ class OC_OCS {
 			->requirements(array('format'=>'xml|json'));
 
 		// CLOUD
-		// systemWebApps 
+		// systemWebApps
 		$router->create('system_webapps',
 				  '/cloud/system/webapps.{format}')
 			->defaults(array('format' => $format))
@@ -187,7 +187,7 @@ class OC_OCS {
 					})
 			->requirements(array('format'=>'xml|json'));
 
-		// quotaget 
+		// quotaget
 		$router->create('quota_get',
 				  '/cloud/user/{user}.{format}')
 			->defaults(array('format' => $format))
@@ -197,7 +197,7 @@ class OC_OCS {
 					OC_OCS::quotaGet($format, $user);
 					})
 			->requirements(array('format'=>'xml|json'));
-		// quotaset 
+		// quotaset
 		$router->create('quota_set',
 				  '/cloud/user/{user}.{format}')
 			->post()
@@ -210,7 +210,7 @@ class OC_OCS {
 					})
 			->requirements(array('format'=>'xml|json'));
 
-		// keygetpublic 
+		// keygetpublic
 		$router->create('keygetpublic',
 				  '/cloud/user/{user}/publickey.{format}')
 			->defaults(array('format' => $format))
@@ -221,7 +221,7 @@ class OC_OCS {
 					})
 			->requirements(array('format'=>'xml|json'));
 
-		// keygetprivate 
+		// keygetprivate
 		$router->create('keygetpublic',
 				  '/cloud/user/{user}/privatekey.{format}')
 			->defaults(array('format' => $format))
@@ -557,7 +557,7 @@ class OC_OCS {
 			echo(OC_OCS::generatexml($format,'ok',100,''));
 		}
 	}
-	
+
 	/**
 	* get private data
 	* @param string $user
diff --git a/lib/ocsclient.php b/lib/ocsclient.php
index ae35470cff..f05a9af31c 100644
--- a/lib/ocsclient.php
+++ b/lib/ocsclient.php
@@ -29,7 +29,7 @@
 class OC_OCSClient{
 
 	/**
-	 * @brief Get the url of the OCS AppStore server. 
+	 * @brief Get the url of the OCS AppStore server.
 	 * @returns string of the AppStore server
 	 *
 	 * This function returns the url of the OCS AppStore server. It´s possible to set it in the config file or it will fallback to the default
@@ -40,7 +40,7 @@ class OC_OCSClient{
 	}
 
         /**
-         * @brief Get the url of the OCS KB server. 
+         * @brief Get the url of the OCS KB server.
          * @returns string of the KB server
          * This function returns the url of the OCS knowledge base server. It´s possible to set it in the config file or it will fallback to the default
          */
@@ -61,13 +61,13 @@ class OC_OCSClient{
 			return NULL;
 		}
 		$url=OC_OCSClient::getAppStoreURL().'/content/categories';
-	
+
 		$xml=@file_get_contents($url);
 		if($xml==FALSE){
 			return NULL;
 		}
 		$data=simplexml_load_string($xml);
-	
+
 		$tmp=$data->data;
 		$cats=array();
 
@@ -119,9 +119,9 @@ class OC_OCSClient{
 			$app['preview']=(string)$tmp[$i]->smallpreviewpic1;
 			$app['changed']=strtotime($tmp[$i]->changed);
 			$app['description']=(string)$tmp[$i]->description;
-	
+
 			$apps[]=$app;
-		} 
+		}
 		return $apps;
 	}
 
@@ -184,10 +184,10 @@ class OC_OCSClient{
 
 		$tmp=$data->data->content;
 		$app=array();
-		if(isset($tmp->downloadlink)) { 
+		if(isset($tmp->downloadlink)) {
 			$app['downloadlink']=$tmp->downloadlink;
 		}else{
-	 		$app['downloadlink']='';
+			$app['downloadlink']='';
 		}
 		return $app;
 	}
@@ -199,7 +199,7 @@ class OC_OCSClient{
 	 *
 	 * This function returns a list of all the knowledgebase entries from the OCS server
 	 */
-	public static function getKnownledgebaseEntries($page,$pagesize,$search=''){	
+	public static function getKnownledgebaseEntries($page,$pagesize,$search=''){
 		if(OC_Config::getValue('knowledgebaseenabled', true)==false){
 			$kbe=array();
 			$kbe['totalitems']=0;
diff --git a/lib/preferences.php b/lib/preferences.php
index b6c4c3a163..de5747fccc 100644
--- a/lib/preferences.php
+++ b/lib/preferences.php
@@ -116,7 +116,7 @@ class OC_Preferences{
 		// Try to fetch the value, return default if not exists.
 		$query = OC_DB::prepare( 'SELECT `configvalue` FROM `*PREFIX*preferences` WHERE `userid` = ? AND `appid` = ? AND `configkey` = ?' );
 		$result = $query->execute( array( $user, $app, $key ));
-		
+
 		$row = $result->fetchRow();
 		if($row){
 			return $row["configvalue"];
diff --git a/lib/public/app.php b/lib/public/app.php
index e74f155074..be38bbff98 100644
--- a/lib/public/app.php
+++ b/lib/public/app.php
@@ -26,7 +26,7 @@
  *
  */
 
-// use OCP namespace for all classes that are considered public. 
+// use OCP namespace for all classes that are considered public.
 // This means that they should be used by apps instead of the internal ownCloud classes
 namespace OCP;
 
@@ -130,7 +130,7 @@ class App {
 
 
         /**
-         * @brief Check if the app is enabled, redirects to home if not 
+         * @brief Check if the app is enabled, redirects to home if not
          * @param $app app
          * @returns true/false
         */
@@ -140,7 +140,7 @@ class App {
 
 
         /**
-         * @brief Get the last version of the app, either from appinfo/version or from appinfo/info.xml 
+         * @brief Get the last version of the app, either from appinfo/version or from appinfo/info.xml
          * @param $app app
          * @returns true/false
          */
diff --git a/lib/public/backgroundjob.php b/lib/public/backgroundjob.php
index 834bebb5c3..2962346dbc 100644
--- a/lib/public/backgroundjob.php
+++ b/lib/public/backgroundjob.php
@@ -24,7 +24,7 @@
  * Public interface of ownCloud forbackground jobs.
  */
 
-// use OCP namespace for all classes that are considered public. 
+// use OCP namespace for all classes that are considered public.
 // This means that they should be used by apps instead of the internal ownCloud classes
 namespace OCP;
 
@@ -42,7 +42,7 @@ namespace OCP;
  * An example of the queued task would be the creation of the thumbnail. As
  * soon as the user uploads a picture the gallery app registers the queued
  * task "create thumbnail" and saves the path in the parameter instead of doing
- * the work right away. This makes the app more responsive. As soon as the task 
+ * the work right away. This makes the app more responsive. As soon as the task
  * is done it will be deleted from the list.
  */
 class BackgroundJob {
diff --git a/lib/public/config.php b/lib/public/config.php
index ab01902ffe..f3120b9aaa 100644
--- a/lib/public/config.php
+++ b/lib/public/config.php
@@ -27,7 +27,7 @@
  */
 
 /**
- * @brief use OCP namespace for all classes that are considered public. 
+ * @brief use OCP namespace for all classes that are considered public.
  *
  * Classes that use this namespace are for use by apps, and not for use by internal
  * OC classes
diff --git a/lib/public/db.php b/lib/public/db.php
index 23c670cf44..e1da62e2d2 100644
--- a/lib/public/db.php
+++ b/lib/public/db.php
@@ -26,7 +26,7 @@
  *
  */
 
-// use OCP namespace for all classes that are considered public. 
+// use OCP namespace for all classes that are considered public.
 // This means that they should be used by apps instead of the internal ownCloud classes
 namespace OCP;
 
diff --git a/lib/public/files.php b/lib/public/files.php
index 32b3f03674..be5952d362 100644
--- a/lib/public/files.php
+++ b/lib/public/files.php
@@ -26,7 +26,7 @@
  *
  */
 
-// use OCP namespace for all classes that are considered public. 
+// use OCP namespace for all classes that are considered public.
 // This means that they should be used by apps instead of the internal ownCloud classes
 namespace OCP;
 
diff --git a/lib/public/json.php b/lib/public/json.php
index 99df79173e..c37b42c3f7 100644
--- a/lib/public/json.php
+++ b/lib/public/json.php
@@ -26,7 +26,7 @@
  *
  */
 
-// use OCP namespace for all classes that are considered public. 
+// use OCP namespace for all classes that are considered public.
 // This means that they should be used by apps instead of the internal ownCloud classes
 namespace OCP;
 
@@ -47,17 +47,17 @@ class JSON {
 
 	/**
 	* Check if the user is logged in, send json error msg if not.
-	* 
+	*
 	* This method checks if a user is logged in. If not, a json error
 	* response will be return and the method will exit from execution
 	* of the script.
 	* The returned json will be in the format:
-	* 
+	*
 	*     {"status":"error","data":{"message":"Authentication error."}}
-	* 
+	*
 	* Add this call to the start of all ajax method files that requires
 	* an authenticated user.
-	* 
+	*
 	* @return string json formatted error string if not authenticated.
 	*/
 	public static function checkLoggedIn(){
@@ -66,22 +66,22 @@ class JSON {
 
 	/**
 	* Check an ajax get/post call if the request token is valid.
-	* 
+	*
 	* This method checks for a valid variable 'requesttoken' in $_GET,
 	* $_POST and $_SERVER. If a valid token is not found, a json error
 	* response will be return and the method will exit from execution
 	* of the script.
 	* The returned json will be in the format:
-	* 
+	*
 	*     {"status":"error","data":{"message":"Token expired. Please reload page."}}
-	* 
-	* Add this call to the start of all ajax method files that creates, 
+	*
+	* Add this call to the start of all ajax method files that creates,
 	* updates or deletes anything.
 	* In cases where you e.g. use an ajax call to load a dialog containing
 	* a submittable form, you will need to add the requesttoken first as a
 	* parameter to the ajax call, then assign it to the template and finally
 	* add a hidden input field also named 'requesttoken' containing the value.
-	* 
+	*
 	* @return string json formatted error string if not valid.
 	*/
 	public static function callCheck(){
@@ -90,10 +90,10 @@ class JSON {
 
 	/**
 	* Send json success msg
-	* 
+	*
 	* Return a json success message with optional extra data.
-	* @see OCP\JSON::error() 		for the format to use.
-	* 
+	* @see OCP\JSON::error()		for the format to use.
+	*
 	* @param array $data The data to use
 	* @return string json formatted string.
 	*/
@@ -103,19 +103,19 @@ class JSON {
 
 	/**
 	* Send json error msg
-	* 
-	* Return a json error message with optional extra data for 
+	*
+	* Return a json error message with optional extra data for
 	* error message or app specific data.
-	* 
+	*
 	* Example use:
-	* 
+	*
 	*     $id = [some value]
 	*     OCP\JSON::error(array('data':array('message':'An error happened', 'id': $id)));
-	* 
+	*
 	* Will return the json formatted string:
-	* 
+	*
 	*     {"status":"error","data":{"message":"An error happened", "id":[some value]}}
-	* 
+	*
 	* @param array $data The data to use
 	* @return string json formatted error string.
 	*/
@@ -134,17 +134,17 @@ class JSON {
 
 	/**
 	* Check if the App is enabled and send JSON error message instead
-	* 
+	*
 	* This method checks if a specific app is enabled. If not, a json error
 	* response will be return and the method will exit from execution
 	* of the script.
 	* The returned json will be in the format:
-	* 
+	*
 	*     {"status":"error","data":{"message":"Application is not enabled."}}
-	* 
+	*
 	* Add this call to the start of all ajax method files that requires
 	* a specific app to be enabled.
-	* 
+	*
 	* @param string $app The app to check
 	* @return string json formatted string if not enabled.
 	*/
@@ -154,17 +154,17 @@ class JSON {
 
 	/**
 	* Check if the user is a admin, send json error msg if not
-	* 
+	*
 	* This method checks if the current user has admin rights. If not, a json error
 	* response will be return and the method will exit from execution
 	* of the script.
 	* The returned json will be in the format:
-	* 
+	*
 	*     {"status":"error","data":{"message":"Authentication error."}}
-	* 
+	*
 	* Add this call to the start of all ajax method files that requires
 	* administrative rights.
-	* 
+	*
 	* @return string json formatted string if not admin user.
 	*/
 	public static function checkAdminUser(){
diff --git a/lib/public/response.php b/lib/public/response.php
index 8dff3bcd35..febb3f1436 100644
--- a/lib/public/response.php
+++ b/lib/public/response.php
@@ -26,7 +26,7 @@
  *
  */
 
-// use OCP namespace for all classes that are considered public. 
+// use OCP namespace for all classes that are considered public.
 // This means that they should be used by apps instead of the internal ownCloud classes
 namespace OCP;
 
diff --git a/lib/public/share.php b/lib/public/share.php
index 93820760d1..9ad0f0f68f 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -32,7 +32,7 @@ class Share {
 
 	const SHARE_TYPE_USER = 0;
 	const SHARE_TYPE_GROUP = 1;
-	const SHARE_TYPE_PRIVATE_LINK = 3;
+	const SHARE_TYPE_LINK = 3;
 	const SHARE_TYPE_EMAIL = 4;
 	const SHARE_TYPE_CONTACT = 5;
 	const SHARE_TYPE_REMOTE = 6;
@@ -67,15 +67,31 @@ class Share {
 	* @return Returns true if backend is registered or false if error
 	*/
 	public static function registerBackend($itemType, $class, $collectionOf = null, $supportedFileExtensions = null) {
-		if (!isset(self::$backendTypes[$itemType])) {
-			self::$backendTypes[$itemType] = array('class' => $class, 'collectionOf' => $collectionOf, 'supportedFileExtensions' => $supportedFileExtensions);
-			if(count(self::$backendTypes) === 1) {
-				\OC_Util::addScript('core', 'share');
-				\OC_Util::addStyle('core', 'share');
+		if (self::isEnabled()) {
+			if (!isset(self::$backendTypes[$itemType])) {
+				self::$backendTypes[$itemType] = array('class' => $class, 'collectionOf' => $collectionOf, 'supportedFileExtensions' => $supportedFileExtensions);
+				if(count(self::$backendTypes) === 1) {
+					\OC_Util::addScript('core', 'share');
+					\OC_Util::addStyle('core', 'share');
+				}
+				return true;
 			}
+			\OC_Log::write('OCP\Share', 'Sharing backend '.$class.' not registered, '.self::$backendTypes[$itemType]['class'].' is already registered for '.$itemType, \OC_Log::WARN);
+		}
+		return false;
+	}
+
+	/**
+	* @brief Check if the Share API is enabled
+	* @return Returns true if enabled or false
+	*
+	* The Share API is enabled by default if not configured
+	*
+	*/
+	public static function isEnabled() {
+		if (\OC_Appconfig::getValue('core', 'shareapi_enabled', 'yes') == 'yes') {
 			return true;
 		}
-		\OC_Log::write('OCP\Share', 'Sharing backend '.$class.' not registered, '.self::$backendTypes[$itemType]['class'].' is already registered for '.$itemType, \OC_Log::WARN);
 		return false;
 	}
 
@@ -112,6 +128,17 @@ class Share {
 		return self::getItems($itemType, $itemSource, self::$shareTypeUserAndGroups, \OC_User::getUser(), null, $format, $parameters, 1, $includeCollections, true);
 	}
 
+	/**
+	* @brief Get the item of item type shared by a link
+	* @param string Item type
+	* @param string Item source
+	* @param string Owner of link
+	* @return Item
+	*/
+	public static function getItemSharedWithByLink($itemType, $itemSource, $uidOwner) {
+		return self::getItems($itemType, $itemSource, self::SHARE_TYPE_LINK, null, $uidOwner, self::FORMAT_NONE, null, 1);
+	}
+
 	/**
 	* @brief Get the shared items of item type owned by the current user
 	* @param string Item type
@@ -138,7 +165,7 @@ class Share {
 	* @brief Share an item with a user, group, or via private link
 	* @param string Item type
 	* @param string Item source
-	* @param int SHARE_TYPE_USER, SHARE_TYPE_GROUP, or SHARE_TYPE_PRIVATE_LINK
+	* @param int SHARE_TYPE_USER, SHARE_TYPE_GROUP, or SHARE_TYPE_LINK
 	* @param string User or group the item is being shared with
 	* @param int CRUDS permissions
 	* @return bool Returns true on success or false on failure
@@ -157,11 +184,13 @@ class Share {
 				\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
 				throw new \Exception($message);
 			}
-			$inGroup = array_intersect(\OC_Group::getUserGroups($uidOwner), \OC_Group::getUserGroups($shareWith));
-			if (empty($inGroup)) {
-				$message = 'Sharing '.$itemSource.' failed, because the user '.$shareWith.' is not a member of any groups that '.$uidOwner.' is a member of';
-				\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
-				throw new \Exception($message);
+			if (\OC_Appconfig::getValue('core', 'shareapi_share_policy', 'global') == 'groups_only') {
+				$inGroup = array_intersect(\OC_Group::getUserGroups($uidOwner), \OC_Group::getUserGroups($shareWith));
+				if (empty($inGroup)) {
+					$message = 'Sharing '.$itemSource.' failed, because the user '.$shareWith.' is not a member of any groups that '.$uidOwner.' is a member of';
+					\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
+					throw new \Exception($message);
+				}
 			}
 			// Check if the item source is already shared with the user, either from the same owner or a different user
 			if ($checkExists = self::getItems($itemType, $itemSource, self::$shareTypeUserAndGroups, $shareWith, null, self::FORMAT_NONE, null, 1, true, true)) {
@@ -198,9 +227,30 @@ class Share {
 			$shareWith = array();
 			$shareWith['group'] = $group;
 			$shareWith['users'] = array_diff(\OC_Group::usersInGroup($group), array($uidOwner));
-		} else if ($shareType === self::SHARE_TYPE_PRIVATE_LINK) {
-				$shareWith = md5(uniqid($itemSource, true));
+		} else if ($shareType === self::SHARE_TYPE_LINK) {
+			if (\OC_Appconfig::getValue('core', 'shareapi_allow_links', 'yes') == 'yes') {
+				if ($checkExists = self::getItems($itemType, $itemSource, self::SHARE_TYPE_LINK, null, $uidOwner, self::FORMAT_NONE, null, 1)) {
+					// If password is set delete the old link
+					if (isset($shareWith)) {
+						self::delete($checkExists['id']);
+					} else {
+						$message = 'Sharing '.$itemSource.' failed, because this item is already shared with a link';
+						\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
+						throw new \Exception($message);
+					}
+				}
+				// Generate hash of password - same method as user passwords
+				if (isset($shareWith)) {
+					$forcePortable = (CRYPT_BLOWFISH != 1);
+					$hasher = new \PasswordHash(8, $forcePortable);
+					$shareWith = $hasher->HashPassword($shareWith.\OC_Config::getValue('passwordsalt', ''));
+				}
 				return self::put($itemType, $itemSource, $shareType, $shareWith, $uidOwner, $permissions);
+			}
+			$message = 'Sharing '.$itemSource.' failed, because sharing with links is not allowed';
+			\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
+			throw new \Exception($message);
+			return false;
 		} else if ($shareType === self::SHARE_TYPE_CONTACT) {
 			if (!\OC_App::isEnabled('contacts')) {
 				$message = 'Sharing '.$itemSource.' failed, because the contacts app is not enabled';
@@ -262,7 +312,7 @@ class Share {
 	* @brief Unshare an item from a user, group, or delete a private link
 	* @param string Item type
 	* @param string Item source
-	* @param int SHARE_TYPE_USER, SHARE_TYPE_GROUP, or SHARE_TYPE_PRIVATE_LINK
+	* @param int SHARE_TYPE_USER, SHARE_TYPE_GROUP, or SHARE_TYPE_LINK
 	* @param string User or group the item is being shared with
 	* @return Returns true on success or false on failure
 	*/
@@ -298,7 +348,7 @@ class Share {
 	* @brief Set the permissions of an item for a specific user or group
 	* @param string Item type
 	* @param string Item source
-	* @param int SHARE_TYPE_USER, SHARE_TYPE_GROUP, or SHARE_TYPE_PRIVATE_LINK
+	* @param int SHARE_TYPE_USER, SHARE_TYPE_GROUP, or SHARE_TYPE_LINK
 	* @param string User or group the item is being shared with
 	* @param int CRUDS permissions
 	* @return Returns true on success or false on failure
@@ -407,7 +457,7 @@ class Share {
 	* @brief Get shared items from the database
 	* @param string Item type
 	* @param string Item source or target (optional)
-	* @param int SHARE_TYPE_USER, SHARE_TYPE_GROUP, SHARE_TYPE_PRIVATE_LINK, $shareTypeUserAndGroups, or $shareTypeGroupUserUnique
+	* @param int SHARE_TYPE_USER, SHARE_TYPE_GROUP, SHARE_TYPE_LINK, $shareTypeUserAndGroups, or $shareTypeGroupUserUnique
 	* @param string User or group the item is being shared with
 	* @param string User that is the owner of shared items (optional)
 	* @param int Format to convert items to with formatItems()
@@ -420,6 +470,13 @@ class Share {
 	*
 	*/
 	private static function getItems($itemType, $item = null, $shareType = null, $shareWith = null, $uidOwner = null, $format = self::FORMAT_NONE, $parameters = null, $limit = -1, $includeCollections = false, $itemShareWithBySource = false) {
+		if (!self::isEnabled()) {
+			if ($limit == 1 || (isset($uidOwner) && isset($item))) {
+				return false;
+			} else {
+				return array();
+			}
+		}
 		$backend = self::getBackend($itemType);
 		// Get filesystem root to add it to the file target and remove from the file source, match file_source with the file cache
 		if ($itemType == 'file' || $itemType == 'folder') {
@@ -444,9 +501,9 @@ class Share {
 				$queryArgs = array($itemType);
 			}
 		}
-		if (isset($shareType) && isset($shareWith)) {
+		if (isset($shareType)) {
 			// Include all user and group items
-			if ($shareType == self::$shareTypeUserAndGroups) {
+			if ($shareType == self::$shareTypeUserAndGroups && isset($shareWith)) {
 				$where .= ' AND `share_type` IN (?,?,?)';
 				$queryArgs[] = self::SHARE_TYPE_USER;
 				$queryArgs[] = self::SHARE_TYPE_GROUP;
@@ -459,9 +516,12 @@ class Share {
 				$where .= ' AND `uid_owner` != ?';
 				$queryArgs[] = $shareWith;
 			} else {
-				$where .= ' AND `share_type` = ? AND `share_with` = ?';
+				$where .= ' AND `share_type` = ?';
 				$queryArgs[] = $shareType;
-				$queryArgs[] = $shareWith;
+				if (isset($shareWith)) {
+					$where .= ' AND `share_with` = ?';
+					$queryArgs[] = $shareWith;
+				}
 			}
 		}
 		if (isset($uidOwner)) {
@@ -485,29 +545,33 @@ class Share {
 			}
 		}
 		if (isset($item)) {
+			if ($includeCollections && $collectionTypes = self::getCollectionItemTypes($itemType)) {
+				$where .= ' AND (';
+			} else {
+				$where .= ' AND';
+			}
 			// If looking for own shared items, check item_source else check item_target
 			if (isset($uidOwner) || $itemShareWithBySource) {
 				// If item type is a file, file source needs to be checked in case the item was converted
 				if ($itemType == 'file' || $itemType == 'folder') {
-					$where .= ' AND `file_source` = ?';
+					$where .= ' `file_source` = ?';
 					$column = 'file_source';
 				} else {
-					$where .= ' AND `item_source` = ?';
+					$where .= ' `item_source` = ?';
 					$column = 'item_source';
 				}
 			} else {
 				if ($itemType == 'file' || $itemType == 'folder') {
-					$where .= ' AND `file_target` = ?';
+					$where .= ' `file_target` = ?';
 				} else {
-					$where .= ' AND `item_target` = ?';
+					$where .= ' `item_target` = ?';
 				}
 			}
 			$queryArgs[] = $item;
 			if ($includeCollections && $collectionTypes = self::getCollectionItemTypes($itemType)) {
-				// TODO Bart - this doesn't work with only one argument
-// 				$placeholders = join(',', array_fill(0, count($collectionTypes), '?'));
-// 				$where .= " OR item_type IN ('".$placeholders."')";
-// 				$queryArgs = array_merge($queryArgs, $collectionTypes);
+				$placeholders = join(',', array_fill(0, count($collectionTypes), '?'));
+				$where .= ' OR item_type IN ('.$placeholders.'))';
+				$queryArgs = array_merge($queryArgs, $collectionTypes);
 			}
 		}
 		if ($limit != -1 && !$includeCollections) {
@@ -518,8 +582,12 @@ class Share {
 			}
 			// The limit must be at least 3, because filtering needs to be done
 			if ($limit < 3) {
-				$limit = 3;
+				$queryLimit = 3;
+			} else {
+				$queryLimit = $limit;
 			}
+		} else {
+			$queryLimit = null;
 		}
 		// TODO Optimize selects
 		if ($format == self::FORMAT_STATUSES) {
@@ -548,7 +616,7 @@ class Share {
 			}
 		}
 		$root = strlen($root);
-		$query = \OC_DB::prepare('SELECT '.$select.' FROM `*PREFIX*share` '.$where, $limit);
+		$query = \OC_DB::prepare('SELECT '.$select.' FROM `*PREFIX*share` '.$where, $queryLimit);
 		$result = $query->execute($queryArgs);
 		$items = array();
 		$targets = array();
@@ -606,28 +674,30 @@ class Share {
 					}
 				}
 				// Check if this is a collection of the requested item type
-				if ($includeCollections && $row['item_type'] != $itemType && ($collectionBackend = self::getBackend($row['item_type'])) && $collectionBackend instanceof Share_Backend_Collection) {
-					$row['collection'] = array('item_type' => $itemType, $column => $row[$column]);
-					// Fetch all of the children sources
-					$children = $collectionBackend->getChildren($row[$column]);
-					foreach ($children as $child) {
-						$childItem = $row;
-						$childItem['item_source'] = $child;
-// 						$childItem['item_target'] = $child['target']; TODO
-						if (isset($item)) {
-							if ($childItem[$column] == $item) {
-								// Return only the item instead of a 2-dimensional array
-								if ($limit == 1 && $format == self::FORMAT_NONE) {
-									return $childItem;
-								} else {
-									// Unset the items array and break out of both loops
-									$items = array();
-									$items[] = $childItem;
-									break 2;
+				if ($includeCollections && $row['item_type'] != $itemType) {
+					if (($collectionBackend = self::getBackend($row['item_type'])) && $collectionBackend instanceof Share_Backend_Collection) {
+						$row['collection'] = array('item_type' => $itemType, $column => $row[$column]);
+						// Fetch all of the children sources
+						$children = $collectionBackend->getChildren($row[$column]);
+						foreach ($children as $child) {
+							$childItem = $row;
+							$childItem['item_source'] = $child;
+	// 						$childItem['item_target'] = $child['target']; TODO
+							if (isset($item)) {
+								if ($childItem[$column] == $item) {
+									// Return only the item instead of a 2-dimensional array
+									if ($limit == 1 && $format == self::FORMAT_NONE) {
+										return $childItem;
+									} else {
+										// Unset the items array and break out of both loops
+										$items = array();
+										$items[] = $childItem;
+										break 2;
+									}
 								}
+							} else {
+								$collectionItems[] = $childItem;
 							}
-						} else {
-							$collectionItems[] = $childItem;
 						}
 					}
 					// Remove collection item
@@ -646,7 +716,7 @@ class Share {
 					$column = 'path';
 				}
 				foreach ($items as $item) {
-					if ($item['share_type'] == self::SHARE_TYPE_PRIVATE_LINK) {
+					if ($item['share_type'] == self::SHARE_TYPE_LINK) {
 						$statuses[$item[$column]] = true;
 					} else if (!isset($statuses[$item[$column]])) {
 						$statuses[$item[$column]] = false;
@@ -666,7 +736,7 @@ class Share {
 	* @brief Put shared item into the database
 	* @param string Item type
 	* @param string Item source
-	* @param int SHARE_TYPE_USER, SHARE_TYPE_GROUP, or SHARE_TYPE_PRIVATE_LINK
+	* @param int SHARE_TYPE_USER, SHARE_TYPE_GROUP, or SHARE_TYPE_LINK
 	* @param string User or group the item is being shared with
 	* @param int CRUDS permissions
 	* @param bool|array Parent folder target (optional)
@@ -823,7 +893,7 @@ class Share {
 	* @brief Generate a unique target for the item
 	* @param string Item type
 	* @param string Item source
-	* @param int SHARE_TYPE_USER, SHARE_TYPE_GROUP, or SHARE_TYPE_PRIVATE_LINK
+	* @param int SHARE_TYPE_USER, SHARE_TYPE_GROUP, or SHARE_TYPE_LINK
 	* @param string User or group the item is being shared with
 	* @return string Item target
 	*
@@ -832,7 +902,7 @@ class Share {
 	*/
 	private static function generateTarget($itemType, $itemSource, $shareType, $shareWith, $uidOwner) {
 		$backend = self::getBackend($itemType);
-		if ($shareType == self::SHARE_TYPE_PRIVATE_LINK) {
+		if ($shareType == self::SHARE_TYPE_LINK) {
 			return $backend->generateTarget($itemSource, false);
 		} else {
 			if ($itemType == 'file' || $itemType == 'folder') {
@@ -1049,5 +1119,3 @@ interface Share_Backend_Collection extends Share_Backend {
 	public function getChildren($itemSource);
 
 }
-
-?>
diff --git a/lib/public/template.php b/lib/public/template.php
index a0ed618cb2..11c740d13a 100644
--- a/lib/public/template.php
+++ b/lib/public/template.php
@@ -26,7 +26,7 @@
  *
  */
 
-// use OCP namespace for all classes that are considered public. 
+// use OCP namespace for all classes that are considered public.
 // This means that they should be used by apps instead of the internal ownCloud classes
 namespace OCP;
 
@@ -88,13 +88,13 @@ function simple_file_size($bytes) {
 
 /**
  * @brief Generate html code for an options block.
- * @param $options the options 
- * @param $selected which one is selected? 
- * @param $params the parameters 
+ * @param $options the options
+ * @param $selected which one is selected?
+ * @param $params the parameters
  * @returns html options
  */
 function html_select_options($options, $selected, $params=array()) {
-	return(\html_select_options($options, $selected, $params)); 
+	return(\html_select_options($options, $selected, $params));
 }
 
 
diff --git a/lib/public/user.php b/lib/public/user.php
index 2fa599488a..6228268d75 100644
--- a/lib/public/user.php
+++ b/lib/public/user.php
@@ -26,7 +26,7 @@
  *
  */
 
-// use OCP namespace for all classes that are considered public. 
+// use OCP namespace for all classes that are considered public.
 // This means that they should be used by apps instead of the internal ownCloud classes
 namespace OCP;
 
diff --git a/lib/public/util.php b/lib/public/util.php
index 9f6f6f32e1..6ad578441e 100644
--- a/lib/public/util.php
+++ b/lib/public/util.php
@@ -144,6 +144,17 @@ class Util {
 		return(\OC_Helper::linkToRemote( $service ));
 	}
 
+	/**
+	 * @brief Creates an absolute url for public use
+	 * @param $service id
+	 * @returns the url
+	 *
+	 * Returns a absolute url to the given app and file.
+	 */
+	public static function linkToPublic($service) {
+		return \OC_Helper::linkToPublic($service);
+	}
+
 
 	/**
 	* @brief Creates an url
@@ -249,7 +260,7 @@ class Util {
 
 
 	/**
- 	 * Register an get/post call. This is important to prevent CSRF attacks
+	 * Register an get/post call. This is important to prevent CSRF attacks
 	 * TODO: write example
 	 */
 	public static function callRegister(){
diff --git a/lib/search.php b/lib/search.php
index f8a4b8e96e..9dfd0cf69e 100644
--- a/lib/search.php
+++ b/lib/search.php
@@ -27,7 +27,7 @@
 class OC_Search{
 	static private $providers=array();
 	static private $registeredProviders=array();
-	
+
 	/**
 	 * remove all registered search providers
 	 */
@@ -35,7 +35,7 @@ class OC_Search{
 		self::$providers=array();
 		self::$registeredProviders=array();
 	}
-	
+
 	/**
 	 * register a new search provider to be used
 	 * @param string $provider class name of a OC_Search_Provider
@@ -43,7 +43,7 @@ class OC_Search{
 	public static function registerProvider($class,$options=array()){
 		self::$registeredProviders[]=array('class'=>$class,'options'=>$options);
 	}
-	
+
 	/**
 	 * search all provider for $query
 	 * @param string query
@@ -57,7 +57,7 @@ class OC_Search{
 		}
 		return $results;
 	}
-	
+
 	/**
 	 * create instances of all the registered search providers
 	 */
diff --git a/lib/search/provider.php b/lib/search/provider.php
index b3ee79b477..b83c5aa61b 100644
--- a/lib/search/provider.php
+++ b/lib/search/provider.php
@@ -4,11 +4,11 @@
  */
 abstract class OC_Search_Provider {
 	private $options;
-	
+
 	public function __construct($options){
 		$this->options=$options;
 	}
-	
+
 	/**
 	 * search for $query
 	 * @param string $query
diff --git a/lib/setup.php b/lib/setup.php
index f7e8c6950c..271fe55fd7 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -18,7 +18,7 @@ if(isset($_POST['install']) AND $_POST['install']=='true') {
 	// We have to launch the installation process :
 	$e = OC_Setup::install($_POST);
 	$errors = array('errors' => $e);
-	
+
 	if(count($e) > 0) {
 		//OC_Template::printGuestPage("", "error", array("errors" => $errors));
 		$options = array_merge($_POST, $opts, $errors);
@@ -37,7 +37,7 @@ class OC_Setup {
 	public static function install($options) {
 		$error = array();
 		$dbtype = $options['dbtype'];
-		
+
 		if(empty($options['adminlogin'])) {
 			$error[] = 'Set an admin username.';
 		}
@@ -72,7 +72,7 @@ class OC_Setup {
 			$username = htmlspecialchars_decode($options['adminlogin']);
 			$password = htmlspecialchars_decode($options['adminpass']);
 			$datadir = htmlspecialchars_decode($options['directory']);
-			
+
 			//use sqlite3 when available, otherise sqlite2 will be used.
 			if($dbtype=='sqlite' and class_exists('SQLite3')){
 				$dbtype='sqlite3';
@@ -84,8 +84,8 @@ class OC_Setup {
 
 			//write the config file
 			OC_Config::setValue('datadirectory', $datadir);
- 			OC_Config::setValue('dbtype', $dbtype);
- 			OC_Config::setValue('version',implode('.',OC_Util::getVersion()));
+			OC_Config::setValue('dbtype', $dbtype);
+			OC_Config::setValue('version',implode('.',OC_Util::getVersion()));
 			if($dbtype == 'mysql') {
 				$dbuser = $options['dbuser'];
 				$dbpass = $options['dbpass'];
@@ -107,7 +107,7 @@ class OC_Setup {
 				}
 				else {
 					$oldUser=OC_Config::getValue('dbuser', false);
-					
+
 					$query="SELECT user FROM mysql.user WHERE user='$dbuser'"; //this should be enough to check for admin rights in mysql
 					if(mysql_query($query, $connection)) {
 						//use the admin login data for the new database user
@@ -184,9 +184,9 @@ class OC_Setup {
 						$dbusername='oc_'.$username;
 						//create a new password so we don't need to store the admin config in the config file
 						$dbpassword=md5(time());
-						
+
 						self::pg_createDBUser($dbusername, $dbpassword, $connection);
-						
+
 						OC_CONFIG::setValue('dbuser', $dbusername);
 						OC_CONFIG::setValue('dbpassword', $dbpassword);
 
@@ -257,7 +257,7 @@ class OC_Setup {
                                         );
                                         return $error;
                                 } else {
-                                        //check for roles creation rights in oracle             
+                                        //check for roles creation rights in oracle
 
                                         $query="SELECT count(*) FROM user_role_privs, role_sys_privs WHERE user_role_privs.granted_role = role_sys_privs.role AND privilege = 'CREATE ROLE'";
                                         $stmt = oci_parse($connection, $query);
@@ -342,7 +342,7 @@ class OC_Setup {
                                                 }
                                         }
                                 }
-                        }                   
+                        }
 			else {
 				//delete the old sqlite database first, might cause infinte loops otherwise
 				if(file_exists("$datadir/owncloud.db")){
@@ -428,7 +428,7 @@ class OC_Setup {
 			}
 		}
 		$query = "REVOKE ALL PRIVILEGES ON DATABASE \"$e_name\" FROM PUBLIC";
-		$result = pg_query($connection, $query);		
+		$result = pg_query($connection, $query);
 	}
 
 	private static function pg_createDBUser($name,$password,$connection) {
@@ -463,7 +463,7 @@ class OC_Setup {
 		}
 	}
         /**
-         * 
+         *
          * @param String $name
          * @param String $password
          * @param String $tablespace
@@ -552,7 +552,7 @@ class OC_Setup {
 		$content.= "</IfModule>\n";
 		$content.= "<IfModule mod_rewrite.c>\n";
 		$content.= "RewriteEngine on\n";
- 		$content.= "RewriteRule .* - [env=HTTP_AUTHORIZATION:%{HTTP:Authorization}]\n";
+		$content.= "RewriteRule .* - [env=HTTP_AUTHORIZATION:%{HTTP:Authorization}]\n";
 		$content.= "RewriteRule ^.well-known/host-meta /public.php?service=host-meta [QSA,L]\n";
 		$content.= "RewriteRule ^.well-known/carddav /remote.php/carddav/ [R]\n";
 		$content.= "RewriteRule ^.well-known/caldav /remote.php/caldav/ [R]\n";
diff --git a/lib/subadmin.php b/lib/subadmin.php
index 8d4f413b10..4752492df3 100644
--- a/lib/subadmin.php
+++ b/lib/subadmin.php
@@ -3,7 +3,7 @@
  * ownCloud
  *
  * @author Georg Ehrke
- * @copyright 2012 Georg Ehrke 
+ * @copyright 2012 Georg Ehrke
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
@@ -85,7 +85,7 @@ class OC_SubAdmin{
 		}
 		return $uids;
 	}
-	
+
 	/**
 	 * @brief get all SubAdmins
 	 * @return array
@@ -99,7 +99,7 @@ class OC_SubAdmin{
 		}
 		return $subadmins;
 	}
-	
+
 	/**
 	 * @brief checks if a user is a SubAdmin of a group
 	 * @param $uid uid of the subadmin
@@ -115,7 +115,7 @@ class OC_SubAdmin{
 		}
 		return false;
 	}
-	
+
 	/**
 	 * @brief checks if a user is a SubAdmin
 	 * @param $uid uid of the subadmin
@@ -130,7 +130,7 @@ class OC_SubAdmin{
 		}
 		return false;
 	}
-	
+
 	/**
 	 * @brief checks if a user is a accessible by a subadmin
 	 * @param $subadmin uid of the subadmin
@@ -141,6 +141,9 @@ class OC_SubAdmin{
 		if(!self::isSubAdmin($subadmin)){
 			return false;
 		}
+		if(OC_Group::inGroup($user, 'admin')){
+			return false;
+		}
 		$accessiblegroups = self::getSubAdminsGroups($subadmin);
 		foreach($accessiblegroups as $accessiblegroup){
 			if(OC_Group::inGroup($user, $accessiblegroup)){
@@ -149,7 +152,7 @@ class OC_SubAdmin{
 		}
 		return false;
 	}
-	
+
 	/*
 	 * @brief alias for self::isSubAdminofGroup()
 	 */
@@ -159,7 +162,7 @@ class OC_SubAdmin{
 
 	/**
 	 * @brief delete all SubAdmins by uid
-	 * @param $parameters 
+	 * @param $parameters
 	 * @return boolean
 	 */
 	public static function post_deleteUser($parameters){
diff --git a/lib/template.php b/lib/template.php
index a10ddcd5c3..fe8a3c7994 100644
--- a/lib/template.php
+++ b/lib/template.php
@@ -161,7 +161,7 @@ class OC_Template{
                 header('X-Frame-Options: Sameorigin');
                 header('X-XSS-Protection: 1; mode=block');
                 header('X-Content-Type-Options: nosniff');
- 
+
 		$this->findTemplate($name);
 	}
 
@@ -171,8 +171,8 @@ class OC_Template{
 	 * mobile -> interface for smartphones
 	 * tablet -> interface for tablets
 	 * standalone -> the default interface but without header, footer and
-	 * 	sidebar, just the application. Useful to use just a specific
-	 * 	app on the desktop in a standalone window.
+	 *	sidebar, just the application. Useful to use just a specific
+	 *	app on the desktop in a standalone window.
 	 */
 	public static function detectFormfactor(){
 		// please add more useragent strings for other devices
@@ -208,13 +208,13 @@ class OC_Template{
 			$_SESSION['formfactor']=$_GET['formfactor'];
 		}
 		$formfactor=$_SESSION['formfactor'];
-		if($formfactor=='default') { 
+		if($formfactor=='default') {
 			$fext='';
-		}elseif($formfactor=='mobile') { 
+		}elseif($formfactor=='mobile') {
 			$fext='.mobile';
-		}elseif($formfactor=='tablet') { 
+		}elseif($formfactor=='tablet') {
 			$fext='.tablet';
-		}elseif($formfactor=='standalone') { 
+		}elseif($formfactor=='standalone') {
 			$fext='.standalone';
 		}else{
 			$fext='';
diff --git a/lib/templatelayout.php b/lib/templatelayout.php
index 588a784599..18fd23aac9 100644
--- a/lib/templatelayout.php
+++ b/lib/templatelayout.php
@@ -29,14 +29,16 @@ class OC_TemplateLayout extends OC_Template {
 					break;
 				}
 			}
-		}else{
-			parent::__construct( 'core', 'layout.guest' );
+		} else if ($renderas == 'guest') {
+			parent::__construct('core', 'layout.guest');
+		} else {
+			parent::__construct('core', 'layout.base');
 		}
 
 		$apps_paths = array();
 		foreach(OC_App::getEnabledApps() as $app){
 			$apps_paths[$app] = OC_App::getAppWebPath($app);
-    }
+		}
 		$this->assign( 'apps_paths', str_replace('\\/', '/',json_encode($apps_paths)),false ); // Ugly unescape slashes waiting for better solution
 
 		// Add the js files
@@ -63,7 +65,7 @@ class OC_TemplateLayout extends OC_Template {
 			foreach(OC::$APPSROOTS as $app_root) {
 				if($root == $app_root['path']) {
 					$in_root = true;
-          break;
+					break;
 				}
 			}
 
diff --git a/lib/user.php b/lib/user.php
index 06a56b7f4a..c432f6074a 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -332,6 +332,27 @@ class OC_User {
 		}
 	}
 
+	/**
+	 * @brief Check if the password is correct
+	 * @param $uid The username
+	 * @param $password The password
+	 * @returns string
+	 *
+	 * Check if the password is correct without logging in the user
+	 * returns the user id or false
+	 */
+	public static function getHome($uid){
+		foreach(self::$_usedBackends as $backend){
+			if($backend->implementsActions(OC_USER_BACKEND_GET_HOME)){
+				$result=$backend->getHome($uid);
+				if($result){
+					return $result;
+				}
+			}
+		}
+		return OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" ) . '/' . $uid;
+	}
+
 	/**
 	 * @brief Get a list of all users
 	 * @returns array with all uids
@@ -364,7 +385,7 @@ class OC_User {
 		}
 		return false;
 	}
-	
+
 	/**
 	 * disables a user
 	 * @param string $userid the user to disable
@@ -374,7 +395,7 @@ class OC_User {
 		$query = OC_DB::prepare($query);
 		$query->execute(array($userid, 'core', 'enabled', 'false'));
 	}
-	
+
 	/**
 	 * enable a user
 	 * @param string $userid
@@ -384,7 +405,7 @@ class OC_User {
 		$query = OC_DB::prepare($query);
 		$query->execute(array($userid, 'core', 'enabled', 'false'));
 	}
-	
+
 	/**
 	 * checks if a user is enabled
 	 * @param string $userid
diff --git a/lib/user/backend.php b/lib/user/backend.php
index f67908cdac..36e4bd9f76 100644
--- a/lib/user/backend.php
+++ b/lib/user/backend.php
@@ -34,6 +34,7 @@ define('OC_USER_BACKEND_NOT_IMPLEMENTED',   -501);
 define('OC_USER_BACKEND_CREATE_USER',       0x000001);
 define('OC_USER_BACKEND_SET_PASSWORD',      0x000010);
 define('OC_USER_BACKEND_CHECK_PASSWORD',    0x000100);
+define('OC_USER_BACKEND_GET_HOME',			0x001000);
 
 
 /**
@@ -48,6 +49,7 @@ abstract class OC_User_Backend implements OC_User_Interface {
 		OC_USER_BACKEND_CREATE_USER => 'createUser',
 		OC_USER_BACKEND_SET_PASSWORD => 'setPassword',
 		OC_USER_BACKEND_CHECK_PASSWORD => 'checkPassword',
+		OC_USER_BACKEND_GET_HOME => 'getHome',
 	);
 
 	/**
@@ -109,4 +111,13 @@ abstract class OC_User_Backend implements OC_User_Interface {
 	public function userExists($uid){
 		return false;
 	}
+
+	/**
+	* @brief get the user's home directory
+	* @param string $uid the username
+	* @return boolean
+	*/
+	public function getHome($uid){
+		return false;
+	}
 }
diff --git a/lib/user/database.php b/lib/user/database.php
index dff4d145fc..52f3b35fa5 100644
--- a/lib/user/database.php
+++ b/lib/user/database.php
@@ -43,7 +43,7 @@ class OC_User_Database extends OC_User_Backend {
 	 * @var PasswordHash
 	 */
 	static private $hasher=null;
-	
+
 	private function getHasher(){
 		if(!self::$hasher){
 			//we don't want to use DES based crypt(), since it doesn't return a has with a recognisable prefix
@@ -53,7 +53,7 @@ class OC_User_Database extends OC_User_Backend {
 		return self::$hasher;
 
 	}
-	
+
 	/**
 	 * @brief Create a new user
 	 * @param $uid The username of the user to create
@@ -121,7 +121,7 @@ class OC_User_Database extends OC_User_Backend {
 	 * returns the user id or false
 	 */
 	public function checkPassword( $uid, $password ){
-		$query = OC_DB::prepare( 'SELECT `uid`, `password` FROM `*PREFIX*users` WHERE `uid` = ?' );
+		$query = OC_DB::prepare( 'SELECT `uid`, `password` FROM `*PREFIX*users` WHERE LOWER(`uid`) = LOWER(?)' );
 		$result = $query->execute( array( $uid));
 
 		$row=$result->fetchRow();
@@ -170,9 +170,22 @@ class OC_User_Database extends OC_User_Backend {
 	 * @return boolean
 	 */
 	public function userExists($uid){
-		$query = OC_DB::prepare( 'SELECT * FROM `*PREFIX*users` WHERE `uid` = ?' );
+		$query = OC_DB::prepare( 'SELECT * FROM `*PREFIX*users` WHERE LOWER(`uid`) = LOWER(?)' );
 		$result = $query->execute( array( $uid ));
-		
+
 		return $result->numRows() > 0;
 	}
+
+	/**
+	* @brief get the user's home directory
+	* @param string $uid the username
+	* @return boolean
+	*/
+	public function getHome($uid){
+		if($this->userExists($uid)){
+			return OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" ) . '/' . $uid;
+		}else{
+			return false;
+		}
+	}
 }
diff --git a/lib/user/example.php b/lib/user/example.php
index 77246d8136..b2d0dc2541 100644
--- a/lib/user/example.php
+++ b/lib/user/example.php
@@ -57,4 +57,14 @@ abstract class OC_User_Example extends OC_User_Backend {
 		* returns the user id or false
 		*/
 	abstract public function checkPassword($uid, $password);
+
+	/**
+		* @brief get the user's home directory
+		* @param $uid The username
+		* @returns string
+		*
+		* get the user's home directory
+		* returns the path or false
+		*/
+	abstract public function getHome($uid);
 }
diff --git a/lib/user/http.php b/lib/user/http.php
index 009aa30c6f..5149678e4e 100644
--- a/lib/user/http.php
+++ b/lib/user/http.php
@@ -41,9 +41,9 @@ class OC_User_HTTP extends OC_User_Backend {
 			$url.='?'.$parts['query'];
 		}
 		return array($parts['user'],$url);
-		
+
 	}
-	
+
 	/**
 	 * check if an url is a valid login
 	 * @param string url
@@ -52,7 +52,7 @@ class OC_User_HTTP extends OC_User_Backend {
 	private function matchUrl($url){
 		return ! is_null(parse_url($url,PHP_URL_USER));
 	}
-	
+
 	/**
 	 * @brief Check if the password is correct
 	 * @param $uid The username
@@ -67,7 +67,7 @@ class OC_User_HTTP extends OC_User_Backend {
 			return false;
 		}
 		list($user,$url)=$this->parseUrl($uid);
-		
+
 		$ch = curl_init();
 		curl_setopt($ch, CURLOPT_URL, $url);
 		curl_setopt($ch, CURLOPT_USERPWD, $user.':'.$password);
@@ -76,7 +76,7 @@ class OC_User_HTTP extends OC_User_Backend {
 		curl_exec($ch);
 
 		$status = curl_getinfo($ch, CURLINFO_HTTP_CODE);
-		
+
 		curl_close($ch);
 
 		return $status==200;
@@ -90,4 +90,17 @@ class OC_User_HTTP extends OC_User_Backend {
 	public function userExists($uid){
 		return $this->matchUrl($uid);
 	}
+
+	/**
+	* @brief get the user's home directory
+	* @param string $uid the username
+	* @return boolean
+	*/
+	public function getHome($uid){
+		if($this->userExists($uid)){
+			return OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" ) . '/' . $uid;
+		}else{
+			return false;
+		}
+	}
 }
\ No newline at end of file
diff --git a/lib/util.php b/lib/util.php
index e63eb5b24c..10b88b2443 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -19,6 +19,18 @@ class OC_Util {
 			return false;
 		}
 
+		// If we are not forced to load a specific user we load the one that is logged in
+		if( $user == "" && OC_User::isLoggedIn()){
+			$user = OC_User::getUser();
+		}
+
+		// the filesystem will finish when $user is not empty,
+		// mark fs setup here to avoid doing the setup from loading
+		// OC_Filesystem
+		if ($user != '') {
+			self::$fsSetup=true;
+		}
+
 		$CONFIG_DATADIRECTORY = OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" );
 		//first set up the local "root" storage
 		if(!self::$rootMounted){
@@ -26,26 +38,21 @@ class OC_Util {
 			self::$rootMounted=true;
 		}
 
-		// If we are not forced to load a specific user we load the one that is logged in
-		if( $user == "" && OC_User::isLoggedIn()){
-			$user = OC_User::getUser();
-		}
-
 		if( $user != "" ){ //if we aren't logged in, there is no use to set up the filesystem
 			$user_dir = '/'.$user.'/files';
-			$userdirectory = $CONFIG_DATADIRECTORY.$user_dir;
+			$user_root = OC_User::getHome($user);
+			$userdirectory = $user_root . '/files';
 			if( !is_dir( $userdirectory )){
 				mkdir( $userdirectory, 0755, true );
 			}
-
 			//jail the user into his "home" directory
+			OC_Filesystem::mount('OC_Filestorage_Local', array('datadir' => $user_root), $user);
 			OC_Filesystem::init($user_dir);
 			$quotaProxy=new OC_FileProxy_Quota();
 			OC_FileProxy::register($quotaProxy);
-			self::$fsSetup=true;
 			// Load personal mount config
-			if (is_file($CONFIG_DATADIRECTORY.'/'.$user.'/mount.php')) {
-				$mountConfig = include($CONFIG_DATADIRECTORY.'/'.$user.'/mount.php');
+			if (is_file($user_root.'/mount.php')) {
+				$mountConfig = include($user_root.'/mount.php');
 				if (isset($mountConfig['user'][$user])) {
 					foreach ($mountConfig['user'][$user] as $mountPoint => $options) {
 						OC_Filesystem::mount($options['class'], $options['options'], $mountPoint);
@@ -66,7 +73,8 @@ class OC_Util {
 	 * @return array
 	 */
 	public static function getVersion(){
-		return array(4,82,4);
+		// hint: We only can count up. So the internal version number of ownCloud 4.5 will be 4,9,0. This is not visible to the user
+		return array(4,83,5);
 	}
 
 	/**
@@ -74,7 +82,7 @@ class OC_Util {
 	 * @return string
 	 */
 	public static function getVersionString(){
-		return '5 pre alpha 1';
+		return '4.5 beta 1';
 	}
 
 	/**
@@ -201,7 +209,7 @@ class OC_Util {
 		// Check if there is a writable install folder.
 		if(OC_Config::getValue('appstoreenabled', true)) {
 			if( OC_App::getInstallPath() === null  || !is_writable(OC_App::getInstallPath())) {
-				$errors[]=array('error'=>"Can't write into apps directory",'hint'=>"You can usually fix this by giving the webserver user write access to the apps directory 
+				$errors[]=array('error'=>"Can't write into apps directory",'hint'=>"You can usually fix this by giving the webserver user write access to the apps directory
 				in owncloud or disabling the appstore in the config file.");
 			}
 		}
@@ -209,7 +217,7 @@ class OC_Util {
 		$CONFIG_DATADIRECTORY = OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" );
 		//check for correct file permissions
 		if(!stristr(PHP_OS, 'WIN')){
-                	$permissionsModHint="Please change the permissions to 0770 so that the directory cannot be listed by other users.";
+			$permissionsModHint="Please change the permissions to 0770 so that the directory cannot be listed by other users.";
 			$prems=substr(decoct(@fileperms($CONFIG_DATADIRECTORY)),-3);
 			if(substr($prems,-1)!='0'){
 				OC_Helper::chmodr($CONFIG_DATADIRECTORY,0770);
@@ -400,15 +408,15 @@ class OC_Util {
 
 		// cleanup old tokens garbage collector
 		// only run every 20th time so we don't waste cpu cycles
-		if(rand(0,20)==0) {  
+		if(rand(0,20)==0) {
 			foreach($_SESSION as $key=>$value) {
 				// search all tokens in the session
 				if(substr($key,0,12)=='requesttoken') {
 					if($value+$maxtime<time()){
 						// remove outdated tokens
-						unset($_SESSION[$key]);						
+						unset($_SESSION[$key]);
 					}
-				}	
+				}
 			}
 		}
 		// return the token
@@ -455,13 +463,13 @@ class OC_Util {
 			exit;
 		}
 	}
-	
+
 	/**
 	 * @brief Public function to sanitize HTML
 	 *
 	 * This function is used to sanitize HTML and should be applied on any
 	 * string or array of strings before displaying it on a web page.
-	 * 
+	 *
 	 * @param string or array of strings
 	 * @return array with sanitized strings or a single sanitized string, depends on the input parameter.
 	 */
diff --git a/lib/vcategories.php b/lib/vcategories.php
index 20d9e3b5d6..05dfe18db6 100644
--- a/lib/vcategories.php
+++ b/lib/vcategories.php
@@ -129,7 +129,7 @@ class OC_VCategories {
 	*			$objects[] = $row['carddata'];
 	*		}
 	*	}
-	* 	$categories->rescan($objects);
+	*	$categories->rescan($objects);
 	*/
 	public function rescan($objects, $sync=true, $reset=true) {
 		if($reset === true) {
@@ -219,7 +219,7 @@ class OC_VCategories {
 		if(!is_array($haystack)) {
 			return false;
 		}
-		return array_search(strtolower($needle),array_map('strtolower',$haystack)); 
+		return array_search(strtolower($needle),array_map('strtolower',$haystack));
 	}
 
 }
diff --git a/public.php b/public.php
index 0581631f41..e46559595f 100644
--- a/public.php
+++ b/public.php
@@ -1,6 +1,10 @@
 <?php
 $RUNTIME_NOAPPS = TRUE;
 require_once('lib/base.php');
+if (!isset($_GET['service'])) {
+	header('HTTP/1.0 404 Not Found');
+	exit;
+}
 $file = OCP\CONFIG::getAppValue('core', 'public_' . strip_tags($_GET['service']));
 if(is_null($file)){
 	header('HTTP/1.0 404 Not Found');
diff --git a/remote.php b/remote.php
index 41d2a7ab34..809a4a9bf5 100644
--- a/remote.php
+++ b/remote.php
@@ -2,7 +2,7 @@
 $RUNTIME_NOAPPS = TRUE;
 require_once('lib/base.php');
 $path_info = OC_Request::getPathInfo();
-if ($path_info === false) {
+if ($path_info === false || $path_info === '') {
 	OC_Response::setStatus(OC_Response::STATUS_NOT_FOUND);
 	exit;
 }
diff --git a/settings/admin.php b/settings/admin.php
index 6909e02d14..8788de940b 100755
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -30,6 +30,10 @@ $tmpl->assign('entries',$entries);
 $tmpl->assign('entriesremain', $entriesremain);
 $tmpl->assign('htaccessworking',$htaccessworking);
 $tmpl->assign('backgroundjobs_mode', OC_Appconfig::getValue('core', 'backgroundjobs_mode', 'ajax'));
+$tmpl->assign('shareAPIEnabled', OC_Appconfig::getValue('core', 'shareapi_enabled', 'yes'));
+$tmpl->assign('allowLinks', OC_Appconfig::getValue('core', 'shareapi_allow_links', 'yes'));
+$tmpl->assign('allowResharing', OC_Appconfig::getValue('core', 'shareapi_allow_resharing', 'yes'));
+$tmpl->assign('sharePolicy', OC_Appconfig::getValue('core', 'shareapi_share_policy', 'global'));
 $tmpl->assign('forms',array());
 foreach($forms as $form){
 	$tmpl->append('forms',$form);
diff --git a/settings/apps.php b/settings/apps.php
index 6feede7741..27bbcc9ada 100644
--- a/settings/apps.php
+++ b/settings/apps.php
@@ -32,7 +32,8 @@ OC_App::setActiveNavigationEntry( "core_apps" );
 $registeredApps=OC_App::getAllApps();
 $apps=array();
 
-$blacklist=array('files','files_imageviewer','files_textviewer');//we dont want to show configuration for these
+//TODO which apps do we want to blacklist and how do we integrate blacklisting with the multi apps folder feature
+$blacklist=array('files');//we dont want to show configuration for these
 
 foreach($registeredApps as $app){
 	if(array_search($app,$blacklist)===false){
diff --git a/settings/css/settings.css b/settings/css/settings.css
index 373b15bff6..74a3a1acc8 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -62,5 +62,5 @@ span.version { margin-left:3em; margin-right:3em; color:#555; }
 
 /* ADMIN */
 span.securitywarning {color:#C33; font-weight:bold; }
-h3.settingsNotice { font-size: 1.2em; }
-.settingsNotice { font-weight:bold; padding: 0.5em 0; }
+input[type=radio] { width:1em; }
+table.shareAPI td { padding-right: 2em; }
\ No newline at end of file
diff --git a/settings/js/admin.js b/settings/js/admin.js
index 409594a4b9..23f445b708 100644
--- a/settings/js/admin.js
+++ b/settings/js/admin.js
@@ -7,7 +7,27 @@ $(document).ready(function(){
 
 	$('#backgroundjobs input').change(function(){
 		if($(this).attr('checked')){
-			$.post(OC.filePath('settings','ajax','setbackgroundjobsmode.php'), { mode: $(this).val() });
+			var mode = $(this).val();
+			if (mode == 'ajax' || mode == 'webcron' || mode == 'cron') {
+				OC.AppConfig.setValue('core', 'backgroundjobs_mode', mode);
+			}
 		}
 	});
+
+	$('#shareAPIEnabled').change(function() {
+		$('.shareAPI td:not(#enable)').toggle();
+	});
+
+	$('#shareAPI input').change(function() {
+		if ($(this).attr('type') == 'checkbox') {
+			if (this.checked) {
+				var value = 'yes';
+			} else {
+				var value = 'no';
+			}
+		} else {
+			var value = $(this).val()
+		}
+		OC.AppConfig.setValue('core', $(this).attr('name'), value);
+	});
 });
\ No newline at end of file
diff --git a/settings/l10n/et_EE.php b/settings/l10n/et_EE.php
index 4ab799a7f0..b2efd4d469 100644
--- a/settings/l10n/et_EE.php
+++ b/settings/l10n/et_EE.php
@@ -1,13 +1,21 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "App Sotre'i nimekirja laadimine ebaõnnestus",
 "Email saved" => "Kiri on salvestatud",
 "Invalid email" => "Vigane e-post",
 "OpenID Changed" => "OpenID on muudetud",
 "Invalid request" => "Vigane päring",
+"Authentication error" => "Autentimise viga",
 "Language changed" => "Keel on muudetud",
+"Error" => "Viga",
 "Disable" => "Lülita välja",
 "Enable" => "Lülita sisse",
 "Saving..." => "Salvestamine...",
 "__language_name__" => "Eesti",
+"Security Warning" => "Turvahoiatus",
+"Cron" => "Ajastatud töö",
+"execute one task with each page loaded" => "käivita iga laetud lehe juures üks ülesanne",
+"cron.php is registered at a webcron service" => "cron.php on webcron teenuses registreeritud",
+"use systems cron service" => "kasuta süsteemide cron teenuseid",
 "Log" => "Logi",
 "More" => "Veel",
 "Add your App" => "Lisa oma rakendus",
@@ -43,6 +51,7 @@
 "Create" => "Lisa",
 "Default Quota" => "Vaikimisi kvoot",
 "Other" => "Muu",
+"Group Admin" => "Grupi admin",
 "Quota" => "Mahupiir",
 "Delete" => "Kustuta"
 );
diff --git a/settings/l10n/eu.php b/settings/l10n/eu.php
index 1ead8b14b6..d5dcf396ad 100644
--- a/settings/l10n/eu.php
+++ b/settings/l10n/eu.php
@@ -1,15 +1,21 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "Ezin izan da App Dendatik zerrenda kargatu",
 "Email saved" => "Eposta gorde da",
 "Invalid email" => "Baliogabeko eposta",
 "OpenID Changed" => "OpenID aldatuta",
 "Invalid request" => "Baliogabeko eskaria",
 "Authentication error" => "Autentifikazio errorea",
 "Language changed" => "Hizkuntza aldatuta",
+"Error" => "Errorea",
 "Disable" => "Ez-gaitu",
 "Enable" => "Gaitu",
 "Saving..." => "Gordetzen...",
 "__language_name__" => "Euskera",
 "Security Warning" => "Segurtasun abisua",
+"Cron" => "Cron",
+"execute one task with each page loaded" => "exekutatu zeregina orri karga bakoitzean",
+"cron.php is registered at a webcron service" => "cron.php webcron zerbitzu batean erregistratuta dago",
+"use systems cron service" => "erabili sistemaren cron zerbitzua",
 "Log" => "Egunkaria",
 "More" => "Gehiago",
 "Add your App" => "Gehitu zure aplikazioa",
@@ -45,6 +51,7 @@
 "Create" => "Sortu",
 "Default Quota" => "Kuota lehentsia",
 "Other" => "Besteak",
+"Group Admin" => "Talde administradorea",
 "Quota" => "Kuota",
 "Delete" => "Ezabatu"
 );
diff --git a/settings/l10n/hr.php b/settings/l10n/hr.php
index 6fb29ce79c..a0a8e2e100 100644
--- a/settings/l10n/hr.php
+++ b/settings/l10n/hr.php
@@ -1,13 +1,19 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "Nemogićnost učitavanja liste sa Apps Stora",
 "Email saved" => "Email spremljen",
 "Invalid email" => "Neispravan email",
 "OpenID Changed" => "OpenID promijenjen",
 "Invalid request" => "Neispravan zahtjev",
+"Authentication error" => "Greška kod autorizacije",
 "Language changed" => "Jezik promijenjen",
+"Error" => "Greška",
 "Disable" => "Isključi",
 "Enable" => "Uključi",
 "Saving..." => "Spremanje...",
 "__language_name__" => "__ime_jezika__",
+"Cron" => "Cron",
+"cron.php is registered at a webcron service" => "cron.php je registriran kod webcron servisa",
+"use systems cron service" => "koristi sistemski cron servis",
 "Log" => "dnevnik",
 "More" => "više",
 "Add your App" => "Dodajte vašu aplikaciju",
@@ -43,6 +49,7 @@
 "Create" => "Izradi",
 "Default Quota" => "standardni kvota",
 "Other" => "ostali",
+"Group Admin" => "Grupa Admin",
 "Quota" => "kvota",
 "Delete" => "Obriši"
 );
diff --git a/settings/l10n/id.php b/settings/l10n/id.php
index bf35b79240..a69d9855ca 100644
--- a/settings/l10n/id.php
+++ b/settings/l10n/id.php
@@ -1,12 +1,19 @@
 <?php $TRANSLATIONS = array(
+"Email saved" => "Email tersimpan",
+"Invalid email" => "Email tidak sah",
 "OpenID Changed" => "OpenID telah dirubah",
 "Invalid request" => "Permintaan tidak valid",
 "Language changed" => "Bahasa telah diganti",
+"Disable" => "NonAktifkan",
+"Enable" => "Aktifkan",
+"Saving..." => "Menyimpan...",
 "__language_name__" => "__language_name__",
+"Security Warning" => "Peringatan Keamanan",
 "Log" => "Log",
 "More" => "Lebih",
 "Add your App" => "Tambahkan App anda",
 "Select an App" => "Pilih satu aplikasi",
+"See application page at apps.owncloud.com" => "Lihat halaman aplikasi di apps.owncloud.com",
 "-licensed" => "-terlisensi",
 "by" => "oleh",
 "Documentation" => "Dokumentasi",
@@ -37,6 +44,7 @@
 "Create" => "Buat",
 "Default Quota" => "Kuota default",
 "Other" => "Lain-lain",
+"Group Admin" => "Admin Grup",
 "Quota" => "Quota",
 "Delete" => "Hapus"
 );
diff --git a/settings/l10n/lv.php b/settings/l10n/lv.php
index 9fa1ccdcfe..eb87bed7f8 100644
--- a/settings/l10n/lv.php
+++ b/settings/l10n/lv.php
@@ -1,14 +1,18 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "Nebija iespējams lejuplādēt sarakstu no aplikāciju veikala",
 "Email saved" => "Epasts tika saglabāts",
 "Invalid email" => "Nepareizs epasts",
 "OpenID Changed" => "OpenID nomainīts",
 "Invalid request" => "Nepareizs vaicājums",
+"Authentication error" => "Ielogošanās kļūme",
 "Language changed" => "Valoda tika nomainīta",
+"Error" => "Kļūme",
 "Disable" => "Atvienot",
 "Enable" => "Pievienot",
 "Saving..." => "Saglabā...",
 "__language_name__" => "__valodas_nosaukums__",
 "Security Warning" => "Brīdinājums par drošību",
+"Cron" => "Cron",
 "Log" => "Log",
 "More" => "Vairāk",
 "Add your App" => "Pievieno savu aplikāciju",
@@ -44,6 +48,7 @@
 "Create" => "Izveidot",
 "Default Quota" => "Apjoms pēc noklusējuma",
 "Other" => "Cits",
+"Group Admin" => "Grupas administrators",
 "Quota" => "Apjoms",
 "Delete" => "Izdzēst"
 );
diff --git a/settings/l10n/nb_NO.php b/settings/l10n/nb_NO.php
index 2a5188a9cc..137e5802a2 100644
--- a/settings/l10n/nb_NO.php
+++ b/settings/l10n/nb_NO.php
@@ -1,13 +1,21 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "Lasting av liste fra App Store feilet.",
 "Email saved" => "Epost lagret",
 "Invalid email" => "Ugyldig epost",
 "OpenID Changed" => "OpenID endret",
 "Invalid request" => "Ugyldig forespørsel",
+"Authentication error" => "Autentikasjonsfeil",
 "Language changed" => "Språk endret",
+"Error" => "Feil",
 "Disable" => "Slå avBehandle ",
 "Enable" => "Slå på",
 "Saving..." => "Lagrer...",
 "__language_name__" => "__language_name__",
+"Security Warning" => "Sikkerhetsadvarsel",
+"Cron" => "Cron",
+"execute one task with each page loaded" => "utfør en oppgave med hver side som blir lastet",
+"cron.php is registered at a webcron service" => "cron.php er registrert som en webcron tjeneste",
+"use systems cron service" => "benytt systemets cron tjeneste",
 "Log" => "Logg",
 "More" => "Mer",
 "Add your App" => "Legg til din App",
@@ -43,6 +51,7 @@
 "Create" => "Opprett",
 "Default Quota" => "Standard Kvote",
 "Other" => "Annet",
+"Group Admin" => "Gruppeadministrator",
 "Quota" => "Kvote",
 "Delete" => "Slett"
 );
diff --git a/settings/l10n/zh_CN.php b/settings/l10n/zh_CN.php
index 410772e080..b008955a4b 100644
--- a/settings/l10n/zh_CN.php
+++ b/settings/l10n/zh_CN.php
@@ -14,6 +14,7 @@
 "Security Warning" => "安全警告",
 "Cron" => "计划任务",
 "execute one task with each page loaded" => "为每个装入的页面执行任务",
+"cron.php is registered at a webcron service" => "crop.php 已",
 "use systems cron service" => "实现系统 cron 服务",
 "Log" => "日志",
 "More" => "更多",
diff --git a/settings/log.php b/settings/log.php
deleted file mode 100644
index ddbf72c443..0000000000
--- a/settings/log.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-/**
- * ownCloud
- *
- * @author Robin Appelman
- * @copyright 2012 Robin Appelman icewind1991@gmail.com
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *
- * You should have received a copy of the GNU Affero General Public
- * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-require_once('../lib/base.php');
-OC_Util::checkAdminUser();
-
-// Load the files we need
-OC_Util::addStyle( "settings", "settings" );
-OC_Util::addScript( "settings", "apps" );
-OC_App::setActiveNavigationEntry( "core_log" );
-
-$entries=OC_Log_Owncloud::getEntries();
-
-OC_Util::addScript('settings','log');
-OC_Util::addStyle('settings','settings');
-
-function compareEntries($a,$b){
-	return $b->time - $a->time;
-}
-usort($entries, 'compareEntries');
-
-$tmpl = new OC_Template( "settings", "log", "user" );
-$tmpl->assign('entries',$entries);
-
-$tmpl->printPage();
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 9ccab25516..b701b0e839 100755
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -35,6 +35,34 @@ if(!$_['htaccessworking']) {
 	<label for="backgroundjobs_cron" title="<?php echo $l->t("use systems cron service"); ?>">Cron</label><br />
 </fieldset>
 
+<fieldset class="personalblock" id="shareAPI">
+	<legend><strong><?php echo $l->t('Share API');?></strong></legend>
+	<table class="shareAPI nostyle">
+		<tr>
+			<td id="enable">
+				<input type="checkbox" name="shareapi_enabled" id="shareAPIEnabled" value="1" <?php if ($_['shareAPIEnabled'] == 'yes') echo 'checked="checked"'; ?> />
+				<label for="shareAPIEnabled"><?php echo $l->t('Enable Share API');?></label><br />
+				<em><?php echo $l->t('Allow apps to use the Share API'); ?></em>
+			</td>
+			<td <?php if ($_['shareAPIEnabled'] == 'no') echo 'style="display:none"';?>>
+				<input type="checkbox" name="shareapi_allow_links" id="allowLinks" value="1" <?php if ($_['allowLinks'] == 'yes') echo 'checked="checked"'; ?> />
+				<label for="allowLinks"><?php echo $l->t('Allow links');?></label><br />
+				<em><?php echo $l->t('Allow users to share items to the public with links'); ?></em>
+			</td>
+			<td <?php if ($_['shareAPIEnabled'] == 'no') echo 'style="display:none"';?>>
+				<input type="checkbox" name="shareapi_allow_resharing" id="allowResharing" value="1" <?php if ($_['allowResharing'] == 'yes') echo 'checked="checked"'; ?> />
+				<label for="allowResharing"><?php echo $l->t('Allow resharing');?></label><br />
+				<em><?php echo $l->t('Allow users to share items shared with them again'); ?></em>
+			<td <?php if ($_['shareAPIEnabled'] == 'no') echo 'style="display:none"';?>>
+				<input type="radio" name="shareapi_share_policy" id="sharePolicyGlobal" value="global" <?php if ($_['sharePolicy'] == 'global') echo 'checked="checked"'; ?> />
+				<label for="sharePolicyGlobal"><?php echo $l->t('Allow users to share with anyone'); ?></label><br />
+				<input type="radio" name="shareapi_share_policy" id="sharePolicyGroupsOnly" value="groups_only" <?php if ($_['sharePolicy'] == 'groups_only') echo 'checked="checked"'; ?> />
+				<label for="sharePolicyGroupsOnly"><?php echo $l->t('Allow users to only share with users in their groups');?></label><br />
+			</td>
+		</tr>
+	</table>
+</fieldset>
+
 <fieldset class="personalblock">
 	<legend><strong><?php echo $l->t('Log');?></strong></legend>
 	Log level: <select name='loglevel' id='loglevel'>
@@ -72,6 +100,6 @@ if(!$_['htaccessworking']) {
 
 <p class="personalblock">
 	<strong>ownCloud</strong> <?php echo(OC_Util::getVersionString()); ?> <?php echo(OC_Util::getEditionString()); ?> (<?php echo(OC_Updater::ShowUpdatingHint()); ?>)<br />
-	Developed by the <a href="http://ownCloud.org/contact" target="_blank">ownCloud community</a>, the <a href="http://gitorious.org/owncloud" target="_blank">source code</a> is licensed under the <a href="http://www.gnu.org/licenses/agpl-3.0.html" target="_blank"><abbr title="Affero General Public License">AGPL</abbr></a>.
+	Developed by the <a href="http://ownCloud.org/contact" target="_blank">ownCloud community</a>, the <a href="https://github.com/owncloud" target="_blank">source code</a> is licensed under the <a href="http://www.gnu.org/licenses/agpl-3.0.html" target="_blank"><abbr title="Affero General Public License">AGPL</abbr></a>.
 </p>
 
diff --git a/settings/templates/users.php b/settings/templates/users.php
index 5298237f67..295b7761cf 100644
--- a/settings/templates/users.php
+++ b/settings/templates/users.php
@@ -151,9 +151,4 @@ var isadmin = <?php echo $_['isadmin']?'true':'false'; ?>;
 		</tr>
 		<?php endforeach; ?>
 	</tbody>
-</table>
-
-<!-- use a standard notification class / system for this message -->
-<?php if( $_["share_notice"] ):?>
-<h3 class="settingsNotice center"><?php echo $_["share_notice"]; ?></h3>
-<?php endif;?>	
\ No newline at end of file
+</table>
\ No newline at end of file
diff --git a/settings/users.php b/settings/users.php
index 6f39059757..b04f0c99e8 100644
--- a/settings/users.php
+++ b/settings/users.php
@@ -11,8 +11,7 @@ OC_Util::checkSubAdminUser();
 // We have some javascript foo!
 OC_Util::addScript( 'settings', 'users' );
 OC_Util::addScript( 'core', 'multiselect' );
-// TODO Move script to core
-OC_Util::addScript('contacts', 'jquery.inview');
+OC_Util::addScript('core', 'jquery.inview');
 OC_Util::addStyle( 'settings', 'settings' );
 OC_App::setActiveNavigationEntry( 'core_users' );
 
@@ -46,14 +45,6 @@ foreach($quotaPreset as &$preset){
 
 $defaultQuota=OC_Appconfig::getValue('files','default_quota','none');
 
-$shareNotice = '';
-
-if (\OC_App::isEnabled( "files_sharing" ) ) {
-
-	$shareNotice = 'Note: users may only share to groups that they belong to, and their members';
-	
-}
-
 $tmpl = new OC_Template( "settings", "users", "user" );
 $tmpl->assign( "users", $users );
 $tmpl->assign( "groups", $groups );
@@ -62,5 +53,4 @@ $tmpl->assign( 'subadmins', $subadmins);
 $tmpl->assign( 'numofgroups', count($accessiblegroups));
 $tmpl->assign( 'quota_preset', $quotaPreset);
 $tmpl->assign( 'default_quota', $defaultQuota);
-$tmpl->assign( 'share_notice', $shareNotice);
-$tmpl->printPage();
+$tmpl->printPage();
\ No newline at end of file
diff --git a/tests/lib/share/share.php b/tests/lib/share/share.php
index 303790b486..18ca5031ca 100644
--- a/tests/lib/share/share.php
+++ b/tests/lib/share/share.php
@@ -241,8 +241,12 @@ class Test_Share extends UnitTestCase {
 		$this->assertTrue(OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\Share::PERMISSION_READ));
 		OC_User::setUserId($this->user3);
 		$this->assertTrue(OCP\Share::shareItem('test', 'share.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\Share::PERMISSION_READ));
+
 		OC_User::setUserId($this->user2);
-		$this->assertEqual(OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET), array('test.txt', 'test1.txt'));
+		$to_test = OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET);
+		$this->assertEqual(count($to_test), 2);
+		$this->assertTrue(in_array('test.txt', $to_test));
+		$this->assertTrue(in_array('test1.txt', $to_test));
 
 		// Remove user
 		OC_User::deleteUser($this->user1);
@@ -356,9 +360,13 @@ class Test_Share extends UnitTestCase {
 		
 		// Attempt user specific target conflict
 		OC_User::setUserId($this->user3);
-		$this->assertTrue(OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_GROUP, $this->group1, OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_SHARE));
+		$this->assertTrue(OCP\Share::shareItem('test', 'share.txt', OCP\Share::SHARE_TYPE_GROUP, $this->group1, OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_SHARE));
 		OC_User::setUserId($this->user2);
-		$this->assertEqual(OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET), array('test.txt', 'test1.txt'));
+		$to_test = OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET);
+		$this->assertEqual(count($to_test), 2);
+		$this->assertTrue(in_array('test.txt', $to_test));
+		$this->assertTrue(in_array('test1.txt', $to_test));
+		//$this->assertEqual(OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET), array('test.txt', 'test1.txt'));
 		
 // 		// Valid reshare TODO Broken
 // 		$this->assertTrue(OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user4, OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_SHARE));
diff --git a/themes/README b/themes/README
index e348f86a12..4025bc8970 100644
--- a/themes/README
+++ b/themes/README
@@ -2,6 +2,6 @@ This is the themes folder. Themes can be used to customize the look and feel of
 Themes can be placed in this folder with the name of the theme as foldername. The theme can be activated by putting 
 "theme" => 'themename', into the config.php file.
 The folder structure of a theme is exactly the same as the main ownCloud structure. You can override js files and templates with own versions. css files are loaded additionaly to the default files so you can override css properties.
-Themes should be developed here: https://gitorious.org/owncloud/themes
+Themes should be developed here: https://github.com/owncloud/themes
 You can also find a super simple example there